diff --git a/.editorconfig b/.editorconfig
index 60827f04baf..3a537d01b28 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,39 +4,39 @@
 root = true
 
 [*]
+end_of_line = lf
 indent_style = space
 indent_size = 4
-
-# We recommend you to keep these unchanged
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[{*.yaml,*.yml}] # To match GitHub Actions formatting
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
-indent_size = 4
-
-[{qmk,*.py}]
-charset = utf-8
-max_line_length = 200
-
-# Make these match what we have in .gitattributes
-[*.mk]
-end_of_line = lf
-indent_style = tab
 
-[Makefile]
-end_of_line = lf
+[{Makefile,*.mk}]
 indent_style = tab
 
-[*.sh]
-end_of_line = lf
-
-# The gitattributes file will handle the line endings conversion properly according to the operating system settings for other files
-
-
-# We don't have gitattributes properly for these
-# So if the user have for example core.autocrlf set to true
-# the line endings would be wrong.
+# Don't override anything in `lib/`...
 [lib/**]
+indent_style = unset
+indent_size = unset
+tab_width = unset
 end_of_line = unset
+charset = unset
+spelling_language = unset
+trim_trailing_whitespace = unset
+insert_final_newline = unset
+
+# ...except QMK's `lib/python`.
+[{*.py,lib/python/**.py}]
+end_of_line = lf
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 200
diff --git a/.gitignore b/.gitignore
index 1af1f10746e..ab405673f8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,11 @@
 *.lst
 *.map
 *.o
+*.a
+*.so
+*.dylib
+*.dll
+*.la
 *.stackdump
 *.sym
 
diff --git a/Makefile b/Makefile
index ab30a17f58a..78d1a372bc7 100644
--- a/Makefile
+++ b/Makefile
@@ -337,24 +337,23 @@ define BUILD_TEST
     endif
 endef
 
+define LIST_TEST
+    include $(BUILDDEFS_PATH)/testlist.mk
+    FOUND_TESTS := $$(patsubst ./tests/%,%,$$(TEST_LIST))
+    $$(info $$(FOUND_TESTS))
+endef
+
 define PARSE_TEST
     TESTS :=
-    # list of possible targets, colon-delimited, to reassign to MAKE_TARGET and remove
-    TARGETS := :clean:
-    ifneq (,$$(findstring :$$(lastword $$(subst :, ,$$(RULE))):, $$(TARGETS)))
-        MAKE_TARGET := $$(lastword $$(subst :, ,$$(RULE)))
-        TEST_SUBPATH := $$(subst $$(eval) ,/,$$(wordlist 2, $$(words $$(subst :, ,$$(RULE))), _ $$(subst :, ,$$(RULE))))
-    else
-        MAKE_TARGET :=
-        TEST_SUBPATH := $$(subst :,/,$$(RULE))
-    endif
+    TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
+    TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE)))
     include $(BUILDDEFS_PATH)/testlist.mk
-    ifeq ($$(RULE),all)
+    ifeq ($$(TEST_NAME),all)
         MATCHED_TESTS := $$(TEST_LIST)
     else
-        MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring /$$(TEST_SUBPATH)/, $$(patsubst %,%/,$$(TEST))), $$(TEST),))
+        MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring x$$(TEST_NAME)x, x$$(patsubst ./tests/%,%,$$(TEST)x)), $$(TEST),))
     endif
-    $$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(MAKE_TARGET))))
+    $$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET))))
 endef
 
 
@@ -437,6 +436,10 @@ git-submodules: git-submodule
 list-keyboards:
 	$(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' '
 
+.PHONY: list-tests
+list-tests:
+	$(eval $(call LIST_TEST))
+
 .PHONY: generate-keyboards-file
 generate-keyboards-file:
 	$(QMK_BIN) list-keyboards --no-resolve-defaults
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index e298c61f26e..17b3edfcf4b 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -313,6 +313,7 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
         OPT_DEFS += -DRGBLIGHT_$(strip $(shell echo $(RGBLIGHT_DRIVER) | tr '[:lower:]' '[:upper:]'))
         SRC += $(QUANTUM_DIR)/color.c
         SRC += $(QUANTUM_DIR)/rgblight/rgblight.c
+        SRC += $(QUANTUM_DIR)/rgblight/rgblight_drivers.c
         CIE1931_CURVE := yes
         RGB_KEYCODES_ENABLE := yes
     endif
@@ -339,7 +340,7 @@ LED_MATRIX_DRIVER := snled27351
 endif
 
 LED_MATRIX_ENABLE ?= no
-VALID_LED_MATRIX_TYPES := is31fl3218 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 custom
+VALID_LED_MATRIX_TYPES := is31fl3218 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 custom
 
 ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
@@ -361,71 +362,73 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3218)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3218-simple.c
+        SRC += is31fl3218-mono.c
+    endif
+
+    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3729)
+        I2C_DRIVER_REQUIRED = yes
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31fl3729-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3731)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3731-simple.c
+        SRC += is31fl3731-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3733)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3733-simple.c
+        SRC += is31fl3733-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3736)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3736-simple.c
+        SRC += is31fl3736-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3737)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3737-simple.c
+        SRC += is31fl3737-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3741)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3741-simple.c
+        SRC += is31fl3741-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3742a)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3742a-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3743a)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3743a-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3745)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3745-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3746a)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3746a-mono.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), snled27351)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led
-        SRC += snled27351-simple.c
+        SRC += snled27351-mono.c
     endif
 
 endif
@@ -440,7 +443,7 @@ endif
 
 RGB_MATRIX_ENABLE ?= no
 
-VALID_RGB_MATRIX_TYPES := aw20216s is31fl3218 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 ws2812 custom
+VALID_RGB_MATRIX_TYPES := aw20216s is31fl3218 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 ws2812 custom
 ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid RGB_MATRIX_DRIVER,RGB_MATRIX_DRIVER="$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
@@ -471,6 +474,12 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
         SRC += is31fl3218.c
     endif
 
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3729)
+        I2C_DRIVER_REQUIRED = yes
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31fl3729.c
+    endif
+
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3731)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
@@ -502,31 +511,27 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     endif
 
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3742a)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3742a.c
     endif
 
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3743a)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3743a.c
     endif
 
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3745)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3745.c
     endif
 
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3746a)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3746a.c
     endif
 
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), snled27351)
@@ -619,24 +624,9 @@ ifeq ($(strip $(VIAL_ENABLE)), yes)
     include $(BUILDDEFS_PATH)/build_vial.mk
 endif
 
-VALID_MAGIC_TYPES := yes
-BOOTMAGIC_ENABLE ?= no
-ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
-  ifeq ($(filter $(BOOTMAGIC_ENABLE),$(VALID_MAGIC_TYPES)),)
-    $(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
-      QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/bootmagic_lite.c
-  endif
-endif
-COMMON_VPATH += $(QUANTUM_DIR)/bootmagic
-QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/magic.c
-
 VALID_CUSTOM_MATRIX_TYPES:= yes lite no
 
 CUSTOM_MATRIX ?= no
-
 ifneq ($(strip $(CUSTOM_MATRIX)), yes)
     ifeq ($(filter $(CUSTOM_MATRIX),$(VALID_CUSTOM_MATRIX_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid CUSTOM_MATRIX,CUSTOM_MATRIX="$(CUSTOM_MATRIX)" is not a valid custom matrix type)
@@ -841,15 +831,12 @@ ifeq ($(strip $(JOYSTICK_ENABLE)), yes)
         $(call CATASTROPHIC_ERROR,Invalid JOYSTICK_DRIVER,JOYSTICK_DRIVER="$(JOYSTICK_DRIVER)" is not a valid joystick driver)
     endif
     OPT_DEFS += -DJOYSTICK_ENABLE
+    OPT_DEFS += -DJOYSTICK_$(strip $(shell echo $(JOYSTICK_DRIVER) | tr '[:lower:]' '[:upper:]'))
     SRC += $(QUANTUM_DIR)/process_keycode/process_joystick.c
     SRC += $(QUANTUM_DIR)/joystick.c
 
     ifeq ($(strip $(JOYSTICK_DRIVER)), analog)
         ANALOG_DRIVER_REQUIRED = yes
-        OPT_DEFS += -DANALOG_JOYSTICK_ENABLE
-    endif
-    ifeq ($(strip $(JOYSTICK_DRIVER)), digital)
-        OPT_DEFS += -DDIGITAL_JOYSTICK_ENABLE
     endif
 endif
 
@@ -903,14 +890,35 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     endif
 endif
 
+ENCODER_ENABLE ?= no
+ENCODER_DRIVER ?= quadrature
+VALID_ENCODER_DRIVER_TYPES := quadrature custom
 ifeq ($(strip $(ENCODER_ENABLE)), yes)
+    ifeq ($(filter $(ENCODER_DRIVER),$(VALID_ENCODER_DRIVER_TYPES)),)
+        $(call CATASTROPHIC_ERROR,Invalid ENCODER_DRIVER,ENCODER_DRIVER="$(ENCODER_DRIVER)" is not a valid encoder driver)
+    endif
     SRC += $(QUANTUM_DIR)/encoder.c
     OPT_DEFS += -DENCODER_ENABLE
+    OPT_DEFS += -DENCODER_DRIVER_$(strip $(shell echo $(ENCODER_DRIVER) | tr '[:lower:]' '[:upper:]'))
+
+    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/encoder
+    COMMON_VPATH += $(DRIVER_PATH)/encoder
+
+    ifneq ($(strip $(ENCODER_DRIVER)), custom)
+        SRC += encoder_$(strip $(ENCODER_DRIVER)).c
+    endif
+
     ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
         OPT_DEFS += -DENCODER_MAP_ENABLE
     endif
 endif
 
+ifeq ($(strip $(DIP_SWITCH_ENABLE)), yes)
+    ifeq ($(strip $(DIP_SWITCH_MAP_ENABLE)), yes)
+        OPT_DEFS += -DDIP_SWITCH_MAP_ENABLE
+    endif
+endif
+
 VALID_WS2812_DRIVER_TYPES := bitbang custom i2c pwm spi vendor
 
 WS2812_DRIVER ?= bitbang
@@ -956,6 +964,15 @@ ifeq ($(strip $(SPI_DRIVER_REQUIRED)), yes)
 endif
 
 ifeq ($(strip $(UART_DRIVER_REQUIRED)), yes)
-    OPT_DEFS += -DHAL_USE_SERIAL=TRUE
-    QUANTUM_LIB_SRC += uart.c
+    ifeq ($(strip $(PLATFORM)), CHIBIOS)
+        ifneq ($(filter $(MCU_SERIES),RP2040),)
+            OPT_DEFS += -DHAL_USE_SIO=TRUE
+            QUANTUM_LIB_SRC += uart_sio.c
+        else
+            OPT_DEFS += -DHAL_USE_SERIAL=TRUE
+            QUANTUM_LIB_SRC += uart_serial.c
+        endif
+    else
+        QUANTUM_LIB_SRC += uart.c
+    endif
 endif
diff --git a/builddefs/converters.mk b/builddefs/converters.mk
index 96c8656b253..3e77a070f2f 100644
--- a/builddefs/converters.mk
+++ b/builddefs/converters.mk
@@ -5,8 +5,10 @@ ifneq ($(findstring yes, $(CTPC)$(CONVERT_TO_PROTON_C)),)
 $(call CATASTROPHIC_ERROR,The `CONVERT_TO_PROTON_C` and `CTPC` options are now deprecated. `CONVERT_TO=proton_c` should be used instead.)
 endif
 
-# TODO: opt in rather than assume everything uses a pro micro
-PIN_COMPATIBLE ?= promicro
+ifneq (,$(filter $(MCU),atmega32u4))
+    # TODO: opt in rather than assume everything uses a pro micro
+    PIN_COMPATIBLE ?= promicro
+endif
 
 # Remove whitespace from any rule.mk provided vars
 #   - env cannot be overwritten but cannot have whitespace anyway
@@ -16,6 +18,10 @@ ifneq ($(CONVERT_TO),)
     # stash so we can overwrite env provided vars if needed
     ACTIVE_CONVERTER=$(CONVERT_TO)
 
+    ifeq ($(PIN_COMPATIBLE),)
+        $(call CATASTROPHIC_ERROR,Converting to '$(CONVERT_TO)' not possible!)
+    endif
+
     # glob to search each platfrorm and/or check for valid converter
     CONVERTER := $(wildcard $(PLATFORM_PATH)/*/converters/$(PIN_COMPATIBLE)_to_$(CONVERT_TO)/)
     ifeq ($(CONVERTER),)
diff --git a/builddefs/generic_features.mk b/builddefs/generic_features.mk
index 9c869586255..dc34a642307 100644
--- a/builddefs/generic_features.mk
+++ b/builddefs/generic_features.mk
@@ -21,6 +21,7 @@ SPACE_CADET_ENABLE ?= yes
 GENERIC_FEATURES = \
     AUTO_SHIFT \
     AUTOCORRECT \
+    BOOTMAGIC \
     CAPS_WORD \
     COMBO \
     COMMAND \
diff --git a/data/constants/keycodes/extras/keycodes_canadian_french_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_canadian_french_0.0.1.hjson
new file mode 100644
index 00000000000..6fefd11f59d
--- /dev/null
+++ b/data/constants/keycodes/extras/keycodes_canadian_french_0.0.1.hjson
@@ -0,0 +1,407 @@
+{
+    "aliases": {
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ # │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ ^ │ ¸ │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ` │ < │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │ « │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ É │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+        "KC_GRV": {
+            "key": "FR_HASH",
+            "label": "#",
+        }
+        "KC_1": {
+            "key": "FR_1",
+            "label": "1",
+        }
+        "KC_2": {
+            "key": "FR_2",
+            "label": "2",
+        }
+        "KC_3": {
+            "key": "FR_3",
+            "label": "3",
+        }
+        "KC_4": {
+            "key": "FR_4",
+            "label": "4",
+        }
+        "KC_5": {
+            "key": "FR_5",
+            "label": "5",
+        }
+        "KC_6": {
+            "key": "FR_6",
+            "label": "6",
+        }
+        "KC_7": {
+            "key": "FR_7",
+            "label": "7",
+        }
+        "KC_8": {
+            "key": "FR_8",
+            "label": "8",
+        }
+        "KC_9": {
+            "key": "FR_9",
+            "label": "9",
+        }
+        "KC_0": {
+            "key": "FR_0",
+            "label": "0",
+        }
+        "KC_MINS": {
+            "key": "FR_MINS",
+            "label": "-",
+        }
+        "KC_EQL": {
+            "key": "FR_EQL",
+            "label": "=",
+        }
+        "KC_Q": {
+            "key": "FR_Q",
+            "label": "Q",
+        }
+        "KC_W": {
+            "key": "FR_W",
+            "label": "W",
+        }
+        "KC_E": {
+            "key": "FR_E",
+            "label": "E",
+        }
+        "KC_R": {
+            "key": "FR_R",
+            "label": "R",
+        }
+        "KC_T": {
+            "key": "FR_T",
+            "label": "T",
+        }
+        "KC_Y": {
+            "key": "FR_Y",
+            "label": "Y",
+        }
+        "KC_U": {
+            "key": "FR_U",
+            "label": "U",
+        }
+        "KC_I": {
+            "key": "FR_I",
+            "label": "I",
+        }
+        "KC_O": {
+            "key": "FR_O",
+            "label": "O",
+        }
+        "KC_P": {
+            "key": "FR_P",
+            "label": "P",
+        }
+        "KC_LBRC": {
+            "key": "FR_DCIR",
+            "label": "^ (dead)",
+        }
+        "KC_RBRC": {
+            "key": "FR_CEDL",
+            "label": "¸ (dead)",
+        }
+        "KC_A": {
+            "key": "FR_A",
+            "label": "A",
+        }
+        "KC_S": {
+            "key": "FR_S",
+            "label": "S",
+        }
+        "KC_D": {
+            "key": "FR_D",
+            "label": "D",
+        }
+        "KC_F": {
+            "key": "FR_F",
+            "label": "F",
+        }
+        "KC_G": {
+            "key": "FR_G",
+            "label": "G",
+        }
+        "KC_H": {
+            "key": "FR_H",
+            "label": "H",
+        }
+        "KC_J": {
+            "key": "FR_J",
+            "label": "J",
+        }
+        "KC_K": {
+            "key": "FR_K",
+            "label": "K",
+        }
+        "KC_L": {
+            "key": "FR_L",
+            "label": "L",
+        }
+        "KC_SCLN": {
+            "key": "FR_SCLN",
+            "label": ";",
+        }
+        "KC_QUOT": {
+            "key": "FR_DGRV",
+            "label": "` (dead)",
+        }
+        "KC_NUHS": {
+            "key": "FR_LABK",
+            "label": "<",
+        }
+        "KC_NUBS": {
+            "key": "FR_LDAQ",
+            "label": "«",
+        }
+        "KC_Z": {
+            "key": "FR_Z",
+            "label": "Z",
+        }
+        "KC_X": {
+            "key": "FR_X",
+            "label": "X",
+        }
+        "KC_C": {
+            "key": "FR_C",
+            "label": "C",
+        }
+        "KC_V": {
+            "key": "FR_V",
+            "label": "V",
+        }
+        "KC_B": {
+            "key": "FR_B",
+            "label": "B",
+        }
+        "KC_N": {
+            "key": "FR_N",
+            "label": "N",
+        }
+        "KC_M": {
+            "key": "FR_M",
+            "label": "M",
+        }
+        "KC_COMM": {
+            "key": "FR_COMM",
+            "label": ",",
+        }
+        "KC_DOT": {
+            "key": "FR_DOT",
+            "label": ".",
+        }
+        "KC_SLSH": {
+            "key": "FR_EACU",
+            "label": "É",
+        }
+/* Shifted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ | │ ! │ " │ / │ $ │ % │ ? │ & │ * │ ( │ ) │ _ │ + │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │ ¨ │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │   │   │   │   │   │   │   │   │   │ : │   │ > │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │ » │   │   │   │   │   │   │   │ ' │   │   │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+        "S(FR_HASH)": {
+            "key": "FR_PIPE",
+            "label": "|",
+        }
+        "S(FR_1)": {
+            "key": "FR_EXLM",
+            "label": "!",
+        }
+        "S(FR_2)": {
+            "key": "FR_DQUO",
+            "label": "\"",
+        }
+        "S(FR_3)": {
+            "key": "FR_SLSH",
+            "label": "/",
+        }
+        "S(FR_4)": {
+            "key": "FR_DLR",
+            "label": "$",
+        }
+        "S(FR_5)": {
+            "key": "FR_PERC",
+            "label": "%",
+        }
+        "S(FR_6)": {
+            "key": "FR_QUES",
+            "label": "?",
+        }
+        "S(FR_7)": {
+            "key": "FR_AMPR",
+            "label": "&",
+        }
+        "S(FR_8)": {
+            "key": "FR_ASTR",
+            "label": "*",
+        }
+        "S(FR_9)": {
+            "key": "FR_LPRN",
+            "label": "(",
+        }
+        "S(FR_0)": {
+            "key": "FR_RPRN",
+            "label": ")",
+        }
+        "S(FR_MINS)": {
+            "key": "FR_UNDS",
+            "label": "_",
+        }
+        "S(FR_EQL)": {
+            "key": "FR_PLUS",
+            "label": "+",
+        }
+        "S(FR_CEDL)": {
+            "key": "FR_DIAE",
+            "label": "¨ (dead)",
+        }
+        "S(FR_SCLN)": {
+            "key": "FR_COLN",
+            "label": ":",
+        }
+        "S(FR_LABK)": {
+            "key": "FR_RABK",
+            "label": ">",
+        }
+        "S(FR_LDAQ)": {
+            "key": "FR_RDAQ",
+            "label": "»",
+        }
+        "S(FR_COMM)": {
+            "key": "FR_QUOT",
+            "label": "'",
+        }
+/* AltGr symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ \ │ ± │ @ │ £ │ ¢ │ ¤ │ ¬ │ ¦ │ ² │ ³ │ ¼ │ ½ │ ¾ │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │   │   │   │   │   │   │   │   │ § │ ¶ │ [ │ ] │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │   │   │   │   │   │   │   │   │   │ ~ │ { │ } │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │ ° │   │   │   │   │   │   │ µ │ ¯ │ - │ ´ │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+        "ALGR(FR_HASH)": {
+            "key": "FR_BSLS",
+            "label": "\\",
+        }
+        "ALGR(FR_1)": {
+            "key": "FR_PLMN",
+            "label": "±",
+        }
+        "ALGR(FR_2)": {
+            "key": "FR_AT",
+            "label": "@",
+        }
+        "ALGR(FR_3)": {
+            "key": "FR_PND",
+            "label": "£",
+        }
+        "ALGR(FR_4)": {
+            "key": "FR_CENT",
+            "label": "¢",
+        }
+        "ALGR(FR_5)": {
+            "key": "FR_CURR",
+            "label": "¤",
+        }
+        "ALGR(FR_6)": {
+            "key": "FR_NOT",
+            "label": "¬",
+        }
+        "ALGR(FR_7)": {
+            "key": "FR_BRKP",
+            "label": "¦",
+        }
+        "ALGR(FR_8)": {
+            "key": "FR_SUP2",
+            "label": "²",
+        }
+        "ALGR(FR_9)": {
+            "key": "FR_SUP3",
+            "label": "³",
+        }
+        "ALGR(FR_0)": {
+            "key": "FR_QRTR",
+            "label": "¼",
+        }
+        "ALGR(FR_MINS)": {
+            "key": "FR_HALF",
+            "label": "½",
+        }
+        "ALGR(FR_EQL)": {
+            "key": "FR_TQTR",
+            "label": "¾",
+        }
+        "ALGR(FR_O)": {
+            "key": "FR_SECT",
+            "label": "§",
+        }
+        "ALGR(FR_P)": {
+            "key": "FR_PARA",
+            "label": "¶",
+        }
+        "ALGR(FR_DCIR)": {
+            "key": "FR_LBRC",
+            "label": "[",
+        }
+        "ALGR(FR_CEDL)": {
+            "key": "FR_RBRC",
+            "label": "]",
+        }
+        "ALGR(FR_SCLN)": {
+            "key": "FR_TILD",
+            "label": "~",
+        }
+        "ALGR(FR_DGRV)": {
+            "key": "FR_LCBR",
+            "label": "{",
+        }
+        "ALGR(FR_LABK)": {
+            "key": "FR_RCBR",
+            "label": "}",
+        }
+        "ALGR(FR_LDAQ)": {
+            "key": "FR_DEG",
+            "label": "°",
+        }
+        "ALGR(FR_M)": {
+            "key": "FR_MICR",
+            "label": "µ",
+        }
+        "ALGR(FR_COMM)": {
+            "key": "FR_MACR",
+            "label": "¯",
+        }
+        "ALGR(FR_DOT)": {
+            "key": "FR_SHYP",
+            "label": "­ (soft hyphen)",
+        }
+        "ALGR(FR_EACU)": {
+            "key": "FR_ACUT",
+            "label": "´ (dead)",
+        }
+    }
+}
diff --git a/data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson b/data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson
new file mode 100644
index 00000000000..fb1de29e6ed
--- /dev/null
+++ b/data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson
@@ -0,0 +1,343 @@
+{
+    "aliases": {
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ | │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ¿ │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ ´ │ + │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ñ │ { │ } │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+        "KC_GRV": {
+            "key": "ES_PIPE",
+            "label": "|",
+        }
+        "KC_1": {
+            "key": "ES_1",
+            "label": "1",
+        }
+        "KC_2": {
+            "key": "ES_2",
+            "label": "2",
+        }
+        "KC_3": {
+            "key": "ES_3",
+            "label": "3",
+        }
+        "KC_4": {
+            "key": "ES_4",
+            "label": "4",
+        }
+        "KC_5": {
+            "key": "ES_5",
+            "label": "5",
+        }
+        "KC_6": {
+            "key": "ES_6",
+            "label": "6",
+        }
+        "KC_7": {
+            "key": "ES_7",
+            "label": "7",
+        }
+        "KC_8": {
+            "key": "ES_8",
+            "label": "8",
+        }
+        "KC_9": {
+            "key": "ES_9",
+            "label": "9",
+        }
+        "KC_0": {
+            "key": "ES_0",
+            "label": "0",
+        }
+        "KC_MINS": {
+            "key": "ES_QUOT",
+            "label": "'",
+        }
+        "KC_EQL": {
+            "key": "ES_IQUE",
+            "label": "¿",
+        }
+        "KC_Q": {
+            "key": "ES_Q",
+            "label": "Q",
+        }
+        "KC_W": {
+            "key": "ES_W",
+            "label": "W",
+        }
+        "KC_E": {
+            "key": "ES_E",
+            "label": "E",
+        }
+        "KC_R": {
+            "key": "ES_R",
+            "label": "R",
+        }
+        "KC_T": {
+            "key": "ES_T",
+            "label": "T",
+        }
+        "KC_Y": {
+            "key": "ES_Y",
+            "label": "Y",
+        }
+        "KC_U": {
+            "key": "ES_U",
+            "label": "U",
+        }
+        "KC_I": {
+            "key": "ES_I",
+            "label": "I",
+        }
+        "KC_O": {
+            "key": "ES_O",
+            "label": "O",
+        }
+        "KC_P": {
+            "key": "ES_P",
+            "label": "P",
+        }
+        "KC_LBRC": {
+            "key": "ES_ACUT",
+            "label": "´ (dead)",
+        }
+        "KC_RBRC": {
+            "key": "ES_PLUS",
+            "label": "+",
+        }
+        "KC_A": {
+            "key": "ES_A",
+            "label": "A",
+        }
+        "KC_S": {
+            "key": "ES_S",
+            "label": "S",
+        }
+        "KC_D": {
+            "key": "ES_D",
+            "label": "D",
+        }
+        "KC_F": {
+            "key": "ES_F",
+            "label": "F",
+        }
+        "KC_G": {
+            "key": "ES_G",
+            "label": "G",
+        }
+        "KC_H": {
+            "key": "ES_H",
+            "label": "H",
+        }
+        "KC_J": {
+            "key": "ES_J",
+            "label": "J",
+        }
+        "KC_K": {
+            "key": "ES_K",
+            "label": "K",
+        }
+        "KC_L": {
+            "key": "ES_L",
+            "label": "L",
+        }
+        "KC_SCLN": {
+            "key": "ES_NTIL",
+            "label": "Ñ",
+        }
+        "KC_QUOT": {
+            "key": "ES_LCBR",
+            "label": "{",
+        }
+        "KC_NUHS": {
+            "key": "ES_RCBR",
+            "label": "}",
+        }
+        "KC_NUBS": {
+            "key": "ES_LABK",
+            "label": "<",
+        }
+        "KC_Z": {
+            "key": "ES_Z",
+            "label": "Z",
+        }
+        "KC_X": {
+            "key": "ES_X",
+            "label": "X",
+        }
+        "KC_C": {
+            "key": "ES_C",
+            "label": "C",
+        }
+        "KC_V": {
+            "key": "ES_V",
+            "label": "V",
+        }
+        "KC_B": {
+            "key": "ES_B",
+            "label": "B",
+        }
+        "KC_N": {
+            "key": "ES_N",
+            "label": "N",
+        }
+        "KC_M": {
+            "key": "ES_M",
+            "label": "M",
+        }
+        "KC_COMM": {
+            "key": "ES_COMM",
+            "label": ",",
+        }
+        "KC_DOT": {
+            "key": "ES_DOT",
+            "label": ".",
+        }
+        "KC_SLSH": {
+            "key": "ES_MINS",
+            "label": "-",
+        }
+/* Shifted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ ° │ ! │ " │ # │ $ │ % │ & │ / │ ( │ ) │ = │ ? │ ¡ │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │   │   │   │   │   │   │   │   │   │   │ ¨ │ * │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │   │   │   │   │   │   │   │   │   │   │ [ │ ] │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │ > │   │   │   │   │   │   │   │ ; │ : │ _ │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+        "S(ES_PIPE)": {
+            "key": "ES_MORD",
+            "label": "°",
+        }
+        "S(ES_1)": {
+            "key": "ES_EXLM",
+            "label": "!",
+        }
+        "S(ES_2)": {
+            "key": "ES_DQUO",
+            "label": "\"",
+        }
+        "S(ES_3)": {
+            "key": "ES_NUMB",
+            "label": "#",
+        }
+        "S(ES_4)": {
+            "key": "ES_DLR",
+            "label": "$",
+        }
+        "S(ES_5)": {
+            "key": "ES_PERC",
+            "label": "%",
+        }
+        "S(ES_6)": {
+            "key": "ES_AMPR",
+            "label": "&",
+        }
+        "S(ES_7)": {
+            "key": "ES_SLSH",
+            "label": "/",
+        }
+        "S(ES_8)": {
+            "key": "ES_LPRN",
+            "label": "(",
+        }
+        "S(ES_9)": {
+            "key": "ES_RPRN",
+            "label": ")",
+        }
+        "S(ES_0)": {
+            "key": "ES_EQL",
+            "label": "=",
+        }
+        "S(ES_QUOT)": {
+            "key": "ES_QUES",
+            "label": "?",
+        }
+        "S(ES_IQUE)": {
+            "key": "ES_IEXL",
+            "label": "¡",
+        }
+        "S(ES_ACUT)": {
+            "key": "ES_DIAE",
+            "label": "¨ (dead)",
+        }
+        "S(ES_PLUS)": {
+            "key": "ES_ASTR",
+            "label": "*",
+        }
+        "S(ES_LCBR)": {
+            "key": "ES_LBRC",
+            "label": "[",
+        }
+        "S(ES_RCBR)": {
+            "key": "ES_RBRC",
+            "label": "]",
+        }
+        "S(ES_LABK)": {
+            "key": "ES_RABK",
+            "label": ">",
+        }
+        "S(ES_COMM)": {
+            "key": "ES_SCLN",
+            "label": ";",
+        }
+        "S(ES_DOT)": {
+            "key": "ES_COLN",
+            "label": ":",
+        }
+        "S(ES_MINS)": {
+            "key": "ES_UNDS",
+            "label": "_",
+        }
+/* AltGr symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ ¬ │   │   │   │   │   │   │   │   │   │   │ \ │   │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │ @ │   │   │   │   │   │   │   │   │   │   │ ~ │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │   │   │   │   │   │   │   │   │   │   │ ^ │ ` │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │   │   │   │   │   │   │   │   │   │   │   │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+        "ALGR(ES_PIPE)": {
+            "key": "ES_NOT",
+            "label": "¬",
+        }
+        "ALGR(ES_QUOT)": {
+            "key": "ES_BSLS",
+            "label": "\\",
+        }
+        "ALGR(ES_Q)": {
+            "key": "ES_AT",
+            "label": "@",
+        }
+        "ALGR(ES_PLUS)": {
+            "key": "ES_TILD",
+            "label": "~",
+        }
+        "ALGR(ES_LCBR)": {
+            "key": "ES_CIRC",
+            "label": "^",
+        }
+        "ALGR(KC_NUHS)": {
+            "key": "ES_GRV",
+            "label": "`",
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/mappings/defaults.hjson b/data/mappings/defaults.hjson
index 4a9f06c0da5..71902c92d68 100644
--- a/data/mappings/defaults.hjson
+++ b/data/mappings/defaults.hjson
@@ -45,6 +45,11 @@
             "bootloader": "rp2040",
             "processor": "RP2040"
         },
+        "imera": {
+            "processor": "RP2040",
+            "bootloader": "rp2040",
+            "board": "QMK_PM2040"
+        },
         "kb2040": {
             "board": "QMK_PM2040",
             "bootloader": "rp2040",
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index 26b437b5133..e2e9569372e 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -3,7 +3,7 @@
 {
     // Format:
     // <config.h key>: {"info_key": <info.json key>, ["value_type": <value_type>], ["to_json": <true/false>], ["to_c": <true/false>]}
-    // value_type: one of "array", "array.int", "bool", "int", "hex", "list", "mapping", "str", "raw"
+    // value_type: one of "array", "array.int", "bool, "flag", "int", "hex", "list", "mapping", "str", "raw"
     // to_json: Default `true`. Set to `false` to exclude this mapping from info.json
     // to_c: Default `true`. Set to `false` to exclude this mapping from config.h
     // warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places
@@ -17,12 +17,14 @@
     "APA102_DI_PIN": {"info_key": "apa102.data_pin"},
 
     // Audio
-    "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "bool"},
-    "SENDSTRING_BELL": {"info_key": "audio.macro_beep", "value_type": "bool"},
+    "AUDIO_DEFAULT_ON": {"info_key": "audio.default.on", "value_type": "bool"},
+    "AUDIO_DEFAULT_CLICKY_ON": {"info_key": "audio.default.clicky", "value_type": "bool"},
+    "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "flag"},
+    "SENDSTRING_BELL": {"info_key": "audio.macro_beep", "value_type": "flag"},
 
     // Backlight
-    "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "bool"},
-    "BACKLIGHT_CAPS_LOCK": {"info_key": "backlight.as_caps_lock", "value_type": "bool"},
+    "BACKLIGHT_BREATHING": {"info_key": "backlight.breathing", "value_type": "flag"},
+    "BACKLIGHT_CAPS_LOCK": {"info_key": "backlight.as_caps_lock", "value_type": "flag"},
     "BACKLIGHT_LEVELS": {"info_key": "backlight.levels", "value_type": "int"},
     "BACKLIGHT_LIMIT_VAL": {"info_key": "backlight.max_brightness", "value_type": "int"},
     "BACKLIGHT_ON_STATE": {"info_key": "backlight.on_state", "value_type": "int"},
@@ -34,16 +36,16 @@
     "BACKLIGHT_DEFAULT_LEVEL": {"info_key": "backlight.default.brightness", "value_type": "int"},
 
     // Bootmagic
-    "BOOTMAGIC_LITE_COLUMN": {"info_key": "bootmagic.matrix.1", "value_type": "int"},
-    "BOOTMAGIC_LITE_COLUMN_RIGHT": {"info_key": "split.bootmagic.matrix.1", "value_type": "int"},
-    "BOOTMAGIC_LITE_ROW": {"info_key": "bootmagic.matrix.0", "value_type": "int"},
-    "BOOTMAGIC_LITE_ROW_RIGHT": {"info_key": "split.bootmagic.matrix.0", "value_type": "int"},
+    "BOOTMAGIC_COLUMN": {"info_key": "bootmagic.matrix.1", "value_type": "int"},
+    "BOOTMAGIC_COLUMN_RIGHT": {"info_key": "split.bootmagic.matrix.1", "value_type": "int"},
+    "BOOTMAGIC_ROW": {"info_key": "bootmagic.matrix.0", "value_type": "int"},
+    "BOOTMAGIC_ROW_RIGHT": {"info_key": "split.bootmagic.matrix.0", "value_type": "int"},
 
     // Caps Word
-    "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "bool"},
+    "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "flag"},
     "CAPS_WORD_IDLE_TIMEOUT": {"info_key": "caps_word.idle_timeout", "value_type": "int"},
-    "CAPS_WORD_INVERT_ON_SHIFT": {"info_key": "caps_word.invert_on_shift", "value_type": "bool"},
-    "DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.double_tap_shift_turns_on", "value_type": "bool"},
+    "CAPS_WORD_INVERT_ON_SHIFT": {"info_key": "caps_word.invert_on_shift", "value_type": "flag"},
+    "DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.double_tap_shift_turns_on", "value_type": "flag"},
 
     // Combos
     "COMBO_TERM": {"info_key": "combo.term", "value_type": "int"},
@@ -69,17 +71,17 @@
     "LED_PIN_ON_STATE": {"info_key": "indicators.on_state", "value_type": "int"},
 
     // Leader Key
-    "LEADER_PER_KEY_TIMING": {"info_key": "leader_key.timing", "value_type": "bool"},
-    "LEADER_KEY_STRICT_KEY_PROCESSING": {"info_key": "leader_key.strict_processing", "value_type": "bool"},
+    "LEADER_PER_KEY_TIMING": {"info_key": "leader_key.timing", "value_type": "flag"},
+    "LEADER_KEY_STRICT_KEY_PROCESSING": {"info_key": "leader_key.strict_processing", "value_type": "flag"},
     "LEADER_TIMEOUT": {"info_key": "leader_key.timeout", "value_type": "int"},
 
     // LED Matrix
-    "LED_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "led_matrix.sleep", "value_type": "bool"},
     "LED_MATRIX_CENTER": {"info_key": "led_matrix.center_point", "value_type": "array.int"},
-    "LED_MATRIX_KEYRELEASES": {"info_key": "led_matrix.react_on_keyup", "value_type": "bool"},
+    "LED_MATRIX_KEYRELEASES": {"info_key": "led_matrix.react_on_keyup", "value_type": "flag"},
     "LED_MATRIX_LED_FLUSH_LIMIT": {"info_key": "led_matrix.led_flush_limit", "value_type": "int"},
     "LED_MATRIX_LED_PROCESS_LIMIT": {"info_key": "led_matrix.led_process_limit", "value_type": "int", "to_json": false},
     "LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
+    "LED_MATRIX_SLEEP": {"info_key": "led_matrix.sleep", "value_type": "flag"},
     "LED_MATRIX_SPD_STEP": {"info_key": "led_matrix.speed_steps", "value_type": "int"},
     "LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"},
     "LED_MATRIX_TIMEOUT": {"info_key": "led_matrix.timeout", "value_type": "int"},
@@ -90,8 +92,8 @@
     "LED_MATRIX_DEFAULT_SPD": {"info_key": "led_matrix.default.speed", "value_type": "int"},
 
     // Locking Switch
-    "LOCKING_SUPPORT_ENABLE": {"info_key": "qmk.locking.enabled", "value_type": "bool"},
-    "LOCKING_RESYNC_ENABLE": {"info_key": "qmk.locking.resync", "value_type": "bool"},
+    "LOCKING_SUPPORT_ENABLE": {"info_key": "qmk.locking.enabled", "value_type": "flag"},
+    "LOCKING_RESYNC_ENABLE": {"info_key": "qmk.locking.resync", "value_type": "flag"},
 
     // LUFA Bootloader
     "QMK_ESC_INPUT": {"info_key": "qmk_lufa_bootloader.esc_input"},
@@ -102,7 +104,7 @@
     // Matrix
     "DEBOUNCE": {"info_key": "debounce", "value_type": "int"},
     "DIODE_DIRECTION": {"info_key": "diode_direction"},
-    "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "bool"},
+    "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "flag"},
     "MATRIX_INPUT_PRESSED_STATE": {"info_key": "matrix_pins.input_pressed_state", "value_type": "int"},
     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
 
@@ -122,14 +124,14 @@
     "PS2_DATA_PIN": {"info_key": "ps2.data_pin"},
 
     // RGB Matrix
-    "RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "rgb_matrix.sleep", "value_type": "bool"},
     "RGB_MATRIX_CENTER": {"info_key": "rgb_matrix.center_point", "value_type": "array.int"},
     "RGB_MATRIX_HUE_STEP": {"info_key": "rgb_matrix.hue_steps", "value_type": "int"},
-    "RGB_MATRIX_KEYRELEASES": {"info_key": "rgb_matrix.react_on_keyup", "value_type": "bool"},
+    "RGB_MATRIX_KEYRELEASES": {"info_key": "rgb_matrix.react_on_keyup", "value_type": "flag"},
     "RGB_MATRIX_LED_FLUSH_LIMIT": {"info_key": "rgb_matrix.led_flush_limit", "value_type": "int"},
     "RGB_MATRIX_LED_PROCESS_LIMIT": {"info_key": "rgb_matrix.led_process_limit", "value_type": "int", "to_json": false},
     "RGB_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "rgb_matrix.max_brightness", "value_type": "int"},
     "RGB_MATRIX_SAT_STEP": {"info_key": "rgb_matrix.sat_steps", "value_type": "int"},
+    "RGB_MATRIX_SLEEP": {"info_key": "rgb_matrix.sleep", "value_type": "flag"},
     "RGB_MATRIX_SPD_STEP": {"info_key": "rgb_matrix.speed_steps", "value_type": "int"},
     "RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"},
     "RGB_MATRIX_TIMEOUT": {"info_key": "rgb_matrix.timeout", "value_type": "int"},
@@ -142,25 +144,25 @@
     "RGB_MATRIX_DEFAULT_SPD": {"info_key": "rgb_matrix.default.speed", "value_type": "int"},
 
     // RGBLight
-    "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"},
     "RGBLED_SPLIT": {"info_key": "rgblight.split_count", "value_type": "array.int"},
     "RGBLIGHT_HUE_STEP": {"info_key": "rgblight.hue_steps", "value_type": "int"},
-    "RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "bool"},
-    "RGBLIGHT_LAYERS": {"info_key": "rgblight.layers.enabled", "value_type": "bool"},
-    "RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF": {"info_key": "rgblight.layers.override_rgb", "value_type": "bool"},
+    "RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "flag"},
+    "RGBLIGHT_LAYERS": {"info_key": "rgblight.layers.enabled", "value_type": "flag"},
+    "RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF": {"info_key": "rgblight.layers.override_rgb", "value_type": "flag"},
+    "RGBLIGHT_LED_COUNT": {"info_key": "rgblight.led_count", "value_type": "int"},
     "RGBLIGHT_LED_MAP": {"info_key": "rgblight.led_map", "value_type": "array.int"},
     "RGBLIGHT_LIMIT_VAL": {"info_key": "rgblight.max_brightness", "value_type": "int"},
     "RGBLIGHT_MAX_LAYERS": {"info_key": "rgblight.layers.max", "value_type": "int"},
     "RGBLIGHT_SAT_STEP": {"info_key": "rgblight.saturation_steps", "value_type": "int"},
-    "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "bool"},
-    "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"},
+    "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "flag"},
+    "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "flag"},
     "RGBLIGHT_VAL_STEP": {"info_key": "rgblight.brightness_steps", "value_type": "int"},
     "RGBLIGHT_DEFAULT_ON": {"info_key": "rgblight.default.on", "value_type": "bool"},
     "RGBLIGHT_DEFAULT_HUE": {"info_key": "rgblight.default.hue", "value_type": "int"},
     "RGBLIGHT_DEFAULT_SAT": {"info_key": "rgblight.default.sat", "value_type": "int"},
     "RGBLIGHT_DEFAULT_VAL": {"info_key": "rgblight.default.val", "value_type": "int"},
     "RGBLIGHT_DEFAULT_SPD": {"info_key": "rgblight.default.speed", "value_type": "int"},
-    "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"},
+    "RGBW": {"info_key": "rgblight.rgbw", "value_type": "flag"},
 
     // Secure
     "SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"},
@@ -172,37 +174,37 @@
     "SOFT_SERIAL_SPEED": {"info_key": "split.soft_serial_speed"},
     "SPLIT_HAND_MATRIX_GRID": {"info_key": "split.handedness.matrix_grid", "value_type": "array", "to_c": false},
     "SPLIT_HAND_PIN": {"info_key": "split.handedness.pin"},
-    "SPLIT_USB_DETECT": {"info_key": "split.usb_detect.enabled", "value_type": "bool"},
+    "SPLIT_USB_DETECT": {"info_key": "split.usb_detect.enabled", "value_type": "flag"},
     "SPLIT_USB_TIMEOUT": {"info_key": "split.usb_detect.timeout", "value_type": "int"},
     "SPLIT_USB_TIMEOUT_POLL": {"info_key": "split.usb_detect.polling_interval", "value_type": "int"},
-    "SPLIT_WATCHDOG_ENABLE": {"info_key": "split.transport.watchdog", "value_type": "bool"},
+    "SPLIT_WATCHDOG_ENABLE": {"info_key": "split.transport.watchdog", "value_type": "flag"},
     "SPLIT_WATCHDOG_TIMEOUT": {"info_key": "split.transport.watchdog_timeout", "value_type": "int"},
-    "SPLIT_ACTIVITY_ENABLE": {"info_key": "split.transport.sync.activity", "value_type": "bool"},
-    "SPLIT_DETECTED_OS_ENABLE": {"info_key": "split.transport.sync.detected_os", "value_type": "bool"},
-    "SPLIT_HAPTIC_ENABLE": {"info_key": "split.transport.sync.haptic", "value_type": "bool"},
-    "SPLIT_LAYER_STATE_ENABLE": {"info_key": "split.transport.sync.layer_state", "value_type": "bool"},
-    "SPLIT_LED_STATE_ENABLE": {"info_key": "split.transport.sync.indicators", "value_type": "bool"},
-    "SPLIT_TRANSPORT_MIRROR": {"info_key": "split.transport.sync.matrix_state", "value_type": "bool"},
-    "SPLIT_MODS_ENABLE": {"info_key": "split.transport.sync.modifiers", "value_type": "bool"},
-    "SPLIT_OLED_ENABLE": {"info_key": "split.transport.sync.oled", "value_type": "bool"},
-    "SPLIT_ST7565_ENABLE": {"info_key": "split.transport.sync.st7565", "value_type": "bool"},
-    "SPLIT_WPM_ENABLE": {"info_key": "split.transport.sync.wpm", "value_type": "bool"},
+    "SPLIT_ACTIVITY_ENABLE": {"info_key": "split.transport.sync.activity", "value_type": "flag"},
+    "SPLIT_DETECTED_OS_ENABLE": {"info_key": "split.transport.sync.detected_os", "value_type": "flag"},
+    "SPLIT_HAPTIC_ENABLE": {"info_key": "split.transport.sync.haptic", "value_type": "flag"},
+    "SPLIT_LAYER_STATE_ENABLE": {"info_key": "split.transport.sync.layer_state", "value_type": "flag"},
+    "SPLIT_LED_STATE_ENABLE": {"info_key": "split.transport.sync.indicators", "value_type": "flag"},
+    "SPLIT_TRANSPORT_MIRROR": {"info_key": "split.transport.sync.matrix_state", "value_type": "flag"},
+    "SPLIT_MODS_ENABLE": {"info_key": "split.transport.sync.modifiers", "value_type": "flag"},
+    "SPLIT_OLED_ENABLE": {"info_key": "split.transport.sync.oled", "value_type": "flag"},
+    "SPLIT_ST7565_ENABLE": {"info_key": "split.transport.sync.st7565", "value_type": "flag"},
+    "SPLIT_WPM_ENABLE": {"info_key": "split.transport.sync.wpm", "value_type": "flag"},
 
     // Tapping
-    "HOLD_ON_OTHER_KEY_PRESS": {"info_key": "tapping.hold_on_other_key_press", "value_type": "bool"},
-    "HOLD_ON_OTHER_KEY_PRESS_PER_KEY": {"info_key": "tapping.hold_on_other_key_press_per_key", "value_type": "bool"},
-    "PERMISSIVE_HOLD": {"info_key": "tapping.permissive_hold", "value_type": "bool"},
-    "PERMISSIVE_HOLD_PER_KEY": {"info_key": "tapping.permissive_hold_per_key", "value_type": "bool"},
-    "RETRO_TAPPING": {"info_key": "tapping.retro", "value_type": "bool"},
-    "RETRO_TAPPING_PER_KEY": {"info_key": "tapping.retro_per_key", "value_type": "bool"},
+    "HOLD_ON_OTHER_KEY_PRESS": {"info_key": "tapping.hold_on_other_key_press", "value_type": "flag"},
+    "HOLD_ON_OTHER_KEY_PRESS_PER_KEY": {"info_key": "tapping.hold_on_other_key_press_per_key", "value_type": "flag"},
+    "PERMISSIVE_HOLD": {"info_key": "tapping.permissive_hold", "value_type": "flag"},
+    "PERMISSIVE_HOLD_PER_KEY": {"info_key": "tapping.permissive_hold_per_key", "value_type": "flag"},
+    "RETRO_TAPPING": {"info_key": "tapping.retro", "value_type": "flag"},
+    "RETRO_TAPPING_PER_KEY": {"info_key": "tapping.retro_per_key", "value_type": "flag"},
     "TAP_CODE_DELAY": {"info_key": "qmk.tap_keycode_delay", "value_type": "int"},
     "TAP_HOLD_CAPS_DELAY": {"info_key": "qmk.tap_capslock_delay", "value_type": "int"},
     "TAPPING_TERM": {"info_key": "tapping.term", "value_type": "int"},
-    "TAPPING_TERM_PER_KEY": {"info_key": "tapping.term_per_key", "value_type": "bool"},
+    "TAPPING_TERM_PER_KEY": {"info_key": "tapping.term_per_key", "value_type": "flag"},
     "TAPPING_TOGGLE": {"info_key": "tapping.toggle", "value_type": "int"},
 
     // USB
-    "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "bool"},
+    "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "flag"},
     "USB_MAX_POWER_CONSUMPTION": {"info_key": "usb.max_power", "value_type": "int"},
     "USB_POLLING_INTERVAL_MS": {"info_key": "usb.polling_interval", "value_type": "int"},
     "USB_SUSPEND_WAKEUP_DELAY": {"info_key": "usb.suspend_wakeup_delay", "value_type": "int"},
@@ -217,16 +219,18 @@
     // Items we want flagged in lint
     "DEBOUNCING_DELAY": {"info_key": "_invalid.debouncing_delay", "invalid": true, "replace_with": "DEBOUNCE"},
     "DESCRIPTION": {"info_key": "_invalid.usb_description", "invalid": true},
-    "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_invalid.ignore_mod_tap_interrupt", "value_type": "bool", "invalid": true},
-    "IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "_invalid.ignore_mod_tap_interrupt_per_key", "invalid": true}
+    "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_invalid.ignore_mod_tap_interrupt", "value_type": "flag", "invalid": true},
+    "IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "_invalid.ignore_mod_tap_interrupt_per_key", "invalid": true},
+    "LED_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.led_matrix_sleep", "invalid": true, "replace_with": "LED_MATRIX_SLEEP"},
     "NO_ACTION_FUNCTION": {"info_key": "_invalid.no_action_function", "invalid": true},
     "NO_ACTION_MACRO": {"info_key": "_invalid.no_action_macro", "invalid": true},
     "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
     "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
     "RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"},
-    "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "bool", "invalid": true},
-    "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "bool", "deprecated": true},
-    "TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "bool", "deprecated": true},
+    "RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.rgb_matrix_sleep", "invalid": true, "replace_with": "RGB_MATRIX_SLEEP"},
+    "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "flag", "invalid": true},
+    "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "flag", "deprecated": true},
+    "TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "flag", "deprecated": true},
     "UNUSED_PINS": {"info_key": "_invalid.unused_pins", "deprecated": true},
     "COMBO_COUNT": {"info_key": "_invalid.combo.count", "invalid": true},
 
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index 02fc2bee9de..fc25eb3328b 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -21,6 +21,7 @@
     "DEBOUNCE_TYPE": {"info_key": "build.debounce_type"},
     "EEPROM_DRIVER": {"info_key": "eeprom.driver"},
     "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
+    "ENCODER_DRIVER": {"info_key": "encoder.driver"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
     "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
     "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 90f32ee6acc..29a7a719f38 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -185,6 +185,12 @@
     "eek": {
         "target": "eek/silk_down"
     },
+    "epoch80": {
+        "target": "kbdfans/epoch80"
+    },
+    "era/klein": {
+        "target": "era/sirind/klein_sd"
+	},
     "ergodone": {
         "target": "ktec/ergodone"
     },
@@ -284,6 +290,12 @@
     "honeycomb": {
         "target": "keyhive/honeycomb"
     },
+    "hub16": {
+        "target": "joshajohnson/hub16"
+    },
+    "hub20": {
+        "target": "joshajohnson/hub20"
+    },
     "idb_60": {
         "target": "idb/idb_60"
     },
@@ -302,6 +314,9 @@
     "jj50": {
         "target": "kprepublic/jj50"
     },
+    "jm60": {
+        "target": "kbdfans/jm60"
+    },
     "jones": {
         "target": "jones/v03_1"
     },
@@ -326,12 +341,48 @@
     "keycapsss/plaid_pad": {
         "target": "keycapsss/plaid_pad/rev1"
     },
+    "kira75": {
+        "target": "kira/kira75"
+    },
+    "kira80": {
+        "target": "kira/kira80"
+    },
     "kudox": {
-        "target": "kudox/rev1"
+        "target": "kumaokobo/kudox/rev1"
+    },
+    "kudox/columner": {
+        "target": "kumaokobo/kudox/columner"
+    },
+    "kudox/rev1": {
+        "target": "kumaokobo/kudox/rev1"
+    },
+    "kudox/rev2": {
+        "target": "kumaokobo/kudox/rev2"
+    },
+    "kudox/rev3": {
+        "target": "kumaokobo/kudox/rev3"
+    },
+    "kudox_full": {
+        "target": "kumaokobo/kudox_full/rev1"
+    },
+    "kudox_full/rev1": {
+        "target": "kumaokobo/kudox_full/rev1"
+    },
+    "kudox_game": {
+        "target": "kumaokobo/kudox_game/rev1"
+    },
+    "kudox_game/rev1": {
+        "target": "kumaokobo/kudox_game/rev1"
+    },
+    "kudox_game/rev2": {
+        "target": "kumaokobo/kudox_game/rev2"
     },
     "kyria": {
         "target": "splitkb/kyria"
     },
+    "laser_ninja/pumpkin_pad": {
+        "target": "laser_ninja/pumpkinpad"
+    },
     "lattice60": {
         "target": "keyhive/lattice60"
     },
@@ -446,6 +497,15 @@
     "minim": {
         "target": "matthewdias/minim"
     },
+    "mnk1800s": {
+        "target": "monokei/mnk1800s"
+    },
+    "mnk50": {
+        "target": "monokei/mnk50"
+    },
+    "mnk75": {
+        "target": "monokei/mnk75"
+    },
     "model01": {
         "target": "keyboardio/model01"
     },
@@ -458,6 +518,9 @@
     "montsinger/rebound": {
         "target": "montsinger/rebound/rev1"
     },
+    "moonlander": {
+        "target": "zsa/moonlander"
+    },
     "mschwingen/modelm": {
         "target": "ibm/model_m/mschwingen"
     },
@@ -485,6 +548,15 @@
     "peiorisboards/ixora": {
         "target": "coarse/ixora"
     },
+    "pico": {
+        "target": "kumaokobo/pico/65keys"
+    },
+    "pico/65keys": {
+        "target": "kumaokobo/pico/65keys"
+    },
+    "pico/70keys": {
+        "target": "kumaokobo/pico/70keys"
+    },
     "plaid": {
         "target": "dm9records/plaid"
     },
@@ -530,6 +602,9 @@
     "ramonimbao/mona": {
         "target": "rmi_kb/mona/v1"
     },
+    "redox_w": {
+        "target": "redox/wireless"
+    },
     "rgbkb/pan": {
         "target": "rgbkb/pan/rev1/32a"
     },
@@ -798,6 +873,12 @@
     "eggman": {
         "target": "qpockets/eggman"
     },
+    "enter67": {
+        "target": "kezewa/enter67"
+    },
+    "enter80": {
+        "target": "kezewa/enter80"
+    },
     "ergo42": {
         "target": "biacco42/ergo42"
     },
@@ -819,9 +900,15 @@
     "espectro": {
         "target": "mechkeys/espectro"
     },
+    "eu_isolation": {
+        "target": "p3d/eu_isolation"
+    },
     "felix": {
         "target": "unikeyboard/felix"
     },
+    "flygone60/rev3": {
+        "target": "shandoncodes/flygone60/rev3"
+    },
     "four_banger": {
         "target": "bpiphany/four_banger"
     },
@@ -915,6 +1002,12 @@
     "keychron/q4": {
         "target": "keychron/q4/ansi/v1"
     }
+    "kmac": {
+        "target": "kbdmania/kmac"
+    }
+    "kmac_pad": {
+        "target": "kbdmania/kmac_pad"
+    }
     "kprepublic/bm40hsrgb": {
         "target": "kprepublic/bm40hsrgb/rev1"
     },
@@ -924,6 +1017,9 @@
     "kprepublic/bm68hsrgb": {
         "target": "kprepublic/bm68hsrgb/rev1"
     },
+    "late9/rev1": {
+        "target": "rookiebwoy/late9/rev1"
+    },
     "latin17rgb": {
         "target": "latincompass/latin17rgb"
     },
@@ -948,6 +1044,12 @@
     "launchpad/rev1": {
         "target": "maple_computing/launchpad/rev1"
     },
+    "lefty": {
+        "target": "smoll/lefty/rev2"
+    },
+    "lefty/rev1": {
+        "target": "smoll/lefty/rev1"
+    },
     "lck75": {
         "target": "lyso1/lck75"
     },
@@ -963,9 +1065,21 @@
     "ls_60": {
         "target": "weirdo/ls_60"
     },
+    "lpad": {
+        "target": "laneware/lpad"
+    },
+    "lw67": {
+        "target": "laneware/lw67"
+    },
+    "lw75": {
+        "target": "laneware/lw75"
+    },
     "m3n3van": {
         "target": "matthewdias/m3n3van"
     },
+    "macro1": {
+        "target": "laneware/macro1"
+    },
     "massdrop/thekey": {
         "target": "drop/thekey/v1"
     },
@@ -990,9 +1104,21 @@
     "melody96": {
         "target": "ymdk/melody96"
     },
+    "miniaxe": {
+        "target": "kagizaraya/miniaxe"
+    },
     "minidox/rev1": {
         "target": "maple_computing/minidox/rev1"
     },
+    "mino/hotswap": {
+        "target": "shandoncodes/mino/hotswap"
+    },
+    "mino_plus/hotswap": {
+        "target": "shandoncodes/mino_plus/hotswap"
+    },
+    "mino_plus/soldered": {
+        "target": "shandoncodes/mino_plus/soldered"
+    },
     "mio": {
         "target": "recompile_keys/mio"
     },
@@ -1047,6 +1173,9 @@
     "nebula68b": {
         "target": "spaceholdings/nebula68b"
     },
+    "neopad/rev1": {
+        "target": "rookiebwoy/neopad/rev1"
+    },
     "niu_mini": {
         "target": "kbdfans/niu_mini"
     },
@@ -1101,6 +1230,12 @@
     "pursuit40": {
         "target": "checkerboards/pursuit40"
     },
+    "pw88": {
+        "target": "smoll/pw88"
+    },
+    "q4z": {
+        "target": "p3d/q4z"
+    },
     "qaz": {
         "target": "tominabox1/qaz"
     },
@@ -1110,6 +1245,9 @@
     "rabbit_capture_plan": {
         "target": "kakunpc/rabbit_capture_plan"
     },
+    "raindrop": {
+        "target": "laneware/raindrop"
+    },
     "ramonimbao/aelith": {
         "target": "rmi_kb/aelith"
     },
@@ -1176,6 +1314,9 @@
     "reviung61": {
         "target": "reviung/reviung61"
     },
+    "riot_pad": {
+        "target": "shandoncodes/riot_pad"
+    },
     "runner3680/3x6": {
         "target": "omkbd/runner3680/3x6"
     },
@@ -1230,6 +1371,9 @@
     "space_space/rev2": {
         "target": "qpockets/space_space/rev2"
     },
+    "spacey": {
+        "target": "p3d/spacey"
+    },
     "spiderisland/winry25tc": {
         "target": "winry/winry25tc"
     },
@@ -1260,6 +1404,9 @@
     "suihankey/split": {
         "target": "kakunpc/suihankey/split"
     },
+    "synapse": {
+        "target": "p3d/synapse"
+    },
     "the_ruler": {
         "target": "maple_computing/the_ruler"
     },
@@ -1281,6 +1428,9 @@
     "tronguylabs/m122_3270": {
         "target": "ibm/model_m_122/m122_3270/teensy"
     },
+    "tw40": {
+        "target": "p3d/tw40"
+    },
     "ua62": {
         "target": "nacly/ua62"
     },
@@ -1299,6 +1449,9 @@
     "vn66": {
         "target": "hnahkb/vn66"
     },
+    "w1_at": {
+        "target": "geonworks/w1_at"
+    },
     "wallaby": {
         "target": "kkatano/wallaby"
     },
@@ -1347,6 +1500,12 @@
     "yurei": {
         "target": "kkatano/yurei"
     },
+    "z12": {
+        "target": "zigotica/z12"
+    },
+    "z34": {
+        "target": "zigotica/z34"
+    },
     "zinc": {
         "target": "25keys/zinc"
     },
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index e04b8f62e6d..e52ba032f28 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -6,6 +6,10 @@
         "encoder_config": {
             "type": "object",
             "properties": {
+                "driver": {
+                    "type": "string",
+                    "enum": ["custom", "quadrature"]
+                },
                 "rotary": {
                     "type": "array",
                     "items": {
@@ -24,14 +28,12 @@
         "dip_switch_config": {
             "type": "object",
             "properties": {
-                "pins": {
-                    "$ref": "qmk.definitions.v1#/mcu_pin_array"
-                }
+                "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}
             }
-        },
+        }
     },
     "type": "object",
-    "not": { "required": [ "vendorId", "productId" ] }, // reject via keys...
+    "not": {"required": ["vendorId", "productId"]}, // reject via keys...
     "properties": {
         "keyboard_name": {"$ref": "qmk.definitions.v1#/text_identifier"},
         "keyboard_folder": {"$ref": "qmk.definitions.v1#/keyboard"},
@@ -43,7 +45,7 @@
         },
         "development_board": {
             "type": "string",
-            "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios", "liatris"]
+            "enum": ["promicro", "elite_c", "elite_pi", "proton_c", "kb2040", "promicro_rp2040", "blok", "michi", "bit_c_pro", "stemcell", "bluepill", "blackpill_f401", "blackpill_f411", "bonsai_c4", "helios", "liatris", "imera"]
         },
         "pin_compatible": {
             "type": "string",
@@ -123,6 +125,14 @@
             "type": "object",
             "additionalProperties": false,
             "properties": {
+                "default": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "on": {"type": "boolean"},
+                        "clicky": {"type": "boolean"}
+                    }
+                },
                 "macro_beep": {"type": "boolean"},
                 "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
                 "voices": {"type": "boolean"}
@@ -134,7 +144,7 @@
             "properties": {
                 "driver": {
                     "type": "string",
-                    "enum": ["pwm", "software", "timer", "custom"]
+                    "enum": ["custom", "pwm", "software", "timer"]
                 },
                 "default": {
                     "type": "object",
@@ -307,8 +317,8 @@
         },
         "features": {
             "$ref": "qmk.definitions.v1#/boolean_array",
-            "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
-
+            "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"},
+            "not": {"required": ["lto"]}
         },
         "indicators": {
             "type": "object",
@@ -333,15 +343,9 @@
                 "type": "object",
                 "additionalProperties": false,
                 "properties": {
-                    "filename": {
-                        "type": "string"
-                    },
-                    "c_macro": {
-                        "type": "boolean"
-                    },
-                    "json_layout": {
-                        "type": "boolean"
-                    },
+                    "filename": {"type": "string"},
+                    "c_macro": {"type": "boolean"},
+                    "json_layout": {"type": "boolean"},
                     "layout": {
                         "type": "array",
                         "items": {
@@ -424,10 +428,8 @@
             "properties": {
                 "animations": {
                     "type": "object",
-                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
-                    "additionalProperties": {
-                        "type": "boolean"
-                    }
+                    "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"},
+                    "additionalProperties": {"type": "boolean"}
                 },
                 "default": {
                     "type": "object",
@@ -439,7 +441,24 @@
                         "speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
                     }
                 },
-                "driver": {"type": "string"},
+                "driver": {
+                    "type": "string",
+                    "enum": [
+                        "custom",
+                        "is31fl3218",
+                        "is31fl3729",
+                        "is31fl3731",
+                        "is31fl3733",
+                        "is31fl3736",
+                        "is31fl3737",
+                        "is31fl3741",
+                        "is31fl3742a",
+                        "is31fl3743a",
+                        "is31fl3745",
+                        "is31fl3746a",
+                        "snled27351"
+                    ]
+                },
                 "center_point": {
                     "type": "array",
                     "minItems": 2,
@@ -488,10 +507,8 @@
             "properties": {
                 "animations": {
                     "type": "object",
-                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
-                    "additionalProperties": {
-                        "type": "boolean"
-                    }
+                    "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"},
+                    "additionalProperties": {"type": "boolean"}
                 },
                 "default": {
                     "type": "object",
@@ -505,7 +522,26 @@
                         "speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
                     }
                 },
-                "driver": {"type": "string"},
+                "driver": {
+                    "type": "string",
+                    "enum": [
+                        "aw20216s",
+                        "custom",
+                        "is31fl3218",
+                        "is31fl3729",
+                        "is31fl3731",
+                        "is31fl3733",
+                        "is31fl3736",
+                        "is31fl3737",
+                        "is31fl3741",
+                        "is31fl3742a",
+                        "is31fl3743a",
+                        "is31fl3745",
+                        "is31fl3746a",
+                        "snled27351",
+                        "ws2812"
+                    ]
+                },
                 "center_point": {
                     "type": "array",
                     "minItems": 2,
@@ -557,10 +593,8 @@
             "properties": {
                 "animations": {
                     "type": "object",
-                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
-                    "additionalProperties": {
-                        "type": "boolean"
-                    }
+                    "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"},
+                    "additionalProperties": {"type": "boolean"}
                 },
                 "brightness_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "default": {
@@ -763,7 +797,7 @@
                                 "st7565": {"type": "boolean"},
                                 "wpm": {"type": "boolean"}
                             }
-                        }
+                        },
                         "watchdog": {"type": "boolean"},
                         "watchdog_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                         "sync_matrix_state": {
diff --git a/docs/ChangeLog/20240225.md b/docs/ChangeLog/20240225.md
new file mode 100644
index 00000000000..779b7784900
--- /dev/null
+++ b/docs/ChangeLog/20240225.md
@@ -0,0 +1,367 @@
+# QMK Breaking Changes - 2024 February 25 Changelog
+
+## Notable Features :id=notable-features
+
+_0.24.0_ is mainly a maintenance release of QMK Firmware -- as per last few breaking changes cycles, there have been a lot of behind-the-scenes changes, mainly:
+
+* continued purge of user keymaps
+* migration of RGB matrix configuration into `info.json` files
+* standardisation of `LAYOUT` naming
+* keyboard relocations
+* addressing technical debt
+
+## Changes Requiring User Action :id=changes-requiring-user-action
+
+### Windows Driver Changes ([QMK Toolbox 0.3.0 Release](https://github.com/qmk/qmk_toolbox/releases/tag/0.3.0))
+
+Flashing keyboards that target `atmel-dfu` or `qmk-dfu` on Windows using `qmk flash` or QMK Toolbox have traditionally used _libusb_ for access to the DFU USB device. Since QMK Toolbox 0.3.0, this has changed to WinUSB.
+
+If you update QMK Toolbox or update QMK MSYS, you may find that flashing Atmel DFU keyboards no longer functions as intended. If you strike such issues when flashing new firmware, you will need to replace the _libusb_ driver with _WinUSB_ using Zadig. You can follow the [Recovering from Installation to Wrong Device](driver_installation_zadig.md#recovering-from-installation-to-wrong-device) instructions to replace the driver associated with the Atmel DFU bootloader, skipping the section about removal as Zadig will safely replace the driver instead. Please ensure your keyboard is in bootloader mode and has _libusb_ as the existing driver before attempting to use Zadig to replace the driver. If instead you see _HidUsb_ you're not in bootloader mode and should not continue with driver replacement.
+
+### Updated Keyboard Codebases :id=updated-keyboard-codebases
+
+One note with updated keyboard names -- historical keyboard names are still considered valid when using [External Userspace](newbs_external_userspace.md) for builds. If you're already using External Userspace, you do not need to move your keymap inside your repository.
+
+| Old Keyboard Name       | New Keyboard Name               |
+|-------------------------|---------------------------------|
+| enter67                 | kezewa/enter67                  |
+| enter80                 | kezewa/enter80                  |
+| epoch80                 | kbdfans/epoch80                 |
+| eu_isolation            | p3d/eu_isolation                |
+| flygone60/rev3          | shandoncodes/flygone60/rev3     |
+| hub16                   | joshajohnson/hub16              |
+| hub20                   | joshajohnson/hub20              |
+| jm60                    | kbdfans/jm60                    |
+| kira75                  | kira/kira75                     |
+| kira80                  | kira/kira80                     |
+| kmac                    | kbdmania/kmac                   |
+| kmac_pad                | kbdmania/kmac_pad               |
+| kudox/columner          | kumaokobo/kudox/columner        |
+| kudox/rev1              | kumaokobo/kudox/rev1            |
+| kudox/rev2              | kumaokobo/kudox/rev2            |
+| kudox/rev3              | kumaokobo/kudox/rev3            |
+| kudox_full/rev1         | kumaokobo/kudox_full/rev1       |
+| kudox_game              | kumaokobo/kudox_game            |
+| kudox_game/rev1         | kumaokobo/kudox_game/rev1       |
+| kudox_game/rev2         | kumaokobo/kudox_game/rev2       |
+| laser_ninja/pumpkin_pad | laser_ninja/pumpkinpad          |
+| late9/rev1              | rookiebwoy/late9/rev1           |
+| lefty                   | smoll/lefty                     |
+| lefty/rev1              | smoll/lefty/rev1                |
+| lefty/rev2              | smoll/lefty/rev2                |
+| lpad                    | laneware/lpad                   |
+| lw67                    | laneware/lw67                   |
+| lw75                    | laneware/lw75                   |
+| macro1                  | laneware/macro1                 |
+| macro3                  | handwired/macro3                |
+| miniaxe                 | kagizaraya/miniaxe              |
+| mino/hotswap            | shandoncodes/mino/hotswap       |
+| mino_plus/hotswap       | shandoncodes/mino_plus/hotswap  |
+| mino_plus/soldered      | shandoncodes/mino_plus/soldered |
+| mnk1800s                | monokei/mnk1800s                |
+| mnk50                   | monokei/mnk50                   |
+| mnk75                   | monokei/mnk75                   |
+| moonlander              | zsa/moonlander                  |
+| neopad/rev1             | rookiebwoy/neopad/rev1          |
+| pico/65keys             | kumaokobo/pico/65keys           |
+| pico/70keys             | kumaokobo/pico/70keys           |
+| pw88                    | smoll/pw88                      |
+| q4z                     | p3d/q4z                         |
+| raindrop                | laneware/raindrop               |
+| redox_w                 | redox/wireless                  |
+| riot_pad                | shandoncodes/riot_pad           |
+| spacey                  | p3d/spacey                      |
+| synapse                 | p3d/synapse                     |
+| tw40                    | p3d/tw40                        |
+| w1_at                   | geonworks/w1_at                 |
+| z12                     | zigotica/z12                    |
+| z34                     | zigotica/z34                    |
+
+## Notable core changes :id=notable-core
+
+### Renaming Arduino-style GPIO pin functions ([#23085](https://github.com/qmk/qmk_firmware/pull/23085), [#23093](https://github.com/qmk/qmk_firmware/pull/23093)) :id=gpio-rename
+
+QMK has long used Arduino-style GPIO naming conventions. This has been confusing for users, as over time they've had new variations added, as well as users mistakenly thinking that QMK supports the rest of the Arduino ecosystem.
+
+The decision was made to rename the GPIO manipulation functions with ones matching QMK Firmware's code styling.
+
+| Old                          | New                                   |
+|------------------------------|---------------------------------------|
+| `setPinInput(pin)`           | `gpio_set_pin_input(pin)`             |
+| `setPinInputHigh(pin)`       | `gpio_set_pin_input_high(pin)`        |
+| `setPinInputLow(pin)`        | `gpio_set_pin_input_low(pin)`         |
+| `setPinOutput(pin)`          | `gpio_set_pin_output(pin)`            |
+| `setPinOutputPushPull(pin)`  | `gpio_set_pin_output_push_pull(pin)`  |
+| `setPinOutputOpenDrain(pin)` | `gpio_set_pin_output_open_drain(pin)` |
+| `writePinHigh(pin)`          | `gpio_write_pin_high(pin)`            |
+| `writePinLow(pin)`           | `gpio_write_pin_low(pin)`             |
+| `writePin(pin, level)`       | `gpio_write_pin(pin, level)`          |
+| `readPin(pin)`               | `gpio_read_pin(pin)`                  |
+| `togglePin(pin)`             | `gpio_toggle_pin(pin)`                |
+
+### I2C driver API Changes ([#22905](https://github.com/qmk/qmk_firmware/pull/22905))
+
+Much like the GPIO refactoring, I2C APIs were also updated to conform to QMK naming standards. This is largely irrelevant to people using subsystem abstractions such as touchpads or RGB lighting, and only affects people manually communicating with other peripherals.
+
+| Old API            | New API                  |
+|--------------------|--------------------------|
+| `i2c_readReg()`    | `i2c_read_register()`    |
+| `i2c_readReg16()`  | `i2c_read_register16()`  |
+| `i2c_writeReg()`   | `i2c_write_register()`   |
+| `i2c_writeReg16()` | `i2c_write_register16()` |
+
+### Renaming _Bootmagic Lite_ => _Bootmagic_ ([#22970](https://github.com/qmk/qmk_firmware/pull/22970), [#22979](https://github.com/qmk/qmk_firmware/pull/22979)) :id=bootmagic-rename
+
+Bootmagic "Lite" had no real meaning once the historical Bootmagic "Full" was deprecated and removed. Any references to _Bootmagic Lite_ should now just refer to _Bootmagic_. We hope we got the majority of the code and the documentation, so if you find any more, let us know!
+
+### Threshold for automatic mouse layer activation ([#21398](https://github.com/qmk/qmk_firmware/pull/21398)) :id=auto-mouse-layer
+
+In some cases, accidental automatic activation of the mouse layer made it difficult to continue typing, such as when brushing across a trackball. `AUTO_MOUSE_THRESHOLD` is now a configurable option in `config.h` which allows for specifying what the movement threshold is before automatically activating the mouse layer.
+
+### DIP Switch Mapping ([#22543](https://github.com/qmk/qmk_firmware/pull/22543)) :id=dip-switch-map
+
+Much like Encoder Mapping, DIP Switch Mapping allows for specifying a table of actions to execute when a DIP switch state changes. See the [DIP Switch Documentation](feature_dip_switch.md#dip-switch-map) for more information.
+
+```c
+#if defined(DIP_SWITCH_MAP_ENABLE)
+const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = {
+    DIP_SWITCH_OFF_ON(DF(0), DF(1)),
+    DIP_SWITCH_OFF_ON(EC_NORM, EC_SWAP)
+};
+#endif
+```
+
+### Quantum Painter updates ([#18521](https://github.com/qmk/qmk_firmware/pull/18521), [#20645](https://github.com/qmk/qmk_firmware/pull/20645), [#22358](https://github.com/qmk/qmk_firmware/pull/22358)) :id=qp-updates
+
+Quantum Painter picked up support for the following:
+
+* ILI9486 displays
+* SSD1306 displays, including smaller OLEDs
+* Native panel pixel format support for fonts
+
+Quantum Painter now supports the majority of common OLED panels supported by the basic OLED driver, so if you're using an ARM-based board you may find Quantum Painter a much more feature-rich API in comparison.
+
+## Full changelist :id=full-changelist
+
+Core:
+* [Driver] ILI9486 on Quantum Painter ([#18521](https://github.com/qmk/qmk_firmware/pull/18521))
+* Insert delay between shifted chars in send_string_with_delay ([#19280](https://github.com/qmk/qmk_firmware/pull/19280))
+* [QP] Native palette support for fonts ([#20645](https://github.com/qmk/qmk_firmware/pull/20645))
+* I2C driver cleanup ([#21273](https://github.com/qmk/qmk_firmware/pull/21273))
+* Add option for auto mouse movement threshold ([#21398](https://github.com/qmk/qmk_firmware/pull/21398))
+* Add Canadian French input locale ([#21456](https://github.com/qmk/qmk_firmware/pull/21456))
+* Add encoder abstraction. ([#21548](https://github.com/qmk/qmk_firmware/pull/21548))
+* Converted RGB matrix to use last_input_activity_elapsed(). ([#21687](https://github.com/qmk/qmk_firmware/pull/21687))
+* Ignore space cadet key release when caps word is active ([#21721](https://github.com/qmk/qmk_firmware/pull/21721))
+* Add OS detection callbacks ([#21777](https://github.com/qmk/qmk_firmware/pull/21777))
+* joystick weights ([#21883](https://github.com/qmk/qmk_firmware/pull/21883))
+* Add RGB matrix & LED Matrix support for IS31FL3729 ([#21944](https://github.com/qmk/qmk_firmware/pull/21944))
+* dac_additive: Decouple the buffer length from the waveform length ([#22276](https://github.com/qmk/qmk_firmware/pull/22276))
+* Add missing rgb matrix default parameters ([#22281](https://github.com/qmk/qmk_firmware/pull/22281))
+* Remove console out endpoint ([#22304](https://github.com/qmk/qmk_firmware/pull/22304))
+* Add ADC support STM32L4xx and STM32G4xx series MCUs ([#22341](https://github.com/qmk/qmk_firmware/pull/22341))
+* Add QP support for smaller OLED displays and SSD1306 ([#22358](https://github.com/qmk/qmk_firmware/pull/22358))
+* Add Imera converter ([#22419](https://github.com/qmk/qmk_firmware/pull/22419))
+* LED drivers: refactor page selection ([#22518](https://github.com/qmk/qmk_firmware/pull/22518))
+* Rework RGBLight driver system ([#22529](https://github.com/qmk/qmk_firmware/pull/22529))
+* Add `APA102_LED_COUNT` define ([#22530](https://github.com/qmk/qmk_firmware/pull/22530))
+* Add latam spanish headers ([#22542](https://github.com/qmk/qmk_firmware/pull/22542))
+* Keymap introspection for Dip Switches ([#22543](https://github.com/qmk/qmk_firmware/pull/22543))
+* Add basic presence check for cirque trackpad. ([#22546](https://github.com/qmk/qmk_firmware/pull/22546))
+* Rename `RGBLED_NUM` -> `RGBLIGHT_LED_COUNT` ([#22570](https://github.com/qmk/qmk_firmware/pull/22570))
+* LED drivers: change "TWI" to "I2C" ([#22617](https://github.com/qmk/qmk_firmware/pull/22617))
+* LED drivers: extract IS31FL3742A from IS31COMMON ([#22620](https://github.com/qmk/qmk_firmware/pull/22620))
+* Align Dip Switch feature ([#22625](https://github.com/qmk/qmk_firmware/pull/22625))
+* LED/RGB Matrix: add header for drivers ([#22628](https://github.com/qmk/qmk_firmware/pull/22628))
+* LED drivers: extract IS31FL3743A from IS31COMMON ([#22635](https://github.com/qmk/qmk_firmware/pull/22635))
+* LED drivers: extract IS31FL3745 from IS31COMMON ([#22636](https://github.com/qmk/qmk_firmware/pull/22636))
+* LED drivers: extract IS31FL3746A from IS31COMMON ([#22637](https://github.com/qmk/qmk_firmware/pull/22637))
+* Update keyboard LED driver configs ([#22638](https://github.com/qmk/qmk_firmware/pull/22638))
+* Solid reactive: improve fading effect ([#22656](https://github.com/qmk/qmk_firmware/pull/22656))
+* Remove redundant RGB/LED matrix eeconfig init ([#22673](https://github.com/qmk/qmk_firmware/pull/22673))
+* Remove redundant rgblight eeconfig init ([#22674](https://github.com/qmk/qmk_firmware/pull/22674))
+* Remove redundant steno eeconfig init ([#22680](https://github.com/qmk/qmk_firmware/pull/22680))
+* Rename `LED_DISABLE_WHEN_USB_SUSPENDED` -> `LED_MATRIX_SLEEP` ([#22681](https://github.com/qmk/qmk_firmware/pull/22681))
+* Rename `RGB_DISABLE_WHEN_USB_SUSPENDED` -> `RGB_MATRIX_SLEEP` ([#22682](https://github.com/qmk/qmk_firmware/pull/22682))
+* Align VUSB suspend protocol logic ([#22688](https://github.com/qmk/qmk_firmware/pull/22688))
+* [Audio] Enable Complementary output for PWM Hardware driver ([#22726](https://github.com/qmk/qmk_firmware/pull/22726))
+* Remove redundant audio eeconfig init ([#22736](https://github.com/qmk/qmk_firmware/pull/22736))
+* Align location of tap dance keycode ([#22742](https://github.com/qmk/qmk_firmware/pull/22742))
+* Align `SPLIT_HAND_MATRIX_GRID` left/right logic with `SPLIT_HAND_PIN` ([#22775](https://github.com/qmk/qmk_firmware/pull/22775))
+* [CI] Regenerate Files ([#22795](https://github.com/qmk/qmk_firmware/pull/22795))
+* Remove IS31FLCOMMON code ([#22800](https://github.com/qmk/qmk_firmware/pull/22800))
+* Cirque reachable calibration aide ([#22803](https://github.com/qmk/qmk_firmware/pull/22803))
+* LED drivers: rename "simple" to "mono" ([#22814](https://github.com/qmk/qmk_firmware/pull/22814))
+* is31fl3733: change `write_register()` return type to `void` ([#22824](https://github.com/qmk/qmk_firmware/pull/22824))
+* snled27351: change `write_register()` return type to `void` ([#22825](https://github.com/qmk/qmk_firmware/pull/22825))
+* apa102: cleanups ([#22826](https://github.com/qmk/qmk_firmware/pull/22826))
+* Remove PWM advanced check for WS2812 driver ([#22830](https://github.com/qmk/qmk_firmware/pull/22830))
+* Allow ChibiOS `SIO` driver for `UART` driver ([#22839](https://github.com/qmk/qmk_firmware/pull/22839))
+* LED drivers: more formatting ([#22865](https://github.com/qmk/qmk_firmware/pull/22865))
+* LED drivers: change `write_pwm_buffer()` return type to `void` ([#22869](https://github.com/qmk/qmk_firmware/pull/22869))
+* [CI] Regenerate Files ([#22872](https://github.com/qmk/qmk_firmware/pull/22872))
+* LED drivers: switch to i2c_writeReg() ([#22878](https://github.com/qmk/qmk_firmware/pull/22878))
+* LED drivers: remove `write_pwm_buffer()` from public API ([#22884](https://github.com/qmk/qmk_firmware/pull/22884))
+* i2c: rename read/write register functions ([#22905](https://github.com/qmk/qmk_firmware/pull/22905))
+* LED drivers: update I2C API usage ([#22951](https://github.com/qmk/qmk_firmware/pull/22951))
+* LED drivers: create structs to hold PWM/scaling buffers ([#22955](https://github.com/qmk/qmk_firmware/pull/22955))
+* Migrate and remove deprecated debug utils ([#22961](https://github.com/qmk/qmk_firmware/pull/22961))
+* Remove call to removed i2c function in azoteq driver ([#22966](https://github.com/qmk/qmk_firmware/pull/22966))
+* Tidy up print/debug logging headers ([#22969](https://github.com/qmk/qmk_firmware/pull/22969))
+* Begin removal of bootmagic lite terminology ([#22970](https://github.com/qmk/qmk_firmware/pull/22970))
+* LED drivers: place I2C addresses into an array ([#22975](https://github.com/qmk/qmk_firmware/pull/22975))
+* Removal of bootmagic lite terminology ([#22979](https://github.com/qmk/qmk_firmware/pull/22979))
+* Init pins for Analog Joystick sensor ([#22985](https://github.com/qmk/qmk_firmware/pull/22985))
+* Workaround for G431 eeprom emulation ([#23002](https://github.com/qmk/qmk_firmware/pull/23002))
+* is31fl3741: split PWM and scaling buffers ([#23049](https://github.com/qmk/qmk_firmware/pull/23049))
+* LED drivers: update PWM register defines for `g_<driver>_leds` ([#23052](https://github.com/qmk/qmk_firmware/pull/23052))
+* LED drivers: add support for shutdown pin ([#23058](https://github.com/qmk/qmk_firmware/pull/23058))
+* AW20216S: combine EN pin defines ([#23067](https://github.com/qmk/qmk_firmware/pull/23067))
+* Update naming convention for GPIO control macros ([#23085](https://github.com/qmk/qmk_firmware/pull/23085))
+* Update GPIO macro usages in core ([#23093](https://github.com/qmk/qmk_firmware/pull/23093))
+* OS Detection - Entire file should not be wrapped with ifdef ([#23108](https://github.com/qmk/qmk_firmware/pull/23108))
+* IS31FL3729 updates ([#23109](https://github.com/qmk/qmk_firmware/pull/23109))
+* Nix shell updates (Nixpkgs 2024-02-23, QMK CLI 1.1.5) ([#23143](https://github.com/qmk/qmk_firmware/pull/23143))
+
+CLI:
+* [Refactor] `qmk find` ([#21096](https://github.com/qmk/qmk_firmware/pull/21096))
+* [Refactor] Break `QGFImageFile`'s `_save` function into smaller pieces ([#21124](https://github.com/qmk/qmk_firmware/pull/21124))
+* [Enhancement] Prepare for `SyntaxWarning` ([#22562](https://github.com/qmk/qmk_firmware/pull/22562))
+* Flag invalid keyboard features during lint ([#22832](https://github.com/qmk/qmk_firmware/pull/22832))
+
+Submodule updates:
+* chore(chibios-contrib): sync with chibios-21.11.x ([#22560](https://github.com/qmk/qmk_firmware/pull/22560))
+
+Keyboards:
+* Move `redox_w` into `redox` ([#21448](https://github.com/qmk/qmk_firmware/pull/21448))
+* null ST110R2.1 (SaikouType) basic support with layouts ([#21623](https://github.com/qmk/qmk_firmware/pull/21623))
+* New keyboard addition: Orthograph ([#21770](https://github.com/qmk/qmk_firmware/pull/21770))
+* Add Olly JF Rev.2 ([#21775](https://github.com/qmk/qmk_firmware/pull/21775))
+* Cleanup Satisfaction75 Firmware and add new revisions ([#22082](https://github.com/qmk/qmk_firmware/pull/22082))
+* Migrate dynamic_keymap.layer_count < 4 where requried ([#22091](https://github.com/qmk/qmk_firmware/pull/22091))
+* Bastard Keyboards: Add support for Dilemma v2 (3x5+3) ([#22185](https://github.com/qmk/qmk_firmware/pull/22185))
+* Karn: correct layout data ([#22201](https://github.com/qmk/qmk_firmware/pull/22201))
+* zk3mod : added OLED ([#22303](https://github.com/qmk/qmk_firmware/pull/22303))
+* Adds support for the Iron180 V2 PCBs ([#22314](https://github.com/qmk/qmk_firmware/pull/22314))
+* Add 5x13 and 6x13 ortho community layouts ([#22315](https://github.com/qmk/qmk_firmware/pull/22315))
+* Cipulot refactoring ([#22368](https://github.com/qmk/qmk_firmware/pull/22368))
+* Remove era/klein ([#22384](https://github.com/qmk/qmk_firmware/pull/22384))
+* consolidate firmware folder in smoll parent folder ([#22401](https://github.com/qmk/qmk_firmware/pull/22401))
+* `keycapsss/plaid_pad`: switch to encoder map ([#22474](https://github.com/qmk/qmk_firmware/pull/22474))
+* Add EE-AT and move W1-AT under geonworks ([#22526](https://github.com/qmk/qmk_firmware/pull/22526))
+* refactor: projectcain/vault35 ([#22558](https://github.com/qmk/qmk_firmware/pull/22558))
+* Update Q5 ([#22575](https://github.com/qmk/qmk_firmware/pull/22575))
+* Update Q7 ([#22577](https://github.com/qmk/qmk_firmware/pull/22577))
+* Update Q8 ([#22578](https://github.com/qmk/qmk_firmware/pull/22578))
+* Update Q9 ([#22579](https://github.com/qmk/qmk_firmware/pull/22579))
+* Remove "empty" files ([#22603](https://github.com/qmk/qmk_firmware/pull/22603))
+* Rename Pumpkin Pad to Pumkinpad ([#22651](https://github.com/qmk/qmk_firmware/pull/22651))
+* Noodlepad Additions and Updates ([#22701](https://github.com/qmk/qmk_firmware/pull/22701))
+* Refactor: move miniaxe into kagizaraya ([#22708](https://github.com/qmk/qmk_firmware/pull/22708))
+* Refactor: move keyboards into zigotica folder ([#22709](https://github.com/qmk/qmk_firmware/pull/22709))
+* Refactor: move keyboards into laneware folder ([#22710](https://github.com/qmk/qmk_firmware/pull/22710))
+* Refactor: move keyboards into kezewa ([#22712](https://github.com/qmk/qmk_firmware/pull/22712))
+* Refactor: move keyboards into kbdmania folder ([#22714](https://github.com/qmk/qmk_firmware/pull/22714))
+* Refactor: move keyboards into monokei folder ([#22715](https://github.com/qmk/qmk_firmware/pull/22715))
+* Refactor: move keyboards into kumaokobo ([#22719](https://github.com/qmk/qmk_firmware/pull/22719))
+* Updating NCC1701KB and adding via support ([#22721](https://github.com/qmk/qmk_firmware/pull/22721))
+* Move Moonlander to ZSA folder ([#22740](https://github.com/qmk/qmk_firmware/pull/22740))
+* Refactor: group shandoncodes keyboards ([#22743](https://github.com/qmk/qmk_firmware/pull/22743))
+* Refactor: group rookiebwoy keyboards ([#22745](https://github.com/qmk/qmk_firmware/pull/22745))
+* Default folder correction for kumaokobo ([#22750](https://github.com/qmk/qmk_firmware/pull/22750))
+* Default folder correction for rookiebwoy ([#22753](https://github.com/qmk/qmk_firmware/pull/22753))
+* Refactor: move macro3 into handwired folder ([#22759](https://github.com/qmk/qmk_firmware/pull/22759))
+* Refactor: group kira keyboards ([#22760](https://github.com/qmk/qmk_firmware/pull/22760))
+* Refactor: group hub keyboards ([#22762](https://github.com/qmk/qmk_firmware/pull/22762))
+* Refactor: move p3d keyboards ([#22763](https://github.com/qmk/qmk_firmware/pull/22763))
+* Refactor: group kbdfans keyboards ([#22764](https://github.com/qmk/qmk_firmware/pull/22764))
+* Remove incorrect use of WS2812_PIO_USE_PIO1 ([#22771](https://github.com/qmk/qmk_firmware/pull/22771))
+* Migrate LED Matrix config to info.json ([#22792](https://github.com/qmk/qmk_firmware/pull/22792))
+* Migrate RGB Matrix config to info.json - [0-9] ([#22797](https://github.com/qmk/qmk_firmware/pull/22797))
+* Migrate RGB Matrix config to info.json - A ([#22798](https://github.com/qmk/qmk_firmware/pull/22798))
+* Late9 keymaps update, added VIA support ([#22801](https://github.com/qmk/qmk_firmware/pull/22801))
+* Migrate RGB Matrix config to info.json - B ([#22806](https://github.com/qmk/qmk_firmware/pull/22806))
+* Migrate RGB Matrix config to info.json - C ([#22807](https://github.com/qmk/qmk_firmware/pull/22807))
+* Migrate RGB Matrix config to info.json - EF ([#22808](https://github.com/qmk/qmk_firmware/pull/22808))
+* Migrate RGB Matrix config to info.json - D ([#22811](https://github.com/qmk/qmk_firmware/pull/22811))
+* H87g2 updates ([#22819](https://github.com/qmk/qmk_firmware/pull/22819))
+* WT boards: extract `g_is31fl3736_leds` from wt_mono_backlight ([#22823](https://github.com/qmk/qmk_firmware/pull/22823))
+* Migrate RGB Matrix config to info.json - G ([#22859](https://github.com/qmk/qmk_firmware/pull/22859))
+* Use existing columns for 3x5 layout ([#22860](https://github.com/qmk/qmk_firmware/pull/22860))
+* Migrate RGB Matrix config to info.json - H ([#22861](https://github.com/qmk/qmk_firmware/pull/22861))
+* Migrate RGB Matrix config to info.json - J ([#22862](https://github.com/qmk/qmk_firmware/pull/22862))
+* Migrate RGB Matrix config to info.json - I ([#22863](https://github.com/qmk/qmk_firmware/pull/22863))
+* Migrate RGB Matrix config to info.json - L ([#22864](https://github.com/qmk/qmk_firmware/pull/22864))
+* Migrate RGB Matrix config to info.json - NOPQ ([#22866](https://github.com/qmk/qmk_firmware/pull/22866))
+* Migrate RGB Matrix config to info.json - XZY ([#22879](https://github.com/qmk/qmk_firmware/pull/22879))
+* Zed65/no_backlight/cor65 correct data layout ([#22898](https://github.com/qmk/qmk_firmware/pull/22898))
+* Migrate RGB Matrix config to info.json - M ([#22908](https://github.com/qmk/qmk_firmware/pull/22908))
+* Migrate RGB Matrix config to info.json - RS ([#22909](https://github.com/qmk/qmk_firmware/pull/22909))
+* Migrate RGB Matrix config to info.json - TUVW ([#22910](https://github.com/qmk/qmk_firmware/pull/22910))
+* Migrate RGB Matrix config to info.json - K ([#22911](https://github.com/qmk/qmk_firmware/pull/22911))
+* Remove `LAYOUTS_HAS_RGB` ([#22917](https://github.com/qmk/qmk_firmware/pull/22917))
+* Migrate lighting defaults to info.json ([#22920](https://github.com/qmk/qmk_firmware/pull/22920))
+* Ensure LTO is enabled as a `info.json` build config option ([#22932](https://github.com/qmk/qmk_firmware/pull/22932))
+* refactor(keyboard): quokka ([#22942](https://github.com/qmk/qmk_firmware/pull/22942))
+* Sango Keyboard ([#22971](https://github.com/qmk/qmk_firmware/pull/22971))
+* Add FS streampad ([#22991](https://github.com/qmk/qmk_firmware/pull/22991))
+* Remove always enabled effects from lighting animation list ([#22992](https://github.com/qmk/qmk_firmware/pull/22992))
+* Migrate RGB Matrix config to info.json - keychron ([#22998](https://github.com/qmk/qmk_firmware/pull/22998))
+* Migrate RGB Matrix config to info.json - Misc ([#23000](https://github.com/qmk/qmk_firmware/pull/23000))
+* Remove ee_hands config from ferris/sweep firmware ([#23029](https://github.com/qmk/qmk_firmware/pull/23029))
+* Migrate dip switch config to info.json - keychron ([#23037](https://github.com/qmk/qmk_firmware/pull/23037))
+* [unicorne] Add a layout alias ([#23056](https://github.com/qmk/qmk_firmware/pull/23056))
+* nacly/sodium62: Update vid, pid, and add via keymap ([#23063](https://github.com/qmk/qmk_firmware/pull/23063))
+* LED drivers: update keyboard LED configs ([#23073](https://github.com/qmk/qmk_firmware/pull/23073))
+* Remove invalid keyboard level features ([#23074](https://github.com/qmk/qmk_firmware/pull/23074))
+* Migrate WEAR_LEVELING_* to info.json ([#23077](https://github.com/qmk/qmk_firmware/pull/23077))
+* [Keymap Removal] keyboard with most keymaps ([#23081](https://github.com/qmk/qmk_firmware/pull/23081))
+* Remove obvious user keymaps, keyboards/{v,x,y,z}* edition. ([#23083](https://github.com/qmk/qmk_firmware/pull/23083))
+* Remove obvious user keymaps, keyboards/{s,t}* edition. ([#23084](https://github.com/qmk/qmk_firmware/pull/23084))
+* [Keymap Removal] keyboard with most keymaps ([#23092](https://github.com/qmk/qmk_firmware/pull/23092))
+* Fiuxup takashicompany/heavy_left ([#23094](https://github.com/qmk/qmk_firmware/pull/23094))
+* Remove obvious user keymaps, keyboards/{i,j,k}* edition ([#23102](https://github.com/qmk/qmk_firmware/pull/23102))
+* Manual user keymap removal ([#23104](https://github.com/qmk/qmk_firmware/pull/23104))
+* Manual user keymap removal ([#23119](https://github.com/qmk/qmk_firmware/pull/23119))
+* Migrate `RGBLED_NUM` -> `RGBLIGHT_LED_COUNT` in remaining non-user keymaps ([#23128](https://github.com/qmk/qmk_firmware/pull/23128))
+
+Keyboard fixes:
+* Fix VID and PID for AnnePro2 ([#22263](https://github.com/qmk/qmk_firmware/pull/22263))
+* fix(kikoslab/kl90): Fix firmware to support encoder knobs properly ([#22649](https://github.com/qmk/qmk_firmware/pull/22649))
+* fix: improper usage of keyboard/user-level functions ([#22652](https://github.com/qmk/qmk_firmware/pull/22652))
+* Temporary fix for mechlovin/olly/octagon ([#22796](https://github.com/qmk/qmk_firmware/pull/22796))
+* Keychron Q11 usb poweron fix ([#22799](https://github.com/qmk/qmk_firmware/pull/22799))
+* capsunlocked/cu80/v2: Fix invalid RGB matrix config ([#22873](https://github.com/qmk/qmk_firmware/pull/22873))
+* Fix typo in Redox config ([#22899](https://github.com/qmk/qmk_firmware/pull/22899))
+* Fixup doio/kb16 ([#22921](https://github.com/qmk/qmk_firmware/pull/22921))
+* Fixup takashicompany/minizone ([#22922](https://github.com/qmk/qmk_firmware/pull/22922))
+* Fixup sofle ([#22934](https://github.com/qmk/qmk_firmware/pull/22934))
+* Fix Issue with RGB Matrix not understanding the split keyboard ([#22997](https://github.com/qmk/qmk_firmware/pull/22997))
+* Fixup sawnsprojects/krush60 ([#23095](https://github.com/qmk/qmk_firmware/pull/23095))
+* Fixup kbd67/rev1 ([#23096](https://github.com/qmk/qmk_firmware/pull/23096))
+* Fixup boardsource/equals ([#23106](https://github.com/qmk/qmk_firmware/pull/23106))
+* Fixup inett_studio/sq80 ([#23121](https://github.com/qmk/qmk_firmware/pull/23121))
+* Add LED/RGB Matrix drivers to info.json schema ([#23127](https://github.com/qmk/qmk_firmware/pull/23127))
+* Fix for multiple AMUX usage ([#23155](https://github.com/qmk/qmk_firmware/pull/23155))
+
+Bugs:
+* MIDI sustain effect fix on qmk 0.22.2 ([#22114](https://github.com/qmk/qmk_firmware/pull/22114))
+* Prevent `qmk migrate` processing unparsed info.json values ([#22374](https://github.com/qmk/qmk_firmware/pull/22374))
+* Remove redundant backlight eeconfig init ([#22675](https://github.com/qmk/qmk_firmware/pull/22675))
+* pointing_device ifdef indentation fix ([#22802](https://github.com/qmk/qmk_firmware/pull/22802))
+* Ensure LED config is extracted when feature is disabled ([#22809](https://github.com/qmk/qmk_firmware/pull/22809))
+* Generate true/false for _DEFAULT_ON options ([#22829](https://github.com/qmk/qmk_firmware/pull/22829))
+* is31fl3733: fix driver sync backwards compatibility defines ([#22851](https://github.com/qmk/qmk_firmware/pull/22851))
+* LED drivers: misc formatting and typos ([#22857](https://github.com/qmk/qmk_firmware/pull/22857))
+* Allow generation of both LED and RGB Matrix config ([#22896](https://github.com/qmk/qmk_firmware/pull/22896))
+* LED drivers: remove PWM register offsets ([#22897](https://github.com/qmk/qmk_firmware/pull/22897))
+* `qmk format-json`: Force Unix line endings and ensure LF at EOF ([#22901](https://github.com/qmk/qmk_firmware/pull/22901))
+* Fix cirque connected check ([#22948](https://github.com/qmk/qmk_firmware/pull/22948))
+* Fix joystick initialization ([#22953](https://github.com/qmk/qmk_firmware/pull/22953))
+* Workaround for `make test:all DEBUG=1` ([#23047](https://github.com/qmk/qmk_firmware/pull/23047))
+* Fix unit test execution ([#23048](https://github.com/qmk/qmk_firmware/pull/23048))
+* Fix git-submodule running in wrong location ([#23059](https://github.com/qmk/qmk_firmware/pull/23059))
+* WS2812 bitbang: prefix for `NOP_FUDGE` define ([#23110](https://github.com/qmk/qmk_firmware/pull/23110))
+* Fix make clean test:os_detection ([#23112](https://github.com/qmk/qmk_firmware/pull/23112))
+* Fix pmw33xx sensor corruption on get-cpi call ([#23116](https://github.com/qmk/qmk_firmware/pull/23116))
+* Ensure `qmk generate-compilation-database` copies to userspace as well. ([#23129](https://github.com/qmk/qmk_firmware/pull/23129))
diff --git a/docs/_summary.md b/docs/_summary.md
index bae93da5b6c..fb584955ce1 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -138,7 +138,7 @@
   * Breaking Changes
     * [Overview](breaking_changes.md)
     * [My Pull Request Was Flagged](breaking_changes_instructions.md)
-    * [Most Recent ChangeLog](ChangeLog/20231126.md "QMK v0.23.0 - 2023 Nov 26")
+    * [Most Recent ChangeLog](ChangeLog/20240225.md "QMK v0.24.0 - 2024 Feb 25")
     * [Past Breaking Changes](breaking_changes_history.md)
 
   * C Development
diff --git a/docs/audio_driver.md b/docs/audio_driver.md
index a0bbb22e196..03c0a824dfe 100644
--- a/docs/audio_driver.md
+++ b/docs/audio_driver.md
@@ -116,19 +116,32 @@ Additionally, in the board config, you'll want to make changes to enable the DAC
 | Define                           | Defaults                   | Description                                                                                                                                                           |
 | -------------------------------- | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `AUDIO_DAC_SAMPLE_MAX`           | `4095U`                    | Highest value allowed. Lower value means lower volume. And 4095U is the upper limit, since this is limited to a 12 bit value. Only effects non-pregenerated samples.  |
-| `AUDIO_DAC_OFF_VALUE`            | `AUDIO_DAC_SAMPLE_MAX / 2` | The value of the DAC when notplaying anything. Some setups may require a high (`AUDIO_DAC_SAMPLE_MAX`) or low (`0`) value here.                                       |
+| `AUDIO_DAC_OFF_VALUE`            | `AUDIO_DAC_SAMPLE_MAX / 2` | The value of the DAC when not playing anything. Some setups may require a high (`AUDIO_DAC_SAMPLE_MAX`) or low (`0`) value here.                                      |
 | `AUDIO_MAX_SIMULTANEOUS_TONES`   | __see next table__         | The number of tones that can be played simultaneously.  A value that is too high may freeze the controller or glitch out when too many tones are being played.        |
 | `AUDIO_DAC_SAMPLE_RATE`          | __see next table__         | Effective bit rate of the DAC (in hertz), higher limits simultaneous tones, and lower sacrifices quality.                                                             |
+| `AUDIO_DAC_BUFFER_SIZE`          | __see next table__         | Number of samples generated every refill. Too few may cause excessive CPU load; too many may cause freezes, RAM or flash exhaustion or lags during matrix scanning.   |
 
-There are a number of predefined quality settings that you can use, with "sane minimum" being the default.  You can use custom values by simply defining the sample rate and number of simultaneous tones, instead of using one of the listed presets. 
+There are a number of predefined quality settings that you can use, with "sane minimum" being the default.  You can use custom values by simply defining the sample rate, number of simultaneous tones and buffer size, instead of using one of the listed presets.
 
-| Define                            | Sample Rate | Simultaneous tones  |
-| --------------------------------- | ----------- | ------------------- |
-| `AUDIO_DAC_QUALITY_VERY_LOW`      | `11025U`    | `8`                 |
-| `AUDIO_DAC_QUALITY_LOW`           | `22040U`    | `4`                 |
-| `AUDIO_DAC_QUALITY_HIGH`          | `44100U`    | `2`                 |
-| `AUDIO_DAC_QUALITY_VERY_HIGH`     | `88200U`    | `1`                 |
-| `AUDIO_DAC_QUALITY_SANE_MINIMUM`  | `16384U`    | `8`                 |
+| Define                            | Sample Rate | Simultaneous tones  | Buffer size |
+| --------------------------------- | ----------- | ------------------- | ----------- |
+| `AUDIO_DAC_QUALITY_VERY_LOW`      | `11025U`    | `8`                 | `64U`       |
+| `AUDIO_DAC_QUALITY_LOW`           | `22050U`    | `4`                 | `128U`      |
+| `AUDIO_DAC_QUALITY_HIGH`          | `44100U`    | `2`                 | `256U`      |
+| `AUDIO_DAC_QUALITY_VERY_HIGH`     | `88200U`    | `1`                 | `256U`      |
+| `AUDIO_DAC_QUALITY_SANE_MINIMUM`  | `16384U`    | `8`                 | `64U`       |
+
+#### Notes on buffer size :id=buffer-size
+
+By default, the buffer size attempts to keep to these constraints:
+
+* The interval between buffer refills can't be too short, since the microcontroller would then only be servicing buffer refills and would freeze up.
+* On the additive driver, the interval between buffer refills can't be too long, since matrix scanning would suffer lengthy pauses every so often, which would delay key presses or releases or lose some short taps altogether.
+* The interval between buffer refills is kept to a minimum, which allows notes to stop as soon as possible after they should.
+* For greater compatibility, the buffer size should be a power of 2.
+* The buffer size being too large causes resource exhaustion leading to build failures or freezing at runtime: RAM usage (on the additive driver) or flash usage (on the basic driver).
+
+You can lower the buffer size if you need a bit more space in your firmware, or raise it if your keyboard freezes up.
 
 
 ```c
@@ -186,6 +199,11 @@ with all this information, the configuration would contain these lines:
 ChibiOS uses GPIOv1 for the F103, which only knows of one alternate function.
 On 'larger' STM32s, GPIOv2 or GPIOv3 are used; with them it is also necessary to configure `AUDIO_PWM_PAL_MODE` to the correct alternate function for the selected pin, timer and timer-channel.
 
+You can also use the Complementary output (`TIMx_CHyN`) for PWM on supported controllers.  To enable this functionality, you will need to make the following changes:
+```c
+// config.h:
+#define AUDIO_PWM_COMPLEMENTARY_OUTPUT
+```
 
 ### PWM software :id=pwm-software
 
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index 70a9044c8c0..b60118cd641 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -10,25 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch
 
 ## What has been included in past Breaking Changes?
 
+* [2024 Feb 25](ChangeLog/20240225.md)
 * [2023 Nov 26](ChangeLog/20231126.md)
 * [2023 Aug 27](ChangeLog/20230827.md)
-* [2023 May 28](ChangeLog/20230528.md)
 * [Older Breaking Changes](breaking_changes_history.md)
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for November 26, 2023.
+The next Breaking Change is scheduled for May 26, 2024.
 
 ### Important Dates
 
-* 2023 Nov 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* 2024 Jan 28 - `develop` closed to new PRs.
-* 2024 Jan 28 - Call for testers.
-* 2024 Feb 4 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* 2024 Feb 18 - `develop` is locked, only critical bugfix PRs merged.
-* 2024 Feb 22 - `master` is locked, no PRs merged.
-* 2024 Feb 25 - Merge `develop` to `master`.
-* 2024 Feb 25 - `master` is unlocked. PRs can be merged again.
+* 2024 Feb 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2024 Apr 28 - `develop` closed to new PRs.
+* 2024 Apr 28 - Call for testers.
+* 2024 May 5 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* 2024 May 19 - `develop` is locked, only critical bugfix PRs merged.
+* 2024 May 23 - `master` is locked, no PRs merged.
+* 2024 May 26 - Merge `develop` to `master`.
+* 2024 May 26 - `master` is unlocked. PRs can be merged again.
 
 ## What changes will be included?
 
@@ -48,7 +48,7 @@ Criteria for acceptance:
 
 Strongly suggested:
 
-* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20240225`.
+* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20240526`.
     * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PRs ID.
     * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability.
 
diff --git a/docs/breaking_changes_history.md b/docs/breaking_changes_history.md
index 4ab890294bb..6e304685b52 100644
--- a/docs/breaking_changes_history.md
+++ b/docs/breaking_changes_history.md
@@ -2,6 +2,7 @@
 
 This page links to all previous changelogs from the QMK Breaking Changes process.
 
+* [2024 Feb 25](ChangeLog/20240225.md) - version 0.24.0
 * [2023 Nov 26](ChangeLog/20231126.md) - version 0.23.0
 * [2023 Aug 27](ChangeLog/20230827.md) - version 0.22.0
 * [2023 May 28](ChangeLog/20230528.md) - version 0.21.0
diff --git a/docs/config_options.md b/docs/config_options.md
index 8119b9e356f..045d9c07479 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -223,7 +223,7 @@ If you define these options you will enable the associated feature, which may in
   * Adds ability to [blink](feature_rgblight.md?id=lighting-layer-blink) a lighting layer for a specified number of milliseconds (e.g. to acknowledge an action).
 * `#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF`
   * If defined, then [lighting layers](feature_rgblight?id=overriding-rgb-lighting-onoff-status) will be shown even if RGB Light is off.
-* `#define RGBLED_NUM 12`
+* `#define RGBLIGHT_LED_COUNT 12`
   * number of LEDs
 * `#define RGBLIGHT_SPLIT`
   * Needed if both halves of the board have RGB LEDs wired directly to the RGB output pin on the controllers instead of passing the output of the left half to the input of the right half
@@ -275,7 +275,7 @@ There are a few different ways to set handedness for split keyboards (listed in
   * For using high/low pin to determine handedness, low = right hand, high = left hand. Replace `B7` with the pin you are using. This is optional, and if you leave `SPLIT_HAND_PIN` undefined, then you can still use the EE_HANDS method or MASTER_LEFT / MASTER_RIGHT defines like the stock Let's Split uses.
 
 * `#define SPLIT_HAND_MATRIX_GRID <out_pin>,<in_pin>`
-  * The handedness is determined by using the intersection of the keyswitches in the key matrix, which does not exist. Normally, when this intersection is shorted (level low), it is considered left. If you define `#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT`, it is determined to be right when the level is low.
+  * The handedness is determined by using the intersection of the keyswitches in the key matrix, which does not exist. Normally, when this intersection is shorted (level low), it is considered right. If you define `#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT`, it is determined to be left when the level is low.
 
 * `#define EE_HANDS` (only works if `SPLIT_HAND_PIN` and `SPLIT_HAND_MATRIX_GRID` are not defined)
   * Reads the handedness value stored in the EEPROM after `eeprom-lefthand.eep`/`eeprom-righthand.eep` has been flashed to their respective halves.
diff --git a/docs/custom_quantum_functions.md b/docs/custom_quantum_functions.md
index 957633837c4..bc3b28bbba7 100644
--- a/docs/custom_quantum_functions.md
+++ b/docs/custom_quantum_functions.md
@@ -119,11 +119,11 @@ void keyboard_pre_init_user(void) {
   // Call the keyboard pre init code.
 
   // Set our LED pins as output
-  setPinOutput(B0);
-  setPinOutput(B1);
-  setPinOutput(B2);
-  setPinOutput(B3);
-  setPinOutput(B4);
+  gpio_set_pin_output(B0);
+  gpio_set_pin_output(B1);
+  gpio_set_pin_output(B2);
+  gpio_set_pin_output(B3);
+  gpio_set_pin_output(B4);
 }
 ```
 
diff --git a/docs/driver_installation_zadig.md b/docs/driver_installation_zadig.md
index 3b2c0b74dc4..0440d6a4aa5 100644
--- a/docs/driver_installation_zadig.md
+++ b/docs/driver_installation_zadig.md
@@ -70,13 +70,13 @@ The device name here is the name that appears in Zadig, and may not be what the
 
 |Bootloader    |Device Name                   |VID/PID       |Driver |
 |--------------|------------------------------|--------------|-------|
-|`atmel-dfu`   |ATmega16u2 DFU                |`03EB:2FEF`   |libusb0|
-|`atmel-dfu`   |ATmega32U2 DFU                |`03EB:2FF0`   |libusb0|
-|`atmel-dfu`   |ATm16U4 DFU V1.0.2            |`03EB:2FF3`   |libusb0|
-|`atmel-dfu`   |ATm32U4DFU                    |`03EB:2FF4`   |libusb0|
-|`atmel-dfu`   |*none* (AT90USB64)            |`03EB:2FF9`   |libusb0|
-|`atmel-dfu`   |AT90USB128 DFU                |`03EB:2FFB`   |libusb0|
-|`qmk-dfu`     |(keyboard name) Bootloader    |As `atmel-dfu`|libusb0|
+|`atmel-dfu`   |ATmega16u2 DFU                |`03EB:2FEF`   |WinUSB |
+|`atmel-dfu`   |ATmega32U2 DFU                |`03EB:2FF0`   |WinUSB |
+|`atmel-dfu`   |ATm16U4 DFU V1.0.2            |`03EB:2FF3`   |WinUSB |
+|`atmel-dfu`   |ATm32U4DFU                    |`03EB:2FF4`   |WinUSB |
+|`atmel-dfu`   |*none* (AT90USB64)            |`03EB:2FF9`   |WinUSB |
+|`atmel-dfu`   |AT90USB128 DFU                |`03EB:2FFB`   |WinUSB |
+|`qmk-dfu`     |(keyboard name) Bootloader    |As `atmel-dfu`|WinUSB |
 |`halfkay`     |*none*                        |`16C0:0478`   |HidUsb |
 |`caterina`    |Pro Micro 3.3V                |`1B4F:9203`   |usbser |
 |`caterina`    |Pro Micro 5V                  |`1B4F:9205`   |usbser |
diff --git a/docs/feature_bootmagic.md b/docs/feature_bootmagic.md
index 4239cdfd2a2..564760be925 100644
--- a/docs/feature_bootmagic.md
+++ b/docs/feature_bootmagic.md
@@ -1,8 +1,8 @@
-# Bootmagic Lite :id=bootmagic-lite
+# Bootmagic :id=bootmagic
 
-The Bootmagic Lite feature that only handles jumping into the bootloader. This is great for boards that don't have a physical reset button, giving you a way to jump into the bootloader
+The Bootmagic feature that only handles jumping into the bootloader. This is great for boards that don't have a physical reset button, giving you a way to jump into the bootloader
 
-On some keyboards Bootmagic Lite is disabled by default. If this is the case, it must be explicitly enabled in your `rules.mk` with:
+On some keyboards Bootmagic is disabled by default. If this is the case, it must be explicitly enabled in your `rules.mk` with:
 
 ```make
 BOOTMAGIC_ENABLE = yes
@@ -11,15 +11,15 @@ BOOTMAGIC_ENABLE = yes
 Additionally, you may want to specify which key to use. This is especially useful for keyboards that have unusual matrices. To do so, you need to specify the row and column of the key that you want to use. Add these entries to your `config.h` file:
 
 ```c
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
+#define BOOTMAGIC_ROW 0
+#define BOOTMAGIC_COLUMN 1
 ```
 
 By default, these are set to 0 and 0, which is usually the "ESC" key on a majority of keyboards.
 
 And to trigger the bootloader, you hold this key down when plugging the keyboard in. Just the single key.
 
-!> Using Bootmagic Lite will **always reset** the EEPROM, so you will lose any settings that have been saved.
+!> Using Bootmagic will **always reset** the EEPROM, so you will lose any settings that have been saved.
 
 ## Split Keyboards
 
@@ -44,35 +44,35 @@ When [handedness](feature_split_keyboard.md#setting-handedness) is predetermined
     }
 ```
 
-If you pick the top right key for the right half, it is `R05` on the top layout. Within the key matrix below, `R05` is located on row 4 columnn 4. To use that key as the right half's Bootmagic Lite trigger, add these entries to your `config.h` file:
+If you pick the top right key for the right half, it is `R05` on the top layout. Within the key matrix below, `R05` is located on row 4 columnn 4. To use that key as the right half's Bootmagic trigger, add these entries to your `config.h` file:
 
 ```c
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
+#define BOOTMAGIC_ROW_RIGHT 4
+#define BOOTMAGIC_COLUMN_RIGHT 4
 ```
 
 ?> These values are not set by default.
 
-## Advanced Bootmagic Lite
+## Advanced Bootmagic
 
-The `bootmagic_lite` function is defined weakly, so that you can replace this in your code, if you need. A great example of this is the Zeal60 boards that have some additional handling needed.
+The `bootmagic_scan` function is defined weakly, so that you can replace this in your code, if you need. A great example of this is the Zeal60 boards that have some additional handling needed.
 
 To replace the function, all you need to do is add something like this to your code:
 
 ```c
-void bootmagic_lite(void) {
+void bootmagic_scan(void) {
     matrix_scan();
     wait_ms(DEBOUNCE * 2);
     matrix_scan();
 
-    if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
+    if (matrix_get_row(BOOTMAGIC_ROW) & (1 << BOOTMAGIC_COLUMN)) {
       // Jump to bootloader.
       bootloader_jump();
     }
 }
 ```
 
-You can define additional logic here. For instance, resetting the EEPROM or requiring additional keys to be pressed to trigger Bootmagic Lite. Keep in mind that `bootmagic_lite` is called before a majority of features are initialized in the firmware.
+You can define additional logic here. For instance, resetting the EEPROM or requiring additional keys to be pressed to trigger Bootmagic. Keep in mind that `bootmagic_scan` is called before a majority of features are initialized in the firmware.
 
 ## Addenda
 
diff --git a/docs/feature_combo.md b/docs/feature_combo.md
index 2e802446b6b..61f8b2ee197 100644
--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -333,27 +333,26 @@ will give the _NAV layer as a reference to it's self. All other layers
 will have the default for their combo reference layer. If the default
 is not set, all other layers will reference themselves.
 
-    ```c
-    #define COMBO_REF_DEFAULT _MY_COMBO_LAYER
-    ...
-
-    uint8_t combo_ref_from_layer(uint8_t layer){
-        switch (get_highest_layer(layer_state)){
-            case _DVORAK: return _QWERTY;
-            case _NAV: return _NAV;
-            default: return _MY_COMBO_LAYER;
-        }
-        return layer;  // important if default is not in case.
+```c
+#define COMBO_REF_DEFAULT _MY_COMBO_LAYER
+
+uint8_t combo_ref_from_layer(uint8_t layer){
+    switch (get_highest_layer(layer_state)){
+        case _DVORAK: return _QWERTY;
+        case _NAV: return _NAV;
+        default: return _MY_COMBO_LAYER;
     }
-    ```
+    return layer;  // important if default is not in case.
+}
+```
 
 The equivalent definition using the combo macros is this:
 
-    ```c
-    COMBO_REF_LAYER(_DVORAK, _QWERTY)
-    COMBO_REF_LAYER(_NAV, _NAV)
-    DEFAULT_REF_LAYER(_MY_COMBO_LAYER).
-    ```
+```c
+COMBO_REF_LAYER(_DVORAK, _QWERTY)
+COMBO_REF_LAYER(_NAV, _NAV)
+DEFAULT_REF_LAYER(_MY_COMBO_LAYER).
+```
     
 
 ## User callbacks
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index 11bdbed576b..62c214e2462 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -19,6 +19,7 @@ The following converters are available at this time:
 | `promicro` | `elite_pi`        |
 | `promicro` | `helios`          |
 | `promicro` | `liatris`         |
+| `promicro` | `imera`           |
 | `promicro` | `michi`           |
 | `elite_c`  | `stemcell`        |
 | `elite_c`  | `rp2040_ce`       |
@@ -82,6 +83,7 @@ If a board currently supported in QMK uses a [Pro Micro](https://www.sparkfun.co
 | [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)         | `elite_pi`        |
 | [0xCB Helios](https://keeb.supply/products/0xcb-helios)                                  | `helios`          |
 | [Liatris](https://splitkb.com/products/liatris)                                          | `liatris`         |
+| [Imera](https://splitkb.com/products/imera)                                              | `imera`           |
 | [Michi](https://github.com/ci-bus/michi-promicro-rp2040)                                 | `michi`           |
 
 Converter summary:
@@ -99,6 +101,7 @@ Converter summary:
 | `elite_pi`        | `-e CONVERT_TO=elite_pi`        | `CONVERT_TO=elite_pi`        | `#ifdef CONVERT_TO_ELITE_PI`        |
 | `helios`          | `-e CONVERT_TO=helios`          | `CONVERT_TO=helios`          | `#ifdef CONVERT_TO_HELIOS`          |
 | `liatris`         | `-e CONVERT_TO=liatris`         | `CONVERT_TO=liatris`         | `#ifdef CONVERT_TO_LIATRIS`         |
+| `imera`           | `-e CONVERT_TO=imera`           | `CONVERT_TO=imera`           | `#ifdef CONVERT_TO_IMERA`           |
 | `michi`           | `-e CONVERT_TO=michi`           | `CONVERT_TO=michi`           | `#ifdef CONVERT_TO_MICHI`           |
 
 ### Proton C :id=proton_c
diff --git a/docs/feature_dip_switch.md b/docs/feature_dip_switch.md
index 6fbe91657d5..0e31f5acae8 100644
--- a/docs/feature_dip_switch.md
+++ b/docs/feature_dip_switch.md
@@ -20,6 +20,27 @@ or
 #define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {2,6} } // List of row and col pairs
 ```
 
+## DIP Switch map :id=dip-switch-map
+
+DIP Switch mapping may be added to your `keymap.c`, which replicates the normal keyswitch functionality, but with dip switches. Add this to your keymap's `rules.mk`:
+
+```make
+DIP_SWITCH_MAP_ENABLE = yes
+```
+
+Your `keymap.c` will then need a dip switch mapping defined (for two dip switches):
+
+```c
+#if defined(DIP_SWITCH_MAP_ENABLE)
+const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = {
+    DIP_SWITCH_OFF_ON(DF(0), DF(1)),
+    DIP_SWITCH_OFF_ON(EC_NORM, EC_SWAP)
+};
+#endif
+```
+
+?> This should only be enabled at the keymap level.
+
 ## Callbacks
 
 The callback functions can be inserted into your `<keyboard>.c`:
diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index 891baeefa1d..4eeb388e577 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -82,10 +82,10 @@ Your `keymap.c` will then need an encoder mapping defined (for four layers and t
 ```c
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] =   { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
-    [_LOWER] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),           ENCODER_CCW_CW(RGB_SAD, RGB_SAI)  },
-    [_RAISE] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),           ENCODER_CCW_CW(RGB_SPD, RGB_SPI)  },
-    [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD),          ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
+    [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),           ENCODER_CCW_CW(RGB_SAD, RGB_SAI)  },
+    [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),           ENCODER_CCW_CW(RGB_SPD, RGB_SPI)  },
+    [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD),          ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
 };
 #endif
 ```
diff --git a/docs/feature_joystick.md b/docs/feature_joystick.md
index 7b699aef175..0e4529b2ebc 100644
--- a/docs/feature_joystick.md
+++ b/docs/feature_joystick.md
@@ -50,10 +50,6 @@ Axes can be configured using one of the following macros:
 
  * `JOYSTICK_AXIS_IN(input_pin, low, rest, high)`  
    The ADC samples the provided pin. `low`, `high` and `rest` correspond to the minimum, maximum, and resting (or centered) analog values of the axis, respectively.
- * `JOYSTICK_AXIS_IN_OUT(input_pin, output_pin, low, rest, high)`  
-   Same as `JOYSTICK_AXIS_IN()`, but the provided `output_pin` will be pulled high before `input_pin` is read.
- * `JOYSTICK_AXIS_IN_OUT_GROUND(input_pin, output_pin, ground_pin, low, rest, high)`  
-   Same as `JOYSTICK_AXIS_IN_OUT()`, but the provided `ground_pin` will be pulled low before reading from `input_pin`.
  * `JOYSTICK_AXIS_VIRTUAL`  
    No ADC reading is performed. The value should be provided by user code.
 
@@ -160,12 +156,8 @@ Describes a single axis.
 
 #### Members :id=api-joystick-config-t-members
 
- - `pin_t output_pin`  
-   A pin to set as output high when reading the analog value, or `JS_VIRTUAL_AXIS`.
  - `pin_t input_pin`  
    The pin to read the analog value from, or `JS_VIRTUAL_AXIS`.
- - `pin_t ground_pin`  
-   A pin to set as output low when reading the analog value, or `JS_VIRTUAL_AXIS`.
  - `uint16_t min_digit`  
    The minimum analog value.
  - `uint16_t mid_digit`  
diff --git a/docs/feature_led_indicators.md b/docs/feature_led_indicators.md
index 1f71cdb1c81..b35a1744907 100644
--- a/docs/feature_led_indicators.md
+++ b/docs/feature_led_indicators.md
@@ -56,16 +56,16 @@ This is a template indicator function that can be implemented on keyboard level
 bool led_update_kb(led_t led_state) {
     bool res = led_update_user(led_state);
     if(res) {
-        // writePin sets the pin high for 1 and low for 0.
+        // gpio_write_pin sets the pin high for 1 and low for 0.
         // In this example the pins are inverted, setting
         // it low/0 turns it on, and high/1 turns the LED off.
         // This behavior depends on whether the LED is between the pin
         // and VCC or the pin and GND.
-        writePin(B0, !led_state.num_lock);
-        writePin(B1, !led_state.caps_lock);
-        writePin(B2, !led_state.scroll_lock);
-        writePin(B3, !led_state.compose);
-        writePin(B4, !led_state.kana);
+        gpio_write_pin(B0, !led_state.num_lock);
+        gpio_write_pin(B1, !led_state.caps_lock);
+        gpio_write_pin(B2, !led_state.scroll_lock);
+        gpio_write_pin(B3, !led_state.compose);
+        gpio_write_pin(B4, !led_state.kana);
     }
     return res;
 }
diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index b1ce09d3494..3a3a9dbf844 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -54,7 +54,7 @@ For split keyboards using `LED_MATRIX_SPLIT` with an LED driver, you can either
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *    driver
  *    |  LED address
@@ -65,7 +65,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
 }
 ```
 
-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` ).
+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-mono.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` ).
 
 ---
 ### IS31FLCOMMON :id=is31flcommon
@@ -142,8 +142,8 @@ const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
  *    driver
  *    |  LED address
  *    |  | */
-    { 0, CS1_SW1 },
-    { 0, CS2_SW1 },
+    { 0, SW1_CS1 },
+    { 0, SW1_CS2 },
     // ...
 }
 ```
@@ -357,7 +357,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
 ```c
 #define LED_MATRIX_KEYRELEASES // reactive effects respond to keyreleases (instead of keypresses)
 #define LED_MATRIX_TIMEOUT 0 // number of milliseconds to wait until led automatically turns off
-#define LED_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define LED_MATRIX_SLEEP // turn off effects when suspended
 #define LED_MATRIX_LED_PROCESS_LIMIT (LED_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
 #define LED_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 LED_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs
@@ -365,6 +365,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
 #define LED_MATRIX_DEFAULT_MODE LED_MATRIX_SOLID // Sets the default mode, if none has been set
 #define LED_MATRIX_DEFAULT_VAL LED_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
 #define LED_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
+#define LED_MATRIX_DEFAULT_FLAGS LED_FLAG_ALL // Sets the default LED flags, if none has been set
 #define LED_MATRIX_SPLIT { X, Y }   // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
                                     // If reactive effects are enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
 ```
diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index c7d6c1a918a..f0533f14fef 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -69,9 +69,9 @@ The current list of available languages is:
 | **italian_osx_iso** | **jis** | **latvian** | **lithuanian_azerty** |
 | **lithuanian_qwerty** | **norman** | **norwegian** | **portuguese** |
 | **portuguese_osx_iso** | **romanian** | **serbian_latin** | **slovak** |
-| **slovenian** | **spanish_dvorak** | **spanish** | **swedish** |
-| **turkish_f** | **turkish_q** | **uk** | **us_international** |
-| **workman** | **workman_zxcvm** |
+| **slovenian** | **spanish_dvorak** | **spanish_latin_america** | **spanish** |
+| **swedish** | **turkish_f** | **turkish_q** | **uk** |
+| **us_international** | **workman** | **workman_zxcvm** |
 
 ### Macro Basics
 
diff --git a/docs/feature_os_detection.md b/docs/feature_os_detection.md
index 907638bcfae..a50ee7ccc23 100644
--- a/docs/feature_os_detection.md
+++ b/docs/feature_os_detection.md
@@ -14,7 +14,7 @@ In your `rules.mk` add:
 OS_DETECTION_ENABLE = yes
 ```
 
-Include `"os_detection.h"` in your `keymap.c`.
+It will automatically include the required headers file.
 It declares `os_variant_t detected_host_os(void);` which you can call to get detected OS.
 
 It returns one of the following values:
@@ -32,6 +32,54 @@ enum {
 ?> Note that it takes some time after firmware is booted to detect the OS.
 This time is quite short, probably hundreds of milliseconds, but this data may be not ready in keyboard and layout setup functions which run very early during firmware startup.
 
+## Callbacks :id=callbacks
+
+If you want to perform custom actions when the OS is detected, then you can use the `process_detected_host_os_kb` function on the keyboard level source file, or `process_detected_host_os_user` function in the user `keymap.c`.
+
+```c
+bool process_detected_host_os_kb(os_variant_t detected_os) {
+    if (!process_detected_host_os_user(detected_os)) {
+        return false;
+    }
+    switch (detected_os) {
+        case OS_MACOS:
+        case OS_IOS:
+            rgb_matrix_set_color_all(RGB_WHITE);
+            break;
+        case OS_WINDOWS:
+            rgb_matrix_set_color_all(RGB_BLUE);
+            break;
+        case OS_LINUX:
+            rgb_matrix_set_color_all(RGB_ORANGE);
+            break;
+        case OS_UNSURE:
+            rgb_matrix_set_color_all(RGB_RED);
+            break;
+    }
+    
+    return true;
+}
+```
+
+## OS detection stability
+
+The OS detection is currently handled while the USB device descriptor is being assembled. 
+The process is done in steps, generating a number of intermediate results until it stabilizes.
+We therefore resort to debouncing the result until it has been stable for a given amount of milliseconds.
+This amount can be configured, in case your board is not stable within the default debouncing time of 200ms.
+
+## KVM and USB switches
+
+Some KVM and USB switches may not trigger the USB controller on the keyboard to fully reset upon switching machines.
+If your keyboard does not redetect the OS in this situation, you can force the keyboard to reset when the USB initialization event is detected, forcing the USB controller to be reconfigured.
+
+## Configuration Options
+
+* `#define OS_DETECTION_DEBOUNCE 200`
+  * defined the debounce time for OS detection, in milliseconds
+* `#define OS_DETECTION_KEYBOARD_RESET`
+  * enables the keyboard reset upon a USB device reinitilization, such as switching devices on some KVMs
+
 ## Debug
 
 If OS is guessed incorrectly, you may want to collect data about USB setup packets to refine the detection logic.
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 0ac0069ff8b..b091dec08b9 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -69,10 +69,29 @@ The Analog Joystick is an analog (ADC) driven sensor.  There are a variety of jo
 | `ANALOG_JOYSTICK_Y_AXIS_PIN`      | (Required) The pin used for the horizontal/Y axis.                         | _not defined_ |
 | `ANALOG_JOYSTICK_AXIS_MIN`        | (Optional) Sets the lower range to be considered movement.                 | `0`           |
 | `ANALOG_JOYSTICK_AXIS_MAX`        | (Optional) Sets the upper range to be considered movement.                 | `1023`        |
+| `ANALOG_JOYSTICK_AUTO_AXIS`       | (Optional) Sets ranges to be considered movement automatically.            | _not defined_ |
 | `ANALOG_JOYSTICK_SPEED_REGULATOR` | (Optional) The divisor used to slow down movement. (lower makes it faster) | `20`          |
 | `ANALOG_JOYSTICK_READ_INTERVAL`   | (Optional) The interval in milliseconds between reads.                     | `10`          |
 | `ANALOG_JOYSTICK_SPEED_MAX`       | (Optional) The maximum value used for motion.                              | `2`           |
 | `ANALOG_JOYSTICK_CLICK_PIN`       | (Optional) The pin wired up to the press switch of the analog stick.       | _not defined_ |
+| `ANALOG_JOYSTICK_WEIGHTS`         | (Optional) Use custom weights for lever positions.                         | _not defined_ |
+| `ANALOG_JOYSTICK_CUTOFF`          | (Optional) Cut off movement when joystick returns to start position.       | _not defined_ |
+
+If `ANALOG_JOYSTICK_AUTO_AXIS` is used, then `ANALOG_JOYSTICK_AXIS_MIN` and `ANALOG_JOYSTICK_AXIS_MAX` are ignored.
+
+By default analog joystick implementation uses `x^2` weighting for lever positions. `ANALOG_JOYSTICK_WEIGHTS` allows to experiment with different configurations that might feel better.
+
+E.g. This is weights for `((x-0.4)^3+0.064)/0.282`:
+
+```c
+#define ANALOG_JOYSTICK_WEIGHTS {0,2,4,5,7,8,9,10,12,13,14,15,15,16,17,18,18,19,19,20,20,21,21,21,22,22,22,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,24,24,24,24,24,25,25,25,26,26,26,27,28,28,29,29,30,31,32,33,34,35,36,37,38,40,41,43,44,46,48,49,51,53,56,58,60,62,65,68,70,73,76,79,82,85,89,92,96,100}
+```
+
+You can use following JS code to generate weights for different formulas:
+
+```js
+JSON.stringify(Array.from(Array(101).keys()).map(x => Math.ceil((((x/100-0.4)**3+0.064)/0.282*100))))
+```
 
 ### Azoteq IQS5XX Trackpad
 
@@ -158,12 +177,13 @@ This supports the Cirque Pinnacle 1CA027 Touch Controller, which is used in the
 
 #### Common settings
 
-| Setting                          | Description                                                | Default                                     |
-| -------------------------------- | ---------------------------------------------------------- | ------------------------------------------- |
-| `CIRQUE_PINNACLE_DIAMETER_MM`    | (Optional) Diameter of the trackpad sensor in millimeters. | `40`                                        |
-| `CIRQUE_PINNACLE_ATTENUATION`    | (Optional) Sets the attenuation of the sensor data.        | `EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_4X` |
-| `CIRQUE_PINNACLE_CURVED_OVERLAY` | (Optional) Applies settings tuned for curved overlay.      | _not defined_                               |
-| `CIRQUE_PINNACLE_POSITION_MODE`  | (Optional) Mode of operation.                              | _not defined_                               |
+| Setting                              | Description                                                | Default                                     |
+| ------------------------------------ | ---------------------------------------------------------- | ------------------------------------------- |
+| `CIRQUE_PINNACLE_DIAMETER_MM`        | (Optional) Diameter of the trackpad sensor in millimeters. | `40`                                        |
+| `CIRQUE_PINNACLE_ATTENUATION`        | (Optional) Sets the attenuation of the sensor data.        | `EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_4X` |
+| `CIRQUE_PINNACLE_CURVED_OVERLAY`     | (Optional) Applies settings tuned for curved overlay.      | _not defined_                               |
+| `CIRQUE_PINNACLE_POSITION_MODE`      | (Optional) Mode of operation.                              | _not defined_                               |
+| `CIRQUE_PINNACLE_SKIP_SENSOR_CHECK`  | (Optional) Skips sensor presence check                     | _not defined_                               |
 
 **`CIRQUE_PINNACLE_ATTENUATION`** is a measure of how much data is suppressed in regards to sensitivity. The higher the attenuation, the less sensitive the touchpad will be.
 
@@ -197,12 +217,13 @@ Also see the `POINTING_DEVICE_TASK_THROTTLE_MS`, which defaults to 10ms when usi
 
 #### Absolute mode settings
 
-| Setting                          | Description                                                | Default            |
-| -------------------------------- | ---------------------------------------------------------- | ------------------ |
-| `CIRQUE_PINNACLE_X_LOWER`        | (Optional) The minimum reachable X value on the sensor.    | `127`              |
-| `CIRQUE_PINNACLE_X_UPPER`        | (Optional) The maximum reachable X value on the sensor.    | `1919`             |
-| `CIRQUE_PINNACLE_Y_LOWER`        | (Optional) The minimum reachable Y value on the sensor.    | `63`               |
-| `CIRQUE_PINNACLE_Y_UPPER`        | (Optional) The maximum reachable Y value on the sensor.    | `1471`             |
+| Setting                                 | Description                                                             | Default     |
+|-----------------------------------------|-------------------------------------------------------------------------|-------------|
+| `CIRQUE_PINNACLE_X_LOWER`               | (Optional) The minimum reachable X value on the sensor.                 | `127`       |
+| `CIRQUE_PINNACLE_X_UPPER`               | (Optional) The maximum reachable X value on the sensor.                 | `1919`      |
+| `CIRQUE_PINNACLE_Y_LOWER`               | (Optional) The minimum reachable Y value on the sensor.                 | `63`        |
+| `CIRQUE_PINNACLE_Y_UPPER`               | (Optional) The maximum reachable Y value on the sensor.                 | `1471`      |
+| `CIRQUE_PINNACLE_REACHABLE_CALIBRATION` | (Optional) Enable console messages to aide in calibrating above values. | not defined |
 
 #### Absolute mode gestures
 
@@ -708,6 +729,7 @@ There are a few ways to control the auto mouse feature with both `config.h` opti
 | `AUTO_MOUSE_TIME`                   | (Optional) Time layer remains active after activation                 | _ideally_ (250-1000) |     _ms_    |                   `650 ms` |
 | `AUTO_MOUSE_DELAY`                  | (Optional) Lockout time after non-mouse key is pressed                | _ideally_ (100-1000) |     _ms_    | `TAPPING_TERM` or `200 ms` |
 | `AUTO_MOUSE_DEBOUNCE`               | (Optional) Time delay from last activation to next update             | _ideally_ (10 - 100) |     _ms_    |                    `25 ms` |
+| `AUTO_MOUSE_THRESHOLD`              | (Optional) Amount of mouse movement required to switch layers         | 0 -                  |   _units_   |                 `10 units` |
 
 ### Adding mouse keys
 
diff --git a/docs/feature_rawhid.md b/docs/feature_rawhid.md
index 094dd21c7e9..64cb42fdfee 100644
--- a/docs/feature_rawhid.md
+++ b/docs/feature_rawhid.md
@@ -28,7 +28,7 @@ To send data to the keyboard, you must first find a library for communicating wi
 * **Node.js:** [node-hid](https://github.com/node-hid/node-hid)
 * **C/C++:** [hidapi](https://github.com/libusb/hidapi)
 * **Java:** [purejavahidapi](https://github.com/nyholku/purejavahidapi) and [hid4java](https://github.com/gary-rowe/hid4java)
-* **Python:** [pyhidapi](https://pypi.org/project/hid/)
+* **Python:** [pyhidapi](https://pypi.org/project/hid/) and [pywinusb](https://pypi.org/project/pywinusb)
 
 Please refer to these libraries' own documentation for instructions on usage. Remember to close the device once you are finished with it!
 
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 824ff50648a..d05d768ceb8 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -55,7 +55,7 @@ For split keyboards using `RGB_MATRIX_SPLIT` with an LED driver, you can either
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -139,19 +139,19 @@ Currently only 4 drivers are supported, but it would be trivial to support all 8
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
- *   |  |       G location
- *   |  |       |       B location
- *   |  |       |       | */
-    {0, B_1,    A_1,    C_1},
+ *   |  |        G location
+ *   |  |        |        B location
+ *   |  |        |        | */
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},
     ....
 }
 ```
 
-Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3733.pdf) and the header file `drivers/led/issi/is31fl3733.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` for now).
+Where `SWx_CSy` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3733.pdf) and the header file `drivers/led/issi/is31fl3733.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` for now).
 
 ---
 ### IS31FL3736 :id=is31fl3736
@@ -218,14 +218,14 @@ Here is an example using 2 drivers.
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31fl3736_led_t PROGMEM g_is31fl3736_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
- *   |  |       G location
- *   |  |       |       B location
- *   |  |       |       | */
-    {0, B_1,    A_1,    C_1},
+ *   |  |        G location
+ *   |  |        |        B location
+ *   |  |        |        | */
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},
     ....
 }
 ```
@@ -292,19 +292,19 @@ Here is an example using 2 drivers.
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
- *   |  |       G location
- *   |  |       |       B location
- *   |  |       |       | */
-    {0, B_1,    A_1,    C_1},
+ *   |  |        G location
+ *   |  |        |        B location
+ *   |  |        |        | */
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},
     ....
 }
 ```
 
-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`, `2`, or `3` for now).
+Where `SWx_CSy` 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`, `2`, or `3` for now).
 
 ---
 ### IS31FLCOMMON :id=is31flcommon
@@ -386,7 +386,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |        G location
  *   |  |        |        B location
  *   |  |        |        | */
-    {0, CS1_SW1, CS2_SW1, CS3_SW1},
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},
     ....
 }
 ```
@@ -501,7 +501,7 @@ Here is an example using 2 drivers.
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const aw20216s_led_t PROGMEM g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Each AW20216S channel is controlled by a register at some offset between 0x00
  * and 0xD7 inclusive.
  * See drivers/led/aw20216s.h for the mapping between register offsets and
@@ -511,16 +511,16 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
  *    |  |        G location
  *    |  |        |        B location
  *    |  |        |        | */
-    { 0, CS1_SW1, CS2_SW1, CS3_SW1 },
-    { 0, CS4_SW1, CS5_SW1, CS6_SW1 },
-    { 0, CS7_SW1, CS8_SW1, CS9_SW1 },
-    { 0, CS10_SW1, CS11_SW1, CS12_SW1 },
-    { 0, CS13_SW1, CS14_SW1, CS15_SW1 },
+    { 0, SW1_CS1, SW1_CS2, SW1_CS3 },
+    { 0, SW1_CS4, SW1_CS5, SW1_CS6 },
+    { 0, SW1_CS7, SW1_CS8, SW1_CS9 },
+    { 0, SW1_CS10, SW1_CS11, SW1_CS12 },
+    { 0, SW1_CS13, SW1_CS14, SW1_CS15 },
     ...
-    { 1, CS1_SW1, CS2_SW1, CS3_SW1 },
-    { 1, CS13_SW1, CS14_SW1, CS15_SW1 },
-    { 1, CS16_SW1, CS17_SW1, CS18_SW1 },
-    { 1, CS4_SW2, CS5_SW2, CS6_SW2 },
+    { 1, SW1_CS1, SW1_CS2, SW1_CS3 },
+    { 1, SW1_CS13, SW1_CS14, SW1_CS15 },
+    { 1, SW1_CS16, SW1_CS17, SW1_CS18 },
+    { 1, SW2_CS4, SW2_CS5, SW2_CS6 },
     ...
 };
 ```
@@ -869,16 +869,17 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master
 ```c
 #define RGB_MATRIX_KEYRELEASES // reactive effects respond to keyreleases (instead of keypresses)
 #define RGB_MATRIX_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_SLEEP // turn off effects when suspended
 #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+#define RGB_MATRIX_DEFAULT_ON true // Sets the default enabled state, if none has been set
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
 #define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set
 #define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
-#define RGB_MATRIX_DEFAULT_ON true // Sets the default enabled state, if none has been set
 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
 #define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
+#define RGB_MATRIX_DEFAULT_FLAGS LED_FLAG_ALL // Sets the default LED flags, if none has been set
 #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
 #define RGB_MATRIX_SPLIT { X, Y } 	// (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
                               		// If reactive effects are enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 8a64454b0db..b7ba0757317 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -33,13 +33,13 @@ RGBLIGHT_DRIVER = apa102
 
 At minimum you must define the data pin your LED strip is connected to, and the number of LEDs in the strip, in your `config.h`. For APA102 LEDs, you must also define the clock pin. If your keyboard has onboard RGB LEDs, and you are simply creating a keymap, you usually won't need to modify these.
 
-|Define         |Description                                                              |
-|---------------|-------------------------------------------------------------------------|
-|`WS2812_DI_PIN`|The pin connected to the data pin of the LEDs (WS2812)                   |
-|`APA102_DI_PIN`|The pin connected to the data pin of the LEDs (APA102)                   |
-|`APA102_CI_PIN`|The pin connected to the clock pin of the LEDs (APA102)                  |
-|`RGBLED_NUM`   |The number of LEDs connected                                             |
-|`RGBLED_SPLIT` |(Optional) For split keyboards, the number of LEDs connected on each half|
+|Define              |Description                                                              |
+|--------------------|-------------------------------------------------------------------------|
+|`WS2812_DI_PIN`     |The pin connected to the data pin of the LEDs (WS2812)                   |
+|`APA102_DI_PIN`     |The pin connected to the data pin of the LEDs (APA102)                   |
+|`APA102_CI_PIN`     |The pin connected to the clock pin of the LEDs (APA102)                  |
+|`RGBLIGHT_LED_COUNT`|The number of LEDs connected                                             |
+|`RGBLED_SPLIT`      |(Optional) For split keyboards, the number of LEDs connected on each half|
 
 Then you should be able to use the keycodes below to change the RGB lighting to your liking.
 
@@ -152,28 +152,28 @@ Use these defines to add or remove animations from the firmware. When you are ru
 
 The following options are used to tweak the various animations:
 
-|Define                              |Default      |Description                                                                                    |
-|------------------------------------|-------------|-----------------------------------------------------------------------------------------------|
-|`RGBLIGHT_EFFECT_BREATHE_CENTER`    |*Not defined*|If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7 |
-|`RGBLIGHT_EFFECT_BREATHE_MAX`       |`255`        |The maximum brightness for the breathing mode. Valid values are 1 to 255                       |
-|`RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL`|`40`         |How long (in milliseconds) to wait between animation steps for the "Christmas" animation       |
-|`RGBLIGHT_EFFECT_CHRISTMAS_STEP`    |`2`          |The number of LEDs to group the red/green colors by for the "Christmas" animation              |
-|`RGBLIGHT_EFFECT_KNIGHT_LED_NUM`    |`RGBLED_NUM` |The number of LEDs to have the "Knight" animation travel                                       |
-|`RGBLIGHT_EFFECT_KNIGHT_LENGTH`     |`3`          |The number of LEDs to light up for the "Knight" animation                                      |
-|`RGBLIGHT_EFFECT_KNIGHT_OFFSET`     |`0`          |The number of LEDs to start the "Knight" animation from the start of the strip by              |
-|`RGBLIGHT_RAINBOW_SWIRL_RANGE`      |`255`        |Range adjustment for the rainbow swirl effect to get different swirls                          |
-|`RGBLIGHT_EFFECT_SNAKE_LENGTH`      |`4`          |The number of LEDs to light up for the "Snake" animation                                       |
-|`RGBLIGHT_EFFECT_TWINKLE_LIFE`      |`200`        |Adjusts how quickly each LED brightens and dims when twinkling (in animation steps)            |
-|`RGBLIGHT_EFFECT_TWINKLE_PROBABILITY`|`1/127`     |Adjusts how likely each LED is to twinkle (on each animation step)                             |
+|Define                              |Default             |Description                                                                                    |
+|------------------------------------|--------------------|-----------------------------------------------------------------------------------------------|
+|`RGBLIGHT_EFFECT_BREATHE_CENTER`    |*Not defined*       |If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7 |
+|`RGBLIGHT_EFFECT_BREATHE_MAX`       |`255`               |The maximum brightness for the breathing mode. Valid values are 1 to 255                       |
+|`RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL`|`40`                |How long (in milliseconds) to wait between animation steps for the "Christmas" animation       |
+|`RGBLIGHT_EFFECT_CHRISTMAS_STEP`    |`2`                 |The number of LEDs to group the red/green colors by for the "Christmas" animation              |
+|`RGBLIGHT_EFFECT_KNIGHT_LED_NUM`    |`RGBLIGHT_LED_COUNT`|The number of LEDs to have the "Knight" animation travel                                       |
+|`RGBLIGHT_EFFECT_KNIGHT_LENGTH`     |`3`                 |The number of LEDs to light up for the "Knight" animation                                      |
+|`RGBLIGHT_EFFECT_KNIGHT_OFFSET`     |`0`                 |The number of LEDs to start the "Knight" animation from the start of the strip by              |
+|`RGBLIGHT_RAINBOW_SWIRL_RANGE`      |`255`               |Range adjustment for the rainbow swirl effect to get different swirls                          |
+|`RGBLIGHT_EFFECT_SNAKE_LENGTH`      |`4`                 |The number of LEDs to light up for the "Snake" animation                                       |
+|`RGBLIGHT_EFFECT_TWINKLE_LIFE`      |`200`               |Adjusts how quickly each LED brightens and dims when twinkling (in animation steps)            |
+|`RGBLIGHT_EFFECT_TWINKLE_PROBABILITY`|`1/127`            |Adjusts how likely each LED is to twinkle (on each animation step)                             |
 
 ### Example Usage to Reduce Memory Footprint
   1. Use `#undef` to selectively disable animations. The following would disable two animations and save about 4KiB:
 
 ```diff
- #undef RGBLED_NUM
+ #undef RGBLIGHT_LED_COUNT
 +#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
 +#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
- #define RGBLED_NUM 12
+ #define RGBLIGHT_LED_COUNT 12
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
 ```
@@ -386,10 +386,10 @@ rgblight_set(); // Utility functions do not call rgblight_set() automatically, s
 #### direct operation
 |Function                                    |Description  |
 |--------------------------------------------|-------------|
-|`rgblight_setrgb_at(r, g, b, index)`          |Set a single LED to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `index` is between 0 and `RGBLED_NUM` (not written to EEPROM) |
-|`rgblight_sethsv_at(h, s, v, index)`          |Set a single LED to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `index` is between 0 and `RGBLED_NUM` (not written to EEPROM) |
-|`rgblight_setrgb_range(r, g, b, start, end)`|Set a continuous range of LEDs to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `start`(included) and `stop`(excluded) are between 0 and `RGBLED_NUM` (not written to EEPROM)|
-|`rgblight_sethsv_range(h, s, v, start, end)`|Set a continuous range of LEDs to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `start`(included) and `stop`(excluded) are between 0 and `RGBLED_NUM` (not written to EEPROM)|
+|`rgblight_setrgb_at(r, g, b, index)`          |Set a single LED to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `index` is between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM) |
+|`rgblight_sethsv_at(h, s, v, index)`          |Set a single LED to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `index` is between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM) |
+|`rgblight_setrgb_range(r, g, b, start, end)`|Set a continuous range of LEDs to the given RGB value, where `r`/`g`/`b` are between 0 and 255 and `start`(included) and `stop`(excluded) are between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM)|
+|`rgblight_sethsv_range(h, s, v, start, end)`|Set a continuous range of LEDs to the given HSV value, where `h`/`s`/`v` are between 0 and 255, and `start`(included) and `stop`(excluded) are between 0 and `RGBLIGHT_LED_COUNT` (not written to EEPROM)|
 |`rgblight_setrgb(r, g, b)`                  |Set effect range LEDs to the given RGB value where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) |
 |`rgblight_setrgb_master(r, g, b)`           |Set the LEDs on the master side  to the given RGB value, where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) |
 |`rgblight_setrgb_slave(r, g, b)`            |Set the LEDs on the slave side  to the given RGB value, where `r`/`g`/`b` are between 0 and 255 (not written to EEPROM) |
@@ -519,7 +519,7 @@ By defining `RGBLIGHT_LED_MAP` as in the example below, you can specify the LED
 ```c
 // config.h
 
-#define RGBLED_NUM 4
+#define RGBLIGHT_LED_COUNT 4
 #define RGBLIGHT_LED_MAP { 3, 2, 1, 0 }
 
 ```
@@ -541,7 +541,7 @@ In addition to setting the Clipping Range, you can use `RGBLIGHT_LED_MAP` togeth
 
 ```c
 // config.h
-#define RGBLED_NUM 8
+#define RGBLIGHT_LED_COUNT 8
 #define RGBLIGHT_LED_MAP { 7, 6, 5, 4, 3, 2, 1, 0 }
 
 // some source
diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index 8f695a2b7c7..59159cb3fab 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -119,12 +119,12 @@ You can configure the firmware to read key matrix pins on the controller to dete
 
 The first pin is the output pin and the second is the input pin.
 
-Some keyboards have unused intersections in the key matrix. This setting uses one of these unused intersections to determine the handness.
+Some keyboards have unused intersections in the key matrix. This setting uses one of these unused intersections to determine the handedness.
 
-Normally, when a diode is connected to an intersection, it is judged to be left. If you add the following definition, it will be judged to be right.
+Normally, when a diode is connected to an intersection, it is judged to be right. If you add the following definition, it will be judged to be left.
 
 ```c
-#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
+#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
 ```
 
 Note that adding a diode at a previously unused intersection will effectively tell the firmware that there is a key held down at that point. You can instruct qmk to ignore that intersection by defining `MATRIX_MASKED` and then defining a `matrix_row_t matrix_mask[MATRIX_ROWS]` array in your keyboard config. Each bit of a single value (starting form the least-significant bit) is used to tell qmk whether or not to pay attention to key presses at that intersection.
diff --git a/docs/feature_tap_dance.md b/docs/feature_tap_dance.md
index 42ea2339623..bb1c2c80346 100644
--- a/docs/feature_tap_dance.md
+++ b/docs/feature_tap_dance.md
@@ -173,7 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     switch (keycode) {
         case TD(CT_CLN):  // list all tap dance keycodes with tap-hold configurations
-            action = &tap_dance_actions[TD_INDEX(keycode)];
+            action = &tap_dance_actions[QK_TAP_DANCE_GET_INDEX(keycode)];
             if (!record->event.pressed && action->state.count && !action->state.finished) {
                 tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
                 tap_code16(tap_hold->tap);
diff --git a/docs/feature_tri_layer.md b/docs/feature_tri_layer.md
index ade0040cc7b..3087fb5a550 100644
--- a/docs/feature_tri_layer.md
+++ b/docs/feature_tri_layer.md
@@ -45,4 +45,4 @@ Eg, if you wanted to set the "Adjust" layer to be layer 5, you'd add this to you
 | `get_tri_layer_upper_layer()`                | Gets the current "upper" layer.                 |
 | `get_tri_layer_adjust_layer()`               | Gets the current "adjust" layer.                |
 
-!> Note: these settings are not persisent, and will be reset to the default on power loss or power cycling of the controller.
+!> Note: these settings are not persistent, and will be reset to the default on power loss or power cycling of the controller.
diff --git a/docs/flashing.md b/docs/flashing.md
index 113d90ca38f..95b36804100 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -464,4 +464,4 @@ CLI Flashing sequence:
 3. Flash via QMK CLI eg. `qmk flash --keyboard handwired/onekey/rpi_pico --keymap default`
 4. Wait for the keyboard to become available
 
-<sup>1</sup>: This works only if QMK was compiled with `RP2040_BOOTLOADER_DOUBLE_TAP_RESET` defined.
+<sup>1</sup>: This works only if the controller has been flashed with QMK Firmware with `RP2040_BOOTLOADER_DOUBLE_TAP_RESET` defined.
diff --git a/docs/getting_started_introduction.md b/docs/getting_started_introduction.md
index 6dc51b82b73..80203353452 100644
--- a/docs/getting_started_introduction.md
+++ b/docs/getting_started_introduction.md
@@ -4,7 +4,7 @@ This page attempts to explain the basic information you need to know to work wit
 
 ## Basic QMK Structure
 
-QMK is a fork of [Jun Wako](https://github.com/tmk)'s [tmk_keyboard](https://github.com/tmk/tmk_keyboard) project. The original TMK code, with modifications, can be found in the `tmk_core` folder. The QMK additions to the project may be found in the `quantum` folder. Keyboard projects may be found in the `handwired` and `keyboard` folders.
+QMK is a fork of [Jun Wako](https://github.com/tmk)'s [tmk_keyboard](https://github.com/tmk/tmk_keyboard) project. The original TMK code, with modifications, can be found in the `tmk_core` folder. The QMK additions to the project may be found in the `quantum` folder. Keyboard projects may be found in the `keyboards` folder.
 
 ### Userspace Structure
 
diff --git a/docs/gpio_control.md b/docs/gpio_control.md
index 12413dfc8e6..90798fc87b8 100644
--- a/docs/gpio_control.md
+++ b/docs/gpio_control.md
@@ -2,29 +2,29 @@
 
 QMK has a GPIO control abstraction layer which is microcontroller agnostic. This is done to allow easy access to pin control across different platforms.
 
-## Functions :id=functions
-
-The following functions provide basic control of GPIOs and are found in `platforms/<platform>/gpio.h`.
-
-| Function                     | Description                                         | Old AVR Examples                                | Old ChibiOS/ARM Examples                         |
-|------------------------------|-----------------------------------------------------|-------------------------------------------------|--------------------------------------------------|
-| `setPinInput(pin)`           | Set pin as input with high impedance (High-Z)       | `DDRB &= ~(1<<2)`                               | `palSetLineMode(pin, PAL_MODE_INPUT)`            |
-| `setPinInputHigh(pin)`       | Set pin as input with builtin pull-up resistor      | `DDRB &= ~(1<<2); PORTB \|= (1<<2)`             | `palSetLineMode(pin, PAL_MODE_INPUT_PULLUP)`     |
-| `setPinInputLow(pin)`        | Set pin as input with builtin pull-down resistor    | N/A (Not supported on AVR)                      | `palSetLineMode(pin, PAL_MODE_INPUT_PULLDOWN)`   |
-| `setPinOutput(pin)`          | Set pin as output (alias of `setPinOutputPushPull`) | `DDRB \|= (1<<2)`                               | `palSetLineMode(pin, PAL_MODE_OUTPUT_PUSHPULL)`  |
-| `setPinOutputPushPull(pin)`  | Set pin as output, push/pull mode                   | `DDRB \|= (1<<2)`                               | `palSetLineMode(pin, PAL_MODE_OUTPUT_PUSHPULL)`  |
-| `setPinOutputOpenDrain(pin)` | Set pin as output, open-drain mode                  | N/A (Not implemented on AVR)                    | `palSetLineMode(pin, PAL_MODE_OUTPUT_OPENDRAIN)` |
-| `writePinHigh(pin)`          | Set pin level as high, assuming it is an output     | `PORTB \|= (1<<2)`                              | `palSetLine(pin)`                                |
-| `writePinLow(pin)`           | Set pin level as low, assuming it is an output      | `PORTB &= ~(1<<2)`                              | `palClearLine(pin)`                              |
-| `writePin(pin, level)`       | Set pin level, assuming it is an output             | `(level) ? PORTB \|= (1<<2) : PORTB &= ~(1<<2)` | `(level) ? palSetLine(pin) : palClearLine(pin)`  |
-| `readPin(pin)`               | Returns the level of the pin                        | `_SFR_IO8(pin >> 4) & _BV(pin & 0xF)`           | `palReadLine(pin)`                               |
-| `togglePin(pin)`             | Invert pin level, assuming it is an output          | `PORTB ^= (1<<2)`                               | `palToggleLine(pin)`                             |
+## Macros :id=macros
+
+The following macros provide basic control of GPIOs and are found in `platforms/<platform>/gpio.h`.
+
+|Macro                                |Description                                                          |
+|-------------------------------------|---------------------------------------------------------------------|
+|`gpio_set_pin_input(pin)`            |Set pin as input with high impedance (High-Z)                        |
+|`gpio_set_pin_input_high(pin)`       |Set pin as input with builtin pull-up resistor                       |
+|`gpio_set_pin_input_low(pin)`        |Set pin as input with builtin pull-down resistor (unavailable on AVR)|
+|`gpio_set_pin_output(pin)`           |Set pin as output (alias of `gpio_set_pin_output_push_pull`)         |
+|`gpio_set_pin_output_push_pull(pin)` |Set pin as output, push/pull mode                                    |
+|`gpio_set_pin_output_open_drain(pin)`|Set pin as output, open-drain mode (unavailable on AVR and ATSAM)    |
+|`gpio_write_pin_high(pin)`           |Set pin level as high, assuming it is an output                      |
+|`gpio_write_pin_low(pin)`            |Set pin level as low, assuming it is an output                       |
+|`gpio_write_pin(pin, level)`         |Set pin level, assuming it is an output                              |
+|`gpio_read_pin(pin)`                 |Returns the level of the pin                                         |
+|`gpio_toggle_pin(pin)`               |Invert pin level, assuming it is an output                           |
 
 ## Advanced Settings :id=advanced-settings
 
-Each microcontroller can have multiple advanced settings regarding its GPIO. This abstraction layer does not limit the use of architecture-specific functions. Advanced users should consult the datasheet of their desired device and include any needed libraries. For AVR, the standard avr/io.h library is used; for STM32, the ChibiOS [PAL library](https://chibios.sourceforge.net/docs3/hal/group___p_a_l.html) is used.
+Each microcontroller can have multiple advanced settings regarding its GPIO. This abstraction layer does not limit the use of architecture-specific functions. Advanced users should consult the datasheet of their desired device. For AVR, the standard `avr/io.h` library is used; for STM32, the ChibiOS [PAL library](https://chibios.sourceforge.net/docs3/hal/group___p_a_l.html) is used.
 
-## Atomic Operation
+## Atomic Operation :id=atomic-operation
 
 The above functions are not always guaranteed to work atomically. Therefore, if you want to prevent interruptions in the middle of operations when using multiple combinations of the above functions, use the following `ATOMIC_BLOCK_FORCEON` macro.
 
diff --git a/docs/hand_wire.md b/docs/hand_wire.md
index 06809254df2..cfae38d6d20 100644
--- a/docs/hand_wire.md
+++ b/docs/hand_wire.md
@@ -175,7 +175,7 @@ As you move along, be sure that the controller is staying in place - recutting a
 
 From here, you should have a working keyboard once you program a firmware.
 
-Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website.  Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix).
+Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website.  Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix)).
 
 Go through the rest of the tabs, assigning keys until you get to the last one where you can compile and download your firmware.  The .hex file can be flashed straight onto your keyboard, or for advanced functionality, compiled locally after [Setting up Your Environment](newbs_getting_started.md).
 
diff --git a/docs/hardware_keyboard_guidelines.md b/docs/hardware_keyboard_guidelines.md
index fb434e15765..684ccc73f68 100644
--- a/docs/hardware_keyboard_guidelines.md
+++ b/docs/hardware_keyboard_guidelines.md
@@ -169,11 +169,11 @@ The `post_rules.mk` file can interpret `features` of a keyboard-level before `co
 
   ifeq ($(strip $(RGBLED_OPTION_TYPE)),backlight)
     RGBLIGHT_ENABLE = yes
-    OPT_DEFS += -DRGBLED_NUM=30
+    OPT_DEFS += -DRGBLIGHT_LED_COUNT=30
   endif
   ifeq ($(strip $(RGBLED_OPTION_TYPE)),underglow)
     RGBLIGHT_ENABLE = yes
-    OPT_DEFS += -DRGBLED_NUM=6
+    OPT_DEFS += -DRGBLIGHT_LED_COUNT=6
   endif
   ```
 
diff --git a/docs/i2c_driver.md b/docs/i2c_driver.md
index faff0a1d7bf..9a3c08b90b6 100644
--- a/docs/i2c_driver.md
+++ b/docs/i2c_driver.md
@@ -127,8 +127,8 @@ This function is weakly defined, meaning it can be overridden if necessary for y
 
 ```c
 void i2c_init(void) {
-    setPinInput(B6); // Try releasing special pins for a short time
-    setPinInput(B7);
+    gpio_set_pin_input(B6); // Try releasing special pins for a short time
+    gpio_set_pin_input(B7);
     wait_ms(10); // Wait for the release to happen
 
     palSetPadMode(GPIOB, 6, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP); // Set B6 to I2C function
@@ -138,23 +138,6 @@ void i2c_init(void) {
 
 ---
 
-### `i2c_status_t i2c_start(uint8_t address, uint16_t timeout)` :id=api-i2c-start
-
-Start an I2C transaction.
-
-#### Arguments :id=api-i2c-start-arguments
-
- - `uint8_t address`  
-   The 7-bit I2C address of the device (ie. without the read/write bit - this will be set automatically).
- - `uint16_t timeout`  
-   The time in milliseconds to wait for a response from the target device.
-
-#### Return Value :id=api-i2c-start-return
-
-`I2C_STATUS_TIMEOUT` if the timeout period elapses, `I2C_STATUS_ERROR` if some other error occurs, otherwise `I2C_STATUS_SUCCESS`.
-
----
-
 ### `i2c_status_t i2c_transmit(uint8_t address, uint8_t *data, uint16_t length, uint16_t timeout)` :id=api-i2c-transmit
 
 Send multiple bytes to the selected I2C device.
@@ -197,11 +180,11 @@ Receive multiple bytes from the selected I2C device.
 
 ---
 
-### `i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-writereg
+### `i2c_status_t i2c_write_register(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-write-register
 
 Writes to a register with an 8-bit address on the I2C device.
 
-#### Arguments :id=api-i2c-writereg-arguments
+#### Arguments :id=api-i2c-write-register-arguments
 
  - `uint8_t devaddr`  
    The 7-bit I2C address of the device.
@@ -214,17 +197,17 @@ Writes to a register with an 8-bit address on the I2C device.
  - `uint16_t timeout`  
    The time in milliseconds to wait for a response from the target device.
 
-#### Return Value :id=api-i2c-writereg-return
+#### Return Value :id=api-i2c-write-register-return
 
 `I2C_STATUS_TIMEOUT` if the timeout period elapses, `I2C_STATUS_ERROR` if some other error occurs, otherwise `I2C_STATUS_SUCCESS`.
 
 ---
 
-### `i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-writereg16
+### `i2c_status_t i2c_write_register16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-write-register16
 
 Writes to a register with a 16-bit address (big endian) on the I2C device.
 
-#### Arguments :id=api-i2c-writereg16-arguments
+#### Arguments :id=api-i2c-write-register16-arguments
 
  - `uint8_t devaddr`  
    The 7-bit I2C address of the device.
@@ -237,17 +220,17 @@ Writes to a register with a 16-bit address (big endian) on the I2C device.
  - `uint16_t timeout`  
    The time in milliseconds to wait for a response from the target device.
 
-#### Return Value :id=api-i2c-writereg16-return
+#### Return Value :id=api-i2c-write-register16-return
 
 `I2C_STATUS_TIMEOUT` if the timeout period elapses, `I2C_STATUS_ERROR` if some other error occurs, otherwise `I2C_STATUS_SUCCESS`.
 
 ---
 
-### `i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-readreg
+### `i2c_status_t i2c_read_register(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-read-register
 
 Reads from a register with an 8-bit address on the I2C device.
 
-#### Arguments :id=api-i2c-readreg-arguments
+#### Arguments :id=api-i2c-read-register-arguments
 
  - `uint8_t devaddr`  
    The 7-bit I2C address of the device.
@@ -258,17 +241,17 @@ Reads from a register with an 8-bit address on the I2C device.
  - `uint16_t timeout`  
    The time in milliseconds to wait for a response from the target device.
 
-#### Return Value :id=api-i2c-readreg-return
+#### Return Value :id=api-i2c-read-register-return
 
 `I2C_STATUS_TIMEOUT` if the timeout period elapses, `I2C_STATUS_ERROR` if some other error occurs, otherwise `I2C_STATUS_SUCCESS`.
 
 ---
 
-### `i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)`
+### `i2c_status_t i2c_read_register16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-read-register16
 
 Reads from a register with a 16-bit address (big endian) on the I2C device.
 
-#### Arguments :id=api-i2c-readreg16-arguments
+#### Arguments :id=api-i2c-read-register16-arguments
 
  - `uint8_t devaddr`  
    The 7-bit I2C address of the device.
@@ -279,12 +262,27 @@ Reads from a register with a 16-bit address (big endian) on the I2C device.
  - `uint16_t timeout`  
    The time in milliseconds to wait for a response from the target device.
 
-#### Return Value :id=api-i2c-readreg16-return
+#### Return Value :id=api-i2c-read-register16-return
 
 `I2C_STATUS_TIMEOUT` if the timeout period elapses, `I2C_STATUS_ERROR` if some other error occurs, otherwise `I2C_STATUS_SUCCESS`.
 
 ---
 
-### `i2c_status_t i2c_stop(void)` :id=api-i2c-stop
+### `i2c_status_t i2c_ping_address(uint8_t address, uint16_t timeout)` :id=api-i2c-ping-address
 
-Stop the current I2C transaction.
+Pings the I2C bus for a specific address. 
+
+On ChibiOS a "best effort" attempt is made by reading a single byte from register 0 at the requested address. This should generally work except for I2C devices that do not not respond to a register 0 read request, which will result in a false negative result (unsucessful response to ping attempt).
+
+This function is weakly defined, meaning it can be overridden if necessary for your particular use case:
+
+#### Arguments
+
+ - `uint8_t address`  
+   The 7-bit I2C address of the device (ie. without the read/write bit - this will be set automatically).
+ - `uint16_t timeout`  
+   The time in milliseconds to wait for a response from the target device.
+
+#### Return Value
+
+`I2C_STATUS_TIMEOUT` if the timeout period elapses, `I2C_STATUS_ERROR` if some other error occurs, otherwise `I2C_STATUS_SUCCESS`.
diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md
index 5e98da5eee6..a349081d6a2 100644
--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -248,7 +248,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
   * high/low ピンを使って左右を決定します。low = 右手、high = 左手。`B7` を使っているピンに置き換えます。これはオプションで、`SPLIT_HAND_PIN` が未定義のままである場合、EE_HANDS メソッドまたは標準の Let's Splitが使っている MASTER_LEFT / MASTER_RIGHT 定義をまだ使うことができます。
 
 * `#define SPLIT_HAND_MATRIX_GRID <out_pin>,<in_pin>`
-  * 左右はキーマトリックスのキースイッチが存在しない交点を使って決定されます。通常、この交点が短絡している(ローレベル)のときに左側と見なされます。もし `#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT` が定義されている場合は、ローレベルの時に右側と決定されます。
+  * 左右はキーマトリックスのキースイッチが存在しない交点を使って決定されます。通常、この交点が短絡している(ローレベル)のときに右側と見なされます。もし `#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT` が定義されている場合は、ローレベルの時に左側と決定されます。
 
 * `#define EE_HANDS` (`SPLIT_HAND_PIN` と `SPLIT_HAND_MATRIX_GRID` が定義されていない場合のみ動作します)
   * `eeprom-lefthand.eep`/`eeprom-righthand.eep` がそれぞれの半分に書き込まれた後で、EEPROM 内に格納されている左右の設定の値を読み込みます。
diff --git a/docs/ja/feature_bootmagic.md b/docs/ja/feature_bootmagic.md
index 2ad6fc85313..c146176a7ee 100644
--- a/docs/ja/feature_bootmagic.md
+++ b/docs/ja/feature_bootmagic.md
@@ -139,8 +139,8 @@ BOOTMAGIC_ENABLE = lite
 さらに、どのキーを使うかを指定したほうが良いかもしれません。これは普通ではないマトリックスを持つキーボードで特に便利です。そのためには、使いたいキーの行と列を指定する必要があります。`config.h` ファイルにこれらのエントリを追加します:
 
 ```c
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
+#define BOOTMAGIC_ROW 0
+#define BOOTMAGIC_COLUMN 1
 ```
 
 デフォルトでは、これらは 0 と 0 に設定されます。これは通常はほとんどのキーボードで "ESC" キーです。
@@ -154,8 +154,8 @@ BOOTMAGIC_ENABLE = lite
 `SPLIT_HAND_PIN` のようなオプションで、左右の設定があらかじめ決められている場合は、キーボードの左右で別のキーを設定する必要があるかもしれません。これを行うには、`config.h` ファイルに以下のエントリを追加します。
 
 ```c
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 1
+#define BOOTMAGIC_ROW_RIGHT 4
+#define BOOTMAGIC_COLUMN_RIGHT 1
 ```
 
 デフォルトでは、これらの値は設定されていません。
@@ -172,7 +172,7 @@ void bootmagic_lite(void) {
     wait_ms(DEBOUNCE * 2);
     matrix_scan();
 
-    if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
+    if (matrix_get_row(BOOTMAGIC_ROW) & (1 << BOOTMAGIC_COLUMN)) {
       // ブートローダにジャンプする。
       bootloader_jump();
     }
diff --git a/docs/ja/feature_split_keyboard.md b/docs/ja/feature_split_keyboard.md
index 3bdf96d1c7d..c84b782d876 100644
--- a/docs/ja/feature_split_keyboard.md
+++ b/docs/ja/feature_split_keyboard.md
@@ -108,10 +108,10 @@ SPLIT_TRANSPORT = custom
 
 キーマトリックスに未使用の交点があるキーボードがあります。この設定は、左右の決定にこれらの未使用の交点の1つを使用します。
 
-通常、ダイオードが交点に接続されている場合、左側と判断されます。次の定義を追加すると、右側と判断されます。
+通常、ダイオードが交点に接続されている場合、右側と判断されます。次の定義を追加すると、左側と判断されます。
 
 ```c
-#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
+#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
 ```
 
 #### EEPROM による左右の設定
diff --git a/docs/ja/i2c_driver.md b/docs/ja/i2c_driver.md
index 1d8f70e1636..92c41853702 100644
--- a/docs/ja/i2c_driver.md
+++ b/docs/ja/i2c_driver.md
@@ -23,12 +23,11 @@ I2C アドレスと他の技術詳細について、さらなる情報を得る
 | 関数                                                                                                        | 説明                                                                                                                                                                                |
 |-------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `void i2c_init(void);`                                                                                      | I2C ドライバを初期化します。他のあらゆるトランザクションを開始する前に、この関数を一度だけ呼ぶ必要があります。                                                                      |
-| `i2c_status_t i2c_start(uint8_t address, uint16_t timeout);`                                                     | I2C トランザクションを開始します。アドレスは方向ビットのない7ビットスレーブアドレスです。                                                                                           |
 | `i2c_status_t i2c_transmit(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout);`                  | I2C 経由でデータを送信します。アドレスは方向ビットのない7ビットスレーブアドレスです。トランザクションのステータスを返します。                                                       |
 | `i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout);`                   | I2C 経由でデータを受信します。アドレスは方向ビットのない7ビットスレーブアドレスです。 `length` で指定した長さのバイト列を `data` に保存し、トランザクションのステータスを返します。 |
 | `i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);` | `i2c_transmit` と同様ですが、 `regaddr` でスレーブのデータ書き込み先のレジスタを指定します。                                                                                    |
 | `i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);`  | `i2c_receive` と同様ですが、 `regaddr` でスレーブのデータ読み込み先のレジスタを指定します。                                                                                     |
-| `i2c_status_t i2c_stop(void);`                                                                                   | I2C トランザクションを終了します。                                                                                                                                                  |
+| `i2c_status_t i2c_ping_address(uint8_t address, uint16_t timeout);`                                              | I2C アドレスをテストします。アドレスは方向ビットのない7ビットスレーブアドレスです。                                                                                           |
 
 ### 関数の戻り値 :id=function-return
 
diff --git a/docs/keymap.md b/docs/keymap.md
index f9d45b32676..b9c5da6be70 100644
--- a/docs/keymap.md
+++ b/docs/keymap.md
@@ -125,7 +125,7 @@ At the top of the file you'll find this:
 
 These are some handy definitions we can use when building our keymap and our custom function. The `GRAVE_MODS` definition will be used later in our custom function, and the following `_BL`, `_FL`, and `_CL` defines make it easier to refer to each of our layers.
 
-Note: You may also find some older keymap files may also have a define(s) for `_______` and/or `XXXXXXX`. These can be used in place for `KC_TRNS` and `KC_NO` respectively, making it easier to see what keys a layer is overriding. These definitions are now unecessary, as they are included by default.
+Note: You may also find some older keymap files may also have a define(s) for `_______` and/or `XXXXXXX`. These can be used in place for `KC_TRNS` and `KC_NO` respectively, making it easier to see what keys a layer is overriding. These definitions are now unnecessary, as they are included by default.
 
 ### Layers and Keymaps
 
diff --git a/docs/other_vscode.md b/docs/other_vscode.md
index 49d5035b08e..4c71a0eb1c6 100644
--- a/docs/other_vscode.md
+++ b/docs/other_vscode.md
@@ -117,3 +117,77 @@ Using the [standard `compile_commands.json` database](https://clang.llvm.org/doc
 1. Start typing `clangd: Restart Language Server` and select it when it appears.
 
 Now you're ready to code QMK Firmware in VS Code!
+
+# Debugging ARM MCUs with Visual Studio Code
+
+**...and a Black Magic Probe.**
+
+Visual Studio Code has the ability to debug applications, but requires some configuration in order to get it to be able to do so for ARM targets.
+
+This documentation describes a known-working configuration for setting up the use of a Black Magic Probe to debug using VS Code.
+
+It is assumed that you've correctly set up the electrical connectivity of the Black Magic Probe with your MCU. Wiring up `NRST`, `SWDIO`, `SWCLK`, and `GND` should be enough.
+
+Install the following plugin into VS Code:
+
+* [Cortex-Debug](https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug) - 
+  This adds debugger support for ARM Cortex targets to VS Code.
+
+A debugging target for the MCU for your board needs to be defined, and can be done so by adding the following to a `.vscode/launch.json` file:
+
+```json
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Black Magic Probe (OneKey Proton-C)",
+      "type": "cortex-debug",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "executable": "${workspaceRoot}/.build/handwired_onekey_proton_c_default.elf",
+      "servertype": "bmp",
+      "BMPGDBSerialPort": "COM4",
+      "svdFile": "Q:\\svd\\STM32F303.svd",
+      "device": "STM32F303",
+      "v1": false,
+      "windows": {
+        "armToolchainPath": "C:\\QMK_MSYS\\mingw64\\bin"
+      }
+    }
+  ]
+}
+```
+
+You'll need to perform some modifications to the file above in order to target your specific device:
+
+* `"name"`: Can be anything, but if you're debugging multiple targets you'll want something descriptive here.
+* `"cwd"`: The path to the QMK Firmware repository root directory -- _if using the `.vscode` directory existing in the `qmk_firmware` git repository, the default above should be correct_
+* `"executable"`: The path to the `elf` file generated as part of the build for your keyboard -- _exists in `<qmk_firmware>/.build`_
+* `"BMPGDBSerialPort"`: The `COM` port under Windows, or the `/dev/...` path for Linux/macOS. Two serial port devices will be created -- the Black Magic Probe debug port is *usually* the first. If it doesn't work, try the second.
+* `"svdFile"`: _[Optional]_ The path to the SVD file that defines the register layout for the MCU -- the appropriate file can be downloaded from the [cmsis-svd repository](https://github.com/posborne/cmsis-svd/tree/master/data/STMicro)
+* `"device"`: The name of the MCU, which matches the `<name>` tag at the top of the downloaded `svd` file.
+* `"armToolchainPath"`: _[Optional]_ The path to the ARM toolchain installation location on Windows -- under normal circumstances Linux/macOS will auto-detect this correctly and will not need to be specified. 
+
+!> Windows builds of QMK Firmware are generally compiled using QMK MSYS, and the path to gdb's location (`C:\\QMK_MSYS\\mingw64\\bin`) needs to be specified under `armToolchainPath` for it to be detected. You may also need to change the GDB path to point at `C:\\QMK_MSYS\\mingw64\\bin\\gdb-multiarch.exe` in the VSCode Cortex-Debug user settings: ![VSCode Settings](https://i.imgur.com/EGrPM1L.png)
+
+Optionally, the following modifications should also be made to the keyboard's `rules.mk` file to disable optimisations -- not strictly required but will ensure breakpoints and variable viewing works correctly:
+```makefile
+# Disable optimisations for debugging purposes
+LTO_ENABLE = no
+OPT = g
+DEBUG = 3
+```
+
+At this point, you should build and flash your firmware through normal methods (`qmk compile ...` and `qmk flash ...`).
+
+Once completed, you can:
+* Switch to the debug view in VS Code (in the sidebar, the Play button with a bug next to it)
+* Select the newly-created debug target in the dropdown at the top of the sidebar
+* Click the green play button next to the dropdown
+
+VS Code's debugger will then start executing the compiled firmware on the MCU.
+
+At this stage, you should have full debugging set up, with breakpoints and variable listings working!
diff --git a/docs/platformdev_rp2040.md b/docs/platformdev_rp2040.md
index 890dadb6f06..593a8198eb1 100644
--- a/docs/platformdev_rp2040.md
+++ b/docs/platformdev_rp2040.md
@@ -2,7 +2,7 @@
 
 The following table shows the current driver status for peripherals on RP2040 MCUs:
 
-|                              System                              |                    Support                     |
+| System                                                           | Support                                        |
 | ---------------------------------------------------------------- | ---------------------------------------------- |
 | [ADC driver](adc_driver.md)                                      | :heavy_check_mark:                             |
 | [Audio](audio_driver.md#pwm-hardware)                            | :heavy_check_mark:                             |
@@ -13,7 +13,7 @@ The following table shows the current driver status for peripherals on RP2040 MC
 | [External EEPROMs](eeprom_driver.md)                             | :heavy_check_mark: using `I2C` or `SPI` driver |
 | [EEPROM emulation](eeprom_driver.md#wear_leveling-configuration) | :heavy_check_mark:                             |
 | [serial driver](serial_driver.md)                                | :heavy_check_mark: using `SIO` or `PIO` driver |
-| [UART driver](uart_driver.md)                                    | Support planned (no ETA)                       |
+| [UART driver](uart_driver.md)                                    | :heavy_check_mark: using `SIO` driver          |
 
 ## GPIO
 
@@ -52,6 +52,13 @@ To configure the I2C driver please read the [ChibiOS/ARM](i2c_driver.md#arm-conf
 
 To configure the SPI driver please read the [ChibiOS/ARM](spi_driver.md#chibiosarm-configuration) section.
 
+### UART Driver
+
+| RP2040 Peripheral | `mcuconf.h` values | `UART_DRIVER` |
+| ----------------- | ------------------ | ------------- |
+| `UART0`           | `RP_SIO_USE_UART0` | `SIOD0`       |
+| `UART1`           | `RP_SIO_USE_UART1` | `SIOD1`       |
+
 ## Double-tap reset boot-loader entry :id=double-tap
 
 The double-tap reset mechanism is an alternate way in QMK to enter the embedded mass storage UF2 boot-loader of the RP2040. It enables bootloader entry by a fast double-tap of the reset pin on start up, which is similar to the behavior of AVR Pro Micros. This feature activated by default for the Pro Micro RP2040 board, but has to be configured for other boards. To activate it, add the following options to your keyboards `config.h` file:
@@ -87,6 +94,10 @@ This is the default board that is chosen, unless any other RP2040 board is selec
 | `SOFT_SERIAL_PIN`                                                          | undefined, use `SERIAL_USART_TX_PIN` |
 | `SERIAL_USART_TX_PIN`                                                      | `GP0`                                |
 | `SERIAL_USART_RX_PIN`                                                      | `GP1`                                |
+| **UART driver**                                                            |                                      |
+| `UART_DRIVER`                                                              | `SIOD0`                              |
+| `UART_TX_PIN`                                                              | `GP0`                                |
+| `UART_RX_PIN`                                                              | `GP1`                                |
 
 ?> The pin-outs of Adafruit's KB2040 and Boardsource's Blok both deviate from the Sparkfun Pro Micro RP2040. Lookup the pin-out of these boards and adjust your keyboards pin definition accordingly if you want to use these boards.
 
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 0ca47933b5b..0d503ab4177 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -9,6 +9,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"](newbs_git_using_your_master_branch.md) page after merging -- (end of this document will contain the contents of the message)
+    - Note, frequently merging upstream with your branch is not needed and is discouraged. Valid reason for updating your branch may be resolving merge conflicts and pulling in new changes relevant to your PR.
 - PRs should contain the smallest amount of modifications required for a single change to the codebase
     - multiple keyboards at the same time is not acceptable
     - **the smaller the PR, the higher likelihood of a quicker review, higher likelihood of quicker merge, and less chance of conflicts**
@@ -39,13 +40,14 @@ If there are any inconsistencies with these recommendations, you're best off [cr
 
 ## Keymap PRs
 
-!> Note that personal keymap submissions will no longer be accepted. This section applies to manufacturer-supported keymaps.
+!> Note that personal keymap submissions will no longer be accepted. This section applies to manufacturer-supported keymaps. Please see this [issue](https://github.com/qmk/qmk_firmware/issues/22724) for more information.
 
+- PRs for vendor specific keymaps will be permitted. The naming convention for these should be `default_${vendor}`, `via_${vendor}` i.e. `via_clueboard`.
+    - vendor specific keymaps do not necessarily need to be "vanilla" and can be more richly featured than `default` or `via` stock keymaps.
 - `#include QMK_KEYBOARD_H` preferred to including specific board files
-- prefer layer `enum`s to `#define`s
-- custom keycode `enum`s must have first entry `= SAFE_RANGE`
-- terminating backslash (`\`) in lines of LAYOUT macro parameters is superfluous and should be removed
-- some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap
+- prefer layer enums to #defines
+- custom keycode enums must have first entry = `QK_USER`
+- some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap. Spaces are preferred to tabs
 
 ## Keyboard PRs
 
@@ -80,6 +82,8 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
       - Encoder Configuration
       - Bootmagic Configuration
       - LED Indicator Configuration
+      - RGB Light Configuration
+      - RGB Matrix Configuration
     - Run `qmk format-json` on this file before submitting your PR. Be sure to append the `-i` flag to directly modify the file, or paste the outputted code into the file. 
 - `readme.md`
     - must follow the [template](https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md)
@@ -89,8 +93,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - a picture about the keyboard and preferably about the PCB, too
         - images are not to be placed in the `qmk_firmware` repository
         - images should be uploaded to an external image hosting service, such as [imgur](https://imgur.com/).
-        - if imgur is used, images should be resized appropriately: append "h" to the image url i.e. [https://i.imgur.com/vqgE7Ok.jpg](https://i.imgur.com/vqgE7Ok.jpg) becomes [https://i.imgur.com/vqgE7Ok**h**.jpg](https://i.imgur.com/vqgE7Okh.jpg)
-        - image links should link directly to the image, not a "preview" -- i.e. [https://imgur.com/vqgE7Ok](https://imgur.com/vqgE7Ok) should be [https://i.imgur.com/vqgE7Okh.jpg](https://i.imgur.com/vqgE7Okh.jpg) when using imgur
+        - image links should link directly to the image, not a "preview" -- i.e. [https://imgur.com/vqgE7Ok](https://imgur.com/vqgE7Ok) should be [https://i.imgur.com/vqgE7Ok.jpg](https://i.imgur.com/vqgE7Ok.jpg) when using imgur
 - `rules.mk`
     - removed `MIDI_ENABLE`, `FAUXCLICKY_ENABLE` and `HD44780_ENABLE`
     - modified `# Enable Bluetooth with the Adafruit EZ-Key HID` -> `# Enable Bluetooth`
@@ -203,7 +206,7 @@ Additionally, PR reviews are something that is done in our free time. We are not
 ## Example GPLv2 Header
 
 ```
-/* Copyright 2021 Your Name (@yourgithub)
+/* Copyright 2024 Your Name (@yourgithub)
  *
  * 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
@@ -223,6 +226,6 @@ Additionally, PR reviews are something that is done in our free time. We are not
 Or, optionally, using [SPDX identifier](https://spdx.org/licenses/) instead:
 
 ```
-// Copyright 2021 Your Name (@yourgithub)
+// Copyright 2024 Your Name (@yourgithub)
 // SPDX-License-Identifier: GPL-2.0-or-later
 ```
diff --git a/docs/quantum_painter.md b/docs/quantum_painter.md
index 181abf8bb37..7f524b07ee3 100644
--- a/docs/quantum_painter.md
+++ b/docs/quantum_painter.md
@@ -19,18 +19,21 @@ The QMK CLI can be used to convert from normal images such as PNG files or anima
 
 Supported devices:
 
-| Display Panel | Panel Type         | Size             | Comms Transport | Driver                                   |
-|---------------|--------------------|------------------|-----------------|------------------------------------------|
-| GC9A01        | RGB LCD (circular) | 240x240          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += gc9a01_spi`  |
-| ILI9163       | RGB LCD            | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9163_spi` |
-| ILI9341       | RGB LCD            | 240x320          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9341_spi` |
-| ILI9488       | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9488_spi` |
-| SSD1351       | RGB OLED           | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ssd1351_spi` |
-| ST7735        | RGB LCD            | 132x162, 80x160  | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7735_spi`  |
-| ST7789        | RGB LCD            | 240x320, 240x240 | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7789_spi`  |
-| SH1106 (SPI)  | Monochrome OLED    | 128x64           | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += sh1106_spi`  |
-| SH1106 (I2C)  | Monochrome OLED    | 128x64           | I2C             | `QUANTUM_PAINTER_DRIVERS += sh1106_i2c`  |
-| Surface       | Virtual            | User-defined     | None            | `QUANTUM_PAINTER_DRIVERS += surface`     |
+| Display Panel  | Panel Type         | Size             | Comms Transport | Driver                                   |
+|----------------|--------------------|------------------|-----------------|------------------------------------------|
+| GC9A01         | RGB LCD (circular) | 240x240          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += gc9a01_spi`  |
+| ILI9163        | RGB LCD            | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9163_spi` |
+| ILI9341        | RGB LCD            | 240x320          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9341_spi` |
+| ILI9486        | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9486_spi` |
+| ILI9488        | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9488_spi` |
+| SSD1351        | RGB OLED           | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ssd1351_spi` |
+| ST7735         | RGB LCD            | 132x162, 80x160  | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7735_spi`  |
+| ST7789         | RGB LCD            | 240x320, 240x240 | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7789_spi`  |
+| SH1106 (SPI)   | Monochrome OLED    | 128x64           | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += sh1106_spi`  |
+| SH1106 (I2C)   | Monochrome OLED    | 128x64           | I2C             | `QUANTUM_PAINTER_DRIVERS += sh1106_i2c`  |
+| SSD1306 (SPI)  | Monochrome OLED    | 128x64           | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += sh1106_spi`  |
+| SSD1306 (I2C)  | Monochrome OLED    | 128x32           | I2C             | `QUANTUM_PAINTER_DRIVERS += sh1106_i2c`  |
+| Surface        | Virtual            | User-defined     | None            | `QUANTUM_PAINTER_DRIVERS += surface`     |
 
 ## Quantum Painter Configuration :id=quantum-painter-config
 
@@ -279,6 +282,39 @@ The maximum number of displays can be configured by changing the following in yo
 
 Native color format rgb565 is compatible with ILI9341
 
+#### ** ILI9486 **
+
+Enabling support for the ILI9486 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += ili9486_spi
+```
+
+Creating a ILI9486 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_ili9486_make_spi_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode);
+```
+
+There's another variant for this [Waveshare module](https://www.waveshare.com/wiki/3.5inch_TFT_Touch_Shield), because it has a quirky SPI->Parallel converter. You can create it with:
+
+```c
+painter_device_t qp_ili9486_make_spi_waveshare_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode);
+```
+
+The device handle returned from these functions can be used to perform all other drawing operations.
+
+The maximum number of displays can be configured by changing the following in your `config.h` (default is 1):
+
+```c
+// 3 displays:
+#define ILI9486_NUM_DEVICES 3
+```
+
+Native color format rgb888 is compatible with ILI9486
+Native color format rgb565 is compatible with ILI9486 Waveshare
+
 #### ** ILI9488 **
 
 Enabling support for the ILI9488 in Quantum Painter is done by adding the following to `rules.mk`:
@@ -433,6 +469,10 @@ The maximum number of displays of each type can be configured by changing the fo
 
 Native color format mono2 is compatible with SH1106
 
+#### ** SSD1306 **
+
+SSD1306 and SH1106 are almost entirely identical, to the point of being indisinguishable by Quantum Painter. Enable SH1106 support in Quantum Painter and create SH1106 devices in firmware to perform drawing operations on SSD1306 displays.
+
 <!-- tabs:end -->
 
 ### ** Surface **
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index e102b9bfb94..796db1f2446 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -111,6 +111,13 @@ Configures the [APA102](apa102_driver.md) driver.
 Configures the [Audio](feature_audio.md) feature.
 
 * `audio`
+    * `default`
+        * `on`
+            * The default audio enabled state.
+            * Default: `true`
+        * `clicky`
+            * The default audio clicky enabled state.
+            * Default: `true`
     * `macro_beep`
         * Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros.
         * Default: `false`
@@ -626,7 +633,7 @@ Configures the [RGB Matrix](feature_rgb_matrix.md) feature.
             * The default animation speed.
             * Default: `128`
     * `driver` (Required)
-        * The driver to use. Must be one of `aw20216s`, `custom`, `is31fl3218`, `is31fl3731`, `is31fl3733`, `is31fl3736`, `is31fl3737`, `is31fl3741`, `is31fl3742a`, `is31fl3743a`, `is31fl3745`, `is31fl3746a`, `snled27351`, `ws2812`.
+        * The driver to use. Must be one of `aw20216s`, `custom`, `is31fl3218`, `is31fl3729`, `is31fl3731`, `is31fl3733`, `is31fl3736`, `is31fl3737`, `is31fl3741`, `is31fl3742a`, `is31fl3743a`, `is31fl3745`, `is31fl3746a`, `snled27351`, `ws2812`.
     * `hue_steps`
         * The number of hue adjustment steps.
         * Default: `8`
diff --git a/docs/reference_keymap_extras.md b/docs/reference_keymap_extras.md
index 84751a512cc..cf2ab288761 100644
--- a/docs/reference_keymap_extras.md
+++ b/docs/reference_keymap_extras.md
@@ -36,6 +36,7 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q
 |French (AFNOR)                   |`keymap_french_afnor.h`          |`sendstring_french_afnor.h`         |
 |French (BÉPO)                    |`keymap_bepo.h`                  |`sendstring_bepo.h`                 |
 |French (Belgium)                 |`keymap_belgian.h`               |`sendstring_belgian.h`              |
+|French (Canada)                  |`keymap_canadian_french.h`       |`sendstring_canadian_french.h`      |
 |French (Switzerland)             |`keymap_swiss_fr.h`              |`sendstring_swiss_fr.h`             |
 |French (macOS, ISO)              |`keymap_french_mac_iso.h`        |`sendstring_french_mac_iso.h`       |
 |German                           |`keymap_german.h`                |`sendstring_german.h`               |
@@ -67,6 +68,7 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q
 |Slovenian                        |`keymap_slovenian.h`             |`sendstring_slovenian.h`            |
 |Spanish                          |`keymap_spanish.h`               |`sendstring_spanish.h`              |
 |Spanish (Dvorak)                 |`keymap_spanish_dvorak.h`        |`sendstring_spanish_dvorak.h`       |
+|Spanish (Latin America)          |`keymap_spanish_latin_america.h` |`sendstring_spanish_latin_america.h`|
 |Swedish                          |`keymap_swedish.h`               |`sendstring_swedish.h`              |
 |Swedish (macOS, ANSI)            |`keymap_swedish_mac_ansi.h`      |                                    |
 |Swedish (macOS, ISO)             |`keymap_swedish_mac_iso.h`       |                                    |
diff --git a/docs/serial_driver.md b/docs/serial_driver.md
index b7e803154b3..8462e4530ff 100644
--- a/docs/serial_driver.md
+++ b/docs/serial_driver.md
@@ -1,6 +1,6 @@
 # 'serial' Driver
 
-The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available, depending on the platform of your split keyboard. Note that none of the drivers support split keyboards with more than two halves.
+The Serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available that cater to the platform and capabilites of MCU in use. Note that none of the drivers support split keyboards with more than two halves.
 
 | Driver                                  | AVR                | ARM                | Connection between halves                                                                     |
 | --------------------------------------- | ------------------ | ------------------ | --------------------------------------------------------------------------------------------- |
@@ -14,7 +14,7 @@ The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature
 
 ## Bitbang
 
-This is the Default driver, the absence of configuration assumes this driver. It works by [bit banging](https://en.wikipedia.org/wiki/Bit_banging) a GPIO pin using the CPU. It is therefore not as efficient as a dedicated hardware peripheral, which the Half-duplex and Full-duplex drivers use.
+This is the Default driver, absence of configuration assumes this driver. It works by [bit banging](https://en.wikipedia.org/wiki/Bit_banging) a GPIO pin using the CPU. It is therefore not as efficient as a dedicated hardware peripheral, which the Half-duplex and Full-duplex drivers use.
 
 !> On ARM platforms the bitbang driver causes connection issues when using it together with the bitbang WS2812 driver. Choosing alternate drivers for both serial and WS2812 (instead of bitbang) is strongly recommended.
 
@@ -31,7 +31,7 @@ This is the Default driver, the absence of configuration assumes this driver. It
 +-------+                 +-------+
 ```
 
-One GPIO pin is needed for the bitbang driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SOFT_SERIAL_PIN` (SSP) in the configuration. A simple TRS or USB cable provides enough conductors for this driver to work. 
+One GPIO pin is needed for the bitbang driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SOFT_SERIAL_PIN` (SSP) in the configuration. A TRS or USB cable provides enough conductors for this driver to function. 
 
 ### Setup
 
@@ -57,7 +57,7 @@ SERIAL_DRIVER = bitbang
 
 ## USART Half-duplex
 
-Targeting ARM boards based on ChibiOS, where communication is offloaded to a USART hardware device that supports Half-duplex operation. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose this driver or the Full-duplex driver whenever possible.
+Targeting ARM boards based on ChibiOS, where communication is offloaded to a USART hardware device that supports Half-duplex operation. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose Half-duplex over Bitbang if MCU is capable of utilising Half-duplex, and Full-duplex can't be used instead (e.g. lack of available GPIO pins, or imcompatible PCB design).
 
 ### Pin configuration
 
@@ -74,11 +74,13 @@ Targeting ARM boards based on ChibiOS, where communication is offloaded to a USA
 +-------+                 +-------+
 ```
 
-Only one GPIO pin is needed for the Half-duplex driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SERIAL_USART_TX_PIN` in the configuration. Take care that the pin you chose can act as the TX pin of the USART peripheral. A simple TRS or USB cable provides enough conductors for this driver to work. As the split connection is configured to work in open-drain mode, an **external pull-up resistor is needed to keep the line high**. Resistor values of 1.5kΩ to 8.2kΩ are known to work.
+Only one GPIO pin is needed for the Half-duplex driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SERIAL_USART_TX_PIN` in the configuration. Ensure that the pin chosen for split communication can operate as the TX pin of the contoller's USART peripheral. A TRS or USB cable provides enough conductors for this driver to function. As the split connection is configured to operate in open-drain mode, an **external pull-up resistor is needed to keep the line high**. Resistor values of 1.5kΩ to 8.2kΩ are known to work. 
+
+!> ***Note:*** A pull-up resistor isn't required for RP2040 controllers configured with PIO subsystem.
 
 ### Setup
 
-To use the Half-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation skip step 1.
+To use the Half-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation, start at step 2.
 
 1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file:
 
@@ -86,7 +88,9 @@ To use the Half-duplex driver follow these steps to activate it. If you target t
 SERIAL_DRIVER = usart
 ```
 
-2. (RP2040 PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
+Skip to step 3.
+
+2. (RP2040 + PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
 
 ```make
 SERIAL_DRIVER = vendor
@@ -105,13 +109,13 @@ For STM32 MCUs several GPIO configuration options can be changed as well. See th
 #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 ```
 
-4. Decide either for `SERIAL`, `SIO` or `PIO` subsystem, see the section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
+4. Decide either for `SERIAL`, `SIO`, or `PIO` subsystem. See section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
 
 <hr>
 
 ## USART Full-duplex
 
-Targeting ARM boards based on ChibiOS where communication is offloaded to an USART hardware device. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose this driver or the Full-duplex driver whenever possible. Due to its internal design it is slightly more efficient then the Half-duplex driver, but it should be primarily chosen if Half-duplex operation is not supported by the USART peripheral.
+Targeting ARM boards based on ChibiOS where communication is offloaded to an USART hardware device. The advantages over bitbanging are fast, accurate timings and reduced CPU usage; therefore it is advised to choose this driver over all others where possible. Due to its internal design Full-duplex is slightly more efficient than the Half-duplex driver, but Full-duplex should be primarily chosen if Half-duplex operation is not supported by the controller's USART peripheral.
 
 ### Pin configuration
 
@@ -129,13 +133,13 @@ Targeting ARM boards based on ChibiOS where communication is offloaded to an USA
 +-------+                 +-------+
 ```
 
-Two GPIO pins are needed for the Full-duplex driver, as two distinct wires are used for receiving and transmitting data. The pin transmitting data is the `TX` pin and refereed to as the `SERIAL_USART_TX_PIN`, the pin receiving data is the `RX` pin and refereed to as the `SERIAL_USART_RX_PIN` in this configuration. Please note that `TX` pin of the master half has to be connected with the `RX` pin of the slave half and the `RX` pin of the master half has to be connected with the `TX` pin of the slave half! Usually this pin swap has to be done outside of the MCU e.g. with cables or on the PCB. Some MCUs like the STM32F303 used on the Proton-C allow this pin swap directly inside the MCU. A simple TRRS or USB cable provides enough conductors for this driver to work.
+Two GPIO pins are needed for the Full-duplex driver, as two distinct wires are used for receiving and transmitting data. The pin transmitting data is the `TX` pin and refereed to as the `SERIAL_USART_TX_PIN`, the pin receiving data is the `RX` pin and refereed to as the `SERIAL_USART_RX_PIN` in this configuration. Please note that `TX` pin of the master half has to be connected with the `RX` pin of the slave half and the `RX` pin of the master half has to be connected with the `TX` pin of the slave half! Usually this pin swap has to be done outside of the MCU e.g. with cables or on the PCB. Some MCUs like the STM32F303 used on the Proton-C allow this pin swap directly inside the MCU. A TRRS or USB cable provides enough conductors for this driver to function.
 
-To use this driver the usart peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Refer to the corresponding datasheets of your MCU or find those settings in the section ["Alternate Functions for selected STM32 MCUs"](#alternate-functions-for-selected-stm32-mcus).
+To use this driver the USART peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C development board everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Refer to the corresponding datasheets of your MCU or find those settings in the section ["Alternate Functions for selected STM32 MCUs"](#alternate-functions-for-selected-stm32-mcus).
 
 ### Setup
 
-To use the Full-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation skip step 1.
+To use the Full-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation, start at step 2
 
 1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file:
 
@@ -143,7 +147,9 @@ To use the Full-duplex driver follow these steps to activate it. If you target t
 SERIAL_DRIVER = usart
 ```
 
-2. (RP2040 PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
+Skip to step 3
+
+2. (RP2040 + PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
 
 ```make
 SERIAL_DRIVER = vendor
@@ -165,7 +171,7 @@ For STM32 MCUs several GPIO configuration options, including the ability for `TX
 #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 ```
 
-1. Decide either for `SERIAL`, `SIO` or `PIO` subsystem, see the section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
+4. Decide either for `SERIAL`, `SIO`, or `PIO` subsystem. See section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
 
 <hr>
 
@@ -225,7 +231,7 @@ Just below `#include_next <mcuconf.h>` add:
 
 Where 'n' matches the peripheral number of your selected USART on the MCU.
 
-3. In you keyboards `config.h`: override the default USART `SIO` driver if you use a USART peripheral that does not belong to the default selected `SIOD1` driver. For instance, if you selected `STM32_SERIAL_USE_USART3` the matching driver would be `SIOD3`.
+3. In the keyboard's `config.h` file: override the default USART `SIO` driver if you use a USART peripheral that does not belong to the default selected `SIOD1` driver. For instance, if you selected `STM32_SERIAL_USE_USART3` the matching driver would be `SIOD3`.
 
 ```c
  #define SERIAL_USART_DRIVER SIOD3
@@ -233,9 +239,9 @@ Where 'n' matches the peripheral number of your selected USART on the MCU.
  
 ### The `PIO` driver
 
-The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using the integrated PIO peripheral and is therefore only available on this MCU. Because of the flexible nature of the PIO peripherals, **any** GPIO pin can be used as a `TX` or `RX` pin. Half-duplex and Full-duplex operation is fully supported. The Half-duplex operation mode uses the built-in pull-ups and GPIO manipulation on the RP2040 to drive the line high by default. An external pull-up is therefore not necessary.
+The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using an integrated PIO peripheral and is therefore only available on this MCU. Because of the flexible nature of PIO peripherals, **any** GPIO pin can be used as a `TX` or `RX` pin. Half-duplex and Full-duplex operation modes are fully supported with this driver. Half-duplex uses the built-in pull-ups and GPIO manipulation of the RP2040 to drive the line high by default, thus an external pull-up resistor **is not required**.
 
-You may optionally switch the PIO peripheral used with the following define in config.h:
+Optionally, the PIO peripheral utilized for split communication can be changed with the following define in config.h:
 ```c
 #define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral
 ```
diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index af015b4b18a..c3b9e5595e1 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -210,6 +210,7 @@ That said, there are a number of Pro Micro replacements with ARM controllers:
 * [Elite-Pi](https://keeb.io/products/elite-pi-usb-c-pro-micro-replacement-rp2040)
 * [0xCB Helios](https://keeb.supply/products/0xcb-helios) ([Open Source](https://github.com/0xCB-dev/0xCB-Helios), DIY/PCBA/Shop)
 * [Liatris](https://splitkb.com/products/liatris)
+* [Imera](https://splitkb.com/products/imera)
 * [Michi](https://github.com/ci-bus/michi-promicro-rp2040)
 
 There are other, non-Pro Micro compatible boards out there. The most popular being:
diff --git a/docs/uart_driver.md b/docs/uart_driver.md
index a88278d5438..9b0a92d23d1 100644
--- a/docs/uart_driver.md
+++ b/docs/uart_driver.md
@@ -32,13 +32,7 @@ No special setup is required - just connect the `RX` and `TX` pins of your UART
 
 You'll need to determine which pins can be used for UART -- as an example, STM32 parts generally have multiple UART peripherals, labeled USART1, USART2, USART3 etc.
 
-To enable UART, modify your board's `halconf.h` to enable the serial driver:
-
-```c
-#define HAL_USE_SERIAL TRUE
-```
-
-Then, modify your board's `mcuconf.h` to enable the peripheral you've chosen, for example:
+To enable UART, modify your board's `mcuconf.h` to enable the peripheral you've chosen, for example:
 
 ```c
 #undef STM32_SERIAL_USE_USART2
@@ -47,17 +41,17 @@ Then, modify your board's `mcuconf.h` to enable the peripheral you've chosen, fo
 
 Configuration-wise, you'll need to set up the peripheral as per your MCU's datasheet -- the defaults match the pins for a Proton-C, i.e. STM32F303.
 
-|`config.h` override       |Description                                                    |Default Value|
-|--------------------------|---------------------------------------------------------------|-------------|
-|`#define SERIAL_DRIVER`   |USART peripheral to use - USART1 -> `SD1`, USART2 -> `SD2` etc.|`SD1`        |
-|`#define SD1_TX_PIN`      |The pin to use for TX                                          |`A9`         |
-|`#define SD1_TX_PAL_MODE` |The alternate function mode for TX                             |`7`          |
-|`#define SD1_RX_PIN`      |The pin to use for RX                                          |`A10`        |
-|`#define SD1_RX_PAL_MODE` |The alternate function mode for RX                             |`7`          |
-|`#define SD1_CTS_PIN`     |The pin to use for CTS                                         |`A11`        |
-|`#define SD1_CTS_PAL_MODE`|The alternate function mode for CTS                            |`7`          |
-|`#define SD1_RTS_PIN`     |The pin to use for RTS                                         |`A12`        |
-|`#define SD1_RTS_PAL_MODE`|The alternate function mode for RTS                            |`7`          |
+|     `config.h` override     |                           Description                           | Default Value |
+| --------------------------- | --------------------------------------------------------------- | ------------- |
+| `#define UART_DRIVER`       | USART peripheral to use - USART1 -> `SD1`, USART2 -> `SD2` etc. | `SD1`         |
+| `#define UART_TX_PIN`       | The pin to use for TX                                           | `A9`          |
+| `#define UART_TX_PAL_MODE`  | The alternate function mode for TX                              | `7`           |
+| `#define UART_RX_PIN`       | The pin to use for RX                                           | `A10`         |
+| `#define UART_RX_PAL_MODE`  | The alternate function mode for RX                              | `7`           |
+| `#define UART_CTS_PIN`      | The pin to use for CTS                                          | `A11`         |
+| `#define UART_CTS_PAL_MODE` | The alternate function mode for CTS                             | `7`           |
+| `#define UART_RTS_PIN`      | The pin to use for RTS                                          | `A12`         |
+| `#define UART_RTS_PAL_MODE` | The alternate function mode for RTS                             | `7`           |
 
 ## API :id=api
 
diff --git a/drivers/bluetooth/bluefruit_le.cpp b/drivers/bluetooth/bluefruit_le.cpp
index 39c14ddd13c..218eca21953 100644
--- a/drivers/bluetooth/bluefruit_le.cpp
+++ b/drivers/bluetooth/bluefruit_le.cpp
@@ -188,7 +188,7 @@ static bool sdep_recv_pkt(struct sdep_msg *msg, uint16_t timeout) {
     bool     ready      = false;
 
     do {
-        ready = readPin(BLUEFRUIT_LE_IRQ_PIN);
+        ready = gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN);
         if (ready) {
             break;
         }
@@ -231,7 +231,7 @@ static void resp_buf_read_one(bool greedy) {
         return;
     }
 
-    if (readPin(BLUEFRUIT_LE_IRQ_PIN)) {
+    if (gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN)) {
         struct sdep_msg msg;
 
     again:
@@ -242,7 +242,7 @@ static void resp_buf_read_one(bool greedy) {
                 dprintf("recv latency %dms\n", TIMER_DIFF_16(timer_read(), last_send));
             }
 
-            if (greedy && resp_buf.peek(last_send) && readPin(BLUEFRUIT_LE_IRQ_PIN)) {
+            if (greedy && resp_buf.peek(last_send) && gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN)) {
                 goto again;
             }
         }
@@ -293,16 +293,16 @@ void bluefruit_le_init(void) {
     state.configured   = false;
     state.is_connected = false;
 
-    setPinInput(BLUEFRUIT_LE_IRQ_PIN);
+    gpio_set_pin_input(BLUEFRUIT_LE_IRQ_PIN);
 
     spi_init();
 
     // Perform a hardware reset
-    setPinOutput(BLUEFRUIT_LE_RST_PIN);
-    writePinHigh(BLUEFRUIT_LE_RST_PIN);
-    writePinLow(BLUEFRUIT_LE_RST_PIN);
+    gpio_set_pin_output(BLUEFRUIT_LE_RST_PIN);
+    gpio_write_pin_high(BLUEFRUIT_LE_RST_PIN);
+    gpio_write_pin_low(BLUEFRUIT_LE_RST_PIN);
     wait_ms(10);
-    writePinHigh(BLUEFRUIT_LE_RST_PIN);
+    gpio_write_pin_high(BLUEFRUIT_LE_RST_PIN);
 
     wait_ms(1000); // Give it a second to initialize
 
@@ -508,7 +508,7 @@ void bluefruit_le_task(void) {
     resp_buf_read_one(true);
     send_buf_send_one(SdepShortTimeout);
 
-    if (resp_buf.empty() && (state.event_flags & UsingEvents) && readPin(BLUEFRUIT_LE_IRQ_PIN)) {
+    if (resp_buf.empty() && (state.event_flags & UsingEvents) && gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN)) {
         // Must be an event update
         if (at_command_P(PSTR("AT+EVENTSTATUS"), resbuf, sizeof(resbuf))) {
             uint32_t mask = strtoul(resbuf, NULL, 16);
diff --git a/drivers/eeprom/eeprom_i2c.c b/drivers/eeprom/eeprom_i2c.c
index a74a0104157..0d3d5ccbe50 100644
--- a/drivers/eeprom/eeprom_i2c.c
+++ b/drivers/eeprom/eeprom_i2c.c
@@ -57,8 +57,8 @@ void eeprom_driver_init(void) {
     i2c_init();
 #if defined(EXTERNAL_EEPROM_WP_PIN)
     /* We are setting the WP pin to high in a way that requires at least two bit-flips to change back to 0 */
-    writePin(EXTERNAL_EEPROM_WP_PIN, 1);
-    setPinInputHigh(EXTERNAL_EEPROM_WP_PIN);
+    gpio_write_pin(EXTERNAL_EEPROM_WP_PIN, 1);
+    gpio_set_pin_input_high(EXTERNAL_EEPROM_WP_PIN);
 #endif
 }
 
@@ -100,8 +100,8 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
     uintptr_t target_addr = (uintptr_t)addr;
 
 #if defined(EXTERNAL_EEPROM_WP_PIN)
-    setPinOutput(EXTERNAL_EEPROM_WP_PIN);
-    writePin(EXTERNAL_EEPROM_WP_PIN, 0);
+    gpio_set_pin_output(EXTERNAL_EEPROM_WP_PIN);
+    gpio_write_pin(EXTERNAL_EEPROM_WP_PIN, 0);
 #endif
 
     while (len > 0) {
@@ -134,7 +134,7 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
 
 #if defined(EXTERNAL_EEPROM_WP_PIN)
     /* We are setting the WP pin to high in a way that requires at least two bit-flips to change back to 0 */
-    writePin(EXTERNAL_EEPROM_WP_PIN, 1);
-    setPinInputHigh(EXTERNAL_EEPROM_WP_PIN);
+    gpio_write_pin(EXTERNAL_EEPROM_WP_PIN, 1);
+    gpio_set_pin_input_high(EXTERNAL_EEPROM_WP_PIN);
 #endif
 }
diff --git a/drivers/encoder/encoder_quadrature.c b/drivers/encoder/encoder_quadrature.c
new file mode 100644
index 00000000000..cd589bf1e20
--- /dev/null
+++ b/drivers/encoder/encoder_quadrature.c
@@ -0,0 +1,213 @@
+// Copyright 2018 Jack Humbert <jack.humb@gmail.com>
+// Copyright 2018-2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <stdint.h>
+#include "encoder.h"
+#include "gpio.h"
+#include "keyboard.h"
+#include "action.h"
+#include "keycodes.h"
+#include "wait.h"
+
+#ifdef SPLIT_KEYBOARD
+#    include "split_util.h"
+#endif
+
+// for memcpy
+#include <string.h>
+
+#if !defined(ENCODER_RESOLUTIONS) && !defined(ENCODER_RESOLUTION)
+#    define ENCODER_RESOLUTION 4
+#endif
+
+#undef ENCODER_DEFAULT_PIN_API_IMPL
+#if defined(ENCODERS_PAD_A) && defined(ENCODERS_PAD_B)
+// Inform the quadrature driver that it needs to implement pin init/read functions
+#    define ENCODER_DEFAULT_PIN_API_IMPL
+#endif
+
+extern volatile bool isLeftHand;
+
+__attribute__((weak)) void    encoder_quadrature_init_pin(uint8_t index, bool pad_b);
+__attribute__((weak)) uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b);
+
+#ifdef ENCODER_DEFAULT_PIN_API_IMPL
+
+static pin_t encoders_pad_a[NUM_ENCODERS_MAX_PER_SIDE] = ENCODERS_PAD_A;
+static pin_t encoders_pad_b[NUM_ENCODERS_MAX_PER_SIDE] = ENCODERS_PAD_B;
+
+__attribute__((weak)) void encoder_wait_pullup_charge(void) {
+    wait_us(100);
+}
+
+__attribute__((weak)) void encoder_quadrature_init_pin(uint8_t index, bool pad_b) {
+    pin_t pin = pad_b ? encoders_pad_b[index] : encoders_pad_a[index];
+    if (pin != NO_PIN) {
+        gpio_set_pin_input_high(pin);
+    }
+}
+
+__attribute__((weak)) uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b) {
+    pin_t pin = pad_b ? encoders_pad_b[index] : encoders_pad_a[index];
+    if (pin != NO_PIN) {
+        return gpio_read_pin(pin) ? 1 : 0;
+    }
+    return 0;
+}
+
+#endif // ENCODER_DEFAULT_PIN_API_IMPL
+
+#ifdef ENCODER_RESOLUTIONS
+static uint8_t encoder_resolutions[NUM_ENCODERS] = ENCODER_RESOLUTIONS;
+#endif
+
+#ifndef ENCODER_DIRECTION_FLIP
+#    define ENCODER_CLOCKWISE true
+#    define ENCODER_COUNTER_CLOCKWISE false
+#else
+#    define ENCODER_CLOCKWISE false
+#    define ENCODER_COUNTER_CLOCKWISE true
+#endif
+static int8_t encoder_LUT[] = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
+
+static uint8_t encoder_state[NUM_ENCODERS]  = {0};
+static int8_t  encoder_pulses[NUM_ENCODERS] = {0};
+
+// encoder counts
+static uint8_t thisCount;
+#ifdef SPLIT_KEYBOARD
+// encoder offsets for each hand
+static uint8_t thisHand, thatHand;
+// encoder counts for each hand
+static uint8_t thatCount;
+#endif
+
+__attribute__((weak)) void encoder_quadrature_post_init_kb(void) {
+    extern void encoder_quadrature_handle_read(uint8_t index, uint8_t pin_a_state, uint8_t pin_b_state);
+    // Unused normally, but can be used for things like setting up pin-change interrupts in keyboard code.
+    // During the interrupt, read the pins then call `encoder_handle_read()` with the pin states and it'll queue up an encoder event if needed.
+}
+
+void encoder_quadrature_post_init(void) {
+#ifdef ENCODER_DEFAULT_PIN_API_IMPL
+    for (uint8_t i = 0; i < thisCount; i++) {
+        encoder_quadrature_init_pin(i, false);
+        encoder_quadrature_init_pin(i, true);
+    }
+    encoder_wait_pullup_charge();
+    for (uint8_t i = 0; i < thisCount; i++) {
+        encoder_state[i] = (encoder_quadrature_read_pin(i, false) << 0) | (encoder_quadrature_read_pin(i, true) << 1);
+    }
+#else
+    memset(encoder_state, 0, sizeof(encoder_state));
+#endif
+
+    encoder_quadrature_post_init_kb();
+}
+
+void encoder_driver_init(void) {
+#ifdef SPLIT_KEYBOARD
+    thisHand  = isLeftHand ? 0 : NUM_ENCODERS_LEFT;
+    thatHand  = NUM_ENCODERS_LEFT - thisHand;
+    thisCount = isLeftHand ? NUM_ENCODERS_LEFT : NUM_ENCODERS_RIGHT;
+    thatCount = isLeftHand ? NUM_ENCODERS_RIGHT : NUM_ENCODERS_LEFT;
+#else // SPLIT_KEYBOARD
+    thisCount                = NUM_ENCODERS;
+#endif
+
+#ifdef ENCODER_TESTS
+    // Annoying that we have to clear out values during initialisation here, but
+    // because all the arrays are static locals, rerunning tests in the same
+    // executable doesn't reset any of these. Kinda crappy having test-only code
+    // here, but it's the simplest solution.
+    memset(encoder_state, 0, sizeof(encoder_state));
+    memset(encoder_pulses, 0, sizeof(encoder_pulses));
+    const pin_t encoders_pad_a_left[] = ENCODERS_PAD_A;
+    const pin_t encoders_pad_b_left[] = ENCODERS_PAD_B;
+    for (uint8_t i = 0; i < thisCount; i++) {
+        encoders_pad_a[i] = encoders_pad_a_left[i];
+        encoders_pad_b[i] = encoders_pad_b_left[i];
+    }
+#endif
+
+#if defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
+    // Re-initialise the pads if it's the right-hand side
+    if (!isLeftHand) {
+        const pin_t encoders_pad_a_right[] = ENCODERS_PAD_A_RIGHT;
+        const pin_t encoders_pad_b_right[] = ENCODERS_PAD_B_RIGHT;
+        for (uint8_t i = 0; i < thisCount; i++) {
+            encoders_pad_a[i] = encoders_pad_a_right[i];
+            encoders_pad_b[i] = encoders_pad_b_right[i];
+        }
+    }
+#endif // defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
+
+    // Encoder resolutions is defined differently in config.h, so concatenate
+#if defined(SPLIT_KEYBOARD) && defined(ENCODER_RESOLUTIONS)
+#    if defined(ENCODER_RESOLUTIONS_RIGHT)
+    static const uint8_t encoder_resolutions_right[NUM_ENCODERS_RIGHT] = ENCODER_RESOLUTIONS_RIGHT;
+#    else  // defined(ENCODER_RESOLUTIONS_RIGHT)
+    static const uint8_t encoder_resolutions_right[NUM_ENCODERS_RIGHT] = ENCODER_RESOLUTIONS;
+#    endif // defined(ENCODER_RESOLUTIONS_RIGHT)
+    for (uint8_t i = 0; i < NUM_ENCODERS_RIGHT; i++) {
+        encoder_resolutions[NUM_ENCODERS_LEFT + i] = encoder_resolutions_right[i];
+    }
+#endif // defined(SPLIT_KEYBOARD) && defined(ENCODER_RESOLUTIONS)
+
+    encoder_quadrature_post_init();
+}
+
+static void encoder_handle_state_change(uint8_t index, uint8_t state) {
+    uint8_t i = index;
+
+#ifdef SPLIT_KEYBOARD
+    index += thisHand;
+#endif
+
+#ifdef ENCODER_RESOLUTIONS
+    const uint8_t resolution = encoder_resolutions[index];
+#else
+    const uint8_t resolution = ENCODER_RESOLUTION;
+#endif
+
+    encoder_pulses[i] += encoder_LUT[state & 0xF];
+
+#ifdef ENCODER_DEFAULT_POS
+    if ((encoder_pulses[i] >= resolution) || (encoder_pulses[i] <= -resolution) || ((state & 0x3) == ENCODER_DEFAULT_POS)) {
+        if (encoder_pulses[i] >= 1) {
+#else
+    if (encoder_pulses[i] >= resolution) {
+#endif
+
+            encoder_queue_event(index, ENCODER_COUNTER_CLOCKWISE);
+        }
+
+#ifdef ENCODER_DEFAULT_POS
+        if (encoder_pulses[i] <= -1) {
+#else
+    if (encoder_pulses[i] <= -resolution) { // direction is arbitrary here, but this clockwise
+#endif
+            encoder_queue_event(index, ENCODER_CLOCKWISE);
+        }
+        encoder_pulses[i] %= resolution;
+#ifdef ENCODER_DEFAULT_POS
+        encoder_pulses[i] = 0;
+    }
+#endif
+}
+
+void encoder_quadrature_handle_read(uint8_t index, uint8_t pin_a_state, uint8_t pin_b_state) {
+    uint8_t state = pin_a_state | (pin_b_state << 1);
+    if ((encoder_state[index] & 0x3) != state) {
+        encoder_state[index] <<= 2;
+        encoder_state[index] |= state;
+        encoder_handle_state_change(index, encoder_state[index]);
+    }
+}
+
+__attribute__((weak)) void encoder_driver_task(void) {
+    for (uint8_t i = 0; i < thisCount; i++) {
+        encoder_quadrature_handle_read(i, encoder_quadrature_read_pin(i, false), encoder_quadrature_read_pin(i, true));
+    }
+}
diff --git a/drivers/gpio/mcp23018.c b/drivers/gpio/mcp23018.c
index 41cbfe087e4..3eca4f9d34c 100644
--- a/drivers/gpio/mcp23018.c
+++ b/drivers/gpio/mcp23018.c
@@ -33,13 +33,13 @@ bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf)
     uint8_t cmdDirection = port ? CMD_IODIRB : CMD_IODIRA;
     uint8_t cmdPullup    = port ? CMD_GPPUB : CMD_GPPUA;
 
-    i2c_status_t ret = i2c_writeReg(addr, cmdDirection, &conf, sizeof(conf), TIMEOUT);
+    i2c_status_t ret = i2c_write_register(addr, cmdDirection, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         dprintf("mcp23018_set_config::directionFAILED::%u\n", ret);
         return false;
     }
 
-    ret = i2c_writeReg(addr, cmdPullup, &conf, sizeof(conf), TIMEOUT);
+    ret = i2c_write_register(addr, cmdPullup, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         dprintf("mcp23018_set_config::pullupFAILED::%u\n", ret);
         return false;
@@ -52,7 +52,7 @@ 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;
 
-    i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
+    i2c_status_t ret = i2c_write_register(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         dprintf("mcp23018_set_output::FAILED::%u\n", ret);
         return false;
@@ -65,7 +65,7 @@ bool mcp23018_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_GPIOA, &conf[0], sizeof(conf), TIMEOUT);
+    i2c_status_t ret = i2c_write_register(addr, CMD_GPIOA, &conf[0], sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         dprintf("mcp23018_set_output::FAILED::%u\n", ret);
         return false;
@@ -78,7 +78,7 @@ 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;
 
-    i2c_status_t ret = i2c_readReg(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
+    i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         dprintf("mcp23018_readPins::FAILED::%u\n", ret);
         return false;
@@ -97,7 +97,7 @@ bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* out) {
 
     data16 data = {.u16 = 0};
 
-    i2c_status_t ret = i2c_readReg(addr, CMD_GPIOA, &data.u8[0], sizeof(data), TIMEOUT);
+    i2c_status_t ret = i2c_read_register(addr, CMD_GPIOA, &data.u8[0], sizeof(data), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         dprintf("mcp23018_readPins::FAILED::%u\n", ret);
         return false;
diff --git a/drivers/gpio/pca9505.c b/drivers/gpio/pca9505.c
index 5803746c96d..5617a14a8b1 100644
--- a/drivers/gpio/pca9505.c
+++ b/drivers/gpio/pca9505.c
@@ -41,8 +41,6 @@ void pca9505_init(uint8_t slave_addr) {
     }
 
     // TODO: could check device connected
-    // i2c_start(SLAVE_TO_ADDR(slave) | I2C_WRITE);
-    // i2c_stop();
 }
 
 bool pca9505_set_config(uint8_t slave_addr, pca9505_port_t port, uint8_t conf) {
@@ -66,7 +64,7 @@ bool pca9505_set_config(uint8_t slave_addr, pca9505_port_t port, uint8_t conf) {
             break;
     }
 
-    i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
+    i2c_status_t ret = i2c_write_register(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9505_set_config::FAILED\n");
         return false;
@@ -96,7 +94,7 @@ bool pca9505_set_polarity(uint8_t slave_addr, pca9505_port_t port, uint8_t conf)
             break;
     }
 
-    i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
+    i2c_status_t ret = i2c_write_register(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9505_set_polarity::FAILED\n");
         return false;
@@ -126,7 +124,7 @@ bool pca9505_set_output(uint8_t slave_addr, pca9505_port_t port, uint8_t conf) {
             break;
     }
 
-    i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
+    i2c_status_t ret = i2c_write_register(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9505_set_output::FAILED\n");
         return false;
@@ -156,7 +154,7 @@ bool pca9505_readPins(uint8_t slave_addr, pca9505_port_t port, uint8_t* out) {
             break;
     }
 
-    i2c_status_t ret = i2c_readReg(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
+    i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9505_readPins::FAILED\n");
         return false;
diff --git a/drivers/gpio/pca9555.c b/drivers/gpio/pca9555.c
index adcd040083d..0fc30099ac3 100644
--- a/drivers/gpio/pca9555.c
+++ b/drivers/gpio/pca9555.c
@@ -29,15 +29,13 @@ void pca9555_init(uint8_t slave_addr) {
     }
 
     // TODO: could check device connected
-    // i2c_start(SLAVE_TO_ADDR(slave) | I2C_WRITE);
-    // i2c_stop();
 }
 
 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);
+    i2c_status_t ret = i2c_write_register(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_set_config::FAILED\n");
         return false;
@@ -50,7 +48,7 @@ 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);
+    i2c_status_t ret = i2c_write_register(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_set_output::FAILED\n");
         return false;
@@ -63,7 +61,7 @@ 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);
+    i2c_status_t ret = i2c_write_register(addr, CMD_OUTPUT_0, &conf[0], sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         dprintf("pca9555_set_output::FAILED::%u\n", ret);
         return false;
@@ -76,7 +74,7 @@ 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;
 
-    i2c_status_t ret = i2c_readReg(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
+    i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_readPins::FAILED\n");
         return false;
@@ -95,7 +93,7 @@ bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* out) {
 
     data16 data = {.u16 = 0};
 
-    i2c_status_t ret = i2c_readReg(addr, CMD_INPUT_0, &data.u8[0], sizeof(data), TIMEOUT);
+    i2c_status_t ret = i2c_read_register(addr, CMD_INPUT_0, &data.u8[0], sizeof(data), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_readPins_all::FAILED\n");
         return false;
diff --git a/drivers/gpio/sn74x138.c b/drivers/gpio/sn74x138.c
index 222e5db56cb..1cf8e54f562 100644
--- a/drivers/gpio/sn74x138.c
+++ b/drivers/gpio/sn74x138.c
@@ -27,39 +27,39 @@ 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]);
+        gpio_set_pin_output(address_pins[i]);
+        gpio_write_pin_low(address_pins[i]);
     }
 
 #if defined(SN74X138_E1_PIN)
-    setPinOutput(SN74X138_E1_PIN);
-    writePinHigh(SN74X138_E1_PIN);
+    gpio_set_pin_output(SN74X138_E1_PIN);
+    gpio_write_pin_high(SN74X138_E1_PIN);
 #endif
 
 #if defined(SN74X138_E2_PIN)
-    setPinOutput(SN74X138_E2_PIN);
-    writePinHigh(SN74X138_E2_PIN);
+    gpio_set_pin_output(SN74X138_E2_PIN);
+    gpio_write_pin_high(SN74X138_E2_PIN);
 #endif
 #if defined(SN74X138_E3_PIN)
-    setPinOutput(SN74X138_E3_PIN);
-    writePinLow(SN74X138_E3_PIN);
+    gpio_set_pin_output(SN74X138_E3_PIN);
+    gpio_write_pin_low(SN74X138_E3_PIN);
 #endif
 }
 
 void sn74x138_set_enabled(bool enabled) {
 #if defined(SN74X138_E1_PIN)
-    writePin(SN74X138_E1_PIN, !enabled);
+    gpio_write_pin(SN74X138_E1_PIN, !enabled);
 #endif
 #if defined(SN74X138_E2_PIN)
-    writePin(SN74X138_E2_PIN, !enabled);
+    gpio_write_pin(SN74X138_E2_PIN, !enabled);
 #endif
 #if defined(SN74X138_E3_PIN)
-    writePin(SN74X138_E3_PIN, enabled);
+    gpio_write_pin(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));
+        gpio_write_pin(address_pins[i], address & (1 << i));
     }
 }
diff --git a/drivers/gpio/sn74x154.c b/drivers/gpio/sn74x154.c
index 5f21f12b55f..6226adf27e6 100644
--- a/drivers/gpio/sn74x154.c
+++ b/drivers/gpio/sn74x154.c
@@ -27,32 +27,32 @@ static const pin_t address_pins[ADDRESS_PIN_COUNT] = SN74X154_ADDRESS_PINS;
 
 void sn74x154_init(void) {
     for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
-        setPinOutput(address_pins[i]);
-        writePinLow(address_pins[i]);
+        gpio_set_pin_output(address_pins[i]);
+        gpio_write_pin_low(address_pins[i]);
     }
 
 #if defined(SN74X154_E0_PIN)
-    setPinOutput(SN74X154_E0_PIN);
-    writePinHigh(SN74X154_E0_PIN);
+    gpio_set_pin_output(SN74X154_E0_PIN);
+    gpio_write_pin_high(SN74X154_E0_PIN);
 #endif
 
 #if defined(SN74X154_E1_PIN)
-    setPinOutput(SN74X154_E1_PIN);
-    writePinHigh(SN74X154_E1_PIN);
+    gpio_set_pin_output(SN74X154_E1_PIN);
+    gpio_write_pin_high(SN74X154_E1_PIN);
 #endif
 }
 
 void sn74x154_set_enabled(bool enabled) {
 #if defined(SN74X154_E0_PIN)
-    writePin(SN74X154_E0_PIN, !enabled);
+    gpio_write_pin(SN74X154_E0_PIN, !enabled);
 #endif
 #if defined(SN74X154_E1_PIN)
-    writePin(SN74X154_E1_PIN, !enabled);
+    gpio_write_pin(SN74X154_E1_PIN, !enabled);
 #endif
 }
 
 void sn74x154_set_addr(uint8_t address) {
     for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
-        writePin(address_pins[i], address & (1 << i));
+        gpio_write_pin(address_pins[i], address & (1 << i));
     }
 }
diff --git a/drivers/haptic/drv2605l.c b/drivers/haptic/drv2605l.c
index 1ad2ad385f2..a5adde5366a 100644
--- a/drivers/haptic/drv2605l.c
+++ b/drivers/haptic/drv2605l.c
@@ -29,7 +29,7 @@ void drv2605l_write(uint8_t reg_addr, uint8_t data) {
 }
 
 uint8_t drv2605l_read(uint8_t reg_addr) {
-    i2c_readReg(DRV2605L_I2C_ADDRESS << 1, reg_addr, &drv2605l_read_buffer, 1, 100);
+    i2c_read_register(DRV2605L_I2C_ADDRESS << 1, reg_addr, &drv2605l_read_buffer, 1, 100);
 
     return drv2605l_read_buffer;
 }
diff --git a/drivers/haptic/solenoid.c b/drivers/haptic/solenoid.c
index da4095cda4d..346b88bbc47 100644
--- a/drivers/haptic/solenoid.c
+++ b/drivers/haptic/solenoid.c
@@ -61,7 +61,7 @@ void solenoid_set_dwell(uint8_t dwell) {
  * @param index select which solenoid to check/stop
  */
 void solenoid_stop(uint8_t index) {
-    writePin(solenoid_pads[index], !solenoid_active_state[index]);
+    gpio_write_pin(solenoid_pads[index], !solenoid_active_state[index]);
     solenoid_on[index]      = false;
     solenoid_buzzing[index] = false;
 }
@@ -78,7 +78,7 @@ void solenoid_fire(uint8_t index) {
     solenoid_on[index]      = true;
     solenoid_buzzing[index] = true;
     solenoid_start[index]   = timer_read();
-    writePin(solenoid_pads[index], solenoid_active_state[index]);
+    gpio_write_pin(solenoid_pads[index], solenoid_active_state[index]);
 }
 
 /**
@@ -128,12 +128,12 @@ void solenoid_check(void) {
             if ((elapsed[i] % (SOLENOID_BUZZ_ACTUATED + SOLENOID_BUZZ_NONACTUATED)) < SOLENOID_BUZZ_ACTUATED) {
                 if (!solenoid_buzzing[i]) {
                     solenoid_buzzing[i] = true;
-                    writePin(solenoid_pads[i], solenoid_active_state[i]);
+                    gpio_write_pin(solenoid_pads[i], solenoid_active_state[i]);
                 }
             } else {
                 if (solenoid_buzzing[i]) {
                     solenoid_buzzing[i] = false;
-                    writePin(solenoid_pads[i], !solenoid_active_state[i]);
+                    gpio_write_pin(solenoid_pads[i], !solenoid_active_state[i]);
                 }
             }
         }
@@ -156,8 +156,8 @@ void solenoid_setup(void) {
 #else
         solenoid_active_state[i] = high;
 #endif
-        writePin(solenoid_pads[i], !solenoid_active_state[i]);
-        setPinOutput(solenoid_pads[i]);
+        gpio_write_pin(solenoid_pads[i], !solenoid_active_state[i]);
+        gpio_set_pin_output(solenoid_pads[i]);
         if ((!HAPTIC_OFF_IN_LOW_POWER) || (usb_device_state == USB_DEVICE_STATE_CONFIGURED)) {
             solenoid_fire(i);
         }
@@ -170,6 +170,6 @@ void solenoid_setup(void) {
  */
 void solenoid_shutdown(void) {
     for (uint8_t i = 0; i < NUMBER_OF_SOLENOIDS; i++) {
-        writePin(solenoid_pads[i], !solenoid_active_state[i]);
+        gpio_write_pin(solenoid_pads[i], !solenoid_active_state[i]);
     }
 }
diff --git a/drivers/lcd/hd44780.c b/drivers/lcd/hd44780.c
index ccc50117abb..9b4e2f0226f 100644
--- a/drivers/lcd/hd44780.c
+++ b/drivers/lcd/hd44780.c
@@ -57,67 +57,67 @@ static const pin_t data_pins[4] = HD44780_DATA_PINS;
 #define HD44780_ENABLE_DELAY_US 1
 
 static void hd44780_latch(void) {
-    writePinHigh(HD44780_E_PIN);
+    gpio_write_pin_high(HD44780_E_PIN);
     wait_us(HD44780_ENABLE_DELAY_US);
-    writePinLow(HD44780_E_PIN);
+    gpio_write_pin_low(HD44780_E_PIN);
 }
 
 void hd44780_write(uint8_t data, bool isData) {
-    writePin(HD44780_RS_PIN, isData);
-    writePinLow(HD44780_RW_PIN);
+    gpio_write_pin(HD44780_RS_PIN, isData);
+    gpio_write_pin_low(HD44780_RW_PIN);
 
     for (int i = 0; i < 4; i++) {
-        setPinOutput(data_pins[i]);
+        gpio_set_pin_output(data_pins[i]);
     }
 
     // Write high nibble
     for (int i = 0; i < 4; i++) {
-        writePin(data_pins[i], (data >> 4) & (1 << i));
+        gpio_write_pin(data_pins[i], (data >> 4) & (1 << i));
     }
     hd44780_latch();
 
     // Write low nibble
     for (int i = 0; i < 4; i++) {
-        writePin(data_pins[i], data & (1 << i));
+        gpio_write_pin(data_pins[i], data & (1 << i));
     }
     hd44780_latch();
 
     for (int i = 0; i < 4; i++) {
-        writePinHigh(data_pins[i]);
+        gpio_write_pin_high(data_pins[i]);
     }
 }
 
 uint8_t hd44780_read(bool isData) {
     uint8_t data = 0;
 
-    writePin(HD44780_RS_PIN, isData);
-    writePinHigh(HD44780_RW_PIN);
+    gpio_write_pin(HD44780_RS_PIN, isData);
+    gpio_write_pin_high(HD44780_RW_PIN);
 
     for (int i = 0; i < 4; i++) {
-        setPinInput(data_pins[i]);
+        gpio_set_pin_input(data_pins[i]);
     }
 
-    writePinHigh(HD44780_E_PIN);
+    gpio_write_pin_high(HD44780_E_PIN);
     wait_us(HD44780_ENABLE_DELAY_US);
 
     // Read high nibble
     for (int i = 0; i < 4; i++) {
-        data |= (readPin(data_pins[i]) << i);
+        data |= (gpio_read_pin(data_pins[i]) << i);
     }
 
     data <<= 4;
 
-    writePinLow(HD44780_E_PIN);
+    gpio_write_pin_low(HD44780_E_PIN);
     wait_us(HD44780_ENABLE_DELAY_US);
-    writePinHigh(HD44780_E_PIN);
+    gpio_write_pin_high(HD44780_E_PIN);
     wait_us(HD44780_ENABLE_DELAY_US);
 
     // Read low nibble
     for (int i = 0; i < 4; i++) {
-        data |= (readPin(data_pins[i]) << i);
+        data |= (gpio_read_pin(data_pins[i]) << i);
     }
 
-    writePinLow(HD44780_E_PIN);
+    gpio_write_pin_low(HD44780_E_PIN);
 
     return data;
 }
@@ -171,20 +171,20 @@ void hd44780_set_ddram_address(uint8_t address) {
 }
 
 void hd44780_init(bool cursor, bool blink) {
-    setPinOutput(HD44780_RS_PIN);
-    setPinOutput(HD44780_RW_PIN);
-    setPinOutput(HD44780_E_PIN);
+    gpio_set_pin_output(HD44780_RS_PIN);
+    gpio_set_pin_output(HD44780_RW_PIN);
+    gpio_set_pin_output(HD44780_E_PIN);
 
     for (int i = 0; i < 4; i++) {
-        setPinOutput(data_pins[i]);
+        gpio_set_pin_output(data_pins[i]);
     }
 
     wait_ms(HD44780_INIT_DELAY_MS);
 
     // Manually configure for 4-bit mode - can't use hd44780_command() yet
     // HD44780U datasheet, Fig. 24 (p46)
-    writePinHigh(data_pins[0]); // Function set
-    writePinHigh(data_pins[1]); // DL = 1
+    gpio_write_pin_high(data_pins[0]); // Function set
+    gpio_write_pin_high(data_pins[1]); // DL = 1
     hd44780_latch();
     wait_ms(5);
     // Send again
@@ -194,7 +194,7 @@ void hd44780_init(bool cursor, bool blink) {
     hd44780_latch();
     wait_us(64);
 
-    writePinLow(data_pins[0]); // DL = 0
+    gpio_write_pin_low(data_pins[0]); // DL = 0
     hd44780_latch();
     wait_us(64);
 
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index 47ee02804ba..4fce40edbe0 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -92,10 +92,10 @@ static void InvertCharacter(uint8_t *cursor) {
 }
 
 bool st7565_init(display_rotation_t rotation) {
-    setPinOutput(ST7565_A0_PIN);
-    writePinHigh(ST7565_A0_PIN);
-    setPinOutput(ST7565_RST_PIN);
-    writePinHigh(ST7565_RST_PIN);
+    gpio_set_pin_output(ST7565_A0_PIN);
+    gpio_write_pin_high(ST7565_A0_PIN);
+    gpio_set_pin_output(ST7565_RST_PIN);
+    gpio_write_pin_high(ST7565_RST_PIN);
 
     st7565_rotation = st7565_init_user(rotation);
 
@@ -488,18 +488,18 @@ void st7565_task(void) {
 __attribute__((weak)) void st7565_task_user(void) {}
 
 void st7565_reset(void) {
-    writePinLow(ST7565_RST_PIN);
+    gpio_write_pin_low(ST7565_RST_PIN);
     wait_ms(20);
-    writePinHigh(ST7565_RST_PIN);
+    gpio_write_pin_high(ST7565_RST_PIN);
     wait_ms(20);
 }
 
 spi_status_t st7565_send_cmd(uint8_t cmd) {
-    writePinLow(ST7565_A0_PIN);
+    gpio_write_pin_low(ST7565_A0_PIN);
     return spi_write(cmd);
 }
 
 spi_status_t st7565_send_data(uint8_t *data, uint16_t length) {
-    writePinHigh(ST7565_A0_PIN);
+    gpio_write_pin_high(ST7565_A0_PIN);
     return spi_transmit(data, length);
 }
diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c
index 527519eb8a9..d6d4327495f 100644
--- a/drivers/led/apa102.c
+++ b/drivers/led/apa102.c
@@ -43,72 +43,37 @@
         }                                       \
     } while (0)
 
-#define APA102_SEND_BIT(byte, bit)                  \
-    do {                                            \
-        writePin(APA102_DI_PIN, (byte >> bit) & 1); \
-        io_wait;                                    \
-        writePinHigh(APA102_CI_PIN);                \
-        io_wait;                                    \
-        writePinLow(APA102_CI_PIN);                 \
-        io_wait;                                    \
+#define APA102_SEND_BIT(byte, bit)                        \
+    do {                                                  \
+        gpio_write_pin(APA102_DI_PIN, (byte >> bit) & 1); \
+        io_wait;                                          \
+        gpio_write_pin_high(APA102_CI_PIN);               \
+        io_wait;                                          \
+        gpio_write_pin_low(APA102_CI_PIN);                \
+        io_wait;                                          \
     } while (0)
 
 uint8_t apa102_led_brightness = APA102_DEFAULT_BRIGHTNESS;
 
-void static apa102_start_frame(void);
-void static apa102_end_frame(uint16_t num_leds);
-
-void static apa102_send_frame(uint8_t red, uint8_t green, uint8_t blue, uint8_t brightness);
-void static apa102_send_byte(uint8_t byte);
-
-void apa102_setleds(rgb_led_t *start_led, uint16_t num_leds) {
-    rgb_led_t *end = start_led + num_leds;
-
-    apa102_start_frame();
-    for (rgb_led_t *led = start_led; led < end; led++) {
-        apa102_send_frame(led->r, led->g, led->b, apa102_led_brightness);
-    }
-    apa102_end_frame(num_leds);
-}
-
-// Overwrite the default rgblight_call_driver to use apa102 driver
-void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds) {
-    apa102_setleds(start_led, num_leds);
-}
-
-void static apa102_init(void) {
-    setPinOutput(APA102_DI_PIN);
-    setPinOutput(APA102_CI_PIN);
-
-    writePinLow(APA102_DI_PIN);
-    writePinLow(APA102_CI_PIN);
-}
-
-void apa102_set_brightness(uint8_t brightness) {
-    if (brightness > APA102_MAX_BRIGHTNESS) {
-        apa102_led_brightness = APA102_MAX_BRIGHTNESS;
-    } else if (brightness < 0) {
-        apa102_led_brightness = 0;
-    } else {
-        apa102_led_brightness = brightness;
-    }
-}
-
-void static apa102_send_frame(uint8_t red, uint8_t green, uint8_t blue, uint8_t brightness) {
-    apa102_send_byte(0b11100000 | brightness);
-    apa102_send_byte(blue);
-    apa102_send_byte(green);
-    apa102_send_byte(red);
+static void apa102_send_byte(uint8_t byte) {
+    APA102_SEND_BIT(byte, 7);
+    APA102_SEND_BIT(byte, 6);
+    APA102_SEND_BIT(byte, 5);
+    APA102_SEND_BIT(byte, 4);
+    APA102_SEND_BIT(byte, 3);
+    APA102_SEND_BIT(byte, 2);
+    APA102_SEND_BIT(byte, 1);
+    APA102_SEND_BIT(byte, 0);
 }
 
-void static apa102_start_frame(void) {
+static void apa102_start_frame(void) {
     apa102_init();
     for (uint16_t i = 0; i < 4; i++) {
         apa102_send_byte(0);
     }
 }
 
-void static apa102_end_frame(uint16_t num_leds) {
+static void apa102_end_frame(uint16_t num_leds) {
     // This function has been taken from: https://github.com/pololu/apa102-arduino/blob/master/APA102.h
     // and adapted. The code is MIT licensed. I think thats compatible?
     //
@@ -141,13 +106,37 @@ void static apa102_end_frame(uint16_t num_leds) {
     apa102_init();
 }
 
-void static apa102_send_byte(uint8_t byte) {
-    APA102_SEND_BIT(byte, 7);
-    APA102_SEND_BIT(byte, 6);
-    APA102_SEND_BIT(byte, 5);
-    APA102_SEND_BIT(byte, 4);
-    APA102_SEND_BIT(byte, 3);
-    APA102_SEND_BIT(byte, 2);
-    APA102_SEND_BIT(byte, 1);
-    APA102_SEND_BIT(byte, 0);
+static void apa102_send_frame(uint8_t red, uint8_t green, uint8_t blue, uint8_t brightness) {
+    apa102_send_byte(0b11100000 | brightness);
+    apa102_send_byte(blue);
+    apa102_send_byte(green);
+    apa102_send_byte(red);
+}
+
+void apa102_init(void) {
+    gpio_set_pin_output(APA102_DI_PIN);
+    gpio_set_pin_output(APA102_CI_PIN);
+
+    gpio_write_pin_low(APA102_DI_PIN);
+    gpio_write_pin_low(APA102_CI_PIN);
+}
+
+void apa102_setleds(rgb_led_t *start_led, uint16_t num_leds) {
+    rgb_led_t *end = start_led + num_leds;
+
+    apa102_start_frame();
+    for (rgb_led_t *led = start_led; led < end; led++) {
+        apa102_send_frame(led->r, led->g, led->b, apa102_led_brightness);
+    }
+    apa102_end_frame(num_leds);
+}
+
+void apa102_set_brightness(uint8_t brightness) {
+    if (brightness > APA102_MAX_BRIGHTNESS) {
+        apa102_led_brightness = APA102_MAX_BRIGHTNESS;
+    } else if (brightness < 0) {
+        apa102_led_brightness = 0;
+    } else {
+        apa102_led_brightness = brightness;
+    }
 }
diff --git a/drivers/led/apa102.h b/drivers/led/apa102.h
index cd0a19d4454..5e2f78658be 100644
--- a/drivers/led/apa102.h
+++ b/drivers/led/apa102.h
@@ -19,13 +19,19 @@
 
 #include "color.h"
 
+#if defined(RGBLIGHT_APA102)
+#    define APA102_LED_COUNT RGBLIGHT_LED_COUNT
+#elif defined(RGB_MATRIX_APA102)
+#    define APA102_LED_COUNT RGB_MATRIX_LED_COUNT
+#endif
+
 #ifndef APA102_DEFAULT_BRIGHTNESS
 #    define APA102_DEFAULT_BRIGHTNESS 31
 #endif
 
 #define APA102_MAX_BRIGHTNESS 31
 
-extern uint8_t apa102_led_brightness;
+void apa102_init(void);
 
 /* User Interface
  *
@@ -38,4 +44,5 @@ extern uint8_t apa102_led_brightness;
  *         - Send out the LED data
  */
 void apa102_setleds(rgb_led_t *start_led, uint16_t num_leds);
+
 void apa102_set_brightness(uint8_t brightness);
diff --git a/drivers/led/aw20216s.c b/drivers/led/aw20216s.c
index ab7f3ccb42d..704794f5b5a 100644
--- a/drivers/led/aw20216s.c
+++ b/drivers/led/aw20216s.c
@@ -45,8 +45,15 @@
 #    define AW20216S_SPI_DIVISOR 4
 #endif
 
-uint8_t g_pwm_buffer[AW20216S_DRIVER_COUNT][AW20216S_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[AW20216S_DRIVER_COUNT] = {false};
+typedef struct aw20216s_driver_t {
+    uint8_t pwm_buffer[AW20216S_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+} PACKED aw20216s_driver_t;
+
+aw20216s_driver_t driver_buffers[AW20216S_DRIVER_COUNT] = {{
+    .pwm_buffer       = {0},
+    .pwm_buffer_dirty = false,
+}};
 
 bool aw20216s_write(pin_t cs_pin, uint8_t page, uint8_t reg, uint8_t* data, uint8_t len) {
     static uint8_t s_spi_transfer_buffer[2] = {0};
@@ -106,16 +113,18 @@ static inline void aw20216s_auto_lowpower(pin_t cs_pin) {
 void aw20216s_init_drivers(void) {
     spi_init();
 
-    aw20216s_init(AW20216S_CS_PIN_1, AW20216S_EN_PIN_1);
+#if defined(AW20216S_EN_PIN)
+    gpio_set_pin_output(AW20216S_EN_PIN);
+    gpio_write_pin_high(AW20216S_EN_PIN);
+#endif
+
+    aw20216s_init(AW20216S_CS_PIN_1);
 #if defined(AW20216S_CS_PIN_2)
-    aw20216s_init(AW20216S_CS_PIN_2, AW20216S_EN_PIN_2);
+    aw20216s_init(AW20216S_CS_PIN_2);
 #endif
 }
 
-void aw20216s_init(pin_t cs_pin, pin_t en_pin) {
-    setPinOutput(en_pin);
-    writePinHigh(en_pin);
-
+void aw20216s_init(pin_t cs_pin) {
     aw20216s_soft_reset(cs_pin);
     wait_ms(2);
 
@@ -131,13 +140,14 @@ void aw20216s_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     aw20216s_led_t led;
     memcpy_P(&led, (&g_aw20216s_leds[index]), sizeof(led));
 
-    if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+    if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
         return;
     }
-    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;
+
+    driver_buffers[led.driver].pwm_buffer[led.r] = red;
+    driver_buffers[led.driver].pwm_buffer[led.g] = green;
+    driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+    driver_buffers[led.driver].pwm_buffer_dirty  = true;
 }
 
 void aw20216s_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
@@ -147,10 +157,10 @@ void aw20216s_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void aw20216s_update_pwm_buffers(pin_t cs_pin, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        aw20216s_write(cs_pin, AW20216S_PAGE_PWM, 0, g_pwm_buffer[index], AW20216S_PWM_REGISTER_COUNT);
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        aw20216s_write(cs_pin, AW20216S_PAGE_PWM, 0, driver_buffers[index].pwm_buffer, AW20216S_PWM_REGISTER_COUNT);
+        driver_buffers[index].pwm_buffer_dirty = false;
     }
-    g_pwm_buffer_update_required[index] = false;
 }
 
 void aw20216s_flush(void) {
diff --git a/drivers/led/aw20216s.h b/drivers/led/aw20216s.h
index 38a0c92b2f4..b2c097125f9 100644
--- a/drivers/led/aw20216s.h
+++ b/drivers/led/aw20216s.h
@@ -42,10 +42,10 @@
 #    define AW20216S_CS_PIN_2 DRIVER_2_CS
 #endif
 #ifdef DRIVER_1_EN
-#    define AW20216S_EN_PIN_1 DRIVER_1_EN
+#    define AW20216S_EN_PIN DRIVER_1_EN
 #endif
-#ifdef DRIVER_2_EN
-#    define AW20216S_EN_PIN_2 DRIVER_2_EN
+#ifdef AW20216S_EN_PIN_1
+#    define AW20216S_EN_PIN AW20216S_EN_PIN_1
 #endif
 
 #define aw_led aw20216s_led_t
@@ -94,226 +94,467 @@ typedef struct aw20216s_led_t {
 extern const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT];
 
 void aw20216s_init_drivers(void);
-void aw20216s_init(pin_t cs_pin, pin_t en_pin);
+void aw20216s_init(pin_t cs_pin);
 void aw20216s_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void aw20216s_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
 void aw20216s_update_pwm_buffers(pin_t cs_pin, uint8_t index);
 
 void aw20216s_flush(void);
 
-#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
-#define CS1_SW12 0xC6
-#define CS2_SW12 0xC7
-#define CS3_SW12 0xC8
-#define CS4_SW12 0xC9
-#define CS5_SW12 0xCA
-#define CS6_SW12 0xCB
-#define CS7_SW12 0xCC
-#define CS8_SW12 0xCD
-#define CS9_SW12 0xCE
-#define CS10_SW12 0xCF
-#define CS11_SW12 0xD0
-#define CS12_SW12 0xD1
-#define CS13_SW12 0xD2
-#define CS14_SW12 0xD3
-#define CS15_SW12 0xD4
-#define CS16_SW12 0xD5
-#define CS17_SW12 0xD6
-#define CS18_SW12 0xD7
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+
+#define SW2_CS1 0x12
+#define SW2_CS2 0x13
+#define SW2_CS3 0x14
+#define SW2_CS4 0x15
+#define SW2_CS5 0x16
+#define SW2_CS6 0x17
+#define SW2_CS7 0x18
+#define SW2_CS8 0x19
+#define SW2_CS9 0x1A
+#define SW2_CS10 0x1B
+#define SW2_CS11 0x1C
+#define SW2_CS12 0x1D
+#define SW2_CS13 0x1E
+#define SW2_CS14 0x1F
+#define SW2_CS15 0x20
+#define SW2_CS16 0x21
+#define SW2_CS17 0x22
+#define SW2_CS18 0x23
+
+#define SW3_CS1 0x24
+#define SW3_CS2 0x25
+#define SW3_CS3 0x26
+#define SW3_CS4 0x27
+#define SW3_CS5 0x28
+#define SW3_CS6 0x29
+#define SW3_CS7 0x2A
+#define SW3_CS8 0x2B
+#define SW3_CS9 0x2C
+#define SW3_CS10 0x2D
+#define SW3_CS11 0x2E
+#define SW3_CS12 0x2F
+#define SW3_CS13 0x30
+#define SW3_CS14 0x31
+#define SW3_CS15 0x32
+#define SW3_CS16 0x33
+#define SW3_CS17 0x34
+#define SW3_CS18 0x35
+
+#define SW4_CS1 0x36
+#define SW4_CS2 0x37
+#define SW4_CS3 0x38
+#define SW4_CS4 0x39
+#define SW4_CS5 0x3A
+#define SW4_CS6 0x3B
+#define SW4_CS7 0x3C
+#define SW4_CS8 0x3D
+#define SW4_CS9 0x3E
+#define SW4_CS10 0x3F
+#define SW4_CS11 0x40
+#define SW4_CS12 0x41
+#define SW4_CS13 0x42
+#define SW4_CS14 0x43
+#define SW4_CS15 0x44
+#define SW4_CS16 0x45
+#define SW4_CS17 0x46
+#define SW4_CS18 0x47
+
+#define SW5_CS1 0x48
+#define SW5_CS2 0x49
+#define SW5_CS3 0x4A
+#define SW5_CS4 0x4B
+#define SW5_CS5 0x4C
+#define SW5_CS6 0x4D
+#define SW5_CS7 0x4E
+#define SW5_CS8 0x4F
+#define SW5_CS9 0x50
+#define SW5_CS10 0x51
+#define SW5_CS11 0x52
+#define SW5_CS12 0x53
+#define SW5_CS13 0x54
+#define SW5_CS14 0x55
+#define SW5_CS15 0x56
+#define SW5_CS16 0x57
+#define SW5_CS17 0x58
+#define SW5_CS18 0x59
+
+#define SW6_CS1 0x5A
+#define SW6_CS2 0x5B
+#define SW6_CS3 0x5C
+#define SW6_CS4 0x5D
+#define SW6_CS5 0x5E
+#define SW6_CS6 0x5F
+#define SW6_CS7 0x60
+#define SW6_CS8 0x61
+#define SW6_CS9 0x62
+#define SW6_CS10 0x63
+#define SW6_CS11 0x64
+#define SW6_CS12 0x65
+#define SW6_CS13 0x66
+#define SW6_CS14 0x67
+#define SW6_CS15 0x68
+#define SW6_CS16 0x69
+#define SW6_CS17 0x6A
+#define SW6_CS18 0x6B
+
+#define SW7_CS1 0x6C
+#define SW7_CS2 0x6D
+#define SW7_CS3 0x6E
+#define SW7_CS4 0x6F
+#define SW7_CS5 0x70
+#define SW7_CS6 0x71
+#define SW7_CS7 0x72
+#define SW7_CS8 0x73
+#define SW7_CS9 0x74
+#define SW7_CS10 0x75
+#define SW7_CS11 0x76
+#define SW7_CS12 0x77
+#define SW7_CS13 0x78
+#define SW7_CS14 0x79
+#define SW7_CS15 0x7A
+#define SW7_CS16 0x7B
+#define SW7_CS17 0x7C
+#define SW7_CS18 0x7D
+
+#define SW8_CS1 0x7E
+#define SW8_CS2 0x7F
+#define SW8_CS3 0x80
+#define SW8_CS4 0x81
+#define SW8_CS5 0x82
+#define SW8_CS6 0x83
+#define SW8_CS7 0x84
+#define SW8_CS8 0x85
+#define SW8_CS9 0x86
+#define SW8_CS10 0x87
+#define SW8_CS11 0x88
+#define SW8_CS12 0x89
+#define SW8_CS13 0x8A
+#define SW8_CS14 0x8B
+#define SW8_CS15 0x8C
+#define SW8_CS16 0x8D
+#define SW8_CS17 0x8E
+#define SW8_CS18 0x8F
+
+#define SW9_CS1 0x90
+#define SW9_CS2 0x91
+#define SW9_CS3 0x92
+#define SW9_CS4 0x93
+#define SW9_CS5 0x94
+#define SW9_CS6 0x95
+#define SW9_CS7 0x96
+#define SW9_CS8 0x97
+#define SW9_CS9 0x98
+#define SW9_CS10 0x99
+#define SW9_CS11 0x9A
+#define SW9_CS12 0x9B
+#define SW9_CS13 0x9C
+#define SW9_CS14 0x9D
+#define SW9_CS15 0x9E
+#define SW9_CS16 0x9F
+#define SW9_CS17 0xA0
+#define SW9_CS18 0xA1
+
+#define SW10_CS1 0xA2
+#define SW10_CS2 0xA3
+#define SW10_CS3 0xA4
+#define SW10_CS4 0xA5
+#define SW10_CS5 0xA6
+#define SW10_CS6 0xA7
+#define SW10_CS7 0xA8
+#define SW10_CS8 0xA9
+#define SW10_CS9 0xAA
+#define SW10_CS10 0xAB
+#define SW10_CS11 0xAC
+#define SW10_CS12 0xAD
+#define SW10_CS13 0xAE
+#define SW10_CS14 0xAF
+#define SW10_CS15 0xB0
+#define SW10_CS16 0xB1
+#define SW10_CS17 0xB2
+#define SW10_CS18 0xB3
+
+#define SW11_CS1 0xB4
+#define SW11_CS2 0xB5
+#define SW11_CS3 0xB6
+#define SW11_CS4 0xB7
+#define SW11_CS5 0xB8
+#define SW11_CS6 0xB9
+#define SW11_CS7 0xBA
+#define SW11_CS8 0xBB
+#define SW11_CS9 0xBC
+#define SW11_CS10 0xBD
+#define SW11_CS11 0xBE
+#define SW11_CS12 0xBF
+#define SW11_CS13 0xC0
+#define SW11_CS14 0xC1
+#define SW11_CS15 0xC2
+#define SW11_CS16 0xC3
+#define SW11_CS17 0xC4
+#define SW11_CS18 0xC5
+
+#define SW12_CS1 0xC6
+#define SW12_CS2 0xC7
+#define SW12_CS3 0xC8
+#define SW12_CS4 0xC9
+#define SW12_CS5 0xCA
+#define SW12_CS6 0xCB
+#define SW12_CS7 0xCC
+#define SW12_CS8 0xCD
+#define SW12_CS9 0xCE
+#define SW12_CS10 0xCF
+#define SW12_CS11 0xD0
+#define SW12_CS12 0xD1
+#define SW12_CS13 0xD2
+#define SW12_CS14 0xD3
+#define SW12_CS15 0xD4
+#define SW12_CS16 0xD5
+#define SW12_CS17 0xD6
+#define SW12_CS18 0xD7
+
+// DEPRECATED - DO NOT USE
+
+#define CS1_SW1 SW1_CS1
+#define CS2_SW1 SW1_CS2
+#define CS3_SW1 SW1_CS3
+#define CS4_SW1 SW1_CS4
+#define CS5_SW1 SW1_CS5
+#define CS6_SW1 SW1_CS6
+#define CS7_SW1 SW1_CS7
+#define CS8_SW1 SW1_CS8
+#define CS9_SW1 SW1_CS9
+#define CS10_SW1 SW1_CS10
+#define CS11_SW1 SW1_CS11
+#define CS12_SW1 SW1_CS12
+#define CS13_SW1 SW1_CS13
+#define CS14_SW1 SW1_CS14
+#define CS15_SW1 SW1_CS15
+#define CS16_SW1 SW1_CS16
+#define CS17_SW1 SW1_CS17
+#define CS18_SW1 SW1_CS18
+
+#define CS1_SW2 SW2_CS1
+#define CS2_SW2 SW2_CS2
+#define CS3_SW2 SW2_CS3
+#define CS4_SW2 SW2_CS4
+#define CS5_SW2 SW2_CS5
+#define CS6_SW2 SW2_CS6
+#define CS7_SW2 SW2_CS7
+#define CS8_SW2 SW2_CS8
+#define CS9_SW2 SW2_CS9
+#define CS10_SW2 SW2_CS10
+#define CS11_SW2 SW2_CS11
+#define CS12_SW2 SW2_CS12
+#define CS13_SW2 SW2_CS13
+#define CS14_SW2 SW2_CS14
+#define CS15_SW2 SW2_CS15
+#define CS16_SW2 SW2_CS16
+#define CS17_SW2 SW2_CS17
+#define CS18_SW2 SW2_CS18
+
+#define CS1_SW3 SW3_CS1
+#define CS2_SW3 SW3_CS2
+#define CS3_SW3 SW3_CS3
+#define CS4_SW3 SW3_CS4
+#define CS5_SW3 SW3_CS5
+#define CS6_SW3 SW3_CS6
+#define CS7_SW3 SW3_CS7
+#define CS8_SW3 SW3_CS8
+#define CS9_SW3 SW3_CS9
+#define CS10_SW3 SW3_CS10
+#define CS11_SW3 SW3_CS11
+#define CS12_SW3 SW3_CS12
+#define CS13_SW3 SW3_CS13
+#define CS14_SW3 SW3_CS14
+#define CS15_SW3 SW3_CS15
+#define CS16_SW3 SW3_CS16
+#define CS17_SW3 SW3_CS17
+#define CS18_SW3 SW3_CS18
+
+#define CS1_SW4 SW4_CS1
+#define CS2_SW4 SW4_CS2
+#define CS3_SW4 SW4_CS3
+#define CS4_SW4 SW4_CS4
+#define CS5_SW4 SW4_CS5
+#define CS6_SW4 SW4_CS6
+#define CS7_SW4 SW4_CS7
+#define CS8_SW4 SW4_CS8
+#define CS9_SW4 SW4_CS9
+#define CS10_SW4 SW4_CS10
+#define CS11_SW4 SW4_CS11
+#define CS12_SW4 SW4_CS12
+#define CS13_SW4 SW4_CS13
+#define CS14_SW4 SW4_CS14
+#define CS15_SW4 SW4_CS15
+#define CS16_SW4 SW4_CS16
+#define CS17_SW4 SW4_CS17
+#define CS18_SW4 SW4_CS18
+
+#define CS1_SW5 SW5_CS1
+#define CS2_SW5 SW5_CS2
+#define CS3_SW5 SW5_CS3
+#define CS4_SW5 SW5_CS4
+#define CS5_SW5 SW5_CS5
+#define CS6_SW5 SW5_CS6
+#define CS7_SW5 SW5_CS7
+#define CS8_SW5 SW5_CS8
+#define CS9_SW5 SW5_CS9
+#define CS10_SW5 SW5_CS10
+#define CS11_SW5 SW5_CS11
+#define CS12_SW5 SW5_CS12
+#define CS13_SW5 SW5_CS13
+#define CS14_SW5 SW5_CS14
+#define CS15_SW5 SW5_CS15
+#define CS16_SW5 SW5_CS16
+#define CS17_SW5 SW5_CS17
+#define CS18_SW5 SW5_CS18
+
+#define CS1_SW6 SW6_CS1
+#define CS2_SW6 SW6_CS2
+#define CS3_SW6 SW6_CS3
+#define CS4_SW6 SW6_CS4
+#define CS5_SW6 SW6_CS5
+#define CS6_SW6 SW6_CS6
+#define CS7_SW6 SW6_CS7
+#define CS8_SW6 SW6_CS8
+#define CS9_SW6 SW6_CS9
+#define CS10_SW6 SW6_CS10
+#define CS11_SW6 SW6_CS11
+#define CS12_SW6 SW6_CS12
+#define CS13_SW6 SW6_CS13
+#define CS14_SW6 SW6_CS14
+#define CS15_SW6 SW6_CS15
+#define CS16_SW6 SW6_CS16
+#define CS17_SW6 SW6_CS17
+#define CS18_SW6 SW6_CS18
+
+#define CS1_SW7 SW7_CS1
+#define CS2_SW7 SW7_CS2
+#define CS3_SW7 SW7_CS3
+#define CS4_SW7 SW7_CS4
+#define CS5_SW7 SW7_CS5
+#define CS6_SW7 SW7_CS6
+#define CS7_SW7 SW7_CS7
+#define CS8_SW7 SW7_CS8
+#define CS9_SW7 SW7_CS9
+#define CS10_SW7 SW7_CS10
+#define CS11_SW7 SW7_CS11
+#define CS12_SW7 SW7_CS12
+#define CS13_SW7 SW7_CS13
+#define CS14_SW7 SW7_CS14
+#define CS15_SW7 SW7_CS15
+#define CS16_SW7 SW7_CS16
+#define CS17_SW7 SW7_CS17
+#define CS18_SW7 SW7_CS18
+
+#define CS1_SW8 SW8_CS1
+#define CS2_SW8 SW8_CS2
+#define CS3_SW8 SW8_CS3
+#define CS4_SW8 SW8_CS4
+#define CS5_SW8 SW8_CS5
+#define CS6_SW8 SW8_CS6
+#define CS7_SW8 SW8_CS7
+#define CS8_SW8 SW8_CS8
+#define CS9_SW8 SW8_CS9
+#define CS10_SW8 SW8_CS10
+#define CS11_SW8 SW8_CS11
+#define CS12_SW8 SW8_CS12
+#define CS13_SW8 SW8_CS13
+#define CS14_SW8 SW8_CS14
+#define CS15_SW8 SW8_CS15
+#define CS16_SW8 SW8_CS16
+#define CS17_SW8 SW8_CS17
+#define CS18_SW8 SW8_CS18
+
+#define CS1_SW9 SW9_CS1
+#define CS2_SW9 SW9_CS2
+#define CS3_SW9 SW9_CS3
+#define CS4_SW9 SW9_CS4
+#define CS5_SW9 SW9_CS5
+#define CS6_SW9 SW9_CS6
+#define CS7_SW9 SW9_CS7
+#define CS8_SW9 SW9_CS8
+#define CS9_SW9 SW9_CS9
+#define CS10_SW9 SW9_CS10
+#define CS11_SW9 SW9_CS11
+#define CS12_SW9 SW9_CS12
+#define CS13_SW9 SW9_CS13
+#define CS14_SW9 SW9_CS14
+#define CS15_SW9 SW9_CS15
+#define CS16_SW9 SW9_CS16
+#define CS17_SW9 SW9_CS17
+#define CS18_SW9 SW9_CS18
+
+#define CS1_SW10 SW10_CS1
+#define CS2_SW10 SW10_CS2
+#define CS3_SW10 SW10_CS3
+#define CS4_SW10 SW10_CS4
+#define CS5_SW10 SW10_CS5
+#define CS6_SW10 SW10_CS6
+#define CS7_SW10 SW10_CS7
+#define CS8_SW10 SW10_CS8
+#define CS9_SW10 SW10_CS9
+#define CS10_SW10 SW10_CS10
+#define CS11_SW10 SW10_CS11
+#define CS12_SW10 SW10_CS12
+#define CS13_SW10 SW10_CS13
+#define CS14_SW10 SW10_CS14
+#define CS15_SW10 SW10_CS15
+#define CS16_SW10 SW10_CS16
+#define CS17_SW10 SW10_CS17
+#define CS18_SW10 SW10_CS18
+
+#define CS1_SW11 SW11_CS1
+#define CS2_SW11 SW11_CS2
+#define CS3_SW11 SW11_CS3
+#define CS4_SW11 SW11_CS4
+#define CS5_SW11 SW11_CS5
+#define CS6_SW11 SW11_CS6
+#define CS7_SW11 SW11_CS7
+#define CS8_SW11 SW11_CS8
+#define CS9_SW11 SW11_CS9
+#define CS10_SW11 SW11_CS10
+#define CS11_SW11 SW11_CS11
+#define CS12_SW11 SW11_CS12
+#define CS13_SW11 SW11_CS13
+#define CS14_SW11 SW11_CS14
+#define CS15_SW11 SW11_CS15
+#define CS16_SW11 SW11_CS16
+#define CS17_SW11 SW11_CS17
+#define CS18_SW11 SW11_CS18
+
+#define CS1_SW12 SW12_CS1
+#define CS2_SW12 SW12_CS2
+#define CS3_SW12 SW12_CS3
+#define CS4_SW12 SW12_CS4
+#define CS5_SW12 SW12_CS5
+#define CS6_SW12 SW12_CS6
+#define CS7_SW12 SW12_CS7
+#define CS8_SW12 SW12_CS8
+#define CS9_SW12 SW12_CS9
+#define CS10_SW12 SW12_CS10
+#define CS11_SW12 SW12_CS11
+#define CS12_SW12 SW12_CS12
+#define CS13_SW12 SW12_CS13
+#define CS14_SW12 SW12_CS14
+#define CS15_SW12 SW12_CS15
+#define CS16_SW12 SW12_CS16
+#define CS17_SW12 SW12_CS17
+#define CS18_SW12 SW12_CS18
diff --git a/drivers/led/issi/is31fl3218-mono.c b/drivers/led/issi/is31fl3218-mono.c
new file mode 100644
index 00000000000..0174da7ab3b
--- /dev/null
+++ b/drivers/led/issi/is31fl3218-mono.c
@@ -0,0 +1,156 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ *
+ * 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 "is31fl3218-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+
+#define IS31FL3218_PWM_REGISTER_COUNT 18
+#define IS31FL3218_LED_CONTROL_REGISTER_COUNT 3
+
+#ifndef IS31FL3218_I2C_TIMEOUT
+#    define IS31FL3218_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3218_I2C_PERSISTENCE
+#    define IS31FL3218_I2C_PERSISTENCE 0
+#endif
+
+typedef struct is31fl3218_driver_t {
+    uint8_t pwm_buffer[IS31FL3218_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3218_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3218_driver_t;
+
+// IS31FL3218 has 18 PWM outputs and a fixed I2C address, so no chaining.
+is31fl3218_driver_t driver_buffers = {
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+};
+
+void is31fl3218_write_register(uint8_t reg, uint8_t data) {
+#if IS31FL3218_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(IS31FL3218_I2C_ADDRESS << 1, reg, &data, 1, IS31FL3218_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(IS31FL3218_I2C_ADDRESS << 1, reg, &data, 1, IS31FL3218_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3218_write_pwm_buffer(void) {
+#if IS31FL3218_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(IS31FL3218_I2C_ADDRESS << 1, IS31FL3218_REG_PWM, driver_buffers.pwm_buffer, 18, IS31FL3218_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(IS31FL3218_I2C_ADDRESS << 1, IS31FL3218_REG_PWM, driver_buffers.pwm_buffer, 18, IS31FL3218_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3218_init(void) {
+    i2c_init();
+
+#if defined(IS31FL3218_SDB_PIN)
+    gpio_set_pin_output(IS31FL3218_SDB_PIN);
+    gpio_write_pin_high(IS31FL3218_SDB_PIN);
+#endif
+
+    // In case we ever want to reinitialize (?)
+    is31fl3218_write_register(IS31FL3218_REG_RESET, 0x00);
+
+    // Turn off software shutdown
+    is31fl3218_write_register(IS31FL3218_REG_SHUTDOWN, 0x01);
+
+    // Set all PWM values to zero
+    for (uint8_t i = 0; i < IS31FL3218_PWM_REGISTER_COUNT; i++) {
+        is31fl3218_write_register(IS31FL3218_REG_PWM + i, 0x00);
+    }
+
+    // turn off all LEDs in the LED control register
+    for (uint8_t i = 0; i < IS31FL3218_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3218_write_register(IS31FL3218_REG_LED_CONTROL_1 + i, 0x00);
+    }
+
+    // Load PWM registers and LED Control register data
+    is31fl3218_write_register(IS31FL3218_REG_UPDATE, 0x01);
+
+    for (int i = 0; i < IS31FL3218_LED_COUNT; i++) {
+        is31fl3218_set_led_control_register(i, true);
+    }
+
+    is31fl3218_update_led_control_registers();
+}
+
+void is31fl3218_set_value(int index, uint8_t value) {
+    is31fl3218_led_t led;
+
+    if (index >= 0 && index < IS31FL3218_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3218_leds[index]), sizeof(led));
+
+        if (driver_buffers.pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers.pwm_buffer[led.v] = value;
+        driver_buffers.pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3218_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3218_LED_COUNT; i++) {
+        is31fl3218_set_value(i, value);
+    }
+}
+
+void is31fl3218_set_led_control_register(uint8_t index, bool value) {
+    is31fl3218_led_t led;
+    memcpy_P(&led, (&g_is31fl3218_leds[index]), sizeof(led));
+
+    uint8_t control_register = led.v / 6;
+    uint8_t bit_value        = led.v % 6;
+
+    if (value) {
+        driver_buffers.led_control_buffer[control_register] |= (1 << bit_value);
+    } else {
+        driver_buffers.led_control_buffer[control_register] &= ~(1 << bit_value);
+    }
+
+    driver_buffers.led_control_buffer_dirty = true;
+}
+
+void is31fl3218_update_pwm_buffers(void) {
+    if (driver_buffers.pwm_buffer_dirty) {
+        is31fl3218_write_pwm_buffer();
+        // Load PWM registers and LED Control register data
+        is31fl3218_write_register(IS31FL3218_REG_UPDATE, 0x01);
+
+        driver_buffers.pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3218_update_led_control_registers(void) {
+    if (driver_buffers.led_control_buffer_dirty) {
+        for (uint8_t i = 0; i < IS31FL3218_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3218_write_register(IS31FL3218_REG_LED_CONTROL_1 + i, driver_buffers.led_control_buffer[i]);
+        }
+
+        driver_buffers.led_control_buffer_dirty = false;
+    }
+}
diff --git a/drivers/led/issi/is31fl3218-mono.h b/drivers/led/issi/is31fl3218-mono.h
new file mode 100644
index 00000000000..38beed05695
--- /dev/null
+++ b/drivers/led/issi/is31fl3218-mono.h
@@ -0,0 +1,75 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ *
+ * 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"
+#include "util.h"
+
+#define IS31FL3218_REG_SHUTDOWN 0x00
+#define IS31FL3218_REG_PWM 0x01
+#define IS31FL3218_REG_LED_CONTROL_1 0x13
+#define IS31FL3218_REG_LED_CONTROL_2 0x14
+#define IS31FL3218_REG_LED_CONTROL_3 0x15
+#define IS31FL3218_REG_UPDATE 0x16
+#define IS31FL3218_REG_RESET 0x17
+
+#define IS31FL3218_I2C_ADDRESS 0x54
+
+#if defined(LED_MATRIX_IS31FL3218)
+#    define IS31FL3218_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+typedef struct is31fl3218_led_t {
+    uint8_t v;
+} PACKED is31fl3218_led_t;
+
+extern const is31fl3218_led_t PROGMEM g_is31fl3218_leds[IS31FL3218_LED_COUNT];
+
+void is31fl3218_init(void);
+
+void is31fl3218_write_register(uint8_t reg, uint8_t data);
+
+void is31fl3218_set_value(int index, uint8_t value);
+
+void is31fl3218_set_value_all(uint8_t value);
+
+void is31fl3218_set_led_control_register(uint8_t index, bool value);
+
+void is31fl3218_update_pwm_buffers(void);
+
+void is31fl3218_update_led_control_registers(void);
+
+#define OUT1 0x00
+#define OUT2 0x01
+#define OUT3 0x02
+#define OUT4 0x03
+#define OUT5 0x04
+#define OUT6 0x05
+#define OUT7 0x06
+#define OUT8 0x07
+#define OUT9 0x08
+#define OUT10 0x09
+#define OUT11 0x0A
+#define OUT12 0x0B
+#define OUT13 0x0C
+#define OUT14 0x0D
+#define OUT15 0x0E
+#define OUT16 0x0F
+#define OUT17 0x10
+#define OUT18 0x11
diff --git a/drivers/led/issi/is31fl3218-simple.c b/drivers/led/issi/is31fl3218-simple.c
deleted file mode 100644
index ce28c51d189..00000000000
--- a/drivers/led/issi/is31fl3218-simple.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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 "is31fl3218.h"
-#include <string.h>
-#include "i2c_master.h"
-
-#define IS31FL3218_PWM_REGISTER_COUNT 18
-#define IS31FL3218_LED_CONTROL_REGISTER_COUNT 3
-
-#ifndef IS31FL3218_I2C_TIMEOUT
-#    define IS31FL3218_I2C_TIMEOUT 100
-#endif
-
-#ifndef IS31FL3218_I2C_PERSISTENCE
-#    define IS31FL3218_I2C_PERSISTENCE 0
-#endif
-
-// Reusable buffer for transfers
-uint8_t g_twi_transfer_buffer[20];
-
-// IS31FL3218 has 18 PWM outputs and a fixed I2C address, so no chaining.
-uint8_t g_pwm_buffer[IS31FL3218_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required = false;
-
-uint8_t g_led_control_registers[IS31FL3218_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required                        = false;
-
-void is31fl3218_write_register(uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-#if IS31FL3218_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT) == 0) break;
-    }
-#else
-    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT);
-#endif
-}
-
-void is31fl3218_write_pwm_buffer(uint8_t *pwm_buffer) {
-    g_twi_transfer_buffer[0] = IS31FL3218_REG_PWM;
-    memcpy(g_twi_transfer_buffer + 1, pwm_buffer, 18);
-
-#if IS31FL3218_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
-        i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
-    }
-#else
-    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
-#endif
-}
-
-void is31fl3218_init(void) {
-    i2c_init();
-
-    // In case we ever want to reinitialize (?)
-    is31fl3218_write_register(IS31FL3218_REG_RESET, 0x00);
-
-    // Turn off software shutdown
-    is31fl3218_write_register(IS31FL3218_REG_SHUTDOWN, 0x01);
-
-    // Set all PWM values to zero
-    for (uint8_t i = 0; i < IS31FL3218_PWM_REGISTER_COUNT; i++) {
-        is31fl3218_write_register(IS31FL3218_REG_PWM + i, 0x00);
-    }
-
-    // turn off all LEDs in the LED control register
-    for (uint8_t i = 0; i < IS31FL3218_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3218_write_register(IS31FL3218_REG_LED_CONTROL_1 + i, 0x00);
-    }
-
-    // Load PWM registers and LED Control register data
-    is31fl3218_write_register(IS31FL3218_REG_UPDATE, 0x01);
-
-    for (int i = 0; i < IS31FL3218_LED_COUNT; i++) {
-        is31fl3218_set_led_control_register(i, true);
-    }
-
-    is31fl3218_update_led_control_registers();
-}
-
-void is31fl3218_set_value(int index, uint8_t value) {
-    is31fl3218_led_t led;
-    if (index >= 0 && index < IS31FL3218_LED_COUNT) {
-        memcpy_P(&led, (&g_is31fl3218_leds[index]), sizeof(led));
-    }
-    if (g_pwm_buffer[led.v - IS31FL3218_REG_PWM] == value) {
-        return;
-    }
-    g_pwm_buffer[led.v - IS31FL3218_REG_PWM] = value;
-    g_pwm_buffer_update_required             = true;
-}
-
-void is31fl3218_set_value_all(uint8_t value) {
-    for (int i = 0; i < IS31FL3218_LED_COUNT; i++) {
-        is31fl3218_set_value(i, value);
-    }
-}
-
-void is31fl3218_set_led_control_register(uint8_t index, bool value) {
-    is31fl3218_led_t led;
-    memcpy_P(&led, (&g_is31fl3218_leds[index]), sizeof(led));
-
-    uint8_t control_register = (led.v - IS31FL3218_REG_PWM) / 6;
-    uint8_t bit_value        = (led.v - IS31FL3218_REG_PWM) % 6;
-
-    if (value) {
-        g_led_control_registers[control_register] |= (1 << bit_value);
-    } else {
-        g_led_control_registers[control_register] &= ~(1 << bit_value);
-    }
-
-    g_led_control_registers_update_required = true;
-}
-
-void is31fl3218_update_pwm_buffers(void) {
-    if (g_pwm_buffer_update_required) {
-        is31fl3218_write_pwm_buffer(g_pwm_buffer);
-        // Load PWM registers and LED Control register data
-        is31fl3218_write_register(IS31FL3218_REG_UPDATE, 0x01);
-
-        g_pwm_buffer_update_required = false;
-    }
-}
-
-void is31fl3218_update_led_control_registers(void) {
-    if (g_led_control_registers_update_required) {
-        for (int i = 0; i < IS31FL3218_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3218_write_register(IS31FL3218_REG_LED_CONTROL_1 + i, g_led_control_registers[i]);
-        }
-
-        g_led_control_registers_update_required = false;
-    }
-}
diff --git a/drivers/led/issi/is31fl3218-simple.h b/drivers/led/issi/is31fl3218-simple.h
deleted file mode 100644
index 94928178092..00000000000
--- a/drivers/led/issi/is31fl3218-simple.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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"
-#include "util.h"
-
-#define IS31FL3218_REG_SHUTDOWN 0x00
-#define IS31FL3218_REG_PWM 0x01
-#define IS31FL3218_REG_LED_CONTROL_1 0x13
-#define IS31FL3218_REG_LED_CONTROL_2 0x14
-#define IS31FL3218_REG_LED_CONTROL_3 0x15
-#define IS31FL3218_REG_UPDATE 0x16
-#define IS31FL3218_REG_RESET 0x17
-
-#define IS31FL3218_I2C_ADDRESS 0x54
-
-#if defined(LED_MATRIX_IS31FL3218)
-#    define IS31FL3218_LED_COUNT LED_MATRIX_LED_COUNT
-#endif
-
-typedef struct is31fl3218_led_t {
-    uint8_t v;
-} PACKED is31fl3218_led_t;
-
-extern const is31fl3218_led_t PROGMEM g_is31fl3218_leds[IS31FL3218_LED_COUNT];
-
-void is31fl3218_init(void);
-
-void is31fl3218_set_value(int index, uint8_t value);
-
-void is31fl3218_set_value_all(uint8_t value);
-
-void is31fl3218_set_led_control_register(uint8_t index, bool value);
-
-void is31fl3218_update_pwm_buffers(void);
-
-void is31fl3218_update_led_control_registers(void);
-
-#define OUT1 0x01
-#define OUT2 0x02
-#define OUT3 0x03
-#define OUT4 0x04
-#define OUT5 0x05
-#define OUT6 0x06
-#define OUT7 0x07
-#define OUT8 0x08
-#define OUT9 0x09
-#define OUT10 0x0A
-#define OUT11 0x0B
-#define OUT12 0x0C
-#define OUT13 0x0D
-#define OUT14 0x0E
-#define OUT15 0x0F
-#define OUT16 0x10
-#define OUT17 0x11
-#define OUT18 0x12
diff --git a/drivers/led/issi/is31fl3218.c b/drivers/led/issi/is31fl3218.c
index 39db09d5186..dd97d236f7b 100644
--- a/drivers/led/issi/is31fl3218.c
+++ b/drivers/led/issi/is31fl3218.c
@@ -13,9 +13,10 @@
  * 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 "is31fl3218.h"
-#include <string.h>
 #include "i2c_master.h"
+#include "gpio.h"
 
 #define IS31FL3218_PWM_REGISTER_COUNT 18
 #define IS31FL3218_LED_CONTROL_REGISTER_COUNT 3
@@ -28,44 +29,49 @@
 #    define IS31FL3218_I2C_PERSISTENCE 0
 #endif
 
-// Reusable buffer for transfers
-uint8_t g_twi_transfer_buffer[20];
+typedef struct is31fl3218_driver_t {
+    uint8_t pwm_buffer[IS31FL3218_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3218_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3218_driver_t;
 
 // IS31FL3218 has 18 PWM outputs and a fixed I2C address, so no chaining.
-uint8_t g_pwm_buffer[IS31FL3218_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required = false;
-
-uint8_t g_led_control_registers[IS31FL3218_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required                        = false;
+is31fl3218_driver_t driver_buffers = {
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+};
 
 void is31fl3218_write_register(uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
 #if IS31FL3218_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT) == 0) break;
+        if (i2c_write_register(IS31FL3218_I2C_ADDRESS << 1, reg, &data, 1, IS31FL3218_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 2, IS31FL3218_I2C_TIMEOUT);
+    i2c_write_register(IS31FL3218_I2C_ADDRESS << 1, reg, &data, 1, IS31FL3218_I2C_TIMEOUT);
 #endif
 }
 
-void is31fl3218_write_pwm_buffer(uint8_t *pwm_buffer) {
-    g_twi_transfer_buffer[0] = IS31FL3218_REG_PWM;
-    memcpy(g_twi_transfer_buffer + 1, pwm_buffer, 18);
-
+void is31fl3218_write_pwm_buffer(void) {
 #if IS31FL3218_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3218_I2C_PERSISTENCE; i++) {
-        i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
+        if (i2c_write_register(IS31FL3218_I2C_ADDRESS << 1, IS31FL3218_REG_PWM, driver_buffers.pwm_buffer, 18, IS31FL3218_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    i2c_transmit(IS31FL3218_I2C_ADDRESS << 1, g_twi_transfer_buffer, 19, IS31FL3218_I2C_TIMEOUT);
+    i2c_write_register(IS31FL3218_I2C_ADDRESS << 1, IS31FL3218_REG_PWM, driver_buffers.pwm_buffer, 18, IS31FL3218_I2C_TIMEOUT);
 #endif
 }
 
 void is31fl3218_init(void) {
     i2c_init();
 
+#if defined(IS31FL3218_SDB_PIN)
+    gpio_set_pin_output(IS31FL3218_SDB_PIN);
+    gpio_write_pin_high(IS31FL3218_SDB_PIN);
+#endif
+
     // In case we ever want to reinitialize (?)
     is31fl3218_write_register(IS31FL3218_REG_RESET, 0x00);
 
@@ -94,16 +100,19 @@ void is31fl3218_init(void) {
 
 void is31fl3218_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31fl3218_led_t led;
+
     if (index >= 0 && index < IS31FL3218_LED_COUNT) {
         memcpy_P(&led, (&g_is31fl3218_leds[index]), sizeof(led));
+
+        if (driver_buffers.pwm_buffer[led.r] == red && driver_buffers.pwm_buffer[led.g] == green && driver_buffers.pwm_buffer[led.b] == blue) {
+            return;
+        }
+
+        driver_buffers.pwm_buffer[led.r] = red;
+        driver_buffers.pwm_buffer[led.g] = green;
+        driver_buffers.pwm_buffer[led.b] = blue;
+        driver_buffers.pwm_buffer_dirty  = true;
     }
-    if (g_pwm_buffer[led.r - IS31FL3218_REG_PWM] == red && g_pwm_buffer[led.g - IS31FL3218_REG_PWM] == green && g_pwm_buffer[led.b - IS31FL3218_REG_PWM] == blue) {
-        return;
-    }
-    g_pwm_buffer[led.r - IS31FL3218_REG_PWM] = red;
-    g_pwm_buffer[led.g - IS31FL3218_REG_PWM] = green;
-    g_pwm_buffer[led.b - IS31FL3218_REG_PWM] = blue;
-    g_pwm_buffer_update_required             = true;
 }
 
 void is31fl3218_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
@@ -116,48 +125,48 @@ void is31fl3218_set_led_control_register(uint8_t index, bool red, bool green, bo
     is31fl3218_led_t led;
     memcpy_P(&led, (&g_is31fl3218_leds[index]), sizeof(led));
 
-    uint8_t control_register_r = (led.r - IS31FL3218_REG_PWM) / 6;
-    uint8_t control_register_g = (led.g - IS31FL3218_REG_PWM) / 6;
-    uint8_t control_register_b = (led.b - IS31FL3218_REG_PWM) / 6;
-    uint8_t bit_r              = (led.r - IS31FL3218_REG_PWM) % 6;
-    uint8_t bit_g              = (led.g - IS31FL3218_REG_PWM) % 6;
-    uint8_t bit_b              = (led.b - IS31FL3218_REG_PWM) % 6;
+    uint8_t control_register_r = led.r / 6;
+    uint8_t control_register_g = led.g / 6;
+    uint8_t control_register_b = led.b / 6;
+    uint8_t bit_r              = led.r % 6;
+    uint8_t bit_g              = led.g % 6;
+    uint8_t bit_b              = led.b % 6;
 
     if (red) {
-        g_led_control_registers[control_register_r] |= (1 << bit_r);
+        driver_buffers.led_control_buffer[control_register_r] |= (1 << bit_r);
     } else {
-        g_led_control_registers[control_register_r] &= ~(1 << bit_r);
+        driver_buffers.led_control_buffer[control_register_r] &= ~(1 << bit_r);
     }
     if (green) {
-        g_led_control_registers[control_register_g] |= (1 << bit_g);
+        driver_buffers.led_control_buffer[control_register_g] |= (1 << bit_g);
     } else {
-        g_led_control_registers[control_register_g] &= ~(1 << bit_g);
+        driver_buffers.led_control_buffer[control_register_g] &= ~(1 << bit_g);
     }
     if (blue) {
-        g_led_control_registers[control_register_b] |= (1 << bit_b);
+        driver_buffers.led_control_buffer[control_register_b] |= (1 << bit_b);
     } else {
-        g_led_control_registers[control_register_b] &= ~(1 << bit_b);
+        driver_buffers.led_control_buffer[control_register_b] &= ~(1 << bit_b);
     }
 
-    g_led_control_registers_update_required = true;
+    driver_buffers.led_control_buffer_dirty = true;
 }
 
 void is31fl3218_update_pwm_buffers(void) {
-    if (g_pwm_buffer_update_required) {
-        is31fl3218_write_pwm_buffer(g_pwm_buffer);
+    if (driver_buffers.pwm_buffer_dirty) {
+        is31fl3218_write_pwm_buffer();
         // Load PWM registers and LED Control register data
         is31fl3218_write_register(IS31FL3218_REG_UPDATE, 0x01);
 
-        g_pwm_buffer_update_required = false;
+        driver_buffers.pwm_buffer_dirty = false;
     }
 }
 
 void is31fl3218_update_led_control_registers(void) {
-    if (g_led_control_registers_update_required) {
-        for (int i = 0; i < IS31FL3218_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3218_write_register(IS31FL3218_REG_LED_CONTROL_1 + i, g_led_control_registers[i]);
+    if (driver_buffers.led_control_buffer_dirty) {
+        for (uint8_t i = 0; i < IS31FL3218_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3218_write_register(IS31FL3218_REG_LED_CONTROL_1 + i, driver_buffers.led_control_buffer[i]);
         }
 
-        g_led_control_registers_update_required = false;
+        driver_buffers.led_control_buffer_dirty = false;
     }
 }
diff --git a/drivers/led/issi/is31fl3218.h b/drivers/led/issi/is31fl3218.h
index ffa7f36d615..2228343329d 100644
--- a/drivers/led/issi/is31fl3218.h
+++ b/drivers/led/issi/is31fl3218.h
@@ -45,6 +45,8 @@ extern const is31fl3218_led_t PROGMEM g_is31fl3218_leds[IS31FL3218_LED_COUNT];
 
 void is31fl3218_init(void);
 
+void is31fl3218_write_register(uint8_t reg, uint8_t data);
+
 void is31fl3218_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 
 void is31fl3218_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
@@ -55,21 +57,21 @@ void is31fl3218_update_pwm_buffers(void);
 
 void is31fl3218_update_led_control_registers(void);
 
-#define OUT1 0x01
-#define OUT2 0x02
-#define OUT3 0x03
-#define OUT4 0x04
-#define OUT5 0x05
-#define OUT6 0x06
-#define OUT7 0x07
-#define OUT8 0x08
-#define OUT9 0x09
-#define OUT10 0x0A
-#define OUT11 0x0B
-#define OUT12 0x0C
-#define OUT13 0x0D
-#define OUT14 0x0E
-#define OUT15 0x0F
-#define OUT16 0x10
-#define OUT17 0x11
-#define OUT18 0x12
+#define OUT1 0x00
+#define OUT2 0x01
+#define OUT3 0x02
+#define OUT4 0x03
+#define OUT5 0x04
+#define OUT6 0x05
+#define OUT7 0x06
+#define OUT8 0x07
+#define OUT9 0x08
+#define OUT10 0x09
+#define OUT11 0x0A
+#define OUT12 0x0B
+#define OUT13 0x0C
+#define OUT14 0x0D
+#define OUT15 0x0E
+#define OUT16 0x0F
+#define OUT17 0x10
+#define OUT18 0x11
diff --git a/drivers/led/issi/is31fl3729-mono.c b/drivers/led/issi/is31fl3729-mono.c
new file mode 100644
index 00000000000..13d5146877f
--- /dev/null
+++ b/drivers/led/issi/is31fl3729-mono.c
@@ -0,0 +1,213 @@
+/* Copyright 2024 HorrorTroll <https://github.com/HorrorTroll>
+ * Copyright 2024 Harrison Chan (Xelus)
+ * Copyright 2024 Dimitris Mantzouranis <d3xter93@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 "is31fl3729-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3729_PWM_REGISTER_COUNT 143
+#define IS31FL3729_SCALING_REGISTER_COUNT 16
+
+#ifndef IS31FL3729_I2C_TIMEOUT
+#    define IS31FL3729_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3729_I2C_PERSISTENCE
+#    define IS31FL3729_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3729_CONFIGURATION
+#    define IS31FL3729_CONFIGURATION IS31FL3729_CONFIG_SWS_15_9
+#endif
+
+#ifndef IS31FL3729_GLOBAL_CURRENT
+#    define IS31FL3729_GLOBAL_CURRENT 0x40
+#endif
+
+#ifndef IS31FL3729_SW_PULLDOWN
+#    define IS31FL3729_SW_PULLDOWN IS31FL3729_SW_PULLDOWN_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3729_CS_PULLUP
+#    define IS31FL3729_CS_PULLUP IS31FL3729_CS_PULLUP_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3729_SPREAD_SPECTRUM
+#    define IS31FL3729_SPREAD_SPECTRUM IS31FL3729_SPREAD_SPECTRUM_DISABLE
+#endif
+
+#ifndef IS31FL3729_SPREAD_SPECTRUM_RANGE
+#    define IS31FL3729_SPREAD_SPECTRUM_RANGE IS31FL3729_SPREAD_SPECTRUM_RANGE_5_PERCENT
+#endif
+
+#ifndef IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME
+#    define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1980_US
+#endif
+
+#ifndef IS31FL3729_PWM_FREQUENCY
+#    define IS31FL3729_PWM_FREQUENCY IS31FL3729_PWM_FREQUENCY_32K_HZ
+#endif
+
+const uint8_t i2c_addresses[IS31FL3729_DRIVER_COUNT] = {
+    IS31FL3729_I2C_ADDRESS_1,
+#ifdef IS31FL3729_I2C_ADDRESS_2
+    IS31FL3729_I2C_ADDRESS_2,
+#    ifdef IS31FL3729_I2C_ADDRESS_3
+    IS31FL3729_I2C_ADDRESS_3,
+#        ifdef IS31FL3729_I2C_ADDRESS_4
+    IS31FL3729_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+// These buffers match the PWM & scaling registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+typedef struct is31fl3729_driver_t {
+    uint8_t pwm_buffer[IS31FL3729_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3729_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3729_driver_t;
+
+is31fl3729_driver_t driver_buffers[IS31FL3729_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3729_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3729_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3729_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3729_write_pwm_buffer(uint8_t index) {
+    // Transmit PWM registers in 11 transfers of 13 bytes.
+
+    // Iterate over the pwm_buffer contents at 13 byte intervals.
+    for (uint8_t i = 0; i <= IS31FL3729_PWM_REGISTER_COUNT; i += 13) {
+#if IS31FL3729_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3729_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3729_SDB_PIN)
+    gpio_set_pin_output(IS31FL3729_SDB_PIN);
+    gpio_write_pin_high(IS31FL3729_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3729_LED_COUNT; i++) {
+        is31fl3729_set_scaling_register(i, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_update_scaling_registers(i);
+    }
+}
+
+void is31fl3729_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3729_write_register(index, IS31FL3729_REG_PULLDOWNUP, ((IS31FL3729_SW_PULLDOWN & 0b111) << 4) | (IS31FL3729_CS_PULLUP & 0b111));
+    is31fl3729_write_register(index, IS31FL3729_REG_SPREAD_SPECTRUM, ((IS31FL3729_SPREAD_SPECTRUM & 0b1) << 4) | ((IS31FL3729_SPREAD_SPECTRUM_RANGE & 0b11) << 2) | (IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME & 0b11));
+    is31fl3729_write_register(index, IS31FL3729_REG_PWM_FREQUENCY, IS31FL3729_PWM_FREQUENCY);
+    is31fl3729_write_register(index, IS31FL3729_REG_GLOBAL_CURRENT, IS31FL3729_GLOBAL_CURRENT);
+    is31fl3729_write_register(index, IS31FL3729_REG_CONFIGURATION, IS31FL3729_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3729_set_value(int index, uint8_t value) {
+    is31fl3729_led_t led;
+    if (index >= 0 && index < IS31FL3729_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3729_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3729_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3729_LED_COUNT; i++) {
+        is31fl3729_set_value(i, value);
+    }
+}
+
+void is31fl3729_set_scaling_register(uint8_t index, uint8_t value) {
+    is31fl3729_led_t led;
+    memcpy_P(&led, (&g_is31fl3729_leds[index]), sizeof(led));
+
+    // need to do a bit of checking here since 3729 scaling is per CS pin.
+    // not the usual per single LED key as per other ISSI drivers
+    // only enable them, since they should be default disabled
+    int cs_value = (led.v & 0x0F) - 1;
+
+    driver_buffers[led.driver].scaling_buffer[cs_value] = value;
+    driver_buffers[led.driver].scaling_buffer_dirty     = true;
+}
+
+void is31fl3729_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3729_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3729_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        for (uint8_t i = 0; i < IS31FL3729_SCALING_REGISTER_COUNT; i++) {
+            is31fl3729_write_register(index, IS31FL3729_REG_SCALING + i, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3729_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3729-mono.h b/drivers/led/issi/is31fl3729-mono.h
new file mode 100644
index 00000000000..9afcde84b37
--- /dev/null
+++ b/drivers/led/issi/is31fl3729-mono.h
@@ -0,0 +1,278 @@
+/* Copyright 2024 HorrorTroll <https://github.com/HorrorTroll>
+ * Copyright 2024 Harrison Chan (Xelus)
+ * Copyright 2024 Dimitris Mantzouranis <d3xter93@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 <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+#include "util.h"
+
+#define IS31FL3729_REG_PWM 0x01
+#define IS31FL3729_REG_SCALING 0x90
+#define IS31FL3729_REG_CONFIGURATION 0xA0
+#define IS31FL3729_REG_GLOBAL_CURRENT 0xA1
+#define IS31FL3729_REG_PULLDOWNUP 0xB0
+#define IS31FL3729_REG_SPREAD_SPECTRUM 0xB1
+#define IS31FL3729_REG_PWM_FREQUENCY 0xB2
+#define IS31FL3729_REG_RESET 0xCF
+
+#define IS31FL3729_I2C_ADDRESS_GND 0x34
+#define IS31FL3729_I2C_ADDRESS_SCL 0x35
+#define IS31FL3729_I2C_ADDRESS_SDA 0x36
+#define IS31FL3729_I2C_ADDRESS_VCC 0x37
+
+#if defined(LED_MATRIX_IS31FL3729)
+#    define IS31FL3729_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3729_I2C_ADDRESS_4)
+#    define IS31FL3729_DRIVER_COUNT 4
+#elif defined(IS31FL3729_I2C_ADDRESS_3)
+#    define IS31FL3729_DRIVER_COUNT 3
+#elif defined(IS31FL3729_I2C_ADDRESS_2)
+#    define IS31FL3729_DRIVER_COUNT 2
+#elif defined(IS31FL3729_I2C_ADDRESS_1)
+#    define IS31FL3729_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3729_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3729_led_t;
+
+extern const is31fl3729_led_t PROGMEM g_is31fl3729_leds[IS31FL3729_LED_COUNT];
+
+void is31fl3729_init_drivers(void);
+void is31fl3729_init(uint8_t index);
+void is31fl3729_write_register(uint8_t index, uint8_t reg, uint8_t data);
+
+void is31fl3729_set_value(int index, uint8_t value);
+void is31fl3729_set_value_all(uint8_t value);
+
+void is31fl3729_set_scaling_register(uint8_t index, uint8_t value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void is31fl3729_update_pwm_buffers(uint8_t index);
+void is31fl3729_update_scaling_registers(uint8_t index);
+
+void is31fl3729_flush(void);
+
+#define IS31FL3729_SW_PULLDOWN_0_OHM 0b000
+#define IS31FL3729_SW_PULLDOWN_0K5_OHM_SW_OFF 0b001
+#define IS31FL3729_SW_PULLDOWN_1K_OHM_SW_OFF 0b010
+#define IS31FL3729_SW_PULLDOWN_2K_OHM_SW_OFF 0b011
+#define IS31FL3729_SW_PULLDOWN_1K_OHM 0b100
+#define IS31FL3729_SW_PULLDOWN_2K_OHM 0b101
+#define IS31FL3729_SW_PULLDOWN_4K_OHM 0b110
+#define IS31FL3729_SW_PULLDOWN_8K_OHM 0b111
+
+#define IS31FL3729_CS_PULLUP_0_OHM 0b000
+#define IS31FL3729_CS_PULLUP_0K5_OHM_CS_OFF 0b001
+#define IS31FL3729_CS_PULLUP_1K_OHM_CS_OFF 0b010
+#define IS31FL3729_CS_PULLUP_2K_OHM_CS_OFF 0b011
+#define IS31FL3729_CS_PULLUP_1K_OHM 0b100
+#define IS31FL3729_CS_PULLUP_2K_OHM 0b101
+#define IS31FL3729_CS_PULLUP_4K_OHM 0b110
+#define IS31FL3729_CS_PULLUP_8K_OHM 0b111
+
+#define IS31FL3729_SPREAD_SPECTRUM_DISABLE 0b0
+#define IS31FL3729_SPREAD_SPECTRUM_ENABLE 0b1
+
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_5_PERCENT 0b00
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_15_PERCENT 0b01
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_24_PERCENT 0b10
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_34_PERCENT 0b11
+
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1980_US 0b00
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1200_US 0b01
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_820_US 0b10
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_660_US 0b11
+
+#define IS31FL3729_PWM_FREQUENCY_55K_HZ 0b000
+#define IS31FL3729_PWM_FREQUENCY_32K_HZ 0b001
+#define IS31FL3729_PWM_FREQUENCY_4K_HZ 0b010
+#define IS31FL3729_PWM_FREQUENCY_2K_HZ 0b011
+#define IS31FL3729_PWM_FREQUENCY_1K_HZ 0b100
+#define IS31FL3729_PWM_FREQUENCY_500_HZ 0b101
+#define IS31FL3729_PWM_FREQUENCY_250_HZ 0b110
+#define IS31FL3729_PWM_FREQUENCY_80K_HZ 0b111
+
+#define IS31FL3729_CONFIG_SWS_15_9 0x01 // 15 CS x 9 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_8 0x11 // 16 CS x 8 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_7 0x21 // 16 CS x 7 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_6 0x31 // 16 CS x 6 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_5 0x41 // 16 CS x 5 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_4 0x51 // 16 CS x 4 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_3 0x61 // 16 CS x 3 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_2 0x71 // 16 CS x 2 SW matrix
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x16
+#define SW2_CS8 0x17
+#define SW2_CS9 0x18
+#define SW2_CS10 0x19
+#define SW2_CS11 0x1A
+#define SW2_CS12 0x1B
+#define SW2_CS13 0x1C
+#define SW2_CS14 0x1D
+#define SW2_CS15 0x1E
+#define SW2_CS16 0x1F
+
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x26
+#define SW3_CS8 0x27
+#define SW3_CS9 0x28
+#define SW3_CS10 0x29
+#define SW3_CS11 0x2A
+#define SW3_CS12 0x2B
+#define SW3_CS13 0x2C
+#define SW3_CS14 0x2D
+#define SW3_CS15 0x2E
+#define SW3_CS16 0x2F
+
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x36
+#define SW4_CS8 0x37
+#define SW4_CS9 0x38
+#define SW4_CS10 0x39
+#define SW4_CS11 0x3A
+#define SW4_CS12 0x3B
+#define SW4_CS13 0x3C
+#define SW4_CS14 0x3D
+#define SW4_CS15 0x3E
+#define SW4_CS16 0x3F
+
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x46
+#define SW5_CS8 0x47
+#define SW5_CS9 0x48
+#define SW5_CS10 0x49
+#define SW5_CS11 0x4A
+#define SW5_CS12 0x4B
+#define SW5_CS13 0x4C
+#define SW5_CS14 0x4D
+#define SW5_CS15 0x4E
+#define SW5_CS16 0x4F
+
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x56
+#define SW6_CS8 0x57
+#define SW6_CS9 0x58
+#define SW6_CS10 0x59
+#define SW6_CS11 0x5A
+#define SW6_CS12 0x5B
+#define SW6_CS13 0x5C
+#define SW6_CS14 0x5D
+#define SW6_CS15 0x5E
+#define SW6_CS16 0x5F
+
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x66
+#define SW7_CS8 0x67
+#define SW7_CS9 0x68
+#define SW7_CS10 0x69
+#define SW7_CS11 0x6A
+#define SW7_CS12 0x6B
+#define SW7_CS13 0x6C
+#define SW7_CS14 0x6D
+#define SW7_CS15 0x6E
+#define SW7_CS16 0x6F
+
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x76
+#define SW8_CS8 0x77
+#define SW8_CS9 0x78
+#define SW8_CS10 0x79
+#define SW8_CS11 0x7A
+#define SW8_CS12 0x7B
+#define SW8_CS13 0x7C
+#define SW8_CS14 0x7D
+#define SW8_CS15 0x7E
+#define SW8_CS16 0x7F
+
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x86
+#define SW9_CS8 0x87
+#define SW9_CS9 0x88
+#define SW9_CS10 0x89
+#define SW9_CS11 0x8A
+#define SW9_CS12 0x8B
+#define SW9_CS13 0x8C
+#define SW9_CS14 0x8D
+#define SW9_CS15 0x8E
diff --git a/drivers/led/issi/is31fl3729.c b/drivers/led/issi/is31fl3729.c
new file mode 100644
index 00000000000..80acb22fa28
--- /dev/null
+++ b/drivers/led/issi/is31fl3729.c
@@ -0,0 +1,219 @@
+/* Copyright 2024 HorrorTroll <https://github.com/HorrorTroll>
+ * Copyright 2024 Harrison Chan (Xelus)
+ * Copyright 2024 Dimitris Mantzouranis <d3xter93@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 "is31fl3729.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3729_PWM_REGISTER_COUNT 143
+#define IS31FL3729_SCALING_REGISTER_COUNT 16
+
+#ifndef IS31FL3729_I2C_TIMEOUT
+#    define IS31FL3729_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3729_I2C_PERSISTENCE
+#    define IS31FL3729_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3729_CONFIGURATION
+#    define IS31FL3729_CONFIGURATION IS31FL3729_CONFIG_SWS_15_9
+#endif
+
+#ifndef IS31FL3729_GLOBAL_CURRENT
+#    define IS31FL3729_GLOBAL_CURRENT 0x40
+#endif
+
+#ifndef IS31FL3729_SW_PULLDOWN
+#    define IS31FL3729_SW_PULLDOWN IS31FL3729_SW_PULLDOWN_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3729_CS_PULLUP
+#    define IS31FL3729_CS_PULLUP IS31FL3729_CS_PULLUP_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3729_SPREAD_SPECTRUM
+#    define IS31FL3729_SPREAD_SPECTRUM IS31FL3729_SPREAD_SPECTRUM_DISABLE
+#endif
+
+#ifndef IS31FL3729_SPREAD_SPECTRUM_RANGE
+#    define IS31FL3729_SPREAD_SPECTRUM_RANGE IS31FL3729_SPREAD_SPECTRUM_RANGE_5_PERCENT
+#endif
+
+#ifndef IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME
+#    define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1980_US
+#endif
+
+#ifndef IS31FL3729_PWM_FREQUENCY
+#    define IS31FL3729_PWM_FREQUENCY IS31FL3729_PWM_FREQUENCY_32K_HZ
+#endif
+
+const uint8_t i2c_addresses[IS31FL3729_DRIVER_COUNT] = {
+    IS31FL3729_I2C_ADDRESS_1,
+#ifdef IS31FL3729_I2C_ADDRESS_2
+    IS31FL3729_I2C_ADDRESS_2,
+#    ifdef IS31FL3729_I2C_ADDRESS_3
+    IS31FL3729_I2C_ADDRESS_3,
+#        ifdef IS31FL3729_I2C_ADDRESS_4
+    IS31FL3729_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+// These buffers match the PWM & scaling registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+typedef struct is31fl3729_driver_t {
+    uint8_t pwm_buffer[IS31FL3729_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3729_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3729_driver_t;
+
+is31fl3729_driver_t driver_buffers[IS31FL3729_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3729_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3729_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3729_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3729_write_pwm_buffer(uint8_t index) {
+    // Transmit PWM registers in 11 transfers of 13 bytes.
+
+    // Iterate over the pwm_buffer contents at 13 byte intervals.
+    for (uint8_t i = 0; i <= IS31FL3729_PWM_REGISTER_COUNT; i += 13) {
+#if IS31FL3729_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3729_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3729_SDB_PIN)
+    gpio_set_pin_output(IS31FL3729_SDB_PIN);
+    gpio_write_pin_high(IS31FL3729_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3729_LED_COUNT; i++) {
+        is31fl3729_set_scaling_register(i, 0xFF, 0xFF, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_update_scaling_registers(i);
+    }
+}
+
+void is31fl3729_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3729_write_register(index, IS31FL3729_REG_PULLDOWNUP, ((IS31FL3729_SW_PULLDOWN & 0b111) << 4) | (IS31FL3729_CS_PULLUP & 0b111));
+    is31fl3729_write_register(index, IS31FL3729_REG_SPREAD_SPECTRUM, ((IS31FL3729_SPREAD_SPECTRUM & 0b1) << 4) | ((IS31FL3729_SPREAD_SPECTRUM_RANGE & 0b11) << 2) | (IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME & 0b11));
+    is31fl3729_write_register(index, IS31FL3729_REG_PWM_FREQUENCY, IS31FL3729_PWM_FREQUENCY);
+    is31fl3729_write_register(index, IS31FL3729_REG_GLOBAL_CURRENT, IS31FL3729_GLOBAL_CURRENT);
+    is31fl3729_write_register(index, IS31FL3729_REG_CONFIGURATION, IS31FL3729_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3729_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3729_led_t led;
+    if (index >= 0 && index < IS31FL3729_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3729_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3729_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (int i = 0; i < IS31FL3729_LED_COUNT; i++) {
+        is31fl3729_set_color(i, red, green, blue);
+    }
+}
+
+void is31fl3729_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3729_led_t led;
+    memcpy_P(&led, (&g_is31fl3729_leds[index]), sizeof(led));
+
+    // need to do a bit of checking here since 3729 scaling is per CS pin.
+    // not the usual per RGB key as per other ISSI drivers
+    // only enable them, since they should be default disabled
+    int cs_red   = (led.r & 0x0F) - 1;
+    int cs_green = (led.g & 0x0F) - 1;
+    int cs_blue  = (led.b & 0x0F) - 1;
+
+    driver_buffers[led.driver].scaling_buffer[cs_red]   = red;
+    driver_buffers[led.driver].scaling_buffer[cs_green] = green;
+    driver_buffers[led.driver].scaling_buffer[cs_blue]  = blue;
+    driver_buffers[led.driver].scaling_buffer_dirty     = true;
+}
+
+void is31fl3729_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3729_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3729_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        for (uint8_t i = 0; i < IS31FL3729_SCALING_REGISTER_COUNT; i++) {
+            is31fl3729_write_register(index, IS31FL3729_REG_SCALING + i, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3729_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3729.h b/drivers/led/issi/is31fl3729.h
new file mode 100644
index 00000000000..865c462f05e
--- /dev/null
+++ b/drivers/led/issi/is31fl3729.h
@@ -0,0 +1,280 @@
+/* Copyright 2024 HorrorTroll <https://github.com/HorrorTroll>
+ * Copyright 2024 Harrison Chan (Xelus)
+ * Copyright 2024 Dimitris Mantzouranis <d3xter93@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 <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+#include "util.h"
+
+#define IS31FL3729_REG_PWM 0x01
+#define IS31FL3729_REG_SCALING 0x90
+#define IS31FL3729_REG_CONFIGURATION 0xA0
+#define IS31FL3729_REG_GLOBAL_CURRENT 0xA1
+#define IS31FL3729_REG_PULLDOWNUP 0xB0
+#define IS31FL3729_REG_SPREAD_SPECTRUM 0xB1
+#define IS31FL3729_REG_PWM_FREQUENCY 0xB2
+#define IS31FL3729_REG_RESET 0xCF
+
+#define IS31FL3729_I2C_ADDRESS_GND 0x34
+#define IS31FL3729_I2C_ADDRESS_SCL 0x35
+#define IS31FL3729_I2C_ADDRESS_SDA 0x36
+#define IS31FL3729_I2C_ADDRESS_VCC 0x37
+
+#if defined(RGB_MATRIX_IS31FL3729)
+#    define IS31FL3729_LED_COUNT RGB_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3729_I2C_ADDRESS_4)
+#    define IS31FL3729_DRIVER_COUNT 4
+#elif defined(IS31FL3729_I2C_ADDRESS_3)
+#    define IS31FL3729_DRIVER_COUNT 3
+#elif defined(IS31FL3729_I2C_ADDRESS_2)
+#    define IS31FL3729_DRIVER_COUNT 2
+#elif defined(IS31FL3729_I2C_ADDRESS_1)
+#    define IS31FL3729_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3729_led_t {
+    uint8_t driver : 2;
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+} PACKED is31fl3729_led_t;
+
+extern const is31fl3729_led_t PROGMEM g_is31fl3729_leds[IS31FL3729_LED_COUNT];
+
+void is31fl3729_init_drivers(void);
+void is31fl3729_init(uint8_t index);
+void is31fl3729_write_register(uint8_t index, uint8_t reg, uint8_t data);
+
+void is31fl3729_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void is31fl3729_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3729_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void is31fl3729_update_pwm_buffers(uint8_t index);
+void is31fl3729_update_scaling_registers(uint8_t index);
+
+void is31fl3729_flush(void);
+
+#define IS31FL3729_SW_PULLDOWN_0_OHM 0b000
+#define IS31FL3729_SW_PULLDOWN_0K5_OHM_SW_OFF 0b001
+#define IS31FL3729_SW_PULLDOWN_1K_OHM_SW_OFF 0b010
+#define IS31FL3729_SW_PULLDOWN_2K_OHM_SW_OFF 0b011
+#define IS31FL3729_SW_PULLDOWN_1K_OHM 0b100
+#define IS31FL3729_SW_PULLDOWN_2K_OHM 0b101
+#define IS31FL3729_SW_PULLDOWN_4K_OHM 0b110
+#define IS31FL3729_SW_PULLDOWN_8K_OHM 0b111
+
+#define IS31FL3729_CS_PULLUP_0_OHM 0b000
+#define IS31FL3729_CS_PULLUP_0K5_OHM_CS_OFF 0b001
+#define IS31FL3729_CS_PULLUP_1K_OHM_CS_OFF 0b010
+#define IS31FL3729_CS_PULLUP_2K_OHM_CS_OFF 0b011
+#define IS31FL3729_CS_PULLUP_1K_OHM 0b100
+#define IS31FL3729_CS_PULLUP_2K_OHM 0b101
+#define IS31FL3729_CS_PULLUP_4K_OHM 0b110
+#define IS31FL3729_CS_PULLUP_8K_OHM 0b111
+
+#define IS31FL3729_SPREAD_SPECTRUM_DISABLE 0b0
+#define IS31FL3729_SPREAD_SPECTRUM_ENABLE 0b1
+
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_5_PERCENT 0b00
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_15_PERCENT 0b01
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_24_PERCENT 0b10
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_34_PERCENT 0b11
+
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1980_US 0b00
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1200_US 0b01
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_820_US 0b10
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_660_US 0b11
+
+#define IS31FL3729_PWM_FREQUENCY_55K_HZ 0b000
+#define IS31FL3729_PWM_FREQUENCY_32K_HZ 0b001
+#define IS31FL3729_PWM_FREQUENCY_4K_HZ 0b010
+#define IS31FL3729_PWM_FREQUENCY_2K_HZ 0b011
+#define IS31FL3729_PWM_FREQUENCY_1K_HZ 0b100
+#define IS31FL3729_PWM_FREQUENCY_500_HZ 0b101
+#define IS31FL3729_PWM_FREQUENCY_250_HZ 0b110
+#define IS31FL3729_PWM_FREQUENCY_80K_HZ 0b111
+
+#define IS31FL3729_CONFIG_SWS_15_9 0x01 // 15 CS x 9 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_8 0x11 // 16 CS x 8 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_7 0x21 // 16 CS x 7 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_6 0x31 // 16 CS x 6 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_5 0x41 // 16 CS x 5 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_4 0x51 // 16 CS x 4 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_3 0x61 // 16 CS x 3 SW matrix
+#define IS31FL3729_CONFIG_SWS_16_2 0x71 // 16 CS x 2 SW matrix
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x16
+#define SW2_CS8 0x17
+#define SW2_CS9 0x18
+#define SW2_CS10 0x19
+#define SW2_CS11 0x1A
+#define SW2_CS12 0x1B
+#define SW2_CS13 0x1C
+#define SW2_CS14 0x1D
+#define SW2_CS15 0x1E
+#define SW2_CS16 0x1F
+
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x26
+#define SW3_CS8 0x27
+#define SW3_CS9 0x28
+#define SW3_CS10 0x29
+#define SW3_CS11 0x2A
+#define SW3_CS12 0x2B
+#define SW3_CS13 0x2C
+#define SW3_CS14 0x2D
+#define SW3_CS15 0x2E
+#define SW3_CS16 0x2F
+
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x36
+#define SW4_CS8 0x37
+#define SW4_CS9 0x38
+#define SW4_CS10 0x39
+#define SW4_CS11 0x3A
+#define SW4_CS12 0x3B
+#define SW4_CS13 0x3C
+#define SW4_CS14 0x3D
+#define SW4_CS15 0x3E
+#define SW4_CS16 0x3F
+
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x46
+#define SW5_CS8 0x47
+#define SW5_CS9 0x48
+#define SW5_CS10 0x49
+#define SW5_CS11 0x4A
+#define SW5_CS12 0x4B
+#define SW5_CS13 0x4C
+#define SW5_CS14 0x4D
+#define SW5_CS15 0x4E
+#define SW5_CS16 0x4F
+
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x56
+#define SW6_CS8 0x57
+#define SW6_CS9 0x58
+#define SW6_CS10 0x59
+#define SW6_CS11 0x5A
+#define SW6_CS12 0x5B
+#define SW6_CS13 0x5C
+#define SW6_CS14 0x5D
+#define SW6_CS15 0x5E
+#define SW6_CS16 0x5F
+
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x66
+#define SW7_CS8 0x67
+#define SW7_CS9 0x68
+#define SW7_CS10 0x69
+#define SW7_CS11 0x6A
+#define SW7_CS12 0x6B
+#define SW7_CS13 0x6C
+#define SW7_CS14 0x6D
+#define SW7_CS15 0x6E
+#define SW7_CS16 0x6F
+
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x76
+#define SW8_CS8 0x77
+#define SW8_CS9 0x78
+#define SW8_CS10 0x79
+#define SW8_CS11 0x7A
+#define SW8_CS12 0x7B
+#define SW8_CS13 0x7C
+#define SW8_CS14 0x7D
+#define SW8_CS15 0x7E
+#define SW8_CS16 0x7F
+
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x86
+#define SW9_CS8 0x87
+#define SW9_CS9 0x88
+#define SW9_CS10 0x89
+#define SW9_CS11 0x8A
+#define SW9_CS12 0x8B
+#define SW9_CS13 0x8C
+#define SW9_CS14 0x8D
+#define SW9_CS15 0x8E
diff --git a/drivers/led/issi/is31fl3731-mono.c b/drivers/led/issi/is31fl3731-mono.c
new file mode 100644
index 00000000000..33a863b982f
--- /dev/null
+++ b/drivers/led/issi/is31fl3731-mono.c
@@ -0,0 +1,230 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2019 Clueboard
+ * Copyright 2021 Doni Crosby
+ *
+ * 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 "is31fl3731-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3731_PWM_REGISTER_COUNT 144
+#define IS31FL3731_LED_CONTROL_REGISTER_COUNT 18
+
+#ifndef IS31FL3731_I2C_TIMEOUT
+#    define IS31FL3731_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3731_I2C_PERSISTENCE
+#    define IS31FL3731_I2C_PERSISTENCE 0
+#endif
+
+const uint8_t i2c_addresses[IS31FL3731_DRIVER_COUNT] = {
+    IS31FL3731_I2C_ADDRESS_1,
+#ifdef IS31FL3731_I2C_ADDRESS_2
+    IS31FL3731_I2C_ADDRESS_2,
+#    ifdef IS31FL3731_I2C_ADDRESS_3
+    IS31FL3731_I2C_ADDRESS_3,
+#        ifdef IS31FL3731_I2C_ADDRESS_4
+    IS31FL3731_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+// These buffers match the IS31FL3731 PWM registers 0x24-0xB3.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in is31fl3731_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+typedef struct is31fl3731_driver_t {
+    uint8_t pwm_buffer[IS31FL3731_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3731_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3731_driver_t;
+
+is31fl3731_driver_t driver_buffers[IS31FL3731_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3731_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3731_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3731_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3731_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3731_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3731_select_page(uint8_t index, uint8_t page) {
+    is31fl3731_write_register(index, IS31FL3731_REG_COMMAND, page);
+}
+
+void is31fl3731_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 9 transfers of 16 bytes.
+
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3731_PWM_REGISTER_COUNT; i += 16) {
+#if IS31FL3731_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3731_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3731_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3731_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3731_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3731_SDB_PIN)
+    gpio_set_pin_output(IS31FL3731_SDB_PIN);
+    gpio_write_pin_high(IS31FL3731_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3731_DRIVER_COUNT; i++) {
+        is31fl3731_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3731_LED_COUNT; i++) {
+        is31fl3731_set_led_control_register(i, true);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3731_DRIVER_COUNT; i++) {
+        is31fl3731_update_led_control_registers(i);
+    }
+}
+
+void is31fl3731_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, first enable software shutdown,
+    // then set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3731_select_page(index, IS31FL3731_COMMAND_FUNCTION);
+
+    // enable software shutdown
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x00);
+#ifdef IS31FL3731_DEGHOST // set to enable de-ghosting of the array
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_GHOST_IMAGE_PREVENTION, IS31FL3731_GHOST_IMAGE_PREVENTION_GEN);
+#endif
+
+    // this delay was copied from other drivers, might not be needed
+    wait_ms(10);
+
+    // picture mode
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_CONFIG, IS31FL3731_CONFIG_MODE_PICTURE);
+    // display frame 0
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_PICTURE_DISPLAY, 0x00);
+    // audio sync off
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_AUDIO_SYNC, 0x00);
+
+    is31fl3731_select_page(index, IS31FL3731_COMMAND_FRAME_1);
+
+    // turn off all LEDs in the LED control register
+    for (uint8_t i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3731_write_register(index, IS31FL3731_FRAME_REG_LED_CONTROL + i, 0x00);
+    }
+
+    // turn off all LEDs in the blink control register (not really needed)
+    for (uint8_t i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3731_write_register(index, IS31FL3731_FRAME_REG_BLINK_CONTROL + i, 0x00);
+    }
+
+    // set PWM on all LEDs to 0
+    for (uint8_t i = 0; i < IS31FL3731_PWM_REGISTER_COUNT; i++) {
+        is31fl3731_write_register(index, IS31FL3731_FRAME_REG_PWM + i, 0x00);
+    }
+
+    is31fl3731_select_page(index, IS31FL3731_COMMAND_FUNCTION);
+
+    // disable software shutdown
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x01);
+
+    // select page 0 and leave it selected.
+    // most usage after initialization is just writing PWM buffers in page 0
+    // as there's not much point in double-buffering
+    is31fl3731_select_page(index, IS31FL3731_COMMAND_FRAME_1);
+}
+
+void is31fl3731_set_value(int index, uint8_t value) {
+    is31fl3731_led_t led;
+
+    if (index >= 0 && index < IS31FL3731_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3731_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3731_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3731_LED_COUNT; i++) {
+        is31fl3731_set_value(i, value);
+    }
+}
+
+void is31fl3731_set_led_control_register(uint8_t index, bool value) {
+    is31fl3731_led_t led;
+    memcpy_P(&led, (&g_is31fl3731_leds[index]), sizeof(led));
+
+    uint8_t control_register = led.v / 8;
+    uint8_t bit_value        = led.v % 8;
+
+    if (value) {
+        driver_buffers[led.driver].led_control_buffer[control_register] |= (1 << bit_value);
+    } else {
+        driver_buffers[led.driver].led_control_buffer[control_register] &= ~(1 << bit_value);
+    }
+
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
+}
+
+void is31fl3731_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3731_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3731_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        for (uint8_t i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3731_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
+        }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
+    }
+}
+
+void is31fl3731_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3731_DRIVER_COUNT; i++) {
+        is31fl3731_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3731-mono.h b/drivers/led/issi/is31fl3731-mono.h
new file mode 100644
index 00000000000..e6e107d309b
--- /dev/null
+++ b/drivers/led/issi/is31fl3731-mono.h
@@ -0,0 +1,286 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2019 Clueboard
+ *
+ * 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"
+#include "util.h"
+
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef LED_DRIVER_ADDR_1
+#    define IS31FL3731_I2C_ADDRESS_1 LED_DRIVER_ADDR_1
+#endif
+#ifdef LED_DRIVER_ADDR_2
+#    define IS31FL3731_I2C_ADDRESS_2 LED_DRIVER_ADDR_2
+#endif
+#ifdef LED_DRIVER_ADDR_3
+#    define IS31FL3731_I2C_ADDRESS_3 LED_DRIVER_ADDR_3
+#endif
+#ifdef LED_DRIVER_ADDR_4
+#    define IS31FL3731_I2C_ADDRESS_4 LED_DRIVER_ADDR_4
+#endif
+#ifdef ISSI_TIMEOUT
+#    define IS31FL3731_I2C_TIMEOUT ISSI_TIMEOUT
+#endif
+#ifdef ISSI_PERSISTENCE
+#    define IS31FL3731_I2C_PERSISTENCE ISSI_PERSISTENCE
+#endif
+#ifdef ISSI_3731_DEGHOST
+#    define IS31FL3731_DEGHOST ISSI_3731_DEGHOST
+#endif
+
+#define is31_led is31fl3731_led_t
+#define g_is31_leds g_is31fl3731_leds
+// ========
+
+#define IS31FL3731_REG_COMMAND 0xFD
+#define IS31FL3731_COMMAND_FRAME_1 0x00
+#define IS31FL3731_COMMAND_FRAME_2 0x01
+#define IS31FL3731_COMMAND_FRAME_3 0x02
+#define IS31FL3731_COMMAND_FRAME_4 0x03
+#define IS31FL3731_COMMAND_FRAME_5 0x04
+#define IS31FL3731_COMMAND_FRAME_6 0x05
+#define IS31FL3731_COMMAND_FRAME_7 0x06
+#define IS31FL3731_COMMAND_FRAME_8 0x07
+#define IS31FL3731_COMMAND_FUNCTION 0x0B
+
+#define IS31FL3731_FRAME_REG_LED_CONTROL 0x00
+#define IS31FL3731_FRAME_REG_BLINK_CONTROL 0x12
+#define IS31FL3731_FRAME_REG_PWM 0x24
+
+#define IS31FL3731_FUNCTION_REG_CONFIG 0x00
+#define IS31FL3731_CONFIG_MODE_PICTURE 0x00
+#define IS31FL3731_CONFIG_MODE_AUTO_PLAY 0x08
+#define IS31FL3731_CONFIG_MODE_AUDIO_PLAY 0x18
+
+#define IS31FL3731_FUNCTION_REG_PICTURE_DISPLAY 0x01
+#define IS31FL3731_FUNCTION_REG_AUDIO_SYNC 0x06
+#define IS31FL3731_FUNCTION_REG_SHUTDOWN 0x0A
+
+// Not defined in the datasheet -- See AN for IC
+#define IS31FL3731_FUNCTION_REG_GHOST_IMAGE_PREVENTION 0xC2
+#define IS31FL3731_GHOST_IMAGE_PREVENTION_GEN 0x10
+
+#define IS31FL3731_I2C_ADDRESS_GND 0x74
+#define IS31FL3731_I2C_ADDRESS_SCL 0x75
+#define IS31FL3731_I2C_ADDRESS_SDA 0x76
+#define IS31FL3731_I2C_ADDRESS_VCC 0x77
+
+#if defined(LED_MATRIX_IS31FL3731)
+#    define IS31FL3731_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined IS31FL3731_I2C_ADDRESS_4
+#    define IS31FL3731_DRIVER_COUNT 4
+#elif defined IS31FL3731_I2C_ADDRESS_3
+#    define IS31FL3731_DRIVER_COUNT 3
+#elif defined IS31FL3731_I2C_ADDRESS_2
+#    define IS31FL3731_DRIVER_COUNT 2
+#elif defined IS31FL3731_I2C_ADDRESS_1
+#    define IS31FL3731_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3731_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3731_led_t;
+
+extern const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT];
+
+void is31fl3731_init_drivers(void);
+void is31fl3731_init(uint8_t index);
+void is31fl3731_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3731_select_page(uint8_t index, uint8_t page);
+
+void is31fl3731_set_value(int index, uint8_t value);
+void is31fl3731_set_value_all(uint8_t value);
+
+void is31fl3731_set_led_control_register(uint8_t index, bool value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void is31fl3731_update_pwm_buffers(uint8_t index);
+void is31fl3731_update_led_control_registers(uint8_t index);
+
+void is31fl3731_flush(void);
+
+#define C1_1 0x00
+#define C1_2 0x01
+#define C1_3 0x02
+#define C1_4 0x03
+#define C1_5 0x04
+#define C1_6 0x05
+#define C1_7 0x06
+#define C1_8 0x07
+
+#define C1_9 0x08
+#define C1_10 0x09
+#define C1_11 0x0A
+#define C1_12 0x0B
+#define C1_13 0x0C
+#define C1_14 0x0D
+#define C1_15 0x0E
+#define C1_16 0x0F
+
+#define C2_1 0x10
+#define C2_2 0x11
+#define C2_3 0x12
+#define C2_4 0x13
+#define C2_5 0x14
+#define C2_6 0x15
+#define C2_7 0x16
+#define C2_8 0x17
+
+#define C2_9 0x18
+#define C2_10 0x19
+#define C2_11 0x1A
+#define C2_12 0x1B
+#define C2_13 0x1C
+#define C2_14 0x1D
+#define C2_15 0x1E
+#define C2_16 0x1F
+
+#define C3_1 0x20
+#define C3_2 0x21
+#define C3_3 0x22
+#define C3_4 0x23
+#define C3_5 0x24
+#define C3_6 0x25
+#define C3_7 0x26
+#define C3_8 0x27
+
+#define C3_9 0x28
+#define C3_10 0x29
+#define C3_11 0x2A
+#define C3_12 0x2B
+#define C3_13 0x2C
+#define C3_14 0x2D
+#define C3_15 0x2E
+#define C3_16 0x2F
+
+#define C4_1 0x30
+#define C4_2 0x31
+#define C4_3 0x32
+#define C4_4 0x33
+#define C4_5 0x34
+#define C4_6 0x35
+#define C4_7 0x36
+#define C4_8 0x37
+
+#define C4_9 0x38
+#define C4_10 0x39
+#define C4_11 0x3A
+#define C4_12 0x3B
+#define C4_13 0x3C
+#define C4_14 0x3D
+#define C4_15 0x3E
+#define C4_16 0x3F
+
+#define C5_1 0x40
+#define C5_2 0x41
+#define C5_3 0x42
+#define C5_4 0x43
+#define C5_5 0x44
+#define C5_6 0x45
+#define C5_7 0x46
+#define C5_8 0x47
+
+#define C5_9 0x48
+#define C5_10 0x49
+#define C5_11 0x4A
+#define C5_12 0x4B
+#define C5_13 0x4C
+#define C5_14 0x4D
+#define C5_15 0x4E
+#define C5_16 0x4F
+
+#define C6_1 0x50
+#define C6_2 0x51
+#define C6_3 0x52
+#define C6_4 0x53
+#define C6_5 0x54
+#define C6_6 0x55
+#define C6_7 0x56
+#define C6_8 0x57
+
+#define C6_9 0x58
+#define C6_10 0x59
+#define C6_11 0x5A
+#define C6_12 0x5B
+#define C6_13 0x5C
+#define C6_14 0x5D
+#define C6_15 0x5E
+#define C6_16 0x5F
+
+#define C7_1 0x60
+#define C7_2 0x61
+#define C7_3 0x62
+#define C7_4 0x63
+#define C7_5 0x64
+#define C7_6 0x65
+#define C7_7 0x66
+#define C7_8 0x67
+
+#define C7_9 0x68
+#define C7_10 0x69
+#define C7_11 0x6A
+#define C7_12 0x6B
+#define C7_13 0x6C
+#define C7_14 0x6D
+#define C7_15 0x6E
+#define C7_16 0x6F
+
+#define C8_1 0x70
+#define C8_2 0x71
+#define C8_3 0x72
+#define C8_4 0x73
+#define C8_5 0x74
+#define C8_6 0x75
+#define C8_7 0x76
+#define C8_8 0x77
+
+#define C8_9 0x78
+#define C8_10 0x79
+#define C8_11 0x7A
+#define C8_12 0x7B
+#define C8_13 0x7C
+#define C8_14 0x7D
+#define C8_15 0x7E
+#define C8_16 0x7F
+
+#define C9_1 0x80
+#define C9_2 0x81
+#define C9_3 0x82
+#define C9_4 0x83
+#define C9_5 0x84
+#define C9_6 0x85
+#define C9_7 0x86
+#define C9_8 0x87
+
+#define C9_9 0x88
+#define C9_10 0x89
+#define C9_11 0x8A
+#define C9_12 0x8B
+#define C9_13 0x8C
+#define C9_14 0x8D
+#define C9_15 0x8E
+#define C9_16 0x8F
diff --git a/drivers/led/issi/is31fl3731-simple.c b/drivers/led/issi/is31fl3731-simple.c
deleted file mode 100644
index 8dbfc3cd31e..00000000000
--- a/drivers/led/issi/is31fl3731-simple.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* Copyright 2017 Jason Williams
- * Copyright 2018 Jack Humbert
- * Copyright 2019 Clueboard
- * Copyright 2021 Doni Crosby
- *
- * 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 "is31fl3731-simple.h"
-#include <string.h>
-#include "i2c_master.h"
-#include "wait.h"
-
-#define IS31FL3731_PWM_REGISTER_COUNT 144
-#define IS31FL3731_LED_CONTROL_REGISTER_COUNT 18
-
-#ifndef IS31FL3731_I2C_TIMEOUT
-#    define IS31FL3731_I2C_TIMEOUT 100
-#endif
-
-#ifndef IS31FL3731_I2C_PERSISTENCE
-#    define IS31FL3731_I2C_PERSISTENCE 0
-#endif
-
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
-
-// These buffers match the IS31FL3731 PWM registers 0x24-0xB3.
-// Storing them like this is optimal for I2C transfers to the registers.
-// We could optimize this and take out the unused registers from these
-// buffers and the transfers in is31fl3731_write_pwm_buffer() but it's
-// probably not worth the extra complexity.
-uint8_t g_pwm_buffer[IS31FL3731_DRIVER_COUNT][IS31FL3731_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3731_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[IS31FL3731_DRIVER_COUNT][IS31FL3731_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[IS31FL3731_DRIVER_COUNT]                        = {false};
-
-void is31fl3731_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
-#if IS31FL3731_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < IS31FL3731_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT) == 0) {
-            break;
-        }
-    }
-#else
-    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT);
-#endif
-}
-
-void is31fl3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes bank is already selected
-
-    // transmit PWM registers in 9 transfers of 16 bytes
-    // g_twi_transfer_buffer[] is 20 bytes
-
-    // iterate over the pwm_buffer contents at 16 byte intervals
-    for (int i = 0; i < IS31FL3731_PWM_REGISTER_COUNT; i += 16) {
-        // set the first register, e.g. 0x24, 0x34, 0x44, etc.
-        g_twi_transfer_buffer[0] = 0x24 + i;
-        // copy the data from i to i+15
-        // device will auto-increment register for data after the first byte
-        // thus this sets registers 0x24-0x33, 0x34-0x43, etc. in one transfer
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);
-
-#if IS31FL3731_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3731_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT) == 0) break;
-        }
-#else
-        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT);
-#endif
-    }
-}
-
-void is31fl3731_init_drivers(void) {
-    i2c_init();
-
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_1);
-#if defined(IS31FL3731_I2C_ADDRESS_2)
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_2);
-#    if defined(IS31FL3731_I2C_ADDRESS_3)
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_3);
-#        if defined(IS31FL3731_I2C_ADDRESS_4)
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_4);
-#        endif
-#    endif
-#endif
-
-    for (int i = 0; i < IS31FL3731_LED_COUNT; i++) {
-        is31fl3731_set_led_control_register(i, true);
-    }
-
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3731_I2C_ADDRESS_2)
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3731_I2C_ADDRESS_3)
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3731_I2C_ADDRESS_4)
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
-
-void is31fl3731_init(uint8_t addr) {
-    // In order to avoid the LEDs being driven with garbage data
-    // in the LED driver's PWM registers, first enable software shutdown,
-    // then set up the mode and other settings, clear the PWM registers,
-    // then disable software shutdown.
-
-    // select "function register" bank
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FUNCTION);
-
-    // enable software shutdown
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x00);
-#ifdef IS31FL3731_DEGHOST // set to enable de-ghosting of the array
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_GHOST_IMAGE_PREVENTION, IS31FL3731_GHOST_IMAGE_PREVENTION_GEN);
-#endif
-
-    // this delay was copied from other drivers, might not be needed
-    wait_ms(10);
-
-    // picture mode
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_CONFIG, IS31FL3731_CONFIG_MODE_PICTURE);
-    // display frame 0
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_PICTURE_DISPLAY, 0x00);
-    // audio sync off
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_AUDIO_SYNC, 0x00);
-
-    // select bank 0
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FRAME_1);
-
-    // turn off all LEDs in the LED control register
-    for (int i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3731_write_register(addr, i, 0x00);
-    }
-
-    // turn off all LEDs in the blink control register (not really needed)
-    for (int i = 0x12; i <= 0x23; i++) {
-        is31fl3731_write_register(addr, i, 0x00);
-    }
-
-    // set PWM on all LEDs to 0
-    for (int i = 0x24; i <= 0xB3; i++) {
-        is31fl3731_write_register(addr, i, 0x00);
-    }
-
-    // select "function register" bank
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FUNCTION);
-
-    // disable software shutdown
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x01);
-
-    // select bank 0 and leave it selected.
-    // most usage after initialization is just writing PWM buffers in bank 0
-    // as there's not much point in double-buffering
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FRAME_1);
-}
-
-void is31fl3731_set_value(int index, uint8_t value) {
-    is31fl3731_led_t led;
-    if (index >= 0 && index < IS31FL3731_LED_COUNT) {
-        memcpy_P(&led, (&g_is31fl3731_leds[index]), sizeof(led));
-
-        // Subtract 0x24 to get the second index of g_pwm_buffer
-
-        if (g_pwm_buffer[led.driver][led.v - 0x24] == value) {
-            return;
-        }
-        g_pwm_buffer[led.driver][led.v - 0x24]   = value;
-        g_pwm_buffer_update_required[led.driver] = true;
-    }
-}
-
-void is31fl3731_set_value_all(uint8_t value) {
-    for (int i = 0; i < IS31FL3731_LED_COUNT; i++) {
-        is31fl3731_set_value(i, value);
-    }
-}
-
-void is31fl3731_set_led_control_register(uint8_t index, bool value) {
-    is31fl3731_led_t led;
-    memcpy_P(&led, (&g_is31fl3731_leds[index]), sizeof(led));
-
-    uint8_t control_register = (led.v - 0x24) / 8;
-    uint8_t bit_value        = (led.v - 0x24) % 8;
-
-    if (value) {
-        g_led_control_registers[led.driver][control_register] |= (1 << bit_value);
-    } else {
-        g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value);
-    }
-
-    g_led_control_registers_update_required[led.driver] = true;
-}
-
-void is31fl3731_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        is31fl3731_write_pwm_buffer(addr, g_pwm_buffer[index]);
-        g_pwm_buffer_update_required[index] = false;
-    }
-}
-
-void is31fl3731_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        for (int i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3731_write_register(addr, i, g_led_control_registers[index][i]);
-        }
-        g_led_control_registers_update_required[index] = false;
-    }
-}
-
-void is31fl3731_flush(void) {
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3731_I2C_ADDRESS_2)
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3731_I2C_ADDRESS_3)
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3731_I2C_ADDRESS_4)
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
diff --git a/drivers/led/issi/is31fl3731-simple.h b/drivers/led/issi/is31fl3731-simple.h
deleted file mode 100644
index 4d173847dd9..00000000000
--- a/drivers/led/issi/is31fl3731-simple.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/* Copyright 2017 Jason Williams
- * Copyright 2018 Jack Humbert
- * Copyright 2019 Clueboard
- *
- * 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"
-#include "util.h"
-
-// ======== DEPRECATED DEFINES - DO NOT USE ========
-#ifdef LED_DRIVER_ADDR_1
-#    define IS31FL3731_I2C_ADDRESS_1 LED_DRIVER_ADDR_1
-#endif
-#ifdef LED_DRIVER_ADDR_2
-#    define IS31FL3731_I2C_ADDRESS_2 LED_DRIVER_ADDR_2
-#endif
-#ifdef LED_DRIVER_ADDR_3
-#    define IS31FL3731_I2C_ADDRESS_3 LED_DRIVER_ADDR_3
-#endif
-#ifdef LED_DRIVER_ADDR_4
-#    define IS31FL3731_I2C_ADDRESS_4 LED_DRIVER_ADDR_4
-#endif
-#ifdef ISSI_TIMEOUT
-#    define IS31FL3731_I2C_TIMEOUT ISSI_TIMEOUT
-#endif
-#ifdef ISSI_PERSISTENCE
-#    define IS31FL3731_I2C_PERSISTENCE ISSI_PERSISTENCE
-#endif
-#ifdef ISSI_3731_DEGHOST
-#    define IS31FL3731_DEGHOST ISSI_3731_DEGHOST
-#endif
-
-#define is31_led is31fl3731_led_t
-#define g_is31_leds g_is31fl3731_leds
-// ========
-
-#define IS31FL3731_REG_COMMAND 0xFD
-#define IS31FL3731_COMMAND_FRAME_1 0x00
-#define IS31FL3731_COMMAND_FRAME_2 0x01
-#define IS31FL3731_COMMAND_FRAME_3 0x02
-#define IS31FL3731_COMMAND_FRAME_4 0x03
-#define IS31FL3731_COMMAND_FRAME_5 0x04
-#define IS31FL3731_COMMAND_FRAME_6 0x05
-#define IS31FL3731_COMMAND_FRAME_7 0x06
-#define IS31FL3731_COMMAND_FRAME_8 0x07
-#define IS31FL3731_COMMAND_FUNCTION 0x0B
-
-#define IS31FL3731_FUNCTION_REG_CONFIG 0x00
-#define IS31FL3731_CONFIG_MODE_PICTURE 0x00
-#define IS31FL3731_CONFIG_MODE_AUTO_PLAY 0x08
-#define IS31FL3731_CONFIG_MODE_AUDIO_PLAY 0x18
-
-#define IS31FL3731_FUNCTION_REG_PICTURE_DISPLAY 0x01
-#define IS31FL3731_FUNCTION_REG_AUDIO_SYNC 0x06
-#define IS31FL3731_FUNCTION_REG_SHUTDOWN 0x0A
-
-// Not defined in the datasheet -- See AN for IC
-#define IS31FL3731_FUNCTION_REG_GHOST_IMAGE_PREVENTION 0xC2
-#define IS31FL3731_GHOST_IMAGE_PREVENTION_GEN 0x10
-
-#define IS31FL3731_I2C_ADDRESS_GND 0x74
-#define IS31FL3731_I2C_ADDRESS_SCL 0x75
-#define IS31FL3731_I2C_ADDRESS_SDA 0x76
-#define IS31FL3731_I2C_ADDRESS_VCC 0x77
-
-#if defined(LED_MATRIX_IS31FL3731)
-#    define IS31FL3731_LED_COUNT LED_MATRIX_LED_COUNT
-#endif
-
-#if defined IS31FL3731_I2C_ADDRESS_4
-#    define IS31FL3731_DRIVER_COUNT 4
-#elif defined IS31FL3731_I2C_ADDRESS_3
-#    define IS31FL3731_DRIVER_COUNT 3
-#elif defined IS31FL3731_I2C_ADDRESS_2
-#    define IS31FL3731_DRIVER_COUNT 2
-#elif defined IS31FL3731_I2C_ADDRESS_1
-#    define IS31FL3731_DRIVER_COUNT 1
-#endif
-
-typedef struct is31fl3731_led_t {
-    uint8_t driver : 2;
-    uint8_t v;
-} PACKED is31fl3731_led_t;
-
-extern const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT];
-
-void is31fl3731_init_drivers(void);
-void is31fl3731_init(uint8_t addr);
-void is31fl3731_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
-
-void is31fl3731_set_value(int index, uint8_t value);
-void is31fl3731_set_value_all(uint8_t value);
-
-void is31fl3731_set_led_control_register(uint8_t index, bool value);
-
-// This should not be called from an interrupt
-// (eg. from a timer interrupt).
-// Call this while idle (in between matrix scans).
-// If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3731_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3731_update_led_control_registers(uint8_t addr, uint8_t index);
-
-void is31fl3731_flush(void);
-
-#define C1_1 0x24
-#define C1_2 0x25
-#define C1_3 0x26
-#define C1_4 0x27
-#define C1_5 0x28
-#define C1_6 0x29
-#define C1_7 0x2A
-#define C1_8 0x2B
-
-#define C1_9 0x2C
-#define C1_10 0x2D
-#define C1_11 0x2E
-#define C1_12 0x2F
-#define C1_13 0x30
-#define C1_14 0x31
-#define C1_15 0x32
-#define C1_16 0x33
-
-#define C2_1 0x34
-#define C2_2 0x35
-#define C2_3 0x36
-#define C2_4 0x37
-#define C2_5 0x38
-#define C2_6 0x39
-#define C2_7 0x3A
-#define C2_8 0x3B
-
-#define C2_9 0x3C
-#define C2_10 0x3D
-#define C2_11 0x3E
-#define C2_12 0x3F
-#define C2_13 0x40
-#define C2_14 0x41
-#define C2_15 0x42
-#define C2_16 0x43
-
-#define C3_1 0x44
-#define C3_2 0x45
-#define C3_3 0x46
-#define C3_4 0x47
-#define C3_5 0x48
-#define C3_6 0x49
-#define C3_7 0x4A
-#define C3_8 0x4B
-
-#define C3_9 0x4C
-#define C3_10 0x4D
-#define C3_11 0x4E
-#define C3_12 0x4F
-#define C3_13 0x50
-#define C3_14 0x51
-#define C3_15 0x52
-#define C3_16 0x53
-
-#define C4_1 0x54
-#define C4_2 0x55
-#define C4_3 0x56
-#define C4_4 0x57
-#define C4_5 0x58
-#define C4_6 0x59
-#define C4_7 0x5A
-#define C4_8 0x5B
-
-#define C4_9 0x5C
-#define C4_10 0x5D
-#define C4_11 0x5E
-#define C4_12 0x5F
-#define C4_13 0x60
-#define C4_14 0x61
-#define C4_15 0x62
-#define C4_16 0x63
-
-#define C5_1 0x64
-#define C5_2 0x65
-#define C5_3 0x66
-#define C5_4 0x67
-#define C5_5 0x68
-#define C5_6 0x69
-#define C5_7 0x6A
-#define C5_8 0x6B
-
-#define C5_9 0x6C
-#define C5_10 0x6D
-#define C5_11 0x6E
-#define C5_12 0x6F
-#define C5_13 0x70
-#define C5_14 0x71
-#define C5_15 0x72
-#define C5_16 0x73
-
-#define C6_1 0x74
-#define C6_2 0x75
-#define C6_3 0x76
-#define C6_4 0x77
-#define C6_5 0x78
-#define C6_6 0x79
-#define C6_7 0x7A
-#define C6_8 0x7B
-
-#define C6_9 0x7C
-#define C6_10 0x7D
-#define C6_11 0x7E
-#define C6_12 0x7F
-#define C6_13 0x80
-#define C6_14 0x81
-#define C6_15 0x82
-#define C6_16 0x83
-
-#define C7_1 0x84
-#define C7_2 0x85
-#define C7_3 0x86
-#define C7_4 0x87
-#define C7_5 0x88
-#define C7_6 0x89
-#define C7_7 0x8A
-#define C7_8 0x8B
-
-#define C7_9 0x8C
-#define C7_10 0x8D
-#define C7_11 0x8E
-#define C7_12 0x8F
-#define C7_13 0x90
-#define C7_14 0x91
-#define C7_15 0x92
-#define C7_16 0x93
-
-#define C8_1 0x94
-#define C8_2 0x95
-#define C8_3 0x96
-#define C8_4 0x97
-#define C8_5 0x98
-#define C8_6 0x99
-#define C8_7 0x9A
-#define C8_8 0x9B
-
-#define C8_9 0x9C
-#define C8_10 0x9D
-#define C8_11 0x9E
-#define C8_12 0x9F
-#define C8_13 0xA0
-#define C8_14 0xA1
-#define C8_15 0xA2
-#define C8_16 0xA3
-
-#define C9_1 0xA4
-#define C9_2 0xA5
-#define C9_3 0xA6
-#define C9_4 0xA7
-#define C9_5 0xA8
-#define C9_6 0xA9
-#define C9_7 0xAA
-#define C9_8 0xAB
-
-#define C9_9 0xAC
-#define C9_10 0xAD
-#define C9_11 0xAE
-#define C9_12 0xAF
-#define C9_13 0xB0
-#define C9_14 0xB1
-#define C9_15 0xB2
-#define C9_16 0xB3
diff --git a/drivers/led/issi/is31fl3731.c b/drivers/led/issi/is31fl3731.c
index 1ab8997731f..86d953ef25d 100644
--- a/drivers/led/issi/is31fl3731.c
+++ b/drivers/led/issi/is31fl3731.c
@@ -17,8 +17,8 @@
  */
 
 #include "is31fl3731.h"
-#include <string.h>
 #include "i2c_master.h"
+#include "gpio.h"
 #include "wait.h"
 
 #define IS31FL3731_PWM_REGISTER_COUNT 144
@@ -32,54 +32,64 @@
 #    define IS31FL3731_I2C_PERSISTENCE 0
 #endif
 
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
+const uint8_t i2c_addresses[IS31FL3731_DRIVER_COUNT] = {
+    IS31FL3731_I2C_ADDRESS_1,
+#ifdef IS31FL3731_I2C_ADDRESS_2
+    IS31FL3731_I2C_ADDRESS_2,
+#    ifdef IS31FL3731_I2C_ADDRESS_3
+    IS31FL3731_I2C_ADDRESS_3,
+#        ifdef IS31FL3731_I2C_ADDRESS_4
+    IS31FL3731_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
 
 // These buffers match the IS31FL3731 PWM registers 0x24-0xB3.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3731_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
-uint8_t g_pwm_buffer[IS31FL3731_DRIVER_COUNT][IS31FL3731_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3731_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[IS31FL3731_DRIVER_COUNT][IS31FL3731_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[IS31FL3731_DRIVER_COUNT]                        = {false};
-
-void is31fl3731_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
+typedef struct is31fl3731_driver_t {
+    uint8_t pwm_buffer[IS31FL3731_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3731_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3731_driver_t;
+
+is31fl3731_driver_t driver_buffers[IS31FL3731_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3731_write_register(uint8_t index, uint8_t reg, uint8_t data) {
 #if IS31FL3731_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3731_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT) == 0) break;
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3731_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3731_I2C_TIMEOUT);
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3731_I2C_TIMEOUT);
 #endif
 }
 
-void is31fl3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes bank is already selected
-
-    // transmit PWM registers in 9 transfers of 16 bytes
-    // g_twi_transfer_buffer[] is 20 bytes
+void is31fl3731_select_page(uint8_t index, uint8_t page) {
+    is31fl3731_write_register(index, IS31FL3731_REG_COMMAND, page);
+}
 
-    // iterate over the pwm_buffer contents at 16 byte intervals
-    for (int i = 0; i < IS31FL3731_PWM_REGISTER_COUNT; i += 16) {
-        // set the first register, e.g. 0x24, 0x34, 0x44, etc.
-        g_twi_transfer_buffer[0] = 0x24 + i;
-        // copy the data from i to i+15
-        // device will auto-increment register for data after the first byte
-        // thus this sets registers 0x24-0x33, 0x34-0x43, etc. in one transfer
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);
+void is31fl3731_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 9 transfers of 16 bytes.
 
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3731_PWM_REGISTER_COUNT; i += 16) {
 #if IS31FL3731_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3731_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT) == 0) break;
+        for (uint8_t j = 0; j < IS31FL3731_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3731_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
 #else
-        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3731_I2C_TIMEOUT);
+        i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3731_I2C_TIMEOUT);
 #endif
     }
 }
@@ -87,101 +97,90 @@ void is31fl3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
 void is31fl3731_init_drivers(void) {
     i2c_init();
 
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_1);
-#if defined(IS31FL3731_I2C_ADDRESS_2)
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_2);
-#    if defined(IS31FL3731_I2C_ADDRESS_3)
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_3);
-#        if defined(IS31FL3731_I2C_ADDRESS_4)
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_4);
-#        endif
-#    endif
+#if defined(IS31FL3731_SDB_PIN)
+    gpio_set_pin_output(IS31FL3731_SDB_PIN);
+    gpio_write_pin_high(IS31FL3731_SDB_PIN);
 #endif
 
+    for (uint8_t i = 0; i < IS31FL3731_DRIVER_COUNT; i++) {
+        is31fl3731_init(i);
+    }
+
     for (int i = 0; i < IS31FL3731_LED_COUNT; i++) {
         is31fl3731_set_led_control_register(i, true, true, true);
     }
 
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3731_I2C_ADDRESS_2)
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3731_I2C_ADDRESS_3)
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3731_I2C_ADDRESS_4)
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3731_DRIVER_COUNT; i++) {
+        is31fl3731_update_led_control_registers(i);
+    }
 }
 
-void is31fl3731_init(uint8_t addr) {
+void is31fl3731_init(uint8_t index) {
     // In order to avoid the LEDs being driven with garbage data
     // in the LED driver's PWM registers, first enable software shutdown,
     // then set up the mode and other settings, clear the PWM registers,
     // then disable software shutdown.
 
-    // select "function register" bank
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FUNCTION);
+    is31fl3731_select_page(index, IS31FL3731_COMMAND_FUNCTION);
 
     // enable software shutdown
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x00);
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x00);
 #ifdef IS31FL3731_DEGHOST // set to enable de-ghosting of the array
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_GHOST_IMAGE_PREVENTION, IS31FL3731_GHOST_IMAGE_PREVENTION_GEN);
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_GHOST_IMAGE_PREVENTION, IS31FL3731_GHOST_IMAGE_PREVENTION_GEN);
 #endif
 
     // this delay was copied from other drivers, might not be needed
     wait_ms(10);
 
     // picture mode
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_CONFIG, IS31FL3731_CONFIG_MODE_PICTURE);
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_CONFIG, IS31FL3731_CONFIG_MODE_PICTURE);
     // display frame 0
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_PICTURE_DISPLAY, 0x00);
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_PICTURE_DISPLAY, 0x00);
     // audio sync off
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_AUDIO_SYNC, 0x00);
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_AUDIO_SYNC, 0x00);
 
-    // select bank 0
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FRAME_1);
+    is31fl3731_select_page(index, IS31FL3731_COMMAND_FRAME_1);
 
     // turn off all LEDs in the LED control register
-    for (int i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3731_write_register(addr, i, 0x00);
+    for (uint8_t i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3731_write_register(index, IS31FL3731_FRAME_REG_LED_CONTROL + i, 0x00);
     }
 
     // turn off all LEDs in the blink control register (not really needed)
-    for (int i = 0x12; i <= 0x23; i++) {
-        is31fl3731_write_register(addr, i, 0x00);
+    for (uint8_t i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3731_write_register(index, IS31FL3731_FRAME_REG_BLINK_CONTROL + i, 0x00);
     }
 
     // set PWM on all LEDs to 0
-    for (int i = 0x24; i <= 0xB3; i++) {
-        is31fl3731_write_register(addr, i, 0x00);
+    for (uint8_t i = 0; i < IS31FL3731_PWM_REGISTER_COUNT; i++) {
+        is31fl3731_write_register(index, IS31FL3731_FRAME_REG_PWM + i, 0x00);
     }
 
-    // select "function register" bank
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FUNCTION);
+    is31fl3731_select_page(index, IS31FL3731_COMMAND_FUNCTION);
 
     // disable software shutdown
-    is31fl3731_write_register(addr, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x01);
+    is31fl3731_write_register(index, IS31FL3731_FUNCTION_REG_SHUTDOWN, 0x01);
 
-    // select bank 0 and leave it selected.
-    // most usage after initialization is just writing PWM buffers in bank 0
+    // select page 0 and leave it selected.
+    // most usage after initialization is just writing PWM buffers in page 0
     // as there's not much point in double-buffering
-    is31fl3731_write_register(addr, IS31FL3731_REG_COMMAND, IS31FL3731_COMMAND_FRAME_1);
+    is31fl3731_select_page(index, IS31FL3731_COMMAND_FRAME_1);
 }
 
 void is31fl3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31fl3731_led_t led;
+
     if (index >= 0 && index < IS31FL3731_LED_COUNT) {
         memcpy_P(&led, (&g_is31fl3731_leds[index]), sizeof(led));
 
-        // Subtract 0x24 to get the second index of g_pwm_buffer
-        if (g_pwm_buffer[led.driver][led.r - 0x24] == red && g_pwm_buffer[led.driver][led.g - 0x24] == green && g_pwm_buffer[led.driver][led.b - 0x24] == blue) {
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
             return;
         }
-        g_pwm_buffer[led.driver][led.r - 0x24]   = red;
-        g_pwm_buffer[led.driver][led.g - 0x24]   = green;
-        g_pwm_buffer[led.driver][led.b - 0x24]   = blue;
-        g_pwm_buffer_update_required[led.driver] = true;
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
     }
 }
 
@@ -195,57 +194,52 @@ void is31fl3731_set_led_control_register(uint8_t index, bool red, bool green, bo
     is31fl3731_led_t led;
     memcpy_P(&led, (&g_is31fl3731_leds[index]), sizeof(led));
 
-    uint8_t control_register_r = (led.r - 0x24) / 8;
-    uint8_t control_register_g = (led.g - 0x24) / 8;
-    uint8_t control_register_b = (led.b - 0x24) / 8;
-    uint8_t bit_r              = (led.r - 0x24) % 8;
-    uint8_t bit_g              = (led.g - 0x24) % 8;
-    uint8_t bit_b              = (led.b - 0x24) % 8;
+    uint8_t control_register_r = led.r / 8;
+    uint8_t control_register_g = led.g / 8;
+    uint8_t control_register_b = led.b / 8;
+    uint8_t bit_r              = led.r % 8;
+    uint8_t bit_g              = led.g % 8;
+    uint8_t bit_b              = led.b % 8;
 
     if (red) {
-        g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] |= (1 << bit_r);
     } else {
-        g_led_control_registers[led.driver][control_register_r] &= ~(1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] &= ~(1 << bit_r);
     }
     if (green) {
-        g_led_control_registers[led.driver][control_register_g] |= (1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] |= (1 << bit_g);
     } else {
-        g_led_control_registers[led.driver][control_register_g] &= ~(1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] &= ~(1 << bit_g);
     }
     if (blue) {
-        g_led_control_registers[led.driver][control_register_b] |= (1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] |= (1 << bit_b);
     } else {
-        g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] &= ~(1 << bit_b);
     }
 
-    g_led_control_registers_update_required[led.driver] = true;
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
 }
 
-void is31fl3731_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        is31fl3731_write_pwm_buffer(addr, g_pwm_buffer[index]);
+void is31fl3731_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3731_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
     }
-    g_pwm_buffer_update_required[index] = false;
 }
 
-void is31fl3731_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        for (int i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3731_write_register(addr, i, g_led_control_registers[index][i]);
+void is31fl3731_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        for (uint8_t i = 0; i < IS31FL3731_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3731_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
         }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
     }
-    g_led_control_registers_update_required[index] = false;
 }
 
 void is31fl3731_flush(void) {
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3731_I2C_ADDRESS_2)
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3731_I2C_ADDRESS_3)
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3731_I2C_ADDRESS_4)
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3731_DRIVER_COUNT; i++) {
+        is31fl3731_update_pwm_buffers(i);
+    }
 }
diff --git a/drivers/led/issi/is31fl3731.h b/drivers/led/issi/is31fl3731.h
index b45cb2b07dc..dc229c876dc 100644
--- a/drivers/led/issi/is31fl3731.h
+++ b/drivers/led/issi/is31fl3731.h
@@ -60,6 +60,10 @@
 #define IS31FL3731_COMMAND_FRAME_8 0x07
 #define IS31FL3731_COMMAND_FUNCTION 0x0B
 
+#define IS31FL3731_FRAME_REG_LED_CONTROL 0x00
+#define IS31FL3731_FRAME_REG_BLINK_CONTROL 0x12
+#define IS31FL3731_FRAME_REG_PWM 0x24
+
 #define IS31FL3731_FUNCTION_REG_CONFIG 0x00
 #define IS31FL3731_CONFIG_MODE_PICTURE 0x00
 #define IS31FL3731_CONFIG_MODE_AUTO_PLAY 0x08
@@ -102,9 +106,9 @@ typedef struct is31fl3731_led_t {
 extern const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT];
 
 void is31fl3731_init_drivers(void);
-void is31fl3731_init(uint8_t addr);
-void is31fl3731_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+void is31fl3731_init(uint8_t index);
+void is31fl3731_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3731_select_page(uint8_t index, uint8_t page);
 
 void is31fl3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void is31fl3731_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
@@ -115,169 +119,169 @@ void is31fl3731_set_led_control_register(uint8_t index, bool red, bool green, bo
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3731_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3731_update_led_control_registers(uint8_t addr, uint8_t index);
+void is31fl3731_update_pwm_buffers(uint8_t index);
+void is31fl3731_update_led_control_registers(uint8_t index);
 
 void is31fl3731_flush(void);
 
-#define C1_1 0x24
-#define C1_2 0x25
-#define C1_3 0x26
-#define C1_4 0x27
-#define C1_5 0x28
-#define C1_6 0x29
-#define C1_7 0x2A
-#define C1_8 0x2B
-
-#define C1_9 0x2C
-#define C1_10 0x2D
-#define C1_11 0x2E
-#define C1_12 0x2F
-#define C1_13 0x30
-#define C1_14 0x31
-#define C1_15 0x32
-#define C1_16 0x33
-
-#define C2_1 0x34
-#define C2_2 0x35
-#define C2_3 0x36
-#define C2_4 0x37
-#define C2_5 0x38
-#define C2_6 0x39
-#define C2_7 0x3A
-#define C2_8 0x3B
-
-#define C2_9 0x3C
-#define C2_10 0x3D
-#define C2_11 0x3E
-#define C2_12 0x3F
-#define C2_13 0x40
-#define C2_14 0x41
-#define C2_15 0x42
-#define C2_16 0x43
-
-#define C3_1 0x44
-#define C3_2 0x45
-#define C3_3 0x46
-#define C3_4 0x47
-#define C3_5 0x48
-#define C3_6 0x49
-#define C3_7 0x4A
-#define C3_8 0x4B
-
-#define C3_9 0x4C
-#define C3_10 0x4D
-#define C3_11 0x4E
-#define C3_12 0x4F
-#define C3_13 0x50
-#define C3_14 0x51
-#define C3_15 0x52
-#define C3_16 0x53
-
-#define C4_1 0x54
-#define C4_2 0x55
-#define C4_3 0x56
-#define C4_4 0x57
-#define C4_5 0x58
-#define C4_6 0x59
-#define C4_7 0x5A
-#define C4_8 0x5B
-
-#define C4_9 0x5C
-#define C4_10 0x5D
-#define C4_11 0x5E
-#define C4_12 0x5F
-#define C4_13 0x60
-#define C4_14 0x61
-#define C4_15 0x62
-#define C4_16 0x63
-
-#define C5_1 0x64
-#define C5_2 0x65
-#define C5_3 0x66
-#define C5_4 0x67
-#define C5_5 0x68
-#define C5_6 0x69
-#define C5_7 0x6A
-#define C5_8 0x6B
-
-#define C5_9 0x6C
-#define C5_10 0x6D
-#define C5_11 0x6E
-#define C5_12 0x6F
-#define C5_13 0x70
-#define C5_14 0x71
-#define C5_15 0x72
-#define C5_16 0x73
-
-#define C6_1 0x74
-#define C6_2 0x75
-#define C6_3 0x76
-#define C6_4 0x77
-#define C6_5 0x78
-#define C6_6 0x79
-#define C6_7 0x7A
-#define C6_8 0x7B
-
-#define C6_9 0x7C
-#define C6_10 0x7D
-#define C6_11 0x7E
-#define C6_12 0x7F
-#define C6_13 0x80
-#define C6_14 0x81
-#define C6_15 0x82
-#define C6_16 0x83
-
-#define C7_1 0x84
-#define C7_2 0x85
-#define C7_3 0x86
-#define C7_4 0x87
-#define C7_5 0x88
-#define C7_6 0x89
-#define C7_7 0x8A
-#define C7_8 0x8B
-
-#define C7_9 0x8C
-#define C7_10 0x8D
-#define C7_11 0x8E
-#define C7_12 0x8F
-#define C7_13 0x90
-#define C7_14 0x91
-#define C7_15 0x92
-#define C7_16 0x93
-
-#define C8_1 0x94
-#define C8_2 0x95
-#define C8_3 0x96
-#define C8_4 0x97
-#define C8_5 0x98
-#define C8_6 0x99
-#define C8_7 0x9A
-#define C8_8 0x9B
-
-#define C8_9 0x9C
-#define C8_10 0x9D
-#define C8_11 0x9E
-#define C8_12 0x9F
-#define C8_13 0xA0
-#define C8_14 0xA1
-#define C8_15 0xA2
-#define C8_16 0xA3
-
-#define C9_1 0xA4
-#define C9_2 0xA5
-#define C9_3 0xA6
-#define C9_4 0xA7
-#define C9_5 0xA8
-#define C9_6 0xA9
-#define C9_7 0xAA
-#define C9_8 0xAB
-
-#define C9_9 0xAC
-#define C9_10 0xAD
-#define C9_11 0xAE
-#define C9_12 0xAF
-#define C9_13 0xB0
-#define C9_14 0xB1
-#define C9_15 0xB2
-#define C9_16 0xB3
+#define C1_1 0x00
+#define C1_2 0x01
+#define C1_3 0x02
+#define C1_4 0x03
+#define C1_5 0x04
+#define C1_6 0x05
+#define C1_7 0x06
+#define C1_8 0x07
+
+#define C1_9 0x08
+#define C1_10 0x09
+#define C1_11 0x0A
+#define C1_12 0x0B
+#define C1_13 0x0C
+#define C1_14 0x0D
+#define C1_15 0x0E
+#define C1_16 0x0F
+
+#define C2_1 0x10
+#define C2_2 0x11
+#define C2_3 0x12
+#define C2_4 0x13
+#define C2_5 0x14
+#define C2_6 0x15
+#define C2_7 0x16
+#define C2_8 0x17
+
+#define C2_9 0x18
+#define C2_10 0x19
+#define C2_11 0x1A
+#define C2_12 0x1B
+#define C2_13 0x1C
+#define C2_14 0x1D
+#define C2_15 0x1E
+#define C2_16 0x1F
+
+#define C3_1 0x20
+#define C3_2 0x21
+#define C3_3 0x22
+#define C3_4 0x23
+#define C3_5 0x24
+#define C3_6 0x25
+#define C3_7 0x26
+#define C3_8 0x27
+
+#define C3_9 0x28
+#define C3_10 0x29
+#define C3_11 0x2A
+#define C3_12 0x2B
+#define C3_13 0x2C
+#define C3_14 0x2D
+#define C3_15 0x2E
+#define C3_16 0x2F
+
+#define C4_1 0x30
+#define C4_2 0x31
+#define C4_3 0x32
+#define C4_4 0x33
+#define C4_5 0x34
+#define C4_6 0x35
+#define C4_7 0x36
+#define C4_8 0x37
+
+#define C4_9 0x38
+#define C4_10 0x39
+#define C4_11 0x3A
+#define C4_12 0x3B
+#define C4_13 0x3C
+#define C4_14 0x3D
+#define C4_15 0x3E
+#define C4_16 0x3F
+
+#define C5_1 0x40
+#define C5_2 0x41
+#define C5_3 0x42
+#define C5_4 0x43
+#define C5_5 0x44
+#define C5_6 0x45
+#define C5_7 0x46
+#define C5_8 0x47
+
+#define C5_9 0x48
+#define C5_10 0x49
+#define C5_11 0x4A
+#define C5_12 0x4B
+#define C5_13 0x4C
+#define C5_14 0x4D
+#define C5_15 0x4E
+#define C5_16 0x4F
+
+#define C6_1 0x50
+#define C6_2 0x51
+#define C6_3 0x52
+#define C6_4 0x53
+#define C6_5 0x54
+#define C6_6 0x55
+#define C6_7 0x56
+#define C6_8 0x57
+
+#define C6_9 0x58
+#define C6_10 0x59
+#define C6_11 0x5A
+#define C6_12 0x5B
+#define C6_13 0x5C
+#define C6_14 0x5D
+#define C6_15 0x5E
+#define C6_16 0x5F
+
+#define C7_1 0x60
+#define C7_2 0x61
+#define C7_3 0x62
+#define C7_4 0x63
+#define C7_5 0x64
+#define C7_6 0x65
+#define C7_7 0x66
+#define C7_8 0x67
+
+#define C7_9 0x68
+#define C7_10 0x69
+#define C7_11 0x6A
+#define C7_12 0x6B
+#define C7_13 0x6C
+#define C7_14 0x6D
+#define C7_15 0x6E
+#define C7_16 0x6F
+
+#define C8_1 0x70
+#define C8_2 0x71
+#define C8_3 0x72
+#define C8_4 0x73
+#define C8_5 0x74
+#define C8_6 0x75
+#define C8_7 0x76
+#define C8_8 0x77
+
+#define C8_9 0x78
+#define C8_10 0x79
+#define C8_11 0x7A
+#define C8_12 0x7B
+#define C8_13 0x7C
+#define C8_14 0x7D
+#define C8_15 0x7E
+#define C8_16 0x7F
+
+#define C9_1 0x80
+#define C9_2 0x81
+#define C9_3 0x82
+#define C9_4 0x83
+#define C9_5 0x84
+#define C9_6 0x85
+#define C9_7 0x86
+#define C9_8 0x87
+
+#define C9_9 0x88
+#define C9_10 0x89
+#define C9_11 0x8A
+#define C9_12 0x8B
+#define C9_13 0x8C
+#define C9_14 0x8D
+#define C9_15 0x8E
+#define C9_16 0x8F
diff --git a/drivers/led/issi/is31fl3733-mono.c b/drivers/led/issi/is31fl3733-mono.c
new file mode 100644
index 00000000000..740fe060970
--- /dev/null
+++ b/drivers/led/issi/is31fl3733-mono.c
@@ -0,0 +1,265 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2021 Doni Crosby
+ * Copyright 2021 Leo Deng
+ *
+ * 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 "is31fl3733-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3733_PWM_REGISTER_COUNT 192
+#define IS31FL3733_LED_CONTROL_REGISTER_COUNT 24
+
+#ifndef IS31FL3733_I2C_TIMEOUT
+#    define IS31FL3733_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3733_I2C_PERSISTENCE
+#    define IS31FL3733_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3733_PWM_FREQUENCY
+#    define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_8K4_HZ // PFS - IS31FL3733B only
+#endif
+
+#ifndef IS31FL3733_SW_PULLUP
+#    define IS31FL3733_SW_PULLUP IS31FL3733_PUR_0_OHM
+#endif
+
+#ifndef IS31FL3733_CS_PULLDOWN
+#    define IS31FL3733_CS_PULLDOWN IS31FL3733_PDR_0_OHM
+#endif
+
+#ifndef IS31FL3733_GLOBAL_CURRENT
+#    define IS31FL3733_GLOBAL_CURRENT 0xFF
+#endif
+
+#ifndef IS31FL3733_SYNC_1
+#    define IS31FL3733_SYNC_1 IS31FL3733_SYNC_NONE
+#endif
+#ifndef IS31FL3733_SYNC_2
+#    define IS31FL3733_SYNC_2 IS31FL3733_SYNC_NONE
+#endif
+#ifndef IS31FL3733_SYNC_3
+#    define IS31FL3733_SYNC_3 IS31FL3733_SYNC_NONE
+#endif
+#ifndef IS31FL3733_SYNC_4
+#    define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE
+#endif
+
+const uint8_t i2c_addresses[IS31FL3733_DRIVER_COUNT] = {
+    IS31FL3733_I2C_ADDRESS_1,
+#ifdef IS31FL3733_I2C_ADDRESS_2
+    IS31FL3733_I2C_ADDRESS_2,
+#    ifdef IS31FL3733_I2C_ADDRESS_3
+    IS31FL3733_I2C_ADDRESS_3,
+#        ifdef IS31FL3733_I2C_ADDRESS_4
+    IS31FL3733_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+const uint8_t driver_sync[IS31FL3733_DRIVER_COUNT] = {
+    IS31FL3733_SYNC_1,
+#ifdef IS31FL3733_I2C_ADDRESS_2
+    IS31FL3733_SYNC_2,
+#    ifdef IS31FL3733_I2C_ADDRESS_3
+    IS31FL3733_SYNC_3,
+#        ifdef IS31FL3733_I2C_ADDRESS_4
+    IS31FL3733_SYNC_4,
+#        endif
+#    endif
+#endif
+};
+
+// These buffers match the IS31FL3733 PWM registers.
+// The control buffers match the page 0 LED On/Off registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+typedef struct is31fl3733_driver_t {
+    uint8_t pwm_buffer[IS31FL3733_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3733_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3733_driver_t;
+
+is31fl3733_driver_t driver_buffers[IS31FL3733_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3733_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3733_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3733_select_page(uint8_t index, uint8_t page) {
+    is31fl3733_write_register(index, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3733_write_register(index, IS31FL3733_REG_COMMAND, page);
+}
+
+void is31fl3733_write_pwm_buffer(uint8_t index) {
+    // Assumes page 1 is already selected.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
+
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) {
+#if IS31FL3733_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3733_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3733_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3733_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3733_SDB_PIN)
+    gpio_set_pin_output(IS31FL3733_SDB_PIN);
+    gpio_write_pin_high(IS31FL3733_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3733_DRIVER_COUNT; i++) {
+        is31fl3733_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3733_LED_COUNT; i++) {
+        is31fl3733_set_led_control_register(i, true);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3733_DRIVER_COUNT; i++) {
+        is31fl3733_update_led_control_registers(i);
+    }
+}
+
+void is31fl3733_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3733_select_page(index, IS31FL3733_COMMAND_LED_CONTROL);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3733_write_register(index, i, 0x00);
+    }
+
+    is31fl3733_select_page(index, IS31FL3733_COMMAND_PWM);
+
+    // Set PWM on all LEDs to 0
+    // No need to setup Breath registers to PWM as that is the default.
+    for (uint8_t i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) {
+        is31fl3733_write_register(index, i, 0x00);
+    }
+
+    is31fl3733_select_page(index, IS31FL3733_COMMAND_FUNCTION);
+
+    uint8_t sync = driver_sync[index];
+
+    // Set de-ghost pull-up resistors (SWx)
+    is31fl3733_write_register(index, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
+    // Set de-ghost pull-down resistors (CSx)
+    is31fl3733_write_register(index, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN);
+    // Set global current to maximum.
+    is31fl3733_write_register(index, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT);
+    // Disable software shutdown.
+    is31fl3733_write_register(index, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3733_set_value(int index, uint8_t value) {
+    is31fl3733_led_t led;
+
+    if (index >= 0 && index < IS31FL3733_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3733_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3733_LED_COUNT; i++) {
+        is31fl3733_set_value(i, value);
+    }
+}
+
+void is31fl3733_set_led_control_register(uint8_t index, bool value) {
+    is31fl3733_led_t led;
+    memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led));
+
+    uint8_t control_register = led.v / 8;
+    uint8_t bit_value        = led.v % 8;
+
+    if (value) {
+        driver_buffers[led.driver].led_control_buffer[control_register] |= (1 << bit_value);
+    } else {
+        driver_buffers[led.driver].led_control_buffer[control_register] &= ~(1 << bit_value);
+    }
+
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
+}
+
+void is31fl3733_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3733_select_page(index, IS31FL3733_COMMAND_PWM);
+
+        is31fl3733_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3733_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        is31fl3733_select_page(index, IS31FL3733_COMMAND_LED_CONTROL);
+
+        for (uint8_t i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3733_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
+        }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
+    }
+}
+
+void is31fl3733_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3733_DRIVER_COUNT; i++) {
+        is31fl3733_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3733-mono.h b/drivers/led/issi/is31fl3733-mono.h
new file mode 100644
index 00000000000..3786b2ed712
--- /dev/null
+++ b/drivers/led/issi/is31fl3733-mono.h
@@ -0,0 +1,366 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2021 Doni Crosby
+ * Copyright 2021 Leo Deng
+ *
+ * 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"
+#include "util.h"
+
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef ISSI_TIMEOUT
+#    define IS31FL3733_I2C_TIMEOUT ISSI_TIMEOUT
+#endif
+#ifdef ISSI_PERSISTENCE
+#    define IS31FL3733_I2C_PERSISTENCE ISSI_PERSISTENCE
+#endif
+#ifdef ISSI_PWM_FREQUENCY
+#    define IS31FL3733_PWM_FREQUENCY ISSI_PWM_FREQUENCY
+#endif
+#ifdef ISSI_SWPULLUP
+#    define IS31FL3733_SW_PULLUP ISSI_SWPULLUP
+#endif
+#ifdef ISSI_CSPULLUP
+#    define IS31FL3733_CS_PULLDOWN ISSI_CSPULLUP
+#endif
+#ifdef ISSI_GLOBALCURRENT
+#    define IS31FL3733_GLOBAL_CURRENT ISSI_GLOBALCURRENT
+#endif
+
+#define is31_led is31fl3733_led_t
+#define g_is31_leds g_is31fl3733_leds
+
+#define PUR_0R IS31FL3733_PUR_0_OHM
+#define PUR_05KR IS31FL3733_PUR_1K_OHM
+#define PUR_3KR IS31FL3733_PUR_2K_OHM
+#define PUR_4KR IS31FL3733_PUR_4K_OHM
+#define PUR_8KR IS31FL3733_PUR_8K_OHM
+#define PUR_16KR IS31FL3733_PUR_16K_OHM
+#define PUR_32KR IS31FL3733_PUR_32K_OHM
+// ========
+
+#define IS31FL3733_REG_INTERRUPT_MASK 0xF0
+#define IS31FL3733_REG_INTERRUPT_STATUS 0xF1
+
+#define IS31FL3733_REG_COMMAND 0xFD
+
+#define IS31FL3733_COMMAND_LED_CONTROL 0x00
+#define IS31FL3733_COMMAND_PWM 0x01
+#define IS31FL3733_COMMAND_AUTO_BREATH 0x02
+#define IS31FL3733_COMMAND_FUNCTION 0x03
+
+#define IS31FL3733_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3733_FUNCTION_REG_SW_PULLUP 0x0F
+#define IS31FL3733_FUNCTION_REG_CS_PULLDOWN 0x10
+#define IS31FL3733_FUNCTION_REG_RESET 0x11
+
+#define IS31FL3733_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3733_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3733_I2C_ADDRESS_GND_GND 0x50
+#define IS31FL3733_I2C_ADDRESS_GND_SCL 0x51
+#define IS31FL3733_I2C_ADDRESS_GND_SDA 0x52
+#define IS31FL3733_I2C_ADDRESS_GND_VCC 0x53
+#define IS31FL3733_I2C_ADDRESS_SCL_GND 0x54
+#define IS31FL3733_I2C_ADDRESS_SCL_SCL 0x55
+#define IS31FL3733_I2C_ADDRESS_SCL_SDA 0x56
+#define IS31FL3733_I2C_ADDRESS_SCL_VCC 0x57
+#define IS31FL3733_I2C_ADDRESS_SDA_GND 0x58
+#define IS31FL3733_I2C_ADDRESS_SDA_SCL 0x59
+#define IS31FL3733_I2C_ADDRESS_SDA_SDA 0x5A
+#define IS31FL3733_I2C_ADDRESS_SDA_VCC 0x5B
+#define IS31FL3733_I2C_ADDRESS_VCC_GND 0x5C
+#define IS31FL3733_I2C_ADDRESS_VCC_SCL 0x5D
+#define IS31FL3733_I2C_ADDRESS_VCC_SDA 0x5E
+#define IS31FL3733_I2C_ADDRESS_VCC_VCC 0x5F
+
+#if defined(LED_MATRIX_IS31FL3733)
+#    define IS31FL3733_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3733_I2C_ADDRESS_4)
+#    define IS31FL3733_DRIVER_COUNT 4
+#elif defined(IS31FL3733_I2C_ADDRESS_3)
+#    define IS31FL3733_DRIVER_COUNT 3
+#elif defined(IS31FL3733_I2C_ADDRESS_2)
+#    define IS31FL3733_DRIVER_COUNT 2
+#elif defined(IS31FL3733_I2C_ADDRESS_1)
+#    define IS31FL3733_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3733_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3733_led_t;
+
+extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT];
+
+void is31fl3733_init_drivers(void);
+void is31fl3733_init(uint8_t index);
+void is31fl3733_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3733_select_page(uint8_t index, uint8_t page);
+
+void is31fl3733_set_value(int index, uint8_t value);
+void is31fl3733_set_value_all(uint8_t value);
+
+void is31fl3733_set_led_control_register(uint8_t index, bool value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void is31fl3733_update_pwm_buffers(uint8_t index);
+void is31fl3733_update_led_control_registers(uint8_t index);
+
+void is31fl3733_flush(void);
+
+#define IS31FL3733_PDR_0_OHM 0b000   // No pull-down resistor
+#define IS31FL3733_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3733_PDR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3733_PDR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3733_PDR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3733_PDR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3733_PDR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3733_PDR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3733_PUR_0_OHM 0b000   // No pull-up resistor
+#define IS31FL3733_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3733_PUR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3733_PUR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3733_PUR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3733_PUR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3733_PUR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3733_PUR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3733_PWM_FREQUENCY_8K4_HZ 0b000
+#define IS31FL3733_PWM_FREQUENCY_4K2_HZ 0b001
+#define IS31FL3733_PWM_FREQUENCY_26K7_HZ 0b010
+#define IS31FL3733_PWM_FREQUENCY_2K1_HZ 0b011
+#define IS31FL3733_PWM_FREQUENCY_1K05_HZ 0b100
+
+#define IS31FL3733_SYNC_NONE 0b00
+#define IS31FL3733_SYNC_MASTER 0b01
+#define IS31FL3733_SYNC_SLAVE 0b10
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x16
+#define SW2_CS8 0x17
+#define SW2_CS9 0x18
+#define SW2_CS10 0x19
+#define SW2_CS11 0x1A
+#define SW2_CS12 0x1B
+#define SW2_CS13 0x1C
+#define SW2_CS14 0x1D
+#define SW2_CS15 0x1E
+#define SW2_CS16 0x1F
+
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x26
+#define SW3_CS8 0x27
+#define SW3_CS9 0x28
+#define SW3_CS10 0x29
+#define SW3_CS11 0x2A
+#define SW3_CS12 0x2B
+#define SW3_CS13 0x2C
+#define SW3_CS14 0x2D
+#define SW3_CS15 0x2E
+#define SW3_CS16 0x2F
+
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x36
+#define SW4_CS8 0x37
+#define SW4_CS9 0x38
+#define SW4_CS10 0x39
+#define SW4_CS11 0x3A
+#define SW4_CS12 0x3B
+#define SW4_CS13 0x3C
+#define SW4_CS14 0x3D
+#define SW4_CS15 0x3E
+#define SW4_CS16 0x3F
+
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x46
+#define SW5_CS8 0x47
+#define SW5_CS9 0x48
+#define SW5_CS10 0x49
+#define SW5_CS11 0x4A
+#define SW5_CS12 0x4B
+#define SW5_CS13 0x4C
+#define SW5_CS14 0x4D
+#define SW5_CS15 0x4E
+#define SW5_CS16 0x4F
+
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x56
+#define SW6_CS8 0x57
+#define SW6_CS9 0x58
+#define SW6_CS10 0x59
+#define SW6_CS11 0x5A
+#define SW6_CS12 0x5B
+#define SW6_CS13 0x5C
+#define SW6_CS14 0x5D
+#define SW6_CS15 0x5E
+#define SW6_CS16 0x5F
+
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x66
+#define SW7_CS8 0x67
+#define SW7_CS9 0x68
+#define SW7_CS10 0x69
+#define SW7_CS11 0x6A
+#define SW7_CS12 0x6B
+#define SW7_CS13 0x6C
+#define SW7_CS14 0x6D
+#define SW7_CS15 0x6E
+#define SW7_CS16 0x6F
+
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x76
+#define SW8_CS8 0x77
+#define SW8_CS9 0x78
+#define SW8_CS10 0x79
+#define SW8_CS11 0x7A
+#define SW8_CS12 0x7B
+#define SW8_CS13 0x7C
+#define SW8_CS14 0x7D
+#define SW8_CS15 0x7E
+#define SW8_CS16 0x7F
+
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x86
+#define SW9_CS8 0x87
+#define SW9_CS9 0x88
+#define SW9_CS10 0x89
+#define SW9_CS11 0x8A
+#define SW9_CS12 0x8B
+#define SW9_CS13 0x8C
+#define SW9_CS14 0x8D
+#define SW9_CS15 0x8E
+#define SW9_CS16 0x8F
+
+#define SW10_CS1 0x90
+#define SW10_CS2 0x91
+#define SW10_CS3 0x92
+#define SW10_CS4 0x93
+#define SW10_CS5 0x94
+#define SW10_CS6 0x95
+#define SW10_CS7 0x96
+#define SW10_CS8 0x97
+#define SW10_CS9 0x98
+#define SW10_CS10 0x99
+#define SW10_CS11 0x9A
+#define SW10_CS12 0x9B
+#define SW10_CS13 0x9C
+#define SW10_CS14 0x9D
+#define SW10_CS15 0x9E
+#define SW10_CS16 0x9F
+
+#define SW11_CS1 0xA0
+#define SW11_CS2 0xA1
+#define SW11_CS3 0xA2
+#define SW11_CS4 0xA3
+#define SW11_CS5 0xA4
+#define SW11_CS6 0xA5
+#define SW11_CS7 0xA6
+#define SW11_CS8 0xA7
+#define SW11_CS9 0xA8
+#define SW11_CS10 0xA9
+#define SW11_CS11 0xAA
+#define SW11_CS12 0xAB
+#define SW11_CS13 0xAC
+#define SW11_CS14 0xAD
+#define SW11_CS15 0xAE
+#define SW11_CS16 0xAF
+
+#define SW12_CS1 0xB0
+#define SW12_CS2 0xB1
+#define SW12_CS3 0xB2
+#define SW12_CS4 0xB3
+#define SW12_CS5 0xB4
+#define SW12_CS6 0xB5
+#define SW12_CS7 0xB6
+#define SW12_CS8 0xB7
+#define SW12_CS9 0xB8
+#define SW12_CS10 0xB9
+#define SW12_CS11 0xBA
+#define SW12_CS12 0xBB
+#define SW12_CS13 0xBC
+#define SW12_CS14 0xBD
+#define SW12_CS15 0xBE
+#define SW12_CS16 0xBF
diff --git a/drivers/led/issi/is31fl3733-simple.c b/drivers/led/issi/is31fl3733-simple.c
deleted file mode 100644
index 9f2444c253a..00000000000
--- a/drivers/led/issi/is31fl3733-simple.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/* Copyright 2017 Jason Williams
- * Copyright 2018 Jack Humbert
- * Copyright 2018 Yiancar
- * Copyright 2021 Doni Crosby
- * Copyright 2021 Leo Deng
- *
- * 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 "is31fl3733-simple.h"
-#include <string.h>
-#include "i2c_master.h"
-#include "wait.h"
-
-#define IS31FL3733_PWM_REGISTER_COUNT 192
-#define IS31FL3733_LED_CONTROL_REGISTER_COUNT 24
-
-#ifndef IS31FL3733_I2C_TIMEOUT
-#    define IS31FL3733_I2C_TIMEOUT 100
-#endif
-
-#ifndef IS31FL3733_I2C_PERSISTENCE
-#    define IS31FL3733_I2C_PERSISTENCE 0
-#endif
-
-#ifndef IS31FL3733_PWM_FREQUENCY
-#    define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_8K4_HZ // PFS - IS31FL3733B only
-#endif
-
-#ifndef IS31FL3733_SW_PULLUP
-#    define IS31FL3733_SW_PULLUP IS31FL3733_PUR_0_OHM
-#endif
-
-#ifndef IS31FL3733_CS_PULLDOWN
-#    define IS31FL3733_CSPULLDOWN IS31FL3733_PDR_0_OHM
-#endif
-
-#ifndef IS31FL3733_GLOBAL_CURRENT
-#    define IS31FL3733_GLOBAL_CURRENT 0xFF
-#endif
-
-#ifndef IS31FL3733_SYNC_1
-#    define IS31FL3733_SYNC_1 IS31FL3733_SYNC_NONE
-#endif
-#ifndef IS31FL3733_SYNC_2
-#    define IS31FL3733_SYNC_2 IS31FL3733_SYNC_NONE
-#endif
-#ifndef IS31FL3733_SYNC_3
-#    define IS31FL3733_SYNC_3 IS31FL3733_SYNC_NONE
-#endif
-#ifndef IS31FL3733_SYNC_4
-#    define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE
-#endif
-
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
-
-// These buffers match the IS31FL3733 PWM registers.
-// The control buffers match the PG0 LED On/Off registers.
-// Storing them like this is optimal for I2C transfers to the registers.
-// We could optimize this and take out the unused registers from these
-// buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
-// probably not worth the extra complexity.
-uint8_t g_pwm_buffer[IS31FL3733_DRIVER_COUNT][IS31FL3733_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3733_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][IS31FL3733_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT]                        = {false};
-
-bool is31fl3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    // If the transaction fails function returns false.
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
-#if IS31FL3733_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
-            return false;
-        }
-    }
-#else
-    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
-        return false;
-    }
-#endif
-    return true;
-}
-
-bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assumes PG1 is already selected.
-    // If any of the transactions fails function returns false.
-    // Transmit PWM registers in 12 transfers of 16 bytes.
-    // g_twi_transfer_buffer[] is 20 bytes
-
-    // Iterate over the pwm_buffer contents at 16 byte intervals.
-    for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) {
-        g_twi_transfer_buffer[0] = i;
-        // Copy the data from i to i+15.
-        // Device will auto-increment register for data after the first byte
-        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);
-
-#if IS31FL3733_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
-                return false;
-            }
-        }
-#else
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
-            return false;
-        }
-#endif
-    }
-    return true;
-}
-
-void is31fl3733_init_drivers(void) {
-    i2c_init();
-
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_1);
-#if defined(IS31FL3733_I2C_ADDRESS_2)
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_2);
-#    if defined(IS31FL3733_I2C_ADDRESS_3)
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_3, IS31FL3733_SYNC_3);
-#        if defined(IS31FL3733_I2C_ADDRESS_4)
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_4, IS31FL3733_SYNC_4);
-#        endif
-#    endif
-#endif
-
-    for (int i = 0; i < IS31FL3733_LED_COUNT; i++) {
-        is31fl3733_set_led_control_register(i, true);
-    }
-
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3733_I2C_ADDRESS_2)
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3733_I2C_ADDRESS_3)
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3733_I2C_ADDRESS_4)
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
-
-void is31fl3733_init(uint8_t addr, uint8_t sync) {
-    // In order to avoid the LEDs being driven with garbage data
-    // in the LED driver's PWM registers, shutdown is enabled last.
-    // Set up the mode and other settings, clear the PWM registers,
-    // then disable software shutdown.
-    // Sync is passed so set it according to the datasheet.
-
-    // Unlock the command register.
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG0
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
-    // Turn off all LEDs.
-    for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3733_write_register(addr, i, 0x00);
-    }
-
-    // Unlock the command register.
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG1
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);
-    // Set PWM on all LEDs to 0
-    // No need to setup Breath registers to PWM as that is the default.
-    for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) {
-        is31fl3733_write_register(addr, i, 0x00);
-    }
-
-    // Unlock the command register.
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG3
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_FUNCTION);
-    // Set de-ghost pull-up resistors (SWx)
-    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
-    // Set de-ghost pull-down resistors (CSx)
-    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN);
-    // Set global current to maximum.
-    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT);
-    // Disable software shutdown.
-    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01);
-
-    // Wait 10ms to ensure the device has woken up.
-    wait_ms(10);
-}
-
-void is31fl3733_set_value(int index, uint8_t value) {
-    is31fl3733_led_t led;
-    if (index >= 0 && index < IS31FL3733_LED_COUNT) {
-        memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led));
-
-        if (g_pwm_buffer[led.driver][led.v] == value) {
-            return;
-        }
-        g_pwm_buffer[led.driver][led.v]          = value;
-        g_pwm_buffer_update_required[led.driver] = true;
-    }
-}
-
-void is31fl3733_set_value_all(uint8_t value) {
-    for (int i = 0; i < IS31FL3733_LED_COUNT; i++) {
-        is31fl3733_set_value(i, value);
-    }
-}
-
-void is31fl3733_set_led_control_register(uint8_t index, bool value) {
-    is31fl3733_led_t led;
-    memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led));
-
-    uint8_t control_register = led.v / 8;
-    uint8_t bit_value        = led.v % 8;
-
-    if (value) {
-        g_led_control_registers[led.driver][control_register] |= (1 << bit_value);
-    } else {
-        g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value);
-    }
-
-    g_led_control_registers_update_required[led.driver] = true;
-}
-
-void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG1.
-        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);
-
-        // If any of the transactions fail we risk writing dirty PG0,
-        // refresh page 0 just in case.
-        if (!is31fl3733_write_pwm_buffer(addr, g_pwm_buffer[index])) {
-            g_led_control_registers_update_required[index] = true;
-        }
-        g_pwm_buffer_update_required[index] = false;
-    }
-}
-
-void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG0
-        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
-        for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3733_write_register(addr, i, g_led_control_registers[index][i]);
-        }
-        g_led_control_registers_update_required[index] = false;
-    }
-}
-
-void is31fl3733_flush(void) {
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3733_I2C_ADDRESS_2)
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3733_I2C_ADDRESS_3)
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3733_I2C_ADDRESS_4)
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
diff --git a/drivers/led/issi/is31fl3733-simple.h b/drivers/led/issi/is31fl3733-simple.h
deleted file mode 100644
index c37b1fe5f2c..00000000000
--- a/drivers/led/issi/is31fl3733-simple.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/* Copyright 2017 Jason Williams
- * Copyright 2018 Jack Humbert
- * Copyright 2018 Yiancar
- * Copyright 2021 Doni Crosby
- * Copyright 2021 Leo Deng
- *
- * 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"
-#include "util.h"
-
-// ======== DEPRECATED DEFINES - DO NOT USE ========
-#ifdef ISSI_TIMEOUT
-#    define IS31FL3733_I2C_TIMEOUT ISSI_TIMEOUT
-#endif
-#ifdef ISSI_PERSISTENCE
-#    define IS31FL3733_I2C_PERSISTENCE ISSI_PERSISTENCE
-#endif
-#ifdef ISSI_PWM_FREQUENCY
-#    define IS31FL3733_PWM_FREQUENCY ISSI_PWM_FREQUENCY
-#endif
-#ifdef ISSI_SWPULLUP
-#    define IS31FL3733_SW_PULLUP ISSI_SWPULLUP
-#endif
-#ifdef ISSI_CSPULLUP
-#    define IS31FL3733_CS_PULLDOWN ISSI_CSPULLUP
-#endif
-#ifdef ISSI_GLOBALCURRENT
-#    define IS31FL3733_GLOBAL_CURRENT ISSI_GLOBALCURRENT
-#endif
-
-#define is31_led is31fl3733_led_t
-#define g_is31_leds g_is31fl3733_leds
-
-#define PUR_0R IS31FL3733_PUR_0_OHM
-#define PUR_05KR IS31FL3733_PUR_1K_OHM
-#define PUR_3KR IS31FL3733_PUR_2K_OHM
-#define PUR_4KR IS31FL3733_PUR_4K_OHM
-#define PUR_8KR IS31FL3733_PUR_8K_OHM
-#define PUR_16KR IS31FL3733_PUR_16K_OHM
-#define PUR_32KR IS31FL3733_PUR_32K_OHM
-// ========
-
-#define IS31FL3733_REG_INTERRUPT_MASK 0xF0
-#define IS31FL3733_REG_INTERRUPT_STATUS 0xF1
-
-#define IS31FL3733_REG_COMMAND 0xFD
-
-#define IS31FL3733_COMMAND_LED_CONTROL 0x00
-#define IS31FL3733_COMMAND_PWM 0x01
-#define IS31FL3733_COMMAND_AUTO_BREATH 0x02
-#define IS31FL3733_COMMAND_FUNCTION 0x03
-
-#define IS31FL3733_FUNCTION_REG_CONFIGURATION 0x00
-#define IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT 0x01
-#define IS31FL3733_FUNCTION_REG_SW_PULLUP 0x0F
-#define IS31FL3733_FUNCTION_REG_CS_PULLDOWN 0x10
-#define IS31FL3733_FUNCTION_REG_RESET 0x11
-
-#define IS31FL3733_REG_COMMAND_WRITE_LOCK 0xFE
-#define IS31FL3733_COMMAND_WRITE_LOCK_MAGIC 0xC5
-
-#define IS31FL3733_I2C_ADDRESS_GND_GND 0x50
-#define IS31FL3733_I2C_ADDRESS_GND_SCL 0x51
-#define IS31FL3733_I2C_ADDRESS_GND_SDA 0x52
-#define IS31FL3733_I2C_ADDRESS_GND_VCC 0x53
-#define IS31FL3733_I2C_ADDRESS_SCL_GND 0x54
-#define IS31FL3733_I2C_ADDRESS_SCL_SCL 0x55
-#define IS31FL3733_I2C_ADDRESS_SCL_SDA 0x56
-#define IS31FL3733_I2C_ADDRESS_SCL_VCC 0x57
-#define IS31FL3733_I2C_ADDRESS_SDA_GND 0x58
-#define IS31FL3733_I2C_ADDRESS_SDA_SCL 0x59
-#define IS31FL3733_I2C_ADDRESS_SDA_SDA 0x5A
-#define IS31FL3733_I2C_ADDRESS_SDA_VCC 0x5B
-#define IS31FL3733_I2C_ADDRESS_VCC_GND 0x5C
-#define IS31FL3733_I2C_ADDRESS_VCC_SCL 0x5D
-#define IS31FL3733_I2C_ADDRESS_VCC_SDA 0x5E
-#define IS31FL3733_I2C_ADDRESS_VCC_VCC 0x5F
-
-#if defined(LED_MATRIX_IS31FL3733)
-#    define IS31FL3733_LED_COUNT LED_MATRIX_LED_COUNT
-#endif
-
-#if defined(IS31FL3733_I2C_ADDRESS_4)
-#    define IS31FL3733_DRIVER_COUNT 4
-#elif defined(IS31FL3733_I2C_ADDRESS_3)
-#    define IS31FL3733_DRIVER_COUNT 3
-#elif defined(IS31FL3733_I2C_ADDRESS_2)
-#    define IS31FL3733_DRIVER_COUNT 2
-#elif defined(IS31FL3733_I2C_ADDRESS_1)
-#    define IS31FL3733_DRIVER_COUNT 1
-#endif
-
-typedef struct is31fl3733_led_t {
-    uint8_t driver : 2;
-    uint8_t v;
-} PACKED is31fl3733_led_t;
-
-extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT];
-
-void is31fl3733_init_drivers(void);
-void is31fl3733_init(uint8_t addr, uint8_t sync);
-bool is31fl3733_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
-
-void is31fl3733_set_value(int index, uint8_t value);
-void is31fl3733_set_value_all(uint8_t value);
-
-void is31fl3733_set_led_control_register(uint8_t index, bool value);
-
-// This should not be called from an interrupt
-// (eg. from a timer interrupt).
-// Call this while idle (in between matrix scans).
-// If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index);
-
-void is31fl3733_flush(void);
-
-#define IS31FL3733_PDR_0_OHM 0b000   // No pull-down resistor
-#define IS31FL3733_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
-#define IS31FL3733_PDR_1K_OHM 0b010  // 1 kOhm resistor
-#define IS31FL3733_PDR_2K_OHM 0b011  // 2 kOhm resistor
-#define IS31FL3733_PDR_4K_OHM 0b100  // 4 kOhm resistor
-#define IS31FL3733_PDR_8K_OHM 0b101  // 8 kOhm resistor
-#define IS31FL3733_PDR_16K_OHM 0b110 // 16 kOhm resistor
-#define IS31FL3733_PDR_32K_OHM 0b111 // 32 kOhm resistor
-
-#define IS31FL3733_PUR_0_OHM 0b000   // No pull-up resistor
-#define IS31FL3733_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
-#define IS31FL3733_PUR_1K_OHM 0b010  // 1 kOhm resistor
-#define IS31FL3733_PUR_2K_OHM 0b011  // 2 kOhm resistor
-#define IS31FL3733_PUR_4K_OHM 0b100  // 4 kOhm resistor
-#define IS31FL3733_PUR_8K_OHM 0b101  // 8 kOhm resistor
-#define IS31FL3733_PUR_16K_OHM 0b110 // 16 kOhm resistor
-#define IS31FL3733_PUR_32K_OHM 0b111 // 32 kOhm resistor
-
-#define IS31FL3733_PWM_FREQUENCY_8K4_HZ 0b000
-#define IS31FL3733_PWM_FREQUENCY_4K2_HZ 0b001
-#define IS31FL3733_PWM_FREQUENCY_26K7_HZ 0b010
-#define IS31FL3733_PWM_FREQUENCY_2K1_HZ 0b011
-#define IS31FL3733_PWM_FREQUENCY_1K05_HZ 0b100
-
-#define IS31FL3733_SYNC_NONE 0b00
-#define IS31FL3733_SYNC_MASTER 0b01
-#define IS31FL3733_SYNC_SLAVE 0b10
-
-#define A_1 0x00
-#define A_2 0x01
-#define A_3 0x02
-#define A_4 0x03
-#define A_5 0x04
-#define A_6 0x05
-#define A_7 0x06
-#define A_8 0x07
-#define A_9 0x08
-#define A_10 0x09
-#define A_11 0x0A
-#define A_12 0x0B
-#define A_13 0x0C
-#define A_14 0x0D
-#define A_15 0x0E
-#define A_16 0x0F
-
-#define B_1 0x10
-#define B_2 0x11
-#define B_3 0x12
-#define B_4 0x13
-#define B_5 0x14
-#define B_6 0x15
-#define B_7 0x16
-#define B_8 0x17
-#define B_9 0x18
-#define B_10 0x19
-#define B_11 0x1A
-#define B_12 0x1B
-#define B_13 0x1C
-#define B_14 0x1D
-#define B_15 0x1E
-#define B_16 0x1F
-
-#define C_1 0x20
-#define C_2 0x21
-#define C_3 0x22
-#define C_4 0x23
-#define C_5 0x24
-#define C_6 0x25
-#define C_7 0x26
-#define C_8 0x27
-#define C_9 0x28
-#define C_10 0x29
-#define C_11 0x2A
-#define C_12 0x2B
-#define C_13 0x2C
-#define C_14 0x2D
-#define C_15 0x2E
-#define C_16 0x2F
-
-#define D_1 0x30
-#define D_2 0x31
-#define D_3 0x32
-#define D_4 0x33
-#define D_5 0x34
-#define D_6 0x35
-#define D_7 0x36
-#define D_8 0x37
-#define D_9 0x38
-#define D_10 0x39
-#define D_11 0x3A
-#define D_12 0x3B
-#define D_13 0x3C
-#define D_14 0x3D
-#define D_15 0x3E
-#define D_16 0x3F
-
-#define E_1 0x40
-#define E_2 0x41
-#define E_3 0x42
-#define E_4 0x43
-#define E_5 0x44
-#define E_6 0x45
-#define E_7 0x46
-#define E_8 0x47
-#define E_9 0x48
-#define E_10 0x49
-#define E_11 0x4A
-#define E_12 0x4B
-#define E_13 0x4C
-#define E_14 0x4D
-#define E_15 0x4E
-#define E_16 0x4F
-
-#define F_1 0x50
-#define F_2 0x51
-#define F_3 0x52
-#define F_4 0x53
-#define F_5 0x54
-#define F_6 0x55
-#define F_7 0x56
-#define F_8 0x57
-#define F_9 0x58
-#define F_10 0x59
-#define F_11 0x5A
-#define F_12 0x5B
-#define F_13 0x5C
-#define F_14 0x5D
-#define F_15 0x5E
-#define F_16 0x5F
-
-#define G_1 0x60
-#define G_2 0x61
-#define G_3 0x62
-#define G_4 0x63
-#define G_5 0x64
-#define G_6 0x65
-#define G_7 0x66
-#define G_8 0x67
-#define G_9 0x68
-#define G_10 0x69
-#define G_11 0x6A
-#define G_12 0x6B
-#define G_13 0x6C
-#define G_14 0x6D
-#define G_15 0x6E
-#define G_16 0x6F
-
-#define H_1 0x70
-#define H_2 0x71
-#define H_3 0x72
-#define H_4 0x73
-#define H_5 0x74
-#define H_6 0x75
-#define H_7 0x76
-#define H_8 0x77
-#define H_9 0x78
-#define H_10 0x79
-#define H_11 0x7A
-#define H_12 0x7B
-#define H_13 0x7C
-#define H_14 0x7D
-#define H_15 0x7E
-#define H_16 0x7F
-
-#define I_1 0x80
-#define I_2 0x81
-#define I_3 0x82
-#define I_4 0x83
-#define I_5 0x84
-#define I_6 0x85
-#define I_7 0x86
-#define I_8 0x87
-#define I_9 0x88
-#define I_10 0x89
-#define I_11 0x8A
-#define I_12 0x8B
-#define I_13 0x8C
-#define I_14 0x8D
-#define I_15 0x8E
-#define I_16 0x8F
-
-#define J_1 0x90
-#define J_2 0x91
-#define J_3 0x92
-#define J_4 0x93
-#define J_5 0x94
-#define J_6 0x95
-#define J_7 0x96
-#define J_8 0x97
-#define J_9 0x98
-#define J_10 0x99
-#define J_11 0x9A
-#define J_12 0x9B
-#define J_13 0x9C
-#define J_14 0x9D
-#define J_15 0x9E
-#define J_16 0x9F
-
-#define K_1 0xA0
-#define K_2 0xA1
-#define K_3 0xA2
-#define K_4 0xA3
-#define K_5 0xA4
-#define K_6 0xA5
-#define K_7 0xA6
-#define K_8 0xA7
-#define K_9 0xA8
-#define K_10 0xA9
-#define K_11 0xAA
-#define K_12 0xAB
-#define K_13 0xAC
-#define K_14 0xAD
-#define K_15 0xAE
-#define K_16 0xAF
-
-#define L_1 0xB0
-#define L_2 0xB1
-#define L_3 0xB2
-#define L_4 0xB3
-#define L_5 0xB4
-#define L_6 0xB5
-#define L_7 0xB6
-#define L_8 0xB7
-#define L_9 0xB8
-#define L_10 0xB9
-#define L_11 0xBA
-#define L_12 0xBB
-#define L_13 0xBC
-#define L_14 0xBD
-#define L_15 0xBE
-#define L_16 0xBF
diff --git a/drivers/led/issi/is31fl3733.c b/drivers/led/issi/is31fl3733.c
index 5857a800d7e..a1d68991149 100644
--- a/drivers/led/issi/is31fl3733.c
+++ b/drivers/led/issi/is31fl3733.c
@@ -18,8 +18,8 @@
  */
 
 #include "is31fl3733.h"
-#include <string.h>
 #include "i2c_master.h"
+#include "gpio.h"
 #include "wait.h"
 
 #define IS31FL3733_PWM_REGISTER_COUNT 192
@@ -62,140 +62,137 @@
 #    define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE
 #endif
 
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
+const uint8_t i2c_addresses[IS31FL3733_DRIVER_COUNT] = {
+    IS31FL3733_I2C_ADDRESS_1,
+#ifdef IS31FL3733_I2C_ADDRESS_2
+    IS31FL3733_I2C_ADDRESS_2,
+#    ifdef IS31FL3733_I2C_ADDRESS_3
+    IS31FL3733_I2C_ADDRESS_3,
+#        ifdef IS31FL3733_I2C_ADDRESS_4
+    IS31FL3733_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+const uint8_t driver_sync[IS31FL3733_DRIVER_COUNT] = {
+    IS31FL3733_SYNC_1,
+#ifdef IS31FL3733_I2C_ADDRESS_2
+    IS31FL3733_SYNC_2,
+#    ifdef IS31FL3733_I2C_ADDRESS_3
+    IS31FL3733_SYNC_3,
+#        ifdef IS31FL3733_I2C_ADDRESS_4
+    IS31FL3733_SYNC_4,
+#        endif
+#    endif
+#endif
+};
 
 // These buffers match the IS31FL3733 PWM registers.
-// The control buffers match the PG0 LED On/Off registers.
+// The control buffers match the page 0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
-uint8_t g_pwm_buffer[IS31FL3733_DRIVER_COUNT][IS31FL3733_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3733_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][IS31FL3733_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT]                        = {false};
-
-bool is31fl3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    // If the transaction fails function returns false.
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
+typedef struct is31fl3733_driver_t {
+    uint8_t pwm_buffer[IS31FL3733_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3733_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3733_driver_t;
+
+is31fl3733_driver_t driver_buffers[IS31FL3733_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3733_write_register(uint8_t index, uint8_t reg, uint8_t data) {
 #if IS31FL3733_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
-            return false;
-        }
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
-        return false;
-    }
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT);
 #endif
-    return true;
 }
 
-bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assumes PG1 is already selected.
-    // If any of the transactions fails function returns false.
+void is31fl3733_select_page(uint8_t index, uint8_t page) {
+    is31fl3733_write_register(index, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3733_write_register(index, IS31FL3733_REG_COMMAND, page);
+}
+
+void is31fl3733_write_pwm_buffer(uint8_t index) {
+    // Assumes page 1 is already selected.
     // Transmit PWM registers in 12 transfers of 16 bytes.
-    // g_twi_transfer_buffer[] is 20 bytes
 
     // Iterate over the pwm_buffer contents at 16 byte intervals.
-    for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) {
-        g_twi_transfer_buffer[0] = i;
-        // Copy the data from i to i+15.
-        // Device will auto-increment register for data after the first byte
-        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);
-
+    for (uint8_t i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) {
 #if IS31FL3733_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
-                return false;
-            }
+        for (uint8_t j = 0; j < IS31FL3733_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
 #else
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
-            return false;
-        }
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3733_I2C_TIMEOUT);
 #endif
     }
-    return true;
 }
 
 void is31fl3733_init_drivers(void) {
     i2c_init();
 
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_1);
-#if defined(IS31FL3733_I2C_ADDRESS_2)
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_2);
-#    if defined(IS31FL3733_I2C_ADDRESS_3)
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_3, IS31FL3733_SYNC_3);
-#        if defined(IS31FL3733_I2C_ADDRESS_4)
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_4, IS31FL3733_SYNC_4);
-#        endif
-#    endif
+#if defined(IS31FL3733_SDB_PIN)
+    gpio_set_pin_output(IS31FL3733_SDB_PIN);
+    gpio_write_pin_high(IS31FL3733_SDB_PIN);
 #endif
 
+    for (uint8_t i = 0; i < IS31FL3733_DRIVER_COUNT; i++) {
+        is31fl3733_init(i);
+    }
+
     for (int i = 0; i < IS31FL3733_LED_COUNT; i++) {
         is31fl3733_set_led_control_register(i, true, true, true);
     }
 
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3733_I2C_ADDRESS_2)
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3733_I2C_ADDRESS_3)
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3733_I2C_ADDRESS_4)
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3733_DRIVER_COUNT; i++) {
+        is31fl3733_update_led_control_registers(i);
+    }
 }
 
-void is31fl3733_init(uint8_t addr, uint8_t sync) {
+void is31fl3733_init(uint8_t index) {
     // In order to avoid the LEDs being driven with garbage data
     // in the LED driver's PWM registers, shutdown is enabled last.
     // Set up the mode and other settings, clear the PWM registers,
     // then disable software shutdown.
-    // Sync is passed so set it according to the datasheet.
 
-    // Unlock the command register.
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3733_select_page(index, IS31FL3733_COMMAND_LED_CONTROL);
 
-    // Select PG0
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
     // Turn off all LEDs.
-    for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3733_write_register(addr, i, 0x00);
+    for (uint8_t i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3733_write_register(index, i, 0x00);
     }
 
-    // Unlock the command register.
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3733_select_page(index, IS31FL3733_COMMAND_PWM);
 
-    // Select PG1
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);
     // Set PWM on all LEDs to 0
     // No need to setup Breath registers to PWM as that is the default.
-    for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) {
-        is31fl3733_write_register(addr, i, 0x00);
+    for (uint8_t i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) {
+        is31fl3733_write_register(index, i, 0x00);
     }
 
-    // Unlock the command register.
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3733_select_page(index, IS31FL3733_COMMAND_FUNCTION);
+
+    uint8_t sync = driver_sync[index];
 
-    // Select PG3
-    is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_FUNCTION);
     // Set de-ghost pull-up resistors (SWx)
-    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
+    is31fl3733_write_register(index, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
     // Set de-ghost pull-down resistors (CSx)
-    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN);
+    is31fl3733_write_register(index, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN);
     // Set global current to maximum.
-    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT);
+    is31fl3733_write_register(index, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT);
     // Disable software shutdown.
-    is31fl3733_write_register(addr, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+    is31fl3733_write_register(index, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
@@ -203,16 +200,18 @@ void is31fl3733_init(uint8_t addr, uint8_t sync) {
 
 void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31fl3733_led_t led;
+
     if (index >= 0 && index < IS31FL3733_LED_COUNT) {
         memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led));
 
-        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
             return;
         }
-        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;
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
     }
 }
 
@@ -234,60 +233,48 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo
     uint8_t bit_b              = led.b % 8;
 
     if (red) {
-        g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] |= (1 << bit_r);
     } else {
-        g_led_control_registers[led.driver][control_register_r] &= ~(1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] &= ~(1 << bit_r);
     }
     if (green) {
-        g_led_control_registers[led.driver][control_register_g] |= (1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] |= (1 << bit_g);
     } else {
-        g_led_control_registers[led.driver][control_register_g] &= ~(1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] &= ~(1 << bit_g);
     }
     if (blue) {
-        g_led_control_registers[led.driver][control_register_b] |= (1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] |= (1 << bit_b);
     } else {
-        g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] &= ~(1 << bit_b);
     }
 
-    g_led_control_registers_update_required[led.driver] = true;
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
 }
 
-void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG1.
-        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);
+void is31fl3733_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3733_select_page(index, IS31FL3733_COMMAND_PWM);
 
-        // If any of the transactions fail we risk writing dirty PG0,
-        // refresh page 0 just in case.
-        if (!is31fl3733_write_pwm_buffer(addr, g_pwm_buffer[index])) {
-            g_led_control_registers_update_required[index] = true;
-        }
-        g_pwm_buffer_update_required[index] = false;
+        is31fl3733_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
     }
 }
 
-void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG0
-        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3733_write_register(addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
-        for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3733_write_register(addr, i, g_led_control_registers[index][i]);
+void is31fl3733_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        is31fl3733_select_page(index, IS31FL3733_COMMAND_LED_CONTROL);
+
+        for (uint8_t i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3733_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
         }
-        g_led_control_registers_update_required[index] = false;
+
+        driver_buffers[index].led_control_buffer_dirty = false;
     }
 }
 
 void is31fl3733_flush(void) {
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3733_I2C_ADDRESS_2)
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3733_I2C_ADDRESS_3)
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3733_I2C_ADDRESS_4)
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3733_DRIVER_COUNT; i++) {
+        is31fl3733_update_pwm_buffers(i);
+    }
 }
diff --git a/drivers/led/issi/is31fl3733.h b/drivers/led/issi/is31fl3733.h
index 20804b016bd..fb60c76c2de 100644
--- a/drivers/led/issi/is31fl3733.h
+++ b/drivers/led/issi/is31fl3733.h
@@ -40,13 +40,13 @@
 #ifdef DRIVER_SYNC_1
 #    define IS31FL3733_SYNC_1 DRIVER_SYNC_1
 #endif
-#ifdef DRIVER_ADDR_2
+#ifdef DRIVER_SYNC_2
 #    define IS31FL3733_SYNC_2 DRIVER_SYNC_2
 #endif
-#ifdef DRIVER_ADDR_3
+#ifdef DRIVER_SYNC_3
 #    define IS31FL3733_SYNC_3 DRIVER_SYNC_3
 #endif
-#ifdef DRIVER_ADDR_4
+#ifdef DRIVER_SYNC_4
 #    define IS31FL3733_SYNC_4 DRIVER_SYNC_4
 #endif
 #ifdef ISSI_TIMEOUT
@@ -140,9 +140,9 @@ typedef struct is31fl3733_led_t {
 extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT];
 
 void is31fl3733_init_drivers(void);
-void is31fl3733_init(uint8_t addr, uint8_t sync);
-bool is31fl3733_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-bool is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+void is31fl3733_init(uint8_t index);
+void is31fl3733_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3733_select_page(uint8_t index, uint8_t page);
 
 void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void is31fl3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
@@ -153,8 +153,8 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index);
+void is31fl3733_update_pwm_buffers(uint8_t index);
+void is31fl3733_update_led_control_registers(uint8_t index);
 
 void is31fl3733_flush(void);
 
@@ -186,206 +186,412 @@ void is31fl3733_flush(void);
 #define IS31FL3733_SYNC_MASTER 0b01
 #define IS31FL3733_SYNC_SLAVE 0b10
 
-#define A_1 0x00
-#define A_2 0x01
-#define A_3 0x02
-#define A_4 0x03
-#define A_5 0x04
-#define A_6 0x05
-#define A_7 0x06
-#define A_8 0x07
-#define A_9 0x08
-#define A_10 0x09
-#define A_11 0x0A
-#define A_12 0x0B
-#define A_13 0x0C
-#define A_14 0x0D
-#define A_15 0x0E
-#define A_16 0x0F
-
-#define B_1 0x10
-#define B_2 0x11
-#define B_3 0x12
-#define B_4 0x13
-#define B_5 0x14
-#define B_6 0x15
-#define B_7 0x16
-#define B_8 0x17
-#define B_9 0x18
-#define B_10 0x19
-#define B_11 0x1A
-#define B_12 0x1B
-#define B_13 0x1C
-#define B_14 0x1D
-#define B_15 0x1E
-#define B_16 0x1F
-
-#define C_1 0x20
-#define C_2 0x21
-#define C_3 0x22
-#define C_4 0x23
-#define C_5 0x24
-#define C_6 0x25
-#define C_7 0x26
-#define C_8 0x27
-#define C_9 0x28
-#define C_10 0x29
-#define C_11 0x2A
-#define C_12 0x2B
-#define C_13 0x2C
-#define C_14 0x2D
-#define C_15 0x2E
-#define C_16 0x2F
-
-#define D_1 0x30
-#define D_2 0x31
-#define D_3 0x32
-#define D_4 0x33
-#define D_5 0x34
-#define D_6 0x35
-#define D_7 0x36
-#define D_8 0x37
-#define D_9 0x38
-#define D_10 0x39
-#define D_11 0x3A
-#define D_12 0x3B
-#define D_13 0x3C
-#define D_14 0x3D
-#define D_15 0x3E
-#define D_16 0x3F
-
-#define E_1 0x40
-#define E_2 0x41
-#define E_3 0x42
-#define E_4 0x43
-#define E_5 0x44
-#define E_6 0x45
-#define E_7 0x46
-#define E_8 0x47
-#define E_9 0x48
-#define E_10 0x49
-#define E_11 0x4A
-#define E_12 0x4B
-#define E_13 0x4C
-#define E_14 0x4D
-#define E_15 0x4E
-#define E_16 0x4F
-
-#define F_1 0x50
-#define F_2 0x51
-#define F_3 0x52
-#define F_4 0x53
-#define F_5 0x54
-#define F_6 0x55
-#define F_7 0x56
-#define F_8 0x57
-#define F_9 0x58
-#define F_10 0x59
-#define F_11 0x5A
-#define F_12 0x5B
-#define F_13 0x5C
-#define F_14 0x5D
-#define F_15 0x5E
-#define F_16 0x5F
-
-#define G_1 0x60
-#define G_2 0x61
-#define G_3 0x62
-#define G_4 0x63
-#define G_5 0x64
-#define G_6 0x65
-#define G_7 0x66
-#define G_8 0x67
-#define G_9 0x68
-#define G_10 0x69
-#define G_11 0x6A
-#define G_12 0x6B
-#define G_13 0x6C
-#define G_14 0x6D
-#define G_15 0x6E
-#define G_16 0x6F
-
-#define H_1 0x70
-#define H_2 0x71
-#define H_3 0x72
-#define H_4 0x73
-#define H_5 0x74
-#define H_6 0x75
-#define H_7 0x76
-#define H_8 0x77
-#define H_9 0x78
-#define H_10 0x79
-#define H_11 0x7A
-#define H_12 0x7B
-#define H_13 0x7C
-#define H_14 0x7D
-#define H_15 0x7E
-#define H_16 0x7F
-
-#define I_1 0x80
-#define I_2 0x81
-#define I_3 0x82
-#define I_4 0x83
-#define I_5 0x84
-#define I_6 0x85
-#define I_7 0x86
-#define I_8 0x87
-#define I_9 0x88
-#define I_10 0x89
-#define I_11 0x8A
-#define I_12 0x8B
-#define I_13 0x8C
-#define I_14 0x8D
-#define I_15 0x8E
-#define I_16 0x8F
-
-#define J_1 0x90
-#define J_2 0x91
-#define J_3 0x92
-#define J_4 0x93
-#define J_5 0x94
-#define J_6 0x95
-#define J_7 0x96
-#define J_8 0x97
-#define J_9 0x98
-#define J_10 0x99
-#define J_11 0x9A
-#define J_12 0x9B
-#define J_13 0x9C
-#define J_14 0x9D
-#define J_15 0x9E
-#define J_16 0x9F
-
-#define K_1 0xA0
-#define K_2 0xA1
-#define K_3 0xA2
-#define K_4 0xA3
-#define K_5 0xA4
-#define K_6 0xA5
-#define K_7 0xA6
-#define K_8 0xA7
-#define K_9 0xA8
-#define K_10 0xA9
-#define K_11 0xAA
-#define K_12 0xAB
-#define K_13 0xAC
-#define K_14 0xAD
-#define K_15 0xAE
-#define K_16 0xAF
-
-#define L_1 0xB0
-#define L_2 0xB1
-#define L_3 0xB2
-#define L_4 0xB3
-#define L_5 0xB4
-#define L_6 0xB5
-#define L_7 0xB6
-#define L_8 0xB7
-#define L_9 0xB8
-#define L_10 0xB9
-#define L_11 0xBA
-#define L_12 0xBB
-#define L_13 0xBC
-#define L_14 0xBD
-#define L_15 0xBE
-#define L_16 0xBF
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x16
+#define SW2_CS8 0x17
+#define SW2_CS9 0x18
+#define SW2_CS10 0x19
+#define SW2_CS11 0x1A
+#define SW2_CS12 0x1B
+#define SW2_CS13 0x1C
+#define SW2_CS14 0x1D
+#define SW2_CS15 0x1E
+#define SW2_CS16 0x1F
+
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x26
+#define SW3_CS8 0x27
+#define SW3_CS9 0x28
+#define SW3_CS10 0x29
+#define SW3_CS11 0x2A
+#define SW3_CS12 0x2B
+#define SW3_CS13 0x2C
+#define SW3_CS14 0x2D
+#define SW3_CS15 0x2E
+#define SW3_CS16 0x2F
+
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x36
+#define SW4_CS8 0x37
+#define SW4_CS9 0x38
+#define SW4_CS10 0x39
+#define SW4_CS11 0x3A
+#define SW4_CS12 0x3B
+#define SW4_CS13 0x3C
+#define SW4_CS14 0x3D
+#define SW4_CS15 0x3E
+#define SW4_CS16 0x3F
+
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x46
+#define SW5_CS8 0x47
+#define SW5_CS9 0x48
+#define SW5_CS10 0x49
+#define SW5_CS11 0x4A
+#define SW5_CS12 0x4B
+#define SW5_CS13 0x4C
+#define SW5_CS14 0x4D
+#define SW5_CS15 0x4E
+#define SW5_CS16 0x4F
+
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x56
+#define SW6_CS8 0x57
+#define SW6_CS9 0x58
+#define SW6_CS10 0x59
+#define SW6_CS11 0x5A
+#define SW6_CS12 0x5B
+#define SW6_CS13 0x5C
+#define SW6_CS14 0x5D
+#define SW6_CS15 0x5E
+#define SW6_CS16 0x5F
+
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x66
+#define SW7_CS8 0x67
+#define SW7_CS9 0x68
+#define SW7_CS10 0x69
+#define SW7_CS11 0x6A
+#define SW7_CS12 0x6B
+#define SW7_CS13 0x6C
+#define SW7_CS14 0x6D
+#define SW7_CS15 0x6E
+#define SW7_CS16 0x6F
+
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x76
+#define SW8_CS8 0x77
+#define SW8_CS9 0x78
+#define SW8_CS10 0x79
+#define SW8_CS11 0x7A
+#define SW8_CS12 0x7B
+#define SW8_CS13 0x7C
+#define SW8_CS14 0x7D
+#define SW8_CS15 0x7E
+#define SW8_CS16 0x7F
+
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x86
+#define SW9_CS8 0x87
+#define SW9_CS9 0x88
+#define SW9_CS10 0x89
+#define SW9_CS11 0x8A
+#define SW9_CS12 0x8B
+#define SW9_CS13 0x8C
+#define SW9_CS14 0x8D
+#define SW9_CS15 0x8E
+#define SW9_CS16 0x8F
+
+#define SW10_CS1 0x90
+#define SW10_CS2 0x91
+#define SW10_CS3 0x92
+#define SW10_CS4 0x93
+#define SW10_CS5 0x94
+#define SW10_CS6 0x95
+#define SW10_CS7 0x96
+#define SW10_CS8 0x97
+#define SW10_CS9 0x98
+#define SW10_CS10 0x99
+#define SW10_CS11 0x9A
+#define SW10_CS12 0x9B
+#define SW10_CS13 0x9C
+#define SW10_CS14 0x9D
+#define SW10_CS15 0x9E
+#define SW10_CS16 0x9F
+
+#define SW11_CS1 0xA0
+#define SW11_CS2 0xA1
+#define SW11_CS3 0xA2
+#define SW11_CS4 0xA3
+#define SW11_CS5 0xA4
+#define SW11_CS6 0xA5
+#define SW11_CS7 0xA6
+#define SW11_CS8 0xA7
+#define SW11_CS9 0xA8
+#define SW11_CS10 0xA9
+#define SW11_CS11 0xAA
+#define SW11_CS12 0xAB
+#define SW11_CS13 0xAC
+#define SW11_CS14 0xAD
+#define SW11_CS15 0xAE
+#define SW11_CS16 0xAF
+
+#define SW12_CS1 0xB0
+#define SW12_CS2 0xB1
+#define SW12_CS3 0xB2
+#define SW12_CS4 0xB3
+#define SW12_CS5 0xB4
+#define SW12_CS6 0xB5
+#define SW12_CS7 0xB6
+#define SW12_CS8 0xB7
+#define SW12_CS9 0xB8
+#define SW12_CS10 0xB9
+#define SW12_CS11 0xBA
+#define SW12_CS12 0xBB
+#define SW12_CS13 0xBC
+#define SW12_CS14 0xBD
+#define SW12_CS15 0xBE
+#define SW12_CS16 0xBF
+
+// DEPRECATED - DO NOT USE
+
+#define A_1 SW1_CS1
+#define A_2 SW1_CS2
+#define A_3 SW1_CS3
+#define A_4 SW1_CS4
+#define A_5 SW1_CS5
+#define A_6 SW1_CS6
+#define A_7 SW1_CS7
+#define A_8 SW1_CS8
+#define A_9 SW1_CS9
+#define A_10 SW1_CS10
+#define A_11 SW1_CS11
+#define A_12 SW1_CS12
+#define A_13 SW1_CS13
+#define A_14 SW1_CS14
+#define A_15 SW1_CS15
+#define A_16 SW1_CS16
+
+#define B_1 SW2_CS1
+#define B_2 SW2_CS2
+#define B_3 SW2_CS3
+#define B_4 SW2_CS4
+#define B_5 SW2_CS5
+#define B_6 SW2_CS6
+#define B_7 SW2_CS7
+#define B_8 SW2_CS8
+#define B_9 SW2_CS9
+#define B_10 SW2_CS10
+#define B_11 SW2_CS11
+#define B_12 SW2_CS12
+#define B_13 SW2_CS13
+#define B_14 SW2_CS14
+#define B_15 SW2_CS15
+#define B_16 SW2_CS16
+
+#define C_1 SW3_CS1
+#define C_2 SW3_CS2
+#define C_3 SW3_CS3
+#define C_4 SW3_CS4
+#define C_5 SW3_CS5
+#define C_6 SW3_CS6
+#define C_7 SW3_CS7
+#define C_8 SW3_CS8
+#define C_9 SW3_CS9
+#define C_10 SW3_CS10
+#define C_11 SW3_CS11
+#define C_12 SW3_CS12
+#define C_13 SW3_CS13
+#define C_14 SW3_CS14
+#define C_15 SW3_CS15
+#define C_16 SW3_CS16
+
+#define D_1 SW4_CS1
+#define D_2 SW4_CS2
+#define D_3 SW4_CS3
+#define D_4 SW4_CS4
+#define D_5 SW4_CS5
+#define D_6 SW4_CS6
+#define D_7 SW4_CS7
+#define D_8 SW4_CS8
+#define D_9 SW4_CS9
+#define D_10 SW4_CS10
+#define D_11 SW4_CS11
+#define D_12 SW4_CS12
+#define D_13 SW4_CS13
+#define D_14 SW4_CS14
+#define D_15 SW4_CS15
+#define D_16 SW4_CS16
+
+#define E_1 SW5_CS1
+#define E_2 SW5_CS2
+#define E_3 SW5_CS3
+#define E_4 SW5_CS4
+#define E_5 SW5_CS5
+#define E_6 SW5_CS6
+#define E_7 SW5_CS7
+#define E_8 SW5_CS8
+#define E_9 SW5_CS9
+#define E_10 SW5_CS10
+#define E_11 SW5_CS11
+#define E_12 SW5_CS12
+#define E_13 SW5_CS13
+#define E_14 SW5_CS14
+#define E_15 SW5_CS15
+#define E_16 SW5_CS16
+
+#define F_1 SW6_CS1
+#define F_2 SW6_CS2
+#define F_3 SW6_CS3
+#define F_4 SW6_CS4
+#define F_5 SW6_CS5
+#define F_6 SW6_CS6
+#define F_7 SW6_CS7
+#define F_8 SW6_CS8
+#define F_9 SW6_CS9
+#define F_10 SW6_CS10
+#define F_11 SW6_CS11
+#define F_12 SW6_CS12
+#define F_13 SW6_CS13
+#define F_14 SW6_CS14
+#define F_15 SW6_CS15
+#define F_16 SW6_CS16
+
+#define G_1 SW7_CS1
+#define G_2 SW7_CS2
+#define G_3 SW7_CS3
+#define G_4 SW7_CS4
+#define G_5 SW7_CS5
+#define G_6 SW7_CS6
+#define G_7 SW7_CS7
+#define G_8 SW7_CS8
+#define G_9 SW7_CS9
+#define G_10 SW7_CS10
+#define G_11 SW7_CS11
+#define G_12 SW7_CS12
+#define G_13 SW7_CS13
+#define G_14 SW7_CS14
+#define G_15 SW7_CS15
+#define G_16 SW7_CS16
+
+#define H_1 SW8_CS1
+#define H_2 SW8_CS2
+#define H_3 SW8_CS3
+#define H_4 SW8_CS4
+#define H_5 SW8_CS5
+#define H_6 SW8_CS6
+#define H_7 SW8_CS7
+#define H_8 SW8_CS8
+#define H_9 SW8_CS9
+#define H_10 SW8_CS10
+#define H_11 SW8_CS11
+#define H_12 SW8_CS12
+#define H_13 SW8_CS13
+#define H_14 SW8_CS14
+#define H_15 SW8_CS15
+#define H_16 SW8_CS16
+
+#define I_1 SW9_CS1
+#define I_2 SW9_CS2
+#define I_3 SW9_CS3
+#define I_4 SW9_CS4
+#define I_5 SW9_CS5
+#define I_6 SW9_CS6
+#define I_7 SW9_CS7
+#define I_8 SW9_CS8
+#define I_9 SW9_CS9
+#define I_10 SW9_CS10
+#define I_11 SW9_CS11
+#define I_12 SW9_CS12
+#define I_13 SW9_CS13
+#define I_14 SW9_CS14
+#define I_15 SW9_CS15
+#define I_16 SW9_CS16
+
+#define J_1 SW10_CS1
+#define J_2 SW10_CS2
+#define J_3 SW10_CS3
+#define J_4 SW10_CS4
+#define J_5 SW10_CS5
+#define J_6 SW10_CS6
+#define J_7 SW10_CS7
+#define J_8 SW10_CS8
+#define J_9 SW10_CS9
+#define J_10 SW10_CS10
+#define J_11 SW10_CS11
+#define J_12 SW10_CS12
+#define J_13 SW10_CS13
+#define J_14 SW10_CS14
+#define J_15 SW10_CS15
+#define J_16 SW10_CS16
+
+#define K_1 SW11_CS1
+#define K_2 SW11_CS2
+#define K_3 SW11_CS3
+#define K_4 SW11_CS4
+#define K_5 SW11_CS5
+#define K_6 SW11_CS6
+#define K_7 SW11_CS7
+#define K_8 SW11_CS8
+#define K_9 SW11_CS9
+#define K_10 SW11_CS10
+#define K_11 SW11_CS11
+#define K_12 SW11_CS12
+#define K_13 SW11_CS13
+#define K_14 SW11_CS14
+#define K_15 SW11_CS15
+#define K_16 SW11_CS16
+
+#define L_1 SW12_CS1
+#define L_2 SW12_CS2
+#define L_3 SW12_CS3
+#define L_4 SW12_CS4
+#define L_5 SW12_CS5
+#define L_6 SW12_CS6
+#define L_7 SW12_CS7
+#define L_8 SW12_CS8
+#define L_9 SW12_CS9
+#define L_10 SW12_CS10
+#define L_11 SW12_CS11
+#define L_12 SW12_CS12
+#define L_13 SW12_CS13
+#define L_14 SW12_CS14
+#define L_15 SW12_CS15
+#define L_16 SW12_CS16
diff --git a/drivers/led/issi/is31fl3736-mono.c b/drivers/led/issi/is31fl3736-mono.c
new file mode 100644
index 00000000000..7a5415c7259
--- /dev/null
+++ b/drivers/led/issi/is31fl3736-mono.c
@@ -0,0 +1,240 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ * Copyright 2021 Doni Crosby
+ *
+ * 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 "is31fl3736-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3736_PWM_REGISTER_COUNT 192 // actually 96
+#define IS31FL3736_LED_CONTROL_REGISTER_COUNT 24
+
+#ifndef IS31FL3736_I2C_TIMEOUT
+#    define IS31FL3736_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3736_I2C_PERSISTENCE
+#    define IS31FL3736_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3736_PWM_FREQUENCY
+#    define IS31FL3736_PWM_FREQUENCY IS31FL3736_PWM_FREQUENCY_8K4_HZ // PFS - IS31FL3736B only
+#endif
+
+#ifndef IS31FL3736_SW_PULLUP
+#    define IS31FL3736_SW_PULLUP IS31FL3736_PUR_0_OHM
+#endif
+
+#ifndef IS31FL3736_CS_PULLDOWN
+#    define IS31FL3736_CS_PULLDOWN IS31FL3736_PDR_0_OHM
+#endif
+
+#ifndef IS31FL3736_GLOBAL_CURRENT
+#    define IS31FL3736_GLOBAL_CURRENT 0xFF
+#endif
+
+const uint8_t i2c_addresses[IS31FL3736_DRIVER_COUNT] = {
+    IS31FL3736_I2C_ADDRESS_1,
+#ifdef IS31FL3736_I2C_ADDRESS_2
+    IS31FL3736_I2C_ADDRESS_2,
+#    ifdef IS31FL3736_I2C_ADDRESS_3
+    IS31FL3736_I2C_ADDRESS_3,
+#        ifdef IS31FL3736_I2C_ADDRESS_4
+    IS31FL3736_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+// These buffers match the IS31FL3736 PWM registers.
+// The control buffers match the page 0 LED On/Off registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in is31fl3736_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+typedef struct is31fl3736_driver_t {
+    uint8_t pwm_buffer[IS31FL3736_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3736_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3736_driver_t;
+
+is31fl3736_driver_t driver_buffers[IS31FL3736_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3736_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3736_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3736_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3736_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3736_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3736_select_page(uint8_t index, uint8_t page) {
+    is31fl3736_write_register(index, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3736_write_register(index, IS31FL3736_REG_COMMAND, page);
+}
+
+void is31fl3736_write_pwm_buffer(uint8_t index) {
+    // Assumes page 1 is already selected.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
+
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i += 16) {
+#if IS31FL3736_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3736_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3736_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3736_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3736_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3736_SDB_PIN)
+    gpio_set_pin_output(IS31FL3736_SDB_PIN);
+    gpio_write_pin_high(IS31FL3736_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3736_DRIVER_COUNT; i++) {
+        is31fl3736_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3736_LED_COUNT; i++) {
+        is31fl3736_set_led_control_register(i, true);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3736_DRIVER_COUNT; i++) {
+        is31fl3736_update_led_control_registers(i);
+    }
+}
+
+void is31fl3736_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3736_select_page(index, IS31FL3736_COMMAND_LED_CONTROL);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3736_write_register(index, i, 0x00);
+    }
+
+    is31fl3736_select_page(index, IS31FL3736_COMMAND_PWM);
+
+    // Set PWM on all LEDs to 0
+    // No need to setup Breath registers to PWM as that is the default.
+    for (uint8_t i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i++) {
+        is31fl3736_write_register(index, i, 0x00);
+    }
+
+    is31fl3736_select_page(index, IS31FL3736_COMMAND_FUNCTION);
+
+    // Set de-ghost pull-up resistors (SWx)
+    is31fl3736_write_register(index, IS31FL3736_FUNCTION_REG_SW_PULLUP, IS31FL3736_SW_PULLUP);
+    // Set de-ghost pull-down resistors (CSx)
+    is31fl3736_write_register(index, IS31FL3736_FUNCTION_REG_CS_PULLDOWN, IS31FL3736_CS_PULLDOWN);
+    // Set global current to maximum.
+    is31fl3736_write_register(index, IS31FL3736_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3736_GLOBAL_CURRENT);
+    // Disable software shutdown.
+    is31fl3736_write_register(index, IS31FL3736_FUNCTION_REG_CONFIGURATION, ((IS31FL3736_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3736_set_value(int index, uint8_t value) {
+    is31fl3736_led_t led;
+
+    if (index >= 0 && index < IS31FL3736_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3736_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3736_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3736_LED_COUNT; i++) {
+        is31fl3736_set_value(i, value);
+    }
+}
+
+void is31fl3736_set_led_control_register(uint8_t index, bool value) {
+    is31fl3736_led_t led;
+    memcpy_P(&led, (&g_is31fl3736_leds[index]), sizeof(led));
+
+    // The PWM register for a matrix position (0x00 to 0xBF) is interleaved, so:
+    // A1=0x00 A2=0x02 A3=0x04 A4=0x06 A5=0x08 A6=0x0A A7=0x0C A8=0x0E
+    // B1=0x10 B2=0x12 B3=0x14
+    // But also, the LED control registers (0x00 to 0x17) are also interleaved, so:
+    // A1-A4=0x00 A5-A8=0x01
+
+    uint8_t control_register = led.v / 8;
+    uint8_t bit_value        = led.v % 8;
+
+    if (value) {
+        driver_buffers[led.driver].led_control_buffer[control_register] |= (1 << bit_value);
+    } else {
+        driver_buffers[led.driver].led_control_buffer[control_register] &= ~(1 << bit_value);
+    }
+
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
+}
+
+void is31fl3736_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3736_select_page(index, IS31FL3736_COMMAND_PWM);
+
+        is31fl3736_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3736_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        is31fl3736_select_page(index, IS31FL3736_COMMAND_LED_CONTROL);
+
+        for (uint8_t i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3736_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
+        }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
+    }
+}
+
+void is31fl3736_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3736_DRIVER_COUNT; i++) {
+        is31fl3736_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3736-mono.h b/drivers/led/issi/is31fl3736-mono.h
new file mode 100644
index 00000000000..91c2e0420b9
--- /dev/null
+++ b/drivers/led/issi/is31fl3736-mono.h
@@ -0,0 +1,371 @@
+/* Copyright 2018 Jason Williams (Wilba)
+ * Copyright 2021 Doni Crosby
+ *
+ * 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"
+#include "util.h"
+
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef ISSI_TIMEOUT
+#    define IS31FL3736_I2C_TIMEOUT ISSI_TIMEOUT
+#endif
+#ifdef ISSI_PERSISTENCE
+#    define IS31FL3736_I2C_PERSISTENCE ISSI_PERSISTENCE
+#endif
+#ifdef ISSI_SWPULLUP
+#    define IS31FL3736_SW_PULLUP ISSI_SWPULLUP
+#endif
+#ifdef ISSI_CSPULLUP
+#    define IS31FL3736_CS_PULLDOWN ISSI_CSPULLUP
+#endif
+#ifdef ISSI_GLOBALCURRENT
+#    define IS31FL3736_GLOBAL_CURRENT ISSI_GLOBALCURRENT
+#endif
+
+#define is31_led is31fl3736_led_t
+#define g_is31_leds g_is31fl3736_leds
+
+#define PUR_0R IS31FL3736_PUR_0_OHM
+#define PUR_05KR IS31FL3736_PUR_05K_OHM
+#define PUR_1KR IS31FL3736_PUR_1K_OHM
+#define PUR_2KR IS31FL3736_PUR_2K_OHM
+#define PUR_4KR IS31FL3736_PUR_4K_OHM
+#define PUR_8KR IS31FL3736_PUR_8K_OHM
+#define PUR_16KR IS31FL3736_PUR_16K_OHM
+#define PUR_32KR IS31FL3736_PUR_32K_OHM
+// ========
+
+#define IS31FL3736_REG_INTERRUPT_MASK 0xF0
+#define IS31FL3736_REG_INTERRUPT_STATUS 0xF1
+
+#define IS31FL3736_REG_COMMAND 0xFD
+
+#define IS31FL3736_COMMAND_LED_CONTROL 0x00
+#define IS31FL3736_COMMAND_PWM 0x01
+#define IS31FL3736_COMMAND_AUTO_BREATH 0x02
+#define IS31FL3736_COMMAND_FUNCTION 0x03
+
+#define IS31FL3736_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3736_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3736_FUNCTION_REG_SW_PULLUP 0x0F
+#define IS31FL3736_FUNCTION_REG_CS_PULLDOWN 0x10
+#define IS31FL3736_FUNCTION_REG_RESET 0x11
+
+#define IS31FL3736_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3736_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3736_I2C_ADDRESS_GND_GND 0x50
+#define IS31FL3736_I2C_ADDRESS_GND_SCL 0x51
+#define IS31FL3736_I2C_ADDRESS_GND_SDA 0x52
+#define IS31FL3736_I2C_ADDRESS_GND_VCC 0x53
+#define IS31FL3736_I2C_ADDRESS_SCL_GND 0x54
+#define IS31FL3736_I2C_ADDRESS_SCL_SCL 0x55
+#define IS31FL3736_I2C_ADDRESS_SCL_SDA 0x56
+#define IS31FL3736_I2C_ADDRESS_SCL_VCC 0x57
+#define IS31FL3736_I2C_ADDRESS_SDA_GND 0x58
+#define IS31FL3736_I2C_ADDRESS_SDA_SCL 0x59
+#define IS31FL3736_I2C_ADDRESS_SDA_SDA 0x5A
+#define IS31FL3736_I2C_ADDRESS_SDA_VCC 0x5B
+#define IS31FL3736_I2C_ADDRESS_VCC_GND 0x5C
+#define IS31FL3736_I2C_ADDRESS_VCC_SCL 0x5D
+#define IS31FL3736_I2C_ADDRESS_VCC_SDA 0x5E
+#define IS31FL3736_I2C_ADDRESS_VCC_VCC 0x5F
+
+#if defined(LED_MATRIX_IS31FL3736)
+#    define IS31FL3736_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3736_I2C_ADDRESS_4)
+#    define IS31FL3736_DRIVER_COUNT 4
+#elif defined(IS31FL3736_I2C_ADDRESS_3)
+#    define IS31FL3736_DRIVER_COUNT 3
+#elif defined(IS31FL3736_I2C_ADDRESS_2)
+#    define IS31FL3736_DRIVER_COUNT 2
+#elif defined(IS31FL3736_I2C_ADDRESS_1)
+#    define IS31FL3736_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3736_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3736_led_t;
+
+extern const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT];
+
+void is31fl3736_init_drivers(void);
+void is31fl3736_init(uint8_t index);
+void is31fl3736_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3736_select_page(uint8_t index, uint8_t page);
+
+void is31fl3736_set_value(int index, uint8_t value);
+void is31fl3736_set_value_all(uint8_t value);
+
+void is31fl3736_set_led_control_register(uint8_t index, bool value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void is31fl3736_update_pwm_buffers(uint8_t index);
+void is31fl3736_update_led_control_registers(uint8_t index);
+
+void is31fl3736_flush(void);
+
+#define IS31FL3736_PDR_0_OHM 0b000   // No pull-down resistor
+#define IS31FL3736_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3736_PDR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3736_PDR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3736_PDR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3736_PDR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3736_PDR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3736_PDR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3736_PUR_0_OHM 0b000   // No pull-up resistor
+#define IS31FL3736_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3736_PUR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3736_PUR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3736_PUR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3736_PUR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3736_PUR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3736_PUR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3736_PWM_FREQUENCY_8K4_HZ 0b000
+#define IS31FL3736_PWM_FREQUENCY_4K2_HZ 0b001
+#define IS31FL3736_PWM_FREQUENCY_26K7_HZ 0b010
+#define IS31FL3736_PWM_FREQUENCY_2K1_HZ 0b011
+#define IS31FL3736_PWM_FREQUENCY_1K05_HZ 0b100
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x02
+#define SW1_CS3 0x04
+#define SW1_CS4 0x06
+#define SW1_CS5 0x08
+#define SW1_CS6 0x0A
+#define SW1_CS7 0x0C
+#define SW1_CS8 0x0E
+
+#define SW2_CS1 0x10
+#define SW2_CS2 0x12
+#define SW2_CS3 0x14
+#define SW2_CS4 0x16
+#define SW2_CS5 0x18
+#define SW2_CS6 0x1A
+#define SW2_CS7 0x1C
+#define SW2_CS8 0x1E
+
+#define SW3_CS1 0x20
+#define SW3_CS2 0x22
+#define SW3_CS3 0x24
+#define SW3_CS4 0x26
+#define SW3_CS5 0x28
+#define SW3_CS6 0x2A
+#define SW3_CS7 0x2C
+#define SW3_CS8 0x2E
+
+#define SW4_CS1 0x30
+#define SW4_CS2 0x32
+#define SW4_CS3 0x34
+#define SW4_CS4 0x36
+#define SW4_CS5 0x38
+#define SW4_CS6 0x3A
+#define SW4_CS7 0x3C
+#define SW4_CS8 0x3E
+
+#define SW5_CS1 0x40
+#define SW5_CS2 0x42
+#define SW5_CS3 0x44
+#define SW5_CS4 0x46
+#define SW5_CS5 0x48
+#define SW5_CS6 0x4A
+#define SW5_CS7 0x4C
+#define SW5_CS8 0x4E
+
+#define SW6_CS1 0x50
+#define SW6_CS2 0x52
+#define SW6_CS3 0x54
+#define SW6_CS4 0x56
+#define SW6_CS5 0x58
+#define SW6_CS6 0x5A
+#define SW6_CS7 0x5C
+#define SW6_CS8 0x5E
+
+#define SW7_CS1 0x60
+#define SW7_CS2 0x62
+#define SW7_CS3 0x64
+#define SW7_CS4 0x66
+#define SW7_CS5 0x68
+#define SW7_CS6 0x6A
+#define SW7_CS7 0x6C
+#define SW7_CS8 0x6E
+
+#define SW8_CS1 0x70
+#define SW8_CS2 0x72
+#define SW8_CS3 0x74
+#define SW8_CS4 0x76
+#define SW8_CS5 0x78
+#define SW8_CS6 0x7A
+#define SW8_CS7 0x7C
+#define SW8_CS8 0x7E
+
+#define SW9_CS1 0x80
+#define SW9_CS2 0x82
+#define SW9_CS3 0x84
+#define SW9_CS4 0x86
+#define SW9_CS5 0x88
+#define SW9_CS6 0x8A
+#define SW9_CS7 0x8C
+#define SW9_CS8 0x8E
+
+#define SW10_CS1 0x90
+#define SW10_CS2 0x92
+#define SW10_CS3 0x94
+#define SW10_CS4 0x96
+#define SW10_CS5 0x98
+#define SW10_CS6 0x9A
+#define SW10_CS7 0x9C
+#define SW10_CS8 0x9E
+
+#define SW11_CS1 0xA0
+#define SW11_CS2 0xA2
+#define SW11_CS3 0xA4
+#define SW11_CS4 0xA6
+#define SW11_CS5 0xA8
+#define SW11_CS6 0xAA
+#define SW11_CS7 0xAC
+#define SW11_CS8 0xAE
+
+#define SW12_CS1 0xB0
+#define SW12_CS2 0xB2
+#define SW12_CS3 0xB4
+#define SW12_CS4 0xB6
+#define SW12_CS5 0xB8
+#define SW12_CS6 0xBA
+#define SW12_CS7 0xBC
+#define SW12_CS8 0xBE
+
+// DEPRECATED - DO NOT USE
+
+#define A_1 SW1_CS1
+#define A_2 SW1_CS2
+#define A_3 SW1_CS3
+#define A_4 SW1_CS4
+#define A_5 SW1_CS5
+#define A_6 SW1_CS6
+#define A_7 SW1_CS7
+#define A_8 SW1_CS8
+
+#define B_1 SW2_CS1
+#define B_2 SW2_CS2
+#define B_3 SW2_CS3
+#define B_4 SW2_CS4
+#define B_5 SW2_CS5
+#define B_6 SW2_CS6
+#define B_7 SW2_CS7
+#define B_8 SW2_CS8
+
+#define C_1 SW3_CS1
+#define C_2 SW3_CS2
+#define C_3 SW3_CS3
+#define C_4 SW3_CS4
+#define C_5 SW3_CS5
+#define C_6 SW3_CS6
+#define C_7 SW3_CS7
+#define C_8 SW3_CS8
+
+#define D_1 SW4_CS1
+#define D_2 SW4_CS2
+#define D_3 SW4_CS3
+#define D_4 SW4_CS4
+#define D_5 SW4_CS5
+#define D_6 SW4_CS6
+#define D_7 SW4_CS7
+#define D_8 SW4_CS8
+
+#define E_1 SW5_CS1
+#define E_2 SW5_CS2
+#define E_3 SW5_CS3
+#define E_4 SW5_CS4
+#define E_5 SW5_CS5
+#define E_6 SW5_CS6
+#define E_7 SW5_CS7
+#define E_8 SW5_CS8
+
+#define F_1 SW6_CS1
+#define F_2 SW6_CS2
+#define F_3 SW6_CS3
+#define F_4 SW6_CS4
+#define F_5 SW6_CS5
+#define F_6 SW6_CS6
+#define F_7 SW6_CS7
+#define F_8 SW6_CS8
+
+#define G_1 SW7_CS1
+#define G_2 SW7_CS2
+#define G_3 SW7_CS3
+#define G_4 SW7_CS4
+#define G_5 SW7_CS5
+#define G_6 SW7_CS6
+#define G_7 SW7_CS7
+#define G_8 SW7_CS8
+
+#define H_1 SW8_CS1
+#define H_2 SW8_CS2
+#define H_3 SW8_CS3
+#define H_4 SW8_CS4
+#define H_5 SW8_CS5
+#define H_6 SW8_CS6
+#define H_7 SW8_CS7
+#define H_8 SW8_CS8
+
+#define I_1 SW9_CS1
+#define I_2 SW9_CS2
+#define I_3 SW9_CS3
+#define I_4 SW9_CS4
+#define I_5 SW9_CS5
+#define I_6 SW9_CS6
+#define I_7 SW9_CS7
+#define I_8 SW9_CS8
+
+#define J_1 SW10_CS1
+#define J_2 SW10_CS2
+#define J_3 SW10_CS3
+#define J_4 SW10_CS4
+#define J_5 SW10_CS5
+#define J_6 SW10_CS6
+#define J_7 SW10_CS7
+#define J_8 SW10_CS8
+
+#define K_1 SW11_CS1
+#define K_2 SW11_CS2
+#define K_3 SW11_CS3
+#define K_4 SW11_CS4
+#define K_5 SW11_CS5
+#define K_6 SW11_CS6
+#define K_7 SW11_CS7
+#define K_8 SW11_CS8
+
+#define L_1 SW12_CS1
+#define L_2 SW12_CS2
+#define L_3 SW12_CS3
+#define L_4 SW12_CS4
+#define L_5 SW12_CS5
+#define L_6 SW12_CS6
+#define L_7 SW12_CS7
+#define L_8 SW12_CS8
diff --git a/drivers/led/issi/is31fl3736-simple.c b/drivers/led/issi/is31fl3736-simple.c
deleted file mode 100644
index e1cce3c48a3..00000000000
--- a/drivers/led/issi/is31fl3736-simple.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Doni Crosby
- *
- * 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 "is31fl3736-simple.h"
-#include <string.h>
-#include "i2c_master.h"
-#include "wait.h"
-
-#define IS31FL3736_PWM_REGISTER_COUNT 192 // actually 96
-#define IS31FL3736_LED_CONTROL_REGISTER_COUNT 24
-
-#ifndef IS31FL3736_I2C_TIMEOUT
-#    define IS31FL3736_I2C_TIMEOUT 100
-#endif
-
-#ifndef IS31FL3736_I2C_PERSISTENCE
-#    define IS31FL3736_I2C_PERSISTENCE 0
-#endif
-
-#ifndef IS31FL3736_PWM_FREQUENCY
-#    define IS31FL3736_PWM_FREQUENCY IS31FL3736_PWM_FREQUENCY_8K4_HZ // PFS - IS31FL3736B only
-#endif
-
-#ifndef IS31FL3736_SW_PULLUP
-#    define IS31FL3736_SW_PULLUP IS31FL3736_PUR_0_OHM
-#endif
-
-#ifndef IS31FL3736_CS_PULLDOWN
-#    define IS31FL3736_CS_PULLDOWN IS31FL3736_PDR_0_OHM
-#endif
-
-#ifndef IS31FL3736_GLOBAL_CURRENT
-#    define IS31FL3736_GLOBAL_CURRENT 0xFF
-#endif
-
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
-
-// These buffers match the IS31FL3736 PWM registers.
-// The control buffers match the PG0 LED On/Off registers.
-// Storing them like this is optimal for I2C transfers to the registers.
-// We could optimize this and take out the unused registers from these
-// buffers and the transfers in is31fl3736_write_pwm_buffer() but it's
-// probably not worth the extra complexity.
-uint8_t g_pwm_buffer[IS31FL3736_DRIVER_COUNT][IS31FL3736_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3736_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[IS31FL3736_DRIVER_COUNT][IS31FL3736_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[IS31FL3736_DRIVER_COUNT]                        = {false};
-
-void is31fl3736_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
-#if IS31FL3736_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < IS31FL3736_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT) == 0) break;
-    }
-#else
-    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT);
-#endif
-}
-
-void is31fl3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes PG1 is already selected
-
-    // transmit PWM registers in 12 transfers of 16 bytes
-    // g_twi_transfer_buffer[] is 20 bytes
-
-    // iterate over the pwm_buffer contents at 16 byte intervals
-    for (int i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i += 16) {
-        g_twi_transfer_buffer[0] = i;
-        // copy the data from i to i+15
-        // device will auto-increment register for data after the first byte
-        // thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);
-
-#if IS31FL3736_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3736_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT) == 0) break;
-        }
-#else
-        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT);
-#endif
-    }
-}
-
-void is31fl3736_init_drivers(void) {
-    i2c_init();
-
-    is31fl3736_init(IS31FL3736_I2C_ADDRESS_1);
-#if defined(IS31FL3736_I2C_ADDRESS_2)
-    is31fl3736_init(IS31FL3736_I2C_ADDRESS_2);
-#    if defined(IS31FL3736_I2C_ADDRESS_3)
-    is31fl3736_init(IS31FL3736_I2C_ADDRESS_3);
-#        if defined(IS31FL3736_I2C_ADDRESS_4)
-    is31fl3736_init(IS31FL3736_I2C_ADDRESS_4);
-#        endif
-#    endif
-#endif
-
-    for (int i = 0; i < IS31FL3736_LED_COUNT; i++) {
-        is31fl3736_set_led_control_register(i, true);
-    }
-
-    is31fl3736_update_led_control_registers(IS31FL3736_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3736_I2C_ADDRESS_2)
-    is31fl3736_update_led_control_registers(IS31FL3736_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3736_I2C_ADDRESS_3)
-    is31fl3736_update_led_control_registers(IS31FL3736_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3736_I2C_ADDRESS_4)
-    is31fl3736_update_led_control_registers(IS31FL3736_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
-
-void is31fl3736_init(uint8_t addr) {
-    // In order to avoid the LEDs being driven with garbage data
-    // in the LED driver's PWM registers, shutdown is enabled last.
-    // Set up the mode and other settings, clear the PWM registers,
-    // then disable software shutdown.
-
-    // Unlock the command register.
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG0
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_LED_CONTROL);
-    // Turn off all LEDs.
-    for (int i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3736_write_register(addr, i, 0x00);
-    }
-
-    // Unlock the command register.
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG1
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_PWM);
-    // Set PWM on all LEDs to 0
-    // No need to setup Breath registers to PWM as that is the default.
-    for (int i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i++) {
-        is31fl3736_write_register(addr, i, 0x00);
-    }
-
-    // Unlock the command register.
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG3
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_FUNCTION);
-    // Set de-ghost pull-up resistors (SWx)
-    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_SW_PULLUP, IS31FL3736_SW_PULLUP);
-    // Set de-ghost pull-down resistors (CSx)
-    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_CS_PULLDOWN, IS31FL3736_CS_PULLDOWN);
-    // Set global current to maximum.
-    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3736_GLOBAL_CURRENT);
-    // Disable software shutdown.
-    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_CONFIGURATION, ((IS31FL3736_PWM_FREQUENCY & 0b111) << 3) | 0x01);
-
-    // Wait 10ms to ensure the device has woken up.
-    wait_ms(10);
-}
-
-void is31fl3736_set_value(int index, uint8_t value) {
-    is31fl3736_led_t led;
-    if (index >= 0 && index < IS31FL3736_LED_COUNT) {
-        memcpy_P(&led, (&g_is31fl3736_leds[index]), sizeof(led));
-
-        if (g_pwm_buffer[led.driver][led.v] == value) {
-            return;
-        }
-        g_pwm_buffer[led.driver][led.v]          = value;
-        g_pwm_buffer_update_required[led.driver] = true;
-    }
-}
-
-void is31fl3736_set_value_all(uint8_t value) {
-    for (int i = 0; i < IS31FL3736_LED_COUNT; i++) {
-        is31fl3736_set_value(i, value);
-    }
-}
-
-void is31fl3736_set_led_control_register(uint8_t index, bool value) {
-    is31fl3736_led_t led;
-    memcpy_P(&led, (&g_is31fl3736_leds[index]), sizeof(led));
-
-    // The PWM register for a matrix position (0x00 to 0xBF) is interleaved, so:
-    // A1=0x00 A2=0x02 A3=0x04 A4=0x06 A5=0x08 A6=0x0A A7=0x0C A8=0x0E
-    // B1=0x10 B2=0x12 B3=0x14
-    // But also, the LED control registers (0x00 to 0x17) are also interleaved, so:
-    // A1-A4=0x00 A5-A8=0x01
-
-    uint8_t control_register = led.v / 8;
-    uint8_t bit_value        = led.v % 8;
-
-    if (value) {
-        g_led_control_registers[led.driver][control_register] |= (1 << bit_value);
-    } else {
-        g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value);
-    }
-
-    g_led_control_registers_update_required[led.driver] = true;
-}
-
-void is31fl3736_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG1
-        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_PWM);
-
-        is31fl3736_write_pwm_buffer(addr, g_pwm_buffer[index]);
-        g_pwm_buffer_update_required[index] = false;
-    }
-}
-
-void is31fl3736_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG0
-        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_LED_CONTROL);
-        for (int i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3736_write_register(addr, i, g_led_control_registers[index][i]);
-        }
-        g_led_control_registers_update_required[index] = false;
-    }
-}
-
-void is31fl3736_flush(void) {
-    is31fl3736_update_pwm_buffers(IS31FL3736_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3736_I2C_ADDRESS_2)
-    is31fl3736_update_pwm_buffers(IS31FL3736_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3736_I2C_ADDRESS_3)
-    is31fl3736_update_pwm_buffers(IS31FL3736_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3736_I2C_ADDRESS_4)
-    is31fl3736_update_pwm_buffers(IS31FL3736_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
diff --git a/drivers/led/issi/is31fl3736-simple.h b/drivers/led/issi/is31fl3736-simple.h
deleted file mode 100644
index a73a8725459..00000000000
--- a/drivers/led/issi/is31fl3736-simple.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Doni Crosby
- *
- * 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"
-#include "util.h"
-
-// ======== DEPRECATED DEFINES - DO NOT USE ========
-#ifdef ISSI_TIMEOUT
-#    define IS31FL3736_I2C_TIMEOUT ISSI_TIMEOUT
-#endif
-#ifdef ISSI_PERSISTENCE
-#    define IS31FL3736_I2C_PERSISTENCE ISSI_PERSISTENCE
-#endif
-#ifdef ISSI_SWPULLUP
-#    define IS31FL3736_SW_PULLUP ISSI_SWPULLUP
-#endif
-#ifdef ISSI_CSPULLUP
-#    define IS31FL3736_CS_PULLDOWN ISSI_CSPULLUP
-#endif
-#ifdef ISSI_GLOBALCURRENT
-#    define IS31FL3736_GLOBAL_CURRENT ISSI_GLOBALCURRENT
-#endif
-
-#define is31_led is31fl3736_led_t
-#define g_is31_leds g_is31fl3736_leds
-
-#define PUR_0R IS31FL3736_PUR_0_OHM
-#define PUR_05KR IS31FL3736_PUR_05K_OHM
-#define PUR_1KR IS31FL3736_PUR_1K_OHM
-#define PUR_2KR IS31FL3736_PUR_2K_OHM
-#define PUR_4KR IS31FL3736_PUR_4K_OHM
-#define PUR_8KR IS31FL3736_PUR_8K_OHM
-#define PUR_16KR IS31FL3736_PUR_16K_OHM
-#define PUR_32KR IS31FL3736_PUR_32K_OHM
-// ========
-
-#define IS31FL3736_REG_INTERRUPT_MASK 0xF0
-#define IS31FL3736_REG_INTERRUPT_STATUS 0xF1
-
-#define IS31FL3736_REG_COMMAND 0xFD
-
-#define IS31FL3736_COMMAND_LED_CONTROL 0x00
-#define IS31FL3736_COMMAND_PWM 0x01
-#define IS31FL3736_COMMAND_AUTO_BREATH 0x02
-#define IS31FL3736_COMMAND_FUNCTION 0x03
-
-#define IS31FL3736_FUNCTION_REG_CONFIGURATION 0x00
-#define IS31FL3736_FUNCTION_REG_GLOBAL_CURRENT 0x01
-#define IS31FL3736_FUNCTION_REG_SW_PULLUP 0x0F
-#define IS31FL3736_FUNCTION_REG_CS_PULLDOWN 0x10
-#define IS31FL3736_FUNCTION_REG_RESET 0x11
-
-#define IS31FL3736_REG_COMMAND_WRITE_LOCK 0xFE
-#define IS31FL3736_COMMAND_WRITE_LOCK_MAGIC 0xC5
-
-#define IS31FL3736_I2C_ADDRESS_GND_GND 0x50
-#define IS31FL3736_I2C_ADDRESS_GND_SCL 0x51
-#define IS31FL3736_I2C_ADDRESS_GND_SDA 0x52
-#define IS31FL3736_I2C_ADDRESS_GND_VCC 0x53
-#define IS31FL3736_I2C_ADDRESS_SCL_GND 0x54
-#define IS31FL3736_I2C_ADDRESS_SCL_SCL 0x55
-#define IS31FL3736_I2C_ADDRESS_SCL_SDA 0x56
-#define IS31FL3736_I2C_ADDRESS_SCL_VCC 0x57
-#define IS31FL3736_I2C_ADDRESS_SDA_GND 0x58
-#define IS31FL3736_I2C_ADDRESS_SDA_SCL 0x59
-#define IS31FL3736_I2C_ADDRESS_SDA_SDA 0x5A
-#define IS31FL3736_I2C_ADDRESS_SDA_VCC 0x5B
-#define IS31FL3736_I2C_ADDRESS_VCC_GND 0x5C
-#define IS31FL3736_I2C_ADDRESS_VCC_SCL 0x5D
-#define IS31FL3736_I2C_ADDRESS_VCC_SDA 0x5E
-#define IS31FL3736_I2C_ADDRESS_VCC_VCC 0x5F
-
-#if defined(LED_MATRIX_IS31FL3736)
-#    define IS31FL3736_LED_COUNT LED_MATRIX_LED_COUNT
-#endif
-
-#if defined(IS31FL3736_I2C_ADDRESS_4)
-#    define IS31FL3736_DRIVER_COUNT 4
-#elif defined(IS31FL3736_I2C_ADDRESS_3)
-#    define IS31FL3736_DRIVER_COUNT 3
-#elif defined(IS31FL3736_I2C_ADDRESS_2)
-#    define IS31FL3736_DRIVER_COUNT 2
-#elif defined(IS31FL3736_I2C_ADDRESS_1)
-#    define IS31FL3736_DRIVER_COUNT 1
-#endif
-
-typedef struct is31fl3736_led_t {
-    uint8_t driver : 2;
-    uint8_t v;
-} PACKED is31fl3736_led_t;
-
-extern const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT];
-
-void is31fl3736_init_drivers(void);
-void is31fl3736_init(uint8_t addr);
-void is31fl3736_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
-
-void is31fl3736_set_value(int index, uint8_t value);
-void is31fl3736_set_value_all(uint8_t value);
-
-void is31fl3736_set_led_control_register(uint8_t index, bool value);
-
-// This should not be called from an interrupt
-// (eg. from a timer interrupt).
-// Call this while idle (in between matrix scans).
-// If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3736_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3736_update_led_control_registers(uint8_t addr, uint8_t index);
-
-void is31fl3736_flush(void);
-
-#define IS31FL3736_PDR_0_OHM 0b000   // No pull-down resistor
-#define IS31FL3736_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
-#define IS31FL3736_PDR_1K_OHM 0b010  // 1 kOhm resistor
-#define IS31FL3736_PDR_2K_OHM 0b011  // 2 kOhm resistor
-#define IS31FL3736_PDR_4K_OHM 0b100  // 4 kOhm resistor
-#define IS31FL3736_PDR_8K_OHM 0b101  // 8 kOhm resistor
-#define IS31FL3736_PDR_16K_OHM 0b110 // 16 kOhm resistor
-#define IS31FL3736_PDR_32K_OHM 0b111 // 32 kOhm resistor
-
-#define IS31FL3736_PUR_0_OHM 0b000   // No pull-up resistor
-#define IS31FL3736_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
-#define IS31FL3736_PUR_1K_OHM 0b010  // 1 kOhm resistor
-#define IS31FL3736_PUR_2K_OHM 0b011  // 2 kOhm resistor
-#define IS31FL3736_PUR_4K_OHM 0b100  // 4 kOhm resistor
-#define IS31FL3736_PUR_8K_OHM 0b101  // 8 kOhm resistor
-#define IS31FL3736_PUR_16K_OHM 0b110 // 16 kOhm resistor
-#define IS31FL3736_PUR_32K_OHM 0b111 // 32 kOhm resistor
-
-#define IS31FL3736_PWM_FREQUENCY_8K4_HZ 0b000
-#define IS31FL3736_PWM_FREQUENCY_4K2_HZ 0b001
-#define IS31FL3736_PWM_FREQUENCY_26K7_HZ 0b010
-#define IS31FL3736_PWM_FREQUENCY_2K1_HZ 0b011
-#define IS31FL3736_PWM_FREQUENCY_1K05_HZ 0b100
-
-#define A_1 0x00
-#define A_2 0x02
-#define A_3 0x04
-#define A_4 0x06
-#define A_5 0x08
-#define A_6 0x0A
-#define A_7 0x0C
-#define A_8 0x0E
-
-#define B_1 0x10
-#define B_2 0x12
-#define B_3 0x14
-#define B_4 0x16
-#define B_5 0x18
-#define B_6 0x1A
-#define B_7 0x1C
-#define B_8 0x1E
-
-#define C_1 0x20
-#define C_2 0x22
-#define C_3 0x24
-#define C_4 0x26
-#define C_5 0x28
-#define C_6 0x2A
-#define C_7 0x2C
-#define C_8 0x2E
-
-#define D_1 0x30
-#define D_2 0x32
-#define D_3 0x34
-#define D_4 0x36
-#define D_5 0x38
-#define D_6 0x3A
-#define D_7 0x3C
-#define D_8 0x3E
-
-#define E_1 0x40
-#define E_2 0x42
-#define E_3 0x44
-#define E_4 0x46
-#define E_5 0x48
-#define E_6 0x4A
-#define E_7 0x4C
-#define E_8 0x4E
-
-#define F_1 0x50
-#define F_2 0x52
-#define F_3 0x54
-#define F_4 0x56
-#define F_5 0x58
-#define F_6 0x5A
-#define F_7 0x5C
-#define F_8 0x5E
-
-#define G_1 0x60
-#define G_2 0x62
-#define G_3 0x64
-#define G_4 0x66
-#define G_5 0x68
-#define G_6 0x6A
-#define G_7 0x6C
-#define G_8 0x6E
-
-#define H_1 0x70
-#define H_2 0x72
-#define H_3 0x74
-#define H_4 0x76
-#define H_5 0x78
-#define H_6 0x7A
-#define H_7 0x7C
-#define H_8 0x7E
-
-#define I_1 0x80
-#define I_2 0x82
-#define I_3 0x84
-#define I_4 0x86
-#define I_5 0x88
-#define I_6 0x8A
-#define I_7 0x8C
-#define I_8 0x8E
-
-#define J_1 0x90
-#define J_2 0x92
-#define J_3 0x94
-#define J_4 0x96
-#define J_5 0x98
-#define J_6 0x9A
-#define J_7 0x9C
-#define J_8 0x9E
-
-#define K_1 0xA0
-#define K_2 0xA2
-#define K_3 0xA4
-#define K_4 0xA6
-#define K_5 0xA8
-#define K_6 0xAA
-#define K_7 0xAC
-#define K_8 0xAE
-
-#define L_1 0xB0
-#define L_2 0xB2
-#define L_3 0xB4
-#define L_4 0xB6
-#define L_5 0xB8
-#define L_6 0xBA
-#define L_7 0xBC
-#define L_8 0xBE
diff --git a/drivers/led/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c
index 30ab796f3e3..3ab42e2f7c3 100644
--- a/drivers/led/issi/is31fl3736.c
+++ b/drivers/led/issi/is31fl3736.c
@@ -16,8 +16,8 @@
  */
 
 #include "is31fl3736.h"
-#include <string.h>
 #include "i2c_master.h"
+#include "gpio.h"
 #include "wait.h"
 
 #define IS31FL3736_PWM_REGISTER_COUNT 192 // actually 96
@@ -47,54 +47,66 @@
 #    define IS31FL3736_GLOBAL_CURRENT 0xFF
 #endif
 
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
+const uint8_t i2c_addresses[IS31FL3736_DRIVER_COUNT] = {
+    IS31FL3736_I2C_ADDRESS_1,
+#ifdef IS31FL3736_I2C_ADDRESS_2
+    IS31FL3736_I2C_ADDRESS_2,
+#    ifdef IS31FL3736_I2C_ADDRESS_3
+    IS31FL3736_I2C_ADDRESS_3,
+#        ifdef IS31FL3736_I2C_ADDRESS_4
+    IS31FL3736_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
 
 // These buffers match the IS31FL3736 PWM registers.
-// The control buffers match the PG0 LED On/Off registers.
+// The control buffers match the page 0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3736_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
-uint8_t g_pwm_buffer[IS31FL3736_DRIVER_COUNT][IS31FL3736_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3736_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[IS31FL3736_DRIVER_COUNT][IS31FL3736_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[IS31FL3736_DRIVER_COUNT]                        = {false};
-
-void is31fl3736_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
+typedef struct is31fl3736_driver_t {
+    uint8_t pwm_buffer[IS31FL3736_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3736_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3736_driver_t;
+
+is31fl3736_driver_t driver_buffers[IS31FL3736_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3736_write_register(uint8_t index, uint8_t reg, uint8_t data) {
 #if IS31FL3736_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3736_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT) == 0) break;
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3736_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3736_I2C_TIMEOUT);
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3736_I2C_TIMEOUT);
 #endif
 }
 
-void is31fl3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes PG1 is already selected
-
-    // transmit PWM registers in 12 transfers of 16 bytes
-    // g_twi_transfer_buffer[] is 20 bytes
+void is31fl3736_select_page(uint8_t index, uint8_t page) {
+    is31fl3736_write_register(index, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3736_write_register(index, IS31FL3736_REG_COMMAND, page);
+}
 
-    // iterate over the pwm_buffer contents at 16 byte intervals
-    for (int i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i += 16) {
-        g_twi_transfer_buffer[0] = i;
-        // copy the data from i to i+15
-        // device will auto-increment register for data after the first byte
-        // thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);
+void is31fl3736_write_pwm_buffer(uint8_t index) {
+    // Assumes page 1 is already selected.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
 
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i += 16) {
 #if IS31FL3736_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3736_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT) == 0) break;
+        for (uint8_t j = 0; j < IS31FL3736_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3736_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
 #else
-        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3736_I2C_TIMEOUT);
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3736_I2C_TIMEOUT);
 #endif
     }
 }
@@ -102,73 +114,55 @@ void is31fl3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
 void is31fl3736_init_drivers(void) {
     i2c_init();
 
-    is31fl3736_init(IS31FL3736_I2C_ADDRESS_1);
-#if defined(IS31FL3736_I2C_ADDRESS_2)
-    is31fl3736_init(IS31FL3736_I2C_ADDRESS_2);
-#    if defined(IS31FL3736_I2C_ADDRESS_3)
-    is31fl3736_init(IS31FL3736_I2C_ADDRESS_3);
-#        if defined(IS31FL3736_I2C_ADDRESS_4)
-    is31fl3736_init(IS31FL3736_I2C_ADDRESS_4);
-#        endif
-#    endif
+#if defined(IS31FL3736_SDB_PIN)
+    gpio_set_pin_output(IS31FL3736_SDB_PIN);
+    gpio_write_pin_high(IS31FL3736_SDB_PIN);
 #endif
 
+    for (uint8_t i = 0; i < IS31FL3736_DRIVER_COUNT; i++) {
+        is31fl3736_init(i);
+    }
+
     for (int i = 0; i < IS31FL3736_LED_COUNT; i++) {
         is31fl3736_set_led_control_register(i, true, true, true);
     }
 
-    is31fl3736_update_led_control_registers(IS31FL3736_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3736_I2C_ADDRESS_2)
-    is31fl3736_update_led_control_registers(IS31FL3736_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3736_I2C_ADDRESS_3)
-    is31fl3736_update_led_control_registers(IS31FL3736_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3736_I2C_ADDRESS_4)
-    is31fl3736_update_led_control_registers(IS31FL3736_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3736_DRIVER_COUNT; i++) {
+        is31fl3736_update_led_control_registers(i);
+    }
 }
 
-void is31fl3736_init(uint8_t addr) {
+void is31fl3736_init(uint8_t index) {
     // In order to avoid the LEDs being driven with garbage data
     // in the LED driver's PWM registers, shutdown is enabled last.
     // Set up the mode and other settings, clear the PWM registers,
     // then disable software shutdown.
 
-    // Unlock the command register.
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3736_select_page(index, IS31FL3736_COMMAND_LED_CONTROL);
 
-    // Select PG0
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_REG_LED_CONTROL);
     // Turn off all LEDs.
-    for (int i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3736_write_register(addr, i, 0x00);
+    for (uint8_t i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3736_write_register(index, i, 0x00);
     }
 
-    // Unlock the command register.
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITELOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3736_select_page(index, IS31FL3736_COMMAND_PWM);
 
-    // Select PG1
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_PWM);
     // Set PWM on all LEDs to 0
     // No need to setup Breath registers to PWM as that is the default.
-    for (int i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i++) {
-        is31fl3736_write_register(addr, i, 0x00);
+    for (uint8_t i = 0; i < IS31FL3736_PWM_REGISTER_COUNT; i++) {
+        is31fl3736_write_register(index, i, 0x00);
     }
 
-    // Unlock the command register.
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3736_select_page(index, IS31FL3736_COMMAND_FUNCTION);
 
-    // Select PG3
-    is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_FUNCTION);
     // Set de-ghost pull-up resistors (SWx)
-    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_SW_PULLUP, IS31FL3736_SW_PULLUP);
+    is31fl3736_write_register(index, IS31FL3736_FUNCTION_REG_SW_PULLUP, IS31FL3736_SW_PULLUP);
     // Set de-ghost pull-down resistors (CSx)
-    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_CS_PULLDOWN, IS31FL3736_CS_PULLDOWN);
+    is31fl3736_write_register(index, IS31FL3736_FUNCTION_REG_CS_PULLDOWN, IS31FL3736_CS_PULLDOWN);
     // Set global current to maximum.
-    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3736_GLOBAL_CURRENT);
+    is31fl3736_write_register(index, IS31FL3736_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3736_GLOBAL_CURRENT);
     // Disable software shutdown.
-    is31fl3736_write_register(addr, IS31FL3736_FUNCTION_REG_CONFIGURATION, ((IS31FL3736_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+    is31fl3736_write_register(index, IS31FL3736_FUNCTION_REG_CONFIGURATION, ((IS31FL3736_PWM_FREQUENCY & 0b111) << 3) | 0x01);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
@@ -176,16 +170,18 @@ void is31fl3736_init(uint8_t addr) {
 
 void is31fl3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31fl3736_led_t led;
+
     if (index >= 0 && index < IS31FL3736_LED_COUNT) {
         memcpy_P(&led, (&g_is31fl3736_leds[index]), sizeof(led));
 
-        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
             return;
         }
-        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;
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
     }
 }
 
@@ -214,56 +210,48 @@ void is31fl3736_set_led_control_register(uint8_t index, bool red, bool green, bo
     uint8_t bit_b = led.b % 8;
 
     if (red) {
-        g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] |= (1 << bit_r);
     } else {
-        g_led_control_registers[led.driver][control_register_r] &= ~(1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] &= ~(1 << bit_r);
     }
     if (green) {
-        g_led_control_registers[led.driver][control_register_g] |= (1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] |= (1 << bit_g);
     } else {
-        g_led_control_registers[led.driver][control_register_g] &= ~(1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] &= ~(1 << bit_g);
     }
     if (blue) {
-        g_led_control_registers[led.driver][control_register_b] |= (1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] |= (1 << bit_b);
     } else {
-        g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] &= ~(1 << bit_b);
     }
 
-    g_led_control_registers_update_required[led.driver] = true;
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
 }
 
-void is31fl3736_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG1
-        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_PWM);
+void is31fl3736_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3736_select_page(index, IS31FL3736_COMMAND_PWM);
+
+        is31fl3736_write_pwm_buffer(index);
 
-        is31fl3736_write_pwm_buffer(addr, g_pwm_buffer[index]);
-        g_pwm_buffer_update_required[index] = false;
+        driver_buffers[index].pwm_buffer_dirty = false;
     }
 }
 
-void is31fl3736_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG0
-        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND_WRITE_LOCK, IS31FL3736_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3736_write_register(addr, IS31FL3736_REG_COMMAND, IS31FL3736_COMMAND_LED_CONTROL);
-        for (int i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3736_write_register(addr, i, g_led_control_registers[index][i]);
+void is31fl3736_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        is31fl3736_select_page(index, IS31FL3736_COMMAND_LED_CONTROL);
+
+        for (uint8_t i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3736_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
         }
-        g_led_control_registers_update_required[index] = false;
+
+        driver_buffers[index].led_control_buffer_dirty = false;
     }
 }
 
 void is31fl3736_flush(void) {
-    is31fl3736_update_pwm_buffers(IS31FL3736_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3736_I2C_ADDRESS_2)
-    is31fl3736_update_pwm_buffers(IS31FL3736_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3736_I2C_ADDRESS_3)
-    is31fl3736_update_pwm_buffers(IS31FL3736_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3736_I2C_ADDRESS_4)
-    is31fl3736_update_pwm_buffers(IS31FL3736_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3736_DRIVER_COUNT; i++) {
+        is31fl3736_update_pwm_buffers(i);
+    }
 }
diff --git a/drivers/led/issi/is31fl3736.h b/drivers/led/issi/is31fl3736.h
index a5710d7ed41..dae7b3c8121 100644
--- a/drivers/led/issi/is31fl3736.h
+++ b/drivers/led/issi/is31fl3736.h
@@ -124,9 +124,9 @@ typedef struct is31fl3736_led_t {
 extern const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT];
 
 void is31fl3736_init_drivers(void);
-void is31fl3736_init(uint8_t addr);
-void is31fl3736_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+void is31fl3736_init(uint8_t index);
+void is31fl3736_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3736_select_page(uint8_t index, uint8_t page);
 
 void is31fl3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void is31fl3736_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
@@ -137,8 +137,8 @@ void is31fl3736_set_led_control_register(uint8_t index, bool red, bool green, bo
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3736_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3736_update_led_control_registers(uint8_t addr, uint8_t index);
+void is31fl3736_update_pwm_buffers(uint8_t index);
+void is31fl3736_update_led_control_registers(uint8_t index);
 
 void is31fl3736_flush(void);
 
@@ -166,110 +166,110 @@ void is31fl3736_flush(void);
 #define IS31FL3736_PWM_FREQUENCY_2K1_HZ 0b011
 #define IS31FL3736_PWM_FREQUENCY_1K05_HZ 0b100
 
-#define A_1 0x00
-#define A_2 0x02
-#define A_3 0x04
-#define A_4 0x06
-#define A_5 0x08
-#define A_6 0x0A
-#define A_7 0x0C
-#define A_8 0x0E
-
-#define B_1 0x10
-#define B_2 0x12
-#define B_3 0x14
-#define B_4 0x16
-#define B_5 0x18
-#define B_6 0x1A
-#define B_7 0x1C
-#define B_8 0x1E
-
-#define C_1 0x20
-#define C_2 0x22
-#define C_3 0x24
-#define C_4 0x26
-#define C_5 0x28
-#define C_6 0x2A
-#define C_7 0x2C
-#define C_8 0x2E
-
-#define D_1 0x30
-#define D_2 0x32
-#define D_3 0x34
-#define D_4 0x36
-#define D_5 0x38
-#define D_6 0x3A
-#define D_7 0x3C
-#define D_8 0x3E
-
-#define E_1 0x40
-#define E_2 0x42
-#define E_3 0x44
-#define E_4 0x46
-#define E_5 0x48
-#define E_6 0x4A
-#define E_7 0x4C
-#define E_8 0x4E
-
-#define F_1 0x50
-#define F_2 0x52
-#define F_3 0x54
-#define F_4 0x56
-#define F_5 0x58
-#define F_6 0x5A
-#define F_7 0x5C
-#define F_8 0x5E
-
-#define G_1 0x60
-#define G_2 0x62
-#define G_3 0x64
-#define G_4 0x66
-#define G_5 0x68
-#define G_6 0x6A
-#define G_7 0x6C
-#define G_8 0x6E
-
-#define H_1 0x70
-#define H_2 0x72
-#define H_3 0x74
-#define H_4 0x76
-#define H_5 0x78
-#define H_6 0x7A
-#define H_7 0x7C
-#define H_8 0x7E
-
-#define I_1 0x80
-#define I_2 0x82
-#define I_3 0x84
-#define I_4 0x86
-#define I_5 0x88
-#define I_6 0x8A
-#define I_7 0x8C
-#define I_8 0x8E
-
-#define J_1 0x90
-#define J_2 0x92
-#define J_3 0x94
-#define J_4 0x96
-#define J_5 0x98
-#define J_6 0x9A
-#define J_7 0x9C
-#define J_8 0x9E
-
-#define K_1 0xA0
-#define K_2 0xA2
-#define K_3 0xA4
-#define K_4 0xA6
-#define K_5 0xA8
-#define K_6 0xAA
-#define K_7 0xAC
-#define K_8 0xAE
-
-#define L_1 0xB0
-#define L_2 0xB2
-#define L_3 0xB4
-#define L_4 0xB6
-#define L_5 0xB8
-#define L_6 0xBA
-#define L_7 0xBC
-#define L_8 0xBE
+#define SW1_CS1 0x00
+#define SW1_CS2 0x02
+#define SW1_CS3 0x04
+#define SW1_CS4 0x06
+#define SW1_CS5 0x08
+#define SW1_CS6 0x0A
+#define SW1_CS7 0x0C
+#define SW1_CS8 0x0E
+
+#define SW2_CS1 0x10
+#define SW2_CS2 0x12
+#define SW2_CS3 0x14
+#define SW2_CS4 0x16
+#define SW2_CS5 0x18
+#define SW2_CS6 0x1A
+#define SW2_CS7 0x1C
+#define SW2_CS8 0x1E
+
+#define SW3_CS1 0x20
+#define SW3_CS2 0x22
+#define SW3_CS3 0x24
+#define SW3_CS4 0x26
+#define SW3_CS5 0x28
+#define SW3_CS6 0x2A
+#define SW3_CS7 0x2C
+#define SW3_CS8 0x2E
+
+#define SW4_CS1 0x30
+#define SW4_CS2 0x32
+#define SW4_CS3 0x34
+#define SW4_CS4 0x36
+#define SW4_CS5 0x38
+#define SW4_CS6 0x3A
+#define SW4_CS7 0x3C
+#define SW4_CS8 0x3E
+
+#define SW5_CS1 0x40
+#define SW5_CS2 0x42
+#define SW5_CS3 0x44
+#define SW5_CS4 0x46
+#define SW5_CS5 0x48
+#define SW5_CS6 0x4A
+#define SW5_CS7 0x4C
+#define SW5_CS8 0x4E
+
+#define SW6_CS1 0x50
+#define SW6_CS2 0x52
+#define SW6_CS3 0x54
+#define SW6_CS4 0x56
+#define SW6_CS5 0x58
+#define SW6_CS6 0x5A
+#define SW6_CS7 0x5C
+#define SW6_CS8 0x5E
+
+#define SW7_CS1 0x60
+#define SW7_CS2 0x62
+#define SW7_CS3 0x64
+#define SW7_CS4 0x66
+#define SW7_CS5 0x68
+#define SW7_CS6 0x6A
+#define SW7_CS7 0x6C
+#define SW7_CS8 0x6E
+
+#define SW8_CS1 0x70
+#define SW8_CS2 0x72
+#define SW8_CS3 0x74
+#define SW8_CS4 0x76
+#define SW8_CS5 0x78
+#define SW8_CS6 0x7A
+#define SW8_CS7 0x7C
+#define SW8_CS8 0x7E
+
+#define SW9_CS1 0x80
+#define SW9_CS2 0x82
+#define SW9_CS3 0x84
+#define SW9_CS4 0x86
+#define SW9_CS5 0x88
+#define SW9_CS6 0x8A
+#define SW9_CS7 0x8C
+#define SW9_CS8 0x8E
+
+#define SW10_CS1 0x90
+#define SW10_CS2 0x92
+#define SW10_CS3 0x94
+#define SW10_CS4 0x96
+#define SW10_CS5 0x98
+#define SW10_CS6 0x9A
+#define SW10_CS7 0x9C
+#define SW10_CS8 0x9E
+
+#define SW11_CS1 0xA0
+#define SW11_CS2 0xA2
+#define SW11_CS3 0xA4
+#define SW11_CS4 0xA6
+#define SW11_CS5 0xA8
+#define SW11_CS6 0xAA
+#define SW11_CS7 0xAC
+#define SW11_CS8 0xAE
+
+#define SW12_CS1 0xB0
+#define SW12_CS2 0xB2
+#define SW12_CS3 0xB4
+#define SW12_CS4 0xB6
+#define SW12_CS5 0xB8
+#define SW12_CS6 0xBA
+#define SW12_CS7 0xBC
+#define SW12_CS8 0xBE
diff --git a/drivers/led/issi/is31fl3737-mono.c b/drivers/led/issi/is31fl3737-mono.c
new file mode 100644
index 00000000000..7b2e5a35763
--- /dev/null
+++ b/drivers/led/issi/is31fl3737-mono.c
@@ -0,0 +1,236 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2021 Doni Crosby
+ *
+ * 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 "is31fl3737-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3737_PWM_REGISTER_COUNT 192 // actually 144
+#define IS31FL3737_LED_CONTROL_REGISTER_COUNT 24
+
+#ifndef IS31FL3737_I2C_TIMEOUT
+#    define IS31FL3737_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3737_I2C_PERSISTENCE
+#    define IS31FL3737_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3737_PWM_FREQUENCY
+#    define IS31FL3737_PWM_FREQUENCY IS31FL3737_PWM_FREQUENCY_8K4_HZ // PFS - IS31FL3737B only
+#endif
+
+#ifndef IS31FL3737_SW_PULLUP
+#    define IS31FL3737_SW_PULLUP IS31FL3737_PUR_0_OHM
+#endif
+
+#ifndef IS31FL3737_CS_PULLDOWN
+#    define IS31FL3737_CS_PULLDOWN IS31FL3737_PDR_0_OHM
+#endif
+
+#ifndef IS31FL3737_GLOBAL_CURRENT
+#    define IS31FL3737_GLOBAL_CURRENT 0xFF
+#endif
+
+const uint8_t i2c_addresses[IS31FL3737_DRIVER_COUNT] = {
+    IS31FL3737_I2C_ADDRESS_1,
+#ifdef IS31FL3737_I2C_ADDRESS_2
+    IS31FL3737_I2C_ADDRESS_2,
+#    ifdef IS31FL3737_I2C_ADDRESS_3
+    IS31FL3737_I2C_ADDRESS_3,
+#        ifdef IS31FL3737_I2C_ADDRESS_4
+    IS31FL3737_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+// These buffers match the IS31FL3737 PWM registers.
+// The control buffers match the page 0 LED On/Off registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in is31fl3737_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+typedef struct is31fl3737_driver_t {
+    uint8_t pwm_buffer[IS31FL3737_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3737_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3737_driver_t;
+
+is31fl3737_driver_t driver_buffers[IS31FL3737_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3737_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3737_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3737_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3737_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3737_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3737_select_page(uint8_t index, uint8_t page) {
+    is31fl3737_write_register(index, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3737_write_register(index, IS31FL3737_REG_COMMAND, page);
+}
+
+void is31fl3737_write_pwm_buffer(uint8_t index) {
+    // Assumes page 1 is already selected.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
+
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i += 16) {
+#if IS31FL3737_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3737_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3737_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3737_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3737_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3737_SDB_PIN)
+    gpio_set_pin_output(IS31FL3737_SDB_PIN);
+    gpio_write_pin_high(IS31FL3737_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3737_DRIVER_COUNT; i++) {
+        is31fl3737_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3737_LED_COUNT; i++) {
+        is31fl3737_set_led_control_register(i, true);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3737_DRIVER_COUNT; i++) {
+        is31fl3737_update_led_control_registers(i);
+    }
+}
+
+void is31fl3737_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3737_select_page(index, IS31FL3737_COMMAND_LED_CONTROL);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3737_write_register(index, i, 0x00);
+    }
+
+    is31fl3737_select_page(index, IS31FL3737_COMMAND_PWM);
+
+    // Set PWM on all LEDs to 0
+    // No need to setup Breath registers to PWM as that is the default.
+    for (uint8_t i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i++) {
+        is31fl3737_write_register(index, i, 0x00);
+    }
+
+    is31fl3737_select_page(index, IS31FL3737_COMMAND_FUNCTION);
+
+    // Set de-ghost pull-up resistors (SWx)
+    is31fl3737_write_register(index, IS31FL3737_FUNCTION_REG_SW_PULLUP, IS31FL3737_SW_PULLUP);
+    // Set de-ghost pull-down resistors (CSx)
+    is31fl3737_write_register(index, IS31FL3737_FUNCTION_REG_CS_PULLDOWN, IS31FL3737_CS_PULLDOWN);
+    // Set global current to maximum.
+    is31fl3737_write_register(index, IS31FL3737_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3737_GLOBAL_CURRENT);
+    // Disable software shutdown.
+    is31fl3737_write_register(index, IS31FL3737_FUNCTION_REG_CONFIGURATION, ((IS31FL3737_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3737_set_value(int index, uint8_t value) {
+    is31fl3737_led_t led;
+
+    if (index >= 0 && index < IS31FL3737_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3737_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3737_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3737_LED_COUNT; i++) {
+        is31fl3737_set_value(i, value);
+    }
+}
+
+void is31fl3737_set_led_control_register(uint8_t index, bool value) {
+    is31fl3737_led_t led;
+    memcpy_P(&led, (&g_is31fl3737_leds[index]), sizeof(led));
+
+    uint8_t control_register = led.v / 8;
+    uint8_t bit_value        = led.v % 8;
+
+    if (value) {
+        driver_buffers[led.driver].led_control_buffer[control_register] |= (1 << bit_value);
+    } else {
+        driver_buffers[led.driver].led_control_buffer[control_register] &= ~(1 << bit_value);
+    }
+
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
+}
+
+void is31fl3737_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3737_select_page(index, IS31FL3737_COMMAND_PWM);
+
+        is31fl3737_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3737_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        is31fl3737_select_page(index, IS31FL3737_COMMAND_LED_CONTROL);
+
+        for (uint8_t i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3737_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
+        }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
+    }
+}
+
+void is31fl3737_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3737_DRIVER_COUNT; i++) {
+        is31fl3737_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3737-mono.h b/drivers/led/issi/is31fl3737-mono.h
new file mode 100644
index 00000000000..99151c1e7a7
--- /dev/null
+++ b/drivers/led/issi/is31fl3737-mono.h
@@ -0,0 +1,299 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2021 Doni Crosby
+ *
+ * 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"
+#include "util.h"
+
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef ISSI_TIMEOUT
+#    define IS31FL3737_I2C_TIMEOUT ISSI_TIMEOUT
+#endif
+#ifdef ISSI_PERSISTENCE
+#    define IS31FL3737_I2C_PERSISTENCE ISSI_PERSISTENCE
+#endif
+#ifdef ISSI_PWM_FREQUENCY
+#    define IS31FL3737_PWM_FREQUENCY ISSI_PWM_FREQUENCY
+#endif
+#ifdef ISSI_SWPULLUP
+#    define IS31FL3737_SW_PULLUP ISSI_SWPULLUP
+#endif
+#ifdef ISSI_CSPULLUP
+#    define IS31FL3737_CS_PULLDOWN ISSI_CSPULLUP
+#endif
+#ifdef ISSI_GLOBALCURRENT
+#    define IS31FL3737_GLOBAL_CURRENT ISSI_GLOBALCURRENT
+#endif
+
+#define PUR_0R IS31FL3737_PUR_0_OHM
+#define PUR_05KR IS31FL3737_PUR_0K5_OHM
+#define PUR_1KR IS31FL3737_PUR_1K_OHM
+#define PUR_2KR IS31FL3737_PUR_2K_OHM
+#define PUR_4KR IS31FL3737_PUR_4K_OHM
+#define PUR_8KR IS31FL3737_PUR_8K_OHM
+#define PUR_16KR IS31FL3737_PUR_16K_OHM
+#define PUR_32KR IS31FL3737_PUR_32K_OHM
+// ========
+
+#define IS31FL3737_REG_INTERRUPT_MASK 0xF0
+#define IS31FL3737_REG_INTERRUPT_STATUS 0xF1
+
+#define IS31FL3737_REG_COMMAND 0xFD
+
+#define IS31FL3737_COMMAND_LED_CONTROL 0x00
+#define IS31FL3737_COMMAND_PWM 0x01
+#define IS31FL3737_COMMAND_AUTO_BREATH 0x02
+#define IS31FL3737_COMMAND_FUNCTION 0x03
+
+#define IS31FL3737_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3737_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3737_FUNCTION_REG_SW_PULLUP 0x0F
+#define IS31FL3737_FUNCTION_REG_CS_PULLDOWN 0x10
+#define IS31FL3737_FUNCTION_REG_RESET 0x11
+
+#define IS31FL3737_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3737_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3737_I2C_ADDRESS_GND 0x50
+#define IS31FL3737_I2C_ADDRESS_SCL 0x55
+#define IS31FL3737_I2C_ADDRESS_SDA 0x5A
+#define IS31FL3737_I2C_ADDRESS_VCC 0x5F
+
+#if defined(LED_MATRIX_IS31FL3737)
+#    define IS31FL3737_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3737_I2C_ADDRESS_4)
+#    define IS31FL3737_DRIVER_COUNT 4
+#elif defined(IS31FL3737_I2C_ADDRESS_3)
+#    define IS31FL3737_DRIVER_COUNT 3
+#elif defined(IS31FL3737_I2C_ADDRESS_2)
+#    define IS31FL3737_DRIVER_COUNT 2
+#elif defined(IS31FL3737_I2C_ADDRESS_1)
+#    define IS31FL3737_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3737_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3737_led_t;
+
+extern const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT];
+
+void is31fl3737_init_drivers(void);
+void is31fl3737_init(uint8_t index);
+void is31fl3737_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3737_select_page(uint8_t index, uint8_t page);
+
+void is31fl3737_set_value(int index, uint8_t value);
+void is31fl3737_set_value_all(uint8_t value);
+
+void is31fl3737_set_led_control_register(uint8_t index, bool value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void is31fl3737_update_pwm_buffers(uint8_t index);
+void is31fl3737_update_led_control_registers(uint8_t index);
+
+void is31fl3737_flush(void);
+
+#define IS31FL3737_PDR_0_OHM 0b000   // No pull-down resistor
+#define IS31FL3737_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3737_PDR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3737_PDR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3737_PDR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3737_PDR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3737_PDR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3737_PDR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3737_PUR_0_OHM 0b000   // No pull-up resistor
+#define IS31FL3737_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3737_PUR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3737_PUR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3737_PUR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3737_PUR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3737_PUR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3737_PUR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3737_PWM_FREQUENCY_8K4_HZ 0b000
+#define IS31FL3737_PWM_FREQUENCY_4K2_HZ 0b001
+#define IS31FL3737_PWM_FREQUENCY_26K7_HZ 0b010
+#define IS31FL3737_PWM_FREQUENCY_2K1_HZ 0b011
+#define IS31FL3737_PWM_FREQUENCY_1K05_HZ 0b100
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x08
+#define SW1_CS8 0x09
+#define SW1_CS9 0x0A
+#define SW1_CS10 0x0B
+#define SW1_CS11 0x0C
+#define SW1_CS12 0x0D
+
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x18
+#define SW2_CS8 0x19
+#define SW2_CS9 0x1A
+#define SW2_CS10 0x1B
+#define SW2_CS11 0x1C
+#define SW2_CS12 0x1D
+
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x28
+#define SW3_CS8 0x29
+#define SW3_CS9 0x2A
+#define SW3_CS10 0x2B
+#define SW3_CS11 0x2C
+#define SW3_CS12 0x2D
+
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x38
+#define SW4_CS8 0x39
+#define SW4_CS9 0x3A
+#define SW4_CS10 0x3B
+#define SW4_CS11 0x3C
+#define SW4_CS12 0x3D
+
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x48
+#define SW5_CS8 0x49
+#define SW5_CS9 0x4A
+#define SW5_CS10 0x4B
+#define SW5_CS11 0x4C
+#define SW5_CS12 0x4D
+
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x58
+#define SW6_CS8 0x59
+#define SW6_CS9 0x5A
+#define SW6_CS10 0x5B
+#define SW6_CS11 0x5C
+#define SW6_CS12 0x5D
+
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x68
+#define SW7_CS8 0x69
+#define SW7_CS9 0x6A
+#define SW7_CS10 0x6B
+#define SW7_CS11 0x6C
+#define SW7_CS12 0x6D
+
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x78
+#define SW8_CS8 0x79
+#define SW8_CS9 0x7A
+#define SW8_CS10 0x7B
+#define SW8_CS11 0x7C
+#define SW8_CS12 0x7D
+
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x88
+#define SW9_CS8 0x89
+#define SW9_CS9 0x8A
+#define SW9_CS10 0x8B
+#define SW9_CS11 0x8C
+#define SW9_CS12 0x8D
+
+#define SW10_CS1 0x90
+#define SW10_CS2 0x91
+#define SW10_CS3 0x92
+#define SW10_CS4 0x93
+#define SW10_CS5 0x94
+#define SW10_CS6 0x95
+#define SW10_CS7 0x98
+#define SW10_CS8 0x99
+#define SW10_CS9 0x9A
+#define SW10_CS10 0x9B
+#define SW10_CS11 0x9C
+#define SW10_CS12 0x9D
+
+#define SW11_CS1 0xA0
+#define SW11_CS2 0xA1
+#define SW11_CS3 0xA2
+#define SW11_CS4 0xA3
+#define SW11_CS5 0xA4
+#define SW11_CS6 0xA5
+#define SW11_CS7 0xA8
+#define SW11_CS8 0xA9
+#define SW11_CS9 0xAA
+#define SW11_CS10 0xAB
+#define SW11_CS11 0xAC
+#define SW11_CS12 0xAD
+
+#define SW12_CS1 0xB0
+#define SW12_CS2 0xB1
+#define SW12_CS3 0xB2
+#define SW12_CS4 0xB3
+#define SW12_CS5 0xB4
+#define SW12_CS6 0xB5
+#define SW12_CS7 0xB8
+#define SW12_CS8 0xB9
+#define SW12_CS9 0xBA
+#define SW12_CS10 0xBB
+#define SW12_CS11 0xBC
+#define SW12_CS12 0xBD
diff --git a/drivers/led/issi/is31fl3737-simple.c b/drivers/led/issi/is31fl3737-simple.c
deleted file mode 100644
index 7f641f4ca5d..00000000000
--- a/drivers/led/issi/is31fl3737-simple.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* Copyright 2017 Jason Williams
- * Copyright 2018 Jack Humbert
- * Copyright 2018 Yiancar
- * Copyright 2021 Doni Crosby
- *
- * 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 "is31fl3737-simple.h"
-#include <string.h>
-#include "i2c_master.h"
-#include "wait.h"
-
-#define IS31FL3737_PWM_REGISTER_COUNT 192 // actually 144
-#define IS31FL3737_LED_CONTROL_REGISTER_COUNT 24
-
-#ifndef IS31FL3737_I2C_TIMEOUT
-#    define IS31FL3737_I2C_TIMEOUT 100
-#endif
-
-#ifndef IS31FL3737_I2C_PERSISTENCE
-#    define IS31FL3737_I2C_PERSISTENCE 0
-#endif
-
-#ifndef IS31FL3737_PWM_FREQUENCY
-#    define IS31FL3737_PWM_FREQUENCY IS31FL3737_PWM_FREQUENCY_8K4_HZ // PFS - IS31FL3737B only
-#endif
-
-#ifndef IS31FL3737_SW_PULLUP
-#    define IS31FL3737_SW_PULLUP IS31FL3737_PUR_0_OHM
-#endif
-
-#ifndef IS31FL3737_CS_PULLDOWN
-#    define IS31FL3737_CS_PULLDOWN IS31FL3737_PDR_0_OHM
-#endif
-
-#ifndef IS31FL3737_GLOBAL_CURRENT
-#    define IS31FL3737_GLOBAL_CURRENT 0xFF
-#endif
-
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
-
-// These buffers match the IS31FL3737 PWM registers.
-// The control buffers match the PG0 LED On/Off registers.
-// Storing them like this is optimal for I2C transfers to the registers.
-// We could optimize this and take out the unused registers from these
-// buffers and the transfers in is31fl3737_write_pwm_buffer() but it's
-// probably not worth the extra complexity.
-
-uint8_t g_pwm_buffer[IS31FL3737_DRIVER_COUNT][IS31FL3737_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3737_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[IS31FL3737_DRIVER_COUNT][IS31FL3737_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[IS31FL3737_DRIVER_COUNT]                        = {false};
-
-void is31fl3737_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
-#if IS31FL3737_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < IS31FL3737_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT) == 0) break;
-    }
-#else
-    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT);
-#endif
-}
-
-void is31fl3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes PG1 is already selected
-
-    // transmit PWM registers in 12 transfers of 16 bytes
-    // g_twi_transfer_buffer[] is 20 bytes
-
-    // iterate over the pwm_buffer contents at 16 byte intervals
-    for (int i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i += 16) {
-        g_twi_transfer_buffer[0] = i;
-        // copy the data from i to i+15
-        // device will auto-increment register for data after the first byte
-        // thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);
-
-#if IS31FL3737_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3737_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT) == 0) break;
-        }
-#else
-        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT);
-#endif
-    }
-}
-
-void is31fl3737_init_drivers(void) {
-    i2c_init();
-
-    is31fl3737_init(IS31FL3737_I2C_ADDRESS_1);
-#if defined(IS31FL3737_I2C_ADDRESS_2)
-    is31fl3737_init(IS31FL3737_I2C_ADDRESS_2);
-#    if defined(IS31FL3737_I2C_ADDRESS_3)
-    is31fl3737_init(IS31FL3737_I2C_ADDRESS_3);
-#        if defined(IS31FL3737_I2C_ADDRESS_4)
-    is31fl3737_init(IS31FL3737_I2C_ADDRESS_4);
-#        endif
-#    endif
-#endif
-
-    for (int i = 0; i < IS31FL3737_LED_COUNT; i++) {
-        is31fl3737_set_led_control_register(i, true);
-    }
-
-    is31fl3737_update_led_control_registers(IS31FL3737_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3737_I2C_ADDRESS_2)
-    is31fl3737_update_led_control_registers(IS31FL3737_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3737_I2C_ADDRESS_3)
-    is31fl3737_update_led_control_registers(IS31FL3737_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3737_I2C_ADDRESS_4)
-    is31fl3737_update_led_control_registers(IS31FL3737_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
-
-void is31fl3737_init(uint8_t addr) {
-    // In order to avoid the LEDs being driven with garbage data
-    // in the LED driver's PWM registers, shutdown is enabled last.
-    // Set up the mode and other settings, clear the PWM registers,
-    // then disable software shutdown.
-
-    // Unlock the command register.
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG0
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_LED_CONTROL);
-    // Turn off all LEDs.
-    for (int i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3737_write_register(addr, i, 0x00);
-    }
-
-    // Unlock the command register.
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG1
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_PWM);
-    // Set PWM on all LEDs to 0
-    // No need to setup Breath registers to PWM as that is the default.
-    for (int i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i++) {
-        is31fl3737_write_register(addr, i, 0x00);
-    }
-
-    // Unlock the command register.
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG3
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_FUNCTION);
-    // Set de-ghost pull-up resistors (SWx)
-    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_SW_PULLUP, IS31FL3737_SW_PULLUP);
-    // Set de-ghost pull-down resistors (CSx)
-    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_CS_PULLDOWN, IS31FL3737_CS_PULLDOWN);
-    // Set global current to maximum.
-    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3737_GLOBAL_CURRENT);
-    // Disable software shutdown.
-    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_CONFIGURATION, ((IS31FL3737_PWM_FREQUENCY & 0b111) << 3) | 0x01);
-
-    // Wait 10ms to ensure the device has woken up.
-    wait_ms(10);
-}
-
-void is31fl3737_set_value(int index, uint8_t value) {
-    is31fl3737_led_t led;
-    if (index >= 0 && index < IS31FL3737_LED_COUNT) {
-        memcpy_P(&led, (&g_is31fl3737_leds[index]), sizeof(led));
-
-        if (g_pwm_buffer[led.driver][led.v] == value) {
-            return;
-        }
-        g_pwm_buffer[led.driver][led.v]          = value;
-        g_pwm_buffer_update_required[led.driver] = true;
-    }
-}
-
-void is31fl3737_set_value_all(uint8_t value) {
-    for (int i = 0; i < IS31FL3737_LED_COUNT; i++) {
-        is31fl3737_set_value(i, value);
-    }
-}
-
-void is31fl3737_set_led_control_register(uint8_t index, bool value) {
-    is31fl3737_led_t led;
-    memcpy_P(&led, (&g_is31fl3737_leds[index]), sizeof(led));
-
-    uint8_t control_register = led.v / 8;
-    uint8_t bit_value        = led.v % 8;
-
-    if (value) {
-        g_led_control_registers[led.driver][control_register] |= (1 << bit_value);
-    } else {
-        g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value);
-    }
-
-    g_led_control_registers_update_required[led.driver] = true;
-}
-
-void is31fl3737_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG1
-        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_PWM);
-
-        is31fl3737_write_pwm_buffer(addr, g_pwm_buffer[index]);
-        g_pwm_buffer_update_required[index] = false;
-    }
-}
-
-void is31fl3737_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG0
-        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_LED_CONTROL);
-        for (int i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3737_write_register(addr, i, g_led_control_registers[index][i]);
-        }
-        g_led_control_registers_update_required[index] = false;
-    }
-}
-
-void is31fl3737_flush(void) {
-    is31fl3737_update_pwm_buffers(IS31FL3737_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3737_I2C_ADDRESS_2)
-    is31fl3737_update_pwm_buffers(IS31FL3737_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3737_I2C_ADDRESS_3)
-    is31fl3737_update_pwm_buffers(IS31FL3737_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3737_I2C_ADDRESS_4)
-    is31fl3737_update_pwm_buffers(IS31FL3737_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
diff --git a/drivers/led/issi/is31fl3737-simple.h b/drivers/led/issi/is31fl3737-simple.h
deleted file mode 100644
index 2658702b1b5..00000000000
--- a/drivers/led/issi/is31fl3737-simple.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/* Copyright 2017 Jason Williams
- * Copyright 2018 Jack Humbert
- * Copyright 2018 Yiancar
- * Copyright 2021 Doni Crosby
- *
- * 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"
-#include "util.h"
-
-// ======== DEPRECATED DEFINES - DO NOT USE ========
-#ifdef ISSI_TIMEOUT
-#    define IS31FL3737_I2C_TIMEOUT ISSI_TIMEOUT
-#endif
-#ifdef ISSI_PERSISTENCE
-#    define IS31FL3737_I2C_PERSISTENCE ISSI_PERSISTENCE
-#endif
-#ifdef ISSI_PWM_FREQUENCY
-#    define IS31FL3737_PWM_FREQUENCY ISSI_PWM_FREQUENCY
-#endif
-#ifdef ISSI_SWPULLUP
-#    define IS31FL3737_SW_PULLUP ISSI_SWPULLUP
-#endif
-#ifdef ISSI_CSPULLUP
-#    define IS31FL3737_CS_PULLDOWN ISSI_CSPULLUP
-#endif
-#ifdef ISSI_GLOBALCURRENT
-#    define IS31FL3737_GLOBAL_CURRENT ISSI_GLOBALCURRENT
-#endif
-
-#define PUR_0R IS31FL3737_PUR_0_OHM
-#define PUR_05KR IS31FL3737_PUR_0K5_OHM
-#define PUR_1KR IS31FL3737_PUR_1K_OHM
-#define PUR_2KR IS31FL3737_PUR_2K_OHM
-#define PUR_4KR IS31FL3737_PUR_4K_OHM
-#define PUR_8KR IS31FL3737_PUR_8K_OHM
-#define PUR_16KR IS31FL3737_PUR_16K_OHM
-#define PUR_32KR IS31FL3737_PUR_32K_OHM
-// ========
-
-#define IS31FL3737_REG_INTERRUPT_MASK 0xF0
-#define IS31FL3737_REG_INTERRUPT_STATUS 0xF1
-
-#define IS31FL3737_REG_COMMAND 0xFD
-
-#define IS31FL3737_COMMAND_LED_CONTROL 0x00
-#define IS31FL3737_COMMAND_PWM 0x01
-#define IS31FL3737_COMMAND_AUTO_BREATH 0x02
-#define IS31FL3737_COMMAND_FUNCTION 0x03
-
-#define IS31FL3737_FUNCTION_REG_CONFIGURATION 0x00
-#define IS31FL3737_FUNCTION_REG_GLOBAL_CURRENT 0x01
-#define IS31FL3737_FUNCTION_REG_SW_PULLUP 0x0F
-#define IS31FL3737_FUNCTION_REG_CS_PULLDOWN 0x10
-#define IS31FL3737_FUNCTION_REG_RESET 0x11
-
-#define IS31FL3737_REG_COMMAND_WRITE_LOCK 0xFE
-#define IS31FL3737_COMMAND_WRITE_LOCK_MAGIC 0xC5
-
-#define IS31FL3737_I2C_ADDRESS_GND 0x50
-#define IS31FL3737_I2C_ADDRESS_SCL 0x55
-#define IS31FL3737_I2C_ADDRESS_SDA 0x5A
-#define IS31FL3737_I2C_ADDRESS_VCC 0x5F
-
-#if defined(LED_MATRIX_IS31FL3737)
-#    define IS31FL3737_LED_COUNT LED_MATRIX_LED_COUNT
-#endif
-
-#if defined(IS31FL3737_I2C_ADDRESS_4)
-#    define IS31FL3737_DRIVER_COUNT 4
-#elif defined(IS31FL3737_I2C_ADDRESS_3)
-#    define IS31FL3737_DRIVER_COUNT 3
-#elif defined(IS31FL3737_I2C_ADDRESS_2)
-#    define IS31FL3737_DRIVER_COUNT 2
-#elif defined(IS31FL3737_I2C_ADDRESS_1)
-#    define IS31FL3737_DRIVER_COUNT 1
-#endif
-
-typedef struct is31fl3737_led_t {
-    uint8_t driver : 2;
-    uint8_t v;
-} PACKED is31fl3737_led_t;
-
-extern const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT];
-
-void is31fl3737_init_drivers(void);
-void is31fl3737_init(uint8_t addr);
-void is31fl3737_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
-
-void is31fl3737_set_value(int index, uint8_t value);
-void is31fl3737_set_value_all(uint8_t value);
-
-void is31fl3737_set_led_control_register(uint8_t index, bool value);
-
-// This should not be called from an interrupt
-// (eg. from a timer interrupt).
-// Call this while idle (in between matrix scans).
-// If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3737_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3737_update_led_control_registers(uint8_t addr, uint8_t index);
-
-void is31fl3737_flush(void);
-
-#define IS31FL3737_PDR_0_OHM 0b000   // No pull-down resistor
-#define IS31FL3737_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
-#define IS31FL3737_PDR_1K_OHM 0b010  // 1 kOhm resistor
-#define IS31FL3737_PDR_2K_OHM 0b011  // 2 kOhm resistor
-#define IS31FL3737_PDR_4K_OHM 0b100  // 4 kOhm resistor
-#define IS31FL3737_PDR_8K_OHM 0b101  // 8 kOhm resistor
-#define IS31FL3737_PDR_16K_OHM 0b110 // 16 kOhm resistor
-#define IS31FL3737_PDR_32K_OHM 0b111 // 32 kOhm resistor
-
-#define IS31FL3737_PUR_0_OHM 0b000   // No pull-up resistor
-#define IS31FL3737_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
-#define IS31FL3737_PUR_1K_OHM 0b010  // 1 kOhm resistor
-#define IS31FL3737_PUR_2K_OHM 0b011  // 2 kOhm resistor
-#define IS31FL3737_PUR_4K_OHM 0b100  // 4 kOhm resistor
-#define IS31FL3737_PUR_8K_OHM 0b101  // 8 kOhm resistor
-#define IS31FL3737_PUR_16K_OHM 0b110 // 16 kOhm resistor
-#define IS31FL3737_PUR_32K_OHM 0b111 // 32 kOhm resistor
-
-#define IS31FL3737_PWM_FREQUENCY_8K4_HZ 0b000
-#define IS31FL3737_PWM_FREQUENCY_4K2_HZ 0b001
-#define IS31FL3737_PWM_FREQUENCY_26K7_HZ 0b010
-#define IS31FL3737_PWM_FREQUENCY_2K1_HZ 0b011
-#define IS31FL3737_PWM_FREQUENCY_1K05_HZ 0b100
-
-#define A_1 0x00
-#define A_2 0x01
-#define A_3 0x02
-#define A_4 0x03
-#define A_5 0x04
-#define A_6 0x05
-#define A_7 0x08
-#define A_8 0x09
-#define A_9 0x0A
-#define A_10 0x0B
-#define A_11 0x0C
-#define A_12 0x0D
-
-#define B_1 0x10
-#define B_2 0x11
-#define B_3 0x12
-#define B_4 0x13
-#define B_5 0x14
-#define B_6 0x15
-#define B_7 0x18
-#define B_8 0x19
-#define B_9 0x1A
-#define B_10 0x1B
-#define B_11 0x1C
-#define B_12 0x1D
-
-#define C_1 0x20
-#define C_2 0x21
-#define C_3 0x22
-#define C_4 0x23
-#define C_5 0x24
-#define C_6 0x25
-#define C_7 0x28
-#define C_8 0x29
-#define C_9 0x2A
-#define C_10 0x2B
-#define C_11 0x2C
-#define C_12 0x2D
-
-#define D_1 0x30
-#define D_2 0x31
-#define D_3 0x32
-#define D_4 0x33
-#define D_5 0x34
-#define D_6 0x35
-#define D_7 0x38
-#define D_8 0x39
-#define D_9 0x3A
-#define D_10 0x3B
-#define D_11 0x3C
-#define D_12 0x3D
-
-#define E_1 0x40
-#define E_2 0x41
-#define E_3 0x42
-#define E_4 0x43
-#define E_5 0x44
-#define E_6 0x45
-#define E_7 0x48
-#define E_8 0x49
-#define E_9 0x4A
-#define E_10 0x4B
-#define E_11 0x4C
-#define E_12 0x4D
-
-#define F_1 0x50
-#define F_2 0x51
-#define F_3 0x52
-#define F_4 0x53
-#define F_5 0x54
-#define F_6 0x55
-#define F_7 0x58
-#define F_8 0x59
-#define F_9 0x5A
-#define F_10 0x5B
-#define F_11 0x5C
-#define F_12 0x5D
-
-#define G_1 0x60
-#define G_2 0x61
-#define G_3 0x62
-#define G_4 0x63
-#define G_5 0x64
-#define G_6 0x65
-#define G_7 0x68
-#define G_8 0x69
-#define G_9 0x6A
-#define G_10 0x6B
-#define G_11 0x6C
-#define G_12 0x6D
-
-#define H_1 0x70
-#define H_2 0x71
-#define H_3 0x72
-#define H_4 0x73
-#define H_5 0x74
-#define H_6 0x75
-#define H_7 0x78
-#define H_8 0x79
-#define H_9 0x7A
-#define H_10 0x7B
-#define H_11 0x7C
-#define H_12 0x7D
-
-#define I_1 0x80
-#define I_2 0x81
-#define I_3 0x82
-#define I_4 0x83
-#define I_5 0x84
-#define I_6 0x85
-#define I_7 0x88
-#define I_8 0x89
-#define I_9 0x8A
-#define I_10 0x8B
-#define I_11 0x8C
-#define I_12 0x8D
-
-#define J_1 0x90
-#define J_2 0x91
-#define J_3 0x92
-#define J_4 0x93
-#define J_5 0x94
-#define J_6 0x95
-#define J_7 0x98
-#define J_8 0x99
-#define J_9 0x9A
-#define J_10 0x9B
-#define J_11 0x9C
-#define J_12 0x9D
-
-#define K_1 0xA0
-#define K_2 0xA1
-#define K_3 0xA2
-#define K_4 0xA3
-#define K_5 0xA4
-#define K_6 0xA5
-#define K_7 0xA8
-#define K_8 0xA9
-#define K_9 0xAA
-#define K_10 0xAB
-#define K_11 0xAC
-#define K_12 0xAD
-
-#define L_1 0xB0
-#define L_2 0xB1
-#define L_3 0xB2
-#define L_4 0xB3
-#define L_5 0xB4
-#define L_6 0xB5
-#define L_7 0xB8
-#define L_8 0xB9
-#define L_9 0xBA
-#define L_10 0xBB
-#define L_11 0xBC
-#define L_12 0xBD
diff --git a/drivers/led/issi/is31fl3737.c b/drivers/led/issi/is31fl3737.c
index a458431952c..b27a4cbb0f2 100644
--- a/drivers/led/issi/is31fl3737.c
+++ b/drivers/led/issi/is31fl3737.c
@@ -18,8 +18,8 @@
  */
 
 #include "is31fl3737.h"
-#include <string.h>
 #include "i2c_master.h"
+#include "gpio.h"
 #include "wait.h"
 
 #define IS31FL3737_PWM_REGISTER_COUNT 192 // actually 144
@@ -41,7 +41,7 @@
 #    define IS31FL3737_SW_PULLUP IS31FL3737_PUR_0_OHM
 #endif
 
-#ifndef IS31FL3737_CS_PULLDONW
+#ifndef IS31FL3737_CS_PULLDOWN
 #    define IS31FL3737_CS_PULLDOWN IS31FL3737_PDR_0_OHM
 #endif
 
@@ -49,55 +49,66 @@
 #    define IS31FL3737_GLOBAL_CURRENT 0xFF
 #endif
 
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
+const uint8_t i2c_addresses[IS31FL3737_DRIVER_COUNT] = {
+    IS31FL3737_I2C_ADDRESS_1,
+#ifdef IS31FL3737_I2C_ADDRESS_2
+    IS31FL3737_I2C_ADDRESS_2,
+#    ifdef IS31FL3737_I2C_ADDRESS_3
+    IS31FL3737_I2C_ADDRESS_3,
+#        ifdef IS31FL3737_I2C_ADDRESS_4
+    IS31FL3737_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
 
 // These buffers match the IS31FL3737 PWM registers.
-// The control buffers match the PG0 LED On/Off registers.
+// The control buffers match the page 0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3737_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
-
-uint8_t g_pwm_buffer[IS31FL3737_DRIVER_COUNT][IS31FL3737_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3737_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[IS31FL3737_DRIVER_COUNT][IS31FL3737_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[IS31FL3737_DRIVER_COUNT]                        = {false};
-
-void is31fl3737_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
+typedef struct is31fl3737_driver_t {
+    uint8_t pwm_buffer[IS31FL3737_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3737_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3737_driver_t;
+
+is31fl3737_driver_t driver_buffers[IS31FL3737_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3737_write_register(uint8_t index, uint8_t reg, uint8_t data) {
 #if IS31FL3737_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3737_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT) == 0) break;
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3737_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3737_I2C_TIMEOUT);
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3737_I2C_TIMEOUT);
 #endif
 }
 
-void is31fl3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // assumes PG1 is already selected
-
-    // transmit PWM registers in 12 transfers of 16 bytes
-    // g_twi_transfer_buffer[] is 20 bytes
+void is31fl3737_select_page(uint8_t index, uint8_t page) {
+    is31fl3737_write_register(index, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3737_write_register(index, IS31FL3737_REG_COMMAND, page);
+}
 
-    // iterate over the pwm_buffer contents at 16 byte intervals
-    for (int i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i += 16) {
-        g_twi_transfer_buffer[0] = i;
-        // copy the data from i to i+15
-        // device will auto-increment register for data after the first byte
-        // thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 16);
+void is31fl3737_write_pwm_buffer(uint8_t index) {
+    // Assumes page 1 is already selected.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
 
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i += 16) {
 #if IS31FL3737_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3737_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT) == 0) break;
+        for (uint8_t j = 0; j < IS31FL3737_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3737_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
 #else
-        i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, IS31FL3737_I2C_TIMEOUT);
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3737_I2C_TIMEOUT);
 #endif
     }
 }
@@ -105,73 +116,55 @@ void is31fl3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
 void is31fl3737_init_drivers(void) {
     i2c_init();
 
-    is31fl3737_init(IS31FL3737_I2C_ADDRESS_1);
-#if defined(IS31FL3737_I2C_ADDRESS_2)
-    is31fl3737_init(IS31FL3737_I2C_ADDRESS_2);
-#    if defined(IS31FL3737_I2C_ADDRESS_3)
-    is31fl3737_init(IS31FL3737_I2C_ADDRESS_3);
-#        if defined(IS31FL3737_I2C_ADDRESS_4)
-    is31fl3737_init(IS31FL3737_I2C_ADDRESS_4);
-#        endif
-#    endif
+#if defined(IS31FL3737_SDB_PIN)
+    gpio_set_pin_output(IS31FL3737_SDB_PIN);
+    gpio_write_pin_high(IS31FL3737_SDB_PIN);
 #endif
 
+    for (uint8_t i = 0; i < IS31FL3737_DRIVER_COUNT; i++) {
+        is31fl3737_init(i);
+    }
+
     for (int i = 0; i < IS31FL3737_LED_COUNT; i++) {
         is31fl3737_set_led_control_register(i, true, true, true);
     }
 
-    is31fl3737_update_led_control_registers(IS31FL3737_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3737_I2C_ADDRESS_2)
-    is31fl3737_update_led_control_registers(IS31FL3737_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3737_I2C_ADDRESS_3)
-    is31fl3737_update_led_control_registers(IS31FL3737_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3737_I2C_ADDRESS_4)
-    is31fl3737_update_led_control_registers(IS31FL3737_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3737_DRIVER_COUNT; i++) {
+        is31fl3737_update_led_control_registers(i);
+    }
 }
 
-void is31fl3737_init(uint8_t addr) {
+void is31fl3737_init(uint8_t index) {
     // In order to avoid the LEDs being driven with garbage data
     // in the LED driver's PWM registers, shutdown is enabled last.
     // Set up the mode and other settings, clear the PWM registers,
     // then disable software shutdown.
 
-    // Unlock the command register.
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3737_select_page(index, IS31FL3737_COMMAND_LED_CONTROL);
 
-    // Select PG0
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_LED_CONTROL);
     // Turn off all LEDs.
-    for (int i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3737_write_register(addr, i, 0x00);
+    for (uint8_t i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3737_write_register(index, i, 0x00);
     }
 
-    // Unlock the command register.
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3737_select_page(index, IS31FL3737_COMMAND_PWM);
 
-    // Select PG1
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_PWM);
     // Set PWM on all LEDs to 0
     // No need to setup Breath registers to PWM as that is the default.
-    for (int i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i++) {
-        is31fl3737_write_register(addr, i, 0x00);
+    for (uint8_t i = 0; i < IS31FL3737_PWM_REGISTER_COUNT; i++) {
+        is31fl3737_write_register(index, i, 0x00);
     }
 
-    // Unlock the command register.
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3737_select_page(index, IS31FL3737_COMMAND_FUNCTION);
 
-    // Select PG3
-    is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_FUNCTION);
     // Set de-ghost pull-up resistors (SWx)
-    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_SW_PULLUP, IS31FL3737_SW_PULLUP);
+    is31fl3737_write_register(index, IS31FL3737_FUNCTION_REG_SW_PULLUP, IS31FL3737_SW_PULLUP);
     // Set de-ghost pull-down resistors (CSx)
-    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_CS_PULLDOWN, IS31FL3737_CS_PULLDOWN);
+    is31fl3737_write_register(index, IS31FL3737_FUNCTION_REG_CS_PULLDOWN, IS31FL3737_CS_PULLDOWN);
     // Set global current to maximum.
-    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3737_GLOBAL_CURRENT);
+    is31fl3737_write_register(index, IS31FL3737_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3737_GLOBAL_CURRENT);
     // Disable software shutdown.
-    is31fl3737_write_register(addr, IS31FL3737_FUNCTION_REG_CONFIGURATION, ((IS31FL3737_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+    is31fl3737_write_register(index, IS31FL3737_FUNCTION_REG_CONFIGURATION, ((IS31FL3737_PWM_FREQUENCY & 0b111) << 3) | 0x01);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
@@ -179,16 +172,18 @@ void is31fl3737_init(uint8_t addr) {
 
 void is31fl3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31fl3737_led_t led;
+
     if (index >= 0 && index < IS31FL3737_LED_COUNT) {
         memcpy_P(&led, (&g_is31fl3737_leds[index]), sizeof(led));
 
-        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
             return;
         }
-        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;
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
     }
 }
 
@@ -210,56 +205,48 @@ void is31fl3737_set_led_control_register(uint8_t index, bool red, bool green, bo
     uint8_t bit_b              = led.b % 8;
 
     if (red) {
-        g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] |= (1 << bit_r);
     } else {
-        g_led_control_registers[led.driver][control_register_r] &= ~(1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] &= ~(1 << bit_r);
     }
     if (green) {
-        g_led_control_registers[led.driver][control_register_g] |= (1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] |= (1 << bit_g);
     } else {
-        g_led_control_registers[led.driver][control_register_g] &= ~(1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] &= ~(1 << bit_g);
     }
     if (blue) {
-        g_led_control_registers[led.driver][control_register_b] |= (1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] |= (1 << bit_b);
     } else {
-        g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] &= ~(1 << bit_b);
     }
 
-    g_led_control_registers_update_required[led.driver] = true;
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
 }
 
-void is31fl3737_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG1
-        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_PWM);
+void is31fl3737_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3737_select_page(index, IS31FL3737_COMMAND_PWM);
+
+        is31fl3737_write_pwm_buffer(index);
 
-        is31fl3737_write_pwm_buffer(addr, g_pwm_buffer[index]);
-        g_pwm_buffer_update_required[index] = false;
+        driver_buffers[index].pwm_buffer_dirty = false;
     }
 }
 
-void is31fl3737_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG0
-        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND_WRITE_LOCK, IS31FL3737_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3737_write_register(addr, IS31FL3737_REG_COMMAND, IS31FL3737_COMMAND_LED_CONTROL);
-        for (int i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3737_write_register(addr, i, g_led_control_registers[index][i]);
+void is31fl3737_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        is31fl3737_select_page(index, IS31FL3737_COMMAND_LED_CONTROL);
+
+        for (uint8_t i = 0; i < IS31FL3737_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3737_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
         }
-        g_led_control_registers_update_required[index] = false;
+
+        driver_buffers[index].led_control_buffer_dirty = false;
     }
 }
 
 void is31fl3737_flush(void) {
-    is31fl3737_update_pwm_buffers(IS31FL3737_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3737_I2C_ADDRESS_2)
-    is31fl3737_update_pwm_buffers(IS31FL3737_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3737_I2C_ADDRESS_3)
-    is31fl3737_update_pwm_buffers(IS31FL3737_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3737_I2C_ADDRESS_4)
-    is31fl3737_update_pwm_buffers(IS31FL3737_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3737_DRIVER_COUNT; i++) {
+        is31fl3737_update_pwm_buffers(i);
+    }
 }
diff --git a/drivers/led/issi/is31fl3737.h b/drivers/led/issi/is31fl3737.h
index 8de3bf4ef52..735a3a1e308 100644
--- a/drivers/led/issi/is31fl3737.h
+++ b/drivers/led/issi/is31fl3737.h
@@ -117,9 +117,9 @@ typedef struct is31fl3737_led_t {
 extern const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT];
 
 void is31fl3737_init_drivers(void);
-void is31fl3737_init(uint8_t addr);
-void is31fl3737_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-void is31fl3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+void is31fl3737_init(uint8_t index);
+void is31fl3737_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3737_select_page(uint8_t index, uint8_t page);
 
 void is31fl3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void is31fl3737_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
@@ -130,8 +130,8 @@ void is31fl3737_set_led_control_register(uint8_t index, bool red, bool green, bo
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3737_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3737_update_led_control_registers(uint8_t addr, uint8_t index);
+void is31fl3737_update_pwm_buffers(uint8_t index);
+void is31fl3737_update_led_control_registers(uint8_t index);
 
 void is31fl3737_flush(void);
 
@@ -159,158 +159,316 @@ void is31fl3737_flush(void);
 #define IS31FL3737_PWM_FREQUENCY_2K1_HZ 0b011
 #define IS31FL3737_PWM_FREQUENCY_1K05_HZ 0b100
 
-#define A_1 0x00
-#define A_2 0x01
-#define A_3 0x02
-#define A_4 0x03
-#define A_5 0x04
-#define A_6 0x05
-#define A_7 0x08
-#define A_8 0x09
-#define A_9 0x0A
-#define A_10 0x0B
-#define A_11 0x0C
-#define A_12 0x0D
-
-#define B_1 0x10
-#define B_2 0x11
-#define B_3 0x12
-#define B_4 0x13
-#define B_5 0x14
-#define B_6 0x15
-#define B_7 0x18
-#define B_8 0x19
-#define B_9 0x1A
-#define B_10 0x1B
-#define B_11 0x1C
-#define B_12 0x1D
-
-#define C_1 0x20
-#define C_2 0x21
-#define C_3 0x22
-#define C_4 0x23
-#define C_5 0x24
-#define C_6 0x25
-#define C_7 0x28
-#define C_8 0x29
-#define C_9 0x2A
-#define C_10 0x2B
-#define C_11 0x2C
-#define C_12 0x2D
-
-#define D_1 0x30
-#define D_2 0x31
-#define D_3 0x32
-#define D_4 0x33
-#define D_5 0x34
-#define D_6 0x35
-#define D_7 0x38
-#define D_8 0x39
-#define D_9 0x3A
-#define D_10 0x3B
-#define D_11 0x3C
-#define D_12 0x3D
-
-#define E_1 0x40
-#define E_2 0x41
-#define E_3 0x42
-#define E_4 0x43
-#define E_5 0x44
-#define E_6 0x45
-#define E_7 0x48
-#define E_8 0x49
-#define E_9 0x4A
-#define E_10 0x4B
-#define E_11 0x4C
-#define E_12 0x4D
-
-#define F_1 0x50
-#define F_2 0x51
-#define F_3 0x52
-#define F_4 0x53
-#define F_5 0x54
-#define F_6 0x55
-#define F_7 0x58
-#define F_8 0x59
-#define F_9 0x5A
-#define F_10 0x5B
-#define F_11 0x5C
-#define F_12 0x5D
-
-#define G_1 0x60
-#define G_2 0x61
-#define G_3 0x62
-#define G_4 0x63
-#define G_5 0x64
-#define G_6 0x65
-#define G_7 0x68
-#define G_8 0x69
-#define G_9 0x6A
-#define G_10 0x6B
-#define G_11 0x6C
-#define G_12 0x6D
-
-#define H_1 0x70
-#define H_2 0x71
-#define H_3 0x72
-#define H_4 0x73
-#define H_5 0x74
-#define H_6 0x75
-#define H_7 0x78
-#define H_8 0x79
-#define H_9 0x7A
-#define H_10 0x7B
-#define H_11 0x7C
-#define H_12 0x7D
-
-#define I_1 0x80
-#define I_2 0x81
-#define I_3 0x82
-#define I_4 0x83
-#define I_5 0x84
-#define I_6 0x85
-#define I_7 0x88
-#define I_8 0x89
-#define I_9 0x8A
-#define I_10 0x8B
-#define I_11 0x8C
-#define I_12 0x8D
-
-#define J_1 0x90
-#define J_2 0x91
-#define J_3 0x92
-#define J_4 0x93
-#define J_5 0x94
-#define J_6 0x95
-#define J_7 0x98
-#define J_8 0x99
-#define J_9 0x9A
-#define J_10 0x9B
-#define J_11 0x9C
-#define J_12 0x9D
-
-#define K_1 0xA0
-#define K_2 0xA1
-#define K_3 0xA2
-#define K_4 0xA3
-#define K_5 0xA4
-#define K_6 0xA5
-#define K_7 0xA8
-#define K_8 0xA9
-#define K_9 0xAA
-#define K_10 0xAB
-#define K_11 0xAC
-#define K_12 0xAD
-
-#define L_1 0xB0
-#define L_2 0xB1
-#define L_3 0xB2
-#define L_4 0xB3
-#define L_5 0xB4
-#define L_6 0xB5
-#define L_7 0xB8
-#define L_8 0xB9
-#define L_9 0xBA
-#define L_10 0xBB
-#define L_11 0xBC
-#define L_12 0xBD
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x08
+#define SW1_CS8 0x09
+#define SW1_CS9 0x0A
+#define SW1_CS10 0x0B
+#define SW1_CS11 0x0C
+#define SW1_CS12 0x0D
+
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x18
+#define SW2_CS8 0x19
+#define SW2_CS9 0x1A
+#define SW2_CS10 0x1B
+#define SW2_CS11 0x1C
+#define SW2_CS12 0x1D
+
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x28
+#define SW3_CS8 0x29
+#define SW3_CS9 0x2A
+#define SW3_CS10 0x2B
+#define SW3_CS11 0x2C
+#define SW3_CS12 0x2D
+
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x38
+#define SW4_CS8 0x39
+#define SW4_CS9 0x3A
+#define SW4_CS10 0x3B
+#define SW4_CS11 0x3C
+#define SW4_CS12 0x3D
+
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x48
+#define SW5_CS8 0x49
+#define SW5_CS9 0x4A
+#define SW5_CS10 0x4B
+#define SW5_CS11 0x4C
+#define SW5_CS12 0x4D
+
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x58
+#define SW6_CS8 0x59
+#define SW6_CS9 0x5A
+#define SW6_CS10 0x5B
+#define SW6_CS11 0x5C
+#define SW6_CS12 0x5D
+
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x68
+#define SW7_CS8 0x69
+#define SW7_CS9 0x6A
+#define SW7_CS10 0x6B
+#define SW7_CS11 0x6C
+#define SW7_CS12 0x6D
+
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x78
+#define SW8_CS8 0x79
+#define SW8_CS9 0x7A
+#define SW8_CS10 0x7B
+#define SW8_CS11 0x7C
+#define SW8_CS12 0x7D
+
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x88
+#define SW9_CS8 0x89
+#define SW9_CS9 0x8A
+#define SW9_CS10 0x8B
+#define SW9_CS11 0x8C
+#define SW9_CS12 0x8D
+
+#define SW10_CS1 0x90
+#define SW10_CS2 0x91
+#define SW10_CS3 0x92
+#define SW10_CS4 0x93
+#define SW10_CS5 0x94
+#define SW10_CS6 0x95
+#define SW10_CS7 0x98
+#define SW10_CS8 0x99
+#define SW10_CS9 0x9A
+#define SW10_CS10 0x9B
+#define SW10_CS11 0x9C
+#define SW10_CS12 0x9D
+
+#define SW11_CS1 0xA0
+#define SW11_CS2 0xA1
+#define SW11_CS3 0xA2
+#define SW11_CS4 0xA3
+#define SW11_CS5 0xA4
+#define SW11_CS6 0xA5
+#define SW11_CS7 0xA8
+#define SW11_CS8 0xA9
+#define SW11_CS9 0xAA
+#define SW11_CS10 0xAB
+#define SW11_CS11 0xAC
+#define SW11_CS12 0xAD
+
+#define SW12_CS1 0xB0
+#define SW12_CS2 0xB1
+#define SW12_CS3 0xB2
+#define SW12_CS4 0xB3
+#define SW12_CS5 0xB4
+#define SW12_CS6 0xB5
+#define SW12_CS7 0xB8
+#define SW12_CS8 0xB9
+#define SW12_CS9 0xBA
+#define SW12_CS10 0xBB
+#define SW12_CS11 0xBC
+#define SW12_CS12 0xBD
+
+// DEPRECATED - DO NOT USE
+
+#define A_1 SW1_CS1
+#define A_2 SW1_CS2
+#define A_3 SW1_CS3
+#define A_4 SW1_CS4
+#define A_5 SW1_CS5
+#define A_6 SW1_CS6
+#define A_7 SW1_CS7
+#define A_8 SW1_CS8
+#define A_9 SW1_CS9
+#define A_10 SW1_CS10
+#define A_11 SW1_CS11
+#define A_12 SW1_CS12
+
+#define B_1 SW2_CS1
+#define B_2 SW2_CS2
+#define B_3 SW2_CS3
+#define B_4 SW2_CS4
+#define B_5 SW2_CS5
+#define B_6 SW2_CS6
+#define B_7 SW2_CS7
+#define B_8 SW2_CS8
+#define B_9 SW2_CS9
+#define B_10 SW2_CS10
+#define B_11 SW2_CS11
+#define B_12 SW2_CS12
+
+#define C_1 SW3_CS1
+#define C_2 SW3_CS2
+#define C_3 SW3_CS3
+#define C_4 SW3_CS4
+#define C_5 SW3_CS5
+#define C_6 SW3_CS6
+#define C_7 SW3_CS7
+#define C_8 SW3_CS8
+#define C_9 SW3_CS9
+#define C_10 SW3_CS10
+#define C_11 SW3_CS11
+#define C_12 SW3_CS12
+
+#define D_1 SW4_CS1
+#define D_2 SW4_CS2
+#define D_3 SW4_CS3
+#define D_4 SW4_CS4
+#define D_5 SW4_CS5
+#define D_6 SW4_CS6
+#define D_7 SW4_CS7
+#define D_8 SW4_CS8
+#define D_9 SW4_CS9
+#define D_10 SW4_CS10
+#define D_11 SW4_CS11
+#define D_12 SW4_CS12
+
+#define E_1 SW5_CS1
+#define E_2 SW5_CS2
+#define E_3 SW5_CS3
+#define E_4 SW5_CS4
+#define E_5 SW5_CS5
+#define E_6 SW5_CS6
+#define E_7 SW5_CS7
+#define E_8 SW5_CS8
+#define E_9 SW5_CS9
+#define E_10 SW5_CS10
+#define E_11 SW5_CS11
+#define E_12 SW5_CS12
+
+#define F_1 SW6_CS1
+#define F_2 SW6_CS2
+#define F_3 SW6_CS3
+#define F_4 SW6_CS4
+#define F_5 SW6_CS5
+#define F_6 SW6_CS6
+#define F_7 SW6_CS7
+#define F_8 SW6_CS8
+#define F_9 SW6_CS9
+#define F_10 SW6_CS10
+#define F_11 SW6_CS11
+#define F_12 SW6_CS12
+
+#define G_1 SW7_CS1
+#define G_2 SW7_CS2
+#define G_3 SW7_CS3
+#define G_4 SW7_CS4
+#define G_5 SW7_CS5
+#define G_6 SW7_CS6
+#define G_7 SW7_CS7
+#define G_8 SW7_CS8
+#define G_9 SW7_CS9
+#define G_10 SW7_CS10
+#define G_11 SW7_CS11
+#define G_12 SW7_CS12
+
+#define H_1 SW8_CS1
+#define H_2 SW8_CS2
+#define H_3 SW8_CS3
+#define H_4 SW8_CS4
+#define H_5 SW8_CS5
+#define H_6 SW8_CS6
+#define H_7 SW8_CS7
+#define H_8 SW8_CS8
+#define H_9 SW8_CS9
+#define H_10 SW8_CS10
+#define H_11 SW8_CS11
+#define H_12 SW8_CS12
+
+#define I_1 SW9_CS1
+#define I_2 SW9_CS2
+#define I_3 SW9_CS3
+#define I_4 SW9_CS4
+#define I_5 SW9_CS5
+#define I_6 SW9_CS6
+#define I_7 SW9_CS7
+#define I_8 SW9_CS8
+#define I_9 SW9_CS9
+#define I_10 SW9_CS10
+#define I_11 SW9_CS11
+#define I_12 SW9_CS12
+
+#define J_1 SW10_CS1
+#define J_2 SW10_CS2
+#define J_3 SW10_CS3
+#define J_4 SW10_CS4
+#define J_5 SW10_CS5
+#define J_6 SW10_CS6
+#define J_7 SW10_CS7
+#define J_8 SW10_CS8
+#define J_9 SW10_CS9
+#define J_10 SW10_CS10
+#define J_11 SW10_CS11
+#define J_12 SW10_CS12
+
+#define K_1 SW11_CS1
+#define K_2 SW11_CS2
+#define K_3 SW11_CS3
+#define K_4 SW11_CS4
+#define K_5 SW11_CS5
+#define K_6 SW11_CS6
+#define K_7 SW11_CS7
+#define K_8 SW11_CS8
+#define K_9 SW11_CS9
+#define K_10 SW11_CS10
+#define K_11 SW11_CS11
+#define K_12 SW11_CS12
+
+#define L_1 SW12_CS1
+#define L_2 SW12_CS2
+#define L_3 SW12_CS3
+#define L_4 SW12_CS4
+#define L_5 SW12_CS5
+#define L_6 SW12_CS6
+#define L_7 SW12_CS7
+#define L_8 SW12_CS8
+#define L_9 SW12_CS9
+#define L_10 SW12_CS10
+#define L_11 SW12_CS11
+#define L_12 SW12_CS12
diff --git a/drivers/led/issi/is31fl3741-mono.c b/drivers/led/issi/is31fl3741-mono.c
new file mode 100644
index 00000000000..dbccba0fc8d
--- /dev/null
+++ b/drivers/led/issi/is31fl3741-mono.c
@@ -0,0 +1,282 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ *
+ * 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 "is31fl3741-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3741_PWM_0_REGISTER_COUNT 180
+#define IS31FL3741_PWM_1_REGISTER_COUNT 171
+#define IS31FL3741_SCALING_0_REGISTER_COUNT 180
+#define IS31FL3741_SCALING_1_REGISTER_COUNT 171
+
+#ifndef IS31FL3741_I2C_TIMEOUT
+#    define IS31FL3741_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3741_I2C_PERSISTENCE
+#    define IS31FL3741_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3741_CONFIGURATION
+#    define IS31FL3741_CONFIGURATION 0x01
+#endif
+
+#ifndef IS31FL3741_PWM_FREQUENCY
+#    define IS31FL3741_PWM_FREQUENCY IS31FL3741_PWM_FREQUENCY_29K_HZ
+#endif
+
+#ifndef IS31FL3741_SW_PULLUP
+#    define IS31FL3741_SW_PULLUP IS31FL3741_PUR_32K_OHM
+#endif
+
+#ifndef IS31FL3741_CS_PULLDOWN
+#    define IS31FL3741_CS_PULLDOWN IS31FL3741_PDR_32K_OHM
+#endif
+
+#ifndef IS31FL3741_GLOBAL_CURRENT
+#    define IS31FL3741_GLOBAL_CURRENT 0xFF
+#endif
+
+const uint8_t i2c_addresses[IS31FL3741_DRIVER_COUNT] = {
+    IS31FL3741_I2C_ADDRESS_1,
+#ifdef IS31FL3741_I2C_ADDRESS_2
+    IS31FL3741_I2C_ADDRESS_2,
+#    ifdef IS31FL3741_I2C_ADDRESS_3
+    IS31FL3741_I2C_ADDRESS_3,
+#        ifdef IS31FL3741_I2C_ADDRESS_4
+    IS31FL3741_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+// These buffers match the IS31FL3741 and IS31FL3741A PWM registers.
+// The scaling buffers match the page 2 and 3 LED On/Off registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in is31fl3741_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+typedef struct is31fl3741_driver_t {
+    uint8_t pwm_buffer_0[IS31FL3741_PWM_0_REGISTER_COUNT];
+    uint8_t pwm_buffer_1[IS31FL3741_PWM_1_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer_0[IS31FL3741_SCALING_0_REGISTER_COUNT];
+    uint8_t scaling_buffer_1[IS31FL3741_SCALING_1_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3741_driver_t;
+
+is31fl3741_driver_t driver_buffers[IS31FL3741_DRIVER_COUNT] = {{
+    .pwm_buffer_0         = {0},
+    .pwm_buffer_1         = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer_0     = {0},
+    .scaling_buffer_1     = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3741_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3741_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3741_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3741_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3741_select_page(uint8_t index, uint8_t page) {
+    is31fl3741_write_register(index, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3741_write_register(index, IS31FL3741_REG_COMMAND, page);
+}
+
+void is31fl3741_write_pwm_buffer(uint8_t index) {
+    is31fl3741_select_page(index, IS31FL3741_COMMAND_PWM_0);
+
+    // Transmit PWM0 registers in 6 transfers of 30 bytes.
+
+    // Iterate over the pwm_buffer_0 contents at 30 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3741_PWM_0_REGISTER_COUNT; i += 30) {
+#if IS31FL3741_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3741_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer_0 + i, 30, IS31FL3741_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer_0 + i, 30, IS31FL3741_I2C_TIMEOUT);
+#endif
+    }
+
+    is31fl3741_select_page(index, IS31FL3741_COMMAND_PWM_1);
+
+    // Transmit PWM1 registers in 9 transfers of 19 bytes.
+
+    // Iterate over the pwm_buffer_1 contents at 19 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3741_PWM_1_REGISTER_COUNT; i += 19) {
+#if IS31FL3741_I2C_PERSISTENCE > 0
+        for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer_1 + i, 19, IS31FL3741_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer_1 + i, 19, IS31FL3741_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3741_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3741_SDB_PIN)
+    gpio_set_pin_output(IS31FL3741_SDB_PIN);
+    gpio_write_pin_high(IS31FL3741_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3741_DRIVER_COUNT; i++) {
+        is31fl3741_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3741_LED_COUNT; i++) {
+        is31fl3741_set_led_control_register(i, true);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3741_DRIVER_COUNT; i++) {
+        is31fl3741_update_led_control_registers(i);
+    }
+}
+
+void is31fl3741_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+    // Unlock the command register.
+
+    is31fl3741_select_page(index, IS31FL3741_COMMAND_FUNCTION);
+
+    // Set to Normal operation
+    is31fl3741_write_register(index, IS31FL3741_FUNCTION_REG_CONFIGURATION, IS31FL3741_CONFIGURATION);
+
+    // Set Golbal Current Control Register
+    is31fl3741_write_register(index, IS31FL3741_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3741_GLOBAL_CURRENT);
+    // Set Pull up & Down for SWx CSy
+    is31fl3741_write_register(index, IS31FL3741_FUNCTION_REG_PULLDOWNUP, ((IS31FL3741_CS_PULLDOWN << 4) | IS31FL3741_SW_PULLUP));
+    // Set PWM frequency
+    is31fl3741_write_register(index, IS31FL3741_FUNCTION_REG_PWM_FREQUENCY, (IS31FL3741_PWM_FREQUENCY & 0b1111));
+
+    // is31fl3741_update_led_scaling_registers(index, 0xFF, 0xFF, 0xFF);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+uint8_t get_pwm_value(uint8_t driver, uint16_t reg) {
+    if (reg & 0x100) {
+        return driver_buffers[driver].pwm_buffer_1[reg & 0xFF];
+    } else {
+        return driver_buffers[driver].pwm_buffer_0[reg];
+    }
+}
+
+void set_pwm_value(uint8_t driver, uint16_t reg, uint8_t value) {
+    if (reg & 0x100) {
+        driver_buffers[driver].pwm_buffer_1[reg & 0xFF] = value;
+    } else {
+        driver_buffers[driver].pwm_buffer_0[reg] = value;
+    }
+}
+
+void is31fl3741_set_value(int index, uint8_t value) {
+    is31fl3741_led_t led;
+
+    if (index >= 0 && index < IS31FL3741_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3741_leds[index]), sizeof(led));
+
+        if (get_pwm_value(led.driver, led.v) == value) {
+            return;
+        }
+
+        set_pwm_value(led.driver, led.v, value);
+        driver_buffers[led.driver].pwm_buffer_dirty = true;
+    }
+}
+
+void is31fl3741_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3741_LED_COUNT; i++) {
+        is31fl3741_set_value(i, value);
+    }
+}
+
+void set_scaling_value(uint8_t driver, uint16_t reg, uint8_t value) {
+    if (reg & 0x100) {
+        driver_buffers[driver].scaling_buffer_1[reg & 0xFF] = value;
+    } else {
+        driver_buffers[driver].scaling_buffer_0[reg] = value;
+    }
+}
+
+void is31fl3741_set_led_control_register(uint8_t index, bool value) {
+    is31fl3741_led_t led;
+    memcpy_P(&led, (&g_is31fl3741_leds[index]), sizeof(led));
+
+    set_scaling_value(led.driver, led.v, value ? 0xFF : 0x00);
+
+    driver_buffers[led.driver].scaling_buffer_dirty = true;
+}
+
+void is31fl3741_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3741_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3741_set_pwm_buffer(const is31fl3741_led_t *pled, uint8_t value) {
+    set_pwm_value(pled->driver, pled->v, value);
+    driver_buffers[pled->driver].pwm_buffer_dirty = true;
+}
+
+void is31fl3741_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3741_select_page(index, IS31FL3741_COMMAND_SCALING_0);
+
+        for (uint8_t i = 0; i < IS31FL3741_SCALING_0_REGISTER_COUNT; i++) {
+            is31fl3741_write_register(index, i, driver_buffers[index].scaling_buffer_0[i]);
+        }
+
+        is31fl3741_select_page(index, IS31FL3741_COMMAND_SCALING_1);
+
+        for (uint8_t i = 0; i < IS31FL3741_SCALING_1_REGISTER_COUNT; i++) {
+            is31fl3741_write_register(index, i, driver_buffers[index].scaling_buffer_1[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3741_set_scaling_registers(const is31fl3741_led_t *pled, uint8_t value) {
+    set_scaling_value(pled->driver, pled->v, value);
+    driver_buffers[pled->driver].scaling_buffer_dirty = true;
+}
+
+void is31fl3741_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3741_DRIVER_COUNT; i++) {
+        is31fl3741_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3741-mono.h b/drivers/led/issi/is31fl3741-mono.h
new file mode 100644
index 00000000000..6d4f70b1b35
--- /dev/null
+++ b/drivers/led/issi/is31fl3741-mono.h
@@ -0,0 +1,887 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ *
+ * 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"
+#include "util.h"
+
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef ISSI_TIMEOUT
+#    define IS31FL3741_I2C_TIMEOUT ISSI_TIMEOUT
+#endif
+#ifdef ISSI_PERSISTENCE
+#    define IS31FL3741_I2C_PERSISTENCE ISSI_PERSISTENCE
+#endif
+#ifdef ISSI_CONFIGURATION
+#    define IS31FL3741_CONFIGURATION ISSI_CONFIGURATION
+#endif
+#ifdef ISSI_SWPULLUP
+#    define IS31FL3741_SW_PULLUP ISSI_SWPULLUP
+#endif
+#ifdef ISSI_CSPULLUP
+#    define IS31FL3741_CS_PULLDOWN ISSI_CSPULLUP
+#endif
+#ifdef ISSI_GLOBALCURRENT
+#    define IS31FL3741_GLOBAL_CURRENT ISSI_GLOBALCURRENT
+#endif
+
+#define PUR_0R IS31FL3741_PUR_0_OHM
+#define PUR_05KR IS31FL3741_PUR_0K5_OHM
+#define PUR_1KR IS31FL3741_PUR_1K_OHM
+#define PUR_2KR IS31FL3741_PUR_2K_OHM
+#define PUR_4KR IS31FL3741_PUR_4K_OHM
+#define PUR_8KR IS31FL3741_PUR_8K_OHM
+#define PUR_16KR IS31FL3741_PUR_16K_OHM
+#define PUR_32KR IS31FL3741_PUR_32K_OHM
+// ========
+
+#define IS31FL3741_REG_INTERRUPT_MASK 0xF0
+#define IS31FL3741_REG_INTERRUPT_STATUS 0xF1
+#define IS31FL3741_REG_ID 0xFC
+
+#define IS31FL3741_REG_COMMAND 0xFD
+
+#define IS31FL3741_COMMAND_PWM_0 0x00
+#define IS31FL3741_COMMAND_PWM_1 0x01
+#define IS31FL3741_COMMAND_SCALING_0 0x02
+#define IS31FL3741_COMMAND_SCALING_1 0x03
+#define IS31FL3741_COMMAND_FUNCTION 0x04
+
+#define IS31FL3741_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3741_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3741_FUNCTION_REG_PULLDOWNUP 0x02
+#define IS31FL3741_FUNCTION_REG_PWM_FREQUENCY 0x36
+#define IS31FL3741_FUNCTION_REG_RESET 0x3F
+
+#define IS31FL3741_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3741_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3741_I2C_ADDRESS_GND 0x30
+#define IS31FL3741_I2C_ADDRESS_SCL 0x31
+#define IS31FL3741_I2C_ADDRESS_SDA 0x32
+#define IS31FL3741_I2C_ADDRESS_VCC 0x33
+
+#if defined(LED_MATRIX_IS31FL3741)
+#    define IS31FL3741_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3741_I2C_ADDRESS_4)
+#    define IS31FL3741_DRIVER_COUNT 4
+#elif defined(IS31FL3741_I2C_ADDRESS_3)
+#    define IS31FL3741_DRIVER_COUNT 3
+#elif defined(IS31FL3741_I2C_ADDRESS_2)
+#    define IS31FL3741_DRIVER_COUNT 2
+#elif defined(IS31FL3741_I2C_ADDRESS_1)
+#    define IS31FL3741_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3741_led_t {
+    uint8_t  driver : 2;
+    uint16_t v : 9;
+} PACKED is31fl3741_led_t;
+
+extern const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT];
+
+void is31fl3741_init_drivers(void);
+void is31fl3741_init(uint8_t index);
+void is31fl3741_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3741_select_page(uint8_t index, uint8_t page);
+
+void is31fl3741_set_value(int index, uint8_t value);
+void is31fl3741_set_value_all(uint8_t value);
+
+void is31fl3741_set_led_control_register(uint8_t index, bool value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void is31fl3741_update_pwm_buffers(uint8_t index);
+void is31fl3741_update_led_control_registers(uint8_t index);
+void is31fl3741_set_scaling_registers(const is31fl3741_led_t *pled, uint8_t value);
+
+void is31fl3741_set_pwm_buffer(const is31fl3741_led_t *pled, uint8_t value);
+
+void is31fl3741_flush(void);
+
+#define IS31FL3741_PDR_0_OHM 0b000   // No pull-down resistor
+#define IS31FL3741_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3741_PDR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3741_PDR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3741_PDR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3741_PDR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3741_PDR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3741_PDR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3741_PUR_0_OHM 0b000   // No pull-up resistor
+#define IS31FL3741_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3741_PUR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3741_PUR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3741_PUR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3741_PUR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3741_PUR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3741_PUR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3741_PWM_FREQUENCY_29K_HZ 0b0000
+#define IS31FL3741_PWM_FREQUENCY_3K6_HZ 0b0011
+#define IS31FL3741_PWM_FREQUENCY_1K8_HZ 0b0111
+#define IS31FL3741_PWM_FREQUENCY_900_HZ 0b1011
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+#define SW1_CS19 0x12
+#define SW1_CS20 0x13
+#define SW1_CS21 0x14
+#define SW1_CS22 0x15
+#define SW1_CS23 0x16
+#define SW1_CS24 0x17
+#define SW1_CS25 0x18
+#define SW1_CS26 0x19
+#define SW1_CS27 0x1A
+#define SW1_CS28 0x1B
+#define SW1_CS29 0x1C
+#define SW1_CS30 0x1D
+
+#define SW2_CS1 0x1E
+#define SW2_CS2 0x1F
+#define SW2_CS3 0x20
+#define SW2_CS4 0x21
+#define SW2_CS5 0x22
+#define SW2_CS6 0x23
+#define SW2_CS7 0x24
+#define SW2_CS8 0x25
+#define SW2_CS9 0x26
+#define SW2_CS10 0x27
+#define SW2_CS11 0x28
+#define SW2_CS12 0x29
+#define SW2_CS13 0x2A
+#define SW2_CS14 0x2B
+#define SW2_CS15 0x2C
+#define SW2_CS16 0x2D
+#define SW2_CS17 0x2E
+#define SW2_CS18 0x2F
+#define SW2_CS19 0x30
+#define SW2_CS20 0x31
+#define SW2_CS21 0x32
+#define SW2_CS22 0x33
+#define SW2_CS23 0x34
+#define SW2_CS24 0x35
+#define SW2_CS25 0x36
+#define SW2_CS26 0x37
+#define SW2_CS27 0x38
+#define SW2_CS28 0x39
+#define SW2_CS29 0x3A
+#define SW2_CS30 0x3B
+
+#define SW3_CS1 0x3C
+#define SW3_CS2 0x3D
+#define SW3_CS3 0x3E
+#define SW3_CS4 0x3F
+#define SW3_CS5 0x40
+#define SW3_CS6 0x41
+#define SW3_CS7 0x42
+#define SW3_CS8 0x43
+#define SW3_CS9 0x44
+#define SW3_CS10 0x45
+#define SW3_CS11 0x46
+#define SW3_CS12 0x47
+#define SW3_CS13 0x48
+#define SW3_CS14 0x49
+#define SW3_CS15 0x4A
+#define SW3_CS16 0x4B
+#define SW3_CS17 0x4C
+#define SW3_CS18 0x4D
+#define SW3_CS19 0x4E
+#define SW3_CS20 0x4F
+#define SW3_CS21 0x50
+#define SW3_CS22 0x51
+#define SW3_CS23 0x52
+#define SW3_CS24 0x53
+#define SW3_CS25 0x54
+#define SW3_CS26 0x55
+#define SW3_CS27 0x56
+#define SW3_CS28 0x57
+#define SW3_CS29 0x58
+#define SW3_CS30 0x59
+
+#define SW4_CS1 0x5A
+#define SW4_CS2 0x5B
+#define SW4_CS3 0x5C
+#define SW4_CS4 0x5D
+#define SW4_CS5 0x5E
+#define SW4_CS6 0x5F
+#define SW4_CS7 0x60
+#define SW4_CS8 0x61
+#define SW4_CS9 0x62
+#define SW4_CS10 0x63
+#define SW4_CS11 0x64
+#define SW4_CS12 0x65
+#define SW4_CS13 0x66
+#define SW4_CS14 0x67
+#define SW4_CS15 0x68
+#define SW4_CS16 0x69
+#define SW4_CS17 0x6A
+#define SW4_CS18 0x6B
+#define SW4_CS19 0x6C
+#define SW4_CS20 0x6D
+#define SW4_CS21 0x6E
+#define SW4_CS22 0x6F
+#define SW4_CS23 0x70
+#define SW4_CS24 0x71
+#define SW4_CS25 0x72
+#define SW4_CS26 0x73
+#define SW4_CS27 0x74
+#define SW4_CS28 0x75
+#define SW4_CS29 0x76
+#define SW4_CS30 0x77
+
+#define SW5_CS1 0x78
+#define SW5_CS2 0x79
+#define SW5_CS3 0x7A
+#define SW5_CS4 0x7B
+#define SW5_CS5 0x7C
+#define SW5_CS6 0x7D
+#define SW5_CS7 0x7E
+#define SW5_CS8 0x7F
+#define SW5_CS9 0x80
+#define SW5_CS10 0x81
+#define SW5_CS11 0x82
+#define SW5_CS12 0x83
+#define SW5_CS13 0x84
+#define SW5_CS14 0x85
+#define SW5_CS15 0x86
+#define SW5_CS16 0x87
+#define SW5_CS17 0x88
+#define SW5_CS18 0x89
+#define SW5_CS19 0x8A
+#define SW5_CS20 0x8B
+#define SW5_CS21 0x8C
+#define SW5_CS22 0x8D
+#define SW5_CS23 0x8E
+#define SW5_CS24 0x8F
+#define SW5_CS25 0x90
+#define SW5_CS26 0x91
+#define SW5_CS27 0x92
+#define SW5_CS28 0x93
+#define SW5_CS29 0x94
+#define SW5_CS30 0x95
+
+#define SW6_CS1 0x96
+#define SW6_CS2 0x97
+#define SW6_CS3 0x98
+#define SW6_CS4 0x99
+#define SW6_CS5 0x9A
+#define SW6_CS6 0x9B
+#define SW6_CS7 0x9C
+#define SW6_CS8 0x9D
+#define SW6_CS9 0x9E
+#define SW6_CS10 0x9F
+#define SW6_CS11 0xA0
+#define SW6_CS12 0xA1
+#define SW6_CS13 0xA2
+#define SW6_CS14 0xA3
+#define SW6_CS15 0xA4
+#define SW6_CS16 0xA5
+#define SW6_CS17 0xA6
+#define SW6_CS18 0xA7
+#define SW6_CS19 0xA8
+#define SW6_CS20 0xA9
+#define SW6_CS21 0xAA
+#define SW6_CS22 0xAB
+#define SW6_CS23 0xAC
+#define SW6_CS24 0xAD
+#define SW6_CS25 0xAE
+#define SW6_CS26 0xAF
+#define SW6_CS27 0xB0
+#define SW6_CS28 0xB1
+#define SW6_CS29 0xB2
+#define SW6_CS30 0xB3
+
+#define SW7_CS1 0x100
+#define SW7_CS2 0x101
+#define SW7_CS3 0x102
+#define SW7_CS4 0x103
+#define SW7_CS5 0x104
+#define SW7_CS6 0x105
+#define SW7_CS7 0x106
+#define SW7_CS8 0x107
+#define SW7_CS9 0x108
+#define SW7_CS10 0x109
+#define SW7_CS11 0x10A
+#define SW7_CS12 0x10B
+#define SW7_CS13 0x10C
+#define SW7_CS14 0x10D
+#define SW7_CS15 0x10E
+#define SW7_CS16 0x10F
+#define SW7_CS17 0x110
+#define SW7_CS18 0x111
+#define SW7_CS19 0x112
+#define SW7_CS20 0x113
+#define SW7_CS21 0x114
+#define SW7_CS22 0x115
+#define SW7_CS23 0x116
+#define SW7_CS24 0x117
+#define SW7_CS25 0x118
+#define SW7_CS26 0x119
+#define SW7_CS27 0x11A
+#define SW7_CS28 0x11B
+#define SW7_CS29 0x11C
+#define SW7_CS30 0x11D
+
+#define SW8_CS1 0x11E
+#define SW8_CS2 0x11F
+#define SW8_CS3 0x120
+#define SW8_CS4 0x121
+#define SW8_CS5 0x122
+#define SW8_CS6 0x123
+#define SW8_CS7 0x124
+#define SW8_CS8 0x125
+#define SW8_CS9 0x126
+#define SW8_CS10 0x127
+#define SW8_CS11 0x128
+#define SW8_CS12 0x129
+#define SW8_CS13 0x12A
+#define SW8_CS14 0x12B
+#define SW8_CS15 0x12C
+#define SW8_CS16 0x12D
+#define SW8_CS17 0x12E
+#define SW8_CS18 0x12F
+#define SW8_CS19 0x130
+#define SW8_CS20 0x131
+#define SW8_CS21 0x132
+#define SW8_CS22 0x133
+#define SW8_CS23 0x134
+#define SW8_CS24 0x135
+#define SW8_CS25 0x136
+#define SW8_CS26 0x137
+#define SW8_CS27 0x138
+#define SW8_CS28 0x139
+#define SW8_CS29 0x13A
+#define SW8_CS30 0x13B
+
+#define SW9_CS1 0x13C
+#define SW9_CS2 0x13D
+#define SW9_CS3 0x13E
+#define SW9_CS4 0x13F
+#define SW9_CS5 0x140
+#define SW9_CS6 0x141
+#define SW9_CS7 0x142
+#define SW9_CS8 0x143
+#define SW9_CS9 0x144
+#define SW9_CS10 0x145
+#define SW9_CS11 0x146
+#define SW9_CS12 0x147
+#define SW9_CS13 0x148
+#define SW9_CS14 0x149
+#define SW9_CS15 0x14A
+#define SW9_CS16 0x14B
+#define SW9_CS17 0x14C
+#define SW9_CS18 0x14D
+#define SW9_CS19 0x14E
+#define SW9_CS20 0x14F
+#define SW9_CS21 0x150
+#define SW9_CS22 0x151
+#define SW9_CS23 0x152
+#define SW9_CS24 0x153
+#define SW9_CS25 0x154
+#define SW9_CS26 0x155
+#define SW9_CS27 0x156
+#define SW9_CS28 0x157
+#define SW9_CS29 0x158
+#define SW9_CS30 0x159
+
+#define SW1_CS31 0x15A
+#define SW1_CS32 0x15B
+#define SW1_CS33 0x15C
+#define SW1_CS34 0x15D
+#define SW1_CS35 0x15E
+#define SW1_CS36 0x15F
+#define SW1_CS37 0x160
+#define SW1_CS38 0x161
+#define SW1_CS39 0x162
+
+#define SW2_CS31 0x163
+#define SW2_CS32 0x164
+#define SW2_CS33 0x165
+#define SW2_CS34 0x166
+#define SW2_CS35 0x167
+#define SW2_CS36 0x168
+#define SW2_CS37 0x169
+#define SW2_CS38 0x16A
+#define SW2_CS39 0x16B
+
+#define SW3_CS31 0x16C
+#define SW3_CS32 0x16D
+#define SW3_CS33 0x16E
+#define SW3_CS34 0x16F
+#define SW3_CS35 0x170
+#define SW3_CS36 0x171
+#define SW3_CS37 0x172
+#define SW3_CS38 0x173
+#define SW3_CS39 0x174
+
+#define SW4_CS31 0x175
+#define SW4_CS32 0x176
+#define SW4_CS33 0x177
+#define SW4_CS34 0x178
+#define SW4_CS35 0x179
+#define SW4_CS36 0x17A
+#define SW4_CS37 0x17B
+#define SW4_CS38 0x17C
+#define SW4_CS39 0x17D
+
+#define SW5_CS31 0x17E
+#define SW5_CS32 0x17F
+#define SW5_CS33 0x180
+#define SW5_CS34 0x181
+#define SW5_CS35 0x182
+#define SW5_CS36 0x183
+#define SW5_CS37 0x184
+#define SW5_CS38 0x185
+#define SW5_CS39 0x186
+
+#define SW6_CS31 0x187
+#define SW6_CS32 0x188
+#define SW6_CS33 0x189
+#define SW6_CS34 0x18A
+#define SW6_CS35 0x18B
+#define SW6_CS36 0x18C
+#define SW6_CS37 0x18D
+#define SW6_CS38 0x18E
+#define SW6_CS39 0x18F
+
+#define SW7_CS31 0x190
+#define SW7_CS32 0x191
+#define SW7_CS33 0x192
+#define SW7_CS34 0x193
+#define SW7_CS35 0x194
+#define SW7_CS36 0x195
+#define SW7_CS37 0x196
+#define SW7_CS38 0x197
+#define SW7_CS39 0x198
+
+#define SW8_CS31 0x199
+#define SW8_CS32 0x19A
+#define SW8_CS33 0x19B
+#define SW8_CS34 0x19C
+#define SW8_CS35 0x19D
+#define SW8_CS36 0x19E
+#define SW8_CS37 0x19F
+#define SW8_CS38 0x1A0
+#define SW8_CS39 0x1A1
+
+#define SW9_CS31 0x1A2
+#define SW9_CS32 0x1A3
+#define SW9_CS33 0x1A4
+#define SW9_CS34 0x1A5
+#define SW9_CS35 0x1A6
+#define SW9_CS36 0x1A7
+#define SW9_CS37 0x1A8
+#define SW9_CS38 0x1A9
+#define SW9_CS39 0x1AA
+
+// DEPRECATED - DO NOT USE
+
+#define CS1_SW1 SW1_CS1
+#define CS2_SW1 SW1_CS2
+#define CS3_SW1 SW1_CS3
+#define CS4_SW1 SW1_CS4
+#define CS5_SW1 SW1_CS5
+#define CS6_SW1 SW1_CS6
+#define CS7_SW1 SW1_CS7
+#define CS8_SW1 SW1_CS8
+#define CS9_SW1 SW1_CS9
+#define CS10_SW1 SW1_CS10
+#define CS11_SW1 SW1_CS11
+#define CS12_SW1 SW1_CS12
+#define CS13_SW1 SW1_CS13
+#define CS14_SW1 SW1_CS14
+#define CS15_SW1 SW1_CS15
+#define CS16_SW1 SW1_CS16
+#define CS17_SW1 SW1_CS17
+#define CS18_SW1 SW1_CS18
+#define CS19_SW1 SW1_CS19
+#define CS20_SW1 SW1_CS20
+#define CS21_SW1 SW1_CS21
+#define CS22_SW1 SW1_CS22
+#define CS23_SW1 SW1_CS23
+#define CS24_SW1 SW1_CS24
+#define CS25_SW1 SW1_CS25
+#define CS26_SW1 SW1_CS26
+#define CS27_SW1 SW1_CS27
+#define CS28_SW1 SW1_CS28
+#define CS29_SW1 SW1_CS29
+#define CS30_SW1 SW1_CS30
+
+#define CS1_SW2 SW2_CS1
+#define CS2_SW2 SW2_CS2
+#define CS3_SW2 SW2_CS3
+#define CS4_SW2 SW2_CS4
+#define CS5_SW2 SW2_CS5
+#define CS6_SW2 SW2_CS6
+#define CS7_SW2 SW2_CS7
+#define CS8_SW2 SW2_CS8
+#define CS9_SW2 SW2_CS9
+#define CS10_SW2 SW2_CS10
+#define CS11_SW2 SW2_CS11
+#define CS12_SW2 SW2_CS12
+#define CS13_SW2 SW2_CS13
+#define CS14_SW2 SW2_CS14
+#define CS15_SW2 SW2_CS15
+#define CS16_SW2 SW2_CS16
+#define CS17_SW2 SW2_CS17
+#define CS18_SW2 SW2_CS18
+#define CS19_SW2 SW2_CS19
+#define CS20_SW2 SW2_CS20
+#define CS21_SW2 SW2_CS21
+#define CS22_SW2 SW2_CS22
+#define CS23_SW2 SW2_CS23
+#define CS24_SW2 SW2_CS24
+#define CS25_SW2 SW2_CS25
+#define CS26_SW2 SW2_CS26
+#define CS27_SW2 SW2_CS27
+#define CS28_SW2 SW2_CS28
+#define CS29_SW2 SW2_CS29
+#define CS30_SW2 SW2_CS30
+
+#define CS1_SW3 SW3_CS1
+#define CS2_SW3 SW3_CS2
+#define CS3_SW3 SW3_CS3
+#define CS4_SW3 SW3_CS4
+#define CS5_SW3 SW3_CS5
+#define CS6_SW3 SW3_CS6
+#define CS7_SW3 SW3_CS7
+#define CS8_SW3 SW3_CS8
+#define CS9_SW3 SW3_CS9
+#define CS10_SW3 SW3_CS10
+#define CS11_SW3 SW3_CS11
+#define CS12_SW3 SW3_CS12
+#define CS13_SW3 SW3_CS13
+#define CS14_SW3 SW3_CS14
+#define CS15_SW3 SW3_CS15
+#define CS16_SW3 SW3_CS16
+#define CS17_SW3 SW3_CS17
+#define CS18_SW3 SW3_CS18
+#define CS19_SW3 SW3_CS19
+#define CS20_SW3 SW3_CS20
+#define CS21_SW3 SW3_CS21
+#define CS22_SW3 SW3_CS22
+#define CS23_SW3 SW3_CS23
+#define CS24_SW3 SW3_CS24
+#define CS25_SW3 SW3_CS25
+#define CS26_SW3 SW3_CS26
+#define CS27_SW3 SW3_CS27
+#define CS28_SW3 SW3_CS28
+#define CS29_SW3 SW3_CS29
+#define CS30_SW3 SW3_CS30
+
+#define CS1_SW4 SW4_CS1
+#define CS2_SW4 SW4_CS2
+#define CS3_SW4 SW4_CS3
+#define CS4_SW4 SW4_CS4
+#define CS5_SW4 SW4_CS5
+#define CS6_SW4 SW4_CS6
+#define CS7_SW4 SW4_CS7
+#define CS8_SW4 SW4_CS8
+#define CS9_SW4 SW4_CS9
+#define CS10_SW4 SW4_CS10
+#define CS11_SW4 SW4_CS11
+#define CS12_SW4 SW4_CS12
+#define CS13_SW4 SW4_CS13
+#define CS14_SW4 SW4_CS14
+#define CS15_SW4 SW4_CS15
+#define CS16_SW4 SW4_CS16
+#define CS17_SW4 SW4_CS17
+#define CS18_SW4 SW4_CS18
+#define CS19_SW4 SW4_CS19
+#define CS20_SW4 SW4_CS20
+#define CS21_SW4 SW4_CS21
+#define CS22_SW4 SW4_CS22
+#define CS23_SW4 SW4_CS23
+#define CS24_SW4 SW4_CS24
+#define CS25_SW4 SW4_CS25
+#define CS26_SW4 SW4_CS26
+#define CS27_SW4 SW4_CS27
+#define CS28_SW4 SW4_CS28
+#define CS29_SW4 SW4_CS29
+#define CS30_SW4 SW4_CS30
+
+#define CS1_SW5 SW5_CS1
+#define CS2_SW5 SW5_CS2
+#define CS3_SW5 SW5_CS3
+#define CS4_SW5 SW5_CS4
+#define CS5_SW5 SW5_CS5
+#define CS6_SW5 SW5_CS6
+#define CS7_SW5 SW5_CS7
+#define CS8_SW5 SW5_CS8
+#define CS9_SW5 SW5_CS9
+#define CS10_SW5 SW5_CS10
+#define CS11_SW5 SW5_CS11
+#define CS12_SW5 SW5_CS12
+#define CS13_SW5 SW5_CS13
+#define CS14_SW5 SW5_CS14
+#define CS15_SW5 SW5_CS15
+#define CS16_SW5 SW5_CS16
+#define CS17_SW5 SW5_CS17
+#define CS18_SW5 SW5_CS18
+#define CS19_SW5 SW5_CS19
+#define CS20_SW5 SW5_CS20
+#define CS21_SW5 SW5_CS21
+#define CS22_SW5 SW5_CS22
+#define CS23_SW5 SW5_CS23
+#define CS24_SW5 SW5_CS24
+#define CS25_SW5 SW5_CS25
+#define CS26_SW5 SW5_CS26
+#define CS27_SW5 SW5_CS27
+#define CS28_SW5 SW5_CS28
+#define CS29_SW5 SW5_CS29
+#define CS30_SW5 SW5_CS30
+
+#define CS1_SW6 SW6_CS1
+#define CS2_SW6 SW6_CS2
+#define CS3_SW6 SW6_CS3
+#define CS4_SW6 SW6_CS4
+#define CS5_SW6 SW6_CS5
+#define CS6_SW6 SW6_CS6
+#define CS7_SW6 SW6_CS7
+#define CS8_SW6 SW6_CS8
+#define CS9_SW6 SW6_CS9
+#define CS10_SW6 SW6_CS10
+#define CS11_SW6 SW6_CS11
+#define CS12_SW6 SW6_CS12
+#define CS13_SW6 SW6_CS13
+#define CS14_SW6 SW6_CS14
+#define CS15_SW6 SW6_CS15
+#define CS16_SW6 SW6_CS16
+#define CS17_SW6 SW6_CS17
+#define CS18_SW6 SW6_CS18
+#define CS19_SW6 SW6_CS19
+#define CS20_SW6 SW6_CS20
+#define CS21_SW6 SW6_CS21
+#define CS22_SW6 SW6_CS22
+#define CS23_SW6 SW6_CS23
+#define CS24_SW6 SW6_CS24
+#define CS25_SW6 SW6_CS25
+#define CS26_SW6 SW6_CS26
+#define CS27_SW6 SW6_CS27
+#define CS28_SW6 SW6_CS28
+#define CS29_SW6 SW6_CS29
+#define CS30_SW6 SW6_CS30
+
+#define CS1_SW7 SW7_CS1
+#define CS2_SW7 SW7_CS2
+#define CS3_SW7 SW7_CS3
+#define CS4_SW7 SW7_CS4
+#define CS5_SW7 SW7_CS5
+#define CS6_SW7 SW7_CS6
+#define CS7_SW7 SW7_CS7
+#define CS8_SW7 SW7_CS8
+#define CS9_SW7 SW7_CS9
+#define CS10_SW7 SW7_CS10
+#define CS11_SW7 SW7_CS11
+#define CS12_SW7 SW7_CS12
+#define CS13_SW7 SW7_CS13
+#define CS14_SW7 SW7_CS14
+#define CS15_SW7 SW7_CS15
+#define CS16_SW7 SW7_CS16
+#define CS17_SW7 SW7_CS17
+#define CS18_SW7 SW7_CS18
+#define CS19_SW7 SW7_CS19
+#define CS20_SW7 SW7_CS20
+#define CS21_SW7 SW7_CS21
+#define CS22_SW7 SW7_CS22
+#define CS23_SW7 SW7_CS23
+#define CS24_SW7 SW7_CS24
+#define CS25_SW7 SW7_CS25
+#define CS26_SW7 SW7_CS26
+#define CS27_SW7 SW7_CS27
+#define CS28_SW7 SW7_CS28
+#define CS29_SW7 SW7_CS29
+#define CS30_SW7 SW7_CS30
+
+#define CS1_SW8 SW8_CS1
+#define CS2_SW8 SW8_CS2
+#define CS3_SW8 SW8_CS3
+#define CS4_SW8 SW8_CS4
+#define CS5_SW8 SW8_CS5
+#define CS6_SW8 SW8_CS6
+#define CS7_SW8 SW8_CS7
+#define CS8_SW8 SW8_CS8
+#define CS9_SW8 SW8_CS9
+#define CS10_SW8 SW8_CS10
+#define CS11_SW8 SW8_CS11
+#define CS12_SW8 SW8_CS12
+#define CS13_SW8 SW8_CS13
+#define CS14_SW8 SW8_CS14
+#define CS15_SW8 SW8_CS15
+#define CS16_SW8 SW8_CS16
+#define CS17_SW8 SW8_CS17
+#define CS18_SW8 SW8_CS18
+#define CS19_SW8 SW8_CS19
+#define CS20_SW8 SW8_CS20
+#define CS21_SW8 SW8_CS21
+#define CS22_SW8 SW8_CS22
+#define CS23_SW8 SW8_CS23
+#define CS24_SW8 SW8_CS24
+#define CS25_SW8 SW8_CS25
+#define CS26_SW8 SW8_CS26
+#define CS27_SW8 SW8_CS27
+#define CS28_SW8 SW8_CS28
+#define CS29_SW8 SW8_CS29
+#define CS30_SW8 SW8_CS30
+
+#define CS1_SW9 SW9_CS1
+#define CS2_SW9 SW9_CS2
+#define CS3_SW9 SW9_CS3
+#define CS4_SW9 SW9_CS4
+#define CS5_SW9 SW9_CS5
+#define CS6_SW9 SW9_CS6
+#define CS7_SW9 SW9_CS7
+#define CS8_SW9 SW9_CS8
+#define CS9_SW9 SW9_CS9
+#define CS10_SW9 SW9_CS10
+#define CS11_SW9 SW9_CS11
+#define CS12_SW9 SW9_CS12
+#define CS13_SW9 SW9_CS13
+#define CS14_SW9 SW9_CS14
+#define CS15_SW9 SW9_CS15
+#define CS16_SW9 SW9_CS16
+#define CS17_SW9 SW9_CS17
+#define CS18_SW9 SW9_CS18
+#define CS19_SW9 SW9_CS19
+#define CS20_SW9 SW9_CS20
+#define CS21_SW9 SW9_CS21
+#define CS22_SW9 SW9_CS22
+#define CS23_SW9 SW9_CS23
+#define CS24_SW9 SW9_CS24
+#define CS25_SW9 SW9_CS25
+#define CS26_SW9 SW9_CS26
+#define CS27_SW9 SW9_CS27
+#define CS28_SW9 SW9_CS28
+#define CS29_SW9 SW9_CS29
+#define CS30_SW9 SW9_CS30
+
+#define CS31_SW1 SW1_CS31
+#define CS32_SW1 SW1_CS32
+#define CS33_SW1 SW1_CS33
+#define CS34_SW1 SW1_CS34
+#define CS35_SW1 SW1_CS35
+#define CS36_SW1 SW1_CS36
+#define CS37_SW1 SW1_CS37
+#define CS38_SW1 SW1_CS38
+#define CS39_SW1 SW1_CS39
+
+#define CS31_SW2 SW2_CS31
+#define CS32_SW2 SW2_CS32
+#define CS33_SW2 SW2_CS33
+#define CS34_SW2 SW2_CS34
+#define CS35_SW2 SW2_CS35
+#define CS36_SW2 SW2_CS36
+#define CS37_SW2 SW2_CS37
+#define CS38_SW2 SW2_CS38
+#define CS39_SW2 SW2_CS39
+
+#define CS31_SW3 SW3_CS31
+#define CS32_SW3 SW3_CS32
+#define CS33_SW3 SW3_CS33
+#define CS34_SW3 SW3_CS34
+#define CS35_SW3 SW3_CS35
+#define CS36_SW3 SW3_CS36
+#define CS37_SW3 SW3_CS37
+#define CS38_SW3 SW3_CS38
+#define CS39_SW3 SW3_CS39
+
+#define CS31_SW4 SW4_CS31
+#define CS32_SW4 SW4_CS32
+#define CS33_SW4 SW4_CS33
+#define CS34_SW4 SW4_CS34
+#define CS35_SW4 SW4_CS35
+#define CS36_SW4 SW4_CS36
+#define CS37_SW4 SW4_CS37
+#define CS38_SW4 SW4_CS38
+#define CS39_SW4 SW4_CS39
+
+#define CS31_SW5 SW5_CS31
+#define CS32_SW5 SW5_CS32
+#define CS33_SW5 SW5_CS33
+#define CS34_SW5 SW5_CS34
+#define CS35_SW5 SW5_CS35
+#define CS36_SW5 SW5_CS36
+#define CS37_SW5 SW5_CS37
+#define CS38_SW5 SW5_CS38
+#define CS39_SW5 SW5_CS39
+
+#define CS31_SW6 SW6_CS31
+#define CS32_SW6 SW6_CS32
+#define CS33_SW6 SW6_CS33
+#define CS34_SW6 SW6_CS34
+#define CS35_SW6 SW6_CS35
+#define CS36_SW6 SW6_CS36
+#define CS37_SW6 SW6_CS37
+#define CS38_SW6 SW6_CS38
+#define CS39_SW6 SW6_CS39
+
+#define CS31_SW7 SW7_CS31
+#define CS32_SW7 SW7_CS32
+#define CS33_SW7 SW7_CS33
+#define CS34_SW7 SW7_CS34
+#define CS35_SW7 SW7_CS35
+#define CS36_SW7 SW7_CS36
+#define CS37_SW7 SW7_CS37
+#define CS38_SW7 SW7_CS38
+#define CS39_SW7 SW7_CS39
+
+#define CS31_SW8 SW8_CS31
+#define CS32_SW8 SW8_CS32
+#define CS33_SW8 SW8_CS33
+#define CS34_SW8 SW8_CS34
+#define CS35_SW8 SW8_CS35
+#define CS36_SW8 SW8_CS36
+#define CS37_SW8 SW8_CS37
+#define CS38_SW8 SW8_CS38
+#define CS39_SW8 SW8_CS39
+
+#define CS31_SW9 SW9_CS31
+#define CS32_SW9 SW9_CS32
+#define CS33_SW9 SW9_CS33
+#define CS34_SW9 SW9_CS34
+#define CS35_SW9 SW9_CS35
+#define CS36_SW9 SW9_CS36
+#define CS37_SW9 SW9_CS37
+#define CS38_SW9 SW9_CS38
+#define CS39_SW9 SW9_CS39
diff --git a/drivers/led/issi/is31fl3741-simple.c b/drivers/led/issi/is31fl3741-simple.c
deleted file mode 100644
index f7009853ba6..00000000000
--- a/drivers/led/issi/is31fl3741-simple.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/* Copyright 2017 Jason Williams
- * Copyright 2018 Jack Humbert
- * Copyright 2018 Yiancar
- * Copyright 2020 MelGeek
- *
- * 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 "is31fl3741-simple.h"
-#include <string.h>
-#include "i2c_master.h"
-#include "wait.h"
-
-#define IS31FL3741_PWM_REGISTER_COUNT 351
-
-#ifndef IS31FL3741_I2C_TIMEOUT
-#    define IS31FL3741_I2C_TIMEOUT 100
-#endif
-
-#ifndef IS31FL3741_I2C_PERSISTENCE
-#    define IS31FL3741_I2C_PERSISTENCE 0
-#endif
-
-#ifndef IS31FL3741_CONFIGURATION
-#    define IS31FL3741_CONFIGURATION 0x01
-#endif
-
-#ifndef IS31FL3741_PWM_FREQUENCY
-#    define IS31FL3741_PWM_FREQUENCY IS31FL3741_PWM_FREQUENCY_29K_HZ
-#endif
-
-#ifndef IS31FL3741_SW_PULLUP
-#    define IS31FL3741_SW_PULLUP IS31FL3741_PUR_32K_OHM
-#endif
-
-#ifndef IS31FL3741_CS_PULLDOWN
-#    define IS31FL3741_CS_PULLDOWN IS31FL3741_PDR_32K_OHM
-#endif
-
-#ifndef IS31FL3741_GLOBAL_CURRENT
-#    define IS31FL3741_GLOBAL_CURRENT 0xFF
-#endif
-
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20] = {0xFF};
-
-// These buffers match the IS31FL3741 and IS31FL3741A PWM registers.
-// The scaling buffers match the PG2 and PG3 LED On/Off registers.
-// Storing them like this is optimal for I2C transfers to the registers.
-// We could optimize this and take out the unused registers from these
-// buffers and the transfers in is31fl3741_write_pwm_buffer() but it's
-// probably not worth the extra complexity.
-uint8_t g_pwm_buffer[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3741_DRIVER_COUNT]        = {false};
-bool    g_scaling_registers_update_required[IS31FL3741_DRIVER_COUNT] = {false};
-
-uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
-
-void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
-#if IS31FL3741_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT) == 0) break;
-    }
-#else
-    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT);
-#endif
-}
-
-bool is31fl3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assume PG0 is already selected
-
-    for (int i = 0; i < 342; i += 18) {
-        if (i == 180) {
-            // unlock the command register and select PG1
-            is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-            is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_PWM_1);
-        }
-
-        g_twi_transfer_buffer[0] = i % 180;
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 18);
-
-#if IS31FL3741_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
-                return false;
-            }
-        }
-#else
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
-            return false;
-        }
-#endif
-    }
-
-    // transfer the left cause the total number is 351
-    g_twi_transfer_buffer[0] = 162;
-    memcpy(g_twi_transfer_buffer + 1, pwm_buffer + 342, 9);
-
-#if IS31FL3741_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
-            return false;
-        }
-    }
-#else
-    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
-        return false;
-    }
-#endif
-
-    return true;
-}
-
-void is31fl3741_init_drivers(void) {
-    i2c_init();
-
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_1);
-#if defined(IS31FL3741_I2C_ADDRESS_2)
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_2);
-#    if defined(IS31FL3741_I2C_ADDRESS_3)
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_3);
-#        if defined(IS31FL3741_I2C_ADDRESS_4)
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_4);
-#        endif
-#    endif
-#endif
-
-    for (int i = 0; i < IS31FL3741_LED_COUNT; i++) {
-        is31fl3741_set_led_control_register(i, true);
-    }
-
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3741_I2C_ADDRESS_2)
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3741_I2C_ADDRESS_3)
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3741_I2C_ADDRESS_4)
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
-
-void is31fl3741_init(uint8_t addr) {
-    // In order to avoid the LEDs being driven with garbage data
-    // in the LED driver's PWM registers, shutdown is enabled last.
-    // Set up the mode and other settings, clear the PWM registers,
-    // then disable software shutdown.
-    // Unlock the command register.
-
-    // Unlock the command register.
-    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG4
-    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_FUNCTION);
-
-    // Set to Normal operation
-    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_CONFIGURATION, IS31FL3741_CONFIGURATION);
-
-    // Set Golbal Current Control Register
-    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3741_GLOBAL_CURRENT);
-    // Set Pull up & Down for SWx CSy
-    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_PULLDOWNUP, ((IS31FL3741_CS_PULLDOWN << 4) | IS31FL3741_SW_PULLUP));
-    // Set PWM frequency
-    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_PWM_FREQUENCY, (IS31FL3741_PWM_FREQUENCY & 0b1111));
-
-    // is31fl3741_update_led_scaling_registers(addr, 0xFF, 0xFF, 0xFF);
-
-    // Wait 10ms to ensure the device has woken up.
-    wait_ms(10);
-}
-
-void is31fl3741_set_value(int index, uint8_t value) {
-    is31fl3741_led_t led;
-    if (index >= 0 && index < IS31FL3741_LED_COUNT) {
-        memcpy_P(&led, (&g_is31fl3741_leds[index]), sizeof(led));
-
-        if (g_pwm_buffer[led.driver][led.v] == value) {
-            return;
-        }
-        g_pwm_buffer_update_required[led.driver] = true;
-        g_pwm_buffer[led.driver][led.v]          = value;
-    }
-}
-
-void is31fl3741_set_value_all(uint8_t value) {
-    for (int i = 0; i < IS31FL3741_LED_COUNT; i++) {
-        is31fl3741_set_value(i, value);
-    }
-}
-
-void is31fl3741_set_led_control_register(uint8_t index, bool value) {
-    is31fl3741_led_t led;
-    memcpy_P(&led, (&g_is31fl3741_leds[index]), sizeof(led));
-
-    if (value) {
-        g_scaling_registers[led.driver][led.v] = 0xFF;
-    } else {
-        g_scaling_registers[led.driver][led.v] = 0x00;
-    }
-
-    g_scaling_registers_update_required[led.driver] = true;
-}
-
-void is31fl3741_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        // unlock the command register and select PG2
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_PWM_0);
-
-        is31fl3741_write_pwm_buffer(addr, g_pwm_buffer[index]);
-    }
-
-    g_pwm_buffer_update_required[index] = false;
-}
-
-void is31fl3741_set_pwm_buffer(const is31fl3741_led_t *pled, uint8_t value) {
-    g_pwm_buffer[pled->driver][pled->v] = value;
-
-    g_pwm_buffer_update_required[pled->driver] = true;
-}
-
-void is31fl3741_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_scaling_registers_update_required[index]) {
-        // unlock the command register and select PG2
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_SCALING_0);
-
-        // CS1_SW1 to CS30_SW6 are on PG2
-        for (int i = CS1_SW1; i <= CS30_SW6; ++i) {
-            is31fl3741_write_register(addr, i, g_scaling_registers[index][i]);
-        }
-
-        // unlock the command register and select PG3
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_SCALING_1);
-
-        // CS1_SW7 to CS39_SW9 are on PG3
-        for (int i = CS1_SW7; i <= CS39_SW9; ++i) {
-            is31fl3741_write_register(addr, i - CS1_SW7, g_scaling_registers[index][i]);
-        }
-
-        g_scaling_registers_update_required[index] = false;
-    }
-}
-
-void is31fl3741_set_scaling_registers(const is31fl3741_led_t *pled, uint8_t value) {
-    g_scaling_registers[pled->driver][pled->v] = value;
-
-    g_scaling_registers_update_required[pled->driver] = true;
-}
-
-void is31fl3741_flush(void) {
-    is31fl3741_update_pwm_buffers(IS31FL3741_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3741_I2C_ADDRESS_2)
-    is31fl3741_update_pwm_buffers(IS31FL3741_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3741_I2C_ADDRESS_3)
-    is31fl3741_update_pwm_buffers(IS31FL3741_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3741_I2C_ADDRESS_4)
-    is31fl3741_update_pwm_buffers(IS31FL3741_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
diff --git a/drivers/led/issi/is31fl3741-simple.h b/drivers/led/issi/is31fl3741-simple.h
deleted file mode 100644
index 34608a37e00..00000000000
--- a/drivers/led/issi/is31fl3741-simple.h
+++ /dev/null
@@ -1,516 +0,0 @@
-/* Copyright 2017 Jason Williams
- * Copyright 2018 Jack Humbert
- * Copyright 2018 Yiancar
- * Copyright 2020 MelGeek
- *
- * 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"
-#include "util.h"
-
-// ======== DEPRECATED DEFINES - DO NOT USE ========
-#ifdef ISSI_TIMEOUT
-#    define IS31FL3741_I2C_TIMEOUT ISSI_TIMEOUT
-#endif
-#ifdef ISSI_PERSISTENCE
-#    define IS31FL3741_I2C_PERSISTENCE ISSI_PERSISTENCE
-#endif
-#ifdef ISSI_CONFIGURATION
-#    define IS31FL3741_CONFIGURATION ISSI_CONFIGURATION
-#endif
-#ifdef ISSI_SWPULLUP
-#    define IS31FL3741_SW_PULLUP ISSI_SWPULLUP
-#endif
-#ifdef ISSI_CSPULLUP
-#    define IS31FL3741_CS_PULLDOWN ISSI_CSPULLUP
-#endif
-#ifdef ISSI_GLOBALCURRENT
-#    define IS31FL3741_GLOBAL_CURRENT ISSI_GLOBALCURRENT
-#endif
-
-#define PUR_0R IS31FL3741_PUR_0_OHM
-#define PUR_05KR IS31FL3741_PUR_0K5_OHM
-#define PUR_1KR IS31FL3741_PUR_1K_OHM
-#define PUR_2KR IS31FL3741_PUR_2K_OHM
-#define PUR_4KR IS31FL3741_PUR_4K_OHM
-#define PUR_8KR IS31FL3741_PUR_8K_OHM
-#define PUR_16KR IS31FL3741_PUR_16K_OHM
-#define PUR_32KR IS31FL3741_PUR_32K_OHM
-// ========
-
-#define IS31FL3741_REG_INTERRUPT_MASK 0xF0
-#define IS31FL3741_REG_INTERRUPT_STATUS 0xF1
-#define IS31FL3741_REG_ID 0xFC
-
-#define IS31FL3741_REG_COMMAND 0xFD
-
-#define IS31FL3741_COMMAND_PWM_0 0x00
-#define IS31FL3741_COMMAND_PWM_1 0x01
-#define IS31FL3741_COMMAND_SCALING_0 0x02
-#define IS31FL3741_COMMAND_SCALING_1 0x03
-#define IS31FL3741_COMMAND_FUNCTION 0x04
-
-#define IS31FL3741_FUNCTION_REG_CONFIGURATION 0x00
-#define IS31FL3741_FUNCTION_REG_GLOBAL_CURRENT 0x01
-#define IS31FL3741_FUNCTION_REG_PULLDOWNUP 0x02
-#define IS31FL3741_FUNCTION_REG_PWM_FREQUENCY 0x36
-#define IS31FL3741_FUNCTION_REG_RESET 0x3F
-
-#define IS31FL3741_REG_COMMAND_WRITE_LOCK 0xFE
-#define IS31FL3741_COMMAND_WRITE_LOCK_MAGIC 0xC5
-
-#define IS31FL3741_I2C_ADDRESS_GND 0x30
-#define IS31FL3741_I2C_ADDRESS_SCL 0x31
-#define IS31FL3741_I2C_ADDRESS_SDA 0x32
-#define IS31FL3741_I2C_ADDRESS_VCC 0x33
-
-#if defined(LED_MATRIX_IS31FL3741)
-#    define IS31FL3741_LED_COUNT LED_MATRIX_LED_COUNT
-#endif
-
-#if defined(IS31FL3741_I2C_ADDRESS_4)
-#    define IS31FL3741_DRIVER_COUNT 4
-#elif defined(IS31FL3741_I2C_ADDRESS_3)
-#    define IS31FL3741_DRIVER_COUNT 3
-#elif defined(IS31FL3741_I2C_ADDRESS_2)
-#    define IS31FL3741_DRIVER_COUNT 2
-#elif defined(IS31FL3741_I2C_ADDRESS_1)
-#    define IS31FL3741_DRIVER_COUNT 1
-#endif
-
-typedef struct is31fl3741_led_t {
-    uint8_t  driver : 2;
-    uint16_t v : 9;
-} PACKED is31fl3741_led_t;
-
-extern const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT];
-
-void is31fl3741_init_drivers(void);
-void is31fl3741_init(uint8_t addr);
-void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-bool is31fl3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
-
-void is31fl3741_set_value(int index, uint8_t value);
-void is31fl3741_set_value_all(uint8_t value);
-
-void is31fl3741_set_led_control_register(uint8_t index, bool value);
-
-// This should not be called from an interrupt
-// (eg. from a timer interrupt).
-// Call this while idle (in between matrix scans).
-// If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3741_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3741_update_led_control_registers(uint8_t addr, uint8_t index);
-void is31fl3741_set_scaling_registers(const is31fl3741_led_t *pled, uint8_t value);
-
-void is31fl3741_set_pwm_buffer(const is31fl3741_led *pled, uint8_t value);
-
-void is31fl3741_flush(void);
-
-#define IS31FL3741_PDR_0_OHM 0b000   // No pull-down resistor
-#define IS31FL3741_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
-#define IS31FL3741_PDR_1K_OHM 0b010  // 1 kOhm resistor
-#define IS31FL3741_PDR_2K_OHM 0b011  // 2 kOhm resistor
-#define IS31FL3741_PDR_4K_OHM 0b100  // 4 kOhm resistor
-#define IS31FL3741_PDR_8K_OHM 0b101  // 8 kOhm resistor
-#define IS31FL3741_PDR_16K_OHM 0b110 // 16 kOhm resistor
-#define IS31FL3741_PDR_32K_OHM 0b111 // 32 kOhm resistor
-
-#define IS31FL3741_PUR_0_OHM 0b000   // No pull-up resistor
-#define IS31FL3741_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
-#define IS31FL3741_PUR_1K_OHM 0b010  // 1 kOhm resistor
-#define IS31FL3741_PUR_2K_OHM 0b011  // 2 kOhm resistor
-#define IS31FL3741_PUR_4K_OHM 0b100  // 4 kOhm resistor
-#define IS31FL3741_PUR_8K_OHM 0b101  // 8 kOhm resistor
-#define IS31FL3741_PUR_16K_OHM 0b110 // 16 kOhm resistor
-#define IS31FL3741_PUR_32K_OHM 0b111 // 32 kOhm resistor
-
-#define IS31FL3741_PWM_FREQUENCY_29K_HZ 0b0000
-#define IS31FL3741_PWM_FREQUENCY_3K6_HZ 0b0011
-#define IS31FL3741_PWM_FREQUENCY_1K8_HZ 0b0111
-#define IS31FL3741_PWM_FREQUENCY_900_HZ 0b1011
-
-#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
-
-#define CS1_SW7 0xB4
-#define CS2_SW7 0xB5
-#define CS3_SW7 0xB6
-#define CS4_SW7 0xB7
-#define CS5_SW7 0xB8
-#define CS6_SW7 0xB9
-#define CS7_SW7 0xBA
-#define CS8_SW7 0xBB
-#define CS9_SW7 0xBC
-#define CS10_SW7 0xBD
-#define CS11_SW7 0xBE
-#define CS12_SW7 0xBF
-#define CS13_SW7 0xC0
-#define CS14_SW7 0xC1
-#define CS15_SW7 0xC2
-#define CS16_SW7 0xC3
-#define CS17_SW7 0xC4
-#define CS18_SW7 0xC5
-#define CS19_SW7 0xC6
-#define CS20_SW7 0xC7
-#define CS21_SW7 0xC8
-#define CS22_SW7 0xC9
-#define CS23_SW7 0xCA
-#define CS24_SW7 0xCB
-#define CS25_SW7 0xCC
-#define CS26_SW7 0xCD
-#define CS27_SW7 0xCE
-#define CS28_SW7 0xCF
-#define CS29_SW7 0xD0
-#define CS30_SW7 0xD1
-
-#define CS1_SW8 0xD2
-#define CS2_SW8 0xD3
-#define CS3_SW8 0xD4
-#define CS4_SW8 0xD5
-#define CS5_SW8 0xD6
-#define CS6_SW8 0xD7
-#define CS7_SW8 0xD8
-#define CS8_SW8 0xD9
-#define CS9_SW8 0xDA
-#define CS10_SW8 0xDB
-#define CS11_SW8 0xDC
-#define CS12_SW8 0xDD
-#define CS13_SW8 0xDE
-#define CS14_SW8 0xDF
-#define CS15_SW8 0xE0
-#define CS16_SW8 0xE1
-#define CS17_SW8 0xE2
-#define CS18_SW8 0xE3
-#define CS19_SW8 0xE4
-#define CS20_SW8 0xE5
-#define CS21_SW8 0xE6
-#define CS22_SW8 0xE7
-#define CS23_SW8 0xE8
-#define CS24_SW8 0xE9
-#define CS25_SW8 0xEA
-#define CS26_SW8 0xEB
-#define CS27_SW8 0xEC
-#define CS28_SW8 0xED
-#define CS29_SW8 0xEE
-#define CS30_SW8 0xEF
-
-#define CS1_SW9 0xF0
-#define CS2_SW9 0xF1
-#define CS3_SW9 0xF2
-#define CS4_SW9 0xF3
-#define CS5_SW9 0xF4
-#define CS6_SW9 0xF5
-#define CS7_SW9 0xF6
-#define CS8_SW9 0xF7
-#define CS9_SW9 0xF8
-#define CS10_SW9 0xF9
-#define CS11_SW9 0xFA
-#define CS12_SW9 0xFB
-#define CS13_SW9 0xFC
-#define CS14_SW9 0xFD
-#define CS15_SW9 0xFE
-#define CS16_SW9 0xFF
-#define CS17_SW9 0x100
-#define CS18_SW9 0x101
-#define CS19_SW9 0x102
-#define CS20_SW9 0x103
-#define CS21_SW9 0x104
-#define CS22_SW9 0x105
-#define CS23_SW9 0x106
-#define CS24_SW9 0x107
-#define CS25_SW9 0x108
-#define CS26_SW9 0x109
-#define CS27_SW9 0x10A
-#define CS28_SW9 0x10B
-#define CS29_SW9 0x10C
-#define CS30_SW9 0x10D
-
-#define CS31_SW1 0x10E
-#define CS32_SW1 0x10F
-#define CS33_SW1 0x110
-#define CS34_SW1 0x111
-#define CS35_SW1 0x112
-#define CS36_SW1 0x113
-#define CS37_SW1 0x114
-#define CS38_SW1 0x115
-#define CS39_SW1 0x116
-
-#define CS31_SW2 0x117
-#define CS32_SW2 0x118
-#define CS33_SW2 0x119
-#define CS34_SW2 0x11A
-#define CS35_SW2 0x11B
-#define CS36_SW2 0x11C
-#define CS37_SW2 0x11D
-#define CS38_SW2 0x11E
-#define CS39_SW2 0x11F
-
-#define CS31_SW3 0x120
-#define CS32_SW3 0x121
-#define CS33_SW3 0x122
-#define CS34_SW3 0x123
-#define CS35_SW3 0x124
-#define CS36_SW3 0x125
-#define CS37_SW3 0x126
-#define CS38_SW3 0x127
-#define CS39_SW3 0x128
-
-#define CS31_SW4 0x129
-#define CS32_SW4 0x12A
-#define CS33_SW4 0x12B
-#define CS34_SW4 0x12C
-#define CS35_SW4 0x12D
-#define CS36_SW4 0x12E
-#define CS37_SW4 0x12F
-#define CS38_SW4 0x130
-#define CS39_SW4 0x131
-
-#define CS31_SW5 0x132
-#define CS32_SW5 0x133
-#define CS33_SW5 0x134
-#define CS34_SW5 0x135
-#define CS35_SW5 0x136
-#define CS36_SW5 0x137
-#define CS37_SW5 0x138
-#define CS38_SW5 0x139
-#define CS39_SW5 0x13A
-
-#define CS31_SW6 0x13B
-#define CS32_SW6 0x13C
-#define CS33_SW6 0x13D
-#define CS34_SW6 0x13E
-#define CS35_SW6 0x13F
-#define CS36_SW6 0x140
-#define CS37_SW6 0x141
-#define CS38_SW6 0x142
-#define CS39_SW6 0x143
-
-#define CS31_SW7 0x144
-#define CS32_SW7 0x145
-#define CS33_SW7 0x146
-#define CS34_SW7 0x147
-#define CS35_SW7 0x148
-#define CS36_SW7 0x149
-#define CS37_SW7 0x14A
-#define CS38_SW7 0x14B
-#define CS39_SW7 0x14C
-
-#define CS31_SW8 0x14D
-#define CS32_SW8 0x14E
-#define CS33_SW8 0x14F
-#define CS34_SW8 0x150
-#define CS35_SW8 0x151
-#define CS36_SW8 0x152
-#define CS37_SW8 0x153
-#define CS38_SW8 0x154
-#define CS39_SW8 0x155
-
-#define CS31_SW9 0x156
-#define CS32_SW9 0x157
-#define CS33_SW9 0x158
-#define CS34_SW9 0x159
-#define CS35_SW9 0x15A
-#define CS36_SW9 0x15B
-#define CS37_SW9 0x15C
-#define CS38_SW9 0x15D
-#define CS39_SW9 0x15E
diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
index efcfa77b468..3614d1c104c 100644
--- a/drivers/led/issi/is31fl3741.c
+++ b/drivers/led/issi/is31fl3741.c
@@ -18,11 +18,14 @@
  */
 
 #include "is31fl3741.h"
-#include <string.h>
 #include "i2c_master.h"
+#include "gpio.h"
 #include "wait.h"
 
-#define IS31FL3741_PWM_REGISTER_COUNT 351
+#define IS31FL3741_PWM_0_REGISTER_COUNT 180
+#define IS31FL3741_PWM_1_REGISTER_COUNT 171
+#define IS31FL3741_SCALING_0_REGISTER_COUNT 180
+#define IS31FL3741_SCALING_1_REGISTER_COUNT 171
 
 #ifndef IS31FL3741_I2C_TIMEOUT
 #    define IS31FL3741_I2C_TIMEOUT 100
@@ -52,150 +55,166 @@
 #    define IS31FL3741_GLOBAL_CURRENT 0xFF
 #endif
 
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20] = {0xFF};
+const uint8_t i2c_addresses[IS31FL3741_DRIVER_COUNT] = {
+    IS31FL3741_I2C_ADDRESS_1,
+#ifdef IS31FL3741_I2C_ADDRESS_2
+    IS31FL3741_I2C_ADDRESS_2,
+#    ifdef IS31FL3741_I2C_ADDRESS_3
+    IS31FL3741_I2C_ADDRESS_3,
+#        ifdef IS31FL3741_I2C_ADDRESS_4
+    IS31FL3741_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
 
 // These buffers match the IS31FL3741 and IS31FL3741A PWM registers.
-// The scaling buffers match the PG2 and PG3 LED On/Off registers.
+// The scaling buffers match the page 2 and 3 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3741_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
-uint8_t g_pwm_buffer[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3741_DRIVER_COUNT]        = {false};
-bool    g_scaling_registers_update_required[IS31FL3741_DRIVER_COUNT] = {false};
-
-uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
-
-void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
+typedef struct is31fl3741_driver_t {
+    uint8_t pwm_buffer_0[IS31FL3741_PWM_0_REGISTER_COUNT];
+    uint8_t pwm_buffer_1[IS31FL3741_PWM_1_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer_0[IS31FL3741_SCALING_0_REGISTER_COUNT];
+    uint8_t scaling_buffer_1[IS31FL3741_SCALING_1_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3741_driver_t;
+
+is31fl3741_driver_t driver_buffers[IS31FL3741_DRIVER_COUNT] = {{
+    .pwm_buffer_0         = {0},
+    .pwm_buffer_1         = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer_0     = {0},
+    .scaling_buffer_1     = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3741_write_register(uint8_t index, uint8_t reg, uint8_t data) {
 #if IS31FL3741_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT) == 0) break;
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3741_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, IS31FL3741_I2C_TIMEOUT);
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3741_I2C_TIMEOUT);
 #endif
 }
 
-bool is31fl3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assume PG0 is already selected
+void is31fl3741_select_page(uint8_t index, uint8_t page) {
+    is31fl3741_write_register(index, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3741_write_register(index, IS31FL3741_REG_COMMAND, page);
+}
 
-    for (int i = 0; i < 342; i += 18) {
-        if (i == 180) {
-            // unlock the command register and select PG1
-            is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-            is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_PWM_1);
-        }
+void is31fl3741_write_pwm_buffer(uint8_t index) {
+    is31fl3741_select_page(index, IS31FL3741_COMMAND_PWM_0);
 
-        g_twi_transfer_buffer[0] = i % 180;
-        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 18);
+    // Transmit PWM0 registers in 6 transfers of 30 bytes.
 
+    // Iterate over the pwm_buffer_0 contents at 30 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3741_PWM_0_REGISTER_COUNT; i += 30) {
 #if IS31FL3741_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
-                return false;
-            }
+        for (uint8_t j = 0; j < IS31FL3741_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer_0 + i, 30, IS31FL3741_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
 #else
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, IS31FL3741_I2C_TIMEOUT) != 0) {
-            return false;
-        }
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer_0 + i, 30, IS31FL3741_I2C_TIMEOUT);
 #endif
     }
 
-    // transfer the left cause the total number is 351
-    g_twi_transfer_buffer[0] = 162;
-    memcpy(g_twi_transfer_buffer + 1, pwm_buffer + 342, 9);
+    is31fl3741_select_page(index, IS31FL3741_COMMAND_PWM_1);
+
+    // Transmit PWM1 registers in 9 transfers of 19 bytes.
 
+    // Iterate over the pwm_buffer_1 contents at 19 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3741_PWM_1_REGISTER_COUNT; i += 19) {
 #if IS31FL3741_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
-            return false;
+        for (uint8_t i = 0; i < IS31FL3741_I2C_PERSISTENCE; i++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer_1 + i, 19, IS31FL3741_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
-    }
 #else
-    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, IS31FL3741_I2C_TIMEOUT) != 0) {
-        return false;
-    }
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer_1 + i, 19, IS31FL3741_I2C_TIMEOUT);
 #endif
-
-    return true;
+    }
 }
 
 void is31fl3741_init_drivers(void) {
     i2c_init();
 
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_1);
-#if defined(IS31FL3741_I2C_ADDRESS_2)
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_2);
-#    if defined(IS31FL3741_I2C_ADDRESS_3)
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_3);
-#        if defined(IS31FL3741_I2C_ADDRESS_4)
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_4);
-#        endif
-#    endif
+#if defined(IS31FL3741_SDB_PIN)
+    gpio_set_pin_output(IS31FL3741_SDB_PIN);
+    gpio_write_pin_high(IS31FL3741_SDB_PIN);
 #endif
 
+    for (uint8_t i = 0; i < IS31FL3741_DRIVER_COUNT; i++) {
+        is31fl3741_init(i);
+    }
+
     for (int i = 0; i < IS31FL3741_LED_COUNT; i++) {
         is31fl3741_set_led_control_register(i, true, true, true);
     }
 
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3741_I2C_ADDRESS_2)
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3741_I2C_ADDRESS_3)
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3741_I2C_ADDRESS_4)
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3741_DRIVER_COUNT; i++) {
+        is31fl3741_update_led_control_registers(i);
+    }
 }
 
-void is31fl3741_init(uint8_t addr) {
+void is31fl3741_init(uint8_t index) {
     // In order to avoid the LEDs being driven with garbage data
     // in the LED driver's PWM registers, shutdown is enabled last.
     // Set up the mode and other settings, clear the PWM registers,
     // then disable software shutdown.
     // Unlock the command register.
 
-    // Unlock the command register.
-    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-
-    // Select PG4
-    is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_FUNCTION);
+    is31fl3741_select_page(index, IS31FL3741_COMMAND_FUNCTION);
 
     // Set to Normal operation
-    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_CONFIGURATION, IS31FL3741_CONFIGURATION);
+    is31fl3741_write_register(index, IS31FL3741_FUNCTION_REG_CONFIGURATION, IS31FL3741_CONFIGURATION);
 
     // Set Golbal Current Control Register
-    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3741_GLOBAL_CURRENT);
+    is31fl3741_write_register(index, IS31FL3741_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3741_GLOBAL_CURRENT);
     // Set Pull up & Down for SWx CSy
-    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_PULLDOWNUP, ((IS31FL3741_CS_PULLDOWN << 4) | IS31FL3741_SW_PULLUP));
+    is31fl3741_write_register(index, IS31FL3741_FUNCTION_REG_PULLDOWNUP, ((IS31FL3741_CS_PULLDOWN << 4) | IS31FL3741_SW_PULLUP));
     // Set PWM frequency
-    is31fl3741_write_register(addr, IS31FL3741_FUNCTION_REG_PWM_FREQUENCY, (IS31FL3741_PWM_FREQUENCY & 0b1111));
+    is31fl3741_write_register(index, IS31FL3741_FUNCTION_REG_PWM_FREQUENCY, (IS31FL3741_PWM_FREQUENCY & 0b1111));
 
-    // is31fl3741_update_led_scaling_registers(addr, 0xFF, 0xFF, 0xFF);
+    // is31fl3741_update_led_scaling_registers(index, 0xFF, 0xFF, 0xFF);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
 }
 
+uint8_t get_pwm_value(uint8_t driver, uint16_t reg) {
+    if (reg & 0x100) {
+        return driver_buffers[driver].pwm_buffer_1[reg & 0xFF];
+    } else {
+        return driver_buffers[driver].pwm_buffer_0[reg];
+    }
+}
+
+void set_pwm_value(uint8_t driver, uint16_t reg, uint8_t value) {
+    if (reg & 0x100) {
+        driver_buffers[driver].pwm_buffer_1[reg & 0xFF] = value;
+    } else {
+        driver_buffers[driver].pwm_buffer_0[reg] = value;
+    }
+}
+
 void is31fl3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31fl3741_led_t led;
+
     if (index >= 0 && index < IS31FL3741_LED_COUNT) {
         memcpy_P(&led, (&g_is31fl3741_leds[index]), sizeof(led));
 
-        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+        if (get_pwm_value(led.driver, led.r) == red && get_pwm_value(led.driver, led.g) == green && get_pwm_value(led.driver, led.b) == blue) {
             return;
         }
-        g_pwm_buffer_update_required[led.driver] = true;
-        g_pwm_buffer[led.driver][led.r]          = red;
-        g_pwm_buffer[led.driver][led.g]          = green;
-        g_pwm_buffer[led.driver][led.b]          = blue;
+
+        set_pwm_value(led.driver, led.r, red);
+        set_pwm_value(led.driver, led.g, green);
+        set_pwm_value(led.driver, led.b, blue);
+        driver_buffers[led.driver].pwm_buffer_dirty = true;
     }
 }
 
@@ -205,92 +224,67 @@ void is31fl3741_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     }
 }
 
-void is31fl3741_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
-    is31fl3741_led_t led;
-    memcpy_P(&led, (&g_is31fl3741_leds[index]), sizeof(led));
-
-    if (red) {
-        g_scaling_registers[led.driver][led.r] = 0xFF;
+void set_scaling_value(uint8_t driver, uint16_t reg, uint8_t value) {
+    if (reg & 0x100) {
+        driver_buffers[driver].scaling_buffer_1[reg & 0xFF] = value;
     } else {
-        g_scaling_registers[led.driver][led.r] = 0x00;
+        driver_buffers[driver].scaling_buffer_0[reg] = value;
     }
+}
 
-    if (green) {
-        g_scaling_registers[led.driver][led.g] = 0xFF;
-    } else {
-        g_scaling_registers[led.driver][led.g] = 0x00;
-    }
+void is31fl3741_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+    is31fl3741_led_t led;
+    memcpy_P(&led, (&g_is31fl3741_leds[index]), sizeof(led));
 
-    if (blue) {
-        g_scaling_registers[led.driver][led.b] = 0xFF;
-    } else {
-        g_scaling_registers[led.driver][led.b] = 0x00;
-    }
+    set_scaling_value(led.driver, led.r, red ? 0xFF : 0x00);
+    set_scaling_value(led.driver, led.g, green ? 0xFF : 0x00);
+    set_scaling_value(led.driver, led.b, blue ? 0xFF : 0x00);
 
-    g_scaling_registers_update_required[led.driver] = true;
+    driver_buffers[led.driver].scaling_buffer_dirty = true;
 }
 
-void is31fl3741_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        // unlock the command register and select PG2
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_PWM_0);
+void is31fl3741_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3741_write_pwm_buffer(index);
 
-        is31fl3741_write_pwm_buffer(addr, g_pwm_buffer[index]);
+        driver_buffers[index].pwm_buffer_dirty = false;
     }
-
-    g_pwm_buffer_update_required[index] = false;
 }
 
 void is31fl3741_set_pwm_buffer(const is31fl3741_led_t *pled, uint8_t red, uint8_t green, uint8_t blue) {
-    g_pwm_buffer[pled->driver][pled->r] = red;
-    g_pwm_buffer[pled->driver][pled->g] = green;
-    g_pwm_buffer[pled->driver][pled->b] = blue;
-
-    g_pwm_buffer_update_required[pled->driver] = true;
+    set_pwm_value(pled->driver, pled->r, red);
+    set_pwm_value(pled->driver, pled->g, green);
+    set_pwm_value(pled->driver, pled->b, blue);
+    driver_buffers[pled->driver].pwm_buffer_dirty = true;
 }
 
-void is31fl3741_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_scaling_registers_update_required[index]) {
-        // unlock the command register and select PG2
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_SCALING_0);
+void is31fl3741_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3741_select_page(index, IS31FL3741_COMMAND_SCALING_0);
 
-        // CS1_SW1 to CS30_SW6 are on PG2
-        for (int i = CS1_SW1; i <= CS30_SW6; ++i) {
-            is31fl3741_write_register(addr, i, g_scaling_registers[index][i]);
+        for (uint8_t i = 0; i < IS31FL3741_SCALING_0_REGISTER_COUNT; i++) {
+            is31fl3741_write_register(index, i, driver_buffers[index].scaling_buffer_0[i]);
         }
 
-        // unlock the command register and select PG3
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND_WRITE_LOCK, IS31FL3741_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3741_write_register(addr, IS31FL3741_REG_COMMAND, IS31FL3741_COMMAND_SCALING_1);
+        is31fl3741_select_page(index, IS31FL3741_COMMAND_SCALING_1);
 
-        // CS1_SW7 to CS39_SW9 are on PG3
-        for (int i = CS1_SW7; i <= CS39_SW9; ++i) {
-            is31fl3741_write_register(addr, i - CS1_SW7, g_scaling_registers[index][i]);
+        for (uint8_t i = 0; i < IS31FL3741_SCALING_1_REGISTER_COUNT; i++) {
+            is31fl3741_write_register(index, i, driver_buffers[index].scaling_buffer_1[i]);
         }
 
-        g_scaling_registers_update_required[index] = false;
+        driver_buffers[index].scaling_buffer_dirty = false;
     }
 }
 
 void is31fl3741_set_scaling_registers(const is31fl3741_led_t *pled, uint8_t red, uint8_t green, uint8_t blue) {
-    g_scaling_registers[pled->driver][pled->r] = red;
-    g_scaling_registers[pled->driver][pled->g] = green;
-    g_scaling_registers[pled->driver][pled->b] = blue;
-
-    g_scaling_registers_update_required[pled->driver] = true;
+    set_scaling_value(pled->driver, pled->r, red);
+    set_scaling_value(pled->driver, pled->g, green);
+    set_scaling_value(pled->driver, pled->b, blue);
+    driver_buffers[pled->driver].scaling_buffer_dirty = true;
 }
 
 void is31fl3741_flush(void) {
-    is31fl3741_update_pwm_buffers(IS31FL3741_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3741_I2C_ADDRESS_2)
-    is31fl3741_update_pwm_buffers(IS31FL3741_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3741_I2C_ADDRESS_3)
-    is31fl3741_update_pwm_buffers(IS31FL3741_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3741_I2C_ADDRESS_4)
-    is31fl3741_update_pwm_buffers(IS31FL3741_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3741_DRIVER_COUNT; i++) {
+        is31fl3741_update_pwm_buffers(i);
+    }
 }
diff --git a/drivers/led/issi/is31fl3741.h b/drivers/led/issi/is31fl3741.h
index 6466696b606..cc9637a4e80 100644
--- a/drivers/led/issi/is31fl3741.h
+++ b/drivers/led/issi/is31fl3741.h
@@ -119,9 +119,9 @@ typedef struct is31fl3741_led_t {
 extern const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT];
 
 void is31fl3741_init_drivers(void);
-void is31fl3741_init(uint8_t addr);
-void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-bool is31fl3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+void is31fl3741_init(uint8_t index);
+void is31fl3741_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3741_select_page(uint8_t index, uint8_t page);
 
 void is31fl3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void is31fl3741_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
@@ -132,8 +132,8 @@ void is31fl3741_set_led_control_register(uint8_t index, bool red, bool green, bo
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3741_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3741_update_led_control_registers(uint8_t addr, uint8_t index);
+void is31fl3741_update_pwm_buffers(uint8_t index);
+void is31fl3741_update_led_control_registers(uint8_t index);
 void is31fl3741_set_scaling_registers(const is31fl3741_led_t *pled, uint8_t red, uint8_t green, uint8_t blue);
 
 void is31fl3741_set_pwm_buffer(const is31fl3741_led_t *pled, uint8_t red, uint8_t green, uint8_t blue);
@@ -163,371 +163,742 @@ void is31fl3741_flush(void);
 #define IS31FL3741_PWM_FREQUENCY_1K8_HZ 0b0111
 #define IS31FL3741_PWM_FREQUENCY_900_HZ 0b1011
 
-#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
-
-#define CS1_SW7 0xB4
-#define CS2_SW7 0xB5
-#define CS3_SW7 0xB6
-#define CS4_SW7 0xB7
-#define CS5_SW7 0xB8
-#define CS6_SW7 0xB9
-#define CS7_SW7 0xBA
-#define CS8_SW7 0xBB
-#define CS9_SW7 0xBC
-#define CS10_SW7 0xBD
-#define CS11_SW7 0xBE
-#define CS12_SW7 0xBF
-#define CS13_SW7 0xC0
-#define CS14_SW7 0xC1
-#define CS15_SW7 0xC2
-#define CS16_SW7 0xC3
-#define CS17_SW7 0xC4
-#define CS18_SW7 0xC5
-#define CS19_SW7 0xC6
-#define CS20_SW7 0xC7
-#define CS21_SW7 0xC8
-#define CS22_SW7 0xC9
-#define CS23_SW7 0xCA
-#define CS24_SW7 0xCB
-#define CS25_SW7 0xCC
-#define CS26_SW7 0xCD
-#define CS27_SW7 0xCE
-#define CS28_SW7 0xCF
-#define CS29_SW7 0xD0
-#define CS30_SW7 0xD1
-
-#define CS1_SW8 0xD2
-#define CS2_SW8 0xD3
-#define CS3_SW8 0xD4
-#define CS4_SW8 0xD5
-#define CS5_SW8 0xD6
-#define CS6_SW8 0xD7
-#define CS7_SW8 0xD8
-#define CS8_SW8 0xD9
-#define CS9_SW8 0xDA
-#define CS10_SW8 0xDB
-#define CS11_SW8 0xDC
-#define CS12_SW8 0xDD
-#define CS13_SW8 0xDE
-#define CS14_SW8 0xDF
-#define CS15_SW8 0xE0
-#define CS16_SW8 0xE1
-#define CS17_SW8 0xE2
-#define CS18_SW8 0xE3
-#define CS19_SW8 0xE4
-#define CS20_SW8 0xE5
-#define CS21_SW8 0xE6
-#define CS22_SW8 0xE7
-#define CS23_SW8 0xE8
-#define CS24_SW8 0xE9
-#define CS25_SW8 0xEA
-#define CS26_SW8 0xEB
-#define CS27_SW8 0xEC
-#define CS28_SW8 0xED
-#define CS29_SW8 0xEE
-#define CS30_SW8 0xEF
-
-#define CS1_SW9 0xF0
-#define CS2_SW9 0xF1
-#define CS3_SW9 0xF2
-#define CS4_SW9 0xF3
-#define CS5_SW9 0xF4
-#define CS6_SW9 0xF5
-#define CS7_SW9 0xF6
-#define CS8_SW9 0xF7
-#define CS9_SW9 0xF8
-#define CS10_SW9 0xF9
-#define CS11_SW9 0xFA
-#define CS12_SW9 0xFB
-#define CS13_SW9 0xFC
-#define CS14_SW9 0xFD
-#define CS15_SW9 0xFE
-#define CS16_SW9 0xFF
-#define CS17_SW9 0x100
-#define CS18_SW9 0x101
-#define CS19_SW9 0x102
-#define CS20_SW9 0x103
-#define CS21_SW9 0x104
-#define CS22_SW9 0x105
-#define CS23_SW9 0x106
-#define CS24_SW9 0x107
-#define CS25_SW9 0x108
-#define CS26_SW9 0x109
-#define CS27_SW9 0x10A
-#define CS28_SW9 0x10B
-#define CS29_SW9 0x10C
-#define CS30_SW9 0x10D
-
-#define CS31_SW1 0x10E
-#define CS32_SW1 0x10F
-#define CS33_SW1 0x110
-#define CS34_SW1 0x111
-#define CS35_SW1 0x112
-#define CS36_SW1 0x113
-#define CS37_SW1 0x114
-#define CS38_SW1 0x115
-#define CS39_SW1 0x116
-
-#define CS31_SW2 0x117
-#define CS32_SW2 0x118
-#define CS33_SW2 0x119
-#define CS34_SW2 0x11A
-#define CS35_SW2 0x11B
-#define CS36_SW2 0x11C
-#define CS37_SW2 0x11D
-#define CS38_SW2 0x11E
-#define CS39_SW2 0x11F
-
-#define CS31_SW3 0x120
-#define CS32_SW3 0x121
-#define CS33_SW3 0x122
-#define CS34_SW3 0x123
-#define CS35_SW3 0x124
-#define CS36_SW3 0x125
-#define CS37_SW3 0x126
-#define CS38_SW3 0x127
-#define CS39_SW3 0x128
-
-#define CS31_SW4 0x129
-#define CS32_SW4 0x12A
-#define CS33_SW4 0x12B
-#define CS34_SW4 0x12C
-#define CS35_SW4 0x12D
-#define CS36_SW4 0x12E
-#define CS37_SW4 0x12F
-#define CS38_SW4 0x130
-#define CS39_SW4 0x131
-
-#define CS31_SW5 0x132
-#define CS32_SW5 0x133
-#define CS33_SW5 0x134
-#define CS34_SW5 0x135
-#define CS35_SW5 0x136
-#define CS36_SW5 0x137
-#define CS37_SW5 0x138
-#define CS38_SW5 0x139
-#define CS39_SW5 0x13A
-
-#define CS31_SW6 0x13B
-#define CS32_SW6 0x13C
-#define CS33_SW6 0x13D
-#define CS34_SW6 0x13E
-#define CS35_SW6 0x13F
-#define CS36_SW6 0x140
-#define CS37_SW6 0x141
-#define CS38_SW6 0x142
-#define CS39_SW6 0x143
-
-#define CS31_SW7 0x144
-#define CS32_SW7 0x145
-#define CS33_SW7 0x146
-#define CS34_SW7 0x147
-#define CS35_SW7 0x148
-#define CS36_SW7 0x149
-#define CS37_SW7 0x14A
-#define CS38_SW7 0x14B
-#define CS39_SW7 0x14C
-
-#define CS31_SW8 0x14D
-#define CS32_SW8 0x14E
-#define CS33_SW8 0x14F
-#define CS34_SW8 0x150
-#define CS35_SW8 0x151
-#define CS36_SW8 0x152
-#define CS37_SW8 0x153
-#define CS38_SW8 0x154
-#define CS39_SW8 0x155
-
-#define CS31_SW9 0x156
-#define CS32_SW9 0x157
-#define CS33_SW9 0x158
-#define CS34_SW9 0x159
-#define CS35_SW9 0x15A
-#define CS36_SW9 0x15B
-#define CS37_SW9 0x15C
-#define CS38_SW9 0x15D
-#define CS39_SW9 0x15E
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+#define SW1_CS19 0x12
+#define SW1_CS20 0x13
+#define SW1_CS21 0x14
+#define SW1_CS22 0x15
+#define SW1_CS23 0x16
+#define SW1_CS24 0x17
+#define SW1_CS25 0x18
+#define SW1_CS26 0x19
+#define SW1_CS27 0x1A
+#define SW1_CS28 0x1B
+#define SW1_CS29 0x1C
+#define SW1_CS30 0x1D
+
+#define SW2_CS1 0x1E
+#define SW2_CS2 0x1F
+#define SW2_CS3 0x20
+#define SW2_CS4 0x21
+#define SW2_CS5 0x22
+#define SW2_CS6 0x23
+#define SW2_CS7 0x24
+#define SW2_CS8 0x25
+#define SW2_CS9 0x26
+#define SW2_CS10 0x27
+#define SW2_CS11 0x28
+#define SW2_CS12 0x29
+#define SW2_CS13 0x2A
+#define SW2_CS14 0x2B
+#define SW2_CS15 0x2C
+#define SW2_CS16 0x2D
+#define SW2_CS17 0x2E
+#define SW2_CS18 0x2F
+#define SW2_CS19 0x30
+#define SW2_CS20 0x31
+#define SW2_CS21 0x32
+#define SW2_CS22 0x33
+#define SW2_CS23 0x34
+#define SW2_CS24 0x35
+#define SW2_CS25 0x36
+#define SW2_CS26 0x37
+#define SW2_CS27 0x38
+#define SW2_CS28 0x39
+#define SW2_CS29 0x3A
+#define SW2_CS30 0x3B
+
+#define SW3_CS1 0x3C
+#define SW3_CS2 0x3D
+#define SW3_CS3 0x3E
+#define SW3_CS4 0x3F
+#define SW3_CS5 0x40
+#define SW3_CS6 0x41
+#define SW3_CS7 0x42
+#define SW3_CS8 0x43
+#define SW3_CS9 0x44
+#define SW3_CS10 0x45
+#define SW3_CS11 0x46
+#define SW3_CS12 0x47
+#define SW3_CS13 0x48
+#define SW3_CS14 0x49
+#define SW3_CS15 0x4A
+#define SW3_CS16 0x4B
+#define SW3_CS17 0x4C
+#define SW3_CS18 0x4D
+#define SW3_CS19 0x4E
+#define SW3_CS20 0x4F
+#define SW3_CS21 0x50
+#define SW3_CS22 0x51
+#define SW3_CS23 0x52
+#define SW3_CS24 0x53
+#define SW3_CS25 0x54
+#define SW3_CS26 0x55
+#define SW3_CS27 0x56
+#define SW3_CS28 0x57
+#define SW3_CS29 0x58
+#define SW3_CS30 0x59
+
+#define SW4_CS1 0x5A
+#define SW4_CS2 0x5B
+#define SW4_CS3 0x5C
+#define SW4_CS4 0x5D
+#define SW4_CS5 0x5E
+#define SW4_CS6 0x5F
+#define SW4_CS7 0x60
+#define SW4_CS8 0x61
+#define SW4_CS9 0x62
+#define SW4_CS10 0x63
+#define SW4_CS11 0x64
+#define SW4_CS12 0x65
+#define SW4_CS13 0x66
+#define SW4_CS14 0x67
+#define SW4_CS15 0x68
+#define SW4_CS16 0x69
+#define SW4_CS17 0x6A
+#define SW4_CS18 0x6B
+#define SW4_CS19 0x6C
+#define SW4_CS20 0x6D
+#define SW4_CS21 0x6E
+#define SW4_CS22 0x6F
+#define SW4_CS23 0x70
+#define SW4_CS24 0x71
+#define SW4_CS25 0x72
+#define SW4_CS26 0x73
+#define SW4_CS27 0x74
+#define SW4_CS28 0x75
+#define SW4_CS29 0x76
+#define SW4_CS30 0x77
+
+#define SW5_CS1 0x78
+#define SW5_CS2 0x79
+#define SW5_CS3 0x7A
+#define SW5_CS4 0x7B
+#define SW5_CS5 0x7C
+#define SW5_CS6 0x7D
+#define SW5_CS7 0x7E
+#define SW5_CS8 0x7F
+#define SW5_CS9 0x80
+#define SW5_CS10 0x81
+#define SW5_CS11 0x82
+#define SW5_CS12 0x83
+#define SW5_CS13 0x84
+#define SW5_CS14 0x85
+#define SW5_CS15 0x86
+#define SW5_CS16 0x87
+#define SW5_CS17 0x88
+#define SW5_CS18 0x89
+#define SW5_CS19 0x8A
+#define SW5_CS20 0x8B
+#define SW5_CS21 0x8C
+#define SW5_CS22 0x8D
+#define SW5_CS23 0x8E
+#define SW5_CS24 0x8F
+#define SW5_CS25 0x90
+#define SW5_CS26 0x91
+#define SW5_CS27 0x92
+#define SW5_CS28 0x93
+#define SW5_CS29 0x94
+#define SW5_CS30 0x95
+
+#define SW6_CS1 0x96
+#define SW6_CS2 0x97
+#define SW6_CS3 0x98
+#define SW6_CS4 0x99
+#define SW6_CS5 0x9A
+#define SW6_CS6 0x9B
+#define SW6_CS7 0x9C
+#define SW6_CS8 0x9D
+#define SW6_CS9 0x9E
+#define SW6_CS10 0x9F
+#define SW6_CS11 0xA0
+#define SW6_CS12 0xA1
+#define SW6_CS13 0xA2
+#define SW6_CS14 0xA3
+#define SW6_CS15 0xA4
+#define SW6_CS16 0xA5
+#define SW6_CS17 0xA6
+#define SW6_CS18 0xA7
+#define SW6_CS19 0xA8
+#define SW6_CS20 0xA9
+#define SW6_CS21 0xAA
+#define SW6_CS22 0xAB
+#define SW6_CS23 0xAC
+#define SW6_CS24 0xAD
+#define SW6_CS25 0xAE
+#define SW6_CS26 0xAF
+#define SW6_CS27 0xB0
+#define SW6_CS28 0xB1
+#define SW6_CS29 0xB2
+#define SW6_CS30 0xB3
+
+#define SW7_CS1 0x100
+#define SW7_CS2 0x101
+#define SW7_CS3 0x102
+#define SW7_CS4 0x103
+#define SW7_CS5 0x104
+#define SW7_CS6 0x105
+#define SW7_CS7 0x106
+#define SW7_CS8 0x107
+#define SW7_CS9 0x108
+#define SW7_CS10 0x109
+#define SW7_CS11 0x10A
+#define SW7_CS12 0x10B
+#define SW7_CS13 0x10C
+#define SW7_CS14 0x10D
+#define SW7_CS15 0x10E
+#define SW7_CS16 0x10F
+#define SW7_CS17 0x110
+#define SW7_CS18 0x111
+#define SW7_CS19 0x112
+#define SW7_CS20 0x113
+#define SW7_CS21 0x114
+#define SW7_CS22 0x115
+#define SW7_CS23 0x116
+#define SW7_CS24 0x117
+#define SW7_CS25 0x118
+#define SW7_CS26 0x119
+#define SW7_CS27 0x11A
+#define SW7_CS28 0x11B
+#define SW7_CS29 0x11C
+#define SW7_CS30 0x11D
+
+#define SW8_CS1 0x11E
+#define SW8_CS2 0x11F
+#define SW8_CS3 0x120
+#define SW8_CS4 0x121
+#define SW8_CS5 0x122
+#define SW8_CS6 0x123
+#define SW8_CS7 0x124
+#define SW8_CS8 0x125
+#define SW8_CS9 0x126
+#define SW8_CS10 0x127
+#define SW8_CS11 0x128
+#define SW8_CS12 0x129
+#define SW8_CS13 0x12A
+#define SW8_CS14 0x12B
+#define SW8_CS15 0x12C
+#define SW8_CS16 0x12D
+#define SW8_CS17 0x12E
+#define SW8_CS18 0x12F
+#define SW8_CS19 0x130
+#define SW8_CS20 0x131
+#define SW8_CS21 0x132
+#define SW8_CS22 0x133
+#define SW8_CS23 0x134
+#define SW8_CS24 0x135
+#define SW8_CS25 0x136
+#define SW8_CS26 0x137
+#define SW8_CS27 0x138
+#define SW8_CS28 0x139
+#define SW8_CS29 0x13A
+#define SW8_CS30 0x13B
+
+#define SW9_CS1 0x13C
+#define SW9_CS2 0x13D
+#define SW9_CS3 0x13E
+#define SW9_CS4 0x13F
+#define SW9_CS5 0x140
+#define SW9_CS6 0x141
+#define SW9_CS7 0x142
+#define SW9_CS8 0x143
+#define SW9_CS9 0x144
+#define SW9_CS10 0x145
+#define SW9_CS11 0x146
+#define SW9_CS12 0x147
+#define SW9_CS13 0x148
+#define SW9_CS14 0x149
+#define SW9_CS15 0x14A
+#define SW9_CS16 0x14B
+#define SW9_CS17 0x14C
+#define SW9_CS18 0x14D
+#define SW9_CS19 0x14E
+#define SW9_CS20 0x14F
+#define SW9_CS21 0x150
+#define SW9_CS22 0x151
+#define SW9_CS23 0x152
+#define SW9_CS24 0x153
+#define SW9_CS25 0x154
+#define SW9_CS26 0x155
+#define SW9_CS27 0x156
+#define SW9_CS28 0x157
+#define SW9_CS29 0x158
+#define SW9_CS30 0x159
+
+#define SW1_CS31 0x15A
+#define SW1_CS32 0x15B
+#define SW1_CS33 0x15C
+#define SW1_CS34 0x15D
+#define SW1_CS35 0x15E
+#define SW1_CS36 0x15F
+#define SW1_CS37 0x160
+#define SW1_CS38 0x161
+#define SW1_CS39 0x162
+
+#define SW2_CS31 0x163
+#define SW2_CS32 0x164
+#define SW2_CS33 0x165
+#define SW2_CS34 0x166
+#define SW2_CS35 0x167
+#define SW2_CS36 0x168
+#define SW2_CS37 0x169
+#define SW2_CS38 0x16A
+#define SW2_CS39 0x16B
+
+#define SW3_CS31 0x16C
+#define SW3_CS32 0x16D
+#define SW3_CS33 0x16E
+#define SW3_CS34 0x16F
+#define SW3_CS35 0x170
+#define SW3_CS36 0x171
+#define SW3_CS37 0x172
+#define SW3_CS38 0x173
+#define SW3_CS39 0x174
+
+#define SW4_CS31 0x175
+#define SW4_CS32 0x176
+#define SW4_CS33 0x177
+#define SW4_CS34 0x178
+#define SW4_CS35 0x179
+#define SW4_CS36 0x17A
+#define SW4_CS37 0x17B
+#define SW4_CS38 0x17C
+#define SW4_CS39 0x17D
+
+#define SW5_CS31 0x17E
+#define SW5_CS32 0x17F
+#define SW5_CS33 0x180
+#define SW5_CS34 0x181
+#define SW5_CS35 0x182
+#define SW5_CS36 0x183
+#define SW5_CS37 0x184
+#define SW5_CS38 0x185
+#define SW5_CS39 0x186
+
+#define SW6_CS31 0x187
+#define SW6_CS32 0x188
+#define SW6_CS33 0x189
+#define SW6_CS34 0x18A
+#define SW6_CS35 0x18B
+#define SW6_CS36 0x18C
+#define SW6_CS37 0x18D
+#define SW6_CS38 0x18E
+#define SW6_CS39 0x18F
+
+#define SW7_CS31 0x190
+#define SW7_CS32 0x191
+#define SW7_CS33 0x192
+#define SW7_CS34 0x193
+#define SW7_CS35 0x194
+#define SW7_CS36 0x195
+#define SW7_CS37 0x196
+#define SW7_CS38 0x197
+#define SW7_CS39 0x198
+
+#define SW8_CS31 0x199
+#define SW8_CS32 0x19A
+#define SW8_CS33 0x19B
+#define SW8_CS34 0x19C
+#define SW8_CS35 0x19D
+#define SW8_CS36 0x19E
+#define SW8_CS37 0x19F
+#define SW8_CS38 0x1A0
+#define SW8_CS39 0x1A1
+
+#define SW9_CS31 0x1A2
+#define SW9_CS32 0x1A3
+#define SW9_CS33 0x1A4
+#define SW9_CS34 0x1A5
+#define SW9_CS35 0x1A6
+#define SW9_CS36 0x1A7
+#define SW9_CS37 0x1A8
+#define SW9_CS38 0x1A9
+#define SW9_CS39 0x1AA
+
+// DEPRECATED - DO NOT USE
+
+#define CS1_SW1 SW1_CS1
+#define CS2_SW1 SW1_CS2
+#define CS3_SW1 SW1_CS3
+#define CS4_SW1 SW1_CS4
+#define CS5_SW1 SW1_CS5
+#define CS6_SW1 SW1_CS6
+#define CS7_SW1 SW1_CS7
+#define CS8_SW1 SW1_CS8
+#define CS9_SW1 SW1_CS9
+#define CS10_SW1 SW1_CS10
+#define CS11_SW1 SW1_CS11
+#define CS12_SW1 SW1_CS12
+#define CS13_SW1 SW1_CS13
+#define CS14_SW1 SW1_CS14
+#define CS15_SW1 SW1_CS15
+#define CS16_SW1 SW1_CS16
+#define CS17_SW1 SW1_CS17
+#define CS18_SW1 SW1_CS18
+#define CS19_SW1 SW1_CS19
+#define CS20_SW1 SW1_CS20
+#define CS21_SW1 SW1_CS21
+#define CS22_SW1 SW1_CS22
+#define CS23_SW1 SW1_CS23
+#define CS24_SW1 SW1_CS24
+#define CS25_SW1 SW1_CS25
+#define CS26_SW1 SW1_CS26
+#define CS27_SW1 SW1_CS27
+#define CS28_SW1 SW1_CS28
+#define CS29_SW1 SW1_CS29
+#define CS30_SW1 SW1_CS30
+
+#define CS1_SW2 SW2_CS1
+#define CS2_SW2 SW2_CS2
+#define CS3_SW2 SW2_CS3
+#define CS4_SW2 SW2_CS4
+#define CS5_SW2 SW2_CS5
+#define CS6_SW2 SW2_CS6
+#define CS7_SW2 SW2_CS7
+#define CS8_SW2 SW2_CS8
+#define CS9_SW2 SW2_CS9
+#define CS10_SW2 SW2_CS10
+#define CS11_SW2 SW2_CS11
+#define CS12_SW2 SW2_CS12
+#define CS13_SW2 SW2_CS13
+#define CS14_SW2 SW2_CS14
+#define CS15_SW2 SW2_CS15
+#define CS16_SW2 SW2_CS16
+#define CS17_SW2 SW2_CS17
+#define CS18_SW2 SW2_CS18
+#define CS19_SW2 SW2_CS19
+#define CS20_SW2 SW2_CS20
+#define CS21_SW2 SW2_CS21
+#define CS22_SW2 SW2_CS22
+#define CS23_SW2 SW2_CS23
+#define CS24_SW2 SW2_CS24
+#define CS25_SW2 SW2_CS25
+#define CS26_SW2 SW2_CS26
+#define CS27_SW2 SW2_CS27
+#define CS28_SW2 SW2_CS28
+#define CS29_SW2 SW2_CS29
+#define CS30_SW2 SW2_CS30
+
+#define CS1_SW3 SW3_CS1
+#define CS2_SW3 SW3_CS2
+#define CS3_SW3 SW3_CS3
+#define CS4_SW3 SW3_CS4
+#define CS5_SW3 SW3_CS5
+#define CS6_SW3 SW3_CS6
+#define CS7_SW3 SW3_CS7
+#define CS8_SW3 SW3_CS8
+#define CS9_SW3 SW3_CS9
+#define CS10_SW3 SW3_CS10
+#define CS11_SW3 SW3_CS11
+#define CS12_SW3 SW3_CS12
+#define CS13_SW3 SW3_CS13
+#define CS14_SW3 SW3_CS14
+#define CS15_SW3 SW3_CS15
+#define CS16_SW3 SW3_CS16
+#define CS17_SW3 SW3_CS17
+#define CS18_SW3 SW3_CS18
+#define CS19_SW3 SW3_CS19
+#define CS20_SW3 SW3_CS20
+#define CS21_SW3 SW3_CS21
+#define CS22_SW3 SW3_CS22
+#define CS23_SW3 SW3_CS23
+#define CS24_SW3 SW3_CS24
+#define CS25_SW3 SW3_CS25
+#define CS26_SW3 SW3_CS26
+#define CS27_SW3 SW3_CS27
+#define CS28_SW3 SW3_CS28
+#define CS29_SW3 SW3_CS29
+#define CS30_SW3 SW3_CS30
+
+#define CS1_SW4 SW4_CS1
+#define CS2_SW4 SW4_CS2
+#define CS3_SW4 SW4_CS3
+#define CS4_SW4 SW4_CS4
+#define CS5_SW4 SW4_CS5
+#define CS6_SW4 SW4_CS6
+#define CS7_SW4 SW4_CS7
+#define CS8_SW4 SW4_CS8
+#define CS9_SW4 SW4_CS9
+#define CS10_SW4 SW4_CS10
+#define CS11_SW4 SW4_CS11
+#define CS12_SW4 SW4_CS12
+#define CS13_SW4 SW4_CS13
+#define CS14_SW4 SW4_CS14
+#define CS15_SW4 SW4_CS15
+#define CS16_SW4 SW4_CS16
+#define CS17_SW4 SW4_CS17
+#define CS18_SW4 SW4_CS18
+#define CS19_SW4 SW4_CS19
+#define CS20_SW4 SW4_CS20
+#define CS21_SW4 SW4_CS21
+#define CS22_SW4 SW4_CS22
+#define CS23_SW4 SW4_CS23
+#define CS24_SW4 SW4_CS24
+#define CS25_SW4 SW4_CS25
+#define CS26_SW4 SW4_CS26
+#define CS27_SW4 SW4_CS27
+#define CS28_SW4 SW4_CS28
+#define CS29_SW4 SW4_CS29
+#define CS30_SW4 SW4_CS30
+
+#define CS1_SW5 SW5_CS1
+#define CS2_SW5 SW5_CS2
+#define CS3_SW5 SW5_CS3
+#define CS4_SW5 SW5_CS4
+#define CS5_SW5 SW5_CS5
+#define CS6_SW5 SW5_CS6
+#define CS7_SW5 SW5_CS7
+#define CS8_SW5 SW5_CS8
+#define CS9_SW5 SW5_CS9
+#define CS10_SW5 SW5_CS10
+#define CS11_SW5 SW5_CS11
+#define CS12_SW5 SW5_CS12
+#define CS13_SW5 SW5_CS13
+#define CS14_SW5 SW5_CS14
+#define CS15_SW5 SW5_CS15
+#define CS16_SW5 SW5_CS16
+#define CS17_SW5 SW5_CS17
+#define CS18_SW5 SW5_CS18
+#define CS19_SW5 SW5_CS19
+#define CS20_SW5 SW5_CS20
+#define CS21_SW5 SW5_CS21
+#define CS22_SW5 SW5_CS22
+#define CS23_SW5 SW5_CS23
+#define CS24_SW5 SW5_CS24
+#define CS25_SW5 SW5_CS25
+#define CS26_SW5 SW5_CS26
+#define CS27_SW5 SW5_CS27
+#define CS28_SW5 SW5_CS28
+#define CS29_SW5 SW5_CS29
+#define CS30_SW5 SW5_CS30
+
+#define CS1_SW6 SW6_CS1
+#define CS2_SW6 SW6_CS2
+#define CS3_SW6 SW6_CS3
+#define CS4_SW6 SW6_CS4
+#define CS5_SW6 SW6_CS5
+#define CS6_SW6 SW6_CS6
+#define CS7_SW6 SW6_CS7
+#define CS8_SW6 SW6_CS8
+#define CS9_SW6 SW6_CS9
+#define CS10_SW6 SW6_CS10
+#define CS11_SW6 SW6_CS11
+#define CS12_SW6 SW6_CS12
+#define CS13_SW6 SW6_CS13
+#define CS14_SW6 SW6_CS14
+#define CS15_SW6 SW6_CS15
+#define CS16_SW6 SW6_CS16
+#define CS17_SW6 SW6_CS17
+#define CS18_SW6 SW6_CS18
+#define CS19_SW6 SW6_CS19
+#define CS20_SW6 SW6_CS20
+#define CS21_SW6 SW6_CS21
+#define CS22_SW6 SW6_CS22
+#define CS23_SW6 SW6_CS23
+#define CS24_SW6 SW6_CS24
+#define CS25_SW6 SW6_CS25
+#define CS26_SW6 SW6_CS26
+#define CS27_SW6 SW6_CS27
+#define CS28_SW6 SW6_CS28
+#define CS29_SW6 SW6_CS29
+#define CS30_SW6 SW6_CS30
+
+#define CS1_SW7 SW7_CS1
+#define CS2_SW7 SW7_CS2
+#define CS3_SW7 SW7_CS3
+#define CS4_SW7 SW7_CS4
+#define CS5_SW7 SW7_CS5
+#define CS6_SW7 SW7_CS6
+#define CS7_SW7 SW7_CS7
+#define CS8_SW7 SW7_CS8
+#define CS9_SW7 SW7_CS9
+#define CS10_SW7 SW7_CS10
+#define CS11_SW7 SW7_CS11
+#define CS12_SW7 SW7_CS12
+#define CS13_SW7 SW7_CS13
+#define CS14_SW7 SW7_CS14
+#define CS15_SW7 SW7_CS15
+#define CS16_SW7 SW7_CS16
+#define CS17_SW7 SW7_CS17
+#define CS18_SW7 SW7_CS18
+#define CS19_SW7 SW7_CS19
+#define CS20_SW7 SW7_CS20
+#define CS21_SW7 SW7_CS21
+#define CS22_SW7 SW7_CS22
+#define CS23_SW7 SW7_CS23
+#define CS24_SW7 SW7_CS24
+#define CS25_SW7 SW7_CS25
+#define CS26_SW7 SW7_CS26
+#define CS27_SW7 SW7_CS27
+#define CS28_SW7 SW7_CS28
+#define CS29_SW7 SW7_CS29
+#define CS30_SW7 SW7_CS30
+
+#define CS1_SW8 SW8_CS1
+#define CS2_SW8 SW8_CS2
+#define CS3_SW8 SW8_CS3
+#define CS4_SW8 SW8_CS4
+#define CS5_SW8 SW8_CS5
+#define CS6_SW8 SW8_CS6
+#define CS7_SW8 SW8_CS7
+#define CS8_SW8 SW8_CS8
+#define CS9_SW8 SW8_CS9
+#define CS10_SW8 SW8_CS10
+#define CS11_SW8 SW8_CS11
+#define CS12_SW8 SW8_CS12
+#define CS13_SW8 SW8_CS13
+#define CS14_SW8 SW8_CS14
+#define CS15_SW8 SW8_CS15
+#define CS16_SW8 SW8_CS16
+#define CS17_SW8 SW8_CS17
+#define CS18_SW8 SW8_CS18
+#define CS19_SW8 SW8_CS19
+#define CS20_SW8 SW8_CS20
+#define CS21_SW8 SW8_CS21
+#define CS22_SW8 SW8_CS22
+#define CS23_SW8 SW8_CS23
+#define CS24_SW8 SW8_CS24
+#define CS25_SW8 SW8_CS25
+#define CS26_SW8 SW8_CS26
+#define CS27_SW8 SW8_CS27
+#define CS28_SW8 SW8_CS28
+#define CS29_SW8 SW8_CS29
+#define CS30_SW8 SW8_CS30
+
+#define CS1_SW9 SW9_CS1
+#define CS2_SW9 SW9_CS2
+#define CS3_SW9 SW9_CS3
+#define CS4_SW9 SW9_CS4
+#define CS5_SW9 SW9_CS5
+#define CS6_SW9 SW9_CS6
+#define CS7_SW9 SW9_CS7
+#define CS8_SW9 SW9_CS8
+#define CS9_SW9 SW9_CS9
+#define CS10_SW9 SW9_CS10
+#define CS11_SW9 SW9_CS11
+#define CS12_SW9 SW9_CS12
+#define CS13_SW9 SW9_CS13
+#define CS14_SW9 SW9_CS14
+#define CS15_SW9 SW9_CS15
+#define CS16_SW9 SW9_CS16
+#define CS17_SW9 SW9_CS17
+#define CS18_SW9 SW9_CS18
+#define CS19_SW9 SW9_CS19
+#define CS20_SW9 SW9_CS20
+#define CS21_SW9 SW9_CS21
+#define CS22_SW9 SW9_CS22
+#define CS23_SW9 SW9_CS23
+#define CS24_SW9 SW9_CS24
+#define CS25_SW9 SW9_CS25
+#define CS26_SW9 SW9_CS26
+#define CS27_SW9 SW9_CS27
+#define CS28_SW9 SW9_CS28
+#define CS29_SW9 SW9_CS29
+#define CS30_SW9 SW9_CS30
+
+#define CS31_SW1 SW1_CS31
+#define CS32_SW1 SW1_CS32
+#define CS33_SW1 SW1_CS33
+#define CS34_SW1 SW1_CS34
+#define CS35_SW1 SW1_CS35
+#define CS36_SW1 SW1_CS36
+#define CS37_SW1 SW1_CS37
+#define CS38_SW1 SW1_CS38
+#define CS39_SW1 SW1_CS39
+
+#define CS31_SW2 SW2_CS31
+#define CS32_SW2 SW2_CS32
+#define CS33_SW2 SW2_CS33
+#define CS34_SW2 SW2_CS34
+#define CS35_SW2 SW2_CS35
+#define CS36_SW2 SW2_CS36
+#define CS37_SW2 SW2_CS37
+#define CS38_SW2 SW2_CS38
+#define CS39_SW2 SW2_CS39
+
+#define CS31_SW3 SW3_CS31
+#define CS32_SW3 SW3_CS32
+#define CS33_SW3 SW3_CS33
+#define CS34_SW3 SW3_CS34
+#define CS35_SW3 SW3_CS35
+#define CS36_SW3 SW3_CS36
+#define CS37_SW3 SW3_CS37
+#define CS38_SW3 SW3_CS38
+#define CS39_SW3 SW3_CS39
+
+#define CS31_SW4 SW4_CS31
+#define CS32_SW4 SW4_CS32
+#define CS33_SW4 SW4_CS33
+#define CS34_SW4 SW4_CS34
+#define CS35_SW4 SW4_CS35
+#define CS36_SW4 SW4_CS36
+#define CS37_SW4 SW4_CS37
+#define CS38_SW4 SW4_CS38
+#define CS39_SW4 SW4_CS39
+
+#define CS31_SW5 SW5_CS31
+#define CS32_SW5 SW5_CS32
+#define CS33_SW5 SW5_CS33
+#define CS34_SW5 SW5_CS34
+#define CS35_SW5 SW5_CS35
+#define CS36_SW5 SW5_CS36
+#define CS37_SW5 SW5_CS37
+#define CS38_SW5 SW5_CS38
+#define CS39_SW5 SW5_CS39
+
+#define CS31_SW6 SW6_CS31
+#define CS32_SW6 SW6_CS32
+#define CS33_SW6 SW6_CS33
+#define CS34_SW6 SW6_CS34
+#define CS35_SW6 SW6_CS35
+#define CS36_SW6 SW6_CS36
+#define CS37_SW6 SW6_CS37
+#define CS38_SW6 SW6_CS38
+#define CS39_SW6 SW6_CS39
+
+#define CS31_SW7 SW7_CS31
+#define CS32_SW7 SW7_CS32
+#define CS33_SW7 SW7_CS33
+#define CS34_SW7 SW7_CS34
+#define CS35_SW7 SW7_CS35
+#define CS36_SW7 SW7_CS36
+#define CS37_SW7 SW7_CS37
+#define CS38_SW7 SW7_CS38
+#define CS39_SW7 SW7_CS39
+
+#define CS31_SW8 SW8_CS31
+#define CS32_SW8 SW8_CS32
+#define CS33_SW8 SW8_CS33
+#define CS34_SW8 SW8_CS34
+#define CS35_SW8 SW8_CS35
+#define CS36_SW8 SW8_CS36
+#define CS37_SW8 SW8_CS37
+#define CS38_SW8 SW8_CS38
+#define CS39_SW8 SW8_CS39
+
+#define CS31_SW9 SW9_CS31
+#define CS32_SW9 SW9_CS32
+#define CS33_SW9 SW9_CS33
+#define CS34_SW9 SW9_CS34
+#define CS35_SW9 SW9_CS35
+#define CS36_SW9 SW9_CS36
+#define CS37_SW9 SW9_CS37
+#define CS38_SW9 SW9_CS38
+#define CS39_SW9 SW9_CS39
diff --git a/drivers/led/issi/is31fl3742.h b/drivers/led/issi/is31fl3742.h
deleted file mode 100644
index c96f12d0f1d..00000000000
--- a/drivers/led/issi/is31fl3742.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/* 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/is31fl3742a-mono.c b/drivers/led/issi/is31fl3742a-mono.c
new file mode 100644
index 00000000000..c63db1a7fc9
--- /dev/null
+++ b/drivers/led/issi/is31fl3742a-mono.c
@@ -0,0 +1,221 @@
+/* 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 "is31fl3742a-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3742A_PWM_REGISTER_COUNT 180
+#define IS31FL3742A_SCALING_REGISTER_COUNT 180
+
+#ifndef IS31FL3742A_I2C_TIMEOUT
+#    define IS31FL3742A_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3742A_I2C_PERSISTENCE
+#    define IS31FL3742A_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3742A_CONFIGURATION
+#    define IS31FL3742A_CONFIGURATION 0x31
+#endif
+
+#ifndef IS31FL3742A_PWM_FREQUENCY
+#    define IS31FL3742A_PWM_FREQUENCY IS31FL3742A_PWM_FREQUENCY_29K_HZ
+#endif
+
+#ifndef IS31FL3742A_SW_PULLDOWN
+#    define IS31FL3742A_SW_PULLDOWN IS31FL3742A_PDR_8K_OHM
+#endif
+
+#ifndef IS31FL3742A_CS_PULLUP
+#    define IS31FL3742A_CS_PULLUP IS31FL3742A_PUR_8K_OHM
+#endif
+
+#ifndef IS31FL3742A_GLOBAL_CURRENT
+#    define IS31FL3742A_GLOBAL_CURRENT 0xFF
+#endif
+
+const uint8_t i2c_addresses[IS31FL3742A_DRIVER_COUNT] = {
+    IS31FL3742A_I2C_ADDRESS_1,
+#ifdef IS31FL3742A_I2C_ADDRESS_2
+    IS31FL3742A_I2C_ADDRESS_2,
+#    ifdef IS31FL3742A_I2C_ADDRESS_3
+    IS31FL3742A_I2C_ADDRESS_3,
+#        ifdef IS31FL3742A_I2C_ADDRESS_4
+    IS31FL3742A_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3742a_driver_t {
+    uint8_t pwm_buffer[IS31FL3742A_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3742A_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3742a_driver_t;
+
+is31fl3742a_driver_t driver_buffers[IS31FL3742A_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3742a_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3742A_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3742A_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3742a_select_page(uint8_t index, uint8_t page) {
+    is31fl3742a_write_register(index, IS31FL3742A_REG_COMMAND_WRITE_LOCK, IS31FL3742A_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3742a_write_register(index, IS31FL3742A_REG_COMMAND, page);
+}
+
+void is31fl3742a_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 6 transfers of 30 bytes.
+
+    // Iterate over the pwm_buffer contents at 30 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3742A_PWM_REGISTER_COUNT; i += 30) {
+#if IS31FL3742A_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3742A_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 30, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 30, IS31FL3742A_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3742a_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3742A_SDB_PIN)
+    gpio_set_pin_output(IS31FL3742A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3742A_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) {
+        is31fl3742a_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3742A_LED_COUNT; i++) {
+        is31fl3742a_set_scaling_register(i, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) {
+        is31fl3742a_update_scaling_registers(i);
+    }
+}
+
+void is31fl3742a_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3742a_select_page(index, IS31FL3742A_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3742A_SCALING_REGISTER_COUNT; i++) {
+        is31fl3742a_write_register(index, i, 0x00);
+    }
+
+    is31fl3742a_select_page(index, IS31FL3742A_COMMAND_PWM);
+
+    for (uint8_t i = 0; i < IS31FL3742A_PWM_REGISTER_COUNT; i++) {
+        is31fl3742a_write_register(index, i, 0x00);
+    }
+
+    is31fl3742a_select_page(index, IS31FL3742A_COMMAND_FUNCTION);
+
+    is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_PULLDOWNUP, (IS31FL3742A_SW_PULLDOWN << 4) | IS31FL3742A_CS_PULLUP);
+    is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3742A_GLOBAL_CURRENT);
+    is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_PWM_FREQUENCY, (IS31FL3742A_PWM_FREQUENCY & 0b0111));
+    is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_CONFIGURATION, IS31FL3742A_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3742a_set_value(int index, uint8_t value) {
+    is31fl3742a_led_t led;
+
+    if (index >= 0 && index < IS31FL3742A_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3742a_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3742a_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3742A_LED_COUNT; i++) {
+        is31fl3742a_set_value(i, value);
+    }
+}
+
+void is31fl3742a_set_scaling_register(uint8_t index, uint8_t value) {
+    is31fl3742a_led_t led;
+    memcpy_P(&led, (&g_is31fl3742a_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].scaling_buffer[led.v] = value;
+    driver_buffers[led.driver].scaling_buffer_dirty  = true;
+}
+
+void is31fl3742a_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3742a_select_page(index, IS31FL3742A_COMMAND_PWM);
+
+        is31fl3742a_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3742a_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3742a_select_page(index, IS31FL3742A_COMMAND_SCALING);
+
+        for (uint8_t i = 0; i < IS31FL3742A_SCALING_REGISTER_COUNT; i++) {
+            is31fl3742a_write_register(index, i, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3742a_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) {
+        is31fl3742a_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3742a-mono.h b/drivers/led/issi/is31fl3742a-mono.h
new file mode 100644
index 00000000000..5c8938906ce
--- /dev/null
+++ b/drivers/led/issi/is31fl3742a-mono.h
@@ -0,0 +1,296 @@
+/* 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"
+#include "util.h"
+
+#define IS31FL3742A_REG_INTERRUPT_MASK 0xF0
+#define IS31FL3742A_REG_INTERRUPT_STATUS 0xF1
+#define IS31FL3742A_REG_ID 0xFC
+
+#define IS31FL3742A_REG_COMMAND 0xFD
+
+#define IS31FL3742A_COMMAND_PWM 0x00
+#define IS31FL3742A_COMMAND_SCALING 0x02
+#define IS31FL3742A_COMMAND_FUNCTION 0x04
+
+#define IS31FL3742A_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3742A_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3742A_FUNCTION_REG_PULLDOWNUP 0x02
+#define IS31FL3742A_FUNCTION_REG_PWM_FREQUENCY 0x36
+#define IS31FL3742A_FUNCTION_REG_RESET 0x3F
+#define IS31FL3742A_FUNCTION_REG_SPREAD_SPECTRUM 0x41
+
+#define IS31FL3742A_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3742A_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3742A_I2C_ADDRESS_GND 0x30
+#define IS31FL3742A_I2C_ADDRESS_SCL 0x31
+#define IS31FL3742A_I2C_ADDRESS_SDA 0x32
+#define IS31FL3742A_I2C_ADDRESS_VCC 0x33
+
+#if defined(LED_MATRIX_IS31FL3742A)
+#    define IS31FL3742A_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3742A_I2C_ADDRESS_4)
+#    define IS31FL3742A_DRIVER_COUNT 4
+#elif defined(IS31FL3742A_I2C_ADDRESS_3)
+#    define IS31FL3742A_DRIVER_COUNT 3
+#elif defined(IS31FL3742A_I2C_ADDRESS_2)
+#    define IS31FL3742A_DRIVER_COUNT 2
+#elif defined(IS31FL3742A_I2C_ADDRESS_1)
+#    define IS31FL3742A_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3742a_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3742a_led_t;
+
+extern const is31fl3742a_led_t PROGMEM g_is31fl3742a_leds[IS31FL3742A_LED_COUNT];
+
+void is31fl3742a_init_drivers(void);
+void is31fl3742a_init(uint8_t index);
+void is31fl3742a_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3742a_select_page(uint8_t index, uint8_t page);
+
+void is31fl3742a_set_value(int index, uint8_t value);
+void is31fl3742a_set_value_all(uint8_t value);
+
+void is31fl3742a_set_scaling_register(uint8_t index, uint8_t value);
+
+void is31fl3742a_update_pwm_buffers(uint8_t index);
+void is31fl3742a_update_scaling_registers(uint8_t index);
+
+void is31fl3742a_flush(void);
+
+#define IS31FL3742A_PDR_0_OHM 0b000   // No pull-down resistor
+#define IS31FL3742A_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3742A_PDR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3742A_PDR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3742A_PDR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3742A_PDR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3742A_PDR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3742A_PDR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3742A_PUR_0_OHM 0b000   // No pull-up resistor
+#define IS31FL3742A_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3742A_PUR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3742A_PUR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3742A_PUR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3742A_PUR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3742A_PUR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3742A_PUR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3742A_PWM_FREQUENCY_29K_HZ 0b0000
+#define IS31FL3742A_PWM_FREQUENCY_3K6_HZ 0b0011
+#define IS31FL3742A_PWM_FREQUENCY_1K8_HZ 0b0111
+#define IS31FL3742A_PWM_FREQUENCY_900_HZ 0b1011
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+#define SW1_CS19 0x12
+#define SW1_CS20 0x13
+#define SW1_CS21 0x14
+#define SW1_CS22 0x15
+#define SW1_CS23 0x16
+#define SW1_CS24 0x17
+#define SW1_CS25 0x18
+#define SW1_CS26 0x19
+#define SW1_CS27 0x1A
+#define SW1_CS28 0x1B
+#define SW1_CS29 0x1C
+#define SW1_CS30 0x1D
+
+#define SW2_CS1 0x1E
+#define SW2_CS2 0x1F
+#define SW2_CS3 0x20
+#define SW2_CS4 0x21
+#define SW2_CS5 0x22
+#define SW2_CS6 0x23
+#define SW2_CS7 0x24
+#define SW2_CS8 0x25
+#define SW2_CS9 0x26
+#define SW2_CS10 0x27
+#define SW2_CS11 0x28
+#define SW2_CS12 0x29
+#define SW2_CS13 0x2A
+#define SW2_CS14 0x2B
+#define SW2_CS15 0x2C
+#define SW2_CS16 0x2D
+#define SW2_CS17 0x2E
+#define SW2_CS18 0x2F
+#define SW2_CS19 0x30
+#define SW2_CS20 0x31
+#define SW2_CS21 0x32
+#define SW2_CS22 0x33
+#define SW2_CS23 0x34
+#define SW2_CS24 0x35
+#define SW2_CS25 0x36
+#define SW2_CS26 0x37
+#define SW2_CS27 0x38
+#define SW2_CS28 0x39
+#define SW2_CS29 0x3A
+#define SW2_CS30 0x3B
+
+#define SW3_CS1 0x3C
+#define SW3_CS2 0x3D
+#define SW3_CS3 0x3E
+#define SW3_CS4 0x3F
+#define SW3_CS5 0x40
+#define SW3_CS6 0x41
+#define SW3_CS7 0x42
+#define SW3_CS8 0x43
+#define SW3_CS9 0x44
+#define SW3_CS10 0x45
+#define SW3_CS11 0x46
+#define SW3_CS12 0x47
+#define SW3_CS13 0x48
+#define SW3_CS14 0x49
+#define SW3_CS15 0x4A
+#define SW3_CS16 0x4B
+#define SW3_CS17 0x4C
+#define SW3_CS18 0x4D
+#define SW3_CS19 0x4E
+#define SW3_CS20 0x4F
+#define SW3_CS21 0x50
+#define SW3_CS22 0x51
+#define SW3_CS23 0x52
+#define SW3_CS24 0x53
+#define SW3_CS25 0x54
+#define SW3_CS26 0x55
+#define SW3_CS27 0x56
+#define SW3_CS28 0x57
+#define SW3_CS29 0x58
+#define SW3_CS30 0x59
+
+#define SW4_CS1 0x5A
+#define SW4_CS2 0x5B
+#define SW4_CS3 0x5C
+#define SW4_CS4 0x5D
+#define SW4_CS5 0x5E
+#define SW4_CS6 0x5F
+#define SW4_CS7 0x60
+#define SW4_CS8 0x61
+#define SW4_CS9 0x62
+#define SW4_CS10 0x63
+#define SW4_CS11 0x64
+#define SW4_CS12 0x65
+#define SW4_CS13 0x66
+#define SW4_CS14 0x67
+#define SW4_CS15 0x68
+#define SW4_CS16 0x69
+#define SW4_CS17 0x6A
+#define SW4_CS18 0x6B
+#define SW4_CS19 0x6C
+#define SW4_CS20 0x6D
+#define SW4_CS21 0x6E
+#define SW4_CS22 0x6F
+#define SW4_CS23 0x70
+#define SW4_CS24 0x71
+#define SW4_CS25 0x72
+#define SW4_CS26 0x73
+#define SW4_CS27 0x74
+#define SW4_CS28 0x75
+#define SW4_CS29 0x76
+#define SW4_CS30 0x77
+
+#define SW5_CS1 0x78
+#define SW5_CS2 0x79
+#define SW5_CS3 0x7A
+#define SW5_CS4 0x7B
+#define SW5_CS5 0x7C
+#define SW5_CS6 0x7D
+#define SW5_CS7 0x7E
+#define SW5_CS8 0x7F
+#define SW5_CS9 0x80
+#define SW5_CS10 0x81
+#define SW5_CS11 0x82
+#define SW5_CS12 0x83
+#define SW5_CS13 0x84
+#define SW5_CS14 0x85
+#define SW5_CS15 0x86
+#define SW5_CS16 0x87
+#define SW5_CS17 0x88
+#define SW5_CS18 0x89
+#define SW5_CS19 0x8A
+#define SW5_CS20 0x8B
+#define SW5_CS21 0x8C
+#define SW5_CS22 0x8D
+#define SW5_CS23 0x8E
+#define SW5_CS24 0x8F
+#define SW5_CS25 0x90
+#define SW5_CS26 0x91
+#define SW5_CS27 0x92
+#define SW5_CS28 0x93
+#define SW5_CS29 0x94
+#define SW5_CS30 0x95
+
+#define SW6_CS1 0x96
+#define SW6_CS2 0x97
+#define SW6_CS3 0x98
+#define SW6_CS4 0x99
+#define SW6_CS5 0x9A
+#define SW6_CS6 0x9B
+#define SW6_CS7 0x9C
+#define SW6_CS8 0x9D
+#define SW6_CS9 0x9E
+#define SW6_CS10 0x9F
+#define SW6_CS11 0xA0
+#define SW6_CS12 0xA1
+#define SW6_CS13 0xA2
+#define SW6_CS14 0xA3
+#define SW6_CS15 0xA4
+#define SW6_CS16 0xA5
+#define SW6_CS17 0xA6
+#define SW6_CS18 0xA7
+#define SW6_CS19 0xA8
+#define SW6_CS20 0xA9
+#define SW6_CS21 0xAA
+#define SW6_CS22 0xAB
+#define SW6_CS23 0xAC
+#define SW6_CS24 0xAD
+#define SW6_CS25 0xAE
+#define SW6_CS26 0xAF
+#define SW6_CS27 0xB0
+#define SW6_CS28 0xB1
+#define SW6_CS29 0xB2
+#define SW6_CS30 0xB3
diff --git a/drivers/led/issi/is31fl3742a.c b/drivers/led/issi/is31fl3742a.c
new file mode 100644
index 00000000000..b8e9a587590
--- /dev/null
+++ b/drivers/led/issi/is31fl3742a.c
@@ -0,0 +1,225 @@
+/* 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 "is31fl3742a.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3742A_PWM_REGISTER_COUNT 180
+#define IS31FL3742A_SCALING_REGISTER_COUNT 180
+
+#ifndef IS31FL3742A_I2C_TIMEOUT
+#    define IS31FL3742A_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3742A_I2C_PERSISTENCE
+#    define IS31FL3742A_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3742A_CONFIGURATION
+#    define IS31FL3742A_CONFIGURATION 0x31
+#endif
+
+#ifndef IS31FL3742A_PWM_FREQUENCY
+#    define IS31FL3742A_PWM_FREQUENCY IS31FL3742A_PWM_FREQUENCY_29K_HZ
+#endif
+
+#ifndef IS31FL3742A_SW_PULLDOWN
+#    define IS31FL3742A_SW_PULLDOWN IS31FL3742A_PDR_8K_OHM
+#endif
+
+#ifndef IS31FL3742A_CS_PULLUP
+#    define IS31FL3742A_CS_PULLUP IS31FL3742A_PUR_8K_OHM
+#endif
+
+#ifndef IS31FL3742A_GLOBAL_CURRENT
+#    define IS31FL3742A_GLOBAL_CURRENT 0xFF
+#endif
+
+const uint8_t i2c_addresses[IS31FL3742A_DRIVER_COUNT] = {
+    IS31FL3742A_I2C_ADDRESS_1,
+#ifdef IS31FL3742A_I2C_ADDRESS_2
+    IS31FL3742A_I2C_ADDRESS_2,
+#    ifdef IS31FL3742A_I2C_ADDRESS_3
+    IS31FL3742A_I2C_ADDRESS_3,
+#        ifdef IS31FL3742A_I2C_ADDRESS_4
+    IS31FL3742A_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3742a_driver_t {
+    uint8_t pwm_buffer[IS31FL3742A_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3742A_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3742a_driver_t;
+
+is31fl3742a_driver_t driver_buffers[IS31FL3742A_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3742a_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3742A_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3742A_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3742a_select_page(uint8_t index, uint8_t page) {
+    is31fl3742a_write_register(index, IS31FL3742A_REG_COMMAND_WRITE_LOCK, IS31FL3742A_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3742a_write_register(index, IS31FL3742A_REG_COMMAND, page);
+}
+
+void is31fl3742a_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 6 transfers of 30 bytes.
+
+    // Iterate over the pwm_buffer contents at 30 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3742A_PWM_REGISTER_COUNT; i += 30) {
+#if IS31FL3742A_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3742A_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 30, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 30, IS31FL3742A_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3742a_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3742A_SDB_PIN)
+    gpio_set_pin_output(IS31FL3742A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3742A_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) {
+        is31fl3742a_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3742A_LED_COUNT; i++) {
+        is31fl3742a_set_scaling_register(i, 0xFF, 0xFF, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) {
+        is31fl3742a_update_scaling_registers(i);
+    }
+}
+
+void is31fl3742a_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3742a_select_page(index, IS31FL3742A_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3742A_SCALING_REGISTER_COUNT; i++) {
+        is31fl3742a_write_register(index, i, 0x00);
+    }
+
+    is31fl3742a_select_page(index, IS31FL3742A_COMMAND_PWM);
+
+    for (uint8_t i = 0; i < IS31FL3742A_PWM_REGISTER_COUNT; i++) {
+        is31fl3742a_write_register(index, i, 0x00);
+    }
+
+    is31fl3742a_select_page(index, IS31FL3742A_COMMAND_FUNCTION);
+
+    is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_PULLDOWNUP, (IS31FL3742A_SW_PULLDOWN << 4) | IS31FL3742A_CS_PULLUP);
+    is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3742A_GLOBAL_CURRENT);
+    is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_PWM_FREQUENCY, (IS31FL3742A_PWM_FREQUENCY & 0b0111));
+    is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_CONFIGURATION, IS31FL3742A_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3742a_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3742a_led_t led;
+
+    if (index >= 0 && index < IS31FL3742A_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3742a_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3742a_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (int i = 0; i < IS31FL3742A_LED_COUNT; i++) {
+        is31fl3742a_set_color(i, red, green, blue);
+    }
+}
+
+void is31fl3742a_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3742a_led_t led;
+    memcpy_P(&led, (&g_is31fl3742a_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].scaling_buffer[led.r] = red;
+    driver_buffers[led.driver].scaling_buffer[led.g] = green;
+    driver_buffers[led.driver].scaling_buffer[led.b] = blue;
+    driver_buffers[led.driver].scaling_buffer_dirty  = true;
+}
+
+void is31fl3742a_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3742a_select_page(index, IS31FL3742A_COMMAND_PWM);
+
+        is31fl3742a_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3742a_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3742a_select_page(index, IS31FL3742A_COMMAND_SCALING);
+
+        for (uint8_t i = 0; i < IS31FL3742A_SCALING_REGISTER_COUNT; i++) {
+            is31fl3742a_write_register(index, i, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3742a_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) {
+        is31fl3742a_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3742a.h b/drivers/led/issi/is31fl3742a.h
new file mode 100644
index 00000000000..10ecf500265
--- /dev/null
+++ b/drivers/led/issi/is31fl3742a.h
@@ -0,0 +1,298 @@
+/* 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"
+#include "util.h"
+
+#define IS31FL3742A_REG_INTERRUPT_MASK 0xF0
+#define IS31FL3742A_REG_INTERRUPT_STATUS 0xF1
+#define IS31FL3742A_REG_ID 0xFC
+
+#define IS31FL3742A_REG_COMMAND 0xFD
+
+#define IS31FL3742A_COMMAND_PWM 0x00
+#define IS31FL3742A_COMMAND_SCALING 0x02
+#define IS31FL3742A_COMMAND_FUNCTION 0x04
+
+#define IS31FL3742A_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3742A_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3742A_FUNCTION_REG_PULLDOWNUP 0x02
+#define IS31FL3742A_FUNCTION_REG_PWM_FREQUENCY 0x36
+#define IS31FL3742A_FUNCTION_REG_RESET 0x3F
+#define IS31FL3742A_FUNCTION_REG_SPREAD_SPECTRUM 0x41
+
+#define IS31FL3742A_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3742A_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3742A_I2C_ADDRESS_GND 0x30
+#define IS31FL3742A_I2C_ADDRESS_SCL 0x31
+#define IS31FL3742A_I2C_ADDRESS_SDA 0x32
+#define IS31FL3742A_I2C_ADDRESS_VCC 0x33
+
+#if defined(RGB_MATRIX_IS31FL3742A)
+#    define IS31FL3742A_LED_COUNT RGB_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3742A_I2C_ADDRESS_4)
+#    define IS31FL3742A_DRIVER_COUNT 4
+#elif defined(IS31FL3742A_I2C_ADDRESS_3)
+#    define IS31FL3742A_DRIVER_COUNT 3
+#elif defined(IS31FL3742A_I2C_ADDRESS_2)
+#    define IS31FL3742A_DRIVER_COUNT 2
+#elif defined(IS31FL3742A_I2C_ADDRESS_1)
+#    define IS31FL3742A_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3742a_led_t {
+    uint8_t driver : 2;
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+} PACKED is31fl3742a_led_t;
+
+extern const is31fl3742a_led_t PROGMEM g_is31fl3742a_leds[IS31FL3742A_LED_COUNT];
+
+void is31fl3742a_init_drivers(void);
+void is31fl3742a_init(uint8_t index);
+void is31fl3742a_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3742a_select_page(uint8_t index, uint8_t page);
+
+void is31fl3742a_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void is31fl3742a_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3742a_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3742a_update_pwm_buffers(uint8_t index);
+void is31fl3742a_update_scaling_registers(uint8_t index);
+
+void is31fl3742a_flush(void);
+
+#define IS31FL3742A_PDR_0_OHM 0b000   // No pull-down resistor
+#define IS31FL3742A_PDR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3742A_PDR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3742A_PDR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3742A_PDR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3742A_PDR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3742A_PDR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3742A_PDR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3742A_PUR_0_OHM 0b000   // No pull-up resistor
+#define IS31FL3742A_PUR_0K5_OHM 0b001 // 0.5 kOhm resistor
+#define IS31FL3742A_PUR_1K_OHM 0b010  // 1 kOhm resistor
+#define IS31FL3742A_PUR_2K_OHM 0b011  // 2 kOhm resistor
+#define IS31FL3742A_PUR_4K_OHM 0b100  // 4 kOhm resistor
+#define IS31FL3742A_PUR_8K_OHM 0b101  // 8 kOhm resistor
+#define IS31FL3742A_PUR_16K_OHM 0b110 // 16 kOhm resistor
+#define IS31FL3742A_PUR_32K_OHM 0b111 // 32 kOhm resistor
+
+#define IS31FL3742A_PWM_FREQUENCY_29K_HZ 0b0000
+#define IS31FL3742A_PWM_FREQUENCY_3K6_HZ 0b0011
+#define IS31FL3742A_PWM_FREQUENCY_1K8_HZ 0b0111
+#define IS31FL3742A_PWM_FREQUENCY_900_HZ 0b1011
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+#define SW1_CS19 0x12
+#define SW1_CS20 0x13
+#define SW1_CS21 0x14
+#define SW1_CS22 0x15
+#define SW1_CS23 0x16
+#define SW1_CS24 0x17
+#define SW1_CS25 0x18
+#define SW1_CS26 0x19
+#define SW1_CS27 0x1A
+#define SW1_CS28 0x1B
+#define SW1_CS29 0x1C
+#define SW1_CS30 0x1D
+
+#define SW2_CS1 0x1E
+#define SW2_CS2 0x1F
+#define SW2_CS3 0x20
+#define SW2_CS4 0x21
+#define SW2_CS5 0x22
+#define SW2_CS6 0x23
+#define SW2_CS7 0x24
+#define SW2_CS8 0x25
+#define SW2_CS9 0x26
+#define SW2_CS10 0x27
+#define SW2_CS11 0x28
+#define SW2_CS12 0x29
+#define SW2_CS13 0x2A
+#define SW2_CS14 0x2B
+#define SW2_CS15 0x2C
+#define SW2_CS16 0x2D
+#define SW2_CS17 0x2E
+#define SW2_CS18 0x2F
+#define SW2_CS19 0x30
+#define SW2_CS20 0x31
+#define SW2_CS21 0x32
+#define SW2_CS22 0x33
+#define SW2_CS23 0x34
+#define SW2_CS24 0x35
+#define SW2_CS25 0x36
+#define SW2_CS26 0x37
+#define SW2_CS27 0x38
+#define SW2_CS28 0x39
+#define SW2_CS29 0x3A
+#define SW2_CS30 0x3B
+
+#define SW3_CS1 0x3C
+#define SW3_CS2 0x3D
+#define SW3_CS3 0x3E
+#define SW3_CS4 0x3F
+#define SW3_CS5 0x40
+#define SW3_CS6 0x41
+#define SW3_CS7 0x42
+#define SW3_CS8 0x43
+#define SW3_CS9 0x44
+#define SW3_CS10 0x45
+#define SW3_CS11 0x46
+#define SW3_CS12 0x47
+#define SW3_CS13 0x48
+#define SW3_CS14 0x49
+#define SW3_CS15 0x4A
+#define SW3_CS16 0x4B
+#define SW3_CS17 0x4C
+#define SW3_CS18 0x4D
+#define SW3_CS19 0x4E
+#define SW3_CS20 0x4F
+#define SW3_CS21 0x50
+#define SW3_CS22 0x51
+#define SW3_CS23 0x52
+#define SW3_CS24 0x53
+#define SW3_CS25 0x54
+#define SW3_CS26 0x55
+#define SW3_CS27 0x56
+#define SW3_CS28 0x57
+#define SW3_CS29 0x58
+#define SW3_CS30 0x59
+
+#define SW4_CS1 0x5A
+#define SW4_CS2 0x5B
+#define SW4_CS3 0x5C
+#define SW4_CS4 0x5D
+#define SW4_CS5 0x5E
+#define SW4_CS6 0x5F
+#define SW4_CS7 0x60
+#define SW4_CS8 0x61
+#define SW4_CS9 0x62
+#define SW4_CS10 0x63
+#define SW4_CS11 0x64
+#define SW4_CS12 0x65
+#define SW4_CS13 0x66
+#define SW4_CS14 0x67
+#define SW4_CS15 0x68
+#define SW4_CS16 0x69
+#define SW4_CS17 0x6A
+#define SW4_CS18 0x6B
+#define SW4_CS19 0x6C
+#define SW4_CS20 0x6D
+#define SW4_CS21 0x6E
+#define SW4_CS22 0x6F
+#define SW4_CS23 0x70
+#define SW4_CS24 0x71
+#define SW4_CS25 0x72
+#define SW4_CS26 0x73
+#define SW4_CS27 0x74
+#define SW4_CS28 0x75
+#define SW4_CS29 0x76
+#define SW4_CS30 0x77
+
+#define SW5_CS1 0x78
+#define SW5_CS2 0x79
+#define SW5_CS3 0x7A
+#define SW5_CS4 0x7B
+#define SW5_CS5 0x7C
+#define SW5_CS6 0x7D
+#define SW5_CS7 0x7E
+#define SW5_CS8 0x7F
+#define SW5_CS9 0x80
+#define SW5_CS10 0x81
+#define SW5_CS11 0x82
+#define SW5_CS12 0x83
+#define SW5_CS13 0x84
+#define SW5_CS14 0x85
+#define SW5_CS15 0x86
+#define SW5_CS16 0x87
+#define SW5_CS17 0x88
+#define SW5_CS18 0x89
+#define SW5_CS19 0x8A
+#define SW5_CS20 0x8B
+#define SW5_CS21 0x8C
+#define SW5_CS22 0x8D
+#define SW5_CS23 0x8E
+#define SW5_CS24 0x8F
+#define SW5_CS25 0x90
+#define SW5_CS26 0x91
+#define SW5_CS27 0x92
+#define SW5_CS28 0x93
+#define SW5_CS29 0x94
+#define SW5_CS30 0x95
+
+#define SW6_CS1 0x96
+#define SW6_CS2 0x97
+#define SW6_CS3 0x98
+#define SW6_CS4 0x99
+#define SW6_CS5 0x9A
+#define SW6_CS6 0x9B
+#define SW6_CS7 0x9C
+#define SW6_CS8 0x9D
+#define SW6_CS9 0x9E
+#define SW6_CS10 0x9F
+#define SW6_CS11 0xA0
+#define SW6_CS12 0xA1
+#define SW6_CS13 0xA2
+#define SW6_CS14 0xA3
+#define SW6_CS15 0xA4
+#define SW6_CS16 0xA5
+#define SW6_CS17 0xA6
+#define SW6_CS18 0xA7
+#define SW6_CS19 0xA8
+#define SW6_CS20 0xA9
+#define SW6_CS21 0xAA
+#define SW6_CS22 0xAB
+#define SW6_CS23 0xAC
+#define SW6_CS24 0xAD
+#define SW6_CS25 0xAE
+#define SW6_CS26 0xAF
+#define SW6_CS27 0xB0
+#define SW6_CS28 0xB1
+#define SW6_CS29 0xB2
+#define SW6_CS30 0xB3
diff --git a/drivers/led/issi/is31fl3743.h b/drivers/led/issi/is31fl3743.h
deleted file mode 100644
index 706b2712549..00000000000
--- a/drivers/led/issi/is31fl3743.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/* 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
-#    ifndef DRIVER_ADDR_2
-#        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/is31fl3743a-mono.c b/drivers/led/issi/is31fl3743a-mono.c
new file mode 100644
index 00000000000..6413dbef04a
--- /dev/null
+++ b/drivers/led/issi/is31fl3743a-mono.c
@@ -0,0 +1,245 @@
+/* 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 "is31fl3743a-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3743A_PWM_REGISTER_COUNT 198
+#define IS31FL3743A_SCALING_REGISTER_COUNT 198
+
+#ifndef IS31FL3743A_I2C_TIMEOUT
+#    define IS31FL3743A_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3743A_I2C_PERSISTENCE
+#    define IS31FL3743A_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3743A_CONFIGURATION
+#    define IS31FL3743A_CONFIGURATION 0x01
+#endif
+
+#ifndef IS31FL3743A_SW_PULLDOWN
+#    define IS31FL3743A_SW_PULLDOWN IS31FL3743A_PDR_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3743A_CS_PULLUP
+#    define IS31FL3743A_CS_PULLUP IS31FL3743A_PUR_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3743A_GLOBAL_CURRENT
+#    define IS31FL3743A_GLOBAL_CURRENT 0xFF
+#endif
+
+#ifndef IS31FL3743A_SYNC_1
+#    define IS31FL3743A_SYNC_1 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_2
+#    define IS31FL3743A_SYNC_2 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_3
+#    define IS31FL3743A_SYNC_3 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_4
+#    define IS31FL3743A_SYNC_4 IS31FL3743A_SYNC_NONE
+#endif
+
+const uint8_t i2c_addresses[IS31FL3743A_DRIVER_COUNT] = {
+    IS31FL3743A_I2C_ADDRESS_1,
+#ifdef IS31FL3743A_I2C_ADDRESS_2
+    IS31FL3743A_I2C_ADDRESS_2,
+#    ifdef IS31FL3743A_I2C_ADDRESS_3
+    IS31FL3743A_I2C_ADDRESS_3,
+#        ifdef IS31FL3743A_I2C_ADDRESS_4
+    IS31FL3743A_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+const uint8_t driver_sync[IS31FL3743A_DRIVER_COUNT] = {
+    IS31FL3743A_SYNC_1,
+#ifdef IS31FL3743A_I2C_ADDRESS_2
+    IS31FL3743A_SYNC_2,
+#    ifdef IS31FL3743A_I2C_ADDRESS_3
+    IS31FL3743A_SYNC_3,
+#        ifdef IS31FL3743A_I2C_ADDRESS_4
+    IS31FL3743A_SYNC_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3743a_driver_t {
+    uint8_t pwm_buffer[IS31FL3743A_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3743A_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3743a_driver_t;
+
+is31fl3743a_driver_t driver_buffers[IS31FL3743A_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3743a_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3743A_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3743A_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3743A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3743A_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3743a_select_page(uint8_t index, uint8_t page) {
+    is31fl3743a_write_register(index, IS31FL3743A_REG_COMMAND_WRITE_LOCK, IS31FL3743A_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3743a_write_register(index, IS31FL3743A_REG_COMMAND, page);
+}
+
+void is31fl3743a_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 11 transfers of 18 bytes.
+
+    // Iterate over the pwm_buffer contents at 18 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3743A_PWM_REGISTER_COUNT; i += 18) {
+#if IS31FL3743A_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3743A_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3743A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3743A_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3743a_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3743A_SDB_PIN)
+    gpio_set_pin_output(IS31FL3743A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3743A_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3743A_DRIVER_COUNT; i++) {
+        is31fl3743a_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3743A_LED_COUNT; i++) {
+        is31fl3743a_set_scaling_register(i, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3743A_DRIVER_COUNT; i++) {
+        is31fl3743a_update_scaling_registers(i);
+    }
+}
+
+void is31fl3743a_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3743a_select_page(index, IS31FL3743A_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3743A_SCALING_REGISTER_COUNT; i++) {
+        is31fl3743a_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3743a_select_page(index, IS31FL3743A_COMMAND_PWM);
+
+    for (uint8_t i = 0; i < IS31FL3743A_PWM_REGISTER_COUNT; i++) {
+        is31fl3743a_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3743a_select_page(index, IS31FL3743A_COMMAND_FUNCTION);
+
+    uint8_t sync = driver_sync[index];
+
+    is31fl3743a_write_register(index, IS31FL3743A_FUNCTION_REG_PULLDOWNUP, (IS31FL3743A_SW_PULLDOWN << 4) | IS31FL3743A_CS_PULLUP);
+    is31fl3743a_write_register(index, IS31FL3743A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3743A_GLOBAL_CURRENT);
+    is31fl3743a_write_register(index, IS31FL3743A_FUNCTION_REG_SPREAD_SPECTRUM, (sync & 0b11) << 6);
+    is31fl3743a_write_register(index, IS31FL3743A_FUNCTION_REG_CONFIGURATION, IS31FL3743A_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3743a_set_value(int index, uint8_t value) {
+    is31fl3743a_led_t led;
+
+    if (index >= 0 && index < IS31FL3743A_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3743a_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3743a_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3743A_LED_COUNT; i++) {
+        is31fl3743a_set_value(i, value);
+    }
+}
+
+void is31fl3743a_set_scaling_register(uint8_t index, uint8_t value) {
+    is31fl3743a_led_t led;
+    memcpy_P(&led, (&g_is31fl3743a_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].scaling_buffer[led.v] = value;
+    driver_buffers[led.driver].scaling_buffer_dirty  = true;
+}
+
+void is31fl3743a_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3743a_select_page(index, IS31FL3743A_COMMAND_PWM);
+
+        is31fl3743a_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3743a_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3743a_select_page(index, IS31FL3743A_COMMAND_SCALING);
+
+        for (uint8_t i = 0; i < IS31FL3743A_SCALING_REGISTER_COUNT; i++) {
+            is31fl3743a_write_register(index, i + 1, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3743a_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3743A_DRIVER_COUNT; i++) {
+        is31fl3743a_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3743a-mono.h b/drivers/led/issi/is31fl3743a-mono.h
new file mode 100644
index 00000000000..4c582d3a7a9
--- /dev/null
+++ b/drivers/led/issi/is31fl3743a-mono.h
@@ -0,0 +1,328 @@
+/* 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"
+#include "util.h"
+
+#define IS31FL3743A_REG_ID 0xFC
+
+#define IS31FL3743A_REG_COMMAND 0xFD
+
+#define IS31FL3743A_COMMAND_PWM 0x00
+#define IS31FL3743A_COMMAND_SCALING 0x01
+#define IS31FL3743A_COMMAND_FUNCTION 0x02
+
+#define IS31FL3743A_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3743A_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3743A_FUNCTION_REG_PULLDOWNUP 0x02
+#define IS31FL3743A_FUNCTION_REG_TEMPERATURE 0x24
+#define IS31FL3743A_FUNCTION_REG_SPREAD_SPECTRUM 0x25
+#define IS31FL3743A_FUNCTION_REG_RESET 0x2F
+
+#define IS31FL3743A_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3743A_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3743A_I2C_ADDRESS_GND_GND 0x20
+#define IS31FL3743A_I2C_ADDRESS_GND_SCL 0x21
+#define IS31FL3743A_I2C_ADDRESS_GND_SDA 0x22
+#define IS31FL3743A_I2C_ADDRESS_GND_VCC 0x23
+#define IS31FL3743A_I2C_ADDRESS_SCL_GND 0x24
+#define IS31FL3743A_I2C_ADDRESS_SCL_SCL 0x25
+#define IS31FL3743A_I2C_ADDRESS_SCL_SDA 0x26
+#define IS31FL3743A_I2C_ADDRESS_SCL_VCC 0x27
+#define IS31FL3743A_I2C_ADDRESS_SDA_GND 0x28
+#define IS31FL3743A_I2C_ADDRESS_SDA_SCL 0x29
+#define IS31FL3743A_I2C_ADDRESS_SDA_SDA 0x2A
+#define IS31FL3743A_I2C_ADDRESS_SDA_VCC 0x2B
+#define IS31FL3743A_I2C_ADDRESS_VCC_GND 0x2C
+#define IS31FL3743A_I2C_ADDRESS_VCC_SCL 0x2D
+#define IS31FL3743A_I2C_ADDRESS_VCC_SDA 0x2E
+#define IS31FL3743A_I2C_ADDRESS_VCC_VCC 0x2F
+
+#if defined(LED_MATRIX_IS31FL3743A)
+#    define IS31FL3743A_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3743A_I2C_ADDRESS_4)
+#    define IS31FL3743A_DRIVER_COUNT 4
+#elif defined(IS31FL3743A_I2C_ADDRESS_3)
+#    define IS31FL3743A_DRIVER_COUNT 3
+#elif defined(IS31FL3743A_I2C_ADDRESS_2)
+#    define IS31FL3743A_DRIVER_COUNT 2
+#elif defined(IS31FL3743A_I2C_ADDRESS_1)
+#    define IS31FL3743A_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3743a_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3743a_led_t;
+
+extern const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT];
+
+void is31fl3743a_init_drivers(void);
+void is31fl3743a_init(uint8_t index);
+void is31fl3743a_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3743a_select_page(uint8_t index, uint8_t page);
+
+void is31fl3743a_set_value(int index, uint8_t value);
+void is31fl3743a_set_value_all(uint8_t value);
+
+void is31fl3743a_set_scaling_register(uint8_t index, uint8_t value);
+
+void is31fl3743a_update_pwm_buffers(uint8_t index);
+void is31fl3743a_update_scaling_registers(uint8_t index);
+
+void is31fl3743a_flush(void);
+
+#define IS31FL3743A_PDR_0_OHM 0b000          // No pull-down resistor
+#define IS31FL3743A_PDR_0K5_OHM_SW_OFF 0b001 // 0.5 kOhm resistor in SWx off time
+#define IS31FL3743A_PDR_1K_OHM_SW_OFF 0b010  // 1 kOhm resistor in SWx off time
+#define IS31FL3743A_PDR_2K_OHM_SW_OFF 0b011  // 2 kOhm resistor in SWx off time
+#define IS31FL3743A_PDR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3743A_PDR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3743A_PDR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3743A_PDR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3743A_PUR_0_OHM 0b000          // No pull-up resistor
+#define IS31FL3743A_PUR_0K5_OHM_CS_OFF 0b001 // 0.5 kOhm resistor in CSy off time
+#define IS31FL3743A_PUR_1K_OHM_CS_OFF 0b010  // 1 kOhm resistor in CSy off time
+#define IS31FL3743A_PUR_2K_OHM_CS_OFF 0b011  // 2 kOhm resistor in CSy off time
+#define IS31FL3743A_PUR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3743A_PUR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3743A_PUR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3743A_PUR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3743A_SYNC_NONE 0b00
+#define IS31FL3743A_SYNC_SLAVE 0b10
+#define IS31FL3743A_SYNC_MASTER 0b11
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+
+#define SW2_CS1 0x12
+#define SW2_CS2 0x13
+#define SW2_CS3 0x14
+#define SW2_CS4 0x15
+#define SW2_CS5 0x16
+#define SW2_CS6 0x17
+#define SW2_CS7 0x18
+#define SW2_CS8 0x19
+#define SW2_CS9 0x1A
+#define SW2_CS10 0x1B
+#define SW2_CS11 0x1C
+#define SW2_CS12 0x1D
+#define SW2_CS13 0x1E
+#define SW2_CS14 0x1F
+#define SW2_CS15 0x20
+#define SW2_CS16 0x21
+#define SW2_CS17 0x22
+#define SW2_CS18 0x23
+
+#define SW3_CS1 0x24
+#define SW3_CS2 0x25
+#define SW3_CS3 0x26
+#define SW3_CS4 0x27
+#define SW3_CS5 0x28
+#define SW3_CS6 0x29
+#define SW3_CS7 0x2A
+#define SW3_CS8 0x2B
+#define SW3_CS9 0x2C
+#define SW3_CS10 0x2D
+#define SW3_CS11 0x2E
+#define SW3_CS12 0x2F
+#define SW3_CS13 0x30
+#define SW3_CS14 0x31
+#define SW3_CS15 0x32
+#define SW3_CS16 0x33
+#define SW3_CS17 0x34
+#define SW3_CS18 0x35
+
+#define SW4_CS1 0x36
+#define SW4_CS2 0x37
+#define SW4_CS3 0x38
+#define SW4_CS4 0x39
+#define SW4_CS5 0x3A
+#define SW4_CS6 0x3B
+#define SW4_CS7 0x3C
+#define SW4_CS8 0x3D
+#define SW4_CS9 0x3E
+#define SW4_CS10 0x3F
+#define SW4_CS11 0x40
+#define SW4_CS12 0x41
+#define SW4_CS13 0x42
+#define SW4_CS14 0x43
+#define SW4_CS15 0x44
+#define SW4_CS16 0x45
+#define SW4_CS17 0x46
+#define SW4_CS18 0x47
+
+#define SW5_CS1 0x48
+#define SW5_CS2 0x49
+#define SW5_CS3 0x4A
+#define SW5_CS4 0x4B
+#define SW5_CS5 0x4C
+#define SW5_CS6 0x4D
+#define SW5_CS7 0x4E
+#define SW5_CS8 0x4F
+#define SW5_CS9 0x50
+#define SW5_CS10 0x51
+#define SW5_CS11 0x52
+#define SW5_CS12 0x53
+#define SW5_CS13 0x54
+#define SW5_CS14 0x55
+#define SW5_CS15 0x56
+#define SW5_CS16 0x57
+#define SW5_CS17 0x58
+#define SW5_CS18 0x59
+
+#define SW6_CS1 0x5A
+#define SW6_CS2 0x5B
+#define SW6_CS3 0x5C
+#define SW6_CS4 0x5D
+#define SW6_CS5 0x5E
+#define SW6_CS6 0x5F
+#define SW6_CS7 0x60
+#define SW6_CS8 0x61
+#define SW6_CS9 0x62
+#define SW6_CS10 0x63
+#define SW6_CS11 0x64
+#define SW6_CS12 0x65
+#define SW6_CS13 0x66
+#define SW6_CS14 0x67
+#define SW6_CS15 0x68
+#define SW6_CS16 0x69
+#define SW6_CS17 0x6A
+#define SW6_CS18 0x6B
+
+#define SW7_CS1 0x6C
+#define SW7_CS2 0x6D
+#define SW7_CS3 0x6E
+#define SW7_CS4 0x6F
+#define SW7_CS5 0x70
+#define SW7_CS6 0x71
+#define SW7_CS7 0x72
+#define SW7_CS8 0x73
+#define SW7_CS9 0x74
+#define SW7_CS10 0x75
+#define SW7_CS11 0x76
+#define SW7_CS12 0x77
+#define SW7_CS13 0x78
+#define SW7_CS14 0x79
+#define SW7_CS15 0x7A
+#define SW7_CS16 0x7B
+#define SW7_CS17 0x7C
+#define SW7_CS18 0x7D
+
+#define SW8_CS1 0x7E
+#define SW8_CS2 0x7F
+#define SW8_CS3 0x80
+#define SW8_CS4 0x81
+#define SW8_CS5 0x82
+#define SW8_CS6 0x83
+#define SW8_CS7 0x84
+#define SW8_CS8 0x85
+#define SW8_CS9 0x86
+#define SW8_CS10 0x87
+#define SW8_CS11 0x88
+#define SW8_CS12 0x89
+#define SW8_CS13 0x8A
+#define SW8_CS14 0x8B
+#define SW8_CS15 0x8C
+#define SW8_CS16 0x8D
+#define SW8_CS17 0x8E
+#define SW8_CS18 0x8F
+
+#define SW9_CS1 0x90
+#define SW9_CS2 0x91
+#define SW9_CS3 0x92
+#define SW9_CS4 0x93
+#define SW9_CS5 0x94
+#define SW9_CS6 0x95
+#define SW9_CS7 0x96
+#define SW9_CS8 0x97
+#define SW9_CS9 0x98
+#define SW9_CS10 0x99
+#define SW9_CS11 0x9A
+#define SW9_CS12 0x9B
+#define SW9_CS13 0x9C
+#define SW9_CS14 0x9D
+#define SW9_CS15 0x9E
+#define SW9_CS16 0x9F
+#define SW9_CS17 0xA0
+#define SW9_CS18 0xA1
+
+#define SW10_CS1 0xA2
+#define SW10_CS2 0xA3
+#define SW10_CS3 0xA4
+#define SW10_CS4 0xA5
+#define SW10_CS5 0xA6
+#define SW10_CS6 0xA7
+#define SW10_CS7 0xA8
+#define SW10_CS8 0xA9
+#define SW10_CS9 0xAA
+#define SW10_CS10 0xAB
+#define SW10_CS11 0xAC
+#define SW10_CS12 0xAD
+#define SW10_CS13 0xAE
+#define SW10_CS14 0xAF
+#define SW10_CS15 0xB0
+#define SW10_CS16 0xB1
+#define SW10_CS17 0xB2
+#define SW10_CS18 0xB3
+
+#define SW11_CS1 0xB4
+#define SW11_CS2 0xB5
+#define SW11_CS3 0xB6
+#define SW11_CS4 0xB7
+#define SW11_CS5 0xB8
+#define SW11_CS6 0xB9
+#define SW11_CS7 0xBA
+#define SW11_CS8 0xBB
+#define SW11_CS9 0xBC
+#define SW11_CS10 0xBD
+#define SW11_CS11 0xBE
+#define SW11_CS12 0xBF
+#define SW11_CS13 0xC0
+#define SW11_CS14 0xC1
+#define SW11_CS15 0xC2
+#define SW11_CS16 0xC3
+#define SW11_CS17 0xC4
+#define SW11_CS18 0xC5
diff --git a/drivers/led/issi/is31fl3743a.c b/drivers/led/issi/is31fl3743a.c
new file mode 100644
index 00000000000..6f13925f27a
--- /dev/null
+++ b/drivers/led/issi/is31fl3743a.c
@@ -0,0 +1,249 @@
+/* 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 "is31fl3743a.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3743A_PWM_REGISTER_COUNT 198
+#define IS31FL3743A_SCALING_REGISTER_COUNT 198
+
+#ifndef IS31FL3743A_I2C_TIMEOUT
+#    define IS31FL3743A_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3743A_I2C_PERSISTENCE
+#    define IS31FL3743A_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3743A_CONFIGURATION
+#    define IS31FL3743A_CONFIGURATION 0x01
+#endif
+
+#ifndef IS31FL3743A_SW_PULLDOWN
+#    define IS31FL3743A_SW_PULLDOWN IS31FL3743A_PDR_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3743A_CS_PULLUP
+#    define IS31FL3743A_CS_PULLUP IS31FL3743A_PUR_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3743A_GLOBAL_CURRENT
+#    define IS31FL3743A_GLOBAL_CURRENT 0xFF
+#endif
+
+#ifndef IS31FL3743A_SYNC_1
+#    define IS31FL3743A_SYNC_1 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_2
+#    define IS31FL3743A_SYNC_2 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_3
+#    define IS31FL3743A_SYNC_3 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_4
+#    define IS31FL3743A_SYNC_4 IS31FL3743A_SYNC_NONE
+#endif
+
+const uint8_t i2c_addresses[IS31FL3743A_DRIVER_COUNT] = {
+    IS31FL3743A_I2C_ADDRESS_1,
+#ifdef IS31FL3743A_I2C_ADDRESS_2
+    IS31FL3743A_I2C_ADDRESS_2,
+#    ifdef IS31FL3743A_I2C_ADDRESS_3
+    IS31FL3743A_I2C_ADDRESS_3,
+#        ifdef IS31FL3743A_I2C_ADDRESS_4
+    IS31FL3743A_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+const uint8_t driver_sync[IS31FL3743A_DRIVER_COUNT] = {
+    IS31FL3743A_SYNC_1,
+#ifdef IS31FL3743A_I2C_ADDRESS_2
+    IS31FL3743A_SYNC_2,
+#    ifdef IS31FL3743A_I2C_ADDRESS_3
+    IS31FL3743A_SYNC_3,
+#        ifdef IS31FL3743A_I2C_ADDRESS_4
+    IS31FL3743A_SYNC_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3743a_driver_t {
+    uint8_t pwm_buffer[IS31FL3743A_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3743A_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3743a_driver_t;
+
+is31fl3743a_driver_t driver_buffers[IS31FL3743A_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3743a_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3743A_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3743A_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3743A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3743A_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3743a_select_page(uint8_t index, uint8_t page) {
+    is31fl3743a_write_register(index, IS31FL3743A_REG_COMMAND_WRITE_LOCK, IS31FL3743A_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3743a_write_register(index, IS31FL3743A_REG_COMMAND, page);
+}
+
+void is31fl3743a_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 11 transfers of 18 bytes.
+
+    // Iterate over the pwm_buffer contents at 18 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3743A_PWM_REGISTER_COUNT; i += 18) {
+#if IS31FL3743A_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3743A_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3743A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3743A_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3743a_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3743A_SDB_PIN)
+    gpio_set_pin_output(IS31FL3743A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3743A_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3743A_DRIVER_COUNT; i++) {
+        is31fl3743a_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3743A_LED_COUNT; i++) {
+        is31fl3743a_set_scaling_register(i, 0xFF, 0xFF, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3743A_DRIVER_COUNT; i++) {
+        is31fl3743a_update_scaling_registers(i);
+    }
+}
+
+void is31fl3743a_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3743a_select_page(index, IS31FL3743A_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3743A_SCALING_REGISTER_COUNT; i++) {
+        is31fl3743a_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3743a_select_page(index, IS31FL3743A_COMMAND_PWM);
+
+    for (uint8_t i = 0; i < IS31FL3743A_PWM_REGISTER_COUNT; i++) {
+        is31fl3743a_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3743a_select_page(index, IS31FL3743A_COMMAND_FUNCTION);
+
+    uint8_t sync = driver_sync[index];
+
+    is31fl3743a_write_register(index, IS31FL3743A_FUNCTION_REG_PULLDOWNUP, (IS31FL3743A_SW_PULLDOWN << 4) | IS31FL3743A_CS_PULLUP);
+    is31fl3743a_write_register(index, IS31FL3743A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3743A_GLOBAL_CURRENT);
+    is31fl3743a_write_register(index, IS31FL3743A_FUNCTION_REG_SPREAD_SPECTRUM, (sync & 0b11) << 6);
+    is31fl3743a_write_register(index, IS31FL3743A_FUNCTION_REG_CONFIGURATION, IS31FL3743A_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3743a_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3743a_led_t led;
+
+    if (index >= 0 && index < IS31FL3743A_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3743a_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3743a_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (int i = 0; i < IS31FL3743A_LED_COUNT; i++) {
+        is31fl3743a_set_color(i, red, green, blue);
+    }
+}
+
+void is31fl3743a_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3743a_led_t led;
+    memcpy_P(&led, (&g_is31fl3743a_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].scaling_buffer[led.r] = red;
+    driver_buffers[led.driver].scaling_buffer[led.g] = green;
+    driver_buffers[led.driver].scaling_buffer[led.b] = blue;
+    driver_buffers[led.driver].scaling_buffer_dirty  = true;
+}
+
+void is31fl3743a_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3743a_select_page(index, IS31FL3743A_COMMAND_PWM);
+
+        is31fl3743a_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3743a_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3743a_select_page(index, IS31FL3743A_COMMAND_SCALING);
+
+        for (uint8_t i = 0; i < IS31FL3743A_SCALING_REGISTER_COUNT; i++) {
+            is31fl3743a_write_register(index, i + 1, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3743a_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3743A_DRIVER_COUNT; i++) {
+        is31fl3743a_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3743a.h b/drivers/led/issi/is31fl3743a.h
new file mode 100644
index 00000000000..48aeab46abd
--- /dev/null
+++ b/drivers/led/issi/is31fl3743a.h
@@ -0,0 +1,541 @@
+/* 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"
+#include "util.h"
+
+#define IS31FL3743A_REG_ID 0xFC
+
+#define IS31FL3743A_REG_COMMAND 0xFD
+
+#define IS31FL3743A_COMMAND_PWM 0x00
+#define IS31FL3743A_COMMAND_SCALING 0x01
+#define IS31FL3743A_COMMAND_FUNCTION 0x02
+
+#define IS31FL3743A_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3743A_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3743A_FUNCTION_REG_PULLDOWNUP 0x02
+#define IS31FL3743A_FUNCTION_REG_TEMPERATURE 0x24
+#define IS31FL3743A_FUNCTION_REG_SPREAD_SPECTRUM 0x25
+#define IS31FL3743A_FUNCTION_REG_RESET 0x2F
+
+#define IS31FL3743A_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3743A_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3743A_I2C_ADDRESS_GND_GND 0x20
+#define IS31FL3743A_I2C_ADDRESS_GND_SCL 0x21
+#define IS31FL3743A_I2C_ADDRESS_GND_SDA 0x22
+#define IS31FL3743A_I2C_ADDRESS_GND_VCC 0x23
+#define IS31FL3743A_I2C_ADDRESS_SCL_GND 0x24
+#define IS31FL3743A_I2C_ADDRESS_SCL_SCL 0x25
+#define IS31FL3743A_I2C_ADDRESS_SCL_SDA 0x26
+#define IS31FL3743A_I2C_ADDRESS_SCL_VCC 0x27
+#define IS31FL3743A_I2C_ADDRESS_SDA_GND 0x28
+#define IS31FL3743A_I2C_ADDRESS_SDA_SCL 0x29
+#define IS31FL3743A_I2C_ADDRESS_SDA_SDA 0x2A
+#define IS31FL3743A_I2C_ADDRESS_SDA_VCC 0x2B
+#define IS31FL3743A_I2C_ADDRESS_VCC_GND 0x2C
+#define IS31FL3743A_I2C_ADDRESS_VCC_SCL 0x2D
+#define IS31FL3743A_I2C_ADDRESS_VCC_SDA 0x2E
+#define IS31FL3743A_I2C_ADDRESS_VCC_VCC 0x2F
+
+#if defined(RGB_MATRIX_IS31FL3743A)
+#    define IS31FL3743A_LED_COUNT RGB_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3743A_I2C_ADDRESS_4)
+#    define IS31FL3743A_DRIVER_COUNT 4
+#elif defined(IS31FL3743A_I2C_ADDRESS_3)
+#    define IS31FL3743A_DRIVER_COUNT 3
+#elif defined(IS31FL3743A_I2C_ADDRESS_2)
+#    define IS31FL3743A_DRIVER_COUNT 2
+#elif defined(IS31FL3743A_I2C_ADDRESS_1)
+#    define IS31FL3743A_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3743a_led_t {
+    uint8_t driver : 2;
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+} PACKED is31fl3743a_led_t;
+
+extern const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT];
+
+void is31fl3743a_init_drivers(void);
+void is31fl3743a_init(uint8_t index);
+void is31fl3743a_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3743a_select_page(uint8_t index, uint8_t page);
+
+void is31fl3743a_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void is31fl3743a_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3743a_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3743a_update_pwm_buffers(uint8_t index);
+void is31fl3743a_update_scaling_registers(uint8_t index);
+
+void is31fl3743a_flush(void);
+
+#define IS31FL3743A_PDR_0_OHM 0b000          // No pull-down resistor
+#define IS31FL3743A_PDR_0K5_OHM_SW_OFF 0b001 // 0.5 kOhm resistor in SWx off time
+#define IS31FL3743A_PDR_1K_OHM_SW_OFF 0b010  // 1 kOhm resistor in SWx off time
+#define IS31FL3743A_PDR_2K_OHM_SW_OFF 0b011  // 2 kOhm resistor in SWx off time
+#define IS31FL3743A_PDR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3743A_PDR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3743A_PDR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3743A_PDR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3743A_PUR_0_OHM 0b000          // No pull-up resistor
+#define IS31FL3743A_PUR_0K5_OHM_CS_OFF 0b001 // 0.5 kOhm resistor in CSy off time
+#define IS31FL3743A_PUR_1K_OHM_CS_OFF 0b010  // 1 kOhm resistor in CSy off time
+#define IS31FL3743A_PUR_2K_OHM_CS_OFF 0b011  // 2 kOhm resistor in CSy off time
+#define IS31FL3743A_PUR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3743A_PUR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3743A_PUR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3743A_PUR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3743A_SYNC_NONE 0b00
+#define IS31FL3743A_SYNC_SLAVE 0b10
+#define IS31FL3743A_SYNC_MASTER 0b11
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+
+#define SW2_CS1 0x12
+#define SW2_CS2 0x13
+#define SW2_CS3 0x14
+#define SW2_CS4 0x15
+#define SW2_CS5 0x16
+#define SW2_CS6 0x17
+#define SW2_CS7 0x18
+#define SW2_CS8 0x19
+#define SW2_CS9 0x1A
+#define SW2_CS10 0x1B
+#define SW2_CS11 0x1C
+#define SW2_CS12 0x1D
+#define SW2_CS13 0x1E
+#define SW2_CS14 0x1F
+#define SW2_CS15 0x20
+#define SW2_CS16 0x21
+#define SW2_CS17 0x22
+#define SW2_CS18 0x23
+
+#define SW3_CS1 0x24
+#define SW3_CS2 0x25
+#define SW3_CS3 0x26
+#define SW3_CS4 0x27
+#define SW3_CS5 0x28
+#define SW3_CS6 0x29
+#define SW3_CS7 0x2A
+#define SW3_CS8 0x2B
+#define SW3_CS9 0x2C
+#define SW3_CS10 0x2D
+#define SW3_CS11 0x2E
+#define SW3_CS12 0x2F
+#define SW3_CS13 0x30
+#define SW3_CS14 0x31
+#define SW3_CS15 0x32
+#define SW3_CS16 0x33
+#define SW3_CS17 0x34
+#define SW3_CS18 0x35
+
+#define SW4_CS1 0x36
+#define SW4_CS2 0x37
+#define SW4_CS3 0x38
+#define SW4_CS4 0x39
+#define SW4_CS5 0x3A
+#define SW4_CS6 0x3B
+#define SW4_CS7 0x3C
+#define SW4_CS8 0x3D
+#define SW4_CS9 0x3E
+#define SW4_CS10 0x3F
+#define SW4_CS11 0x40
+#define SW4_CS12 0x41
+#define SW4_CS13 0x42
+#define SW4_CS14 0x43
+#define SW4_CS15 0x44
+#define SW4_CS16 0x45
+#define SW4_CS17 0x46
+#define SW4_CS18 0x47
+
+#define SW5_CS1 0x48
+#define SW5_CS2 0x49
+#define SW5_CS3 0x4A
+#define SW5_CS4 0x4B
+#define SW5_CS5 0x4C
+#define SW5_CS6 0x4D
+#define SW5_CS7 0x4E
+#define SW5_CS8 0x4F
+#define SW5_CS9 0x50
+#define SW5_CS10 0x51
+#define SW5_CS11 0x52
+#define SW5_CS12 0x53
+#define SW5_CS13 0x54
+#define SW5_CS14 0x55
+#define SW5_CS15 0x56
+#define SW5_CS16 0x57
+#define SW5_CS17 0x58
+#define SW5_CS18 0x59
+
+#define SW6_CS1 0x5A
+#define SW6_CS2 0x5B
+#define SW6_CS3 0x5C
+#define SW6_CS4 0x5D
+#define SW6_CS5 0x5E
+#define SW6_CS6 0x5F
+#define SW6_CS7 0x60
+#define SW6_CS8 0x61
+#define SW6_CS9 0x62
+#define SW6_CS10 0x63
+#define SW6_CS11 0x64
+#define SW6_CS12 0x65
+#define SW6_CS13 0x66
+#define SW6_CS14 0x67
+#define SW6_CS15 0x68
+#define SW6_CS16 0x69
+#define SW6_CS17 0x6A
+#define SW6_CS18 0x6B
+
+#define SW7_CS1 0x6C
+#define SW7_CS2 0x6D
+#define SW7_CS3 0x6E
+#define SW7_CS4 0x6F
+#define SW7_CS5 0x70
+#define SW7_CS6 0x71
+#define SW7_CS7 0x72
+#define SW7_CS8 0x73
+#define SW7_CS9 0x74
+#define SW7_CS10 0x75
+#define SW7_CS11 0x76
+#define SW7_CS12 0x77
+#define SW7_CS13 0x78
+#define SW7_CS14 0x79
+#define SW7_CS15 0x7A
+#define SW7_CS16 0x7B
+#define SW7_CS17 0x7C
+#define SW7_CS18 0x7D
+
+#define SW8_CS1 0x7E
+#define SW8_CS2 0x7F
+#define SW8_CS3 0x80
+#define SW8_CS4 0x81
+#define SW8_CS5 0x82
+#define SW8_CS6 0x83
+#define SW8_CS7 0x84
+#define SW8_CS8 0x85
+#define SW8_CS9 0x86
+#define SW8_CS10 0x87
+#define SW8_CS11 0x88
+#define SW8_CS12 0x89
+#define SW8_CS13 0x8A
+#define SW8_CS14 0x8B
+#define SW8_CS15 0x8C
+#define SW8_CS16 0x8D
+#define SW8_CS17 0x8E
+#define SW8_CS18 0x8F
+
+#define SW9_CS1 0x90
+#define SW9_CS2 0x91
+#define SW9_CS3 0x92
+#define SW9_CS4 0x93
+#define SW9_CS5 0x94
+#define SW9_CS6 0x95
+#define SW9_CS7 0x96
+#define SW9_CS8 0x97
+#define SW9_CS9 0x98
+#define SW9_CS10 0x99
+#define SW9_CS11 0x9A
+#define SW9_CS12 0x9B
+#define SW9_CS13 0x9C
+#define SW9_CS14 0x9D
+#define SW9_CS15 0x9E
+#define SW9_CS16 0x9F
+#define SW9_CS17 0xA0
+#define SW9_CS18 0xA1
+
+#define SW10_CS1 0xA2
+#define SW10_CS2 0xA3
+#define SW10_CS3 0xA4
+#define SW10_CS4 0xA5
+#define SW10_CS5 0xA6
+#define SW10_CS6 0xA7
+#define SW10_CS7 0xA8
+#define SW10_CS8 0xA9
+#define SW10_CS9 0xAA
+#define SW10_CS10 0xAB
+#define SW10_CS11 0xAC
+#define SW10_CS12 0xAD
+#define SW10_CS13 0xAE
+#define SW10_CS14 0xAF
+#define SW10_CS15 0xB0
+#define SW10_CS16 0xB1
+#define SW10_CS17 0xB2
+#define SW10_CS18 0xB3
+
+#define SW11_CS1 0xB4
+#define SW11_CS2 0xB5
+#define SW11_CS3 0xB6
+#define SW11_CS4 0xB7
+#define SW11_CS5 0xB8
+#define SW11_CS6 0xB9
+#define SW11_CS7 0xBA
+#define SW11_CS8 0xBB
+#define SW11_CS9 0xBC
+#define SW11_CS10 0xBD
+#define SW11_CS11 0xBE
+#define SW11_CS12 0xBF
+#define SW11_CS13 0xC0
+#define SW11_CS14 0xC1
+#define SW11_CS15 0xC2
+#define SW11_CS16 0xC3
+#define SW11_CS17 0xC4
+#define SW11_CS18 0xC5
+
+// DEPRECATED - DO NOT USE
+
+#define CS1_SW1 SW1_CS1
+#define CS2_SW1 SW1_CS2
+#define CS3_SW1 SW1_CS3
+#define CS4_SW1 SW1_CS4
+#define CS5_SW1 SW1_CS5
+#define CS6_SW1 SW1_CS6
+#define CS7_SW1 SW1_CS7
+#define CS8_SW1 SW1_CS8
+#define CS9_SW1 SW1_CS9
+#define CS10_SW1 SW1_CS10
+#define CS11_SW1 SW1_CS11
+#define CS12_SW1 SW1_CS12
+#define CS13_SW1 SW1_CS13
+#define CS14_SW1 SW1_CS14
+#define CS15_SW1 SW1_CS15
+#define CS16_SW1 SW1_CS16
+#define CS17_SW1 SW1_CS17
+#define CS18_SW1 SW1_CS18
+
+#define CS1_SW2 SW2_CS1
+#define CS2_SW2 SW2_CS2
+#define CS3_SW2 SW2_CS3
+#define CS4_SW2 SW2_CS4
+#define CS5_SW2 SW2_CS5
+#define CS6_SW2 SW2_CS6
+#define CS7_SW2 SW2_CS7
+#define CS8_SW2 SW2_CS8
+#define CS9_SW2 SW2_CS9
+#define CS10_SW2 SW2_CS10
+#define CS11_SW2 SW2_CS11
+#define CS12_SW2 SW2_CS12
+#define CS13_SW2 SW2_CS13
+#define CS14_SW2 SW2_CS14
+#define CS15_SW2 SW2_CS15
+#define CS16_SW2 SW2_CS16
+#define CS17_SW2 SW2_CS17
+#define CS18_SW2 SW2_CS18
+
+#define CS1_SW3 SW3_CS1
+#define CS2_SW3 SW3_CS2
+#define CS3_SW3 SW3_CS3
+#define CS4_SW3 SW3_CS4
+#define CS5_SW3 SW3_CS5
+#define CS6_SW3 SW3_CS6
+#define CS7_SW3 SW3_CS7
+#define CS8_SW3 SW3_CS8
+#define CS9_SW3 SW3_CS9
+#define CS10_SW3 SW3_CS10
+#define CS11_SW3 SW3_CS11
+#define CS12_SW3 SW3_CS12
+#define CS13_SW3 SW3_CS13
+#define CS14_SW3 SW3_CS14
+#define CS15_SW3 SW3_CS15
+#define CS16_SW3 SW3_CS16
+#define CS17_SW3 SW3_CS17
+#define CS18_SW3 SW3_CS18
+
+#define CS1_SW4 SW4_CS1
+#define CS2_SW4 SW4_CS2
+#define CS3_SW4 SW4_CS3
+#define CS4_SW4 SW4_CS4
+#define CS5_SW4 SW4_CS5
+#define CS6_SW4 SW4_CS6
+#define CS7_SW4 SW4_CS7
+#define CS8_SW4 SW4_CS8
+#define CS9_SW4 SW4_CS9
+#define CS10_SW4 SW4_CS10
+#define CS11_SW4 SW4_CS11
+#define CS12_SW4 SW4_CS12
+#define CS13_SW4 SW4_CS13
+#define CS14_SW4 SW4_CS14
+#define CS15_SW4 SW4_CS15
+#define CS16_SW4 SW4_CS16
+#define CS17_SW4 SW4_CS17
+#define CS18_SW4 SW4_CS18
+
+#define CS1_SW5 SW5_CS1
+#define CS2_SW5 SW5_CS2
+#define CS3_SW5 SW5_CS3
+#define CS4_SW5 SW5_CS4
+#define CS5_SW5 SW5_CS5
+#define CS6_SW5 SW5_CS6
+#define CS7_SW5 SW5_CS7
+#define CS8_SW5 SW5_CS8
+#define CS9_SW5 SW5_CS9
+#define CS10_SW5 SW5_CS10
+#define CS11_SW5 SW5_CS11
+#define CS12_SW5 SW5_CS12
+#define CS13_SW5 SW5_CS13
+#define CS14_SW5 SW5_CS14
+#define CS15_SW5 SW5_CS15
+#define CS16_SW5 SW5_CS16
+#define CS17_SW5 SW5_CS17
+#define CS18_SW5 SW5_CS18
+
+#define CS1_SW6 SW6_CS1
+#define CS2_SW6 SW6_CS2
+#define CS3_SW6 SW6_CS3
+#define CS4_SW6 SW6_CS4
+#define CS5_SW6 SW6_CS5
+#define CS6_SW6 SW6_CS6
+#define CS7_SW6 SW6_CS7
+#define CS8_SW6 SW6_CS8
+#define CS9_SW6 SW6_CS9
+#define CS10_SW6 SW6_CS10
+#define CS11_SW6 SW6_CS11
+#define CS12_SW6 SW6_CS12
+#define CS13_SW6 SW6_CS13
+#define CS14_SW6 SW6_CS14
+#define CS15_SW6 SW6_CS15
+#define CS16_SW6 SW6_CS16
+#define CS17_SW6 SW6_CS17
+#define CS18_SW6 SW6_CS18
+
+#define CS1_SW7 SW7_CS1
+#define CS2_SW7 SW7_CS2
+#define CS3_SW7 SW7_CS3
+#define CS4_SW7 SW7_CS4
+#define CS5_SW7 SW7_CS5
+#define CS6_SW7 SW7_CS6
+#define CS7_SW7 SW7_CS7
+#define CS8_SW7 SW7_CS8
+#define CS9_SW7 SW7_CS9
+#define CS10_SW7 SW7_CS10
+#define CS11_SW7 SW7_CS11
+#define CS12_SW7 SW7_CS12
+#define CS13_SW7 SW7_CS13
+#define CS14_SW7 SW7_CS14
+#define CS15_SW7 SW7_CS15
+#define CS16_SW7 SW7_CS16
+#define CS17_SW7 SW7_CS17
+#define CS18_SW7 SW7_CS18
+
+#define CS1_SW8 SW8_CS1
+#define CS2_SW8 SW8_CS2
+#define CS3_SW8 SW8_CS3
+#define CS4_SW8 SW8_CS4
+#define CS5_SW8 SW8_CS5
+#define CS6_SW8 SW8_CS6
+#define CS7_SW8 SW8_CS7
+#define CS8_SW8 SW8_CS8
+#define CS9_SW8 SW8_CS9
+#define CS10_SW8 SW8_CS10
+#define CS11_SW8 SW8_CS11
+#define CS12_SW8 SW8_CS12
+#define CS13_SW8 SW8_CS13
+#define CS14_SW8 SW8_CS14
+#define CS15_SW8 SW8_CS15
+#define CS16_SW8 SW8_CS16
+#define CS17_SW8 SW8_CS17
+#define CS18_SW8 SW8_CS18
+
+#define CS1_SW9 SW9_CS1
+#define CS2_SW9 SW9_CS2
+#define CS3_SW9 SW9_CS3
+#define CS4_SW9 SW9_CS4
+#define CS5_SW9 SW9_CS5
+#define CS6_SW9 SW9_CS6
+#define CS7_SW9 SW9_CS7
+#define CS8_SW9 SW9_CS8
+#define CS9_SW9 SW9_CS9
+#define CS10_SW9 SW9_CS10
+#define CS11_SW9 SW9_CS11
+#define CS12_SW9 SW9_CS12
+#define CS13_SW9 SW9_CS13
+#define CS14_SW9 SW9_CS14
+#define CS15_SW9 SW9_CS15
+#define CS16_SW9 SW9_CS16
+#define CS17_SW9 SW9_CS17
+#define CS18_SW9 SW9_CS18
+
+#define CS1_SW10 SW10_CS1
+#define CS2_SW10 SW10_CS2
+#define CS3_SW10 SW10_CS3
+#define CS4_SW10 SW10_CS4
+#define CS5_SW10 SW10_CS5
+#define CS6_SW10 SW10_CS6
+#define CS7_SW10 SW10_CS7
+#define CS8_SW10 SW10_CS8
+#define CS9_SW10 SW10_CS9
+#define CS10_SW10 SW10_CS10
+#define CS11_SW10 SW10_CS11
+#define CS12_SW10 SW10_CS12
+#define CS13_SW10 SW10_CS13
+#define CS14_SW10 SW10_CS14
+#define CS15_SW10 SW10_CS15
+#define CS16_SW10 SW10_CS16
+#define CS17_SW10 SW10_CS17
+#define CS18_SW10 SW10_CS18
+
+#define CS1_SW11 SW11_CS1
+#define CS2_SW11 SW11_CS2
+#define CS3_SW11 SW11_CS3
+#define CS4_SW11 SW11_CS4
+#define CS5_SW11 SW11_CS5
+#define CS6_SW11 SW11_CS6
+#define CS7_SW11 SW11_CS7
+#define CS8_SW11 SW11_CS8
+#define CS9_SW11 SW11_CS9
+#define CS10_SW11 SW11_CS10
+#define CS11_SW11 SW11_CS11
+#define CS12_SW11 SW11_CS12
+#define CS13_SW11 SW11_CS13
+#define CS14_SW11 SW11_CS14
+#define CS15_SW11 SW11_CS15
+#define CS16_SW11 SW11_CS16
+#define CS17_SW11 SW11_CS17
+#define CS18_SW11 SW11_CS18
diff --git a/drivers/led/issi/is31fl3745-mono.c b/drivers/led/issi/is31fl3745-mono.c
new file mode 100644
index 00000000000..a6ab6992457
--- /dev/null
+++ b/drivers/led/issi/is31fl3745-mono.c
@@ -0,0 +1,245 @@
+/* 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 "is31fl3745-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3745_PWM_REGISTER_COUNT 144
+#define IS31FL3745_SCALING_REGISTER_COUNT 144
+
+#ifndef IS31FL3745_I2C_TIMEOUT
+#    define IS31FL3745_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3745_I2C_PERSISTENCE
+#    define IS31FL3745_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3745_CONFIGURATION
+#    define IS31FL3745_CONFIGURATION 0x31
+#endif
+
+#ifndef IS31FL3745_SW_PULLDOWN
+#    define IS31FL3745_SW_PULLDOWN IS31FL3745_PDR_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3745_CS_PULLUP
+#    define IS31FL3745_CS_PULLUP IS31FL3745_PUR_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3745_GLOBAL_CURRENT
+#    define IS31FL3745_GLOBAL_CURRENT 0xFF
+#endif
+
+#ifndef IS31FL3745_SYNC_1
+#    define IS31FL3745_SYNC_1 IS31FL3745_SYNC_NONE
+#endif
+#ifndef IS31FL3745_SYNC_2
+#    define IS31FL3745_SYNC_2 IS31FL3745_SYNC_NONE
+#endif
+#ifndef IS31FL3745_SYNC_3
+#    define IS31FL3745_SYNC_3 IS31FL3745_SYNC_NONE
+#endif
+#ifndef IS31FL3745_SYNC_4
+#    define IS31FL3745_SYNC_4 IS31FL3745_SYNC_NONE
+#endif
+
+const uint8_t i2c_addresses[IS31FL3745_DRIVER_COUNT] = {
+    IS31FL3745_I2C_ADDRESS_1,
+#ifdef IS31FL3745_I2C_ADDRESS_2
+    IS31FL3745_I2C_ADDRESS_2,
+#    ifdef IS31FL3745_I2C_ADDRESS_3
+    IS31FL3745_I2C_ADDRESS_3,
+#        ifdef IS31FL3745_I2C_ADDRESS_4
+    IS31FL3745_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+const uint8_t driver_sync[IS31FL3745_DRIVER_COUNT] = {
+    IS31FL3745_SYNC_1,
+#ifdef IS31FL3745_I2C_ADDRESS_2
+    IS31FL3745_SYNC_2,
+#    ifdef IS31FL3745_I2C_ADDRESS_3
+    IS31FL3745_SYNC_3,
+#        ifdef IS31FL3745_I2C_ADDRESS_4
+    IS31FL3745_SYNC_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3745_driver_t {
+    uint8_t pwm_buffer[IS31FL3745_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3745_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3745_driver_t;
+
+is31fl3745_driver_t driver_buffers[IS31FL3745_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3745_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3745_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3745_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3745_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3745_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3745_select_page(uint8_t index, uint8_t page) {
+    is31fl3745_write_register(index, IS31FL3745_REG_COMMAND_WRITE_LOCK, IS31FL3745_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3745_write_register(index, IS31FL3745_REG_COMMAND, page);
+}
+
+void is31fl3745_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 8 transfers of 18 bytes.
+
+    // Iterate over the pwm_buffer contents at 18 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3745_PWM_REGISTER_COUNT; i += 18) {
+#if IS31FL3745_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3745_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3745_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3745_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3745_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3745_SDB_PIN)
+    gpio_set_pin_output(IS31FL3745_SDB_PIN);
+    gpio_write_pin_high(IS31FL3745_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3745_DRIVER_COUNT; i++) {
+        is31fl3745_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3745_LED_COUNT; i++) {
+        is31fl3745_set_scaling_register(i, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3745_DRIVER_COUNT; i++) {
+        is31fl3745_update_scaling_registers(i);
+    }
+}
+
+void is31fl3745_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3745_select_page(index, IS31FL3745_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3745_SCALING_REGISTER_COUNT; i++) {
+        is31fl3745_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3745_select_page(index, IS31FL3745_COMMAND_PWM);
+
+    for (uint8_t i = 0; i < IS31FL3745_PWM_REGISTER_COUNT; i++) {
+        is31fl3745_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3745_select_page(index, IS31FL3745_COMMAND_FUNCTION);
+
+    uint8_t sync = driver_sync[index];
+
+    is31fl3745_write_register(index, IS31FL3745_FUNCTION_REG_PULLDOWNUP, (IS31FL3745_SW_PULLDOWN << 4) | IS31FL3745_CS_PULLUP);
+    is31fl3745_write_register(index, IS31FL3745_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3745_GLOBAL_CURRENT);
+    is31fl3745_write_register(index, IS31FL3745_FUNCTION_REG_SPREAD_SPECTRUM, (sync & 0b11) << 6);
+    is31fl3745_write_register(index, IS31FL3745_FUNCTION_REG_CONFIGURATION, IS31FL3745_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3745_set_value(int index, uint8_t value) {
+    is31fl3745_led_t led;
+
+    if (index >= 0 && index < IS31FL3745_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3745_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3745_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3745_LED_COUNT; i++) {
+        is31fl3745_set_value(i, value);
+    }
+}
+
+void is31fl3745_set_scaling_register(uint8_t index, uint8_t value) {
+    is31fl3745_led_t led;
+    memcpy_P(&led, (&g_is31fl3745_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].scaling_buffer[led.v] = value;
+    driver_buffers[led.driver].scaling_buffer_dirty  = true;
+}
+
+void is31fl3745_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3745_select_page(index, IS31FL3745_COMMAND_PWM);
+
+        is31fl3745_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3745_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3745_select_page(index, IS31FL3745_COMMAND_SCALING);
+
+        for (uint8_t i = 0; i < IS31FL3745_SCALING_REGISTER_COUNT; i++) {
+            is31fl3745_write_register(index, i + 1, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3745_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3745_DRIVER_COUNT; i++) {
+        is31fl3745_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3745-mono.h b/drivers/led/issi/is31fl3745-mono.h
new file mode 100644
index 00000000000..29a13004c87
--- /dev/null
+++ b/drivers/led/issi/is31fl3745-mono.h
@@ -0,0 +1,271 @@
+/* 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"
+#include "util.h"
+
+#define IS31FL3745_REG_ID 0xFC
+
+#define IS31FL3745_REG_COMMAND 0xFD
+
+#define IS31FL3745_COMMAND_PWM 0x00
+#define IS31FL3745_COMMAND_SCALING 0x01
+#define IS31FL3745_COMMAND_FUNCTION 0x02
+
+#define IS31FL3745_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3745_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3745_FUNCTION_REG_PULLDOWNUP 0x02
+#define IS31FL3745_FUNCTION_REG_TEMPERATURE 0x24
+#define IS31FL3745_FUNCTION_REG_SPREAD_SPECTRUM 0x25
+#define IS31FL3745_FUNCTION_REG_RESET 0x2F
+
+#define IS31FL3745_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3745_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3745_I2C_ADDRESS_GND_GND 0x20
+#define IS31FL3745_I2C_ADDRESS_GND_SCL 0x21
+#define IS31FL3745_I2C_ADDRESS_GND_SDA 0x22
+#define IS31FL3745_I2C_ADDRESS_GND_VCC 0x23
+#define IS31FL3745_I2C_ADDRESS_SCL_GND 0x24
+#define IS31FL3745_I2C_ADDRESS_SCL_SCL 0x25
+#define IS31FL3745_I2C_ADDRESS_SCL_SDA 0x26
+#define IS31FL3745_I2C_ADDRESS_SCL_VCC 0x27
+#define IS31FL3745_I2C_ADDRESS_SDA_GND 0x28
+#define IS31FL3745_I2C_ADDRESS_SDA_SCL 0x29
+#define IS31FL3745_I2C_ADDRESS_SDA_SDA 0x2A
+#define IS31FL3745_I2C_ADDRESS_SDA_VCC 0x2B
+#define IS31FL3745_I2C_ADDRESS_VCC_GND 0x2C
+#define IS31FL3745_I2C_ADDRESS_VCC_SCL 0x2D
+#define IS31FL3745_I2C_ADDRESS_VCC_SDA 0x2E
+#define IS31FL3745_I2C_ADDRESS_VCC_VCC 0x2F
+
+#if defined(LED_MATRIX_IS31FL3745)
+#    define IS31FL3745_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3745_I2C_ADDRESS_4)
+#    define IS31FL3745_DRIVER_COUNT 4
+#elif defined(IS31FL3745_I2C_ADDRESS_3)
+#    define IS31FL3745_DRIVER_COUNT 3
+#elif defined(IS31FL3745_I2C_ADDRESS_2)
+#    define IS31FL3745_DRIVER_COUNT 2
+#elif defined(IS31FL3745_I2C_ADDRESS_1)
+#    define IS31FL3745_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3745_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3745_led_t;
+
+extern const is31fl3745_led_t PROGMEM g_is31fl3745_leds[IS31FL3745_LED_COUNT];
+
+void is31fl3745_init_drivers(void);
+void is31fl3745_init(uint8_t index);
+void is31fl3745_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3745_select_page(uint8_t index, uint8_t page);
+
+void is31fl3745_set_value(int index, uint8_t value);
+void is31fl3745_set_value_all(uint8_t value);
+
+void is31fl3745_set_scaling_register(uint8_t index, uint8_t value);
+
+void is31fl3745_update_pwm_buffers(uint8_t index);
+void is31fl3745_update_scaling_registers(uint8_t index);
+
+void is31fl3745_flush(void);
+
+#define IS31FL3745_PDR_0_OHM 0b000          // No pull-down resistor
+#define IS31FL3745_PDR_0K5_OHM_SW_OFF 0b001 // 0.5 kOhm resistor in SWx off time
+#define IS31FL3745_PDR_1K_OHM_SW_OFF 0b010  // 1 kOhm resistor in SWx off time
+#define IS31FL3745_PDR_2K_OHM_SW_OFF 0b011  // 2 kOhm resistor in SWx off time
+#define IS31FL3745_PDR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3745_PDR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3745_PDR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3745_PDR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3745_PUR_0_OHM 0b000          // No pull-up resistor
+#define IS31FL3745_PUR_0K5_OHM_CS_OFF 0b001 // 0.5 kOhm resistor in CSy off time
+#define IS31FL3745_PUR_1K_OHM_CS_OFF 0b010  // 1 kOhm resistor in CSy off time
+#define IS31FL3745_PUR_2K_OHM_CS_OFF 0b011  // 2 kOhm resistor in CSy off time
+#define IS31FL3745_PUR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3745_PUR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3745_PUR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3745_PUR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3745_SYNC_NONE 0b00
+#define IS31FL3745_SYNC_SLAVE 0b10
+#define IS31FL3745_SYNC_MASTER 0b11
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+
+#define SW2_CS1 0x12
+#define SW2_CS2 0x13
+#define SW2_CS3 0x14
+#define SW2_CS4 0x15
+#define SW2_CS5 0x16
+#define SW2_CS6 0x17
+#define SW2_CS7 0x18
+#define SW2_CS8 0x19
+#define SW2_CS9 0x1A
+#define SW2_CS10 0x1B
+#define SW2_CS11 0x1C
+#define SW2_CS12 0x1D
+#define SW2_CS13 0x1E
+#define SW2_CS14 0x1F
+#define SW2_CS15 0x20
+#define SW2_CS16 0x21
+#define SW2_CS17 0x22
+#define SW2_CS18 0x23
+
+#define SW3_CS1 0x24
+#define SW3_CS2 0x25
+#define SW3_CS3 0x26
+#define SW3_CS4 0x27
+#define SW3_CS5 0x28
+#define SW3_CS6 0x29
+#define SW3_CS7 0x2A
+#define SW3_CS8 0x2B
+#define SW3_CS9 0x2C
+#define SW3_CS10 0x2D
+#define SW3_CS11 0x2E
+#define SW3_CS12 0x2F
+#define SW3_CS13 0x30
+#define SW3_CS14 0x31
+#define SW3_CS15 0x32
+#define SW3_CS16 0x33
+#define SW3_CS17 0x34
+#define SW3_CS18 0x35
+
+#define SW4_CS1 0x36
+#define SW4_CS2 0x37
+#define SW4_CS3 0x38
+#define SW4_CS4 0x39
+#define SW4_CS5 0x3A
+#define SW4_CS6 0x3B
+#define SW4_CS7 0x3C
+#define SW4_CS8 0x3D
+#define SW4_CS9 0x3E
+#define SW4_CS10 0x3F
+#define SW4_CS11 0x40
+#define SW4_CS12 0x41
+#define SW4_CS13 0x42
+#define SW4_CS14 0x43
+#define SW4_CS15 0x44
+#define SW4_CS16 0x45
+#define SW4_CS17 0x46
+#define SW4_CS18 0x47
+
+#define SW5_CS1 0x48
+#define SW5_CS2 0x49
+#define SW5_CS3 0x4A
+#define SW5_CS4 0x4B
+#define SW5_CS5 0x4C
+#define SW5_CS6 0x4D
+#define SW5_CS7 0x4E
+#define SW5_CS8 0x4F
+#define SW5_CS9 0x50
+#define SW5_CS10 0x51
+#define SW5_CS11 0x52
+#define SW5_CS12 0x53
+#define SW5_CS13 0x54
+#define SW5_CS14 0x55
+#define SW5_CS15 0x56
+#define SW5_CS16 0x57
+#define SW5_CS17 0x58
+#define SW5_CS18 0x59
+
+#define SW6_CS1 0x5A
+#define SW6_CS2 0x5B
+#define SW6_CS3 0x5C
+#define SW6_CS4 0x5D
+#define SW6_CS5 0x5E
+#define SW6_CS6 0x5F
+#define SW6_CS7 0x60
+#define SW6_CS8 0x61
+#define SW6_CS9 0x62
+#define SW6_CS10 0x63
+#define SW6_CS11 0x64
+#define SW6_CS12 0x65
+#define SW6_CS13 0x66
+#define SW6_CS14 0x67
+#define SW6_CS15 0x68
+#define SW6_CS16 0x69
+#define SW6_CS17 0x6A
+#define SW6_CS18 0x6B
+
+#define SW7_CS1 0x6C
+#define SW7_CS2 0x6D
+#define SW7_CS3 0x6E
+#define SW7_CS4 0x6F
+#define SW7_CS5 0x70
+#define SW7_CS6 0x71
+#define SW7_CS7 0x72
+#define SW7_CS8 0x73
+#define SW7_CS9 0x74
+#define SW7_CS10 0x75
+#define SW7_CS11 0x76
+#define SW7_CS12 0x77
+#define SW7_CS13 0x78
+#define SW7_CS14 0x79
+#define SW7_CS15 0x7A
+#define SW7_CS16 0x7B
+#define SW7_CS17 0x7C
+#define SW7_CS18 0x7D
+
+#define SW8_CS1 0x7E
+#define SW8_CS2 0x7F
+#define SW8_CS3 0x80
+#define SW8_CS4 0x81
+#define SW8_CS5 0x82
+#define SW8_CS6 0x83
+#define SW8_CS7 0x84
+#define SW8_CS8 0x85
+#define SW8_CS9 0x86
+#define SW8_CS10 0x87
+#define SW8_CS11 0x88
+#define SW8_CS12 0x89
+#define SW8_CS13 0x8A
+#define SW8_CS14 0x8B
+#define SW8_CS15 0x8C
+#define SW8_CS16 0x8D
+#define SW8_CS17 0x8E
+#define SW8_CS18 0x8F
diff --git a/drivers/led/issi/is31fl3745.c b/drivers/led/issi/is31fl3745.c
new file mode 100644
index 00000000000..1e3b437e02a
--- /dev/null
+++ b/drivers/led/issi/is31fl3745.c
@@ -0,0 +1,249 @@
+/* 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 "is31fl3745.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3745_PWM_REGISTER_COUNT 144
+#define IS31FL3745_SCALING_REGISTER_COUNT 144
+
+#ifndef IS31FL3745_I2C_TIMEOUT
+#    define IS31FL3745_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3745_I2C_PERSISTENCE
+#    define IS31FL3745_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3745_CONFIGURATION
+#    define IS31FL3745_CONFIGURATION 0x31
+#endif
+
+#ifndef IS31FL3745_SW_PULLDOWN
+#    define IS31FL3745_SW_PULLDOWN IS31FL3745_PDR_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3745_CS_PULLUP
+#    define IS31FL3745_CS_PULLUP IS31FL3745_PUR_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3745_GLOBAL_CURRENT
+#    define IS31FL3745_GLOBAL_CURRENT 0xFF
+#endif
+
+#ifndef IS31FL3745_SYNC_1
+#    define IS31FL3745_SYNC_1 IS31FL3745_SYNC_NONE
+#endif
+#ifndef IS31FL3745_SYNC_2
+#    define IS31FL3745_SYNC_2 IS31FL3745_SYNC_NONE
+#endif
+#ifndef IS31FL3745_SYNC_3
+#    define IS31FL3745_SYNC_3 IS31FL3745_SYNC_NONE
+#endif
+#ifndef IS31FL3745_SYNC_4
+#    define IS31FL3745_SYNC_4 IS31FL3745_SYNC_NONE
+#endif
+
+const uint8_t i2c_addresses[IS31FL3745_DRIVER_COUNT] = {
+    IS31FL3745_I2C_ADDRESS_1,
+#ifdef IS31FL3745_I2C_ADDRESS_2
+    IS31FL3745_I2C_ADDRESS_2,
+#    ifdef IS31FL3745_I2C_ADDRESS_3
+    IS31FL3745_I2C_ADDRESS_3,
+#        ifdef IS31FL3745_I2C_ADDRESS_4
+    IS31FL3745_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+const uint8_t driver_sync[IS31FL3745_DRIVER_COUNT] = {
+    IS31FL3745_SYNC_1,
+#ifdef IS31FL3745_I2C_ADDRESS_2
+    IS31FL3745_SYNC_2,
+#    ifdef IS31FL3745_I2C_ADDRESS_3
+    IS31FL3745_SYNC_3,
+#        ifdef IS31FL3745_I2C_ADDRESS_4
+    IS31FL3745_SYNC_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3745_driver_t {
+    uint8_t pwm_buffer[IS31FL3745_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3745_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3745_driver_t;
+
+is31fl3745_driver_t driver_buffers[IS31FL3745_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3745_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3745_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3745_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3745_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3745_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3745_select_page(uint8_t index, uint8_t page) {
+    is31fl3745_write_register(index, IS31FL3745_REG_COMMAND_WRITE_LOCK, IS31FL3745_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3745_write_register(index, IS31FL3745_REG_COMMAND, page);
+}
+
+void is31fl3745_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 8 transfers of 18 bytes.
+
+    // Iterate over the pwm_buffer contents at 18 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3745_PWM_REGISTER_COUNT; i += 18) {
+#if IS31FL3745_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3745_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3745_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3745_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3745_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3745_SDB_PIN)
+    gpio_set_pin_output(IS31FL3745_SDB_PIN);
+    gpio_write_pin_high(IS31FL3745_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3745_DRIVER_COUNT; i++) {
+        is31fl3745_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3745_LED_COUNT; i++) {
+        is31fl3745_set_scaling_register(i, 0xFF, 0xFF, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3745_DRIVER_COUNT; i++) {
+        is31fl3745_update_scaling_registers(i);
+    }
+}
+
+void is31fl3745_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3745_select_page(index, IS31FL3745_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3745_SCALING_REGISTER_COUNT; i++) {
+        is31fl3745_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3745_select_page(index, IS31FL3745_COMMAND_PWM);
+
+    for (uint8_t i = 0; i < IS31FL3745_PWM_REGISTER_COUNT; i++) {
+        is31fl3745_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3745_select_page(index, IS31FL3745_COMMAND_FUNCTION);
+
+    uint8_t sync = driver_sync[index];
+
+    is31fl3745_write_register(index, IS31FL3745_FUNCTION_REG_PULLDOWNUP, (IS31FL3745_SW_PULLDOWN << 4) | IS31FL3745_CS_PULLUP);
+    is31fl3745_write_register(index, IS31FL3745_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3745_GLOBAL_CURRENT);
+    is31fl3745_write_register(index, IS31FL3745_FUNCTION_REG_SPREAD_SPECTRUM, (sync & 0b11) << 6);
+    is31fl3745_write_register(index, IS31FL3745_FUNCTION_REG_CONFIGURATION, IS31FL3745_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3745_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3745_led_t led;
+
+    if (index >= 0 && index < IS31FL3745_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3745_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3745_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (int i = 0; i < IS31FL3745_LED_COUNT; i++) {
+        is31fl3745_set_color(i, red, green, blue);
+    }
+}
+
+void is31fl3745_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3745_led_t led;
+    memcpy_P(&led, (&g_is31fl3745_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].scaling_buffer[led.r] = red;
+    driver_buffers[led.driver].scaling_buffer[led.g] = green;
+    driver_buffers[led.driver].scaling_buffer[led.b] = blue;
+    driver_buffers[led.driver].scaling_buffer_dirty  = true;
+}
+
+void is31fl3745_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3745_select_page(index, IS31FL3745_COMMAND_PWM);
+
+        is31fl3745_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3745_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3745_select_page(index, IS31FL3745_COMMAND_SCALING);
+
+        for (uint8_t i = 0; i < IS31FL3745_SCALING_REGISTER_COUNT; i++) {
+            is31fl3745_write_register(index, i + 1, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3745_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3745_DRIVER_COUNT; i++) {
+        is31fl3745_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3745.h b/drivers/led/issi/is31fl3745.h
index 1e88aab4a8d..be50dd2cd9b 100644
--- a/drivers/led/issi/is31fl3745.h
+++ b/drivers/led/issi/is31fl3745.h
@@ -20,251 +20,254 @@
 
 #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
+#include <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+#include "util.h"
 
-// Set defaults for Spread Spectrum Register
-#ifndef ISSI_SSR_1
-#    ifndef DRIVER_ADDR_2
-#        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
+#define IS31FL3745_REG_ID 0xFC
 
-// Command Registers
-#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
-#define ISSI_COMMANDREGISTER 0xFD
-#define ISSI_IDREGISTER 0xFC
-#define ISSI_REGISTER_UNLOCK 0xC5
+#define IS31FL3745_REG_COMMAND 0xFD
 
-// Response Registers
-#define ISSI_PAGE_PWM 0x00
-#define ISSI_PAGE_SCALING 0x01
-#define ISSI_PAGE_FUNCTION 0x02
+#define IS31FL3745_COMMAND_PWM 0x00
+#define IS31FL3745_COMMAND_SCALING 0x01
+#define IS31FL3745_COMMAND_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
+#define IS31FL3745_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3745_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3745_FUNCTION_REG_PULLDOWNUP 0x02
+#define IS31FL3745_FUNCTION_REG_TEMPERATURE 0x24
+#define IS31FL3745_FUNCTION_REG_SPREAD_SPECTRUM 0x25
+#define IS31FL3745_FUNCTION_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
+#define IS31FL3745_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3745_COMMAND_WRITE_LOCK_MAGIC 0xC5
 
-// 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
+#define IS31FL3745_I2C_ADDRESS_GND_GND 0x20
+#define IS31FL3745_I2C_ADDRESS_GND_SCL 0x21
+#define IS31FL3745_I2C_ADDRESS_GND_SDA 0x22
+#define IS31FL3745_I2C_ADDRESS_GND_VCC 0x23
+#define IS31FL3745_I2C_ADDRESS_SCL_GND 0x24
+#define IS31FL3745_I2C_ADDRESS_SCL_SCL 0x25
+#define IS31FL3745_I2C_ADDRESS_SCL_SDA 0x26
+#define IS31FL3745_I2C_ADDRESS_SCL_VCC 0x27
+#define IS31FL3745_I2C_ADDRESS_SDA_GND 0x28
+#define IS31FL3745_I2C_ADDRESS_SDA_SCL 0x29
+#define IS31FL3745_I2C_ADDRESS_SDA_SDA 0x2A
+#define IS31FL3745_I2C_ADDRESS_SDA_VCC 0x2B
+#define IS31FL3745_I2C_ADDRESS_VCC_GND 0x2C
+#define IS31FL3745_I2C_ADDRESS_VCC_SCL 0x2D
+#define IS31FL3745_I2C_ADDRESS_VCC_SDA 0x2E
+#define IS31FL3745_I2C_ADDRESS_VCC_VCC 0x2F
+
+#if defined(RGB_MATRIX_IS31FL3745)
+#    define IS31FL3745_LED_COUNT RGB_MATRIX_LED_COUNT
 #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
+#if defined(IS31FL3745_I2C_ADDRESS_4)
+#    define IS31FL3745_DRIVER_COUNT 4
+#elif defined(IS31FL3745_I2C_ADDRESS_3)
+#    define IS31FL3745_DRIVER_COUNT 3
+#elif defined(IS31FL3745_I2C_ADDRESS_2)
+#    define IS31FL3745_DRIVER_COUNT 2
+#elif defined(IS31FL3745_I2C_ADDRESS_1)
+#    define IS31FL3745_DRIVER_COUNT 1
 #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
+typedef struct is31fl3745_led_t {
+    uint8_t driver : 2;
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+} PACKED is31fl3745_led_t;
+
+extern const is31fl3745_led_t PROGMEM g_is31fl3745_leds[IS31FL3745_LED_COUNT];
+
+void is31fl3745_init_drivers(void);
+void is31fl3745_init(uint8_t index);
+void is31fl3745_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3745_select_page(uint8_t index, uint8_t page);
+
+void is31fl3745_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void is31fl3745_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3745_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3745_update_pwm_buffers(uint8_t index);
+void is31fl3745_update_scaling_registers(uint8_t index);
+
+void is31fl3745_flush(void);
+
+#define IS31FL3745_PDR_0_OHM 0b000          // No pull-down resistor
+#define IS31FL3745_PDR_0K5_OHM_SW_OFF 0b001 // 0.5 kOhm resistor in SWx off time
+#define IS31FL3745_PDR_1K_OHM_SW_OFF 0b010  // 1 kOhm resistor in SWx off time
+#define IS31FL3745_PDR_2K_OHM_SW_OFF 0b011  // 2 kOhm resistor in SWx off time
+#define IS31FL3745_PDR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3745_PDR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3745_PDR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3745_PDR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3745_PUR_0_OHM 0b000          // No pull-up resistor
+#define IS31FL3745_PUR_0K5_OHM_CS_OFF 0b001 // 0.5 kOhm resistor in CSy off time
+#define IS31FL3745_PUR_1K_OHM_CS_OFF 0b010  // 1 kOhm resistor in CSy off time
+#define IS31FL3745_PUR_2K_OHM_CS_OFF 0b011  // 2 kOhm resistor in CSy off time
+#define IS31FL3745_PUR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3745_PUR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3745_PUR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3745_PUR_8K_OHM 0b111         // 8 kOhm resistor
 
-// Location of 1st bit for PWM and Scaling registers
-#define ISSI_PWM_REG_1ST 0x01
-#define ISSI_SCL_REG_1ST 0x01
+#define IS31FL3745_SYNC_NONE 0b00
+#define IS31FL3745_SYNC_SLAVE 0b10
+#define IS31FL3745_SYNC_MASTER 0b11
 
-// 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 SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 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 SW2_CS1 0x12
+#define SW2_CS2 0x13
+#define SW2_CS3 0x14
+#define SW2_CS4 0x15
+#define SW2_CS5 0x16
+#define SW2_CS6 0x17
+#define SW2_CS7 0x18
+#define SW2_CS8 0x19
+#define SW2_CS9 0x1A
+#define SW2_CS10 0x1B
+#define SW2_CS11 0x1C
+#define SW2_CS12 0x1D
+#define SW2_CS13 0x1E
+#define SW2_CS14 0x1F
+#define SW2_CS15 0x20
+#define SW2_CS16 0x21
+#define SW2_CS17 0x22
+#define SW2_CS18 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 SW3_CS1 0x24
+#define SW3_CS2 0x25
+#define SW3_CS3 0x26
+#define SW3_CS4 0x27
+#define SW3_CS5 0x28
+#define SW3_CS6 0x29
+#define SW3_CS7 0x2A
+#define SW3_CS8 0x2B
+#define SW3_CS9 0x2C
+#define SW3_CS10 0x2D
+#define SW3_CS11 0x2E
+#define SW3_CS12 0x2F
+#define SW3_CS13 0x30
+#define SW3_CS14 0x31
+#define SW3_CS15 0x32
+#define SW3_CS16 0x33
+#define SW3_CS17 0x34
+#define SW3_CS18 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 SW4_CS1 0x36
+#define SW4_CS2 0x37
+#define SW4_CS3 0x38
+#define SW4_CS4 0x39
+#define SW4_CS5 0x3A
+#define SW4_CS6 0x3B
+#define SW4_CS7 0x3C
+#define SW4_CS8 0x3D
+#define SW4_CS9 0x3E
+#define SW4_CS10 0x3F
+#define SW4_CS11 0x40
+#define SW4_CS12 0x41
+#define SW4_CS13 0x42
+#define SW4_CS14 0x43
+#define SW4_CS15 0x44
+#define SW4_CS16 0x45
+#define SW4_CS17 0x46
+#define SW4_CS18 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 SW5_CS1 0x48
+#define SW5_CS2 0x49
+#define SW5_CS3 0x4A
+#define SW5_CS4 0x4B
+#define SW5_CS5 0x4C
+#define SW5_CS6 0x4D
+#define SW5_CS7 0x4E
+#define SW5_CS8 0x4F
+#define SW5_CS9 0x50
+#define SW5_CS10 0x51
+#define SW5_CS11 0x52
+#define SW5_CS12 0x53
+#define SW5_CS13 0x54
+#define SW5_CS14 0x55
+#define SW5_CS15 0x56
+#define SW5_CS16 0x57
+#define SW5_CS17 0x58
+#define SW5_CS18 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 SW6_CS1 0x5A
+#define SW6_CS2 0x5B
+#define SW6_CS3 0x5C
+#define SW6_CS4 0x5D
+#define SW6_CS5 0x5E
+#define SW6_CS6 0x5F
+#define SW6_CS7 0x60
+#define SW6_CS8 0x61
+#define SW6_CS9 0x62
+#define SW6_CS10 0x63
+#define SW6_CS11 0x64
+#define SW6_CS12 0x65
+#define SW6_CS13 0x66
+#define SW6_CS14 0x67
+#define SW6_CS15 0x68
+#define SW6_CS16 0x69
+#define SW6_CS17 0x6A
+#define SW6_CS18 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 SW7_CS1 0x6C
+#define SW7_CS2 0x6D
+#define SW7_CS3 0x6E
+#define SW7_CS4 0x6F
+#define SW7_CS5 0x70
+#define SW7_CS6 0x71
+#define SW7_CS7 0x72
+#define SW7_CS8 0x73
+#define SW7_CS9 0x74
+#define SW7_CS10 0x75
+#define SW7_CS11 0x76
+#define SW7_CS12 0x77
+#define SW7_CS13 0x78
+#define SW7_CS14 0x79
+#define SW7_CS15 0x7A
+#define SW7_CS16 0x7B
+#define SW7_CS17 0x7C
+#define SW7_CS18 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 SW8_CS1 0x7E
+#define SW8_CS2 0x7F
+#define SW8_CS3 0x80
+#define SW8_CS4 0x81
+#define SW8_CS5 0x82
+#define SW8_CS6 0x83
+#define SW8_CS7 0x84
+#define SW8_CS8 0x85
+#define SW8_CS9 0x86
+#define SW8_CS10 0x87
+#define SW8_CS11 0x88
+#define SW8_CS12 0x89
+#define SW8_CS13 0x8A
+#define SW8_CS14 0x8B
+#define SW8_CS15 0x8C
+#define SW8_CS16 0x8D
+#define SW8_CS17 0x8E
+#define SW8_CS18 0x8F
diff --git a/drivers/led/issi/is31fl3746.h b/drivers/led/issi/is31fl3746.h
deleted file mode 100644
index f89f281533c..00000000000
--- a/drivers/led/issi/is31fl3746.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* 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/is31fl3746a-mono.c b/drivers/led/issi/is31fl3746a-mono.c
new file mode 100644
index 00000000000..6bff10723fd
--- /dev/null
+++ b/drivers/led/issi/is31fl3746a-mono.c
@@ -0,0 +1,222 @@
+/* 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 "is31fl3746a-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3746A_PWM_REGISTER_COUNT 72
+#define IS31FL3746A_SCALING_REGISTER_COUNT 72
+
+#ifndef IS31FL3746A_I2C_TIMEOUT
+#    define IS31FL3746A_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3746A_I2C_PERSISTENCE
+#    define IS31FL3746A_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3746A_CONFIGURATION
+#    define IS31FL3746A_CONFIGURATION 0x01
+#endif
+
+#ifndef IS31FL3746A_PWM_FREQUENCY
+#    define IS31FL3746A_PWM_FREQUENCY IS31FL3746A_PWM_FREQUENCY_29K_HZ
+#endif
+
+#ifndef IS31FL3746A_SW_PULLDOWN
+#    define IS31FL3746A_SW_PULLDOWN IS31FL3746A_PDR_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3746A_CS_PULLUP
+#    define IS31FL3746A_CS_PULLUP IS31FL3746A_PUR_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3746A_GLOBAL_CURRENT
+#    define IS31FL3746A_GLOBAL_CURRENT 0xFF
+#endif
+
+const uint8_t i2c_addresses[IS31FL3746A_DRIVER_COUNT] = {
+    IS31FL3746A_I2C_ADDRESS_1,
+#ifdef IS31FL3746A_I2C_ADDRESS_2
+    IS31FL3746A_I2C_ADDRESS_2,
+#    ifdef IS31FL3746A_I2C_ADDRESS_3
+    IS31FL3746A_I2C_ADDRESS_3,
+#        ifdef IS31FL3746A_I2C_ADDRESS_4
+    IS31FL3746A_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3746a_driver_t {
+    uint8_t pwm_buffer[IS31FL3746A_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3746A_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3746a_driver_t;
+
+is31fl3746a_driver_t driver_buffers[IS31FL3746A_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3746a_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3746A_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3746A_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3746A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3746A_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3746a_select_page(uint8_t index, uint8_t page) {
+    is31fl3746a_write_register(index, IS31FL3746A_REG_COMMAND_WRITE_LOCK, IS31FL3746A_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3746a_write_register(index, IS31FL3746A_REG_COMMAND, page);
+}
+
+void is31fl3746a_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 4 transfers of 18 bytes.
+
+    // Iterate over the pwm_buffer contents at 18 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3746A_PWM_REGISTER_COUNT; i += 18) {
+#if IS31FL3746A_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3746A_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3746A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3746A_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3746a_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3746A_SDB_PIN)
+    gpio_set_pin_output(IS31FL3746A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3746A_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3746A_DRIVER_COUNT; i++) {
+        is31fl3746a_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3746A_LED_COUNT; i++) {
+        is31fl3746a_set_scaling_register(i, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3746A_DRIVER_COUNT; i++) {
+        is31fl3746a_update_scaling_registers(i);
+    }
+}
+
+void is31fl3746a_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3746a_select_page(index, IS31FL3746A_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3746A_SCALING_REGISTER_COUNT; i++) {
+        is31fl3746a_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3746a_select_page(index, IS31FL3746A_COMMAND_PWM);
+
+    for (uint8_t i = 0; i < IS31FL3746A_PWM_REGISTER_COUNT; i++) {
+        is31fl3746a_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3746a_select_page(index, IS31FL3746A_COMMAND_FUNCTION);
+
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_PULLDOWNUP, (IS31FL3746A_SW_PULLDOWN << 4) | IS31FL3746A_CS_PULLUP);
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3746A_GLOBAL_CURRENT);
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_PWM_ENABLE, 0x01);
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_PWM_FREQUENCY, IS31FL3746A_PWM_FREQUENCY);
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_CONFIGURATION, IS31FL3746A_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3746a_set_value(int index, uint8_t value) {
+    is31fl3746a_led_t led;
+
+    if (index >= 0 && index < IS31FL3746A_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3746a_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3746a_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3746A_LED_COUNT; i++) {
+        is31fl3746a_set_value(i, value);
+    }
+}
+
+void is31fl3746a_set_scaling_register(uint8_t index, uint8_t value) {
+    is31fl3746a_led_t led;
+    memcpy_P(&led, (&g_is31fl3746a_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].scaling_buffer[led.v] = value;
+    driver_buffers[led.driver].scaling_buffer_dirty  = true;
+}
+
+void is31fl3746a_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3746a_select_page(index, IS31FL3746A_COMMAND_PWM);
+
+        is31fl3746a_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3746a_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3746a_select_page(index, IS31FL3746A_COMMAND_SCALING);
+
+        for (uint8_t i = 0; i < IS31FL3746A_SCALING_REGISTER_COUNT; i++) {
+            is31fl3746a_write_register(index, i + 1, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3746a_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3746A_DRIVER_COUNT; i++) {
+        is31fl3746a_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3746a-mono.h b/drivers/led/issi/is31fl3746a-mono.h
new file mode 100644
index 00000000000..295599cbcf9
--- /dev/null
+++ b/drivers/led/issi/is31fl3746a-mono.h
@@ -0,0 +1,201 @@
+/* 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"
+#include "util.h"
+
+#define IS31FL3746A_REG_ID 0xFC
+
+#define IS31FL3746A_REG_COMMAND 0xFD
+
+#define IS31FL3746A_COMMAND_PWM 0x00
+#define IS31FL3746A_COMMAND_SCALING 0x01
+#define IS31FL3746A_COMMAND_FUNCTION 0x01
+
+#define IS31FL3746A_FUNCTION_REG_CONFIGURATION 0x50
+#define IS31FL3746A_FUNCTION_REG_GLOBAL_CURRENT 0x51
+#define IS31FL3746A_FUNCTION_REG_PULLDOWNUP 0x52
+#define IS31FL3746A_FUNCTION_REG_TEMPERATURE 0x5F
+#define IS31FL3746A_FUNCTION_REG_SPREAD_SPECTRUM 0x60
+#define IS31FL3746A_FUNCTION_REG_RESET 0x8F
+#define IS31FL3746A_FUNCTION_REG_PWM_ENABLE 0xE0
+#define IS31FL3746A_FUNCTION_REG_PWM_FREQUENCY 0xE2
+
+#define IS31FL3746A_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3746A_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3746A_I2C_ADDRESS_GND_GND 0x60
+#define IS31FL3746A_I2C_ADDRESS_GND_SCL 0x61
+#define IS31FL3746A_I2C_ADDRESS_GND_SDA 0x62
+#define IS31FL3746A_I2C_ADDRESS_GND_VCC 0x63
+#define IS31FL3746A_I2C_ADDRESS_SCL_GND 0x64
+#define IS31FL3746A_I2C_ADDRESS_SCL_SCL 0x65
+#define IS31FL3746A_I2C_ADDRESS_SCL_SDA 0x66
+#define IS31FL3746A_I2C_ADDRESS_SCL_VCC 0x67
+#define IS31FL3746A_I2C_ADDRESS_SDA_GND 0x68
+#define IS31FL3746A_I2C_ADDRESS_SDA_SCL 0x69
+#define IS31FL3746A_I2C_ADDRESS_SDA_SDA 0x6A
+#define IS31FL3746A_I2C_ADDRESS_SDA_VCC 0x6B
+#define IS31FL3746A_I2C_ADDRESS_VCC_GND 0x6C
+#define IS31FL3746A_I2C_ADDRESS_VCC_SCL 0x6D
+#define IS31FL3746A_I2C_ADDRESS_VCC_SDA 0x6E
+#define IS31FL3746A_I2C_ADDRESS_VCC_VCC 0x6F
+
+#if defined(LED_MATRIX_IS31FL3746A)
+#    define IS31FL3746A_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3746A_I2C_ADDRESS_4)
+#    define IS31FL3746A_DRIVER_COUNT 4
+#elif defined(IS31FL3746A_I2C_ADDRESS_3)
+#    define IS31FL3746A_DRIVER_COUNT 3
+#elif defined(IS31FL3746A_I2C_ADDRESS_2)
+#    define IS31FL3746A_DRIVER_COUNT 2
+#elif defined(IS31FL3746A_I2C_ADDRESS_1)
+#    define IS31FL3746A_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3746a_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3746a_led_t;
+
+extern const is31fl3746a_led_t PROGMEM g_is31fl3746a_leds[IS31FL3746A_LED_COUNT];
+
+void is31fl3746a_init_drivers(void);
+void is31fl3746a_init(uint8_t index);
+void is31fl3746a_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3746a_select_page(uint8_t index, uint8_t page);
+
+void is31fl3746a_set_value(int index, uint8_t value);
+void is31fl3746a_set_value_all(uint8_t value);
+
+void is31fl3746a_set_scaling_register(uint8_t index, uint8_t value);
+
+void is31fl3746a_update_pwm_buffers(uint8_t index);
+void is31fl3746a_update_scaling_registers(uint8_t index);
+
+void is31fl3746a_flush(void);
+
+#define IS31FL3746A_PDR_0_OHM 0b000          // No pull-down resistor
+#define IS31FL3746A_PDR_0K5_OHM_SW_OFF 0b001 // 0.5 kOhm resistor in SWx off time
+#define IS31FL3746A_PDR_1K_OHM_SW_OFF 0b010  // 1 kOhm resistor in SWx off time
+#define IS31FL3746A_PDR_2K_OHM_SW_OFF 0b011  // 2 kOhm resistor in SWx off time
+#define IS31FL3746A_PDR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3746A_PDR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3746A_PDR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3746A_PDR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3746A_PUR_0_OHM 0b000          // No pull-up resistor
+#define IS31FL3746A_PUR_0K5_OHM_CS_OFF 0b001 // 0.5 kOhm resistor in CSy off time
+#define IS31FL3746A_PUR_1K_OHM_CS_OFF 0b010  // 1 kOhm resistor in CSy off time
+#define IS31FL3746A_PUR_2K_OHM_CS_OFF 0b011  // 2 kOhm resistor in CSy off time
+#define IS31FL3746A_PUR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3746A_PUR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3746A_PUR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3746A_PUR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3746A_PWM_FREQUENCY_29K_HZ 0b000
+#define IS31FL3746A_PWM_FREQUENCY_14K5_HZ 0b001
+#define IS31FL3746A_PWM_FREQUENCY_7K25_HZ 0b010
+#define IS31FL3746A_PWM_FREQUENCY_3K63_HZ 0b011
+#define IS31FL3746A_PWM_FREQUENCY_1K81_HZ 0b100
+#define IS31FL3746A_PWM_FREQUENCY_906_HZ 0b101
+#define IS31FL3746A_PWM_FREQUENCY_453_HZ 0b110
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+
+#define SW2_CS1 0x12
+#define SW2_CS2 0x13
+#define SW2_CS3 0x14
+#define SW2_CS4 0x15
+#define SW2_CS5 0x16
+#define SW2_CS6 0x17
+#define SW2_CS7 0x18
+#define SW2_CS8 0x19
+#define SW2_CS9 0x1A
+#define SW2_CS10 0x1B
+#define SW2_CS11 0x1C
+#define SW2_CS12 0x1D
+#define SW2_CS13 0x1E
+#define SW2_CS14 0x1F
+#define SW2_CS15 0x20
+#define SW2_CS16 0x21
+#define SW2_CS17 0x22
+#define SW2_CS18 0x23
+
+#define SW3_CS1 0x24
+#define SW3_CS2 0x25
+#define SW3_CS3 0x26
+#define SW3_CS4 0x27
+#define SW3_CS5 0x28
+#define SW3_CS6 0x29
+#define SW3_CS7 0x2A
+#define SW3_CS8 0x2B
+#define SW3_CS9 0x2C
+#define SW3_CS10 0x2D
+#define SW3_CS11 0x2E
+#define SW3_CS12 0x2F
+#define SW3_CS13 0x30
+#define SW3_CS14 0x31
+#define SW3_CS15 0x32
+#define SW3_CS16 0x33
+#define SW3_CS17 0x34
+#define SW3_CS18 0x35
+
+#define SW4_CS1 0x36
+#define SW4_CS2 0x37
+#define SW4_CS3 0x38
+#define SW4_CS4 0x39
+#define SW4_CS5 0x3A
+#define SW4_CS6 0x3B
+#define SW4_CS7 0x3C
+#define SW4_CS8 0x3D
+#define SW4_CS9 0x3E
+#define SW4_CS10 0x3F
+#define SW4_CS11 0x40
+#define SW4_CS12 0x41
+#define SW4_CS13 0x42
+#define SW4_CS14 0x43
+#define SW4_CS15 0x44
+#define SW4_CS16 0x45
+#define SW4_CS17 0x46
+#define SW4_CS18 0x47
diff --git a/drivers/led/issi/is31fl3746a.c b/drivers/led/issi/is31fl3746a.c
new file mode 100644
index 00000000000..1ef0b2d6322
--- /dev/null
+++ b/drivers/led/issi/is31fl3746a.c
@@ -0,0 +1,226 @@
+/* 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 "is31fl3746a.h"
+#include "i2c_master.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define IS31FL3746A_PWM_REGISTER_COUNT 72
+#define IS31FL3746A_SCALING_REGISTER_COUNT 72
+
+#ifndef IS31FL3746A_I2C_TIMEOUT
+#    define IS31FL3746A_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3746A_I2C_PERSISTENCE
+#    define IS31FL3746A_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3746A_CONFIGURATION
+#    define IS31FL3746A_CONFIGURATION 0x01
+#endif
+
+#ifndef IS31FL3746A_PWM_FREQUENCY
+#    define IS31FL3746A_PWM_FREQUENCY IS31FL3746A_PWM_FREQUENCY_29K_HZ
+#endif
+
+#ifndef IS31FL3746A_SW_PULLDOWN
+#    define IS31FL3746A_SW_PULLDOWN IS31FL3746A_PDR_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3746A_CS_PULLUP
+#    define IS31FL3746A_CS_PULLUP IS31FL3746A_PUR_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3746A_GLOBAL_CURRENT
+#    define IS31FL3746A_GLOBAL_CURRENT 0xFF
+#endif
+
+const uint8_t i2c_addresses[IS31FL3746A_DRIVER_COUNT] = {
+    IS31FL3746A_I2C_ADDRESS_1,
+#ifdef IS31FL3746A_I2C_ADDRESS_2
+    IS31FL3746A_I2C_ADDRESS_2,
+#    ifdef IS31FL3746A_I2C_ADDRESS_3
+    IS31FL3746A_I2C_ADDRESS_3,
+#        ifdef IS31FL3746A_I2C_ADDRESS_4
+    IS31FL3746A_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3746a_driver_t {
+    uint8_t pwm_buffer[IS31FL3746A_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t scaling_buffer[IS31FL3746A_SCALING_REGISTER_COUNT];
+    bool    scaling_buffer_dirty;
+} PACKED is31fl3746a_driver_t;
+
+is31fl3746a_driver_t driver_buffers[IS31FL3746A_DRIVER_COUNT] = {{
+    .pwm_buffer           = {0},
+    .pwm_buffer_dirty     = false,
+    .scaling_buffer       = {0},
+    .scaling_buffer_dirty = false,
+}};
+
+void is31fl3746a_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3746A_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3746A_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3746A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3746A_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3746a_select_page(uint8_t index, uint8_t page) {
+    is31fl3746a_write_register(index, IS31FL3746A_REG_COMMAND_WRITE_LOCK, IS31FL3746A_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3746a_write_register(index, IS31FL3746A_REG_COMMAND, page);
+}
+
+void is31fl3746a_write_pwm_buffer(uint8_t index) {
+    // Assumes page 0 is already selected.
+    // Transmit PWM registers in 4 transfers of 18 bytes.
+
+    // Iterate over the pwm_buffer contents at 18 byte intervals.
+    for (uint8_t i = 0; i < IS31FL3746A_PWM_REGISTER_COUNT; i += 18) {
+#if IS31FL3746A_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < IS31FL3746A_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3746A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i + 1, driver_buffers[index].pwm_buffer + i, 18, IS31FL3746A_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3746a_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3746A_SDB_PIN)
+    gpio_set_pin_output(IS31FL3746A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3746A_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3746A_DRIVER_COUNT; i++) {
+        is31fl3746a_init(i);
+    }
+
+    for (int i = 0; i < IS31FL3746A_LED_COUNT; i++) {
+        is31fl3746a_set_scaling_register(i, 0xFF, 0xFF, 0xFF);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3746A_DRIVER_COUNT; i++) {
+        is31fl3746a_update_scaling_registers(i);
+    }
+}
+
+void is31fl3746a_init(uint8_t index) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3746a_select_page(index, IS31FL3746A_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (uint8_t i = 0; i < IS31FL3746A_SCALING_REGISTER_COUNT; i++) {
+        is31fl3746a_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3746a_select_page(index, IS31FL3746A_COMMAND_PWM);
+
+    for (uint8_t i = 0; i < IS31FL3746A_PWM_REGISTER_COUNT; i++) {
+        is31fl3746a_write_register(index, i + 1, 0x00);
+    }
+
+    is31fl3746a_select_page(index, IS31FL3746A_COMMAND_FUNCTION);
+
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_PULLDOWNUP, (IS31FL3746A_SW_PULLDOWN << 4) | IS31FL3746A_CS_PULLUP);
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3746A_GLOBAL_CURRENT);
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_PWM_ENABLE, 0x01);
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_PWM_FREQUENCY, IS31FL3746A_PWM_FREQUENCY);
+    is31fl3746a_write_register(index, IS31FL3746A_FUNCTION_REG_CONFIGURATION, IS31FL3746A_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3746a_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3746a_led_t led;
+
+    if (index >= 0 && index < IS31FL3746A_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3746a_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3746a_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (int i = 0; i < IS31FL3746A_LED_COUNT; i++) {
+        is31fl3746a_set_color(i, red, green, blue);
+    }
+}
+
+void is31fl3746a_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3746a_led_t led;
+    memcpy_P(&led, (&g_is31fl3746a_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].scaling_buffer[led.r] = red;
+    driver_buffers[led.driver].scaling_buffer[led.g] = green;
+    driver_buffers[led.driver].scaling_buffer[led.b] = blue;
+    driver_buffers[led.driver].scaling_buffer_dirty  = true;
+}
+
+void is31fl3746a_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3746a_select_page(index, IS31FL3746A_COMMAND_PWM);
+
+        is31fl3746a_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3746a_update_scaling_registers(uint8_t index) {
+    if (driver_buffers[index].scaling_buffer_dirty) {
+        is31fl3746a_select_page(index, IS31FL3746A_COMMAND_SCALING);
+
+        for (uint8_t i = 0; i < IS31FL3746A_SCALING_REGISTER_COUNT; i++) {
+            is31fl3746a_write_register(index, i + 1, driver_buffers[index].scaling_buffer[i]);
+        }
+
+        driver_buffers[index].scaling_buffer_dirty = false;
+    }
+}
+
+void is31fl3746a_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3746A_DRIVER_COUNT; i++) {
+        is31fl3746a_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3746a.h b/drivers/led/issi/is31fl3746a.h
new file mode 100644
index 00000000000..ba435b8f195
--- /dev/null
+++ b/drivers/led/issi/is31fl3746a.h
@@ -0,0 +1,203 @@
+/* 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"
+#include "util.h"
+
+#define IS31FL3746A_REG_ID 0xFC
+
+#define IS31FL3746A_REG_COMMAND 0xFD
+
+#define IS31FL3746A_COMMAND_PWM 0x00
+#define IS31FL3746A_COMMAND_SCALING 0x01
+#define IS31FL3746A_COMMAND_FUNCTION 0x01
+
+#define IS31FL3746A_FUNCTION_REG_CONFIGURATION 0x50
+#define IS31FL3746A_FUNCTION_REG_GLOBAL_CURRENT 0x51
+#define IS31FL3746A_FUNCTION_REG_PULLDOWNUP 0x52
+#define IS31FL3746A_FUNCTION_REG_TEMPERATURE 0x5F
+#define IS31FL3746A_FUNCTION_REG_SPREAD_SPECTRUM 0x60
+#define IS31FL3746A_FUNCTION_REG_RESET 0x8F
+#define IS31FL3746A_FUNCTION_REG_PWM_ENABLE 0xE0
+#define IS31FL3746A_FUNCTION_REG_PWM_FREQUENCY 0xE2
+
+#define IS31FL3746A_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3746A_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3746A_I2C_ADDRESS_GND_GND 0x60
+#define IS31FL3746A_I2C_ADDRESS_GND_SCL 0x61
+#define IS31FL3746A_I2C_ADDRESS_GND_SDA 0x62
+#define IS31FL3746A_I2C_ADDRESS_GND_VCC 0x63
+#define IS31FL3746A_I2C_ADDRESS_SCL_GND 0x64
+#define IS31FL3746A_I2C_ADDRESS_SCL_SCL 0x65
+#define IS31FL3746A_I2C_ADDRESS_SCL_SDA 0x66
+#define IS31FL3746A_I2C_ADDRESS_SCL_VCC 0x67
+#define IS31FL3746A_I2C_ADDRESS_SDA_GND 0x68
+#define IS31FL3746A_I2C_ADDRESS_SDA_SCL 0x69
+#define IS31FL3746A_I2C_ADDRESS_SDA_SDA 0x6A
+#define IS31FL3746A_I2C_ADDRESS_SDA_VCC 0x6B
+#define IS31FL3746A_I2C_ADDRESS_VCC_GND 0x6C
+#define IS31FL3746A_I2C_ADDRESS_VCC_SCL 0x6D
+#define IS31FL3746A_I2C_ADDRESS_VCC_SDA 0x6E
+#define IS31FL3746A_I2C_ADDRESS_VCC_VCC 0x6F
+
+#if defined(RGB_MATRIX_IS31FL3746A)
+#    define IS31FL3746A_LED_COUNT RGB_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3746A_I2C_ADDRESS_4)
+#    define IS31FL3746A_DRIVER_COUNT 4
+#elif defined(IS31FL3746A_I2C_ADDRESS_3)
+#    define IS31FL3746A_DRIVER_COUNT 3
+#elif defined(IS31FL3746A_I2C_ADDRESS_2)
+#    define IS31FL3746A_DRIVER_COUNT 2
+#elif defined(IS31FL3746A_I2C_ADDRESS_1)
+#    define IS31FL3746A_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3746a_led_t {
+    uint8_t driver : 2;
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+} PACKED is31fl3746a_led_t;
+
+extern const is31fl3746a_led_t PROGMEM g_is31fl3746a_leds[IS31FL3746A_LED_COUNT];
+
+void is31fl3746a_init_drivers(void);
+void is31fl3746a_init(uint8_t index);
+void is31fl3746a_write_register(uint8_t index, uint8_t reg, uint8_t data);
+void is31fl3746a_select_page(uint8_t index, uint8_t page);
+
+void is31fl3746a_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void is31fl3746a_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3746a_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3746a_update_pwm_buffers(uint8_t index);
+void is31fl3746a_update_scaling_registers(uint8_t index);
+
+void is31fl3746a_flush(void);
+
+#define IS31FL3746A_PDR_0_OHM 0b000          // No pull-down resistor
+#define IS31FL3746A_PDR_0K5_OHM_SW_OFF 0b001 // 0.5 kOhm resistor in SWx off time
+#define IS31FL3746A_PDR_1K_OHM_SW_OFF 0b010  // 1 kOhm resistor in SWx off time
+#define IS31FL3746A_PDR_2K_OHM_SW_OFF 0b011  // 2 kOhm resistor in SWx off time
+#define IS31FL3746A_PDR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3746A_PDR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3746A_PDR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3746A_PDR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3746A_PUR_0_OHM 0b000          // No pull-up resistor
+#define IS31FL3746A_PUR_0K5_OHM_CS_OFF 0b001 // 0.5 kOhm resistor in CSy off time
+#define IS31FL3746A_PUR_1K_OHM_CS_OFF 0b010  // 1 kOhm resistor in CSy off time
+#define IS31FL3746A_PUR_2K_OHM_CS_OFF 0b011  // 2 kOhm resistor in CSy off time
+#define IS31FL3746A_PUR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3746A_PUR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3746A_PUR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3746A_PUR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3746A_PWM_FREQUENCY_29K_HZ 0b000
+#define IS31FL3746A_PWM_FREQUENCY_14K5_HZ 0b001
+#define IS31FL3746A_PWM_FREQUENCY_7K25_HZ 0b010
+#define IS31FL3746A_PWM_FREQUENCY_3K63_HZ 0b011
+#define IS31FL3746A_PWM_FREQUENCY_1K81_HZ 0b100
+#define IS31FL3746A_PWM_FREQUENCY_906_HZ 0b101
+#define IS31FL3746A_PWM_FREQUENCY_453_HZ 0b110
+
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+#define SW1_CS17 0x10
+#define SW1_CS18 0x11
+
+#define SW2_CS1 0x12
+#define SW2_CS2 0x13
+#define SW2_CS3 0x14
+#define SW2_CS4 0x15
+#define SW2_CS5 0x16
+#define SW2_CS6 0x17
+#define SW2_CS7 0x18
+#define SW2_CS8 0x19
+#define SW2_CS9 0x1A
+#define SW2_CS10 0x1B
+#define SW2_CS11 0x1C
+#define SW2_CS12 0x1D
+#define SW2_CS13 0x1E
+#define SW2_CS14 0x1F
+#define SW2_CS15 0x20
+#define SW2_CS16 0x21
+#define SW2_CS17 0x22
+#define SW2_CS18 0x23
+
+#define SW3_CS1 0x24
+#define SW3_CS2 0x25
+#define SW3_CS3 0x26
+#define SW3_CS4 0x27
+#define SW3_CS5 0x28
+#define SW3_CS6 0x29
+#define SW3_CS7 0x2A
+#define SW3_CS8 0x2B
+#define SW3_CS9 0x2C
+#define SW3_CS10 0x2D
+#define SW3_CS11 0x2E
+#define SW3_CS12 0x2F
+#define SW3_CS13 0x30
+#define SW3_CS14 0x31
+#define SW3_CS15 0x32
+#define SW3_CS16 0x33
+#define SW3_CS17 0x34
+#define SW3_CS18 0x35
+
+#define SW4_CS1 0x36
+#define SW4_CS2 0x37
+#define SW4_CS3 0x38
+#define SW4_CS4 0x39
+#define SW4_CS5 0x3A
+#define SW4_CS6 0x3B
+#define SW4_CS7 0x3C
+#define SW4_CS8 0x3D
+#define SW4_CS9 0x3E
+#define SW4_CS10 0x3F
+#define SW4_CS11 0x40
+#define SW4_CS12 0x41
+#define SW4_CS13 0x42
+#define SW4_CS14 0x43
+#define SW4_CS15 0x44
+#define SW4_CS16 0x45
+#define SW4_CS17 0x46
+#define SW4_CS18 0x47
diff --git a/drivers/led/issi/is31flcommon.c b/drivers/led/issi/is31flcommon.c
deleted file mode 100644
index d6b9bce93d7..00000000000
--- a/drivers/led/issi/is31flcommon.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* 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) {
-    is31_led led;
-    is31_led scale;
-    for (int i = 0; i < ISSI_MANUAL_SCALING; i++) {
-        memcpy_P(&scale, (&g_is31_scaling[i]), sizeof(scale));
-
-#    ifdef RGB_MATRIX_ENABLE
-        if (scale.driver >= 0 && scale.driver < RGB_MATRIX_LED_COUNT) {
-            memcpy_P(&led, (&g_is31_leds[scale.driver]), sizeof(led));
-
-            if (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) {
-                return;
-            }
-            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)
-        if (scale.driver >= 0 && scale.driver < LED_MATRIX_LED_COUNT) {
-            memcpy_P(&led, (&g_is31_leds[scale.driver]), sizeof(led));
-
-            if (g_scaling_buffer[led.driver][led.v] == scale.v) {
-                return;
-            }
-            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;
-    }
-}
-
-void IS31FL_common_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
-}
-
-#ifdef RGB_MATRIX_ENABLE
-void IS31FL_RGB_init_drivers(void) {
-    i2c_init();
-
-    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
-
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        IS31FL_RGB_set_scaling_buffer(i, true, true, true);
-    }
-
-    // This actually updates the LED drivers
-#    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
-}
-
-// 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 < RGB_MATRIX_LED_COUNT) {
-        is31_led led;
-        memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
-
-        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 < RGB_MATRIX_LED_COUNT; 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;
-    memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
-    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_init_drivers(void) {
-    i2c_init();
-
-    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
-
-    for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
-        IS31FL_simple_set_scaling_buffer(i, true);
-    }
-
-// This actually updates the LED drivers
-#    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
-}
-
-void IS31FL_simple_set_scaling_buffer(uint8_t index, bool value) {
-    is31_led led;
-    memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
-    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 < LED_MATRIX_LED_COUNT) {
-        is31_led led;
-        memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
-
-        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 < LED_MATRIX_LED_COUNT; i++) {
-        IS31FL_simple_set_brightness(i, value);
-    }
-}
-#endif
diff --git a/drivers/led/issi/is31flcommon.h b/drivers/led/issi/is31flcommon.h
deleted file mode 100644
index 10613a6eed8..00000000000
--- a/drivers/led/issi/is31flcommon.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* 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"
-#include "util.h"
-
-// Which variant header file to use
-#if defined(LED_MATRIX_IS31FL3742A) || defined(RGB_MATRIX_IS31FL3742A)
-#    include "is31fl3742.h"
-#elif defined(LED_MATRIX_IS31FL3743A) || defined(RGB_MATRIX_IS31FL3743A)
-#    include "is31fl3743.h"
-#elif defined(LED_MATRIX_IS31FL3745) || defined(RGB_MATRIX_IS31FL3745)
-#    include "is31fl3745.h"
-#elif defined(LED_MATRIX_IS31FL3746A) || defined(RGB_MATRIX_IS31FL3746A)
-#    include "is31fl3746.h"
-#endif
-
-#if defined DRIVER_ADDR_4
-#    define DRIVER_COUNT 4
-#elif defined DRIVER_ADDR_3
-#    define DRIVER_COUNT 3
-#elif defined DRIVER_ADDR_2
-#    define DRIVER_COUNT 2
-#elif defined DRIVER_ADDR_1
-#    define DRIVER_COUNT 1
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-typedef struct is31_led {
-    uint8_t driver : 2;
-    uint8_t r;
-    uint8_t g;
-    uint8_t b;
-} PACKED is31_led;
-
-extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
-
-#elif defined(LED_MATRIX_ENABLE)
-typedef struct is31_led {
-    uint8_t driver : 2;
-    uint8_t v;
-} PACKED is31_led;
-
-extern const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT];
-#endif
-
-#ifdef ISSI_MANUAL_SCALING
-extern const is31_led PROGMEM g_is31_scaling[];
-void                          IS31FL_set_manual_scaling_buffer(void);
-#endif
-
-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);
-
-void IS31FL_common_flush(void);
-
-#ifdef RGB_MATRIX_ENABLE
-// RGB Matrix Specific scripts
-void IS31FL_RGB_init_drivers(void);
-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_init_drivers(void);
-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/led/snled27351-mono.c b/drivers/led/snled27351-mono.c
new file mode 100644
index 00000000000..d87b856db69
--- /dev/null
+++ b/drivers/led/snled27351-mono.c
@@ -0,0 +1,250 @@
+/* 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 "snled27351-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+
+#define SNLED27351_PWM_REGISTER_COUNT 192
+#define SNLED27351_LED_CONTROL_REGISTER_COUNT 24
+
+#ifndef SNLED27351_I2C_TIMEOUT
+#    define SNLED27351_I2C_TIMEOUT 100
+#endif
+
+#ifndef SNLED27351_I2C_PERSISTENCE
+#    define SNLED27351_I2C_PERSISTENCE 0
+#endif
+
+#ifndef SNLED27351_PHASE_CHANNEL
+#    define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_12_CHANNEL
+#endif
+
+#ifndef SNLED27351_CURRENT_TUNE
+#    define SNLED27351_CURRENT_TUNE \
+        { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
+#endif
+
+const uint8_t i2c_addresses[SNLED27351_DRIVER_COUNT] = {
+    SNLED27351_I2C_ADDRESS_1,
+#ifdef SNLED27351_I2C_ADDRESS_2
+    SNLED27351_I2C_ADDRESS_2,
+#    ifdef SNLED27351_I2C_ADDRESS_3
+    SNLED27351_I2C_ADDRESS_3,
+#        ifdef SNLED27351_I2C_ADDRESS_4
+    SNLED27351_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+// These buffers match the SNLED27351 PWM registers.
+// The control buffers match the PG0 LED On/Off registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in snled27351_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+typedef struct snled27351_driver_t {
+    uint8_t pwm_buffer[SNLED27351_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[SNLED27351_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED snled27351_driver_t;
+
+snled27351_driver_t driver_buffers[SNLED27351_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void snled27351_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if SNLED27351_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < SNLED27351_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, SNLED27351_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, SNLED27351_I2C_TIMEOUT);
+#endif
+}
+
+void snled27351_select_page(uint8_t index, uint8_t page) {
+    snled27351_write_register(index, SNLED27351_REG_COMMAND, page);
+}
+
+void snled27351_write_pwm_buffer(uint8_t index) {
+    // Assumes PG1 is already selected.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
+
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (uint8_t i = 0; i < SNLED27351_PWM_REGISTER_COUNT; i += 16) {
+#if SNLED27351_I2C_PERSISTENCE > 0
+        for (uint8_t j = 0; j < SNLED27351_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, SNLED27351_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        }
+#else
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, SNLED27351_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void snled27351_init_drivers(void) {
+    i2c_init();
+
+#if defined(SNLED27351_SDB_PIN)
+    gpio_set_pin_output(SNLED27351_SDB_PIN);
+    gpio_write_pin_high(SNLED27351_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < SNLED27351_DRIVER_COUNT; i++) {
+        snled27351_init(i);
+    }
+
+    for (int i = 0; i < SNLED27351_LED_COUNT; i++) {
+        snled27351_set_led_control_register(i, true);
+    }
+
+    for (uint8_t i = 0; i < SNLED27351_DRIVER_COUNT; i++) {
+        snled27351_update_led_control_registers(i);
+    }
+}
+
+void snled27351_init(uint8_t index) {
+    snled27351_select_page(index, SNLED27351_COMMAND_FUNCTION);
+
+    // Setting LED driver to shutdown mode
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
+    // Setting internal channel pulldown/pullup
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_PULLDOWNUP, SNLED27351_PULLDOWNUP_ALL_ENABLED);
+    // Select number of scan phase
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SCAN_PHASE, SNLED27351_PHASE_CHANNEL);
+    // Setting PWM Delay Phase
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_1, SNLED27351_SLEW_RATE_CONTROL_MODE_1_PDP_ENABLE);
+    // Setting Driving/Sinking Channel Slew Rate
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_2, SNLED27351_SLEW_RATE_CONTROL_MODE_2_DSL_ENABLE | SNLED27351_SLEW_RATE_CONTROL_MODE_2_SSL_ENABLE);
+    // Setting Iref
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, 0);
+
+    snled27351_select_page(index, SNLED27351_COMMAND_LED_CONTROL);
+
+    for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
+        snled27351_write_register(index, i, 0x00);
+    }
+
+    snled27351_select_page(index, SNLED27351_COMMAND_PWM);
+
+    for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
+        snled27351_write_register(index, i, 0x00);
+    }
+
+    snled27351_select_page(index, SNLED27351_COMMAND_CURRENT_TUNE);
+
+    uint8_t current_tune_reg_list[SNLED27351_LED_CURRENT_TUNE_LENGTH] = SNLED27351_CURRENT_TUNE;
+    for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
+        snled27351_write_register(index, i, current_tune_reg_list[i]);
+    }
+
+    snled27351_select_page(index, SNLED27351_COMMAND_LED_CONTROL);
+
+    for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
+        snled27351_write_register(index, i, 0xFF);
+    }
+
+    snled27351_select_page(index, SNLED27351_COMMAND_FUNCTION);
+
+    // Setting LED driver to normal mode
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
+}
+
+void snled27351_set_value(int index, uint8_t value) {
+    snled27351_led_t led;
+    if (index >= 0 && index < SNLED27351_LED_COUNT) {
+        memcpy_P(&led, (&g_snled27351_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void snled27351_set_value_all(uint8_t value) {
+    for (int i = 0; i < SNLED27351_LED_COUNT; i++) {
+        snled27351_set_value(i, value);
+    }
+}
+
+void snled27351_set_led_control_register(uint8_t index, bool value) {
+    snled27351_led_t led;
+    memcpy_P(&led, (&g_snled27351_leds[index]), sizeof(led));
+
+    uint8_t control_register = led.v / 8;
+    uint8_t bit_value        = led.v % 8;
+
+    if (value) {
+        driver_buffers[led.driver].led_control_buffer[control_register] |= (1 << bit_value);
+    } else {
+        driver_buffers[led.driver].led_control_buffer[control_register] &= ~(1 << bit_value);
+    }
+
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
+}
+
+void snled27351_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        snled27351_select_page(index, SNLED27351_COMMAND_PWM);
+
+        snled27351_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void snled27351_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        snled27351_select_page(index, SNLED27351_COMMAND_LED_CONTROL);
+
+        for (uint8_t i = 0; i < SNLED27351_LED_CONTROL_REGISTER_COUNT; i++) {
+            snled27351_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
+        }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
+    }
+}
+
+void snled27351_flush(void) {
+    for (uint8_t i = 0; i < SNLED27351_DRIVER_COUNT; i++) {
+        snled27351_update_pwm_buffers(i);
+    }
+}
+
+void snled27351_sw_return_normal(uint8_t index) {
+    snled27351_select_page(index, SNLED27351_COMMAND_FUNCTION);
+
+    // Setting LED driver to normal mode
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
+}
+
+void snled27351_sw_shutdown(uint8_t index) {
+    snled27351_select_page(index, SNLED27351_COMMAND_FUNCTION);
+
+    // Setting LED driver to shutdown mode
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
+    // Write SW Sleep Register
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, SNLED27351_SOFTWARE_SLEEP_ENABLE);
+}
diff --git a/drivers/led/snled27351-mono.h b/drivers/led/snled27351-mono.h
new file mode 100644
index 00000000000..43d39934cb3
--- /dev/null
+++ b/drivers/led/snled27351-mono.h
@@ -0,0 +1,586 @@
+/* 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/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+#include "util.h"
+
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef CKLED2001_TIMEOUT
+#    define SNLED27351_I2C_TIMEOUT CKLED2001_TIMEOUT
+#endif
+#ifdef CKLED2001_PERSISTENCE
+#    define SNLED27351_I2C_PERSISTENCE CKLED2001_PERSISTENCE
+#endif
+#ifdef PHASE_CHANNEL
+#    define SNLED27351_PHASE_CHANNEL PHASE_CHANNEL
+#endif
+#ifdef CKLED2001_CURRENT_TUNE
+#    define SNLED27351_CURRENT_TUNE CKLED2001_CURRENT_TUNE
+#endif
+
+#define MSKPHASE_12CHANNEL SNLED27351_SCAN_PHASE_12_CHANNEL
+#define MSKPHASE_11CHANNEL SNLED27351_SCAN_PHASE_11_CHANNEL
+#define MSKPHASE_10CHANNEL SNLED27351_SCAN_PHASE_10_CHANNEL
+#define MSKPHASE_9CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
+#define MSKPHASE_8CHANNEL SNLED27351_SCAN_PHASE_8_CHANNEL
+#define MSKPHASE_7CHANNEL SNLED27351_SCAN_PHASE_7_CHANNEL
+#define MSKPHASE_6CHANNEL SNLED27351_SCAN_PHASE_6_CHANNEL
+#define MSKPHASE_5CHANNEL SNLED27351_SCAN_PHASE_5_CHANNEL
+#define MSKPHASE_4CHANNEL SNLED27351_SCAN_PHASE_4_CHANNEL
+#define MSKPHASE_3CHANNEL SNLED27351_SCAN_PHASE_3_CHANNEL
+#define MSKPHASE_2CHANNEL SNLED27351_SCAN_PHASE_2_CHANNEL
+#define MSKPHASE_1CHANNEL SNLED27351_SCAN_PHASE_1_CHANNEL
+
+#define ckled2001_led snled27351_led_t
+#define g_ckled2001_leds g_snled27351_leds
+// ========
+
+#define SNLED27351_REG_COMMAND 0xFD
+#define SNLED27351_COMMAND_LED_CONTROL 0x00
+#define SNLED27351_COMMAND_PWM 0x01
+#define SNLED27351_COMMAND_FUNCTION 0x03
+#define SNLED27351_COMMAND_CURRENT_TUNE 0x04
+
+#define SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN 0x00
+#define SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN (0x0 << 0)
+#define SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL (0x1 << 0)
+
+#define SNLED27351_FUNCTION_REG_ID 0x11
+#define SNLED27351_DRIVER_ID 0x8A
+
+#define SNLED27351_FUNCTION_REG_PULLDOWNUP 0x13
+#define SNLED27351_PULLDOWNUP_ALL_ENABLED 0xAA
+
+#define SNLED27351_FUNCTION_REG_SCAN_PHASE 0x14
+#define SNLED27351_SCAN_PHASE_12_CHANNEL 0x00
+#define SNLED27351_SCAN_PHASE_11_CHANNEL 0x01
+#define SNLED27351_SCAN_PHASE_10_CHANNEL 0x02
+#define SNLED27351_SCAN_PHASE_9_CHANNEL 0x03
+#define SNLED27351_SCAN_PHASE_8_CHANNEL 0x04
+#define SNLED27351_SCAN_PHASE_7_CHANNEL 0x05
+#define SNLED27351_SCAN_PHASE_6_CHANNEL 0x06
+#define SNLED27351_SCAN_PHASE_5_CHANNEL 0x07
+#define SNLED27351_SCAN_PHASE_4_CHANNEL 0x08
+#define SNLED27351_SCAN_PHASE_3_CHANNEL 0x09
+#define SNLED27351_SCAN_PHASE_2_CHANNEL 0x0A
+#define SNLED27351_SCAN_PHASE_1_CHANNEL 0x0B
+
+#define SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_1 0x15
+#define SNLED27351_SLEW_RATE_CONTROL_MODE_1_PDP_ENABLE (0b1 << 2)
+
+#define SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_2 0x16
+#define SNLED27351_SLEW_RATE_CONTROL_MODE_2_SSL_ENABLE (0b1 << 6)
+#define SNLED27351_SLEW_RATE_CONTROL_MODE_2_DSL_ENABLE (0b1 << 7)
+
+#define SNLED27351_FUNCTION_REG_OPEN_SHORT_ENABLE 0x17
+#define SNLED27351_OPEN_SHORT_ENABLE_SDS_ENABLE (0b1 << 6)
+#define SNLED27351_OPEN_SHORT_ENABLE_ODS_ENABLE (0b1 << 7)
+
+#define SNLED27351_FUNCTION_REG_OPEN_SHORT_DUTY 0x18
+
+#define SNLED27351_FUNCTION_REG_OPEN_SHORT_FLAG 0x19
+#define SNLED27351_OPEN_SHORT_FLAG_OSINT_ENABLE (0b1 << 6)
+#define SNLED27351_OPEN_SHORT_FLAG_ODINT_ENABLE (0b1 << 7)
+
+#define SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP 0x1A
+#define SNLED27351_SOFTWARE_SLEEP_ENABLE (0b1 << 1)
+
+// LED Control Registers
+#define SNLED27351_LED_CONTROL_ON_OFF_FIRST_ADDR 0x0
+#define SNLED27351_LED_CONTROL_ON_OFF_LAST_ADDR 0x17
+#define SNLED27351_LED_CONTROL_ON_OFF_LENGTH ((SNLED27351_LED_CONTROL_ON_OFF_LAST_ADDR - SNLED27351_LED_CONTROL_ON_OFF_FIRST_ADDR) + 1)
+
+#define SNLED27351_LED_CONTROL_OPEN_FIRST_ADDR 0x18
+#define SNLED27351_LED_CONTROL_OPEN_LAST_ADDR 0x2F
+#define SNLED27351_LED_CONTROL_OPEN_LENGTH ((SNLED27351_LED_CONTROL_OPEN_LAST_ADDR - SNLED27351_LED_CONTROL_OPEN_FIRST_ADDR) + 1)
+
+#define SNLED27351_LED_CONTROL_SHORT_FIRST_ADDR 0x30
+#define SNLED27351_LED_CONTROL_SHORT_LAST_ADDR 0x47
+#define SNLED27351_LED_CONTROL_SHORT_LENGTH ((SNLED27351_LED_CONTROL_SHORT_LAST_ADDR - SNLED27351_LED_CONTROL_SHORT_FIRST_ADDR) + 1)
+
+#define SNLED27351_LED_CONTROL_PAGE_LENGTH 0x48
+
+// LED Control Registers
+#define SNLED27351_LED_PWM_FIRST_ADDR 0x00
+#define SNLED27351_LED_PWM_LAST_ADDR 0xBF
+#define SNLED27351_LED_PWM_LENGTH 0xC0
+
+// Current Tune Registers
+#define SNLED27351_LED_CURRENT_TUNE_FIRST_ADDR 0x00
+#define SNLED27351_LED_CURRENT_TUNE_LAST_ADDR 0x0B
+#define SNLED27351_LED_CURRENT_TUNE_LENGTH 0x0C
+
+#define SNLED27351_I2C_ADDRESS_GND 0x74
+#define SNLED27351_I2C_ADDRESS_SCL 0x75
+#define SNLED27351_I2C_ADDRESS_SDA 0x76
+#define SNLED27351_I2C_ADDRESS_VDDIO 0x77
+
+#if defined(LED_MATRIX_SNLED27351)
+#    define SNLED27351_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(SNLED27351_I2C_ADDRESS_4)
+#    define SNLED27351_DRIVER_COUNT 4
+#elif defined(SNLED27351_I2C_ADDRESS_3)
+#    define SNLED27351_DRIVER_COUNT 3
+#elif defined(SNLED27351_I2C_ADDRESS_2)
+#    define SNLED27351_DRIVER_COUNT 2
+#elif defined(SNLED27351_I2C_ADDRESS_1)
+#    define SNLED27351_DRIVER_COUNT 1
+#endif
+
+typedef struct snled27351_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED snled27351_led_t;
+
+extern const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT];
+
+void snled27351_init_drivers(void);
+void snled27351_init(uint8_t index);
+void snled27351_select_page(uint8_t index, uint8_t page);
+void snled27351_write_register(uint8_t index, uint8_t reg, uint8_t data);
+
+void snled27351_set_value(int index, uint8_t value);
+void snled27351_set_value_all(uint8_t value);
+
+void snled27351_set_led_control_register(uint8_t index, bool value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void snled27351_update_pwm_buffers(uint8_t index);
+void snled27351_update_led_control_registers(uint8_t index);
+
+void snled27351_flush(void);
+
+void snled27351_sw_return_normal(uint8_t index);
+void snled27351_sw_shutdown(uint8_t index);
+
+#define CB1_CA1 0x00
+#define CB1_CA2 0x01
+#define CB1_CA3 0x02
+#define CB1_CA4 0x03
+#define CB1_CA5 0x04
+#define CB1_CA6 0x05
+#define CB1_CA7 0x06
+#define CB1_CA8 0x07
+#define CB1_CA9 0x08
+#define CB1_CA10 0x09
+#define CB1_CA11 0x0A
+#define CB1_CA12 0x0B
+#define CB1_CA13 0x0C
+#define CB1_CA14 0x0D
+#define CB1_CA15 0x0E
+#define CB1_CA16 0x0F
+
+#define CB2_CA1 0x10
+#define CB2_CA2 0x11
+#define CB2_CA3 0x12
+#define CB2_CA4 0x13
+#define CB2_CA5 0x14
+#define CB2_CA6 0x15
+#define CB2_CA7 0x16
+#define CB2_CA8 0x17
+#define CB2_CA9 0x18
+#define CB2_CA10 0x19
+#define CB2_CA11 0x1A
+#define CB2_CA12 0x1B
+#define CB2_CA13 0x1C
+#define CB2_CA14 0x1D
+#define CB2_CA15 0x1E
+#define CB2_CA16 0x1F
+
+#define CB3_CA1 0x20
+#define CB3_CA2 0x21
+#define CB3_CA3 0x22
+#define CB3_CA4 0x23
+#define CB3_CA5 0x24
+#define CB3_CA6 0x25
+#define CB3_CA7 0x26
+#define CB3_CA8 0x27
+#define CB3_CA9 0x28
+#define CB3_CA10 0x29
+#define CB3_CA11 0x2A
+#define CB3_CA12 0x2B
+#define CB3_CA13 0x2C
+#define CB3_CA14 0x2D
+#define CB3_CA15 0x2E
+#define CB3_CA16 0x2F
+
+#define CB4_CA1 0x30
+#define CB4_CA2 0x31
+#define CB4_CA3 0x32
+#define CB4_CA4 0x33
+#define CB4_CA5 0x34
+#define CB4_CA6 0x35
+#define CB4_CA7 0x36
+#define CB4_CA8 0x37
+#define CB4_CA9 0x38
+#define CB4_CA10 0x39
+#define CB4_CA11 0x3A
+#define CB4_CA12 0x3B
+#define CB4_CA13 0x3C
+#define CB4_CA14 0x3D
+#define CB4_CA15 0x3E
+#define CB4_CA16 0x3F
+
+#define CB5_CA1 0x40
+#define CB5_CA2 0x41
+#define CB5_CA3 0x42
+#define CB5_CA4 0x43
+#define CB5_CA5 0x44
+#define CB5_CA6 0x45
+#define CB5_CA7 0x46
+#define CB5_CA8 0x47
+#define CB5_CA9 0x48
+#define CB5_CA10 0x49
+#define CB5_CA11 0x4A
+#define CB5_CA12 0x4B
+#define CB5_CA13 0x4C
+#define CB5_CA14 0x4D
+#define CB5_CA15 0x4E
+#define CB5_CA16 0x4F
+
+#define CB6_CA1 0x50
+#define CB6_CA2 0x51
+#define CB6_CA3 0x52
+#define CB6_CA4 0x53
+#define CB6_CA5 0x54
+#define CB6_CA6 0x55
+#define CB6_CA7 0x56
+#define CB6_CA8 0x57
+#define CB6_CA9 0x58
+#define CB6_CA10 0x59
+#define CB6_CA11 0x5A
+#define CB6_CA12 0x5B
+#define CB6_CA13 0x5C
+#define CB6_CA14 0x5D
+#define CB6_CA15 0x5E
+#define CB6_CA16 0x5F
+
+#define CB7_CA1 0x60
+#define CB7_CA2 0x61
+#define CB7_CA3 0x62
+#define CB7_CA4 0x63
+#define CB7_CA5 0x64
+#define CB7_CA6 0x65
+#define CB7_CA7 0x66
+#define CB7_CA8 0x67
+#define CB7_CA9 0x68
+#define CB7_CA10 0x69
+#define CB7_CA11 0x6A
+#define CB7_CA12 0x6B
+#define CB7_CA13 0x6C
+#define CB7_CA14 0x6D
+#define CB7_CA15 0x6E
+#define CB7_CA16 0x6F
+
+#define CB8_CA1 0x70
+#define CB8_CA2 0x71
+#define CB8_CA3 0x72
+#define CB8_CA4 0x73
+#define CB8_CA5 0x74
+#define CB8_CA6 0x75
+#define CB8_CA7 0x76
+#define CB8_CA8 0x77
+#define CB8_CA9 0x78
+#define CB8_CA10 0x79
+#define CB8_CA11 0x7A
+#define CB8_CA12 0x7B
+#define CB8_CA13 0x7C
+#define CB8_CA14 0x7D
+#define CB8_CA15 0x7E
+#define CB8_CA16 0x7F
+
+#define CB9_CA1 0x80
+#define CB9_CA2 0x81
+#define CB9_CA3 0x82
+#define CB9_CA4 0x83
+#define CB9_CA5 0x84
+#define CB9_CA6 0x85
+#define CB9_CA7 0x86
+#define CB9_CA8 0x87
+#define CB9_CA9 0x88
+#define CB9_CA10 0x89
+#define CB9_CA11 0x8A
+#define CB9_CA12 0x8B
+#define CB9_CA13 0x8C
+#define CB9_CA14 0x8D
+#define CB9_CA15 0x8E
+#define CB9_CA16 0x8F
+
+#define CB10_CA1 0x90
+#define CB10_CA2 0x91
+#define CB10_CA3 0x92
+#define CB10_CA4 0x93
+#define CB10_CA5 0x94
+#define CB10_CA6 0x95
+#define CB10_CA7 0x96
+#define CB10_CA8 0x97
+#define CB10_CA9 0x98
+#define CB10_CA10 0x99
+#define CB10_CA11 0x9A
+#define CB10_CA12 0x9B
+#define CB10_CA13 0x9C
+#define CB10_CA14 0x9D
+#define CB10_CA15 0x9E
+#define CB10_CA16 0x9F
+
+#define CB11_CA1 0xA0
+#define CB11_CA2 0xA1
+#define CB11_CA3 0xA2
+#define CB11_CA4 0xA3
+#define CB11_CA5 0xA4
+#define CB11_CA6 0xA5
+#define CB11_CA7 0xA6
+#define CB11_CA8 0xA7
+#define CB11_CA9 0xA8
+#define CB11_CA10 0xA9
+#define CB11_CA11 0xAA
+#define CB11_CA12 0xAB
+#define CB11_CA13 0xAC
+#define CB11_CA14 0xAD
+#define CB11_CA15 0xAE
+#define CB11_CA16 0xAF
+
+#define CB12_CA1 0xB0
+#define CB12_CA2 0xB1
+#define CB12_CA3 0xB2
+#define CB12_CA4 0xB3
+#define CB12_CA5 0xB4
+#define CB12_CA6 0xB5
+#define CB12_CA7 0xB6
+#define CB12_CA8 0xB7
+#define CB12_CA9 0xB8
+#define CB12_CA10 0xB9
+#define CB12_CA11 0xBA
+#define CB12_CA12 0xBB
+#define CB12_CA13 0xBC
+#define CB12_CA14 0xBD
+#define CB12_CA15 0xBE
+#define CB12_CA16 0xBF
+
+// DEPRECATED - DO NOT USE
+
+#define A_1 CB1_CA1
+#define A_2 CB1_CA2
+#define A_3 CB1_CA3
+#define A_4 CB1_CA4
+#define A_5 CB1_CA5
+#define A_6 CB1_CA6
+#define A_7 CB1_CA7
+#define A_8 CB1_CA8
+#define A_9 CB1_CA9
+#define A_10 CB1_CA10
+#define A_11 CB1_CA11
+#define A_12 CB1_CA12
+#define A_13 CB1_CA13
+#define A_14 CB1_CA14
+#define A_15 CB1_CA15
+#define A_16 CB1_CA16
+
+#define B_1 CB2_CA1
+#define B_2 CB2_CA2
+#define B_3 CB2_CA3
+#define B_4 CB2_CA4
+#define B_5 CB2_CA5
+#define B_6 CB2_CA6
+#define B_7 CB2_CA7
+#define B_8 CB2_CA8
+#define B_9 CB2_CA9
+#define B_10 CB2_CA10
+#define B_11 CB2_CA11
+#define B_12 CB2_CA12
+#define B_13 CB2_CA13
+#define B_14 CB2_CA14
+#define B_15 CB2_CA15
+#define B_16 CB2_CA16
+
+#define C_1 CB3_CA1
+#define C_2 CB3_CA2
+#define C_3 CB3_CA3
+#define C_4 CB3_CA4
+#define C_5 CB3_CA5
+#define C_6 CB3_CA6
+#define C_7 CB3_CA7
+#define C_8 CB3_CA8
+#define C_9 CB3_CA9
+#define C_10 CB3_CA10
+#define C_11 CB3_CA11
+#define C_12 CB3_CA12
+#define C_13 CB3_CA13
+#define C_14 CB3_CA14
+#define C_15 CB3_CA15
+#define C_16 CB3_CA16
+
+#define D_1 CB4_CA1
+#define D_2 CB4_CA2
+#define D_3 CB4_CA3
+#define D_4 CB4_CA4
+#define D_5 CB4_CA5
+#define D_6 CB4_CA6
+#define D_7 CB4_CA7
+#define D_8 CB4_CA8
+#define D_9 CB4_CA9
+#define D_10 CB4_CA10
+#define D_11 CB4_CA11
+#define D_12 CB4_CA12
+#define D_13 CB4_CA13
+#define D_14 CB4_CA14
+#define D_15 CB4_CA15
+#define D_16 CB4_CA16
+
+#define E_1 CB5_CA1
+#define E_2 CB5_CA2
+#define E_3 CB5_CA3
+#define E_4 CB5_CA4
+#define E_5 CB5_CA5
+#define E_6 CB5_CA6
+#define E_7 CB5_CA7
+#define E_8 CB5_CA8
+#define E_9 CB5_CA9
+#define E_10 CB5_CA10
+#define E_11 CB5_CA11
+#define E_12 CB5_CA12
+#define E_13 CB5_CA13
+#define E_14 CB5_CA14
+#define E_15 CB5_CA15
+#define E_16 CB5_CA16
+
+#define F_1 CB6_CA1
+#define F_2 CB6_CA2
+#define F_3 CB6_CA3
+#define F_4 CB6_CA4
+#define F_5 CB6_CA5
+#define F_6 CB6_CA6
+#define F_7 CB6_CA7
+#define F_8 CB6_CA8
+#define F_9 CB6_CA9
+#define F_10 CB6_CA10
+#define F_11 CB6_CA11
+#define F_12 CB6_CA12
+#define F_13 CB6_CA13
+#define F_14 CB6_CA14
+#define F_15 CB6_CA15
+#define F_16 CB6_CA16
+
+#define G_1 CB7_CA1
+#define G_2 CB7_CA2
+#define G_3 CB7_CA3
+#define G_4 CB7_CA4
+#define G_5 CB7_CA5
+#define G_6 CB7_CA6
+#define G_7 CB7_CA7
+#define G_8 CB7_CA8
+#define G_9 CB7_CA9
+#define G_10 CB7_CA10
+#define G_11 CB7_CA11
+#define G_12 CB7_CA12
+#define G_13 CB7_CA13
+#define G_14 CB7_CA14
+#define G_15 CB7_CA15
+#define G_16 CB7_CA16
+
+#define H_1 CB8_CA1
+#define H_2 CB8_CA2
+#define H_3 CB8_CA3
+#define H_4 CB8_CA4
+#define H_5 CB8_CA5
+#define H_6 CB8_CA6
+#define H_7 CB8_CA7
+#define H_8 CB8_CA8
+#define H_9 CB8_CA9
+#define H_10 CB8_CA10
+#define H_11 CB8_CA11
+#define H_12 CB8_CA12
+#define H_13 CB8_CA13
+#define H_14 CB8_CA14
+#define H_15 CB8_CA15
+#define H_16 CB8_CA16
+
+#define I_1 CB9_CA1
+#define I_2 CB9_CA2
+#define I_3 CB9_CA3
+#define I_4 CB9_CA4
+#define I_5 CB9_CA5
+#define I_6 CB9_CA6
+#define I_7 CB9_CA7
+#define I_8 CB9_CA8
+#define I_9 CB9_CA9
+#define I_10 CB9_CA10
+#define I_11 CB9_CA11
+#define I_12 CB9_CA12
+#define I_13 CB9_CA13
+#define I_14 CB9_CA14
+#define I_15 CB9_CA15
+#define I_16 CB9_CA16
+
+#define J_1 CB10_CA1
+#define J_2 CB10_CA2
+#define J_3 CB10_CA3
+#define J_4 CB10_CA4
+#define J_5 CB10_CA5
+#define J_6 CB10_CA6
+#define J_7 CB10_CA7
+#define J_8 CB10_CA8
+#define J_9 CB10_CA9
+#define J_10 CB10_CA10
+#define J_11 CB10_CA11
+#define J_12 CB10_CA12
+#define J_13 CB10_CA13
+#define J_14 CB10_CA14
+#define J_15 CB10_CA15
+#define J_16 CB10_CA16
+
+#define K_1 CB11_CA1
+#define K_2 CB11_CA2
+#define K_3 CB11_CA3
+#define K_4 CB11_CA4
+#define K_5 CB11_CA5
+#define K_6 CB11_CA6
+#define K_7 CB11_CA7
+#define K_8 CB11_CA8
+#define K_9 CB11_CA9
+#define K_10 CB11_CA10
+#define K_11 CB11_CA11
+#define K_12 CB11_CA12
+#define K_13 CB11_CA13
+#define K_14 CB11_CA14
+#define K_15 CB11_CA15
+#define K_16 CB11_CA16
+
+#define L_1 CB12_CA1
+#define L_2 CB12_CA2
+#define L_3 CB12_CA3
+#define L_4 CB12_CA4
+#define L_5 CB12_CA5
+#define L_6 CB12_CA6
+#define L_7 CB12_CA7
+#define L_8 CB12_CA8
+#define L_9 CB12_CA9
+#define L_10 CB12_CA10
+#define L_11 CB12_CA11
+#define L_12 CB12_CA12
+#define L_13 CB12_CA13
+#define L_14 CB12_CA14
+#define L_15 CB12_CA15
+#define L_16 CB12_CA16
diff --git a/drivers/led/snled27351-simple.c b/drivers/led/snled27351-simple.c
deleted file mode 100644
index b2054c96d54..00000000000
--- a/drivers/led/snled27351-simple.c
+++ /dev/null
@@ -1,266 +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 "snled27351-simple.h"
-#include "i2c_master.h"
-
-#define SNLED27351_PWM_REGISTER_COUNT 192
-#define SNLED27351_LED_CONTROL_REGISTER_COUNT 24
-
-#ifndef SNLED27351_I2C_TIMEOUT
-#    define SNLED27351_I2C_TIMEOUT 100
-#endif
-
-#ifndef SNLED27351_I2C_PERSISTENCE
-#    define SNLED27351_I2C_PERSISTENCE 0
-#endif
-
-#ifndef SNLED27351_PHASE_CHANNEL
-#    define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_12_CHANNEL
-#endif
-
-#ifndef SNLED27351_CURRENT_TUNE
-#    define SNLED27351_CURRENT_TUNE \
-        { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
-#endif
-
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
-
-// These buffers match the SNLED27351 PWM registers.
-// The control buffers match the PG0 LED On/Off registers.
-// Storing them like this is optimal for I2C transfers to the registers.
-// We could optimize this and take out the unused registers from these
-// buffers and the transfers in snled27351_write_pwm_buffer() but it's
-// probably not worth the extra complexity.
-uint8_t g_pwm_buffer[SNLED27351_DRIVER_COUNT][SNLED27351_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[SNLED27351_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[SNLED27351_DRIVER_COUNT][SNLED27351_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[SNLED27351_DRIVER_COUNT]                        = {false};
-
-bool snled27351_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    // If the transaction fails function returns false.
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
-#if SNLED27351_I2C_PERSISTENCE > 0
-    for (uint8_t i = 0; i < SNLED27351_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
-            return false;
-        }
-    }
-#else
-    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
-        return false;
-    }
-#endif
-    return true;
-}
-
-bool snled27351_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assumes PG1 is already selected.
-    // If any of the transactions fails function returns false.
-    // Transmit PWM registers in 12 transfers of 16 bytes.
-    // g_twi_transfer_buffer[] is 20 bytes
-
-    // Iterate over the pwm_buffer contents at 16 byte intervals.
-    for (int i = 0; i < SNLED27351_PWM_REGISTER_COUNT; i += 16) {
-        g_twi_transfer_buffer[0] = i;
-        // Copy the data from i to i+15.
-        // Device will auto-increment register for data after the first byte
-        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
-        for (int j = 0; j < 16; j++) {
-            g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
-        }
-
-#if SNLED27351_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < SNLED27351_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, SNLED27351_I2C_TIMEOUT) != 0) {
-                return false;
-            }
-        }
-#else
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, SNLED27351_I2C_TIMEOUT) != 0) {
-            return false;
-        }
-#endif
-    }
-    return true;
-}
-
-void snled27351_init_drivers(void) {
-    i2c_init();
-
-    snled27351_init(SNLED27351_I2C_ADDRESS_1);
-#if defined(SNLED27351_I2C_ADDRESS_2)
-    snled27351_init(SNLED27351_I2C_ADDRESS_2);
-#    if defined(SNLED27351_I2C_ADDRESS_3)
-    snled27351_init(SNLED27351_I2C_ADDRESS_3);
-#        if defined(SNLED27351_I2C_ADDRESS_4)
-    snled27351_init(SNLED27351_I2C_ADDRESS_4);
-#        endif
-#    endif
-#endif
-
-    for (int i = 0; i < SNLED27351_LED_COUNT; i++) {
-        snled27351_set_led_control_register(i, true);
-    }
-
-    snled27351_update_led_control_registers(SNLED27351_I2C_ADDRESS_1, 0);
-#if defined(SNLED27351_I2C_ADDRESS_2)
-    snled27351_update_led_control_registers(SNLED27351_I2C_ADDRESS_2, 1);
-#    if defined(SNLED27351_I2C_ADDRESS_3)
-    snled27351_update_led_control_registers(SNLED27351_I2C_ADDRESS_3, 2);
-#        if defined(SNLED27351_I2C_ADDRESS_4)
-    snled27351_update_led_control_registers(SNLED27351_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
-
-void snled27351_init(uint8_t addr) {
-    // Select to function page
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
-    // Setting LED driver to shutdown mode
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
-    // Setting internal channel pulldown/pullup
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_PULLDOWNUP, SNLED27351_PULLDOWNUP_ALL_ENABLED);
-    // Select number of scan phase
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SCAN_PHASE, SNLED27351_PHASE_CHANNEL);
-    // Setting PWM Delay Phase
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_1, SNLED27351_SLEW_RATE_CONTROL_MODE_1_PDP_ENABLE);
-    // Setting Driving/Sinking Channel Slew Rate
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_2, SNLED27351_SLEW_RATE_CONTROL_MODE_2_DSL_ENABLE | SNLED27351_SLEW_RATE_CONTROL_MODE_2_SSL_ENABLE);
-    // Setting Iref
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, 0);
-    // Set LED CONTROL PAGE (Page 0)
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
-    for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
-        snled27351_write_register(addr, i, 0x00);
-    }
-
-    // Set PWM PAGE (Page 1)
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_PWM);
-    for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
-        snled27351_write_register(addr, i, 0x00);
-    }
-
-    // Set CURRENT PAGE (Page 4)
-    uint8_t current_tune_reg_list[SNLED27351_LED_CURRENT_TUNE_LENGTH] = SNLED27351_CURRENT_TUNE;
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_CURRENT_TUNE);
-    for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
-        snled27351_write_register(addr, i, current_tune_reg_list[i]);
-    }
-
-    // Enable LEDs ON/OFF
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
-    for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
-        snled27351_write_register(addr, i, 0xFF);
-    }
-
-    // Select to function page
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
-    // Setting LED driver to normal mode
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
-}
-
-void snled27351_set_value(int index, uint8_t value) {
-    snled27351_led_t led;
-    if (index >= 0 && index < SNLED27351_LED_COUNT) {
-        memcpy_P(&led, (&g_snled27351_leds[index]), sizeof(led));
-
-        if (g_pwm_buffer[led.driver][led.v] == value) {
-            return;
-        }
-        g_pwm_buffer[led.driver][led.v]          = value;
-        g_pwm_buffer_update_required[led.driver] = true;
-    }
-}
-
-void snled27351_set_value_all(uint8_t value) {
-    for (int i = 0; i < SNLED27351_LED_COUNT; i++) {
-        snled27351_set_value(i, value);
-    }
-}
-
-void snled27351_set_led_control_register(uint8_t index, bool value) {
-    snled27351_led_t led;
-    memcpy_P(&led, (&g_snled27351_leds[index]), sizeof(led));
-
-    uint8_t control_register = led.v / 8;
-    uint8_t bit_value        = led.v % 8;
-
-    if (value) {
-        g_led_control_registers[led.driver][control_register] |= (1 << bit_value);
-    } else {
-        g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value);
-    }
-
-    g_led_control_registers_update_required[led.driver] = true;
-}
-
-void snled27351_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_PWM);
-
-        // If any of the transactions fail we risk writing dirty PG0,
-        // refresh page 0 just in case.
-        if (!snled27351_write_pwm_buffer(addr, g_pwm_buffer[index])) {
-            g_led_control_registers_update_required[index] = true;
-        }
-    }
-    g_pwm_buffer_update_required[index] = false;
-}
-
-void snled27351_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
-        for (int i = 0; i < SNLED27351_LED_CONTROL_REGISTER_COUNT; i++) {
-            snled27351_write_register(addr, i, g_led_control_registers[index][i]);
-        }
-    }
-    g_led_control_registers_update_required[index] = false;
-}
-
-void snled27351_flush(void) {
-    snled27351_update_pwm_buffers(SNLED27351_I2C_ADDRESS_1, 0);
-#if defined(SNLED27351_I2C_ADDRESS_2)
-    snled27351_update_pwm_buffers(SNLED27351_I2C_ADDRESS_2, 1);
-#    if defined(SNLED27351_I2C_ADDRESS_3)
-    snled27351_update_pwm_buffers(SNLED27351_I2C_ADDRESS_3, 2);
-#        if defined(SNLED27351_I2C_ADDRESS_4)
-    snled27351_update_pwm_buffers(SNLED27351_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
-}
-
-void snled27351_sw_return_normal(uint8_t addr) {
-    // Select to function page
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
-    // Setting LED driver to normal mode
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
-}
-
-void snled27351_sw_shutdown(uint8_t addr) {
-    // Select to function page
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
-    // Setting LED driver to shutdown mode
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
-    // Write SW Sleep Register
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, SNLED27351_SOFTWARE_SLEEP_ENABLE);
-}
diff --git a/drivers/led/snled27351-simple.h b/drivers/led/snled27351-simple.h
deleted file mode 100644
index 2fc62a6f0a7..00000000000
--- a/drivers/led/snled27351-simple.h
+++ /dev/null
@@ -1,380 +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/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "progmem.h"
-#include "util.h"
-
-// ======== DEPRECATED DEFINES - DO NOT USE ========
-#ifdef CKLED2001_TIMEOUT
-#    define SNLED27351_I2C_TIMEOUT CKLED2001_TIMEOUT
-#endif
-#ifdef CKLED2001_PERSISTENCE
-#    define SNLED27351_I2C_PERSISTENCE CKLED2001_PERSISTENCE
-#endif
-#ifdef PHASE_CHANNEL
-#    define SNLED27351_PHASE_CHANNEL PHASE_CHANNEL
-#endif
-#ifdef CKLED2001_CURRENT_TUNE
-#    define SNLED27351_CURRENT_TUNE CKLED2001_CURRENT_TUNE
-#endif
-
-#define MSKPHASE_12CHANNEL SNLED27351_SCAN_PHASE_12_CHANNEL
-#define MSKPHASE_11CHANNEL SNLED27351_SCAN_PHASE_11_CHANNEL
-#define MSKPHASE_10CHANNEL SNLED27351_SCAN_PHASE_10_CHANNEL
-#define MSKPHASE_9CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
-#define MSKPHASE_8CHANNEL SNLED27351_SCAN_PHASE_8_CHANNEL
-#define MSKPHASE_7CHANNEL SNLED27351_SCAN_PHASE_7_CHANNEL
-#define MSKPHASE_6CHANNEL SNLED27351_SCAN_PHASE_6_CHANNEL
-#define MSKPHASE_5CHANNEL SNLED27351_SCAN_PHASE_5_CHANNEL
-#define MSKPHASE_4CHANNEL SNLED27351_SCAN_PHASE_4_CHANNEL
-#define MSKPHASE_3CHANNEL SNLED27351_SCAN_PHASE_3_CHANNEL
-#define MSKPHASE_2CHANNEL SNLED27351_SCAN_PHASE_2_CHANNEL
-#define MSKPHASE_1CHANNEL SNLED27351_SCAN_PHASE_1_CHANNEL
-
-#define ckled2001_led snled27351_led_t
-#define g_ckled2001_leds g_snled27351_leds
-// ========
-
-#define SNLED27351_REG_COMMAND 0xFD
-#define SNLED27351_COMMAND_LED_CONTROL 0x00
-#define SNLED27351_COMMAND_PWM 0x01
-#define SNLED27351_COMMAND_FUNCTION 0x03
-#define SNLED27351_COMMAND_CURRENT_TUNE 0x04
-
-#define SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN 0x00
-#define SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN (0x0 << 0)
-#define SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL (0x1 << 0)
-
-#define SNLED27351_FUNCTION_REG_ID 0x11
-#define SNLED27351_DRIVER_ID 0x8A
-
-#define SNLED27351_FUNCTION_REG_PULLDOWNUP 0x13
-#define SNLED27351_PULLDOWNUP_ALL_ENABLED 0xAA
-
-#define SNLED27351_FUNCTION_REG_SCAN_PHASE 0x14
-#define SNLED27351_SCAN_PHASE_12_CHANNEL 0x00
-#define SNLED27351_SCAN_PHASE_11_CHANNEL 0x01
-#define SNLED27351_SCAN_PHASE_10_CHANNEL 0x02
-#define SNLED27351_SCAN_PHASE_9_CHANNEL 0x03
-#define SNLED27351_SCAN_PHASE_8_CHANNEL 0x04
-#define SNLED27351_SCAN_PHASE_7_CHANNEL 0x05
-#define SNLED27351_SCAN_PHASE_6_CHANNEL 0x06
-#define SNLED27351_SCAN_PHASE_5_CHANNEL 0x07
-#define SNLED27351_SCAN_PHASE_4_CHANNEL 0x08
-#define SNLED27351_SCAN_PHASE_3_CHANNEL 0x09
-#define SNLED27351_SCAN_PHASE_2_CHANNEL 0x0A
-#define SNLED27351_SCAN_PHASE_1_CHANNEL 0x0B
-
-#define SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_1 0x15
-#define SNLED27351_SLEW_RATE_CONTROL_MODE_1_PDP_ENABLE (0b1 << 2)
-
-#define SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_2 0x16
-#define SNLED27351_SLEW_RATE_CONTROL_MODE_2_SSL_ENABLE (0b1 << 6)
-#define SNLED27351_SLEW_RATE_CONTROL_MODE_2_DSL_ENABLE (0b1 << 7)
-
-#define SNLED27351_FUNCTION_REG_OPEN_SHORT_ENABLE 0x17
-#define SNLED27351_OPEN_SHORT_ENABLE_SDS_ENABLE (0b1 << 6)
-#define SNLED27351_OPEN_SHORT_ENABLE_ODS_ENABLE (0b1 << 7)
-
-#define SNLED27351_FUNCTION_REG_OPEN_SHORT_DUTY 0x18
-
-#define SNLED27351_FUNCTION_REG_OPEN_SHORT_FLAG 0x19
-#define SNLED27351_OPEN_SHORT_FLAG_OSINT_ENABLE (0b1 << 6)
-#define SNLED27351_OPEN_SHORT_FLAG_ODINT_ENABLE (0b1 << 7)
-
-#define SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP 0x1A
-#define SNLED27351_SOFTWARE_SLEEP_ENABLE (0b1 << 1)
-
-// LED Control Registers
-#define SNLED27351_LED_CONTROL_ON_OFF_FIRST_ADDR 0x0
-#define SNLED27351_LED_CONTROL_ON_OFF_LAST_ADDR 0x17
-#define SNLED27351_LED_CONTROL_ON_OFF_LENGTH ((SNLED27351_LED_CONTROL_ON_OFF_LAST_ADDR - SNLED27351_LED_CONTROL_ON_OFF_FIRST_ADDR) + 1)
-
-#define SNLED27351_LED_CONTROL_OPEN_FIRST_ADDR 0x18
-#define SNLED27351_LED_CONTROL_OPEN_LAST_ADDR 0x2F
-#define SNLED27351_LED_CONTROL_OPEN_LENGTH ((SNLED27351_LED_CONTROL_OPEN_LAST_ADDR - SNLED27351_LED_CONTROL_OPEN_FIRST_ADDR) + 1)
-
-#define SNLED27351_LED_CONTROL_SHORT_FIRST_ADDR 0x30
-#define SNLED27351_LED_CONTROL_SHORT_LAST_ADDR 0x47
-#define SNLED27351_LED_CONTROL_SHORT_LENGTH ((SNLED27351_LED_CONTROL_SHORT_LAST_ADDR - SNLED27351_LED_CONTROL_SHORT_FIRST_ADDR) + 1)
-
-#define SNLED27351_LED_CONTROL_PAGE_LENGTH 0x48
-
-// LED Control Registers
-#define SNLED27351_LED_PWM_FIRST_ADDR 0x00
-#define SNLED27351_LED_PWM_LAST_ADDR 0xBF
-#define SNLED27351_LED_PWM_LENGTH 0xC0
-
-// Current Tune Registers
-#define SNLED27351_LED_CURRENT_TUNE_FIRST_ADDR 0x00
-#define SNLED27351_LED_CURRENT_TUNE_LAST_ADDR 0x0B
-#define SNLED27351_LED_CURRENT_TUNE_LENGTH 0x0C
-
-#define SNLED27351_I2C_ADDRESS_GND 0x74
-#define SNLED27351_I2C_ADDRESS_SCL 0x75
-#define SNLED27351_I2C_ADDRESS_SDA 0x76
-#define SNLED27351_I2C_ADDRESS_VDDIO 0x77
-
-#if defined(LED_MATRIX_SNLED27351)
-#    define SNLED27351_LED_COUNT LED_MATRIX_LED_COUNT
-#endif
-
-#if defined(SNLED27351_I2C_ADDRESS_4)
-#    define SNLED27351_DRIVER_COUNT 4
-#elif defined(SNLED27351_I2C_ADDRESS_3)
-#    define SNLED27351_DRIVER_COUNT 3
-#elif defined(SNLED27351_I2C_ADDRESS_2)
-#    define SNLED27351_DRIVER_COUNT 2
-#elif defined(SNLED27351_I2C_ADDRESS_1)
-#    define SNLED27351_DRIVER_COUNT 1
-#endif
-
-typedef struct snled27351_led_t {
-    uint8_t driver : 2;
-    uint8_t v;
-} PACKED snled27351_led_t;
-
-extern const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT];
-
-void snled27351_init_drivers(void);
-void snled27351_init(uint8_t addr);
-bool snled27351_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-bool snled27351_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
-
-void snled27351_set_value(int index, uint8_t value);
-void snled27351_set_value_all(uint8_t value);
-
-void snled27351_set_led_control_register(uint8_t index, bool value);
-
-// This should not be called from an interrupt
-// (eg. from a timer interrupt).
-// Call this while idle (in between matrix scans).
-// If the buffer is dirty, it will update the driver with the buffer.
-void snled27351_update_pwm_buffers(uint8_t addr, uint8_t index);
-void snled27351_update_led_control_registers(uint8_t addr, uint8_t index);
-
-void snled27351_flush(void);
-
-void snled27351_sw_return_normal(uint8_t addr);
-void snled27351_sw_shutdown(uint8_t addr);
-
-#define A_1 0x00
-#define A_2 0x01
-#define A_3 0x02
-#define A_4 0x03
-#define A_5 0x04
-#define A_6 0x05
-#define A_7 0x06
-#define A_8 0x07
-#define A_9 0x08
-#define A_10 0x09
-#define A_11 0x0A
-#define A_12 0x0B
-#define A_13 0x0C
-#define A_14 0x0D
-#define A_15 0x0E
-#define A_16 0x0F
-
-#define B_1 0x10
-#define B_2 0x11
-#define B_3 0x12
-#define B_4 0x13
-#define B_5 0x14
-#define B_6 0x15
-#define B_7 0x16
-#define B_8 0x17
-#define B_9 0x18
-#define B_10 0x19
-#define B_11 0x1A
-#define B_12 0x1B
-#define B_13 0x1C
-#define B_14 0x1D
-#define B_15 0x1E
-#define B_16 0x1F
-
-#define C_1 0x20
-#define C_2 0x21
-#define C_3 0x22
-#define C_4 0x23
-#define C_5 0x24
-#define C_6 0x25
-#define C_7 0x26
-#define C_8 0x27
-#define C_9 0x28
-#define C_10 0x29
-#define C_11 0x2A
-#define C_12 0x2B
-#define C_13 0x2C
-#define C_14 0x2D
-#define C_15 0x2E
-#define C_16 0x2F
-
-#define D_1 0x30
-#define D_2 0x31
-#define D_3 0x32
-#define D_4 0x33
-#define D_5 0x34
-#define D_6 0x35
-#define D_7 0x36
-#define D_8 0x37
-#define D_9 0x38
-#define D_10 0x39
-#define D_11 0x3A
-#define D_12 0x3B
-#define D_13 0x3C
-#define D_14 0x3D
-#define D_15 0x3E
-#define D_16 0x3F
-
-#define E_1 0x40
-#define E_2 0x41
-#define E_3 0x42
-#define E_4 0x43
-#define E_5 0x44
-#define E_6 0x45
-#define E_7 0x46
-#define E_8 0x47
-#define E_9 0x48
-#define E_10 0x49
-#define E_11 0x4A
-#define E_12 0x4B
-#define E_13 0x4C
-#define E_14 0x4D
-#define E_15 0x4E
-#define E_16 0x4F
-
-#define F_1 0x50
-#define F_2 0x51
-#define F_3 0x52
-#define F_4 0x53
-#define F_5 0x54
-#define F_6 0x55
-#define F_7 0x56
-#define F_8 0x57
-#define F_9 0x58
-#define F_10 0x59
-#define F_11 0x5A
-#define F_12 0x5B
-#define F_13 0x5C
-#define F_14 0x5D
-#define F_15 0x5E
-#define F_16 0x5F
-
-#define G_1 0x60
-#define G_2 0x61
-#define G_3 0x62
-#define G_4 0x63
-#define G_5 0x64
-#define G_6 0x65
-#define G_7 0x66
-#define G_8 0x67
-#define G_9 0x68
-#define G_10 0x69
-#define G_11 0x6A
-#define G_12 0x6B
-#define G_13 0x6C
-#define G_14 0x6D
-#define G_15 0x6E
-#define G_16 0x6F
-
-#define H_1 0x70
-#define H_2 0x71
-#define H_3 0x72
-#define H_4 0x73
-#define H_5 0x74
-#define H_6 0x75
-#define H_7 0x76
-#define H_8 0x77
-#define H_9 0x78
-#define H_10 0x79
-#define H_11 0x7A
-#define H_12 0x7B
-#define H_13 0x7C
-#define H_14 0x7D
-#define H_15 0x7E
-#define H_16 0x7F
-
-#define I_1 0x80
-#define I_2 0x81
-#define I_3 0x82
-#define I_4 0x83
-#define I_5 0x84
-#define I_6 0x85
-#define I_7 0x86
-#define I_8 0x87
-#define I_9 0x88
-#define I_10 0x89
-#define I_11 0x8A
-#define I_12 0x8B
-#define I_13 0x8C
-#define I_14 0x8D
-#define I_15 0x8E
-#define I_16 0x8F
-
-#define J_1 0x90
-#define J_2 0x91
-#define J_3 0x92
-#define J_4 0x93
-#define J_5 0x94
-#define J_6 0x95
-#define J_7 0x96
-#define J_8 0x97
-#define J_9 0x98
-#define J_10 0x99
-#define J_11 0x9A
-#define J_12 0x9B
-#define J_13 0x9C
-#define J_14 0x9D
-#define J_15 0x9E
-#define J_16 0x9F
-
-#define K_1 0xA0
-#define K_2 0xA1
-#define K_3 0xA2
-#define K_4 0xA3
-#define K_5 0xA4
-#define K_6 0xA5
-#define K_7 0xA6
-#define K_8 0xA7
-#define K_9 0xA8
-#define K_10 0xA9
-#define K_11 0xAA
-#define K_12 0xAB
-#define K_13 0xAC
-#define K_14 0xAD
-#define K_15 0xAE
-#define K_16 0xAF
-
-#define L_1 0xB0
-#define L_2 0xB1
-#define L_3 0xB2
-#define L_4 0xB3
-#define L_5 0xB4
-#define L_6 0xB5
-#define L_7 0xB6
-#define L_8 0xB7
-#define L_9 0xB8
-#define L_10 0xB9
-#define L_11 0xBA
-#define L_12 0xBB
-#define L_13 0xBC
-#define L_14 0xBD
-#define L_15 0xBE
-#define L_16 0xBF
diff --git a/drivers/led/snled27351.c b/drivers/led/snled27351.c
index 71992b73224..8ebf681bdb6 100644
--- a/drivers/led/snled27351.c
+++ b/drivers/led/snled27351.c
@@ -16,6 +16,7 @@
 
 #include "snled27351.h"
 #include "i2c_master.h"
+#include "gpio.h"
 
 #define SNLED27351_PWM_REGISTER_COUNT 192
 #define SNLED27351_LED_CONTROL_REGISTER_COUNT 24
@@ -37,8 +38,18 @@
         { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
 #endif
 
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[65];
+const uint8_t i2c_addresses[SNLED27351_DRIVER_COUNT] = {
+    SNLED27351_I2C_ADDRESS_1,
+#ifdef SNLED27351_I2C_ADDRESS_2
+    SNLED27351_I2C_ADDRESS_2,
+#    ifdef SNLED27351_I2C_ADDRESS_3
+    SNLED27351_I2C_ADDRESS_3,
+#        ifdef SNLED27351_I2C_ADDRESS_4
+    SNLED27351_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
 
 // These buffers match the SNLED27351 PWM registers.
 // The control buffers match the PG0 LED On/Off registers.
@@ -46,135 +57,116 @@ uint8_t g_twi_transfer_buffer[65];
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in snled27351_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
-uint8_t g_pwm_buffer[SNLED27351_DRIVER_COUNT][SNLED27351_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[SNLED27351_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[SNLED27351_DRIVER_COUNT][SNLED27351_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[SNLED27351_DRIVER_COUNT]                        = {false};
-
-bool snled27351_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
-    // If the transaction fails function returns false.
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
+typedef struct snled27351_driver_t {
+    uint8_t pwm_buffer[SNLED27351_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[SNLED27351_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED snled27351_driver_t;
+
+snled27351_driver_t driver_buffers[SNLED27351_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void snled27351_write_register(uint8_t index, uint8_t reg, uint8_t data) {
 #if SNLED27351_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < SNLED27351_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
-            return false;
-        }
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, SNLED27351_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, SNLED27351_I2C_TIMEOUT) != 0) {
-        return false;
-    }
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, SNLED27351_I2C_TIMEOUT);
 #endif
-    return true;
 }
 
-bool snled27351_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+void snled27351_select_page(uint8_t index, uint8_t page) {
+    snled27351_write_register(index, SNLED27351_REG_COMMAND, page);
+}
+
+void snled27351_write_pwm_buffer(uint8_t index) {
     // Assumes PG1 is already selected.
-    // If any of the transactions fails function returns false.
-    // Transmit PWM registers in 3 transfers of 64 bytes.
-
-    // Iterate over the pwm_buffer contents at 64 byte intervals.
-    for (uint8_t i = 0; i < SNLED27351_PWM_REGISTER_COUNT; i += 64) {
-        g_twi_transfer_buffer[0] = i;
-        // Copy the data from i to i+63.
-        // Device will auto-increment register for data after the first byte
-        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
-        for (uint8_t j = 0; j < 64; j++) {
-            g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
-        }
+    // Transmit PWM registers in 12 transfers of 16 bytes.
 
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (uint8_t i = 0; i < SNLED27351_PWM_REGISTER_COUNT; i += 16) {
 #if SNLED27351_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < SNLED27351_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 65, SNLED27351_I2C_TIMEOUT) != 0) {
-                return false;
-            }
+        for (uint8_t j = 0; j < SNLED27351_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, SNLED27351_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
 #else
-        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 65, SNLED27351_I2C_TIMEOUT) != 0) {
-            return false;
-        }
+        i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, SNLED27351_I2C_TIMEOUT);
 #endif
     }
-    return true;
 }
 
 void snled27351_init_drivers(void) {
     i2c_init();
 
-    snled27351_init(SNLED27351_I2C_ADDRESS_1);
-#if defined(SNLED27351_I2C_ADDRESS_2)
-    snled27351_init(SNLED27351_I2C_ADDRESS_2);
-#    if defined(SNLED27351_I2C_ADDRESS_3)
-    snled27351_init(SNLED27351_I2C_ADDRESS_3);
-#        if defined(SNLED27351_I2C_ADDRESS_4)
-    snled27351_init(SNLED27351_I2C_ADDRESS_4);
-#        endif
-#    endif
+#if defined(SNLED27351_SDB_PIN)
+    gpio_set_pin_output(SNLED27351_SDB_PIN);
+    gpio_write_pin_high(SNLED27351_SDB_PIN);
 #endif
 
+    for (uint8_t i = 0; i < SNLED27351_DRIVER_COUNT; i++) {
+        snled27351_init(i);
+    }
+
     for (int i = 0; i < SNLED27351_LED_COUNT; i++) {
         snled27351_set_led_control_register(i, true, true, true);
     }
 
-    snled27351_update_led_control_registers(SNLED27351_I2C_ADDRESS_1, 0);
-#if defined(SNLED27351_I2C_ADDRESS_2)
-    snled27351_update_led_control_registers(SNLED27351_I2C_ADDRESS_2, 1);
-#    if defined(SNLED27351_I2C_ADDRESS_3)
-    snled27351_update_led_control_registers(SNLED27351_I2C_ADDRESS_3, 2);
-#        if defined(SNLED27351_I2C_ADDRESS_4)
-    snled27351_update_led_control_registers(SNLED27351_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < SNLED27351_DRIVER_COUNT; i++) {
+        snled27351_update_led_control_registers(i);
+    }
 }
 
-void snled27351_init(uint8_t addr) {
-    // Select to function page
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
+void snled27351_init(uint8_t index) {
+    snled27351_select_page(index, SNLED27351_COMMAND_FUNCTION);
+
     // Setting LED driver to shutdown mode
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
     // Setting internal channel pulldown/pullup
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_PULLDOWNUP, SNLED27351_PULLDOWNUP_ALL_ENABLED);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_PULLDOWNUP, SNLED27351_PULLDOWNUP_ALL_ENABLED);
     // Select number of scan phase
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SCAN_PHASE, SNLED27351_PHASE_CHANNEL);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SCAN_PHASE, SNLED27351_PHASE_CHANNEL);
     // Setting PWM Delay Phase
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_1, SNLED27351_SLEW_RATE_CONTROL_MODE_1_PDP_ENABLE);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_1, SNLED27351_SLEW_RATE_CONTROL_MODE_1_PDP_ENABLE);
     // Setting Driving/Sinking Channel Slew Rate
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_2, SNLED27351_SLEW_RATE_CONTROL_MODE_2_DSL_ENABLE | SNLED27351_SLEW_RATE_CONTROL_MODE_2_SSL_ENABLE);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SLEW_RATE_CONTROL_MODE_2, SNLED27351_SLEW_RATE_CONTROL_MODE_2_DSL_ENABLE | SNLED27351_SLEW_RATE_CONTROL_MODE_2_SSL_ENABLE);
     // Setting Iref
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, 0);
-    // Set LED CONTROL PAGE (Page 0)
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, 0);
+
+    snled27351_select_page(index, SNLED27351_COMMAND_LED_CONTROL);
+
     for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
-        snled27351_write_register(addr, i, 0x00);
+        snled27351_write_register(index, i, 0x00);
     }
 
-    // Set PWM PAGE (Page 1)
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_PWM);
+    snled27351_select_page(index, SNLED27351_COMMAND_PWM);
+
     for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
-        snled27351_write_register(addr, i, 0x00);
+        snled27351_write_register(index, i, 0x00);
     }
 
-    // Set CURRENT PAGE (Page 4)
+    snled27351_select_page(index, SNLED27351_COMMAND_CURRENT_TUNE);
+
     uint8_t current_tune_reg_list[SNLED27351_LED_CURRENT_TUNE_LENGTH] = SNLED27351_CURRENT_TUNE;
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_CURRENT_TUNE);
     for (int i = 0; i < SNLED27351_LED_CURRENT_TUNE_LENGTH; i++) {
-        snled27351_write_register(addr, i, current_tune_reg_list[i]);
+        snled27351_write_register(index, i, current_tune_reg_list[i]);
     }
 
-    // Enable LEDs ON/OFF
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
+    snled27351_select_page(index, SNLED27351_COMMAND_LED_CONTROL);
+
     for (int i = 0; i < SNLED27351_LED_CONTROL_ON_OFF_LENGTH; i++) {
-        snled27351_write_register(addr, i, 0xFF);
+        snled27351_write_register(index, i, 0xFF);
     }
 
-    // Select to function page
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
+    snled27351_select_page(index, SNLED27351_COMMAND_FUNCTION);
+
     // Setting LED driver to normal mode
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
 }
 
 void snled27351_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
@@ -182,13 +174,14 @@ void snled27351_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index >= 0 && index < SNLED27351_LED_COUNT) {
         memcpy_P(&led, (&g_snled27351_leds[index]), sizeof(led));
 
-        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
             return;
         }
-        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;
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
     }
 }
 
@@ -210,72 +203,64 @@ void snled27351_set_led_control_register(uint8_t index, bool red, bool green, bo
     uint8_t bit_b              = led.b % 8;
 
     if (red) {
-        g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] |= (1 << bit_r);
     } else {
-        g_led_control_registers[led.driver][control_register_r] &= ~(1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] &= ~(1 << bit_r);
     }
     if (green) {
-        g_led_control_registers[led.driver][control_register_g] |= (1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] |= (1 << bit_g);
     } else {
-        g_led_control_registers[led.driver][control_register_g] &= ~(1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] &= ~(1 << bit_g);
     }
     if (blue) {
-        g_led_control_registers[led.driver][control_register_b] |= (1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] |= (1 << bit_b);
     } else {
-        g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] &= ~(1 << bit_b);
     }
 
-    g_led_control_registers_update_required[led.driver] = true;
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
 }
 
-void snled27351_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_PWM);
+void snled27351_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        snled27351_select_page(index, SNLED27351_COMMAND_PWM);
 
-        // If any of the transactions fail we risk writing dirty PG0,
-        // refresh page 0 just in case.
-        if (!snled27351_write_pwm_buffer(addr, g_pwm_buffer[index])) {
-            g_led_control_registers_update_required[index] = true;
-        }
+        snled27351_write_pwm_buffer(index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
     }
-    g_pwm_buffer_update_required[index] = false;
 }
 
-void snled27351_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_LED_CONTROL);
-        for (int i = 0; i < SNLED27351_LED_CONTROL_REGISTER_COUNT; i++) {
-            snled27351_write_register(addr, i, g_led_control_registers[index][i]);
+void snled27351_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        snled27351_select_page(index, SNLED27351_COMMAND_LED_CONTROL);
+
+        for (uint8_t i = 0; i < SNLED27351_LED_CONTROL_REGISTER_COUNT; i++) {
+            snled27351_write_register(index, i, driver_buffers[index].led_control_buffer[i]);
         }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
     }
-    g_led_control_registers_update_required[index] = false;
 }
 
 void snled27351_flush(void) {
-    snled27351_update_pwm_buffers(SNLED27351_I2C_ADDRESS_1, 0);
-#if defined(SNLED27351_I2C_ADDRESS_2)
-    snled27351_update_pwm_buffers(SNLED27351_I2C_ADDRESS_2, 1);
-#    if defined(SNLED27351_I2C_ADDRESS_3)
-    snled27351_update_pwm_buffers(SNLED27351_I2C_ADDRESS_3, 2);
-#        if defined(SNLED27351_I2C_ADDRESS_4)
-    snled27351_update_pwm_buffers(SNLED27351_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < SNLED27351_DRIVER_COUNT; i++) {
+        snled27351_update_pwm_buffers(i);
+    }
 }
 
-void snled27351_sw_return_normal(uint8_t addr) {
-    // Select to function page
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
+void snled27351_sw_return_normal(uint8_t index) {
+    snled27351_select_page(index, SNLED27351_COMMAND_FUNCTION);
+
     // Setting LED driver to normal mode
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_NORMAL);
 }
 
-void snled27351_sw_shutdown(uint8_t addr) {
-    // Select to function page
-    snled27351_write_register(addr, SNLED27351_REG_COMMAND, SNLED27351_COMMAND_FUNCTION);
+void snled27351_sw_shutdown(uint8_t index) {
+    snled27351_select_page(index, SNLED27351_COMMAND_FUNCTION);
+
     // Setting LED driver to shutdown mode
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SHUTDOWN, SNLED27351_SOFTWARE_SHUTDOWN_SSD_SHUTDOWN);
     // Write SW Sleep Register
-    snled27351_write_register(addr, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, SNLED27351_SOFTWARE_SLEEP_ENABLE);
+    snled27351_write_register(index, SNLED27351_FUNCTION_REG_SOFTWARE_SLEEP, SNLED27351_SOFTWARE_SLEEP_ENABLE);
 }
diff --git a/drivers/led/snled27351.h b/drivers/led/snled27351.h
index 77337f177b7..d902744d148 100644
--- a/drivers/led/snled27351.h
+++ b/drivers/led/snled27351.h
@@ -168,9 +168,9 @@ typedef struct snled27351_led_t {
 extern const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT];
 
 void snled27351_init_drivers(void);
-void snled27351_init(uint8_t addr);
-bool snled27351_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-bool snled27351_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+void snled27351_init(uint8_t index);
+void snled27351_select_page(uint8_t index, uint8_t page);
+void snled27351_write_register(uint8_t index, uint8_t reg, uint8_t data);
 
 void snled27351_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void snled27351_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
@@ -181,214 +181,420 @@ void snled27351_set_led_control_register(uint8_t index, bool red, bool green, bo
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void snled27351_update_pwm_buffers(uint8_t addr, uint8_t index);
-void snled27351_update_led_control_registers(uint8_t addr, uint8_t index);
+void snled27351_update_pwm_buffers(uint8_t index);
+void snled27351_update_led_control_registers(uint8_t index);
 
 void snled27351_flush(void);
 
-void snled27351_sw_return_normal(uint8_t addr);
-void snled27351_sw_shutdown(uint8_t addr);
-
-#define A_1 0x00
-#define A_2 0x01
-#define A_3 0x02
-#define A_4 0x03
-#define A_5 0x04
-#define A_6 0x05
-#define A_7 0x06
-#define A_8 0x07
-#define A_9 0x08
-#define A_10 0x09
-#define A_11 0x0A
-#define A_12 0x0B
-#define A_13 0x0C
-#define A_14 0x0D
-#define A_15 0x0E
-#define A_16 0x0F
-
-#define B_1 0x10
-#define B_2 0x11
-#define B_3 0x12
-#define B_4 0x13
-#define B_5 0x14
-#define B_6 0x15
-#define B_7 0x16
-#define B_8 0x17
-#define B_9 0x18
-#define B_10 0x19
-#define B_11 0x1A
-#define B_12 0x1B
-#define B_13 0x1C
-#define B_14 0x1D
-#define B_15 0x1E
-#define B_16 0x1F
-
-#define C_1 0x20
-#define C_2 0x21
-#define C_3 0x22
-#define C_4 0x23
-#define C_5 0x24
-#define C_6 0x25
-#define C_7 0x26
-#define C_8 0x27
-#define C_9 0x28
-#define C_10 0x29
-#define C_11 0x2A
-#define C_12 0x2B
-#define C_13 0x2C
-#define C_14 0x2D
-#define C_15 0x2E
-#define C_16 0x2F
-
-#define D_1 0x30
-#define D_2 0x31
-#define D_3 0x32
-#define D_4 0x33
-#define D_5 0x34
-#define D_6 0x35
-#define D_7 0x36
-#define D_8 0x37
-#define D_9 0x38
-#define D_10 0x39
-#define D_11 0x3A
-#define D_12 0x3B
-#define D_13 0x3C
-#define D_14 0x3D
-#define D_15 0x3E
-#define D_16 0x3F
-
-#define E_1 0x40
-#define E_2 0x41
-#define E_3 0x42
-#define E_4 0x43
-#define E_5 0x44
-#define E_6 0x45
-#define E_7 0x46
-#define E_8 0x47
-#define E_9 0x48
-#define E_10 0x49
-#define E_11 0x4A
-#define E_12 0x4B
-#define E_13 0x4C
-#define E_14 0x4D
-#define E_15 0x4E
-#define E_16 0x4F
-
-#define F_1 0x50
-#define F_2 0x51
-#define F_3 0x52
-#define F_4 0x53
-#define F_5 0x54
-#define F_6 0x55
-#define F_7 0x56
-#define F_8 0x57
-#define F_9 0x58
-#define F_10 0x59
-#define F_11 0x5A
-#define F_12 0x5B
-#define F_13 0x5C
-#define F_14 0x5D
-#define F_15 0x5E
-#define F_16 0x5F
-
-#define G_1 0x60
-#define G_2 0x61
-#define G_3 0x62
-#define G_4 0x63
-#define G_5 0x64
-#define G_6 0x65
-#define G_7 0x66
-#define G_8 0x67
-#define G_9 0x68
-#define G_10 0x69
-#define G_11 0x6A
-#define G_12 0x6B
-#define G_13 0x6C
-#define G_14 0x6D
-#define G_15 0x6E
-#define G_16 0x6F
-
-#define H_1 0x70
-#define H_2 0x71
-#define H_3 0x72
-#define H_4 0x73
-#define H_5 0x74
-#define H_6 0x75
-#define H_7 0x76
-#define H_8 0x77
-#define H_9 0x78
-#define H_10 0x79
-#define H_11 0x7A
-#define H_12 0x7B
-#define H_13 0x7C
-#define H_14 0x7D
-#define H_15 0x7E
-#define H_16 0x7F
-
-#define I_1 0x80
-#define I_2 0x81
-#define I_3 0x82
-#define I_4 0x83
-#define I_5 0x84
-#define I_6 0x85
-#define I_7 0x86
-#define I_8 0x87
-#define I_9 0x88
-#define I_10 0x89
-#define I_11 0x8A
-#define I_12 0x8B
-#define I_13 0x8C
-#define I_14 0x8D
-#define I_15 0x8E
-#define I_16 0x8F
-
-#define J_1 0x90
-#define J_2 0x91
-#define J_3 0x92
-#define J_4 0x93
-#define J_5 0x94
-#define J_6 0x95
-#define J_7 0x96
-#define J_8 0x97
-#define J_9 0x98
-#define J_10 0x99
-#define J_11 0x9A
-#define J_12 0x9B
-#define J_13 0x9C
-#define J_14 0x9D
-#define J_15 0x9E
-#define J_16 0x9F
-
-#define K_1 0xA0
-#define K_2 0xA1
-#define K_3 0xA2
-#define K_4 0xA3
-#define K_5 0xA4
-#define K_6 0xA5
-#define K_7 0xA6
-#define K_8 0xA7
-#define K_9 0xA8
-#define K_10 0xA9
-#define K_11 0xAA
-#define K_12 0xAB
-#define K_13 0xAC
-#define K_14 0xAD
-#define K_15 0xAE
-#define K_16 0xAF
-
-#define L_1 0xB0
-#define L_2 0xB1
-#define L_3 0xB2
-#define L_4 0xB3
-#define L_5 0xB4
-#define L_6 0xB5
-#define L_7 0xB6
-#define L_8 0xB7
-#define L_9 0xB8
-#define L_10 0xB9
-#define L_11 0xBA
-#define L_12 0xBB
-#define L_13 0xBC
-#define L_14 0xBD
-#define L_15 0xBE
-#define L_16 0xBF
+void snled27351_sw_return_normal(uint8_t index);
+void snled27351_sw_shutdown(uint8_t index);
+
+#define CB1_CA1 0x00
+#define CB1_CA2 0x01
+#define CB1_CA3 0x02
+#define CB1_CA4 0x03
+#define CB1_CA5 0x04
+#define CB1_CA6 0x05
+#define CB1_CA7 0x06
+#define CB1_CA8 0x07
+#define CB1_CA9 0x08
+#define CB1_CA10 0x09
+#define CB1_CA11 0x0A
+#define CB1_CA12 0x0B
+#define CB1_CA13 0x0C
+#define CB1_CA14 0x0D
+#define CB1_CA15 0x0E
+#define CB1_CA16 0x0F
+
+#define CB2_CA1 0x10
+#define CB2_CA2 0x11
+#define CB2_CA3 0x12
+#define CB2_CA4 0x13
+#define CB2_CA5 0x14
+#define CB2_CA6 0x15
+#define CB2_CA7 0x16
+#define CB2_CA8 0x17
+#define CB2_CA9 0x18
+#define CB2_CA10 0x19
+#define CB2_CA11 0x1A
+#define CB2_CA12 0x1B
+#define CB2_CA13 0x1C
+#define CB2_CA14 0x1D
+#define CB2_CA15 0x1E
+#define CB2_CA16 0x1F
+
+#define CB3_CA1 0x20
+#define CB3_CA2 0x21
+#define CB3_CA3 0x22
+#define CB3_CA4 0x23
+#define CB3_CA5 0x24
+#define CB3_CA6 0x25
+#define CB3_CA7 0x26
+#define CB3_CA8 0x27
+#define CB3_CA9 0x28
+#define CB3_CA10 0x29
+#define CB3_CA11 0x2A
+#define CB3_CA12 0x2B
+#define CB3_CA13 0x2C
+#define CB3_CA14 0x2D
+#define CB3_CA15 0x2E
+#define CB3_CA16 0x2F
+
+#define CB4_CA1 0x30
+#define CB4_CA2 0x31
+#define CB4_CA3 0x32
+#define CB4_CA4 0x33
+#define CB4_CA5 0x34
+#define CB4_CA6 0x35
+#define CB4_CA7 0x36
+#define CB4_CA8 0x37
+#define CB4_CA9 0x38
+#define CB4_CA10 0x39
+#define CB4_CA11 0x3A
+#define CB4_CA12 0x3B
+#define CB4_CA13 0x3C
+#define CB4_CA14 0x3D
+#define CB4_CA15 0x3E
+#define CB4_CA16 0x3F
+
+#define CB5_CA1 0x40
+#define CB5_CA2 0x41
+#define CB5_CA3 0x42
+#define CB5_CA4 0x43
+#define CB5_CA5 0x44
+#define CB5_CA6 0x45
+#define CB5_CA7 0x46
+#define CB5_CA8 0x47
+#define CB5_CA9 0x48
+#define CB5_CA10 0x49
+#define CB5_CA11 0x4A
+#define CB5_CA12 0x4B
+#define CB5_CA13 0x4C
+#define CB5_CA14 0x4D
+#define CB5_CA15 0x4E
+#define CB5_CA16 0x4F
+
+#define CB6_CA1 0x50
+#define CB6_CA2 0x51
+#define CB6_CA3 0x52
+#define CB6_CA4 0x53
+#define CB6_CA5 0x54
+#define CB6_CA6 0x55
+#define CB6_CA7 0x56
+#define CB6_CA8 0x57
+#define CB6_CA9 0x58
+#define CB6_CA10 0x59
+#define CB6_CA11 0x5A
+#define CB6_CA12 0x5B
+#define CB6_CA13 0x5C
+#define CB6_CA14 0x5D
+#define CB6_CA15 0x5E
+#define CB6_CA16 0x5F
+
+#define CB7_CA1 0x60
+#define CB7_CA2 0x61
+#define CB7_CA3 0x62
+#define CB7_CA4 0x63
+#define CB7_CA5 0x64
+#define CB7_CA6 0x65
+#define CB7_CA7 0x66
+#define CB7_CA8 0x67
+#define CB7_CA9 0x68
+#define CB7_CA10 0x69
+#define CB7_CA11 0x6A
+#define CB7_CA12 0x6B
+#define CB7_CA13 0x6C
+#define CB7_CA14 0x6D
+#define CB7_CA15 0x6E
+#define CB7_CA16 0x6F
+
+#define CB8_CA1 0x70
+#define CB8_CA2 0x71
+#define CB8_CA3 0x72
+#define CB8_CA4 0x73
+#define CB8_CA5 0x74
+#define CB8_CA6 0x75
+#define CB8_CA7 0x76
+#define CB8_CA8 0x77
+#define CB8_CA9 0x78
+#define CB8_CA10 0x79
+#define CB8_CA11 0x7A
+#define CB8_CA12 0x7B
+#define CB8_CA13 0x7C
+#define CB8_CA14 0x7D
+#define CB8_CA15 0x7E
+#define CB8_CA16 0x7F
+
+#define CB9_CA1 0x80
+#define CB9_CA2 0x81
+#define CB9_CA3 0x82
+#define CB9_CA4 0x83
+#define CB9_CA5 0x84
+#define CB9_CA6 0x85
+#define CB9_CA7 0x86
+#define CB9_CA8 0x87
+#define CB9_CA9 0x88
+#define CB9_CA10 0x89
+#define CB9_CA11 0x8A
+#define CB9_CA12 0x8B
+#define CB9_CA13 0x8C
+#define CB9_CA14 0x8D
+#define CB9_CA15 0x8E
+#define CB9_CA16 0x8F
+
+#define CB10_CA1 0x90
+#define CB10_CA2 0x91
+#define CB10_CA3 0x92
+#define CB10_CA4 0x93
+#define CB10_CA5 0x94
+#define CB10_CA6 0x95
+#define CB10_CA7 0x96
+#define CB10_CA8 0x97
+#define CB10_CA9 0x98
+#define CB10_CA10 0x99
+#define CB10_CA11 0x9A
+#define CB10_CA12 0x9B
+#define CB10_CA13 0x9C
+#define CB10_CA14 0x9D
+#define CB10_CA15 0x9E
+#define CB10_CA16 0x9F
+
+#define CB11_CA1 0xA0
+#define CB11_CA2 0xA1
+#define CB11_CA3 0xA2
+#define CB11_CA4 0xA3
+#define CB11_CA5 0xA4
+#define CB11_CA6 0xA5
+#define CB11_CA7 0xA6
+#define CB11_CA8 0xA7
+#define CB11_CA9 0xA8
+#define CB11_CA10 0xA9
+#define CB11_CA11 0xAA
+#define CB11_CA12 0xAB
+#define CB11_CA13 0xAC
+#define CB11_CA14 0xAD
+#define CB11_CA15 0xAE
+#define CB11_CA16 0xAF
+
+#define CB12_CA1 0xB0
+#define CB12_CA2 0xB1
+#define CB12_CA3 0xB2
+#define CB12_CA4 0xB3
+#define CB12_CA5 0xB4
+#define CB12_CA6 0xB5
+#define CB12_CA7 0xB6
+#define CB12_CA8 0xB7
+#define CB12_CA9 0xB8
+#define CB12_CA10 0xB9
+#define CB12_CA11 0xBA
+#define CB12_CA12 0xBB
+#define CB12_CA13 0xBC
+#define CB12_CA14 0xBD
+#define CB12_CA15 0xBE
+#define CB12_CA16 0xBF
+
+// DEPRECATED - DO NOT USE
+
+#define A_1 CB1_CA1
+#define A_2 CB1_CA2
+#define A_3 CB1_CA3
+#define A_4 CB1_CA4
+#define A_5 CB1_CA5
+#define A_6 CB1_CA6
+#define A_7 CB1_CA7
+#define A_8 CB1_CA8
+#define A_9 CB1_CA9
+#define A_10 CB1_CA10
+#define A_11 CB1_CA11
+#define A_12 CB1_CA12
+#define A_13 CB1_CA13
+#define A_14 CB1_CA14
+#define A_15 CB1_CA15
+#define A_16 CB1_CA16
+
+#define B_1 CB2_CA1
+#define B_2 CB2_CA2
+#define B_3 CB2_CA3
+#define B_4 CB2_CA4
+#define B_5 CB2_CA5
+#define B_6 CB2_CA6
+#define B_7 CB2_CA7
+#define B_8 CB2_CA8
+#define B_9 CB2_CA9
+#define B_10 CB2_CA10
+#define B_11 CB2_CA11
+#define B_12 CB2_CA12
+#define B_13 CB2_CA13
+#define B_14 CB2_CA14
+#define B_15 CB2_CA15
+#define B_16 CB2_CA16
+
+#define C_1 CB3_CA1
+#define C_2 CB3_CA2
+#define C_3 CB3_CA3
+#define C_4 CB3_CA4
+#define C_5 CB3_CA5
+#define C_6 CB3_CA6
+#define C_7 CB3_CA7
+#define C_8 CB3_CA8
+#define C_9 CB3_CA9
+#define C_10 CB3_CA10
+#define C_11 CB3_CA11
+#define C_12 CB3_CA12
+#define C_13 CB3_CA13
+#define C_14 CB3_CA14
+#define C_15 CB3_CA15
+#define C_16 CB3_CA16
+
+#define D_1 CB4_CA1
+#define D_2 CB4_CA2
+#define D_3 CB4_CA3
+#define D_4 CB4_CA4
+#define D_5 CB4_CA5
+#define D_6 CB4_CA6
+#define D_7 CB4_CA7
+#define D_8 CB4_CA8
+#define D_9 CB4_CA9
+#define D_10 CB4_CA10
+#define D_11 CB4_CA11
+#define D_12 CB4_CA12
+#define D_13 CB4_CA13
+#define D_14 CB4_CA14
+#define D_15 CB4_CA15
+#define D_16 CB4_CA16
+
+#define E_1 CB5_CA1
+#define E_2 CB5_CA2
+#define E_3 CB5_CA3
+#define E_4 CB5_CA4
+#define E_5 CB5_CA5
+#define E_6 CB5_CA6
+#define E_7 CB5_CA7
+#define E_8 CB5_CA8
+#define E_9 CB5_CA9
+#define E_10 CB5_CA10
+#define E_11 CB5_CA11
+#define E_12 CB5_CA12
+#define E_13 CB5_CA13
+#define E_14 CB5_CA14
+#define E_15 CB5_CA15
+#define E_16 CB5_CA16
+
+#define F_1 CB6_CA1
+#define F_2 CB6_CA2
+#define F_3 CB6_CA3
+#define F_4 CB6_CA4
+#define F_5 CB6_CA5
+#define F_6 CB6_CA6
+#define F_7 CB6_CA7
+#define F_8 CB6_CA8
+#define F_9 CB6_CA9
+#define F_10 CB6_CA10
+#define F_11 CB6_CA11
+#define F_12 CB6_CA12
+#define F_13 CB6_CA13
+#define F_14 CB6_CA14
+#define F_15 CB6_CA15
+#define F_16 CB6_CA16
+
+#define G_1 CB7_CA1
+#define G_2 CB7_CA2
+#define G_3 CB7_CA3
+#define G_4 CB7_CA4
+#define G_5 CB7_CA5
+#define G_6 CB7_CA6
+#define G_7 CB7_CA7
+#define G_8 CB7_CA8
+#define G_9 CB7_CA9
+#define G_10 CB7_CA10
+#define G_11 CB7_CA11
+#define G_12 CB7_CA12
+#define G_13 CB7_CA13
+#define G_14 CB7_CA14
+#define G_15 CB7_CA15
+#define G_16 CB7_CA16
+
+#define H_1 CB8_CA1
+#define H_2 CB8_CA2
+#define H_3 CB8_CA3
+#define H_4 CB8_CA4
+#define H_5 CB8_CA5
+#define H_6 CB8_CA6
+#define H_7 CB8_CA7
+#define H_8 CB8_CA8
+#define H_9 CB8_CA9
+#define H_10 CB8_CA10
+#define H_11 CB8_CA11
+#define H_12 CB8_CA12
+#define H_13 CB8_CA13
+#define H_14 CB8_CA14
+#define H_15 CB8_CA15
+#define H_16 CB8_CA16
+
+#define I_1 CB9_CA1
+#define I_2 CB9_CA2
+#define I_3 CB9_CA3
+#define I_4 CB9_CA4
+#define I_5 CB9_CA5
+#define I_6 CB9_CA6
+#define I_7 CB9_CA7
+#define I_8 CB9_CA8
+#define I_9 CB9_CA9
+#define I_10 CB9_CA10
+#define I_11 CB9_CA11
+#define I_12 CB9_CA12
+#define I_13 CB9_CA13
+#define I_14 CB9_CA14
+#define I_15 CB9_CA15
+#define I_16 CB9_CA16
+
+#define J_1 CB10_CA1
+#define J_2 CB10_CA2
+#define J_3 CB10_CA3
+#define J_4 CB10_CA4
+#define J_5 CB10_CA5
+#define J_6 CB10_CA6
+#define J_7 CB10_CA7
+#define J_8 CB10_CA8
+#define J_9 CB10_CA9
+#define J_10 CB10_CA10
+#define J_11 CB10_CA11
+#define J_12 CB10_CA12
+#define J_13 CB10_CA13
+#define J_14 CB10_CA14
+#define J_15 CB10_CA15
+#define J_16 CB10_CA16
+
+#define K_1 CB11_CA1
+#define K_2 CB11_CA2
+#define K_3 CB11_CA3
+#define K_4 CB11_CA4
+#define K_5 CB11_CA5
+#define K_6 CB11_CA6
+#define K_7 CB11_CA7
+#define K_8 CB11_CA8
+#define K_9 CB11_CA9
+#define K_10 CB11_CA10
+#define K_11 CB11_CA11
+#define K_12 CB11_CA12
+#define K_13 CB11_CA13
+#define K_14 CB11_CA14
+#define K_15 CB11_CA15
+#define K_16 CB11_CA16
+
+#define L_1 CB12_CA1
+#define L_2 CB12_CA2
+#define L_3 CB12_CA3
+#define L_4 CB12_CA4
+#define L_5 CB12_CA5
+#define L_6 CB12_CA6
+#define L_7 CB12_CA7
+#define L_8 CB12_CA8
+#define L_9 CB12_CA9
+#define L_10 CB12_CA10
+#define L_11 CB12_CA11
+#define L_12 CB12_CA12
+#define L_13 CB12_CA13
+#define L_14 CB12_CA14
+#define L_15 CB12_CA15
+#define L_16 CB12_CA16
diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c
index 4a2121cd7c5..1d1c2a90c4c 100644
--- a/drivers/oled/oled_driver.c
+++ b/drivers/oled/oled_driver.c
@@ -192,7 +192,7 @@ __attribute__((weak)) bool oled_send_cmd(const uint8_t *data, uint16_t size) {
         return false;
     }
     // Command Mode
-    writePinLow(OLED_DC_PIN);
+    gpio_write_pin_low(OLED_DC_PIN);
     // Send the commands
     if (spi_transmit(&data[1], size - 1) != SPI_STATUS_SUCCESS) {
         spi_stop();
@@ -215,7 +215,7 @@ __attribute__((weak)) bool oled_send_cmd_P(const uint8_t *data, uint16_t size) {
     }
     spi_status_t status = SPI_STATUS_SUCCESS;
     // Command Mode
-    writePinLow(OLED_DC_PIN);
+    gpio_write_pin_low(OLED_DC_PIN);
     // Send the commands
     for (uint16_t i = 1; i < size && status >= 0; i++) {
         status = spi_write(pgm_read_byte((const char *)&data[i]));
@@ -223,13 +223,8 @@ __attribute__((weak)) bool oled_send_cmd_P(const uint8_t *data, uint16_t size) {
     spi_stop();
     return (status >= 0);
 #    elif defined(OLED_TRANSPORT_I2C)
-    i2c_status_t status = i2c_start((OLED_DISPLAY_ADDRESS << 1) | I2C_WRITE, OLED_I2C_TIMEOUT);
 
-    for (uint16_t i = 0; i < size && status >= 0; i++) {
-        status = i2c_write(pgm_read_byte((const char *)data++), OLED_I2C_TIMEOUT);
-    }
-
-    i2c_stop();
+    i2c_status_t status = i2c_transmit_P((OLED_DISPLAY_ADDRESS << 1), data, size, OLED_I2C_TIMEOUT);
 
     return (status == I2C_STATUS_SUCCESS);
 #    endif
@@ -244,7 +239,7 @@ __attribute__((weak)) bool oled_send_data(const uint8_t *data, uint16_t size) {
         return false;
     }
     // Data Mode
-    writePinHigh(OLED_DC_PIN);
+    gpio_write_pin_high(OLED_DC_PIN);
     // Send the commands
     if (spi_transmit(data, size) != SPI_STATUS_SUCCESS) {
         spi_stop();
@@ -253,7 +248,7 @@ __attribute__((weak)) bool oled_send_data(const uint8_t *data, uint16_t size) {
     spi_stop();
     return true;
 #elif defined(OLED_TRANSPORT_I2C)
-    i2c_status_t status = i2c_writeReg((OLED_DISPLAY_ADDRESS << 1), I2C_DATA, data, size, OLED_I2C_TIMEOUT);
+    i2c_status_t status = i2c_write_register((OLED_DISPLAY_ADDRESS << 1), I2C_DATA, data, size, OLED_I2C_TIMEOUT);
     return (status == I2C_STATUS_SUCCESS);
 #endif
 }
@@ -261,17 +256,17 @@ __attribute__((weak)) bool oled_send_data(const uint8_t *data, uint16_t size) {
 __attribute__((weak)) void oled_driver_init(void) {
 #if defined(OLED_TRANSPORT_SPI)
     spi_init();
-    setPinOutput(OLED_CS_PIN);
-    writePinHigh(OLED_CS_PIN);
+    gpio_set_pin_output(OLED_CS_PIN);
+    gpio_write_pin_high(OLED_CS_PIN);
 
-    setPinOutput(OLED_DC_PIN);
-    writePinLow(OLED_DC_PIN);
+    gpio_set_pin_output(OLED_DC_PIN);
+    gpio_write_pin_low(OLED_DC_PIN);
 #    ifdef OLED_RST_PIN
     /* Reset device */
-    setPinOutput(OLED_RST_PIN);
-    writePinLow(OLED_RST_PIN);
+    gpio_set_pin_output(OLED_RST_PIN);
+    gpio_write_pin_low(OLED_RST_PIN);
     wait_ms(20);
-    writePinHigh(OLED_RST_PIN);
+    gpio_write_pin_high(OLED_RST_PIN);
     wait_ms(20);
 #    endif
 #elif defined(OLED_TRANSPORT_I2C)
diff --git a/drivers/painter/comms/qp_comms_i2c.c b/drivers/painter/comms/qp_comms_i2c.c
index ec45ddfb3b6..93f503f3dda 100644
--- a/drivers/painter/comms/qp_comms_i2c.c
+++ b/drivers/painter/comms/qp_comms_i2c.c
@@ -28,18 +28,14 @@ bool qp_comms_i2c_init(painter_device_t device) {
 }
 
 bool qp_comms_i2c_start(painter_device_t device) {
-    painter_driver_t *     driver       = (painter_driver_t *)device;
-    qp_comms_i2c_config_t *comms_config = (qp_comms_i2c_config_t *)driver->comms_config;
-    return i2c_start(comms_config->chip_address << 1) == I2C_STATUS_SUCCESS;
+    return true;
 }
 
 uint32_t qp_comms_i2c_send_data(painter_device_t device, const void *data, uint32_t byte_count) {
     return qp_comms_i2c_send_raw(device, data, byte_count);
 }
 
-void qp_comms_i2c_stop(painter_device_t device) {
-    i2c_stop();
-}
+void qp_comms_i2c_stop(painter_device_t device) {}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Command+Data I2C support
diff --git a/drivers/painter/comms/qp_comms_spi.c b/drivers/painter/comms/qp_comms_spi.c
index 9f52bc7d1f3..4e6067394b3 100644
--- a/drivers/painter/comms/qp_comms_spi.c
+++ b/drivers/painter/comms/qp_comms_spi.c
@@ -17,8 +17,8 @@ bool qp_comms_spi_init(painter_device_t device) {
     spi_init();
 
     // Set up CS as output high
-    setPinOutput(comms_config->chip_select_pin);
-    writePinHigh(comms_config->chip_select_pin);
+    gpio_set_pin_output(comms_config->chip_select_pin);
+    gpio_write_pin_high(comms_config->chip_select_pin);
 
     return true;
 }
@@ -49,7 +49,7 @@ void qp_comms_spi_stop(painter_device_t device) {
     painter_driver_t *     driver       = (painter_driver_t *)device;
     qp_comms_spi_config_t *comms_config = (qp_comms_spi_config_t *)driver->comms_config;
     spi_stop();
-    writePinHigh(comms_config->chip_select_pin);
+    gpio_write_pin_high(comms_config->chip_select_pin);
 }
 
 const painter_comms_vtable_t spi_comms_vtable = {
@@ -74,16 +74,16 @@ bool qp_comms_spi_dc_reset_init(painter_device_t device) {
 
     // Set up D/C as output low, if specified
     if (comms_config->dc_pin != NO_PIN) {
-        setPinOutput(comms_config->dc_pin);
-        writePinLow(comms_config->dc_pin);
+        gpio_set_pin_output(comms_config->dc_pin);
+        gpio_write_pin_low(comms_config->dc_pin);
     }
 
     // Set up RST as output, if specified, performing a reset in the process
     if (comms_config->reset_pin != NO_PIN) {
-        setPinOutput(comms_config->reset_pin);
-        writePinLow(comms_config->reset_pin);
+        gpio_set_pin_output(comms_config->reset_pin);
+        gpio_write_pin_low(comms_config->reset_pin);
         wait_ms(20);
-        writePinHigh(comms_config->reset_pin);
+        gpio_write_pin_high(comms_config->reset_pin);
         wait_ms(20);
     }
 
@@ -93,14 +93,14 @@ bool qp_comms_spi_dc_reset_init(painter_device_t device) {
 uint32_t qp_comms_spi_dc_reset_send_data(painter_device_t device, const void *data, uint32_t byte_count) {
     painter_driver_t *              driver       = (painter_driver_t *)device;
     qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
-    writePinHigh(comms_config->dc_pin);
+    gpio_write_pin_high(comms_config->dc_pin);
     return qp_comms_spi_send_data(device, data, byte_count);
 }
 
 void qp_comms_spi_dc_reset_send_command(painter_device_t device, uint8_t cmd) {
     painter_driver_t *              driver       = (painter_driver_t *)device;
     qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
-    writePinLow(comms_config->dc_pin);
+    gpio_write_pin_low(comms_config->dc_pin);
     spi_write(cmd);
 }
 
diff --git a/drivers/painter/comms/qp_comms_spi.h b/drivers/painter/comms/qp_comms_spi.h
index ff323c3c10e..c39ea95f726 100644
--- a/drivers/painter/comms/qp_comms_spi.h
+++ b/drivers/painter/comms/qp_comms_spi.h
@@ -38,6 +38,7 @@ typedef struct qp_comms_spi_dc_reset_config_t {
     bool                  command_params_uses_command_pin; // keep D/C held low when sending command sequences for data bytes
 } qp_comms_spi_dc_reset_config_t;
 
+bool     qp_comms_spi_dc_reset_init(painter_device_t device);
 void     qp_comms_spi_dc_reset_send_command(painter_device_t device, uint8_t cmd);
 uint32_t qp_comms_spi_dc_reset_send_data(painter_device_t device, const void* data, uint32_t byte_count);
 void     qp_comms_spi_dc_reset_bulk_command_sequence(painter_device_t device, const uint8_t* sequence, size_t sequence_len);
diff --git a/drivers/painter/ili9xxx/qp_ili9486.c b/drivers/painter/ili9xxx/qp_ili9486.c
new file mode 100644
index 00000000000..c4f3c15cecf
--- /dev/null
+++ b/drivers/painter/ili9xxx/qp_ili9486.c
@@ -0,0 +1,298 @@
+// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2023 Pablo Martinez (@elpekenin) <elpekenin@elpekenin.dev>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "qp_internal.h"
+#include "qp_comms.h"
+#include "qp_ili9486.h"
+#include "qp_ili9xxx_opcodes.h"
+#include "qp_tft_panel.h"
+
+#ifdef QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+#    include "spi_master.h"
+#    include <qp_comms_spi.h>
+#endif // QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Common
+
+// Driver storage
+tft_panel_dc_reset_painter_device_t ili9486_drivers[ILI9486_NUM_DEVICES] = {0};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Initialization
+
+bool qp_ili9486_init(painter_device_t device, painter_rotation_t rotation) {
+    // clang-format off
+    const uint8_t ili9486_init_sequence[] = {
+        // Command,                 Delay,  N, Data[N]
+        ILI9XXX_CMD_RESET,            120,  0,
+        ILI9XXX_SET_PIX_FMT,            0,  1, 0x55,
+        ILI9XXX_SET_PGAMMA,             0, 15, 0x0F, 0x1F, 0x1C, 0x0C, 0x0F, 0x08, 0x48, 0x98, 0x37, 0x0A, 0x13, 0x04, 0x11, 0x0D, 0x00,
+        ILI9XXX_SET_NGAMMA,             0, 15, 0x0F, 0x32, 0x2E, 0x0B, 0x0D, 0x05, 0x47, 0x75, 0x37, 0x06, 0x10, 0x03, 0x24, 0x20, 0x00,
+        ILI9XXX_SET_POWER_CTL_1,        0,  2, 0x0D, 0x0D,
+        ILI9XXX_SET_POWER_CTL_2,        0,  2, 0x43, 0x00,
+        ILI9XXX_SET_POWER_CTL_3,        0,  1, 0x00,
+        ILI9XXX_SET_VCOM_CTL_1,         0,  4, 0x00, 0x48, 0x00, 0x48,
+        ILI9XXX_SET_INVERSION_CTL,      0,  1, 0x02,
+    };
+    // clang-format on
+    qp_comms_bulk_command_sequence(device, ili9486_init_sequence, sizeof(ili9486_init_sequence));
+
+    // Configure the rotation (i.e. the ordering and direction of memory writes in GRAM)
+    const uint8_t madctl[] = {
+        [QP_ROTATION_0]   = ILI9XXX_MADCTL_BGR,
+        [QP_ROTATION_90]  = ILI9XXX_MADCTL_BGR | ILI9XXX_MADCTL_MV,
+        [QP_ROTATION_180] = ILI9XXX_MADCTL_BGR,
+        [QP_ROTATION_270] = ILI9XXX_MADCTL_BGR | ILI9XXX_MADCTL_MV,
+    };
+    const uint8_t functl[] = {
+        [QP_ROTATION_0]   = 0x42,
+        [QP_ROTATION_90]  = 0x62,
+        [QP_ROTATION_180] = 0x22,
+        [QP_ROTATION_270] = 0x02,
+    };
+
+    // clang-format off
+    uint8_t rotation_sequence[] = {
+        // Command,                 Delay,  N, Data[N]
+        ILI9XXX_SET_MEM_ACS_CTL,        0,  1, madctl[rotation],
+        ILI9XXX_SET_FUNCTION_CTL,       0,  2, 0x00, functl[rotation],
+        ILI9XXX_CMD_SLEEP_OFF,          5,  0,
+        ILI9XXX_CMD_DISPLAY_ON,         5,  0,
+    };
+    // clang-format on
+    qp_comms_bulk_command_sequence(device, rotation_sequence, sizeof(rotation_sequence));
+
+    return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Driver vtable
+
+// waveshare variant needs some tweaks due to shift registers
+static void qp_comms_spi_dc_reset_send_command_odd_cs_pulse(painter_device_t device, uint8_t cmd) {
+    painter_driver_t *              driver       = (painter_driver_t *)device;
+    qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
+
+    writePinLow(comms_config->spi_config.chip_select_pin);
+    qp_comms_spi_dc_reset_send_command(device, cmd);
+    writePinHigh(comms_config->spi_config.chip_select_pin);
+}
+
+static uint32_t qp_comms_spi_send_data_odd_cs_pulse(painter_device_t device, const void *data, uint32_t byte_count) {
+    painter_driver_t *              driver       = (painter_driver_t *)device;
+    qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
+
+    uint32_t       bytes_remaining = byte_count;
+    const uint8_t *p               = (const uint8_t *)data;
+    uint32_t       max_msg_length  = 1024;
+
+    writePinHigh(comms_config->dc_pin);
+    while (bytes_remaining > 0) {
+        uint32_t bytes_this_loop = QP_MIN(bytes_remaining, max_msg_length);
+        bool     odd_bytes       = bytes_this_loop & 1;
+
+        // send data
+        writePinLow(comms_config->spi_config.chip_select_pin);
+        spi_transmit(p, bytes_this_loop);
+        p += bytes_this_loop;
+
+        // extra CS toggle, for alignment
+        if (odd_bytes) {
+            writePinHigh(comms_config->spi_config.chip_select_pin);
+            writePinLow(comms_config->spi_config.chip_select_pin);
+        }
+
+        bytes_remaining -= bytes_this_loop;
+    }
+
+    return byte_count - bytes_remaining;
+}
+
+static uint32_t qp_ili9486_send_data_toggling(painter_device_t device, const uint8_t *data, uint32_t byte_count) {
+    painter_driver_t *              driver       = (painter_driver_t *)device;
+    qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
+
+    uint32_t ret;
+    for (uint8_t j = 0; j < byte_count; ++j) {
+        writePinLow(comms_config->spi_config.chip_select_pin);
+        ret = qp_comms_spi_dc_reset_send_data(device, &data[j], 1);
+        writePinHigh(comms_config->spi_config.chip_select_pin);
+    }
+
+    return ret;
+}
+
+static void qp_comms_spi_send_command_sequence_odd_cs_pulse(painter_device_t device, const uint8_t *sequence, size_t sequence_len) {
+    for (size_t i = 0; i < sequence_len;) {
+        uint8_t command   = sequence[i];
+        uint8_t delay     = sequence[i + 1];
+        uint8_t num_bytes = sequence[i + 2];
+
+        qp_comms_spi_dc_reset_send_command_odd_cs_pulse(device, command);
+        if (num_bytes > 0) {
+            qp_ili9486_send_data_toggling(device, &sequence[i + 3], num_bytes);
+        }
+
+        if (delay > 0) {
+            wait_ms(delay);
+        }
+        i += (3 + num_bytes);
+    }
+}
+
+static bool qp_ili9486_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
+    painter_driver_t *                          driver = (painter_driver_t *)device;
+    tft_panel_dc_reset_painter_driver_vtable_t *vtable = (tft_panel_dc_reset_painter_driver_vtable_t *)driver->driver_vtable;
+
+    // Fix up the drawing location if required
+    left += driver->offset_x;
+    right += driver->offset_x;
+    top += driver->offset_y;
+    bottom += driver->offset_y;
+
+    // Check if we need to manually swap the window coordinates based on whether or not we're in a sideways rotation
+    if (vtable->swap_window_coords && (driver->rotation == QP_ROTATION_90 || driver->rotation == QP_ROTATION_270)) {
+        uint16_t temp;
+
+        temp = left;
+        left = top;
+        top  = temp;
+
+        temp   = right;
+        right  = bottom;
+        bottom = temp;
+    }
+
+    // Set up the x-window
+    uint8_t xbuf[4] = {left >> 8, left & 0xFF, right >> 8, right & 0xFF};
+    qp_comms_spi_dc_reset_send_command_odd_cs_pulse(device, vtable->opcodes.set_column_address);
+    qp_ili9486_send_data_toggling(device, xbuf, 4);
+
+    // Set up the y-window
+    uint8_t ybuf[4] = {top >> 8, top & 0xFF, bottom >> 8, bottom & 0xFF};
+    qp_comms_spi_dc_reset_send_command_odd_cs_pulse(device, vtable->opcodes.set_row_address);
+    qp_ili9486_send_data_toggling(device, ybuf, 4);
+
+    // Lock in the window
+    qp_comms_spi_dc_reset_send_command_odd_cs_pulse(device, vtable->opcodes.enable_writes);
+    return true;
+}
+
+// Regular
+const tft_panel_dc_reset_painter_driver_vtable_t ili9486_driver_vtable = {
+    .base =
+        {
+            .init            = qp_ili9486_init,
+            .power           = qp_tft_panel_power,
+            .clear           = qp_tft_panel_clear,
+            .flush           = qp_tft_panel_flush,
+            .pixdata         = qp_tft_panel_pixdata,
+            .viewport        = qp_tft_panel_viewport,
+            .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb565,
+            .append_pixdata  = qp_tft_panel_append_pixdata,
+        },
+    .num_window_bytes   = 2,
+    .swap_window_coords = false,
+    .opcodes =
+        {
+            .display_on         = ILI9XXX_CMD_DISPLAY_ON,
+            .display_off        = ILI9XXX_CMD_DISPLAY_OFF,
+            .set_column_address = ILI9XXX_SET_COL_ADDR,
+            .set_row_address    = ILI9XXX_SET_PAGE_ADDR,
+            .enable_writes      = ILI9XXX_SET_MEM,
+        },
+};
+
+// Waveshare tweaks
+const tft_panel_dc_reset_painter_driver_vtable_t ili9486_waveshare_driver_vtable = {
+    .base =
+        {
+            .init            = qp_ili9486_init,
+            .power           = qp_tft_panel_power,
+            .clear           = qp_tft_panel_clear,
+            .flush           = qp_tft_panel_flush,
+            .pixdata         = qp_tft_panel_pixdata,
+            .viewport        = qp_ili9486_viewport,
+            .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb565,
+            .append_pixdata  = qp_tft_panel_append_pixdata,
+        },
+    .num_window_bytes   = 2,
+    .swap_window_coords = false,
+    .opcodes =
+        {
+            .display_on         = ILI9XXX_CMD_DISPLAY_ON,
+            .display_off        = ILI9XXX_CMD_DISPLAY_OFF,
+            .set_column_address = ILI9XXX_SET_COL_ADDR,
+            .set_row_address    = ILI9XXX_SET_PAGE_ADDR,
+            .enable_writes      = ILI9XXX_SET_MEM,
+        },
+};
+
+static const painter_comms_with_command_vtable_t spi_comms_odd_cs_pulse_vtable = {
+    .base =
+        {
+            .comms_init  = qp_comms_spi_dc_reset_init,
+            .comms_start = qp_comms_spi_start,
+            .comms_send  = qp_comms_spi_send_data_odd_cs_pulse,
+            .comms_stop  = qp_comms_spi_stop,
+        },
+    .send_command          = qp_comms_spi_dc_reset_send_command_odd_cs_pulse,
+    .bulk_command_sequence = qp_comms_spi_send_command_sequence_odd_cs_pulse,
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SPI
+
+#ifdef QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+
+// Factory function for creating a handle to the ILI9486 device
+painter_device_t qp_ili9486_make_spi_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode) {
+    for (uint32_t i = 0; i < ILI9486_NUM_DEVICES; ++i) {
+        tft_panel_dc_reset_painter_device_t *driver = &ili9486_drivers[i];
+        if (!driver->base.driver_vtable) {
+            driver->base.driver_vtable         = (const painter_driver_vtable_t *)&ili9486_driver_vtable;
+            driver->base.comms_vtable          = (const painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.native_bits_per_pixel = 16; // RGB565
+            driver->base.panel_width           = panel_width;
+            driver->base.panel_height          = panel_height;
+            driver->base.rotation              = QP_ROTATION_0;
+            driver->base.offset_x              = 0;
+            driver->base.offset_y              = 0;
+
+            // SPI and other pin configuration
+            driver->base.comms_config                              = &driver->spi_dc_reset_config;
+            driver->spi_dc_reset_config.spi_config.chip_select_pin = chip_select_pin;
+            driver->spi_dc_reset_config.spi_config.divisor         = spi_divisor;
+            driver->spi_dc_reset_config.spi_config.lsb_first       = false;
+            driver->spi_dc_reset_config.spi_config.mode            = spi_mode;
+            driver->spi_dc_reset_config.dc_pin                     = dc_pin;
+            driver->spi_dc_reset_config.reset_pin                  = reset_pin;
+
+            if (!qp_internal_register_device((painter_device_t)driver)) {
+                memset(driver, 0, sizeof(tft_panel_dc_reset_painter_device_t));
+                return NULL;
+            }
+
+            return (painter_device_t)driver;
+        }
+    }
+    return NULL;
+}
+
+painter_device_t qp_ili9486_make_spi_waveshare_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode) {
+    painter_device_t device = qp_ili9486_make_spi_device(panel_width, panel_height, chip_select_pin, dc_pin, reset_pin, spi_divisor, spi_mode);
+    if (device) {
+        tft_panel_dc_reset_painter_device_t *driver = (tft_panel_dc_reset_painter_device_t *)device;
+        driver->base.driver_vtable                  = (const painter_driver_vtable_t *)&ili9486_waveshare_driver_vtable;
+        driver->base.comms_vtable                   = (const painter_comms_vtable_t *)&spi_comms_odd_cs_pulse_vtable;
+    }
+    return device;
+}
+
+#endif // QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/drivers/painter/ili9xxx/qp_ili9486.h b/drivers/painter/ili9xxx/qp_ili9486.h
new file mode 100644
index 00000000000..9976a78da49
--- /dev/null
+++ b/drivers/painter/ili9xxx/qp_ili9486.h
@@ -0,0 +1,52 @@
+// Copyright 2021 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "gpio.h"
+#include "qp_internal.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter ILI9486 configurables (add to your keyboard's config.h)
+
+#ifndef ILI9486_NUM_DEVICES
+/**
+ * @def This controls the maximum number of ILI9486 devices that Quantum Painter can communicate with at any one time.
+ *      Increasing this number allows for multiple displays to be used.
+ */
+#    define ILI9486_NUM_DEVICES 1
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter ILI9486 device factories
+
+#ifdef QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+/**
+ * Factory method for an ILI9486 SPI LCD device.
+ *
+ * @param panel_width[in] the width of the display panel
+ * @param panel_height[in] the height of the display panel
+ * @param chip_select_pin[in] the GPIO pin used for SPI chip select
+ * @param dc_pin[in] the GPIO pin used for D/C control
+ * @param reset_pin[in] the GPIO pin used for RST
+ * @param spi_divisor[in] the SPI divisor to use when communicating with the display
+ * @param spi_mode[in] the SPI mode to use when communicating with the display
+ * @return the device handle used with all drawing routines in Quantum Painter
+ */
+painter_device_t qp_ili9486_make_spi_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode);
+
+/**
+ * Factory method for an ILI9486 SPI LCD device.
+ *
+ * @param panel_width[in] the width of the display panel
+ * @param panel_height[in] the height of the display panel
+ * @param chip_select_pin[in] the GPIO pin used for SPI chip select
+ * @param dc_pin[in] the GPIO pin used for D/C control
+ * @param reset_pin[in] the GPIO pin used for RST
+ * @param spi_divisor[in] the SPI divisor to use when communicating with the display
+ * @param spi_mode[in] the SPI mode to use when communicating with the display
+ * @return the device handle used with all drawing routines in Quantum Painter
+ */
+painter_device_t qp_ili9486_make_spi_waveshare_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode);
+
+#endif // QUANTUM_PAINTER_ILI9486_SPI_ENABLE
diff --git a/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h b/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
index f57e638e034..906f6cd7729 100644
--- a/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
+++ b/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
@@ -70,6 +70,7 @@
 #define ILI9XXX_SET_LIGHT_CTL_8 0xBF        // Set backlight ctl 8
 #define ILI9XXX_SET_POWER_CTL_1 0xC0        // Set power ctl 1
 #define ILI9XXX_SET_POWER_CTL_2 0xC1        // Set power ctl 2
+#define ILI9XXX_SET_POWER_CTL_3 0xC2        // Set power ctl 3
 #define ILI9XXX_SET_VCOM_CTL_1 0xC5         // Set VCOM ctl 1
 #define ILI9XXX_SET_VCOM_CTL_2 0xC7         // Set VCOM ctl 2
 #define ILI9XXX_POWER_CTL_A 0xCB            // Set power control A
diff --git a/drivers/painter/sh1106/qp_sh1106.c b/drivers/painter/sh1106/qp_sh1106.c
index 7cb6e398fac..4117115aec4 100644
--- a/drivers/painter/sh1106/qp_sh1106.c
+++ b/drivers/painter/sh1106/qp_sh1106.c
@@ -44,7 +44,7 @@ __attribute__((weak)) bool qp_sh1106_init(painter_device_t device, painter_rotat
     }
 
     // clang-format off
-    const uint8_t sh1106_init_sequence[] = {
+    uint8_t sh1106_init_sequence[] = {
         // Command,                 Delay,  N, Data[N]
         SH1106_SET_MUX_RATIO,           0,  1, 0x3F,
         SH1106_DISPLAY_OFFSET,          0,  1, 0x00,
@@ -61,6 +61,16 @@ __attribute__((weak)) bool qp_sh1106_init(painter_device_t device, painter_rotat
     };
     // clang-format on
 
+    // If the display height is anything other than the default 64 pixels, change SH1106_SET_MUX_RATIO data byte to the correct value
+    if (driver->oled.base.panel_height != 64) {
+        sh1106_init_sequence[3] = driver->oled.base.panel_height - 1;
+    }
+
+    // For 128x32 or 96x16 displays, change SH1106_COM_PADS_HW_CFG data byte from alternative (0x12) to sequential (0x02) configuration
+    if (driver->oled.base.panel_height <= 32) {
+        sh1106_init_sequence[20] = 0x02;
+    }
+
     qp_comms_bulk_command_sequence(device, sh1106_init_sequence, sizeof(sh1106_init_sequence));
     return true;
 }
@@ -203,4 +213,4 @@ painter_device_t qp_sh1106_make_i2c_device(uint16_t panel_width, uint16_t panel_
     return NULL;
 }
 
-#endif // QUANTUM_PAINTER_SH1106_SPI_ENABLE
+#endif // QUANTUM_PAINTER_SH1106_I2C_ENABLE
diff --git a/drivers/painter/sh1106/qp_sh1106_opcodes.h b/drivers/painter/sh1106/qp_sh1106_opcodes.h
index a2e100d7702..bf86ba4c2c8 100644
--- a/drivers/painter/sh1106/qp_sh1106_opcodes.h
+++ b/drivers/painter/sh1106/qp_sh1106_opcodes.h
@@ -16,7 +16,7 @@
 #define SH1106_COM_PADS_HW_CFG 0xDA
 #define SH1106_SET_CONTRAST 0x81
 #define SH1106_SET_PRECHARGE_PERIOD 0xD9
-#define SH1106_VCOM_DETECT 0xDB
+#define SH1106_VCOM_DESELECT_LEVEL 0xDB
 #define SH1106_ALL_ON_RESUME 0xA4
 #define SH1106_NON_INVERTING_DISPLAY 0xA6
 #define SH1106_DEACTIVATE_SCROLL 0x2E
diff --git a/drivers/sensors/adns5050.c b/drivers/sensors/adns5050.c
index b76268fba26..97daa8db099 100644
--- a/drivers/sensors/adns5050.c
+++ b/drivers/sensors/adns5050.c
@@ -47,9 +47,9 @@
 
 void adns5050_init(void) {
     // Initialize the ADNS serial pins.
-    setPinOutput(ADNS5050_SCLK_PIN);
-    setPinOutput(ADNS5050_SDIO_PIN);
-    setPinOutput(ADNS5050_CS_PIN);
+    gpio_set_pin_output(ADNS5050_SCLK_PIN);
+    gpio_set_pin_output(ADNS5050_SDIO_PIN);
+    gpio_set_pin_output(ADNS5050_CS_PIN);
 
     // reboot the adns.
     // if the adns hasn't initialized yet, this is harmless.
@@ -69,30 +69,30 @@ void adns5050_init(void) {
 // Just as with the serial protocol, this is used by the slave to send a
 // synchronization signal to the master.
 void adns5050_sync(void) {
-    writePinLow(ADNS5050_CS_PIN);
+    gpio_write_pin_low(ADNS5050_CS_PIN);
     wait_us(1);
-    writePinHigh(ADNS5050_CS_PIN);
+    gpio_write_pin_high(ADNS5050_CS_PIN);
 }
 
 void adns5050_cs_select(void) {
-    writePinLow(ADNS5050_CS_PIN);
+    gpio_write_pin_low(ADNS5050_CS_PIN);
 }
 
 void adns5050_cs_deselect(void) {
-    writePinHigh(ADNS5050_CS_PIN);
+    gpio_write_pin_high(ADNS5050_CS_PIN);
 }
 
 uint8_t adns5050_serial_read(void) {
-    setPinInput(ADNS5050_SDIO_PIN);
+    gpio_set_pin_input(ADNS5050_SDIO_PIN);
     uint8_t byte = 0;
 
     for (uint8_t i = 0; i < 8; ++i) {
-        writePinLow(ADNS5050_SCLK_PIN);
+        gpio_write_pin_low(ADNS5050_SCLK_PIN);
         wait_us(1);
 
-        byte = (byte << 1) | readPin(ADNS5050_SDIO_PIN);
+        byte = (byte << 1) | gpio_read_pin(ADNS5050_SDIO_PIN);
 
-        writePinHigh(ADNS5050_SCLK_PIN);
+        gpio_write_pin_high(ADNS5050_SCLK_PIN);
         wait_us(1);
     }
 
@@ -100,19 +100,19 @@ uint8_t adns5050_serial_read(void) {
 }
 
 void adns5050_serial_write(uint8_t data) {
-    setPinOutput(ADNS5050_SDIO_PIN);
+    gpio_set_pin_output(ADNS5050_SDIO_PIN);
 
     for (int8_t b = 7; b >= 0; b--) {
-        writePinLow(ADNS5050_SCLK_PIN);
+        gpio_write_pin_low(ADNS5050_SCLK_PIN);
 
         if (data & (1 << b))
-            writePinHigh(ADNS5050_SDIO_PIN);
+            gpio_write_pin_high(ADNS5050_SDIO_PIN);
         else
-            writePinLow(ADNS5050_SDIO_PIN);
+            gpio_write_pin_low(ADNS5050_SDIO_PIN);
 
         wait_us(2);
 
-        writePinHigh(ADNS5050_SCLK_PIN);
+        gpio_write_pin_high(ADNS5050_SCLK_PIN);
     }
 
     // tSWR. See page 15 of the ADNS spec sheet.
diff --git a/drivers/sensors/adns9800.c b/drivers/sensors/adns9800.c
index 083ab34d9fc..f34529ee90d 100644
--- a/drivers/sensors/adns9800.c
+++ b/drivers/sensors/adns9800.c
@@ -100,7 +100,7 @@ uint8_t adns9800_read(uint8_t reg_addr) {
 }
 
 void adns9800_init(void) {
-    setPinOutput(ADNS9800_CS_PIN);
+    gpio_set_pin_output(ADNS9800_CS_PIN);
 
     spi_init();
 
diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c
index 12256a8e7ab..15b35a45f25 100644
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -22,17 +22,28 @@
 #include <stdlib.h>
 
 // Set Parameters
+#ifndef ANALOG_JOYSTICK_AUTO_AXIS
 uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN;
 uint16_t maxAxisValue = ANALOG_JOYSTICK_AXIS_MAX;
+#else
+int16_t minAxisValues[2];
+int16_t maxAxisValues[2];
+#endif
 
 uint8_t maxCursorSpeed = ANALOG_JOYSTICK_SPEED_MAX;
 uint8_t speedRegulator = ANALOG_JOYSTICK_SPEED_REGULATOR; // Lower Values Create Faster Movement
 
+#ifdef ANALOG_JOYSTICK_WEIGHTS
+int8_t weights[101] = ANALOG_JOYSTICK_WEIGHTS;
+#endif
+
 int16_t xOrigin, yOrigin;
 
 uint16_t lastCursor = 0;
 
-int16_t axisCoordinate(pin_t pin, uint16_t origin) {
+uint8_t prevValues[2] = {0, 0};
+
+int16_t axisCoordinate(pin_t pin, uint16_t origin, uint8_t axis) {
     int8_t  direction;
     int16_t distanceFromOrigin;
     int16_t range;
@@ -43,12 +54,27 @@ int16_t axisCoordinate(pin_t pin, uint16_t origin) {
         return 0;
     } else if (origin > position) {
         distanceFromOrigin = origin - position;
-        range              = origin - minAxisValue;
-        direction          = -1;
+#ifdef ANALOG_JOYSTICK_AUTO_AXIS
+        if (position < minAxisValues[axis]) {
+            minAxisValues[axis] = position;
+        }
+        range = origin - minAxisValues[axis];
+#else
+        range = origin - minAxisValue;
+#endif
+        direction = -1;
     } else {
         distanceFromOrigin = position - origin;
-        range              = maxAxisValue - origin;
-        direction          = 1;
+
+#ifdef ANALOG_JOYSTICK_AUTO_AXIS
+        if (position > maxAxisValues[axis]) {
+            maxAxisValues[axis] = position;
+        }
+        range = maxAxisValues[axis] - origin;
+#else
+        range = maxAxisValue - origin;
+#endif
+        direction = 1;
     }
 
     float   percent    = (float)distanceFromOrigin / range;
@@ -62,14 +88,29 @@ int16_t axisCoordinate(pin_t pin, uint16_t origin) {
     }
 }
 
-int8_t axisToMouseComponent(pin_t pin, int16_t origin, uint8_t maxSpeed) {
-    int16_t coordinate = axisCoordinate(pin, origin);
+int8_t axisToMouseComponent(pin_t pin, int16_t origin, uint8_t maxSpeed, uint8_t axis) {
+    int16_t coordinate = axisCoordinate(pin, origin, axis);
+    int8_t  result;
+#ifndef ANALOG_JOYSTICK_WEIGHTS
     if (coordinate != 0) {
         float percent = (float)coordinate / 100;
-        return percent * maxCursorSpeed * (abs(coordinate) / speedRegulator);
+        result        = percent * maxCursorSpeed * (abs(coordinate) / speedRegulator);
     } else {
         return 0;
     }
+#else
+    result = weights[abs(coordinate)] * (coordinate < 0 ? -1 : 1) * maxCursorSpeed / speedRegulator;
+#endif
+
+#ifdef ANALOG_JOYSTICK_CUTOFF
+    uint8_t pv       = prevValues[axis];
+    prevValues[axis] = abs(result);
+    if (pv > abs(result)) {
+        return 0;
+    }
+#endif
+
+    return result;
 }
 
 report_analog_joystick_t analog_joystick_read(void) {
@@ -77,20 +118,30 @@ report_analog_joystick_t analog_joystick_read(void) {
 
     if (timer_elapsed(lastCursor) > ANALOG_JOYSTICK_READ_INTERVAL) {
         lastCursor = timer_read();
-        report.x   = axisToMouseComponent(ANALOG_JOYSTICK_X_AXIS_PIN, xOrigin, maxCursorSpeed);
-        report.y   = axisToMouseComponent(ANALOG_JOYSTICK_Y_AXIS_PIN, yOrigin, maxCursorSpeed);
+        report.x   = axisToMouseComponent(ANALOG_JOYSTICK_X_AXIS_PIN, xOrigin, maxCursorSpeed, 0);
+        report.y   = axisToMouseComponent(ANALOG_JOYSTICK_Y_AXIS_PIN, yOrigin, maxCursorSpeed, 1);
     }
 #ifdef ANALOG_JOYSTICK_CLICK_PIN
-    report.button = !readPin(ANALOG_JOYSTICK_CLICK_PIN);
+    report.button = !gpio_read_pin(ANALOG_JOYSTICK_CLICK_PIN);
 #endif
     return report;
 }
 
 void analog_joystick_init(void) {
+    gpio_set_pin_input_high(ANALOG_JOYSTICK_X_AXIS_PIN);
+    gpio_set_pin_input_high(ANALOG_JOYSTICK_Y_AXIS_PIN);
+
 #ifdef ANALOG_JOYSTICK_CLICK_PIN
-    setPinInputHigh(ANALOG_JOYSTICK_CLICK_PIN);
+    gpio_set_pin_input_high(ANALOG_JOYSTICK_CLICK_PIN);
 #endif
     // Account for drift
     xOrigin = analogReadPin(ANALOG_JOYSTICK_X_AXIS_PIN);
     yOrigin = analogReadPin(ANALOG_JOYSTICK_Y_AXIS_PIN);
+
+#ifdef ANALOG_JOYSTICK_AUTO_AXIS
+    minAxisValues[0] = xOrigin - 100;
+    minAxisValues[1] = yOrigin - 100;
+    maxAxisValues[0] = xOrigin + 100;
+    maxAxisValues[1] = yOrigin + 100;
+#endif
 }
diff --git a/drivers/sensors/azoteq_iqs5xx.c b/drivers/sensors/azoteq_iqs5xx.c
index 521f558b5f3..367873eb062 100644
--- a/drivers/sensors/azoteq_iqs5xx.c
+++ b/drivers/sensors/azoteq_iqs5xx.c
@@ -107,18 +107,17 @@ static struct {
 
 i2c_status_t azoteq_iqs5xx_wake(void) {
     uint8_t      data   = 0;
-    i2c_status_t status = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_PREVIOUS_CYCLE_TIME, (uint8_t *)&data, sizeof(data), 1);
-    i2c_stop();
+    i2c_status_t status = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_PREVIOUS_CYCLE_TIME, (uint8_t *)&data, sizeof(data), 1);
     wait_us(150);
     return status;
 }
 i2c_status_t azoteq_iqs5xx_end_session(void) {
     const uint8_t END_BYTE = 1; // any data
-    return i2c_writeReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_END_COMMS, &END_BYTE, 1, AZOTEQ_IQS5XX_TIMEOUT_MS);
+    return i2c_write_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_END_COMMS, &END_BYTE, 1, AZOTEQ_IQS5XX_TIMEOUT_MS);
 }
 
 i2c_status_t azoteq_iqs5xx_get_base_data(azoteq_iqs5xx_base_data_t *base_data) {
-    i2c_status_t status = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_PREVIOUS_CYCLE_TIME, (uint8_t *)base_data, 10, AZOTEQ_IQS5XX_TIMEOUT_MS);
+    i2c_status_t status = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_PREVIOUS_CYCLE_TIME, (uint8_t *)base_data, 10, AZOTEQ_IQS5XX_TIMEOUT_MS);
     if (status == I2C_STATUS_SUCCESS) {
         azoteq_iqs5xx_end_session();
     }
@@ -131,7 +130,7 @@ i2c_status_t azoteq_iqs5xx_get_report_rate(azoteq_iqs5xx_report_rate_t *report_r
         return I2C_STATUS_ERROR;
     }
     uint16_t     selected_reg = AZOTEQ_IQS5XX_REG_REPORT_RATE_ACTIVE + (2 * mode);
-    i2c_status_t status       = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, selected_reg, (uint8_t *)report_rate, 2, AZOTEQ_IQS5XX_TIMEOUT_MS);
+    i2c_status_t status       = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, selected_reg, (uint8_t *)report_rate, 2, AZOTEQ_IQS5XX_TIMEOUT_MS);
     if (end_session) {
         azoteq_iqs5xx_end_session();
     }
@@ -147,7 +146,7 @@ i2c_status_t azoteq_iqs5xx_set_report_rate(uint16_t report_rate_ms, azoteq_iqs5x
     azoteq_iqs5xx_report_rate_t report_rate  = {0};
     report_rate.h                            = (uint8_t)((report_rate_ms >> 8) & 0xFF);
     report_rate.l                            = (uint8_t)(report_rate_ms & 0xFF);
-    i2c_status_t status                      = i2c_writeReg16(AZOTEQ_IQS5XX_ADDRESS, selected_reg, (uint8_t *)&report_rate, 2, AZOTEQ_IQS5XX_TIMEOUT_MS);
+    i2c_status_t status                      = i2c_write_register16(AZOTEQ_IQS5XX_ADDRESS, selected_reg, (uint8_t *)&report_rate, 2, AZOTEQ_IQS5XX_TIMEOUT_MS);
     if (end_session) {
         azoteq_iqs5xx_end_session();
     }
@@ -156,10 +155,10 @@ i2c_status_t azoteq_iqs5xx_set_report_rate(uint16_t report_rate_ms, azoteq_iqs5x
 
 i2c_status_t azoteq_iqs5xx_set_reati(bool enabled, bool end_session) {
     azoteq_iqs5xx_system_config_0_t config = {0};
-    i2c_status_t                    status = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONFIG_0, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_config_0_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+    i2c_status_t                    status = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONFIG_0, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_config_0_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     if (status == I2C_STATUS_SUCCESS) {
         config.reati = enabled;
-        status       = i2c_writeReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONFIG_0, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_config_0_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+        status       = i2c_write_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONFIG_0, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_config_0_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     }
     if (end_session) {
         azoteq_iqs5xx_end_session();
@@ -169,7 +168,7 @@ i2c_status_t azoteq_iqs5xx_set_reati(bool enabled, bool end_session) {
 
 i2c_status_t azoteq_iqs5xx_set_event_mode(bool enabled, bool end_session) {
     azoteq_iqs5xx_system_config_1_t config = {0};
-    i2c_status_t                    status = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONFIG_1, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_config_1_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+    i2c_status_t                    status = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONFIG_1, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_config_1_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     if (status == I2C_STATUS_SUCCESS) {
         config.event_mode     = enabled;
         config.touch_event    = true;
@@ -179,7 +178,7 @@ i2c_status_t azoteq_iqs5xx_set_event_mode(bool enabled, bool end_session) {
         config.reati_event    = false;
         config.alp_prox_event = false;
         config.gesture_event  = true;
-        status                = i2c_writeReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONFIG_1, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_config_1_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+        status                = i2c_write_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONFIG_1, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_config_1_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     }
     if (end_session) {
         azoteq_iqs5xx_end_session();
@@ -189,7 +188,7 @@ i2c_status_t azoteq_iqs5xx_set_event_mode(bool enabled, bool end_session) {
 
 i2c_status_t azoteq_iqs5xx_set_gesture_config(bool end_session) {
     azoteq_iqs5xx_gesture_config_t config = {0};
-    i2c_status_t                   status = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SINGLE_FINGER_GESTURES, (uint8_t *)&config, sizeof(azoteq_iqs5xx_gesture_config_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+    i2c_status_t                   status = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SINGLE_FINGER_GESTURES, (uint8_t *)&config, sizeof(azoteq_iqs5xx_gesture_config_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     pd_dprintf("azo scroll: %d\n", config.multi_finger_gestures.scroll);
     if (status == I2C_STATUS_SUCCESS) {
         config.single_finger_gestures.single_tap     = AZOTEQ_IQS5XX_TAP_ENABLE;
@@ -211,7 +210,7 @@ i2c_status_t azoteq_iqs5xx_set_gesture_config(bool end_session) {
         config.scroll_initial_distance               = AZOTEQ_IQS5XX_SWAP_H_L_BYTES(AZOTEQ_IQS5XX_SCROLL_INITIAL_DISTANCE);
         config.zoom_initial_distance                 = AZOTEQ_IQS5XX_SWAP_H_L_BYTES(AZOTEQ_IQS5XX_ZOOM_INITIAL_DISTANCE);
         config.zoom_consecutive_distance             = AZOTEQ_IQS5XX_SWAP_H_L_BYTES(AZOTEQ_IQS5XX_ZOOM_CONSECUTIVE_DISTANCE);
-        status                                       = i2c_writeReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SINGLE_FINGER_GESTURES, (uint8_t *)&config, sizeof(azoteq_iqs5xx_gesture_config_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+        status                                       = i2c_write_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SINGLE_FINGER_GESTURES, (uint8_t *)&config, sizeof(azoteq_iqs5xx_gesture_config_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     }
     if (end_session) {
         azoteq_iqs5xx_end_session();
@@ -221,7 +220,7 @@ i2c_status_t azoteq_iqs5xx_set_gesture_config(bool end_session) {
 
 i2c_status_t azoteq_iqs5xx_set_xy_config(bool flip_x, bool flip_y, bool switch_xy, bool palm_reject, bool end_session) {
     azoteq_iqs5xx_xy_config_0_t config = {0};
-    i2c_status_t                status = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_XY_CONFIG_0, (uint8_t *)&config, sizeof(azoteq_iqs5xx_xy_config_0_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+    i2c_status_t                status = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_XY_CONFIG_0, (uint8_t *)&config, sizeof(azoteq_iqs5xx_xy_config_0_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     if (status == I2C_STATUS_SUCCESS) {
         if (flip_x) {
             config.flip_x = !config.flip_x;
@@ -233,7 +232,7 @@ i2c_status_t azoteq_iqs5xx_set_xy_config(bool flip_x, bool flip_y, bool switch_x
             config.switch_xy_axis = !config.switch_xy_axis;
         }
         config.palm_reject = palm_reject;
-        status             = i2c_writeReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_XY_CONFIG_0, (uint8_t *)&config, sizeof(azoteq_iqs5xx_xy_config_0_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+        status             = i2c_write_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_XY_CONFIG_0, (uint8_t *)&config, sizeof(azoteq_iqs5xx_xy_config_0_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     }
     if (end_session) {
         azoteq_iqs5xx_end_session();
@@ -243,11 +242,11 @@ i2c_status_t azoteq_iqs5xx_set_xy_config(bool flip_x, bool flip_y, bool switch_x
 
 i2c_status_t azoteq_iqs5xx_reset_suspend(bool reset, bool suspend, bool end_session) {
     azoteq_iqs5xx_system_control_1_t config = {0};
-    i2c_status_t                     status = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONTROL_1, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_control_1_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+    i2c_status_t                     status = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONTROL_1, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_control_1_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     if (status == I2C_STATUS_SUCCESS) {
         config.reset   = reset;
         config.suspend = suspend;
-        status         = i2c_writeReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONTROL_1, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_control_1_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+        status         = i2c_write_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_SYSTEM_CONTROL_1, (uint8_t *)&config, sizeof(azoteq_iqs5xx_system_control_1_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     }
     if (end_session) {
         azoteq_iqs5xx_end_session();
@@ -260,14 +259,14 @@ void azoteq_iqs5xx_set_cpi(uint16_t cpi) {
         azoteq_iqs5xx_resolution_t resolution = {0};
         resolution.x_resolution               = AZOTEQ_IQS5XX_SWAP_H_L_BYTES(MIN(azoteq_iqs5xx_device_resolution_t.resolution_x, AZOTEQ_IQS5XX_INCH_TO_RESOLUTION_X(cpi)));
         resolution.y_resolution               = AZOTEQ_IQS5XX_SWAP_H_L_BYTES(MIN(azoteq_iqs5xx_device_resolution_t.resolution_y, AZOTEQ_IQS5XX_INCH_TO_RESOLUTION_Y(cpi)));
-        i2c_writeReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_X_RESOLUTION, (uint8_t *)&resolution, sizeof(azoteq_iqs5xx_resolution_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+        i2c_write_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_X_RESOLUTION, (uint8_t *)&resolution, sizeof(azoteq_iqs5xx_resolution_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     }
 }
 
 uint16_t azoteq_iqs5xx_get_cpi(void) {
     if (azoteq_iqs5xx_product_number != AZOTEQ_IQS5XX_UNKNOWN) {
         azoteq_iqs5xx_resolution_t resolution = {0};
-        i2c_status_t               status     = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_X_RESOLUTION, (uint8_t *)&resolution, sizeof(azoteq_iqs5xx_resolution_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+        i2c_status_t               status     = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_X_RESOLUTION, (uint8_t *)&resolution, sizeof(azoteq_iqs5xx_resolution_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
         if (status == I2C_STATUS_SUCCESS) {
             return AZOTEQ_IQS5XX_RESOLUTION_X_TO_INCH(AZOTEQ_IQS5XX_SWAP_H_L_BYTES(resolution.x_resolution));
         }
@@ -276,7 +275,7 @@ uint16_t azoteq_iqs5xx_get_cpi(void) {
 }
 
 uint16_t azoteq_iqs5xx_get_product(void) {
-    i2c_status_t status = i2c_readReg16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_PRODUCT_NUMBER, (uint8_t *)&azoteq_iqs5xx_product_number, sizeof(uint16_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
+    i2c_status_t status = i2c_read_register16(AZOTEQ_IQS5XX_ADDRESS, AZOTEQ_IQS5XX_REG_PRODUCT_NUMBER, (uint8_t *)&azoteq_iqs5xx_product_number, sizeof(uint16_t), AZOTEQ_IQS5XX_TIMEOUT_MS);
     if (status == I2C_STATUS_SUCCESS) {
         azoteq_iqs5xx_product_number = AZOTEQ_IQS5XX_SWAP_H_L_BYTES(azoteq_iqs5xx_product_number);
     }
diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
index 3131805c200..9afc9df8044 100644
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -216,6 +216,20 @@ void cirque_pinnacle_cursor_smoothing(bool enable) {
     RAP_Write(HOSTREG__FEEDCONFIG3, feedconfig3);
 }
 
+// Check sensor is connected
+bool cirque_pinnacle_connected(void) {
+    uint8_t current_zidle = 0;
+    uint8_t temp_zidle    = 0;
+    RAP_ReadBytes(HOSTREG__ZIDLE, &current_zidle, 1);
+    RAP_Write(HOSTREG__ZIDLE, HOSTREG__ZIDLE_DEFVAL);
+    RAP_ReadBytes(HOSTREG__ZIDLE, &temp_zidle, 1);
+    if (temp_zidle == HOSTREG__ZIDLE_DEFVAL) {
+        RAP_Write(HOSTREG__ZIDLE, current_zidle);
+        return true;
+    }
+    return false;
+}
+
 /*  Pinnacle-based TM040040/TM035035/TM023023 Functions  */
 void cirque_pinnacle_init(void) {
 #if defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_spi)
@@ -274,6 +288,10 @@ void cirque_pinnacle_init(void) {
     }
 
     cirque_pinnacle_enable_feed(true);
+
+#ifndef CIRQUE_PINNACLE_SKIP_SENSOR_CHECK
+    touchpad_init = cirque_pinnacle_connected();
+#endif
 }
 
 pinnacle_data_t cirque_pinnacle_read_data(void) {
@@ -320,6 +338,15 @@ pinnacle_data_t cirque_pinnacle_read_data(void) {
     result.wheelCount = ((int8_t*)data)[3];
 #endif
 
+#ifdef CIRQUE_PINNACLE_REACHABLE_CALIBRATION
+    static uint16_t xMin = UINT16_MAX, yMin = UINT16_MAX, yMax = 0, xMax = 0;
+    if (result.xValue < xMin) xMin = result.xValue;
+    if (result.xValue > xMax) xMax = result.xValue;
+    if (result.yValue < yMin) yMin = result.yValue;
+    if (result.yValue > yMax) yMax = result.yValue;
+    pd_dprintf("%s: xLo=%3d xHi=%3d yLo=%3d yHi=%3d\n", __FUNCTION__, xMin, xMax, yMin, yMax);
+#endif
+
     result.valid = true;
     return result;
 }
diff --git a/drivers/sensors/cirque_pinnacle_i2c.c b/drivers/sensors/cirque_pinnacle_i2c.c
index 3c11e5f0796..a3622e9d60d 100644
--- a/drivers/sensors/cirque_pinnacle_i2c.c
+++ b/drivers/sensors/cirque_pinnacle_i2c.c
@@ -14,12 +14,11 @@ extern bool touchpad_init;
 void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
     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) {
-            pd_dprintf("error cirque_pinnacle i2c_readReg\n");
+        i2c_write_register(CIRQUE_PINNACLE_ADDR << 1, cmdByte, NULL, 0, CIRQUE_PINNACLE_TIMEOUT);
+        if (i2c_read_register(CIRQUE_PINNACLE_ADDR << 1, cmdByte, data, count, CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
+            pd_dprintf("error cirque_pinnacle i2c_read_register\n");
             touchpad_init = false;
         }
-        i2c_stop();
     }
 }
 
@@ -28,10 +27,9 @@ void RAP_Write(uint8_t address, uint8_t data) {
     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) {
-            pd_dprintf("error cirque_pinnacle i2c_writeReg\n");
+        if (i2c_write_register(CIRQUE_PINNACLE_ADDR << 1, cmdByte, &data, sizeof(data), CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
+            pd_dprintf("error cirque_pinnacle i2c_write_register\n");
             touchpad_init = false;
         }
-        i2c_stop();
     }
 }
diff --git a/drivers/sensors/paw3204.c b/drivers/sensors/paw3204.c
index a13753dd6f1..28c47522ed5 100644
--- a/drivers/sensors/paw3204.c
+++ b/drivers/sensors/paw3204.c
@@ -51,8 +51,8 @@ uint8_t paw3204_read_reg(uint8_t reg_addr);
 void    paw3204_write_reg(uint8_t reg_addr, uint8_t data);
 
 void paw3204_init(void) {
-    setPinOutput(PAW3204_SCLK_PIN);    // setclockpin to output
-    setPinInputHigh(PAW3204_SDIO_PIN); // set datapin input high
+    gpio_set_pin_output(PAW3204_SCLK_PIN);     // setclockpin to output
+    gpio_set_pin_input_high(PAW3204_SDIO_PIN); // set datapin input high
 
     paw3204_write_reg(REG_SETUP, 0x86); // reset sensor and set 1600cpi
     wait_us(5);
@@ -64,16 +64,16 @@ void paw3204_init(void) {
 }
 
 uint8_t paw3204_serial_read(void) {
-    setPinInput(PAW3204_SDIO_PIN);
+    gpio_set_pin_input(PAW3204_SDIO_PIN);
     uint8_t byte = 0;
 
     for (uint8_t i = 0; i < 8; ++i) {
-        writePinLow(PAW3204_SCLK_PIN);
+        gpio_write_pin_low(PAW3204_SCLK_PIN);
         wait_us(1);
 
-        byte = (byte << 1) | readPin(PAW3204_SDIO_PIN);
+        byte = (byte << 1) | gpio_read_pin(PAW3204_SDIO_PIN);
 
-        writePinHigh(PAW3204_SCLK_PIN);
+        gpio_write_pin_high(PAW3204_SCLK_PIN);
         wait_us(1);
     }
 
@@ -81,17 +81,17 @@ uint8_t paw3204_serial_read(void) {
 }
 
 void paw3204_serial_write(uint8_t data) {
-    writePinLow(PAW3204_SDIO_PIN);
-    setPinOutput(PAW3204_SDIO_PIN);
+    gpio_write_pin_low(PAW3204_SDIO_PIN);
+    gpio_set_pin_output(PAW3204_SDIO_PIN);
 
     for (int8_t b = 7; b >= 0; b--) {
-        writePinLow(PAW3204_SCLK_PIN);
+        gpio_write_pin_low(PAW3204_SCLK_PIN);
         if (data & (1 << b)) {
-            writePinHigh(PAW3204_SDIO_PIN);
+            gpio_write_pin_high(PAW3204_SDIO_PIN);
         } else {
-            writePinLow(PAW3204_SDIO_PIN);
+            gpio_write_pin_low(PAW3204_SDIO_PIN);
         }
-        writePinHigh(PAW3204_SCLK_PIN);
+        gpio_write_pin_high(PAW3204_SCLK_PIN);
     }
 
     wait_us(4);
diff --git a/drivers/sensors/pimoroni_trackball.c b/drivers/sensors/pimoroni_trackball.c
index 326e59744f7..9c6d26d73de 100644
--- a/drivers/sensors/pimoroni_trackball.c
+++ b/drivers/sensors/pimoroni_trackball.c
@@ -56,13 +56,13 @@ void pimoroni_trackball_set_cpi(uint16_t cpi) {
 
 void pimoroni_trackball_set_rgbw(uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
     uint8_t                              data[4] = {r, g, b, w};
-    __attribute__((unused)) i2c_status_t status  = i2c_writeReg(PIMORONI_TRACKBALL_ADDRESS << 1, PIMORONI_TRACKBALL_REG_LED_RED, data, sizeof(data), PIMORONI_TRACKBALL_TIMEOUT);
+    __attribute__((unused)) i2c_status_t status  = i2c_write_register(PIMORONI_TRACKBALL_ADDRESS << 1, PIMORONI_TRACKBALL_REG_LED_RED, data, sizeof(data), PIMORONI_TRACKBALL_TIMEOUT);
 
     pd_dprintf("Trackball RGBW i2c_status_t: %d\n", status);
 }
 
 i2c_status_t read_pimoroni_trackball(pimoroni_data_t* data) {
-    i2c_status_t status = i2c_readReg(PIMORONI_TRACKBALL_ADDRESS << 1, PIMORONI_TRACKBALL_REG_LEFT, (uint8_t*)data, sizeof(*data), PIMORONI_TRACKBALL_TIMEOUT);
+    i2c_status_t status = i2c_read_register(PIMORONI_TRACKBALL_ADDRESS << 1, PIMORONI_TRACKBALL_REG_LEFT, (uint8_t*)data, sizeof(*data), PIMORONI_TRACKBALL_TIMEOUT);
 
 #ifdef POINTING_DEVICE_DEBUG
     static uint16_t d_timer;
diff --git a/drivers/sensors/pmw3320.c b/drivers/sensors/pmw3320.c
index 69a584f4e14..f19fbfd1ab4 100644
--- a/drivers/sensors/pmw3320.c
+++ b/drivers/sensors/pmw3320.c
@@ -24,9 +24,9 @@
 
 void pmw3320_init(void) {
     // Initialize sensor serial pins.
-    setPinOutput(PMW3320_SCLK_PIN);
-    setPinOutput(PMW3320_SDIO_PIN);
-    setPinOutput(PMW3320_CS_PIN);
+    gpio_set_pin_output(PMW3320_SCLK_PIN);
+    gpio_set_pin_output(PMW3320_SDIO_PIN);
+    gpio_set_pin_output(PMW3320_CS_PIN);
 
     // reboot the sensor.
     pmw3320_write_reg(REG_Power_Up_Reset, 0x5a);
@@ -54,30 +54,30 @@ void pmw3320_init(void) {
 // Just as with the serial protocol, this is used by the slave to send a
 // synchronization signal to the master.
 void pmw3320_sync(void) {
-    writePinLow(PMW3320_CS_PIN);
+    gpio_write_pin_low(PMW3320_CS_PIN);
     wait_us(1);
-    writePinHigh(PMW3320_CS_PIN);
+    gpio_write_pin_high(PMW3320_CS_PIN);
 }
 
 void pmw3320_cs_select(void) {
-    writePinLow(PMW3320_CS_PIN);
+    gpio_write_pin_low(PMW3320_CS_PIN);
 }
 
 void pmw3320_cs_deselect(void) {
-    writePinHigh(PMW3320_CS_PIN);
+    gpio_write_pin_high(PMW3320_CS_PIN);
 }
 
 uint8_t pmw3320_serial_read(void) {
-    setPinInput(PMW3320_SDIO_PIN);
+    gpio_set_pin_input(PMW3320_SDIO_PIN);
     uint8_t byte = 0;
 
     for (uint8_t i = 0; i < 8; ++i) {
-        writePinLow(PMW3320_SCLK_PIN);
+        gpio_write_pin_low(PMW3320_SCLK_PIN);
         wait_us(1);
 
-        byte = (byte << 1) | readPin(PMW3320_SDIO_PIN);
+        byte = (byte << 1) | gpio_read_pin(PMW3320_SDIO_PIN);
 
-        writePinHigh(PMW3320_SCLK_PIN);
+        gpio_write_pin_high(PMW3320_SCLK_PIN);
         wait_us(1);
     }
 
@@ -85,19 +85,19 @@ uint8_t pmw3320_serial_read(void) {
 }
 
 void pmw3320_serial_write(uint8_t data) {
-    setPinOutput(PMW3320_SDIO_PIN);
+    gpio_set_pin_output(PMW3320_SDIO_PIN);
 
     for (int8_t b = 7; b >= 0; b--) {
-        writePinLow(PMW3320_SCLK_PIN);
+        gpio_write_pin_low(PMW3320_SCLK_PIN);
 
         if (data & (1 << b))
-            writePinHigh(PMW3320_SDIO_PIN);
+            gpio_write_pin_high(PMW3320_SDIO_PIN);
         else
-            writePinLow(PMW3320_SDIO_PIN);
+            gpio_write_pin_low(PMW3320_SDIO_PIN);
 
         wait_us(2);
 
-        writePinHigh(PMW3320_SCLK_PIN);
+        gpio_write_pin_high(PMW3320_SCLK_PIN);
     }
 
     // This was taken from ADNS5050 driver.
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index a7dc687f50d..8408daa9451 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -15,6 +15,9 @@ uint16_t pmw33xx_get_cpi(uint8_t sensor) {
     }
 
     uint8_t cpival = pmw33xx_read(sensor, REG_Config1);
+    // In some cases (100, 900, 1700, 2500), reading the CPI corrupts the firmware and the sensor stops responding.
+    // To avoid this, we write the value back to the sensor, which seems to prevent the corruption.
+    pmw33xx_write(sensor, REG_Config1, cpival);
     return (uint16_t)((cpival + 1) & 0xFF) * PMW33XX_CPI_STEP;
 }
 
diff --git a/drivers/usb2422.c b/drivers/usb2422.c
index 1d33b5acf80..de0e399f872 100644
--- a/drivers/usb2422.c
+++ b/drivers/usb2422.c
@@ -346,10 +346,10 @@ static void USB2422_write_block(void) {
 
 void USB2422_init(void) {
 #ifdef USB2422_RESET_PIN
-    setPinOutput(USB2422_RESET_PIN);
+    gpio_set_pin_output(USB2422_RESET_PIN);
 #endif
 #ifdef USB2422_ACTIVE_PIN
-    setPinInput(USB2422_ACTIVE_PIN);
+    gpio_set_pin_input(USB2422_ACTIVE_PIN);
 #endif
 
     i2c_init(); // IC2 clk must be high at USB2422 reset release time to signal SMB configuration
@@ -387,15 +387,15 @@ void USB2422_configure(void) {
 
 void USB2422_reset(void) {
 #ifdef USB2422_RESET_PIN
-    writePinLow(USB2422_RESET_PIN);
+    gpio_write_pin_low(USB2422_RESET_PIN);
     wait_us(2);
-    writePinHigh(USB2422_RESET_PIN);
+    gpio_write_pin_high(USB2422_RESET_PIN);
 #endif
 }
 
 bool USB2422_active(void) {
 #ifdef USB2422_ACTIVE_PIN
-    return readPin(USB2422_ACTIVE_PIN);
+    return gpio_read_pin(USB2422_ACTIVE_PIN);
 #else
     return 1;
 #endif
diff --git a/drivers/ws2812.h b/drivers/ws2812.h
index 1527df23d37..134de51c503 100644
--- a/drivers/ws2812.h
+++ b/drivers/ws2812.h
@@ -56,9 +56,9 @@
 #    define WS2812_TRST_US 280
 #endif
 
-#if defined(RGBLED_NUM)
-#    define WS2812_LED_COUNT RGBLED_NUM
-#elif defined(RGB_MATRIX_LED_COUNT)
+#if defined(RGBLIGHT_WS2812)
+#    define WS2812_LED_COUNT RGBLIGHT_LED_COUNT
+#elif defined(RGB_MATRIX_WS2812)
 #    define WS2812_LED_COUNT RGB_MATRIX_LED_COUNT
 #endif
 
diff --git a/keyboards/0_sixty/keymaps/ven0mtr0n/keymap.c b/keyboards/0_sixty/keymaps/ven0mtr0n/keymap.c
deleted file mode 100644
index f1869cd2282..00000000000
--- a/keyboards/0_sixty/keymaps/ven0mtr0n/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2020 Vinam Arora <vinam@posteo.de>
- *
- * 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 zero_sixty_layers {
-  _DEFAULT,
-  _L1,
-  _L2,
-  _L3,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_DEFAULT] = LAYOUT_1x2uC( /* qwerty */
-  KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_ENT ,
-  KC_LCTL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RCTL ,
-  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_LGUI,  MO(_L3), MO(_L2), KC_LALT, MO(_L1),     KC_SPC,       MO(_L1), KC_RALT, MO(_L2), MO(_L3), KC_RGUI
-),
-
-[_L1] = LAYOUT_1x2uC(
-  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-  _______,  KC_LBRC, KC_LT,   KC_GT,   KC_RBRC, KC_TILD, KC_PIPE, KC_GRV,  KC_QUOT, KC_DQUO, KC_PGUP, _______ ,
-  _______,  KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_DEL,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_PGDN, _______ ,
-  _______,  KC_APP,  _______, _______, _______, _______, KC_EQL,  KC_UNDS, KC_MINS, KC_PLUS, KC_BSLS, _______ ,
-  _______,  _______, _______, _______, _______,     KC_CAPS,      _______, _______, _______, _______, _______
-),
-
-[_L2] = LAYOUT_1x2uC(
-  _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______ ,
-  _______,  _______, _______, _______, _______, KC_VOLU, _______, KC_7,    KC_8,    KC_9,    KC_F11,  _______ ,
-  _______,  _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_4,    KC_5,    KC_6,    KC_F12,  _______ ,
-  _______,  _______, _______, _______, KC_MUTE, KC_VOLD, KC_MUTE, KC_1,    KC_2,    KC_3,    KC_PSCR, _______ ,
-  _______,  _______, KC_CAPS, _______, _______,     _______,      KC_0,    _______, KC_CAPS, _______, _______
-),
-
-[_L3] = LAYOUT_1x2uC(
-  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-  _______,  _______, _______, _______, _______, _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, _______ ,
-  _______,  _______, KC_ACL2, KC_ACL1, KC_ACL0, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______ ,
-  _______,  _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______ ,
-  _______,  _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-),
-
-};
diff --git a/keyboards/0_sixty/keymaps/ven0mtr0n/readme.md b/keyboards/0_sixty/keymaps/ven0mtr0n/readme.md
deleted file mode 100644
index 584faadf79c..00000000000
--- a/keyboards/0_sixty/keymaps/ven0mtr0n/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Keymap used by vinam. Keeps changing ofcourse :3
\ No newline at end of file
diff --git a/keyboards/0_sixty/keymaps/ven0mtr0n/rules.mk b/keyboards/0_sixty/keymaps/ven0mtr0n/rules.mk
deleted file mode 100644
index 6c605daecf5..00000000000
--- a/keyboards/0_sixty/keymaps/ven0mtr0n/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index 9527d6abae2..5791b324b65 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -16,15 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-// clang-format off
-
-  /* default setup after eeprom reset */
-  #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
-  #define RGBLIGHT_DEFAULT_HUE 152
-  #define RGBLIGHT_DEFAULT_SAT 232
-  #define RGBLIGHT_DEFAULT_VAR 255
-  #define RGBLIGHT_DEFAULT_SPD 2
-// clang-format on
+/* default setup after eeprom reset */
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index 30b806aedc7..d492f8e3bed 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -40,6 +40,11 @@
       "rgb_test": true,
       "alternating": true,
       "twinkle": true
+    },
+    "default": {
+      "hue": 152,
+      "sat": 232,
+      "speed": 2
     }
   },
   "ws2812": {
diff --git a/keyboards/0xcb/1337/keymaps/conor/keymap.c b/keyboards/0xcb/1337/keymaps/conor/keymap.c
deleted file mode 100644
index 2064537df11..00000000000
--- a/keyboards/0xcb/1337/keymaps/conor/keymap.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-Copyright 2021 0xCB - Conor Burns
-
-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
-// clang-format off
-enum layer_names {
-  _HOME,
-  _MISC,
-  _RGB,
-  _BLED
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_HOME] = LAYOUT(
-    KC_MPRV, KC_MNXT, KC_MPLY,
-    KC_PGUP, KC_PGDN, TO(3),
-    KC_HOME, KC_END,  TO(1)
-),
-[_MISC] = LAYOUT(
-    _______, _______, _______,
-    _______, _______, TO(0),
-    _______, _______, TO(2)
-),
-[_RGB] = LAYOUT(
-    RGB_HUI, RGB_HUD, RGB_MOD,
-    RGB_SAI, RGB_SAD, TO(1),
-    RGB_SPI, RGB_SPD, TO(3)
-),
-[_BLED] = LAYOUT(
-    BL_STEP, BL_BRTG, BL_TOGG,
-    BL_ON,   BL_OFF,  TO(2),
-    BL_UP,   BL_DOWN, TO(0)
-)
-};
-// clang-format on
-
-/* rotary encoder (SW3) - add more else if blocks for more granular layer control */
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (IS_LAYER_ON(_RGB)) {
-        #ifdef RGBLIGHT_ENABLE
-            if (clockwise) {
-                rgblight_increase_val();
-            } else {
-                rgblight_decrease_val();
-            }
-        #endif
-    } else if (IS_LAYER_ON(_BLED)) {
-        if (clockwise) {
-            backlight_increase();
-        } else {
-            backlight_decrease();
-        }
-    } else {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
-#endif
-
-/* oled stuff :) */
-#ifdef OLED_ENABLE
-uint16_t startup_timer;
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    startup_timer = timer_read();
-    return rotation;
-}
-
-static void render_logo(void) {
-    static const char PROGMEM raw_logo[] = {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  1,  2,  4,  2,  1,  1,  1,  1,  1,  1,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  1,  1,  1,  1,  1,  1,  2,  4,  2,  1,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  5,248,  5,  2,  0,  0,  0,  0,  0,  0,128,192,192,224,224,112,120, 56, 63, 28, 14, 14, 14,254, 14, 14, 30, 28, 63, 56,120,112,224,224,192,128,  0,  0,  0,  0,  0,  0,  0,  2,  5,248,  5,  2,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,160, 19,162, 66, 66, 66, 66, 66, 66, 66,255,255,255,  0,  0,  0,252,254,254,192,192,192,192,255,  0,  0,  0, 62, 62, 60, 60,  0,  0,  1,255,255,255, 66, 66, 66, 66, 66, 66, 66,162, 19,160, 64,  0,
-        0,  0,  0,128, 64, 64, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192, 64, 64,192,128,  0,  0,192, 64, 64,192,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 64,192,  0,  0,  0,  0,  0,128,192, 64, 64,192,128,  0,  0,128,192, 64, 64,192,128,  0,  0, 64, 64, 64, 64, 64,192,  0,  0,  0,  0,  0,249,  8,  8,  8,  8,  8,  8,  8,  8,127,255,255,192,128,128, 15, 31, 31,  1,  1,  1,  1,255,  0,  0,  0, 30, 30, 14, 14,128,192,192,255,255,127,  8,  8,  8,  8,  8,  8,  8,  8,249,  0,  0,  0,
-        0,  0, 31, 49, 64, 78, 64, 49, 31,  0,  0, 97, 22,  8, 22, 97,  0,  0, 31, 49, 96, 64, 64, 96, 32,  0,  0,127, 68, 68,100, 59,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64, 64,127, 64, 64,  0,  0,  0, 32,100, 68, 68,110, 59,  0,  0, 32,100, 68, 68,110, 59,  0,  0,  0,  0,  0,126,  3,  1,  0,  0,  0,  8, 20, 35, 20,  8,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7,  7, 15,254, 30, 28, 28, 28,255, 28, 28, 28, 30,254, 15,  7,  3,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  4, 10, 17, 10,  4,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 40, 68, 40, 16, 16, 16, 16, 16, 16, 31,  0,  0, 16, 40, 71, 40, 16,  0,  0, 31, 16, 16, 16, 16, 16, 16, 40, 68, 40, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    };
-    oled_write_raw_P(raw_logo, sizeof(raw_logo));
-}
-static void render_logo_font(void) {
-    static const char PROGMEM qmk_logo[] = {
-        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xCB, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0xCB, 0xCB, 0xCB, 0x9C, 0x9D, 0xCB, 0xCB,
-        0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xCB, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xCB, 0xCB, 0xBB, 0xBC, 0xBD, 0xBE, 0xCB,
-        0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xCB, 0x88, 0x89, 0x8A, 0x8B, 0x8A, 0x8B, 0x8C, 0x8D, 0xCB, 0xCB, 0xDB, 0xDC, 0xDD, 0xDE, 0xCB,
-        0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xCB, 0xA8, 0xA9, 0xAA, 0xAB, 0xAA, 0xAB, 0xAC, 0xAD, 0xCB, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x00
-    };
-
-    oled_write_P(qmk_logo, false);
-}
-/* Shows the name of the current layer and locks for the host (CAPS etc.) */
-static void render_info(void) {
-    oled_write_P(PSTR("Layer: "), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case _HOME:
-            oled_write_ln_P(PSTR("HOME"), false);
-            break;
-        case _MISC:
-            oled_write_ln_P(PSTR("MISC"), false);
-            break;
-        case _RGB:
-            oled_write_ln_P(PSTR("RGB"), false);
-            break;
-        case _BLED:
-            oled_write_ln_P(PSTR("Backlight"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undefined"), false);
-    }
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
-    oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-}
-static void render_rgbled_status(bool) {
-    char string[4];
-    if (RGBLIGHT_MODES > 1 && rgblight_is_enabled() && get_highest_layer(layer_state) == _RGB) {
-        uint16_t m = rgblight_get_mode();
-        string[3] = '\0';
-        string[2] = '0' + m % 10;
-        string[1] = ( m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
-        string[0] =  m / 10 ? '0' + m / 10 : ' ';
-        oled_write_P(PSTR("Conf:"), false);
-        oled_write(string, false);
-        uint16_t h = rgblight_get_hue()/RGBLIGHT_HUE_STEP;
-        string[3] = '\0';
-        string[2] = '0' + h % 10;
-        string[1] = ( h /= 10) % 10 ? '0' + (h) % 10 : (h / 10) % 10 ? '0' : ' ';
-        string[0] =  h / 10 ? '0' + h / 10 : ' ';
-        oled_write_P(PSTR(","), false);
-        oled_write(string, false);
-        uint16_t s = rgblight_get_sat()/RGBLIGHT_SAT_STEP;
-        string[3] = '\0';
-        string[2] = '0' + s % 10;
-        string[1] = ( s /= 10) % 10 ? '0' + (s) % 10 : (s / 10) % 10 ? '0' : ' ';
-        string[0] =  s / 10 ? '0' + s / 10 : ' ';
-        oled_write_P(PSTR(","), false);
-        oled_write(string, false);
-        uint16_t v = rgblight_get_val()/RGBLIGHT_VAL_STEP;
-        string[3] = '\0';
-        string[2] = '0' + v % 10;
-        string[1] = ( v /= 10) % 10 ? '0' + (v) % 10 : (v / 10) % 10 ? '0' : ' ';
-        string[0] =  v / 10 ? '0' + v / 10 : ' ';
-        oled_write_P(PSTR(","), false);
-        oled_write(string, false);
-        oled_write_ln_P(PSTR("\n     MOD HUE SAT VAR"), false);
-    } else {
-        oled_write_ln_P(PSTR("\n"), false);
-    }
-}
-bool oled_task_user(void) {
-    static bool finished_timer = false;
-    if (!finished_timer && (timer_elapsed(startup_timer) < 1000)) {
-        render_logo();
-    } else {
-        if (!finished_timer) {
-            oled_clear();
-            finished_timer = true;
-        }
-        render_info();
-        render_rgbled_status(true);
-        render_logo_font();
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/0xcb/1337/keymaps/jakob/keymap.c b/keyboards/0xcb/1337/keymaps/jakob/keymap.c
deleted file mode 100644
index 4f73a1d9fdf..00000000000
--- a/keyboards/0xcb/1337/keymaps/jakob/keymap.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-Copyright 2021 0xCB - Conor Burns
-
-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
-// clang-format off
-enum layer_names {
-  _HOME,
-  _MISC,
-  _RGB,
-  _BLED
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_HOME] = LAYOUT(
-    KC_MPRV, KC_MNXT, KC_MPLY,
-    KC_PGUP, KC_PGDN, TO(3),
-    KC_HOME, KC_END,  TO(1)
-),
-[_MISC] = LAYOUT(
-    _______, _______, _______,
-    _______, _______, TO(0),
-    _______, _______, TO(2)
-),
-[_RGB] = LAYOUT(
-    RGB_HUI, RGB_HUD, RGB_MOD,
-    RGB_SAI, RGB_SAD, TO(1),
-    RGB_SPI, RGB_SPD, TO(3)
-),
-[_BLED] = LAYOUT(
-    BL_STEP, BL_BRTG, BL_TOGG,
-    BL_ON,   BL_OFF,  TO(2),
-    BL_UP,   BL_DOWN, TO(0)
-)
-};
-// clang-format on
-
-/* rotary encoder (SW3) - add more else if blocks for more granular layer control */
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (IS_LAYER_ON(_RGB)) {
-        #ifdef RGBLIGHT_ENABLE
-            if (clockwise) {
-                rgblight_increase_val();
-            } else {
-                rgblight_decrease_val();
-            }
-        #endif
-    } else if (IS_LAYER_ON(_BLED)) {
-        if (clockwise) {
-            backlight_increase();
-        } else {
-            backlight_decrease();
-        }
-    } else {
-        if (clockwise) {
-            tap_code16(C(A(KC_UP)));
-        } else {
-            tap_code16(C(A(KC_DOWN)));
-        }
-    }
-    return true;
-}
-#endif
-
-/* oled stuff :) */
-#ifdef OLED_ENABLE
-uint16_t startup_timer;
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    startup_timer = timer_read();
-    return rotation;
-}
-
-static void render_logo(void) {
-    static const char PROGMEM raw_logo[] = {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  1,  2,  4,  2,  1,  1,  1,  1,  1,  1,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  1,  1,  1,  1,  1,  1,  2,  4,  2,  1,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  5,248,  5,  2,  0,  0,  0,  0,  0,  0,128,192,192,224,224,112,120, 56, 63, 28, 14, 14, 14,254, 14, 14, 30, 28, 63, 56,120,112,224,224,192,128,  0,  0,  0,  0,  0,  0,  0,  2,  5,248,  5,  2,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,160, 19,162, 66, 66, 66, 66, 66, 66, 66,255,255,255,  0,  0,  0,252,254,254,192,192,192,192,255,  0,  0,  0, 62, 62, 60, 60,  0,  0,  1,255,255,255, 66, 66, 66, 66, 66, 66, 66,162, 19,160, 64,  0,
-        0,  0,  0,128, 64, 64, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192, 64, 64,192,128,  0,  0,192, 64, 64,192,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 64,192,  0,  0,  0,  0,  0,128,192, 64, 64,192,128,  0,  0,128,192, 64, 64,192,128,  0,  0, 64, 64, 64, 64, 64,192,  0,  0,  0,  0,  0,249,  8,  8,  8,  8,  8,  8,  8,  8,127,255,255,192,128,128, 15, 31, 31,  1,  1,  1,  1,255,  0,  0,  0, 30, 30, 14, 14,128,192,192,255,255,127,  8,  8,  8,  8,  8,  8,  8,  8,249,  0,  0,  0,
-        0,  0, 31, 49, 64, 78, 64, 49, 31,  0,  0, 97, 22,  8, 22, 97,  0,  0, 31, 49, 96, 64, 64, 96, 32,  0,  0,127, 68, 68,100, 59,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64, 64,127, 64, 64,  0,  0,  0, 32,100, 68, 68,110, 59,  0,  0, 32,100, 68, 68,110, 59,  0,  0,  0,  0,  0,126,  3,  1,  0,  0,  0,  8, 20, 35, 20,  8,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7,  7, 15,254, 30, 28, 28, 28,255, 28, 28, 28, 30,254, 15,  7,  3,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  4, 10, 17, 10,  4,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 40, 68, 40, 16, 16, 16, 16, 16, 16, 31,  0,  0, 16, 40, 71, 40, 16,  0,  0, 31, 16, 16, 16, 16, 16, 16, 40, 68, 40, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    };
-    oled_write_raw_P(raw_logo, sizeof(raw_logo));
-}
-static void render_logo_font(void) {
-    static const char PROGMEM qmk_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4,
-        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4,
-        0x88, 0x89, 0x8A, 0x8B, 0x8A, 0x8B, 0x8C, 0x8D, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0,
-        0xA8, 0xA9, 0xAA, 0xAB, 0xAA, 0xAB, 0xAC, 0xAD, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0x00
-    };
-
-    oled_write_P(qmk_logo, false);
-}
-/* Shows the name of the current layer and locks for the host (CAPS etc.) */
-static void render_info(void) {
-    oled_write_P(PSTR("Layer: "), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case _HOME:
-            oled_write_ln_P(PSTR("HOME"), false);
-            break;
-        case _MISC:
-            oled_write_ln_P(PSTR("MISC"), false);
-            break;
-        case _RGB:
-            oled_write_ln_P(PSTR("RGB"), false);
-            break;
-        case _BLED:
-            oled_write_ln_P(PSTR("Backlight"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undefined"), false);
-    }
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
-    oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-}
-static void render_rgbled_status(bool) {
-    char string[4];
-    if (RGBLIGHT_MODES > 1 && rgblight_is_enabled() && get_highest_layer(layer_state) == _RGB) {
-        uint16_t m = rgblight_get_mode();
-        string[3] = '\0';
-        string[2] = '0' + m % 10;
-        string[1] = ( m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
-        string[0] =  m / 10 ? '0' + m / 10 : ' ';
-        oled_write_P(PSTR("Conf:"), false);
-        oled_write(string, false);
-        uint16_t h = rgblight_get_hue()/RGBLIGHT_HUE_STEP;
-        string[3] = '\0';
-        string[2] = '0' + h % 10;
-        string[1] = ( h /= 10) % 10 ? '0' + (h) % 10 : (h / 10) % 10 ? '0' : ' ';
-        string[0] =  h / 10 ? '0' + h / 10 : ' ';
-        oled_write_P(PSTR(","), false);
-        oled_write(string, false);
-        uint16_t s = rgblight_get_sat()/RGBLIGHT_SAT_STEP;
-        string[3] = '\0';
-        string[2] = '0' + s % 10;
-        string[1] = ( s /= 10) % 10 ? '0' + (s) % 10 : (s / 10) % 10 ? '0' : ' ';
-        string[0] =  s / 10 ? '0' + s / 10 : ' ';
-        oled_write_P(PSTR(","), false);
-        oled_write(string, false);
-        uint16_t v = rgblight_get_val()/RGBLIGHT_VAL_STEP;
-        string[3] = '\0';
-        string[2] = '0' + v % 10;
-        string[1] = ( v /= 10) % 10 ? '0' + (v) % 10 : (v / 10) % 10 ? '0' : ' ';
-        string[0] =  v / 10 ? '0' + v / 10 : ' ';
-        oled_write_P(PSTR(","), false);
-        oled_write(string, false);
-        oled_write_ln_P(PSTR("\n     MOD HUE SAT VAR"), false);
-    } else {
-        oled_write_ln_P(PSTR("\n"), false);
-    }
-}
-bool oled_task_user(void) {
-    static bool finished_timer = false;
-    if (!finished_timer && (timer_elapsed(startup_timer) < 1000)) {
-        render_logo();
-    } else {
-        if (!finished_timer) {
-            oled_clear();
-            finished_timer = true;
-        }
-        render_info();
-        render_rgbled_status(true);
-        render_logo_font();
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/0xcb/splaytoraid/config.h b/keyboards/0xcb/splaytoraid/config.h
deleted file mode 100644
index 00674eea11c..00000000000
--- a/keyboards/0xcb/splaytoraid/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2023 Conor Burns (@Conor-Burns)
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 18
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING
-#define RGB_MATRIX_DEFAULT_HUE 152
-#define RGB_MATRIX_DEFAULT_SAT 232
-#define RGB_MATRIX_DEFAULT_SPD 50
-
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_SOLID_COLOR
-#define ENABLE_RGB_MATRIX_BAND_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json
index c218d1ff781..1d47f7d77ca 100644
--- a/keyboards/0xcb/splaytoraid/info.json
+++ b/keyboards/0xcb/splaytoraid/info.json
@@ -36,6 +36,20 @@
         ]
     },
     "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "raindrops": true,
+            "cycle_left_right": true
+        },
+        "default": {
+            "animation": "breathing",
+            "hue": 152,
+            "sat": 232,
+            "speed": 50
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 2], "x": 0, "y": 0},
@@ -56,7 +70,8 @@
             {"flags": 4, "matrix": [7, 5], "x": 122, "y": 64},
             {"flags": 4, "matrix": [1, 5], "x": 142, "y": 64},
             {"flags": 4, "matrix": [0, 3], "x": 163, "y": 64}
-        ]
+        ],
+        "max_brightness": 200
     },
     "ws2812": {
         "pin": "D0"
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
deleted file mode 100644
index 1786ae776db..00000000000
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2023 Dreipunkteinsvier (@dreipunkteinsvier)
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#define TAPPING_TERM 180
-
-#undef LOCKING_SUPPORT_ENABLE
-#undef LOCKING_RESYNC_ENABLE
-
-
-#ifdef COMBO_ENABLE
-    #define COMBO_TERM 20
-    #define COMBO_ONLY_FROM_LAYER 0
-#endif
-
-#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c b/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
deleted file mode 100644
index 07036b7245e..00000000000
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
+++ /dev/null
@@ -1,300 +0,0 @@
-// Copyright 2023 Dreipunkteinsvier (@dreipunkteinsvier)
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include QMK_KEYBOARD_H
-#include <stdio.h>
-#include <string.h>
-
-// ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-// │ D E F I N I T I O N S                                                                                                                      │
-// └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-// ▝▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▘
-
-enum splaytoraid40_layers {
-    _QWERTY,
-    _COLEMAK,
-    _NAVIGATION,
-    _MEDIA,
-    _NUMBERS,
-    _FUNCTION,
-};
-
-// ┌───────────────────────────────────────────────────────────┐
-// │ d e f i n e   k e y c o d e s                             │
-// └───────────────────────────────────────────────────────────┘
-
-enum custom_keycodes {
-    COLEMAK = SAFE_RANGE,
-    QWERTY
-};
-
-// ┌───────────────────────────────────────────────────────────┐
-// │ d e f i n e   m a c r o n a m e s                         │
-// └───────────────────────────────────────────────────────────┘
-
-// LEFT HAND HOME ROW MODS ├───────────────────────────────────┐
-#define HM_A LGUI_T(KC_A)
-#define HM_S LALT_T(KC_S)
-#define HM_D LCTL_T(KC_D)
-#define HM_F LSFT_T(KC_F)
-#define HM_G RALT_T(KC_G)
-
-// RIGHT HAND HOME ROW MODS ├──────────────────────────────────┐
-#define HM_H RALT_T(KC_H)
-#define HM_J RSFT_T(KC_J)
-#define HM_K LCTL_T(KC_K)
-#define HM_L LALT_T(KC_L)
-#define HM_SCLN LGUI_T(KC_SCLN)
-
-// CTRL + ARROWS ├─────────────────────────────────────────────┐
-#define CT_LEFT LCTL(KC_LEFT)
-#define CT_DOWN LCTL(KC_DOWN)
-#define CT_UP LCTL(KC_UP)
-#define CT_RGHT LCTL(KC_RGHT)
-
-// THUMB KEY LAYER TAPS ├──────────────────────────────────────┐
-#define TB_TAB LT(_MEDIA, KC_TAB)
-#define TB_ENT LT(_NAVIGATION, KC_ENT)
-#define TB_SPC LT(_NUMBERS, KC_SPC)
-#define TB_BSPC LT(_FUNCTION, KC_BSPC)
-
-// ┌───────────────────────────────────────────────────────────┐
-// │ d e f i n e   c o m b o s                                 │
-// └───────────────────────────────────────────────────────────┘
-// vertical combos for umlauts
-const uint16_t PROGMEM ae_combo[] = {KC_Q, HM_A, COMBO_END};
-const uint16_t PROGMEM ss_combo[] = {KC_W, HM_S, COMBO_END};
-const uint16_t PROGMEM ue_combo[] = {KC_U, HM_J, COMBO_END};
-const uint16_t PROGMEM oe_combo[] = {KC_O, HM_L, COMBO_END};
-// horizontal combos for mods
-const uint16_t PROGMEM del_combo[] = {HM_H, HM_J, COMBO_END};
-const uint16_t PROGMEM bsp_combo[] = {HM_J, HM_K, COMBO_END};
-const uint16_t PROGMEM ent_combo[] = {HM_K, HM_L, COMBO_END};
-const uint16_t PROGMEM tab_combo[] = {HM_F, HM_D, COMBO_END};
-const uint16_t PROGMEM esc_combo[] = {HM_D, HM_S, COMBO_END};
-
-combo_t key_combos[] = {
-    COMBO(ae_combo, RALT(KC_Q)),
-    COMBO(ss_combo, RALT(KC_S)),
-    COMBO(ue_combo, RALT(KC_Y)),
-    COMBO(oe_combo, RALT(KC_P)),
-    COMBO(del_combo, KC_DEL),
-    COMBO(bsp_combo, KC_BSPC),
-    COMBO(ent_combo, KC_ENT),
-    COMBO(tab_combo, KC_TAB),
-    COMBO(esc_combo, KC_ESC)
-};
-
-// ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-// │ K E Y M A P S                                                                                                                              │
-// └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-// ▝▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▘
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- /*
-   ╺━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╸
-
-   ┌───────────────────────────────────────────────────────────┐
-   │ q w e r t y                                               │
-   └───────────────────────────────────────────────────────────┘
-   ┌─────────┬─────────┬─────────┬─────────┬─────────┐                    ┌─────────┬─────────┬─────────┬─────────┬─────────┐
-   │    Q    │    W    │    E    │    R    │    T    │ ╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮ │    Y    │    U    │    I    │    O    │    P    │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤ │╰╯╰╯╰╯╰╯╰╯╰╯╰╯╰╯│ ├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │    A    │    S    │    D    │    F    │    G    ├─╯                ╰─┤    H    │    J    │    K    │    L    │    ;    │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │    Z    │    X    │    C    │    V    │    B    ││        ││        ││    N    │    M    │    ,    │    .    │    /    │
-   └─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┘
-                       │   ESC   │   TAB   │  ENTER  │                    │  SPACE  │ BSPACE  │   DEL   │
-                       └─────────┴─────────┴─────────┘                    └─────────┴─────────┴─────────┘ */
-
-   [_QWERTY] = LAYOUT_36(
- //╷         ╷         ╷         ╷         ╷         ╷         ╷╷         ╷         ╷         ╷         ╷         ╷         ╷
-    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                          KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,
-    HM_A,     HM_S,     HM_D,     HM_F,     HM_G,                          HM_H,     HM_J,     HM_K,     HM_L,     HM_SCLN,
-    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,                          KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,
-                        KC_ESC,   TB_TAB,   TB_ENT,       KC_MPLY,         TB_SPC,   TB_BSPC,  KC_DEL
-  ),
-
- /*
-   ╺━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╸
-   ┌───────────────────────────────────────────────────────────┐
-   │ c o l e m a k                                             │
-   └───────────────────────────────────────────────────────────┘
-   ┌─────────┬─────────┬─────────┬─────────┬─────────┐                    ┌─────────┬─────────┬─────────┬─────────┬─────────┐
-   │    Q    │    W    │    F    │    P    │    G    │ ╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮ │    J    │    L    │    U    │    Y    │    ;    │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤ │╰╯╰╯╰╯╰╯╰╯╰╯╰╯╰╯│ ├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │    A    │    R    │    S    │    T    │    D    ├─╯                ╰─┤    H    │    N    │    E    │    I    │    O    │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │    Z    │    X    │    C    │    V    │    B    ││        ││        ││    K    │    M    │    ,    │    .    │    /    │
-   └─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┘
-                       │   ESC   │   TAB   │  ENTER  │                    │  SPACE  │ BSPACE  │   DEL   │
-                       └─────────┴─────────┴─────────┘                    └─────────┴─────────┴─────────┘ */
-
-   [_COLEMAK] = LAYOUT_36(
- //╷         ╷         ╷         ╷         ╷         ╷         ╷╷         ╷         ╷         ╷         ╷         ╷         ╷
-    KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,                          KC_J,     KC_L,     KC_U,     KC_Y,     KC_SCLN,
-    KC_A,     KC_R,     KC_S,     KC_T,     KC_D,                          KC_H,     KC_N,     KC_E,     KC_I,     KC_O,
-    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,                          KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,
-                        KC_ESC,   TB_TAB,   TB_ENT,       _______,         TB_SPC,   TB_BSPC,  KC_DEL
-  ),
-
-  /*
-   ╺━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╸
-
-   ┌───────────────────────────────────────────────────────────┐
-   │ n a v i g a t i o n                                       │
-   └───────────────────────────────────────────────────────────┘
-   ┌─────────┬─────────┬─────────┬─────────┬─────────┐                    ┌─────────┬─────────┬─────────┬─────────┬─────────┐
-   │         │         │         │         │    {    │ ╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮ │    }    │ CTRL ←  │ CTRL ↓  │ CTRL ↑  │ CTRL →  │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤ │╰╯╰╯╰╯╰╯╰╯╰╯╰╯╰╯│ ├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │         │         │         │         │    (    ├─╯                ╰─┤    )    │    ←    │    ↓    │    ↑    │    →    │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │         │         │         │         │    [    ││        ││        ││    ]    │  HOME   │    PG↓  │   PG↑   │   END   │
-   └─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┘
-                       │         │         │         │                    │         │         │         │
-                       └─────────┴─────────┴─────────┘                    └─────────┴─────────┴─────────┘ */
-
-   [_NAVIGATION] = LAYOUT_36(
- //╷         ╷         ╷         ╷         ╷         ╷         ╷╷         ╷         ╷         ╷         ╷         ╷         ╷
-    _______,  _______,  _______,  _______,  KC_LCBR,                       KC_RCBR,  CT_LEFT,  CT_DOWN,    CT_UP,  CT_RGHT,
-    KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LSFT,  KC_LPRN,                       KC_RPRN,  KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,
-    _______,  _______,  _______,  _______,  KC_LBRC,                       KC_RBRC,  KC_HOME,  KC_PGDN,  KC_PGUP,   KC_END,
-                        _______,  _______,  _______,       _______,        _______,  _______,  _______
-  ),
-
-  /*
-   ╺━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╸
-
-   ┌───────────────────────────────────────────────────────────┐
-   │ m e d i a   &   s y m b o l                               │
-   └───────────────────────────────────────────────────────────┘
-   ┌─────────┬─────────┬─────────┬─────────┬─────────┐                    ┌─────────┬─────────┬─────────┬─────────┬─────────┐
-   │    _    │    &    │    *    │    (    │    )    │ ╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮ │         │         │         │         │         │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤ │╰╯╰╯╰╯╰╯╰╯╰╯╰╯╰╯│ ├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │    +    │    $    │    %    │    ^    │    "    ├─╯                ╰─┤         │         │         │         │         │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │    ~    │    !    │    @    │    #    │    |    ││        ││        ││         │         │         │         │         │
-   └─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┘
-                       │         │         │         │                    │         │         │         │
-                       └─────────┴─────────┴─────────┘                    └─────────┴─────────┴─────────┘ */
-
-   [_MEDIA] = LAYOUT_36(
- //╷         ╷         ╷         ╷         ╷         ╷         ╷╷         ╷         ╷         ╷         ╷         ╷         ╷
-    KC_UNDS,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,                       RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,
-    KC_PLUS,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_DQUO,                       RGB_M_P,  RGB_RMOD, RGB_HUD,  RGB_SAD,  RGB_VAD,
-    KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_PIPE,                       QWERTY,   COLEMAK,  _______,  _______,  QK_BOOTLOADER,
-                        _______,  _______,  _______,       _______,        _______,  _______,  _______
-  ),
-
-  /*
-   ╺━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╸
-
-   ┌───────────────────────────────────────────────────────────┐
-   │ n u m b e r s                                             │
-   └───────────────────────────────────────────────────────────┘
-   ┌─────────┬─────────┬─────────┬─────────┬─────────┐                    ┌─────────┬─────────┬─────────┬─────────┬─────────┐
-   │    -    │    7    │    8    │    9    │    0    │ ╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮ │         │         │         │         │         │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤ │╰╯╰╯╰╯╰╯╰╯╰╯╰╯╰╯│ ├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │    =    │    4    │    5    │    6    │    '    ├─╯                ╰─┤         │         │         │         │         │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │    `    │    1    │    2    │    3    │    \    ││        ││        ││         │         │         │         │         │
-   └─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┘
-                       │         │         │         │                    │         │         │         │
-                       └─────────┴─────────┴─────────┘                    └─────────┴─────────┴─────────┘ */
-
-   [_NUMBERS] = LAYOUT_36(
- //╷         ╷         ╷         ╷         ╷         ╷         ╷╷         ╷         ╷         ╷         ╷         ╷         ╷
-    KC_MINS,  KC_7,     KC_8,     KC_9,     KC_0,                          _______,  _______,  _______,  _______,  _______,
-    KC_EQL,   KC_4,     KC_5,     KC_6,     KC_QUOT,                       KC_RALT,  KC_RSFT,  KC_LCTL,  KC_LALT,  KC_LGUI,
-    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_BSLS,                       _______,  _______,  _______,  _______,  _______,
-                        _______,  _______,  _______,       _______,        _______,  _______,  _______
-  ),
-
-  /*
-   ╺━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╸
-
-   ┌───────────────────────────────────────────────────────────┐
-   │ f u n t i o n                                             │
-   └───────────────────────────────────────────────────────────┘
-   ┌─────────┬─────────┬─────────┬─────────┬─────────┐                    ┌─────────┬─────────┬─────────┬─────────┬─────────┐
-   │   F12   │   F7    │   F8    │   F9    │ PRT SCR │ ╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮ │         │         │         │         │         │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤ │╰╯╰╯╰╯╰╯╰╯╰╯╰╯╰╯│ ├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │   F11   │   F4    │   F5    │   F6    │         ├─╯                ╰─┤         │         │         │         │         │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │   F10   │   F1    │   F2    │   F3    │   INS   ││        ││        ││         │         │         │         │         │
-   └─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┘
-                       │         │         │         │                    │         │         │         │
-                       └─────────┴─────────┴─────────┘                    └─────────┴─────────┴─────────┘ */
-
-   [_FUNCTION] = LAYOUT_36(
- //╷         ╷         ╷         ╷         ╷         ╷         ╷╷         ╷         ╷         ╷         ╷         ╷         ╷
-    KC_F12,   KC_F7,    KC_F8,    KC_F9,    KC_PSCR,                       _______,  _______,  _______,  _______,  _______,
-    KC_F11,   KC_F4,    KC_F5,    KC_F6,    _______,                       KC_RALT,  KC_RSFT,  KC_LCTL,  KC_LALT,  KC_LGUI,
-    KC_F10,   KC_F1,    KC_F2,    KC_F3,    KC_INS,                        _______,  _______,  _______,  _______,  _______,
-                        _______,  _______,  _______,       _______,        _______,  _______,  _______
-  )
-
- /*
-   ╺━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╸
-
-   ┌───────────────────────────────────────────────────────────┐
-   │ t e m p l a t e                                           │
-   └───────────────────────────────────────────────────────────┘
-   ┌─────────┬─────────┬─────────┬─────────┬─────────┐                    ┌─────────┬─────────┬─────────┬─────────┬─────────┐
-   │         │         │         │         │         │ ╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮╭╮ │         │         │         │         │         │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤ │╰╯╰╯╰╯╰╯╰╯╰╯╰╯╰╯│ ├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │         │         │         │         │         ├─╯                ╰─┤         │         │         │         │         │
-   ├─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┤
-   │         │         │         │         │         ││        ││        ││         │         │         │         │         │
-   └─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┘
-                       │         │         │         │                    │         │         │         │
-                       └─────────┴─────────┴─────────┘                    └─────────┴─────────┴─────────┘ */
-/*
-   [_TEMPLATE] = LAYOUT_saegewerk(
- //╷         ╷         ╷         ╷         ╷         ╷         ╷╷         ╷         ╷         ╷         ╷         ╷         ╷
-    _______,  _______,  _______,  _______,  _______,                       _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,                       _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,                       _______,  _______,  _______,  _______,  _______,
-                        _______,  _______,  _______,       _______,        _______,  _______,  _______
- )*/
-};
-
-// ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-// │ D I E S  U N D  D A S                                                                                                                      │
-// └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-// ▝▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▘
-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_DEL:
-    case KC_MINS:
-    case KC_UNDS:
-    case KC_LSFT:
-    case KC_RSFT:
-      return true;
-
-    default:
-      return false;  // Deactivate Caps Word.
-  }
-}
-
-// ┌───────────────────────────────────────────────────────────┐
-// │ e n c o d e r                                             │
-// └───────────────────────────────────────────────────────────┘
-
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_NAVIGATION] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
-    [_QWERTY] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_COLEMAK] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_MEDIA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_NUMBERS] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FUNCTION] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
-};
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/rules.mk b/keyboards/0xcb/splaytoraid/keymaps/pi/rules.mk
deleted file mode 100644
index 0d3e8aa3a90..00000000000
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMBO_ENABLE = yes
-CAPS_WORD_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/config.h b/keyboards/0xcb/splaytoraid/rp2040_ce/config.h
deleted file mode 100644
index 65bb22450e2..00000000000
--- a/keyboards/0xcb/splaytoraid/rp2040_ce/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2023 Conor Burns (@Conor-Burns)
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SPLASH
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
index 9f0eb511185..49256b64827 100644
--- a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
+++ b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
@@ -1,4 +1,25 @@
 {
+    "rgb_matrix": {
+        "animations": {
+            "cycle_up_down": true,
+            "jellybean_raindrops": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "pixel_fractal": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "pixel_rain": true,
+            "dual_beacon": true,
+            "hue_breathing": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true
+        }
+    },
     "ws2812": {
         "driver": "vendor"
     }
diff --git a/keyboards/0xcb/static/keymaps/bongocat/keymap.c b/keyboards/0xcb/static/keymaps/bongocat/keymap.c
deleted file mode 100644
index 144b8daaa41..00000000000
--- a/keyboards/0xcb/static/keymaps/bongocat/keymap.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
-Copyright 2021 0xCB - Conor Burns
-
-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
-// clang-format off
-enum my_keycodes {
-    WPM = SAFE_RANGE,
-};
-enum layer_names {
-  _HOME,
-  _FN2,
-  _FN3,
-  _FN4
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_HOME] = LAYOUT_all(
-                                                                                                       KC_MPLY,
-    QK_GESC, 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_ENT,
-    SC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  SC_RSPC,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,                    KC_SPC,  KC_RALT, MO(1),   MO(2)
-),
-[_FN2] = LAYOUT_all(
-                                                                                                       QK_BOOT,
-    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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,           _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______,          _______,                   _______, _______, _______, _______
-),
-[_FN3] = LAYOUT_all(
-                                                                                                       EE_CLR,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT,          _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH,
-    _______, _______, _______, _______,          _______,                   _______, _______, _______, _______
-),
-[_FN4] = LAYOUT_all(
-                                                                                                       _______,
-    WPM,     KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_MSTP, KC_INS,  KC_HOME, KC_DEL,  KC_END,  _______,
-    _______, _______, KC_BRID, KC_BRIU, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN,          _______,
-    _______,          _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
-    _______, _______, _______, _______,          _______,                   _______, _______, _______, _______
-),
-};
-// clang-format on
-/* WPM toggle key bongocat hehe */
-bool wpm = false;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case WPM:
-        if (record->event.pressed) {
-            wpm = !wpm;
-        }
-        return false;
-    default:
-        return true;
-  }
-}
-/*layer switcher */
-layer_state_t layer_state_set_user(layer_state_t state) {
-    state = update_tri_layer_state(state, _FN2, _FN3, _FN4);
-    return state;
-}
-/* rotary encoder (MX12) - add different functions for layers here */
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (IS_LAYER_ON(_FN4)) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (IS_LAYER_ON(_FN3)) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (IS_LAYER_ON(_FN2)) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
-#endif
-
-/* oled stuff :) */
-#ifdef OLED_ENABLE
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 20 // below this wpm value your animation will idle
-#define TAP_FRAMES 2
-#define TAP_SPEED 40 // above this wpm value typing animation to trigger
-#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
-#define ANIM_SIZE 636 // number of bytes in array
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-uint16_t startup_timer = 0;
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    startup_timer = timer_read();
-    return rotation;
-}
-static void render_logo(void) {
-    static const char PROGMEM raw_logo[] = {
-        0,  8,  0,192,194,192,192, 60, 60, 44, 60,188, 60, 60, 60, 60, 44, 61, 60,192,192,192,208,  1,  0,252,252,180,252, 60, 60, 44, 60,252,253,252,252, 60, 60, 44, 60,244,220,252,252,  0,  0, 16,  0,  0,  0,192,192, 65,192, 60, 60, 52, 60,192,193,192,192, 16,  0,  0,144,  4,  0,252,125,244, 60, 60, 60, 60, 61,252,252,244,252, 60, 60, 60, 61,248,108,252,  0,  0, 61, 60,188, 60, 52,252,252,220,252, 61, 60, 60, 52,  0,  0,192,210, 64,192, 60, 60, 44, 61, 60, 60, 60, 61, 52, 60, 60, 60,192,192, 64,196,  0,  4,  0,
-        0, 16,  0, 61, 63, 55, 63,192, 64,192,196,192,192,192,200,192,196,192,192,  3,  3,  2, 11,  0,  0, 35,  3,  3,  3,  0, 64,  2,  0,255,255,253,247,  0,  0,  0, 32,  1,  0,  1, 65,  8,  0,189,244,252,236,  3,130,  3,  1,  0, 68,  0,  0,  3, 34,131,  3,252,252,236,252,  0, 32, 17,  1,  1,  0,  0, 32,  0,  2,255,255,127,247,  0,  1,  0,  8,  1,  1,  1,  0,  0,  0, 16,  0, 64,  0,255,191,255,251,  0,129,  0,  2, 32,  0,255,255,239,255,  0,  0,  2,  0,  0,  0,  8, 64,  0,  1,  0,  0,  3, 35,  3,  3,  0,  8,  0,
-        1, 16,  0,192, 64,194,192,  3, 67,  3,  3,  9,  3,  3,  3,  3,  2, 83,  3,252,252,188,244,  0,  2, 32,  0,  0,  2,  0,144,  0,  0,255,255,237,255,  0, 16,  0,  0,  0, 64,  2,  0,128,  0,255,123,255,255, 60, 52, 60, 60, 60, 60, 60, 60, 44, 60, 56, 60,239,255,126,255,  0,  2, 32,  0,  0, 34,  0,  0, 16,  0,255,255,255,223,  0,  0,  4,  0,  0,  0, 33,  0,  0, 17,  0,  0,  0,  0,255,255,239,255,  0,128,  0,  0, 72,  0,255,253,247,255,  0,  0,  1,  0,144,  0,  4,  0, 32,  0,  0,  2,192,192,192,200,  0, 16,  0,
-        64,  4,  0,  3,  7,  3,  3, 60, 60, 52,188, 60, 61, 60, 60, 60, 60, 44, 60, 67,  3,  3,  3,  0,  0, 64,  0,  0,  4,  0,  0, 16,  0, 47, 63, 62, 63,  0,  0,132,  0,  0,  0,  0,128,  8,  0,255,255,111,127,  0,  0,  0,  2,128,  0,  0,  0, 64,  4,  0,128,127,127,107,127,  0, 32,  0,  0,  0, 66,  0,  0,  0,136, 55, 63, 61, 63,  0,  0,  0,  2,  0, 64,  0,136,  0,  0, 60, 44,189, 60, 63, 63, 63, 59, 60, 60,172, 60,  0, 64,  3,  2,  3,131, 60, 44, 60, 60, 60, 60,188, 60, 56, 44, 60, 60,  3,  3,131,  2,  0, 32,  2,
-    };
-    oled_write_raw_P(raw_logo, sizeof(raw_logo));
-}
-/* Shows the name of the current layer and locks for the host (CAPS etc.) */
-static void render_layer(void) {
-    led_t led_state = host_keyboard_led_state();
-    // clang-format off
-    static const char PROGMEM logo[][3][7] = {
-        {{0x97, 0x98, 0x99, 0x9A, 0}, {0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0}, {0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 0}}, /* l      num      CB */
-        {{0xB7, 0xB8, 0xB9, 0xBA, 0}, {0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0}, {0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0}}, /* 1      num      CB */
-        {{0xD7, 0xD8, 0xD9, 0xDA, 0}, {0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0}, {0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0}}, /* 1      cap      CB */
-        {{0xF7, 0xF8, 0xF9, 0xFA, 0}, {0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0}, {0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0}}, /* l      cap      CB */
-        {{0xB7, 0xC0, 0xC1, 0xBA, 0}, {0xB7, 0xC2, 0xC3, 0xBA, 0},             {0xB7, 0xC4, 0xC5, 0xBA, 0}},       /* 2       3       4  */
-        {{0xD7, 0xE0, 0xE1, 0xDA, 0}, {0xD7, 0xE2, 0xE3, 0xDA, 0},             {0xD7, 0xE4, 0xE5, 0xDA, 0}},       /* 2       3       4  */
-    };
-    // clang-format on
-    oled_set_cursor(0, 0);
-    oled_write_P(logo[0][0], false);
-    oled_set_cursor(0, 3);
-    oled_write_P(logo[3][0], false);
-    switch (get_highest_layer(layer_state)) {
-        case _HOME:
-            oled_set_cursor(0, 1);
-            oled_write_P(logo[1][0], false);
-            oled_set_cursor(0, 2);
-            oled_write_P(logo[2][0], false);
-            break;
-        case _FN2:
-            oled_set_cursor(0, 1);
-            oled_write_P(logo[4][0], false);
-            oled_set_cursor(0, 2);
-            oled_write_P(logo[5][0], false);
-            break;
-        case _FN3:
-            oled_set_cursor(0, 1);
-            oled_write_P(logo[4][1], false);
-            oled_set_cursor(0, 2);
-            oled_write_P(logo[5][1], false);
-            break;
-        case _FN4:
-            oled_set_cursor(0, 1);
-            oled_write_P(logo[4][2], false);
-            oled_set_cursor(0, 2);
-            oled_write_P(logo[5][2], false);
-            break;
-        default:
-            oled_set_cursor(0, 1);
-            oled_write_P(PSTR("    "), false);
-            oled_set_cursor(0, 2);
-            oled_write_P(PSTR("    "), false);
-    }
-    oled_set_cursor(8, 0);
-    oled_write_P(led_state.num_lock ? logo[0][1] : PSTR("      "), false);
-    oled_set_cursor(8, 1);
-    oled_write_P(led_state.num_lock ? logo[1][1] : PSTR("      "), false);
-    oled_set_cursor(8, 2);
-    oled_write_P(led_state.caps_lock ? logo[2][1] : PSTR("      "), false);
-    oled_set_cursor(8, 3);
-    oled_write_P(led_state.caps_lock ? logo[3][1] : PSTR("      "), false);
-
-    oled_set_cursor(16, 0);
-    oled_write_P(logo[0][2], false);
-    oled_set_cursor(16, 1);
-    oled_write_P(logo[1][2], false);
-    oled_set_cursor(16, 2);
-    oled_write_P(logo[2][2], false);
-    oled_set_cursor(16, 3);
-    oled_write_P(logo[3][2], false);
-
-    /* Fill empty space to clear animation */
-    oled_set_cursor(4, 0);
-    oled_write_P(PSTR("    "), false);
-    oled_set_cursor(4, 1);
-    oled_write_P(PSTR("    "), false);
-    oled_set_cursor(4, 2);
-    oled_write_P(PSTR("    "), false);
-    oled_set_cursor(4, 3);
-    oled_write_P(PSTR("    "), false);
-
-    oled_set_cursor(14, 0);
-    oled_write_P(PSTR("  "), false);
-    oled_set_cursor(14, 1);
-    oled_write_P(PSTR("  "), false);
-    oled_set_cursor(14, 2);
-    oled_write_P(PSTR("  "), false);
-    oled_set_cursor(14, 3);
-    oled_write_P(PSTR("  "), false);
-}
-
-static void render_cat(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-    static const char PROGMEM prep[][ANIM_SIZE] = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00}};
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    };
-
-    void animation_phase(void) {
-        if (get_current_wpm() <= IDLE_SPEED) {
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
-        }
-        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-            oled_write_raw_P(prep[0], ANIM_SIZE);
-        }
-        if (get_current_wpm() >= TAP_SPEED) {
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
-        }
-    }
-    if (get_current_wpm() != 000) {
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-    }
-}
-
-bool oled_task_user(void) {
-    static bool finished_timer = false;
-    if (!finished_timer && (timer_elapsed(startup_timer) < 3000)) {
-        render_logo();
-    } else {
-        if (!finished_timer) {
-            oled_clear();
-            finished_timer = true;
-        }
-        if (wpm) {
-            render_cat();
-            oled_set_cursor(0, 0);
-            char string[10];
-            uint16_t m = get_current_wpm();
-            string[3] = '\0';
-            string[2] = '0' + m % 10;
-            string[1] = ( m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
-            string[0] =  m / 10 ? '0' + m / 10 : ' ';
-            oled_write_P(PSTR("WPM:"), false);
-            oled_write(string, false);
-        } else {
-            render_layer();
-        }
-    }
-    return false;
-}
-#endif
-
-/* Resets via on eep reset - thank you drashna! */
-void eeconfig_init_kb(void) {
-    via_eeprom_set_valid(false);
-    via_init();
-    eeconfig_init_user();
-}
diff --git a/keyboards/0xcb/static/keymaps/bongocat/rules.mk b/keyboards/0xcb/static/keymaps/bongocat/rules.mk
deleted file mode 100644
index d03b5f1ca75..00000000000
--- a/keyboards/0xcb/static/keymaps/bongocat/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-WPM_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/1k/keymaps/default/rgblite.h b/keyboards/1k/keymaps/default/rgblite.h
index 29d684ac081..9a7761e30de 100644
--- a/keyboards/1k/keymaps/default/rgblite.h
+++ b/keyboards/1k/keymaps/default/rgblite.h
@@ -7,8 +7,8 @@
 #include "color.h"
 
 static inline void rgblite_setrgb(RGB rgb) {
-    rgb_led_t leds[RGBLED_NUM] = {{.r = rgb.r, .g = rgb.g, .b = rgb.b}};
-    ws2812_setleds(leds, RGBLED_NUM);
+    rgb_led_t leds[RGBLIGHT_LED_COUNT] = {{.r = rgb.r, .g = rgb.g, .b = rgb.b}};
+    ws2812_setleds(leds, RGBLIGHT_LED_COUNT);
 }
 
 static void rgblite_increase_hue(void) {
diff --git a/keyboards/1k/keymaps/media/keymap.c b/keyboards/1k/keymaps/media/keymap.c
deleted file mode 100644
index 6fd3eb92dea..00000000000
--- a/keyboards/1k/keymaps/media/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2022 Makoto Kurauchi (@MakotoKurauchi)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "rgblite.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_ortho_1x1(
-    KC_MUTE
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    rgblite_increase_hue();
-  }
-  return true;
-}
-
-void keyboard_post_init_user(void) {
-  rgblite_increase_hue();
-}
diff --git a/keyboards/1k/keymaps/media/rgblite.h b/keyboards/1k/keymaps/media/rgblite.h
deleted file mode 100644
index 29d684ac081..00000000000
--- a/keyboards/1k/keymaps/media/rgblite.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2022 Makoto Kurauchi (@MakotoKurauchi)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "ws2812.h"
-#include "color.h"
-
-static inline void rgblite_setrgb(RGB rgb) {
-    rgb_led_t leds[RGBLED_NUM] = {{.r = rgb.r, .g = rgb.g, .b = rgb.b}};
-    ws2812_setleds(leds, RGBLED_NUM);
-}
-
-static void rgblite_increase_hue(void) {
-    static uint8_t state = 0;
-
-    HSV hsv = { 255, 255, 255 };
-    hsv.h = state;
-    state = (state + 8) % 256;
-
-    rgblite_setrgb(hsv_to_rgb(hsv));
-
-}
diff --git a/keyboards/1k/keymaps/media/rules.mk b/keyboards/1k/keymaps/media/rules.mk
deleted file mode 100644
index 76db8f131e8..00000000000
--- a/keyboards/1k/keymaps/media/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-WS2812_DRIVER_REQUIRED = yes
-SRC += color.c
-EXTRAKEY_ENABLE = yes
diff --git a/keyboards/1k/keymaps/tap_dance/config.h b/keyboards/1k/keymaps/tap_dance/config.h
deleted file mode 100644
index bd0163e4475..00000000000
--- a/keyboards/1k/keymaps/tap_dance/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2022 Makoto Kurauchi (@MakotoKurauchi)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define TAPPING_TERM 500
-#define PERMISSIVE_HOLD
diff --git a/keyboards/1k/keymaps/tap_dance/keymap.c b/keyboards/1k/keymaps/tap_dance/keymap.c
deleted file mode 100644
index 10449249789..00000000000
--- a/keyboards/1k/keymaps/tap_dance/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2022 Makoto Kurauchi (@MakotoKurauchi)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _BASE = 0,
-};
-
-enum {
-  TD_AB = 0
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_AB]  = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_B)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_ortho_1x1(
-    TD(TD_AB)
-  )
-};
diff --git a/keyboards/1k/keymaps/tap_dance/rules.mk b/keyboards/1k/keymaps/tap_dance/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/1k/keymaps/tap_dance/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c
deleted file mode 100644
index f78af99bf6a..00000000000
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * Layer 0
- * ,-----------------------------------------------------------------------------------------.
- * |  ~  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |  [  |  ]  |   \    |
- * |-----------------------------------------------------------------------------------------+
- * | Esc     |  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |    Shift       |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  Sup  |  L1   | Ctrl  |
- * \-----------------------------------------------------------------------------------------/
- *
- */
-  LAYOUT_all(
-    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_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_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT,
-    KC_LSFT, KC_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, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
-
-/*
- * Layer 1
- * ,-----------------------------------------------------------------------------------------.
- * |     |  f1 |  f2 |  f3 |  f4 |  f5 |  f6 |  f7 |  f8 |  f9 | f10 | f11 | f12 |    Del    |
- * |-----------------------------------------------------------------------------------------+
- * |        |     |     |     |     |     |     |     | Ins |     | Paus|     |     |  Prnt  |
- * |-----------------------------------------------------------------------------------------+
- * |         |     |     |     |     |     |  L  |  D  |  U  |  R  |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |            |     |     |     |     |     | Hom | PDn | PUp | End |     |                |
- * |-----------------------------------------------------------------------------------------+
- * |       |       |       |                                 |       |       |       |       |
- * \-----------------------------------------------------------------------------------------/
- *
- */
-  LAYOUT_all(
-    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_DEL,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, KC_PSCR,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, 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/1up60rgb/keymaps/raffle/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
deleted file mode 100644
index 453bf8c9617..00000000000
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
+++ /dev/null
@@ -1,82 +0,0 @@
-//****************************************************************************//
-// raffle's keymap for the 1up60rgb.                                          //
-//   emulates my pok3r layout and adds RGB control + firmware reset/debug     //
-//   layers                                                                   //
-//****************************************************************************//
-
-//************************ dependencies + definitions ************************//
-#include QMK_KEYBOARD_H
-
-// create names for layers
-enum layers {
-  _typing,
-  _raise,
-  _rgb,
-  _adjust
-};
-
-// define layer mods
-#define RAISE MO(_raise)
-#define RGB MO(_rgb)
-
-// define mod masks for making multi-key macros
-#define MODS_SHIFT_MASK  (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL))
-#define MODS_ALT_MASK  (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT))
-
-//********************************** Layers **********************************//
-// define layers
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // typing layer to handle basic typing
-  [_typing] = LAYOUT_all
-  (
-   QK_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_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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT,
-   KC_LSFT, KC_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,
-   RAISE, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, RGB, KC_RCTL
-   ),
-  // raise layer to handle function & nav keys
-    [_raise] = 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_DEL, KC_DEL,
-   KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_LSCR, KC_PAUSE, KC_TRNS,
-   KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, KC_DEL, KC_TRNS, KC_TRNS,
-   KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-   ),
-  // rgb layer for pretty backlight colors
-  [_rgb] = LAYOUT_all
-  (
-   RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUI, RGB_VAI, RGB_HUD, KC_NO, KC_NO, KC_NO, KC_NO,
-   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, RGB_SAI, RGB_VAD,RGB_SAD, KC_NO, KC_NO, KC_NO, KC_NO,
-   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_RMOD, 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
-   ),
-  // adjust to handle firmware debug + reset mode
-  [_adjust] = LAYOUT_all
-  (
-   QK_BOOT, DB_TOGG, 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, 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, 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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-   )
-};
-
-//***************************** Function bodies  *****************************//
-// enable tri-layer state for _raise + _rgb = _adjust
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _raise, _rgb, _adjust);
-}
-
-// support for standard mod state keys (caps lock, scroll lock, etc.)
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    DDRB |= (1 << 2); PORTB &= ~(1 << 2);
-  } else {
-    DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-  }
-  return false;
-}
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/readme.md b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/readme.md
deleted file mode 100644
index c462c206ace..00000000000
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/readme.md
+++ /dev/null
@@ -1,43 +0,0 @@
-## raffle's keymap
-The default keymap is just enough to get started. This keymap adds a pok3r-like
-raise layer, backlight RGB control layer, and firmware reset/debug adjust layer
-for ANSI layouts.
-
-In the default layer, the following modifications are made (using standard ANSI
-keys for LHS):
-
-- `CAPS` = `LCTRL`
-- `LCTRL` = `RAISE`
-- `APP` = `RGB`
-- `LCTRL` + `APP` (`RAISE` + `RGB`) = `ADJUST`
-- `GRV` = `ESC`
-
-Additionally, the pok3r's `SHIFT` + `ESC` for `~` is maintained (with either `SHIFT`).
-
-### Raise Layer
-Emulates standard pok3r layout (without the onboard macro keys)
-
-Highlights:
-
-- `IJKL` for arrow keys
-- `H`/`N` for `HOME`/`END`
-- `U`/`P` for `PGUP`/`PGDN`
-- `1` - `=` for `F1` - `F12`
-- `Y` for calculator
-
-Other standard keys from the pok3r layout are carried over. See the keymap or
-the pok3r documentation for details.
-
-### RGB Layer
-Uses navigation keys from `RAISE` layer for RGB adjustment
-
-- `I`/`K` for Value (brightness) Increase/Decrease
-- `U`/`P` for Hue (color) Increase/Decrease
-- `H`/`N` for Saturation Incrase/Decrease
-- `GRV` to toggle RGB on/off
-- `1`-`9` to activate QMK's predefined RGB animations
-
-### Adjust Layer
-
-- `GRV` activates firmware reset for flashing
-- `1` enters debug mode
diff --git a/keyboards/1upkeyboards/1upocarina/config.h b/keyboards/1upkeyboards/1upocarina/config.h
deleted file mode 100644
index 4431ef6bdbc..00000000000
--- a/keyboards/1upkeyboards/1upocarina/config.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2023 Ziptyze
- *
- * 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_MATRIX_LED_COUNT 32
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// 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
-#    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
diff --git a/keyboards/1upkeyboards/1upocarina/info.json b/keyboards/1upkeyboards/1upocarina/info.json
index c6a37180825..008896d40e8 100644
--- a/keyboards/1upkeyboards/1upocarina/info.json
+++ b/keyboards/1upkeyboards/1upocarina/info.json
@@ -41,6 +41,45 @@
         "pin": "GP24"
     },
     "rgb_matrix": {
+        "animations": {
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
         { "flags": 4, "matrix": [0, 0], "x": 23, "y": 26 },
@@ -81,7 +120,8 @@
 
         { "flags": 2, "x": 70, "y": 3 },
         { "flags": 2, "x": 91, "y": 3 }
-        ]
+        ],
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_1x5": {
diff --git a/keyboards/1upkeyboards/1upslider8/config.h b/keyboards/1upkeyboards/1upslider8/config.h
index 059d16f3fab..d65fa3daab0 100644
--- a/keyboards/1upkeyboards/1upslider8/config.h
+++ b/keyboards/1upkeyboards/1upslider8/config.h
@@ -22,8 +22,3 @@
 
 #define SLIDER_PIN GP28
 #define MIDI_ADVANCED
-
-#define RGB_MATRIX_LED_COUNT 8
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/info.json
index f2fe6510607..6b65361f673 100644
--- a/keyboards/1upkeyboards/1upslider8/info.json
+++ b/keyboards/1upkeyboards/1upslider8/info.json
@@ -95,7 +95,8 @@
             { "flags": 4, "matrix": [0, 6], "x": 84, "y": 48 },
             { "flags": 4, "matrix": [0, 7], "x": 140, "y": 48 },
             { "flags": 4, "matrix": [0, 8], "x": 196, "y": 48 }
-        ]
+        ],
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/1upkeyboards/1upsuper16v3/config.h b/keyboards/1upkeyboards/1upsuper16v3/config.h
deleted file mode 100644
index 41e1679d488..00000000000
--- a/keyboards/1upkeyboards/1upsuper16v3/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2023 ziptyze
- *
- * 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_MATRIX_LED_COUNT 48
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/1upkeyboards/1upsuper16v3/info.json b/keyboards/1upkeyboards/1upsuper16v3/info.json
index b11654a9424..7ef33a03429 100644
--- a/keyboards/1upkeyboards/1upsuper16v3/info.json
+++ b/keyboards/1upkeyboards/1upsuper16v3/info.json
@@ -127,7 +127,8 @@
             {"x": 182, "y": 1, "flags": 2},
             {"x": 154, "y": 1, "flags": 2},
             {"x": 126, "y": 1, "flags": 2}
-        ]
+        ],
+        "sleep": true
     },
     "usb": {
         "device_version": "1.0.0",
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index 361982d153e..c93b70f120f 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -10,61 +10,6 @@
 #define OLED_BRIGHTNESS 128
 #define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
 
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-// 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
-#    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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/config.h b/keyboards/1upkeyboards/pi40/grid_v1_1/config.h
deleted file mode 100644
index 00ed9f31964..00000000000
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 48
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json
new file mode 100644
index 00000000000..135c32dedeb
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/info.json
@@ -0,0 +1,51 @@
+{
+    "rgb_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "max_brightness": 150,
+        "sleep": true
+    }
+}
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/config.h b/keyboards/1upkeyboards/pi40/mit_v1_0/config.h
deleted file mode 100644
index a4d7d0e39ab..00000000000
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#define RGB_MATRIX_LED_COUNT 47
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/config.h b/keyboards/1upkeyboards/pi40/mit_v1_1/config.h
deleted file mode 100644
index a4d7d0e39ab..00000000000
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#define RGB_MATRIX_LED_COUNT 47
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi50/config.h b/keyboards/1upkeyboards/pi50/config.h
index 4c17e6a4f0b..ffdba3bd1f2 100644
--- a/keyboards/1upkeyboards/pi50/config.h
+++ b/keyboards/1upkeyboards/pi50/config.h
@@ -9,10 +9,6 @@
 #define OLED_BRIGHTNESS 128
 #define OLED_FONT_H "keyboards/1upkeyboards/pi50/lib/glcdfont.c"
 
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/1upkeyboards/pi50/grid/config.h b/keyboards/1upkeyboards/pi50/grid/config.h
deleted file mode 100644
index 0bb970a3f22..00000000000
--- a/keyboards/1upkeyboards/pi50/grid/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2023 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#define RGB_MATRIX_LED_COUNT 60
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi50/info.json b/keyboards/1upkeyboards/pi50/info.json
index 17345284cac..2a4fdef3844 100644
--- a/keyboards/1upkeyboards/pi50/info.json
+++ b/keyboards/1upkeyboards/pi50/info.json
@@ -41,7 +41,6 @@
         "driver": "ws2812",
         "max_brightness": 150,
         "animations": {
-            "solid_color": true,
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
@@ -85,7 +84,8 @@
             "multisplash": true,
             "solid_splash": true,
             "solid_multisplash": true
-        }
+        },
+        "sleep": true
     },
     "ws2812": {
         "pin": "GP0",
diff --git a/keyboards/1upkeyboards/pi50/mit/config.h b/keyboards/1upkeyboards/pi50/mit/config.h
deleted file mode 100644
index 39a6d35c05d..00000000000
--- a/keyboards/1upkeyboards/pi50/mit/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2023 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#define RGB_MATRIX_LED_COUNT 59
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h
index 6bbbb2293c0..a697e565c9b 100644
--- a/keyboards/1upkeyboards/pi60/config.h
+++ b/keyboards/1upkeyboards/pi60/config.h
@@ -3,60 +3,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 21
-//#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-//#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-//#    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
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json
index 4d0d21ea250..06abb1a4a64 100644
--- a/keyboards/1upkeyboards/pi60/info.json
+++ b/keyboards/1upkeyboards/pi60/info.json
@@ -44,6 +44,35 @@
         ]
     },
     "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 17, "y": 50},
@@ -67,7 +96,8 @@
             {"flags": 2, "x": 71, "y": 13},
             {"flags": 2, "x": 54, "y": 13},
             {"flags": 2, "x": 20, "y": 13}
-        ]
+        ],
+        "sleep": true
     },
     "community_layouts": [
         "60_ansi",
diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
index b7c4d5e8bc8..2c04274299f 100644
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ b/keyboards/1upkeyboards/pi60_hse/config.h
@@ -3,59 +3,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 16
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json
index 5b3e6b35e56..6b1fcdda411 100644
--- a/keyboards/1upkeyboards/pi60_hse/info.json
+++ b/keyboards/1upkeyboards/pi60_hse/info.json
@@ -35,6 +35,51 @@
         "rows": ["GP4", "GP3", "GP2", "GP1", "GP0", "GP21"]
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 98, "y": 51},
@@ -53,7 +98,8 @@
             {"flags": 2, "x": 183, "y": 51},
             {"flags": 2, "x": 157, "y": 51},
             {"flags": 2, "x": 126, "y": 51}
-        ]
+        ],
+        "sleep": true
     },
     "community_layouts": [
         "60_ansi_split_bs_rshift"
diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h
index b0747bd56d8..2c04274299f 100644
--- a/keyboards/1upkeyboards/pi60_rgb/config.h
+++ b/keyboards/1upkeyboards/pi60_rgb/config.h
@@ -3,61 +3,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 61
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125
-// 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
-#    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
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json
index 68634f4da1f..044e0e3b4b7 100644
--- a/keyboards/1upkeyboards/pi60_rgb/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb/info.json
@@ -38,6 +38,51 @@
         "enabled": true
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [5, 5], "x": 103, "y": 58},
@@ -101,7 +146,9 @@
             {"flags": 4, "matrix": [0, 11], "x": 172, "y": 7},
             {"flags": 4, "matrix": [0, 12], "x": 187, "y": 7},
             {"flags": 1, "matrix": [0, 13], "x": 209, "y": 7}
-        ]
+        ],
+        "max_brightness": 125,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/info.json b/keyboards/1upkeyboards/pi60_rgb_v2/info.json
new file mode 100644
index 00000000000..88b3e1ced4a
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/info.json
@@ -0,0 +1,258 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "pi60_rgb_v2",
+    "maintainer": "ziptyze",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5612",
+        "vid": "0x6F75"
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true,
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["GP25", "GP1", "GP15", "GP4", "GP5", "GP14", "GP6", "GP7", "GP8", "GP13", "GP12", "GP9", "GP11", "GP10"],
+        "rows": ["GP29", "GP27", "GP26", "GP17", "GP16"]
+    },
+    "rgb_matrix": {
+        "max_brightness": 125,
+        "sleep": true,
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"x": 4, "y": 5, "flags": 2},
+            {"matrix": [0, 0], "x": 8, "y": 7, "flags": 1},
+            {"matrix": [0, 1], "x": 23, "y": 7, "flags": 4},
+            {"x": 30, "y": 7, "flags": 2},
+            {"matrix": [0, 2], "x": 37, "y": 7, "flags": 4},
+            {"x": 45, "y": 7, "flags": 2},
+            {"matrix": [0, 3], "x": 52, "y": 7, "flags": 4},
+            {"x": 60, "y": 7, "flags": 2},
+            {"matrix": [0, 4], "x": 67, "y": 7, "flags": 4},
+            {"x": 75, "y": 7, "flags": 2},
+            {"matrix": [0, 5], "x": 82, "y": 7, "flags": 4},
+            {"x": 90, "y": 7, "flags": 2},
+            {"matrix": [0, 6], "x": 97, "y": 7, "flags": 4},
+            {"x": 105, "y": 7, "flags": 2},
+            {"matrix": [0, 7], "x": 112, "y": 7, "flags": 4},
+            {"x": 120, "y": 7, "flags": 2},
+            {"matrix": [0, 8], "x": 127, "y": 7, "flags": 4},
+            {"x": 135, "y": 7, "flags": 2},
+            {"matrix": [0, 9], "x": 142, "y": 7, "flags": 4},
+            {"x": 149, "y": 7, "flags": 2},
+            {"matrix": [0, 10], "x": 157, "y": 7, "flags": 4},
+            {"x": 164, "y": 7, "flags": 2},
+            {"matrix": [0, 11], "x": 172, "y": 7, "flags": 4},
+            {"x": 179, "y": 7, "flags": 2},
+            {"matrix": [0, 12], "x": 187, "y": 7, "flags": 4},
+            {"x": 198, "y": 7, "flags": 2},
+            {"matrix": [0, 13], "x": 209, "y": 7, "flags": 1},
+            {"x": 220, "y": 7, "flags": 2},
+            {"x": 220, "y": 19, "flags": 2},
+            {"matrix": [1, 13], "x": 213, "y": 19, "flags": 1},
+            {"matrix": [1, 12], "x": 194, "y": 19, "flags": 4},
+            {"matrix": [1, 11], "x": 179, "y": 19, "flags": 4},
+            {"matrix": [1, 10], "x": 164, "y": 19, "flags": 4},
+            {"matrix": [1, 9], "x": 149, "y": 19, "flags": 4},
+            {"matrix": [1, 8], "x": 134, "y": 19, "flags": 4},
+            {"matrix": [1, 7], "x": 119, "y": 19, "flags": 4},
+            {"matrix": [1, 6], "x": 105, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 90, "y": 19, "flags": 4},
+            {"matrix": [1, 4], "x": 75, "y": 19, "flags": 4},
+            {"matrix": [1, 3], "x": 60, "y": 19, "flags": 4},
+            {"matrix": [1, 2], "x": 45, "y": 19, "flags": 4},
+            {"matrix": [1, 1], "x": 30, "y": 19, "flags": 4},
+            {"matrix": [1, 0], "x": 11, "y": 19, "flags": 1},
+            {"x": 4, "y": 19, "flags": 2},
+            {"x": 4, "y": 32, "flags": 2},
+            {"matrix": [2, 0], "x": 13, "y": 32, "flags": 1},
+            {"matrix": [2, 1], "x": 34, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 49, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 64, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 79, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 94, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 123, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 138, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 153, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 168, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 183, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 207, "y": 32, "flags": 1},
+            {"x": 220, "y": 32, "flags": 2},
+            {"x": 220, "y": 45, "flags": 2},
+            {"matrix": [3, 13], "x": 203, "y": 45, "flags": 1},
+            {"matrix": [3, 10], "x": 175, "y": 45, "flags": 4},
+            {"matrix": [3, 9], "x": 161, "y": 45, "flags": 4},
+            {"matrix": [3, 8], "x": 146, "y": 45, "flags": 4},
+            {"matrix": [3, 7], "x": 135, "y": 45, "flags": 4},
+            {"matrix": [3, 6], "x": 116, "y": 45, "flags": 4},
+            {"matrix": [3, 5], "x": 101, "y": 45, "flags": 4},
+            {"matrix": [3, 4], "x": 86, "y": 45, "flags": 4},
+            {"matrix": [3, 3], "x": 71, "y": 45, "flags": 4},
+            {"matrix": [3, 2], "x": 56, "y": 45, "flags": 4},
+            {"matrix": [3, 1], "x": 41, "y": 45, "flags": 4},
+            {"matrix": [3, 0], "x": 17, "y": 45, "flags": 1},
+            {"x": 4, "y": 45, "flags": 2},
+            {"x": 4, "y": 57, "flags": 2},
+            {"matrix": [4, 0], "x": 9, "y": 57, "flags": 1},
+            {"x": 15, "y": 57, "flags": 2},
+            {"x": 23, "y": 57, "flags": 2},
+            {"matrix": [4, 1], "x": 28, "y": 57, "flags": 1},
+            {"x": 34, "y": 57, "flags": 2},
+            {"x": 41, "y": 57, "flags": 2},
+            {"matrix": [4, 2], "x": 47, "y": 57, "flags": 1},
+            {"x": 53, "y": 57, "flags": 2},
+            {"x": 67, "y": 57, "flags": 2},
+            {"x": 71, "y": 57, "flags": 1},
+            {"x": 81, "y": 57, "flags": 2},
+            {"x": 95, "y": 57, "flags": 2},
+            {"matrix": [4, 5], "x": 103, "y": 57, "flags": 1},
+            {"x": 110, "y": 57, "flags": 2},
+            {"x": 125, "y": 57, "flags": 2},
+            {"x": 134, "y": 57, "flags": 1},
+            {"x": 139, "y": 57, "flags": 2},
+            {"x": 153, "y": 57, "flags": 2},
+            {"matrix": [4, 9], "x": 159, "y": 57, "flags": 1},
+            {"x": 165, "y": 57, "flags": 2},
+            {"x": 172, "y": 57, "flags": 2},
+            {"matrix": [4, 10], "x": 177, "y": 57, "flags": 1},
+            {"x": 183, "y": 57, "flags": 2},
+            {"x": 190, "y": 57, "flags": 2},
+            {"matrix": [4, 12], "x": 196, "y": 57, "flags": 1},
+            {"x": 202, "y": 57, "flags": 2},
+            {"x": 209, "y": 57, "flags": 2},
+            {"matrix": [4, 13], "x": 215, "y": 57, "flags": 1},
+            {"x": 220, "y": 57, "flags": 2}
+        ]
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP28"
+    },
+    "community_layouts" : ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "BS", "matrix": [0, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "RAlt", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4},
+                {"label": "RGui", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "FN", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "RCtrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..88f17a44e9f
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 ziptyze
+ *
+ * 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_60_ansi(
+         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_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, KC_APP,  KC_RCTL
+    )
+};
diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..5ed2ca48cde
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2022 ziptyze
+ *
+ * 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_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(1), KC_RCTL
+    ),
+
+    [1] = 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,
+        KC_TRNS, KC_TRNS,   KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
+        KC_TRNS,          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS,   MO(2), KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT_60_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,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                         KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/rules.mk b/keyboards/1upkeyboards/pi60_rgb_v2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/rules.mk
rename to keyboards/1upkeyboards/pi60_rgb_v2/keymaps/via/rules.mk
diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/readme.md b/keyboards/1upkeyboards/pi60_rgb_v2/readme.md
new file mode 100644
index 00000000000..87dc3f50305
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/readme.md
@@ -0,0 +1,24 @@
+# 1up pi60 rgb v2
+
+![1up pi60 rgb v2](https://i.imgur.com/H1tRGZh.png)
+
+The pi60 RGB v2 is a 60% pcb from 1upkeyboards. This keyboard features an ANSI layout hot swap PCB with per-key in-switch RGB lighting as well as RGB underglow. The controller is a Raspberry Pi rp2040 microcontroller.
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/pi60_rgb_v2:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/pi60_rgb_v2: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:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Bootloader button**: Hold the button on the back of the PCB and plug in the keyboard
diff --git a/keyboards/era/klein/rules.mk b/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk
similarity index 100%
rename from keyboards/era/klein/rules.mk
rename to keyboards/1upkeyboards/pi60_rgb_v2/rules.mk
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 7a5c6e0e833..043d8b154b1 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -17,61 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGB_MATRIX_LED_COUNT 16
-#    ifdef RGB_MATRIX_ENABLE
-#        define RGB_MATRIX_KEYPRESSES   // reacts to keypresses
-#        define RGB_MATRIX_FRAMEBUFFER_EFFECTS  // reacts to keyreleases (instead of 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
-#        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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index 6d63921f1b9..81b28c66557 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -30,6 +30,51 @@
     }
   },
   "rgb_matrix": {
+    "animations": {
+        "alphas_mods": true,
+        "gradient_up_down": true,
+        "gradient_left_right": true,
+        "breathing": true,
+        "band_sat": true,
+        "band_val": true,
+        "band_pinwheel_sat": true,
+        "band_pinwheel_val": true,
+        "band_spiral_sat": true,
+        "band_spiral_val": true,
+        "cycle_all": true,
+        "cycle_left_right": true,
+        "cycle_up_down": true,
+        "rainbow_moving_chevron": true,
+        "cycle_out_in": true,
+        "cycle_out_in_dual": true,
+        "cycle_pinwheel": true,
+        "cycle_spiral": true,
+        "dual_beacon": true,
+        "rainbow_beacon": true,
+        "rainbow_pinwheels": true,
+        "raindrops": true,
+        "jellybean_raindrops": true,
+        "hue_breathing": true,
+        "hue_pendulum": true,
+        "hue_wave": true,
+        "pixel_rain": true,
+        "pixel_flow": true,
+        "pixel_fractal": true,
+        "typing_heatmap": true,
+        "digital_rain": true,
+        "solid_reactive_simple": true,
+        "solid_reactive": true,
+        "solid_reactive_wide": true,
+        "solid_reactive_multiwide": true,
+        "solid_reactive_cross": true,
+        "solid_reactive_multicross": true,
+        "solid_reactive_nexus": true,
+        "solid_reactive_multinexus": true,
+        "splash": true,
+        "multisplash": true,
+        "solid_splash": true,
+        "solid_multisplash": true
+    },
     "driver": "ws2812"
   },
   "matrix_pins": {
diff --git a/keyboards/1upkeyboards/super16/keymaps/15game/keymap.c b/keyboards/1upkeyboards/super16/keymaps/15game/keymap.c
deleted file mode 100644
index e92a9fc10d9..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/15game/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright 2020 Sam Reinehr
- *
- * 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 my_keycodes {
-    K00 = SAFE_RANGE,
-    K01,
-    K02,
-    K03,
-    K04,
-    K05,
-    K06,
-    K07,
-    K08,
-    K09,
-    K10,
-    K11,
-    K12,
-    K13,
-    K14,
-    K15,
-};
-/* just a simple way to give each key a unique code */
-//clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [0] = LAYOUT_ortho_4x4(
-        K00, K01, K02, K03,
-        K04, K05, K06, K07,
-        K08, K09, K10, K11,
-        K12, K13, K14, K15
-    )
-};
-/* flags describing current free square/0 */
-uint8_t current = 0;
-/* r g and b describe the colors for the initial map,
-currently blank for free, and evenly spaced hues with maximum sat/value  */
-const uint8_t r[16] = {
-    0x00, 0xFF, 0xFF, 0xFF,
-    0xCC, 0x66, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00,
-    0x66, 0xCC, 0xFF, 0xFF
-};
-const uint8_t g[16] = {
-    0x00, 0x00, 0x66, 0xCC,
-    0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xCC, 0x66, 0x00,
-    0x00, 0x00, 0x00, 0x00
-};
-const uint8_t b[16] = {
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x66,
-    0xCC, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xCC, 0x66
-};
-/* pos contains the current positions, could technically be compressed to 4 bits per, but not worth it
-   index into pos is the position we're looking at, output is the tile that is currently there */
-uint8_t tiles[16] = {
-    0, 1, 2, 3,
-    4, 5, 6, 7,
-    8, 9, 10, 11,
-    12, 13, 14, 15
-};
-/* default led array for super 16 has them in a snake, so we must do some remapping/flipping of the 2nd and 4th rows */
-uint8_t remap[16] = {
-    0, 1, 2, 3,
-    7, 6, 5, 4,
-    8, 9, 10, 11,
-    15, 14, 13, 12
-};
-//clang-format on
-/* function to refresh the led coloring with the positions with current tiles */
-void refresh_leds(void) {
-    for (uint8_t index = 0; index < 16; ++index) {
-        uint8_t tile = tiles[index];
-        setrgb(r[tile], g[tile], b[tile], (rgb_led_t *)&led[remap[index]]);
-    }
-    rgblight_set();
-}
-void keyboard_post_init_user(void) {
-    rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_enable_noeeprom();
-    refresh_leds();
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint8_t offset = keycode - K00;
-    uint8_t x      = offset & 0x03;
-    uint8_t y      = (offset & 0x0C) >> 2;
-    /* if the adjacent space exists and is empty, */
-    if ((x > 0 && 0 == tiles[offset - 1]) || (y > 0 && 0 == tiles[offset - 4]) || (x < 3 && 0 == tiles[offset + 1]) || (y < 3 && 0 == tiles[offset + 4])) {
-        /* set the currently blank tile to this tile, and make this one blank */
-        tiles[current] = tiles[offset];
-        tiles[offset]  = 0;
-        current        = offset;
-    }
-    refresh_leds();
-    return false;
-}
diff --git a/keyboards/1upkeyboards/super16/keymaps/15game/readme.md b/keyboards/1upkeyboards/super16/keymaps/15game/readme.md
deleted file mode 100644
index ede6bdd1522..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/15game/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Trying to put a game that plays like the 15 puzzle on the super16
-The 15/16 puzzle consists of a grid where one space is free, and adjacent spaces can be swapped with the free space 
-* future planned features:
-* fix the start at red
-* have a cute animation play when the puzzle is solved
diff --git a/keyboards/1upkeyboards/super16/keymaps/15game/rules.mk b/keyboards/1upkeyboards/super16/keymaps/15game/rules.mk
deleted file mode 100644
index 03198637f17..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/15game/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-RGB_MATRIX_ENABLE = no
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/ahk_companion.ahk b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/ahk_companion.ahk
deleted file mode 100644
index becab49e5cc..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/ahk_companion.ahk
+++ /dev/null
@@ -1,104 +0,0 @@
-#Persistent
-#SingleInstance force
-
-;=================================================================
-;                      Macro Pad Shortcuts                       ;
-;=================================================================
-
-;=================================================================
-;                       Layer 0
-;;=================================================================
-;Row 1
-
-F13::Send a
-F14::Send b
-F15::Send c
-F16::Send d
-
-;Row 2
-
-F17::Send e
-F18::Send f
-F19::Send g
-F20::Send h
-
-;Row 3
-
-F21::Send i
-F22::Send j
-F23::Send k
-F24::Send l
-
-
-;=================================================================
-;                       Layer 1
-;;=================================================================
-;Row 1
-
-!F13::Send m
-!F14::Send n
-!F15::Send o
-!F16::Send p
-
-;Row 2
-
-!F17::Send q
-!F18::Send r
-!F19::Send s
-!F20::Send t
-
-;Row 3
-
-!F21::Send u
-!F22::Send v
-!F23::Send w
-!F24::Send x
-
-
-;=================================================================
-;                       Layer 2
-;;=================================================================
-;Row 1
-
-+F13::Send y
-+F14::Send z
-+F15::Send A
-+F16::Send B
-
-;Row 2
-
-+F17::Send C
-+F18::Send D
-+F19::Send E
-+F20::Send F
-
-;Row 3
-
-+F21::Send G
-+F22::Send H
-+F23::Send I
-+F24::Send J
-
-;=================================================================
-;                       Layer 3
-;;=================================================================
-;Row 1
-
-^F13::Send K
-^F14::Send L
-^F15::Send M
-^F16::Send N
-
-;Row 2
-
-^F17::Send O
-^F18::Send P
-^F19::Send Q
-^F20::Send R
-
-;Row 3
-
-^F21::Send S
-^F22::Send T
-^F23::Send U
-^F24::Send V
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/config.h b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/config.h
deleted file mode 100644
index 3b7fd81d698..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-// Time out one shot layers after 3 seconds
-#define ONESHOT_TIMEOUT 3000
-
-#define RGBLED_NUM 16
-
-// Undef and redefine default brightness to half of 255
-#undef RGBLIGHT_LIMIT_VAL
-#define RGBLIGHT_LIMIT_VAL 128
-
-//Define a preview timeout for RGB reviews
-#define PREVIEW_TIMEOUT 5000
-#define TAPPING_TERM 200
-
-// Enable Light Layers implementation
-#define RGBLIGHT_LAYERS
-// Allow Light Layers to override RGB off configuration
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
deleted file mode 100644
index a326abcf832..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-static uint32_t rgb_preview_timer = 0;
-#endif
-extern rgblight_config_t rgblight_config;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        //Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3 or Toggle Layer 4)
-        [0] = LAYOUT_ortho_4x4(
-                KC_F13, KC_F14, KC_F15, KC_F16,
-                KC_F17, KC_F18, KC_F19, KC_F20,
-                KC_F21, KC_F22, KC_F23, KC_F24,
-                OSL(1), OSL(2), OSL(3), TG(4)    //Transparent to let you go between layers
-		),
-
-        [1] = LAYOUT_ortho_4x4(
-                LALT(KC_F13), LALT(KC_F14), LALT(KC_F15), LALT(KC_F16),
-                LALT(KC_F17), LALT(KC_F18), LALT(KC_F19), LALT(KC_F20),
-                LALT(KC_F21), LALT(KC_F22), LALT(KC_F23), LALT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 2 - Shift + Function Key Layer
-        [2] = LAYOUT_ortho_4x4(
-                LSFT(KC_F13), LSFT(KC_F14), LSFT(KC_F15), LSFT(KC_F16),
-                LSFT(KC_F17), LSFT(KC_F18), LSFT(KC_F19), LSFT(KC_F20),
-                LSFT(KC_F21), LSFT(KC_F22), LSFT(KC_F23), LSFT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 3 - Control + Function Key
-        [3] = LAYOUT_ortho_4x4(
-                LCTL(KC_F13), LCTL(KC_F14), LCTL(KC_F15), LCTL(KC_F16),
-                LCTL(KC_F17), LCTL(KC_F18), LCTL(KC_F19), LCTL(KC_F20),
-                LCTL(KC_F21), LCTL(KC_F22), LCTL(KC_F23), LCTL(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 4 - Multimedia
-        [4] = LAYOUT_ortho_4x4(
-                KC_MPRV, KC_MPLY, KC_MNXT,   KC_VOLU,
-                KC_NO,   KC_NO,   KC_NO,     KC_MUTE,
-                KC_NO,   QK_BOOT, EE_CLR,    KC_VOLD,
-                TG(5),   KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 5 - Keyboard Lights, Programming and Special Functions
-        [5] = LAYOUT_ortho_4x4(
-                RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
-                RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_LSFT,
-                KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        ),
-};
-
-const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_ORANGE}
-	);
-const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_GREEN}
-	);
-const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_RED}
-	);
-const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_BLUE}
-	);
-const rgblight_segment_t PROGMEM my_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_WHITE}
-	);
-const rgblight_segment_t PROGMEM my_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_TEAL}
-	);
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-        my_layer0_layer,
-		my_layer1_layer,
-		my_layer2_layer,
-		my_layer3_layer,
-		my_layer4_layer,
-        my_layer5_layer
-	);
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Allow for a preview of changes when modifying RGB
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-  switch (keycode) {
-    case RGB_TOG ... QK_VELOCIKEY_TOGGLE:
-      for (uint8_t i = 0; i < RGBLIGHT_MAX_LAYERS; i++) {
-        rgblight_set_layer_state(i, false);
-      }
-      rgb_preview_timer = timer_read32();
-      break;
-  }
-# endif
-  return;
-}
-
-//Set the appropriate layer color
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 3));
-    rgblight_set_layer_state(4, layer_state_cmp(state, 4));
-    rgblight_set_layer_state(5, layer_state_cmp(state, 5));
-    return state;
-}
-
-void keyboard_post_init_user(void) {
-	//Enable the LED layers
-	rgblight_layers = my_rgb_layers;
-	layer_state_set_user(layer_state);
-}
-
-void matrix_scan_user(void) {
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-    // Allow preview for
-    if (rgb_preview_timer && TIMER_DIFF_32(timer_read32(), rgb_preview_timer) > PREVIEW_TIMEOUT) {
-        rgb_preview_timer = 0;
-        default_layer_state_set_user(default_layer_state);
-        layer_state_set_user(layer_state);
-        led_update_user((led_t) host_keyboard_leds());
-    }
-# endif
-}
-
-//EEPROM Reset Function
-void eeconfig_init_user(void) {
-  rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv(HSV_ORANGE);  // Set it to orange by default
-}
-
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/readme.md b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/readme.md
deleted file mode 100644
index 7a0107c994c..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/readme.md
+++ /dev/null
@@ -1,58 +0,0 @@
-## AutoHotKey Companion  ##
-
-### Overview ### 
-AutoHotKey Companion Keymap for <a href="https://www.1upkeyboards.com/shop/keyboard-kits/macro-pads/super-16-macro-pad/">1upkeyboards Super16</a> is designed be a quick and easy way to get started with AutoHotKey and to provide a foundation for customizing your own macropad. I chose the Super16 because it provided an easy way (RGB) to identify what layer I was on with a quick glance or peripheral vision. The F13 to F24 keys were selected as they are rarely used so you won't run into conflicts with existing application shortcuts and AutoHotKey recognizes them without any issues. 
-
-Same functionality can be accomplished with other similar applications on the host system like Keyboard Maestro, AutoIt, etc. 
-
-* <a href="https://www.autohotkey.com">AutoHotKey</a>(Windows)
-* <a href="https://www.autoitscript.com/site/autoit/">AutoIT</a> (Windows)
-* <a href="https://www.keyboardmaestro.com/main/">Keyboard Maestro</a>(Mac)
-* <a href="https://github.com/autokey/autokey">AutoKey</a>(Linux)
-
-This keymap allows for a total of 48 Function/Macro keys that are accessible within 2 sequential key presses (or more when extended with your own code and additional layers) 
-
-### Alternate Implementations ###
-I chose to use <a href="https://docs.qmk.fm/#/feature_layers?id=switching-and-toggling-layers">QMK OSL</a> (One Shot Layer) functionality to avoid having to hold a key while selecting the next key and to have my layers always go back to the default layer as the starting point. This also helps me avoid having to cognitively remember what layer I am on. 
-
-If persistent behavior is prefered, OSL can be swapped for TG which will toggle the layer on/off with a key press instead of clearing the layer once the Function key is pressed. This is useful if a layer contains several keys that need to be used in sequence. I also added a OSL timeout of 3 seconds, so that if the key is not pressed within 3 seconds the layer will go back to default. This can be adjusted in the config.h file by increasing 3000 to a desired value: `#define ONESHOT_TIMEOUT 3000` 
-
-
-
-
-### Layers ###
-
-While the first 5 layers are accessible with only 1 key press at most, the 5th (less frequently used) layer is accessed by first going to the 4th layer, which makes the TG(5) button available on the bottom left. Space for additional 2 more layer toggles is available on the 2 middle buttons on the bottom row. Please refer to the layer diagrams.
-
-
-* Layer 0 (Base Layer) - the default layer and functions like sending the F13 to F24 keys along with the bottom row to activate another 4 layers. 
-
-    ![Image of Base Layer ](https://i.imgur.com/0LhityX.png)
-
-* Layer 1 (Alt Layer) - Equivalent to Alt+Fxx key being pressed 
-
-    ![Image of Layer 1 ](https://i.imgur.com/ZblqLZt.png)
-
-* Layer 2 (Shift Layer) - Equivalent to Shift+Fxx key being pressed
-
-    ![Image of Layer 2 ](https://i.imgur.com/ZQHwLC0.png)
-
-* Layer 3 (Control Layer) - Equivalent to Ctrl+Fxx key being pressed
-
-    ![Image of Layer 3 ](https://i.imgur.com/JkM8bqV.png)
-
-* Layer 4 (Config Layer) - Layer for multimedia. You can replace the KC_TRNS on this layer in keymap.c to TG(x) to enable additional layers.
-
-    ![Image of Layer 4 ](https://i.imgur.com/srDp5Lv.png)
-    
-* Layer 5 (RGB Control/QMK) - RGB control layer and Quantum functions (Reset, EEPROM Reset, )
-
-    ![Image of Layer 5 ](https://i.imgur.com/Os3n8dx.png)
-    
-### Host Configuration ### 
-
-Once the keymap has been flashed to the Super16, you can download the accompanying AutoHotKey file or create your own and have it start automatically either via a Windows Task or another way. Using AutoHotKey allows adjustment of functionality of the buttons without the need to change your map and reflash the macropad every time.
-Starting the AHK file can be done either by:
-* Creating a Windows Task 
-* Adding the AHK to the startup folder
-* Launch manually
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/rules.mk b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/rules.mk
deleted file mode 100644
index b5bd51b3270..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGB_MATRIX_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/config.h b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/config.h
deleted file mode 100644
index 3d03512888b..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// Time out one shot layers after 3 seconds
-#define ONESHOT_TIMEOUT 3000
-
-#define RGBLED_NUM 16
-
-
-// Undef and redefine default brightness to half of 255
-#undef RGBLIGHT_LIMIT_VAL
-#define RGBLIGHT_LIMIT_VAL 128
-
-#define TAPPING_TERM 200
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
deleted file mode 100644
index 514b8b7a73c..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include QMK_KEYBOARD_H
-
-uint16_t copy_paste_timer;
-uint16_t enter_timer;
-
-extern rgblight_config_t rgblight_config;
-
-// Define custom keycodes
-enum my_keycodes {
-	KC_CCCV = SAFE_RANGE,
-	KC_2ENTER
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        //Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3,4)
-        [0] = LAYOUT_ortho_4x4(
-                KC_F13, KC_F14, KC_F15, KC_F16,
-                KC_F17, KC_CCCV, KC_F19, KC_F20,
-                KC_F21, KC_F22, KC_F23, KC_2ENTER,
-                OSL(1), OSL(2), OSL(3), TG(4)    //Transparent to let you go between layers
-		),
-
-        [1] = LAYOUT_ortho_4x4(
-                LALT(KC_F13), LALT(KC_F14), LALT(KC_F15), LALT(KC_F16),
-                LALT(KC_F17), LALT(KC_F18), LALT(KC_F19), LALT(KC_F20),
-                LALT(KC_F21), LALT(KC_F22), LALT(KC_F23), LALT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 2 - Shift + Function Key Layer
-        [2] = LAYOUT_ortho_4x4(
-                LSFT(KC_F13), LSFT(KC_F14), LSFT(KC_F15), LSFT(KC_F16),
-                LSFT(KC_F17), LSFT(KC_F18), LSFT(KC_F19), LSFT(KC_F20),
-                LSFT(KC_F21), LSFT(KC_F22), LSFT(KC_F23), LSFT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 3 - Control + Function Key
-        [3] = LAYOUT_ortho_4x4(
-                LCTL(KC_F13), LCTL(KC_F14), LCTL(KC_F15), LCTL(KC_F16),
-                LCTL(KC_F17), LCTL(KC_F18), LCTL(KC_F19), LCTL(KC_F20),
-                LCTL(KC_F21), LCTL(KC_F22), LCTL(KC_F23), LCTL(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 4 - Keyboard Lights. Programming and Special Functions
-        [4] = LAYOUT_ortho_4x4(
-                KC_MPRV, KC_MPLY, KC_MNXT,   KC_VOLU,
-                RGB_TOG, RGB_MOD, RGB_RMOD,  KC_MUTE,
-                TO(0),   QK_BOOT, EE_CLR,    KC_VOLD,
-                KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        ),
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_CCCV:  // One key copy/paste
-            if (record->event.pressed) {
-                copy_paste_timer = timer_read();
-            } else {
-                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
-                    tap_code16(LCTL(KC_C));
-                } else {  // Tap, paste
-                    tap_code16(LCTL(KC_V));
-                }
-            } return true;
-		case KC_2ENTER:
-		    if (record->event.pressed) {
-                enter_timer = timer_read();
-            } else {
-                if (timer_elapsed(enter_timer) > TAPPING_TERM) {  // Hold, shift+enter
-                    tap_code16(LSFT(KC_ENTER));
-                } else {  // Tap, enter
-                    tap_code16(KC_F24);
-                }
-            } 
-			return true;
-        default:
-            return true;
-    }
-}
-
-
-void keyboard_post_init_user(void) {
-	//Enable the LED layers
-	layer_state_set_user(layer_state);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  rgblight_sethsv_noeeprom(HSV_WHITE);
-  switch(get_highest_layer(state)) {
-  case 1:
-    // Green
-    rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom(HSV_GREEN);
-    break;
-  case 2:
-    // Red
-    rgblight_enable_noeeprom();	
-    rgblight_sethsv_noeeprom(HSV_RED);
-    break;
-  case 3:
-    // Blue
-    rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom(HSV_BLUE);
-    break;
-  case 4:
-    // Orange
-    rgblight_enable_noeeprom();
-//    rgblight_sethsv_noeeprom(HSV_PURPLE);
-    rgblight_sethsv_noeeprom(HSV_ORANGE);
-    break;
-  default:
-    // White
-    //Read RGB Light State
-    rgblight_config.raw = eeconfig_read_rgblight();
-    //If enabled, set white
-    if (rgblight_config.enable) {
-		rgblight_sethsv_noeeprom(HSV_WHITE);
-	} else { //Otherwise go back to disabled
-		rgblight_disable_noeeprom();
-	}
-    break;
-}
-return state;
-}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/readme.md b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/readme.md
deleted file mode 100644
index 5ae101b5359..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Nick B's Super16 keymap
-
-A modification of the default keymap to include layer indicators with RGB
-* Added a time out of 3 seconds to 1 shot layers
-* Reduced brightness to half to reduce power draw
-* Added a one key copy/paste keycode  
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/rules.mk b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/rules.mk
deleted file mode 100644
index b5bd51b3270..00000000000
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGB_MATRIX_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 73d8badc5e5..67af6d7cab8 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -16,64 +16,8 @@
 
 #pragma once
 
-
 #define MOUSEKEY_MOVE_DELTA 25
 
-#define RGB_MATRIX_LED_COUNT 20
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-// 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
-//#    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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
index c4bdc441eed..20a06f4c5ec 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -12,7 +12,42 @@
       "pin": "B5"
     },
     "rgb_matrix": {
-      "driver": "ws2812"
+        "animmations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "splash": true
+      },
+      "driver": "ws2812",
+      "sleep": true
     },
     "matrix_pins": {
       "cols": ["D5", "D6", "C2", "D0"],
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c
deleted file mode 100644
index 8888fe35e43..00000000000
--- a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* 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_TRNS,    KC_DELETE,    KC_BACKSPACE,    KC_MUTE,
-    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
-    MO(1),    KC_P0,    KC_PDOT,  KC_BTN3
-  ),
-
-  [1] = LAYOUT_ortho_4x4( /* Fn Layer */
-    RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
-    RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
-    RGB_SPD,   RGB_SPI,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,    KC_TRNS,    QK_BOOT
-  ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code_delay(KC_MS_RIGHT, 10);
-        } else {
-            tap_code_delay(KC_MS_LEFT, 10);
-        }
-    } else if (index == 1) { /* Second encoder */
-        if (clockwise) {
-            tap_code_delay(KC_AUDIO_VOL_UP, 10);
-        } else {
-            tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
-        }
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md
deleted file mode 100644
index e229fcba740..00000000000
--- a/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for Super 16 V2
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
deleted file mode 100644
index 5305d0ad051..00000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
- num,
- extra,
- mouse
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [num] = LAYOUT_numpad_4x4(
-        KC_P7,   KC_P8,  KC_P9,  LT(extra, KC_PPLS),
-        KC_P4,   KC_P5,  KC_P6,
-        KC_P1,   KC_P2,  KC_P3,  KC_PENT,
-             LT(mouse, KC_P0),      KC_DOT
-    ),
-
- [extra] = LAYOUT_numpad_4x4(
-        KC_PSLS,   KC_PAST,  KC_PMNS,  KC_TRNS,
-        KC_BSPC,   KC_EXECUTE,  KC_DEL,
-        KC_LPRN,   KC_RPRN,  KC_PEQL,  KC_PENT,
-             KC_TAB,      KC_NUM
-    ),
-
-
-[mouse] = LAYOUT_numpad_4x4(
-        KC_WH_D,   KC_MS_U,  KC_WH_U,  LT(extra, KC_PPLS),
-        KC_MS_L,   KC_MS_D,  KC_MS_R,
-        KC_BTN1,   KC_BTN2,  KC_BTN3,  KC_PENT,
-             KC_TRNS,      KC_DOT
-    )
-
-
-
-
-};
-
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/readme.md b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/readme.md
deleted file mode 100644
index aabcf82c611..00000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dale's keymap for the Sweet16
-
-I wanted to reuse a standard numpad keyset and have the full functionality of an larger numpad with a nod to Excel functionality.
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
deleted file mode 100644
index 161b46c814e..00000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-/* tap dance stuff*/
-#undef TAPPING_TERM
-#define TAPPING_TERM 500
-#define PERMISSIVE_HOLD
-
-#define TAPPING_TOGGLE 2
-
-#define EXAMPLESTRING1 "tapdance_1"
-#define EXAMPLESTRING2 "tapdance_2"
-#define EXAMPLESTRING3 "tapdance_3"
-#define EXAMPLESTRING4 "tapdance_4"
-
-#undef RGBLED_NUM
-#define RGBLED_NUM 16
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
deleted file mode 100644
index 2e7505ec1c6..00000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-tap danc eis turned on in the rules now...
-*/
-#include QMK_KEYBOARD_H
-
-#define _EMOJI 0
-#define _TAPLAND 1
-#define _LEDCNTL 2
-
-enum custom_keycodes {
-    SHRUG,
-    DISFACE,
-    FU,
-    TFLIP,
-    TFLIP2,
-    SAD_EYES,
-    TPUT,
-    HAPPYFACE,
-    HEARTFACE,
-    CLOUD,
-    CHANFACE,
-    CMDCLEAR
-};
-//Tap Dance Declarations
-enum {
-  TD_EXAMPLE1 = 0,
-  TD_EXAMPLE2,
-  TD_EXAMPLE3,
-  TD_EXAMPLE4
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* EMOJI Pad
-    * ,-------------------------------.
-    * |TFLIP | TFlIP2|DISFACE|   FU   |
-    * |------+-------+-------+--------|
-    * | CLOUD|       |       | CLEAR  |
-    * |------+-------+-------+--------|
-    * |SHRUG |DISFACE| HRTFAC| HAPPYF |
-    * |------+-------+-------+--------|
-    * | ENTER|       |LEDCNTR| tapland|
-    * `-------------------------------'
-    */
-      //purple
-    [_EMOJI] = LAYOUT_ortho_4x4(
-       TFLIP,   TFLIP2,   KC_NO,      FU ,
-       CLOUD,   KC_NO,  KC_NO,      CMDCLEAR,
-       SHRUG,   DISFACE,  HEARTFACE,    HAPPYFACE,
-       KC_ENT,  RGB_TOG,  MO(_LEDCNTL), MO(_TAPLAND)
-    ),
-
-    /* TapLand //
-    * ,-------------------------------.
-    * | str1 | str2  |  str3 |   str4 |
-    * |------+-------+-------+--------|
-    * |      |       |       |        |
-    * |------+-------+-------+--------|
-    * |      |       |       |        |
-    * |------+-------+-------+--------|
-    * |      |       |       |        |
-    * `-------------------------------'
-    */
-    //blue
-    [_TAPLAND] = LAYOUT_ortho_4x4(
-       TD(TD_EXAMPLE1), TD(TD_EXAMPLE2),  TD(TD_EXAMPLE3), TD(TD_EXAMPLE4),
-       KC_NO,         KC_NO,          KC_NO,         KC_NO,
-       KC_NO,         KC_NO,          KC_NO,         KC_NO,
-       KC_NO,         KC_NO,          KC_NO,         KC_NO
-    ),
-    /* LEDControl Pad
-    * ,-------------------------------.
-    * | snake|breathe|rainbow|gradient|
-    * |------+-------+-------+--------|
-    * | xmas |  Val+ | Sat+  |   HUE+ |
-    * |------+-------+-------+--------|
-    * |kngrdr|  Val- | Sat-  |   HUE- |
-    * |------+-------+-------+--------|
-    * | swirl| PLAIN |       | ON/OFF |
-    * `-------------------------------'
-    */
-    //blue
-    [_LEDCNTL] = LAYOUT_ortho_4x4(
-        RGB_M_SN, RGB_M_B,    RGB_M_R,     RGB_M_G,
-        RGB_M_X,  RGB_VAI,    RGB_SAI,     RGB_HUI,
-        RGB_M_K,  RGB_VAD,    RGB_SAD,     RGB_HUD,
-        RGB_M_SW, RGB_M_P,    KC_NO,     RGB_TOG
-     ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case CLOUD:
-                if(record->event.pressed){
-                    send_unicode_string("(っ◕‿◕)っ");
-                }
-                return false;
-                break;
-            case FU:
-                if(record->event.pressed){
-                    SEND_STRING("t(-_-t)");
-                }
-                return false;
-                break;
-            case HAPPYFACE:
-                if(record->event.pressed){
-                     send_unicode_string("ʘ‿ʘ");
-                }
-                return false;
-                break;
-            case CMDCLEAR:
-                if (record->event.pressed) {
-                    register_code(KC_LGUI);
-                    tap_code(KC_A);
-                    unregister_code(KC_LGUI);
-                    tap_code(KC_DEL);
-                }
-                return false;
-                break;
-            case SHRUG:
-                if (record->event.pressed) {
-                    send_unicode_string("¯\\_(ツ)_/¯");
-                }
-                return false;
-                break;
-            case HEARTFACE:
-                if(record->event.pressed){
-                    send_unicode_string("♥‿♥");
-                }
-                return false;
-                break;
-            case DISFACE:
-                if(record->event.pressed){
-                    send_unicode_string("ಠ_ಠ");
-                }
-                return false;
-                break;
-            case TFLIP:
-                if(record->event.pressed){
-                    send_unicode_string("(╯°□°)╯ ︵ ┻━┻");
-                }
-                return false;
-                break;
-            case TFLIP2:
-                if(record->event.pressed){
-                    send_unicode_string("┻━┻︵ \\(°□°)/ ︵ ┻━┻");
-                }
-                return false;
-                break;
-                }
-    }
-    return true;
-}
-
-
-/* tap dance time */
-void tdexample1(tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 2) {
-    SEND_STRING(EXAMPLESTRING1);
-    reset_tap_dance (state);
-  }
-}
-void tdexample2(tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 2) {
-    SEND_STRING(EXAMPLESTRING2);
-    reset_tap_dance (state);
-  }
-}
-void tdexample3(tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 2) {
-    SEND_STRING(EXAMPLESTRING3);
-    reset_tap_dance (state);
-  }
-}
-void tdexample4(tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 2) {
-    SEND_STRING(EXAMPLESTRING4);
-    reset_tap_dance (state);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_EXAMPLE1] = ACTION_TAP_DANCE_FN(tdexample1),
-    [TD_EXAMPLE2] = ACTION_TAP_DANCE_FN(tdexample2),
-    [TD_EXAMPLE3] = ACTION_TAP_DANCE_FN(tdexample3),
-    [TD_EXAMPLE4] = ACTION_TAP_DANCE_FN(tdexample4)
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_scan_user(void) {
-  static bool has_ran_yet;
-  if (!has_ran_yet) {
-    has_ran_yet = true;
-        rgblight_setrgb (16, 0, 16);
-  }
-}
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _TAPLAND:
-        rgblight_setrgb(0, 16, 0); //green
-        break;
-    case _LEDCNTL:
-        rgblight_setrgb(0, 0, 16); //blue
-        break;
-    case _EMOJI:
-        rgblight_setrgb (16, 0, 16); //purple
-        break;
-
-    default: //  for any other layers, or the default layer
-        rgblight_setrgb (16, 0, 16); //purple
-        break;
-    }
-  return state;
-}
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/readme.md b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/readme.md
deleted file mode 100644
index 7a3b8c8e442..00000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Ridingtraffic's examples
-===
-This keymap has many features:
-3 layers
-Momentary layer switching
-16 pixel neopixel
-Unicode Enabled
-Tap dance enabled
-
-The rgb also updates depending on what layer you are on, and then flips back when done.
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/rules.mk b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/rules.mk
deleted file mode 100644
index de441755318..00000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# turning on tap dance
-TAP_DANCE_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-MOUSEKEY_ENABLE = no
-UNICODE_ENABLE = yes 
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c
deleted file mode 100644
index 05cdc0cfb6c..00000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include QMK_KEYBOARD_H
-#define ALT TG(_FUNC)
-
-enum layers {
- _KEYP,
- _FUNC
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_KEYP]=LAYOUT_ortho_4x4(
-  KC_P7, KC_P8,   KC_P9,   ALT,
-  KC_P4, KC_P5,   KC_P6,   KC_PAST,
-  KC_P1, KC_P2,   KC_P3,   KC_PMNS,
-  KC_P0, KC_PDOT, KC_PENT, KC_PPLS
-),
-[_FUNC]=LAYOUT_ortho_4x4(
-  KC_MPRV, KC_MPLY, KC_MNXT, _______,
-  XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM,
-  KC_INS,  KC_HOME, KC_PGUP, XXXXXXX,
-  KC_DEL,  KC_END,  KC_PGDN, XXXXXXX
-)
-};
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
index e4609962f1f..39e43b90cd3 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
@@ -16,59 +16,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 20
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
index 928c8106bf9..40f96fb736b 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
@@ -44,6 +44,51 @@
         ]
     },
     "rgb_matrix": {
+        "animmations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 28, "y": 12},
@@ -66,7 +111,8 @@
             {"flags": 4, "matrix": [3, 1], "x": 84, "y": 60},
             {"flags": 2, "x": 28, "y": 47},
             {"flags": 4, "matrix": [3, 0], "x": 28, "y": 60}
-        ]
+        ],
+        "sleep": true
     },
     "community_layouts": [
         "ortho_4x4"
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
index e4609962f1f..39e43b90cd3 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
@@ -16,59 +16,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 20
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
index 87f2f3574c4..31805fc9678 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
@@ -42,6 +42,51 @@
         ]
     },
     "rgb_matrix": {
+        "animmations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 28, "y": 12},
@@ -64,7 +109,8 @@
             {"flags": 4, "matrix": [3, 1], "x": 84, "y": 60},
             {"flags": 2, "x": 28, "y": 47},
             {"flags": 4, "matrix": [3, 0], "x": 28, "y": 60}
-        ]
+        ],
+        "sleep": true
     },
     "community_layouts": [
         "ortho_4x4"
diff --git a/keyboards/25keys/zinc/keymaps/ginjake/config.h b/keyboards/25keys/zinc/keymaps/ginjake/config.h
deleted file mode 100644
index 2185dc9ebe4..00000000000
--- a/keyboards/25keys/zinc/keymaps/ginjake/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2018 monksoffunk
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-// place overrides here
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_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
-#endif
diff --git a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
deleted file mode 100644
index 5cadafb4bed..00000000000
--- a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
+++ /dev/null
@@ -1,368 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-rgblight_config_t RGB_current_config;
-#endif
-
-extern uint8_t is_master;
-
-// 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,
-    _COLEMAK,
-    _DVORAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  KANA,
-  EISU,
-  RGBRST,
-  AQOURS, //サンシャインぴっかぴかモード
-};
-
-#ifdef RGBLIGHT_ENABLE
-  //9色に変化するLEDのHSV各パラメータ
-  int aqours_h[] = { 26, 340, 150,   0, 199, 220,  53, 265, 322};
-  int aqours_s[] = {255, 165, 255, 255, 255, 350, 255, 255, 255};
-  int aqours_v[] = {255, 255, 255, 255, 255, 255, 255, 255, 255};
-  const int NEXT_COLOR_TIME = 2400; //次の色に切り替わるまでの時間
-  const int NEXT_CHANGE_TARGET_TIME = 100; //次のキーに色が伝播するまでの時間
-  bool aqours_mode = false;
-  int aqours_next_color_timer_count = 0;
-  int aqours_num  = 0;
-  int target_col = 0;
-
-  //keyのmatrixの位置とLEDの番号を紐づける
-  int combined_key_to_led[] =
-  {
-    0,1,2,3,4,5,
-    11,10,9,8,7,6,
-    12,13,14,15,16,17,
-    23,22,21,20,19,18
-  };
-#endif
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Esc  |ADJUST| Win  | Alt  |LOWER |Space |             | Space| RAISE| Left | Down |  Up  | Right|
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-[_QWERTY] = LAYOUT_ortho_4x12(
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-      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, KC_ENT ,
-      KC_ESC,  ADJUST,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,                    KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Colemak
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |             |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   R  |   S  |   T  |   D  |             |   H  |   N  |   E  |   I  |   O  |  '   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Esc  |ADJUST| Alt  | Win  |LOWER |Space |             | Space| RAISE| Left | Down |  Up  | Right|
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT_ortho_4x12(
-      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-      KC_LCTL, 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_ENT ,
-      KC_ESC,  ADJUST,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,                    KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Dvorak
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   '  |   ,  |   .  |   P  |   Y  |             |   F  |   G  |   C  |   R  |   L  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   O  |   E  |   U  |   I  |             |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |             |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Esc  |ADJUST| Alt  | Win  |LOWER |Space |             | Space| RAISE| Left | Down |  Up  | Right|
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-  [_DVORAK] = LAYOUT_ortho_4x12(
-      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
-      KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,                      KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-      KC_ESC,  ADJUST,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,                    KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Lower
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |             |   ^  |   &  |   *  |   (  |   )  |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |   -  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |      | Home | End  |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-  [_LOWER] = LAYOUT_ortho_4x12(
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-      _______, _______, _______, _______, _______, _______,                   KC_MINS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, KC_HOME, KC_END,  _______,
-      _______, _______, _______, _______, _______, _______,                   _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-      ),
-
-  /* Raise
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |             |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |             |  F12 |      |      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-  [_RAISE] = LAYOUT_ortho_4x12(
-      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_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_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-      ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |      | Reset|RGBRST|Aud on|Audoff|      |             |      |Qwerty|Colemk|Dvorak|      | Ins  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |AQOURS|RGB ON| HUE+ | SAT+ | VAL+ | Mac  |             | Win  |  -   |   =  |Print |ScLock|Pause |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      | MODE | HUE- | SAT- | VAL- |      |             |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      | EISU | EISU | EISU |             | KANA | KANA | Home |PageDn|PageUp| End  |
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-    [_ADJUST] =  LAYOUT_ortho_4x12(
-      _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,
-       AQOURS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,
-      _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KC_HOME, KC_PGDN, KC_PGUP, KC_END
-      )
-};
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    #ifdef RGBLIGHT_ENABLE
-      rgblight_mode_noeeprom(RGB_current_config.mode);
-    #endif
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-
-    case LOWER:
-      if (record->event.pressed) {
-          //not sure how to have keyboard check mode and set it to a variable, so my work around
-          //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          #ifdef RGBLIGHT_ENABLE
-           rgblight_mode_noeeprom(16);
-          #endif
-        }
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode_noeeprom(RGB_current_config.mode);   // revert RGB to initial mode prior to RGB mode change
-        #endif
-        TOG_STATUS = false;
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-
-    case RAISE:
-      if (record->event.pressed) {
-        //not sure how to have keyboard check mode and set it to a variable, so my work around
-        //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          #ifdef RGBLIGHT_ENABLE
-            rgblight_mode_noeeprom(15);
-          #endif
-        }
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode_noeeprom(RGB_current_config.mode);  // revert RGB to initial mode prior to RGB mode change
-        #endif
-        layer_off(_RAISE);
-        TOG_STATUS = false;
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode_noeeprom(RGB_current_config.mode);
-          rgblight_step();
-          RGB_current_config.mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-      break;
-
-    case EISU:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG2);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG2);
-      }
-      return false;
-      break;
-    case KANA:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG1);
-        }else{
-         SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG1);
-      }
-      return false;
-      break;
-    case AQOURS:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          aqours_mode = !aqours_mode;
-        }
-      #endif
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_config = rgblight_config;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
-#ifdef RGBLIGHT_ENABLE
-
-  void aqours_led(void) {
-    aqours_next_color_timer_count++;
-    //一定間隔で色が変化
-    if (aqours_next_color_timer_count > NEXT_COLOR_TIME) {
-      aqours_num++;
-      aqours_next_color_timer_count = 0;
-      target_col = 0;
-      if (aqours_num == ARRAY_SIZE(aqours_h)) {
-        aqours_num = 0;
-      }
-    }
-
-    //キー毎に時間差で色が変化していく
-    if (aqours_next_color_timer_count % NEXT_CHANGE_TARGET_TIME == 0) {
-      if (target_col < MATRIX_COLS) {
-        sethsv(aqours_h[aqours_num], aqours_s[aqours_num], aqours_v[aqours_num], (rgb_led_t *)&led[target_col]);
-        sethsv(aqours_h[aqours_num], aqours_s[aqours_num], aqours_v[aqours_num], (rgb_led_t *)&led[11 - target_col]);
-        sethsv(aqours_h[aqours_num], aqours_s[aqours_num], aqours_v[aqours_num], (rgb_led_t *)&led[12 + target_col]);
-        sethsv(aqours_h[aqours_num], aqours_s[aqours_num], aqours_v[aqours_num], (rgb_led_t *)&led[23 - target_col]);
-        target_col++;
-        rgblight_set();
-      }
-    }
-  }
-#endif
-
-void matrix_scan_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      if (aqours_mode) {
-        aqours_led();
-      }
-    #endif
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      rgblight_init();
-      RGB_current_config = rgblight_config;
-    #endif
-}
diff --git a/keyboards/25keys/zinc/keymaps/ginjake/readme_jp.md b/keyboards/25keys/zinc/keymaps/ginjake/readme_jp.md
deleted file mode 100644
index dfedb37c15c..00000000000
--- a/keyboards/25keys/zinc/keymaps/ginjake/readme_jp.md
+++ /dev/null
@@ -1,123 +0,0 @@
-# The Default Zinc Layout
-## 配列
-
-### Qwerty配列
-
-```
- ,-----------------------------------------.             ,-----------------------------------------.
- | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  | Bksp |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Ctrl |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  '   |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Esc  |  Fn  | Alt  | Win  |Lower |Space |             | Space| Raise| Left | Down |  Up  | Right|
- `------------------------------------------             ------------------------------------------'
-```
-
-### Colemak
-
-```
- ,-----------------------------------------.             ,-----------------------------------------.
- | Tab  |   Q  |   W  |   F  |   P  |   G  |             |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Ctrl |   A  |   R  |   S  |   T  |   D  |             |   H  |   N  |   E  |   I  |   O  |  '   |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Shift|   Z  |   X  |   C  |   V  |   B  |             |   K  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Esc  |ADJUST| Alt  | Win  |LOWER |Space |             | Space| RAISE| Left | Down |  Up  | Right|
- `------------------------------------------             ------------------------------------------'
-```   
- 
-### Dvorak
-
-```
- ,-----------------------------------------.             ,-----------------------------------------.
- | Tab  |   '  |   ,  |   .  |   P  |   Y  |             |   F  |   G  |   C  |   R  |   L  | Del  |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Ctrl |   A  |   O  |   E  |   U  |   I  |             |   D  |   H  |   T  |   N  |   S  |  /   |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Shift|   ;  |   Q  |   J  |   K  |   X  |             |   B  |   M  |   W  |   V  |   Z  |Enter |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Esc  |ADJUST| Alt  | Win  |LOWER |Space |             | Space| RAISE| Left | Down |  Up  | Right|
- `-----------------------------------------'             `-----------------------------------------'
-```
-
-
-## コンパイルの仕方
-
-コンパイルは、qmk_firmware のトップディレクトリで行います。
-
-```
-$ cd qmk_firmware
-```
-qmk_firmwareでは各キーボードのコンパイルは、`<キーボード名>:<キーマップ名>`という指定で行います。
-
-```
-$ make zinc:default
-```
-
-キーボードへの書き込みまで同時に行うには下記のように`:avrdude`を付けます。
-
-```
-$ make zinc:default:avrdude
-```
-
-コンパイル結果と中間生成物を消去したい場合は以下のようにします。
-
-```
-$ make zinc:default:clean
-```
-
-## カスタマイズ
-
-コマンドラインからオプションを指定してビルドすることが出来ます。
-
-```
-# Zinc keyboard 'default' keymap: convenient command line option
-make ZINC=<options> zinc:defualt
-#    option= back | under | na | ios
-#    ex.
-#      make ZINC=under    zinc:defualt
-#      make ZINC=under,ios zinc:defualt
-#      make ZINC=back     zinc:default
-#      make ZINC=back,na  zinc:default
-#      make ZINC=back,ios zinc:default
-```
-
-あるいは`qmk_firmware/keyboards/zinc/rev1/keymaps/default/rules.mk` の以下の部分を直接編集して機能を有効化してください。
-
-```
-# Zinc keyboard customize
-LED_BACK_ENABLE = no        # LED backlight (Enable SK6812mini backlight)
-LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight)
-LED_ANIMATIONS = yes        # LED animations
-IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-
-```
-
-## RGB backlight を有効にする
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-```
-LED_BACK_ENABLE = yes   # LED backlight (Enable SK6812mini backlight)
-```
-
-
-## RGB Underglow を有効にする
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-```
-LED_UNDERGLOW_ENABLE = yes   # LED underglow (Enable WS2812 RGB underlight.)
-```
-
-
-## iPad/iPhoneサポートを有効にする。
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-RBG Underglow や RGBバックライトの輝度を抑えて、iPad, iPhone にも接続できるようになります。
-
-```
-IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-```
\ No newline at end of file
diff --git a/keyboards/25keys/zinc/keymaps/ginjake/rules.mk b/keyboards/25keys/zinc/keymaps/ginjake/rules.mk
deleted file mode 100644
index 4bbd3e582ce..00000000000
--- a/keyboards/25keys/zinc/keymaps/ginjake/rules.mk
+++ /dev/null
@@ -1,112 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SWAP_HANDS_ENABLE = no        # Enable one-hand typing
-LTO_ENABLE = no             # if firmware size over limit, try this option
-
-define ZINC_CUSTOMISE_MSG
-  $(info Zinc customize)
-  $(info -  LED_BACK_ENABLE=$(LED_BACK_ENABLE))
-  $(info -  LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE))
-  $(info -  LED_BOTH_ENABLE=$(LED_BOTH_ENABLE))
-  $(info -  LED_RGB_CONT=$(LED_RGB_CONT))
-  $(info -  LED_ANIMATION=$(LED_ANIMATIONS))
-  $(info -  IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE))
-endef
-
-# Zinc keyboard customize
-LED_BACK_ENABLE = no        # LED backlight (Enable SK6812mini backlight)
-LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight)
-LED_BOTH_ENABLE = no        # LED backlight and underglow
-LED_RGB_CONT = no           # LED continuous backlight or/and underglow between left Zinc and right Zinc
-LED_ANIMATIONS = yes        # LED animations
-IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-####  LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE.
-####    Do not enable these with audio at the same time.
-
-### Zinc keyboard 'default' keymap: convenient command line option
-##    make ZINC=<options> zinc:defualt
-##    option= back | under | both | cont | na | ios
-##    ex.
-##      make ZINC=under    zinc:defualt
-##      make ZINC=under,ios zinc:defualt
-##      make ZINC=back     zinc:default
-##      make ZINC=back,na  zinc:default
-##      make ZINC=back,ios zinc:default
-
-ifneq ($(strip $(ZINC)),)
-  ifeq ($(findstring back,$(ZINC)), back)
-    LED_BACK_ENABLE = yes
-  endif
-  ifeq ($(findstring under,$(ZINC)), under)
-    LED_UNDERGLOW_ENABLE = yes
-  endif
-  ifeq ($(findstring both,$(ZINC)), both)
-    LED_BOTH_ENABLE = yes
-  endif
-  ifeq ($(findstring cont,$(ZINC)), cont)
-    LED_RGB_CONT = yes
-  endif
-  ifeq ($(findstring na,$(ZINC)), na)
-    LED_ANIMATIONS = no
-  endif
-  ifeq ($(findstring ios,$(ZINC)), ios)
-    IOS_DEVICE_ENABLE = yes
-  endif
-  $(eval $(call ZINC_CUSTOMISE_MSG))
-  $(info )
-endif
-
-ifeq ($(strip $(LED_BACK_ENABLE)), yes)
-  RGBLIGHT_ENABLE = yes
-  ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
-    OPT_DEFS += -DRGBLED_BOTH
-    $(info LED_BOTH_ENABLE option is enabled instead of LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE)
-  else
-    OPT_DEFS += -DRGBLED_BACK
-  endif
-else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
-  RGBLIGHT_ENABLE = yes
-else
-  RGBLIGHT_ENABLE = no
-endif
-
-ifeq ($(strip $(LED_BOTH_ENABLE)), yes)
-  RGBLIGHT_ENABLE = yes
-  OPT_DEFS += -DRGBLED_BOTH
-endif
-
-ifeq ($(strip $(LED_RGB_CONT)), yes)
-  OPT_DEFS += -DRGBLED_CONT
-endif
-
-ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
-  OPT_DEFS += -DIOS_DEVICE_ENABLE
-endif
-
-ifeq ($(strip $(LED_ANIMATIONS)), yes)
-  OPT_DEFS += -DLED_ANIMATIONS
-endif
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-
-# Uncomment these for debugging
-# $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
-# $(info -- OPT_DEFS=$(OPT_DEFS))
-# $(info )
diff --git a/keyboards/25keys/zinc/keymaps/monks/config.h b/keyboards/25keys/zinc/keymaps/monks/config.h
deleted file mode 100644
index 2185dc9ebe4..00000000000
--- a/keyboards/25keys/zinc/keymaps/monks/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2018 monksoffunk
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-// place overrides here
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_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
-#endif
diff --git a/keyboards/25keys/zinc/keymaps/monks/keymap.c b/keyboards/25keys/zinc/keymaps/monks/keymap.c
deleted file mode 100644
index 5c15fb48ca6..00000000000
--- a/keyboards/25keys/zinc/keymaps/monks/keymap.c
+++ /dev/null
@@ -1,256 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-rgblight_config_t RGB_current_config;
-#endif
-
-extern uint8_t is_master;
-
-// 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
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  KANA,
-  EISU,
-  RGBRST
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |  /   |Enter |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Esc  |ADJUST| Alt  | GUI  |LOWER |Space |             | Space| RAISE| KANA | Left | Down | Right|
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-[_QWERTY] = LAYOUT_ortho_4x12(
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-      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, KC_ENT ,
-      KC_ESC,  ADJUST,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,                    KC_SPC,  RAISE,   KANA,    KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-
-  /* Lower
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |             |   ^  |   &  |   *  |   (  |   )  |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |   -  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |      |      |  UP  |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-  [_LOWER] = LAYOUT_ortho_4x12(
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-      _______, _______, _______, _______, _______, _______,                   KC_MINS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, KC_UP,   _______,
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______
-      ),
-
-  /* Raise
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |             |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |             |  F12 |      |      |      |   ?  |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-  [_RAISE] = LAYOUT_ortho_4x12(
-      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_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,  _______, _______, _______, S(KC_SLSH), _______,
-      _______, _______, _______, _______, _______, _______,                   _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-      ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |      | Reset|RGBRST|      |      |      |             |      |      |      |      |      | Ins  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |RGB ON| HUE+ | SAT+ | VAL+ | Mac  |             | Win  |  -   |   =  |Print |ScLock|Pause |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      | MODE | HUE- | SAT- | VAL- |      |             |      |      |      |      |PageUp|      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      | EISU | EISU | EISU |             | KANA | KANA | KANA | Home |PageDn| End  |
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-    [_ADJUST] =  LAYOUT_ortho_4x12(
-      _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, KC_INS,
-      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,
-      _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, KC_PGUP, _______,
-      _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KANA,    KC_HOME, KC_PGDN, KC_END
-      )
-};
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    #ifdef RGBLIGHT_ENABLE
-       rgblight_mode_noeeprom(RGB_current_config.mode);
-    #endif
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-
-    case LOWER:
-      if (record->event.pressed) {
-          //not sure how to have keyboard check mode and set it to a variable, so my work around
-          //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          #ifdef RGBLIGHT_ENABLE
-            rgblight_mode_noeeprom(16);
-          #endif
-        }
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode_noeeprom(RGB_current_config.mode);   // revert RGB to initial mode prior to RGB mode change
-        #endif
-        TOG_STATUS = false;
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-
-    case RAISE:
-      if (record->event.pressed) {
-        //not sure how to have keyboard check mode and set it to a variable, so my work around
-        //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          #ifdef RGBLIGHT_ENABLE
-            rgblight_mode_noeeprom(15);
-          #endif
-        }
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode_noeeprom(RGB_current_config.mode);  // revert RGB to initial mode prior to RGB mode change
-        #endif
-        layer_off(_RAISE);
-        TOG_STATUS = false;
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode_noeeprom(RGB_current_config.mode);
-          rgblight_step();
-          RGB_current_config.mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-      break;
-
-    case EISU:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG2);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG2);
-      }
-      return false;
-      break;
-    case KANA:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG1);
-        }else{
-         SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG1);
-      }
-      return false;
-      break;
-
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_config = rgblight_config;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      rgblight_init();
-      RGB_current_config = rgblight_config;
-    #endif
-}
diff --git a/keyboards/25keys/zinc/keymaps/monks/readme_jp.md b/keyboards/25keys/zinc/keymaps/monks/readme_jp.md
deleted file mode 100644
index e518eb7696d..00000000000
--- a/keyboards/25keys/zinc/keymaps/monks/readme_jp.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# monksoffunk's personal zinc Layout
-## 配列
-
-### Qwerty配列
-
-```
- ,-----------------------------------------.             ,-----------------------------------------.
- | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  | Bksp |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Ctrl |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  '   |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------|             |------+------+------+------+------+------|
- | Esc  |ADJUST| Alt  | GUI  |LOWER |Space |             | Space| RAISE| KANA | Left | Down | Right|
- `------------------------------------------             ------------------------------------------'
-```
-
-KANAキーを独立させ、UPキーをLOWER＋スラッシュに当てています。そのほかデフォルトからレイヤーをかなりいじっています。
-また、RGB LEDがアンコメントしてありますので、実装していない場合はソースを見て適宜コメントアウトしてください。
-
-## コンパイルの仕方
-
-コンパイルは、qmk_firmware のトップディレクトリで行います。
-
-```
-$ cd qmk_firmware
-```
-qmk_firmwareでは各キーボードのコンパイルは、`<キーボード名>:<キーマップ名>`という指定で行います。
-
-```
-$ make zinc:monks
-```
-
-キーボードへの書き込みまで同時に行うには下記のように`:avrdude`を付けます。
-
-```
-$ make zinc:monks:avrdude
-```
-
-コンパイル結果と中間生成物を消去したい場合は以下のようにします。
-
-```
-$ make zinc:monks:clean
-```
-
-なお、avrdudeではなくQMK Toolbox（GUIツール）を使う方法もあります。
-
-https://github.com/qmk/qmk_toolbox/releases
-
-その場合は、$ make zinc:monksでビルドした成果物をQMK Toolboxから指定してください。
-
-## カスタマイズ
-
-コマンドラインからオプションを指定してビルドすることが出来ます。
-
-```
-# Zinc keyboard 'monks' keymap: convenient command line option
-make ZINC=<options> zinc:monks
-#    option= back | under | na | ios
-#    ex.
-#      make ZINC=under    zinc:monks
-#      make ZINC=under,ios zinc:monks
-#      make ZINC=back     zinc:monks
-#      make ZINC=back,na  zinc:monks
-#      make ZINC=back,ios zinc:monks
-```
-
-あるいは`qmk_firmware/keyboards/zinc/rev1/keymaps/monks/rules.mk` の以下の部分を編集して機能を有効化してください。
-
-```
-# Zinc keyboard customize
-LED_BACK_ENABLE = no        # LED backlight (Enable SK6812mini backlight)
-LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight)
-LED_ANIMATIONS = yes        # LED animations
-IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-
-```
-
-## RGB backlight を有効にする
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-```
-LED_BACK_ENABLE = yes   # LED backlight (Enable SK6812mini backlight)
-```
-
-
-## RGB Underglow を有効にする
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-```
-LED_UNDERGLOW_ENABLE = yes   # LED underglow (Enable WS2812 RGB underlight)
-```
-
-
-## iPad/iPhoneサポートを有効にする。
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-RBG Underglow や RGBバックライトの輝度を抑えて、iPad, iPhone にも接続できるようになります。
-
-```
-IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-```
diff --git a/keyboards/25keys/zinc/keymaps/monks/rules.mk b/keyboards/25keys/zinc/keymaps/monks/rules.mk
deleted file mode 100644
index d37d2b6d1fa..00000000000
--- a/keyboards/25keys/zinc/keymaps/monks/rules.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SWAP_HANDS_ENABLE = no        # Enable one-hand typing
-LTO_ENABLE = no             # if firmware size over limit, try this option
-
-define ZINC_CUSTOMISE_MSG
-  $(info Zinc customize)
-  $(info -  LED_BACK_ENABLE=$(LED_BACK_ENABLE))
-  $(info -  LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE))
-  $(info -  LED_BOTH_ENABLE=$(LED_BOTH_ENABLE))
-  $(info -  LED_RGB_CONT=$(LED_RGB_CONT))
-  $(info -  LED_ANIMATION=$(LED_ANIMATIONS))
-  $(info -  IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE))
-endef
-
-# Zinc keyboard customize
-LED_BACK_ENABLE = no        # LED backlight (Enable SK6812mini backlight)
-LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight)
-LED_BOTH_ENABLE = no        # LED backlight and underglow
-LED_RGB_CONT = no           # LED continuous backlight or/and underglow between left Zinc and right Zinc
-LED_ANIMATIONS = yes        # LED animations
-IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-####  LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE.
-####    Do not enable these with audio at the same time.
-
-### Zinc keyboard 'default' keymap: convenient command line option
-##    make ZINC=<options> zinc:defualt
-##    option= back | under | both | cont | na | ios
-##    ex.
-##      make ZINC=under    zinc:defualt
-##      make ZINC=under,ios zinc:defualt
-##      make ZINC=back     zinc:default
-##      make ZINC=back,na  zinc:default
-##      make ZINC=back,ios zinc:default
-
-ifneq ($(strip $(ZINC)),)
-  ifeq ($(findstring back,$(ZINC)), back)
-    LED_BACK_ENABLE = yes
-  endif
-  ifeq ($(findstring under,$(ZINC)), under)
-    LED_UNDERGLOW_ENABLE = yes
-  endif
-  ifeq ($(findstring both,$(ZINC)), both)
-    LED_BOTH_ENABLE = yes
-  endif
-  ifeq ($(findstring cont,$(ZINC)), cont)
-    LED_RGB_CONT = yes
-  endif
-  ifeq ($(findstring na,$(ZINC)), na)
-    LED_ANIMATIONS = no
-  endif
-  ifeq ($(findstring ios,$(ZINC)), ios)
-    IOS_DEVICE_ENABLE = yes
-  endif
-  $(eval $(call ZINC_CUSTOMISE_MSG))
-  $(info )
-endif
-
-ifeq ($(strip $(LED_BACK_ENABLE)), yes)
-  RGBLIGHT_ENABLE = yes
-  ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
-    OPT_DEFS += -DRGBLED_BOTH
-    $(info LED_BOTH_ENABLE option is enabled instead of LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE)
-  else
-    OPT_DEFS += -DRGBLED_BACK
-  endif
-else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
-  RGBLIGHT_ENABLE = yes
-else
-  RGBLIGHT_ENABLE = no
-endif
-
-ifeq ($(strip $(LED_BOTH_ENABLE)), yes)
-  RGBLIGHT_ENABLE = yes
-  OPT_DEFS += -DRGBLED_BOTH
-endif
-
-ifeq ($(strip $(LED_RGB_CONT)), yes)
-  OPT_DEFS += -DRGBLED_CONT
-endif
-
-ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
-  OPT_DEFS += -DIOS_DEVICE_ENABLE
-endif
-
-ifeq ($(strip $(LED_ANIMATIONS)), yes)
-  OPT_DEFS += -DLED_ANIMATIONS
-endif
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# Uncomment these for debugging
-# $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
-# $(info -- OPT_DEFS=$(OPT_DEFS))
-# $(info )
diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/config.h b/keyboards/25keys/zinc/keymaps/toshi0383/config.h
deleted file mode 100644
index 0d53d44247d..00000000000
--- a/keyboards/25keys/zinc/keymaps/toshi0383/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2019 Toshihiro Suzuki
-Copyright 2018 monksoffunk
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-// place overrides here
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_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
-#endif
diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
deleted file mode 100644
index c6b90a3a997..00000000000
--- a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern uint8_t is_master;
-
-enum layer_names {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_ortho_4x12(
-   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,   SFT_T(KC_SCLN), KC_RGUI,
-   KC_SPC, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_N,  KC_M,  KC_RCTL, KC_DOT, KC_RALT, RGUI(KC_RSFT),
-   KC_LGUI, KC_LALT, _______, _______, LOWER, KC_ENT,    KC_ENT, RAISE, _______, _______, _______, _______
-   ),
-
-  [_LOWER] =  LAYOUT_ortho_4x12(
-   KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR,  KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, RCMD(RALT(KC_O)), RCMD(RALT(KC_L)), _______,
-   _______, KC_LT, KC_GT, KC_LPRN, KC_RPRN, KC_GRV,       KC_MINS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_PIPE,
-   KC_LALT, _______, _______, _______, KC_EQL, KC_QUES,   KC_UNDS, KC_PLUS, KC_COMM, _______, KC_SLSH, _______,
-   _______, _______, _______, _______, _______, KC_TRNS,  KC_TRNS, KC_RGUI, _______, _______, _______, _______
-   ),
-
-  [_RAISE] = LAYOUT_ortho_4x12(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  _______,
-    _______, KC_COLN, KC_SCLN, KC_DQT, KC_QUOT, KC_BSLS,   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______,  ADJUST, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, KC_LGUI, KC_TRNS,  KC_TRNS, _______, _______, _______, _______, _______
-    ),
-
-  [_ADJUST] =  LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, RCMD(LALT(KC_1)), RCMD(LALT(KC_2)), RCMD(LALT(KC_3)), RCMD(LALT(KC_4)), RCMD(LALT(KC_5)), RCMD(LALT(KC_6)), RCMD(LALT(KC_7)), RCMD(LALT(KC_0)),
-    RGB_SAI, RGB_HUI,  RGB_MOD,  _______,   RGB_TOG,    RGB_VAI,   RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, _______,   _______,
-    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______
-    ),
-};
diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk b/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
deleted file mode 100644
index 8fe697932e0..00000000000
--- a/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
+++ /dev/null
@@ -1,130 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-LTO_ENABLE = no             # if firmware size over limit, try this option
-
-define ZINC_CUSTOMISE_MSG
-  $(info Zinc customize)
-  $(info -  LED_BACK_ENABLE=$(LED_BACK_ENABLE))
-  $(info -  LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE))
-  $(info -  LED_BOTH_ENABLE=$(LED_BOTH_ENABLE))
-  $(info -  LED_RGB_CONT=$(LED_RGB_CONT))
-  $(info -  RGB_MATRIX=$(RGB_MATRIX))
-  $(info -  LED_ANIMATION=$(LED_ANIMATIONS))
-  $(info -  IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE))
-endef
-
-# Zinc keyboard customize
-LED_BACK_ENABLE = no        # LED backlight (Enable SK6812mini backlight)
-LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight)
-LED_BOTH_ENABLE = no        # LED backlight and underglow
-LED_RGB_CONT = no           # LED continuous backlight or/and underglow between left Zinc and right Zinc
-RGB_MATRIX = no             # RGB LED Matrix
-RGB_MATRIX_SPLIT_RIGHT = no # RGB Matrix for RIGHT Hand
-LED_ANIMATIONS = yes        # LED animations
-IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-####  LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE.
-####    Do not enable these with audio at the same time.
-
-### Zinc keyboard 'default' keymap: convenient command line option
-##    make ZINC=<options> zinc:defualt
-##    option= back | under | both | cont | matrix | na | ios
-##    ex.
-##      make ZINC=under    zinc:defualt
-##      make ZINC=under,ios zinc:defualt
-##      make ZINC=back     zinc:default
-##      make ZINC=back,na  zinc:default
-##      make ZINC=back,ios zinc:default
-
-ifneq ($(strip $(ZINC)),)
-  ifeq ($(findstring back,$(ZINC)), back)
-    LED_BACK_ENABLE = yes
-  endif
-  ifeq ($(findstring under,$(ZINC)), under)
-    LED_UNDERGLOW_ENABLE = yes
-  endif
-  ifeq ($(findstring both,$(ZINC)), both)
-    LED_BOTH_ENABLE = yes
-  endif
-  ifeq ($(findstring cont,$(ZINC)), cont)
-    LED_RGB_CONT = yes
-  endif
-  ifeq ($(findstring matrix,$(ZINC)), matrix)
-    RGB_MATRIX = yes
-  endif
-  ifeq ($(findstring right,$(ZINC)), right)
-    RGB_MATRIX_SPLIT_RIGHT = yes
-  endif
-  ifeq ($(findstring na,$(ZINC)), na)
-    LED_ANIMATIONS = no
-  endif
-  ifeq ($(findstring ios,$(ZINC)), ios)
-    IOS_DEVICE_ENABLE = yes
-  endif
-  $(eval $(call ZINC_CUSTOMISE_MSG))
-  $(info )
-endif
-
-ifeq ($(strip $(LED_BACK_ENABLE)), yes)
-  RGBLIGHT_ENABLE = yes
-  ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
-    OPT_DEFS += -DRGBLED_BOTH
-    $(info LED_BOTH_ENABLE option is enabled instead of LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE)
-  else
-    OPT_DEFS += -DRGBLED_BACK
-  endif
-else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
-  RGBLIGHT_ENABLE = yes
-else
-  RGBLIGHT_ENABLE = no
-endif
-
-ifeq ($(strip $(LED_BOTH_ENABLE)), yes)
-  RGBLIGHT_ENABLE = yes
-  OPT_DEFS += -DRGBLED_BOTH
-endif
-
-ifeq ($(strip $(LED_RGB_CONT)), yes)
-  OPT_DEFS += -DRGBLED_CONT
-endif
-
-ifeq ($(strip $(RGB_MATRIX)), yes)
-  RGBLIGHT_ENABLE = no
-  RGB_MATRIX_ENABLE = yes
-endif
-
-ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
-  OPT_DEFS += -DIOS_DEVICE_ENABLE
-endif
-
-ifeq ($(strip $(LED_ANIMATIONS)), yes)
-  OPT_DEFS += -DLED_ANIMATIONS
-endif
-
-ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes)
-    OPT_DEFS += -DRGB_MATRIX_SPLIT_RIGHT
-endif
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-
-# Uncomment these for debugging
-# $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
-# $(info -- OPT_DEFS=$(OPT_DEFS))
-# $(info )
diff --git a/keyboards/25keys/zinc/rev1/post_config.h b/keyboards/25keys/zinc/rev1/post_config.h
index 3d51de9e4c1..42d2d7e46c8 100644
--- a/keyboards/25keys/zinc/rev1/post_config.h
+++ b/keyboards/25keys/zinc/rev1/post_config.h
@@ -24,35 +24,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_SPLIT
   #ifdef RGBLED_BACK
     #ifdef RGBLED_CONT
-      #define RGBLED_NUM 48
+      #define RGBLIGHT_LED_COUNT 48
       #define RGBLED_SPLIT { 24, 24 }
     #else
-      #define RGBLED_NUM 24
+      #define RGBLIGHT_LED_COUNT 24
     #endif
   #else
     #ifdef RGBLED_BOTH
       #ifdef RGBLED_CONT
-        #define RGBLED_NUM 60
+        #define RGBLIGHT_LED_COUNT 60
         #define RGBLED_SPLIT { 30, 30 }
       #else
-        #define RGBLED_NUM 30
+        #define RGBLIGHT_LED_COUNT 30
       #endif
     #else
       #ifdef RGBLED_CONT
-        #define RGBLED_NUM 12
+        #define RGBLIGHT_LED_COUNT 12
         #define RGBLED_SPLIT { 6, 6 }
       #else
-        #define RGBLED_NUM 6
+        #define RGBLIGHT_LED_COUNT 6
       #endif
     #endif
   #endif
 #endif
 
 #ifndef IOS_DEVICE_ENABLE
-  #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12))
+  #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12))
     #define RGBLIGHT_LIMIT_VAL 255
   #else
-    #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32))
+    #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32))
       #define RGBLIGHT_LIMIT_VAL 130
     #else
       #define RGBLIGHT_LIMIT_VAL 120
@@ -60,10 +60,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #endif
   #define RGBLIGHT_VAL_STEP 17
 #else
-  #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12))
+  #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12))
     #define RGBLIGHT_LIMIT_VAL 90
   #else
-    #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32))
+    #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32))
       #define RGBLIGHT_LIMIT_VAL 45
     #else
       #define RGBLIGHT_LIMIT_VAL 35
diff --git a/keyboards/25keys/zinc/reva/post_config.h b/keyboards/25keys/zinc/reva/post_config.h
index 3d51de9e4c1..42d2d7e46c8 100644
--- a/keyboards/25keys/zinc/reva/post_config.h
+++ b/keyboards/25keys/zinc/reva/post_config.h
@@ -24,35 +24,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_SPLIT
   #ifdef RGBLED_BACK
     #ifdef RGBLED_CONT
-      #define RGBLED_NUM 48
+      #define RGBLIGHT_LED_COUNT 48
       #define RGBLED_SPLIT { 24, 24 }
     #else
-      #define RGBLED_NUM 24
+      #define RGBLIGHT_LED_COUNT 24
     #endif
   #else
     #ifdef RGBLED_BOTH
       #ifdef RGBLED_CONT
-        #define RGBLED_NUM 60
+        #define RGBLIGHT_LED_COUNT 60
         #define RGBLED_SPLIT { 30, 30 }
       #else
-        #define RGBLED_NUM 30
+        #define RGBLIGHT_LED_COUNT 30
       #endif
     #else
       #ifdef RGBLED_CONT
-        #define RGBLED_NUM 12
+        #define RGBLIGHT_LED_COUNT 12
         #define RGBLED_SPLIT { 6, 6 }
       #else
-        #define RGBLED_NUM 6
+        #define RGBLIGHT_LED_COUNT 6
       #endif
     #endif
   #endif
 #endif
 
 #ifndef IOS_DEVICE_ENABLE
-  #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12))
+  #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12))
     #define RGBLIGHT_LIMIT_VAL 255
   #else
-    #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32))
+    #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32))
       #define RGBLIGHT_LIMIT_VAL 130
     #else
       #define RGBLIGHT_LIMIT_VAL 120
@@ -60,10 +60,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #endif
   #define RGBLIGHT_VAL_STEP 17
 #else
-  #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12))
+  #if (RGBLIGHT_LED_COUNT <= 6) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 12))
     #define RGBLIGHT_LIMIT_VAL 90
   #else
-    #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32))
+    #if (RGBLIGHT_LED_COUNT <= 16) || (defined(RGBLED_CONT) && (RGBLIGHT_LED_COUNT <= 32))
       #define RGBLIGHT_LIMIT_VAL 45
     #else
       #define RGBLIGHT_LIMIT_VAL 35
diff --git a/keyboards/2key2crawl/keymaps/tabs/keymap.c b/keyboards/2key2crawl/keymaps/tabs/keymap.c
deleted file mode 100644
index 9066c3f2e6d..00000000000
--- a/keyboards/2key2crawl/keymaps/tabs/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-LAYOUT(
-    KC_1, KC_2, KC_3, KC_4, KC_5,
-    KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENTER),
-
-};
-
-void matrix_init_user(void) {
-  debug_config.matrix = 1;
-  debug_config.keyboard = 1;
-  debug_config.enable = 1;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-      tap_code16(C(KC_T));
-    } else {
-      tap_code16(C(KC_W));
-    }
-  }
-  return true;
-}
diff --git a/keyboards/2key2crawl/keymaps/vol/keymap.c b/keyboards/2key2crawl/keymaps/vol/keymap.c
deleted file mode 100644
index a45d3f77898..00000000000
--- a/keyboards/2key2crawl/keymaps/vol/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-LAYOUT(
-    KC_1, KC_2, KC_3, KC_4, KC_5,
-    KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENTER),
-
-};
-
-void matrix_init_user(void) {
-  debug_config.matrix = 1;
-  debug_config.keyboard = 1;
-  debug_config.enable = 1;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-     tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
-  return true;
-}
diff --git a/keyboards/3keyecosystem/2key2/2key2.c b/keyboards/3keyecosystem/2key2/2key2.c
deleted file mode 100644
index 11f4b8b2175..00000000000
--- a/keyboards/3keyecosystem/2key2/2key2.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 John Mueller
-
-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 "quantum.h"
-
-// RGB Matrix configuration
-// based on https://docs.qmk.fm/#/feature_rgb_matrix?id=common-configuration
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-  // Key Matrix to LED Index
-  {   0, 1 }
-}, {
-  // LED Index to Physical Position
-  // Using range { 0..224, 0..64 }
-  { 0,  32 }, { 224,  32 }
-}, {
-  // LED Index to Flag
-  // https://docs.qmk.fm/#/feature_rgb_matrix?id=flags
-  LED_FLAG_ALL, LED_FLAG_ALL
-} };
-#endif
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
deleted file mode 100644
index 49bd09eb7e5..00000000000
--- a/keyboards/3keyecosystem/2key2/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Copyright 2021 John Mueller
-
-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
-
-/* RGB matrix key backlighting */
-#define RGB_MATRIX_LED_COUNT 2
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE
-#define RGB_MATRIX_DEFAULT_HUE 90
-#define RGB_MATRIX_DEFAULT_SPD 20
-#define RGB_MATRIX_DEFAULT_VAL 128
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
index 35cc3ee3c45..129662175ca 100644
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/keyboards/3keyecosystem/2key2/info.json
@@ -9,8 +9,64 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "solid_reactive",
+            "hue": 90,
+            "speed": 20,
+            "val": 128
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 32, "flags": 255},
+            {"matrix": [0, 1], "x": 224, "y": 32, "flags": 255}
+        ],
+        "sleep": true
     },
+
     "matrix_pins": {
         "cols": ["F4", "D7"],
         "rows": ["F6"]
diff --git a/keyboards/3w6/keymaps/helltm/combos.def b/keyboards/3w6/keymaps/helltm/combos.def
deleted file mode 100644
index 49b95e5eb24..00000000000
--- a/keyboards/3w6/keymaps/helltm/combos.def
+++ /dev/null
@@ -1,18 +0,0 @@
-CB(open_round_brackets_combo, KC_LPRN, KC_R, KC_T)
-CB(open_square_brackets_combo, KC_LBRC, KC_F, KC_G)
-CB(open_curly_brackets_combo, KC_LCBR, KC_V, KC_B)
-CB(close_round_brackets_combo, KC_RPRN, KC_Y, KC_U)
-CB(close_square_brackets_combo, KC_RBRC, KC_H, KC_J)
-CB(close_curly_brackets_combo, KC_RCBR, KC_N, KC_M)
-
-CB(esc_combo, KC_ESC, KC_Q, KC_A)
-CB(tab_combo, KC_TAB, KC_A, LSFT_T(KC_Z))
-
-CB(single_quote_combo, KC_QUOT, KC_P, KC_SCLN)
-CB(double_quote_combo, KC_DQUO, KC_SCLN, RSFT_T(KC_SLSH))
-
-CB(plus_combo, KC_PLUS, KC_T, KC_G)
-CB(asterisk_combo, KC_ASTR, KC_G, KC_B)
-
-CB(minus_combo, KC_MINS, KC_Y, KC_H)
-CB(equal_combo, KC_EQL, KC_H, KC_N)
diff --git a/keyboards/3w6/keymaps/helltm/combos.h b/keyboards/3w6/keymaps/helltm/combos.h
deleted file mode 100644
index 99173ecb220..00000000000
--- a/keyboards/3w6/keymaps/helltm/combos.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 HellSingCoder
- *
- * 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 CB(name, action, ...) C_##name,
-enum user_combos {
-#include "combos.def"
-};
-#undef CB
-
-#define CB(name, action, ...) const uint16_t PROGMEM name##_combo[] = {__VA_ARGS__, COMBO_END};
-#include "combos.def"
-#undef CB
-
-combo_t key_combos[] = {
-#define CB(name, action, ...) COMBO(name##_combo, action),
-#include "combos.def"
-#undef CB
-};
diff --git a/keyboards/3w6/keymaps/helltm/config.h b/keyboards/3w6/keymaps/helltm/config.h
deleted file mode 100644
index 9ccb616a03f..00000000000
--- a/keyboards/3w6/keymaps/helltm/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 HellSingCoder
- *
- * 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
-
-/* Combo timer */
-#define COMBO_TERM 15
diff --git a/keyboards/3w6/keymaps/helltm/keymap.c b/keyboards/3w6/keymaps/helltm/keymap.c
deleted file mode 100644
index a87c7c75a92..00000000000
--- a/keyboards/3w6/keymaps/helltm/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Copyright 2021 HellSingCoder
- *
- * 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 COMBO_ENABLE
-#   include "combos.h"
-#endif
-
-enum layers
-{
-    _ALPHA_QWERTY = 0,
-    _SYM,
-    _NAV,
-    _NUM,
-};
-
-enum custom_keycodes {
-    KC_THUMB_SWAP,
-};
-
-/* Space Enter swap */
-bool swap_space_enter = false;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /*
-    * QWERTY
-    *
-    *                                          _____________________         _____________________
-    *                                       __|__                   |       |                   __|__
-    *                              _____   |     |                  v       v                  |     |   _____
-    *                       .-----|  E  |-----._____                                         _____.-----|  I  |-----.
-    *                 .-----|  W  |_____|  R  |  T  |  __           (       )           __  |  Y  |  U  |_____|  O  |-----.
-    *             __  |  Q  |-----|  D  |-----|_____|  __|--> +                   - <--|__  |_____|-----|  K  |-----|  P  |  __
-    *    ESC  <--|__  |-----|  S  |_____|  F  |  G  |               [       ]               |  H  |  J  |_____|  L  |-----|  __|--> '
-    *             __  |  A  |-----|  C  |-----|_____|  __                               __  |_____|-----| , < |-----| ; : |  __
-    *    TAB  <--|__  |-----|  X  |_____|  V  |  B  |  __|--> *     {       }     = <--|__  |  N  |  M  |_____| . > |-----|  __|--> "
-    *                 |  Z  |-----'     '-----|_____|                                       |_____|-----'     '-----| / ? |
-    *                 '-----'          .-----. _____   .-.._                           _..-.   _____ .-----.        '-----'
-    *                    |             | WIN ||CTRL | /     /                         \     \ | BSp || Del |           |
-    *                  SHIFT           '-----':_____|/ ENT /                           \ SPC \|_____:'-----'         SHIFT
-    *                                     |         '--.._/                             \_..--'  |      |
-    *                                    NUM                                                    NAV    SYM
-    */
-    [_ALPHA_QWERTY] = LAYOUT(
-        KC_Q,         KC_W   , KC_E   , KC_R   , KC_T   ,                                    KC_Y   , KC_U   , KC_I   , KC_O   , KC_P           ,
-        KC_A,         KC_S   , KC_D   , KC_F   , KC_G   ,                                    KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN        ,
-        LSFT_T(KC_Z), KC_X   , KC_C   , KC_V   , KC_B   ,                                    KC_N   , KC_M   , KC_COMM, KC_DOT , RSFT_T(KC_SLSH),
-                                LT(_NUM, KC_LGUI), KC_LCTL,  KC_ENT,       KC_SPC, LT(_NAV, KC_BSPC), LT(_SYM, KC_DEL)
-    ),
-
-    /*
-    * Symbols
-    *              _____                                                   _____
-    *       .-----|  #  |-----._____                           _____.-----|  *  |-----.
-    * .-----|  @  |_____|  $  |  %  |                         |  ^  |  &  |_____|  (  |-----.
-    * |  !  |-----|     |-----|_____|                         |_____|-----| [ { |-----|  )  |
-    * |-----|     |_____|     |     |                         |  {  |  }  |_____| ] } |-----|
-    * | ` ~ |-----|     |-----|_____|                         |_____|-----|     |-----| ' " |
-    * |-----|     |_____|     |     |                         | - _ | = + |_____|  |  |-----|
-    * |  ~  |-----'     '-----|_____|                         |_____|-----'     '-----| \ | |
-    * '-----'          .-----. _____   .-.._           _..-.   _____ .-----.          '-----'
-    *  SHIFT           |     ||CTRL | /     /         \     \ | BSp ||     |           SHIFT
-    *                  '-----':_____|/ ENT /           \ SPC \|_____:'-----'
-    *                               '--.._/             \_..--'
-    */
-    [_SYM] = LAYOUT(
-        KC_EXLM,         KC_AT  , KC_HASH, KC_DLR , KC_PERC,                                KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN        ,
-        KC_GRV ,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_QUOT        ,
-        LSFT_T(KC_TILD), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                KC_MINS, KC_EQL , XXXXXXX, KC_PIPE, RSFT_T(KC_BSLS),
-                                        XXXXXXX, _______, _______,                    _______, KC_BSPC, XXXXXXX
-    ),
-
-    /*
-    * Navigation
-    *              _____                                                   _____
-    *       .-----|Mute |-----._____                           _____.-----| Up  |-----.
-    * .-----|VDown|_____| VUp |     |                         |     |PDown|_____| PUp |-----.
-    * | Esc |-----|Play |-----|_____|                         |_____|-----|Down |-----| BSp |
-    * |-----|Prev |_____|Next |     |                         |Home |Left |_____|Right|-----|
-    * | Tab |-----|Stop |-----|_____|                         |_____|-----|     |-----| ' " |
-    * |-----|     |_____|     |     |                         |     |     |_____| End |-----|
-    * | CPS |-----'     '-----|_____|                         |_____|-----'     '-----| Del |
-    * '-----'          .-----. _____   .-.._           _..-.   _____ .-----.          '-----'
-    *  SHIFT           |     ||CTRL | /     /         \     \ | BSp ||     |           SHIFT
-    *                  '-----':_____|/ ENT /           \ SPC \|_____:'-----'
-    *                               '--.._/             \_..--'
-    */
-    [_NAV] = LAYOUT(
-        KC_ESC         , KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX,                                XXXXXXX, KC_PGDN, KC_UP  , KC_PGUP, KC_BSPC,
-        KC_TAB         , KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX,                                KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUOT,
-        LSFT_T(KC_CAPS), XXXXXXX, KC_MSTP, XXXXXXX, XXXXXXX,                                XXXXXXX, XXXXXXX, XXXXXXX, KC_END , RSFT_T(KC_DEL) ,
-                                        XXXXXXX, _______, _______,                    _______, KC_BSPC, XXXXXXX
-    ),
-
-    /*
-    * Numbers
-    *              _____                                                   _____
-    *       .-----|  3  |-----._____                           _____.-----|  8  |-----.
-    * .-----|  2  |_____|  4  |  5  |                         |  6  |  7  |_____|  9  |-----.
-    * |  1  |-----| F3  |-----|_____|                         |_____|-----| F8  |-----|  0  |
-    * |-----| F2  |_____| F4  | F5  |                         | F6  | F7  |_____| F9  |-----|
-    * | F1  |-----| Scr |-----|_____|                         |_____|-----|     |-----| F10 |
-    * |-----| TMg |_____|     |Swap |                         |     |     |_____| F11 |-----|
-    * |Shift|-----'     '-----|_____|                         |_____|-----'     '-----| F12 |
-    * '-----'          .-----. _____   .-.._           _..-.   _____ .-----.          '-----'
-    *                  |     ||CTRL | /     /         \     \ | BSp ||     |           SHIFT
-    *                  '-----':_____|/ ENT /           \ SPC \|_____:'-----'
-    *                               '--.._/             \_..--'
-    */
-    [_NUM] = LAYOUT(
-        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  , KC_F7  , KC_F8  , KC_F9  , KC_F10 ,
-        KC_LSFT, LCA(KC_DEL), SWIN(KC_S), XXXXXXX, KC_THUMB_SWAP,                                XXXXXXX, XXXXXXX, XXXXXXX, KC_F11 , RSFT_T(KC_F12) ,
-                                             XXXXXXX, _______, _______,                    _______, KC_BSPC, XXXXXXX
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-
-        /* Space Enter swap */
-        case KC_THUMB_SWAP:
-            if (record->event.pressed) {
-                unregister_code(KC_SPC);
-                unregister_code(KC_ENT);
-                swap_space_enter = !swap_space_enter;
-            }
-            return false;
-            break;
-
-        case KC_ENT:
-            if (swap_space_enter) {
-                if (record->event.pressed) {
-                    register_code(KC_SPC);
-                } else {
-                    unregister_code(KC_SPC);
-                }
-                return false;
-            }
-            break;
-        case KC_SPC:
-            if (swap_space_enter) {
-                if (record->event.pressed) {
-                    register_code(KC_ENT);
-                } else {
-                    unregister_code(KC_ENT);
-                }
-                return false;
-            }
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/3w6/keymaps/helltm/rules.mk b/keyboards/3w6/keymaps/helltm/rules.mk
deleted file mode 100644
index df85626f5f1..00000000000
--- a/keyboards/3w6/keymaps/helltm/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Combos
-COMBO_ENABLE = yes
diff --git a/keyboards/3w6/rev1/matrix.c b/keyboards/3w6/rev1/matrix.c
index 8bb6c77aaa4..aa3e43fbe05 100644
--- a/keyboards/3w6/rev1/matrix.c
+++ b/keyboards/3w6/rev1/matrix.c
@@ -70,7 +70,7 @@ uint8_t init_tca9555(void) {
         // This means: we will write on pins 0 to 2 on port 1. read rest
         0b11111000,
     };
-    tca9555_status = i2c_writeReg(I2C_ADDR, IODIRA, conf, 2, I2C_TIMEOUT);
+    tca9555_status = i2c_write_register(I2C_ADDR, IODIRA, conf, 2, I2C_TIMEOUT);
 
     return tca9555_status;
 }
@@ -189,7 +189,7 @@ static matrix_row_t read_cols(uint8_t row) {
         } else {
             uint8_t data     = 0;
             uint8_t ports[2] = {0};
-            tca9555_status = i2c_readReg(I2C_ADDR, IREGP0, ports, 2, I2C_TIMEOUT);
+            tca9555_status = i2c_read_register(I2C_ADDR, IREGP0, ports, 2, I2C_TIMEOUT);
             if (tca9555_status) {  // if there was an error
                 // do nothing
                 return 0;
@@ -252,7 +252,7 @@ static void select_row(uint8_t row) {
             }
 
             uint8_t ports[2] = {port0, port1};
-            tca9555_status = i2c_writeReg(I2C_ADDR, OREGP0, ports, 2, I2C_TIMEOUT);
+            tca9555_status = i2c_write_register(I2C_ADDR, OREGP0, ports, 2, I2C_TIMEOUT);
             // Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one.
             // Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus.
         }
diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
index a6661cdc076..0db58bfabd6 100644
--- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
+++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
@@ -38,7 +38,7 @@ static uint16_t i2c_timeout_timer;
 
 void trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white) {
     uint8_t data[] = {0x00, red, green, blue, white};
-    i2c_transmit(TRACKBALL_WRITE, data, sizeof(data), I2C_TIMEOUT);
+    i2c_transmit(TRACKBALL_ADDRESS, data, sizeof(data), I2C_TIMEOUT);
 }
 
 int16_t mouse_offset(uint8_t positive, uint8_t negative, int16_t scale) {
@@ -120,7 +120,7 @@ bool pointing_device_task(void) {
     static uint16_t debounce_timer;
     uint8_t         state[5] = {};
     if (timer_elapsed(i2c_timeout_timer) > I2C_WAITCHECK) {
-        if (i2c_readReg(TRACKBALL_WRITE, 0x04, state, 5, I2C_TIMEOUT) == I2C_STATUS_SUCCESS) {
+        if (i2c_read_register(TRACKBALL_ADDRESS, 0x04, state, 5, I2C_TIMEOUT) == I2C_STATUS_SUCCESS) {
             if (!state[4] && !debounce) {
                 if (scrolling) {
 #ifdef PIMORONI_TRACKBALL_INVERT_X
diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h
index cfcd5a47a1b..ca2559bec74 100644
--- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h
+++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h
@@ -20,10 +20,8 @@
 #include "pointing_device.h"
 
 #ifndef TRACKBALL_ADDRESS
-#    define TRACKBALL_ADDRESS 0x0A
+#    define TRACKBALL_ADDRESS (0x0A << 1)
 #endif
-#define TRACKBALL_WRITE ((TRACKBALL_ADDRESS << 1) | I2C_WRITE)
-#define TRACKBALL_READ  ((TRACKBALL_ADDRESS << 1) | I2C_READ)
 
 void trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
 void trackball_check_click(bool pressed, report_mouse_t *mouse);
diff --git a/keyboards/3w6/rev2/matrix.c b/keyboards/3w6/rev2/matrix.c
index 49cb09a9f82..da7a5344e5f 100644
--- a/keyboards/3w6/rev2/matrix.c
+++ b/keyboards/3w6/rev2/matrix.c
@@ -70,7 +70,7 @@ uint8_t init_tca9555(void) {
         // This means: we will write on pins 0 to 3 on port 1. read rest
         0b11110000,
     };
-    tca9555_status = i2c_writeReg(I2C_ADDR, IODIRA, conf, 2, I2C_TIMEOUT);
+    tca9555_status = i2c_write_register(I2C_ADDR, IODIRA, conf, 2, I2C_TIMEOUT);
 
     return tca9555_status;
 }
@@ -189,7 +189,7 @@ static matrix_row_t read_cols(uint8_t row) {
         } else {
             uint8_t data    = 0;
             uint8_t port0   = 0;
-            tca9555_status  = i2c_readReg(I2C_ADDR, IREGP0, &port0, 1, I2C_TIMEOUT);
+            tca9555_status  = i2c_read_register(I2C_ADDR, IREGP0, &port0, 1, I2C_TIMEOUT);
             if (tca9555_status) {  // if there was an error
                 // do nothing
                 return 0;
@@ -250,7 +250,7 @@ static void select_row(uint8_t row) {
                 default:                    break;
             }
 
-            tca9555_status = i2c_writeReg(I2C_ADDR, OREGP1, &port1, 1, I2C_TIMEOUT);
+            tca9555_status = i2c_write_register(I2C_ADDR, OREGP1, &port1, 1, I2C_TIMEOUT);
             // Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one.
             // Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus.
         }
diff --git a/keyboards/40percentclub/25/keymaps/macro/keymap.c b/keyboards/40percentclub/25/keymaps/macro/keymap.c
deleted file mode 100644
index 9e7b1ba61f2..00000000000
--- a/keyboards/40percentclub/25/keymaps/macro/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2018
- *
- * 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_macro(
-    KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,
-    KC_GRV,   KC_Q,    KC_W,    KC_E,    KC_R,
-    KC_TAB,   KC_A,    KC_S,    KC_D,    KC_F,
-    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,
-    KC_LCTL,  KC_LGUI, KC_LALT, KC_SPC,  KC_SPC
-  ),
-};
diff --git a/keyboards/40percentclub/25/keymaps/macro/readme.md b/keyboards/40percentclub/25/keymaps/macro/readme.md
deleted file mode 100644
index 6645f93dd88..00000000000
--- a/keyboards/40percentclub/25/keymaps/macro/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default macro keymap for 25
diff --git a/keyboards/40percentclub/6lit/keymaps/macro/keymap.c b/keyboards/40percentclub/6lit/keymaps/macro/keymap.c
deleted file mode 100644
index f9b0be32e1b..00000000000
--- a/keyboards/40percentclub/6lit/keymaps/macro/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2018
- *
- * 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_macro( /* Base */
-    KC_F19,   KC_F20,   KC_F21,
-    KC_F22,   KC_F23,   KC_F24
-  ),
-};
diff --git a/keyboards/40percentclub/6lit/keymaps/macro/readme.md b/keyboards/40percentclub/6lit/keymaps/macro/readme.md
deleted file mode 100644
index 9f883b821c8..00000000000
--- a/keyboards/40percentclub/6lit/keymaps/macro/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default single board macro keymap for 6lit
diff --git a/keyboards/40percentclub/foobar/keymaps/macro/keymap.c b/keyboards/40percentclub/foobar/keymaps/macro/keymap.c
deleted file mode 100644
index 8eb09293873..00000000000
--- a/keyboards/40percentclub/foobar/keymaps/macro/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018
- *
- * 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_macro( /* Base */
-    KC_F13,   KC_F14,   KC_F15,   KC_F16,   KC_INT1,
-    KC_F17,   KC_F18,   KC_F19,   KC_F20,   KC_INT2,
-    KC_F21,   KC_F22,   KC_F23,   KC_F14,   KC_INT5
-  ),
-};
diff --git a/keyboards/40percentclub/foobar/keymaps/macro/readme.md b/keyboards/40percentclub/foobar/keymaps/macro/readme.md
deleted file mode 100644
index 4cc59e7e5d3..00000000000
--- a/keyboards/40percentclub/foobar/keymaps/macro/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default single board macro keymap for foobar
diff --git a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
deleted file mode 100644
index f6c6117726b..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#undef WS2812_DI_PIN
-#undef RGBLED_NUM
-#define WS2812_DI_PIN D2
-#    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 8
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
deleted file mode 100644
index 3eeb5694f70..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern rgblight_config_t rgblight_config;
-extern keymap_config_t keymap_config;
-
-#define _PS 0 // This is the Photoshop Layer
-#define _AI 1 // This is the Illustrator Layer
-#define _PR 2 // This is the Premier Layer
-#define _XD 3 // This is the Experience Design Layer
-
-enum custom_keycodes {
-  PS = SAFE_RANGE,
-  AI,
-  PR,
-  MACRO_0,
-};
-
-#define PS TO(0)
-#define AI TO(1)
-#define PR TO(2)
-#define XD TO(3)
-
-// Mix of Photoshop, Illustrator, Premiere, and Experience Design shortcuts.
-#define SAVE  LCTL(KC_S)
-#define OPEN  LCTL(KC_O)
-#define COPY  LCTL(KC_C)
-#define PAST  LCTL(KC_V)
-#define CUNDO LCTL(LALT(KC_Z))
-#define INVERT LCTL(LSFT(KC_I))
-#define NLAYER LSFT(LCTL(KC_N))
-#define UNDO LCTL(KC_Z)
-#define TRANS LCTL(KC_T)
-#define ALIGNL LCTL(LSFT(KC_L))
-#define ALIGNC LCTL(LSFT(KC_C))
-#define ALIGNR LCTL(LSFT(KC_R))
-#define BRINGF LCTL(KC_RBRC)
-#define BRINGB LCTL(KC_LBRC)
-
-// Illustrator layer shortcuts.
-#define SHAPE LSFT(KC_M)
-#define RULER LCTL(LALT(KC_R))
-
-// Premiere layer shortcuts.
-#define REDO LCTL(LSFT(KC_Z))
-#define EXPORT LCTL(KC_M)
-#define IMPORT LCTL(KC_I)
-#define PCOPY LCTL(KC_V)
-#define PPASTE LCTL(LSFT(KC_V))
-
-// Experience Design layer shortcuts. (can be used with others too.)
-#define NEW LCTL(KC_N)
-#define LOCK LCTL(KC_L)
-#define SYMB LCTL(KC_K)
-#define HIDE LCTL(KC_SCLN)
-#define REPEAT LCTL(KC_R)
-#define MASK LCTL(LSFT(KC_M))
-#define GROUP LCTL(KC_G)
-#define UNGRP LCTL(LSFT(KC_G))
-#define VIEW LCTL(KC_TAB)
-#define HORZ LSFT(KC_C)
-#define VERT LSFT(KC_M)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // Photoshop layer
-  [_PS] = LAYOUT_ortho_3x10(
-    SAVE,    KC_W, KC_E, KC_T,  KC_U,   KC_I,   KC_P,   INVERT,  CUNDO,   NLAYER,
-    UNDO,    KC_H, KC_L, TRANS, ALIGNL, ALIGNC, ALIGNR, BRINGB,  BRINGF,  OPEN,
-    KC_LSFT, COPY, PAST, KC_Z,  KC_C,   KC_V,   KC_B,   KC_LBRC, KC_RBRC, AI
-  ),
-
-  // Illustrator layer
-  [_AI] = LAYOUT_ortho_3x10(
-    _______, MACRO_0, RULER,   _______, KC_G,    _______, _______, KC_Q,  KC_MINS, KC_PLUS,
-    _______, _______, _______, KC_E,    _______, _______, _______, SHAPE, KC_O,    OPEN,
-    _______, _______, _______, _______, _______, _______, _______, KC_M,  KC_SLSH, PR
-  ),
-
-  // Premiere layer
-  [_PR] = LAYOUT_ortho_3x10(
-    _______, KC_Q,  KC_W,   KC_I,   KC_O, KC_P, IMPORT, EXPORT,  KC_MINS,  KC_EQL,
-    _______, REDO,  KC_D,   KC_F,   KC_H, KC_M, KC_ENT, KC_LBRC, KC_RBRC,  OPEN,
-    _______, PCOPY, PPASTE, KC_SPC, KC_Z, KC_C, KC_V,   KC_LEFT, KC_RIGHT, XD
-  ),
-
-  // Experience Design layer
-  [_XD] = LAYOUT_ortho_3x10(
-    _______, KC_E,    KC_R,  KC_T,  KC_P, KC_A, KC_L, KC_V, KC_DEL, NEW,
-    _______, REDO,    GROUP, UNGRP, VIEW, HORZ, VERT, KC_Z, KC_ENT, OPEN,
-    _______, KC_LCTL, COPY,  PAST,  SYMB, LOCK, MASK, HIDE, REPEAT, PS
-  ),
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-void matrix_init_user(void) {
-  rgblight_enable();
-}
-
-void matrix_scan_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-
-  static uint8_t old_layer = 255;
-  uint8_t new_layer = get_highest_layer(layer_state);
-
-  // Color of the Icons.
-  if (old_layer != new_layer) {
-    switch (new_layer) {
-      case _PS:
-        // #31C5F0
-        rgblight_setrgb(49, 197, 240);
-      break;
-      case _AI:
-        // #FF8011
-        rgblight_setrgb(255, 128, 17);
-      break;
-      case _PR:
-        // #E788FF
-        rgblight_setrgb(231, 136, 255);
-      break;
-      case _XD:
-        // #FF2BC2
-        rgblight_setrgb(255, 43, 194);
-      break;
-    }
-    old_layer = new_layer;
-  }
-  #endif
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	if (record->event.pressed) {
-		switch(keycode) {
-			case MACRO_0:
-        // Save for Web Macro.
-				SEND_STRING(SS_LSFT(SS_LALT(SS_LCTL("s"))));
-				return false;
-		}
-	}
-	return true;
-};
diff --git a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/rules.mk b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/rules.mk
deleted file mode 100644
index b359ca2874c..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/40percentclub/gherkin/keymaps/michel/config.h b/keyboards/40percentclub/gherkin/keymaps/michel/config.h
deleted file mode 100644
index 2105fa65b52..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/michel/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#undef WS2812_DI_PIN
-#undef RGBLED_NUM
-#define WS2812_DI_PIN D3
-#    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 10
-
-/* Make layout upside down = USB port on left side */
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
-#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4 }
diff --git a/keyboards/40percentclub/gherkin/keymaps/michel/keymap.c b/keyboards/40percentclub/gherkin/keymaps/michel/keymap.c
deleted file mode 100644
index dc2c1333998..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/michel/keymap.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_ortho_3x10(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(1, KC_ENT), LSFT_T(KC_Z), LALT_T(KC_X), LGUI_T(KC_C), KC_V, KC_BSPC, KC_SPC, RGUI_T(KC_B), LT(3, KC_N), LT(2, KC_M), KC_RSFT),
-	[1] = LAYOUT_ortho_3x10(KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT),
-	[2] = LAYOUT_ortho_3x10(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LBRC, KC_NO, KC_SCLN, KC_NO, KC_QUOT, 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_RSFT),
-	[3] = LAYOUT_ortho_3x10(KC_TAB, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, 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/40percentclub/gherkin/keymaps/michel/rules.mk b/keyboards/40percentclub/gherkin/keymaps/michel/rules.mk
deleted file mode 100644
index 77b529c0e72..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/michel/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/40percentclub/gherkin/keymaps/midi/config.h b/keyboards/40percentclub/gherkin/keymaps/midi/config.h
deleted file mode 100644
index 4a9607e5b4f..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/midi/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 190
-
-#define MUSIC_MASK (keycode != KC_NO)
-#define MIDI_ADVANCED
diff --git a/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c b/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c
deleted file mode 100644
index b1ded193fe6..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/midi/keymap.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_number {
-  _IONIAN = 0,
-  _DORIAN,
-  _PHRYGIAN,
-  _LYDIAN,
-  _MIXOLYDIAN,
-  _AEOLIAN,
-  _LOCRIAN,
-  _MENU
-};
-
-enum custom_keycodes {
-  IONIAN = SAFE_RANGE,
-  DORIAN,
-  PHRYGIAN,
-  LYDIAN,
-  MIXOLYDIAN,
-  AEOLIAN,
-  LOCRIAN,
-};
-
-#define MENU MO(_MENU)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_IONIAN] = LAYOUT_ortho_3x10(
-    MI_C1,  MI_F1,  MI_B1,  MI_E2,  MI_A2,  MI_D3,  MI_G3,  MI_C4,  MI_OCTD, MI_OCTU,
-    MI_D1,  MI_G1,  MI_C2,  MI_F2,  MI_B2,  MI_E3,  MI_A3,  MI_D4,  MI_TRSD, MI_TRSU,
-    MI_E1,  MI_A1,  MI_D2,  MI_G2,  MI_C3,  MI_F3,  MI_B3,  MI_E4,  MI_SUST, MENU
-  ),
-
-  [_DORIAN] = LAYOUT_ortho_3x10(
-    MI_C1,  MI_F1,  MI_As1, MI_Ds2, MI_A2,  MI_D3,  MI_G3,  MI_C4,  _______, _______,
-    MI_D1,  MI_G1,  MI_C2,  MI_F2,  MI_As2, MI_Ds3, MI_A3,  MI_D4,  _______, _______,
-    MI_Ds1, MI_A1,  MI_D2,  MI_G2,  MI_C3,  MI_F3,  MI_As3, MI_Ds4, _______, _______
-  ),
-
-  [_PHRYGIAN] = LAYOUT_ortho_3x10(
-    MI_C1,  MI_F1,  MI_As1, MI_Ds2, MI_Gs2, MI_Cs3, MI_G3,  MI_C4,  _______, _______,
-    MI_Cs1, MI_G1,  MI_C2,  MI_F2,  MI_As2, MI_Ds3, MI_Gs3, MI_Cs4, _______, _______,
-    MI_Ds1, MI_Gs1, MI_Cs2, MI_G2,  MI_C3,  MI_F3,  MI_As3, MI_Ds4, _______, _______
-  ),
-
-  [_LYDIAN] = LAYOUT_ortho_3x10(
-    MI_C1,  MI_Fs1, MI_B1,  MI_E2,  MI_A2,  MI_D3,  MI_G3,  MI_C4,  _______, _______,
-    MI_D1,  MI_G1,  MI_C2,  MI_Fs2, MI_B2,  MI_E3,  MI_A3,  MI_D4,  _______, _______,
-    MI_E1,  MI_A1,  MI_D2,  MI_G2,  MI_C3,  MI_Fs3, MI_B3,  MI_E4,  _______, _______
-  ),
-
-  [_MIXOLYDIAN] = LAYOUT_ortho_3x10(
-    MI_C1,  MI_F1,  MI_As1, MI_E2,  MI_A2,  MI_D3,  MI_G3,  MI_C4,  _______, _______,
-    MI_D1,  MI_G1,  MI_C2,  MI_F2,  MI_As2, MI_E3,  MI_A3,  MI_D4,  _______, _______,
-    MI_E1,  MI_A1,  MI_D2,  MI_G2,  MI_C3,  MI_F3,  MI_As3, MI_E4,  _______, _______
-  ),
-
-  [_AEOLIAN] = LAYOUT_ortho_3x10(
-    MI_C1,  MI_F1,  MI_As1, MI_Ds2, MI_Gs2, MI_D3,  MI_G3,  MI_C4,  _______, _______,
-    MI_D1,  MI_G1,  MI_C2,  MI_F2,  MI_As2, MI_Ds3, MI_Gs3, MI_D4,  _______, _______,
-    MI_Ds1, MI_Gs1, MI_D2,  MI_G2,  MI_C3,  MI_F3,  MI_As3, MI_Ds4, _______, _______
-  ),
-
-  [_LOCRIAN] = LAYOUT_ortho_3x10(
-    MI_C1,  MI_F1,  MI_As1, MI_Ds2, MI_Gs2, MI_Cs3, MI_Fs3, MI_C4,  _______, _______,
-    MI_Cs1, MI_Fs1, MI_C2,  MI_F2,  MI_As2, MI_Ds3, MI_Gs3, MI_Cs4, _______, _______,
-    MI_Ds1, MI_Gs1, MI_Cs2, MI_Fs2, MI_C3,  MI_F3,  MI_As3, MI_Ds4, _______, _______
-  ),
-
-  [_MENU] = LAYOUT_ortho_3x10(
-    IONIAN,   LYDIAN,     LOCRIAN, _______, _______, _______, _______, _______, _______, _______,
-    DORIAN,   MIXOLYDIAN, _______, _______, _______, _______, _______, _______, _______, _______,
-    PHRYGIAN, AEOLIAN,    _______, _______, _______, _______, _______, _______, QK_BOOT, _______
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case IONIAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_IONIAN);
-      }
-      break;
-    case DORIAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DORIAN);
-      }
-      break;
-    case PHRYGIAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_PHRYGIAN);
-      }
-      break;
-    case LYDIAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_LYDIAN);
-      }
-      break;
-    case MIXOLYDIAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_MIXOLYDIAN);
-      }
-      break;
-    case AEOLIAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_AEOLIAN);
-      }
-      break;
-    case LOCRIAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_LOCRIAN);
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/40percentclub/gherkin/keymaps/midi/readme.md b/keyboards/40percentclub/gherkin/keymaps/midi/readme.md
deleted file mode 100644
index f8fad08dc85..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/midi/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-### Gherkin Midi
-A gherkin midi layout that should cover most midi note playing needs.
-
-A 3x8 grid of notes written bottom left to right upwards as notes for the selected mode, with octave and transpose note controls at the top. Menu accesses other mode layouts, persisted to keyboard settings, and a reset for firmware programming.
-
-Modes are set by pressing Menu and their corresponding note from the C Ionian layout. That is, for Aeolian, press Menu and A 1. For Phrygian, press Menu and E 1.
-
-#### Keyboard Default Layout
-![](https://i.imgur.com/VNc0GsI.jpg)
-
-Keyboard Editor Gist [link](https://gist.github.com/scottsheffield/c57859fe1a85d703f5387bf8ce41028c)
-
-#### Glamour Shot
-![](https://i.imgur.com/B3Q4JoU.jpg)
\ No newline at end of file
diff --git a/keyboards/40percentclub/gherkin/keymaps/midi/rules.mk b/keyboards/40percentclub/gherkin/keymaps/midi/rules.mk
deleted file mode 100644
index a7e93c23412..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/midi/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	  # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no	  # Audio control and System control(+450)
-CONSOLE_ENABLE = no	    # Console for debug(+400)
-COMMAND_ENABLE = no     # Commands for debug and configuration
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no
-MIDI_ENABLE = yes
diff --git a/keyboards/40percentclub/gherkin/keymaps/mjt/config.h b/keyboards/40percentclub/gherkin/keymaps/mjt/config.h
deleted file mode 100644
index 5a295a06ca9..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/mjt/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#undef MANUFACTURER
-#define MANUFACTURER    "Some Guy"
diff --git a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
deleted file mode 100644
index 3a5cef8fad0..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
+++ /dev/null
@@ -1,177 +0,0 @@
-#include QMK_KEYBOARD_H
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-//Tap Dance Declarations
-enum {
-  TD_Z_LCTL = 0,
-  TD_X_LGUI = 1,
-  TD_C_LALT = 2,
-  TD_A_TAB = 3,
-  TD_Q_ESC = 4,
-};
-
-//Friendly Layer Names
-enum gherkin_layers {
-  _QWERTY,
-  _SONGS,
-  _NUMBERS,
-  _SYMBOLS,
-  _PLOVER,
-  _ADJUST
-};
-
-// custom keycodes
-enum gherkin_keycodes {
-  QWERTY = SAFE_RANGE,
-  NUMBERS,
-  SYMBOLS,
-  SONGS,
-  PLOVER,
-  BACKLIT,
-  MACSLEEP,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_ortho_3x10(
-    TD(TD_Q_ESC),   KC_W,               KC_E,           KC_R,  KC_T,               KC_Y,   KC_U,  KC_I,     KC_O,    KC_P,
-    TD(TD_A_TAB),   LT(_SYMBOLS,KC_S),  KC_D,           KC_F,  KC_G,               KC_H,   KC_J,  KC_K,     KC_L,    LT(_ADJUST,KC_SPC),
-    TD(TD_Z_LCTL),  TD(TD_X_LGUI),      TD(TD_C_LALT),  KC_V,  KC_B,  LT(_NUMBERS, KC_N),  KC_M,  KC_COMM,  KC_DOT,  SFT_T(KC_ENT)
-  ),
-  [_NUMBERS] = LAYOUT_ortho_3x10(
-    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,    KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END ,
-    KC_F7,  KC_F8,  KC_F9,  KC_F10,  LT(_ADJUST,KC_F11),  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT
-  ),
-  [_SYMBOLS] = LAYOUT_ortho_3x10(
-    KC_EXLM,  KC_AT,        KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,     KC_RPRN,
-    KC_GRV,   _______,      XXXXXXX,  KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_MINS,  KC_EQL ,  KC_SCLN,     KC_QUOT,
-    KC_TILD,  MO(_ADJUST),  XXXXXXX,  KC_LCBR,  KC_RCBR,  KC_PIPE,  KC_UNDS,  KC_PLUS,  S(KC_SCLN),  S(KC_QUOT)
-  ),
-  [_PLOVER] = LAYOUT_ortho_3x10(
-    KC_Q,     KC_W,     KC_E,  KC_R,  KC_1,     KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,
-    KC_A,     KC_S,     KC_D,  KC_F,  KC_G,     KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,
-    EXT_PLV,  XXXXXXX,  KC_C,  KC_V,  XXXXXXX,  KC_N,  KC_M,  XXXXXXX,  XXXXXXX,  XXXXXXX
-  ),
-  [_ADJUST] = LAYOUT_ortho_3x10(
-    QK_BOOT,  _______,  _______,  _______,  _______,  QWERTY,   NUMBERS,  SYMBOLS,  PLOVER,    SONGS,
-    AU_PREV,  AU_NEXT,  MU_ON,    MU_OFF,   _______,  _______,  _______,  _______,  MACSLEEP,  _______,
-    BACKLIT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______
-  )
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case NUMBERS:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistant_default_layer_set(1UL<<_NUMBERS);
-      }
-      return false;
-      break;
-    case SYMBOLS:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistant_default_layer_set(1UL<<_SYMBOLS);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(tone_plover);
-        #endif
-        layer_off(_NUMBERS);
-        layer_off(_SYMBOLS);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover_gb);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case MACSLEEP:
-      if (record->event.pressed) {
-          // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
-          register_code(KC_RSFT);
-          register_code(KC_RCTL);
-          register_code(KC_PWR);
-          unregister_code(KC_PWR);
-          unregister_code(KC_RCTL);
-          unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-}
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Esc, twice for Caps Lock
-  [TD_Z_LCTL]  = ACTION_TAP_DANCE_DOUBLE(KC_Z, KC_LCTL),
-  [TD_X_LGUI]  = ACTION_TAP_DANCE_DOUBLE(KC_X, KC_LGUI),
-  [TD_C_LALT]  = ACTION_TAP_DANCE_DOUBLE(KC_C, KC_LALT),
-  [TD_A_TAB]  = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB),
-  [TD_Q_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC)
-};
diff --git a/keyboards/40percentclub/gherkin/keymaps/mjt/rules.mk b/keyboards/40percentclub/gherkin/keymaps/mjt/rules.mk
deleted file mode 100644
index 3a35ae3b302..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/mjt/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-AUDIO_ENABLE = yes          # Audio output on port C6
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
deleted file mode 100644
index 0df91ad9252..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-/* Make layout the right way:
- *  - USB port on left side
- *  - Switches facing the correct way
- */
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
-#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4 }
-
-// Set the mouse settings to a comfortable speed/accuracy trade-off
-// Assume the screen refresh rate is 60 Htz or higher
-// The default is 50. This makes the mouse ~3 times faster and more accurate
-#define MOUSEKEY_INTERVAL 16
-// The default is 20. Since we made the mouse about 3 times faster with the previous setting,
-// give it more time to accelerate to max speed to retain precise control over short distances.
-#define MOUSEKEY_TIME_TO_MAX 40
-// The default is 300. Let's try and make this as low as possible while keeping the cursor responsive
-#define MOUSEKEY_DELAY 100
-// It makes sense to use the same delay for the mouseweel
-#define MOUSEKEY_WHEEL_DELAY 100
-// The default is 100
-#define MOUSEKEY_WHEEL_INTERVAL 50
-// The default is 40
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
-
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-#define QUICK_TAP_TERM 0
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json b/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
deleted file mode 100644
index 139421c44c0..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version":1,"notes":"My awesome keymap","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"40percentclub/gherkin","keymap":"pierrec83","layout":"LAYOUT_ortho_3x10","layers":[["KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_BSPC","LSFT_T(KC_A)","LT(5,KC_S)","LT(1,KC_H)","LT(3,KC_T)","KC_G","KC_Y","LT(4,KC_N)","LT(2,KC_E)","LT(6,KC_O)","LSFT_T(KC_I)","KC_Z","KC_X","KC_M","KC_C","KC_V","LT(7,KC_SPC)","KC_L","LALT_T(KC_COMM)","LCTL_T(KC_DOT)","KC_K"],["KC_TRNS","ANY(LCTL(LSFT(KC_C)))","KC_PGUP","ANY(LCTL(LSFT(KC_V)))","KC_TRNS","KC_TRNS","KC_BTN1","KC_WH_U","KC_BTN2","KC_TRNS","KC_TRNS","KC_BTN2","KC_NO","KC_BTN1","KC_TRNS","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_U","KC_MS_R","KC_TRNS","KC_TRNS","KC_PGDN","KC_TRNS","KC_TRNS","KC_TRNS","KC_MPRV","KC_WH_D","KC_MNXT","TG(1)"],["KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","BL_BRTG","BL_UP","KC_WH_U","KC_TRNS","KC_TRNS","KC_LEFT","KC_UP","KC_DOWN","KC_RGHT","KC_TRNS","BL_TOGG","KC_LGUI","KC_NO","LCTL(KC_LALT)","LCA(KC_LSFT)","KC_TRNS","KC_HOME","KC_PGDN","KC_END","KC_TRNS","BL_STEP","BL_DOWN","KC_WH_D","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UNDS","KC_PIPE","KC_QUOT","KC_TRNS","KC_CIRC","KC_ASTR","KC_AMPR","KC_NO","KC_TRNS","KC_HASH","KC_TILD","KC_SLSH","KC_DQUO","KC_DLR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_BSLS","KC_GRV","KC_TRNS"],["KC_TRNS","KC_COLN","KC_LT","KC_GT","KC_SCLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_LPRN","KC_RPRN","KC_AT","KC_TRNS","KC_NO","KC_EQL","KC_PLUS","KC_PERC","KC_TRNS","KC_EXLM","KC_LBRC","KC_RBRC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F7","KC_F8","KC_F9","KC_F10","KC_LCTL","KC_NO","KC_LALT","LCTL(KC_LALT)","KC_TRNS","KC_TRNS","KC_F4","KC_F5","KC_F6","KC_F11","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F1","KC_F2","KC_F3","KC_F12"],["KC_PSLS","KC_7","KC_8","KC_9","KC_PPLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_0","KC_4","KC_5","KC_6","KC_PMNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_PAST","KC_1","KC_2","KC_3","KC_PEQL","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["LT(8,KC_TRNS)","KC_ESC","KC_COLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_DEL","KC_TRNS","KC_PERC","KC_SLSH","KC_ENT","KC_EXLM","KC_TRNS","KC_LGUI","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TAB","KC_TRNS","KC_TRNS","RALT(KC_TRNS)","RCTL(KC_TRNS)","TG(1)"],["KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","EE_CLR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Anonymous"}
\ No newline at end of file
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/readme.md b/keyboards/40percentclub/gherkin/keymaps/pierrec83/readme.md
deleted file mode 100644
index 0ade64b3463..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/readme.md
+++ /dev/null
@@ -1,38 +0,0 @@
-@pierrec83's keymap for the gherkin
-===
-
-A usable keymap for the gherkin's 30 keys layout, somewhat in sync with my Kyria keymap.
-
-This keymap is more or less an adaptation of my Kyria keymap which sacrifices some convenience but retains most functionality.
-
-Features
----
-* Mouse keys with constants tuned so the keyboard usable for me as my sole pointing device
-* Homerow layers activation
-* Minimal side-index motion thanks to workman base layer and similar principles in other layers
-* Two symbol layers, both activated with one homerow key and either another key on the same hand's homerow or a key from the other hand
-* Mousing around, including left and right clicking can be done either one-handed or fully on the homerow with both hands
-* Easy chaining of common command line or vim patterns, such as `~/`, `()`, `ESC : w ENTER` etc.
-* Common OS shortcuts like switching workspaces on gnome or MacOS easily accessible (for the shortcuts I use. This may not apply to others)
-
-Instructions to update the keymap
----
-
-For now, I am still more comfortable updating the keymap through the qmk configurator as I don't trust myself to manually keep comments describing the keymap in sync with the code itself. This means that my keymap.c is generated and not really readable. For a readble view of my keymap, one must import keymap.json into [qmk configurator](https://config.qmk.fm) and use the web UI or print it.
-
-To update the keymap,
-* Load keymap.json into qmk configurator
-* Perform any edits
-* Export the keymap. This should save a json file in `~/Downloads/pierrec83.json` or equivalent for your OS
-* From the root of qmk_firmware, move the keymap to its destination:
-```
-mv ~/Downloads/pierrec83.json keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
-```
-* Flash the firmware (for instance, if left hand is plugged):
-```
-qmk flash -kb 40percentclub/gherkin -km pierrec83
-```
-
-Author
----
-I am @pierrec83 on Twitter, @pierrechevalier83 on github. I chose the shorter nickname for my keymap.
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/rules.mk b/keyboards/40percentclub/gherkin/keymaps/pierrec83/rules.mk
deleted file mode 100644
index bd518d8f273..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/40percentclub/gherkin/keymaps/steno/config.h b/keyboards/40percentclub/gherkin/keymaps/steno/config.h
deleted file mode 100644
index 20a8f7844a9..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/steno/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#define NO_ACTION_LAYER
-#define NO_ACTION_TAPPING
-#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/40percentclub/gherkin/keymaps/steno/keymap.c b/keyboards/40percentclub/gherkin/keymaps/steno/keymap.c
deleted file mode 100644
index ea473fa25fb..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/steno/keymap.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  LAYOUT_ortho_3x10(
-    STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-    STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-    STN_NUM, STN_NUM, STN_A,   STN_O,   STN_NUM, STN_E,   STN_U,   STN_NUM, STN_NUM, STN_NUM),
-};
-
-void matrix_init_user(void) {
-  steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
-}
\ No newline at end of file
diff --git a/keyboards/40percentclub/gherkin/keymaps/steno/readme.md b/keyboards/40percentclub/gherkin/keymaps/steno/readme.md
deleted file mode 100644
index 6536ed7aba4..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/steno/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Gherkin Steno
-
-This is a stenography-only keymap. It boots by default into GeminiPR mode. All the excess stuff is stripped away (I'd remove normal keyboard support if I could).
-
-> Note: The number bar has been moved to the bottom row in all the left-over spaces.
-
-    | S | T | P | H | * | F | P | L | T | D |
-    | S | K | W | R | * | R | B | G | S | Z |
-    | # | # | A | O | # | E | U | # | # | # |
diff --git a/keyboards/40percentclub/gherkin/keymaps/steno/rules.mk b/keyboards/40percentclub/gherkin/keymaps/steno/rules.mk
deleted file mode 100644
index 1210452d86f..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/steno/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-STENO_ENABLE = yes     # Additional protocols for Stenography(+1700), requires VIRTSER
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no   # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no   # Audio control and System control(+450)
-CONSOLE_ENABLE = no    # Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = no       # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
deleted file mode 100644
index c97c9c2f4b3..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-// bootloader (first top leftmost key)
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
-
-
-// Behaviors That Can Be Configured
-
-
-#define TAPPING_TERM 250
-        // how long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-
-#define PERMISSIVE_HOLD
-       // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM
-
-#define QUICK_TAP_TERM 0
-        // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap)
-        // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-
-
-/*
-    #define TAPPING_TERM_PER_KEY
-        // enables handling for per key TAPPING_TERM settings
-    #define RETRO_TAPPING
-        // tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-    #define TAPPING_TOGGLE 2
-        // how many taps before triggering the toggle
-    #define LEADER_TIMEOUT 300
-        // how long before the leader key times out
-        // If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-    #define LEADER_PER_KEY_TIMING
-        // sets the timer for leader key chords to run on each key press rather than overall
-    #define LEADER_KEY_STRICT_KEY_PROCESSING
-        // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-    #define ONESHOT_TIMEOUT 300
-        // how long before oneshot times out
-    #define ONESHOT_TAP_TOGGLE 2
-        // how many taps before oneshot toggle is triggered
-    #define COMBO_TERM 200
-        // how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-    #define TAP_CODE_DELAY 100
-        // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-    #define TAP_HOLD_CAPS_DELAY 80
-        // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-*/
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c b/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c
deleted file mode 100644
index 3516c7a0c3e..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/keymap.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Copyright 2019 Stefano Marago'
- *
- * 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/>.
- */
-
-
-/*
- * The 25% SuperMicro keyboard: a pure - full features - "Alpha 26" keymap on Gherkin, compatible also with 28 and 30 keys layouts
- * See https://github.com/stevexyz/qmk_firmware/blob/master/keyboards/40percentclub/gherkin/keymaps/stevexyz/readme.md for more information
- */
-
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  LAYER_HOME, // home base layer
-  LAYER_FUNC, // function keys and cursors
-  LAYER_NUMSYM, // numbers and other characters
-  LAYER_SYST, // media, mouse and other system keys
-  LAYER_ARROWPAD,
-  LAYER_NUMPAD,
-  LAYER_MEDIAPAD,
-};
-
-enum custom_keycodes {
-  CK_TRIPLEZERO = SAFE_RANGE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * LEGEND:
- *
- * ,--------------------------------.
- * |     Top row: shifted character |
- * | Central row: standard char     |
- * |  Bottom row: hold modifier     |
- * `--------------------------------'
- *
- *  "____" means free to be assigned
- *
- */
-
-/* Qwerty Home Layer
- * ,---------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |
- * |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |
- * | ____ | ____ | ____ | ____ | ____ | FnNav|NumSym|  Alt | Ctrl | Shift|
- * |------+------+------+------+-------------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |
- * |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | Enter|
- * | Shift| FnNav|NumSym| AltGr| OSkey| OSkey| AltGr| FnNav|NumSym| Shift|
- * '------+------+------+------+------+------|------+------+------+------'
- *        |      |      |      |      |      |      |      |      |       
- *        |   Z  |   X  |   C  |   V  |   B  |   N  |   M  | Space|       
- *        | Ctrl |  Alt | FnNav|NumSym| Shift|  Alt | Ctrl | Shift|       
- *        '-------------------------------------------------------'       
- */
-  [LAYER_HOME] = LAYOUT_ortho_3x10(
-    LT(LAYER_ARROWPAD, KC_Q), LT(LAYER_NUMPAD, KC_W), LT(LAYER_MEDIAPAD, KC_E), KC_R, KC_T, LT(LAYER_FUNC, KC_Y), LT(LAYER_NUMSYM, KC_U), MT(MOD_LALT, KC_I), MT(MOD_RCTL, KC_O), MT(MOD_RSFT, KC_P),
-    MT(MOD_LSFT, KC_A), LT(LAYER_FUNC, KC_S), LT(LAYER_NUMSYM, KC_D), MT(MOD_RALT, KC_F), MT(MOD_LGUI, KC_G), MT(MOD_RGUI, KC_H), MT(MOD_RALT, KC_J), LT(LAYER_FUNC, KC_K), LT(LAYER_NUMSYM, KC_L), MT(MOD_RSFT, KC_ENT),
-    KC_DOWN, MT(MOD_LCTL, KC_Z), MT(MOD_LALT, KC_X), LT(LAYER_FUNC, KC_C), LT(LAYER_NUMSYM, KC_V), MT(MOD_LSFT, KC_B), MT(MOD_LALT, KC_N), MT(MOD_RCTL, KC_M), MT(MOD_RSFT, KC_SPC), KC_BSPC
-  ),
-
-/* Function and Navigation Layer
- * ,---------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |
- * | ____ | ____ | ____ | ____ | ____ | ____ |SysLay|  Alt | Ctrl | Shift|
- * |------+------+------+------+-------------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |
- * |  ESC | Home | PgDn | PgUp |  End | Left | Down |  Up  | Right|Backsp|
- * | Shift| ____ |SysLay| AltGr| OSkey| OSkey| AltGr| ____ |SysLay| Shift|
- * '------+------+------+------+------+------|------+------+------+------'
- *        |      |      |      |      |      |      |      |      |       
- *        |  F11 |  F12 |      | Space|PrnScr|ScrLck|Pause |Backsp|       
- *        | Ctrl |  Alt | ____ |SysLay| Shift|  Alt | Ctrl | Shift|       
- *        '-------------------------------------------------------'       
- */
-  [LAYER_FUNC] = LAYOUT_ortho_3x10(
-    KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, LT(LAYER_SYST, KC_F7), MT(MOD_LALT, KC_F8), MT(MOD_RCTL,KC_F9), MT(MOD_RSFT, KC_F10),
-    MT(MOD_LSFT, KC_ESC), KC_HOME, LT(LAYER_SYST, KC_PGDN), MT(MOD_RALT, KC_PGUP), MT(MOD_LGUI, KC_END), MT(MOD_RGUI, KC_LEFT), MT(MOD_RALT, KC_DOWN), KC_UP, LT(LAYER_SYST, KC_RGHT), MT(MOD_RSFT, KC_BSPC),
-    KC_DOWN, MT(KC_LCTL, KC_F11), MT(KC_LALT, KC_F12), KC_NO, LT(LAYER_SYST, KC_SPACE), MT(KC_LSFT, KC_PSCR), MT(KC_LALT, KC_SCRL), MT(KC_RCTL, KC_PAUS), MT(MOD_RSFT, KC_BSPC), KC_UP
-  ),
-
-/* Number and Symbols Layer
- * ,---------------------------------------------------------------------.
- * |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |
- * |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |
- * | ____ | ____ | ____ | ____ | ____ |SysLay| ____ |  Alt | Ctrl | Shift|
- * |------+------+------+------+-------------+------+------+------+------|
- * |      |   ~  |   _  |   +  |   {  |   }  |  |   |   :  |   "  |      |
- * |  TAB |   `  |   -  |   =  |   [  |   ]  |  \   |   ;  |   '  | Del  |
- * | Shift|SysLay| ____ | AltGr| OSkey| OSkey| AltGr|SysLay| ____ | Shift|
- * ' -----+------+------+------+------+------|------+------+------+------'
- *        |      |      |      |      |   <  |   >  |   ?  |      |       
- *        |BackSp|  Del | Enter|      |   ,  |   .  |   /  | Enter|       
- *        | Ctrl |  Alt |SysLay| ____ | Shift|  Alt | Ctrl | Shift|       
- *        '-------------------------------------------------------'       
- */
-  [LAYER_NUMSYM] = LAYOUT_ortho_3x10(
-    KC_1, KC_2, KC_3, KC_4, KC_5, LT(LAYER_SYST, KC_6), KC_7, MT(MOD_LALT, KC_8), MT(MOD_RCTL,KC_9), MT(MOD_RSFT, KC_0),
-    MT(MOD_LSFT, KC_TAB), LT(LAYER_SYST, KC_GRV), KC_MINS, MT(MOD_RALT, KC_EQL), MT(MOD_LGUI, KC_LBRC), MT(MOD_RGUI, KC_RBRC), MT(MOD_RALT, KC_BSLS), LT(LAYER_SYST, KC_SCLN), KC_QUOT, MT(MOD_RSFT, KC_DEL),
-    KC_LEFT, MT(KC_LCTL, KC_BSPC), MT(KC_LALT, KC_DEL), LT(LAYER_SYST, KC_ENT), KC_NO, MT(MOD_LSFT, KC_COMM), MT(MOD_LALT, KC_DOT), MT(MOD_RCTL, KC_SLSH), MT(MOD_RSFT, KC_ENT), KC_RGHT
-  ),
-
-/* System Layer
- * ,---------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |
- * | Play | Stop | Prev | Next |MsBtn1|MsLeft|MSDown| MsUp |MsRigh|MsBtn2|
- * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Shift|
- * |------+------+------+------+-------------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |
- * |Backsp| Mute | Vol- | Vol+ |MsWhlD| Left | Down |  Up  | Right|Backsp|
- * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |
- * '------+------+------+------+------+------|------+------+------+------'
- *        |      |      |      |      |      |      |      |      |       
- *        | ____ | ____ | Enter| Space| Mute | Vol- | Vol+ | Space|       
- *        | Ctrl |  Alt | ____ | ____ | Shift| Alt  | Ctrl | ____ |       
- *        '-------------------------------------------------------'       
- */
-  [LAYER_SYST] = LAYOUT_ortho_3x10(
-    KC_MPLY, KC_STOP, KC_MPRV, KC_MNXT, KC_MS_BTN1, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, MT(MOD_RSFT, KC_MS_BTN2),
-    KC_BSPC, KC_DEL, KC_PGDN, KC_PGUP, KC_APP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BSPC,
-    KC_PGDN, MT(KC_LCTL, KC_CAPS), MT(KC_LALT, KC_INS), KC_ENT, KC_SPC, MT(MOD_RSFT, KC_MUTE), MT(MOD_LALT, KC_VOLD), MT(MOD_RCTL, KC_VOLU), KC_SPC, KC_PGUP
-  ),
-
- /* ArrowPad (mod su Q)  /------mouse-------\ /-----cursor-------\
- * ,---------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |MsBtn1| MsUp |MsBtn2| Home |  Up  | PgUp |Backsp|
- * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |
- * |------+------+------+------+-------------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |MsLeft|MsDown|MsRigh| Left | Down | Right| Enter|
- * | Shift| ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |
- * '------+------+------+------+------+------|------+------+------+------'
- *        |      |      |      |      |      |      |      |      |        
- *        |      |      |MsWhlU|MsDown|MsWhlD|  End | PgDn | PgDn |       
- *        | Ctrl |  Alt | ____ | ____ | ____ | ____ | ____ | ____ |       
- *        '-------------------------------------------------------'       
- */
-  [LAYER_ARROWPAD] = LAYOUT_ortho_3x10(
-    KC_NO, KC_NO, KC_NO, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_HOME, KC_UP, KC_PGUP, KC_BSPC, 
-    KC_LSFT, KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENT, 
-    XXXXXXX, KC_LCTL, KC_LALT, KC_MS_WH_UP, KC_MS_DOWN, KC_MS_WH_DOWN, KC_END, KC_PGDN, KC_PGDN, XXXXXXX 
-  ),
-
-/* NumPad (mod su W)
- * ,---------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |
- * |      |      |   3  |   *  |   -  |Backsp|   7  |   8  |   9  |  0   |
- * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |
- * |------+------+------+------+-------------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |
- * |      |      |   /  |   =  |   +  |   .  |   4  |   5  |   6  | Enter|
- * | Shift| ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |
- * '------+------+------+------+------+------|------+------+------+------'
- *        |      |      |      |      |      |      |      |      |       
- *        |      |      |      |  Tab |   ,  |   1  |   2  |   3  |       
- *        | Ctrl |  Alt | ____ | ____ | ____ | ____ | ____ | ____ |       
- *        '-------------------------------------------------------'       
- */
-  [LAYER_NUMPAD] = LAYOUT_ortho_3x10(
-    KC_NO, KC_NO, KC_3, KC_KP_ASTERISK, KC_KP_MINUS, KC_BSPC, KC_7, KC_8, KC_9, KC_0, 
-    KC_LSFT, KC_NO, KC_KP_SLASH, KC_KP_EQUAL, KC_KP_PLUS, KC_DOT, KC_4, KC_5, KC_6, KC_ENT, 
-    XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_TAB, KC_COMM, KC_1, KC_2, KC_3, XXXXXXX 
-  ),
- 
- /* MediaPad (mod su E)
- * ,---------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      | Vol+ |      |      |
- * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |
- * |------+------+------+------+-------------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      | Prev | Play | Next |      |
- * | Shift| ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |
- * '------+------+------+------+------+------|------+------+------+------'
- *        |      |      |      |      |      |      |      |      |        
- *        |      |      |      |      |      | Mute | Vol- |      |       
- *        | Ctrl |  Alt | ____ | ____ | ____ | ____ | ____ | ____ |       
- *        '-------------------------------------------------------'       
- */
-  [LAYER_MEDIAPAD] = LAYOUT_ortho_3x10(
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLU, KC_NO, KC_NO, 
-    KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, 
-    XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_VOLD, KC_NO, XXXXXXX 
-  ),  
-    
-};
-
-
-void matrix_init_user(void) {
-  // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values
-  // set num lock on at start (for numonly layer to work)
-  if (!host_keyboard_led_state().num_lock) {
-      tap_code(KC_NUM_LOCK);
-  }
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case CK_TRIPLEZERO:
-      if (record->event.pressed) {
-        SEND_STRING("000");
-      } // else { when released }
-      break;
-  }
-  return true;
-};
-
-void keyboard_pre_init_user(void) {
-  // Set our LED pins as output
-  setPinOutput(D5);
-  setPinOutput(B0);
-}
-
-bool led_update_user(led_t led_state) {
-    writePin(D5, !led_state.num_lock);
-    writePin(B0, !led_state.caps_lock);
-    return false; // prevent keyboard from processing state
-}
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/readme.md b/keyboards/40percentclub/gherkin/keymaps/stevexyz/readme.md
deleted file mode 100644
index 8fe7a60679e..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# The 25% SuperMicro keyboard
-## A full featured keymap on Gherkin compatible with a pure "Alpha 26" layout
-
-With this configuration the "SuperMicro" layout first experimented on the plank-like jj40 is being ported to a more proper board, and with the last changes, this layout has been made compatible also to a "26 keys" one. So you can now choose to leave all 30 keys on the keyboard, or remove the two on the bottom line corners to have the "old" and comfortable 28 keys layout, or remove also space and enter to have the simplest "pure alpha" one! And even the intermediate 27 keys one is an interesting compatible option!
-
-This keymap is for a generic usage, trying to avoid as much gimmick as possible (considering the number of keys) and retain muscle memory from people used to the standard Qwerty 104 keys one. Functions and numbers (with related symbols) are on the first row as expected; other examples of design coherency include the symbols on the central row laid out in the same order as you'll find on a standard full keyboard, and the cursor movement aligned to the common unix vi standard ("hjkl", and for symmetry "sdfg" for home/pgdn/pgup/end). I've personally used this layout for months on my home PC in parallel to my portable work PC.
-
-Relying just on the alphabetic keys this layout can be also very easily ported and tested on any qmk supported keyboard (ok, butterstick excluded).
-
-The image below explains the main layers activated respectively with F, N or both modifiers pressed together. In addition to them there are available 5 layers that can be personalized as needed or completely removed without losing any functionality; three of them are currently setup in the default keymap for cursors/mouse, numpad and media (activated with q, w and e respectively).
-
-![layers](https://github.com/stevexyz/qmk_firmware/blob/master/keyboards/40percentclub/gherkin/keymaps/stevexyz/newlayout26272830.jpg)
-
-![prototype](https://github.com/stevexyz/qmk_firmware/blob/master/keyboards/40percentclub/gherkin/keymaps/stevexyz/gherkin28.jpeg)
-
-Happy hacking!
-_Stefano
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/rules.mk b/keyboards/40percentclub/gherkin/keymaps/stevexyz/rules.mk
deleted file mode 100644
index b693b8e3059..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options (yes/no)
-#
-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
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no             # MIDI support
-UNICODE_ENABLE = no          # Unicode
-BLUETOOTH_ENABLE = no        # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no            # Audio output on port C6
-TAP_DANCE_ENABLE = no
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE)
-
-NKRO_ENABLE = yes           # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/config.h b/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/config.h
deleted file mode 100644
index 271f48d0011..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-// place overrides here
diff --git a/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c b/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c
deleted file mode 100644
index 927192c63c7..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define ST_BOLT QK_STENO_BOLT
-#define ST_GEM  QK_STENO_GEMINI
-
-enum keyboard_layers {
-  _QWERTY,
-  _RAISE,
-  _LOWER,
-  _PLOVER,
-  _ADJUST
-};
-
-#define ADJ_Z   LT(_ADJUST, KC_Z)
-#define RS_BSPC LT(_RAISE, KC_BSPC)
-#define LW_SPC LT(_LOWER, KC_SPC)
-#define MO_ADJ  MO(_ADJUST)
-#define TG_PLV  TG(_PLOVER)
-#define OS_LCTL OSM(MOD_LCTL)
-#define OS_LALT OSM(MOD_LALT)
-#define OS_LGUI OSM(MOD_LGUI)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT_ortho_3x10(
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_RSFT,
-    ADJ_Z,   KC_X,    KC_C,    KC_V,    RS_BSPC, LW_SPC,  KC_B,    KC_N,    KC_M,    KC_ENT
-  ),
-
-  [_RAISE] = LAYOUT_ortho_3x10(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-    KC_ESC,  KC_MINS, KC_EQL,  _______, KC_LBRC, KC_RBRC, _______, KC_QUOT, KC_SCLN, _______,
-    OS_LCTL, OS_LGUI, OS_LALT, KC_GRV,  _______, KC_TAB,  KC_BSLS, KC_COMM, KC_DOT,  KC_SLSH
-  ),
-
-  [_LOWER] = LAYOUT_ortho_3x10(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_PGUP, KC_HOME, KC_UP,   KC_END,  XXXXXXX,
-    KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______,
-    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, OS_LALT, OS_LGUI, OS_LCTL, KC_CAPS
-  ),
-
-  [_PLOVER] = LAYOUT_ortho_3x10(
-    STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
-    STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR,
-    MO_ADJ,  STN_NUM, STN_A,   STN_O,   STN_NUM, STN_E,   STN_U,   STN_NUM, STN_NUM, XXXXXXX
-  ),
-
-  [_ADJUST] = LAYOUT_ortho_3x10(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ST_BOLT, ST_GEM,  TG_PLV,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT
-  ),
-
-};
diff --git a/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/rules.mk b/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/rules.mk
deleted file mode 100644
index a64c606ae75..00000000000
--- a/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-STENO_ENABLE = yes          # Additional protocols for Stenography(+1700), requires VIRTSER
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
deleted file mode 100644
index be51c48d8af..00000000000
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2019 Boy_314
- *
- * 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
-
-// place overrides here
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 200
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
deleted file mode 100644
index 128802ca597..00000000000
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/keymap.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2019 Boy_314
- *
- * 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
-
-// Tap Dance Declarations
-enum {
-	TD_SWAP_LAYERS = 0
-};
-
-enum layers {
-	_DVORAK,
-	_QWERTY,
-	_LOWER,
-	_RAISE,
-};
-
-enum halfnhalf_keycodes {
-	NEWTAB = SAFE_RANGE,
-	ALTF4,
-	CLSTAB,
-	PRVWIN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	/* DVORAK
-	 * ,-------------------------------------------------------------------------------------------------.
-	 * |Tab   |'     |,     |.     |P     |Y     |Brght+|=     |F     |G     |C     |R     |L     |Bksp  |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |CtlCps|A     |O     |E     |U     |I     |Brght-|Ctrl+F|D     |H     |T     |N     |S     |Enter |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |LShift|;     |Q     |J     |K     |X     |LAlt  |-     |B     |M     |W     |V     |Z     |RShift|
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 *                             |TD Swap Layer|             |Space        |
-	 *                             `-------------'			       `-------------'
-	 */
-	[_DVORAK] = LAYOUT(/* Base Dvorak */
-	  KC_TAB,           KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_BRIU, KC_EQL,     KC_F, KC_G, KC_C,    KC_R,   KC_L,   KC_BSPC,
-	  LCTL_T(KC_CAPS),  KC_A,    KC_O,    KC_E,   KC_U, KC_I, KC_BRID, LCTL(KC_F), KC_D, KC_H, KC_T,    KC_N,   KC_S,   KC_ENT,
-	  SC_LSPO,          KC_SCLN, KC_Q,    KC_J,   KC_K, KC_X, KC_LALT, KC_MINS,    KC_B, KC_M, KC_W,    KC_V,   KC_Z,   SC_RSPC,
-	                                              TD(TD_SWAP_LAYERS),                    KC_SPC
-	),
-
-	/* QWERTY
-	 * ,-------------------------------------------------------------------------------------------------.
-	 * |Tab   |Q     |W     |E     |R     |T     |Brght+|'     |Y     |U     |I     |O     |P     |Bksp  |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |CtlCps|A     |S     |D     |F     |G     |Brght-|Ctrl+F|H     |J     |K     |L     |;     |Enter |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |LShift|Z     |X     |C     |V     |B     |LAlt  |-     |N     |M     |,     |.     |/     |RShift|
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 *                             |TD Swap Layer|             |Space        |
-	 *                             `-------------'			       `-------------'
-	 */
-	[_QWERTY] = LAYOUT(/* Base Qwerty */
-	  KC_TAB,           KC_Q,    KC_W,    KC_E,   KC_R, KC_T, KC_BRIU, KC_QUOT,    KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_BSPC,
-	  LCTL_T(KC_CAPS),  KC_A,    KC_S,    KC_D,   KC_F, KC_G, KC_BRID, LCTL(KC_F), KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_ENT,
-	  SC_LSPO,          KC_Z,    KC_X,    KC_C,   KC_V, KC_B, KC_LALT, KC_MINS,    KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
-	                                              TD(TD_SWAP_LAYERS),                    KC_SPC
-	),
-
-	/* LOWER
-	 * ,-------------------------------------------------------------------------------------------------.
-	 * |Esc   |1     |2     |3     |4     |5     |      |      |6     |7     |8     |9     |0     |/     |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |Caps  |F1    |F2    |F3    |F4    |F5    |F6    |Vol Up|Play  |_     |+     |{     |}     ||     |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |      |F7    |F8    |F9    |F10   |F11   |F12   |Vol Dn|Next  |Home  |PgDn  |PgUp  |End   |      |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 *                             |             |             |             |
-	 *                             `-------------'             `-------------'
-	 */
-	[_LOWER] = LAYOUT(/* Numbers, Function Row, Media Control, Shifted Symbols, Dvorak Slash Key */
-	  QK_GESC, KC_1,  KC_2,  KC_3,  KC_4,   KC_5,   KC_TRNS, KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
-	  KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5,  KC_F6,   KC_VOLU, KC_MPLY, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-	  KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,  KC_VOLD, KC_MNXT, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_TRNS,
-									                KC_TRNS,    					            KC_TRNS
-	),
-
-	/* RAISE
-	 * ,-------------------------------------------------------------------------------------------------.
-	 * |Reset |      |      |Up    |      |      |      |PRVWIN|CLSTAB|      |      |      |      |Del   |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |`     |      |Left  |Down  |Right |      |      |NEWTAB|ALTF4 |-     |=     |[     |]     |\     |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |      |!     |@     |#     |$     |%     |      |      |^     |&     |*     |(     |)     |      |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-	 *                             |             |             |             |
-	 *                             `-------------'             `-------------'
-	 */
-	[_RAISE] = LAYOUT(/* Arrows, Shifted Numbers, Symbols, Delete, Macros */
-	  QK_BOOT, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, PRVWIN,  CLSTAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-	  KC_GRV,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, NEWTAB,  ALTF4,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-	  KC_TRNS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
-										                    KC_TRNS,                            KC_TRNS
-	)
-};
-
-void tap_dance_choose_layer (tap_dance_state_t *state, void *user_data) {
-	switch (state->count) {
-		case 1:
-			layer_on(_LOWER);
-			break;
-		case 2:
-			layer_on(_RAISE);
-			break;
-	}
-}
-
-void tap_dance_choose_layer_reset (tap_dance_state_t *state, void *user_data) {
-	switch (state->count) {
-		case 1:
-			layer_off(_LOWER);
-			break;
-		case 2:
-			layer_off(_RAISE);
-			break;
-		case 3:
-			if (get_highest_layer(default_layer_state) == _DVORAK) {
-				set_single_persistent_default_layer(_QWERTY);
-			}
-			else if (get_highest_layer(default_layer_state) == _QWERTY) {
-				set_single_persistent_default_layer(_DVORAK);
-			}
-			break;
-	}
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-	[TD_SWAP_LAYERS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_dance_choose_layer, tap_dance_choose_layer_reset)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		// Control + T
-		case NEWTAB:
-			if (record->event.pressed) {
-				SEND_STRING(SS_LCTL("t"));
-			}
-			break;
-		// Alt + F4
-		case ALTF4:
-			if (record->event.pressed) {
-				SEND_STRING(SS_DOWN(X_LALT)SS_TAP(X_F4)SS_UP(X_LALT));
-			}
-			break;
-		// Control + W
-		case CLSTAB:
-			if (record->event.pressed) {
-				SEND_STRING(SS_LCTL("w"));
-			}
-			break;
-		// Control + Shift + N
-		case PRVWIN:
-			if (record->event.pressed) {
-				SEND_STRING(SS_LCTL(SS_LSFT("n")));
-			}
-			break;
-	}
-	return true;
-}
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/readme.md b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/readme.md
deleted file mode 100644
index 9eff08b5ea4..00000000000
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Boy_314's keymap for half_n_half
-# Currently only supports DVORAK. QWERTY Support is on the TODO list.
\ No newline at end of file
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/rules.mk b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/rules.mk
deleted file mode 100644
index 59c7ccf8275..00000000000
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-TAP_DANCE_ENABLE = yes      # Enable Tap Dance
-NKRO_ENABLE = yes           # USB Nkey Rollover
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/40percentclub/mf68/keymaps/68keys/config.h b/keyboards/40percentclub/mf68/keymaps/68keys/config.h
deleted file mode 100644
index 66e7bbed993..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/68keys/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-/* USB Device descriptor parameter */
-#undef VENDOR_ID
-#undef PRODUCT_ID
-#undef DEVICE_VER
-#undef MANUFACTURER
-#undef PRODUCT
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0A0C
-#define DEVICE_VER 0x0068
-#define MANUFACTURER "68Keys.io"
-#define PRODUCT "The 68Keys.io Keyboard"
diff --git a/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c b/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c
deleted file mode 100644
index 0227f26937b..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_68_ansi(
-    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_ESC, KC_PGUP,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN,
-    KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-    KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  )
-};
diff --git a/keyboards/40percentclub/mf68/keymaps/68keys/readme.md b/keyboards/40percentclub/mf68/keymaps/68keys/readme.md
deleted file mode 100644
index 4b7cdf12591..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/68keys/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# 68Keys.io
-
-Custom [68Keys.io](https://68keys.io) DIY keyboard.
-
-Keymap Maintainer: [sbstjn](https://sbstjn.com)
-Hardware Supported: mf68
-Hardware Availability: [DIY Guide](https://68keys.io)
-
-Make example for this keyboard (after setting up your build environment):
-
-```bash
-$ > cd qmk_firmware/
-$ > make 40percentclub/mf68:68keys
-```
-
-Example of flashing this keyboard:
-
-```bash
-$ > cd qmk_firmware/
-$ > make 40percentclub/mf68:68keys:avrdude
-```
-
-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/40percentclub/mf68/keymaps/68keys/rules.mk b/keyboards/40percentclub/mf68/keymaps/68keys/rules.mk
deleted file mode 100644
index 96ce13fe73f..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/68keys/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOTLOADER = atmel-dfu
-
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/40percentclub/mf68/keymaps/andyjack/keymap.c b/keyboards/40percentclub/mf68/keymaps/andyjack/keymap.c
deleted file mode 100644
index 793fb336b0c..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/andyjack/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-Copyright 2020 Andy Jack
-
-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,
-    _L1,
-    _L2
-};
-
-#define CTL_ESC LCTL_T(KC_ESC)
-
-/* these key combos are mapped to shell commands in my .keylaunchrc */
-#define MUT_IN LALT(KC_F10)
-#define MUT_OUT LALT(KC_F11)
-#define MUT_MIC LALT(KC_F12)
-#define SCN_LCK LCTL(KC_SCRL)
-
-extern keymap_config_t keymap_config;
-
-enum custom_keycodes {
-    AJ_FN = SAFE_RANGE,
-    AJ_RCTL,
-    AJ_MSWP,
-    AJ_MLCK,
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_68_ansi(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_PGUP,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_PGDN,
-    CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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, AJ_FN,   AJ_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [_L1] = LAYOUT_68_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_BSPC,          KC_VOLU, KC_HOME,
-    _______, _______, KC_HOME, KC_UP,   KC_END,  _______, _______, MUT_IN , MUT_OUT, MUT_MIC, _______, _______, BL_STEP, _______,          KC_VOLD, KC_END,
-    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, SCN_LCK, _______, _______,          _______,
-    _______, _______, _______, _______, KC_BTN3, _______, _______, KC_MUTE, _______, _______, _______,                   _______,          KC_MUTE,
-    _______, AJ_MLCK, AJ_MSWP,                            _______,                            _______, _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
-  ),
-  [_L2] = LAYOUT_68_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_BSPC,          KC_VOLU, KC_HOME,
-    _______, _______, _______, KC_UP,   _______, _______, _______, KC_7,    KC_8,    KC_9,    _______, _______, _______, _______,          KC_VOLD, KC_END,
-    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_4,    KC_5,    KC_6,    _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, KC_0,    KC_1,    KC_2,    KC_3,    _______,                   _______,          KC_MUTE,
-    _______, _______, _______,                            _______,                            _______, _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
-  )
-};
-// clang-format on
-
-static bool    aj_fn_down   = false;
-static bool    aj_rctl_down = false;
-static uint8_t keycode_for_aj_rctl;
-
-/* My version of:
-  https://www.reddit.com/r/olkb/comments/8eticz/how_to_activate_a_layer_with_a_combination/dxygw0f/
-* AJ_FN by itself turns on layer 1
-* AJ_RCTL by itself acts as a control key
-* pressing FN and RCTL together, in any order, turns on layer 2
-*/
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case AJ_FN:
-            if (record->event.pressed) {
-                if (aj_rctl_down) {
-                    layer_on(_L2);
-                } else {
-                    layer_on(_L1);
-                }
-                aj_fn_down = true;
-            } else {
-                layer_off(_L1);
-                layer_off(_L2);
-                aj_fn_down = false;
-            }
-            return false;
-            break;
-        case AJ_RCTL:
-            if (record->event.pressed) {
-                if (aj_fn_down) {
-                    layer_on(_L2);
-                } else {
-                    register_code(keycode_for_aj_rctl);
-                }
-                aj_rctl_down = true;
-            } else {
-                layer_off(_L2);
-                unregister_code(keycode_for_aj_rctl);
-                aj_rctl_down = false;
-            }
-            return false;
-            break;
-        case AJ_MSWP:
-        case AJ_MLCK:
-            if (record->event.pressed) {
-                if (!eeconfig_is_enabled()) {
-                    eeconfig_init();
-                }
-                keymap_config.raw = eeconfig_read_keymap();
-                switch (keycode) {
-                    case AJ_MSWP:
-                        keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui;
-                        keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui;
-                        keycode_for_aj_rctl          = keymap_config.swap_lalt_lgui ? KC_RALT : KC_RCTL;
-                        break;
-                    case AJ_MLCK:
-                        keymap_config.no_gui = !keymap_config.no_gui;
-                        break;
-                }
-                eeconfig_update_keymap(keymap_config.raw);
-                clear_keyboard();  // clear to prevent stuck keys
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-void keyboard_post_init_user(void) {
-    if (!eeconfig_is_enabled()) {
-        eeconfig_init();
-    }
-    keymap_config.raw   = eeconfig_read_keymap();
-    keycode_for_aj_rctl = keymap_config.swap_lalt_lgui ? KC_RALT : KC_RCTL;
-    eeconfig_update_keymap(keymap_config.raw);
-    clear_keyboard();  // clear to prevent stuck keys
-}
diff --git a/keyboards/40percentclub/mf68/keymaps/andyjack/readme.md b/keyboards/40percentclub/mf68/keymaps/andyjack/readme.md
deleted file mode 100644
index 17a9d9e90fd..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/andyjack/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-## Customizations from the `default` keymap
-
-* caps lock is left ctrl / press & release for escape
-* keyboard LED brightness control - Fn + ] (same as default)
-* bootmagic:
-  * ability to swap keys - for moving between mac and win/linux
-  * for win/linux - keys are as labeled in layer 0; AJ_RCTL is right ctl
-  * for mac:
-    * LALT and LGUI swapped
-    * RALT key sends RGUI code
-    * AJ_RCTL key sends RALT code
-  * layer 2 access via Fn + AJ_RCTL pressed in any order
-    * regardless of swapped state
-  * ability to disable left gui
-* Fn + v sends a middle mouse click - nice for pasting the mouse selection in
-  linux - I always mess up and scroll while clicking
-  * note: the mouse cursor has to be placed at the insert point
-* mapping some Fn + key combinations to program launch shortcuts
-
-<!--
- vim:tw=78
--->
diff --git a/keyboards/40percentclub/mf68/keymaps/andyjack/rules.mk b/keyboards/40percentclub/mf68/keymaps/andyjack/rules.mk
deleted file mode 100644
index a124bde758d..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/andyjack/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/config.h b/keyboards/40percentclub/mf68/keymaps/delivrance/config.h
deleted file mode 100644
index 50c64b4b51d..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Dan's Magicforce 68 (MF68) QMK Keyboard
- * Copyright (C) Dan <https://github.com/delivrance>
- *
- * This file is part of Dan's MF68 QMK Keyboard.
- *
- * Dan's MF68 QMK Keyboard is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Dan's MF68 QMK Keyboard 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 Dan's MF68 QMK Keyboard.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#undef MANUFACTURER
-#define MANUFACTURER "Dan"
-
-#undef PRODUCT
-#define PRODUCT "Magicforce 68 QMK"
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 20
-
-// Disable backlight breathing
-#undef BACKLIGHT_BREATHING
-
-// Set USB polling rate to 1000 Hz
-#define USB_POLLING_INTERVAL_MS 1
-
-// Enable NKRO on boot
-#define FORCE_NKRO
-
-// Backlight idle timeout in seconds
-#define BACKLIGHT_IDLE_TIMEOUT 1200
\ No newline at end of file
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
deleted file mode 100644
index f7899ad886f..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Dan's Magicforce 68 (MF68) QMK Keyboard
- * Copyright (C) Dan <https://github.com/delivrance>
- *
- * This file is part of Dan's MF68 QMK Keyboard.
- *
- * Dan's MF68 QMK Keyboard is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Dan's MF68 QMK Keyboard 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 Dan's MF68 QMK Keyboard.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#define KC_FN1 MO(_FN)
-#define KC_FN2 LT(_FN, KC_CAPS)
-
-#define KC_BLUP BL_UP    // Backlight increase
-#define KC_BLDN BL_DOWN  // Backlight decrease
-#define KC_BLTOG BL_TOGG // Backlight toggle
-#define KC_REC1 DM_REC1  // Record macro 1
-#define KC_PLY1 DM_PLY1  // Play macro 1
-#define KC_REC2 DM_REC2  // Record macro 2
-#define KC_PLY2 DM_PLY2  // Play macro 1
-#define KC_RSTP DM_RSTP  // Stop macro recording
-
-enum {
-    _QWERTY,
-    _FN
-};
-
-/* ┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓
-   ┃Esc ┃ 1! ┃ 2@ ┃ 3# ┃ 4$ ┃ 5% ┃ 6^ ┃ 7& ┃ 8* ┃ 9( ┃ 0) ┃ -_ ┃ =+ ┃   ←─   ┃ ┃Ins ┃PgUp┃
-   ┣━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━━━━━┫ ┣━━━━╋━━━━┫
-   ┃ Tab  ┃ Q  ┃ W  ┃ E  ┃ R  ┃ T  ┃ Y  ┃ U  ┃ I  ┃ O  ┃ P  ┃ [{ ┃ ]} ┃  \|  ┃ ┃Del ┃PgDn┃
-   ┣━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━┫ ┗━━━━┻━━━━┛
-   ┃  Caps  ┃ A  ┃ S  ┃ D  ┃ F  ┃ G  ┃ H  ┃ J  ┃ K  ┃ L  ┃ ;: ┃ '" ┃  Enter  ┃  Magicforce
-   ┣━━━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━━━━┫ ┏━━━━┓
-   ┃   Shift  ┃ Z  ┃ X  ┃ C  ┃ V  ┃ B  ┃ N  ┃ M  ┃ ,< ┃ .> ┃ /? ┃    Shift   ┃ ┃ ↑  ┃ Dan
-   ┣━━━━━┳━━━━┻┳━━━┻━┳━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━┳┻━━━━╋━━━━┻┳━━━━━┳━━┳━━┻━╋━━━━╋━━━━┓
-   ┃Ctrl ┃ GUI ┃ Alt ┃             ━━━━━             ┃ Alt ┃ Fn  ┃Ctrl ┃  ┃ ←  ┃ ↓  ┃ →  ┃
-   ┗━━━━━┻━━━━━┻━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━┻━━━━━┻━━━━━┛  ┗━━━━┻━━━━┻━━━━┛ */
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_68_ansi( /* Default layer
-   ┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓ */
-    QK_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_INS ,KC_PGUP, /*
-   ┣━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━━━━━┫ ┣━━━━╋━━━━┫ */
-     KC_TAB  , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_LBRC,KC_RBRC, KC_BSLS ,  KC_DEL ,KC_PGDN, /*
-   ┣━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━┫ ┗━━━━┻━━━━┛ */
-      KC_FN2   , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,  KC_ENTER  ,         /*
-   ┣━━━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━━━━┫ ┏━━━━┓      */
-       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_SPACE             ,KC_RALT , KC_FN1 ,KC_RCTL ,   KC_LEFT,KC_DOWN,KC_RGHT  /*
-   ┗━━━━━┻━━━━━┻━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━┻━━━━━┻━━━━━┛  ┗━━━━┻━━━━┻━━━━┛ */),
-
-[_FN] = LAYOUT_68_ansi( /* FN & CAPS layer
-   ┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓ */
-    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_RSTP  ,  KC_PSCR,KC_HOME, /*
-   ┣Esc ┻ 1! ┻ 2@ ┻ 3# ┻ 4$ ┻ 5% ┻ 6^ ┻ 7& ┻ 8* ┻ 9( ┻ 0) ┻ -_ ┻ =+ ┻━┳━ ←─ ━┫ ┣Ins ╋PgUp┫ */
-  _______ ,KC_PLY1,KC_PLY2,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_7  , KC_8  , KC_9  ,KC_BLDN,KC_BLUP,KC_BLTOG ,KC_TRNS  ,KC_END , /*
-   ┣ Tab ━┻ Q ━┻ W ━┻ E ━┻ R ━┻ T ━┻ Y ━┻ U ━┻ I ━┻ O ━┻ P ━┻ [{ ┻ ]} ┻━ \| ━┫ ┗Del ┻PgDn┛ */
-    _______ ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_4  , KC_5  , KC_6  ,KC_TRNS,   KC_TRNS  ,         /*
-   ┣━ Caps ━┻ A ━┻ S ━┻ D ━┻ F ━┻ G ━┻ H ━┻ J ━┻ K ━┻ L ━┻ ;: ┻ '" ┻━ Enter ━┫ ┏━━━━┓      */
-    _______   ,KC_REC1,KC_REC2,KC_TRNS,KC_TRNS,KC_MSTP,KC_TRNS,KC_MUTE, KC_1  , KC_2  , KC_3  ,KC_TRNS        ,  KC_VOLU,  /*
-   ┣━━ Shift ━┻ Z ━┻ X ━┻ C ━┻ V ━┻ B ━┻ N ━┻ M ━┻ ,< ┻ .> ╋ /? ┻┳━━ Shift ━━┻━╋ ↑ ━╋━━━━┓ */
-  _______,KC_TRNS ,KC_TRNS ,         KC_MPLY              ,  KC_0  ,KC_TRNS ,KC_TRNS ,   KC_MPRV,KC_VOLD,KC_MNXT  /*
-   ┗Ctrl ┻ GUI ┻ Alt ┻━━━━━━━━━━━━ Space ━━━━━━━━━━━━┻ Alt ┻ Fn ━┻Ctrl ┛  ┗ ← ━┻ ↓ ━┻ → ━┛ */)
-};
-// clang-format on
-
-// Initialization code
-// -------------------
-
-void keyboard_post_init_user(void) {
-    backlight_level(2);
-}
-
-// Custom backlight driver
-// -----------------------
-
-// http://jared.geek.nz/2013/feb/linear-led-pwm
-float cie1931(float x) {
-    x *= 100.0 / BACKLIGHT_LEVELS;
-    float y;
-
-    if (x < 8) {
-        y = x / 902.3;
-    } else {
-        y = (x + 16.0) / 116.0;
-        y = y * y * y;
-    }
-
-    return round(y * 255);
-}
-
-void backlight_init_ports(void) {
-    setPinOutput(BACKLIGHT_PIN);
-    writePinLow(BACKLIGHT_PIN);
-
-    TCCR1A = _BV(COM1A1) | _BV(WGM11);
-    TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10);
-
-    ICR1 = 0xFFU;  // Set PWM levels to 255 (enables high-frequency PWM)
-}
-
-void backlight_set(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS) {
-        level = BACKLIGHT_LEVELS;
-    }
-
-    if (level == 0) {
-        TCCR1A &= ~(_BV(COM1A1));  // Disable PWM
-    } else {
-        TCCR1A |= _BV(COM1A1);  // Enable PWM
-    }
-
-    OCR1A = cie1931(level);
-}
-
-// Custom macro hooks
-// ------------------
-
-// Redefine with lower delay
-void led_blink(void) {
-    backlight_toggle();
-    wait_ms(25);
-    backlight_toggle();
-}
-
-void dynamic_macro_record_start_user(int8_t direction) {
-    led_blink();
-}
-
-void dynamic_macro_play_user(int8_t direction) {
-    led_blink();
-}
-
-void dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record) {
-    led_blink();
-}
-
-void dynamic_macro_record_end_user(int8_t direction) {
-    led_blink();
-}
-
-// Custom Caps Lock backlight behaviour
-// ------------------------------------
-
-bool led_update_user(led_t led_state) {
-    // This exists because I don't like the backlight to turn OFF when the Caps Lock is ON.
-    // That is, this will turn the backlight ON (at half the brightness) when the Caps Lock is ON as well.
-    static bool prev_is_caps_on;
-    bool is_caps_on = led_state.caps_lock;
-
-    if (prev_is_caps_on != is_caps_on) {
-        prev_is_caps_on = is_caps_on;
-
-        if (is_caps_on) {
-            backlight_set(BACKLIGHT_LEVELS / 2);
-        } else {
-            if (is_backlight_enabled()) {
-                backlight_set(get_backlight_level());
-            } else {
-                backlight_set(0);
-            }
-        }
-    }
-
-    // Turn on the Pro Micro's on-board LEDs for Caps Lock
-    if (led_state.caps_lock) {
-        // Set to low
-        setPinOutput(B0);
-        writePinLow(B0);
-        setPinOutput(D5);
-        writePinLow(D5);
-    } else {
-        // Set to Hi-Z
-        setPinInput(B0);
-        setPinInput(D5);
-    }
-    return false;
-}
-
-// Backlight idle timeout feature
-// ------------------------------
-
-static uint32_t timer;
-static bool is_idle;
-
-void matrix_scan_user(void) {
-    // Check the timer only if the keyboard is not idle
-    if (!is_idle) {
-        if (timer_elapsed32(timer) >= (uint32_t) BACKLIGHT_IDLE_TIMEOUT * 1000) {
-            is_idle = true;
-
-            // Both backlight_level and backlight_level_noeeprom modify the global backlight config (not useful)
-            // Instead, use backlight_set in order to restore the current backlight level later on
-            backlight_set(0);
-        }
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Reset timer on each keypress
-    timer = timer_read32();
-
-    // Enable backlight back only when keyboard is idling (which implies the backlight was turned off previously)
-    if (is_idle) {
-        is_idle = false;
-
-        // Set back the original backlight level only if it is actually enabled globally
-        if (is_backlight_enabled()) {
-            // The current backlight level can be obtained with get_backlight_level
-            backlight_set(get_backlight_level());
-        }
-    }
-
-    return true;
-}
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/readme.md b/keyboards/40percentclub/mf68/keymaps/delivrance/readme.md
deleted file mode 100644
index 158235b5ef3..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/readme.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Dan's Magicforce 68 (MF68) QMK Keyboard
-
-> https://github.com/delivrance
-
-```
-┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓
-┃Esc ┃ 1! ┃ 2@ ┃ 3# ┃ 4$ ┃ 5% ┃ 6^ ┃ 7& ┃ 8* ┃ 9( ┃ 0) ┃ -_ ┃ =+ ┃   ←─   ┃ ┃Ins ┃PgUp┃
-┣━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━━━━━┫ ┣━━━━╋━━━━┫
-┃ Tab  ┃ Q  ┃ W  ┃ E  ┃ R  ┃ T  ┃ Y  ┃ U  ┃ I  ┃ O  ┃ P  ┃ [{ ┃ ]} ┃  \|  ┃ ┃Del ┃PgDn┃
-┣━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━┫ ┗━━━━┻━━━━┛
-┃  Caps  ┃ A  ┃ S  ┃ D  ┃ F  ┃ G  ┃ H  ┃ J  ┃ K  ┃ L  ┃ ;: ┃ '" ┃  Enter  ┃  Magicforce
-┣━━━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━━━━┫ ┏━━━━┓
-┃   Shift  ┃ Z  ┃ X  ┃ C  ┃ V  ┃ B  ┃ N  ┃ M  ┃ ,< ┃ .> ┃ /? ┃    Shift   ┃ ┃ ↑  ┃ Dan
-┣━━━━━┳━━━━┻┳━━━┻━┳━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━┳┻━━━━╋━━━━┻┳━━━━━┳━━┳━━┻━╋━━━━╋━━━━┓
-┃Ctrl ┃ GUI ┃ Alt ┃             ━━━━━             ┃ Alt ┃ Fn  ┃Ctrl ┃  ┃ ←  ┃ ↓  ┃ →  ┃
-┗━━━━━┻━━━━━┻━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━┻━━━━━┻━━━━━┛  ┗━━━━┻━━━━┻━━━━┛
-```
-
-## Features
-
-- Right ALT and FN keys swapped.
-- USB Polling rate set to 1000 Hz (1 ms).
-- Dynamic macros enabled (2 macros).
-- Transient EEPROM to avoid wearing (r/w from/to RAM).
-- NKRO enabled on boot (up to 248 keys at once).
-- CAPS LOCK key used as alias to the FN key.
-- Pro Micro's on-board LEDs used for CAPS LOCK status.
-- Backlight also used as CAPS LOCK status indicator.
-- Both Grave and Tilde characters embedded in ESC.
-- Media control keys and extra number keys (numpad).
-- Flicker-free backlight thanks to high-frequency PWM mode.
-- Linear backlight brightness intensity (better for human eyes).
-- Backlight turns off automatically after 20 minutes idle.
-- Backlight brightness levels set to 20 (5% steps) + 1 (off).
-- Backlight breathing completely disabled.
-- Link Time Optimizations to reduce compiled size.
-- QMK Terminal enabled for fun (pretty useless in practice).
-- Performing ~1550 matrix scans per second.
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/rules.mk b/keyboards/40percentclub/mf68/keymaps/delivrance/rules.mk
deleted file mode 100644
index 3d056cb71bc..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-BACKLIGHT_DRIVER = custom
-NKRO_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
-
-# Use RAM (fake EEPROM, transient) instead of real EEPROM
-EEPROM_DRIVER = transient
-
-# LTO: Link Time Optimizations. Reduce compiled size
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/40percentclub/mf68/keymaps/emdarcher/config.h b/keyboards/40percentclub/mf68/keymaps/emdarcher/config.h
deleted file mode 100644
index e1a6eb1a2b0..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/emdarcher/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define GRAVE_ESC_ALT_OVERRIDE
diff --git a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c b/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
deleted file mode 100644
index 3932a1ee9b9..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _FN1 1
-#define _FN2 2
-#define X0 LT(_FN2, KC_CAPS)
-#define X1 MO(_FN1)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Default layer */
-  [_QWERTY] = LAYOUT_68_ansi(
-    QK_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_INS ,KC_PGUP,
-    KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_LBRC,KC_RBRC, KC_BSLS,      KC_DEL ,KC_PGDN,
-    X0     , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,    KC_ENTER,
-    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_LALT ,KC_LGUI ,            KC_SPACE                     ,  X1   ,KC_RALT ,KC_RCTL ,                KC_LEFT,KC_DOWN,KC_RGHT
-  ),
- /* FN Layer */
-  [_FN1] = LAYOUT_68_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_BSPC,     KC_VOLU,KC_HOME,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,       KC_VOLD,KC_END,
-     X0    ,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MRWD,KC_MFFD,    _______,
-   _______      ,_______,_______,KC_MSTP,KC_MPRV,KC_MNXT,KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,_______,       _______,           _______,
-   _______ ,_______ ,_______ ,             _______,                      _______,_______,_______,                  _______,_______,_______
-  ),
-
- /* CAPS LOCK layer */
-  [_FN2] = LAYOUT_68_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_BSPC,      KC_VOLU,KC_HOME,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,      KC_VOLD,KC_END,
-    _______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,_______,_______,    _______,
-    _______     ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,           _______,
-    _______ ,_______ ,_______ ,            _______,                      _______,_______,_______,                  _______,_______,_______
-  )
-};
-
-bool led_update_user(led_t led_state){
-    //turn on the Pro Micro's on board LEDs for CAPS LOCK
-    if(led_state.caps_lock){
-        //set led pins to low
-        setPinOutput(B0);
-        writePinLow(B0);
-        setPinOutput(D5);
-        writePinLow(D5);
-    } else {
-        //set to Hi-Z
-        setPinInput(B0);
-        setPinInput(D5);
-    }
-    return false;
-}
diff --git a/keyboards/40percentclub/mf68/keymaps/emdarcher/readme.md b/keyboards/40percentclub/mf68/keymaps/emdarcher/readme.md
deleted file mode 100644
index 75d6d0317c9..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/emdarcher/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# emdarcher's MF68 Layout
-
-A layout mostly based off the factory layout, but with some modifications. Designed for use in a MAC or Unix environment, and has some VIM inspiration.
-
-- Utilizes the Pro Micro's on board LED's to show the CAPS LOCK status.
-- Added Caps Lock for an extra FN layer with VIM like control on hjlk keys.
-- Made the ESC key use GESC for functionality for Grave and Tilde with shift or GUI modifiers.
-- Added Print Screen, Scroll Lock, and Pause keys on P,[,] keys to add Mac screen brightness control.
-    * On Mac, Scroll Lock is Brightness Down and Pause is Brightness Up, so with this FN+[ = brighness down, FN+] = brightness up
-- Has Mac Fast-forward and Rewind keys mapped for changing media tracks. FN+; = Rewind, FN+' = Fast-forward
-- Moved LGUI to the default MAC Command key position.
-
-Note: By default, this keymap doesn't utilize the backlighting.
diff --git a/keyboards/40percentclub/mf68/keymaps/emdarcher/rules.mk b/keyboards/40percentclub/mf68/keymaps/emdarcher/rules.mk
deleted file mode 100644
index 79cbc11ef96..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/emdarcher/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-
-BACKLIGHT_ENABLE = no
-
diff --git a/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h b/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h
deleted file mode 100644
index 1e87c64a7eb..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/mf68_ble/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Overrides for Feather 32u4 Bluefruit */
-
-/*
- * 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)
- *
-*/
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#define MATRIX_ROW_PINS { D1, D0, C6, D7, B5, B6, B7, D6 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, D2, D3 }
diff --git a/keyboards/40percentclub/mf68/keymaps/mf68_ble/keymap.c b/keyboards/40percentclub/mf68/keymaps/mf68_ble/keymap.c
deleted file mode 100644
index 0002263de51..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/mf68_ble/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _FN1 1
-#define _FN2 2
-#define KC_X0 LT(_FN2, KC_GRV)
-#define KC_X1 MO(_FN1)
-#define KC_X2 BL_STEP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_68_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_INS ,KC_PGUP,
- /*|----`----`----`----`----`----`----`----`----`----`----`----`----`--------|  |----`----| */
-    KC_TAB   , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_LBRC,KC_RBRC, KC_BSLS ,   KC_DEL ,KC_PGDN,
- /*|------`----`----`----`----`----`----`----`----`----`----`----`----`------|  `----`----' */
-    KC_X0     , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,    KC_ENTER ,
- /*|-------`----`----`----`----`----`----`----`----`----`----`----`----------|  ,----. */
-    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_SPACE             ,  KC_X1  ,KC_RALT ,KC_RCTL ,    KC_LEFT,KC_DOWN,KC_RGHT
- /*`-----+-----+-----+------------------------------+------+-----+-----'   `----+----+----' */
-  ),
-
-  [_FN1] = LAYOUT_68_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_BSPC ,   KC_VOLU,KC_HOME,
- /*|esc-`-1--`-2--`-3--`-4--`-5--`-6--`-7--`-8--`-9--`-0--`mnus`plus`--bksp--|  |ins-`pgup| */
-      KC_TRNS,KC_TRNS,KC_TRNS, KC_UP ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_X2 ,  KC_TRNS,   KC_VOLD,KC_END,
- /*|tab---`-q--`-w--`-e--`-r--`-t--`-y--`-u--`-i--`-o--`-p--`-{--`-}--`--|---|  `del-`pgdn' */
-       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,
- /*|caps---`-a--`-s--`-d--`-f--`-g--`-h--`-j--`-k--`-l--`-;--`-'--`----enter-|  ,----. */
-         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_MUTE,
- /*|shift----`-z--`-x--`-c--`-v--`-b--`-n--`-m--`-,--`-.--`-/--`-------shift-.--|-up-|----. */
-     KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPRV,KC_MPLY,KC_MNXT
- /*`ctrl-+-gui-+-alt-+----------space---------------+-fn---+-alt-+ctrl-'   `left+down+rght' */
-  ),
-
-  [_FN2] = LAYOUT_68_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_BSPC ,   KC_VOLU,KC_HOME,
- /*|esc-`-1--`-2--`-3--`-4--`-5--`-6--`-7--`-8--`-9--`-0--`mnus`plus`--bksp--|  |ins-`pgup| */
-      KC_TRNS,KC_TRNS,KC_TRNS, KC_UP ,KC_TRNS,KC_TRNS,KC_TRNS, KC_7  , KC_8  , KC_9  ,KC_TRNS,KC_TRNS,KC_TRNS,  KC_TRNS,   KC_VOLD,KC_END,
- /*|tab---`-q--`-w--`-e--`-r--`-t--`-y--`-u--`-i--`-o--`-p--`-{--`-}--`--|---|  `del-`pgdn' */
-       KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS, KC_4  , KC_5  , KC_6  ,KC_TRNS,KC_TRNS,      KC_TRNS,
- /*|caps---`-a--`-s--`-d--`-f--`-g--`-h--`-j--`-k--`-l--`-;--`-'--`----enter-|  ,----. */
-         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_0  , KC_1  , KC_2  , KC_3  ,KC_TRNS,         KC_TRNS,   KC_MUTE,
- /*|shift----`-z--`-x--`-c--`-v--`-b--`-n--`-m--`-,--`-.--`-/--`-------shift-.--|-up-|----. */
-     KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,    KC_MPRV,KC_MPLY,KC_MNXT
- /*`ctrl-+-gui-+-alt-+----------space---------------+-fn---+-alt-+ctrl-'   `left+down+rght' */
-  )
-};
diff --git a/keyboards/40percentclub/mf68/keymaps/mf68_ble/readme.md b/keyboards/40percentclub/mf68/keymaps/mf68_ble/readme.md
deleted file mode 100644
index e590ae3e6db..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/mf68_ble/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# mf68_ble
-
-![mf68_ble](https://i.imgur.com/zuTyy7k.jpg)
-===
-
-Magicforce 68 with [replacement PCB](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/mf68) designed by [di0ib](https://github.com/di0ib).
-
-Keyboard Maintainer: QMK Community  
-Hardware Supported: [Feather 32u4 Bluefruit](https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/)
-Please note: This is 32u4 and not M0
-Hardware Availability: [PCB files](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/mf68/pcb)  
-[MF68 thicc case files](https://github.com/harshitgoel96/mf68-case-thicc)  
-Story
------
-
-The story and the idea behind this mod is available on [my reddit post](https://www.reddit.com/r/MechanicalKeyboards/comments/7eiiht/guide_i_built_a_bluetooth_enabled_magicforce68_no/)
-
-Wiring
-------
-
-Below is how you wire the Feather to PCB
-
-![wire map](https://i.imgur.com/zYOjlTA.png)
-
-Make example for this keyboard (after setting up your build environment):  
-
-    make 40percentclub/mf68:mf68_ble
-
-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/40percentclub/mf68/keymaps/mf68_ble/rules.mk b/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk
deleted file mode 100644
index dedd62afcbc..00000000000
--- a/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Processor frequency
-F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = bluefruit_le
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/40percentclub/nano/keymaps/spooka/config.h b/keyboards/40percentclub/nano/keymaps/spooka/config.h
deleted file mode 100644
index e00505cd8be..00000000000
--- a/keyboards/40percentclub/nano/keymaps/spooka/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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
-
-#undef RGBLED_NUM
-#    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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/40percentclub/nano/keymaps/spooka/keymap.c b/keyboards/40percentclub/nano/keymaps/spooka/keymap.c
deleted file mode 100644
index 7908794fe01..00000000000
--- a/keyboards/40percentclub/nano/keymaps/spooka/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _MAIN 0
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = LAYOUT(
-     RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-     RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD
-  )
-};
diff --git a/keyboards/40percentclub/nano/keymaps/spooka/rules.mk b/keyboards/40percentclub/nano/keymaps/spooka/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/40percentclub/nano/keymaps/spooka/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/40percentclub/nori/keymaps/macro/config.h b/keyboards/40percentclub/nori/keymaps/macro/config.h
deleted file mode 100644
index 03f34d3f517..00000000000
--- a/keyboards/40percentclub/nori/keymaps/macro/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2018
- *
- * 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
-
-// place overrides here
-#undef RGBLED_NUM
-#define RGBLED_NUM 4
diff --git a/keyboards/40percentclub/nori/keymaps/macro/keymap.c b/keyboards/40percentclub/nori/keymaps/macro/keymap.c
deleted file mode 100644
index fcb1c3dc83e..00000000000
--- a/keyboards/40percentclub/nori/keymaps/macro/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2018
- *
- * 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_INT1,  KC_INT2,  KC_INT3,  KC_INT5,
-    KC_F13,   KC_F14,   KC_F15,   KC_F16,
-    KC_F17,   KC_F18,   KC_F19,   KC_F20,
-    KC_F21,   KC_F22,   KC_F23,   KC_F24
-  ),
-};
diff --git a/keyboards/40percentclub/nori/keymaps/macro/readme.md b/keyboards/40percentclub/nori/keymaps/macro/readme.md
deleted file mode 100644
index de2324248ac..00000000000
--- a/keyboards/40percentclub/nori/keymaps/macro/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default single board macro keymap for nori
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
deleted file mode 100644
index 0ac12473e04..00000000000
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2018
- *
- * 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 RETRO_TAPPING_PER_KEY
-#define TAPPING_TERM_PER_KEY
-
-#define COMBO_TERM 40             // time out for combos in ms
-#define TAPPING_TERM 200          // time out for tap-hold in ms
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
deleted file mode 100644
index fc6b19ff3c6..00000000000
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#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 custom_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-
-#define _ESC MT(MOD_LGUI, KC_ESC) // escape on tap, gui on hold
-#define _SFT MT(MOD_LSFT, KC_ENT) // enter on tap, shift on hold
-#define _SPC MT(MOD_LCTL, KC_SPC) // space on tap, ctrl on hold
-
-const uint16_t PROGMEM df_tab[] = {KC_D, KC_F, COMBO_END};
-const uint16_t PROGMEM jk_alt[] = {KC_J, KC_K, COMBO_END};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * .-----------------------------------------------------------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |      |      |   Y  |   U  |   I  |   O  |   P  |
- * +------+------+------+------+-------------+------+------+------+------+------+------+
- * |   A  |   S  |   D  |   F  |   G  |      |      |   H  |   J  |   K  |   L  | :  ; |
- * +------+------+------+------+------|------+------+------+------+------+------+------+
- * |   Z  |   X  |   C  |   V  |   B  |      |      |   N  |   M  | <  , | >  . | ?  / |
- * +------+------+------+------+------+------+------+------+------+------+------+------+
- * |      |      | Esc  |Enter |Raise |      |      |Lower |Space |Delete|      |      |
- * .-----------------------------------------------------------------------------------.
- * esc   on tap, gui   on hold
- * enter on tap, shift on hold
- * space on tap, ctl   on hold
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   XXXXXXX, XXXXXXX, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   XXXXXXX, XXXXXXX, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   XXXXXXX, XXXXXXX, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-  XXXXXXX, XXXXXXX, _ESC,    _SFT,    RAISE,  XXXXXXX, XXXXXXX, LOWER,   _SPC,    KC_BSPC, XXXXXXX, XXXXXXX
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   !  |   @  |   #  |   $  |      |      |   %  |   ^  |   &  |   *  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ~  |   |  |   [  |   ]  |   {  |      |      |   }  |   (  |   )  |   "  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Shift |   +  |   =  |   -  |  _   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |RAISE |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  XXXXXXX, XXXXXXX, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_BSLS,
-  KC_TILD, KC_PIPE, KC_LBRC, KC_RBRC, KC_LCBR, XXXXXXX, XXXXXXX, KC_RCBR, KC_LPRN, KC_RPRN, KC_DQUO, KC_QUOT,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LSFT, KC_PLUS, KC_EQL,  KC_MINS, KC_UNDS,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RAISE,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |      |      |   6  |   7  |   8  |   9  |   0  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   F1 |   F2 |   F3 |   F4 |   F5 |      |      |      |  GUI |  SFT |  CTL |  ALT |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   F6 |   F7 |   F8 |   F9 |  F10 |      |      |  F11 |  F12 |      |      |  Esc |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Lower |Space |Delete|      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    XXXXXXX, XXXXXXX, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, KC_LSFT, KC_LCTL, KC_LALT,
-  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_ESC,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER,   _SPC,    KC_BSPC, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |PntSrn|      |      | PgUp |BrtUp |      |      | Mute |VolDw |VolUp |Ply/Ps|QK_BOOT |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      | PgDw |BrtDw |      |      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Prev | Next |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  KC_PSCR, XXXXXXX, XXXXXXX, KC_PGUP, KC_BRIU, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, QK_BOOT,
-  XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_BRID, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MNXT, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-)
-};
-
-combo_t key_combos[] = {
-  COMBO(df_tab, KC_TAB),
-  COMBO(jk_alt, KC_LALT),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case _SFT:
-      return TAPPING_TERM - 100;
-    default:
-      return TAPPING_TERM;
-  }
-}
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/readme.md b/keyboards/40percentclub/nori/keymaps/wings_36key/readme.md
deleted file mode 100644
index 16eb6d9e112..00000000000
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# 36 Key QWERTY Layout
-
-Offers more hand seperation with a 2 key gap down the middle of the board.
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/rules.mk b/keyboards/40percentclub/nori/keymaps/wings_36key/rules.mk
deleted file mode 100644
index 446213032ee..00000000000
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes 					# Custom chords
diff --git a/keyboards/40percentclub/sixpack/keymaps/fkeys/keymap.c b/keyboards/40percentclub/sixpack/keymaps/fkeys/keymap.c
deleted file mode 100644
index 4164620b5cc..00000000000
--- a/keyboards/40percentclub/sixpack/keymaps/fkeys/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2020
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Tap Dance declarations
-enum {
-    F13F19,
-    F14F20,
-    F15F21,
-    F16F22,
-    F17F23,
-    F18F24,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for F13 to F18, twice for F19 to F24
-    [F13F19] = ACTION_TAP_DANCE_DOUBLE(KC_F13, KC_F19), [F14F20] = ACTION_TAP_DANCE_DOUBLE(KC_F14, KC_F20), [F15F21] = ACTION_TAP_DANCE_DOUBLE(KC_F15, KC_F21),
-    [F16F22] = ACTION_TAP_DANCE_DOUBLE(KC_F16, KC_F22), [F17F23] = ACTION_TAP_DANCE_DOUBLE(KC_F17, KC_F23), [F18F24] = ACTION_TAP_DANCE_DOUBLE(KC_F18, KC_F24)
-};
-
-// Add tap dance item in place of a key code
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* 2x3 layout
-     * .-----------------------------.
-     * | F13/F19 | D14/F20 | F15/F21 |
-     * |---------+---------+---------+
-     * | F16/F22 | D17/F23 | F18/F24 |
-     * '-----------------------------'
-     */
-
-    [0] = LAYOUT_ortho_2x3(/* F13 to F24 */
-                 TD(F13F19), TD(F14F20), TD(F15F21),
-		 TD(F16F22), TD(F17F23), TD(F18F24)
-		),
-};
diff --git a/keyboards/40percentclub/sixpack/keymaps/fkeys/readme.md b/keyboards/40percentclub/sixpack/keymaps/fkeys/readme.md
deleted file mode 100644
index 9974588e5f2..00000000000
--- a/keyboards/40percentclub/sixpack/keymaps/fkeys/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# F13 to F24 keymap with Tap Dance for Six Pack
diff --git a/keyboards/40percentclub/sixpack/keymaps/fkeys/rules.mk b/keyboards/40percentclub/sixpack/keymaps/fkeys/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/40percentclub/sixpack/keymaps/fkeys/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c b/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
deleted file mode 100644
index 8a0ba7b3916..00000000000
--- a/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Copyright 2018 Carlos Filoteo
- *
- * 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 LED_ENABLE
-  #include "uart.h"
-#endif
-
-#define LT3_TAB LT(3, KC_TAB)
-#define MT_RSFT_ENT MT(MOD_RSFT, KC_ENT)
-
-enum custom_keycodes {
-    LED_TOG = SAFE_RANGE,
-    LED_CHG
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base Layer
-   * ,-------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |Bspace |
-   * |-------------------------------------------------------------------------+
-   * |Tab/L3|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |   '  |
-   * |-------------------------------------------------------------------------+
-   * | Shift |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |Sh/En|
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt | Gui | App |  L2  |   Space   |  L1  | Left| Down|  Up |Right|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT(
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  LT3_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, MT_RSFT_ENT,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  MO(2),      KC_SPC,        MO(1),  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-  /* FN Layer 1
-   * ,-------------------------------------------------------------------------.
-   * | ` ~ |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Delete|
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |  #  |  -  |  =  |  [  |  ]  |  \   |
-   * |-------------------------------------------------------------------------+
-   * |       | F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |Capsl|      |          |       | Home| PgDn| PgUp| End |
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Right */
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DELETE,
-  _______, _______, _______, _______, _______, _______, KC_NUHS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_NUBS,
-  _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  _______,
-  _______, _______, _______, KC_CAPS, _______,     _______,      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-  /* FN Layer 2
-   * ,-------------------------------------------------------------------------.
-   * |   ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |Delete|
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |  _  |  +  |  { |  }  |   |   |
-   * |-------------------------------------------------------------------------+
-   * |       | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |Capsl|      |          |       | Home| PgDn| PgUp| End |
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Left */
-  KC_TILDE,  KC_EXCLAIM,  KC_AT,  KC_HASH,  KC_DOLLAR, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_DELETE,
-  _______, _______, _______, _______, _______, _______, _______, KC_UNDERSCORE, KC_PLUS, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_PIPE,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  _______, _______, _______, KC_CAPS, _______,     _______,      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-  /* FN Layer 2
-   * ,-------------------------------------------------------------------------.
-   * | Esc | Calc|Webhm| Mail| Comp|     |     |     |     |     |PrtSc|       |
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |     |     |     |     |      |
-   * |-------------------------------------------------------------------------+
-   * |       |LEDtg|LEDch|     |     |     |     |     |     |     |     |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |     |      |          |       |MousL|MousD|MousU|MousR|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Tab */
-  KC_ESC,  KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, LED_TOG, LED_CHG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
-),
-};
-
-//LED keymap functions
- #ifdef LED_ENABLE
-void led_chmode(void) {
-  uart_write(0x65);
-}
-
-void led_toggle(void) {
-  uart_write(0x64);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case LED_TOG:
-        #ifdef LED_ENABLE
-        led_toggle();
-        #endif
-        return false;
-      case LED_CHG:
-        #ifdef LED_ENABLE
-        led_chmode();
-        #endif
-        return false;
-    }
-  }
-  return true;
-};
-#endif
diff --git a/keyboards/40percentclub/ut47/keymaps/non-us/readme.md b/keyboards/40percentclub/ut47/keymaps/non-us/readme.md
deleted file mode 100644
index e09dc73fab8..00000000000
--- a/keyboards/40percentclub/ut47/keymaps/non-us/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# UT47 default keymap
-
-![UT47 layout image](https://i.imgur.com/Tsz5qsF.png)
-
-[KLE](http://www.keyboard-layout-editor.com/##@@_y:0%3B&=Esc&=Q&=W&=E&=R&=T&=Y&=U&=I&=O&=P&_w:1.5%3B&=Back%20Space&_x:0.25&a:4&f:4&w:4&h:4&d:true%3B&=%3Cb%3EGNAP!%3C%2F%2Fb%3E%3Cp%3E%3Cp%3EMinimum%20stagger%3Cp%3E47%20key%20layout%3B&@_a:7&f:3&w:1.25%3B&=Tab&=A&=S&=D&=F&=G&=H&=J&=K&=L&=%2F%3B&_w:1.25%3B&=%27%3B&@_w:1.5%3B&=Shift&=Z&=X&=C&=V&=B&=N&=M&=,&=.&=%2F%2F&=Return%3B&@=Ctrl&=Alt&=Super&=Menu&_w:1.25%3B&=%2F&dArr%2F%3B&_w:2%3B&=&_w:1.25%3B&=%2F&uArr%2F%3B&=%2F&larr%2F%3B&=%2F&darr%2F%3B&=%2F&uarr%2F%3B&=%2F&rarr%2F%3B%3B&=undefined)
-
-### LED Controls
-
-Use <kbd>TAB</kbd>+<kbd>Z</kbd> to cycle through brightness (8 steps)
-
-Use <kbd>TAB</kbd>+<kbd>X</kbd> to cycle through the following LED modes: 
-
-- solid
-- breathing
-- random
-- rain
-- reactive
-- poptang
-- off
diff --git a/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c b/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
deleted file mode 100644
index 64bc4506dab..00000000000
--- a/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Copyright 2018 Carlos Filoteo
- *
- * 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 LED_ENABLE
-  #include "uart.h"
-
-#endif
-
-#include "keymap_norwegian.h"
-
-#define LT3_TAB LT(3, KC_TAB)
-#define MT_RSFT_ENT MT(MOD_RSFT, KC_ENT)
-#define CTRADEL LALT(LCTL(KC_DEL))
-#define ALTTAB  LALT(KC_TAB)
-
-enum custom_keycodes {
-    LED_TOG = SAFE_RANGE,
-    LED_CHG
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base Layer - L0
-   * ,-------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |Bspace |
-   * |-------------------------------------------------------------------------+
-   * |Tab/L3|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  '  |Ent/RS|
-   * |-------------------------------------------------------------------------+
-   * | Shift |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  Up |  L4 |
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Gui |  L4 | Alt |  L2  |   Space   |  L1  | Ctrl| Left| Down|Right|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Base - L0 */
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  LT3_TAB, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    NO_QUOT, MT_RSFT_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,  MO(4),
-  KC_LCTL, KC_LGUI, MO(4), KC_LALT,  MO(2),      KC_SPC,        MO(1),  KC_RCTL, KC_LEFT, KC_DOWN,   KC_RGHT
-),
-
-  /* FN Layer 1
-   * ,-------------------------------------------------------------------------.
-   * |  |  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Delete|
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |     |  +  |  =  |  *  |  /   |
-   * |-------------------------------------------------------------------------+
-   * |       |     |     |     |     |     |     |     |  -  |  _  | PgUp|     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |Capsl|      |          |       |     | Home| PgDn| End |
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Right modifier - L1 */
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DELETE,
-  _______, _______, _______, _______, _______, _______, _______, _______, NO_PLUS,  NO_EQL, NO_ASTR, NO_SLSH,
-  _______, _______, _______, _______, _______, _______, _______, _______,  NO_MINS,  NO_UNDS,  KC_PGUP, _______,
-  _______, _______, _______, KC_CAPS, _______,     _______,      _______, _______, KC_HOME, KC_PGDN, KC_END
-),
-
-  /* FN Layer 2
-   * ,-------------------------------------------------------------------------.
-   * |  §  |  !  |  "  |  #  |  ¤  |  %  |  &  |  /  |  =  |  +  |  \  | Delete|
-   * |-------------------------------------------------------------------------+
-   * |      |     |  ?  |  {  |  [  |  (  |  )  |  ]  |  }  | F10 | F11 |  F12 |
-   * |-------------------------------------------------------------------------+
-   * |       | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | PgUp|     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |Capsl|      |          |       |     | Home| PgDn| End |
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Left modifier - L2 */
-  NO_SECT, KC_EXCLAIM,  NO_DQUO, KC_HASH,  NO_CURR,  KC_PERCENT, NO_AMPR, NO_SLSH, NO_EQL, NO_PLUS, NO_BSLS, KC_DELETE,
-  _______, _______, NO_QUES, NO_LCBR, NO_LBRC, NO_LPRN, NO_RPRN, NO_RBRC, NO_RCBR, KC_F10, KC_F11, KC_F12,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_PGUP,  _______,
-  _______, _______, _______, KC_CAPS, _______,     _______,      _______, _______, KC_HOME, KC_PGDN, KC_END
-),
-
-  /* FN Layer 3
-   * ,-------------------------------------------------------------------------.
-   * | Esc | Calc|Webhm| Comp|Webrf|     |     |     |     |     |PrtSc|CtrAlDl|
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |VolDn|VolUp|     |     |      |
-   * |-------------------------------------------------------------------------+
-   * |       |LEDtg|LEDch|     |     |QK_BOOT|     | Mute|     |MouB1|MousU|MouB2|
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |     |      |          |       |     |MousL|MousD|MousR|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Hold Tab down - L3 */
-  KC_ESC,  KC_CALC, KC_WHOM, KC_MYCM, KC_WREF, _______, _______, _______, _______, _______, KC_PSCR, CTRADEL,
-  _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, _______,
-  _______, LED_TOG, LED_CHG, _______, _______, QK_BOOT, _______, KC_MUTE, _______, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2,
-  _______, _______, _______, _______, _______,     _______,      _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-),
-
-  /* FN Layer 4
-   * ,-------------------------------------------------------------------------.
-   * |     |     |  @  |  £  |  $  |  ~  |     |  ¨  |  ´  |  `  |  Å  |       |
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |  €  |     |     |     |     |  ^  |  Ø  |  Æ  |      |
-   * |-------------------------------------------------------------------------+
-   * |       |  <  |     |     |     |     |     |  µ  |     |     |     |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |     |      |          |       | L5  |     |     |     |
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Norsk - L4 */
-  _______, _______,   NO_AT,  NO_PND,  NO_DLR, NO_TILD, _______, NO_QUOT, NO_ACUT,  NO_GRV, NO_ARNG, _______,
-  _______, _______, _______, NO_EURO, _______, _______, _______, _______, NO_CIRC, NO_OSTR,   NO_AE, _______,
-  _______, NO_LABK, _______, _______, _______, _______, _______, NO_MICR, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______,   TO(5), _______, _______, _______
-),
-
-  /* GAMING Layer (toggle on and off)
-   * ,-------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  E  |  R  |  T  |  Y  |  F1 |  F2 |  F3 |  F4 |Alt+Tab|
-   * |-------------------------------------------------------------------------+
-   * | Tab  |  A  |  S  |  D  |  F  |  G  |  H  |  F5 |  F6 |  F7 |  F8 | Enter|
-   * |-------------------------------------------------------------------------+
-   * | Shift |  1  |  2  |  3  |  4  |  5  |  6  |  F9 | F10 | F11 | Up  |TOGGL|
-   * |-------------------------------------------------------------------------+
-   * | Ctrl|  Z  |  X  |  C  |   B  |   Space   |   M  |  V  |Left |Down |Right|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* GAMING, toggled on and off - L5 */
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_F1,    KC_F2,    KC_F3,    KC_F4, ALTTAB,
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_F5,    KC_F6,    KC_F7,    KC_F8,  KC_ENT,
-  KC_LSFT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_F9,   KC_F10,   KC_F11,    KC_UP,   TO(0),
-  KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_B,      KC_SPC,          KC_M,     KC_V,  KC_LEFT,  KC_DOWN, KC_RGHT
-),
-};
-
-//LED keymap functions
- #ifdef LED_ENABLE
-void led_chmode(void) {
-  uart_write(0x65);
-}
-
-void led_toggle(void) {
-  uart_write(0x64);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case LED_TOG:
-        #ifdef LED_ENABLE
-        led_toggle();
-        #endif
-        return false;
-      case LED_CHG:
-        #ifdef LED_ENABLE
-        led_chmode();
-        #endif
-        return false;
-    }
-  }
-  return true;
-};
-#endif
diff --git a/keyboards/40percentclub/ut47/keymaps/nordic/readme.md b/keyboards/40percentclub/ut47/keymaps/nordic/readme.md
deleted file mode 100644
index 4b0d0eb1223..00000000000
--- a/keyboards/40percentclub/ut47/keymaps/nordic/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# UT47 Nordic keymap
-
-
-![UT47 Nordic layout image](https://i.imgur.com/ZNtF4wA.png)
-
-[KLE - Nordic layout](http://www.keyboard-layout-editor.com/##@_name=UT47%20-%20Nordic%20layout&author=neonSpork%3B&@_a:7%3B&=Esc&=Q&=W&=E&=R&=T&=Y&=U&=I&=O&=P&_w:1.5%3B&=Backspace%3B&@_c=%23c75656&a:4&w:1.25%3B&=%0A%0A%0AL3%0A%0A%0A%0A%0A%0ATab&_c=%23cccccc&a:7%3B&=A&=S&=D&=F&=G&=H&=J&=K&=L&='&_a:4&w:1.25%3B&=Enter%0A%0A%0ARShift%3B&@_a:7&w:1.5%3B&=LShift&=Z&=X&=C&=V&=B&=N&=M&=,&=.&=%2F&uarr%2F%3B&_c=%23bb45c4%3B&=L4%3B&@_c=%23cccccc%3B&=LCtrl&=LGUI&_c=%23bb45c4%3B&=L4&_c=%23cccccc%3B&=LAlt&_c=%2333aaff&w:1.25%3B&=L2&_c=%23cccccc&w:2%3B&=Space&_c=%23f5b047&w:1.25%3B&=L1&_c=%23cccccc%3B&=RCtrl&=%2F&larr%2F%3B&=%2F&darr%2F%3B&=%2F&rarr%2F%3B%3B&@_y:0.25&c=%23f5b047%3B&=%7C&=1&=2&=3&=4&=5&=6&=7&=8&=9&=0&_w:1.5%3B&=Delete%3B&@_w:1.25%3B&=&=&=&=&=&=&=&=&=+&=%2F=&=*&_w:1.25%3B&=%2F%2F%3B&@_w:1.5%3B&=&=&=&=&=&=&=&=&=-&=%2F_&=PgUp&=%3B&@=&=&=&=Caps&_w:1.25%3B&=&_w:2%3B&=&_w:1.25%3B&=&=&=Home&=PgDn&=End%3B&@_y:0.25&c=%2333aaff%3B&=%C2%A7&=!&=%22&=%23&=%C2%A4&=%25&=%2F&&=%2F%2F&=%2F=&=+&=%5C&_w:1.5%3B&=Delete%3B&@_w:1.25%3B&=&=&=%3F&=%7B&=%5B&=(&=)&=%5D&=%7D&=F10&=F11&_w:1.25%3B&=F12%3B&@_w:1.5%3B&=&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=PgUp&=%3B&@=&=&=&=Caps&_w:1.25%3B&=&_w:2%3B&=&_w:1.25%3B&=&=&=Home&=PgDn&=End%3B&@_y:0.25&c=%23c75656%3B&=Esc&=Calc&_a:5%3B&=www%0A%0A%0A%0A%0A%0Ahome&=My%0A%0A%0A%0A%0A%0AComp&=www%0A%0A%0A%0A%0A%0ARefresh&_a:7%3B&=&=&=&=&=&=PrtScr&_w:1.5%3B&=Ctr%20Alt%20Del%3B&@_w:1.25%3B&=&=&=&=&=&=&=&=VolDn&=VolUp&=&=&_w:1.25%3B&=%3B&@_w:1.5%3B&=&=LEDtg&=LEDch&=&=&=RESET&=&=Mute&=&_a:5%3B&=Mouse%0AClick%0A%0A%0A%0A%0ALeft&=Mouse%0A%0A%0A%0A%0A%0AUp&=Mouse%0AClick%0A%0A%0A%0A%0ARight%3B&@_a:7%3B&=&=&=&=&_w:1.25%3B&=&_w:2%3B&=&_w:1.25%3B&=&=&_a:5%3B&=Mouse%0A%0A%0A%0A%0A%0ALeft&=Mouse%0A%0A%0A%0A%0A%0ADown&=Mouse%0A%0A%0A%0A%0A%0ARight%3B&@_y:0.25&c=%23bb45c4&a:7%3B&=&=&=%2F@&=%C2%A3&=$&=~&=&=%C2%A8&=%C2%B4&=%60&=%C3%85&_w:1.5%3B&=%3B&@_w:1.25%3B&=&=&=&=%E2%82%AC&=&=&=&=&=%5E&=%C3%98&=%C3%86&_w:1.25%3B&=%3B&@_w:1.5%3B&=&=%3C&=&=&=&=&=&=%C2%B5&=&=&=&=%3B&@=&=&=&=&_w:1.25%3B&=&_w:2%3B&=&_w:1.25%3B&=&_c=%2345b564&a:5%3B&=L5%0A%0A%0A%0A%0A%0AON&_c=%23bb45c4&a:7%3B&=&=&=%3B&@_y:0.25&c=%2345b564%3B&=Esc&=Q&=W&=E&=R&=T&=Y&=F1&=F2&=F3&=F4&_w:1.5%3B&=Alt%20Tab%3B&@_w:1.25%3B&=Tab&=A&=S&=D&=F&=G&=H&=F5&=F6&=F7&=F8&_w:1.25%3B&=Enter%3B&@_w:1.5%3B&=Shift&=1&=2&=3&=4&=5&=6&=F9&=F10&=F11&=%2F&uarr%2F%3B&_c=%23cccccc&a:5%3B&=L5%0A%0A%0A%0A%0A%0AOFF%3B&@_c=%2345b564&a:7%3B&=LCtrl&=Z&=X&=C&_w:1.25%3B&=B&_w:2%3B&=Space&_w:1.25%3B&=M&=V&=%2F&larr%2F%3B&=%2F&darr%2F%3B&=%2F&rarr%2F)
-
-
-Chose to modify the layout to include dedicated arrows on the bottom right. Layers 1-4 are modifiers, layer 5 is a toggle on gaming mode. Tab is dual function: Tap for Tab and hold for L3. So is enter: tap for Enter and hold for Right shift.
-
-### Nordic characters
-On its own modifier layer, accessed from left (between left GUI and ALT) or right (above Right arrow)
-
-### Gaming layer
-Toggled on/off, accessed via the Nordic layer.
-
-Toggle on: <kbd>L4</kbd>+<kbd>RCtrl</kbd>
-
-Toggle off: <kbd>L4</kbd> (above <kbd>&rarr;</kbd>)
-
-### LED Controls
-
-Use <kbd>TAB</kbd>+<kbd>Z</kbd> to cycle through brightness (8 steps)
-
-Use <kbd>TAB</kbd>+<kbd>X</kbd> to cycle through the following LED modes: 
-
-- solid
-- breathing
-- random
-- rain
-- reactive
-- poptang
-- off
diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/config.h b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
index 8dc267380ae..d48ee2bf3f8 100644
--- a/keyboards/40percentclub/ut47/keymaps/rgb/config.h
+++ b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
@@ -29,4 +29,4 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define WS2812_DI_PIN D3    // The pin the LED strip is connected to
-#define RGBLED_NUM 7     // Number of LEDs in your strip
+#define RGBLIGHT_LED_COUNT 7     // Number of LEDs in your strip
diff --git a/keyboards/40percentclub/ut47/matrix.c b/keyboards/40percentclub/ut47/matrix.c
index 97922e2dbe9..02ed88b7091 100644
--- a/keyboards/40percentclub/ut47/matrix.c
+++ b/keyboards/40percentclub/ut47/matrix.c
@@ -76,7 +76,7 @@ uint8_t matrix_scan(void)
         if (matrix_debouncing[i] != cols) {
             matrix_debouncing[i] = cols;
             if (debouncing) {
-                debug("bounce!: "); debug_hex(debouncing); debug("\n");
+                dprintf("bounce!: %02X\n", debouncing);
             }
             debouncing = DEBOUNCE;
         }
diff --git a/keyboards/4by3/keymaps/arrowpad/keymap.c b/keyboards/4by3/keymaps/arrowpad/keymap.c
deleted file mode 100644
index df803a35e60..00000000000
--- a/keyboards/4by3/keymaps/arrowpad/keymap.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Change 'LAYOUT_vertical_right' to 'LAYOUT_vertical_left'
-       to change the side where the pro micro usb port is. */
-    [0] = LAYOUT_vertical_right(
-		KC_INS  , KC_HOME , KC_PGUP ,
-        KC_DEL  , KC_END  , KC_PGDN ,
-        KC_PSCR , KC_UP   , KC_PAUS ,
-        KC_LEFT , KC_DOWN , KC_RGHT
-    )
-};
diff --git a/keyboards/4by3/keymaps/funcpad_horizontal/keymap.c b/keyboards/4by3/keymaps/funcpad_horizontal/keymap.c
deleted file mode 100644
index 287d125ef13..00000000000
--- a/keyboards/4by3/keymaps/funcpad_horizontal/keymap.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_horizontal(
-		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/4by3/keymaps/funcpad_vertical/keymap.c b/keyboards/4by3/keymaps/funcpad_vertical/keymap.c
deleted file mode 100644
index c345f282401..00000000000
--- a/keyboards/4by3/keymaps/funcpad_vertical/keymap.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Change 'LAYOUT_vertical_right' to 'LAYOUT_vertical_left'
-       to change the side where the pro micro usb port is. */
-	[0] = LAYOUT_vertical_right(
-		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/4by3/keymaps/numpad_horizontal/keymap.c b/keyboards/4by3/keymaps/numpad_horizontal/keymap.c
deleted file mode 100644
index c1195b0bc90..00000000000
--- a/keyboards/4by3/keymaps/numpad_horizontal/keymap.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_horizontal(
-		KC_P1   , KC_P2   , KC_P3   , KC_P4   ,
-		KC_P5   , KC_P6   , KC_P7   , KC_P8   ,
-		KC_P9   , KC_P0   , KC_BSPC , KC_ENT
-    ),
-};
diff --git a/keyboards/4by3/keymaps/numpad_vertical/keymap.c b/keyboards/4by3/keymaps/numpad_vertical/keymap.c
deleted file mode 100644
index 7705ea9b83e..00000000000
--- a/keyboards/4by3/keymaps/numpad_vertical/keymap.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Change 'LAYOUT_vertical_right' to 'LAYOUT_vertical_left'
-       to change the side where the pro micro usb port is. */
-	[0] = LAYOUT_vertical_right(
-		KC_P1   , KC_P2   , KC_P3   ,
-        KC_P4   , KC_P5   , KC_P6   ,
-        KC_P7   , KC_P8   , KC_P9   ,
-        KC_BSPC , KC_P0   , KC_ENT
-    ),
-};
diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h
index efad0a1718c..1aa7587780c 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/config.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/config.h
@@ -22,38 +22,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define RGB_MATRIX_LED_COUNT 62
 #define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
-
-#define RGB_MATRIX_DEFAULT_VAL 80
-#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_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
-// 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_CROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-
diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json
index 527f3d57726..06b16d1900a 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/info.json
+++ b/keyboards/4pplet/perk60_iso/rev_a/info.json
@@ -9,6 +9,35 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_nexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "default": {
+            "val": 80
+        },
         "driver": "is31fl3733"
     },
     "matrix_pins": {
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
index e3b8d71a904..2de3acc60d7 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
+++ b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
@@ -17,75 +17,74 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "rev_a.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, K_2,  J_2,  L_2 }, //D402
-    { 0, K_3,  J_3,  L_3 }, //D403
-    { 0, K_4,  J_4,  L_4 }, //D404
-    { 0, K_5,  J_5,  L_5 }, //D405
-    { 0, K_6,  J_6,  L_6 }, //D406
-    { 0, K_7,  J_7,  L_7 }, //D407
-    { 0, K_8,  J_8,  L_8 }, //D408
-    { 0, K_9,  J_9,  L_9 }, //D409
-    { 0, K_10, J_10, L_10 }, //D410
-    { 0, K_11, J_11, L_11 }, //D411
-    { 0, K_12, J_12, L_12 }, //D412
-    { 0, K_13, J_13, L_13 }, //D413
-    { 0, K_14, J_14, L_14 }, //D414
-    { 0, K_15, J_15, L_15 }, //D415
-    { 0, K_1,  J_1,  L_1 }, //D401
-    { 0, H_4,  G_4,  I_4 }, //D420
-    { 0, H_5,  G_5,  I_5 }, //D421
-    { 0, H_6,  G_6,  I_6 }, //D422
-    { 0, H_7,  G_7,  I_7 }, //D423
-    { 0, H_8,  G_8,  I_8 }, //D424
-    { 0, H_9,  G_9,  I_9 }, //D425
-    { 0, H_10, G_10, I_10 }, //D426
-    { 0, H_11, G_11, I_11 }, //D427
-    { 0, H_12, G_12, I_12 }, //D428
-    { 0, H_13, G_13, I_13 }, //D429
-    { 0, H_14, G_14, I_14 }, //D430
-    { 0, H_15, G_15, I_15 }, //D431
-    { 0, K_16, J_16, L_16 }, //D416
-    { 0, H_2,  G_2,  I_2 }, //D418
-    { 0, H_3,  G_3,  I_3 }, //D419
-    { 0, E_5,  D_5,  F_5 }, //D437
-    { 0, E_6,  D_6,  F_6 }, //D438
-    { 0, E_7,  D_7,  F_7 }, //D439
-    { 0, E_8,  D_8,  F_8 }, //D440
-    { 0, E_9,  D_9,  F_9 }, //D441
-    { 0, E_10, D_10, F_10 }, //D442
-    { 0, E_11, D_11, F_11 }, //D443
-    { 0, E_12, D_12, F_12 }, //D444
-    { 0, E_13, D_13, F_13 }, //D445
-    { 0, E_14, D_14, F_14 }, //D446
-    { 0, H_16, G_16, I_16 }, //D432
-    { 0, H_1,  G_1,  I_1 }, //D417
-    { 0, E_3,  D_3,  F_3 }, //D435
-    { 0, E_4,  D_4,  F_4 }, //D436
-    { 0, B_2,  A_2,  C_2 }, //D450
-    { 0, B_3,  A_3,  C_3 }, //D451
-    { 0, B_4,  A_4,  C_4 }, //D452
-    { 0, B_6,  A_6,  C_6 }, //D454
-    { 0, B_8,  A_8,  C_8 }, //D456
-    { 0, B_9,  A_9,  C_9 }, //D457
-    { 0, B_10, A_10, C_10 }, //D458
-    { 0, B_12, A_12, C_12 }, //D460
-    { 0, B_13, A_13, C_13 }, //D461
-    { 0, E_15, D_15, F_15 }, //D447
-    { 0, E_1,  D_1,  F_1 }, //D433
-    { 0, E_2,  D_2,  F_2 }, //D434
-    { 0, B_1,  A_1,  C_1 }, //D449
-    { 0, B_7,  A_7,  C_7 }, //D455
-    { 0, B_11, A_11, C_11 }, //D459
-    { 0, B_14, A_14, C_14 }, //D462
-    { 0, B_15,  A_15,  C_15 }, //D463
-    { 0, B_16,  A_16,  C_16 } //D464
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 }, //D402
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 }, //D403
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 }, //D404
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 }, //D405
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 }, //D406
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 }, //D407
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 }, //D408
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 }, //D409
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 }, //D410
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 }, //D411
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 }, //D412
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 }, //D413
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 }, //D414
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 }, //D415
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 }, //D401
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 }, //D420
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 }, //D421
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 }, //D422
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 }, //D423
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 }, //D424
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 }, //D425
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 }, //D426
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 }, //D427
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 }, //D428
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 }, //D429
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 }, //D430
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 }, //D431
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }, //D416
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 }, //D418
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 }, //D419
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 }, //D437
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 }, //D438
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 }, //D439
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 }, //D440
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 }, //D441
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 }, //D442
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 }, //D443
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 }, //D444
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 }, //D445
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 }, //D446
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 }, //D432
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 }, //D417
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 }, //D435
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 }, //D436
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 }, //D450
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 }, //D451
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 }, //D452
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 }, //D454
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 }, //D456
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 }, //D457
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 }, //D458
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 }, //D460
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 }, //D461
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 }, //D447
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 }, //D433
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 }, //D434
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 }, //D449
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 }, //D455
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 }, //D459
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 }, //D462
+    { 0, SW2_CS15,  SW1_CS15,  SW3_CS15 }, //D463
+    { 0, SW2_CS16,  SW1_CS16,  SW3_CS16 } //D464
 };
 
+#define XXX NO_LED
 led_config_t g_led_config = {
     {
-    #define XXX NO_LED
-
     {   0,   2,   4,   6,   8,  10,  12 },
     {   1,   3,   5,   7,   9,  11, XXX },
     {  14,  16,  18,  20,  22,  24,  26 },
diff --git a/keyboards/4pplet/steezy60/keymaps/canon/keymap.c b/keyboards/4pplet/steezy60/keymaps/canon/keymap.c
deleted file mode 100644
index 92cfe047e9a..00000000000
--- a/keyboards/4pplet/steezy60/keymaps/canon/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2023 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 QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
-* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-* │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│
-* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
-* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
-* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤
-* │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ | Ent│
-* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───| er │
-* │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift│    │
-* ├────┬───|───┴┬──┴┬──┴───┴───┴───┴───┴┬──┴┬──┴┬──┴─┬───|────┤
-* │Ctrl│GUI│None│Alt│        Space      │Alt│GUI│None│App│Ctrl│
-* └────┴───┴────┴───┴───────────────────┴───┴───┴────┴───┴────┘
-*/
-[0] = LAYOUT_canon(
-  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_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_NUHS, KC_ENT,
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  KC_LCTL, 	KC_LGUI, KC_NO,  KC_LALT, KC_SPC, 		   KC_RALT,KC_RGUI, KC_NO,   KC_APP,  KC_RCTL)
-};
diff --git a/keyboards/4pplet/unextended_std/keymaps/m0116/keymap.c b/keyboards/4pplet/unextended_std/keymaps/m0116/keymap.c
deleted file mode 100644
index 593e0de2b20..00000000000
--- a/keyboards/4pplet/unextended_std/keymaps/m0116/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.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] = {
-// main layer
-/*
-* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
-* │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Delete│
-* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
-* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │    │
-* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴    │
-* │ Ctrl │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │
-* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┤
-* │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │   Shift │
-* ├────┬───│───┴┬──┴┬──┴───┴───┴───┴─┬─┴─┬─┴──┬┴───┴┬────┬───┤
-* │Caps│Alt│Gui │ ` │     Space      │ \ │Left│Right│Down│ Up│
-* └────┴───┴────┴───┴────────────────┴───┴────┴─────┴────┴───┘
-*/
-[0] = LAYOUT_m0116(
-  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_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_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,       KC_N,      KC_M,      KC_COMM,   KC_DOT,     KC_SLSH, KC_RSFT,
-  KC_CAPS,  KC_LALT,  KC_LGUI,  KC_GRV,             KC_SPC,                KC_BSLS,              KC_LEFT,    KC_RIGHT,KC_DOWN, KC_UP)
-};
diff --git a/keyboards/4pplet/unextended_std/keymaps/m0118/keymap.c b/keyboards/4pplet/unextended_std/keymaps/m0118/keymap.c
deleted file mode 100644
index 1343ca2dc29..00000000000
--- a/keyboards/4pplet/unextended_std/keymaps/m0118/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.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] = {
-/*
-* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
-* │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp│
-* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
-* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │    │
-* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐Ent│
-* │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │   │
-* ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───│───┤
-* │Shft│ ` │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift│ Up│
-* ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴┬──┴─┬─┴──┬┴────┬────┤
-* │Ctrl│Alt │GUI │        Space         │GUI │Left│Right│Down│
-* └────┴────┴────┴──────────────────────┴────┴────┴─────┴────┘
-*/
-[0] = LAYOUT_m0118(
-  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_ENT,
-  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS,
-  KC_LSFT,  KC_GRV,   KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
-  KC_LCTL,  KC_LALT,  KC_LGUI,            KC_SPC,                                                KC_RGUI,    KC_LEFT, KC_RIGHT,KC_DOWN)
-};
diff --git a/keyboards/4pplet/waffling60/rev_e_iso/config.h b/keyboards/4pplet/waffling60/rev_e_iso/config.h
new file mode 100644
index 00000000000..521ddf96a18
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_iso/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2023 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
+
+#define WS2812_EXTERNAL_PULLUP
+
diff --git a/keyboards/4pplet/waffling60/rev_e_iso/info.json b/keyboards/4pplet/waffling60/rev_e_iso/info.json
new file mode 100644
index 00000000000..e53dcab891c
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_iso/info.json
@@ -0,0 +1,408 @@
+{
+    "manufacturer": "4pplet",
+    "keyboard_name": "waffling60 Rev E ISO HS",
+    "maintainer": "4pplet",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "A1", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 17
+    },
+    "url": "https://github.com/4pplet/waffling60",
+    "usb": {
+        "device_version": "0.0.5",
+        "pid": "0x0016",
+        "vid": "0x4444"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": [
+        "60_iso_tsangan_split_bs_rshift", 
+        "60_iso_wkl_split_bs_rshift"
+     ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/keymap.c
new file mode 100644
index 00000000000..545e1e974fb
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.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] = {
+// main layer
+[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_NO, 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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT_all(
+  QK_BOOT,  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_DEL,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_NUHS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS)
+};
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
diff --git a/keyboards/atlantis/ps17/keymaps/multimedia/rules.mk b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/atlantis/ps17/keymaps/multimedia/rules.mk
rename to keyboards/4pplet/waffling60/rev_e_iso/keymaps/default/rules.mk
diff --git a/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/keymap.c
new file mode 100644
index 00000000000..3254764a0c5
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.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] = {
+// main layer
+[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_BSLS, 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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,
+  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH,  KC_RSFT, MO(1),
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI,  KC_RCTL),
+// basic function layer
+[1] = LAYOUT_all(
+  QK_BOOT,  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_DEL,
+  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
+};
+#endif
diff --git a/keyboards/lpad/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lpad/keymaps/via/rules.mk
rename to keyboards/4pplet/waffling60/rev_e_iso/keymaps/via/rules.mk
diff --git a/keyboards/4pplet/waffling60/rev_e_iso/matrix_diagram.md b/keyboards/4pplet/waffling60/rev_e_iso/matrix_diagram.md
new file mode 100644
index 00000000000..9ccedf98e30
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_iso/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for 4pplet Waffling60 Rev E ISO
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │1D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2D  │
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│40   │41 │42   │44         │46 │48         │4B   │4C │4D   │
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│40   │41 │46                                     │4C │4D   │ 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
\ No newline at end of file
diff --git a/keyboards/4pplet/waffling60/rev_e_iso/readme.md b/keyboards/4pplet/waffling60/rev_e_iso/readme.md
new file mode 100644
index 00000000000..03fa4889c62
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_iso/readme.md
@@ -0,0 +1,26 @@
+# waffling60 Rev. E ISO
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support. Revision E adds underglow and rotary encoder support.
+
+More info: https://github.com/4pplet/waffling60
+
+* 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_e_iso:default
+
+Flashing example for this keyboard:
+
+    make 4pplet/waffling60/rev_e_iso: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
+
+How to enter bootloader (DFU):
+* Short the reset-header (labled BL/RESET) on the back of the PCB for about 2 seconds for the keyboard to enter DFU. When in DFU, it's ready to flash the firmware. If using a APM MCU it will not automatically reset after flash. Simply short the reset-header for a very short time to just reset the PCB, alternatively unplug and repluck the USB-cable to the keyboard.
+
+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_e_iso/rules.mk b/keyboards/4pplet/waffling60/rev_e_iso/rules.mk
new file mode 100644
index 00000000000..04fe1eba2ac
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_iso/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/7c8/framework/keymaps/steven/config.h b/keyboards/7c8/framework/keymaps/steven/config.h
deleted file mode 100644
index 2dfd41f7cf8..00000000000
--- a/keyboards/7c8/framework/keymaps/steven/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Steven Nguyen
- *
- * 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/>.
- */
-
-/* VIA specific defines to increase dynamic layer count */
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 3
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
-
-/* defining an extra row for encoder assignment in VIA */
-#undef MATRIX_ROWS
-#define MATRIX_ROWS 11
\ No newline at end of file
diff --git a/keyboards/7c8/framework/keymaps/steven/keymap.c b/keyboards/7c8/framework/keymaps/steven/keymap.c
deleted file mode 100644
index 5cba63e0fac..00000000000
--- a/keyboards/7c8/framework/keymaps/steven/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2020 Steven Nguyen
- *
- * 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 framework_layers {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _BOTH,
-    _FN
-};
-
-enum framework_keycodes {
-    LOWER = SAFE_RANGE,
-    RAISE,
-    BOTH,
-    FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = framework_via(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,       KC_5,    KC_6,   KC_7,       KC_8,    KC_9,    KC_0,    KC_MEDIA_PLAY_PAUSE,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,       KC_T,    KC_Y,   KC_U,       KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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, MO(_FN), MO(_LOWER), KC_SPC,  KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-    KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP
-),
-
-[_LOWER] = framework_via(
-    _______, _______, _______, _______, _______, _______, _______, _______,   _______, KC_MINS, KC_EQL,  _______,
-    QK_LEAD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______,   _______, KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_DEL,  KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, _______, _______,   _______, _______, _______, _______,
-    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,   _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, MO(_BOTH), KC_HOME, KC_PGDN, KC_PGUP, KC_END,
-    C(S(KC_TAB)), C(KC_TAB)
-),
-
-[_RAISE] = framework_via(
-    _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, MO(_BOTH), _______, _______, _______, _______, _______, _______, _______,
-    C(KC_LEFT), C(KC_RIGHT)
-),
-
-[_BOTH] = framework_via(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,  DB_TOGG,
-    C(KC_Z), C(KC_Y)
-),
-
-[_FN] = framework_via(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_MS_WH_LEFT, KC_MS_WH_RIGHT
-)
-};
-
-void leader_end_user(void) {
-    // qq, alt+f4 close window
-    if (leader_sequence_two_keys(KC_Q, KC_Q)) {
-        tap_code16(A(KC_F4));
-    }
-
-    // ee, open explorer
-    if (leader_sequence_two_keys(KC_E, KC_E)) {
-        tap_code16(G(KC_E));
-    }
-
-    // rr, windows run prompt
-    if (leader_sequence_two_keys(KC_R, KC_R)) {
-        tap_code16(G(KC_R));
-    }
-
-    // ww, maximize window
-    if (leader_sequence_two_keys(KC_W, KC_W)) {
-        tap_code16(G(KC_UP));
-    }
-
-    // ss, minimize window
-    if (leader_sequence_two_keys(KC_S, KC_S)) {
-        tap_code16(G(KC_DOWN));
-    }
-
-    // <space><space>, toggle desktop
-    if (leader_sequence_two_keys(KC_SPC, KC_SPC)) {
-        tap_code16(G(KC_D));
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    uint8_t layer = get_highest_layer(layer_state);
-    if (index == 0) {
-        if (clockwise) {
-            tap_code16(dynamic_keymap_get_keycode(layer, 10, 1));
-        } else {
-            tap_code16(dynamic_keymap_get_keycode(layer, 10, 0));
-        }
-    }
-    return true;
-}
diff --git a/keyboards/7c8/framework/keymaps/steven/readme.md b/keyboards/7c8/framework/keymaps/steven/readme.md
deleted file mode 100644
index c300961c7fe..00000000000
--- a/keyboards/7c8/framework/keymaps/steven/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Steven's Framework layout
-
-This is a VIA compatible layout, exactly like the default VIA keymap, but with some leader key sequences that I find convenient.
\ No newline at end of file
diff --git a/keyboards/7c8/framework/rules.mk b/keyboards/7c8/framework/rules.mk
index 8e856a53360..a9d41f8eff9 100644
--- a/keyboards/7c8/framework/rules.mk
+++ b/keyboards/7c8/framework/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = no
 AUDIO_ENABLE = no
 FAUXCLICKY_ENABLE = no
-LAYOUTS_HAS_RGB = no
 ENCODER_ENABLE = yes
 LEADER_ENABLE = yes
diff --git a/keyboards/9key/keymaps/tap_dance/keymap.c b/keyboards/9key/keymaps/tap_dance/keymap.c
deleted file mode 100644
index d8b2945dc5e..00000000000
--- a/keyboards/9key/keymaps/tap_dance/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Tap Dance Declarations
-enum tap_dances {
-  ENT_5 = 0,
-  ZERO_7,
-};
-
-// Macro Declarations
-enum custom_keycodes {
-  DBL_0 = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* LAYER 0
- * ,-----------------------.
- * |   1   |   2   |   3   |
- * |-------+-------+-------|
- * |   4   | 5/ENT |   6   | Dbl Tap 5 for Enter
- * |-------+-------+-------|
- * |  7/0  |   8   | 9/FN  | 7/0 = Dbl Tap 7 for 0  -  9/FN = Hold 9 for FN
- * `-----------------------'
- */
-[0] = LAYOUT(
-  KC_1,       KC_2,      KC_3,
-  KC_4,       TD(ENT_5), KC_6,
-  TD(ZERO_7), KC_8,      LT(1, KC_9)
-),
-
-/* LAYER 1
- * ,-----------------------.
- * |  ESC  |   +   |   -   |
- * |-------+-------+-------|
- * |  BSPC |   *   |   /   |
- * |-------+-------+-------|
- * |  00   |   .   |       |
- * `-----------------------'
- */
-[1] = LAYOUT(
-  KC_ESC,   KC_PLUS, KC_MINS,
-  KC_BSPC,  KC_ASTR, KC_SLSH,
-  DBL_0,    KC_DOT,  KC_TRNS
-)
-
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [ENT_5] = ACTION_TAP_DANCE_DOUBLE(KC_5, KC_ENT),
-  [ZERO_7] = ACTION_TAP_DANCE_DOUBLE(KC_7, KC_0)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case DBL_0:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        tap_code(KC_P0);
-        tap_code(KC_P0);
-      }
-      break;
-
-  }
-  return true;
-};
-
-
-void matrix_init_user(void) {
-}
diff --git a/keyboards/9key/keymaps/tap_dance/rules.mk b/keyboards/9key/keymaps/tap_dance/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/9key/keymaps/tap_dance/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/a_dux/keymaps/daliusd/config.h b/keyboards/a_dux/keymaps/daliusd/config.h
deleted file mode 100644
index 78a96dd7acd..00000000000
--- a/keyboards/a_dux/keymaps/daliusd/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 Dalius Dobravolskas <dalius.dobravolskas@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 UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
-
-#define MOUSEKEY_INTERVAL 12
-#define MOUSEKEY_MAX_SPEED 6
-#define MOUSEKEY_TIME_TO_MAX 50
-
-#define MOUSEKEY_DELAY 20
-// It makes sense to use the same delay for the mouseweel
-#define MOUSEKEY_WHEEL_DELAY 100
-// The default is 100
-#define MOUSEKEY_WHEEL_INTERVAL 50
-// The default is 40
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
-
-#define FLOW_COUNT 6
-#define FLOW_LAYERS_COUNT 5
diff --git a/keyboards/a_dux/keymaps/daliusd/flow.c b/keyboards/a_dux/keymaps/daliusd/flow.c
deleted file mode 100644
index 6e4db873fe3..00000000000
--- a/keyboards/a_dux/keymaps/daliusd/flow.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/* Copyright 2022 @daliusd
- *
- * 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 "flow.h"
-
-extern const uint16_t flow_config[FLOW_COUNT][2];
-extern const uint16_t flow_layers_config[FLOW_LAYERS_COUNT][2];
-
-// Represents the states a flow key can be in
-typedef enum {
-    flow_up_unqueued,
-    flow_up_queued,
-    flow_up_queued_used,
-    flow_down_unused,
-    flow_down_used,
-} flow_state_t;
-
-#ifdef FLOW_ONESHOT_TERM
-const int g_flow_oneshot_term = FLOW_ONESHOT_TERM;
-#else
-const int g_flow_oneshot_term = 500;
-#endif
-
-#ifdef FLOW_ONESHOT_WAIT_TERM
-const int g_flow_oneshot_wait_term = FLOW_ONESHOT_WAIT_TERM;
-#else
-const int g_flow_oneshot_wait_term = 500;
-#endif
-
-flow_state_t flow_state[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = flow_up_unqueued };
-bool flow_pressed[FLOW_COUNT][2] = { [0 ... FLOW_COUNT - 1] = {false, false} };
-uint16_t flow_timers[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = 0 };
-bool flow_timeout_timers_active[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = false };
-uint16_t flow_timeout_timers_value[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = 0 };
-uint16_t flow_timeout_wait_timers_value[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = 0 };
-
-flow_state_t flow_layers_state[FLOW_LAYERS_COUNT] = {
-    [0 ... FLOW_LAYERS_COUNT - 1] = flow_up_unqueued
-};
-bool flow_layer_timeout_timers_active[FLOW_LAYERS_COUNT] = { [0 ... FLOW_LAYERS_COUNT - 1] = false };
-uint16_t flow_layer_timeout_timers_value[FLOW_LAYERS_COUNT] = { [0 ... FLOW_LAYERS_COUNT - 1] = 0 };
-uint16_t flow_layer_timeout_wait_timers_value[FLOW_LAYERS_COUNT] = { [0 ... FLOW_LAYERS_COUNT - 1] = 0 };
-
-bool is_flow_ignored_key(uint16_t keycode) {
-    for (int i = 0; i < FLOW_COUNT; i++) {
-        if (flow_config[i][0] == keycode) {
-            return true;
-        }
-    }
-
-    for (int i = 0; i < FLOW_LAYERS_COUNT; i++) {
-        if (flow_layers_config[i][0] == keycode) {
-            return true;
-        }
-    }
-
-    if (keycode == KC_LSFT || keycode == KC_RSFT
-            || keycode == KC_LCTL || keycode == KC_RCTL
-            || keycode == KC_LALT || keycode == KC_RALT
-            || keycode == KC_LGUI || keycode == KC_RGUI) {
-        return true;
-    }
-
-    return false;
-}
-
-bool update_flow_mods(
-    uint16_t keycode,
-    bool pressed
-) {
-    bool pass = true;
-    bool flow_key_list_triggered[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = false };
-    bool flow_key_list_pressed[FLOW_COUNT] = { [0 ... FLOW_COUNT - 1] = false };
-
-    bool flow_triggered = false;
-
-    for (uint8_t i = 0; i < FLOW_COUNT; i++) {
-        // Layer key
-        if (keycode == flow_config[i][0]) {
-            if (pressed) {
-                flow_pressed[i][0] = true;
-            } else {
-                flow_pressed[i][0] = false;
-            }
-        // KC mod key
-        } else if (keycode == flow_config[i][1]) {
-            if (pressed) {
-                if (flow_pressed[i][0]) {
-                    flow_pressed[i][1] = true;
-                    flow_key_list_triggered[i] = true;
-                    flow_triggered = true;
-                    flow_key_list_pressed[i] = true;
-                    pass = false;
-                 }
-            } else if (flow_pressed[i][1]) {
-                flow_pressed[i][1] = false;
-                if (flow_pressed[i][0]) {
-                    flow_key_list_triggered[i] = true;
-                    flow_triggered = true;
-                    pass = false;
-                } else if ((flow_state[i] == flow_down_unused)
-                        || (flow_state[i] == flow_down_used)) {
-                    flow_key_list_triggered[i] = true;
-                    flow_triggered = true;
-                    pass = false;
-                }
-            }
-        }
-    }
-
-    for (uint8_t i = 0; i < FLOW_COUNT; i++) {
-        if (flow_key_list_triggered[i]) {
-            if (flow_key_list_pressed[i]) {
-                if (flow_state[i] == flow_up_unqueued) {
-                    register_code(flow_config[i][1]);
-                }
-                flow_timeout_wait_timers_value[i] = timer_read();
-                flow_state[i] = flow_down_unused;
-            } else {
-                // Trigger keyup
-                switch (flow_state[i]) {
-                case flow_down_unused:
-                    if (!flow_pressed[i][1]) {
-                        if (timer_elapsed(flow_timeout_wait_timers_value[i]) > g_flow_oneshot_wait_term) {
-                            flow_state[i] = flow_up_unqueued;
-                            unregister_code(flow_config[i][1]);
-                        } else {
-                            // If we didn't use the mod while trigger was held, queue it.
-                            flow_state[i] = flow_up_queued;
-                            flow_timeout_timers_active[i] = true;
-                            flow_timeout_timers_value[i] = timer_read();
-                        }
-                    }
-                    break;
-                case flow_down_used:
-                    // If we did use the mod while trigger was held, unregister it.
-                    if (!flow_pressed[i][1]) {
-                        flow_state[i] = flow_up_unqueued;
-                        unregister_code(flow_config[i][1]);
-                    }
-                    break;
-                default:
-                    break;
-                }
-            }
-        } else if (!flow_triggered) {
-            if (pressed) {
-                if (!is_flow_ignored_key(keycode)) {
-                    switch (flow_state[i]) {
-                    case flow_up_queued:
-                        flow_state[i] = flow_up_queued_used;
-                        flow_timeout_timers_active[i] = false;
-                        break;
-                    case flow_up_queued_used:
-                        flow_state[i] = flow_up_unqueued;
-                        unregister_code(flow_config[i][1]);
-                        break;
-                    default:
-                        break;
-                    }
-                }
-            } else {
-                if (!is_flow_ignored_key(keycode)) {
-                    // On non-ignored keyup, consider the oneshot used.
-                    switch (flow_state[i]) {
-                    case flow_down_unused:
-                        flow_state[i] = flow_down_used;
-                        break;
-                    case flow_up_queued:
-                        flow_state[i] = flow_up_unqueued;
-                        unregister_code(flow_config[i][1]);
-                        break;
-                    case flow_up_queued_used:
-                        flow_state[i] = flow_up_unqueued;
-                        unregister_code(flow_config[i][1]);
-                        break;
-                    default:
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    return pass;
-}
-
-void change_pressed_status(uint16_t keycode, bool pressed) {
-    for (int i = 0; i < FLOW_COUNT; i++) {
-        if (flow_config[i][0] == keycode) {
-            flow_pressed[i][0] = pressed;
-        }
-    }
-}
-
-bool update_flow_layers(
-    uint16_t keycode,
-    bool pressed,
-    keypos_t key_position
-) {
-    uint8_t key_layer = read_source_layers_cache(key_position);
-    bool pass = true;
-
-    for (int i = 0; i < FLOW_LAYERS_COUNT; i++) {
-        uint16_t trigger = flow_layers_config[i][0];
-        uint16_t layer = flow_layers_config[i][1];
-
-        if (keycode == trigger) {
-            if (pressed) {
-                // Trigger keydown
-                if (flow_layers_state[i] == flow_up_unqueued) {
-                    layer_on(layer);
-                    change_pressed_status(trigger, true);
-                }
-                flow_layer_timeout_wait_timers_value[i] = timer_read();
-                flow_layers_state[i] = flow_down_unused;
-                pass = false;
-            } else {
-                // Trigger keyup
-                switch (flow_layers_state[i]) {
-                case flow_down_unused:
-                    if (timer_elapsed(flow_layer_timeout_wait_timers_value[i]) > g_flow_oneshot_wait_term) {
-                        flow_layers_state[i] = flow_up_unqueued;
-                        layer_off(layer);
-                        change_pressed_status(trigger, false);
-                        pass = false;
-                    } else {
-                        // If we didn't use the layer while trigger was held, queue it.
-                        flow_layers_state[i] = flow_up_queued;
-                        flow_layer_timeout_timers_active[i] = true;
-                        flow_layer_timeout_timers_value[i] = timer_read();
-                        pass = false;
-                        change_pressed_status(trigger, true);
-                    }
-                    break;
-                case flow_down_used:
-                    // If we did use the layer while trigger was held, turn off it.
-                    flow_layers_state[i] = flow_up_unqueued;
-                    layer_off(layer);
-                    change_pressed_status(trigger, false);
-                    pass = false;
-                    break;
-                default:
-                    break;
-                }
-            }
-        } else {
-            if (pressed) {
-                if (key_layer == layer) {
-                    // On non-ignored keyup, consider the oneshot used.
-                    switch (flow_layers_state[i]) {
-                    case flow_down_unused:
-                        flow_layers_state[i] = flow_down_used;
-                        break;
-                    case flow_up_queued:
-                        flow_layers_state[i] = flow_up_queued_used;
-                        flow_layer_timeout_timers_active[i] = false;
-                        break;
-                   case flow_up_queued_used:
-                        flow_layers_state[i] = flow_up_unqueued;
-                        layer_off(layer);
-                        change_pressed_status(trigger, false);
-                        pass = false;
-                        break;
-                    default:
-                        break;
-                    }
-                }
-            } else {
-                // Ignore key ups from other layers
-                if (key_layer == layer) {
-                    // On non-ignored keyup, consider the oneshot used.
-                    switch (flow_layers_state[i]) {
-                    case flow_up_queued:
-                        flow_layers_state[i] = flow_up_unqueued;
-                        layer_off(layer);
-                        change_pressed_status(trigger, false);
-                        break;
-                    case flow_up_queued_used:
-                        flow_layers_state[i] = flow_up_unqueued;
-                        layer_off(layer);
-                        change_pressed_status(trigger, false);
-                        break;
-                    default:
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    return pass;
-}
-
-bool update_flow(
-    uint16_t keycode,
-    bool pressed,
-    keypos_t key_position
-) {
-    bool pass = update_flow_mods(keycode, pressed);
-    pass = update_flow_layers(keycode, pressed, key_position) & pass;
-    return pass;
-}
-
-void flow_matrix_scan(void) {
-    for (int i = 0; i < FLOW_COUNT; i++) {
-        if (flow_timeout_timers_active[i]
-                && timer_elapsed(flow_timeout_timers_value[i]) > g_flow_oneshot_term) {
-            flow_timeout_timers_active[i] = false;
-            flow_state[i] = flow_up_unqueued;
-            unregister_code(flow_config[i][1]);
-        }
-    }
-
-    for (int i = 0; i < FLOW_LAYERS_COUNT; i++) {
-        if (flow_layer_timeout_timers_active[i]
-                && timer_elapsed(flow_layer_timeout_timers_value[i]) > g_flow_oneshot_term) {
-            flow_layer_timeout_timers_active[i] = false;
-            flow_layers_state[i] = flow_up_unqueued;
-            layer_off(flow_layers_config[i][1]);
-            change_pressed_status(flow_layers_config[i][0], false);
-        }
-    }
-}
diff --git a/keyboards/a_dux/keymaps/daliusd/flow.h b/keyboards/a_dux/keymaps/daliusd/flow.h
deleted file mode 100644
index e9ac32c8ed9..00000000000
--- a/keyboards/a_dux/keymaps/daliusd/flow.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2022 Dalius Dobravolskas <dalius.dobravolskas@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 QMK_KEYBOARD_H
-
-bool update_flow(
-    uint16_t keycode,
-    bool pressed,
-    keypos_t key_position
-);
-
-void flow_matrix_scan(void);
diff --git a/keyboards/a_dux/keymaps/daliusd/keymap.c b/keyboards/a_dux/keymaps/daliusd/keymap.c
deleted file mode 100644
index dcc41a36ee2..00000000000
--- a/keyboards/a_dux/keymaps/daliusd/keymap.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* Copyright 2021 @daliusd
- *
- * 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 "flow.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 layers {
-    _QWERTY,
-    _SYM,
-    _NAV,
-    _MISC,
-    _TMUX,
-    _MOUSE,
-    _FUNC,
-    _LT_MAC,
-    _LT_LINUX,
-};
-
-enum custom_keycodes {
-  TM_NEXT = SAFE_RANGE,
-  TM_PREV,
-  TM_LEFT,
-  TM_RIGHT,
-  TM_NEW,
-  TM_SLCT,
-  TM_SRCH,
-  TM_URL,
-  OS_MISC,
-  OS_TMUX,
-  OS_FUNC,
-  LT_OSLNX,
-};
-
-// Shortcut to make keymap more readable
-
-#define L_NAV       MO(_NAV)
-#define L_SYM       MO(_SYM)
-#define L_MOUSE     MO(_MOUSE)
-
-#define K_PRINT     (QK_LCTL | QK_LSFT | QK_LGUI | KC_4)
-#define K_VIDEO     (QK_LSFT | QK_LGUI | KC_5)
-
-// flow_config should correspond to following format:
-// * layer keycode
-// * modifier keycode
-const uint16_t flow_config[FLOW_COUNT][2] = {
-    {L_NAV, KC_LALT},
-    {L_NAV, KC_LGUI},
-    {L_NAV, KC_LCTL},
-    {L_SYM, KC_RCTL},
-    {L_SYM, KC_RGUI},
-    {L_SYM, KC_RALT},
-};
-
-const uint16_t flow_layers_config[FLOW_LAYERS_COUNT][2] = {
-    {OS_MISC, _MISC},
-    {OS_TMUX, _TMUX},
-    {OS_FUNC, _FUNC},
-};
-
-// Unicode characters
-enum unicode_names {
-    SNEK,
-    EURO,
-    LT_S_A,
-    LT_L_A,
-    LT_S_C,
-    LT_L_C,
-    LT_S_E1,
-    LT_L_E1,
-    LT_S_E2,
-    LT_L_E2,
-    LT_S_I,
-    LT_L_I,
-    LT_S_S,
-    LT_L_S,
-    LT_S_U1,
-    LT_L_U1,
-    LT_S_U2,
-    LT_L_U2,
-    LT_S_Z,
-    LT_L_Z,
-    LT_OB,
-    LT_CB,
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    [SNEK]  = 0x1F40D, // 🐍
-    [EURO]  = 0x20ac, // €
-    [LT_S_A] = 0x105, // ą
-    [LT_L_A] = 0x104, // Ą
-    [LT_S_C] = 0x10d, // č
-    [LT_L_C] = 0x10c, // Č
-    [LT_S_E1] = 0x119, // ę
-    [LT_L_E1] = 0x118, // Ę
-    [LT_S_E2] = 0x117, // ė
-    [LT_L_E2] = 0x116, // Ė
-    [LT_S_I] = 0x12f, // į
-    [LT_L_I] = 0x12e, // Į
-    [LT_S_S] = 0x161, // š
-    [LT_L_S] = 0x160, // Š
-    [LT_S_U1] = 0x173, // ų
-    [LT_L_U1] = 0x172, // Ų
-    [LT_S_U2] = 0x16b, // ū
-    [LT_L_U2] = 0x16a, // Ū
-    [LT_S_Z] = 0x17e, // ž
-    [LT_L_Z] = 0x17d, // Ž
-    [LT_OB] = 0x201e, // „
-    [LT_CB] = 0x201c, // “
-};
-
-#define K_SNEK      UM(SNEK)
-#define K_EURO      UM(EURO)
-#define K_LT_A      UP(LT_S_A, LT_L_A)
-#define K_LT_AU     UM(LT_L_A)
-#define K_LT_C      UP(LT_S_C, LT_L_C)
-#define K_LT_CU     UM(LT_L_C)
-#define K_LT_E1     UP(LT_S_E1, LT_L_E1)
-#define K_LT_E1U    UM(LT_L_E1)
-#define K_LT_E2     UP(LT_S_E2, LT_L_E2)
-#define K_LT_E2U    UM(LT_L_E2)
-#define K_LT_I      UP(LT_S_I, LT_L_I)
-#define K_LT_IU     UM(LT_L_I)
-#define K_LT_S      UP(LT_S_S, LT_L_S)
-#define K_LT_SU     UM(LT_L_S)
-#define K_LT_U1     UP(LT_S_U1, LT_L_U1)
-#define K_LT_U1U    UM(LT_L_U1)
-#define K_LT_U2     UP(LT_S_U2, LT_L_U2)
-#define K_LT_U2U    UM(LT_L_U2)
-#define K_LT_Z      UP(LT_S_Z, LT_L_Z)
-#define K_LT_ZU     UM(LT_L_Z)
-#define K_LT_OB     UM(LT_OB)
-#define K_LT_CB     UM(LT_CB)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T,                              KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                          KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                          KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     L_NAV   ,    KC_SPC  ,        KC_LSFT ,    L_SYM
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-
-  [_SYM] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,                          KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_LPRN ,KC_RPRN ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_GRV  ,KC_LBRC ,KC_RBRC ,KC_PLUS ,                          KC_MINS ,KC_PIPE ,KC_RCTL ,KC_RGUI ,KC_RALT ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_DEL  ,KC_BSPC ,KC_LCBR ,KC_RCBR ,KC_EQL  ,                          KC_UNDS ,KC_QUOT ,KC_DQT  ,OS_MISC ,KC_BSLS ,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     _______ ,    _______ ,        _______ ,    XXXXXXX
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                          KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_LALT ,KC_LGUI ,KC_LCTL ,KC_TAB  ,KC_ENT  ,                          KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,KC_PGUP ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_BSPC ,KC_ESC  ,KC_TILDE,OS_TMUX ,                          OS_FUNC ,L_MOUSE ,KC_COMM ,KC_DOT  ,KC_PGDN ,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     XXXXXXX ,    _______ ,        _______ ,    _______
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-
-  [_MISC] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     QK_BOOT ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,KC_PSCR ,XXXXXXX ,K_PRINT ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,DB_TOGG ,LT_OSLNX,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,KC_MNXT ,XXXXXXX ,K_VIDEO ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_VOLD ,KC_VOLU ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     XXXXXXX ,    XXXXXXX ,        XXXXXXX ,    XXXXXXX
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-
-  [_TMUX] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,TM_URL  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          TM_LEFT ,TM_NEXT ,TM_PREV ,TM_RIGHT,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          TM_NEW  ,TM_SLCT ,XXXXXXX ,XXXXXXX ,TM_SRCH ,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     XXXXXXX ,    XXXXXXX ,        XXXXXXX ,    XXXXXXX
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-
-  [_MOUSE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,KC_BTN3 ,KC_WH_U ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,                          XXXXXXX ,XXXXXXX ,KC_RCTL ,KC_RGUI ,KC_RALT ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     KC_BTN1 ,    KC_BTN2 ,        _______ ,    XXXXXXX
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-
-  [_FUNC] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,                          XXXXXXX ,XXXXXXX ,KC_RCTL ,KC_RGUI ,KC_RALT ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_F11  ,KC_F12  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     XXXXXXX ,    XXXXXXX ,        XXXXXXX ,    XXXXXXX
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-
-  [_LT_MAC] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,                          KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_PLUS ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                          KC_6    ,KC_7    ,KC_8    ,KC_EQL  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_BSPC ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     XXXXXXX ,    XXXXXXX ,        _______ ,    XXXXXXX
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-
-  [_LT_LINUX] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐
-     K_LT_AU ,K_LT_CU ,K_LT_E1U,K_LT_E2U,K_LT_IU ,                          K_LT_SU ,K_LT_U1U,K_LT_U2U,K_LT_ZU ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     K_LT_A  ,K_LT_C  ,K_LT_E1 ,K_LT_E2 ,K_LT_I  ,                          K_LT_S  ,K_LT_U1 ,K_LT_U2 ,K_LT_Z  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_BSPC ,XXXXXXX ,K_SNEK  ,K_LT_OB ,                          K_LT_CB ,K_EURO  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘
-                                     XXXXXXX ,    XXXXXXX ,        _______ ,    XXXXXXX
-  //                                └────────┘   └────────┘       └────────┘   └────────┘
-  ),
-};
-
-#define TMUX_PREFIX SS_DOWN(X_LCTL) "b" SS_UP(X_LCTL)
-
-bool lt_os_is_linux = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!update_flow(keycode, record->event.pressed, record->event.key)) return false;
-
-    switch (keycode) {
-        case TM_LEFT:
-            if (!record->event.pressed) return true;
-            SEND_STRING(TMUX_PREFIX "<");
-            return false;
-        case TM_RIGHT:
-            if (!record->event.pressed) return true;
-            SEND_STRING(TMUX_PREFIX ">");
-            return false;
-        case TM_NEXT:
-            if (!record->event.pressed) return true;
-            SEND_STRING(TMUX_PREFIX "n");
-            return false;
-        case TM_PREV:
-            if (!record->event.pressed) return true;
-            SEND_STRING(TMUX_PREFIX "p");
-            return false;
-        case TM_NEW:
-            if (!record->event.pressed) return true;
-            SEND_STRING(TMUX_PREFIX "c");
-            return false;
-        case TM_SLCT:
-            if (!record->event.pressed) return true;
-            SEND_STRING(TMUX_PREFIX "[");
-            return false;
-        case TM_SRCH:
-            if (!record->event.pressed) return true;
-            SEND_STRING(TMUX_PREFIX "\t");
-            return false;
-        case TM_URL:
-            if (!record->event.pressed) return true;
-            SEND_STRING(TMUX_PREFIX SS_LCTL("u"));
-            return false;
-        case LT_OSLNX:
-            if (!record->event.pressed) return true;
-            lt_os_is_linux = !lt_os_is_linux;
-            return false;
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-    flow_matrix_scan();
-}
-
-bool lang_layer_on = false;
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    state = update_tri_layer_state(state, _SYM, _NAV, lt_os_is_linux ? _LT_LINUX : _LT_MAC);
-
-    uint8_t hl = get_highest_layer(state);
-    if (hl == _LT_MAC) {
-        if (!lang_layer_on) {
-            tap_code16(LCTL(KC_SPC));
-            lang_layer_on = true;
-        }
-    } else {
-        if (lang_layer_on) {
-            tap_code16(LCTL(KC_SPC));
-            lang_layer_on = false;
-        }
-    }
-
-    return state;
-}
diff --git a/keyboards/a_dux/keymaps/daliusd/readme.md b/keyboards/a_dux/keymaps/daliusd/readme.md
deleted file mode 100644
index fde19ee630c..00000000000
--- a/keyboards/a_dux/keymaps/daliusd/readme.md
+++ /dev/null
@@ -1,306 +0,0 @@
-# My 34 keys layout
-
-This is my principles for layout:
-
-* I am using Callum style layout. Here you can read explanation by
-  Callum himself and his reasoning for not using mod-tap:
-  [here](../../../../users/callum/readme.md)
-
-* There should be only one way to type key. Key can be on
-  different layer but it must maintain its physical location. I
-  broke this rule for Shift key only.
-
-* The less features are used the better.
-
-* There is simple TMUX layer.
-
-* Common keys must be accessible using two keys if possible.
-
-* It should be possible to work with left keyboard side and mouse
-  in right hand without lifting hands for some scenarios (that's
-  why I had to duplicate Shift key).
-
-## Improvements over Callum
-
-* I have added one shot layers compatible with Callum's one shot
-  keys.
-
-* There is one issue with accidental uppercase characters fixed
-  that exists in original Callum layout's implementation.
-
-* Another annoying feature of Callum layer is one shot keys are
-  frozen until you cancel them. This is problem when you use one
-  hand for keyboard and another for mouse. E.g. you click Ctrl and
-  mouse to get some menu (on Mac OS X), and then you want to click
-  some item in that menu. You have to remember to cancel one shot in such
-  situation. I have added two settings two handle situations like
-  this:
-
-  * `FLOW_ONESHOT_WAIT_TERM` - if hold one shot key longer than
-    `FLOW_ONESHOT_WAIT_TERM` ms then mod key / layer key is not
-    treated as one shot key (defaults to 500ms).
-
-  * `FLOW_ONESHOT_TERM` - if you do not click another key in
-  `FLOW_ONESHOT_TERM` ms then one shot key / layer key is treated
-  as normal key. Therefore if you lift it after `FLOW_ONESHOT_TERM`
-  it will not be treated as one shot (defaults to 500ms).
-
-  After adding those two settings I have found out that I don't
-  need one shot cancel key anymore so I have removed it.
-
-Since differences are significant I named this layout `flow`.
-
-## Using flow with your keyboard
-
-Copy `flow.c` and `flow.h` to keyboard folder.
-
-Add following line to `rules.mk`:
-
-```make
-SRC += flow.c
-```
-
-Define following in `config.h` for modifiers and layers:
-
-```c
-#define FLOW_COUNT 7
-#define FLOW_LAYERS_COUNT 3
-```
-
-In your `keymap.c` add and configure like this:
-
-```c
-#include "flow.h"
-
-...
-
-// flow_config should correspond to following format:
-// * layer keycode
-// * modifier keycode
-const uint16_t flow_config[FLOW_COUNT][2] = {
-    {L_NAV, KC_LALT},
-    {L_NAV, KC_LGUI},
-    {L_NAV, KC_LCTL},
-    {L_NAV, KC_LSFT},
-    {L_SYM, KC_LCTL},
-    {L_SYM, KC_LGUI},
-    {L_SYM, KC_LALT},
-};
-
-
-// for layers configuration follow this format:
-// * custom layer key
-// * layer name
-const uint16_t flow_layers_config[FLOW_LAYERS_COUNT][2] = {
-    {OS_TMUX, _TMUX},
-    {OS_MISC, _MISC},
-    {OS_FUNC, _FUNC},
-};
-
-...
-
-// Add following to handle flow
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!update_flow(keycode, record->event.pressed, record->event.key)) return false;
-    return true;
-}
-
-void matrix_scan_user(void) {
-    flow_matrix_scan();
-}
-
-```
-
-## Lithuanian letters
-
-There are at least two ways how to enter Lithuanian letters: to
-use Unicode support from QMK or to switch OS language when
-necessary. Unicode support has some problems:
-
-* it is OS specific (you need to change Unicode input mode based
-  on your OS and I sometimes switch between Mac OS X and Ubuntu).
-  This is minor issue but it is still issue.
-
-* There is bug in Mac OS X and I can't enter `Š` using unicode
-  input method.
-
-* Unicode Hex Input in Mac OS X is not perfect and there are some
-  minor issue while using it.
-
-On Linux Unicode support meanwhile works perfectly.
-
-This leaves us with other option to use OS language switching as
-you most probably have done before. Still there is space for
-improvement. E.g. I have added Lithuanian letters to trilayer and
-trilayer activation toggles OS language (this works because I use
-only two languages). Check `layer_state_set_user` implementation
-for details.
-
-# Rejected ideas
-
-## Mods as combos
-
-Sometimes when I press `NAV (layer key) + S + Tab` to get `Command
-+ Tab` I ended up with `S + Nav + Tab`. This happened because I
-did that really fast and sometimes clicked S slightly earlier than
-NAV layer key. Initially I have solved this problem using Combo
-keys, but that's additional dependency and combo keys are not
-ideal for Callum layer. You need to release both keys to trigger
-Combo key release. Therefore I have written custom code that
-allows pressing S some milliseconds earlier. This is controlled by
-FLOW_TERM and defaults to 10. I do not recommend setting this to
-higher than 30.
-
-This idea was rejected because it looks like 10ms did not made
-that big difference.
-
-## Swapper
-
-Idea of swapper is to have key that registers Mode key (e.g.
-Command while layer and some key is pressed) to simulate two key
-combo, e.g. Command + Tab. Overall I found that 3 keys combo that
-I have currently for swapping windows is equally good as 2 keys
-swapper. Another problem with swapper is that it is OS specific.
-Still if you want here is swapper implementation I have used:
-
-```c
-bool active;
-
-void update_swapper(
-    uint16_t trigger,
-    uint16_t keycode,
-    bool pressed
-) {
-    if (keycode == trigger) {
-        if (pressed) {
-            if (!active) {
-                active = true;
-                register_code(KC_LGUI);
-            }
-            register_code(KC_TAB);
-        } else {
-            unregister_code(KC_TAB);
-        }
-    } else if (active && keycode != KC_LSFT && keycode != KC_LEFT && keycode != KC_RIGHT) {
-        unregister_code(KC_LGUI);
-        active = false;
-    }
-}
-```
-
-## Combos
-
-I have seen that some people use two letter horizontal combos for
-some actions, e.g. XC for Command+C, CV for Command+V, JK for ESC
-and etc. I found that this kind of kicks me out of the flow when
-working as it requires different kind of action and I need to
-pause to make that action.
-
-## Comma-space
-
-I have noticed that I put space after comma `,` usually. That
-means I can use comma + letter for something else with backspace,
-e.g. for Lithuanian letters. Performance wise that works OK, but
-practically that does not feel really good. Trilayer with language
-layer switch works better.
-
-Still if you are interested here is comma-space implementation:
-
-```c
-void swap_layout(void) {
-    uint8_t saved_mods = get_mods();
-    clear_mods();
-    tap_code16(LCTL(KC_SPC));
-    set_mods(saved_mods);
-}
-
-void press_with_layout_swap(uint16_t keycode) {
-    tap_code16(KC_BSPC);
-    swap_layout();
-    tap_code16(keycode);
-    swap_layout();
-}
-
-bool comma_pressed = false;
-
-bool update_commaspace(
-    uint16_t keycode,
-    bool pressed
-) {
-    if (keycode == KC_COMM) {
-        if (!(get_mods() & MOD_MASK_SHIFT)) {
-            comma_pressed = true;
-        }
-    } else if (comma_pressed) {
-        if (keycode != KC_LSFT) {
-            comma_pressed = false;
-        }
-
-        switch(keycode) {
-            case KC_Q:
-                if (pressed) {
-                    press_with_layout_swap(KC_1);
-                    return false;
-                }
-                break;
-            case KC_W:
-                if (pressed) {
-                    press_with_layout_swap(KC_2);
-                    return false;
-                }
-                break;
-            case KC_E:
-                if (pressed) {
-                    press_with_layout_swap(KC_3);
-                    return false;
-                }
-                break;
-            case KC_R:
-                if (pressed) {
-                    press_with_layout_swap(KC_4);
-                    return false;
-                }
-                break;
-            case KC_T:
-                if (pressed) {
-                    press_with_layout_swap(KC_5);
-                    return false;
-                }
-                break;
-            case KC_Y:
-                if (pressed) {
-                    press_with_layout_swap(KC_6);
-                    return false;
-                }
-                break;
-            case KC_U:
-                if (pressed) {
-                    press_with_layout_swap(KC_7);
-                    return false;
-                }
-                break;
-            case KC_I:
-                if (pressed) {
-                    press_with_layout_swap(KC_8);
-                    return false;
-                }
-                break;
-            case KC_O:
-                if (pressed) {
-                    press_with_layout_swap(KC_EQL);
-                    return false;
-                }
-                break;
-        }
-    }
-
-    return true;
-};
-```
-
-## Using one shot layers on top layer keys (NAV and SYM)
-
-While this looked promising and fun it was really easy to get lost
-in which layer you actually are. You can still use it as `flow`
-supports this scenario, but I do not recommend it.
diff --git a/keyboards/a_dux/keymaps/daliusd/rules.mk b/keyboards/a_dux/keymaps/daliusd/rules.mk
deleted file mode 100644
index dda50a4f783..00000000000
--- a/keyboards/a_dux/keymaps/daliusd/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-UNICODE_ENABLE = no
-UNICODEMAP_ENABLE = yes
-#CONSOLE_ENABLE = yes
-
-SRC += flow.c
diff --git a/keyboards/a_dux/keymaps/jcmkk3/keymap.c b/keyboards/a_dux/keymaps/jcmkk3/keymap.c
deleted file mode 100644
index 608e0c522ea..00000000000
--- a/keyboards/a_dux/keymaps/jcmkk3/keymap.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Copyright 2021 @jcmkk3
- *
- * 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 "oneshot.h"
-
-#define LA_UPP OSL(UPP)
-#define LA_SYM OSL(SYM)
-#define LA_NAV MO(NAV)
-
-enum layers {
-    DEF,
-    UPP,
-    SYM,
-    NAV,
-    NUM,
-};
-
-enum keycodes {
-    // Custom oneshot mod implementation with no timers.
-    OS_SHFT = SAFE_RANGE,
-    OS_CTRL,
-    OS_ALT,
-    OS_GUI,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [DEF] = LAYOUT(
-        KC_Y,    KC_C,    KC_L,    KC_M,    KC_K,    KC_Z,    KC_F,    KC_U,    KC_QUOT, KC_DQUO,
-        KC_I,    KC_S,    KC_R,    KC_T,    KC_G,    KC_P,    KC_N,    KC_E,    KC_A,    KC_O,
-        KC_Q,    KC_V,    KC_W,    KC_D,    KC_J,    KC_B,    KC_H,    KC_COMM, KC_DOT,  KC_X,
-                                   LA_NAV,  KC_SPC,  LA_UPP,  LA_SYM
-    ),
-
-    [UPP] = LAYOUT(
-        S(KC_Y), S(KC_C), S(KC_L), S(KC_M), S(KC_K), S(KC_Z), S(KC_F), S(KC_U), KC_EXLM, KC_QUES,
-        S(KC_I), S(KC_S), S(KC_R), S(KC_T), S(KC_G), S(KC_P), S(KC_N), S(KC_E), S(KC_A), S(KC_O),
-        S(KC_Q), S(KC_V), S(KC_W), S(KC_D), S(KC_J), S(KC_B), S(KC_H), KC_SCLN, KC_COLN, S(KC_X),
-                                   _______, _______, _______, _______
-    ),
-
-    [SYM] = LAYOUT(
-        KC_LABK, KC_LCBR, KC_LBRC, KC_LPRN, KC_CIRC, KC_DLR,  KC_RPRN, KC_RBRC, KC_RCBR, KC_RABK,
-        KC_HASH, KC_UNDS, KC_EQL,  KC_MINS, KC_PLUS, KC_AMPR, OS_CTRL, OS_SHFT, OS_ALT,  OS_GUI,
-        KC_PERC, KC_GRV,  KC_TILD, KC_SLSH, KC_ASTR, KC_PIPE, KC_BSLS, KC_SCLN, KC_COLN, KC_AT,
-                                   _______, _______, _______, _______
-    ),
-
-    [NAV] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB,  KC_UP,   KC_ENT,  KC_DEL,
-        OS_GUI,  OS_ALT,  OS_SHFT, OS_CTRL, XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,
-        C(KC_Z), C(KC_X), C(KC_C), C(KC_V), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                   _______, _______, KC_BSPC, _______
-    ),
-
-    [NUM] = LAYOUT(
-        KC_7,    KC_5,    KC_3,    KC_1,    KC_9,    KC_8,    KC_0,    KC_2,    KC_4,    KC_6,
-        OS_GUI,  OS_ALT,  OS_SHFT, OS_CTRL, XXXXXXX, XXXXXXX, OS_CTRL, OS_SHFT, OS_ALT,  OS_GUI,
-        XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, XXXXXXX, XXXXXXX, XXXXXXX, KC_COMM, KC_DOT, KC_SLSH,
-                                   _______, _______, KC_BSPC, _______
-    ),
-};
-
-bool is_oneshot_cancel_key(uint16_t keycode) {
-    switch (keycode) {
-    case LA_SYM:
-    case LA_NAV:
-        return true;
-    default:
-        return false;
-    }
-}
-
-bool is_oneshot_ignored_key(uint16_t keycode) {
-    switch (keycode) {
-    case LA_SYM:
-    case LA_NAV:
-    case KC_LSFT:
-    case OS_SHFT:
-    case OS_CTRL:
-    case OS_ALT:
-    case OS_GUI:
-        return true;
-    default:
-        return false;
-    }
-}
-
-oneshot_state os_shft_state = os_up_unqueued;
-oneshot_state os_ctrl_state = os_up_unqueued;
-oneshot_state os_alt_state = os_up_unqueued;
-oneshot_state os_gui_state = os_up_unqueued;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    update_oneshot(
-        &os_shft_state, KC_LSFT, OS_SHFT,
-        keycode, record
-    );
-    update_oneshot(
-        &os_ctrl_state, KC_LCTL, OS_CTRL,
-        keycode, record
-    );
-    update_oneshot(
-        &os_alt_state, KC_LALT, OS_ALT,
-        keycode, record
-    );
-    update_oneshot(
-        &os_gui_state, KC_LGUI, OS_GUI,
-        keycode, record
-    );
-
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, SYM, NAV, NUM);
-}
diff --git a/keyboards/a_dux/keymaps/jcmkk3/oneshot.c b/keyboards/a_dux/keymaps/jcmkk3/oneshot.c
deleted file mode 100644
index e84b5a7b1d6..00000000000
--- a/keyboards/a_dux/keymaps/jcmkk3/oneshot.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 @jcmkk3
- *
- * 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 "oneshot.h"
-
-void update_oneshot(
-    oneshot_state *state,
-    uint16_t mod,
-    uint16_t trigger,
-    uint16_t keycode,
-    keyrecord_t *record
-) {
-    if (keycode == trigger) {
-        if (record->event.pressed) {
-            // Trigger keydown
-            if (*state == os_up_unqueued) {
-                register_code(mod);
-            }
-            *state = os_down_unused;
-        } else {
-            // Trigger keyup
-            switch (*state) {
-            case os_down_unused:
-                // If we didn't use the mod while trigger was held, queue it.
-                *state = os_up_queued;
-                break;
-            case os_down_used:
-                // If we did use the mod while trigger was held, unregister it.
-                *state = os_up_unqueued;
-                unregister_code(mod);
-                break;
-            default:
-                break;
-            }
-        }
-    } else {
-        if (record->event.pressed) {
-            if (is_oneshot_cancel_key(keycode) && *state != os_up_unqueued) {
-                // Cancel oneshot on designated cancel keydown.
-                *state = os_up_unqueued;
-                unregister_code(mod);
-            }
-        } else {
-            if (!is_oneshot_ignored_key(keycode)) {
-                // On non-ignored keyup, consider the oneshot used.
-                switch (*state) {
-                case os_down_unused:
-                    *state = os_down_used;
-                    break;
-                case os_up_queued:
-                    *state = os_up_unqueued;
-                    unregister_code(mod);
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/keyboards/a_dux/keymaps/jcmkk3/oneshot.h b/keyboards/a_dux/keymaps/jcmkk3/oneshot.h
deleted file mode 100644
index b88e68d1d5c..00000000000
--- a/keyboards/a_dux/keymaps/jcmkk3/oneshot.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 @jcmkk3
- *
- * 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 QMK_KEYBOARD_H
-
-// Represents the four states a oneshot key can be in
-typedef enum {
-    os_up_unqueued,
-    os_up_queued,
-    os_down_unused,
-    os_down_used,
-} oneshot_state;
-
-// Custom oneshot mod implementation that doesn't rely on timers. If a mod is
-// used while it is held it will be unregistered on keyup as normal, otherwise
-// it will be queued and only released after the next non-mod keyup.
-void update_oneshot(
-    oneshot_state *state,
-    uint16_t mod,
-    uint16_t trigger,
-    uint16_t keycode,
-    keyrecord_t *record
-);
-
-// To be implemented by the consumer. Defines keys to cancel oneshot mods.
-bool is_oneshot_cancel_key(uint16_t keycode);
-
-// To be implemented by the consumer. Defines keys to ignore when determining
-// whether a oneshot mod has been used. Setting this to modifiers and layer
-// change keys allows stacking multiple oneshot modifiers, and carrying them
-// between layers.
-bool is_oneshot_ignored_key(uint16_t keycode);
diff --git a/keyboards/a_dux/keymaps/jcmkk3/rules.mk b/keyboards/a_dux/keymaps/jcmkk3/rules.mk
deleted file mode 100644
index b7dcd87b1ea..00000000000
--- a/keyboards/a_dux/keymaps/jcmkk3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += oneshot.c
diff --git a/keyboards/abacus/keymaps/unicodemap/keymap.c b/keyboards/abacus/keymaps/unicodemap/keymap.c
deleted file mode 100644
index 46e2219f0bd..00000000000
--- a/keyboards/abacus/keymaps/unicodemap/keymap.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Copyright 2020 nickolaij
- *
- * 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
-
-// wait DELAY ms before unregistering media keys
-#define MEDIA_KEY_DELAY 10
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _UPPER,
-    _LOWER
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    NICKURL = SAFE_RANGE,
-    ALTTAB
-};
-
-enum unicode_names {
-    LOVEEYES,
-    THINK,
-    UPSIDEDOWN,
-    NOMOUTH,
-    PARTY,
-    HEART,
-    EGGPLANT,
-    PEACH,
-    EMOJI100,
-    EMOJIB
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    [LOVEEYES]  = 0x1f60d,
-    [THINK] = 0x1f914,
-    [UPSIDEDOWN] = 0x1f643,
-    [NOMOUTH] = 0x1f636,
-    [PARTY]  = 0x1f973,
-    [HEART] = 0x1f495,
-    [EMOJI100] = 0x1f4af,
-    [PEACH] = 0x1f351,
-    [EGGPLANT] = 0x1f346,
-    [EMOJIB] = 0x1f171
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-        KC_ESCAPE, 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_BSLS,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_UP, KC_DELETE,
-        KC_LCTL, KC_LGUI, MO(_UPPER), KC_SPACE, KC_ENTER, MO(_LOWER), KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-    [_UPPER] = LAYOUT(
-        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
-        ALTTAB, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_QUOTE, KC_SLASH,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_EQUAL, _______, _______,
-        KC_LALT, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END
-    ),
-    [_LOWER] = LAYOUT(
-        NICKURL, 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_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_SNAKE, RGB_MODE_KNIGHT, RGB_MODE_GRADIENT, XXXXXXX, RGB_TOG,
-        _______, UM(LOVEEYES), UM(THINK), UM(UPSIDEDOWN), UM(NOMOUTH), UM(PARTY), UM(PEACH), UM(HEART), UM(EGGPLANT), UM(EMOJI100), UM(EMOJIB), RGB_HUI,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case NICKURL:
-            if (record->event.pressed) {
-                SEND_STRING("https://www.github.com/nickolaij");
-            } else {
-                tap_code(KC_ENTER);
-            }
-            return true;
-            break;
-
-        case ALTTAB:
-            if (record->event.pressed) {
-                tap_code16(A(KC_TAB));
-            }
-            return true;
-            break;
-
-        default:
-            return true;
-
-    }
-}
-
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if(active) {
-                switch(get_highest_layer(layer_state)) {
-                case _BASE:
-                    tap_code16(LCTL(KC_F));
-                    break;
-                case _UPPER:
-                    tap_code(KC_MUTE);
-                    break;
-                case _LOWER:
-                    tap_code(KC_MEDIA_PLAY_PAUSE);
-                    break;
-                }
-        }
-    }
-    return true;
-}
-
-
-void matrix_init_user(void) {
-    set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-
-    switch(get_highest_layer(layer_state)) {
-        case _BASE:
-            clockwise ? tap_code(KC_PGDN) : tap_code(KC_PGUP);
-            break;
-        case _UPPER:
-            clockwise ? tap_code(KC_VOLU) : tap_code(KC_VOLD);
-            break;
-        case _LOWER:
-            clockwise ? tap_code(KC_MEDIA_NEXT_TRACK) : tap_code(KC_MEDIA_PREV_TRACK);
-            break;
-        }
-    return true;
-}
diff --git a/keyboards/abacus/keymaps/unicodemap/readme.md b/keyboards/abacus/keymaps/unicodemap/readme.md
deleted file mode 100644
index 0c6098f0e98..00000000000
--- a/keyboards/abacus/keymaps/unicodemap/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# The default keymap for Abacus
-
-This is made based on my first few days of playing with it and honing in on what feels right.
-I've repurposed the DIP switch function for the encoder switches and added some functionality for multiple layers also effecting the encoders output.
diff --git a/keyboards/abacus/keymaps/unicodemap/rules.mk b/keyboards/abacus/keymaps/unicodemap/rules.mk
deleted file mode 100644
index 502b2def762..00000000000
--- a/keyboards/abacus/keymaps/unicodemap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-UNICODEMAP_ENABLE = yes
diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/config.h
deleted file mode 100644
index 7fedf4dce12..00000000000
--- a/keyboards/abatskeyboardclub/nayeon/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 Ramon Imbao
-
-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
-
-
-/* RGB Matrix setup */
-#define RGB_MATRIX_LED_COUNT 2
-#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json
index 7a3b650ff1d..a3fac207f40 100644
--- a/keyboards/abatskeyboardclub/nayeon/info.json
+++ b/keyboards/abatskeyboardclub/nayeon/info.json
@@ -13,7 +13,8 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": false
+        "nkro": false,
+        "rgb_matrix": true
     },
     "usb": {
         "vid": "0xABA7",
@@ -25,7 +26,11 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [3, 0], "x": 5, "y": 40, "flags": 8},
+            {"matrix": [0, 15], "x": 211, "y": 0, "flags": 8}
+        ]
     },
     "processor": "RP2040",
     "bootloader": "rp2040",
diff --git a/keyboards/abatskeyboardclub/nayeon/nayeon.c b/keyboards/abatskeyboardclub/nayeon/nayeon.c
index 504df12999c..0c559046e9a 100644
--- a/keyboards/abatskeyboardclub/nayeon/nayeon.c
+++ b/keyboards/abatskeyboardclub/nayeon/nayeon.c
@@ -16,21 +16,7 @@
 
 #include "quantum.h"
 
-led_config_t g_led_config = {{
-    // Key Matrix to LED Index
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      1, NO_LED },
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-    {      0, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-    { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
-}, {
-    // LED Index to Physical Position
-    { 5, 40 }, { 211, 0 }
-}, {
-    // LED Index to Flag
-    LED_FLAG_INDICATOR, LED_FLAG_INDICATOR
-}};
+#ifdef RGB_MATRIX_ENABLE
 
 bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
     if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
@@ -45,3 +31,5 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
 
     return true;
 }
+
+#endif
diff --git a/keyboards/abatskeyboardclub/nayeon/rules.mk b/keyboards/abatskeyboardclub/nayeon/rules.mk
index e458f33f3c6..6e7633bfe01 100644
--- a/keyboards/abatskeyboardclub/nayeon/rules.mk
+++ b/keyboards/abatskeyboardclub/nayeon/rules.mk
@@ -1,2 +1 @@
-# RGB Matrix
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/abko/ak84bt/ak84bt.c b/keyboards/abko/ak84bt/ak84bt.c
index a51f1f458f6..6b87e9bab35 100644
--- a/keyboards/abko/ak84bt/ak84bt.c
+++ b/keyboards/abko/ak84bt/ak84bt.c
@@ -16,95 +16,95 @@
 
 #include QMK_KEYBOARD_H
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, G_1,    I_1,    H_1},
-    {0, G_3,    I_3,    H_3},
-    {0, G_4,    I_4,    H_4},
-    {0, G_5,    I_5,    H_5},
-    {0, G_6,    I_6,    H_6},
-    {0, G_7,    I_7,    H_7},
-    {0, G_8,    I_8,    H_8},
-    {0, G_9,    I_9,    H_9},
-    {0, G_10,   I_10,   H_10},
-    {0, G_11,   I_11,   H_11},
-    {0, G_12,   I_12,   H_12},
-    {0, G_13,   I_13,   H_13},
-    {0, G_14,   I_14,   H_14},
-    {0, G_15,   I_15,   H_15},
-    {0, D_1,    F_1,    E_1},
-    {0, D_2,    F_2,    E_2},
-    {0, D_3,    F_3,    E_3},
-    {0, D_4,    F_4,    E_4},
-    {0, D_5,    F_5,    E_5},
-    {0, D_6,    F_6,    E_6},
-    {0, D_7,    F_7,    E_7},
-    {0, D_8,    F_8,    E_8},
-    {0, D_9,    F_9,    E_9},
-    {0, D_10,   F_10,   E_10},
-    {0, D_11,   F_11,   E_11},
-    {0, D_12,   F_12,   E_12},
-    {0, D_13,   F_13,   E_13},
-    {0, D_14,   F_14,   E_14},
-    {0, D_15,   F_15,   E_15},
-    {0, A_1,    C_1,    B_1},
-    {0, A_2,    C_2,    B_2},
-    {0, A_3,    C_3,    B_3},
-    {0, A_4,    C_4,    B_4},
-    {0, A_5,    C_5,    B_5},
-    {0, A_6,    C_6,    B_6},
-    {0, A_7,    C_7,    B_7},
-    {0, A_8,    C_8,    B_8},
-    {0, A_9,    C_9,    B_9},
-    {0, A_10,   C_10,   B_10},
-    {0, A_11,   C_11,   B_11},
-    {0, A_12,   C_12,   B_12},
-    {0, A_13,   C_13,   B_13},
-    {0, A_14,   C_14,   B_14},
-    {0, A_15,   C_15,   B_15},
-    {1, G_1,    I_1,    H_1},
-    {1, G_2,    I_2,    H_2},
-    {1, G_3,    I_3,    H_3},
-    {1, G_4,    I_4,    H_4},
-    {1, G_5,    I_5,    H_5},
-    {1, G_6,    I_6,    H_6},
-    {1, G_7,    I_7,    H_7},
-    {1, G_8,    I_8,    H_8},
-    {1, G_9,    I_9,    H_9},
-    {1, G_10,   I_10,   H_10},
-    {1, G_11,   I_11,   H_11},
-    {1, G_12,   I_12,   H_12},
-    {1, G_13,   I_13,   H_13},
-    {1, G_14,   I_14,   H_14},
-    {1, G_15,   I_15,   H_15},
-    {1, D_1,    F_1,    E_1},
-    {1, D_2,    F_2,    E_2},
-    {1, D_3,    F_3,    E_3},
-    {1, D_4,    F_4,    E_4},
-    {1, D_5,    F_5,    E_5},
-    {1, D_6,    F_6,    E_6},
-    {1, D_7,    F_7,    E_7},
-    {1, D_8,    F_8,    E_8},
-    {1, D_9,    F_9,    E_9},
-    {1, D_10,   F_10,   E_10},
-    {1, D_11,   F_11,   E_11},
-    {1, D_12,   F_12,   E_12},
-    {1, D_13,   F_13,   E_13},
-    {1, D_14,   F_14,   E_14},
-    {1, D_15,   F_15,   E_15},
-    {1, A_1,    C_1,    B_1},
-    {1, A_2,    C_2,    B_2},
-    {1, A_3,    C_3,    B_3},
-    {1, A_5,    C_5,    B_5},
-    {1, A_6,    C_6,    B_6},
-    {1, A_7,    C_7,    B_7},
-    {1, A_8,    C_8,    B_8},
-    {1, A_9,    C_9,    B_9},
-    {1, A_10,   C_10,   B_10},
-    {1, A_11,   C_11,   B_11},
-    {1, A_12,   C_12,   B_12},
-    {1, A_13,   C_13,   B_13},
-    {1, A_14,   C_14,   B_14},
-    {1, A_15,   C_15,   B_15},
-    {0, G_2,    I_2,    H_2},
-    {1, A_4,    C_4,    B_4}
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    {0, SW7_CS1,    SW9_CS1,    SW8_CS1},
+    {0, SW7_CS3,    SW9_CS3,    SW8_CS3},
+    {0, SW7_CS4,    SW9_CS4,    SW8_CS4},
+    {0, SW7_CS5,    SW9_CS5,    SW8_CS5},
+    {0, SW7_CS6,    SW9_CS6,    SW8_CS6},
+    {0, SW7_CS7,    SW9_CS7,    SW8_CS7},
+    {0, SW7_CS8,    SW9_CS8,    SW8_CS8},
+    {0, SW7_CS9,    SW9_CS9,    SW8_CS9},
+    {0, SW7_CS10,   SW9_CS10,   SW8_CS10},
+    {0, SW7_CS11,   SW9_CS11,   SW8_CS11},
+    {0, SW7_CS12,   SW9_CS12,   SW8_CS12},
+    {0, SW7_CS13,   SW9_CS13,   SW8_CS13},
+    {0, SW7_CS14,   SW9_CS14,   SW8_CS14},
+    {0, SW7_CS15,   SW9_CS15,   SW8_CS15},
+    {0, SW4_CS1,    SW6_CS1,    SW5_CS1},
+    {0, SW4_CS2,    SW6_CS2,    SW5_CS2},
+    {0, SW4_CS3,    SW6_CS3,    SW5_CS3},
+    {0, SW4_CS4,    SW6_CS4,    SW5_CS4},
+    {0, SW4_CS5,    SW6_CS5,    SW5_CS5},
+    {0, SW4_CS6,    SW6_CS6,    SW5_CS6},
+    {0, SW4_CS7,    SW6_CS7,    SW5_CS7},
+    {0, SW4_CS8,    SW6_CS8,    SW5_CS8},
+    {0, SW4_CS9,    SW6_CS9,    SW5_CS9},
+    {0, SW4_CS10,   SW6_CS10,   SW5_CS10},
+    {0, SW4_CS11,   SW6_CS11,   SW5_CS11},
+    {0, SW4_CS12,   SW6_CS12,   SW5_CS12},
+    {0, SW4_CS13,   SW6_CS13,   SW5_CS13},
+    {0, SW4_CS14,   SW6_CS14,   SW5_CS14},
+    {0, SW4_CS15,   SW6_CS15,   SW5_CS15},
+    {0, SW1_CS1,    SW3_CS1,    SW2_CS1},
+    {0, SW1_CS2,    SW3_CS2,    SW2_CS2},
+    {0, SW1_CS3,    SW3_CS3,    SW2_CS3},
+    {0, SW1_CS4,    SW3_CS4,    SW2_CS4},
+    {0, SW1_CS5,    SW3_CS5,    SW2_CS5},
+    {0, SW1_CS6,    SW3_CS6,    SW2_CS6},
+    {0, SW1_CS7,    SW3_CS7,    SW2_CS7},
+    {0, SW1_CS8,    SW3_CS8,    SW2_CS8},
+    {0, SW1_CS9,    SW3_CS9,    SW2_CS9},
+    {0, SW1_CS10,   SW3_CS10,   SW2_CS10},
+    {0, SW1_CS11,   SW3_CS11,   SW2_CS11},
+    {0, SW1_CS12,   SW3_CS12,   SW2_CS12},
+    {0, SW1_CS13,   SW3_CS13,   SW2_CS13},
+    {0, SW1_CS14,   SW3_CS14,   SW2_CS14},
+    {0, SW1_CS15,   SW3_CS15,   SW2_CS15},
+    {1, SW7_CS1,    SW9_CS1,    SW8_CS1},
+    {1, SW7_CS2,    SW9_CS2,    SW8_CS2},
+    {1, SW7_CS3,    SW9_CS3,    SW8_CS3},
+    {1, SW7_CS4,    SW9_CS4,    SW8_CS4},
+    {1, SW7_CS5,    SW9_CS5,    SW8_CS5},
+    {1, SW7_CS6,    SW9_CS6,    SW8_CS6},
+    {1, SW7_CS7,    SW9_CS7,    SW8_CS7},
+    {1, SW7_CS8,    SW9_CS8,    SW8_CS8},
+    {1, SW7_CS9,    SW9_CS9,    SW8_CS9},
+    {1, SW7_CS10,   SW9_CS10,   SW8_CS10},
+    {1, SW7_CS11,   SW9_CS11,   SW8_CS11},
+    {1, SW7_CS12,   SW9_CS12,   SW8_CS12},
+    {1, SW7_CS13,   SW9_CS13,   SW8_CS13},
+    {1, SW7_CS14,   SW9_CS14,   SW8_CS14},
+    {1, SW7_CS15,   SW9_CS15,   SW8_CS15},
+    {1, SW4_CS1,    SW6_CS1,    SW5_CS1},
+    {1, SW4_CS2,    SW6_CS2,    SW5_CS2},
+    {1, SW4_CS3,    SW6_CS3,    SW5_CS3},
+    {1, SW4_CS4,    SW6_CS4,    SW5_CS4},
+    {1, SW4_CS5,    SW6_CS5,    SW5_CS5},
+    {1, SW4_CS6,    SW6_CS6,    SW5_CS6},
+    {1, SW4_CS7,    SW6_CS7,    SW5_CS7},
+    {1, SW4_CS8,    SW6_CS8,    SW5_CS8},
+    {1, SW4_CS9,    SW6_CS9,    SW5_CS9},
+    {1, SW4_CS10,   SW6_CS10,   SW5_CS10},
+    {1, SW4_CS11,   SW6_CS11,   SW5_CS11},
+    {1, SW4_CS12,   SW6_CS12,   SW5_CS12},
+    {1, SW4_CS13,   SW6_CS13,   SW5_CS13},
+    {1, SW4_CS14,   SW6_CS14,   SW5_CS14},
+    {1, SW4_CS15,   SW6_CS15,   SW5_CS15},
+    {1, SW1_CS1,    SW3_CS1,    SW2_CS1},
+    {1, SW1_CS2,    SW3_CS2,    SW2_CS2},
+    {1, SW1_CS3,    SW3_CS3,    SW2_CS3},
+    {1, SW1_CS5,    SW3_CS5,    SW2_CS5},
+    {1, SW1_CS6,    SW3_CS6,    SW2_CS6},
+    {1, SW1_CS7,    SW3_CS7,    SW2_CS7},
+    {1, SW1_CS8,    SW3_CS8,    SW2_CS8},
+    {1, SW1_CS9,    SW3_CS9,    SW2_CS9},
+    {1, SW1_CS10,   SW3_CS10,   SW2_CS10},
+    {1, SW1_CS11,   SW3_CS11,   SW2_CS11},
+    {1, SW1_CS12,   SW3_CS12,   SW2_CS12},
+    {1, SW1_CS13,   SW3_CS13,   SW2_CS13},
+    {1, SW1_CS14,   SW3_CS14,   SW2_CS14},
+    {1, SW1_CS15,   SW3_CS15,   SW2_CS15},
+    {0, SW7_CS2,    SW9_CS2,    SW8_CS2},
+    {1, SW1_CS4,    SW3_CS4,    SW2_CS4}
 };
diff --git a/keyboards/abko/ak84bt/config.h b/keyboards/abko/ak84bt/config.h
index 0a7f31bf7da..6408c97af4a 100644
--- a/keyboards/abko/ak84bt/config.h
+++ b/keyboards/abko/ak84bt/config.h
@@ -16,25 +16,5 @@
  
 #pragma once
 
-
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
-
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 45
-
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
-
-#define    ENABLE_RGB_MATRIX_SOLID_COLOR
-#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_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_HUE_WAVE
-#define    ENABLE_RGB_MATRIX_PIXEL_FLOW
diff --git a/keyboards/abko/ak84bt/info.json b/keyboards/abko/ak84bt/info.json
index 4660fb70248..ff44df60a1c 100644
--- a/keyboards/abko/ak84bt/info.json
+++ b/keyboards/abko/ak84bt/info.json
@@ -27,6 +27,20 @@
     },
     "processor": "STM32F103",
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "hue_wave": true,
+            "pixel_flow": true
+        },
         "driver": "is31fl3733",
         "layout": [
             {"matrix": [0, 0], "x": 7, "y": 2, "flags": 4},
diff --git a/keyboards/abstract/ellipse/keymaps/abstractkb/config.h b/keyboards/abstract/ellipse/keymaps/abstractkb/config.h
deleted file mode 100644
index 9aca0b31f5c..00000000000
--- a/keyboards/abstract/ellipse/keymaps/abstractkb/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 AbstractKB
- *
- * 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 BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 2
-#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
-
-// place overrides here
diff --git a/keyboards/abstract/ellipse/keymaps/abstractkb/keymap.c b/keyboards/abstract/ellipse/keymaps/abstractkb/keymap.c
deleted file mode 100644
index 4350423183b..00000000000
--- a/keyboards/abstract/ellipse/keymaps/abstractkb/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2019 AbstractKB
- *
- * 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 the keycodes used by our macros in process_record_user
-/*enum custom_keycodes {
-  MYKEY = SAFE_RANGE
-};*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* Base */
-    KC_MUTE,  RGB_TOG,  BL_TOGG,
-    RGB_M_SW,  RGB_M_P,	BL_BRTG
-  )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-	if (index == 0) { /* First encoder */
-		if (clockwise) {
-			tap_code(KC_VOLU);
-		} else {
-			tap_code(KC_VOLD);
-		}
-	} else if (index == 1) { /* Second encoder */
-		if (clockwise) {
-			rgblight_increase_hue_noeeprom();
-		} else {
-			rgblight_decrease_hue_noeeprom();
-		}
-	} else if (index == 2) { /* Third encoder */
-		if (clockwise) {
-			backlight_increase();
-		} else {
-			backlight_decrease();
-		}
-	}
-    return true;
-}
diff --git a/keyboards/abstract/ellipse/keymaps/abstractkb/readme.md b/keyboards/abstract/ellipse/keymaps/abstractkb/readme.md
deleted file mode 100644
index 5db2eb647f7..00000000000
--- a/keyboards/abstract/ellipse/keymaps/abstractkb/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# My keymap
-
-This was used for testing lights but will become my personal keymap
\ No newline at end of file
diff --git a/keyboards/abstract/ellipse/keymaps/abstractkb/rules.mk b/keyboards/abstract/ellipse/keymaps/abstractkb/rules.mk
deleted file mode 100644
index 54a2685bf63..00000000000
--- a/keyboards/abstract/ellipse/keymaps/abstractkb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c b/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
deleted file mode 100644
index 99e61927947..00000000000
--- a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 keebnewb
-
-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_60_utilitarian(
-        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_UP,   KC_DEL,
-        KC_LCTL,  KC_LGUI, KC_LALT,                   KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT_60_utilitarian(
-        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_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
-        KC_TRNS,  KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        BL_TOGG,  BL_DOWN, BL_UP,   KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, 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/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 0798ffa70b5..578a443e882 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -24,63 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define RGB_MATRIX_LED_COUNT 87
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-
-#define RGB_MATRIX_DEFAULT_VAL 60
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json
index b5b935ab585..729512839ff 100644
--- a/keyboards/acheron/apollo/87h/delta/info.json
+++ b/keyboards/acheron/apollo/87h/delta/info.json
@@ -8,7 +8,56 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "fractal": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "val": 60
+        },
+        "driver": "ws2812",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 37c0aaef649..42b27d55ba9 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -26,57 +26,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // RGB Matrix defines
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-
-#define DRIVER_1_LED_TOTAL 87
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
-#define RGB_MATRIX_DEFAULT_VAL 80
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_HUE_WAVE
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.c b/keyboards/acheron/apollo/87h/gamma/gamma.c
index 19e91062873..f047db0feaa 100644
--- a/keyboards/acheron/apollo/87h/gamma/gamma.c
+++ b/keyboards/acheron/apollo/87h/gamma/gamma.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -26,98 +26,98 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |         |         B location
  *   |  |         |         | */
 // First row
-    {0, CS7_SW9 , CS9_SW9 , CS8_SW9  }, //ESC    0
-    {0, CS7_SW8 , CS9_SW8 , CS8_SW8  }, //F1     1
-    {0, CS7_SW7 , CS9_SW7 , CS8_SW7  }, //F2     2
-    {0, CS7_SW6 , CS9_SW6 , CS8_SW6  }, //F3     3
-    {0, CS7_SW5 , CS9_SW5 , CS8_SW5  }, //F4     4
-    {0, CS7_SW4 , CS9_SW4 , CS8_SW4  }, //F5     5
-    {0, CS7_SW3 , CS9_SW3 , CS8_SW3  }, //F6     6
-    {0, CS7_SW2 , CS9_SW2 , CS8_SW2  }, //F7     7
-    {0, CS7_SW1 , CS9_SW1 , CS8_SW1  }, //F8     8
-    {0, CS18_SW2, CS16_SW2, CS17_SW2 }, //F9     9
-    {0, CS18_SW3, CS16_SW3, CS17_SW3 }, //F10    10
-    {0, CS18_SW4, CS16_SW4, CS17_SW4 }, //F11    11
-    {0, CS18_SW6, CS16_SW6, CS17_SW6 }, //F12    12
-    {0, CS18_SW7, CS16_SW7, CS17_SW7 }, //PRI    13
-    {0, CS18_SW8, CS16_SW8, CS17_SW8 }, //SCR    14
-    {0, CS18_SW9, CS16_SW9, CS17_SW9 }, //PAUS   15
+    {0, SW9_CS7 , SW9_CS9 , SW9_CS8  }, //ESC    0
+    {0, SW8_CS7 , SW8_CS9 , SW8_CS8  }, //F1     1
+    {0, SW7_CS7 , SW7_CS9 , SW7_CS8  }, //F2     2
+    {0, SW6_CS7 , SW6_CS9 , SW6_CS8  }, //F3     3
+    {0, SW5_CS7 , SW5_CS9 , SW5_CS8  }, //F4     4
+    {0, SW4_CS7 , SW4_CS9 , SW4_CS8  }, //F5     5
+    {0, SW3_CS7 , SW3_CS9 , SW3_CS8  }, //F6     6
+    {0, SW2_CS7 , SW2_CS9 , SW2_CS8  }, //F7     7
+    {0, SW1_CS7 , SW1_CS9 , SW1_CS8  }, //F8     8
+    {0, SW2_CS18, SW2_CS16, SW2_CS17 }, //F9     9
+    {0, SW3_CS18, SW3_CS16, SW3_CS17 }, //F10    10
+    {0, SW4_CS18, SW4_CS16, SW4_CS17 }, //F11    11
+    {0, SW6_CS18, SW6_CS16, SW6_CS17 }, //F12    12
+    {0, SW7_CS18, SW7_CS16, SW7_CS17 }, //PRI    13
+    {0, SW8_CS18, SW8_CS16, SW8_CS17 }, //SCR    14
+    {0, SW9_CS18, SW9_CS16, SW9_CS17 }, //PAUS   15
 //Second row
-    {0, CS12_SW9, CS11_SW9, CS10_SW9 }, //GRAVE  16
-    {0, CS12_SW8, CS11_SW8, CS10_SW8 }, //1      17
-    {0, CS12_SW7, CS11_SW7, CS10_SW7 }, //2      18
-    {0, CS12_SW6, CS11_SW6, CS10_SW6 }, //3      19
-    {0, CS12_SW5, CS11_SW5, CS10_SW5 }, //4      20
-    {0, CS12_SW4, CS11_SW4, CS10_SW4 }, //5      21
-    {0, CS12_SW3, CS11_SW3, CS10_SW3 }, //6      22
-    {0, CS12_SW2, CS11_SW2, CS10_SW2 }, //7      23
-    {0, CS12_SW1, CS11_SW1, CS10_SW1 }, //8      24
-    {0, CS15_SW1, CS13_SW1, CS14_SW1 }, //9      25
-    {0, CS15_SW2, CS13_SW2, CS14_SW2 }, //0      26
-    {0, CS15_SW3, CS13_SW3, CS14_SW3 }, //MINUS  27
-    {0, CS15_SW4, CS13_SW4, CS14_SW4 }, //PLUS   28
-    {0, CS15_SW5, CS13_SW5, CS14_SW5 }, //BKSP   29
-    {0, CS15_SW7, CS13_SW7, CS14_SW7 }, //INS    30
-    {0, CS15_SW8, CS13_SW8, CS14_SW8 }, //HOME   31
-    {0, CS15_SW9, CS13_SW9, CS14_SW9 }, //PGUP   32
+    {0, SW9_CS12, SW9_CS11, SW9_CS10 }, //GRAVE  16
+    {0, SW8_CS12, SW8_CS11, SW8_CS10 }, //1      17
+    {0, SW7_CS12, SW7_CS11, SW7_CS10 }, //2      18
+    {0, SW6_CS12, SW6_CS11, SW6_CS10 }, //3      19
+    {0, SW5_CS12, SW5_CS11, SW5_CS10 }, //4      20
+    {0, SW4_CS12, SW4_CS11, SW4_CS10 }, //5      21
+    {0, SW3_CS12, SW3_CS11, SW3_CS10 }, //6      22
+    {0, SW2_CS12, SW2_CS11, SW2_CS10 }, //7      23
+    {0, SW1_CS12, SW1_CS11, SW1_CS10 }, //8      24
+    {0, SW1_CS15, SW1_CS13, SW1_CS14 }, //9      25
+    {0, SW2_CS15, SW2_CS13, SW2_CS14 }, //0      26
+    {0, SW3_CS15, SW3_CS13, SW3_CS14 }, //MINUS  27
+    {0, SW4_CS15, SW4_CS13, SW4_CS14 }, //PLUS   28
+    {0, SW5_CS15, SW5_CS13, SW5_CS14 }, //BKSP   29
+    {0, SW7_CS15, SW7_CS13, SW7_CS14 }, //INS    30
+    {0, SW8_CS15, SW8_CS13, SW8_CS14 }, //HOME   31
+    {0, SW9_CS15, SW9_CS13, SW9_CS14 }, //PGUP   32
 //Third row
-    {0, CS4_SW9 , CS6_SW9 , CS5_SW9  }, //TAB    33
-    {0, CS4_SW8 , CS6_SW8 , CS5_SW8  }, //Q      34
-    {0, CS4_SW7 , CS6_SW7 , CS5_SW7  }, //W      35
-    {0, CS4_SW6 , CS6_SW6 , CS5_SW6  }, //E      36
-    {0, CS4_SW5 , CS6_SW5 , CS5_SW5  }, //R      37
-    {0, CS4_SW4 , CS6_SW4 , CS5_SW4  }, //T      38
-    {0, CS4_SW3 , CS6_SW3 , CS5_SW3  }, //Y      39
-    {0, CS4_SW2 , CS6_SW2 , CS5_SW2  }, //U      40
-    {0, CS4_SW1 , CS6_SW1 , CS5_SW1  }, //I      41
-    {0, CS3_SW2 , CS1_SW2 , CS2_SW2  }, //O      42
-    {0, CS3_SW3 , CS1_SW3 , CS2_SW3  }, //P      43
-    {0, CS3_SW4 , CS1_SW4 , CS2_SW4  }, //LBRKT  44
-    {0, CS3_SW5 , CS1_SW5 , CS2_SW5  }, //RBRKT  45
-    {0, CS3_SW6 , CS1_SW6 , CS2_SW6  }, //BSLS   46
-    {0, CS3_SW7 , CS1_SW7 , CS2_SW7  }, //DEL    47
-    {0, CS3_SW8 , CS1_SW8 , CS2_SW8  }, //END    48
-    {0, CS3_SW9 , CS1_SW9 , CS2_SW9  }, //PGDN   49
+    {0, SW9_CS4 , SW9_CS6 , SW9_CS5  }, //TAB    33
+    {0, SW8_CS4 , SW8_CS6 , SW8_CS5  }, //Q      34
+    {0, SW7_CS4 , SW7_CS6 , SW7_CS5  }, //W      35
+    {0, SW6_CS4 , SW6_CS6 , SW6_CS5  }, //E      36
+    {0, SW5_CS4 , SW5_CS6 , SW5_CS5  }, //R      37
+    {0, SW4_CS4 , SW4_CS6 , SW4_CS5  }, //T      38
+    {0, SW3_CS4 , SW3_CS6 , SW3_CS5  }, //Y      39
+    {0, SW2_CS4 , SW2_CS6 , SW2_CS5  }, //U      40
+    {0, SW1_CS4 , SW1_CS6 , SW1_CS5  }, //I      41
+    {0, SW2_CS3 , SW2_CS1 , SW2_CS2  }, //O      42
+    {0, SW3_CS3 , SW3_CS1 , SW3_CS2  }, //P      43
+    {0, SW4_CS3 , SW4_CS1 , SW4_CS2  }, //LBRKT  44
+    {0, SW5_CS3 , SW5_CS1 , SW5_CS2  }, //RBRKT  45
+    {0, SW6_CS3 , SW6_CS1 , SW6_CS2  }, //BSLS   46
+    {0, SW7_CS3 , SW7_CS1 , SW7_CS2  }, //DEL    47
+    {0, SW8_CS3 , SW8_CS1 , SW8_CS2  }, //END    48
+    {0, SW9_CS3 , SW9_CS1 , SW9_CS2  }, //PGDN   49
 //Fourth row
-    {0, CS33_SW9, CS32_SW9, CS31_SW9  }, //CAPS  50
-    {0, CS33_SW8, CS32_SW8, CS31_SW8  }, //A     51
-    {0, CS33_SW7, CS32_SW7, CS31_SW7  }, //S     52
-    {0, CS33_SW6, CS32_SW6, CS31_SW6  }, //D     53
-    {0, CS33_SW5, CS32_SW5, CS31_SW5  }, //F     54
-    {0, CS33_SW4, CS32_SW4, CS31_SW4  }, //G     55
-    {0, CS33_SW3, CS32_SW3, CS31_SW3  }, //H     56
-    {0, CS33_SW2, CS32_SW2, CS31_SW2  }, //J     57
-    {0, CS33_SW1, CS32_SW1, CS31_SW1  }, //K     58
-    {0, CS39_SW2, CS38_SW2, CS37_SW2  }, //L     59
-    {0, CS39_SW3, CS38_SW3, CS37_SW3  }, //COLON 60
-    {0, CS39_SW4, CS38_SW4, CS37_SW4  }, //QUOTE 61
-    {0, CS39_SW6, CS38_SW6, CS37_SW6  }, //ENTER 62
+    {0, SW9_CS33, SW9_CS32, SW9_CS31  }, //CAPS  50
+    {0, SW8_CS33, SW8_CS32, SW8_CS31  }, //A     51
+    {0, SW7_CS33, SW7_CS32, SW7_CS31  }, //S     52
+    {0, SW6_CS33, SW6_CS32, SW6_CS31  }, //D     53
+    {0, SW5_CS33, SW5_CS32, SW5_CS31  }, //F     54
+    {0, SW4_CS33, SW4_CS32, SW4_CS31  }, //G     55
+    {0, SW3_CS33, SW3_CS32, SW3_CS31  }, //H     56
+    {0, SW2_CS33, SW2_CS32, SW2_CS31  }, //J     57
+    {0, SW1_CS33, SW1_CS32, SW1_CS31  }, //K     58
+    {0, SW2_CS39, SW2_CS38, SW2_CS37  }, //L     59
+    {0, SW3_CS39, SW3_CS38, SW3_CS37  }, //COLON 60
+    {0, SW4_CS39, SW4_CS38, SW4_CS37  }, //QUOTE 61
+    {0, SW6_CS39, SW6_CS38, SW6_CS37  }, //ENTER 62
 //Fifth row
-    {0, CS30_SW9, CS28_SW9, CS29_SW9  }, //LSFT  63
-    {0, CS30_SW7, CS28_SW7, CS29_SW7  }, //Z     64
-    {0, CS30_SW6, CS28_SW6, CS29_SW6  }, //X     65
-    {0, CS30_SW5, CS28_SW5, CS29_SW5  }, //C     66
-    {0, CS30_SW4, CS28_SW4, CS29_SW4  }, //V     67
-    {0, CS30_SW3, CS28_SW3, CS29_SW3  }, //B     68
-    {0, CS30_SW2, CS28_SW2, CS29_SW2  }, //N     69
-    {0, CS30_SW1, CS28_SW1, CS29_SW1  }, //M     70
-    {0, CS36_SW1, CS35_SW1, CS34_SW1  }, //COMMA 71
-    {0, CS36_SW3, CS35_SW3, CS34_SW3  }, //DOT   72
-    {0, CS36_SW4, CS35_SW4, CS34_SW4  }, //SLASH 73
-    {0, CS36_SW6, CS35_SW6, CS34_SW6  }, //RSFT  74
-    {0, CS36_SW7, CS35_SW7, CS34_SW7  }, //UP    75
+    {0, SW9_CS30, SW9_CS28, SW9_CS29  }, //LSFT  63
+    {0, SW7_CS30, SW7_CS28, SW7_CS29  }, //Z     64
+    {0, SW6_CS30, SW6_CS28, SW6_CS29  }, //X     65
+    {0, SW5_CS30, SW5_CS28, SW5_CS29  }, //C     66
+    {0, SW4_CS30, SW4_CS28, SW4_CS29  }, //V     67
+    {0, SW3_CS30, SW3_CS28, SW3_CS29  }, //B     68
+    {0, SW2_CS30, SW2_CS28, SW2_CS29  }, //N     69
+    {0, SW1_CS30, SW1_CS28, SW1_CS29  }, //M     70
+    {0, SW1_CS36, SW1_CS35, SW1_CS34  }, //COMMA 71
+    {0, SW3_CS36, SW3_CS35, SW3_CS34  }, //DOT   72
+    {0, SW4_CS36, SW4_CS35, SW4_CS34  }, //SLASH 73
+    {0, SW6_CS36, SW6_CS35, SW6_CS34  }, //RSFT  74
+    {0, SW7_CS36, SW7_CS35, SW7_CS34  }, //UP    75
 //Sixth row
-    {0, CS27_SW9, CS25_SW9, CS26_SW9  }, //LCTRL 76
-    {0, CS27_SW7, CS25_SW7, CS26_SW7  }, //LWIN  77
-    {0, CS27_SW6, CS25_SW6, CS26_SW6  }, //LALT  78
-    {0, CS27_SW5, CS25_SW5, CS26_SW5  }, //SPACE 79
-    {0, CS27_SW3, CS25_SW3, CS26_SW3  }, //RALT  80
-    {0, CS24_SW4, CS23_SW4, CS22_SW4  }, //RGUI  81
-    {0, CS24_SW5, CS23_SW5, CS22_SW5  }, //MENU  82
-    {0, CS24_SW6, CS23_SW6, CS22_SW6  }, //RCTRL 83
-    {0, CS24_SW1, CS23_SW1, CS22_SW1  }, //LEFT  84
-    {0, CS24_SW2, CS23_SW2, CS22_SW2  }, //DOWN  85
-    {0, CS24_SW3, CS23_SW3, CS22_SW3  }, //RIGHT 86
+    {0, SW9_CS27, SW9_CS25, SW9_CS26  }, //LCTRL 76
+    {0, SW7_CS27, SW7_CS25, SW7_CS26  }, //LWIN  77
+    {0, SW6_CS27, SW6_CS25, SW6_CS26  }, //LALT  78
+    {0, SW5_CS27, SW5_CS25, SW5_CS26  }, //SPACE 79
+    {0, SW3_CS27, SW3_CS25, SW3_CS26  }, //RALT  80
+    {0, SW4_CS24, SW4_CS23, SW4_CS22  }, //RGUI  81
+    {0, SW5_CS24, SW5_CS23, SW5_CS22  }, //MENU  82
+    {0, SW6_CS24, SW6_CS23, SW6_CS22  }, //RCTRL 83
+    {0, SW1_CS24, SW1_CS23, SW1_CS22  }, //LEFT  84
+    {0, SW2_CS24, SW2_CS23, SW2_CS22  }, //DOWN  85
+    {0, SW3_CS24, SW3_CS23, SW3_CS22  }, //RIGHT 86
 
 };
 
diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
index 0a3b28e31f6..150f838c89b 100644
--- a/keyboards/acheron/apollo/87h/gamma/info.json
+++ b/keyboards/acheron/apollo/87h/gamma/info.json
@@ -5,7 +5,57 @@
         "device_version": "0.0.3"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "fractal": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "hue_wave",
+            "val": 80
+        },
+        "driver": "is31fl3741",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index e8dd40b32fa..578a443e882 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -24,63 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define RGB_MATRIX_LED_COUNT 86
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-
-#define RGB_MATRIX_DEFAULT_VAL 60
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json
index de0388176e7..91e2cb320e2 100644
--- a/keyboards/acheron/apollo/87htsc/info.json
+++ b/keyboards/acheron/apollo/87htsc/info.json
@@ -12,7 +12,56 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "fractal": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "val": 60
+        },
+        "driver": "ws2812",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 0798ffa70b5..578a443e882 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -24,63 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define RGB_MATRIX_LED_COUNT 87
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-
-#define RGB_MATRIX_DEFAULT_VAL 60
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json
index adb2372e608..17c12b3bebc 100644
--- a/keyboards/acheron/apollo/88htsc/info.json
+++ b/keyboards/acheron/apollo/88htsc/info.json
@@ -12,7 +12,56 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "fractal": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "val": 60
+        },
+        "driver": "ws2812",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
diff --git a/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c b/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c
deleted file mode 100755
index 24ec0c9a36a..00000000000
--- a/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_60_ansi_split_bs_rshift(
-        QK_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_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_TILD,
-        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_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, MO(1)  , KC_RCTL
-    ),
-    [1] = LAYOUT_60_ansi_split_bs_rshift(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, KC_UP  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c b/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c
deleted file mode 100755
index ffd104c771c..00000000000
--- a/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
-Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-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 MEDIA_KEY_DELAY 10
-#define ALT_TAB_DELAY 1000
-
-// Persistent encoder modes: the current encoder mode is written into EEPROM memory, and retrieved at the keyboard initialization. This means the current encoder mode is persistent even if the keyboard is reset or turned off
-#define PERSISTENT_ENCODER_MODES
-
-#define ENCODER_MODE_CHANGE_DELAY 500
-
-// Defining special keycodes
-enum keyboard_keycodes {
-        ECLICK = SAFE_RANGE, // Encoder click
-	ALTTABF , // ALT-TAB forward
-	ALTTABB , // ALT-TAB backwards
-	ALTTABC , // For alt-tab-click
-	ENCMUP  , // Encoder mode up
-	ENCMDN  , // Encoder mode down
-	NEW_SAFE_RANGE
-};
-
-// Creates sample keyevents and keyrecords to be used in the processing of the custom keycodes. Their time should be resampled everytime they are used; their cols and rows are set to be "impossible", that is, outside the normal key matrix bounds.
-const keyevent_t sample_pressed_keyevent = {
-	.key = (keypos_t){.row = 5, .col = 13},
-	.pressed = true,
-	.time = 0
-};
-
-keyrecord_t sample_pressed_keyrecord = {
-	.event = sample_pressed_keyevent
-};
-
-const keyevent_t sample_released_keyevent = {
-	.key = (keypos_t){.row = 5, .col = 13},
-	.pressed = false,
-	.time = 0
-};
-
-keyrecord_t sample_released_keyrecord = {
-	.event = sample_released_keyevent
-};
-
-// tap_process_record_user calls process_record_user with the pressed and released sample keyrecords with a delay of MEDIA_KEY_DELAY. The idea is to allow custom keycodes a simulation of a key press and release, allowing them to be treated in process_record_user. This, in turn, allows the custom keycodes to be used both in the encoder callback and the keyboard keymap.
-uint16_t temp_timer = 0;
-void tap_process_record_user(uint16_t keycode)
-{
-	temp_timer = timer_read();
-	sample_pressed_keyrecord.event.time = timer_read();
-	process_record_user( keycode, &sample_pressed_keyrecord );
-	while (timer_elapsed(temp_timer) < MEDIA_KEY_DELAY);
-	sample_released_keyrecord.event.time = timer_read();
-	process_record_user( keycode, &sample_released_keyrecord );
-}
-
-// process_special_keycode is a function that distinguishes between the native keycodes and the ones custom-defined here. Normal keycodes are tapped, while keycodes in the SAFE_RANGE - NEW_SAFE_RANGE interval are treated with tap_process_record_user.
-void process_special_keycode(uint16_t keycode) {
-	if (SAFE_RANGE <= keycode && keycode < NEW_SAFE_RANGE) tap_process_record_user(keycode);
-	else tap_code(keycode);
-}
-
-uint16_t encoder_click_delay = ENCODER_MODE_CHANGE_DELAY;
-
-uint8_t startup_color[3] = {0xFF,0xFF,0xFF};
-
-typedef struct _encoder_mode_t {
-	uint8_t indicator_color[3];
-	uint16_t clockwise_key[4];
-	uint16_t counterclockwise_key[4];
-	uint16_t clicked_key[4] ;
-	uint16_t hold_key;
-} encoder_mode_t;
-
-encoder_mode_t encoder_modes[] = {
-	{ .indicator_color = {0x22,0x00,0xFF} , .clockwise_key = {KC_VOLU, KC_VOLU, ENCMUP, KC_VOLU}, .counterclockwise_key = {KC_VOLD, KC_VOLD, ENCMDN, KC_VOLD}, .clicked_key = {KC_MUTE, KC_MPLY, KC_MUTE, KC_MUTE}, .hold_key = ENCMUP },
-	{ .indicator_color = {0x00,0x33,0xFF} , .clockwise_key = {KC_WH_D, KC_WH_D, ENCMUP, KC_WH_D}, .counterclockwise_key = {KC_WH_U, KC_WH_U, ENCMDN, KC_WH_U}, .clicked_key = {KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1}, .hold_key = ENCMUP },
-	{ .indicator_color = {0xFF,0x88,0x00} , .clockwise_key = {ALTTABF, ALTTABF, ENCMUP, ALTTABF}, .counterclockwise_key = {ALTTABB, ALTTABB, ENCMDN, ALTTABB}, .clicked_key = {ALTTABC, ALTTABC, ALTTABC, ALTTABC}, .hold_key = ENCMUP }
-	// Insert your custom encoder mode here
-};
-
-#define NUM_ENCODER_MODES ARRAY_SIZE(encoder_modes)
-
-// This counter is used to track what encoder mode is being used at a certain time
-int encoder_mode_count = 0;
-
-
-#ifdef PERSISTENT_ENCODER_MODES
-typedef union {
-	uint32_t raw;
-	struct {
-	int user_encoder_mode_count;
-};
-} user_config_t;
-
-user_config_t user_config;
-#endif
-
-void set_indicator_colors(uint8_t color[3]){
-    rgblight_setrgb(color[0], color[1], color[2]);
-}
-
-// Board init: RGB indicator is set to startup_color
-void keyboard_pre_init_user(void){
-	set_indicator_colors(startup_color);
-};
-
-void keyboard_post_init_user(void){
-#ifdef PERSISTENT_ENCODER_MODES
-	user_config.raw = eeconfig_read_user();
-	encoder_mode_count = user_config.user_encoder_mode_count ;
-#else
-	encoder_mode_count = 0;
-#endif
-	set_indicator_colors(encoder_modes[ encoder_mode_count ].indicator_color);
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_ortho_4x12(
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    ECLICK ,
-		KC_ESC,  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_LALT, KC_LGUI, _______, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-	),
-	[1] = LAYOUT_ortho_4x12(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		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_4x12(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		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_4x12(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-	)
-};
-
-// ------------------------------------------------------------------------------------------------
-
-bool is_alt_tab_active = false; // Flag to check if alt tab is active
-uint32_t alt_tab_timer = 0;     // Time trigger for alt tab
-uint16_t mapped_code = 0;
-uint32_t held_keycode_timer = 0;
-
-int current_layer = 0 ; // Updated in layer_state_set_user each time a layer change is made
-
-void cycle_encoder_mode(bool forward){
-	if (forward) encoder_mode_count++ ;  // Shifts encoder mode forward
-	else encoder_mode_count-- ;
-	if (encoder_mode_count == -1) encoder_mode_count = NUM_ENCODER_MODES - 1;
-	// Shifts encoder mode backward
-	encoder_mode_count = encoder_mode_count % NUM_ENCODER_MODES ; // This makes sure encoder_mode_count keeps cycling between 0,1,...,NUM_ENCODER_MODES and doesnt eventually overflow
-#ifdef PERSISTENT_ENCODER_MODES
-	user_config.user_encoder_mode_count = encoder_mode_count ;
-	eeconfig_update_user(user_config.raw);
-#endif
-	set_indicator_colors( encoder_modes[ encoder_mode_count ].indicator_color ); // Set indicator color to the corresponding defined color
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-	process_special_keycode(clockwise ? encoder_modes[ encoder_mode_count ].clockwise_key[ current_layer ] : encoder_modes[ encoder_mode_count ].counterclockwise_key[ current_layer ]);
-	return false;
-}
-
-uint32_t held_click_timer = 0;
-bool is_click_held = false;
-bool is_shift_held = false;
-bool automatic_hold_cycle = false; // This flag registers if the encoder hold was automatically cycled
-
-// This bool records if LALT is pressed or not. Due to the automatic disabling of the ALT-TAB of the ALTTABS custom keystroke, the automatic disabling can un-register KC_LALT even when the LALT key is phisically pressed. Hence there needs to be two bools: one that keebs track of the ALT-TAB activity and one that keeps track of LALT so that the automatic disabling will not disable LALT if it is phisically pressed.
-bool is_lalt_pressed = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-	case KC_LSFT:
-	case KC_RSFT:
-		if (record->event.pressed) is_shift_held = true;
-		else is_shift_held = false;
-		return true;
-	case ECLICK:
-		// Checks if the encoder has been pressed; if so, sets the corresponding flag and starts the corresponding timer
-		if (record->event.pressed) {
-			is_click_held = true;
-			held_click_timer = timer_read32();
-		// Checks if the encoder has been released: samples the duration of the encoder push; if this time was less than the encoder_click_delay, processes the clicked key. If it was bigger, processes the hold key. This behavior is adjusted using the ENCODER_MODE_CHANGE_DELAY macro. There is an exception made when automatic_hold_cycle is true; this means that the encoder push has been pressed enough to trigger a hold cycle. This case is taken care of in the housekeeping routine, where the held key is triggered and the timer reset. Hence the automatic_hold_cycle needs to be checked because without this check the function will trigger the clicked key after the hold cycle has been cycled more than once.
-		} else {
-			is_click_held = false;
-			if (timer_elapsed32(held_click_timer) < encoder_click_delay && !automatic_hold_cycle ) process_special_keycode( encoder_modes[ encoder_mode_count ].clicked_key[ current_layer ] ) ;
-			automatic_hold_cycle = false;
-		}
-		return true; // Skip all further processing of this key
-	case KC_LALT: // If this is not defined, if the encoder is activated in the alt-tab mode while the LALT key is pressed, the menu goes away.
-		if (record->event.pressed) is_lalt_pressed = true;
-		else is_lalt_pressed = false;
-		return true;
-	case ENCMUP:
-	case ENCMDN:
-		if (record->event.pressed) cycle_encoder_mode(keycode == ENCMUP); // If keycode == ENCMUP the expression returns true and the cycle function cycles the modes forward. If not, then cycles backwards.
-		return false;
-	case ALTTABF:
-	case ALTTABB:
-		if (record->event.pressed) {
-			if (!is_alt_tab_active) {
-				is_alt_tab_active = true;
-				register_code(KC_LALT);
-
-			}
-			tap_code16(keycode == ALTTABF ? KC_TAB : S(KC_TAB)); // Due to S(KC_TAB), the 16-bit tap_code16 is needed.
-			alt_tab_timer = timer_read32();
-		}
-		return true;
-	case ALTTABC:
-		if (record->event.pressed) {
-			if (is_alt_tab_active) {
-				if (!is_lalt_pressed) unregister_code(KC_LALT);
-				is_alt_tab_active = false;
-			}
-		}
-		return false;
-	default:
-		return true; // Process all other keycodes normally
-	}
-}
-
-void housekeeping_task_user(void) {
-	if (is_alt_tab_active) {
-		if (is_lalt_pressed) alt_tab_timer = timer_read32();
-		else if (timer_elapsed32(alt_tab_timer) > ALT_TAB_DELAY) {
-			unregister_code(KC_LALT);
-			is_alt_tab_active = false;
-		}
-	}
-/*		This piece of the code checks for the encoder push timer. If the encoder push interval was less than encoder_click_delay then it is automatically processed by process_record_user by triggering the current mode's click key. However, if the encoder push is held for more time than the defined delay, then the encoder hold "cycles", that is, gets activated and the timer needs to be reset. This does three things:
-- (1) Sets the automatic_hold_cycle flag which prevents process_record_user from triggering the click key when the push is released
-- (2) Processes the current mode's hold key in process_record_user
-- (3) Resets the click timer
-*/
-	if (is_click_held && timer_elapsed32(held_click_timer) > encoder_click_delay ){
-		automatic_hold_cycle = true;
-		process_special_keycode( encoder_modes[ encoder_mode_count ].hold_key );
-		held_click_timer = timer_read32();
-	}
-}
diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h
index 605594eea20..ed1229c7793 100644
--- a/keyboards/acheron/themis/87h/config.h
+++ b/keyboards/acheron/themis/87h/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 1
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/acheron/themis/87h/info.json b/keyboards/acheron/themis/87h/info.json
index cbff8f4eec5..a7bfb899978 100644
--- a/keyboards/acheron/themis/87h/info.json
+++ b/keyboards/acheron/themis/87h/info.json
@@ -8,9 +8,11 @@
         "cols": ["A8" ,"C9" ,"C8" ,"B14","B12","B10","B1" ,"B0" ,"A7" ,"A6" ,"A5" ,"A4" ,"C5" ,"C7" ,"B3" ,"A2" ,"C12","D2" ],
         "rows": ["A15","A10","C6" ,"C4" ,"A3" ,"A1" ,"C11","C10","B4"]
     },
+    "build": {
+        "lto": true
+    },
     "features": {
         "bootmagic": true,
-        "lto":       true,
         "mousekey":  true,
         "extrakey":  true,
         "console":   false,
@@ -26,6 +28,9 @@
             "backing_size": 8192
         }
     },
+    "rgblight": {
+        "led_count": 1
+    },
     "ws2812": {
         "pin": "B15"
     },
diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h
index 605594eea20..ed1229c7793 100644
--- a/keyboards/acheron/themis/87htsc/config.h
+++ b/keyboards/acheron/themis/87htsc/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 1
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/acheron/themis/87htsc/info.json b/keyboards/acheron/themis/87htsc/info.json
index 5b491690bbc..5f388147892 100644
--- a/keyboards/acheron/themis/87htsc/info.json
+++ b/keyboards/acheron/themis/87htsc/info.json
@@ -8,9 +8,11 @@
         "cols": ["A8" ,"C9" ,"C8" ,"B14","B12","B10","B1" ,"B0" ,"A7" ,"A6" ,"A5" ,"A4" ,"C5" ,"C7" ,"B3" ,"A2" ,"C12","D2" ],
         "rows": ["A15","A10","C6" ,"C4" ,"A3" ,"A1" ,"C11","C10","B4"]
     },
+    "build": {
+        "lto": true
+    },
     "features": {
         "bootmagic": true,
-        "lto":       true,
         "mousekey":  true,
         "extrakey":  true,
         "console":   false,
@@ -26,6 +28,9 @@
             "backing_size": 8192
         }
     },
+    "rgblight": {
+        "led_count": 1
+    },
     "ws2812": {
         "pin": "B15"
     },
diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h
index 605594eea20..ed1229c7793 100644
--- a/keyboards/acheron/themis/88htsc/config.h
+++ b/keyboards/acheron/themis/88htsc/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 1
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/acheron/themis/88htsc/info.json b/keyboards/acheron/themis/88htsc/info.json
index 073a16e9461..20b3d38828a 100644
--- a/keyboards/acheron/themis/88htsc/info.json
+++ b/keyboards/acheron/themis/88htsc/info.json
@@ -8,9 +8,11 @@
         "cols": ["A8" ,"C9" ,"C8" ,"B14","B12","B10","B1" ,"B0" ,"A7" ,"A6" ,"A5" ,"A4" ,"C5" ,"C7" ,"B3" ,"A2" ,"C12","D2" ],
         "rows": ["A15","A10","C6" ,"C4" ,"A3" ,"A1" ,"C11","C10","B4"]
     },
+    "build": {
+        "lto": true
+    },
     "features": {
         "bootmagic": true,
-        "lto":       true,
         "mousekey":  true,
         "extrakey":  true,
         "console":   false,
@@ -26,6 +28,9 @@
             "backing_size": 8192
         }
     },
+    "rgblight": {
+        "led_count": 1
+    },
     "ws2812": {
         "pin": "B15"
     },
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index 818a8229f58..7f2e9ab6f96 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -50,57 +50,3 @@
 #define AUDIO_CLICKY
 
 #define SPEAKER_SHUTDOWN GP14
-
-#ifdef RGB_MATRIX_ENABLE
-
-     /* RGB Defines */
-#    define RGB_MATRIX_LED_COUNT 12
-
-     /* Enable Framebuffer and keypress 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
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    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
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index bac0061f3eb..0facf7e0f66 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -14,7 +14,66 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [1, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 1], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [1, 2], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 21, "flags": 4},
+            {"matrix": [2, 1], "x": 112, "y": 21, "flags": 4},
+            {"matrix": [2, 2], "x": 224, "y": 21, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 42, "flags": 4},
+            {"matrix": [3, 1], "x": 112, "y": 42, "flags": 4},
+            {"matrix": [3, 2], "x": 224, "y": 42, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [4, 1], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [4, 2], "x": 224, "y": 64, "flags": 4}
+        ]
     },
     "bootmagic": {
         "matrix": [1, 2]
diff --git a/keyboards/adafruit/macropad/macropad.c b/keyboards/adafruit/macropad/macropad.c
index 6661e43909b..5c1d2ba5930 100644
--- a/keyboards/adafruit/macropad/macropad.c
+++ b/keyboards/adafruit/macropad/macropad.c
@@ -16,31 +16,6 @@
 
 #include "quantum.h"
 
-#ifdef RGB_MATRIX_ENABLE
-
-#define NA NO_LED
-
-/* RGB Positioning */
-led_config_t g_led_config = { {
-    { NA,  NA, NA },
-    {  0,   1,  2 },
-    {  3,   4,  5 },
-    {  6,   7,  8 },
-    {  9,  10, 11 }
-}, {
-    { 0,  0 }, { 112,  0 }, { 224,  0},
-    { 0, 21 }, { 112, 21 }, { 224, 21},
-    { 0, 42 }, { 112, 42 }, { 224, 42},
-    { 0, 64 }, { 112, 64 }, { 224, 64}
-}, {
-    4, 4, 4,
-    4, 4, 4,
-    4, 4, 4,
-    4, 4, 4
-} };
-
-#endif
-
 #ifdef AUDIO_ENABLE
 void keyboard_pre_init_kb(void) {
     // ensure pin is set and enabled pre-audio init
diff --git a/keyboards/adelheid/keymaps/floookay/keymap.c b/keyboards/adelheid/keymaps/floookay/keymap.c
deleted file mode 100644
index 3abe75e0234..00000000000
--- a/keyboards/adelheid/keymaps/floookay/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2020 floookay
- *
- * 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 adelheid_layers {
-  _BASE,
-  _SECONDARY
-};
-
-// tap dance declarations
-enum {
-    _TD_CTGU = 0,
-    _TD_PGUP = 1,
-    _TD_PGDN = 2,
-    _TD_HOME = 3,
-    _TD_END  = 4,
-    _TD_RSHC = 5,
-    _TD_PSCR = 6
-};
-
-#define MO_SEC MO(_SECONDARY)
-#define TD_CTGU TD(_TD_CTGU)
-#define TD_PGUP TD(_TD_PGUP)
-#define TD_PGDN TD(_TD_PGDN)
-#define TD_HOME TD(_TD_HOME)
-#define TD_END TD(_TD_END)
-#define TD_RSHC TD(_TD_RSHC)
-#define TD_PSCR TD(_TD_PSCR)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = 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_F13,  TD_PGUP,
-
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,  TD_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_BSPC,          TD_END,
-    TD_CTGU, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    TD_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_LALT,          KC_SPC,  MO_SEC,           KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [_SECONDARY] = LAYOUT(
-    KC_SLEP, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,           TD_PSCR, KC_VOLU,
-
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_INS,  BL_STEP,
-    _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, _______, KC_DEL,           KC_MUTE,
-    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, KC_MPLY,                   KC_VOLD,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TD_RSHC,          KC_MPLY,
-    _______,          _______,          _______, _______,          _______,          _______,                   KC_MPRV, KC_MSTP, KC_MNXT
-  )
-};
-
-
-// Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for first parameter, twice for second
-    [_TD_CTGU] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_LGUI),
-    [_TD_PGUP] = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, LCTL(KC_PGUP)),
-    [_TD_PGDN] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, LCTL(KC_PGDN)),
-    [_TD_HOME] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, LCTL(KC_HOME)),
-    [_TD_END]  = ACTION_TAP_DANCE_DOUBLE(KC_END,  LCTL(KC_END)),
-    [_TD_RSHC] = ACTION_TAP_DANCE_DOUBLE(KC_RSFT, KC_CAPS),
-    [_TD_PSCR] = ACTION_TAP_DANCE_DOUBLE(KC_PSCR, LSFT(LGUI(KC_S))) // screenshot tool tap dance
-};
diff --git a/keyboards/adelheid/keymaps/floookay/readme.md b/keyboards/adelheid/keymaps/floookay/readme.md
deleted file mode 100644
index a9d624222ea..00000000000
--- a/keyboards/adelheid/keymaps/floookay/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# The default keymap for the Adelheid
-
-- ANSI QWERTY
-- split backspace
-- ctrl on caps lock with super on tap dance
-- caps lock on fn + right shift tap dance
-
-![adelheid_layout](https://gist.githubusercontent.com/floookay/7bf6511a8d84804d32de4d7bbe3bd0fb/raw/dffd622a762463f341466ffecefad3b31ad3ee4f/layout.png)  
-View in [Keyboard-Layout-Editor](http://www.keyboard-layout-editor.com/#/gists/4262535adb5ac81a913edbebc4de8226).
diff --git a/keyboards/adelheid/keymaps/floookay/rules.mk b/keyboards/adelheid/keymaps/floookay/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/adelheid/keymaps/floookay/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h
index 230453c3a00..8c70779a29d 100644
--- a/keyboards/adpenrose/akemipad/config.h
+++ b/keyboards/adpenrose/akemipad/config.h
@@ -8,16 +8,3 @@
 #define AUDIO_CLICKY
 #define AUDIO_ENABLE_TONE_MULTIPLEXING
 #define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10
-
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 27
-#define RGB_MATRIX_CENTER { 60, 77 }
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#ifdef RGB_MATRIX_ENABLE
-// 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_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#endif
diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json
index 0484578571b..28ac8d6d4c5 100644
--- a/keyboards/adpenrose/akemipad/info.json
+++ b/keyboards/adpenrose/akemipad/info.json
@@ -11,7 +11,14 @@
         "pin": "F4"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "cycle_left_right": true,
+            "cycle_up_down": true
+        },
+        "center_point": [60, 77],
+        "driver": "ws2812",
+        "max_brightness": 175,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D3", "D2", "F5", "F6", "B2"],
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/animation_frames.h b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/animation_frames.h
deleted file mode 100644
index 062448b754e..00000000000
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/animation_frames.h
+++ /dev/null
@@ -1,392 +0,0 @@
-// Copyright 2022 Arturo Avila (@ADPenrose)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#ifdef OLED_ENABLE
-
-// Enable OLED bitmpa compression selectively.
-#define USE_OLED_BITMAP_COMPRESSION
-
-#define NUM_IDLE_FRAMES 5
-#define NUM_TAP_FRAMES 2
-#define NUM_OLED_BYTES 512
-
-#ifdef USE_OLED_BITMAP_COMPRESSION
-
-static const char PROGMEM idle_1_block_map[] = { //IDLE_1 and IDLE_2 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x7f, 0x00, 0xf0, 0xb0, 0xc1, 0x07,
-    0xf0, 0xcf, 0x00, 0x1c, 0x00, 0xb8, 0x8f, 0x3f, 0x00, 0x98, 0xff, 0x00, 0x00, 0xf0, 0x03, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
-};
-
-static const char PROGMEM idle_2_block_map[] = { //IDLE_3 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0xf0, 0xd8, 0xe0, 0x03,
-    0xf0, 0x6f, 0x00, 0x3e, 0x00, 0xf8, 0xc7, 0x7f, 0x00, 0x98, 0x7f, 0x00, 0x00, 0xf0, 0x03, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
-};
-
-static const char PROGMEM idle_3_block_map[] = { //IDLE_4 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x01, 0xf0, 0xb0, 0xc1, 0x07,
-    0xf0, 0xcf, 0x00, 0x7c, 0x00, 0xb8, 0x8f, 0xff, 0x00, 0x98, 0xff, 0x00, 0x00, 0xf0, 0x03, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
-};
-
-static const char PROGMEM idle_4_block_map[] = { //IDLE_5 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0xf0, 0xb0, 0xc1, 0x07,
-    0xf0, 0xcf, 0x00, 0x3c, 0x00, 0xb8, 0x8f, 0x7f, 0x00, 0x98, 0xff, 0x00, 0x00, 0xf0, 0x03, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01   
-};
-
-static const char PROGMEM tap_1_block_map[] = { //TAP_1 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x01, 0x80, 0xff, 0xc1, 0x07,
-    0x00, 0xce, 0x00, 0x7c, 0x00, 0xb8, 0x8d, 0xff, 0x00, 0x98, 0xff, 0x1f, 0xc0, 0xff, 0xff, 0x1f,
-    0x00, 0x3f, 0xfe, 0x01, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
-};
-
-static const char PROGMEM tap_2_block_map[] = { //TAP_2 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xde, 0xff, 0xff, 0x01, 0xfc, 0x80, 0xc1, 0x07,
-    0xf1, 0xcf, 0x00, 0x7c, 0x00, 0xb8, 0x8d, 0xff, 0x00, 0xe0, 0xff, 0x00, 0x00, 0x80, 0x3f, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01   
-};
-
-static const char PROGMEM idle_1_block_list[] = { //IDLE_1 and IDLE_2 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x01, 0x02, 0x02, 0x02,
-    0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x04, 0xf8, 0xe0, 0x18, 0x06, 0x01, 0x78, 0x78,
-    0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x30,
-    0xc8, 0x01, 0x3e, 0xc0, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18, 0x80, 0x40, 0x20, 0x10,
-    0x10, 0x08, 0x07, 0xfc, 0x03, 0x80, 0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x01, 0x01,
-    0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0
-};
-
-static const char PROGMEM idle_2_block_list[] = { //IDLE_3 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x06, 0x04,
-    0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0xe0, 0x18, 0x06, 0x01, 0x78,
-    0x78, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0,
-    0x30, 0xc8, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18, 0x80,
-    0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0xfc, 0x03, 0x83, 0x43, 0x20, 0x10, 0x08, 0x04,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01,
-    0x1e, 0xe0
-};
-
-static const char PROGMEM idle_3_block_list[] = { //IDLE_4 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04,
-    0x04, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0xe0, 0x18, 0x06, 0x01,
-    0x78, 0x78, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c,
-    0xe0, 0x30, 0xc8, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18,
-    0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0xfc, 0x03, 0x80, 0x83, 0x43, 0x20, 0x10,
-    0x08, 0x04, 0x02, 0x01, 0x01, 0x01, 0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f,
-    0xe0, 0x01, 0x1e, 0xe0    
-};
-
-static const char PROGMEM idle_4_block_list[] = { //IDLE_5 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04,
-    0x04, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0xe4, 0x18, 0xe0, 0x18, 0x06, 0x01, 0x78,
-    0x78, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0,
-    0x30, 0xc8, 0x01, 0x1e, 0x60, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18, 0x80, 0x40,
-    0x20, 0x10, 0x10, 0x10, 0x08, 0x07, 0xfc, 0x03, 0x80, 0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02,
-    0x01, 0x01, 0x01, 0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e,
-    0xe0    
-};
-
-static const char PROGMEM tap_1_block_list[] = { //TAP_1 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x42, 0x44,
-    0x84, 0x88, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x01, 0x0e, 0xf0, 0x20,
-    0x26, 0x26, 0x29, 0x10, 0xd5, 0xce, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x1c, 0xe0, 0x30, 0xc8,
-    0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0x02, 0x18, 0x18, 0x80, 0x40, 0x20, 0x10,
-    0x10, 0x08, 0x08, 0x04, 0x03, 0xfc, 0x03, 0x80, 0x80, 0x40, 0x20, 0x10, 0x08, 0x84, 0xc2, 0xc1,
-    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfd, 0xfd, 0x01, 0x07, 0x78,
-    0x80, 0x38, 0xf8, 0xf8, 0xf1, 0xe1, 0xc3, 0x83, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x03, 0x03,
-    0x07, 0x07, 0x07, 0x78, 0x81, 0x07, 0x07, 0x03, 0x03, 0x01, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e,
-    0xe0    
-};
-
-static const char PROGMEM tap_2_block_list[] = { //TAP_2 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x7e, 0xfe, 0xfe, 0xfe, 0x07, 0xf9, 0x01,
-    0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18,
-    0x01, 0x01, 0xe0, 0x18, 0x06, 0x01, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x0f, 0x03, 0x04,
-    0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x30, 0xc8, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0,
-    0x03, 0x02, 0x18, 0x18, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0x0f, 0x70, 0x80,
-    0x81, 0x01, 0x31, 0x32, 0x8a, 0x24, 0x86, 0x79, 0x07, 0x78, 0x81, 0x01, 0x01, 0x01, 0x01, 0x07,
-    0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0
-};
-
-// idle_1 and idle_2 are identical, so share them and save some space
-const char* idle_frames[NUM_IDLE_FRAMES] = {
-    idle_1_block_list,
-    idle_1_block_list,
-    idle_2_block_list,
-    idle_3_block_list,
-    idle_4_block_list
-};
-
-const char* tap_frames[NUM_TAP_FRAMES] = {
-    tap_1_block_list,
-    tap_2_block_list
-};
-
-// idle_1 and idle_2 are identical, so save some space
-const char* idle_block_map[NUM_IDLE_FRAMES] = {
-    idle_1_block_map,
-    idle_1_block_map,
-    idle_2_block_map,
-    idle_3_block_map,
-    idle_4_block_map
-};
-
-const char* tap_block_map[NUM_TAP_FRAMES] = {
-    tap_1_block_map,
-    tap_2_block_map
-};
-
-#else
-
-static const char PROGMEM idle_frames[NUM_IDLE_FRAMES][NUM_OLED_BYTES] = {
-  { // IDLE 1 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x08, 0x08, 
-    0x08, 0x04, 0x04, 0x02, 0x02, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    },
-    { //IDLE 2 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x08, 0x08, 
-    0x08, 0x04, 0x04, 0x02, 0x02, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    },
-    { //IDLE 3 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x06, 0x04, 0x08, 0x08, 0x04, 
-    0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 0xc0, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x30, 0xc8, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 
-    0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x83, 
-    0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    },
-    { //IDLE 4 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 
-    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    },
-    { //IDLE 5 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 
-    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0xe4, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x60, 0x80, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x10, 0x08, 0x07, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    }
-  };
-static const char PROGMEM tap_frames[NUM_TAP_FRAMES][NUM_OLED_BYTES] = {
-  { //Tap 1 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x42, 0x44, 0x84, 0x88, 0x08, 
-    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0e, 0xf0, 0x20, 0x26, 0x26, 0x29, 0x10, 0xd5, 
-    0xce, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0x02, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x80, 0x40, 0x20, 0x10, 0x08, 0x84, 0xc2, 0xc1, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfd, 0xfd, 0x01, 0x07, 
-    0x78, 0x80, 0x38, 0xf8, 0xf8, 0xf1, 0xe1, 0xc3, 0x83, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x00, 0x00, 
-    0x00, 0x07, 0x78, 0x81, 0x07, 0x07, 0x03, 0x03, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  
-    },
-    { //Tap 2 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x7e, 0xfe, 0xfe, 0xfe, 0x00, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 
-    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x01, 0x01, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x0f, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0x02, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x70, 0x80, 
-    0x81, 0x01, 0x31, 0x32, 0x8a, 0x24, 0x86, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
-    0x78, 0x81, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
-    },
-  };
-#endif //USE_BITMAP_COMPRESSION
-#endif //OLED_ENABLE
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/animation_process.h b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/animation_process.h
deleted file mode 100644
index 4280574a467..00000000000
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/animation_process.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2022 Arturo Avila (@ADPenrose)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "animation_frames.h"
-
-#ifdef OLED_ENABLE
-#define IDLE_FRAME_DURATION 200 // Idle animation iteration rate in ms
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-
-bool tap_anim        = false;
-bool tap_anim_toggle = false;
-
-
-// Decompress and write a precompressed bitmap frame to the OLED.
-// Documentation and python compression script available at:
-// https://github.com/nullbitsco/squeez-o
-#ifdef USE_OLED_BITMAP_COMPRESSION
-static void oled_write_compressed_P(const char* input_block_map, const char* input_block_list) {
-    uint16_t block_index = 0;
-    for (uint16_t i=0; i<NUM_OLED_BYTES; i++) {
-        uint8_t bit = i%8;
-        uint8_t map_index = i/8;
-        uint8_t _block_map = (uint8_t)pgm_read_byte_near(input_block_map + map_index);
-        uint8_t nonzero_byte = (_block_map & (1 << bit));
-        if (nonzero_byte) {
-            const char data = (const char)pgm_read_byte_near(input_block_list + block_index++);
-            oled_write_raw_byte(data, i);
-        } else {
-            const char data = (const char)0x00;
-            oled_write_raw_byte(data, i);
-        }
-    }
-}
-#endif
-
-static void render_anim(void) {
-    // Idle animation
-    void animation_phase(void) {
-        if (!tap_anim) {
-            current_idle_frame = (current_idle_frame + 1) % NUM_IDLE_FRAMES;
-            uint8_t idx = abs((NUM_IDLE_FRAMES - 1) - current_idle_frame);
-            #ifdef USE_OLED_BITMAP_COMPRESSION
-            oled_write_compressed_P(idle_block_map[idx], idle_frames[idx]);
-            #else
-            oled_write_raw_P(idle_frames[idx], NUM_OLED_BYTES);
-            #endif
-        }
-    }
-
-    // Idle behaviour
-    if (get_current_wpm() != 000) {  // prevent sleep
-        oled_on();
-        if (timer_elapsed32(anim_timer) > IDLE_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {  // Turn off screen when timer threshold elapsed or reset time since last input
-        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > IDLE_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-#endif
-
-// Animate tap
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    #ifdef OLED_ENABLE
-    // Check if non-mod
-     if ((keycode >= KC_TAB && keycode <= KC_SLASH) || // Tab - Slash (Symbols, Punctuation, Space)
-      (keycode >= KC_KP_SLASH && keycode <= KC_KP_COMMA) ||  // Keypad slash - Keypad Dot
-      (keycode >= KC_F1 && keycode <= KC_F12)) { // F1 - F12
-        if (record->event.pressed) {
-            // Display tap frames
-            tap_anim_toggle = !tap_anim_toggle;
-            #ifdef USE_OLED_BITMAP_COMPRESSION
-            oled_write_compressed_P(tap_block_map[tap_anim_toggle], tap_frames[tap_anim_toggle]);
-            #else
-            oled_write_raw_P(tap_frames[tap_anim_toggle], NUM_OLED_BYTES);
-            #endif
-        }
-    }
-    #endif
-
-    return true;
-}
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/config.h b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/config.h
deleted file mode 100644
index 8667314cd4e..00000000000
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2022 Arturo Avila (@ADPenrose)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#ifdef AUDIO_ENABLE
-#    define NO_MUSIC_MODE
-#endif
-
-#ifdef OLED_ENABLE
-#    define OLED_TIMEOUT 120000
-#endif
-
-#undef LOCKING_SUPPORT_ENABLE
-#undef LOCKING_RESYNC_ENABLE
-#define NO_ACTION_ONESHOT
-#define LAYER_STATE_8BIT
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c
deleted file mode 100644
index f9ccfbe7697..00000000000
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2022 Arturo Avila (@ADPenrose), Christopher Courtney/Drashna Jael're (@drashna)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "animation_process.h"
-
-/* Structure that helps store settings in memory and write to the EEPROM: */
-typedef union {
-  uint32_t raw;
-  struct {
-    bool     split_zero :1;
-    bool     split_enter :1;
-    bool     split_plus :1;
-  };
-} via_layout_t;
-
-via_layout_t via_layouts;
-
-/* Keymap */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-                  MO(1),    MO(2),     MO(3),     CK_TOGG,
-                  KC_NUM,   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_MUTE,  KC_P0,    KC_P0,     KC_PDOT,   KC_PENT 
-    ),
-    [1] = LAYOUT_all(
-                  KC_TRNS,  CK_DOWN,   CK_UP,     CK_RST,
-                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-                  KC_TRNS,  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 
-    ),
-    [3] = LAYOUT_all(
-                  QK_BOOT,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-                  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS 
-    )
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
-    [2] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
-    [3] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
-};
-#endif
-
-/* Setting layout options and debuggin text */
-void via_set_layout_options_kb(uint32_t value) { 
-  via_layouts.raw = value;
-  #ifdef CONSOLE_ENABLE
-    if (via_layouts.split_zero && via_layouts.split_enter && via_layouts.split_plus){
-      xprintf("All three layouts are active with a value of: %d\n", value);
-    } else if (!(via_layouts.split_zero) && via_layouts.split_enter && via_layouts.split_plus){
-      xprintf("SE and SP layouts are active with a value of: %d\n", value);
-    } else if (via_layouts.split_zero && !(via_layouts.split_enter) && via_layouts.split_plus){
-      xprintf("SZ and SP layouts are active with a value of: %d\n", value);
-    } else if (!(via_layouts.split_zero) && !(via_layouts.split_enter) && via_layouts.split_plus){
-      xprintf("SP is the only layout active with a value of: %d\n", value);
-    } else if (via_layouts.split_zero && via_layouts.split_enter && !(via_layouts.split_plus)){
-      xprintf("SE and SZ layouts are active with a value of: %d\n", value);
-    } else if (!(via_layouts.split_zero) && via_layouts.split_enter && !(via_layouts.split_plus)) {
-      xprintf("SE is the only layout active with a value of: %d\n", value);
-    } else if (via_layouts.split_zero && !(via_layouts.split_enter) && !(via_layouts.split_plus)){
-      xprintf("SZ is the only layout active with a value of: %d\n", value); 
-    } else {
-      xprintf("The base layout is active with a value of: %d\n", value);
-    }
-  #endif
-}
-
-/* Turing LEDs on/off depending on the layout selected on VIA */
-bool rgb_matrix_indicators_user(void){
-  if (via_layouts.split_zero && via_layouts.split_enter && via_layouts.split_plus){
-    rgb_matrix_set_color(12, 0, 0, 0);
-    rgb_matrix_set_color(21, 0, 0, 0);
-    rgb_matrix_set_color(23, 0, 0, 0);
-  } else if (!(via_layouts.split_zero) && via_layouts.split_enter && via_layouts.split_plus){
-    rgb_matrix_set_color(12, 0, 0, 0);
-    rgb_matrix_set_color(21, 0, 0, 0);
-    rgb_matrix_set_color(22, 0, 0, 0);
-    rgb_matrix_set_color(24, 0, 0, 0);
-  } else if (via_layouts.split_zero && !(via_layouts.split_enter) && via_layouts.split_plus){
-    rgb_matrix_set_color(12, 0, 0, 0);
-    rgb_matrix_set_color(20, 0, 0, 0);
-    rgb_matrix_set_color(23, 0, 0, 0);
-    rgb_matrix_set_color(26, 0, 0, 0);
-  } else if (!(via_layouts.split_zero) && !(via_layouts.split_enter) && via_layouts.split_plus){
-    rgb_matrix_set_color(12, 0, 0, 0);
-    rgb_matrix_set_color(20, 0, 0, 0);
-    rgb_matrix_set_color(22, 0, 0, 0);
-    rgb_matrix_set_color(24, 0, 0, 0);
-    rgb_matrix_set_color(26, 0, 0, 0);
-  } else if (via_layouts.split_zero && via_layouts.split_enter && !(via_layouts.split_plus)){
-    rgb_matrix_set_color(11, 0, 0, 0);
-    rgb_matrix_set_color(16, 0, 0, 0);
-    rgb_matrix_set_color(21, 0, 0, 0);
-    rgb_matrix_set_color(23, 0, 0, 0);
-  } else if (!(via_layouts.split_zero) && via_layouts.split_enter && !(via_layouts.split_plus)) {
-    rgb_matrix_set_color(11, 0, 0, 0);
-    rgb_matrix_set_color(16, 0, 0, 0);
-    rgb_matrix_set_color(21, 0, 0, 0);
-    rgb_matrix_set_color(22, 0, 0, 0);
-    rgb_matrix_set_color(24, 0, 0, 0);
-  } else if (via_layouts.split_zero && !(via_layouts.split_enter) && !(via_layouts.split_plus)){
-    rgb_matrix_set_color(11, 0, 0, 0);
-    rgb_matrix_set_color(16, 0, 0, 0);
-    rgb_matrix_set_color(20, 0, 0, 0);
-    rgb_matrix_set_color(23, 0, 0, 0);
-    rgb_matrix_set_color(26, 0, 0, 0);
-  } else {
-    rgb_matrix_set_color(11, 0, 0, 0);
-    rgb_matrix_set_color(16, 0, 0, 0);
-    rgb_matrix_set_color(20, 0, 0, 0);
-    rgb_matrix_set_color(22, 0, 0, 0);
-    rgb_matrix_set_color(24, 0, 0, 0);
-    rgb_matrix_set_color(26, 0, 0, 0);
-  }
-  return false;
-}
-
-/* OLED stuff */
-#ifdef OLED_ENABLE
-bool oled_task_user(void) { 
-    render_anim();
-    
-    // WPM render
-    oled_set_cursor(1, 0);
-    oled_write_P(PSTR(">"), false);
-    oled_write(get_u8_str(get_current_wpm(), '0'), false);
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_set_cursor(0,14);
-    oled_write_P(led_state.caps_lock ? PSTR("CPSLK") :"    ", true);
-    oled_set_cursor(0,15);
-    oled_write_P(led_state.num_lock ? PSTR("NUMLK") :"    ", true);
-    
-  return false;
-}
-
-/* WPM calculation considerations */
-bool wpm_keycode_user(uint16_t keycode) {
-  if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-      (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) ||
-      (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
-    keycode = keycode & 0xFF;
-  } else if (keycode > 0xFF) {
-    keycode = 0;
-  }
-
-  // Include keys in WPM calculation
-  if ((keycode >= KC_TAB && keycode <= KC_SLASH) || // Tab - Slash (Symbols, Punctuation, Space)
-      (keycode >= KC_KP_SLASH && keycode <= KC_KP_COMMA) ||  // Keypad numbers - Keypad Dot
-      (keycode >= KC_F1 && keycode <= KC_F12)) { // F1 - F12
-    return true;
-  }
-
-  return false;
-}
-#endif
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/readme.md b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/readme.md
deleted file mode 100644
index 5ae1b2280e8..00000000000
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# The Bongo Cat VIA-compatible keymap for the AkemiPad
-
-# Features
-- Audio Click capabilitiy.
-- RGB Matrix Lighting (cycles left-right and up-down).
-- LEDs turn on and off depending on the layout selected on the VIA UI.
-- Encoder Map feature.
-- Bongo Cat animation with WPM counter and Caps Lock/Num Lock indicators.
-
-This keymap is optimized for a numpad and can fit the RGB matrix (with 
-very few animations due to AVR constraints), the encoder map, the audio 
-click feature and the display of the OLED animations. This was possible 
-thanks to the [squeez-o](https://github.com/nullbitsco/squeez-o) compression tool.
-
-![Bongo Cat](https://i.imgur.com/Ty0qKnV.gif)
-
-___
-
-###### *This keymap is an adaptation designed to work with the AkemiPad. The reference keymap used was created for the Nibble keyboard, and you can check it [here](https://github.com/qmk/qmk_firmware/tree/master/keyboards/nullbitsco/nibble/keymaps/oled_bongocat).*
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk
deleted file mode 100644
index d313f3a4f96..00000000000
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no 
-MAGIC_ENABLE = no
-ENCODER_MAP_ENABLE = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/animation_frames.h b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/animation_frames.h
deleted file mode 100644
index 4a97accdde5..00000000000
--- a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/animation_frames.h
+++ /dev/null
@@ -1,405 +0,0 @@
-/* Copyright 2022 adpenrose
- *
- * 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 OLED_ENABLE
-
-// Enable OLED bitmpa compression selectively.
-#define USE_OLED_BITMAP_COMPRESSION
-
-#define NUM_IDLE_FRAMES 5
-#define NUM_TAP_FRAMES 2
-#define NUM_OLED_BYTES 512
-
-#ifdef USE_OLED_BITMAP_COMPRESSION
-
-static const char PROGMEM idle_1_block_map[] = { //IDLE_1 and IDLE_2 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x7f, 0x00, 0xf0, 0xb0, 0xc1, 0x07,
-    0xf0, 0xcf, 0x00, 0x1c, 0x00, 0xb8, 0x8f, 0x3f, 0x00, 0x98, 0xff, 0x00, 0x00, 0xf0, 0x03, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
-};
-
-static const char PROGMEM idle_2_block_map[] = { //IDLE_3 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0xf0, 0xd8, 0xe0, 0x03,
-    0xf0, 0x6f, 0x00, 0x3e, 0x00, 0xf8, 0xc7, 0x7f, 0x00, 0x98, 0x7f, 0x00, 0x00, 0xf0, 0x03, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
-};
-
-static const char PROGMEM idle_3_block_map[] = { //IDLE_4 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x01, 0xf0, 0xb0, 0xc1, 0x07,
-    0xf0, 0xcf, 0x00, 0x7c, 0x00, 0xb8, 0x8f, 0xff, 0x00, 0x98, 0xff, 0x00, 0x00, 0xf0, 0x03, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
-};
-
-static const char PROGMEM idle_4_block_map[] = { //IDLE_5 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0xf0, 0xb0, 0xc1, 0x07,
-    0xf0, 0xcf, 0x00, 0x3c, 0x00, 0xb8, 0x8f, 0x7f, 0x00, 0x98, 0xff, 0x00, 0x00, 0xf0, 0x03, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01   
-};
-
-static const char PROGMEM tap_1_block_map[] = { //TAP_1 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x01, 0x80, 0xff, 0xc1, 0x07,
-    0x00, 0xce, 0x00, 0x7c, 0x00, 0xb8, 0x8d, 0xff, 0x00, 0x98, 0xff, 0x1f, 0xc0, 0xff, 0xff, 0x1f,
-    0x00, 0x3f, 0xfe, 0x01, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01    
-};
-
-static const char PROGMEM tap_2_block_map[] = { //TAP_2 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xde, 0xff, 0xff, 0x01, 0xfc, 0x80, 0xc1, 0x07,
-    0xf1, 0xcf, 0x00, 0x7c, 0x00, 0xb8, 0x8d, 0xff, 0x00, 0xe0, 0xff, 0x00, 0x00, 0x80, 0x3f, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x01   
-};
-
-static const char PROGMEM idle_1_block_list[] = { //IDLE_1 and IDLE_2 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x01, 0x02, 0x02, 0x02,
-    0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x04, 0xf8, 0xe0, 0x18, 0x06, 0x01, 0x78, 0x78,
-    0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x30,
-    0xc8, 0x01, 0x3e, 0xc0, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18, 0x80, 0x40, 0x20, 0x10,
-    0x10, 0x08, 0x07, 0xfc, 0x03, 0x80, 0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x01, 0x01,
-    0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0
-};
-
-static const char PROGMEM idle_2_block_list[] = { //IDLE_3 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x06, 0x04,
-    0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0xe0, 0x18, 0x06, 0x01, 0x78,
-    0x78, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0,
-    0x30, 0xc8, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18, 0x80,
-    0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0xfc, 0x03, 0x83, 0x43, 0x20, 0x10, 0x08, 0x04,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01,
-    0x1e, 0xe0
-};
-
-static const char PROGMEM idle_3_block_list[] = { //IDLE_4 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04,
-    0x04, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0xe0, 0x18, 0x06, 0x01,
-    0x78, 0x78, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c,
-    0xe0, 0x30, 0xc8, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18,
-    0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0xfc, 0x03, 0x80, 0x83, 0x43, 0x20, 0x10,
-    0x08, 0x04, 0x02, 0x01, 0x01, 0x01, 0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f,
-    0xe0, 0x01, 0x1e, 0xe0    
-};
-
-static const char PROGMEM idle_4_block_list[] = { //IDLE_5 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04,
-    0x04, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0xe4, 0x18, 0xe0, 0x18, 0x06, 0x01, 0x78,
-    0x78, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0,
-    0x30, 0xc8, 0x01, 0x1e, 0x60, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 0xc0, 0x18, 0x18, 0x80, 0x40,
-    0x20, 0x10, 0x10, 0x10, 0x08, 0x07, 0xfc, 0x03, 0x80, 0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02,
-    0x01, 0x01, 0x01, 0x01, 0x07, 0x78, 0x80, 0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e,
-    0xe0    
-};
-
-static const char PROGMEM tap_1_block_list[] = { //TAP_1 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x42, 0x44,
-    0x84, 0x88, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x01, 0x0e, 0xf0, 0x20,
-    0x26, 0x26, 0x29, 0x10, 0xd5, 0xce, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x03, 0x1c, 0xe0, 0x30, 0xc8,
-    0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0, 0x03, 0x02, 0x18, 0x18, 0x80, 0x40, 0x20, 0x10,
-    0x10, 0x08, 0x08, 0x04, 0x03, 0xfc, 0x03, 0x80, 0x80, 0x40, 0x20, 0x10, 0x08, 0x84, 0xc2, 0xc1,
-    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfd, 0xfd, 0x01, 0x07, 0x78,
-    0x80, 0x38, 0xf8, 0xf8, 0xf1, 0xe1, 0xc3, 0x83, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x03, 0x03,
-    0x07, 0x07, 0x07, 0x78, 0x81, 0x07, 0x07, 0x03, 0x03, 0x01, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e,
-    0xe0    
-};
-
-static const char PROGMEM tap_2_block_list[] = { //TAP_2 flipped
-    0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c, 0x80, 0x7e, 0xfe, 0xfe, 0xfe, 0x07, 0xf9, 0x01,
-    0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18,
-    0x01, 0x01, 0xe0, 0x18, 0x06, 0x01, 0xc0, 0xc0, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x0f, 0x03, 0x04,
-    0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x30, 0xc8, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x01, 0x3e, 0xc0,
-    0x03, 0x02, 0x18, 0x18, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0x0f, 0x70, 0x80,
-    0x81, 0x01, 0x31, 0x32, 0x8a, 0x24, 0x86, 0x79, 0x07, 0x78, 0x81, 0x01, 0x01, 0x01, 0x01, 0x07,
-    0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0
-};
-
-// idle_1 and idle_2 are identical, so share them and save some space
-const char* idle_frames[NUM_IDLE_FRAMES] = {
-    idle_1_block_list,
-    idle_1_block_list,
-    idle_2_block_list,
-    idle_3_block_list,
-    idle_4_block_list
-};
-
-const char* tap_frames[NUM_TAP_FRAMES] = {
-    tap_1_block_list,
-    tap_2_block_list
-};
-
-// idle_1 and idle_2 are identical, so save some space
-const char* idle_block_map[NUM_IDLE_FRAMES] = {
-    idle_1_block_map,
-    idle_1_block_map,
-    idle_2_block_map,
-    idle_3_block_map,
-    idle_4_block_map
-};
-
-const char* tap_block_map[NUM_TAP_FRAMES] = {
-    tap_1_block_map,
-    tap_2_block_map
-};
-
-#else
-
-static const char PROGMEM idle_frames[NUM_IDLE_FRAMES][NUM_OLED_BYTES] = {
-  { // IDLE 1 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x08, 0x08, 
-    0x08, 0x04, 0x04, 0x02, 0x02, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    },
-    { //IDLE 2 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x08, 0x08, 
-    0x08, 0x04, 0x04, 0x02, 0x02, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    },
-    { //IDLE 3 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x06, 0x04, 0x08, 0x08, 0x04, 
-    0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 0xc0, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x30, 0xc8, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x03, 0xc2, 
-    0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x83, 
-    0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    },
-    { //IDLE 4 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 
-    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    },
-    { //IDLE 5 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 
-    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0xe4, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x60, 0x80, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0xc2, 0xc0, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x10, 0x08, 0x07, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x83, 0x43, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 
-    0x78, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    }
-  };
-static const char PROGMEM tap_frames[NUM_TAP_FRAMES][NUM_OLED_BYTES] = {
-  { //Tap 1 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x42, 0x44, 0x84, 0x88, 0x08, 
-    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0e, 0xf0, 0x20, 0x26, 0x26, 0x29, 0x10, 0xd5, 
-    0xce, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0x02, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x80, 
-    0x80, 0x40, 0x20, 0x10, 0x08, 0x84, 0xc2, 0xc1, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfd, 0xfd, 0x01, 0x07, 
-    0x78, 0x80, 0x38, 0xf8, 0xf8, 0xf1, 0xe1, 0xc3, 0x83, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x00, 0x00, 
-    0x00, 0x07, 0x78, 0x81, 0x07, 0x07, 0x03, 0x03, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  
-    },
-    { //Tap 2 flipped
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, 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, 0x7e, 0xfe, 0xfe, 0xfe, 0x00, 0x07, 0xf9, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 
-    0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x82, 0x64, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x01, 0x01, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x0f, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x04, 0x02, 0x1c, 0xe0, 0x00, 0x00, 0x30, 0xc8, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x20, 0x40, 0x80, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0xc0, 0x00, 0x03, 
-    0x02, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x03, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x70, 0x80, 
-    0x81, 0x01, 0x31, 0x32, 0x8a, 0x24, 0x86, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
-    0x78, 0x81, 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, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
-    },
-  };
-#endif //USE_BITMAP_COMPRESSION
-#endif //OLED_ENABLE
diff --git a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c
deleted file mode 100644
index 900bb3e2651..00000000000
--- a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright 2022 adpenrose
- *
- * 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 "animation_frames.h"
-
-/* Base layout:
- * ,---------------------------------------------------------------------|
- * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0   |-   |=  |Backspace| OLED|
- * |---------------------------------------------------------------      |
- * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  | ]  |   \      OLED|
- * |---------------------------------------------------------------------|
- * |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter     | ENC |
- * |---------------------------------------------------------------------|
- * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift    |Up| M0(3) |
- * |---------------------------------------------------------------------|
- * |Ctrl|GUI |Alt |     Space               |MO(1) |MO(2)|   |Lt |Dn |Rt |
- * `---------------------------------------------------------------------|'
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [0] = LAYOUT(
-          KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
-          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
-          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_MUTE,
-          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,    MO(3),
-          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   MO(1), MO(2),           KC_LEFT, KC_DOWN,  KC_RIGHT
-    ),
-    [1] = 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_DEL,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
-      QK_BOOT,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
-      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
-      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
-    ),
-    [2] = LAYOUT(
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MNXT,
-      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
-      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
-    ),
-    [3] = LAYOUT(
-      _______,    _______,      _______,      _______,      _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,  _______,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,   
-      _______,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
-      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
-      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
-    ),
-};
-
-/* Encoder */
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
-};
-#endif
-
-#ifdef OLED_ENABLE
-#define IDLE_FRAME_DURATION 200 // Idle animation iteration rate in ms
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-
-bool tap_anim        = false;
-bool tap_anim_toggle = false;
-
-
-// Decompress and write a precompressed bitmap frame to the OLED.
-// Documentation and python compression script available at:
-// https://github.com/nullbitsco/squeez-o
-#ifdef USE_OLED_BITMAP_COMPRESSION
-static void oled_write_compressed_P(const char* input_block_map, const char* input_block_list) {
-    uint16_t block_index = 0;
-    for (uint16_t i=0; i<NUM_OLED_BYTES; i++) {
-        uint8_t bit = i%8;
-        uint8_t map_index = i/8;
-        uint8_t _block_map = (uint8_t)pgm_read_byte_near(input_block_map + map_index);
-        uint8_t nonzero_byte = (_block_map & (1 << bit));
-        if (nonzero_byte) {
-            const char data = (const char)pgm_read_byte_near(input_block_list + block_index++);
-            oled_write_raw_byte(data, i);
-        } else {
-            const char data = (const char)0x00;
-            oled_write_raw_byte(data, i);
-        }
-    }
-}
-#endif
-
-static void render_anim(void) {
-    // Idle animation
-    void animation_phase(void) {
-        if (!tap_anim) {
-            current_idle_frame = (current_idle_frame + 1) % NUM_IDLE_FRAMES;
-            uint8_t idx = abs((NUM_IDLE_FRAMES - 1) - current_idle_frame);
-            #ifdef USE_OLED_BITMAP_COMPRESSION
-            oled_write_compressed_P(idle_block_map[idx], idle_frames[idx]);
-            #else
-            oled_write_raw_P(idle_frames[idx], NUM_OLED_BYTES);
-            #endif
-        }
-    }
-
-    // Idle behaviour
-    if (get_current_wpm() != 000) {  // prevent sleep
-        oled_on();
-        if (timer_elapsed32(anim_timer) > IDLE_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {  // Turn off screen when timer threshold elapsed or reset time since last input
-        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > IDLE_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-bool oled_task_user(void) {
-    render_anim();
-    oled_set_cursor(0, 0);
-
-    uint8_t n = get_current_wpm();
-    char wpm_counter[6];
-    wpm_counter[5] = '\0';
-    wpm_counter[4] = '0' + n % 10;
-    wpm_counter[3] = '0' + (n /= 10) % 10;
-    wpm_counter[2] = '0' + n / 10 ;
-    wpm_counter[1] = '0';
-    wpm_counter[0] = '>';
-    oled_write_ln(wpm_counter, false);
-
-    return false;
-}
-#endif
-
-// Animate tap
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    #ifdef OLED_ENABLE
-    // Check if non-mod
-    if ((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) {
-        if (record->event.pressed) {
-            // Display tap frames
-            tap_anim_toggle = !tap_anim_toggle;
-            #ifdef USE_OLED_BITMAP_COMPRESSION
-            oled_write_compressed_P(tap_block_map[tap_anim_toggle], tap_frames[tap_anim_toggle]);
-            #else
-            oled_write_raw_P(tap_frames[tap_anim_toggle], NUM_OLED_BYTES);
-            #endif
-        }
-    }
-    #endif
-
-    return true;
-
-}
diff --git a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/rules.mk b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/rules.mk
deleted file mode 100644
index 24719cefb25..00000000000
--- a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-WPM_ENABLE = yes
-SPACE_CADET_ENABLE = no
-MAGIC_ENABLE = no
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c
deleted file mode 100644
index 7a9e6fb24e6..00000000000
--- a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/* Copyright 2022 adpenrose
- *
- * 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
-
-/* Base layout:
- * ,---------------------------------------------------------------------|
- * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0   |-   |=  |Backspace| OLED|
- * |---------------------------------------------------------------      |
- * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  | ]  |   \      OLED|
- * |---------------------------------------------------------------------|
- * |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter     | ENC |
- * |---------------------------------------------------------------------|
- * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift    |Up| M0(3) |
- * |---------------------------------------------------------------------|
- * |Ctrl|GUI |Alt |     Space               |MO(1) |MO(2)|   |Lt |Dn |Rt |
- * `---------------------------------------------------------------------|'
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [0] = LAYOUT(
-          KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
-          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
-          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_MUTE,
-          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,    MO(3),
-          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   MO(1), MO(2),           KC_LEFT, KC_DOWN,  KC_RIGHT
-    ),
-    [1] = 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_DEL,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
-      QK_BOOT,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
-      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
-      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
-    ),
-    [2] = LAYOUT(
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MNXT,
-      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
-      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
-    ),
-    [3] = LAYOUT(
-      _______,    _______,      _______,      _______,      _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,  _______,
-      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,   
-      _______,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
-      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
-      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
-    ),
-};
-
-/* Encoder */
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [2] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
-};
-#endif
-
-#ifdef OLED_ENABLE
-/*===========================================    OLED CONFIGURATION    ===========================================*/
-bool  oled_horizontal   = true;         // OLED rotation  (true = horizontal,  false = vertical)
-bool  graph_direction   = false;         // Graph movement  (true = right to left,  false = left to right)
-float graph_top_wpm     = 100.0;        // Minimum WPM required to reach the top of the graph
-int   graph_refresh     = 1000;         // In milliseconds, determines the graph-line frequency
-int   icon_med_wpm      = 50;           // WPM required to display the medium snail
-int   icon_fast_wpm     = 72;           // WPM required to display the fast snail
-// Layer names:  Should be exactly 5 characters in length if vertical display, or 6 characters if horizontal
-#define MA_LAYER_NAME     "QWRTY"      // Layer 0 name
-#define L1_LAYER_NAME     "FUNCT"      // Layer 1 name
-#define L2_LAYER_NAME     "NMPAD"      // Layer 2 name
-#define L3_LAYER_NAME     "RANDM"      // Layer 3 name
-// Constants required for the background render, the graph render and the WPM counter. THESE VALUES SHOULD NOT BE CHANGED.
-bool  first_loop  = true;
-int   timer       = 0;
-int   wpm_limit   = 20;
-int   max_wpm     = -1;
-int   wpm_icon    = -1;
-int   graph_lines[65];
-/*================================================================================================================*/
-
-/* Rotation of the OLED: */
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (oled_horizontal) {
-        return OLED_ROTATION_180;
-    } else {
-        return OLED_ROTATION_270;
-    }
-}
-
-// Toggles pixel on/off, converts horizontal coordinates to vertical equivalent if necessary
-static void write_pixel(int x, int y, bool onoff) {
-    if (oled_horizontal) {
-        oled_write_pixel(x, y, onoff);
-    } else {
-        oled_write_pixel(y, 127 - x, onoff);
-    }
-}
-
-/*======================================    BASE KEYBOARD MATRIX IMAGES    =======================================*/
-// Draw static background image to OLED (keyboard with no bottom row)
-static void render_background(void) {
-    if (oled_horizontal) {
-        static const char PROGMEM oled_keymap_horizontal[] = {
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x84, 0x80, 0x80, 0x80, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 
-	    0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 
-	    0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 
-	    0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 
-	    0x80, 0x04, 0x04, 0x04, 0x04, 0x84, 0x84, 0x84, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 
-	    0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 
-	    0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 
-	    0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
-	    0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x42, 0x42, 0x02, 0x02, 0x02, 0x02, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x42, 0x40, 0x00, 0x00, 
-	    0x00, 0x02, 0x40, 0x40, 0x40, 0x40, 0x42, 0x40, 0x40, 0x40, 0x40, 0x42, 0x40, 0x40, 0x40, 0x40, 
-	    0x42, 0x40, 0x40, 0x40, 0x40, 0x42, 0x40, 0x40, 0x40, 0x40, 0x42, 0x40, 0x40, 0x40, 0x40, 0x42, 
-	    0x40, 0x40, 0x40, 0x00, 0x02, 0x00, 0x00, 0x40, 0x40, 0x02, 0x00, 0x00, 0x00, 0x40, 0x42, 0x02, 
-	    0x02, 0x02, 0x02, 0x42, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00    
-	};
-        oled_write_raw_P(oled_keymap_horizontal, sizeof(oled_keymap_horizontal));
-    } else {
-        static const char PROGMEM oled_keymap_vertical[] = {
-	    0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 
-	    0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 
-	    0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 
-	    0x00, 0x43, 0x00, 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 
-	    0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0xe1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 
-	    0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
-	    0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 
-	    0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 
-	    0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 
-	    0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 
-	    0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00    
-	};
-        oled_write_raw_P(oled_keymap_vertical, sizeof(oled_keymap_vertical));
-    }
-}
-/*================================================================================================================*/
-
-
-/*===============================    PIXEL'S COORDINATES FOR EACH PHYSICAL KEY    ================================*/
-// Location of OLED keyboard's top left pixel, relative to the display
-static const int keymap_template[2] = {46, 0};
-// Location of key highlights top left pixels, relative to keymap_template  {X, Y, Key length in px}
-static int keymap_coords[MATRIX_ROWS][MATRIX_COLS][3] = {
-    { {0, 0, 1}, {5, 0, 1}, {10, 0, 1}, {15, 0, 1}, {20, 0, 1}, {25, 0, 1}, {30, 0, 1} },
-    { {0, 5, 5}, {9, 5, 1}, {14, 5, 1}, {19, 5, 1}, {24, 5, 1}, {29, 5, 1}, {34, 5, 1} },
-    { {0, 10, 6}, {10, 10, 1}, {15, 10, 1}, {20, 10, 1}, {25, 10, 1}, {30, 10, 1}, {35, 10, 1} },
-    { {0, 15, 8}, {12, 15, 1}, {17, 15, 1}, {22, 15, 1}, {27, 15, 1}, {32, 15, 1}, {37, 15, 1} },
-    { {0, 20, 2}, {6, 20, 2}, {12, 20, 2}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {18, 20, 33} },
-    { {35, 0, 1}, {40, 0, 1}, {45, 0, 1}, {50, 0, 1}, {55, 0, 1}, {60, 0, 1}, {65, 0, 8} },
-    { {39, 5, 1}, {44, 5, 1}, {49, 5, 1}, {54, 5, 1}, {59, 5, 1}, {64, 5, 1}, {69, 5, 4} },
-    { {40, 10, 1}, {45, 10, 1}, {50, 10, 1}, {55, 10, 1}, {60, 10, 1}, {65, 10, 8}, {77, 10, 1} },
-    { {42, 15, 1}, {47, 15, 1}, {52, 15, 1}, {57, 15, 1}, {62, 15, 6}, {72, 15, 1}, {77, 15, 1} },
-    { {0, 0, 0}, {0, 0, 0}, {55, 20, 2}, {61, 20, 2}, {67, 20, 1}, {72, 20, 1}, {77, 20, 1} },
-    };
-
-// Toggles pixels surrounding key
-static void render_keymap(uint8_t key_row, uint8_t key_col, bool onoff) {
-    int length = keymap_coords[key_row][key_col][2] + 4;
-    int left   = keymap_coords[key_row][key_col][0] + keymap_template[0];
-    int top    = keymap_coords[key_row][key_col][1] + keymap_template[1];
-    int right  = left + length - 1;
-    int bottom = top + 4;
-
-    // Draw top and bottom walls (horizontal for <length>px)
-    for (int x = 0; x < length; x++) {
-        write_pixel(left + x, top, onoff);
-        write_pixel(left + x, bottom, onoff);
-    }
-    // Draw left and right walls (vertical for 5px)
-    for (int y = 0; y < 5; y++) {
-        write_pixel(left,  top + y, onoff);
-        write_pixel(right, top + y, onoff);
-    }
-}
-/*================================================================================================================*/
-
-/*=============================================    LAYER'S NAME    ===============================================*/
-// Write active layer name
-static void render_layer_state(void) {
-  if (oled_horizontal) {
-    oled_set_cursor(0, 0);
-  } else {
-    oled_set_cursor(0, 15);
-  }
-  switch (get_highest_layer(layer_state)) {
-  case 0:
-      oled_write_P(PSTR(MA_LAYER_NAME), false);
-      break;
-  case 1:
-      oled_write_P(PSTR(L1_LAYER_NAME), false);
-      break;
-  case 2:
-      oled_write_P(PSTR(L2_LAYER_NAME), false);
-      break;
-  case 3:
-      oled_write_P(PSTR(L3_LAYER_NAME), false);
-      break;
-  default:
-      oled_write("ERROR", false);
-      break;
-  }
-}
-/*================================================================================================================*/
-
-/*====================================    WPM COUNTERS (CURRENT AND MAX)    ======================================*/    
-// Update WPM counters
-static void render_wpm_counters(int current_wpm) {
-    int cursorposition_cur = 2;
-    int cursorposition_max = 1;
-    if (oled_horizontal == false) {
-        cursorposition_cur = 13;
-        cursorposition_max = 14;
-    }
-
-    oled_set_cursor(0, cursorposition_cur);
-    oled_write(get_u8_str(get_current_wpm(), '0'), false);
-
-    char wpm_counter[4];
-    wpm_counter[3] = '\0';
-    wpm_counter[2] = '0' + current_wpm % 10;
-    wpm_counter[1] = '0' + (current_wpm / 10) % 10;
-    wpm_counter[0] = '0' + (current_wpm / 100) % 10;
-    
-    if (current_wpm > max_wpm) {
-        max_wpm = current_wpm;
-        wpm_limit = max_wpm + 20;
-        oled_set_cursor(0, cursorposition_max);
-        oled_write(wpm_counter, false);
-    }
-}
-/*================================================================================================================*/
-
-/*==============================================    WPM GRAPH    =================================================*/ 
-// Update WPM graph
-static void render_wpm_graph(int current_wpm) {
-    int line_height = ((current_wpm / graph_top_wpm) * 7);
-    if (line_height > 7) {
-        line_height = 7;
-    }
-    // Count graph line pixels, return if nothing to draw
-    int pixel_count = line_height;
-    for (int i = 0; i < 64; i++) {
-        pixel_count += graph_lines[i];
-    }
-    if (pixel_count == 0) {
-        return;
-    }
-    // Shift array elements left or right depending on graph_direction, append new graph line
-    if (graph_direction) {
-        for (int i = 0; i < 64; i++) {
-            graph_lines[i] = graph_lines[i + 1];
-        }
-        graph_lines[64] = line_height;
-    } else {
-        for (int i = 64; i > 0; i--) {
-            graph_lines[i] = graph_lines[i - 1];
-        }
-        graph_lines[0] = line_height;
-    }
-    // Draw all graph lines (left to right, bottom to top)
-    int draw_count, arrpos;
-    for (int x = 1; x <= 127; x += 2) {
-        arrpos = x / 2;
-        draw_count = graph_lines[arrpos];
-        for (int y = 31; y >= 25; y--) {
-            if (draw_count > 0) {
-                write_pixel(x, y, true);
-                draw_count--;
-            } else {
-                write_pixel(x, y, false);
-            }
-        }
-    }
-}
-/*================================================================================================================*/
-
-/*========================================    WPM BASED SNAIL ICON    ============================================*/ 
-// Update WPM snail icon
-static void render_wpm_icon(int current_wpm) {
-    // wpm_icon is used to prevent unnecessary redraw
-    if ((current_wpm < icon_med_wpm) && (wpm_icon != 0)) {
-        wpm_icon = 0;
-    } else if ((current_wpm >= icon_med_wpm) && (current_wpm < icon_fast_wpm) && (wpm_icon != 1)) {
-        wpm_icon = 1;
-    } else if ((current_wpm >= icon_fast_wpm) && (wpm_icon != 2)) {
-        wpm_icon = 2;
-    } else {
-        return;
-    }
-    static const char PROGMEM snails[][2][24] = {
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0xA0, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x50, 0x88, 0x04, 0x00, 0x00},
-         {0x40, 0x60, 0x50, 0x4E, 0x51, 0x64, 0x4A, 0x51, 0x54, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x40, 0x30, 0x09, 0x04, 0x02, 0x01, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x04, 0x98, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00},
-         {0x60, 0x50, 0x54, 0x4A, 0x51, 0x64, 0x4A, 0x51, 0x55, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x21, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x10, 0x10, 0x10, 0x20, 0x40, 0x40, 0xC0, 0x80, 0x80, 0x00, 0x00, 0x00},
-         {0x60, 0x58, 0x54, 0x62, 0x49, 0x54, 0x52, 0x51, 0x55, 0x49, 0x62, 0x52, 0x4D, 0x45, 0x46, 0x22, 0x21, 0x11, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00}}
-    };
-    if (oled_horizontal) {
-        oled_set_cursor(3, 1);
-        oled_write_raw_P(snails[wpm_icon][0], sizeof(snails[wpm_icon][0]));
-        oled_set_cursor(3, 2);
-        oled_write_raw_P(snails[wpm_icon][1], sizeof(snails[wpm_icon][1]));
-    } else {
-        oled_set_cursor(0, 11);
-        oled_write_raw_P(snails[wpm_icon][0], sizeof(snails[wpm_icon][0]));
-        oled_set_cursor(0, 12);
-        oled_write_raw_P(snails[wpm_icon][1], sizeof(snails[wpm_icon][1]));
-    }
-}
-/*================================================================================================================*/
-
-/* Function that renders stuff on the oled */
-bool oled_task_user(void) {
-    // Draw OLED keyboard, preventing redraw.
-    if (first_loop) {
-	render_background();
-	first_loop = false; 
-    }
-
-    // Get current WPM
-    int current_wpm = get_current_wpm(); 
-    // Write active layer name to display
-    render_layer_state();
-    // Update WPM counters
-    render_wpm_counters(current_wpm);
-    // Update WPM snail icon
-    render_wpm_icon(current_wpm);
-    // Update WPM graph every graph_refresh milliseconds
-    if (timer_elapsed(timer) > graph_refresh) {
-        render_wpm_graph(current_wpm);
-        timer = timer_read();
-    }
-
-    return false;
-}
-#endif
-
-// Called by QMK during key processing
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    #ifdef OLED_ENABLE
-    // Toggle pixels surrounding key
-    render_keymap(record->event.key.row, record->event.key.col, record->event.pressed);
-    #endif
-
-    return true;
-}
diff --git a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/readme.md b/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/readme.md
deleted file mode 100644
index eb7b7577af0..00000000000
--- a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/readme.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# SnailMap-ported keymap for the Kintsugi
-
-## Features
-
-- Keyboard matrix that highlights whichever key is currently pressed.
-- Little cute snail icon that changes acording to the current WPM.
-- Counters for current and max WPM values.
-- Active layer name.
-- Mini WPM graph.
-
-## How to customize
-
-The `OLED configuration variables` can be used to easily customize the display:
-
-```
-oled_horizontal     - Horizontal or vertical orientation
-graph_direction     - Graph movement direction
-graph_refresh       - Frequency of graph lines
-graph_top_wpm       - WPM required to reach the top of the graph
-icon_med_wpm        - WPM required to display the medium snail
-icon_fast_wpm       - WPM required to display the fast snail
-MA_LAYER_NAME       - Layer 0 display name
-L1_LAYER_NAME       - Layer 1 display name
-L2_LAYER_NAME       - Layer 2 display name
-L3_LAYER_NAME       - Layer 3 display name
-```
-
-___
-
-###### *This keymap is an adaptation designed to work with the Kintsugi keyboard. The original SnailMap keymap was created by [dogspace](https://github.com/dogspace) for the Nibble keyboard, and you can check it [here](https://github.com/qmk/qmk_firmware/tree/master/keyboards/nullbitsco/nibble/keymaps/snailmap).*
\ No newline at end of file
diff --git a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/rules.mk b/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/rules.mk
deleted file mode 100644
index 24719cefb25..00000000000
--- a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-WPM_ENABLE = yes
-SPACE_CADET_ENABLE = no
-MAGIC_ENABLE = no
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/mine/config.h b/keyboards/adpenrose/mine/config.h
index cc05ddf8f17..2ddf1c4393e 100644
--- a/keyboards/adpenrose/mine/config.h
+++ b/keyboards/adpenrose/mine/config.h
@@ -5,5 +5,3 @@
 
 /* Solenoid pin */
 #define SOLENOID_PIN A7
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json
index 5010485602d..79aceaa3d13 100644
--- a/keyboards/adpenrose/mine/info.json
+++ b/keyboards/adpenrose/mine/info.json
@@ -15,6 +15,9 @@
     "build": {
         "lto": true
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "encoder": {
         "rotary": [{ "pin_a": "C4", "pin_b": "C3" }]
     },
diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c
deleted file mode 100644
index cd9e1768eb6..00000000000
--- a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Arturo Avila (@Arturo Avila)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-                                                                                                                                                                                              HF_TOGG,
-        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_HOME,   KC_END,         KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
-        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_P7,  KC_P8,   KC_P9,   KC_PPLS,
-        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_P4,  KC_P5,   KC_P6,
-        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_P1,  KC_P2,   KC_P3,   KC_PENT,
-        KC_LSFT,   MO(1), 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,         KC_P0,   KC_PDOT, 
-        KC_LCTL,   KC_LGUI,                     KC_LALT, KC_SPC,               KC_SPC,  KC_RALT, KC_RGUI,  KC_RCTL,                                KC_LEFT, KC_DOWN,  KC_RIGHT  
-    ),
-
-    [1] = LAYOUT_all(
-                                                                                                                                                                                                                             KC_TRNS,
-        QK_BOOT,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_PSCR,  KC_DEL,               KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, 
-        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,                        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,
-        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,             KC_TRNS,   KC_TRNS, 
-        KC_TRNS,   KC_TRNS,                           KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,                                    KC_TRNS, KC_TRNS,  KC_TRNS 
-    )
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
-};
-#endif
-
-#ifdef HAPTIC_ENABLE
-bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_VOLU ... KC_VOLD:
-            return false;
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk
deleted file mode 100644
index 345c10cdd48..00000000000
--- a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = yes
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
-ENCODER_MAP_ENABLE = yes	# Encoder mapping functionality
\ No newline at end of file
diff --git a/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c b/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c
deleted file mode 100644
index 0d69e305d1c..00000000000
--- a/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2022 Arturo Avila (@ADPenrose)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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_BSPC,
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
-        KC_LSFT, MO(2), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT,
-        KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-    [1] = LAYOUT(
-        KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, HF_TOGG,
-        KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_SLSH,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [2] = LAYOUT(
-        KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [3] = 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/adpenrose/shisaku/keymaps/solenoid/readme.md b/keyboards/adpenrose/shisaku/keymaps/solenoid/readme.md
deleted file mode 100644
index e9d4bb6af9f..00000000000
--- a/keyboards/adpenrose/shisaku/keymaps/solenoid/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Solenoid keymap for Shisaku
diff --git a/keyboards/adpenrose/shisaku/keymaps/solenoid/rules.mk b/keyboards/adpenrose/shisaku/keymaps/solenoid/rules.mk
deleted file mode 100644
index 6bec144827b..00000000000
--- a/keyboards/adpenrose/shisaku/keymaps/solenoid/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = solenoid
\ No newline at end of file
diff --git a/keyboards/aeboards/ext65/rev2/rev2.c b/keyboards/aeboards/ext65/rev2/rev2.c
index 6fe2d469dc9..934553abcfe 100644
--- a/keyboards/aeboards/ext65/rev2/rev2.c
+++ b/keyboards/aeboards/ext65/rev2/rev2.c
@@ -17,16 +17,18 @@
 #include "quantum.h"
 
 // Tested and verified working on ext65rev2
-void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
+void matrix_io_delay(void) {
+    __asm__ volatile("nop\nnop\nnop\n");
+}
 
 #ifdef OLED_ENABLE
 void board_init(void) {
-  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
-  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+    SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+    SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
 }
 
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
-    return OLED_ROTATION_90;  // rotates the display 90 degrees
+    return OLED_ROTATION_90; // rotates the display 90 degrees
 }
 
 void render_layer_state(void) {
@@ -55,26 +57,31 @@ void render_mod_status(uint8_t modifiers) {
 }
 
 bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
     render_layer_state();
     render_keylock_status(host_keyboard_led_state());
-    render_mod_status(get_mods()|get_oneshot_mods());
-    return false;
+    render_mod_status(get_mods() | get_oneshot_mods());
+    return true;
 }
 
 #else
 
-void keyboard_pre_init_user(void) {
-  // Call the keyboard pre init code.
-  // Set our LED pins as output
-  setPinOutput(B4);
-  setPinOutput(B3);
-  setPinOutput(A15);
-  setPinOutput(A14);
+void keyboard_pre_init_kb(void) {
+    // Call the keyboard pre init code.
+    // Set our LED pins as output
+    setPinOutput(B4);
+    setPinOutput(B3);
+    setPinOutput(A15);
+    setPinOutput(A14);
+
+    keyboard_pre_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
     bool res = led_update_user(led_state);
-    if(res) {
+    if (res) {
         writePin(B4, led_state.num_lock);
         writePin(B3, led_state.caps_lock);
         writePin(A15, led_state.scroll_lock);
@@ -84,14 +91,13 @@ bool led_update_kb(led_t led_state) {
 
 layer_state_t layer_state_set_kb(layer_state_t state) {
     switch (get_highest_layer(state)) {
-      case 1:
-        writePinHigh(A14);
-        break;
-      default: //  for any other layers, or the default layer
-        writePinLow(A14);
-        break;
-      }
+        case 1:
+            writePinHigh(A14);
+            break;
+        default: //  for any other layers, or the default layer
+            writePinLow(A14);
+            break;
+    }
     return layer_state_set_user(state);
 }
 #endif
-
diff --git a/keyboards/aeboards/satellite/rev1/config.h b/keyboards/aeboards/satellite/rev1/config.h
index 429bc2af546..06c3464fe4f 100644
--- a/keyboards/aeboards/satellite/rev1/config.h
+++ b/keyboards/aeboards/satellite/rev1/config.h
@@ -20,62 +20,4 @@
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
 
-#define DRIVER_1_LED_TOTAL 36
-#define DRIVER_2_LED_TOTAL 36
-#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#define RGB_MATRIX_LED_COUNT IS31FL3731_LED_COUNT
-
-#define RGB_MATRIX_DEFAULT_VAL 80
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-
-// 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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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 IS31FL3731_LED_COUNT 72
diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/info.json
index 4669fca3193..68256ed8699 100644
--- a/keyboards/aeboards/satellite/rev1/info.json
+++ b/keyboards/aeboards/satellite/rev1/info.json
@@ -9,7 +9,57 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "custom"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all",
+            "val": 80
+        },
+        "driver": "custom",
+        "sleep": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/aeboards/satellite/rev1/rev1.c b/keyboards/aeboards/satellite/rev1/rev1.c
index 6727894e067..28ac5ef3022 100644
--- a/keyboards/aeboards/satellite/rev1/rev1.c
+++ b/keyboards/aeboards/satellite/rev1/rev1.c
@@ -146,8 +146,8 @@ led_config_t g_led_config = { {
 static void init(void) {
     i2c_init();
 
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_1);
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_2);
+    is31fl3731_init(0);
+    is31fl3731_init(1);
 
     for (int index = 0; index < IS31FL3731_LED_COUNT; index++) {
         bool enabled = !(   ( index == 18+5) || //B5
@@ -157,8 +157,8 @@ static void init(void) {
         is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
     }
 
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_1, 0);
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_2, 1);
+    is31fl3731_update_led_control_registers(0);
+    is31fl3731_update_led_control_registers(1);
 }
 
 const rgb_matrix_driver_t rgb_matrix_driver = {
diff --git a/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c b/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c
deleted file mode 100644
index 9732230b05b..00000000000
--- a/keyboards/afternoonlabs/breeze/keymaps/eithanshavit/keymap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 {
-    _MAIN,
-    _FUNCTION,
-    _NUMPAD,
-};
-
-#define FUNCTION MO(_FUNCTION)
-#define NUMPAD MO(_NUMPAD)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_NUMPAD] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, KC_PEQL, KC_PSLS, KC_PAST, KC_PMNS, _______,  LCA(KC_D),LCA(KC_F),LCA(KC_G),
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,  LCA(KC_E),LCA(KC_ENT),LCA(KC_T),
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,           _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,  KC_MUTE, KC_VOLD, KC_VOLU,
-  //└────────┴────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
-                                _______, _______, _______, _______,          _______, _______, KC_P0,   KC_PDOT
-  //                           └────────┴────────┴────────┴────────┘        └────────┴────────┴────────┴────────┘
-  ),
-
-
-  [_FUNCTION] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
-     QK_BOOT, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,  LCA(KC_D),LCA(KC_F),LCA(KC_G),
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, KC_UP,   _______, _______, _______,  LCA(KC_E),LCA(KC_ENT),LCA(KC_T),
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______,_______,           _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,  KC_MUTE, KC_VOLD, KC_VOLU,
-  //└────────┴────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
-                                _______, _______, _______, _______,          _______, _______, _______, _______
-  //                           └────────┴────────┴────────┴────────┘        └────────┴────────┴────────┴────────┘
-  ),
-
-  [_MAIN] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,  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_DEL,   KC_LBRC, KC_RBRC, KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     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_UP,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
-     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_LEFT, KC_DOWN, KC_RIGHT,
-  //└────────┴────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
-                                NUMPAD,  KC_LALT, KC_LCMD, KC_SPC,           KC_ENT,  FUNCTION,LCMD(KC_GRV),LALT(KC_SPC)
-  //                           └────────┴────────┴────────┴────────┘        └────────┴────────┴────────┴────────┘
-  )
-
-};
diff --git a/keyboards/ah/haven60/haven60.c b/keyboards/ah/haven60/haven60.c
new file mode 100644
index 00000000000..dce612f4e4d
--- /dev/null
+++ b/keyboards/ah/haven60/haven60.c
@@ -0,0 +1,46 @@
+/* Copyright 2023 CMM.S Freather
+ *
+ * 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 "quantum.h"
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 13, HSV_WHITE}
+);
+
+const rgblight_segment_t PROGMEM my_capsoff_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_BLACK}
+);
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer,
+    my_capsoff_layer
+);
+
+
+void keyboard_post_init_kb(void){
+    rgblight_layers = my_rgb_layers;
+    keyboard_post_init_user();
+}
+
+bool led_update_kb(led_t led_state){
+    bool res = led_update_user(led_state);
+    if (res) {
+        rgblight_set_layer_state(0, led_state.caps_lock);
+        rgblight_set_layer_state(1, !led_state.caps_lock);
+    }
+    return res;
+}
diff --git a/keyboards/ah/haven60/info.json b/keyboards/ah/haven60/info.json
new file mode 100644
index 00000000000..a9c2afb0b37
--- /dev/null
+++ b/keyboards/ah/haven60/info.json
@@ -0,0 +1,699 @@
+{
+    "manufacturer": "Freather",
+    "keyboard_name": "Atelier_Haven Haven60",
+    "maintainer": "Freather",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "D4", "D6", "D7", "B4", "B5", "B6", "D5", "D3", "D2", "D1", "D0", "B1", "B0"],
+        "rows": ["F0", "E6", "C6", "F4", "F1"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://keyspensory.store/products",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4660",
+        "vid": "0x4446"
+    },
+    "ws2812": {
+        "pin": "F5"
+    },
+    "rgblight": {
+        "led_count": 13,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "sleep": true,
+        "max_brightness": 125,
+        "layers": {
+            "enabled": true
+        },
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "community_layouts": ["60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ah/haven60/keymaps/default/keymap.c b/keyboards/ah/haven60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..8909239a2c8
--- /dev/null
+++ b/keyboards/ah/haven60/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [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_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_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_NUBS, 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(1),   KC_RCTL
+    ),
+    [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_UP,   _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    )
+};
diff --git a/keyboards/ah/haven60/keymaps/via/keymap.c b/keyboards/ah/haven60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..8909239a2c8
--- /dev/null
+++ b/keyboards/ah/haven60/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [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_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_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_NUBS, 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(1),   KC_RCTL
+    ),
+    [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_UP,   _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    )
+};
diff --git a/keyboards/0xcb/1337/keymaps/conor/rules.mk b/keyboards/ah/haven60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/0xcb/1337/keymaps/conor/rules.mk
rename to keyboards/ah/haven60/keymaps/via/rules.mk
diff --git a/keyboards/ah/haven60/readme.md b/keyboards/ah/haven60/readme.md
new file mode 100644
index 00000000000..c529ec1a73a
--- /dev/null
+++ b/keyboards/ah/haven60/readme.md
@@ -0,0 +1,28 @@
+# haven60
+
+![haven60](https://i.imgur.com/Uja750Oh.png)
+
+Haven60 PCB for Atelier Haven Haven60% keyboard
+both hotswap and solder pcbs use same firmware
+
+* Keyboard Maintainer: [Freather](https://github.com/Freather)
+* Hardware Supported: atmega32u4-mu
+* Hardware Availability: keyspensory.store
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ah/haven60:default
+
+Flashing example for this keyboard:
+
+    make ah/haven60: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 `QK_BOOT` if it is available
diff --git a/keyboards/macro3/rules.mk b/keyboards/ah/haven60/rules.mk
similarity index 100%
rename from keyboards/macro3/rules.mk
rename to keyboards/ah/haven60/rules.mk
diff --git a/keyboards/ai03/duet/keymaps/coordinate/keymap.c b/keyboards/ai03/duet/keymaps/coordinate/keymap.c
deleted file mode 100644
index 821c0295343..00000000000
--- a/keyboards/ai03/duet/keymaps/coordinate/keymap.c
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2023 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-
-/* Coordinate keymap - designed to send a string in the format [a-r][0-5] corresponding to the matrix position, where a0 is the top left and r5 is bottom right */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT(
-        KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,
-        KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,
-        KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,
-        KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,
-        KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,
-        KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0,    KC_0
-    ),
-};
-
-
-/* String generation */
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    if (record->event.pressed) {
-        char col = record->event.key.col + 'a';
-        char row = record->event.key.row + '0';
-        char result[2] = {col, row};
-        send_string(result);
-    }
-
-    return false;
-}
diff --git a/keyboards/ai03/duet/keymaps/coordinate/readme.md b/keyboards/ai03/duet/keymaps/coordinate/readme.md
deleted file mode 100644
index de8245875d1..00000000000
--- a/keyboards/ai03/duet/keymaps/coordinate/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# The coordinate keymap for Duet
-
-An example keymap which sends a string `[a-r][0-5]` corresponding to the column-row position of the pressed switch.  
-Possibly useful for pairing to a kiosk device provided the display application can parse and handle this format.  
diff --git a/keyboards/ai03/equinox/keymaps/crd/keymap.c b/keyboards/ai03/equinox/keymaps/crd/keymap.c
deleted file mode 100644
index a3203cd3128..00000000000
--- a/keyboards/ai03/equinox/keymaps/crd/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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 KC_CTES RCTL_T(KC_ESC)
-#define KC_BSM1 LT(1, KC_BSPC)
-#define KC_SPM1 LT(1, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all( /* Base */
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_GRV, 
-    KC_CTES, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    XXXXXXX, KC_ENT, 
-    KC_LSFT, KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, 
-    KC_LCTL, XXXXXXX, KC_RGUI,          KC_BSM1,          MO(2),            KC_SPM1, KC_RALT, XXXXXXX, KC_RCTL
-  ),
-  [1] = LAYOUT_all( /* Extra Keys */
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, 
-    _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, _______, 
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, 
-    _______, XXXXXXX, _______,          _______,          _______,          _______, _______, _______, _______
-  ),
-  [2] = LAYOUT_all( /* Num and FN */
-    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_MINS, KC_EQL,  _______, 
-    _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_SCLN, KC_QUOT, XXXXXXX, _______, 
-    _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, 
-    _______, XXXXXXX, _______,          _______,          _______,          _______, _______, XXXXXXX, _______
-  )
-};
diff --git a/keyboards/ai03/equinox/keymaps/crd/readme.md b/keyboards/ai03/equinox/keymaps/crd/readme.md
deleted file mode 100644
index c1f50e5ebfb..00000000000
--- a/keyboards/ai03/equinox/keymaps/crd/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# crd's keymap for equinox
-
-[KLE](http://www.keyboard-layout-editor.com/#/gists/0be9c4a916dba80ebb5533cd00c5304c)
diff --git a/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c b/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c
deleted file mode 100644
index 11c860af7fc..00000000000
--- a/keyboards/ai03/lunar/keymaps/muzfuz/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Helpful defines
-#define ESC_CTL     CTL_T(KC_ESCAPE)            // Tap for Esc, hold for Ctrl
-#define FL_KCF LT(1,KC_F)
-#define FL_KCJ LT(1,KC_J)
-#define CMD_ENT LGUI(LSFT(KC_ENT))
-
-enum custom_keycodes {
-  HASHRKT = SAFE_RANGE,
-  CLNEQLS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT( /* Base */
-		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_BSLS, KC_BSLS, LGUI(KC_C),
-		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_BSPC, LGUI(KC_V),
-		ESC_CTL,          KC_A,    KC_S,    KC_D,    FL_KCF,  KC_G,    KC_H,    FL_KCJ,  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_LSFT,          KC_UP,   KC_PGDN,
-		CMD_ENT, KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,           KC_SPC,                    MO(2),   KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-	[1] = LAYOUT( /* FL */
-		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_DEL,  KC_VOLU,
-		_______,          HASHRKT, _______, KC_LCBR, KC_RCBR, _______, _______, KC_UNDS, KC_PLUS, KC_PIPE,  _______, _______, _______, _______, KC_VOLD,
-		_______,          CLNEQLS, _______, KC_LBRC, KC_RBRC, _______, _______, KC_MINS, KC_EQL,  KC_BSLS,  KC_TILD, KC_GRV,           _______, KC_HOME,
-		_______,          _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,          _______, KC_END,
-		_______, _______, _______,          _______,          _______,          _______,                    _______, _______, _______, _______, _______
-	),
-	[2] = LAYOUT( /* FN */
-		QK_BOOT, 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_DEL,  _______,
-		KC_CAPS,          _______, KC_UP,   _______, _______, _______, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
-		_______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_VOLD, KC_VOLU, KC_P4,   KC_P5,   KC_P6,   _______, _______,          _______, _______,
-		_______,          KC_RCTL, KC_RGUI, KC_RALT, _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______, _______,          KC_PGUP, _______,
-		_______, _______, _______,          _______,          _______,          _______,                   _______, _______, KC_HOME, KC_PGDN, KC_END
-	)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case HASHRKT:
-      if (record->event.pressed) {
-        SEND_STRING("=>");
-      }
-      break;
-    case CLNEQLS:
-      if (record->event.pressed) {
-        SEND_STRING(":=");
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/ai03/lunar/keymaps/muzfuz/readme.md b/keyboards/ai03/lunar/keymaps/muzfuz/readme.md
deleted file mode 100644
index f0fef092352..00000000000
--- a/keyboards/ai03/lunar/keymaps/muzfuz/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# muzfuz's keymap for Lunar
-
-```shell
-make ai03/lunar:muzfuz:dfu
-```
diff --git a/keyboards/ai03/polaris/keymaps/mekberg/config.h b/keyboards/ai03/polaris/keymaps/mekberg/config.h
deleted file mode 100644
index ef8caf87094..00000000000
--- a/keyboards/ai03/polaris/keymaps/mekberg/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-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 some configuration for modtap behavior
-// #define TAPPING_TERM 150
-#define PERMISSIVE_HOLD
diff --git a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c b/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
deleted file mode 100644
index 6a15c93fa13..00000000000
--- a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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,
-    _NAV,
-    _FN
-};
-
-#define MY_LOCK C(LCMD(KC_L))      // Mac: Custom lock hotkey in BTT (when Alt/Command have been swapped in macOS)
-
-/*
-KBD6x ANSI physical layout
-1u == 8chars
-    ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-    |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-    |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-    |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
-    |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-    |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
-    |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-    |       2,25u      |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-    └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-                 |        |   1,25u    |                                                        |   1,25u    |        |
-                 └────────────────────────────────────────────────────────────────────────────────────────────────────┘
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_60_tsangan_hhkb(
-//  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-//  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-      QK_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_NUBS, KC_RBRC,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
-  LT(_NAV,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_NUHS,   KC_BSPC,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
-         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,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-           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(_FN),
-//  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-//                   |        |   1,25u    |                                                        |   1,25u    |        |
-         XXXXXXX,     KC_LGUI,   KC_LALT,                         KC_SPACE,                            KC_RALT,   KC_RGUI,      XXXXXXX
-//                   └────────────────────────────────────────────────────────────────────────────────────────────────────┘
-  ),
-  [_NAV] = LAYOUT_60_tsangan_hhkb(
-//  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-//  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_INS, KC_BSPC,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
-      _______,    _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_UP,   KC_PGUP, KC_HOME, _______, _______,    KC_DEL,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
-       _______,     _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,       _______,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-          _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,     _______,
-//  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-//                   |        |   1,25u    |                                                        |   1,25u    |        |
-         XXXXXXX,     _______,  _______,                         _______,                             _______,    _______,      XXXXXXX
-//                   └────────────────────────────────────────────────────────────────────────────────────────────────────┘
-  ),
-  [_FN] = LAYOUT_60_tsangan_hhkb(
-//  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-//  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
-      _______,   _______,  _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______,   _______,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
-        KC_RCTL,    KC_VOLD, KC_VOLU, KC_MUTE, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______,       MY_LOCK,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-          _______,      BL_TOGG,  BL_UP,   BL_DOWN,BL_STEP, _______, _______, _______, KC_MRWD, KC_MFFD, _______,    _______,     _______,
-//  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-//                   |        |   1,25u    |                                                        |   1,25u    |        |
-         XXXXXXX,     _______,  _______,                          KC_MPLY,                            _______,    _______,      XXXXXXX
-//                   └────────────────────────────────────────────────────────────────────────────────────────────────────┘
-  ),
-};
diff --git a/keyboards/ai03/polaris/keymaps/mekberg/readme.md b/keyboards/ai03/polaris/keymaps/mekberg/readme.md
deleted file mode 100644
index b9ae9642f52..00000000000
--- a/keyboards/ai03/polaris/keymaps/mekberg/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# General Information
-
-This is more or less a HHKB base layout, but with completely different Fn layers. I don't use most of the HHKB secondary key positions because, honestly, they make no sense to me at all.
-
-Fn key layer is focused mostly on keyboard firmware features (like RGB) as well as some of the necessary alternate functions. It also hold media controls, F-keys and Reset.
-
-Left Tab-Hold layer is focused on nav cluster functionality, and turns Backspace into Delete (and moves Backspace up into the top right 1u position).
-
-
-# Build instructions
-
-To simply build the firmware file: `make clean && make ai03/polaris:mekberg`
-
-To build and immediately flash: `make clean && make ai03/polaris:mekberg:flash`
diff --git a/keyboards/ai03/polaris/keymaps/mekberg/rules.mk b/keyboards/ai03/polaris/keymaps/mekberg/rules.mk
deleted file mode 100644
index e47bb9e6df6..00000000000
--- a/keyboards/ai03/polaris/keymaps/mekberg/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = no      # Disable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Disable keyboard RGB underglow
diff --git a/keyboards/ai03/quasar/keymaps/ai03/keymap.c b/keyboards/ai03/quasar/keymaps/ai03/keymap.c
deleted file mode 100644
index c564b8aa388..00000000000
--- a/keyboards/ai03/quasar/keymaps/ai03/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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( /* 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_PSCR, KC_SCRL, KC_PAUS, 
-	KC_LGUI, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP, 
-	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN, 
-	MO(1),   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_LALT,                                     KC_SPC,                                      KC_GRV,           KC_DEL,     KC_LEFT, KC_DOWN, KC_RGHT  
-  ),
-  [1] = LAYOUT( /* FN */
-    QK_BOOT,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,    _______, _______, _______, 
-	_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,     _______, _______, _______, 
-	KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PGUP, _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______,    _______, _______, _______, 
-	_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_VOLU, KC_VOLD, KC_HOME, KC_PGDN, KC_END,  _______, _______,                   _______,                               
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_PSCR,             KC_PGUP,          
-	_______,          _______,                                     _______,                                     _______,          KC_BSPC,    KC_HOME, KC_PGDN, KC_END   
-  )
-};
diff --git a/keyboards/ai03/quasar/keymaps/ai03/readme.md b/keyboards/ai03/quasar/keymaps/ai03/readme.md
deleted file mode 100644
index 6f6a0b4fef5..00000000000
--- a/keyboards/ai03/quasar/keymaps/ai03/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The ai03 keymap for Quasar
-
-Focuses functionality mainly into the 60% cluster.
\ No newline at end of file
diff --git a/keyboards/aidansmithdotdev/sango/config.h b/keyboards/aidansmithdotdev/sango/config.h
new file mode 100644
index 00000000000..13b2c01f3e6
--- /dev/null
+++ b/keyboards/aidansmithdotdev/sango/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2024 Aidan Smith <aidan@aidansmith.dev>
+ *
+ * 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 EE_HANDS
diff --git a/keyboards/aidansmithdotdev/sango/info.json b/keyboards/aidansmithdotdev/sango/info.json
new file mode 100644
index 00000000000..6c62ac9bd2a
--- /dev/null
+++ b/keyboards/aidansmithdotdev/sango/info.json
@@ -0,0 +1,220 @@
+{
+    "manufacturer": "AidanSmith.dev",
+    "keyboard_name": "aidansmithdotdev/Sango",
+    "Maintainer": "AidanSmith.dev",
+    "bootloader": "rp2040",
+    "bootmagic": {
+        "matrix": [0, 7]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP4", "GP8", "GP9", "GP11", "GP12", "GP13", "GP14", "GP15"],
+        "rows": ["GP7", "GP6", "GP3", "GP2", "GP0"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [36, 36],
+        "layout": [
+            {"matrix": [0, 1], "x": 60, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 40, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 30, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 10, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 7], "x": 0, "y": 10, "flags": 4},
+            {"matrix": [1, 6], "x": 10, "y": 10, "flags": 4},
+            {"matrix": [1, 5], "x": 20, "y": 10, "flags": 4},
+            {"matrix": [1, 4], "x": 30, "y": 10, "flags": 4},
+            {"matrix": [1, 3], "x": 40, "y": 10, "flags": 4},
+            {"matrix": [1, 2], "x": 50, "y": 10, "flags": 4},
+            {"matrix": [1, 1], "x": 60, "y": 10, "flags": 4},
+            {"matrix": [2, 0], "x": 70, "y": 20, "flags": 4},
+            {"matrix": [2, 1], "x": 60, "y": 20, "flags": 4},
+            {"matrix": [2, 2], "x": 50, "y": 20, "flags": 4},
+            {"matrix": [2, 3], "x": 40, "y": 20, "flags": 4},
+            {"matrix": [2, 4], "x": 30, "y": 20, "flags": 4},
+            {"matrix": [2, 5], "x": 20, "y": 20, "flags": 4},
+            {"matrix": [2, 6], "x": 10, "y": 20, "flags": 4},
+            {"matrix": [2, 7], "x": 0, "y": 20, "flags": 4},
+            {"matrix": [3, 7], "x": 0, "y": 30, "flags": 4},
+            {"matrix": [3, 6], "x": 10, "y": 30, "flags": 4},
+            {"matrix": [3, 5], "x": 20, "y": 30, "flags": 4},
+            {"matrix": [3, 4], "x": 30, "y": 30, "flags": 4},
+            {"matrix": [3, 3], "x": 40, "y": 30, "flags": 4},
+            {"matrix": [3, 2], "x": 50, "y": 30, "flags": 4},
+            {"matrix": [3, 1], "x": 60, "y": 30, "flags": 4},
+            {"matrix": [3, 0], "x": 70, "y": 30, "flags": 4},
+            {"matrix": [4, 0], "x": 70, "y": 30, "flags": 4},
+            {"matrix": [4, 1], "x": 60, "y": 30, "flags": 4},
+            {"matrix": [4, 2], "x": 50, "y": 30, "flags": 4},
+            {"matrix": [4, 5], "x": 20, "y": 30, "flags": 4},
+            {"matrix": [4, 6], "x": 10, "y": 30, "flags": 4},
+            {"matrix": [4, 7], "x": 0, "y": 30, "flags": 4},
+            {"matrix": [5, 1], "x": 100, "y": 0, "flags": 4},
+            {"matrix": [5, 2], "x": 110, "y": 0, "flags": 4},
+            {"matrix": [5, 3], "x": 120, "y": 0, "flags": 4},
+            {"matrix": [5, 4], "x": 130, "y": 0, "flags": 4},
+            {"matrix": [5, 5], "x": 140, "y": 0, "flags": 4},
+            {"matrix": [5, 6], "x": 150, "y": 0, "flags": 4},
+            {"matrix": [5, 7], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [6, 7], "x": 160, "y": 10, "flags": 4},
+            {"matrix": [6, 6], "x": 150, "y": 10, "flags": 4},
+            {"matrix": [6, 5], "x": 140, "y": 10, "flags": 4},
+            {"matrix": [6, 4], "x": 130, "y": 10, "flags": 4},
+            {"matrix": [6, 3], "x": 120, "y": 10, "flags": 4},
+            {"matrix": [6, 2], "x": 110, "y": 10, "flags": 4},
+            {"matrix": [6, 1], "x": 100, "y": 10, "flags": 4},
+            {"matrix": [7, 0], "x": 90, "y": 20, "flags": 4},
+            {"matrix": [7, 1], "x": 100, "y": 20, "flags": 4},
+            {"matrix": [7, 2], "x": 110, "y": 20, "flags": 4},
+            {"matrix": [7, 3], "x": 120, "y": 20, "flags": 4},
+            {"matrix": [7, 4], "x": 130, "y": 20, "flags": 4},
+            {"matrix": [7, 5], "x": 140, "y": 20, "flags": 4},
+            {"matrix": [7, 6], "x": 150, "y": 20, "flags": 4},
+            {"matrix": [7, 7], "x": 160, "y": 20, "flags": 4},
+            {"matrix": [8, 7], "x": 160, "y": 30, "flags": 4},
+            {"matrix": [8, 6], "x": 150, "y": 30, "flags": 4},
+            {"matrix": [8, 5], "x": 140, "y": 30, "flags": 4},
+            {"matrix": [8, 4], "x": 130, "y": 30, "flags": 4},
+            {"matrix": [8, 3], "x": 120, "y": 30, "flags": 4},
+            {"matrix": [8, 2], "x": 110, "y": 30, "flags": 4},
+            {"matrix": [8, 1], "x": 100, "y": 30, "flags": 4},
+            {"matrix": [8, 0], "x": 90, "y": 30, "flags": 4},
+            {"matrix": [9, 0], "x": 90, "y": 30, "flags": 4},
+            {"matrix": [9, 1], "x": 100, "y": 30, "flags": 4},
+            {"matrix": [9, 2], "x": 110, "y": 30, "flags": 4},
+            {"matrix": [9, 5], "x": 140, "y": 30, "flags": 4},
+            {"matrix": [9, 6], "x": 150, "y": 30, "flags": 4},
+            {"matrix": [9, 7], "x": 160, "y": 30, "flags": 4}
+        ]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "brightness_steps": 8,
+        "max_brightness": 128,
+        "saturation_steps": 8,
+        "split": true,
+        "split_count": [36, 36]
+    },
+    "split": {
+        "bootmagic": {
+            "matrix": [4, 7]
+        },
+        "enabled": true,
+        "main": "matrix_grid",
+        "matrix_pins": {
+            "right": {
+                "cols": ["GP7", "GP8", "GP9", "GP11", "GP12", "GP13", "GP14", "GP15"],
+                "rows": ["GP2", "GP3", "GP4", "GP5", "GP6"]
+            }
+        },
+        "soft_serial_pin": "GP1"
+    },
+    "url": "https://aidansmith.dev",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x2567",
+        "vid": "0xA059"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP10"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "L07", "matrix": [0, 7], "x": 0, "y": 0.3},
+                {"label": "L06", "matrix": [0, 6], "x": 1, "y": 0.3},
+                {"label": "L05", "matrix": [0, 5], "x": 2, "y": 0.3},
+                {"label": "L04", "matrix": [0, 4], "x": 3, "y": 0.1},
+                {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "L02", "matrix": [0, 2], "x": 5, "y": 0.1},
+                {"label": "L01", "matrix": [0, 1], "x": 6, "y": 0.2},
+                {"label": "R01", "matrix": [5, 1], "x": 10, "y": 0.2},
+                {"label": "R02", "matrix": [5, 2], "x": 11, "y": 0.1},
+                {"label": "R03", "matrix": [5, 3], "x": 12, "y": 0},
+                {"label": "R04", "matrix": [5, 4], "x": 13, "y": 0.1},
+                {"label": "R05", "matrix": [5, 5], "x": 14, "y": 0.3},
+                {"label": "R06", "matrix": [5, 6], "x": 15, "y": 0.3},
+                {"label": "R07", "matrix": [5, 7], "x": 16, "y": 0.3},
+                {"label": "L17", "matrix": [1, 7], "x": 0, "y": 1.3},
+                {"label": "L16", "matrix": [1, 6], "x": 1, "y": 1.3},
+                {"label": "L15", "matrix": [1, 5], "x": 2, "y": 1.3},
+                {"label": "L14", "matrix": [1, 4], "x": 3, "y": 1.1},
+                {"label": "L13", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "L12", "matrix": [1, 2], "x": 5, "y": 1.1},
+                {"label": "L11", "matrix": [1, 1], "x": 6, "y": 1.2},
+                {"label": "R11", "matrix": [6, 1], "x": 10, "y": 1.2},
+                {"label": "R12", "matrix": [6, 2], "x": 11, "y": 1.1},
+                {"label": "R13", "matrix": [6, 3], "x": 12, "y": 1},
+                {"label": "R14", "matrix": [6, 4], "x": 13, "y": 1.1},
+                {"label": "R15", "matrix": [6, 5], "x": 14, "y": 1.3},
+                {"label": "R16", "matrix": [6, 6], "x": 15, "y": 1.3},
+                {"label": "R17", "matrix": [6, 7], "x": 16, "y": 1.3},
+                {"label": "L27", "matrix": [2, 7], "x": 0, "y": 2.3},
+                {"label": "L26", "matrix": [2, 6], "x": 1, "y": 2.3},
+                {"label": "L25", "matrix": [2, 5], "x": 2, "y": 2.3},
+                {"label": "L24", "matrix": [2, 4], "x": 3, "y": 2.1},
+                {"label": "L23", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "L22", "matrix": [2, 2], "x": 5, "y": 2.1},
+                {"label": "L21", "matrix": [2, 1], "x": 6, "y": 2.2},
+                {"label": "L20", "matrix": [2, 0], "x": 7, "y": 2.7},
+                {"label": "R20", "matrix": [7, 0], "x": 9, "y": 2.7},
+                {"label": "R21", "matrix": [7, 1], "x": 10, "y": 2.2},
+                {"label": "R22", "matrix": [7, 2], "x": 11, "y": 2.1},
+                {"label": "R23", "matrix": [7, 3], "x": 12, "y": 2},
+                {"label": "R24", "matrix": [7, 4], "x": 13, "y": 2.1},
+                {"label": "R25", "matrix": [7, 5], "x": 14, "y": 2.3},
+                {"label": "R26", "matrix": [7, 6], "x": 15, "y": 2.3},
+                {"label": "R27", "matrix": [7, 7], "x": 16, "y": 2.3},
+                {"label": "L37", "matrix": [3, 7], "x": 0, "y": 3.3},
+                {"label": "L36", "matrix": [3, 6], "x": 1, "y": 3.3},
+                {"label": "L35", "matrix": [3, 5], "x": 2, "y": 3.3},
+                {"label": "L34", "matrix": [3, 4], "x": 3, "y": 3.1},
+                {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3},
+                {"label": "L32", "matrix": [3, 2], "x": 5, "y": 3.1},
+                {"label": "L31", "matrix": [3, 1], "x": 6, "y": 3.2},
+                {"label": "L30", "matrix": [3, 0], "x": 7, "y": 3.7},
+                {"label": "R30", "matrix": [8, 0], "x": 9, "y": 3.7},
+                {"label": "R31", "matrix": [8, 1], "x": 10, "y": 3.2},
+                {"label": "R32", "matrix": [8, 2], "x": 11, "y": 3.1},
+                {"label": "R33", "matrix": [8, 3], "x": 12, "y": 3},
+                {"label": "R34", "matrix": [8, 4], "x": 13, "y": 3.1},
+                {"label": "R35", "matrix": [8, 5], "x": 14, "y": 3.3},
+                {"label": "R36", "matrix": [8, 6], "x": 15, "y": 3.3},
+                {"label": "R37", "matrix": [8, 7], "x": 16, "y": 3.3},
+                {"label": "L47", "matrix": [4, 7], "x": 0, "y": 3.3},
+                {"label": "L46", "matrix": [4, 6], "x": 1, "y": 3.3},
+                {"label": "L45", "matrix": [4, 5], "x": 2, "y": 3.3},
+                {"label": "L42", "matrix": [4, 2], "x": 5, "y": 3.1},
+                {"label": "L41", "matrix": [4, 1], "x": 6, "y": 3.2},
+                {"label": "L40", "matrix": [4, 0], "x": 7, "y": 3.7},
+                {"label": "R40", "matrix": [9, 0], "x": 9, "y": 3.7},
+                {"label": "R41", "matrix": [9, 1], "x": 10, "y": 3.2},
+                {"label": "R42", "matrix": [9, 2], "x": 11, "y": 3.1},
+                {"label": "R45", "matrix": [9, 5], "x": 14, "y": 3.3},
+                {"label": "R46", "matrix": [9, 6], "x": 15, "y": 3.3},
+                {"label": "R47", "matrix": [9, 7], "x": 16, "y": 3.3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aidansmithdotdev/sango/keymaps/default/keymap.c b/keyboards/aidansmithdotdev/sango/keymaps/default/keymap.c
new file mode 100644
index 00000000000..a1730a7f86b
--- /dev/null
+++ b/keyboards/aidansmithdotdev/sango/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2024 Aidan Smith <aidan@aidansmith.dev>
+ *
+ * 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,
+};
+
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+     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_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_PGUP , KC_LCAP , KC_A    , KC_S , KC_D , KC_F    , KC_G    , KC_LCBR ,        KC_RCBR , 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_LBRC ,        KC_RBRC , KC_N    , KC_M , KC_DOT , KC_COMM , KC_SLSH , KC_UP   , KC_BSLS ,
+	 KC_LCTL , KC_LGUI , KC_LALT ,               KC_LCTL , KC_LALT , KC_BSPC ,        KC_SPC  , KC_RGUI , KC_RALT ,                 KC_LEFT , KC_DOWN , KC_RGHT
+    )
+};
diff --git a/keyboards/aidansmithdotdev/sango/readme.md b/keyboards/aidansmithdotdev/sango/readme.md
new file mode 100644
index 00000000000..415e21add4b
--- /dev/null
+++ b/keyboards/aidansmithdotdev/sango/readme.md
@@ -0,0 +1,19 @@
+# Sango
+
+![aidansmithdotdev/sango](https://i.imgur.com/NzvLxqyh.jpg)
+
+An open source 65%ish split columnar low profile keyboard.
+
+* Keyboard Maintainer: [Aidan Smith](https://github.com/Aidan-OS)
+* Hardware Supported: Sango
+* Hardware Availability: https://github.com/Aidan-OS/Sango
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aidansmithdotdev/sango:default
+
+Flashing example for this keyboard:
+
+    make aidansmithdotdev/sango: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/aidansmithdotdev/sango/rules.mk b/keyboards/aidansmithdotdev/sango/rules.mk
new file mode 100644
index 00000000000..743228e94b6
--- /dev/null
+++ b/keyboards/aidansmithdotdev/sango/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
\ No newline at end of file
diff --git a/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c b/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c
deleted file mode 100644
index 522651f1c65..00000000000
--- a/keyboards/akb/raine/keymaps/mehadviceguy/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2019 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
-
-/*
-BLANK
- ,----------------------------------------------------------------.   ,--------------.
- |    |    |    |    |    |    |    |    |    |    |    |    |    |   |    |    |    |  
- |----------------------------------------------------------------|   |--------------|
- |       |    |    |    |    |    |    |    |    |    |    |      |   |    |    |    |
- |------------------------------------------------------------    |   |--------------|
- |         |    |    |    |    |    |    |    |    |    |    |    |   |    |    |    | 
- |----------------------------------------------------------------'   |--------------|
- |      |    |    |    |    |    |    |    |    |    |       | ,----. |    |    |    |
- |-----------------------------------------------------------' |    | `--------------|
- |      |    |                              |    |     |  ,--------------. |    |    |
- `------`    '------------------------------`    '-----'  |    |    |    | `---------'
-                                                          `--------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* Base 
- ,----------------------------------------------------------------.   ,--------------.
- |Esc | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  | -  | Bac|   |  / | *  | +  |  
- |----------------------------------------------------------------|   |--------------|
- |  Tab  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  | Enter|   |  7 | 8  | 9  |
- |------------------------------------------------------------    |   |--------------|
- |CapsLock | A  | S  | D  | F  | G  | H  | J  | K  | L  | :  |    |   |  4 | 5  | 6  | 
- |----------------------------------------------------------------'   |--------------|
- |Shift | \  | Z  | X  | C  | V  | B  | N  | M  | ,  |   .   | ,----. |  1 | 2  | 3  |
- |-----------------------------------------------------------' | Up | `--------------|
- | Ctrl |    |             SPACE            |    |AltGr|  ,--------------. | 0  | .  |
- `------`    '------------------------------`    '-----'  |L/fn|Down|Rght| `---------'
-                                                          `--------------'
- */
-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_BSPC, 			KC_PSLS, KC_PAST, KC_PPLS,
-KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, _______, 					KC_P7, KC_P8, KC_P9,
-KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 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_COMMA, KC_DOT, 		 KC_UP, 	KC_P1, KC_P2, KC_P3,
-KC_LCTL, _______, _______, _______, KC_SPC, _______, _______, KC_RALT, LT(1, KC_LEFT), KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
-
-  [1] = LAYOUT( /* Second 
- ,----------------------------------------------------------------.   ,--------------.
- | GRV| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9| F10| F11| F12 |   |Nlck|Pscr| =  |  
- |----------------------------------------------------------------|   |--------------|
- |       |    |    |    |    |    |    |    |    |    | ?  |  DEL |   |Home| Up |PgUp|
- |------------------------------------------------------------    |   |--------------|
- |         |    |    |    |    |    |    |    |    |    | '  |DEL |   |Left|ScrL|Rght| 
- |----------------------------------------------------------------'   |--------------|
- |      |    |    |    |    |    |    |    |    | [  |   ]   | ,----. |End |Down|PgDn|
- |-----------------------------------------------------------' |    | `--------------|
- | GUI  |    |                              |    |     |  ,--------------. |    |Rest|
- `------`    '------------------------------`    '-----'  |    |    |    | `---------'
-                                                          `--------------'
-  */
-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_NUM, KC_PSCR, KC_EQUAL,
-_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, _______, KC_HOME, KC_UP,   KC_PGUP,
-_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_DEL, 	KC_LEFT, KC_SCRL, KC_RGHT,
-_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_END,  KC_DOWN, KC_PGDN,
-KC_LGUI, _______, _______, _______, KC_LALT, _______, _______, _______, _______, _______, _______, _______, QK_BOOT),
-};
-
diff --git a/keyboards/akb/raine/keymaps/mehadviceguy/readme.md b/keyboards/akb/raine/keymaps/mehadviceguy/readme.md
deleted file mode 100644
index e9e411bc5b9..00000000000
--- a/keyboards/akb/raine/keymaps/mehadviceguy/readme.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Eyecandy
-![Eyecandy](https://i.imgur.com/gYWNDlF.png)
-
-# MehAdviceGuy Raine layout
-
-Welcome to one of the most useless layouts you will find this side of town!
-The layout is born out of the need for AltGr to get to æø and å when you don't have a full bottom row.
-
-## Base Layer (0)
-The base layer borrows alot from the Default Raine layer in regards to the alphas, and the numpad. But deviates ever so slightly by putting the layer key on the Left arrow key, relacing it from its original location with AltGr. And putting , and . on what was normally ? and right shift.
-```
- ,----------------------------------------------------------------.   ,--------------.
- |Esc | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  | -  | Bac|   |  / | *  | +  |  
- |----------------------------------------------------------------|   |--------------|
- |  Tab  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  | Enter|   |  7 | 8  | 9  |
- |------------------------------------------------------------    |   |--------------|
- |CapsLock | A  | S  | D  | F  | G  | H  | J  | K  | L  | :  |    |   |  4 | 5  | 6  | 
- |----------------------------------------------------------------'   |--------------|
- |Shift | \  | Z  | X  | C  | V  | B  | N  | M  | ,  |   .   | ,----. |  1 | 2  | 3  |
- |-----------------------------------------------------------' | Up | `--------------|
- | Ctrl |    |             SPACE            |    |AltGr|  ,--------------. | 0  | .  |
- `------`    '------------------------------`    '-----'  |L/fn|Down|Rght| `---------'
-                                                          `--------------'
-```
-
-## Modifier Layer (1)
-The Modifier layer also borrows a few things from the Default Raine layout, but changes a fair bit of things in it. These changes include:
-* Moving Delete to Enter and completing the F-row
-* Moving [ and ] to , and .
-* Adding GUI to Left Ctrl
-* Replacing insert with =
-* Adding / to the P position
-* Moving ' one to the left
-
-```
- ,----------------------------------------------------------------.   ,--------------.
- | GRV| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9| F10| F11| F12 |   |Nlck|Pscr| =  |  
- |----------------------------------------------------------------|   |--------------|
- |       |    |    |    |    |    |    |    |    |    | ?  |  DEL |   |Home| Up |PgUp|
- |------------------------------------------------------------    |   |--------------|
- |         |    |    |    |    |    |    |    |    |    | '  |DEL |   |Left|ScrL|Rght| 
- |----------------------------------------------------------------'   |--------------|
- |      |    |    |    |    |    |    |    |    | [  |   ]   | ,----. |End |Down|PgDn|
- |-----------------------------------------------------------' |    | `--------------|
- | GUI  |    |                              |    |     |  ,--------------. |    |Rest|
- `------`    '------------------------------`    '-----'  |    |    |    | `---------'
-                                                          `--------------'
-```
-
-### Blank ASKII version if anyone needs!
-```
- ,----------------------------------------------------------------.   ,--------------.
- |    |    |    |    |    |    |    |    |    |    |    |    |    |   |    |    |    |  
- |----------------------------------------------------------------|   |--------------|
- |       |    |    |    |    |    |    |    |    |    |    |      |   |    |    |    |
- |------------------------------------------------------------    |   |--------------|
- |         |    |    |    |    |    |    |    |    |    |    |    |   |    |    |    | 
- |----------------------------------------------------------------'   |--------------|
- |      |    |    |    |    |    |    |    |    |    |       | ,----. |    |    |    |
- |-----------------------------------------------------------' |    | `--------------|
- |      |    |                              |    |     |  ,--------------. |    |    |
- `------`    '------------------------------`    '-----'  |    |    |    | `---------'
-                                                          `--------------'
-```
-
-### KLE
-![KLE Layout](https://i.imgur.com/JDc1oM4.png)
-![KLE Link](http://www.keyboard-layout-editor.com/##@@=Esc%0A%60&=!%0A1&=%2F@%0A2&=%23%0A3&=$%0A4&=%25%0A5&=%5E%0A6&=%2F&%0A7&=*%0A8&=(%0A9&=)%0A0&=%2F_%0A-&=+%0A%2F=&_x:0.25%3B&=%2F%2F&=*&=+%3B&@_w:1.5%3B&=Tab&=Q&=W&=E&=R&=T&=Y&=U&=I&=O&=P&_x:0.25&w:1.25&h:2&w2:1.5&h2:1&x2:-0.25%3B&=Enter&_x:0.25%3B&=7&=8&=9%3B&@_w:1.75%3B&=Caps%20Lock&=A&=S&=D&=F&=G&=H&=J&=K&=L&=%2F:%0A%2F%3B&_x:1.5%3B&=4&=5&=6%3B&@_w:1.25%3B&=Shift&=%7C%0A%5C&=Z&=X&=C&=V&=B&=N&=M&=%3C%0A,&_w:1.5%3B&=%3E%0A.&_x:1.5%3B&=1&=2&=3%3B&@_y:-0.75&x:12%3B&=%E2%86%91%3B&@_y:-0.25&w:1.25%3B&=Ctrl&_x:1&a:7&w:6.25%3B&=&_x:1&a:4&w:1.25%3B&=AltGr&_x:3.5%3B&=0&=.%3B&@_y:-0.75&x:11%3B&=%E2%86%90%0AFN&=%E2%86%93&=%E2%86%92%3B&@_y:0.25%3B&=%60&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=F10&=F11&=F12&_x:0.25%3B&=NLock&=Print&=%2F=%3B&@_a:7&w:1.5%3B&=&=&=&=&=&=&=&=&=&=&_a:4%3B&=%2F%2F&_x:0.25&w:1.25&h:2&w2:1.5&h2:1&x2:-0.25%3B&=Del&_x:0.25%3B&=Home&=Up&=PgUp%3B&@_a:7&w:1.75%3B&=&=&=&=&=&=&=&=&=&=&_a:4%3B&='&_x:1.5%3B&=Left&=ScrLc&=Right%3B&@_a:7&w:1.25%3B&=&=&=&=&=&=&=&=&=&_a:4%3B&=%5B&_w:1.5%3B&=%5D&_x:1.5%3B&=End&=Down&=PgDn%3B&@_y:-0.75&x:12&a:7%3B&=%3B&@_y:-0.25&a:4&w:1.25%3B&=Win&_x:1&w:6.25%3B&=RAlt&_x:1&a:7&w:1.25%3B&=&_x:3.5%3B&=&_a:4%3B&=Rst%3B&@_y:-0.75&x:11&a:7%3B&=&=&=)
\ No newline at end of file
diff --git a/keyboards/akko/5087/5087.c b/keyboards/akko/5087/5087.c
index 4d6cf949009..7dd614b4565 100644
--- a/keyboards/akko/5087/5087.c
+++ b/keyboards/akko/5087/5087.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -25,103 +25,103 @@ const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,    E_1,   F_1},
-    {1, D_2,    E_2,   F_2},
-    {1, D_3,    E_3,   F_3},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,    CB5_CA1,   CB6_CA1},
+    {1, CB4_CA2,    CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,    CB5_CA3,   CB6_CA3},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
 };
 #endif // RGB_MATRIX_ENABLE
 
diff --git a/keyboards/akko/5087/config.h b/keyboards/akko/5087/config.h
index 3a6b7030ee7..ceb98727385 100644
--- a/keyboards/akko/5087/config.h
+++ b/keyboards/akko/5087/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-
 /* LED Indicators */
 #define LED_MAC_OS_PIN C10
 #define LED_WIN_LOCK_PIN C11
@@ -36,16 +35,8 @@
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
 
 /* I2C Config for LED Driver */
-#define DRIVER_COUNT 2
-#define DRIVER_ADDR_1 0b1110100
-#define DRIVER_ADDR_2 0b1110111
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
+
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
-
-#define RGB_MATRIX_LED_COUNT   87
-
-#define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-
diff --git a/keyboards/akko/5087/info.json b/keyboards/akko/5087/info.json
index 1b4059b0d58..67ea54c169b 100644
--- a/keyboards/akko/5087/info.json
+++ b/keyboards/akko/5087/info.json
@@ -40,7 +40,7 @@
         "caps_lock": "A15"
     }, 
     "rgb_matrix": {
-        "driver": "ckled2001",
+        "driver": "snled27351",
         "max_brightness": 180,
         "animations": {
             "breathing": true,
@@ -155,7 +155,9 @@
             { "flags": 4, "matrix": [5, 15], "x":210, "y": 64},
             { "flags": 4, "matrix": [5, 16], "x":224, "y": 64}
 
-        ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     },
     "community_layouts": ["tkl_ansi"],
     "layouts": {
diff --git a/keyboards/akko/5108/5108.c b/keyboards/akko/5108/5108.c
index 91f53e1e550..91526289b67 100644
--- a/keyboards/akko/5108/5108.c
+++ b/keyboards/akko/5108/5108.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
@@ -25,124 +25,124 @@ const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
-    {1, D_11,  E_11,  F_11},
-    {1, D_12,  E_12,  F_12},
-    {1, D_13,  E_13,  F_13},
-    {1, D_14,  E_14,  F_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {1, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {1, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {1, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {1, CB4_CA14,  CB5_CA14,  CB6_CA14},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1 },
-    {1, D_2,   E_2,   F_2},
-    {1, D_3,   E_3,   F_3},
-    {1, D_4,   E_4,   F_4},
-    {1, D_5,   E_5,   F_5},
-    {1, D_6,   E_6,   F_6},
-    {1, D_7,   E_7,   F_7},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1 },
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, D_8,   E_8,   F_8},
-    {1, D_9,   E_9,   F_9},
-    {1, D_10,  E_10,  F_10},
-    {1, G_7,   H_7,   I_7},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {1, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {1, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
-    {1,  J_7,   K_7,  L_7},
-    {1,  J_8,   K_8,  L_8},
-    {1,  J_9,   K_9,  L_9},
-    {1,  J_10,  K_10, L_10},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
+    {1,  CB10_CA7,   CB11_CA7,  CB12_CA7},
+    {1,  CB10_CA8,   CB11_CA8,  CB12_CA8},
+    {1,  CB10_CA9,   CB11_CA9,  CB12_CA9},
+    {1,  CB10_CA10,  CB11_CA10, CB12_CA10},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
-    {1,  J_5,   K_5,  L_5},
-    {1,  J_6,   K_6,  L_6},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
+    {1,  CB10_CA5,   CB11_CA5,  CB12_CA5},
+    {1,  CB10_CA6,   CB11_CA6,  CB12_CA6},
 
 };
 #endif
diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h
index 7154ce44d27..6a509733d6a 100644
--- a/keyboards/akko/5108/config.h
+++ b/keyboards/akko/5108/config.h
@@ -40,10 +40,4 @@
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define RGB_MATRIX_LED_COUNT    108
-
 #define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/akko/5108/info.json b/keyboards/akko/5108/info.json
index 662a949a53f..5e97d151c34 100644
--- a/keyboards/akko/5108/info.json
+++ b/keyboards/akko/5108/info.json
@@ -176,7 +176,9 @@
             { "flags": 4, "matrix": [5, 16], "x": 176, "y": 64 },
             { "flags": 4, "matrix": [5, 18], "x": 199, "y": 64 },
             { "flags": 4, "matrix": [5, 19], "x": 214, "y": 64 }
-    ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/akko/acr87/acr87.c b/keyboards/akko/acr87/acr87.c
index 7ee9ec6470c..e2ed06a0e89 100644
--- a/keyboards/akko/acr87/acr87.c
+++ b/keyboards/akko/acr87/acr87.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
@@ -25,160 +25,160 @@ const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,    E_1,   F_1},
-    {1, D_2,    E_2,   F_2},
-    {1, D_3,    E_3,   F_3},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,    CB5_CA1,   CB6_CA1},
+    {1, CB4_CA2,    CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,    CB5_CA3,   CB6_CA3},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
-
-    {2, J_12,  K_12,  L_12},
-    {2, J_11,  K_11,  L_11},
-    {2, J_10,  K_10,  L_10},
-    {2, J_9,   K_9,   L_9},
-    {2, J_8,   K_8,   L_8},
-    {2, J_7,   K_7,   L_7},
-    {2, J_6,   K_6,   L_6},
-    {2, J_5,   K_5,   L_5},
-    {2, J_4,   K_4,   L_4},
-    {2, J_3,   K_3,   L_3},
-    {2, J_2,   K_2,   L_2},
-    {2, J_1,   K_1,   L_1},
-    {2, G_12,  H_12,  I_12},
-    {2, G_11,  H_11,  I_11},
-    {2, G_10,  H_10,  I_10},
-    {2, G_9,   H_9,   I_9},
-
-    {2, A_1,   B_1,   C_1},
-    {2, G_8,   H_8,   I_8},
-
-    {2, A_2,   B_2,   C_2},
-    {2, G_7,   H_7,   I_7},
-
-    {2, A_3,   B_3,   C_3},
-    {2, G_6,   H_6,   I_6},
-
-    {2, A_4,   B_4,   C_4},
-    {2, G_5,   H_5,   I_5},
-
-    {2, A_5,   B_5,   C_5},
-    {2, G_4,   H_4,   I_4},
-
-    {2, A_6,   B_6,   C_6},
-    {2, G_3,   H_3,   I_3},
-
-    {2, A_7,   B_7,   C_7},
-    {2, G_2,   H_2,   I_2},
-
-    {2, A_8,   B_8,   C_8},
-    {2, A_9,   B_9,   C_9},
-    {2, A_10,  B_10,  C_10},
-    {2, A_11,  B_11,  C_11},
-    {2, A_12,  B_12,  C_12},
-    {2, D_1,   E_1,   F_1},
-    {2, D_2,   E_2,   F_2},
-    {2, D_3,   E_3,   F_3},
-    {2, D_4,   E_4,   F_4},
-    {2, D_5,   E_5,   F_5},
-    {2, D_6,   E_6,   F_6},
-    {2, D_7,   E_7,   F_7},
-    {2, D_8,   E_8,   F_8},
-    {2, D_9,   E_9,   F_9},
-    {2, D_10,  E_10,  F_10},
-    {2, D_11,  E_11,  F_11},
-    {2, D_12,  E_12,  F_12},
-    {2, G_1,   H_1,   I_1},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
+
+    {2, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {2, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {2, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {2, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {2, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {2, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {2, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {2, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {2, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {2, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {2, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {2, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {2, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {2, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {2, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {2, CB7_CA9,   CB8_CA9,   CB9_CA9},
+
+    {2, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {2, CB7_CA8,   CB8_CA8,   CB9_CA8},
+
+    {2, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {2, CB7_CA7,   CB8_CA7,   CB9_CA7},
+
+    {2, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {2, CB7_CA6,   CB8_CA6,   CB9_CA6},
+
+    {2, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {2, CB7_CA5,   CB8_CA5,   CB9_CA5},
+
+    {2, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {2, CB7_CA4,   CB8_CA4,   CB9_CA4},
+
+    {2, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {2, CB7_CA3,   CB8_CA3,   CB9_CA3},
+
+    {2, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {2, CB7_CA2,   CB8_CA2,   CB9_CA2},
+
+    {2, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {2, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {2, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {2, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {2, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {2, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {2, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {2, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {2, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {2, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {2, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {2, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {2, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {2, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {2, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {2, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {2, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {2, CB7_CA1,   CB8_CA1,   CB9_CA1},
 };
 
 // clang-format on
diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h
index 4c1fb9afa1f..cdc4b6011a3 100644
--- a/keyboards/akko/acr87/config.h
+++ b/keyboards/akko/acr87/config.h
@@ -39,10 +39,4 @@
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define RGB_MATRIX_LED_COUNT   135
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/akko/acr87/info.json b/keyboards/akko/acr87/info.json
index 5ccb0c3f731..2702ee79152 100644
--- a/keyboards/akko/acr87/info.json
+++ b/keyboards/akko/acr87/info.json
@@ -200,7 +200,9 @@
             {"flags": 2, "x":196, "y":64},
             {"flags": 2, "x":210, "y":64},
             {"flags": 2, "x":224, "y":64}
-    ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     }, 
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h
index 1d601a189cf..a23cf6db922 100644
--- a/keyboards/akko/top40/config.h
+++ b/keyboards/akko/top40/config.h
@@ -37,11 +37,4 @@
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define RGB_MATRIX_LED_COUNT    76
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
 #define RGB_TRIGGER_ON_KEYDOWN
-
diff --git a/keyboards/akko/top40/info.json b/keyboards/akko/top40/info.json
index 243952ccc8b..183c9242f4e 100644
--- a/keyboards/akko/top40/info.json
+++ b/keyboards/akko/top40/info.json
@@ -139,7 +139,9 @@
             {"flags": 2, "x":185, "y":64},
             {"flags": 2, "x":205, "y":64},
             {"flags": 2, "x":224, "y":64}
-    ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     }, 
    "layouts": {
         "LAYOUT": {
diff --git a/keyboards/akko/top40/top40.c b/keyboards/akko/top40/top40.c
index 028e4bdd057..565dfb77c63 100644
--- a/keyboards/akko/top40/top40.c
+++ b/keyboards/akko/top40/top40.c
@@ -17,97 +17,97 @@
 #include "quantum.h"
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
 
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_5,   K_5,   L_5},
-    {0, J_7,   K_7,   L_7},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
 
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, J_7,   K_7,   L_7},
-    {1, J_6,   K_6,   L_6},
-    {1, J_5,   K_5,   L_5},
-    {1, J_4,   K_4,   L_4},
-    {1, J_3,   K_3,   L_3},
-    {1, J_2,   K_2,   L_2},
-    {1, J_1,   K_1,   L_1},
-    {1, G_8,   H_8,   I_8},
-    {1, G_7,   H_7,   I_7},
-    {1, G_6,   H_6,   I_6},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
 
-    {1, A_4,   B_4,   C_4},
-    {1, G_5,   H_5,   I_5},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
 
-    {1, A_5,   B_5,   C_5},
-    {1, G_4,   H_4,   I_4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
 
-    {1, A_6,   B_6,   C_6},
-    {1, G_3,   H_3,   I_3},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, D_1,   E_1,   F_1},
-    {1, D_2,   E_2,   F_2},
-    {1, D_3,   E_3,   F_3},
-    {1, D_4,   E_4,   F_4},
-    {1, D_5,   E_5,   F_5},
-    {1, D_6,   E_6,   F_6},
-    {1, D_7,   E_7,   F_7},
-    {1, D_8,   E_8,   F_8},
-    {1, G_2,   H_2,   I_2},
-    {1, G_1,   H_1,   I_1},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
 
 };
 
diff --git a/keyboards/al1/keymaps/splitbs/keymap.c b/keyboards/al1/keymaps/splitbs/keymap.c
deleted file mode 100644
index 71f2b805449..00000000000
--- a/keyboards/al1/keymaps/splitbs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2018 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] = {
-    LAYOUT_split_bs(
-        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_INS,           KC_NUM,  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_BSLS,                   KC_DEL,           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_ENT,                                      KC_P4,   KC_P5,   KC_P6,
-        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_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT
-    ),
-
-    LAYOUT_split_bs(
-        _______, 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,           _______,          _______, _______, _______, _______,
-        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                     _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______,                   BL_TOGG, BL_DOWN, BL_UP,            _______, _______
-    )
-};
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index d765afd355f..8230f082b35 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -17,11 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define SELECT_SOFT_SERIAL_SPEED 1
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 68
-#define RGB_MATRIX_SPLIT { 34, 34 }
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#endif
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
index c7c5b9a8a8e..a66b5188b60 100644
--- a/keyboards/aleblazer/zodiark/info.json
+++ b/keyboards/aleblazer/zodiark/info.json
@@ -32,9 +32,11 @@
     },
     "rgb_matrix": {
         "driver": "ws2812",
+        "max_brightness": 150,
         "sat_steps": 8,
-        "val_steps": 8,
-        "speed_steps": 10
+        "speed_steps": 10,
+        "split_count": [34, 34],
+        "val_steps": 8
     },
     "matrix_pins": {
         "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
diff --git a/keyboards/aleblazer/zodiark/keymaps/slimoled/config.h b/keyboards/aleblazer/zodiark/keymaps/slimoled/config.h
deleted file mode 100644
index e2df253c3f4..00000000000
--- a/keyboards/aleblazer/zodiark/keymaps/slimoled/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Spencer Deven <splitlogicdesign@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 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X32
-  #define OLED_TIMEOUT 400000
-#endif
diff --git a/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c b/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c
deleted file mode 100644
index 690fe6c71a1..00000000000
--- a/keyboards/aleblazer/zodiark/keymaps/slimoled/keymap.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
-Copyright 2021 Spencer Deven <splitlogicdesign@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 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-enum sofle_layers {
-    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
-    _QWERTY,
-    _COLEMAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-    KC_QWERTY = SAFE_RANGE,
-    KC_COLEMAK,
-    KC_LOWER,
-    KC_RAISE,
-    KC_ADJUST,
-    KC_PRVWD,
-    KC_NXTWD,
-    KC_LSTRT,
-    KC_LEND,
-    KC_DLINE
-};
-
-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,    KC_BSPC,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,  KC_LBRC,                       KC_RBRC,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-      KC_ADJUST, KC_A,  KC_S,    KC_D,    KC_F,    KC_G,  KC_MINS,                       KC_EQL,  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_GRV, KC_MUTE,      RGB_TOG, KC_DEL,KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-      KC_LCTL, KC_LALT, KC_LGUI, LALT(KC_TAB), KC_LOWER,  KC_SPC,   KC_ENT,    KC_ENT,   KC_SPC,  KC_RAISE,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-	[_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_PSLS, KC_P7, KC_P8, KC_P9, KC_NUM,  _______, _______,                   _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
-      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NUM,  _______, _______,                   _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NUM,
-      _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______,
-      _______, KC_P0, KC_PDOT, KC_PENT, _______,     _______,  _______,   _______,    _______,   _______, KC_P0, KC_PDOT, KC_PENT, _______
-      ),
-
-	[_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_PSLS, KC_P7, KC_P8, KC_P9, KC_NUM,  _______, _______,                    _______, _______, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_F12,
-      KC_CAPS, KC_P4, KC_P5, KC_P6, KC_NUM,  _______, _______,                    _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_NUM,
-      _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______,
-      _______, KC_P0, KC_PDOT, KC_PENT, _______,    _______,   _______,  _______,    _______,    _______, KC_P0, KC_PDOT, KC_PENT, _______
-      ),
-
-	[_ADJUST] = LAYOUT(
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-      _______, _______, _______, _______, _______, _______, _______,                   _______, _______, EE_CLR,  _______, _______, _______, KC_F12,
-      _______, _______, _______, _______, _______, _______, _______,                   _______, _______, RGB_TOG, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,
-      _______, _______, _______, _______, _______,      _______,     _______, _______,     _______,      RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD
-      )
-
-};
-#ifdef OLED_ENABLE
-
-static void render_logo(void) {
-    static const char PROGMEM qmk_logo[] = {
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
-    };
-
-    oled_write_P(qmk_logo, false);
-}
-
-static void print_status_narrow(void) {
-    // Print current mode
-    oled_write_P(PSTR("\n\n"), false);
-    oled_write_ln_P(PSTR("MODE"), false);
-    oled_write_ln_P(PSTR(""), false);
-    if (keymap_config.swap_lctl_lgui) {
-        oled_write_ln_P(PSTR("MAC"), false);
-    } else {
-        oled_write_ln_P(PSTR("WIN"), false);
-    }
-
-    switch (get_highest_layer(default_layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("Qwrt"), false);
-            break;
-        case _COLEMAK:
-            oled_write_ln_P(PSTR("Clmk"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    // Print current layer
-    oled_write_ln_P(PSTR("LAYER"), false);
-    switch (get_highest_layer(layer_state)) {
-        case _COLEMAK:
-        case _QWERTY:
-            oled_write_P(PSTR("Base\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adj\n"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    led_t led_usb_state = host_keyboard_led_state();
-    oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_90;
-    }
-    return rotation;
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        print_status_narrow();
-    } else {
-        render_logo();
-    }
-    return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return false;
-        case KC_COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            return false;
-        case KC_LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-        case KC_PRVWD:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_LEFT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                }
-            }
-            break;
-        case KC_NXTWD:
-             if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                }
-            }
-            break;
-        case KC_LSTRT:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                     //CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                } else {
-                    register_code(KC_HOME);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_code(KC_HOME);
-                }
-            }
-            break;
-        case KC_LEND:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    //CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_code(KC_END);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_code(KC_END);
-                }
-            }
-            break;
-        case KC_DLINE:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_BSPC);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_BSPC);
-            }
-            break;
-        case KC_COPY:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_C);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_C);
-            }
-            return false;
-        case KC_PASTE:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_V);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_V);
-            }
-            return false;
-        case KC_CUT:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_X);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_X);
-            }
-            return false;
-            break;
-        case KC_UNDO:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_Z);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_Z);
-            }
-            return false;
-    }
-    return true;
-}
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-              rgblight_step();
-        } else {
-           rgblight_step_reverse();
-        }
-    }
-    return true;
-}
-
-#endif
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
index 5259316d9d5..83ca4d9b8aa 100644
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -349,6 +349,322 @@
                 {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
                 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
 
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_625u_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_625u_space_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 15], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_7u_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_7u_space_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 15], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
                 {"matrix": [4, 12], "x": 13, "y": 4},
                 {"matrix": [4, 13], "x": 14, "y": 4},
                 {"matrix": [4, 14], "x": 15, "y": 4}
diff --git a/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c b/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c
deleted file mode 100644
index 7a1e287e38f..00000000000
--- a/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2023 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┐
-     * │TG1│ / │ * │ - │
-     * ├───┼───┼───┼───┤
-     * │ 7 │ 8 │ 9 │   │
-     * ├───┼───┼───┤ + │
-     * │ 4 │ 5 │ 6 │   │
-     * ├───┼───┼───┼───┤
-     * │ 1 │ 2 │ 3 │   │
-     * ├───┴───┼───┤Ent│
-     * │   0   │ . │   │
-     * └───────┴───┴───┘
-     */
-    [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
-    ),
-
-    /*
-     * ┌───┬───┬───┬───┐
-     * │TG1│ / │ * │ - │
-     * ┌───┬───┬───┐───┤
-     * │Hom│ ↑ │PgU│   │
-     * ├───┼───┼───┤ + │
-     * │ ← │   │ → │   │
-     * ├───┼───┼───┤───┤
-     * │End│ ↓ │PgD│   │
-     * ├───┴───┼───┤Ent│
-     * │Insert │Del│   │
-     * └───────┴───┘───┘
-     */
-    [1] = LAYOUT_numpad_5x4(
-        _______, _______, _______, _______,
-        KC_HOME, KC_UP,   KC_PGUP, 
-        KC_LEFT, XXXXXXX, KC_RGHT, _______,
-        KC_END,  KC_DOWN, KC_PGDN,  
-        KC_INS,           KC_DEL,  _______
-    )
-};
diff --git a/keyboards/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h
index 91e02255699..ff87862693a 100644
--- a/keyboards/aliceh66/pianoforte/config.h
+++ b/keyboards/aliceh66/pianoforte/config.h
@@ -17,11 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
 /* 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/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h
index 91e02255699..ff87862693a 100644
--- a/keyboards/aliceh66/pianoforte_hs/config.h
+++ b/keyboards/aliceh66/pianoforte_hs/config.h
@@ -17,11 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
 /* 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/alpaca/wfeclipse/info.json b/keyboards/alpaca/wfeclipse/info.json
index 47288bb190d..da0ebe388a9 100644
--- a/keyboards/alpaca/wfeclipse/info.json
+++ b/keyboards/alpaca/wfeclipse/info.json
@@ -30,7 +30,6 @@
             "gradient_up_down": true,
             "hue_wave": true,
             "pixel_fractal": true,
-            "solid_color": true,
             "solid_reactive_simple": true,
             "solid_splash": true
         },
diff --git a/keyboards/alpha/keymaps/vderm/README.md b/keyboards/alpha/keymaps/vderm/README.md
deleted file mode 100644
index 26a8ab3e85f..00000000000
--- a/keyboards/alpha/keymaps/vderm/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Alpha 28-Key Keyboard Alternate Keymap
-Alternate keymap for [Alpha 28-key keyboard](https://github.com/qmk/qmk_firmware/tree/master/keyboards/alpha).
-
-## How-to
-Assuming you've followed all the instructions from the original post, put my "keymap.c" file in "$qmk-firmware-folder$/keyboards/alpha/keymaps/vderm/" and then run your make command ("make alpha:vderm" while in $qmk-firmware-folder$ where this folder is what you've downloaded from the official github page) to compile the hex file to upload to your microcontroller. I've also uploaded my hex file.
-
-## Description
-Instead of going up and down layers like in the original Alpha keyboard, I've made the bottom row keys all have alternate functions:
-+ Like in the original Alpha28 keymap, the 2U spacebar is a shift key when held down and space when tapped
-+ Z and M are Ctrl keys when held down or Z and M when tapped
-+ X and N are Alt keys
-+ C activates the function keys layer (arrows, page up/dn, esc, tab, etc.)
-+ V activates the characters and numbers layer
-+ C and V combined activated the F-keys layer (F1, F2, F3, etc.)
-+ The enter key is an enter key in the home layer, backspace in the function keys and characters/numbers layer and a delete in the F-keys layer
-+ While in the other layers, the bottom row acts like a "regular" bottom modified row: ctrl, alt, winkey
-
-## Keymap
-![keymap](https://imgur.com/ZbDz0eL.jpg)
-
-## Build Images
-Here is my keyboard.
-+ Switches: Aliaz Silent Switches (Tactile), PCB mount, 80g from [KBDfans](https://kbdfans.cn/collections/aliaz-switches/products/pre-orderaliaz-silent-switch-tactile?variant=2519899832333)
-+ PCB board: ordered from JLCPCB, in white
-+ Keycaps: ebay, can't find link :S
-+ Bottom plate: I cut a piece of canary wood that was laying around, needs to be varnished; I also need to actually screw the pcb to the wood instead of relying on double-sided tape
-
-![vderm_alpha0](https://imgur.com/MjjoVtr.jpg)
-![vderm_alpha1](https://imgur.com/mIFu9WV.jpg)
-![vderm_alpha2](https://imgur.com/A70Iemw.jpg)
-![vderm_alpha3](https://imgur.com/eYljPWh.jpg)
-![vderm_alpha4](https://imgur.com/OhUKowj.jpg)
-
-Good luck on your build!  
-//vderm
diff --git a/keyboards/alpha/keymaps/vderm/keymap.c b/keyboards/alpha/keymaps/vderm/keymap.c
deleted file mode 100644
index e3ac94807d6..00000000000
--- a/keyboards/alpha/keymaps/vderm/keymap.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define HOME 0
-#define FN 1
-#define FNCHAR 2
-#define FKEYS 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[HOME] = LAYOUT(
-		KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
-		KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
-		MT(MOD_LCTL, KC_Z), MT(MOD_LALT, KC_X), LT(1, KC_C), LT(2, KC_V), MT(MOD_LSFT, KC_SPC), MT(MOD_RGUI,KC_B), MT(MOD_RALT, KC_N), MT(MOD_RCTL, KC_M)),
-
-	[FN] = LAYOUT(
-		KC_ESC, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_NO,
-		KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BSPC,
-		KC_LCTL, KC_LALT, KC_TRNS, MO(3), MT(MOD_LSFT, KC_SPC), KC_RGUI, KC_RALT, KC_RCTL),
-
-	[FNCHAR] = LAYOUT(
-		KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
-		KC_GRV,KC_NO,KC_MINS,KC_EQL,KC_BSLS,KC_LBRC,KC_RBRC,KC_SCLN,KC_QUOT,KC_BSPC,
-		KC_LCTL, KC_LALT, MO(3), KC_TRNS, MT(MOD_LSFT, KC_SPC), KC_COMM, KC_DOT, KC_SLSH),
-
-	[FKEYS] = 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_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_DEL,
-		KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, MT(MOD_LSFT, KC_SPC), KC_RGUI, KC_RALT, KC_RCTL),
-};
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
diff --git a/keyboards/alps64/keymaps/crd/keymap.c b/keyboards/alps64/keymaps/crd/keymap.c
deleted file mode 100644
index e68977d8674..00000000000
--- a/keyboards/alps64/keymaps/crd/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-  _BL = 0, // Base Layer
-  _FL     // Function Layer
-};
-
-// Custom #defined keycodes (shorter macros for readability)
-#define KC_CTES CTL_T(KC_ESC)
-#define KC_RSUP RSFT_T(KC_UP)
-#define KC_FNDN LT(_FL, KC_DOWN)
-#define KC_RGLT RCMD_T(KC_LEFT)
-#define KC_RCRT RCTL_T(KC_RIGHT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BL] = LAYOUT_aek_103(
-    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_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_CTES, 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_RSUP,
-    MO(_FL), KC_LALT, KC_LGUI,                            KC_SPC,                              KC_RGLT, KC_FNDN, KC_RCRT
-  ),
-  [_FL] = LAYOUT_aek_103(
-    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_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______
-  )
-};
diff --git a/keyboards/alps64/keymaps/dbroqua/keymap.c b/keyboards/alps64/keymaps/dbroqua/keymap.c
deleted file mode 100644
index 92fcf1a192a..00000000000
--- a/keyboards/alps64/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Damien Broqua
-  *
-  * 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: qwerty
-     * ,-----------------------------------------------------------------------------------------.
-     * | `   |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |
-     * |-----------------------------------------------------------------------------------------+
-     * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  \     |
-     * |-----------------------------------------------------------------------------------------+
-     * | Caps    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-     * |-----------------------------------------------------------------------------------------+
-     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift          |
-     * |-----------------------------------------------------------------------------------------+
-     * | Ctrl  |LGUI | LAlt  |               Space                        | RAlt   | FN  | RCtrl |
-     * `-----------------------------------------------------------------------------------------'
-     */
-  [0] = LAYOUT_all(
-    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_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,  MO(1),    KC_RCTL
-  ),
-
-  /* FN Layer (Based on Poker 3 FN layout)
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Delete    |
-     * |-----------------------------------------------------------------------------------------+
-     * |        |     |     |     |     |     | Calc| PgUp|  Up | PgDn|PrtSc|Scrlk|Pause|        |
-     * |-----------------------------------------------------------------------------------------+
-     * |         | Vol-| Vol+| Mute|     |     | Home| Left| Down|Right| Ins | Del |             |
-     * |-----------------------------------------------------------------------------------------+
-     * |           | App |     |     |     |     | End |     |     |     |     |                 |
-     * |-----------------------------------------------------------------------------------------+
-     * |       |     |       |                                            |        |     |       |
-     * `-----------------------------------------------------------------------------------------'
-     */
-  [1] = 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_CALC,  KC_PGUP,  KC_UP,    KC_PGDN,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,
-    _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_INS,   KC_DEL,   _______,
-    _______,  _______,  KC_APP,   _______,  _______,  _______,  _______,  KC_END,   _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,                      _______,                                          _______,  _______,  _______,  _______
-    )
-};
diff --git a/keyboards/amag23/keymaps/qwert/keymap.c b/keyboards/amag23/keymaps/qwert/keymap.c
deleted file mode 100644
index 0b29c460729..00000000000
--- a/keyboards/amag23/keymaps/qwert/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021
- *
- * 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
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT( /* Base Layer */
-      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( /* Function Layer */
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
-      _______, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, _______,
-      _______, _______, RGB_VAD, RGB_RMOD,RGB_HUD, _______,
-      _______, _______, _______, _______,          _______
-  ),
-};
-// clang-format on
-
diff --git a/keyboards/amag23/keymaps/qwert/readme.md b/keyboards/amag23/keymaps/qwert/readme.md
deleted file mode 100644
index c3a7df467d8..00000000000
--- a/keyboards/amag23/keymaps/qwert/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# QWERT Keymap for Koolertron AMAG23
-
-## Additional Notes
-QWERT keymap, based on the left hand of an ortholinear layout.
-
-## Keymap
-
-![AMAG23 QWERT Layout](https://i.imgur.com/fiDUo77.png)
-
-## Build
-
-To build the factory keymap, simply run:
-
-    make amag23:qwert
diff --git a/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
deleted file mode 100755
index f810ffc5534..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-#include QMK_KEYBOARD_H
-
-// Set the custom keymap
-#undef LAYOUT
-#define LAYOUT( \
-    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,                k39, k3a, k3b  \
-) { \
-    {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, XXX, XXX, XXX, k39, k3a, k3b} \
-}
-
-extern keymap_config_t keymap_config;
-
-enum custom_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define CTL_ESC CTL_T(KC_ESC)  // Tap for Escape, hold for Control
-#define HPR_TAB ALL_T(KC_TAB)  // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define MEH_GRV MEH_T(KC_GRV)  // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
-#define SFT_BSP SFT_T(KC_BSPC) // Tap for Backspace, hold for Shift
-#define SFT_ENT SFT_T(KC_ENT)  // Tap for Enter, hold for Shift
-#define SFT_SPC SFT_T(KC_SPC)  // Tap for Space, hold for Shift
-#define UMLAUT  RALT(KC_U)     // Combine Alt and U
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  | Lower and Space | Raise          | GUI  |AltGr | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-  HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI,     LT(_LOWER, KC_SPC),    RAISE,            KC_RGUI, KC_RALT, KC_RCTL
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  | Lower and Space | Raise          | GUI  |AltGr | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT(
-  HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI,     LT(_LOWER, KC_SPC),    RAISE,            KC_RGUI, KC_RALT, KC_RCTL
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  | Lower and Space | Raise          | GUI  |AltGr | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT(
-  HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  SFT_BSP, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI,     LT(_LOWER, KC_SPC),    RAISE,            KC_RGUI, KC_RALT, KC_RCTL
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MS L | MS D |MS U  | MS R |MS Btn|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |                 |      Next      | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1,
-  _______, _______, _______, _______,          _______,          _______,          KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | Left | Down |  Up  | Rght |MS_BN2|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |                 |      Next      | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_BTN2,
-  _______, _______, _______, _______,          _______,          _______,          KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      | Reset|  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |                 |                |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______,          _______,          _______,          _______, _______, _______
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk
deleted file mode 100644
index 59a2cb09a85..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes  # Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = no  # Console for debug(+400)
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-NKRO_ENABLE      = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-MIDI_ENABLE      = no  # MIDI controls
-AUDIO_ENABLE     = no  # Audio output on port C6
-UNICODE_ENABLE   = no  # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h
deleted file mode 100644
index 73118332013..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define PERMISSIVE_HOLD
diff --git a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
deleted file mode 100755
index 87217f43610..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Default Layer
-  [0] = LAYOUT(
-      QK_GESC,       KC_Q,    KC_W,   KC_E, KC_R, KC_T,    KC_Y, KC_U,    KC_I,    KC_O,   KC_P,   KC_BSPC,
-      LT(2, KC_TAB), KC_A,    KC_S,   KC_D, KC_F, KC_G,    KC_H, KC_J,    KC_K,    KC_L,   LT(2, KC_ENT),
-      KC_LSFT,       KC_Z,    KC_X,   KC_C, KC_V, KC_B,    KC_N, KC_M,    KC_COMM, KC_DOT, MT(MOD_RSFT, KC_SLSH),
-      KC_LCTL,       KC_LGUI, KC_LALT,      LT(1, KC_SPC), LT(1, KC_SPC), KC_RALT, MO(3),  KC_RCTL
-      ),
-
-  // Number Layer
-  [1] = LAYOUT(
-      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_TRNS, KC_MINS, KC_EQL,  KC_SCLN, KC_QUOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, MT(MOD_RSFT, KC_BSLS),
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-      ),
-
-  // Shifted Layer
-  [2] = LAYOUT(
-      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_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PIPE,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-      ),
-
-  // Fkey Layer
-  [3] = LAYOUT(
-      KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, QK_BOOT,
-      KC_TRNS, 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, TG(4),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-      ),
-
-  // Gaming Layer
-  [4] = LAYOUT(
-      KC_ESC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
-      KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-      ),
-};
diff --git a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md
deleted file mode 100755
index 64ae16c7eb8..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md
+++ /dev/null
@@ -1,55 +0,0 @@
-Jetpacktuxedo's AMJ40 layout
-=====================
-
-This is based heavily on my minivan layout, with most difference stemming from the different widths between the minivan and the AMJ40. ![Image of my specific layout](https://i.imgur.com/B9XraJY.jpg)
-
-## Base Layer (0)
-
-The base layer is pretty simple, straight qwerty layout where available. Both spacebars go to layer 1 when held. `tab` is `tab` when pressed and `fn2` when held, `enter` is the same. `GESC` is `esc` when used alone, but `~` when shifted. `/` is `/` when tapped but `rshift` when held.
-```
-|GESC| Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |BSPC|
-| TAB | A  | S  | D  | F  | G  | H  | J  | K  | L  | ENTER  |
-|LSHIFT | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  /   |
-|LCTRL|LWIN|LALT |  SPACE   |    SPACE    |RALT |FN 3|RCTRL |
-```
-
-## Number Layer (1)
-
-Numbers are set up just like on my minivan layout, but symbols are a bit different because the AMJ40 is one key narrower than the minivan and also lacks dedicated arrows. Decided to go with `hjkl` arrows, which takes some getting used to. `;` is on a layer now because of the narrowness I mentioned before, and it (along with `-`, `=`, and `'`) moves to the right hand to leave room for the `hjkl` arrows. `delete` on `backspace`, `[` and `]` on `<` and `>`, and `\` on `/` are all stolen straight from my minivan layout.
-```
-| `  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  |DEL |
-|     | -  | =  | ;  | '  |    | ←  | ↓  | ↑  | →  |        |
-|       |    |    |    |    |    |    |    | [  | ]  |  \   |
-|     |    |     |          |             |     |    |      |
-```
-
-## Shifted Layer (2)
-
-I don't want to be using two key combos constantly, so I also added this symbol layer that is basically shift+numeric layer. Also has nav keys on top of where arrows sit on the previous layer
-```
-| ~  | !  | @  | #  | $  | %  | ^  | &  | *  | (  | )  |DEL |
-|     | _  | +  | :  | "  |    |HOME|PGDN|PGUP|END |        |
-|       |    |    |    |    |    |    |    | {  | }  |  |   |
-|     |    |     |          |             |     |    |      |
-```
-
-## Fkey Layer (3)
-
-Honestly, I use this more for jumping to my gaming layer and for reset than I use it for Fkeys. Lol. Hitting the left windows key while in this layer locks the gaming layer listed below
-```
-|    | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 |F10 |RSET|
-|     |F11 |F12 |    |    |    |    |    |    |    |        |
-|       |    |    |    |    |    |    |    |    |    |      |
-|     |FN 4|     |          |             |     |    |      |
-```
-
-## "Gaming" Layer (4)
-
-Based on the "gaming" layer on my minivan that I mostly just use for mouse keys. To toggle this back off you hit the right windows key (to go to layer 3) and then the left windows key again.
-```
-|ESC |    |    |    |    |    |MWUP|MLCK|M UP|MRCK|    |    |
-| TAB |    |    |    |    |    |MWDN|M L |M DN|M R |        |
-|       |    |    |    |    |    |    |    |    |    |      |
-|     |    |     |  SPACE   |             |     |    |      |
-```
-
diff --git a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk
deleted file mode 100644
index 780d48a438a..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = no  # Console for debug(+400)
-COMMAND_ENABLE   = no  # Commands for debug and configuration
-NKRO_ENABLE      = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-MIDI_ENABLE      = no  # MIDI controls
-AUDIO_ENABLE     = no  # Audio output on port C6
-UNICODE_ENABLE   = no  # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. It uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/amjkeyboard/amj40/keymaps/myee/config.h b/keyboards/amjkeyboard/amj40/keymaps/myee/config.h
deleted file mode 100644
index 8e6c4dfa430..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/myee/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#include "../../config.h"
-
-#define TAPPING_TERM 25
-#define RETRO_TAPPING
-#define PERMISSIVE_HOLD
-
-
-#endif
\ No newline at end of file
diff --git a/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
deleted file mode 100644
index a39e2af9690..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-#include QMK_KEYBOARD_H
-
-// Keymap myee
-// 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 _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-
-#define LOW_SPC LT(_LOWER, KC_SPC)
-#define RSE_SPC LT(_RAISE, KC_SPC)
-#define ADJ_TAB LT(ADJUST, KC_TAB)
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-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_BSPC,
-        ADJ_TAB, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    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_LCTL, KC_LGUI,KC_LALT, LOW_SPC,       RSE_SPC,        KC_RGUI,KC_RALT, KC_RCTL
-		),
-
-	[_LOWER] = LAYOUT(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_UP,   KC_MINS, KC_EQL, KC_DEL,
-		_______, _______, KC_ASTR, KC_LBRC, KC_RBRC, KC_QUOT, KC_DQUO, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSLS,
-		_______, _______, _______, KC_LPRN, KC_RPRN, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______
-		),
-	
-    [_RAISE] = LAYOUT(
-        KC_GRV,  KC_LPRN, KC_RPRN, KC_DQUO, KC_QUOT, KC_SCLN, KC_COLON,KC_UNDS, KC_PLUS, _______, _______, KC_BSPC,
-		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-		_______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, BL_UP,   BL_DOWN
-		),
-	
-    [_ADJUST] = LAYOUT(
-        _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		KC_SYSTEM_SLEEP, _______, _______, _______, _______, _______, _______, _______
-		),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- 
-  switch (keycode) {
-    
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/amjkeyboard/amj40/keymaps/myee/readme.md b/keyboards/amjkeyboard/amj40/keymaps/myee/readme.md
deleted file mode 100644
index 2659292ae54..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/myee/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-AMJ40 Default Layout
-=====================
-
-##Quantum MK Firmware
-For the full Quantum feature list, see the parent readme.md.
-
-# Features
-* Based on a combination of the original AMJ40 keymap from the TMK firmware as well as the Planck Ortholinear keyboard's "Lower," "Raise," and "Adjust" layers.
-* View the keymap.c file to understand they layout of the keymap.
-* Has keys to toggle both the switch LEDs and underglow LEDs.
-
diff --git a/keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk
deleted file mode 100644
index b8cc8b42c7b..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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   = yes # Commands for debug and configuration
-NKRO_ENABLE      = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-MIDI_ENABLE      = no  # MIDI controls
-AUDIO_ENABLE     = no  # Audio output on port C6
-UNICODE_ENABLE   = no  # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh b/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh
deleted file mode 100644
index da5457e1953..00000000000
--- a/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-git checkout amj60      # gets you on branch amj60
-git fetch origin        # gets you up to date with origin
-git merge origin/master
diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
index 973e6b33759..60cb8ee9e83 100644
--- a/keyboards/amjkeyboard/amj96/info.json
+++ b/keyboards/amjkeyboard/amj96/info.json
@@ -130,6 +130,227 @@
                 {"matrix": [0, 14], "x": 17, "y": 4},
                 {"matrix": [0, 7], "x": 18, "y": 4},
 
+                {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 8], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [6, 10], "x": 16, "y": 5},
+                {"matrix": [6, 11], "x": 17, "y": 5},
+                {"matrix": [6, 12], "x": 18, "y": 5}
+            ]
+        },
+        "LAYOUT_96_ansi_rwkl_split_num_plus_enter": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [1, 2], "x": 2, "y": 0},
+                {"matrix": [1, 3], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [1, 6], "x": 6, "y": 0},
+                {"matrix": [1, 7], "x": 7, "y": 0},
+                {"matrix": [1, 8], "x": 8, "y": 0},
+                {"matrix": [1, 9], "x": 9, "y": 0},
+                {"matrix": [1, 10], "x": 10, "y": 0},
+                {"matrix": [1, 11], "x": 11, "y": 0},
+                {"matrix": [1, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+                {"matrix": [1, 15], "x": 15, "y": 0},
+                {"matrix": [0, 9], "x": 16, "y": 0},
+                {"matrix": [0, 10], "x": 17, "y": 0},
+                {"matrix": [0, 12], "x": 18, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+                {"matrix": [2, 5], "x": 5, "y": 1},
+                {"matrix": [2, 6], "x": 6, "y": 1},
+                {"matrix": [2, 7], "x": 7, "y": 1},
+                {"matrix": [2, 8], "x": 8, "y": 1},
+                {"matrix": [2, 9], "x": 9, "y": 1},
+                {"matrix": [2, 10], "x": 10, "y": 1},
+                {"matrix": [2, 11], "x": 11, "y": 1},
+                {"matrix": [2, 12], "x": 12, "y": 1},
+                {"matrix": [2, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [2, 15], "x": 15, "y": 1},
+                {"matrix": [0, 11], "x": 16, "y": 1},
+                {"matrix": [0, 15], "x": 17, "y": 1},
+                {"matrix": [6, 15], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [3, 9], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+                {"matrix": [3, 15], "x": 16, "y": 2},
+                {"matrix": [0, 13], "x": 17, "y": 2},
+                {"matrix": [6, 13], "x": 18, "y": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 3},
+                {"matrix": [4, 2], "x": 2.75, "y": 3},
+                {"matrix": [4, 3], "x": 3.75, "y": 3},
+                {"matrix": [4, 4], "x": 4.75, "y": 3},
+                {"matrix": [4, 5], "x": 5.75, "y": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 3},
+                {"matrix": [4, 7], "x": 7.75, "y": 3},
+                {"matrix": [4, 8], "x": 8.75, "y": 3},
+                {"matrix": [4, 9], "x": 9.75, "y": 3},
+                {"matrix": [4, 10], "x": 10.75, "y": 3},
+                {"matrix": [4, 11], "x": 11.75, "y": 3},
+                {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 13], "x": 15, "y": 3},
+                {"matrix": [4, 14], "x": 16, "y": 3},
+                {"matrix": [4, 15], "x": 17, "y": 3},
+                {"matrix": [6, 14], "x": 18, "y": 3},
+
+                {"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 4},
+                {"matrix": [5, 3], "x": 3.25, "y": 4},
+                {"matrix": [5, 4], "x": 4.25, "y": 4},
+                {"matrix": [5, 5], "x": 5.25, "y": 4},
+                {"matrix": [5, 6], "x": 6.25, "y": 4},
+                {"matrix": [5, 7], "x": 7.25, "y": 4},
+                {"matrix": [5, 8], "x": 8.25, "y": 4},
+                {"matrix": [5, 9], "x": 9.25, "y": 4},
+                {"matrix": [5, 10], "x": 10.25, "y": 4},
+                {"matrix": [5, 11], "x": 11.25, "y": 4},
+                {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [5, 13], "x": 14, "y": 4},
+                {"matrix": [5, 14], "x": 15, "y": 4},
+                {"matrix": [5, 15], "x": 16, "y": 4},
+                {"matrix": [0, 14], "x": 17, "y": 4},
+                {"matrix": [0, 7], "x": 18, "y": 4},
+
+                {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 8], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [6, 10], "x": 16, "y": 5},
+                {"matrix": [6, 11], "x": 17, "y": 5},
+                {"matrix": [6, 12], "x": 18, "y": 5}
+            ]
+        },
+        "LAYOUT_96_ansi_rwkl_split_bs_num_plus_enter": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [1, 2], "x": 2, "y": 0},
+                {"matrix": [1, 3], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [1, 6], "x": 6, "y": 0},
+                {"matrix": [1, 7], "x": 7, "y": 0},
+                {"matrix": [1, 8], "x": 8, "y": 0},
+                {"matrix": [1, 9], "x": 9, "y": 0},
+                {"matrix": [1, 10], "x": 10, "y": 0},
+                {"matrix": [1, 11], "x": 11, "y": 0},
+                {"matrix": [1, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+                {"matrix": [1, 15], "x": 15, "y": 0},
+                {"matrix": [0, 9], "x": 16, "y": 0},
+                {"matrix": [0, 10], "x": 17, "y": 0},
+                {"matrix": [0, 12], "x": 18, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+                {"matrix": [2, 5], "x": 5, "y": 1},
+                {"matrix": [2, 6], "x": 6, "y": 1},
+                {"matrix": [2, 7], "x": 7, "y": 1},
+                {"matrix": [2, 8], "x": 8, "y": 1},
+                {"matrix": [2, 9], "x": 9, "y": 1},
+                {"matrix": [2, 10], "x": 10, "y": 1},
+                {"matrix": [2, 11], "x": 11, "y": 1},
+                {"matrix": [2, 12], "x": 12, "y": 1},
+                {"matrix": [2, 13], "x": 13, "y": 1},
+                {"matrix": [2, 14], "x": 14, "y": 1},
+                {"matrix": [2, 15], "x": 15, "y": 1},
+                {"matrix": [0, 11], "x": 16, "y": 1},
+                {"matrix": [0, 15], "x": 17, "y": 1},
+                {"matrix": [6, 15], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [3, 9], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+                {"matrix": [3, 15], "x": 16, "y": 2},
+                {"matrix": [0, 13], "x": 17, "y": 2},
+                {"matrix": [6, 13], "x": 18, "y": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 3},
+                {"matrix": [4, 2], "x": 2.75, "y": 3},
+                {"matrix": [4, 3], "x": 3.75, "y": 3},
+                {"matrix": [4, 4], "x": 4.75, "y": 3},
+                {"matrix": [4, 5], "x": 5.75, "y": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 3},
+                {"matrix": [4, 7], "x": 7.75, "y": 3},
+                {"matrix": [4, 8], "x": 8.75, "y": 3},
+                {"matrix": [4, 9], "x": 9.75, "y": 3},
+                {"matrix": [4, 10], "x": 10.75, "y": 3},
+                {"matrix": [4, 11], "x": 11.75, "y": 3},
+                {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 13], "x": 15, "y": 3},
+                {"matrix": [4, 14], "x": 16, "y": 3},
+                {"matrix": [4, 15], "x": 17, "y": 3},
+                {"matrix": [6, 14], "x": 18, "y": 3},
+
+                {"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 4},
+                {"matrix": [5, 3], "x": 3.25, "y": 4},
+                {"matrix": [5, 4], "x": 4.25, "y": 4},
+                {"matrix": [5, 5], "x": 5.25, "y": 4},
+                {"matrix": [5, 6], "x": 6.25, "y": 4},
+                {"matrix": [5, 7], "x": 7.25, "y": 4},
+                {"matrix": [5, 8], "x": 8.25, "y": 4},
+                {"matrix": [5, 9], "x": 9.25, "y": 4},
+                {"matrix": [5, 10], "x": 10.25, "y": 4},
+                {"matrix": [5, 11], "x": 11.25, "y": 4},
+                {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [5, 13], "x": 14, "y": 4},
+                {"matrix": [5, 14], "x": 15, "y": 4},
+                {"matrix": [5, 15], "x": 16, "y": 4},
+                {"matrix": [0, 14], "x": 17, "y": 4},
+                {"matrix": [0, 7], "x": 18, "y": 4},
+
                 {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
                 {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
                 {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
diff --git a/keyboards/amjkeyboard/amj96/matrix.c b/keyboards/amjkeyboard/amj96/matrix.c
index 2999c6241ba..7faf40d4fe7 100644
--- a/keyboards/amjkeyboard/amj96/matrix.c
+++ b/keyboards/amjkeyboard/amj96/matrix.c
@@ -88,7 +88,7 @@ uint8_t matrix_scan(void)
         if (matrix_debouncing[i] != cols) {
             matrix_debouncing[i] = cols;
             if (debouncing) {
-                debug("bounce!: "); debug_hex(debouncing); debug("\n");
+                dprintf("bounce!: %02X\n", debouncing);
             }
             debouncing = DEBOUNCE;
         }
diff --git a/keyboards/amjkeyboard/amj96/matrix_diagram.md b/keyboards/amjkeyboard/amj96/matrix_diagram.md
new file mode 100644
index 00000000000..6bd94f88bef
--- /dev/null
+++ b/keyboards/amjkeyboard/amj96/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for Han Chen AMJ96
+
+There's a lot of options available on the PCB, including some on the
+bottom row, but I haven't ever found high quality images of a bare PCB
+with which to determine what's actually supported. :\\\
+\- @noroadsleft, 19 January, 2024
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │09 │0A │0C │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤      ┌───────┐
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2F │0B │0F │6F │      │2D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤      └─┬─────┤                ┌─────┐               ┌───┐
+│30   │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D   │3E │3F │0D │6D │        │     │                │3D   │               │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┼───┤     ┌──┴┐??  │ ISO Enter   ┌──┴┬────┤ Split Enter   │?? │ 2u Numpad Plus
+│40    │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C      │4D │4E │4F │6E │     │?? │    │             │?? │??  │               │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤   ┌─┴───┴────┤             └───┴────┘               ├───┤
+│50  │51 │52 │53 │54 │55 │56 │57 │58 │59 │5A │5B │5C    │5D │5E │5F │0E │07 │   │??        │ 2.75u                                │   │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┼───┤   └──────────┘ RShift                               │?? │ 2u Numpad Enter
+│60  │61  │62  │63                      │64   │65   │66 │68 │69 │6A │6B │6C │                                                     │   │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘                                                     └───┘
+┌────────┐                                                  ┌───────┐
+│50      │ 2.25u LShift                                     │??     │ 2u Numpad Zero
+└────────┘                                                  └───────┘
+```
diff --git a/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
deleted file mode 100644
index 8b6fd4da516..00000000000
--- a/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef RGBLIGHT_ENABLE
-#include "rgblight.h"
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-------------------.
-   * |Esc |Setp| -  | =  |
-   * |----|----|----|----|
-   * | F1 | F2 | F3 | F4 |
-   * |----|----|----|----|
-   * | 7  | 8  | 9  |  - |
-   * |----|----|----|----|
-   * | 4  | 5  | 6  | LF |
-   * |----|----|----|----|
-   * | 1  | 2  | 3  | \  |
-   * |----|----|----|----|
-   * |Left|Down| Up |Rght|
-   * `-------------------'
-   */
-
-  [_BL] = LAYOUT_ortho_6x4(
-    KC_ESC,  KC_TAB,  KC_MINS,KC_EQL,
-    KC_F1,   KC_F2,   KC_F3,  KC_F4,
-    KC_P7,   KC_P8,   KC_P9,  KC_PMNS,
-    KC_P4,   KC_P5,   KC_P6,  KC_PENT,
-    KC_P1,   KC_P2,   KC_P3,  KC_BSLS,
-    KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT
-  ),
-
-  /* Keymap _FL: Function Layer
-   * ,-------------------.
-   * |Esc |TAB |BS  | =  |
-   * |----|----|----|----|
-   * | NL | /  | *  | -  |
-   * |----|----|----|----|
-   * | 7  | 8  | 9  |    |
-   * |----|----|----|RST |
-   * | 4  | 5  | 6  |    |
-   * |----|----|----|----|
-   * | 1  | 2  | 3  |    |
-   * |----|----|----| En |
-   * |   0     |./FN|    |
-   * `-------------------'
-   */
-  [_FL] = LAYOUT_ortho_6x4(
-    KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL,
-    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    KC_P7,   KC_P8,   KC_P9,   QK_BOOT,
-    KC_P4,   KC_P5,   KC_P6,   KC_PENT,
-    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-  ),
-};
diff --git a/keyboards/an_achronism/tetromino/config.h b/keyboards/an_achronism/tetromino/config.h
index e543d7ae241..c7087edb880 100644
--- a/keyboards/an_achronism/tetromino/config.h
+++ b/keyboards/an_achronism/tetromino/config.h
@@ -16,8 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
+
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RGB_MATRIX_LED_COUNT 70
 
 /* disable debug print */
 //#define NO_DEBUG
diff --git a/keyboards/an_achronism/tetromino/keymaps/indicators/config.h b/keyboards/an_achronism/tetromino/keymaps/indicators/config.h
deleted file mode 100644
index f117063fb1a..00000000000
--- a/keyboards/an_achronism/tetromino/keymaps/indicators/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2022 an_achronism (@an-achronism)
-
-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_TRIGGER_ON_KEYDOWN
-
-/* 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
diff --git a/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c b/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
deleted file mode 100644
index 17d83860895..00000000000
--- a/keyboards/an_achronism/tetromino/keymaps/indicators/keymap.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-Copyright 2022 an_achronism (@an-achronism)
-
-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] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Del│
-     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
-     * │Tab| Q │ W │ E | R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bsp│
-     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
-     * │Ctl│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │UK#│Rtn|
-     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
-     * │Sft│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Sft│ ↑ │App|
-     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
-     * │Esc│Ctl│Alt│GUI│L_1│Spc│L_2|GUI│Alt│Ctl|UK\│ ← │ ↓ │ → │
-     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
-     */
-    [0] = LAYOUT_ortho_5x14(
-        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_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_BSPC,
-        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,
-        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, RSFT_T(KC_APP),
-        KC_ESC,  KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  MO(2),   KC_RGUI, KC_RALT, KC_RCTL, KC_NUBS, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_ortho_5x14(
-        KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PEQL, _______, _______, _______, KC_PWR,
-        _______, _______, KC_UP,   _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_PAUS, KC_ESC,  _______, KC_SLEP,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______, _______, _______, KC_CALC,
-        KC_CAPS, _______, _______, _______, _______, KC_PAUS, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, KC_CAPS, _______, _______,
-        _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, _______, _______, _______, _______, _______, _______
-    ),
-    [2] = LAYOUT_ortho_5x14(
-        _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP,
-        _______, KC_F4,   KC_F3,   KC_F2,   KC_F1,   _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, C(KC_BRK), KC_ESC, _______, _______,
-        _______, KC_F8,   KC_F7,   KC_F6,   KC_F5,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, KC_MPRV, KC_MNXT, KC_MPLY,
-        KC_CAPS, KC_F12,  KC_F11,  KC_F10,  KC_F9,  C(KC_BRK),_______, _______, _______, _______, _______, KC_CAPS, _______, KC_PSCR,
-        _______, _______, _______, _______, MO(3),   _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-    [3] = LAYOUT_ortho_5x14(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
-
-// Initialise RBG matrix with all LEDs set to solid colour and zero HSV (i.e. off):
-void keyboard_post_init_user(void) {
-    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-    rgb_matrix_sethsv_noeeprom(HSV_OFF);
-};
-
-// Custom RGB indicator behaviour:
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t led_processed_count = 0;
-    for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
-        for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
-            if (led_processed_count == RGB_MATRIX_LED_PROCESS_LIMIT){
-                return;
-            }
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            uint16_t keycode = keymap_key_to_keycode(0, (keypos_t){col,row});
-            if (led_index >= led_min && led_index <= led_max && led_index != NO_LED) {
-                // Light base layer arrow keys orange if Scroll Lock is on, otherwise light them magenta:
-                led_processed_count++;
-                if (keycode >= KC_RIGHT && keycode <= KC_UP) {
-                    if (host_keyboard_led_state().scroll_lock) {
-                        rgb_matrix_set_color(led_index, RGB_ORANGE);
-                    } else {
-                        rgb_matrix_set_color(led_index, RGB_MAGENTA);
-                    }
-                }
-                // Light alpha keys (A-Z only) red if Caps Lock is on:
-                if (host_keyboard_led_state().caps_lock && keycode >= KC_A && keycode <= KC_Z) {
-                    rgb_matrix_set_color(led_index, RGB_RED);
-                }
-                // Whenever a layer above base is active, recolour only the keys that are different on that layer:
-                if (get_highest_layer(layer_state) > 0) {
-                    uint8_t layer = get_highest_layer(layer_state);
-                    uint16_t momentary_keycode = keymap_key_to_keycode(layer, (keypos_t){col,row});
-                    if (momentary_keycode > KC_TRNS) {
-                        switch(layer) {
-                            case 2:
-                                // The uppermost layer is blue:
-                                rgb_matrix_set_color(led_index, RGB_BLUE);
-                                break;
-                            case 1:
-                                // The middle layer is green, except that the numpad section turns
-                                // orange when Num Lock is on:
-                                if (host_keyboard_led_state().num_lock &&
-                                (momentary_keycode == KC_KP_EQUAL ||
-                                (momentary_keycode >= KC_NUM_LOCK && momentary_keycode <= KC_KP_DOT)
-                                )) {
-                                    rgb_matrix_set_color(led_index, RGB_ORANGE);
-                                } else {
-                                    rgb_matrix_set_color(led_index, RGB_GREEN);
-                                }
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return false;
-}
diff --git a/keyboards/anavi/arrows/config.h b/keyboards/anavi/arrows/config.h
index 02e7781e570..59b2a11aaea 100644
--- a/keyboards/anavi/arrows/config.h
+++ b/keyboards/anavi/arrows/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 /* Double tap reset button to enter bootloader */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/anavi/arrows/info.json b/keyboards/anavi/arrows/info.json
index bdda15695ac..48dae7b2eab 100644
--- a/keyboards/anavi/arrows/info.json
+++ b/keyboards/anavi/arrows/info.json
@@ -35,6 +35,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "ws2812": {
diff --git a/keyboards/anavi/knob1/config.h b/keyboards/anavi/knob1/config.h
index 338f5d8dbe4..07cea802b30 100644
--- a/keyboards/anavi/knob1/config.h
+++ b/keyboards/anavi/knob1/config.h
@@ -3,14 +3,11 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE 9
-
 /* Double tap reset button to enter bootloader */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
-
 #define I2C_DRIVER I2CD1
 #define I2C1_SDA_PIN GP6
 #define I2C1_SCL_PIN GP7
diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json
index 06acec583fe..551d059badf 100644
--- a/keyboards/anavi/knob1/info.json
+++ b/keyboards/anavi/knob1/info.json
@@ -17,9 +17,6 @@
     "rgblight": {
         "led_count": 1,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "max_brightness": 255,
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -31,6 +28,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "ws2812": {
diff --git a/keyboards/anavi/macropad12/config.h b/keyboards/anavi/macropad12/config.h
index 02e7781e570..59b2a11aaea 100644
--- a/keyboards/anavi/macropad12/config.h
+++ b/keyboards/anavi/macropad12/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 /* Double tap reset button to enter bootloader */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/anavi/macropad12/info.json b/keyboards/anavi/macropad12/info.json
index f0f6d6ca60a..3a1a07a0a1c 100644
--- a/keyboards/anavi/macropad12/info.json
+++ b/keyboards/anavi/macropad12/info.json
@@ -34,6 +34,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "ws2812": {
diff --git a/keyboards/anavi/macropad8/keymaps/git/config.h b/keyboards/anavi/macropad8/keymaps/git/config.h
deleted file mode 100644
index 370eb86ca87..00000000000
--- a/keyboards/anavi/macropad8/keymaps/git/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Leon Anavi <leon@anavi.org>
- *
- * 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
-
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/anavi/macropad8/keymaps/git/keymap.c b/keyboards/anavi/macropad8/keymaps/git/keymap.c
deleted file mode 100644
index 9b7afb5d695..00000000000
--- a/keyboards/anavi/macropad8/keymaps/git/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Copyright 2021 Leon Anavi <leon@anavi.org>
- *
- * 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 _MAIN 0
-#define _FN 1
-
-/*
- * This keymap contains the following shortcuts for Git. On the
- * first row from left to right:
- *
- * git status
- * git log
- * git pull
- * git push
- *
- * On the second row from left to right:
- *
- * git diff
- * git add
- * git commit
- * FN key to switch to the 2nd layout and control lights
- *
- */
-
-enum custom_keycodes {
-	GITCOMMIT = SAFE_RANGE,
-	GITPUSH,
-	GITPULL,
-	GITSTATUS,
-	GITDIFF,
-	GITLOG,
-	GITADD
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-	case GITCOMMIT:
-		if (record->event.pressed) {
-			SEND_STRING("git commit -s\n");
-		}
-	break;
-	case GITPUSH:
-		if (record->event.pressed) {
-			SEND_STRING("git push\n");
-		}
-	break;
-	case GITPULL:
-		if (record->event.pressed) {
-			SEND_STRING("git pull\n");
-		}
-	break;
-	case GITSTATUS:
-		if (record->event.pressed) {
-			SEND_STRING("git status\n");
-		}
-	break;
-	case GITDIFF:
-		if (record->event.pressed) {
-			SEND_STRING("git diff ");
-		}
-	break;
-	case GITLOG:
-		if (record->event.pressed) {
-			SEND_STRING("git log\n");
-		}
-	break;
-	case GITADD:
-		if (record->event.pressed) {
-			SEND_STRING("git add ");
-		}
-	break;
-	}
-	return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = LAYOUT_ortho_2x4(
-     GITSTATUS, GITLOG, GITPULL, GITPUSH,
-     GITDIFF, GITADD, GITCOMMIT, MO(_FN)
-  ),
-
-  [_FN] = LAYOUT_ortho_2x4(
-     RGB_TOG, RGB_MOD, RGB_M_R, RGB_M_SN,
-     BL_TOGG, BL_STEP, BL_BRTG, _______
-  )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
-  oled_write_P(PSTR("Active layer: "), false);
-
-  switch (get_highest_layer(layer_state)) {
-    case _MAIN:
-      oled_write_ln_P(PSTR("Git"), false);
-      break;
-    case _FN:
-      oled_write_ln_P(PSTR("FN"), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR("N/A"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(PSTR("Num Lock: "), false);
-  oled_write_ln_P(led_state.num_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Caps Lock: "), false);
-  oled_write_ln_P(led_state.caps_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Scroll Lock: "), false);
-  oled_write_ln_P(led_state.scroll_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Backlit: "), false);
-  oled_write_ln_P(is_backlight_enabled() ? PSTR("On") : PSTR("Off"), false);
-#ifdef RGBLIGHT_ENABLE
-  static char rgbStatusLine1[26] = {0};
-  snprintf(rgbStatusLine1, sizeof(rgbStatusLine1), "RGB Mode: %d", rgblight_get_mode());
-  oled_write_ln(rgbStatusLine1, false);
-  static char rgbStatusLine2[26] = {0};
-  snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
-  oled_write_ln(rgbStatusLine2, false);
-#endif
-    return false;
-}
-#endif
diff --git a/keyboards/anavi/macropad8/keymaps/kicad/keymap.c b/keyboards/anavi/macropad8/keymaps/kicad/keymap.c
deleted file mode 100644
index e75d588478c..00000000000
--- a/keyboards/anavi/macropad8/keymaps/kicad/keymap.c
+++ /dev/null
@@ -1,118 +0,0 @@
- /* Copyright 2020 Leon Anavi <leon@anavi.org>
-  *
-  * 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 _SCH 0
-#define _PCB 1
-#define _FN 2
-
-#define KC_X0 LT(_FN, KC_ESC)
-
-#ifdef RGBLIGHT_ENABLE
-// How long (in ms) to wait between animation steps for the rainbow mode
-const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {60, 30, 15};
-// How long (in milliseconds) to wait between animation steps for each of the "Swirling rainbow" animations
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 10, 4};
-#endif
-
-/*
- * The keymap contains 2 layers for KiCad hotkeys and a 3rd layer
- * for controlling the backlighting and the underlighting.
- *
- * - Layer for KiCad Schematic hotkeys:
- * m - to move selected component
- * r - to rotate selected component
- * w - to wire components
- * v - to edit component value
- * F1 - zoom in
- * F2 - zoom out
- * F4 - zoom center
- *
- * - Layer for KiCad PCB layout hotkets:
- * m - to move selected component
- * r - to rotate selected component
- * x - to route a new track
- * v - to add a via
- * F1 - zoom in
- * F2 - zoom out
- * F4 - zoom center
- *
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_SCH] = LAYOUT_ortho_2x4(
-     KC_M, KC_R, KC_W, KC_V,
-     KC_F1, KC_F2, KC_F4, TO(_PCB)
-  ),
-
-  [_PCB] = LAYOUT_ortho_2x4(
-     KC_M, KC_R, KC_X, KC_V,
-     KC_F1, KC_F2, KC_F4, TO(_FN)
-  ),
-
-  [_FN] = LAYOUT_ortho_2x4(
-     RGB_TOG, RGB_MOD, RGB_M_R, RGB_M_SN,
-     BL_TOGG, BL_STEP, BL_BRTG, TO(_SCH)
-  )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
-  oled_write_P(PSTR("Layer: "), false);
-
-  switch (get_highest_layer(layer_state)) {
-    case _SCH:
-      oled_write_ln_P(PSTR("KiCad Schema"), false);
-      break;
-    case _PCB:
-      oled_write_ln_P(PSTR("KiCad PCB"), false);
-      break;
-    case _FN:
-      oled_write_ln_P(PSTR("FN "), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR("N/A"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(PSTR("Num Lock: "), false);
-  oled_write_ln_P(led_state.num_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Caps Lock: "), false);
-  oled_write_ln_P(led_state.caps_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Scroll Lock: "), false);
-  oled_write_ln_P(led_state.scroll_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Backlit: "), false);
-  oled_write_ln_P(is_backlight_enabled() ? PSTR("On") : PSTR("Off"), false);
-#ifdef RGBLIGHT_ENABLE
-  static char rgbStatusLine1[26] = {0};
-  snprintf(rgbStatusLine1, sizeof(rgbStatusLine1), "RGB Mode: %d", rgblight_get_mode());
-  oled_write_ln(rgbStatusLine1, false);
-  static char rgbStatusLine2[26] = {0};
-  snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
-  oled_write_ln(rgbStatusLine2, false);
-#endif
-    return false;
-}
-#endif
diff --git a/keyboards/anavi/macropad8/keymaps/kodi/keymap.c b/keyboards/anavi/macropad8/keymaps/kodi/keymap.c
deleted file mode 100644
index f99a22d7233..00000000000
--- a/keyboards/anavi/macropad8/keymaps/kodi/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _MAIN 0
-#define _FN 1
-
-#define KC_X0 LT(_FN, KC_ESC)
-
-#ifdef RGBLIGHT_ENABLE
-// How long (in ms) to wait between animation steps for the rainbow mode
-const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {60, 30, 15};
-// How long (in milliseconds) to wait between animation steps for each of the "Swirling rainbow" animations
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 10, 4};
-#endif
-
-/**
- * Kodi shortcuts:
- *
- * ESC - Previous menu OR Home screen
- * Enter - Select
- * X - Stop
- * Arrows to move
- *
- * For details have a look at:
- * https://kodi.wiki/view/Keyboard_controls
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = LAYOUT_ortho_2x4(
-     KC_ESC, KC_UP, KC_ENTER, KC_X,
-     KC_LEFT, KC_DOWN, KC_RIGHT, MO(_FN)
-  ),
-
-  [_FN] = LAYOUT_ortho_2x4(
-     RGB_TOG, RGB_MOD, RGB_M_R, RGB_M_SN,
-     BL_TOGG, BL_STEP, BL_BRTG, _______
-  )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
-  oled_write_P(PSTR("Active layer: "), false);
-
-  switch (get_highest_layer(layer_state)) {
-    case _MAIN:
-      oled_write_ln_P(PSTR("Kodi"), false);
-      break;
-    case _FN:
-      oled_write_ln_P(PSTR("FN"), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR("N/A"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(PSTR("Num Lock: "), false);
-  oled_write_ln_P(led_state.num_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Caps Lock: "), false);
-  oled_write_ln_P(led_state.caps_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Scroll Lock: "), false);
-  oled_write_ln_P(led_state.scroll_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Backlit: "), false);
-  oled_write_ln_P(is_backlight_enabled() ? PSTR("On") : PSTR("Off"), false);
-#ifdef RGBLIGHT_ENABLE
-  static char rgbStatusLine1[26] = {0};
-  snprintf(rgbStatusLine1, sizeof(rgbStatusLine1), "RGB Mode: %d", rgblight_get_mode());
-  oled_write_ln(rgbStatusLine1, false);
-  static char rgbStatusLine2[26] = {0};
-  snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
-  oled_write_ln(rgbStatusLine2, false);
-#endif
-    return false;
-}
-#endif
diff --git a/keyboards/anavi/macropad8/keymaps/obs/keymap.c b/keyboards/anavi/macropad8/keymaps/obs/keymap.c
deleted file mode 100644
index 1d9fd38eed1..00000000000
--- a/keyboards/anavi/macropad8/keymaps/obs/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
- /* Copyright 2020 Leon Anavi <leon@anavi.org>
-  *
-  * 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 _MAIN 0
-#define _FN 1
-
-#define KC_X0 LT(_FN, KC_ESC)
-
-#ifdef RGBLIGHT_ENABLE
-// How long (in ms) to wait between animation steps for the rainbow mode
-const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {60, 30, 15};
-// How long (in milliseconds) to wait between animation steps for each of the "Swirling rainbow" animations
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 10, 4};
-#endif
-
-/*
- * This keymap contains the following shortcuts for OBS:
- *
- * - Shortcuts useful for switching scenes on the 1st row:
- *   Hold Left Control, Shift, Alt and GUI and press F9
- *   Hold Left Control, Shift, Alt and GUI and press F10
- *   Hold Left Control, Shift, Alt and GUI and press F11
- *   Hold Left Control, Shift, Alt and GUI and press F12
- * - Center to screen: Ctrl+D
- * - Fit to screen: Ctrl+F
- * - Move source to top of sources list: Ctrl+Home
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = LAYOUT_ortho_2x4(
-     HYPR(KC_F9), HYPR(KC_F10), HYPR(KC_F11), HYPR(KC_F12),
-     LCTL(KC_D), LCTL(KC_F), LCTL(KC_HOME), MO(_FN)
-  ),
-
-  [_FN] = LAYOUT_ortho_2x4(
-     RGB_TOG, RGB_MOD, RGB_M_R, RGB_M_SN,
-     BL_TOGG, BL_STEP, BL_BRTG, _______
-  )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
-  oled_write_P(PSTR("Active layer: "), false);
-
-  switch (get_highest_layer(layer_state)) {
-    case _MAIN:
-      oled_write_ln_P(PSTR("OBS"), false);
-      break;
-    case _FN:
-      oled_write_ln_P(PSTR("FN"), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR("N/A"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(PSTR("Num Lock: "), false);
-  oled_write_ln_P(led_state.num_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Caps Lock: "), false);
-  oled_write_ln_P(led_state.caps_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Scroll Lock: "), false);
-  oled_write_ln_P(led_state.scroll_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Backlit: "), false);
-  oled_write_ln_P(is_backlight_enabled() ? PSTR("On") : PSTR("Off"), false);
-#ifdef RGBLIGHT_ENABLE
-  static char rgbStatusLine1[26] = {0};
-  snprintf(rgbStatusLine1, sizeof(rgbStatusLine1), "RGB Mode: %d", rgblight_get_mode());
-  oled_write_ln(rgbStatusLine1, false);
-  static char rgbStatusLine2[26] = {0};
-  snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
-  oled_write_ln(rgbStatusLine2, false);
-#endif
-    return false;
-}
-#endif
diff --git a/keyboards/anavi/macropad8/keymaps/vlc/keymap.c b/keyboards/anavi/macropad8/keymaps/vlc/keymap.c
deleted file mode 100644
index 3ea53c57cb0..00000000000
--- a/keyboards/anavi/macropad8/keymaps/vlc/keymap.c
+++ /dev/null
@@ -1,139 +0,0 @@
- /* Copyright 2021 Marc Nause <marc.nause@gmx.de>
-  *
-  * 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 custom_layers {
-    _PLAY,
-    _FRAME,
-    _DVD,
-    _FN
-};
-
-#define KC_X0 LT(_FN, KC_ESC)
-
-#ifdef RGBLIGHT_ENABLE
-// How long (in ms) to wait between animation steps for the rainbow mode
-const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {60, 30, 15};
-// How long (in milliseconds) to wait between animation steps for each of the "Swirling rainbow" animations
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 10, 4};
-#endif
-
-/*
- * The keymap contains 3 layers for vlc hotkeys and a 4th layer
- * for controlling the backlighting and the underlighting.
- *
- * See https://wiki.videolan.org/QtHotkeys/ for VLC hotkeys
- *
- * - Layer for VLC media play hotkeys:
- * Space                 - Play/pause
- * P                     - Previous track
- * S                     - Stop
- * N                     - Next track
- * +                     - Slower
- * -                     - Faster
- * =                     - Normal rate
- *
- * - Layer for VLC frame control hotkeys:
- * Shift + right arrow   - Jump 5 seconds forward
- * Alt + right arrow     - Jump 10 seconds forward
- * Control + right arrow - Jump 1 minute forward
- * E                     - Next frame
- * Shift + left arrow    - Jump 5 seconds back
- * Alt + left arrow      - Jump 10 seconds back
- * Control + left arrow  - Jump 1 minute back
- *
- * - Layer for VLC DVD hotkeys:
- * Shift + M             - Disc menu
- * Arrow up              - Navigate menu (up)
- * Enter                 - Select menu entry
- * Shift + V             - Toggle subtitles
- * Arrow left            - Navigate menu (left)
- * Arrow down            - Navigate menu (down)
- * Arrow right           - Navigate menu (right)
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_PLAY] = LAYOUT_ortho_2x4(
-     KC_SPC, KC_P, KC_S, KC_N,
-     KC_KP_PLUS, KC_KP_MINUS, KC_KP_EQUAL, TO(_FRAME)
-  ),
-
-  [_FRAME] = LAYOUT_ortho_2x4(
-     LSFT(KC_RIGHT), LALT(KC_RIGHT), LCTL(KC_RIGHT), KC_E,
-     LSFT(KC_LEFT), LALT(KC_LEFT), LCTL(KC_LEFT), TO(_DVD)
-  ),
-
-  [_DVD] = LAYOUT_ortho_2x4(
-     LSFT(KC_M), KC_UP, KC_ENTER, LSFT(KC_V),
-     KC_LEFT, KC_DOWN, KC_RIGHT, TO(_FN)
-  ),
-
-  [_FN] = LAYOUT_ortho_2x4(
-     RGB_TOG, RGB_MOD, RGB_M_R, RGB_M_SN,
-     BL_TOGG, BL_STEP, BL_BRTG, TO(_PLAY)
-  )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
-  oled_write_P(PSTR("Layer: "), false);
-
-  switch (get_highest_layer(layer_state)) {
-    case _PLAY:
-      oled_write_ln_P(PSTR("VLC Play"), false);
-      break;
-    case _FRAME:
-      oled_write_ln_P(PSTR("VLC Frame"), false);
-      break;
-    case _DVD:
-      oled_write_ln_P(PSTR("VLC DVD"), false);
-      break;
-    case _FN:
-      oled_write_ln_P(PSTR("FN "), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR("N/A"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(PSTR("Num Lock: "), false);
-  oled_write_ln_P(led_state.num_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Caps Lock: "), false);
-  oled_write_ln_P(led_state.caps_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Scroll Lock: "), false);
-  oled_write_ln_P(led_state.scroll_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Backlit: "), false);
-  oled_write_ln_P(is_backlight_enabled() ? PSTR("On") : PSTR("Off"), false);
-#ifdef RGBLIGHT_ENABLE
-  static char rgbStatusLine1[26] = {0};
-  snprintf(rgbStatusLine1, sizeof(rgbStatusLine1), "RGB Mode: %d", rgblight_get_mode());
-  oled_write_ln(rgbStatusLine1, false);
-  static char rgbStatusLine2[26] = {0};
-  snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
-  oled_write_ln(rgbStatusLine2, false);
-#endif
-    return false;
-}
-#endif
diff --git a/keyboards/anavi/macropad8/keymaps/vscode/config.h b/keyboards/anavi/macropad8/keymaps/vscode/config.h
deleted file mode 100644
index dd687cad58f..00000000000
--- a/keyboards/anavi/macropad8/keymaps/vscode/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define LAYER_STATE_8BIT
diff --git a/keyboards/anavi/macropad8/keymaps/vscode/keymap.c b/keyboards/anavi/macropad8/keymaps/vscode/keymap.c
deleted file mode 100644
index 46d4a7d8b37..00000000000
--- a/keyboards/anavi/macropad8/keymaps/vscode/keymap.c
+++ /dev/null
@@ -1,227 +0,0 @@
- /* Copyright 2022 Efthimis Iosifidis <iosifidise@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 layers {
-    _BASIC,
-    _BRACKETS,
-    _SELECTORS,
-    _FN,
-};
-
-
-#define KC_X0 LT(_FN, KC_ESC)
-
-static char current_alpha_oled [12] = "None";
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* _BASIC Layer
- * ,-------------------------------------.
- * | Toggle  | Toggle  |        |         |
- * | Block   | Line    |  Undo  | Search  |
- * | Comment | Comment |        |         |
- * |---------+---------+--------+---------+
- * |         |         |        |   TO    |
- * |  Cut    |   Copy  |  Paste | _BASIC  |
- * |         |         |        |         |
- *  `-------------------------------------'
- */ 
-  [_BASIC] = LAYOUT_ortho_2x4(
-     RCS(KC_A),  LCTL(KC_SLASH), LCTL(KC_Z),  LCTL(KC_F),
-     LCTL(KC_X), LCTL(KC_C),     LCTL(KC_V),  TO(_BRACKETS)
-  ),
-/* _BRACKETS Layer
- * ,-----------------------------------------.
- * |         |         |        |            |
- * |  (      |   [     |   {    |   Bksp     |
- * |         |         |        |            |
- * |---------+---------+--------+------------+
- * |         |         |        |   TO       |
- * |  Del    |   Copy  |  Paste | _SELECTORS |
- * |         |         |        |            |
- *  `----------------------------------------'
- */ 
-  [_BRACKETS] = LAYOUT_ortho_2x4(
-     S(KC_9), KC_LBRC, S(KC_LBRC), KC_BACKSPACE,
-     KC_DEL, C(KC_C), C(KC_V),    TO(_SELECTORS)
-  ),
-/* _SELECTORS Layer
-* ,-------------------------------------.
-* |         |         |        |         |
-* | Select  |  Save   |  Undo  |   Bksp  |
-* |   All   |         |        |         |
-* |---------+---------+--------+---------+
-* |         |         |        |   TO    |
-* |  Cut    |   Copy  |  Paste |   _FN   |
-* |         |         |        |         |
-*  `-------------------------------------'
-*/ 
- [_SELECTORS] = LAYOUT_ortho_2x4(
-   C(KC_A), C(KC_S),  C(KC_Z), KC_BACKSPACE,
-   C(KC_X), C(KC_C), C(KC_V),  TO(_FN)
-  ),
-/* _FN Layer
- * ,--------------------------------------------.
- * | RGB       |  RGB      |  RGB      | RGB     |
- * | Toggle    |  Mode     |  Mode     | Snake   |
- * |           |  Forward  | Reverse   | Mode    |
- * |-----------+-----------+-----------+---------+
- * |           |  Cycle    |  Toggle   |  TO     |
- * | BackLight | BackLight | BackLight |  _BASIC |
- * |  Toggle   |   Levels  | Breathing |         |
- *  `--------------------------------------------'
- */ 
-  [_FN] = LAYOUT_ortho_2x4(
-     RGB_TOG, RGB_MOD, RGB_M_R, RGB_M_SN,
-     BL_TOGG, BL_STEP, BL_BRTG, TO(_BASIC)
-  )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        char string [33];
-        switch(keycode)
-        {
-            //First Layer with Basic Keys
-            case LCTL(KC_X):
-                strncpy(current_alpha_oled, "Cut", sizeof(current_alpha_oled));
-                break;
-            case LCTL(KC_F):
-                strncpy(current_alpha_oled, "Search", sizeof(current_alpha_oled));
-                break;
-            case LCTL(KC_Z):
-                strncpy(current_alpha_oled, "Undo", sizeof(current_alpha_oled));
-                break;
-            case LCTL(KC_C):
-                strncpy(current_alpha_oled, "Copy", sizeof(current_alpha_oled));
-                break;
-            case LCTL(KC_V):
-                strncpy(current_alpha_oled, "Paste", sizeof(current_alpha_oled));
-                break;
-            case RCS(KC_A):
-                strncpy(current_alpha_oled, "Block cmt.", sizeof(current_alpha_oled));
-                break;
-            case LCTL(KC_SLASH):
-                strncpy(current_alpha_oled, "Line cmt.", sizeof(current_alpha_oled));
-                break;
-            //Second Layer with Brackets
-            case S(KC_9):
-                strncpy(current_alpha_oled, "()", sizeof(current_alpha_oled));
-                break;
-            case KC_LBRC:
-                strncpy(current_alpha_oled, "[]", sizeof(current_alpha_oled));
-                break;
-            case S(KC_LBRC):
-                strncpy(current_alpha_oled, "{}", sizeof(current_alpha_oled));
-                break;
-            case KC_BACKSPACE:
-                strncpy(current_alpha_oled, "Backspace", sizeof(current_alpha_oled));
-                break;
-            case KC_DEL:
-                strncpy(current_alpha_oled, "Del", sizeof(current_alpha_oled));
-                break;
-            // Selector Layer keys
-            case C(KC_A):
-                strncpy(current_alpha_oled, "Select All", sizeof(current_alpha_oled));
-                break;
-            case C(KC_S):
-                strncpy(current_alpha_oled, "Save", sizeof(current_alpha_oled));
-                break;
-            // FN Layer keys
-            case RGB_TOG:
-                strncpy(current_alpha_oled, "RGB Toggle", sizeof(current_alpha_oled));
-                break;
-            case RGB_MOD:
-                strncpy(current_alpha_oled, "RGB Fwd", sizeof(current_alpha_oled));
-                break;
-            case RGB_M_R:
-                strncpy(current_alpha_oled, "RGB Rev", sizeof(current_alpha_oled));
-                break;
-            case RGB_MODE_SNAKE:
-                strncpy(current_alpha_oled, "RGB Snk", sizeof(current_alpha_oled));
-                break;
-            case BL_TOGG:
-                strncpy(current_alpha_oled, "BkLgt Tog", sizeof(current_alpha_oled));
-                break;
-            case BL_STEP:
-                strncpy(current_alpha_oled, "BkLgt Lvl", sizeof(current_alpha_oled));
-                break;
-            case BL_BRTG:
-                strncpy(current_alpha_oled, "BkLgt Brth", sizeof(current_alpha_oled));
-                break;
-            //FN Key keycodes
-            case TO(_BASIC) ... TO(_FN):
-               strncpy(current_alpha_oled, "Switcher", sizeof(current_alpha_oled));
-               break;
-            default:
-               strncpy(current_alpha_oled, itoa(keycode, string, 10), sizeof(current_alpha_oled));
-               break;
-        }
-    }
-    return true;
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
-  oled_write_P(PSTR("Active layer: "), false);
-
-  switch (get_highest_layer(layer_state)) {
-    case _BASIC:
-      oled_write_ln_P(PSTR("Basic"), false);
-      break;
-    case _BRACKETS:
-      oled_write_ln_P(PSTR("Brkts"), false);
-      break;
-    case _SELECTORS:
-      oled_write_ln_P(PSTR("Selct"), false);
-      break;
-    case _FN:
-      oled_write_ln_P(PSTR("FN"), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR("N/A"), false);
-  }
-
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(PSTR("Num Lock: "), false);
-  oled_write_ln_P(led_state.num_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Caps Lock: "), false);
-  oled_write_ln_P(led_state.caps_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Backlit: "), false);
-  oled_write_ln_P(is_backlight_enabled() ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Last Key: "), false);
-  oled_write_ln(current_alpha_oled, false);
-#ifdef RGBLIGHT_ENABLE
-  static char rgbStatusLine1[26] = {0};
-  snprintf(rgbStatusLine1, sizeof(rgbStatusLine1), "RGB Mode: %d", rgblight_get_mode());
-  oled_write_ln(rgbStatusLine1, false);
-  static char rgbStatusLine2[26] = {0};
-  snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
-  oled_write_ln(rgbStatusLine2, false);
-#endif
-    return false;
-}
-#endif
diff --git a/keyboards/anavi/macropad8/keymaps/zoom/keymap.c b/keyboards/anavi/macropad8/keymaps/zoom/keymap.c
deleted file mode 100644
index 965bbec4292..00000000000
--- a/keyboards/anavi/macropad8/keymaps/zoom/keymap.c
+++ /dev/null
@@ -1,97 +0,0 @@
- /* Copyright 2020 Leon Anavi <leon@anavi.org>
-  *
-  * 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 _MAIN 0
-#define _FN 1
-
-#define KC_X0 LT(_FN, KC_ESC)
-
-#ifdef RGBLIGHT_ENABLE
-// How long (in ms) to wait between animation steps for the rainbow mode
-const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {60, 30, 15};
-// How long (in milliseconds) to wait between animation steps for each of the "Swirling rainbow" animations
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 10, 4};
-#endif
-
-/*
- * The keymap contains the following shortcuts for Zoom meeting:
- *
- * Alt+V: Start/stop video
- * Alt+A: Mute/unmute my audio
- * Alt+M: Mute/unmute audio for everyone except the host
- * Alt+S: Start/stop screen sharing
- * Alt+R: Start/stop local recording
- * Alt+P: Pause/resume recording
- * Alt+C: Start/stop cloud recording
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = LAYOUT_ortho_2x4(
-     LALT(KC_V), LALT(KC_A), LALT(KC_M), LALT(KC_S),
-     LALT(KC_R), LALT(KC_P), LALT(KC_C), MO(_FN)
-  ),
-
-  [_FN] = LAYOUT_ortho_2x4(
-     RGB_TOG, RGB_MOD, RGB_M_R, RGB_M_SN,
-     BL_TOGG, BL_STEP, BL_BRTG, _______
-  )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
-  oled_write_P(PSTR("Active layer: "), false);
-
-  switch (get_highest_layer(layer_state)) {
-    case _MAIN:
-      oled_write_ln_P(PSTR("Zoom"), false);
-      break;
-    case _FN:
-      oled_write_ln_P(PSTR("FN"), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR("N/A"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(PSTR("Num Lock: "), false);
-  oled_write_ln_P(led_state.num_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Caps Lock: "), false);
-  oled_write_ln_P(led_state.caps_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Scroll Lock: "), false);
-  oled_write_ln_P(led_state.scroll_lock ? PSTR("On") : PSTR("Off"), false);
-  oled_write_P(PSTR("Backlit: "), false);
-  oled_write_ln_P(is_backlight_enabled() ? PSTR("On") : PSTR("Off"), false);
-#ifdef RGBLIGHT_ENABLE
-  static char rgbStatusLine1[26] = {0};
-  snprintf(rgbStatusLine1, sizeof(rgbStatusLine1), "RGB Mode: %d", rgblight_get_mode());
-  oled_write_ln(rgbStatusLine1, false);
-  static char rgbStatusLine2[26] = {0};
-  snprintf(rgbStatusLine2, sizeof(rgbStatusLine2), "h:%d s:%d v:%d", rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val());
-  oled_write_ln(rgbStatusLine2, false);
-#endif
-    return false;
-}
-#endif
diff --git a/keyboards/annepro2/c15/config.h b/keyboards/annepro2/c15/config.h
index f488b9d8f38..9ffce919579 100644
--- a/keyboards/annepro2/c15/config.h
+++ b/keyboards/annepro2/c15/config.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "pin_defs.h"
-#include "config_led.h"
 
 // key matrix size
 #define MATRIX_ROWS 5
diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/info.json
index b7624dd6c50..b92b446e4e9 100644
--- a/keyboards/annepro2/c15/info.json
+++ b/keyboards/annepro2/c15/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Anne Pro 2 C15 (QMK)",
     "usb": {
-        "pid": "0xAC15"
+        "pid": "0x8008"
     },
     "eeprom": {
         "driver": "wear_leveling",
@@ -11,7 +11,116 @@
         }
     },
     "rgb_matrix": {
-        "driver": "custom"
+        "animations":{
+           "alphas_mods": true,
+           "gradient_up_down": true,
+           "gradient_left_right": true,
+           "breathing": true,
+           "band_sat": true,
+           "band_val": true,
+           "band_pinwheel_sat": true,
+           "band_pinwheel_val": true,
+           "band_spiral_sat": true,
+           "band_spiral_val": true,
+           "cycle_all": true,
+           "cycle_left_right": true,
+           "cycle_up_down": true,
+           "rainbow_moving_chevron": true,
+           "cycle_out_in": true,
+           "cycle_out_in_dual": true,
+           "cycle_pinwheel": true,
+           "cycle_spiral": true,
+           "dual_beacon": true,
+           "rainbow_beacon": true,
+           "rainbow_pinwheels": true,
+           "raindrops": true,
+           "jellybean_raindrops": true,
+           "hue_breathing": true,
+           "hue_pendulum": true,
+           "hue_wave": true,
+           "pixel_fractal": true,
+           "pixel_flow": true,
+           "pixel_rain": true,
+           "typing_heatmap": true,
+           "digital_rain": true,
+           "solid_reactive_simple": true,
+           "solid_reactive": true,
+           "solid_reactive_wide": true,
+           "solid_reactive_multiwide": true,
+           "solid_reactive_cross": true,
+           "solid_reactive_multicross": true,
+           "solid_reactive_nexus": true,
+           "solid_reactive_multinexus": true,
+           "splash": true,
+           "multisplash": true,
+           "solid_splash": true,
+           "solid_multisplash": true
+        },
+        "driver": "custom",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4},
+            {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4},
+            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
+            {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4},
+            {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
+            {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4},
+            {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1},
+            {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1}
+        ],
+        "led_flush_limit": 40
     },
     "community_layouts": ["60_ansi"]
 }
diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk
index 8694893ac2e..374d8443385 100644
--- a/keyboards/annepro2/c15/rules.mk
+++ b/keyboards/annepro2/c15/rules.mk
@@ -22,22 +22,12 @@ 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
 
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
 
 # Keys
 CUSTOM_MATRIX = lite
-KEY_LOCK_ENABLE = no
-
-# Other features
-RAW_ENABLE = no
-MIDI_ENABLE = no
-VIRTSER_ENABLE = no
-COMBO_ENABLE = no
 
 # Anne Pro 2
 SRC = \
@@ -46,4 +36,3 @@ SRC = \
 	ap2_led.c \
 	protocol.c \
 	rgb_driver.c \
-	config_led.c
diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h
index 36f4a25c8d4..7010f19a3fc 100644
--- a/keyboards/annepro2/c18/config.h
+++ b/keyboards/annepro2/c18/config.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "pin_defs.h"
-#include "config_led.h"
 
 // key matrix size
 #define MATRIX_ROWS 5
diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json
index c8f524e3cfd..390dd819416 100644
--- a/keyboards/annepro2/c18/info.json
+++ b/keyboards/annepro2/c18/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Anne Pro 2 C18 (QMK)",
     "usb": {
-        "pid": "0xAC18"
+        "pid": "0x8009"
     },
     "eeprom": {
         "driver": "wear_leveling",
@@ -11,7 +11,116 @@
         }
     },
     "rgb_matrix": {
-        "driver": "custom"
+        "animations":{
+           "alphas_mods": true,
+           "gradient_up_down": true,
+           "gradient_left_right": true,
+           "breathing": true,
+           "band_sat": true,
+           "band_val": true,
+           "band_pinwheel_sat": true,
+           "band_pinwheel_val": true,
+           "band_spiral_sat": true,
+           "band_spiral_val": true,
+           "cycle_all": true,
+           "cycle_left_right": true,
+           "cycle_up_down": true,
+           "rainbow_moving_chevron": true,
+           "cycle_out_in": true,
+           "cycle_out_in_dual": true,
+           "cycle_pinwheel": true,
+           "cycle_spiral": true,
+           "dual_beacon": true,
+           "rainbow_beacon": true,
+           "rainbow_pinwheels": true,
+           "raindrops": true,
+           "jellybean_raindrops": true,
+           "hue_breathing": true,
+           "hue_pendulum": true,
+           "hue_wave": true,
+           "pixel_fractal": true,
+           "pixel_flow": true,
+           "pixel_rain": true,
+           "typing_heatmap": true,
+           "digital_rain": true,
+           "solid_reactive_simple": true,
+           "solid_reactive": true,
+           "solid_reactive_wide": true,
+           "solid_reactive_multiwide": true,
+           "solid_reactive_cross": true,
+           "solid_reactive_multicross": true,
+           "solid_reactive_nexus": true,
+           "solid_reactive_multinexus": true,
+           "splash": true,
+           "multisplash": true,
+           "solid_splash": true,
+           "solid_multisplash": true
+        },
+        "driver": "custom",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4},
+            {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4},
+            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
+            {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4},
+            {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
+            {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4},
+            {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1},
+            {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1}
+        ],
+        "led_flush_limit": 40
     },
     "community_layouts": ["60_ansi", "60_iso"]
 }
diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk
index dab7269570f..2c9a9077da5 100644
--- a/keyboards/annepro2/c18/rules.mk
+++ b/keyboards/annepro2/c18/rules.mk
@@ -22,22 +22,12 @@ 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
 
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
 
 # Keys
 CUSTOM_MATRIX = lite
-KEY_LOCK_ENABLE = no
-
-# Other features
-RAW_ENABLE = no
-MIDI_ENABLE = no
-VIRTSER_ENABLE = no
-COMBO_ENABLE = no
 
 # Anne Pro 2
 SRC = \
@@ -46,4 +36,3 @@ SRC = \
 	ap2_led.c \
 	protocol.c \
 	rgb_driver.c \
-	config_led.c
diff --git a/keyboards/annepro2/config_led.c b/keyboards/annepro2/config_led.c
deleted file mode 100644
index efa68dff3db..00000000000
--- a/keyboards/annepro2/config_led.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@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/>.
- */
-
-#ifdef RGB_MATRIX_ENABLE
-
-#include "rgb_matrix.h"
-#include "config_led.h"
-
-#define NA NO_LED
-
-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, NA },
-    { 41, NA, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, NA },
-    { 53, NA, 54, 55, NA, NA, 56, NA, NA, 57, 58, 59, 60, NA }
-}, {
-    { 0 ,  0 }, { 16,  0 }, { 32,  0 }, { 48,  0 }, { 65,  0 }, { 81,  0 }, { 97 ,  0 }, { 113,  0 }, { 129,  0 }, { 145,  0 }, { 161,  0 }, { 178,  0 }, { 194,  0 }, { 218,  0 },
-    { 4 , 16 }, { 24, 16 }, { 40, 16 }, { 57, 16 }, { 73, 16 }, { 89, 16 }, { 105, 16 }, { 121, 16 }, { 137, 16 }, { 153, 16 }, { 170, 16 }, { 186, 16 }, { 202, 16 }, { 222, 16 },
-    { 6 , 32 }, { 28, 32 }, { 44, 32 }, { 61, 32 }, { 77, 32 }, { 93, 32 }, { 109, 32 }, { 125, 32 }, { 141, 32 }, { 157, 32 }, { 174, 32 }, { 190, 32 }, { 216, 32 },
-    { 10, 48 },             { 36, 48 }, { 52, 48 }, { 69, 48 }, { 85, 48 }, { 101, 48 }, { 117, 48 }, { 133, 48 }, { 149, 48 }, { 165, 48 }, { 182, 48 }, { 212, 48 },
-    { 2 , 64 }, { 22, 64 }, { 42, 64 },                                     { 103, 64 },                           { 163, 64 }, { 184, 64 }, { 204, 64 }, { 224, 64 },
-}, {
-    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,
-    1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-    1, 1, 1,          4,          1, 1, 1, 1,
-} };
-#endif
diff --git a/keyboards/annepro2/config_led.h b/keyboards/annepro2/config_led.h
deleted file mode 100644
index 12ccd995ad8..00000000000
--- a/keyboards/annepro2/config_led.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@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
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define RGB_MATRIX_LED_COUNT 61
-
-/* Limit animations to 25 FPS to avoid tearing. (1/.040 = 25 FPS). */
-#define RGB_MATRIX_LED_FLUSH_LIMIT 40
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#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
diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json
index a24479a9fa6..d06fe5bed49 100644
--- a/keyboards/annepro2/info.json
+++ b/keyboards/annepro2/info.json
@@ -3,7 +3,7 @@
     "url": "https://openannepro.github.io/",
     "maintainer": "bwisn",
     "usb": {
-        "vid": "0xFEED",
+        "vid": "0xAC20",
         "device_version": "13.3.7"
     },
     "layouts": {
diff --git a/keyboards/aos/tkl/keymaps/aholland909/keymap.c b/keyboards/aos/tkl/keymaps/aholland909/keymap.c
deleted file mode 100644
index 87f12d1763c..00000000000
--- a/keyboards/aos/tkl/keymaps/aholland909/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2020 aholland909
-
-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_tkl_iso_wkl(
-    QK_GESC,       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_SCRL, KC_PAUSE,
-
-    KC_GRV,        KC_1,    KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-    KC_TAB,        KC_Q,    KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,  KC_END,  KC_PGDN,
-    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_NUHS, KC_ENT,
-    KC_LSFT,       KC_NUBS, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
-    KC_LCTL,                KC_LALT,                    KC_SPC,                                KC_RGUI,          TG(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-
-  [1] = LAYOUT_tkl_iso_wkl(
-    QK_BOOT,  KC_F13,  KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18,   KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,   KC_F24,            _______,  _______,  _______,
-
-    _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,
-    _______,  _______, KC_VOLU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           RGB_M_P,  RGB_M_B,  _______,
-    _______,  KC_MPRV, KC_VOLD,  KC_MNXT,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,  _______, _______,
-    _______,  _______, _______,  _______,  KC_CALC,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,            RGB_HUI,
-    _______,           _______,                      KC_MPLY,                                _______,            _______,                     RGB_SAD,  RGB_HUD,  RGB_VAI),
-};
diff --git a/keyboards/arabica37/keymaps/default/config.h b/keyboards/arabica37/keymaps/default/config.h
index 57ce4cc0c18..5654f4daf4b 100644
--- a/keyboards/arabica37/keymaps/default/config.h
+++ b/keyboards/arabica37/keymaps/default/config.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 170
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 50
+#define RGBLIGHT_LED_COUNT 50
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/archetype/minervalx/config.h b/keyboards/archetype/minervalx/config.h
new file mode 100644
index 00000000000..3b5eb8e56ac
--- /dev/null
+++ b/keyboards/archetype/minervalx/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2024 Archetype Made, Inc.
+ *
+ * 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 RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+
+#define BACKLIGHT_PWM_DRIVER PWMD5
+#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A
\ No newline at end of file
diff --git a/keyboards/archetype/minervalx/halconf.h b/keyboards/archetype/minervalx/halconf.h
new file mode 100644
index 00000000000..b807fe16507
--- /dev/null
+++ b/keyboards/archetype/minervalx/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2024 Archetype Made, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/archetype/minervalx/info.json b/keyboards/archetype/minervalx/info.json
new file mode 100644
index 00000000000..0d01ccf485b
--- /dev/null
+++ b/keyboards/archetype/minervalx/info.json
@@ -0,0 +1,98 @@
+{
+    "manufacturer": "Archetype",
+    "keyboard_name": "Minerva LX",
+    "maintainer": "Archetype",
+    "backlight": {
+        "pin": "GP7"
+    },
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "cols": ["GP0", "GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP11", "GP12", "GP13", "GP14", "GP15"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0100",
+        "vid": "0x5453"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [2, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+                {"matrix": [4, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/archetype/minervalx/keymaps/default/keymap.c b/keyboards/archetype/minervalx/keymaps/default/keymap.c
new file mode 100644
index 00000000000..c52c7f4c1e1
--- /dev/null
+++ b/keyboards/archetype/minervalx/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2024 Archetype Made, Inc.
+ *
+ * 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_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_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_SPC,           KC_SPC,           KC_RALT, KC_RGUI, MO(1),   KC_RCTL
+    ),
+    [1] = LAYOUT(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,           _______,         _______,          _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/archetype/minervalx/keymaps/via/keymap.c b/keyboards/archetype/minervalx/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c52c7f4c1e1
--- /dev/null
+++ b/keyboards/archetype/minervalx/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2024 Archetype Made, Inc.
+ *
+ * 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_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_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_SPC,           KC_SPC,           KC_RALT, KC_RGUI, MO(1),   KC_RCTL
+    ),
+    [1] = LAYOUT(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,           _______,         _______,          _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/flygone60/rev3/keymaps/via/rules.mk b/keyboards/archetype/minervalx/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/flygone60/rev3/keymaps/via/rules.mk
rename to keyboards/archetype/minervalx/keymaps/via/rules.mk
diff --git a/keyboards/archetype/minervalx/mcuconf.h b/keyboards/archetype/minervalx/mcuconf.h
new file mode 100644
index 00000000000..6bc01108d35
--- /dev/null
+++ b/keyboards/archetype/minervalx/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2024 Archetype Made, Inc.
+ *
+ * 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_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM5
+#define RP_PWM_USE_PWM5 TRUE
diff --git a/keyboards/archetype/minervalx/readme.md b/keyboards/archetype/minervalx/readme.md
new file mode 100644
index 00000000000..365fd375e58
--- /dev/null
+++ b/keyboards/archetype/minervalx/readme.md
@@ -0,0 +1,24 @@
+# Minerva LX
+
+![Minerva LX](https://i.imgur.com/f97nsrx.jpg)
+
+The following is the QMK Firmware for the Minerva LX PCB.
+
+* Keyboard Maintainer: [Archetype](https://github.com/archetype-made)
+* Hardware Supported: RP2040-based proprietary PCB.
+* Hardware Availability: https://archetypemade.com/minerva-is-here/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make archetype/minervalx:default
+
+Flashing example for this keyboard:
+
+    make archetype/minervalx: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 ESC key and plug in the keyboard (Top Left most switch)
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if available
+* **Physical Reset Button**: With the PCB unplugged, hold down the button labled `RESET` on the back of the PCB while pluggin in the USB.
\ No newline at end of file
diff --git a/keyboards/archetype/minervalx/rules.mk b/keyboards/archetype/minervalx/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/archetype/minervalx/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json
index dceb80da043..125db97ed28 100644
--- a/keyboards/ares/info.json
+++ b/keyboards/ares/info.json
@@ -45,7 +45,7 @@
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all"
     },
-    "community_layouts": ["60_ansi_split_bs_rshift", "60_hhkb"],
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -120,6 +120,75 @@
                 {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+                {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [0, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [0, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
         "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [
                 {"matrix": [4, 0], "x": 0, "y": 0},
@@ -191,7 +260,75 @@
                 {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
-        "LAYOUT_60_hhkb": {
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+                {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 4},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 12], "x": 12.5, "y": 4},
+                {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
             "layout": [
                 {"matrix": [4, 0], "x": 0, "y": 0},
                 {"matrix": [4, 1], "x": 1, "y": 0},
@@ -252,11 +389,633 @@
                 {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75},
                 {"matrix": [1, 13], "x": 14, "y": 3},
 
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5},
                 {"matrix": [0, 1], "x": 1.5, "y": 4},
                 {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
                 {"matrix": [0, 6], "x": 4, "y": 4, "w": 7},
                 {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [0, 12], "x": 12.5, "y": 4}
+                {"matrix": [0, 12], "x": 12.5, "y": 4},
+                {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+                {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+                {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 13], "x": 14, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+                {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 13], "x": 14, "y": 3},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 4},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 3},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [0, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [0, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 3},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 13], "x": 14, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [0, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [0, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 3},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 4},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 12], "x": 12.5, "y": 4},
+                {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 3},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 13], "x": 14, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 4},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 12], "x": 12.5, "y": 4},
+                {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 3},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 2], "x": 2, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0},
+                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 5], "x": 5, "y": 0},
+                {"matrix": [4, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [4, 8], "x": 8, "y": 0},
+                {"matrix": [4, 9], "x": 9, "y": 0},
+                {"matrix": [4, 10], "x": 10, "y": 0},
+                {"matrix": [4, 11], "x": 11, "y": 0},
+                {"matrix": [4, 12], "x": 12, "y": 0},
+                {"matrix": [4, 13], "x": 13, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 2], "x": 2.5, "y": 1},
+                {"matrix": [3, 3], "x": 3.5, "y": 1},
+                {"matrix": [3, 4], "x": 4.5, "y": 1},
+                {"matrix": [3, 5], "x": 5.5, "y": 1},
+                {"matrix": [3, 6], "x": 6.5, "y": 1},
+                {"matrix": [3, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 8], "x": 8.5, "y": 1},
+                {"matrix": [3, 9], "x": 9.5, "y": 1},
+                {"matrix": [3, 10], "x": 10.5, "y": 1},
+                {"matrix": [3, 11], "x": 11.5, "y": 1},
+                {"matrix": [3, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 3},
+                {"matrix": [1, 2], "x": 2.25, "y": 3},
+                {"matrix": [1, 3], "x": 3.25, "y": 3},
+                {"matrix": [1, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 5], "x": 5.25, "y": 3},
+                {"matrix": [1, 6], "x": 6.25, "y": 3},
+                {"matrix": [1, 7], "x": 7.25, "y": 3},
+                {"matrix": [1, 8], "x": 8.25, "y": 3},
+                {"matrix": [1, 9], "x": 9.25, "y": 3},
+                {"matrix": [1, 10], "x": 10.25, "y": 3},
+                {"matrix": [1, 11], "x": 11.25, "y": 3},
+                {"matrix": [1, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [1, 13], "x": 14, "y": 3},
+
+                {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [0, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [0, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/ares/matrix_diagram.md b/keyboards/ares/matrix_diagram.md
new file mode 100644
index 00000000000..5be61c98899
--- /dev/null
+++ b/keyboards/ares/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for LSJ Ares
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │4E     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │4E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      ┌─────┐
+│30   │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D   │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │   │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   └───┴────┘
+│10  │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C    │1D │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+│00  │01  │02  │06                      │0A  │0B  │0C  │0D  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────────┐
+│10      │ 2.25u LShift             2.75u RShift │1C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│00   │01 │02   │06                         │0B   │0C │0D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────┬─────┬───┬───┬─────┐
+│00   │01 │02   │06                     │0A   │0B │0C │0D   │ True HHKB
+└─────┴───┴─────┴───────────────────────┴─────┴───┴───┴─────┘
+```
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/keymap.c b/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/keymap.c
deleted file mode 100644
index b96e5ce6484..00000000000
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/keymap.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Copyright 2022 Jason Devadoss (@jasonj2232)
- *
- * 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 custom_layers {
-    BL,
-    UL,
-};
-
-// OLED setup for bongocat
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 30
-#define TAP_FRAMES 2
-#define TAP_SPEED 40
-#define ANIM_FRAME_DURATION 200
-#define ANIM_SIZE 512
-
-static long int oled_timeout = 600000; // 10 minutes
-bool gui_on = true;
-char wpm_str[10];
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [BL] = LAYOUT(
-        KC_PMNS, KC_PAST, KC_PSLS, KC_NUM,     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_PPLS, KC_P9,   KC_P8,   KC_P7,      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_P6,   KC_P5,   KC_P4,      KC_CAPS_LOCK, 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_PENT, KC_P3,   KC_P2,   KC_P1,      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_PDOT,          KC_P0,      KC_LCTL,      KC_LGUI, LT(1, KC_LALT),                     KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_AUDIO_MUTE
-
-    ),
-    
-    [UL] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_GRAVE,     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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_PSCR, KC_SCRL, KC_PAUS,    KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_LEFT, KC_DOWN, KC_RIGHT,    KC_MPLY
-    ),
-};
-
-#ifdef ENCODER_MAP_ENABLE
-    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-        [BL] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-        [UL] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
-    };
-#endif
-
-#ifdef OLED_ENABLE
-
-//Uncomment the below if OLED orientation is incorrect
-/*
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees
-}
-*/
-
-static void render_anim(void) {
-
-    // Idle animation
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
-            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
-            32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-
-    };
-
-    // Prep animation
-    static const char PROGMEM prep[][ANIM_SIZE] = {
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-
-    };
-
-    // Typing animation
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
-            95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
-            1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
-            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-
-    };
-
-    void animation_phase(void) {
-        if (get_current_wpm() <=IDLE_SPEED) {
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED) {
-            oled_write_raw_P(prep[0], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() >=TAP_SPEED) {
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-            oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-        }
-    }
-
-    if (get_current_wpm() != 000) {
-        oled_on();
-
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-
-        anim_sleep = timer_read32();
-    } else {
-        if (timer_elapsed32(anim_sleep) > oled_timeout) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-bool oled_task_user(void) {
-        render_anim();
-        oled_set_cursor(0,4);
-        sprintf(wpm_str, "WPM: %03d", get_current_wpm());
-        oled_write(wpm_str, false);
-
-    return false;
-}
-
-#endif
\ No newline at end of file
diff --git a/keyboards/argyle/matrix.c b/keyboards/argyle/matrix.c
index 7430c6d9d80..d723392a013 100644
--- a/keyboards/argyle/matrix.c
+++ b/keyboards/argyle/matrix.c
@@ -78,9 +78,9 @@ static void init_pins(void) {
     unselect_rows();
     // Set I/O
     uint8_t send_data = 0xFF;
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data, 1, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data, 1, 20);
     // Set Pull-up
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x06, &send_data, 1, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x06, &send_data, 1, 20);
 
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
         if (col_pins[x] != NO_PIN) {
@@ -111,7 +111,7 @@ static bool matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t curre
     matrix_output_select_delay();
 
     uint8_t port_expander_buffer;
-    i2c_readReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &port_expander_buffer, 1, 20);
+    i2c_read_register((PORT_EXPANDER_ADDRESS << 1), 0x09, &port_expander_buffer, 1, 20);
 
     // For each col...
     // matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
diff --git a/keyboards/arisu/keymaps/fate/keymap.c b/keyboards/arisu/keymaps/fate/keymap.c
deleted file mode 100644
index 9db8fcdbd13..00000000000
--- a/keyboards/arisu/keymaps/fate/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2019 Fate
- *
- * 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 arisu_layers {
-  _QWERTY,
-  _FN,
-  _ADJUST
-};
-
-// Tap Dance Declarations
-enum {
-    TD_LALT_LGUI = 0,
-    TD_RALT_RGUI
-};
-
-#define FN MO(_FN)
-#define ADJUST MO(_ADJUST)
-#define LALT_LG TD(TD_LALT_LGUI)
-#define RALT_RG TD(TD_RALT_RGUI)
-
-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,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  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_BSPC,          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,                    ADJUST,
-    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,          LALT_LG,          KC_SPC,  FN,               KC_SPC,           RALT_RG,                   KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [_FN] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, KC_DEL,           _______,
-    _______, 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_APP,  _______,          _______,
-    _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
-  ),
-
-  [_ADJUST] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           KC_END,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,                   _______,
-    _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,          KC_VOLU,
-    _______,          _______,          _______, _______,          _______,          _______,                   KC_MPRV, KC_VOLD, KC_MNXT
-  )
-};
-
-// Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for L-Alt, twice for L-GUI
-    [TD_LALT_LGUI] = ACTION_TAP_DANCE_DOUBLE(KC_LALT, KC_LGUI),
-    // Tap once for R-Alt, twice for R-GUI
-    [TD_RALT_RGUI] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, KC_RGUI)
-};
diff --git a/keyboards/arisu/keymaps/fate/readme.md b/keyboards/arisu/keymaps/fate/readme.md
deleted file mode 100644
index c1239a09ffc..00000000000
--- a/keyboards/arisu/keymaps/fate/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap of arisu's creator
\ No newline at end of file
diff --git a/keyboards/arisu/keymaps/fate/rules.mk b/keyboards/arisu/keymaps/fate/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/arisu/keymaps/fate/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/arisu/keymaps/kresnak/keymap.c b/keyboards/arisu/keymaps/kresnak/keymap.c
deleted file mode 100644
index 05a0e6ba4cd..00000000000
--- a/keyboards/arisu/keymaps/kresnak/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019 Fate
- *
- * 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 the keycodes used by our macros in process_record_user
-
-#define FN MO(1)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* Base */
-    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_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_BSPC,          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,                    FN,
-    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_LALT,          KC_SPC,  KC_LGUI,               KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [1] = 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_DEL,  KC_HOME,
-    _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          KC_END,
-    _______, 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_BSLS, _______,          _______,
-    _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
-  )
-};
diff --git a/keyboards/arrowmechanics/wings/config.h b/keyboards/arrowmechanics/wings/config.h
new file mode 100644
index 00000000000..bd58c470034
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/config.h
@@ -0,0 +1,11 @@
+// Copyright 2024 Filip Strzałka (@philvec)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#define SERIAL_USART_FULL_DUPLEX
+
+#define AUDIO_PIN GP4
+#define AUDIO_PWM_DRIVER PWMD2
+#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A
+#define AUDIO_INIT_DELAY
diff --git a/keyboards/arrowmechanics/wings/halconf.h b/keyboards/arrowmechanics/wings/halconf.h
new file mode 100644
index 00000000000..772f7982164
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 Filip Strzałka (@philvec)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include_next <halconf.h>
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM TRUE
diff --git a/keyboards/arrowmechanics/wings/info.json b/keyboards/arrowmechanics/wings/info.json
new file mode 100644
index 00000000000..fca38314c9b
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/info.json
@@ -0,0 +1,320 @@
+{
+    "manufacturer": "Arrow Mechanics",
+    "keyboard_name": "WINGS Mark 1",
+    "maintainer": "arrowmechanics",
+    "bootloader": "rp2040",
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP6", "pin_b": "GP7", "resolution": 2}
+        ]
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
+        "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "breathing",
+            "hue": 192
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 7], "x": 93, "y": 2, "flags": 4},
+            {"matrix": [0, 6], "x": 80, "y": 1, "flags": 4},
+            {"matrix": [0, 5], "x": 67, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 54, "y": 1, "flags": 4},
+            {"matrix": [0, 3], "x": 42, "y": 3, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 5, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 5, "flags": 4},
+            {"matrix": [0, 0], "x": 3, "y": 5, "flags": 4},
+
+            {"matrix": [1, 0], "x": 3, "y": 17, "flags": 4},
+            {"matrix": [1, 1], "x": 16, "y": 17, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4},
+            {"matrix": [1, 3], "x": 42, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 54, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 67, "y": 12, "flags": 4},
+            {"matrix": [1, 6], "x": 80, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 93, "y": 14, "flags": 4},
+
+            {"matrix": [2, 8], "x": 106, "y": 25, "flags": 4},
+            {"matrix": [2, 7], "x": 93, "y": 25, "flags": 4},
+            {"matrix": [2, 6], "x": 80, "y": 25, "flags": 4},
+            {"matrix": [2, 5], "x": 67, "y": 24, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 25, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 26, "y": 29, "flags": 4},
+            {"matrix": [2, 0], "x": 6, "y": 29, "flags": 4},
+
+            {"matrix": [3, 0], "x": 3, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 22, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 42, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 54, "y": 36, "flags": 4},
+            {"matrix": [3, 5], "x": 67, "y": 35, "flags": 4},
+            {"matrix": [3, 6], "x": 80, "y": 36, "flags": 4},
+            {"matrix": [3, 7], "x": 93, "y": 37, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 37, "flags": 4},
+
+            {"matrix": [4, 8], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 93, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 80, "y": 48, "flags": 4},
+            {"matrix": [4, 5], "x": 67, "y": 47, "flags": 4},
+            {"matrix": [4, 4], "x": 54, "y": 48, "flags": 4},
+            {"matrix": [4, 3], "x": 42, "y": 50, "flags": 4},
+            {"matrix": [4, 1], "x": 21, "y": 52, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 4},
+
+            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [5, 1], "x": 13, "y": 64, "flags": 4},
+            {"matrix": [5, 2], "x": 26, "y": 64, "flags": 4},
+            {"matrix": [5, 3], "x": 43, "y": 62, "flags": 4},
+            {"matrix": [5, 4], "x": 59, "y": 60, "flags": 4},
+            {"matrix": [5, 6], "x": 75, "y": 60, "flags": 4},
+            {"matrix": [5, 7], "x": 98, "y": 61, "flags": 4},
+
+            {"matrix": [6, 1], "x": 131, "y": 2, "flags": 4},
+            {"matrix": [6, 2], "x": 144, "y": 1, "flags": 4},
+            {"matrix": [6, 3], "x": 157, "y": 0, "flags": 4},
+            {"matrix": [6, 4], "x": 170, "y": 1, "flags": 4},
+            {"matrix": [6, 5], "x": 182, "y": 3, "flags": 4},
+            {"matrix": [6, 6], "x": 195, "y": 5, "flags": 4},
+            {"matrix": [6, 7], "x": 208, "y": 5, "flags": 4},
+            {"matrix": [6, 8], "x": 221, "y": 5, "flags": 4},
+
+            {"matrix": [7, 8], "x": 214, "y": 17, "flags": 4},
+            {"matrix": [7, 6], "x": 195, "y": 17, "flags": 4},
+            {"matrix": [7, 5], "x": 182, "y": 15, "flags": 4},
+            {"matrix": [7, 4], "x": 170, "y": 13, "flags": 4},
+            {"matrix": [7, 3], "x": 157, "y": 12, "flags": 4},
+            {"matrix": [7, 2], "x": 144, "y": 13, "flags": 4},
+            {"matrix": [7, 1], "x": 131, "y": 14, "flags": 4},
+
+            {"matrix": [8, 0], "x": 118, "y": 25, "flags": 4},
+            {"matrix": [8, 1], "x": 131, "y": 25, "flags": 4},
+            {"matrix": [8, 2], "x": 144, "y": 25, "flags": 4},
+            {"matrix": [8, 3], "x": 157, "y": 24, "flags": 4},
+            {"matrix": [8, 4], "x": 170, "y": 25, "flags": 4},
+            {"matrix": [8, 5], "x": 182, "y": 27, "flags": 4},
+            {"matrix": [8, 6], "x": 195, "y": 29, "flags": 4},
+            {"matrix": [8, 7], "x": 208, "y": 29, "flags": 4},
+            {"matrix": [8, 8], "x": 221, "y": 29, "flags": 4},
+
+            {"matrix": [9, 8], "x": 216, "y": 40, "flags": 4},
+            {"matrix": [9, 6], "x": 195, "y": 40, "flags": 4},
+            {"matrix": [9, 5], "x": 182, "y": 38, "flags": 4},
+            {"matrix": [9, 4], "x": 170, "y": 36, "flags": 4},
+            {"matrix": [9, 3], "x": 157, "y": 35, "flags": 4},
+            {"matrix": [9, 2], "x": 144, "y": 36, "flags": 4},
+            {"matrix": [9, 1], "x": 131, "y": 37, "flags": 4},
+            {"matrix": [9, 0], "x": 118, "y": 37, "flags": 4},
+
+            {"matrix": [10, 0], "x": 118, "y": 49, "flags": 4},
+            {"matrix": [10, 1], "x": 131, "y": 49, "flags": 4},
+            {"matrix": [10, 2], "x": 144, "y": 48, "flags": 4},
+            {"matrix": [10, 3], "x": 157, "y": 47, "flags": 4},
+            {"matrix": [10, 4], "x": 170, "y": 48, "flags": 4},
+            {"matrix": [10, 5], "x": 182, "y": 50, "flags": 4},
+            {"matrix": [10, 6], "x": 197, "y": 52, "flags": 4},
+            {"matrix": [10, 7], "x": 211, "y": 52, "flags": 4},
+            {"matrix": [10, 8], "x": 224, "y": 52, "flags": 4},
+
+            {"matrix": [11, 8], "x": 224, "y": 64, "flags": 4},
+            {"matrix": [11, 7], "x": 211, "y": 64, "flags": 4},
+            {"matrix": [11, 6], "x": 198, "y": 64, "flags": 4},
+            {"matrix": [11, 5], "x": 181, "y": 62, "flags": 4},
+            {"matrix": [11, 4], "x": 165, "y": 60, "flags": 4},
+            {"matrix": [11, 2], "x": 149, "y": 60, "flags": 4},
+            {"matrix": [11, 1], "x": 126, "y": 61, "flags": 4}
+        ],
+        "split_count": [47, 48]
+    },
+    "split": {
+        "enabled": true,
+        "transport": {
+            "sync": {
+                "layer_state": true,
+                "matrix_state": true
+            }
+        }
+    },
+    "tags": ["columnar", "split", "rgb", "hotswap", "encoder"],
+    "url": "https://arrowmechanics.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3134",
+        "vid": "0xA880"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP26"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0.43},
+                {"matrix": [0, 1], "x": 1.25, "y": 0.43},
+                {"matrix": [0, 2], "x": 2.25, "y": 0.43},
+                {"matrix": [0, 3], "x": 3.25, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.08},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0.08},
+                {"matrix": [0, 7], "x": 7.25, "y": 0.15},
+
+                {"matrix": [6, 1], "x": 10.45, "y": 0.15},
+                {"matrix": [6, 2], "x": 11.45, "y": 0.08},
+                {"matrix": [6, 3], "x": 12.45, "y": 0},
+                {"matrix": [6, 4], "x": 13.45, "y": 0.08},
+                {"matrix": [6, 5], "x": 14.45, "y": 0.25},
+                {"matrix": [6, 6], "x": 15.45, "y": 0.43},
+                {"matrix": [6, 7], "x": 16.45, "y": 0.43},
+                {"matrix": [6, 8], "x": 17.45, "y": 0.43},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.43},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.43},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.43},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.08},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.08},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.15},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.15, "encoder": 0},
+
+                {"matrix": [7, 0], "x": 9.45, "y": 1.15},
+                {"matrix": [7, 1], "x": 10.45, "y": 1.15},
+                {"matrix": [7, 2], "x": 11.45, "y": 1.08},
+                {"matrix": [7, 3], "x": 12.45, "y": 1},
+                {"matrix": [7, 4], "x": 13.45, "y": 1.08},
+                {"matrix": [7, 5], "x": 14.45, "y": 1.25},
+                {"matrix": [7, 6], "x": 15.45, "y": 1.43},
+                {"matrix": [7, 8], "x": 16.45, "y": 1.43, "w": 2},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.43, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.75, "y": 2.43, "w": 1.5},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.08},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2.08},
+                {"matrix": [2, 7], "x": 7.25, "y": 2.15},
+                {"matrix": [2, 8], "x": 8.25, "y": 2.15},
+
+                {"matrix": [8, 0], "x": 9.45, "y": 2.15},
+                {"matrix": [8, 1], "x": 10.45, "y": 2.15},
+                {"matrix": [8, 2], "x": 11.45, "y": 2.08},
+                {"matrix": [8, 3], "x": 12.45, "y": 2},
+                {"matrix": [8, 4], "x": 13.45, "y": 2.08},
+                {"matrix": [8, 5], "x": 14.45, "y": 2.25},
+                {"matrix": [8, 6], "x": 15.45, "y": 2.43},
+                {"matrix": [8, 7], "x": 16.45, "y": 2.43},
+                {"matrix": [8, 8], "x": 17.45, "y": 2.43},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.43, "w": 1.5},
+                {"matrix": [3, 2], "x": 1.5, "y": 3.43, "w": 1.75},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.08},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.08},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.15},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.15},
+
+                {"matrix": [9, 0], "x": 9.45, "y": 3.15},
+                {"matrix": [9, 1], "x": 10.45, "y": 3.15},
+                {"matrix": [9, 2], "x": 11.45, "y": 3.08},
+                {"matrix": [9, 3], "x": 12.45, "y": 3},
+                {"matrix": [9, 4], "x": 13.45, "y": 3.08},
+                {"matrix": [9, 5], "x": 14.45, "y": 3.25},
+                {"matrix": [9, 6], "x": 15.45, "y": 3.43},
+                {"matrix": [9, 8], "x": 16.45, "y": 3.43, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.43},
+                {"matrix": [4, 1], "x": 1, "y": 4.43, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.08},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.08},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.15},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.15},
+
+                {"matrix": [10, 0], "x": 9.45, "y": 4.15},
+                {"matrix": [10, 1], "x": 10.45, "y": 4.15},
+                {"matrix": [10, 2], "x": 11.45, "y": 4.08},
+                {"matrix": [10, 3], "x": 12.45, "y": 4},
+                {"matrix": [10, 4], "x": 13.45, "y": 4.08},
+                {"matrix": [10, 5], "x": 14.45, "y": 4.25},
+                {"matrix": [10, 6], "x": 15.45, "y": 4.43, "w": 1.25},
+                {"matrix": [10, 7], "x": 16.7, "y": 4.43},
+                {"matrix": [10, 8], "x": 17.7, "y": 4.43},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.43},
+                {"matrix": [5, 1], "x": 1, "y": 5.43},
+                {"matrix": [5, 2], "x": 2, "y": 5.43},
+                {"matrix": [5, 3], "x": 3.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 4.5, "y": 5.08, "w": 1.25},
+                {"matrix": [5, 6], "x": 5.75, "y": 5.08, "w": 1.25},
+                {"matrix": [5, 7], "x": 7, "y": 5.15, "w": 2.25},
+
+                {"matrix": [11, 1], "x": 9.45, "y": 5.15, "w": 2.25},
+                {"matrix": [11, 2], "x": 11.7, "y": 5.08, "w": 1.25},
+                {"matrix": [11, 4], "x": 12.95, "y": 5.08, "w": 1.25},
+                {"matrix": [11, 5], "x": 14.2, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 15.7, "y": 5.43},
+                {"matrix": [11, 7], "x": 16.7, "y": 5.43},
+                {"matrix": [11, 8], "x": 17.7, "y": 5.43}
+            ]
+        }
+    }
+}
diff --git a/keyboards/arrowmechanics/wings/keymaps/default/keymap.c b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
new file mode 100644
index 00000000000..949219b820b
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 Filip Strzałka (@philvec)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    BASE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BASE] = LAYOUT(
+        KC_VOLU, 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_EQL,   KC_PSCR,  KC_DEL,
+        KC_VOLD, KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,   RGB_MOD,        KC_BTN1,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,       KC_BSPC,
+        KC_MPLY,       KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,   C(KC_C),        C(KC_V),  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,
+        KC_MNXT,      KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,     KC_G,   C(KC_Z),        C(KC_Y),  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,
+        KC_MPRV,      KC_LSFT,     KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,   KC_ENT,         KC_ENT,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_UP,    KC_HOME,
+        KC_LCTL, KC_NO,   KC_NO,            KC_LCTL, KC_LCMD, KC_LALT,      KC_SPC,                  KC_SPC,       KC_RALT, KC_RCMD, KC_RCTL,          KC_LEFT,  KC_DOWN,  KC_RGHT
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [BASE] =   { ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+};
+#endif
diff --git a/keyboards/macro3/keymaps/default/rules.mk b/keyboards/arrowmechanics/wings/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/macro3/keymaps/default/rules.mk
rename to keyboards/arrowmechanics/wings/keymaps/default/rules.mk
diff --git a/keyboards/arrowmechanics/wings/mcuconf.h b/keyboards/arrowmechanics/wings/mcuconf.h
new file mode 100644
index 00000000000..80214c1bbd8
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 Filip Strzałka (@philvec)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM2
+#define RP_PWM_USE_PWM2 TRUE
diff --git a/keyboards/arrowmechanics/wings/readme.md b/keyboards/arrowmechanics/wings/readme.md
new file mode 100644
index 00000000000..8f167174e3d
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/readme.md
@@ -0,0 +1,29 @@
+# Arrow Mechanics WINGS Mark 1
+
+![Arrow Mechanics WINGS Mark 1](https://i.imgur.com/oQkDmSu.png)
+
+ErgoDox-inspired SPLIT keyboard by [Arrow Mechanics](https://www.arrowmechanics.com/)
+	
+* 94 GATERON Low Profile 2.0 hotswap sockets
+* RGB diode under each key for WS2812-driven lighting with [RGB Matrix](https://docs.qmk.fm/#/feature_rgb_matrix)
+* 2 rotary encoders, one per half, with push-switches
+* Buzzers for sound effects and/or [Music Mode](https://docs.qmk.fm/#/feature_audio?id=music-mode)
+* Handy magnetic connectors for joining the halves together or splitting with the use of dedicated cable
+* Anti-slip pads with magnetic expanding-legs for conveniently adjusting height/lean
+* RP2040 Chip + 16MB Flash memory - Dual-core Cortex M0+
+---
+* Keyboard Maintainer: [arrowmechanics](https://github.com/arrowmechanics/)
+* Hardware Supported: [Arrow Mechanics WINGS Keyboard set](https://www.arrowmechanics.com/produkty?view=product&id=8)
+* Hardware Availability: [Official Arrow Mechanics E-SHOP](https://www.arrowmechanics.com/produkty?view=product&id=8)
+
+Flashing example for this keyboard:
+
+    qmk flash -kb arrowmechanics/wings -km 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 2 ways:
+* **Bootmagic reset**: Hold down the top-left corner key on power-up.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/arrowmechanics/wings/rules.mk b/keyboards/arrowmechanics/wings/rules.mk
new file mode 100644
index 00000000000..22ce54190c8
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/rules.mk
@@ -0,0 +1,2 @@
+SERIAL_DRIVER = vendor
+AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/artifact/lvl/rev_hs01/config.h b/keyboards/artifact/lvl/rev_hs01/config.h
new file mode 100755
index 00000000000..674fb1110c8
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2024 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
+
+/* RGB Light */
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_DMA_CHANNEL 5  
+
+#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/artifact/lvl/rev_hs01/halconf.h b/keyboards/artifact/lvl/rev_hs01/halconf.h
new file mode 100644
index 00000000000..c7f5bab5c85
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2024 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 HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/artifact/lvl/rev_hs01/info.json b/keyboards/artifact/lvl/rev_hs01/info.json
new file mode 100755
index 00000000000..1b587501550
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/info.json
@@ -0,0 +1,232 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "LvL Type-01/80",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+    },
+    "processor": "STM32F072",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "default": {
+            "sat": 0
+        },
+        "led_count": 1
+    },
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x4C56",
+        "vid": "0x8968"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "A9"
+    },
+    "community_layouts": ["tkl_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/artifact/lvl/rev_hs01/keymaps/default/keymap.c b/keyboards/artifact/lvl/rev_hs01/keymaps/default/keymap.c
new file mode 100644
index 00000000000..0cca681ba67
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2024 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_tkl_ansi_tsangan( /* 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_PSCR, KC_SCRL, KC_PAUS,
+
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/artifact/lvl/rev_hs01/keymaps/via/keymap.c b/keyboards/artifact/lvl/rev_hs01/keymaps/via/keymap.c
new file mode 100644
index 00000000000..0cca681ba67
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2024 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_tkl_ansi_tsangan( /* 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_PSCR, KC_SCRL, KC_PAUS,
+
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/0xcb/1337/keymaps/jakob/rules.mk b/keyboards/artifact/lvl/rev_hs01/keymaps/via/rules.mk
old mode 100644
new mode 100755
similarity index 100%
rename from keyboards/0xcb/1337/keymaps/jakob/rules.mk
rename to keyboards/artifact/lvl/rev_hs01/keymaps/via/rules.mk
diff --git a/keyboards/artifact/lvl/rev_hs01/mcuconf.h b/keyboards/artifact/lvl/rev_hs01/mcuconf.h
new file mode 100644
index 00000000000..73c8c7d3f4f
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2024 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_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/artifact/lvl/rev_hs01/readme.md b/keyboards/artifact/lvl/rev_hs01/readme.md
new file mode 100755
index 00000000000..af724bd85cf
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/readme.md
@@ -0,0 +1,32 @@
+# LvL Type-01/80
+
+This is a standard TKL layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A TKL keyboard with STM32F072CB
+* Hardware Availability: https://artifact-industries.com 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make artifact/lvl/rev_hs01: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 artifact/lvl/rev_hs01:<keymap>:flash`)
diff --git a/keyboards/artifact/lvl/rev_hs01/rev_hs01.c b/keyboards/artifact/lvl/rev_hs01/rev_hs01.c
new file mode 100755
index 00000000000..6266ef69ad5
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/rev_hs01.c
@@ -0,0 +1,21 @@
+/* Copyright 2024 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 "quantum.h"
+
+void led_init_ports(void) {
+    // Set our LED pins as open drain outputs
+    setPinOutputOpenDrain(LED_CAPS_LOCK_PIN);
+}
diff --git a/keyboards/artifact/lvl/rev_hs01/rules.mk b/keyboards/artifact/lvl/rev_hs01/rules.mk
new file mode 100755
index 00000000000..0ab54aaaf71
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/ask55/keymaps/iic/keymap.c b/keyboards/ask55/keymaps/iic/keymap.c
deleted file mode 100644
index 5784307af9f..00000000000
--- a/keyboards/ask55/keymaps/iic/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 Yiancar / Keyboard-Magpie
- *
- * 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( /* Base */
-    LT(1,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_NUBS,
-    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,
-    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_RSFT,
-    KC_LCAP,  KC_GRV,   KC_LGUI,  KC_LALT,              KC_SPC,               KC_LGUI,  KC_LEFT,  KC_RGHT,  KC_DOWN, KC_UP
-),
-  [1] = LAYOUT( /* Momentary Layer 1 */
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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/ask55/keymaps/iic/readme.md b/keyboards/ask55/keymaps/iic/readme.md
deleted file mode 100644
index e9300cc04db..00000000000
--- a/keyboards/ask55/keymaps/iic/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The IIc keymap for the ASK55
\ No newline at end of file
diff --git a/keyboards/ask55/keymaps/m0118/keymap.c b/keyboards/ask55/keymaps/m0118/keymap.c
deleted file mode 100644
index 541944f5d6f..00000000000
--- a/keyboards/ask55/keymaps/m0118/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 Yiancar / Keyboard-Magpie
- *
- * 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( /* Base */
-    LT(1,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_ENT,
-    KC_LCAP,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUBS, KC_TRNS,
-    KC_LSFT,  KC_GRV,   KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
-    KC_LCTL,  KC_LALT,  KC_LGUI,  KC_LGUI,              KC_SPC,               KC_RGUI,  KC_RGUI,  KC_LEFT,  KC_RGHT, KC_DOWN
-),
-  [1] = LAYOUT( /* Momentary Layer 1 */
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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/ask55/keymaps/m0118/readme.md b/keyboards/ask55/keymaps/m0118/readme.md
deleted file mode 100644
index 1bf1a90266e..00000000000
--- a/keyboards/ask55/keymaps/m0118/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The M0118 keymap for the ASK55
\ No newline at end of file
diff --git a/keyboards/ask55/keymaps/mac-portable/keymap.c b/keyboards/ask55/keymaps/mac-portable/keymap.c
deleted file mode 100644
index 056d0aee5a9..00000000000
--- a/keyboards/ask55/keymaps/mac-portable/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 Yiancar / Keyboard-Magpie
- *
- * 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( /* Base */
-    LT(1,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_NUBS,
-    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,
-    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_RSFT,
-    KC_LCAP,  KC_LALT,  KC_LGUI,  KC_GRV,               KC_SPC,               KC_ENT,   KC_LEFT,  KC_RGHT,  KC_DOWN, KC_UP
-),
-  [1] = LAYOUT( /* Momentary Layer 1 */
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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/ask55/keymaps/mac-portable/readme.md b/keyboards/ask55/keymaps/mac-portable/readme.md
deleted file mode 100644
index 9c24da47362..00000000000
--- a/keyboards/ask55/keymaps/mac-portable/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The Mac Portable keymap for the ASK55
diff --git a/keyboards/ask55/keymaps/next/keymap.c b/keyboards/ask55/keymaps/next/keymap.c
deleted file mode 100644
index ea095ed7959..00000000000
--- a/keyboards/ask55/keymaps/next/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 Yiancar / Keyboard-Magpie
- *
- * 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( /* Base */
-    LT(1,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_NUBS,
-    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,
-    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_RSFT,
-    KC_LALT,  KC_LGUI,  KC_TRNS,  KC_TRNS,              KC_SPC,               KC_TRNS,  KC_TRNS,  KC_RGUI,  KC_RGUI, KC_RALT
-),
-  [1] = LAYOUT( /* Momentary Layer 1 */
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_TOG,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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/ask55/keymaps/next/readme.md b/keyboards/ask55/keymaps/next/readme.md
deleted file mode 100644
index 5cb6d33d1b6..00000000000
--- a/keyboards/ask55/keymaps/next/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The NeXT (both) keymaps for the ASK55
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/info.json b/keyboards/asmodus/plaquead/info.json
new file mode 100644
index 00000000000..a38b905caeb
--- /dev/null
+++ b/keyboards/asmodus/plaquead/info.json
@@ -0,0 +1,112 @@
+ {
+    "maintainer": "Mai The San",
+    "manufacturer": "Asmodus",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["GP3", "GP1", "GP0", "GP25", "GP11", "GP9"],
+        "cols": ["GP29", "GP27", "GP26", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP5", "GP4"]
+    },
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
+    "url": "https://paramountkeeb.com/products/plaque-a-d",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [3, 12], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25},
+                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25},
+                {"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25},
+                {"matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25},
+                {"matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/asmodus/plaquead/readme.md b/keyboards/asmodus/plaquead/readme.md
new file mode 100644
index 00000000000..db307f24d9c
--- /dev/null
+++ b/keyboards/asmodus/plaquead/readme.md
@@ -0,0 +1,29 @@
+# Plaque A.D
+
+![Plaque A.D](https://i.imgur.com/axShuI3.jpeg)
+
+A Hotswap Multi-layout F13 TKL PCB (h88c compatible) powered by RP2040.
+
+* Keyboard Maintainer: Mai The San
+* Hardware Supported: Plaque A.D PCB
+* Hardware Availability: [Plaque A.D](https://paramountkeeb.com/products/plaque-a-d)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make asmodus/plaquead:default
+    make asmodus/plaquead/rgb:default
+
+Flashing example for this keyboard:
+
+    make asmodus/plaquead:default:flash
+    make asmodus/plaquead/rgb: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 short the `RST` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/asmodus/plaquead/rgb/config.h b/keyboards/asmodus/plaquead/rgb/config.h
new file mode 100644
index 00000000000..180e14831f8
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2024 Asmodus
+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 RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define RP2040_FLASH_GENERIC_03H
+
+#ifdef RGB_MATRIX_ENABLE
+#define CAPS_LOCK_LED_INDEX 54
+#define SCROLL_LOCK_LED_INDEX 1
+#endif
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/rgb/info.json b/keyboards/asmodus/plaquead/rgb/info.json
new file mode 100644
index 00000000000..7b45875fe97
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/info.json
@@ -0,0 +1,73 @@
+ {
+    "keyboard_name": "Plaque A.D RGB",
+    "usb": {
+        "vid": "0x5A50",
+        "pid": "0x1875",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "GP2",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "led_count": 136,
+        "center_point": [112, 32],
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "fractal": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "val": 60
+        },
+        "driver": "ws2812",
+        "sleep": true
+    }
+}
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/rgb/keymaps/default/keymap.c b/keyboards/asmodus/plaquead/rgb/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ba79e473b9d
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/keymaps/default/keymap.c
@@ -0,0 +1,78 @@
+/*
+Copyright 2024 Asmodus
+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,  KC_F13,                         KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,               KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                        KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                                 KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, _______,   KC_RGUI, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RGHT)
+};
+
+// Code for indicator
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX) && defined(SCROLL_LOCK_LED_INDEX)
+
+#if !defined(CAPS_LOCK_MAX_BRIGHTNESS)
+    #define CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#if !defined(CAPS_LOCK_VAL_STEP)
+    #define CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+#if !defined(SCROLL_LOCK_MAX_BRIGHTNESS)
+    #define SCROLL_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#if !defined(SCROLL_LOCK_VAL_STEP)
+    #define SCROLL_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+
+bool rgb_matrix_indicators_user(void) {
+    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
+    }
+        if (host_keyboard_led_state().scroll_lock) {
+        uint8_t b = rgb_matrix_get_val();
+        if (b < SCROLL_LOCK_VAL_STEP) {
+            b = SCROLL_LOCK_VAL_STEP;
+        } else if (b < (SCROLL_LOCK_MAX_BRIGHTNESS - SCROLL_LOCK_VAL_STEP)) {
+            b += SCROLL_LOCK_VAL_STEP;  // one step more than current brightness
+        } else {
+            b = SCROLL_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(SCROLL_LOCK_LED_INDEX, b, b, b);  // white, with the adjusted brightness
+    }
+    return false;
+}
+
+#endif
+
+// Code for Scroll Locks indicator
+
+
diff --git a/keyboards/asmodus/plaquead/rgb/keymaps/via/keymap.c b/keyboards/asmodus/plaquead/rgb/keymaps/via/keymap.c
new file mode 100644
index 00000000000..391453f11d0
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/keymaps/via/keymap.c
@@ -0,0 +1,78 @@
+/*
+Copyright 2024 Asmodus
+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,  KC_F13,                         KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,               KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                        KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                                 KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RALT, KC_RGUI, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RGHT)
+};
+
+// Code for indicator
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX) && defined(SCROLL_LOCK_LED_INDEX)
+
+#if !defined(CAPS_LOCK_MAX_BRIGHTNESS)
+    #define CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#if !defined(CAPS_LOCK_VAL_STEP)
+    #define CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+#if !defined(SCROLL_LOCK_MAX_BRIGHTNESS)
+    #define SCROLL_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#if !defined(SCROLL_LOCK_VAL_STEP)
+    #define SCROLL_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+
+bool rgb_matrix_indicators_user(void) {
+    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
+    }
+        if (host_keyboard_led_state().scroll_lock) {
+        uint8_t b = rgb_matrix_get_val();
+        if (b < SCROLL_LOCK_VAL_STEP) {
+            b = SCROLL_LOCK_VAL_STEP;
+        } else if (b < (SCROLL_LOCK_MAX_BRIGHTNESS - SCROLL_LOCK_VAL_STEP)) {
+            b += SCROLL_LOCK_VAL_STEP;  // one step more than current brightness
+        } else {
+            b = SCROLL_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(SCROLL_LOCK_LED_INDEX, b, b, b);  // white, with the adjusted brightness
+    }
+    return false;
+}
+
+#endif
+
+// Code for Scroll Locks indicator
+
+
diff --git a/keyboards/acheron/shark/beta/keymaps/gondolindrim/rules.mk b/keyboards/asmodus/plaquead/rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/acheron/shark/beta/keymaps/gondolindrim/rules.mk
rename to keyboards/asmodus/plaquead/rgb/keymaps/via/rules.mk
diff --git a/keyboards/asmodus/plaquead/rgb/keymaps/vial/config.h b/keyboards/asmodus/plaquead/rgb/keymaps/vial/config.h
new file mode 100644
index 00000000000..3197e53ae7f
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/keymaps/vial/config.h
@@ -0,0 +1,19 @@
+/*
+Copyright 2024 Asmodus
+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 VIAL_UNLOCK_COMBO_ROWS { 0, 3 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+#define VIAL_KEYBOARD_UID {0x9C, 0x48, 0x52, 0xD7, 0x95, 0xC0, 0x50, 0x8C}
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/rgb/keymaps/vial/keymap.c b/keyboards/asmodus/plaquead/rgb/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..37e03a3a4c5
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/keymaps/vial/keymap.c
@@ -0,0 +1,120 @@
+/*
+Copyright 2024 Asmodus
+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,  KC_F13,                         KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,               KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                        KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                                 KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RALT, KC_RGUI, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RGHT),
+
+
+  [1] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 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(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 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(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS),
+
+  [4] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS),
+
+  [5] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS),
+
+};
+
+// Code for indicator
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX) && defined(SCROLL_LOCK_LED_INDEX)
+
+#if !defined(CAPS_LOCK_MAX_BRIGHTNESS)
+    #define CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#if !defined(CAPS_LOCK_VAL_STEP)
+    #define CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+#if !defined(SCROLL_LOCK_MAX_BRIGHTNESS)
+    #define SCROLL_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#if !defined(SCROLL_LOCK_VAL_STEP)
+    #define SCROLL_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+
+bool rgb_matrix_indicators_user(void) {
+    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
+    }
+        if (host_keyboard_led_state().scroll_lock) {
+        uint8_t b = rgb_matrix_get_val();
+        if (b < SCROLL_LOCK_VAL_STEP) {
+            b = SCROLL_LOCK_VAL_STEP;
+        } else if (b < (SCROLL_LOCK_MAX_BRIGHTNESS - SCROLL_LOCK_VAL_STEP)) {
+            b += SCROLL_LOCK_VAL_STEP;  // one step more than current brightness
+        } else {
+            b = SCROLL_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(SCROLL_LOCK_LED_INDEX, b, b, b);  // white, with the adjusted brightness
+    }
+    return false;
+}
+
+#endif
+
+// Code for Scroll Locks indicator
+
+
diff --git a/keyboards/asmodus/plaquead/rgb/keymaps/vial/rules.mk b/keyboards/asmodus/plaquead/rgb/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..31bb6d699f9
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/keymaps/vial/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIALRGB_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/rgb/keymaps/vial/vial.json b/keyboards/asmodus/plaquead/rgb/keymaps/vial/vial.json
new file mode 100644
index 00000000000..c0f1cc9f8b2
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/keymaps/vial/vial.json
@@ -0,0 +1,297 @@
+{
+  "name": "Plaque A.D RGB",
+  "vendorId": "0x5A50",
+  "productId": "0x1875",
+  "matrix": {
+    "rows": 6,
+    "cols": 17
+  },
+  "lighting": "vialrgb",
+  "layouts": {
+    "labels": [
+      "Split Backspace",
+      "ISO",
+      "Split Left Shift",
+      "Split Right Shift",
+      "Stepped Caps",
+      ["Bottom Row", "6.25U", "7U", "WKL"]
+    ],
+    "keymap": [
+      [
+        {
+          "x": 2.5
+        },
+        "0,0",
+        {
+          "x": 0.25
+        },
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        {
+          "x": 0.25
+        },
+        "0,5",
+        "0,6",
+        "0,7",
+        "0,8",
+        {
+          "x": 0.25
+        },
+        "0,9",
+        "0,10",
+        "0,11",
+        "0,12",
+        {
+          "x": 0.25
+        },
+        "0,13",
+        {
+          "x": 0.25
+        },
+        "0,14",
+        "0,15",
+        "0,16"
+      ],
+      [
+        {
+          "y": 0.25,
+          "x": 2.5
+        },
+        "1,0",
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        {
+          "w": 2
+        },
+        "1,13\n\n\n0,0",
+        {
+          "x": 0.25
+        },
+        "1,14",
+        "1,15",
+        "1,16",
+        {
+          "x": 1
+        },
+        "3,12\n\n\n0,1",
+        "1,13\n\n\n0,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "2,0",
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        "2,12",
+        {
+          "w": 1.5
+        },
+        "2,13\n\n\n1,0",
+        {
+          "x": 0.25
+        },
+        "2,14",
+        "2,15",
+        "2,16",
+        {
+          "x": 1.75,
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
+        },
+        "2,13\n\n\n1,1"
+      ],
+      [
+        {
+          "w": 1.25,
+          "w2": 1.75,
+          "l": true
+        },
+        "3,0\n\n\n4,1",
+        {
+          "x": 1.25,
+          "w": 1.75
+        },
+        "3,0\n\n\n4,0",
+        "3,1",
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        "3,11",
+        {
+          "w": 2.25
+        },
+        "3,13\n\n\n1,0",
+        {
+          "x": 4
+        },
+        "3,13\n\n\n1,1"
+      ],
+      [
+        {
+          "w": 1.25
+        },
+        "4,0\n\n\n2,1",
+        "4,1\n\n\n2,1",
+        {
+          "x": 0.25,
+          "w": 2.25
+        },
+        "4,0\n\n\n2,0",
+        "4,2",
+        "4,3",
+        "4,4",
+        "4,5",
+        "4,6",
+        "4,7",
+        "4,8",
+        "4,9",
+        "4,10",
+        "4,11",
+        {
+          "w": 2.75
+        },
+        "4,12\n\n\n3,0",
+        {
+          "x": 1.25
+        },
+        "4,15",
+        {
+          "x": 1.25,
+          "w": 1.75
+        },
+        "4,12\n\n\n3,1",
+        "4,13\n\n\n3,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.25
+        },
+        "5,0\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,1\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,2\n\n\n5,0",
+        {
+          "w": 6.25
+        },
+        "5,6\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,10\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,11\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,12\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,13\n\n\n5,0",
+        {
+          "x": 0.25
+        },
+        "5,14",
+        "5,15",
+        "5,16"
+      ],
+      [
+        {
+          "y": 0.25,
+          "x": 2.5,
+          "w": 1.5
+        },
+        "5,0\n\n\n5,1",
+        "5,1\n\n\n5,1",
+        {
+          "w": 1.5
+        },
+        "5,2\n\n\n5,1",
+        {
+          "w": 7
+        },
+        "5,6\n\n\n5,1",
+        {
+          "w": 1.5
+        },
+        "5,11\n\n\n5,1",
+        "5,12\n\n\n5,1",
+        {
+          "w": 1.5
+        },
+        "5,13\n\n\n5,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "5,0\n\n\n5,2",
+        {
+          "d": true
+        },
+        "5,1\n\n\n5,2",
+        {
+          "w": 1.5
+        },
+        "5,2\n\n\n5,2",
+        {
+          "w": 7
+        },
+        "5,6\n\n\n5,2",
+        {
+          "w": 1.5
+        },
+        "5,11\n\n\n5,2",
+        {
+          "d": true
+        },
+        "5,12\n\n\n5,2",
+        {
+          "w": 1.5
+        },
+        "5,13\n\n\n5,2"
+      ]
+    ]
+  }
+}
diff --git a/keyboards/asmodus/plaquead/rgb/rgb.c b/keyboards/asmodus/plaquead/rgb/rgb.c
new file mode 100644
index 00000000000..4f9d2b77497
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/rgb.c
@@ -0,0 +1,71 @@
+/*
+Copyright 2024 Asmodus
+
+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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+//  { 0        , 1          , 2          , 3          , 4          , 5          , 6          , 7          , 8          , 9          , 10         , 11         , 12         , NO_LED     , 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         , 58         , 59         , 60         , 61         , 62         , NO_LED     , NO_LED     , NO_LED     , NO_LED    },
+//  { 63       , NO_LED     , 64         , 65         , 66         , 67         , 68         , 69         , 70         , 71         , 72         , 73         , 74         , NO_LED     , NO_LED     , 75         , NO_LED    },
+//  { 76       , 77         , 78         , NO_LED     , NO_LED     , NO_LED     , 79         , NO_LED     , NO_LED     , 80         , 81         , 82         , 83         , NO_LED     , 84         , 85         , 86        }
+//
+    { 17       , 16         , 15         , 14         , 13         , 12         , 10         , 9          , 8          , 7          , 6          , 5          , 4          , 3          , 2          , 1          , 0         },
+    { 18       , 19         , 20         , 21         , 22         , 23         , 24         , 25         , 26         , 27         , 28         , 29         , 30         , 33         , 34         , 35         , 36        },
+    { 53       , 52         , 51         , 50         , 49         , 48         , 47         , 46         , 45         , 44         , 43         , 42         , 41         , 40         , 39         , 38         , 37        },
+    { 54       , 55         , 56         , 57         , 58         , 59         , 60         , 61         , 62         , 63         , 64         , 65         , 31         , 66         , NO_LED     , NO_LED     , NO_LED    },
+    { 82       , 80         , 79         , 78         , 77         , 76         , 75         , 74         , 73         , 72         , 71         , 70         , 69         , 67         , NO_LED     , 93         , NO_LED    },
+    { 83       , 84         , 85         , NO_LED     , NO_LED     , NO_LED     , 86         , NO_LED     , NO_LED     , NO_LED     , 88         , 89         , 90         , 91         , 92         , 94         , 95        }
+},{
+// "Fine-tuned" complex configuration
+{224,0  }, {211,0  }, {198,0  }, {182,0  }, {166,0  }, {153,0  }, {148,0  }, {140,0  }, {127,0  }, {110,0  }, { 97,0  }, { 84,0  }, { 71,0  }, { 55,0  },            { 42,0  }, { 29,0  }, { 16,0  }, {  0,0  }, 
+{  0,15 }, { 13,15 }, { 26,15 }, { 39,15 }, { 52,15 }, { 65,15 }, { 78,15 }, { 91,15 }, {104,15 }, {117,15 }, {130,15 }, {143,15 }, {156,15 }, {175,15 }, {169,15 }, {182,15 }, {198,15 }, {211,15 }, {224,15 },
+{224,27 }, {211,27 }, {198,27 }, {179,27 }, {162,27 }, {149,27 }, {136,27 }, {123,27 }, {110,27 }, { 97,27 }, { 84,27 }, { 71,27 }, { 58,27 }, { 45,27 },                       { 32,27 }, { 19,27 }, {  3,27 }, 
+{  5,40 }, { 23,40 }, { 36,40 }, { 49,40 }, { 62,40 }, { 75,40 }, { 88,40 }, {101,40 }, {114,40 }, {127,40 }, {140,40 }, {153,40 }, {174,40 }, 
+{182,52 }, {170,52 }, {164,52 }, {146,52 }, {133,52 }, {120,52 }, {107,52 }, { 94,52 }, { 81,52 }, { 68,52 }, { 55,52 }, { 42,52 }, { 29,52 }, { 16,52 }, {  8,52 }, {  2,52 }, 
+{  5,64 }, { 21,64 }, { 37,64 },                                  { 83,64 }, { 91,64 },                       {131,64 }, {151,64 }, {167,64 }, {183,64 },            {198,64 }, {211,52 }, {211,64 }, {224,64 }, 
+
+{224,57 }, {224,45 }, {224,32 }, {224,20 }, 
+{224,5  }, {209,5  }, {194,5  }, {179,5  }, {164,5  }, {149,5  }, {134,5  }, {119,5  }, {104,5  }, {89,5  }, { 74,5  }, { 59,5  }, { 44,5  }, { 29,5  }, { 14,5  }, 
+{  0,5  }, {  0,20 }, {  0,32 }, {  0,45 }, 
+{  0,57 }, { 14,57 }, { 29,57 }, { 44,57 }, { 59,57 }, { 74,57 }, { 89,57 }, {104,57 }, {119,57 }, {134,57 }, {149,57 }, {164,57 }, {179,57 }, {194,57 }, {209,57 },
+
+
+
+// "Stock" simple configuration
+//  { 224,   0}, { 210,   0}, { 196,   0}, { 182,   0}, { 168,   0}, { 154,   0}, { 140,   0}, { 126,   0}, { 112,   0}, {  98,   0}, {  84,   0}, {  70,   0}, {  56,   0},              {  28,   0}, {  14,   0}, {   0,   0},
+//  {   0,  45}, {  14,  45}, {  28,  45}, {  42,  45}, {  56,  45}, {  70,  45}, {  84,  45}, {  98,  45}, { 112,  45}, { 126,  45}, { 140,  45}, { 154,  45}, { 168,  45}, { 182,  45}, { 196,  45}, { 210,  45}, { 224,  45},
+//  { 224,  90}, { 210,  90}, { 196,  90}, { 182,  90}, { 168,  90}, { 154,  90}, { 140,  90}, { 126,  90}, { 112,  90}, {  98,  90}, {  84,  90}, {  70,  90}, {  56,  90}, {  42,  90}, {  28,  90}, {  14,  90}, {   0,  90},
+//  {   0, 135}, {  14, 135}, {  28, 135}, {  42, 135}, {  56, 135}, {  70, 135}, {  84, 135}, {  98, 135}, { 112, 135}, { 126, 135}, { 140, 135}, { 154, 135}, { 168, 135},
+//  { 224, 180},              { 196, 180}, { 182, 180}, { 168, 180}, { 154, 180}, { 140, 180}, { 126, 180}, { 112, 180}, {  98, 180}, {  84, 180}, {  70, 180}, {  56, 180},                           {  14, 180},
+//  {   0, 225}, {  14, 225}, {  28, 225},                                        {  84, 225},                           { 126, 225}, { 140, 225}, { 154, 225}, { 168, 225},              { 196,  45}, { 210,  45}, { 224,  90}
+}, {
+    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          , 1          , 1          , 1          , 4          , 4          , 4          ,
+    4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          ,
+    1          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 1          ,
+    4          , 1          , 1          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 4          , 1          , 1          , 4          ,
+    1          , 1          , 1          ,                                        4          , 4                       , 1          , 1          , 1          , 1          , 1          , 1          , 1          , 1          ,
+
+
+    2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2           ,
+    2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2          , 2                 
+
+} };
+#endif
diff --git a/keyboards/asmodus/plaquead/rgb/rules.mk b/keyboards/asmodus/plaquead/rgb/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rgb/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/asmodus/plaquead/rules.mk b/keyboards/asmodus/plaquead/rules.mk
new file mode 100644
index 00000000000..750753e9890
--- /dev/null
+++ b/keyboards/asmodus/plaquead/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = asmodus/plaquead/standard
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/standard/config.h b/keyboards/asmodus/plaquead/standard/config.h
new file mode 100644
index 00000000000..9186986955e
--- /dev/null
+++ b/keyboards/asmodus/plaquead/standard/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2024 Asmodus
+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 RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define RP2040_FLASH_GENERIC_03H
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/standard/info.json b/keyboards/asmodus/plaquead/standard/info.json
new file mode 100644
index 00000000000..fc6bc7f6123
--- /dev/null
+++ b/keyboards/asmodus/plaquead/standard/info.json
@@ -0,0 +1,44 @@
+ {
+    "keyboard_name": "Plaque A.D",
+    "usb": {
+        "vid": "0x5A50",
+        "pid": "0x0875",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
+    "indicators": {
+        "caps_lock": "GP28",
+        "scroll_lock": "GP2"
+    },
+    "rgblight": {
+        "led_count": 38,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "sleep": true,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "GP10",
+        "driver": "vendor"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/standard/keymaps/default/keymap.c b/keyboards/asmodus/plaquead/standard/keymaps/default/keymap.c
new file mode 100644
index 00000000000..62744f0c875
--- /dev/null
+++ b/keyboards/asmodus/plaquead/standard/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/*
+Copyright 2024 Asmodus
+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,  KC_F13,                         KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,               KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                        KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                                 KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, _______,   KC_RGUI, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/asmodus/plaquead/standard/keymaps/via/keymap.c b/keyboards/asmodus/plaquead/standard/keymaps/via/keymap.c
new file mode 100644
index 00000000000..db9b639cb70
--- /dev/null
+++ b/keyboards/asmodus/plaquead/standard/keymaps/via/keymap.c
@@ -0,0 +1,26 @@
+/*
+Copyright 2024 Asmodus
+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,  KC_F13,                         KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,               KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                        KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                                 KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RALT, KC_RGUI, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RGHT),
+};
diff --git a/keyboards/enter80/keymaps/via/rules.mk b/keyboards/asmodus/plaquead/standard/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/enter80/keymaps/via/rules.mk
rename to keyboards/asmodus/plaquead/standard/keymaps/via/rules.mk
diff --git a/keyboards/asmodus/plaquead/standard/keymaps/vial/config.h b/keyboards/asmodus/plaquead/standard/keymaps/vial/config.h
new file mode 100644
index 00000000000..6559001280e
--- /dev/null
+++ b/keyboards/asmodus/plaquead/standard/keymaps/vial/config.h
@@ -0,0 +1,19 @@
+/*
+Copyright 2024 Asmodus
+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 VIAL_UNLOCK_COMBO_ROWS { 0, 3 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+#define VIAL_KEYBOARD_UID {0xF1, 0x51, 0xCF, 0x94, 0x3E, 0x04, 0xAF, 0x6B}
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/standard/keymaps/vial/keymap.c b/keyboards/asmodus/plaquead/standard/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..1e70631d8b3
--- /dev/null
+++ b/keyboards/asmodus/plaquead/standard/keymaps/vial/keymap.c
@@ -0,0 +1,68 @@
+/*
+Copyright 2024 Asmodus
+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,  KC_F13,                         KC_PSCR, KC_SCRL, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,               KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                        KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                                 KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RALT, KC_RGUI, KC_RCTL,                        KC_LEFT, KC_DOWN, KC_RGHT),
+
+
+  [1] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 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(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 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(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS),
+
+  [4] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS),
+
+  [5] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 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/asmodus/plaquead/standard/keymaps/vial/rules.mk b/keyboards/asmodus/plaquead/standard/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..6bc7063adc2
--- /dev/null
+++ b/keyboards/asmodus/plaquead/standard/keymaps/vial/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/asmodus/plaquead/standard/keymaps/vial/vial.json b/keyboards/asmodus/plaquead/standard/keymaps/vial/vial.json
new file mode 100644
index 00000000000..2dcc0d408a3
--- /dev/null
+++ b/keyboards/asmodus/plaquead/standard/keymaps/vial/vial.json
@@ -0,0 +1,297 @@
+{
+  "name": "Plaque A.D",
+  "vendorId": "0x5A50",
+  "productId": "0x0875",
+  "matrix": {
+    "rows": 6,
+    "cols": 17
+  },
+  "lighting": "qmk_rgblight",
+  "layouts": {
+    "labels": [
+      "Split Backspace",
+      "ISO",
+      "Split Left Shift",
+      "Split Right Shift",
+      "Stepped Caps",
+      ["Bottom Row", "6.25U", "7U", "WKL"]
+    ],
+    "keymap": [
+      [
+        {
+          "x": 2.5
+        },
+        "0,0",
+        {
+          "x": 0.25
+        },
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        {
+          "x": 0.25
+        },
+        "0,5",
+        "0,6",
+        "0,7",
+        "0,8",
+        {
+          "x": 0.25
+        },
+        "0,9",
+        "0,10",
+        "0,11",
+        "0,12",
+        {
+          "x": 0.25
+        },
+        "0,13",
+        {
+          "x": 0.25
+        },
+        "0,14",
+        "0,15",
+        "0,16"
+      ],
+      [
+        {
+          "y": 0.25,
+          "x": 2.5
+        },
+        "1,0",
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        {
+          "w": 2
+        },
+        "1,13\n\n\n0,0",
+        {
+          "x": 0.25
+        },
+        "1,14",
+        "1,15",
+        "1,16",
+        {
+          "x": 1
+        },
+        "3,12\n\n\n0,1",
+        "1,13\n\n\n0,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "2,0",
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        "2,12",
+        {
+          "w": 1.5
+        },
+        "2,13\n\n\n1,0",
+        {
+          "x": 0.25
+        },
+        "2,14",
+        "2,15",
+        "2,16",
+        {
+          "x": 1.75,
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
+        },
+        "2,13\n\n\n1,1"
+      ],
+      [
+        {
+          "w": 1.25,
+          "w2": 1.75,
+          "l": true
+        },
+        "3,0\n\n\n4,1",
+        {
+          "x": 1.25,
+          "w": 1.75
+        },
+        "3,0\n\n\n4,0",
+        "3,1",
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        "3,11",
+        {
+          "w": 2.25
+        },
+        "3,13\n\n\n1,0",
+        {
+          "x": 4
+        },
+        "3,13\n\n\n1,1"
+      ],
+      [
+        {
+          "w": 1.25
+        },
+        "4,0\n\n\n2,1",
+        "4,1\n\n\n2,1",
+        {
+          "x": 0.25,
+          "w": 2.25
+        },
+        "4,0\n\n\n2,0",
+        "4,2",
+        "4,3",
+        "4,4",
+        "4,5",
+        "4,6",
+        "4,7",
+        "4,8",
+        "4,9",
+        "4,10",
+        "4,11",
+        {
+          "w": 2.75
+        },
+        "4,12\n\n\n3,0",
+        {
+          "x": 1.25
+        },
+        "4,15",
+        {
+          "x": 1.25,
+          "w": 1.75
+        },
+        "4,12\n\n\n3,1",
+        "4,13\n\n\n3,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.25
+        },
+        "5,0\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,1\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,2\n\n\n5,0",
+        {
+          "w": 6.25
+        },
+        "5,6\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,10\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,11\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,12\n\n\n5,0",
+        {
+          "w": 1.25
+        },
+        "5,13\n\n\n5,0",
+        {
+          "x": 0.25
+        },
+        "5,14",
+        "5,15",
+        "5,16"
+      ],
+      [
+        {
+          "y": 0.25,
+          "x": 2.5,
+          "w": 1.5
+        },
+        "5,0\n\n\n5,1",
+        "5,1\n\n\n5,1",
+        {
+          "w": 1.5
+        },
+        "5,2\n\n\n5,1",
+        {
+          "w": 7
+        },
+        "5,6\n\n\n5,1",
+        {
+          "w": 1.5
+        },
+        "5,11\n\n\n5,1",
+        "5,12\n\n\n5,1",
+        {
+          "w": 1.5
+        },
+        "5,13\n\n\n5,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "5,0\n\n\n5,2",
+        {
+          "d": true
+        },
+        "5,1\n\n\n5,2",
+        {
+          "w": 1.5
+        },
+        "5,2\n\n\n5,2",
+        {
+          "w": 7
+        },
+        "5,6\n\n\n5,2",
+        {
+          "w": 1.5
+        },
+        "5,11\n\n\n5,2",
+        {
+          "d": true
+        },
+        "5,12\n\n\n5,2",
+        {
+          "w": 1.5
+        },
+        "5,13\n\n\n5,2"
+      ]
+    ]
+  }
+}
diff --git a/keyboards/asmodus/plaquead/standard/rules.mk b/keyboards/asmodus/plaquead/standard/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/asmodus/plaquead/standard/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index c6e12504a3c..374119935e9 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -22,52 +22,4 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true
 #define RGB_MATRIX_LED_COUNT 96
-#define RGB_MATRIX_DEFAULT_HUE 170
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
-
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-#define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-#define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-#define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-#define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradent Chevron shapped scrolling left to right
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-#define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-#define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-#define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight ammount at the same time, then shifts back
-#define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight ammount in a wave to the right, then back to the left
-#define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight ammount and then back down in a wave to the right
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL             // Single hue fractal filled keys pulsing horizontally out to edges
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN                // Randomly light keys with random hues
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP            // How hot is your WPM!
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN              // That famous computer simulation
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-#define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json
index 1a2d1eebe1e..a6b78bb5a8d 100644
--- a/keyboards/atlantis/ak81_ve/info.json
+++ b/keyboards/atlantis/ak81_ve/info.json
@@ -9,7 +9,56 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "hue": 170
+        },
+        "driver": "ws2812",
+        "max_brightness": 130,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"],
diff --git a/keyboards/atlantis/ps17/config.h b/keyboards/atlantis/ps17/config.h
index a41720aeb59..8b2691b751b 100644
--- a/keyboards/atlantis/ps17/config.h
+++ b/keyboards/atlantis/ps17/config.h
@@ -7,46 +7,3 @@
 #define LED_INDICATOR_0_PIN D0
 #define LED_INDICATOR_1_PIN D5
 #define LED_INDICATOR_2_PIN D4
-
-/* RGB matrix */
-#define RGB_MATRIX_LED_COUNT 28
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#ifdef RGB_MATRIX_ENABLE
-	// 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_SOLID_COLOR
-	// #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_FRACTAL
-	// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-	#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-	// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-	// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#endif
diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/info.json
index 5a85dec5b45..ac8f979d399 100644
--- a/keyboards/atlantis/ps17/info.json
+++ b/keyboards/atlantis/ps17/info.json
@@ -64,6 +64,12 @@
         }
     },
     "rgb_matrix": {
+        "animations": {
+            "cycle_all": true,
+            "cycle_pinwheel": true,
+            "rainbow_beacon": true,
+            "pixel_rain": true
+        },
         "driver": "ws2812",
         "center_point": [126, 126],
         "layout": [
@@ -96,6 +102,7 @@
             {"flags": 2, "x": 192, "y": 87},
             {"flags": 2, "x": 183, "y": 26},
             {"flags": 2, "x": 127, "y": 24}
-        ]
+        ],
+        "sleep": true
     }
 }
diff --git a/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c b/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c
deleted file mode 100644
index 8546cfb71f2..00000000000
--- a/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2023 mjbogusz (@mjbogusz)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // Default layer: numpad + volume control
-    [0] = LAYOUT(
-                 KC_MUTE,
-        TO(1),   KC_PSLS, KC_PAST, KC_PMNS,
-        KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS,
-        KC_KP_4, KC_KP_5, KC_KP_6,
-        KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
-        KC_KP_0,          KC_PDOT
-    ),
-    [1] = LAYOUT(
-                 KC_MUTE,
-        TO(2),   XXXXXXX, XXXXXXX, KC_VOLD,
-        XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
-        KC_MRWD, KC_MPLY, KC_MFFD,
-        KC_MPRV, KC_MSTP, KC_MNXT, KC_MSEL,
-        XXXXXXX,          XXXXXXX
-    ),
-    [2] = LAYOUT(
-                 RGB_MOD,
-        TO(3),   KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, 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(
-                 KC_TRNS,
-        TO(0),   KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,          KC_TRNS
-    ),
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [2] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
-    [3] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
-};
-#endif
diff --git a/keyboards/atomic/keymaps/abienz/keymap.c b/keyboards/atomic/keymaps/abienz/keymap.c
deleted file mode 100644
index c499807d769..00000000000
--- a/keyboards/atomic/keymaps/abienz/keymap.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_colemak.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_ortho_5x15(/* Colemak */
-        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, XXXXXXX,
-        KC_TAB,  CM_Q,    CM_W,    CM_F,    CM_P,    CM_G,    CM_J,    CM_L,    CM_U,    CM_Y,    CM_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_BSPC, CM_A,    CM_R,    CM_S,    CM_T,    CM_D,    CM_H,    CM_N,    CM_E,    CM_I,    CM_O,    KC_QUOT, KC_ENT,  XXXXXXX, KC_PGUP,
-        KC_LSFT, CM_Z,    CM_X,    CM_C,    CM_V,    CM_B,    CM_K,    CM_M,    CM_COMM, CM_DOT,  CM_SLSH, KC_RSFT, XXXXXXX, KC_UP,   KC_PGDN,
-        KC_LCTL, KC_LGUI, XXXXXXX, KC_LALT, MO(1),   KC_SPC,  XXXXXXX, KC_RALT, MO(1),   KC_RGUI, XXXXXXX, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_ortho_5x15(/* function */
-        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_BSPC, XXXXXXX,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_MPLY,
-        _______, _______, XXXXXXX, _______, MO(1),   _______, XXXXXXX, _______, MO(1),   _______, XXXXXXX, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-};
diff --git a/keyboards/atomic/keymaps/michelle/keymap.c b/keyboards/atomic/keymaps/michelle/keymap.c
deleted file mode 100644
index da694271680..00000000000
--- a/keyboards/atomic/keymaps/michelle/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_ortho_5x15( /* Dvorak */
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC, XXXXXXX,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_INS,  KC_DEL,
-        KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, KC_ENT,  XXXXXXX, KC_PGUP,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, XXXXXXX, KC_UP,   KC_PGDN,
-        KC_LCTL, MO(1),   XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_ortho_5x15( /* Qwerty + F keys */
-        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_BSPC, XXXXXXX,
-        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_INS,  KC_DEL,
-        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  XXXXXXX, 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, XXXXXXX, KC_UP,   KC_PGDN,
-        KC_LCTL, _______, XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [2] = LAYOUT_ortho_5x15( /* Numpad + qwerty shortcut keys */
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_P7,   KC_P8,   KC_P9,   KC_0,    KC_LBRC, KC_RBRC, KC_BSPC, XXXXXXX,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_P4,   KC_P5,   KC_P6,   KC_L,    KC_SLSH, KC_EQL,  KC_INS,  KC_DEL,
-        KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_P1,   KC_P2,   KC_P3,   KC_S,    KC_MINS, KC_ENT,  XXXXXXX, KC_PGUP,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_X,    KC_B,    KC_P0,   KC_P0,   KC_PENT, KC_Z,    KC_RSFT, XXXXXXX, KC_UP,   KC_PGDN,
-        KC_LCTL, _______, XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-};
diff --git a/keyboards/atomic/keymaps/twolayer/keymap.c b/keyboards/atomic/keymaps/twolayer/keymap.c
deleted file mode 100644
index af235441bae..00000000000
--- a/keyboards/atomic/keymaps/twolayer/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* QWERTY - MIT ENHANCED / GRID COMPATIBLE
-     * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
-     * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | \      | DEL    |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
-     * | LCTRL1 | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | XXXXXX . ENTER  | PG UP  |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
-     * | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | XXXXXX . RSHIFT | UP     | PG DN  |
-     * |--------+--------+--------+--------+--------+- 6.25u ---------+--------+--------+--------+--------+-----------------+--------+--------|
-     * | BRITE  | LALT   |  FN    |               XXXXXX . SPACE                        | RCTRL  | RALT   | FN     | LEFT   | DOWN   | RIGHT  |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-    [0] = LAYOUT_ortho_5x15( /* QWERTY */
-        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_DEL,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,  KC_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_RSFT, KC_UP,   KC_PGDN,
-        BL_STEP, KC_LALT, MO(1),   KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_RCTL, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* FUNCTION
-     * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
-     * | GRV    | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | XXXXXX .        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * | SCR LK | F13    | F14    | F15    | F16    | F17    | F18    | F19    | F20    | F21    | F22    | F23    | F24    | PAUSE  | PR SCR |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
-     * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT   | VOL+   | VOL-   | PLAY   |        | XXXXXX .        | WHEEL+ |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
-     * | NUM LK |        |        |        |        |        |        |        | INSERT |   END1 |  HOME  | XXXXXX .        | MOUS U | WHEEL- |
-     * |--------+--------+--------+--------+--------+- 6.25 ------------+--------+--------+------+--------+-----------------+--------+--------|
-     * |        |        |   FN   |                  XXXXXX . MS BT1                      |      |        |   FN   | MOUS L | MOUS D | MOUS R |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-    [1] = LAYOUT_ortho_5x15( /* FUNCTION LAYER*/
-        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_SCRL, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
-        KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, KC_WH_U,
-        KC_NUM,  _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_END,  KC_HOME, _______, _______, KC_MS_U, KC_WH_D,
-        _______, _______, MO(1),   _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, MO(1),   KC_MS_L, KC_MS_D, KC_MS_R
-    ),
-};
diff --git a/keyboards/atreus/keymaps/clash/keymap.c b/keyboards/atreus/keymaps/clash/keymap.c
deleted file mode 100644
index 449f816f79b..00000000000
--- a/keyboards/atreus/keymaps/clash/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#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.
-#define _QW 0
-#define _RS 1
-#define _LW 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
-    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
-    KC_ESC, KC_TAB, KC_LGUI,  KC_LSFT, KC_BSPC,  KC_LCTL, KC_LALT, KC_SPC,  MO(_RS), KC_MINS, KC_QUOT, KC_ENT
-  ),
-
-  /*
-   *  !       @     up     {    }        ||     pgup    7     8     9    *
-   *  #     left   down  right  $        ||     pgdn    4     5     6    +
-   *  [       ]      (     )    &        ||       `     1     2     3    \
-   * lower  insert super shift del  ctrl || alt space   fn    .     0    =
-   */
-  [_RS] = LAYOUT( /* [> RAISE <] */
-    KC_EXLM, KC_AT,   KC_UP,   KC_LCBR, KC_RCBR,                   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR ,
-    KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR,                    KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS ,
-    KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_1,    KC_2,   KC_3, KC_BSLS ,
-    TG(_LW), KC_INS,  KC_LGUI, KC_LSFT, KC_DEL,  KC_LCTL, KC_LALT, KC_SPC,  KC_TRNS, KC_DOT, KC_0, KC_EQL  ),
-  /*
-   * insert home  mup  end   pgup       ||     mouse1  F7    F8    F9   F10
-   * USB    mlft  mdwn mrght pgdn       ||     mouse2  F4    F5    F6   F11
-   * Blue  volup             reset      ||     mouse3  F1    F2    F3   F12
-   * auto  voldn  super shift bksp ctrl || alt space   L0  prtsc scroll pause
-   */
-  [_LW] = LAYOUT( /* [> LOWER <] */
-    KC_INS,  KC_HOME, KC_MS_U, KC_END,  KC_PGUP,                   KC_BTN1, KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
-    OU_USB,  KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN,                   KC_BTN2, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
-    OU_BT,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_BTN3, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-    OU_AUTO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
-};
diff --git a/keyboards/atreus/keymaps/clash/rules.mk b/keyboards/atreus/keymaps/clash/rules.mk
deleted file mode 100644
index db1870fb157..00000000000
--- a/keyboards/atreus/keymaps/clash/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BLUETOOTH_ENABLE=yes
diff --git a/keyboards/atreus/keymaps/classic/keymap.c b/keyboards/atreus/keymaps/classic/keymap.c
deleted file mode 100644
index 2777edd8e51..00000000000
--- a/keyboards/atreus/keymaps/classic/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#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.
-#define _QW 0
-#define _RS 1
-#define _LW 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
-    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
-    KC_ESC,  KC_TAB, KC_LGUI,  KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  MO(_RS), KC_MINS, KC_QUOT, KC_ENT
-  ),
-
-  [_RS] = LAYOUT( /* [> RAISE <] */
-    KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,                   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR ,
-    KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,                    KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS ,
-    KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                   KC_AMPR, KC_1,    KC_2,   KC_3, KC_BSLS ,
-    TG(_LW), KC_INS,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  KC_TRNS, KC_DOT, KC_0, KC_EQL
-  ),
-
-  [_LW] = LAYOUT( /* [> LOWER <] */
-    KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
-    KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F12 ,
-    KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  DF(_QW), KC_TRNS, KC_TRNS, QK_BOOT
-  ),
-};
diff --git a/keyboards/atreus/keymaps/erlandsona/config.h b/keyboards/atreus/keymaps/erlandsona/config.h
deleted file mode 100644
index aa1d8445c61..00000000000
--- a/keyboards/atreus/keymaps/erlandsona/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-// place overrides here
-
-/* Make Overloaded Keys switch faster */
-#define TAPPING_TERM 150
diff --git a/keyboards/atreus/keymaps/erlandsona/keymap.c b/keyboards/atreus/keymaps/erlandsona/keymap.c
deleted file mode 100644
index 64d24080401..00000000000
--- a/keyboards/atreus/keymaps/erlandsona/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#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.
-#define BASE 0
-#define NUMS 1
-#define MOUS 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT( /* Qwerty */
-    KC_Q       , KC_W   , KC_E   , KC_R   ,  KC_T   ,                 KC_Y  ,  KC_U   , KC_I   , KC_O   , KC_P          ,
-    KC_A       , KC_S   , KC_D   , KC_F   ,  KC_G   ,                 KC_H  ,  KC_J   , KC_K   , KC_L   , KC_SCLN       ,
-    SFT_T(KC_Z), KC_X   , KC_C   , KC_V   ,  KC_B   ,                 KC_N  ,  KC_M   , KC_COMM, KC_DOT , SFT_T(KC_QUOT),
-    KC_LCTL    , KC_LALT, KC_LALT, KC_LGUI,  KC_BSPC, KC_ESC, KC_ENT, KC_SPC,  MO(NUMS),KC_RALT, KC_SLSH, KC_BSLS
-  ),
-
-  [NUMS] = LAYOUT( /* Numbers / Arrows / Symbols */
-    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   ,                   KC_LPRN, KC_RPRN, KC_MINS, KC_EQL , KC_LBRC,
-    KC_TAB , KC_5   , KC_6   , KC_7   , KC_8   ,                   KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, KC_RBRC,
-    _______, KC_9   , KC_0   , KC_DOT , KC_COMM,                   KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
-    _______, _______, _______, _______, KC_DEL , TG(MOUS), _______, _______, _______, _______, _______, _______
-  ),
-
-  [MOUS] = LAYOUT( /* Mouse and Media Keys */
-    KC_SCRL, KC_PAUSE, KC_F11 , KC_F10 , KC_F9  ,                   KC_F8  , KC_F7  , KC_F6  , KC_F5  , KC_F4,
-    KC_VOLD, KC_ACL0 , KC_ACL1, KC_ACL2, KC_VOLU,                   KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_F3,
-    KC_MUTE, KC_MPRV , KC_MPLY, KC_MNXT, KC_MUTE,                   KC_WH_R, KC_WH_U, KC_WH_D, KC_WH_L, KC_F2,
-    _______, _______ , _______, _______, _______, _______, _______, KC_BTN1, TO(BASE), QK_BOOT, KC_F12 , KC_F1
-  ),
-};
diff --git a/keyboards/atreus/keymaps/gerb/keymap.c b/keyboards/atreus/keymaps/gerb/keymap.c
deleted file mode 100644
index e122c5f12f6..00000000000
--- a/keyboards/atreus/keymaps/gerb/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-// This is the personal keymap of Chris Gerber (@gerbercj). I haven't worked out the kinks
-// with the Colemak and Dvorak support yet, but everything else works nicely.
-
-#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.
-#define _QW 0
-#define _CM 1
-#define _DV 2
-#define _L1 3
-#define _L2 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
-    KC_Q,   KC_W,   KC_E,    KC_R,    KC_T,                      KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,
-    KC_A,   KC_S,   KC_D,    KC_F,    KC_G,                      KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN,
-    KC_Z,   KC_X,   KC_C,    KC_V,    KC_B,                      KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-    KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_ENT
-  ),
-  [_CM] = LAYOUT( /* Colemak */
-    KC_Q,   KC_W,   KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-    KC_A,   KC_R,   KC_S,    KC_T,    KC_D,                      KC_H,    KC_N,    KC_E,    KC_I,    KC_O,
-    KC_Z,   KC_X,   KC_C,    KC_V,    KC_B,                      KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-    KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC,  MO(_L1), KC_MINS, KC_QUOT, KC_ENT
-  ),
-  [_DV] = LAYOUT( /* Dvorak */
-    KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L,
-    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S,
-    KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,                      KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,
-    KC_ESC,  KC_TAB,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC,  MO(_L1), KC_MINS, KC_SLSH, KC_ENT
-  ),
-  [_L1] = LAYOUT( /* LAYER 1 */
-    KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_VOLU, KC_7,    KC_8,   KC_9, KC_LBRC,
-    KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_VOLD, KC_4,    KC_5,   KC_6, KC_RBRC,
-    KC_GRV,  KC_MPRV, KC_MPLY, KC_MNXT, KC_MINS,                   KC_MUTE, KC_1,    KC_2,   KC_3, KC_BSLS,
-    TG(_L2), KC_APP,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC,  KC_TRNS, KC_DOT, KC_0, KC_EQL
-  ),
-  [_L2] = LAYOUT( /* LAYER 2 */
-    KC_TRNS, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,                   DF(_QW), KC_F7,   KC_F8,   KC_F9,   KC_F10,
-    KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,                   DF(_CM), KC_F6,   KC_F5,   KC_F6,   KC_F11,
-    KC_BTN4, KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4,                   DF(_DV), KC_F1,   KC_F2,   KC_F3,   KC_F12,
-    KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
-  ),
-};
diff --git a/keyboards/atreus/keymaps/henxing/Readme.md b/keyboards/atreus/keymaps/henxing/Readme.md
deleted file mode 100644
index a615adf9665..00000000000
--- a/keyboards/atreus/keymaps/henxing/Readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Hugh's Atreus Keymap
-
-This keymap is the same as the [default](../default) layout for the Atreus, but
-uses the programming style found in the Let's
-Split [default](../../../lets_split/keymaps/default) keymap. See
-[`keymap.c`](keymap.c) for the layout.
diff --git a/keyboards/atreus/keymaps/henxing/keymap.c b/keyboards/atreus/keymaps/henxing/keymap.c
deleted file mode 100644
index 8db85d04c38..00000000000
--- a/keyboards/atreus/keymaps/henxing/keymap.c
+++ /dev/null
@@ -1,103 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER  1
-#define _RAISE  2
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-   *  q   w   e    r    t        ||       y     u    i  o   p
-   *  a   s   d    f    g        ||       h     j    k  l   ;
-   *  z   x   c    v    b        ||       n     m    ,  .   /
-   * esc tab gui shift bksp ctrl || alt space lower  -  ' enter
-   */
-  [_QWERTY] = LAYOUT(
-    KC_Q,   KC_W,   KC_E,    KC_R,    KC_T,                      KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,
-    KC_A,   KC_S,   KC_D,    KC_F,    KC_G,                      KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN,
-    KC_Z,   KC_X,   KC_C,    KC_V,    KC_B,                      KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH,
-    KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, LOWER, KC_MINS, KC_QUOT, KC_ENT
-  ),
-
-  /*
-   *  !       @     up     {    }        ||     pgup    7     8     9    *
-   *  #     left   down  right  $        ||     pgdn    4     5     6    +
-   *  [       ]      (     )    &        ||       `     1     2     3    \
-   * raise  insert  gui  shift bksp ctrl || alt space  ____   .     0    =
-   */
-  [_LOWER] = LAYOUT(
-    KC_EXLM, KC_AT,   KC_UP,   KC_LCBR, KC_RCBR,                   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR,
-    KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,                    KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS,
-    KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_1,    KC_2,   KC_3, KC_BSLS,
-    RAISE,   KC_INS,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  KC_TRNS, KC_DOT, KC_0, KC_EQL
-  ),
-
-  /*
-   * insert home   up   end  pgup       ||      up      F7    F8     F9    F10
-   *  del   left  down right pgdn       ||     down     F4    F5     F6    F11
-   *       volup             reset      ||              F1    F2     F3    F12
-   *       voldn super shift bksp  ctrl || alt space QWERTY  prtsc scroll pause
-   */
-  [_RAISE] = LAYOUT(
-    KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,  KC_F8,   KC_F9,   KC_F10,
-    KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,  KC_F5,   KC_F6,   KC_F11,
-    KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, QK_BOOT,                   KC_TRNS, KC_F1,  KC_F2,   KC_F3,   KC_F12,
-    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  QWERTY, KC_PSCR, KC_SCRL, KC_PAUS
-  ),
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  // The value to return
-  bool return_value = false;
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      break;
-
-    case LOWER:
-      // Toggle LOWER layer on when key pressed and off when released
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-      } else {
-        layer_off(_LOWER);
-      }
-      break;
-
-    case RAISE:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_RAISE);
-      }
-      break;
-
-    default:
-
-      // If the keycode is not handled by any of the other cases, the
-      // function should return true
-      return_value = true;
-      break;
-  }
-
-  return return_value;
-}
diff --git a/keyboards/atreus/keymaps/jeremy/keymap.c b/keyboards/atreus/keymaps/jeremy/keymap.c
deleted file mode 100644
index 7ca35b3d9ab..00000000000
--- a/keyboards/atreus/keymaps/jeremy/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-// This is the personal keymap of Jeremy Cowgar (@jcowgar). It is written for the programmer.
-
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "keymap_colemak.h"
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-#define ALPH 0
-#define NUMS 1
-#define CURS 2
-#define SYMB 3
-#define FKEY 4
-
-// Some handy macros to keep the keymaps clean and easier to maintain
-#define KM_SAVE LGUI(CM_S)
-#define KM_CLSE LGUI(CM_W)
-#define KM_OPEN LGUI(CM_O)
-
-#define KM_COPY LGUI(KC_C)
-#define KM_CUT  LGUI(KC_X)
-#define KM_PAST LGUI(KC_V)
-#define KM_UNDO LGUI(KC_Z)
-#define KM_REDO LGUI(LSFT(KC_Z))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [ALPH] = LAYOUT(
-    KC_Q,    KC_W,           KC_E,           KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,           KC_O,           KC_P,
-    KC_A,    LT(NUMS, KC_S), LT(FKEY, KC_D), KC_F,    KC_G,                      KC_H,    KC_J,    LT(CURS, KC_K), LT(SYMB, KC_L), KC_SCLN,
-    KC_Z,    KC_X,           KC_C,           KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM,        KC_DOT,         KC_SLSH,
-    KC_LCTL, KC_ESC,         KC_NO,          KC_LSFT, KC_SPC,  KC_LALT, KC_LGUI, KC_ENT,  KC_RSFT, KC_NO,          KC_ESC,         KC_RCTL
-  ),
-  [NUMS] = LAYOUT(
-    KC_TRNS, KC_TRNS,        KC_TRNS,        KC_ASTR, KC_SLSH,                   KC_TRNS, KC_7,    KC_8,           KC_9,           KC_SLSH,
-    KC_TRNS, KC_TRNS,        KC_EQL,         KC_PLUS, KC_MINS,                   KC_LPRN, KC_4,    KC_5,           KC_6,           KC_ASTR,
-    KC_TRNS, KC_TRNS,        KC_DOT,         KC_COMM, CM_SCLN,                   KC_RPRN, KC_1,    KC_2,           KC_3,           KC_MINS,
-    KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0,    KC_DOT,         KC_EQL,         KC_PLUS
-  ),
-  [CURS] = LAYOUT(
-    KC_TRNS, KC_BSPC,        KC_UP,          KC_DEL,  KC_PGUP,                   KC_TRNS, KM_SAVE, KC_TRNS,        KM_OPEN,        KC_TRNS,
-    KC_TRNS, KC_LEFT,        KC_DOWN,        KC_RGHT, KC_PGDN,                   KM_UNDO, KC_LALT, KC_TRNS,        KC_LGUI,        KC_TRNS,
-    KC_TRNS, KC_VOLD,        KC_MUTE,        KC_VOLU, KC_MPLY,                   KM_REDO, KM_CLSE, KC_TRNS,        KC_TRNS,        KC_TRNS,
-    KC_TRNS, KC_TRNS,        QK_BOOT,        KC_TRNS, KC_TAB,  KM_COPY, KM_CUT,  KM_PAST, KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS
-  ),
-  [SYMB] = LAYOUT(
-    KC_BSLS, KC_EXLM,        KC_LABK,        KC_RABK, CM_COLN,                   KC_UNDS, KC_DLR,  KC_QUES,       KC_TRNS,         KC_PERC,
-    KC_AT,   KC_AMPR,        KC_LPRN,        KC_RPRN, CM_SCLN,                   KC_COMM, KC_DOT,  KC_QUOT,       KC_TRNS,         KC_TILD,
-    KC_HASH, KC_PIPE,        KC_LCBR,        KC_RCBR, KC_SLSH,                   KC_TRNS, KC_GRV,  KC_DQT,        KC_TRNS,         KC_CIRC,
-    KC_TRNS, KC_TRNS,        KC_LBRC,        KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,         KC_TRNS
-  ),
-  [FKEY] = LAYOUT(
-    KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS, KC_TRNS,                   KC_TRNS, KC_F9,   KC_F10,        KC_F11,          KC_F12,
-    KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS, KC_TRNS,                   KC_TRNS, KC_F5,   KC_F6,         KC_F7,           KC_F8,
-    KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS, KC_TRNS,                   KC_TRNS, KC_F1,   KC_F2,         KC_F3,           KC_F4,
-    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/atreus/keymaps/jeremy/readme.md b/keyboards/atreus/keymaps/jeremy/readme.md
deleted file mode 100644
index df0179a8e00..00000000000
--- a/keyboards/atreus/keymaps/jeremy/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-Jeremy's Atreus Key Mapping
-===========================
-
-I am a programmer by trade that suffers from the beginning stages of RSI. As a programmer I use letters, symbols and cursor navigation most often. To prevent strange finger gymnastics, I wrote a script to rank which non-letter characters occurred in my primary source projects most often and then placed these characters in the easiest to reach locations, for me. I made heavy use of momentary layer toggling.
-
-My layout is also geared toward a software based Colemak mapping. I would like it to be hardware, but I use my Laptop on the go frequently and thus my laptop keyboard. I have moved the keycaps to reflect the Colemak layout. My laptop is a MacBook Pro (2015).
-
-## Main Layers
-
-1. [Letters](http://www.keyboard-layout-editor.com/#/gists/6861cb9df09ce78efaddf8aa7471e3ac)
-2. [Symbols](http://www.keyboard-layout-editor.com/#/gists/8956a18b508a78e93b9c38ec3fcccaa5)
-3. [Navigation](http://www.keyboard-layout-editor.com/#/gists/6ed492b714a7f54eb1c5de09b87fd8c4)
-4. [Numbers](http://www.keyboard-layout-editor.com/#/gists/399ceb5624e8388e48a3a5eacac8e973)
-5. [Function Keys](http://www.keyboard-layout-editor.com/#/gists/7fd7dc24c7048316f3724b1893c64e89)
-
-## Notes
-
-### General
-
-Some characters can be accessed multiple ways. This was done because you may be in a given layer, such as numbers, where when doing math, you may need quick access to the parentheses characters for grouping. This prevents some layer switching.
-
-I own an ErgoDox and plan on porting this as a base layer, then using the extra keys the ErgoDox provides accordingly. My goal, though, is to be fully functional on this base setup and build everything into muscle memory.
-
-### Symbol Layer
-
-1. I placed characters that deal with an if statement close together, such as !, & and |.
-2. All matching brace/bracket characters are together as well.
-
-### Number Layer
-
-1. Everything I did was a compromise when trying to mimic a ten-key. I did the best I could.
-2. Operators are duplicated on the right and left. I do not find it comfortable to use my pinky much, so I tend to use my left hand for +, -, * and / but those were also placed on the right hand to mimic the ten-key.
-3. Parentheses were added for typing on the calculator.
-
-### Cursor Layer
-
-1. It includes basic audio controls because they didn't really fit anywhere else
-2. It contains basic file manipulation. I'm not sure that was a good idea. I do save all the time, but Cmd+S isn't exactly hard.
-3. It contains the backspace and delete keys right on top of the left and right arrows.
-4. Cmd and Opt keys are duplicated. This makes for very easy navigation, for example on a Mac, Opt+Left/Right moves word by word. It also backspaces or deletes word by word.
-
-### Function Layer
-
-1. Almost all other layers I saw grouped the F keys into a bunch of three. This only gives nine function keys in order if you attempt to stay as close to the home row as possible. I went with a group of four, which gives all twelve function keys to the right hand, one row below and above the home row.
-2. I duplicated the Command and Option keys the same as on the cursor layer. This makes it dead easy to hit modified function keys such as Cmd+Opt+F5. It's also easy to toss in a Shift modifier in there with the right thumb since the bottom row is preserved.
diff --git a/keyboards/atreus/keymaps/kejadlen/README.md b/keyboards/atreus/keymaps/kejadlen/README.md
deleted file mode 100644
index f3b8be3ee0a..00000000000
--- a/keyboards/atreus/keymaps/kejadlen/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-```shell
-make atreus/teensy2:kejadlen
-make atreus/teensy2:kejadlen:flash
-```
diff --git a/keyboards/atreus/keymaps/kejadlen/config.h b/keyboards/atreus/keymaps/kejadlen/config.h
deleted file mode 100644
index a75070e199a..00000000000
--- a/keyboards/atreus/keymaps/kejadlen/config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, F7, B0, B1, B2, B3, B7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define QUICK_TAP_TERM 0
-
-#define USB_MAX_POWER_CONSUMPTION 50
diff --git a/keyboards/atreus/keymaps/kejadlen/keymap.c b/keyboards/atreus/keymaps/kejadlen/keymap.c
deleted file mode 100644
index 45de7824c20..00000000000
--- a/keyboards/atreus/keymaps/kejadlen/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define BASE 0
-#define SYMB 1
-#define ETC 2
-
-enum macro_id {
-    TEENSY,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT(
-    KC_Q,          KC_W,    KC_D,     KC_F,           KC_K,                                              KC_J,             KC_U,            KC_R,            KC_L,     KC_SCLN,
-    LT(ETC,KC_A),  KC_S,    KC_E,     KC_T,           KC_G,                                              KC_Y,             KC_N,            KC_I,            KC_O,     KC_H,
-    SFT_T(KC_Z),   KC_X,    KC_C,     KC_V,           KC_B,                                              KC_P,             KC_M,            KC_COMM,         KC_DOT,   SFT_T(KC_SLSH),
-    KC_GRV,        KC_DEL,  KC_LALT,  GUI_T(KC_TAB),  LT(SYMB,KC_BSPC),  CTL_T(KC_ESC),  SFT_T(KC_ENT),  LT(SYMB,KC_SPC),  GUI_T(KC_LEFT),  ALT_T(KC_DOWN),  KC_UP,    LCAG_T(KC_RGHT)
-  ),
-
-  [SYMB] = LAYOUT(
-    KC_EXLM,  KC_AT,    KC_LCBR,  KC_RCBR,  KC_PIPE,                      KC_EQL,   KC_7,  KC_8,   KC_9,    KC_PLUS,
-    KC_HASH,  KC_DLR,   KC_LPRN,  KC_RPRN,  KC_BSLS,                      KC_MINS,  KC_4,  KC_5,   KC_6,    KC_QUOT,
-    KC_PERC,  KC_CIRC,  KC_LBRC,  KC_RBRC,  KC_ASTR,                      KC_UNDS,  KC_1,  KC_2,   KC_3,    KC_DQUO,
-    KC_TILD,  KC_AMPR,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_0,  KC_NO,  KC_DOT,  KC_TRNS
-  ),
-
-  [ETC] = LAYOUT(
-    QK_BOOT,       KC_NO,  KC_NO,    KC_NO,    KC_PGUP,                      KC_VOLU,  KC_F7,  KC_F8,  KC_F9,   KC_HOME,
-    LT(ETC,KC_A),  KC_NO,  KC_NO,    KC_NO,    KC_PGDN,                      KC_VOLD,  KC_F4,  KC_F5,  KC_F6,   KC_END,
-    KC_NO,         KC_NO,  KC_NO,    KC_NO,    KC_DEL,                       KC_MUTE,  KC_F1,  KC_F2,  KC_F3,   KC_INS,
-    KC_TRNS,       KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_NO,  KC_NO,  KC_NO,   KC_NO
-  ),
-};
diff --git a/keyboards/atreus/keymaps/khitsule/config.h b/keyboards/atreus/keymaps/khitsule/config.h
deleted file mode 100644
index 7fa3bf328ec..00000000000
--- a/keyboards/atreus/keymaps/khitsule/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#endif
diff --git a/keyboards/atreus/keymaps/khitsule/keymap.c b/keyboards/atreus/keymaps/khitsule/keymap.c
deleted file mode 100644
index 79f4da0b81e..00000000000
--- a/keyboards/atreus/keymaps/khitsule/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-// Personal keymap of khitsule
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    ALPH,
-    GAME,
-    LOWR,
-    RAIS,
-    ADJS
-};
-
-// define any macros here to keep keymap clean and readable
-
-#define KM_DLEFT LGUI(LCTL(KC_LEFT))
-#define KM_DRIGHT LGUI(LCTL(KC_RIGHT))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [ALPH] = LAYOUT(
-    KC_Q,    KC_W,     KC_E,     KC_R,           KC_T,                                               KC_Y,              KC_U,     KC_I,     KC_O,     KC_P,
-    KC_A,    KC_S,     KC_D,     KC_F,           KC_G,                                               KC_H,              KC_J,     KC_K,     KC_L,     KC_SCLN,
-    KC_Z,    KC_X,     KC_C,     KC_V,           KC_B,                                               KC_N,              KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,
-    KC_ESC,  KC_TRNS,  KC_TRNS,  ALT_T(KC_ENT),  LT(LOWR, KC_TAB),  CTL_T(KC_SPC),  SFT_T(KC_BSPC),  LT(RAIS, KC_DEL),  KC_LGUI,  TO(GAME),  KC_QUOT,  KC_MINUS
-  ),
-  [GAME] = LAYOUT(
-    KC_Q,    KC_W,     KC_E,     KC_R,      KC_T,                        KC_Y,    KC_U,     KC_I,     KC_O,     KC_P,
-    KC_A,    KC_S,     KC_D,     KC_F,      KC_G,                           KC_H,    KC_J,     KC_K,     KC_L,     KC_SCLN,
-    KC_Z,    KC_X,     KC_C,     KC_V,      KC_B,                                  KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,
-    KC_ESC,  KC_TRNS,  KC_ENT,   KC_LALT,   KC_TAB,  KC_LCTL,  KC_LSFT,  KC_DEL,  KC_LGUI,  TO(ALPH),  KC_QUOT,  KC_MINUS
-  ),
-  [LOWR] = LAYOUT(
-    KC_PSCR,   KC_HOME,    KC_UP,         KC_END,   KC_TRNS,                      KC_LPRN,        KC_F7,    KC_F8,    KC_F9,    KC_RPRN,
-    KC_VOLU,   KC_LEFT,    KC_DOWN,       KC_RIGHT, KC_PGUP,                      KC_LBRC,        KC_F4,    KC_F5,    KC_F6,    KC_RBRC,
-    KC_VOLD,   KC_MPRV,    KC_MPLY,       KC_MNXT,  KC_PGDN,                      LSFT(KC_LBRC),  KC_F1,    KC_F2,    KC_F3,    LSFT(KC_RBRC),
-    KM_DLEFT,  KM_DRIGHT,  LALT(KC_TAB),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  MO(ADJS),        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
-  ),
-  [RAIS] = LAYOUT(
-    KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,     KC_PERC,                        KC_TRNS,   KC_7,     KC_8,  KC_9,    KC_TRNS,
-    KC_CIRC,  KC_AMPR,  KC_GRV,   KC_TILD,    KC_PIPE,                        KC_PLUS,   KC_4,     KC_5,  KC_6,    KC_ASTR,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_BSLS,                        KC_MINUS,  KC_1,     KC_2,  KC_3,    KC_SLASH,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  MO(ADJS),  KC_TRNS,  KC_TRNS,     KC_TRNS,   KC_TRNS,  KC_0,  KC_DOT,  KC_EQL
-  ),
-  [ADJS] = LAYOUT(
-    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                        KC_F6,    KC_F7,     KC_F8,     KC_F9,   KC_F10,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      TSKMGR,   KC_TRNS,   KC_TRNS,   KC_F11,  KC_F12,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,
-    QK_BOOT,  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/atreus/keymaps/khitsule/readme.md b/keyboards/atreus/keymaps/khitsule/readme.md
deleted file mode 100644
index bf984b52b3b..00000000000
--- a/keyboards/atreus/keymaps/khitsule/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Atreus Layout by Khitsule
-![Khitsule](https://i.imgur.com/wuki3aM.png)
-
-[KLE link](http://www.keyboard-layout-editor.com/#/gists/35ed66c55456699fd8f5d06750984a07)
-
-## Layers
-| Layer | Legend |
-| ----- | ------ |
-| Base  |  Top left (black) |
-| Lower | Top right (purple) |
-| Raise | Bottom right (pink) |
-
-## Features
-* Raise/lower layers focus first on one-handed use
-* Numpad on right hand with raise layer
-* Navigation on left hand with lower layer (ESDF)
-    * D refers to desktop left/right on Win 10 (win+ctrl+left/right)
-* Heavy use of hold/tap dual function keys
-    * Ctrl/Space
-    * Shift/Backspace
-    * Alt/Enter
-    * Lower/Tab
-    * Raise/Delete
\ No newline at end of file
diff --git a/keyboards/atreus/keymaps/nojjan/config.h b/keyboards/atreus/keymaps/nojjan/config.h
deleted file mode 100644
index bc5c25d416a..00000000000
--- a/keyboards/atreus/keymaps/nojjan/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-
-// Pin configuration for falbatech atreus
-#define MATRIX_ROW_PINS { D0, D1, D3, D2 }
-#define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
diff --git a/keyboards/atreus/keymaps/nojjan/keymap.c b/keyboards/atreus/keymaps/nojjan/keymap.c
deleted file mode 100644
index 189a5c8e05c..00000000000
--- a/keyboards/atreus/keymaps/nojjan/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#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.
-#define _QW 0
-#define _RS 1
-#define _LW 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QW] = LAYOUT( /* Qwerty */
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
-  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
-  KC_ESC, KC_TAB, KC_LGUI,  KC_LSFT, KC_BSPC,  KC_LCTL, KC_LALT, KC_SPC,  MO(_RS), KC_MINS, KC_QUOT, KC_ENT  ),
-/*
- *  !       @     up     {    }        ||     pgup    7     8     9    *
- *  #     left   down  right  $        ||     pgdn    4     5     6    +
- *  [       ]      (     )    &        ||       `     1     2     3    \
- * lower  insert super shift bksp ctrl || alt space   fn    .     0    =
- */
-[_RS] = LAYOUT( /* [> RAISE <] */
-  KC_EXLM, KC_AT,   KC_UP,   KC_LCBR, KC_RCBR,                   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR ,
-  KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR,                    KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS ,
-  KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_1,    KC_2,   KC_3, KC_BSLS ,
-  TG(_LW), KC_INS,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  KC_TRNS, KC_DOT, KC_0, KC_EQL  ),
-/*
- * insert home   up  end   pgup       ||      up     F7    F8    F9   F10
- *  del   left  down right pgdn       ||     down    F4    F5    F6   F11
- *       volup             reset      ||             F1    F2    F3   F12
- *       voldn  super shift bksp ctrl || alt space   L0  prtsc scroll pause
- */
-[_LW] = LAYOUT( /* [> LOWER <] */
-  KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
-  KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
-  KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-  KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
-};
diff --git a/keyboards/atreus/keymaps/ptillemans/keymap.c b/keyboards/atreus/keymaps/ptillemans/keymap.c
deleted file mode 100644
index 0c9655f5b14..00000000000
--- a/keyboards/atreus/keymaps/ptillemans/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#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.
-#define _QW 0
-#define _RS 1
-#define _LW 2
-
-#define MY_SHEN MT(MOD_LSFT, KC_ENT)
-#define MY_CTES MT(MOD_LCTL, KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
-    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
-    TT(_LW), KC_TAB, KC_LGUI,  KC_LSFT, KC_BSPC, MY_CTES, KC_LALT, KC_SPC,  TT(_RS), KC_MINS, KC_QUOT, MY_SHEN
-  ),
-
-  /*
-   *  !       @     up     {    }        ||     pgup    7     8     9    *
-   *  #     left   down  right  $        ||     pgdn    4     5     6    +
-   *  [       ]      (     )    &        ||       `     1     2     3    \
-   * lower  insert super shift bksp ctrl || alt space   fn    .     0    =
-   */
-  [_RS] = LAYOUT( /* [> RAISE <] */
-    KC_EXLM, KC_AT,   KC_UP,   KC_UNDS, KC_PLUS,                   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR ,
-    KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR,                    KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS ,
-    KC_RBRC, KC_LBRC, KC_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_1,    KC_2,   KC_3, KC_BSLS ,
-    TT(_LW), _______, _______, _______, _______, _______, _______, _______, TO(_QW), KC_DOT,   KC_0, KC_EQL
-  ),
-  /*
-   * insert home   up  end   pgup       ||      up     F7    F8    F9   F10
-   *  del   left  down right pgdn       ||     down    F4    F5    F6   F11
-   *       volup             reset      ||             F1    F2    F3   F12
-   *       voldn  super shift next ctrl || alt space   L0  prtsc scroll pause
-   */
-  [_LW] = LAYOUT( /* [> LOWER <] */
-    KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
-    KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
-    KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-    KC_NO,   KC_VOLD, _______, _______, KC_MNXT, _______, _______, _______, TO(_QW), KC_PSCR, KC_SCRL, KC_MPLY
-  )
-};
diff --git a/keyboards/atreus/keymaps/quartz64/keymap.c b/keyboards/atreus/keymaps/quartz64/keymap.c
deleted file mode 100644
index eb882bce319..00000000000
--- a/keyboards/atreus/keymaps/quartz64/keymap.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-Copyright 2022 DmNosachev
-
-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 {
-    _QW,
-    _RS,
-    _LW
-};
-
-#define MC1 COMP_FR_QUOTES
-#define MC2 COMP_NBSP_EM_DASH
-#define MC3 COMP_NBSP
-
-enum custom_keycodes {
-    COMP_FR_QUOTES = SAFE_RANGE, // Compose: french quotes
-    COMP_NBSP_EM_DASH,	         // Compose: nbsp followed by em dash
-    COMP_NBSP,		    	     // Compose: nbsp
-    PWD1,
-    PWD2,
-    PWD3,				      	 // KP password
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
-	,----------------------------------.              ,----------------------------------.
-	|Q/Alt |   W  |   E  |   R  |   T  |              |   Y  |   U  |   I  |   O  |   P  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|A/Ctrl|   S  |   D  |   F  |   G  |              |   H  |   J  |   K  |   L  |;/Ctrl|
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|Z/Shft|   X  |   C  |   V  |   B  |Bkspc ||Delete|   N  |   M  |   ,  |   .  |?/Shft|
-	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	|   ~  |  Tab |   -  |  GUI |Spc/LW|------'`------|Ent/RS|  |\  |   [  |   ]  |  "'  |
-	`----------------------------------'              `----------------------------------'
-*/
-    [_QW] = LAYOUT( /* QWERTY */
-    LALT_T(KC_Q),   KC_W,    KC_E,    KC_R,    KC_T,                             KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,
-    LCTL_T(KC_A),   KC_S,    KC_D,    KC_F,    KC_G,                             KC_H,            KC_J,    KC_K,    KC_L,    RCTL_T(KC_SCLN),
-    LSFT_T(KC_Z),   KC_X,    KC_C,    KC_V,    KC_B,                             KC_N,            KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),
-    KC_GRV,         KC_TAB,  KC_MINS, KC_LGUI, LT(_LW, KC_SPC), KC_BSPC, KC_DEL, LT(_RS, KC_ENT), KC_BSLS, KC_LBRC, KC_RBRC, KC_QUOT
-    ),
-  
-/*
-	,----------------------------------.              ,----------------------------------.
-	| PrnSc| pwd1 |  up  | pwd2 | PgUp |              | Home |  F7  |  F8  |  F9  |      |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| trns | left | down | right| PgDn |              |  End |  F4  |  F5  |  F6  | trns |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	| trns | MC2  |  MC3 |   (  |   )  |      ||      | AltGr|  F1  |  F2  |  F3  | trns |
-	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	| trns | C+S  |  Ins |  MC1 | trns |------'`------| trns |  F10 |  F11 |  F12 | trns |
-	`----------------------------------'              `----------------------------------'
-*/
-
-    [_RS] = LAYOUT( /* RAISE  */
-    KC_PSCR, PWD1,           KC_UP,   PWD2,    KC_PGUP,                   KC_HOME, KC_F7,   KC_F8,  KC_F9,  _______,
-    _______, KC_LEFT,        KC_DOWN, KC_RGHT, KC_PGDN,                   KC_END,  KC_F4,   KC_F5,  KC_F6,  _______,
-    _______, MC2,            MC3,     KC_LPRN, KC_RPRN,                   KC_RALT, KC_F1,   KC_F2,  KC_F3,  _______,
-    _______, LCTL(KC_LSFT),  _______, MC1,     _______, _______, _______, _______, KC_F10,  KC_F11, KC_F12, _______
-    ),
-
-/*
-	,----------------------------------.              ,----------------------------------.
-	|   !  |   @  |   #  |   $  |  %   |              |   /  |   7  |   8  |   9  |  .   |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| trns |   ^  |   &  |   *  | PWD3 |              |   *  |   4  |   5  |   6  | trns |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	| trns |r_tog | r_hue| r_sat| r_val|      ||      |   +  |   1  |   2  |   3  | trns |
-	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	| trns | Esc  |QK_BOOT |capslk| trns |------'`------| trns |   0  |   -  |  +=  | trns |
-	`----------------------------------'              `----------------------------------'
-*/
-
-    [_LW] = LAYOUT( /* LOWER */
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_PSLS, KC_7, KC_8,    KC_9,   KC_PDOT,
-    _______, KC_CIRC, KC_AMPR, KC_ASTR, PWD3,                      KC_PAST, KC_4, KC_5,    KC_6,   _______,
-    _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,                   KC_PPLS, KC_1, KC_2,    KC_3,   _______,
-    _______, KC_ESC , QK_BOOT, KC_CAPS, _______, _______, _______, _______, KC_0, KC_PMNS, KC_EQL, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case MC1: /* French quotes */
-        if (record->event.pressed) {
-            SEND_STRING(SS_TAP(X_RALT) SS_DELAY(100) "<<" SS_DELAY(100) SS_TAP(X_RALT) SS_DELAY(100) ">>" SS_TAP(X_LEFT));
-        }
-        break;
-	  
-	case MC2: /* NB-space + mdash + space */
-        if (record->event.pressed) {
-            SEND_STRING(SS_TAP(X_RALT) SS_DELAY(100) "  " SS_DELAY(100) SS_TAP(X_RALT) SS_DELAY(100) "--- ");
-        }
-        break;
-	  
-	case MC3: /* NB-space */
-        if (record->event.pressed) {
-            SEND_STRING(SS_TAP(X_RALT) SS_DELAY(100) "  ");
-        }
-        break;
-	  
-	case PWD1:
-        if (record->event.pressed) {
-            SEND_STRING("NakedLunch1991\n");
-        }
-        break;
-	  
-    case PWD2:
-        if (record->event.pressed) {
-            SEND_STRING("O94nx4sUWHc4akud\n");
-        }
-        break;
-	  
-	case PWD3:
-        if (record->event.pressed) {
-            SEND_STRING("Q123qQ123q\n");
-        }
-        break;
-    }
-    return true;
-};
\ No newline at end of file
diff --git a/keyboards/atreus/keymaps/xyverz/config.h b/keyboards/atreus/keymaps/xyverz/config.h
deleted file mode 100644
index 037c9f3180c..00000000000
--- a/keyboards/atreus/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#undef DEBOUNCE
-#define DEBOUNCE 6
diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c
deleted file mode 100644
index 3fea4028731..00000000000
--- a/keyboards/atreus/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-// This is the personal keymap of Ian Sterling (@xyverz). It is based on the keymap by
-// Chris Gerber (@gerbercj), with the addition of persistent layers like the Planck and
-// Preonic keyboards by Jack Humbert.
-
-#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 {
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  ADJUST
-};
-
-// Adding macros to make the keymaps below much easier to read.
-#define SFTSCLN SFT_T(KC_SCLN)
-#define SFTZED SFT_T(KC_Z)
-#define ALTENT ALT_T(KC_ENT)
-#define DELGUI GUI_T(KC_DEL)
-#define ESCTRL CTL_T(KC_ESC)
-#define TABALT ALT_T(KC_TAB)
-#define ADJUST MO(_ADJUST)
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define MACLOCK LGUI(LCTL(KC_Q))
-#define WINLOCK LGUI(KC_L)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Dvorak Layer
-	,----------------------------------.              ,----------------------------------.
-	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|SFT/ ;|   Q  |   J  |   K  |   X  |Delete||Enter |   B  |   M  |   W  |   V  |SFT/ Z|
-	|------+------+------+------+------| / GUI|| / ALT|------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp |------'`------|  Spc | RAISE|   -  |   /  |   \  |
-	`----------------------------------'              `----------------------------------' */
-  [_DVORAK] = LAYOUT(
-    KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L   ,
-    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S   ,
-    SFTSCLN, KC_Q,    KC_J,    KC_K,    KC_X,                      KC_B,    KC_M,    KC_W,    KC_V,    SFTZED ,
-    ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, DELGUI, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_SLSH, KC_BSLS
-  ),
-
-  /* LOWER Layer
-	,----------------------------------.              ,----------------------------------.
-	|   !  |   @  |   #  |   $  |   %  |              |   ^  |   &  |   *  |   (  |   )  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| CAPS |      |  UP  |      | Home |              | PgDn |      |   +  |   {  |   }  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|      | Left | Down | Right| End  |      ||      | PgUp | Mute | Vol- | Vol+ |      |
-	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	|   ~  |      |      |      | Del  |------'`------| Ins  |      |      |      |      |
-	`----------------------------------'              `----------------------------------'*/
-  [_LOWER] = LAYOUT(
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-    KC_CAPS, _______, KC_UP,   _______, KC_HOME,                   KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,                    KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-    KC_TILD, _______, _______, _______, KC_DEL,  _______, _______, KC_INS,  ADJUST,  _______, _______, _______
-  ),
-
-  /* RAISE Layer
-	,----------------------------------.              ,----------------------------------.
-	|   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| CAPS |      |  UP  |      | Home |              | PgDn |      |   =  |   [  |   ]  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|      | Left | Down | Right| End  |      ||      | PgUp | Prev | Play | Next |      |
-	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	|   `  |      |      |      | Del  |------'`------| Ins  |      |      |      |      |
-	`----------------------------------'              `----------------------------------'*/
-  [_RAISE] = LAYOUT(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0   ,
-    KC_CAPS, _______, KC_UP,   _______, KC_HOME,                   KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,                    KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, _______,
-    KC_GRV,  _______, _______, ADJUST,  KC_DEL,  _______, _______, KC_INS,  _______, _______, _______, _______
-  ),
-
-  /* ADJUST Layer
-	,----------------------------------.              ,----------------------------------.
-	|  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  | F10  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|  F11 |      |      |      |      |              |      | PrSc | ScLk | Paus | F12  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|      |      |      |      |      |      ||      |      |      |      |      |      |
-	|------+------+------+------+------|MACLCK||WINLCK|------+------+------+------+------|
-	|      |      |      |      |      |------'`------|      |      |      |      |QKBOOT|
-	`----------------------------------'              `----------------------------------'*/
-  [_ADJUST] = LAYOUT(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
-    KC_F11,  _______, _______, _______, _______,                   _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 ,
-    _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, MACLOCK, WINLOCK, _______, _______, _______, _______, QK_BOOT  
-  ),
-};
\ No newline at end of file
diff --git a/keyboards/atreus/keymaps/xyverz/readme.md b/keyboards/atreus/keymaps/xyverz/readme.md
deleted file mode 100644
index de9ae3f4847..00000000000
--- a/keyboards/atreus/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# Xyverz's Atreus Keymap
-
-## About this keymap:
-
-This is the second iteration of my Atreus keymap. The first one was as close to the planck as I could get at the
-time, but still very much like the original Atreus keymap. I've managed to get things working better now and have
-implemented (more like copied) the RAISE/LOWER/ADJUST layers. This is a work in progress, but I think I'm closer
-to a final go with this.
-
-I'm using MOD_TAP quite a bit in this keymap. On all layers, R4 pinky keys use mod-tap and are SHIFT when held
-and their normal keys when tapped. In addition, ESC and TAB are also set as Ctrl and ALT respectively when held,
-and Enter/ALT on the right thumb key for all alpha layers.
-
-I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
-
-Recently added: Documentation, Formatting, and another Dvorak layer that has Command on the left thumb, instead of
-Control.
-
-## Still to do:
-
- * Enjoy this revision; figure out new things later.
-
-### Layer 0: Dvorak layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|Shft ;|   Q  |   J  |   K  |   X  | CTRL ||Alt / |   B  |   M  |   W  |   V  |Shft Z|
-	|------+------+------+------+------|      ||Enter |------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp |------'`------|  Spc | RAISE|   -  |   /  |   \  |
-	`----------------------------------'              `----------------------------------'
-
-### Layer 1: QWERTY layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   Q  |   W  |   E  |   R  |   T  |              |   Y  |   U  |   I  |   O  |   P  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   S  |   D  |   F  |   G  |              |   H  |   J  |   K  |   L  |   ;  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|Shft Z|   X  |   C  |   V  |   B  | CTRL ||Alt / |   N  |   M  |   ,  |   .  |Shft /|
-	|------+------+------+------+------|      ||Enter |------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp |------'`------|  Spc | RAISE|   -  |   '  |   \  |
-	`----------------------------------'              `----------------------------------'
-	 
-### Layer 2: Colemak layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   Q  |   W  |   F  |   P  |   G  |              |   J  |   L  |   U  |   Y  |   L  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   R  |   S  |   T  |   D  |              |   H  |   N  |   E  |   I  |   S  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|Shft Z|   X  |   C  |   V  |   B  | CTRL ||Alt / |   K  |   M  |   ,  |   .  |Shft /|
-	|------+------+------+------+------|      ||Enter |------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp |------'`------|  Spc | RAISE|   -  |   '  |   \  |
-	`----------------------------------'              `----------------------------------'
-
-### Layer 3: Dvorak for Mac layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|SFT/ ;|   Q  |   J  |   K  |   X  | CMD  ||Alt / |   B  |   M  |   W  |   V  |SFT/ Z|
-	|------+------+------+------+------|      ||Enter |------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp |------'`------|  Spc | RAISE|   -  |   /  |   \  |
-	`----------------------------------'              `----------------------------------'
-
-### Layer 4: LOWER layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   !  |   @  |   #  |   $  |   %  |              |   ^  |   &  |   *  |   (  |   )  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| CAPS |      |  UP  |      | Home |              | PgDn |      |   +  |   {  |   }  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|      | Left | Down | Right| End  |      ||      | PgUp | Mute | Vol- | Vol+ |      |
-	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	|   ~  |      |      |      | Del  |------'`------| Ins  |      |      |      |MACLCK|
-	`----------------------------------'              `----------------------------------'
-
-
-### Layer 5: RAISE layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| CAPS |      |  UP  |      | Home |              | PgDn |      |   =  |   [  |   ]  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|      | Left | Down | Right| End  |      ||      | PgUp | Prev | Play | Next |      |
-	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	|   `  |      |      |      | Del  |------'`------| Ins  |      |      |      |MACLCK|
-	`----------------------------------'              `----------------------------------'
-
-### Layer 6: ADJUST layer
-
-	,----------------------------------.              ,----------------------------------.
-	|  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  | F10  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|  F11 |      |      |      |      |              |      | PScr | SLck | Paus | F12  |
-	|------+------+------+------+------|------.,------|------+------+------+------+------|
-	|      |QWERTY|COLEMK|DVORAK|DVORMC|      ||      |      |      |      |      |      |
-	|------+------+------+------+------|      ||      |------+------+------+------+------|
-	|      |      |      |      |      |------'`------|      |      |      |      | RESET|
-	`----------------------------------'              `----------------------------------'
-
diff --git a/keyboards/atreus/keymaps/yttyx/README.md b/keyboards/atreus/keymaps/yttyx/README.md
deleted file mode 100644
index ba8fa47faab..00000000000
--- a/keyboards/atreus/keymaps/yttyx/README.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# Overview
-
-This layout is based on Balance Twelve (mirror variant) by Sasha Viminitz. Please see [this page](https://mathematicalmulticore.wordpress.com/the-keyboard-layout-project/) 
-for more information. It's designed for left-handers who use their right hand for the mouse.
-
-## To build
-
-```
-sudo make atreus:yttyx
-```
-
-## To flash (example)
-
-```
-sudo avrdude -p atmega32u4 -c avr109 -U flash:w:atreus_yttyx.hex -P /dev/ttyACM0
-```
-
-## Layers
-
-### Base:
-
-    .--------.-------.-------.-------.--------.                           .-------.-------.-------.-------.------.
-    | P      | L     | C     | D     | W      |                           | U     | O     | Y     | K     | Q    |
-    |--------+-------+-------+-------+--------|                           |-------+-------+-------+-------+------|
-    | N      | R     | S     | T     | M      |                           | A     | E     | I     | H     | V    |
-    |--------+-------+-------+-------+--------|                           |-------+-------+-------+-------+------|
-    | Z Sft  | J Ctl | F Alt | G     | B      |                           | ,     | . Alt | ; Ctl | X Sft | Sup  |
-    '--------'-------'-------+-------+--------+-----.               .-----+-------+-------+-------'-------'------'
-                             | BS P1 | Spc P2 | P3  |               |     | Sft   |       |
-                             '-------'--------'-----'               '-----'-------'-------'
-
-### P1: Punctuation (1)
-
-
-    .--------.-------.-------.-------.-------.                              .------.-------.-------.-------.------.
-    | Esc    |       |       |       | RS    |                              | |    | /     | ^     | £     |  ~   |
-    |--------+-------+-------+-------+-------|                              |------+-------+-------+-------+------|
-    | Tab    |       |       |       |       |                              | &    | \     | `     | $     | Ent  |
-    |--------+-------+-------+-------+-------|                              |------+-------+-------+-------+------|
-    | Sft    | Ctl   | Alt   | Del   |       |                              | %    | Alt   | Ctl   | Sft   | Sup  |
-    '--------'-------'-------+-------+-------+-----.                  .-----+------+-------+-------'-------'------'
-                             | P1    |       |     |                  |     | Sft  |       |
-                             '-------'-------'-----'                  '-----'------'-------'
-
-### P2: Punctuation (2)
-
-    .-------.-------.-------.-------.-------.                               .-------.-------.-------.-------.------.
-    | Esc   |       | NC    | FV    |       |                               | (     | )     | "     | ?     |      |
-    |-------+-------+-------+-------+-------|                               |-------+-------+-------+-------+------|
-    | Tab   | Ctl-X | Ctl-C | Ctl-V | Ctl-Z |                               | {     | }     | '     | !     | Ent  |
-    |-------+-------+-------+-------+-------|                               |-------+-------+-------+-------+------|
-    | Sft   | Ctl   | Alt   | Del   | Ent   |                               | #     | Alt   | Ctl   | Sft   | Sup  |
-    '-------'-------'-------+-------+-------+-----.                   .-----+-------+-------+-------'-------'------'
-                            | BS    | P2    |     |                   |     | Sft   |       |
-                            '-------'-------'-----'                   '-----'-------'-------'
-
-### P3: Punctuation (3)
-
-    .-------.-------.-------.-------.-------.                             .------.-------.-------.-------.------.
-    | Esc   |       | Break | Pscr  | ScLk  |                             | <    | >     | +     | _     | =    |
-    |-------+-------+-------+-------+-------|                             |------+-------+-------+-------+------|
-    | Tab   |       |       | Caps  |       |                             | [    | ]     | *     | -     | Ent  |
-    |-------+-------+-------+-------+-------|                             |------+-------+-------+-------+------|
-    | Sft   | Ctl   | Alt   | Del   |       |                             | @    | Alt   | Ctl   | Sft   | Sup  |
-    '-------'-------'-------+-------+-------+-----.                 .-----+------+-------+-------'-------'------'
-                            | BS    |       | P3  |                 |     | Sft  |       |
-                            '-------'-------'-----'                 '-----'------'-------'
-
-### Numerals / Cursor control
-
-    .-------.-------.-------.------.-------.                              .------.-------.-------.------.------.
-    | 1     | 2     | 3     | 4    | 5     |                              | Home | Up    | End   | PgUp |      |
-    |-------+-------+-------+------+-------|                              |------+-------+-------+------+------|
-    | 6     | 7     | 8     | 9    | 0     |                              | Left | Down  | Right | PgDn |      |
-    |-------+-------+-------+------+-------|                              |------+-------+-------+------+------|
-    | Sft   | Ctl   | Alt   | Del  | .     |                              | Ins  | Alt   | Ctl   | Sft  | Sup  |
-    '-------'-------'-------+------+-------+-----.                  .-----+------+-------+-------'------'------'
-                            | BS   | BA    |     |                  |     | Sft  |       |
-                            '------'-------'-----'                  '-----'------'-------'
-
-### FV: Function keys / Cursor control (Vim)
-
-    .-------.------.-------.-----.-------.                                .------.-------.-----.-------.------.
-    | F1    | F2   | F3    | F4  | F5    |                                | 0    | K     | $   | Ctl-B |      |
-    |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
-    | F6    | F7   | F8    | F9  | F10   |                                | H    | J     | L   | Ctl-F |      |
-    |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
-    | Sft   | Ctl  | Alt   | F11 | F12   |                                |      | Alt   | Ctl | Sft   | Sup  |
-    '-------'------'-------+-----+-------+-----.                    .-----+------+-------+-----'-------'------'
-                           | BS  | BA    |     |                    |     | Sft  |       |
-                           '-----'-------'-----'                    '-----'------'-------'
-
-### RS: Reset
-
-    .-------.------.-------.-----.-------.                                .------.-------.-----.-------.------.
-    | RESET |      |       |     |       |                                |      |       |     |       |      |
-    |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
-    |       |      |       |     |       |                                |      |       |     |       |      |
-    |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
-    |       |      |       |     |       |                                |      |       |     |       |      |
-    '-------'------'-------+-----+-------+-----.                    .-----+------+-------+-----'-------'------'
-                           |     | BA    |     |                    |     |      |       |
-                           '-----'-------'-----'                    '-----'------'-------'
diff --git a/keyboards/atreus/keymaps/yttyx/config.h b/keyboards/atreus/keymaps/yttyx/config.h
deleted file mode 100644
index b9e113ec0bb..00000000000
--- a/keyboards/atreus/keymaps/yttyx/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/atreus/keymaps/yttyx/keymap.c b/keyboards/atreus/keymaps/yttyx/keymap.c
deleted file mode 100644
index ce19fc7da5a..00000000000
--- a/keyboards/atreus/keymaps/yttyx/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
- 
-#include QMK_KEYBOARD_H
-
-enum layers {
-  BA,           // Base (Balance Twelve mirror variant)
-  P1,           // Punctuation (1)
-  P2,           // Punctuation (2)
-  P3,           // Punctuation (2)
-  NC,           // Numerals / Cursor control
-  FV,           // Function keys / Cursor control (Vim)
-  RS            // Reset
-};
-
-// Abbreviations - base
-#define KX_P1_BSPC      LT(P1, KC_BSPC)
-#define KX_P2_SPC       LT(P2, KC_SPC)
-
-#define KX_SFT_Z        MT(MOD_LSFT, KC_Z)
-#define KX_CTL_J        MT(MOD_LCTL, KC_J)
-#define KX_ALT_F        MT(MOD_LALT, KC_F)
-
-#define KX_ALT_DOT      MT(MOD_LALT, KC_DOT)
-#define KX_CTL_SCLN     MT(MOD_LCTL, KC_SCLN)
-#define KX_SFT_X        MT(MOD_LSFT, KC_X)
-
-#define KX_AT           LSFT(KC_QUOT)
-#define KX_DQUOT        LSFT(KC_2)
-#define KX_PIPE         LSFT(KC_NUBS)
-#define KX_TILDA        LSFT(KC_NUHS)
-
- 
-const uint16_t PROGMEM keymaps[][ MATRIX_ROWS ][ MATRIX_COLS ] = {
-  /*
-    .--------.-------.-------.-------.--------.                           .-------.-------.-------.-------.------.
-    | P      | L     | C     | D     | W      |                           | U     | O     | Y     | K     | Q    |
-    |--------+-------+-------+-------+--------|                           |-------+-------+-------+-------+------|
-    | N      | R     | S     | T     | M      |                           | A     | E     | I     | H     | V    |
-    |--------+-------+-------+-------+--------|                           |-------+-------+-------+-------+------|
-    | Z Sft  | J Ctl | F Alt | G     | B      |                           | ,     | . Alt | ; Ctl | X Sft | Sup  |
-    '--------'-------'-------+-------+--------+-----.               .-----+-------+-------+-------'-------'------'
-                             | BS P1 | Spc P2 | P3  |               |     | Sft   |       |
-                             '-------'--------'-----'               '-----'-------'-------'
-  */                                                               
-  [BA] = LAYOUT(                                                   
-    KC_P,     KC_L,     KC_C,     KC_D,       KC_W,                          KC_U,    KC_O,       KC_Y,        KC_K,     KC_Q,
-    KC_N,     KC_R,     KC_S,     KC_T,       KC_M,                          KC_A,    KC_E,       KC_I,        KC_H,     KC_V,
-    KX_SFT_Z, KX_CTL_J, KX_ALT_F, KC_G,       KC_B,                          KC_COMM, KX_ALT_DOT, KX_CTL_SCLN, KX_SFT_X, KC_LGUI,
-    XXXXXXX,  XXXXXXX,  XXXXXXX,  KX_P1_BSPC, KX_P2_SPC, MO(P3),    XXXXXXX, KC_RSFT, XXXXXXX,    XXXXXXX,     XXXXXXX,  XXXXXXX
-  ),
-
-  /* P1: Punctuation (1)
-    .--------.-------.-------.-------.-------.                              .------.-------.-------.-------.------.
-    | Esc    |       |       |       | RS    |                              | |    | /     | ^     | �     |  ~   |
-    |--------+-------+-------+-------+-------|                              |------+-------+-------+-------+------|
-    | Tab    |       |       |       |       |                              | &    | \     | `     | $     | Ent  |
-    |--------+-------+-------+-------+-------|                              |------+-------+-------+-------+------|
-    | Sft    | Ctl   | Alt   | Del   |       |                              | %    | Alt   | Ctl   | Sft   | Sup  |
-    '--------'-------'-------+-------+-------+-----.                  .-----+------+-------+-------'-------'------'
-                             | P1    |       |     |                  |     | Sft  |       |
-                             '-------'-------'-----'                  '-----'------'-------'
-  */
-  [P1] = LAYOUT(
-    KC_ESC,  XXXXXXX,    XXXXXXX,    XXXXXXX,  TO(RS),                         KX_PIPE, KC_SLSH, KC_CIRC, KC_HASH, KX_TILDA,  
-    KC_TAB,  XXXXXXX,    XXXXXXX,    XXXXXXX,  XXXXXXX,                        KC_AMPR, KC_NUBS, KC_GRV,  KC_DLR,  KC_ENT,
-    KC_LSFT, KC_LCTL,    KC_LALT,    KC_DEL,   XXXXXXX,                        KC_PERC, KC_LALT, KC_LCTL, KC_LSFT, _______,
-    XXXXXXX, XXXXXXX,    XXXXXXX,    _______,  XXXXXXX, XXXXXXX,      XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* P2: Punctuation (2)
-    .-------.-------.-------.-------.-------.                               .-------.-------.-------.-------.------.
-    | Esc   |       | NC    | FV    |       |                               | (     | )     | "     | ?     |      |
-    |-------+-------+-------+-------+-------|                               |-------+-------+-------+-------+------|
-    | Tab   | Ctl-X | Ctl-C | Ctl-V | Ctl-Z |                               | {     | }     | '     | !     | Ent  |
-    |-------+-------+-------+-------+-------|                               |-------+-------+-------+-------+------|
-    | Sft   | Ctl   | Alt   | Del   | Ent   |                               | #     | Alt   | Ctl   | Sft   | Sup  |
-    '-------'-------'-------+-------+-------+-----.                   .-----+-------+-------+-------'-------'------'
-                            | BS    | P2    |     |                   |     | Sft   |       |
-                            '-------'-------'-----'                   '-----'-------'-------'
-  */
-  [P2] = LAYOUT(
-    KC_ESC,  XXXXXXX,    TO(NC),     TO(FV),     XXXXXXX,                      KC_LPRN, KC_RPRN, KX_DQUOT, KC_QUES, XXXXXXX,
-    KC_TAB,  LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_Z),                   KC_LCBR, KC_RCBR, KC_QUOT,  KC_EXLM, KC_ENT,
-    KC_LSFT, KC_LCTL,    KC_LALT,    KC_DEL,     KC_ENT,                       KC_NUHS, KC_LALT, KC_LCTL,  KC_LSFT, _______,
-    XXXXXXX, XXXXXXX,    XXXXXXX,    KC_BSPC,    _______,    XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX
-  ),
-
-  /* P3: Punctuation (3)
-    .-------.-------.-------.-------.-------.                             .------.-------.-------.-------.------.
-    | Esc   |       | Break | Pscr  | ScLk  |                             | <    | >     | +     | _     | =    |
-    |-------+-------+-------+-------+-------|                             |------+-------+-------+-------+------|
-    | Tab   |       |       | Caps  |       |                             | [    | ]     | *     | -     | Ent  |
-    |-------+-------+-------+-------+-------|                             |------+-------+-------+-------+------|
-    | Sft   | Ctl   | Alt   | Del   |       |                             | @    | Alt   | Ctl   | Sft   | Sup  |
-    '-------'-------'-------+-------+-------+-----.                 .-----+------+-------+-------'-------'------'
-                            | BS    |       | P3  |                 |     | Sft  |       |
-                            '-------'-------'-----'                 '-----'------'-------'
-  */
-  [P3] = LAYOUT(
-    KC_ESC,  XXXXXXX, KC_BRK,  KC_PSCR, KC_SCRL,                             KC_LABK, KC_RABK, KC_PLUS, KC_UNDS, KC_EQL,
-    KC_TAB,  XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX,                             KC_LBRC, KC_RBRC, KC_ASTR, KC_MINS, KC_ENT,
-    KC_LSFT, KC_LCTL, KC_LALT, KC_DEL,  XXXXXXX,                             KX_AT,   KC_LALT, KC_LCTL, KC_LSFT, _______,
-    XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC, XXXXXXX, _______,           XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* NC: Numerals / Cursor control
-    .-------.-------.-------.------.-------.                              .------.-------.-------.------.------.
-    | 1     | 2     | 3     | 4    | 5     |                              | Home | Up    | End   | PgUp |      |
-    |-------+-------+-------+------+-------|                              |------+-------+-------+------+------|
-    | 6     | 7     | 8     | 9    | 0     |                              | Left | Down  | Right | PgDn |      |
-    |-------+-------+-------+------+-------|                              |------+-------+-------+------+------|
-    | Sft   | Ctl   | Alt   | Del  | .     |                              | Ins  | Alt   | Ctl   | Sft  | Sup  |
-    '-------'-------'-------+------+-------+-----.                  .-----+------+-------+-------'------'------'
-                            | BS   | BA    |     |                  |     | Sft  |       |
-                            '------'-------'-----'                  '-----'------'-------'
-  */
-  [NC] = LAYOUT(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX,
-    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                                KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX,
-    KC_LSFT, KC_LCTL, KC_LALT, KC_DEL,  KC_DOT,                              KC_INS,  KC_LALT, KC_LCTL, KC_LSFT, _______,
-    XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC, TO(BA), XXXXXXX,            XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* FV: Function keys / Cursor control (Vim)
-    .-------.------.-------.-----.-------.                                .------.-------.-----.-------.------.
-    | F1    | F2   | F3    | F4  | F5    |                                | 0    | K     | $   | Ctl-B |      |
-    |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
-    | F6    | F7   | F8    | F9  | F10   |                                | H    | J     | L   | Ctl-F |      |
-    |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
-    | Sft   | Ctl  | Alt   | F11 | F12   |                                |      | Alt   | Ctl | Sft   | Sup  |
-    '-------'------'-------+-----+-------+-----.                    .-----+------+-------+-----'-------'------'
-                           | BS  | BA    |     |                    |     | Sft  |       |
-                           '-----'-------'-----'                    '-----'------'-------'
-  */
-  [FV] = LAYOUT(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                               KC_0,    KC_K,    KC_DLR,   LCTL(KC_B), XXXXXXX,
-    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,                              KC_H,    KC_J,    KC_L,     LCTL(KC_F), XXXXXXX,
-    KC_LSFT, KC_LCTL, KC_LALT, KC_F11,  KC_F12,                              XXXXXXX, KC_LALT, KC_LCTL,  KC_LSFT,    _______,
-    XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC, TO(BA), XXXXXXX,            XXXXXXX, _______, XXXXXXX, XXXXXXX,  XXXXXXX,    XXXXXXX
-  ),
-
- /* RS: Reset
-    .-------.------.-------.-----.-------.                                .------.-------.-----.-------.------.
-    | QK_BOOT |      |       |     |       |                                |      |       |     |       |      |
-    |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
-    |       |      |       |     |       |                                |      |       |     |       |      |
-    |-------+------+-------+-----+-------|                                |------+-------+-----+-------+------|
-    |       |      |       |     |       |                                |      |       |     |       |      |
-    '-------'------'-------+-----+-------+-----.                    .-----+------+-------+-----'-------'------'
-                           |     | BA    |     |                    |     |      |       |
-                           '-----'-------'-----'                    '-----'------'-------'
-  */
-  [RS] = LAYOUT(
-    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TO(BA),  XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  )
-};
-
diff --git a/keyboards/atreus62/info.json b/keyboards/atreus62/info.json
index a745eb5e272..d27f97ce974 100644
--- a/keyboards/atreus62/info.json
+++ b/keyboards/atreus62/info.json
@@ -4,7 +4,7 @@
   "url": "",
   "maintainer": "qmk",
   "usb": {
-    "vid": "0xFEED",
+    "vid": "0x5072",
     "pid": "0x6062",
     "device_version": "0.0.1"
   },
diff --git a/keyboards/atreus62/keymaps/194h/config.h b/keyboards/atreus62/keymaps/194h/config.h
deleted file mode 100644
index f5306a07f18..00000000000
--- a/keyboards/atreus62/keymaps/194h/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-#define ONESHOT_TIMEOUT 3000
-#define TAPPING_TERM 200
-#define FORCE_NKRO
-#define LEADER_TIMEOUT 1000
-#define TAPPING_TOGGLE 3
diff --git a/keyboards/atreus62/keymaps/194h/keymap.c b/keyboards/atreus62/keymaps/194h/keymap.c
deleted file mode 100644
index 557b43cd8c6..00000000000
--- a/keyboards/atreus62/keymaps/194h/keymap.c
+++ /dev/null
@@ -1,149 +0,0 @@
-#include QMK_KEYBOARD_H
-
-//The current Nordic and Norwegian layout files are a mess. I'll do it myself:
-//Norwegian
-#define  NO_AE    KC_QUOT     //  Æ
-#define  NO_AO    KC_LBRC     //  Å
-#define  NO_BSLS  KC_EQL      //  Backslash
-#define  NO_LT    KC_NUBS     //  <
-#define  NO_MINS  KC_SLSH     //  -
-#define  NO_OE    KC_SCLN     //  Ø
-#define  NO_PIPE  KC_GRV      //  |
-#define  NO_PLUS  KC_MINS     //  +
-#define  NO_QUOT  KC_NUHS     //  '
-#define  NO_UMLA  KC_RBRC     //  ¨
-//Norwegian - Modifier dependant definitions
-#define  NO_EXLM  LSFT(KC_1)        //  !
-#define  NO_DQT   LSFT(KC_2)        //  "
-#define  NO_AT    RALT(KC_2)        //  @
-#define  NO_HASH  LSFT(KC_3)        //  #
-#define  NO_EUR   LSFT(KC_4)        //  €
-#define  NO_DLR   RALT(KC_4)        //  $
-#define  NO_PERC  LSFT(KC_5)        //  %
-#define  NO_AND   LSFT(KC_6)        //  &
-#define  NO_SLSH  LSFT(KC_7)        //  /
-#define  NO_PO    LSFT(KC_8)        //  (
-#define  NO_PC    LSFT(KC_9)        //  )
-#define  NO_EQL   LSFT(KC_0)        //  =
-#define  NO_LCBR  RALT(KC_7)        //  {
-#define  NO_LBRC  RALT(KC_8)        //  [
-#define  NO_RBRC  RALT(KC_9)        //  ]
-#define  NO_RCBR  RALT(KC_0)        //  }
-#define  NO_COLN  LSFT(KC_DOT)      //  :
-#define  NO_SCLN  LSFT(KC_COMM)     //  ;
-#define  NO_MICR  RALT(KC_M)        //  µ
-#define  NO_EURO  RALT(KC_E)        //  €
-#define  NO_SECT  LSFT(KC_GRV)      //  §
-#define  NO_GERC  RALT(KC_COMM)     //  ¸
-#define  NO_QUAR  LSFT(RALT(KC_4))  //  ¼
-//Norwegian layout - dependant on previous definitions
-#define  NO_UNDS  LSFT(NO_MINS)  //  _
-#define  NO_QUES  LSFT(NO_PLUS)  //  ?
-#define  NO_ACUT  RALT(NO_BSLS)  //  Acute
-#define  NO_GRAV  LSFT(NO_BSLS)  //  `
-#define  NO_GT    LSFT(NO_LT)    //  >
-#define  NO_HALF  RALT(NO_LT)    //  ½
-#define  NO_HAT   LSFT(NO_UMLA)  //  ^
-#define  NO_ASTR  LSFT(NO_QUOT)  //  *
-#define  NO_TILD  RALT(NO_UMLA)  //  ~
-
-//One Shot Modifier
-#define OSM_LCTL OSM(MOD_LCTL)
-#define OSM_LALT OSM(MOD_LALT)
-#define OSM_LSFT OSM(MOD_LSFT)
-#define OSM_LGUI OSM(MOD_LGUI)
-#define OSM_RCTL OSM(MOD_RCTL)
-#define OSM_RALT OSM(MOD_RALT)
-#define OSM_RSFT OSM(MOD_RSFT)
-#define OSM_RGUI OSM(MOD_RGUI)
-
-//CTRL on hold, ESC on tap
-#define CTL_ESC CTL_T(KC_ESC)
-
-//Layers
-#define L1 0
-#define L2 1
-#define L3 2
-#define L4 3
-#define L5 4
-
-// Momentary switch to layer 
-#define MO_L2 MO(L2)
-#define MO_L4 MO(L4)
-#define MO_L5 MO(L5)
-// Momentary switch to layer - One Shot Layer
-#define OSL_L2 OSL(L2)
-#define OSL_L3 OSL(L3)
-#define OSL_L4 OSL(L4)
-
-//Tap Dance Declarations
-enum {
-  SCLN_OE = 0,
-  QUOT_AE,
-  DQT_AO
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for semicolon, twice for ø
-  [SCLN_OE] = ACTION_TAP_DANCE_DOUBLE(NO_SCLN, NO_OE),
-  //Tap once for single quote, twice for æ
-  [QUOT_AE] = ACTION_TAP_DANCE_DOUBLE(NO_QUOT, NO_AE),
-  //Tap once for double quote, twice for å
-  [DQT_AO] = ACTION_TAP_DANCE_DOUBLE(NO_DQT, NO_AO),
-// Other declarations would go here, separated by commas, if you have them
-};
-
-//Tap Dance keys
-#define TD_SCLN_OE TD(SCLN_OE)
-#define TD_QUOT_AE TD(QUOT_AE)
-#define TD_DQT_AO TD(DQT_AO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [L1] = LAYOUT(
-	KC_LGUI,       KC_1,         KC_2,         KC_3,         KC_4,         KC_5,                                     KC_6,         KC_7,         KC_8,         KC_9,         KC_0,         KC_RGUI,
-	KC_TAB,        KC_Q,         KC_W,         KC_E,         KC_R,         KC_T,                                     KC_Y,         KC_U,         KC_I,         KC_O,         KC_P,         TD_DQT_AO,
-	KC_BSPC,       KC_A,         KC_S,         KC_D,         KC_F,         KC_G,                                     KC_H,         KC_J,         KC_K,         KC_L,         TD_SCLN_OE,   TD_QUOT_AE,
-	OSM_LSFT,      KC_Z,         KC_X,         KC_C,         KC_V,         KC_B,                                     KC_N,         KC_M,         KC_COMM,      KC_DOT,       NO_MINS,      OSM_RSFT,
-	CTL_ESC,       MO_L5,        KC_TAB,       OSM_LALT,     MO_L4,        OSL_L3,       KC_SPC,       KC_ENT,       OSL_L3,       MO_L4,        OSM_LALT,     NO_EQL,       NO_PLUS,      KC_RCTL
-  ),
-  [L2] = LAYOUT(
-	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      _______,
-	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      NO_DQT,
-	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      NO_SCLN,      NO_QUOT,
-	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      _______,
-	_______,       _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______       
-  ),
-  [L3] = LAYOUT(
-	NO_LBRC,       XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      NO_RBRC,
-	NO_LCBR,       XXXXXXX,      XXXXXXX,      NO_AT,        XXXXXXX,      NO_TILD,                                  NO_QUES,      NO_EXLM,      NO_PIPE,      XXXXXXX,      XXXXXXX,      NO_RCBR,
-	_______,       NO_ASTR,      NO_BSLS,      NO_DLR,       NO_HASH,      XXXXXXX,                                  NO_HAT,       XXXXXXX,      NO_COLN,      NO_SLSH,      NO_SCLN,      NO_QUOT,
-	NO_PO,         KC_0,         NO_SECT,      NO_PERC,      XXXXXXX,      NO_GRAV,                                  NO_AND,       NO_UMLA,      NO_LT,        NO_GT,        NO_UNDS,      NO_PC,
-	XXXXXXX,       _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      _______,      _______,      XXXXXXX
-  ),
-  [L4] = LAYOUT(
-	KC_ESC,        KC_F1,        KC_F2,        KC_F3,        KC_F4,        KC_F5,                                    XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
-	XXXXXXX,       KC_F6,        KC_F7,        KC_F8,        KC_F9,        KC_F10,                                   KC_HOME,      KC_PGDN,      KC_PGUP,      KC_END,       XXXXXXX,      XXXXXXX,
-	_______,       KC_F11,       KC_F12,       KC_F13,       KC_F14,       KC_F15,                                   KC_LEFT,      KC_DOWN,      KC_UP,        KC_RIGHT,     XXXXXXX,      KC_DEL,
-	XXXXXXX,       KC_F16,       KC_F17,       KC_F18,       KC_F19,       KC_F20,                                   XXXXXXX,      KC_APP,       XXXXXXX,      XXXXXXX,      KC_VOLD,      XXXXXXX,
-	OSM_LCTL,      _______,      XXXXXXX,      _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      OSM_RALT,     KC_MUTE,      KC_VOLU,      OSM_RCTL
-  ),
-  [L5] = LAYOUT(
-	XXXXXXX,       TO(L1),       TO(L2),       TO(L3),       TO(L4),       XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
-	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      QK_BOOT,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
-	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
-	XXXXXXX,       XXXXXXX,      XXXXXXX,      KC_CAPS,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
-	XXXXXXX,       _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX
-  )
-};
-
-//TODO: Is there productivity gain in the use of unicode?
-//	- Won't work in xterm.
-//	Create a layer for macros and/or unicode?
-//	Are macros useful?
-//	- Found no gain in having sendstring for commands.
-//	- Find repeated tasks that cannot be done easily on the OS.
-//	- Most other keymaps have macros for game/fun stuff, hard to find "serious" onces.
-//	Screw Norwegian layout, switch to US with unicode æøå or US/English International?
-//	- Will be different from laptop keyboard, requiring a switch on the OS side when only using the laptop.
diff --git a/keyboards/atreus62/keymaps/194h/rules.mk b/keyboards/atreus62/keymaps/194h/rules.mk
deleted file mode 100644
index 2c97aee0934..00000000000
--- a/keyboards/atreus62/keymaps/194h/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-TAP_DANCE_ENABLE = yes
-NKRO_ENABLE = true
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-KEY_LOCK_ENABLE = no 
-LEADER_ENABLE = no
diff --git a/keyboards/atreus62/keymaps/mfluid/keymap.c b/keyboards/atreus62/keymaps/mfluid/keymap.c
deleted file mode 100644
index 40eeb8b8583..00000000000
--- a/keyboards/atreus62/keymaps/mfluid/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#include "action_layer.h"
-
-#define OOOOOOO KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-    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_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,                      KC_Y,   KC_U,  KC_I,    KC_O,   KC_P,    KC_BSLS,
-    KC_ESC,  KC_A,    KC_S,    KC_D,  KC_F,  KC_G,                      KC_H,   KC_J,  KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-    SC_LSPO, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,                      KC_N,   KC_M,  KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
-    KC_LCTL, KC_LGUI, KC_LALT, MO(3), MO(1), KC_BSPC, KC_RCTL, KC_ENT,  KC_SPC, MO(2), KC_DEL,  KC_EQL, KC_LBRC, KC_RBRC 
-  ),
-
-  [1] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,                   _______, KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______,
-    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,                   _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______,
-    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,                   _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, KC_PGUP,
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______,                   _______, KC_P0,   KC_PDOT, KC_PENT, KC_PPLS, KC_PGDN,
-    _______, _______, _______, _______, OOOOOOO, _______, _______, _______, _______, _______, _______, _______, _______, _______ 
-  ),
-
-  [2] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,                   _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______,
-    _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
-    _______, _______, KC_MPLY, KC_MRWD, KC_MFFD, _______,                   _______, KC_BTN1, KC_BTN2, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, OOOOOOO, _______, _______, _______, _______ 
-  ),
-
-  [3] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,  _______,  _______,
-    _______, _______, _______, _______, _______, _______,                   KC_COPY, KC_PGUP, _______, _______,  KC_PASTE, KC_DEL,
-    _______, _______, _______, KC_PGDN, _______, _______,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______,  _______,
-    _______, _______, KC_CUT,  _______, _______, _______,                   _______, _______, _______, _______,  _______,  _______,
-    _______, _______, _______, OOOOOOO, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______ 
-  )
-};
diff --git a/keyboards/atreus62/keymaps/mfluid/readme.md b/keyboards/atreus62/keymaps/mfluid/readme.md
deleted file mode 100644
index fa341b893c6..00000000000
--- a/keyboards/atreus62/keymaps/mfluid/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Mfluid Keymap for the Atreus62
-
-## Program
-
-`make atreus62:mfluid:avrdude`
-
-## Layers
-
-[0-default](https://i.imgur.com/dpBdPn8.png)
-
-[1-numpad](https://i.imgur.com/JMN8Fk9.png)
-
-[2-multimedia](https://i.imgur.com/ZCSzKsZ.png)
-
-[3-vim](https://i.imgur.com/J15xCqW.png)
-
diff --git a/keyboards/atreus62/keymaps/via/keymap.c b/keyboards/atreus62/keymaps/via/keymap.c
new file mode 100644
index 00000000000..408886f82c1
--- /dev/null
+++ b/keyboards/atreus62/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2024 Tommi Pääkkö (@Glenf)
+ *
+ * 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 {
+    _DEFAULT,
+    _NAV,
+    _RESET,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_DEFAULT] = LAYOUT( /* qwerty */
+    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_BSLS,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC ,
+    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_LBRC ,
+    KC_LCTL,  KC_LGUI, KC_LALT, KC_GRV,  MO(_NAV),KC_BSPC, KC_DEL,   KC_ENT,   KC_SPC,  KC_EQL,  KC_MINS, KC_QUOT, KC_ENT,  KC_RGUI
+  ),
+
+  [_NAV] = LAYOUT(
+    TO(_DEFAULT),  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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_F12,  KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS ,
+    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS ,
+    TO(_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
+  ),
+
+  [_RESET] = LAYOUT(
+    TO(_DEFAULT),  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  , 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  , 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  , KC_NO  , KC_NO  , KC_NO  , QK_BOOT
+  )
+
+};
diff --git a/keyboards/epoch80/keymaps/via/rules.mk b/keyboards/atreus62/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/epoch80/keymaps/via/rules.mk
rename to keyboards/atreus62/keymaps/via/rules.mk
diff --git a/keyboards/atreus62/keymaps/xyverz/keymap.c b/keyboards/atreus62/keymaps/xyverz/keymap.c
deleted file mode 100644
index 11c7c33d673..00000000000
--- a/keyboards/atreus62/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* This is the Atreus62 keyboard layout by Xyverz aka u/Zrevyx on r/mk
-   I've blatantly stolen what works for me from the Planck and Preonic
-   layouts and modified this file to fit me. Initial credet goes to
-   u/profet23 for the doing all the work and adding this keyboard to
-   QMK in the first place.
-
-   I've got Dvorak, Qwerty, and Colemak layouts at this time, with the
-   possibility of adding more in the future.
-
-   The bottom row is fairly Kinesis-ish since the Contour and Advantage
-   keyboards have been my daily drivers for the last 17 years. I hope
-   You can get some enjoyment out of this layout should you chose it!
-
-CHANGELOG:
-
- 0.1 - Initial commit. Based off of Profet's default keymap.
- 0.2 - Converted to a more Planck/Preonic keymap style file with
-       persistent layers enabled. Renamed layers to reflect OLKB maps.
-       Added a TODO list.
- 0.3 - Moved location of media & volume keys. Added Print Screen,
-       Scroll Lock and Pause keys. Added a WOW gaming layer that
-       changes the location of Ctrl & Alt to the thumb keys. Added
-       readme.
- 0.4 - After more useage, I realized that the ESC key was in the way
-       of my muscle memory (gee, thanks, Planck!) so I moved it to
-       the normal Caps Lock position, and moved Caps Lock to the same
-       position on the RAISE and LOWER layers. Added code to turn off
-       the Pro Micro LEDs after flashing.
- 0.5 - Converted keymap to LAYOUT standard.
- 0.6 - Swapped ESC and GRV in all layers.
- 0.7 - Brought code up to current standards.
- 0.8 - Added MACLOCK macro.
- 0.9 - Updated code to correspond to new setPinInput behaviour
- 0.10 - Re-ordered the layers (swapped Destiny & WoW layers in the
-       list). Removed duplicated keys from RAISE and LOWER layers.
-       Updated readme.md and fixed an aesthetic typo in keymap.c.
- 0.11 - Added DEL_GUI macro. Removed WOW layer since I'm no longer
-       supporting Blizzard in any way.
-
-TODO:
-
- * Make the layout more efficient, even if it means changing the RAISE
-   and LOWER functionality.
- * Add legends in comments for each layer. Maybe.
-
-*/
-
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-#include QMK_KEYBOARD_H
-
-enum layer_names { _DVORAK, _QWERTY, _COLEMAK, _DESTINY, _LOWER, _RAISE, _ADJUST };
-
-enum atreus62_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, DESTINY, LOWER, RAISE, ADJUST };
-
-// Aliases to make the keymap clearer.
-#define CTL_ENT CTL_T(KC_ENT)
-#define DEL_GUI GUI_T(KC_DEL)
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-#define MACLOCK LGUI(LCTL(KC_Q))
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_DVORAK] = LAYOUT ( /* dvorak */
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-    KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,                      KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, DEL_GUI, KC_ENT,  KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL
-  ),
-
-  [_QWERTY] = LAYOUT ( /* qwerty */
-    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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-    KC_GRV,  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_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, KC_LGUI, KC_ENT,  KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL
-  ),
-
-  [_COLEMAK] = LAYOUT ( /* colemak */
-    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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
-    KC_GRV,  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_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, KC_LGUI, KC_ENT,  KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL
-  ),
-
-  [_DESTINY] = LAYOUT ( /* Dvorak with minor modifications for playing Destiny 2 and other FPS Looters */
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-    KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,                      KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, KC_DEL,  KC_ENT,  KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL
-  ),
-
-  [_LOWER] = LAYOUT (
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-    _______, _______, KC_HOME, KC_END,  _______, KC_DEL,  MACLOCK, _______, KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______
-  ),
-  [_RAISE] = LAYOUT (
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-    _______, _______, KC_HOME, KC_END,  _______, KC_DEL,  MACLOCK, _______, KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______
-  ),
-  [_ADJUST] = LAYOUT (
-    _______, _______, _______, KC_F13,  KC_F14,  KC_F15,                    _______, _______, _______, _______, _______, _______,
-    _______, QK_BOOT, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,                   _______, QWERTY,  COLEMAK, DVORAK,  DESTINY, _______,
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-};
-//clang-format on
-
-void matrix_init_user(void) {
-#ifdef BOOTLOADER_CATERINA
-   // This will disable the red LEDs on the ProMicros
-   setPinInput(D5);
-   setPinInput(B0);
-#endif
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-   switch (keycode) {
-    case DVORAK:
-        set_single_persistent_default_layer(_DVORAK);
-      return false;
-    case QWERTY:
-        set_single_persistent_default_layer(_QWERTY);
-      return false;
-    case COLEMAK:
-        set_single_persistent_default_layer(_COLEMAK);
-      return false;
-    case DESTINY:
-        set_single_persistent_default_layer(_DESTINY);
-      return false;
-    case WOW:
-        set_single_persistent_default_layer(_WOW);
-      return false;
-   }
-  }
-  return true;
-};
diff --git a/keyboards/atreus62/keymaps/xyverz/readme.md b/keyboards/atreus62/keymaps/xyverz/readme.md
deleted file mode 100644
index 5a3949727c4..00000000000
--- a/keyboards/atreus62/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# Xyverz's Atreus62 Keymap
-
-## About this keymap:
-
-This is the Atreus62 keyboard layout by Xyverz aka u/Zrevyx on r/mk. I've blatantly stolen what works for me from the Planck and Preonic layouts and modified this file to fit me. Initial credet goes to u/profet23 for the doing all the work and adding this keyboard to QMK in the first place.
-
-I've got Dvorak, Qwerty, and Colemak layouts at this time, with the possibility of adding more in the future.
-
-The bottom row is fairly Kinesis-ish since the Contour and Advantage keyboards have been my daily drivers for the last 17 years. I hope You can get some enjoyment out of this layout should you chose it!
-
-### CHANGELOG:
-
-#### 0.1
- *  Initial commit. Based off of Profet's default keymap.
-#### 0.2
- * Converted to a more Planck/Preonic keymap style file with persistent layers enabled. Renamed layers to reflect OLKB maps.
- * Added a TODO list.
-#### 0.3
- * Moved location of media & volume keys. Added Print Screen, Scroll Lock and Pause keys.
- * Added a WOW gaming layer that changes the location of Ctrl & Alt to the thumb keys. Right thumb is Ctrl when held, Enter when tapped.
- * Added readme.
-#### 0.4
- * Moved location of Escape key to Caps Lock position. Moved Caps Lock to same position on Raise/Lower Layers.
- * Put Tilde/Grave in the upper-left corner
- * Added code to turn off the red LEDs on the Pro Micro after flashing. They were annoying me.
-### 0.5
- * Converted keymap to LAYOUT standard.
-### 0.6
- * Swapped ESC and GRV in all layers.
-### 0.7
- * Brought code up to new standards (as of 27 June 2019).
- * Updated this readme file.
-### 0.8
- * Added MACLOCK macro.
-### 0.9
- * Updated code to correspond to new setPinInput behaviour.
-### 0.10
- * Re-ordered the layers (swapped Destiny & WoW layers in the list).
- * Removed duplicated keys from RAISE and LOWER layers.
- * Updated readme.md and fixed an aesthetic typo in keymap.c.
-### 0.11
- * Added DEL_GUI macro.
- * Removed WOW layer since I'm no longer supporting Blizzard in any way.
-
-### TODO:
-
- * Enjoy this revision; figure out new things later.
-
-### Layer 0: Dvorak layer
-
-	,-----------------------------------------.              ,-----------------------------------------.
-	| Esc  |   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |   \  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Tab  |   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |   /  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Grv  |   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |   -  |
-	|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
-	| Shft |   ;  |   Q  |   J  |   K  |   X  | Del/ ||Enter |   B  |   M  |   W  |   V  |   Z  | Shft |
-	|------+------+------+------+------+------| Gui  ||      |------+------+------+------+------+------|
-	| Ctrl |  Alt | Left | Rght | LOWER| BkSp |------'`------|  Spc | RAISE|  Up  | Down |  Gui | Ctrl |
-	`-----------------------------------------'              `-----------------------------------------'
-
-### Layer 1: QWERTY layer
-
-	,-----------------------------------------.              ,-----------------------------------------.
-	| Esc  |   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |   -  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Tab  |   Q  |   W  |   E  |   R  |   T  |              |   Y  |   U  |   I  |   O  |   P  | Del  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Grv  |   A  |   S  |   D  |   F  |   G  |              |   D  |   H  |   T  |   N  |   S  |   '  |
-	|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
-	| Shft |   Z  |   X  |   C  |   V  |   B  | Gui  ||Enter |   N  |   M  |   ,  |   .  |   /  | Shft |
-	|------+------+------+------+------+------|      ||      |------+------+------+------+------+------|
-	| Ctrl |  Alt | Left | Rght | LOWER| BkSp |------'`------|  Spc | RAISE|  Up  | Down |  Gui | Ctrl |
-	`-----------------------------------------'              `-----------------------------------------'
-	 
-### Layer 2: Colemak layer
-
-	,-----------------------------------------.              ,-----------------------------------------.
-	| Esc  |   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |   -  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Tab  |   Q  |   W  |   F  |   P  |   G  |              |   J  |   U  |   U  |   Y  |   ;  | Del  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Grv  |   A  |   R  |   S  |   T  |   D  |              |   H  |   N  |   E  |   I  |   O  |   '  |
-	|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
-	| Shft |   Z  |   X  |   C  |   V  |   B  | Gui  ||Enter |   K  |   M  |   ,  |   .  |   /  | Shft |
-	|------+------+------+------+------+------|      ||      |------+------+------+------+------+------|
-	| Ctrl |  Alt | Left | Rght | LOWER| BkSp |------'`------|  Spc | RAISE|  Up  | Down |  Gui | Ctrl |
-	`-----------------------------------------'              `-----------------------------------------'
-
-### Layer 3: Destiny layer
-
-	,-----------------------------------------.              ,-----------------------------------------.
-	| Esc  |   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |   \  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Tab  |   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |   /  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Grv  |   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |   -  |
-	|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
-	| Shft |   ;  |   Q  |   J  |   K  |   X  | Del  ||Enter |   B  |   M  |   W  |   V  |   Z  | Shft |
-	|------+------+------+------+------+------|      ||      |------+------+------+------+------+------|
-	| Ctrl |  Alt | Left | Rght | LOWER| BkSp |------'`------|  Spc | RAISE|  Up  | Down |  Gui | Ctrl |
-	`-----------------------------------------'              `-----------------------------------------'
-
-### Layer 4: LOWER layer
-
-	,-----------------------------------------.              ,-----------------------------------------.
-	| F11  |  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  | F10  | F12  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	|      |      |      |      |      |      |              |      |      |      |      |      |      |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Caps |      | Mute | Vol- | Vol+ |      |              |      |      |   +  |   {  |   }  |      |
-	|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
-	|      |      | Prev | Play | Next |      |      ||      |      |      | PScr | ScLk | Pause|      |
-	|------+------+------+------+------+------|      ||      |------+------+------+------+------+------|
-	|      |      | Home | End  |      | Del  |------'`------|  Ins |      | PgUp | PgDn |      |      |
-	`-----------------------------------------'              `-----------------------------------------'
-
-
-### Layer 5: RAISE layer
-
-	,-----------------------------------------.              ,-----------------------------------------.
-	| F11  |  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  | F10  | F12  |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	|      |      |      |      |      |      |              |      |      |      |      |      |      |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	| Caps |      | Mute | Vol- | Vol+ |      |              |      |      |   =  |   [  |   ]  |      |
-	|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
-	|      |      | Prev | Play | Next |      |      ||      |      |      | PScr | ScLk | Pause|      |
-	|------+------+------+------+------+------|      ||      |------+------+------+------+------+------|
-	|      |      | Home | End  |      | Del  |------'`------|  Ins |      | PgUp | PgDn |      |      |
-	`-----------------------------------------'              `-----------------------------------------'
-
-### Layer 6: ADJUST layer
-
-	,-----------------------------------------.              ,-----------------------------------------.
-	|      |      |      |      |      |      |              |      |      |      |      |      |      |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	|      |RESET |      |      |      |      |              |      |      |      |      |      |      |
-	|------+------+------+------+------+------|              |------+------+------+------+------+------|
-	|      |      |      |      |      |      |              |      |Qwerty|Colemk|Dvorak|Destny|      |
-	|------+------+------+------+------+------|------.,------|------+------+------+------+------+------|
-	|      |      |      |      |      |      |      ||      |      |      |      |      |      |      |
-	|------+------+------+------+------+------|      ||      |------+------+------+------+------+------|
-	|      |      |      |      |      |      |------'`------|      |      |      |      |      |      |
-	`-----------------------------------------'              `-----------------------------------------'
diff --git a/keyboards/avalanche/v4/keymaps/winder/config.h b/keyboards/avalanche/v4/keymaps/winder/config.h
deleted file mode 100644
index ca4b822f1b1..00000000000
--- a/keyboards/avalanche/v4/keymaps/winder/config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2022 Will Winder (@winder)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#undef RGBLIGHT_EFFECT_BREATHING
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_ALTERNATING
diff --git a/keyboards/avalanche/v4/keymaps/winder/images.h b/keyboards/avalanche/v4/keymaps/winder/images.h
deleted file mode 100644
index 2202e315748..00000000000
--- a/keyboards/avalanche/v4/keymaps/winder/images.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2022 Will Winder (@winder)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-static const char display [] PROGMEM = {
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0x7f, 0x3f, 0x9f, 0xcf, 0x8f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0xcf, 0xef, 
-0xe7, 0xcf, 0x8f, 0x1e, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf1, 0xe3, 0xf7, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0xbf, 0x9f, 0x1f, 0x3f, 
-0x7b, 0xf0, 0xfe, 0xff, 0xff, 0xfe, 0x7c, 0x78, 0x71, 0x03, 0x87, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x3f, 0xff, 0xf3, 0xe3, 0xd7, 0xef, 0xdf, 0x9c, 0x39, 0x73, 
-0xe7, 0xef, 0xcf, 0xcf, 0xce, 0xe0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xdf, 0x9f, 0xbf, 0x3f, 0x1f, 0xc8, 0xe1, 0xc7, 0x9f, 0x3f, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xe7, 0xc7, 0x9f, 0x3f, 0x7d, 0xf0, 0xe3, 0xc7, 0x8f, 0x9f, 0x3e, 
-0x3c, 0xb8, 0x81, 0xc3, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xbf, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xcf, 0xe7, 
-0xf3, 0xf9, 0x71, 0x03, 0x87, 0x8f, 0x1e, 0x3c, 0x79, 0xf3, 0xee, 0x9d, 0xfb, 0xf3, 0xf7, 0xfe, 
-0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xe7, 0xf3, 
-0xf9, 0xfc, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3f, 0x7e, 0xfe, 0xfc, 0xfd, 0xf9, 0xf8, 0xf8, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x9f, 0x3f, 0x7f, 
-0xff, 0xfe, 0xfe, 0xfc, 0xf0, 0xe6, 0xcd, 0x9d, 0x3b, 0x7a, 0xf0, 0xf1, 0xe1, 0xf3, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0x47, 0x1f, 
-0x3d, 0xf9, 0xf9, 0xf3, 0x83, 0x30, 0x78, 0x78, 0x71, 0x23, 0x87, 0xcf, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xe7, 0xef, 0xcf, 0x0e, 0x0c, 0xe1, 0xe3, 0xe7, 0xcf, 
-0x1f, 0x3e, 0x7e, 0xff, 0xef, 0xe7, 0xf3, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3f, 0x7f, 
-0x7f, 0x3f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xbf, 0x9f, 0xbf, 0x3f, 0x3b, 0x33, 0x87, 0x8f, 0x9f, 0x3f, 0x7f, 0xff, 0xfe, 
-0xfc, 0xb9, 0x83, 0xc7, 0xe7, 0xf3, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xbf, 0x9f, 0xcf, 0xc7, 0x33, 0x7f, 0xfe, 0xfc, 0xfc, 0xf9, 0xf8, 0xf6, 0xe7, 
-0xee, 0xc8, 0x83, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf9, 0xf9, 0xf9, 0xf9, 
-0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf8, 0xfc, 
-0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x07, 0x73, 
-0xfb, 0xfb, 0xf3, 0xe7, 0xcf, 0x9f, 0x3f, 0xf8, 0xf0, 0xe7, 0xe7, 0xe7, 0xe7, 0xf0, 0xf8, 0xfd, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x87, 0x33, 
-0x3b, 0x39, 0x3b, 0x9f, 0x9f, 0x9f, 0x3f, 0x7f, 0xfe, 0xfc, 0xd9, 0xc3, 0xe3, 0xf3, 0xf9, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xdf, 0xdf, 0xdf, 0xbf, 0x7f, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xe7, 0xf3, 0xf9, 0xf8, 0xf1, 0xe3, 0xc7, 0x8f, 0x1f, 0x3e, 
-0x7c, 0xf9, 0xf3, 0xf3, 0xf3, 0xf3, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf3, 0xf9, 0xfc, 0xbe, 0x9c, 0xc1, 0xe3, 0xe7, 0xcf, 
-0x1f, 0x3f, 0xff, 0xf3, 0xf3, 0xfb, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 
-0xff, 0xff, 0xe7, 0xdb, 0xbb, 0x7b, 0xf7, 0xee, 0xdc, 0xbd, 0xff, 0xf7, 0xf7, 0xf6, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 
-0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf9, 0xfc, 
-0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 
-0xf9, 0xf3, 0xa7, 0xcf, 0xef, 0xff, 0xfc, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
diff --git a/keyboards/avalanche/v4/keymaps/winder/keymap.c b/keyboards/avalanche/v4/keymaps/winder/keymap.c
deleted file mode 100644
index 75de2f11a86..00000000000
--- a/keyboards/avalanche/v4/keymaps/winder/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2022 Viatly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*
-qmk compile -kb avalanche/v4 -km default
-qmk flash -kb avalanche/v4 -km default
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layer {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-};
-
-#define FN_1 MO(_LOWER)
-#define FN_2 MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(
-                 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_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                                           KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
-        KC_ESC , 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_UNDS,
-                 KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_DEL , KC_LGUI, /**/  KC_INS , KC_BSPC, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
-                                            KC_LGUI, KC_LALT, KC_LGUI, FN_1   , KC_ENT , /**/  FN_2   , KC_SPC , KC_BSPC, KC_RALT, KC_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_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                           KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_DEL ,
-       _______ , KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                                           KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, _______,
-                 _______, KC_EQL , KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______, /**/  _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-                                            _______, _______, _______, _______, _______, /**/  _______, _______, _______, _______, _______
-    ),
-    [_RAISE] = LAYOUT(
-                 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                           KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX,
-                 _______, KC_0,    KC_1,    KC_2,    KC_3,    KC_BSPC,                                           KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        _______, _______, KC_0,    KC_4,    KC_5,    KC_6,    KC_DEL,                                            KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX,
-                 _______, KC_0,    KC_7,    KC_8,    KC_9,    KC_DOT,  _______, _______, /**/  _______, _______, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-                                            _______, _______, _______, _______, _______, /**/  _______, _______, _______, _______, _______
-    ),
-};
-
-#ifdef OLED_ENABLE
-
-#include "images.h"
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_0;
-}
-
-void shiftright(char* buf, int size, int num) {
-  for (int i = size-1; i > 0; i--) {
-    buf[i] >>= 1;
-    if (buf[i-1] & 0x01) {
-      buf[i] |= 0x80;
-    }
-  }
-  buf[0] >>= 1;
-}
-
-// right to left, 8 bit vertical strips.
-void mask(char* enable) {
-  char rowenable[3];
-  const char* data = display;
-  int i = 0;
-  char blockmask[2] = { 0x00, 0x00 };
-
-  while (i < sizeof(display)) {
-    if (i % 128 == 0) {
-      // shift enable-mask right 1 at each row, reinitialize row copy
-      if (i != 0) {
-        shiftright(enable, 3, 2);
-      }
-      rowenable[0] = enable[0];
-      rowenable[1] = enable[1];
-      rowenable[2] = enable[2];
-    }
-
-    if (i % 8 == 0) {
-      if (rowenable[2] & 0x01) {
-        blockmask[1] = 0xff;
-      } else {
-        blockmask[1] = 0x00;
-      }
-
-      if (rowenable[2] & 0x02) {
-        blockmask[0] = 0xff;
-      } else {
-        blockmask[0] = 0x00;
-      }
-      shiftright(rowenable, 3, 2);
-    }
-
-    uint8_t c = pgm_read_byte(data++);
-    oled_write_raw_byte(c & blockmask[1], i++);
-    shiftright(blockmask, 2, 1);
-  }
-}
-
-void setmask(char* mask) {
-  mask[0] = 0x00;
-  mask[1] = 0x00;
-  mask[2] = 0x00;
-
-  uint8_t mod = get_mods() | get_oneshot_mods();
-  if (mod & MOD_MASK_CTRL) {
-    mask[1] |= 0xf0;
-  }
-  if (mod & MOD_MASK_ALT) {
-    mask[1] |= 0x0f;
-  }
-  if (mod & MOD_MASK_GUI) {
-    mask[0] |= 0xf0;
-  }
-
-  switch (get_highest_layer(layer_state)) {
-    case _LOWER:
-      mask[2] |= 0xf0;
-      break;
-    case _RAISE:
-      mask[0] |= 0x0f;
-      break;
-  }
-}
-
-bool oled_task_user(void) {
-    char m[3];
-    setmask(m);
-    mask(m);
-    return false;
-}
-
-#endif
-
diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h
index 02077e05a7d..2c238e3854f 100644
--- a/keyboards/axolstudio/yeti/hotswap/config.h
+++ b/keyboards/axolstudio/yeti/hotswap/config.h
@@ -17,50 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Matrix */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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_SOLID_COLOR
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    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_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    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_PIXEL_FRACTAL
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// 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_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
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 16       // 16 is equivalent to limiting to 60fps
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
-#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 64
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
index 527bec17ee1..df64c809532 100644
--- a/keyboards/axolstudio/yeti/hotswap/hotswap.c
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
@@ -17,75 +17,75 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, B_1,  A_1,  C_1 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_15, A_15, C_15 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
 
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
 
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_14, G_14, I_14 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
 
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
 
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_16, J_16, L_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, B_16, A_16, C_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, K_15, J_15, L_15 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json
index 9b782c88c90..d89d6903603 100644
--- a/keyboards/axolstudio/yeti/hotswap/info.json
+++ b/keyboards/axolstudio/yeti/hotswap/info.json
@@ -9,7 +9,42 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "is31fl3733"
+    "animations": {
+      "breathing": true,
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "band_val": true,
+      "band_pinwheel_val": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "rainbow_moving_chevron": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "pixel_fractal": true,
+      "pixel_flow": true,
+      "pixel_rain": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_multinexus": true,
+      "multisplash": true,
+      "solid_multisplash": true
+    },
+    "driver": "is31fl3733",
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
diff --git a/keyboards/aya/keymaps/default/config.h b/keyboards/aya/keymaps/default/config.h
deleted file mode 100644
index 6e57fd64990..00000000000
--- a/keyboards/aya/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Dan Nixon
- *
- * 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
-
diff --git a/keyboards/b_sides/rev41lp/keymaps/cyril/config.h b/keyboards/b_sides/rev41lp/keymaps/cyril/config.h
deleted file mode 100644
index 7029bdddb73..00000000000
--- a/keyboards/b_sides/rev41lp/keymaps/cyril/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 @cyril279
-
-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_TERM 150
-#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c b/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
deleted file mode 100644
index 72eb2bb5c86..00000000000
--- a/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-Copyright 2021 @cyril279
-
-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,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-    _NAVIG,
-    _FUNCTION
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-#define SPC_NAV LT(_NAVIG,KC_SPC)
-#define FUNCT  MO(_FUNCTION)
-#define NAVIG  MO(_NAVIG)
-
-#define LGUI_A LGUI_T(KC_A)
-#define LALT_S LALT_T(KC_S)
-#define LSFT_D LSFT_T(KC_D)
-#define LCTL_F LCTL_T(KC_F)
-#define RCTL_J RCTL_T(KC_J)
-#define RSFT_K RSFT_T(KC_K)
-#define RALT_L LALT_T(KC_L)
-#define RGUI_SCLN RGUI_T(KC_SCLN)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_rev41lp(
-    KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
-    KC_ESC,     KC_A,  LALT_S,  LSFT_D,  LCTL_F,    KC_G,             KC_H,  RCTL_J,  RSFT_K,  RALT_L, KC_SCLN, KC_QUOT,
-    KC_LCTL,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
-                                        KC_LGUI,   LOWER, SPC_NAV,   RAISE,   FUNCT
-  ),
-
-  [_LOWER] = LAYOUT_rev41lp(
-    KC_GRV,  KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_DEL,
-    _______, _______, _______, _______, _______, _______,          KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, _______, KC_LGUI, KC_LALT, KC_CAPS, _______,          KC_PSCR, _______, _______, _______, _______, _______,
-                                        _______, _______, _______, _______, _______
-  ),
-
-  [_RAISE] = LAYOUT_rev41lp(
-    KC_TILD,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,          KC_6,       KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
-    _______, _______, _______, _______, _______, _______,          KC_GRV,  KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
-    _______, _______, KC_LGUI, KC_LALT, KC_CAPS, _______,          KC_PSCR, _______, _______, _______, _______, _______,
-                                        _______, _______, _______, _______, _______
-  ),
-
-  [_NAVIG] = LAYOUT_rev41lp(
-    KC_DEL,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_DEL,
-    _______, _______, _______, _______, _______, _______,          _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,   KC_NO,
-    _______, _______, KC_LGUI, KC_LALT, KC_CAPS, _______,          _______, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______,
-                                        _______, _______, _______, _______, _______
-  ),
-
-  [_FUNCTION] = LAYOUT_rev41lp(
-    KC_DEL,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_DEL,
-    _______, _______, _______, _______, _______, _______,            KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
-    _______, _______, KC_LGUI, KC_LALT, KC_CAPS, _______,            KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
-                                        _______, _______, _______, _______, _______
-  ),
-
-    [_ADJUST] = LAYOUT_rev41lp(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  BL_DOWN,BL_TOGG,          BL_BRTG,  BL_UP,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            QK_BOOT, 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);
-}
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LGUI_A:
-        case RGUI_SCLN:
-        case LALT_S:
-        case RALT_L:
-        case LCTL_F:
-        case RCTL_J:
-        case SPC_NAV:
-            return 225;
-        default:
-            return TAPPING_TERM;
-    }
-}
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
deleted file mode 100644
index 10f5ddf146b..00000000000
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2022 Jan Lindblom (@janlindblom)
- *
- * 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
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 11
-#undef BACKLIGHT_LIMIT_VAL
-#define BACKLIGHT_LIMIT_VAL 255
-#define BACKLIGHT_DEFAULT_LEVEL 3
-
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200
-#define TAPPING_TERM_PER_KEY
-
-#define LAYER_STATE_8BIT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
-/* key combination for command */
-#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
deleted file mode 100644
index c90f7e25a13..00000000000
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Copyright 2022 Jan Lindblom (@janlindblom)
- *
- * 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_swedish.h"
-#include "sendstring_swedish.h"
-
-enum layer_names {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-enum custom_keycodes {
-    SK_NOT_EQL = SAFE_RANGE,
-    SK_LEQ,
-    SK_GEQ,
-};
-
-// Custom send_string keys
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case SK_NOT_EQL:
-            if (record->event.pressed) {
-                SEND_STRING("!=");
-            }
-            break;
-        case SK_LEQ:
-            if (record->event.pressed) {
-                SEND_STRING("<=");
-            }
-            break;
-        case SK_GEQ:
-            if (record->event.pressed) {
-                SEND_STRING(">=");
-            }
-            break;
-    }
-    return true;
-}
-
-// Combos, if enabled
-#ifdef COMBO_ENABLE
-enum combo_events {
-    ZC_COPY,
-    XV_PASTE,
-    ZX_CUT,
-};
-
-const uint16_t PROGMEM copy_combo[]  = {KC_Z, KC_C, COMBO_END};
-const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END};
-const uint16_t PROGMEM cut_combo[]   = {KC_Z, KC_X, COMBO_END};
-
-combo_t key_combos[] = {
-    [ZC_COPY]  = COMBO_ACTION(copy_combo),
-    [XV_PASTE] = COMBO_ACTION(paste_combo),
-    [ZX_CUT]   = COMBO_ACTION(cut_combo),
-};
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-    switch (combo_index) {
-        case ZC_COPY:
-            if (pressed) {
-                tap_code16(LCTL(KC_C));
-            }
-            break;
-        case XV_PASTE:
-            if (pressed) {
-                tap_code16(LCTL(KC_V));
-            }
-            break;
-        case ZX_CUT:
-            if (pressed) {
-                tap_code16(LCTL(KC_X));
-            }
-            break;
-    }
-}
-#endif
-
-// Tap Dance definitions
-#ifdef TAP_DANCE_ENABLE
-enum dances {
-    TD_SHFT_CAPS,
-    TD_DOT_COL,
-    TD_COM_SCL,
-    TD_DASH_USCR,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Shift, twice for Caps Lock
-    [TD_SHFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-    [TD_COM_SCL]   = ACTION_TAP_DANCE_DOUBLE(KC_COMM, SE_SCLN),
-    [TD_DOT_COL]   = ACTION_TAP_DANCE_DOUBLE(KC_DOT, SE_COLN),
-    [TD_DASH_USCR] = ACTION_TAP_DANCE_DOUBLE(SE_MINS, S(SE_MINS)),
-};
-#    define CK_LSFT TD(TD_SHFT_CAPS)
-#    define CK_COMM TD(TD_COM_SCL)
-#    define CK_DOT TD(TD_DOT_COL)
-#    define CK_DASH TD(TD_DASH_USCR)
-#else
-#    define CK_LSFT KC_LSFT
-#    define CK_COMM KC_COMM
-#    define CK_DOT KC_DOT
-#    define CK_DASH SE_MINS
-#endif
-
-// Some defines for the keys below
-#define CK_ESC LT(_RAISE, KC_ESC)
-#define CK_BSPC LCTL_T(KC_BSPC)
-#define CK_DEL LALT_T(KC_DEL)
-#define CK_ENT1 LT(_LOWER, KC_ENT)
-#define CK_ENT2 LT(_RAISE, KC_ENT)
-#define CK_TAB RALT_T(KC_TAB)
-#define CK_ADIA RCTL_T(SE_ADIA)
-#define CK_QUOT RSFT_T(SE_QUOT)
-#define CK_SPC RSFT_T(KC_SPC)
-
-// Alt + [-] => – (en-dash)
-const key_override_t mins_ndash_override = ko_make_basic(MOD_MASK_ALT, SE_MINS, UC(0x2013));
- // Shift + Alt + [-] => — (em-dash)
-const key_override_t mins_mdash_override = ko_make_basic(MOD_MASK_SA, SE_MINS, UC(0x2014));
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &mins_ndash_override,
-    &mins_mdash_override,
-    NULL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_rev41lp(
-    CK_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,      KC_T,               KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,  SE_ARNG,
-    CK_BSPC,  KC_A,     KC_S,     KC_D,     KC_F,      KC_G,               KC_H,     KC_J,     KC_K,     KC_L,  SE_ODIA,  CK_ADIA,
-    CK_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,               KC_N,     KC_M,  SE_COMM,   SE_DOT,  SE_MINS,  CK_QUOT,
-                                          CK_DEL,   CK_ENT1,  KC_SPC,   CK_ENT2,   CK_TAB
-  ),
-
-  [_LOWER] = LAYOUT_rev41lp(
- SK_NOT_EQL,  SE_EXLM,    SE_AT,  SE_HASH,   SE_DLR,   SE_PERC,            SE_CIRC,  SE_AMPR,  SE_ASTR,  SE_LPRN,  SE_RPRN,  SE_DIAE,
-     SK_LEQ,  SE_UNDS,  SE_PLUS,  SE_LCBR,  SE_RCBR,   SE_PIPE,            KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,   SE_GRV,  SE_TILD,
-     SK_GEQ,   KC_ESC,  KC_LGUI,  KC_LALT,  KC_CAPS,   SE_DQUO,            KC_HOME,   KC_END,  KC_PGUP,  KC_PGDN,  KC_PSCR,   CK_SPC,
-                                            _______,   _______,  KC_ENT,   _______,  _______
-  ),
-
-  [_RAISE] = LAYOUT_rev41lp(
-    _______,     SE_1,     SE_2,     SE_3,     SE_4,      SE_5,               SE_6,   SE_7,   SE_8,    SE_9,    SE_0,  SE_GRV,
-    _______,  SE_MINS,   SE_EQL,  SE_LBRC,  SE_RBRC,   SE_BSLS,              KC_F1,  KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,
-    _______,   KC_ESC,  KC_RGUI,  KC_RALT,  KC_CAPS,   SE_ACUT,              KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,
-                                            SE_LABK,   SE_RABK,  KC_BSPC,  _______,  _______
-  ),
-
-  [_ADJUST] = LAYOUT_rev41lp(
-    XXXXXXX,   XXXXXXX, XXXXXXX,   BL_OFF,   BL_DOWN,  BL_TOGG,            BL_BRTG,   BL_UP,     BL_ON,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   BL_STEP,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    XXXXXXX,   UC_WINC, UC_MAC,   UC_LINX,  XXXXXXX,   XXXXXXX,            QK_BOOT,  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);
-}
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/readme.md b/keyboards/b_sides/rev41lp/keymaps/namnlos/readme.md
deleted file mode 100644
index cc307b3a970..00000000000
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Namnlos custom keymap for Rev41lp
-
-This is a nordic keymap for the Rev41lp by [cyril](https://github.com/cyril279), it's based on the default keymap but has customisations for nordic languages.
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/rules.mk b/keyboards/b_sides/rev41lp/keymaps/namnlos/rules.mk
deleted file mode 100644
index 59c3380a3b8..00000000000
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-SLEEP_LED_ENABLE = yes
-NKRO_ENABLE = yes
-UNICODE_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-KEY_OVERRIDE_ENABLE = yes
-DEBOUNCE_TYPE = sym_defer_pk
-LTO_ENABLE = yes
diff --git a/keyboards/bacca70/keymaps/debaccabean/keymap.c b/keyboards/bacca70/keymaps/debaccabean/keymap.c
deleted file mode 100644
index 1c40669fc8a..00000000000
--- a/keyboards/bacca70/keymaps/debaccabean/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2022 keebnewb
-
-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 CAP_GUI MT(MOD_LGUI, KC_CAPS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_debaccabean(
-        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_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,KC_INS, KC_RBRC,KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSPC,
-        KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_P7,  KC_P8,  KC_P9,  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSLS,
-        CAP_GUI,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_P4,  KC_P5,  KC_P6,  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_P1,  KC_P2,  KC_P3,  KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_ENT,
-        KC_LCTL,        KC_LALT,                                KC_SPC, KC_SPC, KC_SPC,                 MO(1),          KC_RCTL
-    ),
-
-    [1] = LAYOUT_debaccabean(
-        QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_MPLY,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPRV,KC_MNXT,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_HOME,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,
-        KC_TRNS,        KC_TRNS,                                KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,        KC_TRNS
-    )
-};
diff --git a/keyboards/bacca70/keymaps/dede-special/keymap.c b/keyboards/bacca70/keymaps/dede-special/keymap.c
deleted file mode 100644
index e213e794096..00000000000
--- a/keyboards/bacca70/keymaps/dede-special/keymap.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright 2022 keebnewb
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-// Windows mods
-#define GRV_CTL MT(MOD_LCTL, KC_GRV)
-#define BLS_CTL MT(MOD_RCTL, KC_BSLS)
-#define TAB_ALT MT(MOD_LALT, KC_TAB)
-
-// MacOS mods
-#define GRV_GUI MT(MOD_LGUI, KC_GRV)
-#define BLS_GUI MT(MOD_RGUI, KC_BSLS)
-#define TAB_CTL MT(MOD_LCTL, KC_TAB)
-
-// mod tap bracket shifts
-#define LBR_SFT MT(MOD_LSFT, KC_LBRC)
-#define RBR_SFT MT(MOD_RSFT, KC_RBRC)
-
-// Arrow/TenKey/Media Keys/Reset hold with Backspace tap
-#define BSPC_LR LT(3, KC_BSPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_debaccabean(
-        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_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,KC_GRV, KC_RBRC,KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_DEL,
-        KC_ESC, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_P7,  KC_P8,  KC_P9,  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_ENT,
-        TAB_ALT,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_P4,  KC_P5,  KC_P6,  KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
-        LBR_SFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_P1,  KC_P2,  KC_P3,  KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,RBR_SFT,
-        KC_LGUI,        GRV_CTL,                                BSPC_LR,MO(2),  KC_SPC,                 BLS_CTL,        KC_RGUI
-    ),
-
-    // MacOS layer
-    [1] = LAYOUT_debaccabean(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        TAB_CTL,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_LALT,        GRV_GUI,                                KC_TRNS,KC_TRNS,KC_TRNS,                BLS_GUI,        KC_RALT
-    ),
-
-    [2] = LAYOUT_debaccabean(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_UNDS,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_DLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_PLUS,
-        KC_MINS,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_TRNS,KC_TRNS,KC_TRNS,KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_EQL,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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_debaccabean(
-        QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,TG(1),
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS,
-        KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
-        KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_MNXT,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,
-        KC_MPLY,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPRV,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,
-        KC_TRNS,        KC_TRNS,                                KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,        KC_TRNS
-    )
-};
diff --git a/keyboards/bajjak/bajjak.c b/keyboards/bajjak/bajjak.c
index 74e2b2aa8cd..e6102e817b0 100644
--- a/keyboards/bajjak/bajjak.c
+++ b/keyboards/bajjak/bajjak.c
@@ -137,23 +137,16 @@ uint8_t init_mcp23018(void) {
     // - unused  : input  : 1
     // - input   : input  : 1
     // - driving : output : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(IODIRA, BAJJAK_EZ_I2C_TIMEOUT);            if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00000000, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00111111, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    i2c_stop();
-
-    // set pull-up
-    // - unused  : on  : 1
-    // - input   : on  : 1
-    // - driving : off : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(GPPUA, BAJJAK_EZ_I2C_TIMEOUT);             if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00000000, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b01111111, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-
-out:
-    i2c_stop();
+    uint8_t data[] = {0b00000000, 0b00111111};
+    mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, BAJJAK_EZ_I2C_TIMEOUT);
+
+    if (!mcp23018_status) {
+        // set pull-up
+        // - unused  : on  : 1
+        // - input   : on  : 1
+        // - driving : off : 0
+        mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, BAJJAK_EZ_I2C_TIMEOUT);
+    }
 
 #ifdef LEFT_LEDS
     if (!mcp23018_status) mcp23018_status = bajjak_left_leds_update();
@@ -176,21 +169,11 @@ uint8_t bajjak_left_leds_update(void) {
     // - unused  : hi-Z : 1
     // - input   : hi-Z : 1
     // - driving : hi-Z : 1
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(OLATA, BAJJAK_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111
-                                & ~(bajjak_left_led_1<<LEFT_LED_1_SHIFT),
-                                BAJJAK_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111
-                                & ~(bajjak_left_led_2<<LEFT_LED_2_SHIFT),
-                                BAJJAK_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-
- out:
-    i2c_stop();
+    uint8_t data[2];
+    data[0] = 0b11111111 & ~(bajjak_left_led_1<<LEFT_LED_1_SHIFT);
+    data[1] = 0b11111111 & ~(bajjak_left_led_2<<LEFT_LED_2_SHIFT);
+    mcp23018_status = i2c_writeReg(I2C_ADDR, OLATA, data, 2, BAJJAK_EZ_I2C_TIMEOUT);
+
     return mcp23018_status;
 }
 #endif
diff --git a/keyboards/bajjak/bajjak.h b/keyboards/bajjak/bajjak.h
index 52f14ad3ea3..c2d2d77ef61 100644
--- a/keyboards/bajjak/bajjak.h
+++ b/keyboards/bajjak/bajjak.h
@@ -27,9 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "i2c_master.h"
 
 // I2C aliases and register addresses (see "mcp23018.md")
-#define I2C_ADDR        0b0100000
-#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
-#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define I2C_ADDR        (0b0100000<<1)
 #define IODIRA          0x00            // i/o direction register
 #define IODIRB          0x01
 #define GPPUA           0x0C            // GPIO pull-up resistor register
diff --git a/keyboards/bajjak/matrix.c b/keyboards/bajjak/matrix.c
index 20fc3c8f235..424bc29e4e3 100644
--- a/keyboards/bajjak/matrix.c
+++ b/keyboards/bajjak/matrix.c
@@ -145,12 +145,7 @@ static matrix_row_t read_cols(uint8_t row) {
             uint8_t data = 0;
             // reading GPIOB (column port) since in mcp23018's sequential mode
             // it is addressed directly after writing to GPIOA in select_row()
-            mcp23018_status = i2c_start(I2C_ADDR_READ, BAJJAK_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-            mcp23018_status = i2c_read_nack(BAJJAK_EZ_I2C_TIMEOUT);               if (mcp23018_status < 0) goto out;
-            data            = ~((uint8_t)mcp23018_status);
-            mcp23018_status = I2C_STATUS_SUCCESS;
-        out:
-            i2c_stop();
+            mcp23018_status = i2c_receive(I2C_ADDR, &data, 1, BAJJAK_EZ_I2C_TIMEOUT);
             return data;
         }
     } else {
@@ -195,11 +190,10 @@ static void select_row(uint8_t row) {
         if (!mcp23018_status) {
             // set active row low  : 0
             // set other rows hi-Z : 1
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOA, BAJJAK_EZ_I2C_TIMEOUT);                 if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(0xFF & ~(1 << row), BAJJAK_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-        out:
-            i2c_stop();
+            uint8_t data;
+            data = 0xFF & ~(1 << row);
+            mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, BAJJAK_EZ_I2C_TIMEOUT);
+
         }
     } else {
         // select on teensy
diff --git a/keyboards/bandominedoni/bandominedoni.c b/keyboards/bandominedoni/bandominedoni.c
index 47be95a62b1..2884e41c9c1 100644
--- a/keyboards/bandominedoni/bandominedoni.c
+++ b/keyboards/bandominedoni/bandominedoni.c
@@ -97,11 +97,11 @@ static enum { UNKNOWN, LEFT, RIGHT } hand_side = UNKNOWN;
         hand_side = readPin(SPLIT_HAND_PIN) ? LEFT : RIGHT;
         return (hand_side == LEFT);
 #elif defined(SPLIT_HAND_MATRIX_GRID)
-#    ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
-        hand_side = peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID) ? LEFT : RIGHT;
+#    ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
+        hand_side = peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID) ? RIGHT : LEFT;
         return (hand_side == LEFT);
 #    else
-        hand_side = peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID) ? RIGHT : LEFT;
+        hand_side = peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID) ? LEFT : RIGHT;
         return (hand_side == LEFT);
 #    endif
 #elif defined(EE_HANDS)
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index 7dfa48fbd43..ecab8fc61fc 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -19,23 +19,16 @@
 #ifndef MASTER_RIGHT
 //  SPLIT_HAND_MATRIX_GRID was initially designed to use with left hand side diode D35 mounted and not pressing K7 on the right hand side during boot. However when a USB cable is reconnected immediately, it fails. Decided to use "MASTER_RIGHT" to make it more reliable.
 #   define SPLIT_HAND_MATRIX_GRID B5, D0
+#   define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
 #endif
 
 #define SPLIT_USB_DETECT
 
 #ifdef RGB_MATRIX_ENABLE
-
-/* ws2812 RGB MATRIX */
-#   define RGB_MATRIX_LED_COUNT 76
-
- // reacts to keypresses
-#   define RGB_MATRIX_KEYPRESSES
-
 //  for all fingers used at once.
 #   define LED_HITS_TO_REMEMBER 10
 
-#   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-// the above brighness setting has no effect on rgb_matrix_set_color().
+// the max brightness setting has no effect on rgb_matrix_set_color().
 // Use darker colors instead.
 /*              RGB darker COLORS             */
 #   define RGB_DARKWHITE 0x33, 0x33, 0x33
@@ -58,8 +51,6 @@
 #   define RGB_DARKPINK 0x33, 0x19, 0x26
 
 //  https://docs.qmk.fm/#/feature_rgb_matrix
-//  Enable suspend mode.
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED true
 
 #   ifdef CONSOLE_ENABLE
 #       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
@@ -84,7 +75,7 @@
 //  RAINDROPS don't match well with layer LED indicator (oc) using rgb_matrix_set_color().
 // #define ENABLE_RGB_MATRIX_RAINDROPS
 // #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//  Recommendend not to use these.
+//  Recommended not to use these.
 #       ifndef VIA_ENABLE
 #           define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
 #           define ENABLE_RGB_MATRIX_BAND_VAL
diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json
index aa5b2f9a2f2..deea0f3e5ef 100644
--- a/keyboards/bandominedoni/info.json
+++ b/keyboards/bandominedoni/info.json
@@ -9,7 +9,9 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "max_brightness": 50,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],
diff --git a/keyboards/bandominedoni/keymaps/led/config.h b/keyboards/bandominedoni/keymaps/led/config.h
deleted file mode 100644
index 04bd66bf1ac..00000000000
--- a/keyboards/bandominedoni/keymaps/led/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 3araht
- *
- * 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 6
diff --git a/keyboards/bandominedoni/keymaps/led/keymap.c b/keyboards/bandominedoni/keymaps/led/keymap.c
deleted file mode 100644
index 0ae2185ecee..00000000000
--- a/keyboards/bandominedoni/keymaps/led/keymap.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* Copyright 2021 3araht
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-#define DF_COLE  DF(_COLEMAK)
-
-#define _________________QWERTY_L1_________________ KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
-#define _________________QWERTY_L2_________________ KC_A,    KC_S,    KC_D,    KC_F,    KC_G
-#define _________________QWERTY_L3_________________ KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
-
-#define _________________QWERTY_R1_________________ KC_Y,    KC_U,    KC_I,    KC_O,    KC_P
-#define _________________QWERTY_R2_________________ KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN
-#define _________________QWERTY_R3_________________ KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
-
-#define _________________COLEMAK_L1________________ KC_Q,    KC_W,    KC_F,    KC_P,    KC_G
-#define _________________COLEMAK_L2________________ KC_A,    KC_R,    KC_S,    KC_T,    KC_D
-#define _________________COLEMAK_L3________________ KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
-
-#define _________________COLEMAK_R1________________ KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN
-#define _________________COLEMAK_R2________________ KC_H,    KC_N,    KC_E,    KC_I,    KC_O
-#define _________________COLEMAK_R3________________ KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
-
-#define _________________NUMBER_L__________________ KC_1,    KC_2,    KC_3,    KC_4,    KC_5
-// #define _________________NUMBER_R__________________ KC_6,    KC_7,    KC_8,    KC_9,    KC_0
-
-#define _________________FUNC__L___________________ KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
-// #define _________________FUNC__R___________________ KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-#ifndef PEDAL_NORMALLY_CLOSED
-    _OPEN,
-#endif
-    _CLOSE,
-#ifdef PEDAL_NORMALLY_CLOSED
-    _OPEN,
-#endif
-     _QWERTY,
-     _COLEMAK,
-     _MISC,
-     _FN
-};
-
-enum custom_keycodes {
-    VERSION = SAFE_RANGE
-};
-
-// Alias layout macros that expand groups of keys.
-#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_OPEN] = LAYOUT(
-                  MI_Gs1, MI_As1, MI_Cs2, MI_F2, MI_Gs3,
-       MI_E1, MI_A1, MI_G2, MI_Ds2, MI_F3, MI_As2, MI_F1,
-         MI_D2, MI_A2, MI_C3, MI_E3, MI_C2, MI_G1, TG_SWAP,
-       MI_E2, MI_Gs2, MI_B2, MI_D3, MI_Fs3, MI_Cs3, MI_Fs1,
-     MI_D1, MI_B1, MI_G3, MI_A3, MI_Ds3, MI_Fs2, MI_Ds1, MI_C1,
-
-     MO_SWAP,    MI_B5, MI_Gs5, MI_G5, MI_F5,     FN_MUTE,
-         MI_Cs3, MI_A5, MI_Fs5, MI_E5, MI_Ds5,
-        MI_C3, MI_D3, MI_G3, MI_As4, MI_C5, MI_D5,
-     TG_SWAP, MI_B2, MI_E3, MI_Cs4, MI_Fs3, MI_A3, MI_C4, MI_E4,
-       MI_A2, MI_F3, MI_As3, MI_Gs3, MI_B3, MI_D4, MI_Gs4, MI_B4,
-     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_Ds4, MI_Fs4, MI_A4, MI_Cs5, MI_G4
-    ),
-
-    [_CLOSE] = LAYOUT(
-                  MI_Gs1, MI_As1, MI_Ds2, MI_Ds3, MI_G3,
-       MI_D1, MI_D2, MI_As2, MI_C3, MI_Cs2, MI_C2, MI_Fs1,
-         MI_G1, MI_G2, MI_B2, MI_D3, MI_F3, MI_Fs2, TG_SWAP,
-       MI_A1, MI_E2, MI_A2, MI_Cs3, MI_E3, MI_Gs2, MI_B1,
-     MI_E1, MI_E2, MI_Fs3, MI_Gs3, MI_B3, MI_F2, MI_Cs1, MI_F1,
-
-     MO_SWAP,    MI_A5, MI_Gs5, MI_Fs5, MI_F5,     FN_MUTE,
-         MI_C3, MI_G5, MI_As4, MI_C5, MI_Ds5,
-        MI_D3, MI_Cs3, MI_Gs3, MI_As3, MI_C4, MI_D5,
-     TG_SWAP, MI_B2, MI_Fs3, MI_Fs4, MI_G3, MI_B3, MI_D4, MI_G4,
-       MI_A2, MI_F3, MI_E3, MI_A3, MI_Cs4, MI_E4, MI_A4, MI_Cs5,
-     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_E4, MI_Gs4, MI_B4, MI_E5, MI_Ds4
-    ),
-
-    [_QWERTY] = LAYOUT_wrapper(
-                   _________________NUMBER_L__________________,
-       QK_GESC, KC_TAB, _________________QWERTY_L1_________________,
-          KC_CAPS, _________________QWERTY_L2_________________, KC_H,
-       KC_LSFT, _________________QWERTY_L3_________________, KC_N,
-     KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
-
-     MO(_MISC),        KC_LBRC, KC_RBRC, KC_BSLS, KC_0,         _______,
-                  KC_6, KC_7, KC_8, KC_9, KC_BSPC,
-                _________________QWERTY_R1_________________, KC_DEL,
-     KC_PGUP, KC_G, _________________QWERTY_R2_________________, KC_ENT,
-            KC_PGDN, KC_B, _________________QWERTY_R3_________________, KC_RSFT,
-         KC_HOME, KC_END, KC_SPC, MIS_KAN, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-    ),
-
-    [_COLEMAK] = LAYOUT_wrapper(
-                   _________________NUMBER_L__________________,
-       QK_GESC, KC_TAB, _________________COLEMAK_L1________________,
-          KC_LCTL, _________________COLEMAK_L2________________, KC_ENT,
-       KC_LSFT, _________________COLEMAK_L3________________, KC_M,
-     KC_CAPS, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
-
-     MO(_MISC),        KC_LBRC, KC_RBRC, KC_BSLS, KC_0,         _______,
-                  KC_6, KC_7, KC_8, KC_9, KC_BSPC,
-                _________________COLEMAK_R1________________, KC_DEL,
-     KC_PGUP, KC_D, _________________COLEMAK_R2________________, KC_ENT,
-            KC_PGDN, KC_B, _________________COLEMAK_R3________________, KC_RSFT,
-         KC_HOME, KC_END, KC_SPC, MIS_KAN, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-    ),
-
-    [_MISC] = LAYOUT_wrapper(
-                    _________________FUNC__L___________________,
-       _______, _______, _______, _______, _______, _______, _______,
-          _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______,
-
-     _______,        _______, _______, _______, KC_F10,         _______,
-                  KC_F6, KC_F7, KC_F8, KC_F9, _______,
-                _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, KC_QUOT, _______,
-            _______, _______, _______, _______, _______, _______, _______, _______,
-         _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    [_FN] = LAYOUT(
-                   DF_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-       XXXXXXX, DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-          DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-     XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-
-     _______,        MI_OCTD, MI_OCTU, MI_VELD, MI_VELU,         _______,
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
-     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-            RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
-          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, EE_CLR, RGB_TOG
-    )
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_OPEN]     = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_CLOSE]    = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_QWERTY]   = { ENCODER_CCW_CW(_______, _______) },
-    [_COLEMAK]  = { ENCODER_CCW_CW(_______, _______) },
-    [_MISC]     = { ENCODER_CCW_CW(_______, _______) },
-    [_FN]       = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
-};
-#endif
-
-void my_init(void){
-    //  Set octave to 0
-    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
-
-    // avoid using 127 since it is used as a special number in some sound sources.
-    midi_config.velocity = MIDI_INITIAL_VELOCITY;
-}
-
-void eeconfig_init_user(void) {  // EEPROM is getting reset!
-    midi_init();
-    my_init();
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
-    rgb_matrix_sethsv(HSV_BLUE);
-
-    rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
-    // rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
-#endif
-}
-
-void keyboard_post_init_user(void) {
-    my_init();
-
-    //  party mode (for LED soldering test. Enable rainbow color effect, and disable led_indicator to check all LEDs)
-    rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case VERSION: // Output firmware info.
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
-            }
-            break;
-    }
-    return true;
-}
-
-#ifdef RGB_MATRIX_ENABLE
-bool rgb_matrix_indicators_user(void) {
-    if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
-        uint8_t layer = get_highest_layer(layer_state);
-        switch (layer) {
-            case _CLOSE:
-                // rgb_matrix_set_color(pgm_read_byte(&convert_led_location2number[11]),  RGB_RED);         //  RGB_TOG  <- too heavy.
-
-                // Close state indicator
-                rgb_matrix_set_color( 0, RGB_DARKWHITE);     //  oc
-                break;
-
-            case _FN:
-                // left hand side
-                rgb_matrix_set_color( 46, RGB_DARKORANGE);     //  DF_OPEN
-                rgb_matrix_set_color( 48, RGB_DARKWHITE);      //  DF_QWER
-                rgb_matrix_set_color( 60, RGB_DARKWHITE);      //  DF_COLE
-
-                rgb_matrix_set_color( 73, RGB_DARKYELLOW);     //  AG_SWAP
-                rgb_matrix_set_color( 72, RGB_DARKYELLOW);     //  AG_NORM
-
-
-                // right hand side
-                rgb_matrix_set_color( 1, RGB_DARKYELLOW);      //  MI_OCTD
-                rgb_matrix_set_color(13, RGB_DARKGREEN);       //  MI_OCTU
-                rgb_matrix_set_color(14, RGB_DARKYELLOW);      //  MI_VELD
-                rgb_matrix_set_color(25, RGB_DARKGREEN);       //  MI_VELU
-
-                rgb_matrix_set_color( 6, RGB_DARKBLUE);        //  RGB_SAD
-                rgb_matrix_set_color( 9, RGB_DARKBLUE);        //  RGB_SAI
-                rgb_matrix_set_color(18, RGB_DARKBLUE);        //  RGB_HUD
-                rgb_matrix_set_color(21, RGB_DARKBLUE);        //  RGB_HUI
-                rgb_matrix_set_color(29, RGB_DARKBLUE);        //  RGB_SPD
-                rgb_matrix_set_color(32, RGB_DARKBLUE);        //  RGB_SPI
-                rgb_matrix_set_color(36, RGB_DARKBLUE);        //  RGB_VAD
-                rgb_matrix_set_color(39, RGB_DARKBLUE);        //  RGB_VAI
-
-                rgb_matrix_set_color(31, RGB_DARKBLUE);        //  RGB_RMOD
-                rgb_matrix_set_color(37, RGB_DARKBLUE);        //  RGB_MOD
-                rgb_matrix_set_color(38, RGB_DARKPINK);        //  EE_CLR
-                rgb_matrix_set_color(40, RGB_DARKRED);         //  RGB_TOG
-
-                rgb_matrix_set_color(41, RGB_DARKORANGE);      //  _FN
-                break;
-        }
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/bandominedoni/keymaps/led/readme.md b/keyboards/bandominedoni/keymaps/led/readme.md
deleted file mode 100644
index 77e709c70ba..00000000000
--- a/keyboards/bandominedoni/keymaps/led/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap with led for bandominedoni
diff --git a/keyboards/bandominedoni/keymaps/led/rules.mk b/keyboards/bandominedoni/keymaps/led/rules.mk
deleted file mode 100644
index 0a1c4b1858e..00000000000
--- a/keyboards/bandominedoni/keymaps/led/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGB_MATRIX_ENABLE = yes      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_CUSTOM_KB = yes   #
-
-ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/bandominedoni/keymaps/lednotg/keymap.c b/keyboards/bandominedoni/keymaps/lednotg/keymap.c
deleted file mode 100644
index 6f904a06d2b..00000000000
--- a/keyboards/bandominedoni/keymaps/lednotg/keymap.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* Copyright 2021 3araht
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-#define DF_COLE  DF(_COLEMAK)
-
-#define _________________QWERTY_L1_________________ KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
-#define _________________QWERTY_L2_________________ KC_A,    KC_S,    KC_D,    KC_F,    KC_G
-#define _________________QWERTY_L3_________________ KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
-
-#define _________________QWERTY_R1_________________ KC_Y,    KC_U,    KC_I,    KC_O,    KC_P
-#define _________________QWERTY_R2_________________ KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN
-#define _________________QWERTY_R3_________________ KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
-
-#define _________________COLEMAK_L1________________ KC_Q,    KC_W,    KC_F,    KC_P,    KC_G
-#define _________________COLEMAK_L2________________ KC_A,    KC_R,    KC_S,    KC_T,    KC_D
-#define _________________COLEMAK_L3________________ KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
-
-#define _________________COLEMAK_R1________________ KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN
-#define _________________COLEMAK_R2________________ KC_H,    KC_N,    KC_E,    KC_I,    KC_O
-#define _________________COLEMAK_R3________________ KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
-
-#define _________________NUMBER_L__________________ KC_1,    KC_2,    KC_3,    KC_4,    KC_5
-// #define _________________NUMBER_R__________________ KC_6,    KC_7,    KC_8,    KC_9,    KC_0
-
-#define _________________FUNC__L___________________ KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
-// #define _________________FUNC__R___________________ KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-#ifndef PEDAL_NORMALLY_CLOSED
-    _OPEN,
-#endif
-    _CLOSE,
-#ifdef PEDAL_NORMALLY_CLOSED
-    _OPEN,
-#endif
-    _QWERTY,
-    _COLEMAK,
-    _MISC,
-    _FN
-};
-
-enum custom_keycodes {
-    VERSION = SAFE_RANGE
-};
-
-// Alias layout macros that expand groups of keys.
-#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_OPEN] = LAYOUT(
-                  MI_Gs1, MI_As1, MI_Cs2, MI_F2, MI_Gs3,
-       MI_E1, MI_A1, MI_G2, MI_Ds2, MI_F3, MI_As2, MI_F1,
-         MI_D2, MI_A2, MI_C3, MI_E3, MI_C2, MI_G1, MI_B,
-       MI_E2, MI_Gs2, MI_B2, MI_D3, MI_Fs3, MI_Cs3, MI_Fs1,
-     MI_D1, MI_B1, MI_G3, MI_A3, MI_Ds3, MI_Fs2, MI_Ds1, MI_C1,
-
-     MO_SWAP,    MI_B5, MI_Gs5, MI_G5, MI_F5,     FN_MUTE,
-         MI_Cs3, MI_A5, MI_Fs5, MI_E5, MI_Ds5,
-        MI_C3, MI_D3, MI_G3, MI_As4, MI_C5, MI_D5,
-     MI_G2, MI_B2, MI_E3, MI_Cs4, MI_Fs3, MI_A3, MI_C4, MI_E4,
-       MI_A2, MI_F3, MI_As3, MI_Gs3, MI_B3, MI_D4, MI_Gs4, MI_B4,
-     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_Ds4, MI_Fs4, MI_A4, MI_Cs5, MI_G4
-    ),
-
-    [_CLOSE] = LAYOUT(
-                  MI_Gs1, MI_As1, MI_Ds2, MI_Ds3, MI_G3,
-       MI_D1, MI_D2, MI_As2, MI_C3, MI_Cs2, MI_C2, MI_Fs1,
-         MI_G1, MI_G2, MI_B2, MI_D3, MI_F3, MI_Fs2, MI_B,
-       MI_A1, MI_E2, MI_A2, MI_Cs3, MI_E3, MI_Gs2, MI_B1,
-     MI_E1, MI_E2, MI_Fs3, MI_Gs3, MI_B3, MI_F2, MI_Cs1, MI_F1,
-
-     MO_SWAP,    MI_A5, MI_Gs5, MI_Fs5, MI_F5,     FN_MUTE,
-         MI_C3, MI_G5, MI_As4, MI_C5, MI_Ds5,
-        MI_D3, MI_Cs3, MI_Gs3, MI_As3, MI_C4, MI_D5,
-     MI_G2, MI_B2, MI_Fs3, MI_Fs4, MI_G3, MI_B3, MI_D4, MI_G4,
-       MI_A2, MI_F3, MI_E3, MI_A3, MI_Cs4, MI_E4, MI_A4, MI_Cs5,
-     MI_Gs2, MI_As2, MI_Ds3, MI_F4, MI_E4, MI_Gs4, MI_B4, MI_E5, MI_Ds4
-    ),
-
-    [_QWERTY] = LAYOUT_wrapper(
-                   _________________NUMBER_L__________________,
-       QK_GESC, KC_TAB, _________________QWERTY_L1_________________,
-          KC_CAPS, _________________QWERTY_L2_________________, KC_H,
-       KC_LSFT, _________________QWERTY_L3_________________, KC_N,
-     KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
-
-     MO(_MISC),        KC_LBRC, KC_RBRC, KC_BSLS, KC_0,         _______,
-                  KC_6, KC_7, KC_8, KC_9, KC_BSPC,
-                _________________QWERTY_R1_________________, KC_DEL,
-     KC_PGUP, KC_G, _________________QWERTY_R2_________________, KC_ENT,
-            KC_PGDN, KC_B, _________________QWERTY_R3_________________, KC_RSFT,
-         KC_HOME, KC_END, KC_SPC, MIS_KAN, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-    ),
-
-    [_COLEMAK] = LAYOUT_wrapper(
-                   _________________NUMBER_L__________________,
-       QK_GESC, KC_TAB, _________________COLEMAK_L1________________,
-          KC_LCTL, _________________COLEMAK_L2________________, KC_ENT,
-       KC_LSFT, _________________COLEMAK_L3________________, KC_M,
-     KC_CAPS, KC_GRV, KC_LGUI, KC_LALT, MIS_EIS, KC_SPC, KC_SPC, KC_PSCR,
-
-     MO(_MISC),        KC_LBRC, KC_RBRC, KC_BSLS, KC_0,         _______,
-                  KC_6, KC_7, KC_8, KC_9, KC_BSPC,
-                _________________COLEMAK_R1________________, KC_DEL,
-     KC_PGUP, KC_D, _________________COLEMAK_R2________________, KC_ENT,
-            KC_PGDN, KC_B, _________________COLEMAK_R3________________, KC_RSFT,
-         KC_HOME, KC_END, KC_SPC, MIS_KAN, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-    ),
-
-    [_MISC] = LAYOUT_wrapper(
-                    _________________FUNC__L___________________,
-       _______, _______, _______, _______, _______, _______, _______,
-          _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______,
-
-     _______,        _______, _______, _______, KC_F10,         _______,
-                  KC_F6, KC_F7, KC_F8, KC_F9, _______,
-                _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, KC_QUOT, _______,
-            _______, _______, _______, _______, _______, _______, _______, _______,
-         _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    [_FN] = LAYOUT(
-                   DF_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-       XXXXXXX, DF_QWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-          DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-     XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-
-     _______,        KC_VOLD, KC_VOLU, MI_VELD, MI_VELU,         _______,
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
-     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-            RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
-          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, EE_CLR, RGB_TOG
-    )
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_OPEN]     = { ENCODER_CCW_CW(MI_OCTD, MI_OCTU) },
-    [_CLOSE]    = { ENCODER_CCW_CW(MI_OCTD, MI_OCTU) },
-    [_QWERTY]   = { ENCODER_CCW_CW(_______, _______) },
-    [_COLEMAK]  = { ENCODER_CCW_CW(_______, _______) },
-    [_MISC]     = { ENCODER_CCW_CW(_______, _______) },
-    [_FN]       = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
-};
-#endif
-
-void my_init(void){
-    //  Set octave to 0
-    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
-
-    // avoid using 127 since it is used as a special number in some sound sources.
-    midi_config.velocity = MIDI_INITIAL_VELOCITY;
-}
-
-void eeconfig_init_user(void) {  // EEPROM is getting reset!
-    midi_init();
-    my_init();
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
-    rgb_matrix_sethsv(HSV_BLUE);
-
-    rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
-    // rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
-#endif
-}
-
-void keyboard_post_init_user(void) {
-    my_init();
-
-    //  party mode (for LED soldering test. Enable rainbow color effect, and disable led_indicator to check all LEDs)
-    rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case VERSION: // Output firmware info.
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
-            }
-            break;
-    }
-    return true;
-}
-
-#ifdef RGB_MATRIX_ENABLE
-bool rgb_matrix_indicators_user(void) {
-    if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
-        uint8_t layer = biton32(layer_state);
-        switch (layer) {
-            case _CLOSE:
-                // rgb_matrix_set_color(pgm_read_byte(&convert_led_location2number[11]),  RGB_RED);         //  RGB_TOG  <- too heavy.
-
-                // Close state indicator
-                rgb_matrix_set_color( 0, RGB_DARKWHITE);     //  oc
-                break;
-
-            case _FN:
-                // left hand side
-                rgb_matrix_set_color( 46, RGB_DARKORANGE);     //  DF_OPEN
-                rgb_matrix_set_color( 48, RGB_DARKWHITE);      //  DF_QWER
-                rgb_matrix_set_color( 60, RGB_DARKWHITE);      //  DF_COLE
-
-                rgb_matrix_set_color( 73, RGB_DARKYELLOW);     //  AG_SWAP
-                rgb_matrix_set_color( 72, RGB_DARKYELLOW);     //  AG_NORM
-
-
-                // right hand side
-                rgb_matrix_set_color( 1, RGB_DARKYELLOW);      //  MI_OCTD
-                rgb_matrix_set_color(13, RGB_DARKGREEN);       //  MI_OCTU
-                rgb_matrix_set_color(14, RGB_DARKYELLOW);      //  MI_VELD
-                rgb_matrix_set_color(25, RGB_DARKGREEN);       //  MI_VELU
-
-                rgb_matrix_set_color( 6, RGB_DARKBLUE);        //  RGB_SAD
-                rgb_matrix_set_color( 9, RGB_DARKBLUE);        //  RGB_SAI
-                rgb_matrix_set_color(18, RGB_DARKBLUE);        //  RGB_HUD
-                rgb_matrix_set_color(21, RGB_DARKBLUE);        //  RGB_HUI
-                rgb_matrix_set_color(29, RGB_DARKBLUE);        //  RGB_SPD
-                rgb_matrix_set_color(32, RGB_DARKBLUE);        //  RGB_SPI
-                rgb_matrix_set_color(36, RGB_DARKBLUE);        //  RGB_VAD
-                rgb_matrix_set_color(39, RGB_DARKBLUE);        //  RGB_VAI
-
-                rgb_matrix_set_color(31, RGB_DARKBLUE);        //  RGB_RMOD
-                rgb_matrix_set_color(37, RGB_DARKBLUE);        //  RGB_MOD
-                rgb_matrix_set_color(38, RGB_DARKPINK);        //  EE_CLR
-                rgb_matrix_set_color(40, RGB_DARKRED);         //  RGB_TOG
-
-                rgb_matrix_set_color(41, RGB_DARKORANGE);      //  _FN
-                break;
-        }
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/bandominedoni/keymaps/lednotg/readme.md b/keyboards/bandominedoni/keymaps/lednotg/readme.md
deleted file mode 100644
index 803d1d39f82..00000000000
--- a/keyboards/bandominedoni/keymaps/lednotg/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap with led and no TG keys on the layout for bandominedoni
diff --git a/keyboards/bandominedoni/keymaps/lednotg/rules.mk b/keyboards/bandominedoni/keymaps/lednotg/rules.mk
deleted file mode 100644
index 0a1c4b1858e..00000000000
--- a/keyboards/bandominedoni/keymaps/lednotg/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGB_MATRIX_ENABLE = yes      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_CUSTOM_KB = yes   #
-
-ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/barleycorn_smd/matrix.c b/keyboards/barleycorn_smd/matrix.c
index b717452f3d2..315093c8a98 100644
--- a/keyboards/barleycorn_smd/matrix.c
+++ b/keyboards/barleycorn_smd/matrix.c
@@ -42,9 +42,9 @@ static void init_pins(void) {
     unselect_rows();
     // Set I/O
     uint8_t send_data[2] = { 0xFF, 0x03};
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data[0], 2, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data[0], 2, 20);
     // Set Pull-up
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x0C, &send_data[0], 2, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x0C, &send_data[0], 2, 20);
 
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
         if ( x < 8 ) {
@@ -75,7 +75,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
     matrix_io_delay();
 
     uint8_t port_expander_col_buffer[2];
-    i2c_readReg((PORT_EXPANDER_ADDRESS << 1), 0x12, &port_expander_col_buffer[0], 2, 20);
+    i2c_read_register((PORT_EXPANDER_ADDRESS << 1), 0x12, &port_expander_col_buffer[0], 2, 20);
 
     // For each col...
     for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
diff --git a/keyboards/basekeys/slice/rev1/keymaps/2moons/config.h b/keyboards/basekeys/slice/rev1/keymaps/2moons/config.h
deleted file mode 100644
index 3807c29fa7b..00000000000
--- a/keyboards/basekeys/slice/rev1/keymaps/2moons/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 2Moons
-
-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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
-//#define MASTER_RIGHT
diff --git a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
deleted file mode 100644
index 7d84ce3ae0b..00000000000
--- a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Copyright 2020 2Moons
- *
- * 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_japanese.h"
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// 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,
-  _FLOCK,
-  _FN,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-enum tapdances{
-  TD_ESFL = 0,
-  TD_ESQW,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_all(
-  //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    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_BSPC,
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_MODE_FORWARD,   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_MODE_GRADIENT,  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, 
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_MODE_XMAS,      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_RSFT,  KC_RSFT,  
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_TOG,  KC_LCTL, KC_LALT, KC_LALT,  KC_SPC,  KC_SPC,  KC_SPC,               KC_SPC,  KC_SPC, KC_RALT, KC_RCTL, MO(_FN)
-          //`----------------------------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_FLOCK] = LAYOUT_all(
-  //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    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_BSPC,
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_MODE_FORWARD,   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_MODE_GRADIENT,  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, 
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_MODE_XMAS,      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_RSFT,  KC_RSFT,  
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_TOG,  KC_LCTL, KC_LALT, KC_LALT,  KC_SPC,  KC_SPC,  KC_SPC,               KC_SPC,  KC_SPC, KC_RALT, KC_RCTL, MO(_FN)
-          //`----------------------------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_FN] = LAYOUT_all(
-  //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-      KC_ESC, TG(_ADJUST), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    KC_INS, KC_BSPC, KC_DEL,
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      _______,           _______, _______, _______, _______, _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUSE,  KC_UP, _______,  _______,   _______, 
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      _______,           _______, _______, _______, _______, _______, _______,     _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______,   _______, 
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      _______,           _______, _______, _______, _______, _______, _______,     _______,  KC_END, KC_PGDN, KC_DOWN, _______, _______,   _______,  _______, _______, 
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      _______,           _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
-          //`----------------------------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT_all(
-  //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    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_BSPC,
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_MODE_FORWARD,   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_MODE_GRADIENT,  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, 
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_MODE_XMAS,      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_RSFT,  KC_RSFT,  
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_TOG,  KC_LCTL, KC_LALT, KC_LALT,  KC_SPC,  KC_SPC,  KC_SPC,               KC_SPC,  KC_SPC, KC_RALT, KC_RCTL, MO(_FN)
-          //`----------------------------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_all(
-  //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-       KC_ESC, KC_GRAVE,    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_BSPC,
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_MODE_FORWARD,   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_MODE_GRADIENT,  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, 
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_MODE_XMAS,      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_RSFT,  KC_RSFT,  
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      RGB_TOG,  KC_LCTL, KC_LALT, KC_LALT,  KC_SPC,  KC_SPC,  KC_SPC,               KC_SPC,  KC_SPC, KC_RALT, KC_RCTL, MO(_FN)
-          //`----------------------------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_all( /* Base */
-  //,------------------------------------------------------------------------|   |----------------------------------------------------------------.
-   XXXXXXX, TG(_ADJUST), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,    QK_BOOT, XXXXXXX,
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-     XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,  XXXXXXX,
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, 
-  //|--------+---------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------|
-      XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,   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, _RAISE, _LOWER, _ADJUST);
-#ifdef RGBLIGHT_ENABLE
-    switch (get_highest_layer(state)) {
-    case _FLOCK:
-      rgblight_sethsv_at(HSV_YELLOW, 0);
-      break;
-    case _FN:
-      rgblight_sethsv_at(HSV_GREEN, 0);
-      break;
-    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, 4);
-#endif
-return state;
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  bool result = false;
-  switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
diff --git a/keyboards/basekeys/slice/rev1/keymaps/2moons/rules.mk b/keyboards/basekeys/slice/rev1/keymaps/2moons/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/basekeys/slice/rev1/keymaps/2moons/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index 341f6f03e0f..584a6e4bfc5 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -16,75 +16,8 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 80
-
 /* 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
-
-/* EEPROM for via */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-#ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-//#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash.
-
-/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
- * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-// 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
-#    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
diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
index 338eb1ae900..d9afe40a0c9 100644
--- a/keyboards/basekeys/trifecta/info.json
+++ b/keyboards/basekeys/trifecta/info.json
@@ -46,11 +46,57 @@
     "rgb_matrix": {
         "sat_steps": 8,
         "val_steps": 8,
-        "speed_steps": 10
+        "speed_steps": 10,
+        "max_brightness": 150,
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-   "layouts": {
+    "layouts": {
         "LAYOUT": {
             "layout": [
                 {"matrix": [1, 0], "x": 0, "y": 0},
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index e373627d51c..1c952759a76 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -20,10 +20,3 @@
 
 /* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
-
-/* RGB settings. */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 36
-#    define RGB_MATRIX_SPLIT \
-        { 18, 18 }
-#endif
diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json
index cc233f35681..9627b9852f4 100644
--- a/keyboards/bastardkb/charybdis/3x5/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/info.json
@@ -5,6 +5,9 @@
         "pid": "0x1832",
         "vid": "0xA8F8"
     },
+    "rgb_matrix": {
+        "split_count": [18, 18]
+    },
     "layout_aliases": {
         "LAYOUT_charybdis_3x5": "LAYOUT"
     },
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
deleted file mode 100644
index d7b6d01bcea..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * 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 VIA_ENABLE
-/* Via configuration. */
-#    define DYNAMIC_KEYMAP_LAYER_COUNT 8
-#endif // VIA_ENABLE
-
-#ifndef __arm__
-/* Disable unused features. */
-#    define NO_ACTION_ONESHOT
-#endif // __arm__
-
-/**
- * Configure the global tapping term (default: 200ms).
- * If you have a lot of accidental mod activations, crank up the tapping term.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
- */
-#ifndef TAPPING_TERM
-#    define TAPPING_TERM 160
-#endif // TAPPING_TERM
-
-/**
- * Enable rapid switch from tap to hold.  Disable auto-repeat when pressing key
- * twice, except for one-shot keys.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
- */
-#define QUICK_TAP_TERM 0
-
-/*
- * Tap-or-Hold decision modes.
- *
- * Note that the following flags behave differently when combined (ie. when 2 or
- * more are enabled).
- *
- * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
- * decision modes.
- */
-
-/**
- * Faster tap-hold trigger.
- *
- * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
- * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
- */
-#define PERMISSIVE_HOLD
-
-/** Charybdis-specific features. */
-
-#ifdef POINTING_DEVICE_ENABLE
-// Automatically enable the pointer layer when moving the trackball.  See also:
-// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
-// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
-// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
-
-// Flip horizontal direction for drag-scroll.
-#    define CHARYBDIS_DRAGSCROLL_REVERSE_X
-// #define CHARYBDIS_DRAGSCROLL_REVERSE_Y
-#endif // POINTING_DEVICE_ENABLE
-
-/** RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-#    ifdef __arm__
-// Enable all animations on ARM boards since they have plenty of memory
-// available for it.
-#        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_TYPING_HEATMAP
-#        define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#        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
-#    else
-// Disable control of RGB matrix by keycodes (must use firmware implementation
-// to control the feature).
-#        define RGB_MATRIX_DISABLE_KEYCODES
-#    endif
-
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    undef RGB_MATRIX_DEFAULT_SPD
-#    define RGB_MATRIX_DEFAULT_SPD 32
-
-// Startup values.
-#    undef RGB_MATRIX_DEFAULT_HUE
-#    define RGB_MATRIX_DEFAULT_HUE 0
-#    undef RGB_MATRIX_DEFAULT_SAT
-#    define RGB_MATRIX_DEFAULT_SAT 255
-#    undef RGB_MATRIX_DEFAULT_VAL
-#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
deleted file mode 100644
index 21e823575e8..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * 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 charybdis_keymap_bstiq_layers {
-    LAYER_BASE = 0,
-    LAYER_MBO,
-    LAYER_MEDIA,
-    LAYER_NAV,
-    LAYER_MOUSE,
-    LAYER_SYM,
-    LAYER_NUM,
-    LAYER_FUN,
-};
-
-// Automatically enable sniping when the mouse layer is on.
-#define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_MOUSE
-
-#define BSP_NAV LT(LAYER_NAV, KC_BSPC)
-#define ENT_MBO LT(LAYER_MBO, KC_ENT)
-#define TAB_MED LT(LAYER_MEDIA, KC_TAB)
-#define ESC_SYM LT(LAYER_SYM, KC_ESC)
-#define SPC_NUM LT(LAYER_NUM, KC_SPC)
-#define MOUSE(KC) LT(LAYER_MOUSE, KC)
-
-#define USR_RDO KC_AGAIN
-#define USR_PST S(KC_INS)
-#define USR_CPY C(KC_INS)
-#define USR_CUT S(KC_DEL)
-#define USR_UND KC_UNDO
-
-#define MS_L KC_MS_LEFT
-#define MS_R KC_MS_RIGHT
-#define MS_D KC_MS_DOWN
-#define MS_U KC_MS_UP
-
-#define WH_L KC_MS_WH_LEFT
-#define WH_R KC_MS_WH_RIGHT
-#define WH_D KC_MS_WH_DOWN
-#define WH_U KC_MS_WH_UP
-
-// clang-format off
-/** Convenience macro. */
-#define _KC_LAYOUT_wrapper(                                                                             \
-         k00,      k01,      k02,      k03,      k04,      k05,      k06,      k07,      k08,      k09, \
-         k10,      k11,      k12,      k13,      k14,      k15,      k16,      k17,      k18,      k19, \
-         k20,      k21,      k22,      k23,      k24,      k25,      k26,      k27,      k28,      k29, \
-         ...)                                                                                           \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, \
-    __VA_ARGS__
-#define KC_LAYOUT_wrapper(...) _KC_LAYOUT_wrapper(__VA_ARGS__)
-
-/** Base layer with BÉPO layout. */
-#define LAYOUT_LAYER_BASE_BEPO KC_LAYOUT_wrapper(               \
-       B,    Z,    P,    O, QUOT,  DOT,    V,    D,    L,    J, \
-       A,    U,    I,    E, COMM,    C,    T,    S,    R,    N, \
-       W,    Y,    X, SLSH,    K,    M,    Q,    G,    H,    F, \
-       BSP_NAV, ENT_MBO, TAB_MED,    ESC_SYM, SPC_NUM)
-
-/** Convenience key shorthands. */
-#define U_NA KC_NO // Present but not available for use.
-#define U_NU KC_NO // Available but not used.
-
-/** Convenience row shorthands. */
-#define __________________RESET_L__________________ QK_BOOT,    U_NA,    U_NA,    U_NA,    U_NA
-#define __________________RESET_R__________________    U_NA,    U_NA,    U_NA,    U_NA, QK_BOOT
-#define ______________HOME_ROW_GASC_L______________ KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL,    U_NA
-#define ______________HOME_ROW_ALGR_L______________    U_NA, KC_ALGR,    U_NA,    U_NA,    U_NA
-#define ______________HOME_ROW_GASC_R______________    U_NA, KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI
-#define ______________HOME_ROW_ALGR_R______________    U_NA,    U_NA,    U_NA, KC_ALGR,    U_NA
-
-/** Layers. */
-
-// Buttons.
-#define LAYOUT_LAYER_MBO                                                                      \
-    __________________RESET_L__________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
-    ______________HOME_ROW_GASC_L______________, KC_CAPS, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
-    KC_BTN3, KC_ALGR, KC_BTN2, KC_BTN1,    U_NA,  KC_INS, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
-                         U_NA,    U_NA,    U_NA,  KC_ENT,  KC_DEL
-
-// Media.
-#define LAYOUT_LAYER_MEDIA                                                                    \
-    __________________RESET_L__________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
-    ______________HOME_ROW_GASC_L______________,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
-    ______________HOME_ROW_ALGR_L______________,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
-                         U_NA,    U_NA,    U_NA, KC_BTN1, KC_BTN3
-
-// Navigation.
-#define LAYOUT_LAYER_NAV                                                                      \
-    __________________RESET_L__________________, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, \
-    ______________HOME_ROW_GASC_L______________,    U_NU, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, \
-    ______________HOME_ROW_ALGR_L______________,    U_NU,    U_NU,    U_NU,    U_NU,    U_NU, \
-                         U_NA,    U_NA,    U_NA, KC_MSTP, KC_MPLY
-
-// Mouse.
-#define LAYOUT_LAYER_MOUSE                                                                    \
-    S_D_MOD, USR_PST, USR_CPY, USR_CUT, USR_UND, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
-    DPI_MOD, DRGSCRL, KC_LSFT, KC_LCTL, _______,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
-    USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
-                      KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN1, KC_BTN3
-
-// Symbols.
-#define LAYOUT_LAYER_SYM                                                                      \
-    KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, __________________RESET_R__________________, \
-    KC_COLN,  KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GASC_R______________, \
-    KC_TILD, KC_EXLM,   KC_AT, KC_HASH, KC_PIPE, ______________HOME_ROW_ALGR_R______________, \
-                      KC_LPRN, KC_RPRN, KC_UNDS,    U_NA,    U_NA
-
-// Numerals.
-#define LAYOUT_LAYER_NUM                                                                      \
-    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, __________________RESET_R__________________, \
-    KC_SCLN,    KC_4,    KC_5,    KC_6,  KC_EQL, ______________HOME_ROW_GASC_R______________, \
-     KC_GRV,    KC_1,    KC_2,    KC_3, KC_BSLS, ______________HOME_ROW_ALGR_R______________, \
-                       KC_DOT,    KC_0, KC_MINS,    U_NA,    U_NA
-
-// Function keys.
-#define LAYOUT_LAYER_FUN                                                                      \
-     KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, __________________RESET_R__________________, \
-     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SCRL, ______________HOME_ROW_GASC_R______________, \
-     KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\
-                       KC_APP,  KC_SPC,  KC_TAB,    U_NA,    U_NA
-
-/**
- * Add Home Row mod to a layout.
- *
- * Expects a 10-key per row layout.  Adds support for GASC (Gui, Alt, Shift, Ctl)
- * home row.  The layout passed in parameter must contain at least 20 keycodes.
- *
- * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
- *
- *     HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO)
- */
-#define _HOME_ROW_MOD_GASC(                                            \
-    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
-    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
-    ...)                                                               \
-             L00,         L01,         L02,         L03,         L04,  \
-             R05,         R06,         R07,         R08,         R09,  \
-      LGUI_T(L10), LALT_T(L11), LSFT_T(L12), LCTL_T(L13),        L14,  \
-             R15,  RCTL_T(R16), RSFT_T(R17), LALT_T(R18), RGUI_T(R19), \
-      __VA_ARGS__
-#define HOME_ROW_MOD_GASC(...) _HOME_ROW_MOD_GASC(__VA_ARGS__)
-
-/**
- * Add mouse layer keys to a layout.
- *
- * Expects a 10-key per row layout.  The layout passed in parameter must contain
- * at least 30 keycodes.
- *
- * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
- *
- *     MOUSE_MOD(LAYOUT_LAYER_BASE_BEPO)
- */
-#define _MOUSE_MOD(                                               \
-    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,             \
-    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,             \
-    L20, L21, L22, L23, L24, R25, R26, R27, R28, R29,             \
-    ...)                                                          \
-            L00,        L01,        L02,        L03,        L04,  \
-            R05,        R06,        R07,        R08,        R09,  \
-            L10,        L11,        L12,        L13,        L14,  \
-            R15,        R16,        R17,        R18,        R19,  \
-      MOUSE(L20),       L21,        L22,        L23,        L24,  \
-            R25,        R26,        R27,        R28,  MOUSE(R29), \
-      __VA_ARGS__
-#define MOUSE_MOD(...) _MOUSE_MOD(__VA_ARGS__)
-
-#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [LAYER_BASE] = LAYOUT_wrapper(
-    MOUSE_MOD(HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO))
-  ),
-  [LAYER_MBO] = LAYOUT_wrapper(LAYOUT_LAYER_MBO),
-  [LAYER_MEDIA] = LAYOUT_wrapper(LAYOUT_LAYER_MEDIA),
-  [LAYER_NAV] = LAYOUT_wrapper(LAYOUT_LAYER_NAV),
-  [LAYER_MOUSE] = LAYOUT_wrapper(LAYOUT_LAYER_MOUSE),
-  [LAYER_SYM] = LAYOUT_wrapper(LAYOUT_LAYER_SYM),
-  [LAYER_NUM] = LAYOUT_wrapper(LAYOUT_LAYER_NUM),
-  [LAYER_FUN] = LAYOUT_wrapper(LAYOUT_LAYER_FUN),
-};
-// clang-format on
-
-#if defined(POINTING_DEVICE_ENABLE) && defined(CHARYBDIS_AUTO_SNIPING_ON_LAYER)
-layer_state_t layer_state_set_kb(layer_state_t state) {
-    state = layer_state_set_user(state);
-    charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
-    return state;
-}
-#endif // POINTING_DEVICE_ENABLE && CHARYBDIS_AUTO_SNIPING_ON_LAYER
-
-#ifdef RGB_MATRIX_ENABLE
-// Forward-declare this helper function since it is defined in rgb_matrix.c.
-void rgb_matrix_update_pwm_buffers(void);
-#endif
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/readme.md b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/readme.md
deleted file mode 100644
index 5d9f7fcd5f3..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Charybdis (3x5) @bstiq keymap
-
-Inspired from Miryoku, using home-rows.
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/rules.mk
deleted file mode 100644
index 5d910646078..00000000000
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-ifeq ($(MCU),atmega32u4)
-	# Space saving settings.
-	TAP_DANCE_ENABLE = no
-	COMBO_ENABLE = no
-	QMK_SETTINGS = no
-else ifeq ($(MCU),STM32F411)
-	EEPROM_DRIVER = vendor
-endif
-
-VIA_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
index 6aa20712f67..50fc030402b 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
@@ -39,15 +39,14 @@
 
 /* SPI config for pmw3360 sensor. */
 #define SPI_DRIVER SPID1
-#define SPI_SCK_PIN B1
+#define SPI_SCK_PIN A5
 #define SPI_SCK_PAL_MODE 5
-#define SPI_MOSI_PIN B2
+#define SPI_MOSI_PIN A7
 #define SPI_MOSI_PAL_MODE 5
-#define SPI_MISO_PIN B3
+#define SPI_MISO_PIN A6
 #define SPI_MISO_PAL_MODE 5
 
 /* PMW3360 settings. */
-#define A1 PAL_LINE(GPIOA, 1)
 #define POINTING_DEVICE_CS_PIN A1
 #define PMW3360_CS_MODE 3
 #define PMW3360_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
index c119df524c3..af74a299be7 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -7,20 +7,19 @@
         "driver": "ws2812"
     },
     "ws2812": {
-        "pin": "D3",
+        "pin": "A2",
         "driver": "pwm"
     },
     "build": {
         "debounce_type": "asym_eager_defer_pk"
     },
     "matrix_pins": {
-        "cols": ["F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F7", "C6", "D4", "B5"]
+        "cols": ["B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B0", "B3", "A15", "B9"]
     },
     "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "A3"
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
+    "development_board": "stemcell"
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
index 4436426f303..4bd570ddd8c 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -1,5 +1,3 @@
-CONVERT_TO = stemcell
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index ba729aee3ec..1c952759a76 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -20,10 +20,3 @@
 
 /* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
-
-/* RGB settings. */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 42
-#    define RGB_MATRIX_SPLIT \
-        { 21, 21 }
-#endif
diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json
index 787e3bdf14c..3597e72534e 100644
--- a/keyboards/bastardkb/charybdis/3x6/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -3,10 +3,13 @@
     "usb": {
         "pid": "0x1834"
     },
+    "rgb_matrix": {
+        "split_count": [21, 21]
+    },
     "layout_aliases": {
         "LAYOUT_charybdis_3x6": "LAYOUT"
     },
-   "layouts": {
+    "layouts": {
         "LAYOUT": {
             "layout": [
                 {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
index 6aa20712f67..50fc030402b 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
@@ -39,15 +39,14 @@
 
 /* SPI config for pmw3360 sensor. */
 #define SPI_DRIVER SPID1
-#define SPI_SCK_PIN B1
+#define SPI_SCK_PIN A5
 #define SPI_SCK_PAL_MODE 5
-#define SPI_MOSI_PIN B2
+#define SPI_MOSI_PIN A7
 #define SPI_MOSI_PAL_MODE 5
-#define SPI_MISO_PIN B3
+#define SPI_MISO_PIN A6
 #define SPI_MISO_PAL_MODE 5
 
 /* PMW3360 settings. */
-#define A1 PAL_LINE(GPIOA, 1)
 #define POINTING_DEVICE_CS_PIN A1
 #define PMW3360_CS_MODE 3
 #define PMW3360_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index 85b66277cf2..4309fd5ee30 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -7,20 +7,19 @@
         "driver": "ws2812"
     },
     "ws2812": {
-        "pin": "D3",
+        "pin": "A2",
         "driver": "pwm"
     },
     "build": {
         "debounce_type": "asym_eager_defer_pk"
     },
     "matrix_pins": {
-        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F7", "C6", "D4", "B5"]
+        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B0", "B3", "A15", "B9"]
     },
     "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "A3"
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
+    "development_board": "stemcell"
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index 4436426f303..4bd570ddd8c 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -1,5 +1,3 @@
-CONVERT_TO = stemcell
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index 64b5158698b..1c952759a76 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -20,10 +20,3 @@
 
 /* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
-
-/* RGB settings. */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 58
-#    define RGB_MATRIX_SPLIT \
-        { 29, 29 }
-#endif
diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json
index 8259e961410..54bb564306e 100644
--- a/keyboards/bastardkb/charybdis/4x6/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/info.json
@@ -5,6 +5,9 @@
         "pid": "0x1833",
         "vid": "0xA8F8"
     },
+    "rgb_matrix": {
+        "split_count": [29, 29]
+    },
     "layout_aliases": {
         "LAYOUT_charybdis_4x6": "LAYOUT"
     },
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
index 6aa20712f67..50fc030402b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
@@ -39,15 +39,14 @@
 
 /* SPI config for pmw3360 sensor. */
 #define SPI_DRIVER SPID1
-#define SPI_SCK_PIN B1
+#define SPI_SCK_PIN A5
 #define SPI_SCK_PAL_MODE 5
-#define SPI_MOSI_PIN B2
+#define SPI_MOSI_PIN A7
 #define SPI_MOSI_PAL_MODE 5
-#define SPI_MISO_PIN B3
+#define SPI_MISO_PIN A6
 #define SPI_MISO_PAL_MODE 5
 
 /* PMW3360 settings. */
-#define A1 PAL_LINE(GPIOA, 1)
 #define POINTING_DEVICE_CS_PIN A1
 #define PMW3360_CS_MODE 3
 #define PMW3360_CS_DIVISOR 64
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index cfae56715f1..8060c758b88 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -7,20 +7,19 @@
         "driver": "ws2812"
     },
     "ws2812": {
-        "pin": "D3",
+        "pin": "A2",
         "driver": "pwm"
     },
     "build": {
         "debounce_type": "asym_eager_defer_pk"
     },
     "matrix_pins": {
-        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F4", "F7", "C6", "D4", "B5"]
+        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B10", "B0", "B3", "A15", "B9"]
     },
     "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "A3"
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
+    "development_board": "stemcell"
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
index 4436426f303..4bd570ddd8c 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
@@ -1,5 +1,3 @@
-CONVERT_TO = stemcell
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h
index 2cd4394da0d..32ab7b0ebbf 100644
--- a/keyboards/bastardkb/charybdis/config.h
+++ b/keyboards/bastardkb/charybdis/config.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-
 /* Pointing device configuration. */
 
 // Enable use of pointing device on slave split.
@@ -35,21 +34,6 @@
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
-
-// Startup values.
-#    define RGB_MATRIX_DEFAULT_VAL 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_DEFAULT_SPD 32
-
 #    ifndef __arm__
 // Disable control of RGB matrix by keycodes (must use firmware implementation
 // to control the feature).
diff --git a/keyboards/bastardkb/charybdis/info.json b/keyboards/bastardkb/charybdis/info.json
new file mode 100644
index 00000000000..6a4ed7c9f76
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/info.json
@@ -0,0 +1,19 @@
+{
+    "rgb_matrix": {
+        "animations": {
+            "cycle_left_right": true
+        },
+        "default": {
+            "speed": 32,
+            "val": 64
+        },
+        "sleep": true
+    },
+    "split": {
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
deleted file mode 100644
index 8d8baa5c321..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * 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 VIA_ENABLE
-/* Via configuration. */
-#    define DYNAMIC_KEYMAP_LAYER_COUNT 8
-#endif // VIA_ENABLE
-
-/**
- * Configure the global tapping term (default: 200ms).
- * If you have a lot of accidental mod activations, crank up the tapping term.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
- */
-#ifndef TAPPING_TERM
-#    define TAPPING_TERM 160
-#endif // TAPPING_TERM
-
-// disable trackpad taps
-// #define CIRQUE_PINNACLE_TAPPING_TERM 0
-
-/**
- * Enable rapid switch from tap to hold.  Disable auto-repeat when pressing key
- * twice, except for one-shot keys.
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
- */
-#define QUICK_TAP_TERM 0
-
-/*
- * Tap-or-Hold decision modes.
- *
- * Note that the following flags behave differently when combined (ie. when 2 or
- * more are enabled).
- *
- * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
- * decision modes.
- */
-
-/**
- * Faster tap-hold trigger.
- *
- * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
- * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
- */
-#define PERMISSIVE_HOLD
-
-/** Dilemma-specific features. */
-
-#ifdef POINTING_DEVICE_ENABLE
-// Flip horizontal direction for drag-scroll.
-#    define DILEMMA_DRAGSCROLL_REVERSE_X
-// #define DILEMMA_DRAGSCROLL_REVERSE_Y
-#endif // POINTING_DEVICE_ENABLE
-
-/** RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-// Enable all animations on ARM boards since they have plenty of memory
-// available for it.
-#    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_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    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
-
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_DEFAULT_SPD 32
-
-// Startup values.
-#    define RGB_MATRIX_DEFAULT_HUE 0
-#    define RGB_MATRIX_DEFAULT_SAT 255
-#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/keymap.c
deleted file mode 100644
index 5f22184928d..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/keymap.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * 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 bstiq_layers {
-    LAYER_BASE = 0,
-    LAYER_MBO,
-    LAYER_MEDIA,
-    LAYER_NAV,
-    LAYER_MOUSE,
-    LAYER_SYM,
-    LAYER_NUM,
-    LAYER_FUN,
-};
-
-// Automatically enable sniping when the mouse layer is on.
-#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_MOUSE
-
-#define BSP_NAV LT(LAYER_NAV, KC_BSPC)
-#define ENT_MBO LT(LAYER_MBO, KC_ENT)
-#define TAB_MED LT(LAYER_MEDIA, KC_TAB)
-#define ESC_SYM LT(LAYER_SYM, KC_ESC)
-#define SPC_NUM LT(LAYER_NUM, KC_SPC)
-#define SPC_MBO LT(LAYER_MBO, KC_SPC)
-#define MOUSE(KC) LT(LAYER_MOUSE, KC)
-
-#define USR_RDO KC_AGAIN
-#define USR_PST S(KC_INS)
-#define USR_CPY C(KC_INS)
-#define USR_CUT S(KC_DEL)
-#define USR_UND KC_UNDO
-
-#define MS_L KC_MS_LEFT
-#define MS_R KC_MS_RIGHT
-#define MS_D KC_MS_DOWN
-#define MS_U KC_MS_UP
-
-#define WH_L KC_MS_WH_LEFT
-#define WH_R KC_MS_WH_RIGHT
-#define WH_D KC_MS_WH_DOWN
-#define WH_U KC_MS_WH_UP
-
-// clang-format off
-/** Convenience macro. */
-#define _KC_LAYOUT_wrapper(                                                                             \
-         k00,      k01,      k02,      k03,      k04,      k05,      k06,      k07,      k08,      k09, \
-         k10,      k11,      k12,      k13,      k14,      k15,      k16,      k17,      k18,      k19, \
-         k20,      k21,      k22,      k23,      k24,      k25,      k26,      k27,      k28,      k29, \
-         ...)                                                                                           \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, \
-    __VA_ARGS__
-#define KC_LAYOUT_wrapper(...) _KC_LAYOUT_wrapper(__VA_ARGS__)
-
-/** Base layer with BÉPO layout. */
-#define LAYOUT_LAYER_BASE_BEPO KC_LAYOUT_wrapper(               \
-       B,    W,    P,    O, QUOT,  DOT,    V,    D,    L,    J, \
-       A,    U,    I,    E, COMM,    C,    T,    S,    R,    N, \
-       Z,    Y,    X, SLSH,    K,    M,    Q,    G,    H,    F, \
-                SPC_MBO, TAB_MED,    ESC_SYM, SPC_NUM)
-
-/** Convenience key shorthands. */
-#define U_NA KC_NO // Present but not available for use.
-#define U_NU KC_NO // Available but not used.
-
-/** Convenience row shorthands. */
-#define ________________HOME_ROW_NA________________    U_NA,    U_NA,    U_NA,    U_NA,    U_NA
-#define ______________HOME_ROW_GASC_L______________ KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL,    U_NA
-#define ______________HOME_ROW_ALGR_L______________    U_NA, KC_ALGR,    U_NA,    U_NA,    U_NA
-#define ______________HOME_ROW_GASC_R______________    U_NA, KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI
-#define ______________HOME_ROW_ALGR_R______________    U_NA,    U_NA,    U_NA, KC_ALGR,    U_NA
-
-/** Layers. */
-
-// Buttons.
-#define LAYOUT_LAYER_MBO                                                                      \
-    ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
-    ______________HOME_ROW_GASC_L______________, KC_BSPC, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
-    KC_BTN3, KC_ALGR, KC_BTN2, KC_BTN1,    U_NA,  KC_DEL, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
-                                  U_NA,    U_NA,  KC_ENT,  KC_ENT
-
-// Media.
-#define LAYOUT_LAYER_MEDIA                                                                    \
-    ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
-    ______________HOME_ROW_GASC_L______________,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
-    ______________HOME_ROW_ALGR_L______________,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
-                                  U_NA,    U_NA, KC_BTN1, KC_BTN3
-
-// Navigation.
-#define LAYOUT_LAYER_NAV                                                                      \
-    ________________HOME_ROW_NA________________, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, \
-    ______________HOME_ROW_GASC_L______________,    U_NU, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, \
-    ______________HOME_ROW_ALGR_L______________,    U_NU,    U_NU,    U_NU,    U_NU,    U_NU, \
-                                  U_NA,    U_NA, KC_MSTP, KC_MPLY
-
-// Mouse.
-#define LAYOUT_LAYER_MOUSE                                                                    \
-    S_D_MOD, USR_PST, USR_CPY, USR_CUT, USR_UND, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
-    DPI_MOD, DRGSCRL, KC_LSFT, DRGSCRL, _______,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
-    USR_RDO, USR_PST, USR_CPY, KC_BTN3, USR_UND,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
-                               KC_BTN1, KC_BTN2, KC_BTN1, KC_BTN3
-
-// Symbols.
-#define LAYOUT_LAYER_SYM                                                                      \
-    KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, ________________HOME_ROW_NA________________, \
-    KC_COLN,  KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GASC_R______________, \
-    KC_TILD, KC_EXLM,   KC_AT, KC_HASH, KC_MINS, ______________HOME_ROW_ALGR_R______________, \
-                               KC_RPRN, KC_LPRN,    U_NA,    U_NA
-
-// Numerals.
-#define LAYOUT_LAYER_NUM                                                                      \
-    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, ________________HOME_ROW_NA________________, \
-    KC_SCLN,    KC_4,    KC_5,    KC_6,  KC_EQL, ______________HOME_ROW_GASC_R______________, \
-     KC_GRV,    KC_1,    KC_2,    KC_3, KC_UNDS, ______________HOME_ROW_ALGR_R______________, \
-                                  KC_0, KC_MINS,    U_NA,    U_NA
-
-// Function keys.
-#define LAYOUT_LAYER_FUN                                                                      \
-     KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, ________________HOME_ROW_NA________________, \
-     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SCRL, ______________HOME_ROW_GASC_R______________, \
-     KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\
-                                KC_APP,  KC_TAB,    U_NA,    U_NA
-
-/**
- * Add Home Row mod to a layout.
- *
- * Expects a 10-key per row layout.  Adds support for GASC (Gui, Alt, Shift, Ctl)
- * home row.  The layout passed in parameter must contain at least 20 keycodes.
- *
- * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
- *
- *     HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO)
- */
-#define _HOME_ROW_MOD_GASC(                                            \
-    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
-    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
-    ...)                                                               \
-             L00,         L01,         L02,         L03,         L04,  \
-             R05,         R06,         R07,         R08,         R09,  \
-      LGUI_T(L10), LALT_T(L11), LSFT_T(L12), LCTL_T(L13),        L14,  \
-             R15,  RCTL_T(R16), RSFT_T(R17), LALT_T(R18), RGUI_T(R19), \
-      __VA_ARGS__
-#define HOME_ROW_MOD_GASC(...) _HOME_ROW_MOD_GASC(__VA_ARGS__)
-
-/**
- * Add mouse layer keys to a layout.
- *
- * Expects a 10-key per row layout.  The layout passed in parameter must contain
- * at least 30 keycodes.
- *
- * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
- *
- *     MOUSE_MOD(LAYOUT_LAYER_BASE_BEPO)
- */
-#define _MOUSE_MOD(                                               \
-    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,             \
-    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,             \
-    L20, L21, L22, L23, L24, R25, R26, R27, R28, R29,             \
-    ...)                                                          \
-            L00,        L01,        L02,        L03,        L04,  \
-            R05,        R06,        R07,        R08,        R09,  \
-            L10,        L11,        L12,        L13,        L14,  \
-            R15,        R16,        R17,        R18,        R19,  \
-            L20, MOUSE(L21),        L22,        L23,        L24,  \
-            R25,        R26,        R27,        R28,  MOUSE(R29), \
-      __VA_ARGS__
-#define MOUSE_MOD(...) _MOUSE_MOD(__VA_ARGS__)
-
-#define LAYOUT_wrapper(...) LAYOUT_split_3x5_2(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [LAYER_BASE] = LAYOUT_wrapper(
-    MOUSE_MOD(HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO))
-  ),
-  [LAYER_MBO] = LAYOUT_wrapper(LAYOUT_LAYER_MBO),
-  [LAYER_MEDIA] = LAYOUT_wrapper(LAYOUT_LAYER_MEDIA),
-  [LAYER_NAV] = LAYOUT_wrapper(LAYOUT_LAYER_NAV),
-  [LAYER_MOUSE] = LAYOUT_wrapper(LAYOUT_LAYER_MOUSE),
-  [LAYER_SYM] = LAYOUT_wrapper(LAYOUT_LAYER_SYM),
-  [LAYER_NUM] = LAYOUT_wrapper(LAYOUT_LAYER_NUM),
-  [LAYER_FUN] = LAYOUT_wrapper(LAYOUT_LAYER_FUN),
-};
-// clang-format on
-
-#if defined(POINTING_DEVICE_ENABLE) && defined(DILEMMA_AUTO_SNIPING_ON_LAYER)
-layer_state_t layer_state_set_kb(layer_state_t state) {
-    state = layer_state_set_user(state);
-    dilemma_set_pointer_sniping_enabled(layer_state_cmp(state, DILEMMA_AUTO_SNIPING_ON_LAYER));
-    return state;
-}
-#endif // POINTING_DEVICE_ENABLE && DILEMMA_AUTO_SNIPING_ON_LAYER
-
-#ifdef RGB_MATRIX_ENABLE
-// Forward-declare this helper function since it is defined in rgb_matrix.c.
-void rgb_matrix_update_pwm_buffers(void);
-#endif
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/readme.md b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/readme.md
deleted file mode 100644
index df1f43cbcb3..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dilemma @bstiq keymap
-
-Inspired from Miryoku, using home-rows.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
index b9787f473ee..0a5ba151814 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
@@ -2,6 +2,7 @@
  * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ * Copyright 2023 casuanoob <casuanoob@hotmail.com> (@casuanoob)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Publicw License as published by
@@ -19,65 +20,74 @@
 
 #include "quantum.h"
 
-/**
- * LEDs index.
- *
- * ╭────────────────────╮                 ╭────────────────────╮
- *    2   3   8   9  12                     30  27  26  21  20
- * ├────────────────────┤                 ├────────────────────┤
- *    1   4   7  10  13                     31  28  25  22  19
- * ├────────────────────┤                 ├────────────────────┤
- *    0   5   6  11  14                     32  29  24  23  18
- * ╰────────────────────╯                 ╰────────────────────╯
- *                   15  16  17     35  34  33
- *                 ╰────────────╯ ╰────────────╯
- */
-// clang-format off
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    switch (index) {
+        case 0: // Left-half encoder, mouse scroll.
+            tap_code(clockwise ? KC_MS_WH_UP : KC_MS_WH_DOWN);
+            break;
+        case 1: // Right-half encoder, volume control.
+            tap_code(clockwise ? KC_AUDIO_VOL_UP : KC_AUDIO_VOL_DOWN);
+            break;
+    }
+    return true;
+}
+#endif // ENCODER_ENABLE
+
 #ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    /* Key Matrix to LED index. */
-    // Left split.
-    {      2,      3,      8,      9,     12 }, // Top row
-    {      1,      4,      7,     10,     13 }, // Middle row
-    {      0,      5,      6,     11,     14 }, // Bottom row
-    {     17, NO_LED,     15,     16, NO_LED }, // Thumb cluster
-    // Right split.
-    {     20,     21,     26,     27,     30 }, // Top row
-    {     19,     22,     25,     28,     31 }, // Middle row
-    {     18,     23,     24,     29,     32 }, // Bottom row
-    {     35, NO_LED,     33,     34, NO_LED }, // Thumb cluster
-}, {
-    /* LED index to physical position. */
-    // Left split.
-    /* index=0  */ {   0,  42 }, {   0,  21 }, {   0,   0 }, // col 1 (left most)
-    /* index=3  */ {  18,   0 }, {  18,  21 }, {  18,  42 }, // col 2
-    /* index=6  */ {  36,  42 }, {  36,  21 }, {  36,   0 },
-    /* index=9  */ {  54,   0 }, {  54,  21 }, {  54,  42 },
-    /* index=12 */ {  72,   0 }, {  72,  21 }, {  72,  42 },
-    /* index=15 */ {  72,  64 }, {  90,  64 }, { 108,  64 }, // Thumb cluster
-    // Right split.
-    /* index=18 */ { 224,  42 }, { 224,  21 }, { 224,   0 }, // col 10 (right most)
-    /* index=21 */ { 206,   0 }, { 206,  21 }, { 206,  42 }, // col 9
-    /* index=24 */ { 188,  42 }, { 188,  21 }, { 188,   0 },
-    /* index=27 */ { 170,   0 }, { 170,  21 }, { 170,  42 },
-    /* index=30 */ { 152,   0 }, { 152,  21 }, { 152,  42 },
-    /* index=33 */ { 152,  64 }, { 134,  64 }, { 116,  64 }, // Thumb cluster
-}, {
-    /* LED index to flag. */
-    // Left split.
-    /* index=0  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 1
-    /* index=3  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 2
-    /* index=6  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-    /* index=9  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-    /* index=12 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-    /* index=15 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster
-    // Right split.
-    /* index=18 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 10
-    /* index=21 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 9
-    /* index=24 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-    /* index=27 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-    /* index=30 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-    /* index=33 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster
-} };
-#endif
-// clang-format on
+// Layer state indicator
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { return false; }
+    if (host_keyboard_led_state().caps_lock) {
+        for (int i = led_min; i <= led_max; i++) {
+            if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
+                rgb_matrix_set_color(i, MIN(rgb_matrix_get_val() + 76, 255), 0x00, 0x00);
+            }
+        }
+    }
+
+    uint8_t layer = get_highest_layer(layer_state);
+    if (layer > 0) {
+        HSV hsv = rgb_matrix_get_hsv();
+        switch (get_highest_layer(layer_state)) {
+            case 1:
+                hsv = (HSV){HSV_BLUE};
+                break;
+            case 2:
+                hsv = (HSV){HSV_AZURE};
+                break;
+            case 3:
+                hsv = (HSV){HSV_ORANGE};
+                break;
+            case 4:
+                hsv = (HSV){HSV_GREEN};
+                break;
+            case 5:
+                hsv = (HSV){HSV_TEAL};
+                break;
+            case 6:
+                hsv = (HSV){HSV_PURPLE};
+                break;
+            case 7:
+            default:
+                hsv = (HSV){HSV_RED};
+                break;
+        };
+
+        if (hsv.v > rgb_matrix_get_val()) {
+            hsv.v = MIN(rgb_matrix_get_val() + 22, 255);
+        }
+        RGB rgb = hsv_to_rgb(hsv);
+
+        for (uint8_t i = led_min; i < led_max; i++) {
+            if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
+                rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+            }
+        }
+    }
+    return false;
+};
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index d25bb075284..7276c6181fa 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -1,5 +1,6 @@
 /**
  * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ * Copyright 2023 casuanoob <casuanoob@hotmail.com> (@casuanoob)
  *
  * 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
@@ -21,32 +22,23 @@
 #define SPLIT_HAND_PIN GP29
 #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
 
+/* VBUS detection. */
+#define USB_VBUS_PIN GP19
+
 /* CRC. */
 #define CRC8_USE_TABLE
 #define CRC8_OPTIMIZE_SPEED
 
 /* Cirque trackpad over SPI. */
+#define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP22
 #define SPI_MOSI_PIN GP23
 #define SPI_MISO_PIN GP20
 #define POINTING_DEVICE_CS_PIN GP21
-
-/* OLED over i2c. */
-#define I2C1_CLOCK_SPEED 400000
-#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9
-#define OLED_DISPLAY_HEIGHT 128
+#undef CIRQUE_PINNACLE_DIAMETER_MM
+#define CIRQUE_PINNACLE_DIAMETER_MM 40
 
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
-
-/* RGB matrix support. */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 36
-#    define RGB_MATRIX_SPLIT { 18, 18 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
-#endif
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
diff --git a/keyboards/bastardkb/dilemma/3x5_3/halconf.h b/keyboards/bastardkb/dilemma/3x5_3/halconf.h
index b79b0f9e886..57d15376d63 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/halconf.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index 4ab43d6a8e8..2da4f1785e2 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -2,28 +2,195 @@
     "keyboard_name": "Dilemma (3x5+3) Assembled",
     "usb": {
         "device_version": "2.0.0",
-        "pid": "0x1835"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
+        "pid": "0x1836"
     },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
     "matrix_pins": {
         "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
         "rows": ["GP4", "GP5", "GP27", "GP26"]
     },
     "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "GP1"
+        "enabled": true,
+        "soft_serial_pin": "GP1",
+        "bootmagic": {
+            "matrix": [4, 0]
+        },
+        "transport":{
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
+    "encoder": {
+        "enabled" : true,
+        "rotary" : [
+            {"pin_a": "GP25", "pin_b": "GP24"}
+        ]
     },
-    "rgblight": {
-        "split_count": [18, 18]
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "caps_word": true,
+        "tri_layer": true
     },
     "ws2812": {
-        "pin": "GP0",
+        "pin": "GP10",
         "driver": "vendor"
     },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [36, 36],
+        "max_brightness": 176,
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "speed": 32,
+            "val": 128
+        },
+        "layout": [
+            {"x": 82, "y": 0, "flags": 2},
+            {"x": 60, "y": 0, "flags": 2},
+            {"x": 22, "y": 0, "flags": 2},
+            {"x": 15, "y": 0, "flags": 2},
+
+            {"x": 0, "y": 25, "flags": 2},
+            {"x": 0, "y": 40, "flags": 2},
+            {"x": 0, "y": 55, "flags": 2},
+
+            {"x": 15, "y": 45, "flags": 2},
+            {"x": 30, "y": 45, "flags": 2},
+            {"x": 35, "y": 60, "flags": 2},
+            {"x": 55, "y": 62, "flags": 2},
+
+            {"x": 72, "y": 64, "flags": 2},
+            {"x": 90, "y": 64, "flags": 2},
+            {"x": 98, "y": 47, "flags": 2},
+            {"x": 107, "y": 40, "flags": 2},
+
+            {"x": 110, "y": 33, "flags": 2},
+            {"x": 110, "y": 19, "flags": 2},
+            {"x": 110, "y": 5, "flags": 2},
+
+            {"matrix": [0, 4], "x": 73, "y": 11, "flags": 4},
+            {"matrix": [0, 3], "x": 56, "y": 9, "flags": 4},
+            {"matrix": [0, 2], "x": 39, "y": 5, "flags": 4},
+            {"matrix": [0, 1], "x": 22, "y": 10, "flags": 4},
+            {"matrix": [0, 0], "x": 5, "y": 15, "flags": 1},
+
+            {"matrix": [1, 0], "x": 5, "y": 30, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 25, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 20, "flags": 4},
+            {"matrix": [1, 3], "x": 56, "y": 24, "flags": 4},
+            {"matrix": [1, 4], "x": 73, "y": 26, "flags": 4},
+
+            {"matrix": [2, 4], "x": 73, "y": 41, "flags": 4},
+            {"matrix": [2, 3], "x": 56, "y": 39, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 35, "flags": 4},
+            {"matrix": [2, 1], "x": 22, "y": 40, "flags": 4},
+            {"matrix": [2, 0], "x": 5, "y": 45, "flags": 1},
+
+            {"matrix": [3, 2], "x": 45, "y": 51, "flags": 4},
+            {"matrix": [3, 0], "x": 64, "y": 53, "flags": 4},
+            {"matrix": [3, 1], "x": 81, "y": 60, "flags": 4},
+
+            {"x": 142, "y": 0, "flags": 2},
+            {"x": 164, "y": 0, "flags": 2},
+            {"x": 202, "y": 0, "flags": 2},
+            {"x": 209, "y": 0, "flags": 2},
+
+            {"x": 224, "y": 25, "flags": 2},
+            {"x": 224, "y": 40, "flags": 2},
+            {"x": 224, "y": 55, "flags": 2},
+
+            {"x": 209, "y": 45, "flags": 2},
+            {"x": 194, "y": 45, "flags": 2},
+            {"x": 189, "y": 60, "flags": 2},
+            {"x": 169, "y": 62, "flags": 2},
+
+            {"x": 152, "y": 64, "flags": 2},
+            {"x": 134, "y": 64, "flags": 2},
+            {"x": 126, "y": 47, "flags": 2},
+            {"x": 117, "y": 40, "flags": 2},
+
+            {"x": 114, "y": 33, "flags": 2},
+            {"x": 114, "y": 19, "flags": 2},
+            {"x": 114, "y": 5, "flags": 2},
+
+            {"matrix": [4, 4], "x": 151, "y": 11, "flags": 4},
+            {"matrix": [4, 3], "x": 168, "y": 9, "flags": 4},
+            {"matrix": [4, 2], "x": 185, "y": 5, "flags": 4},
+            {"matrix": [4, 1], "x": 202, "y": 10, "flags": 4},
+            {"matrix": [4, 0], "x": 219, "y": 15, "flags": 1},
+
+            {"matrix": [5, 0], "x": 219, "y": 30, "flags": 1},
+            {"matrix": [5, 1], "x": 202, "y": 25, "flags": 4},
+            {"matrix": [5, 2], "x": 185, "y": 20, "flags": 4},
+            {"matrix": [5, 3], "x": 168, "y": 24, "flags": 4},
+            {"matrix": [5, 4], "x": 151, "y": 26, "flags": 4},
+
+            {"matrix": [6, 4], "x": 151, "y": 41, "flags": 4},
+            {"matrix": [6, 3], "x": 168, "y": 39, "flags": 4},
+            {"matrix": [6, 2], "x": 185, "y": 35, "flags": 4},
+            {"matrix": [6, 1], "x": 202, "y": 40, "flags": 4},
+            {"matrix": [6, 0], "x": 219, "y": 45, "flags": 1},
+
+            {"matrix": [7, 2], "x": 179, "y": 51, "flags": 4},
+            {"matrix": [7, 0], "x": 160, "y": 53, "flags": 4},
+            {"matrix": [7, 1], "x": 143, "y": 60, "flags": 4}
+        ],
+        "sleep": true
+    },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
deleted file mode 100644
index cfdafc4a512..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * 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 VIA_ENABLE
-/* Via configuration. */
-#    define DYNAMIC_KEYMAP_LAYER_COUNT 8
-#endif // VIA_ENABLE
-
-/**
- * Configure the global tapping term (default: 200ms).
- * If you have a lot of accidental mod activations, crank up the tapping term.
- */
-#ifndef TAPPING_TERM
-#    define TAPPING_TERM 160
-#endif // TAPPING_TERM
-
-// disable trackpad taps
-// #define CIRQUE_PINNACLE_TAPPING_TERM 0
-
-/**
- * Enable rapid switch from tap to hold.  Disable auto-repeat when pressing key
- * twice, except for one-shot keys.
- */
-#define QUICK_TAP_TERM 0
-
-/*
- * Tap-or-Hold decision modes.
- *
- * Note that the following flags behave differently when combined (ie. when 2 or
- * more are enabled).
- *
- * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
- * decision modes.
- */
-
-/**
- * Faster tap-hold trigger.
- *
- * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
- * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
- *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
- */
-#define PERMISSIVE_HOLD
-
-/** Dilemma-specific features. */
-
-#ifdef POINTING_DEVICE_ENABLE
-// Flip horizontal direction for drag-scroll.
-#    define DILEMMA_DRAGSCROLL_REVERSE_X
-// #define DILEMMA_DRAGSCROLL_REVERSE_Y
-#endif // POINTING_DEVICE_ENABLE
-
-/** RGB Matrix. */
-
-#ifdef RGB_MATRIX_ENABLE
-// Enable all animations on ARM boards since they have plenty of memory
-// available for it.
-#    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_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    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
-
-// Limit maximum brightness to keep power consumption reasonable, and avoid
-// disconnects.
-#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_DEFAULT_SPD 32
-
-// Startup values.
-#    define RGB_MATRIX_DEFAULT_HUE 0
-#    define RGB_MATRIX_DEFAULT_SAT 255
-#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c
deleted file mode 100644
index b55d99b56b7..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * 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 bstiq_layers {
-    LAYER_BASE = 0,
-    LAYER_MBO,
-    LAYER_MEDIA,
-    LAYER_NAV,
-    LAYER_MOUSE,
-    LAYER_SYM,
-    LAYER_NUM,
-    LAYER_FUN,
-};
-
-// Automatically enable sniping when the mouse layer is on.
-#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_MOUSE
-
-#define BSP_NAV LT(LAYER_NAV, KC_BSPC)
-#define ENT_MBO LT(LAYER_MBO, KC_ENT)
-#define TAB_MED LT(LAYER_MEDIA, KC_TAB)
-#define ESC_SYM LT(LAYER_SYM, KC_ESC)
-#define SPC_NUM LT(LAYER_NUM, KC_SPC)
-#define SPC_MBO LT(LAYER_MBO, KC_SPC)
-#define MOUSE(KC) LT(LAYER_MOUSE, KC)
-
-#define USR_RDO KC_AGAIN
-#define USR_PST S(KC_INS)
-#define USR_CPY C(KC_INS)
-#define USR_CUT S(KC_DEL)
-#define USR_UND KC_UNDO
-
-#define MS_L KC_MS_LEFT
-#define MS_R KC_MS_RIGHT
-#define MS_D KC_MS_DOWN
-#define MS_U KC_MS_UP
-
-#define WH_L KC_MS_WH_LEFT
-#define WH_R KC_MS_WH_RIGHT
-#define WH_D KC_MS_WH_DOWN
-#define WH_U KC_MS_WH_UP
-
-// clang-format off
-/** Convenience macro. */
-#define _KC_LAYOUT_wrapper(                                                                             \
-         k00,      k01,      k02,      k03,      k04,      k05,      k06,      k07,      k08,      k09, \
-         k10,      k11,      k12,      k13,      k14,      k15,      k16,      k17,      k18,      k19, \
-         k20,      k21,      k22,      k23,      k24,      k25,      k26,      k27,      k28,      k29, \
-         ...)                                                                                           \
-    KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, \
-    KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, \
-    KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, \
-    __VA_ARGS__
-#define KC_LAYOUT_wrapper(...) _KC_LAYOUT_wrapper(__VA_ARGS__)
-
-/** Base layer with BÉPO layout. */
-#define LAYOUT_LAYER_BASE_BEPO KC_LAYOUT_wrapper(               \
-       B,    W,    P,    O, QUOT,  DOT,    V,    D,    L,    J, \
-       A,    U,    I,    E, COMM,    C,    T,    S,    R,    N, \
-       Z,    Y,    X, SLSH,    K,    M,    Q,    G,    H,    F, \
-          KC_A, SPC_MBO, TAB_MED, ESC_SYM, SPC_NUM, KC_A)
-
-/** Convenience key shorthands. */
-#define U_NA KC_NO // Present but not available for use.
-#define U_NU KC_NO // Available but not used.
-
-/** Convenience row shorthands. */
-#define ________________HOME_ROW_NA________________    U_NA,    U_NA,    U_NA,    U_NA,    U_NA
-#define ______________HOME_ROW_GASC_L______________ KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL,    U_NA
-#define ______________HOME_ROW_ALGR_L______________    U_NA, KC_ALGR,    U_NA,    U_NA,    U_NA
-#define ______________HOME_ROW_GASC_R______________    U_NA, KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI
-#define ______________HOME_ROW_ALGR_R______________    U_NA,    U_NA,    U_NA, KC_ALGR,    U_NA
-
-/** Layers. */
-
-// Buttons.
-#define LAYOUT_LAYER_MBO                                                                      \
-    ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
-    ______________HOME_ROW_GASC_L______________, KC_BSPC, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
-    KC_BTN3, KC_ALGR, KC_BTN2, KC_BTN1,    U_NA,  KC_DEL, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
-                         U_NA,    U_NA,    U_NA,  KC_ENT,  KC_ENT,  KC_ENT
-
-// Media.
-#define LAYOUT_LAYER_MEDIA                                                                    \
-    ________________HOME_ROW_NA________________, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
-    ______________HOME_ROW_GASC_L______________,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
-    ______________HOME_ROW_ALGR_L______________,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
-                        U_NA,     U_NA,    U_NA, KC_BTN1, KC_BTN3, KC_BTN2
-
-// Navigation.
-#define LAYOUT_LAYER_NAV                                                                      \
-    ________________HOME_ROW_NA________________, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, \
-    ______________HOME_ROW_GASC_L______________,    U_NU, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, \
-    ______________HOME_ROW_ALGR_L______________,    U_NU,    U_NU,    U_NU,    U_NU,    U_NU, \
-                        U_NA,     U_NA,    U_NA, KC_MSTP, KC_MPLY,    U_NA
-
-// Mouse.
-#define LAYOUT_LAYER_MOUSE                                                                    \
-    S_D_MOD, USR_PST, USR_CPY, USR_CUT, USR_UND, USR_RDO, USR_PST, USR_CPY, USR_CUT, USR_UND, \
-    DPI_MOD, DRGSCRL, KC_LSFT, DRGSCRL, _______,    U_NU,    MS_L,    MS_D,    MS_U,    MS_R, \
-    USR_RDO, USR_PST, USR_CPY, KC_BTN3, USR_UND,    U_NU,    WH_L,    WH_D,    WH_U,    WH_R, \
-                      KC_BTN3, KC_BTN1, KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN2
-
-// Symbols.
-#define LAYOUT_LAYER_SYM                                                                      \
-    KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, ________________HOME_ROW_NA________________, \
-    KC_COLN,  KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GASC_R______________, \
-    KC_TILD, KC_EXLM,   KC_AT, KC_HASH, KC_MINS, ______________HOME_ROW_ALGR_R______________, \
-                         U_NA, KC_RPRN, KC_LPRN,    U_NA,    U_NA,    U_NA
-
-// Numerals.
-#define LAYOUT_LAYER_NUM                                                                      \
-    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, ________________HOME_ROW_NA________________, \
-    KC_SCLN,    KC_4,    KC_5,    KC_6,  KC_EQL, ______________HOME_ROW_GASC_R______________, \
-     KC_GRV,    KC_1,    KC_2,    KC_3, KC_UNDS, ______________HOME_ROW_ALGR_R______________, \
-                         U_NA,    KC_0, KC_MINS,    U_NA,    U_NA,    U_NA
-
-// Function keys.
-#define LAYOUT_LAYER_FUN                                                                      \
-     KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, ________________HOME_ROW_NA________________, \
-     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SCRL, ______________HOME_ROW_GASC_R______________, \
-     KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\
-                         U_NA,  KC_APP,  KC_TAB,    U_NA,    U_NA,    U_NA
-
-/**
- * Add Home Row mod to a layout.
- *
- * Expects a 10-key per row layout.  Adds support for GASC (Gui, Alt, Shift, Ctl)
- * home row.  The layout passed in parameter must contain at least 20 keycodes.
- *
- * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
- *
- *     HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO)
- */
-#define _HOME_ROW_MOD_GASC(                                            \
-    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
-    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
-    ...)                                                               \
-             L00,         L01,         L02,         L03,         L04,  \
-             R05,         R06,         R07,         R08,         R09,  \
-      LGUI_T(L10), LALT_T(L11), LSFT_T(L12), LCTL_T(L13),        L14,  \
-             R15,  RCTL_T(R16), RSFT_T(R17), LALT_T(R18), RGUI_T(R19), \
-      __VA_ARGS__
-#define HOME_ROW_MOD_GASC(...) _HOME_ROW_MOD_GASC(__VA_ARGS__)
-
-/**
- * Add mouse layer keys to a layout.
- *
- * Expects a 10-key per row layout.  The layout passed in parameter must contain
- * at least 30 keycodes.
- *
- * This is meant to be used with `LAYOUT_LAYER_BASE_BEPO` defined above, eg.:
- *
- *     MOUSE_MOD(LAYOUT_LAYER_BASE_BEPO)
- */
-#define _MOUSE_MOD(                                               \
-    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,             \
-    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,             \
-    L20, L21, L22, L23, L24, R25, R26, R27, R28, R29,             \
-    ...)                                                          \
-            L00,        L01,        L02,        L03,        L04,  \
-            R05,        R06,        R07,        R08,        R09,  \
-            L10,        L11,        L12,        L13,        L14,  \
-            R15,        R16,        R17,        R18,        R19,  \
-            L20, MOUSE(L21),        L22,        L23,        L24,  \
-            R25,        R26,        R27,        R28,  MOUSE(R29), \
-      __VA_ARGS__
-#define MOUSE_MOD(...) _MOUSE_MOD(__VA_ARGS__)
-
-#define LAYOUT_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [LAYER_BASE] = LAYOUT_wrapper(
-    MOUSE_MOD(HOME_ROW_MOD_GASC(LAYOUT_LAYER_BASE_BEPO))
-  ),
-  [LAYER_MBO] = LAYOUT_wrapper(LAYOUT_LAYER_MBO),
-  [LAYER_MEDIA] = LAYOUT_wrapper(LAYOUT_LAYER_MEDIA),
-  [LAYER_NAV] = LAYOUT_wrapper(LAYOUT_LAYER_NAV),
-  [LAYER_MOUSE] = LAYOUT_wrapper(LAYOUT_LAYER_MOUSE),
-  [LAYER_SYM] = LAYOUT_wrapper(LAYOUT_LAYER_SYM),
-  [LAYER_NUM] = LAYOUT_wrapper(LAYOUT_LAYER_NUM),
-  [LAYER_FUN] = LAYOUT_wrapper(LAYOUT_LAYER_FUN),
-};
-// clang-format on
-
-#if defined(POINTING_DEVICE_ENABLE) && defined(DILEMMA_AUTO_SNIPING_ON_LAYER)
-layer_state_t layer_state_set_user(layer_state_t state) {
-    dilemma_set_pointer_sniping_enabled(layer_state_cmp(state, DILEMMA_AUTO_SNIPING_ON_LAYER));
-    return state;
-}
-#endif // POINTING_DEVICE_ENABLE && DILEMMA_AUTO_SNIPING_ON_LAYER
-
-#ifdef RGB_MATRIX_ENABLE
-// Forward-declare this helper function since it is defined in rgb_matrix.c.
-void rgb_matrix_update_pwm_buffers(void);
-#endif
-
-bool shutdown_user(bool jump_to_bootloader) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_enable_noeeprom();
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_setrgb_red();
-#endif // RGBLIGHT_ENABLE
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_set_color_all(RGB_RED);
-    rgb_matrix_update_pwm_buffers();
-#endif // RGB_MATRIX_ENABLE
-    return true;
-}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/readme.md b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/readme.md
deleted file mode 100644
index df1f43cbcb3..00000000000
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dilemma @bstiq keymap
-
-Inspired from Miryoku, using home-rows.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
index 30fef9bbeb0..4185bba7d99 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ enum dilemma_keymap_layers {
     LAYER_NUM,
 };
 
-#define NAV MO(LAYER_NAV)
-#define SYM MO(LAYER_SYM)
+#define NAV QK_TRI_LAYER_LOWER
+#define SYM QK_TRI_LAYER_UPPER
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -33,11 +33,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,
+          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L, KC_QUOT,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
-                            KC_A,     NAV, CW_TOGG,     KC_SPC,     SYM,    KC_A
+                         KC_LCTL,     NAV, KC_LGUI,     KC_SPC,     SYM,    KC_A
   //                   ╰───────────────────────────╯ ╰──────────────────────────╯
   ),
 
@@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
         KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,    XXXXXXX, KC_HOME,   KC_UP,  KC_END,  KC_DEL,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-       KC_LSFT, KC_LCTL, KC_LALT, KC_RGUI, KC_VOLD,    XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
+       KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_VOLD,    XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-       QK_BOOT, EE_CLR,  KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT,
+       QK_BOOT,  EE_CLR, KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
-                            KC_A, _______, KC_LSFT,     KC_SPC, _______,    KC_A
+                         XXXXXXX, _______, KC_LSFT,     KC_SPC, _______, KC_ESC
   //                   ╰───────────────────────────╯ ╰──────────────────────────╯
   ),
 
@@ -59,9 +59,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
        KC_MINS, KC_ASTR,  KC_EQL, KC_UNDS,  KC_DLR,    KC_HASH, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT,
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
-       KC_PLUS, KC_PIPE,   KC_AT, KC_SLSH, KC_PERC,    _______, KC_BSLS, KC_AMPR, KC_QUES, KC_EXLM,
+       KC_PLUS, KC_PIPE,   KC_AT, KC_SLSH, KC_PERC,    KC_SCLN, KC_BSLS, KC_AMPR, KC_QUES, KC_EXLM,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
-                            KC_A, _______, KC_LSFT,     KC_SPC, _______,    KC_A
+                          KC_ESC, _______, KC_LSFT,     KC_SPC, _______, XXXXXXX
   //                   ╰───────────────────────────╯ ╰──────────────────────────╯
   ),
 
@@ -73,12 +73,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,
   // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
-                            KC_A, _______, KC_LSFT,     KC_SPC, _______,    KC_A
+                         XXXXXXX, _______, KC_LSFT,     KC_SPC, _______, XXXXXXX
   //                   ╰───────────────────────────╯ ╰──────────────────────────╯
   ),
 };
 // clang-format on
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, LAYER_NAV, LAYER_SYM, LAYER_NUM);
-}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h
new file mode 100644
index 00000000000..790d6bf751d
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ * Copyright 2023 casuanoob <casuanoob@hotmail.com> (@casuanoob)
+ *
+ * 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 8
+
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c
new file mode 100644
index 00000000000..dacef2231ef
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c
@@ -0,0 +1,170 @@
+/**
+ * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
+ * Copyright 2023 casuanoob <casuanoob@hotmail.com> (@casuanoob)
+ *
+ * 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 dilemma_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_FUNCTION,
+    LAYER_NAVIGATION,
+    LAYER_MEDIA,
+    LAYER_POINTER,
+    LAYER_NUMERAL,
+    LAYER_SYMBOLS,
+};
+
+// Automatically enable sniping-mode on the pointer layer.
+// #define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+
+#define ESC_MED LT(LAYER_MEDIA, KC_ESC)
+#define SPC_NAV LT(LAYER_NAVIGATION, KC_SPC)
+#define TAB_FUN LT(LAYER_FUNCTION, KC_TAB)
+#define ENT_SYM LT(LAYER_SYMBOLS, KC_ENT)
+#define BSP_NUM LT(LAYER_NUMERAL, KC_BSPC)
+#define PT_Z LT(LAYER_POINTER, KC_Z)
+#define PT_SLSH LT(LAYER_POINTER, KC_SLSH)
+
+#ifndef POINTING_DEVICE_ENABLE
+#    define DRGSCRL KC_NO
+#    define DPI_MOD KC_NO
+#    define S_D_MOD KC_NO
+#    define SNIPING KC_NO
+#endif // !POINTING_DEVICE_ENABLE
+
+// clang-format off
+/** \brief QWERTY layout (3 rows, 10 columns). */
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_split_3x5_3(
+       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+       LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, RSFT_T(KC_J), RCTL_T(KC_K), RALT_T(KC_L), RGUI_T(KC_QUOT),
+       PT_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, PT_SLSH,
+                      ESC_MED, TAB_FUN, SPC_NAV, ENT_SYM, BSP_NUM, KC_MUTE
+  ),
+
+/*
+ * Layers used on the Dilemma.
+ *
+ * These layers started off heavily inspired by the Miryoku layout, but trimmed
+ * down and tailored for a stock experience that is meant to be fundation for
+ * further personalization.
+ *
+ * See https://github.com/manna-harbour/miryoku for the original layout.
+ */
+
+/**
+ * \brief Function layer.
+ *
+ * Secondary right-hand layer has function keys mirroring the numerals on the
+ * primary layer with extras on the pinkie column, plus system keys on the inner
+ * column. App is on the tertiary thumb key and other thumb keys are duplicated
+ * from the base layer to enable auto-repeat.
+ */
+  [LAYER_FUNCTION] = LAYOUT_split_3x5_3(
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR,   KC_F7,   KC_F8,   KC_F9,  KC_F12,
+    KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_SCRL,   KC_F4,   KC_F5,   KC_F6,  KC_F11,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAUS,   KC_F1,   KC_F2,   KC_F3,  KC_F10,
+                      XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+  ),
+
+/**
+ * \brief Navigation layer.
+ *
+ * Primary right-hand layer (left home thumb) is navigation and editing. Cursor
+ * keys are on the home position, line and page movement below, clipboard above,
+ * caps lock and insert on the inner column. Thumb keys are duplicated from the
+ * base layer to avoid having to layer change mid edit and to enable auto-repeat.
+ */
+  [LAYER_NAVIGATION] = LAYOUT_split_3x5_3(
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_INS, KC_HOME, KC_PGDN, KC_PGUP,  KC_END,
+                      XXXXXXX, XXXXXXX, _______,  KC_ENT, KC_BSPC, KC_DEL
+  ),
+
+/**
+ * \brief Media layer.
+ *
+ * Tertiary left- and right-hand layer is media and RGB control.  This layer is
+ * symmetrical to accomodate the left- and right-hand trackball.
+ */
+  [LAYER_MEDIA] = LAYOUT_split_3x5_3(
+    XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX,
+    KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                      _______, KC_MPLY, KC_MSTP, KC_MSTP, KC_MPLY, KC_MUTE
+  ),
+
+/** \brief Mouse emulation and pointer functions. */
+  [LAYER_POINTER] = LAYOUT_split_3x5_3(
+    QK_BOOT,  EE_CLR, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX,  EE_CLR, QK_BOOT,
+    KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
+    _______, DRGSCRL, SNIPING, KC_BTN3, XXXXXXX, XXXXXXX, KC_BTN3, SNIPING, DRGSCRL, _______,
+                      KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, KC_BTN3
+  ),
+
+/**
+ * \brief Numeral layout.
+ *
+ * Primary left-hand layer (right home thumb) is numerals and symbols. Numerals
+ * are in the standard numpad locations with symbols in the remaining positions.
+ * `KC_DOT` is duplicated from the base layer.
+ */
+  [LAYER_NUMERAL] = LAYOUT_split_3x5_3(
+    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_SCLN,    KC_4,    KC_5,    KC_6,  KC_EQL, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
+     KC_DOT,    KC_1,    KC_2,    KC_3, KC_BSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                       KC_DOT, KC_MINS,    KC_0, XXXXXXX, _______, XXXXXXX
+  ),
+
+/**
+ * \brief Symbols layer.
+ *
+ * Secondary left-hand layer has shifted symbols in the same locations to reduce
+ * chording when using mods with shifted symbols. `KC_LPRN` is duplicated next to
+ * `KC_RPRN`.
+ */
+  [LAYER_SYMBOLS] = LAYOUT_split_3x5_3(
+    KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_COLN,  KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
+    KC_TILD, KC_EXLM,   KC_AT, KC_HASH, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                      KC_LPRN,  KC_GRV, KC_UNDS, _______, XXXXXXX, XXXXXXX
+  ),
+};
+// clang-format on
+
+#ifdef POINTING_DEVICE_ENABLE
+#    ifdef DILEMMA_AUTO_SNIPING_ON_LAYER
+layer_state_t layer_state_set_user(layer_state_t state) {
+    dilemma_set_pointer_sniping_enabled(layer_state_cmp(state, DILEMMA_AUTO_SNIPING_ON_LAYER));
+    return state;
+}
+#    endif // DILEMMA_AUTO_SNIPING_ON_LAYER
+#endif     // POINTING_DEVICE_ENABLE
+
+#ifdef ENCODER_MAP_ENABLE
+// clang-format off
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [LAYER_BASE]       = {ENCODER_CCW_CW(KC_WH_D, KC_WH_U),  ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [LAYER_FUNCTION]   = {ENCODER_CCW_CW(KC_DOWN, KC_UP),    ENCODER_CCW_CW(KC_LEFT, KC_RGHT)},
+    [LAYER_NAVIGATION] = {ENCODER_CCW_CW(KC_PGDN, KC_PGUP),  ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [LAYER_POINTER]    = {ENCODER_CCW_CW(RGB_HUD, RGB_HUI),  ENCODER_CCW_CW(RGB_SAD, RGB_SAI)},
+    [LAYER_NUMERAL]    = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI),  ENCODER_CCW_CW(RGB_SPD, RGB_SPI)},
+    [LAYER_SYMBOLS]    = {ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_LEFT, KC_RGHT)},
+};
+// clang-format on
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md
new file mode 100644
index 00000000000..4552f0948dc
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md
@@ -0,0 +1,47 @@
+# Dilemma `via` keymap
+
+The Dilemma `via` keymap is based on a QWERTY layout with [home row mods](https://precondition.github.io/home-row-mods) and [Miryoku-inspired layers](https://github.com/manna-harbour/miryoku), and some features and changes specific to the Dilemma.
+
+This layout also supports VIA.
+
+## Customizing the keymap
+
+### Dynamic DPI scaling
+
+Use the following keycodes to change the default DPI:
+
+-   `POINTER_DEFAULT_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_DEFAULT_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 16 possible values for the sniping mode DPI. See the [Dilemma documentation](../../README.md) for more information.
+
+Use the following keycodes to change the sniping mode DPI:
+
+-   `POINTER_SNIPING_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_SNIPING_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 4 possible values for the sniping mode DPI. See the [Dilemma documentation](../../README.md) for more information.
+
+### Drag-scroll
+
+Use the `DRAGSCROLL_MODE` keycode to enable drag-scroll on hold. Use the `DRAGSCROLL_TOGGLE` keycode to enable/disable drag-scroll on key press.
+
+### Circular scroll
+
+By default, the firmware is configured to enable the circular scroll feature on Cirque trackpad.
+
+To disable this, add the following to your keymap:
+
+```c
+#undef POINTING_DEVICE_GESTURES_SCROLL_ENABLE
+```
+
+### Sniping
+
+Use the `SNIPING_MODE` keycode to enable sniping mode on hold. Use the `SNIPING_TOGGLE` keycode to enable/disable sniping mode on key press.
+
+Change the value of `DILEMMA_AUTO_SNIPING_ON_LAYER` to automatically enable sniping mode on layer change. By default, sniping mode is enabled on the pointer layer:
+
+```c
+#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+```
\ No newline at end of file
diff --git a/keyboards/lw75/keymaps/via/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lw75/keymaps/via/rules.mk
rename to keyboards/bastardkb/dilemma/3x5_3/keymaps/via/rules.mk
diff --git a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
index f194dd225ce..52b726a56d5 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
@@ -19,8 +19,5 @@
 
 #include_next <mcuconf.h>
 
-#undef RP_SPI_USE_SPI1
-#define RP_SPI_USE_SPI1 TRUE
-
-#undef RP_I2C_USE_I2C1
-#define RP_I2C_USE_I2C1 TRUE
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/readme.md b/keyboards/bastardkb/dilemma/3x5_3/readme.md
index bfddbc9efc3..b57df90921c 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/readme.md
+++ b/keyboards/bastardkb/dilemma/3x5_3/readme.md
@@ -1,5 +1,5 @@
-# Next generation Dilemma keyboard
+# Dilemma v2 (3x5+3 assembled)
 
 This keyboard is an updated version of the [3x5+2 Dilemma](../3x5_2/).
 
-This is still under active development, and not available publicly yet.
+The Dilemma v2 is available at [bastardkb.com](https://bastardkb.com).
diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
index 3cdb41160c2..4923c2c84a5 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
@@ -1,24 +1,4 @@
-# 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
-
-AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-
 SERIAL_DRIVER = vendor
 
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h
index 9c76cb76f9e..549965444d4 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/config.h
+++ b/keyboards/bastardkb/dilemma/4x6_4/config.h
@@ -44,11 +44,4 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
 /* RGB matrix support. */
-#define SPLIT_TRANSPORT_MIRROR
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// Startup values.
-#define RGB_MATRIX_DEFAULT_VAL 64
-#define RGB_MATRIX_DEFAULT_SPD 32
+#define SPLIT_TRANSPORT_MIRROR
\ No newline at end of file
diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/info.json
index ba07a7fccf2..cc8c30b5105 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/info.json
+++ b/keyboards/bastardkb/dilemma/4x6_4/info.json
@@ -17,6 +17,11 @@
         "soft_serial_pin": "GP1",
         "bootmagic": {
             "matrix": [5, 0]
+        },
+        "transport":{
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "encoder": {
@@ -46,7 +51,6 @@
         "max_brightness": 176,
         "center_point": [112, 28],
         "animations": {
-            "solid_color": true,
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
@@ -91,6 +95,10 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
+        "default": {
+            "speed": 32,
+            "val": 128
+        },
         "layout": [
             {"x": 81, "y": 4, "flags": 2},
             {"x": 65, "y": 2, "flags": 2},
@@ -199,7 +207,8 @@
             {"matrix": [9, 2], "x": 156, "y": 53, "flags": 4},
             {"matrix": [9, 1], "x": 143, "y": 57, "flags": 4},
             {"matrix": [9, 3], "x": 132, "y": 64, "flags": 4}
-        ]
+        ],
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h
index d282c635eab..0da85ec99ad 100644
--- a/keyboards/bastardkb/dilemma/config.h
+++ b/keyboards/bastardkb/dilemma/config.h
@@ -26,6 +26,9 @@
 // Pointing device is on the right split.
 #define POINTING_DEVICE_RIGHT
 
+// Enables support for extended i16 mouse reports (instead of i8).
+#define MOUSE_EXTENDED_REPORT
+
 // Limits the frequency that the sensor is polled for motion.
 #define POINTING_DEVICE_TASK_THROTTLE_MS 10
 
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
deleted file mode 100644
index ec538f8a55b..00000000000
--- a/keyboards/bastardkb/scylla/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * 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
-
-/* RGB matrix support. */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 58
-#    define RGB_MATRIX_SPLIT { 29, 29 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 24a0262beeb..6508c15b5af 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -3,10 +3,22 @@
     "usb": {
         "pid": "0x1829"
     },
+    "rgb_matrix": {
+        "max_brightness": 50,
+        "sleep": true,
+        "split_count": [29, 29]
+    },
     "rgblight": {
         "led_count": 58,
         "split_count": [29, 29]
     },
+    "split": {
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [
diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h b/keyboards/bastardkb/scylla/keymaps/cykedev/config.h
deleted file mode 100644
index 6119f2738b6..00000000000
--- a/keyboards/bastardkb/scylla/keymaps/cykedev/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2021 Christian Eiden, cykedev
-//
-// 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 MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-
-#define TAPPING_TERM 200
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-// #define QUICK_TAP_TERM 0
-
-// Apply the modifier on keys that are tapped during a short hold of a modtap
-// #define PERMISSIVE_HOLD
-
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-
-#define FORCE_NKRO
diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c b/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
deleted file mode 100644
index a51f5b9d386..00000000000
--- a/keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2021 Christian Eiden, cykedev
-//
-// 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 CM_SPAL  LGUI_T(KC_SPC)
-#define CM_SPAR  RGUI_T(KC_SPC)
-
-#define SH_ENL  LSFT_T(KC_ENT)
-#define SH_ENR  RSFT_T(KC_ENT)
-
-#define RAISE   MO(_RAISE)
-#define LOWER   MO(_LOWER)
-
-#define QWERT   DF(_QWERTY)
-#define COLEM   DF(_COLEMAK_DH)
-
-enum layer_names {
-  _COLEMAK_DH,
-  _QWERTY,
-  _RAISE,
-  _LOWER,
-  _ADJUST
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_COLEMAK_DH] = LAYOUT_split_4x6_5(
-  /* COLEMAK_DH
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * | Esc  |   1  |   2  |   3  |   4  |   5  |                                  |   6  |   7  |   8  |   9  |   0  |  Bsp |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   F  |   P  |   B  |                                  |   J  |   L  |   U  |   Y  |   ;  |  \   |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Del  |   A  |   R  |   S  |   T  |   G  |                                  |   M  |   N  |   E  |   I  |   O  |  '   |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Shft |   Z  |   X  |   C  |   D  |   V  |                                  |   K  |   H  |   ,  |   .  |   /  | Shft |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *                                  / RAISE /---------------.    .---------------\ LOWER \
-   *                                 /       /  Cmd  / Shift /      \ Shift \  Cmd  \       \
-   *                                '-------/ Space / Enter /        \ Enter \ Space \-------'
-   *                                       /---------------/          \---------------\
-   *                                      /  Alt  / Ctrl  /            \  Ctrl \  Alt  \
-   *                                     /       /       /              \       \       \
-   *                                    '---------------'                '---------------'
-   */
-   KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSPC,
-   KC_TAB , KC_Q   , KC_W   , KC_F   , KC_P   , KC_B   ,                                     KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSLS,
-   KC_DEL , KC_A   , KC_R   , KC_S   , KC_T   , KC_G   ,                                     KC_M   , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT,
-   KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_D   , KC_V   ,                                     KC_K   , KC_H   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
-                                                RAISE  , CM_SPAL, SH_ENL , SH_ENR , CM_SPAR, LOWER  ,
-                                                         KC_LALT, KC_LCTL, KC_RCTL, KC_RALT
-   ),
-  [_QWERTY] = LAYOUT_split_4x6_5(
-  /* QWERTY
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * | Esc  |   1  |   2  |   3  |   4  |   5  |                                  |   6  |   7  |   8  |   9  |   0  |  Bsp |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |                                  |   Y  |   U  |   I  |   O  |   P  |  \   |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Del  |   A  |   S  |   D  |   F  |   G  |                                  |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Shft |   Z  |   X  |   C  |   V  |   B  |                                  |   N  |   M  |   ,  |   .  |   /  | Shft |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *                                  / RAISE /---------------.    .---------------\ LOWER \
-   *                                 /       /  Cmd  / Shift /      \ Shift \  Cmd  \       \
-   *                                '-------/ Space / Enter /        \ Enter \ Space \-------'
-   *                                       /---------------/          \---------------\
-   *                                      /  Alt  / Ctrl  /            \  Ctrl \  Alt  \
-   *                                     /       /       /              \       \       \
-   *                                    '---------------'                '---------------'
-   */
-   KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , 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_BSLS,
-   KC_DEL , 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_LSFT,
-                                                RAISE  , CM_SPAL, SH_ENL , SH_ENR , CM_SPAR, LOWER  ,
-                                                         KC_LALT, KC_LCTL, KC_RCTL, KC_RALT
-   ),
-   [_RAISE] = LAYOUT_split_4x6_5(
-  /* RAISE
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                                  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |   [  |   ]  |      |                                  |   $  |   /  |  *   |  #   |   ~  |  F12 |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |  Ins |  !   |  @   |   (  |   )  |      |                                  |   %  |   -  |  +   |  =   |  ?   |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |   {  |   }  |      |                                  |   ^  |   &  |  |   |      |      |      |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *                                  /       /---------------.    .---------------\       \
-   *                                 /       /       /       /      \       \       \       \
-   *                                '-------/       /       /        \       \       \-------'
-   *                                       /---------------/          \---------------\
-   *                                      /       /       /            \       \       \
-   *                                     /       /       /              \       \       \
-   *                                    '---------------'                '---------------'
-   */
-   XXXXXXX, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                                     KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-   XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX,                                     KC_DLR , KC_SLSH, KC_ASTR, KC_HASH, KC_TILD, KC_F12 ,
-   KC_INS , KC_EXLM, KC_AT  , KC_LPRN, KC_RPRN, XXXXXXX,                                     KC_PERC, KC_MINS, KC_PPLS, KC_PEQL, KC_QUES, XXXXXXX,
-   XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX,                                     KC_CIRC, KC_AMPR, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX,
-                                                _______, _______, _______, _______, _______, _______,
-                                                         _______, _______, _______, _______
-   ),
-  [_LOWER] = LAYOUT_split_4x6_5(
-  /* LOWER
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                                  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |   [  |   ]  |  +   |                                  |      |      |  up  |      |      |  F12 |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |  Ins |  !   |  @   |   (  |   )  |  -   |                                  |      | left | down | rght |  ?   |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |   {  |   }  |  =   |                                  |      |      |      |      |      |      |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *                                  /       /---------------.    .---------------\       \
-   *                                 /       /       /       /      \       \       \       \
-   *                                '-------/       /       /        \       \       \-------'
-   *                                       /---------------/          \---------------\
-   *                                      /       /       /            \       \       \
-   *                                     /       /       /              \       \       \
-   *                                    '---------------'                '---------------'
-   */
-   XXXXXXX, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                                     KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-   XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_PPLS,                                     XXXXXXX, XXXXXXX, KC_UP  , XXXXXXX, XXXXXXX, KC_F12 ,
-   KC_INS , KC_EXLM, KC_AT  , KC_LPRN, KC_RPRN, KC_MINS,                                     XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUES, XXXXXXX,
-   XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_PEQL,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                                _______, _______, _______, _______, _______, _______,
-                                                         _______, _______, _______, _______
-   ),
-  [_ADJUST] = LAYOUT_split_4x6_5(
-  /* ADJUST
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * |      |      |      |      |      | QWERT|                                  |COLEM |      |      |      |      |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |      |      |  V+  |                                  |  B + |      |      |      |      |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |      |      |  V-  |                                  |  B - |  <<  | play |  >>  |      |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |      |      | Mute |                                  |      |      |      |      |      |      |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *                                  /       /---------------.    .---------------\       \
-   *                                 /       /       /       /      \       \       \       \
-   *                                '-------/       /       /        \       \       \-------'
-   *                                       /---------------/          \---------------\
-   *                                      /       /       /            \       \       \
-   *                                     /       /       /              \       \       \
-   *                                    '---------------'                '---------------'
-   */
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERT  ,                                     COLEM  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,                                     KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,                                     KC_BRID, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                                         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-   )
-};
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-  if (keycode == CM_SPAR) {
-    return false;
-  } else if (QK_MOD_TAP <= keycode && keycode <= QK_MOD_TAP_MAX) {
-    return true; 
-  } else {
-    return false;
-  }
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-// Flexible macOS-friendly Grave Escape
-// https://docs.qmk.fm/#/feature_key_overrides?id=flexible-macos-friendly-grave-escape
-
-const key_override_t tilde_esc_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, S(KC_GRAVE));
-const key_override_t grave_esc_override = ko_make_basic(MOD_MASK_GUI, KC_ESC, KC_GRAVE);
-const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DELETE);
-
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &tilde_esc_override,
-    &grave_esc_override,
-    &delete_key_override,
-    NULL
-};
diff --git a/keyboards/bastardkb/scylla/keymaps/cykedev/rules.mk b/keyboards/bastardkb/scylla/keymaps/cykedev/rules.mk
deleted file mode 100644
index 1ef732910bf..00000000000
--- a/keyboards/bastardkb/scylla/keymaps/cykedev/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE     = no      # Mouse keys
-NKRO_ENABLE         = yes     # USB Nkey Rollover
-RGB_MATRIX_ENABLE   = no      # Enable keyboard RGB matrix
-KEY_OVERRIDE_ENABLE = yes     # Enable Key Overrides, see https://docs.qmk.fm/#/feature_key_overrides
diff --git a/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c b/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
deleted file mode 100644
index c5f563c90ba..00000000000
--- a/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2021 Joschua Gandert
- *
- * 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_german.h"
-
-
-enum layer_names {
-    _BASE,
-    _GAME, /* WASD shifted right once  */
-    _LOWER,
-    _RAISE,
-    _ADJUST /* when both LOWER and RAISE pressed */
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_split_4x6_5(
-    KC_ESC , KC_1  ,  KC_2  ,  KC_3  , KC_4  , KC_5  ,              KC_6  , KC_7  , KC_8   , KC_9  , KC_0   , DE_SS  ,
-    KC_TAB , KC_Q  ,  KC_W  ,  KC_E  , KC_R  , KC_T  ,              DE_Z  , KC_U  , KC_I   , KC_O  , KC_P   , DE_UDIA,
-    KC_LSFT, KC_A  ,  KC_S  ,  KC_D  , KC_F  , KC_G  ,              KC_H  , KC_J  , KC_K   , KC_L  , DE_ODIA, DE_ADIA,
-    KC_LCTL, DE_Y  ,  KC_X  ,  KC_C  , KC_V  , KC_B  ,              KC_N  , KC_M  , KC_COMM, KC_DOT, DE_MINS, DE_PLUS,
-
-                                  RAISE,  KC_SPC,   KC_LCTL,    KC_RALT,  KC_BSPC,  LOWER,
-                                          KC_ENT,   KC_LALT,    KC_LGUI,  KC_RSFT
-  ),
-
-  [_GAME] = LAYOUT_split_4x6_5(
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    KC_T   , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   ,           _______, _______, KC_UP,   _______, _______, _______,
-    KC_G   , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   ,           _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-    KC_B   , KC_LCTL, DE_Y   , KC_X   , KC_C   , KC_V   ,           _______, _______, _______, _______, _______, _______,
-
-                                  _______, _______, _______,    _______, _______, _______,
-                                           _______, _______,    _______, _______
-  ),
-
-  [_LOWER] = LAYOUT_split_4x6_5(
-    KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,           KC_CIRC, KC_AMPR, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL     ,
-    _______, DE_HASH, DE_CIRC, KC_PGUP, DE_LABK, _______,           _______, KC_P7  , KC_P8  , KC_P9  , KC_PPLS, KC_BSPC    ,
-    _______, DE_ACUT, KC_HOME, KC_PGDN, KC_END , KC_LPRN,           KC_RPRN, KC_P4  , KC_P5  , KC_P6  , KC_PDOT, _______    ,
-    _______, KC_PLUS, KC_PIPE, KC_UNDS, _______, _______,           KC_P0  , KC_P1  , KC_P2  , KC_P3  , KC_PENT, KC_KP_EQUAL,
-
-                                  _______, KC_RGHT, _______,    _______, _______, _______,
-                                           KC_LEFT, _______,    QK_BOOT, _______
-  ),
-
-  [_RAISE] = LAYOUT_split_4x6_5(
-    KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NUM  ,  KC_CALC, KC_PSCR   , KC_MUTE,
-    _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
-    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SCRL   , KC_VOLD,
-
-                                  _______, _______, _______,    _______, KC_UP  , _______,
-                                           _______, _______,    _______, KC_DOWN
-  ),
-
-  [_ADJUST] = LAYOUT_split_4x6_5(
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, QK_BOOT, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, DF(_GAME),         _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, DF(_BASE),         _______, _______, _______, _______, _______, _______,
-
-                                   _______, _______, _______,    _______, _______, _______,
-                                            _______, _______,    _______, _______
-  ),
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/bastardkb/scylla/keymaps/german_gaming/readme.md b/keyboards/bastardkb/scylla/keymaps/german_gaming/readme.md
deleted file mode 100644
index 14de01ac415..00000000000
--- a/keyboards/bastardkb/scylla/keymaps/german_gaming/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-![German Gaming Layout Image](https://i.imgur.com/0y938rGh.png)
-
-Despite being less accurate, the columns in the image are shifted up and down to avoid the [Hermann grid illusion](https://en.wikipedia.org/wiki/Grid_illusion).
-​
-
-# German Gaming Layout
-​
-This layout was build with gaming in mind for a german user. As a result I added a "game" layer that shifts the keys of the left side (below the number row) one to the right, so that <kbd>WASD</kbd> is on the <kbd>ESDF</kbd> keys. The reason this layer was added is that using <kbd>WASD</kbd> is less comfortable with a contoured Dactyl-style keyboard, where each column is adjusted for the respective fingers. <kbd>ESDF</kbd> also has the upside of allowing one to stay in the home row. Note that the rightmost column of the default layer, so <kbd>TGB</kbd>, ends up in the leftmost position.
-
-Of course, one could just be forced to reconfigure every game, but that wouldn't be very user-friendly and likely reduce satisfaction with the layout. When in game mode, the right side of keys also features arrow keys on <kbd>IJKL</kbd>.
-
-
-## Raise and Lower layer
-
-Additionally, via the RAISE layer, it's always possible to access the arrow keys, which are often used in game menues. On the exact same position one can access <kbd>Home</kbd>, <kbd>End</kbd>, <kbd>Page Down</kbd> and <kbd>Page Up</kbd> via the LOWER layer. The left side of the LOWER layer also contains the few characters that would usually have their own key in a traditional german keyboard.
-
-The right side features various media keys in the RAISE layer, and a numpad in the LOWER layer.
-
-
-## Firmware
-
-The keyboard can be put into Reset mode (for flashing a keymap) by pressing <kbd>**LOWER**</kbd> + <kbd>Super</kbd> (also known as Windows key), or by pressing <kbd>**LOWER**</kbd> + <kbd>**RAISE**</kbd> + <kbd>R</kbd>.
-
-`MOUSEKEY_ENABLE` was set to `no` for this keymap, since it wasn't used and the size of the firmware ended up being too large.
diff --git a/keyboards/bastardkb/scylla/keymaps/german_gaming/rules.mk b/keyboards/bastardkb/scylla/keymaps/german_gaming/rules.mk
deleted file mode 100644
index 0a5b666e855..00000000000
--- a/keyboards/bastardkb/scylla/keymaps/german_gaming/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
deleted file mode 100644
index 4fa185e9564..00000000000
--- a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 300
-#define PERMISSIVE_HOLD
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 300
\ No newline at end of file
diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c b/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c
deleted file mode 100644
index 2fb26dbf6f4..00000000000
--- a/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* 
- * Copyright 2021 Ian Sterling <xyverz on Github.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 { _WINDOWS, _MAC, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { WINDOWS = SAFE_RANGE, MAC, ADJUST };
-
-// Aliases to keep the keymap tidy
-#define GUIBSPC GUI_T(KC_BSPC)  // GUI when held, BSPC when tapped.
-#define RGB_SWR RGB_M_SW        // Swirl Animation alias
-#define RGB_SNK RGB_M_SN        // Snake Animation alias
-#define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook!
-#define WINLOCK LGUI(KC_L)      // Lock my PC!
-#define DELGUI GUI_T(KC_DEL)
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-
-#define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook!
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_WINDOWS] = LAYOUT_split_4x6_5(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,        KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,        KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,        KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                             LOWER,   KC_BSPC, KC_DEL,      KC_ENT,  KC_SPC,  RAISE,
-                                      KC_LCTL, KC_LALT,     KC_RGUI, KC_RCTL
-  ),
-
-[_MAC] = LAYOUT_split_4x6_5(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,        KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,        KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,        KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                             LOWER,   KC_BSPC, DELGUI,      KC_ENT,  KC_SPC,  RAISE,
-                                      KC_LCTL, KC_LALT,     KC_RGUI, KC_RCTL
-  ),
-
-[_LOWER] = LAYOUT_split_4x6_5(
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
-  KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-                             _______, KC_DEL,  _______,     _______, _______, _______,
-                                      MACLOCK, _______,     _______, WINLOCK
-  ),
-
-[_RAISE] = LAYOUT_split_4x6_5(
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, QK_BOOT,
-  KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-                             _______, KC_DEL,  _______,     _______, _______, _______,
-                                      MACLOCK, _______,     _______, WINLOCK
-  ),
-
-[_ADJUST] = LAYOUT_split_4x6_5(
-  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,     _______, WINDOWS, MAC,     _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-                             _______, _______, _______,     _______, _______, _______,
-                                      _______, _______,     _______, _______
-  ),
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case WINDOWS:
-                set_single_persistent_default_layer(_WINDOWS);
-                return false;
-            case MAC:
-                set_single_persistent_default_layer(_MAC);
-                return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index d463418cf19..598ca9d9ee0 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -7,20 +7,19 @@
         "driver": "ws2812"
     },
     "ws2812": {
-        "pin": "D3",
+        "pin": "A2",
         "driver": "pwm"
     },
     "build": {
         "debounce_type": "asym_eager_defer_pk"
     },
     "matrix_pins": {
-        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F4", "F7", "C6", "D4", "B5"]
+        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B10", "B0", "B3", "A15", "B9"]
     },
     "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "A3"
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
+    "development_board": "stemcell"
 }
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index 8dda103d07a..8256842e21d 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -1,5 +1,3 @@
-CONVERT_TO = stemcell
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
deleted file mode 100644
index 58dacb5c53b..00000000000
--- a/keyboards/bastardkb/skeletyl/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * 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
-
-/* RGB matrix support. */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 36
-#    define RGB_MATRIX_SPLIT { 18, 18 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index b4bb9ea78e5..e4ac29207d2 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -3,10 +3,22 @@
     "usb": {
         "pid": "0x1830"
     },
+    "rgb_matrix": {
+        "max_brightness": 50,
+        "sleep": true,
+        "split_count": [18, 18]
+    },
     "rgblight": {
         "led_count": 36,
         "split_count": [18, 18]
     },
+    "split": {
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
diff --git a/keyboards/bastardkb/skeletyl/readme.md b/keyboards/bastardkb/skeletyl/readme.md
index 5a595d338f3..bd05820d35c 100644
--- a/keyboards/bastardkb/skeletyl/readme.md
+++ b/keyboards/bastardkb/skeletyl/readme.md
@@ -20,8 +20,8 @@ qmk compile -kb bastardkb/skeletyl/{VERSION}/elitec -km {KEYMAP}
 | --------------- | --------------------------------------------------------------- | ----------------------------------------------------------- |
 | v1 (Elite-C)    | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km default`      | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km via`      |
 | v2 (Elite-C)    | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km default`      | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km via`      |
-| v2 (Splinky v2) | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v2 -km default`  | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v2 -km via`  |
-| v2 (Splinky v3) | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v3 -km default`  | `qmk compile -kb bastardkb/skeletyl/v2/splinky/v3 -km via`  |
+| v2 (Splinky v2) | `qmk compile -kb bastardkb/skeletyl/v2/splinky_2 -km default`   | `qmk compile -kb bastardkb/skeletyl/v2/splinky_2 -km via`   |
+| v2 (Splinky v3) | `qmk compile -kb bastardkb/skeletyl/v2/splinky_3 -km default`   | `qmk compile -kb bastardkb/skeletyl/v2/splinky_3 -km via`   |
 | v2 (STeMCell)   | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km default`    | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km via`    |
 
 This keyboard is made to be used with the Miryoku layout, do not use the default keymap.
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index b44d64a47aa..b384da9dbdc 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -7,20 +7,19 @@
         "driver": "ws2812"
     },
     "ws2812": {
-        "pin": "D3",
+        "pin": "A2",
         "driver": "pwm"
     },
     "build": {
         "debounce_type": "asym_eager_defer_pk"
     },
     "matrix_pins": {
-        "cols": ["F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F7", "C6", "D4", "B5"]
+        "cols": ["B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B0", "B3", "A15", "B9"]
     },
     "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "A3"
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
+    "development_board": "stemcell"
 }
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index 8dda103d07a..8256842e21d 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -1,5 +1,3 @@
-CONVERT_TO = stemcell
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c b/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
deleted file mode 100644
index c5f563c90ba..00000000000
--- a/keyboards/bastardkb/tbk/keymaps/german_gaming/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2021 Joschua Gandert
- *
- * 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_german.h"
-
-
-enum layer_names {
-    _BASE,
-    _GAME, /* WASD shifted right once  */
-    _LOWER,
-    _RAISE,
-    _ADJUST /* when both LOWER and RAISE pressed */
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_split_4x6_5(
-    KC_ESC , KC_1  ,  KC_2  ,  KC_3  , KC_4  , KC_5  ,              KC_6  , KC_7  , KC_8   , KC_9  , KC_0   , DE_SS  ,
-    KC_TAB , KC_Q  ,  KC_W  ,  KC_E  , KC_R  , KC_T  ,              DE_Z  , KC_U  , KC_I   , KC_O  , KC_P   , DE_UDIA,
-    KC_LSFT, KC_A  ,  KC_S  ,  KC_D  , KC_F  , KC_G  ,              KC_H  , KC_J  , KC_K   , KC_L  , DE_ODIA, DE_ADIA,
-    KC_LCTL, DE_Y  ,  KC_X  ,  KC_C  , KC_V  , KC_B  ,              KC_N  , KC_M  , KC_COMM, KC_DOT, DE_MINS, DE_PLUS,
-
-                                  RAISE,  KC_SPC,   KC_LCTL,    KC_RALT,  KC_BSPC,  LOWER,
-                                          KC_ENT,   KC_LALT,    KC_LGUI,  KC_RSFT
-  ),
-
-  [_GAME] = LAYOUT_split_4x6_5(
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    KC_T   , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   ,           _______, _______, KC_UP,   _______, _______, _______,
-    KC_G   , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   ,           _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-    KC_B   , KC_LCTL, DE_Y   , KC_X   , KC_C   , KC_V   ,           _______, _______, _______, _______, _______, _______,
-
-                                  _______, _______, _______,    _______, _______, _______,
-                                           _______, _______,    _______, _______
-  ),
-
-  [_LOWER] = LAYOUT_split_4x6_5(
-    KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,           KC_CIRC, KC_AMPR, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL     ,
-    _______, DE_HASH, DE_CIRC, KC_PGUP, DE_LABK, _______,           _______, KC_P7  , KC_P8  , KC_P9  , KC_PPLS, KC_BSPC    ,
-    _______, DE_ACUT, KC_HOME, KC_PGDN, KC_END , KC_LPRN,           KC_RPRN, KC_P4  , KC_P5  , KC_P6  , KC_PDOT, _______    ,
-    _______, KC_PLUS, KC_PIPE, KC_UNDS, _______, _______,           KC_P0  , KC_P1  , KC_P2  , KC_P3  , KC_PENT, KC_KP_EQUAL,
-
-                                  _______, KC_RGHT, _______,    _______, _______, _______,
-                                           KC_LEFT, _______,    QK_BOOT, _______
-  ),
-
-  [_RAISE] = LAYOUT_split_4x6_5(
-    KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NUM  ,  KC_CALC, KC_PSCR   , KC_MUTE,
-    _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
-    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SCRL   , KC_VOLD,
-
-                                  _______, _______, _______,    _______, KC_UP  , _______,
-                                           _______, _______,    _______, KC_DOWN
-  ),
-
-  [_ADJUST] = LAYOUT_split_4x6_5(
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, QK_BOOT, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, DF(_GAME),         _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, DF(_BASE),         _______, _______, _______, _______, _______, _______,
-
-                                   _______, _______, _______,    _______, _______, _______,
-                                            _______, _______,    _______, _______
-  ),
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/bastardkb/tbk/keymaps/german_gaming/readme.md b/keyboards/bastardkb/tbk/keymaps/german_gaming/readme.md
deleted file mode 100644
index 9e6a328bcb8..00000000000
--- a/keyboards/bastardkb/tbk/keymaps/german_gaming/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-![German Gaming Layout Image](https://i.imgur.com/0y938rG.png)
-
-Despite being less accurate, the columns in the image are shifted up and down to avoid the [Hermann grid illusion](https://en.wikipedia.org/wiki/Grid_illusion).
-​
-
-# German Gaming Layout
-​
-This layout was build with gaming in mind for a german user. As a result I added a "game" layer that shifts the keys of the left side (below the number row) one to the right, so that <kbd>WASD</kbd> is on the <kbd>ESDF</kbd> keys. The reason this layer was added is that using <kbd>WASD</kbd> is less comfortable with a contoured Dactyl-style keyboard, where each column is adjusted for the respective fingers. <kbd>ESDF</kbd> also has the upside of allowing one to stay in the home row. Note that the rightmost column of the default layer, so <kbd>TGB</kbd>, ends up in the leftmost position.
-
-Of course, one could just be forced to reconfigure every game, but that wouldn't be very user-friendly and likely reduce satisfaction with the layout. When in game mode, the right side of keys also features arrow keys on <kbd>IJKL</kbd>.
-
-
-## Raise and Lower layer
-
-Additionally, via the RAISE layer, it's always possible to access the arrow keys, which are often used in game menues. On the exact same position one can access <kbd>Home</kbd>, <kbd>End</kbd>, <kbd>Page Down</kbd> and <kbd>Page Up</kbd> via the LOWER layer. The left side of the LOWER layer also contains the few characters that would usually have their own key in a traditional german keyboard.
-
-The right side features various media keys in the RAISE layer, and a numpad in the LOWER layer.
-
-
-## Firmware
-
-The keyboard can be put into Reset mode (for flashing a keymap) by pressing <kbd>**LOWER**</kbd> + <kbd>Super</kbd> (also known as Windows key), or by pressing <kbd>**LOWER**</kbd> + <kbd>**RAISE**</kbd> + <kbd>R</kbd>.
-
-`MOUSEKEY_ENABLE` was set to `no` for this keymap, since it wasn't used and the size of the firmware ended up being too large.
diff --git a/keyboards/bastardkb/tbk/keymaps/german_gaming/rules.mk b/keyboards/bastardkb/tbk/keymaps/german_gaming/rules.mk
deleted file mode 100644
index 0a5b666e855..00000000000
--- a/keyboards/bastardkb/tbk/keymaps/german_gaming/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h
deleted file mode 100644
index 4fa185e9564..00000000000
--- a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 300
-#define PERMISSIVE_HOLD
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 300
\ No newline at end of file
diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c b/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c
deleted file mode 100644
index 2fb26dbf6f4..00000000000
--- a/keyboards/bastardkb/tbk/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* 
- * Copyright 2021 Ian Sterling <xyverz on Github.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 { _WINDOWS, _MAC, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { WINDOWS = SAFE_RANGE, MAC, ADJUST };
-
-// Aliases to keep the keymap tidy
-#define GUIBSPC GUI_T(KC_BSPC)  // GUI when held, BSPC when tapped.
-#define RGB_SWR RGB_M_SW        // Swirl Animation alias
-#define RGB_SNK RGB_M_SN        // Snake Animation alias
-#define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook!
-#define WINLOCK LGUI(KC_L)      // Lock my PC!
-#define DELGUI GUI_T(KC_DEL)
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-
-#define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook!
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_WINDOWS] = LAYOUT_split_4x6_5(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,        KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,        KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,        KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                             LOWER,   KC_BSPC, KC_DEL,      KC_ENT,  KC_SPC,  RAISE,
-                                      KC_LCTL, KC_LALT,     KC_RGUI, KC_RCTL
-  ),
-
-[_MAC] = LAYOUT_split_4x6_5(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,        KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,        KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,        KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                             LOWER,   KC_BSPC, DELGUI,      KC_ENT,  KC_SPC,  RAISE,
-                                      KC_LCTL, KC_LALT,     KC_RGUI, KC_RCTL
-  ),
-
-[_LOWER] = LAYOUT_split_4x6_5(
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
-  KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-                             _______, KC_DEL,  _______,     _______, _______, _______,
-                                      MACLOCK, _______,     _______, WINLOCK
-  ),
-
-[_RAISE] = LAYOUT_split_4x6_5(
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, QK_BOOT,
-  KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-                             _______, KC_DEL,  _______,     _______, _______, _______,
-                                      MACLOCK, _______,     _______, WINLOCK
-  ),
-
-[_ADJUST] = LAYOUT_split_4x6_5(
-  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,     _______, WINDOWS, MAC,     _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-                             _______, _______, _______,     _______, _______, _______,
-                                      _______, _______,     _______, _______
-  ),
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case WINDOWS:
-                set_single_persistent_default_layer(_WINDOWS);
-                return false;
-            case MAC:
-                set_single_persistent_default_layer(_MAC);
-                return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/readme.md b/keyboards/bastardkb/tbk/keymaps/xyverz/readme.md
deleted file mode 100644
index b806bd265a9..00000000000
--- a/keyboards/bastardkb/tbk/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# The Bastard Keyboard
-
-A split ergonomic keyboard.
-
-* Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
-* Hardware Supported: elite-C V4
-* Hardware Availability: [Bastard Keyboards](https://bastardkb.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make bastardkb/tbk: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).
-
-See the [keyboard build instructions](https://docs.bastardkb.com)
-
-
-## Important information regarding the reset
-
-If you modify this firmware, make sure to always have a `QK_BOOT` key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
-
-Otherwise if you're stuck, open the case and reset manually by shorting Gnd and Rst, or pressing the RST button.
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
deleted file mode 100644
index 1a1540b280d..00000000000
--- a/keyboards/bastardkb/tbkmini/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * 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
-
-/* RGB matrix support. */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 42
-#    define RGB_MATRIX_SPLIT { 21, 21 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index ec0433d3873..ff2df9cdd6e 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -3,10 +3,22 @@
     "usb": {
         "pid": "0x1828"
     },
+    "rgb_matrix": {
+        "max_brightness": 50,
+        "sleep": true,
+        "split_count": [21, 21]
+    },
     "rgblight": {
         "led_count": 42,
         "split_count": [21, 21]
     },
+    "split": {
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
     "community_layouts": ["split_3x6_3"],
     "layouts": {
         "LAYOUT_split_3x6_3": {
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
index a75db584e79..f62427438b7 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -7,20 +7,19 @@
         "driver": "ws2812"
     },
     "ws2812": {
-        "pin": "D3",
+        "pin": "A2",
         "driver": "pwm"
     },
     "build": {
         "debounce_type": "asym_eager_defer_pk"
     },
     "matrix_pins": {
-        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
-        "rows": ["F7", "C6", "D4", "B5"]
+        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
+        "rows": ["B0", "B3", "A15", "B9"]
     },
     "diode_direction": "ROW2COL",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "A3"
     },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
+    "development_board": "stemcell"
 }
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
index 8dda103d07a..8256842e21d 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
@@ -1,5 +1,3 @@
-CONVERT_TO = stemcell
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/beatervan/keymaps/oj/keymap.c b/keyboards/beatervan/keymaps/oj/keymap.c
deleted file mode 100644
index 6b32c4ddc1b..00000000000
--- a/keyboards/beatervan/keymaps/oj/keymap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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 {
-  _QW,
-  _DV,
-  _CM,
-  _L1,
-  _L2,
-  _L3
-};
-enum custom_keycodes {
-  DVORAK = SAFE_RANGE,
-  QWERTY,
-  COLEMAK
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
-    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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENTER,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
-    KC_TAB,  MO(_L1), KC_LGUI,                   KC_SPC,  KC_BSPC,                   KC_LALT, KC_RALT, TG(_L3)
-  ),
-  [_DV] = LAYOUT( /* Dvorak */
-    KC_ESC,  KC_SLSH, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_QUOT,
-    KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENTER,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    MO(_L2),
-    KC_TAB,  MO(_L1), KC_LGUI,                   KC_SPC,  KC_BSPC,                   KC_LALT, KC_RALT, TG(_L3)
-  ),
-  [_CM] = LAYOUT( /* Colemak */
-    KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_QUOT,
-    KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENTER,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
-    KC_TAB,  MO(_L1), KC_LGUI,                   KC_SPC,  KC_BSPC,                   KC_LALT, KC_RALT, TG(_L3)
-  ),
-  [_L1] = LAYOUT( /* NUM */
-    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_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_SCLN, KC_BSLS,
-    _______, _______, _______, KC_PSCR, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,
-    _______, _______, _______,                   _______, _______,                   _______, _______, _______
-  ),
-  [_L2] = LAYOUT( /* F Keys */
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,     KC_F11,
-    _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______,    _______, KC_ENTER,
-    _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, _______, _______, _______, _______,    _______,    _______,
-    _______, _______, _______,                   _______, _______,                   _______,    _______,    _______
-  ),
-  [_L3] = LAYOUT( /* Gaming */
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    _______, _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,
-    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    _______, MO(_L2), KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-    KC_LSFT, KC_Z,    KC_B,                      KC_SPC,  KC_BSPC,                   _______, _______, TG(_L3)
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-      switch(keycode) {
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DV);
-          }
-          return false;
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QW);
-          }
-          return false;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_CM);
-          }
-          return false;
-        default:
-          return true;
-      }
-    return true;
-};
diff --git a/keyboards/beatervan/keymaps/oj/readme.md b/keyboards/beatervan/keymaps/oj/readme.md
deleted file mode 100644
index 34c2f075c85..00000000000
--- a/keyboards/beatervan/keymaps/oj/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-#Objectively superior keymap for v44
diff --git a/keyboards/beekeeb/piantor/estardyn/config.h b/keyboards/beekeeb/piantor/estardyn/config.h
index 10b9d99344a..75cd236e26f 100644
--- a/keyboards/beekeeb/piantor/estardyn/config.h
+++ b/keyboards/beekeeb/piantor/estardyn/config.h
@@ -1,5 +1,5 @@
 #define WS2812_DI_PIN GP23
-#define RGBLED_NUM 2
+#define RGBLIGHT_LED_COUNT 2
 #define RGBLED_SPLIT { 1, 1 }
 
 #define RGBLIGHT_LAYERS
diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/info.json
index 7d74c81f450..e4ecd4207e5 100644
--- a/keyboards/beekeeb/piantor/info.json
+++ b/keyboards/beekeeb/piantor/info.json
@@ -95,31 +95,31 @@
         },
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.25},
-                {"matrix": [0, 1], "x": 1, "y": 0.125},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.125},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 1], "x": 0, "y": 0.25},
+                {"matrix": [0, 2], "x": 1, "y": 0.125},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0.125},
+                {"matrix": [0, 5], "x": 4, "y": 0.25},
                 {"matrix": [4, 0], "x": 7, "y": 0.25},
                 {"matrix": [4, 1], "x": 8, "y": 0.125},
                 {"matrix": [4, 2], "x": 9, "y": 0},
                 {"matrix": [4, 3], "x": 10, "y": 0.125},
                 {"matrix": [4, 4], "x": 11, "y": 0.25},
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.125},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.125},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 1], "x": 0, "y": 1.25},
+                {"matrix": [1, 2], "x": 1, "y": 1.125},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1.125},
+                {"matrix": [1, 5], "x": 4, "y": 1.25},
                 {"matrix": [5, 0], "x": 7, "y": 1.25},
                 {"matrix": [5, 1], "x": 8, "y": 1.125},
                 {"matrix": [5, 2], "x": 9, "y": 1},
                 {"matrix": [5, 3], "x": 10, "y": 1.125},
                 {"matrix": [5, 4], "x": 11, "y": 1.25},
-                {"matrix": [2, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 1], "x": 1, "y": 2.125},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.125},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 1], "x": 0, "y": 2.25},
+                {"matrix": [2, 2], "x": 1, "y": 2.125},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2.125},
+                {"matrix": [2, 5], "x": 4, "y": 2.25},
                 {"matrix": [6, 0], "x": 7, "y": 2.25},
                 {"matrix": [6, 1], "x": 8, "y": 2.125},
                 {"matrix": [6, 2], "x": 9, "y": 2},
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h
deleted file mode 100644
index f12d6fb3d4a..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-// #define USE_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
deleted file mode 100644
index 9440af886a7..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
+++ /dev/null
@@ -1,157 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-#define BASE 0
-#define META 1
-#define SYMB 2
-#define GAME 3
-#define BIAC 4
-#define BMETA 5
-#define BSYMB 6
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* BASE
- * ,------------------------------------------------.   ,------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
- * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[BASE] = LAYOUT(
-  KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC,
-  KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1),
-  KC_LCTL,  KC_LGUI, KC_APP, TG(BIAC),LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3
-),
-
-/* META
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |   6  |  [   |   |  ]   |   7  |   8  |   9  |   0  |   -  |  ^   |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |  F1  |      |Muhen | Henk |      |  (   |   |  )   | Left | Down |  Up  |Right |      |      |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |  F2  |  F3  |  F4  |  F5  |  F6  |  {   |   |  }   |  F7  |  F8  |  F9  | F10  | F11  |\/Sft |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |Reset |=>GAME|=>SYMB|  \   |
- * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[META] = LAYOUT(
-  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_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX,
-  _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1),
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______
-),
-
-/* SYMB
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |   !  |   "  |   #  |   $  |   %  |   &  |  [   |   |  ]   |   '  |   (  |   )  |   ~  |   =  |  ~   |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |      |      |      |      |      |  (   |   |  )   |      |      |      |      |   +  |  *   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |      |      |      |      |      |  {   |   |  }   |      |      |   <  |   >  |   ?  |  \   |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
- * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[SYMB] = LAYOUT(
-  S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL),
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT),
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1),
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______
-),
-
-/* GAME
- * ,------------------------------------------------.   ,------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |PrtSc | ESC  |Space |Tab   |   |Back  |Enter | Del  |PrtSc |=>GAME|=>SYMB|  \   |
- * |      |      |      |      |      |      |      |   |Space |      |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-[GAME] = LAYOUT(
-  KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC,
-  KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1),
-  KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3
-),
-
-/* BIAC
- * ,------------------------------------------------.   ,------------------------------------------------.
- * | Tab  |   ;  |   ,  |   .  |   P  |   Q  |  [   |   |  ]   |   Y  |   G  |   D  |   M  |   F  |  @   |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |   A  |   O  |   E  |   I  |   U  |  (   |   |  )   |   B  |   N  |   T  |   R  |   S  |  :   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   Z  |   X  |   C  |   V  |   W  |  {   |   |  }   |   H  |   J  |   K  |   L  |   /  |\/Sft |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |=>BIAC|ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |      |      |  \   |
- * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[BIAC] = LAYOUT(
-  KC_TAB,   KC_SCLN,KC_COMM, KC_DOT,  KC_P,             KC_Q,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_G,    KC_D,     KC_M,     KC_F,     KC_LBRC,
-  KC_LALT,  KC_A,    KC_O,   KC_E,    KC_I,             KC_U,          S(KC_8),       S(KC_9),    KC_B,             KC_N,    KC_T,     KC_R,     KC_S,     KC_QUOT,
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_W,          S(KC_RBRC),    S(KC_BSLS), KC_H,             KC_J,    KC_K,     KC_L,     KC_SLSH,  SFT_T(KC_INT1),
-  KC_LCTL,  KC_LGUI, KC_APP, _______, LT(BSYMB, KC_ESC),RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(BMETA, KC_ENT),KC_DEL,  KC_PSCR,  XXXXXXX,  XXXXXXX,  KC_INT3
-),
-
-/* META
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  {   |   |  }   |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |   2  |   3  |   4  |   5  |   6  |  [   |   |  ]   |   7  |   8  |   9  |   0  |   -  |  ^   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   1  |      |Muhen | Henk |      |  (   |   |  )   | Left | Down |  Up  |Right |      |\/Sft |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |      |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |Reset |      |      |  \   |
- * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[BMETA] = 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_2,    KC_3,    KC_4,    KC_5,    KC_6,    _______, _______, KC_7,    KC_8,    KC_9,  KC_0,    KC_MINS, KC_EQL,
-  _______, KC_1,    XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, SFT_T(KC_INT1),
-  _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______
-),
-
-/* SYMB
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |      |      |      |      |      |      |  [   |   |  ]   |      |      |   [  |   ]  |   +  |  *   |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |   "  |   #  |   $  |   %  |   &  |  (   |   |  )   |   '  |   (  |   )  |      |   =  |  ~   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   !  |      |      |      |      |  {   |   |  }   |   {  |   }  |   <  |   >  |   ?  |  \   |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |      |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |      |      |  \   |
- * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[BSYMB] = LAYOUT(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX,    KC_RBRC,    KC_BSLS,   S(KC_SCLN), S(KC_QUOT),
-  _______, S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7),    S(KC_8),    S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL),
-  _______, S(KC_1), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, S(KC_RBRC), S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1),
-  _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______,    _______,    _______,    _______,   _______,    _______
-)
-
-};
-
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h
deleted file mode 100644
index f0717a46328..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
deleted file mode 100644
index c2039177731..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define BASE 0
-#define META 1
-#define SYMB 2
-#define GAME 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* BASE
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |Cmd   |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [BASE] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC,
-    KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1),
-    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), GUI_T(KC_SPC), SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3
-  ),
-
-  /* META
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |   1  |   2  |   3  |   4  |   5  |   6  |  [   |   |  ]   |   7  |   8  |   9  |   0  |   -  |  ^   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |  F1  |      |Muhen | Henk |      |  (   |   |  )   | Left | Down |  Up  |Right |      |      |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |  F2  |  F3  |  F4  |  F5  |  F6  |  {   |   |  }   |  F7  |  F8  |  F9  | F10  | F11  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |Reset |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |Ctrl  |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [META] = LAYOUT(
-    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_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX,
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______
-  ),
-
-  /* SYMB
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |   !  |   "  |   #  |   $  |   %  |   &  |  [   |   |  ]   |   '  |   (  |   )  |   ~  |   =  |  ~   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |      |      |      |      |      |  (   |   |  )   |      |      |      |      |   +  |  *   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |      |      |      |      |      |  {   |   |  }   |      |      |   <  |   >  |   ?  |  \   |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |Ctrl  |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [SYMB] = LAYOUT(
-    S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______
-  ),
-
-  /* GAME
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc | ESC  |Space |Tab   |   |Back  |Enter | Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |      |      |      |   |Space |      |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [GAME] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC,
-    KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1),
-    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3
-  )
-
-};
-
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
deleted file mode 100644
index a56bd0f2e72..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-// Underglow
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
-#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 RGBLIGHT_SLEEP
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
deleted file mode 100644
index b7a8ba3fb00..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
+++ /dev/null
@@ -1,151 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define BASE 0
-#define META 1
-#define SYMB 2
-#define GAME 3
-#define RGB  4
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE,
-  TAP_ANIM
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* BASE
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>RGB |  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [BASE] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC,
-    KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1),
-    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(RGB),  KC_INT3
-  ),
-
-  /* META
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |   1  |   2  |   3  |   4  |   5  |   6  |  [   |   |  ]   |   7  |   8  |   9  |   0  |   -  |  ^   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |  F1  |      |Muhen | Henk |      |  (   |   |  )   | Left | Down |  Up  |Right |      |      |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |  F2  |  F3  |  F4  |  F5  |  F6  |  {   |   |  }   |  F7  |  F8  |  F9  | F10  | F11  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |Reset |=>GAME|=>RGB |  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [META] = LAYOUT(
-    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_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX,
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______
-  ),
-
-  /* SYMB
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |   !  |   "  |   #  |   $  |   %  |   &  |  [   |   |  ]   |   '  |   (  |   )  |   ~  |   =  |  ~   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |      |      |      |      |      |  (   |   |  )   |      |      |      |      |   +  |  *   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |      |      |      |      |      |  {   |   |  }   |      |      |   <  |   >  |   ?  |  \   |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>RGB |  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [SYMB] = LAYOUT(
-    S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______
-  ),
-
-  /* GAME
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc | ESC  |Space |Tab   |   |Back  |Enter | Del  |PrtSc |=>GAME|=>RGB |  \   |
-   * |      |      |      |      |      |      |      |   |Space |      |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [GAME] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC,
-    KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1),
-    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3
-  ),
-
-  /* RGB
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |   |      | TOG  | HUI  | SAI  | VAI  |HUANIM|      |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |   |      | MOD  | HUD  | SAD  | VAD  |QK_BOOT |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |   |      |      |      |      |      |=>RGB |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [RGB] = LAYOUT(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, TAP_ANIM,XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_RST, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX
-  )
-
-};
-
-bool isTapAnim = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case RGB_MOD:
-      if (record->event.pressed) {
-        isTapAnim = false;
-      }
-      break;
-    case RGB_RST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-        }
-      #endif
-      break;
-    case TAP_ANIM:
-      if (record->event.pressed) {
-        isTapAnim = !isTapAnim;
-      }
-      break;
-  }
-
-  if (isTapAnim) {
-    rgblight_mode_noeeprom(1);
-    uint16_t hue = (rgblight_config.hue + 5) % 360;
-    rgblight_sethsv_noeeprom(hue, rgblight_config.sat, rgblight_config.val);
-  }
-
-  return true;
-}
-
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/rules.mk b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco-underglow/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h
deleted file mode 100644
index f0717a46328..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
deleted file mode 100644
index 17a52693bf2..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
-// WindowsでJIS配列として認識しているときに、US配列として使うためのキーマップ
-// hdbx から2行コピーさせて頂きました。
-
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"     // qmk_firmware-master/quantum/keymap_extras/keymap_japanese.h 日本語キーボード設定用
-// マクロが必要になったらコメントインすること
-// #include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避>
-
-extern keymap_config_t keymap_config;
-
-#define BASE 0
-#define META 1
-#define SYMB 2
-#define GAME 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* BASE
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [BASE] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC,
-    KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(JP_BSLS),
-    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), JP_YEN
-  ),
-
-  /* META
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |   1  |   2  |   3  |   4  |   5  |   6  |  [   |   |  ]   |   7  |   8  |   9  |   0  |   -  |  ^   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |  F1  |      |Muhen | Henk |      |  (   |   |  )   | Left | Down |  Up  |Right |      |      |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |  F2  |  F3  |  F4  |  F5  |  F6  |  {   |   |  }   |  F7  |  F8  |  F9  | F10  | F11  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |Reset |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [META] = LAYOUT(
-    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_F1,   XXXXXXX, JP_MHEN, JP_HENK, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX,
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(JP_BSLS),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______
-  ),
-
-  /* SYMB
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |   !  |   "  |   #  |   $  |   %  |   &  |  [   |   |  ]   |   '  |   (  |   )  |   ~  |   =  |  ~   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |      |      |      |      |      |  (   |   |  )   |      |      |      |      |   +  |  *   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |      |      |      |      |      |  {   |   |  }   |      |      |   <  |   >  |   ?  |  \   |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [SYMB] = LAYOUT(
-    S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(JP_BSLS),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______
-  ),
-
-  /* GAME
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc | ESC  |Space |Tab   |   |Back  |Enter | Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |      |      |      |   |Space |      |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [GAME] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC,
-    KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(JP_BSLS),
-    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, JP_YEN
-  )
-
-};
-
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco/config.h b/keyboards/biacco42/ergo42/keymaps/biacco/config.h
deleted file mode 100644
index f0717a46328..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
deleted file mode 100644
index 61b307d2658..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define BASE 0
-#define META 1
-#define SYMB 2
-#define GAME 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* BASE
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [BASE] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,             KC_T,          KC_RBRC,       KC_BSLS,    KC_Y,             KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC,
-    KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,             KC_G,          S(KC_8),       S(KC_9),    KC_H,             KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,             KC_B,          S(KC_RBRC),    S(KC_BSLS), KC_N,             KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  SFT_T(KC_INT1),
-    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC),SFT_T(KC_TAB), KC_BSPC,    LT(META, KC_ENT), KC_DEL,  KC_PSCR,  TG(GAME), TG(SYMB), KC_INT3
-  ),
-
-  /* META
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |   1  |   2  |   3  |   4  |   5  |   6  |  [   |   |  ]   |   7  |   8  |   9  |   0  |   -  |  ^   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |  F1  |      |Muhen | Henk |      |  (   |   |  )   | Left | Down |  Up  |Right |      |      |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |  F2  |  F3  |  F4  |  F5  |  F6  |  {   |   |  }   |  F7  |  F8  |  F9  | F10  | F11  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |Reset |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [META] = LAYOUT(
-    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_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX,
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______
-  ),
-
-  /* SYMB
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |   !  |   "  |   #  |   $  |   %  |   &  |  [   |   |  ]   |   '  |   (  |   )  |   ~  |   =  |  ~   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |      |      |      |      |      |  (   |   |  )   |      |      |      |      |   +  |  *   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |      |      |      |      |      |  {   |   |  }   |      |      |   <  |   >  |   ?  |  \   |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |   |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |   |Space |~META |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [SYMB] = LAYOUT(
-    S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), _______, _______, S(KC_7), S(KC_8), S(KC_9),    S(KC_0),   S(KC_MINS), S(KC_EQL),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,   S(KC_SCLN), S(KC_QUOT),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______
-  ),
-
-  /* GAME
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
-   * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc | ESC  |Space |Tab   |   |Back  |Enter | Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |      |      |      |   |Space |      |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [GAME] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC,
-    KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1),
-    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3
-  )
-
-};
-
diff --git a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
index a56bd0f2e72..2469b627e26 100644
--- a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
@@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 // Underglow
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
+#undef RGBLIGHT_LED_COUNT
+#define RGBLIGHT_LED_COUNT 14    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/config.h b/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
deleted file mode 100644
index 983305e2558..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-/* Use RGB Underglow */
-
-#undef RGBLED_NUM
-#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 RGBLIGHT_SLEEP
-#define RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
deleted file mode 100644
index 46a1b503b80..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-// WindowsでJIS配列として認識しているときに、US配列として使うためのキーマップ
-// @leopard_gecko さんがPlanck用に作成されたキーマップをかなり参考にしています。
-
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"     // qmk_firmware-master/quantum/keymap_extras/keymap_japanese.h 日本語キーボード設定用
-#include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避
-
-extern keymap_config_t keymap_config;
-
-// レイヤー
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _GAME 3
-#define _ADJUST 4
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE, // QWERTYレイヤーへ
-  MCR1,                // マクロ1
-  MCR2,                // マクロ2
-  MCR3,                // マクロ3
-  DYNAMIC_MACRO_RANGE, // ダイナミックマクロ
-  WN_SCLN,             // タップでJISの「:」  シフトでJISの「;」 (Windows)
-};
-
-// Use Dynamic macro
-#include "dynamic_macro.h"
-
-#define KC_LOWR LT(_LOWER, JP_MHEN)    // タップで無変換     ホールドでLower
-#define KC_RASE LT(_RAISE, JP_HENK)    // タップで変換       ホールドでRaise
-#define KC_LSLB MT(MOD_LSFT, JP_LBRC)  // タップで[          ホールドで左Shift
-#define KC_RSRB MT(MOD_RSFT, JP_RBRC)  // タップで]          ホールドで右Shift
-#define KC_ALTB MT(MOD_LALT, KC_TAB)   // タップでTAB        ホールドで左Alt
-#define CTL_ZH  CTL_T(JP_ZKHK)         // タップで半角/全角  ホールドで左Control     (Windows)
-#define WN_CAPS S(KC_CAPS)             // Caps Lock                                  (Windows)
-#define KC_ALPS LALT(KC_PSCR)          // Alt + PrintScreen
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define GAME DF(_GAME)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* QWERTY // WindowsでJIS配列時のデフォルトキーマップ
-   * ,-------------------------------------------------------.   ,-------------------------------------------------------.
-   * |Tab/Alt|   Q   |   W   |   E   |   R   |   T   |   -   |   |   ~   |   Y   |   U   |   I   |   O   |   P   | BSPC  |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * |ZH/Ctrl|   A   |   S   |   D   |   F   |   G   |   (   |   |   )   |   H   |   J   |   K   |   L   |   :   |   '   |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | [/Sft |   Z   |   X   |   C   |   V   |   B   |  F2   |   |  Home |   N   |   M   |   ,   |   .   |   /   | ]/Sft |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * |WN CAPS|  GUI  |   \   |  Esc  |無変換 | Enter |  Del  |   |  End  | Space | 変換  | Left  | Down  |   Up  | Right |
-   * |       |       |       |       | LOWER |       |       |   |       |       | RAISE |       |       |       |       |
-   * `-------------------------------------------------------'   `-------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-    KC_ALTB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_MINS,   JP_TILD, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    CTL_ZH,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    JP_LPRN,   JP_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    WN_SCLN, JP_QUOT,
-    KC_LSLB,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_F2,     KC_HOME, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSRB,
-    WN_CAPS,  KC_LGUI, JP_YEN,  KC_ESC,  KC_LOWR, KC_ENT,  KC_DEL,    KC_END,  KC_SPC,  KC_RASE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* LOWER // 数字入力用レイヤー
-   * ,-------------------------------------------------------.   ,-------------------------------------------------------.
-   * |       |   1   |   2   |   3   |   4   |   5   |   6   |   |  Esc  |   7   |   8   |   9   |   .   |   =   |       |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * |       |  F1   |  F2   |  F3   |  F4   |  F5   |  F6   |   |  F2   |   4   |   5   |   6   |   -   |   /   | Enter |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | Shift |  F7   |  F8   |  F9   |  F10  |  F11  |  F12  |   |       |   1   |   2   |   3   |   +   |   *   | Shift |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |XXXXXXX|       |       |       |       |   |       |   0   |       |       |       |       |       |
-   * `-------------------------------------------------------'   `-------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,       KC_ESC,  KC_7,    KC_8,    KC_9,    KC_PDOT, JP_EQL,  _______,
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,      KC_F2,   KC_P4,   KC_P5,   KC_P6,   KC_PMNS, KC_PSLS, KC_ENT,
-    KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     _______, KC_P1,   KC_P2,   KC_P3,   KC_PPLS, KC_PAST, KC_RSFT,
-    _______, _______, XXXXXXX, _______, _______, _______, _______,    _______, KC_0,    _______, _______, _______, _______, _______
-  ),
-
-  /* RAISE // 記号入力用レイヤー
-   * ,-------------------------------------------------------.   ,-------------------------------------------------------.
-   * |       |   !   |   @   |   #   |   $   |   %   |   _   |   |   `   |   ^   |   &   |  Ins  |   \   |PrntScr|       |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * |       |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|   {   |   |   }   | Left  | Down  |   Up  | Right |   ;   |   "   |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | Shift |M-PLAY |M-MUTE |VOL_DWN|VOL_UP |PREV_TR|NEXT_TR|   |PageUp |XXXXXXX|XXXXXXX|   <   |   >   |   ?   | Shift |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |   |   |       |       |       |       |   |PageDwn|       |       |       |       |       |       |
-   * `-------------------------------------------------------'   `-------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-    _______, KC_EXLM, JP_AT,   KC_HASH, KC_DLR,  KC_PERC, JP_UNDS,    JP_GRV,  JP_CIRC, JP_AMPR, KC_INS,  JP_YEN,  KC_ALPS, _______,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, JP_LCBR,    JP_RCBR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN, JP_DQUO,
-    KC_LSFT, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT,    KC_PGUP, XXXXXXX, XXXXXXX, KC_LT,   KC_GT,   KC_QUES, KC_RSFT,
-    _______, _______, JP_PIPE, _______, _______, _______, _______,    KC_PGDN, _______, _______, _______, _______, _______, _______
-  ),
-
-  /* GAME // 左手はゲーム用レイヤー、右手はNumPad
-   * ,-------------------------------------------------------.   ,-------------------------------------------------------.
-   * |  Tab  |   Q   |   W   |   E   |   R   |   T   |PrntScr|   |  Esc  |   7   |   8   |   9   |   .   |   =   | BSPC  |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | Ctrl  |   A   |   S   |   D   |   F   |   G   |  F1   |   |  F2   |   4   |   5   |   6   |   -   |   /   | Enter |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | Shift |   Z   |   X   |   C   |   V   |   B   |  F2   |   |  Home |   1   |   2   |   3   |   +   |   *   | Shift |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * |  Del  |  GUI  |  Alt  |  Esc  | LOWER | Space | Enter |   |  End  |   0   | RAISE | Left  | Down  |   Up  | Right |
-   * `-------------------------------------------------------'   `-------------------------------------------------------'
-   */
-  [_GAME] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_ALPS,    KC_ESC,  KC_P7,   KC_P8,   KC_P9,   KC_PDOT, JP_EQL,  KC_BSPC,
-    KC_LCTL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_F1,      KC_F2,   KC_P4,   KC_P5,   KC_P6,   KC_PMNS, KC_PSLS, KC_ENT,
-    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_F2,      KC_HOME, KC_P1,   KC_P2,   KC_P3,   KC_PPLS, KC_PAST, KC_RSFT,
-    KC_DEL,   KC_LGUI, KC_LALT, KC_ESC,  LOWER,   KC_SPC, KC_ENT,     KC_PGDN, KC_P0,   RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* ADJUST // 設定用レイヤー (LOWER+RAISE)
-   * ,-------------------------------------------------------.   ,-------------------------------------------------------.
-   * |RGB_TOG| MCR1  | MCR2  | MCR3  |XXXXXXX|XXXXXXX|XXXXXXX|   |XXXXXXX|PLAY_M1|PLAY_M2|REC_M1 |REC_M2 |STP_REC| BSPC  |
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | QK_BOOT |       |       |       |       |       |       |   |XXXXXXX|XXXXXXX|QWERTY | GAME  |XXXXXXX|XXXXXXX|XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | Shift |       |       |       |       |       |       |   |XXXXXXX| M-PLAY|M-MUTE |VOL_DWN|VOL_UP |PREV_TR|NEXT_TR|
-   * |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-   * | Debug |XXXXXXX|XXXXXXX|       |       |XXXXXXX|XXXXXXX|   |XXXXXXX|XXXXXXX|       | Left  | Down  |   Up  | Right |
-   * `-------------------------------------------------------'   `-------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT(
-    RGB_TOG,  MCR1,    MCR2,    MCR3,    XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, DM_PLY1, DM_PLY2, DM_REC1, DM_REC2, DM_RSTP, KC_BSPC,
-    QK_BOOT,  RGB_MOD, RGB_M_P, RGB_M_B, RGB_HUI, RGB_SAI, RGB_VAI,   XXXXXXX, XXXXXXX, QWERTY,  GAME,   XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSFT,  RGB_M_R, RGB_M_SN,RGB_M_G, RGB_HUD, RGB_SAD, RGB_VAD,   XXXXXXX, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT,
-    DB_TOGG,  XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-};
-
-// RGB Underglow使用時のレイヤー毎のカラー切り替え
-layer_state_t layer_state_set_keymap (layer_state_t state) {
-  return state;
-}
-
-void matrix_init_user(void) {
-#ifdef RGBLIGHT_ENABLE
-  rgblight_enable();
-  rgblight_setrgb(RGB_TEAL);
-#endif
-}
-
-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 _RAISE:
-      rgblight_setrgb(RGB_CHARTREUSE); // RAISE:シャルトリューズ
-      break;
-    case _LOWER:
-      rgblight_setrgb(RGB_PINK); // LOWER:ピンク
-      break;
-    case _ADJUST:
-      rgblight_setrgb(RGB_RED); // ADJUST:レッド
-      break;
-    default: //  for any other layers, or the default layer
-      rgblight_setrgb(RGB_TEAL); // 他:ティール
-      break;
-    }
-#endif
-return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool     lshift = false;
-  if (!process_record_dynamic_macro(keycode, record)) {
-      return false;
-  }
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case WN_SCLN: // コロン「;:」
-      if (record->event.pressed) {
-        lshift = keyboard_report->mods & MOD_BIT(KC_LSFT);
-        if (lshift) {
-          unregister_code(KC_LSFT);
-          register_code(JP_SCLN);
-          unregister_code(JP_SCLN);
-        } else {
-          register_code(JP_COLN);
-          unregister_code(JP_COLN);
-        }
-      }
-      return false;
-      break;
-    case MCR1:
-      if (record->event.pressed) {
-        SEND_STRING("hoge"); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR2:
-      if (record->event.pressed) {
-        SEND_STRING("hogehoge"SS_TAP(X_ENTER)); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR3:
-      if (record->event.pressed) {
-                SEND_STRING("hoge@hoge.hoge"); // 送信文字列
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/readme.md b/keyboards/biacco42/ergo42/keymaps/hdbx/readme.md
deleted file mode 100644
index 3f3ca3e5ce6..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/hdbx/readme.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# hdbx
-
-Designed for Japanese Keyboardists using JIS on the Ergo42.
-
-## Layer
-
-````
-QWERTY
-  ,-------------------------------------------------------.   ,-------------------------------------------------------.
-  |Tab/Alt|   Q   |   W   |   E   |   R   |   T   |   -   |   |   ~   |   Y   |   U   |   I   |   O   |   P   | BSPC  |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  |ZH/Ctrl|   A   |   S   |   D   |   F   |   G   |   (   |   |   )   |   H   |   J   |   K   |   L   |   :   |   '   |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  | [/Sft |   Z   |   X   |   C   |   V   |   B   |  F2   |   |  Home |   N   |   M   |   ,   |   .   |   /   | ]/Sft |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  |WN CAPS|  GUI  |   \   |  Esc  | MHEN/ | Enter |  Del  |   |  End  | Space | HENK/ | Left  | Down  |   Up  | Right |
-  |       |       |       |       | LOWER |       |       |   |       |       | RAISE |       |       |       |       |
-  `-------------------------------------------------------'   `-------------------------------------------------------'
-
-LOWER
-  ,-------------------------------------------------------.   ,-------------------------------------------------------.
-  |       |   1   |   2   |   3   |   4   |   5   |   6   |   |  Esc  |   7   |   8   |   9   |   .   |   =   |       |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  |       |  F1   |  F2   |  F3   |  F4   |  F5   |  F6   |   |  F2   |   4   |   5   |   6   |   -   |   /   | Enter |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  | Shift |  F7   |  F8   |  F9   |  F10  |  F11  |  F12  |   |       |   1   |   2   |   3   |   +   |   *   | Shift |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  |       |       |XXXXXXX|       |       |       |       |   |       |   0   |       |       |       |       |       |
-  `-------------------------------------------------------'   `-------------------------------------------------------'
-
-RAISE
-  ,-------------------------------------------------------.   ,-------------------------------------------------------.
-  |       |   !   |   @   |   #   |   $   |   %   |   _   |   |   `   |   ^   |   &   |  Ins  |   \   |PrntScr|       |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  |       |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|   {   |   |   }   | Left  | Down  |   Up  | Right |   ;   |   "   |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  |       | M-PLAY|M-MUTE |VOL_DWN|VOL_UP |PREV_TR|NEXT_TR|   |PageUp |XXXXXXX|XXXXXXX|   <   |   >   |   ?   | Shift |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  |       |       |   |   |       |       |       |       |   |PageDwn|       |       |       |       |       |       |
-  `-------------------------------------------------------'   `-------------------------------------------------------'
-
-ADJUST
-  ,-------------------------------------------------------.   ,-------------------------------------------------------.
-  |RGB_TOG| MCR1  | MCR2  | MCR3  |XXXXXXX|XXXXXXX|XXXXXXX|   |XXXXXXX|PLAY_M1|PLAY_M2|REC_M1 |REC_M2 |STP_REC| BSPC  |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  | RESET |       |       |       |       |       |       |   |XXXXXXX|XXXXXXX|QWERTY | GAME  |XXXXXXX|XXXXXXX|XXXXXXX|
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  | Shift |       |       |       |       |       |       |   |XXXXXXX| M-PLAY|M-MUTE |VOL_DWN|VOL_UP |PREV_TR|NEXT_TR|
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  | Debug |XXXXXXX|XXXXXXX|       |       |XXXXXXX|XXXXXXX|   |XXXXXXX|XXXXXXX|       | Left  | Down  |   Up  | Right |
-  `-------------------------------------------------------'   `-------------------------------------------------------'
-
-GAME
-  ,-------------------------------------------------------.   ,-------------------------------------------------------.
-  |  Tab  |   Q   |   W   |   E   |   R   |   T   |PrntScr|   |  Esc  |   7   |   8   |   9   |   .   |   =   | BSPC  |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  | Ctrl  |   A   |   S   |   D   |   F   |   G   |  F1   |   |  F2   |   4   |   5   |   6   |   -   |   /   | Enter |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  | Shift |   Z   |   X   |   C   |   V   |   B   |  F2   |   |  Home |   1   |   2   |   3   |   +   |   *   | Shift |
-  |-------+-------+-------+-------+-------+-------+-------|   |-------+-------+-------+-------+-------+-------+-------|
-  |  Del  |  GUI  |  Alt  |  Esc  | LOWER | Space | Enter |   |  End  |   0   | RAISE | Left  | Down  |   Up  | Right |
-  `-------------------------------------------------------'   `-------------------------------------------------------'
-````
-
-## Notes
-
-Supports RGB Underglow color sync to layer switching.
diff --git a/keyboards/biacco42/ergo42/keymaps/ichi-t/config.h b/keyboards/biacco42/ergo42/keymaps/ichi-t/config.h
deleted file mode 100644
index f0717a46328..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/ichi-t/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c b/keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c
deleted file mode 100644
index 39442742908..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _CMOVE 3
-#define _WIN 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,------------------------------------------------.   ,------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  | PGUP |   | PGDN |   Y  |   U  |   I  |   O  |   P  | BSPC |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |  <-  |   |  ->  |   H  |   J  |   K  |   L  |   ;  |  :   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   Z  |   X  |   C  |   V  |   B  | HOME |   | END  |   N  |   M  |   ,  |   .  |   /  |ET/SFT|
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | ESC  | WIN  | ALT  | ALT  | GUI  |LOWER |Space |   |Space |RAISE | GUI  | HOME | LEFT | RGHT | CMOVE|
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[_QWERTY] = LAYOUT(
-  KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,       KC_PGUP, KC_PGDN, KC_Y,       KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_LCTL,  KC_A,    KC_S,   KC_D,    KC_F,    KC_G,       KC_LEFT, KC_RGHT, 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_HOME, KC_END,  KC_N,       KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
-  KC_ESC, TT(_WIN), KC_LALT, KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC,  KC_SPC,  MO(_RAISE), KC_RGUI, KC_RCTL, KC_RSFT, KC_RALT, MO(_CMOVE)
-),
-
-/* RAISE
- * ,------------------------------------------------.   ,------------------------------------------------.
- * | GRV  |  1   |  2   |  3   |  4   |  5   | HOME |   | END  |  6   |  7   |  8   |  9   |  0   | DEL  |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  <-  |   |  ->  |  F6  | MINS | EQL  | LBRC | RBRC | BSLS |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  | F10  | F11  | PGUP |   | PGDN | F12  |      |      |      |      |      |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |Space |   |Space |      |      |      |      |      | Alt+~|
- * `------------------------------------------------'   `------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RALT(KC_GRV)
-),
-
-
-/* LOWER
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |   ~  |   !  |  @   |   #  |  $   |   %  |      |   |      |   ^  |   &  |   *  |   (  |   )  | DEL  |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |   |  UP  |  F6  |  _   |  +   |  {   |   }  |  |   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  | F10  | F11  |      |   | DOWN | F12  |      | PGUP | HOME |  UP  | END  |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   |      |      |      | PGDN | LEFT | DOWN | RGHT |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[_LOWER] = LAYOUT(
-  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_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,   _______, KC_UP,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______,  KC_F7,  KC_F8,    KC_F9,   KC_F10,  KC_F11,  _______, KC_DOWN, KC_F12,  _______, KC_PGUP, KC_HOME, KC_UP,   KC_END,
-  _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* CMOVE
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   |      |      | PGUP | HOME |  UP  | END  |      |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   |      |      | PGDN | LEFT | DOWN | RIGHT|      |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[_CMOVE] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* WIN
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * |      |      |      | LGUI |  ALT |      |      |   |      |      |      | ALT  |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[_WIN] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, KC_LGUI, ALT_T(KC_INT5), _______, _______, _______, _______, ALT_T(KC_INT4), _______, _______, _______, _______
-),
-
-};
diff --git a/keyboards/biacco42/ergo42/keymaps/koba/config.h b/keyboards/biacco42/ergo42/keymaps/koba/config.h
deleted file mode 100644
index f0717a46328..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/koba/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
deleted file mode 100644
index 3f96db27516..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Copyright 2018 Daisuke Kobayashi
- *
- * 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_japanese.h"
-
-enum {
-  _WIN,
-  _MACOS,
-  _LOWER,
-  _RAISE,
-  _FUNC
-};
-
-#define KC_KNA  KC_LNG1
-#define KC_EISU KC_LNG2
-#define LOWER   MO(_LOWER)
-#define RAISE   MO(_RAISE)
-#define FN      MO(_FUNC)
-#define WIN     DF(_WIN)
-#define MACOS   DF(_MACOS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* WIN
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Esc  | Del  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |  @ ` | Bksp |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Tab  | Ctrl |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |  ; + |  ; * |Enter |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | H/Z  |Shift |   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |  , < |  . > |  / ? |  Up  |Shift |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |  Fn  | Ctrl | Win  | Alt  | Mhen |LOWER |Space |   |Space |RAISE | Henk | Menu | Left | Down |Right |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [_WIN] = LAYOUT(
-    KC_ESC,  KC_DEL,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   KC_BSPC,
-    KC_TAB,  KC_RCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, KC_ENT,
-    JP_ZKHK, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,
-    FN,      KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN, LOWER,   KC_SPC,   KC_SPC,  RAISE,   JP_HENK, KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /* MACOS
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * | Esc  | Del  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |  @ ` | Bksp |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Tab  | Ctrl |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |  ; + |  ; * |Enter |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Caps |Shift |   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |  , < |  . > |  / ? |  Up  |Shift |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |  Fn  | Ctrl | Opt  | Cmd  | Eisu |LOWER |Space |   |Space |RAISE | Kana | Cmd  | Left | Down |Right |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [_MACOS] = LAYOUT(
-    KC_ESC,  KC_DEL,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   KC_BSPC,
-    KC_TAB,  KC_RCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, KC_ENT,
-    KC_CAPS, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,
-    FN,      KC_LCTL, KC_LALT, KC_LGUI, KC_EISU, LOWER,   KC_SPC,   KC_SPC,  RAISE,   KC_KNA,  KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /* LOWER
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |      |      |   !  |   "  |   #  |   $  |   %  |   |   &  |   '  |   (  |   )  |      |   =  |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      | XXXX | XXXX | XXXX |   {  |   (  |   |   )  |   }  | XXXX |   ~  |   |  |   _  |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      | XXXX | XXXX | XXXX | XXXX | XXXX |   | XXXX | XXXX | XXXX | XXXX | XXXX | PgUp |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |   |      |      |      |      | Home | PgDn | End  |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT(
-    _______, _______, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5),  S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), JP_EQL,  _______,
-    _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, JP_LCBR, JP_LPRN,  JP_RPRN, JP_RCBR, XXXXXXX, JP_TILD, JP_PIPE, JP_UNDS, _______,
-    _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, _______,
-    _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
-  ),
-
-  /* RAISE
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |      |      |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  |   -  |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      | F11  | F12  | XXXX |   [  |   (  |   |   )  |   ]  | XXXX |   ^  |   \  |   \  |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      |  F1  |  F2  |  F3  |  F4  |  F5  |   |  F6  |  F7  |  F8  |  F9  | F10  |      |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-    _______, _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, _______,
-    _______, _______, KC_F11,  KC_F12,  XXXXXXX, JP_LBRC, JP_LPRN,  JP_RPRN, JP_RBRC, XXXXXXX, JP_CIRC, JP_YEN,  JP_BSLS, _______,
-    _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  /* FUNC
-   * ,------------------------------------------------.   ,------------------------------------------------.
-   * |Reset | Ins  | XXXX | XXXX | XXXX | XXXX | XXXX |   | XXXX | XXXX |PrtSc |SrcLk |Pause | XXXX |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      | XXXX | XXXX | XXXX | XXXX | >Win |   |   *  |   /  | Home | PgUp | XXXX | XXXX |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * | Caps |      | XXXX | XXXX | XXXX | XXXX | >Mac |   |   +  |   -  | End  | PgDn | XXXX | Vol+ |      |
-   * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |   |      |      |      |      | Mute | Vol- | Play |
-   * `------------------------------------------------'   `------------------------------------------------'
-   */
-  [_FUNC] = LAYOUT(
-    QK_BOOT, KC_INS,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, _______,
-    _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, WIN,      JP_ASTR, KC_SLSH, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, _______,
-    KC_CAPS, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MACOS,    JP_PLUS, KC_MINS, KC_END,  KC_PGDN, XXXXXXX, KC_VOLU, _______,
-    _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY
-  )
-};
-
diff --git a/keyboards/biacco42/ergo42/keymaps/koba/readme.md b/keyboards/biacco42/ergo42/keymaps/koba/readme.md
deleted file mode 100644
index bbf9c1c4a6c..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/koba/readme.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Keymap for Ergo42
-
-## About
-
-This keymap is for Ergo42.
-
-- JIS layout.
-- Independent Windows layout/MacOS layout layers.
-- Bottom row keys are arranged like a standard keyboard.
-- Arrow keys are designed in the inverted-T.
-
-## Layout
-
-![keyboard-layout](https://user-images.githubusercontent.com/1042121/52666273-32a45e00-2f51-11e9-9e15-c231155f3bed.png)
-
-## Windows mode/MacOS mode
-
-|mode        |key         |
-|------------|------------|
-|Windows mode|Function + g|
-|MacOS mode  |Function + b|
-
-When switching mode, the following keys switches.
-
-|Windows        |MacOS       |
-|---------------|------------|
-|Alt            |Command(GUI)|
-|Windows(GUI)   |Option(Alt) |
-|Menu(App)      |Command(GUI)|
-|Muhenkan       |Eisu        |
-|Henkan         |Kana        |
-|Hankaku/Zenkaku|Caps        |
-
-## Layers
-
-|No.|Name    |Description                |
-|---|--------|---------------------------|
-| 4 |Function|Mode switch, Media         |
-| 3 |Raise   |Number, Function           |
-| 2 |Lower   |Symbol, Home/End, PgUp/PgDn|
-| 1 |MacOS   |MacOS layout               |
-| 0 |Windows |Windows layout             |
-
-When power is turn on, No.0 Windows layer becomes enabled.
-
-## Windows/MacOS layers
-
-Standard layers for Windows mode/MacOS mode.
-
-## Raise/Lower layers
-
-Layer enabled during pressing Raise or Lower key.
-
-## Function layer
-
-Layer enabled during pressing Function key.
-
diff --git a/keyboards/biacco42/ergo42/keymaps/koba/readme_ja.md b/keyboards/biacco42/ergo42/keymaps/koba/readme_ja.md
deleted file mode 100644
index 188fb48310e..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/koba/readme_ja.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Keymap for Ergo42
-
-## 概要
-
-Ergo42 用キーマップです。
-
-- JIS 配列
-- 独立した Windows 配列/MacOS 配列レイヤー
-- 普通のキーボード配列に似せた最下段キー
-- 逆 T 字 (凸型) 配列の矢印キー
-
-## レイアウト
-
-![keyboard-layout](https://user-images.githubusercontent.com/1042121/52666273-32a45e00-2f51-11e9-9e15-c231155f3bed.png)
-
-## Windows モード/MacOS モード
-
-|モード        |キー        |
-|--------------|------------|
-|Windows モード|Function + g|
-|MacOS モード  |Function + b|
-
-モードを切り替えることで下記のキーが切り替わります。
-
-|Windows     |MacOS       |
-|------------|------------|
-|Alt         |Command(GUI)|
-|Windows(GUI)|Option(Alt) |
-|Menu(App)   |Command(GUI)|
-|無変換      |英数        |
-|変換        |かな        |
-|半角/全角   |Caps        |
-
-## レイヤー
-
-|No.|名称    |内容                      |
-|---|--------|--------------------------|
-| 4 |Function|モード切替, メディア      |
-| 3 |Raise   |数字, ファンクションキー  |
-| 2 |Lower   |記号, Home/End, PgUp/PgDn |
-| 1 |MacOS   |MacOS 配列                |
-| 0 |Windows |Windows 配列              |
-
-電源 ON により No.0 の Windows レイヤーが有効になります。
-
-## Windows/MacOS レイヤー
-
-Windows モード/MacOS モードの標準レイヤー。
-
-## Raise/Lower レイヤー
-
-Raise キーまたは Lower キーを押している間だけ有効になるレイヤー。
-
-普通のキーボードの最上段キー (数字/記号) に加えて、標準レイヤーに入らなかった記号キーが3つ (`[{`, `]}`, `\_`) 入っています。  
-括弧キー `[{`, `]}` は `(`, `)` を加えて、左右対称に配置しました。
-
-## Function レイヤー
-
-Function キーを押している間だけ有効になるレイヤー。
-
-Windows モード/MacOS モードの切り替え、メディア系の操作、標準レイヤーに入らなかった機能キーのレイヤーです。
-
diff --git a/keyboards/biacco42/ergo42/keymaps/shinze/config.h b/keyboards/biacco42/ergo42/keymaps/shinze/config.h
deleted file mode 100644
index f0717a46328..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/shinze/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/biacco42/ergo42/keymaps/shinze/keymap.c b/keyboards/biacco42/ergo42/keymaps/shinze/keymap.c
deleted file mode 100644
index 0240a2e84af..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/shinze/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_bepo.h"
-#include "keymap_french.h"
-
-extern keymap_config_t keymap_config;
-
-#define BASE 0
-#define NUMB 1
-#define SHORT 2
-
-// Special keys
-#define COPY     RGUI(BP_C)
-#define PASTE    RGUI(BP_V)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [BASE] = LAYOUT(
-    KC_TAB,    BP_B,    BP_EACU, BP_P,    BP_O,    BP_EGRV, KC_ESC,      KC_BSPC, BP_DCIR, BP_V,    BP_D,    BP_L,    BP_J,    BP_Z,
-    BP_W,      BP_A,    BP_U,    BP_I,    BP_E,    BP_COMM, _______,     _______, BP_C,    BP_T,    BP_S,    BP_R,    BP_N,    BP_M,
-    KC_LSFT,   BP_AGRV, BP_Y,    BP_X,    BP_DOT,  BP_K,    _______,     _______, BP_QUOT, BP_Q,    BP_G,    BP_H,    BP_F,    BP_CCED,
-    MO(SHORT), KC_LCTL, _______, KC_LALT, KC_LGUI, KC_SPC,  MO(NUMB),    KC_ENT , KC_RSFT, KC_SPC,  _______, _______, _______, _______
-  ),
-
-  [NUMB] = LAYOUT(
-    BP_HASH, BP_DQUO, BP_LDQU, BP_RDQU, BP_LPRN, BP_RPRN, BP_AT,         BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL,  BP_PERC, KC_BSPC,
-    BP_DLR,  BP_1,    BP_2,    BP_3,    BP_4,    BP_5,    KC_LBRC,       KC_RBRC, BP_6,    BP_7,    BP_8,    BP_9,    BP_0,    BP_DEG,
-    _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [SHORT] = LAYOUT(
-    _______, _______, _______, _______,  _______, _______, _______,    _______, _______, _______, _______, _______, _______, QK_BOOT,
-    _______, _______, KC_UP,   _______,  _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, COPY,    PASTE,    _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______
-  )
-
-};
-
diff --git a/keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h b/keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h
deleted file mode 100644
index eb2dbd6dd07..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-/* auto shift config */
-#define AUTO_SHIFT_TIMEOUT 150
-
diff --git a/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c b/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
deleted file mode 100644
index 894af40b3d8..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
+++ /dev/null
@@ -1,162 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _BASE 0
-#define _META 1
-#define _SYMB 2
-#define _GAME 3
-
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  META,
-  SYMB,
-  GAME,
-  EISU,
-  KANA
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* BASE
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |  =   |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  -   |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | EISU | Ctrl | Alt  | GUI  | ESC/ |Del   |Back  |   |Enter |Space | META | GUI  |=>GAME|=>SYMB| KANA |
- * |      |      |      |      | SYMB |      |Space |   |      |      |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[_BASE] = LAYOUT(
-  KC_EQL,  KC_Q,     KC_W,    KC_E,    KC_R,             KC_T,     KC_LBRC,  KC_RBRC,    KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_MINS,
-  KC_TAB,  KC_A,     KC_S,    KC_D,    KC_F,             KC_G,     KC_LPRN,  KC_RPRN,    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_LCBR,  KC_RCBR,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS,
-  EISU,    KC_LCTL,  KC_LALT, KC_LGUI, LT(_SYMB, KC_ESC),KC_DEL,   KC_BSPC,     KC_ENT,    KC_SPC,  META,    KC_LGUI,  TG(_GAME), TG(_SYMB), KANA
-),
-
-/* META
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |      |   |      |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   |      | Left | Down |  Up  |Right | PgUp |      |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  | F10  | F11  | F12  |   |      | Home | End  |Alt+← |Alt+→ | PgDn |      |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   |      |      |      |Reset |      |      |      |
- * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[_META] = LAYOUT(
-  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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_PGUP, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME, KC_END,  LALT(KC_LEFT), LALT(KC_RGHT), KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______
-),
-
-/* SYMB
- * ,------------------------------------------------.   ,------------------------------------------------.
- * |  ~   |   !  |   @  |   #  |   $  |   %  |      |   |      |   ^  |  &   |   *  |   (  |   )  |   -  |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   |      | Left | Down |  Up  |Right | PgUp |      |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  | F10  | F11  | F12  |   |      | Home | End  |Alt+← |Alt+→ | PgDn |      |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   |      |      |      |Reset |      |      |      |
- * |      |      |      |      |      |      |      |   |      |      |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-
-[_SYMB] = LAYOUT(
-  KC_TILD, S(KC_1),  S(KC_2), S(KC_3), S(KC_4), S(KC_5), _______, _______, S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), _______,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_PGUP, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME, KC_END,  LALT(KC_LEFT), LALT(KC_RGHT), KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______
-),
-
-/* GAME
- * ,------------------------------------------------.   ,------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |  [   |   |  ]   |   Y  |   U  |   I  |   O  |   P  |  @   |
- * |------+------+------+------+------+------+------|   |-------------+------+------+------+------+------|
- * | Alt  |   A  |   S  |   D  |   F  |   G  |  (   |   |  )   |   H  |   J  |   K  |   L  |   ;  |  :   |
- * |------+------+------+------+------+------+------|   |------|------+------+------+------+------+------|
- * | Sft  |   Z  |   X  |   C  |   V  |   B  |  {   |   |  }   |   N  |   M  |   ,  |   .  |   /  |\/Sft |
- * |------+------+------+------+------+------+------|   |------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  App |PrtSc | ESC  |Space |Tab   |   |Back  |Enter | Del  |PrtSc |=>GAME|=>SYMB|  \   |
- * |      |      |      |      |      |      |      |   |Space |      |      |      |      |      |      |
- * `------------------------------------------------'   `------------------------------------------------'
- */
-[_GAME] = LAYOUT(
-  KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,   KC_T,   KC_RBRC,    KC_BSLS,    KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    KC_LBRC,
-  KC_LALT,  KC_A,    KC_S,   KC_D,    KC_F,   KC_G,   S(KC_8),    S(KC_9),    KC_H,   KC_J,    KC_K,     KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT,  KC_Z,    KC_X,   KC_C,    KC_V,   KC_B,   S(KC_RBRC), S(KC_BSLS), KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SFT_T(KC_INT1),
-  KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3
-)
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case BASE:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_BASE);
-      }
-      return false;
-      break;
-    case META:
-      if (record->event.pressed) {
-        layer_on(_META);
-        update_tri_layer(_META, _SYMB, _GAME);
-      } else {
-        layer_off(_META);
-        update_tri_layer(_META, _SYMB, _GAME);
-      }
-      return false;
-      break;
-    case SYMB:
-      if (record->event.pressed) {
-        layer_on(_SYMB);
-        update_tri_layer(_META, _SYMB, _GAME);
-      } else {
-        layer_off(_SYMB);
-        update_tri_layer(_META, _SYMB, _GAME);
-      }
-      return false;
-      break;
-    case GAME:
-      if (record->event.pressed) {
-        layer_on(_GAME);
-      } else {
-        layer_off(_GAME);
-      }
-      return false;
-      break;
-    case EISU:
-      if (record->event.pressed) {
-        register_code(KC_LNG2);
-      } else {
-        unregister_code(KC_LNG2);
-      }
-      return false;
-      break;
-    case KANA:
-      if (record->event.pressed) {
-        register_code(KC_LNG1);
-      } else {
-        unregister_code(KC_LNG1);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/biacco42/ergo42/keymaps/yshrsmz/rules.mk b/keyboards/biacco42/ergo42/keymaps/yshrsmz/rules.mk
deleted file mode 100644
index a779882fadf..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/yshrsmz/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-
-AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/biacco42/meishi2/keymaps/led_status/keymap.c b/keyboards/biacco42/meishi2/keymaps/led_status/keymap.c
deleted file mode 100644
index fb8a33930f3..00000000000
--- a/keyboards/biacco42/meishi2/keymaps/led_status/keymap.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * 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 PRO_MICRO_LED_TX D5
-#define PRO_MICRO_LED_RX B0
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* Base */
-    LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C), LCTL(KC_V)
-  )
-};
-
-void matrix_init_user(void) {
-  setPinOutput(PRO_MICRO_LED_TX);
-  setPinOutput(PRO_MICRO_LED_RX);
-}
-
-bool led_update_user(led_t led_state) {
-  writePin(PRO_MICRO_LED_TX, !led_state.num_lock);
-  writePin(PRO_MICRO_LED_RX, !led_state.caps_lock);
-  return true;
-}
diff --git a/keyboards/biacco42/meishi2/keymaps/led_status/readme.md b/keyboards/biacco42/meishi2/keymaps/led_status/readme.md
deleted file mode 100644
index 802ada91db1..00000000000
--- a/keyboards/biacco42/meishi2/keymaps/led_status/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# modified keymap for meishi2
-
-The LED on Pro Micro lights up when CAPS LOCK and NUM LOCK are in place.
diff --git a/keyboards/biacco42/meishi2/keymaps/moc/config.h b/keyboards/biacco42/meishi2/keymaps/moc/config.h
deleted file mode 100644
index 9b5675af6b1..00000000000
--- a/keyboards/biacco42/meishi2/keymaps/moc/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Atsushi Nagase
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/biacco42/meishi2/keymaps/moc/keymap.c b/keyboards/biacco42/meishi2/keymaps/moc/keymap.c
deleted file mode 100644
index 5e6c2e9c20f..00000000000
--- a/keyboards/biacco42/meishi2/keymaps/moc/keymap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2021 Atsushi Nagase
- *
- * 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 meishi2_moc_layers {
-    _DEFAULT,
-    _RAISE
-};
-
-#define PRO_MICRO_LED_TX D5
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_DEFAULT] = LAYOUT( /* Base */
-    RAISE, KC_B, KC_N, KC_SPC
-  ),
-  [_RAISE] = LAYOUT( /* Raise */
-    _______, KC_LEFT, KC_RGHT, LSFT(KC_S)
-  )
-};
-
-void matrix_init_user(void) {
-  setPinOutput(PRO_MICRO_LED_TX);
-  writePinHigh(PRO_MICRO_LED_TX);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (keycode == RAISE) {
-    writePin(PRO_MICRO_LED_TX, !record->event.pressed);
-  }
-  return true;
-}
diff --git a/keyboards/biacco42/meishi2/keymaps/moc/readme.md b/keyboards/biacco42/meishi2/keymaps/moc/readme.md
deleted file mode 100644
index aac1b25c9eb..00000000000
--- a/keyboards/biacco42/meishi2/keymaps/moc/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# [MOC] keymap for meishi2
-
-```
-,--------- ------ ------ -----,
-|  RAISE  |  ⏮  |  ⏭  |  ⏯  |
-`--------- ------ ------ -----'
-```
-
-## Raise Layer
-
-```
-,--------- ------ ------ -----,
-|         |  ⏪  |  ⏩  |  🔀  |
-`--------- ------ ------ -----'
-```
-
-[moc]: http://moc.daper.net/
diff --git a/keyboards/binepad/bn006/config.h b/keyboards/binepad/bn006/config.h
index 0569ccff03c..01b94d6baa5 100755
--- a/keyboards/binepad/bn006/config.h
+++ b/keyboards/binepad/bn006/config.h
@@ -3,68 +3,4 @@
 
 #pragma once
 
-/*
- * RGB Matrix
- */
-
-#ifdef RGB_MATRIX_ENABLE
-    /* ===========================================================================================
-     * PLEASE NOTE:  Because the BN006 only has 6 keys, not all the animations are visually viable
-     * =========================================================================================== */
-
-    #define RGB_MATRIX_LED_COUNT 6
-    #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING // Sets the default mode, if none has been set
-    #define RGB_TRIGGER_ON_KEYDOWN      // Triggers RGB keypress events on key down. This makes RGB control feel more responsive. This may cause RGB to not function properly on some boards
-
-    // 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_SOLID_COLOR
-    // #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
-    // #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
+#define RGB_TRIGGER_ON_KEYDOWN  // Triggers RGB keypress events on key down. This makes RGB control feel more responsive. This may cause RGB to not function properly on some boards
diff --git a/keyboards/binepad/bn006/info.json b/keyboards/binepad/bn006/info.json
index 81e68d2e0c6..e5e25b4b90c 100755
--- a/keyboards/binepad/bn006/info.json
+++ b/keyboards/binepad/bn006/info.json
@@ -33,6 +33,18 @@
         "pin": "B15"
     },
     "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "breathing"
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
@@ -41,7 +53,9 @@
             {"flags": 4, "matrix": [1, 0], "x": 0, "y": 64},
             {"flags": 4, "matrix": [1, 1], "x": 112, "y": 64},
             {"flags": 4, "matrix": [1, 2], "x": 224, "y": 64}
-        ]
+        ],
+        "max_brightness": 200,
+        "sleep": true
     },
     "community_layouts": ["ortho_2x3"],
     "layouts": {
diff --git a/keyboards/binepad/bnk9/config.h b/keyboards/binepad/bnk9/config.h
new file mode 100644
index 00000000000..c774a0f2b09
--- /dev/null
+++ b/keyboards/binepad/bnk9/config.h
@@ -0,0 +1,12 @@
+// Copyright 2023 binepad (@binepad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define ENCODER_DEFAULT_POS 0x3  // enable 1:1 resolution
+
+// Default PIO0 cases flickering in this board.  Setting to PIO1 resolves this issue.
+#define WS2812_PIO_USE_PIO1
+
+// Timing for SK6812
+#define WS2812_T1H 650
diff --git a/keyboards/binepad/bnk9/info.json b/keyboards/binepad/bnk9/info.json
new file mode 100644
index 00000000000..1f3b7cb7b0f
--- /dev/null
+++ b/keyboards/binepad/bnk9/info.json
@@ -0,0 +1,86 @@
+{
+    "manufacturer": "binepad",
+    "keyboard_name": "BNK9",
+    "maintainer": "binepad",
+    "board": "GENERIC_RP_RP2040",
+    "bootloader": "rp2040",
+    "bootloader_instructions": "Hold down the key at (0x0) in the matrix (the 'knob' / rotary encoder) and plug in the keyboard.",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP13", "pin_b": "GP14"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP1", "GP2", "GP3"],
+        "rows": ["GP12", "GP4", "GP5", "GP6"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_pinwheel": true,
+            "cycle_up_down": true,
+            "jellybean_raindrops": true,
+            "riverflow": true,
+            "solid_reactive": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "starlight": true,
+            "starlight_dual_hue": true,
+            "starlight_dual_sat": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [1, 0], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [1, 1], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [1, 2], "x": 144, "y": 0, "flags": 4},
+            {"matrix": [2, 2], "x": 144, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 112, "y": 32, "flags": 4},
+            {"matrix": [2, 0], "x": 80, "y": 32, "flags": 4},
+            {"matrix": [3, 0], "x": 80, "y": 64, "flags": 4},
+            {"matrix": [3, 1], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [3, 2], "x": 144, "y": 64, "flags": 4}
+        ],
+        "led_process_limit": 9,
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "url": "https://www.binepad.com/product-page/bnk9",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4E39",
+        "vid": "0x4249"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP11"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Knob", "matrix": [0, 0], "x": 0, "y": 0, "w": 3, "h": 3, "encoder": 0},
+                {"label": "1", "matrix": [1, 0], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [1, 1], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [1, 2], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [2, 0], "x": 3.25, "y": 1},
+                {"label": "5", "matrix": [2, 1], "x": 4.25, "y": 1},
+                {"label": "6", "matrix": [2, 2], "x": 5.25, "y": 1},
+                {"label": "7", "matrix": [3, 0], "x": 3.25, "y": 2},
+                {"label": "8", "matrix": [3, 1], "x": 4.25, "y": 2},
+                {"label": "9", "matrix": [3, 2], "x": 5.25, "y": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/binepad/bnk9/keymaps/default/keymap.c b/keyboards/binepad/bnk9/keymaps/default/keymap.c
new file mode 100644
index 00000000000..9ae1e4541f6
--- /dev/null
+++ b/keyboards/binepad/bnk9/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2023 Binepad (@binpad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_MUTE,
+        KC_P1,    KC_P2,    KC_P3,
+        KC_P4,    KC_P5,    KC_P6,
+        KC_P7,    KC_P8,    LT(1, KC_P9)
+    ),
+    [1] = LAYOUT(
+        RGB_TOG,
+        RGB_HUI,  RGB_SAI,  RGB_SPI,
+        RGB_HUD,  RGB_SAD,  RGB_SPD,
+        RGB_RMOD, RGB_MOD,  _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+
+#endif
diff --git a/keyboards/rgbkb/mun/keymaps/peott-fr/rules.mk b/keyboards/binepad/bnk9/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/rgbkb/mun/keymaps/peott-fr/rules.mk
rename to keyboards/binepad/bnk9/keymaps/default/rules.mk
diff --git a/keyboards/binepad/bnk9/keymaps/via/keymap.c b/keyboards/binepad/bnk9/keymaps/via/keymap.c
new file mode 100644
index 00000000000..9ae1e4541f6
--- /dev/null
+++ b/keyboards/binepad/bnk9/keymaps/via/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2023 Binepad (@binpad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_MUTE,
+        KC_P1,    KC_P2,    KC_P3,
+        KC_P4,    KC_P5,    KC_P6,
+        KC_P7,    KC_P8,    LT(1, KC_P9)
+    ),
+    [1] = LAYOUT(
+        RGB_TOG,
+        RGB_HUI,  RGB_SAI,  RGB_SPI,
+        RGB_HUD,  RGB_SAD,  RGB_SPD,
+        RGB_RMOD, RGB_MOD,  _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+
+#endif
diff --git a/keyboards/binepad/bnk9/keymaps/via/rules.mk b/keyboards/binepad/bnk9/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/binepad/bnk9/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/binepad/bnk9/readme.md b/keyboards/binepad/bnk9/readme.md
new file mode 100644
index 00000000000..f8e6633b143
--- /dev/null
+++ b/keyboards/binepad/bnk9/readme.md
@@ -0,0 +1,27 @@
+# BINEPAD BNK9
+
+![BINEPAD BNK9](https://i.imgur.com/FrkVRhhh.jpg)
+
+A 3x3 macropad with a large rotary encoder.
+
+* Keyboard Maintainer: [binepad](https://github.com/binepad)
+* Hardware Supported: BINPAD BNK9
+* Hardware Availability: [binepad.com](https://www.binepad.com/product-page/bnk9)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make binepad/bnk9:default
+
+Flashing example for this keyboard:
+
+    make binepad/bnk9: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 (0x0) in the matrix (the 'knob' / rotary encoder) and plug in the keyboard.
+* **Physical reset button**: Briefly press the PCB button located on the back of the PCB.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` *(or* `RESET` *in VIA)* if it is available.
diff --git a/keyboards/binepad/bnk9/rules.mk b/keyboards/binepad/bnk9/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/binepad/bnk9/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/bioi/bluetooth_custom.c b/keyboards/bioi/bluetooth_custom.c
index 4ea277f731a..c3e12d3c6a1 100644
--- a/keyboards/bioi/bluetooth_custom.c
+++ b/keyboards/bioi/bluetooth_custom.c
@@ -59,9 +59,7 @@ static void bluefruit_trace_footer(void)
 static void bluefruit_serial_send(uint8_t data)
 {
 #ifdef BLUEFRUIT_TRACE_SERIAL
-    dprintf(" ");
-    debug_hex8(data);
-    dprintf(" ");
+    dprintf(" %02X ", data);
 #endif
     serial_send(data);
 }
@@ -146,11 +144,7 @@ void bluetooth_send_consumer(uint16_t usage)
     uint16_t bitmap = CONSUMER2BLUEFRUIT(usage);
 
 #ifdef BLUEFRUIT_TRACE_SERIAL
-    dprintf("\nData: ");
-    debug_hex16(data);
-    dprintf("; bitmap: ");
-    debug_hex16(bitmap);
-    dprintf("\n");
+    dprintf("\nData: %04X; bitmap: %04X\n", data, bitmap);
     bluefruit_trace_header();
 #endif
     send_str(PSTR("AT+BLEHIDCONTROLKEY=0x"));
diff --git a/keyboards/bioi/g60/rules.mk b/keyboards/bioi/g60/rules.mk
index 375cb52732a..3635daac6f3 100644
--- a/keyboards/bioi/g60/rules.mk
+++ b/keyboards/bioi/g60/rules.mk
@@ -12,11 +12,8 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Reduce firmware size
 BLUETOOTH_ENABLE = yes
 
-VIA_ENABLE = yes            # VIA support should be enabled here due to the main() loop will be compiled first.
-
 UART_DRIVER_REQUIRED = yes
 SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/g60ble/keymaps/chemicalwill/keymap.c b/keyboards/bioi/g60ble/keymaps/chemicalwill/keymap.c
deleted file mode 100644
index 680c9687957..00000000000
--- a/keyboards/bioi/g60ble/keymaps/chemicalwill/keymap.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* Copyright 2023 Will Hedges (@will-hedges)
- *
- * 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 {
-    _WORK,
-    _QWER,
-    _FN1
-};
-
-enum custom_keycodes {
-    BASE_QWER = SAFE_RANGE,
-    BASE_WORK
-};
-
-// Tap Dance enum
-enum {
-    N8_F8,
-    N9_F9,
-    N0_F10,
-    MINS_F11,
-    EQL_F12,
-    DEL_BSLS,
-    G_END,
-    H_HOME,
-    LALT_PGUP,
-    RALT_PGDN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_WORK] = LAYOUT_60_ansi(
-        QK_GESC,           KC_1,    KC_2,            KC_3,   KC_4,    KC_5,      KC_6,       KC_7,    TD(N8_F8), TD(N9_F9), TD(N0_F10),      TD(MINS_F11), TD(EQL_F12), 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,     TD(DEL_BSLS),
-        LT(_FN1, KC_CAPS), KC_A,    KC_S,            KC_D,   KC_F,    TD(G_END), TD(H_HOME), 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, LALT_T(KC_PGUP),                  KC_SPC,                                               RALT_T(KC_PGDN), KC_APP,       MO(_FN1),    KC_RCTL
-    ),
-
-    [_QWER] = LAYOUT_60_ansi(
-        QK_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_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,  TD(DEL_BSLS),
-        LT(_FN1, 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_APP,  MO(_FN1), KC_RCTL
-    ),
-
-    [_FN1] = LAYOUT_60_ansi(
-        _______, 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_PGUP, _______, QK_RBT,  _______, _______, _______, KC_UP,   _______, _______, _______,   _______, _______,
-        _______, KC_HOME,      KC_PGDN, KC_END,  _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,            _______,
-        _______,               _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,            _______,
-        _______, C(A(KC_DEL)), _______,                   _______,                                     _______, BASE_WORK, _______, BASE_QWER
-    )
-
-};
-
-
-// Tap Dance tap vs. hold docs @ https://docs.qmk.fm/#/feature_tap_dance?id=example-3
-//  Macros are also used with process_record_user @ https://docs.qmk.fm/#/feature_macros?id=using-macros-in-c-keymaps
-typedef struct {
-    uint16_t tap;
-    uint16_t hold;
-    uint16_t held;
-} tap_dance_tap_hold_t;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    tap_dance_action_t *action;
-
-    switch (keycode) {
-        // MACROS
-        case BASE_QWER:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWER);
-            }
-            break;
-
-        case BASE_WORK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_WORK);
-            }
-            break;
-
-        // TAP DANCES
-        case TD(N8_F8):
-            action = &tap_dance_actions[TD_INDEX(keycode)];
-            if (!record->event.pressed && action->state.count && !action->state.finished) {
-                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
-                tap_code16(tap_hold->tap);
-            }
-            break;
-
-        case TD(N9_F9):
-            action = &tap_dance_actions[TD_INDEX(keycode)];
-            if (!record->event.pressed && action->state.count && !action->state.finished) {
-                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
-                tap_code16(tap_hold->tap);
-            }
-            break;
-
-        case TD(N0_F10):
-            action = &tap_dance_actions[TD_INDEX(keycode)];
-            if (!record->event.pressed && action->state.count && !action->state.finished) {
-                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
-                tap_code16(tap_hold->tap);
-            }
-            break;
-
-        case TD(MINS_F11):
-            action = &tap_dance_actions[TD_INDEX(keycode)];
-            if (!record->event.pressed && action->state.count && !action->state.finished) {
-                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
-                tap_code16(tap_hold->tap);
-            }
-            break;
-
-        case TD(EQL_F12):
-            action = &tap_dance_actions[TD_INDEX(keycode)];
-            if (!record->event.pressed && action->state.count && !action->state.finished) {
-                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
-                tap_code16(tap_hold->tap);
-            }
-            break;
-
-        case TD(DEL_BSLS):
-            action = &tap_dance_actions[TD_INDEX(keycode)];
-            if (!record->event.pressed && action->state.count && !action->state.finished) {
-                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
-                tap_code16(tap_hold->tap);
-            }
-            break;
-
-        case TD(G_END):
-            action = &tap_dance_actions[TD_INDEX(keycode)];
-            if (!record->event.pressed && action->state.count && !action->state.finished) {
-                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
-                tap_code16(tap_hold->tap);
-            }
-            break;
-
-        case TD(H_HOME):
-            action = &tap_dance_actions[TD_INDEX(keycode)];
-            if (!record->event.pressed && action->state.count && !action->state.finished) {
-                tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
-                tap_code16(tap_hold->tap);
-            }
-            break;
-
-        }
-    return true;
-}
-
-void tap_dance_tap_hold_finished(tap_dance_state_t *state, void *user_data) {
-    tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data;
-
-    if (state->pressed) {
-        if (state->count == 1
-#ifndef PERMISSIVE_HOLD
-            && !state->interrupted
-#endif
-        ) {
-            register_code16(tap_hold->hold);
-            tap_hold->held = tap_hold->hold;
-        } else {
-            register_code16(tap_hold->tap);
-            tap_hold->held = tap_hold->tap;
-        }
-    }
-}
-
-void tap_dance_tap_hold_reset(tap_dance_state_t *state, void *user_data) {
-    tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data;
-
-    if (tap_hold->held) {
-        unregister_code16(tap_hold->held);
-        tap_hold->held = 0;
-    }
-}
-
-#define ACTION_TAP_DANCE_TAP_HOLD(tap, hold) \
-    { .fn = {NULL, tap_dance_tap_hold_finished, tap_dance_tap_hold_reset}, .user_data = (void *)&((tap_dance_tap_hold_t){tap, hold, 0}), }
-
-tap_dance_action_t tap_dance_actions[] = {
-    [N8_F8] = ACTION_TAP_DANCE_TAP_HOLD(KC_8, KC_F8),
-    [N9_F9] = ACTION_TAP_DANCE_TAP_HOLD(KC_9, KC_F9),
-    [N0_F10] = ACTION_TAP_DANCE_TAP_HOLD(KC_0, KC_F10),
-    [MINS_F11] = ACTION_TAP_DANCE_TAP_HOLD(KC_MINS, KC_F11),
-    [EQL_F12] = ACTION_TAP_DANCE_TAP_HOLD(KC_EQL, KC_F12),
-    [DEL_BSLS] = ACTION_TAP_DANCE_TAP_HOLD(KC_DEL, KC_BSLS),
-    [G_END] = ACTION_TAP_DANCE_TAP_HOLD(KC_G, KC_END),
-    [H_HOME] = ACTION_TAP_DANCE_TAP_HOLD(KC_H, KC_HOME)
-};
diff --git a/keyboards/bioi/g60ble/keymaps/chemicalwill/rules.mk b/keyboards/bioi/g60ble/keymaps/chemicalwill/rules.mk
deleted file mode 100644
index c86c7b33406..00000000000
--- a/keyboards/bioi/g60ble/keymaps/chemicalwill/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# features enabled by default that I want to turn off
-BACKLIGHT_ENABLE = no
-MOUSEKEY_ENABLE = no
-RGBLIGHT_ENABLE = no
-
-# features I want to add
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/bioi/morgan65/rules.mk b/keyboards/bioi/morgan65/rules.mk
index 375cb52732a..3635daac6f3 100644
--- a/keyboards/bioi/morgan65/rules.mk
+++ b/keyboards/bioi/morgan65/rules.mk
@@ -12,11 +12,8 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Reduce firmware size
 BLUETOOTH_ENABLE = yes
 
-VIA_ENABLE = yes            # VIA support should be enabled here due to the main() loop will be compiled first.
-
 UART_DRIVER_REQUIRED = yes
 SRC += bluetooth_custom.c
diff --git a/keyboards/black_hellebore/config.h b/keyboards/black_hellebore/config.h
index ae0bc0aedb6..53910fed097 100644
--- a/keyboards/black_hellebore/config.h
+++ b/keyboards/black_hellebore/config.h
@@ -13,70 +13,12 @@
  * 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 RGB_MATRIX_ENABLE
-
-	#define WS2812_PWM_DRIVER PWMD1
-	#define WS2812_PWM_CHANNEL 1
-	#define WS2812_PWM_PAL_MODE 1						//TIM1_CH1N (AF1)
-	#define WS2812_PWM_COMPLEMENTARY_OUTPUT
-	#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
-	#define WS2812_DMA_CHANNEL 7						//7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298)
 
-    #define RGB_MATRIX_LED_COUNT 61                     // The number of LEDs connected
-    
-    #define RGB_MATRIX_KEYPRESSES                       // reacts to keypresses
-    #define RGB_MATRIX_KEYRELEASES                      // reacts to keyreleases (instead of keypresses)
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS              // enable framebuffer effects
-
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
-
-    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS) */
-    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-    /* RGB_MATRIX_KEYPRESSES) | defined(RGB_MATRIX_KEYRELEASES) */
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-    
-#endif
+#pragma once
 
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_PWM_PAL_MODE 1						//TIM1_CH1N (AF1)
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
+#define WS2812_DMA_CHANNEL 7						//7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298)
diff --git a/keyboards/black_hellebore/info.json b/keyboards/black_hellebore/info.json
index bc70e3eb984..b59cb8f7b97 100644
--- a/keyboards/black_hellebore/info.json
+++ b/keyboards/black_hellebore/info.json
@@ -29,6 +29,48 @@
         "vid": "0x3141"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 7, "y": 5},
@@ -92,7 +134,8 @@
             {"flags": 4, "matrix": [4, 10], "x": 177, "y": 54},
             {"flags": 4, "matrix": [4, 11], "x": 196, "y": 54},
             {"flags": 4, "matrix": [4, 13], "x": 215, "y": 54}
-        ]
+        ],
+        "react_on_keyup": true
     },
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h b/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h
deleted file mode 100644
index 2644dc8d65f..00000000000
--- a/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 SamuraiKek
- *
- * 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 EE_HANDS
-#define TAPPING_TERM 200
-#define MOUSEKEY_INTERVAL 16
-#define MOUSEKEY_MAX_SPEED 3
-#define MOUSEKEY_TIME_TO_MAX 30
-#define MOUSEKEY_WHEEL_MAX_SPEED 10
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 30
-// place overrides here
diff --git a/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c b/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c
deleted file mode 100644
index 5c2d29f197e..00000000000
--- a/keyboards/blank_tehnologii/manibus/keymaps/samurai/keymap.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright 2021 SamuraiKek
- *
- * 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 custom_layers {
-    _QWERTY,
-    _LOWER,
-    _UPPER,
-    _MOUSE,
-    _MEDIA,
-};
-#define MD_SPC MT(MOD_LSFT, KC_SPC)
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  UPPER,
-  MOUSE,
-  MEDIA
-};
-/*
-    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, L46, R40, R41, R42, R43, R44, R45, R46,
-
-    [_UNIVERSAL] = LAYOUT(
-    //   ┌────────┬────────┬────────┬────────┬────────┬────────┐                       ┌────────┬────────┬────────┬────────┬────────┬────────┐
-          _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-    //   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-          _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-    //   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-          _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-    //   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-          _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-    //   ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐     ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-          _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______, _______
-    //   └────────┴────────┴────────┴────────┴────────┴────────┴────────┘     └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-      )
-
-*/
-
-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,    KC_EQL,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      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_LGUI, 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_BSLS,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐     ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-      TG(MOUSE), KC_HOME, MO(UPPER),KC_RALT, KC_LCTL, MD_SPC,  KC_LALT,     KC_ENT, KC_BSPC, MO(LOWER), KC_DEL,  KC_INS, KC_END, MO(MEDIA)
-//   └────────┴────────┴────────┴────────┴────────┴────────┴────────┘     └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-//   ┌────────┬────────┬────────┬────────┬────────┬────────┐                       ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,                          KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______,                         _______, _______, KC_UP,   KC_LBRC, KC_RBRC, KC_F12,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, KC_LCTL, KC_RCTL, _______, _______,                         _______, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐     ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, KC_PGUP, _______, _______, _______, _______, _______,       _______, _______, _______, _______,  _______, KC_PGDN, _______
-//   └────────┴────────┴────────┴────────┴────────┴────────┴────────┘     └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_UPPER] = LAYOUT(
-//   ┌────────┬────────┬────────┬────────┬────────┬────────┐                       ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______,                         KC_NUM,  KC_P7,   KC_P8,   KC_P9,   _______, KC_F12,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______,  _______, _______,                        KC_PPLS, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, _______,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______,                         KC_P0,   KC_P1,   KC_P2,   KC_P3,   KC_PDOT, _______,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐     ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______,  _______, _______, _______, _______
-//   └────────┴────────┴────────┴────────┴────────┴────────┴────────┘     └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_MOUSE] = LAYOUT(
-//   ┌────────┬────────┬────────┬────────┬────────┬────────┐                       ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______,                         KC_CAPS, KC_WH_U, KC_MS_U, _______, _______, _______,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, KC_NUM,  KC_BTN3, KC_BTN2, KC_BTN1, _______,                         _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, KC_BTN3,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______,                         _______, KC_WH_D, KC_BTN2, _______, _______, _______,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐     ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______, _______,       _______, KC_BTN1, _______, _______, _______, _______, _______
-//   └────────┴────────┴────────┴────────┴────────┴────────┴────────┘     └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_MEDIA] = LAYOUT(
-//   ┌────────┬────────┬────────┬────────┬────────┬────────┐                       ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, KC_VOLU,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, KC_MPLY, KC_VOLD,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┤                       ├────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______,                         _______, KC_MUTE, KC_MPRV, KC_MNXT, _______, _______,
-//   ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐     ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-      _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______, _______
-//   └────────┴────────┴────────┴────────┴────────┴────────┴────────┘     └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
-
-//nano to manibus communcation
-bool led_update_user(led_t state) {
-    if (state.caps_lock != layer_state_is(_MOUSE)) {
-        layer_invert(_MOUSE);
-    }
-    return true;
-}
diff --git a/keyboards/blank_tehnologii/manibus/keymaps/samurai/readme.md b/keyboards/blank_tehnologii/manibus/keymaps/samurai/readme.md
deleted file mode 100644
index 5a5d0780486..00000000000
--- a/keyboards/blank_tehnologii/manibus/keymaps/samurai/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-#Manibus Samurai Layout
-
-This is the personal layout of Alex Paulescu/SamuraiKek, the creator and maintainer of the board. 
-
-This layout is the culmination of almost a year of using Manibus in various situations, offering a good balance between writing code, typing exercises and gaming.
diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h
deleted file mode 100644
index b98cb7964fd..00000000000
--- a/keyboards/blockboy/ac980mini/config.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2022 rooski15 (@rooski15)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// RGB configuration
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT  81
-
-#ifdef RGB_MATRIX_ENABLE
-//#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-//#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash. 
-
-/* Enable the animations you want/need.  You may need to enable only a small number of these because       *
- * they take up a lot of space.  Enable and confirm that you can still successfully compile your firmware. */
-// 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 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
-
-/*
- * 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
diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/info.json
index 36d6fe5ba9e..4bc05236bcc 100644
--- a/keyboards/blockboy/ac980mini/info.json
+++ b/keyboards/blockboy/ac980mini/info.json
@@ -19,9 +19,56 @@
         "pin": "B7"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "sat_steps": 8,
         "val_steps": 8,
+        "max_brightness": 150,
+        "sleep": true,
         "speed_steps": 10
     },
     "layouts": {
diff --git a/keyboards/blockey/keymaps/eucalyn/keymap.c b/keyboards/blockey/keymaps/eucalyn/keymap.c
deleted file mode 100644
index 20ab8ed1175..00000000000
--- a/keyboards/blockey/keymaps/eucalyn/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2018 Eucalyn
- *
- * 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 RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-    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_TAB,  KC_Q,    KC_W,    KC_COMM, KC_DOT,  KC_SCLN, KC_M,    KC_R,    KC_D,    KC_Y,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_LCTL, KC_A,    KC_O,    KC_E,    KC_I,    KC_U,    KC_G,    KC_T,    KC_K,    KC_S,    KC_N,    KC_QUOT,          KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_F,    KC_B,    KC_H,    KC_J,    KC_L,    KC_SLSH,          KC_UP,   MO(1),
-    KC_ESC,  KC_CAPS, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = 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,  _______,
-    _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          _______,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_PGUP, _______,
-    _______, _______, _______, _______,                            _______,                            KC_HOME, KC_PGDN, KC_END
-  ),
-
-};
diff --git a/keyboards/blu/vimclutch/keymaps/vc_i/keymap.c b/keyboards/blu/vimclutch/keymaps/vc_i/keymap.c
deleted file mode 100644
index b42f2ca0f05..00000000000
--- a/keyboards/blu/vimclutch/keymaps/vc_i/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2023 Brandon Lu
- *
- * 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 {
-    _VC,
-    _VIM
-};
-
-enum my_keycodes {
-    USER_CLUTCH = QK_USER
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_VC] = LAYOUT(
-        TO(_VC),    TO(_VIM),  KC_F13
-    ),
-
-    [_VIM] = LAYOUT(
-        TO(_VC),    TO(_VIM),  USER_CLUTCH
-    )
-};
-
-/* Layer-specific lighting */
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(F4, !layer_state_cmp(state, _VC));
-    writePin(F5, !layer_state_cmp(state, _VIM));
-    return state;
-};
-
-/* Define vim-clutching */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case USER_CLUTCH:
-        if (record->event.pressed) {
-            tap_code_delay(KC_ESC, 50); 
-            tap_code_delay(KC_I, 50); 
-        } else {
-            tap_code_delay(KC_ESC, 50); 
-        }
-        break;
-    }
-    return true;
-};
diff --git a/keyboards/blu/vimclutch/keymaps/vc_i/readme.md b/keyboards/blu/vimclutch/keymaps/vc_i/readme.md
deleted file mode 100644
index 1c2506a0600..00000000000
--- a/keyboards/blu/vimclutch/keymaps/vc_i/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# "Traditionalist" keymap for the vim clutch
-
-The two enclosure tactile switches change between modes "voice chat" (default) and "vim clutch."
-
-The voice chat mode uses `F13` to activate or deactivate push-to-talk.
-
-The vim clutch uses the `ESC` and `i` keys to clutch into and out of vim.
diff --git a/keyboards/blu/vimclutch/keymaps/vim_ai/keymap.c b/keyboards/blu/vimclutch/keymaps/vim_ai/keymap.c
deleted file mode 100644
index 107ea4bfd1a..00000000000
--- a/keyboards/blu/vimclutch/keymaps/vim_ai/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2021 John Mueller
- *
- * 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 {
-    _VIMA,
-    _VIMI
-};
-
-enum my_keycodes {
-    CLUTCH_A = QK_USER,
-    CLUTCH_I
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_VIMA] = LAYOUT(
-        TO(_VIMA),    TO(_VIMI),  CLUTCH_A
-    ),
-
-    [_VIMI] = LAYOUT(
-        TO(_VIMA),    TO(_VIMI),  CLUTCH_I
-    )
-};
-
-/* Layer-specific lighting */
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(F4, !layer_state_cmp(state, _VIMA));
-    writePin(F5, !layer_state_cmp(state, _VIMI));
-    return state;
-};
-
-/* Define vim-clutching */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case CLUTCH_A:
-        if (record->event.pressed) {
-            tap_code_delay(KC_ESC, 50); 
-            tap_code_delay(KC_A, 50); 
-        } else {
-            tap_code_delay(KC_ESC, 50); 
-        }
-        break;
-    case CLUTCH_I:
-        if (record->event.pressed) {
-            tap_code_delay(KC_ESC, 50); 
-            tap_code_delay(KC_I, 50); 
-        } else {
-            tap_code_delay(KC_ESC, 50); 
-        }
-        break;
-    }
-    return true;
-};
diff --git a/keyboards/blu/vimclutch/keymaps/vim_ai/readme.md b/keyboards/blu/vimclutch/keymaps/vim_ai/readme.md
deleted file mode 100644
index b1521819f9a..00000000000
--- a/keyboards/blu/vimclutch/keymaps/vim_ai/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Hardcore AI keymap for the vim clutch
-
-The two enclosure tactile switches change between different ways of using the vim clutch.
-
-The first vim clutch mode uses the `ESC` and `a` keys to clutch into and out of vim.
-
-The second vim clutch mode uses the `ESC` and `i` keys to clutch into and out of vim.
-
-These different modes can be combined with shift when using vim to jump to the end or the beginning of a line.  The first mode with `a` jumps to the end.  The second mode with `i` jumps to the beginning.
diff --git a/keyboards/bluebell/swoop/keymaps/kyek/config.h b/keyboards/bluebell/swoop/keymaps/kyek/config.h
deleted file mode 100644
index 6b06855a5aa..00000000000
--- a/keyboards/bluebell/swoop/keymaps/kyek/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Duccio Breschi <ducciobreschi@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 ONESHOT_TIMEOUT 1000
diff --git a/keyboards/bluebell/swoop/keymaps/kyek/keymap.c b/keyboards/bluebell/swoop/keymaps/kyek/keymap.c
deleted file mode 100644
index 1901c24f272..00000000000
--- a/keyboards/bluebell/swoop/keymaps/kyek/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright 2022 Duccio Breschi <ducciobreschi@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
-#include "keymap_italian.h"
-
-enum layers {
-    _BASE = 0,
-    _SYM1,
-    _EXT,
-    _FNC,
-    _SYM2,
-    _ACC,
-    _SET,
-};
-
-// Combo Layers
-enum combos {
-  ACC,
-  SET,
-};
-const uint16_t PROGMEM accent_combo[] = {KC_SPC, MO(_SYM1), COMBO_END};
-const uint16_t PROGMEM settings_combo[] = {MO(_EXT), SFT_T(KC_SPC), COMBO_END};
-combo_t key_combos[] = {
-  [ACC] = COMBO(accent_combo, MO(_ACC)),
-  [SET] = COMBO(settings_combo, MO(_SET)),
-};
-// -----
-
-// Layer Aliases
-#define SYM1 MO(_SYM1)
-#define EXT MO(_EXT)
-#define FNC MO(_FNC)
-#define SYM2 MO(_SYM2)
-// #define ACC MO(_ACC)
-// #define SET MO(_SET)
-// Oneshot Aliases
-#define OS_CTL OSM(MOD_LCTL)
-#define OS_ALT OSM(MOD_LALT)
-#define OS_SFT OSM(MOD_LSFT)
-#define OS_GUI OSM(MOD_LGUI)
-#define OS_RALT OSM(MOD_RALT)
-// Other Aliases
-#define DEL_WORD LCTL(KC_BSPC)
-#define UNDO LCTL(KC_Z)
-#define COPY LCTL(KC_C)
-#define CUT LCTL(KC_X)
-#define PASTE LCTL(KC_V)
-#define BACKTICK RALT(KC_MINS)
-#define TILDE RALT(KC_EQL)
-#define CEGR RSA(KC_E)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT_split_3x5_3(
-  IT_Q,   IT_W,    IT_E,    IT_R,    IT_T,        IT_Y,    IT_U,    IT_I,    IT_O,    IT_P,
-  IT_A,   IT_S,    IT_D,    IT_F,    IT_G,        IT_H,    IT_J,    IT_K,    IT_L,    IT_OGRV,
-  IT_Z,   IT_X,    IT_C,    IT_V,    IT_B,        IT_N,    IT_M,    IT_COMM, IT_DOT,  IT_UGRV,
-                   XXXXXXX, EXT, SFT_T(KC_SPC),      KC_SPC,  SYM1,  XXXXXXX
-),
-[_SYM1] = LAYOUT_split_3x5_3(
-  IT_1,   IT_2,    IT_3,    IT_4,    IT_5,        IT_6,    IT_7,    IT_8,    IT_9,    IT_0,
-  IT_LABK,   IT_PERC,    IT_LPRN,    IT_LCBR,    IT_LBRC,        IT_EQL,    IT_QUES,    IT_QUOT,    IT_PLUS,    IT_ASTR,
-  IT_RABK,   IT_DLR,    IT_RPRN,    IT_RCBR,    IT_RBRC,        IT_AT,    IT_EXLM,    IT_DQUO, IT_MINS,  IT_SLSH,
-                   XXXXXXX, FNC, SYM2,          _______,  _______,  XXXXXXX
-),
-[_EXT] = LAYOUT_split_3x5_3(
-  KC_ESC, _______, _______, _______, _______,        KC_PAGE_UP, KC_HOME, KC_UP, KC_END, KC_CAPS,
-  OS_ALT, OS_GUI, OS_SFT, OS_CTL, OS_RALT,        KC_PAGE_DOWN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DELETE,
-  UNDO, CUT, COPY, KC_TAB, PASTE,                 DEL_WORD, KC_BSPC, _______, _______, _______,
-                    _______, _______, _______,        KC_ENT, FNC, _______
-),
-[_FNC] = LAYOUT_split_3x5_3(
-  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,        KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
-  OS_ALT, OS_GUI, OS_SFT, OS_CTL, OS_RALT,           KC_F11, KC_F12, KC_PSCR, _______, _______,
-  _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,
-                    _______, _______, _______,        _______, _______, _______
-),
-[_SYM2] = LAYOUT_split_3x5_3(
-  IT_CIRC, IT_UNDS, IT_PND, IT_EURO, IT_HASH,        _______, _______, _______, _______, _______,
-  BACKTICK, TILDE, IT_BSLS, IT_PIPE, IT_AMPR,        _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,
-                    _______, _______, _______,        _______, _______, _______
-),
-[_ACC] = LAYOUT_split_3x5_3(
-  _______, _______, _______, CEGR, _______,        _______, _______, _______, _______, _______,
-  IT_AGRV, IT_IGRV, IT_OGRV, IT_EGRV, IT_EACU,        _______, _______, _______, _______, _______,
-  _______, _______, _______, IT_UGRV, _______,        _______, _______, _______, _______, _______,
-                    _______, _______, _______,        _______, _______, _______
-),
-[_SET] = LAYOUT_split_3x5_3(
-  _______, _______, _______, RGB_RMOD, RGB_MOD,        RGB_VAI, RGB_VAD, _______, _______, _______,
-  _______, _______, _______, RGB_M_B, RGB_M_P,        RGB_HUI, RGB_HUD, _______, _______, _______,
-  QK_BOOT, _______, _______, RGB_M_R, RGB_TOG,        RGB_SAI, RGB_SAD, _______, _______, QK_BOOT,
-                    _______, _______, _______,        _______, _______, _______
-),
-// [_TEMP] = LAYOUT_split_3x5_3(
-//   _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,
-//   _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,
-//   _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,
-//                     _______, _______, _______,        _______, _______, _______
-// ),
-};
diff --git a/keyboards/bluebell/swoop/keymaps/kyek/rules.mk b/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
deleted file mode 100644
index fb46c2589d3..00000000000
--- a/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Enables Link Time Optimization (LTO) when compiling the keyboard. This makes the process take longer,
-# but it can significantly reduce the compiled size (and since the firmware is small, the added time is not noticeable).
-LTO_ENABLE = no
-
-# Audio control and System control
-EXTRAKEY_ENABLE = no
-
-# ENCODER_ENABLE = no
-# WPM_ENABLE = no
-
-# Enable keyboard underlight functionality
-RGBLIGHT_ENABLE = yes
-
-COMBO_ENABLE = yes
diff --git a/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c b/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
deleted file mode 100644
index c0817ed7c0d..00000000000
--- a/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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 _FUNC   MO(_FN)
-#define _LSADEL LSA_T(KC_DEL)
-#define _AGRHOM RALT_T(KC_HOME)
-#define _CTLEND RCTL_T(KC_END)
-#define _CTLALT LCTL(KC_LALT)
-#define _LSNUBS LSFT_T(KC_NUBS)
-#define _MINMIZ LGUI(KC_D)
-
-// Layer shorthand
-enum layer_names {
-    _ZERO,
-    _FN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
-    [_ZERO] = LAYOUT_ansi(
-       KC_ESC,    KC_BSLS,KC_GRV,  KC_1,     KC_2,   KC_3,   KC_4,   KC_5,                       KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINS,KC_EQL,KC_BSPC,
-       KC_INS,         KC_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_BSPC,
-                 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_LSFT,          KC_Z,           KC_X,   KC_C,   KC_V,   KC_B,   _LSADEL,    KC_LGUI,KC_N,   KC_M,   KC_COMM,KC_DOT,         KC_SLSH,KC_RSFT,      KC_UP,
-                 _FUNC,                                  KC_LALT,    KC_SPC,             _AGRHOM,                                          _CTLEND,    KC_LEFT,KC_DOWN,KC_RGHT
-    ), 
-
-    
-    [_FN] = LAYOUT_ansi(
-       _MINMIZ,   _______,_______,   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_CALC,      _______,    _______,    _______,_______,QK_BOOT,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
-                 KC_CAPS,      _______,      KC_SCRL,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,
-           _LSNUBS,          _______,        _______,_______,_______,KC_PAUS,_______,    KC_RGUI,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
-                 _______,                                _CTLALT,    KC_DEL,             _______,                                          _______,    _______,KC_PGDN,_______
-    )
-};
diff --git a/keyboards/boardsource/4x12/keymaps/codecoffeecode/keymap.c b/keyboards/boardsource/4x12/keymaps/codecoffeecode/keymap.c
deleted file mode 100644
index 102c3b2b427..00000000000
--- a/keyboards/boardsource/4x12/keymaps/codecoffeecode/keymap.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2020 codecoffeecode
- *
- * 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 {
-    _MAIN,
-    _LOWER,
-    _RAISE,
-};
-
-// Readability keycodes
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Layer _MAIN
-     * ,-----------------------------------------------------------------------------------.
-     * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  /   |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl | Caps |  Alt |  GUI |Layer1|    Space    |Layer2| Left | Down |  Up  |Right |
-     * `-----------------------------------------------------------------------------------'
-     */
-  [_MAIN] = LAYOUT_ortho_4x12(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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_CAPS, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-    /* Layer _LOWER
-     * ,-----------------------------------------------------------------------------------.
-     * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  Del |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      | Vol- | Vol+ | Mute | Play |      |      |  F11 |  F12 |      |      |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Reset|      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-  [_LOWER] = LAYOUT_ortho_4x12(
-  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, KC_F11,  KC_F12,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  /* Layer _RAISE
-     * ,-----------------------------------------------------------------------------------.
-     * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |   -  |   =  |   [  |   ]  |  \   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-  [_RAISE] = LAYOUT_ortho_4x12(
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-
-};
diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h
deleted file mode 100644
index 75b5888bc34..00000000000
--- a/keyboards/boardsource/beiwagon/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2022 Boardsource
-
-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_MATRIX_LED_COUNT 18
-#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_PINWHEEL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#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_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
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/info.json
index b02c5288678..39a9006b85c 100644
--- a/keyboards/boardsource/beiwagon/info.json
+++ b/keyboards/boardsource/beiwagon/info.json
@@ -25,6 +25,40 @@
     "vid": "0x4273"
   },
   "rgb_matrix": {
+    "animations":{
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_pinwheel_sat": true,
+      "band_spiral_sat": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_nexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true
+    },
     "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 16, "y": 38},
diff --git a/keyboards/boardsource/equals/48/config.h b/keyboards/boardsource/equals/48/config.h
index 952fa269c6e..39d114872fb 100644
--- a/keyboards/boardsource/equals/48/config.h
+++ b/keyboards/boardsource/equals/48/config.h
@@ -1,11 +1,10 @@
 // Copyright 2023 Cole Smith (@boardsource)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
 
-#define RGB_MATRIX_LED_COUNT 58
-
 #define AUDIO_PIN GP29
 #define AUDIO_PWM_DRIVER PWMD6
 #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B
diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/info.json
index 63561f4c597..054779f6fe1 100644
--- a/keyboards/boardsource/equals/48/info.json
+++ b/keyboards/boardsource/equals/48/info.json
@@ -14,53 +14,6 @@
         "pin": "GP21"
     },
     "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "animations": {
-            "alphas_mods": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_sat": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "band_val": true,
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "cycle_up_down": true,
-            "digital_rain": true,
-            "dual_beacon": true,
-            "gradient_left_right": true,
-            "gradient_up_down": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "jellybean_raindrops": true,
-            "multisplash": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "pixel_rain": true,
-            "rainbow_beacon": true,
-            "rainbow_moving_chevron": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "solid_multisplash": true,
-            "solid_reactive": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_multinexus": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_simple": true,
-            "solid_reactive_wide": true,
-            "solid_splash": true,
-            "splash": true,
-            "typing_heatmap": true
-        },
         "layout": [
             { "flags": 2, "x": 220, "y": 17 },
             { "flags": 2, "x": 172, "y": 17 },
diff --git a/keyboards/boardsource/equals/60/config.h b/keyboards/boardsource/equals/60/config.h
index ee4bc6b1e85..39d114872fb 100644
--- a/keyboards/boardsource/equals/60/config.h
+++ b/keyboards/boardsource/equals/60/config.h
@@ -1,11 +1,10 @@
 // Copyright 2023 Cole Smith (@boardsource)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
 
-#define RGB_MATRIX_LED_COUNT 70
-
 #define AUDIO_PIN GP29
 #define AUDIO_PWM_DRIVER PWMD6
 #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B
diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/info.json
index 355e434b4e5..da3fc3691a6 100644
--- a/keyboards/boardsource/equals/60/info.json
+++ b/keyboards/boardsource/equals/60/info.json
@@ -14,53 +14,6 @@
         "pin": "GP21"
     },
     "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "animations": {
-            "alphas_mods": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_sat": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "band_val": true,
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "cycle_up_down": true,
-            "digital_rain": true,
-            "dual_beacon": true,
-            "gradient_left_right": true,
-            "gradient_up_down": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "jellybean_raindrops": true,
-            "multisplash": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "pixel_rain": true,
-            "rainbow_beacon": true,
-            "rainbow_moving_chevron": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "solid_multisplash": true,
-            "solid_reactive": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_multinexus": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_simple": true,
-            "solid_reactive_wide": true,
-            "solid_splash": true,
-            "splash": true,
-            "typing_heatmap": true
-        },
         "layout": [
             { "flags": 2, "x": 220, "y": 17 },
             { "flags": 2, "x": 172, "y": 17 },
diff --git a/keyboards/boardsource/equals/avr/config.h b/keyboards/boardsource/equals/avr/config.h
deleted file mode 100644
index 68754cbe528..00000000000
--- a/keyboards/boardsource/equals/avr/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2023 Cole Smith (@boardsource)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-#define RGB_MATRIX_LED_COUNT 70
diff --git a/keyboards/boardsource/equals/avr/info.json b/keyboards/boardsource/equals/avr/info.json
index bbade34e638..942feba4ecd 100644
--- a/keyboards/boardsource/equals/avr/info.json
+++ b/keyboards/boardsource/equals/avr/info.json
@@ -13,53 +13,6 @@
         "pin": "C6"
      },
     "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "animations": {
-            "alphas_mods": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_sat": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "band_val": true,
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "cycle_up_down": true,
-            "digital_rain": true,
-            "dual_beacon": true,
-            "gradient_left_right": true,
-            "gradient_up_down": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "jellybean_raindrops": true,
-            "multisplash": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "pixel_rain": true,
-            "rainbow_beacon": true,
-            "rainbow_moving_chevron": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "solid_multisplash": true,
-            "solid_reactive": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_multinexus": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_simple": true,
-            "solid_reactive_wide": true,
-            "solid_splash": true,
-            "splash": true,
-            "typing_heatmap": true
-        },
         "layout": [
             { "flags": 2, "x": 220, "y": 17 },
             { "flags": 2, "x": 172, "y": 17 },
diff --git a/keyboards/boardsource/equals/avr/rules.mk b/keyboards/boardsource/equals/avr/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/boardsource/equals/avr/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/boardsource/equals/equals.c b/keyboards/boardsource/equals/equals.c
index 8eb933e70d2..074fa3df3e2 100644
--- a/keyboards/boardsource/equals/equals.c
+++ b/keyboards/boardsource/equals/equals.c
@@ -1,18 +1,54 @@
 // Copyright 2023 @boardsource
 // SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "quantum.h"
-__attribute__((weak)) void ui_init(void) {};
-__attribute__((weak)) void ui_task(void) {};
 
 #ifdef QUANTUM_PAINTER_ENABLE
+#include "qp.h"
+#include "qp_st7735.h"
+#include "graphics/thintel15.qff.c"
+
+static painter_device_t      oled;
+static painter_font_handle_t font;
+
+__attribute__((weak)) void ui_init(void) {
+    oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0);
+    font = qp_load_font_mem(font_thintel15);
+    qp_init(oled, QP_ROTATION_0);
+    qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true);
+    qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true);
+    qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true);
+    qp_flush(oled);
+}
+
+__attribute__((weak)) void ui_task(void) {
+    static const char *text  = "Layer:";
+    int16_t            width = qp_textwidth(font, text);
+    qp_drawtext(oled, 20, 140, font, text);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            qp_drawtext(oled, (20 + width), 140, font, "QWERTY");
+            break;
+        case 1:
+            qp_drawtext(oled, (20 + width), 140, font, "SYMBOL");
+            break;
+        case 2:
+            qp_drawtext(oled, (20 + width), 140, font, "NUMBER");
+            break;
+        default:
+            qp_drawtext(oled, (20 + width), 140, font, "_PANIC_");
+            break;
+    }
+}
+
 void keyboard_post_init_kb(void) {
-    // Init the display
     ui_init();
     keyboard_post_init_user();
 }
 
 void housekeeping_task_kb(void) {
-    // Draw the display
     ui_task();
+    housekeeping_task_user();
 }
-#endif //QUANTUM_PAINTER_ENABLE
+#endif // QUANTUM_PAINTER_ENABLE
diff --git a/keyboards/boardsource/equals/info.json b/keyboards/boardsource/equals/info.json
index bed8ec2640c..c6d6245dbfc 100644
--- a/keyboards/boardsource/equals/info.json
+++ b/keyboards/boardsource/equals/info.json
@@ -4,18 +4,64 @@
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
-        "command": false,
-        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgb_matrix": true
         },
-    "url": "",
     "usb": {
         "device_version": "1.0.0",
         "pid": "0x7688",
         "vid": "0x4273"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sleep": true,
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        }
     }
-
 }
diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md
index 9c5d48f5c29..82d24b18145 100644
--- a/keyboards/boardsource/equals/readme.md
+++ b/keyboards/boardsource/equals/readme.md
@@ -3,7 +3,7 @@
 ![equals](https://i.imgur.com/c3adFqsh.jpeg)
 
 * Keyboard Maintainer: [Cole Smith](https://github.com/boardsource)
-* Hardware Supported: Equals PCB w/ RP2040
+* Hardware Supported: Equals PCB w/ RP2040 or Equals Kit w/ Pro Micro
 * Hardware Availability: [boardsource](https://boardsource.xyz)
 
 Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/boardsource/equals/ui.c b/keyboards/boardsource/equals/ui.c
deleted file mode 100644
index f953fc4c889..00000000000
--- a/keyboards/boardsource/equals/ui.c
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2023 Cole Smith (@boardsource)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include <stdio.h>
-#include "qp.h"
-#include "qp_st7735.h"
-#include "graphics/thintel15.qff.c"
-
-static painter_device_t      oled;
-static painter_font_handle_t font;
-
-__attribute__((weak)) void ui_init(void) {
-    oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0);
-    font = qp_load_font_mem(font_thintel15);
-    qp_init(oled, QP_ROTATION_0);
-    qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true);
-    qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true);
-    qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true);
-    qp_flush(oled);
-}
-
-__attribute__((weak)) void ui_task(void) {
-    static const char *text  = "Layer:";
-    int16_t            width = qp_textwidth(font, text);
-    qp_drawtext(oled, 20, 140, font, text);
-
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            qp_drawtext(oled, (20 + width), 140, font, "QWERTY");
-            break;
-        case 1:
-            qp_drawtext(oled, (20 + width), 140, font, "SYMBOL");
-            break;
-        case 2:
-            qp_drawtext(oled, (20 + width), 140, font, "NUMBER");
-            break;
-        default:
-            qp_drawtext(oled, (20 + width), 140, font, "_PANIC_");
-            break;
-    }
-}
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/keymap.c b/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/keymap.c
deleted file mode 100644
index 0afc1368544..00000000000
--- a/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2022 boardsource
- *
- * 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_2x3(
-        RGB_TOG, KC_VOLU, KC_F2,
-        RGB_MOD, KC_VOLD, KC_F1
-    )
-};
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;
-}
-
-static void render_RIP(void) {
-  static const char PROGMEM my_logo[] = {
-    0xff, 0xff, 0x07, 0x1e, 0x70, 0xc0, 0x00, 0x00, 0xe0, 0x78, 0x1e, 0x07, 0xff, 0xfe, 0x00, 0x00,
-    0x00, 0x00, 0x03, 0x06, 0x1c, 0xb8, 0xf0, 0xe0, 0xb8, 0x1c, 0x0e, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x3e, 0x66, 0x63, 0x63, 0x43, 0x43, 0xc3, 0xc2, 0x82,
-    0x00, 0x00, 0x00, 0x30, 0xf0, 0xc0, 0x00, 0x00, 0xc0, 0xf0, 0x30, 0xf0, 0x80, 0x00, 0x00, 0xc0,
-    0xf0, 0x10, 0x00, 0x00, 0x00, 0xf3, 0xf3, 0x00, 0x00, 0x10, 0x18, 0xfe, 0x18, 0x10, 0x10, 0x10,
-    0x00, 0x00, 0xc0, 0xe0, 0x30, 0x10, 0x18, 0x18, 0x18, 0x10, 0x10, 0x00, 0x00, 0x00, 0xff, 0xff,
-    0x30, 0x10, 0x18, 0x18, 0x18, 0x30, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0x90, 0x90, 0x98,
-    0x98, 0x98, 0xb0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x90, 0x98, 0x98, 0x18, 0x18, 0x10, 0x00,
-    0x1f, 0x1f, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00,
-    0x00, 0x10, 0x1c, 0x0e, 0x07, 0x01, 0x00, 0x00, 0x01, 0x07, 0x0e, 0x1c, 0x18, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x18, 0x18, 0x10, 0x10, 0x18, 0x18, 0x0d, 0x0f,
-    0x03, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x1e, 0x1e, 0x07, 0x00, 0x00, 0x01, 0x0f, 0x1c, 0x1e, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x18, 0x18, 0x18,
-    0x00, 0x00, 0x03, 0x0f, 0x0c, 0x18, 0x10, 0x10, 0x10, 0x18, 0x08, 0x00, 0x00, 0x00, 0x1f, 0x1f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x08, 0x18, 0x10,
-    0x10, 0x10, 0x18, 0x18, 0x08, 0x00, 0x00, 0x08, 0x18, 0x10, 0x11, 0x11, 0x11, 0x19, 0x0f, 0x0e,
-    0x00, 0x30, 0x30, 0x10, 0x10, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0,
-    0x30, 0x10, 0x18, 0x18, 0x10, 0x70, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xb0, 0x10, 0x18,
-    0x18, 0x10, 0x30, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x70, 0x10, 0x18, 0x18, 0x10, 0x30,
-    0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x10, 0x18, 0x18, 0x18,
-    0x10, 0x30, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0x30, 0x10, 0x18, 0x10, 0x30, 0xf0,
-    0xe0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x10, 0x18, 0x18, 0x10, 0x30, 0xf0, 0xe0, 0x00, 0x00,
-    0x00, 0x00, 0xc0, 0xe0, 0x30, 0x10, 0x18, 0x18, 0x10, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xff, 0xff, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc7,
-    0xc4, 0x8c, 0x8c, 0xcc, 0xc4, 0x77, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x38, 0x7d, 0xc7, 0xc3, 0x82,
-    0x82, 0xc3, 0xc7, 0x7d, 0x7c, 0x00, 0x00, 0x00, 0x0f, 0x3f, 0x70, 0xc0, 0x80, 0x80, 0xc0, 0xc0,
-    0x7f, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08,
-    0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf0, 0xd8, 0xcc,
-    0xc6, 0xc3, 0xc1, 0xc0, 0x00, 0x00, 0x00, 0x0f, 0x3f, 0x70, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0x70,
-    0x3f, 0x0f, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xd8, 0xcc, 0xcc, 0xc7, 0xc3, 0xc1, 0x00, 0x00,
-    0x00, 0x00, 0x3f, 0x7f, 0xe0, 0xc0, 0x80, 0x80, 0xc0, 0x60, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00
-  };
-  oled_write_raw_P(my_logo, sizeof(my_logo));
-}
-
-bool oled_task_user(void) {
-  render_RIP();
-  return false;
-}
-#endif
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/keymap.c b/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/keymap.c
deleted file mode 100644
index 1ddad75827d..00000000000
--- a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2022 boardsource
- *
- * 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_2x3(
-        RGB_TOG, KC_1, KC_2,
-        RGB_MOD, KC_3,KC_4
-    )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;
-}
-
-static void render_RIP(void) {
-  static const char PROGMEM my_logo[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x08, 0x04,
-    0x04, 0x7c, 0xfc, 0xf0, 0x00, 0x00, 0x40, 0x20, 0xf0, 0x7c, 0x06, 0x00, 0x41, 0xc0, 0x00, 0x00,
-    0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0xc0, 0x00,
-    0x00, 0x00, 0xe0, 0x60, 0x00, 0x80, 0x40, 0x20, 0x20, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x3c, 0x02,
-    0x01, 0xc1, 0xf8, 0x0e, 0x00, 0x01, 0xc0, 0x00, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x50, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x08,
-    0x03, 0x00, 0x00, 0x0f, 0x06, 0x01, 0x00, 0x1e, 0x1f, 0x10, 0x00, 0x00, 0x1e, 0x1f, 0x08, 0xc0,
-    0x3e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1e, 0x11, 0x08, 0x04, 0x1e, 0x11, 0x00,
-    0x08, 0x06, 0x01, 0x00, 0x1e, 0x19, 0x08, 0x00, 0x1e, 0x0b, 0x08, 0x00, 0x1f, 0x1b, 0x08, 0x00,
-    0x18, 0x1f, 0x00, 0x00, 0x00, 0x1f, 0x12, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x19, 0x08, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
-    0x84, 0x84, 0x84, 0xcc, 0x38, 0x00, 0x00, 0x00, 0xf0, 0x18, 0x04, 0x05, 0x0f, 0x79, 0xe1, 0x00,
-    0x00, 0x00, 0xc0, 0x78, 0x0c, 0x00, 0x00, 0x0c, 0x84, 0x84, 0xcc, 0xf8, 0x30, 0x00, 0x00, 0xe0,
-    0xf8, 0x0c, 0x04, 0x04, 0x0c, 0xf8, 0x80, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x00, 0x00, 0x08, 0x0c,
-    0x04, 0x04, 0xcc, 0x78, 0x00, 0x00, 0x00, 0xf0, 0x18, 0x0c, 0x04, 0x0c, 0x18, 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, 0x10,
-    0x10, 0x10, 0x10, 0x19, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x18, 0x10, 0x10, 0x18, 0x0f, 0x07, 0x00,
-    0x20, 0x1e, 0x03, 0x00, 0x00, 0x00, 0x18, 0x10, 0x10, 0x10, 0x10, 0x1d, 0x0f, 0x00, 0x00, 0x03,
-    0x0f, 0x18, 0x10, 0x10, 0x18, 0x0f, 0x00, 0x00, 0x38, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x18, 0x1c,
-    0x16, 0x13, 0x10, 0x10, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x10, 0x10, 0x10, 0x0c, 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
-  };
-  oled_write_raw_P(my_logo, sizeof(my_logo));
-}
-
-bool oled_task_user(void) {
-  render_RIP();
-  return false;
-}
-#endif
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk b/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h
deleted file mode 100644
index 537bf0da1ce..00000000000
--- a/keyboards/boardsource/lulu/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2022 Cole Smith <cole@boadsource.xyz>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#define RGB_MATRIX_LED_COUNT 70
diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h
deleted file mode 100644
index 7dea913a0f3..00000000000
--- a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2022 Cole Smith <cole@boardsource.xyz>
- * Copyright 2022 David Rambo <davidrambo@mailfence.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 MASTER_RIGHT
-#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
-#define CAPS_WORD_IDLE_TIMEOUT 3000  // 3 seconds.
-
-#define TAPPING_TERM 210
-/*#define PERMISSIVE_HOLD*/
-#define TAPPING_FORCE_HOLD
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#endif
diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/keymap.c b/keyboards/boardsource/lulu/keymaps/davidrambo/keymap.c
deleted file mode 100644
index 8e5b56b943d..00000000000
--- a/keyboards/boardsource/lulu/keymaps/davidrambo/keymap.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* Copyright 2022 Cole Smith <cole@boardsource.xyz>
- * Copyright 2022 David Rambo <davidrambo@mailfence.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 custom_layers {
-    _COLEMAK,
-    _GAME,
-    _SYMBOL,
-    _NAVIGATION,
-    _FKEYS,
-};
-
-//keycode shorthands
-#define SYM  MO(2)
-#define NAV  LT(3, KC_ESC)
-#define FKEY MO(4)
-
-//aliases for clarity in layering
-#define SftEnt  SFT_T(KC_ENT)   // Shift when held, Enter when tapped
-#define BSCTL   LCTL_T(KC_BSPC) // Ctrl when held, Backspace when tapped
-
-//aliases for clarity in layering
-#define C_TAB   LCTL(KC_TAB)
-#define A_TAB   LALT(KC_TAB)
-#define G_TAB   LGUI(KC_TAB)    // Mac: switch applications
-
-#define CBSPC   LCTL(KC_BSPC)  // delete whole word
-#define G_LEFT  LGUI(KC_LEFT)
-#define G_RGHT  LGUI(KC_RGHT)
-#define CRGHT   LCTL(KC_RGHT)
-#define CLEFT   LCTL(KC_LEFT)
-
-// Left-hand home row mods
-#define HOME_A LALT_T(KC_A)
-#define HOME_R LGUI_T(KC_R)
-#define HOME_S LSFT_T(KC_S)
-#define HOME_T LCTL_T(KC_T)
-
-// Right-hand home row mods
-#define HOME_N RCTL_T(KC_N)
-#define HOME_E RSFT_T(KC_E)
-#define HOME_I LGUI_T(KC_I)
-#define HOME_O LALT_T(KC_O)
-
-//internet browser tab shortcuts and window swapping
-#define CTLPGDN LCTL(KC_PGDN)
-#define CTLPGUP LCTL(KC_PGUP)
-
-#define G_GRV   LGUI(KC_GRV)
-#define SftEnt  SFT_T(KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `~  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  =   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |                    |   J  |   L  |   U  |   Y  |   :  | BSP  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |EscNAV|   A  |   R  |   S  |   T  |   D  |-------.    ,-------|   H  |   N  |   E  |   I  |   O  |  '   |
- * |------+------+------+------+------+------|   NO  |    |   NO  |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   K  |   M  |   ,  |   .  |   /  |EntSft|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | Del  | LGUI | LALT | /LCTL/BS/       \Space \  | SYM  | FKEY | RALT |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
- [_COLEMAK] = LAYOUT(
-  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_TAB,   KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,                     KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  NAV,      HOME_A, HOME_R,  HOME_S,  HOME_T,  KC_D,                     KC_H,    HOME_N,  HOME_E,  HOME_I,  HOME_O,  KC_QUOT,
-  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   KC_MUTE,   KC_NO, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SftEnt,
-                     MEH_T(KC_DEL), KC_LALT, KC_LGUI, BSCTL,          KC_SPC,   SYM,   FKEY, KC_RALT
-),
-
-/* Gaming Layer
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  ESC |  T   |  Q   |  W   |  E   |  R   |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  TAB | LSFT |  S   |  A   |  D   |  F   |-------.    ,-------|      |      |      |      |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * | LALT | LCTL |  Z   |  X   |  C   |  V   |-------|    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |      | /       /       \      \  |      |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_GAME] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, TO(0),
-  KC_ESC , KC_T   , KC_Q   , KC_W   , KC_E   , KC_R   ,                      _______, _______, _______, _______, _______, _______,
-  KC_TAB , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   ,                      _______, _______, _______, _______, _______, _______,
-  KC_LALT, KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   ,  _______,  _______,  _______, _______, _______, _______, _______, _______,
-                               KC_M,    KC_I,    KC_B,  KC_SPC ,    _______,  _______, _______, _______
-),
-
-/* Symbol Layer
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  F12 |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   [  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |   ]  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  \|  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   -  |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      | HOME |  END |   [  |   ]  |      |-------|    |-------|  `~  |   _  | PGUP |   {  |   }  |   |  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | ____ | ____ | ____ | / ____  /       \ ____ \  |RAISE | PGDN | ____ |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-[_SYMBOL] = LAYOUT(
-  KC_F12 , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                    KC_F6  , KC_F7  , KC_F8  , KC_F9 ,  KC_F10 , KC_F11 ,
-  KC_LBRC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                    KC_6   , KC_7   , KC_8   , KC_9  ,  KC_0   , KC_RBRC,
-  KC_BSLS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL ,
-  _______, KC_HOME, KC_END , KC_LBRC, KC_RBRC, _______, _______,  _______, KC_GRV , KC_MINS, KC_PGUP, _______, _______, _______,
-                            _______, _______, _______, _______,    _______, _______, KC_PGDN, _______
-),
-/* Navigation
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |  UP  |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      | LEFT | DOWN |RIGHT |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |      | /       /       \      \  |      |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_NAVIGATION] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  _______, _______, KC_BTN2, KC_MS_U, KC_BTN1, _______,                      C_TAB  , CLEFT  ,  KC_UP , CRGHT  , KC_DEL , _______,
-  _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,                      CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
-  _______, _______, _______, KC_WH_U, KC_WH_D, _______,  _______,  _______,  A_TAB  , CBSPC  , _______, _______, G_GRV  , _______,
-                            _______, _______, _______,  _______,    _______,  _______, _______, _______
-),
-/* Function Keys
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | BOOT |      |      |      |      |      |                    | LALT<-->LGUI|      |      |      | BOOT |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |BRGHT-| SAT- | HUE- |BRGHT+|                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |RGBMOD| SAT+ | HUE+ |RGBTOG|-------.    ,-------|      |      |      |      |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |VOL UP|VOL DN| PLAY |    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |      | /       /       \      \  |      |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_FKEYS] = LAYOUT(
-  QK_BOOT, _______, _______, _______, _______, _______,                      LAG_SWP, LAG_NRM, _______, _______, _______, QK_BOOT,
-  _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_VAI,                      _______, _______, _______, _______, _______, TO(1)  ,
-  _______, _______, RGB_MOD, RGB_SAI, RGB_HUI, RGB_TOG,                      _______, _______, _______, _______, _______, TO(0)  ,
-  _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY,  _______,  _______,  _______, _______, _______, _______, _______, _______,
-                            _______, _______, _______,  _______,    _______,  _______, _______, _______
-)
-};
-
-#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_WH_U);
-        } else {
-            tap_code(KC_WH_D);
-        }
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/readme.org b/keyboards/boardsource/lulu/keymaps/davidrambo/readme.org
deleted file mode 100644
index 11ac7db365f..00000000000
--- a/keyboards/boardsource/lulu/keymaps/davidrambo/readme.org
+++ /dev/null
@@ -1,12 +0,0 @@
-#+title: README
-
-This is my configuration for the Lulu received as part of Boardsource's 2022 group buy.
-Since I already have a few keyboards configured with QMK, I decided to swap out KMK.
-Hopefully this helps others get started.
-
-The base layer is colemak.
-
-I use this keymap on both Linux and MacOS.
-To keep muscle memory between the two as similar as possible, it takes advantage of QMK's boot magic keycodes.
-The ~_FKEYS~ layer provides access to a Left Alt and GUI switch.
-(I use LAlt with yabai on MacOS and GUI with Pop OS's tiling.)
diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/rules.mk b/keyboards/boardsource/lulu/keymaps/davidrambo/rules.mk
deleted file mode 100644
index f7aa3b0bf76..00000000000
--- a/keyboards/boardsource/lulu/keymaps/davidrambo/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CAPS_WORD_ENABLE = yes
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/boardsource/microdox/keymaps/cole/keymap.c b/keyboards/boardsource/microdox/keymaps/cole/keymap.c
deleted file mode 100644
index 8c177be5a5e..00000000000
--- a/keyboards/boardsource/microdox/keymaps/cole/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2022 Cole Smith <cole@boadsource.xyz>
-
-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,
-    _RAISE,
-    _LOWER
-};
-
-#define KC_CTSC RCTL_T(KC_SCLN)
-#define LOWER_SPC LT(_LOWER, KC_SPC)
-#define RASE_BACK LT(_RAISE, KC_BSPC)
-#define SHFT_Z MT(MOD_LSFT, KC_Z)
-#define SHIFT_SLASH MT(MOD_RSFT,KC_SLSH)
-#define RASE_ENT LT(_RAISE, KC_ENT)
-#define CTRL_A MT(MOD_LCTL,KC_A)
-#define PREVWINDOW MT(MOD_LCTL, KC_LEFT)
-#define NEXTWINDOW MT(MOD_LCTL, KC_RGHT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x5_3(
-        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,
-      CTRL_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L, KC_CTSC,
-     SHFT_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M, KC_COMM,  KC_DOT, SHIFT_SLASH,
-                       MO(_LOWER),KC_LGUI, RASE_ENT,       RASE_BACK, LOWER_SPC, KC_TAB
-  ),
-  [_RAISE] = LAYOUT_split_3x5_3(
-        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-      KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, KC_QUOT,
-     KC_LSFT, KC_GRV, PREVWINDOW, NEXTWINDOW, XXXXXXX,           KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
-                         _______, KC_LGUI, KC_ENT,           KC_BSPC,  KC_SPC, _______
-  ),
-  [_LOWER] = LAYOUT_split_3x5_3(
-       KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,             KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-       KC_ESC,   XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,            KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, KC_DQT,
-       KC_ESC,   KC_TILD, PREVWINDOW, NEXTWINDOW, RGB_MODE_FORWARD,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-                            _______,  KC_LGUI,  KC_ENT,         KC_BSPC,  KC_SPC, _______
-  )
-};
diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h
deleted file mode 100644
index 236254317a5..00000000000
--- a/keyboards/boardsource/microdox/v2/config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2022 jack (@waffle87)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#define RGB_MATRIX_LED_COUNT 44
-#define RGB_MATRIX_SPLIT { 22, 22 }
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json
index dccecb4980e..94577059c52 100644
--- a/keyboards/boardsource/microdox/v2/info.json
+++ b/keyboards/boardsource/microdox/v2/info.json
@@ -35,6 +35,14 @@
     }
   },
   "rgb_matrix": {
+    "animations": {
+      "alphas_mods": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "cycle_left_right": true,
+      "cycle_spiral": true,
+      "jellybean_raindrops": true
+    },
     "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 12, "y": 11},
@@ -81,6 +89,9 @@
       {"flags": 1, "matrix": [7, 4], "x": 124, "y": 64},
       {"flags": 1, "matrix": [7, 3], "x": 149, "y": 64},
       {"flags": 1, "matrix": [7, 2], "x": 174, "y": 64}
-    ]
+    ],
+    "max_brightness": 150,
+    "sleep": true,
+    "split_count": [22, 22]
   }
 }
diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h
deleted file mode 100644
index 4d7d053cfbc..00000000000
--- a/keyboards/boardsource/technik_o/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright 2022 Boardsource
-
-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_MATRIX_MAXIMUM_BRIGHTNESS 120
-#define RGB_MATRIX_LED_COUNT 58
-#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_PINWHEEL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#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_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
-// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/boardsource/technik_o/info.json b/keyboards/boardsource/technik_o/info.json
index 91840eeb4fc..65d46a8b62e 100644
--- a/keyboards/boardsource/technik_o/info.json
+++ b/keyboards/boardsource/technik_o/info.json
@@ -26,6 +26,31 @@
     "vid": "0x4273"
   },
   "rgb_matrix": {
+    "animations":{
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_pinwheel_sat": true,
+      "band_spiral_sat": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true
+    },
     "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 220, "y": 17},
@@ -86,7 +111,8 @@
       {"flags": 1, "matrix": [3, 9], "x": 183, "y": 64},
       {"flags": 1, "matrix": [3, 10], "x": 203, "y": 64},
       {"flags": 1, "matrix": [3, 11], "x": 224, "y": 64}
-    ]
+    ],
+    "max_brightness": 120
   },
   "community_layouts": [
     "ortho_4x12"
diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h
deleted file mode 100644
index b01542d77b7..00000000000
--- a/keyboards/boardsource/technik_s/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright 2022 Boardsource
-
-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_MATRIX_MAXIMUM_BRIGHTNESS 120
-#define RGB_MATRIX_LED_COUNT 55
-#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_PINWHEEL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#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_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
-// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/info.json
index 0c8b101b20e..ffb8cb09ec2 100644
--- a/keyboards/boardsource/technik_s/info.json
+++ b/keyboards/boardsource/technik_s/info.json
@@ -26,6 +26,31 @@
     "vid": "0x4273"
   },
   "rgb_matrix": {
+    "animations":{
+        "gradient_up_down": true,
+        "gradient_left_right": true,
+        "breathing": true,
+        "band_sat": true,
+        "band_pinwheel_sat": true,
+        "band_spiral_sat": true,
+        "cycle_all": true,
+        "cycle_left_right": true,
+        "cycle_up_down": true,
+        "rainbow_moving_chevron": true,
+        "cycle_pinwheel": true,
+        "cycle_spiral": true,
+        "dual_beacon": true,
+        "rainbow_beacon": true,
+        "rainbow_pinwheels": true,
+        "raindrops": true,
+        "jellybean_raindrops": true,
+        "hue_breathing": true,
+        "hue_pendulum": true,
+        "hue_wave": true,
+        "pixel_rain": true,
+        "pixel_flow": true,
+        "pixel_fractal": true
+    },
     "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 220, "y": 17},
@@ -83,7 +108,8 @@
       {"flags": 4, "matrix": [3, 9], "x": 183, "y": 64},
       {"flags": 4, "matrix": [3, 10], "x": 203, "y": 64},
       {"flags": 1, "matrix": [3, 11], "x": 224, "y": 64}
-    ]
+    ],
+    "max_brightness": 120
   },
   "layouts": {
     "LAYOUT": {
diff --git a/keyboards/boardsource/the_mark/config.h b/keyboards/boardsource/the_mark/config.h
deleted file mode 100644
index 6d9c9642de6..00000000000
--- a/keyboards/boardsource/the_mark/config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2022 Boardsource
-
-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 RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 24
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    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_PINWHEEL_SAT
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    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_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
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#endif
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index c574f7ab66f..8dc08e4fc45 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -43,6 +43,40 @@
     "pin": "C6"
   },
   "rgb_matrix": {
+    "animations":{
+        "gradient_up_down": true,
+        "gradient_left_right": true,
+        "breathing": true,
+        "band_sat": true,
+        "band_pinwheel_sat": true,
+        "band_spiral_sat": true,
+        "cycle_all": true,
+        "cycle_left_right": true,
+        "cycle_up_down": true,
+        "rainbow_moving_chevron": true,
+        "cycle_pinwheel": true,
+        "cycle_spiral": true,
+        "dual_beacon": true,
+        "rainbow_beacon": true,
+        "rainbow_pinwheels": true,
+        "raindrops": true,
+        "jellybean_raindrops": true,
+        "hue_breathing": true,
+        "hue_pendulum": true,
+        "hue_wave": true,
+        "pixel_rain": true,
+        "pixel_flow": true,
+        "pixel_fractal": true,
+        "typing_heatmap": true,
+        "digital_rain": true,
+        "solid_reactive": true,
+        "solid_reactive_wide": true,
+        "solid_reactive_cross": true,
+        "solid_reactive_nexus": true,
+        "splash": true,
+        "multisplash": true,
+        "solid_splash": true
+    },
     "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 224, "y": 42},
@@ -69,7 +103,9 @@
       {"flags": 2, "x": 209, "y": 85},
       {"flags": 2, "x": 224, "y": 85},
       {"flags": 2, "x": 224, "y": 64}
-    ]
+    ],
+    "max_brightness": 200,
+    "sleep": true
   },
   "layouts": {
     "LAYOUT_all": {
diff --git a/keyboards/boardsource/unicorne/config.h b/keyboards/boardsource/unicorne/config.h
index 5843a0c8472..e79c00f14d3 100644
--- a/keyboards/boardsource/unicorne/config.h
+++ b/keyboards/boardsource/unicorne/config.h
@@ -2,10 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 54
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 
 #define I2C_DRIVER I2CD1
diff --git a/keyboards/boardsource/unicorne/info.json b/keyboards/boardsource/unicorne/info.json
index 4184c870fe4..6afbcc044cb 100644
--- a/keyboards/boardsource/unicorne/info.json
+++ b/keyboards/boardsource/unicorne/info.json
@@ -54,6 +54,9 @@
             "gradient_left_right": true,
             "gradient_up_down": true
         },
+        "default": {
+            "animation": "alphas_mods"
+        },
         "max_brightness": 150,
         "split_count": [27, 27],
         "driver": "ws2812",
@@ -112,9 +115,13 @@
             {"matrix": [4, 0], "x": 0, "y": 7, "flags": 1},
             {"matrix": [5, 0], "x": 0, "y": 24, "flags": 1},
             {"matrix": [6, 0], "x": 0, "y": 41, "flags": 1}
-        ]
+        ],
+        "sleep": true
     },
     "community_layouts": ["split_3x6_3"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x6_3"
+    },
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
diff --git a/keyboards/boardwalk/keymaps/brendanwr/config.h b/keyboards/boardwalk/keymaps/brendanwr/config.h
deleted file mode 100644
index a2530241f47..00000000000
--- a/keyboards/boardwalk/keymaps/brendanwr/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * 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
diff --git a/keyboards/boardwalk/keymaps/brendanwr/keymap.c b/keyboards/boardwalk/keymaps/brendanwr/keymap.c
deleted file mode 100644
index b428651e73e..00000000000
--- a/keyboards/boardwalk/keymaps/brendanwr/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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 {
-  _BASE,
-  _FN,
-  _BACKLIT
-};
-
-
-#define FN MO(_FN)
-#define BACKLIT MO(_BACKLIT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* BASE
- * .-----------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | +      | \      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | LCTRL  | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | ENTER  | HOME   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | RSHIFT | FN     | END    |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
- * |        | LALT  | LGUI       |                             SPACE                            | RGUI        | RALT    |        |
- * '-----------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_BASE] = LAYOUT_ortho_7u(
-  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_BSLS,
-  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_BSPC,
-  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_HOME,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  FN,       KC_END,
-           KC_LALT, KC_LGUI,                                KC_SPC,                                 KC_RGUI, KC_RALT          
- ),
-
-/* FUNCTION
- * .-----------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | `      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        |        |        |        |        |        |        |        |        |        | UP     |        |        | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        | VOLD   | VOLU   | MUTE   |        |        |        |        |        |        | LEFT   | RIGHT  |        | PG_UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        |        | DOWN   |        |        | PG_DN  |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
- * |        |       |            |                                                              |             |         |        |
- * '-----------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_FN] = LAYOUT_ortho_7u(
-  _______, 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_UP,   _______, _______, KC_DEL,
-  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, KC_PGUP,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, KC_PGDN,
-          _______,  _______,                                  _______,                               _______, _______       
- ),
-
-/* BACKLIT 
- * .-----------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | RGBTOG | RGBMOD | RGBHUI | RGBHUD | RGBSAI | RGBSAD | RGBVAI | RGBVAD |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
- * |        |       |            |                                                              |             |         |        |
- * '-----------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_BACKLIT] = LAYOUT_ortho_7u(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-          _______,  _______,                                  _______,                               _______, _______       
- )
-};
diff --git a/keyboards/boardwalk/keymaps/mcallaster/keymap.c b/keyboards/boardwalk/keymaps/mcallaster/keymap.c
deleted file mode 100644
index 5b4292010e1..00000000000
--- a/keyboards/boardwalk/keymaps/mcallaster/keymap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-enum layer {
-  _BASE,
-  _LOWER,
-  _RAISE,
-  _FN
-};
-
-#define LOWER MO(1)
-#define RAISE MO(2)
-#define FN    MO(3)
-
-// Mac sleep
-#define __SLEEP S(LCTL(KC_PWR))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_ortho_hhkb(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_SCRL, KC_PSCR, 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_HOME, KC_PGUP, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_END,  KC_PGDN, 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_DEL,  KC_INS,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-           KC_CAPS, KC_LALT, KC_LGUI, RAISE,        KC_SPC,           KC_SPC,      LOWER,   KC_RGUI, KC_RALT, KC_RCTL
-  ),
-
-  [_LOWER] = LAYOUT_ortho_hhkb(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_PAUS, KC_NUM,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV,  KC_BSLS, _______, _______, _______,
-           _______, _______, _______, _______,       _______,       _______,       _______, _______, _______, _______
-  ),
-
-  [_RAISE] = LAYOUT_ortho_hhkb(
-  _______, KC_F11,  KC_F12,  _______, _______, _______, KC_PAUS, KC_NUM,  _______, _______, _______, _______, _______, _______,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_TILD, KC_PIPE, _______, _______, _______,
-           _______, _______, _______, _______,       _______,       _______,       _______, _______, _______, _______
-  ),
-
-  [_FN] = LAYOUT_ortho_hhkb(
-  __SLEEP, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, _______, KC_MPRV, KC_MNXT, _______, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______,
-  _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, RGB_SAD, RGB_HUD, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
-  _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______,       _______,       _______,       _______, _______, _______, _______
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _FN);
-}
diff --git a/keyboards/boardwalk/keymaps/niclake/config.h b/keyboards/boardwalk/keymaps/niclake/config.h
deleted file mode 100644
index 9028fcf9fbb..00000000000
--- a/keyboards/boardwalk/keymaps/niclake/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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/boardwalk/keymaps/niclake/keymap.c b/keyboards/boardwalk/keymaps/niclake/keymap.c
deleted file mode 100644
index 640ff8767e9..00000000000
--- a/keyboards/boardwalk/keymaps/niclake/keymap.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * 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,
-    _QWERTY,
-    _FN,
-    _NUM,
-    _ADJ,
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-    FN,
-    NUM,
-    ADJ,
-    MACWIN
-};
-
-#define QWERTY DF(_QWERTY)
-#define COLEMAK DF(_BASE)
-#define FN MO(_FN)
-#define NUM TT(_NUM)
-#define ADJ MO(_ADJ)
-#define MACWIN MAGIC_TOGGLE_ALT_GUI
-#define RGB_ON RGB_MODE_PLAIN
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Base Layer (Colemak)
-     * .-----------------------------------------------------------------------------------------------------------------------------.
-     * | `      | 1      | 2      | 3      | 4      | 5      | -      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * | TAB    | Q      | W      | F      | P      | G      | [      | ]      | J      | L      | U      | Y      | ;      | \      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-     * | _FN    | A      | R      | S      | T      | D      | HOME   | PG UP  | H      | N      | E      | I      | O      | '      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-     * | LSHIFT | Z      | X      | C      | V      | B      | END    | PG DN  | K      | M      | ,      | .      | /      | RSHIFT |
-     * '--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------'
-     *          | LCTRL  | LALT   | LGUI   | TG_NUM |      ENTER      |      SPACE      | LEFT   | DOWN   | UP     | RIGHT  |
-     *          '-----------------------------------------------------------------------------------------------------------'
-     */
-    [_BASE] = LAYOUT_ortho_hhkb(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_MINS, KC_EQL,  KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G, KC_LBRC, KC_RBRC, KC_J, KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-        FN,      KC_A,    KC_R,    KC_S,    KC_T,    KC_D, KC_HOME, KC_PGUP, KC_H, KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_END,  KC_PGDN, KC_K, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-                 KC_LCTL, KC_LALT, KC_LGUI, NUM,           KC_ENT,  KC_SPC,        KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-    /* QWERTY
-     * .-----------------------------------------------------------------------------------------------------------------------------.
-     * | `      | 1      | 2      | 3      | 4      | 5      | -      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * | TAB    | Q      | W      | E      | R      | T      | [      | ]      | Y      | U      | I      | O      | P      | \      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-     * | _FN    | A      | S      | D      | F      | G      | HOME   | PG UP  | H      | J      | K      | L      | ;      | '      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-     * | LSHIFT | Z      | X      | C      | V      | B      | END    | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
-     * '--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------'
-     *          | LCTRL  | LALT   | LGUI   | TG_NUM |      ENTER      |      SPACE      | LEFT   | DOWN   | UP     | RIGHT  |
-     *          '-----------------------------------------------------------------------------------------------------------'
-     */
-    [_QWERTY] = LAYOUT_ortho_hhkb(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_MINS, KC_EQL,  KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-        FN,      KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_HOME, KC_PGUP, KC_H, KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_END,  KC_PGDN, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-                 KC_LCTL, KC_LALT, KC_LGUI, NUM,           KC_ENT,  KC_SPC,        KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-    /* FN
-     * .-----------------------------------------------------------------------------------------------------------------------------.
-     * | ESC    | F1     | F2     | F3     | F4     | F5     | F11    | F12    | F6     | F7     | F8     | F9     | F10    | DEL    |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * |        | Prev   | Play   | Next   |        |        |        |        |        | Pg Up  | Up     | Pg Dn  | PRT SC |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-     * | XXXXXX |        | Mute   | Vol Dn | Vol Up |        |        |        |        | Left   | Down   | Right  |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-     * |        |        |        |        |        |        |        |        |        | Home   |        | End    |        | CapsLk |
-     * '--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------'
-     *          |        |        |        | _ADJ   |                 |                 |        |        |        |        |
-     *          '-----------------------------------------------------------------------------------------------------------'
-     */
-    [_FN] = LAYOUT_ortho_hhkb(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F11,  KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,  _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, _______,
-        _______, _______, KC_MUTE, KC_VOLD, KC_VOLU,  _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-        _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_HOME, _______, KC_END,  _______, KC_CAPS,
-                 _______, _______, _______, ADJ,               _______, _______,          _______, _______, _______, _______
-    ),
-
-    /* Num Pad (NUM)
-     * .-----------------------------------------------------------------------------------------------------------------------------.
-     * |        |        |        |        |        |        |        |        | Num Lk | KP /   | KP *   | KP -   | Scr Lk | Pause  |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * |        |        |        |        |        |        |        |        | KP 7   | KP 8   | KP 9   | KP +   |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-     * | _ADJ   |        |        |        |        |        |        |        | KP 4   | KP 5   | KP 6   | KP +   |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-     * |        |        |        |        |        |        |        |        | KP 1   | KP 2   | KP 3   | KP Ent |        |        |
-     * '--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------'
-     *          |        |        |        | XXXXXX |                 |      KP 0       | KP 0   | KP .   | KP Ent |        |
-     *          '-----------------------------------------------------------------------------------------------------------'
-     */
-    [_NUM] = LAYOUT_ortho_hhkb(
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_SCRL, KC_PAUS,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, _______, _______,
-        ADJ,     _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______, _______,
-                 _______, _______, _______, _______,          _______, KC_KP_0,          KC_KP_0, KC_PDOT, KC_PENT, _______
-    ),
-
-    /* ADJUST + RGB Control
-     * .-----------------------------------------------------------------------------------------------------------------------------.
-     * |        | Static | Breath | Rainbw | Swirl  | Gradnt | Twnkle | Test   |        |        |        |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * |        | On/Off | ModeUp | Hue Up | Sat Up | Val Up |        |        |        |        |        |        | QK_BOOT  |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-     * | XXXXXX | MACWIN |        | Hue Dn | Sat Dn | Val Dn |        |        |        |        |        |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-     * |        | Colemak| QWERTY |        |        |        |        |        |        |        |        |        |        |        |
-     * '--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------'
-     *          |        |        |        | XXXXXX |                 |                 |        |        |        |        |
-     *          '-----------------------------------------------------------------------------------------------------------'
-     */
-    [_ADJ] = LAYOUT_ortho_hhkb(
-        XXXXXXX, RGB_ON,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_G, RGB_M_TW, RGB_M_T, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI,  RGB_VAI, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX,
-        XXXXXXX, MACWIN,  XXXXXXX, RGB_HUD, RGB_SAD,  RGB_VAD, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, COLEMAK, QWERTY,  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/boardwalk/keymaps/niclake/readme.md b/keyboards/boardwalk/keymaps/niclake/readme.md
deleted file mode 100644
index fb772a9a257..00000000000
--- a/keyboards/boardwalk/keymaps/niclake/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Nic Lake's Boardwalk Layout
-
-This is Nic's Boardwalk layout, which is based off of the default Pok3r layout.
-
-- Colemak base layer w/ QWERTY support
-- Bottom row set up for Mac usage (use `MACWIN`/`AG_TOGG` to toggle)
-- Latching Numpad layer for data entry
-- Uses [Space Cadet shift keys](https://docs.qmk.fm/#/feature_space_cadet?id=usage)
\ No newline at end of file
diff --git a/keyboards/boardwalk/keymaps/niclake/rules.mk b/keyboards/boardwalk/keymaps/niclake/rules.mk
deleted file mode 100644
index 31d6053e03d..00000000000
--- a/keyboards/boardwalk/keymaps/niclake/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMMAND_ENABLE   = no
-RGBLIGHT_ENABLE  = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index 7d53f90b150..a7dd952cd6a 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -87,6 +87,4 @@
 
 #define RGB_MATRIX_LED_COUNT 10
 
-#define RGB_MATRIX_KEYPRESSES
-
 #define SOLENOID_PIN A14
diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
index e89623ec8a0..8a895c3e50b 100644
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@@ -58,5 +58,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json
index 748ad680768..95fbd477eb5 100644
--- a/keyboards/bpiphany/frosty_flake/info.json
+++ b/keyboards/bpiphany/frosty_flake/info.json
@@ -10,6 +10,9 @@
   },
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
+  "dynamic_keymap": {
+    "layer_count": 3
+  },
   "community_layouts": ["tkl_ansi"],
   "layouts": {
     "LAYOUT": {
diff --git a/keyboards/bpiphany/hid_liber/keymaps/bakageta/config.h b/keyboards/bpiphany/hid_liber/keymaps/bakageta/config.h
deleted file mode 100755
index b158e2d5a26..00000000000
--- a/keyboards/bpiphany/hid_liber/keymaps/bakageta/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define PERMISSIVE_HOLD
diff --git a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
deleted file mode 100755
index 414b7beb644..00000000000
--- a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2017 Mathias Andersson <wraul@dbox.se>: Phantom Layout
- * Copyright 2018 bakageta <amo@bakageta.com>: HID Liberation layouts
- *
- * 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
-
-// Helpful defines
-#define FN_CAPS LT(_FL, KC_CAPS)
-
-// 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 _BL 0 // Base Layer
-#define _GL 1 // Gaming Layer
-#define _FL 2 // Function Layer
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BL] = LAYOUT(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_PSCR, KC_SCRL, KC_BRK,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
-        FN_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_NO,   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_RGUI, TT(_FL), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_GL] = LAYOUT(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,
-        _______, KC_NO,   _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______
-    ),
-    [_FL] = LAYOUT(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        _______, TO(_BL), TO(_GL), _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______,      KC_VOLD, KC_MSTP, KC_VOLU,
-        _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______, _______, _______,      KC_MNXT, KC_MPLY, KC_MNXT,
-        _______, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT,          _______,               _______,
-        _______, _______, _______,                            KC_P0,                              KC_PDOT, KC_PENT, _______, _______,      _______, _______, _______
-    ),
-};
diff --git a/keyboards/bpiphany/hid_liber/keymaps/bakageta/readme.md b/keyboards/bpiphany/hid_liber/keymaps/bakageta/readme.md
deleted file mode 100755
index 2b13586c0f4..00000000000
--- a/keyboards/bpiphany/hid_liber/keymaps/bakageta/readme.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# bakageta's Keymap for the HID Liberation Device
-
-A personal keymap intended for the HID Liberation Device.
-
-See [keymap.c](keymap.c) for details.
-
-## Layers
-
-This keymap has a base layer with combined Fn/Caps, Fn replacing APP, and an otherwise standard ANSI layout. The gaming layer blocks LGUI, and reverts caps back to a regular key for games that bind something to it. The function layer adds media keys to the nav cluster and a virtual numpad, with 1 and 2 selecting between Base and Gaming respectively.
-
-### Layer 1: Base Layer
-     ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
-     `---'   `---------------' `---------------' `---------------' `-----------'
-     ,-----------------------------------------------------------. ,-----------.
-     |~  |  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | |Ins|Hom|PgU|
-     |-----------------------------------------------------------| |-----------|
-     |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |Del|End|PgD|
-     |-----------------------------------------------------------| '-----------'
-     |Fn/Cps|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |
-     |-----------------------------------------------------------|     ,---.
-     |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |     |Up |
-     |-----------------------------------------------------------| ,-----------.
-     |Ctl|Gui|Alt|             Space             |Alt|Gui|Fn |Ctl| |Lef|Dow|Rig|
-     `-----------------------------------------------------------' `-----------'
-
-### Layer 2: Gaming Layer
-     ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     |   |   |   |   |   |   | |   |   |   |   | |   |   |   |   | |   |   |   |
-     `---'   `---------------' `---------------' `---------------' `-----------'
-     ,-----------------------------------------------------------. ,-----------.
-     |   |   |   |   |   |   |   |   |   |   |   |   |   |       | |   |   |   |
-     |-----------------------------------------------------------| |-----------|
-     |     |   |   |   |   |   |   |   |   |   |   |   |   |     | |   |   |   |
-     |-----------------------------------------------------------| '-----------'
-     | Caps |   |   |   |   |   |   |   |   |   |   |   |        |
-     |-----------------------------------------------------------|     ,---.
-     |        |   |   |   |   |   |   |   |   |   |   |          |     |   |
-     |-----------------------------------------------------------| ,-----------.
-     |   |XXX|   |                               |   |   |   |   | |   |   |   |
-     `-----------------------------------------------------------' `-----------'
-
-
-### Layer 3: Function Layer
-     ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     |   |   |   |   |   |   | |   |   |   |   | |   |   |   |   | |   |   |   |
-     `---'   `---------------' `---------------' `---------------' `-----------'
-     ,-----------------------------------------------------------. ,-----------.
-     |   | BL| GL|   |   |   |   |   |   |   |   |   |   |       | |Vo-|Stp|Vo+|
-     |-----------------------------------------------------------| |-----------|
-     |     |   |   |   |   |   |   |   |   |   |   |   |   |     | |Prv|Ply|Nxt|
-     |-----------------------------------------------------------| '-----------'
-     |      |   |   |   |   |   |   |   |   |   |   |   |        |
-     |-----------------------------------------------------------|     ,---.
-     |        |   |   |   |   |   |   |   |   |   |   |          |     |   |
-     |-----------------------------------------------------------| ,-----------.
-     |   |   |   |                               |   |   |   |   | |   |   |   |
-     `-----------------------------------------------------------' `-----------'
diff --git a/keyboards/bpiphany/hid_liber/keymaps/bakageta/rules.mk b/keyboards/bpiphany/hid_liber/keymaps/bakageta/rules.mk
deleted file mode 100755
index b1530f614f1..00000000000
--- a/keyboards/bpiphany/hid_liber/keymaps/bakageta/rules.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/config.h b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/config.h
deleted file mode 100644
index 142aba89094..00000000000
--- a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#undef MOUSEKEY_MOVE_MAX
-#define MOUSEKEY_MOVE_MAX       127
-#undef MOUSEKEY_WHEEL_MAX
-#define MOUSEKEY_WHEEL_MAX      110
-#undef MOUSEKEY_MOVE_DELTA
-#define MOUSEKEY_MOVE_DELTA     5
-#undef MOUSEKEY_WHEEL_DELTA
-#define MOUSEKEY_WHEEL_DELTA    1
-#undef MOUSEKEY_DELAY
-#define MOUSEKEY_DELAY 50
-#undef MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL 20
-#undef MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_MAX_SPEED 4
-#undef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX 30
-#undef MOUSEKEY_WHEEL_MAX_SPEED
-#define MOUSEKEY_WHEEL_MAX_SPEED 3
-#undef MOUSEKEY_WHEEL_TIME_TO_MAX
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
-#undef ONESHOT_TIMEOUT
-#define ONESHOT_TIMEOUT 500
-#undef TAPPING_TOGGLE
-#define TAPPING_TOGGLE 2
-
-#endif
diff --git a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
deleted file mode 100644
index a2f36a303a5..00000000000
--- a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
+++ /dev/null
@@ -1,177 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define MEDAPP LT(MEDIA, KC_APP)
-
-enum layers {
-    DEFAULT,
-    PROG1,
-    PROG2,
-    MEDIA,
-    MOUSE1,
-    MOUSE2,
-    MISC,
-};
-
-enum custom_keycodes {
-    LSHFT_PAREN = SAFE_RANGE,
-    RSHFT_PAREN,
-    LCTRL_BRACKET,
-    RCTRL_BRACKET,
-    LALT_CURLY,
-    RALT_CURLY,
-    CTRL_CLICK,
-    M_GRV,
-    M_CFLEX
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [DEFAULT] = LAYOUT(
-          KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,           KC_PSCR,KC_SCRL,KC_PAUS,
-          KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,    KC_INS,KC_HOME,KC_PGUP,  KC_NUM,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_BSLS,    KC_DEL, KC_END,KC_PGDN,    KC_P7,  KC_P8,  KC_P9,KC_PPLS,
-        TT(MOUSE1), 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_P4,  KC_P5,  KC_P6,
-            LSHFT_PAREN,KC_NUBS,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,           RSHFT_PAREN,             KC_UP,            KC_P1,  KC_P2,  KC_P3,KC_PENT,
-            LCTRL_BRACKET,KC_LGUI,   LALT_CURLY,              LT(MISC,  KC_SPC),                           RALT_CURLY,TT(PROG1), MEDAPP, RCTRL_BRACKET,   KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,KC_PDOT),
-  /* Layer 1: Programming Layer 1, emulating US l ayout */
-  [PROG1] = LAYOUT(
-          KC_ESC,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,           _______,_______,_______,
-          M_GRV,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_SLSH,S(KC_0),_______,   _______,_______,_______,  _______,_______,_______,_______,
-         _______,_______,_______,_______,_______,_______,   KC_Z,_______,_______,_______,_______,ALGR(KC_8),ALGR(KC_9),ALGR(KC_MINS),  _______,_______,_______,  _______,_______,_______,_______,
-         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,S(KC_COMM),S(KC_BSLS),        _______,                             _______,_______,_______,
-       MO(PROG2),_______,   KC_Y,_______,_______,_______,_______,_______,_______,_______,_______,   S(KC_7),      MO(PROG2),           _______,          _______,_______,_______,_______,
-         _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______,  _______,_______),
-    /* Layer 2: programming layer 2
-       all keys that are not FN keys are sent as LSFT+key on this layer
-    */
-  [PROG2] = LAYOUT(
-         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,           _______,_______,_______,
-        ALGR(KC_RBRC),_______,  ALGR(KC_Q),KC_BSLS,_______,_______,M_CFLEX,  S(KC_6),S(KC_RBRC),   S(KC_8),S(KC_9),S(KC_SLSH),KC_RBRC,_______,   _______,_______,_______,  _______,_______,_______,_______,
-         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  ALGR(KC_7),ALGR(KC_0),ALGR(KC_NUBS),  _______,_______,_______,  _______,_______,_______,_______,
-         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, S(KC_DOT),   S(KC_2),        _______,                             _______,_______,_______,
-         _______,S(KC_NUBS),_______,_______,_______,_______,_______,_______,_______,KC_NUBS,S(KC_NUBS),S(KC_MINS),        _______,           _______,          _______,_______,_______,_______,
-         _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______,  _______,_______),
-    /* Layer 3: media layer */
-  [MEDIA] = LAYOUT(
-          KC_PWR,KC_SLEP,KC_WAKE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,           XXXXXXX,XXXXXXX,XXXXXXX,
-         XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,   KC_MPRV,KC_MPLY,KC_MNXT,  XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-         XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,   KC_VOLD,KC_MUTE,KC_VOLU,  XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-         XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,                             XXXXXXX,XXXXXXX,XXXXXXX,
-         XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,           KC_EJCT,          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-         XXXXXXX,XXXXXXX,XXXXXXX,                        XXXXXXX,                        XXXXXXX,XXXXXXX,_______,XXXXXXX,   KC_MRWD,KC_MSTP,KC_MFFD,  XXXXXXX,XXXXXXX),
-    /* Layer 4: Mouse layer */
-  [MOUSE1] = LAYOUT(
-            TO(DEFAULT),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,           _______,_______,_______,
-         _______,KC_ACL0,KC_ACL1,KC_ACL2,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,  _______,_______,_______,_______,
-         _______,KC_BTN4,KC_WH_D,KC_MS_U,KC_WH_U,_______,   C(KC_Z),_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,  _______,_______,_______,_______,
-         _______,KC_BTN5,KC_MS_L,KC_MS_D,KC_MS_R,   CTRL_CLICK,KC_WH_L,KC_WH_D,KC_WH_U,KC_WH_R,_______,_______,        _______,                             _______,_______,_______,
-      MO(MOUSE2),_______,C(KC_Y),C(KC_X),C(KC_C),C(KC_V),_______,KC_BTN2,KC_BTN3,C(KC_PGUP),C(KC_PGDN),_______,        KC_RSFT,           _______,          _______,_______,_______,_______,
-         KC_LCTL,_______,KC_LALT,                        KC_BTN1,                        KC_RALT,KC_RGUI, KC_APP,KC_RCTL,   _______,_______,_______,  _______,_______),
-    /* Layer 5: Mouse layer 2*/
-  [MOUSE2] = LAYOUT(
-         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,           _______,_______,_______,
-         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,  _______,_______,_______,_______,
-         _______,_______,KC_BTN2,KC_WH_U,KC_BTN3,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,  _______,_______,_______,_______,
-         _______,_______,KC_WH_L,KC_WH_D,KC_WH_R,_______,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______,        _______,                             _______,_______,_______,
-         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,          _______,_______,_______,_______,
-         _______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______,  _______,_______),
-    /* Layer 6: Misc layer */
-  [MISC] = 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,           _______,_______,_______,
-         _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,  _______,_______,_______,_______,
-         _______,KC_SLCT,   C(KC_W),  KC_UP,_______,_______,_______,_______,KC_BSPC, KC_DEL,_______,_______,_______,_______,   _______,_______,_______,  _______,_______,_______,_______,
-         _______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,KC_HOME,KC_PGDN,KC_PGUP,_______,_______,_______,        _______,                             _______,_______,_______,
-         KC_LSFT,_______,C(KC_Y),C(KC_X),C(KC_C),C(KC_V), KC_SPC, KC_END,_______,C(KC_PGUP),C(KC_PGDN),_______,        _______,           _______,          _______,_______,_______,_______,
-         _______,_______,_______,               LT(MISC, KC_SPC),                        _______,_______,_______,_______,   _______,_______,_______,  _______,_______),
-};
-
-void tap_helper(keyrecord_t *record, uint16_t orig_mod, uint16_t macro_mod, uint16_t macro_kc ) {
-  if (record->event.pressed) {
-      if (record->tap.count > 0 && !record->tap.interrupted) {
-          if (record->tap.interrupted) {
-              register_mods(MOD_BIT(orig_mod));
-          }
-      } else {
-          register_mods(MOD_BIT(orig_mod));
-      }
-  } else {
-      if (record->tap.count > 0 && !(record->tap.interrupted)) {
-          add_weak_mods(MOD_BIT(macro_mod));
-          send_keyboard_report();
-          register_code(macro_kc);
-          unregister_code(macro_kc);
-          del_weak_mods(MOD_BIT(macro_mod));
-          send_keyboard_report();
-          record->tap.count = 0;  // ad hoc: cancel tap
-      } else {
-          unregister_mods(MOD_BIT(orig_mod));
-      }
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint8_t layer;
-    layer = get_highest_layer(layer_state);
-    if (layer == PROG2) {
-         if (keycode >= KC_A && keycode <= KC_EXSEL && \
-             !(  // do not send LSFT + these keycodes, they are needed for emulating the US layout
-                 keycode == KC_NUBS ||
-                 keycode == KC_RBRC ||
-                 keycode == KC_BSLS ||
-                 keycode == KC_GRV
-            )) {
-              // LSFT is the modifier for this layer, so we set LSFT for every key to get the expected behavior
-              if (record->event.pressed) {
-                  register_mods(MOD_LSFT);
-              } else {
-                  unregister_mods(MOD_LSFT);
-              }
-         }
-    }
-
-    switch (keycode) {
-        case LCTRL_BRACKET:
-            tap_helper(record, KC_LCTL, KC_RALT, KC_8);
-            return false;
-        case RCTRL_BRACKET:
-            tap_helper(record, KC_RCTL, KC_RALT, KC_9);
-            return false;
-        case LALT_CURLY:
-            tap_helper(record, KC_LALT, KC_RALT, KC_7);
-            return false;
-        case RALT_CURLY:
-            tap_helper(record, KC_RALT, KC_RALT, KC_0);
-            return false;
-        case LSHFT_PAREN:
-            tap_helper(record, KC_LSFT, KC_LSFT, KC_8);
-            return false;
-        case RSHFT_PAREN:
-            tap_helper(record, KC_RSFT, KC_LSFT, KC_9);
-            return false;
-        case CTRL_CLICK:
-            if (record->event.pressed) {
-                mousekey_clear();
-                register_mods(MOD_BIT(KC_LCTL));
-                send_keyboard_report();
-                wait_ms(5);
-                mousekey_on(KC_BTN1);
-                mousekey_send();
-                wait_ms(10);
-                mousekey_off(KC_BTN1);
-                mousekey_send();
-                wait_ms(5);
-                unregister_mods(MOD_BIT(KC_LCTL));
-                send_keyboard_report();
-            }
-            return false;
-        case M_GRV:
-            tap_code16(S(KC_EQL));
-            tap_code(KC_SPC);
-            return false;
-        case M_CFLEX:
-            tap_code(KC_GRV);
-            tap_code(KC_SPC);
-            return false;
-    }
-
-    return true;
-}
diff --git a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/readme.md b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/readme.md
deleted file mode 100644
index 0d23be4eac4..00000000000
--- a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# My personal keymap for the Kitten Paw controller
-
-This keymap only works correctly when you have your OS configured with a German keymap. Use the keymap however you like. It's most likely a living thing that will never be quite finished.
-
-## Description of the layers
-Layer 0 (DEFAULT) works just like you would expect a keyboard to work, mostly, except:
-Caps Lock switches to the mouse layer, RGUI and APP are switches to the programming layer and media layer.
-Mouse and programming layer switches can be held or double-tapped to lock.
-Holding space switches to the MISC layer where I currently accumulate useful shortcuts.
-Tapping left and right Shift, Ctrl and Alt will send (), [] and {} respectively.
-
-Layers 1 and 2 (PROG1 and PROG2) emulate the US layout while still using a German OS keymap setting. I was annoyed of having to change the OS settings every time I wanted to use the US layout for coding, so I made these layers to behave just like the US layout even though the OS still uses German. The shift keys were a bit tricky, I had to use them as MO(PROG2) switches, so to get the actual expected behavior I enable LSFT for almost every keypress on PROG2 in ```process_record_user```. Since the shift keys are MO() function keys, they do not print () at the moment, which sucks. I'm working on it.
-
-Layer 3 (MEDIA) just has a couple of media keys on it, mainly around the cursor keys and nav key cluster.
-
-Layers 4 and 5 (MOUSE1 and MOUSE2) are mouse layers. Move the cursor using ESDF, scroll using HJKL, Space for left click, N and M for right and middle click. There's more, look at the keymap.
-
-Layer 6 is a layer I don't have a good name for, so I call it MISC. You'll find cursor keys at ESDF, other navigation keys around the HJKL cluster and F12 to F24 on the F-keys. For now.
\ No newline at end of file
diff --git a/keyboards/bpiphany/pegasushoof/2013/config.h b/keyboards/bpiphany/pegasushoof/2013/config.h
index eb7c2fde134..182495aa9b1 100644
--- a/keyboards/bpiphany/pegasushoof/2013/config.h
+++ b/keyboards/bpiphany/pegasushoof/2013/config.h
@@ -20,5 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3  // not enough memory for a 4th layer with VIA
diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/info.json
index abbeeb0f364..c7b120fd051 100644
--- a/keyboards/bpiphany/pegasushoof/2013/info.json
+++ b/keyboards/bpiphany/pegasushoof/2013/info.json
@@ -1,6 +1,9 @@
 {
     "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013",
     "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "indicators": {
         "caps_lock": "C6",
         "scroll_lock": "C5",
diff --git a/keyboards/bpiphany/pegasushoof/2015/config.h b/keyboards/bpiphany/pegasushoof/2015/config.h
index eb7c2fde134..182495aa9b1 100644
--- a/keyboards/bpiphany/pegasushoof/2015/config.h
+++ b/keyboards/bpiphany/pegasushoof/2015/config.h
@@ -20,5 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3  // not enough memory for a 4th layer with VIA
diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/info.json
index a3b5f667844..5c4f8d6f912 100644
--- a/keyboards/bpiphany/pegasushoof/2015/info.json
+++ b/keyboards/bpiphany/pegasushoof/2015/info.json
@@ -1,6 +1,9 @@
 {
     "keyboard_name": "Majestouch TKL The Pegasus Hoof 2015",
     "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "indicators": {
         "caps_lock": "C6",
         "scroll_lock": "C5",
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
deleted file mode 100644
index 58db20797ee..00000000000
--- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-Copyright 2016 Daniel Svensson <dsvensson@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
-
-/* Swedish keys */
-#define SE_HALF KC_GRV
-#define SE_PLUS KC_MINS
-#define SE_ACUT KC_EQL
-#define SE_AO   KC_LBRC
-#define SE_CIRC KC_RBRC
-#define SE_QUOT KC_BSLS
-#define SE_ODIA KC_SCLN
-#define SE_ADIA KC_QUOT
-#define SE_MINS KC_SLSH
-#define SE_LTGT KC_NUBS
-#define SE_LCBR RALT(KC_7)
-#define SE_LBRC RALT(KC_8)
-#define SE_RBRC RALT(KC_9)
-#define SE_RCBR RALT(KC_0)
-#define SE_PIPE RALT(SE_LTGT)
-#define SE_BSLS RALT(SE_PLUS)
-
-#define KM_BLOWRAK 0
-#define KM_QWERTY  1
-#define KM_MEDIA   2
-#define KM_HAXHAX  3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	/* Layer 0: Blowrak ISO layer, a Swedish take on Dvorak */
-	[KM_BLOWRAK] = LAYOUT(
-		KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,    KC_PSCR,KC_SCRL,KC_PAUS,
-		SE_HALF, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   SE_PLUS,SE_ACUT,KC_BSPC,   KC_INS, KC_HOME,KC_PGUP,
-		KC_TAB,  SE_AO,  SE_ADIA,SE_ODIA,KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,   KC_COMM,SE_CIRC,SE_QUOT,   KC_DEL, KC_END, KC_PGDN,
-		KC_LCTL, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,   KC_H,   KC_D,   KC_T,   KC_N,   KC_S,   SE_MINS,        KC_ENT,
-		KC_LSFT, SE_LTGT,KC_DOT, KC_Q,   KC_J,   KC_K,   KC_B,   KC_X,   KC_M,   KC_W,   KC_V,   KC_Z,           KC_RSFT,           KC_UP,
-		MO(KM_MEDIA),KC_LGUI,KC_LALT,                   KC_SPC,                          KC_RALT,KC_RGUI,KC_MENU,TG(KM_QWERTY), KC_LEFT,KC_DOWN,KC_RGHT),
-	/* Layer 1: Standard ISO layer */
-	[KM_QWERTY] = LAYOUT(
-		KC_ESC,          KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,    KC_PSCR,KC_SCRL,KC_PAUS,
-		SE_HALF, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   SE_PLUS,SE_ACUT,KC_BSPC,   KC_INS, KC_HOME,KC_PGUP,
-		KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   SE_AO,  SE_CIRC,SE_QUOT,   KC_DEL, KC_END, KC_PGDN,
-		KC_LCTL, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   SE_ODIA,SE_ADIA,        KC_ENT,
-		KC_LSFT, SE_LTGT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, SE_MINS,        KC_RSFT,           KC_UP,
-		MO(KM_MEDIA),KC_LGUI,KC_LALT,                   KC_SPC,                          KC_RALT,KC_RGUI,KC_MENU,TG(KM_QWERTY), KC_LEFT,KC_DOWN,KC_RGHT),
-	/* Layer 2: Media layer */
-	[KM_MEDIA] = LAYOUT(
-		_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   KC_WAKE,KC_PWR, KC_SLEP,
-		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,KC_VOLU,
-		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   KC_MUTE,_______,KC_VOLD,
-		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
-		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           KC_MPLY,
-		_______,_______,_______,                        _______,                        _______,_______,QK_BOOT,_______,   KC_MPRV,KC_MSTP,KC_MNXT),
-	/* Layer 3: Programming layer */
-	[KM_HAXHAX] = LAYOUT(
-		_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-		_______,SE_LCBR,SE_PIPE,SE_RCBR,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,   _______,_______,_______,
-		_______,SE_LBRC,SE_BSLS,SE_RBRC,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
-		_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,           _______,
-		_______,_______,_______,                        _______,                        _______,_______,_______,_______,   _______,_______,_______),
-};
-
-void matrix_scan_user(void)
-{
-	uint8_t layer = get_highest_layer(layer_state);
-	switch (layer) {
-		case KM_BLOWRAK:
-			writePin(LED_CAPS_LOCK_PIN, LED_PIN_ON_STATE);
-			writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
-			break;
-		case KM_QWERTY:
-			writePin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
-			writePin(LED_SCROLL_LOCK_PIN, LED_PIN_ON_STATE);
-			break;
-	}
-}
-
-/* Mixes in KM_HAXHAX via RALT modifier without shadowing the RALT key combinations. */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	uint8_t modifiers = get_mods();
-	if (modifiers & MOD_BIT(KC_RALT) && record->event.pressed) {
-		uint16_t kc = keymap_key_to_keycode(KM_HAXHAX, record->event.key);
-		if (kc != KC_TRNS) {
-			register_code(kc);
-			unregister_code(kc);
-			return false;
-		}
-	}
-	return true;
-}
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk
deleted file mode 100644
index 737451b39ad..00000000000
--- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-CUSTOM_MATRIX = yes         # Custom matrix file for the Pegasus Hoof due to the 2x74HC42
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/citadel/config.h b/keyboards/bpiphany/pegasushoof/keymaps/citadel/config.h
deleted file mode 100644
index 9ff01f7e842..00000000000
--- a/keyboards/bpiphany/pegasushoof/keymaps/citadel/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-/* overridden settings: */
-
-#undef PRODUCT
-#define PRODUCT "Pegasus Hoof Citadel"
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
deleted file mode 100644
index 353759b9a6c..00000000000
--- a/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright 2018 Daniel Rose <droseger@protonmail.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
-
-/* Allow shortcuts for combos like RALT(KC_RBRC) that don't take up more than 7 characters: */
-/* Original shortcuts (quantum_keycodes.h) take full-sized keycodes: too long! */
-#undef C
-#undef S
-#undef A
-#undef G
-#define C(kc) LCTL(KC_##kc)
-#define S(kc) LSFT(KC_##kc)
-#define A(kc) LALT(KC_##kc)
-#define G(kc) RALT(KC_##kc)
-#define CTALDEL LCTL(LALT(KC_DEL))
-
-enum layers {
-  DEF,
-  FUN,
-  RES,
-};
-
-enum tap_dance {
-  AF4,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Layer 0: default layer (ISO-DE)
- * .----.   .-------------------. .-------------------. .-------------------. .--------------.
- * |Esc |   |F1  |F2  |F3  |F4  | |F5  |F6  |F7  |F8  | |F9  |F10 |F11 |F12 | |PrSc|SLck|2Tp:|
- * |    |   |    |    |    |    | |    |    |    |    | |    |    |    |    | |SyRq|    |A+F4|
- * '----'   '-------------------' '-------------------' '-------------------' '--------------'
- * .------------------------------------------------------------------------. .--------------.
- * |°   |!   |"   |§   |$   |%   |&   |/   |(   |)   |=   |?   |`   |Backspa| |Ins |Home|PgUp|
- * |^   |1   |2  ²|3  ³|4   |5   |6   |7  {|8  [|9  ]|0  }|ß  \|´   |       | |    |    |    |
- * |------------------------------------------------------------------------| |--------------|
- * |Tab   |Q   |W   |E   |R   |T   |Z   |U   |I   |O   |P   |Ü   |*   |  E  | |Del |End |PgDn|
- * |      |    |    |   €|    |    |    |    |    |    |    |    |+  ~|  n  | |    |    |    |
- * |------------------------------------------------------------------\  t  | '--------------'
- * |Fn:    |A   |S   |D   |F   |G   |H   |J   |K   |L   |Ö   |Ä   |'   | e  |
- * |Layer 2|    |    |    |    |    |    |    |    |    |    |    |#   | r  |
- * |------------------------------------------------------------------------|      .----.
- * |Shift|>   |Y   |X   |C   |V   |B   |N   |M   |;   |:   |_   |Shift      |      |Up  |
- * |     |<  ¦|    |    |    |    |    |    |   µ|,   |.   |-   |           |      |    |
- * |------------------------------------------------------------------------| .--------------.
- * |Ctrl |Super|Alt  |                              |AltGr|Alt  |Fn:  |Ctrl | |Left|Down|Righ|
- * |     |     |     |                              |     |     |Lay 2|     | |    |    |    |
- * '------------------------------------------------------------------------' '--------------'
- *                                                                                                  NUHS = true position of KC_NUHS
- */
-[DEF] = LAYOUT(
-  KC_ESC,         KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12,   KC_PSCR,KC_SCRL,TD(AF4),
-  KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,  KC_INS, KC_HOME,KC_PGUP,
-  KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_NUHS,  KC_DEL, KC_END, KC_PGDN,
-  MO(FUN),KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,/*NUHS*/KC_ENT,
-  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        KC_RSFT,          KC_UP,
-  KC_LCTL,KC_LGUI,KC_LALT,                        KC_SPC,                         KC_RALT,KC_LALT,MO(FUN),KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT),
-
-    /* Layer 1: function layer
- * .----.   .-------------------. .-------------------. .-------------------. .--------------.
- * |Ctl+|   |My  |WWW:|Calc|Medi| |Mus:|Mus:|Mus:|Mus:| |Vol:|Vol:|Vol:|See:| |    |    |Paus|
- * |A+De|   |Comp|Home|    |Play| |Prev|Next|Paus|Stop| |Mute|Down|Up  |[3] | |    |    |Brea|
- * '----'   '-------------------' '-------------------' '-------------------' '--------------'
- * .------------------------------------------------------------------------. .--------------.
- * |    |    |    |    |    |    |    |    |    |    |    |    |    |       | |    |    |Mou:|
- * |    |    |    |    |    |    |    |{   |[   |]   |}   |\   |    |       | |    |    |WhUp|
- * |------------------------------------------------------------------------| |--------------|
- * |      |    |    |    |    |    |    |    |    |    |    |    |~   |     | |    |    |Mou:|
- * |      |    |    |    |    |    |    |    |    |    |    |    |    |     | |    |    |WhDn|
- * |------------------------------------------------------------------\     | '--------------'
- * |CapsLck|Mou:|Mou:|    |    |    |    |    |    |    |    |    |    |    |
- * |       |Fast|Slow|    |    |    |    |    |    |    |    |    |    |    |
- * |------------------------------------------------------------------------|      .----.
- * |     |    |    |    |    |    |    |    |µ   |    |    |    |           |      |Mou:|
- * |     |    |    |    |    |    |    |    |    |    |    |    |           |      |Up  |
- * |------------------------------------------------------------------------| .--------------.
- * |Mous:|Mous:|     |                              |     |Super|App  |     | |Mou:|Mou:|Mou:|
- * |Bttn2|Bttn1|     |                              |     |     |     |     | |Left|Down|Righ|
- * '------------------------------------------------------------------------' '--------------'
- *
- */
-[FUN] = LAYOUT(
-  CTALDEL,        KC_MYCM,KC_WHOM,KC_CALC,KC_MSEL,KC_MPRV,KC_MNXT,KC_MPLY,KC_MSTP,KC_MUTE,KC_VOLD,KC_VOLU,MO(RES),  _______,KC_SCRL,KC_PAUS,
-  _______,_______,_______,_______,_______,_______,_______,G(7),   G(8),   G(9),   G(0),   G(MINS),_______,_______,  _______,_______,KC_WH_U,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,G(RBRC),_______,  _______,_______,KC_WH_D,
-  KC_CAPS,KC_ACL2,KC_ACL0,_______,_______,_______,_______,_______,_______,_______,_______,_______,/*NUHS*/_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,G(M),   _______,_______,_______,        _______,          KC_MS_U,
-  KC_BTN2,KC_BTN1,_______,                        _______,                        _______,KC_RGUI,KC_APP ,_______,   KC_MS_L,KC_MS_D,KC_MS_R),
-
-
-/* Layer 3: Reset layer (prevents accidental resets) */
-[RES] = LAYOUT(
-  _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______,
-  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,/*NUHS*/_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,          _______,
-  _______,_______,_______,                        _______,                        _______,_______,_______,_______,  _______,_______,_______),
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  /* Tap once: nothing. Tap twice: Alt+F4 */
-  [AF4]  = ACTION_TAP_DANCE_DOUBLE(XXXXXXX,A(F4)),
-};
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/citadel/readme.md b/keyboards/bpiphany/pegasushoof/keymaps/citadel/readme.md
deleted file mode 100644
index 3618bae8618..00000000000
--- a/keyboards/bpiphany/pegasushoof/keymaps/citadel/readme.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Citadel keymap for pegasushoof
-
-Designed for ISO-DE and similar ISO layouts. 
-
-The central idea of this keymap is to avoid unergonomic key combos that force the user to either press
-multiple keys with one hand or to use the left hand for right-sided keys. For instance, ISO-DE users
-have to press `AltGr`+`7` to type _{_. The keymap allows ergonomic access to the right-sided keys of the
-German AltGr-layer by turning `Caps Lock` into a hybrid Fn/AltGr-key. It can easily be adapted for other
-ISO layouts.
-
-The _Function_ layer also offers mouse emulation and function/media keys in the F-Row.
-
-`Pause/Break` is used as a safe _close key_: A _single tap_ does nothing, a _double tap_ executes ALT+F4.
-
-Named after the homonymous space station from _Mass Effect_. Made by [Daniel Rose](https://github.com/droseger/).
-
-## [1] Layers  
-
-### Layer 1 (Default)  
-    .----.   .-------------------. .-------------------. .-------------------. .--------------.  
-    |Esc |   |F1  |F2  |F3  |F4  | |F5  |F6  |F7  |F8  | |F9  |F10 |F11 |F12 | |PrSc|SLck|2Tp:|  
-    |    |   |    |    |    |    | |    |    |    |    | |    |    |    |    | |SyRq|    |A+F4|  
-    '----'   '-------------------' '-------------------' '-------------------' '--------------'  
-    .------------------------------------------------------------------------. .--------------.  
-    |°   |!   |"   |§   |$   |%   |&   |/   |(   |)   |=   |?   |`   |Backspa| |Ins |Home|PgUp|  
-    |^   |1   |2  ²|3  ³|4   |5   |6   |7  {|8  [|9  ]|0  }|ß  \|´   |       | |    |    |    |  
-    |------------------------------------------------------------------------| |--------------|  
-    |Tab   |Q   |W   |E   |R   |T   |Z   |U   |I   |O   |P   |Ü   |*   |  E  | |Del |End |PgDn|  
-    |      |    |    |   €|    |    |    |    |    |    |    |    |+  ~|  n  | |    |    |    |  
-    |------------------------------------------------------------------\  t  | '--------------'  
-    |Fn:    |A   |S   |D   |F   |G   |H   |J   |K   |L   |Ö   |Ä   |'   | e  |  
-    |Layer 2|    |    |    |    |    |    |    |    |    |    |    |#   | r  |  
-    |------------------------------------------------------------------------|      .----.  
-    |Shift|>   |Y   |X   |C   |V   |B   |N   |M   |;   |:   |_   |Shift      |      |Up  |  
-    |     |<  ¦|    |    |    |    |    |    |   µ|,   |.   |-   |           |      |    |  
-    |------------------------------------------------------------------------| .--------------.  
-    |Ctrl |Super|Alt  |                              |AltGr|Alt  |Fn:  |Ctrl | |Left|Down|Righ|  
-    |     |     |     |                              |     |     |Lay 2|     | |    |    |    |  
-    '------------------------------------------------------------------------' '--------------'  
-
-### Layer 2 (Function)
-    .----.   .-------------------. .-------------------. .-------------------. .--------------.  
-    |Ctl+|   |My  |WWW:|Calc|Medi| |Mus:|Mus:|Mus:|Mus:| |Vol:|Vol:|Vol:|See:| |    |    |Paus|  
-    |A+De|   |Comp|Home|    |Play| |Prev|Next|Paus|Stop| |Mute|Down|Up  |[3] | |    |    |Brea|  
-    '----'   '-------------------' '-------------------' '-------------------' '--------------'  
-    .------------------------------------------------------------------------. .--------------.  
-    |    |    |    |    |    |    |    |    |    |    |    |    |    |       | |    |    |Mou:|  
-    |    |    |    |    |    |    |    |{   |[   |]   |}   |\   |    |       | |    |    |WhUp|  
-    |------------------------------------------------------------------------| |--------------|  
-    |      |    |    |    |    |    |    |    |    |    |    |    |~   |     | |    |    |Mou:|  
-    |      |    |    |    |    |    |    |    |    |    |    |    |    |     | |    |    |WhDn|  
-    |------------------------------------------------------------------\     | '--------------'  
-    |CapsLck|Mou:|Mou:|    |    |    |    |    |    |    |    |    |    |    |  
-    |       |Fast|Slow|    |    |    |    |    |    |    |    |    |    |    |  
-    |------------------------------------------------------------------------|      .----.  
-    |     |    |    |    |    |    |    |    |µ   |    |    |    |           |      |Mou:|  
-    |     |    |    |    |    |    |    |    |    |    |    |    |           |      |Up  |  
-    |------------------------------------------------------------------------| .--------------.  
-    |Mous:|Mous:|     |                              |     |Super|App  |     | |Mou:|Mou:|Mou:|  
-    |Bttn2|Bttn1|     |                              |     |     |     |     | |Left|Down|Righ|  
-    '------------------------------------------------------------------------' '--------------'  
-
-Layer 3 exists solely to prevent users from accidentally activating boot mode: `R` is redefined
-as `RESET` key [3].
-
-## [2] How to build and install
-1) Prerequisite: install the necessary [build tools](https://docs.qmk.fm/#/getting_started_build_tools)
-such as [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer).
-   - You might need to [add udev rules](https://docs.qmk.fm/#/faq_build?id=can39t-program-on-linux) under Linux.
-2) To test if the keymap compiles, simply run `make pegasushoof:citadel`
-3) Enter the `qmk_firmware` root directory and run `make pegasushoof:citadel:dfu`
-4) Reset controller to _Boot mode_ by pressing the `RESET` key or by using a magnet.
-
-## [3] How to access Boot mode after install
-Press `Fn+F12+R`
diff --git a/keyboards/bpiphany/pegasushoof/keymaps/citadel/rules.mk b/keyboards/bpiphany/pegasushoof/keymaps/citadel/rules.mk
deleted file mode 100644
index 294a245aabc..00000000000
--- a/keyboards/bpiphany/pegasushoof/keymaps/citadel/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes  # Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes  # Audio control and System control(+450)
-CONSOLE_ENABLE   = no   # Console for debug(+400)
-COMMAND_ENABLE   = no   # Commands for debug and configuration
-CUSTOM_MATRIX    = yes  # Custom matrix file for the Pegasus Hoof due to the 2x74HC42
-NKRO_ENABLE      = no   # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
-MIDI_ENABLE      = no   # MIDI controls
-AUDIO_ENABLE     = no   # Audio output on port C6
-UNICODE_ENABLE   = no   # Unicode
-BLUETOOTH_ENABLE = no   # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no   # Enable WS2812 RGB underlight.
-TAP_DANCE_ENABLE = yes  # see https://docs.qmk.fm/#/feature_tap_dance (+1000)
diff --git a/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c b/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c
deleted file mode 100644
index 78037bac14a..00000000000
--- a/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2023 DeskDaily
- *
- * 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_regular_numpad(
-        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 	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_P7,   KC_P8,   KC_P9,   KC_PPLS,   	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_P4,   KC_P5,   KC_P6,   				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_P1,   KC_P2,   KC_P3,   KC_ENT,  	KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, MO(1),   KC_UP,
-				 KC_P0,   KC_DEL, 				KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC
-    ),
-    [1] = LAYOUT_regular_numpad(
-        _______, _______, _______, _______, 	QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	    _______, _______, _______, 				_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-				 _______, _______, 				_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
\ No newline at end of file
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h
index 657c373c7b6..de1b75d0d66 100644
--- a/keyboards/bubble75/hotswap/config.h
+++ b/keyboards/bubble75/hotswap/config.h
@@ -21,73 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* WS2812 RGB */
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 81
-#define RGBLIGHT_LAYERS
-//#define RGBLIGHT_LAYER_BLINK
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-
-#define RGB_MATRIX_KEYPRESSES
-
-#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5
-#define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-
-
-
-// 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
-#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_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#endif
diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json
index c9757847b03..99cfc4064e0 100644
--- a/keyboards/bubble75/hotswap/info.json
+++ b/keyboards/bubble75/hotswap/info.json
@@ -13,7 +13,36 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
diff --git a/keyboards/buildakb/mw60/info.json b/keyboards/buildakb/mw60/info.json
new file mode 100644
index 00000000000..9a8b7955a85
--- /dev/null
+++ b/keyboards/buildakb/mw60/info.json
@@ -0,0 +1,945 @@
+{
+    "manufacturer": "Maelkworks",
+    "keyboard_name": "mw60",
+    "maintainer": "Maelkk",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "C7", "C6", "B6", "B5", "F5", "B4", "D7", "D6", "D4", "D5", "D3", "F6", "D2"],
+        "rows": ["E6", "D1", "F7", "F4", "F1"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x4A56"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k405", "matrix": [4, 5], "x": 4, "y": 4, "w": 2.75},
+                {"label": "k407", "matrix": [4, 7], "x": 6.75, "y": 4, "w": 1.5},
+                {"label": "k409", "matrix": [4, 9], "x": 8.25, "y": 4, "w": 2.75},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/buildakb/mw60/keymaps/default/keymap.c b/keyboards/buildakb/mw60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..efd37afe26d
--- /dev/null
+++ b/keyboards/buildakb/mw60/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2023 Maelkk
+ *
+ * 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(
+    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_BSLS,  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_NUBS, 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_SPC,           KC_SPC, KC_RALT, MO(1),    KC_RGUI,    KC_RCTL),
+    [1] = LAYOUT_all(
+    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_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/buildakb/mw60/keymaps/via/keymap.c b/keyboards/buildakb/mw60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..3a04af81134
--- /dev/null
+++ b/keyboards/buildakb/mw60/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2023 Maelkk
+ *
+ * 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(
+    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_BSLS,  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_NUBS, 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_SPC,           KC_SPC, KC_RALT, MO(1),    KC_RGUI,    KC_RCTL),
+    [1] = LAYOUT_all(
+    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_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/gray_studio/space65/keymaps/conor/rules.mk b/keyboards/buildakb/mw60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/gray_studio/space65/keymaps/conor/rules.mk
rename to keyboards/buildakb/mw60/keymaps/via/rules.mk
diff --git a/keyboards/buildakb/mw60/readme.md b/keyboards/buildakb/mw60/readme.md
new file mode 100644
index 00000000000..f5e0119eeb4
--- /dev/null
+++ b/keyboards/buildakb/mw60/readme.md
@@ -0,0 +1,24 @@
+# MW60 PCB
+
+![MW60 PCB](https://i.imgur.com/5E48mAPh.jpg)
+
+A simple standard 60% PCB available in hotswap and solderable variants
+
+-   Keyboard Maintainer: [Maelkk](https://github.com/Aeonstrife)
+-   Hardware Supported: MW60 PCB
+-   Hardware Availability: [sandkeys.me](https://sandkeys.me/product/petals-60-addon-pcbs/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make buildakb/mw60:default
+
+Flashing example for this keyboard:
+
+    make buildakb/mw60:default:flash
+
+To reset into bootloader mode:
+
+While plugged in, press the RESET switch located on the back of the pcb.
+The keyboard should now be in bootloader mode.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/buildakb/mw60/rules.mk b/keyboards/buildakb/mw60/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/buildakb/mw60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/buzzard/keymaps/crehmann/config.h b/keyboards/buzzard/keymaps/crehmann/config.h
deleted file mode 100644
index 446ae01d346..00000000000
--- a/keyboards/buzzard/keymaps/crehmann/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// Configure the global tapping term (default: 200ms)
-#define TAPPING_TERM 200
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
-
-// Apply the modifier on keys that are tapped during a short hold of a modtap
-#define PERMISSIVE_HOLD
-
-// Using the right side as master
-#define MASTER_RIGHT
-
-#ifdef HAPTIC_ENABLE
-// this configuration has no effect because the haptic exclusion is implemented with
-// __attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record)
-// in the default keymap and reacts only to mouse clicks. 
-//#define NO_HAPTIC_MOD
-#define NO_HAPTIC_FN
-#define NO_HAPTIC_ALPHA
-#define NO_HAPTIC_PUNCTUATION
-#define NO_HAPTIC_NAV 
-#define NO_HAPTIC_NUMERIC
-#define DRV2605L_GREETING       DRV2605L_EFFECT_750_MS_ALERT_100
-#define DRV2605L_DEFAULT_MODE   DRV2605L_EFFECT_SHARP_TICK_1_100
-#endif
-
-#ifdef PS2_MOUSE_ENABLE
-#define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT)
-#define PS2_MOUSE_SCROLL_BTN_SEND 500
-#endif
diff --git a/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c b/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c
deleted file mode 100644
index 941d559f429..00000000000
--- a/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "haptic_utils.h"
-
-#ifdef HAPTIC_ENABLE
-#include "drivers/haptic/drv2605l.h"
-#endif
-
-#ifdef HAPTIC_ENABLE
-bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_BTN1 ... KC_BTN5:
-            return true;
-            break;
-    }
-
-    return false;
-}
-#endif
-
-void process_layer_pulse(layer_state_t state) {
-#ifdef HAPTIC_ENABLE
-    switch (get_highest_layer(state)) {
-        case 1:
-            drv2605l_pulse(DRV2605L_EFFECT_SOFT_BUMP_100);
-            break;
-        case 2:
-            drv2605l_pulse(DRV2605L_EFFECT_SHORT_DOUBLE_SHARP_TICK_1_100);
-            break;
-        case 3:
-            drv2605l_pulse(DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_STRONG_1_100);
-            break;
-        case 4:
-            drv2605l_pulse(DRV2605L_EFFECT_SOFT_BUMP_100);
-            break;
-        case 5:
-            drv2605l_pulse(DRV2605L_EFFECT_PULSING_SHARP_1_100);
-            break;
-    }
-#endif
-}
diff --git a/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.h b/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.h
deleted file mode 100644
index ccfbb7e14b4..00000000000
--- a/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record);
-
-void process_layer_pulse(layer_state_t state);
\ No newline at end of file
diff --git a/keyboards/buzzard/keymaps/crehmann/keymap.c b/keyboards/buzzard/keymaps/crehmann/keymap.c
deleted file mode 100644
index 5a6ae49d8b3..00000000000
--- a/keyboards/buzzard/keymaps/crehmann/keymap.c
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keymap_swiss_de.h"
-#include "features/haptic_utils.h"
-
-#ifdef PS2_MOUSE_ENABLE
-    #include "ps2_mouse.h"
-#endif
-
-enum layers {
-    _BASE = 0,
-    _NAVR,
-    _SYMB,
-    _NUMR,
-    _FUNL,
-    _MOAJ
-};
-
-
-// Aliases for readability
-#define BASE     DF(_BASE)
-#define NAVR     MO(_NAVR)
-#define SYMB     MO(_SYMB)
-#define NUMR     MO(_NUMR)
-#define FUNL     MO(_FUNL)
-#define MOAD     MO(_MOAJ)
-
-// Left-hand home row mods
-#define RALT_X  RALT_T(KC_X)
-#define GUI_A   LGUI_T(KC_A)
-#define ALT_S   LALT_T(KC_S)
-#define CTL_D   LCTL_T(KC_D)
-#define SFT_F   LSFT_T(KC_F)
-
-// Right-hand home row mods
-#define SFT_J   RSFT_T(KC_J)
-#define CTL_K   RCTL_T(KC_K)
-#define ALT_L   LALT_T(KC_L)
-#define GUI_SCL RGUI_T(KC_SCLN)
-#define RALT_DT RALT_T(KC_DOT)
-
-// Left-hand outer column
-#define CTL_ESC  MT(MOD_LCTL, KC_ESC)
-
-// Thumbcluster
-#define UC_TL1 CTL_ESC
-#define UC_TL2 LT(NAVR, KC_SPC)
-#define UC_TL3 LT(NUMR, KC_TAB)
-
-#define UC_TR3 LT(FUNL, KC_BSPC)
-#define UC_TR2 LT(SYMB, KC_ENT)
-#define UC_TR1 KC_DEL
-
-// Shortcuts
-#define UC_COPY LCTL(KC_C)
-#define UC_PSTE LCTL(KC_V)
-#define UC_CUT  LCTL(KC_X)
-#define UC_MUTE SGUI(KC_M)
-#define UC_OSFT OSM(MOD_LSFT)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// /*
-//  * Base Layer
-//  *
-//  *                 ,----------------------------------.                                               ,----------------------------------.
-//  *                 |   Q  |   W  |   E  |   R  |   T  |                                               |   Z  |   U  |   I  |   O  |   P  |      
-//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
-//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
-//  *          | OSM  |   A  |   S  |   D  |   F  |   G  |                                               |   H  |   J  |   K  |   L  |  ; : | Bksp |
-//  *          | Shift|  GUI | LALT | LCTL | LSFT |      |                                               |      | LSFT | LCTL | LALT |  GUI |      |
-//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
-//  *          |  ESC |   Y  |   X  |   C  |   F  |   B  |                                               |   N  |   M  |  , < |  . > |  / ? | Mute |
-//  *          |  CTL |      | RALT |      |      |      |                                               |      |      |      | RALT |      |  Mic |
-//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
-//  *                                             |  ESC | Space| TAB  |                   |  Bksp| Enter|  Del |
-//  *                                             |  CTL | NAVR | NUMR |                   |  FUNL| SYML |      |
-//  *                                             `--------------------'                   `--------------------'
-//  */
-    [_BASE] = LAYOUT(
-               KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                                        CH_Z   , KC_U   , KC_I   , KC_O   , KC_P   ,
-      UC_OSFT, GUI_A  , ALT_S  , CTL_D  , SFT_F  , KC_G   ,                                        KC_H   , SFT_J  , CTL_K  , ALT_L  , GUI_SCL, KC_BSPC,
-      CTL_ESC, CH_Y   , RALT_X , KC_C   , KC_V   , KC_B   ,                                        KC_N   , KC_M   , KC_COMM, RALT_DT, KC_SLSH, UC_MUTE,
-                                                   UC_TL1 , UC_TL2 , UC_TL3 ,    UC_TR3 , UC_TR2 , UC_TR1
-    ),
-
-// /*
-//  * Symbol Layer
-//  *
-//  *                 ,----------------------------------.                                               ,----------------------------------.
-//  *                 |   `  |   @  |   {  |   }  |   $  |                                               |   ¨  |   ü  |   /  |   \  |   ^  |      
-//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
-//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
-//  *          |      |   ä  |   &  |   (  |   )  |   |  |                                               |   '  |   "  |   ?  |   !  |   +  |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
-//  *          |      |   %  |   #  |   [  |   ]  |   ~  |                                               |   €  |   =  |   *  |   <  |   >  |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
-//  *                                             |      |      | TAB  |                   |      |      |      |
-//  *                                             |      |      |      |                   |      |      |      |
-//  *                                             `--------------------'                   `--------------------'
-//  */
-    [_SYMB] = LAYOUT(
-               CH_GRV , CH_AT  , CH_LCBR, CH_RCBR, CH_DLR ,                                       CH_DIAE, CH_UDIA, CH_SLSH, CH_BSLS, KC_CIRC,
-      _______, CH_ADIA, CH_AMPR, CH_LPRN, CH_RPRN, CH_PIPE,                                       CH_QUOT, CH_DQUO, CH_QUES, CH_EXLM, CH_PLUS, _______,
-      _______, CH_PERC, CH_HASH, CH_LBRC, CH_RBRC, CH_TILD,                                       CH_EURO, CH_EQL , CH_ASTR, CH_LABK, CH_RABK, _______,
-                                                   _______, _______, KC_TAB,    _______, _______ , _______ 
-    ),
-
-// /*
-//  * Navigation Layer (Right)
-//  *
-//  *                 ,----------------------------------.                                               ,----------------------------------.
-//  *                 |      |      |      |      |      |                                               |Insert| Cut  | PgUp | PgDn |      |      
-//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
-//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
-//  *          |      |      |      |      |      |      |                                               | Copy |   ←  |   ↑  |   ↓  |   →  |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
-//  *          |      |      |      |      |      |      |                                               | Paste| Home | WH_U | WH_D | End  |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
-//  *                                             |      |      |      |                   | Bksp |      |  Del |
-//  *                                             |      |      |      |                   |      |      |      |
-//  *                                             `--------------------'                   `--------------------'
-//  */
-    [_NAVR] = LAYOUT(
-               _______, _______, _______, _______, _______,                                        KC_INS , UC_CUT , KC_PGUP, KC_PGDN, _______,
-      _______, _______, _______, _______, _______, _______,                                        UC_COPY, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, _______,
-      _______, _______, _______, _______, _______, _______,                                        UC_PSTE, KC_HOME, KC_WH_U, KC_WH_D, KC_END , _______,
-                                                   _______, _______, _______,    KC_BSPC, _______, _______
-    ),
-// --------------------------------------------------------------------------------------------------------------------------------------------------------
-
-// /*
-//  * Number Layer (Right)
-//  *
-//  *                 ,----------------------------------.                                               ,----------------------------------.
-//  *                 |      |      |      |      |      |                                               |   /  |   7  |   8  |   9  |  -   |      
-//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
-//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
-//  *          |      |      |      |      |      |      |                                               |   *  |   4  |   5  |  6   |  +   |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
-//  *          |      |      |      |      |      |      |                                               |   0  |   1  |   2  |  3   |  .   |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
-//  *                                             |      |      |      |                   | Bksp | Enter|      |
-//  *                                             |      |      |      |                   |      |      |      |
-//  *                                             `--------------------'                   `--------------------'
-//  */
-    [_NUMR] = LAYOUT(
-               _______, _______, _______, _______, _______,                                        KC_SLSH, KC_7   , KC_8   , KC_9   , KC_MINS,
-      _______, _______, _______, _______, _______, _______,                                        KC_ASTR, KC_4   , KC_5   , KC_6   , KC_PLUS, _______,
-      _______, _______, _______, _______, _______, _______,                                        KC_0   , KC_1   , KC_2   , KC_3   , KC_DOT , _______,
-                                                   _______, _______, _______,    KC_BSPC, KC_ENT , _______ 
-    ),
-
-// /*
-//  * Function Layer (Left)
-//  *
-//  *                 ,----------------------------------.                                               ,----------------------------------.
-//  *                 |  F12 |  F7  |  F8  |  F9  | Pause|                                               |      |      |      |      |      |      
-//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
-//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
-//  *          |      |  F11 |  F4  |  F5  |  F6  | PrScr|                                               |      |      |      |      |      |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
-//  *          |      |  F10 |  F1  |  F2  |  F3  | CapsL|                                               |      |      |      |      |      |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
-//  *                                             |      | Space|  TAB |                   |      |      |      |
-//  *                                             |      |      |      |                   |      |      |      |
-//  *                                             `--------------------'                   `--------------------'
-//  */
-    [_FUNL] = LAYOUT(
-               KC_F12 , KC_F7  , KC_F8  , KC_F9  , KC_PAUS,                                        _______, _______, _______, _______, _______,
-      _______, KC_F11 , KC_F4  , KC_F5  , KC_F6  , KC_PSCR,                                        _______, _______, _______, _______, _______, _______,
-      _______, KC_F10 , KC_F1  , KC_F2  , KC_F3  , KC_CAPS,                                        _______, _______, _______, _______, _______, _______,
-                                                   _______, KC_SPC , KC_TAB  ,    _______, _______, _______
-    ),
-  
-// /*
-//  * Mouse & Adjustment Layer
-//  *
-//  *                 ,----------------------------------.                                               ,----------------------------------.
-//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
-//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
-//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
-//  *          |      |      | BTN3 | BTN2 | BTN1 |      |                                               |      |      |      |      |      |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
-//  *          |      |      |  Cut | Copy | Paste|      |                                               | Play |M Prev| VolDn| VolUp|M Next|      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
-//  *                                             |      |      |      |                   |      |      |      |
-//  *                                             |      |      |      |                   |      |      |      |
-//  *                                             `--------------------'                   `--------------------'
-//  */
-    [_MOAJ] = LAYOUT(
-               _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______,
-      _______, _______, KC_BTN3, KC_BTN2, KC_BTN1, _______,                                        _______, _______, _______, _______, _______, _______,
-      _______, _______, UC_CUT , UC_COPY, UC_PSTE, _______,                                        KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,
-                                                   _______, _______, _______,    _______, _______, _______
-    ),
-
-// -------------------------------------------------------- TEMPLATE -------------------------------------------------------------------------------------
-// /*
-//  * Layer
-//  *
-//  *                 ,----------------------------------.                                               ,----------------------------------.
-//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
-//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
-//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
-//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
-//  *                                             |      |      |      |                   |      |      |      |
-//  *                                             |      |      |      |                   |      |      |      |
-//  *                                             `--------------------'                   `--------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//                _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______,
-//                                                    _______, _______, _______,    _______, _______, _______
-//     ),
-// --------------------------------------------------------------------------------------------------------------------------------------------------------
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    process_layer_pulse(state);
-    return update_tri_layer_state(state, _NAVR, _SYMB, _MOAJ);
-}
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case GUI_A:
-            return TAPPING_TERM + 150;
-        case ALT_S:
-            return TAPPING_TERM + 50;
-        case ALT_L:
-            return TAPPING_TERM + 50;
-        case GUI_SCL:
-            return TAPPING_TERM + 150;
-        default:
-            return TAPPING_TERM;
-    }
-}
diff --git a/keyboards/buzzard/keymaps/crehmann/rules.mk b/keyboards/buzzard/keymaps/crehmann/rules.mk
deleted file mode 100644
index 98a83af5497..00000000000
--- a/keyboards/buzzard/keymaps/crehmann/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-SRC += features/haptic_utils.c
-
-OLED_ENABLE = yes		
-
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = drv2605l
-
-PS2_MOUSE_ENABLE = yes	
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/canary60rgb.c
index 065268c5318..b14878ff22d 100644
--- a/keyboards/canary/canary60rgb/canary60rgb.c
+++ b/keyboards/canary/canary60rgb/canary60rgb.c
@@ -16,74 +16,74 @@
  #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, J_14, K_14,  L_14 },
-    { 0, J_13, K_13,  L_13 },
-    { 0, J_12, K_12,  L_12 },
-    { 0, J_11, K_11,  L_11 },
-    { 0, J_10, K_10,  L_10 },
-    { 0, J_9,  K_9,   L_9 },
-    { 0, J_8,  K_8,   L_8 },
-    { 0, J_7,  K_7,   L_7 },
-    { 0, J_6,  K_6,   L_6 },
-    { 0, J_5,  K_5,   L_5 },
-    { 0, J_4,  K_4,   L_4 },
-    { 0, J_3,  K_3,   L_3 },
-    { 0, J_2,  K_2,   L_2 },
-    { 0, J_1,  K_1,   L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW10_CS14, SW11_CS14,  SW12_CS14 },
+    { 0, SW10_CS13, SW11_CS13,  SW12_CS13 },
+    { 0, SW10_CS12, SW11_CS12,  SW12_CS12 },
+    { 0, SW10_CS11, SW11_CS11,  SW12_CS11 },
+    { 0, SW10_CS10, SW11_CS10,  SW12_CS10 },
+    { 0, SW10_CS9,  SW11_CS9,   SW12_CS9 },
+    { 0, SW10_CS8,  SW11_CS8,   SW12_CS8 },
+    { 0, SW10_CS7,  SW11_CS7,   SW12_CS7 },
+    { 0, SW10_CS6,  SW11_CS6,   SW12_CS6 },
+    { 0, SW10_CS5,  SW11_CS5,   SW12_CS5 },
+    { 0, SW10_CS4,  SW11_CS4,   SW12_CS4 },
+    { 0, SW10_CS3,  SW11_CS3,   SW12_CS3 },
+    { 0, SW10_CS2,  SW11_CS2,   SW12_CS2 },
+    { 0, SW10_CS1,  SW11_CS1,   SW12_CS1 },
 
-    { 0, G_14, H_14,  I_14 },
-    { 0, G_13, H_13,  I_13 },
-    { 0, G_12, H_12,  I_12 },
-    { 0, G_11, H_11,  I_11 },
-    { 0, G_10, H_10,  I_10 },
-    { 0, G_9,  H_9,   I_9 },
-    { 0, G_8,  H_8,   I_8 },
-    { 0, G_7,  H_7,   I_7 },
-    { 0, G_6,  H_6,   I_6 },
-    { 0, G_5,  H_5,   I_5 },
-    { 0, G_4,  H_4,   I_4 },
-    { 0, G_3,  H_3,   I_3 },
-    { 0, G_2,  H_2,   I_2 },
-    { 0, G_1,  H_1,   I_1 },
+    { 0, SW7_CS14, SW8_CS14,  SW9_CS14 },
+    { 0, SW7_CS13, SW8_CS13,  SW9_CS13 },
+    { 0, SW7_CS12, SW8_CS12,  SW9_CS12 },
+    { 0, SW7_CS11, SW8_CS11,  SW9_CS11 },
+    { 0, SW7_CS10, SW8_CS10,  SW9_CS10 },
+    { 0, SW7_CS9,  SW8_CS9,   SW9_CS9 },
+    { 0, SW7_CS8,  SW8_CS8,   SW9_CS8 },
+    { 0, SW7_CS7,  SW8_CS7,   SW9_CS7 },
+    { 0, SW7_CS6,  SW8_CS6,   SW9_CS6 },
+    { 0, SW7_CS5,  SW8_CS5,   SW9_CS5 },
+    { 0, SW7_CS4,  SW8_CS4,   SW9_CS4 },
+    { 0, SW7_CS3,  SW8_CS3,   SW9_CS3 },
+    { 0, SW7_CS2,  SW8_CS2,   SW9_CS2 },
+    { 0, SW7_CS1,  SW8_CS1,   SW9_CS1 },
 
-    { 0, D_14, E_14,  F_14 },
-    { 0, D_12, E_12,  F_12 },
-    { 0, D_11, E_11,  F_11 },
-    { 0, D_10, E_10,  F_10 },
-    { 0, D_9,  E_9,   F_9 },
-    { 0, D_8,  E_8,   F_8 },
-    { 0, D_7,  E_7,   F_7 },
-    { 0, D_6,  E_6,   F_6 },
-    { 0, D_5,  E_5,   F_5 },
-    { 0, D_4,  E_4,   F_4 },
-    { 0, D_3,  E_3,   F_3 },
-    { 0, D_2,  E_2,   F_2 },
-    { 0, D_1,  E_1,   F_1 },
+    { 0, SW4_CS14, SW5_CS14,  SW6_CS14 },
+    { 0, SW4_CS12, SW5_CS12,  SW6_CS12 },
+    { 0, SW4_CS11, SW5_CS11,  SW6_CS11 },
+    { 0, SW4_CS10, SW5_CS10,  SW6_CS10 },
+    { 0, SW4_CS9,  SW5_CS9,   SW6_CS9 },
+    { 0, SW4_CS8,  SW5_CS8,   SW6_CS8 },
+    { 0, SW4_CS7,  SW5_CS7,   SW6_CS7 },
+    { 0, SW4_CS6,  SW5_CS6,   SW6_CS6 },
+    { 0, SW4_CS5,  SW5_CS5,   SW6_CS5 },
+    { 0, SW4_CS4,  SW5_CS4,   SW6_CS4 },
+    { 0, SW4_CS3,  SW5_CS3,   SW6_CS3 },
+    { 0, SW4_CS2,  SW5_CS2,   SW6_CS2 },
+    { 0, SW4_CS1,  SW5_CS1,   SW6_CS1 },
 
-    { 0, A_14, B_14,  C_14 },
-    { 0, A_13, B_13,  C_13 },
-    { 0, A_11, B_11,  C_11 },
-    { 0, A_10, B_10,  C_10 },
-    { 0, A_9,  B_9,   C_9 },
-    { 0, A_8,  B_8,   C_8 },
-    { 0, A_7,  B_7,   C_7 },
-    { 0, A_6,  B_6,   C_6 },
-    { 0, A_5,  B_5,   C_5 },
-    { 0, A_4,  B_4,   C_4 },
-    { 0, A_3,  B_3,   C_3 },
-    { 0, A_2,  B_2,   C_2 },
-    { 0, A_1,  B_1,   C_1 },
+    { 0, SW1_CS14, SW2_CS14,  SW3_CS14 },
+    { 0, SW1_CS13, SW2_CS13,  SW3_CS13 },
+    { 0, SW1_CS11, SW2_CS11,  SW3_CS11 },
+    { 0, SW1_CS10, SW2_CS10,  SW3_CS10 },
+    { 0, SW1_CS9,  SW2_CS9,   SW3_CS9 },
+    { 0, SW1_CS8,  SW2_CS8,   SW3_CS8 },
+    { 0, SW1_CS7,  SW2_CS7,   SW3_CS7 },
+    { 0, SW1_CS6,  SW2_CS6,   SW3_CS6 },
+    { 0, SW1_CS5,  SW2_CS5,   SW3_CS5 },
+    { 0, SW1_CS4,  SW2_CS4,   SW3_CS4 },
+    { 0, SW1_CS3,  SW2_CS3,   SW3_CS3 },
+    { 0, SW1_CS2,  SW2_CS2,   SW3_CS2 },
+    { 0, SW1_CS1,  SW2_CS1,   SW3_CS1 },
 
-    { 0, A_15, B_15,  C_15 },
-    { 0, D_13, E_13,  F_13 },
-    { 0, A_12, B_12,  C_12 },
-    { 0, D_15, E_15,  F_15 },
-    { 0, G_15, H_15,  I_15 },
-    { 0, A_16, B_16,  C_16 },
-    { 0, D_16, E_16,  F_16 },
-    { 0, G_16, H_16,  I_16 },
-    { 0, J_16, K_16,  L_16 }
+    { 0, SW1_CS15, SW2_CS15,  SW3_CS15 },
+    { 0, SW4_CS13, SW5_CS13,  SW6_CS13 },
+    { 0, SW1_CS12, SW2_CS12,  SW3_CS12 },
+    { 0, SW4_CS15, SW5_CS15,  SW6_CS15 },
+    { 0, SW7_CS15, SW8_CS15,  SW9_CS15 },
+    { 0, SW1_CS16, SW2_CS16,  SW3_CS16 },
+    { 0, SW4_CS16, SW5_CS16,  SW6_CS16 },
+    { 0, SW7_CS16, SW8_CS16,  SW9_CS16 },
+    { 0, SW10_CS16, SW11_CS16,  SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json
index 7f19520ac34..fc973b88103 100644
--- a/keyboards/canary/canary60rgb/info.json
+++ b/keyboards/canary/canary60rgb/info.json
@@ -30,7 +30,40 @@
         "pin": "B6"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "flower_blooming": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/canary/canary60rgb/keymaps/via/config.h b/keyboards/canary/canary60rgb/keymaps/via/config.h
index d3256bff33d..2546add6da6 100644
--- a/keyboards/canary/canary60rgb/keymaps/via/config.h
+++ b/keyboards/canary/canary60rgb/keymaps/via/config.h
@@ -16,5 +16,5 @@
 
 #pragma once
 
-#define DISABLE_RGB_MATRIX_PIXEL_FLOW
+#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index ab5c817000e..3550dd64d34 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -13,26 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- #pragma once
+#pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    define DISABLE_RGB_MATRIX_BAND_SAT
-#    define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define DISABLE_RGB_MATRIX_SPLASH
-#    define DISABLE_RGB_MATRIX_MULTISPLASH
-#    define DISABLE_RGB_MATRIX_SOLID_SPLASH
-#    define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 63
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
index 0f2582901b1..4b007cf387e 100644
--- a/keyboards/cannonkeys/balance/config.h
+++ b/keyboards/cannonkeys/balance/config.h
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/cannonkeys/bastion60/config.h b/keyboards/cannonkeys/bastion60/config.h
index 206ca9cf564..f410fb53257 100644
--- a/keyboards/cannonkeys/bastion60/config.h
+++ b/keyboards/cannonkeys/bastion60/config.h
@@ -10,5 +10,3 @@
 
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A
-
-#define WS2812_PIO_USE_PIO1
diff --git a/keyboards/cannonkeys/bastion65/config.h b/keyboards/cannonkeys/bastion65/config.h
index 0b93d1434be..640aa331343 100644
--- a/keyboards/cannonkeys/bastion65/config.h
+++ b/keyboards/cannonkeys/bastion65/config.h
@@ -24,5 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A
-
-#define WS2812_PIO_USE_PIO1
diff --git a/keyboards/cannonkeys/bastion75/config.h b/keyboards/cannonkeys/bastion75/config.h
index 0b93d1434be..640aa331343 100644
--- a/keyboards/cannonkeys/bastion75/config.h
+++ b/keyboards/cannonkeys/bastion75/config.h
@@ -24,5 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A
-
-#define WS2812_PIO_USE_PIO1
diff --git a/keyboards/cannonkeys/brutalv2_1800/config.h b/keyboards/cannonkeys/brutalv2_1800/config.h
index 9ac66b56248..17bba21f22d 100644
--- a/keyboards/cannonkeys/brutalv2_1800/config.h
+++ b/keyboards/cannonkeys/brutalv2_1800/config.h
@@ -20,6 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
-
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 3b78decb277..dabdb5ee30e 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -22,9 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json
index 49aaaddd525..3f5e92a99c9 100644
--- a/keyboards/cannonkeys/is0gr/info.json
+++ b/keyboards/cannonkeys/is0gr/info.json
@@ -18,8 +18,8 @@
     "url": "https://cannonkeys.com",
     "usb": {
         "device_version": "0.0.1",
-        "pid": "0x0028",
-        "vid": "0xCA04"
+        "pid": "0xCA04",
+        "vid": "0x0028"
     },
     "community_layouts": ["ortho_1x1"],
     "layouts": {
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
new file mode 100644
index 00000000000..e148ae468a6
--- /dev/null
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
@@ -0,0 +1,393 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "satisfaction_core.h"
+#include "print.h"
+#include "debug.h"
+
+#include <ch.h>
+#include <hal.h>
+
+#include "timer.h"
+
+#include "raw_hid.h"
+#include "dynamic_keymap.h"
+#include "eeprom.h"
+#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
+
+/* Artificial delay added to get media keys to work in the encoder*/
+#define MEDIA_KEY_DELAY 10
+
+volatile uint8_t led_numlock = false;
+volatile uint8_t led_capslock = false;
+volatile uint8_t led_scrolllock = false;
+
+uint8_t layer;
+
+bool clock_set_mode = false;
+uint8_t oled_mode = OLED_DEFAULT;
+bool oled_repaint_requested = false;
+bool oled_wakeup_requested = false;
+uint32_t oled_sleep_timer;
+
+uint8_t encoder_value = 32;
+uint8_t encoder_mode = ENC_MODE_VOLUME;
+uint8_t enabled_encoder_modes = 0x1F;
+
+RTCDateTime last_timespec;
+uint16_t last_minute = 0;
+
+uint8_t time_config_idx = 0;
+int8_t hour_config = 0;
+int16_t minute_config = 0;
+int8_t year_config = 0;
+int8_t month_config = 0;
+int8_t day_config = 0;
+uint8_t previous_encoder_mode = 0;
+
+void board_init(void) {
+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+}
+
+void keyboard_post_init_kb(void) {
+      /*
+        This is a workaround to some really weird behavior
+        Without this code, the OLED will turn on, but not when you initially plug the keyboard in. 
+        You have to manually trigger a user reset to get the OLED to initialize properly
+        I'm not sure what the root cause is at this time, but this workaround fixes it.
+    */
+    #ifdef OLED_ENABLE
+    if(!is_oled_on()){
+        wait_ms(3000);
+        oled_init(OLED_ROTATION_0);
+    }
+    #endif
+
+    keyboard_post_init_user();
+}
+
+#ifdef VIA_ENABLE
+void custom_set_value(uint8_t *data) {
+    uint8_t *value_id = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    
+    switch ( *value_id ) {
+        case id_oled_default_mode:
+        {
+            eeprom_update_byte((uint8_t*)EEPROM_DEFAULT_OLED, value_data[0]);
+            break;
+        }
+        case id_oled_mode:
+        {
+            oled_mode = value_data[0];
+            oled_request_wakeup();
+            break;
+        }
+        case id_encoder_modes:
+        {
+            uint8_t index = value_data[0];
+            uint8_t enable = value_data[1];
+            enabled_encoder_modes = (enabled_encoder_modes & ~(1<<index)) | (enable<<index);
+            eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, enabled_encoder_modes);
+            break;
+        }
+        case id_encoder_custom:
+        {
+            uint8_t custom_encoder_idx = value_data[0];
+            uint8_t encoder_behavior = value_data[1];
+            uint16_t keycode = (value_data[2] << 8) | value_data[3];
+            set_custom_encoder_config(custom_encoder_idx, encoder_behavior, keycode);
+            break;
+        }
+    }
+}
+
+void custom_get_value(uint8_t *data) {
+    uint8_t *value_id = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    
+    switch ( *value_id ) {
+        case id_oled_default_mode:
+        {
+            uint8_t default_oled = eeprom_read_byte((uint8_t*)EEPROM_DEFAULT_OLED);
+            value_data[0] = default_oled;
+            break;
+        }
+        case id_oled_mode:
+        {
+            value_data[0] = oled_mode;
+            break;
+        }
+        case id_encoder_modes:
+        {
+            uint8_t index = value_data[0];
+            value_data[1] = (enabled_encoder_modes & (1<<index)) ? 1 : 0;
+            break;
+        }
+        case id_encoder_custom:
+        {
+            uint8_t custom_encoder_idx = value_data[0];
+            uint8_t encoder_behavior = value_data[1];
+            uint16_t keycode = retrieve_custom_encoder_config(custom_encoder_idx, encoder_behavior);
+            value_data[2] = keycode >> 8;
+            value_data[3] = keycode & 0xFF;
+            break;
+        }
+    }
+}
+
+void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *channel_id        = &(data[1]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    if ( *channel_id == id_custom_channel ) {
+        switch ( *command_id )
+        {
+            case id_custom_set_value:
+            {
+                custom_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value:
+            {
+                custom_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save:
+            {
+                // values are saved in custom_set_value()
+                break;
+            }
+            default:
+            {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+        return;
+    }
+
+    *command_id = id_unhandled;
+
+    // DO NOT call raw_hid_send(data,length) here, let caller do this
+}
+#endif
+
+
+void read_host_led_state(void) {
+  led_t led_state = host_keyboard_led_state();
+  if (led_state.num_lock)    {
+    if (led_numlock == false){
+    led_numlock = true;}
+    } else {
+    if (led_numlock == true){
+    led_numlock = false;}
+    }
+  if (led_state.caps_lock)   {
+    if (led_capslock == false){
+    led_capslock = true;}
+    } else {
+    if (led_capslock == true){
+    led_capslock = false;}
+    }
+  if (led_state.scroll_lock) {
+    if (led_scrolllock == false){
+    led_scrolllock = true;}
+    } else {
+    if (led_scrolllock == true){
+    led_scrolllock = false;}
+    }
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+  state = layer_state_set_user(state);
+  layer = get_highest_layer(state);
+  oled_request_wakeup();
+  return state;
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+  oled_request_wakeup();
+  switch (keycode) {
+    case OLED_TOGG:
+      if(!clock_set_mode){
+        if (record->event.pressed) {
+          oled_mode = (oled_mode + 1) % _NUM_OLED_MODES;
+        }
+      }
+      return false;
+    case CLOCK_SET:
+      if (record->event.pressed) {
+        if(clock_set_mode){
+          pre_encoder_mode_change();
+          clock_set_mode = false;
+          encoder_mode = previous_encoder_mode;
+          post_encoder_mode_change();
+
+        }else{
+          previous_encoder_mode = encoder_mode;
+          pre_encoder_mode_change();
+          clock_set_mode = true;
+          encoder_mode = ENC_MODE_CLOCK_SET;
+          post_encoder_mode_change();
+        }
+      }
+      return false;
+    case ENC_PRESS:
+      if (record->event.pressed) {
+        uint16_t mapped_code = handle_encoder_press();
+        uint16_t held_keycode_timer = timer_read();
+        if(mapped_code != 0){
+          register_code16(mapped_code);
+          while (timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){ /* no-op */ }
+          unregister_code16(mapped_code);
+        }
+      } else {
+        // Do something else when release
+      }
+      return false;
+    default:
+      break;
+  }
+
+  return process_record_user(keycode, record);
+}
+
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) return false;
+    oled_request_wakeup();
+  encoder_value = (encoder_value + (clockwise ? 1 : -1)) % 64;
+  if (index == 0) {
+    if (layer == 0){
+      uint16_t mapped_code = 0;
+      if (clockwise) {
+        mapped_code = handle_encoder_clockwise();
+      } else {
+        mapped_code = handle_encoder_ccw();
+      }
+      uint16_t held_keycode_timer = timer_read();
+      if(mapped_code != 0){
+        register_code16(mapped_code);
+        while (timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){ /* no-op */ }
+        unregister_code16(mapped_code);
+      }
+    } else {
+      if(clockwise){
+        change_encoder_mode(false);
+      } else {
+        change_encoder_mode(true);
+      }
+    }
+  }
+  return true;
+}
+
+void custom_config_reset(void){
+  void *p = (void*)(VIA_EEPROM_CUSTOM_CONFIG_ADDR);
+  void *end = (void*)(VIA_EEPROM_CUSTOM_CONFIG_ADDR+VIA_EEPROM_CUSTOM_CONFIG_SIZE);
+  while ( p != end ) {
+    eeprom_update_byte(p, 0);
+    ++p;
+  }
+  eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, 0x1F);
+}
+
+void custom_config_load(void){
+#ifdef DYNAMIC_KEYMAP_ENABLE
+  oled_mode = eeprom_read_byte((uint8_t*)EEPROM_DEFAULT_OLED);
+  enabled_encoder_modes = eeprom_read_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES);
+#endif
+}
+
+// Called from via_init() if VIA_ENABLE
+// Called from matrix_init_kb() if not VIA_ENABLE
+void via_init_kb(void)
+{
+  // This checks both an EEPROM reset (from bootmagic lite, keycodes)
+  // and also firmware build date (from via_eeprom_is_valid())
+  if (eeconfig_is_enabled()) {
+    custom_config_load();
+  } else	{
+#ifdef DYNAMIC_KEYMAP_ENABLE
+    // Reset the custom stuff
+    custom_config_reset();
+#endif
+    // DO NOT set EEPROM valid here, let caller do this
+  }
+}
+
+void matrix_init_kb(void)
+{
+#ifndef VIA_ENABLE
+  via_init_kb();
+  via_eeprom_set_valid(true);
+#endif // VIA_ENABLE
+
+  rtcGetTime(&RTCD1, &last_timespec);
+  matrix_init_user();
+  oled_request_wakeup();
+}
+
+
+void housekeeping_task_kb(void) {
+  rtcGetTime(&RTCD1, &last_timespec);
+  uint16_t minutes_since_midnight = last_timespec.millisecond / 1000 / 60;
+
+  if (minutes_since_midnight != last_minute){
+    last_minute = minutes_since_midnight;
+    oled_request_repaint();
+  }
+}
+
+//
+// In the case of VIA being disabled, we still need to check if
+// keyboard level EEPROM memory is valid before loading.
+// Thus these are copies of the same functions in VIA, since
+// the backlight settings reuse VIA's EEPROM magic/version,
+// and the ones in via.c won't be compiled in.
+//
+// Yes, this is sub-optimal, and is only here for completeness
+// (i.e. catering to the 1% of people that want wilba.tech LED bling
+// AND want persistent settings BUT DON'T want to use dynamic keymaps/VIA).
+//
+#ifndef VIA_ENABLE
+
+bool via_eeprom_is_valid(void)
+{
+    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 );
+
+    return (eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0 ) == magic0 &&
+            eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1 ) == magic1 &&
+            eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2 ) == magic2 );
+}
+
+// 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"
+    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 );
+
+    eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0, valid ? magic0 : 0xFF);
+    eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1, valid ? magic1 : 0xFF);
+    eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2, valid ? magic2 : 0xFF);
+}
+
+void via_eeprom_reset(void)
+{
+    // Set the VIA specific EEPROM state as invalid.
+    via_eeprom_set_valid(false);
+    // Set the TMK/QMK EEPROM state as invalid.
+    eeconfig_disable();
+}
+
+#endif // VIA_ENABLE
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
new file mode 100644
index 00000000000..9c466421952
--- /dev/null
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
@@ -0,0 +1,95 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#include "via.h" // only for EEPROM address
+#include "satisfaction_keycodes.h"
+
+#define EEPROM_ENABLED_ENCODER_MODES (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
+#define EEPROM_DEFAULT_OLED (VIA_EEPROM_CUSTOM_CONFIG_ADDR+1)
+#define EEPROM_CUSTOM_ENCODER (VIA_EEPROM_CUSTOM_CONFIG_ADDR+2)
+
+enum s75_keyboard_value_id {
+  id_encoder_modes = 1,
+  id_oled_default_mode,
+  id_encoder_custom,
+  id_oled_mode
+};
+
+enum encoder_modes {
+  ENC_MODE_VOLUME,
+  ENC_MODE_MEDIA,
+  ENC_MODE_SCROLL,
+  ENC_MODE_BRIGHTNESS,
+  ENC_MODE_BACKLIGHT,
+  ENC_MODE_CUSTOM0,
+  ENC_MODE_CUSTOM1,
+  ENC_MODE_CUSTOM2,
+  _NUM_ENCODER_MODES,
+  ENC_MODE_CLOCK_SET // This shouldn't be included in the default modes, so we put it after NUM_ENCODER_MODES
+};
+
+enum custom_encoder_behavior {
+    ENC_CUSTOM_CW,
+    ENC_CUSTOM_CCW,
+    ENC_CUSTOM_PRESS
+};
+
+enum oled_modes {
+  OLED_DEFAULT,
+  OLED_TIME,
+  OLED_OFF,
+  _NUM_OLED_MODES
+};
+
+
+// Keyboard Information
+extern volatile uint8_t led_numlock;
+extern volatile uint8_t led_capslock;
+extern volatile uint8_t led_scrolllock;
+extern uint8_t layer;
+
+// OLED Behavior
+extern uint8_t oled_mode;
+extern bool oled_repaint_requested;
+extern bool oled_wakeup_requested;
+extern uint32_t oled_sleep_timer;
+
+// Encoder Behavior
+extern uint8_t encoder_value;
+extern uint8_t encoder_mode;
+extern uint8_t enabled_encoder_modes;
+
+// RTC
+extern RTCDateTime last_timespec;
+extern uint16_t last_minute;
+
+// RTC Configuration
+extern bool clock_set_mode;
+extern uint8_t time_config_idx;
+extern int8_t hour_config;
+extern int16_t minute_config;
+extern int8_t year_config;
+extern int8_t month_config;
+extern int8_t day_config;
+extern uint8_t previous_encoder_mode;
+
+void pre_encoder_mode_change(void);
+void post_encoder_mode_change(void);
+void change_encoder_mode(bool negative);
+uint16_t handle_encoder_clockwise(void);
+uint16_t handle_encoder_ccw(void);
+uint16_t handle_encoder_press(void);
+uint16_t retrieve_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior);
+void set_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior, uint16_t new_code);
+
+void update_time_config(int8_t increment);
+
+void oled_request_wakeup(void);
+void oled_request_repaint(void);
+bool oled_task_needs_to_repaint(void);
+
+void custom_config_load(void);
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
similarity index 86%
rename from keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
rename to keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
index c8bb999df46..7122091ea3c 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
@@ -1,4 +1,7 @@
-#include "satisfaction75.h"
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "satisfaction_core.h"
 #include "eeprom.h"
 
 void pre_encoder_mode_change(void){
@@ -11,8 +14,6 @@ void pre_encoder_mode_change(void){
     // timespec.dstflag = last_timespec.dstflag;
     timespec.millisecond = (hour_config * 60 + minute_config) * 60 * 1000;
     rtcSetTime(&RTCD1, &timespec);
-  } else if (encoder_mode == ENC_MODE_BACKLIGHT){
-    backlight_config_save();
   }
 }
 
@@ -99,16 +100,14 @@ uint16_t handle_encoder_clockwise(void){
     case ENC_MODE_SCROLL:
       mapped_code = KC_WH_D;
       break;
+#ifdef BACKLIGHT_ENABLE
     case ENC_MODE_BACKLIGHT:
-      kb_backlight_config.level = kb_backlight_config.level + 1;
-      if(kb_backlight_config.level > BACKLIGHT_LEVELS){
-        kb_backlight_config.level = BACKLIGHT_LEVELS;
-      }
-      backlight_set(kb_backlight_config.level);
-      if (kb_backlight_config.level != 0){
-        kb_backlight_config.enable = true;
+      backlight_increase();
+      if(get_backlight_level() != 0){
+        backlight_enable();
       }
       break;
+#endif
     case ENC_MODE_BRIGHTNESS:
       mapped_code = KC_BRIGHTNESS_UP;
       break;
@@ -143,16 +142,14 @@ uint16_t handle_encoder_ccw(void){
     case ENC_MODE_SCROLL:
       mapped_code = KC_WH_U;
       break;
+#ifdef BACKLIGHT_ENABLE
     case ENC_MODE_BACKLIGHT:
-      // mapped_code = BL_DOWN;
-      if(kb_backlight_config.level != 0){
-        kb_backlight_config.level = kb_backlight_config.level - 1;
-      }
-      backlight_set(kb_backlight_config.level);
-      if (kb_backlight_config.level == 0){
-        kb_backlight_config.enable = false;
+      backlight_decrease();
+      if(get_backlight_level() == 0){
+        backlight_disable();
       }
       break;
+#endif
     case ENC_MODE_BRIGHTNESS:
       mapped_code = KC_BRIGHTNESS_DOWN;
       break;
@@ -188,15 +185,11 @@ uint16_t handle_encoder_press(void){
     case ENC_MODE_SCROLL:
       mapped_code = KC_BTN3;
       break;
+#ifdef BACKLIGHT_ENABLE
     case ENC_MODE_BACKLIGHT:
-      // mapped_code = BL_TOGG;
-      kb_backlight_config.breathing = !kb_backlight_config.breathing;
-      if(!kb_backlight_config.breathing){
-        breathing_disable();
-      } else{
-        breathing_enable();
-      }
+      breathing_toggle();
       break;
+#endif
 #ifdef DYNAMIC_KEYMAP_ENABLE
     case ENC_MODE_CUSTOM0:
       mapped_code = retrieve_custom_encoder_config(0, ENC_CUSTOM_PRESS);
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_keycodes.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_keycodes.h
new file mode 100644
index 00000000000..53f9facfc85
--- /dev/null
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_keycodes.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+enum my_keycodes {
+  ENC_PRESS = QK_KB_0,
+  CLOCK_SET,
+  OLED_TOGG
+};
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction_oled.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
similarity index 93%
rename from keyboards/cannonkeys/satisfaction75/satisfaction_oled.c
rename to keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
index 0fd69ca59b0..18ae368e535 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction_oled.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
@@ -1,4 +1,8 @@
-#include "satisfaction75.h"
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "satisfaction_core.h"
+#include <stdio.h>
 
 void draw_default(void);
 void draw_clock(void);
@@ -15,7 +19,7 @@ bool oled_task_kb(void) {
     oled_clear();
     if (clock_set_mode) {
         draw_clock();
-        return false;;
+        return false;
     }
     switch (oled_mode) {
         default:
@@ -145,8 +149,8 @@ static char* get_time(void) {
         hour = 12;
     }
 
-    static char time_str[11] = "";
-    sprintf(time_str, "%02d:%02d%s", hour, minute, is_pm ? "pm" : "am");
+    static char time_str[8] = "";
+    snprintf(time_str, sizeof(time_str), "%02hhu:%02hu%s", hour, minute, is_pm ? "pm" : "am");
 
     return time_str;
 }
@@ -162,8 +166,8 @@ static char* get_date(void) {
         day   = day_config;
     }
 
-    static char date_str[15] = "";
-    sprintf(date_str, "%04d-%02d-%02d", year, month, day);
+    static char date_str[11] = "";
+    snprintf(date_str, sizeof(date_str), "%04hd-%02hhd-%02hhd", year, month, day);
 
     return date_str;
 }
@@ -264,4 +268,12 @@ void draw_clock(void) {
     draw_line_v(113, 8, 8);
 }
 
-#endif
+#else
+
+void oled_request_repaint(void){
+}
+
+void oled_request_wakeup(void){
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/cannonkeys/rekt1800/config.h b/keyboards/cannonkeys/rekt1800/config.h
index 7f21b3f8a89..a47b76953a2 100644
--- a/keyboards/cannonkeys/rekt1800/config.h
+++ b/keyboards/cannonkeys/rekt1800/config.h
@@ -26,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index b8cdc797d0e..f3d6237a78d 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -31,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/cannonkeys/satisfaction75/chconf.h b/keyboards/cannonkeys/satisfaction75/chconf.h
index ca4a976c27c..d1b9cf32b7f 100644
--- a/keyboards/cannonkeys/satisfaction75/chconf.h
+++ b/keyboards/cannonkeys/satisfaction75/chconf.h
@@ -1,18 +1,5 @@
-/* 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/>.
- */
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * This file was auto-generated by:
diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index 9005b064b79..1ca72c9c7c5 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -1,19 +1,5 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -23,6 +9,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LSE clock */
 #define STM32_LSECLK 32768
 
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   1
+#define BACKLIGHT_PAL_MODE      1
+
 // I2C config
 #define I2C_DRIVER I2CD1
 #define I2C1_SCL_PIN B6
@@ -53,23 +43,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // dynamic keymaps start after this.
 // Custom config Usage:
 // 1 for enabled encoder modes (1 byte)
-// 1 for custom backlighting controls (1 byte)
 // 1 for OLED default mode (1 byte)
 // 6 for 3x custom encoder settings, left, right, and press (18 bytes)
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 21
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20
 
-/* disable print */
-//#define NO_PRINT
 
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/cannonkeys/satisfaction75/halconf.h b/keyboards/cannonkeys/satisfaction75/halconf.h
index aed3fef0a83..45fe60ab072 100644
--- a/keyboards/cannonkeys/satisfaction75/halconf.h
+++ b/keyboards/cannonkeys/satisfaction75/halconf.h
@@ -1,18 +1,5 @@
-/* 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/>.
- */
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * This file was auto-generated by:
@@ -27,7 +14,5 @@
 
 #define HAL_USE_RTC TRUE
 
-#define HAL_USE_SPI TRUE
-
 #include_next <halconf.h>
 
diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json
index 60695b9ac71..a06faccd230 100644
--- a/keyboards/cannonkeys/satisfaction75/info.json
+++ b/keyboards/cannonkeys/satisfaction75/info.json
@@ -1,27 +1,27 @@
 {
-    "keyboard_name": "Satisfaction75",
     "manufacturer": "CannonKeys",
-    "url": "",
-    "maintainer": "Cannon Keys",
-    "usb": {
-        "vid": "0xCA04",
-        "pid": "0x57F5",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"],
-        "rows": ["B3", "B4", "A0", "A2", "A4", "A3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B9", "pin_b": "B8", "resolution": 2}
-        ]
-    },
+    "keyboard_name": "Satisfaction75",
+    "maintainer": "awkannan",
     "backlight": {
+        "breathing": true,
         "levels": 24,
-        "breathing": true
+        "pin": "A6"
+    },
+    "bootloader": "stm32-dfu",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true
     },
     "processor": "STM32F072",
-    "bootloader": "stm32-dfu"
-}
+    "url": "https://cannonkeys.com",
+    "usb": {
+        "vid": "0xCA04"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/config.h b/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/config.h
deleted file mode 100644
index 4af97ded2b1..00000000000
--- a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once 
-
-#define ENCODER_RESOLUTION 2
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c b/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c
deleted file mode 100644
index 256cdecd6a2..00000000000
--- a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2019 Boy_314
-
-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 keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_2x2(
-    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_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_NO,   ENC_PRESS,
-    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_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENTER, KC_END,
-    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_DEL,
-    KC_LCTL,  KC_LALT,                                KC_SPC,                                 KC_LGUI,            MO(1),    KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  [1] = LAYOUT_2x2(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, OLED_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______, QK_BOOT, CLOCK_SET,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, _______,
-    _______, _______,                            _______,                            _______,          _______, KC_MPRV, KC_VOLD, KC_MNXT
-  )
-};
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/readme.md b/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/readme.md
deleted file mode 100644
index 65984873c47..00000000000
--- a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Boy_314's Satisfaction75 Layout
-
-This is Boy_314's Satisfaction75 Layout. It can be used on VIA. It features a QWERTY layout on the base, along with missing TKL keys on layer 1. Right side 3 keys from top down are: Home, End, Delete. The encoder resolution has been reduced from the default of 4 down to 2 so that it no longer needs to click twice, but now only once, before triggering an action.
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/rules.mk b/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/rules.mk
deleted file mode 100644
index 6f45dc73ed6..00000000000
--- a/keyboards/cannonkeys/satisfaction75/keymaps/boy_314/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# rules.mk overrides to enable VIA
-
-VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/default/keymap.c b/keyboards/cannonkeys/satisfaction75/keymaps/default/keymap.c
index 0bdc0aa9e79..f1dc5ae8bb3 100644
--- a/keyboards/cannonkeys/satisfaction75/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/satisfaction75/keymaps/default/keymap.c
@@ -1,19 +1,5 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/jae/keymap.c b/keyboards/cannonkeys/satisfaction75/keymaps/jae/keymap.c
deleted file mode 100644
index 733ba8cd673..00000000000
--- a/keyboards/cannonkeys/satisfaction75/keymaps/jae/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-const uint16_t 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_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, ENC_PRESS,
-    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_NUHS,  KC_ENTER, 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,    MO(1),
-    KC_LCTL,  KC_LGUI,  KC_LALT,  KC_SPC,             KC_SPC,             KC_SPC,             KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  [1] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, OLED_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-  )
-};
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/tester/keymap.c b/keyboards/cannonkeys/satisfaction75/keymaps/tester/keymap.c
deleted file mode 100644
index c648333c3d8..00000000000
--- a/keyboards/cannonkeys/satisfaction75/keymaps/tester/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-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_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, ENC_PRESS,
-    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_NUHS,  KC_ENTER, KC_PGUP,
-    KC_LSFT,  KC_BSLS,  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_SPC,             KC_SPC,             KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  [1] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-  )
-};
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/tester/rules.mk b/keyboards/cannonkeys/satisfaction75/keymaps/tester/rules.mk
deleted file mode 100644
index 3357eb91c05..00000000000
--- a/keyboards/cannonkeys/satisfaction75/keymaps/tester/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-QWIIC_ENABLE = no
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/via/keymap.c b/keyboards/cannonkeys/satisfaction75/keymaps/via/keymap.c
index 47806ff8a29..61981c65211 100644
--- a/keyboards/cannonkeys/satisfaction75/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/satisfaction75/keymaps/via/keymap.c
@@ -1,19 +1,5 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
diff --git a/keyboards/cannonkeys/satisfaction75/led.c b/keyboards/cannonkeys/satisfaction75/led.c
deleted file mode 100644
index 68bfc99d2ed..00000000000
--- a/keyboards/cannonkeys/satisfaction75/led.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <hal.h>
-#include "led_custom.h"
-#include "satisfaction75.h"
-
-#define BREATHING_PERIOD 6
-
-static void breathing_callback(PWMDriver *pwmp);
-
-static PWMConfig pwmCFG = {
-  0xFFFF,                              /* PWM clock frequency  */
-  256,                              /* PWM period (in ticks) 1S (1/10kHz=0.1mS 0.1ms*10000 ticks=1S) */
-  NULL,                               /* No Callback */
-  {
-      {PWM_OUTPUT_ACTIVE_HIGH, NULL}, /* Enable Channel 0 */
-      {PWM_OUTPUT_DISABLED, NULL},
-      {PWM_OUTPUT_DISABLED, NULL},
-      {PWM_OUTPUT_DISABLED, NULL}
-  },
-  0,                                  /* HW dependent part.*/
-  0
-};
-
-static PWMConfig pwmCFG_breathing = {
-  0xFFFF,                              /* 10kHz PWM clock frequency  */
-  256,                              /* PWM period (in ticks) 1S (1/10kHz=0.1mS 0.1ms*10000 ticks=1S) */
-  breathing_callback,                               /* Breathing Callback */
-  {
-      {PWM_OUTPUT_ACTIVE_HIGH, NULL}, /* Enable Channel 0 */
-      {PWM_OUTPUT_DISABLED, NULL},
-      {PWM_OUTPUT_DISABLED, NULL},
-      {PWM_OUTPUT_DISABLED, NULL}
-  },
-  0,                                  /* HW dependent part.*/
-  0
-};
-
-// 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%
-  else {
-    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
-      return 0xFFFFU;
-    else
-      return (uint16_t) y;
-  }
-}
-
-
-void backlight_init_ports(void) {
-  palSetPadMode(GPIOA, 6, PAL_MODE_ALTERNATE(1));
-  pwmStart(&PWMD3, &pwmCFG);
-  if(kb_backlight_config.enable){
-    if(kb_backlight_config.breathing){
-      breathing_enable();
-    } else{
-      backlight_set(kb_backlight_config.level);
-    }
-  } else {
-    backlight_set(0);
-  }
-}
-
-void suspend_power_down_user(void) {
-    backlight_set(0);
-}
-void suspend_wakeup_init_user(void) {
-  if(kb_backlight_config.enable){
-    if(kb_backlight_config.breathing){
-      breathing_enable();
-    } else{
-      backlight_set(kb_backlight_config.level);
-    }
-  } else {
-    backlight_set(0);
-  }
-}
-
-void backlight_set(uint8_t level) {
-  uint32_t duty = (uint32_t)(cie_lightness(0xFFFF * (uint32_t) level / BACKLIGHT_LEVELS));
-  if (level == 0) {
-      // Turn backlight off
-      pwmDisableChannel(&PWMD3, 0);
-  } else {
-    // Turn backlight on
-    if(!is_breathing()){
-      pwmEnableChannel(&PWMD3, 0, PWM_FRACTION_TO_WIDTH(&PWMD3,0xFFFF,duty));
-    }
-  }
-}
-
-
-uint8_t backlight_tick = 0;
-
-void backlight_task(void) {
-}
-
-#define BREATHING_NO_HALT  0
-#define BREATHING_HALT_OFF 1
-#define BREATHING_HALT_ON  2
-#define BREATHING_STEPS 128
-
-static uint8_t breathing_period = BREATHING_PERIOD;
-static uint8_t breathing_halt = BREATHING_NO_HALT;
-static uint16_t breathing_counter = 0;
-
-bool is_breathing(void) {
-    return PWMD3.config == &pwmCFG_breathing;
-}
-
-#define breathing_min() do {breathing_counter = 0;} while (0)
-#define breathing_max() do {breathing_counter = breathing_period * 256 / 2;} while (0)
-
-
-void breathing_interrupt_enable(void){
-    pwmStop(&PWMD3);
-    pwmStart(&PWMD3, &pwmCFG_breathing);
-    chSysLockFromISR();
-    pwmEnablePeriodicNotification(&PWMD3);
-    pwmEnableChannelI(
-      &PWMD3,
-      0,
-      PWM_FRACTION_TO_WIDTH(
-        &PWMD3,
-        0xFFFF,
-        0xFFFF
-      )
-    );
-    chSysUnlockFromISR();
-}
-
-void breathing_interrupt_disable(void){
-    pwmStop(&PWMD3);
-    pwmStart(&PWMD3, &pwmCFG);
-}
-
-void breathing_enable(void)
-{
-  breathing_counter = 0;
-  breathing_halt = BREATHING_NO_HALT;
-  breathing_interrupt_enable();
-}
-
-void breathing_pulse(void)
-{
-    if (kb_backlight_config.level == 0)
-      breathing_min();
-    else
-      breathing_max();
-    breathing_halt = BREATHING_HALT_ON;
-    breathing_interrupt_enable();
-}
-
-void breathing_disable(void)
-{
-    breathing_interrupt_disable();
-    // Restore backlight level
-    backlight_set(kb_backlight_config.level);
-}
-
-void breathing_self_disable(void)
-{
-  if (kb_backlight_config.level == 0)
-    breathing_halt = BREATHING_HALT_OFF;
-  else
-    breathing_halt = BREATHING_HALT_ON;
-}
-
-void breathing_toggle(void) {
-  if (is_breathing()){
-    breathing_disable();
-  } else {
-    breathing_enable();
-  }
-}
-
-void breathing_period_set(uint8_t value)
-{
-  if (!value)
-    value = 1;
-  breathing_period = value;
-}
-
-void breathing_period_default(void) {
-  breathing_period_set(BREATHING_PERIOD);
-}
-
-void breathing_period_inc(void)
-{
-  breathing_period_set(breathing_period+1);
-}
-
-void breathing_period_dec(void)
-{
-  breathing_period_set(breathing_period-1);
-}
-
-/* To generate breathing curve in python:
- * from math import sin, pi; [int(sin(x/128.0*pi)**4*255) for x in range(128)]
- */
-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 * kb_backlight_config.level;
-}
-
-static void breathing_callback(PWMDriver *pwmp)
-{
-  (void)pwmp;
-  uint16_t interval = (uint16_t) breathing_period * 256 / BREATHING_STEPS;
-  // resetting after one period to prevent ugly reset at overflow.
-  breathing_counter = (breathing_counter + 1) % (breathing_period * 256);
-  uint8_t index = breathing_counter / interval % BREATHING_STEPS;
-
-  if (((breathing_halt == BREATHING_HALT_ON) && (index == BREATHING_STEPS / 2)) ||
-      ((breathing_halt == BREATHING_HALT_OFF) && (index == BREATHING_STEPS - 1)))
-  {
-      breathing_interrupt_disable();
-  }
-
-  uint32_t duty = cie_lightness(scale_backlight(breathing_table[index] * 256));
-
-  chSysLockFromISR();
-  pwmEnableChannelI(
-    &PWMD3,
-    0,
-    PWM_FRACTION_TO_WIDTH(
-      &PWMD3,
-      0xFFFF,
-      duty
-    )
-  );
-  chSysUnlockFromISR();
-}
diff --git a/keyboards/cannonkeys/satisfaction75/led_custom.h b/keyboards/cannonkeys/satisfaction75/led_custom.h
deleted file mode 100644
index d818b48ce98..00000000000
--- a/keyboards/cannonkeys/satisfaction75/led_custom.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-void backlight_task(void);
-void breathing_interrupt_disable(void);
-void breathing_interrupt_enable(void);
-void breathing_enable(void);
-void breathing_disable(void);
diff --git a/keyboards/cannonkeys/satisfaction75/mcuconf.h b/keyboards/cannonkeys/satisfaction75/mcuconf.h
index 0c84a1e1a8a..2c81f2243e3 100644
--- a/keyboards/cannonkeys/satisfaction75/mcuconf.h
+++ b/keyboards/cannonkeys/satisfaction75/mcuconf.h
@@ -1,18 +1,5 @@
-/* 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/>.
- */
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * This file was auto-generated by:
@@ -34,7 +21,3 @@
 
 #undef STM32_PWM_USE_TIM3
 #define STM32_PWM_USE_TIM3 TRUE
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 TRUE
-
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/info.json b/keyboards/cannonkeys/satisfaction75/prototype/info.json
index 9f932b65057..4f67754d8fb 100644
--- a/keyboards/cannonkeys/satisfaction75/prototype/info.json
+++ b/keyboards/cannonkeys/satisfaction75/prototype/info.json
@@ -1,24 +1,34 @@
 {
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B9", "pin_b": "B8", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"],
+        "rows": ["B3", "B4", "A0", "A2", "A4", "A3"]
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x57F5"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
                 {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-
                 {"label": "K002", "matrix": [0, 2], "x": 1.5, "y": 0},
                 {"label": "K003", "matrix": [0, 3], "x": 2.5, "y": 0},
                 {"label": "K004", "matrix": [0, 4], "x": 3.5, "y": 0},
                 {"label": "K005", "matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"label": "K006", "matrix": [0, 6], "x": 5.75, "y": 0},
                 {"label": "K007", "matrix": [0, 7], "x": 6.75, "y": 0},
                 {"label": "K008", "matrix": [0, 8], "x": 7.75, "y": 0},
                 {"label": "K009", "matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"label": "K010", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K011", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "K012", "matrix": [0, 12], "x": 12, "y": 0},
                 {"label": "K013", "matrix": [0, 13], "x": 13, "y": 0},
-
                 {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.25},
                 {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.25},
                 {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.25},
@@ -34,9 +44,7 @@
                 {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.25},
                 {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.25},
                 {"label": "K114", "matrix": [1, 14], "x": 14, "y": 1.25},
-
                 {"label": "K115", "matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -51,9 +59,7 @@
                 {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"label": "K215", "matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -68,9 +74,7 @@
                 {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.25},
                 {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.25},
                 {"label": "K313", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
                 {"label": "K315", "matrix": [3, 15], "x": 15.5, "y": 3.25},
-
                 {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
                 {"label": "K401", "matrix": [4, 1], "x": 1.25, "y": 4.25},
                 {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -84,11 +88,8 @@
                 {"label": "K410", "matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"label": "K411", "matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"label": "K412", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"label": "K413", "matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"label": "K415", "matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
@@ -98,7 +99,6 @@
                 {"label": "K509", "matrix": [5, 9], "x": 10, "y": 5.25},
                 {"label": "K510", "matrix": [5, 10], "x": 11, "y": 5.25},
                 {"label": "K511", "matrix": [5, 11], "x": 12, "y": 5.25},
-
                 {"label": "K512", "matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"label": "K513", "matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"label": "K515", "matrix": [5, 15], "x": 15.25, "y": 5.5}
@@ -107,22 +107,18 @@
         "LAYOUT_default": {
             "layout": [
                 {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-
                 {"label": "K002", "matrix": [0, 2], "x": 1.5, "y": 0},
                 {"label": "K003", "matrix": [0, 3], "x": 2.5, "y": 0},
                 {"label": "K004", "matrix": [0, 4], "x": 3.5, "y": 0},
                 {"label": "K005", "matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"label": "K006", "matrix": [0, 6], "x": 5.75, "y": 0},
                 {"label": "K007", "matrix": [0, 7], "x": 6.75, "y": 0},
                 {"label": "K008", "matrix": [0, 8], "x": 7.75, "y": 0},
                 {"label": "K009", "matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"label": "K010", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K011", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "K012", "matrix": [0, 12], "x": 12, "y": 0},
                 {"label": "K013", "matrix": [0, 13], "x": 13, "y": 0},
-
                 {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.25},
                 {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.25},
                 {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.25},
@@ -137,9 +133,7 @@
                 {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.25},
                 {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.25},
                 {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
                 {"label": "K115", "matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -154,9 +148,7 @@
                 {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"label": "K215", "matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -170,9 +162,7 @@
                 {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.25},
                 {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
                 {"label": "K315", "matrix": [3, 15], "x": 15.5, "y": 3.25},
-
                 {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.25},
                 {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.25},
@@ -185,11 +175,8 @@
                 {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.25},
                 {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.25},
                 {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"label": "K413", "matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"label": "K415", "matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
@@ -197,11 +184,10 @@
                 {"label": "K509", "matrix": [5, 9], "x": 10, "y": 5.25},
                 {"label": "K510", "matrix": [5, 10], "x": 11, "y": 5.25},
                 {"label": "K511", "matrix": [5, 11], "x": 12, "y": 5.25},
-
                 {"label": "K512", "matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"label": "K513", "matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"label": "K515", "matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk b/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
index e69de29bb2d..7ff128fa692 100644
--- a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/readme.md b/keyboards/cannonkeys/satisfaction75/readme.md
index 361d1eb0f1a..9e2891b93fa 100644
--- a/keyboards/cannonkeys/satisfaction75/readme.md
+++ b/keyboards/cannonkeys/satisfaction75/readme.md
@@ -2,11 +2,39 @@
 
 Satisfaction75 Keyboard
 
-Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan1)  
-Hardware Supported: STM32F072CBT6  
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+
+## Revisions
+
+Please be advised that there are many revisions of Satisfaction75 PCBs.
+
+- Prototype revisions do not really exist in the wild, unless you are one of very few people who have an early pre-production Satisfaction75
+- Rev1 was the PCB sold with Round 1 and Round 2 of the Satisfaction75 keyboard group buy, as well as any extra PCBs sold before 2023.
+- Rev2 is the PCB sold with the late 2023/early 2024 Injection molded Satisfaction75, and any extra PCBs sold after that. These PCBs also have extra edge cuts to support the injection molded Satisfaction75. It was redesigned from scratch and has a little less layout support compared to Rev1.
+
+Revision 2 PCBs will have Revision 2 printed on the PCBs.
+
+Revisions _are_ backwards compatible, so you can use a Rev2 PCB in a board that originally had a Rev1 PCB in it. They are _not_ forwards compatible - Rev 1 PCBs will not work in the injection molded Satisfaction75.
+
+Change the below commands to reflect the revision you need!
+
+## Building and Flashing
 
 Make example for this keyboard (after setting up your build environment):
 
-    make cannonkeys/Satisfaction75:default
+    make cannonkeys/satisfaction75/rev1:default
+    
+Flashing example for this keyboard:
+
+    make cannonkeys/satisfaction75/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 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**: Toggle the switch on the back of the pcb to "1" and briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/info.json b/keyboards/cannonkeys/satisfaction75/rev1/info.json
index cc4ad80d42a..d4a6b4423c0 100644
--- a/keyboards/cannonkeys/satisfaction75/rev1/info.json
+++ b/keyboards/cannonkeys/satisfaction75/rev1/info.json
@@ -1,24 +1,34 @@
 {
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B9", "pin_b": "B8", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"],
+        "rows": ["B3", "B4", "A0", "A2", "A4", "A3"]
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x57F5"
+    },
     "layouts": {
-        "LAYOUT_default": {
+        "LAYOUT_2x2": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
-
                 {"matrix": [0, 2], "x": 1.5, "y": 0},
                 {"matrix": [0, 3], "x": 2.5, "y": 0},
                 {"matrix": [0, 4], "x": 3.5, "y": 0},
                 {"matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"matrix": [0, 6], "x": 5.75, "y": 0},
                 {"matrix": [0, 7], "x": 6.75, "y": 0},
                 {"matrix": [0, 8], "x": 7.75, "y": 0},
                 {"matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -32,10 +42,9 @@
                 {"matrix": [1, 10], "x": 10, "y": 1.25},
                 {"matrix": [1, 11], "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
                 {"matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -50,9 +59,7 @@
                 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -66,9 +73,7 @@
                 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
                 {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
                 {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
@@ -81,43 +86,33 @@
                 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25},
-                {"matrix": [5, 10], "x": 11, "y": 5.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25},
-
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         },
-        "LAYOUT_iso": {
+        "LAYOUT_3x2": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
-
                 {"matrix": [0, 2], "x": 1.5, "y": 0},
                 {"matrix": [0, 3], "x": 2.5, "y": 0},
                 {"matrix": [0, 4], "x": 3.5, "y": 0},
                 {"matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"matrix": [0, 6], "x": 5.75, "y": 0},
                 {"matrix": [0, 7], "x": 6.75, "y": 0},
                 {"matrix": [0, 8], "x": 7.75, "y": 0},
                 {"matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -132,9 +127,7 @@
                 {"matrix": [1, 11], "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "x": 12, "y": 1.25},
                 {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
                 {"matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -148,9 +141,8 @@
                 {"matrix": [2, 10], "x": 10.5, "y": 2.25},
                 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -163,13 +155,9 @@
                 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
                 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
                 {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
                 {"matrix": [4, 4], "x": 4.25, "y": 4.25},
@@ -181,43 +169,34 @@
                 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25},
-                {"matrix": [5, 10], "x": 11, "y": 5.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25},
-
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         },
-        "LAYOUT_3x2": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
-
                 {"matrix": [0, 2], "x": 1.5, "y": 0},
                 {"matrix": [0, 3], "x": 2.5, "y": 0},
                 {"matrix": [0, 4], "x": 3.5, "y": 0},
                 {"matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"matrix": [0, 6], "x": 5.75, "y": 0},
                 {"matrix": [0, 7], "x": 6.75, "y": 0},
                 {"matrix": [0, 8], "x": 7.75, "y": 0},
                 {"matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -231,10 +210,9 @@
                 {"matrix": [1, 10], "x": 10, "y": 1.25},
                 {"matrix": [1, 11], "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
                 {"matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -249,9 +227,7 @@
                 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -264,11 +240,11 @@
                 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
                 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
                 {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
                 {"matrix": [4, 4], "x": 4.25, "y": 4.25},
@@ -280,42 +256,37 @@
                 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         },
-        "LAYOUT_2x2": {
+        "LAYOUT_default": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
-
                 {"matrix": [0, 2], "x": 1.5, "y": 0},
                 {"matrix": [0, 3], "x": 2.5, "y": 0},
                 {"matrix": [0, 4], "x": 3.5, "y": 0},
                 {"matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"matrix": [0, 6], "x": 5.75, "y": 0},
                 {"matrix": [0, 7], "x": 6.75, "y": 0},
                 {"matrix": [0, 8], "x": 7.75, "y": 0},
                 {"matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -329,11 +300,8 @@
                 {"matrix": [1, 10], "x": 10, "y": 1.25},
                 {"matrix": [1, 11], "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [1, 14], "x": 14, "y": 1.25},
-
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
                 {"matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -348,9 +316,7 @@
                 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -364,9 +330,7 @@
                 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
                 {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
                 {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
@@ -379,41 +343,35 @@
                 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         },
-        "LAYOUT_split_space": {
+        "LAYOUT_iso": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
-
                 {"matrix": [0, 2], "x": 1.5, "y": 0},
                 {"matrix": [0, 3], "x": 2.5, "y": 0},
                 {"matrix": [0, 4], "x": 3.5, "y": 0},
                 {"matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"matrix": [0, 6], "x": 5.75, "y": 0},
                 {"matrix": [0, 7], "x": 6.75, "y": 0},
                 {"matrix": [0, 8], "x": 7.75, "y": 0},
                 {"matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -428,9 +386,7 @@
                 {"matrix": [1, 11], "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "x": 12, "y": 1.25},
                 {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
                 {"matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -444,10 +400,7 @@
                 {"matrix": [2, 10], "x": 10.5, "y": 2.25},
                 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -460,11 +413,11 @@
                 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
                 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
                 {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
                 {"matrix": [4, 4], "x": 4.25, "y": 4.25},
@@ -476,45 +429,35 @@
                 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.25},
-                {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
                 {"matrix": [5, 9], "x": 10, "y": 5.25},
                 {"matrix": [5, 10], "x": 11, "y": 5.25},
                 {"matrix": [5, 11], "x": 12, "y": 5.25},
-
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         },
-        "LAYOUT_all": {
+        "LAYOUT_split_space": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
-
                 {"matrix": [0, 2], "x": 1.5, "y": 0},
                 {"matrix": [0, 3], "x": 2.5, "y": 0},
                 {"matrix": [0, 4], "x": 3.5, "y": 0},
                 {"matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"matrix": [0, 6], "x": 5.75, "y": 0},
                 {"matrix": [0, 7], "x": 6.75, "y": 0},
                 {"matrix": [0, 8], "x": 7.75, "y": 0},
                 {"matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -528,11 +471,8 @@
                 {"matrix": [1, 10], "x": 10, "y": 1.25},
                 {"matrix": [1, 11], "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [1, 14], "x": 14, "y": 1.25},
-
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
                 {"matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -547,9 +487,7 @@
                 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -562,13 +500,9 @@
                 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
                 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
                 {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
                 {"matrix": [4, 4], "x": 4.25, "y": 4.25},
@@ -580,11 +514,8 @@
                 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
@@ -594,11 +525,10 @@
                 {"matrix": [5, 9], "x": 10, "y": 5.25},
                 {"matrix": [5, 10], "x": 11, "y": 5.25},
                 {"matrix": [5, 11], "x": 12, "y": 5.25},
-
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/keymap.c b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/keymap.c
new file mode 100644
index 00000000000..8b05d53fb7e
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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_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, ENC_PRESS,
+    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_NUHS,  KC_ENTER, KC_PGUP,
+    KC_LSFT,  KC_BSLS,  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_SPC,             KC_SPC,             KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/rules.mk b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/rules.mk
new file mode 100644
index 00000000000..517f469b6d7
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/rules.mk
@@ -0,0 +1 @@
+OLED_ENABLE = no
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk b/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
index e69de29bb2d..7ff128fa692 100644
--- a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/info.json b/keyboards/cannonkeys/satisfaction75/rev2/info.json
new file mode 100644
index 00000000000..e8ddb90c89c
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev2/info.json
@@ -0,0 +1,193 @@
+{
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B9", "pin_b": "B8"}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "B14",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A4", "A3", "A2", "B3"],
+        "rows": ["A13", "A14", "A15", "B4", "B5", "C13"]
+    },
+    "usb": {
+        "device_version": "0.0.2",
+        "pid": "0x001A"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 5.75, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.75, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.75, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.75, "y": 0},
+                {"label": "F9", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 1.25},
+                {"label": "EncPress", "matrix": [1, 14], "x": 15.5, "y": 0.75},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Del", "matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "PgUp", "matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "PgDn", "matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25},
+                {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25},
+                {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_split_bs_7u": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 5.75, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.75, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.75, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.75, "y": 0},
+                {"label": "F9", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 1.25},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"label": "Del", "matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "PgUp", "matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "PgDn", "matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/keymaps/default/keymap.c b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..bce6632706b
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#include QMK_KEYBOARD_H
+#include "satisfaction_keycodes.h"
+
+
+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_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, ENC_PRESS,
+    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_ENTER,           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_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    QK_BOOT, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/keymap.c b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..a0119fc0cd3
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#include QMK_KEYBOARD_H
+#include "satisfaction_keycodes.h"
+
+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_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, ENC_PRESS,
+    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_ENTER,           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_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    QK_BOOT, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/rules.mk b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/hs60/v2/hhkb/keymaps/goatmaster/rules.mk
rename to keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/rules.mk
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/readme.md b/keyboards/cannonkeys/satisfaction75/rev2/readme.md
new file mode 100644
index 00000000000..ac393283e08
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev2/readme.md
@@ -0,0 +1,29 @@
+# Satisfaction75 - Revision 2
+
+A new revision of the Satisfaction75 PCB.
+Layout support has been streamlined.
+
+This PCB was released in late 2023/2024. If you have a Satisfaction75 PCB from before that time, please use the rev1 satisfaction75 PCB.
+
+The revision 2 of the PCB also has "Revision 2" printed on it.
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/satisfaction75/rev2:default
+    
+Flashing example for this keyboard:
+
+    make cannonkeys/satisfaction75/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).
+
+## 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**: Toggle the switch on the back of the pcb to "1" and briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/enter67/rules.mk b/keyboards/cannonkeys/satisfaction75/rev2/rules.mk
similarity index 100%
rename from keyboards/enter67/rules.mk
rename to keyboards/cannonkeys/satisfaction75/rev2/rules.mk
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index 8cee2da595e..c92469d1bd4 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -1,21 +1,9 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-SRC += led.c \
-      satisfaction_encoder.c \
-      satisfaction_oled.c
+VPATH += keyboards/cannonkeys/lib/satisfaction75
+SRC += satisfaction_encoder.c \
+      satisfaction_oled.c \
+      satisfaction_core.c 
 
-# 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 = yes	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-#BACKLIGHT_ENABLE = yes
-
-DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
+DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
deleted file mode 100644
index 29fb6e76191..00000000000
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ /dev/null
@@ -1,464 +0,0 @@
-#include "satisfaction75.h"
-#include "print.h"
-#include "debug.h"
-
-#include <ch.h>
-#include <hal.h>
-
-#include "timer.h"
-
-#include "raw_hid.h"
-#include "dynamic_keymap.h"
-#include "eeprom.h"
-#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
-
-/* Artificial delay added to get media keys to work in the encoder*/
-#define MEDIA_KEY_DELAY 10
-
-volatile uint8_t led_numlock = false;
-volatile uint8_t led_capslock = false;
-volatile uint8_t led_scrolllock = false;
-
-uint8_t layer;
-
-bool clock_set_mode = false;
-uint8_t oled_mode = OLED_DEFAULT;
-bool oled_repaint_requested = false;
-bool oled_wakeup_requested = false;
-uint32_t oled_sleep_timer;
-
-uint8_t encoder_value = 32;
-uint8_t encoder_mode = ENC_MODE_VOLUME;
-uint8_t enabled_encoder_modes = 0x1F;
-
-RTCDateTime last_timespec;
-uint16_t last_minute = 0;
-
-uint8_t time_config_idx = 0;
-int8_t hour_config = 0;
-int16_t minute_config = 0;
-int8_t year_config = 0;
-int8_t month_config = 0;
-int8_t day_config = 0;
-uint8_t previous_encoder_mode = 0;
-
-backlight_config_t kb_backlight_config = {
-  .enable = true,
-  .breathing = true,
-  .level = BACKLIGHT_LEVELS
-};
-
-void board_init(void) {
-  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
-  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
-}
-
-#ifdef VIA_ENABLE
-
-void backlight_get_value( uint8_t *data )
-{
-	uint8_t *value_id = &(data[0]);
-	uint8_t *value_data = &(data[1]);
-  switch (*value_id)
-  {
-    case id_qmk_backlight_brightness:
-    {
-      // level / BACKLIGHT_LEVELS * 255
-      value_data[0] = ((uint16_t)kb_backlight_config.level) * 255 / BACKLIGHT_LEVELS;
-      break;
-    }
-    case id_qmk_backlight_effect:
-    {
-      value_data[0] = kb_backlight_config.breathing ? 1 : 0;
-      break;
-    }
-  }
-}
-
-void backlight_set_value( uint8_t *data )
-{
-	uint8_t *value_id = &(data[0]);
-	uint8_t *value_data = &(data[1]);
-  switch (*value_id)
-  {
-    case id_qmk_backlight_brightness:
-    {
-      // level / 255 * BACKLIGHT_LEVELS
-      kb_backlight_config.level = ((uint16_t)value_data[0]) * BACKLIGHT_LEVELS / 255;
-      backlight_set(kb_backlight_config.level);
-      break;
-    }
-    case id_qmk_backlight_effect:
-    {
-      if ( value_data[0] == 0 ) {
-        kb_backlight_config.breathing = false;
-        breathing_disable();
-      } else {
-        kb_backlight_config.breathing = true;
-        breathing_enable();
-      }
-      break;
-    }
-  }
-}
-
-void custom_set_value(uint8_t *data) {
-    uint8_t *value_id = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-    
-    switch ( *value_id ) {
-        case id_oled_default_mode:
-        {
-            eeprom_update_byte((uint8_t*)EEPROM_DEFAULT_OLED, value_data[0]);
-            break;
-        }
-        case id_oled_mode:
-        {
-            oled_mode = value_data[0];
-            oled_request_wakeup();
-            break;
-        }
-        case id_encoder_modes:
-        {
-            uint8_t index = value_data[0];
-            uint8_t enable = value_data[1];
-            enabled_encoder_modes = (enabled_encoder_modes & ~(1<<index)) | (enable<<index);
-            eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, enabled_encoder_modes);
-            break;
-        }
-        case id_encoder_custom:
-        {
-            uint8_t custom_encoder_idx = value_data[0];
-            uint8_t encoder_behavior = value_data[1];
-            uint16_t keycode = (value_data[2] << 8) | value_data[3];
-            set_custom_encoder_config(custom_encoder_idx, encoder_behavior, keycode);
-            break;
-        }
-    }
-}
-
-void custom_get_value(uint8_t *data) {
-    uint8_t *value_id = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-    
-    switch ( *value_id ) {
-        case id_oled_default_mode:
-        {
-            uint8_t default_oled = eeprom_read_byte((uint8_t*)EEPROM_DEFAULT_OLED);
-            value_data[0] = default_oled;
-            break;
-        }
-        case id_oled_mode:
-        {
-            value_data[0] = oled_mode;
-            break;
-        }
-        case id_encoder_modes:
-        {
-            uint8_t index = value_data[0];
-            value_data[1] = (enabled_encoder_modes & (1<<index)) ? 1 : 0;
-            break;
-        }
-        case id_encoder_custom:
-        {
-            uint8_t custom_encoder_idx = value_data[0];
-            uint8_t encoder_behavior = value_data[1];
-            uint16_t keycode = retrieve_custom_encoder_config(custom_encoder_idx, encoder_behavior);
-            value_data[2] = keycode >> 8;
-            value_data[3] = keycode & 0xFF;
-            break;
-        }
-    }
-}
-
-// TODO
-// Refactor so this keyboard uses QMK Core backlight code,
-// then change this to via_custom_value_command_kb() so it
-// only handles the custom values not the backlight
-// (i.e. use QMK Core default handler for backlight values).
-//
-void via_custom_value_command(uint8_t *data, uint8_t length) {
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if ( *channel_id == id_qmk_backlight_channel ) {
-        switch ( *command_id )
-        {
-            case id_custom_set_value:
-            {
-                backlight_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value:
-            {
-                backlight_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save:
-            {
-                backlight_config_save();
-                break;
-            }
-            default:
-            {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-    } else if ( *channel_id == id_custom_channel ) {
-        switch ( *command_id )
-        {
-            case id_custom_set_value:
-            {
-                custom_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value:
-            {
-                custom_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save:
-            {
-                // values are saved in custom_set_value()
-                break;
-            }
-            default:
-            {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-
-    // DO NOT call raw_hid_send(data,length) here, let caller do this
-}
-#endif
-
-
-void read_host_led_state(void) {
-  led_t led_state = host_keyboard_led_state();
-  if (led_state.num_lock)    {
-    if (led_numlock == false){
-    led_numlock = true;}
-    } else {
-    if (led_numlock == true){
-    led_numlock = false;}
-    }
-  if (led_state.caps_lock)   {
-    if (led_capslock == false){
-    led_capslock = true;}
-    } else {
-    if (led_capslock == true){
-    led_capslock = false;}
-    }
-  if (led_state.scroll_lock) {
-    if (led_scrolllock == false){
-    led_scrolllock = true;}
-    } else {
-    if (led_scrolllock == true){
-    led_scrolllock = false;}
-    }
-}
-
-layer_state_t layer_state_set_kb(layer_state_t state) {
-  state = layer_state_set_user(state);
-  layer = get_highest_layer(state);
-  oled_request_wakeup();
-  return state;
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  oled_request_wakeup();
-  switch (keycode) {
-    case OLED_TOGG:
-      if(!clock_set_mode){
-        if (record->event.pressed) {
-          oled_mode = (oled_mode + 1) % _NUM_OLED_MODES;
-        }
-      }
-      return false;
-    case CLOCK_SET:
-      if (record->event.pressed) {
-        if(clock_set_mode){
-          pre_encoder_mode_change();
-          clock_set_mode = false;
-          encoder_mode = previous_encoder_mode;
-          post_encoder_mode_change();
-
-        }else{
-          previous_encoder_mode = encoder_mode;
-          pre_encoder_mode_change();
-          clock_set_mode = true;
-          encoder_mode = ENC_MODE_CLOCK_SET;
-          post_encoder_mode_change();
-        }
-      }
-      return false;
-    case ENC_PRESS:
-      if (record->event.pressed) {
-        uint16_t mapped_code = handle_encoder_press();
-        uint16_t held_keycode_timer = timer_read();
-        if(mapped_code != 0){
-          register_code16(mapped_code);
-          while (timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){ /* no-op */ }
-          unregister_code16(mapped_code);
-        }
-      } else {
-        // Do something else when release
-      }
-      return false;
-    default:
-      break;
-  }
-
-  return process_record_user(keycode, record);
-}
-
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    oled_request_wakeup();
-  encoder_value = (encoder_value + (clockwise ? 1 : -1)) % 64;
-  if (index == 0) {
-    if (layer == 0){
-      uint16_t mapped_code = 0;
-      if (clockwise) {
-        mapped_code = handle_encoder_clockwise();
-      } else {
-        mapped_code = handle_encoder_ccw();
-      }
-      uint16_t held_keycode_timer = timer_read();
-      if(mapped_code != 0){
-        register_code16(mapped_code);
-        while (timer_elapsed(held_keycode_timer) < MEDIA_KEY_DELAY){ /* no-op */ }
-        unregister_code16(mapped_code);
-      }
-    } else {
-      if(clockwise){
-        change_encoder_mode(false);
-      } else {
-        change_encoder_mode(true);
-      }
-    }
-  }
-  return true;
-}
-
-void custom_config_reset(void){
-  void *p = (void*)(VIA_EEPROM_CUSTOM_CONFIG_ADDR);
-  void *end = (void*)(VIA_EEPROM_CUSTOM_CONFIG_ADDR+VIA_EEPROM_CUSTOM_CONFIG_SIZE);
-  while ( p != end ) {
-    eeprom_update_byte(p, 0);
-    ++p;
-  }
-  eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, 0x1F);
-}
-
-void backlight_config_save(void){
-  eeprom_update_byte((uint8_t*)EEPROM_CUSTOM_BACKLIGHT, kb_backlight_config.raw);
-}
-
-void custom_config_load(void){
-  kb_backlight_config.raw = eeprom_read_byte((uint8_t*)EEPROM_CUSTOM_BACKLIGHT);
-#ifdef DYNAMIC_KEYMAP_ENABLE
-  oled_mode = eeprom_read_byte((uint8_t*)EEPROM_DEFAULT_OLED);
-  enabled_encoder_modes = eeprom_read_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES);
-#endif
-}
-
-// Called from via_init() if VIA_ENABLE
-// Called from matrix_init_kb() if not VIA_ENABLE
-void via_init_kb(void)
-{
-  // This checks both an EEPROM reset (from bootmagic lite, keycodes)
-  // and also firmware build date (from via_eeprom_is_valid())
-  if (eeconfig_is_enabled()) {
-    custom_config_load();
-  } else	{
-#ifdef DYNAMIC_KEYMAP_ENABLE
-    // Reset the custom stuff
-    custom_config_reset();
-#endif
-    // DO NOT set EEPROM valid here, let caller do this
-  }
-}
-
-void matrix_init_kb(void)
-{
-#ifndef VIA_ENABLE
-  via_init_kb();
-  via_eeprom_set_valid(true);
-#endif // VIA_ENABLE
-
-  rtcGetTime(&RTCD1, &last_timespec);
-  backlight_init_ports();
-  matrix_init_user();
-  oled_request_wakeup();
-}
-
-
-void housekeeping_task_kb(void) {
-  rtcGetTime(&RTCD1, &last_timespec);
-  uint16_t minutes_since_midnight = last_timespec.millisecond / 1000 / 60;
-
-  if (minutes_since_midnight != last_minute){
-    last_minute = minutes_since_midnight;
-    oled_request_repaint();
-  }
-}
-
-//
-// In the case of VIA being disabled, we still need to check if
-// keyboard level EEPROM memory is valid before loading.
-// Thus these are copies of the same functions in VIA, since
-// the backlight settings reuse VIA's EEPROM magic/version,
-// and the ones in via.c won't be compiled in.
-//
-// Yes, this is sub-optimal, and is only here for completeness
-// (i.e. catering to the 1% of people that want wilba.tech LED bling
-// AND want persistent settings BUT DON'T want to use dynamic keymaps/VIA).
-//
-#ifndef VIA_ENABLE
-
-bool via_eeprom_is_valid(void)
-{
-    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 );
-
-    return (eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0 ) == magic0 &&
-            eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1 ) == magic1 &&
-            eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2 ) == magic2 );
-}
-
-// 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"
-    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 );
-
-    eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0, valid ? magic0 : 0xFF);
-    eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1, valid ? magic1 : 0xFF);
-    eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2, valid ? magic2 : 0xFF);
-}
-
-void via_eeprom_reset(void)
-{
-    // Set the VIA specific EEPROM state as invalid.
-    via_eeprom_set_valid(false);
-    // Set the TMK/QMK EEPROM state as invalid.
-    eeconfig_disable();
-}
-
-#endif // VIA_ENABLE
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.h b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
index 157eff902ef..d4fc7aca87d 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.h
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
@@ -1,117 +1,6 @@
-#pragma once
-
-#include "quantum.h"
-
-#include "via.h" // only for EEPROM address
-#define EEPROM_ENABLED_ENCODER_MODES (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
-#define EEPROM_CUSTOM_BACKLIGHT (VIA_EEPROM_CUSTOM_CONFIG_ADDR+1)
-#define EEPROM_DEFAULT_OLED (VIA_EEPROM_CUSTOM_CONFIG_ADDR+2)
-#define EEPROM_CUSTOM_ENCODER (VIA_EEPROM_CUSTOM_CONFIG_ADDR+3)
-
-typedef union {
-    uint8_t raw;
-    struct {
-        bool    enable :1;
-        bool    breathing : 1;
-        uint8_t level  :6;
-    };
-} backlight_config_t;
-
-// Start these at the USER code range in VIA
-enum my_keycodes {
-  ENC_PRESS = QK_KB_0,
-  CLOCK_SET,
-  OLED_TOGG
-};
-
-enum s75_custom_value_id {
-  id_encoder_modes = 1,
-  id_oled_default_mode,
-  id_encoder_custom,
-  id_oled_mode
-};
-
-enum encoder_modes {
-  ENC_MODE_VOLUME,
-  ENC_MODE_MEDIA,
-  ENC_MODE_SCROLL,
-  ENC_MODE_BRIGHTNESS,
-  ENC_MODE_BACKLIGHT,
-  ENC_MODE_CUSTOM0,
-  ENC_MODE_CUSTOM1,
-  ENC_MODE_CUSTOM2,
-  _NUM_ENCODER_MODES,
-  ENC_MODE_CLOCK_SET // This shouldn't be included in the default modes, so we put it after NUM_ENCODER_MODES
-};
-
-enum custom_encoder_behavior {
-    ENC_CUSTOM_CW = 0,
-    ENC_CUSTOM_CCW,
-    ENC_CUSTOM_PRESS
-};
-
-enum oled_modes {
-  OLED_DEFAULT,
-  OLED_TIME,
-  OLED_OFF,
-  _NUM_OLED_MODES
-};
-
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-// Keyboard Information
-extern volatile uint8_t led_numlock;
-extern volatile uint8_t led_capslock;
-extern volatile uint8_t led_scrolllock;
-extern uint8_t layer;
-
-// OLED Behavior
-extern uint8_t oled_mode;
-extern bool oled_repaint_requested;
-extern bool oled_wakeup_requested;
-extern uint32_t oled_sleep_timer;
-
-// Encoder Behavior
-extern uint8_t encoder_value;
-extern uint8_t encoder_mode;
-extern uint8_t enabled_encoder_modes;
-
-// RTC
-extern RTCDateTime last_timespec;
-extern uint16_t last_minute;
-
-// RTC Configuration
-extern bool clock_set_mode;
-extern uint8_t time_config_idx;
-extern int8_t hour_config;
-extern int16_t minute_config;
-extern int8_t year_config;
-extern int8_t month_config;
-extern int8_t day_config;
-extern uint8_t previous_encoder_mode;
-
-// Backlighting
-extern backlight_config_t kb_backlight_config;
-extern bool kb_backlight_breathing;
-
-void pre_encoder_mode_change(void);
-void post_encoder_mode_change(void);
-void change_encoder_mode(bool negative);
-uint16_t handle_encoder_clockwise(void);
-uint16_t handle_encoder_ccw(void);
-uint16_t handle_encoder_press(void);
-uint16_t retrieve_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior);
-void set_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior, uint16_t new_code);
-
-void update_time_config(int8_t increment);
-
-void oled_request_wakeup(void);
-void oled_request_repaint(void);
-bool oled_task_needs_to_repaint(void);
+#pragma once
 
-void backlight_init_ports(void);
-void backlight_set(uint8_t level);
-bool is_breathing(void);
-void breathing_enable(void);
-void breathing_disable(void);
-void custom_config_load(void);
-void backlight_config_save(void);
+#include "satisfaction_keycodes.h"
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75_hs/chconf.h b/keyboards/cannonkeys/satisfaction75_hs/chconf.h
new file mode 100644
index 00000000000..d1b9cf32b7f
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/chconf.h
@@ -0,0 +1,18 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/satisfaction75/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
+
diff --git a/keyboards/cannonkeys/satisfaction75_hs/config.h b/keyboards/cannonkeys/satisfaction75_hs/config.h
new file mode 100644
index 00000000000..658babd3c08
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/config.h
@@ -0,0 +1,44 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+/* LSE clock */
+#define STM32_LSECLK 32768
+
+#define ENCODER_RESOLUTION 2
+
+// I2C config
+#define I2C_DRIVER I2CD1
+#define I2C1_SCL_PIN B6
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PAL_MODE 1
+#define I2C1_SDA_PAL_MODE 1
+#define I2C1_TIMINGR_PRESC 0x00U
+#define I2C1_TIMINGR_SCLDEL 0x03U
+#define I2C1_TIMINGR_SDADEL 0x01U
+#define I2C1_TIMINGR_SCLH 0x03U
+#define I2C1_TIMINGR_SCLL 0x09U
+
+// configure oled driver for the 128x32 oled
+#define OLED_UPDATE_INTERVAL 66 // ~15fps
+
+// OLED_TIMEOUT is incompatible with the OLED_OFF mode
+#define OLED_TIMEOUT 0
+
+// OLED timeout reimplemented in the keyboard-specific code
+#define CUSTOM_OLED_TIMEOUT 60000
+
+// Custom config starts after VIA's EEPROM usage,
+// dynamic keymaps start after this.
+// Custom config Usage:
+// 1 for enabled encoder modes (1 byte)
+// 1 for OLED default mode (1 byte)
+// 6 for 3x custom encoder settings, left, right, and press (18 bytes)
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20
+
+// VIA lighting is handled by the keyboard-level code
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/cannonkeys/satisfaction75_hs/halconf.h b/keyboards/cannonkeys/satisfaction75_hs/halconf.h
new file mode 100644
index 00000000000..e4cce5cdfb9
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/halconf.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/satisfaction75/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_RTC TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/cannonkeys/satisfaction75_hs/info.json b/keyboards/cannonkeys/satisfaction75_hs/info.json
new file mode 100644
index 00000000000..214ef5f48ad
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/info.json
@@ -0,0 +1,207 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Satisfaction75 HS",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B9", "pin_b": "B8"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true
+    },
+    "indicators": {
+        "caps_lock": "B14",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A8", "C13", "B2", "B1", "B0", "B12", "B5", "B4", "B3", "A7", "A5", "A4", "A3", "A2", "A1"],
+        "rows": ["A10", "A14", "A15", "A0", "B11", "B10"]
+    },
+    "processor": "STM32F072",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0011",
+        "vid": "0xCA04"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 15.5, "y": 0.75},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [0, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_full_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/satisfaction75_hs/keymaps/default/keymap.c
new file mode 100644
index 00000000000..c869bfc4b0c
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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,   ENC_PRESS,
+    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_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_ENTER, 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,                                           MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, _______, _______,                   _______,                                     _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/satisfaction75_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/satisfaction75_hs/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c869bfc4b0c
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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,   ENC_PRESS,
+    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_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_ENTER, 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,                                           MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, _______, _______,                   _______,                                     _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/hub16/keymaps/via/rules.mk b/keyboards/cannonkeys/satisfaction75_hs/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/hub16/keymaps/via/rules.mk
rename to keyboards/cannonkeys/satisfaction75_hs/keymaps/via/rules.mk
diff --git a/keyboards/cannonkeys/satisfaction75_hs/mcuconf.h b/keyboards/cannonkeys/satisfaction75_hs/mcuconf.h
new file mode 100644
index 00000000000..4967f844568
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/mcuconf.h
@@ -0,0 +1,20 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/satisfaction75/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_LSE_ENABLED
+#define STM32_LSE_ENABLED TRUE
+
+#undef STM32_RTCSEL
+#define STM32_RTCSEL STM32_RTCSEL_LSE
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/cannonkeys/satisfaction75_hs/readme.md b/keyboards/cannonkeys/satisfaction75_hs/readme.md
new file mode 100644
index 00000000000..41d3d8a7dbb
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/readme.md
@@ -0,0 +1,20 @@
+# Satisfaction75 Hotswap
+
+Satisfaction75 Hotswap PCB for Satisfaction75 Keyboard
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan1)
+* Hardware Supported: STM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/satisfaction75_hs: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 (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Toggle the switch on the back of the pcb to "0" and briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cannonkeys/satisfaction75_hs/rules.mk b/keyboards/cannonkeys/satisfaction75_hs/rules.mk
new file mode 100644
index 00000000000..25eebb90542
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/rules.mk
@@ -0,0 +1,7 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+VPATH += keyboards/cannonkeys/lib/satisfaction75
+SRC += satisfaction_encoder.c \
+      satisfaction_oled.c \
+      satisfaction_core.c 
diff --git a/keyboards/cannonkeys/satisfaction75_hs/satisfaction75_hs.h b/keyboards/cannonkeys/satisfaction75_hs/satisfaction75_hs.h
new file mode 100644
index 00000000000..d4fc7aca87d
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/satisfaction75_hs.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "satisfaction_keycodes.h"
\ No newline at end of file
diff --git a/keyboards/cantor/keymaps/zeromist/keymap.c b/keyboards/cantor/keymaps/zeromist/keymap.c
deleted file mode 100644
index 993020200b9..00000000000
--- a/keyboards/cantor/keymaps/zeromist/keymap.c
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2022 Diego Palacios (@diepala)
-// SPDX-License-Identifier: GPL-2.0
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-     /*
-      * ┌───┬───┬───┬───┬───┬───┐           ┌───┬───┬───┬───┬───┬───┐
-      * │Tab│ Q │ W │ E │ R │ T │           │ Y │ U │ I │ O │ P │Bsp│
-      * ├───┼───┼───┼───┼───┼───┤           ├───┼───┼───┼───┼───┼───┤
-      * │ESC│ A │ S │ D │ F │ G │           │ H │ J │ K │ L │ ; │ ' │
-      * ├───┼───┼───┼───┼───┼───┤           ├───┼───┼───┼───┼───┼───┤
-      * │Sft│ Z │ X │ C │ V │ B │           │ N │ M │ , │ . │ / │Sft│
-      * └───┴───┴───┴───┴───┴───┘           └───┴───┴───┴───┴───┴───┘
-      *          ┌────┐                                ┌───┐
-      *          │LCTL├───────┐                  ┌─────┤Alt│
-      *          └────┤GUI/Bsp├───────┐      ┌───┤TO(1)├───┘
-      *               └───────┤ALT/ENT│      │SPC├─────┘
-      *                       └───────┘      └───┘
-      */
-    [0] = LAYOUT_split_3x6_3(
-      //--------------------------------------------------------------------------         ---------------------------------------------------------------------------------
-        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                 KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-      //--------------------------------------------------------------------------         ---------------------------------------------------------------------------------
-        KC_ESCAPE, 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_LCTL, MT(MOD_LGUI, KC_BSPC), MT(MOD_LALT, KC_ENT),           KC_SPC, TO(1), KC_RALT
-      //--------------------------------------------------------------------------         ---------------------------------------------------------------------------------
-    ),
-     /*
-      * ┌───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┐
-      * │`~ │ 1  │ 2 │ 3 │ 4 │ 5 │       │ 6 │ 7 │ 8 │ 9 │ 0 │Bsp│
-      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
-      * │   │ !  │ @ │ # │ $ │ % │       │ ^ │ &  │ * │ ( │ ) │ |  │
-      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
-      * │Sft│ += │ -_│ + │ { │ } │       │ [ │ ] │ ; │ : │ \  │    │
-      * └───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┘
-      *           ┌────────┐                       ┌─────┐
-      *           │ MLCKSCN ├─────┐           ┌────┤TO(3)│
-      *           └────────┤TO(0)├───┐   ┌───┤TO(2)├─────┘
-      *                     └─────┤ < │   │ > ├────┘
-      *                           └───┘   └───┘
-      */
-    [1] = LAYOUT_split_3x6_3(
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-        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_TRNS, KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-        KC_LSFT, KC_EQL,   KC_MINS,  KC_PLUS,  KC_LCBR,  KC_RCBR,                KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, KC_RSFT,
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-                                            KC_TRNS, TO(0), KC_LT,               KC_GT, TO(2), TO(3)
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-    ),
-     /*
-      * ┌────┬──────┬──────┬──────┬──────────┬──────┐       ┌──────┬──────┬──────┬───────┬──────┬───┐
-      * │MSTP│ Play │ PRVS │ Next   │          │ CAPS  │       │ PgDn │ PgUp  │ INS   │ Print │      │Bsp│
-      * ├────┼──────┼──────┼───────┼─────────┼──────┤       ├──────┼──────┼──────┼───────┼──────┼───┤
-      * │    │ HOME │ END  │ LCTRL+C │ LCTRL+V │      │       │ Left │ Down │ Up │ Right │ Del  │   │
-      * ├────┼──────┼──────┼───────┼────────┼──────┤       ├──────┼──────┼──────┼───────┼──────┼───┤
-      * │Sft │ UNDO │ CUT  │ COPY │ PASTE │ RApp │       │ Vol- │ Vol+ │ Mute │       │ RGui │   │
-      * └────┴──────┴──────┴──────┴───────┴──────┘       └──────┴──────┴──────┴───────┴──────┴───┘
-      *                                ┌─────┐                       ┌─────┐
-      *                                │LCTRL├─────┐           ┌─────┤TO(3)│
-      *                                └─────┤TO(0)├───┐   ┌───┤TO(0)├─────┘
-      *                                      └─────┤ALT│   │SPC├─────┘
-      *                                            └───┘   └───┘
-      */
-    [2] = LAYOUT_split_3x6_3(
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-        KC_MSTP, KC_MPLY,    KC_MPRV,   KC_MNXT,  KC_NO,    KC_CAPS,              KC_PGDN,      KC_PGUP,    KC_INS,      KC_PSCR,    KC_NO,    KC_BSPC,
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-        KC_NO,   KC_HOME,    KC_END,    C(KC_C),    C(KC_V),   KC_NO,         KC_LEFT,    KC_DOWN,   KC_UP,    KC_RGHT,    KC_DEL,   KC_NO,
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-        KC_TAB,  KC_UNDO,    KC_CUT,    KC_COPY,  KC_PASTE, KC_APP,             KC_VOLD,    KC_VOLU,   KC_MUTE,    KC_NO,      KC_NO,  KC_RSFT,
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-                                            KC_LCTL, TO(0), KC_LALT,            KC_TRNS, KC_TRNS, TO(3)
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-    ),
-     /*
-      * ┌──┬────┬────┬────┬────┬────┐       ┌────┬────┬────┬────┬─────┬─────┐
-      * │  │ F1 │ F2   │ F3 │ F4 │ F5 │       │ F6 │ F7 │ F8 │ F9  │ F10 │ F11 │
-      * ├──┼────┼────┼────┼────┼────┤       ├────┼────┼────┼────┼─────┼─────┤
-      * │  │    │     │    │    │     │       │    │    │    │    │      │ F12 │
-      * ├──┼────┼────┼────┼────┼────┤       ├────┼────┼────┼────┼─────┼─────┤
-      * │  │    │     │    │    │    │       │     │    │    │    │      │     │
-      * └──┴────┴────┴────┴────┴────┘       └────┴────┴────┴────┴─────┴─────┘
-      *                   ┌───┐                        ┌───┐
-      *                   │   ├─────┐           ┌─────┤   │
-      *                   └───┤TO(0)├───┐   ┌───┤     ├───┘
-      *                       └─────┤ENT│   │   ├─────┘
-      *                             └───┘   └───┘
-      */
-    [3] = LAYOUT_split_3x6_3(
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-        KC_NO, KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                   KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-        KC_NO, KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,                   KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,     KC_F12,
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-        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, TO(0), KC_NO,              KC_NO, KC_NO, KC_NO
-      //--------------------------------------------------------------         ---------------------------------------------------------------------------------
-    )
-};
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/ansi.c b/keyboards/capsunlocked/cu80/v2/ansi/ansi.c
index 99673881533..2d4055d9849 100644
--- a/keyboards/capsunlocked/cu80/v2/ansi/ansi.c
+++ b/keyboards/capsunlocked/cu80/v2/ansi/ansi.c
@@ -8,8 +8,8 @@ led_config_t g_led_config = {
     {0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
     {32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16},
     {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49},
-    {62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50},
-    {63, NO_LED, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, NO_LED, NO_LED, 75},
+    {62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, NO_LED, NO_LED, NO_LED, NO_LED},
+    {63, NO_LED, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, NO_LED, NO_LED, 75, NO_LED},
     {86, 85, 84, NO_LED, NO_LED, 83, NO_LED, NO_LED, NO_LED, 82, 81, 80, 79, 78, NO_LED, 77, 76}
   }, {
     {0, 0}, {28, 0}, {42, 0}, {56, 0}, {71, 0}, {85, 0}, {99, 0}, {113, 0}, {127, 0}, {141, 0}, {155, 0}, {169, 0}, {184, 0}, {198, 0}, {212, 0}, {226, 0}, {226, 13}, {212, 13}, {198, 13}, {184, 13}, {169, 13}, {155, 13}, {141, 13}, {127, 13}, {113, 13}, {99, 13}, {85, 13},  {71, 13}, {56, 13},  {42, 13}, {28, 13}, {14, 13}, {0, 13}, {0, 26}, {14, 26}, {28, 26}, {42, 26}, {56, 26}, {71, 26}, {85, 26}, {99, 26}, {113, 26}, {127, 26}, {141, 26}, {155, 26}, {169, 26}, {184, 26}, {198, 26}, {212, 26}, {226, 26}, {169, 38}, {155, 38}, {141, 38}, {127, 38}, {113, 38}, {99, 38}, {85, 38}, {71, 38}, {56, 38}, {42, 38}, {28, 38}, {14, 38}, {0, 38}, {0, 51}, {28, 51}, {42, 51}, {56, 51}, {71, 51}, {85, 51}, {99, 51}, {113, 51}, {127, 51}, {141, 51}, {155, 51}, {169, 51}, {212, 51}, {226, 64}, {212, 64}, {184, 64}, {169, 64}, {155, 64}, {141, 64}, {127, 64}, {71, 64}, {28, 64}, {14, 64},  {0, 64}
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/config.h b/keyboards/capsunlocked/cu80/v2/ansi/config.h
deleted file mode 100644
index 638c9a820ff..00000000000
--- a/keyboards/capsunlocked/cu80/v2/ansi/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2021 CapsUnlocked
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 87
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/capsunlocked/cu80/v2/info.json b/keyboards/capsunlocked/cu80/v2/info.json
index c21572be66f..67c914d2e1a 100644
--- a/keyboards/capsunlocked/cu80/v2/info.json
+++ b/keyboards/capsunlocked/cu80/v2/info.json
@@ -52,7 +52,6 @@
             "rainbow_moving_chevron": true,
             "rainbow_pinwheels": true,
             "raindrops": true,
-            "solid_color": true,
             "solid_multisplash": true,
             "solid_reactive": true,
             "solid_reactive_cross": true,
diff --git a/keyboards/capsunlocked/cu80/v2/iso/config.h b/keyboards/capsunlocked/cu80/v2/iso/config.h
deleted file mode 100644
index 28086d61954..00000000000
--- a/keyboards/capsunlocked/cu80/v2/iso/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2021 CapsUnlocked
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 88
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/capsunlocked/cu80/v2/iso/iso.c b/keyboards/capsunlocked/cu80/v2/iso/iso.c
index cdc588160ec..0e8e26e5ddd 100644
--- a/keyboards/capsunlocked/cu80/v2/iso/iso.c
+++ b/keyboards/capsunlocked/cu80/v2/iso/iso.c
@@ -8,8 +8,8 @@ led_config_t g_led_config = {
     {0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
     {32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16},
     {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49},
-    {62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50},
-    {63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, NO_LED, NO_LED, 76},
+    {62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, NO_LED, NO_LED, NO_LED, NO_LED},
+    {63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, NO_LED, NO_LED, 76, NO_LED},
     {87, 86, 85, NO_LED, NO_LED, 84, NO_LED, NO_LED, NO_LED, 83, 82, 81, 80, 79, NO_LED, 78, 77}
   }, {
     {0, 0}, {28, 0}, {42, 0}, {56, 0}, {71, 0}, {85, 0}, {99, 0}, {113, 0}, {127, 0}, {141, 0}, {155, 0}, {169, 0}, {184, 0}, {198, 0}, {212, 0}, {226, 0}, {226, 26}, {212, 26}, {198, 26}, {184, 26}, {169, 26}, {155, 26}, {141, 26}, {127, 26}, {113, 26}, {99, 26}, {85, 26}, {71, 26}, {56, 26}, {42, 26}, {28, 26}, {14, 26}, {0, 26}, {0, 26}, {14, 26}, {28, 26}, {42, 26}, {56, 26}, {71, 26}, {85, 26}, {99, 26}, {113, 26}, {127, 26}, {141, 26}, {155, 26}, {169, 26}, {184, 26}, {198, 26}, {212, 26}, {226, 26}, {169, 38}, {155, 38}, {141, 38}, {127, 38}, {113, 38}, {99, 38}, {85, 38}, {71, 38}, {56, 38}, {42, 38}, {28, 38}, {14, 38}, {0, 38}, {0, 51}, {14, 51}, {28, 51}, {42, 51}, {56, 51}, {71, 51}, {85, 51}, {99, 51}, {113, 51}, {127, 51}, {141, 51}, {155, 51}, {169, 51}, {212, 51}, {226, 64}, {212, 64}, {184, 64}, {169, 64}, {155, 64}, {141, 64}, {127, 64}, {71, 64}, {28, 64}, {14, 64}, {0, 64}
diff --git a/keyboards/centromere/keymaps/mini/keymap.c b/keyboards/centromere/keymaps/mini/keymap.c
deleted file mode 100644
index 4986dacc742..00000000000
--- a/keyboards/centromere/keymaps/mini/keymap.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#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 centromere_layers
-{
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-// Defines for layer movement
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-// Defines for task manager
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |           |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  |           |   H  |   J  |   K  |   L  |   ;  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  |           |   N  |   M  |   ,  |   .  |   /  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  | Ctrl | LOWER|      |    |      | RAISE| Shift|
- *                  `-------------| Space|    |BckSpc|------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_QWERTY] = LAYOUT_split_3x5_3(
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-                    KC_LCTL, LOWER, KC_SPC,         KC_BSPC, RAISE, OSM(MOD_LSFT)
-),
-
-/* Raise
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |           |   6  |   7  |   8  |   9  |   0  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Tab | Left | Down |  Up  | Right|           |      |   -  |   =  |   [  |   ]  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Ctrl|   `  |  GUI |  Alt |      |           |      |      |      |   \  |   '  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | LOWER|      |    |      | RAISE|      |
- *                  `-------------|      |    |      |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_RAISE] = LAYOUT_split_3x5_3(
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-  KC_TAB,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,      _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
-  KC_LCTL, KC_GRV,  KC_LGUI, KC_LALT, _______,      _______, _______, _______, KC_BSLS,  KC_QUOT,
-                    _______, _______, _______,      _______, _______, _______
-),
-
-/* Lower
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   !  |   @  |   #  |   $  |   %  |           |   ^  |   &  |   *  |   (  |   )  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Esc |      |      |      |      |           |      |   _  |   +  |   {  |   }  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Caps|   ~  |      |      |      |           |      |      |      |   |  |   "  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | LOWER|      |    |      | RAISE|  Del |
- *                  `-------------|      |    | Enter|------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_LOWER] = LAYOUT_split_3x5_3(
-  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-  KC_ESC,  _______, _______, _______, _______,      _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
-  KC_CAPS, KC_TILD, _______, _______, _______,      _______, _______, _______, KC_PIPE,  KC_DQT,
-                    _______, _______, _______,      KC_ENT,  _______, KC_DEL
-),
-
-/* Adjust (Lower + Raise)
- *
- * ,----------------------------------.           ,----------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |           |   F6 |  F7  |  F8  |  F9  |  F10 |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  F11 |  F12 |      |      |      |           |      |      |      |Taskmg|caltde|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | Reset|      |      |      |      |           |      |      |      |      |      |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | LOWER|      |    |      | RAISE|      |
- *                  `-------------|      |    |      |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_ADJUST] =  LAYOUT_split_3x5_3(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-  KC_F11,  KC_F12,  _______, _______, _______,      _______, _______, _______, TSKMGR, CALTDEL,
-  QK_BOOT, _______, _______, _______, _______,      _______, _______, _______, _______,  _______,
-                    _______, _______, _______,      _______,  _______, _______
-)
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/centromere/keymaps/mini_bom/config.h b/keyboards/centromere/keymaps/mini_bom/config.h
deleted file mode 100644
index 7a79437fab9..00000000000
--- a/keyboards/centromere/keymaps/mini_bom/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 keyboard-magpie
- *
- * 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 COMBO_ENABLE
-#    define COMBO_TERM 50
-#endif
-
-#ifdef TAPPING_TERM
-#    undef TAPPING_TERM
-#endif
-#define TAPPING_TERM 200
diff --git a/keyboards/centromere/keymaps/mini_bom/keymap.c b/keyboards/centromere/keymaps/mini_bom/keymap.c
deleted file mode 100644
index 1dd8f60c5af..00000000000
--- a/keyboards/centromere/keymaps/mini_bom/keymap.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright 2020 keyboard-magpie
- *
- * 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 centromere_layers
-{
-    _BASE,
-    _SYMB,
-    _NUMB,
-};
-
-  enum combo_events {
-    COMBO_BSPC,
-    COMBO_TAB,
-    COMBO_ESC,
-    COMBO_DEL,
-    COMBO_UNDS,
-    COMBO_BKSL,
-    COMBO_LESS,
-    COMBO_MORE,
-    COMBO_QUOT,
-    COMBO_DASH,
-      };
-
-
-      /* Combomap
- *
- * ,-----------------------------.       ,--------------------------------.
- * |      |    ESC    |     |     |      |     |           |    BSLH      |
- * |-----+-----+-----+-----+------|      |--------------------------------|
- * |      |   BSPC          |     |      |    LES  |  GRT   |             |
- * |-----+-----+-----+--RMB+-LMB--+      |--------------------------------|
- * |      |   MINS    |     |     |      |    QUO  | UNDR   |     |       |
- * `------+-----+-----+------+----'      `--------------------------------'
- *  .-------------------------.           .-----------------.
- *  |        |       |        |           |        |    |   |
- *  '-------------------------'           '-----------------'
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Keymap 0: Basic layer
-     *
-     * ,-----------------------------.       ,--------------------------------.
-     * |    Q |  W  |  E  |  R  |  T  |      |  Y  |  U  |  I  |  O  |    P   |
-     * |-----+-----+-----+-----+------|      |--------------------------------|
-     * |CTRL/A|  S  |  D  |  F  |  G  |      |  H  |  J  |  K  |  L  | CTRL/; |
-     * |-----+-----+-----+-----+------+      |--------------------------------|
-     * |SHFT/Z|  X  |  C  |  V  |  B  |      |  N  |  M  |  <  |  >  | SHFT/? |
-     * `------+-----+-----+------+----'      `--------------------------------'
-     *  .-------------------------.           .-----------------.
-     *  |ESC/META|ENT/ALT|SPC(SYM)|           |SPC(NUM)|BSPC|TAB|
-     *  '-------------------------'           '-----------------'
- */
-
-[_BASE] = LAYOUT(
-  KC_NO,   KC_Q,                  KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,                     KC_NO,
-  KC_NO,   MT(MOD_LCTL, KC_A),    KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    MT(MOD_LCTL, KC_SCLN),    KC_NO,
-  KC_NO,   MT(MOD_RSFT, KC_Z),    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  MT(MOD_RSFT, KC_SLSH),    KC_NO,
-  MT(MOD_LGUI, KC_ESC), MT(MOD_LALT, KC_ENT), LT(_SYMB, KC_SPC), LT(_NUMB, KC_SPC), KC_LSFT, MT(MOD_RSFT, KC_TAB)
-  ),
-
-    /* Keymap 1: Symbols layer
-     * ,-----------------------------.       ,--------------------------------.
-     * |  !   |  @  |  {  |  }  |       |  `  |  ~  |     |     |    \   |
-     * |-----+-----+-----+-----+------|      |--------------------------------|
-     * |  #   |  $  |  (  |  )  | LMB |      |  +  |  -  |  /  |  *  |    '   |
-     * |-----+-----+-----+-----+------+      |--------------------------------|
-     * |  %   |  ^  |  [  |  ]  | RMB |      |  &  |  =  |  ,  |  .  |   -    |
-     * `------+-----+-----+------+----'      `--------------------------------'
-     *          .-----------------.           .------------------.
-     *          |MMB |  ;   |  =  |           |  =  |  ;  |  DEL |
-     *          '-----------------'           '------------------'
- */
-[_SYMB] = LAYOUT(
- KC_NO, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE,        KC_GRV, KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS, KC_NO,
- KC_NO, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2,       KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT, KC_NO,
- KC_NO, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1,      KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS, KC_NO,
- CM_TOGG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL
-  ),
-
-    /* Keymap 2: Pad/Function layer
-     * ,-----------------------------.       ,-------------------------------.
-     * |  1   |  2  |  3  |  4  |  5  |      |  6  |  7  |  8  |  9  |   0   |
-     * |-----+-----+-----+-----+------|      |-------------------------------|
-     * |  F1  | F2  | F3  | F4  |  F5 |      | LFT | DWN | UP  | RGT | VOLUP |
-     * |-----+-----+-----+-----+------+      |-------------------------------|
-     * |  F6  | F7  | F8  | F9  | F10 |      |MLFT | MDWN| MUP | MRGT| VOLDN |
-     * `------+-----+-----+------+----'      `-------------------------------'
-     *          .-----------------.           .-----------------.
-     *          | F11 | F12|      |           |     | PLY | SKP |
-     *          '-----------------'           '-----------------'
- */
-[_NUMB] = LAYOUT(
-     KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5,           KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO,
-     KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,      KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU, KC_NO,
-     KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,     KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_VOLD, KC_NO,
-     KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT
-     ),
-
-};
-
-
-// layer_state_t layer_state_set_user(layer_state_t state) {
-//   return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-// }
-
-#ifdef COMBO_ENABLE
-const uint16_t PROGMEM combo_bspc[] = {KC_S, KC_D, COMBO_END};
-const uint16_t PROGMEM combo_tab[] = {KC_D, KC_F, COMBO_END};
-const uint16_t PROGMEM combo_esc[] = {KC_W, KC_E, COMBO_END};
-const uint16_t PROGMEM combo_del[] = {KC_A, KC_S, COMBO_END};
-const uint16_t PROGMEM combo_unds[] = {KC_M, KC_COMM,  COMBO_END};
-const uint16_t PROGMEM combo_bksl[] = {KC_O, KC_P, COMBO_END};
-const uint16_t PROGMEM combo_less[] = {KC_H, KC_J, COMBO_END};
-const uint16_t PROGMEM combo_more[] = {KC_K, KC_L, COMBO_END};
-const uint16_t PROGMEM combo_quot[] = {KC_N, KC_M, COMBO_END};
-const uint16_t PROGMEM combo_dash[] = {KC_X, KC_C, COMBO_END};
-
-combo_t key_combos[] = {
-    [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
-    [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
-    [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
-    [COMBO_DEL] = COMBO(combo_del,KC_DEL),
-    [COMBO_UNDS] = COMBO(combo_unds, KC_UNDS),
-    [COMBO_BKSL] = COMBO(combo_bksl,KC_BSLS),
-    [COMBO_LESS] = COMBO(combo_less,KC_LT),
-    [COMBO_MORE] = COMBO(combo_more,KC_GT),
-    [COMBO_QUOT] = COMBO(combo_quot, KC_QUOT),
-    [COMBO_DASH] = COMBO(combo_dash, KC_MINS),
-};
-#endif
diff --git a/keyboards/centromere/keymaps/mini_bom/readme.md b/keyboards/centromere/keymaps/mini_bom/readme.md
deleted file mode 100644
index 6efa1d4c742..00000000000
--- a/keyboards/centromere/keymaps/mini_bom/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Porting a keymap with chording inspired by gboards.ca gergoplex default keymap, to the centromere mini.
\ No newline at end of file
diff --git a/keyboards/charue/charon/keymaps/debug/keymap.c b/keyboards/charue/charon/keymaps/debug/keymap.c
deleted file mode 100644
index e8e4ca13b73..00000000000
--- a/keyboards/charue/charon/keymaps/debug/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2021 Charue Design
- *
- * 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
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    QMKBEST = SAFE_RANGE,
-    QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT_all(
-      QK_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_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_VOLU,
-         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_BSLS, 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_MUTE,
-      KC_LCTL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(_FN),              KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-    [_FN] = LAYOUT_all(
-      QK_BOOT,  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_VOLU,
-         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_BSLS, 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_MUTE,
-      KC_LCTL, KC_LGUI, KC_LALT, QMKURL,      KC_SPC,        KC_SPC,     QMKBEST,     KC_TRNS,              KC_LEFT, KC_DOWN, KC_RIGHT
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QMKBEST:
-            if (record->event.pressed) {
-                // when keycode QMKBEST is pressed
-                SEND_STRING("QMK is the best thing ever!");
-            } else {
-                // when keycode QMKBEST is released
-            }
-            break;
-        case QMKURL:
-            if (record->event.pressed) {
-                // when keycode QMKURL is pressed
-                SEND_STRING("https://qmk.fm/\n");
-            } else {
-                // when keycode QMKURL is released
-            }
-            break;
-    };
-    #ifdef CONSOLE_ENABLE
-        uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-    #endif
-    return true;
-}
-
-void keyboard_post_init_user(void) {
-  debug_enable=true;
-  debug_matrix=true;
-}
diff --git a/keyboards/charue/charon/keymaps/debug/readme.md b/keyboards/charue/charon/keymaps/debug/readme.md
deleted file mode 100644
index b1b61bf15fd..00000000000
--- a/keyboards/charue/charon/keymaps/debug/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for charon
diff --git a/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c b/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
deleted file mode 100644
index e8a20abacfe..00000000000
--- a/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright 2022 Pierre Ott
-
-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(
-        KC_F1, KC_F2, 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_DEL, KC_PSCR, 
-        KC_F3, KC_F4, 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_F5, KC_F6, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_NO, KC_PGDN, 
-        KC_F7, KC_F8, SC_LSPO, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_UP, LT(2,KC_HOME), 
-        KC_F9, KC_F10, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_APP, KC_BSPC, KC_RALT, KC_NO, KC_NO, 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, TG(3), KC_TRNS, 
-        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, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_LCTL, 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_LSFT, KC_LSFT, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, 
-        KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-        [2] = LAYOUT_all(
-        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, QK_BOOT, 
-        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, KC_CAPS, 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, 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_TRNS, 
-        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_all(
-        KC_NO, KC_NO, KC_NO, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_NO, 
-        KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_HOME, KC_PGUP, KC_NO, KC_NO, 
-        KC_NO, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, 
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PEQL, 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_P0, KC_PDOT, KC_PENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-        )
-};
\ No newline at end of file
diff --git a/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c b/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
deleted file mode 100644
index e1e0c963f54..00000000000
--- a/keyboards/charue/sunsetter_r2/keymaps/debug/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2022 Charue Design
-// 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_all(
-      KC_F1, KC_F2,   QK_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_GRV, KC_BSPC,   KC_VOLU,
-      KC_F3, KC_F4,     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_VOLD,
-      KC_F5, KC_F6,      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_MUTE,
-      KC_F7, KC_F8,   KC_LSFT, KC_BSLS, 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_MNXT,
-      KC_F9, KC_F10,  KC_LCTL,   KC_LGUI,   KC_LALT,      KC_SPC,     MO(_FN),        KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-    [_FN] = LAYOUT_all(
-      KC_F11, KC_F12,  QK_BOOT, 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_VOLU,
-      KC_F13, KC_F14,   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_VOLD,
-      KC_F15, KC_F16,    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_MUTE,
-      KC_F17, KC_F18, KC_LSFT, KC_BSLS, 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_MNXT,
-      RGB_MOD, KC_F20, KC_LCTL,   KC_LGUI,   KC_LALT,      KC_SPC,     KC_TRNS,       KC_SPC,     KC_RALT,                KC_LEFT, KC_DOWN, KC_RIGHT
-    )
-};
-
-void keyboard_post_init_user(void) {
-  debug_enable=true;
-  debug_matrix=true;
-}
diff --git a/keyboards/charue/sunsetter_r2/keymaps/debug/readme.md b/keyboards/charue/sunsetter_r2/keymaps/debug/readme.md
deleted file mode 100644
index e4883ef86f1..00000000000
--- a/keyboards/charue/sunsetter_r2/keymaps/debug/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The debug keymap for Sunsetter R2
diff --git a/keyboards/charue/sunsetter_r2/keymaps/debug/rules.mk b/keyboards/charue/sunsetter_r2/keymaps/debug/rules.mk
deleted file mode 100644
index 15b7f725b26..00000000000
--- a/keyboards/charue/sunsetter_r2/keymaps/debug/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONSOLE_ENABLE = yes
diff --git a/keyboards/chavdai40/keymaps/42keys-eucalyn/config.h b/keyboards/chavdai40/keymaps/42keys-eucalyn/config.h
deleted file mode 100644
index bbcd7cdf980..00000000000
--- a/keyboards/chavdai40/keymaps/42keys-eucalyn/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 t-miyajima
- *
- * 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
-
-// place overrides here
-#define PERMISSIVE_HOLD
-#define RETRO_TAPPING
-#define TAPPING_TERM 5
diff --git a/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c b/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
deleted file mode 100644
index 0f42dd25da8..00000000000
--- a/keyboards/chavdai40/keymaps/42keys-eucalyn/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
- /* Copyright 2020 t-miyajima
- *
- * 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] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-------------------------------------------------------.
-   * | Tab |  ;|  ,|  .|  P|  Q|  Y|  G|  D|  M|  F|  -| Bspc|
-   * |-------------------------------------------------------|
-   * | Ctrl  |  A|  O|  E|  I|  U|  B|  N|  T|  R|  S| Return|
-   * |-------------------------------------------------------|
-   * | Shift  |  Z|  X|  C|  V|  W|  H|  J|  K|  L|   /| Lyr|
-   * `----.---------------------------------------------.---'
-   *      | Alt |Win |           Space        |Win |Alt |
-   *      `---------------------------------------------'
-   */
-    LAYOUT_42key( /* Base */
-        KC_TAB, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Q, KC_Y, KC_G, KC_D, KC_M, KC_F, KC_MINUS, KC_BSPC,
-        KC_LCTL, KC_A, KC_O, KC_E, KC_I, KC_U, KC_B, KC_N, KC_T, KC_R, KC_S, KC_ENTER,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_W, KC_H, KC_J, KC_K, KC_L, KC_SLASH, MO(1),
-        KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
-    LAYOUT_42key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
-        KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
-        KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/chavdai40/keymaps/42keys-qwerty/config.h b/keyboards/chavdai40/keymaps/42keys-qwerty/config.h
deleted file mode 100644
index bbcd7cdf980..00000000000
--- a/keyboards/chavdai40/keymaps/42keys-qwerty/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 t-miyajima
- *
- * 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
-
-// place overrides here
-#define PERMISSIVE_HOLD
-#define RETRO_TAPPING
-#define TAPPING_TERM 5
diff --git a/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c b/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
deleted file mode 100644
index 1d547b5093a..00000000000
--- a/keyboards/chavdai40/keymaps/42keys-qwerty/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
- /* Copyright 2020 t-miyajima
- *
- * 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] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-------------------------------------------------------.
-   * | Tab |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  -| Bspc|
-   * |-------------------------------------------------------|
-   * | Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;| Return|
-   * |-------------------------------------------------------|
-   * | Shift  |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|   /| Lyr|
-   * `----.---------------------------------------------.---'
-   *      | Alt |Win |           Space        |Win |Alt |
-   *      `---------------------------------------------'
-   */
-    LAYOUT_42key( /* Base */
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPC,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, MO(1),
-        KC_LALT, KC_LGUI, KC_SPACE, KC_RGUI, KC_RALT),
-    LAYOUT_42key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
-        KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
-        KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/chavdai40/keymaps/44keys-eucalyn/config.h b/keyboards/chavdai40/keymaps/44keys-eucalyn/config.h
deleted file mode 100644
index bbcd7cdf980..00000000000
--- a/keyboards/chavdai40/keymaps/44keys-eucalyn/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 t-miyajima
- *
- * 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
-
-// place overrides here
-#define PERMISSIVE_HOLD
-#define RETRO_TAPPING
-#define TAPPING_TERM 5
diff --git a/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c b/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
deleted file mode 100644
index b2992dc3936..00000000000
--- a/keyboards/chavdai40/keymaps/44keys-eucalyn/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
- /* Copyright 2020 t-miyajima
- *
- * 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] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-------------------------------------------------------.
-   * | Tab |  ;|  ,|  .|  P|  Q|  Y|  G|  D|  M|  F|  -| Bspc|
-   * |-------------------------------------------------------|
-   * | Ctrl  |  A|  O|  E|  I|  U|  B|  N|  T|  R|  S| Return|
-   * |-------------------------------------------------------|
-   * | Shift  |  Z|  X|  C|  V|  W|  H|  J|  K|  L|   /| Del|
-   * `----.---------------------------------------------.---'
-   *      | Alt |Win | Layer |   Space   |Win |Alt |Esc |
-   *      `---------------------------------------------'
-   */
-    LAYOUT_44key( /* Base */
-        KC_TAB, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Q, KC_Y, KC_G, KC_D, KC_M, KC_F, KC_MINUS, KC_BSPC,
-        KC_LCTL, KC_A, KC_O, KC_E, KC_I, KC_U, KC_B, KC_N, KC_T, KC_R, KC_S, KC_ENTER,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_W, KC_H, KC_J, KC_K, KC_L, KC_SLASH, KC_DELETE,
-        KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
-    LAYOUT_44key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
-        KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
-        KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/chavdai40/keymaps/44keys-qwerty/config.h b/keyboards/chavdai40/keymaps/44keys-qwerty/config.h
deleted file mode 100644
index bbcd7cdf980..00000000000
--- a/keyboards/chavdai40/keymaps/44keys-qwerty/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 t-miyajima
- *
- * 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
-
-// place overrides here
-#define PERMISSIVE_HOLD
-#define RETRO_TAPPING
-#define TAPPING_TERM 5
diff --git a/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c b/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
deleted file mode 100644
index 86b65977deb..00000000000
--- a/keyboards/chavdai40/keymaps/44keys-qwerty/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
- /* Copyright 2020 t-miyajima
- *
- * 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] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-------------------------------------------------------.
-   * | Tab |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  -| Bspc|
-   * |-------------------------------------------------------|
-   * | Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;| Return|
-   * |-------------------------------------------------------|
-   * | Shift  |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|   /| Del|
-   * `----.---------------------------------------------.---'
-   *      | Alt |Win | Layer |   Space   |Win |Alt |Esc |
-   *      `---------------------------------------------'
-   */
-    LAYOUT_44key( /* Base */
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINUS, KC_BSPC,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_DELETE,
-        KC_LALT, KC_LGUI, MO(1), KC_SPACE, KC_RGUI, KC_RALT, KC_ESCAPE),
-    LAYOUT_44key( /* layer 1 */
-        KC_GRAVE, KC_EXCLAIM, KC_AT, KC_HASH, KC_QUOTE, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LBRC, KC_RBRC,
-        KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
-        KC_TRNS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/checkerboards/axon40/keymaps/npspears/config.h b/keyboards/checkerboards/axon40/keymaps/npspears/config.h
deleted file mode 100644
index 6d6bb8ea390..00000000000
--- a/keyboards/checkerboards/axon40/keymaps/npspears/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * 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 TAPPING_TERM 200
diff --git a/keyboards/checkerboards/axon40/keymaps/npspears/keymap.c b/keyboards/checkerboards/axon40/keymaps/npspears/keymap.c
deleted file mode 100644
index 5791c39641a..00000000000
--- a/keyboards/checkerboards/axon40/keymaps/npspears/keymap.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- * Modified by Nasp for the Orbit40
- * 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 for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc    |  OS   |  Alt  |  Layer  |    Space     |  Alt |  RGB  |   Super  |
- * `-----------------------------------------------------------------------------------'
- */
-[0] = LAYOUT_all(
-  KC_TAB,        KC_Q,    KC_W,    KC_F,         KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_T(KC_ESC), 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_ENT,
-  KC_LGUI,       KC_LALT, TT(1),   LT(2, KC_SPC), KC_RALT, KC_CAPS
-),
-
-/* 1
- * ,-----------------------------------------------------------------------------------.
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[1] = LAYOUT_all(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
-  CALTDEL,  TSKMGR, _______, KC_SPC,  KC_NUBS, KC_GRV
-),
-
-/* 2
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[2] = LAYOUT_all(
-  RGB_HUI,  RGB_SAI,  _______,   KC_UP,   _______,  _______,  _______,  KC_UNDS, _______, KC_LBRC, KC_RBRC, RGB_VAI,
-  RGB_HUD,  RGB_SAD,   KC_LEFT, KC_DOWN, KC_RGHT,   _______,  _______,  KC_MINS, _______, KC_LCBR, KC_RCBR, RGB_VAD,
-  KC_F1,    KC_F2,     KC_F3,   KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-  QK_BOOT,  RGB_TOG,  _______,  _______,  RGB_MOD,  RGB_RMOD
-),
-
-};
diff --git a/keyboards/checkerboards/quark/keymaps/pezhore/config.h b/keyboards/checkerboards/quark/keymaps/pezhore/config.h
deleted file mode 100644
index 35b49ed9c9e..00000000000
--- a/keyboards/checkerboards/quark/keymaps/pezhore/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * 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 UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
deleted file mode 100644
index f331e2b9cf8..00000000000
--- a/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum ortho_4x12_layers {
-  _QWERTY,
-  _FN,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum ortho_4x12_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  SHRUG,  // ¯\_(ツ)_/¯
-  TFLIP,  // (╯°□°)╯︵ ┻━┻
-  POOP,   // 💩
-  DPOINT, // (ಠ_ಠ)
-  STRUT,  // ᕕ( ᐛ )ᕗ
-  SARCSM, // ⸮
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |Bkpsc |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | FN   | Ctrl | GUI  | ALT  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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,
-  MO(_FN), KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* FN
- * ,-----------------------------------------------------------------------------------.
- * | `    |      |      |      |      |      |      |      |      |POOP  |PrtScr|Del   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |UC_Wnc|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |SHRUG |TFLIP | POOP |DPOINT|STRUT |      |      |      |      |SARCSM|UC_Lin|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FN] = LAYOUT_ortho_4x12(
-   KC_GRV,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  POOP,     KC_PSCR,  KC_DEL,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  UC_WINC,
-  _______,    SHRUG,    TFLIP,     POOP,   DPOINT,    STRUT,  _______,  _______,  _______,  _______,   SARCSM,  UC_LINX,
-  _______,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,  _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Raise | Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  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,    _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      | Prev |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  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_MPRV,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MPLY
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset| Debug|      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(
-  _______,  QK_BOOT,  DB_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER,  _RAISE,  _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER,  _RAISE,  _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER,  _RAISE,  _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER,  _RAISE,  _ADJUST);
-          }
-          return false;
-          break;
-        case SHRUG:
-          if (record->event.pressed) {
-            send_unicode_string("¯\\_(ツ)_/¯");
-          }
-          return false;
-          break;
-        case TFLIP:
-          if (record->event.pressed) {
-            send_unicode_string("(╯°□°)╯︵ ┻━┻");
-          }
-          return false;
-          break;
-        case POOP:
-          if (record->event.pressed) {
-            send_unicode_string("💩");
-          }
-          return false;
-          break;
-        case DPOINT:
-          if (record->event.pressed) {
-            send_unicode_string("(ಠ_ಠ)");
-          }
-          return false;
-          break;
-        case STRUT:
-          if (record->event.pressed) {
-            send_unicode_string("ᕕ( ᐛ )ᕗ");
-          }
-          return false;
-          break;
-        case SARCSM:
-          if (record->event.pressed) {
-            send_unicode_string("⸮");
-          }
-          return false;
-          break;
-      }
-    return true;
-};
diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h
index ca124775d72..21d76ea1ac7 100644
--- a/keyboards/checkerboards/quark_lp/config.h
+++ b/keyboards/checkerboards/quark_lp/config.h
@@ -21,31 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 51
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125 // limits maximum brightness of LEDs to 125 out of 255. Higher may cause the controller to crash.
-
-// 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_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_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#endif
diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json
index 9712b63a389..006e4548868 100644
--- a/keyboards/checkerboards/quark_lp/info.json
+++ b/keyboards/checkerboards/quark_lp/info.json
@@ -12,10 +12,31 @@
         "pin": "C2"
     },
     "rgb_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_left_right": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "jellybean_raindrops": true,
+            "hue_wave": true,
+            "pixel_flow": true
+        },
         "driver": "ws2812",
+        "max_brightness": 125,
         "sat_steps": 8,
         "val_steps": 8,
-        "speed_steps": 10
+        "speed_steps": 10,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"],
diff --git a/keyboards/checkerboards/quark_lp/keymaps/mit/keymap.c b/keyboards/checkerboards/quark_lp/keymaps/mit/keymap.c
deleted file mode 100644
index 338af5ea9ee..00000000000
--- a/keyboards/checkerboards/quark_lp/keymaps/mit/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * 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 for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* [0]
-     * ,-----------------------------------------------------------------------------------------.
-     * |------------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Tab        |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
-     * |------------+------+------+------+------+-------------+------+------+------+------+------|
-     * | CTL & ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-     * |------------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
-     * | PRINT   |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
-     * `-----------------------------------------------------------------------------------------'
-     */
-    [0] = LAYOUT_ortho_4x12_1x2uC(
-      KC_TAB,        KC_Q,    KC_W,    KC_F,     KC_P,     KC_G,    KC_J,      KC_L,      KC_U,    KC_Y, KC_SCLN,    KC_BSPC,
-      CTL_T(KC_ESC), 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_ENT,
-      KC_PSCR,       KC_LCTL, KC_LALT, KC_LGUI,  TT(1),   KC_SPC,  TT(2),   KC_LEFT,   KC_DOWN,   KC_UP,   KC_RGHT
-    ),
-
-    /* [1]
-     * ,---------------------------------------------------------------------------------------.
-     * |------------+------+------+------+------+------+------+------+------+------+------+----|
-     * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
-     * |------------+------+------+------+------+-------------+------+------+------+------+----|
-     * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
-     * |------------+------+------+------+------+------|------+------+------+------+------+----|
-     * |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
-     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
-     * |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
-     * `---------------------------------------------------------------------------------------'
-     */
-    [1] = LAYOUT_ortho_4x12_1x2uC(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-        KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-        _______, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_EQL,  _______, _______, _______,
-        _______, KC_ESC,  CALTDEL,  TSKMGR, _______, _______, _______, _______, KC_NUBS, KC_GRV, _______
-    ),
-
-    /* [2]
-    * ,---------------------------------------------------------------------------------------.
-    * |------------+------+------+------+------+------+------+------+------+------+------+---|
-    * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
-    * |------------+------+------+------+------+-------------+------+------+------+------+---|
-    * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
-    * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
-    * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
-    * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-    * |     QK_BOOT    |           |          |         |         |         |        |         |
-    * `---------------------------------------------------------------------------------------'
-       */
-    [2] = LAYOUT_ortho_4x12_1x2uC(
-        _______, _______, _______,   KC_UP,  _______, _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
-        _______, _______, KC_LEFT, KC_DOWN,  KC_RGHT, _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
-        KC_F1,   KC_F2,   KC_F3,     KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-        QK_BOOT, _______, _______, _______,  _______, _______,  _______, _______,  _______,  _______, _______
-    )
-};
diff --git a/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/config.h b/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/config.h
deleted file mode 100644
index b1498826ee3..00000000000
--- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Nathan Spears
- *
- * 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/checkerboards/ud40_ortho_alt/keymaps/npspears/keymap.c b/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/keymap.c
deleted file mode 100644
index c21cdc76617..00000000000
--- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * 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 for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* [0]
-     * ,-----------------------------------------------------------------------------------------.
-     * |------------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Tab        |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
-     * |------------+------+------+------+------+-------------+------+------+------+------+------|
-     * | CTL & ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-     * |------------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
-     * | QK_BOOT  |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
-     * `-----------------------------------------------------------------------------------------'
-     */
-    [0] = LAYOUT_default(
-        KC_TAB,        KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,          KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-        CTL_T(KC_ESC), 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_ENT,
-        QK_BOOT,       KC_LGUI, KC_LALT,          TT(1),                     LT(2, KC_SPC),          KC_LBRC, KC_RBRC, KC_CAPS
-    ),
-
-    /* [1]
-     * ,---------------------------------------------------------------------------------------.
-     * |------------+------+------+------+------+------+------+------+------+------+------+----|
-     * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
-     * |------------+------+------+------+------+-------------+------+------+------+------+----|
-     * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
-     * |------------+------+------+------+------+------|------+------+------+------+------+----|
-     * |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
-     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
-     * |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
-     * `---------------------------------------------------------------------------------------'
-     */
-    [1] = LAYOUT_default(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-        KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-        _______, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_EQL,  _______, _______, _______,
-        KC_ESC,  CALTDEL, TSKMGR,           _______,                   _______,          KC_NUBS, KC_GRV,  _______
-    ),
-
-    /* [2]
-     * ,---------------------------------------------------------------------------------------.
-     * |------------+------+------+------+------+------+------+------+------+------+------+---|
-     * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
-     * |------------+------+------+------+------+-------------+------+------+------+------+---|
-     * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
-     * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
-     * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
-     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
-     * |     QK_BOOT    |           |          |         |         |         |        |         |
-     * `---------------------------------------------------------------------------------------'
-     */
-    [2] = LAYOUT_default(
-        _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
-        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        QK_BOOT, QK_BOOT, _______,          _______,                   _______,          _______, _______, _______
-    )
-};
diff --git a/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/readme.md b/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/readme.md
deleted file mode 100644
index 126d92ab548..00000000000
--- a/keyboards/checkerboards/ud40_ortho_alt/keymaps/npspears/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# The Default UD40 Ortho Alt Layout
-# 1.25 - 1.25 - 1.25 - 2.25 - 2.25 - 1.25 - 1.25 - 1.25
-# or
-# 1 - 1 - 1 - 3 - 3 - 1 - 1 - 1
diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h
deleted file mode 100644
index a4643fae38a..00000000000
--- a/keyboards/cherrybstudio/cb87rgb/config.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-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_MATRIX_LED_COUNT 92
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#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
-#    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
-
diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json
index eefa7e73f0a..e5d52993361 100644
--- a/keyboards/cherrybstudio/cb87rgb/info.json
+++ b/keyboards/cherrybstudio/cb87rgb/info.json
@@ -12,7 +12,54 @@
         "pin": "E6"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"],
diff --git a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c b/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
deleted file mode 100644
index b330ece3690..00000000000
--- a/keyboards/cheshire/curiosity/keymaps/crd/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-
-enum keyboard_layers {
-  _BL, // Base Layer
-  _FL,     // Function Layer
-  _CL      // Control Layer
-};
-
-// Custom #defined keycodes (shorter macros for readability)
-#define KC_CTES CTL_T(KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BL] = LAYOUT_default(
-    KC_NO,   QK_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_BSLS, KC_GRV,
-    KC_NO,   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_BSPC,
-    KC_NO,   KC_CTES, 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, MO(_FL),
-             KC_LCTL,          KC_LGUI, KC_SPC,  MO(_FL),                           KC_SPC,           KC_RALT,          MO(_CL)
-  ),
-  [_FL] = LAYOUT_default(
-    KC_PGUP, KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-    KC_PGDN, KC_CAPS, _______, _______, EE_CLR,  QK_BOOT, _______,          _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
-    KC_ESC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,          KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT,
-             _______, _______, _______, _______, _______, _______,          _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
-             _______,          _______, _______, _______,                            _______,          _______,          _______
-  ),
-  [_CL] = LAYOUT_default(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, RGB_SAI, _______, _______,
-    _______, _______, RGB_VAD, RGB_VAI, RGB_TOG, _______, _______,          _______, _______, _______, RGB_MOD, RGB_HUD, RGB_HUI,          _______,
-             _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, RGB_RMOD,RGB_SAD, _______, _______,
-             _______,          _______, _______, _______,                            _______,          _______,          _______
-  )
-};
diff --git a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c b/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
deleted file mode 100644
index f539a4f8fc0..00000000000
--- a/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-Copyright 2019 Khader Syed
-
-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 my_layers {
-    _QWERTY,
-    _FNMS,
-    _NAVMED
-};
-
-#define FNMS MO(_FNMS)
-#define NAVMED MO(_NAVMED)
-#define CAP_CTL CTL_T(KC_CAPS)
-#define GUI_BSPC LCMD_T(KC_BSPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_default(
-    QK_GESC, 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_BSLS, KC_DEL,
-    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_BSPC,
-    KC_PGDN, CAP_CTL, 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, FNMS,
-             KC_LCTL,              KC_LALT,   GUI_BSPC, NAVMED,       KC_SPC,        KC_RALT,                              KC_RCTL
-  ),
-
-  [_FNMS] = LAYOUT_default(
-    RGB_TOG, _______, 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_MOD, _______, _______, _______, _______, _______, _______,        _______, _______, KC_MS_U, _______, _______, _______, _______, QK_BOOT,
-    VK_TOGG, _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______,         _______,
-             _______, _______, _______, _______, _______, _______,        RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______,
-             AG_TOGG,                   _______,  _______, _______,        _______,          _______,                        _______
-  ),
-
-  [_NAVMED] = LAYOUT_default(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_HOME, _______, _______, _______, _______, _______, _______,        _______, _______,   KC_UP, _______, _______, _______, _______, QK_BOOT,
-    KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,         EE_CLR,
-             _______, _______, _______, _______, _______, KC_VOLD,        KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
-             _______,                   _______,  _______, _______,        _______,          _______,                        _______
-  )
-};
-
-static uint8_t top = 0;
-static uint8_t middle = 0;
-static uint8_t bottom = 1;
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    top = middle = bottom = 0;
-    switch (get_highest_layer(state)) {
-      case _NAVMED:
-          top = 1;
-          break;
-      case _FNMS:
-          middle = 1;
-          break;
-      default:
-        break;
-    }
-  return state;
-}
-
-bool led_update_user(led_t usb_led) {
-    writePin(A8, !top);
-    writePin(A9, !middle);
-    writePin(A10, !bottom);
-    return false;
-}
diff --git a/keyboards/cheshire/curiosity/keymaps/madhatter/readme.md b/keyboards/cheshire/curiosity/keymaps/madhatter/readme.md
deleted file mode 100644
index a0e4c42c135..00000000000
--- a/keyboards/cheshire/curiosity/keymaps/madhatter/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Curiosity default keymap
-
-- A layer for all functions and mouse keys
-- A layer for arrows and media
-- Arrows on IJKL
-- Caps and control on caps lock - wonderful
-- Layer indicator LEDs
diff --git a/keyboards/cheshire/curiosity/keymaps/madhatter/rules.mk b/keyboards/cheshire/curiosity/keymaps/madhatter/rules.mk
deleted file mode 100644
index 41fcf032655..00000000000
--- a/keyboards/cheshire/curiosity/keymaps/madhatter/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-VELOCIKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/chlx/ppr_merro60/config.h b/keyboards/chlx/ppr_merro60/config.h
new file mode 100644
index 00000000000..bdeed0c824e
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2024 Alexander Lee <chlx.bsmt@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
+
+/* VIA related config */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json
new file mode 100644
index 00000000000..f8f45232a1a
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/info.json
@@ -0,0 +1,957 @@
+{
+    "manufacturer": "chlx bsmt",
+    "keyboard_name": "ppr.merro60",
+    "maintainer": "gaclee3b",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0,
+        "scroll_lock": "F0"
+    },
+    "matrix_pins": {
+        "rows": ["F6", "F4", "F5", "F1", "B1", "B0", "C6", "B6", "D2", "D4"],
+        "cols": ["F7", "B2", "B3", "B7", "D7", "B4", "B5"]
+    },
+    "processor": "atmega32u4",
+    "url": "www.github.com/gaclee3b",
+    "usb": {
+        "device_version": "1.0.1",
+        "pid": "0x0603",
+        "vid": "0x4358"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [8, 3], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c
new file mode 100644
index 00000000000..4012c4a2dac
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_60_ansi(
+  QK_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_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(1),   KC_RCTL),
+
+[1] = 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,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______, _______,                   _______,          _______,                   _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..ebb2ced9f7a
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_60_ansi_split_bs_rshift(
+  QK_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_BSLS, 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_BSPC,
+  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, MO(1),
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
+
+[1] = 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,  _______,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______,          _______,                   _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c
new file mode 100644
index 00000000000..a51098d586b
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_60_ansi_tsangan(
+  QK_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_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, KC_RCTL),
+
+[1] = LAYOUT_60_ansi_tsangan(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______, _______,                   _______,          _______,                            _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c
new file mode 100644
index 00000000000..ca3686c071b
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_60_ansi_wkl(
+  QK_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_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_LALT,          KC_SPC,                             KC_RALT,          KC_RCTL),
+
+[1] = LAYOUT_60_ansi_wkl(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______,                            _______,          _______,                            _______,          _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..1f6ff266d8d
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_60_ansi_wkl_split_bs_rshift(
+  QK_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_BSLS, 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_BSPC,
+  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, MO(1),
+  KC_LCTL,                            KC_LALT,          KC_SPC,                             KC_RALT,          KC_RCTL),
+
+[1] = LAYOUT_60_ansi_wkl_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,  _______,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______,                            _______,          _______,                            _______,          _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..070f6f022b8
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_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_BSLS, 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_BSPC,
+  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_UP,   KC_ENT,
+  KC_LSFT, KC_LEFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGHT,
+  KC_LCTL, KC_LGUI,                   KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+[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_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______, _______, _______, _______,          _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c
new file mode 100644
index 00000000000..8614ad28487
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_60_hhkb(
+  QK_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_BSLS, 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_BSPC,
+  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_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_LALT,                   KC_LGUI,          KC_SPC,                             KC_RGUI, KC_RALT),
+
+[1] = LAYOUT_60_hhkb(
+  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_INS,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+           _______,                   _______,          _______,                            _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c
new file mode 100644
index 00000000000..ffdc49a2fb0
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_60_iso(
+  QK_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_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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_60_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,  QK_BOOT,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______, _______,                   _______,          _______,                   _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c
new file mode 100644
index 00000000000..73282416ab8
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_60_tsangan_hhkb(
+  QK_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_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, MO(1),
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
+
+[1] = LAYOUT_60_tsangan_hhkb(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______,          _______,                            _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6d668def020
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@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_all(
+  QK_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_BSLS, 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_BSPC,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGHT,
+  KC_LCTL, KC_LGUI,                   KC_LALT, MO(1),   KC_SPC,  KC_LSCR,          KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+[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_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______, _______, _______, _______,          _______, _______, _______, _______),
+};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/rules.mk b/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/rules.mk
rename to keyboards/chlx/ppr_merro60/keymaps/via/rules.mk
diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md
new file mode 100644
index 00000000000..14674ff9ab3
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/readme.md
@@ -0,0 +1,28 @@
+# ppr.merro60
+
+![ppr.merro60 PCB](https://i.imgur.com/xyQA68Xh.jpg)
+
+- Standard 60% format keyboard PCB with USB-C and unified daughterboard compatibility.
+- Modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount.
+- Additional center flex cut.
+- Meant to be manufactured in 1.2mm thickness.
+
+* Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b)
+* Hardware Supported: chlx PCB ppr.merro60.x.x.x
+
+Make example for this keyboard (after setting up your build environment):
+
+    make chlx/ppr_merro60:default
+
+Flashing example for this keyboard:
+
+    make chlx/ppr_merro60: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 bootloader mode by any of the following options -
+- When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard
+- When plugged in, pressing and releasing the reset button on the pcb bottom behind the CAPSLOCK / A-key region
+- When plugged in, shorting out the two reset metal contacts near the 'z' key (accessible through the switch LED slot)
diff --git a/keyboards/chlx/ppr_merro60/rules.mk b/keyboards/chlx/ppr_merro60/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/chocofly/v1/keymaps/winder/keymap.c b/keyboards/chocofly/v1/keymaps/winder/keymap.c
deleted file mode 100644
index f0a8b68a05b..00000000000
--- a/keyboards/chocofly/v1/keymaps/winder/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Will Winder (@winder)
-// SPDX-License-Identifier: GPL-2.0-or-later
-//
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-};
-
-#define FN_1 MO(_LOWER)
-#define FN_2 MO(_RAISE)
-#define TRMINAL LGUI(KC_ENT)
-#define RESIZE  LGUI(KC_R)
-#define BROWSER LSG(KC_ENT) // Left Shift + GUI, ENT.
-
-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   , 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_UNDS,
-                 KC_LCTL, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_MUTE,                            KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
-                 KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , TRMINAL, BROWSER, RESIZE , KC_UNDS, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
-                                                     KC_LALT, KC_LGUI, FN_1   , KC_ENT , FN_2   , KC_SPC , KC_BSPC, KC_DEL
-    ),
-    [_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_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_DEL ,
-                 KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, _______,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
-                 _______, KC_EQL , KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-                                                     _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-    [_RAISE] = LAYOUT(
-                 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX,
-                 _______, KC_0,    KC_1,    KC_2,    KC_3,    KC_BSPC,                                     KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                 _______, KC_0,    KC_4,    KC_5,    KC_6,    KC_DEL,  _______,                            KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, XXXXXXX, XXXXXXX,
-                 _______, KC_0,    KC_7,    KC_8,    KC_9,    KC_DOT,  _______, _______, _______, _______, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-                                                     _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-};
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
-            tap_code(KC_VOLU);
-        }
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/chosfox/cf81/cf81.c b/keyboards/chosfox/cf81/cf81.c
index ad7ec9bc553..2e014dbe724 100644
--- a/keyboards/chosfox/cf81/cf81.c
+++ b/keyboards/chosfox/cf81/cf81.c
@@ -18,129 +18,129 @@
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
 
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, A_15,  B_15,  C_15},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, A_16,  B_16,  C_16},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
 
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
 
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
-    {1, G_7,   H_7,   I_7},
-    {1, G_8,   H_8,   I_8},
-    {1, G_9,   H_9,   I_9},
-    {1, G_10,  H_10,  I_10},
-    {1, G_11,  H_11,  I_11},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {1, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {1, CB7_CA11,  CB8_CA11,  CB9_CA11},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
-    {1, J_6,   K_6,   L_6},
-    {1, J_7,   K_7,   L_7},
-    {1, J_8,   K_8,   L_8},
-    {1, J_9,   K_9,   L_9},
-    {1, J_10,  K_10,  L_10},
-    {1, J_11,  K_11,  L_11},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {1, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {1, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {1, CB10_CA11,  CB11_CA11,  CB12_CA11},
 };
 // clang-format on
 bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
diff --git a/keyboards/chosfox/cf81/config.h b/keyboards/chosfox/cf81/config.h
index ae0d87d935b..71e783f2bcc 100644
--- a/keyboards/chosfox/cf81/config.h
+++ b/keyboards/chosfox/cf81/config.h
@@ -36,12 +36,4 @@
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define DRIVER_1_LED_TOTAL 63
-#define DRIVER_2_LED_TOTAL 20
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + 22)
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/chosfox/cf81/info.json b/keyboards/chosfox/cf81/info.json
index 5dff6100715..de125801b79 100644
--- a/keyboards/chosfox/cf81/info.json
+++ b/keyboards/chosfox/cf81/info.json
@@ -174,7 +174,9 @@
             { "flags": 2, "x":224, "y":51},
             { "flags": 2, "x":224, "y":57},
             { "flags": 2, "x":224, "y":64}
-        ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h
index 6643e610c03..18ae28c2115 100644
--- a/keyboards/chromatonemini/config.h
+++ b/keyboards/chromatonemini/config.h
@@ -19,15 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 
-/* ws2812 RGB MATRIX */
-#   define RGB_MATRIX_LED_COUNT 116
- // reacts to keypresses
-#   define RGB_MATRIX_KEYPRESSES
-
 //  for all fingers used at once.
 #   define LED_HITS_TO_REMEMBER 10
 
-// the above brighness setting has no effect on rgb_matrix_set_color().
+// the max brightness setting has no effect on rgb_matrix_set_color().
 // Use darker colors instead.
 /*              RGB darker COLORS             */
 #   define RGB_DARKWHITE 0x33, 0x33, 0x33
@@ -49,9 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define RGB_DARKMAGENTA 0x33, 0x0, 0x33
 #   define RGB_DARKPINK 0x33, 0x19, 0x26
 
-//  https://docs.qmk.fm/#/feature_rgb_matrix
-//  Enable suspend mode.
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif  // RGB_MATRIX_ENABLE
 
 /* Audio */
diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json
index fb4f0c737fa..963496a0c03 100644
--- a/keyboards/chromatonemini/info.json
+++ b/keyboards/chromatonemini/info.json
@@ -11,7 +11,6 @@
         "midi": true,
         "extrakey": true,
         "encoder": true,
-        "via": true,
         "bootmagic": false,
         "console": false,
         "mousekey": false,
@@ -146,7 +145,6 @@
         "val_steps": 8,
         "center_point": [124, 32],
         "animations": {
-            "solid_color": true,
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
@@ -187,7 +185,8 @@
             "multisplash": true,
             "solid_splash": true,
             "solid_multisplash": true
-        }
+        },
+        "sleep": true
     },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
diff --git a/keyboards/chromatonemini/keymaps/led/keymap.c b/keyboards/chromatonemini/keymaps/led/keymap.c
deleted file mode 100644
index 799792d5bd2..00000000000
--- a/keyboards/chromatonemini/keymaps/led/keymap.c
+++ /dev/null
@@ -1,696 +0,0 @@
-/* Copyright 2021 3araht
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-//  define which MIDI ch to use.
-//  Note that (actual MIDI ch# - 1) -> 0 .. 15 is used for coding.
-//  ch1
-#define DEFAULT_MAIN_CH_NUMBER 0
-//  ch3
-#define DEFAULT_SUB_CH_NUMBER  2
-//  ch2
-#define ALT_MAIN_CH_NUMBER     1
-//  ch4
-#define ALT_SUB_CH_NUMBER      3
-static uint8_t midi_left_ch = DEFAULT_SUB_CH_NUMBER;       //  By default, DEFAULT_SUB_CH_NUMBER is used for left side when separated.
-
-//  By default( when use_alt_ch_gr == false), DEFAULT ch group (DEFAULT_MAIN_CH_NUMBER for entirely, or right side when separated, DEFAULT_SUB_CH_NUMBER for left side) is used.
-//  When false, ALT ch group (ALT_MAIN_CH_NUMBER for entirely, or right side when separated, ALT_SUB_CH_NUMBER for left side) is used.
-static bool use_alt_ch_gr = false;
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,              //  Base layer, shift mode, single channel.
-    _SEPALEFTOCT,       //  1st oct channel separated version. Shift mode.
-    _SEPAHALF,          //  Half channel separated version. Shift mode.
-    _SEPARIGHTOCT,      //  2nd oct channel separated version. Shift mode.
-    _TRANS,             //  Transpose feature is enabled instead of shift mode, single channel.
-    _FLIPBASE,          //  Horizontal flipped version entirely. single channel.
-    _FLIPTRANS,         //  Horizontal flipped version entirely. Transpose is used. single channel.
-    _FN                 //  FuNction layer. This must be at the end of the enumurate to use the range from _LS_FN ... _LS_FN_MAX for FN layer LED settings.
-};
-
-//  Layer State
-#define _LS_BASE           (1UL << _BASE)
-#define _LS_SEPALEFTOCT    (1UL << _SEPALEFTOCT)
-#define _LS_SEPAHALF       (1UL << _SEPAHALF)
-#define _LS_SEPARIGHTOCT   (1UL << _SEPARIGHTOCT)
-#define _LS_FLIPBASE       (1UL << _FLIPBASE)
-
-#define _LS_TRANS          (1UL << _BASE         | 1UL << _TRANS)
-#define _LS_SEPALEFTOCT_T  (1UL << _SEPALEFTOCT  | 1UL << _TRANS)
-#define _LS_SEPAHALF_T     (1UL << _SEPAHALF     | 1UL << _TRANS)
-#define _LS_SEPARIGHTOCT_T (1UL << _SEPARIGHTOCT | 1UL << _TRANS)
-#define _LS_FLIPTRANS      (1UL << _FLIPBASE     | 1UL << _FLIPTRANS)
-
-#define _LS_FN             (1UL << _FN)
-#define _LS_MAX            (_LS_FN << 1)
-
-//  Don't change the DEFAULT_SCALE_COL value below. It must be 0.
-#define DEFAULT_SCALE_COL 0
-static uint8_t scale_indicator_col = DEFAULT_SCALE_COL;
-static bool trans_mode_indicator_loc_sel = true;  // when it is true, the location is _KEY01, _KEY13, ...
-
-//  use led indicator or not.
-static bool led_indicator_enable = true;
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    SHIFT_L = SAFE_RANGE,
-    SHIFT_R,
-    TGLINDI,  //  ToGgLe INDIcator
-    TGLINTR,  //  ToGgLe INdicator location {(_KEY01, _KEY13, _KEY25, _KEY37) or (_KEY02, _KEY14, _KEY26) / (_KEY12, _KEY24, _KEY36)}in TRans mode
-    TGLTRNS,  //  ToGgLe TRaNS and shift
-    TGLCHGR,  //  ToGgLe CH GRoup
-    VERSION,
-
-    B_BASE,            //  border set to the left end.
-    B_LEFT,            //  border set to the 1st left octave.
-    B_CENTER,          //  border set to the center.
-    B_RIGHT,           //  border set to the 1st right octave.
-    B_FLIP,            //  border set to the right end.
-
-    // MY tone for _FLIPHALF and _FLIPLEFTOCT layers to distinguish the notes to avoid sustain effect, etc.
-    // Since they are flipped, their subscripts are not MY_ but YM_, to make them easier to tell.
-    YM_TONE_MIN,
-
-    YM_C = YM_TONE_MIN,
-    YM_Cs,
-    YM_Db = YM_Cs,
-    YM_D,
-    YM_Ds,
-    YM_Eb = YM_Ds,
-    YM_E,
-    YM_F,
-    YM_Fs,
-    YM_Gb = YM_Fs,
-    YM_G,
-    YM_Gs,
-    YM_Ab = YM_Gs,
-    YM_A,
-    YM_As,
-    YM_Bb = YM_As,
-    YM_B,
-
-    YM_C_1,
-    YM_Cs_1,
-    YM_Db_1 = YM_Cs_1,
-    YM_D_1,
-    YM_Ds_1,
-    YM_Eb_1 = YM_Ds_1,
-    YM_E_1,
-    YM_F_1,
-    YM_Fs_1,
-    YM_Gb_1 = YM_Fs_1,
-    YM_G_1,
-    YM_Gs_1,
-    YM_Ab_1 = YM_Gs_1,
-    YM_A_1,
-    YM_As_1,
-    YM_Bb_1 = YM_As_1,
-    YM_B_1,
-
-    YM_C_2,
-    YM_Cs_2,
-    YM_Db_2 = YM_Cs_2,
-    YM_D_2,
-    YM_Ds_2,
-    YM_Eb_2 = YM_Ds_2,
-    YM_E_2,
-    YM_F_2,
-    YM_Fs_2,
-    YM_Gb_2 = YM_Fs_2,
-    YM_G_2,
-    YM_Gs_2,
-    YM_Ab_2 = YM_Gs_2,
-    YM_A_2,
-    YM_As_2,
-    YM_Bb_2 = YM_As_2,
-    YM_B_2,
-
-    YM_C_3,
-    YM_Cs_3,
-    YM_Db_3 = YM_Cs_3,
-    YM_D_3,
-    YM_Ds_3,
-    YM_Eb_3 = YM_Ds_3,
-    YM_E_3,
-    YM_F_3,
-    YM_Fs_3,
-    YM_Gb_3 = YM_Fs_3,
-    YM_G_3,
-    YM_Gs_3,
-    YM_Ab_3 = YM_Gs_3,
-    YM_A_3,
-    YM_As_3,
-    YM_Bb_3 = YM_As_3,
-    YM_B_3,
-
-    YM_C_4,
-    YM_Cs_4,
-    YM_Db_4 = YM_Cs_4,
-    YM_D_4,
-    YM_Ds_4,
-    YM_Eb_4 = YM_Ds_4,
-    YM_E_4,
-    YM_F_4,
-    YM_Fs_4,
-    YM_Gb_4 = YM_Fs_4,
-    YM_G_4,
-    YM_Gs_4,
-    YM_Ab_4 = YM_Gs_4,
-    YM_A_4,
-    YM_As_4,
-    YM_Bb_4 = YM_As_4,
-    YM_B_4,
-
-    YM_C_5,
-    YM_Cs_5,
-    YM_Db_5 = YM_Cs_5,
-    YM_D_5,
-    YM_Ds_5,
-    YM_Eb_5 = YM_Ds_5,
-    YM_E_5,
-    YM_F_5,
-    YM_Fs_5,
-    YM_Gb_5 = YM_Fs_5,
-    YM_G_5,
-    YM_Gs_5,
-    YM_Ab_5 = YM_Gs_5,
-    YM_A_5,
-    YM_As_5,
-    YM_Bb_5 = YM_As_5,
-    YM_B_5,
-
-    YM_C_6,
-    YM_TONE_MAX = YM_C_6
-};
-
-#define MY_TONE_COUNT (YM_TONE_MAX - YM_TONE_MIN + 1)
-static uint8_t my_tone_status[MY_TONE_COUNT];
-
-// Long press: go to _FN layer, tap: MUTE
-#define FN_MUTE LT(_FN, KC_MUTE)
-
-// Used to set octave to 0
-extern midi_config_t midi_config;
-static bool is_trans_mode = false;     //  By default, shift mode is chosen.
-
-static uint8_t key_separator_col = _KEY01;  //  (_KEY01 .. _KEY37).     By default, _KEY01 (= _BASE layer) is chosen. _KEY13 = *LEFT, _KEY19 = *HALF, _KEY25 = *RIGHT, _KEY37 = _FLIPBASE and _FLIPTRANS.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-            FN_MUTE,         MI_SUST,
-            MI_BNDU,
-        SHIFT_L, SHIFT_R,    MI_C2, MI_D2, MI_E2,  MI_Fs2, MI_Ab2, MI_Bb2, MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
-            MI_BNDD,            MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2, MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
-    ),
-
-    /* 1 octave on the left side is ch2, others are ch1 (normal) */
-    [_SEPALEFTOCT] = LAYOUT(
-            _______,          _______,
-            _______,
-        SHIFT_L, SHIFT_R,     YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2,     MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
-            _______,             YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2,     MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
-    ),
-
-    /* Half ch2, half ch1 (normal) */
-    [_SEPAHALF] = LAYOUT(
-            _______,           _______,
-            _______,
-        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3,       MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
-            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,    MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
-    ),
-
-    /* 2 octave on the left side is ch2, others are ch1 (normal) */
-    [_SEPARIGHTOCT] = LAYOUT(
-            _______,           _______,
-            _______,
-        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3, YM_Fs_3, YM_Ab_3, YM_Bb_3,      MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
-            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,  YM_G_3, YM_A_3,  YM_B_3,     MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
-    ),
-
-    /* TRANS   This layer must locate 1 layer below _FN layer. */
-    [_TRANS] = LAYOUT(
-            _______,           _______,
-            _______,
-        MI_TRSD,  MI_TRSU,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-            _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Flip Base    SFIFTUP and SHIFT_L are swapped. */
-    [_FLIPBASE] = LAYOUT(
-            FN_MUTE,          MI_SUST,
-            MI_BNDU,
-        SHIFT_L, SHIFT_R,     MI_C5, MI_Bb4, MI_Ab4,  MI_Fs4, MI_E4, MI_D4, MI_C4, MI_Bb3, MI_Ab3, MI_Fs3, MI_E3, MI_D3, MI_C3,  MI_Bb2,  MI_Ab2, MI_Fs2, MI_E2, MI_D2, MI_C2,
-            MI_BNDD,            MI_B4, MI_A4, MI_G4,  MI_F4,  MI_Eb4,  MI_Db4, MI_B3, MI_A3, MI_G3,  MI_F3, MI_Eb3,  MI_Db3, MI_B2, MI_A2, MI_G2,  MI_F2,  MI_Eb2,  MI_Db2
-    ),
-
-    /* Flip Trans   This layer must locate 1 layer above _FLIPBASE layer.  MI_TRSU and MI_TRSD are swapped. */
-    [_FLIPTRANS] = LAYOUT(
-            _______,          _______,
-            _______,
-        MI_TRSU,  MI_TRSD,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-            _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    [_FN] =  LAYOUT(
-            _______,          XXXXXXX,
-            MI_VELU,
-        MI_OCTD, MI_OCTU,     B_BASE,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, B_LEFT, XXXXXXX, XXXXXXX, B_CENTER, XXXXXXX, XXXXXXX, B_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, B_FLIP,
-            MI_VELD,               TGLINTR, TGLTRNS, TGLCHGR, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EE_CLR, TGLINDI, RGB_TOG
-    )
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE]         = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
-    [_SEPALEFTOCT]  = { ENCODER_CCW_CW(_______, _______)  },
-    [_SEPAHALF]     = { ENCODER_CCW_CW(_______, _______)  },
-    [_SEPARIGHTOCT] = { ENCODER_CCW_CW(_______, _______)  },
-    [_TRANS]        = { ENCODER_CCW_CW(_______, _______)  },
-    [_FLIPBASE]     = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
-    [_FLIPTRANS]    = { ENCODER_CCW_CW(_______, _______)  },
-    [_FN]           = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
-};
-#endif
-
-// commom codes called from eeconfig_init_user() and keyboard_post_init_user().
-void my_init(void){
-    //  Set octave to 0
-    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
-    // avoid using 127 since it is used as a special number in some sound sources.
-    midi_config.velocity = MIDI_INITIAL_VELOCITY;
-    default_layer_set(_LS_BASE);
-    layer_state_set(_LS_BASE);
-
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_sethsv(HSV_BLUE);
-    rgb_matrix_mode(RGB_MATRIX_CUSTOM_my_solid_reactive_col);
-#endif  // RGB_MATRIX_ENABLE
-}
-
-void eeconfig_init_user(void) {  // EEPROM is getting reset!
-    midi_init();
-
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
-#endif  // RGB_MATRIX_ENABLE
-    my_init(); // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
-}
-
-void keyboard_post_init_user(void) {
-    for (uint8_t i = 0; i < MY_TONE_COUNT; i++) {
-        my_tone_status[i] = MIDI_INVALID_NOTE;
-    }
-    my_init(); // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
-}
-
-void reset_scale_indicator(void) {
-    //  reset transpose value and scale_indicator_col to default.
-    midi_config.transpose = 0;
-    scale_indicator_col = DEFAULT_SCALE_COL;
-    trans_mode_indicator_loc_sel = true;
-}
-
-void reset_all(void) {
-    reset_scale_indicator();
-    is_trans_mode = false;      //  trans mode is disabled by default.
-}
-
-void my_process_midi4single_note(uint8_t channel, uint16_t keycode, keyrecord_t *record, uint8_t *my_tone_status) {
-    uint8_t  mytone    = keycode - YM_TONE_MIN;
-    uint16_t mykeycode = mytone + MIDI_TONE_MIN;
-    // uint16_t mykeycode = keycode - YM_TONE_MIN;
-    // uint8_t  mytone    = mykeycode - MIDI_TONE_MIN;
-    uint8_t  velocity  = midi_config.velocity;
-    // uprintf("keycode=%u,mykeycode=%u,mytone =%u,velo = %u\n", keycode, mykeycode, mytone, velocity);
-    if (record->event.pressed) {
-        if (my_tone_status[mytone] == MIDI_INVALID_NOTE) {
-            uint8_t note = midi_compute_note(mykeycode);
-            midi_send_noteon(&midi_device, channel, note, velocity);
-            dprintf("midi noteon channel:%d note:%d mytone:%d velocity:%d\n", channel, note, mytone, velocity);
-            // uprintf("midi noteon channel:%d note:%d mytone:%d velocity:%d\n", channel, note, mytone, velocity);
-            my_tone_status[mytone] = note;  // store root_note status.
-        }
-    } else {
-        uint8_t note = my_tone_status[mytone];
-        if (note != MIDI_INVALID_NOTE) {
-            midi_send_noteoff(&midi_device, channel, note, velocity);
-            dprintf("midi noteoff channel:%d note:%d velocity:%d\n", channel, note, velocity);
-            // uprintf("midi noteoff channel:%d note:%d velocity:%d\n", channel, note, velocity);
-        }
-        my_tone_status[mytone] = MIDI_INVALID_NOTE;
-    }
-}
-
-void select_layer_state_set(void) {
-    switch (key_separator_col) {
-        case _KEY01:
-            if (is_trans_mode) {
-                layer_state_set(_LS_TRANS);
-            } else {
-                layer_state_set(_LS_BASE);
-            }
-            break;
-
-        case _KEY13:
-            if (is_trans_mode) {
-                layer_state_set(_LS_SEPALEFTOCT_T);
-            } else {
-                layer_state_set(_LS_SEPALEFTOCT);
-            }
-            break;
-
-        case _KEY19:
-            if (is_trans_mode) {
-                layer_state_set(_LS_SEPAHALF_T);
-            } else {
-                layer_state_set(_LS_SEPAHALF);
-            }
-            break;
-
-        case _KEY25:
-            if (is_trans_mode) {
-                layer_state_set(_LS_SEPARIGHTOCT_T);
-            } else {
-                layer_state_set(_LS_SEPARIGHTOCT);
-            }
-            break;
-
-        case _KEY37:
-            if (is_trans_mode) {
-                layer_state_set(_LS_FLIPTRANS);
-            } else {
-                layer_state_set(_LS_FLIPBASE);
-            }
-            break;
-    }
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // uprintf("keycode=%u, YM_C_3=%u, YM_Db_2 =%u, YM_MIN = %u, YM_MAX = %u\n", keycode, YM_C_3, YM_Db_2, YM_TONE_MIN, YM_TONE_MAX);
-    switch (keycode) {
-        case VERSION: // Output firmware info.
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
-            }
-            break;
-
-        //  Layer-related settings.
-        //  reset_scale_indicator() first, followed by each modification, and then change the default layer.
-
-        //  1, separator column modification
-        case B_BASE:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY01;
-                select_layer_state_set();
-            }
-            break;
-
-        case B_LEFT:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY13;
-                select_layer_state_set();
-            }
-            break;
-
-        case B_CENTER:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY19;
-                select_layer_state_set();
-            }
-            break;
-
-        case B_RIGHT:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY25;
-                select_layer_state_set();
-            }
-            break;
-
-        case B_FLIP:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY37;
-                select_layer_state_set();
-            }
-            break;
-
-        //  2, Toggle scale shift mode and transpose mode
-        case TGLTRNS:
-            if (record->event.pressed) {
-                reset_scale_indicator();
-                is_trans_mode = !is_trans_mode;
-                select_layer_state_set();
-            }
-            break;
-
-        //  SHIFT_L and SHIFT_R can be pressed only when layer is either _BASE, _FLIPBASE.
-        case SHIFT_L:
-            if (record->event.pressed) {
-                switch (layer_state) {
-                    case _LS_BASE:
-                    case _LS_SEPALEFTOCT:
-                    case _LS_SEPAHALF:
-                    case _LS_SEPARIGHTOCT:
-                    case _LS_FLIPBASE:
-                        scale_indicator_col = shift_led_indicator_left(scale_indicator_col);
-                        break;
-                }
-            }
-            break;
-
-        case SHIFT_R:
-            if (record->event.pressed) {
-                switch (layer_state) {
-                    case _LS_BASE:
-                    case _LS_SEPALEFTOCT:
-                    case _LS_SEPAHALF:
-                    case _LS_SEPARIGHTOCT:
-                    case _LS_FLIPBASE:
-                        scale_indicator_col = shift_led_indicator_right(scale_indicator_col);
-                        break;
-                }
-            }
-            break;
-
-        case TGLINDI:
-            if (record->event.pressed) {
-                led_indicator_enable = !led_indicator_enable;
-            }
-            break;
-
-        case TGLINTR:
-            if (record->event.pressed) {
-                switch (layer_state) {
-                    //  main function of the TGLINTR part 1. alternate the status of trans_mode_indicator_loc_sel.
-                    case _LS_TRANS          | (1UL << _FN):
-                    case _LS_SEPALEFTOCT_T  | (1UL << _FN):
-                    case _LS_SEPAHALF_T     | (1UL << _FN):
-                    case _LS_SEPARIGHTOCT_T | (1UL << _FN):
-                        trans_mode_indicator_loc_sel = !trans_mode_indicator_loc_sel;
-
-                        //  when trans_mode_indicator_loc_sel == false, change the scale indicator and transpose.
-                        scale_indicator_col = trans_mode_indicator_loc_sel ? 0:1;
-                        // when TGLINTR is pressed, it also change the initial transpose setting to follow the scale indicator.
-                        if (scale_indicator_col == 1) {
-                            midi_config.transpose = -1;
-                        } else {
-                            midi_config.transpose = 0;
-                        }
-                        break;
-
-                    //  main function of the TGLINTR part 2. alternate the status of trans_mode_indicator_loc_sel.
-                    case _LS_FLIPTRANS      | (1UL << _FN):
-                        trans_mode_indicator_loc_sel = !trans_mode_indicator_loc_sel;
-
-                        //  when trans_mode_indicator_loc_sel == false, change the scale indicator and transpose.
-                        scale_indicator_col = trans_mode_indicator_loc_sel ? 0:11;
-                        // when TGLINTR is pressed, it also change the initial transpose setting to follow the scale indicator.
-                        if (scale_indicator_col == 11) {
-                            midi_config.transpose = -1;
-                        } else {
-                            midi_config.transpose = 0;
-                        }
-                        break;
-
-                    //  special treatment when TGLINTR is pressed in _LS_FLIPBASE layer.
-                    case _LS_FLIPBASE       | (1UL << _FN):   // when in FLIPBASE layer && non-Trans mode, change it to Trans mode.
-                        trans_mode_indicator_loc_sel = false;
-                        scale_indicator_col = 11;
-                        midi_config.transpose = -1;
-                        is_trans_mode = true;
-                        select_layer_state_set();
-                        break;
-
-
-                    //  special treatment when TGLINTR is pressed in other non-Trans layer.
-                    default :  // when other layers = non-Trans mode, change it to Trans mode.
-                        trans_mode_indicator_loc_sel = false;
-                        scale_indicator_col = 1;
-                        midi_config.transpose = -1;
-                        is_trans_mode = true;
-                        select_layer_state_set();
-                }
-            }
-            break;
-
-        case TGLCHGR:
-            if (record->event.pressed) {
-                use_alt_ch_gr = !use_alt_ch_gr;
-                if (use_alt_ch_gr) {
-                    midi_config.channel = ALT_MAIN_CH_NUMBER;
-                    midi_left_ch = ALT_SUB_CH_NUMBER;
-                } else {  //  default
-                    midi_config.channel = DEFAULT_MAIN_CH_NUMBER;
-                    midi_left_ch = DEFAULT_SUB_CH_NUMBER;
-                }
-            }
-            break;
-
-        case  YM_TONE_MIN ... YM_TONE_MAX:  // MY tone
-            // uprintf("keycode=%u, YM_C_3=%u, YM_Db_2 =%u, YM_MIN = %u, YM_MAX = %u\n", keycode, YM_C_3, YM_Db_2, YM_TONE_MIN, YM_TONE_MAX);
-            //  DO NOT THROW BELOW into 'if (record->event.pressed) {}' STATEMENT SINCE IT IS USED IN THE FUNCTION BELOW.
-            my_process_midi4single_note(midi_left_ch, keycode, record, my_tone_status);
-            break;
-    }
-    return true;
-}
-
-#ifdef RGB_MATRIX_ENABLE
-void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
-    uint8_t max_scale_indicator_led_loop;
-    uint8_t i;
-    if (led_indicator_enable) {  //  turn on indicators when enabled.
-        max_scale_indicator_led_loop = ( scale_indicator_col == DEFAULT_SCALE_COL ) ? 12 : 9;
-        for (i = 0; i < max_scale_indicator_led_loop; i++) {
-            rgb_matrix_set_color(led_scale_indicator[scale_indicator_col][i], r, g, b);
-        }
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-    // uint32_t mode = rgblight_get_mode();
-
-    if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
-
-        // uint8_t max_scale_indicator_led_loop;
-        uint8_t i;
-
-        switch (layer_state) {
-            case _LS_BASE:
-                set_led_scale_indicator(BASE_LAYER_COLOR);
-                break;
-
-            case _LS_FLIPBASE:
-                set_led_scale_indicator(FLIPB_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY37][i], FLIP_BORDER_COLOR);    //  right end
-                }
-                break;
-
-            case _LS_TRANS:
-                set_led_scale_indicator(TRANS_LAYER_COLOR);
-                break;
-
-            case _LS_SEPALEFTOCT_T:
-                set_led_scale_indicator(SEPALEFT_T_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY13][i], FLIP_BORDER_COLOR);    //  Left
-                }
-                break;
-
-            case _LS_SEPAHALF_T:
-                set_led_scale_indicator(SEPAHALF_T_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY19][i], FLIP_BORDER_COLOR);    //  Center
-                }
-                break;
-
-            case _LS_SEPARIGHTOCT_T:
-                set_led_scale_indicator(SEPARIGHT_T_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY25][i], FLIP_BORDER_COLOR);    //  Right
-                }
-                break;
-
-            case _LS_FLIPTRANS:
-                set_led_scale_indicator(FLIPT_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY37][i], FLIP_BORDER_COLOR);    //  right end
-                }
-                break;
-
-            case _LS_SEPALEFTOCT:
-                set_led_scale_indicator(SEPALEFT_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY13][i], FLIP_BORDER_COLOR);    //  Left
-                }
-                break;
-
-            case _LS_SEPAHALF:
-                set_led_scale_indicator(SEPAHALF_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY19][i], FLIP_BORDER_COLOR);    //  Center
-                }
-                break;
-
-            case _LS_SEPARIGHTOCT:
-                set_led_scale_indicator(SEPARIGHT_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY25][i], FLIP_BORDER_COLOR);    //  Right
-                }
-                break;
-
-            case _LS_FN ... _LS_MAX:  //  When Mute Button is long-pressed, the previous layers are still active.
-                for (i = 1; i < 5; i++) {
-                    rgb_matrix_set_color(i, RGB_DARKSPRINGGREEN);  //  up(1) down(4) left(3) right(2)  keys
-                }
-                rgb_matrix_set_color(led_single_col_indicator[_KEY02][0], RGB_DARKSPRINGGREEN);   //  TGLTRNS
-                rgb_matrix_set_color(led_single_col_indicator[_KEY04][0], RGB_DARKSPRINGGREEN);   //  TGLINTR
-                rgb_matrix_set_color(led_single_col_indicator[_KEY06][0], RGB_DARKSPRINGGREEN);   //  TGLCHGR
-
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY01][i], BASE_LAYER_COLOR);   //  B_BASE
-
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY13][i], SEPALEFT_LAYER_COLOR);   //  B_LEFT
-
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY19][i], SEPAHALF_LAYER_COLOR);   //  B_CENTER
-
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY25][i], SEPARIGHT_LAYER_COLOR);   //  B_RIGHT
-
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY37][i], FLIPB_LAYER_COLOR);   //  B_FLIP
-                }
-
-                for (i = _KEY12; i < _KEY37; i+=2){  //  even numbers from _KEY12 to _KEY36 are LED related settings.
-                    // turn on the bottom row only to keep the visibility of the RGB MATRIX effects.
-                    rgb_matrix_set_color(led_single_col_indicator[i][0], RGB_DARKSPRINGGREEN);  //       //  LED related settings.
-                }
-                break;
-        }
-    }
-    return false;
-}
-#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/chromatonemini/keymaps/led/readme.md b/keyboards/chromatonemini/keymaps/led/readme.md
deleted file mode 100644
index ed6cfd60405..00000000000
--- a/keyboards/chromatonemini/keymaps/led/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The LED enabled, customized keymap for chromatonemini
diff --git a/keyboards/chromatonemini/keymaps/led/rules.mk b/keyboards/chromatonemini/keymaps/led/rules.mk
deleted file mode 100644
index eb13370b823..00000000000
--- a/keyboards/chromatonemini/keymaps/led/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_CUSTOM_KB = yes  #
-VIA_ENABLE = no             # too many layers to use VIA...
-
-ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/chromatonemini/keymaps/party/keymap.c b/keyboards/chromatonemini/keymaps/party/keymap.c
deleted file mode 100644
index c4c3be83442..00000000000
--- a/keyboards/chromatonemini/keymaps/party/keymap.c
+++ /dev/null
@@ -1,699 +0,0 @@
-/* Copyright 2021 3araht
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-//  define which MIDI ch to use.
-//  Note that (actual MIDI ch# - 1) -> 0 .. 15 is used for coding.
-//  ch1
-#define DEFAULT_MAIN_CH_NUMBER 0
-//  ch3
-#define DEFAULT_SUB_CH_NUMBER  2
-//  ch2
-#define ALT_MAIN_CH_NUMBER     1
-//  ch4
-#define ALT_SUB_CH_NUMBER      3
-static uint8_t midi_left_ch = DEFAULT_SUB_CH_NUMBER;       //  By default, DEFAULT_SUB_CH_NUMBER is used for left side when separated.
-
-//  By default( when use_alt_ch_gr == false), DEFAULT ch group (DEFAULT_MAIN_CH_NUMBER for entirely, or right side when separated, DEFAULT_SUB_CH_NUMBER for left side) is used.
-//  When false, ALT ch group (ALT_MAIN_CH_NUMBER for entirely, or right side when separated, ALT_SUB_CH_NUMBER for left side) is used.
-static bool use_alt_ch_gr = false;
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,              //  Base layer, shift mode, single channel.
-    _SEPALEFTOCT,       //  1st oct channel separated version. Shift mode.
-    _SEPAHALF,          //  Half channel separated version. Shift mode.
-    _SEPARIGHTOCT,      //  2nd oct channel separated version. Shift mode.
-    _TRANS,             //  Transpose feature is enabled instead of shift mode, single channel.
-    _FLIPBASE,          //  Horizontal flipped version entirely. single channel.
-    _FLIPTRANS,         //  Horizontal flipped version entirely. Transpose is used. single channel.
-    _FN                 //  FuNction layer. This must be at the end of the enumurate to use the range from _LS_FN ... _LS_FN_MAX for FN layer LED settings.
-};
-
-//  Layer State
-#define _LS_BASE           (1UL << _BASE)
-#define _LS_SEPALEFTOCT    (1UL << _SEPALEFTOCT)
-#define _LS_SEPAHALF       (1UL << _SEPAHALF)
-#define _LS_SEPARIGHTOCT   (1UL << _SEPARIGHTOCT)
-#define _LS_FLIPBASE       (1UL << _FLIPBASE)
-
-#define _LS_TRANS          (1UL << _BASE         | 1UL << _TRANS)
-#define _LS_SEPALEFTOCT_T  (1UL << _SEPALEFTOCT  | 1UL << _TRANS)
-#define _LS_SEPAHALF_T     (1UL << _SEPAHALF     | 1UL << _TRANS)
-#define _LS_SEPARIGHTOCT_T (1UL << _SEPARIGHTOCT | 1UL << _TRANS)
-#define _LS_FLIPTRANS      (1UL << _FLIPBASE     | 1UL << _FLIPTRANS)
-
-#define _LS_FN             (1UL << _FN)
-#define _LS_MAX            (_LS_FN << 1)
-
-//  Don't change the DEFAULT_SCALE_COL value below. It must be 0.
-#define DEFAULT_SCALE_COL 0
-static uint8_t scale_indicator_col = DEFAULT_SCALE_COL;
-static bool trans_mode_indicator_loc_sel = true;  // when it is true, the location is _KEY01, _KEY13, ...
-
-//  use led indicator or not.
-static bool led_indicator_enable = true;
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    SHIFT_L = SAFE_RANGE,
-    SHIFT_R,
-    TGLINDI,  //  ToGgLe INDIcator
-    TGLINTR,  //  ToGgLe INdicator location {(_KEY01, _KEY13, _KEY25, _KEY37) or (_KEY02, _KEY14, _KEY26) / (_KEY12, _KEY24, _KEY36)}in TRans mode
-    TGLTRNS,  //  ToGgLe TRaNS and shift
-    TGLCHGR,  //  ToGgLe CH GRoup
-    VERSION,
-
-    B_BASE,            //  border set to the left end.
-    B_LEFT,            //  border set to the 1st left octave.
-    B_CENTER,          //  border set to the center.
-    B_RIGHT,           //  border set to the 1st right octave.
-    B_FLIP,            //  border set to the right end.
-
-    // MY tone for _FLIPHALF and _FLIPLEFTOCT layers to distinguish the notes to avoid sustain effect, etc.
-    // Since they are flipped, their subscripts are not MY_ but YM_, to make them easier to tell.
-    YM_TONE_MIN,
-
-    YM_C = YM_TONE_MIN,
-    YM_Cs,
-    YM_Db = YM_Cs,
-    YM_D,
-    YM_Ds,
-    YM_Eb = YM_Ds,
-    YM_E,
-    YM_F,
-    YM_Fs,
-    YM_Gb = YM_Fs,
-    YM_G,
-    YM_Gs,
-    YM_Ab = YM_Gs,
-    YM_A,
-    YM_As,
-    YM_Bb = YM_As,
-    YM_B,
-
-    YM_C_1,
-    YM_Cs_1,
-    YM_Db_1 = YM_Cs_1,
-    YM_D_1,
-    YM_Ds_1,
-    YM_Eb_1 = YM_Ds_1,
-    YM_E_1,
-    YM_F_1,
-    YM_Fs_1,
-    YM_Gb_1 = YM_Fs_1,
-    YM_G_1,
-    YM_Gs_1,
-    YM_Ab_1 = YM_Gs_1,
-    YM_A_1,
-    YM_As_1,
-    YM_Bb_1 = YM_As_1,
-    YM_B_1,
-
-    YM_C_2,
-    YM_Cs_2,
-    YM_Db_2 = YM_Cs_2,
-    YM_D_2,
-    YM_Ds_2,
-    YM_Eb_2 = YM_Ds_2,
-    YM_E_2,
-    YM_F_2,
-    YM_Fs_2,
-    YM_Gb_2 = YM_Fs_2,
-    YM_G_2,
-    YM_Gs_2,
-    YM_Ab_2 = YM_Gs_2,
-    YM_A_2,
-    YM_As_2,
-    YM_Bb_2 = YM_As_2,
-    YM_B_2,
-
-    YM_C_3,
-    YM_Cs_3,
-    YM_Db_3 = YM_Cs_3,
-    YM_D_3,
-    YM_Ds_3,
-    YM_Eb_3 = YM_Ds_3,
-    YM_E_3,
-    YM_F_3,
-    YM_Fs_3,
-    YM_Gb_3 = YM_Fs_3,
-    YM_G_3,
-    YM_Gs_3,
-    YM_Ab_3 = YM_Gs_3,
-    YM_A_3,
-    YM_As_3,
-    YM_Bb_3 = YM_As_3,
-    YM_B_3,
-
-    YM_C_4,
-    YM_Cs_4,
-    YM_Db_4 = YM_Cs_4,
-    YM_D_4,
-    YM_Ds_4,
-    YM_Eb_4 = YM_Ds_4,
-    YM_E_4,
-    YM_F_4,
-    YM_Fs_4,
-    YM_Gb_4 = YM_Fs_4,
-    YM_G_4,
-    YM_Gs_4,
-    YM_Ab_4 = YM_Gs_4,
-    YM_A_4,
-    YM_As_4,
-    YM_Bb_4 = YM_As_4,
-    YM_B_4,
-
-    YM_C_5,
-    YM_Cs_5,
-    YM_Db_5 = YM_Cs_5,
-    YM_D_5,
-    YM_Ds_5,
-    YM_Eb_5 = YM_Ds_5,
-    YM_E_5,
-    YM_F_5,
-    YM_Fs_5,
-    YM_Gb_5 = YM_Fs_5,
-    YM_G_5,
-    YM_Gs_5,
-    YM_Ab_5 = YM_Gs_5,
-    YM_A_5,
-    YM_As_5,
-    YM_Bb_5 = YM_As_5,
-    YM_B_5,
-
-    YM_C_6,
-    YM_TONE_MAX = YM_C_6
-};
-
-#define MY_TONE_COUNT (YM_TONE_MAX - YM_TONE_MIN + 1)
-static uint8_t my_tone_status[MY_TONE_COUNT];
-
-// Long press: go to _FN layer, tap: MUTE
-#define FN_MUTE LT(_FN, KC_MUTE)
-
-// Used to set octave to 0
-extern midi_config_t midi_config;
-static bool is_trans_mode = false;     //  By default, shift mode is chosen.
-
-static uint8_t key_separator_col = _KEY01;  //  (_KEY01 .. _KEY37).     By default, _KEY01 (= _BASE layer) is chosen. _KEY13 = *LEFT, _KEY19 = *HALF, _KEY25 = *RIGHT, _KEY37 = _FLIPBASE and _FLIPTRANS.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-            FN_MUTE,         MI_SUST,
-            MI_BNDU,
-        SHIFT_L, SHIFT_R,    MI_C2, MI_D2, MI_E2,  MI_Fs2, MI_Ab2, MI_Bb2, MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
-            MI_BNDD,            MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2, MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
-    ),
-
-    /* 1 octave on the left side is ch2, others are ch1 (normal) */
-    [_SEPALEFTOCT] = LAYOUT(
-            _______,          _______,
-            _______,
-        SHIFT_L, SHIFT_R,     YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2,     MI_C3, MI_D3, MI_E3, MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
-            _______,             YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2,     MI_Db3, MI_Eb3, MI_F3,  MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
-    ),
-
-    /* Half ch2, half ch1 (normal) */
-    [_SEPAHALF] = LAYOUT(
-            _______,           _______,
-            _______,
-        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3,       MI_Fs3, MI_Ab3, MI_Bb3, MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
-            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,    MI_G3, MI_A3,  MI_B3, MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
-    ),
-
-    /* 2 octave on the left side is ch2, others are ch1 (normal) */
-    [_SEPARIGHTOCT] = LAYOUT(
-            _______,           _______,
-            _______,
-        SHIFT_L, SHIFT_R,      YM_C_2, YM_D_2, YM_E_2,  YM_Fs_2, YM_Ab_2, YM_Bb_2, YM_C_3, YM_D_3, YM_E_3, YM_Fs_3, YM_Ab_3, YM_Bb_3,      MI_C4,  MI_D4,  MI_E4, MI_Fs4, MI_Ab4, MI_Bb4, MI_C5,
-            _______,               YM_Db_2, YM_Eb_2, YM_F_2,  YM_G_2,  YM_A_2,  YM_B_2, YM_Db_3, YM_Eb_3, YM_F_3,  YM_G_3, YM_A_3,  YM_B_3,     MI_Db4, MI_Eb4, MI_F4,  MI_G4,  MI_A4,  MI_B4
-    ),
-
-    /* TRANS   This layer must locate 1 layer below _FN layer. */
-    [_TRANS] = LAYOUT(
-            _______,           _______,
-            _______,
-        MI_TRSD,  MI_TRSU,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-            _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Flip Base    SFIFTUP and SHIFT_L are swapped. */
-    [_FLIPBASE] = LAYOUT(
-            FN_MUTE,          MI_SUST,
-            MI_BNDU,
-        SHIFT_L, SHIFT_R,     MI_C5, MI_Bb4, MI_Ab4,  MI_Fs4, MI_E4, MI_D4, MI_C4, MI_Bb3, MI_Ab3, MI_Fs3, MI_E3, MI_D3, MI_C3,  MI_Bb2,  MI_Ab2, MI_Fs2, MI_E2, MI_D2, MI_C2,
-            MI_BNDD,            MI_B4, MI_A4, MI_G4,  MI_F4,  MI_Eb4,  MI_Db4, MI_B3, MI_A3, MI_G3,  MI_F3, MI_Eb3,  MI_Db3, MI_B2, MI_A2, MI_G2,  MI_F2,  MI_Eb2,  MI_Db2
-    ),
-
-    /* Flip Trans   This layer must locate 1 layer above _FLIPBASE layer.  MI_TRSU and MI_TRSD are swapped. */
-    [_FLIPTRANS] = LAYOUT(
-            _______,          _______,
-            _______,
-        MI_TRSU,  MI_TRSD,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-            _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    [_FN] =  LAYOUT(
-            _______,          XXXXXXX,
-            MI_VELU,
-        MI_OCTD, MI_OCTU,     B_BASE,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, B_LEFT, XXXXXXX, XXXXXXX, B_CENTER, XXXXXXX, XXXXXXX, B_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, XXXXXXX, B_FLIP,
-            MI_VELD,               TGLINTR, TGLTRNS, TGLCHGR, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, EE_CLR, TGLINDI, RGB_TOG
-    )
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE]         = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
-    [_SEPALEFTOCT]  = { ENCODER_CCW_CW(_______, _______)  },
-    [_SEPAHALF]     = { ENCODER_CCW_CW(_______, _______)  },
-    [_SEPARIGHTOCT] = { ENCODER_CCW_CW(_______, _______)  },
-    [_TRANS]        = { ENCODER_CCW_CW(_______, _______)  },
-    [_FLIPBASE]     = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
-    [_FLIPTRANS]    = { ENCODER_CCW_CW(_______, _______)  },
-    [_FN]           = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
-};
-#endif
-
-
-// commom codes called from eeconfig_init_user() and keyboard_post_init_user().
-void my_init(void){
-    //  Set octave to 0
-    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
-    // avoid using 127 since it is used as a special number in some sound sources.
-    midi_config.velocity = MIDI_INITIAL_VELOCITY;
-    default_layer_set(_LS_BASE);
-    layer_state_set(_LS_BASE);
-
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_sethsv(HSV_BLUE);
-    //  party mode (for LED soldering test. Enable rainbow color effect, and disable led_indicator to check all LEDs)
-    rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
-    led_indicator_enable = false;
-#endif  // RGB_MATRIX_ENABLE
-}
-
-void eeconfig_init_user(void) {  // EEPROM is getting reset!
-    midi_init();
-
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_enable();
-    rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD);
-#endif  // RGB_MATRIX_ENABLE
-    my_init(); // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
-}
-
-void keyboard_post_init_user(void) {
-    for (uint8_t i = 0; i < MY_TONE_COUNT; i++) {
-        my_tone_status[i] = MIDI_INVALID_NOTE;
-    }
-    my_init(); // commom codes called from eeconfig_init_user() and keyboard_post_init_user().
-}
-
-void reset_scale_indicator(void) {
-    //  reset transpose value and scale_indicator_col to default.
-    midi_config.transpose = 0;
-    scale_indicator_col = DEFAULT_SCALE_COL;
-    trans_mode_indicator_loc_sel = true;
-}
-
-void reset_all(void) {
-    reset_scale_indicator();
-    is_trans_mode = false;      //  trans mode is disabled by default.
-}
-
-void my_process_midi4single_note(uint8_t channel, uint16_t keycode, keyrecord_t *record, uint8_t *my_tone_status) {
-    uint8_t  mytone    = keycode - YM_TONE_MIN;
-    uint16_t mykeycode = mytone + MIDI_TONE_MIN;
-    // uint16_t mykeycode = keycode - YM_TONE_MIN;
-    // uint8_t  mytone    = mykeycode - MIDI_TONE_MIN;
-    uint8_t  velocity  = midi_config.velocity;
-    // uprintf("keycode=%u,mykeycode=%u,mytone =%u,velo = %u\n", keycode, mykeycode, mytone, velocity);
-    if (record->event.pressed) {
-        if (my_tone_status[mytone] == MIDI_INVALID_NOTE) {
-            uint8_t note = midi_compute_note(mykeycode);
-            midi_send_noteon(&midi_device, channel, note, velocity);
-            dprintf("midi noteon channel:%d note:%d mytone:%d velocity:%d\n", channel, note, mytone, velocity);
-            // uprintf("midi noteon channel:%d note:%d mytone:%d velocity:%d\n", channel, note, mytone, velocity);
-            my_tone_status[mytone] = note;  // store root_note status.
-        }
-    } else {
-        uint8_t note = my_tone_status[mytone];
-        if (note != MIDI_INVALID_NOTE) {
-            midi_send_noteoff(&midi_device, channel, note, velocity);
-            dprintf("midi noteoff channel:%d note:%d velocity:%d\n", channel, note, velocity);
-            // uprintf("midi noteoff channel:%d note:%d velocity:%d\n", channel, note, velocity);
-        }
-        my_tone_status[mytone] = MIDI_INVALID_NOTE;
-    }
-}
-
-void select_layer_state_set(void) {
-    switch (key_separator_col) {
-        case _KEY01:
-            if (is_trans_mode) {
-                layer_state_set(_LS_TRANS);
-            } else {
-                layer_state_set(_LS_BASE);
-            }
-            break;
-
-        case _KEY13:
-            if (is_trans_mode) {
-                layer_state_set(_LS_SEPALEFTOCT_T);
-            } else {
-                layer_state_set(_LS_SEPALEFTOCT);
-            }
-            break;
-
-        case _KEY19:
-            if (is_trans_mode) {
-                layer_state_set(_LS_SEPAHALF_T);
-            } else {
-                layer_state_set(_LS_SEPAHALF);
-            }
-            break;
-
-        case _KEY25:
-            if (is_trans_mode) {
-                layer_state_set(_LS_SEPARIGHTOCT_T);
-            } else {
-                layer_state_set(_LS_SEPARIGHTOCT);
-            }
-            break;
-
-        case _KEY37:
-            if (is_trans_mode) {
-                layer_state_set(_LS_FLIPTRANS);
-            } else {
-                layer_state_set(_LS_FLIPBASE);
-            }
-            break;
-    }
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // uprintf("keycode=%u, YM_C_3=%u, YM_Db_2 =%u, YM_MIN = %u, YM_MAX = %u\n", keycode, YM_C_3, YM_Db_2, YM_TONE_MIN, YM_TONE_MAX);
-    switch (keycode) {
-        case VERSION: // Output firmware info.
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
-            }
-            break;
-
-        //  Layer-related settings.
-        //  reset_scale_indicator() first, followed by each modification, and then change the default layer.
-
-        //  1, separator column modification
-        case B_BASE:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY01;
-                select_layer_state_set();
-            }
-            break;
-
-        case B_LEFT:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY13;
-                select_layer_state_set();
-            }
-            break;
-
-        case B_CENTER:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY19;
-                select_layer_state_set();
-            }
-            break;
-
-        case B_RIGHT:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY25;
-                select_layer_state_set();
-            }
-            break;
-
-        case B_FLIP:
-            if (record->event.pressed) {
-                reset_all();
-                key_separator_col = _KEY37;
-                select_layer_state_set();
-            }
-            break;
-
-        //  2, Toggle scale shift mode and transpose mode
-        case TGLTRNS:
-            if (record->event.pressed) {
-                reset_scale_indicator();
-                is_trans_mode = !is_trans_mode;
-                select_layer_state_set();
-            }
-            break;
-
-        //  SHIFT_L and SHIFT_R can be pressed only when layer is either _BASE, _FLIPBASE.
-        case SHIFT_L:
-            if (record->event.pressed) {
-                switch (layer_state) {
-                    case _LS_BASE:
-                    case _LS_SEPALEFTOCT:
-                    case _LS_SEPAHALF:
-                    case _LS_SEPARIGHTOCT:
-                    case _LS_FLIPBASE:
-                        scale_indicator_col = shift_led_indicator_left(scale_indicator_col);
-                        break;
-                }
-            }
-            break;
-
-        case SHIFT_R:
-            if (record->event.pressed) {
-                switch (layer_state) {
-                    case _LS_BASE:
-                    case _LS_SEPALEFTOCT:
-                    case _LS_SEPAHALF:
-                    case _LS_SEPARIGHTOCT:
-                    case _LS_FLIPBASE:
-                        scale_indicator_col = shift_led_indicator_right(scale_indicator_col);
-                        break;
-                }
-            }
-            break;
-
-        case TGLINDI:
-            if (record->event.pressed) {
-                led_indicator_enable = !led_indicator_enable;
-            }
-            break;
-
-        case TGLINTR:
-            if (record->event.pressed) {
-                switch (layer_state) {
-                    //  main function of the TGLINTR part 1. alternate the status of trans_mode_indicator_loc_sel.
-                    case _LS_TRANS          | (1UL << _FN):
-                    case _LS_SEPALEFTOCT_T  | (1UL << _FN):
-                    case _LS_SEPAHALF_T     | (1UL << _FN):
-                    case _LS_SEPARIGHTOCT_T | (1UL << _FN):
-                        trans_mode_indicator_loc_sel = !trans_mode_indicator_loc_sel;
-
-                        //  when trans_mode_indicator_loc_sel == false, change the scale indicator and transpose.
-                        scale_indicator_col = trans_mode_indicator_loc_sel ? 0:1;
-                        // when TGLINTR is pressed, it also change the initial transpose setting to follow the scale indicator.
-                        if (scale_indicator_col == 1) {
-                            midi_config.transpose = -1;
-                        } else {
-                            midi_config.transpose = 0;
-                        }
-                        break;
-
-                    //  main function of the TGLINTR part 2. alternate the status of trans_mode_indicator_loc_sel.
-                    case _LS_FLIPTRANS      | (1UL << _FN):
-                        trans_mode_indicator_loc_sel = !trans_mode_indicator_loc_sel;
-
-                        //  when trans_mode_indicator_loc_sel == false, change the scale indicator and transpose.
-                        scale_indicator_col = trans_mode_indicator_loc_sel ? 0:11;
-                        // when TGLINTR is pressed, it also change the initial transpose setting to follow the scale indicator.
-                        if (scale_indicator_col == 11) {
-                            midi_config.transpose = -1;
-                        } else {
-                            midi_config.transpose = 0;
-                        }
-                        break;
-
-                    //  special treatment when TGLINTR is pressed in _LS_FLIPBASE layer.
-                    case _LS_FLIPBASE       | (1UL << _FN):   // when in FLIPBASE layer && non-Trans mode, change it to Trans mode.
-                        trans_mode_indicator_loc_sel = false;
-                        scale_indicator_col = 11;
-                        midi_config.transpose = -1;
-                        is_trans_mode = true;
-                        select_layer_state_set();
-                        break;
-
-
-                    //  special treatment when TGLINTR is pressed in other non-Trans layer.
-                    default :  // when other layers = non-Trans mode, change it to Trans mode.
-                        trans_mode_indicator_loc_sel = false;
-                        scale_indicator_col = 1;
-                        midi_config.transpose = -1;
-                        is_trans_mode = true;
-                        select_layer_state_set();
-                }
-            }
-            break;
-
-        case TGLCHGR:
-            if (record->event.pressed) {
-                use_alt_ch_gr = !use_alt_ch_gr;
-                if (use_alt_ch_gr) {
-                    midi_config.channel = ALT_MAIN_CH_NUMBER;
-                    midi_left_ch = ALT_SUB_CH_NUMBER;
-                } else {  //  default
-                    midi_config.channel = DEFAULT_MAIN_CH_NUMBER;
-                    midi_left_ch = DEFAULT_SUB_CH_NUMBER;
-                }
-            }
-            break;
-
-        case  YM_TONE_MIN ... YM_TONE_MAX:  // MY tone
-            // uprintf("keycode=%u, YM_C_3=%u, YM_Db_2 =%u, YM_MIN = %u, YM_MAX = %u\n", keycode, YM_C_3, YM_Db_2, YM_TONE_MIN, YM_TONE_MAX);
-            //  DO NOT THROW BELOW into 'if (record->event.pressed) {}' STATEMENT SINCE IT IS USED IN THE FUNCTION BELOW.
-            my_process_midi4single_note(midi_left_ch, keycode, record, my_tone_status);
-            break;
-    }
-    return true;
-}
-
-#ifdef RGB_MATRIX_ENABLE
-void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
-    uint8_t max_scale_indicator_led_loop;
-    uint8_t i;
-    if (led_indicator_enable) {  //  turn on indicators when enabled.
-        max_scale_indicator_led_loop = ( scale_indicator_col == DEFAULT_SCALE_COL ) ? 12 : 9;
-        for (i = 0; i < max_scale_indicator_led_loop; i++) {
-            rgb_matrix_set_color(led_scale_indicator[scale_indicator_col][i], r, g, b);
-        }
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-    // uint32_t mode = rgblight_get_mode();
-
-    if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
-
-        // uint8_t max_scale_indicator_led_loop;
-        uint8_t i;
-
-        switch (layer_state) {
-            case _LS_BASE:
-                set_led_scale_indicator(BASE_LAYER_COLOR);
-                break;
-
-            case _LS_FLIPBASE:
-                set_led_scale_indicator(FLIPB_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY37][i], FLIP_BORDER_COLOR);    //  right end
-                }
-                break;
-
-            case _LS_TRANS:
-                set_led_scale_indicator(TRANS_LAYER_COLOR);
-                break;
-
-            case _LS_SEPALEFTOCT_T:
-                set_led_scale_indicator(SEPALEFT_T_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY13][i], FLIP_BORDER_COLOR);    //  Left
-                }
-                break;
-
-            case _LS_SEPAHALF_T:
-                set_led_scale_indicator(SEPAHALF_T_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY19][i], FLIP_BORDER_COLOR);    //  Center
-                }
-                break;
-
-            case _LS_SEPARIGHTOCT_T:
-                set_led_scale_indicator(SEPARIGHT_T_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY25][i], FLIP_BORDER_COLOR);    //  Right
-                }
-                break;
-
-            case _LS_FLIPTRANS:
-                set_led_scale_indicator(FLIPT_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY37][i], FLIP_BORDER_COLOR);    //  right end
-                }
-                break;
-
-            case _LS_SEPALEFTOCT:
-                set_led_scale_indicator(SEPALEFT_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY13][i], FLIP_BORDER_COLOR);    //  Left
-                }
-                break;
-
-            case _LS_SEPAHALF:
-                set_led_scale_indicator(SEPAHALF_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY19][i], FLIP_BORDER_COLOR);    //  Center
-                }
-                break;
-
-            case _LS_SEPARIGHTOCT:
-                set_led_scale_indicator(SEPARIGHT_LAYER_COLOR);
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY25][i], FLIP_BORDER_COLOR);    //  Right
-                }
-                break;
-
-            case _LS_FN ... _LS_MAX:  //  When Mute Button is long-pressed, the previous layers are still active.
-                for (i = 1; i < 5; i++) {
-                    rgb_matrix_set_color(i, RGB_DARKSPRINGGREEN);  //  up(1) down(4) left(3) right(2)  keys
-                }
-                rgb_matrix_set_color(led_single_col_indicator[_KEY02][0], RGB_DARKSPRINGGREEN);   //  TGLTRNS
-                rgb_matrix_set_color(led_single_col_indicator[_KEY04][0], RGB_DARKSPRINGGREEN);   //  TGLINTR
-                rgb_matrix_set_color(led_single_col_indicator[_KEY06][0], RGB_DARKSPRINGGREEN);   //  TGLCHGR
-
-                for (i = 0; i < 3; i++) {
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY01][i], BASE_LAYER_COLOR);   //  B_BASE
-
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY13][i], SEPALEFT_LAYER_COLOR);   //  B_LEFT
-
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY19][i], SEPAHALF_LAYER_COLOR);   //  B_CENTER
-
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY25][i], SEPARIGHT_LAYER_COLOR);   //  B_RIGHT
-
-                    rgb_matrix_set_color(led_single_col_indicator[_KEY37][i], FLIPB_LAYER_COLOR);   //  B_FLIP
-                }
-
-                for (i = _KEY12; i < _KEY37; i+=2){  //  even numbers from _KEY12 to _KEY36 are LED related settings.
-                    // turn on the bottom row only to keep the visibility of the RGB MATRIX effects.
-                    rgb_matrix_set_color(led_single_col_indicator[i][0], RGB_DARKSPRINGGREEN);  //       //  LED related settings.
-                }
-                break;
-        }
-    }
-    return false;
-}
-#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/chromatonemini/keymaps/party/readme.md b/keyboards/chromatonemini/keymaps/party/readme.md
deleted file mode 100644
index 8ca1b5a8ce1..00000000000
--- a/keyboards/chromatonemini/keymaps/party/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# The LED enabled, party mode for testing LED soldering, customized keymap for chromatonemini.
-
-The main differences between "led" and "party" are:  
-//  party mode (for LED soldering test. Enable rainbow color effect, and disable led_indicator to check all LEDs)
-rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);  
-led_indicator_enable = false;
diff --git a/keyboards/chromatonemini/keymaps/party/rules.mk b/keyboards/chromatonemini/keymaps/party/rules.mk
deleted file mode 100644
index eb13370b823..00000000000
--- a/keyboards/chromatonemini/keymaps/party/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_CUSTOM_KB = yes  #
-VIA_ENABLE = no             # too many layers to use VIA...
-
-ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/churrosoft/deck8/rgb/config.h b/keyboards/churrosoft/deck8/rgb/config.h
deleted file mode 100644
index 2454c42fbab..00000000000
--- a/keyboards/churrosoft/deck8/rgb/config.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2023 Churrosoft
-*
-* 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_MATRIX_LED_COUNT 8
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_HUE 152
-#define RGB_MATRIX_DEFAULT_SAT 232
-#define RGB_MATRIX_DEFAULT_VAL 180
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-
-#define ENABLE_RGB_MATRIX_SOLID_COLOR
-#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
-#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
diff --git a/keyboards/churrosoft/deck8/rgb/info.json b/keyboards/churrosoft/deck8/rgb/info.json
index 546c17ca13d..b5b3b21b5ae 100644
--- a/keyboards/churrosoft/deck8/rgb/info.json
+++ b/keyboards/churrosoft/deck8/rgb/info.json
@@ -11,6 +11,57 @@
     "rgb_matrix": true
   },
   "rgb_matrix": {
+    "animations": {
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_val": true,
+      "band_pinwheel_sat": true,
+      "band_pinwheel_val": true,
+      "band_spiral_sat": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true,
+      "solid_multisplash": true
+    },
+    "default": {
+      "animation": "solid_color",
+      "hue": 152,
+      "sat": 232,
+      "val": 180
+    },
     "driver": "ws2812",
     "max_brightness": 200,
     "layout": [
@@ -22,6 +73,7 @@
       {"flags": 4, "matrix": [1, 1], "x":  90, "y": 42},
       {"flags": 4, "matrix": [1, 2], "x": 135, "y": 42},
       {"flags": 4, "matrix": [1, 3], "x": 180, "y": 42}
-    ]
+    ],
+    "sleep": true
   }
 }
\ No newline at end of file
diff --git a/keyboards/cipulot/60xt/info.json b/keyboards/cipulot/60xt/info.json
new file mode 100644
index 00000000000..606e6b33633
--- /dev/null
+++ b/keyboards/cipulot/60xt/info.json
@@ -0,0 +1,118 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "60XT",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "A1"
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A2", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B1", "B2", "A6", "A7", "B0"]
+    },
+    "processor": "STM32F072",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BC2",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [1, 15], "x": 16.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 1.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+                {"matrix": [4, 14], "x": 16.5, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.75, "y": 4},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 5.25, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13.75, "y": 4},
+                {"matrix": [4, 13], "x": 14.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 15], "x": 16.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/60xt/keymaps/default/keymap.c b/keyboards/cipulot/60xt/keymaps/default/keymap.c
new file mode 100644
index 00000000000..41008ef92ad
--- /dev/null
+++ b/keyboards/cipulot/60xt/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_F1, 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_F6,
+        KC_F2, 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_F7,
+        KC_F3, 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_F8,
+        KC_F4, 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, MO(1),            KC_F9,
+        KC_F5, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,          KC_F10
+    ),
+    [1] = LAYOUT(
+        _______, KC_GRV,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  _______, KC_DEL, _______,
+        _______, _______, _______, KC_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______,         _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,         _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,         _______,
+        _______, _______, _______, _______,                            _______,                                       _______, _______, MO(2),           _______
+    ),
+    [2] = LAYOUT(
+       QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______,                            _______,                                     _______, _______, _______,          _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/60xt/keymaps/via/keymap.c b/keyboards/cipulot/60xt/keymaps/via/keymap.c
new file mode 100644
index 00000000000..41008ef92ad
--- /dev/null
+++ b/keyboards/cipulot/60xt/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_F1, 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_F6,
+        KC_F2, 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_F7,
+        KC_F3, 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_F8,
+        KC_F4, 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, MO(1),            KC_F9,
+        KC_F5, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,          KC_F10
+    ),
+    [1] = LAYOUT(
+        _______, KC_GRV,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  _______, KC_DEL, _______,
+        _______, _______, _______, KC_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______,         _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,         _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,         _______,
+        _______, _______, _______, _______,                            _______,                                       _______, _______, MO(2),           _______
+    ),
+    [2] = LAYOUT(
+       QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______,                            _______,                                     _______, _______, _______,          _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/hub20/keymaps/via/rules.mk b/keyboards/cipulot/60xt/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/hub20/keymaps/via/rules.mk
rename to keyboards/cipulot/60xt/keymaps/via/rules.mk
diff --git a/keyboards/cipulot/60xt/readme.md b/keyboards/cipulot/60xt/readme.md
new file mode 100644
index 00000000000..19abf2340cc
--- /dev/null
+++ b/keyboards/cipulot/60xt/readme.md
@@ -0,0 +1,27 @@
+# 60XT
+
+![60XT](https://i.imgur.com/7lAvjpmh.png)
+
+A 60% XT solder and hot swap PCB.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: 60XT
+* Hardware Availability: [Eloquent Clicks](https://eloquentclicks.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/60xt:default
+
+Flashing example for this keyboard:
+
+    make cipulot/60xt: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:
+
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured.
+* **Physical reset button**: Long press the reset button soldered on the PCB.
+* **Bootmagic reset**: Hold down the top left key and plug in the controller.
diff --git a/keyboards/kudox/columner/rules.mk b/keyboards/cipulot/60xt/rules.mk
similarity index 100%
rename from keyboards/kudox/columner/rules.mk
rename to keyboards/cipulot/60xt/rules.mk
diff --git a/keyboards/cipulot/common/ec_board.c b/keyboards/cipulot/common/ec_board.c
new file mode 100644
index 00000000000..2225d6da63d
--- /dev/null
+++ b/keyboards/cipulot/common/ec_board.c
@@ -0,0 +1,64 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "quantum.h"
+
+void eeconfig_init_kb(void) {
+    // Default values
+    eeprom_ec_config.actuation_mode                 = DEFAULT_ACTUATION_MODE;
+    eeprom_ec_config.mode_0_actuation_threshold     = DEFAULT_MODE_0_ACTUATION_LEVEL;
+    eeprom_ec_config.mode_0_release_threshold       = DEFAULT_MODE_0_RELEASE_LEVEL;
+    eeprom_ec_config.mode_1_initial_deadzone_offset = DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET;
+    eeprom_ec_config.mode_1_actuation_offset        = DEFAULT_MODE_1_ACTUATION_OFFSET;
+    eeprom_ec_config.mode_1_release_offset          = DEFAULT_MODE_1_RELEASE_OFFSET;
+
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            eeprom_ec_config.bottoming_reading[row][col] = DEFAULT_BOTTOMING_READING;
+        }
+    }
+    // Write default value to EEPROM now
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+
+    eeconfig_init_user();
+}
+
+// On Keyboard startup
+void keyboard_post_init_kb(void) {
+    // Read custom menu variables from memory
+    eeconfig_read_kb_datablock(&eeprom_ec_config);
+
+    // Set runtime values to EEPROM values
+    ec_config.actuation_mode                 = eeprom_ec_config.actuation_mode;
+    ec_config.mode_0_actuation_threshold     = eeprom_ec_config.mode_0_actuation_threshold;
+    ec_config.mode_0_release_threshold       = eeprom_ec_config.mode_0_release_threshold;
+    ec_config.mode_1_initial_deadzone_offset = eeprom_ec_config.mode_1_initial_deadzone_offset;
+    ec_config.mode_1_actuation_offset        = eeprom_ec_config.mode_1_actuation_offset;
+    ec_config.mode_1_release_offset          = eeprom_ec_config.mode_1_release_offset;
+    ec_config.bottoming_calibration          = false;
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.bottoming_calibration_starter[row][col]           = true;
+            ec_config.bottoming_reading[row][col]                       = eeprom_ec_config.bottoming_reading[row][col];
+            ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        }
+    }
+
+    keyboard_post_init_user();
+}
diff --git a/keyboards/cipulot/common/ec_switch_matrix.c b/keyboards/cipulot/common/ec_switch_matrix.c
new file mode 100644
index 00000000000..845ef99d223
--- /dev/null
+++ b/keyboards/cipulot/common/ec_switch_matrix.c
@@ -0,0 +1,318 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "analog.h"
+#include "atomic_util.h"
+#include "math.h"
+#include "print.h"
+#include "wait.h"
+
+#if defined(__AVR__)
+#    error "AVR platforms not supported due to a variety of reasons. Among them there are limited memory, limited number of pins and ADC not being able to give satisfactory results."
+#endif
+
+#define OPEN_DRAIN_SUPPORT defined(PAL_MODE_OUTPUT_OPENDRAIN)
+
+eeprom_ec_config_t eeprom_ec_config;
+ec_config_t        ec_config;
+
+// Pin and port array
+const pin_t row_pins[]                                 = MATRIX_ROW_PINS;
+const pin_t amux_sel_pins[]                            = AMUX_SEL_PINS;
+const pin_t amux_en_pins[]                             = AMUX_EN_PINS;
+const pin_t amux_n_col_sizes[]                         = AMUX_COL_CHANNELS_SIZES;
+const pin_t amux_n_col_channels[][AMUX_MAX_COLS_COUNT] = {AMUX_COL_CHANNELS};
+
+#define AMUX_SEL_PINS_COUNT ARRAY_SIZE(amux_sel_pins)
+#define EXPECTED_AMUX_SEL_PINS_COUNT ceil(log2(AMUX_MAX_COLS_COUNT)
+// Checks for the correctness of the configuration
+_Static_assert(ARRAY_SIZE(amux_en_pins) == AMUX_COUNT, "AMUX_EN_PINS doesn't have the minimum number of bits required to enable all the multiplexers available");
+// Check that number of select pins is enough to select all the channels
+_Static_assert(AMUX_SEL_PINS_COUNT == EXPECTED_AMUX_SEL_PINS_COUNT), "AMUX_SEL_PINS doesn't have the minimum number of bits required address all the channels");
+// Check that number of elements in AMUX_COL_CHANNELS_SIZES is enough to specify the number of channels for all the multiplexers available
+_Static_assert(ARRAY_SIZE(amux_n_col_sizes) == AMUX_COUNT, "AMUX_COL_CHANNELS_SIZES doesn't have the minimum number of elements required to specify the number of channels for all the multiplexers available");
+
+static uint16_t sw_value[MATRIX_ROWS][MATRIX_COLS];
+
+static adc_mux adcMux;
+
+// Initialize the row pins
+void init_row(void) {
+    // Set all row pins as output and low
+    for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) {
+        setPinOutput(row_pins[idx]);
+        writePinLow(row_pins[idx]);
+    }
+}
+
+// Initialize the multiplexers
+void init_amux(void) {
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        setPinOutput(amux_en_pins[idx]);
+        writePinLow(amux_en_pins[idx]);
+    }
+    for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) {
+        setPinOutput(amux_sel_pins[idx]);
+    }
+}
+
+// Select the multiplexer channel of the specified multiplexer
+void select_amux_channel(uint8_t channel, uint8_t col) {
+    // Get the channel for the specified multiplexer
+    uint8_t ch = amux_n_col_channels[channel][col];
+    // momentarily disable specified multiplexer
+    writePinHigh(amux_en_pins[channel]);
+    // Select the multiplexer channel
+    for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) {
+        writePin(amux_sel_pins[i], ch & (1 << i));
+    }
+    // re enable specified multiplexer
+    writePinLow(amux_en_pins[channel]);
+}
+
+// Disable all the unused multiplexers
+void disable_unused_amux(uint8_t channel) {
+    // disable all the other multiplexers apart from the current selected one
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        if (idx != channel) {
+            writePinHigh(amux_en_pins[idx]);
+        }
+    }
+}
+// Discharge the peak hold capacitor
+void discharge_capacitor(void) {
+#ifdef OPEN_DRAIN_SUPPORT
+    writePinLow(DISCHARGE_PIN);
+#else
+    writePinLow(DISCHARGE_PIN);
+    setPinOutput(DISCHARGE_PIN);
+#endif
+}
+
+// Charge the peak hold capacitor
+void charge_capacitor(uint8_t row) {
+#ifdef OPEN_DRAIN_SUPPORT
+    writePinHigh(DISCHARGE_PIN);
+#else
+    setPinInput(DISCHARGE_PIN);
+#endif
+    writePinHigh(row_pins[row]);
+}
+
+// Initialize the peripherals pins
+int ec_init(void) {
+    // Initialize ADC
+    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
+    adcMux = pinToMux(ANALOG_PORT);
+
+    // Dummy call to make sure that adcStart() has been called in the appropriate state
+    adc_read(adcMux);
+
+    // Initialize discharge pin as discharge mode
+    writePinLow(DISCHARGE_PIN);
+#ifdef OPEN_DRAIN_SUPPORT
+    setPinOutputOpenDrain(DISCHARGE_PIN);
+#else
+    setPinOutput(DISCHARGE_PIN);
+#endif
+
+    // Initialize drive lines
+    init_row();
+
+    // Initialize AMUXs
+    init_amux();
+
+    return 0;
+}
+
+// Get the noise floor
+void ec_noise_floor(void) {
+    // Initialize the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] = 0;
+        }
+    }
+
+    // Sample the noise floor
+    for (uint8_t i = 0; i < DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; i++) {
+        for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+            disable_unused_amux(amux);
+            for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col = col + sum;
+                for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                    ec_config.noise_floor[row][adjusted_col] += ec_readkey_raw(amux, row, col);
+                }
+            }
+        }
+        wait_ms(5);
+    }
+
+    // Average the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] /= DEFAULT_NOISE_FLOOR_SAMPLING_COUNT;
+        }
+    }
+}
+
+// Scan key values and update matrix state
+bool ec_matrix_scan(matrix_row_t current_matrix[]) {
+    bool updated = false;
+
+    for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+        disable_unused_amux(amux);
+        for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col        = col + sum;
+                sw_value[row][adjusted_col] = ec_readkey_raw(amux, row, col);
+
+                if (ec_config.bottoming_calibration) {
+                    if (ec_config.bottoming_calibration_starter[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col]             = sw_value[row][adjusted_col];
+                        ec_config.bottoming_calibration_starter[row][adjusted_col] = false;
+                    } else if (sw_value[row][adjusted_col] > ec_config.bottoming_reading[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col];
+                    }
+                } else {
+                    updated |= ec_update_key(&current_matrix[row], row, adjusted_col, sw_value[row][adjusted_col]);
+                }
+            }
+        }
+    }
+
+    return ec_config.bottoming_calibration ? false : updated;
+}
+
+// Read the capacitive sensor value
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
+    uint16_t sw_value = 0;
+
+    // Select the multiplexer
+    select_amux_channel(channel, col);
+
+    // Set the row pin to low state to avoid ghosting
+    writePinLow(row_pins[row]);
+
+    ATOMIC_BLOCK_FORCEON {
+        // Set the row pin to high state and have capacitor charge
+        charge_capacitor(row);
+        // Read the ADC value
+        sw_value = adc_read(adcMux);
+    }
+    // Discharge peak hold capacitor
+    discharge_capacitor();
+    // Waiting for the ghost capacitor to discharge fully
+    wait_us(DISCHARGE_TIME);
+
+    return sw_value;
+}
+
+// Update press/release state of key
+bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
+    bool current_state = (*current_row >> col) & 1;
+
+    // Real Time Noise Floor Calibration
+    if (sw_value < (ec_config.noise_floor[row][col] - NOISE_FLOOR_THRESHOLD)) {
+        uprintf("Noise Floor Change: %d, %d, %d\n", row, col, sw_value);
+        ec_config.noise_floor[row][col]                             = sw_value;
+        ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+    }
+
+    // Normal board-wide APC
+    if (ec_config.actuation_mode == 0) {
+        if (current_state && sw_value < ec_config.rescaled_mode_0_release_threshold[row][col]) {
+            *current_row &= ~(1 << col);
+            uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+        if ((!current_state) && sw_value > ec_config.rescaled_mode_0_actuation_threshold[row][col]) {
+            *current_row |= (1 << col);
+            uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+    }
+    // Rapid Trigger
+    else if (ec_config.actuation_mode == 1) {
+        // Is key in active zone?
+        if (sw_value > ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]) {
+            // Is key pressed while in active zone?
+            if (current_state) {
+                // Is the key still moving down?
+                if (sw_value > ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                }
+                // Has key moved up enough to be released?
+                else if (sw_value < ec_config.extremum[row][col] - ec_config.mode_1_release_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row &= ~(1 << col);
+                    uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+            // Key is not pressed while in active zone
+            else {
+                // Is the key still moving up?
+                if (sw_value < ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                }
+                // Has key moved down enough to be pressed?
+                else if (sw_value > ec_config.extremum[row][col] + ec_config.mode_1_actuation_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row |= (1 << col);
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+        }
+        // Key is not in active zone
+        else {
+            // Check to avoid key being stuck in pressed state near the active zone threshold
+            if (sw_value < ec_config.extremum[row][col]) {
+                ec_config.extremum[row][col] = sw_value;
+                *current_row &= ~(1 << col);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// Print the matrix values
+void ec_print_matrix(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", sw_value[row][col]);
+        }
+        uprintf("%4d\n", sw_value[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Rescale the value to a different range
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max) {
+    return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
diff --git a/keyboards/cipulot/common/ec_switch_matrix.h b/keyboards/cipulot/common/ec_switch_matrix.h
new file mode 100644
index 00000000000..4b424911da8
--- /dev/null
+++ b/keyboards/cipulot/common/ec_switch_matrix.h
@@ -0,0 +1,73 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "matrix.h"
+#include "eeconfig.h"
+#include "util.h"
+
+typedef struct PACKED {
+    uint8_t  actuation_mode;                              // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point
+    uint16_t mode_0_actuation_threshold;                  // threshold for key press in mode 0
+    uint16_t mode_0_release_threshold;                    // threshold for key release in mode 0
+    uint16_t mode_1_initial_deadzone_offset;              // threshold for key press in mode 1
+    uint8_t  mode_1_actuation_offset;                     // offset for key press in mode 1 and 2 (1-255)
+    uint8_t  mode_1_release_offset;                       // offset for key release in mode 1 and 2 (1-255)
+    uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading
+} eeprom_ec_config_t;
+
+typedef struct {
+    uint8_t  actuation_mode;                                                    // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point (it can be very near that baseline noise and be "full travel")
+    uint16_t mode_0_actuation_threshold;                                        // threshold for key press in mode 0
+    uint16_t mode_0_release_threshold;                                          // threshold for key release in mode 0
+    uint16_t mode_1_initial_deadzone_offset;                                    // threshold for key press in mode 1 (initial deadzone)
+    uint16_t rescaled_mode_0_actuation_threshold[MATRIX_ROWS][MATRIX_COLS];     // threshold for key press in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_0_release_threshold[MATRIX_ROWS][MATRIX_COLS];       // threshold for key release in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_1_initial_deadzone_offset[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 1 (initial deadzone) rescaled to actual scale
+    uint8_t  mode_1_actuation_offset;                                           // offset for key press in mode 1 (1-255)
+    uint8_t  mode_1_release_offset;                                             // offset for key release in mode 1 (1-255)
+    uint16_t extremum[MATRIX_ROWS][MATRIX_COLS];                                // extremum values for mode 1
+    uint16_t noise_floor[MATRIX_ROWS][MATRIX_COLS];                             // noise floor detected during startup
+    bool     bottoming_calibration;                                             // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    bool     bottoming_calibration_starter[MATRIX_ROWS][MATRIX_COLS];           // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS];                       // bottoming reading
+} ec_config_t;
+
+// Check if the size of the reserved persistent memory is the same as the size of struct eeprom_ec_config_t
+_Static_assert(sizeof(eeprom_ec_config_t) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
+
+extern eeprom_ec_config_t eeprom_ec_config;
+
+extern ec_config_t ec_config;
+
+void init_row(void);
+void init_amux(void);
+void select_amux_channel(uint8_t channel, uint8_t col);
+void disable_unused_amux(uint8_t channel);
+void discharge_capacitor(void);
+void charge_capacitor(uint8_t row);
+
+int      ec_init(void);
+void     ec_noise_floor(void);
+bool     ec_matrix_scan(matrix_row_t current_matrix[]);
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
+bool     ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
+void     ec_print_matrix(void);
+
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max);
diff --git a/keyboards/cipulot/common/eeprom_tools.h b/keyboards/cipulot/common/eeprom_tools.h
new file mode 100644
index 00000000000..b3c90d87592
--- /dev/null
+++ b/keyboards/cipulot/common/eeprom_tools.h
@@ -0,0 +1,26 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "eeprom.h"
+
+#if (EECONFIG_KB_DATA_SIZE) > 0
+#    define EEPROM_KB_PARTIAL_UPDATE(__struct, __field) eeprom_update_block(&(__struct.__field), (void *)((void *)(EECONFIG_KB_DATABLOCK) + offsetof(typeof(__struct), __field)), sizeof(__struct.__field))
+#endif
+
+#if (EECONFIG_USER_DATA_SIZE) > 0
+#    define EEPROM_USER_PARTIAL_UPDATE(__struct, __field) eeprom_update_block(&(__struct.__field), (void *)((void *)(EECONFIG_USER_DATABLOCK) + offsetof(typeof(__struct), __field)), sizeof(__struct.__field))
+#endif
diff --git a/keyboards/cipulot/common/matrix.c b/keyboards/cipulot/common/matrix.c
new file mode 100644
index 00000000000..cfa2efe0506
--- /dev/null
+++ b/keyboards/cipulot/common/matrix.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "matrix.h"
+
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
+extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
+
+// Custom matrix init function
+void matrix_init_custom(void) {
+    // Initialize EC
+    ec_init();
+
+    // Get the noise floor at boot
+    ec_noise_floor();
+}
+
+// Custom matrix scan function
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool updated = ec_matrix_scan(current_matrix);
+
+    return updated;
+}
+
+// Bootmagic overriden to avoid conflicts with EC
+void bootmagic_scan(void) {
+    ;
+}
diff --git a/keyboards/cipulot/common/via_apc.c b/keyboards/cipulot/common/via_apc.c
deleted file mode 100644
index 2a92052d883..00000000000
--- a/keyboards/cipulot/common/via_apc.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-#ifdef VIA_ENABLE
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-#endif // VIA_ENABLE
diff --git a/keyboards/cipulot/common/via_ec.c b/keyboards/cipulot/common/via_ec.c
new file mode 100644
index 00000000000..ce4e813f759
--- /dev/null
+++ b/keyboards/cipulot/common/via_ec.c
@@ -0,0 +1,363 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "eeprom_tools.h"
+#include "ec_switch_matrix.h"
+#include "action.h"
+#include "print.h"
+#include "via.h"
+
+#ifdef VIA_ENABLE
+
+void ec_rescale_values(uint8_t item);
+void ec_save_threshold_data(uint8_t option);
+void ec_save_bottoming_reading(void);
+void ec_show_calibration_data(void);
+void ec_clear_bottoming_calibration_data(void);
+
+// Declaring enums for VIA config menu
+enum via_enums {
+    // clang-format off
+    id_actuation_mode = 1,
+    id_mode_0_actuation_threshold = 2,
+    id_mode_0_release_threshold = 3,
+    id_save_threshold_data = 4,
+    id_mode_1_initial_deadzone_offset = 5,
+    id_mode_1_actuation_offset = 6,
+    id_mode_1_release_offset = 7,
+    id_bottoming_calibration = 8,
+    id_noise_floor_calibration = 9,
+    id_show_calibration_data = 10,
+    id_clear_bottoming_calibration_data = 11
+    // clang-format on
+};
+
+// Handle the data received by the keyboard from the VIA menus
+void via_config_set_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_actuation_mode: {
+            eeprom_ec_config.actuation_mode = value_data[0];
+            ec_config.actuation_mode        = eeprom_ec_config.actuation_mode;
+            if (ec_config.actuation_mode == 0) {
+                uprintf("#########################\n");
+                uprintf("#  Actuation Mode: APC  #\n");
+                uprintf("#########################\n");
+            } else if (ec_config.actuation_mode == 1) {
+                uprintf("#################################\n");
+                uprintf("# Actuation Mode: Rapid Trigger #\n");
+                uprintf("#################################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, actuation_mode);
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            ec_config.mode_0_actuation_threshold = value_data[1] | (value_data[0] << 8);
+            uprintf("APC Mode Actuation Threshold: %d\n", ec_config.mode_0_actuation_threshold);
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            ec_config.mode_0_release_threshold = value_data[1] | (value_data[0] << 8);
+            uprintf("APC Mode Release Threshold: %d\n", ec_config.mode_0_release_threshold);
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            ec_config.mode_1_initial_deadzone_offset = value_data[1] | (value_data[0] << 8);
+            uprintf("Rapid Trigger Mode Initial Deadzone Offset: %d\n", ec_config.mode_1_initial_deadzone_offset);
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            ec_config.mode_1_actuation_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Actuation Offset: %d\n", ec_config.mode_1_actuation_offset);
+            break;
+        }
+        case id_mode_1_release_offset: {
+            ec_config.mode_1_release_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Release Offset: %d\n", ec_config.mode_1_release_offset);
+            break;
+        }
+        case id_bottoming_calibration: {
+            if (value_data[0] == 1) {
+                ec_config.bottoming_calibration = true;
+                uprintf("##############################\n");
+                uprintf("# Bottoming calibration mode #\n");
+                uprintf("##############################\n");
+            } else {
+                ec_config.bottoming_calibration = false;
+                ec_save_bottoming_reading();
+                uprintf("## Bottoming calibration done ##\n");
+                ec_show_calibration_data();
+            }
+            break;
+        }
+        case id_save_threshold_data: {
+            ec_save_threshold_data(value_data[0]);
+            break;
+        }
+        case id_noise_floor_calibration: {
+            if (value_data[0] == 0) {
+                ec_noise_floor();
+                ec_rescale_values(0);
+                ec_rescale_values(1);
+                ec_rescale_values(2);
+                uprintf("#############################\n");
+                uprintf("# Noise floor data acquired #\n");
+                uprintf("#############################\n");
+                break;
+            }
+        }
+        case id_show_calibration_data: {
+            if (value_data[0] == 0) {
+                ec_show_calibration_data();
+                break;
+            }
+        }
+        case id_clear_bottoming_calibration_data: {
+            if (value_data[0] == 0) {
+                ec_clear_bottoming_calibration_data();
+            }
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+}
+
+// Handle the data sent by the keyboard to the VIA menus
+void via_config_get_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_actuation_mode: {
+            value_data[0] = eeprom_ec_config.actuation_mode;
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_actuation_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_actuation_threshold & 0xFF;
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_release_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_release_threshold & 0xFF;
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_initial_deadzone_offset >> 8;
+            value_data[1] = eeprom_ec_config.mode_1_initial_deadzone_offset & 0xFF;
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_actuation_offset;
+            break;
+        }
+        case id_mode_1_release_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_release_offset;
+            break;
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+}
+
+// Handle the commands sent and received by the keyboard with VIA
+void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *channel_id        = &(data[1]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    if (*channel_id == id_custom_channel) {
+        switch (*command_id) {
+            case id_custom_set_value: {
+                via_config_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value: {
+                via_config_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save: {
+                // Bypass the save function in favor of pinpointed saves
+                break;
+            }
+            default: {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+        return;
+    }
+
+    *command_id = id_unhandled;
+}
+
+// Rescale the values received by VIA to fit the new range
+void ec_rescale_values(uint8_t item) {
+    switch (item) {
+        // Rescale the APC mode actuation thresholds
+        case 0:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the APC mode release thresholds
+        case 1:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the Rapid Trigger mode initial deadzone offsets
+        case 2:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+
+        default:
+            // Unhandled item.
+            break;
+    }
+}
+
+void ec_save_threshold_data(uint8_t option) {
+    // Save APC mode thresholds and rescale them for runtime usage
+    if (option == 0) {
+        eeprom_ec_config.mode_0_actuation_threshold = ec_config.mode_0_actuation_threshold;
+        eeprom_ec_config.mode_0_release_threshold   = ec_config.mode_0_release_threshold;
+        ec_rescale_values(0);
+        ec_rescale_values(1);
+    }
+    // Save Rapid Trigger mode thresholds and rescale them for runtime usage
+    else if (option == 1) {
+        eeprom_ec_config.mode_1_initial_deadzone_offset = ec_config.mode_1_initial_deadzone_offset;
+        eeprom_ec_config.mode_1_actuation_offset   = ec_config.mode_1_actuation_offset;
+        eeprom_ec_config.mode_1_release_offset     = ec_config.mode_1_release_offset;
+        ec_rescale_values(2);
+    }
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+    uprintf("####################################\n");
+    uprintf("# New thresholds applied and saved #\n");
+    uprintf("####################################\n");
+}
+
+// Save the bottoming reading
+void ec_save_bottoming_reading(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            // If the bottom reading doesn't go over the noise floor by BOTTOMING_CALIBRATION_THRESHOLD, it is likely that:
+            // 1. The key is not actually in the matrix
+            // 2. The key is on an alternative layout, therefore not being pressed
+            // 3. The key in in the current layout but not being pressed
+            if (ec_config.bottoming_reading[row][col] < (ec_config.noise_floor[row][col] + BOTTOMING_CALIBRATION_THRESHOLD)) {
+                eeprom_ec_config.bottoming_reading[row][col] = 1023;
+            } else {
+                eeprom_ec_config.bottoming_reading[row][col] = ec_config.bottoming_reading[row][col];
+            }
+        }
+    }
+    // Rescale the values to fit the new range for runtime usage
+    ec_rescale_values(0);
+    ec_rescale_values(1);
+    ec_rescale_values(2);
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+}
+
+// Show the calibration data
+void ec_show_calibration_data(void) {
+    uprintf("\n###############\n");
+    uprintf("# Noise Floor #\n");
+    uprintf("###############\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.noise_floor[row][col]);
+        }
+        uprintf("%4d\n", ec_config.noise_floor[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################\n");
+    uprintf("# Bottoming Readings #\n");
+    uprintf("######################\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", eeprom_ec_config.bottoming_reading[row][col]);
+        }
+        uprintf("%4d\n", eeprom_ec_config.bottoming_reading[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Actuation Points #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Actuation Point: %4d\n", ec_config.mode_0_actuation_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_actuation_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_actuation_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Release Points   #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Release Point: %4d\n", ec_config.mode_0_release_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_release_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_release_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n#######################################################\n");
+    uprintf("# Rescaled Rapid Trigger Mode Initial Deadzone Offset #\n");
+    uprintf("#######################################################\n");
+    uprintf("Original Rapid Trigger Mode Initial Deadzone Offset: %4d\n", ec_config.mode_1_initial_deadzone_offset);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_1_initial_deadzone_offset[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Clear the calibration data
+void ec_clear_bottoming_calibration_data(void) {
+    // Clear the EEPROM data
+    eeconfig_init_kb();
+
+    // Reset the runtime values to the EEPROM values
+    keyboard_post_init_kb();
+
+    uprintf("######################################\n");
+    uprintf("# Bottoming calibration data cleared #\n");
+    uprintf("######################################\n");
+}
+
+#endif // VIA_ENABLE
diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h
index 8bb39367b94..3a3d482e3d3 100644
--- a/keyboards/cipulot/ec_23u/config.h
+++ b/keyboards/cipulot/ec_23u/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,29 +19,51 @@
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 6
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B13, B12, A7, B0 }
-#define MATRIX_COL_CHANNELS \
-    { 4, 6, 3, 2, 0, 1 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 1
+#define AMUX_MAX_COLS_COUNT 6
+
+#define AMUX_EN_PINS \
+    { C15 }
+
+#define AMUX_SEL_PINS \
     { C14, C13, B6 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN C15
+#define AMUX_COL_CHANNELS_SIZES \
+    { 6 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 4, 6, 3, 2, 0, 1 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS
+
 #define DISCHARGE_PIN A3
 #define ANALOG_PORT A2
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-//#define DEBOUNCE 5
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 57
 
 /* 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 DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_23u/ec_switch_matrix.c b/keyboards/cipulot/ec_23u/ec_switch_matrix.c
deleted file mode 100644
index 4059a80e5db..00000000000
--- a/keyboards/cipulot/ec_23u/ec_switch_matrix.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    //Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN);
-    writePinLow(APLEX_EN_PIN);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    writePinHigh(APLEX_EN_PIN);
-    select_mux(col);
-    writePinLow(APLEX_EN_PIN);
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_23u/ec_switch_matrix.h b/keyboards/cipulot/ec_23u/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_23u/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_23u/halconf.h b/keyboards/cipulot/ec_23u/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_23u/halconf.h
+++ b/keyboards/cipulot/ec_23u/halconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/info.json
index 7358099759b..0f656f8e8ca 100644
--- a/keyboards/cipulot/ec_23u/info.json
+++ b/keyboards/cipulot/ec_23u/info.json
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "indicators": {
         "num_lock": "B14"
     },
diff --git a/keyboards/cipulot/ec_23u/keymaps/default/keymap.c b/keyboards/cipulot/ec_23u/keymaps/default/keymap.c
index 93ceadb842c..1f54d78a62b 100644
--- a/keyboards/cipulot/ec_23u/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_23u/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -28,27 +28,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
         RGB_TOG, RGB_VAD, RGB_VAI, _______,
+        _______, _______, _______, NK_TOGG,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, QK_BOOT, _______),
-
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______)
+        _______, _______, QK_BOOT, _______)
     // clang-format on
 };
diff --git a/keyboards/cipulot/ec_23u/keymaps/numpad_6x4/keymap.c b/keyboards/cipulot/ec_23u/keymaps/numpad_6x4/keymap.c
deleted file mode 100644
index 9246aa0eb70..00000000000
--- a/keyboards/cipulot/ec_23u/keymaps/numpad_6x4/keymap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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] = {
-    // clang-format off
-    [0] = LAYOUT_numpad_6x4(
-        KC_ESC, KC_TAB,  KC_BSPC, MO(1),
-        KC_NUM, KC_PSLS, KC_PAST, KC_PEQL,
-        KC_P7,  KC_P8,   KC_P9,
-        KC_P4,  KC_P5,   KC_P6,   KC_PPLS,
-        KC_P1,  KC_P2,   KC_P3,   KC_PENT,
-        KC_P0,           KC_PDOT),
-
-    [1] = LAYOUT_numpad_6x4(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______,
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______,          QK_BOOT),
-
-
-    [2] = LAYOUT_numpad_6x4(
-        _______, _______, _______, _______,
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______,          _______),
-
-    [3] = LAYOUT_numpad_6x4(
-        _______, _______, _______, _______,
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______,          _______)
-    // clang-format on
-};
diff --git a/keyboards/cipulot/ec_23u/keymaps/via/config.h b/keyboards/cipulot/ec_23u/keymaps/via/config.h
index ebf954d07ac..036188669d1 100644
--- a/keyboards/cipulot/ec_23u/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_23u/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,7 @@
 
 #pragma once
 
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
 // This is the size of the EEPROM for the custom VIA-specific data
 #define EECONFIG_USER_DATA_SIZE 4
diff --git a/keyboards/cipulot/ec_23u/keymaps/via/keymap.c b/keyboards/cipulot/ec_23u/keymaps/via/keymap.c
index 93ceadb842c..1f54d78a62b 100644
--- a/keyboards/cipulot/ec_23u/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_23u/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -28,27 +28,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
         RGB_TOG, RGB_VAD, RGB_VAI, _______,
+        _______, _______, _______, NK_TOGG,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, QK_BOOT, _______),
-
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______)
+        _______, _______, QK_BOOT, _______)
     // clang-format on
 };
diff --git a/keyboards/cipulot/ec_23u/keymaps/via/rules.mk b/keyboards/cipulot/ec_23u/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_23u/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_23u/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c b/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_23u/matrix.c b/keyboards/cipulot/ec_23u/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_23u/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* 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
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_23u/mcuconf.h b/keyboards/cipulot/ec_23u/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_23u/mcuconf.h
+++ b/keyboards/cipulot/ec_23u/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_23u/post_rules.mk b/keyboards/cipulot/ec_23u/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_23u/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_23u/readme.md b/keyboards/cipulot/ec_23u/readme.md
index d4832edff5d..28535c37873 100644
--- a/keyboards/cipulot/ec_23u/readme.md
+++ b/keyboards/cipulot/ec_23u/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 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 Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+* **Physical reset**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available
diff --git a/keyboards/cipulot/ec_23u/rules.mk b/keyboards/cipulot/ec_23u/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/ec_23u/rules.mk
+++ b/keyboards/cipulot/ec_23u/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_60/config.h b/keyboards/cipulot/ec_60/config.h
index 083b71cc136..c936b248c45 100644
--- a/keyboards/cipulot/ec_60/config.h
+++ b/keyboards/cipulot/ec_60/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,54 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B15, A8, B0, A7, B1 }
-#define MATRIX_COL_CHANNELS \
-    { 0, 3, 1, 2, 5, 7, 6, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
     { B6, B5, B4 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 B3
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6, 4 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A6
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 159
+
 /* 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 DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_60/ec_switch_matrix.c b/keyboards/cipulot/ec_60/ec_switch_matrix.c
deleted file mode 100644
index 72220b87336..00000000000
--- a/keyboards/cipulot/ec_60/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    //Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < (sizeof(col_channels) - 1); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_60/ec_switch_matrix.h b/keyboards/cipulot/ec_60/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_60/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_60/halconf.h b/keyboards/cipulot/ec_60/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_60/halconf.h
+++ b/keyboards/cipulot/ec_60/halconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_60/info.json b/keyboards/cipulot/ec_60/info.json
index e162eb8db86..a86b20bfd63 100644
--- a/keyboards/cipulot/ec_60/info.json
+++ b/keyboards/cipulot/ec_60/info.json
@@ -8,18 +8,11 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false
-    },
-    "mouse_key": {
-        "enabled": true
+        "nkro": true
     },
     "processor": "STM32F401",
     "url": "https://www.github.com/Cipulot/EC60",
diff --git a/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c
index 82c1e711c95..cc33a90f3df 100644
--- a/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -32,14 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                             _______,                                     _______, _______, _______),
 
     [2] = LAYOUT_60_ansi_tsangan(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                                     _______, _______, _______),
-
-    [3] = LAYOUT_60_ansi_tsangan(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c b/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c
index 530832885b9..8abe5c13bbd 100644
--- a/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -32,14 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                             _______,                                     _______, _______, _______),
 
     [2] = LAYOUT_60_iso_tsangan(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                                     _______, _______, _______),
-
-    [3] = LAYOUT_60_iso_tsangan(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/60_jis/keymap.c b/keyboards/cipulot/ec_60/keymaps/60_jis/keymap.c
index 76ecd082594..985a587f3ca 100644
--- a/keyboards/cipulot/ec_60/keymaps/60_jis/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/60_jis/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -34,14 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______,                             _______,          _______, _______, _______, _______, _______),
 
     [2] = LAYOUT_60_jis(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______,                            _______,          _______, _______, _______, _______, _______),
-
-    [3] = LAYOUT_60_jis(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/default/keymap.c b/keyboards/cipulot/ec_60/keymaps/default/keymap.c
index d76f9166b45..d41d43c8850 100644
--- a/keyboards/cipulot/ec_60/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -34,14 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,        _______,  _______,       _______,  _______,  _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,       _______,  _______,       _______,  _______,  _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/via/config.h b/keyboards/cipulot/ec_60/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_60/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_60/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_60/keymaps/via/keymap.c b/keyboards/cipulot/ec_60/keymaps/via/keymap.c
index d76f9166b45..d41d43c8850 100644
--- a/keyboards/cipulot/ec_60/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -34,14 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,        _______,  _______,       _______,  _______,  _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,       _______,  _______,       _______,  _______,  _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/via/rules.mk b/keyboards/cipulot/ec_60/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_60/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_60/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_60/keymaps/via/via_apc.c b/keyboards/cipulot/ec_60/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_60/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_60/matrix.c b/keyboards/cipulot/ec_60/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_60/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* 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
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_60/mcuconf.h b/keyboards/cipulot/ec_60/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_60/mcuconf.h
+++ b/keyboards/cipulot/ec_60/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_60/post_rules.mk b/keyboards/cipulot/ec_60/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_60/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_60/readme.md b/keyboards/cipulot/ec_60/readme.md
index a171bdfd4e6..be6a8ec6bab 100644
--- a/keyboards/cipulot/ec_60/readme.md
+++ b/keyboards/cipulot/ec_60/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 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 Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_60/rules.mk b/keyboards/cipulot/ec_60/rules.mk
index fc2dcf32ab1..70494b635f6 100644
--- a/keyboards/cipulot/ec_60/rules.mk
+++ b/keyboards/cipulot/ec_60/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/config.h b/keyboards/cipulot/ec_alveus/1_0_0/config.h
index 1947c308026..ea43ba348d5 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/config.h
+++ b/keyboards/cipulot/ec_alveus/1_0_0/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,53 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { A14, B3, A15, B5, B4 }
-#define MATRIX_COL_CHANNELS \
-    { 3, 0, 1, 2, 6, 5, 7, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { C13, C14 }
+
+#define AMUX_SEL_PINS \
     { B7, B8, B9 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 C13
-#define APLEX_EN_PIN_1 C14
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 6, 5, 7, 4 }
+
+#define AMUX_1_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN B1
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 169
+
 /* 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 DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.c b/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.c
deleted file mode 100644
index 783c00457c7..00000000000
--- a/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.h b/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/halconf.h b/keyboards/cipulot/ec_alveus/1_0_0/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/halconf.h
+++ b/keyboards/cipulot/ec_alveus/1_0_0/halconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/info.json b/keyboards/cipulot/ec_alveus/1_0_0/info.json
index 3e195460891..4652166cc5e 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/info.json
+++ b/keyboards/cipulot/ec_alveus/1_0_0/info.json
@@ -8,18 +8,11 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false
-    },
-    "mouse_key": {
-        "enabled": true
+        "nkro": true
     },
     "processor": "STM32F401",
     "usb": {
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/default/keymap.c b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/default/keymap.c
index d111c6a6853..bff38f1fa81 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,            _______,                      _______,                                                    _______,            _______,   _______,  _______,  _______),
 
     [2] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
-    _______,            _______,                      _______,                                                    _______,            _______,   _______,  _______,  _______),
-
-    [3] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/config.h b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/keymap.c b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/keymap.c
index 5fc6c4d94e0..692a631ea82 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,   _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
-        _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,   _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/rules.mk b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/via_apc.c b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/matrix.c b/keyboards/cipulot/ec_alveus/1_0_0/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_alveus/1_0_0/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* 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
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/mcuconf.h b/keyboards/cipulot/ec_alveus/1_0_0/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/mcuconf.h
+++ b/keyboards/cipulot/ec_alveus/1_0_0/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/post_rules.mk b/keyboards/cipulot/ec_alveus/1_0_0/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_alveus/1_0_0/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/readme.md b/keyboards/cipulot/ec_alveus/1_0_0/readme.md
index 01e82a88055..01594cbc4d5 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/readme.md
+++ b/keyboards/cipulot/ec_alveus/1_0_0/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 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**: Long short the exposed pads on the top of the PCB
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/rules.mk b/keyboards/cipulot/ec_alveus/1_0_0/rules.mk
index fc2dcf32ab1..70494b635f6 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_0_0/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/config.h b/keyboards/cipulot/ec_alveus/1_2_0/config.h
index 1947c308026..ea43ba348d5 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/config.h
+++ b/keyboards/cipulot/ec_alveus/1_2_0/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,53 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { A14, B3, A15, B5, B4 }
-#define MATRIX_COL_CHANNELS \
-    { 3, 0, 1, 2, 6, 5, 7, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { C13, C14 }
+
+#define AMUX_SEL_PINS \
     { B7, B8, B9 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 C13
-#define APLEX_EN_PIN_1 C14
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 6, 5, 7, 4 }
+
+#define AMUX_1_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN B1
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 169
+
 /* 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 DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.c b/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.c
deleted file mode 100644
index 783c00457c7..00000000000
--- a/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.h b/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/halconf.h b/keyboards/cipulot/ec_alveus/1_2_0/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/halconf.h
+++ b/keyboards/cipulot/ec_alveus/1_2_0/halconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/info.json b/keyboards/cipulot/ec_alveus/1_2_0/info.json
index 65af74e99ba..8b63d02f770 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/info.json
+++ b/keyboards/cipulot/ec_alveus/1_2_0/info.json
@@ -8,18 +8,11 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false
-    },
-    "mouse_key": {
-        "enabled": true
+        "nkro": true
     },
     "processor": "STM32F401",
     "usb": {
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/default/keymap.c b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/default/keymap.c
index d111c6a6853..bff38f1fa81 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,            _______,                      _______,                                                    _______,            _______,   _______,  _______,  _______),
 
     [2] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
-    _______,            _______,                      _______,                                                    _______,            _______,   _______,  _______,  _______),
-
-    [3] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/tkl_nofrow_ansi_tsangan_wkl_split_bs/keymap.c b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/tkl_nofrow_ansi_tsangan_wkl_split_bs/keymap.c
index 4552cd64575..163f05202ef 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/tkl_nofrow_ansi_tsangan_wkl_split_bs/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/tkl_nofrow_ansi_tsangan_wkl_split_bs/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______,                      _______,                                                    _______,            _______,             _______,  _______,  _______),
 
     [2] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl_split_bs(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,
-        _______,            _______,                      _______,                                                    _______,    _______,             _______,  _______,  _______),
-
-    [3] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl_split_bs(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/config.h b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/keymap.c b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/keymap.c
index 54a8f3b4f00..2134def61ae 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,             _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,
-        _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,             _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/rules.mk b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/via_apc.c b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/matrix.c b/keyboards/cipulot/ec_alveus/1_2_0/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_alveus/1_2_0/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* 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
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/mcuconf.h b/keyboards/cipulot/ec_alveus/1_2_0/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/mcuconf.h
+++ b/keyboards/cipulot/ec_alveus/1_2_0/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/post_rules.mk b/keyboards/cipulot/ec_alveus/1_2_0/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_alveus/1_2_0/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/readme.md b/keyboards/cipulot/ec_alveus/1_2_0/readme.md
index e4c3ef86c3f..43a39b06d80 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/readme.md
+++ b/keyboards/cipulot/ec_alveus/1_2_0/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 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**: Long short the exposed pads on the top of the PCB
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/rules.mk b/keyboards/cipulot/ec_alveus/1_2_0/rules.mk
index fc2dcf32ab1..70494b635f6 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_2_0/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h
index 083b71cc136..c936b248c45 100644
--- a/keyboards/cipulot/ec_pro2/config.h
+++ b/keyboards/cipulot/ec_pro2/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,54 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B15, A8, B0, A7, B1 }
-#define MATRIX_COL_CHANNELS \
-    { 0, 3, 1, 2, 5, 7, 6, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
     { B6, B5, B4 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 B3
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6, 4 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A6
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 159
+
 /* 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 DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c
deleted file mode 100644
index d45e8c32812..00000000000
--- a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < (sizeof(col_channels) - 1); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.h b/keyboards/cipulot/ec_pro2/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_pro2/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_pro2/halconf.h b/keyboards/cipulot/ec_pro2/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_pro2/halconf.h
+++ b/keyboards/cipulot/ec_pro2/halconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json
index cb107d3da3c..2929edfb19c 100644
--- a/keyboards/cipulot/ec_pro2/info.json
+++ b/keyboards/cipulot/ec_pro2/info.json
@@ -1,6 +1,6 @@
 {
     "manufacturer": "Cipulot",
-    "keyboard_name": "EC Pro2",
+    "keyboard_name": "EC Pro 2",
     "maintainer": "Cipulot",
     "bootloader": "stm32-dfu",
     "build": {
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
@@ -40,7 +34,6 @@
     "ws2812": {
         "pin": "B14"
     },
-    "url": "https://www.github.com/Cipulot/EC-Pro-2",
     "usb": {
         "device_version": "0.0.1",
         "pid": "0x6B8E",
diff --git a/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c
index 10c7ffb65fd..71f8cd0368d 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c
+++ b/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -22,8 +22,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_BSLS,  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_DEL,
         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_ENTER,
-        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_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+        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_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_60_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,   KC_INS,  KC_DEL,
@@ -33,13 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______,  _______,                                _______,                                  _______,  MO(2)),
 
     [2] = LAYOUT_60_hhkb(
-        RGB_TOG,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-    [3] = LAYOUT_60_hhkb(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c
index 767b76ea3e7..45e25068e53 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_DEL,
         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_ENTER,
         KC_LSFT,  KC_BSLS,  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_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_INS,  KC_DEL,
@@ -33,13 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______,  _______,                                _______,                                  _______,  MO(2)),
 
     [2] = LAYOUT_all(
-        RGB_TOG,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/config.h b/keyboards/cipulot/ec_pro2/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_pro2/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c
index 767b76ea3e7..45e25068e53 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_DEL,
         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_ENTER,
         KC_LSFT,  KC_BSLS,  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_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_INS,  KC_DEL,
@@ -33,13 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______,  _______,                                _______,                                  _______,  MO(2)),
 
     [2] = LAYOUT_all(
-        RGB_TOG,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk b/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_pro2/matrix.c b/keyboards/cipulot/ec_pro2/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_pro2/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* 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
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_pro2/mcuconf.h b/keyboards/cipulot/ec_pro2/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_pro2/mcuconf.h
+++ b/keyboards/cipulot/ec_pro2/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_pro2/post_rules.mk b/keyboards/cipulot/ec_pro2/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_pro2/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_pro2/readme.md b/keyboards/cipulot/ec_pro2/readme.md
index 0ada16ec193..6e18a2d0d83 100644
--- a/keyboards/cipulot/ec_pro2/readme.md
+++ b/keyboards/cipulot/ec_pro2/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 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 Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_pro2/rules.mk b/keyboards/cipulot/ec_pro2/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/ec_pro2/rules.mk
+++ b/keyboards/cipulot/ec_pro2/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/config.h b/keyboards/cipulot/ec_prox/ansi_iso/config.h
index b659097656b..6a165cf3abd 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/config.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,54 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { A7, B0, A4, A5, A6 }
-#define MATRIX_COL_CHANNELS \
-    { 0, 3, 1, 2, 5, 7, 6, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
     { B4, B5, B6 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 B3
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6, 4 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A2
 #define ANALOG_PORT A1
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 159
+
 /* 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 DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.c b/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.c
deleted file mode 100644
index d45e8c32812..00000000000
--- a/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < (sizeof(col_channels) - 1); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.h b/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/halconf.h b/keyboards/cipulot/ec_prox/ansi_iso/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/halconf.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/halconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/info.json
index b1221bfdd73..3f390d0bc61 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/info.json
+++ b/keyboards/cipulot/ec_prox/ansi_iso/info.json
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/60_hhkb/keymap.c
index 10c7ffb65fd..bd4df694af9 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/60_hhkb/keymap.c
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/60_hhkb/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_DEL,
         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_ENTER,
         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_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_60_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,   KC_INS,  KC_DEL,
@@ -33,13 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______,  _______,                                _______,                                  _______,  MO(2)),
 
     [2] = LAYOUT_60_hhkb(
-        RGB_TOG,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-    [3] = LAYOUT_60_hhkb(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/default/keymap.c b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/default/keymap.c
index 430ed0bafa2..9a0f1dfcbd1 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,24 +23,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_DEL,
         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_ENTER,
         KC_LSFT,  KC_BSLS,  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_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,   KC_INS,  KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  KC_BSPC,
         _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,   KC_DOWN,   _______,  _______,
-                  _______,  _______,                                _______,                                  _______,   _______),
+                  _______,  _______,                                _______,                                  _______,   MO(2)),
 
     [2] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/config.h b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/keymap.c b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/keymap.c
index 430ed0bafa2..9a0f1dfcbd1 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,24 +23,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_DEL,
         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_ENTER,
         KC_LSFT,  KC_BSLS,  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_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,   KC_INS,  KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  KC_BSPC,
         _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,   KC_DOWN,   _______,  _______,
-                  _______,  _______,                                _______,                                  _______,   _______),
+                  _______,  _______,                                _______,                                  _______,   MO(2)),
 
     [2] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/rules.mk b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/via_apc.c b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/matrix.c b/keyboards/cipulot/ec_prox/ansi_iso/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_prox/ansi_iso/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* 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
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/mcuconf.h b/keyboards/cipulot/ec_prox/ansi_iso/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/mcuconf.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/post_rules.mk b/keyboards/cipulot/ec_prox/ansi_iso/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_prox/ansi_iso/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/readme.md b/keyboards/cipulot/ec_prox/ansi_iso/readme.md
index 2afa33514ac..fe9d78537fa 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/readme.md
+++ b/keyboards/cipulot/ec_prox/ansi_iso/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 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 Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
+++ b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_prox/jis/config.h b/keyboards/cipulot/ec_prox/jis/config.h
index 1c6a836867d..6a686d74044 100644
--- a/keyboards/cipulot/ec_prox/jis/config.h
+++ b/keyboards/cipulot/ec_prox/jis/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,54 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { A7, B0, A4, A5, A6 }
-#define MATRIX_COL_CHANNELS \
-    { 2, 1, 0, 3, 5, 7, 4, 6 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
     { B4, B5, B6 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 B3
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 6 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 2, 1, 0, 3, 5, 7, 4, 6 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 2, 1, 0, 3, 5, 7 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A2
 #define ANALOG_PORT A1
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 149
+
 /* 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 DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.c b/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.c
deleted file mode 100644
index 81003dd36a4..00000000000
--- a/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    //Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < (sizeof(col_channels) - 2); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.h b/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_prox/jis/halconf.h b/keyboards/cipulot/ec_prox/jis/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_prox/jis/halconf.h
+++ b/keyboards/cipulot/ec_prox/jis/halconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/info.json
index 6016004b1ba..88067f9305e 100644
--- a/keyboards/cipulot/ec_prox/jis/info.json
+++ b/keyboards/cipulot/ec_prox/jis/info.json
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
@@ -52,79 +46,75 @@
     "layouts": {
         "LAYOUT_jp": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [1, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3},
-                {"matrix": [3, 5], "x": 6, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.5},
-                {"matrix": [4, 7], "x": 7.75, "y": 4},
-                {"matrix": [4, 8], "x": 8.75, "y": 4},
-                {"matrix": [4, 9], "x": 9.75, "y": 4},
-                {"matrix": [4, 10], "x": 10.75, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "1,13", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "3,0", "matrix": [3, 0], "w": 2, "x": 0, "y": 3},
+                {"label": "3,1", "matrix": [3, 1], "x": 2, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 3, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 4, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 5, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 6, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 7, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 8, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 9, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 10, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 11, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 12, "y": 3},
+                {"label": "3,12", "matrix": [3, 12], "x": 13, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "4,5", "matrix": [4, 5], "w": 2.5, "x": 5.25, "y": 4},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.75, "y": 4},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.75, "y": 4},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.75, "y": 4},
+                {"label": "4,11", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "4,12", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "4,13", "matrix": [4, 13], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c b/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
index 2a64063a0bc..88836af7804 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -21,28 +21,21 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [0] = LAYOUT_jp(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  JP_YEN,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_UP,   KC_RSFT,
-        MO(1),   JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,      KC_SPC,      JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+        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,  JP_YEN, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_Y, KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_H, KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_UP,   KC_RSFT,
+        MO(1),   JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,   KC_SPC,   JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_jp(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______,      _______,     _______, _______, MO(2),   _______, _______, _______, _______),
 
     [2] = LAYOUT_jp(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______, _______, _______),
-
-    [3] = LAYOUT_jp(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/via/config.h b/keyboards/cipulot/ec_prox/jis/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c b/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
index 2a64063a0bc..f793b355b23 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -21,31 +21,24 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [0] = LAYOUT_jp(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  JP_YEN,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_UP,   KC_RSFT,
-        MO(1),   JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,      KC_SPC,      JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+        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,  JP_YEN, 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_ENT,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_H, KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_UP,   KC_RSFT,
+        MO(1),   JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,   KC_SPC,   JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_jp(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_PENT,
+        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______,      _______,     _______, _______, MO(2),   _______, _______, _______, _______),
 
     [2] = LAYOUT_jp(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______, _______, _______),
-
-    [3] = LAYOUT_jp(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______, _______, _______)
     // clang-format on
 };
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/via/rules.mk b/keyboards/cipulot/ec_prox/jis/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/via/via_apc.c b/keyboards/cipulot/ec_prox/jis/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_prox/jis/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_prox/jis/matrix.c b/keyboards/cipulot/ec_prox/jis/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_prox/jis/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* 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
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_prox/jis/mcuconf.h b/keyboards/cipulot/ec_prox/jis/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_prox/jis/mcuconf.h
+++ b/keyboards/cipulot/ec_prox/jis/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_prox/jis/post_rules.mk b/keyboards/cipulot/ec_prox/jis/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_prox/jis/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_prox/jis/readme.md b/keyboards/cipulot/ec_prox/jis/readme.md
index f1fa471cc99..2f9c791f256 100644
--- a/keyboards/cipulot/ec_prox/jis/readme.md
+++ b/keyboards/cipulot/ec_prox/jis/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 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 Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_prox/jis/rules.mk b/keyboards/cipulot/ec_prox/jis/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/ec_prox/jis/rules.mk
+++ b/keyboards/cipulot/ec_prox/jis/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_theca/config.h b/keyboards/cipulot/ec_theca/config.h
index 481183b80c1..4b834fdff68 100644
--- a/keyboards/cipulot/ec_theca/config.h
+++ b/keyboards/cipulot/ec_theca/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,53 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B4, A14, B3, A15, B6, B5 }
-#define MATRIX_COL_CHANNELS \
-    { 3, 0, 1, 2, 6, 5, 7, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { C13, C14 }
+
+#define AMUX_SEL_PINS \
     { B7, B8, B9 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 C13
-#define APLEX_EN_PIN_1 C14
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 6, 5, 7, 4 }
+
+#define AMUX_1_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN B1
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 50
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define EECONFIG_KB_DATA_SIZE 201
+
 /* 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 DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_theca/ec_switch_matrix.c b/keyboards/cipulot/ec_theca/ec_switch_matrix.c
deleted file mode 100644
index fdf4479423f..00000000000
--- a/keyboards/cipulot/ec_theca/ec_switch_matrix.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-static inline void clear_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    //writePinLow(row_pins[row]);
-    clear_row();
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_theca/ec_switch_matrix.h b/keyboards/cipulot/ec_theca/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_theca/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_theca/halconf.h b/keyboards/cipulot/ec_theca/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_theca/halconf.h
+++ b/keyboards/cipulot/ec_theca/halconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_theca/info.json b/keyboards/cipulot/ec_theca/info.json
index a80a92a7f5d..fbd7d7ec471 100644
--- a/keyboards/cipulot/ec_theca/info.json
+++ b/keyboards/cipulot/ec_theca/info.json
@@ -8,7 +8,7 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "bootmagic": true,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
diff --git a/keyboards/cipulot/ec_theca/keymaps/default/keymap.c b/keyboards/cipulot/ec_theca/keymaps/default/keymap.c
index 2ad75a0f3e4..caadf93c1c4 100644
--- a/keyboards/cipulot/ec_theca/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_theca/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,                  KC_SPC,                            KC_RALT,  KC_RGUI,  MO(1),    KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
     [1] = LAYOUT_tkl_ansi(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan/keymap.c
index a8f569b189d..7945b62db9f 100644
--- a/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan/keymap.c
+++ b/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,                  KC_SPC,                                      KC_RALT,  MO(1),    KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
     [1] = LAYOUT_tkl_ansi_tsangan(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c b/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c
index 56548302ddc..7205d9fad09 100644
--- a/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c
+++ b/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,            KC_LALT,                  KC_SPC,                                      KC_RALT,            KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
     [1] = LAYOUT_tkl_ansi_wkl(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_theca/keymaps/via/config.h b/keyboards/cipulot/ec_theca/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_theca/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_theca/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_theca/keymaps/via/keymap.c b/keyboards/cipulot/ec_theca/keymaps/via/keymap.c
index a8fc1b961a6..ca11bf60fc8 100644
--- a/keyboards/cipulot/ec_theca/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_theca/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,                  KC_SPC,                            KC_RALT,  MO(1),    MO(1),    KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
     [1] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_theca/keymaps/via/rules.mk b/keyboards/cipulot/ec_theca/keymaps/via/rules.mk
index 72e314e6946..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_theca/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_theca/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += keyboards/cipulot/common/via_apc.c
diff --git a/keyboards/cipulot/ec_theca/matrix.c b/keyboards/cipulot/ec_theca/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_theca/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* 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
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_theca/mcuconf.h b/keyboards/cipulot/ec_theca/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_theca/mcuconf.h
+++ b/keyboards/cipulot/ec_theca/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_theca/post_rules.mk b/keyboards/cipulot/ec_theca/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_theca/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_theca/readme.md b/keyboards/cipulot/ec_theca/readme.md
index c25e498434c..47a70867fa2 100644
--- a/keyboards/cipulot/ec_theca/readme.md
+++ b/keyboards/cipulot/ec_theca/readme.md
@@ -18,8 +18,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 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**: Long short the exposed pads on the top of the PCB
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_theca/rules.mk b/keyboards/cipulot/ec_theca/rules.mk
index fc2dcf32ab1..70494b635f6 100644
--- a/keyboards/cipulot/ec_theca/rules.mk
+++ b/keyboards/cipulot/ec_theca/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_typek/config.h b/keyboards/cipulot/ec_typek/config.h
new file mode 100644
index 00000000000..a6619c600c8
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/config.h
@@ -0,0 +1,81 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B14, B13, B12, A6, A7 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B9, B8 }
+
+#define AMUX_SEL_PINS \
+    { B7, B6, B5 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 7, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7, 5 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A1
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 171
+
+// RGB & Indicators
+// PWM driver with direct memory access (DMA) support
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
+#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM1_UP
+
+#define RGBLIGHT_DEFAULT_VAL 200
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5)
+
+#define NUM_INDICATOR_INDEX 2
+#define CAPS_INDICATOR_INDEX 1
+#define SCROLL_INDICATOR_INDEX 0
diff --git a/keyboards/cipulot/ec_typek/ec_switch_matrix.c b/keyboards/cipulot/ec_typek/ec_switch_matrix.c
new file mode 100644
index 00000000000..da58a75bbcf
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/ec_switch_matrix.c
@@ -0,0 +1,318 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "analog.h"
+#include "atomic_util.h"
+#include "math.h"
+#include "print.h"
+#include "wait.h"
+
+#if defined(__AVR__)
+#    error "AVR platforms not supported due to a variety of reasons. Among them there are limited memory, limited number of pins and ADC not being able to give satisfactory results."
+#endif
+
+#define OPEN_DRAIN_SUPPORT defined(PAL_MODE_OUTPUT_OPENDRAIN)
+
+eeprom_ec_config_t eeprom_ec_config;
+ec_config_t        ec_config;
+
+// Pin and port array
+const pin_t row_pins[]                                 = MATRIX_ROW_PINS;
+const pin_t amux_sel_pins[]                            = AMUX_SEL_PINS;
+const pin_t amux_en_pins[]                             = AMUX_EN_PINS;
+const pin_t amux_n_col_sizes[]                         = AMUX_COL_CHANNELS_SIZES;
+const pin_t amux_n_col_channels[][AMUX_MAX_COLS_COUNT] = {AMUX_COL_CHANNELS};
+
+#define AMUX_SEL_PINS_COUNT ARRAY_SIZE(amux_sel_pins)
+#define EXPECTED_AMUX_SEL_PINS_COUNT ceil(log2(AMUX_MAX_COLS_COUNT)
+// Checks for the correctness of the configuration
+_Static_assert(ARRAY_SIZE(amux_en_pins) == AMUX_COUNT, "AMUX_EN_PINS doesn't have the minimum number of bits required to enable all the multiplexers available");
+// Check that number of select pins is enough to select all the channels
+_Static_assert(AMUX_SEL_PINS_COUNT == EXPECTED_AMUX_SEL_PINS_COUNT), "AMUX_SEL_PINS doesn't have the minimum number of bits required address all the channels");
+// Check that number of elements in AMUX_COL_CHANNELS_SIZES is enough to specify the number of channels for all the multiplexers available
+_Static_assert(ARRAY_SIZE(amux_n_col_sizes) == AMUX_COUNT, "AMUX_COL_CHANNELS_SIZES doesn't have the minimum number of elements required to specify the number of channels for all the multiplexers available");
+// static ec_config_t config;
+static uint16_t sw_value[MATRIX_ROWS][MATRIX_COLS];
+
+static adc_mux adcMux;
+
+// Initialize the row pins
+void init_row(void) {
+    // Set all row pins as output and low
+    for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) {
+        gpio_set_pin_output(row_pins[idx]);
+        gpio_write_pin_low(row_pins[idx]);
+    }
+}
+
+// Initialize the multiplexers
+void init_amux(void) {
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        gpio_set_pin_output(amux_en_pins[idx]);
+        gpio_write_pin_low(amux_en_pins[idx]);
+    }
+    for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) {
+        gpio_set_pin_output(amux_sel_pins[idx]);
+    }
+}
+
+// Select the multiplexer channel of the specified multiplexer
+void select_amux_channel(uint8_t channel, uint8_t col) {
+    // Get the channel for the specified multiplexer
+    uint8_t ch = amux_n_col_channels[channel][col];
+    // momentarily disable specified multiplexer
+    gpio_write_pin_high(amux_en_pins[channel]);
+    // Select the multiplexer channel
+    for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) {
+        gpio_write_pin(amux_sel_pins[i], ch & (1 << i));
+    }
+    // re enable specified multiplexer
+    gpio_write_pin_low(amux_en_pins[channel]);
+}
+
+// Disable all the unused multiplexers
+void disable_unused_amux(uint8_t channel) {
+    // disable all the other multiplexers apart from the current selected one
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        if (idx != channel) {
+            gpio_write_pin_high(amux_en_pins[idx]);
+        }
+    }
+}
+// Discharge the peak hold capacitor
+void discharge_capacitor(void) {
+#ifdef OPEN_DRAIN_SUPPORT
+    gpio_write_pin_low(DISCHARGE_PIN);
+#else
+    gpio_write_pin_low(DISCHARGE_PIN);
+    gpio_set_pin_output(DISCHARGE_PIN);
+#endif
+}
+
+// Charge the peak hold capacitor
+void charge_capacitor(uint8_t row) {
+#ifdef OPEN_DRAIN_SUPPORT
+    gpio_write_pin_high(DISCHARGE_PIN);
+#else
+    gpio_set_pin_input(DISCHARGE_PIN);
+#endif
+    gpio_write_pin_high(row_pins[row]);
+}
+
+// Initialize the peripherals pins
+int ec_init(void) {
+    // Initialize ADC
+    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
+    adcMux = pinToMux(ANALOG_PORT);
+
+    // Dummy call to make sure that adcStart() has been called in the appropriate state
+    adc_read(adcMux);
+
+    // Initialize discharge pin as discharge mode
+    gpio_write_pin_low(DISCHARGE_PIN);
+#ifdef OPEN_DRAIN_SUPPORT
+    gpio_set_pin_output_open_drain(DISCHARGE_PIN);
+#else
+    gpio_set_pin_output(DISCHARGE_PIN);
+#endif
+
+    // Initialize drive lines
+    init_row();
+
+    // Initialize AMUXs
+    init_amux();
+
+    return 0;
+}
+
+// Get the noise floor
+void ec_noise_floor(void) {
+    // Initialize the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] = 0;
+        }
+    }
+
+    // Sample the noise floor
+    for (uint8_t i = 0; i < DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; i++) {
+        for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+            disable_unused_amux(amux);
+            for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col = col + sum;
+                for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                    ec_config.noise_floor[row][adjusted_col] += ec_readkey_raw(amux, row, col);
+                }
+            }
+        }
+        wait_ms(5);
+    }
+
+    // Average the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] /= DEFAULT_NOISE_FLOOR_SAMPLING_COUNT;
+        }
+    }
+}
+
+// Scan key values and update matrix state
+bool ec_matrix_scan(matrix_row_t current_matrix[]) {
+    bool updated = false;
+
+    for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+        disable_unused_amux(amux);
+        for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col        = col + sum;
+                sw_value[row][adjusted_col] = ec_readkey_raw(amux, row, col);
+
+                if (ec_config.bottoming_calibration) {
+                    if (ec_config.bottoming_calibration_starter[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col]             = sw_value[row][adjusted_col];
+                        ec_config.bottoming_calibration_starter[row][adjusted_col] = false;
+                    } else if (sw_value[row][adjusted_col] > ec_config.bottoming_reading[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col];
+                    }
+                } else {
+                    updated |= ec_update_key(&current_matrix[row], row, adjusted_col, sw_value[row][adjusted_col]);
+                }
+            }
+        }
+    }
+
+    return ec_config.bottoming_calibration ? false : updated;
+}
+
+// Read the capacitive sensor value
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
+    uint16_t sw_value = 0;
+
+    // Select the multiplexer
+    select_amux_channel(channel, col);
+
+    // Set the row pin to low state to avoid ghosting
+    gpio_write_pin_low(row_pins[row]);
+
+    ATOMIC_BLOCK_FORCEON {
+        // Set the row pin to high state and have capacitor charge
+        charge_capacitor(row);
+        // Read the ADC value
+        sw_value = adc_read(adcMux);
+    }
+    // Discharge peak hold capacitor
+    discharge_capacitor();
+    // Waiting for the ghost capacitor to discharge fully
+    wait_us(DISCHARGE_TIME);
+
+    return sw_value;
+}
+
+// Update press/release state of key
+bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
+    bool current_state = (*current_row >> col) & 1;
+
+    // Real Time Noise Floor Calibration
+    if (sw_value < (ec_config.noise_floor[row][col] - NOISE_FLOOR_THRESHOLD)) {
+        uprintf("Noise Floor Change: %d, %d, %d\n", row, col, sw_value);
+        ec_config.noise_floor[row][col]                             = sw_value;
+        ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+    }
+
+    // Normal board-wide APC
+    if (ec_config.actuation_mode == 0) {
+        if (current_state && sw_value < ec_config.rescaled_mode_0_release_threshold[row][col]) {
+            *current_row &= ~(1 << col);
+            uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+        if ((!current_state) && sw_value > ec_config.rescaled_mode_0_actuation_threshold[row][col]) {
+            *current_row |= (1 << col);
+            uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+    }
+    // Rapid Trigger
+    else if (ec_config.actuation_mode == 1) {
+        // Is key in active zone?
+        if (sw_value > ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]) {
+            // Is key pressed while in active zone?
+            if (current_state) {
+                // Is the key still moving down?
+                if (sw_value > ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                }
+                // Has key moved up enough to be released?
+                else if (sw_value < ec_config.extremum[row][col] - ec_config.mode_1_release_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row &= ~(1 << col);
+                    uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+            // Key is not pressed while in active zone
+            else {
+                // Is the key still moving up?
+                if (sw_value < ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                }
+                // Has key moved down enough to be pressed?
+                else if (sw_value > ec_config.extremum[row][col] + ec_config.mode_1_actuation_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row |= (1 << col);
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+        }
+        // Key is not in active zone
+        else {
+            // Check to avoid key being stuck in pressed state near the active zone threshold
+            if (sw_value < ec_config.extremum[row][col]) {
+                ec_config.extremum[row][col] = sw_value;
+                *current_row &= ~(1 << col);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// Print the matrix values
+void ec_print_matrix(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", sw_value[row][col]);
+        }
+        uprintf("%4d\n", sw_value[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Rescale the value to a different range
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max) {
+    return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
diff --git a/keyboards/cipulot/ec_typek/ec_switch_matrix.h b/keyboards/cipulot/ec_typek/ec_switch_matrix.h
new file mode 100644
index 00000000000..fad20360bc7
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/ec_switch_matrix.h
@@ -0,0 +1,84 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "matrix.h"
+#include "eeconfig.h"
+#include "util.h"
+
+typedef struct _indicator_config_t {
+    uint8_t h;
+    uint8_t s;
+    uint8_t v;
+    bool    enabled;
+} indicator_config;
+
+typedef struct PACKED {
+    indicator_config num;
+    indicator_config caps;
+    indicator_config scroll;
+    uint8_t          actuation_mode;                              // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point
+    uint16_t         mode_0_actuation_threshold;                  // threshold for key press in mode 0
+    uint16_t         mode_0_release_threshold;                    // threshold for key release in mode 0
+    uint16_t         mode_1_initial_deadzone_offset;              // threshold for key press in mode 1
+    uint8_t          mode_1_actuation_offset;                // offset for key press in mode 1 and 2 (1-255)
+    uint8_t          mode_1_release_offset;                  // offset for key release in mode 1 and 2 (1-255)
+    uint16_t         bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading
+} eeprom_ec_config_t;
+
+typedef struct {
+    uint8_t  actuation_mode;                                                    // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point (it can be very near that baseline noise and be "full travel")
+    uint16_t mode_0_actuation_threshold;                                        // threshold for key press in mode 0
+    uint16_t mode_0_release_threshold;                                          // threshold for key release in mode 0
+    uint16_t mode_1_initial_deadzone_offset;                                    // threshold for key press in mode 1 (initial deadzone)
+    uint16_t rescaled_mode_0_actuation_threshold[MATRIX_ROWS][MATRIX_COLS];     // threshold for key press in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_0_release_threshold[MATRIX_ROWS][MATRIX_COLS];       // threshold for key release in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_1_initial_deadzone_offset[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 1 (initial deadzone) rescaled to actual scale
+    uint8_t  mode_1_actuation_offset;                                      // offset for key press in mode 1 (1-255)
+    uint8_t  mode_1_release_offset;                                        // offset for key release in mode 1 (1-255)
+    uint16_t extremum[MATRIX_ROWS][MATRIX_COLS];                                // extremum values for mode 1
+    uint16_t noise_floor[MATRIX_ROWS][MATRIX_COLS];                             // noise floor detected during startup
+    bool     bottoming_calibration;                                             // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    bool     bottoming_calibration_starter[MATRIX_ROWS][MATRIX_COLS];           // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS];                       // bottoming reading
+} ec_config_t;
+
+// Check if the size of the reserved persistent memory is the same as the size of struct eeprom_ec_config_t
+_Static_assert(sizeof(eeprom_ec_config_t) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
+
+extern eeprom_ec_config_t eeprom_ec_config;
+
+extern ec_config_t ec_config;
+
+void init_row(void);
+void init_amux(void);
+void select_amux_channel(uint8_t channel, uint8_t col);
+void disable_unused_amux(uint8_t channel);
+void discharge_capacitor(void);
+void charge_capacitor(uint8_t row);
+
+int      ec_init(void);
+void     ec_noise_floor(void);
+bool     ec_matrix_scan(matrix_row_t current_matrix[]);
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
+bool     ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
+void     ec_print_matrix(void);
+
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max);
+bool indicators_callback(void);
diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c
new file mode 100644
index 00000000000..035c90303ca
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/ec_typek.c
@@ -0,0 +1,119 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "quantum.h"
+
+void eeconfig_init_kb(void) {
+    // Default values
+    eeprom_ec_config.num.h                          = 0;
+    eeprom_ec_config.num.s                          = 0;
+    eeprom_ec_config.num.v                          = 60;
+    eeprom_ec_config.num.enabled                    = true;
+    eeprom_ec_config.caps.h                         = 0;
+    eeprom_ec_config.caps.s                         = 0;
+    eeprom_ec_config.caps.v                         = 60;
+    eeprom_ec_config.caps.enabled                   = true;
+    eeprom_ec_config.scroll.h                       = 0;
+    eeprom_ec_config.scroll.s                       = 0;
+    eeprom_ec_config.scroll.v                       = 60;
+    eeprom_ec_config.scroll.enabled                 = true;
+    eeprom_ec_config.actuation_mode                 = DEFAULT_ACTUATION_MODE;
+    eeprom_ec_config.mode_0_actuation_threshold     = DEFAULT_MODE_0_ACTUATION_LEVEL;
+    eeprom_ec_config.mode_0_release_threshold       = DEFAULT_MODE_0_RELEASE_LEVEL;
+    eeprom_ec_config.mode_1_initial_deadzone_offset = DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET;
+    eeprom_ec_config.mode_1_actuation_offset   = DEFAULT_MODE_1_ACTUATION_OFFSET;
+    eeprom_ec_config.mode_1_release_offset     = DEFAULT_MODE_1_RELEASE_OFFSET;
+
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            eeprom_ec_config.bottoming_reading[row][col] = DEFAULT_BOTTOMING_READING;
+        }
+    }
+    // Write default value to EEPROM now
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+
+    eeconfig_init_user();
+}
+
+// On Keyboard startup
+void keyboard_post_init_kb(void) {
+    // Read custom menu variables from memory
+    eeconfig_read_kb_datablock(&eeprom_ec_config);
+
+    // Set runtime values to EEPROM values
+    ec_config.actuation_mode                 = eeprom_ec_config.actuation_mode;
+    ec_config.mode_0_actuation_threshold     = eeprom_ec_config.mode_0_actuation_threshold;
+    ec_config.mode_0_release_threshold       = eeprom_ec_config.mode_0_release_threshold;
+    ec_config.mode_1_initial_deadzone_offset = eeprom_ec_config.mode_1_initial_deadzone_offset;
+    ec_config.mode_1_actuation_offset   = eeprom_ec_config.mode_1_actuation_offset;
+    ec_config.mode_1_release_offset     = eeprom_ec_config.mode_1_release_offset;
+    ec_config.bottoming_calibration          = false;
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.bottoming_calibration_starter[row][col]           = true;
+            ec_config.bottoming_reading[row][col]                       = eeprom_ec_config.bottoming_reading[row][col];
+            ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        }
+    }
+
+    // Set the RGB LEDs range that will be used for the effects
+    rgblight_set_effect_range(3, 66);
+    // Call the indicator callback to set the indicator color
+    indicators_callback();
+
+    keyboard_post_init_user();
+}
+
+// This function gets called when caps, num, scroll change
+bool led_update_kb(led_t led_state) {
+    indicators_callback();
+    return true;
+}
+
+// This function is called when layers change
+layer_state_t layer_state_set_user(layer_state_t state) {
+    indicators_callback();
+    return state;
+}
+
+// INDICATOR CALLBACK ------------------------------------------------------------------------------
+/* LED index to physical position
+ *
+ * LED2 | LED1 |  LED0
+ * -----+------+--------
+ * Num  | Caps | Scroll |
+ */
+bool indicators_callback(void) {
+    if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock))
+        sethsv(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]);
+    else
+        sethsv(0, 0, 0, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]);
+
+    if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock))
+        sethsv(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]);
+    else
+        sethsv(0, 0, 0, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]);
+
+    if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock))
+        sethsv(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]);
+    else
+        sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]);
+
+    return true;
+}
diff --git a/keyboards/cipulot/ec_typek/halconf.h b/keyboards/cipulot/ec_typek/halconf.h
new file mode 100644
index 00000000000..24de0954858
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/info.json
new file mode 100644
index 00000000000..e4642ee5553
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/info.json
@@ -0,0 +1,133 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Type-K",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 69,
+        "led_map": [0, 1, 2, 3, 4, 5, 66, 67, 68, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 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],
+        "max_brightness": 200
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BB4",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0.75, "y": 0},
+                {"matrix": [0, 0], "x": 2.5, "y": 0},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [0, 6], "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [2, 0], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 10.25, "y": 1},
+                {"matrix": [1, 8], "x": 11.25, "y": 1},
+                {"matrix": [1, 9], "x": 12.25, "y": 1},
+                {"matrix": [1, 10], "x": 13.25, "y": 1},
+                {"matrix": [1, 11], "x": 14.25, "y": 1},
+                {"matrix": [1, 12], "x": 15.25, "y": 1},
+                {"matrix": [1, 13], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 0.25, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 10.75, "y": 2},
+                {"matrix": [2, 8], "x": 11.75, "y": 2},
+                {"matrix": [2, 9], "x": 12.75, "y": 2},
+                {"matrix": [2, 10], "x": 13.75, "y": 2},
+                {"matrix": [2, 11], "x": 14.75, "y": 2},
+                {"matrix": [2, 12], "x": 15.75, "y": 2},
+                {"matrix": [2, 14], "x": 16.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4},
+                {"matrix": [4, 7], "x": 10, "y": 4},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 2},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_typek/keymaps/default/keymap.c b/keyboards/cipulot/ec_typek/keymaps/default/keymap.c
new file mode 100644
index 00000000000..e47e50680e0
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        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_BSLS,   KC_DEL,
+        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_BSPC,
+        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_ENTER,
+        KC_LGUI,  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,   MO(1),
+        KC_LCTL,                          KC_LALT,  KC_SPC,  KC_LGUI,           KC_RGUI,  KC_SPC,  KC_RALT,                                           MO(1)
+    ),
+    [1] = 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_HOME,  _______,  _______,  KC_UP,    _______,   _______,  _______,            _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  _______,  _______,  _______,
+        KC_END,   _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  _______,            _______,  _______,  _______,  _______,  _______,   _______,  _______,
+        _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        _______,                                _______,   _______,  _______,            _______,  _______,  MO(2),                                             _______
+    ),
+    [2] = LAYOUT(
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,                                _______,  _______,  _______,              _______,  _______,  _______,                                          _______)
+};
diff --git a/keyboards/cipulot/ec_typek/keymaps/via/keymap.c b/keyboards/cipulot/ec_typek/keymaps/via/keymap.c
new file mode 100644
index 00000000000..e47e50680e0
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        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_BSLS,   KC_DEL,
+        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_BSPC,
+        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_ENTER,
+        KC_LGUI,  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,   MO(1),
+        KC_LCTL,                          KC_LALT,  KC_SPC,  KC_LGUI,           KC_RGUI,  KC_SPC,  KC_RALT,                                           MO(1)
+    ),
+    [1] = 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_HOME,  _______,  _______,  KC_UP,    _______,   _______,  _______,            _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  _______,  _______,  _______,
+        KC_END,   _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  _______,            _______,  _______,  _______,  _______,  _______,   _______,  _______,
+        _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        _______,                                _______,   _______,  _______,            _______,  _______,  MO(2),                                             _______
+    ),
+    [2] = LAYOUT(
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,                                _______,  _______,  _______,              _______,  _______,  _______,                                          _______)
+};
diff --git a/keyboards/cipulot/ec_typek/keymaps/via/rules.mk b/keyboards/cipulot/ec_typek/keymaps/via/rules.mk
new file mode 100644
index 00000000000..b870b6349c0
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+
+SRC += via_ec_indicators.c
diff --git a/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c b/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c
new file mode 100644
index 00000000000..742dac0e6f1
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c
@@ -0,0 +1,502 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "keyboards/cipulot/common/eeprom_tools.h"
+#include "ec_switch_matrix.h"
+#include "action.h"
+#include "print.h"
+#include "via.h"
+
+#ifdef VIA_ENABLE
+
+void ec_rescale_values(uint8_t item);
+void ec_save_threshold_data(uint8_t option);
+void ec_save_bottoming_reading(void);
+void ec_show_calibration_data(void);
+void ec_clear_bottoming_calibration_data(void);
+
+// Declaring enums for VIA config menu
+enum via_enums {
+    // clang-format off
+    id_num_indicator_enabled    = 1,
+    id_num_indicator_brightness = 2,
+    id_num_indicator_color      = 3,
+    id_caps_indicator_enabled    = 4,
+    id_caps_indicator_brightness = 5,
+    id_caps_indicator_color      = 6,
+    id_scroll_indicator_enabled    = 7,
+    id_scroll_indicator_brightness = 8,
+    id_scroll_indicator_color      = 9,
+    id_actuation_mode = 10,
+    id_mode_0_actuation_threshold = 11,
+    id_mode_0_release_threshold = 12,
+    id_save_threshold_data = 13,
+    id_mode_1_initial_deadzone_offset = 14,
+    id_mode_1_actuation_offset = 15,
+    id_mode_1_release_offset = 16,
+    id_bottoming_calibration = 17,
+    id_noise_floor_calibration = 18,
+    id_show_calibration_data = 19,
+    id_clear_bottoming_calibration_data = 20
+    // clang-format on
+};
+
+// Handle the data received by the keyboard from the VIA menus
+void via_config_set_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_num_indicator_enabled: {
+            if (value_data[0] == 1) {
+                eeprom_ec_config.num.enabled = true;
+                uprintf("#########################\n");
+                uprintf("# Num indicator enabled #\n");
+                uprintf("#########################\n");
+            } else {
+                eeprom_ec_config.num.enabled = false;
+                uprintf("##########################\n");
+                uprintf("# Num indicator disabled #\n");
+                uprintf("##########################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.enabled);
+            break;
+        }
+        case id_num_indicator_brightness: {
+            eeprom_ec_config.num.v = value_data[0];
+            uprintf("Num indicator brightness: %d\n", eeprom_ec_config.num.v);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.v);
+            break;
+        }
+        case id_num_indicator_color: {
+            eeprom_ec_config.num.h = value_data[0];
+            eeprom_ec_config.num.s = value_data[1];
+            uprintf("Num indicator color: %d, %d\n", eeprom_ec_config.num.h, eeprom_ec_config.num.s);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.h);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.s);
+            break;
+        }
+        case id_caps_indicator_enabled: {
+            if (value_data[0] == 1) {
+                eeprom_ec_config.caps.enabled = true;
+                uprintf("##########################\n");
+                uprintf("# Caps indicator enabled #\n");
+                uprintf("##########################\n");
+            } else {
+                eeprom_ec_config.caps.enabled = false;
+                uprintf("###########################\n");
+                uprintf("# Caps indicator disabled #\n");
+                uprintf("###########################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.enabled);
+            break;
+        }
+        case id_caps_indicator_brightness: {
+            eeprom_ec_config.caps.v = value_data[0];
+            uprintf("Caps indicator brightness: %d\n", eeprom_ec_config.caps.v);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.v);
+            break;
+        }
+        case id_caps_indicator_color: {
+            eeprom_ec_config.caps.h = value_data[0];
+            eeprom_ec_config.caps.s = value_data[1];
+            uprintf("Caps indicator color: %d, %d\n", eeprom_ec_config.caps.h, eeprom_ec_config.caps.s);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.h);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.s);
+            break;
+        }
+        case id_scroll_indicator_enabled: {
+            if (value_data[0] == 1) {
+                eeprom_ec_config.scroll.enabled = true;
+                uprintf("############################\n");
+                uprintf("# Scroll indicator enabled #\n");
+                uprintf("############################\n");
+            } else {
+                eeprom_ec_config.scroll.enabled = false;
+                uprintf("#############################\n");
+                uprintf("# Scroll indicator disabled #\n");
+                uprintf("#############################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.enabled);
+            break;
+        }
+        case id_scroll_indicator_brightness: {
+            eeprom_ec_config.scroll.v = value_data[0];
+            uprintf("Scroll indicator brightness: %d\n", eeprom_ec_config.scroll.v);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.v);
+            break;
+        }
+        case id_scroll_indicator_color: {
+            eeprom_ec_config.scroll.h = value_data[0];
+            eeprom_ec_config.scroll.s = value_data[1];
+            uprintf("Scroll indicator color: %d, %d\n", eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.h);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.s);
+            break;
+        }
+        case id_actuation_mode: {
+            eeprom_ec_config.actuation_mode = value_data[0];
+            ec_config.actuation_mode        = eeprom_ec_config.actuation_mode;
+            if (ec_config.actuation_mode == 0) {
+                uprintf("#########################\n");
+                uprintf("#  Actuation Mode: APC  #\n");
+                uprintf("#########################\n");
+            } else if (ec_config.actuation_mode == 1) {
+                uprintf("#################################\n");
+                uprintf("# Actuation Mode: Rapid Trigger #\n");
+                uprintf("#################################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, actuation_mode);
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            ec_config.mode_0_actuation_threshold = value_data[1] | (value_data[0] << 8);
+            uprintf("APC Mode Actuation Threshold: %d\n", ec_config.mode_0_actuation_threshold);
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            eeprom_ec_config.mode_0_release_threshold = value_data[1] | (value_data[0] << 8);
+            ec_config.mode_0_release_threshold        = eeprom_ec_config.mode_0_release_threshold;
+            uprintf("APC Mode Release Threshold: %d\n", ec_config.mode_0_release_threshold);
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            ec_config.mode_1_initial_deadzone_offset = value_data[1] | (value_data[0] << 8);
+            uprintf("Rapid Trigger Mode Initial Deadzone Offset: %d\n", ec_config.mode_1_initial_deadzone_offset);
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            ec_config.mode_1_actuation_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Actuation Sensitivity: %d\n", ec_config.mode_1_actuation_offset);
+            break;
+        }
+        case id_mode_1_release_offset: {
+            ec_config.mode_1_release_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Release Sensitivity: %d\n", ec_config.mode_1_release_offset);
+            break;
+        }
+        case id_bottoming_calibration: {
+            if (value_data[0] == 1) {
+                ec_config.bottoming_calibration = true;
+                uprintf("##############################\n");
+                uprintf("# Bottoming calibration mode #\n");
+                uprintf("##############################\n");
+            } else {
+                ec_config.bottoming_calibration = false;
+                ec_save_bottoming_reading();
+                uprintf("## Bottoming calibration done ##\n");
+                ec_show_calibration_data();
+            }
+            break;
+        }
+        case id_save_threshold_data: {
+            ec_save_threshold_data(value_data[0]);
+            break;
+        }
+        case id_noise_floor_calibration: {
+            if (value_data[0] == 0) {
+                ec_noise_floor();
+                ec_rescale_values(0);
+                ec_rescale_values(1);
+                ec_rescale_values(2);
+                uprintf("#############################\n");
+                uprintf("# Noise floor data acquired #\n");
+                uprintf("#############################\n");
+                break;
+            }
+        }
+        case id_show_calibration_data: {
+            // Show calibration data once if the user toggle the switch
+            if (value_data[0] == 0) {
+                ec_show_calibration_data();
+                break;
+            }
+        }
+        case id_clear_bottoming_calibration_data: {
+            if (value_data[0] == 0) {
+                ec_clear_bottoming_calibration_data();
+            }
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+
+    // Call the indicator callback to set the indicator color
+    indicators_callback();
+}
+
+// Handle the data sent by the keyboard to the VIA menus
+void via_config_get_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_num_indicator_enabled: {
+            value_data[0] = eeprom_ec_config.num.enabled;
+            break;
+        }
+        case id_num_indicator_brightness: {
+            value_data[0] = eeprom_ec_config.num.v;
+            break;
+        }
+        case id_num_indicator_color: {
+            value_data[0] = eeprom_ec_config.num.h;
+            value_data[1] = eeprom_ec_config.num.s;
+            break;
+        }
+        case id_caps_indicator_enabled: {
+            value_data[0] = eeprom_ec_config.caps.enabled;
+            break;
+        }
+        case id_caps_indicator_brightness: {
+            value_data[0] = eeprom_ec_config.caps.v;
+            break;
+        }
+        case id_caps_indicator_color: {
+            value_data[0] = eeprom_ec_config.caps.h;
+            value_data[1] = eeprom_ec_config.caps.s;
+            break;
+        }
+        case id_scroll_indicator_enabled: {
+            value_data[0] = eeprom_ec_config.scroll.enabled;
+            break;
+        }
+        case id_scroll_indicator_brightness: {
+            value_data[0] = eeprom_ec_config.scroll.v;
+            break;
+        }
+        case id_scroll_indicator_color: {
+            value_data[0] = eeprom_ec_config.scroll.h;
+            value_data[1] = eeprom_ec_config.scroll.s;
+            break;
+        }
+        case id_actuation_mode: {
+            value_data[0] = eeprom_ec_config.actuation_mode;
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_actuation_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_actuation_threshold & 0xFF;
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_release_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_release_threshold & 0xFF;
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_initial_deadzone_offset >> 8;
+            value_data[1] = eeprom_ec_config.mode_1_initial_deadzone_offset & 0xFF;
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_actuation_offset;
+            break;
+        }
+        case id_mode_1_release_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_release_offset;
+            break;
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+}
+
+// Handle the commands sent and received by the keyboard with VIA
+void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *channel_id        = &(data[1]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    if (*channel_id == id_custom_channel) {
+        switch (*command_id) {
+            case id_custom_set_value: {
+                via_config_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value: {
+                via_config_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save: {
+                // Bypass the save function in favor of pinpointed saves
+                break;
+            }
+            default: {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+        return;
+    }
+
+    *command_id = id_unhandled;
+}
+
+// Rescale the values received by VIA to fit the new range
+void ec_rescale_values(uint8_t item) {
+    switch (item) {
+        // Rescale the APC mode actuation thresholds
+        case 0:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the APC mode release thresholds
+        case 1:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the Rapid Trigger mode initial deadzone offsets
+        case 2:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+
+        default:
+            // Unhandled item.
+            break;
+    }
+}
+
+void ec_save_threshold_data(uint8_t option) {
+    // Save APC mode thresholds and rescale them for runtime usage
+    if (option == 0) {
+        eeprom_ec_config.mode_0_actuation_threshold = ec_config.mode_0_actuation_threshold;
+        eeprom_ec_config.mode_0_release_threshold   = ec_config.mode_0_release_threshold;
+        ec_rescale_values(0);
+        ec_rescale_values(1);
+    }
+    // Save Rapid Trigger mode thresholds and rescale them for runtime usage
+    else if (option == 1) {
+        eeprom_ec_config.mode_1_initial_deadzone_offset = ec_config.mode_1_initial_deadzone_offset;
+        ec_rescale_values(2);
+    }
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+    uprintf("####################################\n");
+    uprintf("# New thresholds applied and saved #\n");
+    uprintf("####################################\n");
+}
+
+// Save the bottoming reading
+void ec_save_bottoming_reading(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            // If the bottom reading doesn't go over the noise floor by 100, it is likely that:
+            // 1. The key is not actually in the matrix
+            // 2. The key is on an alternative layout, therefore not being pressed
+            // 3. The key in in the current layout but not being pressed
+            if (ec_config.bottoming_reading[row][col] < (ec_config.noise_floor[row][col] + 100)) {
+                eeprom_ec_config.bottoming_reading[row][col] = 1023;
+            } else {
+                eeprom_ec_config.bottoming_reading[row][col] = ec_config.bottoming_reading[row][col];
+            }
+        }
+    }
+    // Rescale the values to fit the new range for runtime usage
+    ec_rescale_values(0);
+    ec_rescale_values(1);
+    ec_rescale_values(2);
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+}
+
+// Show the calibration data
+void ec_show_calibration_data(void) {
+    uprintf("\n###############\n");
+    uprintf("# Noise Floor #\n");
+    uprintf("###############\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.noise_floor[row][col]);
+        }
+        uprintf("%4d\n", ec_config.noise_floor[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################\n");
+    uprintf("# Bottoming Readings #\n");
+    uprintf("######################\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", eeprom_ec_config.bottoming_reading[row][col]);
+        }
+        uprintf("%4d\n", eeprom_ec_config.bottoming_reading[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Actuation Points #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Actuation Point: %4d\n", ec_config.mode_0_actuation_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_actuation_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_actuation_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Release Points   #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Release Point: %4d\n", ec_config.mode_0_release_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_release_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_release_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n#######################################################\n");
+    uprintf("# Rescaled Rapid Trigger Mode Initial Deadzone Offset #\n");
+    uprintf("#######################################################\n");
+    uprintf("Original Rapid Trigger Mode Initial Deadzone Offset: %4d\n", ec_config.mode_1_initial_deadzone_offset);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_1_initial_deadzone_offset[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Clear the calibration data
+void ec_clear_bottoming_calibration_data(void) {
+    // Clear the EEPROM data
+    eeconfig_init_kb();
+
+    // Reset the runtime values to the EEPROM values
+    keyboard_post_init_kb();
+
+    uprintf("######################################\n");
+    uprintf("# Bottoming calibration data cleared #\n");
+    uprintf("######################################\n");
+}
+
+#endif // VIA_ENABLE
diff --git a/keyboards/cipulot/ec_typek/matrix.c b/keyboards/cipulot/ec_typek/matrix.c
new file mode 100644
index 00000000000..cfa2efe0506
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/matrix.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "matrix.h"
+
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
+extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
+
+// Custom matrix init function
+void matrix_init_custom(void) {
+    // Initialize EC
+    ec_init();
+
+    // Get the noise floor at boot
+    ec_noise_floor();
+}
+
+// Custom matrix scan function
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool updated = ec_matrix_scan(current_matrix);
+
+    return updated;
+}
+
+// Bootmagic overriden to avoid conflicts with EC
+void bootmagic_scan(void) {
+    ;
+}
diff --git a/keyboards/cipulot/ec_typek/mcuconf.h b/keyboards/cipulot/ec_typek/mcuconf.h
new file mode 100644
index 00000000000..5f9ecca48dd
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/mcuconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
+#undef STM32_PWM_USE_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/cipulot/ec_typek/readme.md b/keyboards/cipulot/ec_typek/readme.md
new file mode 100644
index 00000000000..44f6fd89440
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/readme.md
@@ -0,0 +1,26 @@
+# EC Type-K
+
+![EC Type-K](https://i.imgur.com/hFQ0qCfh.png)
+
+EC Type-K Keyboard by gok.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: EC Type-K
+* Hardware Availability: [gok](https://www.gok.design/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_typek:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_typek: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 Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_typek/rules.mk b/keyboards/cipulot/ec_typek/rules.mk
new file mode 100644
index 00000000000..1ff311f102d
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/rules.mk
@@ -0,0 +1,4 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+SRC += matrix.c ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/kawayo/config.h b/keyboards/cipulot/kawayo/config.h
index a87365e69db..a08011b9cf9 100644
--- a/keyboards/cipulot/kawayo/config.h
+++ b/keyboards/cipulot/kawayo/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/default/keymap.c b/keyboards/cipulot/kawayo/keymaps/default/keymap.c
index 5d4bf4a35be..06cf47bc5fc 100644
--- a/keyboards/cipulot/kawayo/keymaps/default/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker/keymap.c b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker/keymap.c
index c160269ae85..2af88d24ff5 100644
--- a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan/keymap.c b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan/keymap.c
index 32a4389d3fc..5db2d32b927 100644
--- a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan_split_bs/keymap.c b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan_split_bs/keymap.c
index ca65d38440e..fe290754838 100644
--- a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan_split_bs/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan_split_bs/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/via/keymap.c b/keyboards/cipulot/kawayo/keymaps/via/keymap.c
index 5d4bf4a35be..06cf47bc5fc 100644
--- a/keyboards/cipulot/kawayo/keymaps/via/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/mnk_60_ec/config.h b/keyboards/cipulot/mnk_60_ec/config.h
new file mode 100644
index 00000000000..1a7df486572
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_ROW_PINS \
+    { B13, B14, B15, A8, A15 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
+    { B6, B5, B4 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 6 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 4, 5, 6, 7 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 4, 5 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A3
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 149
diff --git a/keyboards/cipulot/mnk_60_ec/halconf.h b/keyboards/cipulot/mnk_60_ec/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/mnk_60_ec/info.json b/keyboards/cipulot/mnk_60_ec/info.json
new file mode 100644
index 00000000000..802e216f672
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/info.json
@@ -0,0 +1,225 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "MNK 60 EC",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F401",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BB6",
+        "vid": "0x6369"
+    },
+    "community_layouts": ["60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c
new file mode 100644
index 00000000000..6e2678d4f73
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_60_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_BSLS,  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_DEL,
+        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_ENTER,
+        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_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
+
+    [1] = LAYOUT_60_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,   KC_INS,  KC_DEL,
+        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  KC_BSPC,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),    KC_SLSH,  KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,  KC_DOWN,   _______,   _______,
+                  _______,  _______,                                _______,                                  _______,   MO(2)),
+
+    [2] = LAYOUT_60_hhkb(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                  _______,  _______,                                _______,                                _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c
new file mode 100644
index 00000000000..08599b93d3a
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [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_BSLS,  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_BSPC,
+        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_ENTER,
+        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_RCTL,  KC_RGUI,  KC_RALT),
+
+    [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,   KC_INS,   KC_DEL,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),    KC_SLSH,  KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,  KC_DOWN,   _______,   _______,
+        _______,  _______,  _______,                                _______,                                  _______,  MO(2),     _______),
+
+    [2] = LAYOUT_60_tsangan_hhkb(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c
new file mode 100644
index 00000000000..08599b93d3a
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [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_BSLS,  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_BSPC,
+        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_ENTER,
+        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_RCTL,  KC_RGUI,  KC_RALT),
+
+    [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,   KC_INS,   KC_DEL,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),    KC_SLSH,  KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,  KC_DOWN,   _______,   _______,
+        _______,  _______,  _______,                                _______,                                  _______,  MO(2),     _______),
+
+    [2] = LAYOUT_60_tsangan_hhkb(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/rules.mk b/keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/rules.mk
rename to keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk
diff --git a/keyboards/cipulot/mnk_60_ec/mcuconf.h b/keyboards/cipulot/mnk_60_ec/mcuconf.h
new file mode 100644
index 00000000000..fa3c955e0d8
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/cipulot/mnk_60_ec/post_rules.mk b/keyboards/cipulot/mnk_60_ec/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/mnk_60_ec/readme.md b/keyboards/cipulot/mnk_60_ec/readme.md
new file mode 100644
index 00000000000..85a770f1518
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/readme.md
@@ -0,0 +1,26 @@
+# MNK 60 EC
+
+![MNK 60 EC PCB](https://i.imgur.com/UpkCUKFh.jpeg)
+
+EC version of the Monokei MNK 66.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: MNK 60 EC PCB
+* Hardware Availability: [Monokei](https://monokei.co/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/mnk_60_ec:default
+
+Flashing example for this keyboard:
+
+    make cipulot/mnk_60_ec: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**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/mnk_60_ec/rules.mk b/keyboards/cipulot/mnk_60_ec/rules.mk
new file mode 100644
index 00000000000..ce525670a68
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/mnk_65_ec/config.h b/keyboards/cipulot/mnk_65_ec/config.h
new file mode 100644
index 00000000000..01d1248c436
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B14, B15, A8, B12, A15 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
+    { B6, B5, B4 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 4, 5, 6, 7 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 4, 5, 6 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A3
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 159
diff --git a/keyboards/cipulot/mnk_65_ec/halconf.h b/keyboards/cipulot/mnk_65_ec/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/mnk_65_ec/info.json b/keyboards/cipulot/mnk_65_ec/info.json
new file mode 100644
index 00000000000..5427601f760
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/info.json
@@ -0,0 +1,100 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "MNK 65 EC",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F401",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BB5",
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c b/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c
new file mode 100644
index 00000000000..03b9c3de33e
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_65_ansi_blocker_tsangan(
+        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(1),              KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker_tsangan(
+        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_PSCR,  KC_SCRL,  KC_PAUS,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,            _______,  _______,  _______
+    ),
+    [2] = LAYOUT_65_ansi_blocker_tsangan(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,            _______,  _______,  _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c b/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c
new file mode 100644
index 00000000000..03b9c3de33e
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_65_ansi_blocker_tsangan(
+        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(1),              KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker_tsangan(
+        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_PSCR,  KC_SCRL,  KC_PAUS,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,            _______,  _______,  _______
+    ),
+    [2] = LAYOUT_65_ansi_blocker_tsangan(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,            _______,  _______,  _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/kprepublic/bm80v2/keymaps/smooted/rules.mk b/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm80v2/keymaps/smooted/rules.mk
rename to keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk
diff --git a/keyboards/cipulot/mnk_65_ec/mcuconf.h b/keyboards/cipulot/mnk_65_ec/mcuconf.h
new file mode 100644
index 00000000000..fa3c955e0d8
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/cipulot/mnk_65_ec/post_rules.mk b/keyboards/cipulot/mnk_65_ec/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/mnk_65_ec/readme.md b/keyboards/cipulot/mnk_65_ec/readme.md
new file mode 100644
index 00000000000..aeedcc51c7e
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/readme.md
@@ -0,0 +1,26 @@
+# Monokei MNK 65 EC
+
+![MNK 65 EC PCB](https://i.imgur.com/k5ZvGhth.jpeg)
+
+EC version of the Monokei MNK 65.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: Monokei MNK 65 EC
+* Hardware Availability: [Monokei](https://monokei.co/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/mnk_65_ec:default
+
+Flashing example for this keyboard:
+
+    make cipulot/mnk_65_ec: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**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/mnk_65_ec/rules.mk b/keyboards/cipulot/mnk_65_ec/rules.mk
new file mode 100644
index 00000000000..ce525670a68
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/rf_r1_8_9xu/config.h b/keyboards/cipulot/rf_r1_8_9xu/config.h
index 915348b3f48..fbd65f259fd 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/config.h
+++ b/keyboards/cipulot/rf_r1_8_9xu/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,53 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B15, A8, B13, B12, B14, B0 }
-#define MATRIX_COL_CHANNELS \
-    { 3, 0, 1, 2, 4, 6, 7, 5 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, A6 }
+
+#define AMUX_SEL_PINS \
     { B4, B5, B6 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 A6
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7, 5 }
+
+#define AMUX_1_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A4
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define EECONFIG_KB_DATA_SIZE 201
+
 /* 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 DEFAULT_ACTUATION_LEVEL 700
-#define DEFAULT_RELEASE_LEVEL 650
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.c b/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.c
deleted file mode 100644
index 3f25e365c0e..00000000000
--- a/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    //Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.h b/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/rf_r1_8_9xu/halconf.h b/keyboards/cipulot/rf_r1_8_9xu/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/halconf.h
+++ b/keyboards/cipulot/rf_r1_8_9xu/halconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/info.json
index eb0220f6779..6d3ab8b7091 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/info.json
+++ b/keyboards/cipulot/rf_r1_8_9xu/info.json
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "indicators": {
         "caps_lock": "B3",
         "scroll_lock": "A14"
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/default/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/default/keymap.c
index 6e39d6d4446..983bdefe8a9 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/default/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -29,23 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,                KC_SPC,                JP_KANA, KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_all(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_ansi_tsangan/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_ansi_tsangan/keymap.c
index d9041eae20f..ba948b4fc12 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_ansi_tsangan/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_ansi_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,23 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                                   KC_RALT, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_tkl_ansi_tsangan(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                                     _______, _______, _______,   _______, _______, _______),
-
-    [2] = LAYOUT_tkl_ansi_tsangan(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                                     _______, _______, _______,   _______, _______, _______),
-
-    [3] = LAYOUT_tkl_ansi_tsangan(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_iso_tsangan/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_iso_tsangan/keymap.c
index 4bbcb132990..1689d44d408 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_iso_tsangan/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_iso_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,23 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                                 KC_RALT, MO(1),   KC_RCTL,   KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_tkl_iso_tsangan(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,            _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______,                            _______,                                      _______, _______, _______,   _______, _______, _______),
-
-    [2] = LAYOUT_tkl_iso_tsangan(
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______,                            _______,                                      _______, _______, _______,   _______, _______, _______),
-
-    [3] = LAYOUT_tkl_iso_tsangan(
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,            _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_jis/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_jis/keymap.c
index df2be5eef79..e44575f74f9 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_jis/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_jis/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -29,23 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,               KC_SPC,                 JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_tkl_jis(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [2] = LAYOUT_tkl_jis(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [3] = LAYOUT_tkl_jis(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/config.h b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/config.h
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/keymap.c
index 6e39d6d4446..983bdefe8a9 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -29,23 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,                KC_SPC,                JP_KANA, KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_all(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/rules.mk b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/rules.mk
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/via_apc.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/rf_r1_8_9xu/matrix.c b/keyboards/cipulot/rf_r1_8_9xu/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/rf_r1_8_9xu/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* 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
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/rf_r1_8_9xu/mcuconf.h b/keyboards/cipulot/rf_r1_8_9xu/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/mcuconf.h
+++ b/keyboards/cipulot/rf_r1_8_9xu/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * 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
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/post_rules.mk b/keyboards/cipulot/rf_r1_8_9xu/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/rf_r1_8_9xu/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/rf_r1_8_9xu/readme.md b/keyboards/cipulot/rf_r1_8_9xu/readme.md
index 6e5a8c9f3eb..1491de12da0 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/readme.md
+++ b/keyboards/cipulot/rf_r1_8_9xu/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 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 Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/rf_r1_8_9xu/rules.mk b/keyboards/cipulot/rf_r1_8_9xu/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/rules.mk
+++ b/keyboards/cipulot/rf_r1_8_9xu/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/clickety_split/leeloo/keymaps/default/config.h b/keyboards/clickety_split/leeloo/keymaps/default/config.h
index e41b3d34aaa..2fa2ed15b65 100644
--- a/keyboards/clickety_split/leeloo/keymaps/default/config.h
+++ b/keyboards/clickety_split/leeloo/keymaps/default/config.h
@@ -23,7 +23,7 @@
     #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_SLEEP      // turn off effects when suspended
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
     
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 115   // limits maximum brightness of LEDs to 150 out of 255.
diff --git a/keyboards/clickety_split/leeloo/rev2/config.h b/keyboards/clickety_split/leeloo/rev2/config.h
deleted file mode 100644
index 2aa1acd9721..00000000000
--- a/keyboards/clickety_split/leeloo/rev2/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2023 Clickety Split 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
-
-#    define RGB_MATRIX_LED_COUNT 74
-#    define RGB_MATRIX_SPLIT {37, 37}
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/clickety_split/leeloo/rev2/info.json b/keyboards/clickety_split/leeloo/rev2/info.json
index 6db77714a43..cab643aad8c 100644
--- a/keyboards/clickety_split/leeloo/rev2/info.json
+++ b/keyboards/clickety_split/leeloo/rev2/info.json
@@ -99,6 +99,8 @@
           {"flags": 4, "matrix": [6, 0], "x": 224, "y": 16},  // R LB72 | SW36
           {"flags": 4, "matrix": [7, 0], "x": 224, "y": 32},  // R LB73 | SW42
           {"flags": 4, "matrix": [8, 0], "x": 224, "y": 48}   // R LB74 | SW48
-        ]
+        ],
+        "split_count": [37, 37],
+        "sleep": true
     }
-  }
+}
diff --git a/keyboards/clickety_split/leeloo/rev3/config.h b/keyboards/clickety_split/leeloo/rev3/config.h
deleted file mode 100644
index ac931502214..00000000000
--- a/keyboards/clickety_split/leeloo/rev3/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2023 Clickety Split 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
-
-#    define RGB_MATRIX_LED_COUNT 58
-#    define RGB_MATRIX_SPLIT {29, 29}
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/clickety_split/leeloo/rev3/info.json b/keyboards/clickety_split/leeloo/rev3/info.json
index 2c92f5226ef..d738fffe9e7 100644
--- a/keyboards/clickety_split/leeloo/rev3/info.json
+++ b/keyboards/clickety_split/leeloo/rev3/info.json
@@ -83,6 +83,8 @@
           {"flags": 4, "matrix": [6, 0], "x": 224, "y": 16},  // R LB56 | SW36
           {"flags": 4, "matrix": [7, 0], "x": 224, "y": 32},  // R LB57 | SW42
           {"flags": 4, "matrix": [8, 0], "x": 224, "y": 48}   // R LB58 | SW48
-        ]
+        ],
+        "split_count": [29, 29],
+        "sleep": true
     }
-  }
+}
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c
deleted file mode 100644
index bc54d9da4a3..00000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@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 custom_keycodes {
-    MACRO01 = SAFE_RANGE,
-    MACRO02,
-    MACRO03,
-    MACRO04,
-    MACRO05,
-    MACRO06,
-    MACRO07,
-    MACRO08,
-    MACRO09,
-    MACRO10,
-    MACRO11,
-    MACRO12,
-    MACRO13,
-    MACRO14,
-    MACRO15,
-    MACRO16,
-    MACRO17,
-    MACRO18,
-    MACRO19,
-    MACRO20,
-    MACRO21,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT(
-      MACRO01, MACRO02, MACRO03, MACRO04,       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_SCRL, KC_PAUS, KC_INS,
-
-      MACRO05, MACRO06, MACRO07, MACRO08,      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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-      MACRO09, MACRO10, MACRO11, MACRO12,      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_P7, KC_P8, KC_P9, KC_PSLS,
-               MACRO13, MACRO14, MACRO15,      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_P4, KC_P5, KC_P6,
-      MACRO16, MACRO17, MACRO18, MACRO19,   KC_UP,  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_P1, KC_P2, KC_P3, KC_PENT,
-               MACRO20, MACRO21,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0, KC_PDOT
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case MACRO01:
-                SEND_STRING("This is macro 01");
-                return false;
-            case MACRO02:
-                SEND_STRING("This is macro 02");
-                return false;
-            case MACRO03:
-                SEND_STRING("This is macro 03");
-                return false;
-            case MACRO04:
-                SEND_STRING("This is macro 04");
-                return false;
-            case MACRO05:
-                SEND_STRING("This is macro 05");
-                return false;
-            case MACRO06:
-                SEND_STRING("This is macro 06");
-                return false;
-            case MACRO07:
-                SEND_STRING("This is macro 07");
-                return false;
-            case MACRO08:
-                SEND_STRING("This is macro 08");
-                return false;
-            case MACRO09:
-                SEND_STRING("This is macro 09");
-                return false;
-            case MACRO10:
-                SEND_STRING("This is macro 10");
-                return false;
-            case MACRO11:
-                SEND_STRING("This is macro 11");
-                return false;
-            case MACRO12:
-                SEND_STRING("This is macro 12");
-                return false;
-            case MACRO13:
-                SEND_STRING("This is macro 13");
-                return false;
-            case MACRO14:
-                SEND_STRING("This is macro 14");
-                return false;
-            case MACRO15:
-                SEND_STRING("This is macro 15");
-                return false;
-            case MACRO16:
-                SEND_STRING("This is macro 16");
-                return false;
-            case MACRO17:
-                SEND_STRING("This is macro 17");
-                return false;
-            case MACRO18:
-                SEND_STRING("This is macro 18");
-                return false;
-            case MACRO19:
-                SEND_STRING("This is macro 19");
-                return false;
-            case MACRO20:
-                SEND_STRING("This is macro 20");
-                return false;
-            case MACRO21:
-                SEND_STRING("This is macro 21");
-                return false;
-        }
-    }
-    return true;
-};
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/macroboard/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/macroboard/readme.md
deleted file mode 100644
index 61c9468e7dc..00000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/macroboard/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# A macro keymap template
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c
deleted file mode 100644
index 7764087b0f7..00000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@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_NO,   KC_ACL0, KC_ACL1, KC_ACL2,       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_SCRL, KC_PAUS, KC_INS,
-
-      KC_NO,   KC_NO,   KC_BTN4, KC_BTN5,      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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-      KC_WH_U, KC_NO,   KC_MS_U, KC_NO,        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_P7, KC_P8, KC_P9, KC_PSLS,
-               KC_MS_L, KC_BTN3, KC_MS_R,      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_P4, KC_P5, KC_P6,
-      KC_WH_D, KC_BTN1, KC_MS_D, KC_BTN2,   KC_UP,  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_P1, KC_P2, KC_P3, KC_PENT,
-               KC_WH_L, KC_WH_R,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_P0, KC_PDOT
-)
-};
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/readme.md
deleted file mode 100644
index 41304eca5e9..00000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Mouse keys in the left numpad
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c
deleted file mode 100644
index dc55c592877..00000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@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_HOME, KC_END,  KC_PGUP, KC_PGDN,       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_SCRL, KC_PAUS, KC_INS,
-
-      KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,      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_NO,   KC_ACL0, KC_ACL1, KC_ACL2,
-      KC_PPLS, KC_P7,   KC_P8,   KC_P9,        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_NO,   KC_MS_U, KC_NO,   KC_WH_U,
-               KC_P4,   KC_P5,   KC_P6,        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_MS_L, KC_BTN3, KC_MS_R,
-      KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,  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_BTN1, KC_MS_D, KC_BTN2, KC_WH_D,
-               KC_P0,   KC_PDOT,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,    KC_WH_L, KC_WH_R
-)
-};
diff --git a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/readme.md
deleted file mode 100644
index 51939d6347f..00000000000
--- a/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Mouse keys in the right numpad
diff --git a/keyboards/clueboard/2x1800/2021/keymaps/signboard/config.h b/keyboards/clueboard/2x1800/2021/keymaps/signboard/config.h
deleted file mode 100644
index 81995d66f39..00000000000
--- a/keyboards/clueboard/2x1800/2021/keymaps/signboard/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2017 Zach White <skullydazed@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 MAX7219_LED_FONTTEST
-
-// place overrides here
diff --git a/keyboards/clueboard/2x1800/2021/keymaps/signboard/keymap.c b/keyboards/clueboard/2x1800/2021/keymaps/signboard/keymap.c
deleted file mode 100644
index 35da16664e7..00000000000
--- a/keyboards/clueboard/2x1800/2021/keymaps/signboard/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "font.h"
-#include "max7219.h"
-
-enum custom_keycodes {
-    MSG_CB =  SAFE_RANGE,
-    MSG_CS,
-    MSG_KMI,
-    MSG_QMK,
-};
-
-uint8_t custom_message[5][6] = {CHR_M, CHR_y, CHR_SPACE, CHR_2, CHR_CENT};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_all(
-        MSG_CB,  MSG_QMK, MSG_KMI, MSG_CS,    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_SCRL, KC_PAUS, KC_INS,
-        KC_PMNS, KC_NUM,  KC_PSLS, KC_PAST,   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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-        KC_PPLS, KC_P7,   KC_P8,   KC_P9,     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_P7,   KC_P8,   KC_P9, KC_PPLS,
-                 KC_P4,   KC_P5,   KC_P6,     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_P4,   KC_P5,   KC_P6,
-        KC_PENT, KC_P1,   KC_P2,   KC_P3,     KC_UP,   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_P1, KC_P2, KC_P3, KC_PENT,
-                 KC_P0,   KC_PDOT,   KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case MSG_CB:
-                max7219_led_scrolling=true;
-                uint8_t cb_msg[MSG_CLUEBOARD_LEN][6] = MSG_CLUEBOARD;
-                max7219_message_sign(cb_msg, MSG_CLUEBOARD_LEN);
-                return true;
-            case MSG_CS:
-                max7219_led_scrolling=false;
-                max7219_message_sign(custom_message, 5);
-                return true;
-            case MSG_KMI:
-                max7219_led_scrolling=true;
-                uint8_t kmi_msg[MSG_KONAMI_LEN][6] = MSG_KONAMI;
-                max7219_message_sign(kmi_msg, MSG_KONAMI_LEN);
-                return true;
-            case MSG_QMK:
-                max7219_led_scrolling=true;
-                uint8_t qmk_msg[MSG_QMK_POWERED_LEN][6] = MSG_QMK_POWERED;
-                max7219_message_sign(qmk_msg, MSG_QMK_POWERED_LEN);
-                return true;
-        }
-    }
-    return true;
-};
diff --git a/keyboards/clueboard/2x1800/2021/keymaps/signboard/readme.md b/keyboards/clueboard/2x1800/2021/keymaps/signboard/readme.md
deleted file mode 100644
index 4e3457efce6..00000000000
--- a/keyboards/clueboard/2x1800/2021/keymaps/signboard/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for 2x1800
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/config.h b/keyboards/clueboard/66/keymaps/bloodlvst/config.h
deleted file mode 100644
index 60c6ad4a12c..00000000000
--- a/keyboards/clueboard/66/keymaps/bloodlvst/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define DISABLE_SPACE_CADET_ROLLOVER
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
deleted file mode 100644
index fc49663fa4a..00000000000
--- a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_INS,  KC_DEL,           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_NUHS,  KC_ENT,
-  SC_LSPO, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  SC_RSPC,          KC_UP,
-  KC_LCTL, KC_LGUI, MO(_FL), KC_LALT,          KC_BSPC,KC_SPC,                       KC_RALT,  KC_APP,   MO(_FL),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   KC_HOME, KC_END,           KC_VOLU,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,KC_SCRL, KC_PAUS,  _______,  _______,  KC_MUTE,                   KC_VOLD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  KC_PSCR,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_MPLY,
-  _______, KC_MYCM, MO(_FL), _______,        _______,_______,                        _______,  KC_CALC,  MO(_FL),  _______, KC_MPRV, KC_MSTP, KC_MNXT),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  KC_PWR,  _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,          RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  RGB_MOD,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,RGB_HUD, RGB_HUI,  _______,  _______,  _______,          KC_WAKE,
-  _______, _______, MO(_FL), _______,        RGB_SAD,RGB_SAI,                        _______,  _______,  MO(_FL),  _______, _______, KC_SLEP, _______),
-};
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/readme.md b/keyboards/clueboard/66/keymaps/bloodlvst/readme.md
deleted file mode 100644
index ee287ca476f..00000000000
--- a/keyboards/clueboard/66/keymaps/bloodlvst/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-```
- ___     _____ _            _                         _     __    __ _   __
-|__ \   / ____| |          | |                       | |   / /   / /(_) / /
- ||) | | |    | |_   _  ___| |__   ___   __ _ _ __ __| |  / /_  / /_   / /
- |/ /  | |    | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / /
- |_|   | |____| | |_| |  __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _
- (_)    \_____|_|\__,_|\___|_.__/ \___/ \__,_|_|  \__,_|  \___/ \___/_/ (_)
-```
-
-![Clueboard Layout Image](http://i.imgur.com/7Capi8W.png)
-
-# Default Clueboard Layout
-
-This is the default layout that comes flashed on every Clueboard. For the most
-part it's a straightforward and easy to follow layout. The only unusual key is 
-the key in the upper left, which sends Escape normally, but Grave when any of
-the Ctrl, Alt, or GUI modifiers are held down.
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/rules.mk b/keyboards/clueboard/66/keymaps/bloodlvst/rules.mk
deleted file mode 100644
index b1c2f32f6ae..00000000000
--- a/keyboards/clueboard/66/keymaps/bloodlvst/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRAKEY_ENABLE = yes
-COMMAND_ENABLE  = no
diff --git a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
deleted file mode 100644
index 2bbe67cb73e..00000000000
--- a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_GRV,  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_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
-  _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
-  _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
-};
diff --git a/keyboards/clueboard/66/keymaps/caps_fn/readme.md b/keyboards/clueboard/66/keymaps/caps_fn/readme.md
deleted file mode 100644
index 71d1246c078..00000000000
--- a/keyboards/clueboard/66/keymaps/caps_fn/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Caps Fn Layout
-
-This is the default layout except that Caps Lock acts like Caps Lock when
-tapped but Fn when held.
diff --git a/keyboards/clueboard/66/keymaps/jokrik/keymap.c b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
deleted file mode 100644
index 832493e579a..00000000000
--- a/keyboards/clueboard/66/keymaps/jokrik/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_GRV,          KC_PSCR,
-  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_BSPC,                   KC_PAUS,
-  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,
-  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_INT1,  KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,           KC_SPC,KC_SPC,                        KC_SPC,   KC_RALT,  MO(_FL),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   KC_INS,  KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
-  _______, _______, _______, _______,        _______,_______,                        _______,  _______,  MO(_FL),  _______, KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          RGB_SAI,
-  _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                      _______,  _______,  MO(_FL),  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
-};
diff --git a/keyboards/clueboard/66/keymaps/jokrik/readme.md b/keyboards/clueboard/66/keymaps/jokrik/readme.md
deleted file mode 100644
index a845e65f1b9..00000000000
--- a/keyboards/clueboard/66/keymaps/jokrik/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Jokrik's Clueboard Layout
-
diff --git a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
deleted file mode 100644
index 50c31563c84..00000000000
--- a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_GRV, 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_NUHS,KC_ENT,
-  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_INT1,KC_RSFT,        KC_UP,
-  KC_LCTL,KC_LALT,KC_LGUI,KC_INT5,        KC_SPC, KC_SPC,                         KC_INT4,KC_RGUI,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,KC_DEL,         KC_VOLU,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MRWD,KC_MPLY,KC_MFFD,_______,KC_MUTE,                KC_VOLD,
-  _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        KC_PGUP,
-  _______,_______,_______,_______,        _______,_______,                        _______,_______,MO(_FL),_______,KC_HOME,KC_PGDN,KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  BL_STEP,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,        RGB_VAI,
-  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
-  _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  MO(_FL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_SAI,
-  _______,_______,_______,_______,        RGB_MOD,   RGB_MOD,                     _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
-};
diff --git a/keyboards/clueboard/66/keymaps/mac_optimized/readme.md b/keyboards/clueboard/66/keymaps/mac_optimized/readme.md
deleted file mode 100644
index db7a87d443b..00000000000
--- a/keyboards/clueboard/66/keymaps/mac_optimized/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default Clueboard Layout for Mac
-
-This is the default Clueboard layout with Alt and GUI switched to match Mac
-conventions.
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/config.h b/keyboards/clueboard/66/keymaps/magicmonty/config.h
deleted file mode 100644
index c38aee5ee6d..00000000000
--- a/keyboards/clueboard/66/keymaps/magicmonty/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-/*
-  Setting the modified Space Cadet Parens for German layout
-
-  Default is
-  #define LSPO_KEY KC_9
-  #define RSPC_KEY KC_0
-*/
-#define LSPO_KEY KC_8
-#define RSPC_KEY KC_9
-#define PERMISSIVE_HOLD
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
deleted file mode 100644
index 2a0cf1509f9..00000000000
--- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
+++ /dev/null
@@ -1,222 +0,0 @@
-#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.
-#define _BL 0 // BASE Layer
-#define _FL 1 // Function Layer
-#define _ME 2 // Media Layer
-#define _CL 3 // Control Layer
-#define _ML 4 // Mouse Layer
-#if defined(MIDI_ENABLE)
-  #define _MI 5 // MIDI Layer
-  #define TO_MIDI TO(_MI)
-#else
-  #define TO_MIDI _______
-#endif
-
-// go back to base layer
-#define TO_BASE TO(_BL)
-
-// switch to function layer while helde
-#define MO_FUNC MO(_FL)
-
-// switch to media layer  while held
-#define   MEDIA MO(_ME)
-
-// switch to Control layer while helde
-#define  MO_CTL MO(_CL)
-
-// switch to mouse layer if held, else space
-#define L_MOUSE LT(_ML, KC_SPC)
-
-// Function key when held, else ESC
-#define ESC_FUN LT(_FL, KC_ESC)
-
-// Hyper (CTRL+ALT+SHIFT+SUPER) when held, TAB when tapped
-#define HPR_TAB ALL_T(KC_TAB)
-
-// CTRL when held, ESC when tapped
-#define CTL_ESC CTL_T(KC_ESC)
-
-enum custom_keycodes {
-    RGB_RST = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer) */
-  [_BL] = LAYOUT(
-    QK_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_INS,
-    HPR_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,
-    ESC_FUN,    KC_A,    KC_S,   KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,  KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,
-    KC_LSFT, KC_NUBS,    KC_Z,   KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,   KC_DOT, KC_SLSH,  _______, KC_RSFT,          KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,_______,                    L_MOUSE, L_MOUSE,                    _______, KC_RALT,  KC_RCTL, MO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function layer */
-  [_FL] = LAYOUT(
-     KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12, _______, _______,          BL_STEP,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______,  KC_PAUS, _______,  _______, _______,                   _______,
-    _______, _______,  MO_CTL, _______, _______, _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,  _______, _______,  _______, _______,
-    SC_LSPO, _______, _______, _______, _______, _______, _______, _______,   MEDIA, _______,  _______, TO_MIDI,  _______, SC_RSPC,          KC_PGUP,
-    _______, _______, _______, _______,                   _______, _______,                    _______, _______,  _______, MO_FUNC, KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _ME: Media layer */
-  [_ME] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______, KC_MUTE,          KC_VOLU,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,                   KC_VOLD,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,   MEDIA, _______,  _______, _______,  _______, _______,          _______,
-    _______, _______, _______, _______,                   _______, _______,                    _______, _______,  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT),
-
-  /* Keymap _CL: Control layer */
-  [_CL] = LAYOUT(
-    _______, RGB_RST, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______, RGB_TOG,          RGB_VAI,
-    _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,                   RGB_VAD,
-    _______, _______,  MO_CTL, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,          RGB_SAI,
-    _______, _______, _______, _______,                   RGB_MOD, RGB_MOD,                    _______, _______,  _______, _______, RGB_HUD, RGB_SAD, RGB_HUI),
-
-  /* Keymap _ML: Mouse layer */
-  [_ML] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,                   _______,
-    _______, _______, KC_BTN2, KC_BTN3, KC_BTN1, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R,  _______, _______,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,  _______, _______,          KC_MS_U,
-    _______, _______, _______, _______,                   L_MOUSE, L_MOUSE,                    _______, KC_BTN1,  KC_BTN3, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R),
-
-#if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
-  /* Keymap _MI: MIDI layer (Advanced)*/
-  [_MI] = LAYOUT(
-    TO_BASE,  MI_VL1,  MI_VL2,  MI_VL3,  MI_VL4,  MI_VL5,  MI_VL6,  MI_VL7,  MI_VL8,  MI_VL9,  MI_VL10, MI_CHND,  MI_CHNU, XXXXXXX, XXXXXXX,          XXXXXXX,
-    XXXXXXX, XXXXXXX,   MI_Cs,   MI_Ds, XXXXXXX,   MI_Fs,   MI_Gs,   MI_As, XXXXXXX, MI_Cs1,  MI_Ds1, XXXXXXX,  MI_Fs1, XXXXXXX,                   XXXXXXX,
-     MI_MOD,    MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,  MI_C1,  MI_D1,   MI_E1,  MI_F1,   MI_G1, XXXXXXX,
-    MI_SUST, XXXXXXX, MI_OCTD, MI_OCTU, MI_MODD, MI_MODU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  MI_TRSD, MI_TRSU,   MI_TR0, MI_SUST,          XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   MI_AOFF, MI_AOFF,                    XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
-#elif defined(MIDI_ENABLE) && defined(MIDI_BASIC)
-  /* Keymap _MI: MIDI layer (Basic)*/
-  [_MI] = LAYOUT(
-    TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,                   XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX,   MI_ON,  MI_OFF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,          XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,                    XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
-#endif
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case RGB_RST:
-            if (record->event.pressed) {
-                rgblight_mode(1);
-                rgblight_sethsv(206, 255, 255);
-            }
-            return false;
-    }
-    return true;
-}
-
-enum layer_id {
-  LAYER_BASE,
-  LAYER_FUNCTION,
-  LAYER_MEDIA,
-  LAYER_CONTROL,
-  LAYER_MOUSE,
-#if defined(MIDI_ENABLE)
-  LAYER_MIDI
-#endif
-};
-
-void clueboard_set_led(uint8_t id, uint8_t val) {
-  switch (id) {
-    case LAYER_BASE:
-      rgblight_sethsv_noeeprom(135, 255, val);
-      break;
-    case LAYER_FUNCTION:
-      rgblight_sethsv_noeeprom(32, 255, val);
-      break;
-    case LAYER_MEDIA:
-      rgblight_sethsv_noeeprom(60, 255, val);
-      break;
-    case LAYER_CONTROL:
-      rgblight_sethsv_noeeprom(245, 255, val);
-      break;
-    case LAYER_MOUSE:
-      rgblight_sethsv_noeeprom(146, 255, val);
-      break;
-#if defined(MIDI_ENABLE)
-    case LAYER_MIDI:
-      rgblight_sethsv_noeeprom(224, 255, val);
-      break;
-#endif
-  }
-};
-
-const uint16_t oct_hues[10] = {
-  0,
-  20,
-  40,
-  60,
-  80,
-  100,
-  120,
-  140,
-  160,
-  180
-};
-
-#define MAX_OCT  9
-
-void clueboard_set_midi_led(uint8_t base_oct, uint8_t val)
-{
-  uint8_t sat = 255;
-
-  for (uint8_t i = 0; i < RGBLED_NUM; i++) {
-    sethsv(oct_hues[base_oct], sat, val, (rgb_led_t *)&led[i]);
-  }
-
-  uint8_t next_oct = base_oct < MAX_OCT ? base_oct + 1 : base_oct;
-
-  uint16_t next_hue = base_oct < MAX_OCT ? oct_hues[next_oct] : 0;
-  uint8_t next_val = base_oct < MAX_OCT ? val : 0;
-  uint8_t next_sat = base_oct < MAX_OCT ? sat : 0;
-
-
-  for (uint8_t i = 0; i < 3; i++) {
-    sethsv(next_hue, next_sat, next_val, (rgb_led_t *)&led[i]);
-  }
-
-  for (uint8_t i = 11; i < 14; i++) {
-    sethsv(next_hue, next_sat, next_val, (rgb_led_t *)&led[i]);
-  }
-
-  rgblight_set();
-}
-
-void matrix_scan_user(void) {
-    rgblight_config_t rgblight_config;
-    rgblight_config.raw = eeconfig_read_rgblight();
-
-    if (!rgblight_config.enable || rgblight_config.mode != 1) { return; }
-
-    layer_state_t layer = layer_state;
-    uint8_t val = rgblight_config.val;
-
-    if (layer & (1<<_FL)) {
-      if (layer & (1<<_ME)) {
-        clueboard_set_led(LAYER_MEDIA, val);
-      } else if (layer & (1<<_CL)) {
-        clueboard_set_led(LAYER_CONTROL, val);
-      } else {
-        clueboard_set_led(LAYER_FUNCTION, val);
-      }
-    } else if (layer & (1<<_ML)) {
-      clueboard_set_led(LAYER_MOUSE, val);
-#if defined(MIDI_ENABLE)
-    } else if (layer & (1<<_MI)) {
-      clueboard_set_midi_led(midi_config.octave, val);
-#endif
-    } else {
-        clueboard_set_led(LAYER_BASE, val);
-    }
-};
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/readme.md b/keyboards/clueboard/66/keymaps/magicmonty/readme.md
deleted file mode 100644
index 20d1c6fa3fc..00000000000
--- a/keyboards/clueboard/66/keymaps/magicmonty/readme.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Layout of @magicmonty
-
-[Keyboard Layout Editor File]
-
-![Clueboard Layout Image](http://i.imgur.com/eEwjLEj.png)
-My ClueBoard Layout as of 2017/06/30
-
-
-This layout is a combination of the `mouse_keys` and the `win_optimized` layouts.
-This layout is optimized for an ISO layout.
-The CapsLock is disabled and works as ESC when tapped and FN when held.
-The `TAB` key works as `TAB` when tapped, and [HYPER] (`CTRL` + `ALT` + `SHIFT` + `CMD`) when held.
-
-## Mouse Layer
-
-When you hold down the spacebar the arrow keys will move your mouse cursor.
-You can click using the 3 mods to the left of the arrow keys, or the 3 keys under your primary fingers on the home row.
-The Left, Down, Up and Right for the mouse movement are also VIM-Like on the HJKL keys
-
-## MIDI layer
-
-The MIDI layer is permanently enabled by pressing `FN` + `/`.
-It can be exited with the `ESC`-Key
-
-## Space Cadet(ish) Shift Parentheses
-
-If the function layer is active, the `SHIFT`-Keys are configured like the [Space Cadet Shift Parentheses]
-as opened (left `SHIFT`) and closed (right `SHIFT`) parentheses if tapped and `SHIFT` if held.
-
-## Media layer
-
-The media layer with Volume/Play controls, can be accessed via `FN` + `m`
-
-## Control layer
-
-The control layer is accessed via `FN` + `s`.
-Here one can control the behavior of the RGB underlight.
-`FN` + `s` + `1` resets the RGB underlight to the Layer signalling mode
-
-## Layer signalling through underlight
-
-The different layers are signalled throug setting of the underlight:
-
-- Base layer: Light Blue
-- Function layer: Yellow
-- Media layer: Green
-- Mouse layer: Blue
-- Control layer: Red
-- Midi layer: Purple
-
-[HYPER]: http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
-[Space Cadet Shift Parentheses]: http://stevelosh.com/blog/2012/10/a-modern-space-cadet/#shift-parentheses
-[Keyboard Layout Editor File]: http://www.keyboard-layout-editor.com/#/gists/f869b8789242a712e0f46eabbd550056
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/rules.mk b/keyboards/clueboard/66/keymaps/magicmonty/rules.mk
deleted file mode 100644
index 46222e2d342..00000000000
--- a/keyboards/clueboard/66/keymaps/magicmonty/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality
-
-MIDI_ENABLE = yes
-
-# if MIDI_ENABLE is set to yes, then CONSOLE_ENABLE has to be disabled, because of the firmware size
-CONSOLE_ENABLE = no
-COMMAND_ENABLE   = no
diff --git a/keyboards/clueboard/66/keymaps/manofinterests/keymap.c b/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
deleted file mode 100644
index 4e9a35e0b65..00000000000
--- a/keyboards/clueboard/66/keymaps/manofinterests/keymap.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_GRV, KC_BSPC,        RGB_VAI,
-  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_VAD,
-  KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,
-  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_INT1,KC_RSFT,        KC_UP,
-  KC_LCTL,KC_LGUI,KC_LALT,KC_INT5,        KC_SPC, KC_SPC,                         KC_INT4,KC_RALT,MO(_FL),KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,KC_DEL,         KC_VOLU,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_MUTE,                KC_VOLD,
-  _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        KC_PGUP,
-  _______,_______,_______,_______,        _______,_______,                        _______,_______,MO(_FL),_______,KC_HOME,KC_PGDN,KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,_______,RGB_TOG,        RGB_VAI,
-  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
-  _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  MO(_FL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_SAI,
-  _______,_______,_______,_______,        RGB_MOD,   RGB_MOD,                     _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
-};
diff --git a/keyboards/clueboard/66/keymaps/manofinterests/readme.md b/keyboards/clueboard/66/keymaps/manofinterests/readme.md
deleted file mode 100644
index 019131aeb19..00000000000
--- a/keyboards/clueboard/66/keymaps/manofinterests/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-![Clueboard Layout Image](http://i.imgur.com/7Capi8W.png)
-
-# Default Clueboard Layout
-
-This is the default layout that comes flashed on every Clueboard. For the most
-part it's a straightforward and easy to follow layout. The only unusual key is 
-the key in the upper left, which sends Escape normally, but Grave when any of
-the Ctrl, Alt, or GUI modifiers are held down.
diff --git a/keyboards/clueboard/66/keymaps/maximised/keymap.c b/keyboards/clueboard/66/keymaps/maximised/keymap.c
deleted file mode 100644
index 256c7a76dbe..00000000000
--- a/keyboards/clueboard/66/keymaps/maximised/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,  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_NUHS,  KC_ENT,
-  MO(_FL), 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(_FL),          KC_UP,
-  KC_LCTL, KC_LALT, KC_LGUI,KC_INT5,        KC_SPC, KC_SPC,                          KC_INT4,  KC_RGUI,  KC_RALT,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          KC_PGUP,
-  _______, _______, _______,_______,        _______,_______,                         _______,  _______,  _______,  _______, KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _CL: Reset/Underlight layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
-  _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
-};
diff --git a/keyboards/clueboard/66/keymaps/maximised/readme.md b/keyboards/clueboard/66/keymaps/maximised/readme.md
deleted file mode 100644
index b8d54a30939..00000000000
--- a/keyboards/clueboard/66/keymaps/maximised/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Maximised Clueboard Layout
-
-This layout is intended for a board with one or both shifts split. The outside key on the split shift is an Fn, while the inside is shift. The bottom row has all the mods on both sides, optimised for a Mac.
diff --git a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
deleted file mode 100644
index 0f7c5762f46..00000000000
--- a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-#define _ML 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_GRV,  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_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
-  _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
-  _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
-
-    /* Keymap _ML: Mouse layer
-     */
-  [_ML] = LAYOUT(
-    _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,         _______,
-    _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                  _______,
-    _______, _______, KC_BTN3,KC_BTN2,KC_BTN1,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-    _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_MS_U,
-    _______, _______, _______,_______,        LT(_ML, KC_SPC),LT(_ML, KC_SPC),         _______,  KC_BTN1,  KC_BTN2,  KC_BTN3, KC_MS_L, KC_MS_D,KC_MS_R),
-};
diff --git a/keyboards/clueboard/66/keymaps/mouse_keys/readme.md b/keyboards/clueboard/66/keymaps/mouse_keys/readme.md
deleted file mode 100644
index de883e8940b..00000000000
--- a/keyboards/clueboard/66/keymaps/mouse_keys/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# MouseKeys Layout
-
-This layout adds a mouse layer. When you hold down the spacebar the arrow keys
-will move your mouse cursor. You can click using the 3 mods to the left of the
-arrow keys, or the 3 keys under your primary fingers on the home row.
diff --git a/keyboards/clueboard/66/keymaps/mouse_keys/rules.mk b/keyboards/clueboard/66/keymaps/mouse_keys/rules.mk
deleted file mode 100644
index 6c605daecf5..00000000000
--- a/keyboards/clueboard/66/keymaps/mouse_keys/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/clueboard/66/keymaps/mrscooty/keymap.c b/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
deleted file mode 100644
index f26ac0b90de..00000000000
--- a/keyboards/clueboard/66/keymaps/mrscooty/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_GRV,		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,
-  MO(_FL), 	KC_A,	KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   	KC_SCLN,	KC_QUOT,  	KC_NUHS,  	KC_ENT,
-  KC_LSFT, 	KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,	KC_DOT, 	KC_SLSH,  	KC_INT1,   	KC_RSFT,          		KC_UP,
-  KC_LCTL, 	KC_LGUI,KC_LALT,KC_INT5,        KC_SPC, KC_SPC,                 			KC_INT4,	KC_RALT, 	MO(_FL),  	KC_RCTL, 	KC_LEFT, 	KC_DOWN, 	KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,	 KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,  _______, KC_DEL,           KC_PGUP,
-  _______, RGB_TOG, KC_MPRV, KC_MPLY, KC_MNXT,_______,_______,KC_HOME,KC_UP,  KC_END,   _______,  _______,  _______,  KC_PSCR,                	 KC_PGDN,
-  _______, RGB_VAI, KC_MUTE, KC_VOLD, KC_VOLU,_______,_______,KC_LEFT,KC_DOWN,KC_RIGHT, _______,  _______,  _______,  _______,
-  _______, RGB_VAD, _______, _______, _______,_______,_______,_______,_______,_______,  _______,  _______,  _______,  _______,          RGB_SAI,
-  _______, _______, _______, _______,         RGB_MOD, RGB_MOD,                          _______,  _______,  _______,  _______, RGB_HUD, RGB_SAD, RGB_HUI)
-};
-
-  /* Keymap _CL: Control layer
-   
-[_CL] = LAYOUT(
-  BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,_______,RGB_TOG,        RGB_VAI,
-  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        RGB_SAI,
-  _______,_______,_______,_______,        RGB_MOD,   RGB_MOD,                     _______,_______,_______,_______,RGB_HUD,RGB_SAD,RGB_HUI),
-};*/
diff --git a/keyboards/clueboard/66/keymaps/mrscooty/readme.md b/keyboards/clueboard/66/keymaps/mrscooty/readme.md
deleted file mode 100644
index 69cdb816c50..00000000000
--- a/keyboards/clueboard/66/keymaps/mrscooty/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Mr Scooty's Clueboard Layout
-
-My personal layout for everyday typing and coding. 
-I have a most of my media keys on the function layer as well as a second set of arrows as IJKL which you switch between by holding the normal CAPS key. 
-
-
-#### Base Layer
-![Base Layout Image] (https://imgur.com/HWdi36y)
-
-#### Fn Layer
-![Fn Layout Image] (https://imgur.com/IPa8gFg)
-
-
-
-Both layers (https://imgur.com/a/dAwXq)
diff --git a/keyboards/clueboard/66/keymaps/mrscooty/rules.mk b/keyboards/clueboard/66/keymaps/mrscooty/rules.mk
deleted file mode 100644
index ba997f86967..00000000000
--- a/keyboards/clueboard/66/keymaps/mrscooty/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-
diff --git a/keyboards/clueboard/66/keymaps/muzfuz/keymap.c b/keyboards/clueboard/66/keymaps/muzfuz/keymap.c
deleted file mode 100644
index bc911f045b0..00000000000
--- a/keyboards/clueboard/66/keymaps/muzfuz/keymap.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Helpful defines
-#define ESC_CTL     CTL_T(KC_ESCAPE)            // Tap for Esc, hold for Ctrl
-#define _FL_KCF LT(1,KC_F)
-#define _FL_KCJ LT(1,KC_J)
-#define _AL_KCA LT(2,KC_A)
-#define CMD_ENT LGUI(LSFT(KC_ENT))
-
-// 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.
-#define _BL 0
-#define _FL 1
-#define _AL 2
-#define _CL 3
-
-enum custom_keycodes {
-  HASHRKT = SAFE_RANGE,
-  CLNEQLS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap _BL: Base Layer (Default Layer)
-   */
-    [_BL] = LAYOUT(
-        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_BSLS, HASHRKT, LGUI(KC_C),
-        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_BSPC, LGUI(KC_V),
-        ESC_CTL, _AL_KCA, KC_S, KC_D, _FL_KCF, KC_G, KC_H, _FL_KCJ, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_LGUI,
-        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_SLSH, KC_RSFT, KC_UP,
-        CMD_ENT, KC_LCTL, KC_LALT, KC_LGUI, KC_ENT, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, MO(_CL), KC_LEFT, KC_DOWN, KC_RGHT),
-
-    /* Keymap _FL: Function Layer
-   */
-    [_FL] = 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_VOLU,
-        _______, HASHRKT, _______, KC_LCBR, KC_RCBR, _______, _______, KC_UNDS, KC_PLUS, KC_PIPE, _______, _______, _______, KC_MUTE, KC_VOLD,
-        _______, CLNEQLS, _______, KC_LBRC, KC_RBRC, _______, _______, KC_MINS, KC_EQL, KC_BSLS, KC_TILD, KC_GRV, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
-
-    /* Keymap _FL: Function Layer
-   */
-    [_AL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-    /* Keymap _CL: Control layer
-   */
-    [_CL] = LAYOUT(
-        BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, RGB_VAD,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI,
-        _______, _______, _______, _______, RGB_MOD, RGB_MOD, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case HASHRKT:
-      if (record->event.pressed) {
-        SEND_STRING("=>");
-      }
-      break;
-    case CLNEQLS:
-      if (record->event.pressed) {
-        SEND_STRING(":=");
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/clueboard/66/keymaps/muzfuz/readme.md b/keyboards/clueboard/66/keymaps/muzfuz/readme.md
deleted file mode 100644
index ce23a8a99c0..00000000000
--- a/keyboards/clueboard/66/keymaps/muzfuz/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# muzfuz Clueboard layout
-
-```shell
-make clueboard/66/rev3:muzfuz
-dfu-programmer atmega32u4 erase --force && \
-dfu-programmer atmega32u4 flash .build/clueboard_66_rev3_muzfuz.hex && \
-dfu-programmer atmega32u4 reset
-```
diff --git a/keyboards/clueboard/66/keymaps/serubin/keymap.c b/keyboards/clueboard/66/keymaps/serubin/keymap.c
deleted file mode 100644
index 80c550b56b0..00000000000
--- a/keyboards/clueboard/66/keymaps/serubin/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _ME 2
-#define _CL 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  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_GRV,  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,
-  F(1), KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RGUI,  MO(_FL),  MO(_ME), KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = 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_HOME,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  KC_PSCR,                KC_END,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
-  _______, _______, _______, _______,        _______,_______,                        _______,  _______,  MO(_FL),  MO(_ME), KC_HOME, KC_PGDN, KC_END),
-
-/* Keymap _FL: Function Layer
-   */
-[_ME] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______, _______,  _______,  KC_MUTE,          KC_VOLU,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   KC_VOLD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______, _______ ,  _______,          _______,
-  _______, _______, _______, _______,        _______,_______,                        _______,  _______,  MO(_FL),  MO(_ME), KC_MPRV, KC_MPLY, KC_MNXT),
-
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  MO(_FL),  _______,          RGB_SAI,
-  _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
-};
diff --git a/keyboards/clueboard/66/keymaps/serubin/readme.md b/keyboards/clueboard/66/keymaps/serubin/readme.md
deleted file mode 100644
index 78eef53523c..00000000000
--- a/keyboards/clueboard/66/keymaps/serubin/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Serubin's Clueboard Layout
-
-This is the layout based on the clueboard default, modified for development on Mac, PC, and Windows. This layout also handles media and volume keys on all the previously listed platforms. Most importantly, Capslock has been replaced by a dual function Esc/Ctrl key. This is particularly handy for use in Vim. 
-
-#### Base Layer
-![Base Layout Image](http://i.imgur.com/qL78n1y.png)
-
-#### Fn Layer
-![Fn Layout Image](http://i.imgur.com/QuwxePw.png)
-
-#### Media Layer
-![Media Layer Image](http://i.imgur.com/oOfWXMf.png)
-
-
diff --git a/keyboards/clueboard/66/keymaps/serubin/rules.mk b/keyboards/clueboard/66/keymaps/serubin/rules.mk
deleted file mode 100644
index ba997f86967..00000000000
--- a/keyboards/clueboard/66/keymaps/serubin/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-
diff --git a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
deleted file mode 100644
index fc6a0ed5355..00000000000
--- a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_GRV,  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_NUHS,  KC_ENT,
-  MO(_FL), KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT,KC_INT5,          KC_SPC, KC_SPC,                        KC_INT4,  KC_RALT,  KC_RGUI,  KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV, KC_F1,     KC_F2,  KC_F3,  KC_F4,  KC_F5,    KC_F6,    KC_F7,  KC_F8,  KC_F9,     KC_F10,    KC_F11,    KC_F12,    S(KC_GRV), KC_DEL,           BL_STEP,
-  S(KC_TAB), S(KC_Q),   S(KC_W),S(KC_E),S(KC_R),S(KC_T),  S(KC_Y),  S(KC_U),S(KC_I),S(KC_O),   S(KC_P),   S(KC_LBRC),S(KC_RBRC),S(KC_BSLS),                  S(KC_PGDN),
-  S(KC_LCTL),S(KC_A),   MO(_CL),S(KC_D),S(KC_F),S(KC_G),  S(KC_H),  S(KC_J),S(KC_K),S(KC_L),   S(KC_SCLN),S(KC_QUOT),S(KC_NUHS),S(KC_ENT),
-  MO(_FL),   S(KC_NUBS),S(KC_Z),S(KC_X),S(KC_C),S(KC_V),  S(KC_B),  S(KC_N),S(KC_M),S(KC_COMM),S(KC_DOT), S(KC_SLSH),S(KC_INT1),KC_RSFT,           KC_PGUP,
-  KC_LCTL,   KC_LALT,   KC_LGUI,KC_INT5,        S(KC_SPC),S(KC_SPC),                           KC_INT4,   KC_RGUI,   KC_RALT,   KC_RCTL,   KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,              RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                       RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),               RGB_SAI,
-  _______, _______, _______,_______,        RGB_MOD,RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,RGB_SAD,RGB_HUI),
-};
diff --git a/keyboards/clueboard/66/keymaps/shift_fn/readme.md b/keyboards/clueboard/66/keymaps/shift_fn/readme.md
deleted file mode 100644
index d68c5b05321..00000000000
--- a/keyboards/clueboard/66/keymaps/shift_fn/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Shift Fn Clueboard 66% Layout
-
-This is an experimental layout. It makes the left shift key a dual roll key.
-For most keys it acts as a shift key, but for some keys it activates an 
-alternate function instead. Primarily I use this to access the F-keys under
-the number rows.
diff --git a/keyboards/clueboard/66/keymaps/smt/keymap.c b/keyboards/clueboard/66/keymaps/smt/keymap.c
deleted file mode 100644
index 7c9ef443d7c..00000000000
--- a/keyboards/clueboard/66/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,132 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _FL 3
-#define _CL 4
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK
-};
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _QWERTY: Base Layer (Default Layer)
-   * ,-----------------------------------------------------------.  ,---.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|  |PgU|
-   * |-----------------------------------------------------------|  |---|
-   * |HpTab|  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|   BS|  |PgD|
-   * |-----------------------------------------------------------|  `---'
-   * |CtlEsc|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|   | Ent|
-   * |--------------------------------------------------------------.
-   * |Shift|  |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift| Fn| Up|
-   * |------------------------------------------------------------------.
-   * |Ctrl|Gui|Alt |    | Space| Space|    |Alt |Gui |Ctrl|Left|Down|Rgt|
-   * `------------------------------------------------------------------'
-   */
-[_QWERTY] = LAYOUT(
-  QK_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_BSLS, KC_GRV,           KC_PGUP,
-  HPR_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_BSPC,                   KC_PGDN,
-  CTL_ESC, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  XXXXXXX,  KC_ENT,
-  KC_LSFT, XXXXXXX, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  SFT_ENT,  MO(_FL),          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, XXXXXXX,          KC_SPC,KC_SPC,                        XXXXXXX,  KC_RALT,  KC_RGUI,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _COLEMAK: Base Layer
-   * ,-----------------------------------------------------------.  ,---.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|  |PgU|
-   * |-----------------------------------------------------------|  |---|
-   * |HpTab|  Q|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|   BS|  |PgD|
-   * |-----------------------------------------------------------|  `---'
-   * |CtlEsc|  A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '|   | Ent|
-   * |--------------------------------------------------------------.
-   * |Shift|  |  Z|  X|  C|  V|  B|  K|  M|  ,|  .|  /|Shift| Fn| Up|
-   * |------------------------------------------------------------------.
-   * |Ctrl|Gui|Alt |    | Space| Space|    |Alt |Gui |Ctrl|Left|Down|Rgt|
-   * `------------------------------------------------------------------'
-   */
-[_COLEMAK] = LAYOUT(
-  QK_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_BSLS, KC_GRV,           KC_PGUP,
-  HPR_TAB, KC_Q,    KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,    KC_SCLN,  KC_LBRC,  KC_RBRC,  KC_BSPC,                   KC_PGDN,
-  CTL_ESC, KC_A,    KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,    KC_O,     KC_QUOT,  XXXXXXX,  KC_ENT,
-  KC_LSFT, XXXXXXX, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  SFT_ENT,  MO(_FL),          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, XXXXXXX,          KC_SPC,KC_SPC,                        XXXXXXX,  KC_RALT,  KC_RGUI,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _DVORAK: Base Layer
-   * ,-----------------------------------------------------------.  ,---.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]|  \|  `|  |PgU|
-   * |-----------------------------------------------------------|  |---|
-   * |HpTab|  '|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|   BS|  |PgD|
-   * |-----------------------------------------------------------|  `---'
-   * |CtlEsc|  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -|   | Ent|
-   * |--------------------------------------------------------------.
-   * |Shift|  |  ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z|Shift| Fn| Up|
-   * |------------------------------------------------------------------.
-   * |Ctrl|Gui|Alt |    | Space| Space|    |Alt |Gui |Ctrl|Left|Down|Rgt|
-   * `------------------------------------------------------------------'
-   */
-[_DVORAK] = LAYOUT(
-  QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_GRV,           KC_PGUP,
-  HPR_TAB, KC_QUOT, KC_COMM,KC_DOT, KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,    KC_L,     KC_SLSH,  KC_EQL,   KC_BSPC,                   KC_PGDN,
-  CTL_ESC, KC_A,    KC_O,   KC_E,   KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,    KC_S,     KC_MINS,  XXXXXXX,  KC_ENT,
-  KC_LSFT, XXXXXXX, KC_SCLN,KC_Q,   KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,    KC_V,     KC_Z,     SFT_ENT,  MO(_FL),          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, XXXXXXX,          KC_SPC,KC_SPC,                        XXXXXXX,  KC_RALT,  KC_RGUI,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, _______,          BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  KC_DEL,                    _______,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          KC_PGUP,
-  _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  _______, KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,          RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,QWERTY, COLEMAK,DVORAK,  _______,  _______,  _______,  _______,                   RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
-  _______, _______, _______,_______,         RGB_MOD,RGB_MOD,                        _______,  _______,  _______,  _______, RGB_HUD, RGB_SAD, RGB_HUI),
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/clueboard/66/keymaps/smt/readme.md b/keyboards/clueboard/66/keymaps/smt/readme.md
deleted file mode 100644
index 7fc0f0248d1..00000000000
--- a/keyboards/clueboard/66/keymaps/smt/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# smt Clueboard Layout (HHKB variant)
-
-![Clueboard Layout Image](http://i.imgur.com/Ll5gGte.png)
-
-This is smt's HHKB variant layout, based on the default layout that comes
-flashed on every Clueboard. The primary differences from the default are:
-
-- The Backspace key is moved down into the traditional `\` position
-- `\` and `` ` `` are assigned to the "split-backspace" positions
-- The right Shift is split to allow for a Fn key to its right
-- The modifiers on the right side now mirror the left side (`Alt`/`Super`/`Ctrl`)
-
-For the most part, it's a straightforward and easy to follow layout. There
-are a few special keys:
-
-- The Esc key sends `Esc` when tapped, `` ` `` when `Alt`/`Super`/`Ctrl`/`Fn` is held, or `~` when `Shift` is held
-- The Tab key sends `Tab` when tapped, or `Super+Ctrl+Alt+Shift` (a.k.a. [Hyper]) when held
-- The key traditionally in the Caps-Lock position has been re-mapped to send `Esc` when tapped, or `Ctrl` when held
-- The left Shift key sends `Enter` when tapped, or `Shift` when held
-
-[Hyper]: http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
diff --git a/keyboards/clueboard/66/keymaps/tetris/keymap.c b/keyboards/clueboard/66/keymaps/tetris/keymap.c
deleted file mode 100644
index b6385e2fa05..00000000000
--- a/keyboards/clueboard/66/keymaps/tetris/keymap.c
+++ /dev/null
@@ -1,156 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "tetris_text.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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-enum custom_keycodes {
-    TETRIS_START = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_GRV,  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_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
-  _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
-  _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
-};
-
-static uint8_t tetris_key_presses = 0;
-static uint16_t tetris_timer = 0;
-static uint8_t tetris_running = 0;
-static int tetris_keypress = 0;
-
-/*
- * Set up tetris
- */
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    tetris_key_presses++;
-  }
-
-  if (tetris_running && record->event.pressed) {
-    tetris_keypress = 0;
-    switch (keycode) {
-    case KC_UP: tetris_keypress = 1; break;
-    case KC_LEFT: tetris_keypress = 2; break;
-    case KC_DOWN: tetris_keypress = 3; break;
-    case KC_RIGHT: tetris_keypress = 4; break;
-    // Make ESC stop tetris (on keyboards other than clueboard)
-    // case KC_ESC: tetris_running = 0; return false;
-    }
-    if (tetris_keypress != 0) {
-      return false;
-    }
-  }
-
-  switch (keycode) {
-    case QK_GRAVE_ESCAPE:
-      // clueboard specific hook to make escape quite tetris
-      if (tetris_running) {
-        tetris_running = 0;
-        return false;
-      }
-      break;
-    case TETRIS_START:
-      if (record->event.pressed) {
-        tetris_running = 1;
-        tetris_timer = 0;
-        tetris_keypress = 0;
-        // set randomness using total number of key presses
-        tetris_start(tetris_key_presses);
-      }
-      return false;
-  }
-
-  return true;
-}
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-  if (tetris_running) {
-    tetris_timer++;
-    if (tetris_timer > 1000) {
-      // every 1000 times this is run is about 100 ms.
-      if (!tetris_tick(100)) {
-        // game over
-        tetris_running = 0;
-      }
-      tetris_timer = 0;
-    }
-  }      
-}
-
-void tetris_send_up(void) {
-  tap_code(KC_UP);
-}
-void tetris_send_left(void) {
-  tap_code(KC_LEFT);
-}
-void tetris_send_down(void) {
-  tap_code(KC_DOWN);
-}
-void tetris_send_right(void) {
-  tap_code(KC_RGHT);
-}
-void tetris_send_backspace(void) {
-  tap_code(KC_BSPC);
-}
-void tetris_send_delete(void) {
-  tap_code(KC_DEL);
-}
-
-void tetris_send_string(const char *s) {
-  for (int i = 0; s[i] != 0; i++) {
-    if (s[i] >= 'a' && s[i] <= 'z') {
-      tap_code(KC_A + (s[i] - 'a'));
-    } else if (s[i] >= 'A' && s[i] <= 'Z') {
-      tap_code16(S(KC_A + (s[i] - 'A')));
-    } else if (s[i] >= '1' && s[i] <= '9') {
-      tap_code(KC_1 + (s[i] - '1'));
-    } else {
-      switch (s[i]) {
-      case ' ': tap_code(KC_SPACE); break;
-      case '.': tap_code(KC_DOT); break;
-      case '0': tap_code(KC_0); break;
-      }
-    }
-  }
-}
-
-void tetris_send_newline(void) {
-  tap_code(KC_ENT);
-}
-
-int tetris_get_keypress(void) {
-  int out = tetris_keypress;
-  tetris_keypress = 0;
-  return out;
-}
diff --git a/keyboards/clueboard/66/keymaps/tetris/readme.md b/keyboards/clueboard/66/keymaps/tetris/readme.md
deleted file mode 100644
index 20e97fb19f5..00000000000
--- a/keyboards/clueboard/66/keymaps/tetris/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Default layout but with a tetris game
-=====================================
-Tetris works by outputting key-presses to make ascii-art in a regular text editor.
-It reads key presses to rotate and move the bricks like a regular tetris game.
-
-Example
-=======
-![tetris](https://raw.githubusercontent.com/danamlund/meckb_tetris/master/tetris.gif)
-
-Usage
-=====
-1) Open a default text editor
-2) Press the tetris button (Fn + t)
-3) Play tetris
-
-It makes ascii-art by sending keycodes: left, right, up, down, qwerty characters, and numbers.
-
-Problems
-========
-Drawing ascii-art is too slow to make a pleasant playing experience.
-While drawing ascii-art, the keyboard does not record key-presses, so its pretty unresponsive.
-
-Adds 5000 bytes to the hex file.
-
-Implement in other keyboards
-============================
- - Copy-paste the files tetris_text.c and tetrix_text.h to your keymap folder.
- - Add/update your-keyboard/your-keymap/Makefile to include ``SRC = tetris_text.c``
- - Copy-paste the tetris-related code from this keymap.c to yours.
- - Set a key to trigger F(1) to start tetris mode.
- - Its also a good idea to set a key to stop tetris, here its escape.
-
-You can find a simple tetris keyboard definition at <https://github.com/danamlund/meckb_tetris/>
diff --git a/keyboards/clueboard/66/keymaps/tetris/rules.mk b/keyboards/clueboard/66/keymaps/tetris/rules.mk
deleted file mode 100644
index 464c6e0c8e4..00000000000
--- a/keyboards/clueboard/66/keymaps/tetris/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC = tetris_text.c
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/clueboard/66/keymaps/tetris/tetris_text.c b/keyboards/clueboard/66/keymaps/tetris/tetris_text.c
deleted file mode 100644
index 1376ead0050..00000000000
--- a/keyboards/clueboard/66/keymaps/tetris/tetris_text.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/* Copyright 2017 Dan Amlund Thomsen
- *
- * 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 <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdint.h>
-
-#include "tetris_text.h"
-
-static char empty_piece[7][7] = { { 0, 0, 0, 0, 0, 0, 0 },
-                                  { 0, 0, 0, 0, 0, 0, 0 },
-                                  { 0, 0, 0, 0, 0, 0, 0 },
-                                  { 0, 0, 0, 0, 0, 0, 0 },
-                                  { 0, 0, 0, 0, 0, 0, 0 },
-                                  { 0, 0, 0, 0, 0, 0, 0 },
-                                  { 0, 0, 0, 0, 0, 0, 0 } };
-
-static char temp_piece[7][7];
-
-static int curx = 0;
-static int cury = 0;
-
-static void clear_piece(char piece[7][7]) {
-  for (int y = 0; y < 7; y++) {
-    for (int x = 0; x < 7; x++) {
-      piece[x][y] = 0;
-    }
-  }
-}
-
-static void copy_piece_from_to(char from[7][7], char to[7][7]) {
-  for (int y = 0; y < 7; y++) {
-    for (int x = 0; x < 7; x++) {
-      to[x][y] = from[x][y];
-    }
-  }
-}
-
-static void rotate_piece(char piece[7][7]) {
-  // transpose
-  for (int y = 0; y < 7; y++) {
-    for (int x = y + 1; x < 7; x++) {
-      char tmp = piece[y][x];
-      piece[y][x] = piece[x][y];
-      piece[x][y] = tmp;
-    }
-  }
-
-  // reverse rows
-  for (int y = 0; y < 7; y++) {
-    for (int x = 0; x < 3; x++) {
-      char tmp = piece[y][6 - x];
-      piece[y][6 - x] = piece[y][x];
-      piece[y][x] = tmp;
-    }
-  }
-}
-
-static char get_shape_char(int shape) {
-  switch (shape) {
-  case 0: return 'I';
-  case 1: return 'J';
-  case 2: return 'L';
-  case 3: return 'O';
-  case 4: return 'S';
-  case 5: return 'T';
-  case 6: return 'Z';
-  }
-  return 'Q';
-}
-
-static void set_piece(char piece[7][7], int shape, int rotation) {
-  clear_piece(piece);
-  switch (shape) {
-  case 0:
-    if (rotation % 2 == 0) {
-      // xxXx
-      piece[3][1] = 1;
-      piece[3][2] = 1;
-      piece[3][3] = 1;
-      piece[3][4] = 1;
-    } else {
-      // x
-      // x
-      // X
-      // x
-      piece[1][3] = 1;
-      piece[2][3] = 1;
-      piece[3][3] = 1;
-      piece[4][3] = 1;
-    }
-    break;
-  case 1:
-    // xXx
-    //   x
-    piece[3][2] = 1;
-    piece[3][3] = 1;
-    piece[3][4] = 1;
-    piece[4][4] = 1;
-    for (int i = 0; i < rotation; i++) {
-      rotate_piece(piece);
-    }
-    break;
-  case 2:
-    // xXx
-    // x
-    piece[3][2] = 1;
-    piece[3][3] = 1;
-    piece[3][4] = 1;
-    piece[4][2] = 1;
-    for (int i = 0; i < rotation; i++) {
-      rotate_piece(piece);
-    }
-    break;
-  case 3:
-    // xX
-    // xx
-    piece[3][2] = 1;
-    piece[3][3] = 1;
-    piece[4][2] = 1;
-    piece[4][3] = 1;
-    break;
-  case 4:
-    if (rotation % 2 == 0) {
-      // xX
-      //  xx
-      piece[3][2] = 1;
-      piece[3][3] = 1;
-      piece[4][3] = 1;
-      piece[4][4] = 1;
-    } else {
-      //  x
-      // xX
-      // x
-      piece[2][3] = 1;
-      piece[3][2] = 1;
-      piece[3][3] = 1;
-      piece[4][2] = 1;
-    }
-    break;
-  case 5:
-    // xXx
-    //  x
-    piece[3][2] = 1;
-    piece[3][3] = 1;
-    piece[3][4] = 1;
-    piece[4][3] = 1;
-    for (int i = 0; i < rotation; i++) {
-      rotate_piece(piece);
-    }
-    break;
-  case 6:
-    if (rotation % 2 == 0) {
-      //  Xx
-      // xx
-      piece[3][3] = 1;
-      piece[3][4] = 1;
-      piece[4][2] = 1;
-      piece[4][3] = 1;
-    } else {
-      // x
-      // Xx
-      //  x
-      piece[2][3] = 1;
-      piece[3][3] = 1;
-      piece[3][4] = 1;
-      piece[4][4] = 1;
-    }
-    break;
-  }
-}
-
-static void send_deletes(int deletes) {
-  for (int i = 0; i < deletes; i++) {
-    tetris_send_delete();
-  }
-}
-
-static void send_backspaces(int backspaces) {
-  for (int i = 0; i < backspaces; i++) {
-    tetris_send_backspace();
-    curx--;
-  }
-}
-
-static void send_goto_xy(int x, int y) {
-  while (curx < x) {
-    tetris_send_right();
-    curx++;
-  }
-  while (curx > x) {
-    tetris_send_left();
-    curx--;
-  }
-  while (cury < y) {
-    tetris_send_down();
-    cury++;
-  }
-  while (cury > y) {
-    tetris_send_up();
-    cury--;
-  }
-}
-
-static void draw_row(char c, const char oldrow[7], const char newrow[7], int x, int y) {
-  char str[2] = { c, 0 };
-  char row_is_del[7] = { 0 };
-  int first = -1;
-  int last = -1;
-  for (int px = 0; px < 7; px++) {
-    if (oldrow[px] && !newrow[px]) {
-      row_is_del[px] = 1;
-    }
-    if (newrow[px] || oldrow[px]) {
-      if (first == -1) first = px;
-      last = px;
-    }
-  }
-
-  if (first >= 0) {
-    if (curx > x + last + 1) {
-      send_goto_xy(x + last + 1, cury);
-    }
-    if (curx < x + first) {
-      send_goto_xy(x + first, cury);
-    }
-    send_goto_xy(curx, y);
-    send_deletes((x + last + 1) - curx);
-    send_backspaces(curx - (x + first));
-    for (int i = first; i <= last; i++) {
-      if (row_is_del[i]) {
-        tetris_send_string(".");
-      } else {
-        tetris_send_string(str);
-      }
-      curx++;
-    }
-  }
-}
-
-static void move_piece_from_to(char from[7][7], char to[7][7], int xadd, int yadd) {
-  for (int y = 0; y < 7; y++) {
-    for (int x = 0; x < 7; x++) {
-      if (x + xadd >= 0 && x + xadd < 7 && y + yadd >= 0 && y + yadd < 7) {
-        to[y][x] = from[y + yadd][x + xadd];
-      } else {
-        to[y][x] = 0;
-      }
-    }
-  }
-}
-
-static void draw_piece(char c, int x, int y, char oldpiece[7][7], char piece[7][7]) {
-  for (int py = 0; py < 7; py++) {
-    draw_row(c, oldpiece[py], piece[py], x, y + py);
-  }
-}
-
-static void draw_piece_moved(char c, int x, int y, char piece[7][7], int oldxadd, int oldyadd) {
-  move_piece_from_to(piece, temp_piece, oldxadd, oldyadd);
-  draw_piece(c, x, y, temp_piece, piece);
-}
-
-static int is_piece_hitting(char board[20][10], char piece[7][7], int x, int y) {
-  for (int py = 0; py < 7; py++) {
-    for (int px = 0; px < 7; px++) {
-      if (piece[py][px] &&
-          (px + x >= 10 || px + x < 0
-           || py + y >= 20 || py + y < 0
-           || board[py + y][px + x])) {
-        return 1;
-      }
-    }
-  }
-  return 0;
-}
-
-static void add_piece_to_board(char piece[7][7], char board[20][10], int x, int y) {
-  for (int py = 0; py < 7; py++) {
-    for (int px = 0; px < 7; px++) {
-      if (piece[py][px]) {
-        board[py + y][px + x] = piece[py][px];
-      }
-    }
-  }
-}
-
-static void draw_board_line(void) {
-  //send_string("l          l");
-  tetris_send_string("l..........l");
-  tetris_send_newline();
-}
-static void init(void) {
-  for (int i = 0; i < 20; i++) {
-    draw_board_line();
-  }
-  tetris_send_string("doooooooooob");
-  curx = 12;
-  cury = 20;
-}
-
-static int get_piece_min_y(char piece[7][7]) {
-  for (int y = 0; y < 7; y++) {
-    for (int x = 0; x < 7; x++) {
-      if (piece[y][x])
-        return y;
-    }
-  }
-  return 0;
-}
-
-static int clear_lines(char board[20][10]) {
-  int cleared_lines = 0;
-  for (int y = 19; y >= 0; y--) {
-    char isfull = 1;
-    for (int x = 0; x < 10; x++) {
-      if (!board[y][x]) {
-        isfull = 0;
-      }
-    }
-    if (isfull) {
-      // delete clear line
-      send_goto_xy(12, y);
-      send_backspaces(12); // delete line contents
-      // delete newline
-      tetris_send_backspace();
-      cury--;
-      curx = 12;
-      cleared_lines++;
-    } else {
-      if (cleared_lines > 0) {
-        // move cleared lines down on board
-        for (int x = 0; x < 10; x++) {
-          board[y + cleared_lines][x] = board[y][x];
-        }
-      }
-    }
-  }
-  // clear cleared top lines
-  for (int y = 0; y < cleared_lines; y++) {
-    for (int x = 0; x < 10; x++) {
-      board[y][x] = 0;
-    }
-  }
-  if (cleared_lines > 0) {
-    send_goto_xy(0, 0);
-    for (int i = 0; i < cleared_lines; i++) {
-      draw_board_line();
-      curx = 0;
-      cury++;
-    }
-  }
-  return cleared_lines;
-}
-
-static uint8_t myrandom(uint8_t seed) {
-  uint8_t out = seed >> 1;
-  if (seed & 1) {
-    out = out ^ 0xB8;
-  }
-  return out;
-}
-
-static char piece[7][7];
-static char board[20][10];
-static uint8_t r;
-static int score;
-static int x;
-static int y;
-static int shape;
-static int rotation;
-static int time;
-static int next_down;
-static int down_delay;
-static int first_run;
-static int game_over;
-
-void tetris_start(uint8_t seed) {
-  for (int y = 0; y < 20; y++) {
-    for (int x = 0; x < 10; x++) {
-      board[y][x] = 0;
-    }
-  }
-
-  clear_piece(piece);
-
-  init();
-
-  game_over = 0;
-  
-  r = seed;
-  score = 0;
-  
-  copy_piece_from_to(empty_piece, piece);
-  x = 0;
-  y = 0;
-  shape = 0;
-  rotation = 0;
-  time = 0;
-  next_down = 0;
-  down_delay = -1;
-  first_run = 1;
-}
-
-int tetris_tick(int ms_since_previous_tick) {
-  if (game_over) {
-    return 0;
-  }
-      
-  time += ms_since_previous_tick;
-  
-  if (first_run || time > next_down) {
-    if (first_run || is_piece_hitting(board, piece, x, y + 1)) {
-      first_run = 0;
-      add_piece_to_board(piece, board, x, y);
-
-      score += clear_lines(board);
-
-      down_delay = 500 - score * 10;
-      if (down_delay < 100) {
-        down_delay = 100;
-      }
-        
-      rotation = 0;
-      shape = r % 7;
-      r = myrandom(r);
-      set_piece(piece, shape, rotation);
-      
-      x = 1;
-      y = - get_piece_min_y(piece);
-      draw_piece_moved(get_shape_char(shape), 1 + x, y, piece, 0, 0);
-
-      if (is_piece_hitting(board, piece, x, y)) {
-        game_over = 1;
-        send_goto_xy(12, 10);
-        tetris_send_string(" game over");
-        tetris_send_down();
-        tetris_send_string(" score ");
-        char tmp[10];
-        sprintf(tmp, "%d", score);
-        tetris_send_string(tmp);
-        return 0;
-      }
-    } else {
-      y++;
-      draw_piece_moved(get_shape_char(shape), 1 + x, y, piece, 0, +1);
-    }
-    next_down = time + down_delay;
-  } else {
-      
-    switch (tetris_get_keypress()) {
-    case 1: { // up
-      int oldrotation = rotation;
-      rotation = (rotation + 1) % 4;
-      copy_piece_from_to(piece, temp_piece);
-      set_piece(piece, shape, rotation);
-      if (is_piece_hitting(board, piece, x, y)) {
-        rotation = oldrotation;
-        set_piece(piece, shape, rotation);
-      } else {
-        draw_piece(get_shape_char(shape), 1 + x, y, temp_piece, piece);
-      }
-      break;
-    }
-    case 2: // left
-      if (!is_piece_hitting(board, piece, x - 1, y)) {
-        x--;
-        draw_piece_moved(get_shape_char(shape), 1 + x, y, piece, -1, 0);
-      }
-      break;
-    case 3: {// down
-      int starty = y;
-      while (!is_piece_hitting(board, piece, x, y + 1)) {
-        y++;
-      }
-
-      draw_piece(get_shape_char(shape), x + 1, starty, piece, empty_piece);
-      draw_piece(get_shape_char(shape), x + 1, y, empty_piece, piece);
-
-      next_down = time + down_delay;
-      break;
-    }
-    case 4: // right
-      if (!is_piece_hitting(board, piece, x + 1, y)) {
-        x++;
-        draw_piece_moved(get_shape_char(shape), 1 + x, y, piece, 1, 0);
-      }
-      break;
-    }
-  }
-  return 1;
-}
diff --git a/keyboards/clueboard/66/keymaps/tetris/tetris_text.h b/keyboards/clueboard/66/keymaps/tetris/tetris_text.h
deleted file mode 100644
index 25b4177e0b9..00000000000
--- a/keyboards/clueboard/66/keymaps/tetris/tetris_text.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2017 Dan Amlund Thomsen
- *
- * 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/>.
- */
-#ifndef TETRIS_TEXT_H
-#define TETRIS_TEXT_H
-
-//// to implement
-void tetris_send_up(void);
-void tetris_send_left(void);
-void tetris_send_down(void);
-void tetris_send_right(void);
-
-void tetris_send_backspace(void);
-void tetris_send_delete(void);
-
-void tetris_send_string(const char *s);
-
-void tetris_send_newline(void);
-
-// return = meaning
-// 0 = no keys pressed
-// 1 = up
-// 2 = left
-// 3 = down
-// 4 = right
-int tetris_get_keypress(void);
-
-//// to call
-void tetris_start(uint8_t seed);
-// returns 0 when game is over
-int tetris_tick(int ms_since_previous_tick);
-
-#endif
diff --git a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
deleted file mode 100644
index 2dfaafab022..00000000000
--- a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_GRV,  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_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,
-  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_INT1,  KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,       KC_SPC, KC_SPC,                          KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           KC_INS,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   KC_DEL,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
-  _______, _______, _______, _______,       _______,_______,                         _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,         RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                  RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
-  _______, _______, _______,_______,        RGB_MOD,RGB_MOD,                         _______,  _______,  _______,  _______, RGB_HUD, RGB_SAD,RGB_HUI),
-};
diff --git a/keyboards/clueboard/66/keymaps/unix_optimized/readme.md b/keyboards/clueboard/66/keymaps/unix_optimized/readme.md
deleted file mode 100644
index 79c7daef842..00000000000
--- a/keyboards/clueboard/66/keymaps/unix_optimized/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default Clueboard 66% Layout
-
-This is the default layout except that Caps Lock has been changed to Control
-and Insert and Delete have been put into the Fn layer.
diff --git a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
deleted file mode 100644
index 4a5e8c47204..00000000000
--- a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_GRV,  KC_BSPC,          KC_INS,
-  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_NUHS,  KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,          KC_UP,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,          KC_SPC,KC_SPC,                        KC_INT4,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP,
-  _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL, KC_PAUS,  _______,  _______,  _______,                   _______,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,
-  _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
-
-  /* Keymap _CL: Control layer
-   */
-[_CL] = LAYOUT(
-  _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, RGB_TOG,             RGB_VAI,
-  _______, _______, _______,_______,QK_BOOT,  _______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                   RGB_VAD,
-  _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,
-  MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  MO(_FL),          RGB_SAI,
-  _______, _______, _______,_______,        RGB_MOD,   RGB_MOD,                            _______,  _______,  _______,  _______, RGB_HUD,    RGB_SAD,    RGB_HUI),
-};
diff --git a/keyboards/clueboard/66/keymaps/win_optimized/readme.md b/keyboards/clueboard/66/keymaps/win_optimized/readme.md
deleted file mode 100644
index d79603268d2..00000000000
--- a/keyboards/clueboard/66/keymaps/win_optimized/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default Clueboard 66% Layout
-
-This is the default layout that comes flashed on every Clueboard. For the most
-part it's a straightforward and easy to follow layout. The only unusual key is 
-the key in the upper left, which sends Escape normally, but Grave when any of
-the Ctrl, Alt, or GUI modifiers are held down.
diff --git a/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c b/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
deleted file mode 100644
index 8b2f9d096bd..00000000000
--- a/keyboards/clueboard/66/rev4/keymaps/mine/keymap.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/* THIS FILE WAS GENERATED!
- *
- * This file was generated by qmk json2c. You may or may not want to
- * edit it directly.
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(QK_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_GRV, 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_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_SPC, KC_INT4, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-	[1] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_MUTE, KC_VOLD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, MO(1), KC_TRNS, KC_HOME, KC_PGDN, KC_END),
-	[2] = LAYOUT(BL_STEP, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI)
-};
diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h
index 922426e87b3..07957498d1e 100644
--- a/keyboards/clueboard/66_hotswap/gen1/config.h
+++ b/keyboards/clueboard/66_hotswap/gen1/config.h
@@ -37,34 +37,6 @@
 #define I2C1_SCL_PIN B8
 #define I2C1_SDA_PIN B9
 
-#define LED_MATRIX_LED_COUNT 71
-
-// LED Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
-#define ENABLE_LED_MATRIX_ALPHAS_MODS
-#define ENABLE_LED_MATRIX_BREATHING
-#define ENABLE_LED_MATRIX_BAND
-#define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#define ENABLE_LED_MATRIX_BAND_SPIRAL
-#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#define ENABLE_LED_MATRIX_DUAL_BEACON
-#if defined(LED_MATRIX_KEYREACTIVE_ENABLED)
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SPLASH
-#    define ENABLE_LED_MATRIX_MULTISPLASH
-#endif
-#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-
 #define AUDIO_PIN A5
 #define AUDIO_PIN_ALT A4
 #define AUDIO_PIN_ALT_AS_NEGATIVE
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
index 7af0b964da5..e13a05de054 100644
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
@@ -16,7 +16,7 @@
 #include "quantum.h"
 
 #ifdef LED_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *    driver
  *    |  LED address
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json
index 81a23f7d87a..17e47e66fe8 100644
--- a/keyboards/clueboard/66_hotswap/gen1/info.json
+++ b/keyboards/clueboard/66_hotswap/gen1/info.json
@@ -17,6 +17,28 @@
     "nkro": true
   },
   "led_matrix": {
+    "animations":{
+      "alphas_mods": true,
+      "breathing": true,
+      "band": true,
+      "band_pinwheel": true,
+      "band_spiral": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "cycle_out_in": true,
+      "dual_beacon": true,
+      "solid_reactive_simple": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "wave_left_right": true,
+      "wave_up_down": true
+    },
     "driver": "is31fl3731"
   },
   "matrix_pins": {
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json b/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
deleted file mode 100644
index 6ff257b8509..00000000000
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/json/keymap.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"clueboard/66_hotswap/gen1","keymap":"default_66","layout":"LAYOUT","layers":[["QK_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_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_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","MO(1)","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT"],["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","BL_UP","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_MPRV","KC_MPLY","KC_MNXT","KC_NO","KC_MUTE","BL_DOWN","KC_NO","KC_NO","MO(2)","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","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","MO(1)","KC_NO","KC_HOME","KC_PGDN","KC_END"],["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","BL_TOGG","BL_UP","KC_NO","KC_NO","KC_NO","KC_NO","QK_BOOT","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_DOWN","KC_NO","KC_NO","MO(2)","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","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","BL_STEP","KC_NO","KC_NO","MO(1)","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"","notes":""}
\ No newline at end of file
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
index 98c9f4d5f17..7799110ba6d 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -14,7 +14,6 @@
     "command": false,
     "console": true,
     "extrakey": true,
-    "lto": true,
     "midi": false,
     "mousekey": true,
     "nkro": false,
diff --git a/keyboards/coarse/ixora/keymaps/wntrmln/keymap.c b/keyboards/coarse/ixora/keymaps/wntrmln/keymap.c
deleted file mode 100644
index bf26771b7c8..00000000000
--- a/keyboards/coarse/ixora/keymaps/wntrmln/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-----------------.
-   * |QK_BOOT|  2  |  3  |
-   * |-----------------|
-   * |Caps |NmLk |ScLk |
-   * `-----------------'
-   */
-[0] = LAYOUT_full(
-  KC_PSCR, KC_MUTE, LGUI(KC_1),
-  KC_MPRV, KC_MPLY, KC_MNXT)
-};
-
-void matrix_init_user(void) {
-  //user initialization
-}
-
-void matrix_scan_user(void) {
-  //user matrix
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/compensator/info.json b/keyboards/compensator/info.json
new file mode 100644
index 00000000000..fbba0d750e8
--- /dev/null
+++ b/keyboards/compensator/info.json
@@ -0,0 +1,162 @@
+{
+    "keyboard_name": "Compensator",
+    "manufacturer": "Highleap",
+    "url": "https://lrfoster03.github.io/",
+    "maintainer": "Lrfoster03",
+    "usb": {
+        "vid": "0x564B",
+        "pid": "0x0001",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "rows": ["B2", "F5", "F7", "F1", "B3", "F4", "F6", "F0"],
+        "cols": ["B0", "D4", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B1", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": false
+    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "indicators": {
+        "caps_lock": "E6"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [4, 0], "x": 2.25, "y": 0},
+                {"matrix": [4, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [4, 2], "x": 6.5, "y": 0},
+                {"matrix": [4, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.75, "y": 0, "w": 1.5},
+                {"matrix": [4, 4], "x": 11.25, "y": 0},
+                {"matrix": [4, 5], "x": 12.25, "y": 0},
+                {"matrix": [0, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [4, 6], "x": 15.25, "y": 0},
+                {"matrix": [4, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+                {"matrix": [0, 9], "x": 18.25, "y": 0},
+                {"matrix": [4, 8], "x": 19.25, "y": 0},
+                {"matrix": [4, 9], "x": 20.25, "y": 0},
+                {"matrix": [0, 10], "x": 21.25, "y": 0},
+                {"matrix": [0, 11], "x": 22.25, "y": 0},
+                {"matrix": [4, 10], "x": 23.25, "y": 0, "w": 1.5},
+                {"matrix": [4, 11], "x": 25, "y": 0},
+                {"matrix": [0, 12], "x": 26, "y": 0},
+                {"matrix": [0, 13], "x": 27, "y": 0},
+                {"matrix": [4, 12], "x": 28.25, "y": 0},
+                {"matrix": [4, 13], "x": 29.25, "y": 0},
+                {"matrix": [0, 14], "x": 30.25, "y": 0},
+                {"matrix": [0, 15], "x": 31.25, "y": 0},
+                {"matrix": [4, 14], "x": 32.5, "y": 0},
+                {"matrix": [4, 15], "x": 33.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [5, 0], "x": 2.25, "y": 1},
+                {"matrix": [5, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [5, 2], "x": 6.5, "y": 1},
+                {"matrix": [5, 3], "x": 7.5, "y": 1},
+                {"matrix": [1, 4], "x": 8.5, "y": 1},
+                {"matrix": [1, 5], "x": 9.75, "y": 1, "w": 1.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 1},
+                {"matrix": [5, 5], "x": 12.5, "y": 1},
+                {"matrix": [1, 6], "x": 13.5, "y": 1},
+                {"matrix": [1, 7], "x": 14.5, "y": 1},
+                {"matrix": [5, 6], "x": 15.5, "y": 1},
+                {"matrix": [5, 7], "x": 16.5, "y": 1},
+                {"matrix": [1, 8], "x": 17.5, "y": 1},
+                {"matrix": [1, 9], "x": 18.5, "y": 1},
+                {"matrix": [5, 8], "x": 19.5, "y": 1},
+                {"matrix": [5, 9], "x": 20.5, "y": 1},
+                {"matrix": [1, 10], "x": 21.5, "y": 1},
+                {"matrix": [1, 11], "x": 22.5, "y": 1, "w": 2.25},
+                {"matrix": [5, 11], "x": 25, "y": 1},
+                {"matrix": [1, 12], "x": 26, "y": 1},
+                {"matrix": [1, 13], "x": 27, "y": 1},
+                {"matrix": [5, 12], "x": 28.25, "y": 1},
+                {"matrix": [5, 13], "x": 29.25, "y": 1},
+                {"matrix": [1, 14], "x": 30.25, "y": 1},
+                {"matrix": [1, 15], "x": 31.25, "y": 1},
+                {"matrix": [5, 14], "x": 32.5, "y": 1},
+                {"matrix": [5, 15], "x": 33.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [6, 0], "x": 2.25, "y": 2},
+                {"matrix": [6, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 3], "x": 7.5, "y": 2},
+                {"matrix": [2, 4], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 5], "x": 12, "y": 2},
+                {"matrix": [2, 6], "x": 13, "y": 2},
+                {"matrix": [2, 7], "x": 14, "y": 2},
+                {"matrix": [6, 6], "x": 15, "y": 2},
+                {"matrix": [6, 7], "x": 16, "y": 2},
+                {"matrix": [2, 8], "x": 17, "y": 2},
+                {"matrix": [2, 9], "x": 18, "y": 2},
+                {"matrix": [6, 8], "x": 19, "y": 2},
+                {"matrix": [6, 9], "x": 20, "y": 2},
+                {"matrix": [2, 10], "x": 21, "y": 2},
+                {"matrix": [2, 11], "x": 22, "y": 2, "w": 1.75},
+                {"matrix": [6, 10], "x": 23.75, "y": 2},
+                {"matrix": [6, 11], "x": 25, "y": 2},
+                {"matrix": [2, 12], "x": 26, "y": 2},
+                {"matrix": [2, 13], "x": 27, "y": 2},
+                {"matrix": [6, 12], "x": 28.25, "y": 2},
+                {"matrix": [6, 13], "x": 29.25, "y": 2},
+                {"matrix": [2, 14], "x": 30.25, "y": 2},
+                {"matrix": [2, 15], "x": 31.25, "y": 2},
+                {"matrix": [6, 14], "x": 32.5, "y": 2},
+                {"matrix": [6, 15], "x": 33.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [3, 4], "x": 8.5, "y": 3},
+                {"matrix": [3, 5], "x": 9.75, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 12.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 7], "x": 13.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 16.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 9], "x": 18, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 20.75, "y": 3, "w": 1.5},
+                {"matrix": [7, 10], "x": 23.25, "y": 3, "w": 1.5},
+                {"matrix": [7, 11], "x": 25, "y": 3},
+                {"matrix": [3, 12], "x": 26, "y": 3},
+                {"matrix": [3, 13], "x": 27, "y": 3},
+                {"matrix": [7, 12], "x": 28.25, "y": 3},
+                {"matrix": [7, 13], "x": 29.25, "y": 3},
+                {"matrix": [3, 14], "x": 30.25, "y": 3},
+                {"matrix": [3, 15], "x": 31.25, "y": 3},
+                {"matrix": [7, 14], "x": 32.5, "y": 3},
+                {"matrix": [7, 15], "x": 33.5, "y": 3}
+           ]
+        }
+    }
+}
diff --git a/keyboards/compensator/keymaps/default/keymap.c b/keyboards/compensator/keymaps/default/keymap.c
new file mode 100644
index 00000000000..0bdf18496a8
--- /dev/null
+++ b/keyboards/compensator/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2024 Lrfoster03
+ *
+ * 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 custom_keycodes {
+    KC_P00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
+        KC_F1,  KC_F2,     KC_PPLS,  KC_P7, KC_P8, KC_P9,          KC_INS,  KC_HOME, KC_PGUP,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,                KC_INS,  KC_HOME, KC_PGUP,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_F1,  KC_F2,
+        KC_F3,  KC_F4,     KC_PMNS,  KC_P4, KC_P5, KC_P6,          KC_DEL,  KC_END,  KC_PGDN,          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                          KC_DEL,  KC_END,  KC_PGDN,          KC_P4,   KC_P5,   KC_P6,   KC_PMNS,     KC_F3,  KC_F4,
+        KC_F5,  KC_F6,     KC_PENT,  KC_P1, KC_P2, KC_P3,          KC_NO,   KC_UP,   KC_NO,            KC_LSFT, KC_BSLS, 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_NO,   KC_UP,   KC_NO,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_F5,  KC_F6,
+        KC_F7,  KC_F8,     KC_PMNS,  KC_PDOT, KC_P0, KC_P00,       KC_LEFT, KC_DOWN, KC_RIGHT,         KC_LCTL, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LCTL,                                                                               KC_LEFT, KC_DOWN, KC_RIGHT,         KC_P00,  KC_P0,  KC_PDOT,  KC_PMNS,     KC_F7,  KC_F8
+    ),
+
+    [1] = LAYOUT( /* MO(1) */
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_NUM,           KC_TRNS,  KC_TRNS, 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_NUM,  KC_TRNS, KC_TRNS,          KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS,  KC_TRNS,         KC_TRNS,   KC_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_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_TRNS,  KC_VOLD, 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
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case KC_P00:
+                tap_code(KC_P0);
+                tap_code(KC_P0);
+                return false;
+        }
+    }
+    return true;
+}
diff --git a/keyboards/compensator/keymaps/via/keymap.c b/keyboards/compensator/keymaps/via/keymap.c
new file mode 100644
index 00000000000..a7285b32577
--- /dev/null
+++ b/keyboards/compensator/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2024 Lrfoster03
+ *
+ * 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 custom_keycodes {
+    KC_P00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
+        KC_F1,  KC_F2,     KC_PPLS,  KC_P7, KC_P8, KC_P9,          KC_INS,  KC_HOME, KC_PGUP,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,                KC_INS,  KC_HOME, KC_PGUP,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_F1,  KC_F2,
+        KC_F3,  KC_F4,     KC_PMNS,  KC_P4, KC_P5, KC_P6,          KC_DEL,  KC_END,  KC_PGDN,          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                          KC_DEL,  KC_END,  KC_PGDN,          KC_P4,   KC_P5,   KC_P6,   KC_PMNS,     KC_F3,  KC_F4,
+        KC_F5,  KC_F6,     KC_PENT,  KC_P1, KC_P2, KC_P3,          KC_NO,   KC_UP,   KC_NO,            KC_LSFT, KC_BSLS, 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_NO,   KC_UP,   KC_NO,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_F5,  KC_F6,
+        KC_F7,  KC_F8,     KC_PMNS,  KC_PDOT, KC_P0, KC_P00,       KC_LEFT, KC_DOWN, KC_RIGHT,         KC_LCTL, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LCTL,                                                                               KC_LEFT, KC_DOWN, KC_RIGHT,         KC_P00,  KC_P0,  KC_PDOT,  KC_PMNS,     KC_F7,  KC_F8
+    ),
+
+    [1] = LAYOUT( /* MO(1) */
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_NUM,           KC_TRNS,  KC_TRNS, 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_NUM,  KC_TRNS, KC_TRNS,          KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,   KC_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_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_TRNS,  KC_VOLD, 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
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case KC_P00:
+                tap_code(KC_P0);
+                tap_code(KC_P0);
+                return false;
+        }
+    }
+    return true;
+}
diff --git a/keyboards/kudox/columner/keymaps/via/rules.mk b/keyboards/compensator/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kudox/columner/keymaps/via/rules.mk
rename to keyboards/compensator/keymaps/via/rules.mk
diff --git a/keyboards/compensator/matrix_diagram.md b/keyboards/compensator/matrix_diagram.md
new file mode 100644
index 00000000000..39eeec7b509
--- /dev/null
+++ b/keyboards/compensator/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for Compensator
+
+```
+┌───────┐┌───────────────┐┌───────────┐┌───────────────────────────────────────────────────────────┐┌───────────┐┌───────────────┐┌───────┐
+│00 │01 ││02 │03 │04 │05 ││06 │07 │08 ││09   │0A │0B │0C │0D │0E │0F │0G │0H │0I │0J │0K │0L │0M   ││0N │0O │0P ││0Q │0R │0S │0T ││0U │0V │
+├───┼───┤├───┼───┼───┼───┤├───┼───┼───│├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┼───┼───│├───┼───┼───┼───┤├───┼───┤
+│10 │11 ││12 │13 │14 │15 ││16 │17 │18 ││19    │1A │1B │1C │1D │1E │1F │1G │1H │1I │1J │1K │1L      ││1M │1N │1O ││1P │1Q │1R │1S ││1T │1U │
+├───┼───┤├───┼───┼───┼───┤└───┼───┼───┘├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤└───┼───┼───┘├───┼───┼───┼───┤├───┼───┤
+│20 │21 ││22 │23 │24 │25 │    │26 │    │27  │28 │29 │2A │2B │2C │2D │2E │2F │2G │2H │2I │2J    │2K │    │1L │    │2M │2N │2O │2P ││2Q │2R │
+├───┼───┤├───┼───┼───┼───┤┌───┼───┼───┐├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐├───┼───┼───┼───┤├───┼───┤
+│31 │32 ││33 │34 │35 │36 ││37 │38 │39 ││3A   │   │3B   │3C                         │3D   │   │3E   ││3F │3G │3H ││3I │3J │3K │3L ││30 │31 │
+└───┴───┘└───┴───┴───┴───┘└───┴───┴───┘└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘└───┴───┴───┴───┘└───┴───┘
+                 ┌───────┐             ┌────────┐                                       ┌──────────┐             ┌───────┐
+  2u Numpad Zero │36     │             │27      │ 2.25u LShift             2.75u RShift │2J        │             │3I     │ 2u Numpad Zero
+                 └───────┘             └────────┘                                       └──────────┘             └───────┘
+         ┌───┐                                    ┌───────────────────────────────────────┐                                  ┌───┐
+         │   │ 2u                                 │3C                                     │ 10u Space                        │   │ 2u
+         │02 │ Numpad                             └───────────────────────────────────────┘                                  │0T │ Numpad
+         │   │ Plus                                                                                                          │   │ Plus
+         ├───┤                                         ┌─────────┐┌─────┐┌─────────┐ 2.75 + 1.5 +                            ├───┤
+         │   │ 2u                                      |3C       ||3C   ||3C       | 2.75 Split                              │   │ 2u
+         │33 │ Numpad                                  └─────────┘└─────┘└─────────┘ Spacebar                                │3L │ Numpad
+         │   │ Enter                                                                                                         │   │ Enter
+         └───┘                                                                                                               └───┘
+```
diff --git a/keyboards/compensator/readme.md b/keyboards/compensator/readme.md
new file mode 100644
index 00000000000..13502ecad2d
--- /dev/null
+++ b/keyboards/compensator/readme.md
@@ -0,0 +1,24 @@
+# The Compensator
+
+[Compensator](https://i.imgur.com/fAB2SSTh.png)
+
+A 40% monstrosity with 10U spacebar support and a required 2 keycap sets to fill. It supports VIA. [Geekhack Post](https://geekhack.org/index.php?topic=122493.0)
+
+* Keyboard Maintainer: [Lrfoster03](https://lrfoster03.github.io/) and on [GitHub](https://github.com/Lrfoster03)
+* Hardware Supported: A 40% with 2 numpads, 2 nav clusters, and 2 XT columns with an ATMEGU32U4
+* Hardware Availability: Contact @victusss on discord. [vk.works Discord](https://discord.gg/7weV2kyqFB)
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make compensator: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).
+
+### Flash
+- Ensure PCB is plugged in and recognized by the computer
+- Hold Physical reset button on back of the PCB to enter bootloader mode
+- Flash using QMK Toolbox or CLI (`make compensator:<keymap>:flash`)
diff --git a/keyboards/compensator/rules.mk b/keyboards/compensator/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/compensator/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/contra/keymaps/alper/config.h b/keyboards/contra/keymaps/alper/config.h
deleted file mode 100644
index 6114392f63e..00000000000
--- a/keyboards/contra/keymaps/alper/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/contra/keymaps/alper/keymap.c b/keyboards/contra/keymaps/alper/keymap.c
deleted file mode 100644
index 1ffa892dfd9..00000000000
--- a/keyboards/contra/keymaps/alper/keymap.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,---------------------------------------------------------------------------------------------------.
-   * | Esc       |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I      |   O  |   P  |    Bksp     |
-   * |-----------+------+------+------+------+-------------+------+----------+------+------+-------------|
-   * | Ctrl/Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K      |   L  |   ;  |     "       |
-   * |-----------+------+------+------+------+------|------+------+----------+------+------+-------------|
-   * | Shift/Esc |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,      |   .  |   /  | Shift/Enter |
-   * |-----------+------+------+------+------+------+------+------+----------+------+------+-------------|
-   * | Tab       | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | GUI/Left | Down |  Up  |    Right    |
-   * `---------------------------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_planck_mit(
-    KC_ESC,               KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,                  KC_O,    KC_P,    KC_BSPC,
-    MT(MOD_LCTL, KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,                  KC_L,    KC_SCLN, KC_QUOT,
-    MT(MOD_LSFT, KC_ESC), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,               KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
-    KC_TAB,               KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   MT(MOD_RGUI, KC_LEFT), KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Colemak
-   * ,---------------------------------------------------------------------------------------------------.
-   * | Esc       |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |     U    |   Y  |   ;  |    Bksp     |
-   * |-----------+------+------+------+------+-------------+------+----------+------+------+-------------|
-   * | Ctrl/Tab  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |     E    |   I  |   O  |     "       |
-   * |-----------+------+------+------+------+------|------+------+----------+------+------+-------------|
-   * | Shift/Esc |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |     ,    |   .  |   /  | Shift/Enter |
-   * |-----------+------+------+------+------+-------------+------+----------+------+------+------+------|
-   * | Tab       | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | GUI/Left | Down |  Up  |    Right    |
-   * `---------------------------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT_planck_mit(
-    KC_ESC,               KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,                  KC_Y,    KC_SCLN, KC_BSPC,
-    MT(MOD_LCTL, KC_TAB), KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,                  KC_I,    KC_O,    KC_QUOT,
-    MT(MOD_LSFT, KC_ESC), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM,               KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
-    KC_TAB,               KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   MT(MOD_RGUI, KC_LEFT), KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Dvorak
-   * ,---------------------------------------------------------------------------------------------------.
-   * | Esc       |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C      |   R  |   L  | Bksp        |
-   * |-----------+------+------+------+------+-------------+------+----------+------+------+-------------|
-   * | Ctrl/Tab  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T      |   N  |   S  | /           |
-   * |-----------+------+------+------+------+------|------+------+----------+------+------+-------------|
-   * | Shift/Esc |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W      |   V  |   Z  | Shift/Enter |
-   * |-----------+------+------+------+------+------+------+------+----------+------+------+-------------|
-   * | Tab       | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | GUI/Left | Down |  Up  | Right       |
-   * `---------------------------------------------------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT_planck_mit(
-    KC_ESC,               KC_QUOT, KC_COMM, KC_DOT,  KC_P,  KC_Y,    KC_F,    KC_G,    KC_C,                  KC_R,    KC_L,    KC_BSPC,
-    MT(MOD_LCTL, KC_TAB), KC_A,    KC_O,    KC_E,    KC_U,  KC_I,    KC_D,    KC_H,    KC_T,                  KC_N,    KC_S,    KC_SLSH,
-    MT(MOD_LSFT, KC_ESC), KC_SCLN, KC_Q,    KC_J,    KC_K,  KC_X,    KC_B,    KC_M,    KC_W,                  KC_V,    KC_Z,    MT(MOD_RSFT, KC_ENT),
-    KC_TAB,               KC_LCTL, KC_LALT, KC_LGUI, LOWER,      KC_SPC,      RAISE,   MT(MOD_RGUI, KC_LEFT), KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_planck_mit(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______,     _______,      _______,    KC_MFFD,    KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Raise
-   * ,----------------------------------------------------------------------------------------------.
-   * |   `       |   1     |      2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |-----------+---------+---------+------+------+-------------+------+------+------+------+------|
-   * | Del       |  F1     |  F2     |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |-----------+---------+---------+------+------+------|------+------+------+------+------+------|
-   * |           |  F7     |  F8     |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-   * |-----------+---------+---------+------+------+------+------+------+------+------+------+------|
-   * | AppSwitch | PrevTab | NextTab |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `----------------------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_planck_mit(
-    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_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_PGUP, KC_PGDN, _______,
-    LGUI(KC_GRAVE), LGUI(LSFT(KC_LBRC)),      LGUI(LSFT(KC_RBRC)),      _______, _______, _______,          _______, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/contra/keymaps/alper/readme.md b/keyboards/contra/keymaps/alper/readme.md
deleted file mode 100644
index 0b9cab507f8..00000000000
--- a/keyboards/contra/keymaps/alper/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Alper's Contra Layout
-
-![Dvorak Layout](https://i.imgur.com/BvBYgpz.png)
-
-## Rationale
-
-I based this off the default and changed some stuff because I'm a macOS user who types in Dvorak:
-
-* Ctrl/Tab: It is normal to remap Caps Lock to control there and having a press button there for Tab would solve a lot of problems. BUT on my Contra this button is broken, so I've mapped 0,0 to Tab as well.
-* Shift/Esc: A standard left shift with an Escape that I have not been utilizing much in favor of the top corner button.
-* Tab: The replacement tab.
-* Overloaded the Left arrow with another GUI (Command) button because that is essential on macOS.
-* Overloaded the Enter button with a Shift because like Command, it is essential for me to have these on both sides of the keyboard.
-* Raise-0,0: Switches between windows of an application.
-* Raise-0,1-2: Dedicated next and previous tab buttons since these key combinations caused a finger twister.
-
-
-## TODO
-
-* Try out tapdance for brackets (see ryanm101/keymap.c)
-* REMAP ESC To LT() so I can use it to select numbers (_NUMB) and functions more easily? (see msiu/keymap.c) https://docs.qmk.fm/#/feature_advanced_keycodes?id=switching-and-toggling-layers
-* Wipe everything except Dvorak and Qwerty (see deastiny/keymap.c)
\ No newline at end of file
diff --git a/keyboards/contra/keymaps/basic/config.h b/keyboards/contra/keymaps/basic/config.h
deleted file mode 100644
index 928ddb1617e..00000000000
--- a/keyboards/contra/keymaps/basic/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/contra/keymaps/basic/keymap.c b/keyboards/contra/keymaps/basic/keymap.c
deleted file mode 100644
index 1b5336b8e52..00000000000
--- a/keyboards/contra/keymaps/basic/keymap.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  LOWER,
-  RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | `    |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Esc  | Tab  | Alt  | GUI  |Lower |    Space    |Raise | Left |Right |  Up  |Down  |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_planck_mit(
-    KC_GRV,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    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, KC_ENT ,
-    KC_ESC,  KC_TAB, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_RGHT, KC_UP,   KC_DOWN
-  ),
-
-  /* Colemak
-   * ,-----------------------------------------------------------------------------------.
-   * | `    |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Ctrl |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  '   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Esc  | Tab  | Alt  | GUI  |Lower |    Space    |Raise | Left |Right |  Up  |Down  |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT_planck_mit(
-    KC_GRV,  KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_LCTL, 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_ENT ,
-    KC_ESC,  KC_TAB, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_RGHT, KC_UP,   KC_DOWN
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_planck_mit(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______,     _______,      _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_planck_mit(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      |      |      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |      |      |AGnorm|AGswap|Qwerty|Colemk|      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT_planck_mit(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-    _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/contra/keymaps/basic/readme.md b/keyboards/contra/keymaps/basic/readme.md
deleted file mode 100644
index a2397b798b4..00000000000
--- a/keyboards/contra/keymaps/basic/readme.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# A Basic Contra Layout
-
-The *default* layout currently (as of Mar 19, 2018) has a lot of components from Planck's default layout and is not very suitable for a basic Contra board. This basic layout is developed from Planck's default layout but has removed the parts that's irrelevant to a Contra board.  
-
-My other keyboard is a HHKB and I don't use `Tab` or `Esc` key that much and hence the unusual placements for those keys.
-
-## QWERTY (Normal) Layer
-```
-,-----------------------------------------------------------------------------------.
- | `    |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Esc  | Tab  | Alt  | GUI  |Lower |    Space    |Raise | Left |Right |  Up  |Down  |
- `-----------------------------------------------------------------------------------'
-```
-
-## Colemak Layer
-Switch from `Adjust` layer.
-```
-,-----------------------------------------------------------------------------------.
- | `    |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Ctrl |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  '   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Esc  | Tab  | Alt  | GUI  |Lower |    Space    |Raise | Left |Right |  Up  |Down  |
- `-----------------------------------------------------------------------------------'
-```
-
-## Lower
-```
-,-----------------------------------------------------------------------------------.
- |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- `-----------------------------------------------------------------------------------'
-```
-
-## Raise
-```
-,-----------------------------------------------------------------------------------.
- |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- `-----------------------------------------------------------------------------------'
-```
-
-## Adjust
-`AGnorm` and `AGswap` switches `alt` and `os` key on the keyboard.
-```
-,-----------------------------------------------------------------------------------.
- |      |      |      |      |      |      |      |      |      |      |      |  Del |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |      |      |      |      |      |AGnorm|AGswap|Qwerty|Colemk|      |      |      |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |      |      |      |      |      |      |      |      |      |      |      |      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |             |      |      |      |      |      |
- `-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/contra/keymaps/basic_qwerty/config.h b/keyboards/contra/keymaps/basic_qwerty/config.h
deleted file mode 100644
index 179070dc7b5..00000000000
--- a/keyboards/contra/keymaps/basic_qwerty/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2021 Stehpon Parker (@stephondoestech)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
diff --git a/keyboards/contra/keymaps/basic_qwerty/keymap.c b/keyboards/contra/keymaps/basic_qwerty/keymap.c
deleted file mode 100644
index db41d1d5b14..00000000000
--- a/keyboards/contra/keymaps/basic_qwerty/keymap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- * Contributor 2022 Stephon Parker
- *
- * 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 planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | CAPS | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left |Right |  Up  |Down  |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_planck_mit(
-    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_ENT,
-    KC_LSFT, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-    KC_CAPS,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_RGHT, KC_UP,   KC_DOWN
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Del  |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_planck_mit(
-    KC_TILD,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-    KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_DEL, _______, _______, _______, _______,     _______,      _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_planck_mit(
-    KC_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN,    KC_BSPC,
-    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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      |      |      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |      |      |AGnorm|AGswap|Qwerty|      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT_planck_mit(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-    _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/contra/keymaps/basic_qwerty/readme.md b/keyboards/contra/keymaps/basic_qwerty/readme.md
deleted file mode 100644
index d5aa56666d1..00000000000
--- a/keyboards/contra/keymaps/basic_qwerty/readme.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# A Basic QWERTY Layout
-
-The Contra layer was something that I didn't see widely utilized as a US standard so I tweaked the basic layout layout by Jack Humbert. It's closer to the standard layout you would get on a US keyboard. I also moved the rest of the special characters to the lower layer. 
-
-This is almost the same as my MechWild Marcuio keyboard.
-
-# A Basic Contra Layout
-
-The *default* layout currently (as of Mar 19, 2018) has a lot of components from Planck's default layout and is not very suitable for a basic Contra board. This basic layout is developed from Planck's default layout but has removed the parts that's irrelevant to a Contra board.  
-
-My other keyboard is a HHKB and I don't use `Tab` or `Esc` key that much and hence the unusual placements for those keys.
-
-## QWERTY (Normal) Layer
-```
-,-----------------------------------------------------------------------------------.
- | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | CAPS | Tab  | Alt  | GUI  |Lower |    Space    |Raise | Left |Right |  Up  |Down  |
- `-----------------------------------------------------------------------------------'
-```
-
-## Lower
-```
-,-----------------------------------------------------------------------------------.
- |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |  \   |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- `-----------------------------------------------------------------------------------'
-```
-
-## Raise
-```
-,-----------------------------------------------------------------------------------.
- |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- `-----------------------------------------------------------------------------------'
-```
-
-## Adjust
-`AGnorm` and `AGswap` switches `alt` and `os` key on the keyboard.
-```
-,-----------------------------------------------------------------------------------.
- |      |      |      |      |      |      |      |      |      |      |      |  Del |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |      |      |      |      |      |AGnorm|AGswap|Qwerty|      |      |      |      |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |      |      |      |      |      |      |      |      |      |      |      |      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |             |      |      |      |      |      |
- `-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/contra/keymaps/bramver/README.md b/keyboards/contra/keymaps/bramver/README.md
deleted file mode 100644
index c5a887ce2c1..00000000000
--- a/keyboards/contra/keymaps/bramver/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contra layout
-
-My current setup consists of a very simple base layer, numbers layer, mouse layer and emoji layer.
-Still many options, but time will tell if changes are needed.
-
-## Keymap
-
-```
-#define SP_MSE LT(_MOUSE, KC_SPC)
-
-
-BASE layer
-  { QK_GESC , 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_ENT  }, 
-  { KC_LSFT , KC_Z    , KC_X    , KC_C    , KC_V    , KC_B    , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_QUOT }, 
-  { KC_LCTL , KC_GRV  , KC_LALT , KC_LGUI , MO(1)   , SP_MSE  , SP_MSE  , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , MO(2)   },
-
-LOWER layer
-  { _______ , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_DEL  }, 
-  { _______ , KC_F1   , KC_F2   , KC_F3   , KC_LBRC , KC_MINS , KC_EQL  , KC_RBRC , KC_F7   , KC_F8   , KC_F9   , _______ }, 
-  { _______ , KC_F4   , KC_F5   , KC_F6   , KC_HOME , KC_BSLS , KC_MPLY , KC_END  , KC_F10  , KC_F11  , KC_F12  , _______ }, 
-  { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-
-EMOJI layer
-  { _______ , UM(CLAP) , UM(CUM)  , UM(BNIS) , UM(BUTT) , UM(CAR)  , UM(FIRE) , UM(REDB) , UM(MONY) , UM(HNDR) , UM(SOS)  , _______ },
-  { _______ , UM(CELE) , UM(PRAY) , UM(NAIL) , UM(OK)   , UM(THNK) , UM(UNAM) , UM(HEYE) , UM(COOL) , UM(EYES) , UM(SMIR) , _______ },
-  { _______ , UM(TRIU) , UM(SCRM) , UM(VOMI) , UM(DTIV) , UM(EXPL) , UM(HAIR) , UM(DANC) , UM(STRN) , UM(LEFT) , UM(RGHT) , _______ },
-  { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-
-MOUSE layer
-  { _______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______ },
-  { _______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______ },
-  { _______ , KC_VOLD , KC_VOLU , KC_MPRV , KC_MNXT , KC_MPLY , KC_MPLY , KC_MPRV , KC_MNXT , KC_VOLD , KC_VOLU , _______ },
-  { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-```
\ No newline at end of file
diff --git a/keyboards/contra/keymaps/bramver/config.h b/keyboards/contra/keymaps/bramver/config.h
deleted file mode 100755
index de2a9b0ee14..00000000000
--- a/keyboards/contra/keymaps/bramver/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-                                
-#define MOUSEKEY_DELAY             0
-#define MOUSEKEY_INTERVAL          16
-#define MOUSEKEY_MAX_SPEED         7
-#define MOUSEKEY_TIME_TO_MAX       60
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-#define MOUSEKEY_WHEEL_DELAY 0
diff --git a/keyboards/contra/keymaps/bramver/keymap.c b/keyboards/contra/keymaps/bramver/keymap.c
deleted file mode 100644
index 08f25119c27..00000000000
--- a/keyboards/contra/keymaps/bramver/keymap.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Copyright 2018 darm
- *
- * 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 emoji_map {
-  UNAM, // unamused 😒
-  HEYE, // smiling face with heart shaped eyes 😍
-  OK, // ok hand sign 👌
-  SMIR, // smirk 😏
-  PRAY, // pray 🙏
-  CELE, // celebration 🙌
-  COOL, // smile with sunglasses 😎
-  EYES, // eyes
-  THNK, // BIG THONK
-  NAIL, // Nailcare
-  SOS, // Vuile sos
-  REDB, // Red B
-  HNDR, // 100
-  MONY,
-  FIRE,
-  CAR,
-  BUTT,
-  BNIS,
-  CUM,
-  CLAP,
-  TRIU, // Fart from nose
-  SCRM,
-  VOMI,
-  DTIV, // Detective
-  EXPL, // Brainsplosion
-  HAIR, // Haircut
-  DANC, // Salsa dancer
-  STRN, // Stronk
-  LEFT, // Point Left
-  RGHT, // Point Right
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-  [UNAM] = 0x1F612,
-  [HEYE] = 0x1f60d,
-  [OK]   = 0x1F44C,
-  [SMIR] = 0x1F60F,
-  [PRAY] = 0x1F64F,
-  [CELE] = 0x1F64C,
-  [COOL] = 0x1F60E,
-  [EYES] = 0x1F440,
-  [THNK] = 0x1F914,
-  [NAIL] = 0x1F485,
-  [SOS] = 0x1F198,
-  [REDB] = 0x1F171,
-  [HNDR] = 0x1F4AF,
-  [MONY] = 0x1F480,
-  [FIRE] = 0x1F525,
-  [CAR] = 0x1F697,
-  [BUTT] = 0x1F351,
-  [BNIS] = 0x1F346,
-  [CUM] = 0x1F4A6,
-  [CLAP] = 0x1F44F,
-  [TRIU] = 0x1F624,
-  [SCRM] = 0x1F631,
-  [VOMI] = 0x1F92E,
-  [DTIV] = 0x1F575,
-  [EXPL] = 0x1F92F,
-  [HAIR] = 0x2640,
-  [DANC] = 0x1F483,
-  [STRN] = 0x1F4AA,
-  [LEFT] = 0x1F448,
-  [RGHT] = 0x1F449,
-};
-
-// Layer shorthand
-#define _BASE     0
-#define _LOWER    1
-#define _EMOJI    2
-#define _MOUSE    3
-
-#define SP_MSE LT(_MOUSE, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[_BASE] = LAYOUT_ortho_4x12(
-			QK_GESC	, 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_ENT	, 
-			KC_LSFT	, KC_Z		, KC_X		, KC_C		, KC_V 		, KC_B 		, KC_N 		, KC_M 		, KC_COMM , KC_DOT 	, KC_SLSH , KC_QUOT	, 
-			KC_LCTL	, KC_GRV  , KC_LALT	, KC_LGUI , MO(1)		, SP_MSE 	, SP_MSE	, KC_LEFT , KC_DOWN , KC_UP 	, KC_RGHT , MO(2)   
-	),
-
-	[_LOWER] = LAYOUT_ortho_4x12(
-			_______ , KC_1 		, KC_2 		, KC_3		, KC_4		, KC_5		, KC_6		, KC_7 		, KC_8		, KC_9		, KC_0		, KC_DEL	, 
-			_______ , KC_F1		, KC_F2 	, KC_F3		, KC_LBRC , KC_MINS	, KC_EQL	, KC_RBRC , KC_F7		, KC_F8		, KC_F9		, _______	, 
-			_______ , KC_F4		, KC_F5 	, KC_F6 	, KC_HOME , KC_BSLS , KC_MPLY	, KC_END	, KC_F10	, KC_F11	, KC_F12	, _______	, 
-			_______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ 
-	),
-
-	[_EMOJI] = LAYOUT_ortho_4x12(
-			_______ , UM(CLAP) , UM(CUM)  , UM(BNIS) , UM(BUTT) , UM(CAR)  , UM(FIRE) , UM(REDB) , UM(MONY) , UM(HNDR) , UM(SOS)  , _______ ,
-			_______ , UM(CELE) , UM(PRAY) , UM(NAIL) , UM(OK)   , UM(THNK) , UM(UNAM) , UM(HEYE) , UM(COOL) , UM(EYES) , UM(SMIR) , _______ ,
-			_______ , UM(TRIU) , UM(SCRM) , UM(VOMI) , UM(DTIV) , UM(EXPL) , UM(HAIR) , UM(DANC) , UM(STRN) , UM(LEFT) , UM(RGHT) , _______ ,
-			_______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ 
-	),
-
-	[_MOUSE] = LAYOUT_ortho_4x12(
-			_______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______ ,
-			_______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______ ,
-			_______ , KC_VOLD , KC_VOLU , KC_MPRV , KC_MNXT , KC_MPLY , KC_MPLY , KC_MPRV , KC_MNXT , KC_VOLD , KC_VOLU , _______ ,
-			_______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ 
-	)
-
-};
-
-void matrix_init_user(void) {
-  set_unicode_input_mode(UNICODE_MODE_LINUX);
-}
diff --git a/keyboards/contra/keymaps/bramver/rules.mk b/keyboards/contra/keymaps/bramver/rules.mk
deleted file mode 100755
index 925b1c2b26f..00000000000
--- a/keyboards/contra/keymaps/bramver/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-NKRO_ENABLE = yes           # USB Nkey Rollover
-UNICODEMAP_ENABLE = yes         # Unicode
-BOOTLOADER = atmel-dfu
-
diff --git a/keyboards/contra/keymaps/dana/config.h b/keyboards/contra/keymaps/dana/config.h
deleted file mode 100644
index 2846b579105..00000000000
--- a/keyboards/contra/keymaps/dana/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 190
-
-#define MUSIC_MASK (keycode != KC_NO)
-#define MIDI_ADVANCED
-
-#endif
diff --git a/keyboards/contra/keymaps/dana/keymap.c b/keyboards/contra/keymaps/dana/keymap.c
deleted file mode 100644
index 3f4f44182ee..00000000000
--- a/keyboards/contra/keymaps/dana/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | `    |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Brite| Ctrl | Alt  | Cmd  |Lower |    Space    |Raise | Enter| Cmd  |  Alt |Ctrl  |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [0] = LAYOUT_ortho_4x12(
-      MI_C4, MI_Cs4, MI_D4, MI_Ds4, MI_E4, MI_F4, MI_Fs4, MI_G4, MI_Gs4, MI_A4, MI_As4, MI_B4,
-      MI_C3, MI_Cs3, MI_D3, MI_Ds3, MI_E3, MI_F3, MI_Fs3, MI_G3, MI_Gs3, MI_A3, MI_As3, MI_B3,
-      MI_C2, MI_Cs2, MI_D2, MI_Ds2, MI_E2, MI_F2, MI_Fs2, MI_G2, MI_Gs2, MI_A2, MI_As2, MI_B2,
-      MI_C1, MI_Cs1, MI_D1, MI_Ds1, MI_E1, MI_F1, MI_Fs1, MI_G1, MI_Gs1, MI_A1, MI_As1, MI_B1
-  )
-
-};
-
-
-
-
diff --git a/keyboards/contra/keymaps/dana/readme.md b/keyboards/contra/keymaps/dana/readme.md
deleted file mode 100644
index 75b4582d4af..00000000000
--- a/keyboards/contra/keymaps/dana/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dana musical MIDI keyboard layout
-
-Has the contra mapped as a MIDI keyboard, where each row is an octave.
-
-The keyboard has only MIDI, nothing else!
-
diff --git a/keyboards/contra/keymaps/dana/rules.mk b/keyboards/contra/keymaps/dana/rules.mk
deleted file mode 100644
index bd29e0f4107..00000000000
--- a/keyboards/contra/keymaps/dana/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = yes            # MIDI controls
-AUDIO_ENABLE = no            # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/contra/keymaps/deastiny/config.h b/keyboards/contra/keymaps/deastiny/config.h
deleted file mode 100644
index 6166fea4a77..00000000000
--- a/keyboards/contra/keymaps/deastiny/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/contra/keymaps/deastiny/keymap.c b/keyboards/contra/keymaps/deastiny/keymap.c
deleted file mode 100644
index 026db263edf..00000000000
--- a/keyboards/contra/keymaps/deastiny/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_extras/keymap_german.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  DVORAK = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/**
-,-----------------------------------------------------------------------------------.
- | ESC  |   Ü  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   T  |   Z  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | TAB  |   A  |   O  |   E  |   I  |   U  |   H  |   D  |   R  |   N  |   S  |  L   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   Ä  |   Ö  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------|  
- | CTRL |  GUI | Alt  | MOD  |Lower |   Space     |Raise | Left |Right |  Up  |Down  |
- `-----------------------------------------------------------------------------------'
-**/
-  [_DVORAK] = LAYOUT_planck_mit(
-    KC_ESC,  DE_UDIA, DE_COMM,    DE_DOT,    DE_P,    DE_Y,    DE_F,    DE_G,    DE_C,    DE_T,    DE_Z,    KC_BSPC,
-    KC_TAB, DE_A,   DE_O,    DE_E,    DE_I,    DE_U,    DE_H,    DE_D,    DE_R,    DE_N,    DE_S, DE_L,
-    KC_LSFT, DE_ADIA, DE_ODIA,  DE_Q,    DE_J,    DE_K,    DE_X,    DE_B,    DE_M, DE_W,  DE_V, KC_ENT ,
-    KC_LCTL,  KC_LGUI, KC_LALT, MO(3), LOWER, KC_SPC, RAISE,   KC_LEFT, KC_RIGHT, KC_UP,   KC_DOWN
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_planck_mit(
-    DE_TILD, DE_EXLM, DE_AT,   DE_HASH, DE_DLR,  DE_PERC, DE_CIRC, DE_AMPR,    DE_ASTR,    DE_LPRN, DE_RPRN, KC_DEL,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   DE_UNDS,    DE_PLUS,    DE_LCBR, DE_RCBR, DE_PIPE,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  DE_QUES,
-    _______, _______, _______, _______, _______,     _______,      _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_planck_mit(
-    DE_GRV,  DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,    KC_DEL,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   DE_MINS, DE_EQL,  DE_LBRC, DE_RBRC, DE_BSLS,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, DE_SLSH,
-    _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Adjust (MO(3))
-   * ,-----------------------------------------------------------------------------------.
-   * |      | HOME |  UP  |  END |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      | LEFT | DOWN | RIGHT|      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT_planck_mit(
-    _______, KC_HOME, KC_UP, KC_END, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-    _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______,  _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case DVORAK:
-      if (record->event.pressed) {
-        print("mode just switched to dvorak and this is a huge string\n");
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/contra/keymaps/deastiny/readme.md b/keyboards/contra/keymaps/deastiny/readme.md
deleted file mode 100644
index 61d722847ee..00000000000
--- a/keyboards/contra/keymaps/deastiny/readme.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# A Dvorak Type II based board
-
-As I switched from a Poker II some keys are based on my experience there.
-
-
-## DVORAK (Normal) Layer
-```
-,-----------------------------------------------------------------------------------.
- | ESC  |   Ü  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   T  |   Z  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | TAB  |   A  |   O  |   E  |   I  |   U  |   H  |   D  |   R  |   N  |   S  |  L   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   Ä  |   Ö  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | CTRL |  OS  | Alt  | MO(3)|Lower |    Space    |Raise | Left |Right |  Up  |Down  |
- `-----------------------------------------------------------------------------------'
-```
-
-## Lower
-```
-,-----------------------------------------------------------------------------------.
- |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |  ?   |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- `-----------------------------------------------------------------------------------'
-```
-
-## Raise
-```
-,-----------------------------------------------------------------------------------.
- |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |  /   |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- `-----------------------------------------------------------------------------------'
-```
-
-## Adjust (MO(3))
-```
-   ,-----------------------------------------------------------------------------------.
-   |      | HOME |  UP  |  END |      |      |      |      |      |      |      |  Del |
-   |------+------+------+------+------+-------------+------+------+------+------+------|
-   |      | LEFT | DOWN | RIGHT|      |      |      |      |      |      |      |      |
-   |------+------+------+------+------+------|------+------+------+------+------+------|
-   |      |      |      |      |      |      |      |      |      |      |      |      |
-   |------+------+------+------+------+------+------+------+------+------+------+------|
-   |      |      |      |      |      |             |      |      |      |      |      |
-   `-----------------------------------------------------------------------------------'
-```
\ No newline at end of file
diff --git a/keyboards/contra/keymaps/enigma/config.h b/keyboards/contra/keymaps/enigma/config.h
deleted file mode 100644
index 4fc612e3ea0..00000000000
--- a/keyboards/contra/keymaps/enigma/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 Christopher Swenson
- *
- * 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 WS2812_DI_PIN F7
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    #define RGBLIGHT_EFFECT_SNAKE
-    #define RGBLED_NUM 12
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/contra/keymaps/enigma/keymap.c b/keyboards/contra/keymaps/enigma/keymap.c
deleted file mode 100644
index d8779fb0634..00000000000
--- a/keyboards/contra/keymaps/enigma/keymap.c
+++ /dev/null
@@ -1,625 +0,0 @@
-/* Copyright 2022 Christopher Swenson
- *
- * 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 planck_layers {
-    _ENIGMA,
-    _QWERTY,
-    _FN,
-    _LOWER,
-    _RAISE
-};
-
-enum planck_normal_keycodes {
-    QWERTY = SAFE_RANGE,
-    ENIGMA,
-    EN_A,
-    EN_B,
-    EN_C,
-    EN_D,
-    EN_E,
-    EN_F,
-    EN_G,
-    EN_H,
-    EN_I,
-    EN_J,
-    EN_K,
-    EN_L,
-    EN_M,
-    EN_N,
-    EN_O,
-    EN_P,
-    EN_Q,
-    EN_R,
-    EN_S,
-    EN_T,
-    EN_U,
-    EN_V,
-    EN_W,
-    EN_X,
-    EN_Y,
-    EN_Z,
-    EN_RES,
-    EN_TEST,
-    EN_DIAG,
-    EN_BSPC,
-    EN_SREF,
-    EN_SROT,
-    EN_SPOS,
-    EN_SRIN,
-    EN_SPLU
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Enigma
-    * ,-----------------------------------------------------------------------------------.
-    * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Ctrl |  Fn  | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_ENIGMA] = LAYOUT_planck_mit(
-        QK_GESC, EN_Q,    EN_W,    EN_E,    EN_R,       EN_T,    EN_Y, EN_U,       EN_I,    EN_O,    EN_P,    KC_BSPC,
-        KC_TAB,  EN_A,    EN_S,    EN_D,    EN_F,       EN_G,    EN_H, EN_J,       EN_K,    EN_L,    KC_SCLN, KC_QUOT,
-        KC_LSFT, EN_Z,    EN_X,    EN_C,    EN_V,       EN_B,    EN_N, EN_M,       KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-        KC_LCTL, MO(_FN), KC_LGUI, KC_LALT, MO(_LOWER),    KC_SPC,     MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-    /* Qwerty
-    * ,-----------------------------------------------------------------------------------.
-    * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Ctrl |  Fn  | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_QWERTY] = LAYOUT_planck_mit(
-        QK_GESC, 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_ENT,
-        KC_LCTL, MO(_FN), KC_LGUI, KC_LALT, MO(_LOWER),    KC_SPC,       MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-    /* Function
-    * ,-----------------------------------------------------------------------------------.
-    * | Boot | Reset| Diag |      |      |      |      |      |      |      | Test |Revers|
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |      |      |      |      |      |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * |      |Reflec|Rotors|Posn.s|Rings |Plugs |      |      |Enigma|Qwerty|      |      |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |      |      |      |      |      |             |      |      |      |      |      |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_FN] = LAYOUT_planck_mit(
-        QK_BOOT, EN_RES,  EN_DIAG, _______, _______, _______, _______, _______, _______, _______, EN_TEST, EN_BSPC,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, EN_SREF, EN_SROT, EN_SPOS, EN_SRIN, EN_SPLU, _______, _______, QWERTY,  ENIGMA,  _______, _______,
-        _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______
-    ),
-    /* Lower
-    * ,-----------------------------------------------------------------------------------.
-    * | ~    |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |   _  |   +  |   {  |   }  |  |   |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * | Shift|      |      |      |      |      |      |      |      |      |      |      |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Ctrl |  Fn  | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_LOWER] = LAYOUT_planck_mit(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,  KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 
-        _______, _______, _______, _______, _______, _______, _______, KC_UNDS,  KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 
-        KC_LSFT, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, 
-        KC_LCTL, _______, KC_LGUI, KC_LALT, _______,       KC_SPC,      _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-    /* RAISE
-    * ,-----------------------------------------------------------------------------------.
-    * | `    |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |   -  |   =  |   [  |   ]  |  \   |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * | Shift|      |      |      |      |      |      |      |      |      |      |      |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Ctrl |  Fn  | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_RAISE] = LAYOUT_planck_mit(
-        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_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, 
-        KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        KC_LCTL, _______, KC_LGUI, KC_LALT, _______,      KC_SPC,      _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-};
-
-char rotor_definitions[5][26] = {
-    "EKMFLGDQVZNTOWYHXUSPAIBRCJ",
-    "AJDKSIRUXBLHWTMCQGZNPYFVOE",
-    "BDFHJLCPRTXVZNYEIWGAKMUSQO",
-    "ESOVPZJAYQUIRHXLNFTGKDCMWB",
-    "VZBRGITYUPSDNHLXAWMJQOFECK" 
-};
-
-char reflector_definitions[3][26] = {
-    "EJMZALYXVBWFCRQUONTSPIKHGD",
-    "YRUHQSLDPXNGOKMIEBFZCWVJAT",
-    "FVPJIAOYEDRZXWGCTKUQSBNMHL"
-};
-
-char notch[5] = "QEVJZ";
-
-typedef struct Settings {
-    char rotor_order[3];
-    char rotor_rings[3];
-    char rotor_positions[3];
-    char plugs[25];
-    int plug_count;
-    char reflector;
-} Settings;
-
-typedef struct KeyboardState {
-    bool is_setting_reflector;
-    bool is_setting_rotors;
-    bool is_setting_rotor_positions;
-    bool is_setting_rotor_rings;
-    bool is_setting_plugs;
-    char setting_progress[26];
-    int setting_index;
-    Settings current_settings;
-    Settings default_settings;
-} KeyboardState;
-
-int bound(int letter) {
-    return ((letter % 26) + 26) % 26;
-}
-
-char to_char(int letter) {
-    return 'A' + letter;
-}
-
-int to_int(char letter) {
-    return letter - 'A';
-}
-
-char encipher(char letter, Settings *settings) {
-    int rotor_2_step = settings->rotor_positions[2] == notch[settings->rotor_order[2] - 1];
-    int rotor_1_step = settings->rotor_positions[1] == notch[settings->rotor_order[1] - 1];
-      
-    // Advance the third rotor
-    settings->rotor_positions[2]++;
-    if (settings->rotor_positions[2] > 'Z') {
-      settings->rotor_positions[2] -= 26;
-    }
-
-    // Maybe advance the second rotor, including double steps
-    if (rotor_2_step || rotor_1_step) {
-        settings->rotor_positions[1]++;
-        if (settings->rotor_positions[1] > 'Z') {
-            settings->rotor_positions[1] -= 26;
-        }
-    }
-
-    // Maybe advance the first rotor
-    if (rotor_1_step) {
-        settings->rotor_positions[0]++;
-        if (settings->rotor_positions[0] > 'Z') {
-            settings->rotor_positions[0] -= 26;
-        }
-    }
-
-    // Swap letters on plugboard
-    for (int i = 0; i < settings->plug_count * 2; i += 2) {
-        if (letter == settings->plugs[i]) {
-            letter = settings->plugs[i + 1];
-        } else if (letter == settings->plugs[i + 1]) {
-            letter = settings->plugs[i];
-        }  
-    }
-
-    // Rotors (right to left)
-    for (int rotor_index = 2; rotor_index >= 0; rotor_index--) {
-        char *rotor_definition = rotor_definitions[settings->rotor_order[rotor_index] - 1];
-        int position = to_int(settings->rotor_positions[rotor_index]);
-        int ring = to_int(settings->rotor_rings[rotor_index]);
-        int char_index = to_int(letter);
-        letter = to_char(bound(
-            to_int(rotor_definition[bound(char_index + position - ring)]) + ring - position
-        ));
-    }
-
-    // Swap via reflector
-    letter = reflector_definitions[to_int(settings->reflector)][to_int(letter)];
-
-    // Rotors in reverse (left to right)
-    for (int rotor_index = 0; rotor_index < 3; rotor_index++) {
-        char *rotor_definition = rotor_definitions[settings->rotor_order[rotor_index] - 1];
-        int position = to_int(settings->rotor_positions[rotor_index]);
-        int ring = to_int(settings->rotor_rings[rotor_index]);
-        int search_index;
-        for (search_index = 0; search_index < 26; search_index++) {
-            if (
-                rotor_definition[search_index] 
-                == to_char(bound(to_int(letter) - ring + position))
-            ) {
-                break;
-            }
-        }
-        letter = to_char(bound(search_index - position + ring));
-    }
-    
-    // Plugboard again
-    for (int i = 0; i < settings->plug_count * 2; i += 2) {
-        if (letter == settings->plugs[i]) {
-            letter = settings->plugs[i + 1];
-        } else if (letter == settings->plugs[i + 1]) {
-            letter = settings->plugs[i];
-        }
-    }
-
-    return letter;
-}
-
-void init_enigma_default(Settings *settings) {
-    settings->rotor_order[0] = 1;
-    settings->rotor_rings[0] = 'A';
-    settings->rotor_positions[0] = 'A';
-
-    settings->rotor_order[1] = 2;
-    settings->rotor_rings[1] = 'A';
-    settings->rotor_positions[1] = 'A';
-
-    settings->rotor_order[2] =  3;
-    settings->rotor_rings[2] = 'A';
-    settings->rotor_positions[2] = 'A';
-
-    strcpy(settings->plugs, "");
-    settings->plug_count = 0;
-
-    settings->reflector = 'B';
-}
-
-void copy_settings(Settings *from, Settings *to) {
-    to->rotor_order[0] = from->rotor_order[0];
-    to->rotor_rings[0] = from->rotor_rings[0];
-    to->rotor_positions[0] = from->rotor_positions[0];
-
-    to->rotor_order[1] = from->rotor_order[1];
-    to->rotor_rings[1] = from->rotor_rings[1];
-    to->rotor_positions[1] = from->rotor_positions[1];
-
-    to->rotor_order[2] = from->rotor_order[2];
-    to->rotor_rings[2] = from->rotor_rings[2];
-    to->rotor_positions[2] = from->rotor_positions[2];
-
-    strncpy(to->plugs, from->plugs, from->plug_count * 2);
-    to->plug_count = from->plug_count;
-
-    to->reflector = from->reflector;
-}
-
-char *rotor_name(int rotor_number) {
-    if (rotor_number == 1) {
-        return "I";
-    } else if (rotor_number == 2) {
-        return "II";
-    } else if (rotor_number == 3) {
-        return "III";
-    } else if (rotor_number == 4) {
-        return "IV";
-    } else if (rotor_number == 5) {
-        return "V";
-    }
-    return "?";
-}
-
-void rotors_reverse(Settings *settings) {
-    int rotor_2_step = settings->rotor_positions[2] 
-        == to_char(bound(to_int(notch[settings->rotor_order[2] - 1]) + 1));
-    int rotor_1_step = settings->rotor_positions[1] 
-        == to_char(bound(to_int(notch[settings->rotor_order[1] - 1]) + 1));
-      
-    // Reverse third rotor
-    settings->rotor_positions[2]--;
-    if (settings->rotor_positions[2] < 'A') {
-        settings->rotor_positions[2] += 26;
-    }
-
-    // Maybe reverse second rotor (including double steps)
-    if (rotor_2_step || rotor_1_step) {
-        settings->rotor_positions[1]--;
-        if (settings->rotor_positions[1] < 'A') {
-            settings->rotor_positions[1] += 26;
-        }
-    }
-
-    // Maybe recerse first rotor
-    if (rotor_1_step) {
-        settings->rotor_positions[0]--;
-        if (settings->rotor_positions[0] < 'A') {
-            settings->rotor_positions[0] += 26;
-        }
-    }
-}
-
-void reset_settings(KeyboardState *state) {
-  copy_settings(&state->default_settings, &state->current_settings);
-}
-
-void set_layer(uint8_t default_layer) {
-    default_layer_set((layer_state_t)1 << default_layer);
-}
-
-void set_backlight(uint8_t mode, uint8_t hue, uint8_t sat, uint8_t val) {
-    #ifdef RGBLIGHT_ENABLE
-        rgblight_enable_noeeprom(); 
-        rgblight_mode_noeeprom(mode);
-        rgblight_sethsv_noeeprom(hue, sat, val);
-    #endif
-}
-
-void clear_working_settings(KeyboardState *state) {
-    state->is_setting_reflector = false;
-    state->is_setting_rotors = false;
-    state->is_setting_rotor_positions = false;
-    state->is_setting_rotor_rings = false;
-    state->is_setting_plugs = false;
-    state->setting_index = 0;
-    set_layer(_ENIGMA);
-    set_backlight(RGBLIGHT_MODE_STATIC_LIGHT, HSV_RED);
-}
-
-void send_settings_string(Settings *settings) {
-    send_char(settings->reflector);
-    send_string(". ");
-    send_string(rotor_name(settings->rotor_order[0]));
-    send_char(settings->rotor_rings[0]);
-    send_string("-");
-    send_string(rotor_name(settings->rotor_order[1]));
-    send_char(settings->rotor_rings[1]);
-    send_string("-");
-    send_string(rotor_name(settings->rotor_order[2]));
-    send_char(settings->rotor_rings[2]);
-    send_string(" (");
-    send_char(settings->rotor_positions[0]);
-    send_string(", ");
-    send_char(settings->rotor_positions[1]);
-    send_string(", ");
-    send_char(settings->rotor_positions[2]);
-    send_string(") ");
-    for (int i = 0; i < settings->plug_count; i++) {
-        send_char(settings->plugs[i * 2]);
-        send_char(settings->plugs[i * 2 + 1]);
-        send_string(" ");
-    }
-    send_string("\n");
-}
-
-void perform_test(Settings *settings) {
-    for (int i = 0; i < 1000; i++) {
-        send_char(encipher('A', settings) - ('A' - 'a'));
-    }
-}
-
-void commit_plug_settings(KeyboardState *state) {
-    state->default_settings.plug_count = state->setting_index / 2; 
-    for (int i = 0; i < state->default_settings.plug_count; i++) {
-        state->default_settings.plugs[i * 2] = state->setting_progress[i * 2];
-        state->default_settings.plugs[i * 2 + 1] = state->setting_progress[i * 2 + 1];
-    }
-    reset_settings(state);
-    clear_working_settings(state);
-}
-
-void handle_set_reflector(char letter, KeyboardState *state) {
-    if (letter >= 'A' && letter <= 'C') {
-        state->default_settings.reflector = letter;
-        reset_settings(state);
-        clear_working_settings(state);
-    }
-}
-
-bool handle_set_rotor(char letter, KeyboardState *state) {
-    bool is_valid = letter >= 'A' && letter <= 'E' && state->setting_index < 3;
-    if (is_valid) {
-        state->setting_progress[state->setting_index] = to_int(letter) + 1;
-        state->setting_index += 1;
-        if (state->setting_index == 3) {
-            state->default_settings.rotor_order[0] = state->setting_progress[0];
-            state->default_settings.rotor_order[1] = state->setting_progress[1];
-            state->default_settings.rotor_order[2] = state->setting_progress[2];
-            reset_settings(state);
-            clear_working_settings(state);
-        }
-    }
-    return is_valid;
-}
-
-bool handle_set_rotor_position(char letter, KeyboardState *state) {
-    bool is_valid = state->setting_index < 3; // Guaranteed to be A-Z already
-    if (is_valid) {
-        state->setting_progress[state->setting_index] = letter;
-        state->setting_index += 1;
-        if (state->setting_index == 3) {
-            state->default_settings.rotor_positions[0] = state->setting_progress[0];
-            state->default_settings.rotor_positions[1] = state->setting_progress[1];
-            state->default_settings.rotor_positions[2] = state->setting_progress[2]; 
-            reset_settings(state);
-            clear_working_settings(state);
-        }
-    }
-    return is_valid;
-}
-
-bool handle_set_rotor_ring(char letter, KeyboardState *state) {
-    bool is_valid = state->setting_index < 3;
-    if (is_valid) {
-        state->setting_progress[state->setting_index] = letter;
-        state->setting_index += 1;
-        if (state->setting_index == 3) {
-            state->default_settings.rotor_rings[0] = state->setting_progress[0];
-            state->default_settings.rotor_rings[1] = state->setting_progress[1];
-            state->default_settings.rotor_rings[2] = state->setting_progress[2];
-            reset_settings(state);
-            clear_working_settings(state);
-        }
-    }
-    return is_valid;
-}
-
-bool handle_set_plug(char letter, KeyboardState *state) {
-    bool is_valid = state->setting_index < 26;
-    if (is_valid) {
-        state->setting_progress[state->setting_index] = letter;
-        state->setting_index += 1;
-    }
-    return is_valid;
-}
-
-void handle_enigma_keypress(char letter, bool any_mods, KeyboardState *state) {
-    bool settings_valid = true;
-    if (letter) {
-        if (any_mods) {
-            tap_code(KC_A + to_int(letter));
-        } else if (state->is_setting_reflector) {
-            handle_set_reflector(letter, state);
-        } else if (state->is_setting_rotors) {
-            settings_valid = handle_set_rotor(letter, state);
-        } else if (state->is_setting_rotor_positions) {
-            settings_valid = handle_set_rotor_position(letter, state);
-        } else if (state->is_setting_rotor_rings) {
-            settings_valid = handle_set_rotor_ring(letter, state);
-        } else if (state->is_setting_plugs) {
-            settings_valid = handle_set_plug(letter, state);
-        } else {
-            char c2 = encipher(letter, &state->current_settings);
-            send_char(c2 - ('A' - 'a'));
-        }
-    }
-    if (!settings_valid) {
-        clear_working_settings(state);
-    }
-}
-
-KeyboardState STATE;
-
-void keyboard_pre_init_user(void) {
-    init_enigma_default(&STATE.default_settings);
-    init_enigma_default(&STATE.current_settings);
-    clear_working_settings(&STATE);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint8_t letter_index;
-    bool letter_found = false;
-    if (record->event.pressed) {
-        switch (keycode) {
-          case QWERTY:
-              set_layer(_QWERTY);
-              set_backlight(RGBLIGHT_MODE_RAINBOW_SWIRL + 4, HSV_PURPLE);
-              break;
-          case ENIGMA:
-              set_layer(_ENIGMA);
-              set_backlight(RGBLIGHT_MODE_STATIC_LIGHT, HSV_RED);
-              break;
-          case EN_SREF:
-              reset_settings(&STATE);
-              STATE.is_setting_reflector = true;
-              set_layer(_ENIGMA);
-              set_backlight(RGBLIGHT_MODE_SNAKE, HSV_RED);
-              break;
-          case EN_SROT:
-              reset_settings(&STATE);
-              STATE.is_setting_rotors = true;
-              STATE.setting_index = 0;
-              set_layer(_ENIGMA);
-              set_backlight(RGBLIGHT_MODE_SNAKE, 10, 255, 255);
-              break;
-          case EN_SPOS:
-              reset_settings(&STATE);
-              STATE.is_setting_rotor_positions = true;
-              STATE.setting_index = 0;
-              set_layer(_ENIGMA);
-              set_backlight(RGBLIGHT_MODE_SNAKE, HSV_ORANGE);
-              break;
-          case EN_SRIN:
-              reset_settings(&STATE);
-              STATE.is_setting_rotor_rings = true;
-              STATE.setting_index = 0;
-              set_layer(_ENIGMA);
-              set_backlight(RGBLIGHT_MODE_SNAKE, HSV_GREEN);
-              break;
-          case EN_SPLU:
-              reset_settings(&STATE);
-              STATE.is_setting_plugs = true;
-              STATE.setting_index = 0;
-              set_layer(_ENIGMA);
-              set_backlight(RGBLIGHT_MODE_SNAKE, HSV_BLUE);
-              break;
-          case QK_GESC:
-              if (
-                  STATE.is_setting_reflector
-                  || STATE.is_setting_rotors
-                  || STATE.is_setting_rotor_positions
-                  || STATE.is_setting_rotor_rings
-                  || STATE.is_setting_plugs
-              ) {
-                  clear_working_settings(&STATE);
-                  return false;
-              }
-              break;
-          case KC_ENT:
-              if (STATE.is_setting_plugs) { 
-                  commit_plug_settings(&STATE);
-                  return false;
-              }
-              break;
-          case EN_A ... EN_Z:
-              letter_index = keycode - EN_A;
-              letter_found = true;
-              break;
-          case EN_RES:
-              reset_settings(&STATE);
-              break;
-          case EN_TEST:
-              perform_test(&STATE.current_settings);
-              break;
-          case EN_DIAG:
-              send_settings_string(&STATE.current_settings);
-              break;
-          case EN_BSPC:
-              rotors_reverse(&STATE.current_settings);
-              tap_code(KC_BSPC);
-              break;
-      }
-    }
-    char letter = letter_found ? 'A' + letter_index : 0;
-    uint8_t mods = get_mods();
-    bool any_mods = (mods & MOD_MASK_CTRL) || (mods & MOD_MASK_ALT) || (mods & MOD_MASK_GUI);
-    handle_enigma_keypress(letter, any_mods, &STATE);
-    return true;
-}
-
-void keyboard_post_init_user(void) {
-    set_layer(_QWERTY);
-    set_backlight(RGBLIGHT_MODE_RAINBOW_SWIRL + 4, HSV_PURPLE);
-}
diff --git a/keyboards/contra/keymaps/enigma/readme.md b/keyboards/contra/keymaps/enigma/readme.md
deleted file mode 100644
index 9bc69b3980b..00000000000
--- a/keyboards/contra/keymaps/enigma/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# A Contra Layout with an Enigma Emulator
-
-```
-
-,-----------------------------------------------------------------------------------.
-| Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl |  Fn  | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-By default, this layout functions like a normal QWERTY layout. But it also has an in-built Enigma machine emulator.
-To enable the emulator, press `Fn+.`, and to go back to QWERTY, press `FN+,`.
-
-A demonstration video can be found [here](https://youtu.be/p8kBjP1DCzo).
-
-When Enigma mode is enabled, all letters A-Z will be enciphered using the Enigma emulator. Other keycodes will not be modified. Shift will be sent as normal, so you can choose whether to capitalize the output. If any other modifier (Ctrl, Alt, or Gui) are being pressed, the normal letter will come through.
-
-There are a few key combinations for configuring and diagnosing the Enigma emulator:
-
-* `Fn+Q` resets the emulator to the last-configured settings
-* `Fn+W` types out the current Enigma settings, e.g. `B. IA-IIA-IIIA (A, A, A) QW` (meaning reflector B; rotors I, II, and III all at ring setting A; all at position A, and with Q and W swapped on the plugboard)
-* `Fn+P` types out 1000 enciphered As, for testing
-* `Fn+Backspace` back-rotates the rotors one step, for fixing typos without having to re-type a whole message
-* `Fn+Z` followed by A, B, or C is used to set the reflector
-* `Fn+X` followed by three characters A-E is used to set the rotors
-* `Fn+C` followed by three characters A-Z is used to set the rotor positions
-* `Fn+V` followed by three characters A-Z is used to set the ring settings
-* `Fn+B` followed by up to 13 pairs of characters A-Z (one at a time, not simulaneously) then the Enter key is used to set the plugboard
-
-
diff --git a/keyboards/contra/keymaps/enigma/rules.mk b/keyboards/contra/keymaps/enigma/rules.mk
deleted file mode 100644
index 261e59922ad..00000000000
--- a/keyboards/contra/keymaps/enigma/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-RGBLIGHT_SUPPORTED = yes
\ No newline at end of file
diff --git a/keyboards/contra/keymaps/erovia/config.h b/keyboards/contra/keymaps/erovia/config.h
deleted file mode 100644
index 11d6a2c1ae5..00000000000
--- a/keyboards/contra/keymaps/erovia/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#define AUTO_SHIFT_TIMEOUT 150
-#define NO_AUTO_SHIFT_SPECIAL
-#define NO_AUTO_SHIFT_NUMERIC
-
-#define TAPPING_TERM 200
diff --git a/keyboards/contra/keymaps/erovia/keymap.c b/keyboards/contra/keymaps/erovia/keymap.c
deleted file mode 100644
index ed7c2873c6d..00000000000
--- a/keyboards/contra/keymaps/erovia/keymap.c
+++ /dev/null
@@ -1,163 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  LOWER,
-  RAISE
-};
-
-enum {
-  TD_SPACE_CADET_SHIFT = 0,
-  TD_SPACE_CADET_ENTER = 1
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_SPACE_CADET_SHIFT] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_LPRN),
-  [TD_SPACE_CADET_ENTER] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_RPRN)
-};
-
-#define TD_SHFT TD(TD_SPACE_CADET_SHIFT)
-#define TD_ENTR TD(TD_SPACE_CADET_ENTER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | `    |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | GUI  |Lower | Tab  |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  KC_GRV,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  TD_SHFT, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, TD_ENTR,
-  KC_LCTL,  KC_LGUI, KC_LALT, KC_LGUI, LOWER,   KC_TAB,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | `    |   Q  |   W  |   F  |   P  |   B  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   R  |   S  |   T  |   G  |   M  |   N  |   E  |   I  |   O  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   D  |   V  |   K  |   H  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | GUI  |Lower | Tab  |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-  KC_GRV,  KC_Q,   KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC, KC_A,   KC_R,    KC_S,    KC_T,    KC_G,    KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  TD(TD_SPACE_CADET_SHIFT), KC_Z,   KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, TD(TD_SPACE_CADET_ENTER),
-  KC_LCTL,  KC_LGUI, KC_LALT, KC_LGUI, LOWER,   KC_TAB,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Prev | Vol- | Mute | Stop |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MUTE, KC_MSTP
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Qwerty|Colemk|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | AuSh |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AS_TOGG
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/contra/keymaps/erovia/readme.md b/keyboards/contra/keymaps/erovia/readme.md
deleted file mode 100644
index 34cbdf0a18c..00000000000
--- a/keyboards/contra/keymaps/erovia/readme.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Erovia's Contra Keymap
-
-My personal Contra keymap based on the *basic* keymap.  
-
-**Features**
-
-* Qwerty and Colemak Mod-DH support
-* autoshifting
-* double tap LSHIFT and ENTER for quick access to ( and )
-
-## QWERTY (Normal) Layer
-```
-,-----------------------------------------------------------------------------------.
-| `    |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl | GUI  | Alt  | GUI  |Lower | Tab  |Space |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## Colemak Layer
-Switch from `Adjust` layer.
-```
-,-----------------------------------------------------------------------------------.
-| `    |   Q  |   W  |   F  |   P  |   B  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Ctrl |   A  |   R  |   S  |   T  |   G  |   M  |   N  |   E  |   I  |   O  |  '   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   D  |   V  |   K  |   H  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl | GUI  | Alt  | GUI  |Lower | Tab  |Space |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## Lower
-```
-,-----------------------------------------------------------------------------------.
-|   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-`-----------------------------------------------------------------------------------'
-```
-
-## Raise
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      | Prev | Vol- | Mute | Stop |
-`-----------------------------------------------------------------------------------'
-```
-
-## Adjust
-`AuSh` toggles autoshifting.
-```
-,-----------------------------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |      |      |      |Qwerty|Colemk|      |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |      |      |      | AuSh |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/contra/keymaps/erovia/rules.mk b/keyboards/contra/keymaps/erovia/rules.mk
deleted file mode 100755
index 97999d9cb05..00000000000
--- a/keyboards/contra/keymaps/erovia/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-AUTO_SHIFT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/contra/keymaps/maxr1998/config.h b/keyboards/contra/keymaps/maxr1998/config.h
deleted file mode 100644
index 5580ffeae8a..00000000000
--- a/keyboards/contra/keymaps/maxr1998/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#define TAPPING_TOGGLE 2
-
-#define WS2812_DI_PIN          F7 // pin the DI on the WS2812B is hooked-up to
-#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          12 // number of LEDs
-#define RGBLIGHT_HUE_STEP   12 // units to step when in/decreasing hue
-#define RGBLIGHT_SAT_STEP   25 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP   12 // units to step when in/decreasing value (brightness)
-
-#endif
diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c
deleted file mode 100644
index 0802a211f06..00000000000
--- a/keyboards/contra/keymaps/maxr1998/keymap.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-enum contra_layers {
-  _QWERTZ,
-  _FN,
-  _NR,
-  _NR_L3,
-  _FX,
-  _GAMING
-};
-
-#define KC_I3 LM(_NR, MOD_LALT)
-#define KC_NR SAFE_RANGE
-#define KC_N3 (SAFE_RANGE + 1)
-#define KC_FN MO(_FN)
-#define G_1 TO(_GAMING)
-#define G_0 TG(_GAMING)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwertz
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | +* ~ | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Sup  | Alt  |  i3  | NumR |    Space    | Spec | Fun  | Left | Down | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTZ] = {
-  {QK_GESC, 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,    DE_PLUS, KC_ENT },
-  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT},
-  {KC_LCTL, KC_LGUI, KC_LALT, KC_I3,   KC_NR,   KC_SPC,  KC_SPC,  KC_N3,   KC_FN,   KC_LEFT, KC_DOWN, KC_RGHT}
-},
-
-/* Function layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |   Ü  |      |   Ö  |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Lock |   Ä  |   ß  |      |      | GAME |      | RGBS | RGBB | RGBS |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | RGBH-| RGBT | RGBH+| PgUp |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | ---- | ---- |             | ---- | ---- | Home | PgDn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_FN] = {
-  {_______, _______, _______, _______, _______, _______, _______, DE_UDIA, _______, DE_ODIA, _______, KC_DEL },
-  {QK_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______},
-  {_______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______},
-  {_______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END }
-},
-
-/* Numrow layer (special characters with Shift and ISO_L3_Shift)
- * ,-----------------------------------------------------------------------------------.
- * |      |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |  \   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |  #'  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | <> | |      |      |      |      |      |      |      |      |  -_  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | ---- | ---- |             | ---- | ---- |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NR] = {
-  {_______, DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,    _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DE_HASH, _______},
-  {_______, DE_LABK, _______, _______, _______, _______, _______, _______, _______, _______, DE_MINS, _______},
-  {_______, _______, _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, _______, _______}
-},
-[_NR_L3] = {
-  {_______, DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,    DE_SS  },
-  {_______, DE_Q,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  {_______, DE_LABK, _______, _______, _______, _______, _______, _______, _______, _______, DE_MINS, _______},
-  {_______, _______, _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, _______, _______}
-},
-
-/* Function keys
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FX] = {
-  {KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12 },
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  {_______, _______, _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, _______, _______}
-},
-
-/* Gaming
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Space|      |      |      |      |             |      | Leave|      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAMING] = {
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  {KC_SPC,  XXXXXXX, _______, _______, _______, KC_LCTL, KC_LCTL, _______, G_0,     _______, _______, _______}
-}
-};
-
-void update_tri_layer_user(void);
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case KC_BSPC:
-      if (record->event.pressed) {
-        if (get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) {
-          register_code(DE_SS);
-          return false;
-        }
-      } else {
-        unregister_code(DE_SS);
-      }
-      return true;
-    case KC_NR:
-      if (record->event.pressed) {
-        layer_on(_NR);
-      } else {
-        layer_off(_NR);
-      }
-      update_tri_layer_user();
-      return false;
-    case KC_N3:
-      if (record->event.pressed) {
-        layer_on(_NR_L3);
-      } else {
-        layer_off(_NR_L3);
-      }
-      update_tri_layer_user();
-      return false;
-    default:
-      return true;
-  }
-}
-
-void update_tri_layer_user(void) {
-    update_tri_layer(_NR, _NR_L3, _FX);
-    if (layer_state_is(_NR_L3) && !layer_state_is(_FX)) {
-        register_code(KC_ALGR);
-    } else {
-        unregister_code(KC_ALGR);
-    }
-}
-
-bool led_update_user(led_t led_state) {
-  // Force-enable Numlock
-  if (!led_state.num_lock) {
-    register_code(KC_NUM_LOCK);
-    unregister_code(KC_NUM_LOCK);
-  }
-  return false;
-}
diff --git a/keyboards/contra/keymaps/maxr1998/readme.md b/keyboards/contra/keymaps/maxr1998/readme.md
deleted file mode 100644
index 18d57e2cbc5..00000000000
--- a/keyboards/contra/keymaps/maxr1998/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Contra Layout by Maxr1998
-![img](https://i.imgur.com/dVnnRDT.jpg)
\ No newline at end of file
diff --git a/keyboards/contra/keymaps/maxr1998/rules.mk b/keyboards/contra/keymaps/maxr1998/rules.mk
deleted file mode 100644
index 8607ce19ef7..00000000000
--- a/keyboards/contra/keymaps/maxr1998/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-RGBLIGHT_ENABLE = yes
-KEY_LOCK_ENABLE = yes
-
-LTO_ENABLE      = yes
-UNICODE_ENABLE  = no
-MOUSEKEY_ENABLE = no
-
-### Debugging ###
-CONSOLE_ENABLE  = no # yes
-COMMAND_ENABLE  = no
-
diff --git a/keyboards/contra/keymaps/msiu/config.h b/keyboards/contra/keymaps/msiu/config.h
deleted file mode 100644
index 6166fea4a77..00000000000
--- a/keyboards/contra/keymaps/msiu/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/contra/keymaps/msiu/keymap.c b/keyboards/contra/keymaps/msiu/keymap.c
deleted file mode 100644
index 36dda9863a6..00000000000
--- a/keyboards/contra/keymaps/msiu/keymap.c
+++ /dev/null
@@ -1,176 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _NUMB,
-  _FUNC,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,------------------------------------------------------------------------------------------.
-   * | Tab / Numb  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |-------------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc / Ctrl  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |-------------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift       |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl        |Hyper | Alt  | GUI  |Lower | Func |Space |Raise | Left | Down |  Up  |Right |
-   * `------------------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_ortho_4x12(
-    LT(_NUMB, KC_TAB),   KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,      KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-    LCTL_T(KC_ESC),      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_HYPR, KC_LALT, KC_LGUI, LOWER, MO(_FUNC), KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Dvorak
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT_ortho_4x12(
-    _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,     KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______,
-    _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,     KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,     KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______,
-    _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_ortho_4x12(
-    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_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,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-    _______, _______,  _______, _______, _______, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_ortho_4x12(
-    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_4,    KC_5,    KC_6,   KC_PLUS, KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    _______, KC_7,    KC_8,    KC_9,   KC_MINS, KC_F11,  KC_F12,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-    _______, _______, _______, _______, _______, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-  ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, QWERTY,  DVORAK,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
-  ),
-
-  [_FUNC] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, KC_PSCR, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_NUMB] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,    _______, KC_BSPC,
-    _______, _______, _______, _______, _______, _______, _______, KC_4,    KC_5,    KC_6,    _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_1,    KC_2,    KC_3,    _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_0,    KC_0,    _______, _______, _______
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        // print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/contra/keymaps/msiu/readme.md b/keyboards/contra/keymaps/msiu/readme.md
deleted file mode 100644
index 80aba109548..00000000000
--- a/keyboards/contra/keymaps/msiu/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Contra Layout
-
diff --git a/keyboards/contra/keymaps/ryanm101/config.h b/keyboards/contra/keymaps/ryanm101/config.h
deleted file mode 100644
index 3e6187b08e6..00000000000
--- a/keyboards/contra/keymaps/ryanm101/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#define TAPPING_TERM 200
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/contra/keymaps/ryanm101/keymap.c b/keyboards/contra/keymaps/ryanm101/keymap.c
deleted file mode 100644
index 76cbdc7ff8b..00000000000
--- a/keyboards/contra/keymaps/ryanm101/keymap.c
+++ /dev/null
@@ -1,259 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-extern keymap_config_t keymap_config;
-
-// Custom Key Combos
-#define LCKSCR LCTL(LGUI(KC_Q))
-//#define KC_CAD LCTL(LALT(KC_DEL)) // CTL+ALT+DEL (windows)
-//#define KC_CAE LGUI(LALT(KC_ESC)) // CMD+ALT+ESC (Force Close)
-//#define KC_SCREENSHOT LGUI(S(KC_4)) // CMD+SHIFT+4 (Mac Screenshot)
-
-#define _QWERTY 0
-#define _QWERTYMAC 1
-#define _L1  2
-#define _L2  3
-#define _L3  4
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  QWERTYMAC,
-  L1,
-  L2,
-  L3
-};
-
-//Tap Dance Declarations
-#define COLON TD(CLN)
-#define QUOTE TD(QUOT)
-#define PARAN TD(PAR)
-#define CURLY TD(CUR)
-#define SQUAR TD(SQU)
-#define ANGUL TD(ANG)
-#define TMUX TD(TD_TMUX)
-#define CADCAE TD(CAD_CAE)
-#define SHIFTSLASHPIPE TD(TD_SHIFTSLASHPIPE)
-
-enum {
-  CLN = 0,
-  QUOT,
-  CAD_CAE,
-  PAR,
-  CUR,
-  SQU,
-  ANG,
-  TD_TMUX,
-  TD_SHIFTSLASHPIPE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  |  '@  |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl | GUI  | Alt  |  \|  |  L1  |      |      |  L2  | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_ortho_4x12(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    COLON,   QUOTE,
-    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_NUBS, MO(_L1), XXXXXXX, KC_SPC,  MO(_L2), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* QwertyMAC
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  |  '@  |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl | Alt  | GUI  |  \|  |  L1  |      |      |  L2  | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTYMAC] = LAYOUT_ortho_4x12(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    COLON,   QUOTE,
-    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_LALT, KC_LGUI, KC_NUBS, MO(_L1), XXXXXXX, KC_SPC,  MO(_L2), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* L1
-   * ,-----------------------------------------------------------------------------------.
-   * |  `¬  |INSERT| PGUP | HOME |  <>  |      |  ()  |  7&  |  8*  |  9(  |      | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |DELETE| PGDN | END  |  []  |  {}  |  =+  |  4$  |  5%  |  6^  |  *   | LMAC |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |LSHIFT|PSCRN |      |CADCAE|  L3  |LCKSCR|  -_  |  1!  |  2"  |  3£  |  /?  |ENTER |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl | GUI  | Alt  |  #~  |      |      |      |      |   0) |  .>  |      | MENU |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_L1] = LAYOUT_ortho_4x12(
-    KC_GRV,  KC_INS,  KC_PGUP, KC_HOME, ANGUL,   XXXXXXX, PARAN,   KC_7,    KC_8,    KC_9,           XXXXXXX, KC_BSPC,
-    XXXXXXX, KC_DEL,  KC_PGDN, KC_END,  SQUAR,   CURLY,   KC_EQL,  KC_4,    KC_5,    KC_6,           S(KC_8), TG(_QWERTYMAC),
-    _______, KC_PSCR, XXXXXXX, CADCAE,  MO(_L3), LCKSCR,  KC_MINS, KC_1,    KC_2,    KC_3,           KC_SLSH, KC_ENT,
-    _______, _______, _______, KC_NUHS, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, KC_0,    ALGR_T(KC_DOT), XXXXXXX, KC_MENU
-  ),
-
-  /* L2
-   * ,-----------------------------------------------------------------------------------.
-   * |Sysreq|  F9  |  F10 |  F11 |  F12 |      |NUMLK |   7  |   8  |   9  |   *  |Bksp  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |  F5  |  F6  |  F7  |  F8  |      |      |   4  |   5  |   6  |  /   |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |      |      |   1  |   2  |   3  |  +   |KP_ENT|
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl | GUI  | Alt  |      |      |      |      |      |   0  |   .  |  -   |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_L2] = LAYOUT_ortho_4x12(
-    KC_SYRQ, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_NUM,  KC_P7,   KC_P8,    KC_P9,   KC_PAST, KC_BSPC,
-    XXXXXXX, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_P4,   KC_P5,    KC_P6,   KC_PSLS, _______,
-    XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, XXXXXXX, KC_P1,   KC_P2,    KC_P3,   KC_PPLS, KC_PENT,
-    _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, KC_P0,    KC_PDOT, KC_PMNS, _______
-  ),
-
-  /* L3
-   * ,-----------------------------------------------------------------------------------.
-   * |RGBTOG|RGBHUI|RGBHUD|RGBSAI|RGBSAD|      |      | PGDN | PGUP |      |      |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |BLTOG |BLSTEP|RGBVAI|RGBVAD|RGBMOD|RGBRMD| Left | Down |  Up  | Right|      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | TMUX |      |      |      |      |      |      |      |      |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_L3] = LAYOUT_ortho_4x12(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,
-    TMUX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  )
-
-};
-
-// Parantheses
-void paranthesis_dance (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    SEND_STRING("()"); register_code(KC_LEFT); unregister_code(KC_LEFT);
-  } else if (state->count == 2) {
-    SEND_STRING("(");
-  } else if (state->count == 3) {
-    SEND_STRING(")");
-  }
-}
-
-void curly_dance (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    SEND_STRING("{}"); register_code(KC_LEFT); unregister_code(KC_LEFT);
-  } else if (state->count == 2) {
-    SEND_STRING("{");
-  } else if (state->count == 3) {
-    SEND_STRING("}");
-  }
-}
-
-void square_dance (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    SEND_STRING("[]"); register_code(KC_LEFT); unregister_code(KC_LEFT);
-  } else if (state->count == 2) {
-    SEND_STRING("[");
-  } else if (state->count == 3) {
-    SEND_STRING("]");
-  }
-}
-
-void angular_dance (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    SEND_STRING("<>"); register_code(KC_LEFT); unregister_code(KC_LEFT);
-  } else if (state->count == 2) {
-    SEND_STRING("<");
-  } else if (state->count == 3) {
-    SEND_STRING(">");
-  }
-}
-
-void tmux_dance (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    SEND_STRING("tmux"); register_code(KC_ENT); unregister_code(KC_ENT);
-  } else if (state->count == 2) {
-    register_mods(MOD_BIT(KC_LCTL));
-    register_code(KC_B); unregister_code(KC_B);
-    unregister_mods(MOD_BIT(KC_LCTL));
-    register_mods(MOD_BIT(KC_LSFT));
-    register_code(KC_5); unregister_code(KC_5);
-    unregister_mods(MOD_BIT(KC_LSFT));
-  }
-}
-
-void cmd_dance (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_mods(MOD_BIT(KC_LCTL));
-    register_mods(MOD_BIT(KC_LALT));
-    register_code(KC_DELETE);
-    unregister_mods(MOD_BIT(KC_LCTL));
-    unregister_mods(MOD_BIT(KC_LALT));
-    unregister_code(KC_DELETE);
-  } else if (state->count == 2) {
-    register_mods(MOD_BIT(KC_LGUI));
-    register_mods(MOD_BIT(KC_LALT));
-    register_code(KC_ESC);
-    unregister_mods(MOD_BIT(KC_LGUI));
-    unregister_mods(MOD_BIT(KC_LALT));
-    unregister_code(KC_ESC);
-  } else if (state->count == 3) {
-    register_mods(MOD_BIT(KC_LGUI));
-    register_mods(MOD_BIT(KC_LSFT));
-    register_code(KC_4);
-    unregister_mods(MOD_BIT(KC_LGUI));
-    unregister_mods(MOD_BIT(KC_LSFT));
-    unregister_code(KC_4);
-  }
-}
-
-void cmd_sft_slash_pipe_down (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    if (state->interrupted || state->pressed==0) {
-      register_code (KC_NONUS_BACKSLASH);
-    } else {
-      register_code (KC_LSFT);
-    }
-  } else if (state->count == 2) {
-    register_mods(MOD_BIT(KC_LSFT));
-    register_code(KC_NONUS_BACKSLASH);
-  }
-}
-
-void cmd_sft_slash_pipe_up (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
-      unregister_code (KC_LSFT);
-    } else {
-      unregister_code (KC_NONUS_BACKSLASH);
-    }
-  } else if (state->count == 2) {
-    unregister_mods(MOD_BIT(KC_LSFT));
-    unregister_code(KC_NONUS_BACKSLASH);
-  }
-}
-
- //All tap dance functions would go here. Only showing this one.
- tap_dance_action_t tap_dance_actions[] = {
-   [CLN] = ACTION_TAP_DANCE_DOUBLE (KC_SCLN, S(KC_SCLN ))
-   ,[QUOT] = ACTION_TAP_DANCE_DOUBLE (KC_QUOT, S(KC_2))
-   ,[CAD_CAE] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, cmd_dance )
-   ,[PAR] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, paranthesis_dance )
-   ,[CUR] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, curly_dance )
-   ,[SQU] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, square_dance )
-   ,[ANG] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, angular_dance )
-   ,[TD_TMUX] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, NULL, tmux_dance )
-   ,[TD_SHIFTSLASHPIPE] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, cmd_sft_slash_pipe_down, cmd_sft_slash_pipe_up)
- };
diff --git a/keyboards/contra/keymaps/ryanm101/readme.md b/keyboards/contra/keymaps/ryanm101/readme.md
deleted file mode 100644
index a289eefcb75..00000000000
--- a/keyboards/contra/keymaps/ryanm101/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Layout Info
-Map is from my JJ40 but Contra has been done with a grid vs my JJ's MIT layout. Map will be updated as soon as i figure out what to do with the addional key.
-
-- Uses non-US keys
-- Keymap can be seen: Keymap -> http://www.keyboard-layout-editor.com/#/gists/7d111d72b138c3ef03ea4ffac4ddb7e4
-
-# Notes
-
-- .> on lower layer if tapped but ALTGR if held
-- RAISE -> uses TT() so tap to enter (NUMPAD Usage) or hold for momentary (F Keys)
-- LOWER on _RAISE goes straight to qwerty layout (Base layer)
diff --git a/keyboards/contra/keymaps/ryanm101/rules.mk b/keyboards/contra/keymaps/ryanm101/rules.mk
deleted file mode 100644
index f5e8c3d6dc8..00000000000
--- a/keyboards/contra/keymaps/ryanm101/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE=yes
\ No newline at end of file
diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h
index 4e161532f2a..6c42809eaf2 100644
--- a/keyboards/controllerworks/city42/config.h
+++ b/keyboards/controllerworks/city42/config.h
@@ -17,9 +17,6 @@
 
 #pragma once
 
-#define WS2812_PIO_USE_PIO1
-#define RGB_MATRIX_LED_COUNT 42
-
 #define SPI_SCK_PIN GP18
 #define SPI_MOSI_PIN GP19
 #define SPI_MISO_PIN GP16
@@ -29,4 +26,4 @@
 #define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_1X
 #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE
 #define CIRQUE_PINNACLE_TAP_ENABLE
-#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE
\ No newline at end of file
+#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE
diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json
index 2976021b11a..bff73f7e6ff 100644
--- a/keyboards/controllerworks/city42/info.json
+++ b/keyboards/controllerworks/city42/info.json
@@ -23,7 +23,6 @@
     "processor": "RP2040",
     "rgb_matrix": {
         "animations": {
-            "solid_color": true,
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h
index 4a0c48b1b03..5c22bb25590 100644
--- a/keyboards/controllerworks/mini36/config.h
+++ b/keyboards/controllerworks/mini36/config.h
@@ -18,9 +18,6 @@
 #pragma once
 
 #define WS2812_PIO_USE_PIO1
-#define RGB_MATRIX_LED_COUNT 48
-#define RGB_MATRIX_SPLIT \
-        { 24, 24 }
 
 #define I2C_DRIVER I2CD0
 #define I2C1_SCL_PIN GP25
diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json
index 3a49b210ac3..a3b5365109a 100644
--- a/keyboards/controllerworks/mini36/info.json
+++ b/keyboards/controllerworks/mini36/info.json
@@ -111,7 +111,8 @@
             {"flags": 4, "matrix": [6, 4], "x": 217, "y": 41},
             {"flags": 4, "matrix": [5, 4], "x": 217, "y": 24},
             {"flags": 4, "matrix": [4, 4], "x": 217, "y": 7}
-          ]
+        ],
+        "split_count": [24, 24]
     },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
diff --git a/keyboards/controllerworks/mini36/keymaps/default/config.h b/keyboards/controllerworks/mini36/keymaps/default/config.h
index 77da61828c1..aeca5716c0f 100644
--- a/keyboards/controllerworks/mini36/keymaps/default/config.h
+++ b/keyboards/controllerworks/mini36/keymaps/default/config.h
@@ -21,7 +21,7 @@
 #   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_SLEEP // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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)
diff --git a/keyboards/controllerworks/mini36/keymaps/via/config.h b/keyboards/controllerworks/mini36/keymaps/via/config.h
index 77da61828c1..aeca5716c0f 100644
--- a/keyboards/controllerworks/mini36/keymaps/via/config.h
+++ b/keyboards/controllerworks/mini36/keymaps/via/config.h
@@ -21,7 +21,7 @@
 #   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_SLEEP // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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)
diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
index 20b6bbac8d0..3e5f7fd357e 100644
--- a/keyboards/controllerworks/mini42/config.h
+++ b/keyboards/controllerworks/mini42/config.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #define WS2812_PIO_USE_PIO1
-#define RGB_MATRIX_LED_COUNT 54
 
 #undef I2C_DRIVER
 #define I2C_DRIVER I2CD0
diff --git a/keyboards/controllerworks/mini42/keymaps/default/config.h b/keyboards/controllerworks/mini42/keymaps/default/config.h
index 77da61828c1..aeca5716c0f 100644
--- a/keyboards/controllerworks/mini42/keymaps/default/config.h
+++ b/keyboards/controllerworks/mini42/keymaps/default/config.h
@@ -21,7 +21,7 @@
 #   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_SLEEP // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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)
diff --git a/keyboards/controllerworks/mini42/keymaps/via/config.h b/keyboards/controllerworks/mini42/keymaps/via/config.h
index e11d5aa37fa..5e70c093433 100644
--- a/keyboards/controllerworks/mini42/keymaps/via/config.h
+++ b/keyboards/controllerworks/mini42/keymaps/via/config.h
@@ -22,7 +22,7 @@
 #   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_SLEEP // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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)
diff --git a/keyboards/converter/adb_usb/keymaps/13bit/keymap.c b/keyboards/converter/adb_usb/keymaps/13bit/keymap.c
deleted file mode 100644
index c5dd8aa49b6..00000000000
--- a/keyboards/converter/adb_usb/keymaps/13bit/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define MCTL LCTL(KC_UP)
-#define SCST LSFT(LGUI(KC_4))
-#define SLP  LALT(LGUI(KC_EJCT))
-
-#define APP1 LSFT(LALT(LCTL(LGUI(KC_1))))
-#define APP2 LSFT(LALT(LCTL(LGUI(KC_2))))
-#define APP3 LSFT(LALT(LCTL(LGUI(KC_3))))
-#define APP4 LSFT(LALT(LCTL(LGUI(KC_4))))
-#define APP5 LSFT(LALT(LCTL(LGUI(KC_5))))
-#define APP6 LSFT(LALT(LCTL(LGUI(KC_6))))
-#define APP7 LSFT(LALT(LCTL(LGUI(KC_7))))
-#define APP8 LSFT(LALT(LCTL(LGUI(KC_8))))
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT_ext_ansi(
-    KC_ESC,  APP1,    APP2,   APP3,   APP4,   APP5,   APP6,   APP7,   APP8,    MCTL,   KC_MUTE, KC_VOLD, KC_VOLU,                SCST,   KC_SCRL, KC_PAUS,                               SLP,
-    KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS, KC_HOME, KC_PGUP,     KC_NUM,  KC_EQL, KC_PSLS, KC_PAST,
-    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_DEL, KC_END,  KC_PGDN,     KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
-    KC_LCAP, 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_P4,   KC_P5,  KC_P6,   KC_PPLS,
-    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_P1,   KC_P2,  KC_P3,
-    KC_LCTL, KC_LALT, KC_LGUI,                KC_SPC,                                  KC_RALT, KC_RCTL,                         KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,           KC_PDOT, KC_PENT
-    ),
-};
diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk
index d4e702622a8..104381f12fc 100644
--- a/keyboards/converter/hp_46010a/rules.mk
+++ b/keyboards/converter/hp_46010a/rules.mk
@@ -12,7 +12,6 @@ AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SPLIT_KEYBOARD = no
 WAIT_FOR_USB = yes
-LAYOUTS_HAS_RGB = no
 CUSTOM_MATRIX = yes
 
 SRC = matrix.c
diff --git a/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c b/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c
deleted file mode 100644
index 5497bfe87a5..00000000000
--- a/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright 2020 dsanchezseco
-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 {
-  DVO, // dvorak
-  QWE, // qwerty
-  SYS, // system
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* dvorak */
-    [DVO] = LAYOUT(
-                                     KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______,  _______, KC_PSCR, KC_PAUS, MO(SYS),
-                                     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-
-    LCTL(KC_A), LCTL(KC_Z), KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, XXXXXXX, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_BSPC, KC_PEQL, KC_PSLS, KC_PAST,
-    LCTL(KC_B), LCTL(KC_X), KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,           XXXXXXX,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-    LCTL(KC_D), LCTL(KC_C), KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          KC_BSLS, KC_ENT,               KC_UP,                KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    LCTL(KC_F), LCTL(KC_V), KC_LSFT, KC_BSLS, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,             XXXXXXX, KC_RSFT,     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    LCTL(KC_G), LCTL(KC_W), KC_LCTL,          KC_LALT,                            KC_SPC,                                               KC_RALT,          KC_RCTL,              KC_LGUI,              XXXXXXX, KC_P0,   KC_PDOT, XXXXXXX
-    ),
-    /* qwerty */
-    [QWE] = LAYOUT(
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,   XXXXXXX, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           XXXXXXX,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           _______, _______,              _______,              _______, _______, _______, _______,
-    _______, _______,     _______, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,           XXXXXXX, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______,          _______,                            _______,                                              _______,           _______,              _______,              XXXXXXX, _______, _______, XXXXXXX
-    ),
-
-    /* system */
-    [SYS] = LAYOUT(
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,     _______, _______, _______,     KC_NUM,  _______, _______, _______,
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          XXXXXXX,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, _______, _______, _______, _______, _______, TO(DVO), _______, _______, _______, _______, _______,          _______, _______,              _______,              _______, _______, _______, _______,
-    _______, _______,     _______, _______, _______, TO(QWE), _______, _______, _______, _______, _______, _______, _______, _______,          XXXXXXX, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              XXXXXXX, _______, _______, XXXXXXX
-    ),
-};
diff --git a/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/rules.mk b/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/rules.mk
deleted file mode 100644
index 0a5b666e855..00000000000
--- a/keyboards/converter/ibm_terminal/keymaps/dsanchezseco/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/config.h b/keyboards/converter/ibm_terminal/keymaps/priyadi/config.h
deleted file mode 100644
index 271f48d0011..00000000000
--- a/keyboards/converter/ibm_terminal/keymaps/priyadi/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-// place overrides here
diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
deleted file mode 100644
index 3645dd7da72..00000000000
--- a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
-Copyright 2016 Priyadi Iman Nurcahyo <priyadi@priyadi.net>
-
-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 {
-  QWE, // qwerty
-  COL, // colemak
-  WOR, // workman
-  DVO, // dvorak
-
-  MOU, // mouse keys
-  EMO, // emoji
-  SYS, // system
-};
-
-enum keycodes {
-  // default layout switcher
-  LAY_QWE = SAFE_RANGE,
-  LAY_COL,
-  LAY_WOR,
-  LAY_DVO,
-
-  // layer switchers
-  LYR_SYS,
-  LYR_EMO,
-
-  // os switchers
-  OS_LIN,
-  OS_WIN,
-  OS_MAC,
-};
-
-// unicode map
-
-enum unicode_name {
-  GRIN, // grinning face 😊
-  TJOY, // tears of joy 😂
-  SMILE, // grining face with smiling eyes 😁
-  HEART, // heart ❤
-  EYERT, // smiling face with heart shaped eyes 😍
-  CRY, // crying face 😭
-  SMEYE, // smiling face with smiling eyes 😊
-  UNAMU, // unamused 😒
-  KISS, // kiss 😘
-  HART2, // two hearts 💕
-  WEARY, // weary 😩
-  OKHND, // ok hand sign 👌
-  PENSV, // pensive 😔
-  SMIRK, // smirk 😏
-  RECYC, // recycle ♻
-  WINK, // wink 😉
-  THMUP, // thumb up 👍
-  THMDN, // thumb down 👎
-  PRAY, // pray 🙏
-  PHEW, // relieved 😌
-  MUSIC, // musical notes
-  FLUSH, // flushed 😳
-  CELEB, // celebration 🙌
-  CRY2, // crying face 😢
-  COOL, // smile with sunglasses 😎
-  NOEVS, // see no evil
-  NOEVH, // hear no evil
-  NOEVK, // speak no evil
-  POO, // pile of poo
-  EYES, // eyes
-  VIC, // victory hand
-  BHART, // broken heart
-  SLEEP, // sleeping face
-  SMIL2, // smiling face with open mouth & sweat
-  HUNRD, // 100
-  CONFU, // confused
-  TONGU, // face with tongue & winking eye
-  DISAP, // disappointed
-  YUMMY, // face savoring delicious food
-  CLAP, // hand clapping
-  FEAR, // face screaming in fear
-  HORNS, // smiling face with horns
-  HALO, // smiling face with halo
-  BYE, // waving hand
-  SUN, // sun
-  MOON, // moon
-  SKULL, // skull
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-  [GRIN] = 0x1F600,
-  [TJOY] = 0x1F602,
-  [SMILE] = 0x1F601,
-  [HEART] = 0x2764,
-  [EYERT] = 0x1f60d,
-  [CRY] = 0x1f62d,
-  [SMEYE] = 0x1F60A,
-  [UNAMU] = 0x1F612,
-  [KISS] = 0x1F618,
-  [HART2] = 0x1F495,
-  [WEARY] = 0x1F629,
-  [OKHND] = 0x1F44C,
-  [PENSV] = 0x1F614,
-  [SMIRK] = 0x1F60F,
-  [RECYC] = 0x267B,
-  [WINK] = 0x1F609,
-  [THMUP] = 0x1F44D,
-  [THMDN] = 0x1F44E,
-  [PRAY] = 0x1F64F,
-  [PHEW] = 0x1F60C,
-  [MUSIC] = 0x1F3B6,
-  [FLUSH] = 0x1F633,
-  [CELEB] = 0x1F64C,
-  [CRY2] = 0x1F622,
-  [COOL] = 0x1F60E,
-  [NOEVS] = 0x1F648,
-  [NOEVH] = 0x1F649,
-  [NOEVK] = 0x1F64A,
-  [POO] = 0x1F4A9,
-  [EYES] = 0x1F440,
-  [VIC] = 0x270C,
-  [BHART] = 0x1F494,
-  [SLEEP] = 0x1F634,
-  [SMIL2] = 0x1F605,
-  [HUNRD] = 0x1F4AF,
-  [CONFU] = 0x1F615,
-  [TONGU] = 0x1F61C,
-  [DISAP] = 0x1F61E,
-  [YUMMY] = 0x1F60B,
-  [CLAP] = 0x1F44F,
-  [FEAR] = 0x1F631,
-  [HORNS] = 0x1F608,
-  [HALO] = 0x1F607,
-  [BYE] = 0x1F44B,
-  [SUN] = 0x2600,
-  [MOON] = 0x1F314,
-  [SKULL] = 0x1F480,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* qwerty */
-    [QWE] = LAYOUT(
-                                   KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_PSCR, KC_SCRL, KC_PAUS,
-                                   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(EMO), MO(SYS),     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,  XXXXXXX, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    KC_MNXT, KC_VOLU,     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,          XXXXXXX,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_MPLY, KC_MUTE,     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_BSLS, KC_ENT,               KC_UP,                KC_P4,   KC_P5,   KC_P6,   KC_PCMM,
-    KC_MPRV, KC_VOLD,     KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          XXXXXXX, KC_RSFT,     KC_LEFT, TG(MOU), KC_RGHT,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LGUI, KC_APP,      KC_LCTL,          KC_LALT,                            KC_SPC,                                               KC_RALT,          KC_RCTL,              KC_DOWN,              XXXXXXX, KC_P0,   KC_PDOT, XXXXXXX
-    ),
-
-    /* colemak */
-    [COL] = LAYOUT(
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC,          _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,          _______, _______,              _______,              _______, _______, _______, _______,
-    _______, _______,     _______, _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______
-    ),
-
-    /* workman */
-    [WOR] = LAYOUT(
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC,          _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT,          _______, _______,              _______,              _______, _______, _______, _______,
-    _______, _______,     _______, _______, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH,          _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______
-    ),
-
-    /* dvorak */
-    [DVO] = LAYOUT(
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,           _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          _______, _______,              _______,              _______, _______, _______, _______,
-    _______, _______,     _______, _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,             _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______
-    ),
-
-    /* system */
-    [SYS] = LAYOUT(
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, LAY_QWE, OS_WIN,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, _______, _______, LAY_DVO, _______, _______, _______, _______, LAY_WOR, OS_LIN,  _______, _______,          _______, _______,              _______,              _______, _______, _______, _______,
-    _______, _______,     _______, _______, _______, _______, LAY_COL, _______, _______, _______, OS_MAC,  _______, _______, _______,          _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______
-    ),
-
-    /* mouse keys */
-    [MOU] = 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,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, KC_BTN4,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,              KC_MS_U,              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, KC_BTN5,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,     KC_MS_L, _______, KC_MS_R,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_BTN1, KC_BTN3,     KC_BTN2,          XXXXXXX,                            XXXXXXX,                                              XXXXXXX,          XXXXXXX,              KC_MS_D,              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    /* emoji */
-    [EMO] = 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,     XXXXXXX, UM(CRY2),UM(WEARY),UM(EYERT),UM(SMIRK), UM(TJOY), UM(RECYC),UM(UNAMU),UM(MUSIC),UM(OKHND),UM(PENSV),XXXXXXX, XXXXXXX,          XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX,     XXXXXXX, UM(PRAY),UM(SMILE),UM(SMIL2),UM(FLUSH), UM(GRIN), UM(HEART),UM(BYE),  UM(KISS), UM(CELEB),UM(COOL), XXXXXXX,          XXXXXXX, XXXXXXX,              XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX,UM(SLEEP),UM(CLAP), UM(CRY),   UM(VIC),  UM(BHART),UM(SUN),  UM(SMEYE),UM(WINK), UM(MOON), UM(CONFU),         XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX,     XXXXXXX,          XXXXXXX,                            XXXXXXX,                                              XXXXXXX,          XXXXXXX,              XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    /*
-    [XXX] = LAYOUT(
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,              _______,              _______, _______, _______, _______,
-    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
-    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______
-    ),
-    */
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    /* layout switcher */
-    case LAY_QWE:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<QWE);
-      }
-      return false;
-      break;
-    case LAY_COL:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<COL);
-      }
-      return false;
-      break;
-    case LAY_WOR:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<WOR);
-      }
-      return false;
-      break;
-    case LAY_DVO:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<DVO);
-      }
-      return false;
-      break;
-
-    /* os switcher */
-    case OS_LIN:
-      set_unicode_input_mode(UNICODE_MODE_LINUX);
-      return false;
-      break;
-    case OS_WIN:
-      set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
-      return false;
-      break;
-    case OS_MAC:
-      set_unicode_input_mode(UNICODE_MODE_MACOS);
-      return false;
-      break;
-
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-  set_unicode_input_mode(UNICODE_MODE_LINUX);
-}
diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/rules.mk b/keyboards/converter/ibm_terminal/keymaps/priyadi/rules.mk
deleted file mode 100644
index b18dc2d4d85..00000000000
--- a/keyboards/converter/ibm_terminal/keymaps/priyadi/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = yes
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-PS2_ENABLE = yes
-PS2_DRIVER = usart
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/converter/ibm_terminal/matrix.c b/keyboards/converter/ibm_terminal/matrix.c
index de346a0f70b..d245ff61b28 100644
--- a/keyboards/converter/ibm_terminal/matrix.c
+++ b/keyboards/converter/ibm_terminal/matrix.c
@@ -87,23 +87,23 @@ uint8_t matrix_scan(void)
 
     uint8_t code;
     if ((code = ps2_host_recv())) {
-        debug("r"); debug_hex(code); debug(" ");
+        dprintf("r%02X ", code);
     }
 
     switch (state) {
         case RESET:
-            debug("wFF ");
+            dprint("wFF ");
             if (ps2_host_send(0xFF) == 0xFA) {
-                debug("[ack]\nRESET_RESPONSE: ");
+                dprint("[ack]\nRESET_RESPONSE: ");
                 state = RESET_RESPONSE;
             }
             break;
         case RESET_RESPONSE:
             if (code == 0xAA) {
-                debug("[ok]\nKBD_ID: ");
+                dprint("[ok]\nKBD_ID: ");
                 state = KBD_ID0;
             } else if (code) {
-                debug("err\nRESET: ");
+                dprint("err\nRESET: ");
                 state = RESET;
             }
             break;
@@ -115,14 +115,14 @@ uint8_t matrix_scan(void)
             break;
         case KBD_ID1:
             if (code) {
-                debug("\nCONFIG: ");
+                dprint("\nCONFIG: ");
                 state = CONFIG;
             }
             break;
         case CONFIG:
-            debug("wF8 ");
+            dprint("wF8 ");
             if (ps2_host_send(0xF8) == 0xFA) {
-                debug("[ack]\nREADY\n");
+                dprint("[ack]\nREADY\n");
                 state = READY;
             }
             break;
@@ -132,16 +132,16 @@ uint8_t matrix_scan(void)
                     break;
                 case 0xF0:
                     state = F0_BREAK;
-                    debug(" ");
+                    dprint(" ");
                     break;
                 default:    // normal key make
                     if (code < 0x88) {
                         matrix_make(code);
                     } else {
-                        debug("unexpected scan code at READY: "); debug_hex(code); debug("\n");
+                        dprintf("unexpected scan code at READY: %02X\n", code);
                     }
                     state = READY;
-                    debug("\n");
+                    dprint("\n");
             }
             break;
         case F0_BREAK:    // Break code
@@ -152,10 +152,10 @@ uint8_t matrix_scan(void)
                     if (code < 0x88) {
                         matrix_break(code);
                     } else {
-                        debug("unexpected scan code at F0: "); debug_hex(code); debug("\n");
+                        dprintf("unexpected scan code at F0: %02X\n", code);
                     }
                     state = READY;
-                    debug("\n");
+                    dprint("\n");
             }
             break;
     }
diff --git a/keyboards/converter/m0110_usb/m0110.c b/keyboards/converter/m0110_usb/m0110.c
index f3097fb4651..308eb936e3e 100644
--- a/keyboards/converter/m0110_usb/m0110.c
+++ b/keyboards/converter/m0110_usb/m0110.c
@@ -312,8 +312,7 @@ static inline uint8_t instant(void) {
     m0110_send(M0110_INSTANT);
     uint8_t data = m0110_recv();
     if (data != M0110_NULL) {
-        debug_hex(data);
-        debug(" ");
+        dprintf("%02X ", data);
     }
     return data;
 }
diff --git a/keyboards/converter/modelm101/keymaps/iw0rm3r/config.h b/keyboards/converter/modelm101/keymaps/iw0rm3r/config.h
deleted file mode 100644
index 779e5a858f9..00000000000
--- a/keyboards/converter/modelm101/keymaps/iw0rm3r/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 iw0rm3r
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/config.h b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/config.h
deleted file mode 100644
index 667668959a3..00000000000
--- a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Adam Newbold <adam@neatnik.net>
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
deleted file mode 100644
index 56646283769..00000000000
--- a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2019 Adam Newbold <adam@neatnik.net>
- *
- * 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 the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- +-------+     +-------+-------+-------+  +-------+-------+
- |  Esc  |     |  7    |  8    |  9    |  |  (    |  )    |
- +-------+     +-------+-------+-------+  +-------+-------+
- |  <--  |     |  4    |  5    |  6    |  |  -    |  /    |
- +-------+     +-------+-------+-------+  +-------+-------+
- |  -->  |     |  1    |  2    |  3    |  |  +    |  *    |
- +-------+  +--+-------+-------+-------+  +-------+-------+
- | Space |  |  0       |  ,    |  .    |  |  Ret  | Print |
- +-------+  +----------+-------+-------+  +-------+-------+
-*/
-  [0] = LAYOUT(
-    KC_MUTE,      KC_KP_7,  KC_KP_8,      KC_KP_9,    KC_LEFT_PAREN,  KC_RIGHT_PAREN,
-    KC_VOLD,      KC_KP_4,  KC_KP_5,      KC_KP_6,    KC_KP_MINUS,    KC_KP_SLASH,
-    KC_VOLU,      KC_KP_1,  KC_KP_2,      KC_KP_3,    KC_KP_PLUS,     KC_KP_ASTERISK,
-    MO(1),        KC_KP_0,  KC_KP_COMMA,  KC_KP_DOT,  KC_RETURN,      KC_QUESTION
-  ),
-  [1] = LAYOUT(
-    KC_TRNS,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        KC_TRNS,
-    KC_BRMD,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        KC_TRNS,
-    KC_BRMU,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        KC_TRNS,
-    KC_TRNS,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        QK_BOOT
-  ),
-};
diff --git a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/readme.md b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/readme.md
deleted file mode 100644
index 0bccfdb6cf8..00000000000
--- a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/readme.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# @newbold's layout for the Numeric Keypad IIe
-
-Includes the standard layout for all keys except for the left-most column, which is remapped to these keys:
-
- +-----------------+
- |       Mute      |
- +-----------------+
- |   Volume Down   |
- +-----------------+
- |    Volume Up    |
- +-----------------+
- |     Function    |
- +-----------------+
- 
- With Function held down:
- 
- +-----------------+
- |       Mute      |
- +-----------------+
- | Brightness Down |
- +-----------------+
- |  Brightness Up  |
- +-----------------+
- |     Function    |
- +-----------------+
- 
- And also with Function held down, "Print" (the lower right key) will trigger RESET (putting the controller into bootloader mode so it can be flashed).
- 
\ No newline at end of file
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 016b5622541..8ae89deb6ae 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -168,7 +168,7 @@ uint8_t get_serial_byte(void) {
     while(1) {
         code = uart_read();
         if (code) { 
-            debug_hex(code); debug(" ");
+            dprintf("%02X ", code);
             return code;
         }
     }
@@ -316,8 +316,7 @@ uint8_t matrix_scan(void)
    last_activity = timer_read();
    disconnect_counter=0; // if we are getting serial data, we're connected. 
 
-    debug_hex(code); debug(" ");
-
+    dprintf("%02X ", code);
 
     switch (code) {
         case 0xFD:  // unexpected reset byte 2
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index bf1d5f807fd..6d52d5cd6c5 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -111,7 +111,7 @@ uint8_t matrix_scan(void)
     code = uart_read();
     if (!code) return 0;
 
-    debug_hex(code); debug(" ");
+    dprintf("%02X ", code);
 
     switch (code) {
         case 0xFF:  // reset success: FF 04
diff --git a/keyboards/converter/usb_usb/keymaps/ble/keymap.c b/keyboards/converter/usb_usb/keymaps/ble/keymap.c
deleted file mode 100644
index 7cac65e7852..00000000000
--- a/keyboards/converter/usb_usb/keymaps/ble/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright 2017 Balz Guenat <balz.guenat@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: plain Qwerty without layer switching
-     *         ,---------------. ,---------------. ,---------------.
-     *         |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
-     * ,---.   |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help  |
-     * `---'   `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -| |Stp|Agn|
-     * |-----------------------------------------------------------| |-----------| |---------------| |-------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +| |Mnu|Und|
-     * |-----------------------------------------------------------| `-----------' |---------------| |-------|
-     * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  #|Retn|               |  4|  5|  6|KP,| |Sel|Cpy|
-     * |-----------------------------------------------------------|     ,---.     |---------------| |-------|
-     * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|KP=| |Exe|Pst|
-     * |-----------------------------------------------------------| ,-----------. |---------------| |-------|
-     * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
-     * `-----------------------------------------------------------' `-----------' `---------------' `-------'
-     */
-    [0] = LAYOUT_all(
-                      KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    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_SCRL, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    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_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
-    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_PCMM,    KC_SLCT, KC_COPY,
-    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_INT1, KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
-    ),
-};
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c b/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c
deleted file mode 100644
index 3b894886482..00000000000
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2020 Christopher Ko <chriskopher@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 "shared_enum.h"
-
-#include "quantum.h"
-
-enum combo_event {
-    SD_LAYER_COMBO,
-    KL_MEH_COMBO,
-};
-
-const uint16_t PROGMEM sd_combo[] = {KC_S, KC_D, COMBO_END};  // Combo: S + D for SuperDuper mode
-const uint16_t PROGMEM kl_combo[] = {KC_K, KC_L, COMBO_END};  // Combo: K + L for Meh modifier
-
-// Register the combo action
-combo_t key_combos[] = {
-    [SD_LAYER_COMBO] = COMBO_ACTION(sd_combo),
-    [KL_MEH_COMBO]   = COMBO_ACTION(kl_combo),
-};
-
-// Called after a combo event is triggered
-void process_combo_event(uint16_t combo_index, bool pressed) {
-    switch (combo_index) {
-        case SD_LAYER_COMBO:
-            if (pressed) {
-                layer_on(_SUPERDUPER);
-            } else {
-                layer_off(_SUPERDUPER);
-            }
-            break;
-
-        case KL_MEH_COMBO:
-            if (pressed) {
-                register_mods(MOD_MEH);
-            } else {
-                unregister_mods(MOD_MEH);
-            }
-            break;
-    }
-}
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h b/keyboards/converter/usb_usb/keymaps/chriskopher/config.h
deleted file mode 100644
index 8f26d257994..00000000000
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Christopher Ko <chriskopher@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_TERM 200  // Delay for tap modifiers until it is considered a hold
-
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY   // Allows configuration of hold on other key press per key in keymap.c
-
-#define COMBO_TERM 20  // Delay for combo keys to be chained together
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
deleted file mode 100644
index d34f91d21e4..00000000000
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Copyright 2020 Christopher Ko <chriskopher@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 "shared_enum.h"
-
-#include QMK_KEYBOARD_H
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Modified Qwerty for chriskopher: base default layer
-     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
-     * `---'   `---------------' `---------------' `---------------' `-----------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   \   | |Ins|Hom|PgU| |NmL|  /|  *|  -|
-     * |-----------------------------------------------------------| |-----------| |---------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  Bsp| |Del|End|PgD| |  7|  8|  9|   |
-     * |-----------------------------------------------------------| `-----------' |-----------|   |
-     * |Ctl/Esc|  A|  S|  D|  F|  G|  H|  J|  K| L|;/:| ' |  Return|               |  4|  5|  6|  +|
-     * |-----------------------------------------------------------|     ,---.     |---------------|
-     * |Shift/( |Dev/Z| X|  C|  V|  B|  N|  M|  ,|  .|  /|  Shift/)|     | ↑ |     |  1|  2|  3|   |
-     * |-----------------------------------------------------------| ,-----------. |-----------|   |
-     * |Meh/CapsL|Gui|Alt|     Space       |Alt|Adjust/Gui|App| Ctl| | ← | ↓ | → | |      0|  .|Ent|
-     * `-----------------------------------------------------------' `-----------' `---------------'
-    */
-    [_CKO] = LAYOUT_fullsize_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_SCRL, KC_PAUS,
-        KC_GRV,           KC_1,           KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,         KC_MINS,  KC_EQL,    KC_BSLS,    KC_INS,  KC_HOME, KC_PGUP,            KC_NUM,  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_BSPC,    KC_DEL,  KC_END,  KC_PGDN,            KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-        LCTL_T(KC_ESC),   KC_A,           KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    TD(SCLN_CLN), KC_QUOT,             KC_ENT,                                           KC_P4,   KC_P5,   KC_P6,
-        TD(ESPC_L),       LT(_DEV,KC_Z),  KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,                           TD(ESPC_R),          KC_UP,                       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        MEH_T(KC_CAPS), KC_LGUI, KC_LALT,                   KC_SPC,                                   KC_RALT, LT(_ADJUST,KC_RGUI),      KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,            KC_P0,            KC_PDOT
-    ),
-
-    /* Regular Qwerty: default layer
-     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
-     * `---'   `---------------' `---------------' `---------------' `-----------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|    Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
-     * |-----------------------------------------------------------| |-----------| |---------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|   |
-     * |-----------------------------------------------------------| `-----------' |-----------|   |
-     * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return|               |  4|  5|  6|  +|
-     * |-----------------------------------------------------------|     ,---.     |---------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     | ↑ |     |  1|  2|  3|   |
-     * |-----------------------------------------------------------| ,-----------. |-----------|   |
-     * |Ctl|Gui|Alt|           Space        |Alt|Adjust/Gui|App|Ctl| | ← | ↓ | → | |      0|  .|Ent|
-     * `-----------------------------------------------------------' `-----------' `---------------'
-    */
-    [_QWERTY] = LAYOUT_fullsize_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_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,   KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  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_BSLS,   KC_DEL,  KC_END,  KC_PGDN,    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_ENT,                                  KC_P4,   KC_P5,   KC_P6,
-        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_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                         KC_RALT,  LT(_ADJUST,KC_RGUI), KC_APP,  KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
-    ),
-
-    /* SuperDuper
-     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     * |   |   |   |   |   |   | |   |   |   |   | |   |   |   |   | |   |   |   |
-     * `---'   `---------------' `---------------' `---------------' `-----------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * |   |   |   |   |   |   |   |   |   |   |   |   |   |       | |   |   |   | |   |   |   |   |
-     * |-----------------------------------------------------------| |-----------| |---------------|
-     * |     |   |   |   |   |   |   |1T |T← |T→ |9T |   |    |    | |   |   |   | |   |   |   |   |
-     * |-----------------------------------------------------------| `-----------' |-----------|   |
-     * |      |Alt|[SuperDuper]|Bksp|Ctl| ← | ↓ | ↑ | → |Del|   |  |               |   |   |   |   |
-     * |-----------------------------------------------------------|     ,---.     |---------------|
-     * |        |   |   |   |   |   |   |   |   |   |ToggleSD|     |     |   |     |   |   |   |   |
-     * |-----------------------------------------------------------| ,-----------. |-----------|   |
-     * |   |   |   |             Shift             |   |   |   |   | |   |   |   | |       |   |   |
-     * `-----------------------------------------------------------' `-----------' `---------------'
-    */
-    [_SUPERDUPER] = LAYOUT_fullsize_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______,      _______,    _______,   _______, _______, _______,              _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,    _______,   _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, C(KC_1), C(S(KC_TAB)), C(KC_TAB),  C(KC_9),   _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
-        _______, KC_LALT, _______, _______, KC_BSPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_UP,        KC_RIGHT,   KC_DEL,    _______,                   _______,                                   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,    TG(_SUPERDUPER),                      _______,              _______,             _______, _______, _______, _______,
-        _______, _______, _______,                   KC_LSFT,                                                        _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
-    ),
-
-    /* Dev
-     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     * |   |   |   |   |   |   | |   |   |   |   | |   |   |   |   | |   |   |   |
-     * `---'   `---------------' `---------------' `---------------' `-----------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * |   |   |   |   |   |   |   |   |   |   |   |   |   |       | |   |   |   | |   |   |   |   |
-     * |-----------------------------------------------------------| |-----------| |---------------|
-     * |     |   |   |   |   |   |   | - | + | ( | ) |   |   |     | |   |   |   | |   |   |   |   |
-     * |-----------------------------------------------------------| `-----------' |-----------|   |
-     * |      |   |   |   |   |   | _ | [ | ] | { | } |   |        |               |   |   |   |   |
-     * |-----------------------------------------------------------|     ,---.     |---------------|
-     * |        |   |   |   |   |   | = | | | < | > | ? |          |     |   |     |   |   |   |   |
-     * |-----------------------------------------------------------| ,-----------. |-----------|   |
-     * |   |   |   |                               |   |   |   |   | |   |   |   | |       |   |   |
-     * `-----------------------------------------------------------' `-----------' `---------------'
-    */
-    [_DEV] = LAYOUT_fullsize_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                           _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                       _______,     _______, _______, _______,    _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_MINS, S(KC_EQL), S(KC_9), S(KC_0),  _______, _______,                    _______,     _______, _______, _______,    _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC),  _______,                      _______,                                   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH),                               _______,              _______,             _______, _______, _______, _______,
-        _______, _______, _______,                   _______,                                                           _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
-    ),
-
-    /* Adjust
-     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     * |   |   |   |   |   |   | |   |   |   |   | |   |   |   |   | |   |   |   |
-     * `---'   `---------------' `---------------' `---------------' `-----------'
-     * ,-----------------------------------------------------------. ,--------------. ,---------------.
-     * |   |   |   |   |   |   |   |   |   |   |   |   |   |       | |Play|Next|VolU| |   |   |   |   |
-     * |-----------------------------------------------------------| |--------------| |---------------|
-     * |     |QWERTY|   |   |   |   |   |   |   |   |   |   |  |   | |Stop|Prev|VolD| |   |   |   |   |
-     * |-----------------------------------------------------------| `--------------' |-----------|   |
-     * |      |   |   |   |   |   |   |   |   |   |   |   |        |                  |   |   |   |   |
-     * |-----------------------------------------------------------|     ,---.        |---------------|
-     * |        |   |   |CKO|   |   |  |Play|Mute|VolD|VolU| SD|   |     |   |        |   |   |   |   |
-     * |-----------------------------------------------------------| ,-----------.    |-----------|   |
-     * |   |   |   |                               |   |   |   |   | |   |   |   |    |       |   |   |
-     * `-----------------------------------------------------------' `-----------'    `---------------'
-    */
-    [_ADJUST] = LAYOUT_fullsize_ansi(
-        _______,               _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______,
-        _______, _______,      _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     KC_MPLY, KC_MNXT, KC_VOLU,    _______, _______, _______, _______,
-        _______, DF(_QWERTY),  _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     KC_MSTP, KC_MPRV, KC_VOLD,    _______, _______, _______, _______,
-        _______, _______,      _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______,                   _______,                                   _______, _______, _______,
-        _______, _______,      _______, DF(_CKO),  _______, _______, KC_MPLY,  KC_MUTE, KC_VOLD, KC_VOLU, TG(_SUPERDUPER),                   _______,              _______,             _______, _______, _______, _______,
-        _______, _______,      _______,                     _______,                                              _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
-    )
-
-/* Empty layout for future reference
-  * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-  * |   |   |   |   |   |   | |   |   |   |   | |   |   |   |   | |   |   |   |
-  * `---'   `---------------' `---------------' `---------------' `-----------'
-  * ,-----------------------------------------------------------. ,-----------. ,---------------.
-  * |   |   |   |   |   |   |   |   |   |   |   |   |   |       | |   |   |   | |   |   |   |   |
-  * |-----------------------------------------------------------| |-----------| |---------------|
-  * |     |   |   |   |   |   |   |   |   |   |   |   |   |     | |   |   |   | |   |   |   |   |
-  * |-----------------------------------------------------------| `-----------' |-----------|   |
-  * |      |   |   |   |   |   |   |   |   |   |   |   |        |               |   |   |   |   |
-  * |-----------------------------------------------------------|     ,---.     |---------------|
-  * |        |   |   |   |   |   |   |   |   |   |   |          |     |   |     |   |   |   |   |
-  * |-----------------------------------------------------------| ,-----------. |-----------|   |
-  * |   |   |   |                               |   |   |   |   | |   |   |   | |       |   |   |
-  * `-----------------------------------------------------------' `-----------' `---------------'
- */
- /*
-  *  [_EMPTY] = LAYOUT_fullsize_ansi(
-  *      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______,
-  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
-  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
-  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,                                   _______, _______, _______,
-  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,              _______,             _______, _______, _______, _______,
-  *      _______, _______, _______,                   _______,                                              _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
-  *  ),
- */
-};
-// clang-format on
-
-// Configure hold on other key press per key
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // I don't like how ignore interrupt feels with these keys specifically when I'm typing
-        case LCTL_T(KC_ESC):
-            return true;
-        default:
-            return false;
-    }
-}
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/readme.md b/keyboards/converter/usb_usb/keymaps/chriskopher/readme.md
deleted file mode 100644
index 59f70716aed..00000000000
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/readme.md
+++ /dev/null
@@ -1,193 +0,0 @@
-# chriskopher's QMK Config
-Currently designed for the use of an ANSI tenkeyless keyboard on Windows 10. Although many of the ideas can be applied agnostically across operating systems.
-
-## Hardware
-- [Hasu USB to USB Controller Converter](https://www.1upkeyboards.com/shop/controllers/usb-to-usb-converter/)
-    - Limitations include:
-        - 6KRO
-        - Media/System control keys and <kbd>Fn</kbd> key are not recognized by the converter
-        - Max firmware size of 28K and a lot of it is taken up by the USB keyboard support, so not all QMK features can be enabled
-        - No mouse or other pointing device support
-- A regular ANSI QWERTY USB Type B keyboard
-
-## Layer Overview
-### Base Layers
-#### 0. [My personal modified QWERTY layout](#chriskopher-qwerty-layout)
-This is the default base layer that is used for most of my typing and where the intermediate layers are stacked onto. It is loaded by default on keyboard power up.
-- Apply this base layer with <kbd>[Adjust](#adjust-layer)</kbd> + <kbd>c</kbd>, or by powering on the keyboard
-- Swapped <kbd>CapsLock</kbd> and <kbd>LCtrl</kbd> for ergonomics with often performed <kbd>LCtrl</kbd> keyboard shortcuts
-- Swapped <kbd>\\</kbd> and <kbd>Backspace</kbd> to minimize hand movement, inspired by the [HHKB](https://happyhackingkb.com/) layout
-- Overloaded modifier keys, inspired by Steve Losh's [A Modern Space Cadet](https://stevelosh.com/blog/2012/10/a-modern-space-cadet/)
-    - Tap <kbd>LShift</kbd> for <kbd>(</kbd>, hold for <kbd>LShift</kbd>
-    - Tap <kbd>RShift</kbd> for <kbd>)</kbd>, hold for <kbd>RShift</kbd>
-    - Tap <kbd>LCtrl</kbd> for <kbd>Esc</kbd>, hold for <kbd>LCtrl</kbd> (remember that <kbd>LCtrl</kbd> is swapped with <kbd>CapsLock</kbd>)
-- Tap Dances that allow different functionality based on the number of key presses within the `TAPPING_TERM` of 200 ms
-    - Extended space cadet shifting:
-        - Two taps of <kbd>LShift</kbd> sends <kbd>{</kbd>, and three taps send <kbd>[</kbd>
-        - Two taps of <kbd>RShift</kbd> sends <kbd>}</kbd>, and three taps send <kbd>]</kbd>
-    - One tap of <kbd>;</kbd> will send <kbd>;</kbd>, two taps of <kbd>;</kbd> will send <kbd>:</kbd>
-- Combos that allow for different functionality based on custom chorded key presses within the `COMBO_TERM` of 20 ms
-    - Press and hold <kbd>s</kbd> and <kbd>d</kbd> to momentarily activate the <kbd>[(S)uper(D)uper](#superduper-layer)</kbd> layer
-    - Press and hold <kbd>k</kbd> and <kbd>l</kbd> to momentarily activate <kbd>Meh</kbd> modifier key
-        - <kbd>Meh</kbd> key (<kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Alt</kbd>) is useful for binding unique hotkeys on the OS that won't collide with or override other existing hotkeys
-        - Tap <kbd>CapsLock</kbd> for <kbd>CapsLock</kbd>, hold <kbd>CapsLock</kbd> to momentarily activate <kbd>Meh</kbd> modifier key while held (remember that <kbd>LCtrl</kbd> is swapped with <kbd>CapsLock</kbd>)
-- Tap/Hold actions for layer switching
-    - Similar to the overloaded modifier keys
-    - Tap <kbd>z</kbd> for <kbd>z</kbd>, hold <kbd>z</kbd> to momentarily activate <kbd>[Dev](#dev-layer)</kbd> layer while held
-    - Tap <kbd>RGui</kbd> for <kbd>RGui</kbd>, hold <kbd>RGui</kbd> to momentarily activate <kbd>[Adjust](#adjust-layer)</kbd> layer while held
-
-```
-,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-|Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
-`---'   `---------------' `---------------' `---------------' `-----------'
-,-----------------------------------------------------------. ,-----------. ,---------------.
-|  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   \   | |Ins|Hom|PgU| |NmL|  /|  *|  -|
-|-----------------------------------------------------------| |-----------| |---------------|
-|Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  Bsp| |Del|End|PgD| |  7|  8|  9|   |
-|-----------------------------------------------------------| `-----------' |-----------|   |
-|Ctl/Esc|  A|  S|  D|  F|  G|  H|  J|  K| L|;/:| ' |  Return|               |  4|  5|  6|  +|
-|-----------------------------------------------------------|     ,---.     |---------------|
-|Shift/( |Dev/Z| X|  C|  V|  B|  N|  M|  ,|  .|  /|  Shift/)|     | ↑ |     |  1|  2|  3|   |
-|-----------------------------------------------------------| ,-----------. |-----------|   |
-|Meh/CapsL|Gui|Alt|     Space       |Alt|Adjust/Gui|App| Ctl| | ← | ↓ | → | |      0|  .|Ent|
-`-----------------------------------------------------------' `-----------' `---------------'
-```
-
-Note: can't use <kbd>Hyper</kbd> key (<kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>Gui</kbd>) instead of <kbd>Meh</kbd> reliably on Windows 10 because pressing <kbd>Hyper</kbd> opens Microsoft Office, <kbd>Hyper</kbd> + <kbd>t</kbd> opens Microsoft Teams, <kbd>Hyper</kbd> + <kbd>d</kbd> opens Microsoft OneDrive, <kbd>Hyper</kbd> + <kbd>y</kbd> Yammer, etc. And I couldn't find a clean way to disable this without needing to modify the host computer.
-
-#### 1. [A regular QWERTY layout](#regular-qwerty-layout)
-This layer is for when other people need to type on my keyboard.
-- Apply this base layer with <kbd>[Adjust](#adjust-layer)</kbd> + <kbd>q</kbd>
-- The only modification is the addition of the tap/hold action for switching back to the <kbd>[Adjust](#adjust-layer)</kbd> layer while held
-    - Tap <kbd>RGui</kbd> for <kbd>RGui</kbd>, hold <kbd>RGui</kbd> to momentarily activate <kbd>[Adjust](#adjust-layer)</kbd> layer while held
-
-```
-,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-|Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
-`---'   `---------------' `---------------' `---------------' `-----------'
-,-----------------------------------------------------------. ,-----------. ,---------------.
-|  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|    Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
-|-----------------------------------------------------------| |-----------| |---------------|
-|Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|   |
-|-----------------------------------------------------------| `-----------' |-----------|   |
-|CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return|               |  4|  5|  6|  +|
-|-----------------------------------------------------------|     ,---.     |---------------|
-|Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     | ↑ |     |  1|  2|  3|   |
-|-----------------------------------------------------------| ,-----------. |-----------|   |
-|Ctl|Gui|Alt|           Space        |Alt|Adjust/Gui|App|Ctl| | ← | ↓ | → | |      0|  .|Ent|
-`-----------------------------------------------------------' `-----------' `---------------'
-```
-
-### Intermediate Layers
-#### 2. [(S)uper(D)uper Mode](#superduper-layer)
-Inspired by [narze](https://github.com/qmk/qmk_firmware/tree/master/keyboards/planck/keymaps/narze) via [jasonrudolph](https://github.com/jasonrudolph/keyboard#super-duper-mode). It's designed to help with navigation while keeping you on the home row, or very close to it.
-
-- To activate this layer, press <kbd>s</kbd> + <kbd>d</kbd> simultaneously and hold from the base layer
-    - Alternatively, hold <kbd>/</kbd> to activate the layer. This method is slower because the layer toggle uses a `TAPPING_TERM` of 200 ms but <kbd>s</kbd> + <kbd>d</kbd> uses a `COMBO_TERM` of only 20 ms (can be changed within `config.h`).
-- Use <kbd>h</kbd> / <kbd>j</kbd> / <kbd>k</kbd> / <kbd>l</kbd>
-  for <kbd>←</kbd> / <kbd>↓</kbd> / <kbd>↑</kbd> / <kbd>→</kbd>, respectively
-- Use <kbd>a</kbd> for <kbd>Alt</kbd>
-- Use <kbd>f</kbd> for <kbd>Backspace</kbd>
-- Use <kbd>g</kbd> for <kbd>Ctrl</kbd>
-- Use <kbd>Space</kbd> for <kbd>Shift</kbd>
-- Use <kbd>;</kbd> for <kbd>Delete</kbd>
-- Use <kbd>i</kbd> / <kbd>o</kbd> to move to the previous/next tab
-- Use <kbd>u</kbd> / <kbd>p</kbd> to go to the first/last tab (in most apps)
-- Use <kbd>/</kbd> to toggle <kbd>[(S)uper(D)uper](#superduper-layer)</kbd> layer
-
-```
-,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-|   |   |   |   |   |   | |   |   |   |   | |   |   |   |   | |   |   |   |
-`---'   `---------------' `---------------' `---------------' `-----------'
-,-----------------------------------------------------------. ,-----------. ,---------------.
-|   |   |   |   |   |   |   |   |   |   |   |   |   |       | |   |   |   | |   |   |   |   |
-|-----------------------------------------------------------| |-----------| |---------------|
-|     |   |   |   |   |   |   |1T |T← |T→ |9T |   |    |    | |   |   |   | |   |   |   |   |
-|-----------------------------------------------------------| `-----------' |-----------|   |
-|      |Alt|[SuperDuper]|Bksp|Ctl| ← | ↓ | ↑ | → |Del|   |  |               |   |   |   |   |
-|-----------------------------------------------------------|     ,---.     |---------------|
-|        |   |   |   |   |   |   |   |   |   |ToggleSD|     |     |   |     |   |   |   |   |
-|-----------------------------------------------------------| ,-----------. |-----------|   |
-|   |   |   |             Shift             |   |   |   |   | |   |   |   | |       |   |   |
-`-----------------------------------------------------------' `-----------' `---------------'
-```
-
-#### 3. [Dev](#dev-layer)
-This layer is for easy access to symbols commonly used during development.
-- To activate this layer, press and hold <kbd>z</kbd> from the base layer
-- Use <kbd>u</kbd> / <kbd>i</kbd> / <kbd>o</kbd> / <kbd>p</kbd>
-  for <kbd>-</kbd> / <kbd>+</kbd> / <kbd>(</kbd> / <kbd>)</kbd>, respectively
-- Use <kbd>h</kbd> / <kbd>j</kbd> / <kbd>k</kbd> / <kbd>l</kbd> / <kbd>;</kbd>
-  for <kbd>_</kbd> / <kbd>[</kbd> / <kbd>]</kbd> / <kbd>{</kbd> / <kbd>}</kbd>, respectively
-- Use <kbd>n</kbd> / <kbd>m</kbd> / <kbd>,</kbd> / <kbd>.</kbd> / <kbd>/</kbd>
-  for <kbd>=</kbd> / <kbd>|</kbd> / <kbd><</kbd> / <kbd>></kbd> / <kbd>?</kbd>, respectively
-
-```
-,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-|   |   |   |   |   |   | |   |   |   |   | |   |   |   |   | |   |   |   |
-`---'   `---------------' `---------------' `---------------' `-----------'
-,-----------------------------------------------------------. ,-----------. ,---------------.
-|   |   |   |   |   |   |   |   |   |   |   |   |   |       | |   |   |   | |   |   |   |   |
-|-----------------------------------------------------------| |-----------| |---------------|
-|     |   |   |   |   |   |   | - | + | ( | ) |   |   |     | |   |   |   | |   |   |   |   |
-|-----------------------------------------------------------| `-----------' |-----------|   |
-|      |   |   |   |   |   | _ | [ | ] | { | } |   |        |               |   |   |   |   |
-|-----------------------------------------------------------|     ,---.     |---------------|
-|        |   |   |   |   |   | = | | | < | > | ? |          |     |   |     |   |   |   |   |
-|-----------------------------------------------------------| ,-----------. |-----------|   |
-|   |   |   |                               |   |   |   |   | |   |   |   | |       |   |   |
-`-----------------------------------------------------------' `-----------' `---------------'
-```
-
-### Top Layer
-#### 4. [Adjust](#adjust-layer)
-This layer is applied at the top so that it will override all other layers and as a result it will always be possible to change which base layer is applied as a default. It is also used for media controls.
-- To activate this layer, press and hold <kbd>RGui</kbd> from the base layer
-- Switch to [chriskopher modified QWERTY layout](#chriskopher-qwerty-layout) with <kbd>c</kbd>
-- Switch to [regular QWERTY layout](#regular-qwerty-layout) with <kbd>q</kbd>
-- Use <kbd>n</kbd> / <kbd>m</kbd> / <kbd>,</kbd> / <kbd>.</kbd> / <kbd>/</kbd>
-  for <kbd>Play/Pause</kbd> / <kbd>Mute</kbd> / <kbd>Volume Down</kbd> / <kbd>Volume Up</kbd> / Toggle <kbd>[(S)uper(D)uper](#superduper-layer)</kbd> layer, respectively
-- Use <kbd>Insert</kbd> / <kbd>Home</kbd> / <kbd>Page Up</kbd>
-  for <kbd>Play/Pause</kbd> / <kbd>Next Track</kbd> / <kbd>Volume Up</kbd>, respectively
-- Use <kbd>Delete</kbd> / <kbd>End</kbd> / <kbd>Page Down</kbd>
-for <kbd>Stop</kbd> / <kbd>Previous Track</kbd> / <kbd>Volume Down</kbd>, respectively
-
-```
-,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-|   |   |   |   |   |   | |   |   |   |   | |   |   |   |   | |   |   |   |
-`---'   `---------------' `---------------' `---------------' `-----------'
-,-----------------------------------------------------------. ,--------------. ,---------------.
-|   |   |   |   |   |   |   |   |   |   |   |   |   |       | |Play|Next|VolU| |   |   |   |   |
-|-----------------------------------------------------------| |--------------| |---------------|
-|     |QWERTY|   |   |   |   |   |   |   |   |   |   |  |   | |Stop|Prev|VolD| |   |   |   |   |
-|-----------------------------------------------------------| `--------------' |-----------|   |
-|      |   |   |   |   |   |   |   |   |   |   |   |        |                  |   |   |   |   |
-|-----------------------------------------------------------|     ,---.        |---------------|
-|        |   |   |CKO|   |   |  |Play|Mute|VolD|VolU| SD|   |     |   |        |   |   |   |   |
-|-----------------------------------------------------------| ,-----------.    |-----------|   |
-|   |   |   |                               |   |   |   |   | |   |   |   |    |       |   |   |
-`-----------------------------------------------------------' `-----------'    `---------------'
-```
-
-## Build Instructions
-To compile and flash the config onto the USB to USB converter:
-```sh
-cd /path/to/qmk_firmware
-qmk config user.keyboard=converter/usb_usb/hasu
-qmk config user.keymap=chriskopher
-qmk compile
-qmk flash
-```
-
-Alternatively:
-```sh
-cd /path/to/qmk_firmware
-qmk compile -kb converter/usb_usb/hasu -km chriskopher
-qmk flash -kb converter/usb_usb/hasu -km chriskopher
-```
-
-To modify the config:
-```sh
-cd /path/to/qmk_firmware/keyboards/converter/usb_usb/keymaps/chriskopher
-```
-and edit `keymap.c`, `config.h`, and `rules.mk`.
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/rules.mk b/keyboards/converter/usb_usb/keymaps/chriskopher/rules.mk
deleted file mode 100644
index 643e1d013b8..00000000000
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020 Christopher Ko <chriskopher@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/>.
-
-COMMAND_ENABLE = no # Not being used, and can cause conflicts with space cadet shifting
-SPACE_CADET_ENABLE = no # Not using special built in space cadet keys, using custom tap dance instead
-EXTRAKEY_ENABLE = yes # Used for audio control and system control keys
-COMBO_ENABLE = yes # Used to allow chording of keys to trigger an action
-TAP_DANCE_ENABLE = yes # Used to allow multiple taps of a key to perform different actions
-
-LTO_ENABLE = yes # Reduces the compiled firmware size
-
-SRC += combo.c tap_dance.c
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/shared_enum.h b/keyboards/converter/usb_usb/keymaps/chriskopher/shared_enum.h
deleted file mode 100644
index f83bfa3c490..00000000000
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/shared_enum.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Christopher Ko <chriskopher@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
-
-enum keyboard_layer {
-    // Base layers
-    _CKO,
-    _QWERTY,
-    // Intermediate layers
-    _SUPERDUPER,
-    _DEV,
-    // Adjust layer at the end
-    _ADJUST
-};
-
-enum tap_dance_key_event {
-    // Extended space cadet shift tap dance
-    ESPC_L,
-    ESPC_R,
-    // Semicolon-Colon tap dance
-    SCLN_CLN
-};
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/tap_dance.c b/keyboards/converter/usb_usb/keymaps/chriskopher/tap_dance.c
deleted file mode 100644
index 51a677a5880..00000000000
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/tap_dance.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* Copyright 2020 Christopher Ko <chriskopher@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 "shared_enum.h"
-
-#include "quantum.h"
-
-enum tap_dance_state {
-    SINGLE_HOLD = 1,
-    SINGLE_TAP,
-    DOUBLE_TAP,
-    TRIPLE_TAP,
-};
-
-// Record current state of a tap dance
-static int espc_l_tap_state   = 0;
-static int espc_r_tap_state   = 0;
-static int scln_cln_tap_state = 0;
-
-// Watch the state of the tap dance
-int cur_dance(tap_dance_state_t *state) {
-    if (state->pressed) {
-        return SINGLE_HOLD;
-    }
-    if (state->count == 1) {
-        return SINGLE_TAP;
-    }
-    if (state->count == 2) {
-        return DOUBLE_TAP;
-    }
-    if (state->count == 3) {
-        return TRIPLE_TAP;
-    }
-
-    return -1;
-}
-
-// Extended Space Cadet Shift - Left ==================================
-void espc_l_finished(tap_dance_state_t *state, void *user_data) {
-    espc_l_tap_state = cur_dance(state);
-    switch (espc_l_tap_state) {
-        case SINGLE_TAP:  // (
-            register_code16(LSFT(KC_9));
-            break;
-        case DOUBLE_TAP:  // {
-            unregister_code16(LSFT(KC_9));
-            register_code16(LSFT(KC_LBRC));
-            break;
-        case TRIPLE_TAP:  // [
-            unregister_code16(LSFT(KC_LBRC));
-            register_code16(KC_LBRC);
-            break;
-        case SINGLE_HOLD:  // LShift
-            register_code16(KC_LSFT);
-            break;
-    }
-}
-
-void espc_l_reset(tap_dance_state_t *state, void *user_data) {
-    switch (espc_l_tap_state) {
-        case SINGLE_TAP:  // (
-            unregister_code16(LSFT(KC_9));
-            break;
-        case DOUBLE_TAP:  // {
-            unregister_code16(LSFT(KC_LBRC));
-            break;
-        case TRIPLE_TAP:  // [
-            unregister_code16(KC_LBRC);
-            break;
-        case SINGLE_HOLD:  // LShift
-            unregister_code16(KC_LSFT);
-            break;
-    }
-    espc_l_tap_state = 0;
-}
-// ====================================================================//
-
-// Extended Space Cadet Shift - Right ==================================
-void espc_r_finished(tap_dance_state_t *state, void *user_data) {
-    espc_r_tap_state = cur_dance(state);
-    switch (espc_r_tap_state) {
-        case SINGLE_TAP:  // )
-            register_code16(LSFT(KC_0));
-            break;
-        case DOUBLE_TAP:  // }
-            unregister_code16(LSFT(KC_0));
-            register_code16(LSFT(KC_RBRC));
-            break;
-        case TRIPLE_TAP:  // ]
-            unregister_code16(LSFT(KC_RBRC));
-            register_code16(KC_RBRC);
-            break;
-        case SINGLE_HOLD:  // RShift
-            register_code16(KC_RSFT);
-            break;
-    }
-}
-
-void espc_r_reset(tap_dance_state_t *state, void *user_data) {
-    switch (espc_r_tap_state) {
-        case SINGLE_TAP:  // )
-            unregister_code16(LSFT(KC_0));
-            break;
-        case DOUBLE_TAP:  // }
-            unregister_code16(LSFT(KC_RBRC));
-            break;
-        case TRIPLE_TAP:  // ]
-            unregister_code16(KC_RBRC);
-            break;
-        case SINGLE_HOLD:  // RShift
-            unregister_code16(KC_RSFT);
-            break;
-    }
-    espc_r_tap_state = 0;
-}
-// ====================================================================//
-
-// Semicolon - Colon ==================================================
-void scln_cln_finished(tap_dance_state_t *state, void *user_data) {
-    scln_cln_tap_state = cur_dance(state);
-    switch (scln_cln_tap_state) {
-        case SINGLE_TAP:  // ;
-            register_code16(KC_SCLN);
-            break;
-        default:  // :
-            register_code16(LSFT(KC_SCLN));
-            break;
-    }
-}
-
-void scln_cln_reset(tap_dance_state_t *state, void *user_data) {
-    switch (scln_cln_tap_state) {
-        case SINGLE_TAP:  // ;
-            unregister_code16(KC_SCLN);
-            break;
-        default:  // :
-            unregister_code16(LSFT(KC_SCLN));
-            break;
-    }
-}
-// ====================================================================//
-
-// Associate tap dance with defined functionality
-tap_dance_action_t tap_dance_actions[] = {
-    // Extended space cadet shift left: Hold - Shift, One - (, Two - {, Three - [
-    [ESPC_L] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, espc_l_finished, espc_l_reset),
-    // Extended space cadet shift right: Hold - Shift, One - ), Two - }, Three - ]
-    [ESPC_R] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, espc_r_finished, espc_r_reset),
-    // Semicolon - Colon: One - ;, Two - :
-    [SCLN_CLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, scln_cln_finished, scln_cln_reset),
-};
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/config.h b/keyboards/converter/usb_usb/keymaps/coloneljesus/config.h
deleted file mode 100644
index 7fa3bf328ec..00000000000
--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#endif
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
deleted file mode 100644
index 54d39a3e297..00000000000
--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
-Copyright 2017 Balz Guenat <balz.guenat@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 keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
-    /* 0: plain Qwerty without layer switching
-     *         ,---------------. ,---------------. ,---------------.
-     *         |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
-     * ,---.   |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help  |
-     * `---'   `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -| |Stp|Agn|
-     * |-----------------------------------------------------------| |-----------| |---------------| |-------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +| |Mnu|Und|
-     * |-----------------------------------------------------------| `-----------' |---------------| |-------|
-     * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  #|Retn|               |  4|  5|  6|KP,| |Sel|Cpy|
-     * |-----------------------------------------------------------|     ,---.     |---------------| |-------|
-     * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|KP=| |Exe|Pst|
-     * |-----------------------------------------------------------| ,-----------. |---------------| |-------|
-     * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
-     * `-----------------------------------------------------------' `-----------' `---------------' `-------'
-     */
-    // LAYOUT_all(
-    //           F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
-    // ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
-    // GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
-    // TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,     BSLS,     DEL, END, PGDN,    P7,  P8,  P9,  PPLS,    MENU,UNDO,
-    // CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     NUHS,ENT,                         P4,  P5,  P6,  PCMM,    SLCT,COPY,
-    // LSFT,NUBS,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     RO,  RSFT,          UP,           P1,  P2,  P3,  PEQL,    EXEC,PSTE,
-    // LCTL,LGUI,LALT,MHEN,HANJ,     SPC,      HAEN,HENK,KANA,RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT,    FIND,CUT
-    // ),
-    LAYOUT_all(
-                      KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    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_SCRL, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
-    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_INT3, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
-    MO(1),   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_PCMM,    KC_SLCT, KC_COPY,
-    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_INT1, KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
-    ),
-    LAYOUT_all(
-                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,   _______, _______, _______, _______,   _______,
-    KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,   _______, _______, _______, _______,   _______, _______,
-    KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______,   _______, _______, _______, _______,   _______, _______,
-    _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______, _______,                                 _______, _______, _______, _______,   _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,             _______,            _______, _______, _______, _______,   _______, _______,
-    _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, QK_BOOT,    _______, _______, _______,   _______,          _______, _______,   _______, _______
-    ),
-};
-
-/*
- * Keymap samples
- */
-#if 0
-    /* ANSI layout
-     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
-     * `---'   `---------------' `---------------' `---------------' `-----------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|    Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
-     * |-----------------------------------------------------------| |-----------| |---------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +|
-     * |-----------------------------------------------------------| `-----------' |-----------|   |
-     * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return|               |  4|  5|  6|   |
-     * |-----------------------------------------------------------|     ,---.     |---------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     |Up |     |  1|  2|  3|   |
-     * |-----------------------------------------------------------| ,-----------. |-----------|   |
-     * |Ctl|Gui|Alt|           Space               |Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|Ent|
-     * `-----------------------------------------------------------' `-----------' `---------------'
-     */
-    LAYOUT_fullsize_ansi(
-    ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,      PSCR,SLCK,BRK,
-    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
-    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS,     DEL, END, PGDN,    P7,  P8,  P9,
-    LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     ENT,                         P4,  P5,  P6,  PPLS,
-    LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,          RSFT,          UP,           P1,  P2,  P3,
-    LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT
-    ),
-
-    /* ISO layout
-     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
-     * `---'   `---------------' `---------------' `---------------' `-----------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  ^|    Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
-     * |-----------------------------------------------------------| |-----------| |---------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| Retn| |Del|End|PgD| |  7|  8|  9|  +|
-     * |------------------------------------------------------`    | `-----------' |-----------|   |
-     * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  #|    |               |  4|  5|  6|   |
-     * |-----------------------------------------------------------|     ,---.     |---------------|
-     * |Shft|\  |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     |Up |     |  1|  2|  3|Ent|
-     * |-----------------------------------------------------------| ,-----------. |-----------|   |
-     * |Ctl|Gui|Alt|           Space       |HNK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
-     * `-----------------------------------------------------------' `-----------' `---------------'
-     */
-    LAYOUT_fullsize_iso(
-    ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,      PSCR,SLCK,BRK,
-    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
-    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,ENT,      DEL, END, PGDN,    P7,  P8,  P9,  PPLS,
-    LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,NUHS,                             P4,  P5,  P6,
-    LSFT,NUBS,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     RSFT,          UP,           P1,  P2,  P3,  PENT,
-    LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT
-    ),
-
-    /* JIS layout
-     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
-     * `---'   `---------------' `---------------' `---------------' `-----------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  ^|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
-     * |-----------------------------------------------------------| |-----------| |---------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  @|  [| Retn| |Del|End|PgD| |  7|  8|  9|  +|
-     * |------------------------------------------------------`    | `-----------' |-----------|   |
-     * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  ]|    |               |  4|  5|  6|   |
-     * |-----------------------------------------------------------|     ,---.     |---------------|
-     * |Shft    |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|Ent|
-     * |-----------------------------------------------------------| ,-----------. |-----------|   |
-     * |Ctl|Gui|Alt|MHEN|      Space      |HENK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
-     * `-----------------------------------------------------------' `-----------' `---------------'
-     */
-    LAYOUT_jis(
-    ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,BRK,
-    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JPY, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
-    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,     ENT,      DEL, END, PGDN,    P7,  P8,  P9,  PPLS,
-    LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,NUHS,                                  P4,  P5,  P6,
-    LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,          RO,  RSFT,          UP,           P1,  P2,  P3,  PENT,
-    LCTL,LGUI,LALT,MHEN,     SPC,                HENK,KANA,RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT
-    ),
-
-    /* Colemak http://colemak.com
-     * ,-----------------------------------------------------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backspa|
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|    \|
-     * |-----------------------------------------------------------|
-     * |BackSp|  A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '|Return  |
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  K|  M|  ,|  ,|  /|Shift     |
-     * |-----------------------------------------------------------|
-     * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
-     * `----------------------------------------------------------'
-     */
-    LAYOUT_all(
-              F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
-    ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
-    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
-    TAB, Q,   W,   F,   P,   G,   J,   L,   U,   Y,   SCLN,LBRC,RBRC,     BSLS,     DEL, END, PGDN,    P7,  P8,  P9,  PPLS,    MENU,UNDO,
-    BSPC,A,   R,   S,   T,   D,   H,   N,   E,   I,   O,   QUOT,     NUHS,ENT,                         P4,  P5,  P6,  PCMM,    SLCT,COPY,
-    LSFT,NUBS,Z,   X,   C,   V,   B,   K,   M,   COMM,DOT, SLSH,     RO,  RSFT,          UP,           P1,  P2,  P3,  PEQL,    EXEC,PSTE,
-    LCTL,LGUI,LALT,MHEN,HANJ,     SPC,      HAEN,HENK,KANA,RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT,    FIND,CUT
-    ),
-
-    /* Dvorak http://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard
-     * ,-----------------------------------------------------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]|Backspa|
-     * |-----------------------------------------------------------|
-     * |Tab  |  '|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|    \|
-     * |-----------------------------------------------------------|
-     * |BackSp|  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -|Return  |
-     * |-----------------------------------------------------------|
-     * |Shift   |  ;|  Q|  J|  K|  X|  B|  M|  Wl  V|  Z|Shift     |
-     * |-----------------------------------------------------------|
-     * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
-     * `-----------------------------------------------------------'
-     */
-    LAYOUT_all(
-              F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
-    ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
-    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   LBRC,RBRC,JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
-    TAB, QUOT,COMM,DOT, P,   Y,   F,   G,   C,   R,   L,   SLSH,EQL,      BSLS,     DEL, END, PGDN,    P7,  P8,  P9,  PPLS,    MENU,UNDO,
-    CAPS,A,   O,   E,   U,   I,   D,   H,   T,   N,   S,   MINS,     NUHS,ENT,                         P4,  P5,  P6,  PCMM,    SLCT,COPY,
-    LSFT,NUBS,SCLN,Q,   J,   K,   X,   B,   M,   W,   V,   Z,        RO,  RSFT,          UP,           P1,  P2,  P3,  PEQL,    EXEC,PSTE,
-    LCTL,LGUI,LALT,MHEN,HANJ,     SPC,      HAEN,HENK,KANA,RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT,    FIND,CUT
-    ),
-
-    /* Workman http://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/
-     * ,-----------------------------------------------------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backspa|
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  D|  R|  W|  B|  J|  F|  U|  P|  ;|  [|  ]|    \|
-     * |-----------------------------------------------------------|
-     * |CapsLo|  A|  S|  H|  T|  G|  Y|  N|  E|  O|  I|  '|Return  |
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  M|  C|  V|  K|  L|  ,|  ,|  /|Shift     |
-     * |-----------------------------------------------------------|
-     * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
-     * `-----------------------------------------------------------'
-     */
-    LAYOUT_all(
-              F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
-    ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
-    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
-    TAB, Q,   D,   R,   W,   B,   J,   F,   U,   P,   SCLN,LBRC,RBRC,     BSLS,     DEL, END, PGDN,    P7,  P8,  P9,  PPLS,    MENU,UNDO,
-    CAPS,A,   S,   H,   T,   G,   Y,   N,   E,   O,   I,   QUOT,     NUHS,ENT,                         P4,  P5,  P6,  PCMM,    SLCT,COPY,
-    LSFT,NUBS,Z,   X,   M,   C,   V,   K,   L,   COMM,DOT, SLSH,     RO,  RSFT,          UP,           P1,  P2,  P3,  PEQL,    EXEC,PSTE,
-    LCTL,LGUI,LALT,MHEN,HANJ,     SPC,      HAEN,HENK,KANA,RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT,    FIND,CUT
-    ),
-
-#define KC_LT1 LT(1, KC_SPC)
-
-/*
- * SpaceFN layout
- * http://geekhack.org/index.php?topic=51069.0
- */
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: plain Qwerty
-     *         ,---------------. ,---------------. ,---------------.
-     *         |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
-     * ,---.   |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help  |
-     * `---'   `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
-     * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -| |Stp|Agn|
-     * |-----------------------------------------------------------| |-----------| |---------------| |-------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +| |Mnu|Und|
-     * |-----------------------------------------------------------| `-----------' |---------------| |-------|
-     * |LCtrl |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  #|Retn|               |  4|  5|  6|KP,| |Sel|Cpy|
-     * |-----------------------------------------------------------|     ,---.     |---------------| |-------|
-     * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|KP=| |Exe|Pst|
-     * |-----------------------------------------------------------| ,-----------. |---------------| |-------|
-     * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
-     * `-----------------------------------------------------------' `-----------' `---------------' `-------'
-     */
-    [0] = LAYOUT_all(
-              F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
-    ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
-    ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
-    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,     BSLS,     DEL, END, PGDN,    P7,  P8,  P9,  PPLS,    MENU,UNDO,
-    LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     NUHS,ENT,                         P4,  P5,  P6,  PCMM,    SLCT,COPY,
-    LSFT,NUBS,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     RO,  RSFT,          UP,           P1,  P2,  P3,  PEQL,    EXEC,PSTE,
-    LCTL,LGUI,LALT,MHEN,HANJ,     LT1,      HAEN,HENK,KANA,RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT,    FIND,CUT
-    ),
-
-    /* 1: SpaceFN
-     * ,-----------------------------------------------------------.
-     * |`  | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
-     * |-----------------------------------------------------------|
-     * |Caps |   |   |Esc|   |   |   |Hom|Up |End|Psc|Slk|Pau|Ins  |
-     * |-----------------------------------------------------------|
-     * |      |   |   |   |   |   |PgU|Lef|Dow|Rig|   |   |        |
-     * |-----------------------------------------------------------|
-     * |        |   |   |   |   |Spc|PgD|`  |~  |   |Men|          |
-     * |-----------------------------------------------------------|
-     * |    |    |    |                        |    |    |    |    |
-     * `-----------------------------------------------------------'
-     */
-    [1] = LAYOUT_all(
-              TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-    TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          TRNS,TRNS,TRNS,    TRNS,TRNS,TRNS,TRNS,    TRNS,
-    GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS,DEL,      TRNS,TRNS,TRNS,    TRNS,TRNS,TRNS,TRNS,    TRNS,TRNS,
-    CAPS,TRNS,TRNS,ESC, TRNS,TRNS,TRNS,HOME,UP,  END, PSCR,SLCK,PAUS,     INS,      TRNS,TRNS,TRNS,    TRNS,TRNS,TRNS,TRNS,    TRNS,TRNS,
-    TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PGUP,LEFT,DOWN,RGHT,TRNS,TRNS,     TRNS,TRNS,                        TRNS,TRNS,TRNS,TRNS,    TRNS,TRNS,
-    TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,SPC, PGDN,GRV, TILD, TRNS,APP,      TRNS,TRNS,          TRNS,         TRNS,TRNS,TRNS,TRNS,    TRNS,TRNS,
-    TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS,TRNS,TRNS,    TRNS,     TRNS,TRNS,    TRNS,TRNS
-    ),
-};
-
-#endif
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
deleted file mode 100644
index 0dc219faccc..00000000000
--- a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2019 COSEYFANNITUTTI
- *
- * 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 FN_ESC LT(_FUNC, KC_ESC)
-
-enum discipline_layers {
-  _QWERTY,
-  _WORKMAN,
-  _FUNC,
-};
-
-enum discpline_keycodes {
-  QWERTY = SAFE_RANGE,
-  WORKMAN,
-  FUNC,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = 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_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_DEL,
-        FN_ESC,  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_HOME,
-        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, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_WORKMAN] = 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_GRV,
-        KC_TAB,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,   KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        FN_ESC,  KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,   KC_I,    KC_QUOT, KC_ENT,           KC_HOME,
-        KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    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
-    ),
-
-    [_FUNC] = LAYOUT_65_ansi(
-        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, QK_BOOT,
-        KC_TRNS, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   AG_NORM,  AG_SWAP, QWERTY,  WORKMAN, KC_TRNS, KC_INS,
-        KC_TRNS, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP,
-        KC_TRNS, KC_WH_L, KC_BTN3, KC_WH_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_VOLU, KC_PGDN,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MPLY,                     KC_TRNS, KC_TRNS, KC_TRNS,         KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case WORKMAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WORKMAN);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/readme.md b/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/readme.md
deleted file mode 100644
index c97f4ced164..00000000000
--- a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Discipline Keyboard Compilation
-
-## Features
-
-- Base Layers
-    - QWERTY
-    - Workman
-- Mouse Keys
-- Entertainment Keys
-
-## Building and flashing
-
-```
-make coseyfannitutti/discipline:briianpowell:flash
-```
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c
deleted file mode 100644
index da719690e70..00000000000
--- a/keyboards/coseyfannitutti/discipline/keymaps/osx/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 COSEYFANNITUTTI
- *
- * 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(
-      QK_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_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_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_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_LALT, KC_LGUI,                          KC_SPC,                 MO(1), KC_RALT, KC_RCTL,  KC_LEFT, KC_DOWN,  KC_RIGHT),
-
-  [1] = LAYOUT_65_ansi(
-     /* esc      1        2        3        4       5       6       7       8       9         0        -         =     bkspc       `~  */
-      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_PSCR,
-     /*  tab      Q       W        E        R        T      Y        U      I        O        P        [         ]        \      delete*/ 
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_PAUS, KC_TRNS,  KC_TRNS,
-     /*  caps     A       S        D        F        G      H        J      K        L        ;        '        enter             pg up*/
-      KC_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_HOME,
-     /* shift             Z         X        C       V       B       N      M        ,        .        /        shift     up      pg dn*/
-      KC_LSFT,          KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS,  KC_MUTE, KC_VOLU,  KC_END,
-     /* ctrl     alt      cmd                              space                     fn      alt     ctrl      left     down     right*/
-      KC_LCTL, KC_LALT, KC_LGUI,                          KC_TRNS,                KC_TRNS, KC_RALT, KC_RCTL,  KC_MPRV, KC_VOLD,  KC_MNXT)
-};
diff --git a/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c b/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c
deleted file mode 100644
index dcc035140ef..00000000000
--- a/keyboards/coseyfannitutti/mullet/keymaps/alternate/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2019 COSEYFANNITUTTI
- *
- * 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 _BL 0
-#define _FL 1
-
-  /* Qwerty
-   * .---------------------------------------------------------------------------------------------.
-   * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  Bkspc  | Del |
-   * |---------------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \  | PgUp|
-   * |---------------------------------------------------------------------------------------------+
-   * | Caps    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |   Enter   | PgDn|
-   * |---------------------------------------------------------------------------------------------+
-   * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  Shift  | Up  | Fn  |
-   * |---------------------------------------------------------------------------------------------+
-   * | Ctrl |  Win  |  Alt  |              Space                | RAlt | Fn  |||||Left |Down |Right|
-   * '---------------------------------------------------------------------------------------------'
-   */
-
-  /* FnLayer
-   * .---------------------------------------------------------------------------------------------.
-   * | ` ~ |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  Delete |     |
-   * |---------------------------------------------------------------------------------------------+
-   * | Tab    |STATC|BRTHE|RNBOW|QK_BOOT|     |     |     |     |     |     |PrScr|     |  \   | Home|
-   * |---------------------------------------------------------------------------------------------+
-   * | Caps    |RGBH+|RGBS+|RGBB+|     |     |     |     |     |     |     |     |    Enter  | End |
-   * |---------------------------------------------------------------------------------------------+
-   * | Shift     |RGBH-|RGBS-|RGBB-|     |     |     |     |RGBM-|RGBM+|RGBTG|  Shift  |VolUp|     |
-   * |---------------------------------------------------------------------------------------------+
-   * | Ctrl |  Win  |  Alt  |                                   | RAlt | Fn  |||||     |VolDn|     |
-   * '---------------------------------------------------------------------------------------------'
-   */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BL] = LAYOUT(
-      QK_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_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,    MO(_FL),
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                 KC_RALT, MO(_FL),           KC_LEFT, KC_DOWN,  KC_RIGHT),
-
-  [_FL] = LAYOUT(
-     /* esc      1        2        3        4       5       6       7       8       9         0        -         =     bkspc     delete */
-      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_PSCR,
-     /*  tab      Q       W        E        R        T      Y        U      I        O        P        [         ]        \       pg up */ 
-      KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, QK_BOOT,  KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_PSCR, KC_BSLS,  KC_HOME,
-     /*  caps     A       S        D        F        G      H        J      K        L        ;        '        enter             pg dn */
-      KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS,            KC_END, 
-     /* shift             Z         X        C       V       B       N      M        ,        .        /        shift     up        fn  */
-      KC_LSFT,          RGB_HUD, RGB_SAD, RGB_VAD,KC_TRNS,KC_TRNS,KC_TRNS,KC_MUTE,RGB_RMOD, RGB_MOD, RGB_TOG,  KC_RSFT, KC_VOLU, KC_TRNS,
-     /* ctrl     win      alt                              space                    alt      fn                 left     down     right */
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_TRNS, KC_VOLD,  KC_TRNS)
-};
diff --git a/keyboards/crimsonkeyboards/resume1800/keymaps/dee/keymap.c b/keyboards/crimsonkeyboards/resume1800/keymaps/dee/keymap.c
deleted file mode 100644
index 27e1e2bc50a..00000000000
--- a/keyboards/crimsonkeyboards/resume1800/keymaps/dee/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2022 CrimsonKeyboards
- *
- * 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 custom_keycodes {
-    KC_00 = SAFE_RANGE, //Double Zero
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case KC_00:
-        if (record->event.pressed) {
-            // when keycode KC_00 is pressed
-            SEND_STRING("00");
-        } else {
-            // when keycode KC_00 is released
-        }
-        break;
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_iso_all(
-  /*    Esc      F1       F2       F3       F4      F5      F6      F7      F8      F9       F10      F11       F12      F13      F14     Print     Scroll Lock   Pause   Insert    End		*/
-	  KC_ESC, 	KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,  KC_F14, KC_PRINT_SCREEN,      KC_SCRL,     KC_PAUS, KC_INS,  KC_END,
-  /*    ~         1        2        3        4       5       6       7       8       9        0        -         =     Backspace          Delete    Num Lock      Num /   Num *     Num -	*/
-      KC_GRAVE, 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_DELETE, KC_NUM_LOCK, KC_PSLS, KC_PAST, KC_PMNS, 
-  /*    Tab       Q        W        E        R       T       Y       U       I       O        P        [          ]    ISO Enter          Home      Num 7        Num 8    Num 9     N/A		*/
-      KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_ENT,          KC_HOME,   KC_P7,       KC_P8,   KC_P9,   KC_TRNS,	
-  /*    Caps      A        S        D        F       G       H       J       K       L        ;        '                 ISO \           Page Up    Num 4        Num 5    Num 6     Num +	*/
-      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_BSLS,         KC_PGUP,   KC_P4,       KC_P5,   KC_P6,   KC_PPLS,
-  /* Left Shift   N/A      Z        X        C       V       B       N       M       ,        .        /       R Shift   Up             Page Down   Num 1        Num 2    Num 3     N/A		*/
-      KC_LSFT,  KC_TRNS, 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_P1,       KC_P2,   KC_P3,   KC_TRNS,	
-  /* L Control  Windows  L Alt                             Space                    R Alt    Fn     R Control   Left     Down             Right     Num 00       Num 0    Num .   Num Enter	*/
-      KC_LCTL,  KC_LGUI, KC_LALT,                          KC_SPC,                 KC_ALGR, MO(1),   KC_RCTL,  KC_LEFT, KC_DOWN,         KC_RIGHT,  KC_00,       KC_P0,   KC_PDOT, KC_PENT)
-};
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
index fa9abc574e6..880cbccc29e 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/info.json
@@ -14,7 +14,6 @@
     "features": {
         "bootmagic": true,
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": true,
         "oled": true
diff --git a/keyboards/crkbd/keymaps/ajarov/config.h b/keyboards/crkbd/keymaps/ajarov/config.h
deleted file mode 100644
index d993e8e6595..00000000000
--- a/keyboards/crkbd/keymaps/ajarov/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-//#define QUICK_TAP_TERM 0
-//#define TAPPING_TERM 100
-
-#ifdef RGBLIGHT_ENABLE
-#    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 RGBLIGHT_LIMIT_VAL 120
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-#endif
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/ajarov/keymap.c b/keyboards/crkbd/keymaps/ajarov/keymap.c
deleted file mode 100644
index 5931dc56358..00000000000
--- a/keyboards/crkbd/keymaps/ajarov/keymap.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-Copyright 2022 Alejandro Jarovisky <@ajarov>
-
-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_spanish.h"
-
-enum layers {
-    L_BASE,
-    L_UPPER,
-    L_RIGHT,
-    L_UPPER_RIGHT,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [L_BASE] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-         KC_TAB,    ES_Q,    ES_W,    ES_E,    ES_R,    ES_T,                         ES_Y,    ES_U,    ES_I,    ES_O,   ES_P,  KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_LCTL,    ES_A,    ES_S,    ES_D,    ES_F,    ES_G,                         ES_H,    ES_J,    ES_K,    ES_L, ES_NTIL, ES_ACUT,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_LSFT,    ES_Z,    ES_X,    ES_C,    ES_V,    ES_B,                         ES_N,    ES_M, ES_COMM,  ES_DOT, ES_MINS, KC_RSFT,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI,   MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_LALT
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    [L_UPPER] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-         KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_APP,                       KC_INS, KC_HOME,   KC_UP,  KC_END, KC_PGUP, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_LCTL,   KC_F5,   KC_F6,   KC_F7,   KC_F8, KC_PSCR,                       KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, ES_DIAE,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_LSFT,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PAUS,                      XXXXXXX, XXXXXXX, ES_SCLN, ES_COLN, ES_UNDS, KC_RSFT,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_LALT
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    [L_RIGHT] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        KC_CAPS, ES_EXLM, ES_DQUO, ES_HASH, ES_CIRC, XXXXXXX,                      ES_ASTR,    ES_7,    ES_8,    ES_9, ES_MINS, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_LCTL, ES_LCBR, ES_RCBR, ES_LPRN, ES_RPRN, ES_QUES,                      ES_SLSH,    ES_4,    ES_5,    ES_6, ES_PLUS, ES_QUOT,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_LSFT, ES_LBRC, ES_RBRC, ES_LABK, ES_RABK,  ES_EQL,                         ES_0,    ES_1,    ES_2,    ES_3,  ES_DOT, KC_RSFT,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_LALT
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    [L_UPPER_RIGHT] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        XXXXXXX, ES_IEXL,   ES_AT, ES_EURO,  ES_DLR, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, ES_MORD, XXXXXXX, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_LCTL, ES_FORD, ES_AMPR, ES_PIPE, ES_BSLS, ES_IQUE,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ES_TILD,  ES_GRV,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_LSFT, XXXXXXX,  ES_NOT, ES_CCED, ES_PERC, XXXXXXX,                      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_RSFT,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_LALT
-                                        //`--------------------------'  `--------------------------'
-    )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, L_UPPER, L_RIGHT, L_UPPER_RIGHT);
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_keyboard_master()) {
-        return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-    }
-    return rotation;
-}
-
-void oled_render_layer_state(void) {
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("Default"), false);
-            break;
-        case L_UPPER:
-            oled_write_ln_P(PSTR("Upper"), false);
-            break;
-        case L_RIGHT:
-            oled_write_ln_P(PSTR("Right"), false);
-            break;
-        case L_UPPER_RIGHT:
-            oled_write_ln_P(PSTR("Upper Right"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undefined"), false);
-    }
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_ln_P(PSTR(""), false);
-    oled_write_ln_P(led_state.caps_lock ? PSTR("CAPS LOCK") : PSTR("         "), false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/ajarov/readme.md b/keyboards/crkbd/keymaps/ajarov/readme.md
deleted file mode 100644
index 7a51a35e6e9..00000000000
--- a/keyboards/crkbd/keymaps/ajarov/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Corne Spanish layout by ajarov
-
-![Layout](https://user-images.githubusercontent.com/1832140/178291869-ea3c070b-2c0d-45f9-aeb8-00ac6942e847.png)
-
-The OS keyboard layout should be set to Spanish so the above image matches the actual keys.
-
-Some ideas that shaped this layout:
-* There are 4 layers: Base, Upper (`△`), Right (`▷`), and Upper Right (`△` + `▷`).
-* The base layer is almost the same as the one on the default Corne layout when the keyboard is set to Spanish on the OS (the only differences being `RShift` instead of `Esc`, and `LAlt` instead of `Alt Gr`).
-* When the Upper layer (`△`) is selected, the right hand resting position matches the one on the arrow keys on a traditional keyboard.
-* The right half of the keyboard can be used as a numpad with only the right hand by selecting the Right layer (`▷`).
-* The only keys missing from a full-size (105 keys) Spanish keyboard are the interpunct (`·` or `Shift` + `3`), `Scroll Lock`, and `Num Lock`. I never use them (does anybody?) and I'd rather not include them and risk toggling Scroll/Num Lock by accident.
-* Media keys are not present because I find it better to use keyboard + mouse shortcuts with [AutoHotkey](https://www.autohotkey.com/) (e.g: `Ctrl` + `Shift` + `Wheel Up`/`Wheel Down` increases/decreases the volume).
diff --git a/keyboards/crkbd/keymaps/ajarov/rules.mk b/keyboards/crkbd/keymaps/ajarov/rules.mk
deleted file mode 100644
index bc45ff83ba7..00000000000
--- a/keyboards/crkbd/keymaps/ajarov/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-OLED_ENABLE     = yes
-LTO_ENABLE      = yes
diff --git a/keyboards/crkbd/keymaps/antosha417/config.h b/keyboards/crkbd/keymaps/antosha417/config.h
deleted file mode 100644
index 983f274ace0..00000000000
--- a/keyboards/crkbd/keymaps/antosha417/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2021 Anton Kavalkou (@antosha417)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-
-/* Select hand configuration */
-
-//#define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-
-#define QUICK_TAP_TERM 0
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-    #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 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-#define TAPPING_TERM 200
-#define COMBO_TERM 30
-
diff --git a/keyboards/crkbd/keymaps/antosha417/keymap.c b/keyboards/crkbd/keymaps/antosha417/keymap.c
deleted file mode 100644
index 47771b531e3..00000000000
--- a/keyboards/crkbd/keymaps/antosha417/keymap.c
+++ /dev/null
@@ -1,397 +0,0 @@
-// Copyright 2021 Anton Kavalkou (@antosha417)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-#include "sendstring_dvorak.h"
-
-typedef union {
-  uint32_t raw;
-  struct {
-    bool is_macos :1;
-  };
-} user_config;
-
-user_config config;
-
-enum layers {
-  _QWERTY,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _TOP,
-  _BOTTOM,
-};
-
-enum keycodes {
-  QWERTY = SAFE_RANGE,
-
-  RUS_LANG,
-  EN_LANG,
-  HEB_LANG,
-
-  VIM_SAVE,
-
-  CHNGE_OS,
-  DELETE_WORD,
-
-#define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action)   \
-  keycode,
-#include "mod_tap_keys.h"
-#undef MOD_TAP_KEY
-};
-
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define TOP MO(_TOP)
-#define BOTTOM MO(_BOTTOM)
-#define LANG  TG(_DVORAK)
-#define KC_CAD LALT(LCTL(KC_DEL))
-#define KC_CAH LALT(LCTL(KC_HOME))
-
-#define E_SFT LSFT_T(KC_E)
-#define D_SFT LSFT_T(KC_D)
-#define A_ALT LALT_T(KC_A)
-#define O_GUI LGUI_T(KC_O)
-#define U_CTRL LCTL_T(KC_U)
-
-#define T_SFT RSFT_T(KC_T)
-#define K_SFT RSFT_T(KC_K)
-#define S_ALT RALT_T(KC_S)
-#define N_GUI RGUI_T(KC_N)
-#define H_CTRL RCTL_T(KC_H)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT_split_3x6_3(
-//,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     KC_ESC,  A_ALTQ,  S_GUIQ,   D_SFT,  F_CTLQ,    KC_G,                         KC_H,  J_CTLQ,   K_SFT,  L_GUIQ,  SCLN_Q, 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,
-//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-					BOTTOM,   KC_SPC,   LOWER,      RAISE,  KC_SPC,     TOP
-				    //`--------------------------'  `--------------------------'
-),
-
-[_DVORAK] = LAYOUT_split_3x6_3(
-//,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     KC_TAB, KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,                         KC_F,    KC_G,    KC_C,    KC_R,    KC_L, KC_BSPC,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    KC_LCTL,   A_ALT,   O_GUI,   E_SFT,  U_CTRL,    KC_I,                         KC_D,  H_CTRL,   T_SFT,   N_GUI,   S_ALT, KC_QUOT,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    KC_LSFT, KC_SCLN,    KC_Q,    KC_J,    KC_K,    KC_X,                         KC_B,    KC_M,    KC_W,    KC_V,   KC_Z,  KC_ESC,
-//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-					_______, _______, _______,    _______, _______, _______
-				    //`--------------------------'  `--------------------------'
-),
-
-[_LOWER] = LAYOUT_split_3x6_3(
-//,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     KC_F11, KC_UNDS, KC_MINS, KC_TILD, KC_PERC, KC_QUOT,                      _______, KC_CIRC,  KC_GRV, KC_BSLS, KC_PIPE, KC_MINS,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     KC_DEL, KC_LBRC, KC_LCBR, KC_PLUS, KC_LPRN,  KC_EQL,                      KC_ASTR, KC_RPRN, KC_EXLM, KC_RCBR, KC_RBRC, KC_BSPC,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______,  KC_CAD,  KC_CAH, _______,    LANG, _______,                      _______,HEB_LANG, EN_LANG,RUS_LANG, _______, _______,
-//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-					_______, _______, _______,    _______, _______, _______
-				    //`--------------------------'  `--------------------------'
-                                                        //^^^^^^^
-),
-
-
-[_RAISE] = LAYOUT_split_3x6_3(
-//,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     KC_F11, _______, _______, KC_DLR,  KC_AMPR, _______,                     KC_COLON, KC_QUES,   KC_AT, KC_HASH, KC_SLSH, KC_F12,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______,    KC_7,    KC_5,    KC_3,    KC_1,    KC_9,                         KC_0,    KC_2,    KC_4,    KC_6,    KC_8, KC_BSPC,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______,   KC_F7,   KC_F5,   KC_F3,   KC_F1,   KC_F9,                       KC_F10,   KC_F2,   KC_F4,   KC_F6,   KC_F8, _______,
-//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-					_______, _______, _______,    _______, _______, _______
-				    //`--------------------------'  `--------------------------'
-                                                                    //^^^^^^^
-),
-
-[_TOP] = LAYOUT_split_3x6_3(
-//,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    _______,CHNGE_OS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,                      RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, _______, _______, KC_DOWN, KC_UP,   _______,                      _______, _______, _______, _______, _______, _______,
-//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-					_______, _______, _______,    _______, _______, _______
-				    //`--------------------------'  `--------------------------'
-                                                                                      //^^^^^^^
-),
-
-[_BOTTOM] = LAYOUT_split_3x6_3(
-//,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, KC_RGHT, _______,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, _______, _______, _______, _______, _______,                      _______, KC_LEFT, _______, _______, _______, _______,
-//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, _______, _______, _______, _______, _______,                      _______, KC_VOLD, KC_VOLU, _______, _______, _______,
-//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-					_______, _______, _______,    _______, _______, _______
-				    //`--------------------------'  `--------------------------'
-                                      //^^^^^^^
-)
-
-};
-
-enum combo_events {
-  // combos for dvorak layer
-  RU_COMBO,
-  EN_COMBO,
-  HEB_COMBO,
-  ESC_COMBO,
-  TAB_COMBO,
-  ENT_COMBO,
-  DEL_COMBO,
-  SAVE_COMBO,
-  BSPC_COMBO,
-  BSPCW_COMBO,
-
-  // combos for qwerty layer
-  RUQ_COMBO,
-  ENQ_COMBO,
-  HEBQ_COMBO,
-  ESCQ_COMBO,
-  TABQ_COMBO,
-  ENTQ_COMBO,
-  DELQ_COMBO,
-  SAVEQ_COMBO,
-  BSPCQ_COMBO,
-  BSPCWQ_COMBO
-};
-
-const uint16_t PROGMEM ru_combo[] = {KC_R, U_CTRL, COMBO_END};
-const uint16_t PROGMEM en_combo[] = {U_CTRL, S_ALT, COMBO_END};
-const uint16_t PROGMEM heb_combo[] = {KC_I, KC_V, COMBO_END};
-const uint16_t PROGMEM esc_combo[] = {H_CTRL, U_CTRL, COMBO_END};
-const uint16_t PROGMEM tab_combo[] = {T_SFT, A_ALT, COMBO_END};
-const uint16_t PROGMEM ent_combo[]= {E_SFT, N_GUI, COMBO_END};
-const uint16_t PROGMEM del_combo[] = {KC_D, E_SFT, COMBO_END};
-const uint16_t PROGMEM bspc_combo[] = {KC_C, H_CTRL, COMBO_END};
-const uint16_t PROGMEM bspcw_combo[] = {N_GUI, U_CTRL, COMBO_END};
-const uint16_t PROGMEM save_combo[] = {O_GUI, H_CTRL, COMBO_END};
-
-const uint16_t PROGMEM ruq_combo[] = {KC_O, F_CTLQ, COMBO_END};
-const uint16_t PROGMEM enq_combo[] = {F_CTLQ, SCLN_Q, COMBO_END};
-const uint16_t PROGMEM hebq_combo[] = {KC_G, KC_DOT, COMBO_END};
-const uint16_t PROGMEM escq_combo[] = {F_CTLQ, J_CTLQ, COMBO_END};
-const uint16_t PROGMEM tabq_combo[] = {K_SFT, A_ALTQ, COMBO_END};
-const uint16_t PROGMEM entq_combo[] = {D_SFT, L_GUIQ, COMBO_END};
-const uint16_t PROGMEM delq_combo[] = {KC_H, D_SFT, COMBO_END};
-const uint16_t PROGMEM bspcq_combo[] = {KC_I, J_CTLQ, COMBO_END};
-const uint16_t PROGMEM bspcwq_combo[] = {L_GUIQ, F_CTLQ, COMBO_END};
-const uint16_t PROGMEM saveq_combo[] = {S_GUIQ, J_CTLQ, COMBO_END};
-
-combo_t key_combos[] = {
-    [RU_COMBO] = COMBO(ru_combo, RUS_LANG),
-    [EN_COMBO] = COMBO(en_combo, EN_LANG),
-    [HEB_COMBO] = COMBO(heb_combo, HEB_LANG),
-    [ESC_COMBO] = COMBO(esc_combo, KC_ESC),
-    [TAB_COMBO] = COMBO(tab_combo, KC_TAB),
-    [ENT_COMBO] = COMBO(ent_combo, KC_ENT),
-    [DEL_COMBO] = COMBO(del_combo, KC_DEL),
-    [BSPC_COMBO] = COMBO(bspc_combo, KC_BSPC),
-    [SAVE_COMBO] = COMBO(save_combo, VIM_SAVE),
-    [BSPCW_COMBO] = COMBO(bspcw_combo, DELETE_WORD),
-
-    [RUQ_COMBO] = COMBO(ruq_combo, RUS_LANG),
-    [ENQ_COMBO] = COMBO(enq_combo, EN_LANG),
-    [HEBQ_COMBO] = COMBO(hebq_combo, HEB_LANG),
-    [ESCQ_COMBO] = COMBO(escq_combo, KC_ESC),
-    [TABQ_COMBO] = COMBO(tabq_combo, KC_TAB),
-    [ENTQ_COMBO] = COMBO(entq_combo, KC_ENT),
-    [DELQ_COMBO] = COMBO(delq_combo, KC_DEL),
-    [BSPCQ_COMBO] = COMBO(bspcq_combo, KC_BSPC),
-    [SAVEQ_COMBO] = COMBO(saveq_combo, VIM_SAVE),
-    [BSPCWQ_COMBO] = COMBO(bspcwq_combo, DELETE_WORD),
-};
-
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("layer: "), false);
-    switch (get_highest_layer(layer_state|default_layer_state)) {
-      case _QWERTY:
-        oled_write_ln_P(PSTR("qwerty"), false);
-        break
-      case _DVORAK:
-        oled_write_ln_P(PSTR("dvorak"), false);
-        break;
-      case _LOWER:
-        oled_write_ln_P(PSTR("lower"), false);
-        break;
-      case_RAISE:
-        oled_write_ln_P(PSTR("raise"), false);
-        break;
-      case _TOP:
-        oled_write_ln_P(PSTR("top"), false);
-        break;
-      case _BOTTOM:
-        oled_write_ln_P(PSTR("bottom"), false);
-        break;
-      default:
-        oled_write_ln_P(PSTR("unknown"), false);
-        break;
-    }
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_write_ln_P(PSTR("nice cock"), false);
-        oled_render_layer_state();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-#endif // OLED_ENABLE
-
-void keyboard_post_init_user(void) {
-  config.raw = eeconfig_read_user();
-  layer_on(_DVORAK);
-}
-
-void set_english_language(void) {
-  layer_on(_DVORAK);
-  tap_code16(LSFT(LCTL(LGUI(KC_1))));
-}
-
-void set_russian_language(void) {
-  layer_off(_DVORAK);
-  tap_code16(LSFT(LCTL(LGUI(KC_2))));
-}
-
-void set_hebrew_language(void) {
-  layer_off(_DVORAK);
-  tap_code16(LSFT(LCTL(LGUI(KC_3))));
-}
-
-void delete_word(void) {
-  if (config.is_macos) {
-    tap_code16(A(KC_BSPC));
-  } else {
-    tap_code16(C(KC_BSPC));
-  }
-}
-
-#define CASE(keycode, key_pressed_action, key_released_action)   \
-  case (keycode):                                               \
-    if (record->event.pressed) {                                \
-      key_pressed_action;                                       \
-    } else {                                                    \
-      key_released_action;                                      \
-    }                                                           \
-    return false;                                               \
-    break;
-
-#define CASE_PRESSED(keycode, key_pressed_action) CASE(keycode, key_pressed_action, {});
-
-#define CASE_MOD_TAP_KEY(keycode, tap_action, mod_off_action) \
-  CASE(keycode, {                                  \
-    keycode ## _TIMER = timer_read();                         \
-    IS_ ## keycode ## _ACTIVE = true;                         \
-  }, {                                                        \
-    if(IS_ ## keycode ## _MOD_ACTIVE) {                       \
-      mod_off_action;                          		      \
-    } else if (IS_ ## keycode ## _ACTIVE) {                   \
-      tap_action;                                             \
-    }                                                         \
-    IS_ ## keycode ## _MOD_ACTIVE = false; 		      \
-    IS_ ## keycode ## _ACTIVE = false;                        \
-  });
-
-#define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action) \
-uint16_t keycode ## _TIMER = 0;                                 	\
-bool IS_ ## keycode ## _ACTIVE = false; 		                \
-bool IS_ ## keycode ## _MOD_ACTIVE = false;
-#include "mod_tap_keys.h"
-#undef MOD_TAP_KEY
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  #ifdef OLED_ENABLE
-  if (record->event.pressed) {
-    set_keylog(keycode, record);
-  }
-#endif //OLED_ENABLE
-
-  switch (keycode) {
-    CASE_PRESSED(EN_LANG, set_english_language());
-    CASE_PRESSED(RUS_LANG, set_russian_language());
-    CASE_PRESSED(HEB_LANG, set_hebrew_language());
-
-    CASE_PRESSED(VIM_SAVE, {set_english_language(); SEND_STRING(SS_TAP(X_ESC)SS_LSFT(SS_TAP(X_SCLN))SS_TAP(X_W)SS_TAP(X_ENT));});
-
-    CASE_PRESSED(CHNGE_OS, {config.is_macos ^= 1; eeconfig_update_user(config.raw);});
-    CASE_PRESSED(DELETE_WORD, delete_word());
-
-    #define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action) \
-    CASE_MOD_TAP_KEY(keycode, tap_action, mod_off_action);
-    #include "mod_tap_keys.h"
-    #undef MOD_TAP_KEY
-  }
-
-  #define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action) \
-  if (IS_ ## keycode ## _ACTIVE && !IS_ ## keycode ## _MOD_ACTIVE) {      \
-    if (timer_elapsed(keycode ## _TIMER) <= TAPPING_TERM) {               \
-      tap_action;                                                         \
-      IS_ ## keycode ## _ACTIVE = false;                                  \
-    }                                                    		  \
-  }
-  #include "mod_tap_keys.h"
-  #undef MOD_TAP_KEY
-
-  return true;
-}
-
-void matrix_scan_user(void) {
-  #define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action) \
-  if (IS_ ## keycode ## _ACTIVE) {                                        \
-    if (timer_elapsed(keycode ## _TIMER) > TAPPING_TERM) {                \
-      mod_on_action;                                                      \
-      IS_ ## keycode ## _MOD_ACTIVE = true;                               \
-    }                                                    		  \
-  }
-  #include "mod_tap_keys.h"
-  #undef MOD_TAP_KEY
-}
diff --git a/keyboards/crkbd/keymaps/antosha417/mod_tap_keys.h b/keyboards/crkbd/keymaps/antosha417/mod_tap_keys.h
deleted file mode 100644
index 0d7a86b6913..00000000000
--- a/keyboards/crkbd/keymaps/antosha417/mod_tap_keys.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2021 Anton Kavalkou (@antosha417)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-// MOD_TAP_KEY(key, tap_action, mod_on_action, mod_off_action)
-
-MOD_TAP_KEY(S_GUIQ, tap_code(KC_S), {layer_on(_DVORAK); register_code(KC_LGUI);}, {layer_off(_DVORAK); unregister_code(KC_LGUI);})
-MOD_TAP_KEY(L_GUIQ, tap_code(KC_L), {layer_on(_DVORAK); register_code(KC_RGUI);}, {layer_off(_DVORAK); unregister_code(KC_RGUI);})
-
-MOD_TAP_KEY(F_CTLQ, tap_code(KC_F), {layer_on(_DVORAK); register_code(KC_LCTL);}, {layer_off(_DVORAK); unregister_code(KC_LCTL);})
-MOD_TAP_KEY(J_CTLQ, tap_code(KC_J), {layer_on(_DVORAK); register_code(KC_RCTL);}, {layer_off(_DVORAK); unregister_code(KC_RCTL);})
-
-MOD_TAP_KEY(A_ALTQ, tap_code(KC_A), {layer_on(_DVORAK); register_code(KC_LALT);}, {layer_off(_DVORAK); unregister_code(KC_LALT);})
-MOD_TAP_KEY(SCLN_Q, tap_code(KC_SCLN), {layer_on(_DVORAK); register_code(KC_RALT);},{layer_off(_DVORAK); unregister_code(KC_RALT);})
-
- 
diff --git a/keyboards/crkbd/keymaps/antosha417/rules.mk b/keyboards/crkbd/keymaps/antosha417/rules.mk
deleted file mode 100644
index 63a3a16616f..00000000000
--- a/keyboards/crkbd/keymaps/antosha417/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = yes
-COMBO_ENABLE = yes
-
-LTO_ENABLE = yes #enable link time optimization to reduce binary size
-
diff --git a/keyboards/crkbd/keymaps/antosha417/todo.md b/keyboards/crkbd/keymaps/antosha417/todo.md
deleted file mode 100644
index 4ee83af65de..00000000000
--- a/keyboards/crkbd/keymaps/antosha417/todo.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Notes:
-  * to flush firmware to keyboard use:
-    ```
-    $ make crkbd/rev1:antosha417:avrdude-split-right
-    $ make crkbd/rev1:antosha417:avrdude-split-left
-    ```
-
-# Todo:
-  [ ] do something with displayig symbols on oled screen
-  [ ] count wpm
-  [ ] load images
-  [X] figure out how to delete word on linux
-  [X] fix oled layer names
diff --git a/keyboards/crkbd/keymaps/ardakilic/README.md b/keyboards/crkbd/keymaps/ardakilic/README.md
deleted file mode 100644
index 5e620f03f03..00000000000
--- a/keyboards/crkbd/keymaps/ardakilic/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Ardakilic's Corne Layout
-
-This layout is optimised to use Turkish characters on Corne on macOS.
-
-Also, some size optimisations enabled in `rules.mk` and `config.h`.
-
-Bongo cat animation implemented from: https://github.com/nwii/oledbongocat
diff --git a/keyboards/crkbd/keymaps/ardakilic/config.h b/keyboards/crkbd/keymaps/ardakilic/config.h
deleted file mode 100644
index 59e348981f9..00000000000
--- a/keyboards/crkbd/keymaps/ardakilic/config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-
-#define SPLIT_WPM_ENABLE
-
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-#define RETRO_TAPPING
-
-
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
-
-// size optimisations
-// #define NO_DEBUG
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-/* CONSOLE_ENABLE = no achieves this
-// Size optimisations
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif // !NO_DEBUG
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#define NO_PRINT
-#endif // !NO_PRINT
-
-#define NO_ACTION_ONESHOT
-// Size optimisations END
-*/
diff --git a/keyboards/crkbd/keymaps/ardakilic/keymap.c b/keyboards/crkbd/keymaps/ardakilic/keymap.c
deleted file mode 100644
index 98a9fb50f3b..00000000000
--- a/keyboards/crkbd/keymaps/ardakilic/keymap.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-Copyright 2021 Arda Kilicdagi <GH: @ardakilic, TW: @ardadev>
-
-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
-
-// Layers
-enum {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _SPACE,
-  _NUMPAD,
-  _SODA,
-  _ADJUST
-};
-
-//KC_NUBS (\|) is equivalent to ["é] key in Turkish keyboards.
-//KC_GRV (~ `) is equivalent to [<>|] key in Turkish keyboards.
-// KC_SCLN is Turkish s [şŞ] key
-// KC_QUOT is Turkish i [iİ] key
-// KC_COMM is Turkish o [öÖ] key
-// KC_DOT is Turkish c [çÇ] key
-
-// Custom shortcuts specific to Turkish layout
-#define CURLY_OPEN RALT(KC_7)
-#define CURLY_CLOSE RALT(KC_0)
-#define SQUARE_OPEN RALT(KC_8)
-#define SQUARE_CLOSE RALT(KC_9)
-#define DOLLAR_SIGN RALT(KC_4)
-#define BACKSLASH RALT(KC_MINS)
-#define VERTICAL_PIPE RALT(KC_EQL)
-#define BACKTICK RALT(KC_BSLS)
-#define TILDE RALT(KC_RBRC)
-#define NUMBER_SIGN RALT(KC_3) //hashtag sign
-#define LOCKSCREEN LCTL(LSFT(KC_PWR)) // Screen Lock shortcut for OSX
-
-/* 
-// Unicode Turkish characters, in case it's needed
-enum {
-    TR_C, // ç
-    TR_C_L, // Ç
-    TR_I, // ı
-    TR_I_L, // İ
-    TR_G, // ğ
-    TR_G_L, // Ğ
-    TR_S, // ş
-    TR_S_L, // Ş
-    TR_U, // ü
-    TR_U_L, // Ü
-    TR_O, // ö
-    TR_O_L, // Ö
-};
-
-// clang-format off
-const uint32_t unicode_map[] PROGMEM = {
-    [TR_C] = 0x00c7,
-    [TR_C_L] = 0x00e7,
-    [TR_I] = 0x0130,
-    [TR_I_L] = 0x0131,
-    [TR_G] = 0x011e,
-    [TR_G_L] = 0x011f,
-    [TR_S] = 0x015e,
-    [TR_S_L] = 0x015f,
-    [TR_U] = 0x00dc,
-    [TR_U_L] = 0x00fc,
-    [TR_O] = 0x00d6,
-    [TR_O_L] = 0x00f6,
-};
-// clang-format on
-*/
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * BASE LAYER
-  [_TPL] = LAYOUT_wrapper(
-  //,-----------------------------------------------------.      ,----------------------------------------------------.
-    |  Tab   |   Q    |   W    |   E    |   R    |   T    |      |    Y   |   U    |   I    |   O    |   P    |  Bksp |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    | NpdESC |   A    |   S    |   D    |   F    |   G    |      |    H   |   J    |   K    |   L    |   Ş    |  İ    |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    | SftCaps|   Z    |   X    |   C    |   V    |   B    |      |    N   |   M    |   Ö    |   Ç    |   .    | CtlEnt|
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-                                    ,-----------------------,  ,-----------------------.
-                                    |  OS|. | Lwr|, | Space*|  |Sda|Ent|Raise|"| LAlt|.|
-                                   /|-------+-------+-------'  +-------+-------+-------|\
-  ),
-*/
-  [_QWERTY] = LAYOUT_split_3x6_3(
-    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-    LT(_NUMPAD, KC_ESC), KC_A,  KC_S, KC_D,  KC_F,  KC_G,           KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-    LSFT_T(KC_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B,                  KC_N,   KC_M,  KC_COMM, KC_DOT, KC_SLSH, LCTL_T(KC_ENT), /*KC_ENT*/
-      LGUI_T(KC_SLSH), LT(_LOWER, KC_BSLS),LT(_SPACE, KC_SPC),   LT(_SODA, KC_ENT), LT(_RAISE, KC_NUBS), LALT_T(KC_SLSH)
-
-  ),
-
-/*
- * LOWER LAYER
-  [_TPL] = LAYOUT_wrapper(
-  //,-----------------------------------------------------.      ,----------------------------------------------------.
-    |   >    |   !    |   '    |   ^    |   +    |   %    |      |    &   |   /    |   (    |   )    |   =    |  Bksp |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |      |   "$"  |   ?    |   _    |   Ğ    |   Ü    |  -    |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |      |   "["  |   "]"  |   "{"  |   "}"  |   <    |  ">"  |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-                                    ,-----------------------,  ,-----------------------.
-                                    |       |       |       |  |       | ADJUST|       |
-                                   /|-------+-------+-------'  +-------+-------+-------|\
-  ),
-*/
-  [_LOWER] = LAYOUT_split_3x6_3(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,            KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,                   DOLLAR_SIGN,    KC_UNDS,  KC_PLUS,  KC_LBRC,  KC_RBRC,  KC_EQL,
-    KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,                SQUARE_OPEN, SQUARE_CLOSE, CURLY_OPEN, CURLY_CLOSE, KC_GRV, LSFT(KC_GRV),
-                                _______, _______, _______,        _______, MO(_ADJUST), _______
-  ),
-
-/*
- * RAISE LAYER
-  [_TPL] = LAYOUT_wrapper(
-  //,-----------------------------------------------------.      ,----------------------------------------------------.
-    |   Tab  |   1    |   2    |   3    |   4    |   5    |      |    6   |   7    |   8    |   9    |   0    |  Bksp |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |      |        |   *    |   -    |   "\"  |   "|"  |  ,    |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |      |    '   |   #    |   "    |   "~"  |   "`"  |  <>|  |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-                                    ,-----------------------,  ,-----------------------.
-                                    |       |       |       |  |       |       |       |
-                                   /|-------+-------+-------'  +-------+-------+-------|\
-  ),
-*/
-  [_RAISE] = LAYOUT_split_3x6_3(
-    KC_TAB,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,                       KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_BSPC,
-    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,                   _______, KC_MINS, KC_EQL,  BACKSLASH, VERTICAL_PIPE, KC_BSLS,
-    KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,                KC_AT, NUMBER_SIGN, KC_NUBS, TILDE, BACKTICK, KC_GRV,
-                                _______, _______, _______,        _______, _______, _______
-  ),
-
-/*
- * SPACE LAYER
-  [_TPL] = LAYOUT_wrapper(
-  //,-----------------------------------------------------.      ,----------------------------------------------------.
-    |        |  CMD+1 |  CMD+2 |  CMD+3 |  CMD+4 | CMD+5  |      |  CMD+6 |  CMD+7 |  CMD+8 |  CMD+9 |  CMD+0 | LCKOSX|
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |        | Brght▼ | Brght▲ |        |        |        |      |  Left  |  Down  |   Up   |  Right |        |       |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |        |        |        |        |        |        |      |        |  Prev  |   Next |  Vol-  |  Vol+  |  Play |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-                                    ,-----------------------,  ,-----------------------.
-                                    |       |       |       |  |       |       |       |
-                                   /|-------+-------+-------'  +-------+-------+-------|\
-  ),
-*/
-  [_SPACE] = LAYOUT_split_3x6_3(
-    _______, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5),    LGUI(KC_6), LGUI(KC_7), LGUI(KC_8),  LGUI(KC_9), LGUI(KC_0), LOCKSCREEN,
-    _______, KC_BRMD,  KC_BRMU, _______, _______,  _______,      KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
-    _______, _______, _______, _______,  _______,  _______,      _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
-                                  _______, _______, _______,    _______, _______, _______
-  ),
-
-/*
- * NUMPAD LAYER
- * KC_PDOT is comma on the Turkish layout ¯\_(ツ)_/¯
-  [_TPL] = LAYOUT_wrapper(
-  //,-----------------------------------------------------.      ,----------------------------------------------------.
-    |        |        |        |        |        |        |      |   =    |  Num7  |  Num8  |  Num9  |   -    |  Bksp |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |        |        |        |        |        |        |      |   .    |  Num4  |  Num5  |  Num6  |   +    |   *   |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |        |        |        |        |        |        |      |   ,    |  Num1  |  Num2  |  Num3  |   .    |   /   |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-                                    ,-----------------------,  ,-----------------------.
-                                    |       |       |       |  |  Ent  |  Num0 |  Num0 |
-                                   /|-------+-------+-------'  +-------+-------+-------|\
-  ),
-*/
-  [_NUMPAD] = LAYOUT_split_3x6_3(
-    _______,  _______,  _______,  _______,  _______,  _______,        KC_PEQL, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_BSPC,
-    _______,  _______,  _______,  _______,  _______,  _______,        KC_SLSH, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PAST,
-    _______,  _______,  _______,  _______,  _______,  _______,        KC_PDOT, KC_P1, KC_P2, KC_P3, KC_SLSH, KC_PSLS,
-                                      _______, _______, _______,    KC_PENT, KC_P0, KC_P0
-  ),
-
-
-  /*
- * SODA LAYER
- * KC_PDOT is comma on the Turkish layout ¯\_(ツ)_/¯
-  [_TPL] = LAYOUT_wrapper(
-  //,-----------------------------------------------------.      ,----------------------------------------------------.
-    |        |        |   Up   |        |        |        |      |        |        |        |        |        |       |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |        |  Left  |  Down  | Right  |        |        |      |        |        |        |        |        |       |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    |        |        |        |        |        |        |      |        |        |        |        |        |       |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-                                    ,-----------------------,  ,-----------------------.
-                                    |       |       |       |  |       |       |       |
-                                   /|-------+-------+-------'  +-------+-------+-------|\
-  ),
-*/
-  [_SODA] = LAYOUT_split_3x6_3(
-    _______,  _______,  KC_UP,  _______,  _______,  _______,        _______, _______, _______, _______, _______, _______,
-    _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,      _______, _______, _______, _______, _______, _______,
-    _______,  _______,  _______,  _______,  _______,  _______,      _______, _______, _______, _______, _______, _______,
-                                      _______, _______, _______,    _______, _______, _______
-  ),
-
-
-
-/*
- * ADJUST LAYER
-  [_TPL] = LAYOUT_wrapper(
-  //,-----------------------------------------------------.      ,----------------------------------------------------.
-    |  QK_BOOT | EEPRST |        |        |        |        |      |        |        |        |        |        |       |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    | RGBTog |  HUE▲  |  SAT▲  | BRGHT▲ |        |        |      |        |        |        |        |        |       |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-    | RGBMOD |  HUE▼  |  SAt▼  | BRGHT▼ |        |        |      |        |        |        |        |        |       |
-  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
-                                    ,-----------------------,  ,-----------------------.
-                                    |   OS  |       | Space |  |  Ent  |       |  ALT  |
-                                   /|-------+-------+-------'  +-------+-------+-------|\
-  ),
-*/
-  [_ADJUST] = LAYOUT_split_3x6_3(
-    QK_BOOT, EE_CLR,  _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,                    _______, _______, _______, _______, _______, _______,
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,                    _______, _______, _______, _______, _______, _______,
-                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
-  )
-};
-
-
-#ifdef OLED_ENABLE
-// #include <stdio.h>
-
-// bongo cat
-// Taken from
-// https://github.com/nwii/oledbongocat
-// char wpm_str[10]; // sprintf changed with more optimized code
-
-
-// WPM-responsive animation stuff here
-#    define IDLE_FRAMES 5
-#    define IDLE_SPEED 20  // below this wpm value your animation will idle
-
-// #define PREP_FRAMES 1 // uncomment if >1
-
-#    define TAP_FRAMES 2
-#    define TAP_SPEED 40  // above this wpm value typing animation to trigger
-
-#    define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
-// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#    define ANIM_SIZE 636  // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
-uint8_t current_tap_frame = 0;
-
-// Code containing pixel art, contains:
-// 5 idle frames, 1 prep frame, and 2 tap frames
-
-// To make your own pixel art:
-// save a png/jpeg of an 128x32 image (resource: https://www.pixilart.com/draw )
-// follow this guide up to and including "CONVERT YOUR IMAGE" https://docs.splitkb.com/hc/en-us/articles/360013811280-How-do-I-convert-an-image-for-use-on-an-OLED-display-
-// replace numbers in brackets with your own
-// if you start getting errors when compiling make sure you didn't accedentally delete a bracket
-static void render_anim(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-    static const char PROGMEM prep[][ANIM_SIZE]            = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00}};
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE]   = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    };
-
-    // assumes 1 frame prep stage
-    void animation_phase(void) {
-        if (get_current_wpm() <= IDLE_SPEED) {
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
-        }
-        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-            // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
-            oled_write_raw_P(prep[0], ANIM_SIZE);  // remove if IDLE_FRAMES >1
-        }
-        if (get_current_wpm() >= TAP_SPEED) {
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
-        }
-    }
-    if (get_current_wpm() != 000) {
-        oled_on();  // not essential but turns on animation OLED with any alpha keypress
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {
-        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-// bongop cat
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("Default"), false);
-            break;
-        case _LOWER:
-            oled_write_ln_P(PSTR("Lower"), false);
-            break;
-        case _RAISE:
-            oled_write_ln_P(PSTR("Raise"), false);
-            break;
-        case _SPACE:
-            oled_write_ln_P(PSTR("Space"), false);
-            break;
-        case _NUMPAD:
-            oled_write_ln_P(PSTR("Numpad"), false);
-            break;
-        case _SODA:
-            oled_write_ln_P(PSTR("Soda"), false);
-            break;
-        case _ADJUST:
-        // case _ADJUST|_LOWER:
-        // case _ADJUST|_RAISE:
-        // case _ADJUST|_LOWER|_RAISE:
-        // case _ADJUST|_LOWER|_RAISE|_SPACE:
-        // case _ADJUST|_LOWER|_RAISE|_SPACE|_NUMPAD|_SODA:
-            oled_write_ln_P(PSTR("Adjust"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("?????"), false);
-    }
-}
-
-
-char keylog_str[24] = {};
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-  if (keycode < 60) {
-    name = code_to_name[keycode];
-  }
-
-  // update keylog
-  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-
-void oled_render_keylog(void) {
-    oled_write(keylog_str, false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-// void oled_render_logo(void) {
-//    static const char PROGMEM crkbd_logo[] = {
-//        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-//        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-//        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-//        0};
-//    oled_write_P(crkbd_logo, false);
-// }
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_render_keylog();
-    } else {
-        // bongo cat
-        render_anim();  // renders pixelart
-
-        oled_set_cursor(0, 0);                            // sets cursor to (row, column) using charactar spacing (5 rows on 128x32 screen, anything more will overflow back to the top)
-        // sprintf(wpm_str, "WPM:%03d", get_current_wpm());  // edit the string to change wwhat shows up, edit %03d to change how many digits show up
-        // oled_write(wpm_str, false);                       // writes wpm on top left corner of string
-
-        // This way it's more size efficient than calling sprintf
-        oled_write_P(PSTR("WPM: "), false);
-        oled_write(get_u8_str(get_current_wpm(), ' '), false);
-        // This way it's more size efficient than calling sprintf
-
-        led_t led_state = host_keyboard_led_state();  // caps lock stuff, prints CAPS on new line if caps led is on
-
-        oled_set_cursor(0, 1);
-        oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("       "), false);
-        // bongo cat
-
-        //oled_render_logo();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    set_keylog(keycode, record);
-  }
-  return true;
-}
-#endif // OLED_DRIVER_ENABLE
diff --git a/keyboards/crkbd/keymaps/ardakilic/rules.mk b/keyboards/crkbd/keymaps/ardakilic/rules.mk
deleted file mode 100644
index 0453ca573aa..00000000000
--- a/keyboards/crkbd/keymaps/ardakilic/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-OLED_ENABLE  = yes
-EXTRAKEY_ENABLE = yes # for media keys
-
-# bongo cat
-WPM_ENABLE = yes
-# bongo cat
-
-# Size optimisations
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-LTO_ENABLE = yes
-SPACE_CADET_ENABLE = no
-GRAVE_ESCAPE_ENABLE = no
-MOUSEKEY_ENABLE = no
-# Size optimisations END
diff --git a/keyboards/crkbd/keymaps/armand1m/config.h b/keyboards/crkbd/keymaps/armand1m/config.h
deleted file mode 100644
index 8d97cf1465a..00000000000
--- a/keyboards/crkbd/keymaps/armand1m/config.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-// #define QUICK_TAP_TERM 0
-// #define PERMISSIVE_HOLD
-#define TAPPING_TERM 300
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-#    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 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-#define ONESHOT_TAP_TOGGLE 3  /* Tapping this number of times holds the key until tapped once again. */
-#define ONESHOT_TIMEOUT 5000  /* Time (in ms) before the one shot key is released */
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/armand1m/keymap.c b/keyboards/crkbd/keymaps/armand1m/keymap.c
deleted file mode 100644
index 3caee1c827f..00000000000
--- a/keyboards/crkbd/keymaps/armand1m/keymap.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-Copyright 2021 Armando Magalhaes <@armand1m>
-
-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 custom_keycodes {
-    ARROW_FUNCTION = SAFE_RANGE
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-      case ARROW_FUNCTION:
-        if (record->event.pressed) {
-            SEND_STRING("() => {}");
-        } else {
-            SEND_STRING(SS_TAP(X_LEFT) SS_TAP(X_ENTER));
-        }
-        return false;
-    }
-
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_split_3x6_3(
-            KC_TAB,               KC_Q,           KC_W,    KC_E,    KC_R,    KC_T,           KC_Y,    KC_U,    KC_I,    KC_O,                  KC_P,       KC_BSPC,
-     LT(1, KC_ESC),        LT(2, KC_A),    LT(3, KC_S),    KC_D,    KC_F,    KC_G,           KC_H,    KC_J,    KC_K,    KC_L,               KC_SCLN,       KC_QUOT,
-     OSM(MOD_LSFT), MT(MOD_LCTL, KC_Z),           KC_X,    KC_C,    KC_V,    KC_B,           KC_N,    KC_M, KC_COMM,  KC_DOT, MT(MOD_RCTL, KC_SLSH), OSM(MOD_RSFT),
-                                     KC_LALT,       LGUI(KC_SPACE),   LGUI_T(KC_SPC),    MT(MOD_RSFT, KC_ENT),  MO(2), KC_RALT
-  ),
-
-  [1] = LAYOUT_split_3x6_3(
-      _______,      KC_1,      KC_2,      KC_3,      KC_4,      KC_5,                    KC_6,      KC_7,      KC_8,        KC_9,      KC_0, _______,
-      _______,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,                 KC_LEFT,   KC_DOWN,     KC_UP,    KC_RIGHT,   XXXXXXX, _______,
-      _______,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,                 XXXXXXX,   XXXXXXX,   _______,     _______,   _______, _______,
-                                                  _______, _______, _______,     _______, _______, _______
-  ),
-
-  [2] = LAYOUT_split_3x6_3(
-      _______,   KC_EXLM,     KC_AT,   KC_HASH,         KC_DLR, KC_PERC,             KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-      _______,   XXXXXXX,   XXXXXXX,   XXXXXXX, ARROW_FUNCTION,   KC_LT,             KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
-      _______,   XXXXXXX,   XXXXXXX,   XXXXXXX,        XXXXXXX,   KC_GT,             KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
-                                                  _______, _______, _______,     _______, _______, _______
-  ),
-
-  [3] = LAYOUT_split_3x6_3(
-      _______,   XXXXXXX,   XXXXXXX,   XXXXXXX, LALT(LSFT(KC_0)),   XXXXXXX,             XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX, LGUI(LSFT(KC_4)), XXXXXXX,
-      _______,   XXXXXXX,   XXXXXXX,   XXXXXXX,          XXXXXXX,   XXXXXXX,             XXXXXXX, LGUI(KC_MINS), LGUI(KC_PLUS), XXXXXXX,          XXXXXXX, XXXXXXX,
-      _______,   XXXXXXX,   XXXXXXX,   XXXXXXX,          XXXXXXX,   XXXXXXX,             XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,
-                                                  _______, _______, _______,     _______, _______, _______
-  ),
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180; // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_amsterdam_flag(void) {
-    // 'Flag_of_Amsterdam', 128x32px
-    static const char PROGMEM amsterdam_flag[] = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0,
-        0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf0, 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, 0x01, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff,
-        0xfe, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff,
-        0xff, 0xfe, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0xff,
-        0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03,
-        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, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f,
-        0x3f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff,
-        0xff, 0x7f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff,
-        0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 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, 0x01, 0x03, 0x07, 0x0f, 0x0f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x1f, 0x0f, 0x07, 0x03,
-        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x0f, 0x07, 0x03,
-        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    };
-    oled_write_raw_P(amsterdam_flag, sizeof(amsterdam_flag));
-}
-
-bool oled_task_user(void) {
-    oled_render_amsterdam_flag();
-    return false;
-}
-#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/armand1m/readme.md b/keyboards/crkbd/keymaps/armand1m/readme.md
deleted file mode 100644
index 0d10ae17d0a..00000000000
--- a/keyboards/crkbd/keymaps/armand1m/readme.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# armand1m crkbd layout
-
-This is the personal layout for [@armand1m](https://go.d1m.dev/github)
-
-This layout is heavily inspired in my personal Moonlander layout, optimized for my own personal usage.
-
-As of the date of this writing, my environment runs OS X Big Sur with yabai and skhd to provide an window tiling management experience similar to what i3wm offers to Linux, which means that I often use the `alt` keys.
-
-I am a huge fan of ModTaps, so this layout will contain some of those to allow for a better experience in such a small keyboard like the crkbd.
-
-## Layout
-
-You can find `json` files for http://www.keyboard-layout-editor.com/ in the keymap folder.
-
-Here are some screenshots for convenience:
-
-Base Layer:<br/>
-<a href="https://ibb.co/fYZw3yj"><img src="https://i.ibb.co/0j1b06H/Screen-Shot-2021-03-15-at-4-58-43-PM.png" alt="Base Layer" border="0"></a>
-
-Numbers Layer:<br/>
-<a href="https://ibb.co/30Vg1tS"><img src="https://i.ibb.co/hKr3sp2/Screen-Shot-2021-03-15-at-5-18-07-PM.png" alt="Numbers Layer" border="0"></a>
-
-Symbols Layer:<br/>
-<a href="https://ibb.co/ryCg4pS"><img src="https://i.ibb.co/q1tzkgf/Screen-Shot-2021-03-15-at-5-18-33-PM.png" alt="Symbols Layer" border="0"></a>
-
-## Choices
-
-Every keymap is pretty unique and tailored to suit it's main creators needs. Here are some of my choices for the keys and their explanations:
-
- - Left thumb acts as Space when tapping but as Command when holding: this makes my life so much easier in OS X. Having command reachable all the time just feels right to me and Mod Taps help me a lot on this.
-
- - Right thumb acts as Enter when tapping but as Right Shift when holding: this is more of an experiment. I usually use shift on my pinkies. It is an interesting feature but I often forget about it.
-
- - Esc lives in the home row, before A. It also acts as a layer toggle to the numbers layer when held. Having the LT to the numbers layer here allows me to actually reach the number 1 pretty nicely and other numbers on the left hand pretty easily.
-
- - Keys on the home row are used to switch to layers, so "A" goes to layer 2 when held. I started making this in the Moonlander and migrated the practice, but still sometimes I use the MO 2 on the right thumb.
-
- - One Shot Keys are enabled for the shifts on the pinkies. If you press it twice: it will lock on shift until pressed again (pretty much like caps lock). These are handy when you're typing and just don't want to hold shift to have a capitalized word.
-
-## Usage
-
-In case you have `qmk` installed:
-
-```sh
-qmk compile -kb crkbd -km armand1m
-```
-
-The compiled .hex file should be available in `qmk_firmware/.build`
-
-You can also trigger a build and flash automatically by running the following command:
-
-```sh
-qmk flash -kb crkbd -km armand1m
-```
-
-If you built your crkbd with an Elite-C microcontroller, you probably want to use a DFU bootloader:
-
-```sh
-qmk flash -kb crkbd -km armand1m -bl dfu
-```
-
-## Credits
-
- - Armando Magalhaes [(github)](https://go.d1m.dev/github)
diff --git a/keyboards/crkbd/keymaps/armand1m/rules.mk b/keyboards/crkbd/keymaps/armand1m/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/crkbd/keymaps/armand1m/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/benrestech/config.h b/keyboards/crkbd/keymaps/benrestech/config.h
deleted file mode 100644
index b827d76fcb1..00000000000
--- a/keyboards/crkbd/keymaps/benrestech/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 175
-#define PERMISSIVE_HOLD
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-    #define RGBLED_NUM 27
-    #define RGBLIGHT_SLEEP
-    #define RGBLIGHT_SPLIT
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-    #define RGBLIGHT_LAYERS
-#endif
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/benrestech/keymap.c b/keyboards/crkbd/keymaps/benrestech/keymap.c
deleted file mode 100644
index a79a3cc8c96..00000000000
--- a/keyboards/crkbd/keymaps/benrestech/keymap.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-Copyright 2022 Ben Allen <@benrestech>
-
-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 KC_NP KC_NO // key is not present
-#define KC_NA KC_NO // present but not available for use
-#define KC_NU KC_NO // available but not used
-
-
-// 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 crkbd_layers {
-    BASE,
-    MEDR,
-    NAVR,
-    MOUR,
-    NSSL,
-    NSL,
-    FUNL,
-    GAME
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_split_3x6_3(
-    TO(NSSL),  KC_Q,          KC_W,          KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,             KC_Y,            KC_QUOT,       TO(MOUR),
-    TO(NSL),   LGUI_T(KC_A),  LALT_T(KC_R),  LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),     LALT_T(KC_I),    LGUI_T(KC_O),  TO(NAVR),
-    TO(FUNL),  KC_Z,          ALGR_T(KC_X),  KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,          ALGR_T(KC_DOT),  KC_SLSH,       TO(MEDR),
-                                             LT(MEDR, KC_ESC),  LT(NAVR, KC_SPC),  LT(MOUR, KC_TAB),  LT(NSSL, KC_ENT),  LT(NSL, KC_BSPC),  LT(FUNL, KC_DEL)
-  ),
-  [NAVR] = LAYOUT_split_3x6_3(
-    TO(NSSL),  QK_BOOT,  KC_NA,    KC_NA,   KC_NA,   KC_NA,   KC_AGIN, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE,  TO(MOUR),
-    TO(NSL),   KC_LGUI, KC_LALT,  KC_LCTL, KC_LSFT, KC_NA,   KC_CAPS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,  TO(BASE),
-    TO(FUNL),  KC_NA,   KC_ALGR,  KC_NA,   KC_NA,   KC_NA,   KC_INS,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,   TO(MEDR),
-                                  KC_NA,   KC_NA,   KC_NA,   KC_ENT,  KC_BSPC, KC_DEL
-  ),
-  [MOUR] = LAYOUT_split_3x6_3(
-    TO(NSSL),  QK_BOOT,  KC_NA,    KC_NA,   KC_NA,   KC_NA,   KC_NU,   KC_NU,   KC_NU,   KC_NU,   KC_NU,    TO(BASE),
-    TO(NSL),   KC_LGUI, KC_LALT,  KC_LCTL, KC_LSFT, KC_NA,   KC_NU,   KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R,  TO(NAVR),
-    TO(FUNL),  KC_NA,   KC_ALGR,  KC_NA,   KC_NA,   KC_NA,   KC_NU,   KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,  TO(MEDR),
-                                  KC_NA,   KC_NA,   KC_NA,   KC_BTN1, KC_BTN3, KC_BTN2
-  ),
-  [MEDR] = LAYOUT_split_3x6_3(
-    TO(NSSL),  QK_BOOT,  KC_NA,    KC_NA,   KC_NA,   KC_NA,   RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,   TO(MOUR),
-    TO(NSL),   KC_LGUI, KC_LALT,  KC_LCTL, KC_LSFT, KC_NA,   KC_NU,   KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT,  TO(NAVR),
-    TO(FUNL),  KC_NA,   KC_ALGR,  KC_NA,   KC_NA,   KC_NA,   KC_NU,   KC_NU,   KC_NU,   KC_NU,   KC_NU,    TO(BASE),
-                                  KC_NA,   KC_NA,   KC_NA,   KC_MSTP, KC_MPLY, KC_MUTE
-  ),
-  [FUNL] = LAYOUT_split_3x6_3(
-    TO(NSSL),  KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR, KC_NA,   KC_NA,   KC_NA,   KC_NA,    QK_BOOT,   TO(MOUR),
-    TO(NSL),   KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_SCRL, KC_NA,   KC_LSFT, KC_LCTL, KC_LALT,  KC_LGUI,  TO(NAVR),
-    TO(BASE),  KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_PAUS, KC_NA,   KC_NA,   KC_NA,   KC_ALGR,  KC_NA,    TO(MEDR),
-                                KC_APP,  KC_SPC,  KC_TAB,  KC_NA,   KC_NA,   KC_NA
-  ),
-  [NSL] = LAYOUT_split_3x6_3(
-    TO(NSSL),  KC_LBRC, KC_7,    KC_8,    KC_9,    KC_RBRC, KC_NA,   KC_NA,   KC_NA,   KC_NA,    QK_BOOT,   TO(MOUR),
-    TO(BASE),  KC_SCLN, KC_4,    KC_5,    KC_6,    KC_EQL,  KC_NA,   KC_LSFT, KC_LCTL, KC_LALT,  KC_LGUI,  TO(NAVR),
-    TO(FUNL),  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_BSLS, KC_NA,   KC_NA,   KC_NA,   KC_ALGR,  KC_NA,    TO(MEDR),
-                                KC_DOT,  KC_0,    KC_MINS, TO(GAME),   KC_NA,   KC_NA
-  ),
-  [NSSL] = LAYOUT_split_3x6_3(
-    TO(BASE),  KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, KC_NA,   KC_NA,   KC_NA,   KC_NA,    QK_BOOT,  TO(MOUR),
-    TO(NSL),   KC_COLN, KC_DLR,  KC_PERC, KC_CIRC, KC_PLUS, KC_NA,   KC_LSFT, KC_LCTL, KC_LALT,  KC_LGUI, TO(NAVR),
-    TO(FUNL),  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_PIPE, KC_NA,   KC_NA,   KC_NA,   KC_ALGR,  KC_NA,   TO(MEDR),
-                                KC_GT,   KC_RPRN, KC_UNDS, KC_NA,   KC_NA,   KC_NA
-  ),
-  [GAME] = LAYOUT_split_3x6_3(
-    KC_NA,  KC_Q,  KC_W,  KC_F,    KC_P,    KC_B,    KC_J,              KC_L,              KC_U,             KC_Y,            KC_QUOT,       TO(BASE),
-    KC_NA,  KC_A,  KC_R,  KC_S,    KC_T,    KC_G,    KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),     LALT_T(KC_I),    LGUI_T(KC_O),  TO(BASE),
-    KC_NA,  KC_Z,  KC_X,  KC_C,    KC_D,    KC_V,    KC_K,              KC_H,              KC_COMM,          ALGR_T(KC_DOT),  KC_SLSH,       TO(BASE),
-                          KC_ESC,  KC_SPC,  KC_TAB,  LT(NSSL, KC_ENT),  LT(NSL, KC_BSPC),  LT(FUNL, KC_DEL)
-  )
-};
-
-// Default (BASE) lighting layer is HSV_GREEN.
-// MEDR lighting layer.
-const rgblight_segment_t PROGMEM medr_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 53, HSV_PINK}       // Light all LEDs
-);
-// NAVR lighting layer.
-const rgblight_segment_t PROGMEM navr_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 53, HSV_CYAN}       // Light all LEDs
-);
-// MOUR lighting layer.
-const rgblight_segment_t PROGMEM mour_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 53, HSV_YELLOW}       // Light all LEDs
-);
-// NSSL lighting layer.
-const rgblight_segment_t PROGMEM nssl_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 53, HSV_SPRINGGREEN}       // Light all LEDs
-);
-// NSL lighting layer.
-const rgblight_segment_t PROGMEM nsl_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 53, HSV_BLUE}       // Light all LEDs
-);
-// FUNL lighting layer.
-const rgblight_segment_t PROGMEM funl_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 53, HSV_RED}       // Light all LEDs
-);
-// GAME lighting layer.
-const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 53, HSV_PURPLE}       // Light all LEDs
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    medr_layer,
-    navr_layer,
-    mour_layer,
-    nssl_layer,
-    nsl_layer, 
-    funl_layer,
-    game_layer 
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-    rgblight_sethsv(HSV_GREEN);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, MEDR));
-    rgblight_set_layer_state(1, layer_state_cmp(state, NAVR));
-    rgblight_set_layer_state(2, layer_state_cmp(state, MOUR));
-    rgblight_set_layer_state(3, layer_state_cmp(state, NSSL));
-    rgblight_set_layer_state(4, layer_state_cmp(state, NSL));
-    rgblight_set_layer_state(5, layer_state_cmp(state, FUNL));
-    rgblight_set_layer_state(6, layer_state_cmp(state, GAME));
-    return state;
-}
-
-
diff --git a/keyboards/crkbd/keymaps/benrestech/rules.mk b/keyboards/crkbd/keymaps/benrestech/rules.mk
deleted file mode 100644
index 462ceeb32b7..00000000000
--- a/keyboards/crkbd/keymaps/benrestech/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/bermeo/config.h b/keyboards/crkbd/keymaps/bermeo/config.h
deleted file mode 100644
index fce27a72658..00000000000
--- a/keyboards/crkbd/keymaps/bermeo/config.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-// #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 150
-// #define RETRO_TAPPING
-// #define PERMISSIVE_HOLD
-
-#ifdef RGBLIGHT_ENABLE
-#    undef RGBLED_NUM
-#    define RGBLED_NUM 27
-#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 RGBLIGHT_SLEEP
-#    define RGBLIGHT_SPLIT
-#    define RGBLIGHT_LIMIT_VAL 120
-#    define RGBLIGHT_HUE_STEP 6
-#    define RGBLIGHT_SAT_STEP 6
-#    define RGBLIGHT_VAL_STEP 6
-#    define RGBLIGHT_SLEEP
-#    define RGBLIGHT_TIMEOUT 75000
-#endif
-
-#ifdef OLED_ENABLE
-#    define SPLIT_LAYER_STATE_ENABLE
-#    define SPLIT_LED_STATE_ENABLE
-#    define SPLIT_MODS_ENABLE
-#    define SPLIT_WPM_ENABLE
-#    define SPLIT_OLED_ENABLE
-#    define OLED_FONT_H "keyboards/crkbd/keymaps/soundmonster/glcdfont.c"
-#    define OLED_DISABLE_TIMEOUT
-#    define OLED_TIMEOUT 150000
-#    define OLED_BRIGHTNESS 255
-#    define OLED_FADE_OUT
-#    define OLED_FADE_OUT_INTERVAL 15
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_VAL_STEP 8
-#    define RGB_MATRIX_SPD_STEP 10
-
-/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
- * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/crkbd/keymaps/bermeo/glcdfont.c b/keyboards/crkbd/keymaps/bermeo/glcdfont.c
deleted file mode 100644
index 588ecfd8c88..00000000000
--- a/keyboards/crkbd/keymaps/bermeo/glcdfont.c
+++ /dev/null
@@ -1,232 +0,0 @@
-#include "progmem.h"
-
-// Corne 8x6 font with QMK Firmware Logo
-// Online editor: https://helixfonteditor.netlify.com/
-// See also: https://github.com/soundmonster/glcdfont_converter
-
-const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8,
-0xF8, 0x18, 0x00, 0xC0, 0xF0, 0xFC,
-0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0xFF, 0x7E, 0x00, 0x00, 0x00,
-0x00, 0xF8, 0x04, 0x22, 0x52, 0xE2,
-0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
-0x22, 0x22, 0x42, 0x82, 0x02, 0x02,
-0x22, 0x22, 0x02, 0x04, 0xF8, 0x00,
-0x00, 0xF8, 0x04, 0x02, 0x02, 0x82,
-0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
-0x02, 0x82, 0x42, 0x22, 0x12, 0x22,
-0x42, 0x82, 0x02, 0x04, 0xF8, 0x00,
-0x00, 0xF8, 0xFC, 0xDE, 0xAE, 0x1E,
-0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
-0xDE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-0xDE, 0xDE, 0xFE, 0xFC, 0xF8, 0x00,
-0x00, 0xF8, 0xFC, 0xFE, 0xFE, 0x7E,
-0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
-0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
-0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
-0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
-0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
-0x00, 0xF8, 0xFC, 0xFE, 0xFF, 0xE0,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F,
-0x07, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x20, 0x44, 0x4A, 0x47,
-0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
-0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
-0x44, 0x44, 0x40, 0x20, 0x1F, 0x00,
-0x00, 0x1F, 0x20, 0x40, 0x41, 0x40,
-0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
-0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
-0x4F, 0x41, 0x41, 0x20, 0x1F, 0x00,
-0x00, 0x1F, 0x3F, 0x7B, 0x75, 0x78,
-0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
-0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
-0x7B, 0x7B, 0x7F, 0x3F, 0x1F, 0x00,
-0x00, 0x1F, 0x3F, 0x7F, 0x7E, 0x7F,
-0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
-0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
-0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
-0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
-0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
-0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
-0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
-0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
-0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
-0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
-0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
-0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
-0x00, 0x03, 0x0F, 0x1F, 0x3F, 0x3F,
-0x3F, 0x3F, 0x1F, 0x1F, 0x3F, 0x3F,
-0x7F, 0x7F, 0x7F, 0x3F, 0x3F, 0x1F,
-0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7C,
-0x78, 0x78, 0x38, 0x1C, 0x0F, 0x00,
-0x04, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-0x20, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-0xFC, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-0x04, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-0x20, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-0xFC, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-0xFE, 0x7E, 0xBE, 0xDE, 0xEE, 0xDE,
-0xBE, 0x7E, 0xFE, 0xFC, 0xF8, 0x00,
-0x7E, 0x7E, 0x70, 0x77, 0x77, 0x77,
-0x70, 0x7E, 0x7E, 0x3F, 0x1F, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
-0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
-0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
-0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
-0x03, 0x02, 0x01, 0x01, 0x00, 0x00
-};
diff --git a/keyboards/crkbd/keymaps/bermeo/keymap.c b/keyboards/crkbd/keymaps/bermeo/keymap.c
deleted file mode 100644
index 3b3e6d0abe6..00000000000
--- a/keyboards/crkbd/keymaps/bermeo/keymap.c
+++ /dev/null
@@ -1,596 +0,0 @@
-// Copyright 2022 Guilherme Bermêo (bermeo.dev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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 layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _NUMP,
-};
-
-uint8_t mod_state;
-
-bool isBarking  = false;
-bool isJumping  = false;
-bool showedJump = true;
-bool isSneaking = false;
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    ADJUST,
-    CEDILHA,            // ç direct key
-    AO,                 // ã direct key
-    ASPAS,              // " direct key
-
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[_QWERTY] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    LCTL_T(KC_F3), KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_GRAVE,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    LALT_T(KC_TAB), KC_A,  KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L,  KC_SCLN, KC_ENTER,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    LSFT_T(KC_LEFT), KC_Z, KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, RGUI_T(KC_RIGHT),
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                      LGUI_T(KC_DOWN), MO(1), KC_SPC,    KC_BSPC,  MO(2),  RSFT_T(KC_UP)
-    //                                    `--------------------------'  `--------------------------'
-    ),
-
-[_LOWER] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    LCTL_T(KC_F5), KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                         KC_6, KC_7, KC_8, KC_9, KC_0, KC_ESCAPE,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    LCTL(LGUI(KC_SPC)), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_ENT,                  KC_LBRC, KC_RBRC, KC_BSLS, KC_QUOT, KC_COLON, KC_ENT,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    LALT(KC_LEFT), KC_F1, KC_F2,    KC_C,    KC_V,   KC_BSPC,                      KC_MINS, KC_EQL,   KC_LT,   KC_GT, KC_QUESTION, LALT(KC_RIGHT),
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                               LGUI_T(KC_PAGE_DOWN), _______, KC_SPC,    LALT(KC_BSPC), TG(3), RSFT_T(KC_PAGE_UP)
-    //                                    `--------------------------'  `--------------------------'
-    ),
-
-[_RAISE] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    LCTL_T(KC_F4), KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILDE,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    LALT_T(KC_TAB), AO,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_LCBR, KC_RCBR, KC_PIPE,  ASPAS,  KC_COLON, KC_ENT,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    LALT(KC_LEFT), XXXXXXX, XXXXXXX, CEDILHA, XXXXXXX, XXXXXXX,                   KC_UNDS, KC_PLUS,  KC_LT,    KC_GT, KC_QUESTION, LALT(KC_RIGHT),
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                       LGUI_T(KC_END), TG(3), KC_SPC,     KC_DEL,  _______, RSFT_T(KC_HOME)
-    //                                    `--------------------------'  `--------------------------'
-    ),
-
-[_NUMP] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       RGB_TOG,  _______, _______, _______, _______, _______,                      _______,  KC_P7,   KC_P8,  KC_P9,  KC_PAST, KC_PSLS,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______,                      _______,  KC_P4,   KC_P5,  KC_P6,  KC_PMNS,  KC_ENT,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______,                       KC_PDOT,  KC_P1,   KC_P2,  KC_P3,  KC_PPLS,   KC_NO,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                             TG(3),    TG(3),   TG(3),     KC_BSPC,  TG(3),   KC_P0
-    //                                    `--------------------------'  `--------------------------'
-    )};
-
-//Per key lights
-bool rgb_matrix_indicators_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            isSneaking = false;
-            mod_state  = get_mods();
-            for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-                if (mod_state & MOD_MASK_SHIFT) {
-                    isBarking = true;
-                    rgb_matrix_set_color(52, 255, 255, 255);
-                    rgb_matrix_set_color(i, 255, 150, 0);
-                } else if (mod_state & MOD_MASK_GUI || mod_state & MOD_MASK_CTRL) {
-                    isBarking = true;
-                    rgb_matrix_set_color(15, 255, 0, 0);
-                    switch (i) {
-                        case 0 ... 5:                            // underglow left side
-                        case 9:                                  // cmd + T white (new tab)
-                        case 11:                                 // cmd + F white (find)
-                        case 18:                                 // cmd + W white (close tab)
-                        case 19:                                 // cmd + S white (save)
-                        case 21:                                 // cmd + Z white (undo)
-                        case 22:                                 // cmd + A white (select all)
-                        case 27 ... 32:                          // underglow right side
-                        case 43:                                 // cmd + K white (comment for desktop remote)
-                        case 48:                                 // cmd + / white (comment line)
-                            rgb_matrix_set_color(i, 255, 255, 255); // white
-                            break;
-                        case 6:                                  // space bar off
-                        case 24 ... 26:                          // left column off
-                        case 33:                                 // backspace off
-                        case 41:                                 // shift off
-                        case 51 ... 53:                          // right column off
-                            rgb_matrix_set_color(i, 0, 0, 0);    //off
-                            break;
-                    }
-                    if (mod_state & MOD_MASK_GUI) {
-                        rgb_matrix_set_color(12, 255, 255, 255); // white V key
-                        rgb_matrix_set_color(15, 255, 255, 255); // white C key
-                        rgb_matrix_set_color(20, 255, 255, 255); // white X key
-                    } else {
-                    }
-                } else if (mod_state & MOD_MASK_ALT) {
-                    isBarking = true;
-                } else {
-                    isBarking = false;
-                    rgb_matrix_set_color(14, 0, 0, 0);          // command key off
-                }
-            }
-            rgb_matrix_set_color(13, 23, 181, 255);             // cyan layer
-            rgb_matrix_set_color(40, 255, 33, 0);               // orange layer
-            break;
-
-        case _RAISE:
-            isSneaking = true;
-            for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-                switch (i) {
-                    case 7:                                     // B key off
-                    case 8:                                     // G key off
-                    case 11:                                    // F key off
-                    case 12:                                    // V key off
-                    case 16:                                    // D key off
-                    case 19 ... 21:                             // S, X, Z keys off
-                    case 25:                                    // tab key off
-                    case 26:                                    // shift key off
-                    case 52 ... 53:                             // right column off
-                        rgb_matrix_set_color(i, 0, 0, 0);       // off
-                        break;
-                    case 15:                                    // Ç key
-                    case 22:                                    // Ã key
-                    case 24:                                    // Launch (F4)
-                    case 40:                                    // Active layer
-                        rgb_matrix_set_color(i, 255, 255, 255); // white
-                        break;
-                    case 13:                                    // active layer
-                        rgb_matrix_set_color(i, 0, 255, 0);     // green
-                        break;
-                    case 42:                                    // , shifted key
-                    case 47 ... 49:                             // . / ; shifted keys
-                        rgb_matrix_set_color(i, 255, 214, 0);   // yellow
-                        break;
-                    default:
-                        rgb_matrix_set_color(i, 255, 33, 0);    // orange
-                }
-            }
-            break;
-
-        case _LOWER:
-            isSneaking = true;
-            for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-                switch (i) {
-                    case 7:                                     // Delete key
-                    case 51:                                    // ESC key
-                        rgb_matrix_set_color(i, 255, 0, 0);     // red
-                        break;
-                    case 12:                                    // V key off
-                    case 15:                                    // C key off
-                    case 20:                                    // X key off
-                    case 21:                                    // Z key off
-
-                    case 26:                                    // shift key off
-                    case 52 ... 53:                             // right column off
-                        rgb_matrix_set_color(i, 0, 0, 0);       // off
-                        break;
-                    case 11:                                    // Right arrow key
-                    case 13:                                    // Active layer
-                    case 16:                                    // Up arrow key
-                    case 19:                                    // Down arrow key
-                    case 22:                                    // Left arrow key
-                    case 24:                                    // Print
-                        rgb_matrix_set_color(i, 255, 255, 255); // white
-                        break;
-                    case 8:                                     // Enter key
-                    case 40:                                    // Activate Numpad
-                        rgb_matrix_set_color(i, 0, 255, 0);     // green
-                        break;
-                    case 42:                                    // , shifted key
-                    case 47 ... 49:                             // . / ; shifted keys
-                    case 25:                                    // opens emoji dialog (on macOS)
-                        rgb_matrix_set_color(i, 255, 214, 0);   // yellow
-                        break;
-                    default:
-                        rgb_matrix_set_color(i, 23, 181, 255);  // cyan
-                }
-            }
-
-            break;
-
-        case _NUMP:
-            isSneaking = true;
-            for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-                switch (i) {
-                    case 12:                                    // RGB speed-
-                    case 15:                                    // RGB brigthness-
-                    case 20:                                    // RGB saturation-
-                    case 21:                                    // RGB hue-
-                    case 49:                                    // Numpad -
-                    case 51:                                    // Numpad /
-                        rgb_matrix_set_color(i, 255, 0, 0);     // red
-                        break;
-                    case 8 ... 10:                              // G T R off
-                    case 17:                                    // E off
-                    case 18:                                    // W off
-                    case 23:                                    // Q off
-                    case 25:                                    // Tab off
-                    case 26:                                    // LShift off
-                    case 33:                                    // Backspace off
-                    case 35:                                    // H off
-                    case 36:                                    // Y off
-                    case 53:                                    // RShift off
-                        rgb_matrix_set_color(i, 0, 0, 0);       // off
-                        break;
-                    case 6:                                     // Space bar off
-                    case 13:                                    // Return to default layer
-                    case 16:                                    // RGB brigthness+
-                    case 24:                                    // RGB toggle
-                    case 37 ... 47:                             // Numpad numbers
-                    case 52:                                    // Enter key
-                        rgb_matrix_set_color(i, 255, 255, 255); // white
-                        break;
-                    case 11:                                    // RGB speed+
-                    case 19:                                    // RGB saturation+
-                    case 22:                                    // RGB hue+
-                    case 48:                                    // Numpad +
-                        rgb_matrix_set_color(i, 0, 255, 0);     // green
-                        break;
-                    case 34:                                    // . numpad key
-                        rgb_matrix_set_color(i, 255, 214, 0);   // yellow
-                        break;
-                }
-                rgb_matrix_set_color(13, 23, 181, 255);         // Activate cyan layer
-                rgb_matrix_set_color(40, 255, 33, 0);           // Activate orange layer
-                rgb_matrix_set_color(50, 0, 33, 255);           // Numpad *
-                rgb_matrix_set_color(14, 0, 255, 0);            // Green layer active
-            }
-    }
-    return false;
-};
-#endif
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-/* KEYBOARD PET START */
-/* settings */
-#    define MIN_WALK_SPEED 10
-#    define MIN_RUN_SPEED 60
-/* advanced settings */
-#    define ANIM_FRAME_DURATION 100 // how long each frame lasts in ms
-#    define ANIM_SIZE 96            // number of bytes in array. If you change sprites, minimize for adequate firmware size. max is 1024
-/* timers */
-uint32_t anim_timer = 0;
-/* current frame */
-uint8_t current_frame = 0;
-/* status variables */
-int current_wpm = 0;
-// led_t led_usb_state;
-/* logic */
-static void render_luna(int LUNA_X, int LUNA_Y) {
-    /* Sit */
-    static const char PROGMEM sit[2][ANIM_SIZE] = {/* 'sit1', 32x22px */
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x68, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        },
-        /* 'sit2', 32x22px */
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x90, 0x08, 0x18, 0x60, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-
-    /* Walk */
-    static const char PROGMEM walk[2][ANIM_SIZE] = {/* 'walk1', 32x22px */
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x90, 0x90, 0x90, 0xa0, 0xc0, 0x80, 0x80, 0x80, 0x70, 0x08, 0x14, 0x08, 0x90, 0x10, 0x10, 0x08, 0xa4, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0xea, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x03, 0x06, 0x18, 0x20, 0x20, 0x3c, 0x0c, 0x12, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        },
-        /* 'walk2', 32x22px */
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x28, 0x10, 0x20, 0x20, 0x20, 0x10, 0x48, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0xf8, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x30, 0xd5, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x02, 0x1c, 0x14, 0x08, 0x10, 0x20, 0x2c, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        }};
-
-    /* Run */
-    static const char PROGMEM run[2][ANIM_SIZE] = {/* 'run1', 32x22px */
-        {
-            0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0xc8, 0xb0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0xc4, 0xa4, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x58, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x09, 0x04, 0x04, 0x04, 0x04, 0x02, 0x03, 0x02, 0x01, 0x01, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
-        },
-
-        /* 'run2', 32x22px */
-        {
-            0x00, 0x00, 0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x78, 0x28, 0x08, 0x10, 0x20, 0x30, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xb0, 0x50, 0x55, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x1e, 0x20, 0x20, 0x18, 0x0c, 0x14, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        }};
-
-    // /* Bark */
-    static const char PROGMEM bark[2][ANIM_SIZE] = {/* 'bark1', 32x22px */
-        {
-            0x00, 0xc0, 0x20, 0x10, 0xd0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        },
-
-        /* 'bark2', 32x22px */
-        {
-            0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x2c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x20, 0x4a, 0x09, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        }};
-
-    /* Sneak */
-    static const char PROGMEM sneak[2][ANIM_SIZE] = {/* 'sneak1', 32x22px */
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x21, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x04, 0x04, 0x04, 0x03, 0x01, 0x00, 0x00, 0x09, 0x01, 0x80, 0x80, 0xab, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x02, 0x06, 0x18, 0x20, 0x20, 0x38, 0x08, 0x10, 0x18, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
-            },
-
-            /* 'sneak2', 32x22px */
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xa0, 0x20, 0x40, 0x80, 0xc0, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x41, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x40, 0x55, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x04, 0x18, 0x10, 0x08, 0x10, 0x20, 0x28, 0x34, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-            }};
-
-    /* animation */
-    void animate_luna(void) {
-        /* jump */
-        if (isJumping || !showedJump) {
-            /* clear */
-            oled_set_cursor(LUNA_X, LUNA_Y + 2);
-            oled_write("     ", false);
-            oled_set_cursor(LUNA_X, LUNA_Y - 1);
-            showedJump = true;
-        } else {
-            /* clear */
-            oled_set_cursor(LUNA_X, LUNA_Y - 1);
-            oled_write("     ", false);
-            oled_set_cursor(LUNA_X, LUNA_Y);
-        }
-        /* switch frame */
-        current_frame = (current_frame + 1) % 2;
-        /* draw */
-        if (isBarking) {
-            oled_write_raw_P(bark[current_frame], ANIM_SIZE);
-
-        } else if (isSneaking) {
-            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
-
-        } else if (current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
-
-        } else if (current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
-
-        } else {
-            oled_write_raw_P(run[current_frame], ANIM_SIZE);
-        }
-    }
-    /* animation timer */
-    if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-        anim_timer = timer_read32();
-        animate_luna();
-    }
-}
-
-void render_mod_status_gui_alt(uint8_t modifiers) {
-    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
-    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
-    static const char PROGMEM gui_on_1[]  = {0x8d, 0x8e, 0};
-    static const char PROGMEM gui_on_2[]  = {0xad, 0xae, 0};
-    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
-    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
-    static const char PROGMEM alt_on_1[]  = {0x8f, 0x90, 0};
-    static const char PROGMEM alt_on_2[]  = {0xaf, 0xb0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[]  = {0xc7, 0};
-    static const char PROGMEM on_off_2[]  = {0xc8, 0};
-    static const char PROGMEM off_on_1[]  = {0xc9, 0};
-    static const char PROGMEM off_on_2[]  = {0xca, 0};
-    static const char PROGMEM on_on_1[]   = {0xcb, 0};
-    static const char PROGMEM on_on_2[]   = {0xcc, 0};
-
-    if (modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_1, false);
-    } else {
-        oled_write_P(gui_off_1, false);
-    }
-    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
-        oled_write_P(on_on_1, false);
-    } else if (modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_1, false);
-    } else if (modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-    if (modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_1, false);
-    } else {
-        oled_write_P(alt_off_1, false);
-    }
-    if (modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_2, false);
-    } else {
-        oled_write_P(gui_off_2, false);
-    }
-    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
-        oled_write_P(on_on_2, false);
-    } else if (modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_2, false);
-    } else if (modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-    if (modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_2, false);
-    } else {
-        oled_write_P(alt_off_2, false);
-    }
-}
-
-void render_mod_status_ctrl_shift(uint8_t modifiers) {
-    static const char PROGMEM ctrl_off_1[]  = {0x89, 0x8a, 0};
-    static const char PROGMEM ctrl_off_2[]  = {0xa9, 0xaa, 0};
-    static const char PROGMEM ctrl_on_1[]   = {0x91, 0x92, 0};
-    static const char PROGMEM ctrl_on_2[]   = {0xb1, 0xb2, 0};
-    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
-    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
-    static const char PROGMEM shift_on_1[]  = {0xcd, 0xce, 0};
-    static const char PROGMEM shift_on_2[]  = {0xcf, 0xd0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[]  = {0xc7, 0};
-    static const char PROGMEM on_off_2[]  = {0xc8, 0};
-    static const char PROGMEM off_on_1[]  = {0xc9, 0};
-    static const char PROGMEM off_on_2[]  = {0xca, 0};
-    static const char PROGMEM on_on_1[]   = {0xcb, 0};
-    static const char PROGMEM on_on_2[]   = {0xcc, 0};
-
-    if (modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_1, false);
-    } else {
-        oled_write_P(ctrl_off_1, false);
-    }
-    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
-        oled_write_P(on_on_1, false);
-    } else if (modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_1, false);
-    } else if (modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-    if (modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_1, false);
-    } else {
-        oled_write_P(shift_off_1, false);
-    }
-    if (modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_2, false);
-    } else {
-        oled_write_P(ctrl_off_2, false);
-    }
-    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
-        oled_write_P(on_on_2, false);
-    } else if (modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_2, false);
-    } else if (modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-    if (modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_2, false);
-    } else {
-        oled_write_P(shift_off_2, false);
-    }
-}
-
-void render_layer_state(void) {
-    static const char PROGMEM default_layer[] = {0x20, 0x94, 0x95, 0x96, 0x20, 0x20, 0xb4, 0xb5, 0xb6, 0x20, 0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
-    static const char PROGMEM raise_layer[]   = {0x20, 0x97, 0x98, 0x99, 0x20, 0x20, 0xb7, 0xb8, 0xb9, 0x20, 0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
-    static const char PROGMEM lower_layer[]   = {0x20, 0x9a, 0x9b, 0x9c, 0x20, 0x20, 0xba, 0xbb, 0xbc, 0x20, 0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
-    static const char PROGMEM nump_layer[]    = {0x20, 0x9d, 0x9e, 0x9f, 0x20, 0x20, 0xbd, 0xbe, 0xbf, 0x20, 0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
-    if (layer_state_is(_NUMP)) {
-        oled_write_P(nump_layer, false);
-    } else if (layer_state_is(_LOWER)) {
-        oled_write_P(lower_layer, false);
-    } else if (layer_state_is(_RAISE)) {
-        oled_write_P(raise_layer, false);
-    } else {
-        oled_write_P(default_layer, false);
-    }
-}
-
-// renders on oled
-bool oled_task_user(void) {
-    current_wpm = get_current_wpm();
-    // led_usb_state = host_keyboard_led_state();
-
-    if (is_keyboard_left()) {
-        oled_set_cursor(0, 2);
-        if (isSneaking) {
-            render_layer_state();
-        } else {
-            for (size_t i = 0; i < 7; i++) {
-                oled_write("     ", false);
-            }
-        }
-        render_luna(0, 12);
-    } else {
-        oled_set_cursor(0, 6);
-        render_layer_state();
-        oled_set_cursor(0, 11);
-        if (mod_state) {
-            render_mod_status_gui_alt(get_mods());
-            render_mod_status_ctrl_shift(get_mods());
-        } else {
-            for (size_t i = 0; i < 5; i++) {
-                oled_write("     ", false);
-            }
-        }
-    }
-    return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        // ç key
-        case CEDILHA:
-            if (record->event.pressed) {
-                register_code(KC_QUOT);
-                unregister_code(KC_QUOT);
-                register_code(KC_C);
-                unregister_code(KC_C);
-            }
-            break;
-            return false;
-
-        // ã key
-        case AO:
-            if (record->event.pressed) {
-                register_code(KC_LSFT);
-                register_code(KC_GRV);
-                unregister_code(KC_LSFT);
-                unregister_code(KC_GRV);
-                register_code(KC_A);
-                unregister_code(KC_A);
-            }
-            break;
-            return false;
-
-        // direct " key
-        case ASPAS:
-            if (record->event.pressed) {
-                register_code(KC_LSFT);
-                register_code(KC_QUOT);
-                register_code(KC_SPC);
-                unregister_code(KC_SPC);
-                unregister_code(KC_QUOT);
-                unregister_code(KC_LSFT);
-            }
-            break;
-            return false;
-
-        // Luna jumping on space
-        case KC_SPC:
-            if (record->event.pressed) {
-                isJumping  = true;
-                showedJump = false;
-            } else {
-                isJumping = false;
-            }
-            break;
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/crkbd/keymaps/bermeo/readme.md b/keyboards/crkbd/keymaps/bermeo/readme.md
deleted file mode 100644
index a9b0d4ff095..00000000000
--- a/keyboards/crkbd/keymaps/bermeo/readme.md
+++ /dev/null
@@ -1,158 +0,0 @@
-# Bermeo Layout for Corne
-
-## Features
-
-### *Corne for neo-latin creatives*
-
-* Usable with left hand only (Figma, Adobe, Spline, etc) to combo with mouse.
-* Delete and enter keys on the left side.
-* Z and X on left side with lower layer used to control the monitor's brigtness.
-* Arrow keys on left hand (vim logic)
-* Accentuations used in Romance (neo-latin) languages like Spanish, Portuguese, French and Italian - ` ~ ^ ' -.
-
-#### Direct ç and ã keys
-
-The termination "tion" (eg. action) in portuguese is "ção" (eg. ação). This layout is optimized to use the less keys possible to write words with this termination.
-
-Compared to the `crkbd:default` layout the difference to output ção would be half of the interations:
-
-| crkbd:bermeo | <sub>`MO(2)`</sub>, `KC_C`, `KC_A`, <sup>`MO(2)`</sup> |
-|:--|:--|
-| crkbd:default | `KC_QUOT`, `KC_C`, <sub>`MO(2)`</sub>, <sub>`KC_SFT`</sub>, `KC_GRV`, <sup>`MO(2)`</sup>, <sup>`KC_SFT`</sup>, `KC_A` |
-
-[ <sub>`hold key`</sub> , <sup>`release key`</sup> ]
-
-### Modern OLED Support
-
-* Non-intrusive OLED layer indicator.
-* Non-intrusive OLED modifier indicators ⌘ ⇧ ⌥  ⌃.
-* Fully animated Luna on left side.
-  
-### Full per-key RGB Matrix support
-
-With the index of every key mapped in the table below to be used with `rgb_matrix_set_color(index, r, g, b)`;.
-
-#### Indexes of the keys
-
-|||||||||||||||
-|:--:|:--:|:--:|:--:|:--:|:--:|--|--|:--:|:--:|:--:|:--:|:--:|:--:|
-| 24 | 23 | 18 | 17 | 10 | 9 ||| 36 | 37 | 44 | 45 | 50 | 51 |
-| 25 | 22 | 19 | 16 | 11 | 8 ||| 35 | 38 | 43 | 46 | 49 | 52 |
-| 26 | 21 | 20 | 15 | 12 | 7 ||| 34 | 39 | 42 | 47 | 48 | 53 |
-|||||            14 | 13 |  6 | 33  | 40 | 41            |||||
-
-Each layer uses the LED `14` as an visual indicator:
-
-* ⚫️ Default layer
-* 🔵 Lower (0)
-* 🟠 Raise (1)
-* 🟢 Numpad (2)
-* ⚪️ Control and Command
-* 🟡 Shift
-
-## Mod-taps
-
-For convenience, QMK includes some Mod-Tap shortcuts to make common combinations more compact in your keymap:
-| Key         |                             Description |
-| :--         |                                     --: |
-| LCTL_T(kc)  | Left Control when held, kc when tapped. |
-| LSFT_T(kc)  | Left Shift when held, kc when tapped.   |
-| LALT_T(kc)  | Left Alt when held, kc when tapped.     |
-| ALT(kc)     | Left Alt + kc when tapped.              |
-| LGUI_T(kc)  | Left GUI when held, kc when tapped.     |
-| RSFT_T(kc)  | Right Shift when held, kc when tapped.  |
-| RGUI_T(kc)  | Right GUI when held, kc when tapped.    |
-
-## Macros
-
-|Layer | Name    | Description                                                                       | Keys          |
-| :--: | --:     | --                                                                                | --:           |
-|  🟠  | CEDILLA |  Directly outputs ç                                                               | ' + c         |
-|  🟠  | AO      |  Directly outputs ã                                                               | shift + ` + a |
-|  🟠  | ASPAS   |  Outputs ", since diaeresis[^1] are less used than " (for coding and quoting) | shift + ' + space |
-
-## Layers
-
-### QWERTY
-
-|||||||||||||||
-|:--|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|--:|
-| LCTL_T(F3[^2])  | Q | W | E | R | T ||| Y | U | I | O | P |      GRAVE      |
-| LALT_T(TAB)     | A | S | D | F | G ||| H | J | K | L | ; |        ↵        |
-| LSFT_T(&larr;)  | Z | X | C | V | B ||| N | M | , | . | / | RGUI_T(&rarr;)  |
-|||||  LGUI_T(&darr;) | MO(1) | SPACE |  ⌫ | MO(2)| RSFT_T( &uarr;)       |||||
-
-
-### LOWER 🔵
-
-|||||||||||||||
-|:--|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|--:|
-|CTL_T(F5[^3])   |  1  |  2  |  3  |  4  |  5  |||  6  |  7  |  8  |  9  |  0  | ESCAPE |
-|LCTL(LGUI(KC_SPC))[^4] | &larr; | &darr; |  &uarr; | &rarr; | ↵ ||| [ | ] | \ | ' | : |  ↵  |
-|ALT(&larr;) | F1[^5] | F2[^6] |   C |  V |  ⌫ ||| - | = | < | > | ? |   LALT(&rarr;)       |
-|||||      LGUI_T(PAGE_DOWN) | _ | SPACE | LALT(⌫) | TG(3) | RSFT_T(PAGE_UP)           |||||
-
-### RAISE 🟠
-
-|||||||||||||||
-|:--|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|--:|
-LCTL_T(F4[^7]) |  ! | @ | # | $ | % |||  ˆ | & | *      | (     | ) |     ˜    |
-LALT_T(TAB) | Ã[^8] |   |   |   |   |||  { | } | &#124; | "[^9] | : |     ↵    |
-LALT(&larr;) |  |   | Ç[^10] |   |   ||| _ | + | <      | >     | ? | LALT(&rarr;) |
-|||||  LGUI_T(END) | TG(3) | SPACE| DEL| _ | RSFT_T(HOME)                      |||||
-
-### NUMPAD 🟢
-
-|||||||||||||||
-|:--|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|--:|
-|  RGB_TOG ||         |         |         ||||   | 7 | 8 | 9 | * | / |
-||  RGB_HUI | RGB_SAI | RGB_VAI | RGB_SPI ||||   | 4 | 5 | 6 | - | ↵ |
-||  RGB_HUD | RGB_SAD | RGB_VAD | RGB_SPD |||| . | 1 | 2 | 3 | + |   |
-|||||                  TG(3)| TG(3) | TG(3) | ⌫ | TG(3) |  0     |||||
-
-## Usage
-
-To compile and flash, from `qmk setup` folder, run:
-
-    make crkbd:bermeo:flash
-
-## Compiled size
-
-    28658/28672 (99%, 14 bytes free)
-
-If more space is needed, start by deactivating Macros and Luna's animations.
-
-## Credits
-
-Guilherme Bermêo [(github)](https://git.bermeo.dev)
-
-### Thanks
-
-* @armand1m
-* @brneor
-* @drashna
-* @hellsingcoder
-* @soundmonster
-* @wdtamagi
-
-[^1]: The diaeresis (/daɪˈɛrəsɪs, -ˈɪər-/ dy-ERR-ə-sis, -⁠EER-; also known as the trema) and the umlaut (/ˈʊmlaʊt/) are two different diacritical marks that (in modern usage) look alike. They both consist of two dots ¨ placed over a letter, usually a vowel; when that letter is an i or a j, the diacritic replaces the tittle: ï. In computer systems, both forms have the same code point (binary code). Their appearance in print or on screen may vary between typefaces but rarely within the same typeface. The "diaeresis" diacritic is used to mark the separation of two distinct vowels in adjacent syllables when an instance of diaeresis (or hiatus) occurs, so as to distinguish from a digraph or diphthong.
-The "umlaut" diacritic, in contrast, indicates a sound shift phenomenon – also known as umlaut – in which a back vowel becomes a front vowel.
-Neither of these phenomena occur in English, except in loanwords (like naïve) or for stylistic reasons (as in the Brontë family or Mötley Crüe).
-
-[^2]: Open Mission Control.
-
-[^3]: Bring up the screenshot toolbar.
-
-[^4]: Opens emoji dialog box.
-
-[^5]: Decrease display brightness.
-
-[^6]: Increase display brightness.
-
-[^7]: Launchpad.
-
-[^8]: Macro "CEDILLA".
-
-[^9]: Macro "AO".
-
-[^10]: Macro "ASPAS".
diff --git a/keyboards/crkbd/keymaps/bermeo/rules.mk b/keyboards/crkbd/keymaps/bermeo/rules.mk
deleted file mode 100644
index 369b90ce380..00000000000
--- a/keyboards/crkbd/keymaps/bermeo/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-RGBLIGHT_ENABLE    = no
-RGB_MATRIX_ENABLE  = yes
-MOUSEKEY_ENABLE    = no
-NKRO_ENABLE        = no
-OLED_ENABLE        = yes
-LTO_ENABLE         = yes
-SLEEP_LED_ENABLE   = yes
-WPM_ENABLE         = yes
-
-
-#Dont use
-CONSOLE_ENABLE     = no
-MOUSEKEY_ENABLE    = no
-BOOTMAGIC_ENABLE   = no
-COMBO_ENABLE	   = no
-AUDIO_ENABLE	   = no
-MIDI_ENABLE		   = no
-BLUETOOTH_ENABLE   = no
diff --git a/keyboards/crkbd/keymaps/blipson/blipsonfont.c b/keyboards/crkbd/keymaps/blipson/blipsonfont.c
deleted file mode 100644
index 48f8de2c2e7..00000000000
--- a/keyboards/crkbd/keymaps/blipson/blipsonfont.c
+++ /dev/null
@@ -1,232 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-const unsigned char font[] PROGMEM = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-  0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-  0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-  0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-  0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-  0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-  0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-  0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-  0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-  0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-  0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-  0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-  0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-  0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-  0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-  0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-  0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-  0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-  0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-  0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-  0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-  0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-  0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-  0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-  0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-  0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-  0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-  0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-  0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-  0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-  0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-  0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-  0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-  0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-  0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-  0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-  0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-  0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-  0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-  0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-  0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-  0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-  0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-  0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-  0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-  0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-  0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-  0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-  0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-  0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-  0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-  0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-  0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-  0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-  0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-  0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-  0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-  0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-  0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-  0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-  0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-  0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-  0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-  0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-  0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-  0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-  0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-  0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-  0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-  0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-  0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-  0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-  0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-  0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-  0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-  0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-  0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-  0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-  0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-  0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-  0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-  0x18, 0x24, 0x24, 0x1C, 0x18, 0x00,
-  0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-  0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-  0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-  0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-  0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-  0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-  0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-  0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-  0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-  0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-  0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-  0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-  0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-  0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-  0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-  0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-  0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-  0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-  0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-  0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xE0, 0xE0, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xFC, 0xFC,
-  0xFC, 0xFC, 0xFC, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0xC0, 0xC0, 0x00, 0x00, 0x80,
-  0xC0, 0xE0, 0x60, 0x60, 0xE0, 0xC0,
-  0x80, 0x00, 0x00, 0x80, 0xC0, 0xC0,
-  0xC0, 0x80, 0x00, 0x00, 0x00, 0x00,
-  0x80, 0xC0, 0xC0, 0xC0, 0x80, 0x00,
-  0x00, 0x00, 0xC0, 0x80, 0xC0, 0xC0,
-  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,
-  0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-  0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
-  0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
-  0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
-  0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
-  0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
-  0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
-  0xDE, 0xD7, 0xDC, 0x00, 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,
-  0xFF, 0xFF, 0x30, 0x18, 0x18, 0x38,
-  0xF0, 0xE0, 0x00, 0x00, 0xFF, 0xFF,
-  0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0xFE, 0xFE, 0x00, 0x00, 0xFF,
-  0xFF, 0x18, 0x30, 0x30, 0x38, 0x1F,
-  0x0F, 0x00, 0x8F, 0x1F, 0x38, 0x30,
-  0x70, 0xE3, 0xC7, 0x00, 0x00, 0xFF,
-  0xFF, 0x01, 0x00, 0x01, 0xFF, 0xFF,
-  0x00, 0x00, 0xFF, 0xFF, 0x01, 0x00,
-  0x01, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  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, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
-  0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
-  0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
-  0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
-  0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
-  0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
-  0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
-  0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x03, 0x07, 0x0E, 0x0C, 0x0C, 0x0E,
-  0x07, 0x03, 0x00, 0x00, 0x0F, 0x0F,
-  0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
-  0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00,
-  0x00, 0x0F, 0x0F, 0x00, 0x00, 0x3F,
-  0x3F, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x03, 0x07, 0x0C, 0x0C,
-  0x0E, 0x07, 0x03, 0x00, 0x00, 0x03,
-  0x07, 0x0E, 0x0C, 0x0E, 0x07, 0x03,
-  0x00, 0x00, 0x0F, 0x0F, 0x00, 0x00,
-  0x00, 0x0F, 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, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/keyboards/crkbd/keymaps/blipson/config.h b/keyboards/crkbd/keymaps/blipson/config.h
deleted file mode 100644
index ca69ac3873f..00000000000
--- a/keyboards/crkbd/keymaps/blipson/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2015 Jack Humbert
-Copyright 2020 Ben Lipson <ben.j.lipson@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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-    #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 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-#define OLED_FONT_H "keyboards/crkbd/keymaps/blipson/blipsonfont.c"
-#define SPLIT_LAYER_STATE_ENABLE
diff --git a/keyboards/crkbd/keymaps/blipson/keymap.c b/keyboards/crkbd/keymaps/blipson/keymap.c
deleted file mode 100644
index 53f45eaeb6d..00000000000
--- a/keyboards/crkbd/keymaps/blipson/keymap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Ben Lipson <ben.j.lipson@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_split_3x6_3(
-   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,  KC_BSPC,
-   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       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,  KC_RSFT,
-   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                           MO(1),  KC_LGUI, KC_SPC,     KC_SPC,  KC_RALT, MO(2)
-                                       //`--------------------------'  `--------------------------'
-
-   ),
-
-   [1] = LAYOUT_split_3x6_3(
-   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_GRV,  KC_EXLM, KC_AT,  KC_HASH,  KC_DLR,  KC_PERC,                     KC_CIRC, KC_AMPR, KC_UP,   KC_LPRN, KC_RPRN, KC_BSLS,
-   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                     XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, KC_ENT,
-   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                     KC_INS,  KC_END,  KC_HOME, KC_PGDN,  KC_PGUP, KC_RSFT,
-   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                           _______, KC_LGUI, KC_SPC,    KC_SPC,  KC_RALT,  MO(3)
-                                       //`--------------------------'  `--------------------------'
-   ),
-
-   [2] = LAYOUT_split_3x6_3(
-   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_LCTL, KC_ASTR, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_BSLS, KC_PIPE, KC_UNDS, KC_EQL,  KC_LBRC, KC_RBRC,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                           MO(3),  KC_LGUI,  KC_SPC,    KC_SPC, KC_RALT, _______
-                                       //`--------------------------'  `--------------------------'
-   ),
-
-   [3] = LAYOUT_split_3x6_3(
-   //,-------------------------------------------------------------------------------.                    ,------------------------------------------------------------------.
-       KC_ESC,    KC_F1,       KC_F2,         KC_F3,          KC_F4,     KC_F5,                            KC_F6,       KC_F7,       KC_F8,       KC_F9,   KC_F10,  QK_BOOT,
-   //|----------+------------+--------------+---------------+-----------+------------|                    |------------+------------+------------+--------+--------+---------|
-       KC_LCTL,   A(KC_F12),   A(G(KC_LEFT)), A(G(KC_RIGHT)), S(KC_F6),  C(S(KC_D)),                       C(S(KC_R)),  G(KC_LBRC),  G(KC_RBRC),  KC_F11,  KC_F12, KC_MPLY,
-   //|----------+------------+--------------+---------------+-----------+------------|                    |------------+------------+------------+--------+--------+---------|
-       G(KC_F2), A(G(KC_F)),  KC_MUTE,       KC_VOLD,         KC_VOLU,   G(KC_GRV),                        C(G(KC_G)),  KC_TAB,      S(KC_TAB),   KC_BRID, KC_BRIU, KC_CAPS,
-   //|----------+------------+--------------+---------------+-----------+------------+--------|  |--------+------------+------------+------------+--------+--------+---------|
-                                                             _______,    KC_LGUI,     KC_SPC,     KC_SPC,   KC_RALT,     _______
-                                                         //`----------------------------------'  `-------------------------------'
-   )
- };
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_left()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-#define L_BASE 0
-#define L_LOWER 2
-#define L_RAISE 4
-#define L_ADJUST 8
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("Default"), false);
-            break;
-        case L_LOWER:
-            oled_write_ln_P(PSTR("Lower"), false);
-            break;
-        case L_RAISE:
-            oled_write_ln_P(PSTR("Raise"), false);
-            break;
-        case L_ADJUST:
-        case L_ADJUST|L_LOWER:
-        case L_ADJUST|L_RAISE:
-        case L_ADJUST|L_LOWER|L_RAISE:
-            oled_write_ln_P(PSTR("Adjust"), false);
-            break;
-    }
-    oled_write_P(PSTR("I love Marce"), false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/blipson/readme.md b/keyboards/crkbd/keymaps/blipson/readme.md
deleted file mode 100644
index 5dfb926bc64..00000000000
--- a/keyboards/crkbd/keymaps/blipson/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# bLipson
-a keymap for the CRKBD/Corne geared towards professional software development on MacOS.
-
-#### Meant for use with the following tools:
-
-- [Intellij IDEA](https://www.jetbrains.com/idea/)
-- [Rectangle](https://rectangleapp.com/)
-
-## Building
-`make crkbd:blipson`
diff --git a/keyboards/crkbd/keymaps/blipson/rules.mk b/keyboards/crkbd/keymaps/blipson/rules.mk
deleted file mode 100644
index 5cad39dbd20..00000000000
--- a/keyboards/crkbd/keymaps/blipson/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-OLED_ENABLE = yes
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/crkbd/keymaps/colemad/config.h b/keyboards/crkbd/keymaps/colemad/config.h
deleted file mode 100644
index f23a3a4177f..00000000000
--- a/keyboards/crkbd/keymaps/colemad/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define SPLIT_USB_DETECT // Added for Elite-C to work
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-    #define RGB_MATRIX_LED_FLUSH_LIMIT 16
-    #define RGB_MATRIX_HUE_STEP 8
-    #define RGB_MATRIX_SAT_STEP 8
-    #define RGB_MATRIX_VAL_STEP 5
-    #define RGB_MATRIX_SPD_STEP 10
-    
-    // Effects
-    #define ENABLE_RGB_MATRIX_BREATHING
-#endif 
-
-#ifdef OLED_ENABLE
-    #define SPLIT_LAYER_STATE_ENABLE
-    #define SPLIT_LED_STATE_ENABLE
-    #define SPLIT_MODS_ENABLE
-    #define SPLIT_OLED_ENABLE
-    #define OLED_TIMEOUT 60000
-    #define OLED_FONT_H "keyboards/crkbd/keymaps/colemad/glcdfont.c"
-#endif
diff --git a/keyboards/crkbd/keymaps/colemad/glcdfont.c b/keyboards/crkbd/keymaps/colemad/glcdfont.c
deleted file mode 100644
index 3bf950e1626..00000000000
--- a/keyboards/crkbd/keymaps/colemad/glcdfont.c
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "progmem.h"
-
-// Corne 8x6 font with QMK Firmware Logo
-// Online editor: https://helixfonteditor.netlify.com/
-// See also: https://github.com/soundmonster/glcdfont_converter
-
-const unsigned char font[] PROGMEM = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-  0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-  0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-  0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-  0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-  0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-  0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-  0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-  0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-  0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-  0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-  0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-  0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-  0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-  0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-  0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-  0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-  0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-  0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-  0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-  0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-  0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-  0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-  0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-  0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-  0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-  0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-  0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-  0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-  0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-  0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-  0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-  0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-  0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-  0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-  0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-  0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-  0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-  0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-  0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-  0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-  0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-  0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-  0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-  0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-  0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-  0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-  0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-  0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-  0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-  0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-  0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-  0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-  0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-  0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-  0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-  0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-  0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-  0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-  0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-  0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-  0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-  0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-  0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-  0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-  0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-  0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-  0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-  0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-  0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-  0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-  0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-  0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-  0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-  0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-  0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-  0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-  0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-  0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-  0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-  0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-  0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-  0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-  0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-  0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-  0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-  0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-  0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-  0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-  0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-  0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-  0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-  0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-  0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-  0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-  0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-  0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-  0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-  0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-  0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-  0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-  0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8,
-  0xF8, 0x18, 0x00, 0xC0, 0xF0, 0xFC,
-  0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-  0xFF, 0xFF, 0x7E, 0x00, 0x00, 0x00,
-  0xF8, 0xFC, 0x06, 0x03, 0x83, 0x43,
-  0x23, 0x13, 0x23, 0x43, 0x83, 0x03,
-  0x06, 0xFC, 0x00, 0x00, 0x00, 0x00,
-  0xF8, 0xFC, 0x06, 0x03, 0xE3, 0x23,
-  0x23, 0x03, 0x23, 0xE3, 0x23, 0x03,
-  0xE3, 0xA3, 0x63, 0x03, 0xE3, 0x03,
-  0x03, 0x03, 0x06, 0xFC, 0x00, 0x00,
-  0xF8, 0xFC, 0x06, 0x03, 0xC3, 0x23,
-  0x23, 0xC3, 0x03, 0x43, 0xA3, 0x23,
-  0x43, 0x03, 0x06, 0xFC, 0x00, 0x00,
-  0xF8, 0xFC, 0x06, 0x03, 0xE3, 0xA3,
-  0xE3, 0x03, 0xE3, 0x03, 0x83, 0xE3,
-  0x83, 0x03, 0x06, 0xFC, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-  0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-  0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-  0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-  0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
-  0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
-  0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-  0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-  0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-  0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
-  0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
-  0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
-  0x00, 0xF8, 0xFC, 0xFE, 0xFF, 0xE0,
-  0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-  0xFF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
-  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F,
-  0x07, 0x01, 0x00, 0x00, 0x00, 0x00,
-  0x1F, 0x3F, 0x60, 0x41, 0x41, 0x4F,
-  0x48, 0x48, 0x48, 0x4F, 0x41, 0x41,
-  0x20, 0x1F, 0x00, 0x00, 0x00, 0x00,
-  0x1F, 0x3F, 0x60, 0x40, 0x47, 0x44,
-  0x44, 0x40, 0x40, 0x47, 0x40, 0x40,
-  0x47, 0x40, 0x47, 0x40, 0x47, 0x44,
-  0x44, 0x40, 0x20, 0x1F, 0x00, 0x00,
-  0x1F, 0x3F, 0x60, 0x40, 0x43, 0x44,
-  0x44, 0x43, 0x40, 0x42, 0x44, 0x45,
-  0x42, 0x40, 0x20, 0x1F, 0x00, 0x00,
-  0x1F, 0x3F, 0x60, 0x40, 0x47, 0x40,
-  0x47, 0x40, 0x47, 0x44, 0x40, 0x47,
-  0x44, 0x40, 0x20, 0x1F, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
-  0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
-  0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
-  0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
-  0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
-  0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
-  0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
-  0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
-  0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
-  0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
-  0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
-  0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
-  0x00, 0x03, 0x0F, 0x1F, 0x3F, 0x3F,
-  0x3F, 0x3F, 0x1F, 0x1F, 0x3F, 0x3F,
-  0x7F, 0x7F, 0x7F, 0x3F, 0x3F, 0x1F,
-  0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7C,
-  0x78, 0x78, 0x38, 0x1C, 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,
-  0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-  0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-  0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-  0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-  0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-  0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-  0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
-  0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
-  0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
-  0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
-  0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
-  0x03, 0x02, 0x01, 0x01, 0x00, 0x00,
-};
diff --git a/keyboards/crkbd/keymaps/colemad/keycodes.h b/keyboards/crkbd/keymaps/colemad/keycodes.h
deleted file mode 100644
index 0f75dabef6a..00000000000
--- a/keyboards/crkbd/keymaps/colemad/keycodes.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include QMK_KEYBOARD_H
-#include "layers.h"
-
-/* Tap-Hold keycodes */
-#define KC_LOWER LT(_LOWER, KC_ENT) /* Tap for Enter, Hold for LOWER layer */
-#define KC_RAISE LT(_RAISE, KC_SPC) /* Tap for Space, Hold for RAISE layer */
-
-/* Tap Dance keycodes */
-#if defined(TAP_DANCE_ENABLE)
-    #include "tap_dances.h"
-    #define KC_T_SFT T_SFT /* Single tap for Shift, Double tap for CAPS Lock */
-#else
-    #define KC_T_SFT KC_LSFT
-#endif
-
-/* Macros */
-enum custom_keycodes {
-    VSCTERM = QK_USER,
-    CHNLANG 
-};
diff --git a/keyboards/crkbd/keymaps/colemad/keymap.c b/keyboards/crkbd/keymaps/colemad/keymap.c
deleted file mode 100644
index 888499f5a2d..00000000000
--- a/keyboards/crkbd/keymaps/colemad/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-
-#include "layers.h"
-#include "keycodes.h"
-#include "process_records.h"
-
-#ifdef OLED_ENABLE
-    #include "oled.h"
-#endif
-
-/* Layer keymaps */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_COLEMAK] = LAYOUT(
-    //,-----------------------------------------------------.       ,-----------------------------------------------------.
-         KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,            KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_BSLS,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-        KC_BSPC,    KC_A,    KC_R,    KC_S,    KC_T,    KC_D,            KC_H,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-          T_SFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,            KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ESC,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-                                   KC_LALT, KC_LCTL,KC_RAISE,        KC_LOWER,   T_SFT, KC_LGUI
-    //                            `-------------------------'       `--------------------------'
-    ),
-
-    [_LOWER] = LAYOUT(
-    //,-----------------------------------------------------.       ,-----------------------------------------------------.
-        _______,    KC_0,    KC_1,    KC_2,    KC_3, KC_MINS,         KC_PGUP, KC_HOME,   KC_UP,  KC_END,  KC_ESC, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-        _______, KC_SLSH,    KC_4,    KC_5,    KC_6, KC_PLUS,         KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT,  KC_DEL, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-        _______, KC_ASTR,    KC_7,    KC_8,    KC_9,  KC_EQL,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-                                   _______, _______, _______,         _______, _______, _______
-    //                            `-------------------------'       `--------------------------'
-    ),
-
-    [_RAISE] = LAYOUT(
-    //,-----------------------------------------------------.       ,-----------------------------------------------------.
-        _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_F11,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-        _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,          KC_GRV, KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC,  KC_F12,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-        _______,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,         KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-                                   _______, _______, _______,         _______, _______, _______
-    //                            `-------------------------'       `--------------------------'
-    ),
-
-    [_ADJUST] = LAYOUT(
-    //,-----------------------------------------------------.       ,-----------------------------------------------------.
-        XXXXXXX, XXXXXXX,  KC_F13,  KC_F14,  KC_F15, XXXXXXX,         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-        XXXXXXX,  KC_F16,  KC_F17,  KC_F18,  KC_F19, XXXXXXX,         XXXXXXX,RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD,
-    //|--------+--------+--------+--------+--------+--------|       |--------+--------+--------+--------+--------+--------|
-        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);
-}
diff --git a/keyboards/crkbd/keymaps/colemad/layers.h b/keyboards/crkbd/keymaps/colemad/layers.h
deleted file mode 100644
index f569ad156ed..00000000000
--- a/keyboards/crkbd/keymaps/colemad/layers.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-enum custom_layers {
-    _COLEMAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
diff --git a/keyboards/crkbd/keymaps/colemad/oled.c b/keyboards/crkbd/keymaps/colemad/oled.c
deleted file mode 100644
index 8c5591184e9..00000000000
--- a/keyboards/crkbd/keymaps/colemad/oled.c
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-#include "layers.h"
-#include "oled.h"
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-void render_layer_symbol(void) {
-    static const char PROGMEM default_layer[] = {
-        0x20, 0x94, 0x95, 0x96, 0x20,
-        0x20, 0xb4, 0xb5, 0xb6, 0x20,
-        0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
-    static const char PROGMEM raise_layer[] = {
-        0x20, 0x97, 0x98, 0x99, 0x20,
-        0x20, 0xb7, 0xb8, 0xb9, 0x20,
-        0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
-    static const char PROGMEM lower_layer[] = {
-        0x20, 0x9a, 0x9b, 0x9c, 0x20,
-        0x20, 0xba, 0xbb, 0xbc, 0x20,
-        0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
-    static const char PROGMEM adjust_layer[] = {
-        0x20, 0x9d, 0x9e, 0x9f, 0x20,
-        0x20, 0xbd, 0xbe, 0xbf, 0x20,
-        0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
-    if(layer_state_is(_ADJUST)) {
-        oled_write_P(adjust_layer, false);
-    } else if(layer_state_is(_LOWER)) {
-        oled_write_P(lower_layer, false);
-    } else if(layer_state_is(_RAISE)) {
-        oled_write_P(raise_layer, false);
-    } else {
-        oled_write_P(default_layer, false);
-    }
-}
-
-void render_layer_name(void) {
-    bool lower = layer_state_is(_LOWER) & !layer_state_is(_ADJUST);
-    bool raise = layer_state_is(_RAISE) & !layer_state_is(_ADJUST);
-    bool adjust = layer_state_is(_ADJUST);
-
-    if(lower){ 
-        oled_write_P(PSTR("LOWER"), false);
-    } else if(raise){ 
-        oled_write_P(PSTR("RAISE"), false);
-    } else if(adjust){ 
-        oled_write_P(PSTR(" ADJ "), false);
-    } else { 
-        oled_write_P(PSTR("     "), false); 
-    }
-}
-
-void render_mod_state(uint8_t modifiers) {
-    static const char PROGMEM shift_line_1[] = {
-        0x85, 0x86, 0x87, 0};
-    static const char PROGMEM shift_line_2[] = {
-        0xa5, 0xa6, 0xa7, 0};
-
-    static const char PROGMEM ctrl_line_1[] = {
-        0x88, 0x89, 0x8a, 0x8b, 0};
-    static const char PROGMEM ctrl_line_2[] = {
-        0xa8, 0xa9, 0xaa, 0xab, 0};
-
-    static const char PROGMEM os_line_1[] = {
-        0x8c, 0x8d, 0x8e, 0};
-    static const char PROGMEM os_line_2[] = {
-        0xac, 0xad, 0xae, 0};
-
-    static const char PROGMEM alt_line_1[] = {
-        0x8f, 0x90, 0x91, 0};
-    static const char PROGMEM alt_line_2[] = {
-        0xaf, 0xb0, 0xb1, 0};
-    
-    if (modifiers & MOD_MASK_GUI) {
-        oled_write(" ", false);
-        oled_write_ln_P(os_line_1, false);
-        oled_write(" ", false);
-        oled_write_ln_P(os_line_2, false);
-    } else {
-        oled_write_ln("", false);
-        oled_write_ln("", false);
-    }
-
-    if (modifiers & MOD_MASK_SHIFT) {
-        oled_write(" ", false);
-        oled_write_ln_P(shift_line_1, false);
-        oled_write(" ", false);
-        oled_write_ln_P(shift_line_2, false);
-    } else {
-        oled_write_ln("", false);
-        oled_write_ln("", false);
-    }
-
-    if (modifiers & MOD_MASK_ALT) {
-        oled_write(" ", false);
-        oled_write_ln_P(alt_line_1, false);
-        oled_write(" ", false);
-        oled_write_ln_P(alt_line_2, false);
-    } else {
-        oled_write_ln("", false);
-        oled_write_ln("", false);
-    }
-
-    if (modifiers & MOD_MASK_CTRL) {
-        oled_write_ln_P(ctrl_line_1, false);
-        oled_write_ln_P(ctrl_line_2, false);
-    } else {
-        oled_write_ln("", false);
-        oled_write_ln("", false);
-    }
-}
-
-void render_status(void){
-    render_layer_name();
-
-    render_layer_symbol();
-    
-    oled_write_P(PSTR("\n\n\n"), false);
-    
-    render_mod_state(get_mods()|get_oneshot_mods());
-}
-
-bool oled_task_user(void) {
-    render_status();
-    return false;
-}
diff --git a/keyboards/crkbd/keymaps/colemad/oled.h b/keyboards/crkbd/keymaps/colemad/oled.h
deleted file mode 100644
index c096466e713..00000000000
--- a/keyboards/crkbd/keymaps/colemad/oled.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#ifdef OLED_ENABLE
-    bool process_record_oled(uint16_t keycode, keyrecord_t *record);
-    oled_rotation_t oled_init_user(oled_rotation_t rotation);
-    void render_layer_symbol(void);
-    void render_layer_name(void);
-    void render_mod_state(uint8_t modifiers);
-    void render_status(void);
-    bool oled_task_user(void);
-#endif
\ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/colemad/process_records.c b/keyboards/crkbd/keymaps/colemad/process_records.c
deleted file mode 100644
index 549dec24644..00000000000
--- a/keyboards/crkbd/keymaps/colemad/process_records.c
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "layers.h"
-#include "keycodes.h"
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    /* Macros */
-    switch (keycode) {
-        case VSCTERM:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCTL("`")); // Ctrl + ` (to toggle vscode terminal)
-            }
-            return false;
-        case CHNLANG:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCTL(SS_LSFT("n"))); // Ctrl + Shift + N (to change keyboard layout)
-            }
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/crkbd/keymaps/colemad/process_records.h b/keyboards/crkbd/keymaps/colemad/process_records.h
deleted file mode 100644
index 7cedcfbe685..00000000000
--- a/keyboards/crkbd/keymaps/colemad/process_records.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/crkbd/keymaps/colemad/readme.md b/keyboards/crkbd/keymaps/colemad/readme.md
deleted file mode 100644
index fd216bea36a..00000000000
--- a/keyboards/crkbd/keymaps/colemad/readme.md
+++ /dev/null
@@ -1,122 +0,0 @@
-# **COLEMAD**
-
-Compiled and tested: `July 12, 2023`
-
-## Corne Keyboard (CRKBD) **Colemak** layout by [ACortesDev](https://github.com/ACortesDev)
-
-1. **Ergonomic navigation keys**.
-2. **Symbols where expected to be**.
-3. **Numbers (numpad)**.
-   Using the Telephone/ATM numpad layout. Easier to memorize/visualize as numbers follow *left-to-right, top-to-bottom* order.
-4. **Easy Capital letters**.
-   Added a *CAPS Lock* key because... [There is no *CAPS Lock* key in the Colemak Layout](https://colemak.com/FAQ#Where_is_the_Caps_Lock_key.3F).
-
----
-
-### **Flashing**
-
-~~For *Pro Micro* execute: `sudo make crkbd:colemad:avrdude`~~
-
-~~For *Elite-C* execute: `sudo make crkbd:colemad:dfu`~~
-
-For *Pro Micro* and *Elite-C* run:
-
-```sh
-qmk flash -kb crkbd -km colemad -bl dfu
-```
-
----
-
-### **Layers**
-
-#### 0. **COLEMAK**
-
-Notes:
-
-- Double tap Shift to (de)activate CAPS Lock.
-- Hold down the Enter thumb key to switch to the LOWER layer
-- Hold down the Space thumb key to switch to the RAISE layer
-- Characters  **"**  **:**  **|**  **<**  **>**  **?** as you would expect them using *Shift*.
-
-```text
-  ,-----------------------------------------------------.      ,-----------------------------------------------------.
-  |    Tab |      Q |      W |      F |      P |      G |      |      J |      L |      U |      Y |      ; |      \ |
-  |--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------|
-  | BackSP |      A |      R |      S |      T |      D |      |      H |      N |      E |      I |      O |      ' |
-  |--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------|
-  |  Shift |      Z |      X |      C |      V |      B |      |      K |      M |      , |      . |      / |    ESC |
-  `--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------'
-                                               ,--------.      ,--------.
-                             ,-----------------|        |      |        |-----------------.
-                             |   Alt  |  Ctrl  |  Space |      | Enter  |  Shift |    GUI |
-                             |        |        | (RAISE)|      |(LOWER) |        |        |
-                             `--------+--------+--------'      `--------+--------+--------'
-```
-
-#### 1. **LOWER**
-
-##### Numpad + Navigation
-
-```text
-  ,-----------------------------------------------------.      ,-----------------------------------------------------.
-  |    Tab |      0 |      1 |      2 |      3 |      - |      |   PgUP |   HOME |      ↑ |    END |    ESC |        |
-  |--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------|
-  | BackSP |      / |      4 |      5 |      6 |      + |      |   PgDN |      ← |      ↓ |      → |    DEL |        |
-  |--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------|
-  |  Shift |      * |      7 |      8 |      9 |      = |      |        |        |        |        |        |    ESC |
-  `--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------'
-                                               ,--------.      ,--------.
-                             ,-----------------|        |      |        |-----------------.
-                             |    Alt |  Ctrl  |  Space |      |        |  Shift |    GUI |
-                             |        |        | (RAISE)|      |(LOWER) |        |        |
-                             `--------+--------+--------'      `--------+--------+--------'
-```
-
-#### 2. **RAISE**
-
-##### Symbols + Function Keys
-
-```text
-  ,-----------------------------------------------------.      ,-----------------------------------------------------.
-  |    Tab |      ! |      @ |      # |      $ |      % |      |      ^ |      & |      * |      ( |      ) |    F11 |
-  |--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------|
-  | BackSP |     F1 |     F2 |     F3 |     F4 |     F5 |      |      ` |      - |      = |      [ |      ] |    F12 |
-  |--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------|
-  |  Shift |     F6 |     F7 |     F8 |     F9 |    F10 |      |      ~ |      _ |      + |      { |      } |    ESC |
-  `--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------'
-                                               ,--------.      ,--------.
-                             ,-----------------|        |      |        |-----------------.
-                             |   Alt  |  Ctrl  |        |      |  Enter |  Shift |    GUI |
-                             |        |        | (RAISE)|      |(LOWER) |        |        |
-                             `--------+--------+--------'      `--------+--------+--------'
-```
-
-#### 3. **ADJUST**
-
-##### Macros + Settings
-
-Notes:
-
-- Function keys (from F13 to F19) to use for Linux/MacOS shortcuts.
-
-```text
-  ,-----------------------------------------------------.      ,-----------------------------------------------------.
-  |        |        |    F13 |    F14 |    F15 |        |      |RGB_TOG |RGB_MOD |RGB_VAI |RGB_HUI |RGB_SAI |RGB_SPI |
-  |--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------|
-  |        |    F16 |    F17 |    F18 |    F19 |        |      |        |RGB_RMOD|RGB_VAD |RGB_HUD |RGB_SAD |RGB_SPD |
-  |--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------|
-  |        |        |        |        |        |        |      |        |        |        |        |        |        |
-  `--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+--------'
-                                               ,--------.      ,--------.
-                             ,-----------------|        |      |        |-----------------.
-                             |        |        |        |      |        |        |        |
-                             |        |        | (RAISE)|      |(LOWER) |        |        |
-                             `--------+--------+--------'      `--------+--------+--------'
-```
-
-##### Ready to use Macro examples
-
-Checkout `keycodes.h` and `process_records.c/h` files.
-
-- Macro **VSCTERM**: Toggles the vscode terminal (Ctrl + `)
-- Macro **CHNLANG**: Changes the OS keyboard layout (Ctrl + Shift + N)
diff --git a/keyboards/crkbd/keymaps/colemad/rules.mk b/keyboards/crkbd/keymaps/colemad/rules.mk
deleted file mode 100644
index 70eb5c33188..00000000000
--- a/keyboards/crkbd/keymaps/colemad/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = no
-SPLIT_KEYBOARD = yes
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE = no
-OLED_ENABLE = yes
-
-
-# Link Time Optimization (Reduces compiled size)
-LTO_ENABLE = yes
-
-SRC += ./process_records.c
-
-ifeq ($(TAP_DANCE_ENABLE),yes)
-	SRC += ./tap_dances.c
-endif
-
-ifeq ($(OLED_ENABLE),yes)
-	SRC += ./oled.c
-endif
diff --git a/keyboards/crkbd/keymaps/colemad/tap_dances.c b/keyboards/crkbd/keymaps/colemad/tap_dances.c
deleted file mode 100644
index c0d83b94d03..00000000000
--- a/keyboards/crkbd/keymaps/colemad/tap_dances.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "tap_dances.h"
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_LSFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
-};
diff --git a/keyboards/crkbd/keymaps/colemad/tap_dances.h b/keyboards/crkbd/keymaps/colemad/tap_dances.h
deleted file mode 100644
index 1d7cf1e7f42..00000000000
--- a/keyboards/crkbd/keymaps/colemad/tap_dances.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-enum custom_tapdances{
-    TD_LSFT_CAPS = 0,
-};
-
-#define T_SFT TD(TD_LSFT_CAPS) /* Tap for Shift, double tap for CAPSLOCK */
diff --git a/keyboards/crkbd/keymaps/colemak_luna/config.h b/keyboards/crkbd/keymaps/colemak_luna/config.h
index 1975c913661..546e01bdba9 100644
--- a/keyboards/crkbd/keymaps/colemak_luna/config.h
+++ b/keyboards/crkbd/keymaps/colemak_luna/config.h
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#   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_SLEEP // turn off effects when suspended
 //#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   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)
diff --git a/keyboards/crkbd/keymaps/crkdves/config.h b/keyboards/crkbd/keymaps/crkdves/config.h
deleted file mode 100644
index 07d930137fb..00000000000
--- a/keyboards/crkbd/keymaps/crkdves/config.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200
-// #define RETRO_TAPPING
-
-#ifdef RGBLIGHT_ENABLE
-    #define RGBLIGHT_SLEEP
-    #define RGBLIGHT_SPLIT
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-
-#ifdef OLED_ENABLE
-#   define SPLIT_LAYER_STATE_ENABLE
-#   define SPLIT_LED_STATE_ENABLE
-#   define SPLIT_MODS_ENABLE
-#   define SPLIT_OLED_ENABLE
-#   define OLED_FONT_H "keyboards/crkbd/keymaps/crkdves/glcdfont.c"
-#   define OLED_TIMEOUT 30000
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash.
-#   define RGB_MATRIX_HUE_STEP 8
-#   define RGB_MATRIX_SAT_STEP 8
-#   define RGB_MATRIX_VAL_STEP 8
-#   define RGB_MATRIX_SPD_STEP 10
-
-/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
- * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-#   define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#   define ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#   define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#   define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#   define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#   define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#   define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#   define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#   define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#   define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#   define ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/crkbd/keymaps/crkdves/glcdfont.c b/keyboards/crkbd/keymaps/crkdves/glcdfont.c
deleted file mode 100644
index 0086a73fe9e..00000000000
--- a/keyboards/crkbd/keymaps/crkdves/glcdfont.c
+++ /dev/null
@@ -1,236 +0,0 @@
-#include "progmem.h"
-
-// Corne 8x6 font with QMK Firmware Logo
-// Online editor: https://helixfonteditor.netlify.com/
-// See also: https://github.com/soundmonster/glcdfont_converter
-
-/* Copyright 2022 Yeimi Alberth (@yeimialberth)
-* This program is free software: you can redistribute it and/or modify it in the hope that it will be useful.
-*/
-
-const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8,
-0xF8, 0x18, 0x00, 0xC0, 0xF0, 0xFC,
-0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0xFF, 0x7E, 0x00, 0x00, 0x00,
-0x00, 0xF8, 0x04, 0x22, 0x52, 0xE2,
-0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
-0x22, 0x22, 0x42, 0x82, 0x02, 0x02,
-0x22, 0x22, 0x02, 0x04, 0xF8, 0x00,
-0x00, 0xF8, 0x04, 0x02, 0x02, 0x82,
-0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
-0x02, 0x82, 0x42, 0x22, 0x12, 0x22,
-0x42, 0x82, 0x02, 0x04, 0xF8, 0x00,
-0x00, 0xF8, 0xFC, 0xDE, 0xAE, 0x1E,
-0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
-0xDE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-0xDE, 0xDE, 0xFE, 0xFC, 0xF8, 0x00,
-0x00, 0xF8, 0xFC, 0xFE, 0xFE, 0x7E,
-0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
-0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
-0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
-0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
-0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
-0x00, 0xF8, 0xFC, 0xFE, 0xFF, 0xE0,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F,
-0x07, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x20, 0x44, 0x4A, 0x47,
-0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
-0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
-0x44, 0x44, 0x40, 0x20, 0x1F, 0x00,
-0x00, 0x1F, 0x20, 0x40, 0x41, 0x40,
-0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
-0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
-0x4F, 0x41, 0x41, 0x20, 0x1F, 0x00,
-0x00, 0x1F, 0x3F, 0x7B, 0x75, 0x78,
-0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
-0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
-0x7B, 0x7B, 0x7F, 0x3F, 0x1F, 0x00,
-0x00, 0x1F, 0x3F, 0x7F, 0x7E, 0x7F,
-0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
-0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
-0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
-0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
-0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
-0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
-0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
-0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
-0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
-0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
-0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
-0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
-0x00, 0x03, 0x0F, 0x1F, 0x3F, 0x3F,
-0x3F, 0x3F, 0x1F, 0x1F, 0x3F, 0x3F,
-0x7F, 0x7F, 0x7F, 0x3F, 0x3F, 0x1F,
-0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7C,
-0x78, 0x78, 0x38, 0x1C, 0x0F, 0x00,
-0x04, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-0x20, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-0xFC, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-0x04, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-0x20, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-0xFC, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-0xFE, 0x7E, 0xBE, 0xDE, 0xEE, 0xDE,
-0xBE, 0x7E, 0xFE, 0xFC, 0xF8, 0x00,
-0x7E, 0x7E, 0x70, 0x77, 0x77, 0x77,
-0x70, 0x7E, 0x7E, 0x3F, 0x1F, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
-0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
-0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
-0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
-0x03, 0x02, 0x01, 0x01, 0x00, 0x00
-};
diff --git a/keyboards/crkbd/keymaps/crkdves/keymap.c b/keyboards/crkbd/keymaps/crkdves/keymap.c
deleted file mode 100644
index 333e47e952b..00000000000
--- a/keyboards/crkbd/keymaps/crkdves/keymap.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "keymap_spanish.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 layers {
-  _DVORAK,
-  _NAVIGATE,
-  _SYMBOLS,
-  _NUMPAD,
-  _ADJUST
-};
-
-// Custom keycodes for layer keys
-// Dual function escape with left command
-#define KC_LGESC LGUI_T(KC_ESC)
-
-enum custom_keycodes {
-  DVORAK = SAFE_RANGE,
-//   LOWER,
-//   RAISE,
-//   ADJUST,
-  RGBRST
-//   KC_RACL // right alt / colon
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-   LT(3,KC_TAB),   ./:  ,   ,/;  ,       Ñ,       P,       Y,                            F,       G,       C,       H,      L ,     BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- LCTL_T(KC_ESC),       A,       O,       E,       U,       I,                            D,       R,       T,       N,       S,       ´ ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      LSFT_T(<),       -,       Q,       J,       K,       X,                            B,       M,       W,       V,       Z, RSFT_T('),
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            WIN/CMD,   MO(1),  KC_SPC,     KC_SPC,   MO(2),    RALT(SUPR)
-                                        //`--------------------------'  `--------------------------'
-
-        */
-    [_DVORAK] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-LT(_NUMPAD,KC_TAB),  ES_DOT, ES_COMM, ES_NTIL,    ES_P,    ES_Y,                         ES_F,    ES_G,    ES_C,    ES_H,    ES_L, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- LCTL_T(KC_ESC),    ES_A,    ES_O,    ES_E,    ES_U,    ES_I,                         ES_D,    ES_R,    ES_T,    ES_N,    ES_S, ES_ACUT,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-LSFT_T(ES_LABK), ES_MINS,    ES_Q,    ES_J,    ES_K,    ES_X,                         ES_B,    ES_M,    ES_W,    ES_V,    ES_Z, RSFT_T(ES_QUOT),
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                       KC_LGUI, LT(_NAVIGATE,KC_CAPS), KC_SPC,     KC_SPC, LT(_SYMBOLS,KC_ENT), RALT_T(KC_DEL)
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    /*
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-         KC_TAB,   z    ,   v    ,   c    , KC_LCTL,        ,                             ,        ,   ↑    ,        ,        ,        ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         KC_ESC,   x    , KC_LSFT, KC_LALT, KC_LGUI,        ,                             ,     ←  ,   ↓    ,  →     ,        ,        ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_BRMU, KC_BRMD, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD,                      KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            WIN/CMD,        ,  KC_SPC,     KC_SPC,   MO(2), KC_DEL
-                                        //`--------------------------'  `--------------------------'
-
-        */
-
-    [_NAVIGATE] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-         KC_TAB,    ES_Z,    ES_V,    ES_C, KC_LCTL, XXXXXXX,                      XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         KC_ESC,    ES_X, KC_LSFT, KC_LALT, KC_LGUI, XXXXXXX,                      XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_BRMU, KC_BRMD, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD,                      KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI, _______,  KC_SPC,     KC_SPC,   MO(_ADJUST), KC_DEL
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    /*
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-                ,    ¡   ,    !   ,    (   ,   )    ,        ,                             ,    =   ,    *   ,    `   ,   ^   , KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-                ,    <   ,    >   ,    {   ,   }    ,        ,                        "    ,   /    ,    +   ,    @   ,   #   ,   º    ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-                ,    ¿   ,    ?   ,    [   ,   ]    ,        ,                             ,   $    ,    &   ,    |   ,   %   ,   \    ,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            WIN/CMD,        ,  KC_SPC,     KC_SPC,        , KC_RALT
-                                        //`--------------------------'  `--------------------------'
-
-        */
-
-    [_SYMBOLS] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        XXXXXXX, ES_IEXL, ES_EXLM, ES_LPRN, ES_RPRN, XXXXXXX,                      XXXXXXX,  ES_EQL, ES_ASTR,  ES_GRV, ES_CIRC, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        XXXXXXX, ES_LABK, ES_RABK, ES_LCBR, ES_RCBR, XXXXXXX,                      ES_DQUO, ES_SLSH, ES_PLUS,   ES_AT, ES_HASH, ES_MORD,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        XXXXXXX, ES_IQUE, ES_QUES, ES_LBRC, ES_RBRC, XXXXXXX,                      XXXXXXX,  ES_DLR, ES_AMPR, ES_PIPE, ES_PERC, ES_BSLS,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI,   MO(_ADJUST),  KC_SPC,     KC_SPC, _______, KC_RALT
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    /*
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-                ,        ,        ,        ,        ,        ,                        +    ,    7   ,    8   ,    9   ,   -   ,        ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-                ,        ,        ,        ,        ,        ,                        *    ,    4   ,    5   ,    6   ,   /   ,        ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-                ,        ,        ,        ,        ,        ,                        .    ,    1   ,    2   ,    3   ,   0   ,        ,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            WIN/CMD,        ,  KC_SPC,     KC_SPC,   MO(2), KC_RALT
-                                        //`--------------------------'  `--------------------------'
-
-        */
-
-    [_NUMPAD] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-         KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      ES_MINS,    ES_7,    ES_8,    ES_9, ES_SLSH, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         KC_ESC, XXXXXXX, KC_LSFT, KC_LALT, KC_LGUI, XXXXXXX,                      ES_PLUS,    ES_4,    ES_5,    ES_6, ES_ASTR, ES_COMM,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       ES_DOT,    ES_1,    ES_2,    ES_3,    ES_0, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI, _______,  KC_SPC,     KC_SPC, _______, KC_RALT
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    [_ADJUST] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-          QK_BOOT,  RGBRST,RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI, _______,  KC_SPC,     KC_SPC, _______, KC_RALT
-                                        //`--------------------------'  `--------------------------'
-    )
-};
-
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
-
-void render_space(void) {
-    oled_write_P(PSTR("     "), false);
-}
-
-void render_mod_status_gui_alt(uint8_t modifiers) {
-    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
-    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
-    static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
-    static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
-
-    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
-    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
-    static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
-    static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_1, false);
-    } else {
-        oled_write_P(gui_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_1, false);
-    } else {
-        oled_write_P(alt_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_2, false);
-    } else {
-        oled_write_P(gui_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_2, false);
-    } else {
-        oled_write_P(alt_off_2, false);
-    }
-}
-
-void render_mod_status_ctrl_shift(uint8_t modifiers) {
-    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
-    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
-    static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
-    static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
-
-    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
-    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
-    static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
-    static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_1, false);
-    } else {
-        oled_write_P(ctrl_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_1, false);
-    } else {
-        oled_write_P(shift_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_2, false);
-    } else {
-        oled_write_P(ctrl_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_2, false);
-    } else {
-        oled_write_P(shift_off_2, false);
-    }
-}
-
-void render_logo(void) {
-    static const char PROGMEM corne_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0};
-    oled_write_P(corne_logo, false);
-    oled_write_P(PSTR("corne"), false);
-}
-
-void render_layer_state(void) {
-    static const char PROGMEM raise_layer[] = {
-        0x20, 0x97, 0x98, 0x99, 0x20,
-        0x20, 0xb7, 0xb8, 0xb9, 0x20,
-        0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
-    static const char PROGMEM navigate_layer[] = {
-        0x20, 0x94, 0x95, 0x96, 0x20,
-        0x20, 0xb4, 0xb5, 0xb6, 0x20,
-        0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
-    static const char PROGMEM lower_layer[] = {
-        0x20, 0x9a, 0x9b, 0x9c, 0x20,
-        0x20, 0xba, 0xbb, 0xbc, 0x20,
-        0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
-    static const char PROGMEM numpad_layer[] = {
-        0x20, 0x9b, 0x9c, 0x94, 0x20,
-        0x20, 0xbb, 0xbc, 0xb4, 0x20,
-        0x20, 0xdb, 0xdc, 0xd4, 0x20, 0};
-    static const char PROGMEM adjust_layer[] = {
-        0x20, 0x9d, 0x9e, 0x9f, 0x20,
-        0x20, 0xbd, 0xbe, 0xbf, 0x20,
-        0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
-    if(layer_state_is(_ADJUST)) {
-        oled_write_P(adjust_layer, false);
-    } else if(layer_state_is(_NAVIGATE)) {
-        oled_write_P(navigate_layer, false);
-    } else if(layer_state_is(_SYMBOLS)) {
-        oled_write_P(lower_layer, false);
-    } else if(layer_state_is(_NUMPAD)) {
-        oled_write_P(numpad_layer, false);
-    } else {
-        oled_write_P(raise_layer, false);
-    }
-}
-
-bool oled_task_user(void) {
-    // Renders the current keyboard state (layers and mods)
-    render_logo();
-    render_space();
-    render_layer_state();
-    render_space();
-    render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
-    render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-    return false;
-}
-
-#endif
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//   static uint16_t my_colon_timer;
-
-  switch (keycode) {
-    /* case LOWER:
-      if (record->event.pressed) {
-        layer_on(_NAVIGATE);
-        update_tri_layer_RGB(_NAVIGATE, _SYMBOLS, _ADJUST);
-      } else {
-        layer_off(_NAVIGATE);
-        update_tri_layer_RGB(_NAVIGATE, _SYMBOLS, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_SYMBOLS);
-        update_tri_layer_RGB(_NAVIGATE, _SYMBOLS, _ADJUST);
-      } else {
-        layer_off(_SYMBOLS);
-        update_tri_layer_RGB(_NAVIGATE, _SYMBOLS, _ADJUST);
-      }
-      return false;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-    case KC_RACL:
-        if (record->event.pressed) {
-          my_colon_timer = timer_read();
-          register_code(KC_RALT);
-        } else {
-          unregister_code(KC_RALT);
-          if (timer_elapsed(my_colon_timer) < TAPPING_TERM) {
-            SEND_STRING(":"); // Change the character(s) to be sent on tap here
-          }
-        }
-        return false; */
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-        }
-      #endif
-      #ifdef RGB_MATRIX_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgb_matrix_default();
-          rgb_matrix_enable();
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
-#endif
diff --git a/keyboards/crkbd/keymaps/crkdves/rules.mk b/keyboards/crkbd/keymaps/crkdves/rules.mk
deleted file mode 100644
index d95e1136bbb..00000000000
--- a/keyboards/crkbd/keymaps/crkdves/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-RGBLIGHT_ENABLE    = no
-RGB_MATRIX_ENABLE  = yes
-MOUSEKEY_ENABLE    = no
-NKRO_ENABLE        = yes
-OLED_ENABLE        = yes
-LTO_ENABLE         = yes
diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h
deleted file mode 100644
index b2209c7e6df..00000000000
--- a/keyboards/crkbd/keymaps/crkqwes/config.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef USE_I2C
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200
-// #define RETRO_TAPPING
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-    #define RGBLED_NUM 27
-#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 RGBLIGHT_SLEEP
-    #define RGBLIGHT_SPLIT
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-
-#ifdef OLED_ENABLE
-#   define SPLIT_LAYER_STATE_ENABLE
-#   define SPLIT_LED_STATE_ENABLE
-#   define SPLIT_MODS_ENABLE
-#   define SPLIT_OLED_ENABLE
-#   define OLED_FONT_H "keyboards/crkbd/keymaps/crkqwes/glcdfont.c"
-#   define OLED_TIMEOUT 30000
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash.
-#   define RGB_MATRIX_HUE_STEP 8
-#   define RGB_MATRIX_SAT_STEP 8
-#   define RGB_MATRIX_VAL_STEP 8
-#   define RGB_MATRIX_SPD_STEP 10
-
-/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
- * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-#   define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#   define ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#   define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#   define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#   define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#   define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#   define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#   define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#   define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#   define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#   define ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/crkbd/keymaps/crkqwes/glcdfont.c b/keyboards/crkbd/keymaps/crkqwes/glcdfont.c
deleted file mode 100644
index 0086a73fe9e..00000000000
--- a/keyboards/crkbd/keymaps/crkqwes/glcdfont.c
+++ /dev/null
@@ -1,236 +0,0 @@
-#include "progmem.h"
-
-// Corne 8x6 font with QMK Firmware Logo
-// Online editor: https://helixfonteditor.netlify.com/
-// See also: https://github.com/soundmonster/glcdfont_converter
-
-/* Copyright 2022 Yeimi Alberth (@yeimialberth)
-* This program is free software: you can redistribute it and/or modify it in the hope that it will be useful.
-*/
-
-const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8,
-0xF8, 0x18, 0x00, 0xC0, 0xF0, 0xFC,
-0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0xFF, 0x7E, 0x00, 0x00, 0x00,
-0x00, 0xF8, 0x04, 0x22, 0x52, 0xE2,
-0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
-0x22, 0x22, 0x42, 0x82, 0x02, 0x02,
-0x22, 0x22, 0x02, 0x04, 0xF8, 0x00,
-0x00, 0xF8, 0x04, 0x02, 0x02, 0x82,
-0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
-0x02, 0x82, 0x42, 0x22, 0x12, 0x22,
-0x42, 0x82, 0x02, 0x04, 0xF8, 0x00,
-0x00, 0xF8, 0xFC, 0xDE, 0xAE, 0x1E,
-0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
-0xDE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-0xDE, 0xDE, 0xFE, 0xFC, 0xF8, 0x00,
-0x00, 0xF8, 0xFC, 0xFE, 0xFE, 0x7E,
-0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
-0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
-0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
-0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
-0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
-0x00, 0xF8, 0xFC, 0xFE, 0xFF, 0xE0,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F,
-0x07, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x20, 0x44, 0x4A, 0x47,
-0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
-0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
-0x44, 0x44, 0x40, 0x20, 0x1F, 0x00,
-0x00, 0x1F, 0x20, 0x40, 0x41, 0x40,
-0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
-0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
-0x4F, 0x41, 0x41, 0x20, 0x1F, 0x00,
-0x00, 0x1F, 0x3F, 0x7B, 0x75, 0x78,
-0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
-0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
-0x7B, 0x7B, 0x7F, 0x3F, 0x1F, 0x00,
-0x00, 0x1F, 0x3F, 0x7F, 0x7E, 0x7F,
-0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
-0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
-0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
-0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
-0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
-0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
-0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
-0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
-0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
-0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
-0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
-0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
-0x00, 0x03, 0x0F, 0x1F, 0x3F, 0x3F,
-0x3F, 0x3F, 0x1F, 0x1F, 0x3F, 0x3F,
-0x7F, 0x7F, 0x7F, 0x3F, 0x3F, 0x1F,
-0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7C,
-0x78, 0x78, 0x38, 0x1C, 0x0F, 0x00,
-0x04, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-0x20, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-0xFC, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-0x04, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-0x20, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-0xFC, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-0xFE, 0x7E, 0xBE, 0xDE, 0xEE, 0xDE,
-0xBE, 0x7E, 0xFE, 0xFC, 0xF8, 0x00,
-0x7E, 0x7E, 0x70, 0x77, 0x77, 0x77,
-0x70, 0x7E, 0x7E, 0x3F, 0x1F, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
-0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
-0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
-0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
-0x03, 0x02, 0x01, 0x01, 0x00, 0x00
-};
diff --git a/keyboards/crkbd/keymaps/crkqwes/keymap.c b/keyboards/crkbd/keymaps/crkqwes/keymap.c
deleted file mode 100644
index 817935d0b31..00000000000
--- a/keyboards/crkbd/keymaps/crkqwes/keymap.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "keymap_spanish.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 layers {
-  _QWERTY,
-  _NAVIGATE,
-  _SYMBOLS,
-  _NUMPAD,
-  _ADJUST
-};
-
-// Custom keycodes for layer keys
-// Dual function escape with left command
-#define KC_LGESC LGUI_T(KC_ESC)
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-//   LOWER,
-//   RAISE,
-//   ADJUST,
-  RGBRST
-//   KC_RACL // right alt / colon
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-   LT(3,KC_TAB),       Q,       W,       E,       R,       T,                            Y,       U,       I,       O,       P,    BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- LCTL_T(KC_ESC),       A,       S,       D,       F,       G,                            H,       J,       K,       L,       Ñ,      ´ ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      LSFT_T(<),       Z,       X,       C,       V,       B,                            N,       M,    ,/; ,    ./: ,    -/_ , RSFT_T('),
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            WIN/CMD,   MO(1),  KC_SPC,     KC_SPC,   MO(2),    RALT(SUPR)
-                                        //`--------------------------'  `--------------------------'
-
-        */
-    [_QWERTY] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-LT(_NUMPAD,KC_TAB),    ES_Q,    ES_W,    ES_E,    ES_R,    ES_T,                         ES_Y,    ES_U,    ES_I,    ES_O,    ES_P, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- LCTL_T(KC_ESC),    ES_A,    ES_S,    ES_D,    ES_F,    ES_G,                         ES_H,    ES_J,    ES_K,    ES_L, ES_NTIL, ES_ACUT,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-LSFT_T(ES_LABK),    ES_Z,    ES_X,    ES_C,    ES_V,    ES_B,                         ES_N,    ES_M, ES_COMM,  ES_DOT, ES_MINS, RSFT_T(ES_QUOT),
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                       KC_LGUI, LT(_NAVIGATE,KC_CAPS), KC_SPC,     KC_SPC, LT(_SYMBOLS,KC_ENT), RALT_T(KC_DEL)
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    /*
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-         KC_TAB,   z    ,   v    ,   c    , KC_LCTL,        ,                             ,        ,   ↑    ,        ,        ,        ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         KC_ESC,   x    , KC_LSFT, KC_LALT, KC_LGUI,        ,                             ,     ←  ,   ↓    ,  →     ,        ,        ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_BRMU, KC_BRMD, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD,                      KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            WIN/CMD,        ,  KC_SPC,     KC_SPC,   MO(2), KC_DEL
-                                        //`--------------------------'  `--------------------------'
-
-        */
-
-    [_NAVIGATE] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-         KC_TAB,    ES_X,    ES_V,    ES_C, KC_LCTL, XXXXXXX,                      XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         KC_ESC,    ES_Z, KC_LSFT, KC_LALT, KC_LGUI, XXXXXXX,                      XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        KC_BRMU, KC_BRMD, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD,                      KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI, _______,  KC_SPC,     KC_SPC,   MO(_ADJUST), KC_DEL
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    /*
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-                ,    ¡   ,    !   ,    (   ,   )    ,        ,                             ,    =   ,    *   ,    `   ,   ^   , KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-                ,    <   ,    >   ,    {   ,   }    ,        ,                        "    ,   /    ,    +   ,    @   ,   #   ,   º    ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-                ,    ¿   ,    ?   ,    [   ,   ]    ,        ,                             ,   $    ,    &   ,    |   ,   %   ,   \    ,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            WIN/CMD,        ,  KC_SPC,     KC_SPC,        , KC_RALT
-                                        //`--------------------------'  `--------------------------'
-
-        */
-
-    [_SYMBOLS] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        XXXXXXX, ES_IEXL, ES_EXLM, ES_LPRN, ES_RPRN, XXXXXXX,                      XXXXXXX,  ES_EQL, ES_ASTR,  ES_GRV, ES_CIRC, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        XXXXXXX, ES_LABK, ES_RABK, ES_LCBR, ES_RCBR, XXXXXXX,                      ES_DQUO, ES_SLSH, ES_PLUS,   ES_AT, ES_HASH, ES_MORD,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        XXXXXXX, ES_IQUE, ES_QUES, ES_LBRC, ES_RBRC, XXXXXXX,                      XXXXXXX,  ES_DLR, ES_AMPR, ES_PIPE, ES_PERC, ES_BSLS,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI,   MO(_ADJUST),  KC_SPC,     KC_SPC, _______, KC_RALT
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    /*
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-                ,        ,        ,        ,        ,        ,                        +    ,    7   ,    8   ,    9   ,   -   ,        ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-                ,        ,        ,        ,        ,        ,                        *    ,    4   ,    5   ,    6   ,   /   ,        ,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-                ,        ,        ,        ,        ,        ,                        .    ,    1   ,    2   ,    3   ,   0   ,        ,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            WIN/CMD,        ,  KC_SPC,     KC_SPC,   MO(2), KC_RALT
-                                        //`--------------------------'  `--------------------------'
-
-        */
-
-    [_NUMPAD] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-         KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      ES_MINS,    ES_7,    ES_8,    ES_9, ES_SLSH, KC_BSPC,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         KC_ESC, XXXXXXX, KC_LSFT, KC_LALT, KC_LGUI, XXXXXXX,                      ES_PLUS,    ES_4,    ES_5,    ES_6, ES_ASTR, ES_COMM,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       ES_DOT,    ES_1,    ES_2,    ES_3,    ES_0, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI, _______,  KC_SPC,     KC_SPC, _______, KC_RALT
-                                        //`--------------------------'  `--------------------------'
-    ),
-
-    [_ADJUST] = LAYOUT_split_3x6_3(
-    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-          QK_BOOT,  RGBRST,RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            KC_LGUI, _______,  KC_SPC,     KC_SPC, _______, KC_RALT
-                                        //`--------------------------'  `--------------------------'
-    )
-};
-
-
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
-
-void render_space(void) {
-    oled_write_P(PSTR("     "), false);
-}
-
-void render_mod_status_gui_alt(uint8_t modifiers) {
-    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
-    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
-    static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
-    static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
-
-    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
-    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
-    static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
-    static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_1, false);
-    } else {
-        oled_write_P(gui_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_1, false);
-    } else {
-        oled_write_P(alt_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_2, false);
-    } else {
-        oled_write_P(gui_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_2, false);
-    } else {
-        oled_write_P(alt_off_2, false);
-    }
-}
-
-void render_mod_status_ctrl_shift(uint8_t modifiers) {
-    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
-    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
-    static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
-    static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
-
-    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
-    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
-    static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
-    static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_1, false);
-    } else {
-        oled_write_P(ctrl_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_1, false);
-    } else {
-        oled_write_P(shift_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_2, false);
-    } else {
-        oled_write_P(ctrl_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_2, false);
-    } else {
-        oled_write_P(shift_off_2, false);
-    }
-}
-
-void render_logo(void) {
-    static const char PROGMEM corne_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0};
-    oled_write_P(corne_logo, false);
-    oled_write_P(PSTR("corne"), false);
-}
-
-void render_layer_state(void) {
-    static const char PROGMEM raise_layer[] = {
-        0x20, 0x97, 0x98, 0x99, 0x20,
-        0x20, 0xb7, 0xb8, 0xb9, 0x20,
-        0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
-    static const char PROGMEM navigate_layer[] = {
-        0x20, 0x94, 0x95, 0x96, 0x20,
-        0x20, 0xb4, 0xb5, 0xb6, 0x20,
-        0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
-    static const char PROGMEM lower_layer[] = {
-        0x20, 0x9a, 0x9b, 0x9c, 0x20,
-        0x20, 0xba, 0xbb, 0xbc, 0x20,
-        0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
-    static const char PROGMEM numpad_layer[] = {
-        0x20, 0x9b, 0x9c, 0x94, 0x20,
-        0x20, 0xbb, 0xbc, 0xb4, 0x20,
-        0x20, 0xdb, 0xdc, 0xd4, 0x20, 0};
-    static const char PROGMEM adjust_layer[] = {
-        0x20, 0x9d, 0x9e, 0x9f, 0x20,
-        0x20, 0xbd, 0xbe, 0xbf, 0x20,
-        0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
-    if(layer_state_is(_ADJUST)) {
-        oled_write_P(adjust_layer, false);
-    } else if(layer_state_is(_NAVIGATE)) {
-        oled_write_P(navigate_layer, false);
-    } else if(layer_state_is(_SYMBOLS)) {
-        oled_write_P(lower_layer, false);
-    } else if(layer_state_is(_NUMPAD)) {
-        oled_write_P(numpad_layer, false);
-    } else {
-        oled_write_P(raise_layer, false);
-    }
-}
-
-bool oled_task_user(void) {
-    // Renders the current keyboard state (layers and mods)
-    render_logo();
-    render_space();
-    render_layer_state();
-    render_space();
-    render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
-    render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-    return false;
-}
-
-#endif
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//   static uint16_t my_colon_timer;
-
-  switch (keycode) {
-    /* case LOWER:
-      if (record->event.pressed) {
-        layer_on(_NAVIGATE);
-        update_tri_layer_RGB(_NAVIGATE, _SYMBOLS, _ADJUST);
-      } else {
-        layer_off(_NAVIGATE);
-        update_tri_layer_RGB(_NAVIGATE, _SYMBOLS, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_SYMBOLS);
-        update_tri_layer_RGB(_NAVIGATE, _SYMBOLS, _ADJUST);
-      } else {
-        layer_off(_SYMBOLS);
-        update_tri_layer_RGB(_NAVIGATE, _SYMBOLS, _ADJUST);
-      }
-      return false;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-    case KC_RACL:
-        if (record->event.pressed) {
-          my_colon_timer = timer_read();
-          register_code(KC_RALT);
-        } else {
-          unregister_code(KC_RALT);
-          if (timer_elapsed(my_colon_timer) < TAPPING_TERM) {
-            SEND_STRING(":"); // Change the character(s) to be sent on tap here
-          }
-        }
-        return false; */
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-        }
-      #endif
-      #ifdef RGB_MATRIX_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgb_matrix_default();
-          rgb_matrix_enable();
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
diff --git a/keyboards/crkbd/keymaps/crkqwes/rules.mk b/keyboards/crkbd/keymaps/crkqwes/rules.mk
deleted file mode 100644
index d95e1136bbb..00000000000
--- a/keyboards/crkbd/keymaps/crkqwes/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-RGBLIGHT_ENABLE    = no
-RGB_MATRIX_ENABLE  = yes
-MOUSEKEY_ENABLE    = no
-NKRO_ENABLE        = yes
-OLED_ENABLE        = yes
-LTO_ENABLE         = yes
diff --git a/keyboards/crkbd/keymaps/davidrambo/config.h b/keyboards/crkbd/keymaps/davidrambo/config.h
deleted file mode 100644
index 15ed448caee..00000000000
--- a/keyboards/crkbd/keymaps/davidrambo/config.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define RGBLIGHT_SPLIT
-
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_DEFAULT_HUE 231
-    #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-    #define RGB_MATRIX_TYPING_MEATMAP_DECREASE_DELAY_MS 50
-    // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 100 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-    #define RGB_MATRIX_HUE_STEP 8
-    #define RGB_MATRIX_SAT_STEP 8
-    #define RGB_MATRIX_VAL_STEP 8
-    #define RGB_MATRIX_SPD_STEP 10
-
-// 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
-// #    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
diff --git a/keyboards/crkbd/keymaps/davidrambo/keymap.c b/keyboards/crkbd/keymaps/davidrambo/keymap.c
deleted file mode 100644
index b707192608b..00000000000
--- a/keyboards/crkbd/keymaps/davidrambo/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2021 David Rambo
- *
- * 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 custom_layers {
-    _COLEMAK,
-    _SYMBOL,
-    _NAVIGATION,
-    _FKEYS,
-};
-
-//keycode shorthands
-#define SYM  MO(1)
-#define NAV  LT(2, KC_ESC)
-#define FKEY MO(3)
-
-//aliases for clarity in layering
-#define SftEnt SFT_T(KC_ENT)   // Shift when held, Enter when tapped
-#define BSCTL  LCTL_T(KC_BSPC) // Ctrl when held, Backspace when tapped
-#define CTAB   LCTL(KC_TAB)
-#define ATAB   LALT(KC_TAB)
-
-//aliases for Navigation layer
-#define CBSPC LCTL(KC_BSPC)  // delete whole word
-#define C_CL   LCTL(KC_LEFT) // move cursor one word back
-#define C_CR   LCTL(KC_RGHT) // move cursor one word forward
-
-//internet browser tab shortcuts and window swapping
-#define CTLPGDN LCTL(KC_PGDN)
-#define CTLPGUP LCTL(KC_PGUP)
-
-#define G_GRV   LGUI(KC_GRV)
-#define SftEnt  SFT_T(KC_ENT)
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE,
-  SET_RGB,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_COLEMAK] = LAYOUT(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                        KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      NAV   ,    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,  SftEnt,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT, KC_LGUI,   BSCTL,   KC_SPC,   SYM ,   FKEY
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [_SYMBOL] = LAYOUT(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      KC_LBRC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_RBRC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_BSLS, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL ,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_HOME, KC_END,  _______, _______, _______,                       KC_GRV, KC_MINS, KC_PGUP, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, KC_PGDN
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_NAVIGATION] = LAYOUT(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, _______, _______, _______, _______, _______,                      CTAB ,   C_CL  ,   KC_UP,   C_CR  ,  KC_DEL, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                     CTLPGUP, KC_LEFT , KC_DOWN, KC_RGHT, CTLPGDN, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        QK_BOOT, _______, _______, _______, _______, _______,                      ATAB   , CBSPC , KC_HOME, KC_END,    G_GRV , _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_FKEYS] = LAYOUT(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_F12,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                        KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, RGB_SAI, RGB_HUI, RGB_VAI, RGB_TOG, SET_RGB,                     _______, _______, _______, _______, _______,  _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, RGB_MOD, RGB_M_P, KC_VOLD, KC_VOLU, KC_MPLY,                     _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,     _______, _______, _______
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-void keyboard_post_init_user(void) {
-//    rgb_matrix_sethsv(191, 43, 81);
-    rgblight_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP);
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    switch (keycode) {
-        
-        case SET_RGB:
-            if (record->event.pressed) {
-                rgb_matrix_sethsv_noeeprom(18, 86, 95);
-            }
-            return false;
-            break;
-
-    }
-    return true;
-}
diff --git a/keyboards/crkbd/keymaps/davidrambo/readme.md b/keyboards/crkbd/keymaps/davidrambo/readme.md
deleted file mode 100644
index e8ce162b64e..00000000000
--- a/keyboards/crkbd/keymaps/davidrambo/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-This is my Corne keymap, which uses Colemak and shortcuts for Linux and Windows.
diff --git a/keyboards/crkbd/keymaps/davidrambo/rules.mk b/keyboards/crkbd/keymaps/davidrambo/rules.mk
deleted file mode 100644
index 782b689f420..00000000000
--- a/keyboards/crkbd/keymaps/davidrambo/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = yes
-BOOTLOADER = atmel-dfu
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/README.md b/keyboards/crkbd/keymaps/dsanchezseco/README.md
deleted file mode 100644
index ce161e3c55d..00000000000
--- a/keyboards/crkbd/keymaps/dsanchezseco/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Dvorak keymap for CRKBD
-
-To flash the halves use:
-
-```
-#left side
-make crkbd:dsanchezseco:dfu-split-left
-#right side, with RGB matrix fix
-make crkbd:dsanchezseco:dfu-split-right RGB_MATRIX_SPLIT_RIGHT=yes
-```
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/config.h b/keyboards/crkbd/keymaps/dsanchezseco/config.h
deleted file mode 100644
index 229e26e0103..00000000000
--- a/keyboards/crkbd/keymaps/dsanchezseco/config.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-// lower maximum brightness to lower power usage and prevent unresponsiveness
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
-
-// 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
-// #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
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
deleted file mode 100644
index 2047320c4e3..00000000000
--- a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
+++ /dev/null
@@ -1,107 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define ESC_CTL LCTL_T(KC_ESC)
-
-// 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 crkbd_layers {
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_DVORAK] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------.          ,-----------------------------------------------.
-     KC_TAB, KC_QUOT,KC_COMM, KC_DOT, KC_P,   KC_Y,              KC_F,   KC_G,   KC_C,   KC_R,   KC_L,  KC_SLSH,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-     ESC_CTL, KC_A,   KC_O,   KC_E,   KC_U,   KC_I,              KC_D,   KC_H,   KC_T,   KC_N,   KC_S, KC_MINUS,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-     KC_LSFT,KC_SCLN, KC_Q,   KC_J,   KC_K,   KC_X,              KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,SC_SENT,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-                                KC_LGUI, LOWER, KC_SPC,    KC_BSPC, RAISE,KC_RALT
-                             //`-----------------------'  `----------------------'
-  ),
-
-
-  [_LOWER] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------.          ,-----------------------------------------------.
-     KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR,KC_PERC,           KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RIGHT,KC_RPRN,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-     _______,KC_VOLD,KC_VOLU,KC_MPRV,KC_MPLY,KC_MNXT,           _______,KC_LEFT,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-     _______,_______,_______,KC_DOWN, KC_UP, _______,           _______,_______,_______,KC_HOME, KC_END,_______,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-                                _______,_______,_______,   KC_DEL,_______,_______
-                             //`-----------------------'  `----------------------'
-  ),
-
-  [_RAISE] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------.          ,-----------------------------------------------.
-     KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,  KC_5,              KC_6,    KC_7,  KC_8,    KC_9,KC_RIGHT,  KC_0,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-     _______,_______,_______,_______,_______,_______,           _______,KC_LEFT, KC_EQL,KC_LBRC,KC_RBRC,KC_BSLS,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-     _______,_______,_______,KC_DOWN, KC_UP, _______,           _______,_______,_______,KC_PGUP,KC_PGDN,_______,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-                                _______,_______,_______,   KC_DEL ,_______,_______
-                             //`-----------------------'  `----------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------.          ,-----------------------------------------------.
-     RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,_______,RGB_M_T,          _______,_______,_______,_______,KC_RIGHT,_______,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-     RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,_______,_______,           _______,KC_LEFT,_______,_______,_______,_______,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-     _______,KC_PSCR,_______,KC_DOWN, KC_UP, _______,           _______,_______,_______,_______,_______,_______,
-  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
-                                _______,_______,_______,   KC_DEL ,_______,_______
-                             //`-----------------------'  `----------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_left())
-    return OLED_ROTATION_180;  // flips the display 180 to see it from my side
-  return rotation;
-}
-
-const char *read_logo(void);
-bool oled_task_user(void){
-    switch (get_highest_layer(layer_state)){
-        case _DVORAK:
-            oled_write_ln_P(PSTR("DVRK"), false);
-            break;
-        case _LOWER:
-            oled_write_ln_P(PSTR("LOWER"), false);
-            break;
-        case _RAISE:
-            oled_write_ln_P(PSTR("RAISE"), false);
-            break;
-        case _ADJUST:
-            oled_write_ln_P(PSTR("ADJST"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("?????"), false);
-    }
-  //now print logo
-  oled_write(read_logo(), false);
-    return false;
-}
-#endif
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/logo_reader.c b/keyboards/crkbd/keymaps/dsanchezseco/logo_reader.c
deleted file mode 100644
index 039a538cc54..00000000000
--- a/keyboards/crkbd/keymaps/dsanchezseco/logo_reader.c
+++ /dev/null
@@ -1,9 +0,0 @@
-const char *read_logo(void) {
-  static char logo[] = {
-      0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-      0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-      0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-      0};
-
-  return logo;
-}
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/rules.mk b/keyboards/crkbd/keymaps/dsanchezseco/rules.mk
deleted file mode 100644
index 161517dd855..00000000000
--- a/keyboards/crkbd/keymaps/dsanchezseco/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# If you want to change the display of OLED, you need to change here
-SRC += ./logo_reader.c
-
-# enable OLED displays
-OLED_ENABLE = no
-
-# enable media keys
-EXTRAKEY_ENABLE = yes
-
-# enable LEDs
-RGB_MATRIX_ENABLE = yes
-
-# using elite-c controllers
-BOOTLOADER = qmk-dfu
diff --git a/keyboards/crkbd/keymaps/gotham/README.md b/keyboards/crkbd/keymaps/gotham/README.md
deleted file mode 100644
index 88120ae888a..00000000000
--- a/keyboards/crkbd/keymaps/gotham/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Gotham's custom CRKBD Layout
-
-My take on the 40% layout with programming in mind. Do read about the layers, it helps with forming a mental model to remember the keymap better than just memorization.
-
-## Layers
-- QWERTY: Base layer. The idea is to reduce thumb movement by placing commonly used keys and layers on resting thumb positions (center thumb keys). You might need to play around with TAPPING_TERM to find your perfect setting. Also, both Lower and Raise buttons appear on both halves for easy access (think of it as: middle thumb key is Lower, outer thumb key is Raise).
-- LOWER: Numbers, common symbols and navigation. Easiest layer to reach (middle thumb button on both halves). The nav is shaped as a T instead of an inverted T for a few reasons. First, Left and Right needed to be on the home row (since I use them a lot to navigate through code). But the Up key can't be on the top row because numbers occupy that space. So I moved the Up and Down keys one key down. It takes some getting used to, but I find this a great balance without separating the nav and number rows. The nav cluster also contains Home and End keys below Left and Right, making it a breeze to navigate through code.
-- RAISE: All symbols are here, arranged in a way that can be (kind of) deduced more by logic and less by memory. On the left hand, the first 2 cols contain the symbols for shifted numbers 1-6, with ! and @ in the home row instead of the top row. Think of the 3 rows as symbols for 3 and 4, 1 and 2, 5 and 6). The next 2 cols contain common brackets. On the right hand is everything else. Note that -, _ and = are close to the home row because of how common they are in code. Operators (&, | and !) are on the top row for convinience. Just try and remember where +, *, < and > located. Admitedlly, the locations for these symbols could use improvement.
-- ADJUST: Contains settings and Function keys. This is placed on the bottom-right corner (triggerred by the pinky), since the thumb keys already have multiple uses.
-
-## Custom OLED
-This keymap includes custom OLED font and code. The font contains some logos and status indidcators for some of the features I use (RGB and Audio). Enable OLED in rukes.mk to check it out. Feel free to reuse the font or parts of it.
-
-## Flashing
-Flash using `make crkbd:gotham:avrdude` for Pro Micro and `make crkbd:gotham:dfu` for Elite-C.
diff --git a/keyboards/crkbd/keymaps/gotham/config.h b/keyboards/crkbd/keymaps/gotham/config.h
deleted file mode 100644
index 753854c01c0..00000000000
--- a/keyboards/crkbd/keymaps/gotham/config.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#pragma once
-
-#define EE_HANDS
-#define SPLIT_USB_DETECT
-
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 250
-
-#define NO_ACTION_ONESHOT
-
-#ifdef AUDIO_ENABLE
-#    define AUDIO_PIN B5
-#    define NO_MUSIC_MODE
-#    define AUDIO_CLICKY
-#endif
-
-#ifdef OLED_ENABLE
-#    define OLED_FONT_H "keyboards/crkbd/keymaps/gotham/glcdfont.c"
-#    define SPLIT_LAYER_STATE_ENABLE
-#    define SPLIT_LED_STATE_ENABLE
-#    define SPLIT_MODS_ENABLE
-#    define SPLIT_OLED_ENABLE
-#    undef  OLED_TIMEOUT
-        //  due to timer_read() for render_prompt(), we have own implementation of oled time out
-#    define OLED_KEY_TIMEOUT 30000
-#endif
-
-#define RGBLIGHT_SLEEP
-
-#ifdef RGBLIGHT_ENABLE
-#    undef RGBLED_NUM
-#    define RGBLED_NUM 6
-#    define RGBLIGHT_LIMIT_VAL 150
-#    define RGBLIGHT_HUE_STEP 16
-#    define RGBLIGHT_SAT_STEP 32
-#    define RGBLIGHT_VAL_STEP 32
-
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_KNIGHT
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES                // reacts to keypresses
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150    // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_HUE_STEP 32
-#    define RGB_MATRIX_SAT_STEP 64
-#    define RGB_MATRIX_VAL_STEP 64
-#    define RGB_MATRIX_SPD_STEP 20
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-
-/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
- * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-// #undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-// #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// #undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/crkbd/keymaps/gotham/glcdfont.c b/keyboards/crkbd/keymaps/gotham/glcdfont.c
deleted file mode 100644
index 656b13974a3..00000000000
--- a/keyboards/crkbd/keymaps/gotham/glcdfont.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-// https://helixfonteditor.netlify.com/
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-const unsigned char font[] PROGMEM = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-    0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, 0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x60, 0x30, 0x18, 0xF8, 0x18, 0x00, 0xC0, 0x70, 0x1C, 0x06, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0xC3, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x08, 0x00, 0x1C, 0x22, 0x41, 0x41, 0x41, 0x22, 0x1C, 0x00, 0x08, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0xF8, 0x0C, 0x04, 0xE7, 0xE4, 0xE4, 0x07, 0x04, 0xE4, 0xE7, 0xE4, 0x04, 0x07, 0xE4, 0xE4, 0xE7, 0x04, 0x0C, 0xF8, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x1C, 0x3E, 0x7F, 0x7F, 0x00, 0x14, 0x08, 0x14, 0x00, 0x00, 0x00, 0x1C, 0x1C, 0x3E, 0x7F, 0x7F, 0x00, 0x22, 0x1C, 0x41, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0x0C, 0x06, 0x0C, 0x18, 0x30, 0x77, 0x77, 0x77, 0x00, 0x77, 0x77,
-    0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x4A, 0x4F, 0x4A, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x60, 0x70, 0x3E, 0x1F, 0x19, 0x18, 0x0C, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x0C, 0x06, 0x07, 0xFC, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x80, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x1C, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 0x1C, 0x22, 0x00, 0x00, 0x1C, 0x3E, 0x7F, 0x63, 0x41, 0x22, 0x1C, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x49, 0xFF, 0x00, 0x00, 0x0F, 0x1F, 0x3F, 0x38, 0x30, 0xFF, 0xFF, 0xFF, 0x30, 0x38, 0x3F, 0x1F, 0x0F, 0x00, 0x00, 0xFF, 0x49, 0x49, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x40, 0x60, 0x6A, 0x64, 0x6A, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x04, 0x42, 0x69, 0x65, 0x65, 0x65, 0x69, 0x42, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x0C, 0x18, 0x30, 0x66, 0x66, 0x66, 0x00, 0x00, 0xFC, 0x24, 0x24, 0xFC, 0x24, 0x24, 0xFC, 0x24, 0x24, 0xFC, 0x24, 0x24, 0xFC, 0x24, 0x24, 0xFC, 0x24, 0x24, 0xFC, 0x24, 0x24, 0xFC, 0x24, 0x24, 0xFC, 0x00, 0x00, 0x00, 0xF0, 0x90, 0x90, 0xF0, 0x90, 0x90, 0xF0, 0x98, 0x9C, 0xF2, 0x22, 0x21, 0xE1, 0x01, 0x01, 0x01, 0xF1, 0x91, 0x91, 0xFA, 0x4C, 0x4C, 0xF8, 0x48, 0x48, 0xF8, 0x48, 0x48, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0E, 0x18, 0x30, 0x21, 0x21, 0x31, 0x18, 0x10, 0x30, 0x20, 0x60, 0x41, 0x60, 0x20, 0x30, 0x18, 0x30, 0x60, 0x40, 0x40, 0x47, 0x4C, 0x48, 0x68, 0x38, 0x1C, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x1C, 0x22, 0x41, 0x63, 0x7F, 0x3E, 0x1C,
-    0x00, 0x00, 0x22, 0x1C, 0x00, 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0F, 0x18, 0x10, 0x70, 0x10, 0x10, 0x70, 0x10, 0x13, 0x73, 0x13, 0x10, 0x70, 0x10, 0x10, 0x70, 0x10, 0x18, 0x0F, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x22, 0xC9, 0xD1, 0xC9, 0x22, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x38, 0xFC, 0xED, 0xFC, 0x38, 0x02, 0x10, 0x00, 0x00, 0x08, 0x0C, 0x7E, 0x7F, 0x7E, 0x0C, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x09, 0x09, 0x09, 0x0F, 0x09, 0x09, 0x0F, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0F, 0x09, 0x09, 0x0F, 0x09, 0x09, 0x09, 0x0F, 0x00, 0x00, 0x00, 0x07, 0x04, 0x04, 0x07, 0x04, 0x04, 0x07, 0x04, 0x04, 0x0F, 0x09, 0x09, 0x0F, 0x00, 0x00, 0x00, 0x07, 0x04, 0x04, 0x07, 0x02, 0x02, 0x03, 0x02, 0x02, 0x03, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/keyboards/crkbd/keymaps/gotham/keycodes.h b/keyboards/crkbd/keymaps/gotham/keycodes.h
deleted file mode 100644
index 9ba44c54a7c..00000000000
--- a/keyboards/crkbd/keymaps/gotham/keycodes.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-enum layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes { QWERTY = SAFE_RANGE, LOWER, RAISE, ADJUST, RGBRST };
-
-#define SFT_EQ MT(MOD_LSFT, KC_EQL)
-#define SFT_QT MT(MOD_RSFT, KC_QUOT)
-
-#define SFT_A MT(MOD_LSFT, KC_A)
-#define CTL_Z MT(MOD_LCTL, KC_Z)
-
-#define SFT_SCLN MT(MOD_RSFT, KC_SCLN)
-#define CTL_SLSH MT(MOD_RCTL, KC_SLSH)
-
-#define LOW_SPC LT(_LOWER, KC_SPC)
-#define RAI_EQ LT(_RAISE, KC_EQL)
-#define RAI_ENT LT(_RAISE, KC_ENT)
-#define LOW_BSP LT(_LOWER, KC_BSPC)
-#define LOW_DEL LT(_LOWER, KC_DEL)
-#define ADJ_GRV LT(_ADJUST, KC_GRV)
-#define KC_ANGL LSFT(KC_COMM)
-#define KC_ANGR LSFT(KC_DOT)
diff --git a/keyboards/crkbd/keymaps/gotham/keymap.c b/keyboards/crkbd/keymaps/gotham/keymap.c
deleted file mode 100644
index 02cc3af68eb..00000000000
--- a/keyboards/crkbd/keymaps/gotham/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keycodes.h"
-
-#ifdef OLED_ENABLE
-#    include "oled.c"
-#endif
-
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-#    include "rgb.c"
-#endif
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     SFT_EQ,  SFT_A,   KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L,    SFT_SCLN,SFT_QT,
-  //---------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     KC_LCTL, CTL_Z,   KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M,    KC_COMM, KC_DOT,  CTL_SLSH,ADJ_GRV,
-  //---------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                         KC_LALT, LOW_SPC, RAI_EQ,     RAI_ENT, LOW_BSP, KC_LGUI
-                                      //|--------------------------|  |--------------------------|
-
-
-  ),
-
-  [_LOWER] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     _______, KC_ANGL, KC_ANGR, KC_LPRN, KC_RPRN, KC_PGUP,                      KC_MINS, KC_LEFT, KC_UP,   KC_RIGHT,KC_PLUS, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     _______, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_PGDN,                      KC_UNDS, KC_HOME, KC_DOWN, KC_END,  XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                         _______, _______, _______,    _______, LOW_DEL, _______
-                                      //|--------------------------|  |--------------------------|
-  ),
-
-  [_RAISE] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-     KC_ESC,  KC_HASH, KC_DLR,  KC_LCBR, KC_RCBR, XXXXXXX,                      XXXXXXX, KC_AMPR, KC_PIPE, KC_EXLM, KC_ASTR, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     _______, KC_EXLM, KC_AT,   KC_LPRN, KC_RPRN, XXXXXXX,                      XXXXXXX, KC_UNDS, KC_EQL,  KC_ANGL, KC_ANGR, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, XXXXXXX,                      XXXXXXX, KC_MINS, KC_PLUS, XXXXXXX, KC_BSLS, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, _______
-                                      //|--------------------------|  |--------------------------|
-  ),
-
-  [_ADJUST] = LAYOUT_split_3x6_3(
-  //|-----------------------------------------------------|                    |-----------------------------------------------------|
-     XXXXXXX, CK_RST,  CK_DOWN, CK_UP,   CK_TOGG, RGB_TOG,                      MU_TOGG, KC_F12,  KC_F7,   KC_F8,   KC_F9,   XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD,                      MU_NEXT, KC_F11,  KC_F4,   KC_F5,   KC_F6,   QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGBRST,                       AU_TOGG, KC_F10,  KC_F1,   KC_F2,   KC_F3,   _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                         _______, _______, _______,    _______, KC_VOLD, KC_VOLU
-                                      //|--------------------------|  |--------------------------|
-  )
-};
-// clang-format off
-
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-layer_state_t layer_state_set_user(layer_state_t state) {
-    /* For any layer other than default, save current RGB state and switch to layer-based RGB */
-    if (layer_state_cmp(state, 0)) {
-        restore_rgb_config();
-    } else {
-        uint8_t layer = get_highest_layer(state);
-        if (layer_state_cmp(layer_state, 0)) save_rgb_config();
-        rgb_by_layer(layer);
-    }
-    return state;
-}
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#ifdef OLED_ENABLE
-    if (record->event.pressed) {
-        oled_timer = timer_read();
-        is_key_processed = true;
-        add_keylog(keycode);
-    }
-#endif
-
-    switch (keycode) {
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-            } else {
-                layer_off(_LOWER);
-            }
-            return false;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-            } else {
-                layer_off(_RAISE);
-            }
-            return false;
-        case ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-        case RGB_MOD:
-        case RGB_TOG:
-        case RGB_HUI:
-        case RGB_HUD:
-        case RGB_SAI:
-        case RGB_SAD:
-        case RGB_VAI:
-        case RGB_VAD:
-        case RGB_SPI:
-        case RGB_SPD:
-            /* Override layer-based RGB and resume RGB effect to be able to preview changes */
-            if (record->event.pressed) {
-                restore_rgb_config();
-                process_rgb(keycode, record);
-                save_rgb_config();
-            }
-            return false;
-        case RGBRST:
-            if (record->event.pressed) {
-#    ifdef RGBLIGHT_ENABLE
-                eeconfig_update_rgblight_default();
-                rgblight_enable();
-#    elif RGB_MATRIX_ENABLE
-                eeconfig_update_rgb_matrix_default();
-                rgb_matrix_enable();
-#    endif
-                save_rgb_config();
-            }
-            return false;
-#endif
-    }
-    return true;
-}
diff --git a/keyboards/crkbd/keymaps/gotham/oled.c b/keyboards/crkbd/keymaps/gotham/oled.c
deleted file mode 100644
index c285a37c5ba..00000000000
--- a/keyboards/crkbd/keymaps/gotham/oled.c
+++ /dev/null
@@ -1,260 +0,0 @@
-#pragma once
-
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-#    include "rgb.c"
-#endif
-
-#ifdef AUDIO_ENABLE
-extern audio_config_t audio_config;
-#endif
-
-// 5x3 Logos
-
-void render_corne_logo(void) {
-    static const char PROGMEM font_logo[16] = {0x80, 0x81, 0x82, 0x83, 0x84, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0};
-    oled_write_P(font_logo, false);
-};
-
-void render_qmk_logo(void) {
-    static const char PROGMEM font_qmk_logo[16] = {0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0};
-    oled_write_P(font_qmk_logo, false);
-};
-
-// 5x2 Keyboard, Controller logos
-
-void render_keyboard(void) {
-    static const char PROGMEM font_keyboard[11] = {0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0};
-    oled_write_P(font_keyboard, false);
-};
-
-void render_kb_split(void) {
-    static const char PROGMEM font_kb_split[11] = {0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0};
-    oled_write_P(font_kb_split, false);
-};
-
-// 5x1 Layer indicator
-
-void render_layer(void) {
-    static const char PROGMEM font_layer[4][6] = {
-        {0x85, 0x86, 0x87, 0x88, 0x89, 0},
-        {0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0},
-        {0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0},
-        {0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0},
-    };
-    uint8_t layer = 0;
-    if (layer_state_is(_LOWER)) {
-        layer = 1;
-    } else if (layer_state_is(_RAISE)) {
-        layer = 2;
-    } else if (layer_state_is(_ADJUST)) {
-        layer = 3;
-    }
-    oled_write_P(font_layer[layer], false);
-};
-
-    // 2x1 Audio, clicky and RGB status indicators
-
-#ifdef AUDIO_ENABLE
-void render_audio_status(void) {
-    static const char PROGMEM font_audio_off[3] = {0x8f, 0x90, 0};
-    static const char PROGMEM font_audio_on[3]  = {0x91, 0x92, 0};
-    oled_write_P(audio_config.enable ? font_audio_on : font_audio_off, false);
-};
-
-void render_clicky_status(void) {
-    static const char PROGMEM font_clicky_off[3] = {0xaf, 0xb0, 0};
-    static const char PROGMEM font_clicky_on[3]  = {0xb1, 0xb2, 0};
-    oled_write_P(audio_config.clicky_enable ? font_clicky_on : font_clicky_off, false);
-};
-#endif
-
-#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
-void render_rgb_status(void) {
-    static const char PROGMEM font_rgb_off[3] = {0xcf, 0xd0, 0};
-    static const char PROGMEM font_rgb_on[3]  = {0xd1, 0xd2, 0};
-#    ifdef RGBLIGHT_ENABLE
-    bool rgb_enabled = rgblight_config.enable;
-#    elif RGB_MATRIX_ENABLE
-    bool rgb_enabled = rgb_matrix_config.enable;
-#    endif
-    oled_write_P(rgb_enabled ? font_rgb_on : font_rgb_off, false);
-};
-#endif
-
-// 2x1 Ctrl, Alt, Shift, GUI, Mouse
-
-void render_mod_ctrl(void) {
-    static const char PROGMEM font_ctrl[3] = {0x93, 0x94, 0};
-    oled_write_P(font_ctrl, false);
-};
-
-void render_mod_alt(void) {
-    static const char PROGMEM font_alt[3] = {0xb3, 0xb4, 0};
-    oled_write_P(font_alt, false);
-};
-
-void render_mod_shift(void) {
-    static const char PROGMEM font_shift[3] = {0xd3, 0xd4, 0};
-    oled_write_P(font_shift, false);
-};
-
-void render_mod_gui(void) {
-    static const char PROGMEM font_gui[3] = {0x95, 0x96, 0};
-    oled_write_P(font_gui, false);
-};
-
-#ifdef MOUSEKEY_ENABLE
-void render_mod_mouse(void) {
-    static const char PROGMEM font_mouse[3] = {0x97, 0x98, 0};
-    oled_write_P(font_mouse, false);
-};
-#endif
-
-// 5x2 Mod and feature indicator clusters
-
-void render_mod_status(void) {
-#ifdef NO_ACTION_ONESHOT
-    uint8_t modifiers = get_mods();
-#else
-    uint8_t modifiers = get_mods() | get_oneshot_mods();
-#endif
-
-    (modifiers & MOD_MASK_CTRL) ? render_mod_ctrl() : oled_write_P(PSTR("  "), false);
-    oled_write_P(PSTR(" "), false);
-    (modifiers & MOD_MASK_SHIFT) ? render_mod_shift() : oled_write_P(PSTR("  "), false);
-
-    (modifiers & MOD_MASK_ALT) ? render_mod_alt() : oled_write_P(PSTR("  "), false);
-    oled_write_P(PSTR(" "), false);
-    (modifiers & MOD_MASK_GUI) ? render_mod_gui() : oled_write_P(PSTR("  "), false);
-}
-
-void render_feature_status(void) {
-#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
-    render_rgb_status();
-#endif
-
-#ifdef AUDIO_ENABLE
-    oled_write_P(PSTR(" "), false);
-    render_audio_status();
-#endif
-};
-
-// Keylogger
-#define KEYLOGGER_LENGTH 5
-static uint16_t oled_timer                       = 0;
-static bool     is_key_processed                 = true;
-static char     keylog_str[KEYLOGGER_LENGTH + 1] = {"\n"};
-// clang-format off
-static const char PROGMEM code_to_name[0xFF] = {
-//   0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',  // 0x
-    'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2',  // 1x
-    '3', '4', '5', '6', '7', '8', '9', '0',  20,  19,  27,  26,  22, '-', '=', '[',  // 2x
-    ']','\\', '#', ';','\'', '`', ',', '.', '/', 128, ' ', ' ', ' ', ' ', ' ', ' ',  // 3x
-    ' ', ' ', ' ', ' ', ' ', ' ', 'P', 'S', ' ', ' ', ' ', ' ',  16, ' ', ' ', ' ',  // 4x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 5x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 6x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 7x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 8x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 9x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Ax
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Bx
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Cx
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Dx
-    'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Ex
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '        // Fx
-};
-
-void add_keylog(uint16_t keycode) {
-  if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
-    keycode = keycode & 0xFF;
-  } else if (keycode > 0xFF) {
-    keycode = 0;
-  }
-
-  for (uint8_t i = (KEYLOGGER_LENGTH - 1); i > 0; --i) {
-    keylog_str[i] = keylog_str[i - 1];
-  }
-
-  if (keycode < ARRAY_SIZE(code_to_name)) {
-    keylog_str[0] = pgm_read_byte(&code_to_name[keycode]);
-  }
-}
-
-void render_keylogger_status(void) {
-  oled_write(keylog_str, false);
-}
-
-void render_prompt(void) {
-    bool blink = (timer_read() % 1000) < 500;
-
-    if (layer_state_is(_LOWER)) {
-        oled_write_ln_P(blink ? PSTR("> lo_") : PSTR("> lo "), false);
-    } else if (layer_state_is(_RAISE)) {
-        oled_write_ln_P(blink ? PSTR("> hi_") : PSTR("> hi "), false);
-    } else if (layer_state_is(_ADJUST)) {
-        oled_write_ln_P(blink ? PSTR("> aj_") : PSTR("> aj "), false);
-    } else {
-        oled_write_ln_P(blink ? PSTR("> _  ") : PSTR(">    "), false);
-    }
-};
-
-void render_status_secondary(void) {
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_kb_split();
-
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_layer();
-
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    #if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE) || defined(AUDIO_ENABLE)
-        layer_state_is(_ADJUST) ? render_feature_status() : render_mod_status();
-    #else
-        render_mod_status();
-    #endif
-};
-
-void render_status_main(void) {
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_corne_logo();
-
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_qmk_logo();
-
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_prompt();
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        if (is_key_processed && (timer_elapsed(oled_timer) < OLED_KEY_TIMEOUT)) {
-            render_status_main();
-        } else {
-            is_key_processed = false;
-            oled_off();
-        }
-    } else {
-        render_status_secondary();
-    }
-    return false;
-}
diff --git a/keyboards/crkbd/keymaps/gotham/rgb.c b/keyboards/crkbd/keymaps/gotham/rgb.c
deleted file mode 100644
index 9f66428836d..00000000000
--- a/keyboards/crkbd/keymaps/gotham/rgb.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#pragma once
-
-#ifdef RGBLIGHT_ENABLE
-extern rgblight_config_t rgblight_config;
-rgblight_config_t        RGB_current_config;
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-extern rgb_config_t rgb_matrix_config;
-rgb_config_t        RGB_current_config;
-#endif
-
-void save_rgb_config(void) {
-#ifdef RGBLIGHT_ENABLE
-    RGB_current_config.enable = rgblight_config.enable;
-    RGB_current_config.mode   = rgblight_get_mode();
-    RGB_current_config.speed  = rgblight_get_speed();
-    RGB_current_config.hue    = rgblight_get_hue();
-    RGB_current_config.sat    = rgblight_get_sat();
-    RGB_current_config.val    = rgblight_get_val();
-#elif RGB_MATRIX_ENABLE
-    RGB_current_config.enable = rgb_matrix_config.enable;
-    RGB_current_config.mode   = rgb_matrix_get_mode();
-    RGB_current_config.speed  = rgb_matrix_config.speed;
-    RGB_current_config.hsv    = rgb_matrix_config.hsv;
-#endif
-}
-
-void restore_rgb_config(void) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_set_speed_noeeprom(RGB_current_config.speed);
-    if (rgblight_config.mode != RGB_current_config.mode) {
-        rgblight_mode_noeeprom(RGB_current_config.mode);
-    }
-    if ((RGB_current_config.hue != rgblight_config.hue) || (RGB_current_config.sat != rgblight_config.sat) || (RGB_current_config.val != rgblight_config.val)) {
-        rgblight_sethsv_noeeprom(RGB_current_config.hue, RGB_current_config.sat, RGB_current_config.val);
-    }
-    if (rgblight_config.enable) {
-        rgblight_enable_noeeprom();
-    } else {
-        rgblight_disable_noeeprom();
-    }
-#elif RGB_MATRIX_ENABLE
-    rgb_matrix_config.speed   = RGB_current_config.speed;
-    if (rgb_matrix_config.mode != RGB_current_config.mode) {
-        rgb_matrix_mode_noeeprom(RGB_current_config.mode);
-    }
-    if ((RGB_current_config.hsv.h != rgb_matrix_config.hsv.h) || (RGB_current_config.hsv.s != rgb_matrix_config.hsv.s) || (RGB_current_config.hsv.v != rgb_matrix_config.hsv.v)) {
-        rgb_matrix_sethsv_noeeprom(RGB_current_config.hsv.h, RGB_current_config.hsv.s, RGB_current_config.hsv.v);
-    }
-    if (rgb_matrix_config.enable) {
-        rgb_matrix_enable_noeeprom();
-    } else {
-        rgb_matrix_disable_noeeprom();
-    }
-#endif
-}
-
-void rgb_by_layer(int layer) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-#elif RGB_MATRIX_ENABLE
-    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-#endif
-
-    switch (layer) {
-        case _ADJUST:
-            rgblight_sethsv_noeeprom(9, 255, 255);
-            break;
-        case _RAISE:
-            rgblight_sethsv_noeeprom(HSV_CYAN);
-            break;
-        case _LOWER:
-            rgblight_sethsv_noeeprom(HSV_MAGENTA);
-            break;
-        default:
-            rgblight_sethsv_noeeprom(HSV_RED);
-    }
-}
diff --git a/keyboards/crkbd/keymaps/gotham/rules.mk b/keyboards/crkbd/keymaps/gotham/rules.mk
deleted file mode 100644
index 455cf708a6a..00000000000
--- a/keyboards/crkbd/keymaps/gotham/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-AUDIO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-OLED_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/joe_scotto/config.h b/keyboards/crkbd/keymaps/joe_scotto/config.h
deleted file mode 100644
index 113313ceb1f..00000000000
--- a/keyboards/crkbd/keymaps/joe_scotto/config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2022 Joe Scotto
-
-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
-
-
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS  8
-#define MATRIX_COLS  6
-#define MATRIX_ROW_PINS \
-    { D4, C6, D7, E6 }
-
-// wiring of each half
-#define MATRIX_COL_PINS \
-    { F4, F5, F6, F7, B1, B3 }
-// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* 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
-
-/*
- * 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 TAPPING_TERM 50
diff --git a/keyboards/crkbd/keymaps/joe_scotto/keymap.c b/keyboards/crkbd/keymaps/joe_scotto/keymap.c
deleted file mode 100644
index 9e49aa6df73..00000000000
--- a/keyboards/crkbd/keymaps/joe_scotto/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright 2022 Joe Scotto
-
-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_split_3x6_3(
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        KC_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 
-        LSFT_T(KC_ESC), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, 
-        KC_LALT, KC_LGUI, KC_SPC, MO(1), MO(2), KC_LCTL
-    ),
-	[1] = LAYOUT_split_3x6_3(
-        KC_GRV, KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_NO, KC_NO, KC_MRWD, KC_MPLY, KC_MFFD, KC_NO, KC_DEL, 
-        KC_ENT, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_BSLS, KC_NO, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_CAPS, 
-        LSFT_T(KC_ESC), KC_LBRC, KC_QUOT, KC_DQUO, KC_RBRC, KC_NO, KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_NO, KC_RSFT, 
-        KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_NO, KC_LCTL
-    ),
-	[2] = LAYOUT_split_3x6_3(
-        KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 
-        KC_ENT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CAPS, 
-        LSFT_T(KC_ESC), KC_NO, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, KC_NO, KC_RSFT, 
-        KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_NO, KC_LCTL
-    ),
-	[3] = LAYOUT_split_3x6_3(
-        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
-        QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LGUI, 
-        LSFT_T(KC_ESC), KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, 
-        KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_NO, KC_LCTL
-    )
-};
-
diff --git a/keyboards/crkbd/keymaps/jpe230/config.h b/keyboards/crkbd/keymaps/jpe230/config.h
deleted file mode 100644
index 815cb907067..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* ---------------------------
- * Common Spit Configuration
- * ---------------------------
- */
-#define SPLIT_OLED_ENABLE
-
-/* ---------------------------
- * Common OLED Configuration
- * ---------------------------
- */
-#define OLED_TIMEOUT 0
-#define CUSTOM_OLED_TIMEOUT 10000
-
-/* ---------------------------
- * Common Bootmagic Lite
- * ---------------------------
- */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
-/* ---------------------------
- * Common RGB Configuration
- * ---------------------------
- */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_DISABLE_TIMEOUT CUSTOM_OLED_TIMEOUT
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
-#define RGB_MATRIX_DEFAULT_HUE 215
-#define RGB_MATRIX_DEFAULT_SAT 255
-#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-
-/* ---------------------------
- * Common other Configuration
- * ---------------------------
- */
-#define ENABLE_COMPILE_KEYCODE
-
-#if defined CONVERT_TO_KB2040 || defined CONVERT_TO_PROMICRO_RP2040
-#    include "config_rp2040.h"
-#else
-#    include "config_avr.h"
-#endif
diff --git a/keyboards/crkbd/keymaps/jpe230/config_avr.h b/keyboards/crkbd/keymaps/jpe230/config_avr.h
deleted file mode 100644
index 67226d88f79..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/config_avr.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* ---------------------------
- * AVR RGB Configuration
- * ---------------------------
- */
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
diff --git a/keyboards/crkbd/keymaps/jpe230/config_rp2040.h b/keyboards/crkbd/keymaps/jpe230/config_rp2040.h
deleted file mode 100644
index b26c14986ab..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/config_rp2040.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* ---------------------------
- * RP2040 OLED Configuration
- * ---------------------------
- */
-#define I2C1_CLOCK_SPEED 400000
-#define OLED_UPDATE_INTERVAL 1
-#define OLED_I2C_TIMEOUT 1
-
-/* ---------------------------
- * RP2040 Split Configuration
- * ---------------------------
- */
-#define SPLIT_WPM_ENABLE
-
-/* ---------------------------
- * RP2040 Debounce
- * ---------------------------
- */
-#undef DEBOUNCE
-#define DEBOUNCE 1
-
-/* ---------------------------
- * RP2040 RGB Configuration
- * ---------------------------
- */
-#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
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#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
diff --git a/keyboards/crkbd/keymaps/jpe230/jpe230.h b/keyboards/crkbd/keymaps/jpe230/jpe230.h
deleted file mode 100644
index f5f098f5c57..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/jpe230.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-/* ---------------------------
- * Custom OLED Fncs Prototypes
- * ---------------------------
- */
-void render_slave_oled(void);
-void render_master_oled(void);
-void oled_timer_reset(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/crkbd/keymaps/jpe230/keymap.c b/keyboards/crkbd/keymaps/jpe230/keymap.c
deleted file mode 100644
index 530c418be59..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/keymap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      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,  KC_ESC,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,   MO(1),  KC_ENT,     KC_SPC,   MO(2), KC_RALT
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [1] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_CAPS, _______, _______, _______, _______, _______,                      _______,   KC_UP, _______, RGB_MOD, RGB_HUI, RGB_VAI,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, _______, _______, _______, _______, _______,                      KC_LEFT, KC_DOWN,KC_RIGHT, RGB_TOG, RGB_SAI, RGB_SPI,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______, _______,   _______,   MO(3), KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [2] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_CAPS, _______, _______, _______, _______, _______,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, _______, _______, _______, _______, _______,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,   MO(3), _______,      TG(3), _______, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [3] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      KC_MUTE, KC_WBAK, KC_WFWD,   KC_F7,   KC_F8,   KC_F9,                      _______,    KC_7,    KC_8,    KC_9, _______, QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_VOLU, _______, KC_MNXT,   KC_F6,   KC_F5,   KC_F6,                      _______,    KC_6,    KC_5,    KC_4, _______, QK_MAKE,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_VOLD, KC_MPRV, KC_MNXT,   KC_F1,   KC_F2,   KC_F3,                      _______,    KC_1,    KC_2,    KC_3, _______, DB_TOGG,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______, _______,      TG(3), _______, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-// clang-format off
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c
deleted file mode 100644
index f0f6f3f62fe..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/avr/master/oled_master_handler.c
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "jpe230.h"
-
-extern uint8_t logged_row;
-extern uint8_t logged_col;
-extern uint32_t oled_timer;
-static char logged_char = ' ';
-static uint16_t logged_keycode = 0;
-
-#define L_BASE 0
-#define L_LOWER 2
-#define L_RAISE 4
-#define L_ADJUST 8
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("Default"), false);
-            break;
-        case L_LOWER:
-            oled_write_ln_P(PSTR("Lower"), false);
-            break;
-        case L_RAISE:
-            oled_write_ln_P(PSTR("Raise"), false);
-            break;
-        case L_ADJUST:
-        case L_ADJUST|L_LOWER:
-        case L_ADJUST|L_RAISE:
-        case L_ADJUST|L_LOWER|L_RAISE:
-            oled_write_ln_P(PSTR("Adjust"), false);
-            break;
-    }
-}
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void handle_oled_keypress(uint16_t keycode, keyrecord_t *record) {
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-    if (keycode < 60) {
-        logged_char = code_to_name[keycode];
-    }
-
-    logged_keycode = keycode;
-}
-
-void oled_render_keylog(void) {
-    oled_write(get_u8_str(logged_row, '0'), false);
-    oled_write_P(PSTR(":"), false);
-    oled_write(get_u8_str(logged_col, '0'), false);
-    oled_write_P(PSTR(", "), false);
-    oled_write(get_u16_str(logged_keycode, ' '), false);
-    oled_write_P(PSTR(" : "), false);
-    oled_write((const char *)&logged_char, false);
-}
-
-void render_master_oled(void) {
-    if (timer_elapsed32(oled_timer) > CUSTOM_OLED_TIMEOUT) {
-        oled_off();
-        return;
-    }
-
-    oled_on();
-    oled_render_layer_state();
-    oled_render_keylog();
-}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c
deleted file mode 100644
index c47fb2a07b2..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/avr/slave/oled_slave_handler.c
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "jpe230.h"
-
-void render_slave_oled(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c
deleted file mode 100644
index 9e130dae380..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/oled_handler.c
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "jpe230.h"
-
-uint8_t logged_row;
-uint8_t logged_col;
-uint32_t oled_timer = 0;
-
-__attribute__ ((weak)) void handle_oled_keypress(uint16_t keycode, keyrecord_t *record) {}
-
-__attribute__ ((weak)) oled_rotation_t rotate_master(oled_rotation_t rotation) {return rotation;}
-__attribute__ ((weak)) oled_rotation_t rotate_slave(oled_rotation_t rotation) {return rotation;}
-
-void oled_timer_reset(void) { oled_timer = timer_read32(); }
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-
-    if (!is_keyboard_master()) {
-        return rotate_slave(rotation);
-    }
-
-    return rotate_master(rotation);
-}
-
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-    logged_row = record->event.key.row;
-    logged_col = record->event.key.col;
-
-    handle_oled_keypress(keycode, record);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_master_oled();
-    } else {
-        render_slave_oled();
-    }
-    return false;
-}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators.h b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators.h
deleted file mode 100644
index 038d9eff2c2..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "jpe230.h"
-#include <stdio.h>
-
-#define ANIM_SIZE 352 // number of bytes in array, max is 1024 (minimize where possible)
-#define IDLE_FRAMES 67 //number of total frames
-
-void change_frame_up(uint8_t frame_number);
-void change_frame_down(uint8_t frame_number);
-const char first_frame[ANIM_SIZE];
-const uint8_t key_frame[4];
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_down.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_down.c
deleted file mode 100644
index c5d70f20636..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_down.c
+++ /dev/null
@@ -1,463 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "indicators.h"
-
-const uint8_t key_frame[4] = {10, 30, 46, 61};
-
-static const uint16_t cumsum_inds[IDLE_FRAMES+1] = {
-        0, 8, 50, 82, 113, 141, 199, 261, 283, 294, 294, 294, 294, 294, 294,
-        294, 330, 332, 377, 478, 588, 741, 844, 970, 1085, 1172, 1219, 1235, 1242, 1242,
-        1243, 1243, 1244, 1318, 1368, 1466, 1491, 1627, 1797, 1900, 2019, 2094, 2215, 2311, 2375,
-        2404, 2404, 2404, 2404, 2477, 2479, 2515, 2560, 2614, 2728, 2884, 2961, 3072, 3143, 3164,
-        3167, 3167, 3167, 3167, 3169, 3171, 3221, 3221,
-};
-
-static const uint16_t change_inds[3221] = {
-        173, 174, 175, 176, 177, 207, 208, 209, 135, 136, 137, 138, 139, 140, 141,
-        142, 143, 144, 145, 146, 147, 148, 167, 168, 169, 170, 171, 172, 173, 174,
-        175, 176, 177, 178, 179, 180, 206, 207, 208, 209, 210, 211, 212, 238, 239,
-        240, 241, 242, 243, 244, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-        144, 145, 146, 147, 148, 149, 166, 167, 168, 169, 171, 172, 181, 213, 238,
-        239, 240, 241, 242, 243, 244, 245, 134, 135, 136, 137, 138, 139, 140, 141,
-        142, 143, 144, 145, 146, 147, 148, 149, 166, 167, 168, 171, 172, 181, 213,
-        238, 239, 240, 241, 242, 243, 244, 245, 39, 102, 135, 136, 137, 138, 139,
-        140, 141, 142, 143, 144, 145, 146, 147, 148, 167, 169, 170, 171, 173, 238,
-        239, 240, 241, 242, 243, 244, 0, 2, 3, 4, 5, 7, 8, 10, 11,
-        12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-        27, 28, 29, 30, 39, 62, 94, 96, 97, 98, 100, 102, 126, 134, 136,
-        137, 140, 148, 158, 166, 180, 190, 198, 212, 222, 230, 244, 254, 262, 286,
-        294, 318, 326, 350, 0, 2, 3, 4, 5, 7, 8, 10, 11, 12, 13,
-        14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
-        29, 30, 62, 64, 65, 66, 67, 94, 96, 97, 98, 99, 100, 102, 126,
-        131, 134, 158, 163, 166, 190, 195, 198, 222, 227, 230, 254, 259, 262, 286,
-        291, 294, 318, 323, 326, 350, 32, 33, 64, 65, 66, 67, 97, 99, 129,
-        131, 161, 163, 193, 195, 225, 227, 257, 259, 289, 291, 321, 323, 32, 33,
-        65, 97, 129, 161, 193, 225, 257, 289, 321, 136, 137, 138, 139, 140, 141,
-        142, 143, 144, 145, 146, 147, 168, 169, 170, 171, 172, 173, 174, 175, 176,
-        177, 178, 179, 206, 207, 208, 209, 210, 211, 238, 239, 240, 241, 242, 243,
-        175, 176, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
-        150, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
-        182, 183, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
-        213, 214, 108, 109, 110, 111, 112, 113, 114, 132, 133, 134, 135, 136, 137,
-        138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
-        153, 154, 155, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-        176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 196, 197, 198,
-        199, 200, 201, 202, 203, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
-        215, 216, 217, 218, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238,
-        239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 38, 39,
-        40, 42, 43, 44, 45, 46, 47, 48, 50, 51, 54, 55, 56, 65, 66,
-        67, 90, 91, 92, 97, 108, 109, 110, 111, 112, 113, 114, 120, 121, 122,
-        123, 124, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
-        146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 164, 165, 168, 169, 171,
-        172, 174, 182, 186, 187, 193, 194, 196, 197, 198, 199, 203, 207, 208, 210,
-        211, 213, 217, 218, 220, 221, 223, 228, 229, 230, 231, 232, 233, 234, 235,
-        236, 237, 238, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 261,
-        262, 264, 265, 38, 39, 40, 42, 43, 44, 45, 46, 47, 48, 50, 51,
-        54, 55, 56, 65, 66, 67, 89, 90, 91, 92, 93, 94, 95, 97, 111,
-        112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 132, 133,
-        134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
-        149, 150, 151, 152, 153, 154, 160, 161, 162, 163, 165, 166, 167, 168, 169,
-        170, 172, 179, 183, 184, 185, 186, 193, 194, 197, 198, 202, 205, 206, 207,
-        208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 220, 221, 223, 229,
-        230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
-        245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 261, 262, 264, 265,
-        266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 290, 291, 292, 293,
-        294, 295, 296, 297, 320, 321, 62, 63, 84, 85, 86, 87, 88, 89, 90,
-        91, 92, 93, 94, 95, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
-        115, 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, 133, 134, 135, 136,
-        137, 139, 140, 141, 142, 147, 150, 151, 152, 153, 160, 161, 162, 163, 181,
-        184, 185, 230, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 266,
-        267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
-        282, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 320,
-        321, 322, 323, 324, 30, 31, 52, 53, 54, 55, 56, 57, 58, 59, 60,
-        61, 62, 63, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
-        85, 86, 87, 88, 89, 90, 91, 92, 93, 96, 97, 98, 99, 100, 101,
-        102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
-        128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 250, 251, 252, 253, 254,
-        255, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
-        284, 285, 286, 287, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
-        303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 320, 321, 322, 323,
-        324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 20, 21, 22, 23, 24,
-        25, 26, 27, 28, 29, 30, 31, 41, 42, 43, 44, 45, 46, 47, 48,
-        49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 64,
-        65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-        80, 81, 82, 83, 84, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
-        106, 146, 280, 281, 282, 283, 284, 285, 286, 287, 301, 302, 303, 304, 305,
-        306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 323,
-        324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
-        339, 340, 341, 342, 343, 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, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
-        146, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 331, 332, 333, 334,
-        335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
-        350, 351, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
-        13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 32, 33, 34, 35, 36,
-        37, 38, 39, 40, 41, 42, 43, 64, 341, 342, 343, 344, 345, 346, 347,
-        348, 349, 350, 351, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-        11, 12, 32, 33, 351, 0, 1, 2, 3, 4, 5, 6, 146, 146, 135,
-        136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
-        151, 152, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 177, 178, 179,
-        180, 181, 182, 183, 184, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
-        208, 209, 210, 211, 212, 213, 214, 215, 216, 230, 231, 232, 233, 234, 235,
-        236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 137, 138,
-        139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 168, 169, 170,
-        171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 200, 201, 202,
-        203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 237, 238, 239,
-        240, 241, 242, 108, 109, 110, 111, 112, 113, 114, 132, 133, 134, 135, 136,
-        137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
-        152, 153, 154, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-        176, 177, 178, 181, 182, 183, 184, 185, 186, 195, 196, 197, 198, 199, 200,
-        201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 213, 214, 215, 216,
-        217, 218, 219, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-        240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 108, 109, 110, 111,
-        112, 113, 114, 133, 134, 136, 144, 150, 154, 185, 195, 204, 211, 219, 231,
-        234, 235, 243, 244, 247, 250, 34, 35, 36, 37, 38, 41, 42, 43, 44,
-        45, 46, 47, 48, 49, 52, 53, 55, 64, 65, 89, 90, 91, 92, 122,
-        123, 124, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
-        142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 161, 164,
-        166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 178, 182, 183, 184,
-        185, 186, 193, 196, 203, 204, 205, 206, 207, 208, 209, 210, 211, 217, 218,
-        225, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240,
-        241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 252, 285, 288, 289, 313,
-        314, 315, 316, 317, 323, 324, 327, 328, 329, 330, 331, 332, 333, 334, 335,
-        336, 337, 338, 339, 340, 342, 343, 26, 27, 28, 29, 30, 31, 34, 35,
-        36, 37, 38, 41, 42, 43, 44, 45, 46, 47, 48, 49, 52, 53, 55,
-        64, 65, 89, 90, 91, 92, 95, 96, 97, 98, 99, 100, 101, 102, 103,
-        104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 119,
-        120, 121, 122, 123, 124, 125, 126, 129, 130, 131, 132, 133, 134, 135, 136,
-        137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
-        152, 153, 161, 165, 171, 172, 177, 183, 184, 185, 193, 197, 198, 199, 200,
-        201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 216, 217, 224, 225, 226,
-        227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
-        242, 243, 244, 245, 246, 247, 248, 249, 250, 252, 281, 282, 283, 284, 285,
-        286, 287, 288, 289, 313, 314, 315, 316, 317, 323, 324, 327, 328, 329, 330,
-        331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 342, 343, 26, 27, 28,
-        29, 30, 31, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
-        97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-        112, 113, 114, 115, 116, 117, 119, 120, 121, 122, 123, 124, 125, 126, 224,
-        225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-        240, 241, 242, 244, 245, 246, 247, 248, 256, 257, 258, 259, 260, 261, 262,
-        263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277,
-        278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 63, 64, 65, 66, 67,
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
-        83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
-        98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
-        113, 114, 115, 116, 117, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265,
-        266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280,
-        281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
-        296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
-        311, 312, 313, 314, 315, 316, 317, 318, 319, 53, 54, 55, 56, 57, 58,
-        59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
-        74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
-        89, 90, 91, 92, 93, 94, 95, 288, 289, 290, 291, 292, 293, 294, 295,
-        296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
-        311, 312, 313, 314, 315, 316, 317, 318, 319, 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, 67,
-        68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
-        83, 84, 85, 86, 87, 88, 288, 289, 290, 291, 292, 293, 294, 295, 296,
-        297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
-        312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326,
-        327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341,
-        342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 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, 58, 59, 60, 61, 62, 63, 320,
-        321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
-        336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
-        351, 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, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
-        332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
-        347, 348, 349, 350, 351, 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, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
-        145, 146, 147, 148, 149, 150, 151, 152, 166, 167, 168, 169, 170, 171, 173,
-        174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 198, 199, 200, 201,
-        202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
-        231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245,
-        246, 247, 175, 176, 140, 141, 142, 143, 144, 145, 169, 170, 171, 172, 173,
-        174, 175, 176, 177, 178, 179, 180, 181, 199, 200, 201, 202, 203, 204, 205,
-        206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 137, 138, 139, 140, 141,
-        142, 143, 144, 145, 166, 167, 168, 169, 170, 173, 174, 175, 176, 182, 183,
-        196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 214, 215,
-        216, 217, 218, 241, 242, 243, 244, 245, 246, 247, 136, 137, 138, 139, 140,
-        141, 142, 143, 144, 145, 165, 166, 167, 168, 174, 175, 178, 179, 180, 181,
-        182, 183, 184, 195, 196, 197, 204, 216, 219, 227, 228, 229, 230, 231, 232,
-        233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247,
-        248, 249, 250, 251, 20, 21, 22, 23, 49, 50, 51, 52, 78, 79, 80,
-        107, 108, 109, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 165, 166,
-        167, 168, 174, 175, 178, 179, 180, 181, 182, 183, 184, 193, 194, 195, 196,
-        197, 204, 216, 219, 224, 225, 227, 228, 229, 230, 231, 232, 233, 234, 235,
-        236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250,
-        251, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
-        270, 271, 272, 273, 274, 275, 276, 320, 321, 322, 323, 324, 325, 326, 327,
-        328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 15, 16,
-        17, 18, 20, 21, 22, 23, 44, 45, 46, 47, 49, 50, 51, 52, 73,
-        74, 75, 76, 78, 79, 80, 102, 103, 104, 107, 108, 109, 131, 132, 133,
-        136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 160, 161, 162, 165, 166,
-        167, 168, 169, 173, 175, 181, 183, 184, 185, 186, 187, 188, 189, 190, 191,
-        193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
-        208, 216, 217, 218, 224, 225, 242, 243, 244, 245, 246, 247, 256, 257, 258,
-        259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
-        274, 275, 276, 279, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
-        299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 320, 321,
-        322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
-        337, 338, 339, 340, 13, 14, 15, 16, 17, 18, 42, 43, 44, 45, 46,
-        47, 70, 71, 72, 73, 74, 75, 76, 99, 100, 101, 102, 103, 104, 128,
-        129, 130, 131, 132, 133, 160, 161, 162, 183, 184, 185, 186, 187, 188, 189,
-        190, 191, 208, 215, 216, 217, 247, 249, 279, 281, 288, 289, 290, 291, 292,
-        293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
-        308, 309, 310, 311, 312, 313, 8, 9, 10, 11, 13, 14, 15, 16, 37,
-        38, 39, 40, 42, 43, 44, 45, 66, 67, 68, 69, 70, 71, 72, 73,
-        96, 97, 98, 99, 100, 101, 102, 128, 129, 130, 131, 156, 157, 158, 159,
-        160, 185, 186, 187, 188, 189, 190, 191, 208, 216, 217, 220, 249, 252, 281,
-        284, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
-        302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 316, 320, 321,
-        322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336,
-        337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 3, 4, 5,
-        6, 8, 9, 10, 11, 32, 33, 34, 35, 37, 38, 39, 40, 64, 66,
-        67, 68, 69, 96, 97, 98, 156, 157, 158, 159, 188, 189, 191, 206, 208,
-        220, 223, 252, 255, 284, 287, 316, 319, 320, 321, 322, 323, 324, 325, 326,
-        327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341,
-        342, 343, 344, 345, 346, 347, 348, 351, 0, 1, 2, 3, 4, 5, 6,
-        32, 33, 34, 35, 64, 159, 191, 205, 206, 223, 255, 287, 319, 351, 0,
-        1, 2, 205, 207, 207, 216, 138, 139, 140, 141, 142, 143, 144, 145, 167,
-        168, 169, 170, 171, 172, 173, 174, 175, 177, 178, 179, 180, 181, 182, 197,
-        198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
-        213, 214, 215, 216, 217, 241, 242, 243, 244, 245, 246,
-};
-
-static const char change_vals[3221] = {
-        0x18, 0x1C, 0xFC, 0xFC, 0xFC, 0x0F, 0x0F, 0x0F, 0xE0, 0xE0, 0xF0, 0xF0, 0xF0, 0xF8, 0xF8,
-        0xFC, 0xFC, 0xFE, 0xFE, 0xFE, 0xFC, 0xFC, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F,
-        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0xF0, 0xF8, 0xF8, 0xF8, 0xFC, 0xFC, 0xFC, 0xFE, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0x1F,
-        0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x00, 0xF0, 0xF0, 0xF0, 0xF8, 0xF8, 0xF8, 0xFC,
-        0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0x00, 0x00, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
-        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x80, 0x80, 0x00, 0xE0, 0xE0, 0xE0, 0xE0,
-        0xF0, 0xF0, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x00, 0x03, 0x03, 0x03, 0x01, 0x03,
-        0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x80, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x02,
-        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x02, 0x02, 0xFC, 0x00, 0xFF, 0xFF, 0x08, 0x04, 0x04, 0x02, 0xFE, 0xFF, 0xFF, 0xC0,
-        0xC0, 0xE0, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x08, 0x08, 0x04, 0xFC, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00,
-        0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00,
-        0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x80, 0x80, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF,
-        0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0xA0, 0x60, 0x80, 0xC0, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0,
-        0x80, 0x06, 0x0F, 0x0F, 0x0F, 0x0F, 0x03, 0x81, 0xC1, 0xC1, 0xE1, 0xFB, 0xFF, 0x7F, 0x3F,
-        0x1F, 0x06, 0xF0, 0xF8, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xF7, 0xF3, 0xF1, 0xF1, 0xF0, 0xF0,
-        0xF0, 0xF0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xE0, 0xF8, 0xFC, 0xFE, 0xFE, 0xFF,
-        0xFF, 0xFF, 0x3F, 0x3F, 0x1F, 0x1F, 0x1F, 0x3F, 0x3F, 0x7F, 0xFF, 0xFF, 0xFF, 0xFE, 0xFE,
-        0xFC, 0xF8, 0xC0, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x80, 0xC0, 0xC0,
-        0xE0, 0xF0, 0xF8, 0xFC, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F, 0x1F, 0x0F, 0x03, 0x80, 0xE0, 0xF0,
-        0xF8, 0xF8, 0xFC, 0xFE, 0xFF, 0xBF, 0x9F, 0x9F, 0x8F, 0x87, 0x87, 0x83, 0x81, 0x81, 0x80,
-        0x80, 0x80, 0x80, 0x80, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F,
-        0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x80, 0x40,
-        0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x80, 0xC0, 0x18,
-        0x04, 0x01, 0x04, 0xB0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20,
-        0x08, 0x03, 0x00, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE, 0xFE, 0xFE, 0x7E, 0x3E, 0x3F, 0xBF, 0x7F,
-        0x7E, 0xFE, 0xFE, 0xFE, 0xFE, 0xFD, 0xF8, 0xF0, 0xC0, 0x00, 0x00, 0x43, 0x13, 0x0B, 0x07,
-        0x02, 0x80, 0x7F, 0x07, 0x00, 0x02, 0x01, 0x00, 0xC0, 0xE0, 0xF0, 0xFE, 0x8F, 0x87, 0x83,
-        0x81, 0x80, 0xC0, 0xA0, 0x10, 0x08, 0x04, 0x00, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
-        0x8F, 0x4F, 0x2F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x40,
-        0x60, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x60, 0x30, 0x18, 0x0C, 0x02, 0x00, 0x80,
-        0x40, 0x40, 0x20, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,
-        0xC0, 0xE0, 0xF0, 0xF8, 0xF8, 0xFC, 0xFE, 0xFE, 0x7D, 0x7C, 0x7C, 0x7C, 0xFC, 0xFC, 0xF8,
-        0xF8, 0xF8, 0xF0, 0xE0, 0x80, 0x00, 0x04, 0x02, 0x01, 0x01, 0x00, 0x07, 0x07, 0x07, 0x07,
-        0x07, 0x01, 0xFF, 0x3F, 0x1F, 0x07, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFC, 0xFF, 0xCF, 0xCF,
-        0xC7, 0xC3, 0xC3, 0xC1, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-        0x87, 0x87, 0x47, 0x27, 0x20, 0x10, 0x18, 0x08, 0x04, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
-        0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x08, 0x04, 0x02, 0x02, 0x01, 0xC0, 0x60, 0x30, 0x18,
-        0x0C, 0x04, 0x02, 0x01, 0x06, 0x01, 0x80, 0x40, 0x80, 0x80, 0x40, 0x20, 0x30, 0x18, 0x0C,
-        0x04, 0x02, 0x01, 0x00, 0x00, 0x80, 0x80, 0x40, 0x60, 0x20, 0x10, 0x08, 0x0C, 0x04, 0x02,
-        0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x30, 0x10, 0x08, 0x0C, 0x04, 0xC2, 0xF1,
-        0xF1, 0xF8, 0xF8, 0xFC, 0x7C, 0xF8, 0xF0, 0xE0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F,
-        0x0F, 0x00, 0x03, 0x07, 0x07, 0x07, 0x07, 0x00, 0x80, 0x80, 0x40, 0x60, 0x20, 0x30, 0x00,
-        0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x60, 0x20, 0x10, 0x18, 0x08, 0x04, 0x06, 0x02, 0x01,
-        0x01, 0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x10, 0x18, 0x0C, 0x04, 0x02, 0x03, 0x01, 0x18,
-        0x0C, 0x06, 0x03, 0x01, 0x80, 0xC0, 0x80, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06,
-        0x03, 0x01, 0x00, 0x80, 0x80, 0xC0, 0x60, 0x20, 0x30, 0x18, 0x0C, 0x04, 0x06, 0x03, 0x01,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x60, 0x30, 0x30, 0x18, 0x0C,
-        0x04, 0x06, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0x60,
-        0x60, 0x30, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0,
-        0x60, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06, 0x06, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x80,
-        0xC0, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x01, 0x80, 0x80, 0xC0, 0x60, 0x70,
-        0x30, 0x18, 0x0C, 0x0E, 0x07, 0x03, 0x01, 0x80, 0x80, 0xC0, 0xE0, 0x60, 0x30, 0x18, 0x1C,
-        0x0C, 0x06, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0,
-        0x60, 0x70, 0x30, 0x18, 0x1C, 0x0C, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0xE0, 0x60, 0x30, 0x38, 0x18, 0x0C, 0x0C, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0x60, 0x70, 0x30, 0x18, 0x0C,
-        0x0E, 0x06, 0x03, 0x03, 0x01, 0x80, 0xC0, 0xE0, 0x60, 0x70, 0x38, 0x1C, 0x0C, 0x0E, 0x07,
-        0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0x60,
-        0x70, 0x38, 0x1C, 0x0C, 0x0E, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0xE0, 0x70, 0x30, 0x38, 0x1C, 0x0C,
-        0x0E, 0x07, 0xC0, 0xE0, 0xE0, 0x70, 0x38, 0x3C, 0x1C, 0x0E, 0x0F, 0x07, 0x03, 0x01, 0x01,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x80, 0x3C, 0x1E, 0x0E, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFC, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xC0, 0xC0,
-        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x07, 0x07, 0x07,
-        0x07, 0x07, 0xE1, 0xE1, 0xE1, 0xE1, 0xF1, 0xFF, 0xFF, 0xFF, 0xBF, 0x1F, 0x38, 0x78, 0xFC,
-        0xFC, 0xF8, 0xF0, 0xE1, 0xE0, 0xE1, 0xF1, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F, 0x01, 0x01, 0x01,
-        0x01, 0x01, 0x01, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xF0, 0xFC, 0xFE, 0xFE, 0xFF,
-        0xFF, 0xFF, 0x7F, 0x3F, 0x3F, 0x1F, 0x1F, 0x1F, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE,
-        0xFC, 0xF8, 0xF0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0xF8, 0xF8, 0xF8, 0xF8,
-        0xF8, 0xF8, 0xFC, 0xFF, 0xFF, 0xBF, 0x9F, 0x1F, 0x07, 0x60, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
-        0xF0, 0xF0, 0x80, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x83, 0xC7, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFE, 0x30, 0x03, 0x07, 0x0F, 0x1F, 0x1F, 0x1F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
-        0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x1F, 0x1F, 0x1F, 0x0F, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xF8, 0xFC, 0xFE, 0x3F, 0xFE, 0xE0, 0x0F, 0x00, 0x81, 0xD7, 0x00, 0x0F,
-        0x1F, 0x1F, 0x1F, 0x1F, 0x0F, 0x01, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20,
-        0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x80, 0x02, 0x01, 0x01, 0x02, 0x08, 0xE0, 0x40,
-        0x20, 0x0F, 0xF8, 0x08, 0x08, 0x08, 0xC8, 0xF8, 0xF8, 0xF8, 0xFC, 0xFC, 0xFC, 0x7E, 0x7E,
-        0x7E, 0x3E, 0x7E, 0x7E, 0xFE, 0xFC, 0xFC, 0xFC, 0xFC, 0xFA, 0xF1, 0x80, 0x00, 0xFF, 0x00,
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x60, 0xF0, 0xF0, 0xF0, 0xF0, 0xF8, 0xBF, 0x9F, 0x1F,
-        0x07, 0x00, 0xFF, 0x00, 0xE0, 0xC1, 0x81, 0x81, 0x81, 0x81, 0x81, 0xC3, 0xFF, 0xFE, 0x00,
-        0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x07, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
-        0x0F, 0x0F, 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x01, 0x08, 0x10, 0x40, 0xFF, 0x40, 0x80, 0x80,
-        0x40, 0x20, 0x18, 0x07, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x0C, 0x18, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x10,
-        0x10, 0x08, 0x08, 0x0C, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0xF0,
-        0xF8, 0xF8, 0xF8, 0xF8, 0x7C, 0x7C, 0x7C, 0x7C, 0xFC, 0xF8, 0xF8, 0xF8, 0xF8, 0xF0, 0xE0,
-        0xC0, 0x00, 0x00, 0x00, 0x03, 0x00, 0xF0, 0x1F, 0x0F, 0x00, 0x00, 0x00, 0x78, 0xF8, 0xF8,
-        0xF8, 0xF8, 0xF0, 0xC0, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xE3, 0x7E, 0x00, 0x40, 0x40, 0x40,
-        0x40, 0x40, 0x40, 0x40, 0x41, 0x43, 0x43, 0x43, 0x47, 0x47, 0x47, 0x47, 0x47, 0x47, 0x47,
-        0x47, 0x07, 0x87, 0x83, 0x83, 0x81, 0x80, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02,
-        0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0xC0, 0x40, 0x40, 0x60, 0x20, 0x30, 0x10, 0x02,
-        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x01,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07,
-        0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-        0x18, 0x08, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-        0x10, 0x30, 0x30, 0x20, 0x20, 0x20, 0x60, 0x40, 0x40, 0xC0, 0x80, 0x18, 0x18, 0x18, 0x18,
-        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08,
-        0x0C, 0x0C, 0x0C, 0x0C, 0x04, 0x04, 0x06, 0x06, 0x02, 0x03, 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, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-        0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x04, 0x04, 0x04, 0x0C, 0x0C, 0x0C, 0x08, 0x18, 0x80, 0x80, 0x80, 0x80, 0x80, 0xC0,
-        0xC0, 0xC0, 0x40, 0x60, 0x60, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03,
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x10, 0x10, 0x10, 0x30,
-        0x30, 0x30, 0x30, 0x30, 0x20, 0x20, 0x60, 0x60, 0x60, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0C, 0x0C, 0x0C,
-        0x0C, 0x0C, 0x0C, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
-        0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0x60, 0x60, 0x60,
-        0x60, 0x60, 0x70, 0x70, 0x70, 0x30, 0x30, 0x30, 0x38, 0x38, 0x18, 0x18, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0,
-        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0xC0, 0xC0,
-        0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-        0x80, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-        0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0x20, 0xE0, 0xF8, 0xFF, 0xFF, 0xFF,
-        0x3F, 0x07, 0x01, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x18, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3C,
-        0x3C, 0x3C, 0x3C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3C, 0x3C, 0xC0, 0xF0, 0xFC, 0xFE, 0xFC,
-        0xFE, 0xFE, 0x7E, 0x0C, 0xC0, 0xF0, 0xFE, 0xFF, 0xFF, 0x3F, 0x0F, 0x01, 0x00, 0xC0, 0xC0,
-        0xF8, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xF8, 0xF8, 0xF8, 0xF8, 0xFF, 0xFF,
-        0xF8, 0xF8, 0xF8, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x80, 0xF0, 0xFE, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0x3F, 0x07, 0xC0, 0xF0, 0xFE, 0xFF, 0x07, 0x00, 0xE0, 0xE0, 0xE0, 0xE0,
-        0xE0, 0xE0, 0xE0, 0xF8, 0xFE, 0xFF, 0xF8, 0xFF, 0xF8, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F,
-        0x1F, 0x01, 0x01, 0x01, 0x80, 0x30, 0x0C, 0x01, 0x80, 0x30, 0x04, 0x01, 0xC0, 0x10, 0x06,
-        0xC0, 0x18, 0x06, 0x60, 0x98, 0xF3, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x7C, 0x0C, 0x60, 0x88,
-        0xF3, 0xFC, 0x0F, 0x01, 0xC0, 0xC0, 0xC0, 0xF0, 0xC0, 0xC0, 0x00, 0x80, 0x20, 0x0C, 0xF1,
-        0xFE, 0xF9, 0xF8, 0x00, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x07, 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, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x70,
-        0x0C, 0x03, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x30, 0x0E, 0x01, 0x00, 0x00, 0x00, 0x00, 0xC0,
-        0x38, 0x06, 0x01, 0x00, 0x00, 0x00, 0xC0, 0x38, 0x07, 0x00, 0x00, 0x00, 0xE0, 0x18, 0x07,
-        0x00, 0x00, 0xC0, 0xF0, 0xF8, 0xF8, 0xF8, 0xF8, 0x78, 0x18, 0x60, 0x1C, 0x03, 0x00, 0x00,
-        0xC0, 0xF8, 0xFE, 0x7F, 0x03, 0xC0, 0xFC, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-        0x00, 0x00, 0x00, 0x00, 0x78, 0x7E, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7D, 0x7C, 0x7C, 0x7C,
-        0x7C, 0xFC, 0x78, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0xFF, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xC0, 0x38, 0x07, 0x01, 0x00, 0x00, 0xE0, 0x38, 0x07, 0x01, 0x00,
-        0x00, 0x80, 0xE0, 0x1C, 0x07, 0x00, 0x00, 0x00, 0x80, 0x70, 0x1C, 0x03, 0x00, 0x00, 0x80,
-        0x70, 0x0E, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x02, 0x78, 0x7C, 0x7C, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x20, 0x20, 0x20, 0x20, 0x20,
-        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-        0x20, 0x20, 0x20, 0x20, 0x20, 0x3F, 0xC0, 0x78, 0x1E, 0x03, 0x00, 0x00, 0x00, 0x00, 0xC0,
-        0x78, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x38, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00,
-        0x3C, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80,
-        0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x7C, 0x78, 0x78, 0xFF, 0x00, 0xFF, 0x00,
-        0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x30, 0x30,
-        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3F, 0xC0, 0xF8, 0x1E,
-        0x07, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x78, 0x1F, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0xFF, 0x78, 0x78,
-        0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x3F, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x7C, 0x78, 0x7C, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-uint16_t index_start2 = 0;
-uint16_t index_end2 = 0;
-void change_frame_up(uint8_t frame_number){
-// for n changes this frame, change those bytes by change_inds and change_vals
-        index_start2 = cumsum_inds[frame_number-1];
-        index_end2 = cumsum_inds[frame_number];
-        if (index_start2 != index_end2){  // if a change in buffer
-                for (uint16_t i=index_start2; i < index_end2; i++){
-                        oled_write_raw_byte(change_vals[i], change_inds[i]);
-                }
-        }
-}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_up.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_up.c
deleted file mode 100644
index 29128380124..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/indicators_up.c
+++ /dev/null
@@ -1,461 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "indicators.h"
-
-static const uint16_t cumsum_inds[IDLE_FRAMES+1] = {
-        0, 50, 52, 54, 54, 54, 54, 57, 78, 149, 260, 337, 493, 607, 661,
-        706, 742, 744, 817, 817, 817, 817, 846, 910, 1006, 1127, 1202, 1321, 1424, 1594,
-        1730, 1755, 1853, 1903, 1977, 1978, 1978, 1979, 1979, 1986, 2002, 2049, 2136, 2251, 2377,
-        2480, 2633, 2743, 2844, 2889, 2891, 2927, 2927, 2927, 2927, 2927, 2927, 2927, 2938, 2960,
-        3022, 3080, 3108, 3139, 3171, 3213, 3221, 3221,
-};
-
-static const uint16_t change_inds[3221] = {
-        138, 139, 140, 141, 142, 143, 144, 145, 167, 168, 169, 170, 171, 172, 173,
-        174, 175, 177, 178, 179, 180, 181, 182, 197, 198, 199, 200, 201, 202, 203,
-        204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 241,
-        242, 243, 244, 245, 246, 207, 216, 205, 207, 0, 1, 2, 0, 1, 2,
-        3, 4, 5, 6, 32, 33, 34, 35, 64, 159, 191, 205, 206, 223, 255,
-        287, 319, 351, 3, 4, 5, 6, 8, 9, 10, 11, 32, 33, 34, 35,
-        37, 38, 39, 40, 64, 66, 67, 68, 69, 96, 97, 98, 156, 157, 158,
-        159, 188, 189, 191, 206, 208, 220, 223, 252, 255, 284, 287, 316, 319, 320,
-        321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
-        336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 351, 8,
-        9, 10, 11, 13, 14, 15, 16, 37, 38, 39, 40, 42, 43, 44, 45,
-        66, 67, 68, 69, 70, 71, 72, 73, 96, 97, 98, 99, 100, 101, 102,
-        128, 129, 130, 131, 156, 157, 158, 159, 160, 185, 186, 187, 188, 189, 190,
-        191, 208, 216, 217, 220, 249, 252, 281, 284, 288, 289, 290, 291, 292, 293,
-        294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308,
-        309, 310, 311, 312, 313, 316, 320, 321, 322, 323, 324, 325, 326, 327, 328,
-        329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343,
-        344, 345, 346, 347, 348, 13, 14, 15, 16, 17, 18, 42, 43, 44, 45,
-        46, 47, 70, 71, 72, 73, 74, 75, 76, 99, 100, 101, 102, 103, 104,
-        128, 129, 130, 131, 132, 133, 160, 161, 162, 183, 184, 185, 186, 187, 188,
-        189, 190, 191, 208, 215, 216, 217, 247, 249, 279, 281, 288, 289, 290, 291,
-        292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
-        307, 308, 309, 310, 311, 312, 313, 15, 16, 17, 18, 20, 21, 22, 23,
-        44, 45, 46, 47, 49, 50, 51, 52, 73, 74, 75, 76, 78, 79, 80,
-        102, 103, 104, 107, 108, 109, 131, 132, 133, 136, 137, 138, 139, 140, 141,
-        142, 143, 144, 145, 160, 161, 162, 165, 166, 167, 168, 169, 173, 175, 181,
-        183, 184, 185, 186, 187, 188, 189, 190, 191, 193, 194, 195, 196, 197, 198,
-        199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 216, 217, 218, 224, 225,
-        242, 243, 244, 245, 246, 247, 256, 257, 258, 259, 260, 261, 262, 263, 264,
-        265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 279, 288, 289,
-        290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
-        305, 306, 307, 308, 309, 310, 311, 320, 321, 322, 323, 324, 325, 326, 327,
-        328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 20, 21,
-        22, 23, 49, 50, 51, 52, 78, 79, 80, 107, 108, 109, 136, 137, 138,
-        139, 140, 141, 142, 143, 144, 145, 165, 166, 167, 168, 174, 175, 178, 179,
-        180, 181, 182, 183, 184, 193, 194, 195, 196, 197, 204, 216, 219, 224, 225,
-        227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
-        242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 256, 257, 258, 259, 260,
-        261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275,
-        276, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333,
-        334, 335, 336, 337, 338, 339, 340, 136, 137, 138, 139, 140, 141, 142, 143,
-        144, 145, 165, 166, 167, 168, 174, 175, 178, 179, 180, 181, 182, 183, 184,
-        195, 196, 197, 204, 216, 219, 227, 228, 229, 230, 231, 232, 233, 234, 235,
-        236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250,
-        251, 137, 138, 139, 140, 141, 142, 143, 144, 145, 166, 167, 168, 169, 170,
-        173, 174, 175, 176, 182, 183, 196, 197, 198, 199, 200, 201, 202, 203, 204,
-        205, 206, 207, 208, 214, 215, 216, 217, 218, 241, 242, 243, 244, 245, 246,
-        247, 140, 141, 142, 143, 144, 145, 169, 170, 171, 172, 173, 174, 175, 176,
-        177, 178, 179, 180, 181, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
-        209, 210, 211, 212, 213, 214, 215, 175, 176, 134, 135, 136, 137, 138, 139,
-        140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 166, 167,
-        168, 169, 170, 171, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
-        184, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
-        212, 213, 214, 215, 216, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240,
-        241, 242, 243, 244, 245, 246, 247, 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, 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, 320, 321, 322, 323, 324, 325, 326,
-        327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341,
-        342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 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, 58, 59, 60, 61, 62, 63, 320,
-        321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
-        336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
-        351, 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, 67, 68, 69, 70, 71, 72, 73, 74, 75,
-        76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 288, 289,
-        290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
-        305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
-        320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
-        335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
-        350, 351, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
-        66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
-        81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-        288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
-        303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
-        318, 319, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
-        76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
-        91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
-        106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 256, 257, 258,
-        259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
-        274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288,
-        289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
-        304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
-        319, 26, 27, 28, 29, 30, 31, 85, 86, 87, 88, 89, 90, 91, 92,
-        93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
-        108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 119, 120, 121, 122, 123,
-        124, 125, 126, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
-        236, 237, 238, 239, 240, 241, 242, 244, 245, 246, 247, 248, 256, 257, 258,
-        259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
-        274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 26,
-        27, 28, 29, 30, 31, 34, 35, 36, 37, 38, 41, 42, 43, 44, 45,
-        46, 47, 48, 49, 52, 53, 55, 64, 65, 89, 90, 91, 92, 95, 96,
-        97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-        112, 113, 114, 115, 116, 117, 119, 120, 121, 122, 123, 124, 125, 126, 129,
-        130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
-        145, 146, 147, 148, 149, 150, 151, 152, 153, 161, 165, 171, 172, 177, 183,
-        184, 185, 193, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
-        209, 210, 216, 217, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
-        235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
-        250, 252, 281, 282, 283, 284, 285, 286, 287, 288, 289, 313, 314, 315, 316,
-        317, 323, 324, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
-        339, 340, 342, 343, 34, 35, 36, 37, 38, 41, 42, 43, 44, 45, 46,
-        47, 48, 49, 52, 53, 55, 64, 65, 89, 90, 91, 92, 122, 123, 124,
-        129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-        144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 161, 164, 166, 167,
-        168, 169, 170, 171, 172, 173, 174, 175, 176, 178, 182, 183, 184, 185, 186,
-        193, 196, 203, 204, 205, 206, 207, 208, 209, 210, 211, 217, 218, 225, 227,
-        228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
-        243, 244, 245, 246, 247, 248, 249, 250, 252, 285, 288, 289, 313, 314, 315,
-        316, 317, 323, 324, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337,
-        338, 339, 340, 342, 343, 108, 109, 110, 111, 112, 113, 114, 133, 134, 136,
-        144, 150, 154, 185, 195, 204, 211, 219, 231, 234, 235, 243, 244, 247, 250,
-        108, 109, 110, 111, 112, 113, 114, 132, 133, 134, 135, 136, 137, 138, 139,
-        140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
-        164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
-        181, 182, 183, 184, 185, 186, 195, 196, 197, 198, 199, 200, 201, 202, 203,
-        204, 205, 206, 207, 208, 209, 210, 211, 213, 214, 215, 216, 217, 218, 219,
-        228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
-        243, 244, 245, 246, 247, 248, 249, 250, 137, 138, 139, 140, 141, 142, 143,
-        144, 145, 146, 147, 148, 149, 150, 168, 169, 170, 171, 172, 173, 174, 175,
-        176, 177, 178, 179, 180, 181, 182, 200, 201, 202, 203, 204, 205, 206, 207,
-        208, 209, 210, 211, 212, 213, 214, 237, 238, 239, 240, 241, 242, 135, 136,
-        137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
-        152, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 177, 178, 179, 180,
-        181, 182, 183, 184, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
-        209, 210, 211, 212, 213, 214, 215, 216, 230, 231, 232, 233, 234, 235, 236,
-        237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 146, 146, 0,
-        1, 2, 3, 4, 5, 6, 0, 1, 2, 3, 4, 5, 6, 7, 8,
-        9, 10, 11, 12, 32, 33, 351, 0, 1, 2, 3, 4, 5, 6, 7,
-        8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
-        32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 341, 342,
-        343, 344, 345, 346, 347, 348, 349, 350, 351, 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, 64, 65, 66, 67, 68, 69, 70,
-        71, 72, 73, 74, 146, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
-        331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
-        346, 347, 348, 349, 350, 351, 20, 21, 22, 23, 24, 25, 26, 27, 28,
-        29, 30, 31, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 64, 65, 66, 67, 68,
-        69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
-        84, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 146, 280, 281,
-        282, 283, 284, 285, 286, 287, 301, 302, 303, 304, 305, 306, 307, 308, 309,
-        310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 323, 324, 325, 326, 327,
-        328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342,
-        343, 30, 31, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-        73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
-        88, 89, 90, 91, 92, 93, 96, 97, 98, 99, 100, 101, 102, 103, 104,
-        105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 128, 129, 130,
-        131, 132, 133, 134, 135, 136, 137, 250, 251, 252, 253, 254, 255, 270, 271,
-        272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
-        287, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
-        306, 307, 308, 309, 310, 311, 312, 313, 320, 321, 322, 323, 324, 325, 326,
-        327, 328, 329, 330, 331, 332, 333, 62, 63, 84, 85, 86, 87, 88, 89,
-        90, 91, 92, 93, 94, 95, 105, 106, 107, 108, 109, 110, 111, 112, 113,
-        114, 115, 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, 133, 134, 135,
-        136, 137, 139, 140, 141, 142, 147, 150, 151, 152, 153, 160, 161, 162, 163,
-        181, 184, 185, 230, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
-        266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280,
-        281, 282, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
-        320, 321, 322, 323, 324, 38, 39, 40, 42, 43, 44, 45, 46, 47, 48,
-        50, 51, 54, 55, 56, 65, 66, 67, 89, 90, 91, 92, 93, 94, 95,
-        97, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
-        132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
-        147, 148, 149, 150, 151, 152, 153, 154, 160, 161, 162, 163, 165, 166, 167,
-        168, 169, 170, 172, 179, 183, 184, 185, 186, 193, 194, 197, 198, 202, 205,
-        206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 220, 221,
-        223, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
-        243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 261, 262,
-        264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 290, 291,
-        292, 293, 294, 295, 296, 297, 320, 321, 38, 39, 40, 42, 43, 44, 45,
-        46, 47, 48, 50, 51, 54, 55, 56, 65, 66, 67, 90, 91, 92, 97,
-        108, 109, 110, 111, 112, 113, 114, 120, 121, 122, 123, 124, 132, 133, 134,
-        135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 146, 147, 148, 149, 150,
-        151, 152, 153, 154, 155, 164, 165, 168, 169, 171, 172, 174, 182, 186, 187,
-        193, 194, 196, 197, 198, 199, 203, 207, 208, 210, 211, 213, 217, 218, 220,
-        221, 223, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 241, 242,
-        243, 244, 245, 246, 247, 248, 249, 250, 251, 261, 262, 264, 265, 108, 109,
-        110, 111, 112, 113, 114, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
-        142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 164,
-        165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
-        180, 181, 182, 183, 184, 185, 186, 187, 196, 197, 198, 199, 200, 201, 202,
-        203, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
-        228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
-        243, 244, 245, 246, 247, 248, 249, 250, 251, 137, 138, 139, 140, 141, 142,
-        143, 144, 145, 146, 147, 148, 149, 150, 168, 169, 170, 171, 172, 173, 174,
-        175, 176, 177, 178, 179, 180, 181, 182, 183, 200, 201, 202, 203, 204, 205,
-        206, 207, 208, 209, 210, 211, 212, 213, 214, 175, 176, 136, 137, 138, 139,
-        140, 141, 142, 143, 144, 145, 146, 147, 168, 169, 170, 171, 172, 173, 174,
-        175, 176, 177, 178, 179, 206, 207, 208, 209, 210, 211, 238, 239, 240, 241,
-        242, 243, 32, 33, 65, 97, 129, 161, 193, 225, 257, 289, 321, 32, 33,
-        64, 65, 66, 67, 97, 99, 129, 131, 161, 163, 193, 195, 225, 227, 257,
-        259, 289, 291, 321, 323, 0, 2, 3, 4, 5, 7, 8, 10, 11, 12,
-        13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-        28, 29, 30, 62, 64, 65, 66, 67, 94, 96, 97, 98, 99, 100, 102,
-        126, 131, 134, 158, 163, 166, 190, 195, 198, 222, 227, 230, 254, 259, 262,
-        286, 291, 294, 318, 323, 326, 350, 0, 2, 3, 4, 5, 7, 8, 10,
-        11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
-        26, 27, 28, 29, 30, 39, 62, 94, 96, 97, 98, 100, 102, 126, 134,
-        136, 137, 140, 148, 158, 166, 180, 190, 198, 212, 222, 230, 244, 254, 262,
-        286, 294, 318, 326, 350, 39, 102, 135, 136, 137, 138, 139, 140, 141, 142,
-        143, 144, 145, 146, 147, 148, 167, 169, 170, 171, 173, 238, 239, 240, 241,
-        242, 243, 244, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
-        146, 147, 148, 149, 166, 167, 168, 171, 172, 181, 213, 238, 239, 240, 241,
-        242, 243, 244, 245, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
-        145, 146, 147, 148, 149, 166, 167, 168, 169, 171, 172, 181, 213, 238, 239,
-        240, 241, 242, 243, 244, 245, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-        144, 145, 146, 147, 148, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
-        177, 178, 179, 180, 206, 207, 208, 209, 210, 211, 212, 238, 239, 240, 241,
-        242, 243, 244, 173, 174, 175, 176, 177, 207, 208, 209,
-};
-
-static const char change_vals[3221] = {
-        0xC0, 0xF0, 0xF8, 0xF8, 0xF8, 0xF8, 0x78, 0x18, 0xC0, 0xF8, 0xFE, 0xFF, 0xFF, 0xFF, 0x7F,
-        0x0F, 0x03, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x78, 0x7E, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
-        0x7D, 0x7C, 0x7C, 0x7C, 0x78, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7C, 0x7C, 0x78, 0x07,
-        0x07, 0x07, 0x07, 0x07, 0x07, 0x78, 0x78, 0x78, 0x7C, 0x3F, 0x07, 0x01, 0x00, 0x00, 0x00,
-        0xC0, 0xF8, 0x1E, 0x07, 0xE0, 0x78, 0x1F, 0x03, 0x03, 0xF0, 0xFF, 0x7C, 0x78, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x78, 0x1E, 0x03, 0x00, 0x00, 0x00, 0x00,
-        0xC0, 0x78, 0x0F, 0x03, 0x00, 0xE0, 0x38, 0x0F, 0x01, 0x3C, 0x0F, 0x01, 0x80, 0x80, 0x80,
-        0x80, 0xFF, 0x01, 0x00, 0x7C, 0x7C, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x30,
-        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3F, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xC0, 0x38, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x38, 0x07, 0x01,
-        0x00, 0x00, 0x00, 0x00, 0x80, 0xE0, 0x1C, 0x07, 0x00, 0x00, 0x00, 0x80, 0x70, 0x1C, 0x03,
-        0x80, 0x70, 0x0E, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFE, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x78, 0x7C, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-        0x20, 0x20, 0x20, 0x20, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x70, 0x0C, 0x03, 0x00, 0x00, 0xC0, 0x30,
-        0x0E, 0x01, 0x00, 0x00, 0x00, 0xC0, 0x38, 0x06, 0x01, 0x00, 0x00, 0x00, 0xC0, 0x38, 0x07,
-        0x00, 0x00, 0x00, 0xE0, 0x18, 0x07, 0x60, 0x1C, 0x03, 0xFC, 0x04, 0x04, 0x04, 0x04, 0x04,
-        0x04, 0x04, 0x04, 0x7C, 0xFF, 0xFC, 0x78, 0xFF, 0x00, 0xFF, 0x00, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x30, 0x0C, 0x01,
-        0x00, 0x00, 0x00, 0x00, 0x80, 0x30, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x10, 0x06,
-        0x00, 0x00, 0x00, 0xC0, 0x18, 0x06, 0x00, 0x00, 0x00, 0x60, 0x98, 0xF3, 0xFC, 0xFC, 0xFC,
-        0xFC, 0xFC, 0x7C, 0x0C, 0x00, 0x00, 0x00, 0x60, 0x88, 0xF3, 0xFC, 0xFF, 0x3F, 0x01, 0xF0,
-        0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x0C, 0xF1, 0xFE, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x0C, 0x01,
-        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x07, 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, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xF0, 0xFE,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x07, 0xC0, 0xF0, 0xFE, 0xFF, 0x07, 0x00, 0xE0, 0xE0,
-        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0x00, 0x00, 0xF8, 0xFE, 0xFF, 0xF8, 0xFF, 0xF8, 0x00, 0x00,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x1F,
-        0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 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, 0xC0, 0xF0, 0xFC, 0xFE, 0xFC, 0xFE, 0xFE,
-        0x7E, 0x0C, 0x00, 0xC0, 0xF0, 0xFE, 0x0F, 0x01, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x00,
-        0x00, 0xF8, 0xFE, 0xF9, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0x20, 0x00, 0x00, 0x00, 0xE0, 0xF8,
-        0xFF, 0x3F, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
-        0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xC0, 0xE0, 0xF0, 0xF8, 0xF8, 0xF8,
-        0xF8, 0x7C, 0x7C, 0x7C, 0x7C, 0xFC, 0xF8, 0xF8, 0xF8, 0xF8, 0xF0, 0xE0, 0xC0, 0x03, 0x03,
-        0x03, 0x03, 0x03, 0x03, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF8, 0xFF, 0xFF, 0xFF, 0xBF, 0x1F,
-        0x0F, 0x78, 0xF8, 0xF8, 0xF8, 0xF8, 0xF0, 0xC0, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xE3, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-        0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-        0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-        0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
-        0xC0, 0xC0, 0xC0, 0xC0, 0xE0, 0xE0, 0xE0, 0xE0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x70, 0x70,
-        0x70, 0x30, 0x30, 0x30, 0x38, 0x38, 0x18, 0x18, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
-        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
-        0xC0, 0xC0, 0xC0, 0x80, 0x80, 0x80, 0x80, 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, 0x18, 0x18, 0x18,
-        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-        0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x03, 0x03, 0x03, 0x03,
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-        0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0xC0, 0xC0, 0xC0,
-        0x40, 0x60, 0x60, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03,
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x18, 0x18,
-        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-        0x18, 0x18, 0x10, 0x10, 0x10, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, 0x20, 0x60, 0x60, 0x60,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 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, 0x18, 0x18,
-        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x08, 0x08, 0x08,
-        0x08, 0x08, 0x0C, 0x0C, 0x0C, 0x0C, 0x04, 0x04, 0x06, 0x06, 0x02, 0x03, 0x03, 0x01, 0x01,
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02,
-        0x02, 0x02, 0x02, 0x02, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x0C, 0x0C, 0x0C,
-        0x08, 0x18, 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, 0x80, 0xC0, 0x40,
-        0x40, 0x60, 0x20, 0x30, 0x10, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0x08,
-        0x08, 0x08, 0x08, 0x08, 0x18, 0x08, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x10, 0x10,
-        0x10, 0x10, 0x10, 0x10, 0x10, 0x30, 0x30, 0x20, 0x20, 0x20, 0x60, 0x40, 0x40, 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, 0x01, 0x01, 0x02, 0x04, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x0C,
-        0x04, 0x02, 0x01, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 0x43, 0x43, 0x43, 0x47,
-        0x47, 0x47, 0x47, 0x47, 0x47, 0x47, 0x47, 0x87, 0x83, 0x83, 0x81, 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, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20,
-        0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x80, 0x02, 0x01, 0x01, 0x02, 0x08, 0xE0, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x0F, 0x00, 0x00, 0xF8,
-        0x08, 0x08, 0x08, 0xC8, 0xF8, 0xF8, 0xF8, 0xFC, 0xFC, 0xFC, 0x7E, 0x7E, 0x7E, 0x3E, 0x7E,
-        0x7E, 0xFE, 0xFC, 0xFC, 0xFC, 0xFC, 0xFA, 0xF1, 0x80, 0xFF, 0x01, 0x01, 0x60, 0xF8, 0x9F,
-        0x1F, 0x07, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xE0, 0xC1, 0x81, 0x81, 0x81, 0x81,
-        0x81, 0xC3, 0xFF, 0xFE, 0x00, 0x01, 0x00, 0x02, 0x02, 0x02, 0x03, 0x03, 0x07, 0x07, 0x0F,
-        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x01, 0x08,
-        0x10, 0x40, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x20, 0x18,
-        0x07, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x02, 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, 0xF0, 0xF8, 0xFC, 0xFE, 0xFE, 0xFF, 0xFF, 0x7F, 0x3F, 0x3F, 0x1F, 0x1F,
-        0x3F, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFE, 0xFE, 0xFC, 0xF8, 0xE0, 0x00, 0x01, 0x01, 0x01,
-        0x01, 0x01, 0x01, 0x00, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xFC, 0xFF, 0xBF, 0x9F, 0x0F, 0x07,
-        0x00, 0xF0, 0x80, 0x81, 0x01, 0x01, 0x01, 0x01, 0x03, 0x83, 0xD7, 0xFF, 0xFE, 0x00, 0x00,
-        0x03, 0x07, 0x0F, 0x0F, 0x1F, 0x1F, 0x1F, 0x1F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
-        0x1F, 0x1F, 0x1F, 0x1F, 0x0F, 0x0F, 0x07, 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, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xFC, 0xFE, 0xFF,
-        0x1F, 0xFF, 0xF0, 0x1F, 0x60, 0x01, 0xC7, 0x30, 0x1F, 0x3F, 0x3F, 0x3F, 0x3F, 0x1F, 0x03,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xC0, 0xE0,
-        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0xE1, 0xE1, 0xE1, 0xE1, 0xF1, 0xFF,
-        0xBF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x78, 0xFC, 0xFC,
-        0xF8, 0xF0, 0xE1, 0xE0, 0xE1, 0xF1, 0xFF, 0xFF, 0x7F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x20,
-        0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xF0,
-        0xF0, 0xF8, 0xF8, 0xF8, 0xFC, 0x7C, 0x7C, 0x7C, 0x7C, 0xFC, 0xF8, 0xF8, 0xF8, 0xF0, 0xE0,
-        0xC0, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x01, 0x80, 0x80, 0xC0, 0xF0, 0xF8, 0xFF, 0xFF,
-        0x7F, 0x7F, 0x3F, 0x0F, 0xC0, 0xF0, 0xF8, 0xFC, 0xFC, 0xFE, 0xFF, 0xFF, 0xCF, 0xCF, 0xC7,
-        0xC3, 0xC3, 0xC1, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-        0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xF8, 0xFC, 0x3C,
-        0x1E, 0x0E, 0x07, 0x07, 0x03, 0x01, 0xC0, 0xE0, 0xE0, 0x70, 0x38, 0x3C, 0x1C, 0x0E, 0x0F,
-        0x07, 0x03, 0x01, 0x01, 0x01, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x80, 0xC0, 0xE0, 0x60, 0x70, 0x38, 0x1C, 0x0C, 0x0E, 0x07, 0x03, 0x01, 0x01,
-        0xC0, 0xE0, 0x60, 0x70, 0x38, 0x1C, 0x0C, 0x0E, 0x07, 0x03, 0x03, 0x01, 0x01, 0x80, 0xC0,
-        0xC0, 0xE0, 0x70, 0x30, 0x38, 0x1C, 0x0C, 0x0E, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0x60, 0x70, 0x30, 0x18, 0x0C, 0x0E, 0x07, 0x03,
-        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0xE0, 0x60,
-        0x30, 0x18, 0x1C, 0x0C, 0x06, 0x03, 0x03, 0x01, 0xC0, 0x60, 0x70, 0x30, 0x18, 0x1C, 0x0C,
-        0x06, 0x07, 0x03, 0x01, 0xF8, 0x80, 0x80, 0xC0, 0xE0, 0x60, 0x30, 0x38, 0x18, 0x0C, 0x0C,
-        0x80, 0xC0, 0xC0, 0x60, 0x70, 0x30, 0x18, 0x0C, 0x0E, 0x06, 0x03, 0x03, 0x01, 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, 0x80,
-        0x80, 0xC0, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0x60, 0x20, 0x30, 0x18, 0x0C, 0x04, 0x06, 0x03,
-        0x01, 0xC0, 0x60, 0x30, 0x30, 0x18, 0x0C, 0x04, 0x06, 0x03, 0x01, 0x01, 0xFC, 0x80, 0x80,
-        0xC0, 0x60, 0x60, 0x30, 0x10, 0x18, 0x80, 0xC0, 0x60, 0x60, 0x30, 0x18, 0x18, 0x0C, 0x06,
-        0x06, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x60, 0x30, 0x18,
-        0x18, 0x0C, 0x06, 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, 0x80, 0x40,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x20,
-        0x30, 0x18, 0x0C, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x80, 0x80, 0x40, 0x60, 0x20, 0x10, 0x08, 0x0C, 0x04, 0x02, 0x01, 0x01, 0x40, 0x20, 0x30,
-        0x10, 0x08, 0x0C, 0x04, 0xC2, 0xF1, 0xF1, 0x80, 0x80, 0x40, 0x60, 0x20, 0x30, 0x80, 0x80,
-        0x40, 0x60, 0x20, 0x10, 0x18, 0x08, 0x04, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x80, 0x80, 0x40, 0x20, 0x10, 0x18, 0x0C, 0x04, 0x02, 0x03, 0x01, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-        0x40, 0x60, 0x30, 0x18, 0x0C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40,
-        0x20, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xC0, 0xE0,
-        0xF0, 0xF8, 0xFC, 0xFE, 0xFE, 0x7D, 0xFC, 0xF8, 0xF0, 0xE0, 0x80, 0x04, 0x02, 0x01, 0x01,
-        0xFF, 0x1F, 0x07, 0x07, 0x87, 0x87, 0x47, 0x27, 0x20, 0x10, 0x18, 0x08, 0x04, 0x06, 0x02,
-        0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x08, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x06, 0x01, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-        0x20, 0x20, 0x40, 0x40, 0x80, 0xC0, 0x18, 0x04, 0x00, 0x01, 0x04, 0xB0, 0x00, 0x00, 0x00,
-        0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x08, 0x03,
-        0x00, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE, 0xFE, 0xFE, 0x7E, 0x3E, 0x3F, 0xBF, 0x7F, 0x3F, 0x7E,
-        0xFE, 0xFE, 0xFE, 0xFE, 0xFD, 0xF8, 0xF0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x03, 0x03,
-        0x13, 0x0B, 0x03, 0x02, 0xFC, 0x7F, 0x3F, 0x1F, 0x07, 0x02, 0x01, 0xC0, 0xE0, 0xFE, 0xBF,
-        0x9F, 0x8F, 0x87, 0x87, 0x83, 0x81, 0x81, 0x80, 0x80, 0x80, 0x80, 0xC0, 0xA0, 0x10, 0x08,
-        0x04, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x8F, 0x4F, 0x2F, 0x1F, 0x1F, 0x0F, 0x0F,
-        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60,
-        0x04, 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,
-        0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF8, 0xFC,
-        0xFE, 0xFE, 0xFF, 0xFF, 0xFF, 0x3F, 0x3F, 0x1F, 0x1F, 0x1F, 0x3F, 0x7F, 0xFF, 0xFF, 0xFF,
-        0xFE, 0xFE, 0xFC, 0xF8, 0xC0, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0xC0, 0xFF, 0x0F, 0x03,
-        0x00, 0x00, 0x80, 0xE0, 0xF0, 0xF8, 0xFF, 0x9F, 0x8F, 0x87, 0x83, 0x81, 0x80, 0x80, 0x00,
-        0x00, 0x00, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F,
-        0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x06, 0x0F, 0x0F, 0x0F, 0x0F, 0x03, 0x81, 0xC1, 0xC1, 0xE1, 0xFB, 0xFF,
-        0x7F, 0x3F, 0x1F, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF8, 0xFC,
-        0xFE, 0xFF, 0xFF, 0xF7, 0xF3, 0xF1, 0xF1, 0xF0, 0xF0, 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,
-        0xA0, 0x60, 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, 0xE0, 0xE0,
-        0xE0, 0xF0, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x07, 0x07, 0x07,
-        0x07, 0x07, 0x80, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
-        0x08, 0x08, 0x04, 0xFC, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00,
-        0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x80, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x02, 0x02,
-        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x02, 0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x08, 0x04, 0x04, 0x00, 0x02, 0xFE,
-        0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF,
-        0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x00, 0x00,
-        0xE0, 0xE0, 0xF0, 0xF8, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x03, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF0, 0xF0, 0xF8, 0xF8, 0xF8, 0xFC, 0xFE,
-        0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0x03, 0x01, 0x01, 0x01, 0x00, 0x0F, 0x0F, 0x0F, 0x0F,
-        0x0F, 0x0F, 0x0F, 0xF0, 0xF8, 0xF8, 0xF8, 0xFC, 0xFC, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x01, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0x1F, 0x1F, 0x1F, 0x1F,
-        0x1F, 0x1F, 0x1F, 0x1F, 0x00, 0xE0, 0xE0, 0xF0, 0xF0, 0xF0, 0xF8, 0xF8, 0xFC, 0xFC, 0xFE,
-        0xFE, 0xFE, 0xFC, 0xFC, 0x00, 0x00, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x0F, 0x0F,
-        0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1C, 0xFC, 0xFC,
-        0xFC, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-uint16_t index_start = 0;
-uint16_t index_end = 0;
-void change_frame_down(uint8_t frame_number){
-// for n changes this frame, change those bytes by change_inds and change_vals
-        index_start = cumsum_inds[frame_number-1];
-        index_end = cumsum_inds[frame_number];
-        if (index_start != index_end){  // if a change in buffer
-                for (uint16_t i=index_start; i < index_end; i++){
-                        oled_write_raw_byte(change_vals[i], change_inds[i]);
-                }
-        }
-}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c
deleted file mode 100644
index ffd3edb792d..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/master/oled_master_handler.c
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "jpe230.h"
-#include "indicators.h"
-
-extern uint8_t logged_row, logged_col;
-extern uint32_t oled_timer;
-extern const uint8_t key_frame[4];
-
-static uint32_t frame_limiter;
-
-void oled_render_layer_state(void) {
-    int current_layer_idx = get_highest_layer(layer_state | default_layer_state);
-    static int current_frame = 0;
-    static bool first_run = 1;
-
-    if(first_run){
-        first_run = 0;
-        char clear[ANIM_SIZE] = {0};
-        memset(clear, 0, ANIM_SIZE);
-        oled_write_raw_P(clear, ANIM_SIZE);
-        frame_limiter = timer_read();
-        return;
-    }
-
-    if (timer_elapsed(frame_limiter) < 12) {
-        return;
-    }
-
-    frame_limiter = timer_read();
-
-    if(current_frame < key_frame[current_layer_idx]){
-        current_frame = (current_frame + 1) % IDLE_FRAMES;
-        change_frame_up(current_frame);
-    }else  if(current_frame > key_frame[current_layer_idx]) {
-        current_frame = (current_frame - 1) % IDLE_FRAMES;
-        change_frame_down(IDLE_FRAMES - current_frame - 1);
-    }
-
-}
-
-void render_master_oled(void) {
-    if (timer_elapsed32(oled_timer) > CUSTOM_OLED_TIMEOUT) {
-        oled_off();
-        return;
-    }
-
-    oled_on();
-
-    /* Render the layar state */
-    oled_render_layer_state();
-
-    /* Move cursor bellow the graphic */
-    oled_set_cursor(0, 12);
-
-    /* Print logged col and row
-     * Format: 00x00
-     */
-    char logged_matrix[9] = {0};
-    sprintf(logged_matrix, "%02dx%02d", logged_col, logged_row);
-
-    /* Write a separator char: ◆,
-     * make sure to add a NULL terminator otherwise strlen could fail
-     */
-    static const char PROGMEM separator[] = {4, 4, 4, 4, 4, 0};
-    oled_write(separator, false);
-
-    /* Write logged matrix position */
-    oled_write(logged_matrix, false);
-
-    /* Write another separator */
-    oled_write(separator, false);
-
-    /* Write scanrate */
-    oled_write(get_u16_str(get_matrix_scan_rate(), ' '), false);
-}
-
-oled_rotation_t rotate_master(oled_rotation_t rotation) {return OLED_ROTATION_270;}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.c
deleted file mode 100644
index d2d452d03d0..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.c
+++ /dev/null
@@ -1,533 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "ocean_dream.h"
-#include "quantum.h"
-#include "print.h"
-
-// Calculated Parameters
-#define TWINKLE_PROBABILITY_MODULATOR 100 / TWINKLE_PROBABILITY                             // CALCULATED: Don't Touch
-#define TOTAL_STARS STARS_PER_LINE *NUMBER_OF_STAR_LINES                                    // CALCULATED: Don't Touch
-#define OCEAN_ANIMATION_MODULATOR NUMBER_OF_FRAMES / OCEAN_ANIMATION_SPEED                  // CALCULATED: Don't Touch
-#define SHOOTING_STAR_ANIMATION_MODULATOR NUMBER_OF_FRAMES / SHOOTING_STAR_ANIMATION_SPEED  // CALCULATED: Don't Touch
-#define STAR_ANIMATION_MODULATOR NUMBER_OF_FRAMES / STAR_ANIMATION_SPEED                    // CALCULATED: Don't Touch
-
-uint8_t    animation_counter       = 0;  // global animation counter.
-bool       is_calm                 = false;
-uint32_t   starry_night_anim_timer = 0;
-uint32_t   starry_night_anim_sleep = 0;
-static int current_wpm             = 0;
-
-static uint8_t increment_counter(uint8_t counter, uint8_t max) {
-    counter++;
-    if (counter >= max) {
-        return 0;
-    } else {
-        return counter;
-    }
-}
-
-#ifdef ENABLE_WAVE
-static uint8_t decrement_counter(uint8_t counter, uint8_t max) {
-    counter--;
-    if (counter < 0 || counter > max) {
-        return max;
-    } else {
-        return counter;
-    }
-}
-#endif
-
-#ifdef ENABLE_MOON  // region
-#    ifndef STATIC_MOON
-uint8_t  moon_animation_frame   = 0;  // keeps track of current moon frame
-uint16_t moon_animation_counter = 0;  // counts how many frames to wait before animating moon to next frame
-#    endif
-
-#    ifdef STATIC_MOON
-static const char PROGMEM moon[6] = {
-    0x18, 0x7E, 0xFF, 0xC3, 0x81, 0x81,
-};
-#    endif
-
-#    ifndef STATIC_MOON
-static const char PROGMEM moon_animation[14][8] = {
-    // clang-format off
-    { 0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C, },
-    { 0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0x42, 0x00, },
-    { 0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xC3, 0x00, 0x00, },
-    { 0x3C, 0x7E, 0xFF, 0xFF, 0xC3, 0x81, 0x00, 0x00, },
-    { 0x3C, 0x7E, 0xFF, 0xC3, 0x81, 0x00, 0x00, 0x00, },
-    { 0x3C, 0x7E, 0xC3, 0x81, 0x81, 0x00, 0x00, 0x00, },
-    { 0x3C, 0x42, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, },
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, },
-    { 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x42, 0x3C, },
-    { 0x00, 0x00, 0x00, 0x81, 0x81, 0xC3, 0x7E, 0x3C, },
-    { 0x00, 0x00, 0x00, 0x81, 0xC3, 0xFF, 0x7E, 0x3C, },
-    { 0x00, 0x00, 0x81, 0xC3, 0xFF, 0xFF, 0x7E, 0x3C, },
-    { 0x00, 0x00, 0xC3, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C, },
-    { 0x00, 0x42, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C, },
-    // clang-format on
-};
-#    endif
-
-static void draw_moon(void) {
-#    ifdef STATIC_MOON
-    oled_set_cursor(MOON_COLUMN, MOON_LINE);
-    oled_write_raw_P(moon, 6);
-#    endif
-#    ifndef STATIC_MOON
-    moon_animation_counter = increment_counter(moon_animation_counter, ANIMATE_MOON_EVERY_N_FRAMES);
-    if (moon_animation_counter == 0) {
-        moon_animation_frame = increment_counter(moon_animation_frame, 14);
-        oled_set_cursor(MOON_COLUMN, MOON_LINE);
-        oled_write_raw_P(moon_animation[moon_animation_frame], 8);
-    }
-#    endif
-}
-#endif  // endregion
-
-#ifdef ENABLE_WAVE  // region
-uint8_t starry_night_wave_frame_width_counter = 31;
-uint8_t rough_waves_frame_counter             = 0;
-
-// clang-format off
-static const char PROGMEM ocean_top[8][32] = {
-    // still ocean
-    {
-        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-    },
-    // small ripples
-    {
-        0x20, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x20, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x20, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-        0x20, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-    },
-    // level 2 ripples
-    {
-        0x20, 0x60, 0x40, 0x40, 0x20, 0x60, 0x40, 0x40,
-        0x20, 0x60, 0x40, 0x40, 0x20, 0x60, 0x40, 0x40,
-        0x20, 0x60, 0x40, 0x40, 0x20, 0x60, 0x40, 0x40,
-        0x20, 0x60, 0x40, 0x40, 0x20, 0x60, 0x40, 0x40,
-    },
-    // level 3 waves
-    {
-        0x40, 0x20, 0x10, 0x20, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x20, 0x10, 0x20, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x20, 0x10, 0x20, 0x40, 0x40, 0x40, 0x40,
-        0x40, 0x20, 0x10, 0x20, 0x40, 0x40, 0x40, 0x40,
-    },
-    {
-        0x40, 0x40, 0x20, 0x10, 0x28, 0x50, 0x40, 0x40,
-        0x40, 0x40, 0x20, 0x10, 0x28, 0x50, 0x40, 0x40,
-        0x40, 0x40, 0x20, 0x10, 0x28, 0x50, 0x40, 0x40,
-        0x40, 0x40, 0x20, 0x10, 0x28, 0x50, 0x40, 0x40,
-    },
-    {
-        0x40, 0x40, 0x40, 0x20, 0x10, 0x30, 0x70, 0x60,
-        0x40, 0x40, 0x40, 0x20, 0x10, 0x30, 0x70, 0x60,
-        0x40, 0x40, 0x40, 0x20, 0x10, 0x30, 0x70, 0x60,
-        0x40, 0x40, 0x40, 0x20, 0x10, 0x30, 0x70, 0x60,
-    },
-};
-static const char PROGMEM ocean_bottom[8][32] = {
-    // still ocean
-    {
-        0x00, 0x40, 0x40, 0x41, 0x01, 0x01, 0x01, 0x21,
-        0x20, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x44,
-        0x44, 0x40, 0x40, 0x00, 0x00, 0x08, 0x08, 0x00,
-        0x01, 0x01, 0x01, 0x00, 0x40, 0x40, 0x00, 0x00,
-    },
-    // small ripples
-    {
-        0x00, 0x00, 0x40, 0x40, 0x01, 0x01, 0x01, 0x20,
-        0x20, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04,
-        0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
-        0x00, 0x01, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00,
-    },
-    // level 2 ripples
-    {
-        0x00, 0x00, 0x40, 0x40, 0x01, 0x01, 0x01, 0x20,
-        0x20, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04,
-        0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
-        0x00, 0x01, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00,
-    },
-    // level 3 waves
-    {
-        0x00, 0x40, 0x40, 0x42, 0x42, 0x03, 0x11, 0x11,
-        0x20, 0x20, 0x00, 0x00, 0x08, 0x0C, 0x0C, 0x04,
-        0x05, 0x41, 0x41, 0x21, 0x20, 0x00, 0x00, 0x08,
-        0x0A, 0x0A, 0x0B, 0x41, 0x41, 0x41, 0x41, 0x00,
-    },
-    {
-        0x10, 0x10, 0x00, 0x80, 0x84, 0xC4, 0x02, 0x06,
-        0x84, 0x44, 0xC0, 0x80, 0x80, 0x20, 0x20, 0x10,
-        0x08, 0x12, 0x91, 0x81, 0x42, 0x40, 0x00, 0x00,
-        0x10, 0x12, 0x22, 0x22, 0x24, 0x04, 0x84, 0x80,
-    },
-    {
-        0x08, 0x80, 0x80, 0x82, 0x82, 0x03, 0x21, 0x21,
-        0x10, 0x10, 0x00, 0x00, 0x04, 0x04, 0x0C, 0x08,
-        0x09, 0x41, 0x42, 0x22, 0x20, 0x00, 0x00, 0x08,
-        0x0A, 0x0A, 0x0B, 0x41, 0x43, 0x42, 0x42, 0x00,
-    },
-};
-// clang-format on
-
-static void animate_waves(void) {
-    starry_night_wave_frame_width_counter = decrement_counter(starry_night_wave_frame_width_counter, WIDTH - 1);  // only 3 frames for last wave type
-    rough_waves_frame_counter             = increment_counter(rough_waves_frame_counter, 3);                      // only 3 frames for last wave type
-
-    void draw_ocean(uint8_t frame, uint16_t offset, uint8_t byte_index) {
-        oled_write_raw_byte(pgm_read_byte(ocean_top[frame] + byte_index), offset);
-        oled_write_raw_byte(pgm_read_byte(ocean_bottom[frame] + byte_index), offset + WIDTH);
-    }
-
-    for (int i = 0; i < WIDTH; ++i) {
-        uint16_t offset     = OCEAN_LINE * WIDTH + i;
-        uint8_t  byte_index = starry_night_wave_frame_width_counter + i;
-        if (byte_index >= WIDTH) {
-            byte_index = byte_index - WIDTH;
-        }
-        if (is_calm || current_wpm <= WAVE_CALM) {
-            draw_ocean(0, offset, byte_index);
-        } else if (current_wpm <= WAVE_HEAVY_STORM) {
-            draw_ocean(1, offset, byte_index);
-        } else if (current_wpm <= WAVE_HURRICANE) {
-            draw_ocean(2, offset, byte_index);
-        } else {
-            draw_ocean(3 + rough_waves_frame_counter, offset, byte_index);
-        }
-    }
-}
-#endif  // endregion
-
-#ifdef ENABLE_ISLAND  // region
-uint8_t island_frame_1 = 0;
-
-// clang-format off
-// only use 46 bytes (first 18 are blank, so we don't write them, makes it smaller and we can see the shooting stars properly!)
-
-// To save space and allow the shooting stars to be seen, only draw the tree on every frame.
-// Tree is only 14bytes wide so we save 108 bytes on just the first row. Second row, the
-// first 18 bytes is always the same piece of land, so only store that once, which saves 90 bytes
-static const char PROGMEM islandRightTop[6][14] = {
-    {0x84, 0xEC, 0x6C, 0x3C, 0xF8, 0xFE, 0x3F, 0x6B, 0xDB, 0xB9, 0x30, 0x40, 0x00, 0x00,},
-    {0x80, 0xC3, 0xEE, 0x7C, 0xB8, 0xFC, 0xFE, 0x6F, 0xDB, 0x9B, 0xB2, 0x30, 0x00, 0x00,},
-    {0x00, 0xC0, 0xEE, 0x7F, 0x3D, 0xF8, 0xFC, 0x7E, 0x57, 0xDB, 0xDB, 0x8A, 0x00, 0x00,},
-    {0x00, 0xC0, 0xE6, 0x7F, 0x3B, 0xF9, 0xFC, 0xFC, 0xB6, 0xB3, 0x33, 0x61, 0x00, 0x00,},
-    {0x00, 0x00, 0x00, 0x00, 0x80, 0xEE, 0xFF, 0xFB, 0xF9, 0xFC, 0xDE, 0xB6, 0xB6, 0x24,},
-    {0x00, 0x00, 0x00, 0x00, 0xC0, 0xEE, 0xFE, 0xFF, 0xFB, 0xFD, 0xEE, 0xB6, 0xB6, 0x92,},
-};
-static const char PROGMEM islandRightBottom[6][14] = {
-    {0x41, 0x40, 0x60, 0x3E, 0x3F, 0x23, 0x20, 0x60, 0x41, 0x43, 0x40, 0x40, 0x40, 0x80,},
-    {0x40, 0x41, 0x60, 0x3E, 0x3F, 0x23, 0x20, 0x60, 0x40, 0x40, 0x41, 0x41, 0x40, 0x80,},
-    {0x40, 0x40, 0x61, 0x3D, 0x3F, 0x27, 0x21, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80,},
-    {0x40, 0x43, 0x61, 0x3C, 0x3F, 0x27, 0x21, 0x60, 0x41, 0x43, 0x43, 0x42, 0x40, 0x80,},
-    {0x40, 0x40, 0x60, 0x3C, 0x3F, 0x27, 0x23, 0x63, 0x44, 0x40, 0x41, 0x41, 0x41, 0x81,},
-    {0x40, 0x40, 0x60, 0x3C, 0x3F, 0x27, 0x23, 0x63, 0x42, 0x42, 0x41, 0x41, 0x41, 0x80,},
-};
-static const char PROGMEM islandLeft[18] = {
-    0x80, 0x40, 0x40, 0x40, 0x40, 0x60,
-    0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-    0x20, 0x20, 0x20, 0x60, 0x40, 0x40,
-};
-// clang-format on
-
-static void animate_island(void) {
-    if (animation_counter == 0) {
-        island_frame_1 = increment_counter(island_frame_1, 2);
-    }
-
-    void draw_island_parts(uint8_t frame) {
-        oled_set_cursor(ISLAND_COLUMN + 3, ISLAND_LINE);
-        oled_write_raw_P(islandRightTop[frame], 14);
-        oled_set_cursor(ISLAND_COLUMN + 0, ISLAND_LINE + 1);
-        oled_write_raw_P(islandLeft, 18);
-        oled_set_cursor(ISLAND_COLUMN + 3, ISLAND_LINE + 1);
-        oled_write_raw_P(islandRightBottom[frame], 14);
-    }
-
-    if (is_calm || current_wpm < ISLAND_CALM) {
-        draw_island_parts(0);
-    } else if (current_wpm >= ISLAND_CALM && current_wpm < ISLAND_HEAVY_STORM) {
-        draw_island_parts(island_frame_1 + 1);
-    } else if (current_wpm >= ISLAND_HEAVY_STORM && current_wpm < ISLAND_HURRICANE) {
-        draw_island_parts(island_frame_1 + 2);
-    } else {
-        draw_island_parts(island_frame_1 + 4);
-    }
-}
-#endif  // endregion
-
-#ifdef ENABLE_STARS  // region
-bool stars_setup = false;  // only setup stars once, then we just twinkle them
-struct Coordinate {
-    int  x;
-    int  y;
-    bool exists;
-};
-
-struct Coordinate stars[TOTAL_STARS];  // tracks all stars/coordinates
-
-/**
- * Setup all the initial stars on the screen
- * This function divides the screen into regions based on STARS_PER_LINE and NUMBER_OF_STAR_LINES
- * where each line is made up of 8x8 pixel groups, that are populated by a single star.
- *
- * Not sure how this function will work with larger or smaller screens.
- * It should be fine, as long as the screen width is a multiple of 8
- */
-static void setup_stars(void) {
-    // For every line, split the line into STARS_PER_LINE, find a random point in that region, and turn the pixel on
-    // 36% probability it will not be added
-    // (said another way, 80% chance it will start out lit in the x direction, then 80% chance it will start out lit in the y direction = 64% probability it will start out lit at all)
-    for (int line = 0; line < NUMBER_OF_STAR_LINES; ++line) {
-        for (int column_group = 0; column_group < STARS_PER_LINE; ++column_group) {
-            uint8_t rand_column = rand() % 10;
-            uint8_t rand_row    = rand() % 10;
-            if (rand_column < 8 && rand_row < 8) {
-                int column_adder = column_group * 8;
-                int line_adder   = line * 8;
-                int x            = rand_column + column_adder;
-                int y            = rand_row + line_adder;
-                oled_write_pixel(x, y, true);
-                stars[column_group + (line * STARS_PER_LINE)].x      = x;
-                stars[column_group + (line * STARS_PER_LINE)].y      = y;
-                stars[column_group + (line * STARS_PER_LINE)].exists = true;
-            } else {
-                stars[column_group + (line * STARS_PER_LINE)].exists = false;
-            }
-        }
-    }
-    stars_setup = true;
-}
-
-/**
- * Twinkle the stars (move them one pixel in any direction) with a probability of 50% to twinkle any given star
- */
-static void twinkle_stars(void) {
-    for (int line = 0; line < NUMBER_OF_STAR_LINES; ++line) {
-        for (int column_group = 0; column_group < STARS_PER_LINE; ++column_group) {
-            struct Coordinate star = stars[column_group + (line * STARS_PER_LINE)];
-
-            // skip stars that were never added
-            if (!star.exists) {
-                continue;
-            }
-            if (rand() % TWINKLE_PROBABILITY_MODULATOR == 0) {
-                oled_write_pixel(star.x, star.y, false);  // black out pixel
-
-                // don't allow stars to leave their own region
-                if (star.x == (column_group * 8)) {                     // star is the farthest left it can go in its region
-                    star.x++;                                           // move it right immediately
-                } else if (star.x == (((column_group + 1) * 8) - 1)) {  // star is farthest right it can go in its region
-                    star.x--;                                           // move it left immediately
-                }
-                if (star.y == (line * 8)) {                     // star is the farthest up it can go in its region
-                    star.y++;                                   // move it down immediately
-                } else if (star.y == (((line + 1) * 8) - 1)) {  // star is farthest down it can go in its region
-                    star.y--;                                   // move it up immediately
-                }
-
-                // now decide direction
-                int new_x;
-                int x_choice = rand() % 3;
-                if (x_choice == 0) {
-                    new_x = star.x - 1;
-                } else if (x_choice == 1) {
-                    new_x = star.x + 1;
-                } else {
-                    new_x = star.x;
-                }
-
-                int new_y;
-                int y_choice = rand() % 3;
-                if (y_choice == 0) {
-                    new_y = star.y - 1;
-                } else if (y_choice == 1) {
-                    new_y = star.y + 1;
-                } else {
-                    new_y = star.y;
-                }
-
-                star.x = new_x;
-                star.y = new_y;
-                oled_write_pixel(new_x, new_y, true);
-            }
-
-            stars[column_group + (line * STARS_PER_LINE)] = star;
-        }
-    }
-}
-
-/**
- * Setup the stars and then animate them on subsequent frames
- */
-static void animate_stars(void) {
-    if (!stars_setup) {
-        setup_stars();
-    } else {
-        twinkle_stars();
-    }
-}
-#endif  // endregion
-
-#ifdef ENABLE_SHOOTING_STARS  // region
-bool shooting_stars_setup = false;  // only setup shooting stars array once with defaults
-
-struct ShootingStar {
-    int  x_1;
-    int  y_1;
-    int  x_2;
-    int  y_2;
-    bool running;
-    int  frame;
-    int  delay;
-};
-
-struct ShootingStar shooting_stars[MAX_NUMBER_OF_SHOOTING_STARS];  // tracks all the shooting stars
-
-static void setup_shooting_star(struct ShootingStar *shooting_star) {
-    int column_to_start = rand() % (WIDTH / 2);
-    int row_to_start    = rand() % (HEIGHT - 48);  // shooting_stars travel diagonally 1 down, 1 across. So the lowest a shooting_star can start and not 'hit' the ocean is 32 above the ocean.
-
-    shooting_star->x_1     = column_to_start;
-    shooting_star->y_1     = row_to_start;
-    shooting_star->x_2     = column_to_start + 1;
-    shooting_star->y_2     = row_to_start + 1;
-    shooting_star->running = true;
-    shooting_star->frame++;
-    shooting_star->delay = rand() % SHOOTING_STAR_DELAY;
-}
-
-static void move_shooting_star(struct ShootingStar *shooting_star) {
-    oled_write_pixel(shooting_star->x_1, shooting_star->y_1, false);
-    oled_write_pixel(shooting_star->x_2, shooting_star->y_2, false);
-
-    shooting_star->x_1++;
-    shooting_star->y_1++;
-    shooting_star->x_2++;
-    shooting_star->y_2++;
-    shooting_star->frame++;
-
-    oled_write_pixel(shooting_star->x_1, shooting_star->y_1, true);
-    oled_write_pixel(shooting_star->x_2, shooting_star->y_2, true);
-}
-
-static void finish_shooting_star(struct ShootingStar *shooting_star) {
-    oled_write_pixel(shooting_star->x_1, shooting_star->y_1, false);
-    oled_write_pixel(shooting_star->x_2, shooting_star->y_2, false);
-    shooting_star->running = false;
-    shooting_star->frame   = 0;
-}
-
-static void animate_shooting_star(struct ShootingStar *shooting_star) {
-    if (shooting_star->frame > SHOOTING_STAR_FRAMES) {
-        finish_shooting_star(shooting_star);
-        return;
-    } else if (!shooting_star->running) {
-        setup_shooting_star(shooting_star);
-    } else {
-        if (shooting_star->delay == 0) {
-            move_shooting_star(shooting_star);
-        } else {
-            shooting_star->delay--;
-        }
-    }
-}
-
-static void animate_shooting_stars(void) {
-    if (is_calm) {
-        return;
-    }
-    if (!shooting_stars_setup) {
-        for (int i = 0; i < MAX_NUMBER_OF_SHOOTING_STARS; ++i) {
-            shooting_stars[i].running = false;
-        }
-        shooting_stars_setup = true;
-    }
-    /**
-     * Fixes issue with stars that were falling _while_ the
-     * wpm dropped below the condition for them to keep falling
-     */
-    void end_extra_stars(uint8_t starting_index) {
-        for (int shooting_star_index = starting_index; shooting_star_index < MAX_NUMBER_OF_SHOOTING_STARS; ++shooting_star_index) {
-            struct ShootingStar shooting_star = shooting_stars[shooting_star_index];
-            if (shooting_star.running) {
-                finish_shooting_star(&shooting_star);
-                shooting_stars[shooting_star_index] = shooting_star;
-            }
-        }
-    }
-
-    int number_of_shooting_stars = current_wpm / SHOOTING_STAR_WPM_INCREMENT;
-    number_of_shooting_stars     = (number_of_shooting_stars > MAX_NUMBER_OF_SHOOTING_STARS) ? MAX_NUMBER_OF_SHOOTING_STARS : number_of_shooting_stars;
-
-    if (number_of_shooting_stars == 0) {
-        // make sure all shooting_stars are ended
-        end_extra_stars(0);
-    } else {
-        for (int shooting_star_index = 0; shooting_star_index < number_of_shooting_stars; ++shooting_star_index) {
-            struct ShootingStar shooting_star = shooting_stars[shooting_star_index];
-            animate_shooting_star(&shooting_star);
-            shooting_stars[shooting_star_index] = shooting_star;
-        }
-        end_extra_stars(number_of_shooting_stars);
-    }
-}
-#endif  // endregion
-
-/**
- * Main rendering function
- *
- * Calls all different animations at different rates
- */
-void render_stars(void) {
-    //    // animation timer
-    if (timer_elapsed32(starry_night_anim_timer) > STARRY_NIGHT_ANIM_FRAME_DURATION) {
-        starry_night_anim_timer = timer_read32();
-        current_wpm             = get_current_wpm();
-
-#ifdef ENABLE_ISLAND
-        animate_island();
-#endif
-
-#ifdef ENABLE_SHOOTING_STARS
-        if (animation_counter % SHOOTING_STAR_ANIMATION_MODULATOR == 0) {
-            animate_shooting_stars();
-        }
-#endif
-
-#ifdef ENABLE_STARS
-        // TODO offsetting the star animation from the wave animation would look better,
-        // but if I do that, then the stars appear in the water because
-        // the ocean animation has to wait a bunch of frames to overwrite it.
-        // Possible solutions:
-        // 1. Only draw stars to the top of the island/ocean.
-        // 2. Draw ocean every frame, only move ocean on frames matching modulus
-        // Problems:
-        // 1. What if someone wants to move the island up a bit, or they want to have the stars reflect in the water?
-        // 2. More cpu intensive. And I'm already running out of cpu as it is...
-        if (animation_counter % STAR_ANIMATION_MODULATOR == 0) {
-            animate_stars();
-        }
-#endif
-
-#ifdef ENABLE_WAVE
-        if (animation_counter % OCEAN_ANIMATION_MODULATOR == 0) {
-            animate_waves();
-        }
-#endif
-
-#ifdef ENABLE_MOON
-        draw_moon();
-#endif
-
-        animation_counter = increment_counter(animation_counter, NUMBER_OF_FRAMES);
-    }
-}
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.h b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.h
deleted file mode 100644
index 8d3c505c33b..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/ocean_dream.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#include "quantum.h"
-
-/**
- * Features:
- * You can turn on and off features in this section
- */
-#define ENABLE_MOON            // Uses 182 bytes
-#define ENABLE_WAVE            // Uses 844 bytes
-#define ENABLE_SHOOTING_STARS  // Uses 872 bytes
-#define ENABLE_ISLAND
-#define ENABLE_STARS  // Uses 606 bytes
-
-/**
- * Global Settings
- */
-#define STARRY_NIGHT_ANIM_FRAME_DURATION 30  // how long each frame lasts in ms
-#define NUMBER_OF_FRAMES 20                  // Self explanatory. Probably shouldn't touch this, not sure how stuff will work if it's changed. If changed should be multiple of 1, 2, 3, 4, and 5
-#define WIDTH OLED_DISPLAY_HEIGHT            // for vertical displays
-#define HEIGHT OLED_DISPLAY_WIDTH            // for vertical displays
-
-/**
- * Moon Parameters
- */
-#define MOON_LINE 4    // the line you want the moon to appear at
-#define MOON_COLUMN 4  // the column you want the moon to appear at
-//#define STATIC_MOON  // uncomment this to make the moon a static image, no animation
-#ifndef STATIC_MOON
-#    define ANIMATE_MOON_EVERY_N_FRAMES 100  // animate the moon every n frames
-#endif
-
-/**
- * Wave Parameters
- */
-#define OCEAN_LINE 14        // Line you want to render the ocean starting at (best at oled_max_lines() - 2)
-#define WAVE_CALM 20         // render calm ocean under this WPM and ripple ocean at this WPM
-#define WAVE_HEAVY_STORM 40  // render medium ocean at this WPM
-#define WAVE_HURRICANE 60    // render heavy waves above this WPM
-// What number of frames you want to animate the ocean at.
-// Should be equal to or smaller than NUMBER_OF_FRAMES, e.g. 30, would animate on every other frame, 20, every third frame, etc
-// Don't set equal to 0.
-#define OCEAN_ANIMATION_SPEED 1
-
-/**
- * Shooting Star Parameters
- */
-#define SHOOTING_STAR_DELAY 12           // delay modulus for time between shooting stars. Decides number of frames to delay, e.g. 12 means 0-11 frames of delay between each shooting star
-#define SHOOTING_STAR_FRAMES 16          // how many 2 pixel frames per shooting star. Increment this for longer shooting stars
-#define MAX_NUMBER_OF_SHOOTING_STARS 12  // maximum number of shooting stars that can be on screen at the same time
-#define SHOOTING_STAR_WPM_INCREMENT 10   // every n WPM increase, add an extra star, up to MAX_NUMBER_OF_SHOOTING_STARS, e.g. an increment of 5 would result in 1 shooting star at 5-9wpm, 2 at 10-14, etc.
-// What number of frames you want to animate the shooting stars at.
-// Should be equal to or smaller than NUMBER_OF_FRAMES, e.g. 30, would animate on every other frame, 20, every third frame, etc
-// Don't set equal to 0.
-#define SHOOTING_STAR_ANIMATION_SPEED 30
-
-/**
- * Star Parameters
- */
-#define STARS_PER_LINE 4         // number of stars per line (for a display that is 128x32, this would be 4 stars spread out evenly over the 32byte width, one every 8 bytes)
-#define NUMBER_OF_STAR_LINES 16  // number of lines to fill up with stars (for a display that is 128x32, 16 bytes are filled with the ocean animation, so that leaves 112 pixels left over. The number of lines depends on your OLED_FONT_HEIGHT)
-#define TWINKLE_PROBABILITY 25   // probability that any star twinkles on a given frame
-// What number of frames you want to animate the stars at.
-// Should be equal to or smaller than NUMBER_OF_FRAMES, e.g. 20, would animate on every frame, 10, every other frame, etc
-// Don't set equal to 0.
-#define STAR_ANIMATION_SPEED 1
-
-/**
- * Island Parameters
- */
-#define ISLAND_LINE 12         // line that the island starts at. Island is 2 lines tall
-#define ISLAND_COLUMN 0        // column that the island starts at
-#define ISLAND_CALM 20         // WPM at which the palm tree calmly moves
-#define ISLAND_HEAVY_STORM 40  // WPM at which the heavy storm occurs
-#define ISLAND_HURRICANE 60    // WPM at which THE HURRICANE STARTS
-
-/*
- * DON'T TOUCH
- */
-
-extern bool is_calm;
-
-// timers
-extern uint32_t starry_night_anim_timer;
-extern uint32_t starry_night_anim_sleep;
-
-void render_stars(void);
diff --git a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c b/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c
deleted file mode 100644
index 31166b3b432..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/oled/rp2040/slave/oled_slave_handler.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "jpe230.h"
-#include "ocean_dream.h"
-
-void render_slave_oled(void) {
-    render_stars();
-}
-
-oled_rotation_t rotate_slave(oled_rotation_t rotation) {return OLED_ROTATION_270;}
diff --git a/keyboards/crkbd/keymaps/jpe230/process_record.c b/keyboards/crkbd/keymaps/jpe230/process_record.c
deleted file mode 100644
index db10438d8fb..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/process_record.c
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2022 Jose Pablo Ramirez (@jpe230)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "jpe230.h"
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        oled_timer_reset();
-        set_keylog(keycode, record);
-
-        switch (keycode) {
-            case QK_BOOT:
-                rgb_matrix_set_color_all(30, 0, 0);
-                rgb_matrix_driver.flush();
-                oled_off();
-                return true;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/crkbd/keymaps/jpe230/readme.md b/keyboards/crkbd/keymaps/jpe230/readme.md
deleted file mode 100644
index de5696116f2..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Jpe230's CRKBD Layout
-
-## Layers
-The four layers:
-- BASE Layer: QWERTY
-- LOWER Layer: Numbers + Arrows
-- RAISE Layer: Symbols
-- ADJUST Layer: Numpad + Media Keys + Fn keys
-## OLED
-The graphics for the OLED varies depending on the target platform:
-
-| Half   | RP2040                               | Pro Micro                            |
-|--------|--------------------------------------|--------------------------------------|
-| Master | ![](https://i.imgur.com/FF0EuWoh.png) | ![](https://i.imgur.com/stxRevvh.png) |
-| Slave  | ![](https://i.imgur.com/hyjdDITh.png) | ![](https://i.imgur.com/UrTCd2sh.png) |
-
-
-## Flashing
-For Arduino Pro Micro:
-- `qmk compile -kb crkbd -km jpe230`
-
-For Pro Micro Compatible board (See [Converters](https://docs.qmk.fm/#/feature_converters?id=converters)):
-- `qmk compile -kb crkbd -km jpe230 -e CONVERT_TO<target>`
diff --git a/keyboards/crkbd/keymaps/jpe230/rules.mk b/keyboards/crkbd/keymaps/jpe230/rules.mk
deleted file mode 100644
index 459cf9c6917..00000000000
--- a/keyboards/crkbd/keymaps/jpe230/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Shared rules for both of my Corne
-OLED_ENABLE       = yes
-VIA_ENABLE        = yes
-RGB_MATRIX_ENABLE = yes
-
-SRC += oled/oled_handler.c process_record.c
-
-ifneq ($(CONVERT_TO),)
-    # Asume ARM
-    DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
-    WPM_ENABLE = yes
-    CONSOLE_ENABLE = yes
-    SRC +=  oled/rp2040/master/oled_master_handler.c \
-            oled/rp2040/master/indicators_down.c \
-            oled/rp2040/master/indicators_up.c \
-            oled/rp2040/slave/oled_slave_handler.c \
-            oled/rp2040/slave/ocean_dream.c
-else
-    # Asume AVR
-    LTO_ENABLE = yes
-    SRC +=  oled/avr/master/oled_master_handler.c \
-            oled/avr/slave/oled_slave_handler.c
-endif
diff --git a/keyboards/crkbd/keymaps/julian_turner/config.h b/keyboards/crkbd/keymaps/julian_turner/config.h
deleted file mode 100644
index 2d200d7d55b..00000000000
--- a/keyboards/crkbd/keymaps/julian_turner/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 Julian Turner
- *
- * 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
-
-#undef MANUFACTURER
-#define MANUFACTURER "Trner"
-
-/* Select hand configuration */
-#define MASTER_LEFT
-
-// Configure the global tapping term (default: 200ms)
-#define TAPPING_TERM 500
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
-
-//#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/julian_turner/keymap.c b/keyboards/crkbd/keymaps/julian_turner/keymap.c
deleted file mode 100644
index 56f6998c50c..00000000000
--- a/keyboards/crkbd/keymaps/julian_turner/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2022 Julian Turner
- *
- * 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_german.h"
-#include "layers.h"
-#include "keytabs.h"
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTZ] = LAYOUT_split_3x6_3(
-        //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-             KC_TAB,    DE_Q,    DE_W,    DE_E,    DE_R,    DE_T,                         DE_Z,    DE_U,    DE_I,    DE_O,    DE_P, DE_UDIA,
-        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-            XXXXXXX,  HOME_A,  HOME_S,  HOME_D,  HOME_F,    DE_G,                         DE_H,  HOME_J,  HOME_K,  HOME_L, HOME_OE, DE_ADIA,
-        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_LEFT_CTRL,    DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,                         DE_N,    DE_M, KC_COMM,  DE_DOT, XXXXXXX, XXXXXXX,
-        //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                         MO(_NUMBER), MO(_SYMBOL), KC_SPC,   KC_BSPC, KC_ENTER, XXXXXXX
-                                            //`--------------------------'  `--------------------------'
-
-        ),
-    [_SYMBOL] = LAYOUT_split_3x6_3(
-        //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-            XXXXXXX, XXXXXXX, DE_UNDS, DE_LBRC, DE_RBRC, DE_CIRC,                      DE_EXLM, DE_LABK, DE_RABK,  DE_EQL, DE_AMPR,   DE_SS,
-        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-            XXXXXXX, DE_BSLS, DE_SLSH, DE_LCBR, DE_RCBR, DE_ASTR,                      DE_QUES, DE_LPRN, DE_RPRN, DE_MINS,   DE_AT, XXXXXXX,
-        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_LEFT_CTRL, DE_HASH,  DE_DLR, DE_PIPE, DE_TILD,  DE_GRV,                      DE_PLUS, DE_PERC, DE_DQUO, DE_QUOT, XXXXXXX, XXXXXXX,
-        //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                      MO(_NUMBER), MO(_SYMBOL),    KC_SPC,   KC_BSPC, KC_ENTER, XXXXXXX
-                                            //`--------------------------'  `--------------------------'
-
-        ),
-    [_NUMBER] = LAYOUT_split_3x6_3(
-        //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-            XXXXXXX, XXXXXXX, KC_PAGE_UP, KC_UP, KC_PAGE_DOWN, XXXXXXX,                XXXXXXX,    DE_7,    DE_8,    DE_9, DE_ASTR, DE_SLSH,
-        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-            XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX,                     XXXXXXX,    DE_4,    DE_5,    DE_6, DE_PLUS, DE_MINS,
-        //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_LEFT_CTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX,    DE_1,    DE_2,    DE_3, XXXXXXX, XXXXXXX,
-        //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                        MO(_NUMBER), MO(_SYMBOL),  KC_SPC,   KC_BSPC, KC_ENTER, DE_0
-                                            //`--------------------------'  `--------------------------'
-
-        ),
-};
-// clang-format off
diff --git a/keyboards/crkbd/keymaps/julian_turner/keytabs.h b/keyboards/crkbd/keymaps/julian_turner/keytabs.h
deleted file mode 100644
index fd81049d830..00000000000
--- a/keyboards/crkbd/keymaps/julian_turner/keytabs.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 Julian Turner
- *
- * 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/>.
- */
-
-// Left-hand home row mods
-#define HOME_A LGUI_T(DE_A)
-#define HOME_S LALT_T(DE_S)
-#define HOME_D LSFT_T(DE_D)
-#define HOME_F LCTL_T(DE_F)
-
-// Right-hand home row mods
-#define HOME_J RCTL_T(DE_J)
-#define HOME_K RSFT_T(DE_K)
-#define HOME_L LALT_T(DE_L)
-#define HOME_OE RGUI_T(DE_ODIA)
diff --git a/keyboards/crkbd/keymaps/julian_turner/layers.h b/keyboards/crkbd/keymaps/julian_turner/layers.h
deleted file mode 100644
index ff27c187635..00000000000
--- a/keyboards/crkbd/keymaps/julian_turner/layers.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Julian Turner
- *
- * 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
-
-enum layers { _QWERTZ, _SYMBOL, _NUMBER };
\ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/julian_turner/oled.c b/keyboards/crkbd/keymaps/julian_turner/oled.c
deleted file mode 100644
index f6b022d5ec9..00000000000
--- a/keyboards/crkbd/keymaps/julian_turner/oled.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2022 Julian Turner
- *
- * 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 "layers.h"
-
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_keyboard_master()) {
-        return OLED_ROTATION_180; // flips the display 180 degrees if offhand
-    }
-    return rotation;
-}
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("layer: "), false);
-    switch (get_highest_layer(layer_state | default_layer_state)) {
-        case _QWERTZ:
-            oled_write_ln_P(PSTR("QWERTZ"), false);
-            break;
-        case _SYMBOL:
-            oled_write_ln_P(PSTR("SYMBOL"), false);
-            break;
-        case _NUMBER:
-            oled_write_ln_P(PSTR("NUMBER"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("unknown"), false);
-            break;
-    }
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_write_P(PSTR("WPM: "), false);
-        oled_write(get_u8_str(get_current_wpm(), ' '), false);
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/julian_turner/oled.h b/keyboards/crkbd/keymaps/julian_turner/oled.h
deleted file mode 100644
index 5fcf62d0aac..00000000000
--- a/keyboards/crkbd/keymaps/julian_turner/oled.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 Julian Turner
- *
- * 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 OLED_ENABLE
-bool            process_record_oled(uint16_t keycode, keyrecord_t *record);
-oled_rotation_t oled_init_user(oled_rotation_t rotation);
-void            render_layer_symbol(void);
-void            render_layer_name(void);
-void            render_mod_state(uint8_t modifiers);
-void            render_status(void);
-bool            oled_task_user(void);
-#endif
\ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/julian_turner/readme.md b/keyboards/crkbd/keymaps/julian_turner/readme.md
deleted file mode 100644
index ab1be582258..00000000000
--- a/keyboards/crkbd/keymaps/julian_turner/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# JulianTurner´s CRKBD Layout
-
-## Compile
-
-Compile using `qmk compile -kb crkbd -km julian_turner` for Pro Micro
diff --git a/keyboards/crkbd/keymaps/julian_turner/rules.mk b/keyboards/crkbd/keymaps/julian_turner/rules.mk
deleted file mode 100644
index 1717383ec49..00000000000
--- a/keyboards/crkbd/keymaps/julian_turner/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-RGBLIGHT_ENABLE = yes
-
-OLED_ENABLE     = yes
-WPM_ENABLE = yes
-
-
-# Enables Link Time Optimization (LTO) when compiling the keyboard. This makes the process take longer, but it can significantly reduce the compiled size (and since the firmware is small, the added time is not noticeable).
-LTO_ENABLE      = yes
-
-
-
-ifeq ($(OLED_ENABLE),yes)
-	SRC += ./oled.c
-endif
diff --git a/keyboards/crkbd/keymaps/kidbrazil/README.md b/keyboards/crkbd/keymaps/kidbrazil/README.md
deleted file mode 100644
index a7995a4f657..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/README.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# KidBrazil's custom CRKBD Layout
-
-![Loose Transistor Crkbd](https://user-images.githubusercontent.com/4823043/71268460-0862c000-231b-11ea-8f32-2fe8da4d348a.jpg)
-
-This is a simple layout that I use for both programming and gaming. It is very
-closely based on the original CRKBD layout with some modifications to the
-position of CTRL and SHIFT.
-
-## Layers
-This keymap includes a total of 4 Layers:
-- QWERTY
-- NUMBERS
-- SYMBOLS
-- GAMING
-- WEAPONS
-
-The first three layers are pretty self explanatory and follow closely the
-default keymap for this keyboard. The magic really starts to happen with the
-gaming layer.
-
-### Gaming Layer
-The gaming layer can be toggled on/off from the SYMBOLS layer. Once on the
-gaming layer it will stay there until you toggle it off again. The gaming layer
-includes normal WASD and most of the keys FPS games use on the left hand. On the
-right hand we have F1-F12 and a few other special keys for games that require
-it.
-
-### Weapon
-The weapon layer is a momentary layer that can only be reached from the gaming
-layer. This layer preserves the left hand almost unchanged, except for when the
-layer is activated the top row becomes NUM 1 - 6 for wepon selection. The right
-hand is KC_TRNS the whole way so basically it is still the gaming layer.
-
-## Custom Font
-This keymap includes a custom font for my LooseTransistor logo. It is fine if
-you want to use it I certainly don't mind but if you want your own, just replace
-the glcdfont file here and you should be fine.
-
-Alternatively you could remove the font config line from the config.h file so it
-will use the default QMK one.
-
-## OLED
-This Keymap is setup to use the newer OLED API. Some work has been done to
-customize this with showing layer and USB information. I also tried my best to
-get a dormant / sleep state going but it is hit or miss and often only works on
-the master hand.
-
-## OLED & RGB Matrix timeout
-This keymap will set a automated timeout system for the OLED screen and the RGB
-matrix. After 3 minutes or so the LED screen will display the logo on both
-halves and 5 minutes after that both the LED and the Matrix will be switched
-off.
-
-Once a user hits the keys again, the LED matrix will turn back on unless the
-user has disabled it via RGB_TOG.
-
-## Flashing
-To flash this on your CRKBD simply use the `make crkbd:kidbrazil:flash`
-command.
-
-### TODO
-- Wait for Spit_common to be implemented in CRKBD and revisit the special color
-  layers and animations
diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h
deleted file mode 100644
index 33655b4c9db..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/config.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2019 Lucas Moreira
-
-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 USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 150
-#undef PRODUCT
-#define PRODUCT         "CRKBD Loose Transistor Ed."
-
-#ifdef RGBLIGHT_ENABLE
-    //#undef RGBLED_NUM
-    #define RGBLIGHT_EFFECT_BREATHING
-    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    #define RGBLIGHT_EFFECT_KNIGHT
-    //#define RGBLED_NUM 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-    //#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-    // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash.
-    #define RGB_MATRIX_HUE_STEP 4
-    #define RGB_MATRIX_SAT_STEP 4
-    #define RGB_MATRIX_VAL_STEP 4
-    #define RGB_MATRIX_SPD_STEP 10
-
-    /* Disable the animations you don&#39;t want/need.  You will need to disable a good number of these    *
-     * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_MULTISPLASH
-#endif
-// Custom Font path
-#define OLED_FONT_H "keyboards/crkbd/keymaps/kidbrazil/glcdfont.c"
-#define OLED_DISABLE_TIMEOUT
diff --git a/keyboards/crkbd/keymaps/kidbrazil/enums.h b/keyboards/crkbd/keymaps/kidbrazil/enums.h
deleted file mode 100644
index ec1a67925f4..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/enums.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// [CRKBD layers Init] -------------------------------------------------------//
-typedef enum {
-    _QWERTY,
-    _NUM,
-    _SYM,
-    _GAME,
-    _WEAPON
-}CRKBD_LAYERS;
-
-extern enum CRKBD_LAYERS crkbd_layers;
diff --git a/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c b/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c
deleted file mode 100644
index ea1f3bd76b0..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/glcdfont.c
+++ /dev/null
@@ -1,232 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-const unsigned char font[] PROGMEM = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-  0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-  0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-  0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-  0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-  0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-  0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-  0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-  0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-  0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-  0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-  0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-  0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-  0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-  0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-  0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-  0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-  0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-  0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-  0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-  0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-  0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-  0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-  0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-  0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-  0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-  0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-  0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-  0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-  0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-  0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-  0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-  0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-  0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-  0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-  0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-  0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-  0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-  0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-  0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-  0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-  0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-  0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-  0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-  0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-  0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-  0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-  0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-  0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-  0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-  0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-  0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-  0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-  0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-  0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-  0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-  0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-  0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-  0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-  0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-  0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-  0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-  0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-  0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-  0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-  0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-  0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-  0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-  0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-  0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-  0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-  0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-  0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-  0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-  0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-  0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-  0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-  0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-  0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-  0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-  0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-  0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-  0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-  0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-  0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-  0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-  0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-  0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-  0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-  0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-  0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-  0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-  0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-  0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-  0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-  0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-  0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-  0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-  0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-  0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-  0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-  0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8,
-  0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x00,
-  0xFC, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
-  0x02, 0xF9, 0x01, 0x01, 0x05, 0x09,
-  0x11, 0x22, 0x06, 0xFE, 0xFE, 0xFE,
-  0xFE, 0xFE, 0xFE, 0xFE, 0x46, 0x46,
-  0x44, 0x44, 0x45, 0x44, 0x29, 0x28,
-  0x2A, 0x28, 0x11, 0x13, 0x05, 0x07,
-  0x05, 0x07, 0x05, 0x07, 0x05, 0x07,
-  0xE5, 0xE7, 0xE5, 0x07, 0x05, 0x07,
-  0x05, 0x07, 0x05, 0x07, 0x05, 0x07,
-  0x85, 0xC7, 0xE5, 0xE7, 0xE5, 0xE7,
-  0xE5, 0xE7, 0xE5, 0xC7, 0x85, 0x07,
-  0x85, 0xC7, 0xE5, 0xE7, 0xE5, 0xE7,
-  0xE5, 0xE7, 0xE5, 0xC7, 0x85, 0x07,
-  0x85, 0xC7, 0xE5, 0xE7, 0xE5, 0xE7,
-  0xE5, 0xE7, 0xE5, 0xE7, 0xE5, 0x07,
-  0xE5, 0xE7, 0xE5, 0xE7, 0xE5, 0xE7,
-  0xE5, 0xE7, 0xE5, 0xE7, 0xE5, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-  0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
-  0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
-  0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
-  0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
-  0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
-  0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
-  0xDE, 0xD7, 0xDC, 0x00, 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, 0xFF, 0xFF, 0xFF, 0xFF,
-  0xFF, 0xFF, 0xE3, 0xC1, 0xC1, 0x00,
-  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-  0x00, 0xFF, 0x00, 0x00, 0x80, 0x00,
-  0x1C, 0x3E, 0x7F, 0xFF, 0xFF, 0xFF,
-  0xFF, 0xFF, 0xFF, 0xFF, 0x22, 0x22,
-  0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-  0x22, 0x22, 0x22, 0x14, 0x14, 0x14,
-  0x14, 0x14, 0x08, 0x08, 0x00, 0x00,
-  0xFF, 0xFF, 0xFF, 0x80, 0x80, 0x80,
-  0x80, 0x80, 0x80, 0x80, 0x80, 0x00,
-  0xFF, 0xFF, 0xFF, 0xFF, 0x80, 0xBE,
-  0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
-  0xFF, 0xFF, 0xFF, 0xFF, 0x81, 0xBD,
-  0x81, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
-  0x8F, 0x9F, 0x9C, 0x9C, 0x9C, 0x9C,
-  0x9C, 0x9C, 0x9C, 0xFC, 0xF8, 0x00,
-  0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0x9C,
-  0x9C, 0x9C, 0x9C, 0x80, 0x80, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
-  0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
-  0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
-  0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
-  0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
-  0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
-  0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
-  0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
-  0x00, 0x00, 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, 0x03, 0x07, 0x0F,
-  0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00,
-  0x1F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
-  0x20, 0x47, 0x48, 0x50, 0x40, 0x41,
-  0x42, 0x24, 0x30, 0x3F, 0x3F, 0x3F,
-  0x3F, 0x3F, 0x3F, 0x3F, 0x31, 0x31,
-  0x11, 0x51, 0x11, 0x11, 0x4A, 0x0A,
-  0x2A, 0x0A, 0x44, 0x64, 0x50, 0x70,
-  0x50, 0x70, 0x50, 0x70, 0x50, 0x70,
-  0x53, 0x73, 0x53, 0x73, 0x53, 0x73,
-  0x53, 0x73, 0x53, 0x73, 0x53, 0x70,
-  0x50, 0x71, 0x53, 0x73, 0x53, 0x73,
-  0x53, 0x73, 0x53, 0x71, 0x50, 0x70,
-  0x50, 0x71, 0x53, 0x73, 0x53, 0x73,
-  0x53, 0x73, 0x53, 0x71, 0x50, 0x70,
-  0x53, 0x73, 0x53, 0x73, 0x53, 0x73,
-  0x53, 0x73, 0x53, 0x73, 0x51, 0x70,
-  0x53, 0x73, 0x53, 0x73, 0x53, 0x73,
-  0x53, 0x73, 0x53, 0x73, 0x53, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/keyboards/crkbd/keymaps/kidbrazil/keymap.c b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
deleted file mode 100644
index d5966033f19..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/keymap.c
+++ /dev/null
@@ -1,214 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "enums.h"
-#include "layer.h"
-#include "lufa.h"
-
-// [Init Variables] ----------------------------------------------------------//
-// Oled timer similar to Drashna's
-static uint32_t oled_timer = 0;
-// Boolean to store LED state
-bool user_led_enabled = true;
-// Boolean to store the master LED clear so it only runs once.
-bool master_oled_cleared = false;
-
-// [Keymaps] -----------------------------------------------------------------//
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	  [_QWERTY] = LAYOUT_split_3x6_3(
-      KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T,                                  KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-      LSFT_T(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_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B,                                 KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-                          LGUI_T(KC_PGUP), MO(_NUM), KC_SPC,         KC_ENT, MO(_SYM), LALT_T(KC_PGDN)
-    ),
-
-	  [_NUM] = LAYOUT_split_3x6_3(
-      KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,                                      KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
-      LSFT_T(KC_TAB), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,                         KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F12, KC_NO,
-      KC_LCTL, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,                               KC_PGUP, KC_PGDN, KC_HOME, KC_END, KC_F11, KC_NO,
-                               LGUI_T(KC_PGUP), KC_TRNS, KC_SPC,         KC_ENT, KC_TRNS, LALT_T(KC_PGDN)
-    ),
-
-	  [_SYM] = LAYOUT_split_3x6_3(
-      KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,                                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-      LSFT_T(KC_TAB), RGB_TOG, KC_MPLY, KC_MUTE, KC_VOLU, KC_VOLD,                        KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
-      KC_LCTL, KC_CALC, KC_MYCM, KC_MPRV, KC_MNXT, TG(_GAME),                             KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
-                                          LGUI_T(KC_PGUP), KC_TRNS, KC_SPC,       KC_ENT, KC_TRNS, LALT_T(KC_PGDN)
-    ),
-
-	  [_GAME] = LAYOUT_split_3x6_3(
-      KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T,                                   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
-      KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G,                                  KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, KC_NO,
-      KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_TRNS,                               KC_PGUP, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO,
-                            KC_TAB, MO(_WEAPON), KC_SPC,              KC_ENT, KC_TRNS, KC_NO
-      ),
-
-	  [_WEAPON] = LAYOUT_split_3x6_3(
-      KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LSFT, KC_A, KC_S, KC_D, KC_F,                               KC_6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LCTL, KC_Z, KC_X, KC_C, KC_V,                               KC_7, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,
-                                KC_TRNS, KC_TAB, KC_TRNS,             KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
-
-// [Post Init] --------------------------------------------------------------//
-void keyboard_post_init_user(void) {
-    // Set RGB to known state
-    rgb_matrix_enable_noeeprom();
-    rgb_matrix_set_color_all(RGB_GREEN);
-    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-    user_led_enabled = true;
-}
-// [Process User Input] ------------------------------------------------------//
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-      // Handle RGB Changes sans eeprom - necessary due to the layer dependent RGB color
-      // changes in marrix_scan_user
-      case RGB_TOG:
-          if (record->event.pressed) {
-              // Toggle matrix on key press
-              user_led_enabled ? rgb_matrix_disable_noeeprom() : rgb_matrix_enable_noeeprom();
-              // Toggle boolean flag
-              user_led_enabled = !user_led_enabled;
-          }
-          return false;
-      default:
-          // Use process_record_keymap to reset timer on all other keypresses to awaken from idle.
-          if (record->event.pressed) {
-              #ifdef OLED_ENABLE
-                  oled_timer = timer_read32();
-              #endif
-              // Restore LEDs if they are enabled by user
-              if (user_led_enabled) {
-                  rgb_matrix_enable_noeeprom();
-              }
-          }
-          return true;
-    }
-}
-
-// [Matrix Scan] ------------------------------------------------------------//
-void matrix_scan_user(void) {
-     // Iddle timer to return to default layer if left on game layer
-     if (timer_elapsed32(oled_timer) > 380000 && timer_elapsed32(oled_timer) < 479999) {
-         // Reset layer in case it got left on _GAME
-         // This prevents the issue where the master side sometimes wont switch off as expected
-         // in the next step.
-         if (get_highest_layer(layer_state) == _GAME) {
-             layer_off(_GAME);
-             layer_on(_QWERTY);
-         }
-         return;
-     }
-     // Timeout to turn off LEDs
-     else if (timer_elapsed32(oled_timer) > 480000) {
-         rgb_matrix_disable_noeeprom();
-         return;
-     }
-     // Set RGB Matrix color based on layers
-     if (user_led_enabled) {
-         switch (get_highest_layer(layer_state)){
-            case _GAME:
-                rgb_matrix_set_color_all(RGB_PURPLE);
-                break;
-            case _NUM:
-            case _SYM:
-            case _QWERTY:
-                rgb_matrix_set_color_all(RGB_GREEN);
-                break;
-            default:
-                rgb_matrix_set_color_all(RGB_GREEN);
-                break;
-
-          }
-     } else {
-         rgb_matrix_disable_noeeprom();
-         return;
-     }
-}
-// [OLED Configuration] ------------------------------------------------------//
-#ifdef OLED_ENABLE
-// Init Oled and Rotate....
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_keyboard_master())
-      return OLED_ROTATION_180;  // flips the display 180 to see it from my side
-    return rotation;
-}
-
-// Read logo from font file
-const char *read_logo(void);
-
-// {OLED helpers} -----------------------------------------------//
-// Render Logo
-void render_logo(void) {
-    oled_write(read_logo(), false);
-}
-
-// Master OLED Screen (Left Hand )
-void render_master_oled(void) {
-    // Switch display based on Layer
-    switch (get_highest_layer(layer_state)){
-        case _GAME:
-            render_separator();
-            render_layer_state();
-            render_separator();
-            render_separator();
-            break;
-        case _WEAPON:
-            render_separator();
-            render_separator();
-            render_layer_state();
-            render_separator();
-            break;
-        default:
-            render_separator();
-            render_layer_state();
-            render_separator();
-            render_usb_state();
-    }
-}
-
-// Slave OLED scren (Right Hand)
-void render_slave_oled(void) {
-    render_logo();
-}
-
-// {OLED Task} -----------------------------------------------//
-bool oled_task_user(void) {
-    // First time out switches to logo as first indication of iddle.
-    if (timer_elapsed32(oled_timer) > 100000 && timer_elapsed32(oled_timer) < 479999) {
-        // Render logo on both halves before full timeout
-        if (is_keyboard_master() && !master_oled_cleared) {
-            // Clear master OLED once so the logo renders properly
-            oled_clear();
-            master_oled_cleared = true;
-        }
-        render_logo();
-        return false;
-    }
-    // Drashna style timeout for LED and OLED Roughly 8mins
-    else if (timer_elapsed32(oled_timer) > 480000) {
-        oled_off();
-        rgb_matrix_disable_noeeprom();
-        return false;
-    }
-    else {
-        oled_on();
-        // Reset OLED Clear flag
-        master_oled_cleared = false;
-        // Show logo when USB dormant
-        switch (USB_DeviceState) {
-            case DEVICE_STATE_Unattached:
-            case DEVICE_STATE_Powered:
-            case DEVICE_STATE_Suspended:
-                render_logo();
-                break;
-            default:
-                if (is_keyboard_master()) {
-                    render_master_oled();
-                } else {
-                    render_slave_oled();
-                }
-        }
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/crkbd/keymaps/kidbrazil/kidbrazil.json b/keyboards/crkbd/keymaps/kidbrazil/kidbrazil.json
deleted file mode 100644
index dd9895cce97..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/kidbrazil.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"crkbd/rev1","keymap":"kidbrazil","layout":"LAYOUT","layers":[["KC_ESC","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSPC","LCTL_T(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","LGUI_T(KC_PGUP)","MO(1)","KC_SPC","KC_ENT","MO(2)","LALT_T(KC_PGDN)"],["KC_ESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_DEL","LCTL_T(KC_TAB)","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_LEFT","KC_UP","KC_DOWN","KC_RGHT","KC_F12","KC_NO","KC_LSFT","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_PGUP","KC_PGDN","KC_HOME","KC_END","KC_F11","KC_NO","LGUI_T(KC_PGUP)","KC_TRNS","KC_SPC","KC_ENT","KC_TRNS","LALT_T(KC_PGDN)"],["KC_ESC","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_BSPC","LCTL_T(KC_TAB)","RGB_TOG","RGB_MOD","RGB_HUI","RGB_SAI","RGB_VAI","KC_MINS","KC_EQL","KC_LCBR","KC_RCBR","KC_PIPE","KC_GRV","KC_LSFT","RGB_VAD","RGB_RMOD","RGB_HUD","RGB_SAD","TG(3)","KC_UNDS","KC_PLUS","KC_LBRC","KC_RBRC","KC_BSLS","KC_TILD","LGUI_T(KC_PGUP)","KC_TRNS","KC_SPC","KC_ENT","KC_TRNS","LALT_T(KC_PGDN)"],["KC_ESC","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_LSFT","KC_A","KC_S","KC_D","KC_F","KC_G","KC_F7","KC_F8","KC_F9","KC_F10","KC_NO","KC_NO","KC_LCTL","KC_Z","KC_X","KC_C","KC_V","KC_TRNS","KC_PGUP","KC_PGDN","KC_NO","KC_NO","KC_NO","KC_NO","KC_TAB","MO(4)","KC_SPC","KC_ENT","KC_TRNS","KC_NO"],["KC_ESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LSFT","KC_A","KC_S","KC_D","KC_F","KC_6","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCTL","KC_Z","KC_X","KC_C","KC_V","KC_7","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TAB","KC_TRNS","KC_SPC","KC_TRNS","KC_TRNS","KC_TRNS"]],"author":"","notes":""}
\ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/kidbrazil/layer.c b/keyboards/crkbd/keymaps/kidbrazil/layer.c
deleted file mode 100644
index fbcebd66ffb..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/layer.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "enums.h"
-#include "lufa.h"
-
-// Render Blank Space
-void render_space(void) {
-    oled_write_ln_P(PSTR("     "), false);
-}
-
-// Render separator lines for oled display
-void render_separator(void) {
-    switch (get_highest_layer(layer_state)){
-        case _GAME:
-        case _WEAPON:
-            oled_write_ln_P(PSTR("===================="), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("++++++++++++++++++++"), false);
-    }
-}
-
-// Render current layer state
-void render_layer_state(void){
-	// If you want to change the display of OLED, you need to change here
-    switch (get_highest_layer(layer_state)){
-        case _QWERTY:
-            oled_write_ln_P(PSTR("| MODE | QWRTY     ]"), false);
-            break;
-        case _NUM:
-            oled_write_ln_P(PSTR("| MODE | NUMBERS   ]"), false);
-            break;
-        case _SYM:
-            oled_write_ln_P(PSTR("| MODE | SYMBOLS   ]"), false);
-            break;
-        case _GAME:
-            oled_write_ln_P(PSTR("|    G  A  M  E    ]"), false);
-            break;
-        case _WEAPON:
-            oled_write_ln_P(PSTR("| W  E  A  P  O  N ]"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("| MODE | UNDEF     ]"), false);
-    }
-}
-
-// Render USB State
-void render_usb_state(void) {
-    switch (USB_DeviceState) {
-      case DEVICE_STATE_Unattached:
-			    oled_write_ln_P(PSTR("| USB  | FREE      ]"), false);
-          break;
-      case DEVICE_STATE_Suspended:
-          oled_write_ln_P(PSTR("| USB  | SLEEP     ]"), false);
-          break;
-      case DEVICE_STATE_Configured:
-          oled_write_ln_P(PSTR("| USB  | READY     ]"), false);
-          break;
-      case DEVICE_STATE_Powered:
-          oled_write_ln_P(PSTR("| USB  | PWRD      ]"), false);
-          break;
-      case DEVICE_STATE_Default:
-          oled_write_ln_P(PSTR("| USB  | DFLT      ]"), false);
-          break;
-      case DEVICE_STATE_Addressed:
-          oled_write_ln_P(PSTR("| USB  | ADDRS     ]"), false);
-          break;
-      default:
-          oled_write_ln_P(PSTR("| USB  | INVALID   ]"), false);
-    }
-}
diff --git a/keyboards/crkbd/keymaps/kidbrazil/layer.h b/keyboards/crkbd/keymaps/kidbrazil/layer.h
deleted file mode 100644
index 2134e6ddab0..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/layer.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// [OLED Helpers] ----------------------------------------------------//
-// Render empty space on OLED
-void render_space(void);
-// Render separator characters for rows
-void render_separator(void);
-// Render layer state
-void render_layer_state(void);
-// Render USB State
-void render_usb_state(void);
diff --git a/keyboards/crkbd/keymaps/kidbrazil/logo_reader.c b/keyboards/crkbd/keymaps/kidbrazil/logo_reader.c
deleted file mode 100644
index 1bc1503a604..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/logo_reader.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "crkbd.h"
-
-const char *read_logo(void) {
-  static char logo[] = {
-      0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-      0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-      0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-      0};
-
-  return logo;
-}
diff --git a/keyboards/crkbd/keymaps/kidbrazil/rules.mk b/keyboards/crkbd/keymaps/kidbrazil/rules.mk
deleted file mode 100644
index c16efc66e30..00000000000
--- a/keyboards/crkbd/keymaps/kidbrazil/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-MOUSEKEY_ENABLE = no
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = yes
-OLED_ENABLE = yes
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  logo_reader.c \
-				layer.c
diff --git a/keyboards/crkbd/keymaps/madhatter/config.h b/keyboards/crkbd/keymaps/madhatter/config.h
deleted file mode 100644
index afdaf1c1fd0..00000000000
--- a/keyboards/crkbd/keymaps/madhatter/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-#    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 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
diff --git a/keyboards/crkbd/keymaps/madhatter/keymap.c b/keyboards/crkbd/keymaps/madhatter/keymap.c
deleted file mode 100644
index eb29bfe33eb..00000000000
--- a/keyboards/crkbd/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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 <string.h>
-
-enum corny_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum corny_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  RGBRST
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      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, KC_ENT ,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LCTL,  LOWER, KC_BSPC,     KC_SPC,  RAISE,  KC_RCMD
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [_LOWER] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS,  LOWER, KC_TRNS,    KC_TRNS,   RAISE, KC_TRNS
-                                      //`--------------------------'  `--------------------------'
-    ),
-
-  [_RAISE] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE,  KC_GRV,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS,  LOWER, KC_BSPC,    KC_TRNS,   RAISE, KC_TRNS
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      XXXXXXX,  RGBRST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS,  LOWER, KC_TRNS,    KC_TRNS,   RAISE, KC_TRNS
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_get_mode();
-    #endif
-}
-
-#ifdef OLED_ENABLE
-
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write(read_layer_state(), false);
-    oled_write(read_keylog(), false);
-    //oled_write_ln(read_keylogs(), false);
-    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
-    //oled_write_ln(read_host_led_state(), false);
-    //oled_write_ln(read_timelog(), false);
-  } else {
-    oled_write(read_logo(), false);
-  }
-  return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-       set_single_persistent_default_layer(_QWERTY);
-      }
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      return false;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/crkbd/keymaps/madhatter/rules.mk b/keyboards/crkbd/keymaps/madhatter/rules.mk
deleted file mode 100644
index ed64986331f..00000000000
--- a/keyboards/crkbd/keymaps/madhatter/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-OLED_ENABLE     = yes
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h
deleted file mode 100644
index 0a3d7a360cf..00000000000
--- a/keyboards/crkbd/keymaps/markstos/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-This is the C configuration file for the keymap
-
-  Copyright 2022 Mark Stosberg (@markstos)
-  SPDX-License-Identifier: GPL-2.0-or-later
-
-*/
-
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-#define MASTER_RIGHT
-// #define EE_HANDS
-
-// By default, when holding a dual-function key shortly after tapping it, the
-// tapped key will begin repeating. This is handy for fast typists when typing
-// words with double letters, such as "happy". If you turn this setting ON, it
-// will be counted as a held modifier instead.
-//#define TAPPING_FORCE_HOLD
-
-// Customized by markstos
-#define TAPPING_TERM 200
-#define TAPPING_TERM_PER_KEY
-// used for Tapping Term on thumb keys
-#define TAPPING_TERM_THUMB 125
-
-// If you press a dual-role key, press another key, and then release the
-// dual-role key, all within the tapping term, by default the dual-role key
-// will perform its tap action. If the HOLD_ON_OTHER_KEY_PRESS option is
-// enabled, the dual-role key will perform its hold action instead.
-#define HOLD_ON_OTHER_KEY_PRESS
-
-// markstos: not sure if these are correct
-// They are intended to beep and flash during flashing
-#define QMK_LED     D5
-#define QMK_SPEAKER C6
-
-// When enabled, typing a mod-tap plus second within term will register as the mod-combo
-// Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
-#define PERMISSIVE_HOLD
-
-// Set the COMBO_TERM so low that I won't type the keys one after each other during normal typing.
-// They would have be held together intentionally to trigger this.
-#define COMBO_TERM 40
-
-// These mostly affect my one-shot Shift key, providing a CapsLock alternative.
-// I want a relatively low timeout, so if I accidentally type "Shift", I can pause just briefly and move on.
-#define ONESHOT_TAP_TOGGLE 3  /* Tapping this number of times holds the key until tapped once again. */
-#define ONESHOT_TIMEOUT 2000  /* Time (in ms) before the one shot key is released */
diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c
deleted file mode 100644
index 1f95ee52b28..00000000000
--- a/keyboards/crkbd/keymaps/markstos/keymap.c
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2022 Mark Stosberg (@markstos)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  FUNC,
-  BACKLIT
-};
-
-enum combos {
-  DF_DASH,
-  JK_ESC
-};
-
-const uint16_t PROGMEM df_combo[] = {KC_D, KC_F, COMBO_END};
-const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
-
-combo_t key_combos[] = {
-  // Add commonly used dash to home row
-  [DF_DASH]    = COMBO(df_combo, KC_MINS),
-  // For Vim, put Escape on the home row
-  [JK_ESC]    = COMBO(jk_combo, KC_ESC),
-};
-
-// 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 custom_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _FUNC,
-};
-
-// For _QWERTY layer
-#define OSM_LCTL OSM(MOD_LCTL)
-#define OSM_AGR  OSM(MOD_RALT)
-#define OSL_FUN  OSL(_FUNC)
-#define GUI_ENT  GUI_T(KC_ENT)
-#define LOW_TAB  LT(_LOWER, KC_TAB)
-#define RSE_BSP  LT(_RAISE, KC_BSPC)
-#define OSM_SFT  OSM(MOD_LSFT)
-
-
-// For _RAISE layer
-#define CTL_ESC  LCTL_T(KC_ESC)
-
-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_DEL  ,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- OSM(MOD_LALT),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                     KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_QUOT ,OSM_AGR ,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- OSM(MOD_LSFT),   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                     KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,OSL_FUN ,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                         OSM_LCTL, GUI_ENT, LOW_TAB,   RSE_BSP ,KC_SPC  ,OSM_SFT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, KC_EXLM, KC_AT,  KC_HASH, KC_DLR,  KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______ ,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_1,    KC_2,   KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______ ,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX , KC_TILD,KC_GRV, KC_LBRC, KC_LCBR,                       KC_RCBR, KC_RBRC, KC_COMM,KC_DOT,  KC_SLSH, _______ ,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS,  KC_TRNS, LOWER,    KC_TRNS, KC_TRNS, KC_COLON
-                                      //`--------------------------'  `--------------------------'
-    ),
-
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, KC_DEL , XXXXXXX, KC_UNDS, KC_PLUS, KC_PGUP,                      XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_PIPE,_______ ,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_HOME, KC_END , KC_MINS, KC_EQL , KC_PGDN,                      KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, KC_APP ,_______ ,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_LT  , KC_GT  , KC_COPY, KC_PSTE, KC_SCLN,                      KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU,_______ ,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          CTL_ESC, KC_TRNS, XXXXXXX,    RAISE  , KC_TRNS, KC_TRNS
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_FUNC] = 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 , XXXXXXX, XXXXXXX, XXXXXXX,                     XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______ ,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                     XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,XXXXXXX ,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, FUNC   , XXXXXXX
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-      case LT(_RAISE, KC_BSPC):
-            return TAPPING_TERM_THUMB;
-      case LT(_LOWER, KC_TAB):
-            return TAPPING_TERM_THUMB;
-      default:
-            return TAPPING_TERM;
-    }
-}
diff --git a/keyboards/crkbd/keymaps/markstos/readme.md b/keyboards/crkbd/keymaps/markstos/readme.md
deleted file mode 100644
index 6789c9da30e..00000000000
--- a/keyboards/crkbd/keymaps/markstos/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Markstos Corne keyboard layout
-
-![markstos 3x5+1 Corne layout](https://mark.stosberg.com/content/images/2022/11/markstos-3x5-plus-1-layout-v2.2.png)
-
-A primarily 3x5 layout for split ergonomic keywords with an extra column on each hand for rare and optional keys.
-
-For a detailed description see [markstos Corne layout](https://mark.stosberg.com/markstos-corne-3x5-1-keyboard-layout).
-
-# Disclaimer
-
-This is my personal layout and is subject to evolve further with my tastes. Fork your own copy if you need stability. Suggestions welcome.
-
-# Author
-
-* [Mark Stosberg](mailto:mark@stosberg.com)
diff --git a/keyboards/crkbd/keymaps/markstos/rules.mk b/keyboards/crkbd/keymaps/markstos/rules.mk
deleted file mode 100644
index 9bca23db951..00000000000
--- a/keyboards/crkbd/keymaps/markstos/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# markstos: enable media keys
-EXTRAKEY_ENABLE = yes
-
-# markstos: smaller file size, little down-side
-LTO_ENABLE = yes
-
-COMBO_ENABLE = yes
-
-# This is for RGB *underglow*
-# https://github.com/qmk/qmk_firmware/blob/master/docs/feature_rgblight.md
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/crkbd/keymaps/mb_via/readme.md b/keyboards/crkbd/keymaps/mb_via/readme.md
deleted file mode 100644
index 048927073ba..00000000000
--- a/keyboards/crkbd/keymaps/mb_via/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Default Via keyboard for the Corne R2G by Mechboards UK
-
-![r2g](https://cdn.shopify.com/s/files/1/0582/0242/3501/products/HelidoxCorneR2GPCB_1800x1800.png)
-
-Corne R2G is an eddition of the classic CRKBD by footsan remade to feature a full smd assembly
-
-In this fold can be found the default via enabled keymap that can be in conjunction 
-
-Flash example for this Keymap:  
-```sh
-qmk flash -kb crkbd/r2g -km mb_via
-```
diff --git a/keyboards/crkbd/keymaps/mcrown/config.h b/keyboards/crkbd/keymaps/mcrown/config.h
deleted file mode 100644
index 15a1f20954d..00000000000
--- a/keyboards/crkbd/keymaps/mcrown/config.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/** @file config.h
- *  @brief config header that includes function prototypes and external variables.
- *
- * 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/>.
- *
- * @author Mario Corona (mariocc@comunidad.unam.mx) 2021
- *
- */
-
-#pragma once
-
-/* Select hand configuration */
-#define MASTER_LEFT
-
-/* Comment this definition out if you want the main display to be output in horizontal mode */
-#define OLED_VERTICAL
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-    #define RGB_MATRIX_HUE_STEP 10
-    #define RGB_MATRIX_SAT_STEP 10
-    #define RGB_MATRIX_VAL_STEP 10
-    #define RGB_MATRIX_SPD_STEP 10
-//    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-    /* BEGIN: Disable RGB Effects */
-//    #undef ENABLE_RGB_MATRIX_SOLID_COLOR
-//    #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-//    #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-//    #undef ENABLE_RGB_MATRIX_BREATHING
-//    #undef ENABLE_RGB_MATRIX_BAND_SAT
-//    #undef ENABLE_RGB_MATRIX_BAND_VAL
-//    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-//    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-//    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-//    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-//    #undef ENABLE_RGB_MATRIX_CYCLE_ALL
-//    #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-//    #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-//    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-//    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-//    #undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-//    #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-
-/* BEGIN: RGB_MATRIX_FRAMEBUFFER_EFFECTS */
-//    #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-//    #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-/* END: RGB_MATRIX_FRAMEBUFFER_EFFECTS */
-
-/* BEGIN: RGB_MATRIX_KEYPRESSES */
-//    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-//    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-//    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-//    #undef ENABLE_RGB_MATRIX_SPLASH
-//    #undef ENABLE_RGB_MATRIX_MULTISPLASH
-//    #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-//    #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-/* END: RGB_MATRIX_KEYPRESSES */
-/* END: Disable RGB Effects */
-#endif
-
-/* To tell the compiler to use custom font */
-#define OLED_FONT_H "keyboards/crkbd/keymaps/mcrown/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/mcrown/glcdfont.c b/keyboards/crkbd/keymaps/mcrown/glcdfont.c
deleted file mode 100644
index 17aa1dde39a..00000000000
--- a/keyboards/crkbd/keymaps/mcrown/glcdfont.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/** @file glcfont.c
- *  @brief mcrown glcfont module. This module includes the font for mcrown keymap.
- *
- * 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/>.
- *
- * @author Mario Corona (mariocc@comunidad.unam.mx) 2021
- *
- */
-
-#include "progmem.h"
-
-/* Standard ASCII 5x7 font */
-static const unsigned char font[] PROGMEM =
-{
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-    0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, 0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, 0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00, 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 0xFC, 0x18, 0x24, 0x24, 0x18, 0x00, 0x18, 0x24, 0x24, 0x18, 0xFC, 0x00, 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0xF0, 0xF8, 0xF8, 0xFF, 0x38, 0xFF, 0xF8, 0xF8, 0x3F, 0xF8, 0xF8, 0xFF, 0x38, 0xFF, 0xF8, 0xF8, 0xF0, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0xC0, 0x80, 0x00, 0x00, 0xC0, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0x00, 0xC0, 0xC0, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 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, 0xC0, 0xF0, 0xF8, 0xFC, 0x3E,
-    0x1E, 0x06, 0x01, 0x00, 0x00, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 0xDE, 0xD7, 0xDC, 0x00, 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, 0x49, 0x49, 0x49, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0xDF, 0xBF, 0xBF, 0x00, 0xBF, 0xBF, 0xDF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x49, 0x49, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x3F, 0x60, 0x60, 0xE0, 0xBF, 0x1F, 0x00, 0x7F, 0x7F, 0x07, 0x1E, 0x38, 0x1E, 0x07, 0x7F, 0x7F, 0x00, 0x7F, 0x7F, 0x0E, 0x1F, 0x3B, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x7F, 0x0C, 0x0C, 0x0C, 0x00, 0x7E, 0x7E, 0x00, 0x7F, 0x7E, 0x03, 0x03, 0x00, 0x7F, 0x7E, 0x03, 0x03, 0x7E, 0x7E, 0x03, 0x03, 0x7F, 0x7E, 0x00, 0x0F,
-    0x3E, 0x70, 0x3C, 0x06, 0x3C, 0x70, 0x3E, 0x0F, 0x00, 0x32, 0x7B, 0x49, 0x49, 0x3F, 0x7E, 0x00, 0x7F, 0x7E, 0x03, 0x03, 0x00, 0x1E, 0x3F, 0x69, 0x69, 0x6F, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0F, 0x1F, 0x3F, 0x3C, 0x78, 0x70, 0x60, 0x00, 0x00, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00, 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 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, 0x07, 0x0F, 0x0F, 0x7F, 0x0F, 0x7F, 0x0F, 0x0F, 0x7E, 0x0F, 0x0F, 0x7F, 0x0F, 0x7F, 0x0F, 0x0F, 0x07, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/keyboards/crkbd/keymaps/mcrown/keymap.c b/keyboards/crkbd/keymaps/mcrown/keymap.c
deleted file mode 100644
index 907e1347bb8..00000000000
--- a/keyboards/crkbd/keymaps/mcrown/keymap.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/** @file keymap.c
- *  @brief keymao.c that includes key layout and keylogs functions
- *
- * 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/>.
- *
- * @author Mario Corona (mariocc@comunidad.unam.mx) 2021
- *
- */
-
-#include "mcrown.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] =  LAYOUT_wrapper(
-          /*,-------------------------------------------------|-----|--------------------------------------------------------|.*/
-          _____________________QWERTY_L1______________________,      _____________________QWERTY_R1______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-          _____________________QWERTY_L2______________________,      _____________________QWERTY_R2______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-          _____________________QWERTY_L3______________________,      _____________________QWERTY_R3______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-                            _____________MOD_LEFT_____________,      _____________MOD_RIGHT____________
-                        /*|-----------------------------------|     |----------------------------------|*/
-  ),
-
-  [_LOWER] =  LAYOUT_wrapper(
-          /*,-------------------------------------------------|-----|--------------------------------------------------------|.*/
-          _____________________LOWER_L1_______________________,      _____________________LOWER_R1_______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-          _____________________LOWER_L2_______________________,      _____________________LOWER_R2_______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-          _____________________LOWER_L3_______________________,      _____________________LOWER_R3_______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-                            _____________MOD_LEFT_____________,      _____________MOD_RIGHT____________
-                        /*|-----------------------------------|     |----------------------------------|*/
-  ),
-
-  [_RAISE] = LAYOUT_wrapper(
-          /*,-------------------------------------------------|-----|--------------------------------------------------------|.*/
-          _____________________RAISE_L1_______________________,      _____________________RAISE_R1_______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-          _____________________RAISE_L2_______________________,      _____________________RAISE_R2_______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-          _____________________RAISE_L3_______________________,      _____________________RAISE_R3_______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-                            _____________MOD_LEFT_____________,      _____________MOD_RIGHT____________
-                        /*|-----------------------------------|     |----------------------------------|*/
-  ),
-
-  [_ADJUST] = LAYOUT_wrapper(
-          /*,-------------------------------------------------|-----|--------------------------------------------------------|.*/
-          _____________________ADJUST_L1______________________,      _____________________ADJUST_R1______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-          _____________________ADJUST_L2______________________,      _____________________ADJUST_R2______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-          _____________________ADJUST_L3______________________,      _____________________ADJUST_R3______________________,
-          /*|--------+--------+--------+--------+--------+----|     |--------+--------+--------+--------+--------+-----------|*/
-                            _____________MOD_LEFT_____________,      _____________MOD_RIGHT____________
-                        /*|-----------------------------------|     |----------------------------------|*/
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record){
-    bool user_records_press=true;
-
-    if (record->event.pressed){
-        add_keylog(keycode);
-    }
-
-    switch (keycode){
-        case QWERTY:
-            if (record->event.pressed){
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            break;
-
-        case LOWER:
-            if(record->event.pressed){
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }else{
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            break;
-
-        case RAISE:
-            if (record->event.pressed){
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }else{
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            break;
-
-        case ADJUST:
-            if (record->event.pressed){
-                layer_on(_ADJUST);
-            }else{
-                layer_off(_ADJUST);
-            }
-            break;
-
-        case RGB_MOD:
-            #ifdef RGBLIGHT_ENABLE
-            if(record->event.pressed){
-                rgblight_mode(RGB_current_mode);
-                rgblight_step();
-                RGB_current_mode = rgblight_get_mode();
-            }
-            #endif
-            break;
-
-        case RGBRST:
-            #ifdef RGBLIGHT_ENABLE
-            if(record->event.pressed){
-                eeconfig_update_rgblight_default();
-                rgblight_enable();
-                RGB_current_mode = rgblight_get_mode();
-            }
-            #endif
-            break;
-
-        default:
-            user_records_press=false;
-            break;
-    }
-
-    return false==user_records_press;
-}
diff --git a/keyboards/crkbd/keymaps/mcrown/mcrown.h b/keyboards/crkbd/keymaps/mcrown/mcrown.h
deleted file mode 100644
index b60f759469a..00000000000
--- a/keyboards/crkbd/keymaps/mcrown/mcrown.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/** @file mcrown.h
- *  @brief mcrown header thant incluedes key layout and some definintions.
- *
- * 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/>.
- *
- * @author Mario Corona (mariocc@comunidad.unam.mx) 2021
- *
- */
-
-#pragma once
-
-#include QMK_KEYBOARD_H
-#include "oled.h"
-
-#define KC_XXXXX KC_NO
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_CTLTB CTL_T(KC_TAB)
-#define KC_GUIEI GUI_T(KC_LNG2)
-#define KC_ALTKN ALT_T(KC_LNG1)
-
-#define LAYOUT_wrapper(...)   LAYOUT(__VA_ARGS__)
-
-/* For values greater than 0x200, substract that value and add 0x20 so the characters can be mapped  */
-#define RM_LSFT(kc)           ((uint8_t)(0x20)+(kc-0x200))
-
-/* ######################################################################### LAYOUT BLOCKS ##################################################### */
-/* -----------------------------------------BUTTON1---BUTTON2- BUTTON3------- */
-#define _____________MOD_LEFT_____________ KC_GUIEI, KC_LOWER, KC_SPC
-#define _____________MOD_RIGHT____________ KC_ENT,   KC_RAISE, KC_ALTKN
-
-
-/* ------------------------------------------------------------COL1------COL2-----COL3-----COL4-----COL5-----COL6--------- */
-#define   _____________________RAISE_L1_______________________ KC_ESC,   KC_EXLM, KC_AT,   KC_HASH,  KC_DLR,   KC_PERC
-#define   _____________________RAISE_L2_______________________ KC_LSFT,  KC_MPLY, KC_VOLU, KC_MNXT,  XXXXXXX,  XXXXXXX
-#define   _____________________RAISE_L3_______________________ KC_CTLTB, KC_CALC, KC_VOLD, KC_MPRV,  KC_BRIU,  KC_BRID
-
-#define   _____________________RAISE_R1_______________________ KC_CIRC,  KC_AMPR, KC_ASTR, KC_LPRN,  KC_RPRN,  KC_DEL
-#define   _____________________RAISE_R2_______________________ KC_MINS,  KC_EQL,  KC_LCBR, KC_RCBR,  KC_PIPE,  KC_GRV
-#define   _____________________RAISE_R3_______________________ KC_UNDS,  KC_PLUS, KC_LBRC, KC_RBRC,  KC_BSLS,  KC_TILD
-
-/* ------------------------------------------------------------COL1------COL2-----COL3-----COL4-----COL5-----COL6--------- */
-#define   _____________________QWERTY_L1______________________ KC_ESC,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
-#define   _____________________QWERTY_L2______________________ KC_LSFT,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G
-#define   _____________________QWERTY_L3______________________ KC_CTLTB, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
-
-#define   _____________________QWERTY_R1______________________ KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC
-#define   _____________________QWERTY_R2______________________ KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT
-#define   _____________________QWERTY_R3______________________ KC_N,     KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT
-
-/* ------------------------------------------------------------COL1------COL2-----COL3-----COL4-----COL5-----COL6--------- */
-#define   _____________________LOWER_L1_______________________ KC_CAPS,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5
-#define   _____________________LOWER_L2_______________________ KC_LSFT,  XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_PGDN
-#define   _____________________LOWER_L3_______________________ KC_CTLTB, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
-
-#define   _____________________LOWER_R1_______________________ KC_6,     KC_7,    KC_8,    KC_9,     KC_0,     KC_BSPC
-#define   _____________________LOWER_R2_______________________ KC_LEFT,  KC_UP,   KC_DOWN, KC_RIGHT, KC_HOME,  KC_END
-#define   _____________________LOWER_R3_______________________ KC_F6,    KC_F7,   KC_F8,   KC_F9,    KC_F10,   KC_F11
-
-/* ------------------------------------------------------------COL1------COL2-----COL3-----COL4-----COL5-----COL6--------- */
-#define   _____________________ADJUST_L1______________________ XXXXXXX,  EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
-  #define _____________________ADJUST_L2______________________ XXXXXXX,  XXXXXXX, RGB_SPI, RGB_SAI, RGB_HUI, RGB_VAI
-  #define _____________________ADJUST_L3______________________ XXXXXXX,  XXXXXXX, RGB_SPD, RGB_SAD, RGB_HUD, RGB_VAD
-#else/* ---------------------------------------------------------------|---------|--------|--------|--------|------------- */
-  #define _____________________ADJUST_L2______________________ M_VRSN,   M_MALL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  #define _____________________ADJUST_L3______________________ M_FLSH,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-#endif/* --------------------------------------------------------------|---------|--------|--------|--------|------------- */
-#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
-  #define _____________________ADJUST_R1______________________ RGB_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  #define _____________________ADJUST_R3______________________ RGB_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-#else/* ---------------------------------------------------------------|---------|--------|--------|--------|------------- */
-  #define _____________________ADJUST_R1______________________ XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  #define _____________________ADJUST_R3______________________ XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-#endif/* --------------------------------------------------------------|---------|--------|--------|--------|------------- */
-#define   _____________________ADJUST_R2______________________ RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-
-/* Each layer gets a name for readability */
-typedef enum custom_layers {
-    _QWERTY,
-    _DVORAK,
-    _COLEMAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-    _NUMPAD,
-    _MAX_LAYERS
-}CUSTOM_LAYERS_T;
-
-/* To be used to identify the current working layer */
-typedef enum custom_keycodes{
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    ADJUST,
-    BACKLIT,
-    RGBRST
-}CUSTOM_KEYCODES_T;
diff --git a/keyboards/crkbd/keymaps/mcrown/oled.c b/keyboards/crkbd/keymaps/mcrown/oled.c
deleted file mode 100644
index f88fc0c8d88..00000000000
--- a/keyboards/crkbd/keymaps/mcrown/oled.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/** @file oled.h
- *  @brief mcrown oled service implementation.
- *
- * 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/>.
- *
- * @author Mario Corona (mariocc@comunidad.unam.mx) 2021
- *
- */
-
-#include QMK_KEYBOARD_H
-#include <stdio.h>
-#include <string.h>
-#include "mcrown.h"
-#include "oled.h"
-
-#define ASCII_TABLE_LENGTH       (0x80)
-#define KEYLOG_STRING_STARTUP    (KEYLOG_EOL_LEN+1)
-#define ALT_CODE                 (0x7E)
-#define SPECIAL_KEYS_SHIFT(kc)   (0x18+(kc))
-
-static void render_keylogger_status(void);
-
-static char keylog_str[KEYLOG_EOL_LEN] = {' '};
-static uint16_t log_timer = 0;
-static uint8_t current_cursor_pos=0;
-static uint32_t cursor_oled_timer = 0;
-static uint32_t standby_oled_timer = 0;
-static char last_c=' ';
-
-/* Provides the ASCII value or the address of the character selected of the OLED font specified in glcfont.c */
-static const char ascii_t[ASCII_TABLE_LENGTH] = {
-        /*     0          1         2         3        4         5         6         7         8         9         A         B         C         D         E         F                */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-           0x0F,         0x1A,    0x1B,     0x19,    0x18,     0x0E,      ' ',      ' ',     0x11,      0x1C,    0x97,      ' ',      ' ',      ' ',      ' ',      ' ',         /* 0 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            ' ',         ' ',      ' ',      ' ',     ' ',      ' ',      ' ',      ' ',      ' ',       ' ',     ' ',     0x1D,      ' ',      ' ',      ' ',      ' ',         /* 1 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-           0x16,         '!',      '"',      '#',     '$',      '%',      '&',     '\'',      '(',       ')',     '*',      '+',      ',',      '-',      '.',      '/',         /* 2 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            '0',         '1',      '2',      '3',     '4',      '5',      '6',      '7',      '8',       '9',     ':',      ';',      '<',      '=',      '>',      '?',         /* 3 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            '@',         'A',      'B',      'C',     'D',      'E',      'F',      'G',      'H',       'I',     'J',      'K',      'L',      'M',      'N',      'O',         /* 4 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            'P',         'Q',      'R',      'S',     'T',      'U',      'V',      'W',      'X',       'Y',     'Z',      '[',      '\\',     ']',      '^',      '_',         /* 5 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            '`',         'a',      'b',      'c',     'd',      'e',      'f',      'g',      'h',       'i',     'j',      'k',      'l',      'm',      'n',      'o',         /* 6 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            'p',         'q',      'r',      's',     't',      'u',      'v',      'w',      'x',       'y',     'z',      '{',      '|',      '}',      '~',     0x7F,         /* 7 */
-};
-
-/* This table is to remap and get the corresponding ASCII value based on the KEYCODE (taken as the index of the array) of quatum_keycodes.h module */
-static const unsigned char code_to_ascii[ASCII_TABLE_LENGTH] = {
-        /*     0          1         2         3        4         5         6         7         8         9         A         B         C         D         E         F                */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-           0x00,        0x00,     0x00,     0x00,      'a',      'b',     'c',      'd',      'e',       'f',     'g',      'h',      'i',      'j',      'k',      'l',         /* 0 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            'm',         'n',      'o',      'p',      'q',      'r',     's',      't',      'u',       'v',     'w',      'x',      'y',      'z',      '1',      '2',         /* 1 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            '3',         '4',      '5',      '6',      '7',      '8',     '9',      '0',     0x0A,      0x1B,    0x08,     0x09,      ' ',      '-',      '=',      '[',         /* 2 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            ']',        '\\',     0x00,      ';',     '\'',      '`',     ',',      '.',      '/',      0x00,    0x00,     0x00,     0x00,     0x00,      '!',      '@',         /* 3 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            '#',         '$',      '%',      '^',      '&',      '*',     '(',      ')',     0x00,      0x00,    0x00,     0x00,     0x00,      '_',      '+',      '{',         /* 4 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-            '}',         '|',     0x00,     0x00,     0x00,      '~',    0x00,     0x00,     0x00,      0x00,    0x00,     0x00,     0x00,     0x00,     0x00,     0x00,         /* 5 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-           0x00,        0x00,     0x00,     0x00,     0x7F,     0x00,    0x00,     0x01,     0x02,      0x03,    0x04,     0x00,     0x00,     0x00,     0x00,     0x00,         /* 6 */
-        /*          |         |         |         |         |         |         |         |         |         |         |         |         |         |         |         |           */
-           0x00,        0x00,     0x00,     0x00,     0x00,     0x00,    0x00,     0x00,     0x00,      0x00,    0x00,     0x00,     0x00,     0x00,     0x05,     0x00,         /* 7 */
-};
-
-/** @brief maps the keycode to get the ascii value.
- *
- *  If any argument is invalid, the function has no effect.
- *
- *  @param keycode value of the pressed key.
- *  @return ascii value of the pressed key or a special value for non-ascii keys.
- */
-inline static char get_ascii(int16_t keycode){
-    uint8_t ascii_idx=0x00;
-
-    if(keycode<KC_F1){
-        ascii_idx=code_to_ascii[(uint8_t)keycode];
-    }else if(keycode<KC_KP_ENTER){
-        ascii_idx=code_to_ascii[SPECIAL_KEYS_SHIFT(keycode)];
-    }else if(KC_LNG1==keycode){
-        ascii_idx=code_to_ascii[ALT_CODE];
-    }else if( QK_LSFT==(QK_LSFT&keycode) ){
-        ascii_idx=code_to_ascii[RM_LSFT(keycode)];
-    }
-
-    return ascii_t[ascii_idx];
-}
-
-/** @brief detect retuns the rotation of the display based on the keyboard side.
- *
- *  If any argument is invalid, the function has no effect.
- *
- *  @param oled_rotation_t rotation
- *  @return rotation of the display.
- */
-oled_rotation_t oled_init_user(oled_rotation_t rotation){
-    oled_rotation_t oled_rot=OLED_ROTATION_180;
-
-    if(true==is_keyboard_master()){
-#ifdef OLED_VERTICAL
-        oled_rot=OLED_ROTATION_270;
-#else
-        oled_rot=OLED_ROTATION_0;
-#endif
-    }
-    return oled_rot;
-}
-
-/** @brief renders the keylog string and display it. This function also toggles the cursor.
- *
- *  If any argument is invalid, the function has no effect.
- *
- *  @param void.
- *  @return void.
- */
-static void render_keylogger_status(void){
-    static bool cursor_f=true;
-
-    if(timer_elapsed32(cursor_oled_timer) > 300){
-        cursor_oled_timer = timer_read32();
-        cursor_f=!cursor_f;
-    }
-    oled_write_P(PSTR("\n>:"), false);
-    if(current_cursor_pos>(KEYLOG_LEN-1)){
-        current_cursor_pos=0;
-        memset(keylog_str, ' ', sizeof(char)*KEYLOG_EOL_LEN);
-        /* Here the EOL is to clear with white spaces all the keylog area */
-        keylog_str[KEYLOG_EOL_LEN-1] = '\0';
-        oled_write(keylog_str, false);
-        /* Reset EOL to the begining of the keylog string */
-        keylog_str[0] = '\0';
-    }
-    oled_write(keylog_str, false);
-    oled_write_char(last_c, cursor_f);
-
-}
-
-/** @brief displays the current active layout.
- *
- *  If any argument is invalid, the function has no effect.
- *
- *  @param void.
- *  @return void.
- */
-void render_layout_state(void){
-    CUSTOM_LAYERS_T current_layer;
-    current_layer=(CUSTOM_LAYERS_T)get_highest_layer(layer_state);
-
-#ifdef OLED_VERTICAL
-    oled_write_P(PSTR("Lyt:\n"), false);
-#else
-    oled_write_P(PSTR("Layout: "), false);
-#endif
-
-    switch (current_layer){
-#ifdef OLED_VERTICAL
-        case _COLEMAK:
-            oled_write_P(PSTR("Clmak\n"), false);
-            break;
-
-        case _DVORAK:
-            oled_write_P(PSTR("Dvak\n"), false);
-            break;
-
-        case _QWERTY:
-            oled_write_P(PSTR("Qwty\n"), false);
-            break;
-
-        default:
-            oled_write_P(PSTR("Undf\n"), false);
-            break;
-
-#else
-        case _COLEMAK:
-            oled_write_P(PSTR("Colemak\n"), false);
-            break;
-
-        case _DVORAK:
-            oled_write_P(PSTR("Dvorak\n"), false);
-            break;
-
-        case _QWERTY:
-            oled_write_P(PSTR("Qwerty\n"), false);
-            break;
-
-        default:
-            oled_write_P(PSTR("Undefined\n"), false);
-            break;
-#endif
-    }
-}
-
-/** @brief displays the current active layer.
- *
- *  If any argument is invalid, the function has no effect.
- *
- *  @param void.
- *  @return void.
- */
-void render_layer_state(void){
-    CUSTOM_LAYERS_T current_layer;
-    current_layer=(CUSTOM_LAYERS_T)get_highest_layer(layer_state);
-
-#ifdef OLED_VERTICAL
-    oled_write_P(PSTR("Lyr:\n"), false);
-#else
-    oled_write_P(PSTR("Layer:"), false);
-#endif
-
-    switch(current_layer){
-#ifdef OLED_VERTICAL
-        case _LOWER:
-            oled_write_P(PSTR("Lwr\n"), true);
-            break;
-
-        case _RAISE:
-            oled_write_P(PSTR("Ris\n"), true);
-            break;
-
-        case _ADJUST:
-            oled_write_P(PSTR("Adj\n"), true);
-            break;
-
-        case _NUMPAD:
-            oled_write_P(PSTR("Num\n"), true);
-            break;
-
-        default:
-            oled_write_P(PSTR("Def\n"), false);
-            break;
-
-#else
-        case _LOWER:
-            oled_write_P(PSTR(" Lower "), true);
-            break;
-
-        case _RAISE:
-            oled_write_P(PSTR(" Raise "), true);
-            break;
-
-        case _ADJUST:
-            oled_write_P(PSTR(" Adjust "), true);
-            break;
-
-        case _NUMPAD:
-            oled_write_P(PSTR(" Numpad "), true);
-            break;
-
-        default:
-            oled_write_P(PSTR(" Default "), false);
-            break;
-#endif
-    }
-}
-
-/** @brief displays the current status of the main display/
- *
- *  If any argument is invalid, the function has no effect.
- *
- *  @param void.
- *  @return void.
- */
-void render_status(void){
-    render_layout_state();
-    oled_write_P(PSTR("\n"), false);
-    render_layer_state();
-    render_keylogger_status();
-}
-
-/** @brief renders the logo to be displayed.
- *
- *  If any argument is invalid, the function has no effect.
- *
- *  @param void.
- *  @return void.
- */
-static void render_logo(void){
-    static const char PROGMEM qmk_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
-        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4,
-        0x00};
-
-    oled_write_P(qmk_logo, false);
-}
-
-/** @brief executes the actions for both displays.
- *
- *  If any argument is invalid, the function has no effect.
- *
- *  @param void.
- *  @return void.
- */
-bool oled_task_user(void){
-    if (timer_elapsed32(standby_oled_timer) > 15000){
-        oled_off();
-    }else{
-        oled_on();
-        if(true==is_keyboard_master()){
-            render_status();
-        }else{
-            render_logo();
-            oled_write_P(PSTR("\n"), false);
-            oled_scroll_left();
-        }
-    }
-    return false;
-}
-
-/** @brief process the current key and add it to the keylog string.
- *
- *  If any argument is invalid, the function has no effect.
- *
- *  @param keycode pressed key.
- *  @return void.
- */
-extern void add_keylog(uint16_t keycode){
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)){
-        keycode&=0x00FF;
-    }
-
-    if(current_cursor_pos>(KEYLOG_LEN-1)||(current_cursor_pos>KEYLOG_STRING_STARTUP)){
-        current_cursor_pos=0;
-        last_c=get_ascii(keycode);
-        current_cursor_pos++;
-    }else{
-        if(keycode <= KC_TILD){
-            keylog_str[current_cursor_pos]=last_c;
-            last_c=get_ascii(keycode);
-            current_cursor_pos++;
-        }
-        keylog_str[current_cursor_pos] = '\0';
-    }
-
-    log_timer = timer_read();
-
-    standby_oled_timer = timer_read32();
-}
diff --git a/keyboards/crkbd/keymaps/mcrown/oled.h b/keyboards/crkbd/keymaps/mcrown/oled.h
deleted file mode 100644
index 7e7c746b993..00000000000
--- a/keyboards/crkbd/keymaps/mcrown/oled.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/** @file oled.h
- *  @brief oled header that includes function prototypes and external variables.
- *
- * 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/>.
- *
- * @author Mario Corona (mariocc@comunidad.unam.mx) 2021
- *
- */
-#pragma once
-
-#include <stdio.h>
-#include "mcrown.h"
-
-#ifdef OLED_VERTICAL
-#define KEYLOG_LEN (48)
-#else
-#define KEYLOG_LEN (19)
-#endif
-
-#define KEYLOG_EOL_LEN (KEYLOG_LEN+1)
-
-extern void add_keylog(uint16_t keycode);
-extern void update_log(void);
diff --git a/keyboards/crkbd/keymaps/mcrown/readme.md b/keyboards/crkbd/keymaps/mcrown/readme.md
deleted file mode 100644
index e6034b12344..00000000000
--- a/keyboards/crkbd/keymaps/mcrown/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-![the-frey-layout](https://raw.githubusercontent.com/MarioCorona/mcrown_pics/main/mcrown_layout.png)
-
-# Keyboard layout by MCrown
-
-This is all four layers:
-
-- The top indicates the RAISE layer
-- The middle indicates the DEFAULT layer
-- The bottom indicates the LOWER layer
-- Green indicated ADJUST layer
-
-All the keys respond as you'd expect to the 'shift' key - i.e. on a UK/GB keyboard, `/` becomes `?` and so on.
-
diff --git a/keyboards/crkbd/keymaps/mcrown/rules.mk b/keyboards/crkbd/keymaps/mcrown/rules.mk
deleted file mode 100644
index 8b6f82d5df3..00000000000
--- a/keyboards/crkbd/keymaps/mcrown/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
-RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix.
-OLED_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = yes    # Breathing sleep LED during USB suspend
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./oled.c\
diff --git a/keyboards/crkbd/keymaps/md40/config.h b/keyboards/crkbd/keymaps/md40/config.h
deleted file mode 100644
index c1ef28df50e..00000000000
--- a/keyboards/crkbd/keymaps/md40/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 300
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/crkbd/keymaps/md40/keymap.c b/keyboards/crkbd/keymaps/md40/keymap.c
deleted file mode 100644
index 39ae0bb4e0b..00000000000
--- a/keyboards/crkbd/keymaps/md40/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2021 Shane Dowling (@shano)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#define KC_ESCC MT(MOD_LCTL, KC_ESC)
-#define KC_ENTS MT(MOD_LSFT, KC_ENT)
-#define KC_FN   MO(_FN)
-
-enum layers {
-  _QWERTY,
-  _FN,
-};
-
-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_BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     //|----+----+----+----+----+----+              |----+----+----+----+----+----|
-     KC_ESCC, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_ESC ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       KC_LALT,KC_LGUI,KC_SPC ,         KC_ENTS,KC_FN,KC_FN
-  //                  `----+----+----'        `+---+----+----'c
-  ),
-  [_FN] = LAYOUT(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     _______,KC_1, KC_2 ,KC_3, KC_4,KC_5,               KC_6,KC_7,KC_8,KC_9,KC_0,KC_BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     _______,KC_EXCLAIM,KC_AT,KC_HASH,KC_DOLLAR,KC_PERCENT,      KC_LEFT,KC_DOWN, KC_UP ,KC_RIGHT,KC_LBRC,KC_RBRC,
-  //|----+----+----+----+----+----+              |----+----+----+----+----+----|
-     _______, KC_CIRCUMFLEX  , KC_AMPR  , KC_ASTERISK  , KC_LEFT_PAREN  , KC_RIGHT_PAREN  ,               KC_MINUS,KC_PLUS,KC_EQL,KC_PIPE,KC_GRAVE,KC_BACKSLASH,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       _______,_______,_______ ,         _______,_______,_______
-  //                  `----+----+----'        `----+----+----'
-  )
-};
-
diff --git a/keyboards/crkbd/keymaps/md40/readme.md b/keyboards/crkbd/keymaps/md40/readme.md
deleted file mode 100644
index ee1e14a0165..00000000000
--- a/keyboards/crkbd/keymaps/md40/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# MD40: Minimally Disruptive 40% Keymap
-
-This keymap is an attempt to go from a standard keyboard layout to a 40% keyboard with minimal disruption.
-
-Some aims:
-- Two layers only
-- Existing keyboard positions where possible
-- Exceptions where it's not possible
-- Exceptions where it makes sense
-
-Supports crkbd only.
-
-## Base Layer
-
-![Base Layer](https://i.imgur.com/hXLP6ush.png)
-
-## Fn Layer
-
-![Base Layer](https://i.imgur.com/Sozd1p8h.png)
diff --git a/keyboards/crkbd/keymaps/md40/rules.mk b/keyboards/crkbd/keymaps/md40/rules.mk
deleted file mode 100644
index 86f4f1e11c0..00000000000
--- a/keyboards/crkbd/keymaps/md40/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-NKRO_ENABLE = no            # Enable N-Key Rollover
diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h
deleted file mode 100644
index b4c5bc9e0a5..00000000000
--- a/keyboards/crkbd/keymaps/nimishgautam/config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2022 Nimish Gåtam (@nimishgautam)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// OS-specific stuff
-//#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS
-
-/* Select hand configuration */
-//#define MASTER_LEFT
-#define MASTER_RIGHT
-// #define EE_HANDS
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
-
-
-// combo
-#define EXTRA_SHORT_COMBOS
-
-//Tapping values
-//#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD_PER_KEY
-
-
-// Try to save some memory
-#define NO_ACTION_ONESHOT
-#undef LOCKING_SUPPORT_ENABLE
-#undef LOCKING_RESYNC_ENABLE
-#define LAYER_STATE_8BIT  //8 layers max
-
-
-// which lighting effects to include (less saves memory)
-#ifdef RGBLIGHT_ENABLE
-    #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 RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-
-#endif
-
-// rgb matrix, cooler effects than lighting above
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-    #define RGB_MATRIX_HUE_STEP 8
-    #define RGB_MATRIX_SAT_STEP 8
-    #define RGB_MATRIX_VAL_STEP 8
-    #define RGB_MATRIX_SPD_STEP 10
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-    #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 ENABLE_RGB_MATRIX_SOLID_SPLASH
-
-    // NOTE: the below effects are super cool but they go absolutely nuts if you manually set hsv colors (eg with layers)
-
-    //#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    //#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-    //#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#endif
-
-//autoshift
-/*
-#define NO_AUTO_SHIFT_NUMERIC
-#define NO_AUTO_SHIFT_SPECIAL
-#define RETRO_SHIFT 400
-#define AUTO_SHIFT_TIMEOUT 175
-#define AUTO_SHIFT_ENABLED
-#define AUTO_SHIFT_TIMEOUT_PER_KEY
-*/
-
-
-// oled font (for logo etc)
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
-
-// mouse keys go at a constant speed instead of accelerating
-#define MK_3_SPEED
-#define MK_MOMENTARY_ACCEL
diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c
deleted file mode 100644
index 389a5bfdb16..00000000000
--- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c
+++ /dev/null
@@ -1,585 +0,0 @@
-// Copyright 2022 Nimish Gåtam (@nimishgautam)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum custom_key_codes {
-    SHOW_WIN_LEFT = SAFE_RANGE, // show windows on tap, move active window left on hold
-    NUMERIC_WIN_RIGHT, // lock to numeric layer on press, move active window right on hold
-    DEL_WORD, //delete a word
-    SELECT_LEFT_WD, // select word left of cursor
-    SELECT_RIGHT_WD, // select word right of cursor
-    SELECT_LEFT_LINE, // select all from left of cursor to beginning of line
-    SELECT_RIGHT_LINE, // select all from right of cursor to end of line
-    MOVE_LEFT_WD, // move one word to the left
-    MOVE_RIGHT_WD, // move one word to the right
-    MOVE_LEFT_LINE, // move to beginning of line
-    MOVE_RIGHT_LINE, // move to end of line
-    PASTE_NOSTYLE, // paste without formatting
-    MOVE_BEGIN_LINE_TERMINAL, // move to the beginning of the line in the terminal
-    MOVE_END_LINE_TERMINAL, // move to the end of the line in the terminal
-    /* macros */
-    PASTE_VIM, // paste in vim from system register
-    ACIRCLE, // å
-    ADOT, // ä
-    ODOT, // ö
-    COMPOSE_MACRO, // compose key for mac or linux
-    SCREENSHOT, // This is theoretically reprogrammable on Linux, but Gui(Shift(4)) or Gui(4) is reserved for '4th item on favorite menu' and doesn't remap so well
-};
-
-//Tap Dance Declarations
-enum {
-  TD_MOVE_BEGIN_LINE = 0, // tap-dance, on single press move to beginning of the line, on double, output ^(vim character for beginning of line nonwhitespace char)
-  TD_MOVE_END_LINE, // tap-dance, on single press move to end of the line, on double, output $ (vim character for last nonblank char on a line)
-  TD_PERIOD_COMMA, // period on single press, comma on second press
-};
-
-// Mac-specific definitions of these functions
-// I've changed Linux to accept these defaults
-
-#define FINDER          LGUI(LALT(KC_SPACE)) //open the search bar for finding apps, docs in-computer, etc
-#define COMPOSE_KEY    KC_SCRL //manually set on linux, to create chars via .Xcompose ()
-#define COMPOSE_MAC     KC_F13 //manually set on mac using some tricks
-#define X_COMPOSE_KEY    X_SCROLL_LOCK //for use with macros
-#define SHOW_WINDOWS    LCTL(KC_UP) //'Expose' on Mac, overview on linux. Just all the windows
-#define WINDOW_LEFT LCTL(LGUI(LSFT(KC_LEFT))) //custom shortcut for this feature -- make window take up 50% left screen (using gui and ctl to make it os agnostic)
-#define WINDOW_RIGHT LCTL(LGUI(LSFT(KC_RIGHT))) //custom shortcut for this feature -- make window take up 50% right screen (using gui and ctl to make it os agnostic)/fully custom shortcut, using ctl and gui keys so will need them both irrespective of os
-#define SHOW_APP_WINDOWS LCTL(KC_DOWN)
-#define LOCK_SCREEN     LCTL(LGUI(KC_Q)) //manually set this on linux to match osx default
-#define EURO            LALT(LSFT(KC_2))
-#define EMOJI_KBD       LCTL(LGUI(KC_SPACE)) //manually set this on linux to match osx default, with 'emote' on linux and a custom shortcut (probably better to use compose feature)
-#define APP_LEFT		LGUI(KC_TAB)
-#define APP_RIGHT		RSFT(LGUI(KC_TAB))
-#define CALCULATOR      RSFT(LGUI(LCTL(KC_SLASH))) // arbitrary shortcut
-
-#define MOVE_LEFT_TERMINAL LALT(KC_LEFT) //move cursor one word left on the terminal... does not work if .inputrc is set to use vim bindings!
-#define MOVE_RIGHT_TERMINAL LALT(KC_RIGHT) //move cursor one word left on the terminal... does not work if .inputrc is set to use vim bindings!
-#define DEL_WORD_TERMINAL LALT(KC_BSPC) // delete one word back on terminal ... does not work if .inputrc is set to use vim bindings!
-
-enum custom_layers {
-    _BASE,
-    _NUMS,
-    _NUM_MASK,
-    _TEXT_NAV,
-    _ADJUST,
-    _FN_KEYS,
-};
-
-// combo - press space and backspace together to get 'scroll lock', used as the compose key on my custom linux
-const uint16_t PROGMEM compose_combo[] = {KC_BSPC, KC_SPACE, COMBO_END};
-
-// combo - press the 2 larger keys on the inner part of the corne to get the search window ('finder' as I'm calling it)
-const uint16_t PROGMEM search_combo[] = {LT(_FN_KEYS, KC_ENTER),LT(_TEXT_NAV, KC_PAST), COMBO_END};
-
-// combo - press ,. to paste in vim
-const uint16_t PROGMEM vim_paste_combo[] = {KC_COMM, KC_DOT, COMBO_END};
-
-// combo - press () to launch calculator
-const uint16_t PROGMEM calculator_combo[] = {LT(_NUMS,KC_LPRN),  LT(_NUMS,KC_RPRN), COMBO_END};
-
-// combo - press combo+ a to get å
-const uint16_t PROGMEM acircle_combo[] = { KC_BSPC, KC_SPACE, MT(MOD_LCTL, KC_A),COMBO_END};
-
-// combo - press combo+ l to get ä
-const uint16_t PROGMEM adot_combo[] = {KC_BSPC, KC_SPACE, MT(MOD_RALT,KC_L), COMBO_END};
-
-// combo - press combo+ ; to get ö
-const uint16_t PROGMEM odot_combo[] = {KC_BSPC, KC_SPACE, MT(MOD_LCTL,KC_SCLN),COMBO_END};
-
-combo_t key_combos[] = {
-    COMBO(compose_combo, COMPOSE_MACRO),
-    COMBO(search_combo, FINDER),
-    COMBO(calculator_combo, CALCULATOR),
-    /* macros */
-    COMBO(vim_paste_combo, PASTE_VIM),
-    COMBO(acircle_combo, ACIRCLE),
-    COMBO(adot_combo, ADOT),
-    COMBO(odot_combo, ODOT)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_split_3x6_3(  //basic
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                    KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,     KC_MINUS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_ESCAPE, MT(MOD_LCTL, KC_A),    MT(MOD_LALT,KC_S),    MT(MOD_RSFT,KC_D),    MT(MOD_LGUI, KC_F),    KC_G,                    KC_H,    MT(MOD_RGUI,KC_J),    MT(MOD_RSFT,KC_K),    MT(MOD_RALT,KC_L), MT(MOD_LCTL,KC_SCLN), KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      LT(0, SHOW_WIN_LEFT), KC_Z, KC_X,  KC_C, KC_V,  KC_B,   KC_N,                  KC_M,  KC_COMM, KC_DOT,  KC_SLASH,  LT(0, NUMERIC_WIN_RIGHT),
-  //|--------+--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------+--------|
-                                         LT(_NUMS,KC_LPRN),   KC_BSPC,  LT(_FN_KEYS, KC_ENTER),     LT(_TEXT_NAV, KC_PAST),   KC_SPACE, LT(_NUMS,KC_RPRN)
-                                      //`--------------------------'                    `--------------------------'
-
-  ),
-
-  [_NUMS] = LAYOUT_split_3x6_3( //numbers
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     SCREENSHOT,   KC_EXCLAIM,KC_AT, KC_HASH, KC_DOLLAR,KC_PERCENT,            KC_CIRCUMFLEX,    KC_7,    KC_8,    KC_9,    KC_TRANSPARENT, KC_PIPE,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI,KC_PLUS,                    KC_EQL, KC_4,  KC_5,  KC_6,  KC_BSLS, KC_TRANSPARENT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCBR, KC_LBRC, KC_GRAVE, KC_TILD, PASTE_NOSTYLE, KC_AMPERSAND,      TD(TD_PERIOD_COMMA), KC_1,  KC_2,  KC_3, KC_RBRC, KC_RCBR,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+-C```-------+--------+--------|
-                                          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT , KC_TRANSPARENT  ,  KC_UNDS, KC_0
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-     [_NUM_MASK] = LAYOUT_split_3x6_3( //NUM MASK, so I can still have backspace/enter/tab etc but with the nums, arrows and formatters too
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     KC_TRANSPARENT, KC_TRANSPARENT,KC_TRANSPARENT, KC_UP, KC_TRANSPARENT,KC_TRANSPARENT,      KC_TRANSPARENT, KC_7,    KC_8,    KC_9, KC_TRANSPARENT, KC_TRANSPARENT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TO(_BASE), KC_TRANSPARENT, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRANSPARENT,         KC_TRANSPARENT, KC_4,  KC_5,  KC_6, KC_TRANSPARENT, KC_TRANSPARENT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     KC_TRANSPARENT, KC_TRANSPARENT,KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,      TD(TD_PERIOD_COMMA), KC_1,  KC_2,  KC_3,KC_TRANSPARENT, KC_NUM,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT , KC_TRANSPARENT  ,  KC_TRANSPARENT, KC_0
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_TEXT_NAV] = LAYOUT_split_3x6_3( //text nav and special navigation (lock screen, adjust layer, etc)
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      LOCK_SCREEN, KC_PSCR, SELECT_LEFT_LINE, KC_UP, SELECT_RIGHT_LINE, TD(TD_MOVE_BEGIN_LINE),                    TD(TD_MOVE_END_LINE), KC_MS_WH_UP, EMOJI_KBD, KC_TRANSPARENT, KC_TRANSPARENT, QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TO(_BASE), SELECT_LEFT_WD, KC_LEFT, KC_DOWN, KC_RIGHT,SELECT_RIGHT_WD,              KC_MS_WH_LEFT, KC_RGUI, KC_RSFT, KC_RALT,KC_RCTL, KC_CAPS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_INSERT, KC_TRANSPARENT, MOVE_LEFT_WD,KC_PAGE_DOWN,MOVE_RIGHT_WD, KC_PAGE_UP,                    KC_MS_WH_RIGHT, KC_MS_WH_DOWN, KC_HOME, KC_END,KC_TRANSPARENT, TO(_ADJUST),
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_DELETE,  DEL_WORD, KC_TRANSPARENT , KC_TRANSPARENT  ,  KC_TRANSPARENT, KC_TRANSPARENT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-    [_ADJUST] = LAYOUT_split_3x6_3( // adjust things
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TO(_BASE), RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX,                       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          CG_TOGG, XXXXXXX, XXXXXXX ,     XXXXXXX, XXXXXXX, XXXXXXX
-                                      //`--------------------------'  `--------------------------'
-  ), // CG_TOGG toggles gui and Ctrl (switching from mac to windows/linux)
-    // the RGB buttons go backwards if shift is held when they're pressed, so shift is included
-    // RGB MOD changes the mode, it's the most important one
-    // right side mostly no-op so I can play with the visualization
-
-   [_FN_KEYS] = LAYOUT_split_3x6_3( //fn keys, terminal text navigation keys
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     KC_TRANSPARENT, KC_LCBR,KC_LBRC, KC_RBRC, KC_RCBR, MOVE_BEGIN_LINE_TERMINAL,                           MOVE_END_LINE_TERMINAL, KC_F7,    KC_F8,    KC_F9,    KC_F11, KC_TRANSPARENT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI, KC_TRANSPARENT,                                               KC_TRANSPARENT, KC_F4,  KC_F5,  KC_F6,  KC_F12, KC_TRANSPARENT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_TRANSPARENT, KC_TRANSPARENT, MOVE_LEFT_TERMINAL, DEL_WORD_TERMINAL, MOVE_RIGHT_TERMINAL, KC_TRANSPARENT,                           KC_TRANSPARENT, KC_F1,  KC_F2,  KC_F3, KC_TRANSPARENT, KC_TRANSPARENT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT , KC_HASH  ,  KC_TRANSPARENT, KC_F10
-                                      //`--------------------------'  `--------------------------'
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-
-  switch (keycode) {
-
-    // as of this writing, you can't do a layer tap (LT)
-    // and also send a shifted code, like left parens
-    // If you call such a function, it'll do the layer shift but
-    // it'll ignore the key code on tap... this is the workaround
-
-    case LT(_NUMS,KC_LPRN): // Shift to _NUMS layer on hold, but send left paren on press
-        if (record->tap.count && record->event.pressed) {
-            tap_code16(KC_LPRN);
-            return false;
-        }
-    break;
-    case LT(_NUMS,KC_RPRN): // Shift to _NUMS on hold, send right parens on press
-        if (record->tap.count && record->event.pressed) {
-            tap_code16(KC_RPRN);
-            return false;
-        }
-    break;
-
-    case LT(0,SHOW_WIN_LEFT):
-            if (record->tap.count && record->event.pressed) {
-                tap_code16(SHOW_WINDOWS); // Intercept tap function
-            } else if (record->event.pressed) {
-                tap_code16(WINDOW_LEFT); // Intercept hold function
-            }
-        return false;
-        break;
-
-    case LT(0, NUMERIC_WIN_RIGHT):
-            if (record->tap.count && record->event.pressed) {
-                layer_on(_NUM_MASK);// Intercept tap function
-            } else if (record->event.pressed) {
-                tap_code16(WINDOW_RIGHT); // Intercept hold function
-            }
-        return false;
-        break;
-
-    case PASTE_VIM:
-        if (record->event.pressed){
-            SEND_STRING(SS_TAP(X_ESCAPE)"\"+pi");
-        }
-        return false;
-        break;
-
-    //only read the keymap config if it's one of the below cases (instead of every time)
-    case DEL_WORD:
-    case SELECT_LEFT_WD:
-    case SELECT_RIGHT_WD:
-    case SELECT_LEFT_LINE:
-    case SELECT_RIGHT_LINE:
-    case MOVE_LEFT_WD:
-    case MOVE_RIGHT_WD:
-    case MOVE_LEFT_LINE:
-    case MOVE_RIGHT_LINE:
-    case PASTE_NOSTYLE:
-    case MOVE_BEGIN_LINE_TERMINAL:
-    case MOVE_END_LINE_TERMINAL:
-    case ACIRCLE:
-    case ADOT:
-    case ODOT:
-    case COMPOSE_MACRO:
-    case SCREENSHOT:
-
-        if(record->event.pressed) {
-            keymap_config.raw = eeconfig_read_keymap();
-            switch (keycode){
-                case DEL_WORD:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(LCTL(KC_BSPC));
-                    } else { //osx
-                        tap_code16(LALT(KC_BSPC));
-                    }
-                break;
-                case SELECT_LEFT_WD:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(RSFT(LCTL(KC_LEFT)));
-                    } else { //osx
-                        tap_code16(RSFT(LALT(KC_LEFT)));
-                    }
-                break;
-                case SELECT_RIGHT_WD:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(RSFT(LCTL(KC_RIGHT)));
-                    } else { //osx
-                        tap_code16(RSFT(LALT(KC_RIGHT)));
-                    }
-                break;
-                case SELECT_LEFT_LINE:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(RSFT(KC_HOME));
-                    } else { //osx
-                        tap_code16(RSFT(LCTL(KC_LEFT)));
-                    }
-                break;
-                case SELECT_RIGHT_LINE:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(RSFT(KC_END));
-                    } else { //osx
-                        tap_code16(RSFT(LCTL(KC_RIGHT)));
-                    }
-                break;
-                case MOVE_LEFT_WD:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(LCTL(KC_LEFT));
-                    } else { //osx
-                        tap_code16(LALT(KC_LEFT));
-                    }
-                break;
-                case MOVE_RIGHT_WD:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(LCTL(KC_RIGHT));
-                    } else { //osx
-                        tap_code16(LALT(KC_RIGHT));
-                    }
-                break;
-                case MOVE_LEFT_LINE:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(KC_HOME);
-                    } else { //osx
-                        tap_code16(LGUI(KC_LEFT)); //GUI for move, shift-ctl for highlight... thanks mac!
-                    }
-                break;
-                case MOVE_RIGHT_LINE:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(KC_END);
-                    } else { //osx
-                        tap_code16(LGUI(KC_RIGHT)); //GUI for move, shift-ctl for highlight... thanks mac!
-                    }
-                break;
-                case PASTE_NOSTYLE:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(LCTL(RSFT(KC_V)));
-                    } else { //osx
-                        tap_code16(LGUI(LALT(LSFT(KC_V))));
-                    }
-                break;
-                case MOVE_BEGIN_LINE_TERMINAL:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(KC_HOME);
-                    } else { //osx
-                        tap_code16(LSFT(KC_HOME));
-                    }
-                break;
-                case MOVE_END_LINE_TERMINAL:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(KC_END);
-                    } else { //osx
-                        tap_code16(LSFT(KC_END));
-                    }
-                break;
-                case ACIRCLE: // å
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        SEND_STRING(SS_TAP(X_COMPOSE_KEY)"aa");
-                    } else { //osx
-                        tap_code16(LALT(KC_A));
-                    }
-                break;
-                case ADOT: // ä
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        SEND_STRING(SS_TAP(X_COMPOSE_KEY)"a\"");
-                    } else { //osx
-                        SEND_STRING(SS_LALT("u")"a");
-                    }
-                break;
-                case ODOT: // ö
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        SEND_STRING(SS_TAP(X_COMPOSE_KEY)"o\"");
-                    } else { //osx
-                        SEND_STRING(SS_LALT("u")"o");
-                    }
-                break;
-                case COMPOSE_MACRO:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(COMPOSE_KEY);
-                    } else { //osx
-                        tap_code16(COMPOSE_MAC);
-                    }
-                break;
-                case SCREENSHOT:
-                    if(keymap_config.swap_lctl_lgui){ //Linux
-                        tap_code16(KC_PSCR);
-                    } else { //osx
-                        tap_code16(LGUI(LSFT(KC_4)));
-                    }
-                break;
-            }
-        }
-
-    return false;
-    break;
-
-  }
-  return true;
-}
-
-void dance_left_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) { //1 tap, move to line left
-    keymap_config.raw = eeconfig_read_keymap();
-    if(keymap_config.swap_lctl_lgui){ //Linux
-        tap_code16(KC_HOME);
-    } else { //osx
-    tap_code16(LGUI(KC_LEFT));
-    }
-  } else { //2 taps, make a circumflex
-    tap_code16(KC_CIRC);
-  }
-}
-
-void dance_right_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) { // 1 tap, move line right
-       keymap_config.raw = eeconfig_read_keymap();
-    if(keymap_config.swap_lctl_lgui){ //Linux
-        tap_code16(KC_END);
-    } else { //osx
-    tap_code16(LGUI(KC_RIGHT));
-    }
-  } else { //2 taps, dollar
-    tap_code16(KC_DOLLAR);
-  }
-}
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_MOVE_BEGIN_LINE]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_left_finished, NULL),
-  [TD_MOVE_END_LINE]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_right_finished, NULL),
-  [TD_PERIOD_COMMA] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_COMMA),
-};
-
-bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case MT(MOD_RSFT,KC_D): // for modtap shift, otherwise lots of mis-firings
-        case MT(MOD_RSFT,KC_K):
-            // Immediately select the hold action when another key is tapped.
-            return true;
-        default:
-            // Do not select the hold action when another key is tapped.
-            return false;
-    }
-}
-
-// yeah, should be layer_state_set_user but that one doesn't update the mods
-void set_lighting_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-    switch(layer){
-        case _BASE:
-            rgblight_sethsv_noeeprom(HSV_WHITE);
-            led_t led_state = host_keyboard_led_state();
-            if(led_state.caps_lock){
-                rgblight_sethsv_noeeprom(HSV_RED);
-            }
-            //rgblight_sethsv(HSV_OFF);
-        break;
-        case _NUMS:
-            rgblight_sethsv_noeeprom(HSV_GREEN);
-        break;
-        case _NUM_MASK:
-            rgblight_sethsv_noeeprom(HSV_PINK);
-        break;
-        case _TEXT_NAV:
-            rgblight_sethsv_noeeprom(HSV_BLUE);
-        break;
-        case _ADJUST:
-            rgblight_sethsv_noeeprom(HSV_ORANGE);
-        break;
-        case _FN_KEYS:
-            rgblight_sethsv_noeeprom(HSV_PURPLE);
-        break;
-        default:
-        break;
-    }
-    // override color with mods
-
-    if(get_mods() & MOD_MASK_SHIFT){
-        rgblight_sethsv_noeeprom(HSV_RED);
-    }
-    if(get_mods() & MOD_MASK_CTRL){
-        rgblight_sethsv_noeeprom(HSV_MAGENTA);
-    }
-    if(get_mods() & MOD_MASK_ALT){
-        rgblight_sethsv_noeeprom(HSV_YELLOW);
-    }
-    if(get_mods() & MOD_MASK_GUI){
-        rgblight_sethsv_noeeprom(HSV_TEAL);
-    }
-    // return state;
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  return OLED_ROTATION_270;
-}
-
-void oled_render_general_state(void){
-    set_lighting_user();
-
-    keymap_config.raw = eeconfig_read_keymap();
-    if(keymap_config.swap_lctl_lgui){
-        oled_write_ln_P(PSTR("Linux"), false);
-    }
-    else {
-        oled_write_ln_P(PSTR("OSX"), false);
-    }
-
-    //oled_write_ln(get_u8_str(get_current_wpm(), '0'), false);
-    /*
-    led_t led_state = host_keyboard_led_state();
-    if(led_state.caps_lock){
-        rgblight_sethsv(HSV_RED);
-    }*/
-    //Layer color has to be handled by master
-
-
-    // led state doesn't have to be handled by master, but
-    // the keyboard will freeze if you type too fast
-    // and have this handled on the slave side
-
-    led_t led_state = host_keyboard_led_state();
-    if(led_state.caps_lock){
-        oled_write_ln_P(PSTR("CAPS"), false);
-    } else {
-        oled_write_ln_P(PSTR(" "), false);
-    }
-    if(led_state.num_lock){
-        oled_write_ln_P(PSTR("NumLk"), false);
-    } else {
-        oled_write_ln_P(PSTR(" "), false);
-    }
-    if(led_state.scroll_lock){
-        oled_write_ln_P(PSTR("Scrol"), false);
-    } else {
-        oled_write_ln_P(PSTR(" "), false);
-    }
-    if(led_state.compose){
-        oled_write_ln_P(PSTR("comp"), false);
-    } else {
-        oled_write_ln_P(PSTR(" "), false);
-    }
-}
-
-void oled_render_layer_mod_state(void) {
-    //Layer
-    uint8_t layer = get_highest_layer(layer_state);
-    switch (layer) {
-        case _BASE:
-            oled_write_ln_P(PSTR("Base"), false);
-            //rgblight_sethsv(HSV_OFF);
-            break;
-        case _NUMS:
-            oled_write_ln_P(PSTR("Symb"), false);
-            break;
-        case _NUM_MASK:
-            oled_write_ln_P(PSTR("NumX"), false);
-            break;
-        case _TEXT_NAV:
-            oled_write_ln_P(PSTR("Text"), false);
-            break;
-        case _ADJUST:
-            oled_write_ln_P(PSTR("Adj"), false);
-            break;
-        case _FN_KEYS:
-            oled_write_ln_P(PSTR("Fn"), false);
-            break;
-        default:
-            break;
-    }
-    oled_write_ln_P(PSTR(" "), false);
-    // mods
-    if(get_mods() & MOD_MASK_SHIFT){
-        oled_write_ln_P(PSTR("SHIFT"), false);
-    }
-    if(get_mods() & MOD_MASK_CTRL){
-        oled_write_ln_P(PSTR("ctrl"), false);
-    }
-    if(get_mods() & MOD_MASK_ALT){
-        oled_write_ln_P(PSTR("alt"), false);
-    }
-    if(get_mods() & MOD_MASK_GUI){
-        oled_write_ln_P(PSTR("GUI"), false);
-    }
-    if(!get_mods()){
-        oled_write_ln_P(PSTR(" "), false);
-        oled_write_ln_P(PSTR(" "), false);
-        oled_write_ln_P(PSTR(" "), false);
-        oled_write_ln_P(PSTR(" "), false);
-    }
-}
-
-
-/* https://joric.github.io/qle/  - font */
-
-
-// render general state on master, a little bit of info on slave side
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_general_state();
-    }
-    else {
-        oled_render_layer_mod_state();
-    }
-    return false;
-}
-
-#endif
diff --git a/keyboards/crkbd/keymaps/nimishgautam/readme.md b/keyboards/crkbd/keymaps/nimishgautam/readme.md
deleted file mode 100644
index 98906afa100..00000000000
--- a/keyboards/crkbd/keymaps/nimishgautam/readme.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Full-featured Corne layout for Linux and MacOS
-
-This is a generic layout for Corne, especially for someone who:
-
-* has to type in English
-* occasionally has to type in Swedish
-* Switches regularly between Linux and MacOS
-* Prioritizes text navigation
-  * This includes selecting whole lines and deleting words
-* uses VIM or VIM bindings for text navigation
-* uses the 'compose' feature in Linux and uses the 'mac user dictionary' trick for getting compose features
-* Home row modifiers for optimal ergo (hopefully optimal)
-
-This also features:
-* OLED displays:
- * indicating OS and LED status (scroll lock, numlock, caps, compose) on the master side
- * layer and modifiers on the slave side
-* LED lights:
- * color changes to indicate layer and modifier status
- * LED matrix effects around keypresses
- 
-## Major notes
-
-### OS 'detection'
-* I assume MacOS as the default. Using the ctrl/gui swap magic keycode switches everything to Linux
- * Most of the Linux codes should work in Windows
- * Yes, there are lots of if-statements around which key code to send here... this isn't the most sustainable way to do it, but is the most memory-efficient way I could come up with
- 
-### RGB matrix effects
-* Not all RGB matrix effects are compatible with changing the color on layer/mod change. Some of them get caught in a loop and freeze half of the keyboard, so beware of which ones you activate
-* Some RGB settings are stored in eeprom (despite me using the `noeeprom()` version of functions) If something is weird, try clearing eeprom
-* The color-changing function probably _should_ be in the `layer_state_set_user` function, except that function doesn't give the state of the modifiers. So instead I have it done in a call that updates the OLEDs
-
-### LED state explicitly not shared
-* For some reason, sharing the LED state (as a split keyboard function) will cause the slave side of the keyboard to freeze up if you type too fast. Don't do it!
-
-### Windowing shortcuts
-* Again, MacOS is assumed to be the default so I changed as many Linux shortcuts as I could to make them compatible with MacOS. Some of them don't have default shortcuts defined (such as 'move window left' or 'launch calculator') so I just made those as needed
-
-### Right-shift preferred
-* At the time of this writing, left-shift wasn't always being registered as a modifier key when checking modmasks, so I stuck with everything using right-shift as it had the expected effects
-
-### Compose key
-* I used [macos compose](https://github.com/Granitosaurus/macos-compose) 
-  
-
-   
diff --git a/keyboards/crkbd/keymaps/nimishgautam/rules.mk b/keyboards/crkbd/keymaps/nimishgautam/rules.mk
deleted file mode 100644
index dcb0007591b..00000000000
--- a/keyboards/crkbd/keymaps/nimishgautam/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-RGB_MATRIX_ENABLE = yes
-OLED_ENABLE     = yes
-COMBO_ENABLE = yes
-TAP_DANCE_ENABLE = yes  # enable tap dance features
-EXTRAKEY_ENABLE = no
-GRAVE_ESC_ENABLE = no
-SPACE_CADET_ENABLE = no
-#WPM_ENABLE = yes
-#CAPS_WORD_ENABLE = yes # if you hold down both shifts, you get lshift enabled for 1 word, but only works with KC shift, not MOD shift :(
-#AUTO_SHIFT_ENABLE = yes
-#UNICODE_ENABLE = yes     # enable unicode
diff --git a/keyboards/crkbd/keymaps/oled_sample/config.h b/keyboards/crkbd/keymaps/oled_sample/config.h
deleted file mode 100644
index 14718b26d16..00000000000
--- a/keyboards/crkbd/keymaps/oled_sample/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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 USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/oled_sample/keymap.c b/keyboards/crkbd/keymaps/oled_sample/keymap.c
deleted file mode 100644
index 84a4f9204f0..00000000000
--- a/keyboards/crkbd/keymaps/oled_sample/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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 crkbd_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-#define CTLTB CTL_T(KC_TAB)
-#define GUIEI GUI_T(KC_LNG2)
-#define ALTKN ALT_T(KC_LNG1)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x6_3(
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    CTLTB,   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,
-                                        GUIEI,    LOWER,   KC_SPC,  KC_ENT,  RAISE,   ALTKN
-  ),
-
-  [_LOWER] = LAYOUT_split_3x6_3(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    CTLTB,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX,
-    KC_LSFT, KC_F11,  KC_F12,  KC_F13,  KC_F14,   KC_F15,                    KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  XXXXXXX,
-                                        GUIEI,    LOWER,   KC_SPC,  KC_ENT,  RAISE,   ALTKN
-  ),
-
-  [_RAISE] = LAYOUT_split_3x6_3(
-    KC_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-    CTLTB,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
-    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
-                                        GUIEI,   LOWER,   KC_SPC,  KC_ENT,  RAISE,   ALTKN
-
-  ),
-
-  [_ADJUST] = LAYOUT_split_3x6_3(
-    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                        GUIEI,   LOWER,   KC_SPC,  KC_ENT,  RAISE,   ALTKN
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-    return state;
-}
-
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    } else {
-        return rotation;
-    }
-}
-
-void render_crkbd_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-#    define KEYLOG_LEN 5
-char     keylog_str[KEYLOG_LEN] = {};
-uint8_t  keylogs_str_idx        = 0;
-uint16_t log_timer              = 0;
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void add_keylog(uint16_t keycode) {
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-        keycode = keycode & 0xFF;
-    }
-
-    for (uint8_t i = KEYLOG_LEN - 1; i > 0; i--) {
-        keylog_str[i] = keylog_str[i - 1];
-    }
-    if (keycode < 60) {
-        keylog_str[0] = code_to_name[keycode];
-    }
-    keylog_str[KEYLOG_LEN - 1] = 0;
-
-    log_timer = timer_read();
-}
-
-void update_log(void) {
-    if (timer_elapsed(log_timer) > 750) {
-        add_keylog(0);
-    }
-}
-
-void render_keylogger_status(void) {
-    oled_write_P(PSTR("KLogr"), false);
-    oled_write(keylog_str, false);
-}
-
-void render_default_layer_state(void) {
-    oled_write_P(PSTR("Lyout"), false);
-    switch (get_highest_layer(default_layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR(" QRTY"), false);
-            break;
-    }
-}
-
-void render_layer_state(void) {
-    oled_write_P(PSTR("LAYER"), false);
-    oled_write_P(PSTR("Lower"), layer_state_is(_LOWER));
-    oled_write_P(PSTR("Raise"), layer_state_is(_RAISE));
-}
-
-void render_keylock_status(led_t led_state) {
-    oled_write_P(PSTR("Lock:"), false);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(PSTR("N"), led_state.num_lock);
-    oled_write_P(PSTR("C"), led_state.caps_lock);
-    oled_write_ln_P(PSTR("S"), led_state.scroll_lock);
-}
-
-void render_mod_status(uint8_t modifiers) {
-    oled_write_P(PSTR("Mods:"), false);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
-    oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL));
-    oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT));
-    oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI));
-}
-
-void render_bootmagic_status(void) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    oled_write_P(PSTR("BTMGK"), false);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(logo[0][0], !keymap_config.swap_lctl_lgui);
-    oled_write_P(logo[1][0], keymap_config.swap_lctl_lgui);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(logo[0][1], !keymap_config.swap_lctl_lgui);
-    oled_write_P(logo[1][1], keymap_config.swap_lctl_lgui);
-    oled_write_P(PSTR(" NKRO"), keymap_config.nkro);
-}
-
-void render_status_main(void) {
-    /* Show Keyboard Layout  */
-    render_default_layer_state();
-    render_keylock_status(host_keyboard_led_state());
-    render_mod_status(get_mods());
-    render_bootmagic_status();
-
-    render_keylogger_status();
-}
-
-bool oled_task_user(void) {
-    update_log();
-    if (is_keyboard_master()) {
-        render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_crkbd_logo();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        add_keylog(keycode);
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/crkbd/keymaps/oled_sample/rules.mk b/keyboards/crkbd/keymaps/oled_sample/rules.mk
deleted file mode 100644
index 676795847a3..00000000000
--- a/keyboards/crkbd/keymaps/oled_sample/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-OLED_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/oo/config.h b/keyboards/crkbd/keymaps/oo/config.h
deleted file mode 100644
index 814d227d7d0..00000000000
--- a/keyboards/crkbd/keymaps/oo/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-#define SPLIT_USB_DETECT
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/oo/keymap.c b/keyboards/crkbd/keymaps/oo/keymap.c
deleted file mode 100644
index bcc296c8b60..00000000000
--- a/keyboards/crkbd/keymaps/oo/keymap.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-    Copyright 2019 @foostan
-    Copyright 2020 Drashna Jaelre <@drashna>
-    Copyright 2021 Oliver Ocean <@oliverocean>
-
-    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_split_3x6_3(
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-      KC_LALT,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_RALT,
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-       KC_ESC,    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_LCTL,   MO(1),  KC_ENT,            MO(2),  KC_SPC, KC_RGUI
-  //                           |--------+--------+--------|        |--------+--------+--------|
-    ),
-
-    [1] = LAYOUT_split_3x6_3(
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-      KC_TRNS, KC_BSLS, KC_UNDS,  KC_TAB, KC_PEQL, KC_TILD,           KC_GRV, KC_PEQL,  KC_TAB, KC_UNDS, KC_BSLS, KC_TRNS,
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-      KC_TRNS,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_TRNS,
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-      KC_TRNS,   KC_NO,   KC_NO,   KC_NO, KC_LEFT, KC_DOWN,            KC_UP, KC_RGHT,   KC_NO,   KC_NO,   KC_NO, KC_TRNS,
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-                                 KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_BSPC, KC_TRNS
-  //                           |--------+--------+--------|        |--------+--------+--------|
-    ),
-
-    [2] = LAYOUT_split_3x6_3(
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-      KC_TRNS, KC_PIPE,   KC_LT, KC_LPRN, KC_LCBR, KC_LBRC,          KC_RBRC, KC_RCBR, KC_RPRN,   KC_GT, KC_PIPE, KC_TRNS,
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-      KC_TRNS, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,          KC_CIRC, KC_AMPR, KC_ASTR, KC_PMNS, KC_PPLS, KC_TRNS,
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-      KC_TRNS, KC_CAPS,   KC_NO,   KC_NO, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,   KC_NO,   KC_NO, KC_CAPS, KC_TRNS,
-  //|--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------|
-                                 KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_SPC, KC_TRNS
-  //                           |--------+--------+--------|        |--------+--------+--------|
-    )
-
-};
-
-
-#ifdef OLED_ENABLE
-#include <stdio.h>
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-#define L_BASE 0
-#define L_LOWER 2
-#define L_RAISE 4
-#define L_ADJUST 8
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("Default"), false);
-            break;
-        case L_LOWER:
-            oled_write_ln_P(PSTR("Lower"), false);
-            break;
-        case L_RAISE:
-            oled_write_ln_P(PSTR("Raise"), false);
-            break;
-        case L_ADJUST:
-        case L_ADJUST|L_LOWER:
-        case L_ADJUST|L_RAISE:
-        case L_ADJUST|L_LOWER|L_RAISE:
-            oled_write_ln_P(PSTR("Adjust"), false);
-            break;
-    }
-}
-
-
-char keylog_str[24] = {};
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-  if (keycode < 60) {
-    name = code_to_name[keycode];
-  }
-
-  // update keylog
-  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-
-void oled_render_keylog(void) {
-    oled_write(keylog_str, false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_render_keylog();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    set_keylog(keycode, record);
-  }
-  return true;
-}
-#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/oo/readme.md b/keyboards/crkbd/keymaps/oo/readme.md
deleted file mode 100644
index e7ef6865995..00000000000
--- a/keyboards/crkbd/keymaps/oo/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build instructions
-
-```zsh
-# if this is a fresh install of QMK, don't forget to run setup
-# or you might be missing necessary tools and libraries!
-# https://docs.qmk.fm/#/newbs_getting_started
-$ qmk setup
-
-# using json via the configurator can be easier than starting from scratch
-# but you will need to go back and make the formatting readable for future edits
-$ qmk json2c -o keymap.c keymap.json
-
-# compile; use appropriate tool for your microcontroller
-$ qmk compile -kb crkbd/rev1/common -km oo
-
-# flash; each side has to be done separately
-$ qmk flash -kb crkbd/rev1/common -km oo
-
-```
diff --git a/keyboards/crkbd/keymaps/oo/rules.mk b/keyboards/crkbd/keymaps/oo/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/crkbd/keymaps/oo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/rarick/config.h b/keyboards/crkbd/keymaps/rarick/config.h
deleted file mode 100644
index 4a033596a89..00000000000
--- a/keyboards/crkbd/keymaps/rarick/config.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-#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 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-// Sets path to OLED font
-#define OLED_FONT_H "keyboards/crkbd/keymaps/rarick/glcdfont.c"
-
-// Limits maximum brightness of LEDs to 150 out of 255
-// Higher may cause the controller to crash.
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
diff --git a/keyboards/crkbd/keymaps/rarick/glcdfont.c b/keyboards/crkbd/keymaps/rarick/glcdfont.c
deleted file mode 100644
index ae81ba57376..00000000000
--- a/keyboards/crkbd/keymaps/rarick/glcdfont.c
+++ /dev/null
@@ -1,233 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-// Cowboy Bebop
-const unsigned char font[] PROGMEM = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 
-  0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 
-  0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 
-  0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 
-  0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 
-  0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 
-  0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 
-  0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 
-  0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 
-  0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 
-  0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 
-  0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 
-  0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 
-  0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 
-  0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 
-  0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 
-  0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 
-  0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 
-  0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 
-  0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 
-  0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 
-  0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-  0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 
-  0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, 
-  0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 
-  0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 
-  0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 
-  0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 
-  0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 
-  0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 
-  0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 
-  0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 
-  0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 
-  0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 
-  0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 
-  0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 
-  0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 
-  0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 
-  0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 
-  0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 
-  0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 
-  0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 
-  0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-  0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 
-  0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 
-  0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, 
-  0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 
-  0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 
-  0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 
-  0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 
-  0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 
-  0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 
-  0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 
-  0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 
-  0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 
-  0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 
-  0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 
-  0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 
-  0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 
-  0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 
-  0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 
-  0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 
-  0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 
-  0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 
-  0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-  0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 
-  0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 
-  0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 
-  0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 
-  0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 
-  0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, 
-  0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 
-  0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 
-  0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 
-  0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 
-  0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-  0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 
-  0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 
-  0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 
-  0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 
-  0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 
-  0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 
-  0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 
-  0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 
-  0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 
-  0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 
-  0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 
-  0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 
-  0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 
-  0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 
-  0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 
-  0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 
-  0x00, 0x03, 0x07, 0x08, 0x00, 0x00, 
-  0x20, 0x54, 0x54, 0x78, 0x40, 0x00, 
-  0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, 
-  0x38, 0x44, 0x44, 0x44, 0x28, 0x00, 
-  0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, 
-  0x38, 0x54, 0x54, 0x54, 0x18, 0x00, 
-  0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, 
-  0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, 
-  0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, 
-  0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, 
-  0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, 
-  0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, 
-  0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, 
-  0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, 
-  0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, 
-  0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 
-  0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, 
-  0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, 
-  0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, 
-  0x48, 0x54, 0x54, 0x54, 0x24, 0x00, 
-  0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, 
-  0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, 
-  0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, 
-  0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, 
-  0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 
-  0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, 
-  0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 
-  0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 
-  0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 
-  0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 
-  0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 
-  0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 
-  0x06, 0x06, 0x06, 0x7F, 0xFF, 0xFF, 
-  0xFF, 0x07, 0x01, 0x01, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, 
-  0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 
-  0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 
-  0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 
-  0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 
-  0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 
-  0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 
-  0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 
-  0x08, 0x08, 0x08, 0x08, 0x1C, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0xFF, 0xFF, 
-  0xFF, 0x36, 0x3E, 0x7F, 0x3E, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x7F, 0xFF, 0x1C, 
-  0x08, 0x00, 0x00, 0x08, 0x08, 0x08, 
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
-  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x00, 
-  0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 
-  0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 
-  0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 
-  0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 
-  0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 
-  0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 
-  0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 
-  0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 
-  0x30, 0x30, 0x30, 0x7F, 0x7F, 0x7F, 
-  0x7F, 0x70, 0x40, 0x40, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x40, 0x48, 
-  0x54, 0x24, 0x00, 0x78, 0x54, 0x54, 
-  0x04, 0x78, 0x54, 0x54, 0x04, 0x00, 
-  0x00, 0x0C, 0x70, 0x08, 0x04, 0x78, 
-  0x44, 0x44, 0x3C, 0x00, 0x78, 0x40, 
-  0x40, 0x3C, 0x00, 0x00, 0x40, 0x48, 
-  0x54, 0x24, 0x00, 0x78, 0x14, 0x14, 
-  0x48, 0x30, 0x28, 0x7C, 0x00, 0x78, 
-  0x44, 0x44, 0x04, 0x78, 0x54, 0x54, 
-  0x04, 0x00, 0x00, 0x78, 0x44, 0x44, 
-  0x04, 0x78, 0x44, 0x44, 0x3C, 0x00, 
-  0x7C, 0x20, 0x18, 0x78, 0x30, 0x0C, 
-  0x78, 0x54, 0x54, 0x28, 0x78, 0x44, 
-  0x44, 0x3C, 0x00, 0x0C, 0x70, 0x08, 
-  0x44, 0x00, 0x40, 0x00, 0x40, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
diff --git a/keyboards/crkbd/keymaps/rarick/keymap.c b/keyboards/crkbd/keymaps/rarick/keymap.c
deleted file mode 100644
index 00bf3d900e5..00000000000
--- a/keyboards/crkbd/keymaps/rarick/keymap.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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 <stdio.h>
-
-#define KC_SFTTB LSFT_T(KC_TAB)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       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_SFTTB,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-     KC_LCTL,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT,   MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_RGUI
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [1] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, KC_PGUP,   KC_UP, KC_PGDN, XXXXXXX, XXXXXXX,                      XXXXXXX,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,                      KC_HOME,    KC_4,    KC_5,    KC_6, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       KC_END,    KC_1,    KC_2,    KC_3, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______,   MO(3), _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [2] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_DEL,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE,  KC_GRV,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______,   MO(3), _______,    _______, _______, _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [3] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                        KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, _______
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-#ifdef OLED_DRIVER_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-#define L_BASE 0
-#define L_LOWER 2
-#define L_RAISE 4
-#define L_ADJUST 8
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("Spike"), false);
-            break;
-        case L_LOWER:
-            oled_write_ln_P(PSTR("Jet"), false);
-            break;
-        case L_RAISE:
-            oled_write_ln_P(PSTR("Faye"), false);
-            break;
-        case L_ADJUST:
-        case L_ADJUST|L_LOWER:
-        case L_ADJUST|L_RAISE:
-        case L_ADJUST|L_LOWER|L_RAISE:
-            oled_write_ln_P(PSTR("Ed"), false);
-            break;
-    }
-}
-
-char keylog_str[24] = {};
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-  if (keycode < 60) {
-    name = code_to_name[keycode];
-  }
-
-  // update keylog
-  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-
-void oled_render_keylog(void) {
-    oled_write(keylog_str, false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_render_keylog();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    set_keylog(keycode, record);
-  }
-  return true;
-}
-
-#endif // OLED_DRIVER_ENABLE
diff --git a/keyboards/crkbd/keymaps/rarick/rules.mk b/keyboards/crkbd/keymaps/rarick/rules.mk
deleted file mode 100644
index 2528fec9b0f..00000000000
--- a/keyboards/crkbd/keymaps/rarick/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Bootloader for the elite-c
-BOOTLOADER = atmel-dfu
-
-# Enable RGB matric
-RGB_MATRIX_ENABLE = yes
-
-# Enable media keys
-EXTRAKEY_ENABLE = yes
-
-# Disabled to save space
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/config.h b/keyboards/crkbd/keymaps/rjhilgefort/config.h
deleted file mode 100644
index a7eb8b2a4fb..00000000000
--- a/keyboards/crkbd/keymaps/rjhilgefort/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200 // 200 is default
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-#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 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/keymap.c b/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
deleted file mode 100644
index a753b2b8722..00000000000
--- a/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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 ALT_ESC ALT_T(KC_ESC)
-#define CTL_ESC CTL_T(KC_ESC)
-#define GUI_ESC GUI_T(KC_ESC)
-#define HYPER LGUI(LSFT(KC_LALT))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // 0 - Base Mac
-  [0] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      CTL_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            MO(3), ALT_ESC, KC_LGUI,     KC_SPC,   MO(2),   HYPER
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  // 1 - Base Linux
-  [1] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      ALT_ESC,    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,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            MO(4), GUI_ESC, KC_LCTL,     KC_SPC,   MO(2),   HYPER
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  // 2 - Symbols
-  [2] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD,                      KC_PIPE,  KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN,  KC_GRV,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            MO(5), _______, _______,    _______, KC_TRNS, _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  // 3 - MAN Mac
-  [3] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, _______, KC_BRMD, KC_VOLU, KC_BRMU, _______,                      _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_MUTE, KC_MRWD, KC_MPLY, KC_MFFD, _______,                      _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, KC_VOLD, _______, _______,                      _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS, _______, _______,       KC_0,   MO(5), _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  // 4 - MAN Linux
-  [4] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, _______, KC_BRID, KC_VOLU, KC_BRIU, _______,                      _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______,                      _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, KC_VOLD, _______, _______,                      _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS, _______, _______,       KC_0,   MO(5), _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  // 5 - Extra
-  [5] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______,   DF(0),   DF(1), _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                      KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS, _______, _______,    _______, KC_TRNS, _______
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-#ifdef OLED_ENABLE
-#    include <stdio.h>
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-#define L_BASE_MAC 0
-#define L_BASE_LINUX 2
-#define L_SYMBOLS 4
-#define L_MAN_MAC 8
-#define L_MAN_LINUX 16
-#define L_EXTRA 32
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("L: "), false);
-
-    switch (layer_state) {
-        case L_BASE_MAC:
-        case L_BASE_LINUX:
-            oled_write_ln_P(PSTR("Base"), false);
-            break;
-        case L_SYMBOLS:
-            oled_write_ln_P(PSTR("Symbols"), false);
-            break;
-        case L_MAN_MAC:
-            oled_write_ln_P(PSTR("Media/Num (Mac)"), false);
-            break;
-        case L_MAN_LINUX:
-            oled_write_ln_P(PSTR("Media/Num (Linux)"), false);
-            break;
-        case L_EXTRA:
-        case L_EXTRA|L_SYMBOLS:
-        case L_EXTRA|L_MAN_MAC:
-        case L_EXTRA|L_MAN_LINUX:
-        case L_EXTRA|L_SYMBOLS|L_MAN_MAC:
-        case L_EXTRA|L_SYMBOLS|L_MAN_LINUX:
-            oled_write_ln_P(PSTR("Extra"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Unhandled!"), false);
-            break;
-    }
-}
-
-
-char keylog_str[24] = {};
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-  if (keycode < 60) {
-    name = code_to_name[keycode];
-  }
-
-  // update keylog
-  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-
-void oled_render_keylog(void) {
-    oled_write(keylog_str, false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_render_keylog();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    set_keylog(keycode, record);
-  }
-  return true;
-}
-#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/readme.md b/keyboards/crkbd/keymaps/rjhilgefort/readme.md
deleted file mode 100644
index 6c8fd9c2248..00000000000
--- a/keyboards/crkbd/keymaps/rjhilgefort/readme.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# [🐦 @rjhilgefort](https://twitter.com/rjhilgefort)'s Corne KBD (CRKBD) Layout
-
-My Corne KBD layout is inspired by [my Planck Layout](../../../planck/keymaps/rjhilgefort/readme.md), but with some additional features. Namely, this layout has Linux support.
-
-![](https://imgur.com/wp9ksTIh.jpg)
-![](https://imgur.com/fnyiCnEh.jpg)
-
-## Features
-
-Here's some highlights/features of the layout.
-
--   Ergonomic symbols layer.
--   Media and Numpad layer.
--   Planck-like extra tri-layer when holding the other two layers.
--   Supports Mac and Linux as 1st class citizens giving each a dedicated base layer and a media layer for each that matches media keys for each OS. The Linux default layer focuses on `Ctrl` instead of `Super` and vice versa for Mac. (When you set Linux as your base layer, the Linux media layer is what you shift into. Same for the Mac layer when that's the base)
-
-## Layers
-
-#### Keymap 0: Base (Mac)
-
-```
-  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    CTL_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
-  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          MO(3), ALT_ESC, KC_LGUI,     KC_SPC,   MO(2),   HYPER
-                                    //`--------------------------'  `--------------------------'
-```
-
-#### Keymap 1: Base (Linux)
-
-```
-  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
-     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    ALT_ESC,    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,
-  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          MO(4), GUI_ESC, KC_LCTL,     KC_SPC,   MO(2),   HYPER
-                                    //`--------------------------'  `--------------------------'
-```
-
-#### Keymap 2: Symbol Layer
-
-```
-  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD,                      KC_PIPE,  KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, _______,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN,  KC_GRV,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          MO(5), _______, _______,    _______, KC_TRNS, _______
-                                    //`--------------------------'  `--------------------------'
-```
-
-#### Keymap 3: Media & Numbers (MAC)
-
-```
-  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    _______, _______, KC_BRMD, KC_VOLU, KC_BRMU, _______,                      _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, KC_MUTE, KC_MRWD, KC_MPLY, KC_MFFD, _______,                      _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, _______, _______, KC_VOLD, _______, _______,                      _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
-  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                        KC_TRNS, _______, _______,       KC_0,   MO(5), _______
-                                    //`--------------------------'  `--------------------------'
-```
-
-#### Keymap 4: Media & Numbers (Linux)
-
-```
-  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    _______, _______, KC_BRID, KC_VOLU, KC_BRIU, _______,                      _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______,                      _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, _______, _______, KC_VOLD, _______, _______,                      _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
-  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                        KC_TRNS, _______, _______,       KC_0,   MO(5), _______
-                                    //`--------------------------'  `--------------------------'
-```
-
-#### Keymap 5: Extra
-
-```
-  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    _______,   DF(0),   DF(1), _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, _______, _______, _______, _______, _______,                      KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______, _______,
-  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-    _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                        KC_TRNS, _______, _______,    _______, KC_TRNS, _______
-                                    //`--------------------------'  `--------------------------'
-```
-
-## Building And Flashing
-
-Note, you'll see that most `crkbd`'s recommend a target of `avrdude` because most kits come with a Pro Micro. I put a Elite-C on mine and thus the target is `dfu`. You can see this in the [rules.mk](./rules.mk) as the `BOOTLOADER` configuration.
-
-#### CLI
-
-```
-make crkbd:rjhilgefort:flash
-```
-
-#### Docker
-
-```
-util/docker_build.sh crkbd:rjhilgefort:flash
-```
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/rules.mk b/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
deleted file mode 100644
index e7c9b4b9537..00000000000
--- a/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# For Elite-C
-BOOTLOADER = atmel-dfu
-
-# https://www.reddit.com/r/olkb/comments/9pyc0u/qmk_media_keys_are_not_working/
-EXTRAKEY_ENABLE = yes
-
-OLED_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
deleted file mode 100644
index 82064abb575..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-#define EE_HANDS
-
-#define NO_ACTION_ONESHOT
-#define NO_USB_STARTUP_CHECK
-
-#define LAYER_STATE_8BIT // 8 layer limit
-
-#define SPLIT_ACTIVITY_ENABLE
-#define SPLIT_LAYER_STATE_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-
-// Undefine r2g effects
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_HUE_BREATHING
-#    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-
-#    define SPLIT_TRANSACTION_IDS_USER USER_CONFIG_SYNC
-
-#    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-#    define IDLE_TIMEOUT 60000 * 4
-#    define GAMING_IDLE_TIMEOUT 10000
-#    define RGB_MATRIX_TYPING_ACTIVE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define RGB_MATRIX_TYPING_PASSIVE RGB_MATRIX_CYCLE_ALL
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 135
-
-#    define RGB_MATRIX_HUE_STEP 6
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_VAL_STEP 10
-#    define RGB_MATRIX_SPD_STEP 10
-
-#    define ENABLE_RGB_MATRIX_BREATHING
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-
-#    define RGB_MATRIX_ANIMATION_SPEED_FAST UINT8_MAX / 2
-#    define RGB_MATRIX_ANIMATION_SPEED_MEDIUM UINT8_MAX / 4
-#    define RGB_MATRIX_ANIMATION_SPEED_SLOW UINT8_MAX / 8
-#    define RGB_MATRIX_ANIMATION_SPEED_SLOWER UINT8_MAX / 24
-
-#    if defined(THEME_GODSPEED)
-#        define THEME_HSV 132, 255, 125
-#    elif defined(THEME_GODSPEED_ARES)
-#        define THEME_HSV HSV_ORANGE
-#    elif defined(THEME_LASER)
-#        undef RGB_MATRIX_TYPING_ACTIVE
-#        undef RGB_MATRIX_TYPING_PASSIVE
-#        define THEME_HSV HSV_PURPLE
-#        define RGB_MATRIX_TYPING_ACTIVE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#        define RGB_MATRIX_TYPING_PASSIVE RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    elif defined(THEME_MILKSHAKE)
-#        undef RGB_MATRIX_TYPING_ACTIVE
-#        undef RGB_MATRIX_TYPING_PASSIVE
-#        define THEME_HSV 30, 255, 218
-#        define RGB_MATRIX_TYPING_ACTIVE RGB_MATRIX_TYPING_HEATMAP
-#        define RGB_MATRIX_TYPING_PASSIVE RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    else
-#        define THEME_HSV 123, 255, 125 // default to PULSE
-#    endif
-#endif
-
-#define TAPPING_TERM 140
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM_PER_KEY
-
-#define TAP_CODE_DELAY 10
-#define TAPPING_TOGGLE 2
-
-#ifdef OLED_ENABLE
-#    define SPLIT_OLED_ENABLE
-#    define OLED_TIMEOUT 60000 * 10
-#    define OLED_FONT_H "glcdfont_multi.c"
-#endif
-
-#undef PRODUCT
-#define PRODUCT "Corne Keyboard"
diff --git a/keyboards/crkbd/keymaps/rpbaptist/glcdfont_multi.c b/keyboards/crkbd/keymaps/rpbaptist/glcdfont_multi.c
deleted file mode 100644
index 28d228190cb..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/glcdfont_multi.c
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2023 Your Name (@rpbaptist)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "progmem.h"
-
-// Helidox 8x6 font with QMK Firmware Logo
-// Online editor: https://joric.github.io/qle/
-
-const unsigned char font[] PROGMEM = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-    0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, 0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-#if defined(THEME_GODSPEED) || defined(THEME_GODSPEED_ARES)
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x38, 0x1C, 0x0C, 0x06, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x82, 0x86, 0xCC, 0xF8, 0xF0, 0xF0, 0x38, 0x1C, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x70, 0xF8, 0x0C, 0x04, 0xC6, 0xA2, 0xB3, 0x9F, 0x87, 0x01, 0x01, 0x1F, 0x66, 0x66, 0x44, 0x4C, 0x58, 0x70, 0xE0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0x78, 0x18, 0x8C, 0xC6, 0xE6, 0xE3, 0xE3, 0xC3, 0x83, 0x03, 0x03, 0x73, 0x76, 0x76, 0x0C, 0x18, 0xF8, 0xF0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-    0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 0xDE, 0xD7, 0xDC, 0x00, 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, 0x80, 0xC0, 0x40, 0x7F, 0xF3, 0x60, 0x20, 0x30, 0x30, 0x38, 0x18, 0x9C, 0xCC, 0x6C, 0x6E, 0x3E, 0x3E, 0x1F, 0x0F, 0x0F, 0x03, 0x03, 0x01, 0xC0, 0xFF, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xC1, 0x00, 0x1D, 0x67, 0xC0, 0x80, 0x01, 0x00, 0x00, 0xF0, 0x0F, 0x00, 0x00, 0x00, 0x0C, 0x1A, 0x32, 0xC2, 0x01, 0xC1, 0xFF, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0xFF,
-    0x80, 0x00, 0x00, 0xC3, 0xC7, 0xC7, 0x8F, 0x0F, 0x07, 0x03, 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0x80, 0x00, 0x07, 0x0F, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 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, 0x00, 0x40, 0x60, 0x31, 0x3B, 0x1E, 0x0C, 0x1E, 0x36, 0x23, 0x61, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x30, 0x1C, 0x3E, 0x3E, 0x3F, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0C, 0x18, 0x10, 0x33, 0x3E, 0x38, 0x6E, 0x67, 0x60, 0x60, 0x60, 0x20, 0x30, 0x18, 0x08, 0x0F, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0C, 0x19, 0x31, 0x21, 0x60, 0x60, 0x60, 0x60, 0x61, 0x63, 0x67, 0x67, 0x33, 0x39, 0x18, 0x0E, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-#elif defined(THEME_LASER)
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xE0, 0xF8, 0x3E, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF0, 0x7C, 0x3F, 0x0F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x1B, 0x1F, 0x1F, 0x07, 0x03, 0xC0, 0xE0, 0xFC, 0x1C, 0x0F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0xE7, 0xFF, 0xFF, 0x0F, 0x03, 0x03, 0x03, 0x03, 0x83, 0x83, 0xE3, 0xE7, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-    0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 0xDE, 0xD7, 0xDC, 0x00, 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, 0x80, 0xC0, 0xF0, 0x7C, 0x1F, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x90, 0x98, 0x9C, 0x8C, 0x80, 0x80, 0x80, 0x9C, 0x9C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x9C, 0x9C, 0x1C, 0x1C, 0x0C, 0x0C, 0x80, 0x90, 0x90, 0x10, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x0C,
-    0x00, 0x00, 0x90, 0x90, 0x9C, 0x9C, 0x1C, 0x1C, 0x1C, 0x1C, 0x9C, 0x9C, 0x9C, 0x0C, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x7C, 0x7E, 0x6F, 0x63, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x70, 0x78, 0x3C, 0x1E, 0x0F, 0x07, 0x03, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x7F, 0x7F, 0x00, 0x00, 0x60, 0x70, 0x7C, 0x7C, 0x6C, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78, 0x3E, 0x0F, 0x03, 0x01, 0x00, 0x60, 0x78, 0x7E, 0x67, 0x61, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x78, 0x7E, 0x0F, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0F, 0x7F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-#elif defined(THEME_MILKSHAKE)
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFC, 0xFE, 0xFE, 0xFE, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xF8, 0xF8, 0xF8, 0xF0, 0xE0, 0xC0, 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xF8, 0xF8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFE, 0xFE, 0xFE, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xF8, 0xFC, 0x7C, 0x7C, 0x7C, 0xFC, 0xF8, 0xF8, 0xF0, 0xE0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-    0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xF8, 0xFC, 0xFE, 0xFF, 0xDF, 0x8F, 0x07, 0x03, 0x00, 0x00, 0x70, 0xF8, 0xF8, 0xF8, 0xF8, 0xFC, 0x7C, 0x7E, 0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0xF1, 0xFB, 0xFF, 0xFF, 0x7F, 0x3F, 0x7F, 0xFF, 0xFF, 0xFB, 0xF1, 0xE0, 0xC0, 0x00, 0x00, 0x00, 0x0E, 0x1F, 0x1F, 0x1F, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xF0, 0xF0, 0xF0, 0xE0, 0xC1, 0x83, 0x03, 0x83, 0xC1, 0xE0, 0xF0, 0xF0, 0xF0, 0x60, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x1F, 0x1F, 0x1F, 0x0E, 0x00, 0x00, 0x1F, 0x7F, 0xFF, 0xFF, 0xFF, 0xF1, 0xE0, 0xC0, 0xC0, 0xC0, 0xE0, 0xF1, 0xFF, 0xFF, 0xFF, 0x3F, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 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, 0x03, 0x07, 0x0F, 0x1F, 0x1F, 0x0E, 0x00, 0x00, 0x00, 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, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-#else // default PULSE
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xF0, 0xF8, 0xF8, 0xF0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xF0, 0xFE, 0x7F, 0x7F, 0xFE, 0xF0, 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, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-    0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1F, 0x0F, 0x03, 0x03, 0x1F, 0xFF, 0xFC, 0xE0, 0xE0, 0xFC, 0xFF, 0x1F, 0x03, 0x00, 0x00, 0x03, 0x1F, 0xFF, 0xFC, 0xE0, 0xE0, 0xF8, 0xFC, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
-    0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x0F, 0x0F, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0F, 0x0F, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-#endif
-};
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
deleted file mode 100644
index fc05a554036..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2023 Your Name (@rpbaptist)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rpbaptist.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_COLEMAKDH] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                         KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, BSP_DEL,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TAB_NUM,    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                         KC_M,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      LCTL_BR,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                         KC_K,    KC_H, KC_COMM,  KC_DOT, KC_SLSH, RCTL_BR,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT,   T_SYM, SFT_SPC,    SFT_ENT,   T_NAV, KC_RGUI \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_GAMING] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, KC_BSPC,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_TAB, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, KC_RCTL,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          EXTALT, KC_LSFT,  KC_SPC,    _______, _______, _______ \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_WASD] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______,    KC_T,    KC_Q,    KC_W,    KC_E,    KC_R,                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_TAB,    KC_G,    KC_A,    KC_S,    KC_D,    KC_F,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, _______,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL,    KC_B,    KC_Z,    KC_X,    KC_C,    KC_V,                         KC_N,    KC_M, _______, _______, _______, KC_RCTL,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          EXTALT, KC_LSFT,  KC_SPC,    _______, _______, _______ \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_GAMING_EXT] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_GRV,    KC_Y,    KC_I,    KC_J,    KC_M,    KC_N,                      _______, _______, _______, _______, _______,  KC_DEL,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_CAPS,    KC_6,    KC_7, KC_LBRC, KC_RBRC, KC_BSLS,                      _______, _______, _______, _______, _______, _______,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, KC_LALT, KC_ENT,     KC_ENT, _______, _______ \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_NUMPAD] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, XXXXXXX,                       KC_EUR,    KC_7,    KC_8,    KC_9, _______, _______,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-        S_NUM, XXXXXXX, KC_MSTP, KC_VOLD, KC_MPLY, XXXXXXX,                      KC_UNDS,    KC_4,    KC_5,    KC_6, KC_MINS, KC_PLUS,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      SC_LCPO, XXXXXXX, XXXXXXX, KC_MUTE, KC_PSCR,  KC_NUM,                       KC_EQL,    KC_1,    KC_2,    KC_3, KC_SLSH, KC_ASTR,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______,    KC_0,  KC_DOT \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_SYM] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_MINS, KC_PLUS,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      SC_LCPO, XXXXXXX, XXXXXXX, XXXXXXX,  KC_EUR, XXXXXXX,                       KC_EQL, KC_PIPE,   KC_LT,   KC_GT, KC_EXLM, SC_RCPC,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______,   S_SYM, _______,    _______, _______, _______ \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_NAV] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_PGUP, KC_HOME,   KC_UP,  KC_END,  KC_INS, KC_BSPC,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_TILD,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                      KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, KC_RSFT,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      SC_LCPO,  KC_F11,  KC_F12,  KC_F13, KC_PSCR, KC_CAPS,                      WIN_CLS, TAB_BCK, TAB_CLS, TAB_FWD, KC_BSLS, SC_RCPC,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+---------|
-                                          _______, _______, _______,    _______,   S_NAV, _______ \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_UTIL] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      QK_BOOT, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX,  TYPING,                      RGB_ATG, XXXXXXX, XXXXXXX, RGB_IDL, RGB_UND, RGB_TOG,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      LCK_NMP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  GAMING,                      RGB_PST, XXXXXXX, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       EE_CLR, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX,    WASD,                      RGB_PCT, XXXXXXX, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, _______ \
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(default_layer_state)) {
-        case _COLEMAKDH:
-            state = update_tri_layer_state(state, _SYM, _NAV, _UTIL);
-            break;
-        case _GAMING:
-        case _WASD:
-            state = update_tri_layer_state(state, _GAMING_EXT, _NAV, _UTIL);
-            break;
-    }
-    return state;
-}
-
-void suspend_power_down_keymap(void) {
-#ifdef OLED_ENABLE
-    oled_off();
-#endif
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_set_suspend_state(true);
-#endif
-}
-
-void suspend_wakeup_init_keymap(void) {
-#ifdef OLED_ENABLE
-    oled_on();
-#endif
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_set_suspend_state(false);
-#endif
-}
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case SFT_ENT:
-            return TAPPING_TERM - 20;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint8_t saved_mods   = 0;
-    uint16_t       temp_keycode = keycode;
-
-#ifdef RGB_MATRIX_ENABLE
-    process_record_user_rgb_matrix(temp_keycode, record);
-#endif
-
-    // Filter out the actual keycode from MT and LT keys.
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-        temp_keycode &= 0xFF;
-    }
-
-    switch (temp_keycode) {
-        case BSP_DEL:
-            if (record->event.pressed) {
-                saved_mods = get_mods() & MOD_MASK_SHIFT;
-
-                if (saved_mods == MOD_MASK_SHIFT) { // Both shifts pressed
-                    register_code(KC_DEL);
-                } else if (saved_mods) {  // One shift pressed
-                    del_mods(saved_mods); // Remove any Shifts present
-                    register_code(KC_DEL);
-                    add_mods(saved_mods); // Add shifts again
-                } else {
-                    register_code(KC_BSPC);
-                }
-            } else {
-                unregister_code(KC_DEL);
-                unregister_code(KC_BSPC);
-            }
-            return false;
-        case TYPING:
-            if (record->event.pressed) {
-#ifdef RGB_MATRIX_ENABLE
-                rgb_matrix_set_typing_defaults();
-#endif
-                default_layer_set(1U << _COLEMAKDH);
-            }
-            return true;
-        case GAMING:
-            if (record->event.pressed) {
-#ifdef RGB_MATRIX_ENABLE
-                rgb_matrix_set_gaming_defaults();
-#endif
-                default_layer_set(1U << _GAMING);
-            }
-            return true;
-        case WASD:
-            if (record->event.pressed) {
-#ifdef RGB_MATRIX_ENABLE
-                rgb_matrix_set_gaming_defaults();
-#endif
-                default_layer_set(1U << _WASD);
-            }
-            return true;
-    }
-    return true;
-}
-
-// Override functions to save memory
-// https://docs.qmk.fm/#/squeezing_avr?id=magic-keycodes
-uint16_t keycode_config(uint16_t keycode) {
-    return keycode;
-}
-
-uint8_t mod_config(uint8_t mod) {
-    return mod;
-}
diff --git a/keyboards/crkbd/keymaps/rpbaptist/oled.c b/keyboards/crkbd/keymaps/rpbaptist/oled.c
deleted file mode 100644
index 549826fac60..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/oled.c
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2023 Your Name (@rpbaptist)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rpbaptist.h"
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    } else {
-        return OLED_ROTATION_180;
-    }
-}
-
-void render_crkbd_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-user_config_t user_config;
-
-void render_status(void) {
-    switch (get_highest_layer(default_layer_state)) {
-        case _COLEMAKDH:
-            oled_write_P(PSTR("TYPE "), false);
-            break;
-        case _GAMING:
-            oled_write_P(PSTR("GAME "), false);
-            break;
-        case _WASD:
-            oled_write_P(PSTR("WASD "), false);
-            break;
-    }
-
-    oled_write_P(PSTR("\n"), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_P(PSTR("     "), false);
-            break;
-        case _SYM:
-            oled_write_P(PSTR("Sym  "), false);
-            break;
-        case _NAV:
-            oled_write_P(PSTR("Nav  "), false);
-            break;
-        case _GAMING_EXT:
-            oled_write_P(PSTR("Ext  "), false);
-            break;
-        case _NUMPAD:
-            oled_write_P(PSTR("Num  "), false);
-            break;
-        case _UTIL:
-            oled_write_P(PSTR("Util "), false);
-            break;
-        default:
-            oled_write_P(PSTR("Unkn "), false);
-            break;
-    }
-    oled_write_P(PSTR("\n"), false);
-
-    uint8_t modifiers = get_mods();
-
-    oled_write_P((modifiers & MOD_MASK_SHIFT) ? PSTR("SHIFT") : PSTR("\n"), false);
-    oled_write_P((modifiers & MOD_MASK_CTRL) ? PSTR("CTRL ") : PSTR("\n"), false);
-    oled_write_P((modifiers & MOD_MASK_ALT) ? PSTR("ALT  ") : PSTR("\n"), false);
-    oled_write_P((modifiers & MOD_MASK_GUI) ? PSTR("SUPER") : PSTR("\n"), false);
-
-    oled_write_P(PSTR("\n"), false);
-
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(PSTR("Mode:"), false);
-    oled_write_P(led_state.num_lock ? PSTR(" NUM ") : PSTR("\n"), false);
-    oled_write_P(led_state.caps_lock ? PSTR(" CAPS") : PSTR("\n"), false);
-
-#ifdef RGB_MATRIX_ENABLE
-    oled_write_P(PSTR("\n"), false);
-    oled_write_P(PSTR("\n"), false);
-
-    if (rgb_matrix_config.enable) {
-        if (user_config.rgb_matrix_idle_anim) {
-            oled_write_P(rgb_matrix_anim_oled_text(user_config.rgb_matrix_active_mode), false);
-            oled_write_P(rgb_matrix_anim_oled_text(user_config.rgb_matrix_idle_mode), false);
-        } else {
-            oled_write_P(PSTR("\n"), false);
-            oled_write_P(rgb_matrix_anim_oled_text(rgb_matrix_get_mode()), false);
-        }
-    } else {
-        oled_write_P(PSTR("\n"), false);
-        oled_write_P(PSTR("\n"), false);
-    }
-#endif
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_crkbd_logo();
-#ifdef RGB_MATRIX_ENABLE
-        if (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode) {
-            oled_scroll_left(); // Turns on scrolling
-        } else {
-            oled_scroll_off();
-        }
-#endif
-    }
-    return false;
-}
diff --git a/keyboards/crkbd/keymaps/rpbaptist/oled.h b/keyboards/crkbd/keymaps/rpbaptist/oled.h
deleted file mode 100644
index d4a73992e0e..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/oled.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2023 Your Name (@rpbaptist)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "oled_driver.h"
-
-void render_crkbd_logo(void);
diff --git a/keyboards/crkbd/keymaps/rpbaptist/readme.md b/keyboards/crkbd/keymaps/rpbaptist/readme.md
deleted file mode 100644
index 2312ec8c498..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/readme.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Corne keyboard layout
-
-This is my highly personalized CRKBD layout. I use Colemak DH as main typing layer. I use this keyboard and layout in my daily programming job and for everything at home, including gaming.
-
-This keymap is the result of an evolution from Ultimate Hacking Keyboard to Iris, to Corne. It took many iterations and changes and only now I feel this is ready to be merged into the main QMK repository, because I think further changes will be minor. This is my 1.0 release so to speak.
-
-Many thanks to foostan for the keyboard, all QMK contributors and drashna specifically for his work on this keyboard.
-
-## Layers
-
-### COLEMAKDH
-
-Main typing layer. I really love having SHIFT available on thumbs. I am a left thumb space bar person, so I put SPACE there and ENTER on right. I use CTRL key combos lot in my text editor and desktop environment. That's why I have two of them. I also found them to be a great position for the square brackets. (`[` and `]`). These become parenthesis (`(` and `)`) on either of the layers.
-
-Holding SHIFT while tapping BACKSPACE will output DEL. Holding both SHIFT keys will output SHIFT+DEL.
-
-I don't know about you but "lower" and "raise" don't mean that much to me. I named my layers `SYM`, short for symbols and `NAV`, short for navigation. Holding the key will activate the layer for as long as it is held, double tapping it will switch to it. Single tapping it once will switch to main layer again.
-
-Holding TAB will access `NUMPAD` layer which features a numpad. This is lockable by going to `ADJUST` layer and pressing the same key.
-
-### SYM
-
-Includes a number row, the symbols normally on SHIFT and numbers and a variety of other symbols used mostly for programming.
-
-### NAV
-
-This is where I access F keys, arrow keys, page up, down, home, end and F keys. I also added general tab forward and backward keys. Tab close and window close. I primarily use these in my browser, terminal and text editor.
-
-### UTIL
-
-Short for utility. This is accessed by pressing both `SYM` and `NAV` at the same time. It has a software `QK_BOOT` key, control for RGB and switching the main layer. More on the RGB below.
-
-### NUMPAD"
-
-This gives access to a numpad on the right half with some additional symbols I find useful when using the numpad. The left half has media control.
-
-### GAMING
-
-Sometimes I switch to type in Discord, Steam, or in game chat, so I think it's more important to keep typing functional than put WASD on where I want movement to be. This means I rebind my keys in all games. It's worth it to me.
-
-I put movement on FRST (would be ESDF on QWERTY), because it lines up more comfortably with the columnar staggered layout of the Corne. It also gives more easy access to all keys on left half.
-
-Most notable here is that there are no tap and hold differences anymore on left hand side besides the new layer key. This is a different layer than `SYM`.
-
-### WASD
-
-This is functionally the same as the `GAMING` layer, but uses traditional WASD layout. This is done for games where I don't need to type and want to just jump in without rebinding everything.
-
-### GAMING_EXT
-
-This is the gaming extended layer. I moved this to most inner thumb instead of mid thumb position. Num row is now moved to the home row. Besides that it gives me an ENTER key which does not switch. This is good when a game requires you to hold ENTER.
-
-## RGB
-
-I took a big inspiration from Drashna's RGB configuration and tweaked it.
-
-- `RGB_UND`: Toggles underglow indicators on and off. Each layer has its own color.
-- `RGB_IDL`: This will enable/disable idle mode. By default an "active" RGB mode will be used. When the idle timeout has exceeded the secondary animation will be activated, which is a passive animation. When switching to `GAMING` layer the timeout will be reduced and the idle animation changed to `RGB_MATRIX_RAINBOW_PINWHEELS`.
-   When disabling idle mode, the current idle animation will be activated.
-   On idling, on idling, the underglow layer indication will be deactivated and the animation RGB will be set instead.
-- `RGB_ATG`: Cylces through three active modes: `RGB_MATRIX_SOLID_REACTIVE_SIMPLE` -> `RGB_MATRIX_TYPING_HEATMAP` -> `RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS`
-- `RGB_PST`: Cycles through three passive modes: `RGB_MATRIX_SOLID_COLOR` -> `RGB_MATRIX_BREATHING` -> `RGB_MATRIX_CYCLE_ALL`
-- `RGB_PCT`: Cycles through two, more colorful, passive modes: `RGB_MATRIX_RAINBOW_PINWHEELS` -> `RGB_MATRIX_CYCLE_LEFT_RIGHT`
-
-## Building
-
-`qmk flash -bl dfu -kb crkbd -km rpbaptist`
-
-## Notes
-
-I use several OLED slave side images, depending on the keycaps I am using. These also determine the default LED color and underglow.
-
-Provide the theme like this:
-
-`THEME=laser qmk flash -bl dfu -kb crkbd -km rpbaptist`
-
-Current supported themes are:
-
-- pulse (default)
-- godspeed
-- laser
-- milkshake
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rgb.c b/keyboards/crkbd/keymaps/rpbaptist/rgb.c
deleted file mode 100644
index 7f87d0a9eaa..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/rgb.c
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright 2023 Your Name (@rpbaptist)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rpbaptist.h"
-
-uint32_t transport_user_config = 0;
-
-void user_config_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
-    if (initiator2target_buffer_size == sizeof(transport_user_config)) {
-        memcpy(&transport_user_config, initiator2target_buffer, initiator2target_buffer_size);
-    }
-}
-
-#ifdef OLED_ENABLE
-const char* rgb_matrix_anim_oled_text(uint8_t mode) {
-    switch (mode) {
-        case RGB_MATRIX_TYPING_HEATMAP:
-            return PSTR("Heat ");
-        case RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS:
-            return PSTR("Nexus");
-        case RGB_MATRIX_SOLID_REACTIVE_SIMPLE:
-            return PSTR("Ease ");
-        case RGB_MATRIX_SOLID_COLOR:
-            return PSTR("Solid");
-        case RGB_MATRIX_BREATHING:
-            return PSTR("Fade ");
-        case RGB_MATRIX_CYCLE_ALL:
-            return PSTR("Cycle");
-        case RGB_MATRIX_RAINBOW_PINWHEELS:
-            return PSTR("Wheel");
-        case RGB_MATRIX_CYCLE_LEFT_RIGHT:
-            return PSTR("Wave ");
-        default:
-            return PSTR("");
-    }
-}
-#endif
-
-extern led_config_t g_led_config;
-
-void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t led_min, uint8_t led_max) {
-    HSV hsv = {hue, sat, val};
-    if (hsv.v > rgb_matrix_get_val()) {
-        hsv.v = rgb_matrix_get_val();
-    }
-
-    RGB rgb = hsv_to_rgb(hsv);
-    for (uint8_t i = 0; i < led_max; i++) {
-        if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-        }
-    }
-}
-
-extern user_config_t user_config;
-
-bool rgb_matrix_in_idle(void) {
-    return (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode);
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    if (user_config.rgb_layer_indicator && !rgb_matrix_in_idle()) {
-        switch (get_highest_layer(layer_state | default_layer_state)) {
-            case _GAMING_EXT:
-                rgb_matrix_layer_helper(HSV_PURPLE, led_min, led_max);
-                break;
-            case _SYM:
-                rgb_matrix_layer_helper(HSV_YELLOW, led_min, led_max);
-                break;
-            case _NAV:
-                rgb_matrix_layer_helper(HSV_SPRINGGREEN, led_min, led_max);
-                break;
-            case _UTIL:
-                rgb_matrix_layer_helper(HSV_PINK, led_min, led_max);
-                break;
-            case _NUMPAD:
-                rgb_matrix_layer_helper(HSV_CORAL, led_min, led_max);
-                break;
-            case _GAMING:
-            case _WASD:
-                rgb_matrix_layer_helper(HSV_RED, led_min, led_max);
-                break;
-            default:
-                rgb_matrix_layer_helper(THEME_HSV, led_min, led_max);
-                break;
-        }
-    }
-    return false;
-}
-
-void rgb_matrix_turn_off_underglow(void) {
-    rgb_matrix_layer_helper(0, 0, 0, 0, 54);
-}
-
-uint8_t rgb_matrix_speed_for_mode(uint8_t mode) {
-    switch (mode) {
-        case RGB_MATRIX_SOLID_REACTIVE_SIMPLE:
-        case RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS:
-            return RGB_MATRIX_ANIMATION_SPEED_FAST;
-        case RGB_MATRIX_BREATHING:
-        case RGB_MATRIX_CYCLE_LEFT_RIGHT:
-        case RGB_MATRIX_RAINBOW_PINWHEELS:
-            return RGB_MATRIX_ANIMATION_SPEED_SLOW;
-        case RGB_MATRIX_CYCLE_ALL:
-            return RGB_MATRIX_ANIMATION_SPEED_SLOWER;
-        default:
-            return RGB_MATRIX_ANIMATION_SPEED_MEDIUM;
-    }
-}
-
-bool rgb_matrix_mode_active(uint8_t mode) {
-    return (mode == RGB_MATRIX_SOLID_REACTIVE_SIMPLE || mode == RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS || mode == RGB_MATRIX_TYPING_HEATMAP);
-}
-
-void rgb_matrix_update_current_mode(uint8_t mode) {
-    rgb_matrix_config.speed = rgb_matrix_speed_for_mode(mode);
-    rgb_matrix_mode_noeeprom(mode);
-}
-
-void rgb_matrix_update_dynamic_mode(uint8_t mode) {
-    uint8_t speed;
-    speed = rgb_matrix_speed_for_mode(mode);
-
-    if (rgb_matrix_mode_active(mode)) {
-        user_config.rgb_matrix_active_speed = speed;
-        user_config.rgb_matrix_active_mode  = mode;
-    } else {
-        user_config.rgb_matrix_idle_speed = speed;
-        user_config.rgb_matrix_idle_mode  = mode;
-    }
-}
-
-void rgb_matrix_update_mode(uint8_t mode) {
-    if (user_config.rgb_matrix_idle_anim) {
-        rgb_matrix_update_dynamic_mode(mode);
-    }
-    if (rgb_matrix_mode_active(mode) || !user_config.rgb_matrix_idle_anim) {
-        rgb_matrix_update_current_mode(mode);
-    }
-}
-
-uint8_t get_rgb_matrix_active_mode(void) {
-    if (user_config.rgb_matrix_idle_anim) {
-        return user_config.rgb_matrix_active_mode;
-    } else {
-        return rgb_matrix_get_mode();
-    }
-}
-
-void rgb_matrix_toggle_active_mode(void) {
-    switch (get_rgb_matrix_active_mode()) {
-        case RGB_MATRIX_SOLID_REACTIVE_SIMPLE:
-            rgb_matrix_update_mode(RGB_MATRIX_TYPING_HEATMAP);
-            break;
-        case RGB_MATRIX_TYPING_HEATMAP:
-            rgb_matrix_update_mode(RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS);
-            break;
-        default:
-            rgb_matrix_update_mode(RGB_MATRIX_SOLID_REACTIVE_SIMPLE);
-            break;
-    }
-}
-
-uint8_t get_rgb_matrix_idle_mode(void) {
-    if (user_config.rgb_matrix_idle_anim) {
-        return user_config.rgb_matrix_idle_mode;
-    } else {
-        return rgb_matrix_get_mode();
-    }
-}
-
-void rgb_matrix_toggle_simple_passive_mode(void) {
-    switch (get_rgb_matrix_idle_mode()) {
-        case RGB_MATRIX_SOLID_COLOR:
-            rgb_matrix_update_mode(RGB_MATRIX_BREATHING);
-            break;
-        case RGB_MATRIX_BREATHING:
-            rgb_matrix_update_mode(RGB_MATRIX_CYCLE_ALL);
-            break;
-        default:
-            rgb_matrix_update_mode(RGB_MATRIX_SOLID_COLOR);
-            break;
-    }
-}
-
-void rgb_matrix_toggle_color_passive_mode(void) {
-    switch (get_rgb_matrix_idle_mode()) {
-        case RGB_MATRIX_RAINBOW_PINWHEELS:
-            rgb_matrix_update_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT);
-            break;
-        default:
-            rgb_matrix_update_mode(RGB_MATRIX_RAINBOW_PINWHEELS);
-            break;
-    }
-}
-
-void rgb_matrix_toggle_underglow_layer_indicator(void) {
-    user_config.rgb_layer_indicator ^= 1;
-    if (user_config.rgb_layer_indicator) {
-        layer_state_set(layer_state); // This is needed to immediately set the layer color (looks better)
-    } else {
-        rgb_matrix_turn_off_underglow();
-    }
-}
-
-void rgb_matrix_toggle_idle_animation_change(void) {
-    user_config.rgb_matrix_idle_anim ^= 1;
-    if (user_config.rgb_matrix_idle_anim) {
-        rgb_matrix_update_mode(user_config.rgb_matrix_active_mode);
-    } else {
-        rgb_matrix_update_current_mode(user_config.rgb_matrix_idle_mode);
-    }
-}
-
-void rgb_matrix_set_gaming_defaults(void) {
-    if (!user_config.rgb_layer_indicator) {
-        user_config.rgb_layer_indicator = true;
-    }
-    user_config.rgb_matrix_idle_timeout = GAMING_IDLE_TIMEOUT;
-    rgb_matrix_update_mode(RGB_MATRIX_RAINBOW_PINWHEELS);
-    rgb_matrix_update_mode(RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS);
-}
-
-void rgb_matrix_set_typing_defaults(void) {
-    user_config.rgb_matrix_idle_timeout = IDLE_TIMEOUT;
-    rgb_matrix_update_mode(RGB_MATRIX_TYPING_PASSIVE);
-    rgb_matrix_update_mode(RGB_MATRIX_TYPING_ACTIVE);
-}
-
-void rgb_matrix_set_defaults(void) {
-    rgb_matrix_enable_noeeprom();
-    rgb_matrix_sethsv_noeeprom(THEME_HSV);
-
-    user_config.rgb_layer_indicator  = true;
-    user_config.rgb_matrix_idle_anim = true;
-
-    rgb_matrix_set_typing_defaults();
-
-    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_REACTIVE_SIMPLE);
-}
-
-void matrix_scan_rgb(void) {
-    if (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_active_mode && last_input_activity_elapsed() > user_config.rgb_matrix_idle_timeout) {
-        if (user_config.rgb_layer_indicator) {
-            rgb_matrix_turn_off_underglow();
-        }
-        rgb_matrix_update_current_mode(user_config.rgb_matrix_idle_mode);
-    }
-}
-
-void user_transport_sync(void) {
-    // Keep track of the last state, so that we can tell if we need to propagate to slave
-    static uint32_t last_config = 0, last_sync = 0;
-
-    // Check if the state values are different
-    // or if sync timer elapsed
-    if (memcmp(&user_config, &last_config, sizeof(transport_user_config)) || (timer_elapsed32(last_sync) > 250)) {
-        memcpy(&last_config, &user_config, sizeof(transport_user_config));
-
-        if (transaction_rpc_send(USER_CONFIG_SYNC, sizeof(transport_user_config), &transport_user_config)) {
-            last_sync = timer_read32();
-        }
-    }
-}
-
-void user_transport_update(void) {
-    if (is_keyboard_master()) {
-        transport_user_config = user_config.raw;
-        user_transport_sync();
-    } else {
-        user_config.raw = transport_user_config;
-    }
-}
-
-void housekeeping_task_user(void) {
-    static bool has_ran_yet;
-    if (!has_ran_yet) {
-        has_ran_yet = true;
-        startup_user();
-    }
-    matrix_scan_rgb();
-
-    // Update config to slave
-    user_transport_update();
-}
-
-void eeconfig_init_user(void) {
-    user_config.raw                  = 0;
-    user_config.rgb_layer_indicator  = true;
-    user_config.rgb_matrix_idle_anim = true;
-
-    rgb_matrix_enable();
-    rgb_matrix_sethsv(THEME_HSV);
-    rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE_SIMPLE);
-
-    eeconfig_update_user(user_config.raw);
-}
-
-void keyboard_post_init_user(void) {
-    set_single_persistent_default_layer(_COLEMAKDH);
-    rgb_matrix_set_defaults();
-
-    // Register user config sync
-    transaction_register_rpc(USER_CONFIG_SYNC, user_config_sync);
-}
-
-bool process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t* record) {
-    if (user_config.rgb_matrix_idle_anim) {
-        if (rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode) {
-            rgb_matrix_update_current_mode(user_config.rgb_matrix_active_mode);
-            if (!user_config.rgb_layer_indicator) {
-                rgb_matrix_turn_off_underglow();
-            }
-        }
-    }
-
-    switch (keycode) {
-        case RGB_RST:
-            if (record->event.pressed) {
-                rgb_matrix_set_defaults();
-            }
-            break;
-        case RGB_UND: // Toggle separate underglow status
-            if (record->event.pressed) {
-                rgb_matrix_toggle_underglow_layer_indicator();
-            }
-            break;
-        case RGB_IDL: // Toggle idle/heatmap animation
-            if (record->event.pressed) {
-                rgb_matrix_toggle_idle_animation_change();
-            }
-            break;
-        case RGB_ATG:
-            if (record->event.pressed) {
-                rgb_matrix_toggle_active_mode();
-            }
-            break;
-        case RGB_PST:
-            if (record->event.pressed) {
-                rgb_matrix_toggle_simple_passive_mode();
-            }
-            break;
-        case RGB_PCT:
-            if (record->event.pressed) {
-                rgb_matrix_toggle_color_passive_mode();
-            }
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rgb.h b/keyboards/crkbd/keymaps/rpbaptist/rgb.h
deleted file mode 100644
index 91c25f5c287..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/rgb.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2023 Your Name (@rpbaptist)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "transactions.h"
-
-typedef union {
-    uint32_t raw;
-    struct {
-        bool     rgb_layer_indicator : 1;
-        bool     rgb_matrix_idle_anim : 1;
-        uint8_t  rgb_matrix_active_mode : 4;
-        uint8_t  rgb_matrix_idle_mode : 4;
-        uint8_t  rgb_matrix_active_speed : 2;
-        uint8_t  rgb_matrix_idle_speed : 2;
-        uint32_t rgb_matrix_idle_timeout : 18;
-    };
-} user_config_t;
-
-extern user_config_t user_config;
-
-_Static_assert(sizeof(user_config_t) == sizeof(uint32_t), "Userspace EECONFIG out of spec.");
-
-const char *rgb_matrix_anim_oled_text(uint8_t mode);
-void        rgb_matrix_set_gaming_defaults(void);
-void        rgb_matrix_set_typing_defaults(void);
-bool        process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rpbaptist.h b/keyboards/crkbd/keymaps/rpbaptist/rpbaptist.h
deleted file mode 100644
index 630ab5df49c..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/rpbaptist.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2023 Your Name (@rpbaptist)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#include QMK_KEYBOARD_H
-
-#include "quantum.h"
-
-#if defined(RGB_MATRIX_ENABLE)
-#    include "rgb.h"
-#endif
-
-#if defined(OLED_ENABLE)
-#    include "oled.h"
-#endif
-
-enum layer_names {
-  _COLEMAKDH,
-  _GAMING,
-  _WASD,
-  _GAMING_EXT,
-  _NUMPAD,
-  _SYM,
-  _NAV,
-  _UTIL
-};
-
-enum custom_keycodes {
-    BSP_DEL = SAFE_RANGE,
-#if defined(RGB_MATRIX_ENABLE)
-    RGB_RST, // Reset RGB
-    RGB_UND, // Toggle RGB underglow as layer indicator
-    RGB_ATG, // Toggle active RGB mode
-    RGB_PST, // Toggle simple passive RGB mode
-    RGB_PCT, // Toggle colorful passive RGB mode
-    RGB_IDL, // RGB Idling animations
-#endif
-    TYPING, // Switch to Colemak layer
-    GAMING, // Switch to gaming Colemak layer
-    WASD    // Switch to gaming with WASD positions
-};
-
-// Layer toggle and switch
-#define T_NAV TT(_NAV)
-#define S_NAV MO(_NAV)
-
-#define T_SYM TT(_SYM)
-#define S_SYM MO(_SYM)
-
-// Layer keys with functionality on tap
-#define NAV_0 LT(_NAV, KC_0)
-#define TAB_NUM LT(_NUMPAD, KC_TAB)
-#define LCK_NMP TG(_NUMPAD)
-#define S_NUM MO(_NUMPAD)
-
-#define EXTALT LT(_GAMING_EXT, KC_LALT)
-
-// Tap/mod keys
-#define RCTL_BR RCTL_T(KC_RBRC)
-#define LCTL_BR LCTL_T(KC_LBRC)
-
-#define SFT_SPC LSFT_T(KC_SPACE)
-#define SFT_ENT RSFT_T(KC_ENTER)
-
-// Global tab forward and backward
-#define TAB_FWD LCTL(KC_TAB)
-#define TAB_BCK LCTL(LSFT(KC_TAB))
-#define TAB_CLS LCTL(KC_W)
-
-#define WIN_CLS LALT(KC_F4)
-
-// €
-#define KC_EUR ALGR(KC_5)
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rules.mk b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
deleted file mode 100644
index 9620e41253a..00000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/rules.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#This enables Link Time Optimization.This can save a good chunk of space(several KB for me), but the macro and function... functions cause it to error out.
-LTO_ENABLE = yes
-
-#Build Options
-#change to "no" to disable the options, or define them in the Makefile in
-#the appropriate keymap folder that will get included automatically
-#
-EXTRAKEY_ENABLE    = yes  # Audio control and System control(+450)
-NKRO_ENABLE        = yes  # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-DYNAMIC_MACRO_ENABLE = no
-
-MOUSEKEY_ENABLE    = no   # Mouse keys(+4700)
-RGBLIGHT_ENABLE    = no   # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE   = no   # Virtual DIP switch configuration(+1000)
-CONSOLE_ENABLE     = no   # Console for debug(+400)
-COMMAND_ENABLE     = no   # Commands for debug and configuration
-BACKLIGHT_ENABLE   = no   # Enable keyboard backlight functionality
-MIDI_ENABLE        = no   # MIDI controls
-AUDIO_ENABLE       = no   # Audio output on port C6
-UNICODE_ENABLE     = no   # Unicode
-BLUETOOTH_ENABLE   = no   # Enable Bluetooth with the Adafruit EZ-Key HID
-SWAP_HANDS_ENABLE  = no   # Enable one-hand typing
-GRAVE_ESC_ENABLE   = no
-MAGIC_ENABLE       = no
-MUSIC_ENABLE       = no
-
-RGB_MATRIX_ENABLE = yes
-
-#Do not enable SLEEP_LED_ENABLE.it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE   = no    # Breathing sleep LED during USB suspend
-
-BOOTLOADER       = qmk-dfu
-
-OLED_ENABLE = yes
-
-DEBOUNCE_TYPE = sym_eager_pk
-
-ifeq ($(strip $(THEME)), godspeed)
-    OPT_DEFS += -DTHEME_GODSPEED
-endif
-
-ifeq ($(strip $(THEME)), godspeed_ares)
-    OPT_DEFS += -DTHEME_GODSPEED_ARES
-endif
-
-ifeq ($(strip $(THEME)), pulse)
-    OPT_DEFS += -DTHEME_PULSE
-endif
-
-ifeq ($(strip $(THEME)), laser)
-    OPT_DEFS += -DTHEME_LASER
-endif
-
-ifeq ($(strip $(THEME)), milkshake)
-    OPT_DEFS += -DTHEME_MILKSHAKE
-endif
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-	SRC += rgb.c
-endif
-
-ifeq ($(strip $(OLED_ENABLE)), yes)
-	SRC+= oled.c
-endif
diff --git a/keyboards/crkbd/keymaps/sharkby7e/config.h b/keyboards/crkbd/keymaps/sharkby7e/config.h
deleted file mode 100644
index 50a42477650..00000000000
--- a/keyboards/crkbd/keymaps/sharkby7e/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-//#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200
-
-#ifdef RGBLIGHT_ENABLE
-    #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 RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/sharkby7e/keymap.c b/keyboards/crkbd/keymaps/sharkby7e/keymap.c
deleted file mode 100644
index a3d88e2c018..00000000000
--- a/keyboards/crkbd/keymaps/sharkby7e/keymap.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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 <stdio.h>
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = LAYOUT_split_3x5_3(
-  // \-----------------------------------------------------------------|   |--------------------------------------------------------------/
-           KC_Q,      KC_W,    LCTL_T(KC_F),      KC_P,         KC_B,         KC_J,         KC_L,       RCTL_T(KC_U),    KC_Y,    KC_BSPC,  
-  // \--------------+-------+----------------+--------------+----------|   | ---------+---------------+---------------+--------+----------/
-      LALT_T(KC_A),   KC_R,        KC_S,       LGUI_T(KC_T),    KC_G,         KC_M,     RGUI_T(KC_N),      KC_E,           KC_I,     KC_O,   
-  // \--------------+-------+----------------+--------------+----------|   | ---------+---------------+---------------+--------+----------/
-           KC_Z,      KC_X,        KC_C,          KC_D,         KC_V,         KC_K,         KC_H,         KC_COMM,      KC_DOT,   KC_SLSH,  
-  // \--------------+-------+----------------+--------------+----------|   | ---------+---------------+---------------+--------+----------/
-                              RCTL_T(KC_ESC),     MO(1),       SC_LSPO,       KC_SPC,       MO(2),     MEH_T(KC_TAB)
-//                           \---------------+--------------+----------|   |----------+---------------+--------------/
-
-  ),
-
-  [1] = LAYOUT_split_3x5_3(
-  // \--------------------------------------------------|   |----------------------------------------------------------/
-       KC_GRV,   KC_TILD,  KC_PEQL,  KC_UNDS,  KC_PIPE,       KC_PPLS,     KC_7,          KC_8,       KC_9,    KC_BSPC, 
-  // \---------+---------+---------+---------+----------|   |---------+--------------+--------------+--------+---------/
-       KC_LBRC,  KC_RBRC,  KC_LCBR,  KC_RCBR,  KC_RPRN,       KC_PMNS,  RGUI_T(KC_4),  RCTL_T(KC_5),  KC_6,    KC_QUOT, 
-  // \---------+---------+---------+---------+----------|   |---------+--------------+--------------+--------+---------/
-       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_BSLS,       KC_SCLN,     KC_1,          KC_2,       KC_3,    KC_0, 
-  // \---------+---------+---------+---------+----------|   |---------+--------------+--------------+--------+---------/
-                   RCTL_T(KC_ESC),  _______,   KC_TRNS,       KC_RSFT,     MO(3),         KC_NO
-  //             \----------------+---------+-----------|   |---------+--------------+-------------/
-  ),
-
-  [2] = LAYOUT_split_3x5_3(
-  // \----------------------------------------------|   |-----------------------------------------------/
-       KC_ESC,  KC_NO,   KC_COMM,  KC_DOT,  KC_NO,        KC_NO,    KC_NO,    KC_ENT,  KC_NO,   KC_DEL,
-  // \--------+--------+---------+--------+---------|   |---------+---------+--------+---------+--------/
-       KC_TAB,  KC_NO,    KC_NO,   KC_NO,   KC_NO,        KC_LEFT,  KC_DOWN,  KC_UP,  KC_RIGHT, KC_NO,  
-  // \--------+--------+---------+--------+---------|   |---------+---------+--------+---------+--------/
-       XXXXXXX, KC_NO,    KC_NO,   KC_NO,   KC_NO,        KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO, 
-  // \--------+--------+---------+--------+---------|   |---------+---------+--------+---------+--------/
-                         KC_LGUI,  MO(3),   KC_LSFT,      KC_TRNS,  KC_TRNS, KC_RALT
-  //                    \--------+--------+---------|   |---------+---------+-------/
-  ),
-
-  [3] = LAYOUT_split_3x5_3(
-  // \--------------------------------------------.                    ,---------------------------------------------|
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  // \--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+---------|
-      RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  // \--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+---------|
-      RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  // \--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+---------|
-                      KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
-  //                 \---------------'  `--------------------------'
-  ),
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-#define L_BASE 0
-#define L_LOWER 2
-#define L_RAISE 4
-#define L_ADJUST 8
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("Default"), false);
-            break;
-        case L_LOWER:
-            oled_write_ln_P(PSTR("Lower"), false);
-            break;
-        case L_RAISE:
-            oled_write_ln_P(PSTR("Raise"), false);
-            break;
-        case L_ADJUST:
-        case L_ADJUST|L_LOWER:
-        case L_ADJUST|L_RAISE:
-        case L_ADJUST|L_LOWER|L_RAISE:
-            oled_write_ln_P(PSTR("Adjust"), false);
-            break;
-    }
-}
-
-
-char keylog_str[24] = {};
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-  if (keycode < 60) {
-    name = code_to_name[keycode];
-  }
-
-  // update keylog
-  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-
-void oled_render_keylog(void) {
-    oled_write(keylog_str, false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_render_keylog();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    set_keylog(keycode, record);
-  }
-  return true;
-}
-#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/sharkby7e/rules.mk b/keyboards/crkbd/keymaps/sharkby7e/rules.mk
deleted file mode 100644
index 17406603fe2..00000000000
--- a/keyboards/crkbd/keymaps/sharkby7e/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-OLED_ENABLE     = yes
-LTO_ENABLE      = yes
-BOOTLOADER = caterina
diff --git a/keyboards/crkbd/keymaps/soundmonster/README.md b/keyboards/crkbd/keymaps/soundmonster/README.md
deleted file mode 100644
index 8b271cbbbad..00000000000
--- a/keyboards/crkbd/keymaps/soundmonster/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Soundmonster's layout for Corne
-
-Features:
-
-* Modern OLED support (many thanks to @drashna):
-  * Proper orientation
-  * Graphic layer indicator ↑ ↓
-  * Graphic modifier indicator ⌘ ⇧ ⌥  ⌃
-* Similar enough to the default keymap so you can easily port your custom keymap to it
-* Mac-friendly (Command and Option on the thumbs)
-* Vim-friendly (Esc, `:` and Ctrl on the thumbs)
-* Full per-key RGB Matrix support out of the box (you still have to go through the nightmare of soldering yourself though 😉)
-
diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h
deleted file mode 100644
index 97614f3b703..00000000000
--- a/keyboards/crkbd/keymaps/soundmonster/config.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-// #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 150
-#define RETRO_TAPPING
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-    #define RGBLED_NUM 27
-#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 RGBLIGHT_SLEEP
-    #define RGBLIGHT_SPLIT
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-
-#ifdef OLED_ENABLE
-#   define SPLIT_LAYER_STATE_ENABLE
-#   define SPLIT_LED_STATE_ENABLE
-#   define SPLIT_MODS_ENABLE
-#   define SPLIT_OLED_ENABLE
-#   define OLED_FONT_H "keyboards/crkbd/keymaps/soundmonster/glcdfont.c"
-#   define OLED_TIMEOUT 30000
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash.
-#   define RGB_MATRIX_HUE_STEP 8
-#   define RGB_MATRIX_SAT_STEP 8
-#   define RGB_MATRIX_VAL_STEP 8
-#   define RGB_MATRIX_SPD_STEP 10
-
-/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
- * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-#   define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#   define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#   define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#   define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#   define ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/crkbd/keymaps/soundmonster/glcdfont.c b/keyboards/crkbd/keymaps/soundmonster/glcdfont.c
deleted file mode 100644
index 588ecfd8c88..00000000000
--- a/keyboards/crkbd/keymaps/soundmonster/glcdfont.c
+++ /dev/null
@@ -1,232 +0,0 @@
-#include "progmem.h"
-
-// Corne 8x6 font with QMK Firmware Logo
-// Online editor: https://helixfonteditor.netlify.com/
-// See also: https://github.com/soundmonster/glcdfont_converter
-
-const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8,
-0xF8, 0x18, 0x00, 0xC0, 0xF0, 0xFC,
-0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0xFF, 0x7E, 0x00, 0x00, 0x00,
-0x00, 0xF8, 0x04, 0x22, 0x52, 0xE2,
-0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
-0x22, 0x22, 0x42, 0x82, 0x02, 0x02,
-0x22, 0x22, 0x02, 0x04, 0xF8, 0x00,
-0x00, 0xF8, 0x04, 0x02, 0x02, 0x82,
-0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
-0x02, 0x82, 0x42, 0x22, 0x12, 0x22,
-0x42, 0x82, 0x02, 0x04, 0xF8, 0x00,
-0x00, 0xF8, 0xFC, 0xDE, 0xAE, 0x1E,
-0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
-0xDE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-0xDE, 0xDE, 0xFE, 0xFC, 0xF8, 0x00,
-0x00, 0xF8, 0xFC, 0xFE, 0xFE, 0x7E,
-0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
-0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
-0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
-0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
-0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
-0x00, 0xF8, 0xFC, 0xFE, 0xFF, 0xE0,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F,
-0x07, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x20, 0x44, 0x4A, 0x47,
-0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
-0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
-0x44, 0x44, 0x40, 0x20, 0x1F, 0x00,
-0x00, 0x1F, 0x20, 0x40, 0x41, 0x40,
-0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
-0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
-0x4F, 0x41, 0x41, 0x20, 0x1F, 0x00,
-0x00, 0x1F, 0x3F, 0x7B, 0x75, 0x78,
-0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
-0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
-0x7B, 0x7B, 0x7F, 0x3F, 0x1F, 0x00,
-0x00, 0x1F, 0x3F, 0x7F, 0x7E, 0x7F,
-0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
-0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
-0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
-0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
-0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
-0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
-0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
-0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
-0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
-0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
-0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
-0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
-0x00, 0x03, 0x0F, 0x1F, 0x3F, 0x3F,
-0x3F, 0x3F, 0x1F, 0x1F, 0x3F, 0x3F,
-0x7F, 0x7F, 0x7F, 0x3F, 0x3F, 0x1F,
-0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7C,
-0x78, 0x78, 0x38, 0x1C, 0x0F, 0x00,
-0x04, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-0x20, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-0xFC, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-0x04, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-0x20, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-0xFC, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-0xFE, 0x7E, 0xBE, 0xDE, 0xEE, 0xDE,
-0xBE, 0x7E, 0xFE, 0xFC, 0xF8, 0x00,
-0x7E, 0x7E, 0x70, 0x77, 0x77, 0x77,
-0x70, 0x7E, 0x7E, 0x3F, 0x1F, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
-0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
-0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
-0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
-0x03, 0x02, 0x01, 0x01, 0x00, 0x00
-};
diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
deleted file mode 100644
index 054ac771910..00000000000
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright 2022 Soundmonster (@soundmonster)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-// Custom keycodes for layer keys
-// Dual function escape with left command
-#define KC_LGESC LGUI_T(KC_ESC)
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  RGBRST,
-  KC_RACL // right alt / colon
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------.                ,---------------------------------------------.
-     KC_TAB,  KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,                   KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  KC_BSPC,
-  //|------+------+------+------+------+------|                |------+------+-------+------+-------+--------|
-    KC_LCTL,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,                   KC_H,  KC_J,  KC_K,  KC_L, KC_SCLN,KC_QUOT,
-  //|------+------+------+------+------+------|                |------+------+-------+------+-------+--------|
-    SC_LSPO,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,                   KC_N,  KC_M,KC_COMM,KC_DOT,KC_SLSH,SC_RSPC,
-  //|------+------+------+------+------+------+------|  |------+------+------+-------+------+-------+--------|
-                               KC_LGESC,LOWER, KC_SPC,   RCTL_T(KC_ENT), RAISE, KC_RACL
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_LOWER] = LAYOUT_split_3x6_3(
-  //,---------------------------------------------.                ,-----------------------------------------.
-     KC_ESC,  KC_1, KC_2,   KC_3,   KC_4,   KC_5,                    KC_6,  KC_7,  KC_8,  KC_9,  KC_0, KC_DEL,
-  //|------+------+-------+-------+-------+-------|                |------+------+------+------+------+------|
-    KC_LCTL, KC_NO,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,                KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_NO,KC_NO,
-  //|------+------+-------+-------+-------+-------|                |------+------+------+------+------+------|
-    KC_LSFT, KC_NO,KC_BTN2,KC_WH_D,KC_WH_U,KC_BTN1,                KC_HOME,KC_PGDN,KC_PGUP,KC_END,KC_NO,KC_NO,
-  //|------+------+-------+-------+-------+-------+------|  |------+------+------+------+------+------+------|
-                                    KC_LGUI, LOWER,KC_SPC,   KC_ENT, RAISE,KC_RALT
-                                  //`--------------------'  `--------------------'
-  ),
-
-  [_RAISE] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------.                ,-----------------------------------------.
-     KC_ESC,KC_EXLM,KC_AT,KC_HASH,KC_DLR,KC_PERC,              KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_BSPC,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-    KC_LCTL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,                KC_MINS,KC_EQL,KC_LCBR,KC_RCBR,KC_PIPE,KC_GRV,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-    KC_LSFT, KC_F6, KC_F7, KC_F8, KC_F9,KC_F10,                KC_UNDS,KC_PLUS,KC_LBRC,KC_RBRC,KC_BSLS,KC_TILD,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                KC_LGUI, LOWER,KC_SPC,   KC_ENT, RAISE,KC_RALT
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------.                ,-----------------------------------------.
-      QK_BOOT,RGBRST, KC_NO, KC_NO, KC_NO, KC_NO,                  KC_NO,KC_MUTE,  KC_NO, KC_NO, KC_NO, KC_NO,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-    RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,KC_NO,               KC_PAUSE,KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-    RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD,KC_NO,               KC_SCRL,KC_VOLD, KC_NO, KC_NO, KC_NO, RGB_RMOD,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                KC_LGUI, LOWER,KC_SPC,   KC_ENT, RAISE,KC_RALT
-                              //`--------------------'  `--------------------'
-  )
-};
-
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
-
-void render_space(void) {
-    oled_write_P(PSTR("     "), false);
-}
-
-void render_mod_status_gui_alt(uint8_t modifiers) {
-    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
-    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
-    static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
-    static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
-
-    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
-    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
-    static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
-    static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_1, false);
-    } else {
-        oled_write_P(gui_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_1, false);
-    } else {
-        oled_write_P(alt_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_2, false);
-    } else {
-        oled_write_P(gui_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_2, false);
-    } else {
-        oled_write_P(alt_off_2, false);
-    }
-}
-
-void render_mod_status_ctrl_shift(uint8_t modifiers) {
-    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
-    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
-    static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
-    static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
-
-    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
-    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
-    static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
-    static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_1, false);
-    } else {
-        oled_write_P(ctrl_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_1, false);
-    } else {
-        oled_write_P(shift_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_2, false);
-    } else {
-        oled_write_P(ctrl_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_2, false);
-    } else {
-        oled_write_P(shift_off_2, false);
-    }
-}
-
-void render_logo(void) {
-    static const char PROGMEM corne_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0};
-    oled_write_P(corne_logo, false);
-    oled_write_P(PSTR("corne"), false);
-}
-
-void render_layer_state(void) {
-    static const char PROGMEM default_layer[] = {
-        0x20, 0x94, 0x95, 0x96, 0x20,
-        0x20, 0xb4, 0xb5, 0xb6, 0x20,
-        0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
-    static const char PROGMEM raise_layer[] = {
-        0x20, 0x97, 0x98, 0x99, 0x20,
-        0x20, 0xb7, 0xb8, 0xb9, 0x20,
-        0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
-    static const char PROGMEM lower_layer[] = {
-        0x20, 0x9a, 0x9b, 0x9c, 0x20,
-        0x20, 0xba, 0xbb, 0xbc, 0x20,
-        0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
-    static const char PROGMEM adjust_layer[] = {
-        0x20, 0x9d, 0x9e, 0x9f, 0x20,
-        0x20, 0xbd, 0xbe, 0xbf, 0x20,
-        0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
-    if(layer_state_is(_ADJUST)) {
-        oled_write_P(adjust_layer, false);
-    } else if(layer_state_is(_LOWER)) {
-        oled_write_P(lower_layer, false);
-    } else if(layer_state_is(_RAISE)) {
-        oled_write_P(raise_layer, false);
-    } else {
-        oled_write_P(default_layer, false);
-    }
-}
-
-bool oled_task_user(void) {
-    // Renders the current keyboard state (layers and mods)
-    render_logo();
-    render_space();
-    render_layer_state();
-    render_space();
-    render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
-    render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-    return false;
-}
-
-#endif
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  static uint16_t my_colon_timer;
-
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-    case KC_RACL:
-        if (record->event.pressed) {
-          my_colon_timer = timer_read();
-          register_code(KC_RALT);
-        } else {
-          unregister_code(KC_RALT);
-          if (timer_elapsed(my_colon_timer) < TAPPING_TERM) {
-            SEND_STRING(":"); // Change the character(s) to be sent on tap here
-          }
-        }
-        return false;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      #ifdef RGB_MATRIX_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgb_matrix_default();
-          rgb_matrix_enable();
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
-#ifdef RGB_MATRIX_ENABLE
-
-void suspend_power_down_keymap(void) {
-    rgb_matrix_set_suspend_state(true);
-}
-
-void suspend_wakeup_init_keymap(void) {
-    rgb_matrix_set_suspend_state(false);
-}
-
-#endif
diff --git a/keyboards/crkbd/keymaps/soundmonster/rules.mk b/keyboards/crkbd/keymaps/soundmonster/rules.mk
deleted file mode 100644
index d95e1136bbb..00000000000
--- a/keyboards/crkbd/keymaps/soundmonster/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-RGBLIGHT_ENABLE    = no
-RGB_MATRIX_ENABLE  = yes
-MOUSEKEY_ENABLE    = no
-NKRO_ENABLE        = yes
-OLED_ENABLE        = yes
-LTO_ENABLE         = yes
diff --git a/keyboards/crkbd/keymaps/sulrich/README.md b/keyboards/crkbd/keymaps/sulrich/README.md
deleted file mode 100644
index 0bb585aa2ea..00000000000
--- a/keyboards/crkbd/keymaps/sulrich/README.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# sulrich crkbd layout
-
-this is the personal keyboard layout of [@sulrich](https://github.com/sulrich),
-and is heavily oriented towards operation in the Mac OS environment.
-
-there are no LED rules in this keymap and the OLED display uses the default
-corne images
-
-## layout notes
-
-this layout uses a standard QWERTY layout on the default layer followed by a
-separate layer for symbols and numbers (and F-keys)
-
-### thumb cluster: left
-
-this contains the Mac OS modifier keys as well as the enter key.  these are
-transparently mapped through the remaining layers with the exception of the
-enter key which is toggled to backspace on the symbols layer.  
-
-### thumb cluster: right
-
-the largest right thumb button provides the space and the layer toggles.
-
-### default layer
-```text
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-          TAB,       Q,       W,       E,       R,       T,                            Y,       U,       I,       O,      P,        \,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         LCTL,       A,       S,       D,       F,       G,                            H,       J,       K,       L,       ;,       ',
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         LSFT,       Z,       X,       C,       V,       B,                            N,       M,       ,,       .,       /,    RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                             OPT,      CMD,   ENTER,        SPC,   MO(1),   MO(2)
-                                      //`--------------------------'  `--------------------------'
-```
-
-### symbols layer [1]
-
-this layer contains all of the standard symbols.  the arrow keys are mapped to
-the default vi bindings for single character motion (h, j, k, l). 
-
-```text
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-          ESC,       !,       @,       {,       },       |,                            ^,       +,       =,       -,       *,        ,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-             ,       #,     $,         (,       ),       `,                         LEFT,    DOWN,      UP,   RIGHT,        ,   ENTER,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-             ,       %,       ^,       [,       ],       ~,                            _,       &,       <,       >,      \,         ,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                             OPT,      CMD,  BSPACE,        SPC,   MO(1),   MO(2)
-                                      //`--------------------------'  `--------------------------'
-```
-
-### number/media layer [2]
-
-this layer has all of the numbers and the F-keys mapped to reasonably intuitive
-locations.  additionally, media controls allow for quick access to volume and
-track changes.
-
-```text
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-          ESC,      F1,      F2,      F3,      F4,      F5,                           F6,      F7,      F8,      F9,     F10,     F11,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-             ,       1,       2,       3,       4,       5,                            6,       7,       8,       9,       0,     F12,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-             ,    PREV,    PLAY,    NEXT,  VOL_DN,  VOL_UP,                             ,    MUTE,        ,        ,        ,        ,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                             OPT,      CMD,   ENTER,        SPC,   MO(1),   MO(2)
-                                      //`--------------------------'  `--------------------------'
-
-```
-
diff --git a/keyboards/crkbd/keymaps/sulrich/config.h b/keyboards/crkbd/keymaps/sulrich/config.h
deleted file mode 100644
index 616b2afd98a..00000000000
--- a/keyboards/crkbd/keymaps/sulrich/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* select hand configuration */
-#define MASTER_LEFT
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-#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 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/sulrich/keymap.c b/keyboards/crkbd/keymaps/sulrich/keymap.c
deleted file mode 100644
index adab2b68aec..00000000000
--- a/keyboards/crkbd/keymaps/sulrich/keymap.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-Copyright 2021 @sulrich <sulrich@botwerks.org>
-
-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_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSLS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      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, KC_RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LOPT, KC_LGUI,  KC_ENT,     KC_SPC,   MO(1),  MO(2)
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [1] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC, KC_EXLM,   KC_AT, KC_LCBR, KC_RCBR, KC_PIPE,                      KC_CIRC, KC_PLUS,KC_EQUAL,KC_MINUS, KC_ASTR, KC_TRNS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_TRNS, KC_HASH,  KC_DLR, KC_LPRN, KC_RPRN,KC_GRAVE,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, KC_TRNS,KC_ENTER,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                      KC_UNDS, KC_AMPR, KC_LABK, KC_RABK,KC_BSLS,KC_TRNS,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS, KC_TRNS,KC_BSPC,     KC_TRNS, KC_TRNS, KC_TRNS
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [2] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       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_TRNS,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU,                      KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_TRNS, KC_TRNS,  KC_ENT,    KC_TRNS, KC_TRNS, KC_TRNS
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-#define L_BASE 0
-#define L_SYMBOLS 2
-#define L_NUMBERS 4
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("default"), false);
-            break;
-        case L_SYMBOLS:
-            oled_write_ln_P(PSTR("symbols"), false);
-            break;
-        case L_NUMBERS:
-            oled_write_ln_P(PSTR("numbers/media"), false);
-            break;
-   }
-}
-
-
-char keylog_str[24] = {};
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-  if (keycode < 60) {
-    name = code_to_name[keycode];
-  }
-
-  // update keylog
-  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-
-void oled_render_keylog(void) {
-    oled_write(keylog_str, false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_render_keylog();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    set_keylog(keycode, record);
-  }
-  return true;
-}
-#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/sulrich/rules.mk b/keyboards/crkbd/keymaps/sulrich/rules.mk
deleted file mode 100644
index 61b07ad0dfa..00000000000
--- a/keyboards/crkbd/keymaps/sulrich/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRAKEY_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/config.h b/keyboards/crkbd/keymaps/thumb_ctrl/config.h
deleted file mode 100755
index 4191a14524b..00000000000
--- a/keyboards/crkbd/keymaps/thumb_ctrl/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 150
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c b/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
deleted file mode 100755
index e2557b53fb3..00000000000
--- a/keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
+++ /dev/null
@@ -1,226 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_names {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  RGBRST
-};
-
-#define KC_ KC_TRNS
-#define KC______ KC_TRNS
-#define KC_XXXXX KC_NO
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_RST   QK_BOOT
-#define KC_LRST  RGBRST
-#define KC_LTOG  RGB_TOG
-#define KC_LHUI  RGB_HUI
-#define KC_LHUD  RGB_HUD
-#define KC_LSAI  RGB_SAI
-#define KC_LSAD  RGB_SAD
-#define KC_LVAI  RGB_VAI
-#define KC_LVAD  RGB_VAD
-#define KC_LMOD  RGB_MOD
-#define KC_CTLTB CTL_T(KC_TAB)
-#define KC_GUIEI GUI_T(KC_LNG2)
-#define KC_ALTKN ALT_T(KC_LNG1)
-#define KC_CTLEN CTL_T(KC_LNG2)    // for Linux and Windows
-#define KC_GUIEN GUI_T(KC_LNG2)    // for Mac
-#define KC_SFTJP SFT_T(KC_LNG1)
-#define KC_ALTSP ALT_T(KC_SPACE)
-#define KC_ALTDL ALT_T(KC_DEL)
-
-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_BSPC,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_CTLTB,     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_ALTSP, KC_LOWER, KC_GUIEN,    KC_SFTJP, KC_RAISE, KC_ALTDL
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-       _______,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,  _______,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       _______,  KC_HOME,   KC_END,  KC_PGDN,  KC_PGUP,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,   KC_F12,  KC_PIPE,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       _______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                     KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  _______,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                   _______,  _______,  _______,     _______,  _______, _______
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-       _______,  KC_EXLM,    KC_AT,  KC_HASH,   KC_DLR,  KC_PERC,                   KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       _______, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,  KC_PSCR,                    KC_GRV,  KC_MINS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_BSLS,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       _______, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,                   KC_TILD,  KC_UNDS,   KC_EQL,  KC_LBRC,  KC_RBRC,  _______,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                   _______,  _______,  _______,     _______,  _______, _______
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-        KC_RST,  KC_LRST, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       KC_LTOG,  KC_LHUI,  KC_LSAI,  KC_LVAI, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       KC_LMOD,  KC_LHUD,  KC_LSAD,  KC_LVAD, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  KC_GUIEI, KC_LOWER,   KC_SPC,      KC_ENT, KC_RAISE, KC_ALTKN
-                              //`--------------------'  `--------------------'
-  )
-};
-
-int RGB_current_mode;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
-
-#ifdef OLED_ENABLE
-
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    oled_write_ln(read_keylog(), false);
-    oled_write_ln(read_keylogs(), false);
-    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
-    //oled_write_ln(read_host_led_state(), false);
-    //oled_write_ln(read_timelog(), false);
-  } else {
-    oled_write(read_logo(), false);
-  }
-  return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk b/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
deleted file mode 100755
index d3bbc97a236..00000000000
--- a/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-OLED_ENABLE     = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/config.h b/keyboards/crkbd/keymaps/thunderbird2086/config.h
deleted file mode 100644
index 8251bc9b8fc..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/config.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2021 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define EE_HANDS
-#define SPLIT_USB_DETECT
-
-// #define RGB_LAYER_ENABLE
-
-#define PERMISSIVE_HOLD
-
-#if defined(TAPPING_TERM)
-#   undef TAPPING_TERM
-#endif
-#define TAPPING_TERM 200
-#define VER_NEWLINE_WAIT 200 // in milliseconds
-
-#define NO_ACTION_ONESHOT
-
-#if defined(OLED_ENABLE)
-#   define SPLIT_LAYER_STATE_ENABLE
-#   define SPLIT_LED_STATE_ENABLE
-#   define SPLIT_MODS_ENABLE
-#   define SPLIT_OLED_ENABLE
-#   define OLED_FONT_H "keyboards/crkbd/keymaps/thunderbird2086/glcdfont.c"
-#    undef OLED_TIMEOUT
-        //  due to timer_read() for render_prompt(), we have own implementation of oled time out
-#   define OLED_KEY_TIMEOUT 30000
-#   define KEY_LOG_ENABLE
-#endif
-
-#define RGBLIGHT_SLEEP
-
-#if defined(RGBLIGHT_ENABLE)
-#    define RGBLIGHT_LAYERS
-#    define RGBLIGHT_LIMIT_VAL 150
-#    define RGBLIGHT_HUE_STEP 16
-#    define RGBLIGHT_SAT_STEP 32
-#    define RGBLIGHT_VAL_STEP 32
-
-#    define RGBLIGHT_EFFECT_ALTERING
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_CHRISTMAS
-#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_RGB_TEST
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
-#if defined(RGB_MATRIX_ENABLE)
-#   define SPLIT_LAYER_STATE_ENABLE
-#   define RGB_MATRIX_KEYPRESSES                // reacts to keypresses
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
-#   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-        // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#   define RGB_MATRIX_HUE_STEP 32
-#   define RGB_MATRIX_SAT_STEP 64
-#   define RGB_MATRIX_VAL_STEP 64
-#   define RGB_MATRIX_SPD_STEP 20
-#   define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-
-/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
- * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-#   define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#   define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#   define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_HUE_BREATHING
-#    undef ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    undef ENABLE_RGB_MATRIX_HUE_WAVE
-#    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#   define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#   define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#     undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#     undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#     undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#     undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#     undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#     undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#     undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#     undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#     undef ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#     undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#     undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/glcdfont.c b/keyboards/crkbd/keymaps/thunderbird2086/glcdfont.c
deleted file mode 100644
index 97dc8fdaa3c..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/glcdfont.c
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright 2021 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-// https://helixfonteditor.netlify.com/
-
-#include "progmem.h"
-
-// clang-format off
-// Standard ASCII 5x7 font
-static const unsigned char PROGMEM font[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-    0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-    0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-    0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-    0x00, 0x00, 0x00, 0x20, 0x20, 0xF8,
-    0x0C, 0x04, 0xE7, 0xE4, 0xE4, 0x07,
-    0x04, 0xE4, 0xE7, 0xE4, 0x04, 0x07,
-    0xE4, 0xE4, 0xE7, 0x04, 0x0C, 0xF8,
-    0x20, 0x20, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-    0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-    0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-    0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-    0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
-    0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
-    0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-    0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-    0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-    0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
-    0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
-    0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x30,
-    0x18, 0x0C, 0x06, 0x0C, 0x18, 0x30,
-    0x00, 0x77, 0x55, 0x7F, 0x14, 0x7F,
-    0x55, 0x77, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x08, 0x00, 0x00,
-    0x00, 0x00, 0x08, 0x00, 0x00, 0x60,
-    0x70, 0x3E, 0x1F, 0x19, 0x18, 0x0C,
-    0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x08, 0x08, 0x08, 0x00,
-    0x00, 0x08, 0x08, 0x08, 0x00, 0x1C,
-    0x22, 0x41, 0x41, 0x41, 0x22, 0x1C,
-    0x00, 0x08, 0x08, 0x08, 0x00, 0x00,
-    0x08, 0x08, 0x08, 0x00, 0x00, 0x00,
-    0x08, 0x0C, 0x5E, 0x5F, 0x5E, 0x0C,
-    0x00, 0x00, 0x00, 0x49, 0x49, 0xFF,
-    0x00, 0x00, 0x0F, 0x1F, 0x3F, 0x38,
-    0x30, 0xFF, 0xFF, 0xFF, 0x30, 0x38,
-    0x3F, 0x1F, 0x0F, 0x00, 0x00, 0xFF,
-    0x49, 0x49, 0x00, 0x00, 0x00, 0x00,
-    0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
-    0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
-    0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
-    0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
-    0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
-    0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
-    0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
-    0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
-    0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
-    0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
-    0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
-    0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
-    0x00, 0x00, 0x00, 0x06, 0x06, 0x06,
-    0x0C, 0x18, 0x30, 0x66, 0x66, 0x66,
-    0x08, 0x0C, 0x7E, 0x7F, 0x7E, 0x0C,
-    0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xF0, 0x90, 0x90, 0xF0, 0x90, 0x90,
-    0xF0, 0x98, 0x9C, 0xF2, 0x22, 0x21,
-    0xE1, 0x01, 0x01, 0x01, 0xF1, 0x91,
-    0x91, 0xFA, 0x4C, 0x4C, 0xF8, 0x48,
-    0x48, 0xF8, 0x48, 0x48, 0xF8, 0x00,
-    0x00, 0x00, 0x1C, 0x22, 0x41, 0x00,
-    0x00, 0x1C, 0x22, 0x00, 0x00, 0x1C,
-    0x3E, 0x7F, 0x63, 0x41, 0x22, 0x1C,
-    0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-    0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x02, 0x02, 0x0F,
-    0x18, 0x10, 0x70, 0x10, 0x10, 0x70,
-    0x10, 0x13, 0x73, 0x13, 0x10, 0x70,
-    0x10, 0x10, 0x70, 0x10, 0x18, 0x0F,
-    0x02, 0x02, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-    0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-    0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
-    0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
-    0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
-    0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
-    0x03, 0x02, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x1C, 0x22, 0xC9, 0xD1,
-    0xC9, 0x22, 0x1C, 0x00, 0x00, 0x00,
-    0x00, 0x10, 0x02, 0x39, 0xFC, 0xED,
-    0xFC, 0x38, 0x02, 0x10, 0x00, 0x00,
-    0x07, 0x04, 0x04, 0x07, 0x04, 0x04,
-    0x07, 0x04, 0x04, 0x0F, 0x09, 0x09,
-    0x0F, 0x00, 0x00, 0x00, 0x07, 0x04,
-    0x04, 0x07, 0x02, 0x02, 0x03, 0x02,
-    0x02, 0x03, 0x02, 0x02, 0x03, 0x00,
-    0x00, 0x00, 0x00, 0x08, 0x00, 0x00,
-    0x00, 0x00, 0x08, 0x00, 0x00, 0x1C,
-    0x22, 0x41, 0x63, 0x7F, 0x3E, 0x1C,
-    0x00, 0x00, 0x22, 0x1C, 0x00, 0x00,
-    0x41, 0x22, 0x1C, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-// clang-format on
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/keycodes.h b/keyboards/crkbd/keymaps/thunderbird2086/keycodes.h
deleted file mode 100644
index 90b26b88a4e..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/keycodes.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2021 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-enum custom_keycodes {
-    // Layer Macros
-    COLEMAK = QK_USER,
-    QWERTY,
-    FUNCTION,
-    CODE,
-    ADJUST,
-#   if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-    RGBRST,
-#   endif
-    VRSN,
-    // Secret Macros
-    M_XXX1,
-    M_XXX2,
-    M_XXX3,
-    M_XXX4,
-    M_XXX5,
-};
-
-
-enum layers {
-    _COLEMAK,
-    _QWERTY,
-    _FUNCTION,
-    _CODE,
-    _ADJUST,
-    _SECRET,
-};
-
-// Shortcut Keys
-#define K_BACK      LGUI(KC_LBRC)           // browser back
-#define K_FWRD      LGUI(KC_RBRC)           // browser forward
-#define K_LOCK      LGUI(LCTL(KC_Q))        // Lock screen
-#define K_CSCN      LGUI(LCTL(LSFT(KC_4)))  // Copy a portion of the screen to the clipboard
-#define K_MDSH      LSFT(LALT(KC_MINS))
-
-// Layer Keys
-#define FCT_BSP     LT(_FUNCTION, KC_BSPC)
-#define FCT_DEL     LT(_FUNCTION, KC_DEL)
-
-#define FCT_ENT     LT(_FUNCTION, KC_ENT)
-#define RAI_ENT     LT(_CODE    , KC_ENT)
-
-#define FCT_EQL     LT(_FUNCTION, KC_EQL)
-#define RAI_EQL     LT(_CODE    , KC_EQL)
-
-#define FCT_SPC     LT(_FUNCTION, KC_SPC)
-#define RAI_SPC     LT(_CODE    , KC_SPC)
-
-#define FCT_TAB     LT(_FUNCTION, KC_TAB)
-
-#define ADJ_EQL     LT(_ADJUST, KC_EQL)
-#define ADJ_GRV     LT(_ADJUST, KC_GRV)
-
-// Mod-Tap Keys
-#define SFT_SLSH    MT(MOD_RSFT, KC_SLSH)
-#define SFT_Z       MT(MOD_LSFT, KC_Z)
-
-#define CTL_QUOT    MT(MOD_RCTL, KC_QUOT)
-#define CTL_SCLN    MT(MOD_RCTL, KC_SCLN)
-#define CTL_A       MT(MOD_LCTL, KC_A)
-#define CTL_O       MT(MOD_LCTL, KC_O)
-
-#define M_LOPT_F    MT(MOD_LALT, KC_F)
-#define M_LOPT_T    MT(MOD_LALT, KC_T)
-#define RCMD_J      MT(MOD_LGUI, KC_J)
-#define RCMD_N      MT(MOD_RGUI, KC_N)
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/keymap.c b/keyboards/crkbd/keymaps/thunderbird2086/keymap.c
deleted file mode 100644
index 69c5d25fd44..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2021 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "layers_block.h"
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_COLEMAK] = LAYOUT_wrapper(
-  // +---------+---------+---------+---------+---------+---------+      +---------+---------+---------+---------+---------+---------+
-       T_TAB   , ___________________COLEMAK_DH_L1_______________ ,        ___________________COLEMAK_DH_R1_______________ , KC_MINS ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       KC_LCTL , ___________________COLEMAK_DH_L2_______________ ,        ___________________COLEMAK_DH_R2_______________ , CTL_QUOT,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       KC_LSFT , ___________________COLEMAK_DH_L3_______________ ,        ___________________COLEMAK_DH_R3_______________ , ADJ_EQL ,
-  // +---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------+
-                                     _________MOD_LEFT__________ ,        _________MOD_RIGHT_________
-                                 // \----------------------------/      \-----------------------------/
-  ),
-
-  [_QWERTY] = LAYOUT_wrapper(
-  // +---------+---------+---------+---------+---------+---------+      +---------+---------+---------+---------+---------+---------+
-       T_TAB   , ___________________QWERTY_L1___________________ ,        ___________________QWERTY_R1___________________ , KC_MINS ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       KC_LCTL , ___________________QWERTY_L2___________________ ,        ___________________QWERTY_R2___________________ , CTL_QUOT,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       KC_LSFT , ___________________QWERTY_L3___________________ ,        ___________________QWERTY_R3___________________ , ADJ_EQL ,
-  // +---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------+
-                                     _________MOD_LEFT__________ ,        _________MOD_RIGHT_________
-                                 // \----------------------------/      \-----------------------------/
-  ),
-
-  [_FUNCTION] = LAYOUT_wrapper(
-  // +---------+---------+---------+---------+---------+---------+      +---------+---------+---------+---------+---------+---------+
-       KC_ESC  , ___________________FUNC_LEFT___________________ ,        ___________________FUNC_RIGHT__________________ , KC_F11  ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       K_CSCN  , ____________________MEDIA_1____________________ ,        KC_DEL  , _______________NAV_1_________________ , KC_F12  ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       _______ , ____________________MEDIA_2____________________ ,        KC_INS  , _______________NAV_2_________________ , K_LOCK  ,
-  // +---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------+
-                                     _______MOD_TRNS_LEFT_______ ,        _______MOD_TRNS_RIGHT______
-                                 // \----------------------------/      \-----------------------------/
-  ),
-
-  [_CODE] = LAYOUT_wrapper(
-  // +---------+---------+---------+---------+---------+---------+      +---------+---------+---------+---------+---------+---------+
-       T_GRV   , ___________________NUM_LEFT____________________ ,        ___________________NUM_RIGHT___________________ , KC_BSLS ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       ________________________SYMBOL_L1________________________ ,        ________________________SYMBOL_R1________________________ ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       ________________________SYMBOL_L2________________________ ,        ________________________SYMBOL_R2________________________ ,
-  // +---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------+
-                                     _______MOD_TRNS_LEFT_______ ,        _______MOD_TRNS_RIGHT______
-                                 // \----------------------------/      \-----------------------------/
-  ),
-
-  [_ADJUST] = LAYOUT_wrapper(
-  // +---------+---------+---------+---------+---------+---------+      +---------+---------+---------+---------+---------+---------+
-       ________________________ADJUST_L1________________________ ,        ________________________ADJUST_R1________________________ ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       ________________________ADJUST_L2________________________ ,        ________________________ADJUST_R2________________________ ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       ________________________ADJUST_L3________________________ ,        ________________________ADJUST_R3________________________ ,
-  // +---------+---------+---------+---------+---------+---------+      +---------+---------+---------+---------+---------+---------+
-                                     _______ , _______ , _______ ,        _______ , _______ , _______
-                                 // \----------------------------/      \-----------------------------/
-  ),
-
-  [_SECRET] = LAYOUT_wrapper(
-  // +---------+---------+---------+---------+---------+---------+      +---------+---------+---------+---------+---------+---------+
-       ________________________SECRET_L1________________________ ,        ________________________SECRET_R1________________________ ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       ________________________SECRET_L2________________________ ,        ________________________SECRET_R2________________________ ,
-  // |---------+---------+---------+---------+---------+---------|      |---------+---------+---------+---------+---------+---------|
-       ________________________SECRET_L3________________________ ,        ________________________SECRET_R3________________________ ,
-  // +---------+---------+---------+---------+---------+---------+      +---------+---------+---------+---------+---------+---------+
-                                     XXXXXXX , XXXXXXX , XXXXXXX ,        XXXXXXX , XXXXXXX , XXXXXXX
-                                 // \----------------------------/      \-----------------------------/
-  )
-};
-// clang-format off
-
-#if defined(RGBLIGHT_ENABLE)
-__attribute__((weak))
-void set_rgb_by_layer(layer_state_t state) {
-    return;
-}
-#endif 
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-#   if defined(RGBLIGHT_ENABLE)
-    set_rgb_by_layer(state);
-#   endif
-    return update_tri_layer_state(state, _FUNCTION, _ADJUST, _SECRET);
-}
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h b/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h
deleted file mode 100644
index db47ea65ed6..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2021 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "keycodes.h"
-#include "tap_dances.h"
-
-// Layout blocks
-#define ___________________COLEMAK_DH_L1_______________ KC_Q    , KC_W    , KC_F    , KC_P    , KC_B
-#define ___________________COLEMAK_DH_L2_______________ CTL_A   , KC_R    , KC_S    , M_LOPT_T, KC_G
-#define ___________________COLEMAK_DH_L3_______________ SFT_Z   , KC_X    , KC_C    , KC_D    , KC_V
-                                      
-#define ___________________COLEMAK_DH_R1_______________ KC_J    , KC_L    , KC_U    , KC_Y    , KC_SCLN 
-#define ___________________COLEMAK_DH_R2_______________ KC_M    , RCMD_N  , KC_E    , KC_I    , CTL_O   
-#define ___________________COLEMAK_DH_R3_______________ KC_K    , KC_H    , KC_COMM , KC_DOT  , SFT_SLSH
-
-#define ___________________QWERTY_L1___________________ KC_Q    , KC_W    , KC_E    , KC_R    , KC_T
-#define ___________________QWERTY_L2___________________ CTL_A   , KC_S    , KC_D    , M_LOPT_F, KC_G
-#define ___________________QWERTY_L3___________________ SFT_Z   , KC_X    , KC_C    , KC_V    , KC_B
-
-#define ___________________QWERTY_R1___________________ KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    
-#define ___________________QWERTY_R2___________________ KC_H    , RCMD_J  , KC_K    , KC_L    , CTL_SCLN
-#define ___________________QWERTY_R3___________________ KC_N    , KC_M    , KC_COMM , KC_DOT  , SFT_SLSH
-
-#define ___________________COLEMAK_L1__________________ KC_Q    , KC_W    , KC_F    , KC_P    , KC_G
-#define ___________________COLEMAK_L2__________________ CTL_A   , KC_R    , KC_S    , M_LOPT_T, KC_D
-#define ___________________COLEMAK_L3__________________ SFT_Z   , KC_X    , KC_C    , KC_V    , KC_B
-
-#define ___________________COLEMAK_R1__________________ KC_J    , KC_L    , KC_U    , KC_Y    , KC_SCLN 
-#define ___________________COLEMAK_R2__________________ KC_H    , RCMD_N  , KC_E    , KC_I    , CTL_O   
-#define ___________________COLEMAK_R3__________________ KC_K    , KC_M    , KC_COMM , KC_DOT  , SFT_SLSH
-
-#define ___________________NUM_LEFT____________________ KC_1    , KC_2    , KC_3    , KC_4    , KC_5
-#define ___________________NUM_RIGHT___________________ KC_6    , KC_7    , KC_8    , KC_9    , KC_0
-
-#define ___________________FUNC_LEFT___________________ KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5
-#define ___________________FUNC_RIGHT__________________ KC_F6   , KC_F7   , KC_F8   , KC_F9   , KC_F10
-
-#define ________________________SYMBOL_L1________________________ KC_TILD , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC
-#define ________________________SYMBOL_L2________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-
-#define ________________________SYMBOL_R1________________________ KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_PIPE
-#define ________________________SYMBOL_R2________________________ XXXXXXX , KC_LCBR , KC_RCBR , KC_LBRC , KC_RBRC , KC_PLUS
-
-
-#define ________________________ADJUST_L1________________________ QK_BOOT , XXXXXXX , KC_PWR  , KC_WAKE , KC_SLEP , XXXXXXX
-
-#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
-#   define ________________________ADJUST_L2________________________ RGBRST  , XXXXXXX , RGB_SPI , RGB_SAI , RGB_HUI , RGB_VAI
-#   define ________________________ADJUST_L3________________________ EE_CLR  , VRSN    , RGB_SPD , RGB_SAD , RGB_HUD , RGB_VAD
-#else                                                                                                                
-#   define ________________________ADJUST_L2________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-#   define ________________________ADJUST_L3________________________ EE_CLR  , VRSN    , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-#endif
-
-#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
-#   define ________________________ADJUST_R1________________________ RGB_TOG , XXXXXXX , XXXXXXX , XXXXXXX , COLEMAK , QWERTY
-#   define ________________________ADJUST_R3________________________ RGB_MOD , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-#else
-#   define ________________________ADJUST_R1________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , COLEMAK , QWERTY
-#   define ________________________ADJUST_R3________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-#endif
-#define ________________________ADJUST_R2________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-
-#define ________________________SECRET_L1________________________ M_XXX1  , XXXXXXX , M_XXX3  , XXXXXXX , M_XXX5  , XXXXXXX 
-#define ________________________SECRET_L2________________________ XXXXXXX , M_XXX2  , XXXXXXX , M_XXX4  , XXXXXXX , XXXXXXX 
-#define ________________________SECRET_L3________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX 
-                                                                                                                  
-#define ________________________SECRET_R1________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-#define ________________________SECRET_R2________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-#define ________________________SECRET_R3________________________ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX
-
-#define _______________NAV_1_________________ KC_LEFT , KC_UP   , KC_RGHT , KC_PGUP
-#define _______________NAV_2_________________ KC_HOME , KC_DOWN , KC_END  , KC_PGDN
-
-#define _______________MOUSE_1_______________ KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_D
-#define _______________MOUSE_2_______________ KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_U
-
-#define ____________________MEDIA_1____________________ KC_BRMU , KC_MFFD , KC_MPLY , KC_VOLU , K_BACK 
-#define ____________________MEDIA_2____________________ KC_BRMD , KC_MRWD , KC_MUTE , KC_VOLD , K_FWRD  
-
-#define _________MOD_LEFT__________ T_GUI   , FCT_DEL , RAI_SPC
-#define _________MOD_RIGHT_________ RAI_ENT , FCT_BSP , KC_ROPT
-#define _______MOD_TRNS_LEFT_______ KC_TRNS , T_ESC   , XXXXXXX
-#define _______MOD_TRNS_RIGHT______ XXXXXXX , T_ESC   , KC_TRNS
-
-// Layout wrappers
-#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/oled.c b/keyboards/crkbd/keymaps/thunderbird2086/oled.c
deleted file mode 100644
index 108f3e0cdde..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/oled.c
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright 2021 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keycodes.h"
-
-
-// 5x3 Logos
-void render_qmk_logo(void) {
-    static const char PROGMEM font_qmk_logo[16] = {
-        0x80, 0x81, 0x82, 0x83, 0x84,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4,
-        0
-    };
-    oled_write_P(font_qmk_logo, false);
-};
-
-// 5x2 Keyboard, Controller logos
-void render_kb_split(void) {
-    static const char PROGMEM font_kb_split[11] = {
-        0xb5, 0xb6, 0xb7, 0xb8, 0xb9,
-        0xd5, 0xd6, 0xd7, 0xd8, 0xd9,
-        0
-    };
-    oled_write_P(font_kb_split, false);
-};
-
-// 5x1 Layer indicator
-
-void render_layer(void) {
-    static const char PROGMEM font_layer[4][6] = {
-        {0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0},
-        {0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0},
-        {0xda, 0xdb, 0xdc, 0xdd, 0xde, 0},
-        {0x95, 0x96, 0x97, 0x98, 0x99, 0},
-    };
-
-    uint8_t layer = 0;
-    if (layer_state_is(_FUNCTION)) {
-        layer = 1;
-    } else if (layer_state_is(_CODE)) {
-        layer = 2;
-    } else if (layer_state_is(_ADJUST)) {
-        layer = 3;
-    }
-    oled_write_P(font_layer[layer], false);
-};
-
-
-void render_layers(void) {
-    static const char PROGMEM font_layers[4][16] = {
-        {0x20, 0x85, 0x86, 0x87, 0x20,
-         0x20, 0xa5, 0xa6, 0xa7, 0x20,
-         0x20, 0xc5, 0xc6, 0xc7, 0x20,
-         0},
-        {0x20, 0x88, 0x89, 0x8a, 0x20,
-         0x20, 0xa8, 0xa9, 0xaa, 0x20,
-         0x20, 0xc8, 0xc9, 0xca, 0x20,
-         0},
-        {0x20, 0x8b, 0x8c, 0x8d, 0x20,
-         0x20, 0xab, 0xac, 0xad, 0x20,
-         0x20, 0xcb, 0xcc, 0xcd, 0x20,
-         0},
-        {0x20, 0x8e, 0x8f, 0x90, 0x20,
-         0x20, 0xae, 0xaf, 0xb0, 0x20,
-         0x20, 0xce, 0xcf, 0xd0, 0x20,
-         0},
-    };
-
-    uint8_t layer = 0;
-    if (layer_state_is(_FUNCTION)) {
-        layer = 1;
-    } else if (layer_state_is(_CODE)) {
-        layer = 2;
-    } else if (layer_state_is(_ADJUST)) {
-        layer = 3;
-    }
-    oled_write_P(font_layers[layer], false);
-};
-
-#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
-
-void render_rgb_status(void) {
-    static const char PROGMEM font_rgb_off[3] = {0xd1, 0xd2, 0};
-    static const char PROGMEM font_rgb_on[3]  = {0xd3, 0xd4, 0};
-    bool rgb_enabled = 
-#    if defined(RGBLIGHT_ENABLE)
-        rgblight_is_enabled();
-#    elif defined(RGB_MATRIX_ENABLE)
-        rgb_matrix_is_enabled();
-#    endif
-
-    oled_write_P(rgb_enabled ? font_rgb_on : font_rgb_off, false);
-};
-#endif
-
-// 2x1 Ctrl, Alt, Shift, GUI, Caps
-
-void render_mod_ctrl(void) {
-    static const char PROGMEM font_ctrl[3] = {0x91, 0x92, 0};
-    oled_write_P(font_ctrl, false);
-};
-
-void render_mod_alt(void) {
-    static const char PROGMEM font_alt[3] = {0xb1, 0xb2, 0};
-    oled_write_P(font_alt, false);
-};
-
-void render_mod_shift(void) {
-    static const char PROGMEM font_shift[3] = {0xb3, 0xb4, 0};
-    oled_write_P(font_shift, false);
-};
-
-void render_mod_gui(void) {
-    static const char PROGMEM font_gui[3] = {0x93, 0x94, 0};
-    oled_write_P(font_gui, false);
-};
-
-void render_caps_lock(void) {
-    static const char PROGMEM font_caps[3] = {0x9f, 0xbf, 0};
-    oled_write_P(font_caps, false);
-};
-
-
-// 5x2 Mod and feature indicator clusters
-
-void render_mod_status(void) {
-#if defined(NO_ACTION_ONESHOT)
-    uint8_t modifiers = get_mods();
-#else
-    uint8_t modifiers = get_mods() | get_oneshot_mods();
-#endif
-
-    (modifiers & MOD_MASK_CTRL) ? render_mod_ctrl() : oled_write_P(PSTR("  "), false);
-    oled_write_P(PSTR(" "), false);
-    (modifiers & MOD_MASK_SHIFT) ? render_mod_shift() : oled_write_P(PSTR("  "), false);
-
-    (modifiers & MOD_MASK_ALT) ? render_mod_alt() : oled_write_P(PSTR("  "), false);
-    oled_write_P(PSTR(" "), false);
-    (modifiers & MOD_MASK_GUI) ? render_mod_gui() : oled_write_P(PSTR("  "), false);
-
-    led_t led_state = host_keyboard_led_state(); 
-    (led_state.caps_lock) ? render_caps_lock() : oled_write_P(PSTR("  "), false);
-}
-
-void render_feature_status(void) {
-#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
-    render_rgb_status();
-#endif
-};
-
-// Keylogger
-#define KEYLOGGER_LENGTH 5
-static char     keylog_str[KEYLOGGER_LENGTH + 1] = {"\n"};
-// clang-format off
-static const char PROGMEM code_to_name[0xFF] = {
-//   0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',  // 0x
-    'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2',  // 1x
-    '3', '4', '5', '6', '7', '8', '9', '0',  20,  19,  27,  26,  22, '-', '=', '[',  // 2x
-    ']','\\', '#', ';','\'', '`', ',', '.', '/', 128, ' ', ' ', ' ', ' ', ' ', ' ',  // 3x
-    ' ', ' ', ' ', ' ', ' ', ' ', 'P', 'S', ' ', ' ', ' ', ' ',  16, ' ', ' ', ' ',  // 4x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 5x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 6x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 7x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 8x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 9x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Ax
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Bx
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Cx
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Dx
-    'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Ex
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '        // Fx
-};
-
-
-#if defined(KEY_LOG_ENABLE)
-void add_keylog(uint16_t keycode) {
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX)
-        || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)
-        || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
-        keycode = keycode & 0xFF;
-    } else if (keycode > 0xFF) {
-        keycode = 0;
-    }
-
-    for (uint8_t i = (KEYLOGGER_LENGTH - 1); i > 0; --i) {
-        keylog_str[i] = keylog_str[i - 1];
-    }
-
-    if (keycode < ARRAY_SIZE(code_to_name)) {
-        keylog_str[0] = pgm_read_byte(&code_to_name[keycode]);
-    }
-}
-#endif
-
-static uint16_t key_timer  = 0;
-static bool is_key_processed = true;
-bool process_record_oled(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        key_timer = timer_read();
-        is_key_processed = true;
-
-#       if defined(KEY_LOG_ENABLE)
-        add_keylog(keycode);
-#endif
-    }
-
-    return true;
-}
-
-
-void render_keylogger_status(void) {
-    oled_write(keylog_str, false);
-}
-
-
-void render_prompt(void) {
-    bool blink = (timer_read() % 1000) < 500;
-
-    if (layer_state_is(_FUNCTION)) {
-        oled_write_ln_P(blink ? PSTR("> ft_") : PSTR("> ft "), false);
-    } else if (layer_state_is(_CODE)) {
-        oled_write_ln_P(blink ? PSTR("> sy_") : PSTR("> sy "), false);
-    } else if (layer_state_is(_ADJUST)) {
-        oled_write_ln_P(blink ? PSTR("> aj_") : PSTR("> aj "), false);
-    } else {
-        oled_write_ln_P(blink ? PSTR("> _  ") : PSTR(">    "), false);
-    }
-};
-
-
-void render_status_secondary(void) {
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_kb_split();
-
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_layer();
-
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-#if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)
-    layer_state_is(_ADJUST) ? render_feature_status() : render_mod_status();
-#else
-    render_mod_status();
-#endif
-};
-
-
-void render_status_main(void) {
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_qmk_logo();
-
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_layers();
-
-    oled_write_ln("", false);
-    oled_write_ln("", false);
-
-    render_prompt();
-
-    oled_write_ln("", false);
-
-    render_keylogger_status();
-}
-
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        if (is_key_processed && (timer_elapsed(key_timer) < OLED_KEY_TIMEOUT)) {
-            render_status_main();
-        } else if (is_key_processed) {
-            is_key_processed = false;
-            oled_off();
-        }
-    } else {
-        render_status_secondary();
-    }
-
-    return false;
-}
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/process_records.c b/keyboards/crkbd/keymaps/thunderbird2086/process_records.c
deleted file mode 100644
index 46b9126677f..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/process_records.c
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2021 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "keycodes.h"
-#include "version.h"
-
-__attribute__((weak))
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-__attribute__((weak))
-bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-#if defined(OLED_ENABLE)
-__attribute__((weak))
-bool process_record_oled(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case COLEMAK:
-                set_single_persistent_default_layer(_COLEMAK);
-                break;
-            case QWERTY:
-                set_single_persistent_default_layer(_QWERTY);
-                break;
-#           if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-            case RGBRST:
-#               if defined(RGBLIGHT_ENABLE)
-                eeconfig_update_rgblight_default();
-                rgblight_enable();
-#               else 
-                eeconfig_update_rgb_matrix_default();
-#               endif
-                break;
-#           endif
-            case VRSN:
-                send_string(
-                    "# qmk " QMK_VERSION "\n" SS_DELAY(VER_NEWLINE_WAIT)
-                    "# " QMK_KEYBOARD "/" QMK_KEYMAP "\n" SS_DELAY(VER_NEWLINE_WAIT)
-                    "# built on: " QMK_BUILDDATE "\n");
-                break;
-        }
-    }
-
-    return process_record_keymap(keycode, record) && process_record_secrets(keycode, record)
-#   if defined(OLED_ENABLE)
-           && process_record_oled(keycode, record)
-#   endif
-           ;
-}
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/readme.md b/keyboards/crkbd/keymaps/thunderbird2086/readme.md
deleted file mode 100644
index cb57f20aecb..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/readme.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Thunderbird2086's custom CRKBD Layout
-
-The concept is Mac and **baby finger** friendly keymap.
-
-## Layers
-- Colemak-DH: base layer. The option(⌥) and command(⌘) keys are assigned to thumb blocks as well as home position keys on each side.  Also, far end two columns are assigned to shift(⇧) and control(⌃) keys.
-  ![colemak-dh](https://i.imgur.com/R7EzTTt.png)
-  - Thumb keys
-    | Tap         |  Double tap           |  Long tap        |
-    | ---         | ---                   |  ---             |
-    | Command(⌘)  | Command(⌘) + Space(␣) |                  |
-    | Delete(⌦)   |                       |  Function layer  |
-    | Backspace(⌫)|                       |  Function layer  |
-    | Space(␣)    |                       |  Code layer      |
-    | Enter(⏎)    |                       |  Code layer      |
-  - Staggered keys
-    | Tap         |  Double tap           |  Long tap        |
-    | ---         | ---                   |  ---             |
-    | TAB         | Control(⌃) + TAB      |                  |
-    | a           |                       |  Control(⌃)      |
-    | z           |                       |  Shift(⇧)        |
-    | t           |                       |  Option(⌥)       |
-    | n           |                       |  Command(⌘)      |
-    | o           |                       |  Control(⌃)      |
-    | '           |                       |  Control(⌃)      |
-    | /           |                       |  Shift(⇧)        |
-    | =           |                       |  Adjust layer    |
-
-- QWERTY: same as Colemak-DH layer
-  ![qwery](https://i.imgur.com/v9JBwQu.png)
-  - Thumb keys : same as Colemak-DH
-  - Staggered keys : almost same as Colemak-DH except
-    | Tap         |  Double tap           |  Long tap        |
-    | ---         | ---                   |  ---             |
-    | f           |                       |  Option(⌥)       |
-    | j           |                       |  Command(⌘)      |
-    | ;           |                       |  Control(⌃)      |
-
-- CODE: numbers and symbols.  
-  ![symbol](https://i.imgur.com/BPgPlYX.png)
-  - Thumb keys
-    | Tap         |  Double tap           |  Long tap        |
-    | ---         | ---                   |  ---             |
-    | ESC         | Caps lock             |                  |
-  - Staggered keys
-    | Tap         |  Double tap           |  Long tap        |
-    | ---         | ---                   |  ---             |
-    | `           | Command(⌘) + `        |                  |
-
-- FUNCTION: function, meadia and navigation keys 
-  ![function](https://i.imgur.com/cs5haUP.png)
-  - Thumb keys
-    | Tap         |  Double tap           |  Long tap        |
-    | ---         | ---                   |  ---             |
-    | ESC         | Caps lock             |                  |
-
-- ADJUST: RGB control, Power control, default layer setting, QMK version and reset
-  ![adjust](https://i.imgur.com/uDIhigd.png)
-- SECRET: hold `ADJUST` and `FUNCTION` to activate
-
-## Custom OLED
-This keymap includes custom OLED font and code. The font contains some logos and status indidcators from [gotham](../gotham) and [soundmonster](../soundmonster) including my own CAPS LOCK icon.  Enable OLED in rukes.mk to check it out. Feel free to reuse the font or parts of it.
-
-## Flashing
-Flash using `make crkbd:thunderbird2086:avrdude` for Pro Micro and `make crkbd:thunderbird2086:dfu` for Elite-C.
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/rgb.c b/keyboards/crkbd/keymaps/thunderbird2086/rgb.c
deleted file mode 100644
index d9b0003c881..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/rgb.c
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2023 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-#   include QMK_KEYBOARD_H
-
-#   include "keycodes.h"
-
-#   ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM _rgb_layer_0[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 56, HSV_BLUE}
-);
-const rgblight_segment_t PROGMEM _rgb_layer_1[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 56, HSV_GREEN}
-);
-const rgblight_segment_t PROGMEM _rgb_layer_2[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 56, HSV_YELLOW}
-);
-
-const rgblight_segment_t* const PROGMEM _rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    _rgb_layer_0,
-    _rgb_layer_1,
-    _rgb_layer_2
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = _rgb_layers;
-}
-
-void set_rgb_by_layer(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, _CODE));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _FUNCTION));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _ADJUST));
-}
-
-#   else
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        switch(get_highest_layer(layer_state|default_layer_state)) {
-            case _CODE:
-                rgb_matrix_set_color(i, RGB_BLUE);
-                break;
-            case _FUNCTION:
-                rgb_matrix_set_color(i, RGB_GREEN);
-                break;
-            case _ADJUST:
-                rgb_matrix_set_color(i, RGB_YELLOW);
-                    //  RGB_WHITE caused crash
-                break;
-            default:
-                break;
-        }
-    }
-    return false;
-}
-
-#   endif
-#endif
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/rules.mk b/keyboards/crkbd/keymaps/thunderbird2086/rules.mk
deleted file mode 100644
index 0621b371e9c..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = yes
-OLED_ENABLE = yes
-LTO_ENABLE = yes
-
-TAP_DANCE_ENABLE = yes
-
-SRC += oled.c
-SRC += process_records.c
-SRC += rgb.c
-SRC += tap_dances.c
-
-ifneq ("$(wildcard keyboards/crkbd/keymaps/thunderbird2086/secrets.c)","")
-	SRC += secrets.c
-endif
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.c b/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.c
deleted file mode 100644
index dbfe3c5b3d6..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.c
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2021 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "tap_dances.h"
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_CAPS]     = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
-    [TD_TAB_CTRLTAB]  = ACTION_TAP_DANCE_DOUBLE(KC_TAB, LCTL(KC_TAB)),
-    [TD_GRV_CTRLGRV]  = ACTION_TAP_DANCE_DOUBLE(KC_GRV, LGUI(KC_GRV)),
-    [TD_GUI_GUISPC]   = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, LGUI(KC_SPC)),
-};
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.h b/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.h
deleted file mode 100644
index 34d3c4e32c2..00000000000
--- a/keyboards/crkbd/keymaps/thunderbird2086/tap_dances.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2021 Allen Choi (@thunderbird2086)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-enum custom_tapdances {
-    TD_ESC_CAPS = 0,
-    TD_TAB_CTRLTAB,
-    TD_GRV_CTRLGRV,
-    TD_GUI_GUISPC,
-};
-
-#define T_ESC  TD(TD_ESC_CAPS)          // Tap for ESC, double tap for CAPSLOCK
-#define T_TAB  TD(TD_TAB_CTRLTAB)       // Tap for TAB, double tap for CTRL + TAB
-#define T_GRV  TD(TD_GRV_CTRLGRV)       // Tap for GRV, double tap for Cmd + GRV
-#define T_GUI  TD(TD_GUI_GUISPC)        // Tap for Cmd, double tap for Cmd + Space
diff --git a/keyboards/crkbd/keymaps/vayashiko/config.h b/keyboards/crkbd/keymaps/vayashiko/config.h
deleted file mode 100644
index 01a1210c81d..00000000000
--- a/keyboards/crkbd/keymaps/vayashiko/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#undef RGBLED_NUM
-#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 42
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/crkbd/keymaps/vayashiko/keymap.c b/keyboards/crkbd/keymaps/vayashiko/keymap.c
deleted file mode 100644
index 41160cb6d2c..00000000000
--- a/keyboards/crkbd/keymaps/vayashiko/keymap.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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_japanese.h"
-
-enum custom_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LALT,    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_LCTL,    MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_RALT
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [_LOWER] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-    KC_DELETE,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      XXXXXXX,    KC_7,    KC_8,    KC_9, JP_MINS,KC_DELETE,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LALT,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                      XXXXXXX,    KC_4,    KC_5,    KC_6, JP_PLUS,LSFT(KC_CAPS),
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,                         KC_0,    KC_1,    KC_2,    KC_3,  KC_DOT, KC_RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                        KC_LCTL,  _______,  KC_SPC,     KC_ENT,   MO(3), KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC, JP_EXLM,  JP_DQT, JP_HASH,  KC_DLR, JP_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_MINS, JP_CIRC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL,  KC_GRV, XXXXXXX, XXXXXXX, JP_MHEN,    KC_G,                      XXXXXXX, JP_HENK, JP_LBRC, JP_RBRC, XXXXXXX,  JP_YEN,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                     JP_EQL,JP_AT,LSFT(JP_LBRC),LSFT(JP_RBRC),XXXXXXX,JP_UNDS,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,   MO(3),  KC_SPC,     KC_ENT, _______, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, KC_HOME,    KC_S, XXXXXXX,  KC_END,    KC_G,                      XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, KC_DOWN, XXXXXXX, XXXXXXX, KC_RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-#define L_BASE 0
-#define L_LOWER 2
-#define L_RAISE 4
-#define L_ADJUST 8
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("Default"), false);
-            break;
-        case L_LOWER:
-            oled_write_ln_P(PSTR("Lower"), false);
-            break;
-        case L_RAISE:
-            oled_write_ln_P(PSTR("Raise"), false);
-            break;
-        case L_ADJUST:
-        case L_ADJUST|L_LOWER:
-        case L_ADJUST|L_RAISE:
-        case L_ADJUST|L_LOWER|L_RAISE:
-            oled_write_ln_P(PSTR("Adjust"), false);
-            break;
-    }
-}
-
-
-char keylog_str[24] = {};
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-  if (keycode < 60) {
-    name = code_to_name[keycode];
-  }
-
-  // update keylog
-  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-
-void oled_render_keylog(void) {
-    oled_write(keylog_str, false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_render_keylog();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    set_keylog(keycode, record);
-  }
-  return true;
-}
-#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/vayashiko/rules.mk b/keyboards/crkbd/keymaps/vayashiko/rules.mk
deleted file mode 100644
index c29927421d1..00000000000
--- a/keyboards/crkbd/keymaps/vayashiko/rules.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/crkbd/keymaps/mb_via/config.h b/keyboards/crkbd/keymaps/via_mechboards/config.h
similarity index 100%
rename from keyboards/crkbd/keymaps/mb_via/config.h
rename to keyboards/crkbd/keymaps/via_mechboards/config.h
diff --git a/keyboards/crkbd/keymaps/mb_via/keymap.c b/keyboards/crkbd/keymaps/via_mechboards/keymap.c
similarity index 100%
rename from keyboards/crkbd/keymaps/mb_via/keymap.c
rename to keyboards/crkbd/keymaps/via_mechboards/keymap.c
diff --git a/keyboards/crkbd/keymaps/via_mechboards/readme.md b/keyboards/crkbd/keymaps/via_mechboards/readme.md
new file mode 100644
index 00000000000..a173bc43ecb
--- /dev/null
+++ b/keyboards/crkbd/keymaps/via_mechboards/readme.md
@@ -0,0 +1,10 @@
+# Default Via keymap for the Corne R2G by Mechboards UK
+
+Corne R2G is an edition of the classic CRKBD by foostan remade to feature full smd assembly
+
+In this folder can be found the default via enabled keymap that can be in conjunction with the mechboards R2G PCB.
+
+Flash example for this Keymap:  
+```sh
+qmk flash -kb crkbd/r2g -km via_mechboards
+```
diff --git a/keyboards/crkbd/keymaps/mb_via/rules.mk b/keyboards/crkbd/keymaps/via_mechboards/rules.mk
similarity index 100%
rename from keyboards/crkbd/keymaps/mb_via/rules.mk
rename to keyboards/crkbd/keymaps/via_mechboards/rules.mk
diff --git a/keyboards/crkbd/keymaps/vial/config.h b/keyboards/crkbd/keymaps/vial/config.h
index 10362968727..a4e7d7da1c5 100644
--- a/keyboards/crkbd/keymaps/vial/config.h
+++ b/keyboards/crkbd/keymaps/vial/config.h
@@ -39,9 +39,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USE_SERIAL_PD2
 #ifdef RGBLIGHT_ENABLE
-#    undef RGBLED_NUM
+#    undef RGBLIGHT_LED_COUNT
 #    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM 54
+#    define RGBLIGHT_LED_COUNT 54
 #    undef RGBLED_SPLIT
 #    define RGBLED_SPLIT \
         { 27, 27 }
diff --git a/keyboards/crkbd/keymaps/vial/rules.mk b/keyboards/crkbd/keymaps/vial/rules.mk
index 76001860ad6..10ed8a57e69 100644
--- a/keyboards/crkbd/keymaps/vial/rules.mk
+++ b/keyboards/crkbd/keymaps/vial/rules.mk
@@ -7,7 +7,7 @@ RGB_MATRIX_ENABLE   = no # Can't have RGBLIGHT and RGB_MATRIX at the same time.
 MOUSEKEY_ENABLE     = no
 OLED_ENABLE         = no
 OLED_DRIVER         = SSD1306
-EXTRAKEY_ENABLE     = yes
+EXTRAKEY_ENABLE     = no
 COMBO_ENABLE        = no
 
 QMK_SETTINGS        = no
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
deleted file mode 100644
index 8ff7589a9d0..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
deleted file mode 100644
index 8ee3841efcf..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/keymap.c
+++ /dev/null
@@ -1,198 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-enum layer_names {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  RGBRST,
-  MBTN1,
-  SCRL
-};
-
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_RST   QK_BOOT
-#define KC_LRST  RGBRST
-#define KC_LTOG  RGB_TOG
-#define KC_LHUI  RGB_HUI
-#define KC_LHUD  RGB_HUD
-#define KC_LSAI  RGB_SAI
-#define KC_LSAD  RGB_SAD
-#define KC_LVAI  RGB_VAI
-#define KC_LVAD  RGB_VAD
-#define KC_LMOD  RGB_MOD
-
-#define KC_CTLA CTL_T(KC_A)
-#define KC_CTLSC CTL_T(KC_SCLN)
-#define KC_SFTZ SFT_T(KC_Z)
-#define KC_SFTSL SFT_T(KC_SLSH)
-#define KC_WINX LWIN_T(KC_X)
-#define KC_WINDO RWIN_T(KC_DOT)
-
-#define KC_MBTN1  MBTN1
-#define KC_SCRL   SCRL
-
-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_BSPC,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-        KC_TAB,  KC_CTLA,     KC_S,     KC_D,     KC_F,     KC_G,                      KC_H,     KC_J,     KC_K,     KC_L, KC_CTLSC,  KC_QUOT,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_GRAVE,  KC_SFTZ,  KC_WINX,     KC_C,     KC_V,     KC_B,                      KC_N,     KC_M,  KC_COMM, KC_WINDO, KC_SFTSL,KC_BSLS,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-        KC_ESC, XXXXXXX,  KC_PGDN,  KC_PSCR,  KC_PGUP,  KC_LBRC,                   KC_RBRC,     KC_7,     KC_8,     KC_9, XXXXXXX, XXXXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXXXX, KC_LCTL,   KC_PLUS,  KC_MINS,   KC_EQL,  KC_LPRN,                   KC_RPRN,     KC_4,     KC_5,     KC_6, KC_RCTL, XXXXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXXXX,  KC_LSFT,  KC_HOME, XXXXXXX,   KC_END,  KC_LCBR,                   KC_RCBR,     KC_1,     KC_2,     KC_3,  KC_RSFT, XXXXXXX,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT,     KC_0
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-        KC_ESC, XXXXXXX,    KC_F7,    KC_F8,    KC_F9,   KC_F10,                   KC_BTN2,  KC_BTN2,  KC_MNXT,  KC_MPRV,  KC_MPLY,  KC_MSTP,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXXXX, KC_LCTL,     KC_F4,    KC_F5,    KC_F6,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_RCTL, XXXXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      XXXXXXX,  KC_LSFT,    KC_F1,    KC_F2,    KC_F3,   KC_F12,                  XXXXXXX, XXXXXXX,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_RSFT,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-        KC_RST,  KC_LRST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_RST,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       KC_LTOG,  KC_LHUI,  KC_LSAI,  KC_LVAI, XXXXXXX, XXXXXXX,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       KC_LMOD,  KC_LHUD,  KC_LSAD,  KC_LVAD, XXXXXXX, XXXXXXX,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
-                              //`--------------------'  `--------------------'
-  )
-};
-
-int RGB_current_mode;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
-
-#ifdef OLED_ENABLE
-
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    oled_write_ln(read_keylog(), false);
-    oled_write_ln(read_keylogs(), false);
-  } else {
-    oled_write(read_logo(), false);
-  }
-  return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-  }
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/readme.md b/keyboards/crkbd/keymaps/vlukash_trackpad_left/readme.md
deleted file mode 100644
index 91b884749fa..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# CrKbd with the Trackpad support
-
-CrKbd version that supports BlackBerry 8520 trackpad via additional PCB.
-See this repository for more details:
- - https://github.com/vlukash/corne-trackpad
- - https://vlukash.com/2019/01/15/trackpad-in-keycap-corne-crkbd-keyboard
-
-This firmware is for the Left keyboard.
-
-# Build
-
-```
-make crkbd:vlukash_trackpad_left:dfu
-```
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk b/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
deleted file mode 100644
index d2e0957c499..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-OLED_ENABLE     = yes
-
-BOOTLOADER = atmel-dfu
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
deleted file mode 100644
index 89b58e4648f..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#define NO_DEBUG_LEDS
-
-// Connector PCB version
-// 1 - PCB that supports flex caple and the trackpad sensor is mounted on an 'H' keycap
-//   - https://github.com/vlukash/corne-trackpad/tree/master/connector
-// 2 - PCB woth no flex option, track sensor mounted directly on the PCB
-//   - https://github.com/vlukash/corne-trackpad/tree/master/connector-no-flex
-#define TRACKPAD_CONNECTOR_VER 1
-
-/* Select hand configuration */
-#define MASTER_RIGHT
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 300
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-/* key matrix size */
-// Rows are doubled-up
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B7, D5 }
-
-/* ws2812 RGB LED */
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN B5
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c b/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
deleted file mode 100644
index 5f95ad497f6..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern bool isScrollMode;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-
-enum layer_names {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  RGBRST,
-  MBTN1,
-  SCRL
-};
-
-#define KC______ KC_TRNS
-#define KC_XXXXX KC_NO
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_RST   QK_BOOT
-#define KC_LRST  RGBRST
-#define KC_LTOG  RGB_TOG
-#define KC_LHUI  RGB_HUI
-#define KC_LHUD  RGB_HUD
-#define KC_LSAI  RGB_SAI
-#define KC_LSAD  RGB_SAD
-#define KC_LVAI  RGB_VAI
-#define KC_LVAD  RGB_VAD
-#define KC_LMOD  RGB_MOD
-
-#define KC_CTLA CTL_T(KC_A)
-#define KC_CTLSC CTL_T(KC_SCLN)
-#define KC_SFTZ SFT_T(KC_Z)
-#define KC_SFTSL SFT_T(KC_SLSH)
-#define KC_WINX LWIN_T(KC_X)
-#define KC_WINDO RWIN_T(KC_DOT)
-
-#define KC_MBTN1  MBTN1
-#define KC_SCRL   SCRL
-
-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_BSPC,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-        KC_TAB,  KC_CTLA,     KC_S,     KC_D,     KC_F,     KC_G,                      KC_H,     KC_J,     KC_K,     KC_L, KC_CTLSC,  KC_QUOT,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_GRAVE,  KC_SFTZ,  KC_WINX,     KC_C,     KC_V,     KC_B,                      KC_N,     KC_M,  KC_COMM, KC_WINDO, KC_SFTSL,KC_BSLS,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-        KC_ESC, KC_XXXXX,  KC_PGDN,  KC_PSCR,  KC_PGUP,  KC_LBRC,                   KC_RBRC,     KC_7,     KC_8,     KC_9, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_XXXXX, KC_LCTL,   KC_PLUS,  KC_MINS,   KC_EQL,  KC_LPRN,                   KC_RPRN,     KC_4,     KC_5,     KC_6, KC_RCTL,  KC_XXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_XXXXX,  KC_LSFT,  KC_HOME, KC_XXXXX,   KC_END,  KC_LCBR,                   KC_RCBR,     KC_1,     KC_2,     KC_3,  KC_RSFT, KC_XXXXX,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT,     KC_0
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-        KC_ESC, KC_XXXXX,    KC_F7,    KC_F8,    KC_F9,   KC_F10,                   KC_BTN2,  KC_BTN2,  KC_MNXT,  KC_MPRV,  KC_MPLY,  KC_MSTP,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_XXXXX, KC_LCTL,     KC_F4,    KC_F5,    KC_F6,   KC_F11,                   KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_RCTL,  KC_XXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      KC_XXXXX,  KC_LSFT,    KC_F1,    KC_F2,    KC_F3,   KC_F12,                  KC_XXXXX, KC_XXXXX,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_RSFT,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-        KC_RST,  KC_LRST, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,   KC_RST,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       KC_LTOG,  KC_LHUI,  KC_LSAI,  KC_LVAI, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       KC_LMOD,  KC_LHUD,  KC_LSAD,  KC_LVAD, KC_XXXXX, KC_XXXXX,                  KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  KC_LOWER,   KC_SPC,  KC_SCRL,    KC_MBTN1,   KC_ENT, KC_RAISE
-                              //`--------------------'  `--------------------'
-  )
-};
-
-int RGB_current_mode;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  report_mouse_t currentReport = {};
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-    case MBTN1:
-      currentReport = pointing_device_get_report();
-      if (record->event.pressed) {
-        currentReport.buttons |= MOUSE_BTN1;
-      }
-      else {
-        currentReport.buttons &= ~MOUSE_BTN1;
-      }
-      pointing_device_set_report(currentReport);
-      pointing_device_send();
-      return false;
-    case SCRL:
-      if (record->event.pressed) {
-        isScrollMode = true;
-      }
-      else {
-        isScrollMode = false;
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/readme.md b/keyboards/crkbd/keymaps/vlukash_trackpad_right/readme.md
deleted file mode 100644
index cd511018c14..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# CrKbd with the Trackpad support
-
-CrKbd version that supports BlackBerry 8520 trackpad via additional PCB.
-See this repository for more details:
- - https://github.com/vlukash/corne-trackpad
- - https://vlukash.com/2019/01/15/trackpad-in-keycap-corne-crkbd-keyboard
-
-This firmware is for the Right keyboard.
-
-# Build
-
-```
-make crkbd:vlukash_trackpad_right:dfu
-```
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk b/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk
deleted file mode 100644
index 92ded45e93f..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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.
-
-BOOTLOADER = atmel-dfu
-
-# Add support for the BB 8520 trackpad
-SRC += trackpad.c
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.c b/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.c
deleted file mode 100644
index 4dc336c4208..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "trackpad.h"
-
-// bool isScrollingMode = false;
-bool isScrollMode = false;
-
-void pointing_device_init(void){
-
-  SPI_Init(SPI_SPEED_FCPU_DIV_8 | SPI_MODE_MASTER);
-
-  // Set as output
-  TP_RESET_INIT;
-  TP_SHUTDOWN_INIT;
-  TP_CS_INIT;
-  LVL_SHIFT_EN_INIT;
-
-  // Reset level shifter
-  LVL_SHIFT_EN_LO;
-  wait_ms(100);
-  LVL_SHIFT_EN_HI;
-
-  // Force a BB-8520 reset
-  TP_RESET_HI;
-  wait_ms(100);
-  TP_RESET_LO;
-
-  // Turn on BB-8520 trackpad
-  TP_SHUTDOWN_LO;
-
-  TP_CS_HI;
-}
-
-uint8_t readRegister(uint8_t address) {
-  uint8_t data;
-
-  TP_CS_LO;
-
-  // Read the data
-  SPI_TransferByte(address);
-  data = SPI_TransferByte(0x00);
-
-  TP_CS_HI;
-
-  return data;
-}
-
-bool pointing_device_task(void){
-  uint8_t motion = readRegister(0x02);
-
-  // Motion has occurred on the trackpad
-  if (motion > 127) {
-
-  int8_t dx, dy;
-
-  if(TRACKPAD_CONNECTOR_VER == 1) {
-    dx = readRegister(0x03);
-    dy = -readRegister(0x04);
-  }
-  else {
-    dy = -readRegister(0x03);
-    dx = -readRegister(0x04);
-  }
-
-    report_mouse_t currentReport = pointing_device_get_report();
-    if (isScrollMode)
-    {
-      currentReport.h = dx/SCROLL_SPEED_DIVIDER;
-      currentReport.v = dy/SCROLL_SPEED_DIVIDER;
-    }
-    else
-    {
-      currentReport.x = dx * POINTER_SPEED_MULTIPLIER;
-      currentReport.y = dy * POINTER_SPEED_MULTIPLIER;
-    }
-
-    pointing_device_set_report(currentReport);
-  }
-  return pointing_device_send();
-}
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h
deleted file mode 100644
index cce460a97c9..00000000000
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "pointing_device.h"
-#include "quantum.h"
-#include "report.h"
-#include <util/delay.h>
-#include <LUFA/Drivers/Peripheral/SPI.h>
-
-// Trackpad speed adjustments
-#define POINTER_SPEED_MULTIPLIER 2
-#define SCROLL_SPEED_DIVIDER 6
-
-// Pins on corresponding ports
-#define TP_RESET     1
-#define TP_SHUTDOWN  0
-#define TP_CS        0
-#define LVL_SHIFT_EN 7
-
-// Configure as output
-#define TP_RESET_INIT     DDRF |= (1 << TP_RESET);
-#define TP_SHUTDOWN_INIT  DDRF |= (1 << TP_SHUTDOWN);
-#define TP_CS_INIT        DDRB |= (1 << TP_CS);
-#define LVL_SHIFT_EN_INIT DDRC |= (1 << LVL_SHIFT_EN);
-
-#define TP_RESET_HI     PORTF |= (1 << TP_RESET);
-#define TP_RESET_LO     PORTF &= ~ (1 << TP_RESET);
-#define TP_SHUTDOWN_HI  PORTF |= (1 << TP_SHUTDOWN);
-#define TP_SHUTDOWN_LO  PORTF &= ~ (1 << TP_SHUTDOWN);
-#define TP_CS_HI        PORTB |= (1 << TP_CS);
-#define TP_CS_LO        PORTB &= ~ (1 << TP_CS);
-#define LVL_SHIFT_EN_HI PORTC |= (1 << LVL_SHIFT_EN);
-#define LVL_SHIFT_EN_LO PORTC &= ~ (1 << LVL_SHIFT_EN);
diff --git a/keyboards/crkbd/keymaps/vxid/README.md b/keyboards/crkbd/keymaps/vxid/README.md
deleted file mode 100644
index 7b0f9b8af5a..00000000000
--- a/keyboards/crkbd/keymaps/vxid/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Vxid crkbd layout
-
-Inspired by sdothum's wide planck layout.
diff --git a/keyboards/crkbd/keymaps/vxid/config.h b/keyboards/crkbd/keymaps/vxid/config.h
deleted file mode 100644
index 1960e131947..00000000000
--- a/keyboards/crkbd/keymaps/vxid/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-#define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/crkbd/keymaps/vxid/keymap.c b/keyboards/crkbd/keymaps/vxid/keymap.c
deleted file mode 100644
index 643a9eb425d..00000000000
--- a/keyboards/crkbd/keymaps/vxid/keymap.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-
-#define KC______ KC_TRNS
-#define KC_XXXXX KC_NO
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //,-----------------------------------------.                ,-----------------------------------------.
-          KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,   KC_ESC,                    KC_DEL,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-          KC_A,     KC_S,     KC_D,     KC_F,     KC_G,   KC_SPC,                   KC_BSPC,     KC_H,     KC_J,     KC_K,     KC_L,  KC_SCLN,
-  //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-          KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,   KC_TAB,                    KC_ENT,     KC_N,     KC_M,  KC_COMM,   KC_DOT,  KC_SLSH,
-  //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                   KC_LALT,  KC_LGUI,  KC_LCTL,     KC_LSFT, KC_RAISE, KC_LOWER
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,-----------------------------------------.                ,------------------------------------------.
-          KC_1,     KC_2,     KC_3,     KC_4,     KC_5, KC_XXXXX,                   KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------|                |-------+------+------+------+------+------|
-          KC_6,     KC_7,     KC_8,     KC_9,     KC_0, KC_XXXXX,                   KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------|                |-------+------+------+------+------+------|
-        KC_EQL,  KC_PLUS,  KC_MINS,  KC_SLSH,  KC_ASTR, KC_XXXXX,                   KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------+------|  |------+-------+------+------+------+------+------|
-                                   KC_LALT,  KC_LGUI,  KC_LCTL,     KC_LSFT, KC_RAISE, KC_LOWER
-                              //`--------------------'  `--------------------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------.                ,------------------------------------------.
-       KC_EXLM,    KC_AT,  KC_HASH,   KC_DLR,  KC_PERC,  KC_LPRN,                    KC_RPRN, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------|                |-------+------+------+------+------+------|
-       KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_QUOT,  KC_DQUO,  KC_LCBR,                    KC_RCBR,  KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT, KC_XXXXX,
-  //|------+------+------+------+------+------|                |-------+------+------+------+------+------|
-       KC_BSLS,  KC_TILD,   KC_GRV,  KC_UNDS,  KC_PIPE,  KC_LBRC,                    KC_RBRC, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX, KC_XXXXX,
-  //|------+------+------+------+------+------+------|  |------+-------+------+------+------+------+------|
-                                   KC_LALT,  KC_LGUI,  KC_LCTL,     KC_LSFT, KC_RAISE, KC_LOWER
-                              //`--------------------'  `--------------------'
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-      } else {
-        layer_off(_LOWER);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-      } else {
-        layer_off(_RAISE);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/crkbd/keymaps/vxid/rules.mk b/keyboards/crkbd/keymaps/vxid/rules.mk
deleted file mode 100644
index b14970fbf36..00000000000
--- a/keyboards/crkbd/keymaps/vxid/rules.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-OLED_ENABLE     = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/crkbd/keymaps/xyverz/config.h b/keyboards/crkbd/keymaps/xyverz/config.h
deleted file mode 100644
index 3b7eab62e66..00000000000
--- a/keyboards/crkbd/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 300
-#define PERMISSIVE_HOLD
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 300
-
-
-#ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-#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 27
-    #define RGBLIGHT_LIMIT_VAL 120
-    #define RGBLIGHT_HUE_STEP 10
-    #define RGBLIGHT_SAT_STEP 17
-    #define RGBLIGHT_VAL_STEP 17
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGBLED_NUM 54  // Number of LEDs
-    #define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#endif
-
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/xyverz/keymap.c b/keyboards/crkbd/keymaps/xyverz/keymap.c
deleted file mode 100644
index 95112ece549..00000000000
--- a/keyboards/crkbd/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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 <stdio.h>
-
-enum layer_names {
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  DVORAK = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-// Adding macros to make the keymaps below much easier to read.
-#define DELGUI GUI_T(KC_DEL)
-#define ALTENT ALT_T(KC_ENT)
-#define SCLNCTL CTL_T(KC_SCLN)
-#define QUEALT ALT_T(KC_Q)
-#define VEEALT ALT_T(KC_V)
-#define ZEDCTL CTL_T(KC_Z)
-#define ADJUST MO(_ADJUST)
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define MACLOCK LGUI(LCTL(KC_Q))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_DVORAK] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB, KC_SCLN, KC_COMM,  KC_DOT,    KC_P,    KC_Y,                         KC_F,    KC_G,    KC_C,    KC_R,    KC_L, KC_SLSH,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_ESC,    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                         KC_D,    KC_H,    KC_T,    KC_N,    KC_S, KC_MINS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, SCLNCTL,  QUEALT,    KC_J,    KC_K,    KC_X,                         KC_B,    KC_M,    KC_W,  VEEALT,  ZEDCTL, KC_RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                            LOWER, KC_BSPC,  DELGUI,     KC_ENT,  KC_SPC,   RAISE
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [_LOWER] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_GRV, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSLS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_HOME,                      KC_PGUP, XXXXXXX, KC_PLUS, KC_LCBR, KC_RCBR, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT,  KC_END,                      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______,  KC_DEL, MACLOCK,    _______,  KC_INS, _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      KC_TILD,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_PIPE,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_HOME,                      KC_PGUP, XXXXXXX,  KC_EQL, KC_LBRC, KC_RBRC, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT,  KC_END,                      KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______,  KC_DEL, MACLOCK,    _______,  KC_INS, _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_F11,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                        KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, _______
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master()) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  }
-  return rotation;
-}
-
-#define L_BASE 0
-#define L_LOWER 2
-#define L_RAISE 4
-#define L_ADJUST 8
-
-void oled_render_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-            oled_write_ln_P(PSTR("Default"), false);
-            break;
-        case L_LOWER:
-            oled_write_ln_P(PSTR("Lower"), false);
-            break;
-        case L_RAISE:
-            oled_write_ln_P(PSTR("Raise"), false);
-            break;
-        case L_ADJUST:
-        case L_ADJUST|L_LOWER:
-        case L_ADJUST|L_RAISE:
-        case L_ADJUST|L_LOWER|L_RAISE:
-            oled_write_ln_P(PSTR("Adjust"), false);
-            break;
-    }
-}
-
-
-char keylog_str[24] = {};
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void set_keylog(uint16_t keycode, keyrecord_t *record) {
-  char name = ' ';
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
-  if (keycode < 60) {
-    name = code_to_name[keycode];
-  }
-
-  // update keylog
-  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
-           record->event.key.row, record->event.key.col,
-           keycode, name);
-}
-
-void oled_render_keylog(void) {
-    oled_write(keylog_str, false);
-}
-
-void render_bootmagic_status(bool status) {
-    /* Show Ctrl-Gui Swap options */
-    static const char PROGMEM logo[][2][3] = {
-        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
-        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
-    };
-    if (status) {
-        oled_write_ln_P(logo[0][0], false);
-        oled_write_ln_P(logo[0][1], false);
-    } else {
-        oled_write_ln_P(logo[1][0], false);
-        oled_write_ln_P(logo[1][1], false);
-    }
-}
-
-void oled_render_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_render_layer_state();
-        oled_render_keylog();
-    } else {
-        oled_render_logo();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    set_keylog(keycode, record);
-  }
-  return true;
-}
-#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/xyverz/rules.mk b/keyboards/crkbd/keymaps/xyverz/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/crkbd/keymaps/xyverz/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/crkbd/post_config.h b/keyboards/crkbd/post_config.h
index 133014b02ad..aaf405a5bf9 100644
--- a/keyboards/crkbd/post_config.h
+++ b/keyboards/crkbd/post_config.h
@@ -16,18 +16,18 @@
 
 #pragma once
 
-#ifndef BOOTMAGIC_LITE_ROW
-#    define BOOTMAGIC_LITE_ROW 0
+#ifndef BOOTMAGIC_ROW
+#    define BOOTMAGIC_ROW 0
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN
-#    define BOOTMAGIC_LITE_COLUMN 1
+#ifndef BOOTMAGIC_COLUMN
+#    define BOOTMAGIC_COLUMN 1
 #endif
 
-#ifndef BOOTMAGIC_LITE_ROW_RIGHT
-#    define BOOTMAGIC_LITE_ROW_RIGHT 4
+#ifndef BOOTMAGIC_ROW_RIGHT
+#    define BOOTMAGIC_ROW_RIGHT 4
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 1
+#ifndef BOOTMAGIC_COLUMN_RIGHT
+#    define BOOTMAGIC_COLUMN_RIGHT 1
 #endif
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
deleted file mode 100644
index 4c2e3744151..00000000000
--- a/keyboards/crkbd/r2g/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-Copyright 2021 Elliot Powell @e11i0t23
-
-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 RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 54
-#    define RGB_MATRIX_SPLIT \
-        { 27, 27 }
-#    define SPLIT_TRANSPORT_MIRROR
-
-#   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_SPIRAL_SAT
-#   define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#   define ENABLE_RGB_MATRIX_CYCLE_ALL
-#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#   define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#   define ENABLE_RGB_MATRIX_RAINDROPS
-#   define ENABLE_RGB_MATRIX_HUE_BREATHING
-#   define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// #   define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// #   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #   define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// #   define ENABLE_RGB_MATRIX_SPLASH
-// #   define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#endif
-
-#define SPLIT_USB_DETECT
-
diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json
index 8cdf07854e9..991a5301f49 100644
--- a/keyboards/crkbd/r2g/info.json
+++ b/keyboards/crkbd/r2g/info.json
@@ -3,7 +3,15 @@
         "rgb_matrix": true
     },
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        },
+        "usb_detect": {
+            "enabled": true
+        }
     },
     "rgblight": {
         "led_count": 54,
@@ -131,6 +139,23 @@
         }
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "rainbow_moving_chevron": true,
+            "cycle_spiral": true,
+            "raindrops": true,
+            "hue_breathing": true,
+            "pixel_fractal": true
+        },
+        "split_count": [27, 27],
         "layout": [
             {"x": 85, "y": 16, "flags": 2},
             {"x": 50, "y": 13, "flags": 2},
diff --git a/keyboards/crkbd/r2g/r2g.c b/keyboards/crkbd/r2g/r2g.c
index ef7b84b4a98..9a589a9e722 100644
--- a/keyboards/crkbd/r2g/r2g.c
+++ b/keyboards/crkbd/r2g/r2g.c
@@ -18,75 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "quantum.h"
 
-#ifdef RGB_MATRIX_ENABLE
-
-  // Logical Layout
-  // Columns
-  // Left
-  // 0  1  2  3  4  5
-  //                   ROWS
-  // 25 24 19 18 11 10   0
-  //    03    02    01
-  // 26 23 20 17 12 09   1
-  //    04    05    06
-  // 27 22 21 16 13 08   2
-  //
-  //          15 14 07   3
-  //
-  // Right
-  // 0  1  2  3  4  5
-  //                    ROWS
-  // 25 24 19 18 11 10   4
-  //    03    02    01
-  // 26 23 20 17 12 09   5
-  //    04    05    06
-  // 27 22 21 16 13 08   6
-  //
-  //          15 14 07   7
-  //
-  // Physical Layout
-  // Columns
-  // 0  1  2  3  4  5  6  7  8  9  10 11 12 13
-  //                                           ROWS
-  // 25 24 19 18 11 10       10 11 18 19 24 25  0
-  //    03    02    01       01    02    03
-  // 26 23 20 17 12 09       09 12 17 20 23 26  1
-  //    04                               04
-  // 27 22 21 16 13 08       08 13 16 21 22 27  2
-  //          05    06       06    05
-  //           15 14 07     07 14 15              3
-
-led_config_t g_led_config = { {
-    {  24,  23,  18,  17,  10,   9 },
-    {  25,  22,  19,  16,  11,   8 },
-    {  26,  21,  20,  15,  12,   7 },
-    { NO_LED, NO_LED, NO_LED,  14,  13,   6 },
-    {  51,  50,  45,  44,  37,  36 },
-    {  52,  49,  46,  43,  38,  35 },
-    {  53,  48,  47,  42,  39,  34 },
-    { NO_LED, NO_LED, NO_LED,  41,  40,  33 }
-}, {
-    {  85,  16 }, {  50,  13 }, {  16,  20 }, {  16,  38 }, {  50,  48 }, {  85,  52 }, {  95,  63 },
-    {  85,  39 }, {  85,  21 }, {  85,   4 }, {  68,   2 }, {  68,  19 }, {  68,  37 }, {  80,  58 },
-    {  60,  55 }, {  50,  35 }, {  50,  13 }, {  50,   0 }, {  33,   3 }, {  33,  20 }, {  33,  37 },
-    {  16,  42 }, {  16,  24 }, {  16,   7 }, {   0,   7 }, {   0,  24 }, {   0,  41 }, { 139,  16 },
-    { 174,  13 }, { 208,  20 }, { 208,  38 }, { 174,  48 }, { 139,  52 }, { 129,  63 }, { 139,  39 },
-    { 139,  21 }, { 139,   4 }, { 156,   2 }, { 156,  19 }, { 156,  37 }, { 144,  58 }, { 164,  55 },
-    { 174,  35 }, { 174,  13 }, { 174,   0 }, { 191,   3 }, { 191,  20 }, { 191,  37 }, { 208,  42 },
-    { 208,  24 }, { 208,   7 }, { 224,   7 }, { 224,  24 }, { 224,  41 }
-}, {
-    2, 2, 2, 2, 2, 2, 1,
-    4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 1, 1, 1, 2,
-    2, 2, 2, 2, 2, 1, 4,
-    4, 4, 4, 4, 4, 1, 1,
-    4, 4, 4, 4, 4, 4, 4,
-    4, 4, 1, 1, 1
-} };
-
-#endif
-
 #ifdef OLED_ENABLE
 void oled_render_logo(void) {
     static const char PROGMEM mb_logo[] = {
diff --git a/keyboards/crkbd/readme.md b/keyboards/crkbd/readme.md
index 75267463b29..4297ee56d90 100644
--- a/keyboards/crkbd/readme.md
+++ b/keyboards/crkbd/readme.md
@@ -43,7 +43,7 @@ And in your `config.h` file, add the following:
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#   define RGB_MATRIX_SLEEP // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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)
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
deleted file mode 100644
index 60a49100e3f..00000000000
--- a/keyboards/crkbd/rev1/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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 RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 54
-#    define RGB_MATRIX_SPLIT \
-        { 27, 27 }
-#    define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json
index 48a27d11f34..108bfb7370a 100644
--- a/keyboards/crkbd/rev1/info.json
+++ b/keyboards/crkbd/rev1/info.json
@@ -3,7 +3,12 @@
         "rgblight": true
     },
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
     },
     "rgblight": {
         "led_count": 54,
@@ -13,6 +18,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
+        "split_count": [27, 27],
         "layout": [
             {"x": 85, "y": 16, "flags": 2},
             {"x": 50, "y": 13, "flags": 2},
diff --git a/keyboards/custommk/cmk11/config.h b/keyboards/custommk/cmk11/config.h
new file mode 100644
index 00000000000..122d32c5da5
--- /dev/null
+++ b/keyboards/custommk/cmk11/config.h
@@ -0,0 +1,29 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// FRAM configuration
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN B7
+#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 4 // 48MHz / 4 = 12MHz; max supported by MB85R64 is 20MHz
+
+// SPI configuration
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+// Audio configuration
+#define AUDIO_PIN B8
+#define AUDIO_PWM_DRIVER PWMD4
+#define AUDIO_PWM_CHANNEL 3 
+#define AUDIO_PWM_PAL_MODE 2
+#define AUDIO_STATE_TIMER GPTD5
+#define AUDIO_INIT_DELAY
+
+// WS2812 configuration
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
diff --git a/keyboards/custommk/cmk11/halconf.h b/keyboards/custommk/cmk11/halconf.h
new file mode 100644
index 00000000000..6791d829f9b
--- /dev/null
+++ b/keyboards/custommk/cmk11/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2024 customMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SPI TRUE
+
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#define SERIAL_BUFFERS_SIZE 256
+
+// This enables interrupt-driven mode
+#define SPI_USE_WAIT TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/custommk/cmk11/info.json b/keyboards/custommk/cmk11/info.json
new file mode 100644
index 00000000000..d831351aa78
--- /dev/null
+++ b/keyboards/custommk/cmk11/info.json
@@ -0,0 +1,121 @@
+{
+    "manufacturer": "customMK",
+    "keyboard_name": "CMK11",
+    "maintainer": "customMK",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 32
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "A1", "A2", "A3", "A6", "B10"],
+        "rows": ["A5", "A4"]
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 45, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 90, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 134, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 179, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 23, "y": 64, "flags": 4},
+            {"matrix": [1, 1], "x": 68, "y": 64, "flags": 4},
+            {"matrix": [1, 2], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [1, 3], "x": 157, "y": 64, "flags": 4},
+            {"matrix": [1, 4], "x": 202, "y": 64, "flags": 4}
+        ],
+        "max_brightness": 120,
+        "sat_steps": 8,
+        "speed_steps": 10,
+        "val_steps": 8
+    },
+    "url": "https://shop.custommk.com/collections/cmk11/products/ckm11",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xFABA",
+        "vid": "0xF35B"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "A10"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [1, 0], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/custommk/cmk11/keymaps/default/keymap.c b/keyboards/custommk/cmk11/keymaps/default/keymap.c
new file mode 100644
index 00000000000..a6d6db48c94
--- /dev/null
+++ b/keyboards/custommk/cmk11/keymaps/default/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_C,    KC_V,   KC_VOLU, KC_VOLD, KC_DEL,
+        KC_LCTL, KC_PGUP, KC_SPC, KC_PGDN, KC_ENT
+    )
+};
diff --git a/keyboards/custommk/cmk11/keymaps/via/config.h b/keyboards/custommk/cmk11/keymaps/via/config.h
new file mode 100644
index 00000000000..c2dca382777
--- /dev/null
+++ b/keyboards/custommk/cmk11/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_MACRO_COUNT 128
diff --git a/keyboards/custommk/cmk11/keymaps/via/keymap.c b/keyboards/custommk/cmk11/keymaps/via/keymap.c
new file mode 100644
index 00000000000..a4ee324f3fb
--- /dev/null
+++ b/keyboards/custommk/cmk11/keymaps/via/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_C,    KC_V,   KC_VOLU, KC_VOLD, KC_DEL,
+        KC_LCTL, KC_PGUP, KC_SPC, KC_PGDN, MO(1)
+    )
+};
diff --git a/keyboards/7c8/framework/keymaps/steven/rules.mk b/keyboards/custommk/cmk11/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/7c8/framework/keymaps/steven/rules.mk
rename to keyboards/custommk/cmk11/keymaps/via/rules.mk
diff --git a/keyboards/custommk/cmk11/mcuconf.h b/keyboards/custommk/cmk11/mcuconf.h
new file mode 100644
index 00000000000..8151abdcba3
--- /dev/null
+++ b/keyboards/custommk/cmk11/mcuconf.h
@@ -0,0 +1,31 @@
+/* Copyright 2024 customMK
+ *
+ * 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_next <mcuconf.h>
+
+// Used for audio
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+// Used for FRAM
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+// Used for RGB matrix
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
\ No newline at end of file
diff --git a/keyboards/custommk/cmk11/readme.md b/keyboards/custommk/cmk11/readme.md
new file mode 100644
index 00000000000..961261ac664
--- /dev/null
+++ b/keyboards/custommk/cmk11/readme.md
@@ -0,0 +1,27 @@
+# CMK11
+
+![cmk11](https://i.imgur.com/y8MEwXYh.jpeg)
+
+CMK11 supports eleven 1u keys (or eight 1u keys and one 3u key). The PCB is fully compatible with the Cary Works C11 macropad.
+
+* Keyboard Maintainer: [customMK](https://github.com/customMK)
+* Hardware Supported: CMK11
+* Hardware Availability: [customMK](https://shop.custommk.com/products/cmk11)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make custommk/cmk11:default
+
+Flashing example for this keyboard:
+
+    make custommk/cmk11: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 (the key in the top left corner) 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 `QK_BOOT` if it is available
diff --git a/keyboards/custommk/cmk11/rules.mk b/keyboards/custommk/cmk11/rules.mk
new file mode 100644
index 00000000000..72f75f4367e
--- /dev/null
+++ b/keyboards/custommk/cmk11/rules.mk
@@ -0,0 +1 @@
+AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/custommk/genesis/rev1/keymaps/numpad/keymap.c b/keyboards/custommk/genesis/rev1/keymaps/numpad/keymap.c
deleted file mode 100644
index 97970191da7..00000000000
--- a/keyboards/custommk/genesis/rev1/keymaps/numpad/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2020 customMK
- *
- * 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(
-			MO(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_ENT),
-
-	[1] = LAYOUT_numpad_5x4(
-			KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, 
-			KC_TRNS, KC_TRNS, KC_TRNS,   
-			RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, 
-			KC_TRNS, KC_TRNS, KC_TRNS, 	 
-			RGB_HUI, 	      KC_TRNS, RGB_HUD),
-
-	[2] = LAYOUT_numpad_5x4(
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, 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_numpad_5x4(
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, 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/custommk/genesis/rev1/keymaps/numpad/readme.md b/keyboards/custommk/genesis/rev1/keymaps/numpad/readme.md
deleted file mode 100644
index 795e4341a96..00000000000
--- a/keyboards/custommk/genesis/rev1/keymaps/numpad/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Numpad Genesis Macro Pad Layout
-
-This is the numpad layout for the Genesis Macro Pad. It assumes the 0, +, and enter keys are all 2u size, with an optional rotary encoder in the top-left or top-right corner for media volume control. The top left switch activates Layer 1 which enables control of the RGB underglow.
\ No newline at end of file
diff --git a/keyboards/custommk/genesis/rev2/keymaps/numpad/keymap.c b/keyboards/custommk/genesis/rev2/keymaps/numpad/keymap.c
deleted file mode 100644
index e6b84c3f6be..00000000000
--- a/keyboards/custommk/genesis/rev2/keymaps/numpad/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2020 customMK
- *
- * 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 GENESIS_LAYER_COLORS
-#define GENESIS_LAYER1_COLOR HSV_CYAN
-#define GENESIS_LAYER2_COLOR HSV_GREEN
-#define GENESIS_LAYER3_COLOR HSV_WHITE
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT_numpad_5x4(
-			MO(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_ENT),
-
-	[1] = LAYOUT_numpad_5x4(
-			KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, 
-			KC_TRNS, KC_TRNS, KC_TRNS,   
-			RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, 
-			KC_TRNS, KC_TRNS, KC_TRNS, 	 
-			RGB_HUI, 	      KC_TRNS, RGB_HUD),
-
-	[2] = LAYOUT_numpad_5x4(
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, 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_numpad_5x4(
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS,   
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-			KC_TRNS, KC_TRNS, KC_TRNS,   
-			KC_TRNS,          KC_TRNS, KC_TRNS),
-
-};
-
-
-#ifdef GENESIS_LAYER_COLORS
-const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,13,GENESIS_LAYER1_COLOR}
-	);
-
-const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,13,GENESIS_LAYER2_COLOR}
-	);
-
-const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,13,GENESIS_LAYER3_COLOR}
-	);
-
-
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-		my_layer1_layer,
-		my_layer2_layer,
-		my_layer3_layer
-	);
-
-//Set the appropriate layer color
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(1, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 3));
-    return state;
-}
-
-void keyboard_post_init_user(void) {
-	//Enable the LED layers
-	rgblight_layers = my_rgb_layers;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/custommk/genesis/rev2/keymaps/numpad/readme.md b/keyboards/custommk/genesis/rev2/keymaps/numpad/readme.md
deleted file mode 100644
index 795e4341a96..00000000000
--- a/keyboards/custommk/genesis/rev2/keymaps/numpad/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Numpad Genesis Macro Pad Layout
-
-This is the numpad layout for the Genesis Macro Pad. It assumes the 0, +, and enter keys are all 2u size, with an optional rotary encoder in the top-left or top-right corner for media volume control. The top left switch activates Layer 1 which enables control of the RGB underglow.
\ No newline at end of file
diff --git a/keyboards/cutie_club/wraith/keymaps/amber/config.h b/keyboards/cutie_club/wraith/keymaps/amber/config.h
deleted file mode 100644
index b825835bb49..00000000000
--- a/keyboards/cutie_club/wraith/keymaps/amber/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Amber Holly
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/cutie_club/wraith/keymaps/amber/keymap.c b/keyboards/cutie_club/wraith/keymaps/amber/keymap.c
deleted file mode 100644
index f3ea61ba5e3..00000000000
--- a/keyboards/cutie_club/wraith/keymaps/amber/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2019 Amber Holly
- *
- * 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 the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-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_PSCR,    KC_BRK,
-    KC_GRV,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,      KC_MINS,   KC_EQL,    KC_BSPC,    KC_INS,
-    KC_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_DEL,
-    KC_LCTL,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,   KC_QUOT,   KC_BSLS,   KC_ENT,     MO(1),
-    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_RGUI,
-    KC_CAPS,             KC_LALT,                                          KC_SPC,                                  KC_RALT,   KC_LEFT,   KC_DOWN,    KC_RGHT
-  ),
-  [1] = LAYOUT_all(
-    QK_BOOT,    KC_F13,     KC_F14,     KC_F15,     KC_F16,     KC_F17,     KC_F18,     KC_F19,     KC_F20,     KC_F21,     KC_F22,     KC_F23,     KC_F24,     _______,    _______,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-	  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,
-	  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_TRNS,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-    _______,                _______,                                        _______,                                                    _______,    KC_MPRV,    _______,    KC_MNXT
-  )
-};
-
-void matrix_scan_user(void) {
-  // escape LED on layer 1
-  if (IS_LAYER_ON(1)) {
-    writePinLow(B0);
-  } else {
-    writePinHigh(B0);
-  }
-}
diff --git a/keyboards/cutie_club/wraith/keymaps/amber/readme.md b/keyboards/cutie_club/wraith/keymaps/amber/readme.md
deleted file mode 100644
index 013ae7f109d..00000000000
--- a/keyboards/cutie_club/wraith/keymaps/amber/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Amber's personal keymap
diff --git a/keyboards/cutie_club/wraith/keymaps/timer/config.h b/keyboards/cutie_club/wraith/keymaps/timer/config.h
deleted file mode 100644
index f6f1af659d1..00000000000
--- a/keyboards/cutie_club/wraith/keymaps/timer/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Amber Holly
- *
- * 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 LAYER_TIMEOUT 10000
-#define TIMEOUT_WARNING 3000
-#define FLASH_PERIOD 250
-#define SPEED_SCALE 2
-#define TIMEOUT_SCALE 4
-#define LAYER_SWITCH 1 // the layer to switch to
-#define GET_FLASH_PERIOD ((layer_time_remaining <= TIMEOUT_WARNING/TIMEOUT_SCALE) ? FLASH_PERIOD/SPEED_SCALE : FLASH_PERIOD)
diff --git a/keyboards/cutie_club/wraith/keymaps/timer/keymap.c b/keyboards/cutie_club/wraith/keymaps/timer/keymap.c
deleted file mode 100644
index 57d894ebc9e..00000000000
--- a/keyboards/cutie_club/wraith/keymaps/timer/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2019 Amber Holly
- *
- * 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
-
-int layer_time_remaining;
-uint16_t prev_loop_time;
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-   TIME_TOGGLE = SAFE_RANGE
-};
-
-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_PSCR,    KC_BRK,
-    KC_GRV,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,      KC_MINS,   KC_EQL,    KC_BSPC,    KC_INS,
-    KC_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_DEL,
-    KC_LCTL,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,   KC_QUOT,   KC_BSLS,   KC_ENT,     TIME_TOGGLE,
-    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_RGUI,
-    KC_CAPS,             KC_LALT,                                          KC_SPC,                                  KC_RALT,   KC_LEFT,   KC_DOWN,    KC_RGHT
-  ),
-  [1] = LAYOUT_all(
-    QK_BOOT,    KC_F13,     KC_F14,     KC_F15,     KC_F16,     KC_F17,     KC_F18,     KC_F19,     KC_F20,     KC_F21,     KC_F22,     KC_F23,     KC_F24,     _______,    _______,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_TRNS,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-    _______,                _______,                                        _______,                                                    KC_MPLY,    KC_MPRV,    _______,    KC_MNXT
-  )
-};
-
-void matrix_scan_user(void) {
-  layer_time_remaining -= timer_read()-prev_loop_time; //amount of time elapsed since the start of the previous loop
-  prev_loop_time = timer_read(); //start counting the time to check at the next iteration
-
-  if (layer_time_remaining <= 0) {
-  	// once timer run out
-  	layer_off(LAYER_SWITCH);
-  }
-
-  // escape LED on layer 1
-  if (IS_LAYER_ON(LAYER_SWITCH)) {
-    if (layer_time_remaining <= TIMEOUT_WARNING) {
-      if ((int)(layer_time_remaining/GET_FLASH_PERIOD % 2 == 0)) {
-		    // if even led on
-		    writePinLow(B0);
-		  } else {
-		    writePinHigh(B0);
-		  }
-    } else {
-      writePinLow(B0);
-    }
-  } else {
-    writePinHigh(B0);
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case TIME_TOGGLE:
-			// get the time when time toggle pressed
-			layer_time_remaining = LAYER_TIMEOUT;
-			// set the layer
-			layer_on(LAYER_SWITCH);
-    break;
-  }
-  return true;
-};
diff --git a/keyboards/cutie_club/wraith/keymaps/timer/readme.md b/keyboards/cutie_club/wraith/keymaps/timer/readme.md
deleted file mode 100644
index 1e812f3aedd..00000000000
--- a/keyboards/cutie_club/wraith/keymaps/timer/readme.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Timed function layer keymap
-
-Amber's personal keymap for the Wraith, but with a custom timed function layer keycode.  `config.h` contains defines that you can edit to control various aspects of this function.
-
-## How does it work?
-We are reading QMK's software timer in `matrix_scan_user()`.
-
-Once the `TIME_TOGGLE` key is pressed, `layer_time_remaining` is set equal to `LAYER_TIMEOUT`, the layer defined in `LAYER_SWITCH` becomes active, and the LED on the Escape key (pin B0) will light up.
-
-Each time the matrix is scanned, the software timer is read, and the value of `layer_time_remaining` is decreased by `prev_loop_time` - the amount of time elapsed since the last matrix scan.
-
-When there are `TIMEOUT_WARNING`ms left in `LAYER_TIMEOUT`, the LED will begin to flash at intervals of `FLASH_PERIOD`ms.
-
-When there are `TIMEOUT_WARNING/TIMEOUT_SCALE`ms left, the LED will begin to flash at intervals of `FLASH_PERIOD/SPEED_SCALE`ms.
-
-When `layer_time_remaining` is equal to or less than 0, the layer defined in `LAYER_SWITCH` is removed from the layer stack.
-
-
-## What are the defaults?
-`LAYER_TIMEOUT` controls how long the layer will stay active for. The default is 10 seconds.
-
-`TIMEOUT_WARNING` controls how long the warning (LED flash) will occur before the layer becomes inactive. The default is 3 seconds.
-
-`FLASH_PERIOD` controls how long each LED flash interval is in the warning time. The default flash period is 250ms.
-
-`SPEED_SCALE` controls how many times faster the LED will flash in the second flash period. The default scale is 2, twice as fast.
-
-`TIMEOUT_SCALE` controls the length of the second flash period, relative to `TIMEOUT_WARNING`. The default scale is 4; for 750ms of the secondary flash period.
-
-`LAYER_SWITCH` is the layer that will be activated by the key. The default is layer 1.
diff --git a/keyboards/cxt_studio/config.h b/keyboards/cxt_studio/config.h
index 5c60daad9d0..e56e07a2545 100644
--- a/keyboards/cxt_studio/config.h
+++ b/keyboards/cxt_studio/config.h
@@ -3,31 +3,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 12
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-
-#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_TYPING_HEATMAP_SPREAD 9
 
 /*
diff --git a/keyboards/cxt_studio/info.json b/keyboards/cxt_studio/info.json
index 6166ea22961..7ee7b52d50c 100644
--- a/keyboards/cxt_studio/info.json
+++ b/keyboards/cxt_studio/info.json
@@ -31,21 +31,40 @@
     },
     "processor": "atmega32u4",
     "rgb_matrix": {
-       "driver": "ws2812",
-       "layout": [
-         {"flags": 4, "matrix": [0, 3], "x": 3, "y": 0},
-         {"flags": 4, "matrix": [0, 2], "x": 2, "y": 0},
-         {"flags": 4, "matrix": [0, 1], "x": 1, "y": 0},
-         {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
-         {"flags": 4, "matrix": [1, 0], "x": 0, "y": 1},
-         {"flags": 4, "matrix": [1, 1], "x": 1, "y": 1},
-         {"flags": 4, "matrix": [1, 2], "x": 2, "y": 1},
-         {"flags": 4, "matrix": [1, 3], "x": 3, "y": 1},
-         {"flags": 4, "matrix": [2, 3], "x": 3, "y": 2},
-         {"flags": 4, "matrix": [2, 2], "x": 2, "y": 2},
-         {"flags": 4, "matrix": [2, 1], "x": 1, "y": 2},
-         {"flags": 4, "matrix": [2, 0], "x": 0, "y": 2}
-       ]
+        "animations": {
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "typing_heatmap"
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"flags": 4, "matrix": [0, 3], "x": 3, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 2, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 1, "y": 0},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 1},
+            {"flags": 4, "matrix": [1, 1], "x": 1, "y": 1},
+            {"flags": 4, "matrix": [1, 2], "x": 2, "y": 1},
+            {"flags": 4, "matrix": [1, 3], "x": 3, "y": 1},
+            {"flags": 4, "matrix": [2, 3], "x": 3, "y": 2},
+            {"flags": 4, "matrix": [2, 2], "x": 2, "y": 2},
+            {"flags": 4, "matrix": [2, 1], "x": 1, "y": 2},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 2}
+        ]
     },
     "url": "",
     "usb": {
diff --git a/keyboards/daji/seis_cinco/keymaps/split_backspace/keymap.c b/keyboards/daji/seis_cinco/keymaps/split_backspace/keymap.c
deleted file mode 100644
index 0182874e236..00000000000
--- a/keyboards/daji/seis_cinco/keymaps/split_backspace/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 B. Fletcher
- * 
- * 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(
-    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_GRV,  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,            MO(1),
-    KC_LCTL,  KC_LGUI,  KC_LALT,                       KC_SPC,                          KC_RGUI,            KC_LEFT, KC_DOWN,          KC_RIGHT),
-
-  [1] = LAYOUT_all(
-    QK_BOOT, 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_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/dark/magnum_ergo_1/config.h b/keyboards/dark/magnum_ergo_1/config.h
index 207bc978e87..6b153f69df6 100644
--- a/keyboards/dark/magnum_ergo_1/config.h
+++ b/keyboards/dark/magnum_ergo_1/config.h
@@ -30,6 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_INDICATOR_3   B0
 #define LED_INDICATOR_4   A5
 #define LED_INDICATOR_5  C15
-
-#define WEAR_LEVELING_LOGICAL_SIZE    2048
-#define WEAR_LEVELING_BACKING_SIZE    4096
diff --git a/keyboards/dark/magnum_ergo_1/info.json b/keyboards/dark/magnum_ergo_1/info.json
index a213d92fd56..cdabceec7f9 100644
--- a/keyboards/dark/magnum_ergo_1/info.json
+++ b/keyboards/dark/magnum_ergo_1/info.json
@@ -8,6 +8,14 @@
         "pid": "0x4D45",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "features": {
         "audio": false,
         "backlight": true,
@@ -16,7 +24,6 @@
         "console": false,
         "encoder": false,
         "extrakey": true,
-        "lto": true,
         "mousekey": false,
         "nkro": true,
         "rgblight": false
diff --git a/keyboards/darkproject/kd83a_bfg_edition/config.h b/keyboards/darkproject/kd83a_bfg_edition/config.h
index 9cf993b8613..cb7cdb57fc1 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/config.h
+++ b/keyboards/darkproject/kd83a_bfg_edition/config.h
@@ -21,11 +21,8 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
 
 /* SPI Config for LED Driver */
 #define SPI_DRIVER SPIDQ
@@ -33,12 +30,6 @@
 #define SPI_MOSI_PIN A7
 #define SPI_MISO_PIN A6
 
-#define DRIVER_1_CS A15
-#define DRIVER_2_CS B15
-#define DRIVER_1_EN C13
-#define DRIVER_2_EN C13
-
-#define DRIVER_COUNT 2
-#define DRIVER_1_LED_TOTAL 66
-#define DRIVER_2_LED_TOTAL 19
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define AW20216S_CS_PIN_1 A15
+#define AW20216S_CS_PIN_2 B15
+#define AW20216S_EN_PIN C13
diff --git a/keyboards/darkproject/kd83a_bfg_edition/info.json b/keyboards/darkproject/kd83a_bfg_edition/info.json
index 5795c11cca3..56c45a222f3 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/info.json
+++ b/keyboards/darkproject/kd83a_bfg_edition/info.json
@@ -80,7 +80,7 @@
             "solid_multisplash": true
         },
         "center_point": [76, 25],
-        "driver": "aw20216",
+        "driver": "aw20216s",
         "layout": [
             { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
             { "flags": 4, "matrix": [2, 6], "x": 20, "y": 0 },
@@ -167,7 +167,8 @@
             { "flags": 4, "matrix": [0, 5], "x": 150, "y": 50 },
             { "flags": 4, "matrix": [11, 0], "x": 0, "y": 1 },
             { "flags": 4, "matrix": [11, 1], "x": 0, "y": 2 }
-        ]
+        ],
+        "sleep": true
     },
     "url": "",
     "usb": {
@@ -176,7 +177,11 @@
         "vid": "0x342D"
     },
     "eeprom": {
-        "driver": "wear_leveling"
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 8192
+        }
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
index e78de78bf80..f21aeeb38d3 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
+++ b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
@@ -18,106 +18,106 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, k00, Esc
-
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   1, k13, Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   2, k26, F1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   3, k36, F2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   4, k31, F3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   5, k33, F4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   6, k07, F5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   7, k63, F6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   8, k71, F7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   9, k76, F8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  10, ka6, F9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  11, ka7, F10
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  12, ka3, F11
-    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  13, ka5, F12
-    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  14, k97, Printscreen
-    {1, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  15, k02, Del
-
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  16, k16, `
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  17, k17, 1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  18, k27, 2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  19, k37, 3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  20, k47, 4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  21, k46, 5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  22, k56, 6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  23, k57, 7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  24, k67, 8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  25, k77, 9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  26, k87, 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  27, k86, -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  28, k66, =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  29, ka1, Backspace
-    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  30, kc6, Home
-
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  31, k11, Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  32, k10, Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  33, k20, W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  34, k30, E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  35, k40, R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  36, k41, T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  37, k51, Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  38, k50, U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  39, k60, I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  40, k70, O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  41, k80, P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  42, k81, [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  43, k61, ]
-    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  44, ka2, "\\"
-    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  45, k65, End
-
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  46, k21, Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  47, k12, A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  48, k22, S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  49, k32, D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  50, k42, F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  51, k43, G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  52, k53, H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  53, k52, J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  54, k62, K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  55, k72, L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  56, k82, ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  57, k83, '
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  58, ka4, Enter
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  59, k15, PgUp
-
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  60, k00, Shift_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  61, k14, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  62, k24, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  63, k34, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  64, k44, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  65, k45, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  66, k55, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  67, k54, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  68, k64, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  69, k74, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  70, k85, /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  71, k91, Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  72, k35, Up
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  73, k25, PgDn
-
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  74, k06, Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  75, k90, Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  76, k93, Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  77, k94, Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  78, k95, Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  79, k92, FN
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  80, k04, Ctrl_R
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  81, k03, Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  82, k73, Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  83, k05, Right
-
-    {1, CS10_SW10, CS11_SW10, CS12_SW10}, //  84, kb0, Z1
-    {1, CS10_SW11, CS11_SW11, CS12_SW11}, //  85, kb1, Z2
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   0, k00, Esc
+
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   1, k13, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   2, k26, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   3, k36, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   4, k31, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   5, k33, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   6, k07, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   7, k63, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   8, k71, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   9, k76, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  10, ka6, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  11, ka7, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  12, ka3, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  13, ka5, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  14, k97, Printscreen
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  15, k02, Del
+
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  16, k16, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  17, k17, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  18, k27, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  19, k37, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  20, k47, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  21, k46, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  22, k56, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  23, k57, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  24, k67, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  25, k77, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  26, k87, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  27, k86, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  28, k66, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  29, ka1, Backspace
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  30, kc6, Home
+
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  31, k11, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  32, k10, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  33, k20, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  34, k30, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  35, k40, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  36, k41, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  37, k51, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  38, k50, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  39, k60, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  40, k70, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  41, k80, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  42, k81, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  43, k61, ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  44, ka2, "\\"
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  45, k65, End
+
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  46, k21, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  47, k12, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  48, k22, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  49, k32, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  50, k42, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  51, k43, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  52, k53, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  53, k52, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  54, k62, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  55, k72, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  56, k82, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  57, k83, '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  58, ka4, Enter
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  59, k15, PgUp
+
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  60, k00, Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  61, k14, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  62, k24, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  63, k34, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  64, k44, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  65, k45, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  66, k55, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  67, k54, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  68, k64, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  69, k74, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  70, k85, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  71, k91, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  72, k35, Up
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  73, k25, PgDn
+
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  74, k06, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  75, k90, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  76, k93, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  77, k94, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  78, k95, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  79, k92, FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  80, k04, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  81, k03, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  82, k73, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  83, k05, Right
+
+    {1, SW10_CS10, SW10_CS11, SW10_CS12}, //  84, kb0, Z1
+    {1, SW11_CS10, SW11_CS11, SW11_CS12}, //  85, kb1, Z2
 };
 
 #endif
diff --git a/keyboards/darkproject/kd83a_bfg_edition/rules.mk b/keyboards/darkproject/kd83a_bfg_edition/rules.mk
index 07eb511a199..6e7633bfe01 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/rules.mk
+++ b/keyboards/darkproject/kd83a_bfg_edition/rules.mk
@@ -1 +1 @@
-WEAR_LEVELING_DRIVER = spi_flash
\ No newline at end of file
+# This file intentionally left blank
diff --git a/keyboards/darkproject/kd87a_bfg_edition/config.h b/keyboards/darkproject/kd87a_bfg_edition/config.h
index 4ac83ab9f62..1d4c0772a24 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/config.h
+++ b/keyboards/darkproject/kd87a_bfg_edition/config.h
@@ -21,8 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
 
@@ -32,11 +30,6 @@
 #define SPI_MOSI_PIN A7
 #define SPI_MISO_PIN A6
 
-#define DRIVER_1_CS A15
-#define DRIVER_2_CS B15
-#define DRIVER_1_EN C13
-#define DRIVER_2_EN C13
-
-#define DRIVER_1_LED_TOTAL 68
-#define DRIVER_2_LED_TOTAL 54
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define AW20216S_CS_PIN_1 A15
+#define AW20216S_CS_PIN_2 B15
+#define AW20216S_EN_PIN C13
diff --git a/keyboards/darkproject/kd87a_bfg_edition/info.json b/keyboards/darkproject/kd87a_bfg_edition/info.json
index 94717c6baac..76cd497b0f3 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/info.json
+++ b/keyboards/darkproject/kd87a_bfg_edition/info.json
@@ -79,7 +79,7 @@
             "solid_multisplash": true
         },
         "center_point": [87, 35],
-        "driver": "aw20216",
+        "driver": "aw20216s",
         "layout": [
             { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
             { "flags": 4, "matrix": [2, 6], "x": 20, "y": 0 },
@@ -173,7 +173,8 @@
             { "flags": 4, "matrix": [0, 3], "x": 155, "y": 55 },
             { "flags": 4, "matrix": [7, 3], "x": 165, "y": 55 },
             { "flags": 4, "matrix": [0, 5], "x": 175, "y": 55 }
-        ]
+        ],
+        "sleep": true
     },
     "url": "",
     "usb": {
diff --git a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
index 0ce0799e14c..20a46e343ea 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
+++ b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
@@ -18,107 +18,107 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, Esc
-
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   1, Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   2, F1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   3, F2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   4, F3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   5, F4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   6, F5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   7, F6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   8, F7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   9, F8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  10, F9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  11, F10
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  12, F11
-    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  13, F12
-    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  14, Printscreen
-    {1, CS1_SW3,   CS2_SW3,   CS3_SW3},   //  15, Scroll Lock
-    {1, CS1_SW4,   CS2_SW4,   CS3_SW4},   //  16, Pause Break
-
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  17, `
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  18, 1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  19, 2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  20, 3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  21, 4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  22, 5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  23, 6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  24, 7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  25, 8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  26, 9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  27, 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  28, -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  29, =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  30, Backspace
-    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  31, Insert
-    {1, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  32, Home
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  33, Page Up
-
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  34, Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  35, Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  36, W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  37, E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  38, R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  39, T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  40, Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  41, U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  42, I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  43, O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  44, P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  45, [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  46, ]
-    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  47, "\\"
-    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  48, Delete
-    {1, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  49, END
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  50, Page down
-
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  51, Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  52, A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  53, S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  54, D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  55, F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  56, G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  57, H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  58, J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  59, K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  60, L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  61, ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  62, '
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  63, Enter
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   0, Esc
+
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   1, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   2, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   3, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   4, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   5, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   6, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   7, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   8, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   9, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  10, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  11, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  12, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  13, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  14, Printscreen
+    {1, SW3_CS1,   SW3_CS2,   SW3_CS3},   //  15, Scroll Lock
+    {1, SW4_CS1,   SW4_CS2,   SW4_CS3},   //  16, Pause Break
+
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  17, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  18, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  19, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  20, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  21, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  22, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  23, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  24, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  25, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  26, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  27, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  28, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  29, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  30, Backspace
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  31, Insert
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  32, Home
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  33, Page Up
+
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  34, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  35, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  36, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  37, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  38, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  39, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  40, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  41, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  42, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  43, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  44, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  45, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  46, ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  47, "\\"
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  48, Delete
+    {1, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  49, END
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  50, Page down
+
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  51, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  52, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  53, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  54, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  55, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  56, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  57, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  58, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  59, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  60, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  61, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  62, '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  63, Enter
     
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  64, Shift_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  65, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  66, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  67, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  68, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  69, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  70, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  71, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  72, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  73, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  74, /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  75, Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  76, Up
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  64, Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  65, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  66, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  67, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  68, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  69, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  70, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  71, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  72, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  73, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  74, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  75, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  76, Up
     
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  77, Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  78, Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  79, Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  80, Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  81, Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  82, FN
-    {0, CS16_SW11, CS17_SW11, CS18_SW11}, //  83, APP
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  84, Ctrl_R
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  85, Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  86, Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  87, Right
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  77, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  78, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  79, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  80, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  81, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  82, FN
+    {0, SW11_CS16, SW11_CS17, SW11_CS18}, //  83, APP
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  84, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  85, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  86, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  87, Right
 };
 
 #endif
diff --git a/keyboards/darmoshark/k3/config.h b/keyboards/darmoshark/k3/config.h
new file mode 100644
index 00000000000..c3cf83a9849
--- /dev/null
+++ b/keyboards/darmoshark/k3/config.h
@@ -0,0 +1,12 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
diff --git a/keyboards/darmoshark/k3/halconf.h b/keyboards/darmoshark/k3/halconf.h
new file mode 100644
index 00000000000..b6a606056a1
--- /dev/null
+++ b/keyboards/darmoshark/k3/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/darmoshark/k3/info.json b/keyboards/darmoshark/k3/info.json
new file mode 100644
index 00000000000..ff5047b93ae
--- /dev/null
+++ b/keyboards/darmoshark/k3/info.json
@@ -0,0 +1,182 @@
+{
+    "manufacturer": "Darmoshark",
+    "keyboard_name": "K3 QMK",
+    "maintainer": "Proceee",
+    "url": "",
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xC001",
+        "pid": "0x3667",
+        "suspend_wakeup_delay": 1000
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 4096
+        }
+    },
+    "matrix_pins": {
+        "rows": ["B13", "A1", "A2", "A3", "A4", "B7"],
+        "cols": ["B1", "C7", "C13", "B9"]
+    },
+    "indicators": {
+        "num_lock": "C5",
+        "on_state": 1
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "default":{
+          "val": 80
+        },
+        "sleep": true,
+        "center_point": [24, 32],
+        "max_brightness": 140,
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "layout": [
+            { "flags": 4, "matrix":[0,2], "x": 32, "y": 0},
+            { "flags": 4, "matrix":[0,3], "x": 48, "y": 0},
+
+            { "flags": 4, "matrix":[1,3], "x": 48, "y": 13},
+            { "flags": 4, "matrix":[2,3], "x": 48, "y": 26},
+            { "flags": 4, "matrix":[4,3], "x": 48, "y": 51},
+
+            { "flags": 4, "matrix":[5,2], "x": 48, "y": 64},
+            { "flags": 4, "matrix":[4,2], "x": 32, "y": 51},
+            { "flags": 4, "matrix":[3,2], "x": 32, "y": 38},
+            { "flags": 4, "matrix":[2,2], "x": 32, "y": 26},
+            { "flags": 4, "matrix":[1,2], "x": 32, "y": 13},
+
+            { "flags": 4, "matrix":[1,1], "x":  16, "y": 13},
+            { "flags": 4, "matrix":[2,1], "x":  16, "y": 26},
+            { "flags": 4, "matrix":[3,1], "x":  16, "y": 38},
+            { "flags": 4, "matrix":[4,1], "x":  16, "y": 51},
+
+            { "flags": 4, "matrix":[5,1], "x":  0, "y": 64},
+            { "flags": 4, "matrix":[4,0], "x":  0, "y": 51},
+            { "flags": 4, "matrix":[3,0], "x":  0, "y": 38},
+            { "flags": 4, "matrix":[2,0], "x":  0, "y": 26},
+            { "flags": 4, "matrix":[1,0], "x":  0, "y": 13},
+            { "flags": 4, "matrix":[0,0], "x":  0, "y": 0},
+
+            { "flags": 4, "matrix":[0,1], "x":  16, "y": 0},
+
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64},
+            { "flags": 4, "x": 224, "y": 64}
+        ]
+    },
+    "community_layouts": ["numpad_6x4"],
+    "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                { "matrix":[0,0], "x": 0, "y": 0 },
+                { "matrix":[0,1], "x": 1, "y": 0 },
+                { "matrix":[0,2], "x": 2, "y": 0 },
+                { "matrix":[0,3], "x": 3, "y": 0 },
+
+                { "matrix":[1,0], "x": 0, "y": 1 },
+                { "matrix":[1,1], "x": 1, "y": 1 },
+                { "matrix":[1,2], "x": 2, "y": 1 },
+                { "matrix":[1,3], "x": 3, "y": 1 },
+
+                { "matrix":[2,0], "x": 0, "y": 2 },
+                { "matrix":[2,1], "x": 1, "y": 2 },
+                { "matrix":[2,2], "x": 2, "y": 2 },
+
+                { "matrix":[3,0], "x": 0, "y": 3 },
+                { "matrix":[3,1], "x": 1, "y": 3 },
+                { "matrix":[3,2], "x": 2, "y": 3 },
+                { "matrix":[2,3], "x": 3, "y": 2, "h": 2 },
+
+                { "matrix":[4,0], "x": 0, "y": 4 },
+                { "matrix":[4,1], "x": 1, "y": 4 },
+                { "matrix":[4,2], "x": 2, "y": 4 },
+
+                { "matrix":[5,1],  "x": 0, "y": 5, "w": 2 },
+                { "matrix":[5,2],  "x": 2, "y": 5 },
+                { "matrix":[4,3], "x": 3, "y": 4, "h": 2 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/darmoshark/k3/keymaps/default/keymap.c b/keyboards/darmoshark/k3/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5c49cab1a3e
--- /dev/null
+++ b/keyboards/darmoshark/k3/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_numpad_6x4(
+        KC_ESC,   KC_TAB,   KC_BSPC,  MO(1),
+        KC_NUM,   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(
+        EE_CLR,   _______,  RGB_MOD,  _______,
+        KC_CALC,  _______,  _______,  RGB_VAD,
+        _______,  RGB_SPI,  _______,
+        _______,  _______,  _______,  RGB_VAI,
+        _______,  RGB_SPD,  _______,
+        _______,            RGB_TOG,  _______
+    )
+};
diff --git a/keyboards/darmoshark/k3/keymaps/via/config.h b/keyboards/darmoshark/k3/keymaps/via/config.h
new file mode 100644
index 00000000000..5e18cd01164
--- /dev/null
+++ b/keyboards/darmoshark/k3/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
diff --git a/keyboards/darmoshark/k3/keymaps/via/keymap.c b/keyboards/darmoshark/k3/keymaps/via/keymap.c
new file mode 100644
index 00000000000..5c49cab1a3e
--- /dev/null
+++ b/keyboards/darmoshark/k3/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_numpad_6x4(
+        KC_ESC,   KC_TAB,   KC_BSPC,  MO(1),
+        KC_NUM,   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(
+        EE_CLR,   _______,  RGB_MOD,  _______,
+        KC_CALC,  _______,  _______,  RGB_VAD,
+        _______,  RGB_SPI,  _______,
+        _______,  _______,  _______,  RGB_VAI,
+        _______,  RGB_SPD,  _______,
+        _______,            RGB_TOG,  _______
+    )
+};
diff --git a/keyboards/kudox/rev3/keymaps/via/rules.mk b/keyboards/darmoshark/k3/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kudox/rev3/keymaps/via/rules.mk
rename to keyboards/darmoshark/k3/keymaps/via/rules.mk
diff --git a/keyboards/darmoshark/k3/mcuconf.h b/keyboards/darmoshark/k3/mcuconf.h
new file mode 100644
index 00000000000..182db617aa8
--- /dev/null
+++ b/keyboards/darmoshark/k3/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Proceee
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
diff --git a/keyboards/darmoshark/k3/readme.md b/keyboards/darmoshark/k3/readme.md
new file mode 100644
index 00000000000..aecfe659357
--- /dev/null
+++ b/keyboards/darmoshark/k3/readme.md
@@ -0,0 +1,23 @@
+# K3 QMK
+
+* Keyboard Maintainer: [Proceee](https://github.com/Proceee)
+* Hardware Supported: [Darmoshark](http://www.Darmoshark.cn)
+* Hardware Availability: [Darmoshark](http://www.Darmoshark.cn)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make darmoshark/k3:default
+
+Flashing example for this keyboard:
+
+    make darmoshark/k3: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 `QK_BOOT` if it is available
diff --git a/keyboards/darmoshark/k3/rules.mk b/keyboards/darmoshark/k3/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/darmoshark/k3/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/dasky/reverb/info.json b/keyboards/dasky/reverb/info.json
index b161ba8099a..e7e203ebf6e 100644
--- a/keyboards/dasky/reverb/info.json
+++ b/keyboards/dasky/reverb/info.json
@@ -23,7 +23,6 @@
     "rgb_matrix": {
         "driver": "ws2812",
         "animations": {
-            "solid_color": true,
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c
index d384c6a4bca..fd21d4333b7 100644
--- a/keyboards/dc01/left/matrix.c
+++ b/keyboards/dc01/left/matrix.c
@@ -387,37 +387,13 @@ static void unselect_cols(void)
 
 // Complete rows from other modules over i2c
 i2c_status_t i2c_transaction(uint8_t address, uint32_t mask, uint8_t col_offset) {
-    i2c_status_t status = i2c_start(address, 5);
-    if (status < 0) {
-        goto error;
-    }
-
-    status = i2c_write(0x01, 50);
-    if (status < 0) {
-        goto error;
-    }
-
-    status = i2c_start(address | I2C_READ, 50);
+    uint8_t data[MATRIX_ROWS + 1];
+    i2c_status_t status = i2c_readReg(address, 0x01, data, (MATRIX_ROWS + 1), 5);
 
-    status = i2c_read_ack(50);
-    if (status != 0x55) { //synchronization byte
-        goto error;
+    for (uint8_t i = 0; i < (MATRIX_ROWS) && status >= 0; i++) { //assemble slave matrix in main matrix
+        matrix[i] &= mask;  //mask bits to keep
+        matrix[i] |= ((uint32_t)data[i+1] << (MATRIX_COLS_SCANNED + col_offset)); //add new bits at the end
     }
 
-    for (uint8_t i = 0; i < MATRIX_ROWS-1 && status >= 0; i++) { //assemble slave matrix in main matrix
-        matrix[i] &= mask; //mask bits to keep
-        status = i2c_read_ack(50);
-            matrix[i] |= ((uint32_t)status << (MATRIX_COLS_SCANNED + col_offset)); //add new bits at the end
-        }
-    //last read request must be followed by a NACK
-    if (status >= 0) {
-        matrix[MATRIX_ROWS - 1] &= mask; //mask bits to keep
-        status = i2c_read_nack(50);
-        matrix[MATRIX_ROWS - 1] |= ((uint32_t)status << (MATRIX_COLS_SCANNED + col_offset)); //add new bits at the end
-    }
-
-error:
-    i2c_stop();
-
-    return (status < 0) ? status : I2C_STATUS_SUCCESS;
+    return status;
 }
diff --git a/keyboards/deemen17/de60fs/config.h b/keyboards/deemen17/de60fs/config.h
new file mode 100644
index 00000000000..e21d4ae3732
--- /dev/null
+++ b/keyboards/deemen17/de60fs/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Deemen17 <https://github.com/Deemen17>
+ *
+ * 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 RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define RP2040_FLASH_GENERIC_03H
diff --git a/keyboards/deemen17/de60fs/info.json b/keyboards/deemen17/de60fs/info.json
new file mode 100644
index 00000000000..b2d9a12f4e7
--- /dev/null
+++ b/keyboards/deemen17/de60fs/info.json
@@ -0,0 +1,403 @@
+{
+    "manufacturer": "Deemen17",
+    "keyboard_name": "De60fs",
+    "maintainer": "Deemen17",
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "GP24"
+    },
+    "matrix_pins": {
+        "cols": ["GP23", "GP22", "GP21", "GP20", "GP28", "GP0", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"],    
+        "rows": ["GP27", "GP26", "GP25", "GP29", "GP18"]
+    },
+    "processor": "RP2040",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 22,
+        "max_brightness": 240,
+        "sleep": true
+    },
+    "usb": {
+        "vid": "0xDE17",
+        "pid": "0x60F0",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP11"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": [
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_ansi_wkl",
+        "60_ansi_wkl_split_bs_rshift",
+        "60_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/deemen17/de60fs/keymaps/default/keymap.c b/keyboards/deemen17/de60fs/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f93f61d7684
--- /dev/null
+++ b/keyboards/deemen17/de60fs/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2023 Deemen17
+ *
+ * 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] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Del│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│Fn │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * │Ctrl │GUI│ Alt │                           │ Alt │GUI│ Ctrl│
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+     */
+    [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_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_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, KC_RGUI, KC_RCTL
+    )
+
+};
diff --git a/keyboards/deemen17/de60fs/keymaps/via/keymap.c b/keyboards/deemen17/de60fs/keymaps/via/keymap.c
new file mode 100644
index 00000000000..f93f61d7684
--- /dev/null
+++ b/keyboards/deemen17/de60fs/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2023 Deemen17
+ *
+ * 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] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Del│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│Fn │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * │Ctrl │GUI│ Alt │                           │ Alt │GUI│ Ctrl│
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+     */
+    [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_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_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, KC_RGUI, KC_RCTL
+    )
+
+};
diff --git a/keyboards/kudox_game/keymaps/via/rules.mk b/keyboards/deemen17/de60fs/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kudox_game/keymaps/via/rules.mk
rename to keyboards/deemen17/de60fs/keymaps/via/rules.mk
diff --git a/keyboards/deemen17/de60fs/readme.md b/keyboards/deemen17/de60fs/readme.md
new file mode 100644
index 00000000000..e5135691a85
--- /dev/null
+++ b/keyboards/deemen17/de60fs/readme.md
@@ -0,0 +1,27 @@
+# De60fs
+
+![De60fs](https://i.imgur.com/7hpYaoXh.jpg)
+
+A GH60 form factor PCB for 60% keyboards. Uses a Left USB Type C connector or 5 JST SH positions for daughter board.
+
+* Keyboard Maintainer: [Deemen17](https://github.com/Deemen17)
+* Hardware Supported: RP2040, De60fs PCB, De60fs Oring Edition PCB, De60 Tsangan Edition PCB
+* Hardware Availability: [Deemen17 Works](https://www.facebook.com/deemen17)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make deemen17/de60fs:default
+
+Flashing example for this keyboard:
+
+    make deemen17/de60fs: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 double press the button RESET on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/deemen17/de60fs/rules.mk b/keyboards/deemen17/de60fs/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/deemen17/de60fs/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h
index cc4c962462c..88f915d4681 100644
--- a/keyboards/dekunukem/duckypad/config.h
+++ b/keyboards/dekunukem/duckypad/config.h
@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 15
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define RGB_MATRIX_DEFAULT_HUE 221
-#endif
-
 #define I2C1_SCL_PIN B8
 #define I2C1_SDA_PIN B9
 
diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/info.json
index 9ca8e7bc93f..f186cbd3cdf 100644
--- a/keyboards/dekunukem/duckypad/info.json
+++ b/keyboards/dekunukem/duckypad/info.json
@@ -17,6 +17,10 @@
         "pin": "A10"
     },
     "rgb_matrix": {
+        "default": {
+            "animation": "solid_reactive_simple",
+            "hue": 221
+        },
         "driver": "ws2812",
         "layout": [
             {"matrix": [0, 2], "x": 224, "y": 0, "flags": 4},
@@ -67,7 +71,6 @@
             "rainbow_moving_chevron": true,
             "rainbow_pinwheels": true,
             "raindrops": true,
-            "solid_color": true,
             "solid_multisplash": true,
             "solid_reactive": true,
             "solid_reactive_cross": true,
diff --git a/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h b/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h
deleted file mode 100644
index bb66e1b754e..00000000000
--- a/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-
-M4cs Keymap for dekuNukem/duckyPad QMK firmware
-
-Copyright (C) 2020 Max Bridgland
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_ONESHOT
-
-#define OLED_TIMEOUT 90000
-#define RGB_MATRIX_TIMEOUT 90000
-
-#define MT_0_0 " prev "
-#define MT_0_1 " pl/pa"
-#define MT_0_2 " next "
-#define MT_0_3 " volx "
-#define MT_0_4 " vol- "
-#define MT_0_5 " vol+ "
-#define MT_0_6 " spot "
-#define MT_0_7 " ffox "
-#define MT_0_8 " code "
-#define MT_0_9 " term "
-#define MT_0_10 " steam"
-#define MT_0_11 " dscd "
-#define MT_0_12 "      "
-#define MT_0_13 " micx "
-#define MT_0_14 "      "
-
-#define MT_1_0 " stat "
-#define MT_1_1 " brth "
-#define MT_1_2 " rbow "
-#define MT_1_3 " swrl "
-#define MT_1_4 " spd- "
-#define MT_1_5 " spd+ "
-#define MT_1_6 " eff- "
-#define MT_1_7 " sat- "
-#define MT_1_8 " sat+ "
-#define MT_1_9 " eff+ "
-#define MT_1_10 " hue- "
-#define MT_1_11 " hue+ "
-#define MT_1_12 " powr "
-#define MT_1_13 " bri- "
-#define MT_1_14 " bri+ "
-
-#define MT_2_0 "      "
-#define MT_2_1 "      "
-#define MT_2_2 "      "
-#define MT_2_3 " undo "
-#define MT_2_4 "  cut "
-#define MT_2_5 " copy "
-#define MT_2_6 " paste"
-#define MT_2_7 " find "
-#define MT_2_8 " pscr "
-#define MT_2_9 "      "
-#define MT_2_10 "      "
-#define MT_2_11 "      "
-#define MT_2_12 "      "
-#define MT_2_13 "      "
-#define MT_2_14 "      "
diff --git a/keyboards/dekunukem/duckypad/keymaps/m4cs/keymap.c b/keyboards/dekunukem/duckypad/keymaps/m4cs/keymap.c
deleted file mode 100644
index cd8a3147390..00000000000
--- a/keyboards/dekunukem/duckypad/keymaps/m4cs/keymap.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-
-M4cs Keymap for dekuNukem/duckyPad QMK firmware
-
-Copyright (C) 2020 Max Bridgland
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#include "stdio.h"
-#include "raw_hid.h"
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#define LOGO_SIZE 384
-
-bool rgbToggled = false;
-bool altToggled = false;
-bool sysToggled = false;
-
-enum layer_codes {
-  RGB_LAYER = SAFE_RANGE,
-  ALT_LAYER,
-  SYS_LAYER,
-  CLOCK_TOGGLE
-};
-
-#define MAC_1 LCTL(LALT(KC_MINS))
-#define MAC_2 LCTL(LALT(KC_EQL))
-#define MAC_3 LCTL(LALT(KC_LBRC))
-#define MAC_4 LCTL(LALT(KC_RBRC))
-#define MAC_5 LCTL(LALT(KC_BSLS))
-#define MAC_6 LCTL(LALT(KC_SCLN))
-#define MAC_7 LCTL(LALT(KC_QUOT))
-#define MAC_8 LCTL(LALT(KC_COMM))
-#define MAC_9 LCTL(LALT(KC_SLSH))
-
-#define MAC_10 LCTL(LSFT(KC_MINS))
-#define MAC_11 LCTL(LSFT(KC_EQL))
-#define MAC_12 LCTL(LSFT(KC_SLSH))
-#define MAC_13 LCTL(LSFT(KC_LBRC))
-#define MAC_14 LCTL(LSFT(KC_RBRC))
-#define MAC_15 LCTL(LSFT(KC_BSLS))
-#define MAC_16 LCTL(LSFT(KC_SCLN))
-#define MAC_17 LCTL(LSFT(KC_QUOT))
-#define MAC_18 LCTL(LSFT(KC_COMM))
-
-#define _DEFAULT 0
-#define _RGB 1
-#define _ALT 2
-#define _SYS 3
-
-float cpuFreq = 0;
-int memPerc = 0;
-int gpuLoad = 0;
-int temp = 0;
-int hour = 0;
-int minute = 0;
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-  ,=========================================.
-  | Media Prev. | Media Play  | Media Next  |
-  |=========================================|
-  | Mute Sound  | Volume Do.  | Volume Up   |
-  |=========================================|
-  | Macro 1     | Macro 2     | Macro 3     |
-  |=========================================|
-  | Macro 4     | Macro 5     | Macro 6     |
-  |=========================================| ,---------------------.
-  | Macro 7     | Macro 8     | Sys. Info   | | RGB Menu | Alt Menu |
-  `=========================================' `--------------------'
-  */
-  [_DEFAULT] = LAYOUT(
-      KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK,
-      KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP,
-      MAC_1, MAC_2, MAC_3,
-      MAC_4, MAC_5, MAC_6,
-      CLOCK_TOGGLE, MAC_8, SYS_LAYER,
-      RGB_LAYER, ALT_LAYER
-  ),
-  /*
-  ,=========================================.
-  | Plain RGB   | Breathe RGB | Rainbow RGB |
-  |=========================================|
-  | Swirl RGB   | Speed Down  | Speed Up    |
-  |=========================================|
-  | Effect Up   | Sat. Down   | Sat. Up     |
-  |=========================================|
-  | Effect Down | Hue Down    | Hue Up      |
-  |=========================================| ,----------------------.
-  | Toggle RGB  | Brt. Down   | Brt. Up     | | Norm Menu | Alt Menu |
-  `=========================================' `---------------------'
-  */
-  [_RGB] = LAYOUT(
-      RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW,
-      RGB_MODE_SWIRL, RGB_SPD, RGB_SPI,
-      RGB_MOD, RGB_SAD, RGB_SAI,
-      RGB_RMOD, RGB_HUD, RGB_HUI,
-      RGB_TOG, RGB_VAD, RGB_VAI,
-      RGB_LAYER, ALT_LAYER
-  ),
-  /*
-  ,=========================================.
-  | Macro 10    | Macro 11    | Macro 12    |
-  |=========================================|
-  | Undo        | Cut         | Copy        |
-  |=========================================|
-  | Paste       | Find        | Prnt Scrn.  |
-  |=========================================|
-  | Macro 13    | Macro 14    | Macro 15    |
-  |=========================================| ,----------------------.
-  | Macro 16    | Macro 17    | Sys. Info   | | Norm Menu | Alt Menu |
-  `=========================================' `---------------------'
-  */
-  [_ALT] = LAYOUT(
-      MAC_10, MAC_11, MAC_12,
-      KC_UNDO, KC_CUT, KC_COPY,
-      KC_PASTE, KC_FIND, KC_PSCR,
-      MAC_13, MAC_14, MAC_15,
-      CLOCK_TOGGLE, MAC_17, SYS_LAYER,
-      RGB_LAYER, ALT_LAYER
-  ),
-  [_SYS] = LAYOUT(
-      KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO,
-      CLOCK_TOGGLE, KC_NO, SYS_LAYER,
-      RGB_LAYER, ALT_LAYER
-  )
-};
-
-static void render_logo(void) {
-    static const char PROGMEM raw_logo[] = {
-        0,  0,  0,  0,128,128,128,128,128,  0,  0,252,252,252,  0,  0,  0,128,128,128,  0,  0,  0,  0,  0,128,128,128,  0,  0,  0,  0,  0,128,128,128,128,128,  0,  0,  0,  0,  0,252,252,252,  0,  0,  0,  0,  0,128,128,128,128,128,128,  0,  0,  0,  0,  0,  0,128,128,128,128,  0,248,248,248, 56, 56, 56, 56, 56, 56,120,240,224,192,  0,  0,128,128,128,128,128,128,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128,128,  0,  0,252,252,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,248,254,255,143,  7,  3,  3,  3,  7,142,255,255,255,  0,  0,  0,255,255,255,  0,  0,  0,  0,  0,255,255,255,  0,248,254,255,143,  7,  3,  3,  3,  3,143,  7,  2,  0,  0,255,255,255,240,120,252,254,231,131,  1,  0,  1,  7, 63,254,240,192,  0,224,252,127, 31,  3,  0,  0,255,255,255,112,112,112,112,112,112, 56, 63, 31, 15,193,231,243,115, 51, 51, 51, 55,255,255,252,  0,  0,248,254,255,143,  7,  3,  3,  3,  7,142,255,255,255,  0,  0,  0,  0,192,240,240, 96, 48, 48,  0, 12, 12,134,198,230,126, 60,  0,  0,  0,
-        0,  0,  3,  7, 15, 15, 14, 14, 14,  7,  3, 15, 15, 15,  0,  0,  0,  3,  7, 15, 15, 14, 14,  6,  3, 15, 15, 15,  0,  0,  3,  7,  7, 15, 14, 14, 14, 14,  7,  7,  2,  0,  0, 15, 15, 15,  0,  0,  0,  1,  3, 15, 15, 12,136,224,224,224,247,127,127, 31,  3,  0,  0,  0,  0,  0, 15, 15, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 14, 14, 14,  6,  3, 15, 15, 15,  0,  0,  0,  3,  7, 15, 15, 14, 14, 14,  7,  3, 15, 15, 15,  0,  0,  0, 12, 15,  7,  0,  0,  0, 12, 14, 15, 15, 13, 13, 12, 12,  0,  0,  0,  0,
-    };
-    oled_write_raw_P(raw_logo, sizeof(raw_logo));
-}
-
-char* make_menu_text(void){
-  char *s = malloc((30 * 4) * sizeof(*s));
-  int width = 3;
-  snprintf(s, 120, "%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s",
-    width, MT_0_0, width, MT_0_1, width, MT_0_2,
-    width, MT_0_3, width, MT_0_4, width, MT_0_5,
-    width, MT_0_6, width, MT_0_7, width, MT_0_8,
-    width, MT_0_9, width, MT_0_10, width,MT_0_11,
-    width, MT_0_12, width, MT_0_13, width, MT_0_14
-  );
-  return s;
-};
-
-char* make_rgb_text(void){
-  char *s = malloc((30 * 4) * sizeof(*s));
-  int width = 3;
-  snprintf(
-    s, 120, "%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s",
-    width, MT_1_0, width, MT_1_1, width, MT_1_2,
-    width, MT_1_3, width, MT_1_4, width, MT_1_5,
-    width, MT_1_6, width, MT_1_7, width, MT_1_8,
-    width, MT_1_9, width, MT_1_10, width,MT_1_11,
-    width, MT_1_12, width, MT_1_13, width, MT_1_14
-  );
-  return s;
-};
-
-char* make_alt_text(void){
-  char *s = malloc((30 * 4) * sizeof(*s));
-  int width = 3;
-  snprintf(
-    s,  120, "%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s",
-    width, MT_2_0, width, MT_2_1, width, MT_2_2,
-    width, MT_2_3, width, MT_2_4, width, MT_2_5,
-    width, MT_2_6, width, MT_2_7, width, MT_2_8,
-    width, MT_2_9, width, MT_2_10, width,MT_2_11,
-    width, MT_2_12, width, MT_2_13, width, MT_2_14
-  );
-  return s;
-};
-
-char* make_sys_info_text(void) {
-  char *s = malloc((30 * 5) * sizeof(*s));
-  snprintf(s, 150, "    cpu: %.1fGHz\n      mem: %d%%\n      gpu: %d%%\n     temp: %dC\n    time: %d:%d", cpuFreq, memPerc, gpuLoad, temp, hour, minute);
-  return s;
-};
-
-
-bool oled_task_user(void) {
-  if (!sysToggled) {
-    render_logo();
-    oled_set_cursor(0,3);
-    if (rgbToggled) {
-        char *s = make_rgb_text();
-        oled_write_ln(s, false);
-        free(s);
-    } else if (altToggled) {
-        char *s = make_alt_text();
-        oled_write_ln(s, false);
-        free(s);
-    } else {
-        char *s = make_menu_text();
-        oled_write_ln(s, false);
-        free(s);
-    }
-  }
-    return false;
-};
-
-int concat(int a, int b) {
-    char s1[20];
-    char s2[20];
-    sprintf(s1, "%d", a);
-    sprintf(s2, "%d", b);
-    strcat(s1, s2);
-    int c = atoi(s1);
-
-    return c;
-};
-
-void raw_hid_receive(uint8_t *data, uint8_t length) {
-    if (sysToggled) {
-        oled_clear();
-        render_logo();
-        int i;
-        int stepper = 0;
-        int toWrite;
-        for (i=0; i < length; i++) {
-            if (data[i] != 13) {
-                toWrite = concat(toWrite, data[i]);
-            } else {
-                switch (stepper) {
-                    case 0:
-                        cpuFreq = floor(100*toWrite)/10000;
-                        break;
-                    case 1:
-                        memPerc = toWrite / 10;
-                        break;
-                    case 2:
-                        gpuLoad = toWrite;
-                        break;
-                    case 3:
-                        temp = toWrite;
-                        break;
-                    case 4:
-                        hour = toWrite;
-                        break;
-                    case 5:
-                        minute = toWrite;
-                        break;
-                    default:
-                        break;
-                }
-                toWrite = 0;
-                stepper++;
-            }
-        }
-        oled_set_cursor(0,3);
-        char *s = make_sys_info_text();
-        oled_write_ln(s, false);
-        free(s);
-    }
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case RGB_LAYER:
-      if (record->event.pressed) {
-        if (rgbToggled) {
-          rgbToggled = false;
-          altToggled = false;
-          sysToggled = false;
-          oled_clear();
-          layer_clear();
-        } else {
-          rgbToggled = true;
-          altToggled = false;
-          sysToggled = false;
-          layer_on(_RGB);
-        }
-      }
-      return false;
-    case ALT_LAYER:
-      if (record->event.pressed) {
-        if (altToggled) {
-          rgbToggled = false;
-          altToggled = false;
-          sysToggled = false;
-          oled_clear();
-          layer_clear();
-        } else {
-          rgbToggled = false;
-          sysToggled = false;
-          altToggled = true;
-          layer_on(_ALT);
-        }
-      }
-      return false;
-    case SYS_LAYER:
-        if (record->event.pressed) {
-            if (sysToggled) {
-                rgbToggled = false;
-                altToggled = false;
-                sysToggled = false;
-                oled_clear();
-                layer_clear();
-            } else {
-                rgbToggled = false;
-                sysToggled = true;
-                altToggled = false;
-                layer_on(_SYS);
-            }
-        }
-    default:
-      return true;
-  }
-  return false;
-};
diff --git a/keyboards/dekunukem/duckypad/keymaps/m4cs/readme.md b/keyboards/dekunukem/duckypad/keymaps/m4cs/readme.md
deleted file mode 100644
index 50c06cf42fd..00000000000
--- a/keyboards/dekunukem/duckypad/keymaps/m4cs/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-[M4cs'](https://github.com/M4cs) duckyPad Layout
-
-### Layers:
-
-0: Default Layer w/ Media Functionality and Macros
-
-1: RGB Menu that allows RGB customization
-
-2: Alternate Macro Menu
-
-### Configuration:
-
-To change the menu, edit the `MT_X_XX` values in `config.h`. The sytax is as follows: `MT_A_B`, where A equals the layer, and B equals the key from 0-14.
-
-### Misc. Info:
-
-The macros currently just map to Ctrl + Alt + (Different Keys) right now. I have them launching certain shortcuts. I recommend you change these and add your shortcuts to match your shortcut manager.
-
-To get sysinfo working, run `pip3 install psutil GPUtil` and then `python sysinfo.py`. Now when pressing the bottom right key, you will get an info screen with your updated system info.
-
-### Need Help?
-
-Contact me on discord: macs#0420
-
-or join the duckyPad Discord and find me in there :)
-
-https://discord.gg/ADtrCjf
diff --git a/keyboards/dekunukem/duckypad/keymaps/m4cs/rules.mk b/keyboards/dekunukem/duckypad/keymaps/m4cs/rules.mk
deleted file mode 100644
index 87065466685..00000000000
--- a/keyboards/dekunukem/duckypad/keymaps/m4cs/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-LTO_ENABLE = yes # Enable Link Time Optimization
-NO_USB_STARTUP_CHECK = yes # Disables usb suspend check after keyboard startup
diff --git a/keyboards/dekunukem/duckypad/keymaps/m4cs/sysinfo.py b/keyboards/dekunukem/duckypad/keymaps/m4cs/sysinfo.py
deleted file mode 100644
index 4dfcd4d4d17..00000000000
--- a/keyboards/dekunukem/duckypad/keymaps/m4cs/sysinfo.py
+++ /dev/null
@@ -1,77 +0,0 @@
-
-###
-# M4cs Keymap for dekuNukem/duckyPad QMK firmware
-
-# Copyright (C) 2020 Max Bridgland
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-###
-
-
-import hid
-import time
-import psutil
-import GPUtil
-import datetime
-
-vendor_id  = 0x444E
-product_id = 0x4450
-
-usage_page = 0xFF60
-usage      = 0x61
-
-device_interfaces = hid.enumerate(vendor_id, product_id)
-raw_hid_interfaces = [i for i in device_interfaces if i['usage_page'] == usage_page and i['usage'] == usage]
-
-if len(raw_hid_interfaces) == 0:
-    print('Couldnt find any interfaces')
-    exit()
-
-interface = hid.device()
-interface.open_path(raw_hid_interfaces[0]['path'])
-print("Manufacturer: %s" % interface.get_manufacturer_string())
-print("Product: %s" % interface.get_product_string())
-time.sleep(0.05)
-while True:
-    time.sleep(0.75)
-    cpufreq = psutil.cpu_freq()
-    currFreq = int(cpufreq.current)
-    svmem = psutil.virtual_memory()
-    memPerc = int(svmem.percent * 10)
-    gpus = GPUtil.getGPUs()
-    gpu = gpus[0]
-    load = int(gpu.load*100)
-    temp = int(gpu.temperature)
-    data = [0]
-    for x in str(currFreq):
-        data.append(int(x))
-    data.append(13)
-    for x in str(memPerc):
-        data.append(int(x))
-    data.append(13)
-    for x in str(load):
-        data.append(int(x))
-    data.append(13)
-    for x in str(temp):
-        data.append(int(x))
-    data.append(13)
-    now_hour = datetime.datetime.now().strftime("%I")
-    now_min = datetime.datetime.now().strftime("%M")
-    data.append(int(now_hour[0]))
-    data.append(int(now_hour[1]))
-    data.append(13)
-    data.append(int(now_min[0]))
-    data.append(int(now_min[1]))
-    data.append(13)
-    interface.write(data)
diff --git a/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
deleted file mode 100644
index ec6a9969006..00000000000
--- a/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Copyright 2020 noclew
- *
- * 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,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-    _MAC,
-    _GAME
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    BASE = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    MAC,
-    GAME
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* BASE
-     * ---------------------------------------------------------------------------------------------------------
-     * |  `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -   |  =   | Bspc | Mute |
-     * ---------------------------------------------------------------------------------------------------------
-     * | Tab     |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |    \    |   [  |  ]   |
-     *----------------------------------------------------------------------------------------------------------
-     * |   Esc      |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Enter |  N/A |  '  |
-     *----------------------------------------------------------------------------------------------------------
-     * |  N/A  |  Shift |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  Shift   | DEL |
-     *----------------------------------------------------------------------------------------------------------
-     * | Ctrl |  GUI |  Alt  | Lower |  Space  |  Space  |  Space  | Raise |  Alt | Left | Down |  Up  | Right |
-     *----------------------------------------------------------------------------------------------------------
-     */
-
-    [_BASE] = LAYOUT_all(
-    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_AUDIO_MUTE,
-    KC_TAB ,                KC_Q   ,    KC_W   ,    KC_E   ,    KC_R   ,    KC_T   ,    KC_Y   ,    KC_U   ,    KC_I   ,    KC_O   ,    KC_P   ,        KC_BSLS,            KC_LBRC,    KC_RBRC,
-    KC_ESC ,                KC_A   ,    KC_S   ,    KC_D   ,    KC_F   ,    KC_G   ,    KC_H   ,    KC_J   ,    KC_K   ,    KC_L   ,    KC_SCLN,        KC_ENT ,            KC_NO,      KC_QUOT,
-    KC_NO  ,    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_QUOT),            KC_DEL,
-    KC_LCTL,    KC_LGUI,    KC_LALT,    LOWER  ,    KC_SPC ,            KC_SPC ,        KC_SPC ,                RAISE,      KC_RALT,                KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT
-    ),
-
-    [_MAC] = LAYOUT_all(
-    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
-    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,                _______,
-    _______,    KC_LALT,    KC_LGUI,    _______,    _______,            _______,        _______,                _______,    _______,                _______,    _______,    _______,    _______
-    ),
-
-    [_GAME] = LAYOUT_all(
-    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
-    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,                _______,
-    _______,    _______,    MO(_LOWER), KC_LALT,    _______,            _______,        _______,                _______,    _______,                _______,    _______,    _______,    _______
-    ),
-
-    [_LOWER] = LAYOUT_all(
-    _______,                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_F12 ,    _______,
-    KC_BSPC,                KC_SLSH,    KC_7   ,    KC_8   ,    KC_9   ,    KC_PPLS,    KC_CIRC,    KC_LBRC,    KC_RBRC,    KC_AT  ,    KC_EXLM,        KC_BSLS,            _______,    _______,
-    KC_EQL ,                KC_0   ,    KC_4   ,    KC_5   ,    KC_6   ,    KC_MINS,    KC_PIPE,    KC_LPRN,    KC_RPRN,    KC_HASH,    KC_DQUO,        _______,            _______,    _______,
-    KC_ENT ,    _______,    KC_PAST,    KC_1   ,    KC_2   ,    KC_3   ,    KC_UNDS,    KC_DLR ,    KC_LCBR,    KC_RCBR,    KC_AMPR,    KC_PERC,                _______,                _______,
-    _______,    _______,    _______,    _______,    _______,            _______,        _______,                _______,    _______,                _______,    _______,    _______,    _______
-    ),
-
-    [_RAISE] = LAYOUT_all(
-    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-    _______,                _______,    _______,    _______,    _______,    _______,    _______,    KC_HOME,    KC_BSPC,    KC_DEL,     KC_END ,        _______,            _______,    _______,
-    _______,                _______,    _______,    _______,    _______,    _______,    KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_QUOT,        _______,            _______,    _______,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_PGUP,    _______,    _______,    KC_PGDN,                _______,                _______,
-    _______,    _______,    _______,    _______,    _______,            _______,        _______,                _______,    _______,                _______,    _______,    _______,    _______
-    ),
-
-    [_ADJUST] = LAYOUT_all(
-    QK_BOOT,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    DB_TOGG,
-    _______,                RGB_TOG,    RGB_RMOD,   RGB_MOD,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,        _______,            _______,    _______,
-    KC_CAPS,                RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    _______,    _______,    TG(_GAME),  _______,    _______,    _______,        _______,            _______,    _______,
-    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    TG(_MAC),   _______,    _______,    _______,                _______,                _______,
-    _______,    _______,    _______,    _______,    _______,            _______,        _______,                _______,    _______,                _______,    _______,    _______,    _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-        return false;
-
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-        return false;
-
-    }
-    return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    /* With an if statement we can check which encoder was turned. */
-    if (index == 0) { /* First encoder */
-        /* And with another if statement we can check the direction. */
-        if (clockwise) {
-            if (IS_LAYER_ON(_LOWER)){
-                tap_code(KC_RIGHT);
-            } else {
-                tap_code(KC_VOLU);
-            }
-        } else {
-            if (IS_LAYER_ON(_LOWER)){
-                tap_code(KC_LEFT);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        }
-
-    } else if (index == 1) { /* Second encoder. Only supported by Elite-C */
-        if (clockwise) {
-            tap_code(KC_RIGHT);
-        } else {
-            tap_code(KC_LEFT);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/delikeeb/vaguettelite/keymaps/noclew/readme.md b/keyboards/delikeeb/vaguettelite/keymaps/noclew/readme.md
deleted file mode 100644
index bc2bbecb7ce..00000000000
--- a/keyboards/delikeeb/vaguettelite/keymaps/noclew/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The noclew's keymap for Vaguette LITE
diff --git a/keyboards/deltasplit75/keymaps/itsaferbie/config.h b/keyboards/deltasplit75/keymaps/itsaferbie/config.h
deleted file mode 100644
index 32605799a85..00000000000
--- a/keyboards/deltasplit75/keymaps/itsaferbie/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 20
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/deltasplit75/keymaps/itsaferbie/keymap.c b/keyboards/deltasplit75/keymaps/itsaferbie/keymap.c
deleted file mode 100644
index a0c8f042667..00000000000
--- a/keyboards/deltasplit75/keymaps/itsaferbie/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Layer 0: Default Layer
-   *,-----------------------------------------------------------------------.
-   * |Esc| F1| F2| F3| F4| F5| F6|    F7| F8| F9| F10| F11| F12|Prnt|Ins|Del|
-   * |----------------------------------------------------------------------|
-   * |  `|  1|  2|  3|  4|  5|  6|    7|  8|  9|  0|  -|  =| Backspace| Home|
-   * |----------------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|      Y|  U|  I|  O|  P|  [|  ]|  \|    PgUp|
-   * |----------------------------------------------------------------------|
-   * |Ctrl|  A|  S|  D|  F|  G|       H|  J|  K|  L|  ;|  '|Enter  |  PgDown|
-   * |----------------------------------------------------------------------|
-   * |Shif|   |  Z|  X|  C|  V|  B|   N|  M|  ,|  .|  /|Shift |      Up| End|
-   * |----------------------------------------------------------------------|
-   * |CapsLo|Gui |Alt |Mod|Sp |      Sp| Alt| Gui| Ctrl|    | Lef| Dow| Rig|
-   * `----------------------------------------------------------------------'
-   */
-  LAYOUT_v2(
-    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_INS,  KC_DEL,
-    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_TRNS, KC_HOME, // KC_TRNS is the unneeded key in the split backspace.
-    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_LCTL, KC_A,    KC_S,    KC_D,   KC_F,  KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_TRNS,  KC_ENT,  KC_PGDN, // KC_TRNS is unneeded ISO Enter key.
-    KC_LSFT, KC_TRNS, 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,   KC_END,  // KC_TRNS is unneeded ISO layout key.
-    KC_CAPS, KC_LGUI, KC_LALT,         MO(1), KC_SPC,                   KC_SPC,  KC_RALT, KC_RGUI, KC_RCTL,                   KC_LEFT,  KC_DOWN, KC_RGHT
-  ),
-
-  LAYOUT_v2(
-    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
-    _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD,
-    _______, _______, _______,          _______, _______,               _______, _______, _______, _______,                   KC_MPRV, KC_STOP, KC_MNXT
-  ),
-
-};
diff --git a/keyboards/deltasplit75/keymaps/itsaferbie/rules.mk b/keyboards/deltasplit75/keymaps/itsaferbie/rules.mk
deleted file mode 100644
index 92f24224c78..00000000000
--- a/keyboards/deltasplit75/keymaps/itsaferbie/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
-AUDIO_ENABLE = no            # Audio disabled while using RGB underlight.
-EXTRAKEY_ENABLE = yes
-
diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/config.h b/keyboards/deltasplit75/keymaps/mbsurfer/config.h
deleted file mode 100644
index 3e79f43ed06..00000000000
--- a/keyboards/deltasplit75/keymaps/mbsurfer/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
deleted file mode 100644
index e5c9ecc5824..00000000000
--- a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Layer 0: Default Layer
-   * ,----------------------------     ----------------------------------------.
-   * |Esc| F1| F2| F3| F4| F5| F6|     |F7| F8| F9| F10| F11| F12|Prnt|Ins|Home|
-   * |----------------------------     ----------------------------------------|
-   * |  `|  1|  2|  3|  4|  5|  6|     | 7|  8|  9|  0|  -|  =|  \|   Del|  End|
-   * |--------------------------     ------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|     | Y|  U|  I|  O|  P|  [|  ]|   BkSp | PgUp|
-   * |--------------------------     ------------------------------------------|
-   * |Ctrl|  A|  S|  D|  F|  G|       | H|  J|  K|  L|  ;|  '|   Enter   | PgDn|
-   * |----------------------------    -----------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|    | N|  M|  ,|  .|  /|  Shift |  Up|   FN1|
-   * |-----------------------------    ----------------------------------------|
-   * |Ctrl |Gui |Alt |Space |FN1 |     | Space | Alt| Gui| Ctrl| Lef | Dow |Rig|
-   * `----------------------------     ----------------------------------------'
-   */
-	LAYOUT_v2(
-		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_INS, KC_PAUSE, KC_HOME,
-		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_BSLS, KC_DEL, KC_END,
-		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_BSPC, KC_PGUP,
-		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_PGDN,  //modify _______ to enable ISO Support
-		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, MO(1), //modify _______ to enable ISO Support
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Layer 1: FN1 Layer
-   * ,----------------------------        -------------------------------------.
-   * |   |   |   |   |   |   |   |        |   |   |   |    |    |    |   |Reset|
-   * |----------------------------        -------------------------------------|
-   * | \ |   |   |   |   |   |   |        |   |   |   |   |   |   |       |    |
-   * |----------------------------      ---------------------------------------|
-   * |Caps|VolUp| Up |  |  |  |         |   |   |   |   |  Up|    |       |    |
-   * |---------------------------       ---------------------------------------|
-   * |      |Lft|Dwn|Rig|   |    |        |   |   |   |Lft|Rig|           |    |
-   * |----------------------------        -------------------------------------|
-   * |      |VolDn|Mute|  |  |   |        |    |    |    |Dwn|       |    |    |
-   * |----------------------------     ----------------------------------------|
-   * |    |   |   |         |   |      |         |     |     |       |    |    |
-   * `---------------------------      ----------------------------------------'
-   */
-	LAYOUT_v2(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-		KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		KC_CAPS, KC_VOLU, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______,
-		M(1), KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______, _______, _______,
-		_______, _______, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-};
diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/readme.md b/keyboards/deltasplit75/keymaps/mbsurfer/readme.md
deleted file mode 100644
index b65c3a734e0..00000000000
--- a/keyboards/deltasplit75/keymaps/mbsurfer/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![Mbsurfer Layout Image](https://i.imgur.com/Hz82zyh.png)
-
-# Mbsurfer's DeltaSplit75 Layout
-
-This layout features an ANSI layout with split backspace and a full bottom row with no gaps. The reset key on the FN layer is for quickly flashing a new firmware.
diff --git a/keyboards/deltasplit75/keymaps/protosplit/config.h b/keyboards/deltasplit75/keymaps/protosplit/config.h
deleted file mode 100644
index 3e79f43ed06..00000000000
--- a/keyboards/deltasplit75/keymaps/protosplit/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/deltasplit75/keymaps/protosplit/keymap.c b/keyboards/deltasplit75/keymaps/protosplit/keymap.c
deleted file mode 100644
index 760a81f8fc4..00000000000
--- a/keyboards/deltasplit75/keymaps/protosplit/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  LAYOUT_protosplit(
-    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_INS,  KC_HOME, KC_PGUP,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_END,  KC_PGDN,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_SCRL,
-    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_PAUS,
-    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_LSFT,          KC_UP,   KC_PSCR,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  LAYOUT_protosplit(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_VOLU, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    M(1),    KC_LEFT, KC_DOWN, KC_RGHT, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-    _______, KC_VOLD, M(0),    KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______, _______
-  ),
-
-};
diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h
deleted file mode 100644
index 39ea6d6e900..00000000000
--- a/keyboards/deng/djam/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Leo Deng (@myst729)
- *
- * 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 RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 31
-#define RGB_MATRIX_KEYPRESSES
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json
index c7fe59ff0a4..47d9559d304 100644
--- a/keyboards/deng/djam/info.json
+++ b/keyboards/deng/djam/info.json
@@ -9,6 +9,13 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812"
     },
     "matrix_pins": {
diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h
index 9fcb90742fa..1ad5f9c15d4 100644
--- a/keyboards/deng/thirty/config.h
+++ b/keyboards/deng/thirty/config.h
@@ -17,60 +17,3 @@
 
 #define BACKLIGHT_PWM_DRIVER PWMD2
 #define BACKLIGHT_PWM_CHANNEL 4
-
-/* RGB Matrix */
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 30
-#define RGB_MATRIX_KEYPRESSES
-// #define RGB_MATRIX_KEYRELEASES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-// Enable Effects
-// == Regular 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_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_MOVING_CHEVRON
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// == Framebuffer Effects ==
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// == Reactive Effects ==
-#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
diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json
index b93881c0866..8e594cccb9c 100644
--- a/keyboards/deng/thirty/info.json
+++ b/keyboards/deng/thirty/info.json
@@ -9,7 +9,56 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["B13", "B14", "B3", "A4", "A6"],
diff --git a/keyboards/dichotomy/keymaps/alairock/keymap.c b/keyboards/dichotomy/keymaps/alairock/keymap.c
deleted file mode 100644
index a7f9189a480..00000000000
--- a/keyboards/dichotomy/keymaps/alairock/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#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.
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _MOUSE 8
-#define _ADJUST 16
-
-
-enum dichotomy_keycodes
-{
-	QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  MOUKEY,
-  MS_BTN1,
-  MS_BTN2,
-  MS_BTN3
-};
-
-#define RED_BRIGHTNESS 3
-#define GREEN_BRIGHTNESS 2
-#define BLUE_BRIGHTNESS 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[_QWERTY] = LAYOUT( /* Base layout, nearly qwerty but with modifications because it's not a full keyboard. Obviously. */
-  KC_ESCAPE,   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_ENT,
-  KC_LSFT,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,           KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MOUKEY,
-                                 KC_LCTL, KC_LALT, MOUKEY,         KC_RGUI, KC_RALT, KC_RCTL,
-              MS_BTN3, SFT_T(KC_ESCAPE), KC_LGUI, KC_BSPC,         KC_SPC,  RAISE,   LOWER,   MS_BTN3
-),
-
-[_RAISE] = LAYOUT( /* Shifted layout, small changes (because angle brackets have been moved to thumb cluster buttons) */
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, KC_MFFD,        KC_MUTE, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC,  _______,
-  _______, _______, KC_GRV,  _______, _______, KC_MRWD,        _______, _______, _______, KC_BSLS, KC_QUOT, _______,
-                             _______, _______, _______,        _______, _______, _______,
-                    _______, _______, KC_LABK, _______,        _______, KC_RABK, _______, _______
-),
-
-[_LOWER] = LAYOUT( /* Number layout, basically the main function layer */
-  _______, KC_EXLM, KC_AT,    KC_HASH, KC_DLR,  KC_PERC,       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, _______, KC_VOLD,  KC_VOLU, KC_MPLY, KC_MFFD,       KC_MUTE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-  _______, _______, KC_TILD,  _______, _______, KC_MRWD,       _______, _______, _______, KC_PIPE, KC_DQT,  _______,
-                              _______, _______, _______,       _______, _______, _______,
-                    _______,  RAISE,   _______, _______,       _______, _______, _______, _______
-),
-
-[_ADJUST] = LAYOUT( /* Shifted number/function layout, for per-key control.  Only active when shift is held, and number is toggled or held */
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,          _______, KC_PGUP, KC_UP,   KC_PGDN, _______, _______,
-  KC_LGUI, KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  KC_LSFT, KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,         _______, _______, _______, _______, _______, _______,
-                             _______, _______, _______,        _______, _______, _______,
-                    _______, _______, _______, _______,        _______, _______, _______, _______
-),
-
-[_MOUSE] = LAYOUT( /* Mouse layer, including buttons for clicking. */
-  _______, _______, _______, _______, _______, _______,        KC_VOLU, KC_HOME, KC_PGUP, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,        _______, MS_BTN1, MS_BTN2, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,        KC_VOLD, KC_END,  KC_PGDN, _______, _______, _______,
-                             _______, _______, _______,        _______, KC_UP,   _______,
-                    _______, _______, _______, _______,        KC_LEFT, KC_DOWN, KC_RGHT, _______
-)
-
-}; // end keymaps block
-
-static bool shift_held = false;
-static bool shift_suspended = false;
-report_mouse_t currentReport = {};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-			return false;
-      break;
-		case LOWER:
-			if (record->event.pressed) {
-				layer_on(_LOWER);
-				grn_led_on();
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			} else {
-				layer_off(_LOWER);
-				grn_led_off();
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			}
-			return false;
-			break;
-		//SHIFT is handled as LSHIFT in the general case - 'toggle' shoudl activate caps, while the layer is only active when shift is held.
-		case RAISE:
-			if (record->event.pressed) {
-				layer_on(_RAISE);
-				red_led_on();
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			} else {
-				layer_off(_RAISE);
-				red_led_off();
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			}
-			return false;
-			break;
-		case ADJUST:
-			if (record->event.pressed) {
-				layer_on(_ADJUST);
-			} else {
-				layer_off(_ADJUST);
-			}
-			return false;
-			break;
-		//MOUSE layer needs to be handled the same way as NUMKEY, but differently from shift
-		case MOUKEY:
-			if (record->event.pressed) {
-				layer_on(_MOUSE);
-				blu_led_on();
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			} else {
-				layer_off(_MOUSE);
-				blu_led_off();
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			}
-			return false;
-			break;
-
-		//mouse buttons, for 1-3, to update the mouse report:
-		case MS_BTN1:
-			currentReport = pointing_device_get_report();
-			if (record->event.pressed) {
-				if (shift_held && shift_suspended){
-					register_code(KC_LSFT);
-					shift_suspended = false;
-				}
-				//update mouse report here
-				currentReport.buttons |= MOUSE_BTN1; //MOUSE_BTN1 is a const defined in report.h
-			} else {
-				//update mouse report here
-				currentReport.buttons &= ~MOUSE_BTN1;
-			}
-			pointing_device_set_report(currentReport);
-			return false;
-			break;
-		case MS_BTN2:
-			currentReport = pointing_device_get_report();
-			if (record->event.pressed) {
-				if (shift_held && shift_suspended){
-					register_code(KC_LSFT);
-					shift_suspended = false;
-				}
-				//update mouse report here
-				currentReport.buttons |= MOUSE_BTN2; //MOUSE_BTN2 is a const defined in report.h
-			} else {
-				//update mouse report here
-				currentReport.buttons &= ~MOUSE_BTN2;
-			}
-			pointing_device_set_report(currentReport);
-			return false;
-			break;
-		case MS_BTN3:
-			currentReport = pointing_device_get_report();
-			if (record->event.pressed) {
-				if (shift_held && shift_suspended){
-					register_code(KC_LSFT);
-					shift_suspended = false;
-				}
-				//update mouse report here
-				currentReport.buttons |= MOUSE_BTN3; //MOUSE_BTN3 is a const defined in report.h
-			} else {
-				//update mouse report here
-				currentReport.buttons &= ~MOUSE_BTN3;
-			}
-			pointing_device_set_report(currentReport);
-			return false;
-			break;
-		//Additionally, if NS_ keys are in use, then shift may be held (but is
-		//disabled for the unshifted keycodes to be send.  Check the bool and
-		//register shift as necessary.
-		// default:
-		// 	if (shift_held){
-		// 		register_code(KC_LSFT);
-		// 	}
-		// break;
-	}
-	return true;
-};
diff --git a/keyboards/dichotomy/keymaps/beat/config.h b/keyboards/dichotomy/keymaps/beat/config.h
deleted file mode 100644
index f31e7469f42..00000000000
--- a/keyboards/dichotomy/keymaps/beat/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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_TERM 200
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/dichotomy/keymaps/beat/keymap.c b/keyboards/dichotomy/keymaps/beat/keymap.c
deleted file mode 100644
index c686d77d6e8..00000000000
--- a/keyboards/dichotomy/keymaps/beat/keymap.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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 {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _MOUSE,
-    _ADJUST
-};
-
-enum dichotomy_keycodes {
-  MS_BTN1 = SAFE_RANGE,
-  MS_BTN2,
-  MS_BTN3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT( /* Base layout, nearly qwerty but with modifications because it's not a full keyboard. Obviously. */
-  KC_ESCAPE,   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_ENT,
-  KC_LSFT,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, TT(_MOUSE),
-                                 KC_LGUI, KC_LALT, KC_DEL,     KC_RCTL, KC_RALT, KC_RGUI,
-               MS_BTN3, SFT_T(KC_ESCAPE), KC_LCTL, KC_SPC,     KC_SPC,  TT(_RAISE), TT(_LOWER),   MS_BTN3
-  ),
-
-  [_RAISE] = LAYOUT( /* Shifted layout, small changes (because angle brackets have been moved to thumb cluster buttons) */
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT,        KC_MUTE, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  _______, _______, KC_GRV,  _______, _______, KC_MPRV,        _______, KC_LABK, KC_RABK, KC_BSLS, KC_QUOT, _______,
-                             _______, _______, _______,        _______, _______, _______,
-                    _______, _______, _______, _______,        _______, _______, _______, _______
-  ),
-
-  [_LOWER] = LAYOUT( /* Number layout, basically the main function layer */
-  _______, KC_EXLM, KC_AT,    KC_HASH, KC_DLR,  KC_PERC,       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, _______, KC_VOLD,  KC_VOLU, KC_MPLY, KC_MNXT,       KC_MUTE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-  _______, _______, KC_TILD,  _______, _______, KC_MPRV,       _______, _______, _______, KC_PIPE, KC_DQT,  _______,
-                              _______, _______, _______,       _______, _______, _______,
-                     _______, _______, _______, _______,       _______, _______, _______, _______
-  ),
-
-  [_ADJUST] = LAYOUT( /* Shifted number/function layout, for per-key control.  Only active when shift is held, and number is toggled or held */
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,          KC_PSLS, KC_P7,   KC_P8,   KC_P9, KC_PMNS, _______,
-  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,         KC_PAST, KC_P4,   KC_P5,   KC_P6, KC_PPLS, _______,
-  _______, _______, _______, LGUI(KC_L), KC_PSCR, KC_APP,      KC_PCMM, KC_P1,   KC_P2,   KC_P3, KC_PEQL, _______,
-                             _______, _______, _______,        _______, KC_P0,   KC_PDOT,
-                    _______, _______, _______, _______,        _______, _______, _______, _______
-  ),
-
-  [_MOUSE] = LAYOUT( /* Mouse layer, including buttons for clicking. */
-  _______, _______, _______, _______, _______, _______,        KC_VOLU, KC_HOME, KC_WH_U, KC_PGUP, _______, _______,
-  _______, _______, MS_BTN2, MS_BTN3, MS_BTN1, _______,        KC_VOLD, MS_BTN1, MS_BTN3, MS_BTN2, _______, _______,
-  _______, _______, _______, _______, _______, _______,        KC_HOME, KC_END,  KC_WH_D, KC_PGDN, _______, _______,
-                             _______, KC_UP,   _______,        _______, KC_UP,   _______,
-                    _______, KC_LEFT, KC_DOWN, KC_RGHT,        KC_LEFT, KC_DOWN, KC_RGHT, _______
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    red_led(layer_state_cmp(state, _LOWER));
-    grn_led(layer_state_cmp(state, _RAISE));
-    blu_led(layer_state_cmp(state, _MOUSE));
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-#define SetBitMask(variable, mask, on) if (on) variable |= mask; else variable &= ~mask
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    report_mouse_t currentReport;
-	switch (keycode) {
-		//mouse buttons, for 1-3, to update the mouse report:
-		//MOUSE_BTN1-3 are consts defined in report.h
-		case MS_BTN1:
-			currentReport = pointing_device_get_report();
-			SetBitMask(currentReport.buttons, MOUSE_BTN1, record->event.pressed);
-			pointing_device_set_report(currentReport);
-			return false;
-		case MS_BTN2:
-			currentReport = pointing_device_get_report();
-			SetBitMask(currentReport.buttons, MOUSE_BTN2, record->event.pressed);
-			pointing_device_set_report(currentReport);
-			return false;
-		case MS_BTN3:
-			currentReport = pointing_device_get_report();
-			SetBitMask(currentReport.buttons, MOUSE_BTN3, record->event.pressed);
-			pointing_device_set_report(currentReport);
-			return false;
-        case KC_WH_U:
-			currentReport = pointing_device_get_report();
-            if(record->event.pressed) {
-                currentReport.v += 1;
-            }
-            else {
-                currentReport.v = 0;
-            }
-			pointing_device_set_report(currentReport);
-			return false;
-        case KC_WH_D:
-			currentReport = pointing_device_get_report();
-            if(record->event.pressed) {
-                currentReport.v -= 1;
-            }
-            else {
-                currentReport.v = 0;
-            }
-            pointing_device_set_report(currentReport);
-			return false;
-	}
-	return true;
-}
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index d1c1201a548..b6a3484a260 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #ifndef IOS_DEVICE_ENABLE
-  #if RGBLED_NUM <= 7
+  #if RGBLIGHT_LED_COUNT <= 7
     #define RGBLIGHT_LIMIT_VAL 255
     #define RGBLIGHT_VAL_STEP 17
   #endif
diff --git a/keyboards/dm9records/plaid/keymaps/brickbots/config.h b/keyboards/dm9records/plaid/keymaps/brickbots/config.h
deleted file mode 100644
index 5733b9e4b04..00000000000
--- a/keyboards/dm9records/plaid/keymaps/brickbots/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Takuya Urakawa (dm9records.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
-
-// place overrides here
diff --git a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c b/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
deleted file mode 100644
index 975eacaebc6..00000000000
--- a/keyboards/dm9records/plaid/keymaps/brickbots/keymap.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* Copyright 2019 Takuya Urakawa (dm9records.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
-
-extern keymap_config_t keymap_config;
-
-enum plaid_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum plaid_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  EXT_PLV,
-  LED_1,
-  LED_2,
-  LED_3,
-  LED_4,
-  LED_5,
-  LED_6,
-  LED_7,
-  LED_8,
-  LED_9,
-  LED_0
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-// array of keys considered modifiers for led purposes
-const uint16_t modifiers[] = {
-    KC_LCTL,
-    KC_RCTL,
-    KC_LALT,
-    KC_RALT,
-    KC_LSFT,
-    KC_RSFT,
-    KC_LGUI,
-    KC_RGUI,
-    LOWER,
-    RAISE
-};
-
-//Setup consts for LED modes
-#define LEDMODE_ON 1 //always on
-#define LEDMODE_OFF 0 //always off
-#define LEDMODE_MODS 2 //On with modifiers
-#define LEDMODE_BLINKIN 3 //blinkinlights - % chance toggle on keypress
-#define LEDMODE_KEY 4 //On with any keypress, off with key release
-#define LEDMODE_ENTER 5 // On with enter key
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ltrl | Rctl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_plaid_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_ENT ,
-    KC_LCTL, KC_RCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | RAlt | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_plaid_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    KC_LCTL, KC_RALT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | RAlt | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_plaid_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    KC_LCTL, KC_RALT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_plaid_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_plaid_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_plaid_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Reset |      |      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_plaid_grid(
-    QK_BOOT,LED_1, LED_2, LED_3, LED_4, LED_5,LED_6, LED_7, LED_8, LED_9, LED_0,KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-//Setup config struct for LED
-typedef union {
-  uint32_t raw;
-  struct {
-    uint8_t  red_mode :8;
-    uint8_t  green_mode :8;
-  };
-} led_config_t;
-led_config_t led_config;
-
-//Set leds to saved state during powerup
-void keyboard_post_init_user(void) {
-  // Call the post init code.
-  led_config.raw = eeconfig_read_user();
-
-  if(led_config.red_mode == LEDMODE_ON) {
-      writePinHigh(LED_RED);
-  }
-
-  if(led_config.green_mode == LEDMODE_ON) {
-      writePinHigh(LED_GREEN);
-  }
-}
-
-void eeconfig_init_user(void) {  // EEPROM is getting reset!
-  led_config.raw = 0;
-  led_config.red_mode = LEDMODE_ON;
-  led_config.green_mode = LEDMODE_MODS;
-      eeconfig_update_user(led_config.raw);
-  eeconfig_update_user(led_config.raw);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-void led_keypress_update(uint8_t led, uint8_t led_mode, uint16_t keycode, keyrecord_t *record) {
-    switch (led_mode) {
-      case LEDMODE_MODS:
-        for (int i=0;i<ARRAY_SIZE(modifiers);i++) {
-          if(keycode==modifiers[i]) {
-            if (record->event.pressed) {
-              writePinHigh(led);
-            }
-            else {
-              writePinLow(led);
-            }
-          }
-        }
-        break;
-      case LEDMODE_BLINKIN:
-        if (record->event.pressed) {
-          if(rand() % 2 == 1) {
-            if(rand() % 2 == 0) {
-              writePinLow(led);
-            }
-            else {
-              writePinHigh(led);
-            }
-          }
-        }
-        break;
-      case LEDMODE_KEY:
-        if (record->event.pressed) {
-          writePinHigh(led);
-          return;
-        }
-        else {
-          writePinLow(led);
-          return;
-        }
-        break;
-      case LEDMODE_ENTER:
-        if (keycode==KC_ENT) {
-          writePinHigh(led);
-        }
-        else {
-          writePinLow(led);
-        }
-        break;
-
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  /* If the either led mode is keypressed based, call the led updater
-     then let it fall through the keypress handlers. Just to keep
-     the logic out of this procedure */
-  if (led_config.red_mode >= LEDMODE_MODS && led_config.red_mode <= LEDMODE_ENTER) {
-      led_keypress_update(LED_RED, led_config.red_mode, keycode, record);
-  }
-  if (led_config.green_mode >= LEDMODE_MODS && led_config.green_mode <= LEDMODE_ENTER) {
-      led_keypress_update(LED_GREEN, led_config.green_mode, keycode, record);
-  }
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case LED_1:
-      if (record->event.pressed) {
-        if (led_config.red_mode==LEDMODE_ON) {
-            led_config.red_mode=LEDMODE_OFF;
-            writePinLow(LED_RED);
-        }
-        else {
-            led_config.red_mode=LEDMODE_ON;
-            writePinHigh(LED_RED);
-        }
-      }
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-    case LED_2:
-      if (record->event.pressed) {
-        if (led_config.green_mode==LEDMODE_ON) {
-            led_config.green_mode=LEDMODE_OFF;
-            writePinLow(LED_GREEN);
-        }
-        else {
-            led_config.green_mode=LEDMODE_ON;
-            writePinHigh(LED_GREEN);
-        }
-      }
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-    case LED_3:
-      led_config.red_mode=LEDMODE_MODS;
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-    case LED_4:
-      led_config.green_mode=LEDMODE_MODS;
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-    case LED_5:
-      led_config.red_mode=LEDMODE_BLINKIN;
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-    case LED_6:
-      led_config.green_mode=LEDMODE_BLINKIN;
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-    case LED_7:
-      led_config.red_mode=LEDMODE_KEY;
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-    case LED_8:
-      led_config.green_mode=LEDMODE_KEY;
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-    case LED_9:
-      led_config.red_mode=LEDMODE_ENTER;
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-    case LED_0:
-      led_config.green_mode=LEDMODE_ENTER;
-      eeconfig_update_user(led_config.raw);
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/dm9records/plaid/keymaps/brickbots/readme.md b/keyboards/dm9records/plaid/keymaps/brickbots/readme.md
deleted file mode 100644
index 48a12fa8bbe..00000000000
--- a/keyboards/dm9records/plaid/keymaps/brickbots/readme.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Brickbots keymap for plaid
-Original copyright 2019 Takuya Urakawa (dm9records.com)
-LED Support added by Richard Sutherland (rich@brickbots.com)
-
-This layout is based on the Planck layout, with esc/tab swapped and an extra
-ctrl key in the bottom left corner. It includes an adjust layer (6)
-accessible by holding the lower and raise modifiers (MO3 and MO4) together.
-The adjustment layer is used to set the behavior of the two LEDs:
-
-**Modifier Mode:**   
-Activates when any modifier (shift, alt, os, MO) key is held
-down.  LED turns off when key is release
-
-**Blinkinlights Mode:**  
-Random chance of state change on each keystroke.
-
-**Keypress Mode:**  
-On for any keypress as long as the key is pressed
-
-**Carriage Mode:**  
-Turns on when enter is pressed, turns off when any next key is pressed
-
-To set the behavior of an LED, and save it to eeprom, hold the
-raise/lower keys together to access the adjust layer, then use
-the keys indicated below to set the behaviors
-
-* q = Toggle Red LED state, deactivates any other modes
-* w = Toggle Green LED state, deactivates any other modes
-* e = Set RED LED to modifier mode
-* r = Set GREEN LED to modifier mode
-* t = Set RED LED to Blinkinlights mode
-* y = set GREEN LED to Blinkinlights mode
-* u = set RED LED to Keypress mode
-* i = set GREEN LED to Keypress mode
-* o = set RED LED to Carriage mode
-* p = set GREEN LED to Carriage mode
diff --git a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c b/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
deleted file mode 100644
index a91664f0c96..00000000000
--- a/keyboards/dm9records/plaid/keymaps/gipsy-king/keymap.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Copyright 2020 Benjamin Große <ste3ls@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 plaid_layers {
-  _QWERTY,
-  _XMONAD,
-  _RAISE,
-  _LOWER,
-};
-
-enum plaid_keycodes {
-  AUTOCLICK = SAFE_RANGE
-};
-
-static bool autoclick = false;
-static bool autoclick_state = false;
-static uint16_t autoclick_timer = 0;
-
-#define XMONAD LM(_XMONAD, MOD_LGUI)
-#define SPC_LWR LT(_LOWER, KC_SPACE)
-#define ENT_RSE LT(_RAISE, KC_ENT)
-#define LOWER LT(_LOWER, KC_BSPC)
-
-#define LS_ESC LSFT_T(KC_ESC)
-#define RS_QUOT RSFT_T(KC_QUOT)
-
-#define LCT_MINS LCTL_T(KC_MINS)
-#define RCT_EQL RCTL_T(KC_EQL)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |Bckspc|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   -  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  =   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |XMONAD|LShift|    Space    |Ent/RA|RShift|LOWER | RAlt |RCtrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_plaid_grid( // Base QWERTY
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    LS_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, RS_QUOT,
-    LCT_MINS,KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RCT_EQL,
-    KC_LCTL, KC_LALT, KC_LGUI, XMONAD,  SC_LSPO, KC_SPACE,_______, ENT_RSE, SC_RSPC, LOWER,   KC_RALT, KC_RCTL
-),
-
-[_XMONAD] = LAYOUT_plaid_grid( // Xmonad with MOD4
-    KC_Q,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_P,    _______,
-    KC_LSFT, _______, _______, _______, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    _______, _______,
-    KC_LSFT, _______, _______, KC_C,    _______, KC_B,    _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_ENT,  _______, _______, _______, _______
-),
-
-/* Raised
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  \   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   {  | PgUp | PgDn |  End | Home | Left | Down |  Up  | Right|  }   |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   [  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  ]   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |VolDn |VolUp |Mute  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_plaid_grid( // Numbers, arrows, symbols
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-    KC_TILD, KC_LCBR, KC_PGUP, KC_PGDN, KC_END,  KC_HOME, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_RCBR, KC_PIPE,
-    KC_LBRC, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_RBRC,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE
-),
-
-[_LOWER] = LAYOUT_plaid_grid( // F, media keys, reset
-    KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, QK_BOOT,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, AUTOCLICK
-)
-};
-
-#define BLINKEN_RANDOM_STARTLE false
-static uint16_t blinken_timer = 0;
-static uint16_t next_timeout = 1000;
-enum blinken_modes {
-  BLINK_HOLD,
-  BLINK_STARTLED,
-  BLINK_STARTLED_LAYER
-};
-static uint16_t blinken_mode = BLINK_HOLD;
-static uint16_t blinken_timer_startled = 0;
-static uint16_t blinken_startled_state = 0;
-
-void matrix_init_user(void) {
-  // https://github.com/hsgw/plaid/issues/15#issuecomment-534677102
-  eeconfig_init();
-}
-
-void keyboard_post_init_user(void) {
-  writePinHigh(LED_RED);
-  writePinHigh(LED_GREEN);
-  blinken_timer = timer_read();
-}
-
-void matrix_scan_user(void) {
-  if (blinken_mode != BLINK_STARTLED_LAYER && timer_elapsed(blinken_timer) > next_timeout) {
-    blinken_timer = timer_read();
-    if (BLINKEN_RANDOM_STARTLE && rand() % 5 == 0) {
-      blinken_mode = BLINK_STARTLED;
-      blinken_timer_startled = timer_read();
-      blinken_startled_state = 0;
-    } else {
-      blinken_mode = BLINK_HOLD;
-
-      if(rand() % 2 == 0) {
-        next_timeout = 1000;
-      } else if(rand() % 2 == 0) {
-        next_timeout = 500;
-      } else {
-        next_timeout = 300;
-      }
-
-      if(rand() % 2 == 0) {
-        writePinLow(LED_RED);
-      } else {
-        writePinHigh(LED_RED);
-      }
-      if(rand() % 2 == 0) {
-        writePinLow(LED_GREEN);
-      } else {
-        writePinHigh(LED_GREEN);
-      }
-    }
-  } else if ((blinken_mode == BLINK_STARTLED || blinken_mode == BLINK_STARTLED_LAYER)
-      && timer_elapsed(blinken_timer_startled) > 50) {
-      blinken_timer_startled = timer_read();
-      switch (blinken_startled_state) {
-        case 0:
-          writePinLow(LED_GREEN);
-          blinken_startled_state += 1;
-          break;
-        case 1:
-          writePinHigh(LED_RED);
-          blinken_startled_state += 1;
-          break;
-        case 2:
-          writePinHigh(LED_GREEN);
-          blinken_startled_state += 1;
-          break;
-        case 3:
-          writePinLow(LED_RED);
-          blinken_startled_state = 0;
-          break;
-      }
-  }
-  if (autoclick && timer_elapsed(autoclick_timer) > (autoclick_state ? 20 : 100)) {
-    if (!autoclick_state) {
-      mousekey_on(KC_MS_BTN1);
-    } else {
-      mousekey_off(KC_MS_BTN1);
-    }
-    mousekey_send();
-    autoclick_state = !autoclick_state;
-    autoclick_timer = timer_read();
-  }
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-  case _RAISE:
-      blinken_mode = BLINK_STARTLED_LAYER;
-      break;
-  case _XMONAD:
-      blinken_mode = BLINK_STARTLED_LAYER;
-      break;
-  case _LOWER:
-      blinken_mode = BLINK_STARTLED_LAYER;
-      break;
-  default:
-      blinken_mode = BLINK_HOLD;
-      break;
-  }
-  return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case AUTOCLICK:
-        if (record->event.pressed) {
-            autoclick = !autoclick;
-            autoclick_timer = timer_read();
-        }
-        break;
-    }
-    return true;
-};
diff --git a/keyboards/dm9records/plaid/keymaps/gipsy-king/readme.md b/keyboards/dm9records/plaid/keymaps/gipsy-king/readme.md
deleted file mode 100644
index 999d92c8445..00000000000
--- a/keyboards/dm9records/plaid/keymaps/gipsy-king/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Gipsy keymap for plaid
-
-This layout is based on my corne layout:
-* QWERTY with Tab, Backspace on top, dash and equals on the bottom.
-* RAISE has numbers on top, arrows on hjkl, end/home on F/G, symbols on the
-  bottom and around.
-* XMONAD has xmonad wm key bindings, should be used with Layer modifier LGUI
-* LOWER has F keys and shouldn't be used much.
-* Thumbs are: XMONAD, Left SC shift, Space, Enter/Raise, Right SC shift
-
-Does not have so many modtaps, basically just on enter.
-
-The LEDs of the plaid keep blinking in a soothing dance, reminiscent of some
-old machine.
-
-When any layer is active, the LEDs are "startled".
-
-There is an autoclicker for minecraft.
-
diff --git a/keyboards/dm9records/plaid/keymaps/stephen-huan/config.h b/keyboards/dm9records/plaid/keymaps/stephen-huan/config.h
deleted file mode 100644
index 5733b9e4b04..00000000000
--- a/keyboards/dm9records/plaid/keymaps/stephen-huan/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Takuya Urakawa (dm9records.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
-
-// place overrides here
diff --git a/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c b/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
deleted file mode 100644
index de9d6cc45bf..00000000000
--- a/keyboards/dm9records/plaid/keymaps/stephen-huan/keymap.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/* Copyright 2019 Takuya Urakawa (dm9records.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 plaid_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum plaid_keycodes {
-  QWERTY = SAFE_RANGE,
-  LED_1,
-  LED_2,
-  LED_3,
-  LED_4,
-  LED_5,
-  LED_6,
-  LED_7,
-  LED_8,
-  LED_9,
-  LED_0
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-// array of keys considered modifiers for led purposes
-const uint16_t modifiers[] = {
-    KC_LCTL,
-    KC_RCTL,
-    KC_LALT,
-    KC_RALT,
-    KC_LSFT,
-    KC_RSFT,
-    KC_LGUI,
-    KC_RGUI,
-    LOWER,
-    RAISE
-};
-
-//Setup consts for LED modes
-#define LEDMODE_ON 1 //always on
-#define LEDMODE_OFF 0 //always off
-#define LEDMODE_MODS 2 //On with modifiers
-#define LEDMODE_BLINKIN 3 //blinkinlights - % chance toggle on keypress
-#define LEDMODE_KEY 4 //On with any keypress, off with key release
-#define LEDMODE_ENTER 5 // On with enter key
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Esc/hy|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  fn  | Alt  | GUI  |Lower |    Space    |Raise | GUI  | Alt  |Shift | Ctrl |
- * `-----------------------------------------------------------------------------------'
- *  (karabiner remaps Caps lock -> fn)
- */
-[_QWERTY] = LAYOUT_plaid_grid(
-    KC_TAB        , KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    HYPR_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_RSFT       , KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-    KC_RCTL       , KC_CAPS, KC_RALT, KC_RGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_RGUI, KC_RALT, KC_RSFT, KC_RCTL
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  | F10  | F11  | F12  |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      | Prev | Vol- | Play |
- * `-----------------------------------------------------------------------------------'
- * volume up key repeats randomly on mac, have to use mac specific volume
- */
-[_LOWER] = LAYOUT_plaid_grid(
-    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_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_MPRV, KC_VOLD, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |      |      | End  |      |      |      |Pg Up |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Home |      |Pg Dn |      |      | Left | Down |  Up  |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      | Copy |Paste |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      | Next | Vol+ | Mute |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_plaid_grid(
-    KC_TILD, _______, _______, KC_END, _______, _______, _______,  KC_PGUP, _______, _______, _______  , KC_DEL , 
-    _______, KC_HOME, _______, KC_PGDN, _______, _______, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______  , _______, 
-    _______, _______, _______, KC_COPY, KC_PSTE, KC_PGDN, _______, _______, _______, _______, _______  , _______,  
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLU, KC_MUTE
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Reset | Red  |Green | Rmod | Gmod |Rblink|Gblink| Rkey | Gkey | Rcar | Gcar |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |Power |Sleep |Wake  |Eject |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_plaid_grid(
-    QK_BOOT, LED_1  , LED_2  ,  LED_3  , LED_4  , LED_5  ,LED_6   , LED_7  , LED_8  , LED_9  , LED_0  , _______ ,
-    _______, KC_PWR , KC_SLEP,  KC_WAKE, KC_EJCT, _______, _______, _______, _______, _______, _______, _______ ,
-    _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-    _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-//Setup config struct for LED
-typedef union {
-  uint32_t raw;
-  struct {
-    uint8_t  red_mode :8;
-    uint8_t  green_mode :8;
-  };
-} led_config_t;
-led_config_t led_config;
-
-//Set leds to saved state during powerup
-void keyboard_post_init_user(void) {
-  // set LED pin modes
-  setPinOutput(LED_RED);
-  setPinOutput(LED_GREEN);
-
-  // Call the post init code.
-  led_config.raw = eeconfig_read_user();
-
-  if(led_config.red_mode == LEDMODE_ON) {
-      writePinHigh(LED_RED);
-  }
-
-  if(led_config.green_mode == LEDMODE_ON) {
-      writePinHigh(LED_GREEN);
-  }
-}
-
-void eeconfig_init_user(void) {  // EEPROM is getting reset! 
-  led_config.raw = 0;
-  led_config.red_mode = LEDMODE_ON;
-  led_config.green_mode = LEDMODE_MODS;
-  eeconfig_update_user(led_config.raw);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-void led_keypress_update(uint8_t led, uint8_t led_mode, uint16_t keycode, keyrecord_t *record) {
-    switch (led_mode) {
-      case LEDMODE_MODS:
-        for (int i=0;i<ARRAY_SIZE(modifiers);i++) {
-          if(keycode==modifiers[i]) {
-            if (record->event.pressed) {
-              writePinHigh(led);
-            }
-            else {
-              writePinLow(led);
-            }
-          }
-        }
-        break;
-      case LEDMODE_BLINKIN:
-        if (record->event.pressed) {
-
-          /* Markov Chain
-           *
-           *   1 - x           1 - y
-           *   /---\           /---\
-           *   v   |           v   |
-           *  /------\   x   /------\
-           *  |      |------>|      |
-           *  |  on  |   y   | off  |
-           *  |      |<------|      |
-           *  \------/       \------/
-          */
-
-          /* Non-homogeneous Markov Chain
-           *
-           * /-----\ 1 - x0 /-----\ 1 - x1 /-----\  
-           * |on  0|------->|on  1|------->|on  2|----> ...  
-           * \-----/\      /\-----/\      /\-----/\
-           *         \    /         \    /         .
-           *        x0\  /         x1\  /           .
-           *           \/             \/             .
-           *           /\             /\              
-           *        y0/  \         y1/  \            .
-           *         /    \         /    \          .
-           *        /      \       /      \        .
-           * /-----\ 1 - y0 /-----\ 1 - y1 /-----\/  
-           * |off 0|------->|off 1|------->|off 2|----> ...
-           * \-----/        \-----/        \-----/  
-           *
-           *
-           * if x = 1/4 and y 1/4, behavior is equivalent to the original code
-           * and converges to a steady state at the rate of 1/2^k
-           * where k is the number of key presses
-           * (the distance from a given vector to the steady state, [1/2, 1/2], 
-           * is cut in half every key press)
-           *
-           * if x = y, then it is guaranteed that the steady state is still
-           * [1/2, 1/2], but the rate at which it converges is variable 
-           *
-           * if x != y, then there is no well-defined steady state
-          */
-
-          double x = (1.0*rand())/RAND_MAX;
-          double y = x;
-
-          double p = (readPin(led)) ? x : y;
-          if (rand() < p*RAND_MAX) {
-            togglePin(led);
-          }
-
-          /* following code is restriced to x + y <= 1
-           * if(rand() % 2 == 1) { */
-          /*   if(rand() % 2 == 0) { */
-          /*     writePinLow(led); */
-          /*   } */
-          /*   else { */
-          /*     writePinHigh(led); */
-          /*   } */
-          /* } */
-        }
-        break;
-      case LEDMODE_KEY:
-        if (record->event.pressed) {
-          writePinHigh(led);
-          return;
-        }
-        else {
-          writePinLow(led);
-          return;
-        }
-        break;
-      case LEDMODE_ENTER:
-        if (keycode==KC_ENT) {
-          writePinHigh(led);
-        }
-        else {
-          writePinLow(led);
-        }
-        break;
-
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  /* If the either led mode is keypressed based, call the led updater
-     then let it fall through the keypress handlers. Just to keep 
-     the logic out of this procedure */
-  if (led_config.red_mode >= LEDMODE_MODS && led_config.red_mode <= LEDMODE_ENTER) {
-      led_keypress_update(LED_RED, led_config.red_mode, keycode, record);
-  }
-  if (led_config.green_mode >= LEDMODE_MODS && led_config.green_mode <= LEDMODE_ENTER) {
-      led_keypress_update(LED_GREEN, led_config.green_mode, keycode, record);
-  }
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LED_1:
-      if (record->event.pressed) {
-        if (led_config.red_mode==LEDMODE_ON) {
-            led_config.red_mode=LEDMODE_OFF;
-            writePinLow(LED_RED);
-        }
-        else {
-            led_config.red_mode=LEDMODE_ON;
-            writePinHigh(LED_RED);
-        }
-      }
-      break;
-    case LED_2:
-      if (record->event.pressed) {
-        if (led_config.green_mode==LEDMODE_ON) {
-            led_config.green_mode=LEDMODE_OFF;
-            writePinLow(LED_GREEN);
-        }
-        else {
-            led_config.green_mode=LEDMODE_ON;
-            writePinHigh(LED_GREEN);
-        }
-      }
-      break;
-    case LED_3:
-      led_config.red_mode=LEDMODE_MODS;
-      break;
-    case LED_4:
-      led_config.green_mode=LEDMODE_MODS;
-      break;
-    case LED_5:
-      led_config.red_mode=LEDMODE_BLINKIN;
-      break;
-    case LED_6:
-      led_config.green_mode=LEDMODE_BLINKIN;
-      break;
-    case LED_7:
-      led_config.red_mode=LEDMODE_KEY;
-      break;
-    case LED_8:
-      led_config.green_mode=LEDMODE_KEY;
-      break;
-    case LED_9:
-      led_config.red_mode=LEDMODE_ENTER;
-      break;
-    case LED_0:
-      led_config.green_mode=LEDMODE_ENTER;
-      break;
-  }
-
-  if (keycode >= LED_1 && keycode <= LED_0) {
-    eeconfig_update_user(led_config.raw);
-  }
-
-  return true;
-}
diff --git a/keyboards/dm9records/plaid/keymaps/stephen-huan/readme.md b/keyboards/dm9records/plaid/keymaps/stephen-huan/readme.md
deleted file mode 100644
index e52d24c3dfd..00000000000
--- a/keyboards/dm9records/plaid/keymaps/stephen-huan/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# stephen-huan's keymap for Plaid
diff --git a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/config.h b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/config.h
deleted file mode 100644
index 4bcbc6f673a..00000000000
--- a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Ian Canino (ian@thecommittedbug.io)
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
deleted file mode 100644
index 82494e40afb..00000000000
--- a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/keymap.c
+++ /dev/null
@@ -1,182 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum plaid_layers {
-    _QWERTY,
-    _DVORAK,
-    _COLEMAK,
-    _LOWER,
-    _RAISE,
-    _FUNCTION,
-};
-
-enum plaid_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, LED };
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-#define LED_ON 1
-#define LED_OFF 0
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty
-     * ,-----------------------------------------------------------------------------------.
-     * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | LS/( |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl | LGUI | Alt  |   [  |Lower |    Space    |Raise |   ]  | RGUI |   \  | RS/) |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_QWERTY] = LAYOUT_planck_mit(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, SC_LSPO, 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_LBRC, LOWER, KC_SPC, RAISE, KC_RBRC, KC_RGUI, KC_BSLS, SC_RSPC),
-
-    /* Colemak
-     * ,-----------------------------------------------------------------------------------.
-     * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Tab  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | LS/( |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl | LGUI | Alt  |   [  |Lower |    Space    |Raise |   ]  | RGUI |   \  | RS/) |
-     * `-----------------------------------------------------------------------------------'
-     */
-
-    [_COLEMAK] = LAYOUT_planck_mit(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, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, KC_RALT, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_RBRC, KC_RGUI, KC_BSLS, SC_RSPC),
-
-    /* Dvorak
-     * ,-----------------------------------------------------------------------------------.
-     * | Esc  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Tab  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl | LGUI | Alt  |   [  |Lower |    Space    |Raise |   ]  | RGUI |   \  | RS/) |
-     * `-----------------------------------------------------------------------------------'
-     */
-
-    [_DVORAK] = LAYOUT_planck_mit(KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, SC_LSPO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT, KC_LCTL, KC_RALT, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_RBRC, KC_RGUI, KC_BSLS, SC_RSPC),
-
-    /* LOWER
-     * ,----------------------------------------------------------------------------.
-     * |      |      | MPRV | MPLY | MNXT |     |     |     | PGUP| UP  | PGDN|PSCR |
-     * |------+------+------+------+------+-----+-----+-----+-----+-----------+-----+
-     * |      |      | MUTE | VOLD | VOLU |     |     |     | LEFT| DOWN|RIGHT|     |
-     * |------+------+------+------+------+-----+-----+-----+-----+-----+-----+-----+
-     * |      |      | MAIL | WBAK | WFWD |     |     |     | HOME|     | END |     |
-     * |------+------+------+------+------+-----+-----+-----+-----+-----------+-----+
-     * |      |      |      |      |      |    DEL    |     |     |     |     |     |
-     * `----------------------------------------------------------------------------'
-     */
-
-    [_LOWER] = LAYOUT_planck_mit(KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_NO, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_MAIL, KC_WBAK, KC_WFWD, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-
-    /* RAISE
-     * ,--------------------------------------------------------------------------------.
-     * | NLCK |  1   |  2   |  3   |  -   |     |     |     |  !   |  #   |  $   |  +   |
-     * |------+------+------+------+------+-----+-----+-----+------+------+------+------+
-     * |   /  |  4   |  5   |  6   |  +   |     |     |     |  %   |  !   |  !   |  =   |
-     * |------+------+------+------+------+-----+-----+-----+------+------+------+------+
-     * |   *  |  7   |  8   |  9   |  ,   |     |     |     |  _   |  -   |  @   |  ~   |
-     * |------+------+------+------+------+-----+-----+-----+------+------+------+------+
-     * |      |  0   |  .   | Ent  |  =   |           |     |      |      |      |  `   |
-     * `--------------------------------------------------------------------------------'
-     */
-
-    [_RAISE] = LAYOUT_planck_mit(KC_NUM, KC_P1, KC_P2, KC_P3, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_EXLM, KC_HASH, KC_DLR, KC_PLUS, KC_PSLS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_NO, KC_PERC, KC_ASTR, KC_AMPR, KC_EQL, KC_PAST, KC_P7, KC_P8, KC_P9, KC_PCMM, KC_NO, KC_NO, KC_NO, KC_UNDS, KC_MINS, KC_AT, KC_TILDE, KC_NO, KC_P0, KC_PDOT, KC_PENT, KC_PEQL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV),
-
-    /* Function (Lower + Raise)
-     * ,-----------------------------------------------------------------------------------------------------------------------.
-     * | QK_BOOT| LCA_T(F1)  | LCA_T(F2) | LCA_T(F3) | LCA_T(F4) | LCA_T(F5) | LCA_T(F6) | LCA_T(F7) |      |      |      |      |
-     * |------+------------+-----------+-----------+-----------+-----------+-----------+-----------+------+------+------+------+
-     * |      |            |           |           |           | QWERTY    | DVORAK    | COLEMAK   |      |      |      |      |
-     * |------+------------+-----------+-----------+-----------+-----------+-----------+-----------+------+------+------+------+
-     * |      |            |           |           |           |           |           |           |      |      |      |      |
-     * |------+------------+-----------+-----------+-----------+-----------+-----------+-----------+------+------+------+------+
-     * |      |            |           |           |           |          LED          |           |      |      |      |      |
-     * `-----------------------------------------------------------------------------------------------------------------------'
-     */
-
-    [_FUNCTION] = LAYOUT_planck_mit(QK_BOOT, LCA_T(KC_F1), LCA_T(KC_F2), LCA_T(KC_F3), LCA_T(KC_F4), LCA_T(KC_F5), LCA_T(KC_F6), LCA_T(KC_F7), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QWERTY, DVORAK, COLEMAK, 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, KC_NO, KC_NO, LED, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)};
-
-// constants to toggle LED behavior
-
-// Setup config struct for LED
-typedef union {
-    uint32_t raw;
-    struct {
-        bool red_mode : 1;
-        bool green_mode : 1;
-    };
-} led_config_t;
-led_config_t led_config;
-
-void keyboard_post_init_user(void) { led_config.raw = eeconfig_read_user(); }
-
-void eeconfig_init_user(void) {  // EEPROM is getting reset!
-    led_config.raw        = 0;
-    led_config.red_mode   = LED_ON;
-    led_config.green_mode = LED_ON;
-    eeconfig_update_user(led_config.raw);
-    eeconfig_update_user(led_config.raw);
-}
-
-// When LOWER and RAISE are held together, go to the FUNCTION layer
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _FUNCTION); }
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    switch (layer) {
-        case _LOWER:
-            writePinHigh(LED_RED);
-            break;
-        case _RAISE:
-            writePinHigh(LED_GREEN);
-            break;
-        default:
-            writePinLow(LED_GREEN);
-            writePinLow(LED_RED);
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return false;
-            break;
-        case COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            return false;
-            break;
-        case DVORAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_DVORAK);
-            }
-            return false;
-            break;
-        case LED:
-            if (record->event.pressed) {
-                if (led_config.red_mode == LED_ON && led_config.green_mode == LED_ON) {
-                    led_config.red_mode   = LED_OFF;
-                    led_config.green_mode = LED_OFF;
-                } else if (led_config.red_mode == LED_OFF && led_config.green_mode == LED_OFF) {
-                    led_config.red_mode   = LED_ON;
-                    led_config.green_mode = LED_ON;
-                }
-            }
-            eeconfig_update_user(led_config.raw);
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/readme.md b/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/readme.md
deleted file mode 100644
index bd09965b55e..00000000000
--- a/keyboards/dm9records/plaid/keymaps/thehalfdeafchef/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![Plaid Layout Image](https://i.imgur.com/WnVnwEG.png)
-
-# The Half Deaf Chef Plaid Layout
-
-Opinionated keymaps optimized for programmers. The Left and Right Shift tap as parenthesis and the bracket keys are to either side of the layer keys (LOWER, RAISE). A 'right-side' up number pad in a layer with a complementary 'symbol' pad on the opposite side. An additional layer is provided to switch to virtual console on Linux based systems running xorg. These changes are propagated among all the layouts.
diff --git a/keyboards/dm9records/plaid/rules.mk b/keyboards/dm9records/plaid/rules.mk
index c8391483dda..760f9b9650b 100644
--- a/keyboards/dm9records/plaid/rules.mk
+++ b/keyboards/dm9records/plaid/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS_HAS_RGB = no
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/dm9records/tartan/rules.mk b/keyboards/dm9records/tartan/rules.mk
index 66ded37adf6..722ea170590 100644
--- a/keyboards/dm9records/tartan/rules.mk
+++ b/keyboards/dm9records/tartan/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS_HAS_RGB = no
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/dmqdesign/spin/keymaps/codecoffeecode/config.h b/keyboards/dmqdesign/spin/keymaps/codecoffeecode/config.h
deleted file mode 100644
index d736cc309f0..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/codecoffeecode/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 codecoffeecode
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_HUE_STEP 8
\ No newline at end of file
diff --git a/keyboards/dmqdesign/spin/keymaps/codecoffeecode/keymap.c b/keyboards/dmqdesign/spin/keymaps/codecoffeecode/keymap.c
deleted file mode 100644
index d6653691bb2..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/codecoffeecode/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2020 codecoffeecode
- *
- * 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_HOME,              KC_UP,   KC_END,   /*|*/ KC_TRNS,
-      KC_LEFT,              KC_DOWN, KC_RIGHT, /*|*/ KC_TRNS,
-      KC_MPRV,              KC_MPLY, KC_MNXT,  /*|*/ KC_TRNS,
-      LCTL(LSFT(KC_ESC)),   RGB_TOG, LGUI(KC_L)
-      ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    switch(index) {
-      case 0:
-        if (clockwise) {
-          tap_code(KC_VOLU); // Volume
-        } else {
-          tap_code(KC_VOLD);
-        }
-        break;
-      case 1:
-        if (clockwise) {
-          tap_code(KC_MS_WH_DOWN);  // Scroll
-        } else {
-          tap_code(KC_MS_WH_UP);
-        }
-        break;
-      case 2:
-        if (clockwise) {
-          rgblight_increase_hue(); // RGB Hue
-        } else {
-          rgblight_decrease_hue();
-        }
-        break;
-    }
-    return true;
-}
diff --git a/keyboards/dmqdesign/spin/keymaps/encoderlayers/config.h b/keyboards/dmqdesign/spin/keymaps/encoderlayers/config.h
deleted file mode 100644
index 8b04e7dd318..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/encoderlayers/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019-2020 DMQ Design
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_HUE_STEP 8
-#define MIDI_ADVANCED
-
diff --git a/keyboards/dmqdesign/spin/keymaps/encoderlayers/keymap.c b/keyboards/dmqdesign/spin/keymaps/encoderlayers/keymap.c
deleted file mode 100644
index 100f821a605..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/encoderlayers/keymap.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Copyright 2019-2020 DMQ Design
- *
- * 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 "midi.h"
-#include "qmk_midi.h"
-
-enum layers
-{
-  _BL,
-  _FL,
-  _TL
-};
-
-uint8_t currentLayer;
-
-//The below layers are intentionally empty in order to give a good starting point for how to configure multiple layers.
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BL] = LAYOUT(/* Base */
-                KC_KP_7, KC_KP_8, KC_KP_9, TO(_BL),
-                KC_KP_4, KC_KP_5, KC_KP_6, TO(_FL),
-                KC_KP_1, KC_KP_2, KC_KP_3, TO(_TL),
-                KC_KP_0, RGB_TOG, RGB_MOD
-                ),
-
-    [_FL] = LAYOUT(/* Base */
-                KC_NO, KC_NO, KC_NO, KC_TRNS,
-                KC_NO, KC_NO, KC_NO, KC_TRNS,
-                KC_NO, KC_NO, KC_NO, KC_TRNS,
-                KC_MS_BTN1, KC_NO, KC_MS_BTN2
-                ),
-
-    [_TL] = LAYOUT(/* Base */
-                KC_NO, KC_NO, KC_NO, KC_TRNS,
-                KC_NO, KC_NO, KC_NO, KC_TRNS,
-                KC_NO, KC_NO, KC_NO, KC_TRNS,
-                KC_NO, KC_NO, KC_NO
-                )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        switch (currentLayer) {     //break each encoder update into a switch statement for the current layer
-            case _BL:
-                if (clockwise) {
-                    rgblight_increase_hue();
-                } else {
-                    rgblight_decrease_hue();
-                }
-                break;
-            case _FL:
-                if (clockwise) {
-                    midi_send_cc(&midi_device, 0, 0x14, 1);
-                } else {
-                    midi_send_cc(&midi_device, 0, 0x15, 1);
-                }
-                break;
-            case _TL:
-                if (clockwise) {
-                    midi_send_cc(&midi_device, 0, 0x1A, 1);
-                } else {
-                    midi_send_cc(&midi_device, 0, 0x1B, 1);
-                }
-                break;
-        }
-    } else if (index == 1) { /* Second encoder */
-        switch (currentLayer) {
-            case _BL:
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-                break;
-            case _FL:
-                if (clockwise) {
-                    midi_send_cc(&midi_device, 0, 0x16, 1);
-                } else {
-                    midi_send_cc(&midi_device, 0, 0x17, 1);
-                }
-                break;
-            case _TL:
-                if (clockwise) {
-                    midi_send_cc(&midi_device, 0, 0x1C, 1);
-                } else {
-                    midi_send_cc(&midi_device, 0, 0x1D, 1);
-                }
-                break;
-        }
-    } else if (index == 2) { /* Third encoder */
-        switch (currentLayer) {
-            case _BL:
-                if (clockwise) {
-                    rgblight_increase_val();
-                } else {
-                    rgblight_decrease_val();
-                }
-                break;
-            case _FL:
-                if (clockwise) {
-                    midi_send_cc(&midi_device, 0, 0x18, 1);
-                } else {
-                    midi_send_cc(&midi_device, 0, 0x19, 1);
-                }
-                break;
-            case _TL:
-                if (clockwise) {
-                    midi_send_cc(&midi_device, 0, 0x1E, 1);
-                } else {
-                    midi_send_cc(&midi_device, 0, 0x1F, 1);
-                }
-                break;
-        }
-    }
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) { //This will run every time the layer is updated
-    currentLayer = get_highest_layer(state);
-
-    switch (currentLayer) {
-        case _BL:
-            setrgb(RGB_WHITE, &led[0]); //Set the top LED to white for the bottom layer
-            setrgb(0, 0, 0, &led[1]);
-            setrgb(0, 0, 0, &led[2]);
-            break;
-        case _FL:
-            setrgb(0, 0, 0, &led[0]); //Set the middle LED to white for the middle layer
-            setrgb(RGB_WHITE, &led[1]);
-            setrgb(0, 0, 0, &led[2]);
-            break;
-        case _TL:
-            setrgb(0, 0, 0, &led[0]);
-            setrgb(0, 0, 0, &led[1]);
-            setrgb(RGB_WHITE, &led[2]); //Set the bottom LED to white for the top layer
-            break;
-    }
-    rgblight_set();
-    return state;
-}
diff --git a/keyboards/dmqdesign/spin/keymaps/encoderlayers/readme.md b/keyboards/dmqdesign/spin/keymaps/encoderlayers/readme.md
deleted file mode 100644
index 256fb16d47c..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/encoderlayers/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# This keymap is intended to demonstrate how to implement different encoder functions dependent on layer, and on how to implement MIDI control with encoders.
\ No newline at end of file
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h b/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h
deleted file mode 100644
index 72c55371418..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/gorbachev/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019-2020 DMQ Design
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_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 RGBLIGHT_HUE_STEP 8
-
-// Use one or the other, determines the orientation of
-// the OLED display
-// #define RIGHT_HAND
-#define LEFT_HAND
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/keymap.c b/keyboards/dmqdesign/spin/keymaps/gorbachev/keymap.c
deleted file mode 100644
index b41359c5b60..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/gorbachev/keymap.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* Copyright 2019-2020 DMQ Design
- *
- * 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 {
-    _NUMPAD,
-    _RGB,
-    _MACRO
-};
-
-enum custom_keycodes {
-    HELLO_WORLD = SAFE_RANGE,
-};
-
-//The below layers are intentionally empty in order to give a good starting point for how to configure multiple layers.
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_NUMPAD] = LAYOUT(/* Base */
-                KC_7, KC_8, KC_9, TO(_NUMPAD),
-                KC_4, KC_5, KC_6, TO(_RGB),
-                KC_1, KC_2, KC_3, TO(_MACRO),
-                KC_0, KC_DOT, KC_ENTER
-                ),
-
-    [_RGB] = LAYOUT(/* Base */
-                RGB_HUI,  RGB_SAI, RGB_VAI, KC_TRNS,
-                RGB_HUD,  RGB_SAD, RGB_VAD, KC_TRNS,
-                KC_NO,    KC_NO,   KC_NO,   KC_TRNS,
-                RGB_RMOD, RGB_TOG, RGB_MOD
-                ),
-
-    [_MACRO] = LAYOUT(/* Base */
-                HELLO_WORLD, KC_NO, KC_NO, KC_TRNS,
-                KC_NO, KC_NO, KC_NO, KC_TRNS,
-                KC_NO, KC_NO, KC_NO, KC_TRNS,
-                KC_NO, KC_NO, KC_NO
-                )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case HELLO_WORLD:
-            if (record->event.pressed) {
-                SEND_STRING("Hello, world!");
-            }
-            break;
-    }
-
-    return true;
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        switch (get_highest_layer(layer_state)) {     //break each encoder update into a switch statement for the current layer
-            case _NUMPAD:
-                if (clockwise) {
-                    tap_code(KC_DOWN);
-                } else {
-                    tap_code(KC_UP);
-                }
-                break;
-            case _RGB:
-                if (clockwise) {
-                    rgblight_increase_hue();
-                } else {
-                    rgblight_decrease_hue();
-                }
-                break;
-            case _MACRO:
-                if (clockwise) {
-                    break;
-                } else {
-                    break;
-                }
-                break;
-        }
-    } else if (index == 1) { /* Second encoder */
-        switch (get_highest_layer(layer_state)) {
-            case _NUMPAD:
-                if (clockwise) {
-                    tap_code(KC_PGDN);
-                } else {
-                    tap_code(KC_PGUP);
-                }
-                break;
-            case _RGB:
-                if (clockwise) {
-                    rgblight_increase_sat();
-                } else {
-                    rgblight_decrease_sat();
-                }
-                break;
-            case _MACRO:
-                if (clockwise) {
-                    break;
-                } else {
-                    break;
-                }
-                break;
-        }
-    } else if (index == 2) { /* Third encoder */
-        switch (get_highest_layer(layer_state)) {
-            case _NUMPAD:
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-                break;
-            case _RGB:
-                if (clockwise) {
-                    rgblight_increase_val();
-                } else {
-                    rgblight_decrease_val();
-                }
-                break;
-            case _MACRO:
-                if (clockwise) {
-                    break;
-                } else {
-                    break;
-                }
-                break;
-        }
-    }
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) { //This will run every time the layer is updated
-    switch (get_highest_layer(state)) {
-        case _NUMPAD:
-            setrgb(RGB_WHITE, &led[0]); //Set the top LED to white for the bottom layer
-            setrgb(0, 0, 0, &led[1]);
-            setrgb(0, 0, 0, &led[2]);
-            break;
-        case _RGB:
-            setrgb(0, 0, 0, &led[0]); //Set the middle LED to white for the middle layer
-            setrgb(RGB_WHITE, &led[1]);
-            setrgb(0, 0, 0, &led[2]);
-            break;
-        case _MACRO:
-            setrgb(0, 0, 0, &led[0]);
-            setrgb(0, 0, 0, &led[1]);
-            setrgb(RGB_WHITE, &led[2]); //Set the bottom LED to white for the top layer
-            break;
-    }
-    rgblight_set();
-    return state;
-}
-
-#ifdef OLED_ENABLE
-
-static const char *ANIMATION_NAMES[] = {
-	"unknown",
-	"static",
-	"breathing I",
-	"breathing II",
-	"breathing III",
-	"breathing IV",
-	"rainbow mood I",
-	"rainbow mood II",
-	"rainbow mood III",
-	"rainbow swirl I",
-	"rainbow swirl II",
-	"rainbow swirl III",
-	"rainbow swirl IV",
-	"rainbow swirl V",
-	"rainbow swirl VI",
-	"snake I",
-	"snake II",
-	"snake III",
-	"snake IV",
-	"snake V",
-	"snake VI",
-	"knight I",
-	"knight II",
-	"knight III",
-	"christmas",
-	"static gradient I",
-	"static gradient II",
-	"static gradient III",
-	"static gradient IV",
-	"static gradient V",
-	"static gradient VI",
-	"static gradient VII",
-	"static gradient VIII",
-	"static gradient IX",
-	"static gradient X",
-	"rgb test",
-	"alternating",
-	"twinkle I",
-	"twinkle II",
-	"twinkle III",
-	"twinkle IV",
-	"twinkle V",
-	"twinkle VI"
-};
-
-void rgblight_get_mode_name(uint8_t mode, size_t bufsize, char *buf) {
-    snprintf(buf, bufsize, "%-25s", ANIMATION_NAMES[mode]);
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-#ifdef LEFT_HAND
-    return OLED_ROTATION_180;
-#else
-    return OLED_ROTATION_0;
-#endif
-}
-
-bool oled_task_user(void) {
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case _NUMPAD:
-            oled_write_P(PSTR("Numpad\n"), false);
-            break;
-        case _RGB:
-            oled_write_P(PSTR("RGB\n"), false);
-            break;
-        case _MACRO:
-            oled_write_P(PSTR("Macro\n"), false);
-            break;
-        default:
-            // Or use the write_ln shortcut over adding '\n' to the end of your string
-            oled_write_ln_P(PSTR("Undefined"), false);
-    }
-
-    static char rgb_mode_name[30];
-    rgblight_get_mode_name(rgblight_get_mode(), sizeof(rgb_mode_name), rgb_mode_name);
-
-    oled_write_P(PSTR("Mode: "), false);
-    oled_write_ln(rgb_mode_name, false);
-    return false;
-}
-#endif
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/readme.md b/keyboards/dmqdesign/spin/keymaps/gorbachev/readme.md
deleted file mode 100644
index 451dae7ef77..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/gorbachev/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Keymap for Spin
-
-* Encoder button push changes layers
-* First layer is a number pad
-* Second layer is RGB control layer
-* Third layer is macro layer
-* OLED support
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk b/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
deleted file mode 100644
index cd11afc8d49..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-OLED_ENABLE = yes
-MOUSEKEY_ENABLE    = no
-MIDI_ENABLE        = no
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
deleted file mode 100644
index 5aabd5e3ff1..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019-2020 DMQ Design
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_HUE_STEP 8
-
-// place overrides here
-
-#define NO_ACTION_ONESHOT
-#undef LOCKING_SUPPORT_ENABLE
-
-#define LAYER_STATE_8BIT
-#define MAX_LAYER 5
-
-#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_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYER_BLINK
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
deleted file mode 100644
index 4acb0ee59be..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/keymap.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/* Copyright 2020 Joshua Moses Diamond
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#include "version.h"
-#include <stdlib.h>
-
-#define RGB_LAYER_ACK_DURATION 500
-
-enum layers { _MACRO, _NUMPAD, _CURSOR, _RGB, _FN };
-
-enum layer_base {
-    LAYER_BASE     = _MACRO,
-    LAYER_BASE_END = _FN + 1,
-};
-
-enum custom_keycodes {
-    HELLO = SAFE_RANGE,
-    CH_SUSP,  // Suspend
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MACRO] = LAYOUT(
-        A(S(KC_N)),    HELLO,         CH_SUSP,       TO(_MACRO),
-        KC_MPRV,       KC_MPLY,       KC_MNXT,       TO(_NUMPAD),
-        C(A(KC_COMM)), KC_F5,         C(A(KC_DOT)),  TO(_RGB),
-        MO(_FN),       KC_ASST,       KC_CPNL),
-
-    [_NUMPAD] = LAYOUT(
-        KC_KP_7,   KC_KP_8,   KC_KP_9,   KC_TRNS,
-        KC_KP_4,   KC_KP_5,   KC_KP_6,   TO(_CURSOR),
-        KC_KP_1,   KC_KP_2,   KC_KP_3,   KC_TRNS,
-        KC_KP_0,   KC_PDOT,   KC_PENT),
-
-    [_CURSOR] = LAYOUT(
-        KC_HOME,   KC_UP,     KC_PGUP,   KC_TRNS,
-        KC_LEFT,   KC_NO,     KC_RIGHT,  TO(_NUMPAD),
-        KC_END,    KC_DOWN,   KC_PGDN,   KC_TRNS,
-        KC_INS,    KC_DEL,    KC_PENT),
-
-    [_RGB] = LAYOUT(
-        RGB_HUI,   RGB_SAI,   RGB_VAI,   KC_TRNS,
-        RGB_HUD,   RGB_SAD,   RGB_VAD,   TO(_NUMPAD),
-        RGB_SPD,   RGB_SPI,   KC_NO,     KC_TRNS,
-        RGB_RMOD,  RGB_TOG,   RGB_MOD),
-
-    [_FN] = LAYOUT(
-        KC_NO,     DB_TOGG,   QK_BOOT,   KC_TRNS,
-        KC_NO,     KC_NO,     EE_CLR,    KC_TRNS,
-        KC_NO,     KC_NO,     KC_NO,     KC_TRNS,
-        KC_TRNS,   KC_NO,     KC_NO),
-};
-
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_MACRO]  = { ENCODER_CCW_CW(KC_BRID,       KC_BRIU),      ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL)), ENCODER_CCW_CW(KC_VOLD,    KC_VOLU) },
-    [_NUMPAD] = { ENCODER_CCW_CW(KC_BRID,       KC_BRIU),      ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL)), ENCODER_CCW_CW(KC_VOLD,    KC_VOLU) },
-    [_CURSOR] = { ENCODER_CCW_CW(KC_BRID,       KC_BRIU),      ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL)), ENCODER_CCW_CW(KC_VOLD,    KC_VOLU) },
-    [_RGB]    = { ENCODER_CCW_CW(RGB_HUD,       RGB_HUI     ), ENCODER_CCW_CW(RGB_SAD,    RGB_SAI  ), ENCODER_CCW_CW(RGB_VAD,    RGB_VAI) },
-    [_FN]     = { ENCODER_CCW_CW(KC_BRID,       KC_BRIU),      ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL)), ENCODER_CCW_CW(KC_VOLD,    KC_VOLU) },
-};
-
-// clang-format on
-
-typedef enum layer_ack {
-    ACK_NO = 0,
-    ACK_YES,
-    ACK_MEH,
-} layer_ack_t;
-
-#define LAYER_OFFSET 0
-const rgblight_segment_t PROGMEM _macro_layer[]  = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_TEAL});
-const rgblight_segment_t PROGMEM _numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_TEAL});
-const rgblight_segment_t PROGMEM _cursor_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_BLUE});
-const rgblight_segment_t PROGMEM _rgb_layer[]    = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_TEAL});
-const rgblight_segment_t PROGMEM _fn_layer[]     = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_PURPLE});
-
-#define ACK_OFFSET 4
-const rgblight_segment_t PROGMEM _no_layer[]  = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_RED});
-const rgblight_segment_t PROGMEM _yes_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_GREEN});
-const rgblight_segment_t PROGMEM _meh_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_YELLOW});
-
-// clang-format on
-const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
-    [LAYER_OFFSET + 0] = _macro_layer,
-    [LAYER_OFFSET + 1] = _numpad_layer,
-    [LAYER_OFFSET + 2] = _cursor_layer,
-    [LAYER_OFFSET + 3] = _rgb_layer,
-    [LAYER_OFFSET + 4] = _fn_layer,
-
-    [ACK_OFFSET + ACK_NO] = _no_layer,
-    [ACK_OFFSET + ACK_YES] = _yes_layer,
-    [ACK_OFFSET + ACK_MEH] = _meh_layer,
-
-    [ACK_OFFSET + ACK_MEH + 1] = NULL
-};
-// clang-format off
-
-const uint8_t PROGMEM _n_rgb_layers = ARRAY_SIZE(_rgb_layers) - 1;
-
-void clear_rgb_layers(void) {
-    dprint("clear_rgb_layers()\n");
-    for (uint8_t i = 0; i < _n_rgb_layers; i++) {
-        rgblight_set_layer_state(i, false);
-    }
-}
-
-void do_rgb_layers(layer_state_t state, uint8_t start, uint8_t end) {
-    dprintf("start=%u, end=%u, LAYER_OFFSET=%u\n", start, end, LAYER_OFFSET);
-    for (uint8_t i = start; i < end; i++) {
-        bool    is_on = layer_state_cmp(state, i);
-        uint8_t rl    = LAYER_OFFSET + i;
-        dprintf("layer[%u]=%u, rl=%u\n", i, is_on, rl);
-        rgblight_set_layer_state(rl, is_on);
-    }
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    do_rgb_layers(state, LAYER_BASE, LAYER_BASE_END);
-    return state;
-}
-
-void rgb_layer_ack(layer_ack_t n) {
-    uint8_t layer = ACK_OFFSET + n;
-    dprintf("rgb_layer_ack(%u) ==> %u\n", n, layer);
-    rgblight_blink_layer(layer, RGB_LAYER_ACK_DURATION);
-}
-
-void rgb_layer_ack_yn(bool yn) { rgb_layer_ack(yn ? ACK_YES : ACK_NO); }
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = _rgb_layers;
-    do_rgb_layers(layer_state, LAYER_BASE, LAYER_BASE_END);
-}
-
-bool shutdown_user(bool jump_to_bootloader) {
-    clear_rgb_layers();
-    rgblight_enable();
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_sethsv_noeeprom(HSV_RED);
-    return false;
-}
-
-void spidey_glow(void) {
-    rgblight_enable();
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_MOOD);
-    rgblight_sethsv(255, 230, 128);
-}
-
-void eeconfig_init_user(void) {
-    spidey_glow();
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    dprintf("key event: kc: %02X, col: %02u, row: %02u, pressed: %u mods: %08b "
-#if !defined(NO_ACTION_ONESHOT)
-            "os: %08b "
-#endif
-            "weak: %08b\n",
-            keycode, record->event.key.col, record->event.key.row, record->event.pressed, bitrev(get_mods()),
-#if !defined(NO_ACTION_ONESHOT)
-            bitrev(get_oneshot_mods()),
-#endif
-            bitrev(get_weak_mods()));
-
-    if (record->event.pressed) {
-        switch (keycode) {
-            // Re-implement this here, but fix the persistence!
-            case QK_DEBUG_TOGGLE:
-                if (!debug_enable) {
-                    debug_enable = 1;
-                } else if (!debug_keyboard) {
-                    debug_keyboard = 1;
-                } else if (!debug_matrix) {
-                    debug_matrix = 1;
-                } else {
-                    debug_enable   = 0;
-                    debug_keyboard = 0;
-                    debug_matrix   = 0;
-                }
-                uprintf("DEBUG: enable=%u, keyboard=%u, matrix=%u\n", debug_enable, debug_keyboard, debug_matrix);
-                uprintln(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE);
-                eeconfig_update_debug(debug_config.raw);
-                return false;
-
-                // clang-format off
-            case CH_SUSP: tap_code16(LGUI(LSFT(KC_L))); return true;
-            case HELLO:   SEND_STRING("Hello, world!"); return true;
-                // clang-format on
-        }
-    }
-
-    return true;
-};
-
-
-void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // Acks follow...
-        case QK_DEBUG_TOGGLE:
-            rgb_layer_ack_yn(debug_enable);
-            break;
-        case RGB_TOG:
-            rgb_layer_ack_yn(rgblight_is_enabled());
-            break;
-    }
-}
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/readme.md b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/readme.md
deleted file mode 100644
index 1abca274896..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-spidey3 keymap for spin keypad
diff --git a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/rules.mk b/keyboards/dmqdesign/spin/keymaps/spidey3_pad/rules.mk
deleted file mode 100644
index 5d543e2c7ec..00000000000
--- a/keyboards/dmqdesign/spin/keymaps/spidey3_pad/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MOUSEKEY_ENABLE    = no
-MIDI_ENABLE        = no
-BOOTMAGIC_ENABLE   = yes
-LTO_ENABLE         = yes
-CONSOLE_ENABLE     = yes
-GRAVE_ESC_ENABLE   = no
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/dnworks/numpad/config.h b/keyboards/dnworks/numpad/config.h
new file mode 100644
index 00000000000..77970ce4d34
--- /dev/null
+++ b/keyboards/dnworks/numpad/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+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 RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
diff --git a/keyboards/dnworks/numpad/info.json b/keyboards/dnworks/numpad/info.json
new file mode 100644
index 00000000000..26fbcbf146e
--- /dev/null
+++ b/keyboards/dnworks/numpad/info.json
@@ -0,0 +1,73 @@
+{
+    "manufacturer": "dnworks",
+    "keyboard_name": "DN Numpad Rev1",
+    "maintainer": "itsme-zeix",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP5", "GP6", "GP7", "GP25"],
+        "rows": ["GP11", "GP4", "GP3", "GP2", "GP1", "GP0", "GP24"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x2937",
+        "vid": "0x4C23"
+    },
+    "community_layouts": ["numpad_6x4", "ortho_6x4"],
+    "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [6, 3], "x": 3, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
+            ]
+        },
+        "LAYOUT_ortho_6x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [6, 3], "x": 3, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/dnworks/numpad/keymaps/default/keymap.c b/keyboards/dnworks/numpad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ad8c5887044
--- /dev/null
+++ b/keyboards/dnworks/numpad/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+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(
+        KC_ESC,  KC_APP,  KC_TAB,  KC_BSPC,
+    
+        KC_NUM,  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
+    ),
+};
diff --git a/keyboards/dnworks/numpad/keymaps/via/keymap.c b/keyboards/dnworks/numpad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ad8c5887044
--- /dev/null
+++ b/keyboards/dnworks/numpad/keymaps/via/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+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(
+        KC_ESC,  KC_APP,  KC_TAB,  KC_BSPC,
+    
+        KC_NUM,  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
+    ),
+};
diff --git a/keyboards/laser_ninja/pumpkin_pad/keymaps/via/rules.mk b/keyboards/dnworks/numpad/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/laser_ninja/pumpkin_pad/keymaps/via/rules.mk
rename to keyboards/dnworks/numpad/keymaps/via/rules.mk
diff --git a/keyboards/dnworks/numpad/matrix_diagram.md b/keyboards/dnworks/numpad/matrix_diagram.md
new file mode 100644
index 00000000000..9bd195650db
--- /dev/null
+++ b/keyboards/dnworks/numpad/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for dnworks numpad rev1
+
+```
+Top Left 2u
+┌───────┐┌───────┐
+│00     ││02     │ Top Right 2u
+└───────┘└───────┘
+┌───┬───┬───┬───┐
+│00 │01 │02 │03 │
+└───┴───┴───┴───┘
+┌───┬───┬───┬───┐
+│10 │11 │12 │63 │
+├───┼───┼───┼───┤ ┌───┐
+│20 │21 │22 │   │ │23 │
+├───┼───┼───┤33 │ ├───┤ Split Plus
+│30 │31 │32 │   │ │33 │
+├───┼───┼───┼───┤ └───┘ ┌───┐
+│40 │41 │42 │   │       │43 │
+├───┴───┼───┤53 │       ├───┤ Split Enter
+│50     │52 │   │       │53 │
+└───────┴───┴───┘       └───┘
+┌───┬───┐
+│50 │51 │ Split Zero
+└───┴───┘
+```
diff --git a/keyboards/dnworks/numpad/readme.md b/keyboards/dnworks/numpad/readme.md
new file mode 100644
index 00000000000..080ced6f77d
--- /dev/null
+++ b/keyboards/dnworks/numpad/readme.md
@@ -0,0 +1,27 @@
+# DN Numpad Rev1
+
+![DN Numpad Rev1](https://i.imgur.com/OpklWTih.png)
+
+PCB that supports the numpad designed by dnworks.
+
+* Keyboard Maintainer: [Zeix](https://github.com/itsme-zeix)
+* Hardware Supported: DN Numpad Rev1
+* Hardware Availability: dnworks.co
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dnworks/numpad:default
+
+Flashing example for this keyboard:
+
+    make dnworks/numpad: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 top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the `RESET` button twice or short the `USB_BOOT` and `GND` pads and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/dnworks/numpad/rules.mk b/keyboards/dnworks/numpad/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/dnworks/numpad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/do60/keymaps/crd/keymap.c b/keyboards/do60/keymaps/crd/keymap.c
deleted file mode 100644
index d1108ea2cf7..00000000000
--- a/keyboards/do60/keymaps/crd/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-  _BL = 0, // Base Layer
-  _FL,     // Function Layer
-  _CL      // Control Layer
-};
-
-// Custom #defined keycodes (shorter macros for readability)
-#define KC_CTES CTL_T(KC_ESC)
-#define KC_RSUP RSFT_T(KC_UP)
-#define KC_RGLT RCMD_T(KC_LEFT)
-#define KC_RADN RALT_T(KC_DOWN)
-#define KC_RCRT RCTL_T(KC_RIGHT)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_BL] = LAYOUT_60_ansi_split_bs_rshift(
-		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,  XXXXXXX,  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_CTES, 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_RSUP, MO(_FL),
-		KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             XXXXXXX, KC_RGLT, KC_RADN, KC_RCRT
-	),
-	[_FL] = LAYOUT_60_ansi_split_bs_rshift(
-		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_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
-		_______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
-		_______, _______, _______,                            _______,                            _______, _______, _______, _______
-	),
-};
-
diff --git a/keyboards/doio/kb04/info.json b/keyboards/doio/kb04/info.json
index 8174a4bb62f..2455f82e03c 100644
--- a/keyboards/doio/kb04/info.json
+++ b/keyboards/doio/kb04/info.json
@@ -1,21 +1,110 @@
 {
-    "keyboard_name": "KB04-01",
     "manufacturer": "DOIO",
-    "url": "https://www.keebmonkey.com/products/megalodon-macro-pad-with-a-knob",
+    "keyboard_name": "KB04-01",
     "maintainer": "filmstarr",
+    "bootloader": "stm32duino",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B6"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B0", "A7"],
+        "rows": ["B3"]
+    },
+    "processor": "STM32F103",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 75, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 149, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 224, "y": 0, "flags": 1},
+            
+            {"x": 112, "y": 64, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1}
+        ],
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "url": "https://www.keebmonkey.com/products/megalodon-macro-pad-with-a-knob",
     "usb": {
-        "vid": "0xD010",
+        "device_version": "0.0.1",
         "pid": "0x0401",
-        "device_version": "0.0.1"
+        "vid": "0xD010"
+    },
+    "ws2812": {
+        "pin": "A10"
     },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "1!", "x": 0, "y": 0 },
-                { "label": "2@", "x": 1, "y": 0 },
-                { "label": "3#", "x": 2, "y": 0 },
-                { "label": "4$", "x": 3, "y": 0 },
-                { "label": "Encoder", "x": 4.75, "y": 0 }
+                {"label": "1!", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "2@", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "3#", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "4$", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "Encoder", "matrix": [0, 4], "x": 1.5, "y": 1}
             ]
         }
     }
diff --git a/keyboards/doio/kb04/keymaps/default/keymap.c b/keyboards/doio/kb04/keymaps/default/keymap.c
index e4a9adc6504..7df80397fd3 100644
--- a/keyboards/doio/kb04/keymaps/default/keymap.c
+++ b/keyboards/doio/kb04/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_LAY0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
 };
diff --git a/keyboards/doio/kb04/keymaps/default/rules.mk b/keyboards/doio/kb04/keymaps/default/rules.mk
index 61312f8527a..a40474b4d5c 100644
--- a/keyboards/doio/kb04/keymaps/default/rules.mk
+++ b/keyboards/doio/kb04/keymaps/default/rules.mk
@@ -1,2 +1 @@
-# Encoder enabled
 ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/doio/kb04/keymaps/via/keymap.c b/keyboards/doio/kb04/keymaps/via/keymap.c
index 917fd287e69..7df80397fd3 100644
--- a/keyboards/doio/kb04/keymaps/via/keymap.c
+++ b/keyboards/doio/kb04/keymaps/via/keymap.c
@@ -18,9 +18,7 @@
 
 enum layer_names {
     _LAY0,
-    _LAY1,
-    _LAY2,
-    _LAY3
+    _LAY1
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -39,20 +37,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_LAY1] = LAYOUT(
         KC_TRNS,     RGB_HUD,    RGB_TOG,    RGB_MOD,     KC_TRNS
-    ),
-    [_LAY2] = LAYOUT(
-        KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS
-    ),
-    [_LAY3] = LAYOUT(
-        KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS
-    ),
+    )
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_LAY0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_LAY2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_LAY3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
 };
 #endif
diff --git a/keyboards/doio/kb04/keymaps/via/rules.mk b/keyboards/doio/kb04/keymaps/via/rules.mk
index c759bb600ba..4253f570f0b 100644
--- a/keyboards/doio/kb04/keymaps/via/rules.mk
+++ b/keyboards/doio/kb04/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
-
-# Encoder enabled
 ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/doio/kb04/readme.md b/keyboards/doio/kb04/readme.md
index 50031f9157d..8277164bf38 100644
--- a/keyboards/doio/kb04/readme.md
+++ b/keyboards/doio/kb04/readme.md
@@ -1,22 +1,20 @@
 # doio/kb04
 
-![doio/kb04](https://cdn.shopify.com/s/files/1/0463/5980/6101/products/4_f40396cc-ea72-47a5-887f-bbeeb4023b11_1100x.png?v=1654787686)
+![doio/kb04](https://i.imgur.com/lqABZw4h.png)
 
 A macropad that have 4-key keyboard made by DOIO, which controlled by an APM32F103CBT6 chipset. The keyboard features per-key RGB and 1 encoder.
 
-There are four keymaps: default, via, vial, and vial-inverted. vial-inverted is intended for use when the keyboard is plugged in upside down (with the encoder at the top).
-
 * Keyboard Maintainer: [filmstarr](https://github.com/filmstarr)
 * Hardware Supported: DOIO Knob Board - KB04
 * Hardware Availability: [keebmonkey.com](https://www.keebmonkey.com/products/megalodon-macro-pad-with-a-knob)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make doio/kb04:default
+    qmk compile -kb doio/kb04 -km default
 
 Flashing example for this keyboard:
 
-    make doio/kb04:default:flash
+    qmk flash -kb doio/kb04 -km 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/doio/kb04/rules.mk b/keyboards/doio/kb04/rules.mk
index ab192232629..7ff128fa692 100644
--- a/keyboards/doio/kb04/rules.mk
+++ b/keyboards/doio/kb04/rules.mk
@@ -1,35 +1 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
-# 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
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = ws2812
-
-# Encoder enabled
-ENCODER_ENABLE = yes
-
-# Wear-levelling driver
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = embedded_flash
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/doio/kb12/config.h b/keyboards/doio/kb12/config.h
deleted file mode 100644
index d853409b858..00000000000
--- a/keyboards/doio/kb12/config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
- *
- * 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
-
-/* RGB Matrix config */
-#define RGB_MATRIX_LED_COUNT 12
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-/* RGB Matrix effect */
-#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_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#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
diff --git a/keyboards/doio/kb12/info.json b/keyboards/doio/kb12/info.json
index fc75fd8c0d9..c87d5f9544e 100644
--- a/keyboards/doio/kb12/info.json
+++ b/keyboards/doio/kb12/info.json
@@ -9,7 +9,54 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_up_down"
+        },
+        "driver": "ws2812",
         "layout": [
             {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
             {"matrix": [0, 1], "x": 75, "y": 0, "flags": 4},
@@ -24,7 +71,8 @@
             {"matrix": [2, 2], "x": 150, "y": 64, "flags": 4},
             {"matrix": [2, 3], "x": 224, "y": 64, "flags": 4}
         ],
-        "max_brightness": 200
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B14", "B13", "B12", "B0", "A7"],
diff --git a/keyboards/doio/kb16/config.h b/keyboards/doio/kb16/config.h
index 911ba9d3d59..24766ac76f1 100644
--- a/keyboards/doio/kb16/config.h
+++ b/keyboards/doio/kb16/config.h
@@ -17,72 +17,5 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 7
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D5, D4, D3, D2 }
-#define MATRIX_COL_PINS { F5, F4, F1, F0, B7, B4, B5 }
-
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
-/* 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
-
 /* Use the custom font */
-#define OLED_FONT_H "lib/glcdfont.c"
-
-/* Encoder pins */
-#define ENCODERS_PAD_A { F7, C7, D7 }
-#define ENCODERS_PAD_B { E6, C6, D6 }
-
-#ifdef RGB_MATRIX_ENABLE
-    /* RGB Matrix config */
-    #define RGB_DI_PIN F6
-    #define DRIVER_LED_TOTAL 16
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
-    #define RGB_MATRIX_KEYPRESSES
-
-    /* RGB Matrix effect */
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #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_CYCLE_ALL
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-    #define ENABLE_RGB_MATRIX_DUAL_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
-
-    #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
+#define OLED_FONT_H "./lib/glcdfont.c"
diff --git a/keyboards/doio/kb16/info.json b/keyboards/doio/kb16/info.json
index 7cd02bce7b3..cadfabdf861 100644
--- a/keyboards/doio/kb16/info.json
+++ b/keyboards/doio/kb16/info.json
@@ -1,47 +1,108 @@
 {
     "keyboard_name": "KB16-01",
     "manufacturer": "DOIO",
-    "url": "",
     "maintainer": "HorrorTroll",
     "usb": {
         "vid": "0xD010",
         "pid": "0x1601",
-        "device_version": "0.0.1"
+        "force_nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "oled": true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "default": {
+            "animation": "cycle_up_down"
+        },
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 75, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 149, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
+            {"matrix": [1, 1], "x": 75, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 149, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 224, "y": 21, "flags": 1},
+            {"matrix": [2, 0], "x": 0, "y": 43, "flags": 1},
+            {"matrix": [2, 1], "x": 75, "y": 43, "flags": 4},
+            {"matrix": [2, 2], "x": 149, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 224, "y": 43, "flags": 1},
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 75, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 149, "y": 64, "flags": 1},
+            {"matrix": [3, 3], "x": 224, "y": 64, "flags": 1}
+        ],
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "cycle_all": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "dual_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "multisplash": true,
+            "solid_multisplash": true
+        }
     },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1!", "x":0, "y":0},
-                {"label":"2@", "x":1, "y":0},
-                {"label":"3#", "x":2, "y":0},
-                {"label":"4$", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"Encoder 1 CCW", "x":4.25, "y":0, "w":0.5},
-                {"label":"Encoder 1", "x":4.75, "y":0},
-                {"label":"Encoder 1 CW", "x":5.75, "y":0, "w":0.5},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
 
-                {"label":"5%", "x":0, "y":1},
-                {"label":"6^", "x":1, "y":1},
-                {"label":"7&", "x":2, "y":1},
-                {"label":"8*", "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"Encoder 2 CCW", "x":6.25, "y":0, "w":0.5},
-                {"label":"Encoder 2", "x":6.75, "y":0},
-                {"label":"Encoder 2 CW", "x":7.75, "y":0, "w":0.5},
+                {"matrix": [1, 4], "x": 6, "y": 0},
 
-                {"label":"9(", "x":0, "y":2},
-                {"label":"0)", "x":1, "y":2},
-                {"label":"\u2191", "x":2, "y":2},
-                {"label":"Enter", "x":3, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
 
-                {"label":"Encoder 3 CCW", "x":5.25, "y":2.5, "w":0.5},
-                {"label":"Encoder 3", "x":5.75, "y":2.5},
-                {"label":"Encoder 3 CW", "x":6.75, "y":2.5, "w":0.5},
+                {"matrix": [2, 4], "x": 5.375, "y": 2.5},
 
-                {"label":"Fn", "x":0, "y":3},
-                {"label":"\u2190", "x":1, "y":3},
-                {"label":"\u2193", "x":2, "y":3},
-                {"label":"\u2192", "x":3, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
             ]
         }
     }
diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c
index 05f5792ea7e..bfb491c4c2d 100644
--- a/keyboards/doio/kb16/kb16.c
+++ b/keyboards/doio/kb16/kb16.c
@@ -26,7 +26,7 @@
 #endif
 
 #ifdef OLED_ENABLE
-    uint16_t startup_timer; 
+    uint16_t startup_timer;
 
     oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
         startup_timer = timer_read();
@@ -48,22 +48,3 @@
         return true;
     }
 #endif
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    {  0,      1,      2,      3, NO_LED },
-    {  4,      5,      6,      7, NO_LED },
-    {  8,      9,     10,     11, NO_LED },
-    { 12,     13,     14,     15, NO_LED }
-}, {
-    {0  ,  0}, {75 ,  0}, {149,  0}, {224,  0},
-    {0  , 21}, {75 , 21}, {149, 21}, {224, 21},
-    {0  , 43}, {75 , 43}, {149, 43}, {224, 43},
-    {0  , 64}, {75 , 64}, {149, 64}, {224, 64},
-}, {
-    1, 1, 1, 1,
-    1, 4, 4, 1,
-    1, 4, 4, 1,
-    1, 1, 1, 1,
-} };
-#endif
diff --git a/keyboards/doio/kb16/keymaps/default/keymap.c b/keyboards/doio/kb16/keymaps/default/keymap.c
index df72bbe15a9..fc1f1dcfaaa 100644
--- a/keyboards/doio/kb16/keymaps/default/keymap.c
+++ b/keyboards/doio/kb16/keymaps/default/keymap.c
@@ -56,11 +56,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0         1        2        3         4        5        6      */
+    /*  Row:    0         1        2        3         4      */
     [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     _______, KC_MPLY, _______,
-                KC_5,     KC_6,    KC_7,    KC_8,     _______, TO(_FN), _______,
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   _______, KC_MUTE, _______,
+                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
+                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
+                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
                 MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
             ),
 
@@ -75,11 +75,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN1), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN1),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -94,11 +94,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN2), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN2),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -113,11 +113,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │Vai│Hud│Vad│      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5          6      */
+    /*  Row:    0        1        2        3        4        */
     [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______, _______,   _______,
-                RGB_SAI, RGB_SAD, _______, _______, _______, TO(_BASE), _______,
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______, _______,   _______,
+                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
+                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
+                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
                 _______, RGB_VAI, RGB_HUD, RGB_VAD
             ),
 };
@@ -131,10 +131,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #endif
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FN] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
 };
 #endif
diff --git a/keyboards/doio/kb16/keymaps/via/keymap.c b/keyboards/doio/kb16/keymaps/via/keymap.c
index 4f01846eae4..fc1f1dcfaaa 100644
--- a/keyboards/doio/kb16/keymaps/via/keymap.c
+++ b/keyboards/doio/kb16/keymaps/via/keymap.c
@@ -56,11 +56,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0         1        2        3         4        5        6      */
+    /*  Row:    0         1        2        3         4      */
     [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPRV, KC_MPLY, KC_MNXT,
-                KC_5,     KC_6,    KC_7,    KC_8,     KC_PGDN, TO(_FN), KC_PGUP,
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_VOLD, KC_MUTE, KC_VOLU,
+                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
+                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
+                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
                 MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
             ),
 
@@ -75,11 +75,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN1), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN1),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -94,11 +94,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │   │   │   │      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5         6      */
+    /*  Row:    0        1        2        3        4       */
     [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, TO(_FN2), _______,
-                _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, TO(_FN2),
+                _______, _______, _______, _______, _______,
                 _______, _______, _______, _______
             ),
 
@@ -113,11 +113,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │   │Vai│Hud│Vad│      └───┘
        └───┴───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5          6      */
+    /*  Row:    0        1        2        3        4        */
     [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______, _______,   _______,
-                RGB_SAI, RGB_SAD, _______, _______, _______, TO(_BASE), _______,
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______, _______,   _______,
+                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
+                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
+                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
                 _______, RGB_VAI, RGB_HUD, RGB_VAD
             ),
 };
@@ -130,43 +130,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     }
 #endif
 
-#ifdef ENCODER_ENABLE
-
-#define ENCODERS 3
-static uint8_t  encoder_state[ENCODERS] = {0};
-static keypos_t encoder_cw[ENCODERS]    = {{ 5, 0 }, { 5, 1 }, { 5, 2 }};
-static keypos_t encoder_ccw[ENCODERS]   = {{ 6, 0 }, { 6, 1 }, { 6, 2 }};
-
-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;
-}
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
 #endif
diff --git a/keyboards/doio/kb16/keymaps/via/rules.mk b/keyboards/doio/kb16/keymaps/via/rules.mk
index 1e5b99807cb..d76c12896fc 100644
--- a/keyboards/doio/kb16/keymaps/via/rules.mk
+++ b/keyboards/doio/kb16/keymaps/via/rules.mk
@@ -1 +1,4 @@
 VIA_ENABLE = yes
+
+# Encoder enabled
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
deleted file mode 100644
index 6d635d7557d..00000000000
--- a/keyboards/doio/kb16/rev1/config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2022 DOIO
- * 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
-
-/* Use the custom font */
-#define OLED_FONT_H "./lib/glcdfont.c"
-
-#ifdef RGB_MATRIX_ENABLE
-    /* RGB Matrix config */
-    #define RGB_MATRIX_LED_COUNT 16
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
-    #define RGB_MATRIX_KEYPRESSES
-
-    /* RGB Matrix effect */
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #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_CYCLE_ALL
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-    #define ENABLE_RGB_MATRIX_DUAL_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
-
-    #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/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index bcf2c2eb0ee..fc9b30a20a0 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -1,22 +1,16 @@
 {
-    "keyboard_name": "KB16-01",
-    "manufacturer": "DOIO",
-    "url": "",
-    "maintainer": "HorrorTroll",
     "usb": {
-        "vid": "0xD010",
-        "pid": "0x1601",
-        "device_version": "0.0.1",
-        "force_nkro": true
+        "device_version": "0.0.1"
     },
-    "rgb_matrix": {
-        "driver": "ws2812"
+    "features": {
+        "grave_esc": false,
+        "space_cadet": false,
+        "magic": false
     },
     "matrix_pins": {
         "cols": ["F5", "F4", "F1", "F0", "B7"],
         "rows": ["D5", "D4", "D3", "D2"]
     },
-    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F7", "pin_b": "E6"},
@@ -28,36 +22,5 @@
         "pin": "F6"
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-
-                {"matrix": [0, 4], "x": 4.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-
-                {"matrix": [1, 4], "x": 6, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-
-                {"matrix": [2, 4], "x": 5.375, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3}
-            ]
-        }
-    }
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/doio/kb16/rev1/keymaps/bongocat/config.h b/keyboards/doio/kb16/rev1/keymaps/bongocat/config.h
deleted file mode 100644
index bb22eebb1be..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/bongocat/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 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
-
-/* Additional thing to reduce compiled size */
-#define NO_ACTION_ONESHOT
-#define LAYER_STATE_8BIT
-
-#ifdef RGB_MATRIX_ENABLE
-    /* RGB Matrix config */
-    #undef RGB_MATRIX_KEYPRESSES
-
-    /* RGB Matrix effect */
-    #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-    #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #undef ENABLE_RGB_MATRIX_BREATHING
-    #undef ENABLE_RGB_MATRIX_BAND_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_VAL
-    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-    #undef ENABLE_RGB_MATRIX_DUAL_BEACON
-    #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-    #undef ENABLE_RGB_MATRIX_RAINDROPS
-    #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-    #undef ENABLE_RGB_MATRIX_HUE_PENDULUM
-    #undef ENABLE_RGB_MATRIX_HUE_WAVE
-    #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-    #undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-    #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#endif
diff --git a/keyboards/doio/kb16/rev1/keymaps/bongocat/keymap.c b/keyboards/doio/kb16/rev1/keymaps/bongocat/keymap.c
deleted file mode 100644
index ae24fc2755d..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/bongocat/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* 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
-
-// OLED animation
-#include "./lib/bongocat/bongocat.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,
-    _FN1,
-    _FN2
-};
-
-// enum layer_keycodes { };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ 1 │ 2 │ 3 │ 4 │   │Ply│ │TO1│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ 5 │ 6 │ 7 │ 8 │
-       ├───┼───┼───┼───┤
-       │ 9 │ 0 │ ↑ │Ent│      ┌───┐
-       ├───┼───┼───┼───┤      │Mut│
-       │Fn2│ ← │ ↓ │ → │      └───┘
-       └───┴───┴───┴───┘
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ ! │ @ │ # │ $ │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ % │ ^ │ & │ * │
-       ├───┼───┼───┼───┤
-       │ ( │ ) │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0         1        2        3         4      */
-    [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
-                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
-                MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN1),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN2),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │Spi│Spd│   │   │   │   │ │TO0│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │Sai│Sad│   │   │
-       ├───┼───┼───┼───┤
-       │Tog│Mod│Hui│   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │Vai│Hud│Vad│      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        */
-    [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
-                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
-                _______, RGB_VAI, RGB_HUD, RGB_VAD
-            ),
-};
-
-#ifdef OLED_ENABLE
-    bool oled_task_user(void) {
-        led_t led_usb_state = host_keyboard_led_state();
-
-        render_bongocat();
-        oled_set_cursor(14, 0);                                // sets cursor to (column, row) using charactar spacing (4 rows on 128x32 screen, anything more will overflow back to the top)
-        oled_write_P(PSTR("WPM:"), false);
-        oled_write(get_u8_str(get_current_wpm(), '0'), false); // writes wpm on top right corner of string
-        oled_set_cursor(17, 2);
-        oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-        oled_set_cursor(17, 3);
-        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
-
-        return true;
-    }
-#endif
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-};
-#endif
diff --git a/keyboards/doio/kb16/rev1/keymaps/bongocat/rules.mk b/keyboards/doio/kb16/rev1/keymaps/bongocat/rules.mk
deleted file mode 100644
index 78d071eab34..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/bongocat/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-SRC += ./lib/bongocat/bongocat.c
-
-# Build Options
-#   change yes to no to disable
-#
-MOUSEKEY_ENABLE = no       # Mouse keys
-
-VIA_ENABLE = yes
-
-# Additional thing to reduce compiled size
-GRAVE_ESC_ENABLE = no 
-
-# OLED enabled
-WPM_ENABLE = yes
-
-# Encoder enabled
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev1/keymaps/default/keymap.c b/keyboards/doio/kb16/rev1/keymaps/default/keymap.c
deleted file mode 100644
index 1217a3c788a..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/default/keymap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright 2022 DOIO
- * 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
-
-// OLED animation
-#include "./lib/layer_status/layer_status.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,
-    _FN1,
-    _FN2
-};
-
-// enum layer_keycodes { };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ 1 │ 2 │ 3 │ 4 │   │Ply│ │TO1│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ 5 │ 6 │ 7 │ 8 │
-       ├───┼───┼───┼───┤
-       │ 9 │ 0 │ ↑ │Ent│      ┌───┐
-       ├───┼───┼───┼───┤      │Mut│
-       │Fn2│ ← │ ↓ │ → │      └───┘
-       └───┴───┴───┴───┘
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ ! │ @ │ # │ $ │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ % │ ^ │ & │ * │
-       ├───┼───┼───┼───┤
-       │ ( │ ) │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0         1        2        3         4      */
-    [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
-                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
-                MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN1),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN2),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │Spi│Spd│   │   │   │   │ │TO0│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │Sai│Sad│   │   │
-       ├───┼───┼───┼───┤
-       │Tog│Mod│Hui│   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │Vai│Hud│Vad│      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        */
-    [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
-                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
-                _______, RGB_VAI, RGB_HUD, RGB_VAD
-            ),
-};
-
-#ifdef OLED_ENABLE
-    bool oled_task_user(void) {
-        render_layer_status();
-
-        return true;
-    }
-#endif
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-};
-#endif
diff --git a/keyboards/doio/kb16/rev1/keymaps/default/rules.mk b/keyboards/doio/kb16/rev1/keymaps/default/rules.mk
deleted file mode 100644
index 00003ba11bd..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/default/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Encoder enabled
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev1/keymaps/pugmajere/keymap.c b/keyboards/doio/kb16/rev1/keymaps/pugmajere/keymap.c
deleted file mode 100644
index f9b34ece171..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/pugmajere/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- * Copyright 2022 Ryan Anderson <ryan@michonline.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
-
-// OLED animation
-#include "lib/layer_status/layer_status.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 = 0,
-    _FN,
-    _FN1,
-    _FN2,
-};
-
-// enum layer_keycodes { };
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /*
-           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-           │C-D│C-E│M-D│M-E│   │Ply│ │TO1│
-           ├───┼───┼───┼───┤   └───┘ └───┘
-           │ 5 │ 6 │ 7 │ 8 │
-           ├───┼───┼───┼───┤
-           │ 9 │ 0 │ ↑ │Ent│      ┌───┐
-           ├───┼───┼───┼───┤      │Mut│
-           │Fn2│ ← │ ↓ │ → │      └───┘
-           └───┴───┴───┴───┘
-           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-           │ ! │ @ │ # │ $ │   │   │ │   │
-           ├───┼───┼───┼───┤   └───┘ └───┘
-           │ % │ ^ │ & │ * │
-           ├───┼───┼───┼───┤
-           │ ( │ ) │   │   │      ┌───┐
-           ├───┼───┼───┼───┤      │   │
-           │   │   │   │   │      └───┘
-           └───┴───┴───┴───┘
-    */
-    /*  Row:    0         1        2        3         4        5        6      */
-    [_BASE] = LAYOUT(C(KC_D), C(KC_E), LCMD(KC_D), LCMD(KC_E), KC_MPLY,
-                     KC_5, KC_6, LCTL(LCMD(KC_H)), KC_8, TO(_FN),
-                     KC_9, KC_0, KC_UP, KC_ENT, KC_MUTE,
-                     MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT),
-
-    /*
-           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-           │   │   │   │   │   │   │ │   │
-           ├───┼───┼───┼───┤   └───┘ └───┘
-           │   │   │   │   │
-           ├───┼───┼───┼───┤
-           │   │   │   │   │      ┌───┐
-           ├───┼───┼───┼───┤      │   │
-           │   │   │   │   │      └───┘
-           └───┴───┴───┴───┘
-    */
-    /*  Row:    0        1        2        3        4        5         6      */
-    [_FN] = LAYOUT(_______, _______, _______, _______, _______,
-                   _______, _______, _______, _______, TO(_FN1),
-                   _______, _______, _______, _______, _______,
-                   _______, _______, _______, _______),
-
-    /*
-           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-           │   │   │   │   │   │   │ │   │
-           ├───┼───┼───┼───┤   └───┘ └───┘
-           │   │   │   │   │
-           ├───┼───┼───┼───┤
-           │   │   │   │   │      ┌───┐
-           ├───┼───┼───┼───┤      │   │
-           │   │   │   │   │      └───┘
-           └───┴───┴───┴───┘
-    */
-    /*  Row:    0        1        2        3        4        5         6      */
-    [_FN1] = LAYOUT(_______, _______, _______, _______, _______,
-                    _______, _______, _______, _______, TO(_FN2),
-                    _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______),
-
-    /*
-           ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-           │Spi│Spd│   │   │   │   │ │TO0│
-           ├───┼───┼───┼───┤   └───┘ └───┘
-           │Sai│Sad│   │   │
-           ├───┼───┼───┼───┤
-           │Tog│Mod│Hui│   │      ┌───┐
-           ├───┼───┼───┼───┤      │   │
-           │   │Vai│Hud│Vad│      └───┘
-           └───┴───┴───┴───┘
-    */
-    /*  Row:    0        1        2        3        4        5          6      */
-    [_FN2] = LAYOUT(RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
-                    RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
-                    RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
-                    _______, RGB_VAI, RGB_HUD, RGB_VAD),
-};
-// clang-format on
-
-#ifdef OLED_ENABLE
-bool oled_task_user(void) {
-    render_layer_status();
-
-    return true;
-}
-#endif
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [_FN]   = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [_FN2]  = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [_BASE] = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-};
-#endif
diff --git a/keyboards/doio/kb16/rev1/keymaps/pugmajere/readme.md b/keyboards/doio/kb16/rev1/keymaps/pugmajere/readme.md
deleted file mode 100644
index f88901c6239..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/pugmajere/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# pugmajere's Google Meet optimized version of the default keymap
-
-A lightly modified version of the default keymap.
-
-The top row is converted to keys used for muting audio and video in
-Google Meet, in both Linux and MacOS. (Yes, they annoyingly have
-different conventions.)
-
-The ASCII-art depiction uses "C-E" to mean "ctrl-e", and "M-E" to mean
-CMD(GUI) and "e", roughly following Emacs naming conventions.
diff --git a/keyboards/doio/kb16/rev1/keymaps/pugmajere/rules.mk b/keyboards/doio/kb16/rev1/keymaps/pugmajere/rules.mk
deleted file mode 100644
index 00003ba11bd..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/pugmajere/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Encoder enabled
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev1/keymaps/via/keymap.c b/keyboards/doio/kb16/rev1/keymaps/via/keymap.c
deleted file mode 100644
index fc1f1dcfaaa..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/via/keymap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright 2022 DOIO
- * 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
-
-// OLED animation
-#include "lib/layer_status/layer_status.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,
-    _FN1,
-    _FN2
-};
-
-// enum layer_keycodes { };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ 1 │ 2 │ 3 │ 4 │   │Ply│ │TO1│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ 5 │ 6 │ 7 │ 8 │
-       ├───┼───┼───┼───┤
-       │ 9 │ 0 │ ↑ │Ent│      ┌───┐
-       ├───┼───┼───┼───┤      │Mut│
-       │Fn2│ ← │ ↓ │ → │      └───┘
-       └───┴───┴───┴───┘
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ ! │ @ │ # │ $ │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ % │ ^ │ & │ * │
-       ├───┼───┼───┼───┤
-       │ ( │ ) │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0         1        2        3         4      */
-    [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
-                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
-                MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN1),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN2),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │Spi│Spd│   │   │   │   │ │TO0│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │Sai│Sad│   │   │
-       ├───┼───┼───┼───┤
-       │Tog│Mod│Hui│   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │Vai│Hud│Vad│      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        */
-    [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
-                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
-                _______, RGB_VAI, RGB_HUD, RGB_VAD
-            ),
-};
-
-#ifdef OLED_ENABLE
-    bool oled_task_user(void) {
-        render_layer_status();
-
-        return true;
-    }
-#endif
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-};
-#endif
diff --git a/keyboards/doio/kb16/rev1/keymaps/via/rules.mk b/keyboards/doio/kb16/rev1/keymaps/via/rules.mk
deleted file mode 100644
index d76c12896fc..00000000000
--- a/keyboards/doio/kb16/rev1/keymaps/via/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = yes
-
-# Encoder enabled
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev1/rules.mk b/keyboards/doio/kb16/rev1/rules.mk
index b234c1ca6a9..8fc28d64802 100644
--- a/keyboards/doio/kb16/rev1/rules.mk
+++ b/keyboards/doio/kb16/rev1/rules.mk
@@ -1,28 +1,2 @@
 SRC += ./lib/layer_status/layer_status.c
 SRC += ./lib/logo.c
-
-# 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
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes
-SPACE_CADET_ENABLE = no
-
-# OLED enabled
-OLED_ENABLE = yes
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-
-# Encoder enabled
-ENCODER_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
index fc58b8518b8..ebe78d363bb 100644
--- a/keyboards/doio/kb16/rev2/config.h
+++ b/keyboards/doio/kb16/rev2/config.h
@@ -22,46 +22,4 @@
     #define I2C1_SCL_PIN B10
     #define I2C1_SDA_PIN B11
     #define I2C_DRIVER I2CD2
-
-    /* Use the custom font */
-    #define OLED_FONT_H "./lib/glcdfont.c"
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-    /* RGB Matrix config */
-    #define RGB_MATRIX_LED_COUNT 16
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
-    #define RGB_MATRIX_KEYPRESSES
-
-    /* RGB Matrix effect */
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #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_CYCLE_ALL
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-    #define ENABLE_RGB_MATRIX_DUAL_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
-
-    #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/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index c3cf6b9a12e..b3f14e180d7 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -1,22 +1,11 @@
 {
-    "keyboard_name": "KB16-01",
-    "manufacturer": "DOIO",
-    "url": "",
-    "maintainer": "HorrorTroll",
     "usb": {
-        "vid": "0xD010",
-        "pid": "0x1601",
-        "device_version": "0.0.2",
-        "force_nkro": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
+        "device_version": "0.0.2"
     },
     "matrix_pins": {
         "cols": ["B14", "B13", "B12", "B0", "A7"],
         "rows": ["B3", "B4", "B9", "B8"]
     },
-    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6"},
@@ -28,36 +17,5 @@
         "pin": "A10"
     },
     "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-
-                {"matrix": [0, 4], "x": 4.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-
-                {"matrix": [1, 4], "x": 6, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-
-                {"matrix": [2, 4], "x": 5.375, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3}
-            ]
-        }
-    }
+    "bootloader": "stm32duino"
 }
diff --git a/keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c b/keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c
deleted file mode 100644
index ae24fc2755d..00000000000
--- a/keyboards/doio/kb16/rev2/keymaps/bongocat/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* 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
-
-// OLED animation
-#include "./lib/bongocat/bongocat.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,
-    _FN1,
-    _FN2
-};
-
-// enum layer_keycodes { };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ 1 │ 2 │ 3 │ 4 │   │Ply│ │TO1│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ 5 │ 6 │ 7 │ 8 │
-       ├───┼───┼───┼───┤
-       │ 9 │ 0 │ ↑ │Ent│      ┌───┐
-       ├───┼───┼───┼───┤      │Mut│
-       │Fn2│ ← │ ↓ │ → │      └───┘
-       └───┴───┴───┴───┘
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ ! │ @ │ # │ $ │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ % │ ^ │ & │ * │
-       ├───┼───┼───┼───┤
-       │ ( │ ) │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0         1        2        3         4      */
-    [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
-                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
-                MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN1),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN2),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │Spi│Spd│   │   │   │   │ │TO0│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │Sai│Sad│   │   │
-       ├───┼───┼───┼───┤
-       │Tog│Mod│Hui│   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │Vai│Hud│Vad│      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        */
-    [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
-                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
-                _______, RGB_VAI, RGB_HUD, RGB_VAD
-            ),
-};
-
-#ifdef OLED_ENABLE
-    bool oled_task_user(void) {
-        led_t led_usb_state = host_keyboard_led_state();
-
-        render_bongocat();
-        oled_set_cursor(14, 0);                                // sets cursor to (column, row) using charactar spacing (4 rows on 128x32 screen, anything more will overflow back to the top)
-        oled_write_P(PSTR("WPM:"), false);
-        oled_write(get_u8_str(get_current_wpm(), '0'), false); // writes wpm on top right corner of string
-        oled_set_cursor(17, 2);
-        oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-        oled_set_cursor(17, 3);
-        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
-
-        return true;
-    }
-#endif
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-};
-#endif
diff --git a/keyboards/doio/kb16/rev2/keymaps/bongocat/rules.mk b/keyboards/doio/kb16/rev2/keymaps/bongocat/rules.mk
deleted file mode 100644
index 822e06e1799..00000000000
--- a/keyboards/doio/kb16/rev2/keymaps/bongocat/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-SRC += ./lib/bongocat/bongocat.c
-
-VIA_ENABLE = yes
-
-# OLED enabled
-WPM_ENABLE = yes
-
-# Encoder enabled
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/keymaps/default/keymap.c b/keyboards/doio/kb16/rev2/keymaps/default/keymap.c
deleted file mode 100644
index 1217a3c788a..00000000000
--- a/keyboards/doio/kb16/rev2/keymaps/default/keymap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright 2022 DOIO
- * 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
-
-// OLED animation
-#include "./lib/layer_status/layer_status.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,
-    _FN1,
-    _FN2
-};
-
-// enum layer_keycodes { };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ 1 │ 2 │ 3 │ 4 │   │Ply│ │TO1│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ 5 │ 6 │ 7 │ 8 │
-       ├───┼───┼───┼───┤
-       │ 9 │ 0 │ ↑ │Ent│      ┌───┐
-       ├───┼───┼───┼───┤      │Mut│
-       │Fn2│ ← │ ↓ │ → │      └───┘
-       └───┴───┴───┴───┘
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ ! │ @ │ # │ $ │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ % │ ^ │ & │ * │
-       ├───┼───┼───┼───┤
-       │ ( │ ) │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0         1        2        3         4      */
-    [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
-                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
-                MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN1),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN2),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │Spi│Spd│   │   │   │   │ │TO0│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │Sai│Sad│   │   │
-       ├───┼───┼───┼───┤
-       │Tog│Mod│Hui│   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │Vai│Hud│Vad│      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        */
-    [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
-                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
-                _______, RGB_VAI, RGB_HUD, RGB_VAD
-            ),
-};
-
-#ifdef OLED_ENABLE
-    bool oled_task_user(void) {
-        render_layer_status();
-
-        return true;
-    }
-#endif
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-};
-#endif
diff --git a/keyboards/doio/kb16/rev2/keymaps/default/rules.mk b/keyboards/doio/kb16/rev2/keymaps/default/rules.mk
deleted file mode 100644
index 00003ba11bd..00000000000
--- a/keyboards/doio/kb16/rev2/keymaps/default/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Encoder enabled
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/keymaps/via/keymap.c b/keyboards/doio/kb16/rev2/keymaps/via/keymap.c
deleted file mode 100644
index fc1f1dcfaaa..00000000000
--- a/keyboards/doio/kb16/rev2/keymaps/via/keymap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright 2022 DOIO
- * 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
-
-// OLED animation
-#include "lib/layer_status/layer_status.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,
-    _FN1,
-    _FN2
-};
-
-// enum layer_keycodes { };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ 1 │ 2 │ 3 │ 4 │   │Ply│ │TO1│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ 5 │ 6 │ 7 │ 8 │
-       ├───┼───┼───┼───┤
-       │ 9 │ 0 │ ↑ │Ent│      ┌───┐
-       ├───┼───┼───┼───┤      │Mut│
-       │Fn2│ ← │ ↓ │ → │      └───┘
-       └───┴───┴───┴───┘
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │ ! │ @ │ # │ $ │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │ % │ ^ │ & │ * │
-       ├───┼───┼───┼───┤
-       │ ( │ ) │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0         1        2        3         4      */
-    [_BASE] = LAYOUT(
-                KC_1,     KC_2,    KC_3,    KC_4,     KC_MPLY,
-                KC_5,     KC_6,    KC_7,    KC_8,     TO(_FN),
-                KC_9,     KC_0,    KC_UP,   KC_ENT,   KC_MUTE,
-                MO(_FN2), KC_LEFT, KC_DOWN, KC_RIGHT
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN1),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │   │   │   │   │   │   │ │   │
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │   │   │   │   │
-       ├───┼───┼───┼───┤
-       │   │   │   │   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │   │   │   │      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4       */
-    [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, TO(_FN2),
-                _______, _______, _______, _______, _______,
-                _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┬───┬───┬───┐   ┌───┐ ┌───┐
-       │Spi│Spd│   │   │   │   │ │TO0│
-       ├───┼───┼───┼───┤   └───┘ └───┘
-       │Sai│Sad│   │   │
-       ├───┼───┼───┼───┤
-       │Tog│Mod│Hui│   │      ┌───┐
-       ├───┼───┼───┼───┤      │   │
-       │   │Vai│Hud│Vad│      └───┘
-       └───┴───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        */
-    [_FN2] = LAYOUT(
-                RGB_SPI, RGB_SPD, _______, QK_BOOT, _______,
-                RGB_SAI, RGB_SAD, _______, _______, TO(_BASE),
-                RGB_TOG, RGB_MOD, RGB_HUI, _______, _______,
-                _______, RGB_VAI, RGB_HUD, RGB_VAD
-            ),
-};
-
-#ifdef OLED_ENABLE
-    bool oled_task_user(void) {
-        render_layer_status();
-
-        return true;
-    }
-#endif
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-};
-#endif
diff --git a/keyboards/doio/kb16/rev2/keymaps/via/rules.mk b/keyboards/doio/kb16/rev2/keymaps/via/rules.mk
deleted file mode 100644
index d76c12896fc..00000000000
--- a/keyboards/doio/kb16/rev2/keymaps/via/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = yes
-
-# Encoder enabled
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk
index 2145c9fbe10..e9bb89acc7e 100644
--- a/keyboards/doio/kb16/rev2/rules.mk
+++ b/keyboards/doio/kb16/rev2/rules.mk
@@ -3,25 +3,3 @@ SRC += ./lib/logo.c
 
 # Configure for 128K flash
 MCU_LDSCRIPT = STM32F103xB
-
-# 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
-
-# OLED enabled
-OLED_ENABLE = yes
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-
-# Encoder enabled
-ENCODER_ENABLE = yes
diff --git a/keyboards/doio/kb19/info.json b/keyboards/doio/kb19/info.json
new file mode 100644
index 00000000000..faaaedd36fd
--- /dev/null
+++ b/keyboards/doio/kb19/info.json
@@ -0,0 +1,77 @@
+{
+    "keyboard_name": "KB19-01",
+    "manufacturer": "DOIO",
+    "url": "",
+    "maintainer": "DOIO2022",
+    "usb": {
+        "vid": "0xD010",
+        "pid": "0x1901",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "encoder": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B0", "A7"],
+        "rows": ["B3", "B4", "B9", "B8", "B1"]
+    },
+    "ws2812": {
+        "pin": "A10"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B6"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 19,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/doio/kb19/keymaps/default/keymap.c b/keyboards/doio/kb19/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ba44342b20a
--- /dev/null
+++ b/keyboards/doio/kb19/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
+ *
+ * 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, RGB_MOD,
+        KC_P7,  KC_P8,   KC_P9,   KC_PPLS, RGB_TOG,
+        KC_P4,  KC_P5,   KC_P6,
+        KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_P0,  KC_PDOT, KC_MUTE
+  )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif
diff --git a/keyboards/doio/kb19/keymaps/default/rules.mk b/keyboards/doio/kb19/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/doio/kb19/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb19/keymaps/via/keymap.c b/keyboards/doio/kb19/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ba44342b20a
--- /dev/null
+++ b/keyboards/doio/kb19/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
+ *
+ * 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, RGB_MOD,
+        KC_P7,  KC_P8,   KC_P9,   KC_PPLS, RGB_TOG,
+        KC_P4,  KC_P5,   KC_P6,
+        KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_P0,  KC_PDOT, KC_MUTE
+  )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif
diff --git a/keyboards/doio/kb19/keymaps/via/rules.mk b/keyboards/doio/kb19/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/doio/kb19/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb19/readme.md b/keyboards/doio/kb19/readme.md
new file mode 100644
index 00000000000..ad9d0aaccd9
--- /dev/null
+++ b/keyboards/doio/kb19/readme.md
@@ -0,0 +1,24 @@
+# doio/kb19
+
+QMK for DOIO Knob keypad .
+
+* Keyboard Maintainer: DOIO2022
+* Hardware Supported: DOIO Knob keypad
+
+Make example for this keyboard (after setting up your build environment):
+
+    make doio/kb19:default
+
+Flashing example for this keyboard:
+
+    make doio/kb19: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 `QK_BOOT` if it is available
diff --git a/keyboards/doio/kb19/rules.mk b/keyboards/doio/kb19/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/doio/kb19/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
index 586a61c7a09..7050e67b7e3 100644
--- a/keyboards/doio/kb30/config.h
+++ b/keyboards/doio/kb30/config.h
@@ -22,8 +22,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-// #define QMK_KEYS_PER_SCAN 12
-
 /* OLED */
 #ifdef OLED_ENABLE
 #    define OLED_BRIGHTNESS 5
@@ -34,59 +32,7 @@
 #    define I2C_DRIVER I2CD2
 #endif
 
-#ifdef RGB_MATRIX_ENABLE
-    /* RGB Matrix config */
-    #define RGB_MATRIX_LED_COUNT 36
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
-
-
-/* RGB Matrix effect */
-#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_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#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_FRACTAL
-// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#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
+#define RGB_MATRIX_LED_COUNT 36
 
 /*
  * Feature disable options
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index cd3c7729947..60e02a58baa 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -9,7 +9,44 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_up_down"
+        },
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"],
diff --git a/keyboards/doio/kb38/config.h b/keyboards/doio/kb38/config.h
deleted file mode 100644
index 106ad4d651c..00000000000
--- a/keyboards/doio/kb38/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2022 Katrina (@Daggette10)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 44
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#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_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-
-/*
- * 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
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json
index 95d3be13d39..9a67e3ed5c9 100644
--- a/keyboards/doio/kb38/info.json
+++ b/keyboards/doio/kb38/info.json
@@ -36,6 +36,14 @@
         "pin": "F6"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "rainbow_moving_chevron": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
@@ -88,7 +96,8 @@
             {"flags": 2, "x": 0, "y": 0},
             {"flags": 2, "x": 74.6, "y": 0},
             {"flags": 2, "x": 224, "y": 0}
-        ]
+        ],
+        "max_brightness": 200,
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/doio/kb3x/info.json b/keyboards/doio/kb3x/info.json
new file mode 100644
index 00000000000..be0d1384397
--- /dev/null
+++ b/keyboards/doio/kb3x/info.json
@@ -0,0 +1,125 @@
+{
+    "manufacturer": "DOIO",
+    "keyboard_name": "KB3x-01",
+    "maintainer": "DOIO2022",
+    "bootloader": "stm32duino",
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B6", "resolution": 2},
+            {"pin_a": "A1", "pin_b": "A2", "resolution": 2},
+            {"pin_a": "A3", "pin_b": "A4", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B0", "A7", "A6"],
+        "rows": ["B3", "B4", "B9", "B8"]
+    },
+    "processor": "STM32F103",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 75, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 149, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 224, "y": 0, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1},
+            {"x": 112, "y": 64, "flags": 1}
+        ],
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x3F01",
+        "vid": "0xD010"
+    },
+    "ws2812": {
+        "pin": "A10"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [3, 0], "x": 0, "y": 0},
+                {"matrix": [3, 1], "x": 1, "y": 0},
+                {"matrix": [3, 2], "x": 2, "y": 0},
+                {"matrix": [3, 3], "x": 6.5, "y": 0},
+                {"matrix": [3, 4], "x": 7.5, "y": 0},
+                {"matrix": [3, 5], "x": 8.5, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 1.25},
+                {"matrix": [1, 0], "x": 4.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 7.5, "y": 1.25},
+                {"matrix": [0, 3], "x": 0, "y": 2.25},
+                {"matrix": [0, 4], "x": 1, "y": 2.25, "encoder": 0},
+                {"matrix": [0, 1], "x": 2, "y": 2.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 2.25, "encoder": 1},
+                {"matrix": [1, 1], "x": 5.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 7.5, "y": 2.25, "encoder": 2},
+                {"matrix": [2, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [0, 2], "x": 1, "y": 3.25},
+                {"matrix": [1, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [2, 2], "x": 7.5, "y": 3.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/doio/kb3x/keymaps/default/keymap.c b/keyboards/doio/kb3x/keymaps/default/keymap.c
new file mode 100644
index 00000000000..934019e8cf5
--- /dev/null
+++ b/keyboards/doio/kb3x/keymaps/default/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
+ *
+ * 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 {
+    _LAY0,
+    _LAY1,
+    _LAY2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAY0] = LAYOUT(
+            TO(1),      RGB_MOD,        RGB_TOG,        RGB_HUI,        RGB_VAD,        RGB_VAI,    
+                KC_MPLY,                                    KC_UP,                                      KC_UP,
+    KC_MNXT,    KC_TRNS,    KC_MPRV,        A(KC_LEFT),     KC_TRNS,    A(KC_RIGHT),        KC_RIGHT,   KC_TRNS,    KC_LEFT,
+                KC_MPLY,                                    KC_DOWN,                                    KC_DOWN),
+    [_LAY1] = LAYOUT(
+            TO(2),      KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,    
+                KC_WH_U,                                    S(KC_RBRC),                                 C(KC_L),
+    C(KC_WH_D), KC_TRNS,    C(KC_WH_U),     KC_DOT,         KC_TRNS,    KC_COMM,            C(KC_B),    KC_TRNS,    C(KC_U),
+                KC_WH_D,                                    S(KC_LBRC),                                 C(KC_M)),
+    [_LAY2] = LAYOUT(
+            TO(0),      KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,    
+                KC_B,                                       KC_UP,                                      S(KC_I),
+    KC_P,       KC_TRNS,    KC_H,           KC_RIGHT,       KC_TRNS,    KC_LEFT,            KC_O,       KC_TRNS,    KC_I,
+                KC_Y,                                       KC_DOWN,                                    S(KC_O))
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_LAY0] = { ENCODER_CCW_CW(C(KC_DOWN), C(KC_UP)), ENCODER_CCW_CW(C(KC_PMNS), C(KC_PPLS)), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAY1] = { ENCODER_CCW_CW(C(KC_PMNS), C(KC_PPLS)), ENCODER_CCW_CW(KC_LBRC, KC_RBRC), ENCODER_CCW_CW(C(S(KC_U)), C(KC_I)) },
+    [_LAY2] = { ENCODER_CCW_CW(KC_C, KC_V), ENCODER_CCW_CW(KC_MINS, KC_EQL), ENCODER_CCW_CW(KC_J, KC_L) }
+};
+#endif
diff --git a/keyboards/doio/kb3x/keymaps/default/rules.mk b/keyboards/doio/kb3x/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/doio/kb3x/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb3x/keymaps/via/keymap.c b/keyboards/doio/kb3x/keymaps/via/keymap.c
new file mode 100644
index 00000000000..5ebd1066a9f
--- /dev/null
+++ b/keyboards/doio/kb3x/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+/* Copyright 2022 DOIO
+ * Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
+ *
+ * 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 {
+    _LAY0,
+    _LAY1,
+    _LAY2,
+    _LAY3,
+    _LAY4,
+    _LAY5
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAY0] = LAYOUT(
+            TO(1),      RGB_MOD,        RGB_TOG,        RGB_HUI,        RGB_VAD,        RGB_VAI,    
+                KC_MPLY,                                    KC_UP,                                      KC_UP,
+    KC_MNXT,    KC_TRNS,    KC_MPRV,        A(KC_LEFT),     KC_TRNS,    A(KC_RIGHT),        KC_RIGHT,   KC_TRNS,    KC_LEFT,
+                KC_MPLY,                                    KC_DOWN,                                    KC_DOWN),
+    [_LAY1] = LAYOUT(
+            TO(2),      KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,    
+                KC_WH_U,                                    S(KC_RBRC),                                 C(KC_L),
+    C(KC_WH_D), KC_TRNS,    C(KC_WH_U),     KC_DOT,         KC_TRNS,    KC_COMM,            C(KC_B),    KC_TRNS,    C(KC_U),
+                KC_WH_D,                                    S(KC_LBRC),                                 C(KC_M)),
+    [_LAY2] = LAYOUT(
+            TO(3),      KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,    
+                KC_B,                                       KC_UP,                                      S(KC_I),
+    KC_P,       KC_TRNS,    KC_H,           KC_RIGHT,       KC_TRNS,    KC_LEFT,            KC_O,       KC_TRNS,    KC_I,
+                KC_Y,                                       KC_DOWN,                                    S(KC_O)),
+    [_LAY3] = LAYOUT(
+            TO(4),      KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,    
+                KC_TRNS,                                    KC_TRNS,                                    KC_TRNS,
+  KC_TRNS,      KC_TRNS,    KC_TRNS,        KC_TRNS,        KC_TRNS,    KC_TRNS,            KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,                                    KC_TRNS,                                    KC_TRNS),
+    [_LAY4] = LAYOUT(
+            TO(5),      KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,   
+                KC_TRNS,                                    KC_TRNS,                                    KC_TRNS,
+  KC_TRNS,      KC_TRNS,    KC_TRNS,        KC_TRNS,        KC_TRNS,    KC_TRNS,            KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,                                    KC_TRNS,                                    KC_TRNS),
+    [_LAY5] = LAYOUT(
+		   TO(0),      KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS, 
+                KC_TRNS,                                    KC_TRNS,                                    KC_TRNS,
+  KC_TRNS,      KC_TRNS,    KC_TRNS,        KC_TRNS,        KC_TRNS,    KC_TRNS,            KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,                                    KC_TRNS,                                    KC_TRNS),
+
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_LAY0] = { ENCODER_CCW_CW(C(KC_DOWN), C(KC_UP)), ENCODER_CCW_CW(C(KC_PMNS), C(KC_PPLS)), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAY1] = { ENCODER_CCW_CW(C(KC_PMNS), C(KC_PPLS)), ENCODER_CCW_CW(KC_LBRC, KC_RBRC), ENCODER_CCW_CW(C(S(KC_U)), C(KC_I)) },
+    [_LAY2] = { ENCODER_CCW_CW(KC_C, KC_V), ENCODER_CCW_CW(KC_MINS, KC_EQL), ENCODER_CCW_CW(KC_J, KC_L) },
+    [_LAY3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/doio/kb3x/keymaps/via/rules.mk b/keyboards/doio/kb3x/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/doio/kb3x/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb3x/readme.md b/keyboards/doio/kb3x/readme.md
new file mode 100644
index 00000000000..c27c983d496
--- /dev/null
+++ b/keyboards/doio/kb3x/readme.md
@@ -0,0 +1,26 @@
+# doio/kb3x
+
+![kb3x-01](https://i.imgur.com/6DvIu9Mh.png)
+
+QMK for DOIO Knob keypad .
+
+* Keyboard Maintainer: DOIO2022
+* Hardware Supported: DOIO Knob keypad
+
+Make example for this keyboard (after setting up your build environment):
+
+    make doio/kb3x:default
+
+Flashing example for this keyboard:
+
+    make doio/kb3x: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 `QK_BOOT` if it is available
diff --git a/keyboards/doio/kb3x/rules.mk b/keyboards/doio/kb3x/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/doio/kb3x/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/donutcables/budget96/keymaps/donut/config.h b/keyboards/donutcables/budget96/keymaps/donut/config.h
deleted file mode 100644
index 3da4a621c2e..00000000000
--- a/keyboards/donutcables/budget96/keymaps/donut/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Copyright 2020 DonutCables
-
-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
-
-// place overrides here
-
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
-
-#define UNICODE_KEY_WINC KC_RGUI
diff --git a/keyboards/donutcables/budget96/keymaps/donut/keymap.c b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
deleted file mode 100644
index f726fe2228c..00000000000
--- a/keyboards/donutcables/budget96/keymaps/donut/keymap.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-Copyright 2020 DonutCables
-
-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,
-    _B,
-    _FN1,
-    _FN2,
-};
-
-enum custom_keycodes {
-    img = SAFE_RANGE,
-    xkcd,
-    CD,
-    AES,
-    /* Unicode strings maps */
-    ALT0,
-    ALT1,
-    ALT2,
-    ALT3,
-    ALT4,
-    ALT5,
-    ALT6,
-    ALT7,
-    /* Discord emotes maps */
-    B,
-    X,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT_96_ansi_2_right_mod(
-	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_HOME, KC_INS, KC_END, KC_MPRV, KC_MPLY, KC_MNXT, 
-	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_PSCR, KC_PSLS, KC_PAST, 
-	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_P7, KC_P8, KC_P9, KC_PMNS, 
-	MO(3), 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_P4, KC_P5, KC_P6, KC_PPLS, 
-	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_P1, KC_P2, KC_P3, 
-	KC_LCTL, MO(2), KC_RALT, KC_SPC, KC_CALC, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT),
-
-    /* (1) Bmode layer */
-    [_B] = LAYOUT_96_ansi_2_right_mod(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-	_______, _______, _______, _______, _______, B, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-    /* (2) Fn 1 */
-    [_FN1] = LAYOUT_96_ansi_2_right_mod(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, TG(1), KC_PGUP, KC_VOLD, KC_MUTE, KC_VOLU, 
-	ALT0, _______, _______, ALT1, _______, _______, _______, _______, _______, _______, _______, _______, ALT2, _______, _______, KC_NUM, _______, _______, 
-	_______, CD, _______, _______, _______, ALT3, _______, _______, _______, ALT4, _______, _______, _______, _______, _______, _______, _______, _______, 
-	_______, AES, xkcd, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-	KC_CAPS, _______, X, _______, img, B, _______, ALT7, ALT5, ALT6, _______, _______, _______, _______, _______, _______, 
-	_______, _______, KC_LALT, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-    /* (3) Fn 2 */
-    [_FN2] = LAYOUT_96_ansi_2_right_mod(
-	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, UC_WINC, EE_CLR, QK_BOOT, 
-	VK_TOGG, 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, 
-	RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, 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, 
-	_______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, 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, 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, KC_NO, KC_NO),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case xkcd:
-            if (record->event.pressed) {
-                SEND_STRING("https://xkcd.com/927/");
-            }
-            return true;
-        case CD:
-            if (record->event.pressed) {
-                SEND_STRING("cd d:/keyboard_stuff/gits/qmk_firmware");
-            }
-            return true;
-        case AES:
-            if (record->event.pressed) {
-                SEND_STRING("***A E S T H E T I C S***");
-            }
-            return true;
-        case img:
-            if (record->event.pressed) {
-                SEND_STRING("[url=" SS_LCTL("v") "][img]" SS_LCTL("v") "[/img][/url]");
-            }
-            return true;
-        case ALT0:
-            if (record->event.pressed) {
-                send_unicode_string("≈");
-            }
-            return true;
-        case ALT1:
-            if (record->event.pressed) {
-                send_unicode_string("π");
-            }
-            return true;
-        case ALT2:
-            if (record->event.pressed) {
-                send_unicode_string("±");
-            }
-            return true;
-        case ALT3:
-            if (record->event.pressed) {
-                send_unicode_string("™");
-            }
-            return true;
-        case ALT4:
-            if (record->event.pressed) {
-                send_unicode_string("Ω");
-            }
-            return true;
-        case ALT5:
-            if (record->event.pressed) {
-                send_unicode_string("≤");
-            }
-            return true;
-        case ALT6:
-            if (record->event.pressed) {
-                send_unicode_string("≥");
-            }
-            return true;
-        case ALT7:
-            if (record->event.pressed) {
-                send_unicode_string("ゴ");
-            }
-            return true;
-        case B:
-            if (record->event.pressed) {
-                SEND_STRING(":b:");
-            }
-            return true;
-        case X:
-            if (record->event.pressed) {
-                SEND_STRING(":x:");
-            }
-            return true;
-        case KC_A ... KC_Z:
-        case KC_1 ... KC_0:
-            if (layer_state_is(1)) {
-                if (record->event.pressed) {
-                    register_code(KC_F13);
-                    tap_code(keycode);
-                    unregister_code(KC_F13);
-                }
-            } else {
-                return true;
-            }
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/donutcables/budget96/keymaps/donut/readme.md b/keyboards/donutcables/budget96/keymaps/donut/readme.md
deleted file mode 100644
index 3e1ca1361ac..00000000000
--- a/keyboards/donutcables/budget96/keymaps/donut/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# My personal keymap for Budget96
-
-My daily map for the Budget96. Includes unicode and masked characters for AHK pickup.
\ No newline at end of file
diff --git a/keyboards/donutcables/budget96/keymaps/donut/rules.mk b/keyboards/donutcables/budget96/keymaps/donut/rules.mk
deleted file mode 100644
index 7d48394b23d..00000000000
--- a/keyboards/donutcables/budget96/keymaps/donut/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-VELOCIKEY_ENABLE = yes
-UNICODE_ENABLE = yes
-BACKLIGHT_ENABLE = no
-MOUSEKEY_ENABLE = no
-COMMAND_ENABLE = no
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
diff --git a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
deleted file mode 100644
index 70768007179..00000000000
--- a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <stdlib.h>
-
-static uint16_t keystroke;
-static bool shift_pressed;
-
-static int lower = (int) KC_A;
-static int upper = (int) KC_Z;
-
-uint16_t random_keycode(void) {
-  return lower + (rand() % (upper - lower + 1));
-};
-
-enum custom_keycodes {
-  RND_KEY = SAFE_RANGE
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case RND_KEY:
-      if (record->event.pressed) {
-        keystroke = random_keycode();
-        if (rand() % 2 > 0) {
-          shift_pressed = 1;
-          register_code(KC_LSFT);
-        }
-        register_code(keystroke);
-      } else {
-        if (shift_pressed > 0) {
-          unregister_code(KC_LSFT);
-        }
-        unregister_code(keystroke);
-      }
-
-      return false;
-
-    default:
-        return true;
-  }
-
-  return true;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, QK_BOOT, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY,
-  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY
-),
-};
diff --git a/keyboards/donutcables/scrabblepad/keymaps/random/readme.md b/keyboards/donutcables/scrabblepad/keymaps/random/readme.md
deleted file mode 100644
index e719adaeb8a..00000000000
--- a/keyboards/donutcables/scrabblepad/keymaps/random/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Scrabblepad keymap with every key press random
-
-Every key produces a random key press, except the middle key, which is reserved for resetting the board.
-
-The random key press is selected between KC_A and KC_Z keycodes.
diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
index e18a2313807..b5a6d1893cf 100644
--- a/keyboards/doro67/rgb/config.h
+++ b/keyboards/doro67/rgb/config.h
@@ -17,59 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 67
-
-#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
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/doro67/rgb/info.json b/keyboards/doro67/rgb/info.json
index ad7661830a9..3c2461a90b9 100644
--- a/keyboards/doro67/rgb/info.json
+++ b/keyboards/doro67/rgb/info.json
@@ -9,6 +9,51 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
+      "animations": {
+        "alphas_mods": true,
+        "gradient_up_down": true,
+        "gradient_left_right": true,
+        "breathing": true,
+        "band_sat": true,
+        "band_val": true,
+        "band_pinwheel_sat": true,
+        "band_pinwheel_val": true,
+        "band_spiral_sat": true,
+        "band_spiral_val": true,
+        "cycle_all": true,
+        "cycle_left_right": true,
+        "cycle_up_down": true,
+        "rainbow_moving_chevron": true,
+        "cycle_out_in": true,
+        "cycle_out_in_dual": true,
+        "cycle_pinwheel": true,
+        "cycle_spiral": true,
+        "dual_beacon": true,
+        "rainbow_beacon": true,
+        "rainbow_pinwheels": true,
+        "raindrops": true,
+        "jellybean_raindrops": true,
+        "hue_breathing": true,
+        "hue_pendulum": true,
+        "hue_wave": true,
+        "pixel_rain": true,
+        "pixel_flow": true,
+        "pixel_fractal": true,
+        "typing_heatmap": true,
+        "digital_rain": true,
+        "solid_reactive_simple": true,
+        "solid_reactive": true,
+        "solid_reactive_wide": true,
+        "solid_reactive_multiwide": true,
+        "solid_reactive_cross": true,
+        "solid_reactive_multicross": true,
+        "solid_reactive_nexus": true,
+        "solid_reactive_multinexus": true,
+        "splash": true,
+        "multisplash": true,
+        "solid_splash": true,
+        "solid_multisplash": true
+      },
       "driver": "ws2812"
     },
     "matrix_pins": {
diff --git a/keyboards/dotmod/dymium65/config.h b/keyboards/dotmod/dymium65/config.h
index fa5999ca48d..ca6e56156de 100644
--- a/keyboards/dotmod/dymium65/config.h
+++ b/keyboards/dotmod/dymium65/config.h
@@ -21,12 +21,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 66
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0
-#define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/dotmod/dymium65/info.json b/keyboards/dotmod/dymium65/info.json
index 650260483c6..6095f4c3f1c 100644
--- a/keyboards/dotmod/dymium65/info.json
+++ b/keyboards/dotmod/dymium65/info.json
@@ -59,7 +59,9 @@
             "solid_reactive_cross": true,
             "solid_reactive_nexus": true,
             "splash": true
-        }
+        },
+        "max_brightness": 200,
+        "react_on_keyup": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/dp3000/config.h b/keyboards/dp3000/config.h
deleted file mode 100644
index 26e9f037f58..00000000000
--- a/keyboards/dp3000/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 
- * Copyright 2023 deddia permana (@depermana12)
- *
- * 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_MATRIX_LED_COUNT 8
-#define RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/dp3000/rev1/info.json b/keyboards/dp3000/rev1/info.json
index 7ea2d101c4f..63d023de5cf 100644
--- a/keyboards/dp3000/rev1/info.json
+++ b/keyboards/dp3000/rev1/info.json
@@ -29,7 +29,6 @@
             "hue_wave": true,
             "rainbow_moving_chevron": true,
             "raindrops": true,
-            "solid_color": true,
             "solid_reactive": true,
             "solid_reactive_multinexus": true,
             "solid_reactive_simple": true,
@@ -51,7 +50,9 @@
         "max_brightness": 180,
         "sat_steps": 8,
         "speed_steps": 10,
-        "val_steps": 8
+        "val_steps": 8,
+        "react_on_keyup": true,
+        "sleep": true
     },
     "ws2812": {
         "pin": "B5"
diff --git a/keyboards/dp3000/rev2/config.h b/keyboards/dp3000/rev2/config.h
new file mode 100644
index 00000000000..237f9897ba2
--- /dev/null
+++ b/keyboards/dp3000/rev2/config.h
@@ -0,0 +1,20 @@
+/* 
+ * Copyright 2023 deddia permana (@depermana12)
+ *
+ * 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_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index 3c65d947363..c2aa3152914 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -35,54 +35,5 @@
 //rgb matrix setting
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#define DRIVER_1_LED_TOTAL 36
-#define DRIVER_2_LED_TOTAL 36
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-// 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
-// #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_LED_COUNT 72
diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c
index 588acd591d1..5f23b355424 100644
--- a/keyboards/dp60/dp60.c
+++ b/keyboards/dp60/dp60.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json
index 10af7cb6cac..ec36a725c34 100644
--- a/keyboards/dp60/info.json
+++ b/keyboards/dp60/info.json
@@ -29,6 +29,37 @@
         "pin": "D7"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
         "driver": "is31fl3731"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/dp60/keymaps/allleds/keymap.c b/keyboards/dp60/keymaps/allleds/keymap.c
deleted file mode 100644
index 3d49bd268fe..00000000000
--- a/keyboards/dp60/keymaps/allleds/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * keymap.c
- *
-  Copyright 2020 astro <yuleiz@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_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_DEL, KC_BSPC,
-      KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_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,   MO(1),
-      KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RGUI,  TG(1),   KC_RCTL),
-
-    [1] = LAYOUT_60_ansi_split_bs_rshift(
-      _______, 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,
-      QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
-      _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______,
-      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-      _______,_______,_______,                        _______,                        _______,_______,TG(0),_______),
-};
diff --git a/keyboards/dp60/keymaps/allleds/rules.mk b/keyboards/dp60/keymaps/allleds/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/dp60/keymaps/allleds/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/dp60/keymaps/indicator/config.h b/keyboards/dp60/keymaps/indicator/config.h
deleted file mode 100644
index c7b52b27a5e..00000000000
--- a/keyboards/dp60/keymaps/indicator/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * config.h
- *
-  Copyright 2020 astro <yuleiz@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 RGB_INDICATOR_NUM 8
-#undef RGBLED_NUM
-#define RGBLED_NUM  (18+RGB_INDICATOR_NUM)
-
-#define RGB_INDICATOR_PIN B1
-#define RGBLIGHT_LAYERS
diff --git a/keyboards/dp60/keymaps/indicator/indicator.c b/keyboards/dp60/keymaps/indicator/indicator.c
deleted file mode 100644
index 02450ce68d9..00000000000
--- a/keyboards/dp60/keymaps/indicator/indicator.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * indicator.c
- *
-  Copyright 2020 astro <yuleiz@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 "dp60.h"
-
-#include "rgblight.h"
-
-
-// caps led
-const rgblight_segment_t PROGMEM dp60_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {18, 1, HSV_RED}
-);
-
-// scroll led
-const rgblight_segment_t PROGMEM dp60_scrolllock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {19, 1, HSV_GREEN}
-);
-
-// num led
-const rgblight_segment_t PROGMEM dp60_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {20, 1, HSV_BLUE}
-);
-
-// light 21 to 26 for layer 1-5
-const rgblight_segment_t PROGMEM dp60_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {21, 1, HSV_PURPLE}
-);
-const rgblight_segment_t PROGMEM dp60_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {22, 1, HSV_CYAN}
-);
-const rgblight_segment_t PROGMEM dp60_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {23, 1, HSV_YELLOW}
-);
-const rgblight_segment_t PROGMEM dp60_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {24, 1, HSV_PINK}
-);
-const rgblight_segment_t PROGMEM dp60_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {25, 1, HSV_ORANGE}
-);
-
-// rgb light layers
-const rgblight_segment_t* const PROGMEM dp60_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    dp60_capslock_layer,
-    dp60_scrolllock_layer,
-    dp60_numlock_layer,
-    dp60_layer1_layer,
-    dp60_layer2_layer,
-    dp60_layer3_layer,
-    dp60_layer4_layer,
-    dp60_layer5_layer
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = dp60_rgb_layers;
-}
-
-extern rgblight_config_t rgblight_config;
-extern void              rgblight_layers_write(void);
-extern void              indicator_write(rgb_led_t *start_led, uint8_t num_leds);
-
-void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
-{
-    ws2812_setleds(start_led, RGBLED_NUM-RGB_INDICATOR_NUM);
-
-    indicator_write(start_led + (RGBLED_NUM - RGB_INDICATOR_NUM), RGB_INDICATOR_NUM);
-}
-
-void led_update_ports(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    rgblight_set_layer_state(1, led_state.scroll_lock);
-    rgblight_set_layer_state(2, led_state.num_lock);
-}
-
-layer_state_t layer_state_set_kb(layer_state_t state) {
-    state = layer_state_set_user(state);
-    rgblight_set_layer_state(3, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(4, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(5, layer_state_cmp(state, 3));
-    rgblight_set_layer_state(6, layer_state_cmp(state, 4));
-    rgblight_set_layer_state(7, layer_state_cmp(state, 5));
-    return state;
-}
diff --git a/keyboards/dp60/keymaps/indicator/keymap.c b/keyboards/dp60/keymaps/indicator/keymap.c
deleted file mode 100644
index 0cfe07f3ae9..00000000000
--- a/keyboards/dp60/keymaps/indicator/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * keymap.c
- *
-  Copyright 2020 astro <yuleiz@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_60_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_BSLS, 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_BSPC,
-      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_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_LGUI,  KC_LALT,                     LT(1,KC_SPC),                  KC_RALT,KC_RGUI                   ),
-
-    [1] = LAYOUT_60_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,_______,KC_PSCR,
-      QK_BOOT, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
-      KC_CAPS,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______,
-      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-              _______,_______,                        _______,                        _______,_______),
-};
diff --git a/keyboards/dp60/keymaps/indicator/led_driver.c b/keyboards/dp60/keymaps/indicator/led_driver.c
deleted file mode 100644
index b31e2daacd8..00000000000
--- a/keyboards/dp60/keymaps/indicator/led_driver.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * led_driver.c
- *
- Copyright 2020 astro <yuleiz@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/>.
-*/
-
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN RGB_INDICATOR_PIN
-#define ws2812_setleds indicator_setleds
-#define ws2812_setleds_pin indicator_setleds_pin
-#include "ws2812_bitbang.c"
-
-void indicator_write(rgb_led_t *start_led, uint8_t num_leds)
-{
-    indicator_setleds(start_led, num_leds);
-}
diff --git a/keyboards/dp60/keymaps/indicator/readme.md b/keyboards/dp60/keymaps/indicator/readme.md
deleted file mode 100644
index bb3fbbbe0b6..00000000000
--- a/keyboards/dp60/keymaps/indicator/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Indicator RGB leds support for the open source viper/eagle fr4 [plate](https://github.com/yulei/viper_plate.git)
-
-Three wires need to be soldered:  
-
-B1 pin (SCLK at the board) to the plate's D pin
-
-VCC to plate's V
-
-GND to plate's G
diff --git a/keyboards/dp60/keymaps/indicator/rules.mk b/keyboards/dp60/keymaps/indicator/rules.mk
deleted file mode 100644
index a8891659f72..00000000000
--- a/keyboards/dp60/keymaps/indicator/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-RGBLIGHT_ENABLE = yes       	# Use RGB underglow light
-
-SRC += indicator.c led_driver.c
diff --git a/keyboards/draculad/keymaps/pimoroni/config.h b/keyboards/draculad/keymaps/pimoroni/config.h
deleted file mode 100644
index 378b9b8923e..00000000000
--- a/keyboards/draculad/keymaps/pimoroni/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2021 @mangoiv
-
-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/>.
-*/
-
-#define POINTING_DEVICE_ROTATION_90
-
-//comment that out if your trackball is on the left side
-#define TRACKBALL_RIGHT
-
-#ifdef TRACKBALL_RIGHT 
-    #define POINTING_DEVICE_INVERT_X
-    #define POINTING_DEVICE_INVERT_Y
-#endif
-
diff --git a/keyboards/draculad/keymaps/pimoroni/keymap.c b/keyboards/draculad/keymaps/pimoroni/keymap.c
deleted file mode 100644
index f074a9d353d..00000000000
--- a/keyboards/draculad/keymaps/pimoroni/keymap.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-Copyright 2021 @mangoiv
-
-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_number {
-  _BASE,
-  _NUM,
-  _SYMB,
-  _MUS,
-  _ADJ
-};
-
-enum custom_keycodes {
-  BALL_HUI = SAFE_RANGE, //cycles hue
-  BALL_WHT,              //cycles white
-  BALL_DEC,              //decreased color
-  BALL_SCR,              //scrolls
-  BALL_NCL,              //left click
-  BALL_RCL,              //right click
-  BALL_MCL,              //middle click
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] =  LAYOUT(
-        KC_Q,         KC_W,    KC_E,    KC_R,    KC_T,                                         KC_Y,            KC_U,             KC_I,    KC_O,    KC_P,
-        KC_A,         KC_S,    KC_D,    KC_F,    KC_G,                                         KC_H,            KC_J,             KC_K,    KC_L,    KC_SCLN,
-        LSFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,                                         KC_N,            KC_M,             KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),
-                                                 KC_MUTE,                                      TG(_ADJ),
-                                        KC_LCTL, LALT_T(KC_BSPC), LT(_MUS,KC_SPC),    KC_NO,   LT(_NUM,KC_ENT), LT(_SYMB,KC_DEL)
-    ),
-    [_NUM] = LAYOUT(
-        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-        KC_TAB,  KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                      KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
-        KC_LSFT, XXXXXXX, KC_MPRV, KC_MNXT, QK_BOOT,                      KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_RSFT,
-                                            XXXXXXX,                      KC_NO,
-                                   KC_LCTL, KC_LALT, XXXXXXX,    KC_NO,   _______, KC_ENT
-    ),
-    [_SYMB] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,                        XXXXXXX, XXXXXXX, XXXXXXX, KC_EQL,  KC_MINS,
-        XXXXXXX, KC_F5,   KC_F6,   KC_F7,   KC_F8,                        KC_LBRC, KC_RBRC, XXXXXXX, KC_GRV,  KC_BSLS,
-        KC_LSFT, KC_F9,   KC_F10,  KC_F11,  KC_F12,                       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
-                                            XXXXXXX,                      KC_NO,
-                                   KC_LALT, XXXXXXX, XXXXXXX,    XXXXXXX, KC_NO,   _______
-    ),
-    [_MUS] = LAYOUT(
-        KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_LALT, KC_BTN3, KC_BTN2, KC_BTN1, BALL_SCR,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                            XXXXXXX,                       XXXXXXX,
-                                   XXXXXXX, XXXXXXX,  XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    [_ADJ] = LAYOUT(
-        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      BALL_HUI, BALL_WHT, BALL_DEC, XXXXXXX, XXXXXXX,
-        EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI, RGB_TOG,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      RGB_RMOD, RGB_HUD,  RGB_SAD,  RGB_VAD, _______,
-                                            XXXXXXX,                      _______,
-                                   XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,  XXXXXXX
-    )
-};
-
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-
- if (is_keyboard_master()) {
-    if(is_keyboard_left()){
-      return OLED_ROTATION_270;
-      }
-      else {
-        return OLED_ROTATION_90;
-      }
-    } else {
-	    return OLED_ROTATION_0;
-    }
-}
-static void render_logo(void) {
-  static const char PROGMEM drac_logo[] = {
-    // drac_logo, 128x64px
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x80, 0x80, 0x80, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x0c, 0x18, 0x78, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0,
-    0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x07, 0x3e, 0xfc, 0xf0, 0x00, 0x00, 0x00,
-    0xf0, 0xf0, 0x60, 0x30, 0x30, 0x30, 0x00, 0x00, 0xe0, 0xe0, 0x30, 0x30, 0x30, 0x30, 0x30, 0xe0,
-    0xe0, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x70, 0x30, 0x30, 0x30, 0x70, 0xe0, 0xc0, 0x00, 0x00,
-    0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0,
-    0x80, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xf0, 0x80, 0xc0, 0xe0, 0xf0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3f, 0xff, 0xff,
-    0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0x7c, 0x3f, 0x0f, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf8, 0xcc, 0x8c, 0x84, 0x86, 0x86, 0xc6, 0xff,
-    0xff, 0x80, 0x80, 0x00, 0x3f, 0x7f, 0xe0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0xf0, 0x71, 0x00, 0x00,
-    0x1f, 0xff, 0xff, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x03, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x1f,
-    0x7f, 0x7f, 0x3e, 0x3e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf8, 0xfc,
-    0xfc, 0xfe, 0xfe, 0x7e, 0x7c, 0x78, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
-    0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x60, 0x60,
-    0x60, 0x60, 0x60, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0x60, 0x60, 0x60, 0xc0,
-    0xc0, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07,
-    0x0f, 0x3e, 0x7c, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8,
-    0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf1, 0x99, 0x18, 0x08,
-    0x0c, 0x0c, 0x8c, 0xff, 0xff, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xc1, 0x80, 0x00, 0x00, 0x00, 0x80,
-    0xc3, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f,
-    0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03,
-    0x03, 0x03, 0x01, 0x01, 0x03, 0x03, 0x03, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x01,
-    0x01, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
-  oled_write_raw_P(drac_logo, sizeof(drac_logo));
-}
-
-static void render_status(void) {
-    oled_write_P(PSTR("This is\n~~~~~~~~~\nDracu\nLad\n~~~~~~~~~\nv1.0\n~~~~~~~~~\n"), false);
-    uint8_t n = get_current_wpm();
-    char    wpm_counter[4];
-    wpm_counter[3] = '\0';
-    wpm_counter[2] = '0' + n % 10;
-    wpm_counter[1] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
-    wpm_counter[0] = n / 10 ? '0' + n / 10 : ' ';
-    oled_write_P(PSTR("WPM:"), false);
-    oled_write(wpm_counter, false);
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(PSTR("\nCaps: "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("on ") : PSTR("off"), false);
-    oled_write_P(PSTR("\n"), false);
-    switch (get_highest_layer(layer_state)) {
-        case _BASE:
-            oled_write_P(PSTR("Base   "), false);
-            break;
-        case _NUM:
-            oled_write_P(PSTR("Numbers"), false);
-            break;
-        case _SYMB:
-            oled_write_P(PSTR("Symbols"), false);
-            break;
-        case _ADJ:
-            oled_write_P(PSTR("Adjust "), false);
-            break;
-        case _MUS:
-            oled_write_P(PSTR("Mouse  "), false);
-            break;
-        default:
-            oled_write_P(PSTR("Unkn "), false);
-            break;
-    }
-}
-
-bool oled_task_user(void) {
-      if (is_keyboard_master()) {
-        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_logo();
-    }
-    return false;
-}
-
-#endif //OLED_ENABLE
-
-uint8_t white = 0;
-uint8_t red = 255;
-uint8_t green = 0;
-uint8_t blue = 0;
-
-bool set_scrolling = false;
-report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
-    if (set_scrolling) {
-        mouse_report.h = mouse_report.x;
-        mouse_report.v = mouse_report.y;
-        mouse_report.x = mouse_report.y = 0; 
-    }
-    return mouse_report;
-}
-
-void ball_increase_hue(void){
-      if(red!=255&&green!=255&&blue!=255){
-        red =255;
-      }
-      if (red==255&&green<255&&blue==0){
-       green += 15;
-      } else if(green==255&&blue==0&&red>0){
-        red-=15;
-      } else if(red==0&&blue<255&&green==255){
-        blue+=15;
-      } else if(blue==255&&green>0&&red==0){
-        green -= 15;
-      } else if(green == 0&&blue==255&&red<255){
-        red +=15;
-      } else if(green ==0&&blue>0&&red==255){
-        blue -=15;
-      }
-      pimoroni_trackball_set_rgbw(red,green,blue,white);
-}
-
-void decrease_color(void){
-  if (green>0){
-    green-=15;
-  }
-  if (red>0){
-    red-=15;
-  }
-  if (blue>0){
-    blue-=15;
-  }
-  pimoroni_trackball_set_rgbw(red,green,blue,white);
-}
-
-void cycle_white(void){
-  if (white<255){
-    white +=15;
-  } else{
-    white=0;
-  }
-  pimoroni_trackball_set_rgbw(red,green,blue,white);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record){
-  switch (keycode){
-  case  BALL_HUI:
-    if(record->event.pressed){
-      ball_increase_hue();
-    }
-    break;
-
-  case BALL_WHT:
-    if(record-> event.pressed){
-      cycle_white();
-    }
-    break;
-
-  case BALL_DEC:
-   if(record-> event.pressed){
-      decrease_color();
-    }
-    break;
-
-  case BALL_SCR:
-   if(record->event.pressed){
-     set_scrolling = true;
-   } else{
-     set_scrolling = false;
-   }
-   break;
-
-  case BALL_NCL:
-     record->event.pressed?register_code(KC_BTN1):unregister_code(KC_BTN1);
-     break;
-  case BALL_RCL:
-      record->event.pressed?register_code(KC_BTN2):unregister_code(KC_BTN2);
-      break;
-  case BALL_MCL:
-      record->event.pressed?register_code(KC_BTN3):unregister_code(KC_BTN3);
-      break;
-  }
-  return true;
-}
-
-#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 == 2) {
-      switch (get_highest_layer(layer_state)) {
-        case _ADJ:
-            clockwise?ball_increase_hue():cycle_white();
-            break;
-        case _MUS:
-            clockwise?tap_code(KC_WH_U):tap_code(KC_WH_D);
-            break;
-        default:
-            clockwise?tap_code(KC_PGUP):tap_code(KC_PGDN);
-            break;
-      }
-    }
-    // I only have 2 encoders on the the pimoroni example board, just add else ifs for your other encoders...
-    // the missing ones are encoder 1 on the right side and encoder 3 on the left side
-    return true;
-}
-#endif // ENCODER_ENABLE
diff --git a/keyboards/draculad/keymaps/pimoroni/rules.mk b/keyboards/draculad/keymaps/pimoroni/rules.mk
deleted file mode 100644
index 72ace5a3df1..00000000000
--- a/keyboards/draculad/keymaps/pimoroni/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# only uncomment on the side you have your trackball on
-POINTING_DEVICE_ENABLE = yes
-POINTING_DEVICE_DRIVER = pimoroni_trackball
-OLED_ENABLE = yes
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/drhigsby/ogurec/keymaps/dack/config.h b/keyboards/drhigsby/ogurec/keymaps/dack/config.h
deleted file mode 100644
index cadd53a9712..00000000000
--- a/keyboards/drhigsby/ogurec/keymaps/dack/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * 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_TERM 230
-#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c b/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c
deleted file mode 100644
index 1f1edae03a5..00000000000
--- a/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * 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 custom_layers {
-    _BASE,
-    _CLOSE,
-    _FAR,
-    _FUNKY,
-};
-#define CLS_SPC LT(_CLOSE, KC_SPC)
-#define FAR_F LT(_FAR, KC_F)
-#define FNK_D LT(_FUNKY, KC_D)
-#define SFT_Z LSFT_T(KC_Z)
-#define SFT_ENT RSFT_T(KC_ENT)
-#define CTL_X LCTL_T(KC_X)
-#define CTL_DOT RCTL_T(KC_DOT)
-#define WIN_C LWIN_T(KC_C)
-#define WIN_COMM RWIN_T(KC_COMM)
-#define ALT_V LALT_T(KC_V)
-#define ALT_M LALT_T(KC_M)
-#define COPY LCTL(KC_C)
-#define PASTE LCTL(KC_V)
-#define CUT LCTL(KC_X)
-#define UNDO LCTL(KC_Z)
-#define RUS_TGL RALT(KC_LSFT)
-#define LOCK LWIN(KC_L)
-#define vvv KC_TRNS
-
-enum custom_keycodes {
-    TYPEDON = SAFE_RANGE
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-        case TYPEDON:
-            SEND_STRING("[typed on an ogurec]");
-            return false;
-        }
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_ortho_3x12(
-        KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P,
-        KC_A, KC_S, FNK_D, FAR_F, KC_G, KC_GRAVE, KC_SCLN, KC_H, KC_J, KC_K, KC_L, KC_QUOT,
-        SFT_Z, CTL_X, WIN_C, ALT_V, KC_B, KC_BSPC, CLS_SPC, KC_N, ALT_M, WIN_COMM, CTL_DOT, SFT_ENT
-  ),
-
-    [_CLOSE] = LAYOUT_ortho_3x12(
-        KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,       KC_8,     KC_9,    KC_0,
-        KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, KC_CIRC, KC_AMPR,    KC_ASTR,  KC_LPRN, KC_RPRN,
-        KC_MINUS, KC_UNDS, KC_EQL,  KC_PLUS, _______, _______, vvv,     _______, KC_SCLN,    KC_COLON, KC_SLSH, KC_QUES
-  ),
-
-    [_FAR] = LAYOUT_ortho_3x12(
-        KC_ESC,  TYPEDON, KC_BSLS, RUS_TGL,_______,  _______,  _______,  KC_PGUP,   KC_HOME,    KC_UP,    KC_END,    KC_INS,
-        KC_CAPS, KC_TAB,  KC_PIPE, vvv,    LOCK,     _______,  _______,  KC_PGDN,   KC_LEFT,    KC_DOWN,  KC_RIGHT,  KC_DEL,
-        UNDO,    CUT,     COPY,    PASTE,  KC_LBRC,  KC_RBRC,  KC_LCBR,  KC_RCBR,   _______,    _______,  _______,   _______
-  ),
-    [_FUNKY] = LAYOUT_ortho_3x12(
-        KC_F1,    KC_F2,    KC_F3,   KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-        _______,  _______,  vvv,     _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______, _______,  _______,  KC_VOLD, KC_VOLU,  _______,  _______,  _______,  _______,  _______
-  )
-
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-    case FAR_F:
-        return TAPPING_TERM - 50;
-    case CLS_SPC:
-        return TAPPING_TERM - 50;
-    case SFT_Z:
-        return TAPPING_TERM - 80;
-    case SFT_ENT:
-        return TAPPING_TERM - 75;
-    default:
-        return TAPPING_TERM;
-    }
-}
diff --git a/keyboards/drhigsby/ogurec/keymaps/dack/readme.md b/keyboards/drhigsby/ogurec/keymaps/dack/readme.md
deleted file mode 100644
index adffe1797f2..00000000000
--- a/keyboards/drhigsby/ogurec/keymaps/dack/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dack's Ogurec Keymap
-
-This is Dack's personal ogurec keymap and it is for left-sided PM placement
diff --git a/keyboards/drhigsby/packrat/keymaps/3uc/config.h b/keyboards/drhigsby/packrat/keymaps/3uc/config.h
deleted file mode 100644
index 5d9acf020f4..00000000000
--- a/keyboards/drhigsby/packrat/keymaps/3uc/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * 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 COMBO_TERM 40
diff --git a/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c b/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c
deleted file mode 100644
index 110d76f2cd7..00000000000
--- a/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2021 drhigsby
- *
- * 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{
-  _BASE,
-  _CODE,
-  _MATH,
-  _FUNC
-};
-
-enum combo_events {
-  combo_ESC,
-  combo_BACK,
-  combo_TAB,
-  combo_DELETE,
-  combo_ENTER,
-  combo_LPRN,
-  combo_RPRN,
-};
-
-const uint16_t PROGMEM esc_combo[] = {KC_Q, KC_W, COMBO_END};
-const uint16_t PROGMEM bspc_combo[] = {KC_O, KC_P, COMBO_END};
-const uint16_t PROGMEM tab_combo[] = {KC_A, KC_S, COMBO_END};
-const uint16_t PROGMEM del_combo[] = {KC_I, KC_O, COMBO_END};
-const uint16_t PROGMEM enter_combo[] = {KC_L, KC_SCLN, COMBO_END};
-const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END};
-const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END};
-
-
-combo_t key_combos[] = {
-  [combo_ESC] = COMBO(esc_combo, KC_ESC),
-  [combo_BACK] = COMBO(bspc_combo, KC_BSPC),
-  [combo_TAB] = COMBO(tab_combo, KC_TAB),
-  [combo_DELETE] = COMBO(del_combo, KC_DEL),
-  [combo_ENTER] = COMBO(enter_combo, KC_ENT),
-  [combo_LPRN] = COMBO(lprn_combo, KC_LPRN),
-  [combo_RPRN] = COMBO(rprn_combo, KC_RPRN),
-};
-
-#define BASE TO(_BASE)
-#define CODE MO(_CODE)
-#define MATH TG(_MATH)
-#define FUNC MO(_FUNC)
-#define xxx KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_3uc(
-        KC_Q, KC_W, KC_E, KC_R, KC_T,               MATH,          KC_Y, KC_U, KC_I, KC_O, KC_P,
-        KC_A, KC_S, KC_D, KC_F, KC_G,               KC_HOME,       KC_H, KC_J, KC_K, KC_L, KC_SCLN,
-        LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B,       KC_END,        KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
-              KC_LALT, KC_LCTL, CODE,               KC_SPC,        CODE, KC_RGUI, FUNC
-  ),
-
-    [_CODE] = LAYOUT_3uc(
-        KC_1, KC_2, KC_3, KC_4, KC_5,               xxx,           KC_6, KC_7, KC_8, KC_9, KC_0,
-        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,   KC_PGUP,       KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,
-        KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, xxx,      KC_PGDN,       xxx, KC_PIPE, KC_BSLS, KC_DQUO, KC_QUOT,
-                      xxx, xxx, xxx,                xxx,           xxx, KC_PGUP, KC_PGDN
-  ),
-
-    [_MATH] = LAYOUT_3uc(
-        xxx, xxx, xxx, xxx, xxx,                    BASE,           xxx, KC_P7, KC_P8, KC_P9, KC_PPLS,
-        xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, KC_P4, KC_P5, KC_P6, KC_PCMM,
-        xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, KC_P1, KC_P2, KC_P3, KC_PEQL,
-                  xxx, xxx, xxx,                    xxx,           KC_P0, KC_PDOT, KC_PENT
-
-  ),
-
-    [_FUNC] = LAYOUT_3uc(
-        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,          xxx,           KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
-        xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx, KC_F11, KC_F12,
-        xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx, xxx, xxx,
-                  xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx
-  )
-
-};
diff --git a/keyboards/drhigsby/packrat/keymaps/3uc/readme.md b/keyboards/drhigsby/packrat/keymaps/3uc/readme.md
deleted file mode 100644
index 603f82a812a..00000000000
--- a/keyboards/drhigsby/packrat/keymaps/3uc/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Centered 3uC Packrat Keymap
diff --git a/keyboards/drop/alt/v2/v2.c b/keyboards/drop/alt/v2/v2.c
index fcdad7f2df9..49ed4bfc998 100644
--- a/keyboards/drop/alt/v2/v2.c
+++ b/keyboards/drop/alt/v2/v2.c
@@ -3,112 +3,112 @@
 #ifdef RGB_MATRIX_ENABLE
 #    include "rgb_matrix.h"
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-     { 1, B_2, A_2, C_2 },
-     { 1, E_3, D_3, F_3 },
-     { 1, E_4, D_4, F_4 },
-     { 1, E_5, D_5, F_5 },
-     { 1, E_6, D_6, F_6 },
-     { 1, E_7, D_7, F_7 },
-     { 1, E_8, D_8, F_8 },
-     { 1, B_13, A_13, C_13 },
-     { 0, E_1, D_1, F_1 },
-     { 0, E_2, D_2, F_2 },
-     { 0, E_3, D_3, F_3 },
-     { 0, E_4, D_4, F_4 },
-     { 0, E_5, D_5, F_5 },
-     { 0, E_6, D_6, F_6 },
-     { 0, B_7, A_7, C_7 },
-     { 1, E_2, D_2, F_2 },
-     { 1, H_3, G_3, I_3 },
-     { 1, H_4, G_4, I_4 },
-     { 1, H_5, G_5, I_5 },
-     { 1, H_6, G_6, I_6 },
-     { 1, H_7, G_7, I_7 },
-     { 1, H_8, G_8, I_8 },
-     { 0, H_1, G_1, I_1 },
-     { 0, H_2, G_2, I_2 },
-     { 0, H_3, G_3, I_3 },
-     { 0, H_4, G_4, I_4 },
-     { 0, H_5, G_5, I_5 },
-     { 0, K_11, J_11, L_11 },
-     { 0, H_6, G_6, I_6 },
-     { 0, E_7, D_7, F_7 },
-     { 1, H_2, G_2, I_2 },
-     { 1, K_3, J_3, L_3 },
-     { 1, K_4, J_4, L_4 },
-     { 1, K_5, J_5, L_5 },
-     { 1, K_6, J_6, L_6 },
-     { 1, K_7, J_7, L_7 },
-     { 1, K_8, J_8, L_8 },
-     { 0, K_1, J_1, L_1 },
-     { 0, K_2, J_2, L_2 },
-     { 0, K_3, J_3, L_3 },
-     { 0, K_4, J_4, L_4 },
-     { 0, K_5, J_5, L_5 },
-     { 0, K_6, J_6, L_6 },
-     { 0, H_7, G_7, I_7 },
-     { 1, K_2, J_2, L_2 },
-     { 1, E_9, D_9, F_9 },
-     { 1, B_9, A_9, C_9 },
-     { 1, K_9, J_9, L_9 },
-     { 1, H_9, G_9, I_9 },
-     { 1, K_12, J_12, L_12 },
-     { 1, K_13, J_13, L_13 },
-     { 0, K_9, J_9, L_9 },
-     { 0, K_10, J_10, L_10 },
-     { 0, H_10, G_10, I_10 },
-     { 0, H_11, G_11, I_11 },
-     { 0, B_11, A_11, C_11 },
-     { 0, E_11, D_11, F_11 },
-     { 0, K_7, J_7, L_7 },
-     { 1, H_10, G_10, I_10 },
-     { 1, E_10, D_10, F_10 },
-     { 1, B_10, A_10, C_10 },
-     { 1, H_12, G_12, I_12 },
-     { 0, E_10, D_10, F_10 },
-     { 0, B_10, A_10, C_10 },
-     { 0, B_12, A_12, C_12 },
-     { 0, H_12, G_12, I_12 },
-     { 0, E_12, D_12, F_12 },
-     { 1, K_11, J_11, L_11 },
-     { 1, H_11, G_11, I_11 },
-     { 1, E_11, D_11, F_11 },
-     { 1, B_11, A_11, C_11 },
-     { 1, B_12, A_12, C_12 },
-     { 1, E_12, D_12, F_12 },
-     { 1, E_13, D_13, F_13 },
-     { 1, H_13, G_13, I_13 },
-     { 0, H_9, G_9, I_9 },
-     { 0, E_9, D_9, F_9 },
-     { 0, B_9, A_9, C_9 },
-     { 0, B_13, A_13, C_13 },
-     { 0, H_13, G_13, I_13 },
-     { 0, E_13, D_13, F_13 },
-     { 0, K_13, J_13, L_13 },
-     { 0, K_12, J_12, L_12 },
-     { 0, K_8, J_8, L_8 },
-     { 0, H_8, G_8, I_8 },
-     { 0, E_8, D_8, F_8 },
-     { 0, B_8, A_8, C_8 },
-     { 0, B_6, A_6, C_6 },
-     { 0, B_5, A_5, C_5 },
-     { 0, B_4, A_4, C_4 },
-     { 0, B_3, A_3, C_3 },
-     { 0, B_2, A_2, C_2 },
-     { 0, B_1, A_1, C_1 },
-     { 0, B_14, A_14, C_14 },
-     { 1, B_8, A_8, C_8 },
-     { 1, B_7, A_7, C_7 },
-     { 1, B_6, A_6, C_6 },
-     { 1, B_5, A_5, C_5 },
-     { 1, B_4, A_4, C_4 },
-     { 1, B_3, A_3, C_3 },
-     { 1, B_1, A_1, C_1 },
-     { 1, E_1, D_1, F_1 },
-     { 1, H_1, G_1, I_1 },
-     { 1, K_1, J_1, L_1 },
-     { 1, K_10, J_10, L_10 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+     { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+     { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+     { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+     { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+     { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+     { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+     { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
 };
 
 #endif
diff --git a/keyboards/drop/cstm65/cstm65.c b/keyboards/drop/cstm65/cstm65.c
index ccb86f1d3e9..dff7008f593 100644
--- a/keyboards/drop/cstm65/cstm65.c
+++ b/keyboards/drop/cstm65/cstm65.c
@@ -3,77 +3,77 @@
 #ifdef RGB_MATRIX_ENABLE
 #    include "rgb_matrix.h"
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, B_1,  A_1,  C_1  },
-    { 0, B_2,  A_2,  C_2  },
-    { 0, B_3,  A_3,  C_3  },
-    { 0, B_4,  A_4,  C_4  },
-    { 0, B_5,  A_5,  C_5  },
-    { 0, B_6,  A_6,  C_6  },
-    { 0, B_7,  A_7,  C_7  },
-    { 0, B_8,  A_8,  C_8  },
-    { 0, B_9,  A_9,  C_9  },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_15, A_15, C_15 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
 
-    { 0, E_1,  D_1,  F_1  },
-    { 0, E_2,  D_2,  F_2  },
-    { 0, E_3,  D_3,  F_3  },
-    { 0, E_4,  D_4,  F_4  },
-    { 0, E_5,  D_5,  F_5  },
-    { 0, E_6,  D_6,  F_6  },
-    { 0, E_7,  D_7,  F_7  },
-    { 0, E_8,  D_8,  F_8  },
-    { 0, E_9,  D_9,  F_9  },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
 
-    { 1, B_1,  A_1,  C_1  },
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, B_12, A_12, C_12 },
-    { 1, B_13, A_13, C_13 },
-    { 1, B_14, A_14, C_14 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
 
-    { 1, E_1,  D_1,  F_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, E_14, D_14, F_14 },
+    { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
 
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10  },
-    { 1, H_11, G_11, I_11  },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10  },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11  },
 };
 #endif
diff --git a/keyboards/drop/cstm80/cstm80.c b/keyboards/drop/cstm80/cstm80.c
index 75e7049c200..6350f3a32d6 100644
--- a/keyboards/drop/cstm80/cstm80.c
+++ b/keyboards/drop/cstm80/cstm80.c
@@ -3,94 +3,94 @@
 #ifdef RGB_MATRIX_ENABLE
 #    include "rgb_matrix.h"
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, E_1,  D_1,  F_1  },
-    { 0, E_2,  D_2,  F_2  },
-    { 0, E_3,  D_3,  F_3  },
-    { 0, E_4,  D_4,  F_4  },
-    { 0, E_5,  D_5,  F_5  },
-    { 0, E_6,  D_6,  F_6  },
-    { 0, E_7,  D_7,  F_7  },
-    { 0, E_8,  D_8,  F_8  },
-    { 0, E_9,  D_9,  F_9  },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_1,  G_1,  I_1  },
-    { 0, H_2,  G_2,  I_2  },
-    { 0, H_3,  G_3,  I_3  },
-    { 0, H_4,  G_4,  I_4  },
-    { 0, H_5,  G_5,  I_5  },
-    { 0, H_6,  G_6,  I_6  },
-    { 0, H_7,  G_7,  I_7  },
-    { 0, H_8,  G_8,  I_8  },
-    { 0, H_9,  G_9,  I_9  },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_1,  J_1,  L_1  },
-    { 0, K_2,  J_2,  L_2  },
-    { 0, K_3,  J_3,  L_3  },
-    { 0, K_4,  J_4,  L_4  },
-    { 0, K_5,  J_5,  L_5  },
-    { 0, K_6,  J_6,  L_6  },
-    { 0, K_7,  J_7,  L_7  },
-    { 0, K_8,  J_8,  L_8  },
-    { 0, K_9,  J_9,  L_9  },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
-    { 1, B_1,  A_1,  C_1  },
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, B_12, A_12, C_12 },
-    { 1, B_13, A_13, C_13 },
-    { 1, B_14, A_14, C_14 },
-    { 1, B_15, A_15, C_15 },
-    { 1, B_16, A_16, C_16 },
-    { 1, E_1,  D_1,  F_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_6,  G_6,  I_6  },
-    { 1, H_7,  G_7,  I_7  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10 },
-    { 1, H_11, G_11, I_11 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
 };
 #endif
diff --git a/keyboards/drop/ctrl/v2/v2.c b/keyboards/drop/ctrl/v2/v2.c
index 6b565efbe1b..81689dc78af 100644
--- a/keyboards/drop/ctrl/v2/v2.c
+++ b/keyboards/drop/ctrl/v2/v2.c
@@ -3,126 +3,126 @@
 #ifdef RGB_MATRIX_ENABLE
 #    include "rgb_matrix.h"
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-     { 1, B_2, A_2, C_2 },
-     { 1, E_3, D_3, F_3 },
-     { 1, E_4, D_4, F_4 },
-     { 1, E_5, D_5, F_5 },
-     { 1, B_6, A_6, C_6 },
-     { 1, E_7, D_7, F_7 },
-     { 1, E_8, D_8, F_8 },
-     { 0, E_1, D_1, F_1 },
-     { 0, E_2, D_2, F_2 },
-     { 0, E_3, D_3, F_3 },
-     { 0, E_4, D_4, F_4 },
-     { 0, E_5, D_5, F_5 },
-     { 0, E_6, D_6, F_6 },
-     { 0, E_7, D_7, F_7 },
-     { 0, E_8, D_8, F_8 },
-     { 0, E_9, D_9, F_9 },
-     { 1, H_1, G_1, I_1 },
-     { 1, H_2, G_2, I_2 },
-     { 1, H_3, G_3, I_3 },
-     { 1, H_4, G_4, I_4 },
-     { 1, H_5, G_5, I_5 },
-     { 1, H_6, G_6, I_6 },
-     { 1, H_7, G_7, I_7 },
-     { 1, H_8, G_8, I_8 },
-     { 0, H_1, G_1, I_1 },
-     { 0, H_2, G_2, I_2 },
-     { 0, H_3, G_3, I_3 },
-     { 0, H_4, G_4, I_4 },
-     { 0, H_5, G_5, I_5 },
-     { 0, H_6, G_6, I_6 },
-     { 0, H_7, G_7, I_7 },
-     { 0, H_8, G_8, I_8 },
-     { 0, H_9, G_9, I_9 },
-     { 1, K_1, J_1, L_1 },
-     { 1, K_2, J_2, L_2 },
-     { 1, K_3, J_3, L_3 },
-     { 1, K_4, J_4, L_4 },
-     { 1, K_5, J_5, L_5 },
-     { 1, K_6, J_6, L_6 },
-     { 1, K_7, J_7, L_7 },
-     { 1, K_8, J_8, L_8 },
-     { 0, K_1, J_1, L_1 },
-     { 0, K_2, J_2, L_2 },
-     { 0, K_3, J_3, L_3 },
-     { 0, K_4, J_4, L_4 },
-     { 0, K_5, J_5, L_5 },
-     { 0, K_6, J_6, L_6 },
-     { 0, K_7, J_7, L_7 },
-     { 0, K_8, J_8, L_8 },
-     { 0, K_9, J_9, L_9 },
-     { 1, E_1, D_1, F_1 },
-     { 1, E_2, D_2, F_2 },
-     { 1, K_13, J_13, L_13 },
-     { 1, K_12, J_12, L_12 },
-     { 1, K_11, J_11, L_11 },
-     { 1, E_6, D_6, F_6 },
-     { 1, K_10, J_10, L_10 },
-     { 1, K_9, J_9, L_9 },
-     { 0, K_16, J_16, L_16 },
-     { 0, K_15, J_15, L_15 },
-     { 0, K_14, J_14, L_14 },
-     { 0, K_13, J_13, L_13 },
-     { 0, K_12, J_12, L_12 },
-     { 1, E_14, D_14, F_14 },
-     { 1, E_13, D_13, F_13 },
-     { 1, H_12, G_12, I_12 },
-     { 1, E_12, D_12, F_12 },
-     { 1, E_11, D_11, F_11 },
-     { 1, E_10, D_10, F_10 },
-     { 1, E_9, D_9, F_9 },
-     { 1, H_9, G_9, I_9 },
-     { 0, H_16, G_16, I_16 },
-     { 0, H_15, G_15, I_15 },
-     { 0, H_14, G_14, I_14 },
-     { 0, H_13, G_13, I_13 },
-     { 0, H_11, G_11, I_11 },
-     { 1, K_14, J_14, L_14 },
-     { 1, H_14, G_14, I_14 },
-     { 1, H_13, G_13, I_13 },
-     { 1, H_10, G_10, I_10 },
-     { 0, E_16, D_16, F_16 },
-     { 0, E_15, D_15, F_15 },
-     { 0, E_14, D_14, F_14 },
-     { 0, E_13, D_13, F_13 },
-     { 0, H_12, G_12, I_12 },
-     { 0, E_12, D_12, F_12 },
-     { 0, E_11, D_11, F_11 },
-     { 0, B_11, A_11, C_11 },
-     { 0, B_12, A_12, C_12 },
-     { 0, B_13, A_13, C_13 },
-     { 0, B_14, A_14, C_14 },
-     { 0, B_15, A_15, C_15 },
-     { 0, B_16, A_16, C_16 },
-     { 1, B_9, A_9, C_9 },
-     { 1, B_10, A_10, C_10 },
-     { 1, B_11, A_11, C_11 },
-     { 1, B_12, A_12, C_12 },
-     { 1, B_13, A_13, C_13 },
-     { 1, B_14, A_14, C_14 },
-     { 1, B_15, A_15, C_15 },
-     { 1, K_15, J_15, L_15 },
-     { 1, E_15, D_15, F_15 },
-     { 1, H_15, G_15, I_15 },
-     { 1, B_1, A_1, C_1 },
-     { 1, B_3, A_3, C_3 },
-     { 1, B_4, A_4, C_4 },
-     { 1, B_5, A_5, C_5 },
-     { 1, B_7, A_7, C_7 },
-     { 1, B_8, A_8, C_8 },
-     { 0, B_1, A_1, C_1 },
-     { 0, B_2, A_2, C_2 },
-     { 0, B_3, A_3, C_3 },
-     { 0, B_5, A_5, C_5 },
-     { 0, B_6, A_6, C_6 },
-     { 0, B_8, A_8, C_8 },
-     { 0, B_10, A_10, C_10 },
-     { 0, H_10, G_10, I_10 },
-     { 0, K_10, J_10, L_10 },
-     { 0, E_10, D_10, F_10 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+     { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+     { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+     { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+     { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+     { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 1, SW11_CS14, SW10_CS14, SW12_CS14 },
+     { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+     { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+     { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 1, SW11_CS15, SW10_CS15, SW12_CS15 },
+     { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+     { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+     { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
 };
 
 #endif
diff --git a/keyboards/drop/sense75/sense75.c b/keyboards/drop/sense75/sense75.c
index 057e3107489..1130cf12790 100644
--- a/keyboards/drop/sense75/sense75.c
+++ b/keyboards/drop/sense75/sense75.c
@@ -3,133 +3,133 @@
 #ifdef RGB_MATRIX_ENABLE
 #    include "rgb_matrix.h"
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 // top underglow sd2-sd17
-    { 0, B_2,  A_2,  C_2  },
-    { 0, B_3,  A_3,  C_3  },
-    { 0, B_5,  A_5,  C_5  },
-    { 0, B_6,  A_6,  C_6  },
-    { 0, B_7,  A_7,  C_7  },
-    { 0, B_9,  A_9,  C_9  },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_16, A_16, C_16 },
-    { 1, B_12, A_12, C_12 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
 
 // sd1 + function + sd18
-    { 0, B_1,  A_1,  C_1  },
-    { 0, E_2,  D_2,  F_2  },
-    { 0, E_3,  D_3,  F_3  },
-    { 0, E_4,  D_4,  F_4  },
-    { 0, E_5,  D_5,  F_5  },
-    { 0, E_6,  D_6,  F_6  },
-    { 0, E_7,  D_7,  F_7  },
-    { 0, E_8,  D_8,  F_8  },
-    { 0, E_9,  D_9,  F_9  },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
     // <enc gap>
-    { 1, B_13, A_13, C_13 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
 
 // sd45 + num + sd20
-    { 0, H_1,  G_1,  I_1  },
-    { 0, H_2,  G_2,  I_2  },
-    { 0, H_3,  G_3,  I_3  },
-    { 0, H_4,  G_4,  I_4  },
-    { 0, H_5,  G_5,  I_5  },
-    { 0, H_6,  G_6,  I_6  },
-    { 0, H_7,  G_7,  I_7  },
-    { 0, H_8,  G_8,  I_8  },
-    { 0, H_9,  G_9,  I_9  },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_16, G_16, I_16 },
-    { 1, B_15, A_15, C_15 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
 
 // 44+ qwer 21
-    { 0, K_1,  J_1,  L_1  },
-    { 0, K_2,  J_2,  L_2  },
-    { 0, K_3,  J_3,  L_3  },
-    { 0, K_4,  J_4,  L_4  },
-    { 0, K_5,  J_5,  L_5  },
-    { 0, K_6,  J_6,  L_6  },
-    { 0, K_7,  J_7,  L_7  },
-    { 0, K_8,  J_8,  L_8  },
-    { 0, K_9,  J_9,  L_9  },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
-    { 1, B_16, A_16, C_16 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
 
 // asdf
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, E_14, D_14, F_14 },
-    { 1, H_15, G_15, I_15 },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
 
 // 43 + zxcv + 22
-    { 1, B_1,  A_1,  C_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, H_12, G_12, I_12 },
-    { 1, H_13, G_13, I_13 },
-    { 1, H_14, G_14, I_14 },
-    { 1, E_15, D_15, F_15 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
 
 // 41 + mods + 23
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_6,  G_6,  I_6  },
-    { 1, H_7,  G_7,  I_7  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10 },
-    { 1, H_11, G_11, I_11 },
-    { 1, E_16, D_16, F_16 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 1, SW5_CS16, SW4_CS16, SW6_CS16 },
 
 // bottom underglow 24 - 39
-    { 1, K_2,  J_2,  L_2  },
-    { 1, K_3,  J_3,  L_3  },
-    { 1, K_4,  J_4,  L_4  },
-    { 1, K_6,  J_6,  L_6  },
-    { 1, K_10, J_10, L_10 },
-    { 1, K_13, J_13, L_13 },
-    { 1, K_15, J_15, L_15 },
-    { 1, H_16, G_16, I_16 }
+    { 1, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 1, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 1, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 1, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 1, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 1, SW8_CS16, SW7_CS16, SW9_CS16 }
 };
 #endif
diff --git a/keyboards/drop/shift/v2/v2.c b/keyboards/drop/shift/v2/v2.c
index 8565a0cb269..4715d7b81b5 100644
--- a/keyboards/drop/shift/v2/v2.c
+++ b/keyboards/drop/shift/v2/v2.c
@@ -4,173 +4,173 @@
 #    include "host.h"
 #    include "rgb_matrix.h"
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-     { 0, K_1,  J_1,  L_1  },// LED1
-     { 0, K_2,  J_2,  L_2  },
-     { 0, K_3,  J_3,  L_3  },
-     { 0, K_4,  J_4,  L_4  },
-     { 0, K_5,  J_5,  L_5  },
-     { 0, K_7,  J_7,  L_7  },
-     { 0, K_8,  J_8,  L_8  },
-     { 0, K_9,  J_9,  L_9  },
-     { 0, K_10, J_10, L_10 },// LED9
-     { 1, K_1,  J_1,  L_1  },// LED10
-     { 1, K_2,  J_2,  L_2  },// LED11
-     { 1, K_3,  J_3,  L_3  },// LED12
-     { 1, K_4,  J_4,  L_4  },// LED13
-     { 1, K_9,  J_9,  L_9  },// LED18
-     { 1, K_5,  J_5,  L_5  },// LED15
-     { 1, K_6,  J_6,  L_6  },// LED19
-     { 1, K_7,  J_7,  L_7  },// LED16
-     { 1, K_8,  J_8,  L_8  },// LED20
-     { 0, H_1,  G_1,  I_1  },//start2
-     { 0, H_11, G_11, I_11 },
-     { 0, H_2,  G_2,  I_2  },
-     { 0, H_3,  G_3,  I_3  },
-     { 0, H_4,  G_4,  I_4  },
-     { 0, H_5,  G_5,  I_5  },
-     { 0, H_6,  G_6,  I_6  },
-     { 0, H_7,  G_7,  I_7  },
-     { 0, H_8,  G_8,  I_8  },
-     { 0, H_9,  G_9,  I_9  },
-     { 0, H_10, G_10, I_10 },
-     { 1, E_1,  D_1,  F_1  },
-     { 1, E_2,  D_2,  F_2  },
-     { 1, E_4,  D_4,  F_4  },
-     { 1, E_5,  D_5,  F_5  },
-     { 1, E_6,  D_6,  F_6  },
-     { 1, E_7,  D_7,  F_7  },
-     { 1, E_8,  D_8,  F_8  },
-     { 0, E_1,  D_1,  F_1  },
-     { 0, E_2,  D_2,  F_2  },
-     { 0, E_3,  D_3,  F_3  },
-     { 0, E_4,  D_4,  F_4  },
-     { 0, E_5,  D_5,  F_5  },
-     { 0, E_6,  D_6,  F_6  },
-     { 0, E_7,  D_7,  F_7  },
-     { 0, E_8,  D_8,  F_8  },
-     { 0, E_9,  D_9,  F_9  },
-     { 0, E_10, D_10, F_10 },
-     { 1, B_1,  A_1,  C_1  },
-     { 1, B_2,  A_2,  C_2  },
-     { 1, B_3,  A_3,  C_3  },
-     { 1, B_4,  A_4,  C_4  },
-     { 1, B_5,  A_5,  C_5  },
-     { 1, B_6,  A_6,  C_6  },
-     { 1, B_7,  A_7,  C_7  },
-     { 1, B_8,  A_8,  C_8  },
-     { 0, B_1,  A_1,  C_1  },
-     { 0, B_2,  A_2,  C_2  },
-     { 0, B_3,  A_3,  C_3  },
-     { 0, B_4,  A_4,  C_4  },
-     { 0, B_5,  A_5,  C_5  },
-     { 0, B_6,  A_6,  C_6  },
-     { 0, B_7,  A_7,  C_7  },
-     { 0, B_8,  A_8,  C_8  },
-     { 0, B_9,  A_9,  C_9  },
-     { 0, B_10, A_10, C_10 },
-     { 1, B_9,  A_9,  C_9  },
-     { 1, B_10, A_10, C_10 },
-     { 1, B_11, A_11, C_11 },
-     { 1, B_13, A_13, C_13 },
-     { 1, B_14, A_14, C_14 },
-     { 1, B_15, A_15, C_15 },
-     { 1, B_16, A_16, C_16 },
-     { 0, B_11, A_11, C_11 },
-     { 0, B_12, A_12, C_12 },
-     { 0, B_13, A_13, C_13 },
-     { 0, H_13, G_13, I_13 },
-     { 0, H_14, G_14, I_14 },
-     { 0, B_14, A_14, C_14 },
-     { 0, E_15, D_15, F_15 },
-     { 0, B_15, A_15, C_15 },
-     { 0, B_16, A_16, C_16 },
-     { 1, E_9,  D_9,  F_9  },
-     { 1, E_10, D_10, F_10 },
-     { 1, E_11, D_11, F_11 },
-     { 1, E_12, D_12, F_12 },
-     { 1, E_13, D_13, F_13 },
-     { 1, E_14, D_14, F_14 },
-     { 1, E_15, D_15, F_15 },
-     { 1, H_16, G_16, I_16 },
-     { 0, E_11, D_11, F_11 },//start6
-     { 0, E_12, D_12, F_12 },
-     { 0, E_13, D_13, F_13 },
-     { 0, E_14, D_14, F_14 },
-     { 1, H_9,  G_9,  I_9  },
-     { 1, H_10, G_10, I_10 },
-     { 1, H_11, G_11, I_11 },
-     { 1, H_12, G_12, I_12 },
-     { 1, H_13, G_13, I_13 },
-     { 1, H_14, G_14, I_14 },
-     { 1, H_15, G_15, I_15 },
-     { 2, H_1,  G_1,  I_1  },//start underglow
-     { 2, K_1,  J_1,  L_1  },
-     { 2, B_1,  A_1,  C_1  },
-     { 2, E_1,  D_1,  F_1  },
-     { 2, E_2,  D_2,  F_2  },
-     { 2, B_2,  A_2,  C_2  },
-     { 2, B_3,  A_3,  C_3  },
-     { 2, E_3,  D_3,  F_3  },
-     { 2, E_4,  D_4,  F_4  },
-     { 2, B_4,  A_4,  C_4  },
-     { 2, B_5,  A_5,  C_5  },
-     { 2, E_5,  D_5,  F_5  },
-     { 2, E_6,  D_6,  F_6  },
-     { 2, B_6,  A_6,  C_6  },
-     { 2, B_7,  A_7,  C_7  },
-     { 2, E_7,  D_7,  F_7  },
-     { 2, E_8,  D_8,  F_8  },
-     { 2, B_8,  A_8,  C_8  },
-     { 2, B_9,  A_9,  C_9  },
-     { 2, E_9,  D_9,  F_9  },
-     { 2, E_10, D_10, F_10 },
-     { 2, B_10, A_10, C_10 },
-     { 2, B_11, A_11, C_11 },//125
-     { 2, E_11, D_11, F_11 },
-     { 2, E_12, D_12, F_12 },
-     { 2, B_12, A_12, C_12 },
-     { 2, B_13, A_13, C_13 },
-     { 2, E_13, D_13, F_13 },
-     { 2, E_14, D_14, F_14 },
-     { 2, B_14, A_14, C_14 },
-     { 2, B_15, A_15, C_15 },
-     { 2, E_15, D_15, F_15 },
-     { 2, E_16, D_16, F_16 },
-     { 2, B_16, A_16, C_16 },
-     { 2, H_16, G_16, I_16 },
-     { 2, K_16, J_16, L_16 },
-     { 2, K_15, J_15, L_15 },
-     { 2, H_15, G_15, I_15 },
-     { 2, H_14, G_14, I_14 },
-     { 2, K_14, J_14, L_14 },
-     { 2, K_13, J_13, L_13 },
-     { 2, H_13, G_13, I_13 },
-     { 2, H_12, G_12, I_12 },
-     { 2, K_12, J_12, L_12 },
-     { 2, K_11, J_11, L_11 },
-     { 2, H_11, G_11, I_11 },
-     { 2, H_10, G_10, I_10 },
-     { 2, K_10, J_10, L_10 },
-     { 2, K_9,  J_9,  L_9  },
-     { 2, H_9,  G_9,  I_9  },
-     { 2, H_8,  G_8,  I_8  },
-     { 2, K_8,  J_8,  L_8  },
-     { 2, K_7,  J_7,  L_7  },
-     { 2, H_7,  G_7,  I_7  },
-     { 2, H_6,  G_6,  I_6  },
-     { 2, K_6,  J_6,  L_6  },
-     { 2, K_5,  J_5,  L_5  },
-     { 2, H_5,  G_5,  I_5  },
-     { 2, H_4,  G_4,  I_4  },
-     { 2, K_4,  J_4,  L_4  },
-     { 2, K_3,  J_3,  L_3  },
-     { 2, H_3,  G_3,  I_3  },
-     { 2, H_2,  G_2,  I_2  },
-     { 2, K_2,  J_2,  L_2  },
-     { 1, K_10, J_10, L_10 },
-     { 1, K_11, J_11, L_11 },
-     { 1, E_3,  D_3,  F_3  },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+     { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },// LED1
+     { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+     { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+     { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+     { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+     { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+     { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+     { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+     { 0, SW11_CS10, SW10_CS10, SW12_CS10 },// LED9
+     { 1, SW11_CS1,  SW10_CS1,  SW12_CS1  },// LED10
+     { 1, SW11_CS2,  SW10_CS2,  SW12_CS2  },// LED11
+     { 1, SW11_CS3,  SW10_CS3,  SW12_CS3  },// LED12
+     { 1, SW11_CS4,  SW10_CS4,  SW12_CS4  },// LED13
+     { 1, SW11_CS9,  SW10_CS9,  SW12_CS9  },// LED18
+     { 1, SW11_CS5,  SW10_CS5,  SW12_CS5  },// LED15
+     { 1, SW11_CS6,  SW10_CS6,  SW12_CS6  },// LED19
+     { 1, SW11_CS7,  SW10_CS7,  SW12_CS7  },// LED16
+     { 1, SW11_CS8,  SW10_CS8,  SW12_CS8  },// LED20
+     { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },//start2
+     { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+     { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+     { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+     { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+     { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+     { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+     { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+     { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+     { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+     { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+     { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+     { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+     { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+     { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+     { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+     { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+     { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+     { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+     { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+     { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+     { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+     { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+     { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+     { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+     { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+     { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+     { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+     { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+     { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+     { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+     { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+     { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+     { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+     { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+     { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+     { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+     { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+     { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+     { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+     { 0, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+     { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+     { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+     { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+     { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 1, SW8_CS16, SW7_CS16, SW9_CS16 },
+     { 0, SW5_CS11, SW4_CS11, SW6_CS11 },//start6
+     { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+     { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 2, SW8_CS1,  SW7_CS1,  SW9_CS1  },//start underglow
+     { 2, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+     { 2, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+     { 2, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+     { 2, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+     { 2, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+     { 2, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+     { 2, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+     { 2, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+     { 2, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+     { 2, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+     { 2, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+     { 2, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+     { 2, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+     { 2, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+     { 2, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+     { 2, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+     { 2, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+     { 2, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+     { 2, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+     { 2, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 2, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 2, SW2_CS11, SW1_CS11, SW3_CS11 },//125
+     { 2, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 2, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 2, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 2, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 2, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 2, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 2, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 2, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 2, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 2, SW5_CS16, SW4_CS16, SW6_CS16 },
+     { 2, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 2, SW8_CS16, SW7_CS16, SW9_CS16 },
+     { 2, SW11_CS16, SW10_CS16, SW12_CS16 },
+     { 2, SW11_CS15, SW10_CS15, SW12_CS15 },
+     { 2, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 2, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 2, SW11_CS14, SW10_CS14, SW12_CS14 },
+     { 2, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 2, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 2, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 2, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 2, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 2, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 2, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 2, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 2, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+     { 2, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+     { 2, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+     { 2, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+     { 2, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+     { 2, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+     { 2, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+     { 2, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+     { 2, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+     { 2, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+     { 2, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+     { 2, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+     { 2, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+     { 2, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+     { 2, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+     { 2, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+     { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
 };
 
 bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/drop/thekey/keymaps/url-copy-paste-bepo/keymap.c b/keyboards/drop/thekey/keymaps/url-copy-paste-bepo/keymap.c
deleted file mode 100644
index feafa02ac2c..00000000000
--- a/keyboards/drop/thekey/keymaps/url-copy-paste-bepo/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2022 Benjamin Collet <benjamin.collet@protonmail.ch>
- *
- * 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 "sendstring_bepo.h"
-
-enum custom_keycodes {
-    TK_URL = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(TK_URL, C(BP_C), C(BP_V)),
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TK_URL:
-            if (record->event.pressed) {
-                // when keycode TK_URL is pressed
-                SEND_STRING("https://stackoverflow.com/");
-            }
-            break;
-        default:
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/drop/thekey/keymaps/url-copy-paste-macos/keymap.c b/keyboards/drop/thekey/keymaps/url-copy-paste-macos/keymap.c
deleted file mode 100644
index 57382dfc5f8..00000000000
--- a/keyboards/drop/thekey/keymaps/url-copy-paste-macos/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Joe Maples <joe@maples.dev>
- *
- * 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 custom_keycodes {
-    TK_URL = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(TK_URL, G(KC_C), G(KC_V)),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TK_URL:
-            if (record->event.pressed) {
-                // when keycode TK_URL is pressed
-                SEND_STRING("https://stackoverflow.com/\n");
-            }
-            break;
-        default:
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/drop/thekey/keymaps/url-copy-paste/keymap.c b/keyboards/drop/thekey/keymaps/url-copy-paste/keymap.c
deleted file mode 100644
index 18778d19468..00000000000
--- a/keyboards/drop/thekey/keymaps/url-copy-paste/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 Joe Maples <joe@maples.dev>
- *
- * 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 custom_keycodes {
-    TK_URL = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(TK_URL, C(KC_C), C(KC_V)),
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TK_URL:
-            if (record->event.pressed) {
-                // when keycode TK_URL is pressed
-                SEND_STRING("https://stackoverflow.com/");
-            }
-            break;
-        default:
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
deleted file mode 100644
index 0ad383a688e..00000000000
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright 2021 DTIsaac
-
-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 RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 42
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#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_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json
index e90d21725a5..557b5c3abcb 100644
--- a/keyboards/dtisaac/dosa40rgb/info.json
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -15,7 +15,56 @@
         "pin": "D0"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "react_on_keyup": true
     },
     "matrix_pins": {
         "cols": ["D1", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
deleted file mode 100644
index f6e3ae8a1cd..00000000000
--- a/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2017 MechMerlin <mechmerlin@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] = {
-  /* layer 0: qwerty */
-  [0] = LAYOUT_viper(
-    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_BSLS, 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_BSPC,
-    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_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_LGUI, KC_LALT,                                     KC_SPC,                                      KC_RALT, KC_RGUI
-  ),
-
-  [1] = LAYOUT_viper(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-    KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAI, QK_BOOT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,          KC_BSPC,
-    _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,                   KC_ENT,
-    _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN,          KC_DOWN, _______, _______,
-             _______, _______,                                     _______,                                     _______, _______
-  ),
-};
diff --git a/keyboards/duck/eagle_viper/v2/keymaps/profanum429/readme.md b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/readme.md
deleted file mode 100644
index 0f993559eae..00000000000
--- a/keyboards/duck/eagle_viper/v2/keymaps/profanum429/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Profanum429 Duck Viper V2 Layout
-TODO
-
-## Features
-TODO
diff --git a/keyboards/duck/jetfire/indicator_leds.h b/keyboards/duck/jetfire/indicator_leds.h
index d94709d1cb1..36dda632fbc 100644
--- a/keyboards/duck/jetfire/indicator_leds.h
+++ b/keyboards/duck/jetfire/indicator_leds.h
@@ -6,6 +6,6 @@ void backlight_init_ports(void);
 void backlight_set_state(bool cfg[7]);
 void backlight_update_state(void);
 void backlight_toggle_rgb(bool enabled);
-void backlight_set_rgb(uint8_t cfg[RGBLED_NUM][3]);
+void backlight_set_rgb(uint8_t cfg[RGBLIGHT_LED_COUNT][3]);
 void backlight_set(uint8_t level);
 void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device);
diff --git a/keyboards/duck/jetfire/jetfire.c b/keyboards/duck/jetfire/jetfire.c
index 23e6e9095a5..45a46766fd6 100644
--- a/keyboards/duck/jetfire/jetfire.c
+++ b/keyboards/duck/jetfire/jetfire.c
@@ -44,10 +44,10 @@ uint8_t backlight_state_led = 1<<STATE_LED_LAYER_0;
 
 void backlight_toggle_rgb(bool enabled)
 {
-  uint8_t rgb[RGBLED_NUM][3] = { 0 };
+  uint8_t rgb[RGBLIGHT_LED_COUNT][3] = { 0 };
 
   if(enabled) {
-    for(uint8_t i = 0; i < RGBLED_NUM; ++i) {
+    for(uint8_t i = 0; i < RGBLIGHT_LED_COUNT; ++i) {
       rgb[i][0] = backlight_rgb_r;
       rgb[i][1] = backlight_rgb_g;
       rgb[i][2] = backlight_rgb_b;
@@ -56,10 +56,10 @@ void backlight_toggle_rgb(bool enabled)
   backlight_set_rgb(rgb);
 }
 
-void backlight_set_rgb(uint8_t cfg[RGBLED_NUM][3])
+void backlight_set_rgb(uint8_t cfg[RGBLIGHT_LED_COUNT][3])
 {
   cli();
-  for(uint8_t i = 0; i < RGBLED_NUM; ++i) {
+  for(uint8_t i = 0; i < RGBLIGHT_LED_COUNT; ++i) {
     send_color(cfg[i][0], cfg[i][1], cfg[i][2], Device_PCBRGB);
   }
   sei();
diff --git a/keyboards/dumbo/keymaps/trip-trap/config.h b/keyboards/dumbo/keymaps/trip-trap/config.h
deleted file mode 100644
index 15b6ce7c0d3..00000000000
--- a/keyboards/dumbo/keymaps/trip-trap/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 Adam Naldal <adamnaldal@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
-
-// Tapping term is ever so slightly lowered from the 200ms default to make layer and mod usage more snappy.
-#define TAPPING_TERM 200
-
-// 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/dumbo/keymaps/trip-trap/keymap.c b/keyboards/dumbo/keymaps/trip-trap/keymap.c
deleted file mode 100644
index 6e6a909e7e0..00000000000
--- a/keyboards/dumbo/keymaps/trip-trap/keymap.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/* Copyright 2020 Adam Naldal <adamnaldal@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
-#include "keymap_danish.h"
-#include <stdio.h>
-
-enum layers {
-    _QWERTY = 0,
-    _COLEMAK,
-    _NN,
-    _MS,
-    _SP
-};
-
-// Default layer switching
-#define QWERT DF(_QWERTY)
-#define COLEM DF(_COLEMAK)
-
-// Layer tap codes
-#define LT_SPC LT(_NN, KC_SPC)
-#define LT_TAB LT(_MS, KC_TAB)
-#define LT_ENT LT(_MS, KC_ENT)
-#define LT_BSPC LT(_NN, KC_BSPC)
-
-// Qwerty homerow mods
-#define A_CTL LCTL_T(KC_A)
-#define S_ALT LALT_T(KC_S)
-#define D_GUI LGUI_T(KC_D)
-#define F_SFT LSFT_T(KC_F)
-#define J_SFT RSFT_T(KC_J)
-#define K_GUI RGUI_T(KC_K)
-#define L_ALT RALT_T(KC_L)
-#define AE_CTL RCTL_T(DK_AE)
-
-// Colemak homerow mods
-#define R_ALT LALT_T(KC_R)
-#define S_GUI LGUI_T(KC_S)
-#define T_SFT LSFT_T(KC_T)
-#define N_SFT RSFT_T(KC_N)
-#define E_GUI RGUI_T(KC_E)
-#define I_ALT RALT_T(KC_I)
-#define O_CTL RCTL_T(KC_O)
-
-// Navigation and numbers homerow mods
-#define RGHT_SFT LSFT_T(KC_RGHT)
-#define DOWN_GUI LGUI_T(KC_DOWN)
-#define LEFT_ALT LALT_T(KC_LEFT)
-#define N4_SFT RSFT_T(KC_4)
-#define N5_GUI RGUI_T(KC_5)
-#define N6_ALT RALT_T(KC_6)
-#define OE_CTL RCTL_T(DK_OSTR)
-
-// Undefined or wrong symbols (homebrew)
-#define HB_LCBR S(A(KC_8))  // {
-#define HB_RCBR S(A(KC_9))  // }
-#define HB_LABR KC_GRV      // <
-#define HB_RABR S(KC_GRV)   // >
-#define HB_USD KC_NUBS      // $
-#define HB_PRGF S(KC_NUBS)  // §
-#define HB_AT A(KC_NUHS)    // @
-#define HB_EUR S(KC_4)      // €
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- *     ,-------------------------------------------.                            ,-------------------------------------------.
- *     |        |   Q  |   W  |   E  |   R  |   T  |                            |   Y  |   U  |   I  |   O  |   P  |    Å   |
- *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
- *     |        |   A  |   S  |   D  |   F  |   G  |                            |   H  |   J  |   K  |   L  |   Æ  |    Ø   |
- *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
- *     |        |   Z  |   X  |   C  |   V  |   B  |                            |   N  |   M  | ,  ; | . :  | -  _ |        |
- *     `------------------------⫟------⫟------⫟------⫟------.         ,-----⫟------⫟------⫟------⫟-------------------------'
- *                              | MUTE | Esc  | Space|  Tab |         | Enter| Bksp | Caps| PLAY|
- *                              |(enc) |      |  _NN |  _MS |         | _MS  | _NN  |      |(enc)|
- *                              `---------------------------'         `---------------------------'
- */
-    [_QWERTY] = LAYOUT_split_3x6_4(
-      //,-----------------------------------------------------.                            ,-----------------------------------------------------.
-          XXXXXXX,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                 KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, DK_ARNG,
-      //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-          XXXXXXX,   A_CTL,   S_ALT,   D_GUI,   F_SFT,    KC_G,                                 KC_H,   J_SFT,   K_GUI,   L_ALT,  AE_CTL, DK_OSTR,
-      //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-          XXXXXXX,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                 KC_N,    KC_M, KC_COMM,  KC_DOT, DK_MINS, XXXXXXX,
-      //|--------+--------+-----------⫟--------⫟--------⫟--------⫟--------.   .--------⫟--------⫟--------⫟--------⫟-----------+--------+--------|
-                                        KC_MUTE,  KC_ESC,  LT_SPC,   LT_TAB,      LT_ENT, LT_BSPC, KC_CAPS, KC_MPLY
-                                    //`------------------------------------'  '------------------------------------'
-    ),
-/*
- * Base Layer: COLEMAK
- *
- *     ,-------------------------------------------.                            ,-------------------------------------------.
- *     |        |   Q  |   W  |   F  |   P  |   B  |                            |   J  |   L  |   U  |   Y  |   Å  |        |
- *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
- *     |        |   A  |   R  |   S  |   T  |   G  |                            |   M  |   N  |   E  |   I  |   O  |        |
- *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
- *     |        |   Z  |   X  |   C  |   D  |   V  |                            |   K  |   H  | ,  ; | . :  |   Æ  |        |
- *     `------------------------⫟------⫟------⫟------⫟------.         ,-----⫟------⫟------⫟------⫟-------------------------'
- *                              | MUTE | Esc  | Space|  Tab |         | Enter| Bksp | Caps |  PLAY|
- *                              |(enc) |      |  _NN |  _MS |         | _MS  | _NN  |      | (enc)|
- *                              `---------------------------'         `---------------------------'
- */
-    [_COLEMAK] = LAYOUT_split_3x6_4(
-      //,-----------------------------------------------------.                            ,-----------------------------------------------------.
-          XXXXXXX,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                                 KC_J,    KC_L,    KC_U,    KC_Y, DK_ARNG, XXXXXXX,
-      //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-          XXXXXXX,   A_CTL,   R_ALT,   S_GUI,   T_SFT,    KC_G,                                 KC_M,   N_SFT,   E_GUI,   I_ALT,   O_CTL, XXXXXXX,
-      //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-          XXXXXXX,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                                 KC_K,    KC_H, KC_COMM,  KC_DOT,   DK_AE, XXXXXXX,
-      //|--------+--------+-----------⫟--------⫟--------⫟--------⫟--------.   .--------⫟--------⫟--------⫟--------⫟-----------+--------+--------|
-                                        KC_MUTE,  KC_ESC,  LT_SPC,   LT_TAB,      LT_ENT, LT_BSPC, KC_CAPS, KC_MPLY
-                                    //`------------------------------------'  '------------------------------------'
-    ),
-  /*
-   * Navigation and Numbers: _NN
-   *
-   *     ,-------------------------------------------.                            ,-------------------------------------------.
-   *     |        |      | Home |  Up  |  End | pgUp |                            |   *  |   7  |   8  |   9  |  +   |        |
-   *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
-   *     |        |      | Left | Down | Right| pgDwn|                            |   /  |   4  |   5  |   6  |  Ø   |        |
-   *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
-   *     |        |      | Cut  | Copy |      | Paste|                            |   =  |   1  |   2  |   3  |  -   |        |
-   *     `------------------------⫟------⫟------⫟------⫟------.         ,-----⫟------⫟------⫟------⫟-------------------------'
-   *                              | MUTE | Del  | Space|  Tab |         | Enter| Bksp |   0  | PLAY |
-   *                              |(enc) |      |  _NN |  _MS |         | _MS  | _NN  |      |(enc) |
-   *                              `---------------------------'         `---------------------------'
-   */
-   [_NN] = LAYOUT_split_3x6_4(
-     //,-----------------------------------------------------.                            ,-----------------------------------------------------.
-         XXXXXXX, XXXXXXX, KC_HOME,   KC_UP,  KC_END, KC_PGUP,                              DK_ASTR,    KC_7,    KC_8,    KC_9, DK_PLUS, XXXXXXX,
-     //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-         XXXXXXX, KC_LCTL,LEFT_ALT,DOWN_GUI,RGHT_SFT, KC_PGDN,                              DK_SLSH,  N4_SFT,  N5_GUI,  N6_ALT,  OE_CTL, XXXXXXX,
-     //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-         XXXXXXX, XXXXXXX, G(KC_X), G(KC_C), XXXXXXX, G(KC_V),                               DK_EQL,    KC_1,    KC_2,    KC_3, DK_MINS, XXXXXXX,
-     //|--------+--------+-----------⫟--------⫟--------⫟--------⫟--------.   .--------⫟--------⫟--------⫟--------⫟-----------+--------+--------|
-                                       KC_MUTE,  KC_DEL,  _______, _______,     _______, _______,    KC_0, KC_MPLY
-                                   //`------------------------------------'  '------------------------------------'
-   ),
- /*
-  * Media and Symbols: _MS
-  *
-  *     ,-------------------------------------------.                            ,-------------------------------------------.
-  *     |        |      |      |   [  |   ]  |  F1  |                            |   $  |   /  |   (  |   )  |   ?  |        |
-  *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
-  *     |        |brght-|brght+|   {  |   }  |  F2  |                            |   @  |   €  |   %  |   &  |   '  |        |
-  *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
-  *     |        |      |      |   <  |   >  |  F3  |                            |   §  |   !  |   "  |   #  |   _  |        |
-  *     `------------------------⫟------⫟------⫟------⫟------.         ,-----⫟------⫟------⫟------⫟-------------------------'
-  *                              | MUTE | Esc  | Space|  Tab |         | Enter| Bksp | Caps |  PLAY|
-  *                              |(enc) |      |  _NN |  _MS |         | _MS  | _NN  |      | (enc)|
-  *                              `---------------------------'         `---------------------------'
-  */
-  [_MS] = LAYOUT_split_3x6_4(
-    //,-----------------------------------------------------.                            ,-----------------------------------------------------.
-        XXXXXXX, XXXXXXX, XXXXXXX, DK_LBRC, DK_RBRC,   KC_F1,                               HB_USD, DK_SLSH, DK_LPRN, DK_RPRN, DK_QUES, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-        XXXXXXX, KC_BRID, KC_BRIU, HB_LCBR, HB_RCBR,   KC_F2,                                HB_AT,  HB_EUR, DK_PERC, DK_AMPR, DK_QUOT, XXXXXXX,
-    //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-        XXXXXXX, XXXXXXX, XXXXXXX, HB_LABR, HB_RABR,  KC_F3,                               HB_PRGF, DK_EXLM, DK_DQUO, DK_HASH, DK_UNDS, XXXXXXX,
-    //|--------+--------+-----------⫟--------⫟--------⫟--------⫟--------.   .--------⫟--------⫟--------⫟--------⫟-----------+--------+--------|
-                                      KC_MUTE,  KC_ESC,  _______, _______,     _______, _______, KC_CAPS, KC_MPLY
-                                  //`------------------------------------'  '------------------------------------'
-  ),
-/*
- * Special functions: _SP
- *
- *     ,-------------------------------------------.                            ,-------------------------------------------.
- *     |        |QWERTY|      |      | QK_BOOT|      |                            |      |      |      |      |      |        |
- *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
- *     |        |      |      | Debug|      |      |                            |      |      |      |      |      |        |
- *     |--------+------+------+------+------+------|                            |------+------+------+------+------+--------|
- *     |        |      |      |COLEMK|      |      |                            |      |      |      |      |      |        |
- *     `------------------------⫟------⫟------⫟------⫟------.         ,-----⫟------⫟------⫟------⫟-------------------------'
- *                              | GUI  | Del  | Space| Nav +|         |Media+| Bksp | Enter| AltGr|
- *                              |      |      |      |Number|         |symbol|      |      |      |
- *                              `---------------------------'         `---------------------------'
- */
- [_SP] = LAYOUT_split_3x6_4(
-   //,-----------------------------------------------------.                            ,-----------------------------------------------------.
-       XXXXXXX,   QWERT, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-       XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   //|--------+--------+--------+--------+--------+--------|                            |--------+--------+--------+--------+--------+--------|
-       XXXXXXX, XXXXXXX, XXXXXXX,   COLEM, XXXXXXX, XXXXXXX,                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   //|--------+--------+-----------⫟--------⫟--------⫟--------⫟--------.   .--------⫟--------⫟--------⫟--------⫟-----------+--------+--------|
-                                     KC_MUTE,  KC_ESC,  _______, _______,     _______, _______, KC_CAPS, KC_MPLY
-                                 //`------------------------------------'  '------------------------------------'
- ),
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _NN, _MS, _SP);
-}
-
-#ifdef OLED_ENABLE
-char wpm_str[10];
-
-// static void render_logo(void) {
-//     static const char PROGMEM qmk_logo[] = {
-//         0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
-//         0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
-//         0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
-//     };
-//
-//     oled_write_P(qmk_logo, false);
-// }
-
-static void print_status_narrow(void) {
-    // Print current mode
-    oled_write_P(PSTR("\n"), false);
-    oled_write_ln_P(PSTR("MODE"), false);
-    oled_write_ln_P(PSTR(""), false);
-
-    switch (get_highest_layer(default_layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("Qwrt"), false);
-            break;
-        case _COLEMAK:
-            oled_write_ln_P(PSTR("Clmk"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    // Print current layer
-    oled_write_ln_P(PSTR("LAYER"), false);
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR("Base\n"), false);
-            break;
-        case _NN:
-            oled_write_P(PSTR("Nums\n"), false);
-            break;
-        case _MS:
-            oled_write_P(PSTR("Sym\n"), false);
-            break;
-        case _SP:
-            oled_write_P(PSTR("Spec\n"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef\n"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    led_t led_usb_state = host_keyboard_led_state();
-    oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
-}
-
-#define ANIM_NUM_FRAMES 2 // number of frames in the animation
-#define MAX_DURATION 10000
-#define ANIM_BEGIN 30
-uint16_t anim_frame_duration = 100; // how long each frame lasts
-//  #define ANIM_REVERSE // define this if you want the animation to run backwards at the end
-
-#ifdef ANIM_REVERSE
-#define ANIM_TOTAL_FRAMES (2*((ANIM_NUM_FRAMES)-1))
-#else
-#define ANIM_TOTAL_FRAMES ANIM_NUM_FRAMES
-#endif
-
-uint16_t anim_timer = 0;
-uint8_t current_anim_frame = 0;
-
-static void render_anim(void) {
-    static const char PROGMEM frame[ANIM_NUM_FRAMES][512] = {
-        {
-          // 'pokemon experiment frame 1', 32x128px
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x60, 0x10, 0x08, 0x04, 0x04, 0x02, 0x02, 0x02,
-          0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x30, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0x3c, 0xf2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x04, 0xf2, 0x3a, 0x1c, 0x3c, 0xf8, 0xe0, 0x00, 0x00, 0x01, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x70, 0x8c, 0x03, 0x41, 0x82, 0x02, 0x03, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x07, 0x04, 0x84, 0x84, 0xc7, 0x63, 0x00, 0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x04, 0x1c, 0x28, 0x58, 0xa4, 0xa4, 0x44, 0x42, 0x42,
-          0x23, 0x97, 0x91, 0x48, 0x24, 0x23, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
-          0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x80, 0x70, 0x08, 0x04, 0x04, 0x08, 0x08, 0x50, 0x20, 0x10, 0x10, 0x10, 0x90, 0x90,
-          0x90, 0x10, 0x10, 0x10, 0x10, 0x10, 0x20, 0x10, 0x08, 0x08, 0x04, 0x04, 0x08, 0xf0, 0x00, 0x00,
-          0x80, 0x78, 0x1f, 0x3a, 0xf2, 0xc4, 0x00, 0x00, 0x30, 0x60, 0x00, 0x06, 0x8f, 0xcf, 0xe7, 0x03,
-          0x01, 0x00, 0x04, 0xf2, 0x3a, 0x1c, 0x1c, 0x78, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0,
-          0x1f, 0x64, 0xb4, 0x64, 0xa7, 0x23, 0x40, 0x48, 0x50, 0x40, 0x80, 0x80, 0x91, 0x89, 0x80, 0x80,
-          0x80, 0x40, 0x40, 0x47, 0x44, 0x44, 0xa4, 0x64, 0x27, 0x13, 0x08, 0x00, 0x00, 0x80, 0x60, 0x1f,
-          0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x02, 0x06, 0x04, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0c,
-          0x0c, 0x0c, 0x0a, 0x0a, 0x09, 0x05, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 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, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04,
-          0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x10, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0xfc, 0x1b, 0x3c, 0xfc, 0xf9, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x02, 0xf1, 0x39, 0x1c, 0x3c, 0xfc, 0xf8, 0xf0, 0x00, 0x00, 0x03, 0x0c, 0xf0,
-          0x00, 0xf8, 0x06, 0x01, 0x32, 0x02, 0x03, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x07, 0x04, 0x84, 0x84, 0x47, 0xe3, 0x01, 0x00, 0x00, 0x00, 0xc0, 0x3f,
-          0x00, 0x00, 0x01, 0x02, 0x06, 0x0a, 0x14, 0x28, 0x48, 0x44, 0x44, 0xc2, 0xc2, 0xc2, 0xa2, 0xa2,
-          0xa1, 0x91, 0x91, 0x89, 0x49, 0x45, 0x44, 0x22, 0x21, 0x10, 0x10, 0x08, 0x04, 0x02, 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,
-
-        },
-        {
-          // 'pokemon experiment frame 2', 32x128px
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80,
-          0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x84, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00,
-          0x00, 0x80, 0x80, 0x00, 0x01, 0x01, 0x01, 0x02, 0x0c, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x7f, 0x87, 0x8f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x01, 0xfc, 0x0e, 0x07, 0x0f, 0xfe, 0xf8, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x1c, 0x63, 0x80, 0x10, 0x20, 0x00, 0x00, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x81, 0x81, 0x41, 0x41, 0x21, 0x10, 0x00, 0x80, 0x60, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x06, 0x04, 0x04, 0x0a, 0x0a, 0x0a, 0x0a, 0x09,
-          0x05, 0x07, 0x04, 0x02, 0x02, 0x02, 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, 0xe0, 0x10, 0x08, 0x08, 0x10, 0x10, 0xa0, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20,
-          0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x10, 0xe0, 0x00, 0x00,
-          0x00, 0xf0, 0x3f, 0x72, 0xe2, 0x80, 0x00, 0x00, 0x60, 0xc0, 0x00, 0x0c, 0x1e, 0x9e, 0xcf, 0x07,
-          0x03, 0x00, 0x00, 0xe2, 0x72, 0x38, 0x38, 0xf0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x01, 0x1e, 0xe0,
-          0x3f, 0xc8, 0x68, 0x48, 0x8f, 0x87, 0x00, 0x20, 0x40, 0x00, 0x00, 0x00, 0x43, 0x23, 0x01, 0x00,
-          0x00, 0x00, 0x00, 0x0f, 0x08, 0x88, 0x88, 0x48, 0x4f, 0x27, 0x10, 0x00, 0x00, 0x00, 0xc0, 0x3f,
-          0x00, 0x00, 0x01, 0x02, 0x02, 0x06, 0x05, 0x09, 0x09, 0x09, 0x12, 0x12, 0x12, 0x12, 0x11, 0x11,
-          0x11, 0x11, 0x11, 0x09, 0x09, 0x09, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 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, 0x80, 0x40, 0x20, 0x90, 0x88, 0x88, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02,
-          0x02, 0x02, 0x02, 0x82, 0x82, 0x84, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0xfe, 0x0d, 0x1e, 0xfe, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0xf8, 0x1c, 0x0e, 0x1e, 0xfe, 0xfc, 0xf8, 0x00, 0x00, 0x01, 0x06, 0xf8,
-          0x00, 0x78, 0x87, 0x00, 0x31, 0x01, 0x01, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x82, 0x82, 0x43, 0x61, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1f,
-          0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x04, 0x0c, 0x08, 0x14, 0x12, 0x12, 0x12, 0x22, 0x22, 0x22,
-          0x21, 0x21, 0x21, 0x21, 0x11, 0x11, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 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
-        }
-    };
-
-    if (get_current_wpm() > ANIM_BEGIN){
-      if(timer_elapsed(anim_timer) > anim_frame_duration) {
-          anim_timer = timer_read();
-          current_anim_frame = (current_anim_frame + 1) % ANIM_TOTAL_FRAMES;
-          oled_clear();
-          oled_write_raw_P(frame[abs((ANIM_NUM_FRAMES-1)-current_anim_frame)], 512);
-          if (get_current_wpm() > ANIM_BEGIN){
-            anim_frame_duration = MAX_DURATION/get_current_wpm();
-          }
-      }
-    } else {
-      oled_write_raw_P(frame[0],512);
-    }
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-    if (is_keyboard_master() != true){
-        return OLED_ROTATION_270;
-    }
-    return rotation;
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        print_status_narrow();
-        sprintf(wpm_str, "%03d", get_current_wpm());
-        oled_write(wpm_str, false);
-    } else {
-        render_anim();
-    }
-    return false;
-}
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        // master side thumb encoder
-        // Volume control
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    else if (index == 1) {
-        // master side pinky encoder
-        // Page down / Page up
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    else if (index == 2) {
-        // minion side thumb encoder
-        // Next track / Previous track
-        if (clockwise) {
-            tap_code(KC_MFFD);
-        } else {
-            tap_code(KC_MRWD);
-        }
-    }
-    else if (index == 3) {
-        // minion side pinky encoder
-        // Page end / Page home
-        if (clockwise) {
-            tap_code(KC_END);
-        } else {
-            tap_code(KC_HOME);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/dumbo/keymaps/trip-trap/rules.mk b/keyboards/dumbo/keymaps/trip-trap/rules.mk
deleted file mode 100644
index 023239d3eea..00000000000
--- a/keyboards/dumbo/keymaps/trip-trap/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-WPM_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c b/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c
deleted file mode 100644
index 334c72596ad..00000000000
--- a/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * 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 LAYER
-    /-----------------------------------------------------`
-    |             |    7    |    8    |    9    |  Bkspc  |
-    |             |---------|---------|---------|---------|
-    |             |    4    |    5    |    6    |    +    |
-    |             |---------|---------|---------|---------|
-    |             |    1    |    2    |    3    |    *    |
-    |-------------|---------|---------|---------|---------|
-    | Play/pause  |  TT(1)  |    0    |    .    |  Enter  |
-    \-----------------------------------------------------'
-    */
-    [0] = LAYOUT(
-                    KC_P7,     KC_P8,   KC_P9,    KC_BSPC,
-                    KC_P4,     KC_P5,   KC_P6,    KC_KP_PLUS,
-                    KC_P1,     KC_P2,   KC_P3,    KC_KP_ASTERISK,
-        KC_MPLY,    TT(1),     KC_P0,   KC_PDOT,  KC_KP_ENTER
-    ),
-    /*
-            SUB LAYER
-    /-----------------------------------------------------`
-    |             |         |         |         | Numlock |
-    |             |---------|---------|---------|---------|
-    |             |         |         |         |    -    |
-    |             |---------|---------|---------|---------|
-    |             |         |         |         |    /    |
-    |-------------|---------|---------|---------|---------|
-    |    MUTE     |         |         |         |    =    |
-    \-----------------------------------------------------'
-    */
-    [1] = LAYOUT(
-                    _______,     _______,     _______,      KC_NUM,
-                    _______,     _______,     _______,      KC_KP_MINUS,
-                    _______,     _______,     _______,      KC_KP_SLASH,
-        KC_MUTE,    _______,     _______,     _______,      KC_KP_EQUAL
-    ),
-};
-
-void encoder_update_user(uint8_t index, bool clockwise) {
-    /*  Custom encoder control - handles CW/CCW turning of encoder
-     *  Default behavior:
-     *    main layer:
-     *       CW: volume up
-     *      CCW: volume down
-     *    other layers:
-     *       CW: next track
-     *      CCW: previous track
-     */
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            case 0:
-                // main layer - volume up (CW) and volume down (CCW)
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-                break;
-
-            default:
-                // other layers - media next (CW) and media previous (CCW)
-                if (clockwise) {
-                    tap_code(KC_MNXT);
-                } else {
-                    tap_code(KC_MPRV);
-                }
-                break;
-        }
-    }
-}
diff --git a/keyboards/dumbpad/v1x_oled/v1x_oled.c b/keyboards/dumbpad/v1x_oled/v1x_oled.c
index ef91d4d416f..2abf45b1842 100644
--- a/keyboards/dumbpad/v1x_oled/v1x_oled.c
+++ b/keyboards/dumbpad/v1x_oled/v1x_oled.c
@@ -19,7 +19,10 @@
 char wpm_str[10];
 
 #ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
     // Right encoder
     if (index == 0) {
         if (clockwise) {
@@ -42,16 +45,16 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 #ifdef OLED_ENABLE
 // WPM-responsive animation stuff here
 #    define IDLE_FRAMES 5
-#    define IDLE_SPEED 20  // below this wpm value your animation will idle
+#    define IDLE_SPEED 20 // below this wpm value your animation will idle
 
 // #define PREP_FRAMES 1 // uncomment if >1
 
 #    define TAP_FRAMES 2
-#    define TAP_SPEED 40  // above this wpm value typing animation to trigger
+#    define TAP_SPEED 40 // above this wpm value typing animation to trigger
 
-#    define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
+#    define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
 // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#    define ANIM_SIZE 636  // number of bytes in array, minimize for adequate firmware size, max is 1024
+#    define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
 
 uint32_t anim_timer         = 0;
 uint32_t anim_sleep         = 0;
@@ -111,7 +114,7 @@ static void render_anim(void) {
         }
         if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
             // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
-            oled_write_raw_P(prep[0], ANIM_SIZE);  // remove if IDLE_FRAMES >1
+            oled_write_raw_P(prep[0], ANIM_SIZE); // remove if IDLE_FRAMES >1
         }
         if (get_current_wpm() >= TAP_SPEED) {
             current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
@@ -119,7 +122,7 @@ static void render_anim(void) {
         }
     }
     if (get_current_wpm() != 000) {
-        oled_on();  // not essential but turns on animation OLED with any alpha keypress
+        oled_on(); // not essential but turns on animation OLED with any alpha keypress
         if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
             anim_timer = timer_read32();
             animation_phase();
@@ -138,18 +141,21 @@ static void render_anim(void) {
 }
 
 // Used to draw on to the oled screen
-bool oled_task_user(void) {
-    render_anim();  // renders pixelart
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    render_anim(); // renders pixelart
 
-    oled_set_cursor(0, 0);                            // sets cursor to (row, column) using charactar spacing (5 rows on 128x32 screen, anything more will overflow back to the top)
+    oled_set_cursor(0, 0); // sets cursor to (row, column) using charactar spacing (5 rows on 128x32 screen, anything more will overflow back to the top)
     oled_write_P(PSTR("WPM: "), false);
     oled_write(get_u8_str(get_current_wpm(), '0'), false);
-    oled_write(wpm_str, false);                       // writes wpm on top left corner of string
+    oled_write(wpm_str, false); // writes wpm on top left corner of string
 
-    led_t led_state = host_keyboard_led_state();  // caps lock stuff, prints CAPS on new line if caps led is on
+    led_t led_state = host_keyboard_led_state(); // caps lock stuff, prints CAPS on new line if caps led is on
     oled_set_cursor(0, 1);
     oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("       "), false);
 
-    return false;
+    return true;
 }
 #endif
diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h
index 7667bb39d06..21776afe966 100644
--- a/keyboards/dumbpad/v3x/config.h
+++ b/keyboards/dumbpad/v3x/config.h
@@ -20,45 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_00 B1
 #define LED_01 B3
 #define LED_02 B6
-
-#define RGB_MATRIX_LED_COUNT 16
-
-// Cleanup RGB
-#ifdef RGB_MATRIX_ENABLE
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
-#define RGB_MATRIX_KEYPRESSES
-
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_SAT
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#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
-#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
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
index 24c16ac0afb..4dc17272a95 100644
--- a/keyboards/dumbpad/v3x/info.json
+++ b/keyboards/dumbpad/v3x/info.json
@@ -6,8 +6,38 @@
         "device_version": "0.1.0"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_spiral_val": true,
+            "cycle_left_right": true,
+            "cycle_pinwheel": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
-        "timeout": 300000
+        "timeout": 300000,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C6", "D7", "E6", "B4", "B5"],
diff --git a/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c b/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
deleted file mode 100644
index 3d0fd20ecfe..00000000000
--- a/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright 2022 imchipwood && deveth0
-
-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 MUTE_HOLD_DELAY 400
-static uint16_t mute_hold_timer = 0;
-
-enum custom_keycodes {
-    MUTE_TEAMS = SAFE_RANGE,
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-            BASE LAYER - Media Controls
-    /------------------------------------------------------------------------------------`
-    |             | Media Prev         |    Media Pause    |    Media Next    |         |
-    |             |--------------------|-------------------|------------------|---------|
-    |             |    Teams - Mute    |                   |                  |         |
-    |             |--------------------|-------------------|------------------|---------|
-    |             |                    |                   |                  |         |
-    |-------------|--------------------|-------------------|------------------|---------|
-    |    Mute     |  TT(1)             |                   |                  |  Enter  |
-    \------------------------------------------------------------------------------------'
-    */
-    [0] = LAYOUT(
-                    KC_MPRV,    KC_MPLY,  KC_MNXT,    KC_NO,
-                    KC_NO,      KC_NO,    KC_NO,      KC_NO,
-                    MUTE_TEAMS, KC_NO,    KC_NO,      KC_NO,
-        KC_MUTE,    TT(1),      KC_NO,    KC_NO,      KC_NO
-    ),
-    /*
-            SUB LAYER  - RGB controls, Modes on encoder
-    /-----------------------------------------------------`
-    |             | On/Off  | Bright- | Bright+ |  Reset  |
-    |             |---------|---------|---------|---------|
-    |             |         | Hue-    | Hue+    |         |
-    |             |---------|---------|---------|---------|
-    |             |         | Sat-    | Sat+    |         |
-    |-------------|---------|---------|---------|---------|
-    |             |  TT(1)  | Effect- | Effect+ |         |
-    \-----------------------------------------------------'
-    */
-    [1] = LAYOUT(
-                    RGB_TOG,    RGB_VAD,     RGB_VAI,      QK_BOOT,
-                    KC_NO,      RGB_HUD,     RGB_HUI,      KC_NO,
-                    KC_NO,      RGB_SAD,     RGB_SAI,      KC_NO,
-        KC_NO,      _______,    RGB_SPD,     RGB_SPI,      KC_NO
-    ),
-};
-// clang-format on
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // props to https://www.reddit.com/r/olkb/comments/oewbr2/comment/h49z38r
-    switch (keycode) {
-        case MUTE_TEAMS:
-            if (record->event.pressed) {                               // when keycode MUTE_TEAMS is pressed
-                mute_hold_timer = timer_read();                        // mark the time the key was pressed
-                tap_code16(LCTL(LSFT(KC_M)));                          // tap Ctrl + Shift + M (mute shortcut)
-            } else {                                                   // when keycode MUTE_TEAMS is released
-                if (timer_elapsed(mute_hold_timer) > MUTE_HOLD_DELAY)  // if held longer than MUTE_HOLD_DELAY
-                    tap_code16(LCTL(LSFT(KC_M)));                      // tap the mute shortcut again
-            }                                                          // otherwise do nothing
-            break;
-    }
-    return true;
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            // main layer, volume
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-            break;
-        default:
-            // rgb control layer, effects
-            if (clockwise) {
-                rgblight_step();
-            } else {
-                rgblight_step_reverse();
-            }
-            break;
-    }
-    return false;
-}
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index 7c85f977ba8..fabf6bc9235 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -33,12 +33,9 @@
 #define LED_WIN_LOCK_PIN    C5
 #define LED_MR_LOCK_PIN     LED_SCROLL_LOCK_PIN
 
-#ifdef RGB_MATRIX_ENABLE
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
 
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* I2C Alternate function settings */
 #define I2C1_SCL_PAL_MODE 1
 #define I2C1_SDA_PAL_MODE 1
@@ -49,60 +46,3 @@
 #define I2C1_TIMINGR_SDADEL  0x0U
 #define I2C1_TIMINGR_SCLH   0x0cU
 #define I2C1_TIMINGR_SCLL   0x22U
-
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-
-// 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
-#    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 /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h
index f68a595cae3..87c7cf5d936 100644
--- a/keyboards/durgod/dgk6x/galaxy/config.h
+++ b/keyboards/durgod/dgk6x/galaxy/config.h
@@ -16,9 +16,4 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define DRIVER_1_LED_TOTAL 58
-#define DRIVER_2_LED_TOTAL 26
-#endif
-
 #define CAPS_LED 46
diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c
index aa903c3a0a0..1cf2d712558 100644
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.c
+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -26,95 +26,95 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 
-   {0, C_1,   B_1,   A_1},  // Esc
-   {0, C_2,   B_2,   A_2},  // F1
-   {0, C_3,   B_3,   A_3},  // F2
-   {0, C_4,   B_4,   A_4},  // F3
-   {0, C_5,   B_5,   A_5},  // F4
-   {0, C_6,   B_6,   A_6},  // F5
-   {0, C_7,   B_7,   A_7},  // F6
-   {0, C_8,   B_8,   A_8},  // F7
-   {0, C_9,   B_9,   A_9},  // F8
-   {0, C_10,  B_10,  A_10}, // F9
-   {0, C_11,  B_11,  A_11}, // F10
-   {0, C_12,  B_12,  A_12}, // F11
-   {0, C_13,  B_13,  A_13}, // F12
-   {0, C_14,  B_14,  A_14}, // PrtSc
-   {0, C_15,  B_15,  A_15}, // Pause
-   {0, C_16,  B_16,  A_16}, // Del
+   {0, SW3_CS1,   SW2_CS1,   SW1_CS1},  // Esc
+   {0, SW3_CS2,   SW2_CS2,   SW1_CS2},  // F1
+   {0, SW3_CS3,   SW2_CS3,   SW1_CS3},  // F2
+   {0, SW3_CS4,   SW2_CS4,   SW1_CS4},  // F3
+   {0, SW3_CS5,   SW2_CS5,   SW1_CS5},  // F4
+   {0, SW3_CS6,   SW2_CS6,   SW1_CS6},  // F5
+   {0, SW3_CS7,   SW2_CS7,   SW1_CS7},  // F6
+   {0, SW3_CS8,   SW2_CS8,   SW1_CS8},  // F7
+   {0, SW3_CS9,   SW2_CS9,   SW1_CS9},  // F8
+   {0, SW3_CS10,  SW2_CS10,  SW1_CS10}, // F9
+   {0, SW3_CS11,  SW2_CS11,  SW1_CS11}, // F10
+   {0, SW3_CS12,  SW2_CS12,  SW1_CS12}, // F11
+   {0, SW3_CS13,  SW2_CS13,  SW1_CS13}, // F12
+   {0, SW3_CS14,  SW2_CS14,  SW1_CS14}, // PrtSc
+   {0, SW3_CS15,  SW2_CS15,  SW1_CS15}, // Pause
+   {0, SW3_CS16,  SW2_CS16,  SW1_CS16}, // Del
 
-   {0, F_1,   E_1,   D_1},  // `
-   {0, F_2,   E_2,   D_2},  // 1
-   {0, F_3,   E_3,   D_3},  // 2
-   {0, F_4,   E_4,   D_4},  // 3
-   {0, F_5,   E_5,   D_5},  // 4
-   {0, F_6,   E_6,   D_6},  // 5
-   {0, F_7,   E_7,   D_7},  // 6
-   {0, F_8,   E_8,   D_8},  // 7
-   {0, F_9,   E_9,   D_9},  // 8
-   {0, F_10,  E_10,  D_10}, // 9
-   {0, F_11,  E_11,  D_11}, // 0
-   {0, F_12,  E_12,  D_12}, // -
-   {0, F_13,  E_13,  D_13}, // =
-   {0, F_14,  E_14,  D_14}, // Bksp
-   {0, F_15,  E_15,  D_15}, // Home
+   {0, SW6_CS1,   SW5_CS1,   SW4_CS1},  // `
+   {0, SW6_CS2,   SW5_CS2,   SW4_CS2},  // 1
+   {0, SW6_CS3,   SW5_CS3,   SW4_CS3},  // 2
+   {0, SW6_CS4,   SW5_CS4,   SW4_CS4},  // 3
+   {0, SW6_CS5,   SW5_CS5,   SW4_CS5},  // 4
+   {0, SW6_CS6,   SW5_CS6,   SW4_CS6},  // 5
+   {0, SW6_CS7,   SW5_CS7,   SW4_CS7},  // 6
+   {0, SW6_CS8,   SW5_CS8,   SW4_CS8},  // 7
+   {0, SW6_CS9,   SW5_CS9,   SW4_CS9},  // 8
+   {0, SW6_CS10,  SW5_CS10,  SW4_CS10}, // 9
+   {0, SW6_CS11,  SW5_CS11,  SW4_CS11}, // 0
+   {0, SW6_CS12,  SW5_CS12,  SW4_CS12}, // -
+   {0, SW6_CS13,  SW5_CS13,  SW4_CS13}, // =
+   {0, SW6_CS14,  SW5_CS14,  SW4_CS14}, // Bksp
+   {0, SW6_CS15,  SW5_CS15,  SW4_CS15}, // Home
 
-   {0, I_1,   H_1,   G_1},  // Tab
-   {0, I_2,   H_2,   G_2},  // Q
-   {0, I_3,   H_3,   G_3},  // W
-   {0, I_4,   H_4,   G_4},  // E
-   {0, I_5,   H_5,   G_5},  // R
-   {0, I_6,   H_6,   G_6},  // T
-   {0, I_7,   H_7,   G_7},  // Y
-   {0, I_8,   H_8,   G_8},  // U
-   {0, I_9,   H_9,   G_9},  // I
-   {0, I_10,  H_10,  G_10}, // O
-   {0, I_11,  H_11,  G_11}, // P
-   {0, I_12,  H_12,  G_12}, // [
-   {0, I_13,  H_13,  G_13}, // ]
-   {0, I_14,  H_14,  G_14}, // Pipe
-   {0, I_15,  H_15,  G_15}, // End
+   {0, SW9_CS1,   SW8_CS1,   SW7_CS1},  // Tab
+   {0, SW9_CS2,   SW8_CS2,   SW7_CS2},  // Q
+   {0, SW9_CS3,   SW8_CS3,   SW7_CS3},  // W
+   {0, SW9_CS4,   SW8_CS4,   SW7_CS4},  // E
+   {0, SW9_CS5,   SW8_CS5,   SW7_CS5},  // R
+   {0, SW9_CS6,   SW8_CS6,   SW7_CS6},  // T
+   {0, SW9_CS7,   SW8_CS7,   SW7_CS7},  // Y
+   {0, SW9_CS8,   SW8_CS8,   SW7_CS8},  // U
+   {0, SW9_CS9,   SW8_CS9,   SW7_CS9},  // I
+   {0, SW9_CS10,  SW8_CS10,  SW7_CS10}, // O
+   {0, SW9_CS11,  SW8_CS11,  SW7_CS11}, // P
+   {0, SW9_CS12,  SW8_CS12,  SW7_CS12}, // [
+   {0, SW9_CS13,  SW8_CS13,  SW7_CS13}, // ]
+   {0, SW9_CS14,  SW8_CS14,  SW7_CS14}, // Pipe
+   {0, SW9_CS15,  SW8_CS15,  SW7_CS15}, // End
 
-   {0, L_1,   K_1,   J_1},  // Caps
-   {0, L_2,   K_2,   J_2},  // A
-   {0, L_3,   K_3,   J_3},  // S
-   {0, L_4,   K_4,   J_4},  // D
-   {0, L_5,   K_5,   J_5},  // F
-   {0, L_6,   K_6,   J_6},  // G
-   {0, L_7,   K_7,   J_7},  // H
-   {0, L_8,   K_8,   J_8},  // J
-   {0, L_9,   K_9,   J_9},  // K
-   {0, L_10,  K_10,  J_10}, // L
-   {0, L_11,  K_11,  J_11}, // :
-   {0, L_12,  K_12,  J_12}, // '
-   {0, L_14,  K_14,  J_14}, // Enter
-   {0, L_15,  K_15,  J_15}, // PgUp
+   {0, SW12_CS1,   SW11_CS1,   SW10_CS1},  // Caps
+   {0, SW12_CS2,   SW11_CS2,   SW10_CS2},  // A
+   {0, SW12_CS3,   SW11_CS3,   SW10_CS3},  // S
+   {0, SW12_CS4,   SW11_CS4,   SW10_CS4},  // D
+   {0, SW12_CS5,   SW11_CS5,   SW10_CS5},  // F
+   {0, SW12_CS6,   SW11_CS6,   SW10_CS6},  // G
+   {0, SW12_CS7,   SW11_CS7,   SW10_CS7},  // H
+   {0, SW12_CS8,   SW11_CS8,   SW10_CS8},  // J
+   {0, SW12_CS9,   SW11_CS9,   SW10_CS9},  // K
+   {0, SW12_CS10,  SW11_CS10,  SW10_CS10}, // L
+   {0, SW12_CS11,  SW11_CS11,  SW10_CS11}, // :
+   {0, SW12_CS12,  SW11_CS12,  SW10_CS12}, // '
+   {0, SW12_CS14,  SW11_CS14,  SW10_CS14}, // Enter
+   {0, SW12_CS15,  SW11_CS15,  SW10_CS15}, // PgUp
 
-   {1, C_1,   B_1,   A_1},  // LShift
-   {1, C_3,   B_3,   A_3},  // Z
-   {1, C_4,   B_4,   A_4},  // X
-   {1, C_5,   B_5,   A_5},  // C
-   {1, C_6,   B_6,   A_6},  // V
-   {1, C_7,   B_7,   A_7},  // B
-   {1, C_8,   B_8,   A_8},  // N
-   {1, C_9,   B_9,   A_9},  // M
-   {1, C_10,  B_10,  A_10}, // <
-   {1, C_11,  B_11,  A_11}, // >
-   {1, C_12,  B_12,  A_12}, // ?
-   {1, C_13,  B_13,  A_13}, // RShift
-   {1, C_14,  B_14,  A_14}, // Up
-   {1, C_15,  B_15,  A_15}, // PgDn
+   {1, SW3_CS1,   SW2_CS1,   SW1_CS1},  // LShift
+   {1, SW3_CS3,   SW2_CS3,   SW1_CS3},  // Z
+   {1, SW3_CS4,   SW2_CS4,   SW1_CS4},  // X
+   {1, SW3_CS5,   SW2_CS5,   SW1_CS5},  // C
+   {1, SW3_CS6,   SW2_CS6,   SW1_CS6},  // V
+   {1, SW3_CS7,   SW2_CS7,   SW1_CS7},  // B
+   {1, SW3_CS8,   SW2_CS8,   SW1_CS8},  // N
+   {1, SW3_CS9,   SW2_CS9,   SW1_CS9},  // M
+   {1, SW3_CS10,  SW2_CS10,  SW1_CS10}, // <
+   {1, SW3_CS11,  SW2_CS11,  SW1_CS11}, // >
+   {1, SW3_CS12,  SW2_CS12,  SW1_CS12}, // ?
+   {1, SW3_CS13,  SW2_CS13,  SW1_CS13}, // RShift
+   {1, SW3_CS14,  SW2_CS14,  SW1_CS14}, // Up
+   {1, SW3_CS15,  SW2_CS15,  SW1_CS15}, // PgDn
 
-   {1, F_1,   E_1,   D_1},  // LCtrl
-   {1, F_2,   E_2,   D_2},  // LAlt
-   {1, F_3,   E_3,   D_3},  // LGUI
-   {1, F_7,   E_7,   D_7},  // Space
-   {1, F_10,  E_10,  D_10}, // RAlt
-   {1, F_11,  E_11,  D_11}, // Fn1
-   {1, F_12,  E_12,  D_12}, // Fn2
-   {1, F_13,  E_13,  D_13}, // Left
-   {1, F_14,  E_14,  D_14}, // Down
-   {1, F_15,  E_15,  D_15}  // Right
+   {1, SW6_CS1,   SW5_CS1,   SW4_CS1},  // LCtrl
+   {1, SW6_CS2,   SW5_CS2,   SW4_CS2},  // LAlt
+   {1, SW6_CS3,   SW5_CS3,   SW4_CS3},  // LGUI
+   {1, SW6_CS7,   SW5_CS7,   SW4_CS7},  // Space
+   {1, SW6_CS10,  SW5_CS10,  SW4_CS10}, // RAlt
+   {1, SW6_CS11,  SW5_CS11,  SW4_CS11}, // Fn1
+   {1, SW6_CS12,  SW5_CS12,  SW4_CS12}, // Fn2
+   {1, SW6_CS13,  SW5_CS13,  SW4_CS13}, // Left
+   {1, SW6_CS14,  SW5_CS14,  SW4_CS14}, // Down
+   {1, SW6_CS15,  SW5_CS15,  SW4_CS15}  // Right
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/durgod/dgk6x/hades_ansi/config.h b/keyboards/durgod/dgk6x/hades_ansi/config.h
index 47f6da5988f..b61e32a2ffa 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/config.h
+++ b/keyboards/durgod/dgk6x/hades_ansi/config.h
@@ -16,9 +16,4 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define DRIVER_1_LED_TOTAL 58
-#define DRIVER_2_LED_TOTAL 10
-#endif
-
 #define CAPS_LED 30
diff --git a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
index 2d1907f4dbb..e984c36d911 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
+++ b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
@@ -19,7 +19,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -27,78 +27,78 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 
-   {0, C_1,   B_1,   A_1},  // Esc
-   {0, C_2,   B_2,   A_2},  // 1
-   {0, C_3,   B_3,   A_3},  // 2
-   {0, C_4,   B_4,   A_4},  // 3
-   {0, C_5,   B_5,   A_5},  // 4
-   {0, C_6,   B_6,   A_6},  // 5
-   {0, C_7,   B_7,   A_7},  // 6
-   {0, C_8,   B_8,   A_8},  // 7
-   {0, C_9,   B_9,   A_9},  // 8
-   {0, C_10,  B_10,  A_10}, // 9
-   {0, C_11,  B_11,  A_11}, // 0
-   {0, C_12,  B_12,  A_12}, // -
-   {0, C_13,  B_13,  A_13}, // =
-   {0, C_14,  B_14,  A_14}, // Bksp
-   {0, C_15,  B_15,  A_15}, // Del
+   {0, SW3_CS1,   SW2_CS1,   SW1_CS1},  // Esc
+   {0, SW3_CS2,   SW2_CS2,   SW1_CS2},  // 1
+   {0, SW3_CS3,   SW2_CS3,   SW1_CS3},  // 2
+   {0, SW3_CS4,   SW2_CS4,   SW1_CS4},  // 3
+   {0, SW3_CS5,   SW2_CS5,   SW1_CS5},  // 4
+   {0, SW3_CS6,   SW2_CS6,   SW1_CS6},  // 5
+   {0, SW3_CS7,   SW2_CS7,   SW1_CS7},  // 6
+   {0, SW3_CS8,   SW2_CS8,   SW1_CS8},  // 7
+   {0, SW3_CS9,   SW2_CS9,   SW1_CS9},  // 8
+   {0, SW3_CS10,  SW2_CS10,  SW1_CS10}, // 9
+   {0, SW3_CS11,  SW2_CS11,  SW1_CS11}, // 0
+   {0, SW3_CS12,  SW2_CS12,  SW1_CS12}, // -
+   {0, SW3_CS13,  SW2_CS13,  SW1_CS13}, // =
+   {0, SW3_CS14,  SW2_CS14,  SW1_CS14}, // Bksp
+   {0, SW3_CS15,  SW2_CS15,  SW1_CS15}, // Del
 
-   {0, F_1,   E_1,   D_1},  // Tab
-   {0, F_2,   E_2,   D_2},  // Q
-   {0, F_3,   E_3,   D_3},  // W
-   {0, F_4,   E_4,   D_4},  // E
-   {0, F_5,   E_5,   D_5},  // R
-   {0, F_6,   E_6,   D_6},  // T
-   {0, F_7,   E_7,   D_7},  // Y
-   {0, F_8,   E_8,   D_8},  // U
-   {0, F_9,   E_9,   D_9},  // I
-   {0, F_10,  E_10,  D_10}, // O
-   {0, F_11,  E_11,  D_11}, // P
-   {0, F_12,  E_12,  D_12}, // [
-   {0, F_13,  E_13,  D_13}, // ]
-   {0, F_14,  E_14,  D_14}, // Pipe
-   {0, F_15,  E_15,  D_15}, // Home
+   {0, SW6_CS1,   SW5_CS1,   SW4_CS1},  // Tab
+   {0, SW6_CS2,   SW5_CS2,   SW4_CS2},  // Q
+   {0, SW6_CS3,   SW5_CS3,   SW4_CS3},  // W
+   {0, SW6_CS4,   SW5_CS4,   SW4_CS4},  // E
+   {0, SW6_CS5,   SW5_CS5,   SW4_CS5},  // R
+   {0, SW6_CS6,   SW5_CS6,   SW4_CS6},  // T
+   {0, SW6_CS7,   SW5_CS7,   SW4_CS7},  // Y
+   {0, SW6_CS8,   SW5_CS8,   SW4_CS8},  // U
+   {0, SW6_CS9,   SW5_CS9,   SW4_CS9},  // I
+   {0, SW6_CS10,  SW5_CS10,  SW4_CS10}, // O
+   {0, SW6_CS11,  SW5_CS11,  SW4_CS11}, // P
+   {0, SW6_CS12,  SW5_CS12,  SW4_CS12}, // [
+   {0, SW6_CS13,  SW5_CS13,  SW4_CS13}, // ]
+   {0, SW6_CS14,  SW5_CS14,  SW4_CS14}, // Pipe
+   {0, SW6_CS15,  SW5_CS15,  SW4_CS15}, // Home
 
-   {0, I_1,   H_1,   G_1},  // Caps
-   {0, I_2,   H_2,   G_2},  // A
-   {0, I_3,   H_3,   G_3},  // S
-   {0, I_4,   H_4,   G_4},  // D
-   {0, I_5,   H_5,   G_5},  // F
-   {0, I_6,   H_6,   G_6},  // G
-   {0, I_7,   H_7,   G_7},  // H
-   {0, I_8,   H_8,   G_8},  // J
-   {0, I_9,   H_9,   G_9},  // K
-   {0, I_10,  H_10,  G_10}, // L
-   {0, I_11,  H_11,  G_11}, // :
-   {0, I_12,  H_12,  G_12}, // '
-   {0, I_14,  H_14,  G_14}, // Enter
-   {0, I_15,  H_15,  G_15}, // PgUp
+   {0, SW9_CS1,   SW8_CS1,   SW7_CS1},  // Caps
+   {0, SW9_CS2,   SW8_CS2,   SW7_CS2},  // A
+   {0, SW9_CS3,   SW8_CS3,   SW7_CS3},  // S
+   {0, SW9_CS4,   SW8_CS4,   SW7_CS4},  // D
+   {0, SW9_CS5,   SW8_CS5,   SW7_CS5},  // F
+   {0, SW9_CS6,   SW8_CS6,   SW7_CS6},  // G
+   {0, SW9_CS7,   SW8_CS7,   SW7_CS7},  // H
+   {0, SW9_CS8,   SW8_CS8,   SW7_CS8},  // J
+   {0, SW9_CS9,   SW8_CS9,   SW7_CS9},  // K
+   {0, SW9_CS10,  SW8_CS10,  SW7_CS10}, // L
+   {0, SW9_CS11,  SW8_CS11,  SW7_CS11}, // :
+   {0, SW9_CS12,  SW8_CS12,  SW7_CS12}, // '
+   {0, SW9_CS14,  SW8_CS14,  SW7_CS14}, // Enter
+   {0, SW9_CS15,  SW8_CS15,  SW7_CS15}, // PgUp
 
-   {0, L_1,   K_1,   J_1},  // LShift
-   {0, L_2,   K_2,   J_2},  // Z
-   {0, L_3,   K_3,   J_3},  // X
-   {0, L_4,   K_4,   J_4},  // C
-   {0, L_5,   K_5,   J_5},  // V
-   {0, L_6,   K_6,   J_6},  // B
-   {0, L_7,   K_7,   J_7},  // N
-   {0, L_8,   K_8,   J_8},  // M
-   {0, L_9,   K_9,   J_9},  // <
-   {0, L_10,  K_10,  J_10}, // >
-   {0, L_11,  K_11,  J_11}, // ?
-   {0, L_12,  K_12,  J_12}, // RShift
-   {0, L_14,  K_14,  J_14}, // Up
-   {0, L_15,  K_15,  J_15}, // PgOn
+   {0, SW12_CS1,   SW11_CS1,   SW10_CS1},  // LShift
+   {0, SW12_CS2,   SW11_CS2,   SW10_CS2},  // Z
+   {0, SW12_CS3,   SW11_CS3,   SW10_CS3},  // X
+   {0, SW12_CS4,   SW11_CS4,   SW10_CS4},  // C
+   {0, SW12_CS5,   SW11_CS5,   SW10_CS5},  // V
+   {0, SW12_CS6,   SW11_CS6,   SW10_CS6},  // B
+   {0, SW12_CS7,   SW11_CS7,   SW10_CS7},  // N
+   {0, SW12_CS8,   SW11_CS8,   SW10_CS8},  // M
+   {0, SW12_CS9,   SW11_CS9,   SW10_CS9},  // <
+   {0, SW12_CS10,  SW11_CS10,  SW10_CS10}, // >
+   {0, SW12_CS11,  SW11_CS11,  SW10_CS11}, // ?
+   {0, SW12_CS12,  SW11_CS12,  SW10_CS12}, // RShift
+   {0, SW12_CS14,  SW11_CS14,  SW10_CS14}, // Up
+   {0, SW12_CS15,  SW11_CS15,  SW10_CS15}, // PgOn
 
-   {1, C_1,   B_1,   A_1},  // LCtrl
-   {1, C_2,   B_2,   A_2},  // LAlt
-   {1, C_3,   B_3,   A_3},  // Windows
-   {1, C_6,   B_6,   A_6},  // Space
-   {1, C_10,  B_10,  A_10}, // Fn1/RAlt hades/venus
-   {1, C_11,  B_11,  A_11}, // Fn2/Fn1
-   {1, C_12,  B_12,  A_12}, // RCtrl/Fn2
-   {1, C_13,  B_13,  A_13}, // LEFT/RCtrl
-   {1, C_14,  B_14,  A_14}, // DOWN
-   {1, C_15,  B_15,  A_15}  // RIGHT
+   {1, SW3_CS1,   SW2_CS1,   SW1_CS1},  // LCtrl
+   {1, SW3_CS2,   SW2_CS2,   SW1_CS2},  // LAlt
+   {1, SW3_CS3,   SW2_CS3,   SW1_CS3},  // Windows
+   {1, SW3_CS6,   SW2_CS6,   SW1_CS6},  // Space
+   {1, SW3_CS10,  SW2_CS10,  SW1_CS10}, // Fn1/RAlt hades/venus
+   {1, SW3_CS11,  SW2_CS11,  SW1_CS11}, // Fn2/Fn1
+   {1, SW3_CS12,  SW2_CS12,  SW1_CS12}, // RCtrl/Fn2
+   {1, SW3_CS13,  SW2_CS13,  SW1_CS13}, // LEFT/RCtrl
+   {1, SW3_CS14,  SW2_CS14,  SW1_CS14}, // DOWN
+   {1, SW3_CS15,  SW2_CS15,  SW1_CS15}  // RIGHT
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/durgod/dgk6x/hades_iso/config.h b/keyboards/durgod/dgk6x/hades_iso/config.h
index ed9494a9901..f23b355905d 100644
--- a/keyboards/durgod/dgk6x/hades_iso/config.h
+++ b/keyboards/durgod/dgk6x/hades_iso/config.h
@@ -16,7 +16,4 @@
 
 #pragma once
 
-#define DRIVER_1_LED_TOTAL 59
-#define DRIVER_2_LED_TOTAL 10   
-
 #define CAPS_LED 29
diff --git a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
index 42f43645f58..5ccc60e841e 100644
--- a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
+++ b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
@@ -19,7 +19,7 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -27,79 +27,79 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 
-   {0, C_1,   B_1,   A_1},  // Esc
-   {0, C_2,   B_2,   A_2},  // 1
-   {0, C_3,   B_3,   A_3},  // 2
-   {0, C_4,   B_4,   A_4},  // 3
-   {0, C_5,   B_5,   A_5},  // 4
-   {0, C_6,   B_6,   A_6},  // 5
-   {0, C_7,   B_7,   A_7},  // 6
-   {0, C_8,   B_8,   A_8},  // 7
-   {0, C_9,   B_9,   A_9},  // 8
-   {0, C_10,  B_10,  A_10}, // 9
-   {0, C_11,  B_11,  A_11}, // 0
-   {0, C_12,  B_12,  A_12}, // -
-   {0, C_13,  B_13,  A_13}, // =
-   {0, C_14,  B_14,  A_14}, // Bksp
-   {0, C_15,  B_15,  A_15}, // Del
+   {0, SW3_CS1,   SW2_CS1,   SW1_CS1},  // Esc
+   {0, SW3_CS2,   SW2_CS2,   SW1_CS2},  // 1
+   {0, SW3_CS3,   SW2_CS3,   SW1_CS3},  // 2
+   {0, SW3_CS4,   SW2_CS4,   SW1_CS4},  // 3
+   {0, SW3_CS5,   SW2_CS5,   SW1_CS5},  // 4
+   {0, SW3_CS6,   SW2_CS6,   SW1_CS6},  // 5
+   {0, SW3_CS7,   SW2_CS7,   SW1_CS7},  // 6
+   {0, SW3_CS8,   SW2_CS8,   SW1_CS8},  // 7
+   {0, SW3_CS9,   SW2_CS9,   SW1_CS9},  // 8
+   {0, SW3_CS10,  SW2_CS10,  SW1_CS10}, // 9
+   {0, SW3_CS11,  SW2_CS11,  SW1_CS11}, // 0
+   {0, SW3_CS12,  SW2_CS12,  SW1_CS12}, // -
+   {0, SW3_CS13,  SW2_CS13,  SW1_CS13}, // =
+   {0, SW3_CS14,  SW2_CS14,  SW1_CS14}, // Bksp
+   {0, SW3_CS15,  SW2_CS15,  SW1_CS15}, // Del
 
-   {0, F_1,   E_1,   D_1},  // Tab
-   {0, F_2,   E_2,   D_2},  // Q
-   {0, F_3,   E_3,   D_3},  // W
-   {0, F_4,   E_4,   D_4},  // E
-   {0, F_5,   E_5,   D_5},  // R
-   {0, F_6,   E_6,   D_6},  // T
-   {0, F_7,   E_7,   D_7},  // Y
-   {0, F_8,   E_8,   D_8},  // U
-   {0, F_9,   E_9,   D_9},  // I
-   {0, F_10,  E_10,  D_10}, // O
-   {0, F_11,  E_11,  D_11}, // P
-   {0, F_12,  E_12,  D_12}, // [
-   {0, F_13,  E_13,  D_13}, // ]
-   {0, F_15,  E_15,  D_15}, // Home
+   {0, SW6_CS1,   SW5_CS1,   SW4_CS1},  // Tab
+   {0, SW6_CS2,   SW5_CS2,   SW4_CS2},  // Q
+   {0, SW6_CS3,   SW5_CS3,   SW4_CS3},  // W
+   {0, SW6_CS4,   SW5_CS4,   SW4_CS4},  // E
+   {0, SW6_CS5,   SW5_CS5,   SW4_CS5},  // R
+   {0, SW6_CS6,   SW5_CS6,   SW4_CS6},  // T
+   {0, SW6_CS7,   SW5_CS7,   SW4_CS7},  // Y
+   {0, SW6_CS8,   SW5_CS8,   SW4_CS8},  // U
+   {0, SW6_CS9,   SW5_CS9,   SW4_CS9},  // I
+   {0, SW6_CS10,  SW5_CS10,  SW4_CS10}, // O
+   {0, SW6_CS11,  SW5_CS11,  SW4_CS11}, // P
+   {0, SW6_CS12,  SW5_CS12,  SW4_CS12}, // [
+   {0, SW6_CS13,  SW5_CS13,  SW4_CS13}, // ]
+   {0, SW6_CS15,  SW5_CS15,  SW4_CS15}, // Home
 
-   {0, I_1,   H_1,   G_1},  // Caps
-   {0, I_2,   H_2,   G_2},  // A
-   {0, I_3,   H_3,   G_3},  // S
-   {0, I_4,   H_4,   G_4},  // D
-   {0, I_5,   H_5,   G_5},  // F
-   {0, I_6,   H_6,   G_6},  // G
-   {0, I_7,   H_7,   G_7},  // H
-   {0, I_8,   H_8,   G_8},  // J
-   {0, I_9,   H_9,   G_9},  // K
-   {0, I_10,  H_10,  G_10}, // L
-   {0, I_11,  H_11,  G_11}, // :
-   {0, I_12,  H_12,  G_12}, // '
-   {0, I_13,  H_13,  G_13}, // NUHS
-   {0, I_14,  H_14,  G_14}, // Enter
-   {0, I_15,  H_15,  G_15}, // PgUp
+   {0, SW9_CS1,   SW8_CS1,   SW7_CS1},  // Caps
+   {0, SW9_CS2,   SW8_CS2,   SW7_CS2},  // A
+   {0, SW9_CS3,   SW8_CS3,   SW7_CS3},  // S
+   {0, SW9_CS4,   SW8_CS4,   SW7_CS4},  // D
+   {0, SW9_CS5,   SW8_CS5,   SW7_CS5},  // F
+   {0, SW9_CS6,   SW8_CS6,   SW7_CS6},  // G
+   {0, SW9_CS7,   SW8_CS7,   SW7_CS7},  // H
+   {0, SW9_CS8,   SW8_CS8,   SW7_CS8},  // J
+   {0, SW9_CS9,   SW8_CS9,   SW7_CS9},  // K
+   {0, SW9_CS10,  SW8_CS10,  SW7_CS10}, // L
+   {0, SW9_CS11,  SW8_CS11,  SW7_CS11}, // :
+   {0, SW9_CS12,  SW8_CS12,  SW7_CS12}, // '
+   {0, SW9_CS13,  SW8_CS13,  SW7_CS13}, // NUHS
+   {0, SW9_CS14,  SW8_CS14,  SW7_CS14}, // Enter
+   {0, SW9_CS15,  SW8_CS15,  SW7_CS15}, // PgUp
 
-   {0, L_1,   K_1,   J_1},  // LShift
-   {0, L_2,   K_2,   J_2},  // NUBS
-   {0, L_3,   K_3,   J_3},  // Z
-   {0, L_4,   K_4,   J_4},  // X
-   {0, L_5,   K_5,   J_5},  // C
-   {0, L_6,   K_6,   J_6},  // V
-   {0, L_7,   K_7,   J_7},  // B
-   {0, L_8,   K_8,   J_8},  // N
-   {0, L_9,   K_9,   J_9},  // M
-   {0, L_10,  K_10,  J_10}, // <
-   {0, L_11,  K_11,  J_11}, // >
-   {0, L_12,  K_12,  J_12}, // ?
-   {0, L_13,  K_13,  J_13}, // RShift
-   {0, L_14,  K_14,  J_14}, // Up
-   {0, L_15,  K_15,  J_15}, // PgOn
+   {0, SW12_CS1,   SW11_CS1,   SW10_CS1},  // LShift
+   {0, SW12_CS2,   SW11_CS2,   SW10_CS2},  // NUBS
+   {0, SW12_CS3,   SW11_CS3,   SW10_CS3},  // Z
+   {0, SW12_CS4,   SW11_CS4,   SW10_CS4},  // X
+   {0, SW12_CS5,   SW11_CS5,   SW10_CS5},  // C
+   {0, SW12_CS6,   SW11_CS6,   SW10_CS6},  // V
+   {0, SW12_CS7,   SW11_CS7,   SW10_CS7},  // B
+   {0, SW12_CS8,   SW11_CS8,   SW10_CS8},  // N
+   {0, SW12_CS9,   SW11_CS9,   SW10_CS9},  // M
+   {0, SW12_CS10,  SW11_CS10,  SW10_CS10}, // <
+   {0, SW12_CS11,  SW11_CS11,  SW10_CS11}, // >
+   {0, SW12_CS12,  SW11_CS12,  SW10_CS12}, // ?
+   {0, SW12_CS13,  SW11_CS13,  SW10_CS13}, // RShift
+   {0, SW12_CS14,  SW11_CS14,  SW10_CS14}, // Up
+   {0, SW12_CS15,  SW11_CS15,  SW10_CS15}, // PgOn
 
-   {1, C_1,   B_1,   A_1},  // LCtrl
-   {1, C_2,   B_2,   A_2},  // LAlt
-   {1, C_3,   B_3,   A_3},  // Windows
-   {1, C_6,   B_6,   A_6},  // Space
-   {1, C_10,  B_10,  A_10}, // Fn1/RAlt hades/venus
-   {1, C_11,  B_11,  A_11}, // Fn2/Fn1
-   {1, C_12,  B_12,  A_12}, // RCtrl/Fn2
-   {1, C_13,  B_13,  A_13}, // LEFT/RCtrl
-   {1, C_14,  B_14,  A_14}, // DOWN
-   {1, C_15,  B_15,  A_15}  // RIGHT
+   {1, SW3_CS1,   SW2_CS1,   SW1_CS1},  // LCtrl
+   {1, SW3_CS2,   SW2_CS2,   SW1_CS2},  // LAlt
+   {1, SW3_CS3,   SW2_CS3,   SW1_CS3},  // Windows
+   {1, SW3_CS6,   SW2_CS6,   SW1_CS6},  // Space
+   {1, SW3_CS10,  SW2_CS10,  SW1_CS10}, // Fn1/RAlt hades/venus
+   {1, SW3_CS11,  SW2_CS11,  SW1_CS11}, // Fn2/Fn1
+   {1, SW3_CS12,  SW2_CS12,  SW1_CS12}, // RCtrl/Fn2
+   {1, SW3_CS13,  SW2_CS13,  SW1_CS13}, // LEFT/RCtrl
+   {1, SW3_CS14,  SW2_CS14,  SW1_CS14}, // DOWN
+   {1, SW3_CS15,  SW2_CS15,  SW1_CS15}  // RIGHT
 };
 
 #endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json
index a52d0a9b8f7..b8d38e2d9f9 100644
--- a/keyboards/durgod/dgk6x/info.json
+++ b/keyboards/durgod/dgk6x/info.json
@@ -5,7 +5,52 @@
         "on_state": 0
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "is31fl3733",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
     },
     "processor": "STM32F072", // F070
     "bootloader": "stm32-dfu",
diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h
index ab3f57914ed..a03084f2e69 100644
--- a/keyboards/durgod/dgk6x/venus/config.h
+++ b/keyboards/durgod/dgk6x/venus/config.h
@@ -16,9 +16,4 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define DRIVER_1_LED_TOTAL 53
-#define DRIVER_2_LED_TOTAL 8
-#endif
-
 #define CAPS_LED 28
diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c
index d48e95fb212..9bde901374b 100644
--- a/keyboards/durgod/dgk6x/venus/venus.c
+++ b/keyboards/durgod/dgk6x/venus/venus.c
@@ -18,7 +18,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -26,71 +26,71 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 
-   {0, C_1,   B_1,   A_1},  // Esc
-   {0, C_2,   B_2,   A_2},  // 1
-   {0, C_3,   B_3,   A_3},  // 2
-   {0, C_4,   B_4,   A_4},  // 3
-   {0, C_5,   B_5,   A_5},  // 4
-   {0, C_6,   B_6,   A_6},  // 5
-   {0, C_7,   B_7,   A_7},  // 6
-   {0, C_8,   B_8,   A_8},  // 7
-   {0, C_9,   B_9,   A_9},  // 8
-   {0, C_10,  B_10,  A_10}, // 9
-   {0, C_11,  B_11,  A_11}, // 0
-   {0, C_12,  B_12,  A_12}, // -
-   {0, C_13,  B_13,  A_13}, // =
-   {0, C_14,  B_14,  A_14}, // Bksp
+   {0, SW3_CS1,   SW2_CS1,   SW1_CS1},  // Esc
+   {0, SW3_CS2,   SW2_CS2,   SW1_CS2},  // 1
+   {0, SW3_CS3,   SW2_CS3,   SW1_CS3},  // 2
+   {0, SW3_CS4,   SW2_CS4,   SW1_CS4},  // 3
+   {0, SW3_CS5,   SW2_CS5,   SW1_CS5},  // 4
+   {0, SW3_CS6,   SW2_CS6,   SW1_CS6},  // 5
+   {0, SW3_CS7,   SW2_CS7,   SW1_CS7},  // 6
+   {0, SW3_CS8,   SW2_CS8,   SW1_CS8},  // 7
+   {0, SW3_CS9,   SW2_CS9,   SW1_CS9},  // 8
+   {0, SW3_CS10,  SW2_CS10,  SW1_CS10}, // 9
+   {0, SW3_CS11,  SW2_CS11,  SW1_CS11}, // 0
+   {0, SW3_CS12,  SW2_CS12,  SW1_CS12}, // -
+   {0, SW3_CS13,  SW2_CS13,  SW1_CS13}, // =
+   {0, SW3_CS14,  SW2_CS14,  SW1_CS14}, // Bksp
 
-   {0, F_1,   E_1,   D_1},  // Tab
-   {0, F_2,   E_2,   D_2},  // Q
-   {0, F_3,   E_3,   D_3},  // W
-   {0, F_4,   E_4,   D_4},  // E
-   {0, F_5,   E_5,   D_5},  // R
-   {0, F_6,   E_6,   D_6},  // T
-   {0, F_7,   E_7,   D_7},  // Y
-   {0, F_8,   E_8,   D_8},  // U
-   {0, F_9,   E_9,   D_9},  // I
-   {0, F_10,  E_10,  D_10}, // O
-   {0, F_11,  E_11,  D_11}, // P
-   {0, F_12,  E_12,  D_12}, // [
-   {0, F_13,  E_13,  D_13}, // ]
-   {0, F_14,  E_14,  D_14}, // Pipe
+   {0, SW6_CS1,   SW5_CS1,   SW4_CS1},  // Tab
+   {0, SW6_CS2,   SW5_CS2,   SW4_CS2},  // Q
+   {0, SW6_CS3,   SW5_CS3,   SW4_CS3},  // W
+   {0, SW6_CS4,   SW5_CS4,   SW4_CS4},  // E
+   {0, SW6_CS5,   SW5_CS5,   SW4_CS5},  // R
+   {0, SW6_CS6,   SW5_CS6,   SW4_CS6},  // T
+   {0, SW6_CS7,   SW5_CS7,   SW4_CS7},  // Y
+   {0, SW6_CS8,   SW5_CS8,   SW4_CS8},  // U
+   {0, SW6_CS9,   SW5_CS9,   SW4_CS9},  // I
+   {0, SW6_CS10,  SW5_CS10,  SW4_CS10}, // O
+   {0, SW6_CS11,  SW5_CS11,  SW4_CS11}, // P
+   {0, SW6_CS12,  SW5_CS12,  SW4_CS12}, // [
+   {0, SW6_CS13,  SW5_CS13,  SW4_CS13}, // ]
+   {0, SW6_CS14,  SW5_CS14,  SW4_CS14}, // Pipe
 
-   {0, I_1,   H_1,   G_1},  // Caps
-   {0, I_2,   H_2,   G_2},  // A
-   {0, I_3,   H_3,   G_3},  // S
-   {0, I_4,   H_4,   G_4},  // D
-   {0, I_5,   H_5,   G_5},  // F
-   {0, I_6,   H_6,   G_6},  // G
-   {0, I_7,   H_7,   G_7},  // H
-   {0, I_8,   H_8,   G_8},  // J
-   {0, I_9,   H_9,   G_9},  // K
-   {0, I_10,  H_10,  G_10}, // L
-   {0, I_11,  H_11,  G_11}, // :
-   {0, I_12,  H_12,  G_12}, // '
-   {0, I_14,  H_14,  G_14}, // Enter
+   {0, SW9_CS1,   SW8_CS1,   SW7_CS1},  // Caps
+   {0, SW9_CS2,   SW8_CS2,   SW7_CS2},  // A
+   {0, SW9_CS3,   SW8_CS3,   SW7_CS3},  // S
+   {0, SW9_CS4,   SW8_CS4,   SW7_CS4},  // D
+   {0, SW9_CS5,   SW8_CS5,   SW7_CS5},  // F
+   {0, SW9_CS6,   SW8_CS6,   SW7_CS6},  // G
+   {0, SW9_CS7,   SW8_CS7,   SW7_CS7},  // H
+   {0, SW9_CS8,   SW8_CS8,   SW7_CS8},  // J
+   {0, SW9_CS9,   SW8_CS9,   SW7_CS9},  // K
+   {0, SW9_CS10,  SW8_CS10,  SW7_CS10}, // L
+   {0, SW9_CS11,  SW8_CS11,  SW7_CS11}, // :
+   {0, SW9_CS12,  SW8_CS12,  SW7_CS12}, // '
+   {0, SW9_CS14,  SW8_CS14,  SW7_CS14}, // Enter
 
-   {0, L_1,   K_1,   J_1},  // LShift
-   {0, L_2,   K_2,   J_2},  // Z
-   {0, L_3,   K_3,   J_3},  // X
-   {0, L_4,   K_4,   J_4},  // C
-   {0, L_5,   K_5,   J_5},  // V
-   {0, L_6,   K_6,   J_6},  // B
-   {0, L_7,   K_7,   J_7},  // N
-   {0, L_8,   K_8,   J_8},  // M
-   {0, L_9,   K_9,   J_9},  // <
-   {0, L_10,  K_10,  J_10}, // >
-   {0, L_11,  K_11,  J_11}, // ?
-   {0, L_12,  K_12,  J_12}, // RShift
+   {0, SW12_CS1,   SW11_CS1,   SW10_CS1},  // LShift
+   {0, SW12_CS2,   SW11_CS2,   SW10_CS2},  // Z
+   {0, SW12_CS3,   SW11_CS3,   SW10_CS3},  // X
+   {0, SW12_CS4,   SW11_CS4,   SW10_CS4},  // C
+   {0, SW12_CS5,   SW11_CS5,   SW10_CS5},  // V
+   {0, SW12_CS6,   SW11_CS6,   SW10_CS6},  // B
+   {0, SW12_CS7,   SW11_CS7,   SW10_CS7},  // N
+   {0, SW12_CS8,   SW11_CS8,   SW10_CS8},  // M
+   {0, SW12_CS9,   SW11_CS9,   SW10_CS9},  // <
+   {0, SW12_CS10,  SW11_CS10,  SW10_CS10}, // >
+   {0, SW12_CS11,  SW11_CS11,  SW10_CS11}, // ?
+   {0, SW12_CS12,  SW11_CS12,  SW10_CS12}, // RShift
 
-   {1, C_1,   B_1,   A_1},  // LCtrl
-   {1, C_2,   B_2,   A_2},  // LAlt
-   {1, C_3,   B_3,   A_3},  // Windows
-   {1, C_6,   B_6,   A_6},  // Space
-   {1, C_10,  B_10,  A_10}, // Fn1/RAlt hades/venus
-   {1, C_11,  B_11,  A_11}, // Fn2/Fn1
-   {1, C_12,  B_12,  A_12}, // RCtrl/Fn2
-   {1, C_13,  B_13,  A_13}, // LEFT/RCtrl
+   {1, SW3_CS1,   SW2_CS1,   SW1_CS1},  // LCtrl
+   {1, SW3_CS2,   SW2_CS2,   SW1_CS2},  // LAlt
+   {1, SW3_CS3,   SW2_CS3,   SW1_CS3},  // Windows
+   {1, SW3_CS6,   SW2_CS6,   SW1_CS6},  // Space
+   {1, SW3_CS10,  SW2_CS10,  SW1_CS10}, // Fn1/RAlt hades/venus
+   {1, SW3_CS11,  SW2_CS11,  SW1_CS11}, // Fn2/Fn1
+   {1, SW3_CS12,  SW2_CS12,  SW1_CS12}, // RCtrl/Fn2
+   {1, SW3_CS13,  SW2_CS13,  SW1_CS13}, // LEFT/RCtrl
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/durgod/k310/keymaps/chimera/keymap.c b/keyboards/durgod/k310/keymaps/chimera/keymap.c
deleted file mode 100644
index 9caf4078137..00000000000
--- a/keyboards/durgod/k310/keymaps/chimera/keymap.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* Copyright 2021 Don Kjer and Tyler Tidman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-enum _layer {
-    _WBL,
-    _WFL,
-    _WSL,
-    _MBL,
-    _MFL,
-    _MSL
-};
-
-#ifndef DEFAULT_LAYOUT
-# define DEFAULT_LAYOUT _WBL // Change to _MBL to boot into Mac layout.
-#endif
-#ifndef ALT_LAYOUT
-# define ALT_LAYOUT     _MBL // Layout to display 'MR' led when active.
-#endif
-
-static bool win_key_locked = false;
-static bool mac_media_locked = false;
-static bool win_appkey_pressed = false;
-static bool mac_fnkey_pressed = false;
-
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    KC_TGUI = SAFE_RANGE,  // Toggle between GUI Lock or Unlock (Windows)
-    KC_TMED,               // Toggle between Fx keys or Media keys (Mac)
-    KC_WFN,                // Windows function key
-    KC_MFN,                // Mac function key
-    MO_WSL,                // Windows system key
-    MO_MSL,                // Mac system key
-    DF_W2MBL,              // Change layout from Windows to Mac
-    DF_M2WBL               // Change layout from Mac to Windows
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _WBL: Windows Base Layer (Default Layer)
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Slk│Pse│
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤ + │
-   * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │Entr│               │ 4 │ 5 │ 6 │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
-   * │Ctrl│GUI │Alt │                        │ Alt│Func│ App│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-    [_WBL] = LAYOUT_all( /* Windows Base Layer */
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  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_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    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, KC_WFN,  KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
-    ),
-  /* Keymap _WFL: Windows Function Layer
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │   │   │Ply│Stp│Prv│Nxt│ │Mut│Vo+│Vo-│   │ │   │   │   │   │ │   │   │Mut│
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │Vo+│ │   │   │   │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │Vo-│ │   │   │   │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤   │
-   * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │               │   │   │   │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
-   * │    │Lock│    │                        │    │Func│ Sys│    │ │   │   │   │ │       │   │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-  [_WFL] = LAYOUT_all( /* Windows Function Layer */
-        _______,          KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______,    _______, _______, KC_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_VOLU,    _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_VOLD,    _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                  _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,             _______, _______, _______, _______,
-        _______, KC_TGUI, _______,                            _______,                            _______, _______, MO_WSL,  _______,    _______, _______, _______,    _______,          _______
-    ),
-  /* Keymap _WSL: Windows System Layer
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │Rst│   │Slp│   │   │Pwr│ │   │   │   │   │ │   │   │   │MAC│ │   │   │   │
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │ │   │   │   │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │ │   │   │   │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤   │
-   * │      │   │   │DBG│   │   │   │   │   │   │   │   │   │    │               │   │   │   │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
-   * │    │    │    │                        │    │    │    │    │ │   │   │   │ │       │   │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-    [_WSL] = LAYOUT_all( /* Windows Second / System Layer */
-        QK_BOOT,          KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL,   XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,             XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,          XXXXXXX
-    ),
-
-  /* Keymap _MBL: Mac Base Layer (Alternate Layout)
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │F13│F14│F15│
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤ + │
-   * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │Entr│               │ 4 │ 5 │ 6 │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
-   * │Ctrl│Alt │GUI │                        │ GUI│ Alt│Func│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-    [_MBL] = LAYOUT_all( /* Mac Base Layer */
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_F13,  KC_F14,  KC_F15,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  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_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RALT, KC_MFN,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
-    ),
-  /* Keymap _MFL: Mac Function Layer
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │   │   │Br-│Br+│   │   │ │   │   │Prv│Ply│ │Nxt│Mut│Vo-│Vo+│ │TMd│   │Mut│
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │Vo+│ │   │   │   │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │Vo-│ │   │   │   │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤   │
-   * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │               │   │   │   │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
-   * │    │    │    │                        │    │ Sys│Func│    │ │   │   │   │ │       │   │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-  [_MFL] = LAYOUT_all( /* Mac Function Layer */
-        _______,          KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,    KC_TMED, _______, KC_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_VOLU,     _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_VOLD,     _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,              _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, MO_MSL,  _______, _______,    _______, _______, _______,     _______,          _______
-    ),
-  /* Keymap _MSL: Mac System Layer
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │Rst│   │   │   │   │Slp│ │   │   │   │   │ │   │   │   │WIN│ │   │   │   │
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │ │   │   │   │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │ │   │   │   │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤   │
-   * │      │   │   │DBG│   │   │   │   │   │   │   │   │   │    │               │   │   │   │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
-   * │    │    │    │                        │    │ Sys│Func│    │ │   │   │   │ │       │   │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-    [_MSL] = LAYOUT_all( /* Mac Second / System Layer */
-        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL,   XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,             XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,          XXXXXXX
-    )
-};
-
-void unlock_win_key(void) {
-    win_key_locked = false;
-    mac_media_locked = false;
-    writePinHigh(LED_WIN_LOCK_PIN);
-}
-
-void toggle_lock_win_key(void) {
-    win_key_locked = !win_key_locked;
-    writePin(LED_WIN_LOCK_PIN, !win_key_locked);
-}
-
-void toggle_lock_media_key(void) {
-    mac_media_locked = !mac_media_locked;
-    writePin(LED_WIN_LOCK_PIN, !mac_media_locked);
-}
-
-#ifdef CONSOLE_ENABLE
-void dprint_global_layers(void) {
-    dprint("Global Layers:");
-    if (IS_LAYER_ON(_WFL)) { dprint(" _WFL"); }
-    if (IS_LAYER_ON(_WSL)) { dprint(" _WSL"); }
-    if (IS_LAYER_ON(_MFL)) { dprint(" _MFL"); }
-    if (IS_LAYER_ON(_MSL)) { dprint(" _MSL"); }
-    dprintf("\n");
-}
-
-void dprint_layers(layer_state_t state) {
-    dprint("Layers:");
-    if (IS_LAYER_ON_STATE(state, _WFL)) { dprint(" _WFL"); }
-    if (IS_LAYER_ON_STATE(state, _WSL)) { dprint(" _WSL"); }
-    if (IS_LAYER_ON_STATE(state, _MFL)) { dprint(" _MFL"); }
-    if (IS_LAYER_ON_STATE(state, _MSL)) { dprint(" _MSL"); }
-    dprintf("\n");
-}
-#endif
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-#ifdef CONSOLE_ENABLE
-    dprintf("default_layer_state_set_user: 0x%x\n", state);
-    dprint_global_layers();
-#endif
-    // Disable windows key lock on default layer transition.
-    unlock_win_key();
-    win_appkey_pressed = false;
-    mac_fnkey_pressed = false;
-    writePin(LED_MR_LOCK_PIN, !IS_LAYER_ON_STATE(state, ALT_LAYOUT));
-    return state;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-#ifdef CONSOLE_ENABLE
-    dprintf("layer_state_set_user: 0x%x\n", state);
-    dprint_layers(state);
-#endif
-    return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_TGUI:
-            if (!record->event.pressed) {
-                // Toggle GUI lock on key release
-                toggle_lock_win_key();
-            }
-            break;
-        case KC_TMED:
-            // Only trigger when Fn key is also held down, to avoid accidental unlock.
-            if (!mac_fnkey_pressed) { return false; }
-            if (!record->event.pressed) {
-                // Toggle Media Lock on key release
-                toggle_lock_media_key();
-            }
-            break;
-        case KC_LGUI:
-            if (win_key_locked) { return false; }
-            break;
-        case KC_WFN:
-            // Like MO(_WFL), but also enables _WSL if KC_APP is already pressed down.
-            if (record->event.pressed) {
-                layer_on(_WFL);
-                if (win_appkey_pressed) {
-                    // Also enable Secondary layer if App key is being held down.
-                    win_appkey_pressed = false;
-                    layer_on(_WSL);
-                }
-            } else {
-                if (IS_LAYER_ON(_WFL)) { layer_off(_WFL); }
-                if (IS_LAYER_ON(_MSL)) { layer_off(_MSL); }
-            }
-            break;
-        case KC_APP:
-            if (record->event.pressed) {
-                // Don't actually press down the app menu key
-                win_appkey_pressed = true;
-            } else {
-                if (IS_LAYER_ON(_WSL)) { layer_off(_WSL); }
-                if (IS_LAYER_ON(_MFL)) { layer_off(_MFL); }
-                if (win_appkey_pressed) {
-                    win_appkey_pressed = false;
-                    // Tap the KC_APP key on key release.
-                    tap_code(KC_APP);
-                }
-            }
-            return false;
-            break;
-        case KC_MFN:
-            // Mac Fn key.  Emit Fn keycode, and also transition layers similar to KC_WFN.
-            if (record->event.pressed) {
-                mac_fnkey_pressed = true;
-                layer_on(_MFL);
-                // Also enable Secondary layer if Right-Alt key is being held down.
-                if (get_mods() & MOD_BIT(KC_RALT)) {
-                    layer_on(_MSL);
-                }
-            } else {
-                mac_fnkey_pressed = false;
-                if (!mac_media_locked) {
-                    if (IS_LAYER_ON(_MFL)) { layer_off(_MFL); }
-                    if (IS_LAYER_ON(_WSL)) { layer_off(_WSL); }
-                }
-            }
-            break;
-        case KC_RALT:
-            // Disable MSL/WFL layer on key-up.
-            if (!record->event.pressed) {
-                if (IS_LAYER_ON(_MSL)) { layer_off(_MSL); }
-                if (IS_LAYER_ON(_WFL)) { layer_off(_WFL); }
-            }
-            break;
-        case MO_WSL:
-            if (record->event.pressed) {
-                layer_on(_WSL);
-            } else {
-                if (IS_LAYER_ON(_WSL)) { layer_off(_WSL); }
-                if (IS_LAYER_ON(_MFL)) { layer_off(_MFL); }
-            }
-            break;
-        case MO_MSL:
-            if (record->event.pressed) {
-                layer_on(_MSL);
-            } else {
-                if (IS_LAYER_ON(_MSL)) { layer_off(_MSL); }
-                if (IS_LAYER_ON(_WFL)) { layer_off(_WFL); }
-            }
-            break;
-        case DF_W2MBL:
-            if (!record->event.pressed) {
-                // Switch base layer, but preserve first/secondary layers.
-                default_layer_set(1UL<<_MBL);
-                layer_state_set(1UL<<_MFL | 1UL<<_MSL);
-            }
-            break;
-        case DF_M2WBL:
-            if (!record->event.pressed) {
-                // Switch base layer, but preserve first/secondary layers.
-                default_layer_set(1UL<<_WBL);
-                layer_state_set(1UL<<_WFL | 1UL<<_WSL);
-            }
-            break;
-        case QK_BOOT:
-            if (record->event.pressed) {
-                // Flash LEDs to indicate bootloader mode is enabled.
-                on_all_leds();
-            }
-            break;
-    }
-    return true;
-}
-
-void keyboard_post_init_user(void) {
-    default_layer_set(1UL<<DEFAULT_LAYOUT);
-}
diff --git a/keyboards/durgod/k310/keymaps/chimera/readme.md b/keyboards/durgod/k310/keymaps/chimera/readme.md
deleted file mode 100644
index eb9a3ea5f3b..00000000000
--- a/keyboards/durgod/k310/keymaps/chimera/readme.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# A keymap for Durgod Taurus K310/K320 that supports toggling between Mac and Windows
-
-Supports both ANSI and ISO layouts.
-
-Layer 0 : Standard layout (Windows)
-
-Layer 1 : Media control and Windows lock key (Windows)
-- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
-- Fn + Windows to toggle Windows lock key functionality
-
-Layer 2 : System layer (Windows)
-- Fn + Menu + Esc : Bootloader mode
-- Fn + Menu + F1  : System Sleep
-- Fn + Menu + F4  : Turning Off System
-- Fn + Menu + F12 : Switch to Mac layout
-
-Layer 3 : Mac layout
-
-Layer 4 : Media control and Media lock key (Mac)
- - Standard Mac Media keys for Fn + F1 ~ Fn + F12.
- - Fn + F13 to toggle Media lock key functionality
-
-Layer 5 : System layer (Mac)
-- Fn + R-ALT + Esc : Bootloader mode
-- Fn + R-ALT + F4  : Shutdown/Sleep (Hold down on Mac)
-- Fn + R-ALT + F12 : Switch to Windows layout
-
-## Toggle between Mac and Windows layout
-
-You can switch between Mac and Windows layout by doing the following:
-- Hold down Fn + Menu (Windows Layout) or Fn + Right-Alt (Mac layout)  (These are the same physical keys)
-- Press F12
-
-The 'M' led will be lit when you are using the alternate layout.  By default Mac is the alternate layout.
-
-You can change the default & alternate layout by setting the following flags to either '_WBL'(Windows) or '_MBL' (Mac)
-- DEFAULT_LAYOUT (initial layout to use on boot)
-- ALT_LAYOUT (layout that will light the 'M' LED when active)
-
-For example, to configure Mac as the default layer, and Windows to be the alternate layout, compile with these flags:
-
-    make EXTRAFLAGS="-DDEFAULT_LAYOUT=_MBL -DALT_LAYOUT=_WBL" durgod/k3x0/k310:chimera
-
-## Windows key lock
-
-In windows layout, you can hold down Fn + Windows key to disable the Windows key while in locked mode.  The 'Lock' LED
-indicates if the Windows key is locked.
-
-This is similar to the stock K310/K320 Windows key lock functionality.
-
-## Mac Media Lock
-
-To switch between Function row and Media row in Mac layout, press Fn + PrtSc.  The 'Lock' LED indicator will be lit when in Media row mode.
-
-### Subsequent Flashing
-
-For repeating Flashing you have two options with this keymap:
-1. Use BootMagic
-- BootMagic Lite has been enabled with Assigned "Esc" key 
-- Unplug USB Cable
-- Holding Esc Button 
-- Plug in USB Cable, Keyboard should be in ST-Bootloader state
-2. Use key combination if using default keymap
-- Hold down Fn + Menu (Windows Layout) or Fn + Right-Alt (Mac layout)  (These are the same physical keys)
-- Press Esc.  Keyboard should go into booloader state.
diff --git a/keyboards/durgod/k310/keymaps/chimera/rules.mk b/keyboards/durgod/k310/keymaps/chimera/rules.mk
deleted file mode 100644
index 19843e8a206..00000000000
--- a/keyboards/durgod/k310/keymaps/chimera/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OPT_DEFS += -DWINLOCK_DISABLED
diff --git a/keyboards/durgod/k310/keymaps/typhon/keymap.c b/keyboards/durgod/k310/keymaps/typhon/keymap.c
deleted file mode 100644
index 14f60c73e6f..00000000000
--- a/keyboards/durgod/k310/keymaps/typhon/keymap.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* Copyright 2021 Don Kjer and Tyler Tidman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-enum _layer {
-    _WBL,
-    _WFL,
-    _WSL,
-    _MBL,
-    _MFL,
-    _MSL
-};
-
-#ifndef DEFAULT_LAYOUT
-# define DEFAULT_LAYOUT _WBL // Change to _MBL to boot into Mac layout.
-#endif
-#ifndef ALT_LAYOUT
-# define ALT_LAYOUT     _MBL // Layout to display 'MR' led when active.
-#endif
-
-static bool win_key_locked = false;
-static bool mac_media_locked = false;
-static bool win_appkey_pressed = false;
-static bool mac_fnkey_pressed = false;
-
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    KC_TGUI = SAFE_RANGE,  // Toggle between GUI Lock or Unlock (Windows)
-    KC_TMED,               // Toggle between Fx keys or Media keys (Mac)
-    KC_WFN,                // Windows function key
-    KC_MFN,                // Mac function key
-    MO_WSL,                // Windows system key
-    MO_MSL,                // Mac system key
-    DF_W2MBL,              // Change layout from Windows to Mac
-    DF_M2WBL               // Change layout from Mac to Windows
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _WBL: Windows Base Layer (Default Layer)
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │Esc│   │M1 │M3 │M2 │M4 │ │M1 │M3 │M2 │M4 │ │M1 │M3 │M2 │M4 │ │PSc│Slk│Pse│
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤ + │
-   * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │Entr│               │ 4 │ 5 │ 6 │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
-   * │Ctrl│GUI │Alt │                        │ Alt│Func│ App│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-    [_WBL] = LAYOUT_all( /* Windows Base Layer */
-        KC_ESC,           KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4,    KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  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_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    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, KC_WFN,  KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
-    ),
-  /* Keymap _WFL: Windows Function Layer
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │   │   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │   │   │Mut│
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │Vo+│ │   │   │   │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │Vo-│ │   │   │   │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤   │
-   * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │               │   │   │   │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
-   * │    │Lock│    │                        │    │Func│ Sys│    │ │   │   │   │ │       │   │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-  [_WFL] = LAYOUT_all( /* Windows Function Layer */
-        _______,          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_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_VOLU,    _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_VOLD,    _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                  _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,             _______, _______, _______, _______,
-        _______, KC_TGUI, _______,                            _______,                            _______, _______, MO_WSL,  _______,    _______, _______, _______,    _______,          _______
-    ),
-  /* Keymap _WSL: Windows System Layer
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │Rst│   │Slp│   │   │Pwr│ │   │   │   │   │ │   │   │   │MAC│ │   │   │   │
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │ │   │   │   │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │ │   │   │   │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤   │
-   * │      │   │   │DBG│   │   │   │   │   │   │   │   │   │    │               │   │   │   │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
-   * │    │    │    │                        │    │    │    │    │ │   │   │   │ │       │   │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-    [_WSL] = LAYOUT_all( /* Windows Second / System Layer */
-        QK_BOOT,          KC_SLEP, XXXXXXX, XXXXXXX, KC_PWR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_W2MBL,   XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,             XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,          XXXXXXX
-    ),
-
-  /* Keymap _MBL: Mac Base Layer (Alternate Layout)
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │Esc│   │M1 │M3 │M2 │M4 │ │M1 │M3 │M2 │M4 │ │M1 │M3 │M2 │M4 │ │F13│F14│F15│
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤ + │
-   * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │Entr│               │ 4 │ 5 │ 6 │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
-   * │Ctrl│Alt │GUI │                        │ GUI│ Alt│Func│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-    [_MBL] = LAYOUT_all( /* Mac Base Layer */
-        KC_ESC,           KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN4,    KC_F13,  KC_F14,  KC_F15,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  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_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RALT, KC_MFN,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
-    ),
-  /* Keymap _MFL: Mac Function Layer
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │   │   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │TMd│   │Mut│
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │Vo+│ │   │   │   │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │Vo-│ │   │   │   │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤   │
-   * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │               │   │   │   │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
-   * │    │    │    │                        │    │ Sys│Func│    │ │   │   │   │ │       │   │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-  [_MFL] = LAYOUT_all( /* Mac Function Layer */
-        _______,          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_TMED, _______, KC_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_VOLU,     _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_VOLD,     _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,              _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, MO_MSL,  _______, _______,    _______, _______, _______,     _______,          _______
-    ),
-  /* Keymap _MSL: Mac System Layer
-   * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-   * │Rst│   │   │   │   │Slp│ │   │   │   │   │ │   │   │   │WIN│ │   │   │   │
-   * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │ │   │   │   │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │ │   │   │   │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤   │
-   * │      │   │   │DBG│   │   │   │   │   │   │   │   │   │    │               │   │   │   │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
-   * │    │    │    │                        │    │ Sys│Func│    │ │   │   │   │ │       │   │   │
-   * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
-   */
-    [_MSL] = LAYOUT_all( /* Mac Second / System Layer */
-        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF_M2WBL,   XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,             XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, _______, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,          XXXXXXX
-    )
-};
-
-void unlock_win_key(void) {
-    win_key_locked = false;
-    mac_media_locked = false;
-    writePinHigh(LED_WIN_LOCK_PIN);
-}
-
-void toggle_lock_win_key(void) {
-    win_key_locked = !win_key_locked;
-    writePin(LED_WIN_LOCK_PIN, !win_key_locked);
-}
-
-void toggle_lock_media_key(void) {
-    mac_media_locked = !mac_media_locked;
-    writePin(LED_WIN_LOCK_PIN, !mac_media_locked);
-}
-
-#ifdef CONSOLE_ENABLE
-void dprint_global_layers(void) {
-    dprint("Global Layers:");
-    if (IS_LAYER_ON(_WFL)) { dprint(" _WFL"); }
-    if (IS_LAYER_ON(_WSL)) { dprint(" _WSL"); }
-    if (IS_LAYER_ON(_MFL)) { dprint(" _MFL"); }
-    if (IS_LAYER_ON(_MSL)) { dprint(" _MSL"); }
-    dprintf("\n");
-}
-
-void dprint_layers(layer_state_t state) {
-    dprint("Layers:");
-    if (IS_LAYER_ON_STATE(state, _WFL)) { dprint(" _WFL"); }
-    if (IS_LAYER_ON_STATE(state, _WSL)) { dprint(" _WSL"); }
-    if (IS_LAYER_ON_STATE(state, _MFL)) { dprint(" _MFL"); }
-    if (IS_LAYER_ON_STATE(state, _MSL)) { dprint(" _MSL"); }
-    dprintf("\n");
-}
-#endif
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-#ifdef CONSOLE_ENABLE
-    dprintf("default_layer_state_set_user: 0x%x\n", state);
-    dprint_global_layers();
-#endif
-    // Disable windows key lock on default layer transition.
-    unlock_win_key();
-    win_appkey_pressed = false;
-    mac_fnkey_pressed = false;
-    writePin(LED_MR_LOCK_PIN, !IS_LAYER_ON_STATE(state, ALT_LAYOUT));
-    return state;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-#ifdef CONSOLE_ENABLE
-    dprintf("layer_state_set_user: 0x%x\n", state);
-    dprint_layers(state);
-#endif
-    return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_TGUI:
-            if (!record->event.pressed) {
-                // Toggle GUI lock on key release
-                toggle_lock_win_key();
-            }
-            break;
-        case KC_TMED:
-            // Only trigger when Fn key is also held down, to avoid accidental unlock.
-            if (!mac_fnkey_pressed) { return false; }
-            if (!record->event.pressed) {
-                // Toggle Media Lock on key release
-                toggle_lock_media_key();
-            }
-            break;
-        case KC_LGUI:
-            if (win_key_locked) { return false; }
-            break;
-        case KC_WFN:
-            // Like MO(_WFL), but also enables _WSL if KC_APP is already pressed down.
-            if (record->event.pressed) {
-                layer_on(_WFL);
-                if (win_appkey_pressed) {
-                    // Also enable Secondary layer if App key is being held down.
-                    win_appkey_pressed = false;
-                    layer_on(_WSL);
-                }
-            } else {
-                if (IS_LAYER_ON(_WFL)) { layer_off(_WFL); }
-                if (IS_LAYER_ON(_MSL)) { layer_off(_MSL); }
-            }
-            break;
-        case KC_APP:
-            if (record->event.pressed) {
-                // Don't actually press down the app menu key
-                win_appkey_pressed = true;
-            } else {
-                if (IS_LAYER_ON(_WSL)) { layer_off(_WSL); }
-                if (IS_LAYER_ON(_MFL)) { layer_off(_MFL); }
-                if (win_appkey_pressed) {
-                    win_appkey_pressed = false;
-                    // Tap the KC_APP key on key release.
-                    tap_code(KC_APP);
-                }
-            }
-            return false;
-            break;
-        case KC_MFN:
-            // Mac Fn key.  Emit Fn keycode, and also transition layers similar to KC_WFN.
-            if (record->event.pressed) {
-                mac_fnkey_pressed = true;
-                layer_on(_MFL);
-                // Also enable Secondary layer if Right-Alt key is being held down.
-                if (get_mods() & MOD_BIT(KC_RALT)) {
-                    layer_on(_MSL);
-                }
-            } else {
-                mac_fnkey_pressed = false;
-                if (!mac_media_locked) {
-                    if (IS_LAYER_ON(_MFL)) { layer_off(_MFL); }
-                    if (IS_LAYER_ON(_WSL)) { layer_off(_WSL); }
-                }
-            }
-            break;
-        case KC_RALT:
-            // Disable MSL/WFL layer on key-up.
-            if (!record->event.pressed) {
-                if (IS_LAYER_ON(_MSL)) { layer_off(_MSL); }
-                if (IS_LAYER_ON(_WFL)) { layer_off(_WFL); }
-            }
-            break;
-        case MO_WSL:
-            if (record->event.pressed) {
-                layer_on(_WSL);
-            } else {
-                if (IS_LAYER_ON(_WSL)) { layer_off(_WSL); }
-                if (IS_LAYER_ON(_MFL)) { layer_off(_MFL); }
-            }
-            break;
-        case MO_MSL:
-            if (record->event.pressed) {
-                layer_on(_MSL);
-            } else {
-                if (IS_LAYER_ON(_MSL)) { layer_off(_MSL); }
-                if (IS_LAYER_ON(_WFL)) { layer_off(_WFL); }
-            }
-            break;
-        case DF_W2MBL:
-            if (!record->event.pressed) {
-                // Switch base layer, but preserve first/secondary layers.
-                default_layer_set(1UL<<_MBL);
-                layer_state_set(1UL<<_MFL | 1UL<<_MSL);
-            }
-            break;
-        case DF_M2WBL:
-            if (!record->event.pressed) {
-                // Switch base layer, but preserve first/secondary layers.
-                default_layer_set(1UL<<_WBL);
-                layer_state_set(1UL<<_WFL | 1UL<<_WSL);
-            }
-            break;
-        case QK_BOOT:
-            if (record->event.pressed) {
-                // Flash LEDs to indicate bootloader mode is enabled.
-                on_all_leds();
-            }
-            break;
-    }
-    return true;
-}
-
-void keyboard_post_init_user(void) {
-    default_layer_set(1UL<<DEFAULT_LAYOUT);
-}
diff --git a/keyboards/durgod/k310/keymaps/typhon/readme.md b/keyboards/durgod/k310/keymaps/typhon/readme.md
deleted file mode 100644
index 9ddef43aa51..00000000000
--- a/keyboards/durgod/k310/keymaps/typhon/readme.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# A keymap for Durgod Taurus K310/K320 that supports toggling between Mac and Windows
-
-Supports both ANSI and ISO layouts.
-
-Layer 0 : Standard layout (Windows)
-
-Layer 1 : Media control and Windows lock key (Windows)
-- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
-- Fn + Windows to toggle Windows lock key functionality
-
-Layer 2 : System layer (Windows)
-- Fn + Menu + Esc : Bootloader mode
-- Fn + Menu + F1  : System Sleep
-- Fn + Menu + F4  : Turning Off System
-- Fn + Menu + F12 : Switch to Mac layout
-
-Layer 3 : Mac layout
-
-Layer 4 : Media control and Media lock key (Mac)
- - Standard Mac Media keys for Fn + F1 ~ Fn + F12.
- - Fn + F13 to toggle Media lock key functionality
-
-Layer 5 : System layer (Mac)
-- Fn + R-ALT + Esc : Bootloader mode
-- Fn + R-ALT + F4  : Shutdown/Sleep (Hold down on Mac)
-- Fn + R-ALT + F12 : Switch to Windows layout
-
-## Toggle between Mac and Windows layout
-
-You can switch between Mac and Windows layout by doing the following:
-- Hold down Fn + Menu (Windows Layout) or Fn + Right-Alt (Mac layout)  (These are the same physical keys)
-- Press F12
-
-The 'M' led will be lit when you are using the alternate layout.  By default Mac is the alternate layout.
-
-You can change the default & alternate layout by setting the following flags to either '_WBL'(Windows) or '_MBL' (Mac)
-- DEFAULT_LAYOUT (initial layout to use on boot)
-- ALT_LAYOUT (layout that will light the 'M' LED when active)
-
-For example, to configure Mac as the default layer, and Windows to be the alternate layout, compile with these flags:
-
-    make EXTRAFLAGS="-DDEFAULT_LAYOUT=_MBL -DALT_LAYOUT=_WBL" durgod/k3x0/k310:typhon
-
-## Windows key lock
-
-In windows layout, you can hold down Fn + Windows key to disable the Windows key while in locked mode.  The 'Lock' LED
-indicates if the Windows key is locked.
-
-This is similar to the stock K310/K320 Windows key lock functionality.
-
-## Mac Media Lock
-
-To switch between Function row and Media row in Mac layout, press Fn + PrtSc.  The 'Lock' LED indicator will be lit when in Media row mode.
-
-### Subsequent Flashing
-
-For repeating Flashing you have two options with this keymap:
-1. Use BootMagic
-- BootMagic Lite has been enabled with Assigned "Esc" key 
-- Unplug USB Cable
-- Holding Esc Button 
-- Plug in USB Cable, Keyboard should be in ST-Bootloader state
-2. Use key combination if using default keymap
-- Hold down Fn + Menu (Windows Layout) or Fn + Right-Alt (Mac layout)  (These are the same physical keys)
-- Press Esc.  Keyboard should go into booloader state.
diff --git a/keyboards/durgod/k310/keymaps/typhon/rules.mk b/keyboards/durgod/k310/keymaps/typhon/rules.mk
deleted file mode 100644
index 437d8205c7c..00000000000
--- a/keyboards/durgod/k310/keymaps/typhon/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OPT_DEFS += -DWINLOCK_DISABLED
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
deleted file mode 100644
index 4092126d7fa..00000000000
--- a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Copyright 2021 kuenhlee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _BL     0u
-#define _FL     1u  // Multimedia Related, Virtual Desktop control
-#define _SL     2u  // Just for System Related
-#define _UL     3u  // Unicode Map
-
-#define KC_ADTP LGUI(LCTL(KC_D))      // Adding New Virtual Desktop
-#define KC_DDTP LGUI(LCTL(KC_F4))     // Deleting / Removing Current Virtual Desktop
-#define KC_NDTP LGUI(LCTL(KC_RGHT))   // Navigate to the Next Virtual Desktop
-#define KC_PDTP LGUI(LCTL(KC_LEFT))   // Navigate to the Previous Virtual Desktop
-#define KC_WINL LGUI(KC_LEFT)         // Snap Windows to Left
-#define KC_WINR LGUI(KC_RGHT)         // Snap Windows to Right
-#define KC_WINU LGUI(KC_UP)           // Maximize the Window
-#define KC_WIND LGUI(KC_DOWN)         // Minimize the desktop window
-#define KC_TASK LCTL(LSFT(KC_ESC))    // Launch Task Manager
-
-#define KC_FIND LCTL(LSFT(KC_F))      // Find In Files
-#define KC_STOP LCTL(LSFT(KC_HOME))   // Select from Cursor to Home
-#define KC_SEND LCTL(LSFT(KC_END))    // Select from Cursor to End
-
-// °±²³µ©ΩθΩ√∞∆≈≠→↓←↑≡■□●○∴«»÷≤≥Σ
-// Defines the Enumeration for Unicode Map
-enum unicode_names {
-  DEGR, 
-  PONE,
-  POW2,
-  POW3,
-  MYU,
-  COPY,
-  THET,
-  OHM,
-  SQRT,
-  INFI,
-  DELT,
-  APPR,
-  NEQU,
-  RARR,
-  DARR,
-  LARR,
-  UARR,
-  SAME,
-  BSQR,
-  WSQR,
-  BDOT,
-  WDOT,
-  THFR,
-  DIV,
-  LTOE,
-  MTOE,
-  DLAR,
-  DRAR,
-  SUM,
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-  [DEGR]  = 0x00B0, // °
-  [PONE]  = 0x00B1, // ±
-  [POW2]  = 0x00B2, // ²
-  [POW3]  = 0x00B3, // ³
-  [MYU]   = 0x00B5, // µ
-  [COPY]  = 0x00A9, // ©
-  [THET]  = 0x03B8, // θ
-  [OHM]   = 0x2126, // Ω
-  [SQRT]  = 0x221A, // √
-  [INFI]  = 0x221E, // ∞
-  [DELT]  = 0x0394, // ∆
-  [APPR]  = 0x2248, // ≈
-  [NEQU]  = 0x2260, // ≠
-  [RARR]  = 0x2192, // →
-  [DARR]  = 0x2193, // ↓
-  [LARR]  = 0x2190, // ←
-  [UARR]  = 0x2191, // ↑
-  [SAME]  = 0x2261, // ≡
-  [BSQR]  = 0x25A0, // ■
-  [WSQR]  = 0x25A1, // □
-  [BDOT]  = 0x25CF, // ●
-  [WDOT]  = 0x25CB, // ○
-  [THFR]  = 0x2234, // ∴
-  [DIV]   = 0x00F7, // ÷
-  [LTOE]  = 0x2264, // ≤
-  [MTOE]  = 0x2265, // ≥
-  [DLAR]  = 0x00AB, // «
-  [DRAR]  = 0x00BB, // »
-  [SUM]   = 0x03A3  // Σ
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BL] = LAYOUT_tkl_ansi( /* Base Layer */
-      KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_PSCR,  KC_SCRL,  KC_PAUS,
-      KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
-      KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
-      KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,
-      KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,
-      KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(_FL),  KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-
-  [_FL] = LAYOUT_tkl_ansi( /* First Layer */
-      KC_TRNS,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_CALC,            XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_ADTP,  KC_STOP,  KC_PDTP,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_TASK,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_MSEL,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_DDTP,  KC_SEND,  KC_NDTP,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_FIND,  KC_WHOM,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,            XXXXXXX,  XXXXXXX,  KC_MYCM,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_MAIL,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_MENU,                      KC_WINU,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,                                XXXXXXX,                                MO(_SL),  KC_TRNS,  MO(_UL),  XXXXXXX,  KC_WINL,  KC_WIND,  KC_WINR
-  ),
-
-  [_SL] = LAYOUT_tkl_ansi( /* Second Layer */
-      XXXXXXX,  KC_SLEP,  XXXXXXX,  XXXXXXX,  KC_PWR,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,                      XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,                                XXXXXXX,                                KC_TRNS,  KC_TRNS,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX
-  ),
-
-  [_UL] = LAYOUT_tkl_ansi( /* Unicode Layer */
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,
-      UM(APPR),  UM(NEQU),  UM(POW2),  UM(POW3),  XXXXXXX,  XXXXXXX,  UM(BSQR),  UM(WSQR),  UM(INFI),  UM(BDOT),  UM(WDOT),  XXXXXXX,  UM(PONE),  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  UM(SUM),   XXXXXXX,  UM(MYU),   UM(SAME),  XXXXXXX,  UM(OHM),   UM(DLAR),  UM(DRAR),  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  UM(SQRT),  UM(DELT),  XXXXXXX,  XXXXXXX,  UM(THFR),  XXXXXXX,  XXXXXXX,  XXXXXXX,  UM(THET),  UM(DEGR),  XXXXXXX,
-      XXXXXXX,            XXXXXXX,  XXXXXXX,  UM(COPY),  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  UM(LTOE),  UM(MTOE),  UM(DIV),   XXXXXXX,                      UM(UARR),
-      XXXXXXX,  XXXXXXX,  XXXXXXX,                                XXXXXXX,                                XXXXXXX,  KC_TRNS,  KC_TRNS,  XXXXXXX,  UM(LARR),  UM(DARR),  UM(RARR)
-  )
-};
-
-void matrix_init_user(void) {
-  set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
-}
diff --git a/keyboards/durgod/k320/keymaps/kuenhlee/readme.md b/keyboards/durgod/k320/keymaps/kuenhlee/readme.md
deleted file mode 100644
index 60925e61cf1..00000000000
--- a/keyboards/durgod/k320/keymaps/kuenhlee/readme.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# The kuenhlee keymap for Durgod Taurus K320.
-
-Layer 0 : Standard ANSI 87 Keys TKL layout
-------------------------------------------
-
-Layer 1 : Media control and Key Modifier for Virtual Desktop navagation
------------------------------------------------------------------------
-- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
-  - Fn + F12 Remapped to Launch Calculator
-  - Fn + M   To Launch Media Player
-  - Fn + P   To Mail Client
-  - Fn + G   To Launch Web Browswer / Nagivate to Homepage
-  - Fn + C   To Launch My Computer
-  - Fn + T   Launch Task Manager
-  - Fn + F   Find in Files ( Notepad ++ )
-
-- Windows's Virtual Desktop Navigation
-  - Fn + Ins    To add New Virtual Desktop
-  - Fn + Del    To Delete / Remove Current Virtual Desktop
-  - Fn + PgUp   Navigate to the Next Virtual Desktop
-  - Fn + PgDn   Navigate to the Previous Virtual Desktop
-  
-- Windows ShortKeys
-  - Fn + Left  Snap Windows to Left
-  - Fn + Right Snap Windows to Right
-  - Fn + Up    Maximize the Window
-  - Fn + Down  Minimize the desktop window
-  - Fn + Home  Select from Cursor to Home
-  - Fn + End   Select from Cursor to End
-  
-Layer 2 : Mainly for Windows Sleep and Shutdown
------------------------------------------------
-- Fn + R-ALT + F1 : System Sleep
-- Fn + R-ALT + F4 : Turning Off System
-
-Layer Unicode : Mainly for Predefined Unicode code to work with WinCompose
---------------------------------------------------------------------------
-- °±²³µ©ΩθΩ√∞∆≈≠→↓←↑≡■□●○∴«»÷≤≥Σ
\ No newline at end of file
diff --git a/keyboards/durgod/k320/keymaps/kuenhlee/rules.mk b/keyboards/durgod/k320/keymaps/kuenhlee/rules.mk
deleted file mode 100644
index b6a7e51c104..00000000000
--- a/keyboards/durgod/k320/keymaps/kuenhlee/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-UNICODEMAP_ENABLE = yes         # Enable Unicode Map
diff --git a/keyboards/dz60/keymaps/256k_HHKB/README.md b/keyboards/dz60/keymaps/256k_HHKB/README.md
deleted file mode 100644
index 4241ca1ba7c..00000000000
--- a/keyboards/dz60/keymaps/256k_HHKB/README.md
+++ /dev/null
@@ -1,128 +0,0 @@
-256k HHKB Layout:
-===
-
-this is my personal layer that i use on my Tina-C HHKB layout board with a DZ60 PCB.
----
-UPDATE (4-20-2018):
-===
-after a week of using this layout i reazlied that having the ALT button on the right side and the ALTFN layer trigger on the left isn't ideal...i still wanted to change the default HHKB style CROSS arrow cluster into a reversed T cluster since im more used to that so i swapped the ALTFN layer to the right side and the normal ALT layer is back on the left side. so now i can use the arrow cluster (which i shifted one key over to the right) with 1 hand.
-
-it feels more nataural to me this way.
-
-also i decided to change the mouse scroll keys on the mouse layer to mouse movement keys... the scrolling wasn't working out as well as i'd hoped. again, this is merely an experimental layer just to play around with mouse control.
-
-
-
-
----
-
-Walkthrough:
----
-
-there is 1 base layer and 4 modifyer layers:
-
-BASE:
----
-
-```
- /* BASE LAYER
- *
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \| | ~ ` |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
- * |-----------------------------------------------------------------------------------------+
- * | CTRL    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  RShift   |  FN |
- * |-----------------------------------------------------------------------------------------+
- * |              Win  |      Alt  |            Space       |   ALTFN     |    LIGHTS        |
- * `-----------------------------------------------------------------------------------------'
- */
- ```
- 
- LAYER 1 (ALTFN):
- ---
- 
- this layer is my main function layer, i changed the default HHKB function layer to suit my need and also changed the placement of the modifyer key to the left alt since i want to control the layer activation with one hand and have the other hand control the keys on that layer freely. perhaps this is due to me being left handed but it feels more natural to me this way.
- 
- ```
- /* ALTFN LAYER
- *
- *  ,---------------------------------------------------------------------------------------------------------------------
- * |         | F1   | F2   | F3   | F4    | F5    | F6    | F7   | F8    | F9   | F10   | F11   | F12   | INSERT  |  _   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | CAPS     |   _  |   _  |   _   |    _  |    _  |    _  |    _  |    _   |    _   |  UP  |  V_DEC   |  V_INC  | DEL  |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | CTRL       |   _   |   _   |   _   |   _   |   _    |   _  | HOME |   END    | LEFT | DOWN | RIGHT  |    _          |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | Shift         |  _   |  _   |  _   |  _   |  _   |  _   |  _   |  PREV  |    NEXT  |  PLAY  |    _       |   _      |
- * |---------------------------------------------------------------------------------------------------------------------+
- * |                          _    |      _     |               _               |     _      |     _                     |
- * `---------------------------------------------------------------------------------------------------------------------'
- */
- ```
-
-
-MOUSE LAYER (MOUSEFN):
----
-
-*To access this layer you need to enter the ALTFN layer first then hit ESC button which will switch to the MOUSEFN layer*
-
-this is the second *hidden* layer that controls the mouse scroll wheel directions. i find it's useful to have these controls on the keyboard for certain applications that require scrolling in all 4 directions (Simple example: expanding an image preview to full size that overflows outside of the default monitor size and using the scroll wheel to mouve the image around.)
-
-also another benefit is that a lot of mice do not have horizontal control buttons for the scrolling
-
-(This layer is still experimental so i might change it later or modify it but so far i enjoy it)
-
-```
- /* MOUSEFN LAYER
- *
- *  ,---------------------------------------------------------------------------------------------------------------------
- * |        |  ACC_1  |  ACC_2  |  ACC_3  |  _    |  _    |  _    |  _   |  _    |  _   |  _   |  _   |  _   | _  |  _   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | CAPS     |   _  |   _  |   _   |    _  |    _  |    _  |    _  |    _   |  _  |  WHEEL_UP  |   _   |    _   |   _   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | CTRL       |   _   |   _   |   _   |   _   |   _    |   _  | _ |   _    |  WH_LEFT |  WH_DOWN |  WH_RIGHT  |    _   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | Shift         |  _   |  _   |  _   |  _   |  _   |  _   |  _   |   _    |    _    |    _    |    _       |   _      |
- * |---------------------------------------------------------------------------------------------------------------------+
- * |                          _    |      _     |               _               |     _      |     _                     |
- * `---------------------------------------------------------------------------------------------------------------------'
- */
- ```
- 
- 
- STANDARD HHKB FN LAYER (FN):
- ---
- 
- this is the default HHKB function layer (mostly)... I have left it there on the same button and everything for 2 reasons: 1. for backup incase i forget where something was or if it contains a button that i did not include in my ALTFN layer. 2. as a reference for anyone else.
- 
- *this layer will probably get removed once i get comfortable with my ALTFN layer.*
- 
- 
- 
- LIGHTS LAYER:
- ---
- 
- this is the basic lights layer used to control the RBG backlight on the DZ60... i have removed the 3 backlight controls since i do not use any key LED Backlight.
- 
- 
- ```
- /* LIGHTS LAYER
- *
- *  ,---------------------------------------------------------------------------------------------------------------------+
- * | RGB_TOGGLE  | STATIC | BREATHE | RAINBOW | SWIRL | SNAKE | KNIGHTRIDER | XMAS | STATIC_GRAD | _ |  _ | _ | _ | _ | _ |
- * |----------------------------------------------------------------------------------------------------------------------+
- * | RBG_MOD      |  HUE_INC |  SATURATION_INC  |  BRIGHT_INC   |  _  |  _  |  _  |  _ |  _ |  _ |  _ |  _  |  _  |  _    |
- * |----------------------------------------------------------------------------------------------------------------------+
- * | CTRL           |  HUE_DEC |  SATURATION_DEC  |  BRIGHT_DEC  |  _  |  _  |  _ |  _  |  _  |  _  |  _  |  _  |    _    |
- * |----------------------------------------------------------------------------------------------------------------------+
- * | Shift                |   _   |   _   |   _   |   _   |   _   |   _   |   _   |   _   |   _   |   _   |  _   |    _   |
- * |----------------------------------------------------------------------------------------------------------------------+
- * |                             _    |      _     |               _               |     _      |     _                   |
- * `----------------------------------------------------------------------------------------------------------------------'
- */
- ```
- 
- 
diff --git a/keyboards/dz60/keymaps/256k_HHKB/keymap.c b/keyboards/dz60/keymaps/256k_HHKB/keymap.c
deleted file mode 100644
index 051437792eb..00000000000
--- a/keyboards/dz60/keymaps/256k_HHKB/keymap.c
+++ /dev/null
@@ -1,240 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// My layout is practically the default HHKB layout.
-#define _DEFAULT 0
-#define _ALTFN 1
-#define _MOUSEFN 2
-#define _FN 3
-#define _LIGHTS 4
-
-
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
- /* BASE LAYER
- *
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \| | ~ ` |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
- * |-----------------------------------------------------------------------------------------+
- * | CTRL    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  RShift   |  FN |
- * |-----------------------------------------------------------------------------------------+
- * |              Win  |      Alt  |            Space       |   Alt     |    LIGHTS          |
- * `-----------------------------------------------------------------------------------------'
- */
-
-
-	[_DEFAULT] = LAYOUT_60_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_BSLS, 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_BSPC,
-		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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT, MO(_FN),
-		            KC_LGUI,             KC_LALT,                      KC_SPC,                    MO(_ALTFN),           MO(_LIGHTS)),
-
-
-
-
-
-/* ALTFN LAYER
- *
- *  ,---------------------------------------------------------------------------------------------------------------------
- * |         | F1   | F2   | F3   | F4    | F5    | F6    | F7   | F8    | F9   | F10   | F11   | F12   | INSERT  |  _   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | CAPS     |   _  |   _  |   _   |    _  |    _  |    _  |    _  |    _   |    _   |  UP  |  V_DEC   |  V_INC  | DEL  |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | CTRL       |   _   |   _   |   _   |   _   |   _    |   _  | HOME |   END    | LEFT | DOWN | RIGHT  |    _          |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | Shift         |  _   |  _   |  _   |  _   |  _   |  _   |  _   |  PREV  |    NEXT  |  PLAY  |    _       |   _      |
- * |---------------------------------------------------------------------------------------------------------------------+
- * |                          _    |      _     |               _               |     _      |     _                     |
- * `---------------------------------------------------------------------------------------------------------------------'
- */
-
-	[_ALTFN] = LAYOUT_60_hhkb(
-
-		MO(_MOUSEFN),  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_CAPS,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_UP,  KC_VOLD,   KC_VOLU,  KC_DEL,
-		______,             ______,  ______,  ______,  ______,  ______,  ______,  KC_HOME,  KC_END, KC_LEFT,   KC_DOWN,   KC_RIGHT, ______,
-		______,            ______,  ______,  ______, ______, ______,   ______,  ______,  KC_MPRV,  KC_MNXT, KC_MPLY,     ______,  ______,
-		         ______,           ______,                    ______,                              ______,            ______),
-
-
-
-
-
-
-
-/* MOUSEFN LAYER
- *
- *  ,---------------------------------------------------------------------------------------------------------------------
- * |        |  ACC_1  |  ACC_2  |  ACC_3  |  _    |  _    |  _    |  _   |  _    |  _   |  _   |  _   |  _   | _  |  _   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | CAPS     |   _  |   _  |   _   |    _  |    _  |    _  |    _  |    _   |  _  |  WHEEL_UP  |   _   |    _   |   _   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | CTRL       |   _   |   _   |   _   |   _   |   _    |   _  | _ |   _    |  WH_LEFT |  WH_DOWN |  WH_RIGHT  |    _   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * | Shift         |  _   |  _   |  _   |  _   |  _   |  _   |  _   |   _    |    _    |    _    |    _       |   _      |
- * |---------------------------------------------------------------------------------------------------------------------+
- * |                          _    |      _     |               _               |     _      |     _                     |
- * `---------------------------------------------------------------------------------------------------------------------'
- */
-
-
-	[_MOUSEFN] = LAYOUT_60_hhkb(
-
-		______,  KC_ACL0,   KC_ACL1,   KC_ACL2,   ______,   ______,   ______,   ______,   ______,   ______,   ______,  ______,   ______,  ______,  ______,
-		______,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_MS_UP,    ______,   ______,  ______,
-		______,             ______,  ______,  ______,  ______,  ______,  ______,  ______,   ______,  KC_MS_LEFT,   KC_MS_DOWN,  KC_MS_RIGHT,   ______,
-		______,            ______,  ______,  ______, ______, ______,   ______,  ______,  ______,  ______, ______,     ______,  ______,
-		         ______,           ______,                    ______,                              ______,            ______),
-
-
-
-
-
-
-
-/* FN LAYER
- *
- *  ,------------------------------------------------------------------------------------------------------
- * |         | F1  | F2  | F3  | F4   | F5   | F6   | F7  | F8   | F9  | F10  | F11  | F12  |INSERT |  _  |
- * |------------------------------------------------------------------------------------------------------+
- * | CAPS     |  _  |  _  |  _   |  _  |  _  |  _  |  _  |  PRSC  |  SLOCK |  PAUSE |  UP   |  _  | DEL   |
- * |------------------------------------------------------------------------------------------------------+
- * | CTRL       |  _  |  VOLDOWN  |  VOLUP  |  VOLMUTE  | _ | _ | _ | HOME | PGUP  | LEFT | IGHT |   _    |
- * |------------------------------------------------------------------------------------------------------+
- * | Shift         |  _   |  _   |  _   |  _   |  _   |  _   |  _   |  END  |  PGDN  | DOWN  |  _  |   _  |
- * |------------------------------------------------------------------------------------------------------+
- * |                 _    |      _     |               _               |     _      |     _               |
- * `------------------------------------------------------------------------------------------------------'
- */
-
-
-
-	[_FN] = LAYOUT_60_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,  KC_INS,  ______,
-		KC_CAPS,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS,  KC_UP,   ______,  KC_DEL,
-		______,           KC_VOLD, KC_VOLU, KC_MUTE, ______,  ______,  KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT,  KC_RGHT, ______,
-		______,           KC_MPRV, KC_MPLY, KC_MNXT, ______,  ______,  KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,           ______,  ______,
-		         ______,           ______,                    ______,                                      ______,            ______),
-
-
-
-
-
-
-
-/* LIGHTS LAYER
- *
- *  ,---------------------------------------------------------------------------------------------------------------------+
- * | RGB_TOGGLE  | STATIC | BREATHE | RAINBOW | SWIRL | SNAKE | KNIGHTRIDER | XMAS | STATIC_GRAD | _ |  _ | _ | _ | _ | _ |
- * |----------------------------------------------------------------------------------------------------------------------+
- * | RBG_MOD      |  HUE_INC |  SATURATION_INC  |  BRIGHT_INC   |  _  |  _  |  _  |  _ |  _ |  _ |  _ |  _  |  _  |  _    |
- * |----------------------------------------------------------------------------------------------------------------------+
- * | CTRL           |  HUE_DEC |  SATURATION_DEC  |  BRIGHT_DEC  |  _  |  _  |  _ |  _  |  _  |  _  |  _  |  _  |    _    |
- * |----------------------------------------------------------------------------------------------------------------------+
- * | Shift                |   _   |   _   |   _   |   _   |   _   |   _   |   _   |   _   |   _   |   _   |  _   |    _   |
- * |----------------------------------------------------------------------------------------------------------------------+
- * |                             _    |      _     |               _               |     _      |     _                   |
- * `----------------------------------------------------------------------------------------------------------------------'
- */
-
-
-
-	[_LIGHTS] = LAYOUT_60_hhkb(
-		RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, ______, ______, ______, ______, ______, ______,
-		RGB_MOD,          RGB_HUI, RGB_SAI, RGB_VAI,  ______,   ______,  ______,  ______,  ______, ______, ______, ______, ______, ______,
-		______,           RGB_HUD, RGB_SAD, RGB_VAD,  ______,   ______,  ______,  ______,  ______, ______, ______, ______, ______,
-		______,           ______,  ______,  ______,   ______,  ______,  ______,  ______,  ______, ______, ______,         ______, ______,
-		         ______,           ______,                      ______,                                    ______,         ______),
-
-};
-
-
-/*
-
-RGB controls
-
-Key       ->  Description
-=========================
-
-RGB_TOG   ->  Toggle RGB lighting on or off
-
-RGB_MOD   ->  Cycle through modes, reverse direction when Shift is held
-
-RGB_RMOD  ->  Cycle through modes in reverse, forward direction when Shift is held
-
-RGB_HUI   ->  Increase hue
-
-RGB_HUD   ->  Decrease hue
-
-RGB_SAI   ->  Increase saturation
-
-RGB_SAD   ->  Decrease saturation
-
-RGB_VAI   ->  Increase value (brightness)
-
-RGB_VAD   ->  Decrease value (brightness)
-
-RGB_M_P   ->  Static (no animation) mode
-
-RGB_M_B   ->  Breathing animation mode
-
-RGB_M_R   ->  Rainbow animation mode
-
-RGB_M_SW  ->  Swirl animation mode
-
-RGB_M_SN  ->  Snake animation mode
-
-RGB_M_K   ->  "Knight Rider" animation mode
-
-RGB_M_X   ->  Christmas animation mode
-
-RGB_M_G   ->  Static gradient animation mode
-
-*/
-
-/*
-  Mouse controls:
-
-  Key           ->   Aliases  ->  Description
-  ==================================================
-
-  KC_MS_UP      ->   KC_MS_U  ->   Mouse Cursor Up
-
-  KC_MS_DOWN    ->   KC_MS_D  ->   Mouse Cursor Down
-
-  KC_MS_LEFT    ->   KC_MS_L  ->   Mouse Cursor Left
-
-  KC_MS_RIGHT   ->   KC_MS_R  ->  Mouse Cursor Right
-
-  KC_MS_BTN1    ->   KC_BTN1  ->   Mouse Button 1
-
-  KC_MS_BTN2    ->   KC_BTN2  ->   Mouse Button 2
-
-  KC_MS_BTN3    ->   KC_BTN3  ->   Mouse Button 3
-
-  KC_MS_BTN4    ->   KC_BTN4  ->   Mouse Button 4
-
-  KC_MS_BTN5    ->   KC_BTN5  ->   Mouse Button 5
-
-KC_MS_WH_UP     ->   KC_WH_U  ->  Mouse Wheel Up
-
-KC_MS_WH_DOWN   ->   KC_WH_D  ->  Mouse Wheel Down
-
-KC_MS_WH_LEFT   ->   KC_WH_L  ->  Mouse Wheel Left
-
-KC_MS_WH_RIGHT  ->   KC_WH_R  ->   Mouse Wheel Right
-
-KC_MS_ACCEL0    ->   KC_ACL0  ->   Set mouse acceleration to 0
-
-KC_MS_ACCEL1    ->   KC_ACL1  ->   Set mouse acceleration to 1
-
-KC_MS_ACCEL2    ->   KC_ACL2  ->   Set mouse acceleration to 2
-
-*/
diff --git a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/config.h b/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/config.h
deleted file mode 100644
index 9560d51a6f9..00000000000
--- a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define GRAVE_ESC_GUI_OVERRIDE    # Always send Escape if GUI is pressed
diff --git a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c b/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
deleted file mode 100644
index a7b77d423a9..00000000000
--- a/keyboards/dz60/keymaps/Ansi_plus_fn_arrows/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT(
-		QK_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_NO, 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_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RALT, KC_RALT, KC_LGUI, KC_RCTL),
-
-	LAYOUT(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL,
-		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  BL_STEP, 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, KC_LEFT, KC_LEFT, KC_DOWN, KC_RIGHT),
-
-	LAYOUT(
-		KC_TRNS, M(1), M(2), M(3), M(4), M(5), M(6), M(7), M(8), M(9), M(10), M(11), M(12), KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/dz60/keymaps/LEdiodes/config.h b/keyboards/dz60/keymaps/LEdiodes/config.h
deleted file mode 100644
index bb6c5c55e41..00000000000
--- a/keyboards/dz60/keymaps/LEdiodes/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-/* sets 'Auto Shift' timeouts */
-#define AUTO_SHIFT_TIMEOUT 150
-#define NO_AUTO_SHIFT_SPECIAL
diff --git a/keyboards/dz60/keymaps/LEdiodes/keymap.c b/keyboards/dz60/keymaps/LEdiodes/keymap.c
deleted file mode 100644
index 1e8c1b0d800..00000000000
--- a/keyboards/dz60/keymaps/LEdiodes/keymap.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _L0 0
-#define _L1 1
-#define _L2 2
-#define _L3 3
-#define _L4 4
-
-enum {
-  TD_SPC_ENT = 0,
-  TD_KC_LSFT_CAPS,
-  TD_KC_RSFT_CAPS
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * template
- * [_L1] = LAYOUT(
- *      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
- *      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
- *       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
- *      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
- *       _______,_______,_______,        _______,_______,_______,                _______,_______,_______,_______,_______,
- *
- *
- * Keymap _L0: (Layer 0 - Base Layer) This is the default layer
- * This layer has a key set to MO(_L1) which means when held down Layer 1 will become active, If Layer 1 does not have anything set for tat key is will revert to uing the key set at layer 0.
- * LT(_L1, KC_1) means that when the "1" key is long touched then it will activate the layer _L1 key(F1) but if the key is just tapped it will activate the "1" key.
- * QK_GESC = Escape when tapped, ` when pressed with Shift or GUI
- * SC_LSPO = Left Shift when held, ( when tapped
- * TD(LT(_L3,KC_SPACE)) = This is a test... hoping it will tap dance if double tapped it does enter if single tap it does space if long hold down it does _L3(Layer 3).
- * LT(_L3,KC_SPACE) = if tapped it does space, is long touch it does _L3(Layer 3)
- * BL_TOGG = Toggles the LEDs.
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |Bkspc| Del |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
- * |-----------------------------------------------------------------------------------------+
- * | _L4    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RSh |  U  | _L1 |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl |  Win  |  Alt  |  _L3[Space]  |LEdiodes|      Space       |Win | _L2|  L |  D |  R |
- * `-----------------------------------------------------------------------------------------'
- */
-[_L0] = LAYOUT(
-      QK_GESC,              LT(_L1, KC_1),LT(_L1, KC_2),LT(_L1, KC_3),LT(_L1, KC_4),LT(_L1, KC_5),LT(_L1, KC_6),LT(_L1, KC_7),LT(_L1, KC_8),LT(_L1, KC_9),LT(_L1, KC_0),LT(_L1, KC_MINS),LT(_L1, 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_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,
-      SC_LSPO,   KC_Z,    KC_X,     KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    TO(_L1),
-      KC_LCTL,             KC_LGUI, KC_LALT, LT(_L3,KC_SPACE),BL_TOGG,TD(TD_SPC_ENT),     KC_RGUI, TO(_L2), KC_LEFT,  KC_DOWN,  KC_RIGHT),
-
-/* Keymap _L1: (Layer 1) This is function layer 1
- * This layer is activated while the Fn key is being held down.
- * ,-----------------------------------------------------------------------------------------.
- * | Reset |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | F13| F14|
- * |-----------------------------------------------------------------------------------------+
- * |        |  WhUp|  U  | WhDn |    |    |     |     |     | PrtScr |     |    |    |       |
- * |-----------------------------------------------------------------------------------------+
- * |         |  L   |   D  |  R  |     |     | Home |     |     |     |     |      |         |
- * |-----------------------------------------------------------------------------------------+
- * |           |      |     |     |     |     |  End | VolDn|VolUp|Mute |    |   | PgUp|     |
- * |-----------------------------------------------------------------------------------------+
- * |      |       |      |          |       |                |      |      | Home| PgDn| End |
- * `-----------------------------------------------------------------------------------------'
- */
-[_L1] = LAYOUT(
-      QK_BOOT, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,  KC_F6,    KC_F7,    KC_F8,    KC_F9,     KC_F10,   KC_F11,   KC_F12,  KC_F13,   KC_F14,
-      _______, KC_WH_U, KC_UP,   KC_WH_D,  _______, _______,_______,  _______,  _______,  _______,   KC_PSCR, _______,  _______,                      _______,
-      _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_HOME, _______,  _______,  _______,   KC_HOME, _______,                        _______,
-      _______,           _______,  KC_APP,  BL_STEP,_______,  KC_END,   KC_VOLD,  KC_VOLU,   KC_MUTE, _______,  _______,  _______, KC_PGUP,   _______,
-      _______, _______, _______,                                _______,_______,_______,                _______, _______,         KC_HOME, KC_PGDN, KC_END),
-
-/* Keymap _L2: (Layer 2) This is function layer 2
- * This layer is activated while the Fn2 key is being held down.
- * LCA(KC_TAB) = Hold Left Control and Alt and press kc_tab which cycles trough open apps.
- * MEH(KC_TAB) = Hold Left Control, Shift and Alt and press kc_TAB to cycle backwards through apps.
- * ,-----------------------------------------------------------------------------------------.
- * |  |   |   |   |   |   |   |   |   |   |  |  |  | | LCA(KC_TAB)|
- * |-----------------------------------------------------------------------------------------+
- * |        |  |    |  |    |    |     |     |     |  |     |    |    |       |MEH(KC_TAB)
- * |-----------------------------------------------------------------------------------------+
- * |         |     |     |    |     |     | |     |     |     |     |      |         |
- * |-----------------------------------------------------------------------------------------+
- * |           |      |     |     |     |     |   | || |    |   | |     |
- * |-----------------------------------------------------------------------------------------+
- * |      |       |      |          |       |                |      |      | | |  |
- * `-----------------------------------------------------------------------------------------'
- */
-[_L2] = LAYOUT(
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,LCA(KC_TAB),
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        MEH(KC_TAB),
-      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MS_BTN1,KC_MS_UP,KC_MS_BTN2,
-      _______,_______,_______,        _______,_______,_______,                _______,_______,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT)
-
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-
-  //Tap once for space, tap twice for enter
-  [TD_SPC_ENT]  = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT),
-  //Tap once for Left Shift, twice for Caps Lock
-  [TD_KC_LSFT_CAPS]  = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-  //Tap once for Right Shift, twice for Caps Lock
-  [TD_KC_RSFT_CAPS]  = ACTION_TAP_DANCE_DOUBLE(KC_RSFT, KC_CAPS)
-
-// Other declarations would go here, separated by commas, if you have them
-
-};
diff --git a/keyboards/dz60/keymaps/LEdiodes/readme.md b/keyboards/dz60/keymaps/LEdiodes/readme.md
deleted file mode 100644
index db83b2494d0..00000000000
--- a/keyboards/dz60/keymaps/LEdiodes/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# LEdiodes Keymap for XD60 60% PCB
-
-![LEdiodes Layer 0 Keymap for XD60](https://i.imgur.com/pDneawX.jpg)
-
-## Additional Notes
-Layer 0(default) Keymap for LEdiodes XD60.
-
-## Build
-To build the default keymap, simply run `make xd60:LEdiodes`.
diff --git a/keyboards/dz60/keymaps/LEdiodes/rules.mk b/keyboards/dz60/keymaps/LEdiodes/rules.mk
deleted file mode 100644
index 2f6622e587e..00000000000
--- a/keyboards/dz60/keymaps/LEdiodes/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE = no	# Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes # If the time depressed is greater than or equal to the AUTO_SHIFT_TIMEOUT, then a shifted version of the key is emitted. If the time is less than the AUTO_SHIFT_TIMEOUT time, then the normal state is emitted
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/dz60/keymaps/_bonfire/README.md b/keyboards/dz60/keymaps/_bonfire/README.md
deleted file mode 100644
index 9fe4c5a2da4..00000000000
--- a/keyboards/dz60/keymaps/_bonfire/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Docs
-
-1. https://docs.qmk.fm/#/
-2. To build, run: `make dz60:_bonfire`
-
-## Map of Layers
-
-http://www.keyboard-layout-editor.com/#/gists/b19ee1c251c908d9b5ef76965d588937
-
-![Visual Keymap](https://i.imgur.com/DuiUo0W.jpg)
-
-### Todo
-- lighting effects based on layer in use
-    - https://github.com/DanDobrick/qmk_firmware/blob/danDobrick-v60r-layout/keyboards/v60_type_r/keymaps/danDobrick/keymap.c#L140
-
-- rewrite the mod-tap functions to use the non-deprecated way of instancing them
diff --git a/keyboards/dz60/keymaps/_bonfire/dz60-v6-1-0.json b/keyboards/dz60/keymaps/_bonfire/dz60-v6-1-0.json
deleted file mode 100644
index 42625f7e2c0..00000000000
--- a/keyboards/dz60/keymaps/_bonfire/dz60-v6-1-0.json
+++ /dev/null
@@ -1,1160 +0,0 @@
-[
-  {
-    "name": "DZ60 v6.1.0",
-    "author": "Bonf1re"
-  },
-  [
-    {
-      "c": "#454545",
-      "a": 7,
-      "f": 2,
-      "w": 1.75
-    },
-    "NOTHING",
-    {
-      "c": "#fc8e28",
-      "w": 1.25
-    },
-    "HELD",
-    {
-      "c": "#7afff6",
-      "w2": 2
-    },
-    "Function Layer",
-    {
-      "x": 1,
-      "c": "#c47aff",
-      "w2": 2
-    },
-    "Keyboard Layer"
-  ],
-  [
-    {
-      "y": 0.75,
-      "c": "#cccccc",
-      "f": 3,
-      "w": 3
-    },
-    "[BASE]"
-  ],
-  [
-    {
-      "a": 5
-    },
-    "~\n`",
-    "!\n1",
-    "@\n2",
-    "#\n3",
-    "$\n4",
-    "%\n5",
-    "^\n6",
-    "&\n7",
-    "*\n8",
-    "(\n9",
-    ")\n0",
-    "_\n-",
-    "+\n=",
-    {
-      "a": 7,
-      "w": 2
-    },
-    "Backspace"
-  ],
-  [
-    {
-      "w": 1.5
-    },
-    "Tab",
-    "Q",
-    "W",
-    "E",
-    "R",
-    "T",
-    "Y",
-    "U",
-    "I",
-    "O",
-    "P",
-    {
-      "a": 5
-    },
-    "{\n[",
-    "}\n]",
-    {
-      "w": 1.5
-    },
-    "|\n\\"
-  ],
-  [
-    {
-      "a": 7,
-      "w": 1.75
-    },
-    "Escape",
-    "A",
-    "S",
-    "D",
-    {
-      "n": true
-    },
-    "F",
-    "G",
-    "H",
-    {
-      "n": true
-    },
-    "J",
-    "K",
-    "L",
-    {
-      "a": 5
-    },
-    ":\n;",
-    "\"\n'",
-    {
-      "a": 7,
-      "w": 2.25
-    },
-    "Enter"
-  ],
-  [
-    {
-      "w": 2.25
-    },
-    "Shift",
-    "Z",
-    "X",
-    "C",
-    "V",
-    "B",
-    "N",
-    "M",
-    {
-      "a": 5
-    },
-    "<\n,",
-    ">\n.",
-    "?\n/",
-    {
-      "w": 1.75
-    },
-    "Up\nShift",
-    {
-      "c": "#7afff6",
-      "a": 7,
-      "fa": [
-        2
-      ]
-    },
-    "HACK"
-  ],
-  [
-    {
-      "c": "#cccccc",
-      "f": 3,
-      "w": 1.25
-    },
-    "Ctrl",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Sys",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Alt",
-    {
-      "w": 6.25
-    },
-    "",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Alt",
-    {
-      "a": 5,
-      "f": 3,
-      "w": 1.25
-    },
-    "Left\nSys",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Down\nCtrl",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Right\nHYPER"
-  ],
-  [
-    {
-      "y": 0.25,
-      "a": 7,
-      "f": 3,
-      "w": 3
-    },
-    "[NRMN]"
-  ],
-  [
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "a": 5,
-      "f": 3
-    },
-    "~\n`",
-    {
-      "f": 3
-    },
-    "!\n1",
-    {
-      "f": 3
-    },
-    "@\n2",
-    {
-      "f": 3
-    },
-    "#\n3",
-    {
-      "f": 3
-    },
-    "$\n4",
-    {
-      "f": 3
-    },
-    "%\n5",
-    {
-      "f": 3
-    },
-    "^\n6",
-    {
-      "f": 3
-    },
-    "&\n7",
-    {
-      "f": 3
-    },
-    "*\n8",
-    {
-      "f": 3
-    },
-    "(\n9",
-    {
-      "f": 3
-    },
-    ")\n0",
-    {
-      "f": 3
-    },
-    "_\n-",
-    {
-      "f": 3
-    },
-    "+\n=",
-    {
-      "a": 7,
-      "f": 3,
-      "w": 2
-    },
-    "Backspace"
-  ],
-  [
-    {
-      "f": 3,
-      "w": 1.5
-    },
-    "Tab",
-    {
-      "c": "#cccccc",
-      "g": false,
-      "f": 3
-    },
-    "Q",
-    {
-      "f": 3
-    },
-    "W",
-    {
-      "f": 3
-    },
-    "D",
-    {
-      "f": 3
-    },
-    "F",
-    {
-      "f": 3
-    },
-    "K",
-    {
-      "f": 3
-    },
-    "J",
-    {
-      "f": 3
-    },
-    "U",
-    {
-      "f": 3
-    },
-    "R",
-    {
-      "f": 3
-    },
-    "L",
-    {
-      "a": 5,
-      "f": 3
-    },
-    ":\n;",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "f": 3
-    },
-    "{\n[",
-    {
-      "f": 3
-    },
-    "}\n]",
-    {
-      "f": 3,
-      "w": 1.5
-    },
-    "|\n\\"
-  ],
-  [
-    {
-      "a": 7,
-      "f": 3,
-      "w": 1.75
-    },
-    "Escape",
-    {
-      "c": "#cccccc",
-      "g": false,
-      "f": 3
-    },
-    "A",
-    {
-      "f": 3
-    },
-    "S",
-    {
-      "f": 3
-    },
-    "E",
-    {
-      "f": 3,
-      "n": true
-    },
-    "T",
-    {
-      "f": 3
-    },
-    "G",
-    {
-      "f": 3
-    },
-    "Y",
-    {
-      "f": 3,
-      "n": true
-    },
-    "N",
-    {
-      "f": 3
-    },
-    "I",
-    {
-      "f": 3
-    },
-    "O",
-    {
-      "f": 3
-    },
-    "H",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "a": 5
-    },
-    "\n'\n\n\n\n\n\"",
-    {
-      "a": 7,
-      "f": 3,
-      "w": 2.25
-    },
-    "Enter"
-  ],
-  [
-    {
-      "f": 3,
-      "w": 2.25
-    },
-    "Shift",
-    {
-      "c": "#cccccc",
-      "g": false,
-      "f": 3
-    },
-    "Z",
-    {
-      "f": 3
-    },
-    "X",
-    {
-      "f": 3
-    },
-    "C",
-    {
-      "f": 3
-    },
-    "V",
-    {
-      "f": 3
-    },
-    "B",
-    {
-      "f": 3
-    },
-    "P",
-    {
-      "f": 3
-    },
-    "M",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "a": 5,
-      "f": 3
-    },
-    "<\n,",
-    {
-      "f": 3
-    },
-    ">\n.",
-    {
-      "f": 3
-    },
-    "?\n/",
-    {
-      "f": 3,
-      "w": 1.75
-    },
-    "Up\nShift",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "HACK"
-  ],
-  [
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Ctrl",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Sys",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Alt",
-    {
-      "w": 6.25
-    },
-    "",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Alt",
-    {
-      "a": 5,
-      "f": 3,
-      "w": 1.25
-    },
-    "Left\nSys",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Down\nCtrl",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Right\nHYPER"
-  ],
-  [
-    {
-      "y": 0.25,
-      "c": "#cccccc",
-      "g": false,
-      "a": 7,
-      "f": 3,
-      "w": 3
-    },
-    "[GAME]"
-  ],
-  [
-    {
-      "c": "#aaaaaa",
-      "g": true
-    },
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    {
-      "w": 2
-    },
-    ""
-  ],
-  [
-    {
-      "w": 1.5
-    },
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    {
-      "w": 1.5
-    },
-    ""
-  ],
-  [
-    {
-      "c": "#cccccc",
-      "g": false,
-      "f": 3,
-      "w": 1.75
-    },
-    "Held Esc",
-    {
-      "c": "#aaaaaa",
-      "g": true
-    },
-    "",
-    "",
-    "",
-    {
-      "n": true
-    },
-    "",
-    "",
-    "",
-    {
-      "n": true
-    },
-    "",
-    "",
-    "",
-    "",
-    "",
-    {
-      "w": 2.25
-    },
-    ""
-  ],
-  [
-    {
-      "w": 2.25
-    },
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    {
-      "w": 1.75
-    },
-    "",
-    ""
-  ],
-  [
-    {
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 6.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    ""
-  ],
-  [
-    {
-      "y": 0.25,
-      "c": "#cccccc",
-      "g": false,
-      "a": 5,
-      "fa": [
-        2,
-        1
-      ],
-      "w": 3
-    },
-    "\nHACK is held\n\n\n\n\n[FCTN]"
-  ],
-  [
-    {
-      "c": "#7afff6",
-      "a": 7,
-      "f": 3
-    },
-    "ESC",
-    {
-      "f": 3
-    },
-    "F1",
-    {
-      "f": 3
-    },
-    "F2",
-    {
-      "f": 3
-    },
-    "F3",
-    {
-      "f": 3
-    },
-    "F4",
-    {
-      "f": 3
-    },
-    "F5",
-    {
-      "f": 3
-    },
-    "F6",
-    {
-      "f": 3
-    },
-    "F7",
-    {
-      "f": 3
-    },
-    "F8",
-    {
-      "f": 3
-    },
-    "F9",
-    {
-      "f": 3
-    },
-    "F10",
-    {
-      "f": 3
-    },
-    "F11",
-    {
-      "f": 3
-    },
-    "F12",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "f": 3,
-      "w": 2
-    },
-    "Backspace"
-  ],
-  [
-    {
-      "f": 3,
-      "w": 1.5
-    },
-    "Tab",
-    {
-      "c": "#7afff6",
-      "g": false,
-      "f": 3
-    },
-    "Mute",
-    {
-      "a": 5,
-      "f": 3
-    },
-    "\nDown\n\n\n\n\nVolume",
-    {
-      "f": 3
-    },
-    "\nUp\n\n\n\n\nVolume",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "a": 7,
-      "f": 3
-    },
-    "R",
-    {
-      "f": 3
-    },
-    "T",
-    {
-      "f": 3
-    },
-    "Y",
-    {
-      "f": 3
-    },
-    "U",
-    {
-      "f": 3
-    },
-    "I",
-    {
-      "f": 3
-    },
-    "O",
-    {
-      "c": "#7afff6",
-      "g": false,
-      "a": 5,
-      "f": 3
-    },
-    "\nScreen\n\n\n\n\nPrint",
-    {
-      "f": 3
-    },
-    "\nLock\n\n\n\n\nScroll",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "Pause",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "a": 5,
-      "f": 3,
-      "w": 1.5
-    },
-    "|\n\\"
-  ],
-  [
-    {
-      "c": "#7afff6",
-      "g": false,
-      "a": 7,
-      "f": 3,
-      "w": 1.75
-    },
-    "Caps Lock",
-    {
-      "a": 5,
-      "f": 3
-    },
-    "\nPrev\n\n\n\n\nMedia",
-    {
-      "f": 3
-    },
-    "\nPlay\n\n\n\n\nMedia",
-    {
-      "f": 3
-    },
-    "\nNext\n\n\n\n\nMedia",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "a": 7,
-      "f": 3,
-      "n": true
-    },
-    "F",
-    {
-      "f": 3
-    },
-    "G",
-    {
-      "f": 3
-    },
-    "H",
-    {
-      "f": 3,
-      "n": true
-    },
-    "J",
-    {
-      "f": 3
-    },
-    "K",
-    {
-      "c": "#7afff6",
-      "g": false,
-      "f": 3
-    },
-    "Insert",
-    {
-      "f": 3
-    },
-    "Home",
-    {
-      "a": 5,
-      "f": 3
-    },
-    "\nUp\n\n\n\n\nPage",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "a": 7,
-      "f": 3,
-      "w": 2.25
-    },
-    "Enter"
-  ],
-  [
-    {
-      "f": 3,
-      "w": 2.25
-    },
-    "Shift",
-    {
-      "c": "#7afff6",
-      "g": false,
-      "f": 3
-    },
-    "Sleep",
-    {
-      "f": 3
-    },
-    "Wake",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "f": 3
-    },
-    "C",
-    {
-      "f": 3
-    },
-    "V",
-    {
-      "f": 3
-    },
-    "B",
-    {
-      "f": 3
-    },
-    "N",
-    {
-      "f": 3
-    },
-    "M",
-    {
-      "c": "#7afff6",
-      "g": false,
-      "f": 3
-    },
-    "Delete",
-    {
-      "f": 3
-    },
-    "End",
-    {
-      "a": 5,
-      "f": 3
-    },
-    "\nDown\n\n\n\n\nPage",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "f": 3,
-      "w": 1.75
-    },
-    "Up\nShift",
-    {
-      "c": "#fc8e28",
-      "g": false,
-      "a": 7,
-      "f": 3
-    },
-    "HACK"
-  ],
-  [
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "f": 3,
-      "w": 1.25
-    },
-    "Ctrl",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Sys",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Alt",
-    {
-      "w": 6.25
-    },
-    "",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Alt",
-    {
-      "c": "#c47aff",
-      "g": false,
-      "a": 5,
-      "f": 3,
-      "w": 1.25
-    },
-    "\n[KEYB]\n\n\n\n\nTo",
-    {
-      "c": "#aaaaaa",
-      "g": true,
-      "f": 3,
-      "w": 1.25
-    },
-    "Down\nCtrl",
-    {
-      "f": 3,
-      "w": 1.25
-    },
-    "Right\nHYPER"
-  ],
-  [
-    {
-      "y": 0.25,
-      "c": "#cccccc",
-      "g": false,
-      "f": 3,
-      "w": 3
-    },
-    "\nHACK + SYS Held\n\n\n\n\n[KEYB]"
-  ],
-  [
-    {
-      "c": "#c47aff",
-      "f": 2
-    },
-    "\n[BASE]\n\n\n\n\nReset",
-    {
-      "a": 7
-    },
-    "[NRMN]",
-    "[GAME]",
-    {
-      "c": "#454545",
-      "f": 3
-    },
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    {
-      "c": "#c47aff",
-      "f": 2,
-      "w": 2
-    },
-    "QMK FLASH"
-  ],
-  [
-    {
-      "c": "#454545",
-      "f": 3,
-      "w": 1.5
-    },
-    "",
-    {
-      "c": "#c47aff",
-      "a": 5,
-      "f": 2
-    },
-    "\nToggle\n\n\n\n\nRGB",
-    "\nMode\n\n\n\n\nRGB",
-    "RGB\nUp\n\n\n\n\nHue",
-    "RGB\nDown\n\n\n\n\nHue",
-    "RGB\nDown\n\n\n\n\nSat",
-    "RGB\nUp\n\n\n\n\nSat",
-    "RGB\nDown\n\n\n\n\nValue",
-    "RGB\nUp\n\n\n\n\nValue",
-    {
-      "c": "#454545",
-      "a": 7,
-      "f": 3
-    },
-    "",
-    "",
-    "",
-    "",
-    {
-      "w": 1.5
-    },
-    ""
-  ],
-  [
-    {
-      "w": 1.75
-    },
-    "",
-    {
-      "c": "#c47aff",
-      "a": 5,
-      "f": 2
-    },
-    "\nDown\n\n\n\n\nBacklight",
-    "\nToggle\n\n\n\n\nBacklight",
-    "\nUp\n\n\n\n\nBacklight",
-    {
-      "n": true
-    },
-    "\nStep\n\n\n\n\nBacklight",
-    {
-      "c": "#454545",
-      "a": 7,
-      "f": 3
-    },
-    "",
-    "",
-    {
-      "n": true
-    },
-    "",
-    "",
-    "",
-    "",
-    "",
-    {
-      "w": 2.25
-    },
-    ""
-  ],
-  [
-    {
-      "w": 2.25
-    },
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    {
-      "w": 1.75
-    },
-    "",
-    {
-      "c": "#fc8e28",
-      "fa": [
-        2
-      ]
-    },
-    "HACK"
-  ],
-  [
-    {
-      "c": "#454545",
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 6.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    "",
-    {
-      "c": "#fc8e28",
-      "a": 5,
-      "w": 1.25
-    },
-    "\n[KEYB]\n\n\n\n\nTo",
-    {
-      "c": "#454545",
-      "a": 7,
-      "w": 1.25
-    },
-    "",
-    {
-      "w": 1.25
-    },
-    ""
-  ]
-]
diff --git a/keyboards/dz60/keymaps/_bonfire/keymap-parts/defs.c b/keyboards/dz60/keymaps/_bonfire/keymap-parts/defs.c
deleted file mode 100644
index 95351b43ba3..00000000000
--- a/keyboards/dz60/keymaps/_bonfire/keymap-parts/defs.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Variables
- * 
- */
-int held_esc_threshold = 230;
-bool is_esc_held = false;
-uint16_t held_esc_timer = 0;
-
-/**
- * Define Layers
- */
-enum layers {
-    BASE = 0,
-    NRMN,
-    GAME,
-    FCTN,
-    KEYB
-};
-
-/**
- * Define Custom Keycodes
- */
-enum custom_keycodes { 
-    HLD_ESC = SAFE_RANGE,
-    MOD_UP = MT(MOD_RSFT, KC_UP),
-    MOD_RT = MT(MOD_HYPR, KC_RIGHT),
-    MOD_DN = MT(MOD_RCTL, KC_DOWN),
-    MOD_LT = MT(MOD_RGUI, KC_LEFT)
-};
diff --git a/keyboards/dz60/keymaps/_bonfire/keymap-parts/functions.c b/keyboards/dz60/keymaps/_bonfire/keymap-parts/functions.c
deleted file mode 100644
index fd4d168227b..00000000000
--- a/keyboards/dz60/keymaps/_bonfire/keymap-parts/functions.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Custom Keycodes
- * https://beta.docs.qmk.fm/detailed-guides/custom_quantum_functions#custom-keycodes
- * 
- */
-
-// Called on every keyup and keydown
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    switch (keycode) {
-        case HLD_ESC:
-            if(record->event.pressed) {
-                is_esc_held = true;
-                held_esc_timer = timer_read(); 
-            } else {
-                is_esc_held = false;
-                unregister_code(KC_ESC);
-            }
-            return true;
-            break;
-
-        default:
-            return true;
-            break;
-    }
-}
-
-// checking the held escape timer
-void matrix_scan_user(void)
-{
-    if(is_esc_held && timer_elapsed(held_esc_timer) > held_esc_threshold) {
-        register_code(KC_ESC);
-    }
-}
diff --git a/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c b/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
deleted file mode 100644
index 1c0c7f90781..00000000000
--- a/keyboards/dz60/keymaps/_bonfire/keymap-parts/layers.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-/*
- * LAYOUT_bonfire                                                Row Keys
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │  0e   │ 14
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │ 14
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │ 13
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │ 13
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │40  │41  │43  │           46           │4a  │4b  │4d  │4e  │ 8
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- *
-*/
-#define LAYOUT_bonfire( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
-    k10,      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, k3e, \
-    k40, k41,      k43,           k46,                k4a, k4b,      k4d, k4e \
-) { \
-    { k00, k01,   k02,   k03, k04,   k05,   k06, k07,   k08,   k09,   k0a, k0b, k0c,   KC_NO, k0e   }, \
-    { k10, KC_NO, k12,   k13, k14,   k15,   k16, k17,   k18,   k19,   k1a, k1b, k1c,   k1d,   k1e   }, \
-    { k20, KC_NO, k22,   k23, k24,   k25,   k26, k27,   k28,   k29,   k2a, k2b, k2c,   k2d,   KC_NO }, \
-    { k30, KC_NO, k32,   k33, k34,   k35,   k36, k37,   k38,   k39,   k3a, k3b, KC_NO, k3d,   k3e   }, \
-    { k40, k41,   KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a, k4b, KC_NO, k4d,   k4e   }  \
-}
-
-/**
- * XXXXXXX = Key does nothing.
- * _______ = Key that allows the uppermost exposed key in a layer below it.
- * 
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /**
-     * Layer 0
-     *
-     * QWERTY and basic modifiers.
-     * Upper layers are toggled or accessed through the "HACK" key: last key on fourth row.
-     */
-    [BASE] = LAYOUT_bonfire(
-        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_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_ESC,  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, MOD_UP, MO(FCTN),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MOD_LT, MOD_DN, MOD_RT
-    ),
-
-    /**
-     * Layer 1
-     *
-     * NORMAN Key layout.
-     * All that's changed is the position of A-Z and a few punctuation keys.
-     */
-    [NRMN] = LAYOUT_bonfire(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q,    KC_W,    KC_D,    KC_F,    KC_K,    KC_J,    KC_U,    KC_R,    KC_L,    KC_SCLN, _______, _______, _______,
-        _______, KC_A,    KC_S,    KC_E,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_I,    KC_O,    KC_H,    _______, _______,
-        _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P,    KC_M,    _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /**
-     * Layer 2
-     *
-     * Moves the escape key from the left to the right side of the keyboard for gaming.
-     */
-    [GAME] = LAYOUT_bonfire(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        HLD_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /**
-     * Layer 3
-     *
-     * Function layer.
-     * This layer is accessed when "HACK" is held down.
-     * Modifiers and such to basic keys, but with basic key functions.
-     */
-    [FCTN] = LAYOUT_bonfire(
-        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_MUTE, KC_VOLD, KC_VOLU, _______, _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-        KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,  _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
-        _______, KC_SLEP, KC_WAKE, _______, _______, _______,  _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______,
-        _______, _______, _______, _______, _______, MO(KEYB), _______, _______
-    ),
-
-    /**
-     * Layer 4
-     * 
-     * This is the KEYB/System layer.
-     * Other keymaps call this a NAV layer, but it's more than just NAV-ing the board's layers.
-     * This Layer currently handles RGB and puts the board into QK_BOOT for flashing.
-     *
-     * ~ key resets board to [BASE].
-     * 1 key toggles [NRMN].
-     * 2 key toggles [GAME].
-     * BACKSPACE puts board into reset.
-     */
-    [KEYB] = LAYOUT_bonfire(
-        TO(BASE), TG(NRMN), TO(GAME), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, 
-        XXXXXXX,  RGB_TOG,  RGB_MOD,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX,  BL_DOWN,  BL_TOGG,  BL_UP,   BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, 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/dz60/keymaps/_bonfire/keymap.c b/keyboards/dz60/keymaps/_bonfire/keymap.c
deleted file mode 100644
index a6b55105c2f..00000000000
--- a/keyboards/dz60/keymaps/_bonfire/keymap.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/**
- * Bonfire Layout
- * v6.1.0
- *
- * @author Ethan Beyer
- *
- */
-#include "keymap-parts/defs.c"
-#include "keymap-parts/layers.c"
-#include "keymap-parts/functions.c"
diff --git a/keyboards/dz60/keymaps/_bonfire/not-in-use/super-alt-tab.c b/keyboards/dz60/keymaps/_bonfire/not-in-use/super-alt-tab.c
deleted file mode 100644
index 1d951b1bcf7..00000000000
--- a/keyboards/dz60/keymaps/_bonfire/not-in-use/super-alt-tab.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Cool Function where a single key does ALT+TAB
- * From: https://beta.docs.qmk.fm/features/feature_macros#super-alt-tab
- */
-bool is_alt_tab_active = false;    // ADD this near the begining of keymap.c
-uint16_t alt_tab_timer = 0;        // we will be using them soon.
-
-enum custom_keycodes {            // Make sure have the awesome keycode ready 
-  ALT_TAB = SAFE_RANGE,
-};
-
-// key processing
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {               // This will do most of the grunt work with the keycodes.
-    case ALT_TAB:
-      if (record->event.pressed) {
-        if (!is_alt_tab_active) {
-          is_alt_tab_active = true;
-          register_code(KC_LALT);
-        } 
-        alt_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-  }
-  return true;
-}
-
-// The very important timer.
-void matrix_scan_user(void) { 
-  if (is_alt_tab_active && timer_elapsed(alt_tab_timer) > 1000) {
-    unregister_code(KC_LALT);
-    is_alt_tab_active = false;
-  }
-}
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/_bonfire/rules.mk b/keyboards/dz60/keymaps/_bonfire/rules.mk
deleted file mode 100644
index 84550c22bfb..00000000000
--- a/keyboards/dz60/keymaps/_bonfire/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = no
-
-# CONSOLE_ENABLE = yes
diff --git a/keyboards/dz60/keymaps/_bonfire/scratchpad.txt b/keyboards/dz60/keymaps/_bonfire/scratchpad.txt
deleted file mode 100644
index 48ed72c5506..00000000000
--- a/keyboards/dz60/keymaps/_bonfire/scratchpad.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-[NAME] = LAYOUT_bonfire(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______
-)
diff --git a/keyboards/dz60/keymaps/atlacat/keymap.c b/keyboards/dz60/keymaps/atlacat/keymap.c
deleted file mode 100644
index fa4c382f76b..00000000000
--- a/keyboards/dz60/keymaps/atlacat/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define RGB_STA RGB_M_P //rgb static
-#define RGB_BRE RGB_M_B //rgb breathe
-#define RGB_RAI RGB_M_R //rgb rainbow
-#define RGB_SWI RGB_M_SW //rgb swirl
-#define RGB_SNA RGB_M_SN //rgb snake
-#define RGB_KNI RGB_M_K //rgb knight
-#define RGB_GRA RGB_M_G //rgb gradient
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-   /* Keymap: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |CAPS/MO|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |MO  |Ctrl |
-   * `-----------------------------------------------------------'
-   */
-    LAYOUT(
-        QK_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 , XXXXXXX, 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,
-        LT(MO(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, XXXXXXX, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          XXXXXXX,
-        KC_LCTL,          KC_LGUI, KC_LALT, KC_SPC ,          KC_SPC ,          KC_SPC , KC_RALT, KC_RGUI, XXXXXXX, MO(2)  ,          KC_RCTL),
-
-    /* Keymap : Second Layer (WASD and Media)
-   * ,-----------------------------------------------------------.
-   * |ESC| F1| F2| F3  |   |   |   |   |   |   |   |   |   | DEL   |
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |
-   * |-----------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-
-    LAYOUT(
-        KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_DEL ,
-        _______,          _______,  KC_UP,  _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE,_______, _______, _______,
-        _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_INS , KC_HOME, KC_PGUP, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DEL,  KC_END, KC_PGDN, _______,          _______,
-        _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
-
-   /* Keymap : Third Layer (RGB / Reset)
-   * ,-----------------------------------------------------------.
-   * | ` |   |   |   |   |   |   |   |   |   |   |   |   |       |
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |
-   * |-----------------------------------------------------------|
-   * |      |   |   |   |   |   |   |       |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-
-    LAYOUT(
-        KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_SLEP,
-        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
-        _______,          RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______,
-        _______, _______, BL_DOWN, BL_TOGG, BL_UP  , BL_STEP, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,          _______,
-        _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
-
-};
diff --git a/keyboards/dz60/keymaps/atlacat/readme.md b/keyboards/dz60/keymaps/atlacat/readme.md
deleted file mode 100644
index c4c8702b7c1..00000000000
--- a/keyboards/dz60/keymaps/atlacat/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-// Template made by Atlacat for DZ 60% keyboard
-
-The design of the keyboard is coppied from other makers but change to be more dynamic.
-The main difference is the switching between layers to keep things simple for me
diff --git a/keyboards/dz60/keymaps/billiams/keymap.c b/keyboards/dz60/keymaps/billiams/keymap.c
deleted file mode 100644
index ed562fd96fb..00000000000
--- a/keyboards/dz60/keymaps/billiams/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------------.
-   * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |     \     |
-   * |-----------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bkspc |
-   * |-----------------------------------------------------------------------------------------+
-   * |   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-   * |-----------------------------------------------------------------------------------------+
-   * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |Tap(/) Shft|  U  | ESC |
-   * |-----------------------------------------------------------------------------------------+
-   * | Ctrl |  Alt  |  Cmd  |              Space                | Alt |  Fn  |  L  |  D  |  R  |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_directional(
-      KC_GRAVE, 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_BSLS,
-      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_BSPC,
-      MO(1), 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, _______, RSFT_T(KC_SLSH) , KC_UP, KC_ESCAPE,
-      KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT
-      ),
-
-  /* FN Layer
-   * ,-----------------------------------------------------------------------------------------.
-   * |     |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+| Mute | Vol-| Vol+| Prev | Next |
-   * |-----------------------------------------------------------------------------------------+
-   * |         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |Scr- |Scr+ |           |PG_UP|QK_BOOT|
-   * |-----------------------------------------------------------------------------------------+
-   * |      |       |       |                                   |     |      | HOME|PG_DN| END |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_directional(
-      _______, 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_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD,
-      _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
-      KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, QK_BOOT,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
-      ),
-};
diff --git a/keyboards/dz60/keymaps/billiams/readme.md b/keyboards/dz60/keymaps/billiams/readme.md
deleted file mode 100644
index 0f917bf4153..00000000000
--- a/keyboards/dz60/keymaps/billiams/readme.md
+++ /dev/null
@@ -1,72 +0,0 @@
-## Billiam's DZ60 layout
-
-This layout is optimized for MacOS and is for a Build 4 DZ60 with a 2U left shift, 2U right shift and an arrow
-cluster in the bottom right. Don't use this layout if you didn't get Build 4, you will enter a world of pain Donny.
-
-Settings:
-
-* The `CAPS LOCK` key is replaced with a second function key.
-* The `ALT` and `CMD` keys are swapped to replicate the Mac layout.
-* Del is available as `Fn` + `Backspace`
-* `/ ?` are available when you tap the right shift. Otherwise RShift is shift when held down
-* RESET is available as `Fn`+ ` ESC`
-* Underglow toggle is available as `Fn` + `Q`. Yes your keyboard has lights even if you didn't get the LEDs. Bonus!
-* vim-style arrow key bindings H J K L in layer 1
-* The `Bkspc` and `\` keys have been swapped, the reach was too great to have backspace on the top row
-
-### Initial Installation
-
-I found the instructions to be longer than they had to be, and I ended up having to Google some steps anyway. These are the steps I took to get my keyboard setup, in case you are new to the process.
-
-1. Clone the qmk_firmware repo locally
-```
-# Choose one:
-git clone git@github.com:qmk/qmk_firmware.git # OR
-git clone https://github.com/qmk/qmk_firmware.git
-```
-2. Customize your layout by starting with a [keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dz60/keymaps). I copied [StephenGrier](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dz60/keymaps/stephengrier)'s and modified it for DZ60 Build 4 and changed a few things, like the `grave` key, `ESC` and `/`.
-
-3. Build your hex file
-```
-make dz60:billiams # be in the qmk_firmware directory to do this
-```
-A hex file `dz60_billiams.hex` will be created in the base qmk_firmware directory
-
-4. Before plugging in your keyboard into your computer, hold `SPACE` and `B` keys down
-5. Holding those keys down, plug the keyboard into your computer, which will put the keyboard in bootlegger mode
-6. If you are using [QMK toolbox](https://github.com/qmk/qmk_toolbox/releases), upload the .hex file you made above, select it and hit the flash button. For the love of all that is good and holy on Earth, don't hit the load button, that will load the default keymap and that's not what you want! Unless it is, in which case click away.
-
-Note: If you didn't follow my instructions in 4 and accidentally loaded the default keymap, then to `RESET` the keyboard and kick it into bootleg mode again, hold the `down arrow` key and `\`. The default layout is Build 1 and sets the `MENU` key on that build to `Fn`. `MENU` corresponds to `down arrow` in build 4. Note that you don't have to unplug the keyboard.
-
-Hope this helps!
-
-### 0 Qwerty
-```
-,-----------------------------------------------------------------------------------------.
-|  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |     \     |
-|-----------------------------------------------------------------------------------------+
-| Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  | Bkspc  |
-|-----------------------------------------------------------------------------------------+
-|   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-|-----------------------------------------------------------------------------------------+
-| Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | Tap:/ RSh |  U  | ESC |
-|-----------------------------------------------------------------------------------------+
-| Ctrl |  Alt  |  Cmd  |              Space                | Alt |  Fn  |  L  |  D  |  R  |
-`-----------------------------------------------------------------------------------------'
-```
-
-### 1 Fn Layer
-```
-FN Layer
-,-----------------------------------------------------------------------------------------.
-|  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
-|-----------------------------------------------------------------------------------------+
-|        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+| Mute | Vol-| Vol+| Prev | Next |
-|-----------------------------------------------------------------------------------------+
-|         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |Scr- |Scr+ |         | PG_UP |RESET|
-|-----------------------------------------------------------------------------------------+
-|      |       |       |                                 |     |     | HOME | PG_DN | END |
-`-----------------------------------------------------------------------------------------'
-```
diff --git a/keyboards/dz60/keymaps/billiams_layout2/config.h b/keyboards/dz60/keymaps/billiams_layout2/config.h
deleted file mode 100644
index 9560d51a6f9..00000000000
--- a/keyboards/dz60/keymaps/billiams_layout2/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define GRAVE_ESC_GUI_OVERRIDE    # Always send Escape if GUI is pressed
diff --git a/keyboards/dz60/keymaps/billiams_layout2/keymap.c b/keyboards/dz60/keymaps/billiams_layout2/keymap.c
deleted file mode 100644
index 0f9d5e9c0b9..00000000000
--- a/keyboards/dz60/keymaps/billiams_layout2/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------------.
-   * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | \ | Del   |
-   * |-----------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  | Bkspc  |
-   * |-----------------------------------------------------------------------------------------+
-   * |   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-   * |-----------------------------------------------------------------------------------------+
-   * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | ?/ |    Shift   | ESC |
-   * |-----------------------------------------------------------------------------------------+
-   * | Ctrl |  Alt  |  Cmd  |              Space                |  Cmd |  Alt  |  Ctrl  |  Fn  |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_60_2_function(
-      KC_GRAVE, 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_BSLS, 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_BSPC,
-      MO(1), 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_ESCAPE,
-      KC_LCTL, KC_LALT, KC_LGUI,       KC_SPC,        KC_RGUI, KC_RALT, KC_RCTL, MO(1)
-      ),
-
-  /* FN Layer
-   * ,-----------------------------------------------------------------------------------------.
-   * |     |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |Vol- |Vol+ |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+|      |     | Mute| Prev | Next |
-   * |-----------------------------------------------------------------------------------------+
-   * |         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |Scr- |Scr+ |     |     |     |QK_BOOT|
-   * |-----------------------------------------------------------------------------------------+
-   * |      |       |       |                                   |      |       |       |       |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_60_2_function(
-      _______, 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_VOLD, KC_VOLU,
-      _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, KC_MUTE, KC_MRWD, KC_MFFD,
-      _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, KC_MPLY,
-      _______,  _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, _______, QK_BOOT,
-      _______, _______, _______, _______, _______, _______, _______, _______
-      ),
-};
diff --git a/keyboards/dz60/keymaps/billiams_layout2/readme.md b/keyboards/dz60/keymaps/billiams_layout2/readme.md
deleted file mode 100644
index bef96f4671d..00000000000
--- a/keyboards/dz60/keymaps/billiams_layout2/readme.md
+++ /dev/null
@@ -1,68 +0,0 @@
-## Billiam's DZ60 60_2 layout (KBDFANS Layout 2 with split backspace and split right shift)
-
-This layout is optimized for MacOS and is for a Build 2 DZ60 with a 2U left shift, 1.75U right shift and no arrow cluster. Don't use this layout if you didn't get Build 2, you will enter a world of pain Donny.
-
-Settings:
-
-* The `CAPS LOCK` key is a function key.
-* The `ALT` and `CMD` keys are swapped to replicate the Mac layout.
-* RESET is available as `Fn`+ ` ESC`
-* Underglow toggle is available as `Fn` + `Q`. Yes your keyboard has lights even if you didn't get the LEDs. Bonus!
-* vim-style arrow key bindings H J K L in layer 1
-
-### Initial Installation
-
-I found the instructions to be longer than they had to be, and I ended up having to Google some steps anyway. These are the steps I took to get my keyboard setup, in case you are new to the process.
-
-1. Clone the qmk_firmware repo locally
-```
-# Choose one:
-git clone git@github.com:qmk/qmk_firmware.git # OR
-git clone https://github.com/qmk/qmk_firmware.git
-```
-2. Customize your layout by starting with a [keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dz60/keymaps). I copied [StephenGrier](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dz60/keymaps/stephengrier)'s and modified it for DZ60 Build 4 and changed a few things, like the `grave` key, `ESC` and `/`.
-
-3. Build your hex file
-```
-make dz60:billiams_layout2 # be in the qmk_firmware directory to do this
-```
-A hex file `dz60_billiams_layout2.hex` will be created in the base qmk_firmware directory
-
-4. Before plugging in your keyboard into your computer, hold `SPACE` and `B` keys down
-5. Holding those keys down, plug the keyboard into your computer, which will put the keyboard in bootlegger mode
-6. If you are using [QMK toolbox](https://github.com/qmk/qmk_toolbox/releases), upload the .hex file you made above, select it and hit the flash button. For the love of all that is good and holy on Earth, don't hit the load button, that will load the default keymap and that's not what you want! Unless it is, in which case click away.
-
-Note: If you didn't follow my instructions in 4 and accidentally loaded the default keymap, then to `RESET` the keyboard and kick it into bootleg mode again, hold the `down arrow` key and `\`. The default layout is Build 1 and sets the `MENU` key on that build to `Fn`. `MENU` corresponds to `down arrow` in build 4. Note that you don't have to unplug the keyboard.
-
-Hope this helps!
-
-### 0 Qwerty
-```
-,-----------------------------------------------------------------------------------------.
-|  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | \ |  DEL  |
-|-----------------------------------------------------------------------------------------+
-| Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-|-----------------------------------------------------------------------------------------+
-|   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-|-----------------------------------------------------------------------------------------+
-| Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | ?/ |  Shift  |  ESC   |
-|-----------------------------------------------------------------------------------------+
-| Ctrl |  Alt  |  Cmd  |              Space                |  Cmd  |  Alt  |  Ctrl  |  Fn |
-`-----------------------------------------------------------------------------------------'
-```
-
-### 1 Fn Layer
-```
-FN Layer
-,-----------------------------------------------------------------------------------------.
-|  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |Vol- |Vol+ |
-|-----------------------------------------------------------------------------------------+
-|        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+|     |     | Mute | Prev | Next |
-|-----------------------------------------------------------------------------------------+
-|         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |Scr- |Scr+ |    |    |     | RESET |
-|-----------------------------------------------------------------------------------------+
-|      |       |       |                                 |       |       |       |        |
-`-----------------------------------------------------------------------------------------'
-```
diff --git a/keyboards/dz60/keymaps/billiams_layout4/config.h b/keyboards/dz60/keymaps/billiams_layout4/config.h
deleted file mode 100644
index 9560d51a6f9..00000000000
--- a/keyboards/dz60/keymaps/billiams_layout4/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define GRAVE_ESC_GUI_OVERRIDE    # Always send Escape if GUI is pressed
diff --git a/keyboards/dz60/keymaps/billiams_layout4/keymap.c b/keyboards/dz60/keymaps/billiams_layout4/keymap.c
deleted file mode 100644
index 4f21ccb83ea..00000000000
--- a/keyboards/dz60/keymaps/billiams_layout4/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------------.
-   * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-   * |-----------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-   * |-----------------------------------------------------------------------------------------+
-   * |   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-   * |-----------------------------------------------------------------------------------------+
-   * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |Tap(/) Shft|  U  | ESC |
-   * |-----------------------------------------------------------------------------------------+
-   * | Ctrl |  Alt  |  Cmd  |              Space                | Alt |  Fn  |  L  |  D  |  R  |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_directional(
-      KC_GRAVE, 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,
-      MO(1), 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, _______, RSFT_T(KC_SLSH) , KC_UP, KC_ESCAPE,
-      KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT
-      ),
-
-  /* FN Layer
-   * ,-----------------------------------------------------------------------------------------.
-   * |     |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+| Mute | Vol-| Vol+| Prev | Next |
-   * |-----------------------------------------------------------------------------------------+
-   * |         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |Scr- |Scr+ |           |PG_UP|QK_BOOT|
-   * |-----------------------------------------------------------------------------------------+
-   * |      |       |       |                                   |     |      | HOME|PG_DN| END |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_directional(
-      _______, 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_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD,
-      _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
-      KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, QK_BOOT,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
-      ),
-};
diff --git a/keyboards/dz60/keymaps/billiams_layout4/readme.md b/keyboards/dz60/keymaps/billiams_layout4/readme.md
deleted file mode 100644
index 37bbd6a65d1..00000000000
--- a/keyboards/dz60/keymaps/billiams_layout4/readme.md
+++ /dev/null
@@ -1,71 +0,0 @@
-## Billiam's DZ60 Directional layout
-
-This layout is optimized for MacOS and is for a Build 4 DZ60 with a 2U left shift, 2U right shift and an arrow
-cluster in the bottom right. Don't use this layout if you didn't get Build 4, you will enter a world of pain Donny.
-
-Settings:
-
-* The `CAPS LOCK` key is replaced with a second function key.
-* The `ALT` and `CMD` keys are swapped to replicate the Mac layout.
-* Del is available as `Fn` + `Backspace`
-* `/ ?` are available when you tap the right shift. Otherwise RShift is shift when held down
-* RESET is available as `Fn`+ ` ESC`
-* Underglow toggle is available as `Fn` + `Q`. Yes your keyboard has lights even if you didn't get the LEDs. Bonus!
-* vim-style arrow key bindings H J K L in layer 1
-
-### Initial Installation
-
-I found the instructions to be longer than they had to be, and I ended up having to Google some steps anyway. These are the steps I took to get my keyboard setup, in case you are new to the process.
-
-1. Clone the qmk_firmware repo locally
-```
-# Choose one:
-git clone git@github.com:qmk/qmk_firmware.git # OR
-git clone https://github.com/qmk/qmk_firmware.git
-```
-2. Customize your layout by starting with a [keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dz60/keymaps). I copied [StephenGrier](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dz60/keymaps/stephengrier)'s and modified it for DZ60 Build 4 and changed a few things, like the `grave` key, `ESC` and `/`.
-
-3. Build your hex file
-```
-make dz60:billiams_layout4 # be in the qmk_firmware directory to do this
-```
-A hex file `dz60_billiams_layout4.hex` will be created in the base qmk_firmware directory
-
-4. Before plugging in your keyboard into your computer, hold `SPACE` and `B` keys down
-5. Holding those keys down, plug the keyboard into your computer, which will put the keyboard in bootlegger mode
-6. If you are using [QMK toolbox](https://github.com/qmk/qmk_toolbox/releases), upload the .hex file you made above, select it and hit the flash button. For the love of all that is good and holy on Earth, don't hit the load button, that will load the default keymap and that's not what you want! Unless it is, in which case click away.
-
-Note: If you didn't follow my instructions in 4 and accidentally loaded the default keymap, then to `RESET` the keyboard and kick it into bootleg mode again, hold the `down arrow` key and `\`. The default layout is Build 1 and sets the `MENU` key on that build to `Fn`. `MENU` corresponds to `down arrow` in build 4. Note that you don't have to unplug the keyboard.
-
-Hope this helps!
-
-### 0 Qwerty
-```
-,-----------------------------------------------------------------------------------------.
-|  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-|-----------------------------------------------------------------------------------------+
-| Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-|-----------------------------------------------------------------------------------------+
-|   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-|-----------------------------------------------------------------------------------------+
-| Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | Tap:/ RSh |  U  | ESC |
-|-----------------------------------------------------------------------------------------+
-| Ctrl |  Alt  |  Cmd  |              Space                | Alt |  Fn  |  L  |  D  |  R  |
-`-----------------------------------------------------------------------------------------'
-```
-
-### 1 Fn Layer
-```
-FN Layer
-,-----------------------------------------------------------------------------------------.
-|  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
-|-----------------------------------------------------------------------------------------+
-|        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+| Mute | Vol-| Vol+| Prev | Next |
-|-----------------------------------------------------------------------------------------+
-|         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |Scr- |Scr+ |         | PG_UP |RESET|
-|-----------------------------------------------------------------------------------------+
-|      |       |       |                                 |     |     | HOME | PG_DN | END |
-`-----------------------------------------------------------------------------------------'
-```
diff --git a/keyboards/dz60/keymaps/bingocaller/config.h b/keyboards/dz60/keymaps/bingocaller/config.h
deleted file mode 100644
index b04b47a30bc..00000000000
--- a/keyboards/dz60/keymaps/bingocaller/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_TIME_TO_MAX 15
diff --git a/keyboards/dz60/keymaps/bingocaller/keymap.c b/keyboards/dz60/keymaps/bingocaller/keymap.c
deleted file mode 100644
index 6e1bb29481a..00000000000
--- a/keyboards/dz60/keymaps/bingocaller/keymap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define WORD_BACK A(KC_LEFT)
-#define WORD_FORWARD A(KC_RIGHT)
-#define DELETE_WORD_BACK A(KC_BACKSPACE)
-#define DELETE_WORD_FORWARD A(KC_DELETE)
-#define FINE_VOLUP S(A(KC_VOLU))
-#define FINE_VOLDOWN S(A(KC_VOLD))
-
-enum layers {
-  _BASE,
-  _ARROWS,
-  _HDUE, // Home, PgDown, PgUp, End
-  _MOUSE,
-  _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*  Default layer:
-        * Space Cadet shifts (parentheses on tap)
-        * Caps Lock is Control on hold, Esc on tap
-        * Hyper/Caps Lock on Control
-        * Hold D to activate layer 1
-        * Hold Space to activate layer 3 (Mouse keys)
-        * Hold FN to activate layer 4
-    */
-    [_BASE] = LAYOUT(
-        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_NO, 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,
-        LCTL_T(KC_ESC), KC_A, KC_S, LT(_ARROWS, KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-        SC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_NO,
-        ALL_T(KC_CAPS), KC_LALT, KC_LGUI, KC_NO, LT(_MOUSE, KC_SPC), KC_NO, KC_RGUI, KC_RALT, KC_NO, MO(_FN), ALL_T(KC_CAPS)),
-
-    /*  Layer 1:
-        * Vim arrows (HJKL)
-        * Vim-like move across words with W(ord), and B(eginning)
-        * Media controls (fine volume controls using Option+Shift)
-        * Backspace/Del on N/M
-        * Hold F to activate layer 2
-    */
-    [_ARROWS] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, WORD_FORWARD, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, FINE_VOLDOWN, FINE_VOLUP, _______,
-        _______, _______, _______, _______, LT(_HDUE, _______), _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, WORD_BACK, KC_BSPC, KC_DEL, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-    /*  Layer 2:
-        * Home, End, Page Up, Page Down
-        * Delete word forward/back on W/B
-    */
-    [_HDUE] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, DELETE_WORD_FORWARD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, DELETE_WORD_BACK, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-    /*  Layer 3:
-        * Mouse keys
-            * Cursor movement: HJKL
-            * MB 1, 2, and 3 on F, D, and S, respectively
-            * Mouse wheel: up (V), down (R) (reversed because of Natural Scrolling)
-    */
-    [_MOUSE] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, KC_WH_D, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, _______,
-        _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-    /*  Layer 4:
-        * F1-12
-        * Del on backspace
-        * RGB (underglow) controls
-        * QK_BOOT firmware on backslash
-        * Screen brightness: Z (decrease), X (increase)
-    */
-    [_FN] = 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_DEL,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, KC_BRMD, KC_BRMU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-    // TEMPLATE
-    // LAYOUT(
-        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-};
diff --git a/keyboards/dz60/keymaps/bingocaller/readme.md b/keyboards/dz60/keymaps/bingocaller/readme.md
deleted file mode 100644
index d32dc626749..00000000000
--- a/keyboards/dz60/keymaps/bingocaller/readme.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# MacOS standard 60% keymap with Vim-like arrows
-
-This is a MacOS-specific keymap for DZ60 configured in a standard 60% ANSI layout, with a stepped Caps Lock:
-
-[![](https://i.imgur.com/lFP2O41.png)](http://www.keyboard-layout-editor.com/#/gists/4b156fdf2c1426bffc82fadd2b1c5634)
-
-**[Fully assembled 60% keyboard from KBDfans](https://kbdfans.cn/collections/fully-assembled-keyboard/products/fully-assembled-plastic-case-mechanical-keyboard)**
-
-## Base Layer
-
-```
-,-----------------------------------------------------------------------------------------.
-|  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |
-|-----------------------------------------------------------------------------------------+
-|   Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
-|-----------------------------------------------------------------------------------------+
-| Ctrl/Esc |  A  |  S  | D/L1 |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |   Enter   |
-|-----------------------------------------------------------------------------------------+
-|   Shift/(   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |    Shift/)    |
-|-----------------------------------------------------------------------------------------+
-| Hyper |  Alt  |  Cmd  |             Space/L3             |  Cmd  |  Alt  |  L4  | Hyper |
-`-----------------------------------------------------------------------------------------'
-```
-
-* Space Cadet shifts (parentheses on tap)
-* Caps Lock is Control on hold, Esc on tap
-* Hyper/Caps Lock on Control
-* Hold D to activate layer 1
-* Hold Space to activate layer 3 (Mouse keys)
-* Hold FN to activate layer 4
-
-## `L1`
-
-```
-,-----------------------------------------------------------------------------------------.
-|     |     |     |     |     |     |     |     |     |     |     |     |     |           |
-|-----------------------------------------------------------------------------------------+
-|        |     |  W→  |     |     |     |     | ⏮ | ⏯ | ⏭ |  🔇 |  🔉 |  🔊 |         |
-|-----------------------------------------------------------------------------------------+
-|          |     |     |     |  L2  |     |  ←  |  ↓  |  ↑  |  →  |     |     |           |
-|-----------------------------------------------------------------------------------------+
-|             |     |     |     |     |  W←  |  ⌫  |  ⌦  |     |     |     |              |
-|-----------------------------------------------------------------------------------------+
-|       |       |       |                                 |       |       |       |       |
-`-----------------------------------------------------------------------------------------'
-```
-
-* Vim arrows (HJKL)
-* Vim-like move across words with W(ord), and B(eginning)
-* Media controls (fine volume controls using Option+Shift)
-* Backspace/Del on N/M
-* Hold F to activate layer 2
-
-## `L2`
-
-```
-,-----------------------------------------------------------------------------------------.
-|     |     |     |     |     |     |     |     |     |     |     |     |     |           |
-|-----------------------------------------------------------------------------------------+
-|        |     |  W⌦  |     |     |     |     |     |     |     |     |     |     |       |
-|-----------------------------------------------------------------------------------------+
-|          |     |      |     |     |     |  ↖  |  ⇞  |  ⇟  |  ↘︎  |     |     |           |
-|-----------------------------------------------------------------------------------------+
-|             |     |     |     |     |  W⌫  |     |     |     |     |     |              |
-|-----------------------------------------------------------------------------------------+
-|       |       |       |                                 |       |       |       |       |
-`-----------------------------------------------------------------------------------------'
-```
-
-* Home, End, Page Up, Page Down
-* Delete word forward/back on W/B
-
-## `L3`
-
-```
-,-----------------------------------------------------------------------------------------.
-|     |     |     |     |     |     |     |     |     |     |     |     |     |           |
-|-----------------------------------------------------------------------------------------+
-|        |     |     |     | MWU |     |     |     |     |     |     |     |     |        |
-|-----------------------------------------------------------------------------------------+
-|           |     | M3  | M2  | M1  |     | M←  | M↓  | M↑  | M→  |     |     |           |
-|-----------------------------------------------------------------------------------------+
-|             |     |     |     | MWD |     |     |     |     |     |     |               |
-|-----------------------------------------------------------------------------------------+
-|       |       |       |                                 |       |       |       |       |
-`-----------------------------------------------------------------------------------------'
-```
-
-* Mouse keys
-    * Cursor movement: HJKL
-    * MB 1, 2, and 3 on F, D, and S, respectively
-    * Mouse wheel: up (V), down (R) (reversed because of Natural Scrolling)
-
-## `L4`
-
-```
-,-----------------------------------------------------------------------------------------.
-|     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |     ⌦     |
-|-----------------------------------------------------------------------------------------+
-|       |RGB_T|RGB_M|RGB_H+|RGB_H-|RGB_S+|RGB_S-|RGB_V+|RGB_V-|   |   |   |   |   RESET   |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |     |     |     |     |           |
-|-----------------------------------------------------------------------------------------+
-|             | 🔅 | 🔆 |     |     |     |     |     |     |     |      |                |
-|-----------------------------------------------------------------------------------------+
-|       |       |       |                                 |       |       |       |       |
-`-----------------------------------------------------------------------------------------'
-```
-
-* F1-12
-* Del on backspace
-* RGB (underglow) controls
-* RESET firmware on backspace
-* Screen brightness: Z (decrease), X (increase)
diff --git a/keyboards/dz60/keymaps/boris_burger/README.md b/keyboards/dz60/keymaps/boris_burger/README.md
deleted file mode 100644
index 64062f823a0..00000000000
--- a/keyboards/dz60/keymaps/boris_burger/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-### boris_burger's DZ60 layout
-
-This layout is for a DZ60 with a 2U left shift, 1U right shift and an arrow cluster in
-the bottom right.
-
-It is based off stephengrier's layout adding support for Home/End/PgUp/PgDn using Fn+arrows
-as used on macOS and Microsoft Surface. It has Insert instead of Fn near the arrow cluster
-and other smaller tweaks:
-- CapsLock is the only Fn key (CapsLock by itself is not available)
-- Del is available as Fn+Backspace
-- Ctrl+Del is available as Ctrl+Backspace (e.g. deleting word to the right of the cursor)
-- Shift+Del is available as Shift+Backspace (e.g. permanently deleting file or e-mail)
-- PgUp = Fn+Up
-- PgDn = Fn+Down
-- Home = Fn+Left
-- End = Fn+Right
-- Tilde = Shift+Esc 
-- Backtick = Fn+Esc
-- Underglow toggle and mode selection are available as Fn+Q and Fn+W
-- Reset (bootloader mode) = Fn+B
-
-### 0 Qwerty
-```
-,-----------------------------------------------------------------------------------------.
-| Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-|-----------------------------------------------------------------------------------------+
-| Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-|-----------------------------------------------------------------------------------------+
-|   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-|-----------------------------------------------------------------------------------------+
-| Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RSh |  U  | Ins |
-|-----------------------------------------------------------------------------------------+
-| Ctrl |  Win  |  Alt  |              Space                | Alt | Menu |  L  |  D  |  R  |
-`-----------------------------------------------------------------------------------------'
-```
-
-### 1 Fn Layer
-```
-FN Layer
-,-----------------------------------------------------------------------------------------.
-|  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
-|-----------------------------------------------------------------------------------------+
-|        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |      |     |       |
-|-----------------------------------------------------------------------------------------+
-|         | BL T| BL M| BL+ | BL- |     |     |     |     |     |     |     |             |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |RESET|     |     |     |     |     |     | PgUp|     |
-|-----------------------------------------------------------------------------------------+
-|      |       |       |                                   |     |      | Home| PgDn| End |
-`-----------------------------------------------------------------------------------------'
-```
-
diff --git a/keyboards/dz60/keymaps/boris_burger/config.h b/keyboards/dz60/keymaps/boris_burger/config.h
deleted file mode 100644
index 9560d51a6f9..00000000000
--- a/keyboards/dz60/keymaps/boris_burger/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define GRAVE_ESC_GUI_OVERRIDE    # Always send Escape if GUI is pressed
diff --git a/keyboards/dz60/keymaps/boris_burger/keymap.c b/keyboards/dz60/keymaps/boris_burger/keymap.c
deleted file mode 100644
index b29c76ee125..00000000000
--- a/keyboards/dz60/keymaps/boris_burger/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/* Holds state of modifiers when Backspace was pressed.
- * Used to ensure that the correct keycode is unregistered when Backspace is released.
- */
-static uint8_t bspc_mods = 0;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty
-    * ,-----------------------------------------------------------------------------------------.
-    * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-    * |-----------------------------------------------------------------------------------------+
-    * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-    * |-----------------------------------------------------------------------------------------+
-    * |   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-    * |-----------------------------------------------------------------------------------------+
-    * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RSh |  U  | Ins |
-    * |-----------------------------------------------------------------------------------------+
-    * | Ctrl |  Win  |  Alt  |              Space                | Alt | Menu |  L  |  D  |  R  |
-    * `-----------------------------------------------------------------------------------------'
-    */
-    LAYOUT_directional(
-        QK_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_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,
-        MO(1)  ,          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_INS ,
-        KC_LCTL, KC_LGUI,          KC_LALT, KC_SPC ,          KC_SPC ,          KC_SPC ,          KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-
-    /* FN Layer
-    * ,-----------------------------------------------------------------------------------------.
-    * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
-    * |-----------------------------------------------------------------------------------------+
-    * |        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |      |     |       |
-    * |-----------------------------------------------------------------------------------------+
-    * |         | BL T| BL M| BL+ | BL- |     |     |     |     |     |     |     |             |
-    * |-----------------------------------------------------------------------------------------+
-    * |           |     |     |     |     |QK_BOOT|     |     |     |     |     |     | PgUp|     |
-    * |-----------------------------------------------------------------------------------------+
-    * |      |       |       |                                   |     |      | Home| PgDn| End |
-    * `-----------------------------------------------------------------------------------------'
-    */
-    LAYOUT_directional(
-        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, _______, _______, _______, _______, _______,
-        _______,          BL_TOGG, BL_STEP, BL_UP  , BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
-        _______, _______,          _______, _______,          _______,          _______,          _______, _______, KC_HOME, KC_PGDN, KC_END
-        ),
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch(keycode) {
-        case KC_BSPC: {
-            if (record->event.pressed) {
-                const uint8_t current_mods = get_mods();
-                const uint8_t shift = current_mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT));
-                const uint8_t ctrl = current_mods & (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTL));
-                bspc_mods = current_mods;
-                if(shift || ctrl) {
-                    add_key(KC_DEL);
-                    add_mods(current_mods);
-                    send_keyboard_report();
-                } else {
-                    return true;
-                }
-            }
-            else {
-                if(bspc_mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)|MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTL))) {
-                    // if Shift or Ctrl was pressed with Backspace, than that was intepreted as Del, so we need
-                    // to unregister the Del key 
-                    del_key(KC_DEL);
-                } else {
-                    // Either Backspace was pressed without mods, or with a modifier other than Shift or Ctrl
-                    // so it is simply taken as Backspace
-                    del_key(KC_BSPC);
-                }
-                send_keyboard_report();
-            }
-            return false;
-        }
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/dz60/keymaps/calbatr0ss/keymap.c b/keyboards/dz60/keymaps/calbatr0ss/keymap.c
deleted file mode 100644
index 7c4921a36c4..00000000000
--- a/keyboards/dz60/keymaps/calbatr0ss/keymap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*  LAYER 0
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │ TAB │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ BKSP│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │ CTRL │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ ENTER  │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │ SHIFT  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ SHIFT│LYR│
- * ├────┬───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │CAPS│ ALT│ OS │ SPACE    │ FN │ SPACE  │ OS │ ALT│MENU│CTRL│
- * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
- */
-  LAYOUT_60_calbatr0ss(
-      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_BSLS, 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_BSPC,
-      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_LSFT,          KC_Z, KC_X,    KC_C,   KC_V, KC_B,  KC_N, KC_M,   KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT, MO(3),
-      KC_CAPS, KC_LALT,       KC_LGUI, KC_SPC,       MO(2),       KC_SPC, KC_RGUI,         KC_RALT, KC_APP,  KC_RCTL),
-
-/*  LAYER 1
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │ TAB │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ BKSP│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │ CTRL │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ ENTER  │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │ SHIFT  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ SHIFT│LYR│
- * ├────┬───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │CAPS│ OS │ ALT│ SPACE    │ FN │ SPACE  │ ALT│ OS │MENU│CTRL│
- * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
- */
-  LAYOUT_60_calbatr0ss(
-      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_BSLS, 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_BSPC,
-      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_LSFT,          KC_Z, KC_X,    KC_C,   KC_V, KC_B,  KC_N, KC_M,   KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT, MO(3),
-      KC_CAPS, KC_LGUI,       KC_LALT, KC_SPC,       MO(2),       KC_SPC, KC_RALT,         KC_RGUI, KC_APP,  KC_RCTL),
-
-/*  LAYER 2
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │     │RGB│   │   │   │   │   │PDN│ UP│PUP│   │   │   │ DEL │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │   │   │   │   │HOM│LFT│DWN│RHT│END│   │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │        │   │   │   │   │VDN│VUP│MUT│PRV│NXT│PLY│      │   │
- * ├────┬───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │RSET│    │    │          │    │        │    │    │    │    │
- * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
- */
-  LAYOUT_60_calbatr0ss(
-      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,          RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP,   KC_PGUP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT,  KC_END,  KC_TRNS, KC_TRNS,
-      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT,  KC_MPLY,          KC_TRNS, KC_TRNS,
-      QK_BOOT, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS),
-
-/*  LAYER 3
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │     │   │WIN│   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │   │   │   │   │   │   │   │   │   │   │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │        │   │   │   │   │   │   │MAC│   │   │   │      │   │
- * ├────┬───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │    │    │    │          │    │        │    │    │    │    │
- * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
- */
-  LAYOUT_60_calbatr0ss(
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS,          KC_TRNS, DF(1),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DF(0),   KC_TRNS, KC_TRNS, KC_TRNS,          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/dz60/keymaps/chrisae9/config.h b/keyboards/dz60/keymaps/chrisae9/config.h
deleted file mode 100644
index 4daf8ee9b5b..00000000000
--- a/keyboards/dz60/keymaps/chrisae9/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* chrisae9 Config */
-#pragma once
-
-/* Light Config */
-#undef RGBLIGHT_HUE_STEP
-#define RGBLIGHT_HUE_STEP 1
-#undef RGBLIGHT_SAT_STEP
-#define RGBLIGHT_SAT_STEP 8
-#undef RGBLIGHT_VAL_STEP
-#define RGBLIGHT_VAL_STEP 16
-
-/* In order */
-#define RGBLIGHT_EFFECT_BREATHING
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-
-/* Mouse Config */
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_INTERVAL 15
-#define MOUSEKEY_TIME_TO_MAX 10
-#define MOUSEKEY_MAX_SPEED 2.5
diff --git a/keyboards/dz60/keymaps/chrisae9/keymap.c b/keyboards/dz60/keymaps/chrisae9/keymap.c
deleted file mode 100644
index 689f9f228df..00000000000
--- a/keyboards/dz60/keymaps/chrisae9/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_directional(
-		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_NO, 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,
-		QK_GESC, 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, MO(1),
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_MINS, KC_BSPC, KC_RALT, MO(2), KC_LEFT, KC_DOWN, KC_RIGHT),
-
-	LAYOUT_directional(
-		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_NO, KC_DEL,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		TG(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,
-		KC_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, MO(2), KC_HOME, KC_PGDN, KC_END),
-
-	LAYOUT_directional(
-		KC_PWR, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRID, KC_BRIU, KC_NO, KC_PSCR,
-		KC_TRNS, KC_PGUP, KC_MS_U, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE,
-		KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY,
-		KC_TRNS, RGB_RMOD, RGB_MOD, KC_BTN3, KC_BTN4, KC_BTN5, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, RGB_TOG, RGB_SAI, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN1, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI),
-
-	LAYOUT_directional(
-		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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-		TG(3), 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, 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/dz60/keymaps/chrisae9/readme.md b/keyboards/dz60/keymaps/chrisae9/readme.md
deleted file mode 100644
index 9e85864fa58..00000000000
--- a/keyboards/dz60/keymaps/chrisae9/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Chris' DZ60 Layout
-
-This is a custom keymap for the layout of the DZ60.
-
-## Keyboard Picture
-
-![Keyboard](https://i.imgur.com/qyWgShY.png)
-
-## Keyboard Layout
-
-![Chris DZ60](https://i.imgur.com/6mwsEOl.png)
-
-## Setup
-
-[QMK Toolbox Download](https://github.com/qmk/qmk_toolbox/releases/tag/0.0.13)
-
-[MYSYS2 for Windows](http://www.msys2.org/)
-
-``` bash
-#After downloading
-pacman -Syu
-#Close and re-open
-pacman -Su
-pacman -S git
-
-#Clone this repo and run this command in directory
-util/qmk_install.sh
-```
-
-``` bash
-#From the qmk_firware directory run
-make dz60:chrisae9
-```
diff --git a/keyboards/dz60/keymaps/coppertop/keymap.c b/keyboards/dz60/keymaps/coppertop/keymap.c
deleted file mode 100644
index 3d733bfad20..00000000000
--- a/keyboards/dz60/keymaps/coppertop/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
- /* Copyright 2020 Philip Chan
-  * 
-  * 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
-
-//Layers
-enum layer_names {
-    _QWERTY,
-    _FN,
-    _MEDIA,
-};
-
-//Custom Keymap Definitions
-#define KC_CAD LALT(LCTL(KC_DEL))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty Base layer
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | BSpc| Del |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
- * |-----------------------------------------------------------------------------------------+
- * | `/_Media|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |Home | Up  |End  |
- * |-----------------------------------------------------------------------------------------+
- * | LCtrl | LGui  | LAlt  |     Space     |  Fn  |    Space   | F7  | F10 |Left |Down |Right|
- *  `----------------------------------------------------------------------------------------'
- */
-
-    [_QWERTY] = LAYOUT_directional(
-        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,
-        LT(_MEDIA,KC_GRV), 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_HOME, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI,  KC_LALT, KC_SPC, MO(_FN), KC_SPC, KC_F7, KC_F10, KC_LEFT, KC_DOWN, KC_RGHT
-        ),
-
-/* F-Key/Lighting/whatever layer
- * ,-----------------------------------------------------------------------------------------.
- * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F0  | F11 | F12 |     | Ins |
- * |-----------------------------------------------------------------------------------------+
- * |       |R_Tog|R_HUI|R_SAI|R_VAI|     |     |     |     |     |     |     |     |  KC_CAD |
- * |-----------------------------------------------------------------------------------------+
- * |  Caps  |     |R_HUD|R_SAD|     |      |     |     |     |     | SLCK|PAUSE| Print Screen|
- * |-----------------------------------------------------------------------------------------+
- * |          |R_M_P|R_M_B|R_M_R|R_M_SW|R_M_S|R_M_K|R_M_X|R_M_G|     |     |PgUp |BLUP |PgDn |
- * |-----------------------------------------------------------------------------------------+
- * |       |       |       |               |      |            |     |     |BLTog|BLDN |BLInc|
- *  `----------------------------------------------------------------------------------------'
- */
-
-    [_FN] = LAYOUT_directional(
-        XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_INS,
-        XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAD,
-        KC_CAPS, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCRL, KC_PAUS, KC_PSCR,
-        _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXXX, XXXXXXX, KC_PGUP, BL_UP,   KC_PGDN,
-        _______, _______, _______, XXXXXXX, _______,  XXXXXXX,  XXXXXXX, XXXXXXX, BL_TOGG, BL_DOWN, BL_STEP
-        ),
-
-/* SFX/Multimedia/Numpad layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |  /  |  *  |  -  |  =  |     |Trns |Trns |
- * |-----------------------------------------------------------------------------------------+
- * |        |     | Prev | Play| Next|     |     |  7  |  8  |  9  |  +  |     |     | QK_BOOT |
- * |-----------------------------------------------------------------------------------------+
- * |         |     |Mute | VUp | VDn |     |     |  4  |  5  |  6  |  +  |     |    Trns     |
- * |-----------------------------------------------------------------------------------------+
- * |           |     |     |     |     |     |     |  1  |  2  |  3  |NumEN|     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * | Trns  | Trns  | Trns  |    Trns       |      |     0      |  .  |     |     |     |     |
- *  `----------------------------------------------------------------------------------------'
- */
-
-	[_MEDIA] = LAYOUT_directional(
-		XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, XXXXXXX, _______, _______, 
-		XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX, QK_BOOT, 
-		_______, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, XXXXXXX, _______, 
-		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX, 
-		_______, _______, _______, _______, _______, KC_P0,   KC_PDOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-		)
-};
diff --git a/keyboards/dz60/keymaps/coppertop/rules.mk b/keyboards/dz60/keymaps/coppertop/rules.mk
deleted file mode 100644
index 7b4abdbc1ba..00000000000
--- a/keyboards/dz60/keymaps/coppertop/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c b/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
deleted file mode 100644
index 523f65b2eab..00000000000
--- a/keyboards/dz60/keymaps/crd_2u_lshift/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------------.
-   * | ` ~ |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-   * |-----------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-   * |-----------------------------------------------------------------------------------------+
-   * | Ctrl/Esc|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-   * |-----------------------------------------------------------------------------------------+
-   * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |Home |  U  | End |
-   * |-----------------------------------------------------------------------------------------+
-   * | FN1  |  Alt  |  Cmd  |              Space                | Cmd  | FN2 |  L  |  D  |  R  |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_directional(
-      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_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,
-      CTL_T(KC_ESC), 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_HOME, KC_UP,   KC_END,
-      MO(1),         KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, MO(2), KC_LEFT, KC_DOWN, KC_RIGHT
-      ),
-
-  /* FN1 Layer
-   * ,-----------------------------------------------------------------------------------------.
-   * | Esc |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |     Del   |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |     |     |     |     |     |     |     |     |     |     | Home | PgUp |      |
-   * |-----------------------------------------------------------------------------------------+
-   * |         |     |     |     |     |     |  L  |  D  |  U  |  R  | End | PgDn|             |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |     |PgUp |     |
-   * |-----------------------------------------------------------------------------------------+
-   * |      |       |       |                                   |     |      |Home |PgDn | End |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_directional(
-      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_HOME,   KC_PGUP, _______,
-      _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,  KC_END,  KC_PGDN,   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______,   KC_PGUP, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
-      ),
-
-  /* FN2 Layer (Media)
-   * ,-----------------------------------------------------------------------------------------.
-   * |     |     |     |     |     |     |     |     |     |     |     |     |     |   QK_BOOT   |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |Mute | Vol- | Vol+ |      |
-   * |-----------------------------------------------------------------------------------------+
-   * |         |     |     |     |     |     |     |     |     |     |Bri- |Bri+ |             |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |Pl/Ps|Vol+ |Mute |
-   * |-----------------------------------------------------------------------------------------+
-   * |      |       |       |                                   |     |      |Prev |Vol- |Next |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_directional(
-      KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, QK_BOOT,
-      _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_MUTE, KC_VOLD,  KC_VOLU, _______,
-      _______, _______, _______, DB_TOGG, _______, _______, _______, _______, _______, _______, KC_SCRL, KC_PAUSE, _______, 
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,  KC_VOLU, KC_MUTE,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-      ),
-};
diff --git a/keyboards/dz60/keymaps/crd_ansi/keymap.c b/keyboards/dz60/keymaps/crd_ansi/keymap.c
deleted file mode 100644
index 7bf564eecb0..00000000000
--- a/keyboards/dz60/keymaps/crd_ansi/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-  _BL = 0, // Base Layer
-  _FL     // Function Layer
-};
-
-// Custom #defined keycodes (shorter macros for readability)
-#define KC_CTES CTL_T(KC_ESC)
-#define KC_RSUP RSFT_T(KC_UP)
-#define KC_FNLT LT(_FL, KC_LEFT)
-#define KC_RADN RALT_T(KC_DOWN)
-#define KC_RCRT RCTL_T(KC_RIGHT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_BL] = LAYOUT_60_ansi(
-		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_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_CTES, 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_RSUP,
-		KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_FNLT, KC_RADN, KC_RCRT
-	),
-	[_FL] = LAYOUT_60_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_DEL,
-		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, QK_BOOT,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______,          _______,                   _______,                            _______, _______, _______, _______
-	)
-};
diff --git a/keyboards/dz60/keymaps/crd_tsangan/keymap.c b/keyboards/dz60/keymaps/crd_tsangan/keymap.c
deleted file mode 100644
index 7f0c9f44250..00000000000
--- a/keyboards/dz60/keymaps/crd_tsangan/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-  _BL = 0, // Base Layer
-  _FL     // Function Layer
-};
-
-// Custom #defined keycodes (shorter macros for readability)
-#define KC_CTES CTL_T(KC_ESC)
-#define KC_RSUP RSFT_T(KC_UP)
-#define KC_RGLT RGUI_T(KC_LEFT)
-#define KC_RADN RALT_T(KC_DOWN)
-#define KC_RCRT RCTL_T(KC_RIGHT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_BL] = LAYOUT_60_tsangan_hhkb(
-		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_BSLS, 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_RBRC, KC_BSPC,
-		KC_CTES, 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_RSUP, MO(_FL),
-		KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGLT, KC_RADN, KC_RCRT
-	),
-	[_FL] = 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,  _______, QK_BOOT,
-		_______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, KC_DEL,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______,                            _______,                            _______, _______, _______
-	)
-};
diff --git a/keyboards/dz60/keymaps/danbee/keymap.c b/keyboards/dz60/keymaps/danbee/keymap.c
deleted file mode 100644
index 19ef257f52e..00000000000
--- a/keyboards/dz60/keymaps/danbee/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-  _QW,
-  _L1,
-  _L2,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: qwerty */
-  /*┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-    │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bcksp │
-    ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-    │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ Ent │
-    ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
-    │ Ctrl │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │    │
-    ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
-    │Shft│ ` │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  Shift   │
-    ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-    │ Fn │Alt │Cmd │         Space          │Cmd │Hypr│Ctrl│Fn 2│
-    └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘*/
-  [_QW] = LAYOUT_60_iso( /* Layer 0: Qwerty */
-    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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-    KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_L1), KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_HYPR, KC_RCTL, MO(_L2)
-  ),
-  /* 1: fn */
-  /*┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-    │ § │Br-│Br+│   │   │BL-│BL+│Pre│Pau│Nxt│Mut│Vo-│Vo+│  Del  │
-    ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-    │     │   │   │   │   │   │   │   │   │   │   │   │   │ Ins │
-    ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
-    │      │   │   │   │   │   │ ◀ │ ▼ │ ▲ │ ▶ │   │   │   │    │
-    ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
-    │    │   │   │   │   │   │BL~│   │   │   │   │   │          │
-    ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-    │    │    │    │                        │    │    │    │    │
-    └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘*/
-  [_L1] = LAYOUT_60_iso( /* Layer 1: Functions */
-    KC_NUBS, KC_BRID, KC_BRIU, _______, _______, BL_DOWN, BL_UP,   KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______, KC_INS,
-    _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  ),
-  /* 2: fn 2 */
-  /*┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-    │Pwr│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ Eject │
-    ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-    │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
-    ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
-    │ Caps │   │   │   │   │   │Hom│PgD│PgU│End│   │   │   │    │
-    ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
-    │    │   │   │   │   │   │Rst│   │   │   │   │   │          │
-    ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-    │    │    │    │                        │    │    │    │    │
-    └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘*/
-  [_L2] = LAYOUT_60_iso( /* Layer 2: Functions */
-    KC_PWR,   KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_EJCT,
-    _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, RGB_M_T, RGB_MOD, _______, _______, _______, _______, _______, _______,
-    KC_CAPS, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_SW,RGB_M_G, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, _______, _______,
-    _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_K, _______, QK_BOOT, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  ),
-};
diff --git a/keyboards/dz60/keymaps/danbee/rules.mk b/keyboards/dz60/keymaps/danbee/rules.mk
deleted file mode 100644
index cfd86c52bac..00000000000
--- a/keyboards/dz60/keymaps/danbee/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE = no
-CONSOLE_ENABLE = yes
diff --git a/keyboards/dz60/keymaps/dbroqua/keymap.c b/keyboards/dz60/keymaps/dbroqua/keymap.c
deleted file mode 100644
index 46471911ba6..00000000000
--- a/keyboards/dz60/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _DEFAULT 0
-#define _FN 1
-#define _SFX 2
-
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty gui/alt/space/alt/gui
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
- * |-----------------------------------------------------------------------------------------+
- *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
- *         `-----------------------------------------------------------------'
- */
-  [_DEFAULT] = LAYOUT_true_hhkb( /* Basic QWERTY */
-      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_BSLS, 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_BSPC,
-      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_LSFT, ______,  KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),
-               KC_LGUI, KC_LALT,                     KC_SPC,                       KC_RALT, KC_RGUI
-      ),
-
-/* FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * | SFX | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |  CAPS  |     |     |     |     |     |     |     | Psc | Slck| Paus| Up  |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 | Stop  |       |
- *         `-----------------------------------------------------------------'
- */
-  [_FN] = LAYOUT_true_hhkb( /* Layer 1 */
-      TG(_SFX),KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS,  KC_DEL,
-      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  ______, ______,
-      ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______,
-      ______,  ______,  KC_MPRV, KC_MPLY, KC_MNXT,______, ______, KC_PPLS,  KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,______, ______,
-               ______,  ______,                   ______,                            KC_MSTP, ______
-      ),
-
-
-/* SFX Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        | BL- | BL+ | BL  |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | RGBT| RGBM|     |     |     |     |     |     |     |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |      |    |     |           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 |       |       |
- *         `-----------------------------------------------------------------'
- */
-  [_SFX] = LAYOUT_true_hhkb(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   BL_TOGG,BL_STEP,BL_DOWN,BL_UP,  ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   RGB_TOG,RGB_MOD,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   ______, RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,______, ______, ______, ______, ______, ______,
-                ______, ______,                         ______,                         ______, ______
-      )
-};
diff --git a/keyboards/dz60/keymaps/devinceble_wkl_tofu/keymap.c b/keyboards/dz60/keymaps/devinceble_wkl_tofu/keymap.c
deleted file mode 100644
index 5135a7b8ea8..00000000000
--- a/keyboards/dz60/keymaps/devinceble_wkl_tofu/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 Devinceble AKA Vimwarrior
- *
- * 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_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_BSLS, 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_BSPC,
-        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_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_LALT, KC_LCTL, KC_LGUI, KC_SPC, KC_RCTL, KC_RGUI, MO(2)
-    ),
-	[1] = LAYOUT_60_tsangan_hhkb(
-        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_INS, KC_DEL,
-        KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-	[2] = LAYOUT_60_tsangan_hhkb(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS,
-        KC_CAPS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP,  BL_DOWN,BL_BRTG, 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/dz60/keymaps/devinceble_wkl_tofu/readme.md b/keyboards/dz60/keymaps/devinceble_wkl_tofu/readme.md
deleted file mode 100644
index 221ce8061e7..00000000000
--- a/keyboards/dz60/keymaps/devinceble_wkl_tofu/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Devinceble AKA Vimwarrior WKL Tofu Keymap
-
-Build Hex File:
-
-    make dz60:devinceble_wkl_tofu
-
-Flash Keyboard
-
-    make dz60:devinceble_wkl_tofu:flash
diff --git a/keyboards/dz60/keymaps/devinceble_wkl_tofu/rules.mk b/keyboards/dz60/keymaps/devinceble_wkl_tofu/rules.mk
deleted file mode 100644
index 522abf46b15..00000000000
--- a/keyboards/dz60/keymaps/devinceble_wkl_tofu/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE    = yes
diff --git a/keyboards/dz60/keymaps/drewsky/Readme.md b/keyboards/dz60/keymaps/drewsky/Readme.md
deleted file mode 100755
index 115d9cf83b8..00000000000
--- a/keyboards/dz60/keymaps/drewsky/Readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# **DREWSKY'S DZ60 ANSI Layout**
-![Imgur](https://i.imgur.com/v4zVbl7.jpg)
-
-
-Layer 1 is default configuration, for the exception of the Space cadet shifts. Layer 2 is for WASD arrows and Media, which I have included both PREV and NEXT for Windows and macOS. Layer 3 is for RGB underglow. Legends in picture follow Layers. Modifier one is momentary, and the RGB layer is TT (TAP_TOGGLE)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make dz60:drewsky
-
-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/dz60/keymaps/drewsky/keymap.c b/keyboards/dz60/keymaps/drewsky/keymap.c
deleted file mode 100755
index 0de122a7f06..00000000000
--- a/keyboards/dz60/keymaps/drewsky/keymap.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Helpful defines
-#define _L0 0
-#define _L1 1
-#define _L2 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	 
-  [_L0] = LAYOUT_60_ansi(
-			QK_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_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, 
-			SC_LSPO,      KC_Z,    KC_X,   KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, 
-			KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                                 TT(2),   KC_RALT,    MO(1),    KC_RCTL),
-	
-  [_L1] = LAYOUT_60_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_DEL, 
-			KC_NO,     KC_NO,    KC_UP,    KC_NO,    KC_NO,    KC_NO,     KC_NO,     KC_NO,     KC_NO,    KC_NO,    KC_NO,     KC_NO,     KC_NO,     KC_PGUP, 
-			KC_NO,      KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_NO,    KC_NO,     KC_NO,     KC_NO,     KC_NO,    KC_NO,    KC_NO,     KC_NO,     KC_PGDN, 
-			KC_NO,       KC_MRWD,  KC_MFFD,  KC_NO,    KC_NO,    KC_NO,     KC_NO,     KC_NO,     KC_NO,    KC_NO,    KC_NO,     KC_NO, 
-			KC_MSTP,   KC_VOLD,    KC_VOLU,                            KC_MPLY,                             KC_VOLD, KC_VOLU, KC_TRNS, KC_NO),
-	
-  [_L2] = LAYOUT_60_ansi(    
-			KC_ESC, RGB_M_P,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-			KC_NO,   RGB_HUD,  RGB_HUI,  KC_NO,   KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-            KC_NO,    RGB_SAD,  RGB_SAI,  KC_NO,   KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, 
-            KC_NO,     RGB_VAD,  RGB_VAI,  KC_NO,   KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   RGB_SPD, RGB_SPI, KC_NO, 
-            KC_NO,    KC_NO,    KC_NO,                             RGB_TOG,                           KC_TRNS, KC_NO, KC_NO, DB_TOGG)
-};
-
-
-
-
diff --git a/keyboards/dz60/keymaps/edulpn/README.md b/keyboards/dz60/keymaps/edulpn/README.md
deleted file mode 100644
index 221be722b1b..00000000000
--- a/keyboards/dz60/keymaps/edulpn/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Edulpn Tsangan Keymap for the DZ60 PCB
-
-## Additional Notes
-Tsangan 60% Keymap for DZ60 + Fn layer.
-
-### Layout
-![Edulpn Tsangan Keymap for the DZ60](https://i.imgur.com/z7HHeH7.png)
-
-## Build
-To build the default keymap, simply run `make dz60:edulpn`.
diff --git a/keyboards/dz60/keymaps/edulpn/keymap.c b/keyboards/dz60/keymaps/edulpn/keymap.c
deleted file mode 100644
index f9eef567336..00000000000
--- a/keyboards/dz60/keymaps/edulpn/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_60_tsangan_hhkb(
-		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_BSLS,	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_BSPC,
-		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,	MO(1),
-		KC_LCTL, 	KC_LGUI,	KC_LALT,											KC_SPC,													KC_RALT,    KC_RGUI, 	KC_RCTL
-	),
-	[1] = LAYOUT_60_tsangan_hhkb(
-		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_TRNS,	QK_BOOT,
-		KC_TRNS,	RGB_TOG,	RGB_MOD,	RGB_HUI,	RGB_HUD,	RGB_SAI,	RGB_SAD,	RGB_VAI,	RGB_VAD,	KC_TRNS,	KC_TRNS,	KC_UP,		KC_TRNS,	KC_DEL,
-		KC_TRNS,	KC_MPLY,	KC_MPRV,	KC_MNXT,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_LEFT,	KC_RIGHT, 				KC_TRNS,
-		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_DOWN,				KC_TRNS,	KC_TRNS,
-		KC_TRNS, 	KC_TRNS,	KC_TRNS,											KC_TRNS,												KC_TRNS,    KC_TRNS, 	KC_TRNS
-	)
-};
diff --git a/keyboards/dz60/keymaps/eric/keymap.c b/keyboards/dz60/keymaps/eric/keymap.c
deleted file mode 100644
index 571dd25baf3..00000000000
--- a/keyboards/dz60/keymaps/eric/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Layer 0
-* ,-----------------------------------------------------------------------------------------.
-* | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  ~  |
-* |-----------------------------------------------------------------------------------------+
-* | Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  | Bkspc   |
-* |-----------------------------------------------------------------------------------------+
-* | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-* |-----------------------------------------------------------------------------------------+
-* | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |   /   |  Shift   | Fn |
-* |-----------------------------------------------------------------------------------------+
-* | Caps  |  GUI |  Alt |                    Space               |   Alt   |  GUI  |  Ctrl  |
-* `-----------------------------------------------------------------------------------------'
-*/
-
-	LAYOUT(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC,
-		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_LSFT, KC_NO, 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_CAPS, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_RALT, KC_RCTL),
-
-
-
- /* Layer 1
-* ,-----------------------------------------------------------------------------------------.
-* |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | INS | Del |
-* |-----------------------------------------------------------------------------------------+
-* |      | PGUP | UP | PGDN | HOME | &  |  ~  |     |     |     | Prnt | UP | Del |  Bkspc  |
-* |-----------------------------------------------------------------------------------------+
-* |        | LEFT | DWN | RGHT | END |  *  |    |    | PGUP | HOME | LEFT | RGHT |          |
-* |-----------------------------------------------------------------------------------------+
-* |           |  _  |  +  |  (  |  )  |  |  |     |     | PGDN | END |  DWN  |        |     |
-* |-----------------------------------------------------------------------------------------+
-* |       |      |       |                                         |        |      |        |
-* `-----------------------------------------------------------------------------------------'
-*/
-
-
-	LAYOUT(
-		KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-		KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_AMPR, KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_DEL, KC_BSPC,
-		KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_ASTR, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_LEFT, KC_RGHT, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LPRN, KC_RPRN, KC_PIPE, KC_TRNS, KC_TRNS, KC_PGDN, KC_END, KC_DOWN, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS),
-
-	LAYOUT(
-		QK_BOOT, KC_A, 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, 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, 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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-};
diff --git a/keyboards/dz60/keymaps/f3d3/keymap.c b/keyboards/dz60/keymaps/f3d3/keymap.c
deleted file mode 100644
index 9b9f5d950a6..00000000000
--- a/keyboards/dz60/keymaps/f3d3/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Layer 0
-* ,-----------------------------------------------------------------------------------------.
-* | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  `  | Bck |
-* |-----------------------------------------------------------------------------------------+
-* | Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \    |
-* |-----------------------------------------------------------------------------------------+
-* | Caps    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-* |-----------------------------------------------------------------------------------------+
-* | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |    RSh    |  U  |  /  |
-* |-----------------------------------------------------------------------------------------+
-* | Ctrl  |  GUI |  Alt |     Space     |  Fn1 |    Play    | Pscr | Fn1 | Left |Rght |Down |
-* `-----------------------------------------------------------------------------------------'
-*/
-
-	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_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_TRNS, KC_Z,    KC_X,   KC_C,  KC_V,    KC_B,    KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_TRNS,  KC_RSFT,  KC_UP,   KC_SLSH,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_MPLY, KC_PSCR, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
-
-
-
- /* Layer 1
-* ,-----------------------------------------------------------------------------------------.
-* | PWR | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |     | Del |
-* |-----------------------------------------------------------------------------------------+
-* |       |RGBT |RGBM |Hue+ |Hue- |Sat+ |Sat- |Val+ |Val- |     |     |     |     |  QK_BOOT  |
-* |-----------------------------------------------------------------------------------------+
-* |         |     |     |     |     |     |     |     |     |     |     |     |             |
-* |-----------------------------------------------------------------------------------------+
-* |           |     |     |     | BLT | BL- | BL+ | BLS |     |     |           |Vol+ |     |
-* |-----------------------------------------------------------------------------------------+
-* |      |      |      |                |      |    Stop     |      |     |Prev |Vol- |Next |
-* `-----------------------------------------------------------------------------------------'
-*/
-
-
-  LAYOUT_all(
-		KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,  KC_DEL,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
-};
diff --git a/keyboards/dz60/keymaps/frogger/keymap.c b/keyboards/dz60/keymaps/frogger/keymap.c
deleted file mode 100644
index 0e2f0b62a85..00000000000
--- a/keyboards/dz60/keymaps/frogger/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define ______ KC_TRNS
-
-#define LAYER_1 1
-#define LAYER_2 2
-#define LAYER_3 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base Layer
-   * ,-----------------------------------------------------------------------------------------.
-   * | ` ~ |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-   * |-----------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-   * |-----------------------------------------------------------------------------------------+
-   * | LAY1    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-   * |-----------------------------------------------------------------------------------------+
-   * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RSh |  U  | LAY2|
-   * |-----------------------------------------------------------------------------------------+
-   * | Ctrl |  Cmd  |  Alt  |   LAY1    | LAY2 |      SPACE     | RAlt | LAY1 |  L  |  D  |  R |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_all(
-      KC_GRAVE, 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,
-
-      MO(LAYER_1), 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, MO(LAYER_2),
-
-      KC_LCTL, KC_LGUI, KC_LALT, MO(LAYER_1),  MO(LAYER_1), KC_SPC, KC_RALT, MO(LAYER_1), KC_LEFT, KC_DOWN, KC_RIGHT
-      ),
-
-  /* Layer 1
-   * ,-----------------------------------------------------------------------------------------.
-   * | Esc |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |   DEL     |
-   * |-----------------------------------------------------------------------------------------+
-   * |       | PREV | PLAY | NEXT |     |     |     |     |  Up |      |     |     |    |      |
-   * |-----------------------------------------------------------------------------------------+
-   * |         |    |    |    |   |   |     | Home| Left | Down | Right | End |     |          |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |     |VOL+|      |
-   * |-----------------------------------------------------------------------------------------+s
-   * |      |       |       |                                   |     |      |     |VOL-| MUTE |
-   * `-----------------------------------------------------------------------------------------'
-   KC_VOLD, KC_VOLU, KC_MUTE,
-   KC_MPRV, KC_MPLY, KC_MNXT,
-   */
-
-  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_MPRV, KC_MPLY, KC_MNXT, ______, ______, ______, ______, KC_UP, ______, ______, ______, ______, ______,
-
-      ______, ______, ______, ______, ______, ______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, ______, ______,
-
-      ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_VOLU, ______,
-
-      ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_VOLD, KC_MUTE
-      ),
-
-  /* Layer 2
-   * ,-----------------------------------------------------------------------------------------.
-   * | QK_BOOT |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  QK_BOOT  |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |      |      |      |
-   * |-----------------------------------------------------------------------------------------+
-   * |         | BL T| BL M| BL+ | BL- |     |     |     |     |     |     |     |             |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
-   * |-----------------------------------------------------------------------------------------+
-   * |      |       |       |                                   |     |      |     |     |     |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_all(
-      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_F11, KC_F12, ______, QK_BOOT,
-
-      ______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______, ______, ______, ______, ______,
-
-      ______, BL_TOGG, BL_STEP, BL_UP,  BL_DOWN,______, ______, ______, ______, ______, ______, ______, ______,
-
-      ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-
-      ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______
-      ),
-};
diff --git a/keyboards/dz60/keymaps/frogger/readme.md b/keyboards/dz60/keymaps/frogger/readme.md
deleted file mode 100644
index 1704717155c..00000000000
--- a/keyboards/dz60/keymaps/frogger/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-![DZ60 Layout Image](https://i.redd.it/aa4usjtk5j701.jpg)
-
-# Frogger's Keyboard Layout
-
-This layouts is for someone with a dedicated arrow keys, but still wants arrows on home row as well.  I have one layer which is functionality, and another layer
-which is really more around backlight stuff, because I rarely use it. Instead of a 2.25u shift as pictured, I have 2 1u keys.
diff --git a/keyboards/dz60/keymaps/gk64/keymap.c b/keyboards/dz60/keymaps/gk64/keymap.c
deleted file mode 100644
index 53b4b5c1a6a..00000000000
--- a/keyboards/dz60/keymaps/gk64/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_64_ansi(
-		QK_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_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_UP,   MO(1),
-		KC_LCTL, KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	LAYOUT_64_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_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, 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/dz60/keymaps/hailbreno/README.md b/keyboards/dz60/keymaps/hailbreno/README.md
deleted file mode 100644
index f7f8ff48026..00000000000
--- a/keyboards/dz60/keymaps/hailbreno/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Split spacebar and multiple layouts for DZ60.
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/hailbreno/keymap.c b/keyboards/dz60/keymaps/hailbreno/keymap.c
deleted file mode 100644
index 3abc57aca64..00000000000
--- a/keyboards/dz60/keymaps/hailbreno/keymap.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
-* @Author: hailbreno
-* @Date:   2018-04-30 14:32:13
-* @Last Modified by:   hailbreno
-* @Last Modified time: 2018-05-03 11:19:34
-*/
-
-#include QMK_KEYBOARD_H
-
-#define X KC_NO
-
-extern keymap_config_t keymap_config;
-
-enum layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _FUNC,
-  _FUNC2,
-  _ADJUST,
-  _RGB
-};
-
-enum keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  FUNC,
-  FUNC2,
-  RGB,
-};
-
-/*layout template
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |          |     |     |     |     |     |     |     |     |     |     |     |            |
- * |-----------------------------------------------------------------------------------------+
- * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |      |      |      |             |      |                 |     |     |     |     |     |
- * `-----------------------------------------------------------------------------------------'
-
- [LAYOUT] = LAYOUT_all(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______,
-  _______, X,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______,           _______,        _______,           _______,         _______, _______, _______, _______, _______),
-*/
-
-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   | [   | ]   |  Del   |
- * |-----------------------------------------------------------------------------------------+
- * | Caps     | A   | S   | D   | F   | G   | H   | J   | K   | L   | ;   | '   | Enter      |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     | Z   | X   | C   | V   | B   | N   | M   | ,   | .   | /   |Shift| Up  | Bl  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl | Alt  | Gui  |  Backspace  | Fn2  |      Space      | Alt | App | Left| Down|Right|
- * `-----------------------------------------------------------------------------------------'
- */
-[_QWERTY] = 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_BSLS, 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_DEL,
-  LT(_FUNC,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,
-  SC_LSPO, X,         KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC,  KC_UP,     RGB,
-  KC_LCTL,            KC_LALT,  KC_LGUI,  KC_BSPC,    FUNC2,   KC_SPC,     KC_RALT,  KC_APP,  KC_LEFT,  KC_DOWN,   KC_RGHT),
-
-/* COLEMAK
- * ,-----------------------------------------------------------------------------------------.
- * | Esc | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   | 0   | -   | =   | ~   | Del |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    | Q   | W   | F   | P   | G   | J   | L   | U   | Y   | ;   | [   | ]   | \      |
- * |-----------------------------------------------------------------------------------------+
- * | Caps     | A   | R   | S   | T   | D   | H   | N   | E   | I   | O   | '   | Enter      |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     | Z   | X   | C   | V   | B   | K   | M   | ,   | .   | /   |Shift| Up  | Bl  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl | Alt  | Gui  |  Backspace  | Fn2  |      Space      | Alt | App | Left| Down|Right|
- * `-----------------------------------------------------------------------------------------'
- */
-[_COLEMAK] = 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_BSLS, KC_GRV,
-  KC_TAB,             KC_Q,  KC_W,  KC_F,  KC_P,  KC_G,  KC_J,  KC_L,  KC_U,  KC_Y,  KC_SCLN,  KC_LBRC,  KC_RBRC,    KC_DEL,
-  LT(_FUNC,KC_CAPS),   KC_A,  KC_R,  KC_S,  KC_T,  KC_D,  KC_H,  KC_N,  KC_E,  KC_I,  KC_O,  KC_QUOT,                KC_ENT,
-  SC_LSPO, X,         KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_K,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC,  KC_UP,     RGB,
-  KC_LCTL,            KC_LALT,  KC_LGUI,  KC_BSPC,    FUNC2,   KC_SPC,     KC_RALT,  KC_APP,  KC_LEFT,  KC_DOWN,   KC_RGHT),
-
-/* DVORAK
- * ,-----------------------------------------------------------------------------------------.
- * | Esc | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   | 0   | [   | ]   | ~   | Del |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    | "   | ,   | .   | P   | Y   | F   | G   | C   | R   | L   | /   | =   | \      |
- * |-----------------------------------------------------------------------------------------+
- * | Bckspc   | A  | O   | E   | U   | I   | D   | H   | T   | N   | S   | -   | Enter       |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     | ;   | Q   | J   | K   | X   | B   | M   | W   | V   | Z   |Shift| Up  | Bl  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl | Alt  | Gui  |  Backspace  | Fn2  |      Space      | Alt | App | Left| Down|Right|
- * `-----------------------------------------------------------------------------------------'
- */
-[_DVORAK] = 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_LBRC,  KC_RBRC,  KC_BSLS, KC_GRV,
-  KC_TAB,          KC_QUOTE,  KC_COMM,  KC_DOT,  KC_P,  KC_Y,  KC_F,  KC_G,  KC_C,  KC_R,  KC_L,  KC_SLSH,  KC_EQL,  KC_DEL,
-  LT(_FUNC,KC_CAPS),   KC_A,  KC_O,  KC_E,  KC_U,  KC_I,  KC_D,  KC_H,  KC_T,  KC_N,  KC_S,  KC_MINS,                KC_ENT,
-  SC_LSPO, X,         KC_SCLN,  KC_Q,  KC_J,  KC_K,  KC_X,  KC_B,  KC_M,  KC_W, KC_V,  KC_Z,  SC_RSPC,     KC_UP,       RGB,
-  KC_LCTL,            KC_LALT,  KC_LGUI,  KC_BSPC,    FUNC2,   KC_SPC,      KC_RALT,  KC_APP,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-/* FUNC
- * ,-----------------------------------------------------------------------------------------.
- * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Prnt| Ins |
- * |-----------------------------------------------------------------------------------------+
- * |        |     |     |     |     |     |     |     | Up  |     |     |     |     | Bspc   |
- * |-----------------------------------------------------------------------------------------+
- * |          |     |     |     |     |     |     | Left| Down| Rght|     |     |            |
- * |-----------------------------------------------------------------------------------------+
- * |           |     |     |     |     |     |     |     |     |     |     |     | PgUp|     |
- * |-----------------------------------------------------------------------------------------+
- * |      |      |      |             |      |                 |     |     | Home| PgDn| End |
- * `-----------------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_all(
-  _______,   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_INS,
-  _______,          _______, _______, _______, _______, _______, _______, KC_PGUP,   KC_UP, KC_PGDN, KC_CIRC, _______, _______, KC_BSPC,
-  _______,      _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_TILD,              _______,
-  _______, X,        _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, KC_PGUP, _______,
-  _______, _______, _______,           _______,        _______,           _______,          _______, _______, KC_HOME, KC_PGDN, KC_END),
-
-/* FUNC2
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |          |     |     |     |     |     |     |     |     |     |     |     |            |
- * |-----------------------------------------------------------------------------------------+
- * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |      |      |      |             |      |                 |     |     |     |     |     |
- * `-----------------------------------------------------------------------------------------'
- */
-[_FUNC2] = LAYOUT_all(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______,
-  _______, X,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______,           _______,        _______,           _______,         _______, _______, _______, _______, _______),
-
-/* RGB
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |          |     |     |     |     |     |     |     |     |     |     |     |            |
- * |-----------------------------------------------------------------------------------------+
- * |           |     |     |     |     |     |     |     |     |     |     |     | Tog |     |
- * |-----------------------------------------------------------------------------------------+
- * |      |      |      |             |      |                 |     |     |     |     |     |
- * `-----------------------------------------------------------------------------------------'
- */
-[_RGB] = LAYOUT_all(
-  _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______, _______, _______, _______,
-  _______,          RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,      RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,              _______,
-  _______, X,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______,
-  _______, _______, _______,           _______,        _______,           _______,         _______, _______, _______, _______, _______),
-
-/* Adjust (Func + Func2)
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |Reset|
- * |-----------------------------------------------------------------------------------------+
- * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |          |     |     |     |     |     |     |     |     |     |     |     |            |
- * |-----------------------------------------------------------------------------------------+
- * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |      |      |      |           |      |                |     |     |Qwerty|Colemk|Dvorak|
- * `-----------------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_all(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   QK_BOOT,
-  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______,
-  _______, X,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______,           _______,        _______,           _______,         _______, _______,  QWERTY, COLEMAK,  DVORAK),
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case FUNC:
-      if (record->event.pressed) {
-        layer_on(_FUNC);
-        update_tri_layer(_FUNC, _FUNC2, _ADJUST);
-      } else {
-        layer_off(_FUNC);
-        update_tri_layer(_FUNC, _FUNC2, _ADJUST);
-      }
-      return false;
-      break;
-    case FUNC2:
-      if (record->event.pressed) {
-        layer_on(_FUNC2);
-        update_tri_layer(_FUNC, _FUNC2, _ADJUST);
-      } else {
-        layer_off(_FUNC2);
-        update_tri_layer(_FUNC, _FUNC2, _ADJUST);
-      }
-      return false;
-      break;
-    case RGB:
-      if (record->event.pressed) {
-        layer_on(_RGB);
-      } else {
-        layer_off(_RGB);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/dz60/keymaps/hailbreno/rules.mk b/keyboards/dz60/keymaps/hailbreno/rules.mk
deleted file mode 100644
index 975bfbbbcb2..00000000000
--- a/keyboards/dz60/keymaps/hailbreno/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/iso_de_andys8/README.md b/keyboards/dz60/keymaps/iso_de_andys8/README.md
deleted file mode 100644
index 504726adf51..00000000000
--- a/keyboards/dz60/keymaps/iso_de_andys8/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ISO DE layout
-
-This layout is ISO-DE and similar to a standard 60 ISO layout. There are vim style arrow keys on the function layer. The bottom right is the expected default.
diff --git a/keyboards/dz60/keymaps/iso_de_andys8/keymap.c b/keyboards/dz60/keymaps/iso_de_andys8/keymap.c
deleted file mode 100644
index dfd5e75b541..00000000000
--- a/keyboards/dz60/keymaps/iso_de_andys8/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* ISO 60 layout by andys8 (ISO German keyboard layout shown)
-   *
-   * This layout starts from a standard ISO 60% layout, and adds a function layer.
-   *
-   * ,-----------------------------------------------------------------------------------------.
-   * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace |
-   * |-----------------------------------------------------------------------------------------|
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Z  |  U  |  I  |  O  |  P  |  Ä  | + * | Enter  |
-   * |----------------------------------------------------------------------------------       |
-   * | Layer_1 |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ü  | # ' |       |
-   * |-----------------------------------------------------------------------------------------|
-   * | Shift | < > |  Y  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | . : | - _ | Shift         |
-   * |-----------------------------------------------------------------------------------------|
-   * | LCtl  | LGUI  | LAlt  |            Space                  | RAlt  | RGUI  | App  | RCtl |
-   * `-----------------------------------------------------------------------------------------'
-   */
-  LAYOUT_60_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_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,
-    MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-    KC_LSFT, KC_NUBS, 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, KC_APP,   KC_RCTL
-  ),
-
-
-  LAYOUT_60_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_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT, KC_NO,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_PSCR, KC_NO,   KC_NO,
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_END,  KC_DEL,  KC_NO,   KC_NO,
-    KC_LSFT, BL_TOGG, KC_APP,  KC_PAUS, KC_INS,  KC_NO,   KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,   KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_BSPC,                                     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-};
diff --git a/keyboards/dz60/keymaps/iso_de_andys8/rules.mk b/keyboards/dz60/keymaps/iso_de_andys8/rules.mk
deleted file mode 100644
index 0aa5b794605..00000000000
--- a/keyboards/dz60/keymaps/iso_de_andys8/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   comment out to disable the options.
-#
-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
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUTO_SHIFT_ENABLE = no # If the time depressed is greater than or equal to the AUTO_SHIFT_TIMEOUT, then a shifted version of the key is emitted. If the time is less than the AUTO_SHIFT_TIMEOUT time, then the normal state is emitted
-TAP_DANCE_ENABLE = no
diff --git a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c
deleted file mode 100644
index 76a93b50be4..00000000000
--- a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2021 Tobias Minn (@0x544D) 
-  * 
-  * 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_idx{
-  _BL = 0, // base layer
-  _FN1,    // function layer 1
-  _FN2     // function layer 2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-   /* ISO 60 layout by 0x544D (ISO German keyboard layout shown)
-   *
-   * Keyboard uses a HW layout with dedicated arrow keys. To accomplish that, the key on the
-   * left of the "UP arrow" key serves a dual purpose as "-_" when pressed short and as "RShift" key
-   * when you hold the key. To trigger the "underscore" you need to hold LShift and press "-_".
-   *
-   * ,-----------------------------------------------------------------------------------------.
-   * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace |
-   * |-----------------------------------------------------------------------------------------|
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Z  |  U  |  I  |  O  |  P  |  Ü  | + * | Enter  |
-   * |----------------------------------------------------------------------------------       |
-   * | MO(2)   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ä  | # ' |       |
-   * |-----------------------------------------------------------------------------------------|
-   * | Shift | < > |  Y  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | .: |-_ /Shift |  Up | Del |
-   * |-----------------------------------------------------------------------------------------|
-   * | LCtl  | LGUI  | LAlt  |            Space                  |RAlt| MO(1)| Lft | Dwn | Rgh |
-   * `-----------------------------------------------------------------------------------------'
-   */
-    [_BL] = LAYOUT_60_iso_arrow_one_bksp(
-        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,
-        MO(2),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,         KC_BSLS, KC_ENT,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT,         KC_DOWN, KC_RGHT
-    ),
-
-   /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys,
-   *                   RGB backlight control
-   * ,-----------------------------------------------------------------------------------------.
-   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |
-   * |-----------------------------------------------------------------------------------------|
-   * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
-   * |----------------------------------------------------------------------------------       |
-   * |         |     |     |     |     |     |     |     |     |     |     |     |     |       |
-   * |-----------------------------------------------------------------------------------------|
-   * |       |     |     |     |     | RGB-|RGB_T| RGB+|     |     |     |  MPlay  |Vol_U|     |
-   * |-----------------------------------------------------------------------------------------|
-   * |       |       |       |                                   |     |Trans| MPrv|Vol_D| MNxt|
-   * `-----------------------------------------------------------------------------------------'
-   */
-    [_FN1] = LAYOUT_60_iso_arrow_one_bksp(
-        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_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,   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,   RGB_RMOD,RGB_TOG, RGB_MOD, KC_NO,   KC_NO,   KC_NO,   KC_MPLY,         KC_VOLU, KC_NO,
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_TRNS, KC_MPRV,         KC_VOLD, KC_MNXT
-    ),
-    
-
-   /* Funtion Layer 2: Media Controls left hand, F keys, Page up/down, Home/end, Program/QK_BOOT
-   * ,-----------------------------------------------------------------------------------------.
-   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |
-   * |-----------------------------------------------------------------------------------------|
-   * |        |     |Vol_D|Vol_U|     |     |     |     |     |     |QK_BOOT|     |     |        |
-   * |----------------------------------------------------------------------------------       |
-   * |  Trans  |MPrv |MPlay| MNxt|     |     |     |     |     |     |     |     |     |       |
-   * |-----------------------------------------------------------------------------------------|
-   * |       |     |     |     |     |     |     |     |     |     |     |         |PGUP |     |
-   * |-----------------------------------------------------------------------------------------|
-   * |       |       |       |                                   |     |     | Home|PGDN | End |
-   * `-----------------------------------------------------------------------------------------'
-   */
-    [_FN2] = LAYOUT_60_iso_arrow_one_bksp(
-        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_NO,   KC_NO,   KC_VOLD, KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT,   KC_NO,           KC_NO,
-        KC_TRNS, KC_MRWD, KC_MPLY, KC_MNXT, 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,   KC_NO,   KC_NO,   KC_NO,           KC_PGUP, KC_NO,
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_NO,   KC_HOME,         KC_PGDN, KC_END
-    )
-};
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md
deleted file mode 100644
index a3d58c159fc..00000000000
--- a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# DZ60 - ISO DE Arrow Layout
-
-![DZ60 ISO DE Arrow Layout Image](https://i.imgur.com/rfQRr7n.png)
-
-This is a modified version of the ISO DE layout for the DZ60 board. It has dedicated
-arrow keys and standard spacebar and backspace keys.
-
-The keyboard uses a hardware layout with dedicated arrow keys. To accomplish that, the key on the
-left of the "UP arrow" key serves a dual purpose as "-\_" when pressed short and as "RShift" key
-when you hold the key. To trigger the "underscore" you need to hold LShift and press "-\_".
diff --git a/keyboards/dz60/keymaps/itsaferbie/keymap.c b/keyboards/dz60/keymaps/itsaferbie/keymap.c
deleted file mode 100644
index 43a6a3af94c..00000000000
--- a/keyboards/dz60/keymaps/itsaferbie/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// My layout is practically the default HHKB layout.
-#define _DEFAULT 0
-#define _FN 1
-#define _LIGHTS 2
-
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[_DEFAULT] = LAYOUT_60_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_BSLS, 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_BSPC,
-		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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT, MO(_FN),
-		         KC_LGUI,          KC_LALT,                   KC_SPC,                                      KC_RALT,           MO(_LIGHTS)),
-
-	[_FN] = LAYOUT_60_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,  KC_INS,  KC_DEL,
-		KC_CAPS,          ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS,  KC_UP,   ______,  QK_BOOT,
-		______,           KC_VOLD, KC_VOLU, KC_MUTE, ______,  ______,  KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT,  KC_RGHT, ______,
-		______,           KC_MPRV, KC_MPLY, KC_MNXT, ______,  ______,  KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,           ______,  ______,
-		         ______,           ______,                    ______,                                      ______,            ______),
-
-	[_LIGHTS] = LAYOUT_60_hhkb(
-		RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, ______, ______, ______, ______, ______, ______,
-		RGB_MOD,          RGB_HUI, RGB_SAI, RGB_VAI,  ______,   ______,  ______,  ______,  ______, ______, ______, ______, ______, ______,
-		______,           RGB_HUD, RGB_SAD, RGB_VAD,  ______,   ______,  ______,  ______,  ______, ______, ______, ______, ______,
-		______,           ______,  ______,  BL_DOWN,  BL_TOGG,  BL_UP,   ______,  ______,  ______, ______, ______,         ______, ______,
-		         ______,           ______,                      ______,                                    ______,         ______),
-
-};
diff --git a/keyboards/dz60/keymaps/jkbone/keymap.c b/keyboards/dz60/keymaps/jkbone/keymap.c
deleted file mode 100644
index e51625d0b4d..00000000000
--- a/keyboards/dz60/keymaps/jkbone/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define ____ KC_TRNS
-#define FL_ESC  LT(_FL, KC_ESC)
-#define FL      MO(_FL)
-
-enum layers_idx {
-    _BL, // Base Layer
-    _ML, // Mac Modifiers (Switched around LGUI, LALT, LCTL)
-    _FL  // Functions
-};
-
-enum custom_keycodes {
-    RGB_VAZ = SAFE_RANGE,
-    RGB_OAZ,
-    RGB_WAN,
-    RGB_000
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BL] = LAYOUT_60_iso_5x1u(
-    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,
-    FL_ESC,        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS,KC_ENT,
-    KC_LSFT,    KC_GRV,  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,                         FL, KC_LEFT, KC_DOWN,  KC_UP,  KC_RIGHT
-  ),
-  [_ML] = LAYOUT_60_iso_5x1u(
-    ____,      ____,     ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,         ____,
-    ____,        ____,     ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,     ____,     ____,
-    ____,         ____,     ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,     ____,     ____,    ____,
-    ____,       ____,     ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,    ____,     ____,          ____,
-    KC_LGUI,     KC_LALT,     KC_LCTL,                      ____,                             ____,    ____,    ____,    ____,    ____
-  ),
-  [_FL] = LAYOUT_60_iso_5x1u(
-    QK_BOOT,  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,
-    ____,        ____,   DF(_BL),   DF(_ML),    ____,    ____,    ____,    ____,    ____,    ____,    ____,     ____,     ____,
-    ____,         ____,    ____,    ____,    ____,    ____,  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,    ____,     ____,     ____,     ____,
-    ____,       RGB_000,  RGB_WAN, RGB_OAZ, RGB_VAZ, ____,    ____,    ____, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,          ____,
-    ____,        ____,      ____,                          ____,                             ____,    ____,    ____,    ____,    ____
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case RGB_VAZ:
-        rgblight_enable();
-        rgblight_setrgb(0, 204, 33);
-        break;
-      case RGB_OAZ:
-        rgblight_enable();
-        rgblight_setrgb(229, 65, 0);
-        break;
-      case RGB_WAN:
-        rgblight_enable();
-        rgblight_setrgb(255, 255, 255);
-        break;
-      case RGB_000:
-        rgblight_disable();
-        break;
-    }
-  }
-  return true;
-};
diff --git a/keyboards/dz60/keymaps/jkbone/readme.md b/keyboards/dz60/keymaps/jkbone/readme.md
deleted file mode 100644
index ac732ffac27..00000000000
--- a/keyboards/dz60/keymaps/jkbone/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# JKBONE - ISO dz70
-
-Split left shift, vim arrow keys & ISO setup. Keymap based on Macbooks with ISO uk/english international keyboard layouts.
-
-[![JKBONE](https://i.imgur.com/FWP4IIi.png)](http://www.keyboard-layout-editor.com/#/gists/17b5b4c1248a66947575181ff98cb562)
-
-[![Apple English International Layout](https://i.imgur.com/GxVqALg.png)](https://support.apple.com/en-us/HT201794)
-
diff --git a/keyboards/dz60/keymaps/jkbone/rules.mk b/keyboards/dz60/keymaps/jkbone/rules.mk
deleted file mode 100644
index c1a9769cce9..00000000000
--- a/keyboards/dz60/keymaps/jkbone/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c b/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
deleted file mode 100644
index 3ae3b75f7d5..00000000000
--- a/keyboards/dz60/keymaps/joooosh_hhkb/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
- /* BASE LAYER
- *
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \| | Del |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
- * |-----------------------------------------------------------------------------------------+
- * | LCTRL   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | LShift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  RShift   | FN1 |
- * |-----------------------------------------------------------------------------------------+
- * |              LGUI |     LAlt  |            Space       |   RAlt    |    RCTRL           |
- * `-----------------------------------------------------------------------------------------'
- */
-	LAYOUT_60_hhkb(
-		QK_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_BSLS, 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_BSPC,
-		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_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_LGUI,             KC_LALT,                      KC_SPC,                    KC_RALT,           KC_RCTL),
-
-
-/* FN1 LAYER
- *
- *  ,---------------------------------------------------------------------------------------------------------------------
- * |  KC_GRV | F1   | F2   | F3   | F4    | F5    | F6    | F7   | F8    | F9   | F10   | F11   | F12   | INSERT | QK_BOOT |
- * |---------------------------------------------------------------------------------------------------------------------+
- * |  RGB_TOG |   _  |   _  |   _   |    _  |    _  |    _  |    _  |  PSCR  |  SLCK  |  PAUS  |  UP   |   _   |   CLR   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * |   CAPS     | VOLD | VOLU | MUTE |   _   |   _    |  PAST  |  PSLS  |  HOME  | PGUP  |  LEFT  |  RIGHT  |   RETURN   |
- * |---------------------------------------------------------------------------------------------------------------------+
- * |     _           |  _   |  _   |  _   |  _   |  _   |  PPLS  |  PMNS  |  END  |   PGDN  |  DOWN  |      _      |  _  |
- * |---------------------------------------------------------------------------------------------------------------------+
- * |                          _    |      _     |               _               |     APP      |     _                   |
- * `---------------------------------------------------------------------------------------------------------------------'
- */
-	LAYOUT_60_hhkb(
-		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_INS,   QK_BOOT,
-		RGB_TOG,         _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR, KC_SCRL, KC_PAUS,  KC_UP,     _______,   KC_CLR,
-		KC_CAPS,         KC_VOLD, KC_VOLU,   KC_MUTE,  _______,  _______,  KC_PAST,  KC_PSLS,  KC_HOME, KC_PGUP, KC_LEFT,  KC_RIGHT,  KC_RETURN,
-		_______,         _______,  _______,  _______,  _______,  _______,  KC_PPLS,  KC_PMNS,  KC_END,  KC_PGDN, KC_DOWN,  _______,   _______,
-		        _______,           _______,                    _______,                             KC_APP,            _______),
-};
diff --git a/keyboards/dz60/keymaps/kifinnsson/keymap.c b/keyboards/dz60/keymaps/kifinnsson/keymap.c
deleted file mode 100644
index 6fbb4466ab9..00000000000
--- a/keyboards/dz60/keymaps/kifinnsson/keymap.c
+++ /dev/null
@@ -1,210 +0,0 @@
-#include QMK_KEYBOARD_H
-
-bool is_lgui_active = false;
-uint16_t lgui_timer = 0;
-
-
-//Macro Declarations
-enum my_keycodes {
-  KI_NO = SAFE_RANGE,
-    KI_1,
-    KI_2,
-    KI_3,
-    KI_4,
-    KI_5,
-    KI_6,
-    KI_7,
-    KI_8,
-    KI_9,
-    KI_10,
-    KI_11,
-    KI_12,
-    KI_ESC,
-    KI_BKSP,
-    KI_BSLS,
-    KI_WLFT,
-    KI_WRGT,
-    };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_all(
-		QK_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,  XXXXXXX, KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,   KC_U,     KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
-		MO(1),   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,   KC_E,     KC_I,    KC_O,    KC_QUOT, KC_ENT,
-		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(2),   KC_K,   KC_M,     KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX, KC_RSFT, XXXXXXX,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(1),  XXXXXXX,  MO(3),   KC_RCTL),
-
-	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_DEL,
-		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_UP,   KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-		_______, XXXXXXX, KC_TAB,  KC_LSFT, KC_LCTL, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  KC_CAPS, XXXXXXX,
-		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,,
-		_______, _______, XXXXXXX, KC_ENT,  KC_ENT,  KC_ENT,  _______, _______, _______, _______, QK_BOOT),
-
-	LAYOUT_all(
-		KI_ESC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KI_BKSP,
-		_______, KI_1,    KI_2,    KI_3,    KI_4,    KI_5,    KI_6,    KI_7,    KI_8,    KI_9,    KI_10,   KI_11,   KI_12,   KI_BSLS,
-		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, KI_WLFT, KI_WRGT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-		_______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, XXXXXXX),
-
-	LAYOUT_all(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // Keycodes Starting with KI_ are place holders for my personal macros. They are set below. Most are simple SEND_STRINGS().
-    case KI_ESC:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_1:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_2:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_3:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_4:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_5:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_6:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_7:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_8:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_9:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_10:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_11:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_12:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_BKSP:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    case KI_BSLS:
-      if (record->event.pressed) {
-        SEND_STRING("");
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-
-    //Windows Win+Left tap to move window without resetting KC_LGUI
-    //Additional code is in matrix_scan_user()
-    case KI_WLFT:
-      if (record->event.pressed) {
-        if (!is_lgui_active) {
-          is_lgui_active = true;
-          register_code(KC_LGUI);
-        } 
-        lgui_timer = timer_read();
-        tap_code(KC_LEFT);
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    //Windows Win+Right tap to move window without resetting KC_LGUI
-    //Additional code is in matrix_scan_user()
-    case KI_WRGT:
-      if (record->event.pressed) {
-        if (!is_lgui_active) {
-          is_lgui_active = true;
-          register_code(KC_LGUI);
-        } 
-        lgui_timer = timer_read();
-        tap_code(KC_RIGHT);
-      } else {
-        
-      }
-      return false; // Skip all further processing of this key
-    default:
-      return true; // Process all other keycodes normally
-  }
-}
-
-//Check if KC_LGUI is active in KI_WLFT and KI_WRGT
-void matrix_scan_user(void) { 
-  if (is_lgui_active) {
-    if (timer_elapsed(lgui_timer) > 1000) {
-      unregister_code(KC_LGUI);
-      is_lgui_active = false;
-    }
-  }
-}
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/kifinnsson/readme.md b/keyboards/dz60/keymaps/kifinnsson/readme.md
deleted file mode 100644
index 49f55950301..00000000000
--- a/keyboards/dz60/keymaps/kifinnsson/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# kifinnsson's Colemak angle mod ansi-ish layout
------------------
-
-Keymap for my non-standard DZ60 layout. It is an ansi layout on the right and iso on the left (ie 1.25x left shift). This is to implement the angle mod on for Colemak which is the base layer. A side effect of this is that I have an extra key on row 4, which sits between the "b" and "k" keys in Colemak. I use this key as a switch to layer 2 which is my macro layer.
-
diff --git a/keyboards/dz60/keymaps/kifinnsson/rules.mk b/keyboards/dz60/keymaps/kifinnsson/rules.mk
deleted file mode 100644
index 1874258612c..00000000000
--- a/keyboards/dz60/keymaps/kifinnsson/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = no	# Audio control and System control(+450)
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/kream/keymap.c b/keyboards/dz60/keymaps/kream/keymap.c
deleted file mode 100644
index 26935642be9..00000000000
--- a/keyboards/dz60/keymaps/kream/keymap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_60_ansi_split_space_rshift(
-        QK_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_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,
-        MO(1),   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, MO(1),
-        KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_SPC, KC_CAPS, KC_NO, KC_NO,   KC_ENT),
-
-	[1] = LAYOUT_60_ansi_split_space_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,
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_PSCR, KC_GRV,  KC_TILD, _______,
-        _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,
-        _______, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-};
diff --git a/keyboards/dz60/keymaps/kream/rules.mk b/keyboards/dz60/keymaps/kream/rules.mk
deleted file mode 100644
index 6a82f21b358..00000000000
--- a/keyboards/dz60/keymaps/kream/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE=no
-BACKLIGHT_ENABLE=no
-RGBLIGHT_ENABLE=no
diff --git a/keyboards/dz60/keymaps/krusli/config.h b/keyboards/dz60/keymaps/krusli/config.h
deleted file mode 100644
index e8cb446e27d..00000000000
--- a/keyboards/dz60/keymaps/krusli/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/dz60/keymaps/krusli/keymap.c b/keyboards/dz60/keymaps/krusli/keymap.c
deleted file mode 100644
index 8c838369236..00000000000
--- a/keyboards/dz60/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC,
-		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_LSFT, KC_NO, 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_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_APP, KC_RCTL),
-
-	LAYOUT(
-		KC_GRV,  KC_F1,   KC_F2, 	 KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS, KC_DEL,
-		KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  _______, QK_BOOT,
-		_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
-		_______, KC_NO, 	_______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-};
diff --git a/keyboards/dz60/keymaps/krusli/rules.mk b/keyboards/dz60/keymaps/krusli/rules.mk
deleted file mode 100644
index 3207000a16b..00000000000
--- a/keyboards/dz60/keymaps/krusli/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE = no	# Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
-
-LAYOUTS = 60_ansi
diff --git a/keyboards/dz60/keymaps/lint_kid/config.h b/keyboards/dz60/keymaps/lint_kid/config.h
deleted file mode 100644
index 090dcf74715..00000000000
--- a/keyboards/dz60/keymaps/lint_kid/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define GRAVE_ESC_GUI_OVERRIDE    // Always send Escape if GUI is pressed
diff --git a/keyboards/dz60/keymaps/lint_kid/keymap.c b/keyboards/dz60/keymaps/lint_kid/keymap.c
deleted file mode 100644
index 92412c2e89a..00000000000
--- a/keyboards/dz60/keymaps/lint_kid/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include QMK_KEYBOARD_H
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // layer 0
-  LAYOUT_directional(
-      KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC,
-      KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_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_RSFT,
-      KC_LCTL, KC_LGUI, KC_LALT, LT(5,KC_SPC), LT(5,KC_SPC), LT(5,KC_SPC), LT(3,KC_LEFT), KC_DOWN, _______, KC_UP, KC_RIGHT
-      ),
-
-  // layer 1 toggle hardware caps layer
-  LAYOUT_directional(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      LT(4,KC_ENT), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      ),
-  //layer 2 toggle space layer
-  LAYOUT_directional(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, KC_SPC, KC_SPC, KC_SPC, _______, _______, _______, _______, _______
-      ),
-
-  // layer 3 FN
-  LAYOUT_directional(
-      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, _______, QK_BOOT,
-      KC_TILD, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
-      TG(1), BL_TOGG, BL_STEP, BL_UP,  BL_DOWN,_______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, TG(2), TG(2), TG(2), _______, _______, _______, _______, _______
-      ),
-
-  // layer 4 caps
-  LAYOUT_directional(
-      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_TILD, KC_DEL, KC_UP,LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_W), _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, KC_LPRN, KC_RPRN, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, KC_BSPC, KC_BSPC, KC_BSPC, _______, _______, _______, _______, _______
-      ),
-
-  // layer 5 space
-  LAYOUT_directional(
-      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_TILD, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_BSLS, _______, _______, _______, _______, _______, _______,
-      _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      ),
-};
diff --git a/keyboards/dz60/keymaps/lint_kid/readme.md b/keyboards/dz60/keymaps/lint_kid/readme.md
deleted file mode 100644
index 265668016d5..00000000000
--- a/keyboards/dz60/keymaps/lint_kid/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# DZ60
-
-![DZ60](https://i.imgur.com/8eeYOzU.jpg)
-
-https://kbdfans.com/products/dz60-60-pcb
-
-Make example for this keyboard (after setting up your build environment):
-
-  qmk compile -kb dz60 -km lint_kid
-
-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/dz60/keymaps/macos_64/config.h b/keyboards/dz60/keymaps/macos_64/config.h
deleted file mode 100644
index 0e4aa34dd74..00000000000
--- a/keyboards/dz60/keymaps/macos_64/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CONFIG_KEYMAP_H
-#define CONFIG_KEYMAP_H
-
-#include "../../config.h"
-
-// Fix QK_GESC conflict with Cmd+Alt+Esc on macos
-#define GRAVE_ESC_GUI_OVERRIDE
-
-#endif
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/macos_64/keymap.c b/keyboards/dz60/keymaps/macos_64/keymap.c
deleted file mode 100644
index 105eed257b8..00000000000
--- a/keyboards/dz60/keymaps/macos_64/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* ,-----------------------------------------------------------------------------------------.
-   * | Esc | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   | 0   | -   | =   | Backspace |
-   * |-----------------------------------------------------------------------------------------+
-   * | Tab    | Q   | W   | E   | R   | T   | Y   | U   | I   | O   | P   | [   | ]   |   \    |
-   * |-----------------------------------------------------------------------------------------+
-   * | Caps     | A   | S   | D   | F   | G   | H   | J   | K   | L   | ;   | '   | Enter      |
-   * |-----------------------------------------------------------------------------------------+
-   * | Shift     | Z   | X   | C   | V   | B   | N   | M   | ,   | .   | /   |Shift| Up |Delete|
-   * |-----------------------------------------------------------------------------------------+
-   * | Ctrl | Alt  | Cmd  |               Space                |   Fn  | Alt | Left| Down|Right|
-   * `-----------------------------------------------------------------------------------------'
-   */
-  LAYOUT_all(
-    QK_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_NO, 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_NO, 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_DELETE,
-    KC_LCTL, KC_LALT, KC_LGUI, KC_NO, KC_SPC, KC_NO, MO(1), KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT),
-
-  /* ,-----------------------------------------------------------------------------------------.
-   * | ` ~ | BR- | BR+ |     |     |     |     |PREV |PLAY |NEXT |MUTE | V- | V+ |    Delete   |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |     |     |  Up |     |     |     |     |  0  |  1  |  2  |  3  |     |  QK_BOOT |
-   * |-----------------------------------------------------------------------------------------+
-   * |         |     | Left| Down|Right|     |     |     |     |  4  |  5  |  6  |             |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |  7  |  8  |  9  |     |     |
-   * |-----------------------------------------------------------------------------------------+
-   * |      |      |      |                                      |     |     |     |     |     |
-   * `-----------------------------------------------------------------------------------------'
-   */
-  LAYOUT_all(
-    KC_GRV , KC_SCRL, KC_PAUSE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_NO, KC_DEL,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_1, KC_2, KC_3, KC_TRNS, QK_BOOT,
-    KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_4, KC_5, KC_6, KC_TRNS,
-    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_TRNS, 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/dz60/keymaps/macos_64/readme.md b/keyboards/dz60/keymaps/macos_64/readme.md
deleted file mode 100644
index c559c2b3836..00000000000
--- a/keyboards/dz60/keymaps/macos_64/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# MacOS 64 keymap
-
-This is a keymap of DZ60 configured with 64 keys for MacOS. It refers the keymap of [macos_arrow](../macos_arrow/readme.md).
-
-## How to use
-
-1. Follow the [introduction](https://docs.qmk.fm/#/) to compile the keymap
-2. Download QMK Toolbox from [here](https://github.com/qmk/qmk_toolbox/releases)
-3. Insert the dz60 keyboard while pressing  ```Space+b``` (default)
-4. Flash the firmware
-
-More details about flashing firmware please check the [documentation](https://docs.qmk.fm/#/) of QMK.
-
-## Base Layer
-
-```
-,-----------------------------------------------------------------------------------------.
-| Esc | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   | 0   | -   | =   | Backspace |
-|-----------------------------------------------------------------------------------------+
-| Tab    | Q   | W   | E   | R   | T   | Y   | U   | I   | O   | P   | [   | ]   |   \    |
-|-----------------------------------------------------------------------------------------+
-| Caps     | A   | S   | D   | F   | G   | H   | J   | K   | L   | ;   | '   | Enter      |
-|-----------------------------------------------------------------------------------------+
-| Shift     | Z   | X   | C   | V   | B   | N   | M   | ,   | .   | /   |Shift| Up |Delete|
-|-----------------------------------------------------------------------------------------+
-| Ctrl | Alt  | Cmd  |               Space                |   Fn  | Alt | Left| Down|Right|
-`-----------------------------------------------------------------------------------------'
-```
-
-## Fn Layer
-
-```
-,-----------------------------------------------------------------------------------------.
-| ` ~ | BR- | BR+ |     |     |     |     |PREV |PLAY |NEXT |MUTE | V- | V+ |    Delete   |
-|-----------------------------------------------------------------------------------------+
-|        |     |     |  Up |     |     |     |     |  0  |  1  |  2  |  3  |     |  RESET |
-|-----------------------------------------------------------------------------------------+
-|         |     | Left| Down|Right|     |     |     |     |  4  |  5  |  6  |             |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |     |  7  |  8  |  9  |     |     |
-|-----------------------------------------------------------------------------------------+
-|      |      |      |                                      |     |     |     |     |     |
-`-----------------------------------------------------------------------------------------'
-
-```
diff --git a/keyboards/dz60/keymaps/macos_64/rules.mk b/keyboards/dz60/keymaps/macos_64/rules.mk
deleted file mode 100644
index e1cfb3e508c..00000000000
--- a/keyboards/dz60/keymaps/macos_64/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/macos_arrow/config.h b/keyboards/dz60/keymaps/macos_arrow/config.h
deleted file mode 100644
index 0e4aa34dd74..00000000000
--- a/keyboards/dz60/keymaps/macos_arrow/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CONFIG_KEYMAP_H
-#define CONFIG_KEYMAP_H
-
-#include "../../config.h"
-
-// Fix QK_GESC conflict with Cmd+Alt+Esc on macos
-#define GRAVE_ESC_GUI_OVERRIDE
-
-#endif
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/macos_arrow/keymap.c b/keyboards/dz60/keymaps/macos_arrow/keymap.c
deleted file mode 100644
index 17402aa9313..00000000000
--- a/keyboards/dz60/keymaps/macos_arrow/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum dz60_layers {
-  _BL, // Base layer
-  _FL, // Function layer
-  _ML, // Media layer
-  _NL  // Numpad layer
-};
-
-enum my_keycodes {
-  BR_UP = SAFE_RANGE,
-  BR_DOWN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* ,-----------------------------------------------------------------------------------------.
-   * |  `  | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   | 0   | -   | =   | Backspace |
-   * |-----------------------------------------------------------------------------------------+
-   * | Tab    | Q   | W   | E   | R   | T   | Y   | U   | I   | O   | P   | [   | ]   |   \    |
-   * |-----------------------------------------------------------------------------------------+
-   * | Esc/_FL  | A   | S   | D   | F   | G   | H   | J   | K   | L   | ;   | '   | Enter      |
-   * |-----------------------------------------------------------------------------------------+
-   * | Shift     | Z   | X   | C   | V   | B   | N   | M   | ,   | .   | /   |     | Up  |Shift|
-   * |-----------------------------------------------------------------------------------------+
-   * | Ctrl | Alt  | Gui  |                Space               |Gui/_ML| Alt | Left| Down|Right|
-   * `-----------------------------------------------------------------------------------------'
-   */
-  [_BL] = LAYOUT_all(
-    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_NO, 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,
-    LT(_FL, KC_ESC), 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_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_A, KC_UP, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LGUI, KC_NO, KC_SPC, KC_NO, LM(_ML, MOD_RGUI), KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT),
-
-  /* ,-----------------------------------------------------------------------------------------.
-   * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |    Del    |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |     |     | PgUp|     |     |     |     | Up  |     |     |     |     |        |
-   * |-----------------------------------------------------------------------------------------+
-   * |          |     |Home |PgDwn| End |     |     | Left| Down|Right|     |     |            |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
-   * |-----------------------------------------------------------------------------------------+
-   * |      |      |      |                                      |     |     |     |     |     |
-   * `-----------------------------------------------------------------------------------------'
-   */
-  [_FL] = LAYOUT_all(
-    _______, 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_NO, KC_DEL,
-    _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______,
-    _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______,
-    _______, KC_NO,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-  /* ,-----------------------------------------------------------------------------------------.
-   * |Eject| BR- | BR+ |     |     |     |     |PREV |PLAY |NEXT |MUTE | V- | V+ |             |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |     |     |     |     |     |     |     |     |     |     |     |     |  Reset |
-   * |-----------------------------------------------------------------------------------------+
-   * |          |     |     |     |     |     |     |     |     |     |     |     |            |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
-   * |-----------------------------------------------------------------------------------------+
-   * |      |      |      |                                      |     |     |     |     |     |
-   * `-----------------------------------------------------------------------------------------'
-   */
-  [_ML] = LAYOUT_all(
-    KC_MEDIA_EJECT, BR_DOWN, BR_UP, BL_TOGG, RGB_TOG, _______, _______, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_NO, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_NO,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_UP,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, RGB_MODE_REVERSE, BL_DOWN,RGB_MODE_FORWARD),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  uint8_t key;
-  switch (keycode) {
-    case BR_DOWN:
-    case BR_UP:
-      // Clear the RGUI modifier placed by LM for _ML layer as brightness don't
-      // work with modifiers.
-      key = (keycode == BR_DOWN) ? KC_SCRL : KC_PAUS;
-      if (record->event.pressed) {
-          unregister_mods(MOD_RGUI);
-          add_key(key);
-          send_keyboard_report();
-      } else {
-          del_key(key);
-          send_keyboard_report();
-      }
-      return false; // Skip all further processing of this key
-    default:
-      return true; // Process all other keycodes normally
-  }
-}
diff --git a/keyboards/dz60/keymaps/macos_arrow/readme.md b/keyboards/dz60/keymaps/macos_arrow/readme.md
deleted file mode 100644
index cb700b38f0e..00000000000
--- a/keyboards/dz60/keymaps/macos_arrow/readme.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Macos keymap with arrow
-
-This is a keymap for DZ60 configured with arrows using the layout below:
-
-[![](https://poitr.us/mARFK9+)](http://www.keyboard-layout-editor.com/#/gists/07d924064c77c0ff43de6b8a9519f931)
-
-My build used the following components:
-* DZ60 PCB
-* [Stainless steel alu plate option A with 2U left shift](https://www.aliexpress.com/item/Alu-plate-dz60-plate-for-DIY-mechanical-keyboard/32827595666.html) (optional)
-* [YMDK customized 61 64 68 ANSI keyset](https://www.amazon.com/Customized-Keyset-Profile-Mechanical-Keyboard/dp/B0777LMKKK)
-* 60 Cherry MX Clear for the main keys + 10 Cherry MX Grey for the large keys
-* [The wood case for DZ60](https://www.aliexpress.com/item/GH60-Keyboard-Wood-Case-PCB-Board-Position-Plate-Satellite-Axis-And-Walnut-Wood-Wrist-Rest-For/32836566852.html) (optional)
-
-## Base Layer
-
-```
-,-----------------------------------------------------------------------------------------.
-|  `  | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   | 0   | -   | =   | Backspace |
-|-----------------------------------------------------------------------------------------+
-| Tab    | Q   | W   | E   | R   | T   | Y   | U   | I   | O   | P   | [   | ]   |   \    |
-|-----------------------------------------------------------------------------------------+
-| _FL/Esc  | A   | S   | D   | F   | G   | H   | J   | K   | L   | ;   | '   | Enter      |
-|-----------------------------------------------------------------------------------------+
-| Shift     | Z   | X   | C   | V   | B   | N   | M   | ,   | .   | /   |     | Up  |Shift|
-|-----------------------------------------------------------------------------------------+
-| Ctrl | Alt  | Cmd  |            _NL / Space             |Cmd/_ML| Alt | Left| Down|Right|
-`-----------------------------------------------------------------------------------------'
-```
-
-* The escape key is moved to the capslock to get keep grave letter pristine.
-* The `Caps-Lock` (`Hyper`) key switch to the function layer (`_FL`) or escape when used alone.
-* The right `Cmd` key is used to switch to the media layer (`_ML`) when used with keys mapped on that layer.
-* The space key can be used to switch to the numpad layer (`_NL`) when used with one of the mapped key on that layer.
-
-## Function Layer (_FL)
-
-```
-,-----------------------------------------------------------------------------------------.
-|  `  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |    Del    |
-|-----------------------------------------------------------------------------------------+
-|        |     |     |     |     |     |     |PgDwn| PgUp|     |     |     |     |        |
-|-----------------------------------------------------------------------------------------+
-|          |     |     |     |     |     | Left| Down| Up  |Right|     |     |            |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |     |     |     |     |     |     |
-|-----------------------------------------------------------------------------------------+
-|      |      |      |                                      |     |     |     |     |     |
-`-----------------------------------------------------------------------------------------'
-```
-
-The function layer is activated by the `Caps-Lock` (`Hyper`) key to access `F` keys. In addition, the `HJKL` are mapped as cursor keys on that layer.
-
-## Media Layer (_ML)
-
-```
-,-----------------------------------------------------------------------------------------.
-|Eject| BR- | BR+ |     |     |     |     |PREV |PLAY |NEXT |MUTE | V- | V+ |             |
-|-----------------------------------------------------------------------------------------+
-|        |     |     |     |     |     |     |     |     |     |     |     |     |  Reset |
-|-----------------------------------------------------------------------------------------+
-|          |     |     |     |     |     |     |     |     |     |     |     |            |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |     |     |     |     |     |     |
-|-----------------------------------------------------------------------------------------+
-|      |      |      |                                      |     |     |     |     |     |
-`-----------------------------------------------------------------------------------------'
-```
-
-The media layer is activated by the right `Cmd` (`FN`) key. It contains the typical macos media keys on the top row. Blank keys act as `Cmd+` that key on the base layer.
-
-## Numpad Layer (_NL)
-
-```
-,-----------------------------------------------------------------------------------------.
-|     |     |     |     |     |     |     |     |  %  |  (  |  )  |  < |  > |             |
-|-----------------------------------------------------------------------------------------+
-|        |     |     |     |     |     |     |  *  |  0  |  1  |  2  |  3  |     |        |
-|-----------------------------------------------------------------------------------------+
-|          |     |     |     |     |     |     |  .  |  -  |  4  |  5  |  6  |            |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |  ,  |  =  |  7  |  8  |  9  |     |     |
-|-----------------------------------------------------------------------------------------+
-|      |      |      |                                      |     |     |     |     |     |
-`-----------------------------------------------------------------------------------------'
-```
-
-The numpad layer is activated by the space bar, when hold.
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/macos_arrow/rules.mk b/keyboards/dz60/keymaps/macos_arrow/rules.mk
deleted file mode 100644
index 1572f18c79a..00000000000
--- a/keyboards/dz60/keymaps/macos_arrow/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/marianas/customLogic.c b/keyboards/dz60/keymaps/marianas/customLogic.c
deleted file mode 100644
index 03ba92fe928..00000000000
--- a/keyboards/dz60/keymaps/marianas/customLogic.c
+++ /dev/null
@@ -1,138 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "customLogic.h"
-#include "keymap.h"
-#include "keyDefinitions.h"
-#include "relativity.h"
-#include "timer.h"
-
-static int16_t fnTimer = 0;
-
-
-
-layer_state_t layer_state_set_user(layer_state_t state)
-{
-  switch (get_highest_layer(state))
-  {
-    case QWERTY:
-      rgblight_mode(9);
-      break;
-    case NAV_CLUSTER:
-      rgblight_mode(29);
-      break;
-    case GAMING:
-      rgblight_mode(26);
-      break;
-    case SQLMACROS:
-      rgblight_mode(1);
-      break;
-    case FN_LAYER:
-      rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL+5);
-      break;
-  }
-  return state;
-}
-
-
-
-bool printSqlVerbs(uint16_t keycode, keyrecord_t *record)
-{
-  if (record->event.pressed)
-  {
-    switch (keycode)
-    {
-      case S_LFTJN:
-        SEND_STRING("LEFT JOIN");
-        activateRelativity();
-        return false;
-      case S_INRJN:
-        SEND_STRING("INNER JOIN ");
-        activateRelativity();
-        return false;
-      case S_SLCT:
-        SEND_STRING("SELECT "); return
-        false;
-      case S_FROM:
-        SEND_STRING("FROM "); return
-        false;
-      case S_DSNCT:
-        SEND_STRING("DISTINCT "); return
-        false;
-      case S_ORDER:
-        SEND_STRING("ORDER BY "); return
-        false;
-      case S_WHERE:
-        SEND_STRING("WHERE "); return
-        false;
-      case S_ALTER:
-        SEND_STRING("ALTER SESSION SET CURRENT_SCHEMA = SUPPLY;"); return false;
-      case S_ASTRK:
-        SEND_STRING("* "); return false;
-
-    }
-  }
-  return true;
-}
-
-
-bool isFn = false;
-bool didFn = false;
-
-
-bool updateLayerState(uint16_t keycode, keyrecord_t *record)
-{
-
-  if (record->event.pressed)
-  {
-    switch (keycode)
-    {
-      case FN_QT:
-        fnTimer = timer_read();
-        layer_on(FN_LAYER);
-        isFn = true;
-        return false;
-    }
-    if (isFn)
-    {
-      didFn = true;
-      return true;
-    }
-  }
-  else
-  {
-    switch(keycode)
-    {
-      case FN_QT:
-        layer_off(FN_LAYER);
-        if (!didFn)
-        {
-          #if fnTimeout
-          if (TIMER_DIFF_16(timer_read(), fnTimer) <= fnTimeout)
-          {
-            activateRelativity();
-          }
-          else
-          {
-            deactivateRelativity();
-          }
-          #else
-          activateRelativity();
-          #endif
-        }
-        didFn = false;
-        isFn = false;
-        return false;
-    }
-  }
-  return true;
-}
-
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  return
-    storeShiftState(keycode, record) &&
-    printSqlVerbs(keycode, record) &&
-    updateLayerState(keycode, record) &&
-    handleSmartMacros(keycode, record);
-}
diff --git a/keyboards/dz60/keymaps/marianas/customLogic.h b/keyboards/dz60/keymaps/marianas/customLogic.h
deleted file mode 100644
index 29198d60b2e..00000000000
--- a/keyboards/dz60/keymaps/marianas/customLogic.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define fnTimeout 500
-
-
-layer_state_t layer_state_set_user(layer_state_t state);
-
-bool printSqlVerbs(uint16_t keycode, keyrecord_t *record);
-
-bool updateLayerState(uint16_t keycode, keyrecord_t *record);
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/dz60/keymaps/marianas/keyDefinitions.h b/keyboards/dz60/keymaps/marianas/keyDefinitions.h
deleted file mode 100644
index 3e99580e04b..00000000000
--- a/keyboards/dz60/keymaps/marianas/keyDefinitions.h
+++ /dev/null
@@ -1,123 +0,0 @@
-
-//Control
-#define MO_FNLR MO(FN_LAYER)
-#define BACKSPC KC_BSPC
-#define ENTER_OR_SQL LT(SQLMACROS,KC_ENT)
-#define ESCAP KC_ESC
-#define PSCR KC_PSCR
-#define SCRL KC_SCRL
-#define PAUS KC_PAUSE
-#define NSRT KC_INSERT
-#define HOME KC_HOME
-#define PGUP KC_PGUP
-#define PGDN KC_PGDN
-#define END_ KC_END
-#define DEL  KC_DELETE
-#define UPUP KC_UP
-#define D_WN KC_DOWN
-#define LEFT KC_LEFT
-#define RGHT KC_RIGHT
-
-//KEYPAD
-#define KP_1 KC_KP_1
-#define KP_2 KC_KP_2
-#define KP_3 KC_KP_3
-#define KP_4 KC_KP_4
-#define KP_5 KC_KP_5
-#define KP_6 KC_KP_6
-#define KP_7 KC_KP_7
-#define KP_8 KC_KP_8
-#define KP_9 KC_KP_9
-#define KP_0 KC_KP_0
-#define NMLK KC_NUM_LOCK
-#define STAR KC_KP_ASTERISK
-#define KSSH KC_KP_SLASH
-#define KMIN KC_KP_MINUS
-#define PLUS KC_KP_PLUS
-#define KNTR KC_KP_ENTER
-#define KDOT KC_KP_DOT
-
-//Modifiers
-#define CTLL KC_LCTL
-#define LEFTSHFT SC_LSPO
-#define WINL KC_LGUI
-#define ALTL KC_LALT
-#define CTLR KC_RCTL
-#define RIGHT_SHIFT__PAREN SC_RSPC
-#define WINR KC_RGUI
-#define ALTR KC_RALT
-#define APPR KC_APP
-
-
-//Punctuation
-#define CMMA KC_COMM
-#define PRRD KC_DOT
-#define SLSH KC_SLSH
-#define QUOT KC_QUOT
-#define COLN KC_SCLN
-#define LBRC KC_LBRC
-#define RBRC KC_RBRC
-#define EQUL KC_EQL
-#define MNUS KC_MINS
-#define BSLASH KC_BSLS
-
-//Layers
-#define QWRTY TO(QWERTY)
-#define NAVS TO(NAV_CLUSTER)
-#define GAME TO(GAMING)
-
-//Space
-#define ____ KC_TRNS
-#define _____ KC_TRNS
-#define ______ KC_TRNS
-#define ________ KC_TRNS
-#define ___________ KC_TRNS
-#define _________________ KC_TRNS
-#define SPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACE KC_SPC
-#define KCNO KC_NO
-
-enum sql_macros {
-  S_LFTJN = SAFE_RANGE, // L
-  S_INRJN, // I
-  S_SLCT,  // S
-  S_FROM,  // F
-  S_DSNCT, // D
-  S_ORDER, // O
-  S_WHERE, // W
-  S_ALTER, // Esc
-  S_ASTRK, // *
-
-  TD_A,
-  TD_B,
-  TD_C, // Corp, Corporation, Company
-  TD_D, // Distribution, Dist, Distributor
-  TD_E,
-  TD_F,
-  TD_G, // GlobalLookup
-  TD_H,
-  TD_I, // Instance, Item
-  TD_J,
-  TD_K,
-  TD_L,
-  TD_M,
-  TD_N, // NadRate
-  TD_O,
-  TD_P, // Product, Person,
-  TD_Q, // Darden
-  TD_R,
-  TD_S, // Supplier, Step
-  TD_T, // Task, Type
-  TD_U,
-  TD_V,
-  TD_W, // Workflow,
-  TD_X,
-  TD_Y,
-  TD_Z,
-  TD_BSPC,
-  TD_ENT,
-  TD_ESC,
-
-  FN_QT
-};
-
-bool isShifted(void);
diff --git a/keyboards/dz60/keymaps/marianas/keymap.c b/keyboards/dz60/keymaps/marianas/keymap.c
deleted file mode 100644
index 8474ab1be3e..00000000000
--- a/keyboards/dz60/keymaps/marianas/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap.h"
-#include "relativity.h"
-#include "keyDefinitions.h"
-#include "customLogic.h"
-
-// planned change: store previous table names and abbreviations to allow scrolling for inner joins on table name+id and abbreviation+id.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [QWERTY]=
-    LAYOUT_60_ansi(
-      ESCAP,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  MNUS,  EQUL,  BACKSPC,
-      KC_TAB,  KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,  KC_P,  LBRC,  RBRC,  BSLASH,
-      FN_QT,    KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  COLN,  QUOT,  ENTER_OR_SQL,
-      LEFTSHFT,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  CMMA,  PRRD,  SLSH,  RIGHT_SHIFT__PAREN,
-      CTLL,  WINL,  ALTL,  SPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACE,  ALTR,  WINR,  APPR,  CTLR),
-
-  [NAV_CLUSTER]=
-    LAYOUT_60_ansi(
-      _____,  PSCR,  SCRL,  PAUS,  NSRT,  HOME,  PGUP,  NMLK,  KSSH,  STAR,  KMIN,  ____,  ____,  ______,
-      ______,  ____,  ____,  ____,  DEL,   END_,  PGDN,  KP_7,  KP_8,  KP_9,  PLUS,  ____,  ____,  _____,
-      _______,  ____,  ____,  ____,  ____,  UPUP,  UPUP,  KP_4,  KP_5,  KP_6,  PLUS,  ____,  ___________,
-      ________,  ____,  ____,  ____,  LEFT,  D_WN,  RGHT,  KP_1,  KP_2,  KP_3,  KNTR,  _________________,
-      ____,  ____,  ____,  /*-----------------*/KC_KP_0/*-----------------*/,  KDOT,  KNTR,  ____,  ____),
-
-  [GAMING]=
-    LAYOUT_60_ansi(
-      _____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ______,
-      ______,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  _____,
-         KCNO,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ___________,
-      ________,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  _________________,
-      ____,  KCNO,  ____,  /*------------------*/_____/*------------------*/,  ____,  KCNO,  ____,  QWRTY),
-
-  [SQLMACROS]=
-    LAYOUT_60_ansi(
-      S_ALTER, ____, ____, ____, ____, ____, ____, ____, S_ASTRK, ____, ____, ____, ____,    ___________,
-      ______,    ____, S_WHERE, ____, ____, ____, ____, ____, S_INRJN, S_ORDER, ____, ____, ____, ______,
-      _______, KC_LBRC, S_SLCT, S_ASTRK ,S_FROM, ____, ____, ____, ____, S_LFTJN, ____, RBRC, ___________,
-      ________,  RGB_VAI, RGB_VAD, ____,  ____,  ____,  ____,  ____,  ____,  ____,  ____,  _________________,
-      ____,  ____,  ____,  /*------------------*/_____/*------------------*/,  ____,  ____,  ____,  ____),
-
-  [FN_LAYER]=
-    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,
-      KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, LWIN(KC_R), ____, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_BRK, ____,
-      ____, KC_VOLD, KC_MUTE, KC_VOLU, ____, ____, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, KC_DEL, ____,
-      ____, RGB_HUI, RGB_SAI, RGB_SAD, ____,  ____, KC_END, QWRTY, GAME, NAVS, ____, ____,
-      ____, ____, ____, _________________, ____, KC_HYPR, KC_MEH, QK_BOOT)
-};
diff --git a/keyboards/dz60/keymaps/marianas/keymap.h b/keyboards/dz60/keymaps/marianas/keymap.h
deleted file mode 100644
index bb1ea68c77a..00000000000
--- a/keyboards/dz60/keymaps/marianas/keymap.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-enum marianas_layers {
-  QWERTY,
-/*
-  COLEMAK,
-  DVORAK,
-*/
-  NAV_CLUSTER,
-  GAMING,
-  SQLMACROS,
-  FN_LAYER
-};
-
diff --git a/keyboards/dz60/keymaps/marianas/relativity.c b/keyboards/dz60/keymaps/marianas/relativity.c
deleted file mode 100644
index f498b867420..00000000000
--- a/keyboards/dz60/keymaps/marianas/relativity.c
+++ /dev/null
@@ -1,510 +0,0 @@
-#include "relativity.h"
-#include "keymap.h"
-#include "keyDefinitions.h"
-
-
-uint16_t *macroTaps = 0;
-
-char *tableNameList = 0;
-
-uint8_t *charCount = 0;
-uint8_t countPointer = 0;
-
-bool relativityActive = false;
-
-
-bool sendAbbr = false;
-
-
-static int16_t relativityTimer = 0;
-
-
-bool tempOff = false;
-
-
-
-
-void initStringData(void)
-{
-  if (macroTaps == 0)
-  {
-    macroTaps = malloc(macroTapsLen*sizeof(uint16_t));
-    for(int i = 0; i < macroTapsLen; i++)
-    {
-      macroTaps[i] = 0;
-    }
-  }
-  if (tableNameList == 0)
-  {
-    tableNameList = malloc(tableNameListLen*sizeof(char));
-    for(int i = 0; i < tableNameListLen; i++)
-    {
-      tableNameList[i] = 0;
-    }
-  }
-  if (charCount == 0)
-  {
-    charCount = malloc(charCountLen*sizeof(uint8_t));
-    for (int i = 0; i < charCountLen; i++)
-    {
-      charCount[i] = 0;
-    }
-  }
-}
-
-void activateRelativity(void)
-{
-  initStringData();
-  rgblight_mode(RGBLIGHT_MODE_KNIGHT);
-  relativityTimer = timer_read();
-  relativityActive = true;
-}
-
-bool deactivateRelativity(void)
-{  
-  rgblight_mode(9);
-  eraseKeyCodes();
-  eraseTableAbbreviation();
-  eraseCharCounts();
-  relativityActive = false;
-  tempOff = false;
-  return false;
-}
-
-bool containsCode(uint16_t kc)
-{
-  for (int i = 0; i < macroTapsLen && macroTaps[i] > 0; i++)
-  {
-    if (macroTaps[i] == kc) return true;
-  }
-  return false;
-}
-
-bool lastCodeIs(uint16_t kc)
-{
-  for (int i = 0; i < macroTapsLen-1 && macroTaps[i] > 0; i++)
-  {
-    if (macroTaps[i] == kc && macroTaps[i+1] == 0) return true;
-  }
-  return false;
-}
-
-bool last2CodeAre(uint16_t kc)
-{
-  for (int i = 0; i < macroTapsLen-2 && macroTaps[i] > 0; i++)
-  {
-    if (macroTaps[i] == kc && macroTaps[i+1] == kc && macroTaps[i+2] == 0) return true;
-  }
-  return false;
-}
-
-bool last2CodesAre(uint16_t kc, uint16_t kc2)
-{
-  for (int i = 0; i < macroTapsLen-2 && macroTaps[i] > 0; i++)
-  {
-    if (macroTaps[i] == kc && macroTaps[i+1] == kc2 && macroTaps[i+2] == 0) return true;
-  }
-  return false;
-}
-
-void addKeyCode(uint16_t kc)
-{
-  int i = 0;
-  while (i < macroTapsLen-2 && macroTaps[i] > 0) i++;
-  if (macroTaps[i] == 0)
-  {
-    macroTaps[i] = kc;
-    macroTaps[i+1] = 0;
-  }
-}
-
-void eraseKeyCodes(void)
-{
-  int i = 0;
-  while (i < macroTapsLen && macroTaps[i] > 0) macroTaps[i++] = 0;
-}
-
-void eraseCharCounts(void)
-{
-  while (countPointer > 0)
-  {
-    charCount[countPointer] = 0;
-    countPointer--;
-  }
-  charCount[countPointer] = 0;
-}
-
-void printTableAbbreviationLimited(void)
-{
-  if (tableNameList[0] == 0)
-  {
-    return;
-  }
-  int i = 0;
-  for (i = 0; i < tableNameListLen && tableNameList[i] > 0; i++)
-  {
-    if (tableNameList[i] >= 65 && tableNameList[i] <= 90)
-    {
-      send_char(tableNameList[i]+32);
-    }
-    else
-    {
-      send_char(tableNameList[i]);
-    }
-  }
-}
-
-void printTableAbbreviation(void)
-{
-  if (tableNameList[0] == 0)
-  {
-    return;
-  }
-  send_char(0x20);
-  int i = 0;
-  for (i = 0; i < tableNameListLen && tableNameList[i] > 0; i++)
-  {
-    if (tableNameList[i] >= 65 && tableNameList[i] <= 90)
-    {
-      send_char(tableNameList[i]+32);
-    }
-    else
-    {
-      send_char(tableNameList[i]);
-    }
-  }
-  send_char(0x20);
-}
-
-void eraseTableAbbreviation(void)
-{
-  for (int i = 0; i < tableNameListLen && tableNameList[i] > 0; i++)
-  {
-    tableNameList[i] = '\0';
-  }
-}
-
-void printString(char* str)
-{
-
-  if (str[0] != '\0')
-  {
-    int i = 0;
-    while (true)
-    {
-      if (str[i] == 0)
-      {
-        break;
-      }
-      send_char(str[i++]);
-      charCount[countPointer]++;
-    }
-  }
-}
-
-void printStringAndQueueChar(char* str)
-{
-  if (charCount[countPointer] > 0 && countPointer < charCountLen)
-  {
-    countPointer++;
-  }
-  sendAbbr = true;
-  if (str[0] != '\0')
-  {
-    printString(str);
-
-    for (int i = 0; i < tableNameListLen-1; i++)
-    {
-      if (tableNameList[i] == '\0')
-      {
-        tableNameList[i] = str[0];
-        tableNameList[i+1] = '\0';
-        break;
-      }
-      else if (i == tableNameListLen-2)
-      {
-        printTableAbbreviation();
-        break;
-      }
-    }
-    //for (i = 0; i < tableNameListLen && tableNameList[i] > 0; i++)
-    //{
-    //  send_char(tableNameList[i]);
-    //}
-    //send_string_P("Darden");
-    //send_string_P(&myarray);
-    //send_string_P(str);
-  }
-}
-
-void ReplaceString(char *orig, char *repl)
-{
-  int i = 0;
-  while((orig[i] != 0x0 && repl[i] != 0x0) && orig[i] == repl[i])
-   i++;
-
-  if(orig[i] != 0x0)
-  {
-    int o = i;
-    while (orig[o++] != 0x0) {
-      charCount[countPointer]--;
-      register_code(KC_BSPC);
-      unregister_code(KC_BSPC);
-    }
-  }
-  printString(repl+i);
-}
-
-void deletePrev(void)
-{
-  if (countPointer == 0 && charCount[countPointer] == 0)
-    return;
-  for (int i = 0; i < charCount[countPointer]; i++)
-  {
-      register_code(KC_BSPC);
-      unregister_code(KC_BSPC);
-  }
-  charCount[countPointer] = 0;
-  int i = 1;
-  for (;i < tableNameListLen-1; i++)
-  {
-    if (tableNameList[i] == 0x0)
-    {
-      break;
-    }
-  }
-  tableNameList[i-1] = 0x0;
-  if (countPointer > 0)
-  {
-    countPointer--;
-  }
-}
-
-bool processSmartMacroTap(uint16_t kc)
-{
-  if (relativityTimer > 0 && TIMER_DIFF_16(timer_read(), relativityTimer) >= relTimeout)
-  {
-    deactivateRelativity();
-    return true;
-  }
-  relativityTimer = 0;
-  switch(kc)
-  {
-    case KC_C:
-      if (containsCode(KC_D))
-      {
-        printString("ribution");
-        printStringAndQueueChar("Center");
-      }
-      else if (last2CodeAre(KC_C))
-      {
-        ReplaceString("Corporation", "Contact");
-      }
-      else if(lastCodeIs(KC_C))
-      {
-        printString("oration");
-      }
-      else
-      {
-        printStringAndQueueChar("Corp");
-      }
-      break;
-    case KC_D:
-      if (last2CodeAre(KC_D))
-      {
-        ReplaceString("Distribution", "Distributor");
-      }
-      else if(lastCodeIs(KC_D))
-      {
-        printString("ribution");
-      }
-      else
-      {
-        printStringAndQueueChar("Dist");
-      }
-      break;
-    case KC_G:
-        printStringAndQueueChar("Global");
-        printStringAndQueueChar("Lookup");
-      break;
-    case KC_I:
-      if (containsCode(KC_W))
-        printStringAndQueueChar("Instance");
-      else
-        printStringAndQueueChar("Item");
-      break;
-    case KC_N:
-      printStringAndQueueChar("NadRate");
-      break;
-    case KC_P:
-      if (last2CodesAre(KC_D, KC_C))
-      {
-        ReplaceString("DistributionCenter", "DistCenter");
-        printStringAndQueueChar("Pricing");
-      }
-      else if (last2CodeAre(KC_P))
-      {
-      }
-      else if(lastCodeIs(KC_P))
-      {
-        ReplaceString("Product", "Person");
-      }
-      else
-      {
-        printStringAndQueueChar("Product");
-      }
-      break;
-    case KC_Q:
-      printStringAndQueueChar("Darden");
-      break;
-    case KC_S:
-      if (containsCode(KC_W))
-        if (containsCode(KC_S) || containsCode(KC_D))
-          printStringAndQueueChar("Step");
-        else
-          printStringAndQueueChar("Session");
-      else
-        printStringAndQueueChar("Supplier");
-      break;
-    case KC_T:
-      if (containsCode(KC_W))
-        printStringAndQueueChar("Task");
-      else
-        printStringAndQueueChar("Type");
-      break;
-    case KC_W:
-      printStringAndQueueChar("Workflow");
-      break;
-  }
-  addKeyCode(kc);
-  return false;
-}
-
-
-bool shifted = false;
-bool isShifted(void)
-{
-  return shifted;
-}
-
-void setShifted(bool val)
-{
-  shifted = val;
-}
-
-
-bool storeShiftState(uint16_t keycode, keyrecord_t *record)
-{
-
-  if (record->event.pressed)
-  {
-    switch (keycode)
-    {
-      case SC_LSPO:
-      case SC_RSPC:
-        shifted = true;
-    }
-  }
-  else
-  {
-    switch (keycode)
-    {
-
-      case SC_LSPO:
-      case SC_RSPC:
-        shifted = false;
-        return true;
-    }
-  }
-  return true;
-}
-
-bool handleSmartMacros(uint16_t keycode, keyrecord_t *record)
-{
-  if (relativityActive != true) return true;
-  if (record->event.pressed)
-  {
-    switch (keycode)
-    {
-      case KC_BSPC:
-        if (!isShifted()){
-          deletePrev();
-        }
-        else {
-          register_code(KC_BSPC);
-          unregister_code(KC_BSPC);
-        }
-        return false;
-      case KC_A:
-      case KC_B:
-      case KC_C:
-      case KC_D:
-      case KC_E:
-      case KC_F:
-      case KC_G:
-      case KC_H:
-      case KC_I:
-      case KC_J:
-      case KC_K:
-      case KC_L:
-      case KC_M:
-      case KC_N:
-      case KC_O:
-      case KC_P:
-      case KC_Q:
-      case KC_R:
-      case KC_S:
-      case KC_T:
-      case KC_U:
-      case KC_V:
-      case KC_W:
-      case KC_X:
-      case KC_Y:
-      case KC_Z:
-        return processSmartMacroTap(keycode);
-
-      case PRRD:
-        if (tempOff)
-        {
-          SEND_STRING("Id = ");
-          printTableAbbreviationLimited();
-          SEND_STRING(".Id");
-          return deactivateRelativity();
-        }
-        else
-        {
-          printTableAbbreviation();
-          SEND_STRING("ON ");
-          printTableAbbreviationLimited();
-          eraseKeyCodes();
-          eraseTableAbbreviation();
-          eraseCharCounts();
-          tempOff = true;
-          return true;
-        }
-        
-
-      case KC_SPC:
-        printTableAbbreviation();
-          return deactivateRelativity();
-      case ENTER_OR_SQL:
-        if (tempOff)
-        {
-          SEND_STRING("Id = ");
-          printTableAbbreviationLimited();
-          SEND_STRING(".Id");
-          deactivateRelativity();
-          return true;
-        }
-        else
-        {
-          printTableAbbreviation();
-          deactivateRelativity();
-          return true;
-        }
-      case KC_ESC:
-          return deactivateRelativity();
-    }
-  }
-  return true;
-}
diff --git a/keyboards/dz60/keymaps/marianas/relativity.h b/keyboards/dz60/keymaps/marianas/relativity.h
deleted file mode 100644
index c917b1a4dcd..00000000000
--- a/keyboards/dz60/keymaps/marianas/relativity.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#include QMK_KEYBOARD_H
-#define macroTapsLen 32
-#define tableNameListLen 32
-#define charCountLen 32
-
-#define relTimeout 1500
-
-
-void activateRelativity(void);
-bool deactivateRelativity(void);
-void initStringData(void);
-bool containsCode(uint16_t kc);
-bool lastCodeIs(uint16_t kc);
-bool last2CodeAre(uint16_t kc);
-bool last2CodesAre(uint16_t kc, uint16_t kc2);
-void addKeyCode(uint16_t kc);
-void eraseKeyCodes(void);
-void eraseCharCounts(void);
-void printTableAbbreviation(void);
-void eraseTableAbbreviation(void);
-void printString(char* str);
-void printStringAndQueueChar(char* str);
-void ReplaceString(char *orig, char *repl);
-void deletePrev(void);
-bool processSmartMacroTap(uint16_t kc);
-bool isShifted(void);
-void setShifted(bool);
-
-
-
-bool handleSmartMacros(uint16_t keycode, keyrecord_t *record);
-bool storeShiftState(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/dz60/keymaps/marianas/rules.mk b/keyboards/dz60/keymaps/marianas/rules.mk
deleted file mode 100644
index 11eb15fe15f..00000000000
--- a/keyboards/dz60/keymaps/marianas/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build Options
-#   comment out to disable the options.
-#
-
-
-BOOTMAGIC_ENABLE = yes      # 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
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = no		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = no
-AUTO_SHIFT_ENABLE = no
-
-
-SRC += relativity.c
-SRC += customLogic.c
diff --git a/keyboards/dz60/keymaps/model42/keymap.c b/keyboards/dz60/keymaps/model42/keymap.c
deleted file mode 100644
index 30b95e63e00..00000000000
--- a/keyboards/dz60/keymaps/model42/keymap.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Hard Reload Chrome
-enum dz60_keycodes {
-	LT_1_OR_RELOAD_CHROME = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][5][15] = {
-// layer 0
-LAYOUT_directional(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_PGUP, KC_PGDN,
-       KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-       KC_ESC, 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, LT(3, KC_Z), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MT(MOD_RSFT, KC_SLSH), KC_UP, KC_SLSH,
-       KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, LT(4, KC_SPC), KC_BSPC, MO(2), LT_1_OR_RELOAD_CHROME, KC_LEFT, KC_DOWN, KC_RGHT),
-
-// layer 1
-LAYOUT_directional(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-// layer 2
-LAYOUT_directional(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_HOME, KC_END,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-// layer 3
-LAYOUT_directional(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-// layer 4
-LAYOUT_directional(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-uint16_t custom_lt_timer;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	if(LT_1_OR_RELOAD_CHROME == keycode) {
-		if(record->event.pressed) {
-			custom_lt_timer = timer_read();
-			layer_on(1);
-		} else {
-			layer_off(1);
-			if (timer_elapsed(custom_lt_timer) < 200) {
-				register_code(KC_LGUI);
-				register_code(KC_RSFT);
-				register_code(KC_R);
-				unregister_code(KC_R);
-				unregister_code(KC_RSFT);
-				unregister_code(KC_LGUI);
-			}
-		}
-	}
-	return true;
-}
diff --git a/keyboards/dz60/keymaps/model42/readme.md b/keyboards/dz60/keymaps/model42/readme.md
deleted file mode 100644
index 04fa11aad57..00000000000
--- a/keyboards/dz60/keymaps/model42/readme.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# yanfali's keymap for KBDFans DZ60 PCB
-
-## 4 Layers
-
-### Layer 0
-
-![layer 0](https://imgur.com/gELh7Se.png)
-Conventional ANSI layout. Except:
-
- - Backspace has been replaced with 2 keys
-   - PGUP
-   - PGDN
- - 2.25U Left shift is now 1.25U with 1U key LT(layer 3, KC_Z)
- - Bottom right shift is 1.75U. Has arrow cluster. Tap right shift for / and dedicated / key is to far right.
- - Bottom row, split space bar
-   - 2.75U (Space)
-   - 1.25U (mouse key + WASD) with LT(4, KC_SPC)
-   - 2.25U (backspace)
-   - 1U MO(layer 2)
-   - 1U LT(layer 1, SHIFT+LGUI+R)
-   - arrows.
-
-### Layer 1
-
-![layer 1](https://imgur.com/X7iKNxQ.png)
-RGB underglow and backlight controls, Reset
-
-### Layer 2
-
-![layer 2](https://imgur.com/bOiQI69.png)
-F1-F12, PGUP -> HOME, PGDN -> END
-
-### Layer 3
-
-Unused at this time but tied to 3 FN key to right of 1.25U left shift.
-
-### Layer 4
-
- * WASD - Mouse controls
- * Q - Btn 1
- * E - Btn 2
-
diff --git a/keyboards/dz60/keymaps/mpaarating/keymap.c b/keyboards/dz60/keymaps/mpaarating/keymap.c
deleted file mode 100644
index 0d8ae497ef4..00000000000
--- a/keyboards/dz60/keymaps/mpaarating/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Layer definition
-#define L0 0
-#define L1 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[L0] = LAYOUT_60_2_function(
-		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_BSLS, KC_GRAVE,
-		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_BSPC,
-		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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(L1),
-		KC_LCTL, KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL, KC_RGUI, MO(L1)
-    ),
-
-	[L1] = LAYOUT_60_2_function(
-		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_TRNS, KC_TRNS,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_UP, KC_TRNS, KC_DELETE,
-		KC_CAPS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_LEFT, KC_RIGHT, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS,  KC_END,  KC_DOWN, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS
-    )
-};
diff --git a/keyboards/dz60/keymaps/mpaarating/readme.md b/keyboards/dz60/keymaps/mpaarating/readme.md
deleted file mode 100644
index d21d26c757b..00000000000
--- a/keyboards/dz60/keymaps/mpaarating/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# DZ60
-
-![dz60](https://i.imgur.com/nVOX9Gb.jpg)
-
-### Layout
-**Note:** Layer 2 does not exist currently
-![layer 0](https://i.imgur.com/uXFTNBs.png)
-![layer 1](https://i.imgur.com/f7uTkDU.png)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make dz60:mpaarating
diff --git a/keyboards/dz60/keymaps/mpstewart/config.h b/keyboards/dz60/keymaps/mpstewart/config.h
deleted file mode 100644
index 92d4cfb50a3..00000000000
--- a/keyboards/dz60/keymaps/mpstewart/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-// Turn off RGB when computer goes to sleep
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SLEEP
-#endif // RGBLIGHT_ENABLE
diff --git a/keyboards/dz60/keymaps/mpstewart/keymap.c b/keyboards/dz60/keymaps/mpstewart/keymap.c
deleted file mode 100644
index 8cc97a549bc..00000000000
--- a/keyboards/dz60/keymaps/mpstewart/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include QMK_KEYBOARD_H
-#define C_ESC CTL_T(KC_ESC)
-
-
-// Layers
-#define _BASE   0
-#define _FN     1
-#define _LIGHTS 2
-
-/* Layout designed primarily around replicating the ergonomics of an HHKB, with
- * a standard 60% spacebar row to be more compatible with conveniently
- * available parts. The feature most shamelessly ripped off from the HHKB is
- * the split right shift and backspace.
- *
- * This keymap is macOS-oriented by default, but pressing the AG_TOGG key on
- * the _FN layer will swap alt and gui, making this layout also functional for
- * Linux and PC.
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* _BASE layer
- * Looks like this                                                Arranged like this
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐  ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │  │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤  ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │Bksp │  │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤  ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │esc/^ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │  │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤  ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │lshift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │rshift│fn │  │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤  ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │ctrl│alt │win │                        │win │alt │menu│ctrl│  │40  │41  │43  │46                      │4a  │4b  │4d  │4e  │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘  └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-*/
-	[_BASE] = LAYOUT_60_ansi_split_bs_rshift(
- //    _0        _1        _2      _3       _4      _5      _6      _7       _8     _9       _A       _B        _C       _D           _E
-/*0_*/ QK_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_BSLS,     KC_GRV,
-/*1_*/ 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_BSPC,
-/*2_*/ C_ESC,              KC_A,   KC_S,    KC_D,   KC_F,   KC_G,   KC_H,    KC_J,  KC_K,    KC_L,    KC_SCLN,  KC_QUOT, KC_ENT,
-/*3_*/ 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(_FN),
-/*4_*/ KC_LCTL,  KC_LALT,          KC_LGUI,                 KC_SPC,                          KC_RGUI, KC_RALT,           MO(_LIGHTS), KC_RCTL
-  ),
-
-/* _FN layer, where blank keys indicates transparency to the base layer
- * Looks like this                                                Arranged like this (as above)
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐  ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │slp│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ins│del│  │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤  ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │caps │bup│bdn│   │XXX│   │   │   │prt│scl│pus│ ↑ │   │     │  │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤  ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │vup│vdn│vmt│   │   │   │   │hme│pup│ ← │ → │ Return │  │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤  ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │lshift  │   │   │   │   │   │   │   │end│pdn│ ↓ │rshift│   │  │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤  ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │ctrl│lalt│lgui│       S P A C E        │rgui│ralt│menu│ctrl│  │40  │41  │43  │46                      │4a  │4b  │4d  │4e  │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘  └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- * XXX = QK_BOOT (dfu mode)
-*/
-	[_FN] = LAYOUT_60_ansi_split_bs_rshift(
- //    _0       _1       _2       _3       _4        _5       _6       _7       _8       _9       _A       _B       _C       _D         _E
-/*0_*/ KC_SLEP, KC_F1,   KC_F2  , KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,    KC_DEL,
-/*1_*/ KC_CAPS,          KC_BRID,  KC_BRIU,  KC_NO,    QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_NO,     KC_NO,
-/*2_*/ KC_NO,            KC_VOLD,  KC_VOLU,  KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_RGHT, KC_RETURN,
-/*3_*/ SC_LSPO,          KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_PGDN, KC_DOWN,          SC_RSPC,   KC_TRNS,
-/*4_*/ KC_LCTL, KC_LALT,          KC_LGUI,                    KC_SPC,                             KC_RGUI, KC_RALT,          KC_APP,    AG_TOGG
-  ),
-
-/* _LIGHTS LAYER (stolen shamelessly from 256k_HHKB
- *
- *  ,---------------------------------------------------------------------------------------------------------------------+
- * | RGB_TOGGLE  | STATIC | BREATHE | RAINBOW | SWIRL | SNAKE | KNIGHTRIDER | XMAS | STATIC_GRAD | _ |  _ | _ | _ | _ | _ |
- * |----------------------------------------------------------------------------------------------------------------------+
- * | RBG_MOD      |  HUE_INC |  SATURATION_INC  |  BRIGHT_INC   |  _  |  _  |  _  |  _ |  _ |  _ |  _ |  _  |  _  |  _    |
- * |----------------------------------------------------------------------------------------------------------------------+
- * | CTRL           |  HUE_DEC |  SATURATION_DEC  |  BRIGHT_DEC  |  _  |  _  |  _ |  _  |  _  |  _  |  _  |  _  |    _    |
- * |----------------------------------------------------------------------------------------------------------------------+
- * | Shift                |   _   |   _   |   _   |   _   |   _   |   _   |   _   |   _   |   _   |   _   |  _   |    _   |
- * |----------------------------------------------------------------------------------------------------------------------+
- * |                             _    |      _     |               _               |     _      |     _                   |
- * `----------------------------------------------------------------------------------------------------------------------'
- */
-	[_LIGHTS] = LAYOUT_60_ansi_split_bs_rshift(
-//     _0       _1       _2       _3       _4        _5        _6       _7       _8       _9      _A      _B      _C      _D      _E
-/*0_*/ RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-/*1_*/ RGB_MOD,          RGB_HUI, RGB_SAI, RGB_VAI,  KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-/*2_*/ KC_NO,            RGB_HUD, RGB_SAD, RGB_VAD,  KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-/*3_*/ 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,
-/*4_*/ KC_NO,   KC_NO,            KC_NO,                       KC_NO,                             KC_NO,  KC_NO,          KC_NO,  KC_NO
-  )
-};
diff --git a/keyboards/dz60/keymaps/mpstewart/rules.mk b/keyboards/dz60/keymaps/mpstewart/rules.mk
deleted file mode 100644
index 176a650c933..00000000000
--- a/keyboards/dz60/keymaps/mpstewart/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-EXTRAKEY_ENABLE  = yes
-NKRO_ENABLE      = yes
-
-BACKLIGHT_ENABLE = yes
-MOUSEKEY_ENABLE  = no
-AUDIO_ENABLE     = no
-RGBLIGHT_ENABLE  = yes
-LEADER_ENABLE    = no
-MIDI_ENABLE      = no
-BLUETOOTH_ENABLE = no
diff --git a/keyboards/dz60/keymaps/muralisc/keymap.c b/keyboards/dz60/keymaps/muralisc/keymap.c
deleted file mode 100644
index d7d4326a12f..00000000000
--- a/keyboards/dz60/keymaps/muralisc/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2022 Murali Suresh
- *
- * 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
-
-// Copied from keyboards/dz60/keymaps/60_ansi/keymap.c
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,------------------------------------------------------------------------------------------.
-   * | ` ~  |  1! |  2@ |  3# |  4$ |  5% |  6^ |  7& |  8* |  9( |  0) |  -  |  =  |   Bkspc   |
-   * |------------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |     \   |
-   * |------------------------------------------------------------------------------------------+
-   * | Ctl_T(C) |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-   * |------------------------------------------------------------------------------------------+
-   * | Shift      |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |    RShift       |
-   * |------------------------------------------------------------------------------------------+
-   * |  MO1  |  Cmd  |  Alt  |              Space                | RAlt | Cmd  |  MO2  |  RCTL  |
-   * `------------------------------------------------------------------------------------------'
-   */
-
-	LAYOUT_60_ansi(
-		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_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,
-		MO(1)  , KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI,          MO(2),   KC_RCTL),
-
-  /* Qwerty
-   * ,------------------------------------------------------------------------------------------.
-   * | Esc  |  F1 |  F2 |  F3 |  F4 |  5% |  6^ |  7& |  8* |  9( |  0) |  -  |  =  |   Bkspc   |
-   * |------------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  | End |  R  |  T  |  Y  |  U  |  I  |  O  | PsCr| SlCk| Paus|     \   |
-   * |------------------------------------------------------------------------------------------+
-   * | Ctl_T(C) | Home|  S  |  D  | Pgdn|  G  | Left| Down| Up  | Rght| Home| PgUp|    Enter    |
-   * |------------------------------------------------------------------------------------------+
-   * | Shift      |  Z  |  X  |  C  |  V  | PgUp|  N  |  M  |  ,  | End | PgDn|    RShift       |
-   * |------------------------------------------------------------------------------------------+
-   * |  MO1  |  Cmd  |  Alt  |              Space                | RAlt | Cmd  |  MO2  |  RCTL  |
-   * `------------------------------------------------------------------------------------------'
-   */
-
-
-	LAYOUT_60_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_DEL,
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_END , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-		KC_TRNS,          KC_HOME, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, KC_HOME, KC_PGUP, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS),
-
-	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,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
-};
diff --git a/keyboards/dz60/keymaps/muzfuz/README.md b/keyboards/dz60/keymaps/muzfuz/README.md
deleted file mode 100644
index 711d6d5f56a..00000000000
--- a/keyboards/dz60/keymaps/muzfuz/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# muzfuz DZ60 layout
-
-```shell
-make dz60:muzfuz
-dfu-programmer atmega32u4 erase --force && \
-dfu-programmer atmega32u4 flash .build/dz60_muzfuz_v2.hex && \
-dfu-programmer atmega32u4 reset
-```
diff --git a/keyboards/dz60/keymaps/muzfuz/keymap.c b/keyboards/dz60/keymaps/muzfuz/keymap.c
deleted file mode 100644
index 1a71b9bb868..00000000000
--- a/keyboards/dz60/keymaps/muzfuz/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
-#define ESC_CTL     CTL_T(KC_ESCAPE)            // Tap for Esc, hold for Ctrl
-
-enum custom_keycodes {
-  HASHRKT = SAFE_RANGE,
-  CLNEQLS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT(
-		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_BSLS, HASHRKT,
-		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_BSPC,
-		ESC_CTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RGUI,
-		KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-		KC_LCTL, KC_LALT, KC_LGUI, KC_ENT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_RGHT, KC_DOWN),
-
-	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_DEL,
-		_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, BL_DOWN,BL_TOGG, BL_UP,  BL_STEP, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-};
-
-bool led_update_user(led_t led_state) {
-	if (led_state.caps_lock) {
-		DDRB |= (1 << 2); PORTB &= ~(1 << 2);
-	} else {
-		DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-	}
-	return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  switch (keycode)
-  {
-  case HASHRKT:
-    if (record->event.pressed)
-    {
-      SEND_STRING("=>");
-    }
-    break;
-  case CLNEQLS:
-    if (record->event.pressed)
-    {
-      SEND_STRING(":=");
-    }
-    break;
-  }
-  return true;
-}
diff --git a/keyboards/dz60/keymaps/niclake/config.h b/keyboards/dz60/keymaps/niclake/config.h
deleted file mode 100644
index 9028fcf9fbb..00000000000
--- a/keyboards/dz60/keymaps/niclake/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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/dz60/keymaps/niclake/keymap.c b/keyboards/dz60/keymaps/niclake/keymap.c
deleted file mode 100644
index 7c1b0b7d7c0..00000000000
--- a/keyboards/dz60/keymaps/niclake/keymap.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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,
-    _QWERTY,
-    _FN,
-    _ADJ
-};
-
-enum custom_keycodes {
-    COLEMAK = SAFE_RANGE,
-    QWERTY,
-    FN,
-    ADJ,
-    MACWIN
-};
-
-#define COLEMAK DF(_BASE)
-#define QWERTY  DF(_QWERTY)
-#define RAISE   MO(_RAISE)
-#define LOWER   MO(_LOWER)
-#define ADJUST  TT(_ADJUST)
-#define MACWIN  MAGIC_TOGGLE_ALT_GUI
-#define RGB_ON  RGB_MODE_PLAIN
-#define RGB_TW  RGB_MODE_TWINKLE
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        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_TAB,           KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
-        FN,               KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,
-        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_LCTL, KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI,          MO(1),   KC_RCTL
-    ),
-
-    [_QWERTY] = LAYOUT(
-        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_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        FN,               KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        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,          LOWER,   KC_RCTL
-    ),
-
-    [_RAISE] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
-        _______,          KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, _______, _______, _______,
-        _______,          _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END,  _______,          KC_CAPS,
-        _______, _______,          _______,                   _______,                            _______, _______,          ADJUST,  _______
-    ),
-
-    [_LOWER] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        ADJUST,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______,          _______,                   _______,                            _______, _______,          _______, _______
-    ),
-
-    [_ADJUST] = LAYOUT(
-        XXXXXXX, RGB_ON,  RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_G, RGB_M_TW, RGB_M_T, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-        XXXXXXX,          RGB_TOG, RGB_MOD, RGB_HUI,  RGB_SAI, RGB_VAI,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
-        ADJUST,           MACWIN,  XXXXXXX, RGB_HUD, RGB_SAD,  RGB_VAD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 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/dz60/keymaps/niclake/readme.md b/keyboards/dz60/keymaps/niclake/readme.md
deleted file mode 100644
index a36c32d2465..00000000000
--- a/keyboards/dz60/keymaps/niclake/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Nic Lake's DZ60 Layout
-
-This is Nic's DZ60 layout.
-
-- Colemak base layer w/ QWERTY support
-- Caps -> FN
-- Bottom row set up for Mac usage (use `MACWIN`/`AG_TOGG` to toggle)
-- Latching Numpad layer for data entry
-- Uses [Space Cadet shift keys](https://docs.qmk.fm/#/feature_space_cadet?id=usage)
-- Experimenting with [Home Row Mods](https://precondition.github.io/home-row-mods)
-
-![Nic's DZ60 Layout](https://i.imgur.com/Lmw08LT.jpg)
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/niclake/rules.mk b/keyboards/dz60/keymaps/niclake/rules.mk
deleted file mode 100644
index 31d6053e03d..00000000000
--- a/keyboards/dz60/keymaps/niclake/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMMAND_ENABLE   = no
-RGBLIGHT_ENABLE  = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/dz60/keymaps/olivierko/keymap.c b/keyboards/dz60/keymaps/olivierko/keymap.c
deleted file mode 100644
index 7d49d1b51d0..00000000000
--- a/keyboards/dz60/keymaps/olivierko/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-  _BL,
-  _SL,
-  _FL,
-  _CL,
-};
-
-enum custom_keycodes {
-  SWE_AA = SAFE_RANGE,
-  SWE_AE,
-  SWE_OE,
-};
-
-char *alt_codes[][2] = {
-    {
-        SS_LALT(SS_TAP(X_KP_0)SS_TAP(X_KP_2)SS_TAP(X_KP_2)SS_TAP(X_KP_9)), // Alt+0229 → å
-        SS_LALT(SS_TAP(X_KP_0)SS_TAP(X_KP_1)SS_TAP(X_KP_9)SS_TAP(X_KP_7)), // Alt+0197 → Å
-    },
-    {
-		SS_LALT(SS_TAP(X_KP_0)SS_TAP(X_KP_2)SS_TAP(X_KP_2)SS_TAP(X_KP_8)), // Alt+0228 → ä
-        SS_LALT(SS_TAP(X_KP_0)SS_TAP(X_KP_1)SS_TAP(X_KP_9)SS_TAP(X_KP_6)), // Alt+0196 → Ä
-    },
-    {
-        SS_LALT(SS_TAP(X_KP_0)SS_TAP(X_KP_2)SS_TAP(X_KP_4)SS_TAP(X_KP_6)), // Alt+0246 → ö
-        SS_LALT(SS_TAP(X_KP_0)SS_TAP(X_KP_2)SS_TAP(X_KP_1)SS_TAP(X_KP_4)), // Alt+0214 → Ö
-    },
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[_BL] = LAYOUT_olivierko(
-		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_BSLS,		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_BSPC,
-		MO(_FL),	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_UP, 		KC_RSFT,	
-		KC_LCTL, 	KC_LGUI,  	KC_LALT, 										KC_SPC,											KC_LEFT,	KC_DOWN,	KC_RIGHT,	KC_RCTL),
-									
-	[_SL] = LAYOUT_olivierko(
-		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,
-		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	SWE_AA,		KC_NO,		KC_TRNS,
-		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	SWE_OE,		SWE_AE,		KC_TRNS,		
-		KC_TRNS, 	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS, 	KC_TRNS,	
-		KC_TRNS, 	KC_TRNS,  	KC_TRNS, 										KC_TRNS,										KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS),									
-									
-	[_FL] = LAYOUT_olivierko(								
-		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_PAUSE,
-		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_DELETE,
-		KC_NO,		DF(_BL),	DF(_SL),	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_INS,	
-		KC_LSFT,	KC_NO,		KC_NO,		KC_CAPS,	KC_NO,		KC_NO,		KC_NO,		KC_MUTE,	KC_NO,		KC_NO,		KC_NO,		KC_PGUP,	KC_RSFT,	
-		KC_LCTL,	MO(_CL),	KC_LALT,										KC_MPLY,										KC_HOME,	KC_PGDN,	KC_END,		KC_RCTL),
-											
-	[_CL] = LAYOUT_olivierko(								
-		RGB_TOG,	RGB_MOD,	RGB_HUI,	RGB_HUD,	RGB_SAI,	RGB_SAD,	RGB_VAI,	RGB_VAD,	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,			KC_NO,
-		KC_NO,		KC_NO,		KC_NO,		KC_NO,		QK_BOOT,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,
-		KC_NO,		KC_NO,		KC_NO,		DB_TOGG,	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,	
-		KC_LSFT,	KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_NO,		KC_RSFT,	
-		KC_NO,		KC_NO,		KC_NO,											KC_NO,											KC_NO,		KC_NO,		KC_NO,		KC_NO),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    if (!record->event.pressed) 
-		return true;
-
-    switch (keycode) {
-		case SWE_AA: 
-		case SWE_AE: 
-		case SWE_OE: {
-			uint16_t index = keycode - SWE_AA;
-			uint8_t shift = get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT));
-
-			unregister_code(KC_LSFT);
-			unregister_code(KC_RSFT);
-
-			send_string(alt_codes[index][(bool)shift]);
-
-			if (shift & MOD_BIT(KC_LSFT)) register_code(KC_LSFT);
-			if (shift & MOD_BIT(KC_RSFT)) register_code(KC_RSFT);
-
-			return false;
-		}
-		default:
-			return true;
-    }
-}
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/olivierko/readme.md b/keyboards/dz60/keymaps/olivierko/readme.md
deleted file mode 100644
index 54ade6d78e6..00000000000
--- a/keyboards/dz60/keymaps/olivierko/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# DZ60
-### _BL:
-Base layer with american ANSI layout.  
-
-![_BL](https://i.imgur.com/BPMn7dk.png)
-### _SL:
-Swedish layer with ÅÄÖ at original positions.  
-
-![_SL](https://i.imgur.com/I8QRh24.png)
-### _FL:
-Function layer including various extra keys.  
-
-![_FL](https://i.imgur.com/nCbCIrZ.png)
-### _CL:
-Control layer for managing RGB and flashing.  
-
-![_CL](https://i.imgur.com/QnoMgsb.png)
-### Make command:
-```sh
-make dz60:olivierko:flash
-```
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c
deleted file mode 100644
index e71bac47deb..00000000000
--- a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2020 Oliver Granlund
- * 
- * 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
-
-/* ISO 60 layout by olligranlund
-*
-* This layout starts from a standard ISO 60% layout, and adds one function layer.
-* If you wish to only have one wide spacebar, you can easily do that by dismissing the "side" spacebar switches.
-*
-* Default Layer
-* ,-----------------------------------------------------------------------------------------.
-* | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Del | BSPC|
-* |-----------------------------------------------------------------------------------------|
-* | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  Ä  | + * | Enter  |
-* |----------------------------------------------------------------------------------       |
-* | FN      |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ü  | # ' |       |
-* |-----------------------------------------------------------------------------------------|
-* | Shift | < > |  Z  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | . : | - _ |  Shift  |Shift|
-* |-----------------------------------------------------------------------------------------|
-* | LCtl  | LGUI  | LAlt  |  Space      | Space |  Space      | RAlt  | FN    | App  | RCtl |
-* `-----------------------------------------------------------------------------------------'
-*/
-
-enum custom_keycodes {
-    EMOJI_DANCERS = SAFE_RANGE,
-	EMOJI_PERJANTAI,
-	EMOJI_THISISFINE,
-	EMOJI_KOVAAAJOA,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-    	case EMOJI_DANCERS:
-			if (record->event.pressed) {
-				// when keycode QMKBEST is pressed
-				SEND_STRING(">dancers>");
-			}
-			break;
-
-		case EMOJI_PERJANTAI:
-			if (record->event.pressed) {
-				// when keycode QMKBEST is pressed
-				SEND_STRING(">perjantaideploy>");
-			}
-			break;
-		
-		case EMOJI_THISISFINE:
-			if (record->event.pressed) {
-				// when keycode QMKBEST is pressed
-				SEND_STRING(">this/is/fine>");
-			}
-			break;
-    
-		case EMOJI_KOVAAAJOA:
-			if (record->event.pressed) {
-				// when keycode QMKBEST is pressed
-				SEND_STRING(">kovaaajoa>");
-			}
-			break;
-    }
-    
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	// 0 Base
-	LAYOUT_60_iso_split_space_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_DEL, KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-		MO(2),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,     KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TG(1),
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(3),    KC_APP,  KC_RCTL),
-
-	// 1 Base with arrows
-	LAYOUT_60_iso_split_space_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_DEL, KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-		MO(2),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,     KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP, KC_TRNS,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, KC_LEFT,  KC_DOWN, KC_RGHT),
-
-	// 2 FN
-	LAYOUT_60_iso_split_space_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,  KC_DEL,
-		KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_PGDN,  KC_UP,   KC_PGUP,   KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   KC_VOLD, KC_MUTE, KC_VOLU, KC_NO,   KC_NO,   KC_HOME, KC_LEFT,  KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RSFT, KC_CAPS,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, KC_NO,    KC_APP,  KC_RCTL),
-
-	// 3 FN with RGB and macros
-	LAYOUT_60_iso_split_space_bs_rshift(
-		KC_GRV,  RGB_TOG,   		RGB_MOD,   		RGB_RMOD,   		RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD,  RGB_SAD, RGB_VAD, KC_F10,  KC_F11,  KC_F12,  KC_DEL,  QK_BOOT,
-		KC_NO,   KC_NO, 			EMOJI_DANCERS, 	KC_NO, 				KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   EMOJI_PERJANTAI,   EMOJI_THISISFINE,EMOJI_KOVAAAJOA,	KC_NO,   KC_NO,   KC_NO,   KC_LEFT,  KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_LSFT, KC_NO, 			KC_NO, 			KC_NO, 				KC_NO,   KC_NO,   KC_NO,   KC_END,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RSFT, KC_CAPS,
-		KC_LCTL, KC_LGUI, 			KC_LALT,		KC_SPC,  			KC_SPC,  KC_SPC,  KC_RALT, KC_NO,    KC_APP,  KC_RCTL),
-
-};
diff --git a/keyboards/dz60/keymaps/olligranlund_iso/readme.md b/keyboards/dz60/keymaps/olligranlund_iso/readme.md
deleted file mode 100644
index 77869e4361f..00000000000
--- a/keyboards/dz60/keymaps/olligranlund_iso/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# DZ60 with splitted parts with VIA support
-### by Oliver Granlund
-
-![Finished product](https://i.imgur.com/HlEo5Ygl.jpg)
-
-This is still under progress, but currently works on Windows as a daily driver.
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/olligranlund_iso/rules.mk b/keyboards/dz60/keymaps/olligranlund_iso/rules.mk
deleted file mode 100644
index 9008ce984f8..00000000000
--- a/keyboards/dz60/keymaps/olligranlund_iso/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRAKEY_ENABLE = yes
-VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c
deleted file mode 100644
index 6aede3f13f3..00000000000
--- a/keyboards/dz60/keymaps/olligranlund_iso_v2/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2020 Oliver Granlund
- * 
- * 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
-
-/* ISO 60 layout by olligranlund
-*
-* This layout starts from a standard ISO 60% layout, and adds one function layer.
-* If you wish to only have one wide spacebar, you can easily do that by dismissing the "side" spacebar switches.
-*
-* Default Layer
-* ,-----------------------------------------------------------------------------------------.
-* | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Del | BSPC|
-* |-----------------------------------------------------------------------------------------|
-* | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  Ä  | + * | Enter  |
-* |----------------------------------------------------------------------------------       |
-* | FN      |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ü  | # ' |       |
-* |-----------------------------------------------------------------------------------------|
-* | Shift | < > |  Z  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | . : | - _ |  Shift  |Shift|
-* |-----------------------------------------------------------------------------------------|
-* | LCtl  | LGUI  | LAlt  |  Space      | Space |  Space     | RAlt | FN | App | RCtl |     |
-* `-----------------------------------------------------------------------------------------'
-*/
-
-enum custom_keycodes {
-    EMOJI_DANCERS = SAFE_RANGE,
-	EMOJI_PERJANTAI,
-	EMOJI_THISISFINE,
-	EMOJI_KOVAAAJOA,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-    	case EMOJI_DANCERS:
-			if (record->event.pressed) {
-				// when keycode QMKBEST is pressed
-				SEND_STRING(">dancers>");
-			}
-			break;
-
-		case EMOJI_PERJANTAI:
-			if (record->event.pressed) {
-				// when keycode QMKBEST is pressed
-				SEND_STRING(">perjantaideploy>");
-			}
-			break;
-		
-		case EMOJI_THISISFINE:
-			if (record->event.pressed) {
-				// when keycode QMKBEST is pressed
-				SEND_STRING(">this/is/fine>");
-			}
-			break;
-    
-		case EMOJI_KOVAAAJOA:
-			if (record->event.pressed) {
-				// when keycode QMKBEST is pressed
-				SEND_STRING(">kovaaajoa>");
-			}
-			break;
-    }
-    
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	// 0 Base
-	LAYOUT_60_iso_5x1u_split_bs_rshift_spc(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,     KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-		MO(2),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,     KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TG(1),
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(3),    KC_APP,  KC_PSCR, KC_RCTL),
-
-	// 1 Base with arrows
-	LAYOUT_60_iso_5x1u_split_bs_rshift_spc(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,     KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-		MO(2),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,     KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP, KC_TRNS,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(3),    KC_LEFT,  KC_DOWN, KC_RGHT),
-
-	// 2 FN
-	LAYOUT_60_iso_5x1u_split_bs_rshift_spc(
-		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_DEL,
-		KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_PGDN,  KC_UP,   KC_PGUP, KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   KC_VOLD, KC_MUTE, KC_VOLU, KC_NO,   KC_NO,   KC_HOME, KC_LEFT,  KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RSFT, KC_CAPS,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, KC_NO,    KC_APP,  KC_PSCR, KC_RCTL),
-
-	// 3 FN with RGB and macros
-	LAYOUT_60_iso_5x1u_split_bs_rshift_spc(
-		KC_GRV,  RGB_TOG,   		RGB_MOD,   		RGB_RMOD,   		RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD,  RGB_SAD, RGB_VAD, KC_F10,  KC_F11,  KC_F12,  KC_DEL,  QK_BOOT,
-		KC_NO,   KC_NO, 			EMOJI_DANCERS, 	KC_NO, 				KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   EMOJI_PERJANTAI,   EMOJI_THISISFINE,EMOJI_KOVAAAJOA,	KC_NO,   KC_NO,   KC_NO,   KC_LEFT,  KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_LSFT, KC_NO, 			KC_NO, 			KC_NO, 				KC_NO,   KC_NO,   KC_NO,   KC_END,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RSFT, KC_CAPS,
-		KC_LCTL, KC_LGUI, 			KC_LALT,		KC_SPC,  			KC_SPC,  KC_SPC,  KC_RALT, KC_NO,    KC_APP,  KC_PSCR, KC_RCTL),
-	
-};
diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md b/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md
deleted file mode 100644
index 1d81116af83..00000000000
--- a/keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# DZ60 with splitted parts with VIA support
-### by Oliver Granlund
-
-![Finished product](https://i.imgur.com/AT1Lyrxl.jpg)
-
-This is still under progress, but currently works on Windows as a daily driver. Also added macros for Slack emojis
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/olligranlund_iso_v2/rules.mk b/keyboards/dz60/keymaps/olligranlund_iso_v2/rules.mk
deleted file mode 100644
index 9008ce984f8..00000000000
--- a/keyboards/dz60/keymaps/olligranlund_iso_v2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRAKEY_ENABLE = yes
-VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/ottodokto/config.h b/keyboards/dz60/keymaps/ottodokto/config.h
deleted file mode 100644
index 331b14f2872..00000000000
--- a/keyboards/dz60/keymaps/ottodokto/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---defines-------------------------------------------- */
-#define TAPPING_TOGGLE 2 // toggle on layer on two taps.
-
-/*---RGB settings-------------------------------------------- */
-#undef  RGBLIGHT_HUE_STEP
-#undef  RGBLIGHT_SAT_STEP
-#undef  RGBLIGHT_VAL_STEP
-#undef  RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL
-
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 200
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/ottodokto/keymap.c b/keyboards/dz60/keymaps/ottodokto/keymap.c
deleted file mode 100644
index 5684afe26c9..00000000000
--- a/keyboards/dz60/keymaps/ottodokto/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* 
-   Last updated: 3 Aug 2019
-   DZ60 Layout by ottodokto
-
-   This layout is a modification of the 60 tsangan hhkb layout, 
-   with an additional layer to update the arrow keys and 
-   */
-
-#include QMK_KEYBOARD_H
-
-/*---Layers-------------------------------------------- */
-#define _base 0 // default, tsangan layout with split backspace
-#define _func 1 // media controls and reset buttons
-
-/*---defines-------------------------------------------- */
-#define KC_CTOG LT(_func, KC_CAPS)
-#define KC_TTAP TT(_func)
-
-#define RGB_STA RGB_M_P		// rgb static
-#define RGB_BRE RGB_M_B 	// rgb breathe
-#define RGB_RAI RGB_M_R 	// rgb rainbow
-#define RGB_SWI RGB_M_SW 	// rgb swirl
-#define RGB_SNA RGB_M_SN	// rgb snake
-#define RGB_KNI RGB_M_K 	// rgb knight
-#define RGB_GRA RGB_M_G 	// rgb gradient
-
-
-/*---Layout-------------------------------------------- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_base] = 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_BSLS, 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_BSPC,
-		KC_CTOG, 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_TTAP,
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL 
-	),
-    [_func] = LAYOUT_60_tsangan_hhkb(
-		RGB_TOG, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT,
-		_______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, RGB_SPI, RGB_HUD, RGB_VAI, RGB_HUI, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, RGB_SPD, RGB_SAD, RGB_VAD, RGB_SAI, KC_BRID, KC_BRIU, _______,
-		_______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VK_TOGG, _______, _______, _______, _______,
-		_______, _______, _______,                            _______,                            _______, _______, _______
-    )
-};
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/ottodokto/rules.mk b/keyboards/dz60/keymaps/ottodokto/rules.mk
deleted file mode 100644
index 1b0f198d06c..00000000000
--- a/keyboards/dz60/keymaps/ottodokto/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VELOCIKEY_ENABLE = yes
diff --git a/keyboards/dz60/keymaps/pevecyan/keymap.c b/keyboards/dz60/keymaps/pevecyan/keymap.c
deleted file mode 100644
index 4b10ac06b29..00000000000
--- a/keyboards/dz60/keymaps/pevecyan/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#include QMK_KEYBOARD_H
-#include "keymap_slovenian.h"
-
-
-#define CARON LT(3, SI_CIRC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = LAYOUT(
-    QK_GESC,SI_1,   SI_2,   SI_3,   SI_4,   SI_5,   SI_6,   SI_7,   SI_8,   SI_9,   SI_0,   SI_QUOT, SI_PLUS,XXXXXXX,KC_BSPC,
-    KC_TAB,         SI_Q,   SI_W,   SI_E,   SI_R,   SI_T,   SI_Z,   SI_U,   SI_I,   SI_O,   SI_P,    SI_GRV, SI_TILD,CARON,
-    MO(2),          SI_A,   SI_S,   SI_D,   SI_F,   SI_G,   SI_H,   SI_J,   SI_K,   SI_L,   KC_SCLN, KC_QUOT,KC_ENT,
-    KC_LSFT,XXXXXXX,SI_Y,   SI_X,   SI_C,   SI_V,   SI_B,   SI_N,   SI_M,   SI_COMM,SI_DOT, SI_MINS,        KC_RSFT,XXXXXXX,
-    KC_LCTL,KC_LGUI,        KC_LALT,KC_SPC,         KC_SPC,         KC_SPC,         KC_RALT,MO(3),   XXXXXXX,MO(1),  KC_F5
-  ),
-
-  [1] = LAYOUT(
-    KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,KC_DEL,
-    _______,        RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______,_______,QK_BOOT,
-    _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  BL_STEP,_______,_______,_______,_______,        _______,_______,
-    _______,_______,        _______,_______,        _______,        _______,        _______,_______,_______,_______,_______
-  ),
-
-  [2] = LAYOUT(
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,        KC_BSPC,KC_UP,  KC_DEL, _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME, KC_END,
-    _______,        KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-    _______,_______,        _______,_______,        _______,        _______,        _______,_______,_______,_______,_______
-  ),
-
-  [3] = LAYOUT(
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,        _______,_______,_______,_______,_______,SI_ZCAR,_______,_______,_______,_______,_______,_______,_______,
-    _______,        _______,SI_SCAR,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,SI_CCAR,  _______,_______,_______,_______,_______,_______,_______,        _______,_______,
-    _______,_______,        _______,_______,        _______,        _______,        _______,_______,_______,_______,_______
-  ),
-};
diff --git a/keyboards/dz60/keymaps/pinpox/keymap.c b/keyboards/dz60/keymaps/pinpox/keymap.c
deleted file mode 100644
index a80a78c4b2d..00000000000
--- a/keyboards/dz60/keymaps/pinpox/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	// Qwerty
-	[0] = LAYOUT_60_ansi(
-			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_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_ESC,     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, MO(1),    KC_SPC,  KC_ALGR, KC_RGUI, KC_LALT, KC_RCTL
-			),
-
-	// Special keys
-	[1] = LAYOUT_60_ansi(
-			KC_SLEP, KC_F1,   KC_F2,    KC_F3,   KC_F3,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,    KC_F12,   KC_DEL,
-			KC_NO,   RGB_MOD, RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_DOWN, KC_RGHT, KC_NO,   KC_NO,  KC_NO,   KC_PGUP,   KC_PGDN,  KC_NO,
-			KC_CAPS, BL_TOGG, RGB_TOG,  KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,     KC_MFFD,
-			KC_NO,   BL_UP,   BL_DOWN,  BL_BRTG, KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_HOME, KC_END, KC_NO,   KC_PSCR,
-			KC_NO,   KC_NO,   KC_TRNS,  KC_MPLY, KC_NO,   KC_NO,   KC_TRNS, KC_NO
-			)
-};
diff --git a/keyboards/dz60/keymaps/pinpox/rules.mk b/keyboards/dz60/keymaps/pinpox/rules.mk
deleted file mode 100644
index 7e4fd5d3491..00000000000
--- a/keyboards/dz60/keymaps/pinpox/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/dz60/keymaps/pok3r/keymap.c b/keyboards/dz60/keymaps/pok3r/keymap.c
deleted file mode 100644
index 410fd9473f0..00000000000
--- a/keyboards/dz60/keymaps/pok3r/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT(
-		QK_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_NO, 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,
-		MO(1), 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_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_NO, MO(2), KC_RCTL),
-
-	LAYOUT(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
-		_______, KC_MPRV, KC_MPLY, KC_MNXT, QK_BOOT, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-		KC_CAPS, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_DEL, _______,
-		_______, KC_APP, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-	LAYOUT(
-		RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, _______, RGB_RMOD, RGB_MOD, _______, _______,
-		_______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-};
diff --git a/keyboards/dz60/keymaps/split_space_arrows/keymap.c b/keyboards/dz60/keymaps/split_space_arrows/keymap.c
deleted file mode 100644
index 0ac20ea4809..00000000000
--- a/keyboards/dz60/keymaps/split_space_arrows/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/* DZ60 layout using following options (from layouts diagram on KBDfans):
- *  - plate B (2.25u lshift)
- *  - opt 4 (1.75, 1, 1 on rshift)
- *  - opt 10 (2.75, 1.25, 2.25 on space, 5x1u bottom right keys)
- * http://www.keyboard-layout-editor.com/#/gists/225f0f4dcf6671405f744fabe314627c
- */
-
-#define LAYOUT_b_4_10( \
-        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, \
-        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
-        K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310,       K312, K313, K314, \
-        K400, K401,       K403,       K404, K406,       K408,       K410, K411, K412, K413, K414  \
-        ) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014 }, \
-    { K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  KC_NO, K312,  K313,  K314 }, \
-    { K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  K412,  K413,  K414 }  \
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: basic qwerty */
-    LAYOUT_b_4_10(
-       // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------||------2.0-------|
-            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,
-       // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------||----------------|
-       //
-       // |----1.5-----||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|----1.5-----|
-             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,
-       // |------------||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|------------|
-       //
-       // |----1.75------||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|------2.25--------||
-             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,
-       // |--------------||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|------------------||
-       //
-       // |------2.25--------|--------|--------|--------|--------|--------|--------|--------|--------|--------||----1.75------|--------|--------||
-               KC_LSFT,        KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,   SFT_T(KC_SLSH), KC_UP,  KC_HYPR,
-       // |------------------|--------|--------|--------|--------|--------|--------|--------|--------|--------||--------------|--------|--------||
-       //
-       // |---1.25---|---1.25---||---1.25---||--------2.75----------||---1.25---|------2.25--------||--------|--------|--------|--------|--------|
-             KC_MEH,    KC_LALT,    KC_LGUI,         KC_SPC,             TT(1),       MO(1),          TG(1),   TT(2),  KC_LEFT, KC_DOWN, KC_RGHT
-       // |----------|----------||----------||----------------------||----------|------------------||--------|--------|--------|--------|--------|
-          ),
-
-    /* Layer 1: primary fn layer */
-    LAYOUT_b_4_10(
-        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_TAB,  KC_NO,   KC_HOME,       KC_UP,               KC_END,          KC_NO,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,   KC_NO,   KC_NO,   KC_NO,  KC_NO,
-        KC_CAPS, KC_NO,   KC_LEFT,       KC_DOWN,             KC_RIGHT,        KC_NO,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_NO,   KC_NO,   KC_ENT,
-        KC_LSFT, KC_MPRV, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN,   KC_AUDIO_VOL_UP, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,    QK_LOCK, KC_PGUP, KC_INS,
-        KC_MEH,  KC_LALT, KC_LGUI,       KC_MEDIA_PLAY_PAUSE, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN,  KC_END
-    ),
-
-    /* Layer 2: mouse navigation */
-    /* Layer 3: numpad */
-    /* Layer 4: RGB lighting controls and keyboard config, reset */
-    LAYOUT_b_4_10(
-        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,     TO(5),
-        KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,            KC_NO,     RGB_HUD,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   RGB_MODE_PLAIN, RGB_MODE_FORWARD, KC_RSFT,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   RGB_TOG,        RGB_VAI,          RGB_HUI,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_SAD, RGB_VAD, RGB_SAI
-    ),
-};
diff --git a/keyboards/dz60/keymaps/split_space_arrows/rules.mk b/keyboards/dz60/keymaps/split_space_arrows/rules.mk
deleted file mode 100644
index e30193dab9f..00000000000
--- a/keyboards/dz60/keymaps/split_space_arrows/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build Options
-# override the options specified in dz60/rules.mk
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dz60/keymaps/stephengrier/README.md b/keyboards/dz60/keymaps/stephengrier/README.md
deleted file mode 100644
index 002a8f255b1..00000000000
--- a/keyboards/dz60/keymaps/stephengrier/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-### stephengrier's DZ60 layout
-
-This layout is for a DZ60 with a 2U left shift, 1U right shift and an arrow
-cluster in the bottom right (i.e. the GK64 layout).
-
-Other features:
-
-* The capslock key is replaced with a second function key.
-* The Alt an Cmd keys are swapped to replicate the Mac layout.
-* Del is available as Fn+Backspace
-* Tilde is available as Shift+Esc
-* Backtick is available as Fn+Esc
-* Underglow toggle and mode selection are available as Fn+Q and Fn+W
-
-### 0 Qwerty
-```
-,-----------------------------------------------------------------------------------------.
-| Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-|-----------------------------------------------------------------------------------------+
-| Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-|-----------------------------------------------------------------------------------------+
-|   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-|-----------------------------------------------------------------------------------------+
-| Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RSh |  U  | Fn  |
-|-----------------------------------------------------------------------------------------+
-| Ctrl |  Alt  |  Cmd  |              Space                | Cmd | Alt  |  L  |  D  |  R  |
-`-----------------------------------------------------------------------------------------'
-```
-
-### 1 Fn Layer
-```
-FN Layer
-,-----------------------------------------------------------------------------------------.
-|  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
-|-----------------------------------------------------------------------------------------+
-|        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |      |     | RESET |
-|-----------------------------------------------------------------------------------------+
-|         | BL T| BL M| BL+ | BL- |     |     |     |     |     |     |     |             |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |     |     |     |     |     |     |
-|-----------------------------------------------------------------------------------------+
-|      |       |       |                                   |     |      |     |     |     |
-`-----------------------------------------------------------------------------------------'
-```
-
diff --git a/keyboards/dz60/keymaps/stephengrier/config.h b/keyboards/dz60/keymaps/stephengrier/config.h
deleted file mode 100644
index 9560d51a6f9..00000000000
--- a/keyboards/dz60/keymaps/stephengrier/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define GRAVE_ESC_GUI_OVERRIDE    # Always send Escape if GUI is pressed
diff --git a/keyboards/dz60/keymaps/stephengrier/keymap.c b/keyboards/dz60/keymaps/stephengrier/keymap.c
deleted file mode 100644
index de9bb632b07..00000000000
--- a/keyboards/dz60/keymaps/stephengrier/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------------.
-   * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-   * |-----------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-   * |-----------------------------------------------------------------------------------------+
-   * |   Fn    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-   * |-----------------------------------------------------------------------------------------+
-   * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RSh |  U  | Fn  |
-   * |-----------------------------------------------------------------------------------------+
-   * | Ctrl |  Alt  |  Cmd  |              Space                | Cmd | Alt  |  L  |  D  |  R  |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_directional(
-      QK_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_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,
-      MO(1), 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, MO(1),
-      KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT
-      ),
-
-  /* FN Layer
-   * ,-----------------------------------------------------------------------------------------.
-   * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
-   * |-----------------------------------------------------------------------------------------+
-   * |        |RBB T|RGB M| Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |      |     | QK_BOOT |
-   * |-----------------------------------------------------------------------------------------+
-   * |         | BL T| BL M| BL+ | BL- |     |     |     |     |     |     |     |             |
-   * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
-   * |-----------------------------------------------------------------------------------------+
-   * |      |       |       |                                   |     |      |     |     |     |
-   * `-----------------------------------------------------------------------------------------'
-   */
-
-  LAYOUT_directional(
-      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_TRNS, KC_DEL,
-      ______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______, ______, ______, ______, QK_BOOT,
-      ______, BL_TOGG, BL_STEP, BL_UP,  BL_DOWN,______, ______, ______, ______, ______, ______, ______,
-      ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______
-      ),
-};
diff --git a/keyboards/dz60/keymaps/tailcall/keymap.c b/keyboards/dz60/keymaps/tailcall/keymap.c
deleted file mode 100644
index 8c92e98e9d7..00000000000
--- a/keyboards/dz60/keymaps/tailcall/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    LAYOUT(
-        QK_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 , XXXXXXX, 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_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_LSFT, XXXXXXX, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          XXXXXXX,
-        MO(1)  ,          KC_LGUI, KC_LALT, KC_SPC ,          KC_SPC ,          KC_SPC , KC_RALT, KC_RGUI, XXXXXXX, MO(2)  ,          KC_RCTL),
-
-    LAYOUT(
-        KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_DEL ,
-        _______,          KC_HOME, KC_UP  , KC_END , KC_PGUP, KC_INS , KC_PSCR, KC_SCRL, RGB_VAD, _______, _______, _______, _______, _______,
-        KC_CAPS,          KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DEL , _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          _______,
-        _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
-
-    LAYOUT(
-        KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, KC_SLEP,
-        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, BL_DOWN, BL_TOGG, BL_UP  , BL_STEP, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______,          _______,          _______, _______, _______, _______, _______,          _______),
-
-};
diff --git a/keyboards/dz60/keymaps/tarnjotsingh/keymap.c b/keyboards/dz60/keymaps/tarnjotsingh/keymap.c
deleted file mode 100644
index 47c337d67c8..00000000000
--- a/keyboards/dz60/keymaps/tarnjotsingh/keymap.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_60_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_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_LALT, KC_RCTL),
-	[1] = LAYOUT_60_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_TRNS, KC_MUTE, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS),
-	[2] = LAYOUT_60_iso(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, 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/dz60/keymaps/tarnjotsingh/layers.json b/keyboards/dz60/keymaps/tarnjotsingh/layers.json
deleted file mode 100644
index 7399ef8fd62..00000000000
--- a/keyboards/dz60/keymaps/tarnjotsingh/layers.json
+++ /dev/null
@@ -1 +0,0 @@
-[["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_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "MO(1)", "KC_RGUI", "KC_LALT", "KC_RCTL"], ["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_TRNS", "KC_MUTE", "KC_VOLU", "KC_MPLY", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MRWD", "KC_MFFD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGDN", "KC_HOME", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(2)", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUI", "RGB_HUD", "RGB_SAI", "RGB_SAD", "RGB_VAI", "RGB_VAD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DOWN", "BL_TOGG", "BL_UP", "KC_TRNS", "KC_TRNS", "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/dz60/keymaps/tarnjotsingh/readme.md b/keyboards/dz60/keymaps/tarnjotsingh/readme.md
deleted file mode 100644
index c5442696631..00000000000
--- a/keyboards/dz60/keymaps/tarnjotsingh/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# DZ60 ISO Keymap
-
-Custom keymap for UK ISO keyboard layouts.
-This includes 3 different layers.
-
--   Layer 0:
-    -   Standard ISO layout with main modifier key, for accessing layer 1, to the right of the space bar.
--   Layer 1:
-    -   Layer that gives you access to pretty much everything else like the arrow keys.
--   Layer 2;
-    -   Standalone layer only for modifying the lighting on the board. Keys for this purpose are mapped in the locations used by the default dz60 layout.
-    -   You can access this layer by holding MO(1) (next to the space bar) followed by holding MO(2) which where the Left Alt key is positioned.
-
-![dz60-iso-keymap](https://i.imgur.com/UV0t6aL.png)
-
-Make the kaymap for this keyboard (after setting up your build environment):
-
-    make dz60:tarnjotsingh
-
-Then flash it by running:
-
-    make dz60:tarnjotsingh: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/dz60/keymaps/thomasviaud/README.md b/keyboards/dz60/keymaps/thomasviaud/README.md
deleted file mode 100644
index f5bf221a229..00000000000
--- a/keyboards/dz60/keymaps/thomasviaud/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## French ISO Layout
-
-Here is a very simple version of a French ISO Layout (handled by OS).
-Feel free to take this as base for your own layout.
diff --git a/keyboards/dz60/keymaps/thomasviaud/keymap.c b/keyboards/dz60/keymaps/thomasviaud/keymap.c
deleted file mode 100644
index 44b106858f7..00000000000
--- a/keyboards/dz60/keymaps/thomasviaud/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_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_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_CAPS, 						KC_A, 		KC_S, 		KC_D,			KC_F,			KC_G,			KC_H,			KC_J,			KC_K, 		KC_L,			KC_SCLN,	KC_QUOT,  KC_NUHS	,	KC_ENT,
-		KC_LSFT, 	KC_NUBS,	KC_Z, 		KC_X,			KC_C, 		KC_V, 		KC_B, 		KC_N, 		KC_M, 		KC_COMM, 	KC_DOT, 	KC_SLSH, 						KC_RSFT,
-		KC_LCTL, 	KC_LGUI,						KC_LALT, 											KC_SPC, 																KC_RALT, 	KC_RGUI, 					 	MO(1), 		KC_RCTL),
-
-	LAYOUT_60_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_UP, 		_______, 	_______, 	_______, 	_______, 	_______, 	_______, 	_______, 	_______,  _______, _______,	
-		_______, 						KC_LEFT, 	KC_DOWN, 	KC_RIGHT,	_______,	_______,	_______,	_______,	_______, 	_______,	_______,	_______, _______,		_______,
-		_______, 	_______,	RGB_TOG, 	RGB_MOD, 	RGB_HUI, 	RGB_HUD, 	RGB_SAI, 	RGB_SAD, 	RGB_VAI, 	RGB_VAD, 	_______, 	_______, 					 _______,
-		_______, 	_______,						_______, 											QK_BOOT, 																  _______, 	_______, 					 _______, 	_______),
-};
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/weeheavy/README.md b/keyboards/dz60/keymaps/weeheavy/README.md
deleted file mode 100644
index 95a435a13c8..00000000000
--- a/keyboards/dz60/keymaps/weeheavy/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-![DZ60 split spacebar layout image](https://i.imgur.com/EFF7pBN.png)
-
-# weeheavy's DZ60 split spacebar layout
-
-* 2u left shift
-* arrow cluster
-* split spacebar with a center key
-
-## Layouts
-
-The base layout is ANSI QWERTY.
-
-Key sizes (ASCII keyboards below match this scale):
-
-    1u    = 4 chars  = |  |
-    1.25u = 5 chars  = |   |
-    1.5u  = 6 chars  = |    |
-    1.75u = 7 chars  = |     |
-    2u    = 8 chars  = |      |
-    2.25u = 9 chars  = |       |
-    2.75u = 11 chars = |         |
-    6.25u = 25 chars = |                       |
-
-### Layer 0: Base layout
-
-Specialities:
-
-* Arrow cluster
-* FN1: access to layer 1
-* F2: access to layer 2
-
-```
-,----------------------------------------------------------.
-|Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
-|----------------------------------------------------------+
-|Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
-|----------------------------------------------------------+
-|Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
-|----------------------------------------------------------+
-|Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||Sf||↑ ||Dl|
-|----------------------------------------------------------+
-|Ctl||Win||Alt|| Space ||FN1||  Space  ||Al||F2||← ||↓ ||→ |
-`----------------------------------------------------------'
-```
-
-### Layer 1: Utility
-
-Specialities:
-
-* F1-F12 keys when holding FN1
-* Movement cluster on the right hand side
-* Multimedia cluster on the bottom right
-* RGB config on the left hand side
-
-### Layer 2: Config and setup
-
-Specialities:
-
-* Reset key on ESC and backslash location
-* Additional "B" key (a learning from my mistakes)
-
diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
deleted file mode 100644
index 633a0f33111..00000000000
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Make special keycodes more visible
-#define ____ KC_TRNS
-#define XXXX KC_NO
-
-// Layer definition
-#define L0 0
-#define L1 1
-#define L2 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// Base layer - ANSI QWERTY
-[L0] = LAYOUT_all(
-	QK_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, XXXX, 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, XXXX, 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_DEL,
-	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(L1), KC_SPC, KC_RALT, MO(L2), KC_LEFT, KC_DOWN, KC_RIGHT),
-
-// Utility layer - RGB and multimedia control
-[L1] = LAYOUT_all(
-	____, 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_M_K, RGB_M_R, ____, ____, KC_PSCR, ____, KC_PAUS, ____, ____, ____, ____,
-	____, RGB_HUI, RGB_HUD, ____, ____, ____, ____, KC_INS, KC_HOME, KC_PGUP, ____, ____, ____,
-	____, ____, RGB_SAI, RGB_SAD, ____, ____, ____, ____, ____, KC_END, KC_PGDN, ____, KC_MPLY, KC_VOLU, KC_MUTE,
-	____, RGB_VAI, RGB_VAD, ____, ____, ____, ____, ____, KC_MPRV, KC_VOLD, KC_MNXT),
-
-// Setup layer - Reset an additional "b" button
-[L2] = LAYOUT_all(
-	QK_BOOT, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-	KC_B, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, QK_BOOT,
-	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
-
-};
-
diff --git a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/README.md b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/README.md
deleted file mode 100644
index 6ff8d9e67ca..00000000000
--- a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-![DZ60 ANSI with arrow cluster](https://i.imgur.com/hX6rMcm.png)
-
-# weeheavy's DZ60 layout
-
-* Default 2.25 left shift
-* arrow cluster
-
-## Layouts
-
-The base layout is ANSI QWERTY.
-
-Key sizes (ASCII keyboards below match this scale):
-
-    1u    = 4 chars  = |  |
-    1.25u = 5 chars  = |   |
-    1.5u  = 6 chars  = |    |
-    1.75u = 7 chars  = |     |
-    2u    = 8 chars  = |      |
-    2.25u = 9 chars  = |       |
-    2.75u = 11 chars = |         |
-    6.25u = 25 chars = |                       |
-
-### Layer 0: Base layout
-
-Specialities:
-
-* Arrow cluster
-* FN: access to layer 1
-
-```
-,----------------------------------------------------------.
-|Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
-|----------------------------------------------------------+
-|Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
-|----------------------------------------------------------+
-|Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
-|----------------------------------------------------------+
-| Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||  Shift  |
-|----------------------------------------------------------+
-|Ctl||Win||Alt||          Space         |FN||← ||↑ ||↓ ||→ |
-`----------------------------------------------------------'
-```
-
-### Layer 1: Utility
-
-Specialities:
-
-* F1-F12 keys when holding FN
-* Multimedia cluster on the bottom right
-* RGB config on the left hand side
-* Reset key on ESC and backslash location
-* Brightness control top right
-* Additional "B" key (a learning from my mistakes)
diff --git a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
deleted file mode 100644
index 9702baccace..00000000000
--- a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Make special keycodes more visible
-#define ____ KC_TRNS
-#define XXXX KC_NO
-
-// Layer definition
-#define L0 0
-#define L1 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// Base layer - ANSI QWERTY
-[L0] = LAYOUT_all(
-	QK_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, XXXX, 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, XXXX, 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, MO(L1), KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT),
-
-// Utility layer - RGB and multimedia control, reset and additional "b" button
-[L1] = LAYOUT_all(
-	QK_BOOT, 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_B, RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_R, ____, ____, KC_PSCR, ____, KC_PAUS, KC_BRID, KC_BRIU, ____, QK_BOOT,
-	____, RGB_HUI, RGB_HUD, KC_DEL, ____, ____, ____, KC_INS, KC_HOME, KC_PGUP, ____, ____, ____,
-	____, ____, RGB_SAI, RGB_SAD, ____, ____, ____, ____, ____, KC_END, KC_PGDN, KC_MPLY, ____, KC_MUTE, KC_MUTE,
-	____, RGB_VAI, RGB_VAD, ____, ____, ____, ____, KC_MPRV, KC_VOLU, KC_VOLD, KC_MNXT),
-
-};
-
diff --git a/keyboards/dz60/keymaps/zepol_layout/keymap.c b/keyboards/dz60/keymaps/zepol_layout/keymap.c
deleted file mode 100644
index ffa4e133c41..00000000000
--- a/keyboards/dz60/keymaps/zepol_layout/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT(
-		QK_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_NO, 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_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_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO,
-		KC_CAPS, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(2), KC_NO, MO(1), KC_RCTL),
-
-	LAYOUT(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL,
-		KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUSE, KC_HOME, KC_END, KC_INSERT, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	LAYOUT(
-		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
index 361706e5764..14d66caf12a 100644
--- a/keyboards/dztech/duo_s/config.h
+++ b/keyboards/dztech/duo_s/config.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json
index 02776750185..ef5af799be5 100644
--- a/keyboards/dztech/duo_s/info.json
+++ b/keyboards/dztech/duo_s/info.json
@@ -25,6 +25,9 @@
       "rgb_test": true,
       "alternating": true,
       "twinkle": true
+    },
+    "default": {
+      "speed": 15
     }
   },
   "ws2812": {
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index 826e3502ebf..207fccd4f97 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -1,74 +1,74 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, K_14, J_14, L_14 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_14, D_14, F_14 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_14, A_14, C_14 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
 
-    { 0, B_15, A_15, C_15 },
-    { 0, E_13, D_13, F_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, E_15, D_15, F_15 },
-    { 0, H_15, G_15, I_15 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_16, J_16, L_16 }
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb/keymaps/didel/config.h b/keyboards/dztech/dz60rgb/keymaps/didel/config.h
deleted file mode 100644
index 32f04d817a6..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/didel/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-    Keymap for the DZ60RGB keyboard.
-    Copyright (C) 2020  Dimiter Geelen
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define FORCE_NKRO
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 150
diff --git a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c b/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
deleted file mode 100644
index 2147ca8bf8b..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/didel/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    Keymap for the DZ60RGB keyboard.
-    Copyright (C) 2020  Dimiter Geelen
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum didel_layers {
-    _QWERTY,
-    _MEDIA,
-    _RGB,
-    _DVORAK,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(
-        QK_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_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,
-        CTL_T(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,
-        LSFT_T(KC_GRAVE), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),
-        KC_LCTL, LM(1, MOD_LALT), KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_MEDIA] = LAYOUT(
-        TO(3), 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_PWR,
-        _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EE_CLR,
-        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
-        _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-
-    [_RGB] = 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_DEL,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, EE_CLR,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    [_DVORAK] = LAYOUT(
-        KC_DLR, KC_AMPR, KC_LBRC, KC_LCBR, KC_RCBR, KC_LPRN, KC_EQL, KC_ASTR, KC_RPRN, KC_PLUS, KC_RBRC, KC_EXLM, KC_HASH, KC_BSPC,
-        KC_TAB, KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_AT, KC_BSLS,
-        KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT,
-        KC_LSFT, KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, RSFT_T(KC_Z), KC_UP, KC_DEL,
-        KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TO(0), KC_LEFT, KC_DOWN, KC_RGHT
-    )
-};
diff --git a/keyboards/dztech/dz60rgb/keymaps/didel/rules.mk b/keyboards/dztech/dz60rgb/keymaps/didel/rules.mk
deleted file mode 100644
index 23a7632433d..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/didel/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-NKRO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
deleted file mode 100644
index 6ad73f6edf4..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
-
-#define PERMISSIVE_HOLD
-
-#define TAP_HOLD_CAPS_DELAY 0
-#define USB_POLLING_INTERVAL_MS 1
-
-// some speed shit
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif // !NO_DEBUG
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#define NO_PRINT
-#endif // !NO_PRINT
-
-#define NO_ACTION_ONESHOT
-#define QUICK_TAP_TERM 0
-
-// #include "config_led.h"
-// #include "dz60rgb.h"
-#undef DISABLE_RGB_MATRIX_SPLASH
-#undef DISABLE_RGB_MATRIX_MULTISPLASH
-#undef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#undef RGB_MATRIX_DEFAULT_MODE
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#undef ENABLE_RGB_MATRIX_SOLID_COLOR
-#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_SAT
-#undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_MULTISPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c b/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
deleted file mode 100644
index 711d8687baa..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_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,    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_UP,   LT(2, KC_DEL),
-        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT,         KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        KC_GRAVE,   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_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
-        _______, _______, _______,                            KC_SPC,                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-    [2] = 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_DEL,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/rules.mk b/keyboards/dztech/dz60rgb/keymaps/kgreulich/rules.mk
deleted file mode 100644
index 8a502e9ee3f..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-NKRO_ENABLE = yes                 # USB Nkey Rollover
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
deleted file mode 100644
index 90627f894f3..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
-
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 150
-
-#define TAP_HOLD_CAPS_DELAY 0
-
-#undef DISABLE_RGB_MATRIX_SPLASH
-#undef DISABLE_RGB_MATRIX_MULTISPLASH
-#undef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#undef RGB_MATRIX_DEFAULT_MODE
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_SAT
-// #undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-// #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// #undef ENABLE_RGB_MATRIX_SPLASH
-// #undef ENABLE_RGB_MATRIX_MULTISPLASH
-// #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// #define RGB_MATRIX_KEYRELEASES
-
-// some speed shit
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif // !NO_DEBUG
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#define NO_PRINT
-#endif // !NO_PRINT
-
-#define NO_ACTION_ONESHOT
-#define QUICK_TAP_TERM 0
-
-// #include "config_led.h"
-// #include "dz60rgb.h"
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
deleted file mode 100644
index e446178b62b..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
+++ /dev/null
@@ -1,324 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-enum dz60rgb_layers {
-	_QWERTY,
-	_FNM,
-	_NAV,
-	_RGB,
-	_FNC
-};
-
-enum dz60rgb_keycodes {
-	REBOOT = SAFE_RANGE,
-	MAS_CRM,
-	MAS_PRP,
-	MAS_RED,
-	MAS_GRN,
-	MAS_BLU,
-	MAS_CYN,
-	MAS_MGT,
-	MAS_YEL,
-	MAS_KEY,
-	MAS_WHT,
-};
-#define _V_V_V_ KC_TRNS
-#define LT_CAPS LT(_NAV, KC_CAPS)
-#define LT_DEL  LT(_RGB, KC_DEL)
-#define MT_SLSH RSFT_T(KC_SLSH)
-#define MT_APP  RALT_T(KC_APP)
-#define LM_LALT LM(_FNM, MOD_LALT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_QWERTY] = LAYOUT(
-		QK_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_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,
-		LT_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,
-		SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MT_SLSH,          KC_UP,   LT_DEL,
-		KC_LCTL, KC_LGUI, LM_LALT,       KC_SPC,                                MT_APP,  MO(_FNC),         KC_LEFT, KC_DOWN, KC_RGHT
-	),
-	[_FNM] = LAYOUT(
-		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-		_______, _______, _V_V_V_,                   _______,                   _______, _______,          _______, _______, _______
-	),
-	[_NAV] = LAYOUT(
-		KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PMNS, KC_PPLS, KC_DEL,
-		_______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PSLS, KC_PSCR, KC_SCRL, KC_INS,
-		_V_V_V_, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, KC_PENT,
-		_______, _______, _______, _______, _______, _______, KC_P0,   KC_P0,   KC_P0,   KC_PDOT, _______,          _______, _______,
-		_______, _______, _______,                   _______,                   _______, _______,          _______, _______, _______
-	),
-	[_RGB] = 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,  _______,
-		_______, RGB_MOD,  RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, MAS_MGT, MAS_BLU, MAS_WHT, RGB_RMOD, RGB_MOD, _______,
-		_______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP, _______, _______,
-		_______, RGB_TOG,  _______, _______, _______, _______, _______, MAS_YEL, MAS_GRN, MAS_CRM, _______,          _______, _V_V_V_,
-		_______, _______,  _______,                   _______,                   _______, _______,          _______, _______, _______
-	),
-	[_FNC] = LAYOUT( // fuck it edition
-		RCTL(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,        AS_TOGG,
-		RCTL(KC_TAB),  RCTL(KC_Q), RCTL(KC_W), RCTL(KC_E), RCTL(KC_R), RCTL(KC_T), RCTL(KC_Y), RCTL(KC_U), RCTL(KC_I),    RCTL(KC_O),   RCTL(KC_P),    RCTL(KC_LBRC), RCTL(KC_RBRC), RCTL(KC_BSLS),
-		RCTL(KC_CAPS), RCTL(KC_A), RCTL(KC_S), RCTL(KC_D), RCTL(KC_F), RCTL(KC_G), RCTL(KC_H), RCTL(KC_J), RCTL(KC_K),    RCTL(KC_L),   RCTL(KC_SCLN), RCTL(KC_QUOT), RCTL(KC_ENT),
-		RCTL(KC_LSFT), RCTL(KC_Z), RCTL(KC_X), RCTL(KC_C), RCTL(KC_V), REBOOT,     RCTL(KC_N), RCTL(KC_M), RCTL(KC_COMM), RCTL(KC_DOT), RCTL(KC_SLSH),                KC_VOLU, RCTL(KC_DEL),
-		RCTL(KC_LCTL), RCTL(KC_LGUI), RCTL(KC_LALT),                   RCTL(KC_SPC),                       KC_MUTE,       _V_V_V_,                     RCTL(KC_LEFT), KC_VOLD, RCTL(KC_RGHT)
-	),
-	/*
-	[_FNC] = 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,  AS_TOGG,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, REBOOT,  _______, _______, _______, _______, RCTL(KC_SLSH),    KC_VOLU, RCTL(KC_DEL),
-		_______, _______, _______,                   _______,                   KC_MUTE, _______,    RCTL(KC_LEFT), KC_VOLD, RCTL(KC_RGHT)
-	),
-	[_LAYER] = LAYOUT(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-		_______, _______, _______,                   _______,                   _______, _______,          _______, _______, _______
-	),
-	 [_LAYER] = LAYOUT(
-		13,      12,      11,       10,      9,       8,       7,       6,       5,       4,       3,       2,       1,       0,
-		27,      26,      25,       24,      23,      22,      21,      20,      19,      18,      17,      16,      15,      14,
-		40,      39,      38,       37,      36,      35,      34,      33,      32,      31,      30,      29,      28,
-		53,      52,      51,       50,      49,      48,      47,      46,      45,      44,      43,               42,      41,
-		62,      61,      60,                         59,                        58,      57,               56,      55,      54
-	),
-	*/
-};
-
-bool rgb_matrix_indicators_user(void) {
-	led_t led_state = host_keyboard_led_state();
-
-	if (!g_suspend_state && rgb_matrix_config.enable) {
-		switch (get_highest_layer(layer_state)) {
-		case _NAV:
-			if (led_state.num_lock) {
-				rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
-				rgb_matrix_set_color(19, 0xFF, 0xFF, 0x00);
-			} else {
-				rgb_matrix_set_color(13, 0x00, 0x00, 0x00);
-				rgb_matrix_set_color(19, 0xFF, 0x00, 0x00);
-			}
-
-			rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF); // layer indicator
-			// ESDF
-			rgb_matrix_set_color(24, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(38, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(36, 0xFF, 0x00, 0x00);
-			// home/end
-			rgb_matrix_set_color(25, 0x00, 0xFF, 0x00);
-			rgb_matrix_set_color(23, 0x00, 0xFF, 0x00);
-			// pgup/dn
-			rgb_matrix_set_color(26, 0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(39, 0x00, 0x00, 0xFF);
-			// numpad
-			rgb_matrix_set_color(6,  0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(5,  0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(4,  0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(20, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(18, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(33, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(32, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(31, 0xFF, 0xFF, 0x00);
-			// zero
-			rgb_matrix_set_color(47, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(46, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(45, 0xFF, 0x00, 0x00);
-			// dot
-			rgb_matrix_set_color(44, 0x00, 0x00, 0xFF);
-			// math shit
-			rgb_matrix_set_color(3,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(2,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(1,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(0,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(17, 0x00, 0x00, 0xFF);
-			// other
-			rgb_matrix_set_color(16, 0xFF, 0xFF, 0xFF);
-			rgb_matrix_set_color(15, 0xFF, 0xFF, 0xFF);
-			rgb_matrix_set_color(14, 0xFF, 0xFF, 0xFF);
-			break;
-
-		case _RGB: {
-			HSV hsv = { rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v };
-			HSV hui = hsv;
-			HSV hud = hsv;
-			HSV sai = hsv;
-			HSV sad = hsv;
-			HSV vai = hsv;
-			HSV vad = hsv;
-			hui.h = hsv.h + 8;
-			hud.h = hsv.h - 8;
-			sai.s = hsv.s + 16 > 255 ? 255 : hsv.s + 16;
-			sad.s = hsv.s - 16 < 0   ?   0 : hsv.s - 16;
-			vai.v = hsv.v + 16 > 255 ? 255 : hsv.v + 16;
-			vad.v = hsv.v - 16 < 0   ?   0 : hsv.v - 16;
-			RGB rgb = hsv_to_rgb(hsv);
-			RGB rgbHUI = hsv_to_rgb(hui);
-			RGB rgbHUD = hsv_to_rgb(hud);
-			RGB rgbSAI = hsv_to_rgb(sai);
-			RGB rgbSAD = hsv_to_rgb(sad);
-			RGB rgbVAI = hsv_to_rgb(vai);
-			RGB rgbVAD = hsv_to_rgb(vad);
-			rgb_matrix_set_color(41, 0xFF, 0xFF, 0xFF); // layer indicator
-			rgb_matrix_set_color(59, rgb.r, rgb.g, rgb.b); // color indicator
-			rgb_matrix_set_color(26, 0xFF, 0x80, 0x00); //MOD
-			rgb_matrix_set_color(39, 0xFF, 0x80, 0x00); //MOD
-			rgb_matrix_set_color(16, 0xFF, 0x80, 0x00); //RGB_RMOD
-			rgb_matrix_set_color(15, 0xFF, 0x80, 0x00); //MOD
-			rgb_matrix_set_color(52, 0xFF, 0x40, 0x00); //TOG
-			rgb_matrix_set_color(25, 0x80, 0x80, 0x80); //SPI
-			rgb_matrix_set_color(38, 0x80, 0x80, 0x80); //SPD
-			rgb_matrix_set_color(24, rgbHUI.r, rgbHUI.g, rgbHUI.b); //HUI
-			rgb_matrix_set_color(37, rgbHUD.r, rgbHUD.g, rgbHUD.b); //HUD
-			rgb_matrix_set_color(23, rgbSAI.r, rgbSAI.g, rgbSAI.b); //SAI
-			rgb_matrix_set_color(36, rgbSAD.r, rgbSAD.g, rgbSAD.b); //SAD
-			rgb_matrix_set_color(22, rgbVAI.r, rgbVAI.g, rgbVAI.b); //VAI
-			rgb_matrix_set_color(35, rgbVAD.r, rgbVAD.g, rgbVAD.b); //VAD
-			rgb_matrix_set_color(19, 0xF0, 0x00, 0xFF); //MAS_MGT
-			rgb_matrix_set_color(18, 0x00, 0x02, 0xFF); //MAS_BLU
-			rgb_matrix_set_color(33, 0xFF, 0x00, 0x00); //MAS_RED
-			rgb_matrix_set_color(32, 0x00, 0x00, 0x00); //MAS_KEY
-			rgb_matrix_set_color(31, 0x00, 0xFF, 0xF7); //MAS_CYN
-			rgb_matrix_set_color(46, 0xFF, 0xDA, 0x00); //MAS_YEL
-			rgb_matrix_set_color(45, 0x00, 0xFF, 0x01); //MAS_GRN
-			rgb_matrix_set_color(44, 0xFF, 0xA5, 0x18); //MAS_CRM
-			rgb_matrix_set_color(30, 0x81, 0x3C, 0xFF); //MAS_PRP
-			rgb_matrix_set_color(17, 0xFF, 0xFF, 0xFF); //MAS_WHT
-		}
-		break;
-
-		case _FNC:
-			rgb_matrix_set_color(57, 0xFF, 0xFF, 0xFF); // layer indicator
-			rgb_matrix_set_color(48, 0xFF, 0x00, 0x00); // bootloader
-			rgb_matrix_set_color(42, 0x00, 0x80, 0xFF); // vol
-			rgb_matrix_set_color(55, 0x00, 0x80, 0xFF);
-			rgb_matrix_set_color(58, 0xFF, 0x00, 0x00); // mute
-			rgb_matrix_set_color(56, 0xFF, 0x80, 0x00); // ctrl+left/right
-			rgb_matrix_set_color(54, 0xFF, 0x80, 0x00);
-			rgb_matrix_set_color(41, 0xFF, 0x00, 0x40); // ctrl+delete
-			rgb_matrix_set_color(43, 0xFF, 0x00, 0x40); // ctrl+slash
-
-			break;
-		}
-	}
-
-	if (led_state.caps_lock) {
-		rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
-	}
-    return false;
-}
-
-void matrix_init_user(void)
-{
-	//user initialization
-	autoshift_disable();
-}
-
-void matrix_scan_user(void)
-{
-	//user matrix
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record)
-{
-	static uint32_t key_timer;
-
-	switch (keycode) {
-	case REBOOT:
-		if (record->event.pressed) {
-			key_timer = timer_read32();
-		} else {
-			if (timer_elapsed32(key_timer) >= 500) {
-				rgb_matrix_enable_noeeprom();
-				rgb_matrix_mode_noeeprom(1);
-				rgb_matrix_sethsv_noeeprom(11, 11, 11);
-				wait_ms(150);
-				reset_keyboard();
-			} else {
-				register_code(KC_RCTL);
-				tap_code(KC_B);
-				unregister_code(KC_RCTL);
-			}
-		}
-
-		return false;
-
-	case MAS_CRM:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(32, 160, 255);
-		}
-
-		return false;
-
-	case MAS_PRP:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(192, 112, 255);
-		}
-
-		return false;
-
-	case MAS_RED:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(0, 255, 255);
-		}
-
-		return false;
-
-	case MAS_GRN:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(88, 255, 255);
-		}
-
-		return false;
-
-	case MAS_BLU:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(168, 255, 255);
-		}
-
-		return false;
-
-	case MAS_CYN:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(128, 255, 255);
-		}
-
-		return false;
-
-	case MAS_MGT:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(216, 255, 255);
-		}
-
-		return false;
-
-	case MAS_YEL:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(40, 255, 255);
-		}
-
-		return false;
-
-	case MAS_KEY:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(0, 0, 0);
-		}
-
-		return false;
-
-	case MAS_WHT:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(128, 0, 255);
-		}
-
-		return false;
-
-	default:
-		return true;
-	}
-}
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk
deleted file mode 100644
index e2618e52906..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-NKRO_ENABLE = yes                 # USB Nkey Rollover
-AUTO_SHIFT_ENABLE = yes      # Auto Shift
-# VELOCIKEY_ENABLE = yes
-
-LTO_ENABLE = yes
-
-# SRC += dz60rgb.c
diff --git a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/README.md b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/README.md
deleted file mode 100644
index cda042db064..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Mechmaster48 keymap
-
--Personal keyboard layout
--Mainly following the default layout.
--Picture of the map below with 3 total layers 0-2
--More to come as I figure QMK out
-
-## Layer 0
-![alt text](https://i.imgur.com/yi8BCCf.gif)
-
-## Layer 1
-![alt text](https://i.imgur.com/aG2cCn9.gif)
-
-## Layer 2
-![alt text](https://i.imgur.com/79RAh1G.gif)
\ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
deleted file mode 100644
index 743d9188b07..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/mechmaster48/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright 2021 MechMaster48 admin@mechbox.net
-
-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 is just a diagram that makes it easier for me to see what keys I have bound and where.
--The README has a better image to see the exact keymap.
-
---Layer 0--
-  _________________________________________________________________________________________________
- |[esc]            [1!]-[2@]-[3#]-[4$]-[5%]-[6^]-[7&]-[8*]-[9(]-[0)]-[-_]-[+=]      [  BackSpace  ]|
- |[ Tab ]               [Q]-[W]-[E]-[R]-[T]-[Y]-[U]-[I]-[O]-[P]-[[{]-[]}]                    [ |\ ]|
- |[CapsLock]             [A]-[S]-[D]-[F]-[G]-[H]-[J]-[K]-[L]-[;/:]-['/"]                    [Enter]|
- |[ Shift ]               [Z]-[X]-[C]-[V]-[B]-[N]-[M]-[</,]-[>/.]-[?//]                    [↑][del]|
- |[ctrl][win][alt]        [____________________SPACE__________________][fn/OSL(1)][ctrl][←][↓][→]  |
- |_________________________________________________________________________________________________|
-
-
-
-
---Layer 1--
-  _____________________________________________________________________________________
- |[TO(2)]    [F1]-[F2]-[F3]-[F4]-[F5]-[F6]-[F7]-[F8]-[F9]-[F10]-[F11]-[F12]   [   ▼   ]|
- |[ ▼ ]        [~]-[▼]-[▼]-[▼]-[▼]-[▼]-[PS]-[▼]-[▼]-[▼]-[play/pause]-[▼]      [ QK_BOOT ]|
- |[    ▼    ]        [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[PU]-[▼]-[▼]               [  ▼  ]|
- |[ Shift ]            [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[PD]-[▼]           [vol↑]  [ ▼ ]|
- |[ctrl][ ▼ ][alt]    [_________________▼________________] [▼][ ▼ ][←prvs][vol↓][next→]|
- |_____________________________________________________________________________________|
-
-
-
---Layer 2--
-  _________________________________________________________________________________________________
- |[ ▼ ]                   [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]             [     ▼     ]| 
- |[ ▼ ]     [RGBTgg]-[▼]-[Hue+]-[Hue-]-[Sat+]-[Sat-]-[Brt+]-[Brt-]-[RGBmd]-[▼]-[▼]-[▼]    [ QK_BOOT ]| 
- |[    ▼    ]              [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]                      [  ▼  ]| 
- |[   ▼   ]                  [▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]-[▼]                 [  ▼  ][  ▼  ]| 
- |[  ▼  ][ ▼ ][▼]             [_______________TO(0)________________] [▼][ ▼ ] [  ▼  ][  ▼  ][  ▼  ]| 
- |_________________________________________________________________________________________________|
-
-*/
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        QK_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_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,
-        CTL_T(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,  RSFT_T(KC_SLSH), KC_UP,   LT(2, KC_DEL),
-        KC_LCTL,        KC_LGUI, KC_LALT,                           KC_SPC,                    OSL(1), KC_RCTL,           KC_LEFT,         KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        TO(2),   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_GRV, _______, _______, _______, _______, _______, KC_PSCR, _______,  _______, _______, KC_MPLY, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, KC_VOLU, KC_MUTE,
-        KC_LCTL, _______, KC_LALT,                            TO(0),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-    [2] = LAYOUT(
-        _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EE_CLR,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            TO(0),                   _______, _______, _______, _______, _______
-    )
-};
\ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
deleted file mode 100644
index 52b7643850e..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ /dev/null
@@ -1,154 +0,0 @@
-#include QMK_KEYBOARD_H
-#define _LAYER0 0
-#define _LAYER1 1
-#define _LAYER2 2
-#define _LAYER3 3
-#define _LAYER4 4
-#define _LAYER5 5
-#define _LAYER6 6
-#define _LAYER7 7
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_LAYER0] = LAYOUT( /* MAC */
-		QK_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_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,
-		CTL_T(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,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL),
-		KC_LCTL,  KC_LALT,  KC_LGUI,                KC_SPC,                KC_RGUI,  MO(1)  , KC_LEFT,         KC_DOWN,           KC_RGHT),
-	[_LAYER1] = LAYOUT( /* FN */
-		TO(3),    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,
-		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  LGUI(LSFT(KC_5)),   KC_SCRL,  KC_PAUS,  _______,  _______,   QK_BOOT,
-		_______,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_EJCT,  _______,  KC_ASTR,  KC_PSLS,  KC_HOME,  KC_PGUP,  _______,  _______,  _______,  _______,
-		_______,  _______,  _______,  _______,  _______,  KC_PPLS,  KC_PMNS,  KC_END,   KC_PGDN,  MO(5),              KC_MPLY,            _______,
-		_______,  _______,  _______,                      TO(4),                        _______,  _______, KC_MPRV,   KC_MSTP,            KC_MFFD),
-	[_LAYER2] = LAYOUT( /* LIGHT */
-    RGB_TOG,    RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW, RGB_M_SN, RGB_M_K,  RGB_M_X,  RGB_M_G,  _______,    _______,    _______,    _______,    _______,
-		_______,    RGB_HUD,  RGB_HUI,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-		_______,    RGB_SAD,  RGB_SAI,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,
-		_______,    RGB_VAD,  RGB_VAI,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    RGB_MOD,                _______,
-		_______,    _______,  _______,                          _______,                            _______,    _______,    RGB_SPD,    RGB_RMOD,               RGB_SPI),
-	[_LAYER3] = LAYOUT( /* NUMPAD */
-		KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,      _______,    _______,    _______,    _______,    KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,  _______,
-		_______,    KC_P7,    KC_P8,    KC_P9,    _______,    _______,    _______,    _______,    KC_P7,    KC_P8,    KC_P9,    _______,    _______,    TO(0),
-		_______,    KC_P4,    KC_P5,    KC_P6,    _______,    _______,    _______,    _______,    KC_P4,    KC_P5,    KC_P6,    _______,              KC_PENT,
-		_______,    KC_P1,    KC_P2,    KC_P3,    _______,    _______,    _______,    _______,    KC_P1,    KC_P2,    KC_P3,    _______,              _______,
-		_______,    KC_P0,    KC_PDOT,                        KC_ENT,                             KC_P0,    KC_PDOT,  _______,  _______,              _______),
-	[_LAYER4] = LAYOUT( /* WIN */
-		QK_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_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,
-		CTL_T(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,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL),
-		KC_LCTL,  KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,  MO(5)  , KC_LEFT,         KC_DOWN,           KC_RIGHT),
-	[_LAYER5] = LAYOUT( /* FN */
-		_______,  KC_BRID,  KC_BRIU, LCTL(KC_UP), LSFT(KC_F12),     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
-		_______,  _______,  KC_UP,    _______,  _______,  _______,  KC_CALC,  _______,  KC_INS,   _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT,
-		_______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,            _______,
-		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN, KC_VOLU,           KC_MUTE,
-		_______,  _______,  _______,                      TO(0),                        _______,  _______,  KC_MPRV,  KC_VOLD,            KC_MNXT),
-}
-;
-
-
-
-void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-  for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-    if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-        rgb_matrix_set_color( i, red, green, blue );
-    }
-  }
-}
-
-bool rgb_matrix_indicators_user(void) {
-	led_t led_state = host_keyboard_led_state();
-
-	if (!g_suspend_state && rgb_matrix_config.enable) {
-		switch (get_highest_layer(layer_state)) {
-		case _LAYER1:
-			rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
-
-		case _LAYER2:
-			rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
-
-		case _LAYER4:
-			rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
-		}
-	}
-
-	if (led_state.caps_lock) {
-		rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
-	}
-
-	switch (get_highest_layer(layer_state)) {
-	case _LAYER3:
-		if (led_state.num_lock) {
-			rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
-		} else {
-			rgb_matrix_set_color(13, 0x00, 0x00, 0x00);
-		}
-
-		rgb_matrix_set_color(0, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(1, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(1, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(2, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(3, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(4, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(5, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(6, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(7, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(8, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(9, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(10, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(11, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(12, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(14, 0x00, 0x00, 0xFF);
-		rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(17, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(18, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(19, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(20, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(21, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(22, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(23, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(24, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(25, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(26, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(27, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(28, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(29, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(30, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(31, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(32, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(33, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(34, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(35, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(36, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(37, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(38, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(39, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(40, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(41, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(42, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(43, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(44, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(45, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(46, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(47, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(48, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(49, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(50, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(51, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(52, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(53, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(54, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(55, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(56, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(57, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(58, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(59, 0xFF, 0x00, 0x00);
-		rgb_matrix_set_color(60, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(61, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
-		break;
-	}
-    return false;
-}
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/readme.md b/keyboards/dztech/dz60rgb/keymaps/mekanist/readme.md
deleted file mode 100644
index e85200457e3..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/readme.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# mekanist keymap instructions
-
-## Dev Environment setup (macOS)
-
-1. Install Homebrew by copy pasting the following into a terminal:
-    ```
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-    ```
-
-2. Refer to the [QMK macOS Instructions](https://github.com/qmk/qmk_firmware/blob/master/docs/getting_started_build_tools.md#macos) and install the list of tools using the `brew` command in terminal. 
-
-3. While in terminal, issue the following command within the directory you wish to clone qmk_firmware in. 
-
-    ```
-    git clone https://github.com/qmk/qmk_firmware.git
-    ```
-
-## Creating the mekanist dz60rgb firmware file
-
-1. While in the `qmk_firmware` directory, issue the following command
-
-    ```
-    make git-submodule
-    ```
-
-    This will download the chibi-os submoduled needed to create firmware for ARM based boards such as the dz60rgb. 
-
-2. While in the `qmk_firmware` directory, issue the followng command
-
-    ```
-    make dztech/dz60rgb:mekanist
-    ```
-
-    This will result in a file called `dztech_dz60rgb_mekanist.bin` that you can flash onto your board using QMK Toolbox. 
diff --git a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c b/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
deleted file mode 100644
index c4a9a2b588f..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/perseid/keymap.c
+++ /dev/null
@@ -1,132 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QWERTY,
-    _FNM
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE
-};
-
-#define FNM MO(_FNM)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_QWERTY] = LAYOUT( /* Base */
-		QK_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_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_GRV,   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_UP,             KC_DEL,
-		KC_LCTL,  KC_LALT,  KC_LGUI,                KC_SPC,                FNM,     KC_RALT,  KC_LEFT,    KC_DOWN,           KC_RIGHT),
-	[_FNM] = LAYOUT( /* FN */
-		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_DEL,
-		KC_TRNS,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI,  RGB_SAD,  RGB_VAI, RGB_VAD,  KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, QK_BOOT,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, RGB_SPI,  RGB_SPD, KC_HOME, KC_PGUP,    EE_CLR,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_END,  KC_PGDN, KC_VOLU,    KC_MUTE,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_TRNS,                     KC_TRNS,  KC_TRNS, KC_MPRV, KC_VOLD,    KC_MNXT)
-};
-
-void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-  for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-    if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-        rgb_matrix_set_color( i, red, green, blue );
-    }
-  }
-}
-
-bool rgb_matrix_indicators_user(void) {
-	if (!g_suspend_state) {
-		switch (get_highest_layer(layer_state)) {
-		case _QWERTY:
-			rgb_matrix_layer_helper(0x00, 0x0F, 0xFF); break;
-
-		case _FNM:
-			rgb_matrix_layer_helper(0xF0, 0x00, 0xFF); break;
-		}
-	}
-
-	switch (get_highest_layer(layer_state)) {
-	case _FNM:
-		rgb_matrix_set_color(0, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(1, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(1, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(2, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(3, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(4, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(5, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(6, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(7, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(8, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(9, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(10, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(11, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(12, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(14, 0x00, 0x00, 0xFF);
-		rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(17, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(18, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(19, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(20, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(21, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(22, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(23, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(24, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(25, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(26, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(27, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(28, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(29, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(30, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(31, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(32, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(33, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(34, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(35, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(36, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(37, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(38, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(39, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(40, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(41, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(42, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(43, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(44, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(45, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(46, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(47, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(48, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(49, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(50, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(51, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(52, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(53, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(54, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(55, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(56, 0x00, 0x00, 0x00);
-		rgb_matrix_set_color(57, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(58, 0x00, 0xFF, 0x00);
-		rgb_matrix_set_color(59, 0xFF, 0x00, 0x00);
-		rgb_matrix_set_color(60, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(61, 0xFF, 0xFF, 0x00);
-		rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
-		break;
-	}
-    return false;
-}
-
-
-void matrix_init_user(void)
-{
-	//user initialization
-}
-
-void matrix_scan_user(void)
-{
-	//user matrix
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record)
-{
-	return true;
-}
diff --git a/keyboards/dztech/dz60rgb/keymaps/perseid/readme.md b/keyboards/dztech/dz60rgb/keymaps/perseid/readme.md
deleted file mode 100644
index a4fd04f63da..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/perseid/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# My Personal Keymap for the dz60rgb
-
-This is for the one with the arrows. Not very many changes.
-
-* I don't use the capslock - so that's the grave key
-* Escape is now GESC
-* Alt and Cmd are swapped - cause I use a Mac
diff --git a/keyboards/dztech/dz60rgb/keymaps/piv3rt/config.h b/keyboards/dztech/dz60rgb/keymaps/piv3rt/config.h
deleted file mode 100644
index bdc2a1a057a..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/piv3rt/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-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 FORCE_NKRO
-#define TAPPING_TERM 100
-
-#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_SAT
-#undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-//#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_MULTISPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c b/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
deleted file mode 100644
index abb2c07885a..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/piv3rt/keymap.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-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 LT_DEL  LT(_RGB, KC_DEL)
-#define LT_CAPS LT(_FNC, KC_CAPS)
-#define LM_LALT LM(_FNC, MOD_LALT)
-#define LM_NALT LM(_NUM, MOD_LALT)
-#define RSFT_SL RSFT_T(KC_SLSH)
-#define RALT_F6 RALT_T(KC_F6)
-#define CTLINS  LCTL(KC_INS)     // Ctrl + Insert (terminal copy)
-#define SFTINS  LSFT(KC_INS)     // Shift + Insert (terminal paste)
-#define AMDREP  LCTL(LSFT(KC_S)) // AMD Replay
-#define AMDREC  LCTL(LSFT(KC_E)) // AMD Record
-
-enum piv3rt_layers {
-    _DEF,
-    _MAC,
-    _FNC,
-    _RGB,
-    _NUM,
-};
-
-enum piv3rt_keycodes {
-    RGB_RST = SAFE_RANGE,
-    RGB_PCY, // Cycle through RGB profiles
-    RGB_000, // Turn everything off except profiles
-    EACUTE,  // French É for Windows
-    CCED,    // French Ç for Windows
-    AGRAVE,  // French À for Windows
-    FRQLT,   // French ≪ for Windows
-    FRQGT,   // French ≫ for Windows
-};
-
-enum piv3rt_rgbprofiles {
-    CSGO,
-    TEXT,
-    OFF, // Should be the last item
-};
-
-enum piv3rt_rgbprofiles current_profile = OFF;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_DEF] = LAYOUT(
-        QK_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_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,
-        LT_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,   RSFT_SL,  KC_UP,   LT_DEL,
-        KC_LCTL, KC_LGUI,  LM_LALT,                            KC_SPC,                    RALT_F6, MO(_FNC), KC_LEFT,  KC_DOWN, KC_RGHT
-    ),
-    [_MAC] = LAYOUT(
-        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______,
-        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______,
-        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,           _______,
-        _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______,
-        KC_LGUI, KC_LCTL,  KC_LGUI,                            _______,                   _______, _______,  _______,  _______, _______
-    ),
-    [_FNC] = 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_DEL,
-        _______, AGRAVE,   KC_UP,   EACUTE,  _______, KC_INS,  _______, _______, KC_UP,   KC_UP,   KC_PGUP,  KC_HOME,  KC_PSCR, KC_NUBS,
-        _______, KC_HOME,  KC_DOWN, KC_END,  CTLINS,  SFTINS,  _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  KC_END,            KC_F8,
-        _______,           _______, KC_CALC, CCED,    _______, _______, _______, _______, FRQLT,   FRQGT,    TG(_NUM), KC_VOLU, KC_MUTE,
-        _______, TG(_MAC), LM_NALT,                            _______,                   KC_MPLY, _______,  KC_MPRV,  KC_VOLD, KC_MNXT
-    ),
-    [_RGB] = 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_DEL,
-        _______, RGB_TOG,  _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______,  _______,  _______, QK_BOOT,
-        _______, _______,  _______, _______, _______, RGB_PCY, _______, _______, RGB_SPI, RGB_SPD, _______,  _______,           EE_CLR,
-        _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  RGB_000, _______,
-        _______, _______,  _______,                            RGB_RST,                   _______, _______,  KC_PWR,   AMDREC,  AMDREP
-    ),
-    [_NUM] = LAYOUT(
-        KC_NUM,  _______,  _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,    _______,  _______, _______,
-        _______, _______,  _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,    _______,  _______, _______,
-        _______, _______,  _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,    KC_PENT,           KC_PENT,
-        _______,           _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT,  TG(_NUM), _______, _______,
-        _______, _______,  _______,                            KC_PENT,                   _______, _______,  _______,  _______, _______
-    ),
-};
-
-void reset_leds(void) {
-    current_profile = OFF;
-    rgb_matrix_enable();
-    rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
-    rgb_matrix_sethsv(0x6a, 0x33, 0xff);
-}
-
-void suspend_wakeup_init_user(void) {
-    current_profile = OFF;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case RGB_RST:
-        if (record->event.pressed) {
-            reset_leds();
-        }
-        return false;
-        break;
-    case RGB_PCY:
-        if (record->event.pressed) {
-            // Cycle through RGB profiles
-            current_profile = current_profile == OFF ? 0 : current_profile + 1;
-        }
-        return false;
-        break;
-    case RGB_000:
-        if (record->event.pressed) {
-            rgb_matrix_sethsv(0, 0, 0);
-        }
-        return false;
-        break;
-    case EACUTE:
-        if (record->event.pressed) {
-            SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P0) SS_TAP(X_P2) SS_TAP(X_P0) SS_TAP(X_P1) SS_UP(X_LALT));
-        }
-        return false;
-        break;
-    case CCED:
-        if (record->event.pressed) {
-            SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P0) SS_TAP(X_P1) SS_TAP(X_P9) SS_TAP(X_P9) SS_UP(X_LALT));
-        }
-        return false;
-        break;
-    case AGRAVE:
-        if (record->event.pressed) {
-            SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P0) SS_TAP(X_P1) SS_TAP(X_P9) SS_TAP(X_P2) SS_UP(X_LALT));
-        }
-        return false;
-        break;
-    case FRQLT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P7) SS_TAP(X_P4) SS_UP(X_LALT));
-        }
-        return false;
-        break;
-    case FRQGT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P7) SS_TAP(X_P5) SS_UP(X_LALT));
-        }
-        return false;
-        break;
-    }
-    return true;
-};
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    led_t led_state = host_keyboard_led_state();
-
-    if (led_state.caps_lock) {
-        // Tab key = 27
-        RGB_MATRIX_INDICATOR_SET_COLOR(27, 0xff, 0x00, 0x00);
-    }
-
-    if (led_state.num_lock && (layer_state_is(_FNC) || layer_state_is(_NUM))) {
-        // ESC key = 13
-        RGB_MATRIX_INDICATOR_SET_COLOR(13, 0xff, 0x55, 0x55);
-    }
-
-    if (layer_state_is(_NUM)) {
-        // Num pad
-        for (int i=0; i<3; i++) {
-            RGB_MATRIX_INDICATOR_SET_COLOR(3 + i, 0xff, 0x55, 0x55);
-            RGB_MATRIX_INDICATOR_SET_COLOR(17 + i, 0xff, 0x55, 0x55);
-            RGB_MATRIX_INDICATOR_SET_COLOR(30 + i, 0xff, 0x55, 0x55);
-        }
-        RGB_MATRIX_INDICATOR_SET_COLOR(43, 0xff, 0x00, 0x00);
-        return;
-    }
-
-    if (layer_state_is(_RGB)) {
-        // AMD record and replay
-        RGB_MATRIX_INDICATOR_SET_COLOR(54, 0x00, 0xff, 0x00);
-        RGB_MATRIX_INDICATOR_SET_COLOR(55, 0xff, 0x00, 0x00);
-    }
-
-    if (current_profile == CSGO) {
-        // Moves
-        RGB_MATRIX_INDICATOR_SET_COLOR(25, 0xff, 0x00, 0x00);
-        RGB_MATRIX_INDICATOR_SET_COLOR(39, 0xff, 0x00, 0x00);
-        RGB_MATRIX_INDICATOR_SET_COLOR(38, 0xff, 0x00, 0x00);
-        RGB_MATRIX_INDICATOR_SET_COLOR(37, 0xff, 0x00, 0x00);
-
-        // Grenades
-        RGB_MATRIX_INDICATOR_SET_COLOR(4, 0x00, 0xff, 0x00);
-        RGB_MATRIX_INDICATOR_SET_COLOR(3, 0xff, 0x66, 0x00);
-        RGB_MATRIX_INDICATOR_SET_COLOR(2, 0x66, 0x66, 0x22);
-        RGB_MATRIX_INDICATOR_SET_COLOR(1, 0xff, 0xff, 0xff);
-
-        // Primary
-        RGB_MATRIX_INDICATOR_SET_COLOR(18, 0xff, 0x00, 0x00);
-        RGB_MATRIX_INDICATOR_SET_COLOR(17, 0x99, 0x33, 0x00);
-        RGB_MATRIX_INDICATOR_SET_COLOR(16, 0x00, 0xff, 0x00);
-
-        // Secondary
-        RGB_MATRIX_INDICATOR_SET_COLOR(32, 0x66, 0x66, 0x22);
-        RGB_MATRIX_INDICATOR_SET_COLOR(31, 0x00, 0x00, 0xff);
-
-        // Equipment
-        RGB_MATRIX_INDICATOR_SET_COLOR(30, 0xff, 0x00, 0xff);
-        RGB_MATRIX_INDICATOR_SET_COLOR(29, 0x00, 0x00, 0xff);
-        RGB_MATRIX_INDICATOR_SET_COLOR(28, 0x33, 0x66, 0x99);
-        RGB_MATRIX_INDICATOR_SET_COLOR(0, 0x33, 0x66, 0x99);
-    } else if (current_profile == TEXT) {
-        // Letters
-        for (int i=0; i<7; i++) {
-            RGB_MATRIX_INDICATOR_SET_COLOR(17 + i, 0x33, 0x66, 0x99);
-            RGB_MATRIX_INDICATOR_SET_COLOR(31 + i, 0x33, 0x66, 0x99);
-            RGB_MATRIX_INDICATOR_SET_COLOR(46 + i, 0x33, 0x66, 0x99);
-        }
-        RGB_MATRIX_INDICATOR_SET_COLOR(38, 0x33, 0x66, 0x99);
-        RGB_MATRIX_INDICATOR_SET_COLOR(39, 0x33, 0x66, 0x99);
-        RGB_MATRIX_INDICATOR_SET_COLOR(24, 0x33, 0x66, 0x99);
-        RGB_MATRIX_INDICATOR_SET_COLOR(25, 0x33, 0x66, 0x99);
-        RGB_MATRIX_INDICATOR_SET_COLOR(26, 0x33, 0x66, 0x99);
-    }
-    return false;
-}
diff --git a/keyboards/dztech/dz60rgb/keymaps/piv3rt/rules.mk b/keyboards/dztech/dz60rgb/keymaps/piv3rt/rules.mk
deleted file mode 100644
index 23a7632433d..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/piv3rt/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-NKRO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
deleted file mode 100644
index d981df82ed8..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
-
-#undef DISABLE_RGB_MATRIX_SPLASH
-#undef DISABLE_RGB_MATRIX_MULTISPLASH
-#undef DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #undef ENABLE_RGB_MATRIX_BREATHING
-// #undef ENABLE_RGB_MATRIX_BAND_SAT
-// #undef ENABLE_RGB_MATRIX_BAND_VAL
-// #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-// #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-// #undef ENABLE_RGB_MATRIX_CYCLE_ALL
-// #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-// #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-// #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-// #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-// #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-// #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-// #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-// #undef ENABLE_RGB_MATRIX_DUAL_BEACON
-// #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #undef ENABLE_RGB_MATRIX_RAINDROPS
-// #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// #undef ENABLE_RGB_MATRIX_SPLASH
-// #undef ENABLE_RGB_MATRIX_MULTISPLASH
-// #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// #define RGB_MATRIX_KEYRELEASES
-
-#define NO_ACTION_ONESHOT
-#define QUICK_TAP_TERM 0
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c b/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
deleted file mode 100644
index 905ec1b531e..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include QMK_KEYBOARD_H
-#define _LAYER0 0
-#define _LAYER1 1
-#define _LAYER2 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_LAYER0] = LAYOUT(QK_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_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, RSFT_T(KC_SLSH), KC_UP, LT(2,KC_DEL),
-							KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
-	[_LAYER1] = LAYOUT(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_DEL,
-							 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-							 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EE_CLR,
-							 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE,
-								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
-	[_LAYER2] = LAYOUT(KC_TRNS, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_DEL,
-								KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_PSLS, KC_PAST, QK_BOOT,
-								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, EE_CLR,
-								KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PDOT, 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/dztech/dz60rgb/keymaps/xunz/readme.md b/keyboards/dztech/dz60rgb/keymaps/xunz/readme.md
deleted file mode 100644
index b18d497adb9..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/readme.md
+++ /dev/null
@@ -1,48 +0,0 @@
-### XuNz Layout
-
-3 Layers
-
-All rgb enable
-
-NKRO enable
-
-### 0 Qwerty
-,-----------------------------------------------------------------------------------------.
-| ` ~ |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-|-----------------------------------------------------------------------------------------+
-| Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-|-----------------------------------------------------------------------------------------+
-| Caps    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-|-----------------------------------------------------------------------------------------+
-| Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |    RSh    |  U  | DEL |
-|-----------------------------------------------------------------------------------------+
-| Ctrl |  Cmd  |  Alt  |              Space                | RAlt | FN  |  L  |  D  |  R  |
-`-----------------------------------------------------------------------------------------'
-
-### 1 FN Layer
-FN + Key
-,-----------------------------------------------------------------------------------------.
-| Esc |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |   reset   |
-|-----------------------------------------------------------------------------------------+
-|       |     |  up |     |     |     |     |     |insert|     | pscr | slck | paus |reset|
-|-----------------------------------------------------------------------------------------+
-|        |left| down |right|     |     |     |     |     |     | home | pgup |   EEP RST  |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |     | end |   pgdn  | vol+ | mute |
-|-----------------------------------------------------------------------------------------+
-|      |       |       |                                 | calc |    | prev | vol- | next |
-`-----------------------------------------------------------------------------------------'
-
-### 2 Del Layer
-Del + Key
-,-----------------------------------------------------------------------------------------.
-| Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  10  |  -  |  +  |    del   |
-|-----------------------------------------------------------------------------------------+
-|        |RBB T|     | Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |     |   /   |  *  | reset|
-|-----------------------------------------------------------------------------------------+
-|         |     |     |     |     |     |     | SPI | SPD |     |     |     |   EEP RST   |
-|-----------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |     |  dot   |       |     |      |
-|-----------------------------------------------------------------------------------------+
-|      |       |       |                                   |     |      |     |     |     |
-`-----------------------------------------------------------------------------------------'
\ No newline at end of file
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/rules.mk b/keyboards/dztech/dz60rgb/keymaps/xunz/rules.mk
deleted file mode 100644
index d12c8dc44ef..00000000000
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-NKRO_ENABLE = yes                 # USB Nkey Rollover
-# VELOCIKEY_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index af726789227..130f99d7b7e 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -1,60 +1,3 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 63
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json
index 0033c3acc7a..8a9801c4f30 100644
--- a/keyboards/dztech/dz60rgb/v1/info.json
+++ b/keyboards/dztech/dz60rgb/v1/info.json
@@ -4,7 +4,55 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3733",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index 2470e7b3f9a..130f99d7b7e 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -1,58 +1,3 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-// #    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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 63
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json
index 4801792d98e..c3e1837dbd3 100644
--- a/keyboards/dztech/dz60rgb/v2/info.json
+++ b/keyboards/dztech/dz60rgb/v2/info.json
@@ -4,7 +4,38 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index 05cfa7d4e12..5d2ea692ed8 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -16,59 +16,4 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-// #    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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 63
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json
index 9028f69d4fb..1d97037c311 100644
--- a/keyboards/dztech/dz60rgb/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb/v2_1/info.json
@@ -4,7 +4,37 @@
         "device_version": "2.1.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations":{
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
index 5c069220285..cdc5148e115 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -1,72 +1,72 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, K_14, J_14, L_14 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_14, D_14, F_14 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_13, A_13, C_13 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
 
-    { 0, B_15, A_15, C_15 },
-    { 0, E_13, D_13, F_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, E_15, D_15, F_15 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_16, J_16, L_16 }
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/config.h b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/config.h
deleted file mode 100644
index 59fc46d260d..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2021 Jesper Nellemann Jakobsen
-  * 
-  * 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 MOUSEKEY_DELAY 0 // default is 300ms
-#define MOUSEKEY_INTERVAL 16 // ~ 60Hz (1/60)
-#define MOUSEKEY_MAX_SPEED 8 // default is 10; the lower interval, the lower this ought to be
-#define MOUSEKEY_TIME_TO_MAX 15 // default is 20
-
-#define MOUSEKEY_WHEEL_DELAY 0 // default is 300ms
-#define MOUSEKEY_WHEEL_INTERVAL 50 // default is 100ms
-#define MOUSEKEY_WHEEL_MAX_SPEED 10 // default is 8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 30 // default is 40
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
deleted file mode 100644
index 6ed31b62bca..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
- /* Copyright 2021 Jesper Nellemann Jakobsen
-  * 
-  * 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 {
-    _BASE,
-    _ARROWS,
-    _HDUE, /* Home, pgDown, pgUp, End */
-    _MOUSE,
-    _FN
-};
-
-/* Custom keys */
-
-/* Word movement/deletetion */
-#define WORD_BK A(KC_LEFT)
-#define WORD_FW A(KC_RIGHT)
-#define D_WORD_BK A(KC_BACKSPACE)
-#define D_WORD_FW A(KC_DELETE)
-/* Fine volume control */
-#define FVOLU S(A(KC_VOLU))
-#define F_VOLD S(A(KC_VOLD))
-/* Multi-purpose keys */
-#define HYPR_CAPS ALL_T(KC_CAPS)
-#define CTL_ESC LCTL_T(KC_ESC)
-/* Layer keys */
-#define ARROWS LT(_ARROWS, KC_D)
-#define HDUE MO(_HDUE)
-#define MOUSP LT(_MOUSE, KC_SPC)
-#define FN MO(_FN)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*  Default layer:
-     * Space Cadet shifts (parentheses on tap)
-     * Caps Lock is Control on hold, Esc on tap
-     * Hyper/Caps Lock on Control keys
-     * Hold D to activate layer 1 (Arrows)
-     * Hold Space to activate layer 3 (Mouse keys)
-     * Hold FN to activate layer 4 (FN layer)
-     */
-    [_BASE] = LAYOUT_60_ansi(
-        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_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,
-        CTL_ESC,   KC_A,    KC_S,    ARROWS,  KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        SC_LSPO,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,
-        HYPR_CAPS, KC_LALT, KC_LGUI,                            MOUSP,                              KC_RGUI, KC_RALT, FN,      HYPR_CAPS
-    ),
-
-    /*  Layer 1:
-     * Vim arrows (HJKL)
-     * Vim-like move across words with W(ord), and B(eginning)
-     * Media controls (fine volume controls using Option+Shift)
-     * Backspace/Del on N/M
-     * Hold F to activate layer 2 (HDUE: Home, Down, Up, End)
-     */
-    [_ARROWS] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, WORD_FW, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, F_VOLD,  FVOLU,   _______,
-        _______, _______, _______, _______, HDUE,    _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, WORD_BK, KC_BSPC, KC_DEL,  _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-
-    /*  Layer 2:
-     * Home, Page Down, Page Up, End
-     * Delete word forward/back on W/B
-     */
-    [_HDUE] = LAYOUT_60_ansi(
-        _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, D_WORD_FW, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,   _______, _______, _______, KC_HOME,   KC_PGDN, KC_PGUP, KC_END,  _______, _______,          _______,
-        _______,          _______,   _______, _______, _______, D_WORD_BK, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                              _______,                              _______, _______, _______, _______
-    ),
-
-    /*  Layer 3:
-     * Mouse keys
-     * Cursor movement: HJKL
-     * MB 1, 2, and 3 on F, D, and S, respectively
-     * Mouse wheel: up (V), down (R) (reversed because of Natural Scrolling)
-     * Change mouse acceleration on U, I, O (0, 1, 2)
-     */
-    [_MOUSE] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, KC_WH_D, _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______,
-        _______, _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,          _______,
-        _______,          _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-
-    /*  Layer 4:
-     * F1-12
-     * Del on backspace
-     * Lots of RGB controls
-     * QK_BOOT firmware on backslash
-     * Screen brightness: Z (decrease), X (increase)
-     */
-    [_FN] = LAYOUT_60_ansi(
-        _______, 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_SAI, RGB_VAI, RGB_SPI, RGB_M_P,  RGB_M_B,  RGB_M_R, _______, _______, _______, QK_BOOT,
-        _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SW, RGB_M_SN, RGB_M_K, _______, _______,          _______,
-        _______,          KC_BRID,  KC_BRIU, _______, _______, _______, _______,  RGB_M_X,  RGB_M_G, RGB_M_T, _______,          _______,
-        _______, _______, _______,                             _______,                              _______, _______, _______, _______
-    )
-
-    // TEMPLATE
-    // LAYOUT_60_ansi(
-    //    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    //    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    //    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    //    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    //    _______, _______, _______,                            _______,                            _______, _______, _______, _______,
-    // ),
-};
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/readme.md b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/readme.md
deleted file mode 100644
index 5f65c349dc3..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/readme.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# MacOS standard-ish 60% keymap with Vim-like arrows
-
-This is a MacOS-specific keymap for DZ60 RGB ANSI with a bit of Vim arrows and other niceties.
-
-## Base Layer
-
-![Graphical representation of the Base Layer](https://i.imgur.com/L66C3ya.png)
-
-* Space Cadet shifts (parentheses on tap)
-* Caps Lock is Control on hold, Esc on tap
-* Hyper/Caps Lock on Control keys
-* Hold D to activate layer 1 (Arrows)
-* Hold Space to activate layer 3 (Mouse keys)
-* Hold FN to activate layer 4 (FN layer)
-
-## Layer 1: "Arrows"
-
-![Graphical representation of Layer 1](https://i.imgur.com/VirYuoO.png)
-
-* Vim arrows (HJKL)
-* Vim-like move across words with W(ord), and B(eginning)
-* Media controls (fine volume controls using Option+Shift)
-* Backspace/Del on N/M
-* Hold F to activate layer 2 (HDUE: Home, Down, Up, End)
-
-## Layer 2: "HDUE"
-
-![Graphical representation of Layer 2](https://i.imgur.com/xWMqCmD.png)
-
-* **H**ome, Page **D**own, Page **U**p, **E**nd
-* Delete word forward/back on W/B
-
-## Layer 3: "Mouse keys"
-
-![Graphical representation of Layer 3](https://i.imgur.com/x5vmAyK.png)
-
-* Mouse keys
-* Cursor movement: HJKL
-* MB 1, 2, and 3 on F, D, and S, respectively
-* Mouse wheel: up (V), down (R) (reversed because of Natural Scrolling)
-* Change mouse acceleration on U, I, O (0, 1, 2)
-
-## Layer 4: "The FN layer"
-
-![Graphical representation of Layer 4](https://i.imgur.com/6favpke.png)
-
-* F1-12
-* Del on backspace
-* Lots of RGB controls
-* RESET firmware on backslash
-* Screen brightness: Z (decrease), X (increase)
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
deleted file mode 100644
index e5f5083ee5f..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright 2022 Murali Suresh
- *
- * 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_60_ansi(
-        KC_GRAVE,       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, LT(2,KC_BSLS),
-        CTL_T(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_UP,
-        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_60_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_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
-        KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
-        _______, _______, _______,                            TO(3)  ,                            _______, _______, _______, _______
-    ),
-    [2] = LAYOUT_60_ansi(
-        _______, 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_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-    [3] = LAYOUT_60_ansi(
-        KC_GRAVE,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  LT(4,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,
-        CTL_T(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,
-        MO(4)  ,        KC_LGUI, KC_RALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(2),   KC_RCTL
-    ),
-    [4] = LAYOUT_60_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_DEL,
-        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_HOME, _______, _______, KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, KC_PGUP, NK_TOGG, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            TO(0)  ,                            _______, _______, _______, _______
-    ),
-};
-
-void highlight_layer3(void){
-    // F9-F12
-    rgb_matrix_set_color(4, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(3, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(2, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(1, 0xFF, 0xFF, 0xFF);
-    // F1-F4
-    rgb_matrix_set_color(9, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(10, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(11, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(12, 0xFF, 0xFF, 0xFF);
-    // Reset
-    rgb_matrix_set_color(14, 0x99, 0x99, 0xFF);
-    // Pause + Slck + PrScr
-    rgb_matrix_set_color(15, 0xFF, 0x99, 0x00);
-    rgb_matrix_set_color(16, 0xFF, 0x99, 0x00);
-    rgb_matrix_set_color(17, 0xFF, 0x99, 0x00);
-    // Pgup, Home
-    rgb_matrix_set_color(39, 0x00, 0x99, 0x00);
-    rgb_matrix_set_color(24, 0x00, 0x99, 0x00);
-    // hjkl
-    rgb_matrix_set_color(31, 0x00, 0x00, 0xFF);
-    rgb_matrix_set_color(32, 0x00, 0x00, 0xFF);
-    rgb_matrix_set_color(33, 0x00, 0x00, 0xFF);
-    rgb_matrix_set_color(34, 0x00, 0x00, 0xFF);
-    // PgDwn, End
-    rgb_matrix_set_color(36, 0x00, 0x99, 0x00);
-    rgb_matrix_set_color(46, 0x00, 0x99, 0x00);
-}
-
-bool rgb_matrix_indicators_user(void) {
-	  led_t led_state = host_keyboard_led_state();
-      if (!g_suspend_state) {
-        switch (get_highest_layer(layer_state)) {
-          case 3:
-            highlight_layer3(); break;
-          default:
-            break;
-        }
-      }
-	  if (led_state.caps_lock) {
-	        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
-	  }
-    return false;
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
deleted file mode 100644
index ff829f53fa0..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Copyright 2022 Murali Suresh
- *
- * 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] = {
-  /* Qwerty
-   * ,------------------------------------------------------------------------------------------.
-   * | ` ~  |  1! |  2@ |  3# |  4$ |  5% |  6^ |  7& |  8* |  9( |  0) |  -  |  =  |   Bkspc   |
-   * |------------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |     \   |
-   * |------------------------------------------------------------------------------------------+
-   * | Ctl_T(C) |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-   * |------------------------------------------------------------------------------------------+
-   * | Shift      |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |    RShift       |
-   * |------------------------------------------------------------------------------------------+
-   * |  MO1  |  Cmd  |  Alt  |              Space                | RAlt | Cmd  |  MO2  |  RCTL  |
-   * `------------------------------------------------------------------------------------------'
-   */
-    [0] = LAYOUT_60_ansi(
-        KC_GRAVE,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  LT(1,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,
-        CTL_T(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,
-        MO(1)  ,        KC_LGUI, KC_RALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(2),   KC_RCTL
-    ),
-  /* Layer1
-   * ,------------------------------------------------------------------------------------------.
-   * | ` ~  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Del     |
-   * |------------------------------------------------------------------------------------------+
-   * |        |     |     |     |     |     |  Y  |     |  I  |     | PScr| Slck| Paus|  Reset  |
-   * |------------------------------------------------------------------------------------------+
-   * |          |     |     |     |     |     | Left| Down| Up  | Rght| Home| Pgup|             |
-   * |------------------------------------------------------------------------------------------+
-   * | Shift      | V-  | V+  |  C  |     |     |     |     |     | End | PgDn|                 |
-   * |------------------------------------------------------------------------------------------+
-   * |       |       |       |              TO3                  |      |      |       |        |
-   * `------------------------------------------------------------------------------------------'
-   */
-    [1] = LAYOUT_60_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_DEL,
-        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_HOME, _______, _______, KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, KC_PGUP, NK_TOGG, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            TO(3)  ,                            _______, _______, _______, _______
-    ),
-    [2] = LAYOUT_60_ansi(
-        _______, 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, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-    [3] = LAYOUT_60_ansi(
-        _______, 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_PSCR, KC_SCRL, KC_PAUS, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, TO(0),
-        _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,          _______,
-        _______,          _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______,          KC_UP,
-        _______, _______, _______,                            _______,                            _______, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-};
-
-void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-  for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-    if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-        rgb_matrix_set_color( i, red, green, blue );
-    }
-  }
-}
-
-void highlight_layer1(void){
-    // F9-F12
-    rgb_matrix_set_color(4, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(3, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(2, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(1, 0xFF, 0xFF, 0xFF);
-    // F1-F4
-    rgb_matrix_set_color(9, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(10, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(11, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(12, 0xFF, 0xFF, 0xFF);
-    // Reset
-    rgb_matrix_set_color(14, 0x99, 0x99, 0xFF);
-    // Pause + Slck + PrScr
-    rgb_matrix_set_color(15, 0xFF, 0x99, 0x00);
-    rgb_matrix_set_color(16, 0xFF, 0x99, 0x00);
-    rgb_matrix_set_color(17, 0xFF, 0x99, 0x00);
-    // Pgup, Home
-    rgb_matrix_set_color(39, 0x00, 0x99, 0x00);
-    rgb_matrix_set_color(24, 0x00, 0x99, 0x00);
-    // hjkl
-    rgb_matrix_set_color(31, 0x00, 0x00, 0xFF);
-    rgb_matrix_set_color(32, 0x00, 0x00, 0xFF);
-    rgb_matrix_set_color(33, 0x00, 0x00, 0xFF);
-    rgb_matrix_set_color(34, 0x00, 0x00, 0xFF);
-    // PgDwn, End
-    rgb_matrix_set_color(36, 0x00, 0x99, 0x00);
-    rgb_matrix_set_color(46, 0x00, 0x99, 0x00);
-}
-
-void highlight_layer2(void){
-    // Mode
-    rgb_matrix_set_color(18, 0xFF, 0xFF, 0xFF);
-    // Value
-    rgb_matrix_set_color(19, 0x4C, 0x00, 0x99);
-    rgb_matrix_set_color(20, 0x4C, 0x00, 0x99);
-    // Sat
-    rgb_matrix_set_color(21, 0xFF, 0xFF, 0xFF);
-    rgb_matrix_set_color(22, 0xFF, 0xFF, 0xFF);
-    // Hue
-    rgb_matrix_set_color(23, 0x99, 0x99, 0x00);
-    rgb_matrix_set_color(24, 0x99, 0x99, 0x00);
-    // Toggle
-    rgb_matrix_set_color(26, 0xFF, 0xFF, 0xFF);
-    // Speed
-    rgb_matrix_set_color(31, 0xFF, 0x99, 0x00);
-    rgb_matrix_set_color(32, 0xFF, 0x99, 0x00);
-}
-
-void highlight_layer3(void) {
-    int ins_key_block[9] = {25, 24, 23, 38, 37, 36, 50, 49, 48};
-    for(int i  = 0; i < 9; i++) {
-      rgb_matrix_set_color(ins_key_block[i], 0x00, 0x99, 0x00);
-    }
-    int num_key_block[9] = {20, 19, 18, 33, 32, 31, 45, 44, 43};
-    for(int i  = 0; i < 9; i++) {
-      rgb_matrix_set_color(num_key_block[i], 0x00, 0x09, 0x09);
-    }
-    int easy_arrow_keys[4] = {41, 55, 54, 53};
-    for(int i  = 0; i < 4; i++) {
-      rgb_matrix_set_color(easy_arrow_keys[i], 0x09, 0x00, 0x09);
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-	  led_t led_state = host_keyboard_led_state();
-      if (!g_suspend_state) {
-        switch (get_highest_layer(layer_state)) {
-          case 1:
-            highlight_layer1(); break;
-          case 2:
-            highlight_layer2(); break;
-          case 3:
-            /* rgb_matrix_layer_helper(0x03, 0x03, 0x00); */
-            highlight_layer3();
-            break;
-          default:
-            break;
-        }
-      }
-	  if (led_state.caps_lock) {
-	        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
-	  }
-    return false;
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md
deleted file mode 100644
index b9dbdfeb90f..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-### ansi vim
-
-Keymap for dz60rgb terminal users
-
-### Philosophy
-
-Touch typing largely relies on muscle memory and hence
-maintaining a uniform position of keys across devices helps a lot.
-
-The below keymap attempts to maintain a uniform keymap across Linux and Mac.
-
-Avoiding the use of `QK_GESC` as the intention is to use the same layer for mac and linux.
-`QK_GESC` causes `` CMD+` `` to be send which has a default mapping
-
-Layer: 1
-
-Using `A` for `Home`
-Using `E` for `End`
-Using `F` for `PgDN`
-Using `B` for `PgUP`
-
-Layer 3:
-
-Dedicated Num keys block and `Ins, Home, PgUp` block.
-
-Dedicated Layer for arrow keys and Num keys and `Ins`, `Home` and `PgUp`.
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index 674871ec49c..130f99d7b7e 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -1,60 +1,3 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 61
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json
index 9c8b271cc95..d09c967d008 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json
@@ -4,7 +4,55 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3733",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index 0b458818bca..130f99d7b7e 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -1,58 +1,3 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-// #    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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 61
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json
index cc239f74b32..5769daefef2 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json
@@ -4,7 +4,40 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_splash": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index 75ccef8193c..7cc462cbae5 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -16,59 +16,4 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-// #    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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 61
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
index edd27d45771..649ea2e2611 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
@@ -4,7 +4,37 @@
         "device_version": "2.1.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
index d6506389a68..b5af34be38e 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -1,73 +1,73 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, H_15, G_15, I_15 },
-    { 0, K_14, J_14, L_14 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_14, D_14, F_14 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_14, A_14, C_14 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
 
-    { 0, B_15, A_15, C_15 },
-    { 0, E_13, D_13, F_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_16, J_16, L_16 }
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index ac79efd26cd..130f99d7b7e 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -1,60 +1,3 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 62
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json
index 0a61ae0d834..320d412aaef 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json
@@ -4,7 +4,55 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3733",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index a341a18e0d6..130f99d7b7e 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -1,55 +1,3 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-// 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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 62
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json
index adc6fb3b4c0..f7d6acff0c7 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json
@@ -4,7 +4,36 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_splash": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index 13169e21f5e..c83555d7307 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -16,59 +16,4 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-// #    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 IS31FL3733_I2C_ADDRESS_1      IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT   62
-#endif
+#define IS31FL3733_I2C_ADDRESS_1      IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
index cea77d59cff..5a3cc636024 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
@@ -4,7 +4,37 @@
         "device_version": "2.1.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_splash": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60v2/keymaps/vial/config.h b/keyboards/dztech/dz60v2/keymaps/vial/config.h
new file mode 100644
index 00000000000..4e4ec8d6a55
--- /dev/null
+++ b/keyboards/dztech/dz60v2/keymaps/vial/config.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x8A, 0xCA, 0x7C, 0xA1, 0x95, 0x21, 0x27, 0x9C}
+
+// Esc + Enter
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+
diff --git a/keyboards/dztech/dz60v2/keymaps/vial/keymap.c b/keyboards/dztech/dz60v2/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..d183fa2ca5b
--- /dev/null
+++ b/keyboards/dztech/dz60v2/keymaps/vial/keymap.c
@@ -0,0 +1,19 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT(
+        QK_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,  XXXXXXX, 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, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXXXX,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, XXXXXXX, XXXXXXX, MO(1),   KC_RCTL
+    ),
+
+    LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, BL_DOWN,  BL_TOGG, BL_UP,  BL_STEP, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/dztech/dz60v2/keymaps/vial/rules.mk b/keyboards/dztech/dz60v2/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..a05117bb19e
--- /dev/null
+++ b/keyboards/dztech/dz60v2/keymaps/vial/rules.mk
@@ -0,0 +1,6 @@
+VIA_ENABLE=yes
+VIAL_ENABLE=yes
+LTO_ENABLE = yes
+COMBO_ENABLE = no
+KEY_OVERRIDE_ENABLE = no
+QMK_SETTINGS = no
diff --git a/keyboards/dztech/dz60v2/keymaps/vial/vial.json b/keyboards/dztech/dz60v2/keymaps/vial/vial.json
new file mode 100644
index 00000000000..068f47937ee
--- /dev/null
+++ b/keyboards/dztech/dz60v2/keymaps/vial/vial.json
@@ -0,0 +1,432 @@
+{
+  "name": "DZ60",
+  "vendorId": "0x445A",
+  "productId": "0x2260",
+  "firmwareVersion": 0,
+  "keycodes": ["via/keycodes", "via/qmk_lighting"],
+  "menus": [
+    "via/keymap",
+    "via/layouts",
+    "via/macros",
+    "via/save_load",
+    "core/qmk_backlight",
+    "core/qmk_rgblight"
+  ],
+  "matrix": {"rows": 5, "cols": 15},
+  "layouts": {
+    "presets": {
+      "Default": [0, 0, 0, 0],
+      "ISO": [0, 1, 3, 0],
+      "HHKB": [0, 0, 0, 2],
+      "With arrows": [0, 0, 3, 3]
+    },
+    "labels": [
+      "Split Backspace",
+      "ISO Enter",
+      [
+        "Row 4",
+        "Default",
+        "Split right shift",
+        "Arrows",
+        "Default ISO",
+        "ISO split right shift",
+        "ISO arrows",
+        "[2U] Default",
+        "[2U] Split left shift",
+        "[2U] Split right shift",
+        "[2U] Split both shifts"
+      ],
+      [
+        "Bottom row",
+        "6.25U",
+        "7U",
+        "6.25U Arrows",
+        "6.25U Arrows B",
+        "7U Arrows",
+        "Split space",
+        "Split space arrows"
+      ]
+    ],
+    "keymap": [
+      [
+        {"x": 2.5, "c": "#777777"},
+        "0,0",
+        {"c": "#cccccc"},
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5",
+        "0,6",
+        "0,7",
+        "0,8",
+        "0,9",
+        "0,10",
+        "0,11",
+        "0,12",
+        {"c": "#aaaaaa", "w": 2},
+        "0,14\n\n\n0,0",
+        {"x": 0.5, "c": "#cccccc"},
+        "0,13\n\n\n0,1",
+        "0,14\n\n\n0,1"
+      ],
+      [
+        {"x": 2.5, "c": "#aaaaaa", "w": 1.5},
+        "1,0",
+        {"c": "#cccccc"},
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        "1,13",
+        {"w": 1.5},
+        "1,14\n\n\n1,0",
+        {
+          "x": 1.25,
+          "c": "#777777",
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
+        },
+        "2,13\n\n\n1,1"
+      ],
+      [
+        {"x": 2.5, "c": "#aaaaaa", "w": 1.75},
+        "2,0",
+        {"c": "#cccccc"},
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        "2,12",
+        {"c": "#777777", "w": 2.25},
+        "2,13\n\n\n1,0",
+        {"x": 0.25, "c": "#cccccc"},
+        "1,14\n\n\n1,1"
+      ],
+      [
+        {"x": 2.5, "c": "#aaaaaa", "w": 2.25},
+        "3,0\n\n\n2,0",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,0",
+        "3,3\n\n\n2,0",
+        "3,4\n\n\n2,0",
+        "3,5\n\n\n2,0",
+        "3,6\n\n\n2,0",
+        "3,7\n\n\n2,0",
+        "3,8\n\n\n2,0",
+        "3,9\n\n\n2,0",
+        "3,10\n\n\n2,0",
+        "3,11\n\n\n2,0",
+        {"c": "#aaaaaa", "w": 2.75},
+        "3,13\n\n\n2,0"
+      ],
+      [
+        {"x": 2.5, "w": 1.25},
+        "4,0\n\n\n3,0",
+        {"w": 1.25},
+        "4,1\n\n\n3,0",
+        {"w": 1.25},
+        "4,3\n\n\n3,0",
+        {"c": "#cccccc", "w": 6.25},
+        "4,6\n\n\n3,0",
+        {"c": "#aaaaaa", "w": 1.25},
+        "4,10\n\n\n3,0",
+        {"w": 1.25},
+        "4,11\n\n\n3,0",
+        {"w": 1.25},
+        "4,13\n\n\n3,0",
+        {"w": 1.25},
+        "4,14\n\n\n3,0"
+      ],
+      [
+        {"y": 0.5, "x": 2.5, "w": 2.25},
+        "3,0\n\n\n2,1",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,1",
+        "3,3\n\n\n2,1",
+        "3,4\n\n\n2,1",
+        "3,5\n\n\n2,1",
+        "3,6\n\n\n2,1",
+        "3,7\n\n\n2,1",
+        "3,8\n\n\n2,1",
+        "3,9\n\n\n2,1",
+        "3,10\n\n\n2,1",
+        "3,11\n\n\n2,1",
+        {"c": "#aaaaaa", "w": 1.75},
+        "3,13\n\n\n2,1",
+        "3,14\n\n\n2,1"
+      ],
+      [
+        {"x": 2.5, "w": 2.25},
+        "3,0\n\n\n2,2",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,2",
+        "3,3\n\n\n2,2",
+        "3,4\n\n\n2,2",
+        "3,5\n\n\n2,2",
+        "3,6\n\n\n2,2",
+        "3,7\n\n\n2,2",
+        "3,8\n\n\n2,2",
+        "3,9\n\n\n2,2",
+        "3,10\n\n\n2,2"
+      ],
+      [
+        {"x": 2.5, "c": "#aaaaaa", "w": 1.25},
+        "3,0\n\n\n2,3",
+        "3,1\n\n\n2,3",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,3",
+        "3,3\n\n\n2,3",
+        "3,4\n\n\n2,3",
+        "3,5\n\n\n2,3",
+        "3,6\n\n\n2,3",
+        "3,7\n\n\n2,3",
+        "3,8\n\n\n2,3",
+        "3,9\n\n\n2,3",
+        "3,10\n\n\n2,3",
+        "3,11\n\n\n2,3",
+        {"c": "#aaaaaa", "w": 2.75},
+        "3,13\n\n\n2,3"
+      ],
+      [
+        {"x": 2.5, "w": 1.25},
+        "3,0\n\n\n2,4",
+        "3,1\n\n\n2,4",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,4",
+        "3,3\n\n\n2,4",
+        "3,4\n\n\n2,4",
+        "3,5\n\n\n2,4",
+        "3,6\n\n\n2,4",
+        "3,7\n\n\n2,4",
+        "3,8\n\n\n2,4",
+        "3,9\n\n\n2,4",
+        "3,10\n\n\n2,4",
+        "3,11\n\n\n2,4",
+        {"c": "#aaaaaa", "w": 1.75},
+        "3,13\n\n\n2,4",
+        "3,14\n\n\n2,4"
+      ],
+      [
+        {"x": 2.5, "w": 1.25},
+        "3,0\n\n\n2,5",
+        "3,1\n\n\n2,5",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,5",
+        "3,3\n\n\n2,5",
+        "3,4\n\n\n2,5",
+        "3,5\n\n\n2,5",
+        "3,6\n\n\n2,5",
+        "3,7\n\n\n2,5",
+        "3,8\n\n\n2,5",
+        "3,9\n\n\n2,5",
+        "3,10\n\n\n2,5"
+      ],
+      [
+        {"y": 0.25, "x": 2.5, "c": "#aaaaaa", "w": 2},
+        "3,0\n\n\n2,6",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,6",
+        "3,3\n\n\n2,6",
+        "3,4\n\n\n2,6",
+        "3,5\n\n\n2,6",
+        "3,6\n\n\n2,6",
+        "3,7\n\n\n2,6",
+        "3,8\n\n\n2,6",
+        "3,9\n\n\n2,6",
+        "3,10\n\n\n2,6",
+        "3,11\n\n\n2,6",
+        "3,12\n\n\n2,6",
+        {"c": "#aaaaaa", "w": 2},
+        "3,13\n\n\n2,6"
+      ],
+      [
+        {"x": 2.5},
+        "3,0\n\n\n2,7",
+        "3,1\n\n\n2,7",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,7",
+        "3,3\n\n\n2,7",
+        "3,4\n\n\n2,7",
+        "3,5\n\n\n2,7",
+        "3,6\n\n\n2,7",
+        "3,7\n\n\n2,7",
+        "3,8\n\n\n2,7",
+        "3,9\n\n\n2,7",
+        "3,10\n\n\n2,7",
+        "3,11\n\n\n2,7",
+        "3,12\n\n\n2,7",
+        {"c": "#aaaaaa", "w": 2},
+        "3,13\n\n\n2,7"
+      ],
+      [
+        {"x": 2.5, "w": 2},
+        "3,0\n\n\n2,8",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,8",
+        "3,3\n\n\n2,8",
+        "3,4\n\n\n2,8",
+        "3,5\n\n\n2,8",
+        "3,6\n\n\n2,8",
+        "3,7\n\n\n2,8",
+        "3,8\n\n\n2,8",
+        "3,9\n\n\n2,8",
+        "3,10\n\n\n2,8",
+        "3,11\n\n\n2,8",
+        "3,12\n\n\n2,8",
+        {"c": "#aaaaaa"},
+        "3,13\n\n\n2,8",
+        "3,14\n\n\n2,8"
+      ],
+      [
+        {"x": 2.5},
+        "3,0\n\n\n2,9",
+        "3,1\n\n\n2,9",
+        {"c": "#cccccc"},
+        "3,2\n\n\n2,9",
+        "3,3\n\n\n2,9",
+        "3,4\n\n\n2,9",
+        "3,5\n\n\n2,9",
+        "3,6\n\n\n2,9",
+        "3,7\n\n\n2,9",
+        "3,8\n\n\n2,9",
+        "3,9\n\n\n2,9",
+        "3,10\n\n\n2,9",
+        "3,11\n\n\n2,9",
+        "3,12\n\n\n2,9",
+        {"c": "#aaaaaa"},
+        "3,13\n\n\n2,9",
+        "3,14\n\n\n2,9"
+      ],
+      [
+        {"y": 0.5, "x": 2.5, "w": 1.5},
+        "4,0\n\n\n3,1",
+        "4,1\n\n\n3,1",
+        {"w": 1.5},
+        "4,3\n\n\n3,1",
+        {"c": "#cccccc", "w": 7},
+        "4,6\n\n\n3,1",
+        {"c": "#aaaaaa", "w": 1.5},
+        "4,11\n\n\n3,1",
+        "4,13\n\n\n3,1",
+        {"w": 1.5},
+        "4,14\n\n\n3,1"
+      ],
+      [
+        {"x": 2.5, "w": 1.25},
+        "4,0\n\n\n3,2",
+        {"w": 1.25},
+        "4,1\n\n\n3,2",
+        {"w": 1.25},
+        "4,3\n\n\n3,2",
+        {"c": "#cccccc", "w": 6.25},
+        "4,6\n\n\n3,2",
+        {"c": "#aaaaaa"},
+        "4,10\n\n\n3,2",
+        "4,11\n\n\n3,2",
+        "4,12\n\n\n3,2",
+        "4,13\n\n\n3,2",
+        "4,14\n\n\n3,2"
+      ],
+      [
+        {"x": 2.5, "w": 1.5},
+        "4,0\n\n\n3,3",
+        "4,1\n\n\n3,3",
+        {"w": 1.25},
+        "4,3\n\n\n3,3",
+        {"c": "#cccccc", "w": 6.25},
+        "4,6\n\n\n3,3",
+        {"c": "#aaaaaa"},
+        "4,10\n\n\n3,3",
+        "4,11\n\n\n3,3",
+        "4,12\n\n\n3,3",
+        "4,13\n\n\n3,3",
+        "4,14\n\n\n3,3"
+      ],
+      [
+        {"x": 2.5, "w": 1.5},
+        "4,0\n\n\n3,4",
+        {"w": 1.5},
+        "4,1\n\n\n3,4",
+        {"c": "#cccccc", "w": 7},
+        "4,6\n\n\n3,4",
+        {"c": "#aaaaaa"},
+        "4,10\n\n\n3,4",
+        "4,11\n\n\n3,4",
+        "4,12\n\n\n3,4",
+        "4,13\n\n\n3,4",
+        "4,14\n\n\n3,4"
+      ],
+      [
+        {"x": 2.5, "w": 1.25},
+        "4,0\n\n\n3,5",
+        {"w": 1.25},
+        "4,1\n\n\n3,5",
+        {"w": 1.25},
+        "4,3\n\n\n3,5",
+        {"c": "#cccccc", "w": 2.25},
+        "4,4\n\n\n3,5",
+        {"w": 1.25},
+        "4,6\n\n\n3,5",
+        {"w": 2.75},
+        "4,8\n\n\n3,5",
+        {"c": "#aaaaaa", "w": 1.25},
+        "4,10\n\n\n3,5",
+        {"w": 1.25},
+        "4,11\n\n\n3,5",
+        {"w": 1.25},
+        "4,13\n\n\n3,5",
+        {"w": 1.25},
+        "4,14\n\n\n3,5"
+      ],
+      [
+        {"x": 2.5, "w": 1.25},
+        "4,0\n\n\n3,6",
+        {"w": 1.25},
+        "4,1\n\n\n3,6",
+        {"w": 1.25},
+        "4,3\n\n\n3,6",
+        {"c": "#cccccc", "w": 2.25},
+        "4,4\n\n\n3,6",
+        {"w": 1.25},
+        "4,6\n\n\n3,6",
+        {"w": 2.75},
+        "4,8\n\n\n3,6",
+        {"c": "#aaaaaa"},
+        "4,10\n\n\n3,6",
+        "4,11\n\n\n3,6",
+        "4,12\n\n\n3,6",
+        "4,13\n\n\n3,6",
+        "4,14\n\n\n3,6"
+      ],
+      [
+        {"rx": 0.25, "y": 6.5, "x": 13.5, "w": 1.75},
+        "3,12\n\n\n2,2",
+        "3,13\n\n\n2,2",
+        "3,14\n\n\n2,2"
+      ],
+      [
+        {"y": 2, "x": 13.5, "w": 1.75},
+        "3,12\n\n\n2,5",
+        "3,13\n\n\n2,5",
+        "3,14\n\n\n2,5"
+      ]
+    ]
+  }
+}
\ No newline at end of file
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index edfc7b71716..970fce9d72f 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -16,39 +16,8 @@
  
 #pragma once
 
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#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
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define RGB_MATRIX_LED_COUNT 64
-#endif
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c
index 561a9727e50..e2512c72a57 100644
--- a/keyboards/dztech/dz64rgb/dz64rgb.c
+++ b/keyboards/dztech/dz64rgb/dz64rgb.c
@@ -17,75 +17,75 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, K_14, J_14, L_14 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_14, D_14, F_14 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_14, A_14, C_14 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
 
-    { 0, B_15, A_15, C_15 },
-    { 0, E_13, D_13, F_13 },
-    { 0, K_15, J_15, L_15 },
-    { 0, E_15, D_15, F_15 },
-    { 0, H_15, G_15, I_15 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_16, J_16, L_16 }
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json
index ca2dd46bd2e..b568170e14d 100644
--- a/keyboards/dztech/dz64rgb/info.json
+++ b/keyboards/dztech/dz64rgb/info.json
@@ -9,7 +9,39 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c b/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
deleted file mode 100644
index 914d1cc7566..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi(
-        QK_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_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_DEL,
-        LCTL_T(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_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_65_ansi(
-        QK_GESC,         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_TRNS,         RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PGUP,
-        LCTL_T(KC_CAPS), RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,  KC_PGDN,
-        KC_LSFT,                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_VOLU, KC_MUTE,
-        KC_TRNS,         KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
-    )
-
-};
diff --git a/keyboards/dztech/dz65rgb/keymaps/adi/readme.md b/keyboards/dztech/dz65rgb/keymaps/adi/readme.md
deleted file mode 100644
index fd3a6744ca2..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/adi/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Adi's DZ65RGB Layout
-![Layout Visual](https://i.imgur.com/xuFkvVI.png)
-
-This layout modifies the extra row on the right and makes some of the key bindings easier to reach on Layer 1.
-## Step by Step
-1. Build your Firmware: run build command in directory
-```make dztech/dz65rgb/v1:adi```
-2. Flash your Firmware:
-    * Open QMK Toolbox Application
-    * Open firmware file: dztech_dz65rgb_v1_adi.bin
-    * Unplug keyboard USB-C, and hold the ESC key while plugging it back in
-    * Check that QMK Toolbox displays: *** STM32 device connected. 
-    * Hit the flash button!
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h
deleted file mode 100644
index 76feedceb07..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define LEADER_TIMEOUT 300
-#define FORCE_NKRO
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE
\ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
deleted file mode 100644
index 7b4e9ab7288..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ /dev/null
@@ -1,243 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Config
-const uint8_t MAIN_COLOR[3] = {0xFF, 0x00, 0x00};
-
-// layers, ordering is important!
-enum layers {
-    _MAIN,
-    _INDEX,
-    _FN,
-    _MULTIMEDIA,
-    _EMOJI,
-    _EXT1,
-    _EXT2,
-    _EXT3,
-    _EXT4,
-    _EXT5,
-    _EXT6,
-    _RGB,
-    _CONFIG,
-}
-
-const layers_leds_map[] = {
-    [_MAIN] = 0,
-    [_INDEX] = 1,
-    [_FN] = 2,
-    [_MULTIMEDIA] = 3,
-    [_EMOJI] = 4,
-    [_EXT1] = 5,
-    [_EXT2] = 6,
-    [_EXT3] = 7,
-    [_EXT4] = 8,
-    [_EXT5] = 9,
-    [_EXT6] = 10,
-    [_RGB] = 11,
-    [_CONFIG] = 12,
-};
-
-enum unicode_names {
-    UC_GRINNING_FACE, // 😃
-    UC_BEAMING_FACE, // 😁
-    UC_GRINNING_FACE_WITH_SWEAT, // 😅
-    UC_ROLLING_LAUGHING, // 🤣
-    UC_FACE_TEARS_JOY, // 😂
-    UC_WINKING_FACE, // 😉
-    UC_SMILING_FACE_HALO, // 😇
-    UC_SMILING_FACE_HEARTS, // 🥰
-    UC_SMILING_FACE_HEART_EYES, // 😍
-    UC_FACE_BLOWING_KISS, // 😘
-    UC_FACE_SAVORING_FOOD, // 😋
-    UC_ZANY_FACE, // 🤪
-    UC_HUGGING_FACE, // 🤗
-    UC_SHUSHING_FACE, // 🤫
-    UC_THINKING_FACE, // 🤔
-    UC_FACE_RAISED_EYEBROW, // 🤨
-    UC_NEUTRAL_FACE, // 😐
-    UC_SMIRKING_FACE, // 😏
-    UC_FACE_ROLLING_EYES, // 🙄
-    UC_PENSIVE_FACE, // 😔
-    UC_FACE_VOMITING, // 🤮
-    UC_WOOZY_FACE, // 🥴
-    UC_PLEADING_FACE, // 🥺
-    UC_LOUDLY_CRYING_FACE, // 😭
-    UC_DISAPPOINTED_FACE, // 😞
-    UC_FACE_SYMBOLS_MOUTH, // 🤬
-    UC_SMILING_FACE_HORNS, // 😈
-    UC_SKULL, // 💀
-    UC_PILE_POO, // 💩
-    UC_GHOST, // 👻
-    UC_ALIEN_MONSTER, // 👾
-    UC_RED_HEART, // ❤
-    UC_BOMB, // 💣
-    UC_WAVING_HAND, // 👋
-    UC_OK_HAND, // 👌
-    UC_CLAPPING_HANDS, // 👏
-    UC_EYES, // 👀
-    UC_MAN_FACEPALMING, // 🤦
-    UC_TURTLE, // 🐢
-    UC_SNAKE, // 🐍
-    UC_SPOUTING_WHALE, // 🐳
-    UC_DRAGON, // 🐉
-    UC_TREX, // 🦖
-    UC_ARGENTINA_A, // 🇦
-    UC_ARGENTINA_R, // 🇷
-    UC_THUMBSDOWN, // 👍
-    UC_THUMBSUP, // 👎
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    [UC_GRINNING_FACE] = 0x1F603,
-    [UC_BEAMING_FACE] = 0x1F601,
-    [UC_GRINNING_FACE_WITH_SWEAT] = 0x1F605,
-    [UC_ROLLING_LAUGHING] = 0x1F923,
-    [UC_FACE_TEARS_JOY] = 0x1F602,
-    [UC_WINKING_FACE] = 0x1F609,
-    [UC_SMILING_FACE_HALO] = 0x1F607,
-    [UC_SMILING_FACE_HEARTS] = 0x1F970,
-    [UC_SMILING_FACE_HEART_EYES] = 0x1F60D,
-    [UC_FACE_BLOWING_KISS] = 0x1F618,
-    [UC_FACE_SAVORING_FOOD] = 0x1F60B,
-    [UC_ZANY_FACE] = 0x1F92A,
-    [UC_HUGGING_FACE] = 0x1F917,
-    [UC_SHUSHING_FACE] = 0x1F92B,
-    [UC_THINKING_FACE] = 0x1F914,
-    [UC_FACE_RAISED_EYEBROW] = 0x1F928,
-    [UC_NEUTRAL_FACE] = 0x1F610,
-    [UC_SMIRKING_FACE] = 0x1F60F,
-    [UC_FACE_ROLLING_EYES] = 0x1F644,
-    [UC_PENSIVE_FACE] = 0x1F614,
-    [UC_FACE_VOMITING] = 0x1F92E,
-    [UC_WOOZY_FACE] = 0x1F974,
-    [UC_PLEADING_FACE] = 0x1F97A,
-    [UC_LOUDLY_CRYING_FACE] = 0x1F62D,
-    [UC_DISAPPOINTED_FACE] = 0x1F61E,
-    [UC_FACE_SYMBOLS_MOUTH] = 0x1F92C,
-    [UC_SMILING_FACE_HORNS] = 0x1F608,
-    [UC_SKULL] = 0x1F480,
-    [UC_PILE_POO] = 0x1F4A9,
-    [UC_GHOST] = 0x1F47B,
-    [UC_ALIEN_MONSTER] = 0x1F47E,
-    [UC_RED_HEART] = 0x2764,
-    [UC_BOMB] = 0x1F4A3,
-    [UC_WAVING_HAND] = 0x1F44B,
-    [UC_OK_HAND] = 0x1F44C,
-    [UC_CLAPPING_HANDS] = 0x1F44F,
-    [UC_EYES] = 0x1F440,
-    [UC_MAN_FACEPALMING] = 0x1F926,
-    [UC_TURTLE] = 0x1F422,
-    [UC_SNAKE] = 0x1F40D,
-    [UC_SPOUTING_WHALE] = 0x1F433,
-    [UC_DRAGON] = 0x1F409,
-    [UC_TREX] = 0x1F996,
-    [UC_ARGENTINA_A] = 0x1F1E6,
-    [UC_ARGENTINA_R] = 0x1F1F7,
-    [UC_THUMBSDOWN] = 0x1F44E,
-    [UC_THUMBSUP] = 0x1F44D,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MAIN] = LAYOUT_65_ansi(
-        QK_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_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, RSFT_T(KC_APP), KC_UP, KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, QK_LEAD, TO(_INDEX), MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_INDEX] = LAYOUT_65_ansi(
-        TO(_MAIN), TO(_INDEX), TO(_FN), TO(_MULTIMEDIA), TO(_EMOJI), TO(_EXT1), TO(_EXT2), TO(_EXT3), TO(_EXT4), TO(_EXT5), TO(_EXT6), TO(_RGB), TO(_CONFIG), TO(_MAIN), 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, 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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), TO(_FN), KC_NO, KC_NO, KC_NO
-    ),
-    [_FN] = 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_PSCR,
-        KC_TAB, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_INS, KC_SCRL,
-        KC_APP, 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_PAUS,
-        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, TO(_INDEX), KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R
-    ),
-    [_MULTIMEDIA] = LAYOUT_65_ansi(
-        TO(_MAIN), 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, 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, KC_NO, KC_NO, KC_NO, KC_MPLY, 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_MSTP, KC_VOLU, KC_MUTE,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-    [_EMOJI] = LAYOUT_65_ansi(
-        TO(_MAIN), UM(UC_GRINNING_FACE), UM(UC_BEAMING_FACE), UM(UC_GRINNING_FACE_WITH_SWEAT), UM(UC_ROLLING_LAUGHING), UM(UC_FACE_TEARS_JOY), UM(UC_WINKING_FACE), UM(UC_SMILING_FACE_HALO), UM(UC_SMILING_FACE_HEARTS), UM(UC_SMILING_FACE_HEART_EYES), UM(UC_FACE_BLOWING_KISS), UM(UC_FACE_SAVORING_FOOD), UM(UC_ZANY_FACE), KC_BSPC, KC_HOME,
-        KC_TAB, UM(UC_HUGGING_FACE), UM(UC_SHUSHING_FACE), UM(UC_THINKING_FACE), UM(UC_FACE_RAISED_EYEBROW), UM(UC_NEUTRAL_FACE), UM(UC_SMIRKING_FACE), UM(UC_FACE_ROLLING_EYES), UM(UC_PENSIVE_FACE), UM(UC_FACE_VOMITING), UM(UC_WOOZY_FACE), UM(UC_PLEADING_FACE), UM(UC_LOUDLY_CRYING_FACE), UM(UC_THUMBSUP), KC_END,
-        KC_APP, UM(UC_DISAPPOINTED_FACE), UM(UC_FACE_SYMBOLS_MOUTH), UM(UC_SMILING_FACE_HORNS), UM(UC_SKULL), UM(UC_PILE_POO), UM(UC_GHOST), UM(UC_ALIEN_MONSTER), UM(UC_RED_HEART), UM(UC_BOMB), UM(UC_WAVING_HAND), UM(UC_OK_HAND), KC_ENT, KC_PGUP,
-        KC_LSFT, UM(UC_CLAPPING_HANDS), UM(UC_EYES), UM(UC_MAN_FACEPALMING), UM(UC_TURTLE), UM(UC_SNAKE), UM(UC_SPOUTING_WHALE), UM(UC_DRAGON), UM(UC_TREX), UM(UC_ARGENTINA_A), UM(UC_ARGENTINA_R), UM(UC_THUMBSDOWN), KC_UP, KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, QK_LEAD, TO(_INDEX), TO(_MAIN), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_EXT1] = LAYOUT_65_ansi(
-        TO(_MAIN), 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, 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, 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,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-    [_EXT2] = LAYOUT_65_ansi(
-        TO(_MAIN), 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, 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, 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,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-    [_EXT3] = LAYOUT_65_ansi(
-        TO(_MAIN), 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, 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, 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,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-    [_EXT4] = LAYOUT_65_ansi(
-        TO(_MAIN), 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, 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, 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,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-    [_EXT5] = LAYOUT_65_ansi(
-        TO(_MAIN), 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, 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, 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,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-    [_EXT6] = LAYOUT_65_ansi(
-        TO(_MAIN), 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, 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, 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,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-    [_RGB] = LAYOUT_65_ansi(
-        TO(_MAIN), 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, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_NO, KC_NO, KC_NO,
-        KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, 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,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-    [_CONFIG] = LAYOUT_65_ansi(
-        TO(_MAIN), 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_ACL2,
-        KC_NO, KC_PWR, KC_SLEP, KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, DB_TOGG, EE_CLR, KC_NO, KC_ACL1,
-        KC_NO, UC_PREV, UC_NEXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ACL0,
-        KC_NO, MAGIC_TOGGLE_NKRO, MAGIC_UNHOST_NKRO, MAGIC_HOST_NKRO, 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, TO(_INDEX), KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-};
-
-bool rgb_matrix_indicators_user(void) {
-
-    // CapsLock Light
-    if (host_keyboard_led_state().caps_lock) {
-        rgb_matrix_set_color(30, MAIN_COLOR[0], MAIN_COLOR[1], MAIN_COLOR[2]);
-    }
-
-    // Show Selected Layer
-    rgb_matrix_set_color(layers_leds_map[get_highest_layer(layer_state)], MAIN_COLOR[0], MAIN_COLOR[1], MAIN_COLOR[2]);
-    return false;
-}
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/rules.mk b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/rules.mk
deleted file mode 100644
index 1bd58cf79cd..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-LEADER_ENABLE = yes
-UNICODEMAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/keymaps/chocol8/config.h b/keyboards/dztech/dz65rgb/keymaps/chocol8/config.h
deleted file mode 100644
index 1c801d7e3c1..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/chocol8/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
diff --git a/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c b/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
deleted file mode 100644
index 735ceef722d..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/chocol8/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum tofu68_layers {
-    _QWERTY,
-    _FNM
-};
-
-#define FNM MO(_FNM)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_QWERTY] = LAYOUT_65_ansi(
-		QK_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_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_DEL,
-		KC_GRV,  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_LALT,  KC_LCMD,                   KC_SPC,                             FNM,     KC_RALT,  KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-	[_FNM]    = LAYOUT_65_ansi(
-		_______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   _______,  _______, KC_MUTE, KC_VOLU,
-		_______, RGB_TOG,  RGB_MOD, RGB_HUI ,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,  _______,  _______,   QK_BOOT, KC_VOLD,
-		_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,           AG_TOGG, _______,
-		_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_BTN1,           KC_MS_U, _______,
-		_______, _______,  _______,                   _______,                            _______, _______,  _______,  KC_MS_L, KC_MS_D, KC_MS_R
-	)
-};
diff --git a/keyboards/dztech/dz65rgb/keymaps/chocol8/rules.mk b/keyboards/dztech/dz65rgb/keymaps/chocol8/rules.mk
deleted file mode 100644
index 1778a5e141c..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/chocol8/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-NKRO_ENABLE = yes            # USB Nkey Rollover
-VELOCIKEY_ENABLE = yes
-# AUTO_SHIFT_ENABLE = yes      # Auto Shift
-
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/config.h b/keyboards/dztech/dz65rgb/keymaps/drootz/config.h
deleted file mode 100644
index 51fd5c6871e..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 425
-#define TAP_HOLD_CAPS_DELAY 80
-
-#ifdef RGB_MATRIX_ENABLE
-/* Reset default from dz65rgb/v2 config.h */
-#	undef DISABLE_RGB_MATRIX_SPLASH
-#	undef DISABLE_RGB_MATRIX_SOLID_SPLASH
-#	undef RGB_MATRIX_LED_FLUSH_LIMIT
-#	undef RGB_MATRIX_DEFAULT_MODE
-#	undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#	define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#	define RGB_MATRIX_LED_FLUSH_LIMIT 16 // default: 26
-#	define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
-#	define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#	define RGB_MATRIX_DEFAULT_HUE 10
-#	define RGB_MATRIX_DEFAULT_SAT 255
-#	define RGB_MATRIX_DEFAULT_VAL 200
-#	define RGB_MATRIX_DEFAULT_SPD 75
-/* Active RBG Modes */
-/* #	undef ENABLE_RGB_MATRIX_TYPING_HEATMAP   		// How hot is your WPM! */
-/* #	undef ENABLE_RGB_MATRIX_SPLASH           		// Full gradient & value pulse away from a single key hit then fades value out */
-/* #	undef ENABLE_RGB_MATRIX_SOLID_SPLASH     		// Hue & value pulse away from a single key hit then fades value out */
-/* Disabling to optimize firmware size */
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS             // Static dual hue, speed is hue for secondary hue
-#    undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT     // Static gradient left to right, speed controls how much gradient changes
-#    undef ENABLE_RGB_MATRIX_BREATHING               // Single hue brightness cycling animation
-#    undef ENABLE_RGB_MATRIX_BAND_VAL                // Single hue band fading brightness scrolling left to right
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL       // Single hue 3 blade spinning pinwheel fades brightness
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL         // Single hue spinning spiral fades brightness
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL               // Full keyboard solid hue cycling through full gradient
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT        // Full gradient scrolling left to right
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN           // Full gradient scrolling top to bottom
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN            // Full gradient scrolling out to in
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL       // Full dual gradients scrolling out to in
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradent Chevron shapped scrolling left to right
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL          // Full gradient spinning pinwheel around center of keyboard
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL            // Full gradient spinning spiral around center of keyboard
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON             // Full gradient spinning around center of keyboard
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON          // Full tighter gradient spinning around center of keyboard
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS       // Full dual gradients spinning two halfs of keyboard
-#    undef ENABLE_RGB_MATRIX_RAINDROPS               // Randomly changes a single key's hue
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS     // Randomly changes a single key's hue and saturation
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE          // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#endif /* RBG MATRIX */
-
-/* Firmware size Optimizations */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_ONESHOT
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
deleted file mode 100644
index 8a7bbd22ec3..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+++ /dev/null
@@ -1,747 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/**************** SOME GLOBALS *********************/
-
-bool onMac = false;
-bool isLeader = false;
-bool isBlinking = false;
-bool isRecording = false;
-bool isPlaying = false;
-const float led_dim_ratio = 0.50;
-static uint16_t blink_cycle_timer,
-                blink_fade_in_timer,
-                blink_fade_out_timer,
-                macro_one_play_timer,
-                macro_two_play_timer,
-                macro_play_blink_timer = 2000;
-static uint8_t  fade_in_step_counter,
-                fade_out_step_counter,
-                blink_hsv_value;
-
-/**************** LED BLINK HELPER FUNCTIONS *********************/
-
-/*
-Function to set color with hsv arguments
-- "hue", "sat" and "val" arguments above 255 will get value from rgb matrix config
-- "val_ratio" is used to adjust brightness ratio
-*/
-void rgb_matrix_set_color_hsv(uint8_t led, uint16_t hue, uint16_t sat, uint16_t val, float val_ratio) {
-    const uint8_t h = hue <= 255 ? hue : rgb_matrix_config.hsv.h;
-    const uint8_t s = sat <= 255 ? sat : rgb_matrix_config.hsv.s;
-    const uint8_t v = val <= 255 ? val * val_ratio : rgb_matrix_config.hsv.v * val_ratio;
-    HSV hsv_in = {h, s, v};
-    RGB rgb_out = hsv_to_rgb(hsv_in);
-    rgb_matrix_set_color(led, rgb_out.r, rgb_out.g, rgb_out.b);
-}
-
-void reset_blink_cycle(void) {
-    blink_cycle_timer = timer_read();
-    blink_fade_in_timer = timer_read();
-    blink_fade_out_timer = timer_read();
-    blink_hsv_value = 0;
-    fade_in_step_counter = 0;
-    fade_out_step_counter = 0;
-}
-
-void reset_blink_status(void) {
-    isRecording = false;
-    isPlaying = false;
-    isBlinking = false;
-}
-
-void get_this_led_blinking(uint8_t led_index, bool speed, uint8_t hue, uint8_t sat) {
-    const uint16_t static_on_time = speed ? 200 : 500;
-    const uint16_t static_off_time = speed ? 200 : 500;
-    const uint8_t fade_timing = speed ? 100 : 150;
-    const uint8_t fade_step = speed ? 10 : 15;
-    const uint8_t fade_value_step_size = rgb_matrix_config.hsv.v / fade_step;
-    const uint8_t fade_cycle_time_elapsed = fade_timing / fade_step;
-    if (timer_elapsed(blink_cycle_timer) < static_on_time) {
-        if (timer_elapsed(blink_fade_in_timer) > fade_cycle_time_elapsed && fade_in_step_counter < fade_step) {
-            blink_hsv_value = blink_hsv_value + fade_value_step_size;
-            fade_in_step_counter = fade_in_step_counter + 1;
-            blink_fade_in_timer = timer_read();
-        }
-    } else {
-        if (timer_elapsed(blink_fade_out_timer) > fade_cycle_time_elapsed && fade_out_step_counter < fade_step) {
-            blink_hsv_value = blink_hsv_value - fade_value_step_size;
-            fade_out_step_counter = fade_out_step_counter + 1;
-            blink_fade_out_timer = timer_read();
-        }
-    }
-
-    rgb_matrix_set_color_hsv(led_index, hue, sat, blink_hsv_value, 0.75);
-
-    if (timer_elapsed(blink_cycle_timer) > static_on_time + static_off_time) {
-        reset_blink_cycle();
-    }
-}
-
-
-/**************** LAYOUT *********************/
-
-/*
-[LEDS]
- 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
-58,  59,  60,            61,                 62,  63,  64,  65,  66,  67
-
-[KEYS]
-ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   -,   =,  BCK, INS
-TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   [,   ],    \,PGUP
-CPS, A,   S,   D,   F,   G,   H,   J,   K,   L,   COL, QOT,  RETURN,PGDN
-SFT, Z,   X,   C,   V,   B,   N,   M,   COM, DOT, SLS, SHIFT,    UP, DEL
-CTL, GUI, ALT,           SPACEBAR,           ALT, FN, CTL, LFT, DWN, RIT
-*/
-
-enum layers {
-    _MAIN,
-    _MAC,
-    _FN
-}
-
-const layers_leds_map[] = {
-    [_MAIN] = 45,
-    [_MAC] = 46,
-    [_FN] = 63
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MAIN] = LAYOUT_65_ansi(
-        QK_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_INS,
-        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,
-        QK_LEAD, 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_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_MAC] = 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_TRNS, KC_TRNS,
-        KC_TRNS, KC_LALT, KC_LGUI, KC_TRNS, KC_TRNS, MO(_FN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_FN] = LAYOUT_65_ansi(
-        DM_RSTP, 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_NO, KC_NO,
-        KC_TRNS, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, DM_PLY2, DM_REC2,
-        KC_TRNS, KC_BRID, KC_VOLD, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, DM_PLY1, DM_REC1,
-        KC_TRNS, TO(_MAIN), TO(_MAC), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPD, RGB_SPI, KC_TRNS, RGB_VAI, KC_NO,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_MOD
-    ),
-};
-
-//**************** MATRIX SCANS *********************//
-
-bool rgb_matrix_indicators_user(void) {
-
-    #ifdef RGB_MATRIX_ENABLE
-
-    /*Ensure some leds don't completeley turn off if hsv value setting is below 100 in the rgb matrix config */
-    const uint8_t led_constant_val = rgb_matrix_config.hsv.v < 100 ? 100 : rgb_matrix_config.hsv.v;
-
-    /* CapsLock LED indicator */
-    if (host_keyboard_led_state().caps_lock) {
-        rgb_matrix_set_color_hsv(30, 999, 0, led_constant_val, 0.75); // WHITE
-    }
-
-    /* Current layer LED indicator */
-    rgb_matrix_set_color_hsv(layers_leds_map[get_highest_layer(layer_state)], 999, 0, led_constant_val, led_dim_ratio); // WHITE
-
-    /* Leader Key LED under-glow */
-    if (isLeader) {
-        rgb_matrix_set_color_hsv(14, 999, 999, 999, 1); // CONFIG
-        rgb_matrix_set_color_hsv(30, 999, 999, 999, 1); // CONFIG
-    } else {
-        rgb_matrix_set_color_hsv(14, 999, 999, 999, led_dim_ratio); // CONFIG
-    }
-
-    /* Blinking LED indicator when recording Dynamic Macro */
-    if (isRecording && isBlinking) {
-        get_this_led_blinking(0, false, 0, 255);
-    }
-
-    /* Blinking LED indicator when playing Dynamic Macro */
-    if (isPlaying && isBlinking) {
-        if (timer_elapsed(macro_one_play_timer) < macro_play_blink_timer || timer_elapsed(macro_two_play_timer) < macro_play_blink_timer) {
-            get_this_led_blinking(0, true, 85, 255);
-        } else {
-            if (isBlinking && isPlaying) {
-                reset_blink_status();
-                reset_blink_cycle();
-            }
-        }
-    }
-
-    switch (get_highest_layer(layer_state)) {
-        case _FN:
-            /* Dynamic Macro LED indicator */
-            if (isRecording) {
-                rgb_matrix_set_color_hsv(0, 0, 999, 999, 1); /* RED macro stop */
-            } else {
-                rgb_matrix_set_color_hsv(43, 0, 999, 999, led_dim_ratio); /* RED macro 1 record */
-                rgb_matrix_set_color_hsv(29, 0, 999, 999, led_dim_ratio); /* RED macro 2 record */
-                rgb_matrix_set_color_hsv(42, 85, 999, 999, led_dim_ratio); /* GREEN macro 1 play */
-                rgb_matrix_set_color_hsv(28, 85, 999, 999, led_dim_ratio); /* GREEN macro 2 play */
-            }
-            /* Layer LED indicators */
-            rgb_matrix_set_color_hsv(45, 999, 0, led_constant_val, led_dim_ratio); /* WHITE Layer _MAIN */
-            rgb_matrix_set_color_hsv(46, 999, 0, led_constant_val, led_dim_ratio); /* WHITE Layer _MAC */
-            break;
-    }
-
-    #endif /* RGB_MATRIX */
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    bool pressed = record->event.pressed;
-    if (pressed) {
-        switch (keycode) {
-            case TO(_MAC):
-                onMac = true;
-                break;
-            case TO(_MAIN):
-                onMac = false;
-                break;
-        }
-    }
-    return true;
-}
-
-//**************** LEADER *********************//
-
-#ifdef LEADER_ENABLE
-
-/******* FRENCH ACCENT HELPER FUNCTIONS & DECLARATIONS *************/
-/*Most comonly used accents only*/
-
-enum french_letter {
-    _A,
-    _E,
-    _I,
-    _O,
-    _U
-};
-
-const uint8_t french_letter_index[5] = {
-    [_A] = 0,
-    [_E] = 1,
-    [_I] = 2,
-    [_O] = 3,
-    [_U] = 4
-};
-
-enum french_accent {
-    _CIRCUMFLEX,
-    _GRAVE,
-    _ACUTE
-};
-
-const uint8_t french_accent_index[3] = {
-    [_CIRCUMFLEX] = 0,
-    [_GRAVE] = 1,
-    [_ACUTE] = 2
-};
-
-/*
-This represent unicode decimal values
-Each index will be mapped to numpad keycode to out put the correct sequence
-All codes in this array should be of size 3
-All accent codes have the same index position as in the french_accent_index Array
-*/
-const uint8_t french_decimal_unicodes[5][3][2] = { /*[Letter][Accent][Case]*/
-    {
-        {
-            131,    // â
-            194     // Â
-        },{
-            133,    // à
-            192     // À
-        }
-    },{
-        {
-            136,    // ê
-            202     // Ê
-        },{
-            138,    // è
-            200     // È
-        },{
-            130,    // é
-            201     // É
-        }
-    },{
-        {
-            140,    // î
-            206     // Î
-        }
-    },{
-        {
-            147,    // ô
-            212     // Ô
-        }
-    },{
-        {
-            150,    // û
-            219     // Û
-        },{
-            151,    // ù
-            217     // Ù
-        }
-    }
-};
-
-void break_int_in_array(uint8_t int_code, uint8_t size, uint8_t *array) {
-    uint8_t i;
-    i = size;
-    while (i--) {
-        array[i] = int_code%10;
-        int_code /= 10;
-    }
-}
-
-/*
-Function meant to be used in Leader Key macros to output most commonly used french accents
-This is designed and work on an English language keyboard setting on both Windows and Mac
-=> accept french_letter and french_accent enum's as argument
-*/
-void send_french_accent(uint8_t letter, uint8_t accent) {
-
-    bool isCaps;
-    uint8_t decimal_unicode_in;
-    uint8_t decimal_unicode_size = 3;
-    uint8_t decimal_unicode_out[decimal_unicode_size];
-
-    /*Map to numpad keycodes*/
-    const uint16_t numpad_key_map[10] = {
-        KC_P0, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9
-    };
-
-    /*Map to letter keycodes*/
-    const uint16_t french_letter_key_map[5] = {
-        KC_A, KC_E, KC_I, KC_O, KC_U
-    };
-
-    /*Map to mod keys for French Mac shortcuts*/
-    const uint16_t osx_mod_key_map[3] = {
-        KC_I, // _CIRCUMFLEX
-        KC_GRAVE, // _GRAVE
-        KC_E // _ACUTE
-    };
-
-    /*
-    Function to tap the correct keycodes in sequence for the
-    "Windows Alt Code" requested, aka Decimal Unicodes
-    */
-    void tap_win_alt_code(void) {
-        if (isCaps) {
-            tap_code(numpad_key_map[0]); // Leading 0 on all upper case "Windows alt codes"
-        }
-        for (int i = 0; i < decimal_unicode_size; ++i) {
-            tap_code(numpad_key_map[decimal_unicode_out[i]]);
-        }
-    }
-
-    isCaps = host_keyboard_led_state().caps_lock ? true : false;
-
-    if (onMac) {
-        if (isCaps) {
-            SEND_STRING(SS_TAP(X_CAPS_LOCK));
-            register_code(KC_LALT);
-            tap_code(osx_mod_key_map[accent]);
-            unregister_code(KC_LALT);
-            register_code(KC_LSFT);
-            tap_code(french_letter_key_map[letter]);
-            unregister_code(KC_LSFT);
-            tap_code(KC_CAPS);
-        } else {
-            register_code(KC_LALT);
-            tap_code(osx_mod_key_map[accent]);
-            unregister_code(KC_LALT);
-            tap_code(french_letter_key_map[letter]);
-        }
-    } else {
-        /*get the correct decimal unicode*/
-        decimal_unicode_in = isCaps ? french_decimal_unicodes[letter][accent][1] : french_decimal_unicodes[letter][accent][0];
-        break_int_in_array(decimal_unicode_in, decimal_unicode_size, decimal_unicode_out);
-        register_code(KC_LALT);
-        tap_win_alt_code();
-        unregister_code(KC_LALT);
-    }
-}
-
-/*Couple functions used to output the same macro on two different sequences*/
-
-/* (|) */
-void ldrkey_send_paranthesis_wrap_ini(void) {
-    SEND_STRING("()" SS_TAP(X_LEFT));
-}
-
-/* (X) */
-void ldrkey_send_paranthesis_wrap_word(void) {
-    onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "(" SS_LALT(SS_TAP(X_RIGHT)) ")") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "(" SS_LCTL(SS_TAP(X_RIGHT)) ")");
-}
-
-/* (selection) */
-void ldrkey_send_paranthesis_wrap_selection(void) {
-    onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_X)) "()" SS_TAP(X_LEFT) SS_LGUI(SS_TAP(X_V)) SS_TAP(X_RIGHT)) : SEND_STRING(SS_LCTL(SS_TAP(X_X)) "()" SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_V)) SS_TAP(X_RIGHT));
-}
-
-/* [|] */
-void ldrkey_send_bracket_wrap_ini(void) {
-    SEND_STRING("[]" SS_TAP(X_LEFT));
-}
-
-/* [X] */
-void ldrkey_send_bracket_wrap_word(void) {
-    onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "[" SS_LALT(SS_TAP(X_RIGHT)) "]") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "[" SS_LCTL(SS_TAP(X_RIGHT)) "]");
-}
-
-/* [selection] */
-void ldrkey_send_bracket_wrap_selection(void) {
-    onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_X)) "[]" SS_TAP(X_LEFT) SS_LGUI(SS_TAP(X_V)) SS_TAP(X_RIGHT)) : SEND_STRING(SS_LCTL(SS_TAP(X_X)) "[]" SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_V)) SS_TAP(X_RIGHT));
-}
-
-/* {|} */
-void ldrkey_send_curlybrace_wrap_ini(void) {
-    SEND_STRING("{}" SS_TAP(X_LEFT));
-}
-
-/* {X} */
-void ldrkey_send_curlybrace_wrap_word(void) {
-    onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "{" SS_LALT(SS_TAP(X_RIGHT)) "}") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "{" SS_LCTL(SS_TAP(X_RIGHT)) "}");
-}
-
-/* {selection} */
-void ldrkey_send_curlybrace_wrap_selection(void) {
-    onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_X)) "{}" SS_TAP(X_LEFT) SS_LGUI(SS_TAP(X_V)) SS_TAP(X_RIGHT)) : SEND_STRING(SS_LCTL(SS_TAP(X_X)) "{}" SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_V)) SS_TAP(X_RIGHT));
-}
-
-void leader_start_user(void) {
-    isLeader = true;
-}
-
-void leader_end_user(void) {
-    isLeader = false;
-
-    /* Sequences on layer _MAIN & _MAC */
-        /*  éÉ      => LdrKey > / */
-        if (leader_sequence_one_key(KC_SLSH)) {
-            send_french_accent(_E, _ACUTE);
-        }
-        /*  àÀ      => LdrKey > A */
-        if (leader_sequence_one_key(KC_A)) {
-            send_french_accent(_A, _GRAVE);
-        }
-        /*  èÈ      => LdrKey > E */
-        if (leader_sequence_one_key(KC_E)) {
-            send_french_accent(_E, _GRAVE);
-        }
-        /*  ùÙ      => LdrKey > U */
-        if (leader_sequence_one_key(KC_U)) {
-            send_french_accent(_U, _GRAVE);
-        }
-        /*  â      => LdrKey > A > A */
-        if (leader_sequence_two_keys(KC_A, KC_A)) {
-            send_french_accent(_A, _CIRCUMFLEX);
-        }
-        /*  êÊ      => LdrKey > E > E */
-        if (leader_sequence_two_keys(KC_E, KC_E)) {
-            send_french_accent(_E, _CIRCUMFLEX);
-        }
-        /*  îÎ      => LdrKey > I > I */
-        if (leader_sequence_two_keys(KC_I, KC_I)) {
-            send_french_accent(_I, _CIRCUMFLEX);
-        }
-        /*  ôÔ      => LdrKey > O > O */
-        if (leader_sequence_two_keys(KC_O, KC_O)) {
-            send_french_accent(_O, _CIRCUMFLEX);
-        }
-        /*  ûÛ      => LdrKey > U > U */
-        if (leader_sequence_two_keys(KC_U, KC_U)) {
-            send_french_accent(_U, _CIRCUMFLEX);
-        }
-        /*  çÇ      => LdrKey > C */
-        if (leader_sequence_one_key(KC_C)) {
-            if (onMac) {
-                SEND_STRING(SS_LALT("c"));
-            } else {
-                host_keyboard_led_state().caps_lock ? SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P2) SS_TAP(X_P8) SS_UP(X_LALT)) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P3) SS_TAP(X_P5) SS_UP(X_LALT));
-            }
-        }
-        /*  CapsLock */
-        if (leader_sequence_one_key(QK_LEAD)) {
-            tap_code(KC_CAPS);
-        }
-        /*  ±       => LdrKey > = > - */
-        if (leader_sequence_two_keys(KC_EQL, KC_MINS)) {
-            onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_EQL)))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P1) SS_UP(X_LALT));
-        }
-        /*  ≤       => LdrKey > - > = */
-        if (leader_sequence_two_keys(KC_MINS, KC_EQL)) {
-            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_COMM))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P3) SS_UP(X_LALT));
-        }
-        /*  ≥       => LdrKey > = > = */
-        if (leader_sequence_two_keys(KC_EQL, KC_EQL)) {
-            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_DOT))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P2) SS_UP(X_LALT));
-        }
-        /*  <=      => LdrKey > , > , */
-        if (leader_sequence_two_keys(KC_COMM, KC_COMM)) {
-            SEND_STRING(SS_LSFT(SS_TAP(X_COMM)) SS_TAP(X_SPC) SS_TAP(X_EQL) SS_TAP(X_LEFT) SS_TAP(X_BSPC) SS_TAP(X_RIGHT));
-        }
-        /*  =>      => LdrKey > . > . */
-        if (leader_sequence_two_keys(KC_DOT, KC_DOT)) {
-            SEND_STRING("=>");
-        }
-        /*  ", "    => LdrKey > " " */
-        if (leader_sequence_one_key(KC_SPC)) {
-            SEND_STRING(", ");
-        }
-        /*  ". "    => LdrKey > " " > " " */
-        if (leader_sequence_two_keys(KC_SPC, KC_SPC)) {
-            SEND_STRING(". ");
-        }
-        /*  Backward delete current word (on cursor) */
-        if (leader_sequence_two_keys(KC_BSPC, KC_BSPC)) {
-            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_RIGHT)) SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_TAP(X_RIGHT)) SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC));
-        }
-        /*  Previous word delete */
-        if (leader_sequence_one_key(KC_BSPC)) {
-            onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC));
-        }
-        /*  Forward delete current word (on cursor) */
-        if (leader_sequence_two_keys(KC_DEL, KC_DEL)) {
-
-            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)) : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL));
-        }
-        /*  Next word delete */
-        if (leader_sequence_one_key(KC_DEL)) {
-            onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)): SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL));
-        }
-        /*  `   => LdrKey > Escape */
-        if (leader_sequence_one_key(QK_GESC)) {
-            SEND_STRING("`");
-        }
-        /*  ``` => LdrKey > Escape > Escape > Escape */
-        if (leader_sequence_three_keys(QK_GESC, QK_GESC, QK_GESC)) {
-            SEND_STRING("```");
-        }
-        /*  Printscreen             => LdrKey > Insert */
-        if (leader_sequence_one_key(KC_INS)) {
-            onMac ? SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_4)))) : SEND_STRING(SS_TAP(X_PSCR));
-        }
-        /*  Home                    => LdrKey > Page Up */
-        if (leader_sequence_one_key(KC_PGUP)) {
-            onMac ? SEND_STRING(SS_TAP(X_HOME)) : SEND_STRING(SS_LCTL(SS_TAP(X_HOME)));
-        }
-        /*  End                     => LdrKey > Page Down */
-        if (leader_sequence_one_key(KC_PGDN)) {
-            onMac ? SEND_STRING(SS_TAP(X_END)) : SEND_STRING(SS_LCTL(SS_TAP(X_END)));
-        }
-        /*  Close Curernt File/Tab  => LdrKey > W */
-        if (leader_sequence_one_key(KC_W)) {
-            onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_W))) : SEND_STRING(SS_LCTL(SS_TAP(X_W)));
-        }
-        /*  Close Current App       => LdrKey > Q */
-        if (leader_sequence_one_key(KC_Q)) {
-            onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_Q))) : SEND_STRING(SS_LALT(SS_TAP(X_F4)));
-        }
-        /*  "           => LdrKey > ' */
-        if (leader_sequence_one_key(KC_QUOT)) {
-            SEND_STRING("\"");
-        }
-        /*  "|"         => LdrKey > ' > ' */
-        if (leader_sequence_two_keys(KC_QUOT, KC_QUOT)) {
-            SEND_STRING("\"\"" SS_TAP(X_LEFT));
-        }
-        /*  "X" wrap    => LdrKey > ' > ' > ' */
-        if (leader_sequence_three_keys(KC_QUOT, KC_QUOT, KC_QUOT)) {
-            onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "\"" SS_LALT(SS_TAP(X_RIGHT)) "\"") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "\"" SS_LCTL(SS_TAP(X_RIGHT)) "\"");
-        }
-        /*  (           => LdrKey > Left Shift */
-        if (leader_sequence_one_key(KC_LSFT)) {
-            SEND_STRING("(");
-        }
-        /*  )           => LdrKey > Right Shift */
-        if (leader_sequence_one_key(KC_RSFT)) {
-            SEND_STRING(")");
-        }
-        /*  (|)         => LdrKey > Left Shift > Left Shift */
-        if (leader_sequence_two_keys(KC_LSFT, KC_LSFT)) {
-            ldrkey_send_paranthesis_wrap_ini();
-        }
-        /*  (|)         => LdrKey > Right Shift > Right Shift */
-        if (leader_sequence_two_keys(KC_RSFT, KC_RSFT)) {
-            ldrkey_send_paranthesis_wrap_ini();
-        }
-        /*  (X) wrap    => LdrKey > Left Shift > W */
-        if (leader_sequence_two_keys(KC_LSFT, KC_W)) {
-            ldrkey_send_paranthesis_wrap_word();
-        }
-        /*  (X) wrap    => LdrKey > Right Shift > W */
-        if (leader_sequence_two_keys(KC_RSFT, KC_W)) {
-            ldrkey_send_paranthesis_wrap_word();
-        }
-        /*  (X) wrap selection    => LdrKey > Left Shift > W > W */
-        if (leader_sequence_three_keys(KC_LSFT, KC_W, KC_W)) {
-            ldrkey_send_paranthesis_wrap_selection();
-        }
-        /*  (X) wrap selection    => LdrKey > Right Shift > W > W */
-        if (leader_sequence_three_keys(KC_RSFT, KC_W, KC_W)) {
-            ldrkey_send_paranthesis_wrap_selection();
-        }
-        /*  [           => LdrKey > Left CTL */
-        if (leader_sequence_one_key(KC_LCTL)) {
-            SEND_STRING("[");
-        }
-        /*  ]           => LdrKey > Right CTL */
-        if (leader_sequence_one_key(KC_RCTL)) {
-            SEND_STRING("]");
-        }
-        /*  [|]         => LdrKey > Left CTL > Left CTL */
-        if (leader_sequence_two_keys(KC_LCTL, KC_LCTL)) {
-            ldrkey_send_bracket_wrap_ini();
-        }
-        /*  [|]         => LdrKey > Right CTL > Right CTL */
-        if (leader_sequence_two_keys(KC_RCTL, KC_RCTL)) {
-            ldrkey_send_bracket_wrap_ini();
-        }
-        /*  [X] wrap    => LdrKey > Left CTL > W */
-        if (leader_sequence_two_keys(KC_LCTL, KC_W)) {
-            ldrkey_send_bracket_wrap_word();
-        }
-        /*  [X] wrap    => LdrKey > Right CTL > W */
-        if (leader_sequence_two_keys(KC_RCTL, KC_W)) {
-            ldrkey_send_bracket_wrap_word();
-        }
-        /*  [X] wrap selection    => LdrKey > Left CTL > W > W */
-        if (leader_sequence_three_keys(KC_LCTL, KC_W, KC_W)) {
-            ldrkey_send_bracket_wrap_selection();
-        }
-        /*  [X] wrap selection    => LdrKey > Right CTL > W > W */
-        if (leader_sequence_three_keys(KC_RCTL, KC_W, KC_W)) {
-            ldrkey_send_bracket_wrap_selection();
-        }
-        /*  {           => LdrKey > Left ALT */
-        if (leader_sequence_one_key(KC_LALT)) {
-            SEND_STRING("{");
-        }
-        /*  }           => LdrKey > Right ALT */
-        if (leader_sequence_one_key(KC_RALT)) {
-            SEND_STRING("}");
-        }
-        /*  {|}         => LdrKey > Left ALT > Left ALT */
-        if (leader_sequence_two_keys(KC_LALT, KC_LALT)) {
-            ldrkey_send_curlybrace_wrap_ini();
-        }
-        /*  {|}         => LdrKey > Right ALT > Right ALT */
-        if (leader_sequence_two_keys(KC_RALT, KC_RALT)) {
-            ldrkey_send_curlybrace_wrap_ini();
-        }
-        /*  {X} wrap    => LdrKey > Left ALT > W */
-        if (leader_sequence_two_keys(KC_LALT, KC_W)) {
-            ldrkey_send_curlybrace_wrap_word();
-        }
-        /*  {X} wrap    => LdrKey > Right ALT > W */
-        if (leader_sequence_two_keys(KC_RALT, KC_W)) {
-            ldrkey_send_curlybrace_wrap_word();
-        }
-        /*  {X} wrap selection    => LdrKey > Left ALT > W > W */
-        if (leader_sequence_three_keys(KC_LALT, KC_W, KC_W)) {
-            ldrkey_send_curlybrace_wrap_selection();
-        }
-        /*  {X} wrap selection    => LdrKey > Right ALT > W > W */
-        if (leader_sequence_three_keys(KC_RALT, KC_W, KC_W)) {
-            ldrkey_send_curlybrace_wrap_selection();
-        }
-        /*  Select everything on this line before cursor => LdrKey > Left */
-        if (leader_sequence_one_key(KC_LEFT)) {
-            onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_LEFT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_HOME)));
-        }
-        /*  Select everything on this line after cursor  => LdrKey > Right */
-        if (leader_sequence_one_key(KC_RIGHT)) {
-            onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_RIGHT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_END)));
-        }
-        /*  Select everything on this line before cursor and bring on previous line => LdrKey > Left > Left */
-        if (leader_sequence_two_keys(KC_LEFT, KC_LEFT)) {
-            onMac ? SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_LGUI(SS_TAP(X_RIGHT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_TAP(X_END)));
-        }
-        /*  Select everything on this line  => LdrKey > Right > Left */
-        if (leader_sequence_two_keys(KC_RIGHT, KC_LEFT)) {
-            onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_RIGHT) SS_LSFT(SS_LGUI(SS_TAP(X_LEFT))))) : SEND_STRING(SS_TAP(X_END) SS_LSFT(SS_TAP(X_HOME)));
-        }
-        /*  Select 1x Page Up on the page before the cursor  => LdrKey > Up */
-        if (leader_sequence_one_key(KC_UP)) {
-            SEND_STRING(SS_LSFT(SS_TAP(X_PGUP)));
-        }
-        /*  Select 1x Page Down on the page after the cursor => LdrKey > Down */
-        if (leader_sequence_one_key(KC_DOWN)) {
-            SEND_STRING(SS_LSFT(SS_TAP(X_PGDN)));
-        }
-        /*  Select everything on the page before the cursor => LdrKey > Up > Up */
-        if (leader_sequence_two_keys(KC_UP, KC_UP)) {
-            onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_UP)))) : SEND_STRING(SS_LSFT(SS_LCTL(SS_TAP(X_HOME))));
-        }
-        /*  Select everything on the page after the cursor => LdrKey > Down > Down */
-        if (leader_sequence_two_keys(KC_DOWN, KC_DOWN)) {
-            onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_DOWN)))) : SEND_STRING(SS_LSFT(SS_LCTL(SS_TAP(X_END))));
-        }
-        /* HELPER => spit out the url of the layout description page on github */
-        if (leader_sequence_five_keys(QK_GESC, QK_GESC, QK_GESC, QK_GESC, QK_GESC)) {
-            SEND_STRING("https://github.com/qmk/qmk_firmware/tree/master/keyboards/dztech/dz65rgb/keymaps/drootz");
-        }
-        /*  google.ca   => LdrKey > G > G */
-        if (leader_sequence_two_keys(KC_G, KC_G)) {
-            SEND_STRING("https://google.ca" SS_TAP(X_ENT));
-        }
-        /*  @gmail  => LdrKey > M > L > T */
-        if (leader_sequence_three_keys(KC_M, KC_L, KC_T)) {
-            SEND_STRING("mailto." SS_TAP(X_D) SS_TAP(X_A) SS_TAP(X_N) SS_TAP(X_I) SS_TAP(X_E) SS_TAP(X_L) SS_TAP(X_R) SS_TAP(X_A) SS_TAP(X_C) SS_TAP(X_I) SS_TAP(X_N) SS_TAP(X_E) "@gmail.com");
-        }
-        /*  Show Desktop            => LdrKey > D */
-        if (leader_sequence_one_key(KC_D)) {
-            onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_SPC)) "Mission" SS_TAP(X_ENT)) : SEND_STRING(SS_LGUI(SS_TAP(X_D)));
-        }
-}
-
-#endif /* LEADER */
-
-/**************** DYNAMIC MACRO *********************/
-
-void dynamic_macro_record_start_user(int8_t direction) {
-    onMac = false; /* reset layer bool as dynamic macro clear the keyboard and reset layers. */
-    if (!isBlinking && !isRecording) {
-        reset_blink_cycle();
-        isBlinking = true;
-        isRecording = true;
-    }
-}
-
-void dynamic_macro_record_end_user(int8_t direction) {
-    if (isBlinking && isRecording) {
-        reset_blink_status();
-        reset_blink_cycle();
-    }
-}
-
-void dynamic_macro_play_user(int8_t direction) {
-    switch (direction) {
-        case 1:
-            if (!isBlinking && !isPlaying) {
-                reset_blink_cycle();
-                isBlinking = true;
-                isPlaying = true;
-                macro_one_play_timer = timer_read();
-            }
-            break;
-        case -1:
-            if (!isBlinking && !isPlaying) {
-                reset_blink_cycle();
-                isBlinking = true;
-                isPlaying = true;
-                macro_two_play_timer = timer_read();
-            }
-            break;
-    }
-}
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/readme.md b/keyboards/dztech/dz65rgb/keymaps/drootz/readme.md
deleted file mode 100644
index 15f15d752be..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/readme.md
+++ /dev/null
@@ -1,210 +0,0 @@
-![DZ65RGBv2 Layout Image - MAIN](https://res.cloudinary.com/drootz/image/upload/c_scale,w_800/v1582000645/drootz_dz65rgb_layer_0_main_n61oxl.jpg)
-
-# Drootz's DZ65RGBv2 ANSI Layout
-
-This layout fit best people who mainly type in English but regularly need to type in French _(using an English keyboard in OS setting)_. There are also some cool LED indicator effects and tons of Leader Key bindings/macros designed to work on both Mac and Windows OS. I tried to keep things as simple as possible from a usability perspective. Enjoy!
-
-- [LAYERS](#LAYERS)
-- [LEADER KEY BINDINGS:](#LEADER-KEY-BINDINGS)
-	- [OS and Keyboard Macros](#OS-and-Keyboard-Macros)
-	- [French Accents](#French-Accents)
-	- [Special Characters and Punctuation](#Special-Characters-and-Punctuation)
-	- [Text Selection Macros](#Text-Selection-Macros)
-	- [Expanded Space Cadet Macros](#Expanded-Space-Cadet-Macros)
-	- [Text Expanders](#Text-Expanders)
-- [STEP BY STEP FLASH INSTRUCTIONS](#STEP-BY-STEP-FLASH-INSTRUCTIONS)
-
-## HIGH LEVEL DESCRIPTION
-
-#### Dual function Capslock key
-- Single tap to trigger the Leader Key
-- Double tap to toggle Capslock ON/OFF
-
-#### 70+ useful Leader Key bindings and macros 
-- "Designed" to work on both Mac and Windows OS with an English keyboard OS setting
-- Per key timing set at 425ms. Never a key sequence!
-- 20+ Punctuation, ASCII, System shortcuts and macros
-- 15+ French accents (è, é, ê, È, É, Ê, à, etc.)
-	- No need to switch to a French keyboard OS setting!
-	- Preserve Capslock if enabled
-- 8 Text "selection" shortcuts
-- 20+ Expanded "Space Cadet" feature with Shift, Ctrl, Alt and DoubleQuote for (), [], {} and ""
-- Few useful strings output for my workflow (You may want to change or remove them...)
-
-#### Dynamic Macros enabled
-- Record/Play up to 2 Macros
-- Nesting allowed
-
-#### Kept only 4 RGB matrix animations due to size of firmware
-- Typing Heatmap => How hot is your WPM! (preferred animation because of LED indicators)
-- Matrix Splash => Full gradient & value pulse away from a single key hit then fades value out 
-- Solid Splash => Hue & value pulse away from a single key hit then fades value out 
-- Solid Color => Static single hue, no speed support
-
-#### LED indicators and animations
-- White led when Capslock toggle ON
-- The brightness of all the other indicator can be adjusted globally with the RGB matrix brightness setting on layer \_FN
-- White LED indicator for layer selection and current layer identification
-- Red and green blinking indicator when "recording" or "playing" Dynamic Macros
-- Leader Key LED indicator:
-	- Persistent 50% dimmed under-glow on top right corner key
-	- Light up at 100% for the duration of the Leader Key timeout when activated
-	- Hue, saturation and brightness can be globally adjusted with the RGB matrix settings on layer \_FN
-
-#### 3 Layers
-- \_MAIN: Default layer for Windows OS
-- \_MAC: Transparent layer that switch left hand modifier KC_LALT and KC_LGUI keys for MacOS
-- \_FN: Functions & settings layer:
-	- Macro 1 & 2 keycodes (Record, Stop, Play) with LED indicators
-	- F Keys (F1...F12) on number row
-	- RGB matrix & animation settings
-	- Screen brightness & volume system controls
-	- Layer selection
-
-## LAYERS
-
-- Colored keys on the layout visuals below represent the position of the LED indicators on each layer.
-- Press down and hold the MO(\_FN) key to access the \_FN layer
-- Double tap on the Capslock key to toggle Capslock ON/OFF
-- \_TRNS keys use the next lowest non-transparent key (on lower layers)
-- \_NO keys are ignored (nothing happens)
-
-### [Layer 0: \_MAIN](http://www.keyboard-layout-editor.com/#/gists/67c22220856a927766bd3e0331ed782a)
-![DZ65RGBv2 Layout Image - MAIN](https://res.cloudinary.com/drootz/image/upload/c_scale,w_800/v1582000645/drootz_dz65rgb_layer_0_main_n61oxl.jpg)
-
-### [Layer 1: \_MAC](http://www.keyboard-layout-editor.com/#/gists/4a32d80c67c778658febf28524fb5000)
-![DZ65RGBv2 Layout Image - MAC](https://res.cloudinary.com/drootz/image/upload/c_scale,w_800/v1582000653/drootz_dz65rgb_layer_1_mac_z4tsaw.jpg)
-
-### [Layer 2: \_FN](http://www.keyboard-layout-editor.com/#/gists/b583bd7cc5b0a75b4610bbda18fba65e)
-![DZ65RGBv2 Layout Image - FN](https://res.cloudinary.com/drootz/image/upload/c_scale,w_800/v1582000661/drootz_dz65rgb_layer_2_fn_zv8yte.jpg)
-
-## LEADER KEY BINDINGS
-
-The Leader Key on this layout is triggered by tapping the Capslock key once. Once triggered, we have 450ms between each key press to type any one of the sequences listed below. All sequences are designed to work on both Mac and Windows with an English keyboard OS setting.
-
-- [OS and Keyboard Macros](#OS-and-Keyboard-Macros)
-- [French Accents](#French-Accents)
-- [Special Characters and Ponctuation](#Special-Characters-and-Ponctuation)
-- [Text Selection Macros](#Text-Selection-Macros)
-- [Expanded Space Cadet Macros](#Expanded-Space-Cadet-Macros)
-- [Text Expanders](#Text-Expanders)
-
-#### Legend:
-
-| Acronym | Description |
-| :--- | :--- |
-| LDR | Leader Key |
-| SFT | Shift key |
-| CTL | Control key |
-| ESC | Escape key |
-| ¶ | Text cursor position |
-
-### OS and Keyboard Macros
-
-| Output | Sequence | Description
-| :--- | :--- | :--- |
-| Toggle Capslock | `LDR  LDR` | Single tap Capslock to trigger the LDR key |
-| Delete all previous characters in word on cursor OR; | `LDR  BACKSPACE` | n/a |
-| => Delete previous word if triggered repeatedly | `LDR  BACKSPACE` | n/a |
-| Delete all forward characters in word on cursor OR; | `LDR  DEL` | n/a |
-| => Delete next word if triggered repeatedly | `LDR  DEL` | n/a |
-| Backward Delete whole word on cursor | `LDR  BACKSPACE BACKSPACE` | n/a |
-| Forward Delete whole word on cursor | `LDR  DEL DEL` | n/a |
-| Printscreen | `LDR  INSERT` | n/a |
-| Home | `LDR  PAGE-UP` | n/a |
-| End | `LDR  PAGE-DOWN` | n/a |
-| OS: Close current file/tab | `LDR  W` | n/a |
-| OS: Close current application | `LDR  Q` | n/a |
-| OS: Show Desktop(Win) or Mission Control(Mac)  | `LDR  D` | The Mac sequence will work with LaunchBar (Cmd+Space) |
-
-### French Accents
-
-| Output | Sequence | Description
-| :--- | :--- | :--- |
-| `à`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `À`¶ | `LDR  A` | Will output upper character if Capslock enabled. |
-| `â`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `Â`¶ | `LDR  A  A` | Will output upper character if Capslock enabled. |
-| `ç`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `Ç`¶ | `LDR  C` | Will output upper character if Capslock enabled. |
-| `è`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `È`¶ | `LDR  E` | Will output upper character if Capslock enabled. |
-| `ê`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `Ê`¶ | `LDR  E  E` | Will output upper character if Capslock enabled. |
-| `é`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `É`¶ | `LDR  /` | Will output upper character if Capslock enabled |
-| `î`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `Î`¶ | `LDR  I  I` | Will output upper character if Capslock enabled. |
-| `ô`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `Ô`¶ | `LDR  O  O` | Will output upper character if Capslock enabled. |
-| `ù`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `Ù`¶ | `LDR  U` | Will output upper character if Capslock enabled. |
-| `û`¶ &nbsp;&nbsp;or&nbsp;&nbsp; `Û`¶ | `LDR  U  U` | Will output upper character if Capslock enabled. |
-
-### Special Characters and Punctuation
-
-| Output | Sequence | Description |
-| :--- | :--- | :--- |
-| `±`¶ | `LDR  =  -` | n/a |
-| `≤`¶ | `LDR  -  =` | n/a |
-| `≥`¶ | `LDR  =  =` | n/a |
-| `=>`¶ | `LDR  ,  ,` | n/a |
-| `<=`¶ | `LDR  .  .` | n/a |
-| ``` ` ``` ¶ | `LDR  ESC` | n/a |
-| \`\`\` ¶ | `LDR  ESC  ESC  ESC` | n/a |
-| `,` space ¶ | `LDR  SPACE` | n/a |
-| `.` space ¶ | `LDR  SPACE  SPACE` | n/a |
-
-### Text Selection Macros
-
-| Output | Sequence |
-| :--- | :--- |
-| Select everything on this line before cursor | `LDR  LEFT-ARROW` |
-| Select everything on this line after cursor | `LDR  RIGHT-ARROW` |
-| Select everything on this line before cursor up to end of previous line | `LDR  LEFT-ARROW  LEFT-ARROW` | n/a |
-| Select everything on this line | `LDR  RIGHT-ARROW  LEFT-ARROW` |
-| Select 1x Page Up on the page before the cursor | `LDR  UP-ARROW` |
-| Select 1x Page Down on the page after the cursor | `LDR  DOWN-ARROW` |
-| Select everything on the page before the cursor | `LDR  UP-ARROW  UP-ARROW` |
-| Select everything on the page after the cursor | `LDR  DOWN-ARROW  DOWN-ARROW` |
-
-### Expanded Space Cadet Macros
-
-| Output | Sequence | Description |
-| :--- | :--- | :--- |
-| `"`¶ | `LDR  '` | Will output single double-quote |
-| `"`¶`"` | `LDR  '  '` | Will wrap cursor between two double-quotes |
-| `"`WORD`"`¶ | `LDR  '  '  '` | Will wrap word on cursor between two double-quotes |
-| `(`¶ | `LDR  LEFT-SFT` | Will output single left parenthesis |
-| `)`¶ | `LDR  RIGHT-SFT` | Will output single right parenthesis |
-| `(`¶`)` | `LDR  LEFT-SFT  LEFT-SFT` | Will wrap cursor between two parenthesis' |
-| `(`¶`)` | `LDR  RIGHT-SFT  RIGHT-SFT` | Will wrap cursor between two parenthesis' |
-| `(`WORD`)`¶ | `LDR  LEFT-SFT  W` | Will wrap word on cursor between two parenthesis' |
-| `(`WORD`)`¶ | `LDR  RIGHT-SFT  W` | Will wrap word on cursor between two parenthesis' |
-| `(`SELECTION`)`¶ | `LDR  LEFT-SFT  W  W` | Will wrap selection between two parenthesis' |
-| `(`SELECTION`)`¶ | `LDR  RIGHT-SFT  W  W` | Will wrap selection between two parenthesis' |
-| `[`¶ | `LDR  LEFT-CTL` | Will output single left bracket |
-| `]`¶ | `LDR  RIGHT-CTL` | Will output single right bracket |
-| `[`¶`]` | `LDR  LEFT-CTL  LEFT-CTL` | Will wrap cursor between two brackets' |
-| `[`¶`]` | `LDR  RIGHT-CTL  RIGHT-CTL` | Will wrap cursor between two brackets' |
-| `[`WORD`]`¶ | `LDR  LEFT-CTL  W` | Will wrap word on cursor between two brackets' |
-| `[`WORD`]`¶ | `LDR  RIGHT-CTL  W` | Will wrap word on cursor between two brackets' |
-| `[`SELECTION`]`¶ | `LDR  LEFT-CTL  W  W` | Will wrap selection between two brackets' |
-| `[`SELECTION`]`¶ | `LDR  RIGHT-CTL  W  W` | Will wrap selection between two brackets' |
-| `{`¶ | `LDR  LEFT-ALT` | Will output single left curly brace |
-| `}`¶ | `LDR  RIGHT-ALT` | Will output single right curly brace |
-| `{`¶`}` | `LDR  LEFT-ALT  LEFT-ALT` | Will wrap cursor between two curly braces' |
-| `{`¶`}` | `LDR  RIGHT-ALT  RIGHT-ALT` | Will wrap cursor between two curly braces' |
-| `{`WORD`}`¶ | `LDR  LEFT-ALT  W` | Will wrap word on cursor between two curly braces' |
-| `{`WORD`}`¶ | `LDR  RIGHT-ALT  W` | Will wrap word on cursor between two curly braces' |
-| `{`SELECTION`}`¶ | `LDR  LEFT-ALT  W  W` | Will wrap selection between two curly braces' |
-| `{`SELECTION`}`¶ | `LDR  RIGHT-ALT  W  W` | Will wrap selection between two curly braces' |
-
-### Text Expanders
-
-| Output | Sequence | Description |
-| :--- | :--- | :--- |
-| https://google.ca | `LDR  G  G` | n/a |
-| Layout Help URL | `LDR  ESC  ESC  ESC  ESC  ESC` | URL to this readme.md page |
-| My Gmail | `LDR  M L T` | You may want to update this before compiling the firmware |
-
-## STEP BY STEP FLASH INSTRUCTIONS
-1. Build the Firmware. Run build command in directory: `make dztech/dz65rgb/v2:drootz`
-	- Approximate firmware size: 27302/28672 (95%, 1370 bytes free)
-2. Flash the Firmware:
-    - Open QMK Toolbox Application
-    - Open firmware file: dztech_dz65rgb_v2_drootz.hex
-    - Unplug keyboard USB, and hold the ESC key while plugging it back in
-    - Check that QMK Toolbox displays: *** DFU device connected. 
-    - Hit the flash button!
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk b/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk
deleted file mode 100644
index 2f8ab8ecc38..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-DYNAMIC_MACRO_ENABLE = yes
-LEADER_ENABLE = yes
-
-# Firmware size Optimizations
-LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = no
-SPACE_CADET_ENABLE = no
-TAP_DANCE_ENABLE   = no
-UNICODEMAP_ENABLE  = no
-SPLIT_KEYBOARD    = no
diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/config.h b/keyboards/dztech/dz65rgb/keymaps/jumper149/config.h
deleted file mode 100644
index 081b2d8b41d..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/jumper149/config.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2021 Felix Springer
- *
- * 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 FORCE_NKRO
-
-#ifdef RGB_MATRIX_ENABLE
-
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// Fix RGB_MATRIX_STARTUP, because RGB_MATRIX_CYCLE_ALL is disabled.
-// The actual handling of RGB_EFFECTs is done in keymap.c
-#undef RGB_MATRIX_DEFAULT_MODE
-
-#endif
diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c b/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
deleted file mode 100644
index ec63d53bd7a..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/jumper149/keymap.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright 2021 Felix Springer
- *
- * 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_user {
-    _QWERTY,
-    _AD,
-    _VI,
-    _FN,
-    _KB
-};
-
-enum keycodes_user {
-    _BASEEF = SAFE_RANGE,
-    _KITTEF
-};
-
-int selected_mode_user = RGB_MATRIX_CUSTOM_base_effect; // for layer_state_set_user()
-bool process_record_user(uint16_t keycode, keyrecord_t * record) {
-    switch (keycode) {
-        case _BASEEF:
-            if (record->event.pressed) {
-                selected_mode_user = RGB_MATRIX_CUSTOM_base_effect;
-            }
-            return false;
-        case _KITTEF:
-            if (record->event.pressed) {
-                selected_mode_user = RGB_MATRIX_CUSTOM_kitt_effect;
-            }
-            return false;
-        default:
-            return true;
-    }
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_65_ansi(
-        KC_GRAVE,       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_ESC,         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(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_AD] = LAYOUT_65_ansi(
-        _______,        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-        _______,        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
-        _______,        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
-        _______,                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
-        _______,        _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
-    ),
-    [_VI] = LAYOUT_65_ansi(
-        KC_ESC,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        _______,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_ESC,         XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,          _______, XXXXXXX,
-        _______,                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FIND, _______, _______, XXXXXXX,
-        _______,        _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
-    ),
-    [_FN] = LAYOUT_65_ansi(
-        XXXXXXX,        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,
-        XXXXXXX,        KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, KC_PSTE,
-        CTL_T(KC_CAPS), KC_BRID, KC_VOLD, KC_BRIU, XXXXXXX, XXXXXXX, TG(_AD), TG(_VI), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, KC_COPY,
-        KC_LSFT,                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP,  XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, KC_MSTP, KC_CUT,
-        KC_LCTL,        KC_LGUI, KC_LALT,                            XXXXXXX,                   MO(_KB), XXXXXXX, KC_RCTL, KC_MPRV, KC_MPLY, KC_MNXT
-    ),
-    [_KB] = LAYOUT_65_ansi(
-        XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPI, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX,
-        XXXXXXX,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX,        XXXXXXX, RGB_SAI, RGB_SAD, XXXXXXX, XXXXXXX, _BASEEF, _KITTEF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          EE_CLR,  XXXXXXX,
-        KC_LSFT,                 RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT, XXXXXXX, XXXXXXX,
-        XXXXXXX,        XXXXXXX, XXXXXXX,                            XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-    /*
-    [_LEDS]    = LAYOUT_65_ansi(
-         0  ,            1  ,     2  ,     3  ,     4  ,     5  ,     6  ,     7  ,     8  ,     9  ,    10  ,    11  ,    12  ,    13  ,    14  ,
-        15  ,           16 Q,    17 W,    18 E,    19 R,    20 T,    21 Y,    22 U,    23 I,    24 O,    25 P,    26  ,    27  ,    28  ,    29  ,
-        30  ,           31 A,    32 S,    33 D,    34 F,    35 G,    36 H,    37 J,    38 K,    39 L,    40  ,    41  ,             42  ,    43  ,
-        44  ,                    45 Z,    46 X,    47 C,    48 V,    49 B,    50 N,    51 M,    52  ,    53  ,    54  ,    55  ,    56  ,    57  ,
-        58  ,           59  ,    60  ,                               61  ,                      62  ,    63  ,    64  ,    65  ,    66  ,    67
-    )
-    */
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _QWERTY:
-            rgb_matrix_mode(selected_mode_user);
-            break;
-        case _AD:
-            if (selected_mode_user == RGB_MATRIX_CUSTOM_base_effect) {
-                rgb_matrix_mode(RGB_MATRIX_CUSTOM_base_ad_effect);
-            } else {
-                rgb_matrix_mode(selected_mode_user);
-            }
-            break;
-        case _VI:
-            rgb_matrix_mode(RGB_MATRIX_CUSTOM_vi_effect);
-            break;
-        case _FN:
-            rgb_matrix_mode(RGB_MATRIX_CUSTOM_fn_indicator);
-            break;
-        case _KB:
-            rgb_matrix_mode(RGB_MATRIX_CUSTOM_kb_indicator);
-            break;
-    }
-
-    return state;
-}
diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/readme.md b/keyboards/dztech/dz65rgb/keymaps/jumper149/readme.md
deleted file mode 100644
index 9de86be2d12..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/jumper149/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# jumper149's DZ65RGB v2
-
-Run commands in the root directory of this repository.
-
-```
-qmk compile && sudo dfu-programmer atmega32u4 erase && sudo dfu-programmer atmega32u4 flash ./dztech_dz65rgb_v2_jumper149.hex && sudo dfu-programmer atmega32u4 reset
-```
-
-## build
-
-```
-qmk compile
-```
-
-## flash
-
-Use `qmk flash` or if it is broken (unknown reason) you can try this workaround.
-I personally had some problems on ArchLinux, that I didn't debug any further though.
-
-```
-sudo dfu-programmer atmega32u4 erase
-sudo dfu-programmer atmega32u4 flash ./dztech_dz65rgb_v2_jumper149.hex
-sudo dfu-programmer atmega32u4 reset
-```
diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/rgb_matrix_user.inc b/keyboards/dztech/dz65rgb/keymaps/jumper149/rgb_matrix_user.inc
deleted file mode 100644
index 8d99ff9481a..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/jumper149/rgb_matrix_user.inc
+++ /dev/null
@@ -1,700 +0,0 @@
-/* Copyright 2021 Felix Springer
- *
- * 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/>.
- */
-RGB_MATRIX_EFFECT(base_effect)
-RGB_MATRIX_EFFECT(base_ad_effect)
-RGB_MATRIX_EFFECT(vi_effect)
-RGB_MATRIX_EFFECT(fn_indicator)
-RGB_MATRIX_EFFECT(kb_indicator)
-RGB_MATRIX_EFFECT(kitt_effect)
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-/*
-[_LEDS]    = LAYOUT_65_ansi(
-     0  ,            1  ,     2  ,     3  ,     4  ,     5  ,     6  ,     7  ,     8  ,     9  ,    10  ,    11  ,    12  ,    13  ,    14  ,
-    15  ,           16 Q,    17 W,    18 E,    19 R,    20 T,    21 Y,    22 U,    23 I,    24 O,    25 P,    26  ,    27  ,    28  ,    29  ,
-    30  ,           31 A,    32 S,    33 D,    34 F,    35 G,    36 H,    37 J,    38 K,    39 L,    40  ,    41  ,             42  ,    43  ,
-    44  ,                    45 Z,    46 X,    47 C,    48 V,    49 B,    50 N,    51 M,    52  ,    53  ,    54  ,    55  ,    56  ,    57  ,
-    58  ,           59  ,    60  ,                               61  ,                      62  ,    63  ,    64  ,    65  ,    66  ,    67
-)
-*/
-
-// variable for startup animation
-bool BASE_EFFECT_NOT_STARTED_YET = true;
-uint8_t base_effect_startup_counter = 255;
-
-static HSV base_effect_math(HSV hsv, uint8_t i, uint8_t time) {
-
-    if (BASE_EFFECT_NOT_STARTED_YET) {
-        base_effect_startup_counter = 0;
-        BASE_EFFECT_NOT_STARTED_YET = false;
-    }
-
-    // startup animation
-    if (base_effect_startup_counter < 255) {
-
-        // jump to correct indices for alpha keys
-        if (i == 0) { // only run for one key (key 0 is an arbitrary choice)
-            if (base_effect_startup_counter == 0) {
-                base_effect_startup_counter = 1;
-            } else if (base_effect_startup_counter == 1) {
-                base_effect_startup_counter = 17;
-            } else if (base_effect_startup_counter == 26) {
-                base_effect_startup_counter = 31;
-            } else if (base_effect_startup_counter == 40) {
-                base_effect_startup_counter = 45;
-            } else if (base_effect_startup_counter == 52) {
-                base_effect_startup_counter = 100;
-            } else if (base_effect_startup_counter == 120) {
-                base_effect_startup_counter = 255;
-            } else {
-                base_effect_startup_counter++;
-            }
-        }
-
-        // overwrite some highlit keys
-        if (3 + 39 - i < base_effect_startup_counter - 100 && i >= 36 && i <= 39) {
-            hsv.s = hsv.s;
-        } else if (3 + 39 - i < base_effect_startup_counter - 100 && i >= 31 && i <= 34) {
-            hsv.s = hsv.s;
-        // light up alpha keys
-        } else if (i < base_effect_startup_counter && i >= 16 && i <= 25) {
-            hsv.s = 0;
-        } else if (31 + 39 - i < base_effect_startup_counter && i >= 31 && i <= 39) {
-            hsv.s = 0;
-        } else if (i < base_effect_startup_counter && i >= 45 && i <= 51) {
-            hsv.s = 0;
-        // light up number row
-        } else if (12 + 1 - i < base_effect_startup_counter - 100 && i == 2) {
-            hsv.s = 0;
-            hsv.v = 1 * (hsv.v / 8);
-        } else if (12 + 1 - i < base_effect_startup_counter - 100 && i == 3) {
-            hsv.s = 0;
-            hsv.v = 2 * (hsv.v / 8);
-        } else if (12 + 1 - i < base_effect_startup_counter - 100 && i == 4) {
-            hsv.s = 0;
-            hsv.v = 3 * (hsv.v / 8);
-        } else if (12 + 1 - i < base_effect_startup_counter - 100 && i >= 5 && i <= 8) {
-            hsv.v = hsv.v;
-        } else if (12 + 1 - i < base_effect_startup_counter - 100 && i == 9) {
-            hsv.s = 0;
-            hsv.v = 3 * (hsv.v / 8);
-        } else if (12 + 1 - i < base_effect_startup_counter - 100 && i == 10) {
-            hsv.s = 0;
-            hsv.v = 2 * (hsv.v / 8);
-        } else if (12 + 1 - i < base_effect_startup_counter - 100 && i == 11) {
-            hsv.s = 0;
-            hsv.v = 1 * (hsv.v / 8);
-        // light up punctuation keys
-        } else if (27 + 1 - i < base_effect_startup_counter - 100 && i >= 26 && i <= 27) {
-            hsv.s = 0;
-            hsv.v = hsv.v / 8;
-        } else if (41 + 2 - i < base_effect_startup_counter - 100 && i >= 40 && i <= 41) {
-            hsv.s = 0;
-            hsv.v = hsv.v / 8;
-        } else if (54 + 3 - i < base_effect_startup_counter - 100 && i >= 52 && i <= 54) {
-            hsv.s = 0;
-            hsv.v = hsv.v / 8;
-        // rest
-        } else {
-            hsv.v = 0;
-        }
-
-    } else {
-
-        switch (i) {
-
-            // number row
-            case 0:
-                hsv.v = 0;
-                break;
-            case 1:
-                hsv.v = 0;
-                break;
-            case 2:
-                hsv.s = 0;
-                hsv.v = 1 * (hsv.v / 8);
-                break;
-            case 3:
-                hsv.s = 0;
-                hsv.v = 2 * (hsv.v / 8);
-                break;
-            case 4:
-                hsv.s = 0;
-                hsv.v = 3 * (hsv.v / 8);
-                break;
-            case 5:
-                hsv.v = hsv.v;
-                break;
-            case 6:
-                hsv.v = hsv.v;
-                break;
-            case 7:
-                hsv.v = hsv.v;
-                break;
-            case 8:
-                hsv.v = hsv.v;
-                break;
-            case 9:
-                hsv.s = 0;
-                hsv.v = 3 * (hsv.v / 8);
-                break;
-            case 10:
-                hsv.s = 0;
-                hsv.v = 2 * (hsv.v / 8);
-                break;
-            case 11:
-                hsv.s = 0;
-                hsv.v = 1 * (hsv.v / 8);
-                break;
-            case 12:
-                hsv.v = 0;
-                break;
-
-            // punctuation keys
-            case 26:
-                hsv.s = 0;
-                hsv.v = hsv.v / 8;
-                break;
-            case 27:
-                hsv.s = 0;
-                hsv.v = hsv.v / 8;
-                break;
-            case 40:
-                hsv.s = 0;
-                hsv.v = hsv.v / 8;
-                break;
-            case 41:
-                hsv.s = 0;
-                hsv.v = hsv.v / 8;
-                break;
-            case 52:
-                hsv.s = 0;
-                hsv.v = hsv.v / 8;
-                break;
-            case 53:
-                hsv.s = 0;
-                hsv.v = hsv.v / 8;
-                break;
-            case 54:
-                hsv.s = 0;
-                hsv.v = hsv.v / 8;
-                break;
-
-            default:
-                if (
-                    (i > 15 && i <= 25) ||
-                    (i > 30 && i <= 39) ||
-                    (i > 44 && i <= 51)
-                ) {
-                    if (i > 35 && i <= 39) {
-                        hsv.s = hsv.s;
-                    } else if (i > 30 && i <= 34) {
-                        hsv.s = hsv.s;
-                    } else {
-                        hsv.s = 0;
-                    }
-                } else {
-                    hsv.v = 0;
-                }
-                break;
-
-        }
-
-    }
-
-    return hsv;
-}
-
-bool base_effect(effect_params_t* params) {
-    return effect_runner_i(params, &base_effect_math);
-}
-
-static HSV base_ad_effect_math(HSV hsv, uint8_t i, uint8_t time) {
-
-    // no startup animation
-    if (BASE_EFFECT_NOT_STARTED_YET) {
-        base_effect_startup_counter = 255; // act like startup is already completed
-        BASE_EFFECT_NOT_STARTED_YET = false;
-    }
-
-    switch (i) {
-
-        // delete
-        case 14:
-            hsv.h = 0;
-            hsv.s = 255;
-            break;
-
-        // insert
-        case 29:
-            hsv.h = 255/3;
-            hsv.s = 255;
-            break;
-
-        // home
-        case 43:
-            hsv.s = 0;
-            break;
-
-        // end
-        case 57:
-            hsv.s = 255;
-            break;
-
-        default:
-            hsv = base_effect_math(hsv, i, time);
-            break;
-
-    }
-
-    return hsv;
-}
-
-bool base_ad_effect(effect_params_t* params) {
-    return effect_runner_i(params, &base_ad_effect_math);
-}
-
-static HSV vi_effect_math(HSV hsv, uint8_t i, uint8_t time) {
-
-    // no startup animation
-    if (BASE_EFFECT_NOT_STARTED_YET) {
-        base_effect_startup_counter = 255; // act like startup is already completed
-        BASE_EFFECT_NOT_STARTED_YET = false;
-    }
-
-    switch (i) {
-
-        // hjkl
-        case 36:
-            break;
-        case 37:
-            break;
-        case 38:
-            break;
-        case 39:
-            break;
-
-        // page up
-        case 22:
-            hsv.s = 0;
-            break;
-
-        // page down
-        case 33:
-            hsv.s = 0;
-            break;
-
-        // find
-        case 54:
-            hsv.s = 0;
-            break;
-
-        default:
-            hsv.v = 0;
-            break;
-
-    }
-
-    return hsv;
-}
-
-bool vi_effect(effect_params_t* params) {
-    return effect_runner_i(params, &vi_effect_math);
-}
-
-static HSV fn_indicator_math(HSV hsv, uint8_t i, uint8_t time) {
-
-    // cancel base effect startup
-    base_effect_startup_counter = 255;
-
-    switch (i) {
-
-        // F1 - F12
-        case 1:
-            hsv.h = 0 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 2:
-            hsv.h = 0 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 3:
-            hsv.h = 0 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 4:
-            hsv.h = 0 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 5:
-            hsv.h = 1 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 6:
-            hsv.h = 1 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 7:
-            hsv.h = 1 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 8:
-            hsv.h = 1 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 9:
-            hsv.h = 2 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 10:
-            hsv.h = 2 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 11:
-            hsv.h = 2 * 255 / 3;
-            hsv.s = 255;
-            break;
-        case 12:
-            hsv.h = 2 * 255 / 3;
-            hsv.s = 255;
-            break;
-
-        // delete/insert
-        case 13:
-            hsv.h = 0;
-            hsv.s = 255;
-            break;
-        case 14:
-            hsv.h = 1 * (255 / 3);
-            hsv.s = 255;
-            break;
-
-        // paste/copy/cut
-        case 29:
-            hsv.s = 0;
-            break;
-        case 43:
-            hsv.h = 200;
-            hsv.s = 255;
-            break;
-        case 57:
-            hsv.h = 0;
-            hsv.s = 255;
-            break;
-
-        // print/scroll/pause
-        case 25:
-            hsv.s = 0;
-            break;
-        case 26:
-            hsv.s = 0;
-            break;
-        case 27:
-            hsv.s = 0;
-            break;
-
-        // caps lock
-        case 30:
-            hsv.s = 0;
-            break;
-
-        // modifier
-        case 44:
-            hsv.s = 0;
-            hsv.v = hsv.v / 2;
-            break;
-        case 55:
-            hsv.s = 0;
-            hsv.v = hsv.v / 2;
-            break;
-        case 58:
-            hsv.s = 0;
-            hsv.v = hsv.v / 2;
-            break;
-        case 59:
-            hsv.s = 0;
-            hsv.v = hsv.v / 2;
-            break;
-        case 60:
-            hsv.s = 0;
-            hsv.v = hsv.v / 2;
-            break;
-        case 64:
-            hsv.s = 0;
-            hsv.v = hsv.v / 2;
-            break;
-
-        // volume
-        case 18: // mute
-            hsv.h = 0;
-            break;
-        case 17: // increase
-            hsv.s = 255;
-            break;
-        case 32: // decrease
-            hsv.s = 0;
-            break;
-
-        // brightness
-        case 33: // increase
-            hsv.s = 255;
-            break;
-        case 31: // decrease
-            hsv.s = 0;
-            break;
-
-        // media
-        case 65: // previous
-            hsv.s = 0;
-            break;
-        case 67: // next
-            hsv.s = 0;
-            break;
-        case 56: // stop
-            hsv.h = 0;
-            break;
-        case 66: // play/pause
-            hsv.h = 255/3;
-            break;
-
-        // menu
-        case 51:
-            hsv.s = 0;
-            break;
-
-        // toggle AD layer
-        case 36:
-            hsv.h = 0;
-            break;
-
-        // toggle VI layer
-        case 37:
-            hsv.h = 255/3;
-            break;
-
-        // KB layer
-        case 62:
-            hsv.h = time;
-            hsv.s = 255;
-            break;
-
-        // no function
-        default:
-            hsv.v = 0;
-            break;
-
-    }
-
-    return hsv;
-}
-
-bool fn_indicator(effect_params_t* params) {
-    return effect_runner_i(params, &fn_indicator_math);
-}
-
-static HSV kb_indicator_math(HSV hsv, uint8_t i, uint8_t time) {
-
-    // cancel base effect startup
-    base_effect_startup_counter = 255;
-
-    switch (i) {
-
-        // test HSV
-        case 14:
-            break;
-        case 29:
-            break;
-        case 43:
-            break;
-        case 57:
-            break;
-        case 67:
-            break;
-
-        // toggle RGB
-        case 16:
-            hsv.s = 0;
-            if (time < (255 / 2)) {
-                hsv.v = 255;
-            } else {
-                hsv.v = 0;
-            }
-            break;
-
-        // cycle effect
-        case 17:
-            hsv.s = 255;
-            hsv.v = 255;
-            if (time < (255 / 3)) {
-                hsv.h = 0;
-            } else if (time < (2 * 255 / 3)) {
-                hsv.h = 255 / 3;
-            } else {
-                hsv.h = 2 * 255 / 3;
-            }
-            break;
-
-        // adjust hue
-        case 18:
-            hsv.h = time;
-            hsv.s = 255;
-            hsv.v = 255;
-            break;
-        case 19:
-            hsv.h = 255 - time;
-            hsv.s = 255;
-            hsv.v = 255;
-            break;
-
-        // adjust saturation
-        case 32:
-            hsv.s = 255;
-            hsv.v = 255;
-            break;
-        case 33:
-            hsv.s = 0;
-            hsv.v = 255;
-            break;
-
-        // adjust value
-        case 45:
-            hsv.v = 255;
-            break;
-        case 46:
-            hsv.v = 63;
-            break;
-
-        // adjust speed
-        case 4:
-            if (((time / 8) % 2) == 0) {
-                hsv.v = 255;
-            } else {
-                hsv.v = 63;
-            }
-            break;
-        case 5:
-            if (((time / 16) % 2) == 0) {
-                hsv.v = 63;
-            } else {
-                hsv.v = 255;
-            }
-            break;
-
-        // set main effect
-        case 36: // BASE
-            hsv.s = 0;
-            break;
-        case 37: // KITT
-            hsv.h = 0;
-            hsv.s = 255;
-            if (time < 128) {
-                hsv.v = time;
-            } else {
-                hsv.v = 255 - time;
-            }
-            break;
-
-        // reset (for flashing)
-        case 13:
-            hsv.s = 0;
-            if (time < 16) {
-                hsv.v = 255 - time * 128 / 16;
-            } else {
-                hsv.v = 127;
-            }
-            break;
-
-        // reset (reinitialize EEPROM)
-        case 42:
-            hsv.s = 0;
-            hsv.v = 127;
-            break;
-
-        // shift
-        case 44:
-            hsv.s = 0;
-            hsv.v = 63;
-            break;
-        case 55:
-            hsv.s = 0;
-            hsv.v = 63;
-            break;
-
-        // no function
-        default:
-            hsv.v = 0;
-
-    }
-
-    return hsv;
-}
-
-bool kb_indicator(effect_params_t* params) {
-    return effect_runner_i(params, &kb_indicator_math);
-}
-
-uint8_t led_count = 7;
-uint8_t led_first = 33;
-static uint8_t time_to_led(uint8_t time, uint8_t led_behind) {
-    uint16_t led_time = led_count * time;
-    uint16_t step = ((2 * led_count + (led_time / 128)) - led_behind) % (2 * led_count);
-    uint8_t led;
-    if (step < led_count) {
-        led = step;
-    } else {
-        led = led_count - 1 - (step - led_count);
-    }
-    return led;
-}
-
-static HSV kitt_effect_math(HSV hsv, uint8_t i, uint8_t time) {
-
-    // reset base effect startup
-    if (i == 0) {
-        BASE_EFFECT_NOT_STARTED_YET = true;
-    }
-
-    hsv.h = 0;
-    hsv.s = 255;
-
-    if (i >= led_first && i < led_first + led_count) {
-        uint8_t j = i - led_first;
-        if (j == time_to_led(time, 0)) {
-            hsv.v = hsv.v;
-        } else if (j == time_to_led(time, 1)) {
-            hsv.v = hsv.v/2;
-        } else if (j == time_to_led(time, 2)) {
-            hsv.v = hsv.v/4;
-        } else if (j == time_to_led(time, 3)) {
-            hsv.v = hsv.v/8;
-        } else {
-            hsv.v = 0;
-        }
-    } else {
-        hsv.v = 0;
-    }
-
-    return hsv;
-}
-
-bool kitt_effect(effect_params_t* params) {
-    return effect_runner_i(params, &kitt_effect_math);
-}
-
-#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-// vim: syntax=c
diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/rules.mk b/keyboards/dztech/dz65rgb/keymaps/jumper149/rules.mk
deleted file mode 100644
index 6245023e803..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/jumper149/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
deleted file mode 100644
index bce34bcfbc2..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
-
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 150
-
-#define TAP_HOLD_CAPS_DELAY 0
-#undef RGB_MATRIX_DEFAULT_MODE
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_SAT
-// #undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-// #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// #undef ENABLE_RGB_MATRIX_SPLASH
-// #undef ENABLE_RGB_MATRIX_MULTISPLASH
-// #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// #define RGB_MATRIX_KEYRELEASES
-
-// some speed shit
-
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif // !NO_DEBUG
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#define NO_PRINT
-#endif // !NO_PRINT
-
-#define NO_ACTION_ONESHOT
-#define QUICK_TAP_TERM 0
-
-// #include "config_led.h"
-// #include "dz60rgb.h"
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
deleted file mode 100644
index 7936aaff75e..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ /dev/null
@@ -1,306 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum dz65rgb_layers {
-	_QWERTY,
-	_FNM,
-	_NAV,
-	_FNC
-};
-
-enum dz65rgb_keycodes {
-	REBOOT = SAFE_RANGE,
-	REEPROM,
-	MAS_CRM,
-	MAS_PRP,
-	MAS_RED,
-	MAS_GRN,
-	MAS_BLU,
-	MAS_CYN,
-	MAS_MGT,
-	MAS_YEL,
-	MAS_KEY,
-	MAS_WHT,
-};
-
-#define TG_NKRO MAGIC_TOGGLE_NKRO
-#define _V_V_V_ KC_TRNS
-#define LT_CAPS LT(_NAV, KC_CAPS)
-#define MT_APP  RALT_T(KC_APP)
-#define LM_LALT LM(_FNM, MOD_LALT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_QWERTY] = LAYOUT_65_ansi(
-		QK_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_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,
-		LT_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,
-		SC_LSPO, KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC,           KC_UP,   KC_END,
-		KC_LCTL, KC_LGUI,  LM_LALT,                   KC_SPC,                             KC_RALT, MO(_FNC), KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-	[_FNM]    = LAYOUT_65_ansi(
-		_______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   _______,  _______, _______, _______,
-		_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
-		_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,           _______, _______,
-		_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,           _______, _______,
-		_______, _______,  _V_V_V_,                   _______,                            _______, _______,  _______,  _______, _______, _______
-	),
-	[_NAV]    = LAYOUT_65_ansi(
-		KC_NUM,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,   KC_PAST,  KC_PMNS,  KC_PPLS, _______, _______,
-		_______, KC_PGUP,  KC_HOME, KC_UP,   KC_END,  _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PSLS,  KC_PSCR,  KC_SCRL, KC_INS,  KC_PMNS,
-		_V_V_V_, KC_PGDN,  KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______,  _______,           KC_PENT, KC_PPLS,
-		_______, _______,  _______, _______, _______, _______, KC_P0,   KC_P0,   KC_P0,   KC_PDOT, KC_PSLS,  _______,           _______, _______,
-		_______, _______,  _______,                   _______,                            _______, _______,  _______,  _______, _______, _______
-	),
-	[_FNC]    = LAYOUT_65_ansi(
-		_______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  _______, AS_TOGG,
-		_______, RGB_MOD,  RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, MAS_MGT, MAS_BLU, MAS_WHT,  RGB_RMOD, RGB_MOD, _______, KC_MPRV,
-		_______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP,  _______,           EE_CLR,  KC_MNXT,
-		_______, RGB_TOG,  _______, _______, REEPROM, REBOOT,  TG_NKRO, MAS_YEL, MAS_GRN, MAS_CRM, _______,  _______,           KC_VOLU, KC_MUTE,
-		_______, _______,  _______,                  _______,                             _______, _V_V_V_,  _______,  RGB_SPD, KC_VOLD, RGB_SPI
-	),
-	/*
-	[_LEDS]    = LAYOUT_65_ansi(
-		17, 16, 15, 14, 13, 12, 11, 10,  9, 18, 19, 20, 21, 22, 23,
-		 7,  6,  5,  4,  3,  2,  1,  0, 26, 27, 28, 29, 30, 31, 24,
-		 8, 48, 47, 46, 45, 44, 43, 51, 52, 53, 54, 55,     56, 25,
-		49, 40, 39, 38, 37, 36, 60, 61, 62, 63, 57, 58,     59, 32,
-		50, 42, 41,         35,             64, 65, 66, 67, 34, 33
-	),
-	*/
-};
-
-/*
-17,  16,  15,  14,  13,  12,  11,  10,   9,  18,  19,  20,  21,  22,  23
- 7,   6,   5,   4,   3,   2,   1,   0,  26,  27,  28,  29,  30,  31,  24
- 8,  48,  47,  46,  45,  44,  43,  51,  52,  53,  54,  55,       56,  25
-49,  40,  39,  38,  37,  36,  60,  61,  62,  63,  57,  58,       59,  32
-50,  42,  41,            35,                 64,  65,  66,  67,  34,  33
-
-ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   -,   =,  BCK, DEL
-TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   [,   ],    \,   -
-CPS, A,   S,   D,   F,   G,   H,   J,   K,   L,   COL, QOT,  RETURN,   +
-SFT, Z,   X,   C,   V,   B,   N,   M,   COM, DOT, SLS, SHIFT,    UP,   0
-CTL, GUI, ALT,        SPACEBAR,              ALT, FN, CTL, LFT, DWN, RIT
-*/
-bool rgb_matrix_indicators_user(void) {
-	if (host_keyboard_led_state().caps_lock) {
-		rgb_matrix_set_color(8, 0xFF, 0xFF, 0xFF);
-	}
-
-	led_t led_state = host_keyboard_led_state();
-
-	if (!g_suspend_state && rgb_matrix_config.enable) {
-		switch (get_highest_layer(layer_state)) {
-		case _NAV:
-			if (led_state.num_lock) {
-				rgb_matrix_set_color(17, 0xFF, 0x00, 0x00);
-				rgb_matrix_set_color(26, 0xFF, 0xFF, 0x00);
-			} else {
-				rgb_matrix_set_color(17, 0x00, 0x00, 0x00);
-				rgb_matrix_set_color(26, 0xFF, 0x00, 0x00);
-			}
-
-			rgb_matrix_set_color(8, 0xFF, 0xFF, 0xFF); // layer indicator
-			// ESDF
-			rgb_matrix_set_color(4, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(47, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(46, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(45, 0xFF, 0x00, 0x00);
-			// home/end
-			rgb_matrix_set_color(5, 0x00, 0xFF, 0x00);
-			rgb_matrix_set_color(3, 0x00, 0xFF, 0x00);
-			// pgup/dn
-			rgb_matrix_set_color(6, 0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(48, 0x00, 0x00, 0xFF);
-			// numpad
-			rgb_matrix_set_color(10,  0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(9,  0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(18,  0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(0, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(27, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(51, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(52, 0xFF, 0xFF, 0x00);
-			rgb_matrix_set_color(53, 0xFF, 0xFF, 0x00);
-			// zero
-			rgb_matrix_set_color(60, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(61, 0xFF, 0x00, 0x00);
-			rgb_matrix_set_color(62, 0xFF, 0x00, 0x00);
-			// dot
-			rgb_matrix_set_color(63, 0x00, 0x00, 0xFF);
-			// math shit
-			rgb_matrix_set_color(19,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(20,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(21,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(28,  0x00, 0x00, 0xFF);
-			rgb_matrix_set_color(24,  0x00, 0x00, 0xFF); // macro minus
-			rgb_matrix_set_color(25,  0x00, 0x00, 0xFF); // macro plus
-			// other
-			rgb_matrix_set_color(29, 0xFF, 0xFF, 0xFF);
-			rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
-			rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
-			break;
-
-		case _FNC: {
-			HSV hsv = { rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v };
-			HSV hui = hsv;
-			HSV hud = hsv;
-			HSV sai = hsv;
-			HSV sad = hsv;
-			HSV vai = hsv;
-			HSV vad = hsv;
-			hui.h = hsv.h + 8;
-			hud.h = hsv.h - 8;
-			sai.s = hsv.s + 16 > 255 ? 255u : hsv.s + 16;
-			sad.s = hsv.s - 16 < 0   ?   0 : hsv.s - 16;
-			vai.v = hsv.v + 16 > 255 ? 255 : hsv.v + 16;
-			vad.v = hsv.v - 16 < 0   ?   0 : hsv.v - 16;
-			RGB rgb = hsv_to_rgb(hsv);
-			RGB rgbHUI = hsv_to_rgb(hui);
-			RGB rgbHUD = hsv_to_rgb(hud);
-			RGB rgbSAI = hsv_to_rgb(sai);
-			RGB rgbSAD = hsv_to_rgb(sad);
-			RGB rgbVAI = hsv_to_rgb(vai);
-			RGB rgbVAD = hsv_to_rgb(vad);
-			rgb_matrix_set_color(65, 0xFF, 0xFF, 0xFF); // layer indicator
-			rgb_matrix_set_color(36, 0xFF, 0x00, 0x00); // MASBOOT
-			rgb_matrix_set_color(37, 0xFF, 0x00, 0x40); // REEPROM
-			rgb_matrix_set_color(37, 0xFF, 0x00, 0x40); // 60
-			rgb_matrix_set_color(59, 0x00, 0x80, 0xFF); // KC_VOLU
-			rgb_matrix_set_color(34, 0x00, 0x80, 0xFF);
-			rgb_matrix_set_color(32, 0xFF, 0x00, 0x00); // KC_MUTE
-			rgb_matrix_set_color(24, 0xFF, 0x40, 0x00); // KC_MPRV
-			rgb_matrix_set_color(25, 0xFF, 0x40, 0x00);
-
-			rgb_matrix_set_color(6, 0xFF, 0x80, 0x00); //RGB_MOD
-			rgb_matrix_set_color(48, 0xFF, 0x80, 0x00);
-			rgb_matrix_set_color(29, 0xFF, 0x80, 0x00); //RGB_MOD
-			rgb_matrix_set_color(30, 0xFF, 0x80, 0x00);
-			rgb_matrix_set_color(40, 0xFF, 0x40, 0x00); //RGB_TOG
-			rgb_matrix_set_color(4, rgbHUI.r, rgbHUI.g, rgbHUI.b); //RGB_HUI
-			rgb_matrix_set_color(46, rgbHUD.r, rgbHUD.g, rgbHUD.b);
-			rgb_matrix_set_color(3, rgbSAI.r, rgbSAI.g, rgbSAI.b); //RGB_SAI
-			rgb_matrix_set_color(45, rgbSAD.r, rgbSAD.g, rgbSAD.b);
-			rgb_matrix_set_color(2, rgbVAI.r, rgbVAI.g, rgbVAI.b); //RGB_VAI
-			rgb_matrix_set_color(44, rgbVAD.r, rgbVAD.g, rgbVAD.b);
-			rgb_matrix_set_color(35, rgb.r, rgb.g, rgb.b); // config display
-			rgb_matrix_set_color(5, 0x80, 0x80, 0x80); //RGB_SPI
-			rgb_matrix_set_color(47, 0x80, 0x80, 0x80);
-			rgb_matrix_set_color(67, 0x80, 0x80, 0x80); //RGB_SPI
-			rgb_matrix_set_color(33, 0x80, 0x80, 0x80);
-			rgb_matrix_set_color(26, 0xF0, 0x00, 0xFF); //MAS_MGT
-			rgb_matrix_set_color(27, 0x00, 0x02, 0xFF); //MAS_BLU
-			rgb_matrix_set_color(51, 0xFF, 0x00, 0x00); //MAS_RED
-			rgb_matrix_set_color(52, 0x00, 0x00, 0x00); //MAS_KEY
-			rgb_matrix_set_color(53, 0x00, 0xFF, 0xF7); //MAS_CYN
-			rgb_matrix_set_color(61, 0xFF, 0xDA, 0x00); //MAS_YEL
-			rgb_matrix_set_color(62, 0x00, 0xFF, 0x01); //MAS_GRN
-			rgb_matrix_set_color(63, 0xFF, 0xA5, 0x18); //MAS_CRM
-			rgb_matrix_set_color(54, 0x81, 0x3C, 0xFF); //MAS_PRP
-			rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF); //MAS_WHT
-		}
-		break;
-		}
-	}
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record)
-{
-	static uint32_t key_timer;
-
-	switch (keycode) {
-	case REBOOT:
-		if (record->event.pressed) {
-			key_timer = timer_read32();
-		} else {
-			if (timer_elapsed32(key_timer) >= 500) {
-				reset_keyboard();
-			}
-		}
-
-		return false;
-
-	case REEPROM:
-		if (record->event.pressed) {
-			key_timer = timer_read32();
-		} else {
-			if (timer_elapsed32(key_timer) >= 500) {
-				eeconfig_init();
-			}
-		}
-
-		return false;
-
-	case MAS_CRM:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(32, 160, 255);
-		}
-
-		return false;
-
-	case MAS_PRP:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(192, 112, 255);
-		}
-
-		return false;
-
-	case MAS_RED:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(0, 255, 255);
-		}
-
-		return false;
-
-	case MAS_GRN:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(88, 255, 255);
-		}
-
-		return false;
-
-	case MAS_BLU:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(168, 255, 255);
-		}
-
-		return false;
-
-	case MAS_CYN:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(128, 255, 255);
-		}
-
-		return false;
-
-	case MAS_MGT:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(216, 255, 255);
-		}
-
-		return false;
-
-	case MAS_YEL:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(40, 255, 255);
-		}
-
-		return false;
-
-	case MAS_KEY:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(0, 0, 0);
-		}
-
-		return false;
-
-	case MAS_WHT:
-		if (record->event.pressed) {
-			rgb_matrix_sethsv(128, 0, 255);
-		}
-
-		return false;
-
-	default:
-		return true;
-	}
-}
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/rules.mk b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/rules.mk
deleted file mode 100644
index 29afe8cd036..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-NKRO_ENABLE = yes                 # USB Nkey Rollover
-AUTO_SHIFT_ENABLE = yes      # Auto Shift
-# VELOCIKEY_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c b/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
deleted file mode 100644
index ae7e29c8375..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2020 pagondel
- *
- * 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 {
-    _BL,
-    _FL,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        /* Keymap _BL: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Backsp |~ ` |
-     * |-----------------------------------------------------------------------------|
-     * |Tab    |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] | \  |Del |
-     * |-----------------------------------------------------------------------------|
-     * |FN      |  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |Return  |PgUp|
-     * |-----------------------------------------------------------------------------|
-     * |Shift    |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / |Shift  | Up |PgDn|
-     * |-----------------------------------------------------------------------------|
-     * |Ctrl |Win  |Alt  |           Space            |Alt | FN |Ctrl |Lef |Dow |Rig |
-     * `-----------------------------------------------------------------------------'
-     */
-    [_BL] = 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_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_DEL,
-        MO(1),          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
-    ),
-        /* Keymap _FL: Function Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 |F10 |F11 |F12 |DEL   |PNTS|
-     * |-----------------------------------------------------------------------------|
-     * |       |RgbT|RgbM|Hue+|Hue-|Sat+|Sat-|BR+ |BR- |    |    |SLCK|Paus|RST |    |
-     * |-----------------------------------------------------------------------------|
-     * |        |Eff+|Eff-|    |    |    |    |    |    |    |    |    |EEP RST |    |
-     * |-----------------------------------------------------------------------------|
-     * |Shift    |    |    |    |    |    |NK T|Mute|Vol-|Vol+|    |       |PgUp|    |
-     * |-----------------------------------------------------------------------------|
-     * |     |     |     |           Play             |    |    |     |Home|PgDn|End |
-     * `-----------------------------------------------------------------------------'
-     */
-    [_FL] = LAYOUT_65_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_DEL,  KC_PSCR,
-        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SCRL, KC_PAUS, QK_BOOT, _______,
-        _______,        RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______,
-        KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
-        _______,        _______, _______,                            KC_MPLY,                   _______, _______, _______, KC_HOME, KC_VOLD, KC_END
-    )
-};
diff --git a/keyboards/dztech/dz65rgb/keymaps/pagondel/readme.md b/keyboards/dztech/dz65rgb/keymaps/pagondel/readme.md
deleted file mode 100644
index 8f55ce428a6..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/pagondel/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# pagondel's DZ65RGB v2 layout
-
-```
-    Keymap Default Layer
-       ,-----------------------------------------------------------------------------.
-       |Esc |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Backsp |~ ` |
-       |-----------------------------------------------------------------------------|
-       |Tab    |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] | \  |Del |
-       |-----------------------------------------------------------------------------|
-       |FN      |  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |Return  |PgUp|
-       |-----------------------------------------------------------------------------|
-       |Shift    |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / |Shift  | Up |PgDn|
-       |-----------------------------------------------------------------------------|
-       |Ctrl |Win  |Alt  |           Space            |Alt | FN |Ctrl |Lef |Dow |Rig |
-       `-----------------------------------------------------------------------------'
-```
-
-```
-    Keymap Function Layer
-       ,-----------------------------------------------------------------------------.
-       |Esc  | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 |F10 |F11 |F12 |DEL   |PNTS|
-       |-----------------------------------------------------------------------------|
-       |       |RgbT|RgbM|Hue+|Hue-|Sat+|Sat-|BR+ |BR- |    |    |SLCK|Paus|RST |    |
-       |-----------------------------------------------------------------------------|
-       |        |Eff+|Eff-|    |    |    |    |    |    |    |    |    |EEP RST |    |
-       |-----------------------------------------------------------------------------|
-       |Shift    |    |    |    |    |    |NK T|Mute|Vol-|Vol+|    |       |PgUp|    |
-       |-----------------------------------------------------------------------------|
-       |     |     |     |           Play             |    |    |     |Home|PgDn|End |
-       `-----------------------------------------------------------------------------'
-```
-
-### Build layout
-
-```qmk compile -kb dztech/dz65rgb/v2 -km pagondel```
diff --git a/keyboards/dztech/dz65rgb/keymaps/sbennett13/config.h b/keyboards/dztech/dz65rgb/keymaps/sbennett13/config.h
deleted file mode 100644
index 2d4559faddb..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/sbennett13/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2021 Scott Bennett (@SBennett13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define NO_MUSIC_MODE
-#define FORCE_NKRO
-
-// I don't use a bunch of layers
-#define LAYER_STATE_8BIT
-
-// Disable the RGB Light (underglow) stuff
-#undef RBGLIGHT_ANIMATIONS
-#undef RBGLIGHT_EFFECT_BREATHING
-#undef RBGLIGHT_EFFECT_RAINBOW_MOOD
-#undef RBGLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RBGLIGHT_EFFECT_SNAKE
-#undef RBGLIGHT_EFFECT_KNIGHT
-#undef RBGLIGHT_EFFECT_CHRISTMAS
-#undef RBGLIGHT_EFFECT_STATIC_GRADIENT
-#undef RBGLIGHT_EFFECT_RGB_TEST
-#undef RBGLIGHT_EFFECT_ALTERNATING
-#undef RBGLIGHT_EFFECT_TWINKLE
-
-// No Cherry MX Lock switch
-#undef LOCKING_SUPPORT_ENABLE
-#undef LOCKING_RESYNC_ENABLE
-
-// No oneshot (Active until another key hit)
-#define NO_ACTION_ONESHOT
-
-// Remove some RGB
-#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-#undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c b/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
deleted file mode 100644
index 34977bdbe31..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/sbennett13/keymap.c
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2021 Scott Bennett (@SBennett13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi(
-        QK_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_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,
-        CTL_T(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_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_PSCR,
-        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP,
-        CTL_T(KC_CAPS), RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  KC_PGDN,
-        KC_LSFT,                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
-        _______,        _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    )
-};
diff --git a/keyboards/dztech/dz65rgb/keymaps/sbennett13/readme.md b/keyboards/dztech/dz65rgb/keymaps/sbennett13/readme.md
deleted file mode 100644
index e5535e9ffc2..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/sbennett13/readme.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# sbennett13 DZ65RGB v2 layout
-
-Copyright 2022 Scott Bennett scottbennett027@gmail @SBennett13
-
-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/>.
-
-```text
-    Keymap Default Layer
-       ,-----------------------------------------------------------------------------.
-       |Esc ~|  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Backsp|Home|
-       |-----------------------------------------------------------------------------|
-       |Tab    |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] | \  |PgUp|
-       |-----------------------------------------------------------------------------|
-       |FN      |  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |Return  |PgDn|
-       |-----------------------------------------------------------------------------|
-       |Shift    |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / |Shift  | Up | End|
-       |-----------------------------------------------------------------------------|
-       |Ctrl |Win  |Alt  |           Space            |Alt | FN |Ctrl |Lef |Dow |Rig |
-       `-----------------------------------------------------------------------------'
-```
-
-```text
-    Keymap Function Layer
-       ,-----------------------------------------------------------------------------.
-       | `~  | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 |F10 |F11 |F12 |DEL   |PNTS|
-       |-----------------------------------------------------------------------------|
-       |       |RgbT|RgbM|Hue+|Hue-|Sat+|Sat-|BR+ |BR- |    |    |SLCK|Paus|RST |    |
-       |-----------------------------------------------------------------------------|
-       |        |Eff+|Eff-|    |    |    |    |    |    |    |    |    |EEP RST |    |
-       |-----------------------------------------------------------------------------|
-       |         |    |    |    |    |    |    |    |    |    |    |       |Vol+|MUTE|
-       |-----------------------------------------------------------------------------|
-       |     |     |     |                            |    |    |     |LAST|Vol-|NEXT|
-       `-----------------------------------------------------------------------------'
-```
-
-### Build layout
-
-```qmk compile -kb dztech/dz65rgb/v2 -km sbennett13```
diff --git a/keyboards/dztech/dz65rgb/keymaps/sbennett13/rules.mk b/keyboards/dztech/dz65rgb/keymaps/sbennett13/rules.mk
deleted file mode 100644
index ed0a53416bf..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/sbennett13/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Load Time Optimization
-LTO_ENABLE = yes
-
-# Space Cadet (Shift/Ctrl/Alt tapping for parenthesis)
-SPACE_CADET_ENABLE = no
-
-# Mouse keys bindable to keyboard
-MOUSEKEY_ENABLE = no
-
-# Console
-CONSOLE_ENABLE = no
-
-# Command (Change keyboard behavior without having to flash)
-COMMAND_ENABLE = no
-
-# Magic QMK keycodes
-MAGIC_ENABLE = no
-
-# No audio stuff
-MUSIC_ENABLE = no
-
-# No WPM
-WPM_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h b/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h
deleted file mode 100644
index e0c5522cb0c..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 DZTECH <moyi4681@live.cn>
- *
- * 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
-
-#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-
-#undef RGB_MATRIX_DEFAULT_MODE
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_OUT_IN_DUAL
-
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 8
-
-#define MOUSEKEY_DELAY 	0
-#define MOUSEKEY_INTERVAL 	1
-#define MOUSEKEY_MOVE_DELTA 	1
-#define MOUSEKEY_MAX_SPEED 	25
-#define MOUSEKEY_TIME_TO_MAX 	255
-#define MOUSEKEY_WHEEL_DELAY 	0
-#define MOUSEKEY_WHEEL_INTERVAL 	100
-#define MOUSEKEY_WHEEL_MAX_SPEED 	100
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 	100
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c b/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
deleted file mode 100644
index 87ea995a9a9..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* Copyright 2021 Yuannan (https://github.com/yuannan)
-  *
-  * 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 custom_keycodes {
-    AUTOCLICK_TOGGLE = SAFE_RANGE,
-	AUTO_BURST,
-    RAPID_BURST,
-    INC_CLICK_SPEED,
-	DEC_CLICK_SPEED,
-    DEL_LINE,
-    DEL_HOME,
-    DEL_END
-};
-
-enum my_layers {
-    _ALPHA_LAYER,
-    _VIM_EDITING_LAYER,
-    _MOUSE_LAYER,
-    _HYPER_LAYER
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_ALPHA_LAYER] = LAYOUT_65_ansi(
-		QK_GESC,	KC_1,	KC_2,	KC_3,   KC_4,	KC_5,	KC_6,	KC_7,	KC_8,		KC_9,	KC_0,		KC_MINUS,	KC_EQUAL,		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_LCTL,	KC_A,   KC_S,	KC_D,	KC_F,	KC_G,	KC_H,	KC_J,	KC_K,		KC_L,	KC_SCLN,	KC_QUOTE,	        KC_ENTER,	        KC_PGDN,
-		KC_LSFT,	KC_Z,	KC_X,	KC_C,	KC_V,	KC_B,	KC_N,	KC_M,	KC_COMMA,	KC_DOT,	KC_SLASH,           KC_RSFT,          KC_UP,		KC_END,
-		KC_CAPS,KC_LGUI,TL_LOWR,				KC_SPACE,                       TL_UPPR,	KC_LALT,    KC_RCTL,        KC_LEFT,	KC_DOWN,	KC_RIGHT
-    ),
-    [_VIM_EDITING_LAYER] = LAYOUT_65_ansi(
-		KC_GRAVE,	    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_DELETE,	KC_INSERT,
-		KC_TRNS,	    KC_TRNS,	        KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	DEL_HOME,	KC_HOME,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_SCRL,
-		KC_TRNS,	    KC_TRNS,	        KC_TRNS,	KC_TRNS,	KC_TRNS,	DEL_LINE,	KC_LEFT,	KC_DOWN,	KC_UP,		KC_RIGHT,	KC_TRNS,	KC_TRNS,		    KC_MPLY,        KC_PAUSE,
-		KC_TRNS,        AUTOCLICK_TOGGLE,   KC_TRNS,	AUTO_BURST,RAPID_BURST,	KC_TRNS,	DEL_END,	KC_END,	    KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_VOLU,	KC_PSCR,
-		DEC_CLICK_SPEED,INC_CLICK_SPEED,	KC_TRNS,                                KC_TRNS,						            KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_MPRV,    KC_VOLD,	KC_MNXT
-    ),
-    [_MOUSE_LAYER] = LAYOUT_65_ansi(
-		KC_GRAVE,	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_ACL0,	KC_BTN1,			KC_MS_U,	KC_BTN2,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_BTN4,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
-		KC_ACL1,	KC_MS_L,			KC_MS_D,	KC_MS_R,	KC_TRNS,	KC_TRNS,	KC_WH_L,	KC_WH_D,	KC_WH_U,	KC_WH_R,	KC_TRNS,			KC_TRNS,		KC_TRNS,	KC_TRNS,
-		KC_ACL2,	AUTOCLICK_TOGGLE,	KC_BTN3,	AUTO_BURST,	RAPID_BURST,	KC_TRNS,	KC_TRNS,	KC_BTN5,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS,
-		DEC_CLICK_SPEED,INC_CLICK_SPEED,KC_TRNS,								KC_TRNS,							KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS
-    ),
-    [_HYPER_LAYER] = LAYOUT_65_ansi(
-		DM_RSTP,		DM_REC1,			DM_REC2,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
-		KC_NO,			DM_PLY1,			DM_PLY2,			KC_NO,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,
-		KC_NO,			KC_NO,				KC_NO,				KC_NO,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS,
-		KC_LSFT,		KC_NO,				KC_NO,				RGB_HUI,	RGB_SAI,	RGB_VAI,	RGB_SPI,	RGB_MOD,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS,
-		KC_TRNS,		KC_TRNS,			KC_TRNS,									RGB_TOG,							KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,				KC_TRNS,	KC_TRNS
-	)
-};
-
-#define CLICKSPEEDS 5
-const uint16_t clickspeed_sets[CLICKSPEEDS] = {1000, 100, 50, 20, 1};
-uint16_t clickspeed_set = CLICKSPEEDS - 1;
-deferred_token autoclick_token = INVALID_DEFERRED_TOKEN;
-bool rapid = false;
-
-void decrement_click_speed(void){
-	clickspeed_set += CLICKSPEEDS - 1;
-	clickspeed_set %= CLICKSPEEDS;
-}
-
-void increment_click_speed(void){
-	clickspeed_set ++;
-	clickspeed_set %= CLICKSPEEDS;
-}
-
-uint32_t autoclick_callback(uint32_t trigger_time, void *cb_arg){
-    tap_code(KC_BTN1);
-
-    return rapid ? 1 : clickspeed_sets[clickspeed_set];
-}
-
-void start_autoclicker(void){
-    autoclick_token = defer_exec(1, autoclick_callback, NULL);
-}
-
-void stop_autoclicker(void){
-    cancel_deferred_exec(autoclick_token);
-    autoclick_token = INVALID_DEFERRED_TOKEN;
-}
-
-// Custom process key to allow for custom keycodes
-bool process_record_user(uint16_t keycode, keyrecord_t *record){
-    switch (keycode) {
-        case AUTOCLICK_TOGGLE:
-            if (record->event.pressed) {
-                if (autoclick_token == INVALID_DEFERRED_TOKEN){
-                    start_autoclicker();
-                } else{
-                    stop_autoclicker();
-                }
-            }
-            break;
-		case AUTO_BURST:
-            if (record->event.pressed && (autoclick_token == INVALID_DEFERRED_TOKEN)) {
-                start_autoclicker();
-            } else if (autoclick_token != INVALID_DEFERRED_TOKEN){
-                stop_autoclicker();
-			}
-            break;
-        case RAPID_BURST:
-            if (record->event.pressed){
-                rapid = true;
-                start_autoclicker();
-            } else{
-                rapid = false;
-                stop_autoclicker();
-            }
-            break;
-        case INC_CLICK_SPEED:
-            if (record->event.pressed){
-				if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT)){
-					decrement_click_speed();
-				} else{
-					increment_click_speed();
-				}
-			}
-            break;
-        case DEC_CLICK_SPEED:
-            if (record->event.pressed){
-				if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT)){
-					increment_click_speed();
-				} else{
-					decrement_click_speed();
-				}
-			}
-            break;
-        case DEL_LINE:
-            if(record->event.pressed){
-                SEND_STRING(SS_TAP(X_HOME) SS_LSFT(SS_TAP(X_END)) SS_TAP(X_DELETE));
-            }
-            break;
-        case DEL_HOME:
-            if(record->event.pressed){
-                SEND_STRING(SS_LSFT(SS_TAP(X_HOME)) SS_TAP(X_DELETE));
-            }
-            break;
-        case DEL_END:
-            if(record->event.pressed){
-                SEND_STRING(SS_LSFT(SS_TAP(X_END)) SS_TAP(X_DELETE));
-            }
-            break;
-		case RGB_TOG:
-			if(record->event.pressed){
-				if (!(get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))){
-					if(rgb_matrix_get_val() < 128){
-						rgb_matrix_sethsv(rgb_matrix_get_hue(), rgb_matrix_get_sat(), 255);
-					} else{
-						rgb_matrix_sethsv(rgb_matrix_get_hue(), rgb_matrix_get_sat(), 0);
-					}
-					return false;
-				}
-			}
-			break;
-    }
-
-    return true;
-};
-
-RGB get_inverted_RGB(void){
-	HSV current_HSV = rgb_matrix_get_hsv();
-	current_HSV.h = 255 - current_HSV.h;
-	current_HSV.s = 255;
-	current_HSV.v = 255;
-
-	return hsv_to_rgb(current_HSV);
-}
-
-// Move Caps indicator to the ctrl key where it belongs
-bool rgb_matrix_indicators_user(void){
-	RGB inverted_RGB = get_inverted_RGB();
-    if (host_keyboard_led_state().caps_lock){
-        rgb_matrix_set_color(58, inverted_RGB.r, inverted_RGB.g, inverted_RGB.b);
-    }
-    return false;
-}
-
-// show coloured indicator for layers with a keybind
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max){
-    uint8_t layer = get_highest_layer(layer_state);
-    if (layer > 0) {
-		RGB inverted_RGB = get_inverted_RGB();
-        for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
-            for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
-                uint8_t index = g_led_config.matrix_co[row][col];
-
-                if (index >= led_min && index <= led_max && index != NO_LED &&
-                keymap_key_to_keycode(layer, (keypos_t){col,row}) > KC_TRNS) {
-                    rgb_matrix_set_color(index, inverted_RGB.r, inverted_RGB.g, inverted_RGB.b);
-                }
-            }
-        }
-    }
-    return false;
-}
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/readme.md b/keyboards/dztech/dz65rgb/keymaps/yuannan/readme.md
deleted file mode 100644
index c6768aceec3..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/readme.md
+++ /dev/null
@@ -1,88 +0,0 @@
-[DZ65RGB/v3 Yuannan's Layout Imgur Album](https://imgur.com/a/BI2RjgE)
-
-![Alpha](https://i.imgur.com/ikqvrtF.png)
-![Vim Editing Layer](https://i.imgur.com/hoBvSRR.png)
-![Mouse and Autoclicker](https://i.imgur.com/QWmWaWY.png)
-![Hyper functions and RGB Layer](https://i.imgur.com/Zm6Tf6p.png)
-
-# Yuannan's DZ65 Custom Profile. Autoclicker, Vim, and more!
-
-## Features
-
-1. Much better mouse support. Now able to:
-	- Move mouse around with 3 levels of acceleration
-	- Click and nav using mouse buttons 1-5
-	- Mouse scroll in all 4 directions, autoclick with 5 different levels of speed!
-	- Increase or Decrease the autoclick speed from the preset array of {500, 50, 20, 10, 1} clicks per second \*(Read Notes). Press Shift while using the Increase or Decrease button to do the opposite. Designed to work with other keymaps and keyboards!
-2. Ctrl and Caps swapped. The new indicator is dynamically colored and has been moved to the CTRL key to reflect the keymap.
-3. Improved navigation via Vim like keys.
-4. Dynamic Macros now enabled!
-5. Custom Editing Macros such as:
-	- Deleting entire line
-	- Deleting from cursor to start of line
-	- Deleting form cursor to end of line
-6. VIA support.
-7. Improved granularity of the RGB Matrix. Now with steps of 8/256, which is 32 steps!
-8. The default toggle for RGB now sets the matrix to be on low brightness. Why? If the matrix is completely toggled off then the indicators for Caps Locks and FN are also completely off. You can completely turn it off by pressing shift while processing the "RGB_TOG" keycode. (It is {FN1+FN2+Shift+Space} on this keymap.)
-9. Disabled some effects to free up more space.
-
-### Notes
-
-#### Note Autoclicker Speed
-
-The click events are now programmed with the new Deferred Execution API (https://docs.qmk.fm/#/custom_quantum_functions?id=deferred-execution).
-
-While it's programmed to input with a delay of 1ms (500CPS), the result will vary depending on your board and host. This is a massive improvment compared to timer based events. This new API is much faster and will work with less interference from other tasks on the board.
-
-#### Note Autoclick Linux libinput (Linux autoclicker not working)
-
-Linux's input driver (libinput) has a debounce feature. This is useful in normal usage as a person cannot feasibly click more than 20CPS. However when the keyboard tries to input 50+CPS and sometimes up to ~500CPS this is a problem.
-
-Create a file at "/etc/libinput/local-overrides.quirks" with the contents:
-
-	[Never Debounce]
-	MatchUdevType=mouse
-	ModelBouncingKeys=1
-
-This disables the debounce feature for libnput. This maybe be different if you use evdev, On Arch Linux the driver packages are {"libinput", "xf86-input-libinput"} compared to {"libevdev", "xf86-input-evdev"}. I have {"libinput", "xf86-input-libinput"} installed. In addition I have {"libevdev"} installed as a dependency of other packages. You maybe need to change the driver for your device if you have both installed. For me it was working just fine. Check what driver your xsession currently is utilizing with: 
-
-	$cat /var/log/Xorg.0.log | grep libinput
-
-If it is using libinput then it will show contents. Otherwise search for "evdev".
-
-#### Still not working? (Linux)
-
-Check if the events are reaching your OS with either:
-
-	$evtest /dev/input/by-id/YOUR_KEYBOARD
-
-or
-
-	$cat /dev/input/by-id/YOUR_KEYBOARD
-
-It should end in `event-mouse`. In my case it was `/dev/input/by-id/usb-DZTECH_DZ65RGBV3-if02-event-mouse` which was a symlink to `/dev/input/event12`. It **WILL** vary on your setup.
-
-The output will appear "garbled" as it's trying to interoperate the data stream into text. The underlying data is actually a struct of the form:
-
-	struct input_event {
-		struct timeval time;
-		unsigned short type;
-		unsigned short code;
-		unsigned int value;
-	};
-
-You can read more about it here (https://www.kernel.org/doc/Documentation/input/input.txt)
-
-If it has an output when you autoclick but do not receive it in your desktop then it's a driver issue.
-
-View libinput with:
-
-	$libinput debug-events --device  /dev/input/by-id/usb-DZTECH_DZ65RGBV3-if02-event-mouse --verbose
-
-If you experience "DEBOUNCE" events then it's a driver issue and should be able to be disabled with the above method, restart your display manager or just reboot afterwards.
-
-If you have any issues feel free to make bug report or pull request to me, QMK, or libinput. Please send logs along with any steps you have tried.
-
-#### ALT Position
-
-The physical Right_Alt is mapped as a Left_Alt. This is to ensure compatibility in legacy and programs which treat them differently. A key example would be the TTY system in Linux.
diff --git a/keyboards/dztech/dz65rgb/keymaps/yuannan/rules.mk b/keyboards/dztech/dz65rgb/keymaps/yuannan/rules.mk
deleted file mode 100644
index e98ba61c3af..00000000000
--- a/keyboards/dztech/dz65rgb/keymaps/yuannan/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-DEFERRED_EXEC_ENABLE = yes
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index b9203346dd7..9cf952815db 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -15,64 +15,5 @@
  */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#    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
-// #    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 RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#    define DRIVER_1_LED_TOTAL 35
-#    define DRIVER_2_LED_TOTAL 33
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json
index 6b418b8cd67..98c69134ebf 100644
--- a/keyboards/dztech/dz65rgb/v1/info.json
+++ b/keyboards/dztech/dz65rgb/v1/info.json
@@ -4,7 +4,45 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3731",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"],
diff --git a/keyboards/dztech/dz65rgb/v1/v1.c b/keyboards/dztech/dz65rgb/v1/v1.c
index a0a355e1209..6e8cf96e4c8 100644
--- a/keyboards/dztech/dz65rgb/v1/v1.c
+++ b/keyboards/dztech/dz65rgb/v1/v1.c
@@ -16,7 +16,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
     { 0, C8_8,  C7_8,  C6_8 },
     { 0, C9_8,  C7_7,  C6_7 },
     { 0, C9_7,  C8_7,  C6_6 },
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index 600687c2451..911d21179d0 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -15,64 +15,5 @@
  */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#    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
-// #    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 RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#    define DRIVER_1_LED_TOTAL 35
-#    define DRIVER_2_LED_TOTAL 33
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json
index e52584f724c..16919905d89 100644
--- a/keyboards/dztech/dz65rgb/v2/info.json
+++ b/keyboards/dztech/dz65rgb/v2/info.json
@@ -4,7 +4,45 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3731",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
diff --git a/keyboards/dztech/dz65rgb/v2/v2.c b/keyboards/dztech/dz65rgb/v2/v2.c
index 7754bc4ee51..a9f7fc104f9 100644
--- a/keyboards/dztech/dz65rgb/v2/v2.c
+++ b/keyboards/dztech/dz65rgb/v2/v2.c
@@ -16,7 +16,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
     { 0, C8_8,  C7_8,  C6_8 },
     { 0, C9_8,  C7_7,  C6_7 },
     { 0, C9_7,  C8_7,  C6_6 },
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index 1398a378f86..0c4d1c9d274 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -16,63 +16,8 @@
 
 #pragma once
 
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 #    define USB_SUSPEND_WAKEUP_DELAY 5000
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#    define RGB_MATRIX_LED_COUNT 68
-#    define DRIVER_INDICATOR_LED_TOTAL 0
 #endif
diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json
index ccc24b724ea..ea7390ee9ee 100644
--- a/keyboards/dztech/dz65rgb/v3/info.json
+++ b/keyboards/dztech/dz65rgb/v3/info.json
@@ -4,7 +4,58 @@
         "device_version": "3.0.0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c
index 0fb8ba49de7..bf54a8cdfc5 100755
--- a/keyboards/dztech/dz65rgb/v3/v3.c
+++ b/keyboards/dztech/dz65rgb/v3/v3.c
@@ -18,79 +18,79 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {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, CS24_SW7, CS23_SW7, CS22_SW7},
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
 
-    {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, 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, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
 
-    {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, 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, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {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, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
 
-    {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, 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_SW7, CS38_SW7, CS37_SW7}
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
index a8851d89138..8d6b35eae43 100644
--- a/keyboards/dztech/endless80/config.h
+++ b/keyboards/dztech/endless80/config.h
@@ -16,4 +16,3 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
-#define RGBLIGHT_DEFAULT_SPD 10
diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json
index 2391faf4955..4572b091fa6 100644
--- a/keyboards/dztech/endless80/info.json
+++ b/keyboards/dztech/endless80/info.json
@@ -37,6 +37,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 10
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/dztech/tofu/ii/v1/config.h b/keyboards/dztech/tofu/ii/v1/config.h
index 36741e11680..45576fcdacc 100644
--- a/keyboards/dztech/tofu/ii/v1/config.h
+++ b/keyboards/dztech/tofu/ii/v1/config.h
@@ -22,66 +22,9 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
+#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
+#define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
+
 #ifdef RGB_MATRIX_ENABLE
-#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 USB_SUSPEND_WAKEUP_DELAY 5000
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
-#    define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
-#    define DRIVER_1_LED_TOTAL 46
-#    define DRIVER_2_LED_TOTAL 20
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json
index 2eac06f6fd4..60ccc5ec9b5 100644
--- a/keyboards/dztech/tofu/ii/v1/info.json
+++ b/keyboards/dztech/tofu/ii/v1/info.json
@@ -16,6 +16,54 @@
     },
     "processor": "RP2040",
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "is31fl3737",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
@@ -84,7 +132,11 @@
             {"flags": 1, "matrix": [4, 12], "x": 195, "y": 64},
             {"flags": 1, "matrix": [4, 13], "x": 210, "y": 64},
             {"flags": 1, "matrix": [4, 14], "x": 224, "y": 64}
-        ]
+        ],
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "max_brightness": 180,
+        "sleep": true
     },
     "usb": {
         "device_version": "1.0.0",
diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c
index 8baf0235bd2..15589096df5 100644
--- a/keyboards/dztech/tofu/ii/v1/v1.c
+++ b/keyboards/dztech/tofu/ii/v1/v1.c
@@ -17,77 +17,77 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
-    { 1, K_12, J_12, L_12 },
-    { 1, K_11, J_11, L_11 },
-    { 1, K_10, J_10, L_10 },
-    { 1, K_9,  J_9,  L_9 },
-    { 1, K_8,  J_8,  L_8 },
-    { 1, K_7,  J_7,  L_7 },
-    { 1, K_6,  J_6,  L_6 },
-    { 1, K_5,  J_5,  L_5 },
-    { 1, K_4,  J_4,  L_4 },
-    { 1, K_3,  J_3,  L_3 },
-    { 1, K_2,  J_2,  L_2 },
-    { 1, K_1,  J_1,  L_1 },
-    { 1, H_1,  G_1,  I_1 },
-    { 1, H_2,  G_2,  I_2 },
-    { 1, H_3,  G_3,  I_3 },
+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
+    { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 1, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 1, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 1, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 1, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 1, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 1, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 1, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 1, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 1, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3 },
 
-    { 0, B_12, A_12, C_12 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
-    { 1, H_6,  G_6,  I_6 },
-    { 1, H_5,  G_5,  I_5 },
-    { 1, H_4,  G_4,  I_4 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4 },
 
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
-    { 1, H_7,  G_7,  I_7 },
-    { 1, H_8,  G_8,  I_8 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8 },
 
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
-    { 0, K_9,  J_9,  L_9 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
 
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
 };
 
 bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/dztech/tofu/jr/v1/config.h b/keyboards/dztech/tofu/jr/v1/config.h
index 74e5ed08484..bc559ee6f35 100644
--- a/keyboards/dztech/tofu/jr/v1/config.h
+++ b/keyboards/dztech/tofu/jr/v1/config.h
@@ -15,6 +15,7 @@
  */
 
 #pragma once
+
 #define I2C1_SDA_PIN GP2
 #define I2C1_SCL_PIN GP3
 #define I2C_DRIVER I2CD1
@@ -22,66 +23,9 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
+#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
+#define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
+
 #ifdef RGB_MATRIX_ENABLE
-#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 USB_SUSPEND_WAKEUP_DELAY 5000
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
-#    define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
-#    define DRIVER_1_LED_TOTAL 48
-#    define DRIVER_2_LED_TOTAL 20
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #endif
diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json
index 1460350d73e..12930f65d02 100644
--- a/keyboards/dztech/tofu/jr/v1/info.json
+++ b/keyboards/dztech/tofu/jr/v1/info.json
@@ -16,6 +16,54 @@
         "rows": ["GP29", "GP28", "GP27", "GP26", "GP22"]
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "is31fl3737",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
@@ -86,7 +134,11 @@
             {"flags": 1, "matrix": [4, 12], "x": 195, "y": 64},
             {"flags": 1, "matrix": [4, 13], "x": 210, "y": 64},
             {"flags": 1, "matrix": [4, 14], "x": 224, "y": 64}
-        ]
+        ],
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "max_brightness": 180,
+        "sleep": true
     },
     "usb": {
         "device_version": "1.0.0",
diff --git a/keyboards/dztech/tofu/jr/v1/v1.c b/keyboards/dztech/tofu/jr/v1/v1.c
index 474134cb5ef..046c46458eb 100644
--- a/keyboards/dztech/tofu/jr/v1/v1.c
+++ b/keyboards/dztech/tofu/jr/v1/v1.c
@@ -18,79 +18,79 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
-    { 1, K_12, J_12, L_12 },
-    { 1, K_11, J_11, L_11 },
-    { 1, K_10, J_10, L_10 },
-    { 1, K_9,  J_9,  L_9 },
-    { 1, K_8,  J_8,  L_8 },
-    { 1, K_7,  J_7,  L_7 },
-    { 1, K_6,  J_6,  L_6 },
-    { 1, K_5,  J_5,  L_5 },
-    { 1, K_4,  J_4,  L_4 },
-    { 1, K_3,  J_3,  L_3 },
-    { 1, K_2,  J_2,  L_2 },
-    { 1, K_1,  J_1,  L_1 },
-    { 1, H_1,  G_1,  I_1 },
-    { 1, H_2,  G_2,  I_2 },
-    { 1, H_3,  G_3,  I_3 },
+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
+    { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 1, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 1, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 1, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 1, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 1, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 1, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 1, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 1, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 1, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3 },
 
-    { 0, B_12, A_12, C_12 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
-    { 1, H_6,  G_6,  I_6 },
-    { 1, H_5,  G_5,  I_5 },
-    { 1, H_4,  G_4,  I_4 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4 },
 
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
-    { 1, H_7,  G_7,  I_7 },
-    { 1, H_8,  G_8,  I_8 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8 },
 
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
 
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
 };
 
 bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/eco/keymaps/fsck/config.h b/keyboards/eco/keymaps/fsck/config.h
deleted file mode 100644
index b0a7901b2d6..00000000000
--- a/keyboards/eco/keymaps/fsck/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Frederick Hirsch
- *
- * 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 USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/eco/keymaps/fsck/keymap.c b/keyboards/eco/keymaps/fsck/keymap.c
deleted file mode 100644
index 34cb2799929..00000000000
--- a/keyboards/eco/keymaps/fsck/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2019 Frederick Hirsch
- *
- * 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
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _RAISE 3
-
-enum eco_keycodes {
-  QWERTY = SAFE_RANGE,
-  RAISE
-};
-
-#define JC_Z    CTL_T(KC_Z)
-#define JC_X    ALT_T(KC_X)
-#define JC_C    GUI_T(KC_C)
-#define JC_COMM GUI_T(KC_COMM)
-#define JC_DOT  ALT_T(KC_DOT)
-#define JC_SLSH CTL_T(KC_SLSH)
-
-#define JC_CAPS LT(_RAISE,KC_CAPS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-------------------------------------------------------------------------------------------------.
- * | Tab  |   1  |   2  |   3  |   4  |   5  |   -  |  =   |   6  |   7  |   8  |   9  |  10  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | ESC  |   Q  |   W  |   E  |   R  |   T  | Home | PgUp |   Y  |   U  |   I  |   O  |   P  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Raise|   A  |   S  |   D  |   F  |   G  | End  | PgDn |   H  |   J  |   K  |   L  |   ;  | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |    Space    |   N  |   M  |   ,  |   .  |   /  | Shift|
- * |      | Ctrl | Alt  | GUI  |             |             |             | GUI  | Alt  | Ctrl |      |
- * `-------------------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-  KC_TAB,   KC_1,   KC_2,    KC_3,   KC_4,    KC_5,  KC_MINS, KC_EQL,  KC_6,   KC_7,   KC_8,     KC_9,     KC_0,    KC_BSPC,
-  QK_GESC,  KC_Q,   KC_W,    KC_E,   KC_R,    KC_T,  KC_HOME, KC_PGUP, KC_Y,   KC_U,   KC_I,     KC_O,     KC_P,    KC_QUOT,
-  JC_CAPS,  KC_A,   KC_S,    KC_D,   KC_F,    KC_G,  KC_END,  KC_PGDN, KC_H,   KC_J,   KC_K,     KC_L,     KC_SCLN, KC_ENT,
-  KC_LSFT,  JC_Z,   JC_X,    JC_C,   KC_V,    KC_B,  KC_SPC,  KC_SPC,  KC_N,   KC_M,   JC_COMM,  JC_DOT,   JC_SLSH, KC_RSFT
-),
- 
-
-/* Raise
- * ,-------------------------------------------------------------------------------------------------.
- * |  `   |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |  F6  |  F7  |  F8  |  F9  |  F0  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |      |  Up  |      |      |      |      |PrntSc|      |      |      |   [  |   ]  |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Left | Down | Right|      |      |ScrLck|Pause |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |             |      |      |             |      |      |      |Insert|
- * `-------------------------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  _______, _______, KC_UP,   _______, _______, _______, _______, KC_PSCR, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS
-)
-};
\ No newline at end of file
diff --git a/keyboards/eco/keymaps/fsck/readme.md b/keyboards/eco/keymaps/fsck/readme.md
deleted file mode 100644
index 1f3678daf11..00000000000
--- a/keyboards/eco/keymaps/fsck/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![eco:fsck Layout Image](https://i.imgur.com/Sb8n8B0.png)
-
-# ECO Layout by fsck
-
-This is the fsck layout for the eco keyboard. The bottom row of the default layer are dual function tap/hold keys.
\ No newline at end of file
diff --git a/keyboards/eco/keymaps/fsck/rules.mk b/keyboards/eco/keymaps/fsck/rules.mk
deleted file mode 100644
index e48f4aec52f..00000000000
--- a/keyboards/eco/keymaps/fsck/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no          # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/eco/keymaps/that_canadian/keymap.c b/keyboards/eco/keymaps/that_canadian/keymap.c
deleted file mode 100644
index edd88b184ed..00000000000
--- a/keyboards/eco/keymaps/that_canadian/keymap.c
+++ /dev/null
@@ -1,171 +0,0 @@
-
-// Below layout is based upon /u/That-Canadian's planck layout
-
-#include QMK_KEYBOARD_H
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 2
-#define _RAISE 3
-
-#define _FUNCTION 15
-#define _ADJUST 16
-
-enum eco_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-------------------------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   (  |   )  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Func |   A  |   S  |   D  |   F  |   G  |   [  |   ]  |   H  |   J  |   K  |   L  |   ;  | Enter|
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   {  |   }  |   N  |   M  |   ,  |   .  |   /  |  '   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl |  `   | GUI  | Alt  |Lower | Space|Pg-dwn| Pg-up| Space|Raise | Left | Down |  Up  |Right |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-    KC_TAB,  	   KC_Q,   KC_W,    KC_E,    KC_R,  KC_T,   KC_LPRN, KC_RPRN, KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-    MO(_FUNCTION), 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_ENT,
-    OSM(MOD_LSFT), KC_Z,   KC_X,    KC_C,    KC_V,  KC_B,   KC_LCBR, KC_RCBR, KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-    KC_LCTL, 	   KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_PGDN, KC_PGUP, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,-------------------------------------------------------------------------------------------------.
-   * | Esc  |   !  |   @  |   #  |   $  |   %  |      |      |   ^  |   &  |   *  |   (  |   )  | Del  |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |  F6  |   _  |   +  |   {  |   }  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |      |      |  F12 |      |      | Mute |      |  |   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |Lower |      |      |      | Bksp |Raise | Next | Vol- | Vol+ | Play |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT(
-    KC_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, KC_F12,  _______, _______, KC_MUTE, _______, KC_PIPE,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Raise
-   * ,-------------------------------------------------------------------------------------------------.
-   * | Esc  |   1  |   2  |   3  |   4  |   5  |      |      |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |   4  |   5  |   6  |   +  |      |      |      |      |   -  |   =  |   [  |   ]  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Enter |   7  |   8  |   9  |   -  |      |      |      |      |      |      | Mute |      |   \  |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |   ,  |   0  |  .   |Lower | Bksp |      |      |      |Raise | Next | Vol- | Vol+ | Play |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2, KC_3,   KC_4,    KC_5,    _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-    _______, KC_4,    KC_5, KC_6,   KC_PLUS, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-    KC_ENT,  KC_7,    KC_8, KC_9,   KC_MINS, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_BSLS,
-    _______, KC_COMM, KC_0, KC_DOT, _______, KC_BSPC, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Adjust (Lower + Raise)
-   * ,-------------------------------------------------------------------------------------------------.
-   * |Taskmg| Reset|      |      |      |      |      |      |      |      |      |      |      |caltde|
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT(
-    TSKMGR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  /* Function
-   * ,-------------------------------------------------------------------------------------------------.
-   * |      |      |      |      |      |      |      |      |      |      |  Up  |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      | Left | Down |Right |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Caps |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_FUNCTION] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/eco/keymaps/that_canadian/readme.md b/keyboards/eco/keymaps/that_canadian/readme.md
deleted file mode 100644
index aa3316af039..00000000000
--- a/keyboards/eco/keymaps/that_canadian/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# ECO Layout by u/That-Canadian
\ No newline at end of file
diff --git a/keyboards/eco/keymaps/that_canadian/rules.mk b/keyboards/eco/keymaps/that_canadian/rules.mk
deleted file mode 100644
index c76a07e24bd..00000000000
--- a/keyboards/eco/keymaps/that_canadian/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no          # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/eco/keymaps/xyverz/keymap.c b/keyboards/eco/keymaps/xyverz/keymap.c
deleted file mode 100644
index 0050b79847f..00000000000
--- a/keyboards/eco/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,156 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names { _QWERTY, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, LOWER, RAISE, ADJUST };
-
-// Aliases to keep the keymap tidy
-#define GUIBSPC GUI_T(KC_BSPC)  // GUI when held, BSPC when tapped.
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-------------------------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |      |      |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |      |      |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |      |      |   N  |   M  |   ,  |   .  |   /  |Shift |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Ctrl | Alt  | Left |Right |Lower | Bksp |  GUI |Enter |Space |Raise |  Up  | Down |  GUI |Enter |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_NO,   KC_NO,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_NO,   KC_NO,   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_NO,   KC_NO,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, KC_LGUI, KC_ENT,  KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_ENT
-  ),
-
-  /* Colemak
-   * ,-------------------------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |      |      |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Esc  |   A  |   R  |   S  |   T  |   D  |      |      |   H  |   N  |   E  |   I  |   O  |  "   |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |      |      |   N  |   M  |   ,  |   .  |   /  |Shift |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Ctrl | Alt  | Left |Right |Lower | Bksp |  GUI |Enter |Space |Raise |  Up  | Down |  GUI |Enter |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_NO,   KC_NO,   KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_NO,   KC_NO,   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_NO,   KC_NO,   KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, KC_LGUI, KC_ENT,  KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_ENT
-  ),
-
-  /* Dvorak
-   * ,-------------------------------------------------------------------------------------------------.
-   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |      |      |   F  |   G  |   C  |   R  |   L  |  /   |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Esc  |   A  |   O  |   E  |   U  |   I  |      |      |   D  |   H  |   T  |   N  |   S  |  -   |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |      |      |   B  |   M  |   W  |   V  |   Z  | Shift|
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Ctrl | Alt  | Left |Right |Lower | Bksp |  GUI |Enter |Space |Raise |  Up  | Down |  GUI |Enter |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_NO,   KC_NO,   KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_NO,   KC_NO,   KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_NO,   KC_NO,   KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, KC_LGUI, KC_ENT,  KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_ENT
-  ),
-
-  /* Lower
-   * ,-------------------------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |      |      |   ^  |   &  |   *  |   (  |   )  |      |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Caps |      | Mute | Vol- | Vol+ |      |      |      |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * |      |      | Prev | Play | Next |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * | Brite|      | Home |  End |      |  Del |      |      |      |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_NO,   KC_NO,   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-    KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_NO,   KC_NO,   _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NO,   KC_NO,   _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_HOME, KC_END,  _______, KC_DEL,  _______, _______, KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______
-  ),
-
-  /* Raise
-   * ,-------------------------------------------------------------------------------------------------.
-   * |      |   1  |   2  |   3  |   4  |   5  |      |      |   6  |   7  |   8  |   9  |   0  |   -  |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_NO,   KC_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_NO,   KC_NO,   _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_NO,   KC_NO,   _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_HOME, KC_END,  _______, KC_DEL,  _______, _______, KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______
-  ),
-
-
-  /* Adjust
-   * ,-------------------------------------------------------------------------------------------------.
-   * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * |      | Reset|      |      |      |      |      |      |      |Qwerty|Colemk|Dvorak|      |      |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT(
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NO,   KC_NO,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-    _______, QK_BOOT, _______, _______, _______, _______, KC_NO,   KC_NO,   _______, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-    _______, _______, _______, _______, _______, _______, KC_NO,   KC_NO,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-};
-// clang-format on
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void matrix_init_user(void) {
-#ifdef BOOTLOADER_CATERINA
-    // This will disable the red LEDs on the ProMicros
-    setPinInput(D5);
-    setPinInput(B0);
-#endif
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case QWERTY:
-                set_single_persistent_default_layer(_QWERTY);
-                return false;
-            case COLEMAK:
-                set_single_persistent_default_layer(_COLEMAK);
-                return false;
-            case DVORAK:
-                set_single_persistent_default_layer(_DVORAK);
-                return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/eco/keymaps/xyverz/readme.md b/keyboards/eco/keymaps/xyverz/readme.md
deleted file mode 100644
index cf168377d5d..00000000000
--- a/keyboards/eco/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ECO Default Layout by u/That-Canadian
-
-KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039
\ No newline at end of file
diff --git a/keyboards/eco/keymaps/xyverz/rules.mk b/keyboards/eco/keymaps/xyverz/rules.mk
deleted file mode 100644
index d8d012a9fa5..00000000000
--- a/keyboards/eco/keymaps/xyverz/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no          # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/edc40/keymaps/oj/keymap.c b/keyboards/edc40/keymaps/oj/keymap.c
deleted file mode 100644
index 1946750c122..00000000000
--- a/keyboards/edc40/keymaps/oj/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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{
-  _QW,
-  _DV,
-  _CM,
-  _L1,
-  _L2,
-  _L3
-};
-enum custom_keycodes {
-    DVORAK = SAFE_RANGE,
-    QWERTY,
-    COLEMAK
-};
-
-
-const uint16_t PROGMEM keymaps [][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QW] = LAYOUT( /* Qwerty */
-      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_LCTL,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_ENT,
-      KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,    KC_DOT,
-      KC_TAB,  KC_LGUI,                  KC_SPC,              MO(_L1), MO(_L2)
-    ),
-    [_DV] = LAYOUT( /* Dvorak */
-      KC_ESC, KC_SLSH, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_QUOT,
-      KC_LCTL, KC_A,    KC_O,    KC_E,   KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S,
-      KC_LSFT,   KC_Q,    KC_J,   KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
-      KC_TAB,  KC_LGUI,                         KC_SPC,                       MO(_L1), MO(_L2)
-    ),
-    [_CM] = LAYOUT( /* Colemak */
-      KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_QUOT,
-      KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
-      KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM,    KC_DOT,
-      KC_TAB, KC_LGUI,                  KC_SPC,              MO(_L1), MO(_L2)
-    ),
-    [_L1] = LAYOUT( /* NUM */
-      KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_MINUS,
-      _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_SCLN,      KC_BSLS,
-      _______,   _______, _______, KC_PSCR, _______, _______, KC_LBRC, KC_RBRC, KC_MINUS,      KC_EQL,
-      _______, _______,                             _______,                        _______, _______
-    ),
-    [_L2] = LAYOUT( /* F Keys */
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,     KC_F11,
-      _______,  KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,  _______, _______, UC(0xc3b6), UC(0xc3a4),    KC_ENT,
-      _______,    QWERTY,  DVORAK,  COLEMAK, TG(_L3), _______, _______, _______, _______,            _______,
-      _______, _______,                              _______,                           _______, _______
-    ),
-    [_L3] = LAYOUT( /*Gaming */
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,    _______, KC_F1, KC_F2, KC_F3, KC_F4, _______,
-    KC_TAB,  KC_Q, KC_W, KC_E, KC_R, _______,  KC_F5, KC_F6, KC_F7, KC_F8,    _______,
-    KC_LCTL,   KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______,       _______,
-    KC_LSFT, KC_B,                    KC_SPC,                      MO(_L2), _______
-    )
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-      switch(keycode) {
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DV);
-          }
-          return false;
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QW);
-          }
-          return false;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_CM);
-          }
-          return false;
-        default:
-          return true;
-      }
-    return true;
-};
diff --git a/keyboards/edc40/keymaps/oj/readme.md b/keyboards/edc40/keymaps/oj/readme.md
deleted file mode 100644
index 8e21176ad01..00000000000
--- a/keyboards/edc40/keymaps/oj/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Objectively the best keymap for EDC40
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
deleted file mode 100644
index d4074f02a40..00000000000
--- a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
- 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _MAIN,
-    _RAISE,
-    _LOWER,
-    _SET,
-};
-
-// Readability keycodes
-#define LOWER   MO(_LOWER)
-#define RAISE   MO(_RAISE)
-#define SET     MO(_SET)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-/* MAIN
- * .-----------------------------------------------------------------------------------------------------------------------------------------------.
- * | Tab    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | Backsp | Delete |   7    |   8    |   9    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Esc    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | Enter  |   4    |   5    |   6    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | LShift | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | Up     | Pause  |   1    |   2    |   3    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | LCtrl  |  Lock  |   GUI  |   Alt  | Lower  | Space  |  Space | Raise  | PrtScr | RShift | Left   | Down   | Right  |   0    |   .    |  Enter |
- * '-----------------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_MAIN] = LAYOUT_ortho_4x16(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9,
-  KC_ESC,  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_KP_4, KC_KP_5,   KC_KP_6,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_PAUS, KC_KP_1, KC_KP_2,   KC_KP_3,
-  KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
-  ),
-
-/* RAISE
- * .-----------------------------------------------------------------------------------------------------------------------------------------------.
- * |    `   |  1     |  2     |  3     |  4     |  5     |  6     |  7     |  8     |  9     |  0     |        | Insert |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        | -      | =      | [      | ]      |   \    |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |  PgUp  |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |  Vol-  |  PgDn  |  Vol+  |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_RAISE] = LAYOUT_ortho_4x16(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, KC_INS,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_PGDN, KC_VOLU, _______, _______, _______
-  ),
-
-/* LOWER
- * .-----------------------------------------------------------------------------------------------------------------------------------------------.
- * |    ~   |    !   |    @   |    #   |    $   |    %   |    ^   |    &   |    *   |    (   |    )   |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |    _   |    +   |    {   |    }   |   |    |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   |        |        |        |        |  Home  |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |  Mute  |  End   |  Play  |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_LOWER] = LAYOUT_ortho_4x16(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______, 
-  _______, 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,  _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_END,  KC_MPLY, _______, _______, _______
-  ),
-
- /* SETTINGS
- * .-----------------------------------------------------------------------------------------------------------------------------------------------.
- * |        | CapLok | ScrLok | NumLok | VK I/O |        |        | RGB IO | Mode+  | Mode-  | Plain  |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |  Hue+  |  Sat+  |  Val+  | Larsen |        | Reset  |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |  Hue-  |  Sat-  |  Val-  | Rswirl |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_SET] = LAYOUT_ortho_4x16(
-  _______, KC_CAPS, KC_SCRL, KC_NUM,  VK_TOGG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, QK_BOOT, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _SET);
-}
\ No newline at end of file
diff --git a/keyboards/edinburgh41/keymaps/lalit/config.h b/keyboards/edinburgh41/keymaps/lalit/config.h
deleted file mode 100644
index b8304212e28..00000000000
--- a/keyboards/edinburgh41/keymaps/lalit/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 L. Mistry (@schwarzer-geiger)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// Underglow LED settings
-
-#define RGBLIGHT_SLEEP
-
-// Thumbstick settings
-
-#undef CURSOR_SPEED
-#define CURSOR_SPEED 95
-
-#undef SCROLL_SPEED
-#define SCROLL_SPEED 20
-
-// tap dance settings
-#define TAPPING_TERM 155
diff --git a/keyboards/edinburgh41/keymaps/lalit/keymap.c b/keyboards/edinburgh41/keymaps/lalit/keymap.c
deleted file mode 100644
index 91e9b8fe268..00000000000
--- a/keyboards/edinburgh41/keymaps/lalit/keymap.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* Copyright 2022 schwarzer-geiger
- *
- * 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,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-
-enum custom_keycodes {
-    AE_UMLAUT = SAFE_RANGE,
-    UE_UMLAUT,
-    OE_UMLAUT,
-    SS_UMLAUT
-};
-
-enum {
-    TD_J_QUOTE,
-    TD_H_DQT,
-};
-
-// Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for J, twice for Semicolon
-    [TD_J_QUOTE] = ACTION_TAP_DANCE_DOUBLE(KC_J, KC_QUOTE),
-    // Tap once for K, twice for Colon
-    [TD_H_DQT] = ACTION_TAP_DANCE_DOUBLE(KC_H, KC_DOUBLE_QUOTE),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,      KC_T,               KC_Z,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
-    LT(RAISE, KC_TAB),  KC_A,     KC_S,     KC_D,     KC_F,      KC_G,               TD(TD_H_DQT),     TD(TD_J_QUOTE),     KC_K,     KC_L,     KC_MS_BTN1,  KC_ENTER,
-    LGUI(KC_TAB),  KC_Y,     KC_X,     KC_C,     KC_V,      KC_B,               KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_SCLN,
-                                            KC_LCTL,   KC_LSFT,    KC_NO,   KC_SPC,    LOWER
-  ),
-
-  [_LOWER] = LAYOUT(
-    RGB_TOG,  KC_NO,  KC_LBRC,    KC_RBRC,  KC_NO,    KC_NO,            KC_NO,  LGUI(KC_SPC),  KC_MINUS,  LSFT(KC_EQUAL),  KC_NO,  LGUI(LSFT(KC_4)),
-    _______,  KC_1,  KC_2,  KC_3,  KC_4,   KC_5,            KC_6,  KC_7,  KC_8,    KC_9,  KC_0,   KC_DEL,
-    _______,  KC_NO,   LSFT(KC_LBRC),  LSFT(KC_RBRC),  KC_NO,   KC_NO,            KC_NO,  KC_EQUAL,   KC_BSLS,  KC_GRAVE,  KC_NO,  KC_NO,
-                                            _______,   _______,  KC_NO,   _______,  _______
-  ),
-
-  [_RAISE] = LAYOUT(
-    _______,  KC_NO,     KC_UP,     KC_NO,     KC_NO,         KC_NO,               KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-    _______,  KC_LEFT,  KC_DOWN,   KC_RIGHT,  KC_NO,   KC_NO,            KC_NO,    UE_UMLAUT,    OE_UMLAUT,    AE_UMLAUT,    SS_UMLAUT,    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,  _______,  _______
-  ),
-
-  [_ADJUST] = LAYOUT(
-    RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  XXXXXXX,   RGB_TOG,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, XXXXXXX,   XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,            QK_BOOT,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-                                            _______,   _______,  XXXXXXX,  _______,  _______
-  ),
-};
-
-// German Umlaute macro for Mac US keyboard
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-    case AE_UMLAUT:
-        if (record->event.pressed) {
-            // when keycode AE_UMLAUT is pressed
-            SEND_STRING(SS_LALT("u") "a");
-        } else {
-            // when keycode AE_UMLAUT is released
-        }
-        break;
-        case UE_UMLAUT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("u") "u");
-        } else {
-        }
-        break;
-        case OE_UMLAUT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("u") "o");
-        } else {
-        }
-        break;
-        case SS_UMLAUT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("s"));
-        } else {
-        }
-        break;
-    }
-    return true;
-};
-
-// Thumbstick keymap, change KC_XXX to whatever you need
-
-#define THUMBSTICK_RIGHT_TAP KC_RIGHT
-#define THUMBSTICK_LEFT_TAP KC_LEFT
-#define THUMBSTICK_UP_TAP KC_UP
-#define THUMBSTICK_DOWN_TAP KC_DOWN
-
-// Thumbstick code, no customisation needed
-
-bool cursor_mode = false;
-bool scrolling_mode = false;
-bool tapping_mode = false;
-
-// tracks if thumbstick was released
-bool returned_to_zero = true;
-
-// tracks how many times mouse_report.x/y have been read zero in succession
-uint16_t zero_reads = 0;
-
-// set mode depending on layer
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case SCROLLING_LAYER:
-            if (scrolling_mode == false) {
-            scrolling_mode = true;
-            }
-            if (tapping_mode) {
-                tapping_mode = false;
-            }
-            if (cursor_mode) {
-                cursor_mode = false;
-            }
-            break;
-        case TAPPING_LAYER:
-            if (tapping_mode == false) {
-                tapping_mode = true;
-            }
-            if (cursor_mode) {
-                cursor_mode = false;
-            }
-            if (scrolling_mode) {
-                scrolling_mode = false;
-            }
-            break;
-        default:
-            if (scrolling_mode) {
-                scrolling_mode = false;
-            }
-            if (tapping_mode) {
-                tapping_mode = false;
-            }
-            if (cursor_mode == false) {
-                cursor_mode = true;
-            }
-            break;
-    }
-    return state;
-}
-
-// manipulate mouse report based on current mode
-report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
-
-    if (cursor_mode) {
-        mouse_report.x = CURSOR_SPEED * mouse_report.x/100;
-        mouse_report.y = CURSOR_SPEED * mouse_report.y/100;
-    }
-    if (scrolling_mode) {
-        mouse_report.h = SCROLL_SPEED * mouse_report.x/100;
-        mouse_report.v = SCROLL_SPEED * mouse_report.y/100;
-        mouse_report.x = 0;
-        mouse_report.y = 0;
-        if ((mouse_report.h != 0) | (mouse_report.v != 0)) {
-            _delay_ms(SCROLL_DELAY_MS);
-        }
-
-    } else if (tapping_mode) {
-        if ((mouse_report.x || mouse_report.y) != 0) {
-            if (returned_to_zero) {
-                if (mouse_report.x > 0) {
-                    tap_code16(THUMBSTICK_RIGHT_TAP);
-                }
-                if (mouse_report.x < 0) {
-                    tap_code16(THUMBSTICK_LEFT_TAP);
-                }
-                if (mouse_report.y > 0) {
-                    tap_code16(THUMBSTICK_DOWN_TAP);
-                }
-                if (mouse_report.y < 0) {
-                    tap_code16(THUMBSTICK_UP_TAP);
-                }
-                returned_to_zero = false;
-            }
-            zero_reads = 0;
-        } else if (zero_reads < 20) {
-            zero_reads++;
-        }
-        if (zero_reads >= 20) {
-            if (returned_to_zero == false) {
-                returned_to_zero = true;
-            }
-        }
-        mouse_report.x = 0;
-        mouse_report.y = 0;
-    }
-
-    return mouse_report;
-}
diff --git a/keyboards/edinburgh41/keymaps/lalit/rules.mk b/keyboards/edinburgh41/keymaps/lalit/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/edinburgh41/keymaps/lalit/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index 66b91b7c4e2..95a2527d403 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
- #ifdef RGB_MATRIX_ENABLE
-  #define RGB_MATRIX_LED_COUNT 36
-  #define RGB_MATRIX_LED_FLUSH_LIMIT 16
-  #define RGB_MATRIX_DEFAULT_VAL 150
-  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
- #endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
index 27441a293ea..4d179a805bb 100644
--- a/keyboards/eek/info.json
+++ b/keyboards/eek/info.json
@@ -9,7 +9,12 @@
         "device_version": "0.0.4"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "default": {
+            "val": 150
+        },
+        "driver": "ws2812",
+        "led_flush_limit": 16,
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/eggsworks/egg58/config.h b/keyboards/eggsworks/egg58/config.h
deleted file mode 100644
index 50d95fae1e5..00000000000
--- a/keyboards/eggsworks/egg58/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022-2023 Travis Mick (@tmick0)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 58
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index 94592a01eb3..ccb31b8612a 100644
--- a/keyboards/ein_60/config.h
+++ b/keyboards/ein_60/config.h
@@ -29,13 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define AUDIO_DAC_SAMPLE_MAX 4095U
 #endif
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT              38
-#    define RGB_MATRIX_LED_FLUSH_LIMIT    16
-#    define RGB_MATRIX_DEFAULT_VAL        150
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
index bc208afcecd..14b5578f259 100644
--- a/keyboards/ein_60/info.json
+++ b/keyboards/ein_60/info.json
@@ -9,7 +9,12 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "default": {
+            "val": 150
+        },
+        "driver": "ws2812",
+        "led_flush_limit": 16,
+        "max_brightness": 200
     },
     "rgblight": {
         "hue_steps": 4,
diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json
index 7905a1233a0..6ed958463e2 100644
--- a/keyboards/elcantorhs/info.json
+++ b/keyboards/elcantorhs/info.json
@@ -20,7 +20,7 @@
             ["B1", "B10", "A8", "B15", "B14", "B13"],
             ["B9", "B8", "B5", "B4", "B3", "A15"],
             ["A3", "A4", "A5", "A6", "A7", "B0"],
-            ["B12","A2", "A1", "A0", null, null]
+            ["A2", "A1", "A0", "B12", null, null]
         ]
     },
     "split": {
@@ -34,7 +34,7 @@
                     ["B13", "B14", "B15", "A8", "B10", "B1"],
                     ["A15", "B3", "B4", "B5", "B8", "B9"],
                     ["B0", "A7", "A6", "A5", "A4", "A3"],
-                    ["A0", "A1", "A2", "B12", null, null]
+                    ["B12", "A0", "A1", "A2", null, null]
                 ]
             }
         }
diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h
index b62d75af3c4..8468b8057c3 100644
--- a/keyboards/elephant42/config.h
+++ b/keyboards/elephant42/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 54
-#    define RGB_MATRIX_SPLIT { 27, 27 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
-#endif
-
 #ifndef OLED_FONT_H
 #   define OLED_FONT_H "keyboards/elephant42/lib/glcdfont.c"
 #endif
diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
index 742640619e1..1bc39ced986 100644
--- a/keyboards/elephant42/info.json
+++ b/keyboards/elephant42/info.json
@@ -12,7 +12,9 @@
         "driver": "ws2812",
         "sat_steps": 8,
         "val_steps": 8,
-        "speed_steps": 8
+        "speed_steps": 8,
+        "max_brightness": 170,
+        "split_count": [27, 27]
     },
     "rgblight": {
         "saturation_steps": 8,
@@ -39,7 +41,12 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/enter67/readme.md b/keyboards/enter67/readme.md
deleted file mode 100644
index 8a4890ff1d5..00000000000
--- a/keyboards/enter67/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# ENTER67 - PCB
-
-![enter67](https://imgur.com/igF8Lurh.jpg)
-
-67 layout PCB, with option for stepped Caps Lock
-
-* Keyboard Maintainer: https://github.com/LXF-YZP
-* Hardware Supported: enter67 PCB
-
-Make example for this keyboard (after setting up your build environment):
-    
-    make enter67:default
-    
-Flashing example for this keyboard:
-
-    make enter67: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/enter80/readme.md b/keyboards/enter80/readme.md
deleted file mode 100644
index c02001a43d8..00000000000
--- a/keyboards/enter80/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# ENTER80 - PCB
-
-![enter80](https://i.imgur.com/rH9m5Ysh.jpg)
-
-80 layout PCB, With caps lock light
-
-* Keyboard Maintainer: https://github.com/LXF-YZP
-* Hardware Supported: enter80 PCB
-
-Make example for this keyboard (after setting up your build environment):
-    
-    make enter80:default
-    
-Flashing example for this keyboard:
-
-    make enter80: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 `QK_BOOT` if it is available
diff --git a/keyboards/epoch80/epoch80.c b/keyboards/epoch80/epoch80.c
deleted file mode 100644
index 43aa6ee8c94..00000000000
--- a/keyboards/epoch80/epoch80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.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 "epoch80.h"
diff --git a/keyboards/epoch80/epoch80.h b/keyboards/epoch80/epoch80.h
deleted file mode 100644
index a21623b1c94..00000000000
--- a/keyboards/epoch80/epoch80.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.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 ____ 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.
- */
-#define LAYOUT_all( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k314, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413,       k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, ____, }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, ____, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_splitbs( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k314, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                         k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, ____, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, ____, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan_splitbs( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k314, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                         k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, ____, k511, k512, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500,       k502,                   k506,                         k511,       k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, ____, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, ____, k502, ____, ____, ____, k506, ____, ____, ____, ____, k511, ____, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl_splitbs( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k314, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k313,                   \
-    k400,       k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500,       k502,                   k506,                         k511,       k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, ____, }, \
-    { k400, ____, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, ____, k502, ____, ____, ____, k506, ____, ____, ____, ____, k511, ____, k513, k514, k515, k516, }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k000,       k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,       k214, k215, k216, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k213, k313,                   \
-    k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,             k415,       \
-    k500, k501, k502,                   k506,                   k510, k511, k512, k513, k514, k515, k516  \
-) { \
-    { k000, ____, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, ____, ____, ____, }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____, }, \
-    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, k513, k514, k515, k516, }  \
-}
diff --git a/keyboards/epoch80/readme.md b/keyboards/epoch80/readme.md
deleted file mode 100644
index a78f9ce87ba..00000000000
--- a/keyboards/epoch80/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Epoch 80 / Dolch.CR 80
-
-![epoch80](https://i.imgur.com/xNvEKBOl.png)
-
-Dolch PAC inspired TKL keyboard designed by Cary Works and made by KBDFans.  
-The board was also sold in a zFrontier groupbuy under the name Dolch.CR 80.
-
-* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
-* Hardware Supported: Epoch 80 / Dolch.CR 80 PCB
-* Hardware Availability: https://kbdfans.com/collections/80-diy-kit/products/coming-soon-epoch-80-mechanical-keyboard
-
-Make example for this keyboard (after setting up your build environment):
-
-    make epoch80:default
-
-Flashing example for this keyboard:
-
-    make epoch80: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/era/klein/config.h b/keyboards/era/klein/config.h
deleted file mode 100644
index 1033bc738e7..00000000000
--- a/keyboards/era/klein/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2023 eerraa
- *
- * 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
-
-/* BACKLIGHT PWM */
-#define BACKLIGHT_PWM_DRIVER PWMD7
-#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
-
-/* RGB Matrix */
-#define RGB_MATRIX_DEFAULT_VAL 60
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/era/klein/halconf.h b/keyboards/era/klein/halconf.h
deleted file mode 100644
index f57e86df018..00000000000
--- a/keyboards/era/klein/halconf.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2023 eerraa
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define HAL_USE_PWM TRUE
-
-#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/era/klein/info.json b/keyboards/era/klein/info.json
deleted file mode 100644
index ac08cbb8a2b..00000000000
--- a/keyboards/era/klein/info.json
+++ /dev/null
@@ -1,590 +0,0 @@
-{
-    "manufacturer": "SIRIND",
-    "keyboard_name": "Klein",
-    "maintainer": "eerraa",
-    "backlight": {
-        "levels": 5,
-        "pin": "GP15"
-    },
-    "bootloader": "rp2040",
-    "build": {
-        "debounce_type": "sym_defer_pk"
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "backlight": true,
-        "bootmagic": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true
-    },
-    "indicators": {
-        "caps_lock": "GP16",
-        "on_state": 0,
-        "scroll_lock": "GP17"
-    },
-    "matrix_pins": {
-        "cols": ["GP22", "GP23", "GP24", "GP25", "GP26", "GP27", "GP28", "GP29", "GP11", "GP10", "GP8", "GP7", "GP1", "GP2", "GP3", "GP4"],
-        "rows": ["GP18", "GP19", "GP20", "GP21", "GP14", "GP5", "GP6", "GP9", "GP13", "GP12"]
-    },
-    "processor": "RP2040",
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "layout": [
-            {"matrix": [0, 7], "x": 4, "y": 0, "flags": 1},
-            {"matrix": [0, 6], "x": 20, "y": 2, "flags": 4},
-            {"matrix": [0, 5], "x": 32, "y": 2, "flags": 4},
-            {"matrix": [0, 4], "x": 45, "y": 1, "flags": 4},
-            {"matrix": [0, 3], "x": 58, "y": 3, "flags": 4},
-            {"matrix": [0, 2], "x": 71, "y": 5, "flags": 4},
-            {"matrix": [0, 1], "x": 83, "y": 8, "flags": 4},
-            {"matrix": [0, 0], "x": 96, "y": 10, "flags": 4},
-            {"matrix": [1, 0], "x": 129, "y": 9, "flags": 4},
-            {"matrix": [1, 1], "x": 141, "y": 7, "flags": 4},
-            {"matrix": [1, 2], "x": 154, "y": 4, "flags": 4},
-            {"matrix": [1, 3], "x": 166, "y": 2, "flags": 4},
-            {"matrix": [1, 4], "x": 179, "y": 1, "flags": 4},
-            {"matrix": [1, 5], "x": 192, "y": 2, "flags": 4},
-            {"matrix": [1, 6], "x": 211, "y": 2, "flags": 1},
-            {"matrix": [1, 7], "x": 1, "y": 13, "flags": 1},
-            {"matrix": [2, 6], "x": 21, "y": 15, "flags": 1},
-            {"matrix": [2, 5], "x": 36, "y": 15, "flags": 4},
-            {"matrix": [2, 4], "x": 50, "y": 15, "flags": 4},
-            {"matrix": [2, 3], "x": 62, "y": 17, "flags": 4},
-            {"matrix": [2, 2], "x": 75, "y": 20, "flags": 4},
-            {"matrix": [2, 1], "x": 87, "y": 22, "flags": 4},
-            {"matrix": [2, 0], "x": 100, "y": 24, "flags": 4},
-            {"matrix": [3, 1], "x": 125, "y": 23, "flags": 4},
-            {"matrix": [3, 2], "x": 137, "y": 21, "flags": 4},
-            {"matrix": [3, 3], "x": 150, "y": 18, "flags": 4},
-            {"matrix": [3, 4], "x": 162, "y": 16, "flags": 4},
-            {"matrix": [3, 5], "x": 175, "y": 15, "flags": 4},
-            {"matrix": [3, 6], "x": 188, "y": 15, "flags": 4},
-            {"matrix": [4, 6], "x": 201, "y": 15, "flags": 4},
-            {"matrix": [4, 5], "x": 217, "y": 15, "flags": 4},
-            {"matrix": [4, 3], "x": 0, "y": 27, "flags": 1},
-            {"matrix": [4, 1], "x": 18, "y": 29, "flags": 1},
-            {"matrix": [0, 8], "x": 38, "y": 29, "flags": 4},
-            {"matrix": [0, 9], "x": 51, "y": 29, "flags": 4},
-            {"matrix": [0, 10], "x": 64, "y": 31, "flags": 4},
-            {"matrix": [0, 11], "x": 76, "y": 33, "flags": 4},
-            {"matrix": [0, 12], "x": 89, "y": 36, "flags": 4},
-            {"matrix": [0, 13], "x": 129, "y": 36, "flags": 4},
-            {"matrix": [0, 15], "x": 142, "y": 33, "flags": 4},
-            {"matrix": [1, 15], "x": 154, "y": 31, "flags": 4},
-            {"matrix": [1, 14], "x": 167, "y": 29, "flags": 4},
-            {"matrix": [1, 13], "x": 180, "y": 29, "flags": 4},
-            {"matrix": [1, 12], "x": 193, "y": 29, "flags": 4},
-            {"matrix": [1, 11], "x": 213, "y": 29, "flags": 1},
-            {"matrix": [1, 10], "x": 21, "y": 42, "flags": 1},
-            {"matrix": [1, 9], "x": 42, "y": 42, "flags": 4},
-            {"matrix": [1, 8], "x": 60, "y": 57, "flags": 4},
-            {"matrix": [2, 8], "x": 67, "y": 45, "flags": 4},
-            {"matrix": [2, 9], "x": 80, "y": 47, "flags": 4},
-            {"matrix": [2, 10], "x": 92, "y": 50, "flags": 4},
-            {"matrix": [2, 11], "x": 126, "y": 50, "flags": 4},
-            {"matrix": [2, 12], "x": 138, "y": 48, "flags": 4},
-            {"matrix": [2, 13], "x": 151, "y": 45, "flags": 4},
-            {"matrix": [2, 15], "x": 163, "y": 43, "flags": 4},
-            {"matrix": [3, 14], "x": 177, "y": 42, "flags": 4},
-            {"matrix": [3, 13], "x": 189, "y": 42, "flags": 4},
-            {"matrix": [3, 12], "x": 213, "y": 42, "flags": 1},
-            {"matrix": [3, 11], "x": 16, "y": 55, "flags": 1},
-            {"matrix": [3, 10], "x": 55, "y": 43, "flags": 1},
-            {"matrix": [3, 9], "x": 76, "y": 60, "flags": 4},
-            {"matrix": [3, 8], "x": 96, "y": 64, "flags": 1},
-            {"matrix": [4, 9], "x": 139, "y": 61, "flags": 4},
-            {"matrix": [4, 11], "x": 166, "y": 57, "flags": 1},
-            {"matrix": [4, 13], "x": 189, "y": 55, "flags": 1},
-            {"matrix": [4, 14], "x": 202, "y": 55, "flags": 1},
-            {"matrix": [4, 15], "x": 221, "y": 55, "flags": 1}
-        ],
-        "led_count": 67
-    },
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0003",
-        "vid": "0x4552"
-    },
-    "ws2812": {
-        "driver": "vendor",
-        "pin": "GP0"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [5, 0], "x": 10.75, "y": 0},
-                {"matrix": [5, 1], "x": 11.75, "y": 0},
-                {"matrix": [5, 2], "x": 12.75, "y": 0},
-                {"matrix": [5, 3], "x": 13.75, "y": 0},
-                {"matrix": [5, 4], "x": 14.75, "y": 0},
-                {"matrix": [5, 5], "x": 15.75, "y": 0},
-                {"matrix": [5, 6], "x": 16.75, "y": 0},
-                {"matrix": [5, 7], "x": 17.75, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [6, 0], "x": 10.25, "y": 1},
-                {"matrix": [6, 1], "x": 11.25, "y": 1},
-                {"matrix": [6, 2], "x": 12.25, "y": 1},
-                {"matrix": [6, 3], "x": 13.25, "y": 1},
-                {"matrix": [6, 4], "x": 14.25, "y": 1},
-                {"matrix": [6, 5], "x": 15.25, "y": 1},
-                {"matrix": [6, 6], "x": 16.25, "y": 1},
-                {"matrix": [6, 7], "x": 17.25, "y": 1, "w": 1.5},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [7, 0], "x": 10.5, "y": 2},
-                {"matrix": [7, 1], "x": 11.5, "y": 2},
-                {"matrix": [7, 2], "x": 12.5, "y": 2},
-                {"matrix": [7, 3], "x": 13.5, "y": 2},
-                {"matrix": [7, 4], "x": 14.5, "y": 2},
-                {"matrix": [7, 5], "x": 15.5, "y": 2},
-                {"matrix": [7, 7], "x": 16.5, "y": 2, "w": 2.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [8, 0], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 4], "x": 14, "y": 3},
-                {"matrix": [8, 5], "x": 15, "y": 3},
-                {"matrix": [8, 6], "x": 16, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.75, "y": 3},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 8.25, "y": 4},
-                {"matrix": [9, 1], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [9, 3], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 5], "x": 15, "y": 4},
-                {"matrix": [9, 6], "x": 16, "y": 4},
-                {"matrix": [9, 7], "x": 17, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [5, 0], "x": 10.75, "y": 0},
-                {"matrix": [5, 1], "x": 11.75, "y": 0},
-                {"matrix": [5, 2], "x": 12.75, "y": 0},
-                {"matrix": [5, 3], "x": 13.75, "y": 0},
-                {"matrix": [5, 4], "x": 14.75, "y": 0},
-                {"matrix": [5, 5], "x": 15.75, "y": 0},
-                {"matrix": [5, 7], "x": 16.75, "y": 0, "w": 2},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [6, 0], "x": 10.25, "y": 1},
-                {"matrix": [6, 1], "x": 11.25, "y": 1},
-                {"matrix": [6, 2], "x": 12.25, "y": 1},
-                {"matrix": [6, 3], "x": 13.25, "y": 1},
-                {"matrix": [6, 4], "x": 14.25, "y": 1},
-                {"matrix": [6, 5], "x": 15.25, "y": 1},
-                {"matrix": [6, 6], "x": 16.25, "y": 1},
-                {"matrix": [6, 7], "x": 17.25, "y": 1, "w": 1.5},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [7, 0], "x": 10.5, "y": 2},
-                {"matrix": [7, 1], "x": 11.5, "y": 2},
-                {"matrix": [7, 2], "x": 12.5, "y": 2},
-                {"matrix": [7, 3], "x": 13.5, "y": 2},
-                {"matrix": [7, 4], "x": 14.5, "y": 2},
-                {"matrix": [7, 5], "x": 15.5, "y": 2},
-                {"matrix": [7, 7], "x": 16.5, "y": 2, "w": 2.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [8, 0], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 4], "x": 14, "y": 3},
-                {"matrix": [8, 5], "x": 15, "y": 3},
-                {"matrix": [8, 6], "x": 16, "y": 3, "w": 2.75},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 8.25, "y": 4},
-                {"matrix": [9, 1], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [9, 3], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 7], "x": 17.25, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_ansi_arrow": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [5, 0], "x": 10.75, "y": 0},
-                {"matrix": [5, 1], "x": 11.75, "y": 0},
-                {"matrix": [5, 2], "x": 12.75, "y": 0},
-                {"matrix": [5, 3], "x": 13.75, "y": 0},
-                {"matrix": [5, 4], "x": 14.75, "y": 0},
-                {"matrix": [5, 5], "x": 15.75, "y": 0},
-                {"matrix": [5, 7], "x": 16.75, "y": 0, "w": 2},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [6, 0], "x": 10.25, "y": 1},
-                {"matrix": [6, 1], "x": 11.25, "y": 1},
-                {"matrix": [6, 2], "x": 12.25, "y": 1},
-                {"matrix": [6, 3], "x": 13.25, "y": 1},
-                {"matrix": [6, 4], "x": 14.25, "y": 1},
-                {"matrix": [6, 5], "x": 15.25, "y": 1},
-                {"matrix": [6, 6], "x": 16.25, "y": 1},
-                {"matrix": [6, 7], "x": 17.25, "y": 1, "w": 1.5},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [7, 0], "x": 10.5, "y": 2},
-                {"matrix": [7, 1], "x": 11.5, "y": 2},
-                {"matrix": [7, 2], "x": 12.5, "y": 2},
-                {"matrix": [7, 3], "x": 13.5, "y": 2},
-                {"matrix": [7, 4], "x": 14.5, "y": 2},
-                {"matrix": [7, 5], "x": 15.5, "y": 2},
-                {"matrix": [7, 7], "x": 16.5, "y": 2, "w": 2.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [8, 0], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 4], "x": 14, "y": 3},
-                {"matrix": [8, 5], "x": 15, "y": 3},
-                {"matrix": [8, 6], "x": 16, "y": 3},
-                {"matrix": [8, 7], "x": 17, "y": 3, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 8.25, "y": 4},
-                {"matrix": [9, 1], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [9, 3], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 5], "x": 15, "y": 4},
-                {"matrix": [9, 6], "x": 16, "y": 4},
-                {"matrix": [9, 7], "x": 17, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [5, 0], "x": 10.75, "y": 0},
-                {"matrix": [5, 1], "x": 11.75, "y": 0},
-                {"matrix": [5, 2], "x": 12.75, "y": 0},
-                {"matrix": [5, 3], "x": 13.75, "y": 0},
-                {"matrix": [5, 4], "x": 14.75, "y": 0},
-                {"matrix": [5, 5], "x": 15.75, "y": 0},
-                {"matrix": [5, 6], "x": 16.75, "y": 0},
-                {"matrix": [5, 7], "x": 17.75, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [6, 0], "x": 10.25, "y": 1},
-                {"matrix": [6, 1], "x": 11.25, "y": 1},
-                {"matrix": [6, 2], "x": 12.25, "y": 1},
-                {"matrix": [6, 3], "x": 13.25, "y": 1},
-                {"matrix": [6, 4], "x": 14.25, "y": 1},
-                {"matrix": [6, 5], "x": 15.25, "y": 1},
-                {"matrix": [6, 6], "x": 16.25, "y": 1},
-                {"matrix": [6, 7], "x": 17.25, "y": 1, "w": 1.5},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [7, 0], "x": 10.5, "y": 2},
-                {"matrix": [7, 1], "x": 11.5, "y": 2},
-                {"matrix": [7, 2], "x": 12.5, "y": 2},
-                {"matrix": [7, 3], "x": 13.5, "y": 2},
-                {"matrix": [7, 4], "x": 14.5, "y": 2},
-                {"matrix": [7, 5], "x": 15.5, "y": 2},
-                {"matrix": [7, 7], "x": 16.5, "y": 2, "w": 2.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [8, 0], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 4], "x": 14, "y": 3},
-                {"matrix": [8, 5], "x": 15, "y": 3},
-                {"matrix": [8, 6], "x": 16, "y": 3, "w": 2.75},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 8.25, "y": 4},
-                {"matrix": [9, 1], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [9, 3], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 7], "x": 17.25, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rsft": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [5, 0], "x": 10.75, "y": 0},
-                {"matrix": [5, 1], "x": 11.75, "y": 0},
-                {"matrix": [5, 2], "x": 12.75, "y": 0},
-                {"matrix": [5, 3], "x": 13.75, "y": 0},
-                {"matrix": [5, 4], "x": 14.75, "y": 0},
-                {"matrix": [5, 5], "x": 15.75, "y": 0},
-                {"matrix": [5, 6], "x": 16.75, "y": 0},
-                {"matrix": [5, 7], "x": 17.75, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [6, 0], "x": 10.25, "y": 1},
-                {"matrix": [6, 1], "x": 11.25, "y": 1},
-                {"matrix": [6, 2], "x": 12.25, "y": 1},
-                {"matrix": [6, 3], "x": 13.25, "y": 1},
-                {"matrix": [6, 4], "x": 14.25, "y": 1},
-                {"matrix": [6, 5], "x": 15.25, "y": 1},
-                {"matrix": [6, 6], "x": 16.25, "y": 1},
-                {"matrix": [6, 7], "x": 17.25, "y": 1, "w": 1.5},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [7, 0], "x": 10.5, "y": 2},
-                {"matrix": [7, 1], "x": 11.5, "y": 2},
-                {"matrix": [7, 2], "x": 12.5, "y": 2},
-                {"matrix": [7, 3], "x": 13.5, "y": 2},
-                {"matrix": [7, 4], "x": 14.5, "y": 2},
-                {"matrix": [7, 5], "x": 15.5, "y": 2},
-                {"matrix": [7, 7], "x": 16.5, "y": 2, "w": 2.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [8, 0], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 4], "x": 14, "y": 3},
-                {"matrix": [8, 5], "x": 15, "y": 3},
-                {"matrix": [8, 6], "x": 16, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 17.75, "y": 3},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 8.25, "y": 4},
-                {"matrix": [9, 1], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [9, 3], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 7], "x": 17.25, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_arrow_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [5, 0], "x": 10.75, "y": 0},
-                {"matrix": [5, 1], "x": 11.75, "y": 0},
-                {"matrix": [5, 2], "x": 12.75, "y": 0},
-                {"matrix": [5, 3], "x": 13.75, "y": 0},
-                {"matrix": [5, 4], "x": 14.75, "y": 0},
-                {"matrix": [5, 5], "x": 15.75, "y": 0},
-                {"matrix": [5, 6], "x": 16.75, "y": 0},
-                {"matrix": [5, 7], "x": 17.75, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [6, 0], "x": 10.25, "y": 1},
-                {"matrix": [6, 1], "x": 11.25, "y": 1},
-                {"matrix": [6, 2], "x": 12.25, "y": 1},
-                {"matrix": [6, 3], "x": 13.25, "y": 1},
-                {"matrix": [6, 4], "x": 14.25, "y": 1},
-                {"matrix": [6, 5], "x": 15.25, "y": 1},
-                {"matrix": [6, 6], "x": 16.25, "y": 1},
-                {"matrix": [6, 7], "x": 17.25, "y": 1, "w": 1.5},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [7, 0], "x": 10.5, "y": 2},
-                {"matrix": [7, 1], "x": 11.5, "y": 2},
-                {"matrix": [7, 2], "x": 12.5, "y": 2},
-                {"matrix": [7, 3], "x": 13.5, "y": 2},
-                {"matrix": [7, 4], "x": 14.5, "y": 2},
-                {"matrix": [7, 5], "x": 15.5, "y": 2},
-                {"matrix": [7, 7], "x": 16.5, "y": 2, "w": 2.25},
-                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [8, 0], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 4], "x": 14, "y": 3},
-                {"matrix": [8, 5], "x": 15, "y": 3},
-                {"matrix": [8, 6], "x": 16, "y": 3},
-                {"matrix": [8, 7], "x": 17, "y": 3, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 8.25, "y": 4},
-                {"matrix": [9, 1], "x": 10, "y": 4, "w": 2.75},
-                {"matrix": [9, 3], "x": 12.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 5], "x": 15, "y": 4},
-                {"matrix": [9, 6], "x": 16, "y": 4},
-                {"matrix": [9, 7], "x": 17, "y": 4}
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/keyboards/era/klein/keymaps/default/keymap.c b/keyboards/era/klein/keymaps/default/keymap.c
deleted file mode 100644
index 88878bbcd93..00000000000
--- a/keyboards/era/klein/keymaps/default/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2018-2022 QMK (@qmk)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT(
-        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_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,  MO(1),
-                  KC_LCTL,            KC_LALT,            KC_SPC,   MO(1),                        KC_SPC,             KC_RALT,            KC_LEFT,  KC_DOWN,  KC_RCTL
-    ),
-
-    [1] = LAYOUT(
-        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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-                  KC_LSFT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  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/era/klein/keymaps/via/keymap.c b/keyboards/era/klein/keymaps/via/keymap.c
deleted file mode 100644
index 88878bbcd93..00000000000
--- a/keyboards/era/klein/keymaps/via/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2018-2022 QMK (@qmk)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT(
-        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_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,  MO(1),
-                  KC_LCTL,            KC_LALT,            KC_SPC,   MO(1),                        KC_SPC,             KC_RALT,            KC_LEFT,  KC_DOWN,  KC_RCTL
-    ),
-
-    [1] = LAYOUT(
-        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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-                  KC_LSFT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  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/era/klein/mcuconf.h b/keyboards/era/klein/mcuconf.h
deleted file mode 100644
index b82cc49d7d0..00000000000
--- a/keyboards/era/klein/mcuconf.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2023 eerraa
- *
- * 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_next <mcuconf.h>
-
-#undef RP_PWM_USE_PWM7
-#define RP_PWM_USE_PWM7 TRUE
\ No newline at end of file
diff --git a/keyboards/era/klein/readme.md b/keyboards/era/klein/readme.md
deleted file mode 100644
index 1efeafe4512..00000000000
--- a/keyboards/era/klein/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# MontK Cervin Klein
-
-* Keyboard Maintainer: [ERA](https://github.com/eerraa)
-* Hardware supported: SIRIND Klein
-* Hardware availability: [Syryan](https://srind.mysoho.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make era/klein:default
-
-Flashing example for this keyboard:
-
-    make era/klein: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 ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
-* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/era/linx3/n86/config.h b/keyboards/era/linx3/n86/config.h
new file mode 100644
index 00000000000..8b294dd91b1
--- /dev/null
+++ b/keyboards/era/linx3/n86/config.h
@@ -0,0 +1,8 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+ 
+#pragma once
+
+/* Reset */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U
\ No newline at end of file
diff --git a/keyboards/era/linx3/n86/info.json b/keyboards/era/linx3/n86/info.json
new file mode 100644
index 00000000000..40e1f78baaa
--- /dev/null
+++ b/keyboards/era/linx3/n86/info.json
@@ -0,0 +1,451 @@
+{
+    "manufacturer": "eerraa",
+    "keyboard_name": "N86",
+    "maintainer": "eerraa",
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP11", "GP9", "GP5"],
+        "rows": ["GP3", "GP2", "GP1", "GP0", "GP10", "GP8"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 16], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 211, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 198, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 182, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 156, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 143, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 123, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 110, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 97, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4},
+            {"matrix": [1, 1], "x": 13, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 26, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 39, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 52, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 65, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 78, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 91, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 104, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 117, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 130, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 143, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 156, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 175, "y": 15, "flags": 1},
+            {"matrix": [2, 14], "x": 198, "y": 15, "flags": 4},
+            {"matrix": [1, 15], "x": 211, "y": 15, "flags": 4},
+            {"matrix": [1, 16], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 16], "x": 224, "y": 27, "flags": 4},
+            {"matrix": [2, 15], "x": 211, "y": 27, "flags": 4},
+            {"matrix": [3, 14], "x": 198, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 179, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 149, "y": 27, "flags": 4},
+            {"matrix": [2, 10], "x": 136, "y": 27, "flags": 4},
+            {"matrix": [2, 9], "x": 123, "y": 27, "flags": 4},
+            {"matrix": [2, 8], "x": 110, "y": 27, "flags": 4},
+            {"matrix": [2, 7], "x": 97, "y": 27, "flags": 4},
+            {"matrix": [2, 6], "x": 84, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 71, "y": 27, "flags": 4},
+            {"matrix": [2, 4], "x": 58, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 45, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 32, "y": 27, "flags": 4},
+            {"matrix": [2, 1], "x": 19, "y": 27, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1},
+            {"matrix": [3, 0], "x": 2, "y": 40, "flags": 1},
+            {"matrix": [3, 1], "x": 23, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 36, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 49, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 75, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 88, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 101, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 114, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 127, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 140, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 153, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 174, "y": 40, "flags": 1},
+            {"matrix": [4, 15], "x": 211, "y": 52, "flags": 1},
+            {"matrix": [4, 13], "x": 182, "y": 52, "flags": 4},
+            {"matrix": [4, 12], "x": 170, "y": 52, "flags": 1},
+            {"matrix": [4, 11], "x": 146, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 133, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 120, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 81, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 68, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 42, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 29, "y": 52, "flags": 4},
+            {"matrix": [4, 0], "x": 8, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 3, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 19, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 36, "y": 64, "flags": 1},
+            {"x": 62, "y": 64, "flags": 4},
+            {"x": 76, "y": 64, "flags": 4},
+            {"matrix": [5, 7], "x": 91, "y": 64, "flags": 4},
+            {"x": 106, "y": 64, "flags": 4},
+            {"x": 120, "y": 64, "flags": 4},
+            {"matrix": [5, 11], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 162, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 179, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 198, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 211, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 224, "y": 64, "flags": 1}
+        ],
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0008",
+        "vid": "0x4552"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP4"
+    },
+    "community_layouts": ["tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/linx3/n86/keymaps/default/keymap.c b/keyboards/era/linx3/n86/keymaps/default/keymap.c
new file mode 100644
index 00000000000..49ae04a5a79
--- /dev/null
+++ b/keyboards/era/linx3/n86/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4  , KC_5    , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R  , KC_T    , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                                     KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/era/linx3/n86/keymaps/via/keymap.c b/keyboards/era/linx3/n86/keymaps/via/keymap.c
new file mode 100644
index 00000000000..49ae04a5a79
--- /dev/null
+++ b/keyboards/era/linx3/n86/keymaps/via/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4  , KC_5    , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R  , KC_T    , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                                     KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/enter67/keymaps/via/rules.mk b/keyboards/era/linx3/n86/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/enter67/keymaps/via/rules.mk
rename to keyboards/era/linx3/n86/keymaps/via/rules.mk
diff --git a/keyboards/era/linx3/n86/readme.md b/keyboards/era/linx3/n86/readme.md
new file mode 100644
index 00000000000..ba681090689
--- /dev/null
+++ b/keyboards/era/linx3/n86/readme.md
@@ -0,0 +1,23 @@
+# N86
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: Syryan & Linx3
+* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/linx3/n86:default
+
+Flashing example for this keyboard:
+
+    make era/linx3/n86: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 ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/enter80/rules.mk b/keyboards/era/linx3/n86/rules.mk
similarity index 100%
rename from keyboards/enter80/rules.mk
rename to keyboards/era/linx3/n86/rules.mk
diff --git a/keyboards/era/linx3/n8x/config.h b/keyboards/era/linx3/n8x/config.h
new file mode 100644
index 00000000000..b2cffb1151a
--- /dev/null
+++ b/keyboards/era/linx3/n8x/config.h
@@ -0,0 +1,14 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+ 
+#pragma once
+
+/* Reset */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U
+
+/* BACKLIGHT PWM */
+#define BACKLIGHT_PWM_DRIVER PWMD1
+#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
+
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 4
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/halconf.h b/keyboards/era/linx3/n8x/halconf.h
new file mode 100644
index 00000000000..3dbc886a838
--- /dev/null
+++ b/keyboards/era/linx3/n8x/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/info.json b/keyboards/era/linx3/n8x/info.json
new file mode 100644
index 00000000000..ae0d608ffa8
--- /dev/null
+++ b/keyboards/era/linx3/n8x/info.json
@@ -0,0 +1,1230 @@
+{
+    "manufacturer": "eerraa",
+    "keyboard_name": "N8X",
+    "maintainer": "eerraa",
+    "backlight": {
+        "breathing": true,
+        "breathing_period": 5,
+        "levels": 10,
+        "pin": "GP3"
+    },
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "GP11",
+        "scroll_lock": "GP8"
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP1", "GP0", "GP2"],
+        "rows": ["GP4", "GP5", "GP6", "GP7", "GP10", "GP9"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0007",
+        "vid": "0x4552"
+    },
+    "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/keymaps/default/keymap.c b/keyboards/era/linx3/n8x/keymaps/default/keymap.c
new file mode 100644
index 00000000000..3dd2571ab86
--- /dev/null
+++ b/keyboards/era/linx3/n8x/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4  , KC_5    , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R  , KC_T    , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
+        KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          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/era/linx3/n8x/keymaps/via/keymap.c b/keyboards/era/linx3/n8x/keymaps/via/keymap.c
new file mode 100644
index 00000000000..3dd2571ab86
--- /dev/null
+++ b/keyboards/era/linx3/n8x/keymaps/via/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4  , KC_5    , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R  , KC_T    , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
+        KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          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/era/klein/keymaps/via/rules.mk b/keyboards/era/linx3/n8x/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/era/klein/keymaps/via/rules.mk
rename to keyboards/era/linx3/n8x/keymaps/via/rules.mk
diff --git a/keyboards/era/linx3/n8x/mcuconf.h b/keyboards/era/linx3/n8x/mcuconf.h
new file mode 100644
index 00000000000..9a4b5b1c61e
--- /dev/null
+++ b/keyboards/era/linx3/n8x/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM1
+#define RP_PWM_USE_PWM1 TRUE
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/readme.md b/keyboards/era/linx3/n8x/readme.md
new file mode 100644
index 00000000000..b414e149758
--- /dev/null
+++ b/keyboards/era/linx3/n8x/readme.md
@@ -0,0 +1,23 @@
+# N8X
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: Syryan & Linx3
+* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/linx3/n8x:default
+
+Flashing example for this keyboard:
+
+    make era/linx3/n8x: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 ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/riot_pad/rules.mk b/keyboards/era/linx3/n8x/rules.mk
similarity index 100%
rename from keyboards/riot_pad/rules.mk
rename to keyboards/era/linx3/n8x/rules.mk
diff --git a/keyboards/era/sirind/brick65/info.json b/keyboards/era/sirind/brick65/info.json
new file mode 100644
index 00000000000..3d35bc0d98f
--- /dev/null
+++ b/keyboards/era/sirind/brick65/info.json
@@ -0,0 +1,201 @@
+{
+    "manufacturer": "SR industry",
+    "keyboard_name": "Brick65",
+    "maintainer": "Syryan",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "C6",
+        "on_state": 0,
+        "scroll_lock": "B6"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "D4", "F1", "D5", "F4", "D3", "F5", "D2", "F6", "D1", "F7", "D0", "C7", "B3", "B1", "B2"],
+        "rows": ["D6", "D7", "B4", "B5", "F0"]
+    },
+    "processor": "atmega32u4",
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "dual_beacon": true,
+            "multisplash": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "raindrops": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_simple": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 96, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 128, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 144, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 192, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 208, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [1, 15], "x": 224, "y": 16, "flags": 4},
+            {"matrix": [1, 14], "x": 210, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 197, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 181, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 165, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 149, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 133, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 117, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 101, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 85, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 69, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 53, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 21, "y": 16, "flags": 4},
+            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 30, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 46, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 62, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 78, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 94, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 110, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 126, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 142, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 158, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 206, "y": 32, "flags": 4},
+            {"matrix": [3, 14], "x": 208, "y": 48, "flags": 4},
+            {"matrix": [3, 12], "x": 197, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 160, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
+            {"matrix": [3, 0], "x": 8, "y": 48, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [4, 1], "x": 19, "y": 64, "flags": 4},
+            {"matrix": [4, 2], "x": 38, "y": 64, "flags": 4},
+            {"matrix": [4, 5], "x": 78, "y": 64, "flags": 4},
+            {"matrix": [4, 7], "x": 104, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 64, "flags": 4},
+            {"matrix": [4, 10], "x": 160, "y": 64, "flags": 4},
+            {"matrix": [4, 11], "x": 176, "y": 64, "flags": 4},
+            {"matrix": [4, 13], "x": 192, "y": 64, "flags": 4},
+            {"matrix": [4, 14], "x": 208, "y": 64, "flags": 4},
+            {"matrix": [4, 15], "x": 224, "y": 64, "flags": 4}
+        ],
+        "max_brightness": 200,
+        "val_steps": 20
+    },
+    "url": "https://srind.mysoho.com/",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0005",
+        "vid": "0x5943"
+    },
+    "ws2812": {
+        "pin": "B0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 4, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 7], "x": 6.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 9], "x": 8, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/sirind/brick65/keymaps/default/keymap.c b/keyboards/era/sirind/brick65/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f77a7aabff0
--- /dev/null
+++ b/keyboards/era/sirind/brick65/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 PyuPyu
+
+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_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS,   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_SCRL, 
+        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_LWIN,  KC_LALT,                   KC_SPC,           MO(1),            KC_SPC,  KC_RALT, KC_RCTL,            KC_LEFT,   KC_DOWN,   KC_RGHT
+    ),
+    [1] = LAYOUT(
+        KC_TILD,    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,              RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE,  KC_TRNS,             KC_TRNS, 
+        KC_TRNS,    KC_TRNS,  KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, RGB_MOD, KC_TRNS,            KC_TRNS,   KC_TRNS,   KC_TRNS
+    )
+};
diff --git a/keyboards/era/sirind/brick65/keymaps/via/keymap.c b/keyboards/era/sirind/brick65/keymaps/via/keymap.c
new file mode 100644
index 00000000000..0c895c84e41
--- /dev/null
+++ b/keyboards/era/sirind/brick65/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2018-2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_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,    KC_MINS,  KC_EQL,   KC_BSLS,   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_LSCR, 
+        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_LWIN,  KC_LALT,                   KC_SPC,           MO(1),            KC_SPC,  KC_RALT, KC_RCTL,            KC_LEFT,   KC_DOWN,   KC_RGHT
+    ),
+    [1] = LAYOUT(
+        KC_TILD,    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,              RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE,  KC_TRNS,             KC_TRNS, 
+        KC_TRNS,    KC_TRNS,  KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, RGB_MOD, KC_TRNS,            KC_TRNS,   KC_TRNS,   KC_TRNS
+    )
+};
diff --git a/keyboards/lefty/keymaps/via/rules.mk b/keyboards/era/sirind/brick65/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lefty/keymaps/via/rules.mk
rename to keyboards/era/sirind/brick65/keymaps/via/rules.mk
diff --git a/keyboards/era/sirind/brick65/readme.md b/keyboards/era/sirind/brick65/readme.md
new file mode 100644
index 00000000000..8d8f07d7c52
--- /dev/null
+++ b/keyboards/era/sirind/brick65/readme.md
@@ -0,0 +1,26 @@
+# Brick65
+
+![Brick65](https://i.imgur.com/qyQYWfjh.jpg)
+
+Brick65 is a 65% ANSI layout Custom Keyboard
+
+* Keyboard Maintainer: Pyupyu
+* Hardware Supported: Brick65
+* Hardware Availability: Syryan
+
+## How to enter Bootloader Mode
+
+Enter the bootloader in 2 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
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/sirind/brick65:default
+
+Flashing example for this keyboard:
+
+    make era/sirind/brick65: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/era/sirind/brick65/rules.mk b/keyboards/era/sirind/brick65/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/era/sirind/brick65/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/config.h b/keyboards/era/sirind/klein_sd/config.h
index ae1d4a9e1d0..54731b7aa9d 100644
--- a/keyboards/era/sirind/klein_sd/config.h
+++ b/keyboards/era/sirind/klein_sd/config.h
@@ -19,7 +19,3 @@
 /* BACKLIGHT PWM */
 #define BACKLIGHT_PWM_DRIVER PWMD7
 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
-
-/* RGB Matrix */
-#define RGB_MATRIX_DEFAULT_VAL 60
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/info.json b/keyboards/era/sirind/klein_sd/info.json
index 53f89f2cb70..62b8f788655 100644
--- a/keyboards/era/sirind/klein_sd/info.json
+++ b/keyboards/era/sirind/klein_sd/info.json
@@ -74,6 +74,9 @@
             "splash": true,
             "typing_heatmap": true
         },
+        "default": {
+            "val": 60
+        },
         "driver": "ws2812",
         "layout": [
             {"matrix": [0, 7], "x": 97, "y": 10, "flags": 4},
@@ -143,7 +146,8 @@
             {"matrix": [4, 13], "x": 192, "y": 55, "flags": 1},
             {"matrix": [4, 14], "x": 205, "y": 55, "flags": 1},
             {"matrix": [4, 15], "x": 224, "y": 55, "flags": 1}
-        ]
+        ],
+        "sleep": true
     },
     "url": "",
     "usb": {
diff --git a/keyboards/ergodox_ez/base/keymaps/vial/rules.mk b/keyboards/ergodox_ez/base/keymaps/vial/rules.mk
index 2e31796d1b5..595326ed775 100644
--- a/keyboards/ergodox_ez/base/keymaps/vial/rules.mk
+++ b/keyboards/ergodox_ez/base/keymaps/vial/rules.mk
@@ -1,3 +1,4 @@
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
 KEY_OVERRIDE_ENABLE = no
+QMK_SETTINGS = no
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index af1e14c49f0..8209c21dba5 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -93,62 +93,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // RGB backlight
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#define DRIVER_1_LED_TOTAL 24
-#define DRIVER_2_LED_TOTAL 24
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-#define RGB_MATRIX_LED_PROCESS_LIMIT 5
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-// #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 RGBLIGHT_COLOR_LAYER_0 0x00, 0x00, 0xFF
 /* #define RGBLIGHT_COLOR_LAYER_1 0x00, 0x00, 0xFF */
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 455d294ef57..3d6272ae667 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -155,31 +155,16 @@ uint8_t init_mcp23018(void) {
     // - unused  : input  : 1
     // - input   : input  : 1
     // - driving : output : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(IODIRA, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00000000, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00111111, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    i2c_stop();
-
-    // set pull-up
-    // - unused  : on  : 1
-    // - input   : on  : 1
-    // - driving : off : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(GPPUA, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00000000, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00111111, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-
-out:
-    i2c_stop();
+    uint8_t data[] = {0b00000000, 0b00111111};
+    mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
+
+    if (!mcp23018_status) {
+        // set pull-up
+        // - unused  : on  : 1
+        // - input   : on  : 1
+        // - driving : off : 0
+        mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
+    }
 
 #ifdef LEFT_LEDS
     if (!mcp23018_status) mcp23018_status = ergodox_left_leds_update();
@@ -203,17 +188,11 @@ uint8_t ergodox_left_leds_update(void) {
     // - unused  : hi-Z : 1
     // - input   : hi-Z : 1
     // - driving : hi-Z : 1
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(OLATA, ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111 & ~(ergodox_left_led_3 << LEFT_LED_3_SHIFT), ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111 & ~(ergodox_left_led_2 << LEFT_LED_2_SHIFT) & ~(ergodox_left_led_1 << LEFT_LED_1_SHIFT), ERGODOX_EZ_I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-
-out:
-    i2c_stop();
+    uint8_t data[2];
+    data[0] = 0b11111111 & ~(ergodox_left_led_3 << LEFT_LED_3_SHIFT);
+    data[1] = 0b11111111 & ~(ergodox_left_led_2 << LEFT_LED_2_SHIFT) & ~(ergodox_left_led_1 << LEFT_LED_1_SHIFT);
+    mcp23018_status = i2c_writeReg(I2C_ADDR, OLATA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
+
     return mcp23018_status;
 }
 #endif
@@ -243,7 +222,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef RGB_MATRIX_ENABLE
 // clang-format off
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /*   driver
  *   |  R location
  *   |  |      G location
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index befc1146177..df2dbed7157 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -26,9 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "i2c_master.h"
 
 // I2C aliases and register addresses (see "mcp23018.md")
-#define I2C_ADDR        0b0100000
-#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
-#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define I2C_ADDR        (0b0100000<<1)
 #define IODIRA          0x00            // i/o direction register
 #define IODIRB          0x01
 #define GPPUA           0x0C            // GPIO pull-up resistor register
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index 1b2942cd428..f2495a409c3 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -30,7 +30,41 @@
         "pin": "D7"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 5,
+        "sleep": true
     },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
diff --git a/keyboards/ergodox_ez/keymaps/bdk/config.h b/keyboards/ergodox_ez/keymaps/bdk/config.h
deleted file mode 100644
index e824b731091..00000000000
--- a/keyboards/ergodox_ez/keymaps/bdk/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_TIMEOUT 167
-#define FORCE_NKRO
diff --git a/keyboards/ergodox_ez/keymaps/bdk/keymap.c b/keyboards/ergodox_ez/keymaps/bdk/keymap.c
deleted file mode 100644
index 20af6c18ed4..00000000000
--- a/keyboards/ergodox_ez/keymaps/bdk/keymap.c
+++ /dev/null
@@ -1,176 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define SHIFT_DOWN() (get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)))
-#define KC_FKEYS MO(FKEYS)
-
-// Layers
-enum {
-    BASE=0,
-    SYMNUM,  // Symbols and numbers (activated by holding enter)
-    FKEYS,   // Function keys (activated by a thumb button)
-};
-
-// counter that increments on all key press events.  This is needed for our LT
-// handling
-uint16_t press_counter = 0;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// Keymap 0: Base layer
-
-[BASE] = LAYOUT_ergodox(
-  // left hand ---------------------------------------------------------------------------------------------------
-  KC_NO,          KC_EXLM,        KC_AT,          KC_HASH,        KC_DLR,         KC_PERC,        KC_NO,
-  KC_GRV,         KC_QUOT,        KC_COMM,        KC_DOT,         KC_P,           KC_Y,           KC_LGUI,
-  KC_SLSH,        KC_A,           KC_O,           KC_E,           KC_U,           KC_I,
-  KC_LSFT,        KC_SCLN,        KC_Q,           KC_J,           KC_K,           KC_X,           KC_HOME,
-  KC_LCTL,        KC_LALT,        KC_PGUP,        KC_PGDN,        KC_NO,
-  // left thumb --------------------------------------------------------------------------------------------------
-                                                                                  KC_NO,          KC_NO,
-                                                                                                  KC_NO,
-                                                                  KC_SPC,         KC_TAB,         KC_FKEYS,
-  // right hand --------------------------------------------------------------------------------------------------
-  KC_NO,          KC_CIRC,        KC_AMPR,        KC_ASTR,        KC_LPRN,        KC_RPRN,        KC_NO,
-  KC_RGUI,        KC_F,           KC_G,           KC_C,           KC_R,           KC_L,           KC_BSLS,
-                  KC_D,           KC_H,           KC_T,           KC_N,           KC_S,           KC_MINS,
-  KC_END,         KC_B,           KC_M,           KC_W,           KC_V,           KC_Z,           KC_RSFT,
-                  KC_LEFT,        KC_UP,          KC_DOWN,        KC_RIGHT,       KC_RCTL,
-  // right thumb -------------------------------------------------------------------------------------------------
-  KC_NO,          KC_NO,
-  KC_NO,
-  KC_DEL,         KC_BSPC,        KC_ENT
-),
-// SYMNUM -- numpad and function keys
-[SYMNUM] = LAYOUT_ergodox(
-  // left hand ---------------------------------------------------------------------------------------------------
-  KC_TRNS,        LALT(KC_1),     LALT(KC_2),     LALT(KC_3),     LALT(KC_4),     LALT(KC_5),     KC_TRNS,
-  KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_AMPR,        KC_TRNS,        KC_TRNS,
-  KC_TRNS,        KC_LCBR,        KC_LBRC,        KC_LPRN,        KC_0,           KC_MINS,
-  KC_TRNS,        KC_6,           KC_7,           KC_8,           KC_9,           KC_SLSH,        KC_TRNS,
-  KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,
-  // left thumb --------------------------------------------------------------------------------------------------
-                                                                                  KC_TRNS,        KC_TRNS,
-                                                                                                  KC_TRNS,
-                                                                  KC_TRNS,        KC_TRNS,        KC_TRNS,
-  // right hand --------------------------------------------------------------------------------------------------
-  KC_TRNS,        LALT(KC_6),     LALT(KC_7),     LALT(KC_8),     LALT(KC_9),     LALT(KC_0),     KC_TRNS,
-  KC_TRNS,        KC_PERC,        KC_EQL,         KC_LT,          KC_GT,          KC_EXLM,        KC_TRNS,
-                  KC_PLUS,        KC_1,           KC_RPRN,        KC_RBRC,        KC_RCBR,        KC_TRNS,
-  KC_TRNS,        KC_ASTR,        KC_2,           KC_3,           KC_4,           KC_5,           KC_TRNS,
-                  KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,
-  // right thumb -------------------------------------------------------------------------------------------------
-  KC_TRNS,        KC_TRNS,
-  KC_TRNS,
-  KC_TRNS,        KC_TRNS,        KC_TRNS
-),
-// FKEYS -- function keys
-[FKEYS] = LAYOUT_ergodox(
-  // left hand ---------------------------------------------------------------------------------------------------
-  KC_TRNS,        KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,
-  KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,
-  KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,
-  KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,
-  KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,
-  // left thumb --------------------------------------------------------------------------------------------------
-                                                                                  KC_TRNS,        KC_TRNS,
-                                                                                                  KC_TRNS,
-                                                                  KC_TRNS,        KC_TRNS,        KC_TRNS,
-  // right hand --------------------------------------------------------------------------------------------------
-  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,
-  // right thumb -------------------------------------------------------------------------------------------------
-  KC_TRNS,        KC_TRNS,
-  KC_TRNS,
-  KC_TRNS,        KC_TRNS,        KC_TRNS
-),
-};
-
-// Code to handle layer tap.
-//
-// The default code doesn't work for me, so I rolled my own code.  The main
-// difference is that it always tries to send modifier+key combination, rather
-// than two keys.  One place where this is noticable is if you tap the key,
-// then try hold it.
-
-struct tap_start_info {
-    uint16_t timer;
-    uint16_t initial_press_counter;
-};
-
-static struct tap_start_info tap_start_infos[5];
-
-// Quick check to see if a key is down.  Note that this requires NKRO enabled
-static bool key_down(uint8_t code) {
-    return (keyboard_report->nkro.bits[code>>3] & 1<<(code&7)) != 0;
-}
-
-static bool handle_lt(uint16_t keycode, keyrecord_t *record, uint8_t layer, uint8_t index) {
-    struct tap_start_info* tap_start = tap_start_infos + index;
-
-    if(record->event.pressed) {
-        layer_on(layer);
-        tap_start->timer = timer_read();
-        tap_start->initial_press_counter = press_counter;
-    } else {
-        layer_off(layer);
-        // Only click the key if:
-        //   - No other keys are pressed between the press and release events
-        //   - The release happens before the ONESHOT_TIMEOUT
-        if(press_counter == tap_start->initial_press_counter && timer_elapsed(tap_start->timer) < ONESHOT_TIMEOUT) {
-            register_code16(keycode);
-            unregister_code16(keycode);
-        }
-    }
-    return false;
-}
-
-static bool handle_mt(uint16_t keycode, keyrecord_t *record, uint8_t mods, uint8_t index) {
-    struct tap_start_info* tap_start = tap_start_infos + index;
-
-    if(record->event.pressed) {
-        register_mods(mods);
-        tap_start->timer = timer_read();
-        tap_start->initial_press_counter = press_counter;
-    } else {
-        unregister_mods(mods);
-        // Only click the key if:
-        //   - No other keys are pressed between the press and release events
-        //   - The release happens before the ONESHOT_TIMEOUT
-        if(press_counter == tap_start->initial_press_counter && timer_elapsed(tap_start->timer) < ONESHOT_TIMEOUT) {
-            register_code16(keycode);
-            unregister_code16(keycode);
-        }
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if(record->event.pressed) {
-        press_counter++;
-        // The symbol layer allows sequences repeat the same "physical" key.
-        // For example "0)", which is like pressing the "0" key twice in a
-        // row.  It's very easy to make a sequence of these where the ")"
-        // press comes before the "0" release.  If that happens, force a
-        // release of the "0" key, otherwise nothing will happen.
-        uint8_t shortcode = keycode & 0xFF;
-        if(key_down(shortcode)) {
-            unregister_code(shortcode);
-        }
-    }
-
-    switch(keycode) {
-        case KC_ENTER:
-            return handle_lt(keycode, record, SYMNUM, 0);
-
-        case KC_TAB:
-            return handle_mt(keycode, record, MOD_BIT(KC_LCTL), 1);
-
-        case KC_LSFT:
-        case KC_RSFT:
-            return handle_mt(KC_ESC, record, MOD_BIT(keycode), 2);
-    }
-    return true;
-}
diff --git a/keyboards/ergodox_ez/keymaps/bdk/readme.md b/keyboards/ergodox_ez/keymaps/bdk/readme.md
deleted file mode 100644
index 36a211d321f..00000000000
--- a/keyboards/ergodox_ez/keymaps/bdk/readme.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# The BDK Ergodox Keyboard Layout
-
-## Dvorak-based
-
-This was the first alternative layout I switched to and I don't want to change
-again.
-
-## Mod-tap / Layer-tap is great for thumb keys
-
-This means a key that activates a layer/modifier when you hold it down, but
-results in a keyclick when you tap it.  Thumb keys are great for this since
-they are good for both high-usage keys as well as modifiers.
-
-The one thing to avoid is when you mean to tap a key, but hit the next key
-before you release, which results in the modifier/layer instead of a tap.  To
-avoid this, I chose Enter/Tab as the tap keys, since they aren't chorded
-together with other keys often.
-
-The other issue is I found several problems with using the standard MT,LT code,
-so I rolled my own to handle it.
-
-## Don't have too many layers
-
-My first layouts had multiple layers that I could switch to, but that
-overloaded my brain.  This layout basically only uses 1 extra layer.
-Technically there's also a function key layer, but I only use those keys for
-a handlful of things: boot order, rename, reload page, that's basically it.
-
-## Brackets should be easy to use
-
-There's a lot of ways to lay out a symbol layer.  I organized mine around
-making the {[()]} chars easy to use since they're so frequent in programming.
-I put them all on the symbol layer home row.
-
-I also arranged the numbers so 0/1 were also on the symbol layer home row.
-This makes for fairly easy chording of "[0]" and "[1]".
diff --git a/keyboards/ergodox_ez/keymaps/bdk/rules.mk b/keyboards/ergodox_ez/keymaps/bdk/rules.mk
deleted file mode 100644
index 6c516362390..00000000000
--- a/keyboards/ergodox_ez/keymaps/bdk/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# CONSOLE_ENABLE   = yes
-# DEBUG_ENABLE = yes
-COMMAND_ENABLE   = no
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h b/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
deleted file mode 100755
index c03ee70bd51..00000000000
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "../../config.h"
-
-// Sets good default for the speed of the mouse.
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_TIME_TO_MAX
-#undef MOUSEKEY_MAX_SPEED
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          100
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-
-#undef MOUSEKEY_WHEEL_MAX_SPEED
-#undef MOUSEKEY_WHEEL_TIME_TO_MAX
-#undef MOUSEKEY_WHEEL_DELAY
-
-#define MOUSEKEY_WHEEL_MAX_SPEED    5
-#define MOUSEKEY_WHEEL_TIME_TO_MAX  60
-#define MOUSEKEY_WHEEL_DELAY        100
-
-#undef TAPPING_TOGGLE
-#undef TAPPING_TERM
-
-#define TAPPING_TOGGLE  1
-#define TAPPING_TERM    150
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
deleted file mode 100755
index 99d10e9a126..00000000000
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
+++ /dev/null
@@ -1,349 +0,0 @@
-// An Ergodox EZ keymap meant to be used with a bépo layout (FR ergonomic
-// layout, dvorak style). The overall design is slightly inspired by the
-// TypeMatrix keyboard. Switching between a TypeMatrix and an Ergodox with this
-// layout should be relatively easy.
-//
-// See the README.md file for an image of this keymap.
-
-#include QMK_KEYBOARD_H
-#include "keymap_bepo.h"
-
-// The layers that we are defining for this keyboards.
-#define BASE 0
-#define FN 1
-#define MOUSE 2
-#define NUMS 3
-#define SWAP 4
-#define SYSLEDS 5
-
-// The Tap Dance identifiers, used in the TD keycode and tap_dance_actions array.
-#define TAP_MACRO 0
-
-// A 'transparent' key code (that falls back to the layers below it).
-#define ___ KC_TRANSPARENT
-
-// A 'blocking' key code. Does nothing but prevent falling back to another layer.
-#define XXX KC_NO
-
-// Some combined keys (one normal keycode when tapped and one modifier or layer
-// toggle when held).
-#define ESC_FN    LT(FN, KC_ESC)        // ESC key and FN layer toggle.
-#define M_RSFT    MT(MOD_RSFT, BP_M)    // 'M' key and right shift modifier.
-#define W_RCTL    MT(MOD_RCTL, BP_W)    // 'W' key and right control modifier.
-#define SPC_RALT  MT(MOD_RALT, KC_SPC)  // SPACE key and right alt modifier.
-#define PERC_FN    LT(FN, BP_PERC)      // '%' key and FN layer toggle.
-
-// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators).
-#define MK_CUT    LSFT(KC_DEL)  // shift + delete
-#define MK_COPY   LCTL(KC_INS)  // ctrl + insert
-#define MK_PASTE  LSFT(KC_INS)  // shift + insert
-
-// Custom keycodes
-enum {
-  // SAFE_RANGE must be used to tag the first element of the enum.
-  // DYNAMIC_MACRO_RANGE must always be the last element of the enum if other
-  // values are added (as its value is used to create a couple of other keycodes
-  // after it).
-  DYNAMIC_MACRO_RANGE = SAFE_RANGE,
-};
-
-// This file must be included after DYNAMIC_MACRO_RANGE is defined...
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Layer 0: basic keys.
-  [BASE] = LAYOUT_ergodox(
-    /* left hand */
-    BP_DLR,   BP_DQUO, BP_LDAQ, BP_RDAQ, BP_LPRN, BP_RPRN, KC_DEL,
-    KC_TAB,   BP_B,    BP_EACU, BP_P,    BP_O,    BP_EGRV, KC_BSPC,
-    KC_LSFT,  BP_A,    BP_U,    BP_I,    BP_E,    BP_COMM,
-    KC_LCTL,  BP_AGRV, BP_Y,    BP_X,    BP_DOT,  BP_K,    KC_ENT,
-    ESC_FN,   BP_ECIR, KC_LGUI, KC_LALT, SPC_RALT,
-                                                          TT(SWAP), KC_MNXT,
-                                                                    KC_MPLY,
-                                                  TT(FN), TT(NUMS), KC_MPRV,
-    /* right hand */
-        KC_DEL,  BP_AT,   BP_PLUS,  BP_MINS, BP_SLSH,     BP_ASTR, BP_EQL,
-        KC_BSPC, BP_DCIR, BP_V,     BP_D,    BP_L,        BP_J,    BP_Z,
-                 BP_C,    BP_T,     BP_S,    BP_R,        BP_N,    M_RSFT,
-        KC_ENT,  BP_QUOT, BP_Q,     BP_G,    BP_H,        BP_F,    W_RCTL,
-                          SPC_RALT, KC_LALT, TT(SYSLEDS), BP_CCED, PERC_FN,
-    KC_LEFT, KC_RIGHT,
-    KC_UP,
-    KC_DOWN, TD(TAP_MACRO), TT(MOUSE)),
-
-  // Layer 1: function and media keys.
-  [FN] = LAYOUT_ergodox(
-    /* left hand */
-    KC_SLEP, KC_F1, KC_F2,  KC_F3,   KC_F4,    KC_F5,    ___,
-    ___,     ___,   ___,    ___,     ___,      ___,      ___,
-    ___,     ___,   ___,    ___,     ___,      KC_LSFT,
-    ___,     ___,   MK_CUT, MK_COPY, MK_PASTE, KC_LCTL,  ___,
-    ___,     ___,   ___,    ___,     ___,
-                                                     ___, KC_VOLU,
-                                                          KC_VOLD,
-                                             ___,    ___, KC_MUTE,
-    /* right hand */
-        ___, KC_F6, KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,
-        ___, ___,   KC_HOME, KC_UP,   KC_END,   KC_PGUP, KC_F12,
-             ___,   KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, ___,
-        ___, ___,   ___,     ___,     ___,      ___,     ___,
-                    ___,     ___,     ___,      ___,     ___,
-    KC_HOME, KC_END,
-    KC_PGUP,
-    KC_PGDN, ___,    ___),
-    // Note that any change to the FN layer above must be added to
-    // the MOUSE layer below (except for the arrow keys).
-
-  // Layer 2: Mouse control.
-  [MOUSE] = LAYOUT_ergodox(
-    /* left hand */
-    KC_SLEP, KC_F1, KC_F2,   KC_F3,   KC_F4,    KC_F5,    ___,
-    ___,     ___,   KC_BTN4, KC_MS_U, KC_BTN5,  ___,      ___,
-    ___,     ___,   KC_MS_L, KC_MS_D, KC_MS_R,  KC_LSFT,
-    ___,     ___,   MK_CUT,  MK_COPY, MK_PASTE, KC_LCTL,  ___,
-    ___,     ___,   ___,     ___,     ___,
-                                                  ___, KC_VOLU,
-                                                       KC_VOLD,
-                                             ___, ___, KC_MUTE,
-    /* right hand */
-         ___, KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10, KC_F11,
-         ___, ___,   XXX,     KC_WH_U, XXX,     XXX,    KC_F12,
-              ___,   KC_WH_L, KC_WH_D, KC_WH_R, XXX,    ___,
-         ___, ___,   KC_ACL0, KC_ACL1, KC_ACL2, ___,    ___,
-                     KC_BTN1, KC_BTN2, KC_BTN3, ___,    ___,
-    ___, ___,
-    ___,
-    ___, ___, ___),
-
-  // Layer 3: Numeric keypad and system keys.
-  [NUMS] = LAYOUT_ergodox(
-    /* left hand */
-    KC_PSCR, KC_INS, KC_PAUS,    ___,     ___,      ___, ___,
-    ___,     ___,    ___,        ___,     ___,      ___, ___,
-    ___,     ___,    ___,        ___,     ___,      ___,
-    ___,     ___,    MK_CUT,     MK_COPY, MK_PASTE, ___, ___,
-    ___,     ___,    ___,        ___,     ___,
-                                              ___, ___,
-                                                   ___,
-                                         ___, ___, ___,
-    /* right hand */
-         ___,     ___,     ___,   ___,   ___,     ___,     KC_NUM,
-         ___,     KC_PEQL, KC_P7, KC_P8, KC_P9,   KC_PMNS, KC_SCRL,
-                  KC_PCMM, KC_P4, KC_P5, KC_P6,   KC_PPLS, ___,
-         KC_PENT, KC_P0,   KC_P1, KC_P2, KC_P3,   KC_PAST, ___,
-                           ___,   ___,   ___,     KC_PSLS, ___,
-    ___, ___,
-    ___,
-    ___, ___, ___),
-
-  // Layer 4: hand swap, all keys are mirrored to the other side of the keyboard
-  // except for the layer toggle itself (so there is no right arrow when this
-  // layer is activated).
-  [SWAP] = LAYOUT_ergodox(
-    /* left hand */
-    ___, ___, ___, ___, ___, ___, ___,
-    ___, ___, ___, ___, ___, ___, ___,
-    ___, ___, ___, ___, ___, ___,
-    ___, ___, ___, ___, ___, ___, ___,
-    ___, ___, ___, ___, ___,
-                             TT(SWAP), ___,
-                                       ___,
-                             ___, ___, ___,
-    /* right hand */
-         ___, ___, ___, ___, ___, ___, ___,
-         ___, ___, ___, ___, ___, ___, ___,
-              ___, ___, ___, ___, ___, ___,
-         ___, ___, ___, ___, ___, ___, ___,
-                   ___, ___, ___, ___, ___,
-    ___, TT(SWAP),
-    ___,
-    ___, ___,      ___),
-
-  // Layer 5: The LEDs are showing the "standard" caps/num/scroll lock indicator
-  // instead of their default which shows the currently active layers (FN, NUMS,
-  // and MOUSE in that order).
-  [SYSLEDS] = LAYOUT_ergodox(
-    /* left hand */
-    ___, ___, ___, ___, ___, ___, ___,
-    ___, ___, ___, ___, ___, ___, ___,
-    ___, ___, ___, ___, ___, ___,
-    ___, ___, ___, ___, ___, ___, ___,
-    ___, ___, ___, ___, ___,
-                                  ___, ___,
-                                       ___,
-                             ___, ___, ___,
-    /* right hand */
-         ___, ___, ___, ___, ___,         ___, ___,
-         ___, ___, ___, ___, ___,         ___, ___,
-              ___, ___, ___, ___,         ___, ___,
-         ___, ___, ___, ___, ___,         ___, ___,
-                   ___, ___, TT(SYSLEDS), ___, ___,
-    ___, ___,
-    ___,
-    ___, ___, ___),
-};
-
-// Whether the macro 1 is currently being recorded.
-static bool is_macro1_recording = false;
-
-// The current set of active layers (as a bitmask).
-// There is a global 'layer_state' variable but it is set after the call
-// to layer_state_set_user().
-static layer_state_t current_layer_state = 0;
-layer_state_t layer_state_set_user(layer_state_t state);
-
-// Method called at the end of the tap dance on the TAP_MACRO key. That key is
-// used to start recording a macro (double tap or more), to stop recording (any
-// number of tap), or to play the recorded macro (1 tap).
-void macro_tapdance_fn(tap_dance_state_t *state, void *user_data) {
-  uint16_t keycode;
-  keyrecord_t record;
-  dprintf("macro_tap_dance_fn %d\n", state->count);
-  if (is_macro1_recording) {
-    keycode = DM_RSTP;
-    is_macro1_recording = false;
-    layer_state_set_user(current_layer_state);
-  } else if (state->count == 1) {
-    keycode = DM_PLY1;
-  } else {
-    keycode = DM_REC1;
-    is_macro1_recording = true;
-    layer_state_set_user(current_layer_state);
-  }
-
-  record.event.pressed = true;
-  process_record_dynamic_macro(keycode, &record);
-  record.event.pressed = false;
-  process_record_dynamic_macro(keycode, &record);
-}
-
-// The definition of the tap dance actions:
-tap_dance_action_t tap_dance_actions[] = {
-  // This Tap dance plays the macro 1 on TAP and records it on double tap.
-  [TAP_MACRO] = ACTION_TAP_DANCE_FN(macro_tapdance_fn),
-};
-
-// Runs for each key down or up event.
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (keycode != TD(TAP_MACRO)) {
-    // That key is processed by the macro_tapdance_fn. Not ignoring it here is
-    // mostly a no-op except that it is recorded in the macros (and uses space).
-    // We can't just return false when the key is a tap dance, because
-    // process_record_user, is called before the tap dance processing (and
-    // returning false would eat the tap dance).
-    if (!process_record_dynamic_macro(keycode, record)) {
-      return false;
-    }
-  }
-
-  return true; // Let QMK send the enter press/release events
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-  ergodox_right_led_1_off();
-  ergodox_right_led_2_off();
-  ergodox_right_led_3_off();
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-};
-
-// The state of the LEDs requested by the system, as a bitmask.
-static led_t sys_led_state = {0};
-
-// Value to use to switch LEDs on. The default value of 255 is far too bright.
-static const uint8_t max_led_value = 20;
-
-// Whether the given layer (one of the constant defined at the top) is active.
-#define LAYER_ON(layer) (current_layer_state & (1<<layer))
-
-void led_1_on(void) {
-  ergodox_right_led_1_on();
-  ergodox_right_led_1_set(max_led_value);
-}
-
-void led_2_on(void) {
-  ergodox_right_led_2_on();
-  ergodox_right_led_2_set(max_led_value);
-}
-
-void led_3_on(void) {
-  ergodox_right_led_3_on();
-  ergodox_right_led_3_set(max_led_value);
-}
-
-void led_1_off(void) {
-  ergodox_right_led_1_off();
-}
-
-void led_2_off(void) {
-  ergodox_right_led_2_off();
-}
-
-void led_3_off(void) {
-  ergodox_right_led_3_off();
-}
-
-// Called when the computer wants to change the state of the keyboard LEDs.
-bool led_update_user(led_t led_state) {
-  sys_led_state = led_state;
-  if (LAYER_ON(SYSLEDS)) {
-    if (sys_led_state.caps_lock) {
-      led_1_on();
-    } else {
-      led_1_off();
-    }
-    if (sys_led_state.num_lock) {
-      led_2_on();
-    } else {
-      led_2_off();
-    }
-    if (sys_led_state.scroll_lock) {
-      led_3_on();
-    } else {
-      led_3_off();
-    }
-  }
-  return false;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  current_layer_state = state;
-  swap_hands = LAYER_ON(SWAP);
-
-  if (is_macro1_recording) {
-    led_1_on();
-    led_2_on();
-    led_3_on();
-    return state;
-  }
-
-  if (LAYER_ON(SYSLEDS)) {
-    led_update_user(sys_led_state);
-    return state;
-  }
-
-  if (LAYER_ON(FN)) {
-    led_1_on();
-  } else {
-    led_1_off();
-  }
-
-  if (LAYER_ON(NUMS)) {
-    led_2_on();
-  } else {
-    led_2_off();
-  }
-
-  if (LAYER_ON(MOUSE)) {
-    led_3_on();
-  } else {
-    led_3_off();
-  }
-
-  return state;
-};
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/readme.md b/keyboards/ergodox_ez/keymaps/bepo_tm_style/readme.md
deleted file mode 100755
index 5571f120cc4..00000000000
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Bépo compatible keymap for the Ergodox EZ, *TypeMatrix* style.
-
-This keymap is meant to be used with a [Bépo](http://bepo.fr) layout. It is
-designed to be somewhat similar to a TypeMatrix keyboard so that switching
-between one and the other is easy.
-
-![The Keymap](https://i.imgur.com/yChIbaK.png)
-
-## Build instruction
-
-To build this on Windows, under Cygwin, provided that you have installed the
-Arduino environment and Teensy loaded in the default path, you can do:
-
-```shell
-PATH=/cygdrive/c/Program\ Files\ \(x86\)/Arduino/hardware/tools/avr/bin:$PATH
-make ergodox_ez:bepo_tm_style:all
-```
-
-## Debug
-
-See https://github.com/tmk/tmk_keyboard#magic-commands for command that can help
-debug, together with the [hid_listen tool](https://docs.qmk.fm/faq_debug.html).
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk b/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk
deleted file mode 100755
index 785b3df8bea..00000000000
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-MOUSEKEY_ENABLE  = yes # Mouse keys
-EXTRAKEY_ENABLE  = yes # Audio control and System control
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
-KEY_LOCK_ENABLE  = yes
-TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
-CONSOLE_ENABLE   = yes  # Console for debug
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-UNICODE_ENABLE   = no
-SLEEP_LED_ENABLE = no
-RGBLIGHT_ENABLE = no
-RGBLIGHT_ANIMATION = no
diff --git a/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c b/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c
deleted file mode 100644
index 67c50eb129e..00000000000
--- a/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c
+++ /dev/null
@@ -1,264 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-/**
- * This section of macros is for tap or hold functionality. Keys will fire off the second symbol in the name if tapped
- * or fire the first symbol in the name if held. For example
- * GUI_Z
- *
- * - will fire z if tapped
- * - will fire cmd/super/win if held
- */
-#define ALT_DOT     ALT_T(KC_DOT)
-#define ALT_X       ALT_T(KC_X)
-#define CTL_SLSH    CTL_T(KC_SLSH)
-#define CTL_Z       CTL_T(KC_Z)
-#define GUI_C       GUI_T(KC_C)
-#define GUI_COMM    GUI_T(KC_COMM)
-#define HPR_ESC     ALL_T(KC_ESC)
-#define HPR_QUO     ALL_T(KC_QUOT)
-
-#define BASE 0
-#define SYMB 1
-#define MDIA 2
-#define MOUSE 3
-#define DEV 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|   '"   |
- * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|X/Alt |C/GUI |   V  |   B  |      |           |      |   N  |   M  |,/GUI |./ALT |//Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,------------.
- *                                        |MOUSE | Home |       | PgDn | PgUp|
- *                                 ,------|------|------|       |------+-----+------.
- *                                 |      |      | ESC  |       | ESC  |     |      |
- *                                 | Space|Backsp|------|       |------| Tab |Enter |
- *                                 |      |ace   | LGui |       | LGui |     |      |
- *                                 `--------------------'       `-------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_EQL,          KC_1,        KC_2,   KC_3,   KC_4,        KC_5,   KC_LEFT,
-        KC_DEL,          KC_Q,        KC_W,   KC_E,   KC_R,        KC_T,   TG(DEV),
-        KC_BSPC,         KC_A,        KC_S,   KC_D,   KC_F,        KC_G,
-        KC_LSFT,         CTL_T(KC_Z), ALT_T(KC_X),    GUI_T(KC_C), KC_V,   KC_B,   ALL_T(KC_NO),
-        LT(SYMB,KC_GRV), KC_QUOT,     LALT(KC_LSFT),  KC_LEFT,     KC_RGHT,
-
-                                                                                    TG(MOUSE), KC_HOME,
-                                                                                               KC_ESC,
-                                                                            KC_SPC, KC_BSPC,   KC_LGUI,
-
-        // right hand
-        KC_RGHT,      KC_6, KC_7,    KC_8,     KC_9,    KC_0,              KC_MINS,
-        TG(SYMB),     KC_Y, KC_U,    KC_I,     KC_O,    KC_P,              KC_BSLS,
-                      KC_H, KC_J,    KC_K,     KC_L,    LT(MDIA, KC_SCLN), KC_QUOT,
-        MEH_T(KC_NO), KC_N, KC_M,    GUI_COMM, ALT_DOT, CTL_SLSH,          KC_RSFT,
-                            KC_DOWN, KC_UP,    KC_LBRC, KC_RBRC,           TT(SYMB),
-
-        KC_PGDN,       KC_PGUP,
-        KC_ESC,
-        KC_LGUI,       KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      | Prev | Next | Mute |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      | VolDn| VolUp|      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA
-[MDIA] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-       // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_MPRV, KC_MNXT, KC_MUTE, KC_TRNS, KC_MPLY,
-       KC_TRNS,  KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-[MOUSE] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-       // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_ACL2, KC_ACL1, KC_ACL0, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-[DEV] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_TRNS,
-       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
-       KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-       // right hand
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case SYMB:
-            // Binary 1 represented by the leds
-            // --*
-            ergodox_right_led_3_on();
-            break;
-        case MDIA:
-            // Binary 2 represented by the leds
-            // -*-
-            ergodox_right_led_2_on();
-            break;
-        case MOUSE:
-            // Binary 3 represented by the leds
-            // -**
-            ergodox_right_led_3_on();
-            ergodox_right_led_2_on();
-            break;
-        case DEV:
-            // Binary 4 represented by the leds
-            // *--
-            ergodox_right_led_1_on();
-            break;
-        default:
-            // none
-            break;
-    }
-};
-
-//bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//  switch (keycode) {
-//    case QWERTY:
-//    return false
-//    break;
-//    case LOWER:
-//      if (record->event.pressed) {
-//        layer_on(_LOWER);
-//        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-//      } else {
-//        layer_off(_LOWER);
-//        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-//      }
-//      return false;
-//      break;
-//    case RAISE:
-//      if (record->event.pressed) {
-//        layer_on(_RAISE);
-//        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-//      } else {
-//        layer_off(_RAISE);
-//        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-//      }
-//      return false;
-//      break;
-//  }
-//  return true;
-//}
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
deleted file mode 100644
index c03ee70bd51..00000000000
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "../../config.h"
-
-// Sets good default for the speed of the mouse.
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_TIME_TO_MAX
-#undef MOUSEKEY_MAX_SPEED
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          100
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-
-#undef MOUSEKEY_WHEEL_MAX_SPEED
-#undef MOUSEKEY_WHEEL_TIME_TO_MAX
-#undef MOUSEKEY_WHEEL_DELAY
-
-#define MOUSEKEY_WHEEL_MAX_SPEED    5
-#define MOUSEKEY_WHEEL_TIME_TO_MAX  60
-#define MOUSEKEY_WHEEL_DELAY        100
-
-#undef TAPPING_TOGGLE
-#undef TAPPING_TERM
-
-#define TAPPING_TOGGLE  1
-#define TAPPING_TERM    150
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
deleted file mode 100644
index 87ad7e63e47..00000000000
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c
+++ /dev/null
@@ -1,234 +0,0 @@
-// An Ergodox EZ keymap mostly following the programmer's dvorak layout.
-// There is a standard QWERTY layer as well
-//
-// See the README.md file for an image of this keymap.
-
-#include QMK_KEYBOARD_H
-
-// The layers that we are defining for this keyboards.
-#define BASE 0
-#define NUM 1
-#define QWERTY 2
-#define MAC 3
-
-// The Tap Dance identifiers, used in the TD keycode and tap_dance_actions array.
-#define TAP_MACRO 0
-
-// SAFE_RANGE must be used to tag the first element of the enum.
-// DYNAMIC_MACRO_RANGE must always be the last element of the enum if other
-// values are added (as its value is used to create a couple of other keycodes
-// after it).
-enum custom_keycodes {
-    MC_ARROW = SAFE_RANGE,
-    DYNAMIC_MACRO_RANGE
-};
-
-// A 'transparent' key code (that falls back to the layers below it).
-#define ___ KC_TRANSPARENT
-
-// A 'blocking' key code. Does nothing but prevent falling back to another layer.
-#define XXX KC_NO
-
-// Some combined keys (one normal keycode when tapped and one modifier or layer
-// toggle when held).
-#define SPC_RALT  MT(MOD_RALT, KC_SPC)  // SPACE key and right alt modifier.
-
-// The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators).
-#define MK_CUT    LSFT(KC_DEL)  // shift + delete
-#define MK_COPY   LCTL(KC_INS)  // ctrl + insert
-#define MK_PASTE  LSFT(KC_INS)  // shift + insert
-//Move mac desktop spaces
-#define MAC_L     LGUI(LSFT(KC_UP)) // cmd + shift + up
-#define MAC_R     LGUI(LSFT(KC_DOWN)) // cmd + shift + down
-
-// This file must be included after DYNAMIC_MACRO_RANGE is defined...
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Layer 0: basic keys.
-  [BASE] = LAYOUT_ergodox_pretty(
-    KC_DLR,           KC_AMPR,  KC_LBRC,  KC_LCBR, KC_RCBR, KC_LPRN, KC_CIRC,           KC_F4,        KC_EQUAL,KC_ASTR, KC_BSLS,   KC_PLUS, KC_RBRC,     KC_EXLM,
-    GUI_T(KC_BSLS),   KC_SCLN,  KC_COMMA, KC_DOT,  KC_P,    KC_Y,    KC_PERC,           KC_DELETE,    KC_F,    KC_G,    KC_C,      KC_R,    KC_L,        KC_SLASH,
-    MO(NUM),          KC_A,     KC_O,     KC_E,    KC_U,    KC_I,                                     KC_D,    KC_H,    KC_T,      KC_N,    KC_S,        KC_MINUS,
-    SC_LSPO,          KC_QUOTE, KC_Q,     KC_J,    KC_K,    KC_X,    KC_LALT,           TD(TAP_MACRO),KC_B,    KC_M,    KC_W,      KC_V,    KC_Z,        SC_RSPC,
-    KC_AT,            KC_HASH,  KC_GRAVE, KC_LEFT, KC_RIGHT,                                                   KC_UP,   KC_DOWN,   KC_HOME, KC_END,      TO(QWERTY),
-                                         ALT_T(KC_APPLICATION), ALL_T(KC_NO),           KC_PGUP, KC_LGUI,
-                                                                   KC_BSLS,             TO(MAC),
-                                          KC_ENTER, KC_TAB, CTL_T(KC_ESCAPE),           CTL_T(KC_ESCAPE), KC_BSPC,  KC_SPACE),
-
-  // Layer 1: function and numpad keys.
-  [NUM] = LAYOUT_ergodox_pretty(
-    ___,  KC_F1,   KC_F2,    KC_F3,       KC_F4,       KC_F5,      ___,         ___, KC_F6,   KC_F7,  KC_F8,  KC_F9,      KC_F10,       KC_F11,
-    ___,  KC_EXLM, KC_COMMA, KC_DOT,      KC_MS_BTN1,  KC_MS_BTN2, ___,         ___, KC_UP,   KC_7,   KC_8,   KC_9,       KC_ASTR,      KC_F12,
-    XXX,  ___,     KC_LCBR,  KC_RCBR,     MC_ARROW,    KC_GRAVE,                     KC_DOWN, KC_4,   KC_5,   KC_6,       KC_PLUS,      KC_UNDS,
-    ___,  ___,     KC_CIRC,  KC_LBRC,     KC_RBRC,     KC_TILD,    ___,         ___, KC_0,    KC_1,   KC_2,   KC_3,       KC_KP_SLASH,  KC_BSLS,
-    ___,  ___,     ___,      ___,         ___,                                                ___,    KC_0,   KC_KP_DOT,  KC_EQUAL,     ___,
-                                                           ___,    ___,         KC_KP_ASTERISK, KC_KP_SLASH,
-                                                               KC_LCTL,         ___,
-                                      KC_KP_PLUS,  KC_KP_MINUS, KC_DLR,         KC_DELETE, KC_BSPC,  KC_SPACE),
-
-  // Layer 2: QWERTY control.
-  [QWERTY] = LAYOUT_ergodox_pretty(
-    /* left hand */
-    KC_EQUAL,   KC_1,     KC_2,         KC_3,     KC_4,     KC_5,    KC_LEFT,           KC_RIGHT,     KC_6,   KC_7,   KC_8,     KC_9,         KC_0,         KC_MINUS,
-    KC_DELETE,  KC_Q,     KC_W,         KC_E,     KC_R,     KC_T,    KC_Y,              TO(BASE),     KC_Y,   KC_U,   KC_I,     KC_O,         KC_P,         KC_BSLS,
-    MO(NUM),    KC_A,     KC_S,         KC_D,     KC_F,     KC_G,                                     KC_H,   KC_J,   KC_K,     KC_L,         KC_SCLN,      GUI_T(KC_QUOT),
-    KC_LSFT,    KC_Z,     KC_X,         KC_C,     KC_V,     KC_B, ALT_T(KC_NO),         MEH_T(KC_NO), KC_N,   KC_M,   KC_COMMA, KC_DOT,       KC_SLASH,     SC_RSPC,
-    KC_GRAVE,   KC_QUOTE, LALT(KC_TAB), KC_LEFT,  KC_RIGHT,                                                   KC_UP,  KC_DOWN,  KC_LBRC,      KC_RBRC,      TO(BASE),
-                                                  ___, KC_LGUI,                         ___, KC_ESCAPE,
-                                                       KC_HOME,                         KC_PGUP,
-                                      KC_ENTER, KC_TAB, KC_END,                         KC_PGDN, KC_BSPC, KC_SPACE),
-
-    // Layer 3: Mac layer
-    [MAC] = LAYOUT_ergodox_pretty(
-      /* left hand */
-      ___,  KC_1, KC_2, KC_3,   KC_4,   KC_5, ___,        ___, KC_6,  KC_7, KC_8, KC_9, KC_0, ___,
-      ___,  ___,  ___,  ___,    ___,    ___,  ___,        ___, ___,   ___,  ___,  ___,  ___,  ___,
-      ___,  ___,  ___,  ___,    ___,    ___,                   ___,   ___,  ___,  ___,  ___,  ___,
-      ___,  ___,  ___,  ___,    ___,    ___,  ___,        ___, ___,   ___,  ___,  ___,  ___,  ___,
-      ___,  ___,  ___,  MAC_L,  MAC_R,                                ___,  ___,  ___,  ___,  ___,
-                                        ___,  ___,        ___, ___,
-                                              ___,        TO(BASE),
-                      KC_LGUI,  KC_LALT,  KC_LGUI,        KC_LGUI, KC_LALT, KC_LGUI),
-};
-
-// Whether the macro 1 is currently being recorded.
-static bool is_macro1_recording = false;
-
-// The current set of active layers (as a bitmask).
-// There is a global 'layer_state' variable but it is set after the call
-// to layer_state_set_user().
-static layer_state_t current_layer_state = 0;
-layer_state_t layer_state_set_user(layer_state_t state);
-
-// Method called at the end of the tap dance on the TAP_MACRO key. That key is
-// used to start recording a macro (double tap or more), to stop recording (any
-// number of tap), or to play the recorded macro (1 tap).
-void macro_tapdance_fn(tap_dance_state_t *state, void *user_data) {
-  uint16_t keycode;
-  keyrecord_t record;
-  dprintf("macro_tap_dance_fn %d\n", state->count);
-  if (is_macro1_recording) {
-    keycode = DM_RSTP;
-    is_macro1_recording = false;
-    layer_state_set_user(current_layer_state);
-  } else if (state->count == 1) {
-    keycode = DM_PLY1;
-  } else {
-    keycode = DM_REC1;
-    is_macro1_recording = true;
-    layer_state_set_user(current_layer_state);
-  }
-
-  record.event.pressed = true;
-  process_record_dynamic_macro(keycode, &record);
-  record.event.pressed = false;
-  process_record_dynamic_macro(keycode, &record);
-}
-
-// The definition of the tap dance actions:
-tap_dance_action_t tap_dance_actions[] = {
-  // This Tap dance plays the macro 1 on TAP and records it on double tap.
-  [TAP_MACRO] = ACTION_TAP_DANCE_FN(macro_tapdance_fn)
-};
-
-// Runs for each key down or up event.
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (keycode != TD(TAP_MACRO)) {
-    // That key is processed by the macro_tapdance_fn. Not ignoring it here is
-    // mostly a no-op except that it is recorded in the macros (and uses space).
-    // We can't just return false when the key is a tap dance, because
-    // process_record_user, is called before the tap dance processing (and
-    // returning false would eat the tap dance).
-    if (!process_record_dynamic_macro(keycode, record)) {
-      return false;
-    }
-
-    if(record->event.pressed) {
-      switch(keycode) {
-        case MC_ARROW:
-          SEND_STRING("=>");
-          return false;
-          break;
-      }
-    }
-  }
-
-  return true; // Let QMK send the enter press/release events
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-  ergodox_right_led_1_off();
-  ergodox_right_led_2_off();
-  ergodox_right_led_3_off();
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-};
-
-// Value to use to switch LEDs on. The default value of 255 is far too bright.
-static const uint8_t max_led_value = 20;
-
-// Whether the given layer (one of the constant defined at the top) is active.
-#define LAYER_ON(layer) (current_layer_state & (1<<layer))
-
-void led_1_on(void) {
-  ergodox_right_led_1_on();
-  ergodox_right_led_1_set(max_led_value);
-}
-
-void led_2_on(void) {
-  ergodox_right_led_2_on();
-  ergodox_right_led_2_set(max_led_value);
-}
-
-void led_3_on(void) {
-  ergodox_right_led_3_on();
-  ergodox_right_led_3_set(max_led_value);
-}
-
-void led_1_off(void) {
-  ergodox_right_led_1_off();
-}
-
-void led_2_off(void) {
-  ergodox_right_led_2_off();
-}
-
-void led_3_off(void) {
-  ergodox_right_led_3_off();
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  current_layer_state = state;
-
-  if (is_macro1_recording) {
-    led_1_on();
-    led_2_on();
-    led_3_on();
-    return state;
-  }
-
-  if (LAYER_ON(NUM)) {
-    led_1_on();
-  } else {
-    led_1_off();
-  }
-
-  if (LAYER_ON(MAC)) {
-    led_2_on();
-  } else {
-    led_2_off();
-  }
-
-  if (LAYER_ON(QWERTY)) {
-    led_3_on();
-  } else {
-    led_3_off();
-  }
-
-  return state;
-};
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/readme.md b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/readme.md
deleted file mode 100644
index 33040800e96..00000000000
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Ergodox EZ Layout by bpruitt-goddard
-![Layout Image](https://i.imgur.com/kVPmpFG.png)
-
-[KLE link](http://www.keyboard-layout-editor.com/#/gists/5896c5a729a64633d3f63de71e7e0e79)
-
-## Layers
-| Layer | Legend |
-| ----- | ------ |
-| Base  |  Top (black) |
-| Num | Center (blue) |
-| QWERTY | Bottom (Red) |
-| MAC | Front/Bottom-most (Yellow) |
-
-## Features
-* Tap-dance dynamic macro key.
-  * Tap twice for starting macro. Then tap once to complete the macro
-  * Tap one for replaying macro
-* Numpad on right hand with momentary Num layer
-* QWERTY layer for non-dvorak users
-* Mac layer for changing thumbpad modifier keys with Command
-* Uses the following dual function keys
-    * Space Cadet shifts (shift/paren)
-    * Ctrl/Esc
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
deleted file mode 100644
index 75832dcf8e8..00000000000
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-MOUSEKEY_ENABLE  = yes # Mouse keys
-EXTRAKEY_ENABLE  = yes # Audio control and System control
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard
-KEY_LOCK_ENABLE  = yes
-TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
-CONSOLE_ENABLE   = yes  # Console for debug
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-UNICODE_ENABLE   = no
-SLEEP_LED_ENABLE = no
-RGBLIGHT_ENABLE = no
-RGBLIGHT_ANIMATION = no
diff --git a/keyboards/ergodox_ez/keymaps/colemak_es_osx/config.h b/keyboards/ergodox_ez/keymaps/colemak_es_osx/config.h
deleted file mode 100644
index a1e4d79768b..00000000000
--- a/keyboards/ergodox_ez/keymaps/colemak_es_osx/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-// Sets good default for the speed of the mouse.
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_TIME_TO_MAX
-#undef MOUSEKEY_MAX_SPEED
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          100
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-
-#undef MOUSEKEY_WHEEL_MAX_SPEED
-#undef MOUSEKEY_WHEEL_TIME_TO_MAX
-#undef MOUSEKEY_WHEEL_DELAY
-
-#define MOUSEKEY_WHEEL_MAX_SPEED    5
-#define MOUSEKEY_WHEEL_TIME_TO_MAX  60
-#define MOUSEKEY_WHEEL_DELAY        100
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/colemak_es_osx/keymap.c b/keyboards/ergodox_ez/keymaps/colemak_es_osx/keymap.c
deleted file mode 100644
index a505fc2b62b..00000000000
--- a/keyboards/ergodox_ez/keymaps/colemak_es_osx/keymap.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
-  Copyright 2019 Mario Arias <mario@marioarias.org>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-#include "keymap_spanish.h"
-
-enum layers {
-    BASE = 0,   //Colemak
-    QWERTY,     //Qwerty
-    FN,         //Colemak but FN1 to FN12 instead of numbers
-    NUM,        //Numpad
-    MOUSE,      //Mouse and media controls
-    IDEA        //Shortcuts for IDEA / Other tools
-};
-
-//Special paste
-#define S_PASTE     LSFT(LGUI(KC_V))
-//tmux prefix
-#define T_PREFIX    LCTL(KC_B)
-// Column mode
-#define I_COLUMN    ALGR(LCTL(LGUI(ES_MINS)))
-// Terminal
-#define I_TERM      ALGR(KC_F12)
-// Line comment
-#define I_LN_COM    LCTL(LGUI(KC_7))
-// Block comment
-#define I_BK_COM    LCTL(LGUI(KC_8))
-// Reformat code
-#define I_REFORM    LALT(LGUI(KC_L))
-// Rename
-#define I_RENAME    LSFT(KC_F6)
-// Find usages
-#define I_FUSAGE    LALT(KC_F7)
-// Code for Packt
-#define P_CODE      LCTL(ALGR(KC_X))
-// Search
-#define I_SEARCH    LCTL(LSFT(KC_F))
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Colemak MacOS Spanish layer
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   Esc  |  1 ! | 2 "  | 3 ·  | 4 $  | 5 %  |  º \ |           | ¡ ¿  |  6 & | 7 /  |  8 ( | 9 )  | 0 =  | Backsp |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |   TAB  |   Q  |   W  |   F  |   P  |   G  | Home |           | End  |   J  |   L  |   U  |   Y  |  Ñ   |  ' ?   |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  CAPS  |   A  |   R  |   S  |   T  |   D  |------|           |------|   H  |   N  |   E  |   I  |  O   |  ENT   |
- * |--------+------+------+------+------+------|  <>  |           |  -_  |------+------+------+------+------+--------|
- * | Shift  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   K  |   M  |  , ; |  . : |  UP  | Shift  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Del  | PgUp |Ctl/PD|Alt/[ |Cmd/] |                                       |Cmd/{ |Alt/} | LEFT | DOWN | RIGHT|
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,--------------.        ,--------------.
- *                                        | Num  | Mouse |        | Qwer | Ctrl  |
- *                                 ,------|------|-------|        |------+-------+------.
- *                                 |      |      | FN    |        |SPaste|       |      |
- *                                 |LShift|Backsp|-------|        |------|  ENT  |Space |
- *                                 |      |      | IDEA  |        | T-pre|       |      |
- *                                 `---------------------'        `---------------------'
- */
-[BASE] = LAYOUT_ergodox(
-// left hand
-        KC_ESC,     KC_1,       KC_2,           KC_3,           KC_4,        KC_5,        ES_LABK,
-        KC_TAB,     KC_Q,       KC_W,           KC_F,           KC_P,        KC_G,        KC_HOME,
-        KC_CAPS,    KC_A,       KC_R,           KC_S,           KC_T,        KC_D,
-        KC_LSFT,    KC_Z,       KC_X,           KC_C,           KC_V,        KC_B,        KC_GRV,
-        KC_DEL,     KC_PGUP,    CTL_T(KC_PGDN), ALT_T(ES_GRV),  GUI_T(ES_PLUS),
-
-                                                                            DF(NUM),    DF(MOUSE),
-                                                                                        DF(FN),
-                                                                KC_LSFT,    KC_BSPC,    MO(IDEA),
-
-// right hand
-        ES_IEXL,        KC_6,           KC_7,       KC_8,       KC_9,       KC_0,       KC_BSPC,
-        KC_END,         KC_J,           KC_L,       KC_U,       KC_Y,       ES_NTIL,    ES_QUOT,
-                        KC_H,           KC_N,       KC_E,       KC_I,       KC_O,       KC_ENT,
-        ES_MINS,        KC_K,           KC_M,       KC_COMM,    KC_DOT,     KC_UP,      KC_RSFT,
-                                GUI_T(ES_ACUT), ALT_T(KC_BSLS), KC_LEFT,    KC_DOWN,    KC_RIGHT,
-
-        DF(QWERTY),     KC_RCTL,
-        S_PASTE,
-        T_PREFIX,       KC_ENT,     KC_SPC
-),
-/* Keymap 1: Spanish QWERTY layer (games) //Will probably change it for a Linux/Windows Colemak layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |   P  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   Ñ  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       | Base |      |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |      |       |      |        |      |
- *                                 |      |      |------|       |------|        |      |
- *                                 |      |      |      |       |      |        |      |
- *                                 `--------------------'       `----------------------'
- */
-[QWERTY] = LAYOUT_ergodox(
-  // left hand
-        _______,        _______,    _______,    _______,    _______,    _______,    _______,
-        _______,        KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       _______,
-        _______,        KC_A,       KC_S,       KC_D,       KC_F,       KC_G,
-        _______,        KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,       _______,
-        _______,        _______,    _______,    _______,    _______,
-
-                                                                        _______,    _______,
-                                                                                    _______,
-                                                        _______,        _______,    _______,
-
-// right hand
-        _______,        _______,    _______,    _______,    _______,    _______,    _______,
-        _______,        KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       _______,
-                        KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    _______,
-        _______,        KC_N,       KC_M,       _______,    _______,    _______,    _______,
-                                    _______,    _______,    _______,    _______,    _______,
-        DF(BASE),   _______,
-        _______,
-        _______,    _______,    _______
-),
-/* Keymap 2: Function Layer
-*
-* ,--------------------------------------------------.           ,--------------------------------------------------.
-* |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  | F10  | F11  | F12  |        |
-* |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-* |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
-* |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-* `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-*   |      |      |      |      |      |                                       |      |      |      |      |      |
-*   `----------------------------------'                                       `----------------------------------'
-*                                        ,-------------.       ,-------------.
-*                                        |      |      |       |      |      |
-*                                 ,------|------|------|       |------+------+------.
-*                                 |      |      | Base |       |      |      |      |
-*                                 |      |      |------|       |------|      |      |
-*                                 |      |      |      |       |      |      |      |
-*                                 `--------------------'       `--------------------'
-*/
-[FN] = LAYOUT_ergodox(
-        // left hand
-        _______,        KC_F1,        KC_F2,       KC_F3,      KC_F4,       KC_F5,      KC_F6,
-        _______,        _______,      _______,     _______,    _______,     _______,    _______,
-        _______,        _______,      _______,     _______,    _______,     _______,
-        _______,        _______,      _______,     _______,    _______,     _______,    _______,
-        _______,        _______,      _______,     _______,    _______,
-
-                                                                            _______,    _______,
-        DF(BASE),
-        _______,        _______,      _______,
-
-// right hand
-        KC_F7,          KC_F8,        KC_F9,        KC_F10,     KC_F11,     KC_F12,     _______,
-        _______,        _______,      _______,      _______,    _______,    _______,    _______,
-                        _______,      _______,      _______,    _______,    _______,    _______,
-        _______,        _______,      _______,      _______,    _______,    _______,    _______,
-        _______,        _______,      _______,      _______,    _______,
-
-        _______,        _______,
-        _______,
-        _______,        _______,      _______
-),
-/* Mouse and media controls
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   Esc  |      |      |      |      |      | Play |           | Vol+ |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | Ms U |      |      |      |           |      |      |      | Wh U |      |      |        |
- * |--------+------+------+------+------+------| Rwd  |           | Vol- |------+------+------+------+------+--------|
- * |        |      | Ms L | Ms D | Ms R |      |------|           |------|      | Wh L | Wh D | Wh R |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      | Acc0 | Acc1 | Acc2 |      | Fwd  |           | Mute |      | Btn1 | Btn2 | Btn3 |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |  Num | Base |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------        |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[MOUSE] = LAYOUT_ergodox(
-// left hand
-        KC_ESC,         XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_MPLY,
-        XXXXXXX,        XXXXXXX,    XXXXXXX,    KC_MS_U,    XXXXXXX,    XXXXXXX,    KC_MRWD,
-        XXXXXXX,        XXXXXXX,    KC_MS_L,    KC_MS_D,    KC_MS_R,    XXXXXXX,
-        XXXXXXX,        XXXXXXX,    KC_ACL0,    KC_ACL1,    KC_ACL2,    XXXXXXX,    KC_MFFD,
-        XXXXXXX,        XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,
-
-                                                                            DF(NUM),   DF(BASE),
-                                                                                        XXXXXXX,
-                                                                XXXXXXX,    XXXXXXX,    XXXXXXX,
-
-// right hand
-        KC_VOLU,        XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,
-        KC_VOLD,        XXXXXXX,    XXXXXXX,    KC_WH_U,    XXXXXXX,    XXXXXXX,    XXXXXXX,
-                        XXXXXXX,    KC_WH_L,    KC_WH_D,    KC_WH_R,    XXXXXXX,    XXXXXXX,
-        KC_MUTE,        XXXXXXX,    KC_BTN1,    KC_BTN2,    KC_BTN3,    XXXXXXX,    XXXXXXX,
-        XXXXXXX,        XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,
-
-        XXXXXXX,        XXXXXXX,
-        XXXXXXX,
-        XXXXXXX,        XXXXXXX,    XXXXXXX
-),
-/* Num pad
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |  (   |  )   |  =   |  /   |  *   |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |  Up  |      |      |      |           |      |      |  7   |  8   |  9   |  -   |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      | Left | Down |Right |      |------|           |------|      |  4   |  5   |  6   |  +   |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |  1   |  2   |  3   |Enter |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |  0   |  0   |  ,   |Enter |  .   |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | Base |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------        |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[NUM] = LAYOUT_ergodox(
-// left hand
-        _______,        _______,    _______,    _______,    _______,  _______,    _______,
-        _______,        _______,    _______,      KC_UP,    _______,  _______,    _______,
-        _______,        _______,    KC_LEFT,    KC_DOWN,    KC_RIGHT, _______,
-        _______,        _______,    _______,    _______,    _______,  _______,    _______,
-        _______,        _______,    _______,    _______,    _______,
-
-        DF(BASE),   _______,
-        _______,
-        _______,        _______,    _______,
-
-// right hand
-        _______,        LSFT(KC_8), LSFT(KC_9), KC_PEQL,    KC_PSLS,    KC_PAST,    _______,
-        _______,        _______,    KC_P7,      KC_P8,      KC_P9,      KC_PMNS,    _______,
-                        _______,    KC_P4,      KC_P5,      KC_P6,      KC_PPLS,    _______,
-        _______,        _______,    KC_P1,      KC_P2,      KC_P3,      KC_PENT,    _______,
-                                    KC_P0,      KC_P0,      KC_PDOT,    KC_PENT,    KC_DOT,
-
-        _______,        _______,
-        _______,
-        _______,        _______,    _______
-),
-/* IDEA
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      | Renm |           | Usag |      | LnCm | BkCm |      | Term |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |Search|      |      |      |           |      |      | Refm |      |      |      |        |
- * |--------+------+------+------+------+------|      |           | Col  |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      | Code |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------        |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[IDEA] = LAYOUT_ergodox(
-
-//Left hand
-        _______,        _______,    _______,    _______,    _______,    _______,    I_RENAME,
-        _______,        _______,    _______,    I_SEARCH,   _______,    _______,    _______,
-        _______,        _______,    _______,    _______,    _______,    _______,
-        _______,        _______,    P_CODE,     _______,    _______,    _______,    _______,
-        _______,        _______,    _______,    _______,    _______,
-
-                                                                        _______,    DF(BASE),
-                                                                                    _______,
-                                                        _______,        _______,    _______,
-
-// right hand
-        I_FUSAGE,       _______,    I_LN_COM,   I_BK_COM,   _______,    I_TERM,    _______,
-        I_COLUMN,       _______,    I_REFORM,   _______,    _______,    _______,    _______,
-                        _______,    _______,    _______,    _______,    _______,    _______,
-        _______,        _______,    _______,    _______,    _______,    _______,    _______,
-                                _______,        _______,    _______,    _______,    _______,
-
-        _______,        _______,
-        _______,
-        _______,        _______,    _______
-)
-};
-
-
-void led_1_off(void) {
-    ergodox_right_led_1_off();
-}
-
-void led_2_off(void) {
-    ergodox_right_led_2_off();
-}
-
-void led_3_off(void) {
-    ergodox_right_led_3_off();
-}
-
-//Runs just one time when the keyboard initializes
-void matrix_init_use(void) {
-    led_1_off();
-    led_2_off();
-    led_3_off();
-}
-
-// Value to use to switch LEDs on. The default value of 255 is far too bright.
-static const uint8_t max_led_value = 20;
-
-
-void led_1_on(void) {
-    ergodox_right_led_1_on();
-    ergodox_right_led_1_set(max_led_value);
-}
-
-void led_2_on(void) {
-    ergodox_right_led_2_on();
-    ergodox_right_led_2_set(max_led_value);
-}
-
-void led_3_on(void) {
-    ergodox_right_led_3_on();
-    ergodox_right_led_3_set(max_led_value);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-    if(layer_state_cmp(state ,IDEA)) {
-        led_1_on();
-        led_3_on();
-    } else {
-        led_1_off();
-        led_3_off();
-    }
-
-  return state;
-};
-
-void matrix_scan_user(void) {
-
-    ergodox_board_led_off();
-    led_1_off();
-    led_2_off();
-    led_3_off();
-
-    if(layer_state_cmp(default_layer_state, QWERTY)) {
-        led_3_on();
-    }
-
-    if(layer_state_cmp(default_layer_state, FN)) {
-        led_2_on();
-    }
-
-    if(layer_state_cmp(default_layer_state, NUM)) {
-        led_2_on();
-        led_3_on();
-    }
-
-    if(layer_state_cmp(default_layer_state, MOUSE)) {
-        led_1_on();
-    }
-};
diff --git a/keyboards/ergodox_ez/keymaps/colemak_es_osx/readme.md b/keyboards/ergodox_ez/keymaps/colemak_es_osx/readme.md
deleted file mode 100644
index b17ae015aaa..00000000000
--- a/keyboards/ergodox_ez/keymaps/colemak_es_osx/readme.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# ErgoDox EZ Spanish Colemak configuration
-
-## Description
-
-A Colemak keymap adapted for Spanish.
-
-### Base Layer - Spanish Colemak
-
-The Base Layer is a Colemak keymap with an additional "&ntilde;" next to the "y" key. The arrow cluster has a proper T inverted shape.
-
-It includes almost all Spanish Symbols from a normal 100% keyboard thanks to the use of tap keys
-
-
-| Pressed | Tap | Shift | Alt |   
-|---|---|---|---|
-|Left Ctrl|PgDn|||
-|Left Alt|`|ˆ|[|
-|Left Cmd|+|*|]|
-|Right Cmd|´|¨|{|
-|Right Alt|ç|Ç|}|
-
-For example, if you want to type ```[]```, you keep pressing the "Left Alt" (To modify) and tap "Right Alt" and "Right Cmd" to send "[" and "]"
-
-### Qwerty Layer
-
-A Qwerty layer for gaming and maybe some VIM commands. It just modifies the few keys that are different between Colemak and Qwerty and keep all the others keys
-
-### Fn Layer
-
-A layer to change the number row including "º" and "¡" for "Fn1" to "Fn12". The rest is just the same as the Base layer
-
-### Mouse and media controls
-
-Mouse movement on the left hand, wheel and buttons on the right hand. "Play/Pause", "Rewind", "Forward" in the Left inner column. "Volume Up", "Volume Down" and "Mute" in the Right inner column
-
-### Numpad
-
-A complete numpad in the right hand, plus and Arrow cluster on the left hand
-
-### IDEA (JetBrains IDEs)
-
-A momentary layer for IDEA shortcuts that require more than two fingers or any Fn key
-
-## How to build it
-
-If you already have all the dependencies (Check QMK's documentation), you can run the command:
-
-```bash
-make ergodox_ez:colemak_es_osx
-```
-
-On MacOS, if you're using MacPorts you can install the following dependencies:
-
-```bash
-port install avr-binutils
-port install avr-gcc
-port install avr-libc
-```
-
-This isn't an exhaustive list and maybe there other dependencies that are technically necessary 
-
-## Changelog
-
-* Jul 2019:
-    * Initial version for the new QMK version
-
-![](https://imgur.com/AyWNGlL.png)
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/.gitignore b/keyboards/ergodox_ez/keymaps/hacker_dvorak/.gitignore
deleted file mode 100644
index 504afef81fb..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/
-package-lock.json
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
deleted file mode 100644
index 05d30392ff2..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-  Set any config.h overrides for your specific keymap here.
-  See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
-*/
-#pragma once
-
-
-#undef  TAPPING_TERM
-#define TAPPING_TERM 175
-#define TAPPING_TERM_PER_KEY
-
-#undef  DEBOUNCE
-#define DEBOUNCE 15
-
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#undef  FORCE_NKRO
-#define FORCE_NKRO
-
-#undef  TAPPING_TOGGLE
-#define TAPPING_TOGGLE 5
-
-#define LEADER_TIMEOUT 1000
-#define PERMISSIVE_HOLD
-#define DANCING_TERM 175
-
-#define ONESHOT_TAP_TOGGLE 5
-
-#undef  ONESHOT_TIMEOUT
-#define ONESHOT_TIMEOUT 5000
-
-#define COMBO_TERM 200
-
-#undef  RGBLIGHT_HUE_STEP
-#define RGBLIGHT_HUE_STEP 24
-
-#undef  RGBLIGHT_SAT_STEP
-#define RGBLIGHT_SAT_STEP 24
-
-#undef  RGBLIGHT_VAL_STEP
-#define RGBLIGHT_VAL_STEP 24
-
-#undef  RGBLIGHT_BRI_STEP
-#define RGBLIGHT_BRI_STEP 24
-
-#undef  RGBLIGHT_LIMIT_VAL
-#define RGBLIGHT_LIMIT_VAL 255
-
-
-#undef  MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL 10
-
-#undef  MOUSEKEY_DELAY
-#define MOUSEKEY_DELAY 15
-
-#undef  MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_MAX_SPEED 20
-
-#undef  MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX 200
-
-#undef  MOUSEKEY_WHEEL_MAX_SPEED
-#define MOUSEKEY_WHEEL_MAX_SPEED 20
-
-#undef  MOUSEKEY_WHEEL_TIME_TO_MAX
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 200
-
-
-// #undef  NO_DEBUG
-// #define NO_DEBUG
-
-// #undef  NO_PRINT
-// #define NO_PRINT
-
-// #define RETRO_TAPPING
-// #define QUICK_TAP_TERM 0
-
-// #define AUTO_SHIFT_TIMEOUT 150
-// #define NO_AUTO_SHIFT_SPECIAL
-// #define NO_AUTO_SHIFT_NUMERIC
-// #define NO_AUTO_SHIFT_ALPHA
-
-// #define EXTRA_LONG_COMBOS
-// #define EXTRA_EXTRA_LONG_COMBOS
-// #define COMBO_ALLOW_ACTION_KEYS
-
-// #define RGBLIGHT_SLEEP
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/gulpfile.js b/keyboards/ergodox_ez/keymaps/hacker_dvorak/gulpfile.js
deleted file mode 100644
index 81a4e93fda4..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/gulpfile.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const gulp = require('gulp');
-const run = require('gulp-run-command').default;
-
-
-const ROOT_DIR = '../../../../';
-const BUILD_DIR = `${ROOT_DIR}.build`;
-const HACKER_DVORAK_DIR = './**/*';
-
-const CLEAN_CMD = `rm -rf ${BUILD_DIR}`;
-const BUILD_CMD = `make -C ${ROOT_DIR} ergodox_ez:hacker_dvorak`;
-
-gulp.task('clean', run(CLEAN_CMD));
-
-gulp.task('build', gulp.series('clean', run(BUILD_CMD, {
-        ignoreErrors: true
-})));
-
-gulp.task('watch', gulp.series('build', () => {
-    gulp.watch(HACKER_DVORAK_DIR, gulp.series('build'));
-}));
-
-gulp.task('default', gulp.series('watch'));
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
deleted file mode 100644
index 19627ad11fd..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/hacker_dvorak.c
+++ /dev/null
@@ -1,353 +0,0 @@
-// Keyboard keymap:
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [DVORAK] = LAYOUT_ergodox(
-
-        // HACKER DVORAK left hand
-
-         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-        //  ESCAPE                 |                         |                         |                         |                         |                         |     START RECORDING     //
-        //                         |                         |                         |                         |                         |                         |                         //
-                   KC_ESC,                 TD(GRV_TILD),             TD(AT_DLR),              TD(LCBR_LABK),            TD(LPRN_LBRC),            TD(EXLM_QUES),           DM_REC1,            //
-        //                         |                       ~ |                       $ |                       < |                       [ |                       ? |                         //
-        //                         |            TAP DANCE: ` |            TAP DANCE: @              TAP DANCE: { |            TAP DANCE: ( |            TAP DANCE: ! |     DYNAMIC MARCO 1     //
-         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-        //  TAB                    |      MOD TAP: ALT+SHIFT |       MOD TAP: CTRL+ALT |     MOD TAP: CTRL+SHIFT | P                       | Y                       |                         //
-        //                         |                         |                         |                         |                         |                         |                         //
-                   KC_TAB,                TD(NONE_LEAD),            TD(QUOT_DQUO),           TD(DOT_COMM),               LCG_T(KC_P),              LAG_T(KC_Y),            DM_PLY1,            //
-        //                         |                    LEAD |                       " |                       , |                         |                         |                         //
-        //                         |         TAP DANCE: NONE |            TAP DANCE: ' |            TAP DANCE: . |       MOD TAP: CTRL+GUI |        MOD TAP: ALT+GUI |                         //
-         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------|   PLAY DYNAMIC MACRO 1  //
-        //                         |            MOD TAP: ALT |           MOD TAP: CTRL |        LAYER TAP: SHIFT | M TAP DANCE: ARROWS/GUI |      MOD TAP: SHIFT+GUI |                         //
-        //                         |                         |                         |                         |                       Ü |                         |                         //
-                TD(EQL_PLUS),             LALT_T(KC_A),             LCTL_T(KC_O),             LSFT_T(KC_E),            TD(U_ARR_GUI),             SGUI_T(KC_I),      //-----------------------//
-        //                       + |                       Á |                       Ó |                       É |                       Ú |                       Í |                         //
-        //            TAP DANCE: = |            TAP DANCE: A |            TAP DANCE: O |            TAP DANCE: E |            TAP DANCE: U |            TAP DANCE: I |                         //
-         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------|  META                   //
-        //          STOP RECORDING |  MOD TAP: GUI+SHIFT+ALT | Q                       | J                       | K                       | X                       |                         //
-        //                         |                         |                         |                         |                         |                         |                         //
-                DM_RSTP,                  TD(SCLN_COLN),            LCAG_T(KC_Q),             TD(J_MED_MEH),            TD(K_NUM_HYP),            LCSG_T(KC_X),                KC_LGUI,        //
-        //                         |                       : |                         |                         |                         |                         |                         //
-        //           DYNAMIC MACRO |            TAP DANCE: ; |      MOD TAP: SHIFT+GUI |  M TAP DANCE: MEDIA/MEH |  M TAP DANCE: ATM/HYPER |  MOD TAP: CTL+SHIFT+GUI |                         //
-         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-        //         LAYERS SWITCHER | APPLICATION MENU        |                         |                         |                        //
-        //                         |                         |                         |                         |                  SCROLL //
-                 TG(LAYERS),                 KC_APP,                  KC_NUM,                   KC_SCRL,                   KC_CAPS,        //
-        //                         |                         |                         |                         |                  NUM    //
-        //            LAYER TOGGLE |                         |                         |                         |       TAP DANCE: CAPS   //
-         //------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-
-                                                                                                               // HACKER DVORAK left thumb
-
-                                                                                                                                           //------------------------+------------------------//
-                                                                                                                                          // MOUSE WHEEL LEFT        | MOUSE WHEEL RIGHT       //
-                                                                                                                                          //                         |                         //
-                                                                                                                                                     KC_WH_L,                  KC_WH_R,        //
-                                                                                                                                          //                         |                         //
-                                                                                                                                           //                        |                         //
-                                                                                                                //-------------------------+-------------------------+------------------------//
-                                                                                                               //                          |                         | HOME                    //
-                                                                                                               //                          |                         |                         //
-                                                                                                                /*  SPACE                   |  BACKSPACE             */         KC_HOME,       //
-                                                                                                               //                          |                         |                         //
-                                                                                                               //                          |                         |                         //
-                                                                                                                           KC_SPC,                   KC_BSPC,        //-----------------------//
-                                                                                                               //                          |                         | END                     //
-                                                                                                               //                          |                         |                         //
-                                                                                                               /*                          |                        */         KC_END,         //
-                                                                                                               //                          |                         |                         //
-                                                                                                               //                          |                         |                         //
-                                                                                                                //-------------------------+-------------------------+------------------------//
-
-        // HACKER DVORAK right hand
-
-         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |                         |                         |                         |                         |                         |                         //
-                DM_REC2,                   TD(APMR_PIPE),            TD(RPRN_RBRC),            TD(RCBR_RABK),            TD(HASH_PERC),            TD(ASTR_CIRC),               XXXXXXX,        //
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |                         |                         |                         |                         |                         |                         //
-         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |                         |                         |                         |                         |                         |                         //
-                DM_PLY2,                   LAG_T(KC_F),              LCG_T(KC_G),             C_S_T(KC_C),                LCA_T(KC_R),             LAS_T(KC_L),             TD(SLSH_BSLS),     //
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |                         |                         |                         |                         |                         |                         //
-        /*-----------------------*/        SGUI_T(KC_D),            TD(H_MOU_GUI),            LSFT_T(KC_T),               LCTL_T(KC_N),            LALT_T(KC_S),            TD(MINS_UNDS),     //
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |                         |                         |                         |                         |                         |                         //
-                   KC_LGUI,                LCSG_T(KC_B),            TD(M_CHO_HYP),            TD(W_MED_MEH),            LCAG_T(KC_V),             LASG_T(KC_Z),                COMPOSE,        //
-        //                         |                         |                         |                         |                         |                         |                         //
-        //                         |                         |                         |                         |                         |                         | ⎄                      //
-         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-                                                             //                        |                         |                         |                         |                         //
-                                                            //                         |                         |                         |                         |                         //
-                                                                      KC_LEFT,                   KC_UP,                    KC_DOWN,                 KC_RGHT,                  KC_SYRQ,         //
-                                                            //                         |                         |                         |                         |                         //
-                                                            //                         |                         |                         |                         |                         //
-                                                             //------------------------+-------------------------+-------------------------+-------------------------+------------------------//
-
-        // HACKER DVORAK right thumb
-
-         //------------------------+------------------------//
-        //                         |                         //
-        //                         |                         //
-                   KC_WH_U,                  KC_WH_D,        //
-        //                         |                         //
-        //                         |                         //
-         //------------------------+-------------------------+------------------------//
-        //                         |                         |                         //
-        //                         |                         |                         //
-                   KC_PGUP,        //                        |                         //
-        //                         |                         |                         //
-        //                         |                         |                         //
-         //------------------------|                         |                         //
-        //                         |                         |                         //
-        //                         |                         |                         //
-                  KC_PGDN,                   KC_DEL,                   KC_ENT          //
-        //                         |                         |                         //
-        //                         |                         |                         //
-         //------------------------+-------------------------+------------------------//
-
-    ),
-
-    [PLOVER] = LAYOUT_ergodox(
-        // left hand
-        XXXXXXX,    XXXXXXX,       KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_BTN3, GUI_T(KC_NO),
-        KC_ESC,     KC_MS_BTN4,    KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN5, PV_NUM,
-        KC_TAB,     PV_LS,         PV_LT,      PV_LP,      PV_LH,       PV_STAR,
-        KC_CAPS,    PV_LS,         PV_LK,      PV_LW,      PV_LR,       PV_STAR,    PV_STAR,
-        XXXXXXX, TG(LAYERS), PV_NUM,     PV_NUM,     PV_NUM,
-
-        // left thumb
-              KC_SPACE, KC_BSPC,
-                        KC_HOME,
-        PV_A, PV_O,     KC_END,
-
-        // right hand
-        KC_MS_ACCEL2, KC_MS_ACCEL1,  KC_MS_ACCEL0, KC_UP,   KC_APPLICATION, XXXXXXX,        KC_MS_WH_UP,
-        PV_NUM,       KC_MS_WH_LEFT, KC_LEFT,      KC_DOWN, KC_RIGHT,       KC_MS_WH_RIGHT, KC_MS_WH_DOWN,
-                      PV_STAR,       PV_RF,        PV_RP,   PV_RL,          PV_RT,          PV_RD,
-        PV_STAR,      PV_STAR,       PV_RR,        PV_RB,   PV_RG,          PV_RS,          PV_RZ,
-                                     PV_NUM,       PV_NUM,  PV_NUM,         PV_NUM,         XXXXXXX,
-
-        // right thumb
-        KC_DELETE, KC_ENTER,
-        KC_PGUP,
-        KC_PGDN, PV_E,     PV_U
-    ),
-
-    [GAMING] = LAYOUT_ergodox(
-        // left hand
-        KC_ESCAPE,            GUI_T(KC_MINS), KC_I,     KC_O,   KC_P,   ALGR_T(KC_EQL), KC_T,
-        KC_TAB,               KC_LALT,        KC_Q,     KC_W,   KC_E,   ALL_T(KC_R),    KC_G,
-        LT(MOUSE, KC_GRV), KC_LCTL,        KC_A,     KC_S,   KC_D,   MEH_T(KC_F),
-        KC_BSLS,              KC_LSFT,      KC_Z,     KC_X,   KC_C,   SCMD_T(KC_V),   KC_M,
-        XXXXXXX,           TG(LAYERS),  KC_COMM, KC_DOT, KC_LBRC,
-
-        // left thumb
-                   MO(MEDIA_FN), KC_NUM,
-                                 KC_SCLN,
-         KC_SPACE, KC_ENTER,     KC_BSPC,
-
-        // right hand
-        KC_QUOT,       KC_Y,       KC_K,        KC_U,        KC_KP_7, KC_KP_8,  KC_KP_9,
-        KC_MS_WH_UP,   KC_H,       KC_J,        KC_L,        KC_KP_4, KC_KP_2,  KC_KP_6,
-                       KC_B,       KC_MS_UP,    KC_N,        KC_KP_1, KC_KP_5,  KC_KP_3,
-        KC_MS_WH_DOWN, KC_MS_LEFT, KC_MS_DOWN,  KC_MS_RIGHT, KC_UP,   KC_KP_0,  KC_SLASH,
-                                   KC_RBRC,     KC_LEFT,     KC_DOWN, KC_RIGHT, XXXXXXX,
-
-        // right thumb
-        KC_MS_BTN5, MO(CHORD),
-        KC_MS_BTN4,
-        KC_MS_BTN3, KC_MS_BTN2,   KC_MS_BTN1
-    ),
-
-    [ARROWS] = LAYOUT_ergodox(
-        // left hand
-        XXXXXXX, XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,    XXXXXXX, XXXXXXX,
-        XXXXXXX, SCMD_T(KC_NO), MEH_T(KC_NO), ALL_T(KC_NO), XXXXXXX,    XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_LCTL,       KC_LSFT,      XXXXXXX,      _______,    XXXXXXX,
-        XXXXXXX, KC_RALT,       KC_LALT,      GUI_T(KC_NO), XXXXXXX,    XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,
-
-        // left thumb
-                  XXXXXXX,   XXXXXXX,
-                             KC_HOME,
-        KC_SPACE, KC_BSPC,   KC_END,
-
-        // right hand
-        LGUI(KC_X), XXXXXXX,       LCTL(KC_X), KC_MS_WH_UP,   XXXXXXX,       XXXXXXX,        XXXXXXX,
-        LGUI(KC_C), XXXXXXX,       LCTL(KC_C), KC_UP,         SCTL(KC_C),    LCTL(KC_Z),     LGUI(KC_Z),
-                    KC_MS_WH_LEFT, KC_LEFT,    KC_DOWN,       KC_RIGHT,      KC_MS_WH_RIGHT, KC_APPLICATION,
-        LGUI(KC_V), XXXXXXX,       LCTL(KC_V), KC_MS_WH_DOWN, SCTL(KC_V),    LCTL(KC_Y),     SGUI(KC_Z),
-        XXXXXXX,    XXXXXXX,       XXXXXXX,    XXXXXXX,       KC_SCRL,
-
-        // right thumb
-        XXXXXXX,   XXXXXXX,
-        KC_PGUP,
-        KC_PGDN, KC_DELETE, KC_ENTER
-    ),
-
-    [MOUSE] = LAYOUT_ergodox(
-        // left hand
-        XXXXXXX,       XXXXXXX,       XXXXXXX,    KC_MS_WH_UP,   LCTL(KC_X),  XXXXXXX,        LGUI(KC_X),
-        LGUI(KC_Z),    LCTL(KC_Z),    SCTL(KC_C), KC_MS_UP,      LCTL(KC_C),  KC_MS_BTN4,     LGUI(KC_C),
-        KC_MS_BTN3,    KC_MS_WH_LEFT, KC_MS_LEFT, KC_MS_DOWN,    KC_MS_RIGHT, KC_MS_WH_RIGHT,
-        LGUI(KC_Z),    LCTL(KC_Y),    SCTL(KC_V), KC_MS_WH_DOWN, LCTL(KC_V),  KC_MS_BTN5,     LGUI(KC_V),
-        KC_SCRL,       XXXXXXX,       XXXXXXX,    XXXXXXX,       XXXXXXX,
-
-        // left thumb
-                    XXXXXXX,    XXXXXXX,
-                                XXXXXXX,
-        KC_MS_BTN1, KC_MS_BTN2, XXXXXXX,
-
-        // right hand
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, ALL_T(KC_NO), MEH_T(KC_NO), SCMD_T(KC_NO), XXXXXXX,
-                 XXXXXXX, _______, KC_MS_ACCEL1, KC_LSFT,      KC_LCTL,       KC_MS_ACCEL2,
-        XXXXXXX, XXXXXXX, XXXXXXX, GUI_T(KC_NO), KC_LALT,      KC_RALT,       XXXXXXX,
-                          XXXXXXX, XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,
-
-        // right thumb
-        XXXXXXX, XXXXXXX,
-        XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_MS_ACCEL0
-    ),
-
-    [NUMPAD] = LAYOUT_ergodox(
-        // left hand
-        XXXXXXX, XXXXXXX,  XXXXXXX,      XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX,  GUI_T(KC_NO), XXXXXXX, ALL_T(KC_NO),  XXXXXXX, XXXXXXX,
-        _______, KC_LCTL,  KC_LSFT,      _______, MEH_T(KC_NO),  XXXXXXX,
-        XXXXXXX, KC_RALT,  KC_LALT,      XXXXXXX, SCMD_T(KC_NO), XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX,  XXXXXXX,      XXXXXXX, XXXXXXX,
-
-        // left thumb
-                  XXXXXXX,   XXXXXXX,
-                             KC_HOME,
-        KC_SPACE, KC_BSPC,   KC_END,
-
-        // right hand
-        KC_X, KC_A, KC_B,   KC_C, KC_D,     KC_E,    KC_F,
-        KC_O, KC_I, KC_1,   KC_2, KC_3,     KC_SLSH, KC_PERC,
-              KC_M, KC_4,   KC_5, KC_6,     KC_PLUS, KC_MINS,
-        KC_L, KC_J, KC_7,   KC_8, KC_9,     KC_ASTR, KC_CIRC,
-                    KC_DOT, KC_0, KC_COMM, KC_UNDS,  KC_BSLS,
-
-        // right thumb
-        XXXXXXX,   XXXXXXX,
-        KC_PGUP,
-        KC_PGDN, KC_DELETE, KC_ENTER
-    ),
-
-    [LAYERS] = LAYOUT_ergodox(
-        // left hand
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,
-
-        // left thumb
-                 XXXXXXX, XXXXXXX,
-                          XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,
-
-        // right hand
-        XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
-                 XXXXXXX, TO(DVORAK), TO(PLOVER), TO(GAMING), XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
-                          XXXXXXX,       XXXXXXX,       XXXXXXX,       XXXXXXX, XXXXXXX,
-
-        // right thumb
-        XXXXXXX, XXXXXXX,
-        XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    [MEDIA_FN] = LAYOUT_ergodox(
-        // left hand
-        KC_VOLD,   KC_MUTE, RGB_TOG,    XXXXXXX, KC_MAIL,      KC_FIND, KC_WWW_REFRESH,
-        KC_MPRV, KC_F9,         KC_F7,      KC_F5,   KC_F3,        KC_F1,   KC_WWW_HOME,
-        KC_PAUS,            KC_F19,        KC_F17,     KC_F15,  KC_F13,       KC_F11,
-        RGB_HUD,             XXXXXXX,       XXXXXXX,    _______, KC_F23,       KC_F21,  KC_WWW_BACK,
-        RGB_VAD,             KC_CAPS,       KC_PSCR,    XXXXXXX, MO(FIRMWARE),
-
-        // left thumb
-                 _______, XXXXXXX,
-                          XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_MEDIA_EJECT,
-
-        // right hand
-        KC_WWW_FAVORITES, KC_MYCM, KC_CALC,   XXXXXXX, RGB_MOD,         RGB_M_P,        KC_VOLU,
-        KC_WWW_SEARCH,    KC_F2,          KC_F4,           KC_F6,   KC_F8,           KC_F10,         KC_MNXT,
-                          KC_F12,         KC_F14,          KC_F16,  KC_F18,          KC_F20,         KC_MPLY,
-        KC_WWW_FORWARD,   KC_F22,         KC_F24,          _______, XXXXXXX,         XXXXXXX,        RGB_HUI,
-                                          KC_PWR, XXXXXXX, KC_SLEP, KC_WAKE, RGB_VAI,
-
-        // right thumb
-        XXXXXXX,   XXXXXXX,
-        XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    [CHORD] = LAYOUT_ergodox(
-        // left hand
-        XXXXXXX, HYPR(KC_F1),  HYPR(KC_F2),  HYPR(KC_F3),  HYPR(KC_F4),  HYPR(KC_F5),  XXXXXXX,
-        XXXXXXX, HYPR(KC_F6),  HYPR(KC_F7),  HYPR(KC_F8),  HYPR(KC_F9),  HYPR(KC_F10), XXXXXXX,
-        XXXXXXX, HYPR(KC_F11), HYPR(KC_F12), HYPR(KC_F13), HYPR(KC_F14), HYPR(KC_F15),
-        XXXXXXX, HYPR(KC_F16), HYPR(KC_F17), HYPR(KC_F18), HYPR(KC_F19), HYPR(KC_F20), XXXXXXX,
-        XXXXXXX, HYPR(KC_F21), HYPR(KC_F22), HYPR(KC_F23), HYPR(KC_F24),
-
-        // left thumb
-                 XXXXXXX, XXXXXXX,
-                          XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,
-
-        // right hand
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                 XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-
-        // right thumb
-        XXXXXXX, _______,
-        XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    [FIRMWARE] = LAYOUT_ergodox(
-
-        // left hand
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-
-        // left thumb
-               XXXXXXX, XXXXXXX,
-                        XXXXXXX,
-        QK_BOOT, XXXXXXX, XXXXXXX,
-
-        // right hand
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-
-        // right thumb
-        XXXXXXX, XXXXXXX,
-        XXXXXXX,
-        XXXXXXX, XXXXXXX, EE_CLR
-    )
-};
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/keycodes/aliases_definitions.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/keycodes/aliases_definitions.c
deleted file mode 100644
index 323358357ad..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/keycodes/aliases_definitions.c
+++ /dev/null
@@ -1,13 +0,0 @@
-// Compound keycode aliases
-#define SCTL(kc)   LSFT(LCTL(kc))  // Modifier keys: SHIFT+CTRL+kc combination.
-
-// Tap
-#define LASG_T(kc) MT(MOD_LGUI | MOD_LALT | MOD_LSFT, kc)  // Mod tap: kc when tapped, GUI+ALT+SHIFT when held.
-#define LCSG_T(kc) MT(MOD_LGUI | MOD_LSFT | MOD_LCTL, kc)  // Mod tap: kc when tapped, GUI+CTL+SHIFT when held.
-
-#define LCG_T(kc)  MT(MOD_LCTL | MOD_LGUI, kc)  // Mod tap: kc when tapped, CTL+GUI when held.
-#define LAS_T(kc)  MT(MOD_LALT | MOD_LSFT, kc)  // Mod tap: kc when tapped, ALT+SHIFT when held.
-#define LAG_T(kc)  MT(MOD_LALT | MOD_LGUI, kc)  // Mod tap: kc when tapped, ALT+GUI when held.
-
-// Others
-#define COMPOSE    KC_RALT  // Compose key (used to input characters like á, ñ, ü).
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/keycodes/custom_keycodes.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/keycodes/custom_keycodes.c
deleted file mode 100644
index 338910b53f6..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/keycodes/custom_keycodes.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Define custom user keycodes:
-enum custom_keycodes {
-    PLACEHOLDER = SAFE_RANGE,  // Can always be here.
-    MY_CUSTOM_MACRO,           // Custom macro example.
-    MY_OTHER_MACRO,            // Custom macro example.
-    DYNAMIC_MACRO_RANGE        // Should always be the last.
-};
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/keymap.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/keymap.c
deleted file mode 100644
index e953f06de8c..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include QMK_KEYBOARD_H       // Includes the QMK-verse.
-#include "keymap_plover.h"    // Includes the Plover keymap for easier readability.
-
-
-// TODO: No eeprom changes unless needed, custom rgb settings for animations.
-#include "keycodes/aliases_definitions.c"
-#include "layers/layers_definitions.c"
-#include "tap_dance/tap_dance_setup.c"
-#include "tap_dance/tap_dances.c"
-#include "user/matrix_scan_user.c"
-#include "tap_dance/mod_tap_layer_dances/none_lead.c"
-#include "tap_dance/mod_tap_layer_dances/dot_comm.c"
-#include "tap_dance/mod_tap_layer_dances/quot_dquot.c"
-#include "tap_dance/mod_tap_layer_dances/scln_coln.c"
-#include "tap_dance/mod_tap_layer_dances/u_arrows_gui.c"
-#include "tap_dance/mod_tap_layer_dances/h_mouse_gui.c"
-#include "tap_dance/mod_tap_layer_dances/j_media_meh.c"
-#include "tap_dance/mod_tap_layer_dances/w_media_meh.c"
-#include "tap_dance/mod_tap_layer_dances/k_numpad_hyper.c"
-#include "tap_dance/mod_tap_layer_dances/m_chords_hyper.c"
-#include "tap_dance/tap_dance_actions.c"
-#include "keycodes/custom_keycodes.c"
-#include "dynamic_macro.h"    // Includes dynamic macro definitions, needed *after* the custom keycodes.
-#include "hacker_dvorak.c"
-#include "user/eeconfig_init_user.c"
-#include "user/process_record_user.c"
-#include "plover/plover_mode.c"
-#include "user/layer_set_state_user.c"
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/layers/layers_definitions.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/layers/layers_definitions.c
deleted file mode 100644
index f252bc802b2..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/layers/layers_definitions.c
+++ /dev/null
@@ -1,12 +0,0 @@
-enum layers {        // Hacker Dvorak keyboard layers:
-    DVORAK   = 0,    //   * Dvorak base layer.
-    PLOVER   = 1,    //   * Steno layer for use with Plover.
-    GAMING   = 2,    //   * Gaming layer intended for general purpose playing.
-    ARROWS   = 3,    //   * Arrows movement keys and edition shortcuts.
-    MOUSE    = 4,    //   * Mouse movement keys and edition shortcuts.
-    NUMPAD   = 5,    //   * ATM style numpad with symbols and letters that should suffice to input any numeric literal.
-    LAYERS   = 6,    //   * Layer switcher used to change between DVORAK, PLOVER and GAMING layers.
-    MEDIA_FN = 7,    //   * Media, RGB and function keys from F1 to F24 in symmetric fashion.
-    CHORD    = 8,    //   * Hot keys layer (uses hyper + F1 .. F24) suitable for global shortcut tasks.
-    FIRMWARE = 9     //   * Layer with firmware related functionality, like the reset and EEPROM keys.
-};
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/package.json b/keyboards/ergodox_ez/keymaps/hacker_dvorak/package.json
deleted file mode 100644
index 173bcd5a866..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "hacker_dvorak",
-  "version": "1.0.0",
-  "description": "Inspired by the [*Programmer Dvorak*](https://www.kaufmann.no/roland/dvorak) keyboard layout, cherry picked ideas from other layouts in the [EZ Repository](https://configure.ergodox-ez.com/search?q=dvorak&legacy=true), a character distribution [heatmap vizualizer](https://run.plnkr.co/plunks/5EEO8nJ2wRzYAfT3), my own subjective use cases and lots of trial and error.",
-  "main": "gulpfile.js",
-  "scripts": {
-    "test": "test"
-  },
-  "author": "SalchiPapa",
-  "license": "GPL-2.0",
-  "dependencies": {
-    "gulp": "^4.0.0",
-    "gulp-run-command": "0.0.9"
-  }
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/plover/plover_mode.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/plover/plover_mode.c
deleted file mode 100644
index b388264907a..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/plover/plover_mode.c
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO: improve feedback
-void plover_toggle(void) {
-    // Press "PHROLG"
-    register_code(PV_LP);
-    register_code(PV_LH);
-    register_code(PV_LR);
-    register_code(PV_O);
-    register_code(PV_RL);
-    register_code(PV_RG);
-
-    // Release "PHROLG"
-    unregister_code(PV_LP);
-    unregister_code(PV_LH);
-    unregister_code(PV_LR);
-    unregister_code(PV_O);
-    unregister_code(PV_RL);
-    unregister_code(PV_RG);
-}
-
-bool PLOVER_MODE = false;
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/readme.md b/keyboards/ergodox_ez/keymaps/hacker_dvorak/readme.md
deleted file mode 100644
index 8089a6d55a4..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/readme.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# [Ergodox EZ Hacker Dvorak Layout](https://configure.ergodox-ez.com/layouts/Wadz/latest/0)
-
-Inspired by the [*Programmer Dvorak*](https://www.kaufmann.no/roland/dvorak) keyboard layout, cherry picked ideas from other layouts in the [EZ Repository](https://configure.ergodox-ez.com/search?q=dvorak&legacy=true), a character distribution [heatmap vizualizer](https://run.plnkr.co/plunks/5EEO8nJ2wRzYAfT3), my own subjective use cases and lots of trial and error.
-
-## Setup
-
-Configure your OS keyboard layout to US, or the keymap will be incorrect.
-
-## Limitations
-
-I plan to use [QMK](https://docs.qmk.fm) in the future, in order to overcome some limitations of the Ergodox EZ [graphical configurator](https://configure.ergodox-ez.com/layouts/default/latest/0)), however I will defer that, until more progress is made to the new [configurator](https://medium.com/the-ergo/the-configurator-is-out-of-beta-e107aec80cae).
-
-## Layers
-
-1. Dvorak
-  * US Dvorak layout.
-  * All symbols (including shifted symbols).
-  * All modifier are dual keys positioned near the home row.
-2. Querty
-  * Used to overcome the limitation pointed above, when your OS layout is set to Dvorak instead of US, this way you can use
-    Standard Dvorak (available by default on all the main operating systems) on other normal keybdoards and Hacker Dvorak on
-    the Ergodox EZ Shine at the same time, without changing back and forth tho OS layout.
-3. Gaming
-  * Still in development.
-  * Left side is mainly "normal" Qwerty.
-  * Right side is mainly for movement, either using the mouse, the arrow keys, the number pad or the `H`, `J`, `K`, `L` as       direction keys.
-4. Arrows
-  * Arrow keys navigation.
-  * All modifier keys.
-  * Common text edititng shortcuts (doesn't work for MacOS).
-5. Mouse
-  * Mouse navigation.
-  * All modifier keys.
-  * Common text edititng shortcuts (doesn't work for MacOS).
-6. Numpad
-  * ATM style numpad.
-  * All modifier keys.
-  * Letters from `A` to `F` for hexadecimal numbers (`B` is also used for binary numeric literals in most programming
-    languages, ie. `0b11001`).
-  * `X` for hexadecimal numeric literals in most programming languages, ie. `0xbeef`.
-  * `O` for octal numeric literals in most programming languages, ie `0o123`.
-  * `J` for complex numeric literals in Python, ie. `3j`.
-  * `I` and `M` for complex Julia numeric literals, ie. `3im`.
-  * Common symbols for mathematical operations.
-7. Hyper Fn
-  * Useful for custom global shortcuts.
-8. Media Fn
-  * Media keys.
-  * Function keys.
-  * EZ Shine keys.
-9. Meh Fn
-  * Useful for custom application shortcuts.
-10. Meh Fn +
-  * Useful for custom standard shortcuts.
-
-## To Do
-
-Add images.
-
-***
-
-Please comment below if you have any ideas or suggestions. If you have used this layout or used it as a base, I'd love to hear about your experience!
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/rules.mk b/keyboards/ergodox_ez/keymaps/hacker_dvorak/rules.mk
deleted file mode 100644
index aaf4e53f6eb..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/rules.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Set any rules.mk overrides for your specific keymap here.
-# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
-
-LTO_ENABLE = yes
-NKRO_ENABLE      = yes  # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE  = yes  # Mouse keys(+4700b).
-EXTRAKEY_ENABLE  = yes  # Audio control and System control(+450b).
-RGBLIGHT_ENABLE  = yes
-LEADER_ENABLE    = yes
-
-UNICODE_ENABLE    = no
-COMMAND_ENABLE    = no  # Commands for debug and configuration
-SWAP_HANDS_ENABLE = no  # Allow swapping hands of keyboard.
-
-
-# This are by default off:
-# COMBO_ENABLE      = no
-# UCIS_ENABLE       = no  # For Unicode.
-# UNICODEMAP_ENABLE = no
-# SLEEP_LED_ENABLE  = no  # Turn off leds when computer is sleeping.
-# KEY_LOCK_ENABLE   = no  # (+1730b)
-# CONSOLE_ENABLE    = no  # Console for debug(+400b)
-# MIDI_ENABLE       = no
-# BLUETOOTH_ENABLE  = no
-# AUDIO_ENABLE      = no
-# VARIABLE_TRACE    = no
-# BACKLIGHT_ENABLE  = no
-# RGB_MATRIX_ENABLE = no
-
-# POINTING_DEVICE_ENABLE = no
-
-# AUTO_SHIFT_ENABLE    = no
-
-# This don't need argument?
-# CUSTOM_MATRIX    # Custom matrix file for the ErgoDox EZ
-# SPLIT_KEYBOARD
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/dot_comm.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/dot_comm.c
deleted file mode 100644
index e96c7c275e2..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/dot_comm.c
+++ /dev/null
@@ -1,41 +0,0 @@
-//instanalize an instance of 'tap' for the Dot - Comma tap dance.
-static tap dot_comm_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void dot_comm_finished(tap_dance_state_t *state, void *user_data) {
-    dot_comm_state.state = current_dance(state);
-    switch (dot_comm_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_DOT);
-            break;
-
-        case SINGLE_HOLD:
-            register_code(KC_LCTL);
-            register_code(KC_LSFT);
-            break;
-
-        case DOUBLE_TAP:
-            register_code(KC_COMM);
-            break;
-    }
-}
-
-void dot_comm_reset(tap_dance_state_t *state, void *user_data) {
-    switch (dot_comm_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_DOT);
-            break;
-
-        case SINGLE_HOLD:
-            unregister_code(KC_LCTL);
-            unregister_code(KC_LSFT);
-            break;
-
-        case DOUBLE_TAP:
-            unregister_code(KC_COMM);
-            break;
-    }
-    dot_comm_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/h_mouse_gui.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/h_mouse_gui.c
deleted file mode 100644
index 0589128a580..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/h_mouse_gui.c
+++ /dev/null
@@ -1,39 +0,0 @@
-//instanalize an instance of 'tap' for the H - Mouse - Gui tap dance.
-static tap h_mouse_gui_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void h_mouse_gui_finished(tap_dance_state_t *state, void *user_data) {
-    h_mouse_gui_state.state = current_dance(state);
-    switch (h_mouse_gui_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_H);
-            break;
-
-        case SINGLE_HOLD:
-            layer_on(MOUSE);
-            break;
-
-        case DOUBLE_HOLD:
-            register_code(KC_LGUI);
-            break;
-    }
-}
-
-void h_mouse_gui_reset(tap_dance_state_t *state, void *user_data) {
-    switch (h_mouse_gui_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_H);
-            break;
-
-        case SINGLE_HOLD:
-            layer_off(MOUSE);
-            break;
-
-        case DOUBLE_HOLD:
-            unregister_code(KC_LGUI);
-            break;
-    }
-    h_mouse_gui_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/j_media_meh.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/j_media_meh.c
deleted file mode 100644
index a1400236dce..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/j_media_meh.c
+++ /dev/null
@@ -1,43 +0,0 @@
-//instanalize an instance of 'tap' for the J - Media - Meh tap dance.
-static tap j_media_meh_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void j_media_meh_finished(tap_dance_state_t *state, void *user_data) {
-    j_media_meh_state.state = current_dance(state);
-    switch (j_media_meh_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_J);
-            break;
-
-        case SINGLE_HOLD:
-            layer_on(MEDIA_FN);
-            break;
-
-        case DOUBLE_HOLD:
-            register_code(KC_LCTL);
-            register_code(KC_LSFT);
-            register_code(KC_LALT);
-            break;
-    }
-}
-
-void j_media_meh_reset(tap_dance_state_t *state, void *user_data) {
-    switch (j_media_meh_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_J);
-            break;
-
-        case SINGLE_HOLD:
-            layer_off(MEDIA_FN);
-            break;
-
-        case DOUBLE_HOLD:
-            unregister_code(KC_LCTL);
-            unregister_code(KC_LSFT);
-            unregister_code(KC_LALT);
-            break;
-    }
-    j_media_meh_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/k_numpad_hyper.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/k_numpad_hyper.c
deleted file mode 100644
index c405e650911..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/k_numpad_hyper.c
+++ /dev/null
@@ -1,45 +0,0 @@
-//instanalize an instance of 'tap' for the K - Numpad - Hyper tap dance.
-static tap k_numpad_hyper_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void k_numpad_hyper_finished(tap_dance_state_t *state, void *user_data) {
-    k_numpad_hyper_state.state = current_dance(state);
-    switch (k_numpad_hyper_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_K);
-            break;
-
-        case SINGLE_HOLD:
-            layer_on(NUMPAD);
-            break;
-
-        case DOUBLE_HOLD:
-            register_code(KC_LCTL);
-            register_code(KC_LSFT);
-            register_code(KC_LALT);
-            register_code(KC_LGUI);
-            break;
-    }
-}
-
-void k_numpad_hyper_reset(tap_dance_state_t *state, void *user_data) {
-    switch (k_numpad_hyper_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_K);
-            break;
-
-        case SINGLE_HOLD:
-            layer_off(NUMPAD);
-            break;
-
-        case DOUBLE_HOLD:
-            unregister_code(KC_LCTL);
-            unregister_code(KC_LSFT);
-            unregister_code(KC_LALT);
-            unregister_code(KC_LGUI);
-            break;
-    }
-    k_numpad_hyper_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/m_chords_hyper.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/m_chords_hyper.c
deleted file mode 100644
index 736074e7512..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/m_chords_hyper.c
+++ /dev/null
@@ -1,45 +0,0 @@
-//instanalize an instance of 'tap' for the M - Chords - Hyper tap dance.
-static tap m_chords_hyper_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void m_chords_hyper_finished(tap_dance_state_t *state, void *user_data) {
-    m_chords_hyper_state.state = current_dance(state);
-    switch (m_chords_hyper_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_M);
-            break;
-
-        case SINGLE_HOLD:
-            layer_on(CHORD);
-            break;
-
-        case DOUBLE_HOLD:
-            register_code(KC_LCTL);
-            register_code(KC_LSFT);
-            register_code(KC_LALT);
-            register_code(KC_LGUI);
-            break;
-    }
-}
-
-void m_chords_hyper_reset(tap_dance_state_t *state, void *user_data) {
-    switch (m_chords_hyper_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_M);
-            break;
-
-        case SINGLE_HOLD:
-            layer_off(CHORD);
-            break;
-
-        case DOUBLE_HOLD:
-            unregister_code(KC_LCTL);
-            unregister_code(KC_LSFT);
-            unregister_code(KC_LALT);
-            unregister_code(KC_LGUI);
-            break;
-    }
-    m_chords_hyper_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/none_lead.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/none_lead.c
deleted file mode 100644
index a553f874cc1..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/none_lead.c
+++ /dev/null
@@ -1,40 +0,0 @@
-//instanalize an instance of 'tap' for the None - Lead tap dance.
-static tap none_lead_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void none_lead_finished(tap_dance_state_t *state, void *user_data) {
-    none_lead_state.state = current_dance(state);
-    switch (none_lead_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_NO);
-            break;
-
-        case SINGLE_HOLD:
-            register_code(KC_LALT);
-            register_code(KC_LSFT);
-            break;
-
-        case DOUBLE_TAP:
-            leader_start();
-            break;
-    }
-}
-
-void none_lead_reset(tap_dance_state_t *state, void *user_data) {
-    switch (none_lead_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_NO);
-            break;
-
-        case SINGLE_HOLD:
-            unregister_code(KC_LALT);
-            unregister_code(KC_LSFT);
-            break;
-
-        case DOUBLE_TAP:
-            break;
-    }
-    none_lead_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/quot_dquot.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/quot_dquot.c
deleted file mode 100644
index 8b1af61cacc..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/quot_dquot.c
+++ /dev/null
@@ -1,41 +0,0 @@
-//instanalize an instance of 'tap' for the Quote - Double Quote tap dance.
-static tap quot_dquot_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void quot_dquot_finished(tap_dance_state_t *state, void *user_data) {
-    quot_dquot_state.state = current_dance(state);
-    switch (quot_dquot_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_QUOT);
-            break;
-
-        case SINGLE_HOLD:
-            register_code(KC_LCTL);
-            register_code(KC_LALT);
-            break;
-
-        case DOUBLE_TAP:
-            register_code16(KC_DQUO);
-            break;
-    }
-}
-
-void quot_dquot_reset(tap_dance_state_t *state, void *user_data) {
-    switch (quot_dquot_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_QUOT);
-            break;
-
-        case SINGLE_HOLD:
-            unregister_code(KC_LCTL);
-            unregister_code(KC_LALT);
-            break;
-
-        case DOUBLE_TAP:
-            unregister_code16(KC_DQUO);
-            break;
-    }
-    quot_dquot_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/scln_coln.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/scln_coln.c
deleted file mode 100644
index 8cc3b6dfe17..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/scln_coln.c
+++ /dev/null
@@ -1,43 +0,0 @@
-//instanalize an instance of 'tap' for the Semicolon - Colon tap dance.
-static tap scln_coln_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void scln_coln_finished(tap_dance_state_t *state, void *user_data) {
-    scln_coln_state.state = current_dance(state);
-    switch (scln_coln_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_SCLN);
-            break;
-
-        case SINGLE_HOLD:
-            register_code(KC_LALT);
-            register_code(KC_LSFT);
-            register_code(KC_LGUI);
-            break;
-
-        case DOUBLE_TAP:
-            register_code16(KC_COLN);
-            break;
-    }
-}
-
-void scln_coln_reset(tap_dance_state_t *state, void *user_data) {
-    switch (scln_coln_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_SCLN);
-            break;
-
-        case SINGLE_HOLD:
-            unregister_code(KC_LALT);
-            unregister_code(KC_LSFT);
-            unregister_code(KC_LGUI);
-            break;
-
-        case DOUBLE_TAP:
-            unregister_code16(KC_COLN);
-            break;
-    }
-    scln_coln_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/u_arrows_gui.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/u_arrows_gui.c
deleted file mode 100644
index b9a213ef083..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/u_arrows_gui.c
+++ /dev/null
@@ -1,39 +0,0 @@
-//instanalize an instance of 'tap' for the U - Arrows - Gui tap dance.
-static tap u_arrows_gui_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void u_arrows_gui_finished(tap_dance_state_t *state, void *user_data) {
-    u_arrows_gui_state.state = current_dance(state);
-    switch (u_arrows_gui_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_U);
-            break;
-
-        case SINGLE_HOLD:
-            layer_on(ARROWS);
-            break;
-
-        case DOUBLE_HOLD:
-            register_code(KC_LGUI);
-            break;
-    }
-}
-
-void u_arrows_gui_reset(tap_dance_state_t *state, void *user_data) {
-    switch (u_arrows_gui_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_U);
-            break;
-
-        case SINGLE_HOLD:
-            layer_off(ARROWS);
-            break;
-
-        case DOUBLE_HOLD:
-            unregister_code(KC_LGUI);
-            break;
-    }
-    u_arrows_gui_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/w_media_meh.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/w_media_meh.c
deleted file mode 100644
index 5f2bb2a69a4..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/w_media_meh.c
+++ /dev/null
@@ -1,43 +0,0 @@
-//instanalize an instance of 'tap' for the W - Media - Meh tap dance.
-static tap w_media_meh_state = {
-    .is_press_action = true,
-    .state           = 0
-};
-
-void w_media_meh_finished(tap_dance_state_t *state, void *user_data) {
-    w_media_meh_state.state = current_dance(state);
-    switch (w_media_meh_state.state) {
-        case SINGLE_TAP:
-            register_code(KC_W);
-            break;
-
-        case SINGLE_HOLD:
-            layer_on(MEDIA_FN);
-            break;
-
-        case DOUBLE_HOLD:
-            register_code(KC_LCTL);
-            register_code(KC_LSFT);
-            register_code(KC_LALT);
-            break;
-    }
-}
-
-void w_media_meh_reset(tap_dance_state_t *state, void *user_data) {
-    switch (w_media_meh_state.state) {
-        case SINGLE_TAP:
-            unregister_code(KC_W);
-            break;
-
-        case SINGLE_HOLD:
-            layer_off(MEDIA_FN);
-            break;
-
-        case DOUBLE_HOLD:
-            unregister_code(KC_LCTL);
-            unregister_code(KC_LSFT);
-            unregister_code(KC_LALT);
-            break;
-    }
-    w_media_meh_state.state = 0;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c
deleted file mode 100644
index fe13023d45c..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c
+++ /dev/null
@@ -1,44 +0,0 @@
-// Register the double tap dances:
-tap_dance_action_t tap_dance_actions[] = {
-    [EQL_PLUS]  = ACTION_TAP_DANCE_DOUBLE(KC_EQL,  KC_PLUS),
-    [MINS_UNDS] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),
-    [SLSH_BSLS] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS),
-    [GRV_TILD]  = ACTION_TAP_DANCE_DOUBLE(KC_GRV,  KC_TILD),
-    [ASTR_CIRC] = ACTION_TAP_DANCE_DOUBLE(KC_ASTR, KC_CIRC),
-    [APMR_PIPE] = ACTION_TAP_DANCE_DOUBLE(KC_AMPR, KC_PIPE),
-    [EXLM_QUES] = ACTION_TAP_DANCE_DOUBLE(KC_EXLM, KC_QUES),
-    [HASH_PERC] = ACTION_TAP_DANCE_DOUBLE(KC_HASH, KC_PERC),
-    [AT_DLR]    = ACTION_TAP_DANCE_DOUBLE(KC_AT,   KC_DLR),
-    [LPRN_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_LBRC),
-    [RPRN_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_RPRN, KC_RBRC),
-    [LCBR_LABK] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_LABK),
-    [RCBR_RABK] = ACTION_TAP_DANCE_DOUBLE(KC_RCBR, KC_RABK),
-    [SCLN_COLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, scln_coln_finished,       scln_coln_reset),
-    [QUOT_DQUO] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, quot_dquot_finished,      quot_dquot_reset),
-    [DOT_COMM]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dot_comm_finished,        dot_comm_reset),
-    [NONE_LEAD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, none_lead_finished,       none_lead_reset),
-    [U_ARR_GUI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, u_arrows_gui_finished,    u_arrows_gui_reset),
-    [H_MOU_GUI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, h_mouse_gui_finished,     h_mouse_gui_reset),
-    [J_MED_MEH] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, j_media_meh_finished,     j_media_meh_reset),
-    [W_MED_MEH] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, w_media_meh_finished,     w_media_meh_reset),
-    [K_NUM_HYP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, k_numpad_hyper_finished,  k_numpad_hyper_reset),
-    [M_CHO_HYP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, m_chords_hyper_finished,  m_chords_hyper_reset),
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(SCLN_COLN):
-        case TD(QUOT_DQUO):
-        case TD(DOT_COMM):
-        case TD(NONE_LEAD):
-        case TD(U_ARR_GUI):
-        case TD(H_MOU_GUI):
-        case TD(J_MED_MEH):
-        case TD(W_MED_MEH):
-        case TD(K_NUM_HYP):
-        case TD(M_CHO_HYP):
-            return DANCING_TERM;
-        default:
-            return TAPPING_TERM;
-    }
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_setup.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_setup.c
deleted file mode 100644
index d7331232307..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_setup.c
+++ /dev/null
@@ -1,75 +0,0 @@
-typedef struct {
-    bool is_press_action;
-    int state;
-} tap;
-
-enum {
-    SINGLE_TAP        = 1,
-    SINGLE_HOLD       = 2,
-    DOUBLE_TAP        = 3,
-    DOUBLE_HOLD       = 4,
-    DOUBLE_SINGLE_TAP = 5,  // Send two single taps.
-    TRIPLE_TAP        = 6,
-    TRIPLE_HOLD       = 7,
-    TRIPLE_SINGLE_TAP = 8   // Send three single taps.
-};
-
-/* Return an integer that corresponds to what kind of tap dance should be executed.
- *
- * 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
- *  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
- *  has ended, but the key is still being pressed down. This generally means the key is being "held".
- *
- * One thing that is currenlty not possible with qmk software in regards to tap dance is to mimic the "permissive hold"
- *  feature. In general, advanced tap dances do not work well if they are used with commonly typed letters.
- *  For example "A". Tap dances are best used on non-letter keys that are not hit while typing letters.
- *
- * Good places to put an advanced tap dance:
- *  z,q,x,j,k,v,b, any function key, home/end, comma, semi-colon
- *
- * Criteria for "good placement" of a tap dance key:
- *  Not a key that is hit frequently in a sentence
- *  Not a key that is used frequently to double tap, for example 'tab' is often double tapped in a terminal, or
- *    in a web form. So 'tab' would be a poor choice for a tap dance.
- *  Letters used in common words as a double. For example 'p' in 'pepper'. If a tap dance function existed on the
- *    letter 'p', the word 'pepper' would be quite frustating to type.
- *
- * For the third point, there does exist the 'DOUBLE_SINGLE_TAP', however this is not fully tested
- *
- */
-int current_dance(tap_dance_state_t *state) {
-    int current_state = 0;
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) {
-            current_state = SINGLE_TAP;
-        } else {
-            current_state = SINGLE_HOLD; //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'.
-        }
-    } else if (state->count == 2) {
-        /*
-         * DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
-         * action when hitting 'pp'. Suggested use case for this return value is when you want to send two
-         * keystrokes of the key, and not the 'double tap' action/macro.
-        */
-        if (state->interrupted) {
-            current_state = DOUBLE_SINGLE_TAP;
-        } else if (state->pressed) {
-            current_state = DOUBLE_HOLD;
-        } else {
-            current_state = DOUBLE_TAP;
-        }
-    } else if (state->count == 3) {
-        if (state->interrupted) {
-            current_state = TRIPLE_SINGLE_TAP;
-        } else if (state->pressed) {
-            current_state = TRIPLE_HOLD;
-        } else {
-            current_state = TRIPLE_TAP;
-        }
-    }
-    return current_state;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dances.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dances.c
deleted file mode 100644
index d05a71d7e59..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dances.c
+++ /dev/null
@@ -1,98 +0,0 @@
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-                       //  Single tap  |  Single hold  |  Double tap  |  Double hold  |  Triple tap  |  Triple hold  //
-// Mod tap dances:     //              |               |              |               |              |               //
-enum tap_dances {      //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    EQL_PLUS  = 0,     //       =      |               |       +      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    MINS_UNDS = 1,     //       -      |               |       _      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    SLSH_BSLS = 2,     //       /      |               |       \      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    GRV_TILD  = 3,     //       `      |               |       ~      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    QUOT_DQUO = 4,     //       '      |   CTRL+ALT    |      "       |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    SCLN_COLN = 5,     //       ;      |ALT+SHIFT+META |      :       |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    ASTR_CIRC = 6,     //       *      |               |       ^      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    APMR_PIPE = 7,     //       &      |               |       |      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    EXLM_QUES = 8,     //       !      |               |       ?      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    HASH_PERC = 9,     //       #      |               |       %      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    AT_DLR    = 10,    //       @      |               |       $      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    LPRN_LBRC = 11,    //       (      |               |       [      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    RPRN_RBRC = 12,    //       )      |               |       ]      |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    LCBR_LABK = 13,    //       {      |               |      <       |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    RCBR_RABK = 14,    //       }      |               |      >       |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    DOT_COMM  = 15,    //       .      |  CTRL+SHIFT   |      ,       |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    NONE_LEAD = 16,    //     NONE     |   ALT+SHIFT   |     LEAD     |               |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    U_ARR_GUI = 17,    //       U      |     ARROWS    |              |      GUI      |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    H_MOU_GUI = 18,    //       H      |     MOUSE     |              |      GUI      |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    J_MED_MEH = 19,    //       J      |   MEDIA_FN    |              |      MEH      |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    W_MED_MEH = 20,    //       W      |   MEDIA_FN    |              |      MEH      |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    K_NUM_HYP = 21,    //       K      |    NUMPAD     |              |    HYPER      |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-                       //              |               |              |               |              |               //
-    M_CHO_HYP = 22,    //       M      |     CHORD     |              |    HYPER      |              |               //
-                       //              |               |              |               |              |               //
-                       //--------------------------------------------------------------------------------------------//
-};
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/eeconfig_init_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/eeconfig_init_user.c
deleted file mode 100644
index 41b7b669413..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/eeconfig_init_user.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// void eeconfig_init_user(void) {
-//
-// };
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c
deleted file mode 100644
index 5ce5f5298f6..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c
+++ /dev/null
@@ -1,121 +0,0 @@
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    uint8_t layer = get_highest_layer(state);
-
-    switch (layer) {
-        case DVORAK:
-            rgblight_sethsv_noeeprom(HSV_GREEN);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-
-            if (PLOVER_MODE) {
-                plover_toggle();
-                PLOVER_MODE = false;
-            }
-
-            break;
-
-        case PLOVER:
-            rgblight_sethsv_noeeprom(HSV_RED);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
-
-            if (!(PLOVER_MODE)) {
-                plover_toggle();
-                PLOVER_MODE = true;
-            }
-
-            break;
-
-        case GAMING:
-            rgblight_sethsv_noeeprom(HSV_RED);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
-
-            if (PLOVER_MODE) {
-                plover_toggle();
-                PLOVER_MODE = false;
-            }
-
-            break;
-
-        case ARROWS:
-            rgblight_sethsv_noeeprom(HSV_BLUE);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
-
-            if (PLOVER_MODE) {
-                plover_toggle();
-                PLOVER_MODE = false;
-            }
-
-            break;
-
-        case MOUSE:
-            rgblight_sethsv_noeeprom(HSV_BLUE);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
-
-            if (PLOVER_MODE) {
-                plover_toggle();
-                PLOVER_MODE = false;
-            }
-
-            break;
-
-        case NUMPAD:
-            rgblight_sethsv_noeeprom(HSV_BLUE);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
-
-            if (PLOVER_MODE) {
-                plover_toggle();
-                PLOVER_MODE = false;
-            }
-
-            break;
-
-        case LAYERS:
-            rgblight_sethsv_noeeprom(HSV_CYAN);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
-
-            if (PLOVER_MODE) {
-                plover_toggle();
-                PLOVER_MODE = false;
-            }
-
-            break;
-
-        case MEDIA_FN:
-            rgblight_sethsv_noeeprom(HSV_YELLOW);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
-
-            if (PLOVER_MODE) {
-                plover_toggle();
-                PLOVER_MODE = false;
-            }
-
-            break;
-
-        case CHORD:
-            rgblight_sethsv_noeeprom(HSV_MAGENTA);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
-
-            if (PLOVER_MODE) {
-                plover_toggle();
-                PLOVER_MODE = false;
-            }
-
-            break;
-
-        case FIRMWARE:
-            rgblight_sethsv_noeeprom(HSV_MAGENTA);
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
-
-            if (PLOVER_MODE) {
-                plover_toggle();
-                PLOVER_MODE = false;
-            }
-
-            break;
-
-        default:
-            break;
-    }
-
-    return state;
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c
deleted file mode 100644
index fc6c99cb85f..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c
+++ /dev/null
@@ -1,20 +0,0 @@
-bool MATRIX_SCANNED = false;
-
-void matrix_scan_user(void) {
-    if (!(MATRIX_SCANNED)) {
-        rgblight_sethsv_noeeprom(HSV_GREEN);
-        MATRIX_SCANNED = true;
-    }
-};
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(TD(APMR_PIPE))) {
-        register_code(KC_LCTL);
-        register_code(KC_LSFT);
-        register_code(KC_U);
-
-        unregister_code(KC_U);
-        unregister_code(KC_LSFT);
-        unregister_code(KC_LCTL);
-    }
-}
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
deleted file mode 100644
index 967d554081c..00000000000
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/process_record_user.c
+++ /dev/null
@@ -1,75 +0,0 @@
-// TODO: Improve this currently there is no feedback if activated by other means.
-bool CAPS_LOCK   = false;
-bool NUM_LOCK    = false;
-bool SCROLL_LOCK = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-
-    switch (keycode) {
-        case KC_CAPS_LOCK:
-            if (record->event.pressed) {
-                if (!(CAPS_LOCK)) {
-                    ergodox_right_led_1_on();
-                    CAPS_LOCK = true;
-                } else {
-                    ergodox_right_led_1_off();
-                    CAPS_LOCK = false;
-                }
-            }
-
-            return true;
-
-        case KC_NUM_LOCK:
-            if (record->event.pressed) {
-                if (!(NUM_LOCK)) {
-                    ergodox_right_led_2_on();
-                    NUM_LOCK = true;
-                } else {
-                    ergodox_right_led_2_off();
-                    NUM_LOCK = false;
-                }
-            }
-
-            return true;
-
-        case KC_SCROLL_LOCK:
-            if (record->event.pressed) {
-                if (!(SCROLL_LOCK)) {
-                    ergodox_right_led_3_on();
-                    SCROLL_LOCK = true;
-                } else {
-                    ergodox_right_led_3_off();
-                    SCROLL_LOCK = false;
-                }
-            }
-
-            return true;
-
-        case KC_MS_WH_UP ... KC_MS_WH_RIGHT:
-            if (record->event.pressed) {
-                if (SCROLL_LOCK) {
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-
-        case MY_CUSTOM_MACRO:
-            if (record->event.pressed) {
-                SEND_STRING("QMK is the best thing ever!"); // this is our macro!
-                return false;
-            }
-
-        case MY_OTHER_MACRO:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCTL("ac")); // selects all and copies
-                return false;
-            }
-
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/config.h b/keyboards/ergodox_ez/keymaps/ifohancroft/config.h
deleted file mode 100644
index b279371a0b4..00000000000
--- a/keyboards/ergodox_ez/keymaps/ifohancroft/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 IFo Hancroft
- *
- * 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
-
-// place overrides here
-#define FORCE_NKRO
-#ifdef TAPPING_TOGGLE
-#    undef TAPPING_TOGGLE
-#endif
-#define TAPPING_TOGGLE 3
-
diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c b/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c
deleted file mode 100644
index 58c3beaeaa6..00000000000
--- a/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Copyright 2022 IFo Hancroft
- *
- * 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] = {
-
-    /* Default Layer
-    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
-    * | `       | 1       | 2       | 3       | 4       | 5       | -       |                             | =       | 6       | 7       | 8       | 9       | 0       | Del     |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * | Tab     | Q       | W       | E       | R       | T       | [       |                             | ]       | Y       | U       | I       | O       | P       | \       |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * | Esc     | A       | S       | D       | F       | G       |         |                             |         | H       | J       | K       | L       | ;       | '       |
-    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
-    * | Shift   | Z       | X       | C       | V       | B       |                                                 | N       | M       | ,       | .       | /       | Shift   |
-    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
-    * | Ctrl    | Super   | Alt     |         | OSL(1)  |                                                                     | TT(1)   |         | Alt     | Super   | Ctrl    |
-    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
-    *
-    *                                                             *-------------------*         *-------------------*
-    *                                                             |         |         |         |         |         |
-    *                                                   *---------+---------+---------|         |---------+---------+---------*
-    *                                                   |         |         |         |         |         |         |         |
-    *                                                   | Bckspc  | Enter   |---------|         |---------| Enter   | Space   |
-    *                                                   |         |         | SH_OS   |         |         |         |         |
-    *                                                   *---------+---------+---------*         *---------+---------+---------*
-    */
-
-    LAYOUT_ergodox_pretty(
-        KC_GRV,   KC_1,     KC_2,     KC_3,    KC_4,      KC_5,     KC_MINS,                                KC_EQL,   KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,    KC_R,      KC_T,     KC_LBRC,                                KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
-        KC_ESC,   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_NO,                                  KC_NO,    KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
-        KC_LCTL,  KC_LGUI,  KC_LALT,  KC_NO,   OSL(1),                                                                          TT(1),    KC_NO,    KC_RALT,  KC_RGUI,  KC_RCTL,
-
-                                                                    KC_NO,    KC_NO,              KC_NO,    KC_NO,
-                                                                              KC_NO,              KC_NO,
-                                                          KC_BSPC,  KC_ENT,   SH_OS,              KC_NO,    KC_ENT,   KC_SPC
-    ),
-
-    /* Function Keys Layer
-    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
-    * | NumLock | F1      | F2      | F3      | F4      | F5      | F11     |                             | F12     | F6      | F7      | F8      | F9      | F10     |         |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * |         | +       | 7       | 8       | 9       | *       |         |                             |         |         |         |         |         |         |         |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * |         | -       | 4       | 5       | 6       | /       |         |                             |         | Left    | Down    | Up      | Right   |         |         |
-    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
-    * |         | 0       | 1       | 2       | 3       | .       |                                                 | NK_TOGG |         |         |         |         |         |
-    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
-    * |         |         |         |         |         |                                                                     |         | Left    | Down    | Up      | Right   |
-    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
-    *
-    *                                                             *-------------------*         *-------------------*
-    *                                                             |         |         |         |         |         |
-    *                                                   *---------+---------+---------|         |---------+---------+---------*
-    *                                                   |         |         |         |         |         |         |         |
-    *                                                   |         | Enter   |---------|         |---------|         |         |
-    *                                                   |         |         | PgUp    |         | PgDn    |         |         |
-    *                                                   *---------+---------+---------*         *---------+---------+---------*
-    */
-
-    LAYOUT_ergodox_pretty(
-        KC_NUM,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,                                 KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
-        _______,  KC_PPLS,  KC_P7,    KC_P8,    KC_P9,    KC_PAST,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  KC_PMNS,  KC_P4,    KC_P5,    KC_P6,    KC_PSLS,                                                    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,
-        _______,  KC_P0,    KC_P1,    KC_P2,    KC_P3,    KC_PDOT,  _______,                                _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,                                                                        _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,
-
-                                                                    _______,  _______,            _______,  _______,
-                                                                              _______,            _______,
-                                                          _______,  KC_PENT,  KC_PGUP,            KC_PGDN,  _______,  _______
-    ),
-
-    /* Empty Layer */
-    LAYOUT_ergodox_pretty(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
-
-                                                                    _______,  _______,            _______,  _______,
-                                                                              _______,            _______,
-                                                          _______,  _______,  _______,            _______,  _______,  _______
-    ),
-
-    /* Empty Layer */
-    LAYOUT_ergodox_pretty(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
-
-                                                                    _______,  _______,            _______,  _______,
-                                                                              _______,            _______,
-                                                          _______,  _______,  _______,            _______,  _______,  _______
-    )
-};
-
-    /* Swap Hands
-    * *-------------------------------------------------*
-    * | Del     | \       | '       |         |         |
-    * |---------+---------+---------+---------+---------+---------*
-    * | 6       | Y       | H       | N       |         |         |
-    * |---------+---------+---------+---------+---------+---------|
-    * | 7       | U       | J       | M       |         |         |
-    * |---------+---------+---------+---------+---------+---------|
-    * | 8       | I       | K       | ,       |         | Space   |
-    * |---------+---------+---------+---------+---------+---------|
-    * | 9       | O       | L       | .       |         |         |
-    * |---------+---------+---------+---------+---------+---------|
-    * | 0       | P       | ;       | /       |         |         |
-    * |---------+---------+---------+---------|         |---------|
-    * | =       | ]       |         |         |         |         |
-    * *---------------------------------------*         *---------*
-    */
-
-const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
-      {{0, 13},  {1, 13},  {2, 13},  {3,  0},  {4,  0}},
-      {{0,  8},  {1,  8},  {2,  8},  {3,  8},  {4,  1},  {5,  1}},
-      {{0,  9},  {1,  9},  {2,  9},  {3,  9},  {4,  2},  {5,  2}},
-      {{0, 10},  {1, 10},  {2, 10},  {3, 10},  {4,  3},  {5, 10}},
-      {{0, 11},  {1, 11},  {2, 11},  {3, 11},  {4,  4},  {5,  9}},
-      {{0, 12},  {1, 12},  {2, 12},  {3, 12},  {0,  0},  {5,  8}},
-      {{0,  7},  {1,  7},  {0,  0},  {3,  7},  {0,  0},  {5,  7}},
-
-      {{0,  7},  {1,  7},  {0,  0},  {3,  7},  {0,  0},  {5,  7}},
-      {{0,  8},  {1,  8},  {2,  8},  {3,  8},  {0,  0},  {5,  8}},
-      {{0,  9},  {1,  9},  {2,  9},  {3,  9},  {4,  9},  {5,  9}},
-      {{0, 10},  {1, 10},  {2, 10},  {3, 10},  {4, 10},  {5, 10}},
-      {{0, 11},  {1, 11},  {2, 11},  {3, 11},  {4, 11},  {5, 11}},
-      {{0, 12},  {1, 12},  {2, 12},  {3, 12},  {4, 12},  {5, 12}},
-      {{0, 13},  {1, 13},  {2, 13},  {3, 13},  {4, 13}}
-};
-
diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md b/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md
deleted file mode 100644
index 7a94a05eae8..00000000000
--- a/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-![IFo Hancroft ErgoDox EZ Layout Image](https://i.imgur.com/bSWyBCV.png)
-
-# IFo Hancroft's ErgoDox EZ Layout
-
-- Layer 0: A QWERTY Layer.
-- Layer 1: A Function Layer.
-- Layer 2: Empty Layer.
-- Layer 3: Empty Layer.
-
-This keymap also does the following:
-
-- Forces NKRO on
-- Enables:
-    - Via
-    - The Swap Hands feature
-- Disables:
-    - Mouse Key
-    - Extra Key
diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk b/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk
deleted file mode 100644
index 3b18c2b9d28..00000000000
--- a/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
-SWAP_HANDS_ENABLE = yes
-VIA_ENABLE = yes
diff --git a/keyboards/ergodox_ez/keymaps/kou/keymap.c b/keyboards/ergodox_ez/keymaps/kou/keymap.c
deleted file mode 100644
index b938b5f1683..00000000000
--- a/keyboards/ergodox_ez/keymaps/kou/keymap.c
+++ /dev/null
@@ -1,312 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define NPAD 2 // number pad
-#define MDIA 3 // media keys
-#define OTHR 4 // other keys
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |  1!  |  2@  |  3#  |  4$  |  5%  |  `~  |           |  \|  |   6  |   7  |   8  |   9  |   0  | BkSp   |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  | Del  |           |  =+  |   Y  |   U  |   I  |   O  |   P  |   '"   |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | LCtrl  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | RCtrl  |
- * |--------+------+------+------+------+------| Esc  |           |  -_  |------+------+------+------+------+--------|
- * | LShift | Z/L2 |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  | //L3 | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | ~L1  | LAlt | LGui | ~L1  | Space|                                       | Left | Right| LGui | LAlt | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | (*1) | (*2) |       | L2   | L1   |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | L3   |       | (*3) |        |      |
- *                                 | Enter| Esc  |------|       |------| Up     | Down |
- *                                 | /LSft| /LCtr| L4   |       | (*4) |        |      |
- *                                 `--------------------'       `----------------------'
- * (*1) -> Ctrl + Alt + U            (Webstorm: Toggle Camel Case)
- * (*2) -> Ctrl + Shift + Alt + P    (Webstorm: Pritter Format)
- * (*3) -> Ctrl + Shift + Alt + Up   (Webstorm: Move Previous Change)
- * (*4) -> Ctrl + Shift + Alt + Down (Webstorm: Move Next Change)
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,   KC_1,           KC_2,    KC_3,     KC_4,   KC_5,   KC_GRV,
-        KC_TAB,   KC_Q,           KC_W,    KC_E,     KC_R,   KC_T,   KC_DEL,
-        KC_LCTL,  KC_A,           KC_S,    KC_D,     KC_F,   KC_G,
-        KC_LSFT,  LT(NPAD, KC_Z), KC_X,    KC_C,     KC_V,   KC_B,   KC_ESC,
-        MO(SYMB), KC_LALT,        KC_LGUI, MO(SYMB), KC_SPC,
-        LSFT(LALT(KC_U)), LCTL(LSFT(LALT(KC_P))),
-        TG(MDIA),
-        SFT_T(KC_ENT),    CTL_T(KC_ESC),          TG(OTHR),
-
-
-        // right hand
-        KC_BSLS,  KC_6,     KC_7,    KC_8,    KC_9,    KC_0,              KC_BSPC,
-        KC_EQL,   KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,              KC_QUOT,
-                  KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN,           KC_RCTL,
-        KC_MINS,  KC_N,     KC_M,    KC_COMM, KC_DOT,  LT(MDIA, KC_SLSH), KC_RSFT,
-                            KC_LEFT, KC_RGHT, KC_RGUI, KC_RALT,           MO(SYMB),
-        TG(NPAD),                  TG(SYMB),
-        LCTL(LSFT(LALT(KC_UP))),
-        LCTL(LSFT(LALT(KC_DOWN))), KC_UP,    KC_DOWN
-    ),
-
-
-
-/* Keymap 1: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |         |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |      |      |      |  [   |  ]   |        |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |  F6  |  F7  |  F8  |  F9  |  F10 |      |           |      |  !   |  @   |  #   |  $   |  %   |   `    |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |  F11 |  F12 | GUI+1| GUI+2| GUI+3|------|           |------|  ^   |  &   |  *   |  ~   |  |   |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      |      |      |      |      |      |           |      |      |      |  {   |  }   |  \   |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       | Home | End  |      |      |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------| PgUp | PgDn |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,
-       KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-       KC_TRNS, 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,
-
-       // right hand
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS,
-       KC_TRNS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_GRV,
-                KC_CIRC, KC_AMPR, KC_ASTR, KC_TILD, KC_PIPE, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_BSLS, KC_TRNS,
-                         KC_HOME, KC_END,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_PGUP, KC_PGDN
-),
-
-
-
-/* Keymap 2: Number pad Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |NumLk |   *  |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |   +  |      |   7  |   8  |   9  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |   4  |   5  |   6  |      |        |
- * |--------+------+------+------+------+------|      |           |   -  |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |   1  |   2  |   3  |   /  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |   0  |   .  |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// Number Pad
-[NPAD] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-       // right hand
-       KC_TRNS,  KC_TRNS, KC_NUM,  KC_PAST, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_PPLS,  KC_TRNS,  KC_P7,   KC_P8,   KC_P9,   KC_TRNS, KC_TRNS,
-                 KC_TRNS,  KC_P4,   KC_P5,   KC_P6,   KC_TRNS, KC_TRNS,
-       KC_PMNS,  KC_TRNS,  KC_P1,   KC_P2,   KC_P3,   KC_PSLS, KC_TRNS,
-                          KC_P0,   KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-
-
-/* Keymap 3: Mouse Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      | WUp  |      |           |      |      | WUp  |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght| WDn  |------|           |------|      | WDn  |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |MsAcl0|                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |Brwser|Brwser|
- *                                 | Lclk | Rclk |------|       |------|Back  |Fwd   |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_WH_U, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ACL0,
-                KC_TRNS, KC_TRNS,
-                         KC_TRNS,
-       KC_BTN1, KC_BTN2, KC_TRNS,
-
-       // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_WBAK, KC_WFWD
-),
-
-
-
-/* Keymap 4:
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-//
-[OTHR] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                KC_TRNS, KC_TRNS,
-                         KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS,
-
-       // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-};
diff --git a/keyboards/ergodox_ez/keymaps/kou/readme.md b/keyboards/ergodox_ez/keymaps/kou/readme.md
deleted file mode 100644
index b77f32c72fd..00000000000
--- a/keyboards/ergodox_ez/keymaps/kou/readme.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# ErgoDox EZ Kou Keymap Configuration
-
-## Changelog
-
-* Jun 22, 2018
-  * Update keymap.
-    - enable prettier format of WebStorm.
-    - arrange key of toggle-camel-case.
-* Sep 5, 2017
-  * Update keymap.
-* Jul 20, 2017
-  * Update keymap.
-* May 19, 2017
-  * Update keymap.
-* Jan 18, 2017
-  * Update keymap.
-* Jan 10, 2017
-  * Update keymap.
-* Jan 7, 2017:
-  * create kou keymap.
-
-## How to build
-
-```bash
-# in project root
-$ make git-submodule
-$ make ergodox_ez:kou
-```
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/config.h b/keyboards/ergodox_ez/keymaps/lukaus/config.h
deleted file mode 100644
index 95d5fc46e15..00000000000
--- a/keyboards/ergodox_ez/keymaps/lukaus/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#define CONFIG_USER_H
-
-#define TAPPING_TERM 200
-
-#ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_SAT_STEP 
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 7
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 7
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
-#endif // RGBLIGHT_ENABLE
-
-#define FORCE_NKRO
-
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c b/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
deleted file mode 100644
index 5529abbb6b0..00000000000
--- a/keyboards/ergodox_ez/keymaps/lukaus/keymap.c
+++ /dev/null
@@ -1,843 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-#include "keymap_german.h"
-
-#include "keymap_nordic.h"
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-
-  // Programmer's Dvorak "macros" :
-  //  To be paired with get_mods to enable both
-  //  Shift functionality and Programmer's Dvorak
-
-  DVP_ESC, // Grave escape basically i think
-  DVP_AMPR,
-  DVP_LBRACKET,
-  DVP_LCBR,
-  DVP_RCBR,
-  DVP_LPRN,
-  DVP_AT,
-
-  DVP_EQUAL,
-  DVP_ASTERISK,
-  DVP_RPRN,
-  DVP_PLUS,
-  DVP_RBRACKET,
-  DVP_EXLM,
-  DVP_HASH,
-
-  RU_2,
-  RU_3,
-  RU_4,
-  RU_6,
-  RU_7,
-  RU_DOT,
-
-  SHFT_COMMA,
-  SHFT_DOT,
-
-  RGB_SLD,
-  RGB_FF0000,
-  RGB_008000,
-  RGB_0000FF,
-  RGB_FFFFFF,
-  RGB_800080
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Programmer's Dvorak layer
-  [0] = LAYOUT_ergodox(
-    DVP_ESC,      DVP_AMPR,         DVP_LBRACKET, DVP_LCBR,         DVP_RCBR,     DVP_LPRN,   DVP_AT,
-    KC_TAB,       KC_SCLN,          KC_COMMA,     KC_DOT,           KC_P,         KC_Y,       MO(4),
-    MO(3),        KC_A,             KC_O,         KC_E,             KC_U,         KC_I,
-    KC_LSFT,      KC_QUOTE,         KC_Q,         KC_J,             KC_K,         KC_X,       KC_HYPR,
-    KC_LCTL,      KC_LALT,          KC_LGUI,      LCTL(KC_C),       LCTL(KC_V),
-
-      KC_MS_BTN3, TO(1),    KC_HOME,  KC_SPACE,   MO(4),  KC_END,
-
-    DVP_EQUAL,    DVP_ASTERISK,     DVP_RPRN,     DVP_PLUS,         DVP_RBRACKET, DVP_EXLM,   DVP_HASH,
-    TT(4),        KC_F,             KC_G,         KC_C,             KC_R,         KC_L,       KC_SLASH,
-                  KC_D,             KC_H,         KC_T,             KC_N,         KC_S,       KC_MINUS,
-    KC_MEH,       KC_B,             KC_M,         KC_W,             KC_V,         KC_Z,       MO(3),
-                                    KC_DELETE,    KC_BSLS,          KC_RGUI,      KC_RCTL,    LCTL(KC_F),
-
-      KC_F17,     KC_F18,   KC_PGUP,  KC_PGDN,  KC_ENTER,   KC_BSPC
-  ),
-  // Gaming QWERTY layer
-  [1] = LAYOUT_ergodox(
-    KC_ESCAPE,  KC_1,   KC_2,     KC_3,         KC_4,       KC_5,         KC_F14,
-    KC_TAB,     KC_Q,   KC_W,     KC_E,         KC_R,       KC_T,         KC_F23,
-    MO(3),      KC_A,   KC_S,     KC_D,         KC_F,       KC_G,
-    KC_LSFT,    KC_Z,   KC_X,     KC_C,         KC_V,       KC_B,         KC_F24,
-    KC_LCTL,    KC_F8,  KC_LALT,  KC_F14,      KC_F13,
-
-      KC_HOME,  TO(0),  KC_F15,  KC_SPACE, KC_LCTL,  KC_LALT,
-
-    KC_6,       KC_7,   KC_8,     KC_9,         KC_0,       KC_MINUS,   KC_EQUAL,
-    KC_F24,     KC_Y,   KC_U,     KC_I,         KC_O,       KC_P,       KC_BSLS,
-                KC_H,   KC_J,     KC_K,         KC_L,       KC_SCLN,    KC_QUOTE,
-    KC_F17,     KC_N,   KC_M,     KC_COMMA,     KC_DOT,     KC_SLASH,   KC_RSFT,
-            KC_DELETE,  KC_F19,   KC_LGUI,       KC_F21,     KC_F22,
-
-      KC_F17,   KC_F18, KC_PGUP,  KC_PGDN,    KC_ENTER,   KC_BSPC
-  ),
-  [2] = LAYOUT_ergodox(
-    KC_ESCAPE,  KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_C,
-    KC_TAB,     KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,      TO(0),
-    MO(3),      KC_1,      KC_2,      KC_3,      KC_4,      KC_5,
-    KC_LSFT,    KC_6,      KC_7,      KC_8,      KC_9,      KC_0,     KC_NO,
-    KC_LCTL,    KC_F8,     KC_LALT,   KC_I,      KC_S,
-
-    KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSFT,  KC_END,
-
-    KC_NO,     KC_NUM,         KC_KP_SLASH,    KC_KP_ASTERISK, KC_KP_MINUS,     KC_NO,   KC_NO,
-    TO(0),     KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_KP_PLUS,      KC_NO,   KC_NO,
-               KC_KP_4,        KC_KP_5,        KC_KP_6,        KC_EQUAL,        KC_NO,  KC_NO,
-    KC_NO,     KC_KP_1,        KC_KP_2,        KC_KP_3,        KC_KP_ENTER,     KC_NO,  KC_NO,
-               KC_KP_0,        KC_KP_DOT,      KC_NO,          KC_NO,           KC_NO,
-
-      TO(0), KC_F18, KC_PGUP,  KC_PGDN,  KC_ENTER, KC_BSPC
-  ),
-  // Function Layer
-  [3] = LAYOUT_ergodox(
-    KC_DLR,         KC_F1,            KC_F2,              KC_F3,              KC_F4,              KC_F5,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT,   KC_MEDIA_PREV_TRACK,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_NO,          TT(4),
-    KC_TRANSPARENT, KC_TRANSPARENT,   KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,    KC_AUDIO_MUTE,      KC_TRANSPARENT,
-    KC_LSFT,        LALT(KC_Z),       KC_TRANSPARENT,     KC_TRANSPARENT,     KC_F12,             KC_TRANSPARENT, ALL_T(KC_NO),
-    KC_LCTL,        KC_LALT,          KC_LGUI,            KC_CAPS,            LSFT(KC_F12),
-
-     KC_PSCR,    KC_PGUP,  KC_PGDN,  KC_SPACE, KC_LSFT,   KC_INSERT,
-
-    KC_F6,          KC_F7,            KC_F8,              KC_F9,              KC_F10,             KC_F11,         KC_F12,
-    KC_NO,          KC_HOME,          KC_TRANSPARENT,     KC_PSCR,            KC_SCRL,            KC_TRANSPARENT, KC_TRANSPARENT,
-                    KC_LEFT,          KC_DOWN,            KC_UP,              KC_RIGHT,           KC_TRANSPARENT, KC_TRANSPARENT,
-    MEH_T(KC_NO),   KC_CALCULATOR,    KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT,     KC_TRANSPARENT, KC_RSFT,
-                                      KC_DELETE,          KC_INSERT,          KC_TRANSPARENT,     KC_F19,         KC_RCTL,
-
-     TO(2),KC_TRANSPARENT,KC_TRANSPARENT,LALT(KC_F10),KC_ENTER,KC_BSPC
-  ),
-  // Keypad, Lighting, and Mouse emulation layer
- ///*
-    [4] = LAYOUT_ergodox(
-    KC_ESCAPE,  KC_NO,      KC_NO,        KC_MS_BTN3, KC_NO,        KC_NO,          KC_NO,
-    KC_TAB,     KC_NO,      KC_MS_BTN2,   KC_MS_UP,   KC_MS_BTN1,   KC_MS_WH_UP,    TO(0),
-    KC_NO,      KC_NO,      KC_MS_LEFT,   KC_MS_DOWN, KC_MS_RIGHT,  KC_MS_WH_DOWN,
-    KC_LSFT,    KC_NO,      KC_NO,        KC_UP,      KC_NO,        KC_NO,          TO(5),
-    KC_LCTL,    KC_NO,      KC_LEFT,      KC_DOWN,    KC_RIGHT,
-
-    KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSFT,  KC_END,
-
-    KC_NO,          KC_NUM,         KC_KP_SLASH,    KC_KP_ASTERISK, KC_CALCULATOR,    KC_NO,      RGB_VAI,
-    TO(0),          KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_KP_MINUS,      KC_NO,      RGB_VAD,
-                    KC_KP_4,        KC_KP_5,        KC_KP_6,        KC_KP_PLUS,       KC_NO,    RGB_HUI,
-    KC_NO,          KC_KP_1,        KC_KP_2,        KC_KP_3,        KC_EQUAL,         RGB_SLD,    RGB_HUD,
-                                    KC_KP_0,        KC_KP_DOT,      KC_KP_ENTER,      RGB_MOD,   RGB_TOG,
-
-      KC_F17, KC_F18, KC_PGUP,  KC_PGDN,  KC_ENTER, KC_BSPC
-  )
-  //*/
-  /*
-  // Keypad, Lighting, and Mouse emulation layer
-  [4] = KEYMAP(
-    KC_ESCAPE,  KC_NO,      KC_NO,        KC_MS_BTN3, KC_NO,        KC_NO,          KC_NO,
-    KC_TAB,     KC_NO,      KC_MS_BTN2,   KC_MS_UP,   KC_MS_BTN1,   KC_MS_WH_UP,    TO(0),
-    KC_NO,      KC_NO,      KC_MS_LEFT,   KC_MS_DOWN, KC_MS_RIGHT,  KC_MS_WH_DOWN,
-    KC_LSFT,   KC_NO,      KC_NO,        KC_UP,      KC_NO,        KC_NO,          TO(5),
-    KC_LCTL,    KC_NO,      KC_LEFT,      KC_DOWN,    KC_RIGHT,
-
-    KC_MS_BTN3, TO(1),  KC_HOME,  KC_SPACE, KC_LSFT,  KC_END,
-
-    KC_NO,    KC_I,       KC_NUM,         KC_KP_SLASH,    KC_KP_ASTERISK, KC_CALCULATOR,  RGB_VAI,
-    TO(0),    KC_G,       KC_KP_7,        KC_KP_8,        KC_KP_9,        KC_KP_MINUS,    RGB_VAD,
-              SHFT_COMMA,       KC_KP_4,        KC_KP_5,        KC_KP_6,        KC_KP_PLUS,     RGB_HUI,
-    KC_NO,    SHFT_DOT,       KC_KP_1,        KC_KP_2,        KC_KP_3,        KC_EQUAL,       RGB_HUD,
-              KC_NO,                       KC_KP_0,        KC_KP_DOT,      KC_KP_ENTER,    RGB_TOG,
-
-      KC_F17, KC_F18, KC_PGUP,  KC_PGDN,  KC_ENTER, KC_BSPC
-  )
-  */
-
-};
-
-void led_set_keymap(uint8_t usb_led) {
-
-}
-
-void matrix_init_user (void) {
-
-}
-
-
-bool left_shift_down = false;
-bool right_shift_down = false;
-
-bool numlock = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  switch (keycode) {
-    case KC_LEFT_SHIFT:
-    if (record->event.pressed)
-      {
-        left_shift_down = true;
-      return true;
-      }
-      else
-      {
-        left_shift_down = false;
-        return true;
-      }
-    break;
-    case KC_RIGHT_SHIFT:
-
-      if (record->event.pressed)
-      {
-        right_shift_down = true;
-      return true;
-      }
-      else
-      {
-        right_shift_down = false;
-        return true;
-      }
-    break;
-    case KC_NUM_LOCK:
-
-      if (record->event.pressed)
-      {
-        numlock = !numlock;
-    }
-    break;
-
-    case DVP_ESC:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-        SEND_STRING("~");
-      return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING(SS_DOWN(X_ESCAPE));
-      else
-        SEND_STRING(SS_UP(X_ESCAPE));
-      return false;
-    }
-    break;
-
-    case DVP_AMPR:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        SEND_STRING("%");
-
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("&");
-    }
-    return false;
-
-    break;
-
-    case SHFT_DOT:
-      if(record->event.pressed)
-        SEND_STRING(">");
-      break;
-
-    case SHFT_COMMA:
-      if(record->event.pressed)
-        SEND_STRING("<");
-      break;
-
-    case DVP_LBRACKET:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-        {
-          if(left_shift_down)
-            unregister_code(KC_LEFT_SHIFT);
-          if(right_shift_down)
-            unregister_code(KC_RIGHT_SHIFT);
-
-          register_code(KC_7);
-          unregister_code(KC_7);
-
-          if(left_shift_down)
-            register_code(KC_LEFT_SHIFT);
-          if(right_shift_down)
-            register_code(KC_RIGHT_SHIFT);
-        }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("[");
-    }
-    return false;
-
-        return false;
-        break;
-
-    case DVP_LCBR:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-       {
-          if(left_shift_down)
-            unregister_code(KC_LEFT_SHIFT);
-          if(right_shift_down)
-            unregister_code(KC_RIGHT_SHIFT);
-
-          register_code(KC_5);
-          unregister_code(KC_5);
-
-          if(left_shift_down)
-            register_code(KC_LEFT_SHIFT);
-          if(right_shift_down)
-            register_code(KC_RIGHT_SHIFT);
-        }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("{");
-    }
-    return false;
-    break;
-
-    case DVP_RCBR:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_3);
-        unregister_code(KC_3);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("}");
-    }
-    return false;
-    break;
-
-    case DVP_LPRN:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_1);
-        unregister_code(KC_1);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("(");
-    }
-    return false;
-    break;
-
-    case DVP_AT:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_LEFT_SHIFT);
-        register_code(KC_6);
-        unregister_code(KC_6);
-        unregister_code(KC_LEFT_SHIFT);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("@");
-    }
-    return false;
-    break;
-
-
-    case DVP_EQUAL:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_9);
-        unregister_code(KC_9);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("=");
-    }
-    return false;
-    break;
-
-    case DVP_ASTERISK:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_0);
-        unregister_code(KC_0);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("*");
-    }
-    return false;
-    break;
-
-    case DVP_RPRN:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_2);
-        unregister_code(KC_2);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING(")");
-    }
-    return false;
-    break;
-
-    case DVP_PLUS:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_4);
-        unregister_code(KC_4);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("+");
-    }
-    return false;
-    break;
-
-    case DVP_RBRACKET:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_6);
-        unregister_code(KC_6);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("]");
-    }
-    return false;
-    break;
-
-    case DVP_EXLM:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_8);
-        unregister_code(KC_8);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("!");
-    }
-    return false;
-    break;
-
-    case DVP_HASH:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_GRAVE);
-        unregister_code(KC_GRAVE);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("#");
-    }
-    return false;
-    break;
-
-    // Russian
-    case RU_2:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_GRAVE);
-        unregister_code(KC_GRAVE);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("#");
-    }
-    return false;
-    break;
-case RU_3:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_GRAVE);
-        unregister_code(KC_GRAVE);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("#");
-    }
-    return false;
-    break;
-case RU_4:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_GRAVE);
-        unregister_code(KC_GRAVE);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("#");
-    }
-    return false;
-    break;
-case RU_6:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_GRAVE);
-        unregister_code(KC_GRAVE);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("#");
-    }
-    return false;
-    break;
-case RU_7:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_GRAVE);
-        unregister_code(KC_GRAVE);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("#");
-    }
-    return false;
-    break;
-
-  case RU_DOT:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_GRAVE);
-        unregister_code(KC_GRAVE);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("#");
-    }
-    return false;
-    break;
-
-
-    case RGB_SLD:
-      if (record->event.pressed) {
-        rgblight_mode(1);
-      }
-      return false;
-      break;
-
-    case RGB_FF0000:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_enable();
-          rgblight_mode(1);
-          rgblight_setrgb(0xff,0x00,0x00);
-        #endif
-      }
-      return false;
-      break;
-
-    case RGB_008000:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_enable();
-          rgblight_mode(1);
-          rgblight_setrgb(0x00,0x80,0x00);
-        #endif
-      }
-      return false;
-      break;
-
-    case RGB_0000FF:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_enable();
-          rgblight_mode(1);
-          rgblight_setrgb(0x00,0x00,0xff);
-        #endif
-      }
-      return false;
-      break;
-
-    case RGB_FFFFFF:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_enable();
-          rgblight_mode(1);
-          rgblight_setrgb(0xff,0xff,0xff);
-        #endif
-      }
-      return false;
-      break;
-
-    case RGB_800080:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_enable();
-          rgblight_mode(1);
-          rgblight_setrgb(0x80,0x00,0x80);
-        #endif
-      }
-      return false;
-      break;
-
-  }
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-    uint8_t layer = get_highest_layer(state);
-
-  //  ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      case 0:
-        break;
-      case 1:
-        ergodox_right_led_1_on();
-        break;
-      case 2:
-        ergodox_right_led_2_on();
-        break;
-      case 3:
-        ergodox_right_led_3_on();
-        break;
-      case 4:
-        ergodox_right_led_1_on();
-        ergodox_right_led_3_on();
-        break;
-      default:
-        break;
-    }
-    return state;
-
-};
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/readme.md b/keyboards/ergodox_ez/keymaps/lukaus/readme.md
deleted file mode 100644
index af091bb1b9a..00000000000
--- a/keyboards/ergodox_ez/keymaps/lukaus/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lukaus' keymap
-
-Programmer's Dvorak as default layer with Qwerty gaming layer and two function layers
diff --git a/keyboards/ergodox_ez/keymaps/lukaus/rules.mk b/keyboards/ergodox_ez/keymaps/lukaus/rules.mk
deleted file mode 100644
index fe05f599b92..00000000000
--- a/keyboards/ergodox_ez/keymaps/lukaus/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-#UNICODE_ENABLE = yes
diff --git a/keyboards/ergodox_ez/keymaps/matrixman/keymap.c b/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
deleted file mode 100644
index ab1fd0e889f..00000000000
--- a/keyboards/ergodox_ez/keymaps/matrixman/keymap.c
+++ /dev/null
@@ -1,188 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-// http://www.keyboard-layout-editor.com/#/gists/9be130e4c9b503317619
-
-#define BASE 0 // default layer
-#define SYMB_R 1 // symbols (activated by right hand)
-#define SYMB_L 2 // symbols (activated by left hand)
-#define NAV 3 // navigation
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Prose layer
- *
- * Layer switch keys:
- * [tap/toggle]
- * (momentary)
- * {toggle}
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   ESC  |   1  |   2  |   3  |   4  |   5  | Del  |           | BSPC |   6  |   7  |   8  |   9  |   0  | BSPC   |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |   Tab  |   Q  |   W  |   E  |   R  |   T  | Ctrl/|           |Ctrl/ |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------| Esc  |           |  ;   |------+------+------+------+------+--------|
- * |  Ctrl  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
- * |--------+------+------+------+------+------|Alt/  |           |Alt/  |------+------+------+------+------+--------|
- * |  Shift |   Z  |   X  |   C  |   V  |   B  |Tab   |           |Ins   |   N  |   M  |   ,  |   .  | /    | Shift  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Ctrl  |Super |  Alt |[Nav] |[Symb]|                                       |[Symb]|[Nav] | Alt  | Ctrl | Enter|
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | Shift| Alt  |       | Alt  | Shift  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |[Nav] |       |[Nav] |        |      |
- *                                 | Tab  | Esc  |------|       |------|  Space | Bspc |
- *                                 |      |      | Ctrl |       | Ctrl |        |      |
- *                                 `--------------------'       `----------------------'
- */
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-   LT(NAV,KC_ESC),  KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_DELETE,
-        KC_TAB,     KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   CTL_T(KC_ESC),
-        KC_LCTL,    KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,    KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   ALT_T(KC_TAB),
-        KC_LCTL,    KC_LGUI,      KC_LALT,KC_NO,  MO(NAV),
-
-                                           KC_LCTL,   KC_LALT,
-                                                      MO(NAV),
-                       KC_TAB,    LT(SYMB_L,KC_ESC),  KC_LSFT,
-                  // right hand
-                  KC_BSPC,       KC_6,   KC_7,   KC_8,   KC_9,   KC_0,      KC_BSPC,
-                  CTL_T(KC_SCLN),KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,      KC_BSLS,
-                                 KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,   KC_QUOT,
-                  ALT_T(KC_INS), KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   KC_RSFT,
-                                         MO(NAV),KC_NO,  KC_RALT,KC_RGUI,   CTL_T(KC_ENT),
-                  KC_RALT,   KC_RCTL,
-                  MO(NAV),
-                  KC_RSFT, LT(SYMB_R,KC_SPACE), KC_BSPC
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |  `   |  ~   |   *  |   &  |   /  |  <   |           |   >  |   \  |   7  |   8  |   9  |   |  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |  _   |  ^   |   %  |   $  |   (  |------|           |------|   )  |   4  |   5  |   6  |   -  | Enter  |
- * |--------+------+------+------+------+------|  [   |           |   ]  |------+------+------+------+------+--------|
- * |        |  =   |  #   |   @  |   !  |   {  |      |           |      |   }  |   1  |   2  |   3  |   +  | Enter  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |   "  |      |      |      |      |                                       |   0  |   .  |   .  |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |   ?  |   :  |------|       |------|   ;  |  .   |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[SYMB_L] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-       KC_TRNS,  KC_GRV ,  KC_TILD,  KC_ASTR,  KC_AMPR,  KC_SLSH,  LSFT(KC_COMM),
-       KC_TRNS,  KC_UNDS,  KC_CIRC,  KC_PERC,  KC_DLR,   KC_LPRN,
-       KC_TRNS,  KC_EQL,   KC_HASH,  KC_AT,    KC_EXLM,  KC_LCBR,  KC_LBRC,
- LSFT(KC_QUOT),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                                         KC_TRNS,  KC_TRNS,
-                                                   KC_TRNS,
-                         LSFT(KC_SLSH),  KC_TRNS,  KC_TRNS,
-       // right hand
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-  LSFT(KC_DOT),  KC_BSLS,  KC_7,     KC_8,     KC_9,     KC_PIPE,  KC_TRNS,
-                 KC_RPRN,  KC_4,     KC_5,     KC_6,     KC_MINS,  KC_ENT,
-       KC_RBRC,  KC_RCBR,  KC_1,     KC_2,     KC_3,     KC_PLUS,  KC_ENT,
-                           KC_0,    KC_DOT,  KC_DOT,     KC_TRNS,  KC_TRNS,
-       KC_TRNS,  KC_TRNS,
-       KC_TRNS,
-       KC_TRNS,  KC_SCLN,  KC_DOT
-),
-
-[SYMB_R] = LAYOUT_ergodox(  // same as above, but avoids clash between SYMB and ;/:
-       // left hand
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-       KC_TRNS,  KC_GRV ,  KC_TILD,  KC_ASTR,  KC_AMPR,  KC_SLSH,  LSFT(KC_COMM),
-       KC_TRNS,  KC_UNDS,  KC_CIRC,  KC_PERC,  KC_DLR,   KC_LPRN,
-       KC_TRNS,  KC_EQL,   KC_HASH,  KC_AT,    KC_EXLM,  KC_LCBR,  KC_LBRC,
- LSFT(KC_QUOT),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                                         KC_TRNS,  KC_TRNS,
-                                                   KC_TRNS,
-                         LSFT(KC_SLSH),  KC_COLN,  KC_TRNS,
-       // right hand
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-  LSFT(KC_DOT),  KC_BSLS,  KC_7,     KC_8,     KC_9,     KC_PIPE,  KC_TRNS,
-                 KC_RPRN,  KC_4,     KC_5,     KC_6,     KC_MINS,  KC_ENT,
-       KC_RBRC,  KC_RCBR,  KC_1,     KC_2,     KC_3,     KC_PLUS,  KC_ENT,
-                           KC_0,   KC_DOT,     KC_DOT,   KC_TRNS,  KC_TRNS,
-       KC_TRNS,  KC_TRNS,
-       KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_DOT
-),
-/* Keymap 2: Navigation Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |Break |           |PrntSc|  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | ---  |MsLeft|MsUp  |MsDown|MsRght|------|           |------| Left | Down | Up   | Right|  F11 |   Enter|
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | ---  | Btn4 |ScrlDn|ScrlUp| Btn5 |      |           |      | Home | PgDwn| PgUp | End  |  F12 |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[NAV] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,  KC_F1,    KC_F2,          KC_F3,        KC_F4,    KC_F5,  KC_PAUSE,
-       KC_TRNS,  KC_F1,    KC_F2,          KC_F3,        KC_F4,    KC_F5,  KC_TRNS,
-       KC_TRNS,  KC_BTN1,  KC_MS_L,        KC_MS_U,      KC_MS_D,  KC_MS_R,
-       KC_TRNS,  KC_BTN2,  KC_BTN4,        KC_MS_WH_UP,  KC_MS_WH_DOWN,  KC_BTN5,  KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_TRNS,        KC_TRNS,      KC_TRNS,
-                                           KC_TRNS,      KC_TRNS,
-                                                         KC_TRNS,
-                               KC_TRNS,    KC_TRNS,      KC_TRNS,
-       // right hand
-       KC_PSCR,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,
-       KC_TRNS,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F12,
-                    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_F11,   KC_ENT,
-       KC_TRNS,     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   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
-),
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-        case 2:
-            ergodox_right_led_1_on();
-            break;
-        case 3:
-        case 4:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-};
diff --git a/keyboards/ergodox_ez/keymaps/matrixman/readme.md b/keyboards/ergodox_ez/keymaps/matrixman/readme.md
deleted file mode 100644
index 1f72d732216..00000000000
--- a/keyboards/ergodox_ez/keymaps/matrixman/readme.md
+++ /dev/null
@@ -1,100 +0,0 @@
-The Matrixman Ergodox / Split-Planck Keyboard Layout
-====================================================
-
-### The problem
-
-These layouts were designed to give my aching pinkeys a break
-
-### The Design
-
- - Pinkeys do less:
-   - Left q, a, z, `, _, =, [Shift], [F1] [Click], [Right Click]
-   - Right p, ', /, |, -, +, [Shift], [F10], [F11], [F12]
- - Index fingers do more:
-   - Left: r, f, v, t, g, b, &, $, !, /, (, {, <, [, [Ctrl], [Tab], [Alt], [PrintScr]
-   - Right: u, j, m, y, h, n, 7, 4, 1, \, ), }, >, ], ;, [Ctrl], [Insert], [Alt], [Pause]
- - Thumbs do more:
-   - Left: [Esc], :, [Shift], [Tab]
-   - Right: [Space], ;, [Shift], [Backspace]
- - Palm Presses too:
-   - Left: [Ctrl], "
-   - Right: [Ctrl, [Enter]
-
-### The Plan
-
-I keep an Ergodox at home and at work, and when I'm mobile, I carry a planck.
-These keymaps are designed to minimize the difficulty of switching between the two.
-
-### Other features
-
-- 10-key at home row for right hand
-- "Matching" symbols use same finger on opposite hand: <> [] {} /\ () 1! 2@ 3# 4$ 5% 6^ 7& 8* -_ +=
-- Supports vim-like (hjkl) movements:
-  - mouse movement and scrolling
-  - arrow keys and nav keys (home, end, pg up, pg down)
-- All non-modal keys mapped (all keys from a typical 105 key keyboard except caps, num, and scroll lock)
-
-The Planck Layout
------------------
-
-For a picture, see here: http://www.keyboard-layout-editor.com/#/gists/eb0696806831fc0d93c9
-
-### Prose Layer
-
-    qwert▓▓yuiop
-    asdfg▓;hjkl'
-    zxcvb▓▓nm,./
-    ▓▓▓▓▓▓▓ ▓▓▓▓
-
-### Symbol Layer
-
-    `~*&/<>\789|
-    _^%$([])456-
-    =#@!{▓▓}123+
-    "▓,?:▓▓;0▓.▓
-
-### Nav Layer
-
-    FKEYF▓▓KEYFK
-    mouse▓▓arowE
-    scrol▓▓seekY
-    ▓▓▓▓▓▓▓▓▓▓▓▓
-
-
-The Ergodox Layout
-------------------
-
-For a picture, see here: http://www.keyboard-layout-editor.com/#/gists/9be130e4c9b503317619
-
-Wherever the Ergodox has keys that the Planck doesn't, whichever key would be expected on a typical 105 key is in that place
-
-### Prose Layer
-
-▓▓▓▓▓▓▓          ▓▓▓▓▓▓
-▓qwert▓         ▓yuiop\
-▓asdfg▓         ;hjkl;'
-▓zxcvb           nm,./▓
-▓▓▓▓▓▓           ▓▓▓▓▓▓
-        ▓▓   ▓▓
-       ▓▓▓   ▓ ▓
-
-### Symbol Layer
-
-▓▓▓▓▓▓           ▓▓▓▓▓▓
-▓`~*&/<         >\789|\
-▓_^%$([         ])456-▓
-▓=#@!{           }123+▓
-"▓▓▓▓▓▓           0▓.▓▓
-        ▓▓   ▓▓
-       ?:▓   ▓;.
-
-
-### Nav Layer
-
-▓▓▓▓▓▓▓          ▓▓▓▓▓▓
-▓FKEYF▓         ▓KEYFK▓
-▓mouse▓          arowE▓
-▓scrol           seekY▓
-▓▓▓▓▓▓           ▓▓▓▓▓▓
-        ▓▓   ▓▓
-       ▓▓▓   ▓▓▓
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h b/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
deleted file mode 100644
index 232b608be93..00000000000
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Set any config.h overrides for your specific keymap here.
-  See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
-*/
-#define ORYX_CONFIGURATOR
-#undef TAPPING_TERM
-#define TAPPING_TERM 175
-
-#undef MOUSEKEY_DELAY
-#define MOUSEKEY_DELAY 20
-
-#undef MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_MAX_SPEED 14
-
-#undef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX 30
-
-#undef MOUSEKEY_WHEEL_INTERVAL
-#define MOUSEKEY_WHEEL_INTERVAL 50
-
-#undef MK_COMBINED
-#define MK_COMBINED
-
-// /* Temporarily defining a tapping term that is ridiculous to see if i can tell if lt is working. */
-// #undef TAPPING_TERM
-// #define TAPPING_TERM 499
-
-/* Turning permissive hold off in order to test the tapping term. */
-#undef PERMISSIVE_HOLD
-#define PERMISSIVE_HOLD
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
deleted file mode 100644
index 14c3a46b692..00000000000
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c
+++ /dev/null
@@ -1,433 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "keymap_german.h"
-#include "keymap_nordic.h"
-#include "keymap_french.h"
-#include "keymap_spanish.h"
-#include "keymap_hungarian.h"
-#include "keymap_swedish.h"
-#include "keymap_brazilian_abnt2.h"
-#include "keymap_canadian_multilingual.h"
-#include "keymap_swiss_de.h"
-#include "keymap_japanese.h"
-#include "keymap_bepo.h"
-
-#define KC_MAC_UNDO LGUI(KC_Z)
-#define KC_MAC_CUT LGUI(KC_X)
-#define KC_MAC_COPY LGUI(KC_C)
-#define KC_MAC_PASTE LGUI(KC_V)
-#define KC_PC_UNDO LCTL(KC_Z)
-#define KC_PC_CUT LCTL(KC_X)
-#define KC_PC_COPY LCTL(KC_C)
-#define KC_PC_PASTE LCTL(KC_V)
-#define ES_LABK_MAC KC_GRAVE
-#define ES_RABK_MAC LSFT(KC_GRAVE)
-#define ES_BSLS_MAC ALGR(KC_6)
-#define NO_PIPE_ALT KC_GRAVE
-#define NO_BSLS_ALT KC_EQUAL
-
-enum custom_keycodes {
-  RGB_SLD = SAFE_RANGE,
-  MS_WH_UP,
-  MS_WH_DOWN,
-  MS_WH_RIGHT,
-  MS_WH_LEFT,
-};
-
-// tapdance keycodes
-enum td_keycodes {
-  CTRL_TO12,
-  SHIFT_TO13,
-  ALT_TO11,
-};
-
-// define a type containing as many tapdance states as you need
-typedef enum {
-  SINGLE_TAP,
-  SINGLE_HOLD,
-} td_state_t;
-
-// create a global instance of the tapdance state type
-static td_state_t td_state;
-
-// declare your tapdance functions:
-
-// function to determine the current tapdance state
-int cur_dance (tap_dance_state_t *state);
-
-// `finished` and `reset` functions for each tapdance keycode
-void ctrlto12_finished (tap_dance_state_t *state, void *user_data);
-void ctrlto12_reset (tap_dance_state_t *state, void *user_data);
-void altto11_finished (tap_dance_state_t *state, void *user_data);
-void altto11_reset (tap_dance_state_t *state, void *user_data);
-void shiftto13_finished (tap_dance_state_t *state, void *user_data);
-void shiftto13_reset (tap_dance_state_t *state, void *user_data);
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_ergodox_pretty(
-    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_INSERT,      KC_Q,           LGUI_T(KC_W),   MT(MOD_HYPR, KC_E),LT(5,KC_R),  KC_T,           KC_NO,                                          KC_NO,          KC_Y,           LT(6,KC_U),     MT(MOD_HYPR, KC_I),RGUI_T(KC_O), KC_P,          KC_PSCR,
-    KC_ESCAPE,      LSFT_T(KC_A),   LCTL_T(KC_S),   LALT_T(KC_D),   LT(1,KC_F),     KC_G,                                                                           KC_H,           LT(2,KC_J),     RALT_T(KC_K),   RCTL_T(KC_L),   RSFT_T(KC_SCLN),KC_CAPS,
-    KC_HOME,        LT(9,KC_Z),     MT(MOD_LGUI | MOD_LCTL,KC_X), LT(7,KC_C), LT(3,KC_V), KC_B,     KC_NO,                                          KC_NO,          KC_N,           LT(4,KC_M),     LT(8,KC_COMMA), MT(MOD_RGUI | MOD_RCTL, KC_DOT), KC_QUOTE, KC_END,
-    KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_DELETE,                                                                                                      KC_TAB,         KC_NO,          KC_NO,          KC_NO,          KC_NO,
-                                                                                                    KC_NO,          KC_NO,          KC_NO,          KC_NO,
-                                                                                                                    KC_NO,          KC_NO,
-                                                                                    TO(10),         KC_BSPC,        KC_NO,          KC_NO,          KC_ENTER,       KC_SPACE
-  ),
-  [1] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_7,           KC_8,           KC_9,           KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_TRANSPARENT, KC_NO,                                                                          KC_NO,          KC_4,           KC_5,           KC_6,           KC_0,           KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_1,           KC_2,           KC_3,           KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-  [2] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_HYPR,        KC_RGUI,        KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LPRN,        KC_RPRN,        KC_ASTR,        KC_SLASH,       KC_NO,                                                                          KC_NO,          KC_TRANSPARENT, KC_RALT,        KC_RCTL,        KC_RSFT,        KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          MT(MOD_RGUI | MOD_RCTL, KC_NO), KC_NO, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-  [3] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_F5,          KC_F6,          KC_F7,          KC_F8,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO,          KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-  [4] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_HYPR,        KC_RGUI,        KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LBRC,        KC_RBRC,        KC_QUES,        KC_EXLM,        KC_NO,                                                                          KC_NO,          KC_NO,          KC_RALT,        KC_RCTL,        KC_RSFT,        KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT, KC_NO,          MT(MOD_RGUI | MOD_RCTL, KC_NO), KC_NO, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-  [5] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_HASH,        KC_BSLS,        KC_GRAVE,       KC_TILD,        KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-  [6] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_TRANSPARENT, KC_HYPR,        KC_RGUI,        KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_UNDS,        KC_EQUAL,       KC_MINUS,       KC_PLUS,        KC_NO,                                                                          KC_NO,          KC_NO,          KC_RALT,        KC_RCTL,        KC_RSFT,        KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          MT(MOD_RGUI | MOD_RCTL, KC_NO), KC_NO, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-  [7] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,                                                                          KC_NO,          KC_AT,          KC_DLR,         KC_PERC,        KC_CIRC,        KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_TRANSPARENT, KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-  [8] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LCBR,        KC_RCBR,        KC_AMPR,        KC_PIPE,        KC_NO,                                                                          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_TRANSPARENT, KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-  [9] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_AUDIO_VOL_UP,KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,                                                                          KC_NO,          KC_MEDIA_PREV_TRACK,KC_AUDIO_VOL_DOWN,KC_MEDIA_NEXT_TRACK,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-  [10] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_MS_BTN2,     KC_ACL2,        KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_MS_UP,       KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, TD(SHIFT_TO13), TD(CTRL_TO12),  TD(ALT_TO11),   KC_MS_BTN1,     KC_NO,                                                                          KC_NO,          KC_MS_LEFT,     KC_MS_DOWN,     KC_MS_RIGHT,    KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_ACL0, KC_NO, KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, TO(0)
-  ),
-  [11] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_UP,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_LEFT,        KC_DOWN,        KC_RIGHT,       KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, TO(0)
-  ),
-  [12] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_ACL2,        KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_MS_WH_UP,    KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_MS_WH_LEFT,  KC_MS_WH_DOWN,  KC_MS_WH_RIGHT, KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  MO(14), KC_NO,  KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, TO(0)
-  ),
-  [13] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_LGUI,        KC_HYPR,        KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_PGUP,        KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_LSFT,        KC_LCTL,        KC_LALT,        KC_NO,          KC_NO,                                                                          KC_NO,          KC_NO,          KC_PGDN,      KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          MT(MOD_LGUI | MOD_LCTL,KC_NO),  KC_NO, KC_NO,   KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, TO(0)
-  ),
-  [14] = LAYOUT_ergodox_pretty(
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          MS_WH_UP,   KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,                                                                          KC_NO,          MS_WH_LEFT,     MS_WH_DOWN, MS_WH_RIGHT,    KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_NO,          KC_NO,          KC_TRANSPARENT, KC_NO,          KC_NO,          KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_NO,          KC_NO,          KC_NO,      KC_NO,          KC_NO,          KC_TRANSPARENT,
-    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                                                    KC_TRANSPARENT, KC_TRANSPARENT,
-                                                                                    KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-  ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  uint8_t layer = get_highest_layer(state);
-  ergodox_board_led_off();
-  ergodox_right_led_1_off();
-  ergodox_right_led_2_off();
-  ergodox_right_led_3_off();
-  switch (layer) {
-    case 1:
-      ergodox_right_led_1_on();
-      break;
-    case 2:
-      ergodox_right_led_2_on();
-      break;
-    case 3:
-      ergodox_right_led_3_on();
-      break;
-    case 4:
-      ergodox_right_led_1_on();
-      ergodox_right_led_2_on();
-      break;
-    case 5:
-      ergodox_right_led_1_on();
-      ergodox_right_led_3_on();
-      break;
-    case 6:
-      ergodox_right_led_2_on();
-      ergodox_right_led_3_on();
-      break;
-    case 7:
-      ergodox_right_led_1_on();
-      ergodox_right_led_2_on();
-      ergodox_right_led_3_on();
-      break;
-    default:
-      break;
-  }
-  return state;
-};
-
-// determine the tapdance state to return
-int cur_dance (tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted && state->pressed && state->interrupting_keycode == KC_MS_BTN1) {return SINGLE_HOLD;}
-    if (state->interrupted && state->pressed && state->interrupting_keycode == 22273) {return SINGLE_HOLD;}
-    if (state->interrupted && state->pressed && state->interrupting_keycode == 22272) {return SINGLE_HOLD;}
-    if (state->interrupted && state->pressed && state->interrupting_keycode == KC_TAB) {return SINGLE_HOLD;}
-    else if (state->interrupted || !state->pressed) {
-        // if (state->interrupted) {
-        //     print("interrupted\n");
-        //     uprintf("Shift: %u\n", KC_LSFT);
-        //     uprintf("Control: %u\n", KC_LCTL);
-        //     uprintf("%u\n",state->interrupting_keycode);
-        // }
-        return SINGLE_TAP;
-    }
-    else { return SINGLE_HOLD; }
-  }
-  else { return 2; } // any number higher than the maximum state value you return above
-}
-// /* Backup in case previous code is hard to piece together. */
-// int cur_dance (tap_dance_state_t *state) {
-//   if (state->count == 1) {
-//     if (state->interrupted || !state->pressed) { return SINGLE_TAP; }
-//     else { return SINGLE_HOLD; }
-//   }
-//   else { return 2; } // any number higher than the maximum state value you return above
-// }
-
-void ctrlto12_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      layer_on(12);
-      break;
-    case SINGLE_HOLD:
-      if (state->interrupted && (state->interrupting_keycode == 22273 || state->interrupting_keycode == 43)) {
-        register_mods(MOD_BIT(KC_LCTL));
-        break;
-      }
-      register_mods(MOD_BIT(KC_LCTL)); // for a layer-tap key, use `layer_on(_MY_LAYER)` here
-      if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
-        register_code16(LCTL(KC_MS_BTN1));
-      }
-      break;
-  }
-}
-
-void ctrlto12_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      break;
-    case SINGLE_HOLD:
-      if (state->interrupted && (state->interrupting_keycode == 22273 || state->interrupting_keycode == 43) ) {
-        unregister_mods(MOD_BIT(KC_LCTL));
-        break;
-      }
-      unregister_mods(MOD_BIT(KC_LCTL)); // for a layer-tap key, use `layer_off(_MY_LAYER)` here
-      if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
-        unregister_code16(LCTL(KC_MS_BTN1));
-      }
-      break;
-  }
-}
-
-void shiftto13_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      layer_on(13);
-      break;
-    case SINGLE_HOLD:
-      if (state->interrupted && (state->interrupting_keycode == 22272 || state->interrupting_keycode == 43) ) {
-        register_mods(MOD_BIT(KC_LSFT));
-        break;
-      }
-      register_mods(MOD_BIT(KC_LSFT)); // for a layer-tap key, use `layer_on(_MY_LAYER)` here
-      if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
-        register_code16(LSFT(KC_MS_BTN1));
-      }
-      break;
-  }
-}
-
-void shiftto13_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      break;
-    case SINGLE_HOLD:
-      if (state->interrupted && (state->interrupting_keycode == 22272 || state->interrupting_keycode == 43) ) {
-        unregister_mods(MOD_BIT(KC_LSFT));
-        break;
-      }
-      unregister_mods(MOD_BIT(KC_LSFT)); // for a layer-tap key, use `layer_off(_MY_LAYER)` here
-      if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
-        unregister_code16(LSFT(KC_MS_BTN1));
-      }
-      break;
-  }
-}
-
-void altto11_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      layer_on(11);
-      break;
-    case SINGLE_HOLD:
-      register_mods(MOD_BIT(KC_LALT)); // for a layer-tap key, use `layer_on(_MY_LAYER)` here
-      if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
-        register_code16(LALT(KC_MS_BTN1));
-      }
-      break;
-  }
-}
-
-void altto11_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      break;
-    case SINGLE_HOLD:
-      unregister_mods(MOD_BIT(KC_LALT)); // for a layer-tap key, use `layer_off(_MY_LAYER)` here
-      if (state->interrupted && state->interrupting_keycode == KC_MS_BTN1) {
-        unregister_code16(LALT(KC_MS_BTN1));
-      }
-      break;
-  }
-}
-
-// define `ACTION_TAP_DANCE_FN_ADVANCED()` for each tapdance keycode, passing in `finished` and `reset` functions
-tap_dance_action_t tap_dance_actions[] = {
-  [CTRL_TO12] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctrlto12_finished, ctrlto12_reset),
-  [SHIFT_TO13] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, shiftto13_finished, shiftto13_reset),
-  [ALT_TO11] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altto11_finished, altto11_reset),
-};
-
-/* Debugging functions */
-
-void keyboard_post_init_user(void) {
-  // Customise these values to desired behaviour
-//   debug_enable=true;
-//   debug_matrix=true;
-//   debug_keyboard=true;
-//   debug_mouse=true;
-}
-
-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
-    switch (keycode) {
-    case MS_WH_DOWN:
-        if (record->event.pressed) {
-            SEND_STRING(SS_TAP(X_MS_WH_DOWN));
-        }
-        break;
-    case MS_WH_UP:
-        if (record->event.pressed) {
-            SEND_STRING(SS_TAP(X_MS_WH_UP));
-        }
-        break;
-    case MS_WH_LEFT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_TAP(X_MS_WH_LEFT));
-        }
-        break;
-    case MS_WH_RIGHT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_TAP(X_MS_WH_RIGHT));
-        }
-        break;
-    }
-    return true;
-}
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/readme.md b/keyboards/ergodox_ez/keymaps/nathanvercaemert/readme.md
deleted file mode 100644
index ff3c8d142cc..00000000000
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# The nathanvercaemert ErgoDox EZ configuration
-
-Centered around the home row and the use of mouse keys, this configuration focuses on minimal finger movement. No key is more than one unit away from the home row.
-
-## Layers
-
-* Base Layer
-  * The two main thumb keys provide a loop to the mouse key layer. Pressing the left followed by the right always guarantees that you are on the base layer.
-  * There are a lot of dual function keys on the base layer.
-  * The layout of the letters is qwerty.
-  * Pinkys, ring fingers, and middle fingers apply dual function modifiers (along with the keys above and below the ring fingers.)
-* Numbers, Symbols, and Function Keys.
-  * From the base layer, many keys are dual function layer switches.
-  * The switch on one hand changes the home row of the other hand to a row of symbols in most cases.
-  * The left index finger, and the key below it, change the right hand to the numbers and function keys
-  respectfully.
-* Mouse Layer
-  * Clicking the main left thumb key navigates to the mouse layer (10.) Some dual function keys (technically tap dance functions) allow the left hand to apply modifiers to mouse clicks while tapping switches to
-  navigation layers.
-* Navigation Layers
-  * From the Mouse Layer, taps to the left home row navigate to scroll keys, arrow keys, and page keys.
-* Notes on Acceleration
-  * Designated as "Slow" and "Fast" on the mouse layers (movement and scroll,) these keys can be held to allow for slow/precise or fast/efficient control.
-
-Here is the image of my keymap:
-
-![Imgur Image](https://i.imgur.com/x6VgH9Z.png)
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/rules.mk b/keyboards/ergodox_ez/keymaps/nathanvercaemert/rules.mk
deleted file mode 100644
index 0dadd4371f5..00000000000
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set any rules.mk overrides for your specific keymap here.
-# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
-LTO_ENABLE = yes
-COMMAND_ENABLE = no
-RGBLIGHT_ENABLE = no
-TAP_DANCE_ENABLE=yes
-
-# Debugging
-CONSOLE_ENABLE = yes
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/config.h b/keyboards/ergodox_ez/keymaps/nfriend/config.h
deleted file mode 100644
index 141d7ac89a2..00000000000
--- a/keyboards/ergodox_ez/keymaps/nfriend/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2020 Nathan Friend
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#undef DEBOUNCE
-#define DEBOUNCE 15
-
-#undef ONESHOT_TIMEOUT
-#define ONESHOT_TIMEOUT 1003
-
-#define PERMISSIVE_HOLD
-
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c b/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
deleted file mode 100644
index 13a06f6065e..00000000000
--- a/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
+++ /dev/null
@@ -1,1096 +0,0 @@
-/* Copyright (C) 2020 Nathan Friend
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "keymap_german.h"
-#include "keymap_nordic.h"
-#include "keymap_french.h"
-#include "keymap_spanish.h"
-#include "keymap_hungarian.h"
-
-#define KC_MAC_UNDO LGUI(KC_Z)
-#define KC_MAC_CUT LGUI(KC_X)
-#define KC_MAC_COPY LGUI(KC_C)
-#define KC_MAC_PASTE LGUI(KC_V)
-#define KC_PC_UNDO LCTL(KC_Z)
-#define KC_PC_CUT LCTL(KC_X)
-#define KC_PC_COPY LCTL(KC_C)
-#define KC_PC_PASTE LCTL(KC_V)
-#define ___ KC_TRNS
-
-/* Shortcut for Option+Ctrl */
-#define OC(keycode) LALT(LCTL(keycode))
-
-enum layer_names {
-
-    /* Base layers */
-    _COLEMAK,
-    _QWERTY,
-    _DVORAK,
-
-    /* Keys the base layers share */
-    _COMMON,
-
-    /* OS layers */
-    _MAC,
-    _WINDOWS,
-
-    /* Symbols */
-    _NUMPAD,
-    _SYMBOLS,
-
-    /* Window management */
-    _WM_MAC,
-    _WM_WINDOWS,
-
-    /* Navigation */
-    _ARROWS_MAC,
-    _ARROWS_WINDOWS,
-
-    _MISC
-};
-
-enum custom_keycodes {
-    RGB_SLD = SAFE_RANGE, /* Can always be here */
-    HSV_0_255_255,
-    HSV_120_255_128,
-    HSV_240_255_255,
-    MAC_MODE,
-    WINDOWS_MODE,
-    DYNAMIC_MACRO_RANGE, /* This needs to be last! */
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* clang-format off */
-
-    [_COLEMAK] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/   KC_Q,   /**/   KC_W,   /**/   KC_F,   /**/   KC_P,   /**/   KC_G,   /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/   KC_A,   /**/   KC_R,   /**/   KC_S,   /**/   KC_T,   /**/   KC_D,   /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/   KC_Z,   /**/   KC_X,   /**/   KC_C,   /**/   KC_V,   /**/   KC_B,   /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/ _______,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/   KC_J,   /**/   KC_L,   /**/   KC_U,   /**/   KC_Y,   /**/ KC_SCLN,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/   KC_H,   /**/   KC_N,   /**/   KC_E,   /**/   KC_I,   /**/   KC_O,   /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/   KC_K,   /**/   KC_M,   /**/ KC_COMMA, /**/  KC_DOT,  /**/ KC_SLASH, /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______   /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [_QWERTY] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/   KC_Q,   /**/   KC_W,   /**/   KC_E,   /**/   KC_R,   /**/   KC_T,   /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/   KC_A,   /**/   KC_S,   /**/   KC_D,   /**/   KC_F,   /**/   KC_G,   /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/   KC_Z,   /**/   KC_X,   /**/   KC_C,   /**/   KC_V,   /**/   KC_B,   /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/ _______,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/   KC_Y,   /**/   KC_U,   /**/   KC_I,   /**/   KC_O,   /**/   KC_P,   /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/   KC_H,   /**/   KC_J,   /**/   KC_K,   /**/   KC_L,   /**/ KC_SCLN,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/   KC_N,   /**/   KC_M,   /**/ KC_COMMA, /**/  KC_DOT,  /**/ KC_SLASH, /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______   /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [_DVORAK] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_QUOTE, /**/ KC_COMMA, /**/  KC_DOT,  /**/   KC_P,   /**/   KC_Y,   /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/   KC_A,   /**/   KC_O,   /**/   KC_E,   /**/   KC_U,   /**/   KC_I,   /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_SCLN,  /**/   KC_Q,   /**/   KC_J,   /**/   KC_K,   /**/   KC_X,   /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/ _______,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/   KC_F,   /**/   KC_G,   /**/   KC_C,   /**/   KC_R,   /**/   KC_L,   /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/   KC_D,   /**/   KC_H,   /**/   KC_T,   /**/   KC_N,   /**/   KC_S,   /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/   KC_B,   /**/   KC_M,   /**/   KC_W,   /**/   KC_V,   /**/   KC_Z,   /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______   /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [_COMMON] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ KC_ESCAPE,/**/   KC_1,   /**/   KC_2,   /**/   KC_3,   /**/   KC_4,   /**/   KC_5,   /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ KC_TAB,   /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/MO(_SYMBOLS),   _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/KC_LSFT,   /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LT(_NUMPAD,KC_TAB),
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ KC_SPACE, /**/ _______,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ KC_AUDIO_VOL_DOWN,
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ KC_BSPC,  /**/ _______,  /**/ KC_ENTER, /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/   KC_6,   /**/   KC_7,   /**/   KC_8,   /**/   KC_9,   /**/   KC_0,   /**/  KC_F12,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ KC_HYPR,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ KC_BSLS,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/MO(_SYMBOLS),//
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/  KC_MEH,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/KC_RSFT,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/TT(_MISC),
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-          /*==============================*/
-          /**/           /**/           /**/
-          /**/ _______,  /**/ KC_CAPS,  /**/
-          /**/           /**/           /**/
-          /*=============================================*/
-          /**/           /**/           /**/           /**/
-         KC_AUDIO_VOL_UP,/**/           /**/           /**/
-          /**/           /**/           /**/           /**/
-          /*===============*/           /**/           /**/
-          /**/           /**/           /**/           /**/
-          /**/ KC_ESCAPE,/**/ KC_ENTER, /**/  KC_SPACE /**/
-          /**/           /**/           /**/           /**/
-          /*=============================================*/
-    ),
-
-    [_MAC] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LCTL(LGUI(LSFT(KC_4))),
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______  ,/**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LALT(KC_BSPC),
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-              KC_LCTL, /**/ KC_LGUI,  /**/  KC_LALT, /**/MO(_WM_MAC),   MO(_ARROWS_MAC),
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/LCTL(LGUI(KC_Q)),
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ KC_LGUI,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                  RGUI(RSFT(KC_7)),/**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  MO(_ARROWS_MAC),  MO(_WM_MAC),/**/ KC_LALT,  /**/ KC_LGUI,  /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-          /*==============================*/
-          /**/           /**/           /**/
-        LCTL(LGUI(KC_Q)),/**/ KC_CAPS,  /**/
-          /**/           /**/           /**/
-          /*=============================================*/
-          /**/           /**/           /**/           /**/
-          /**/ _______,  /**/           /**/           /**/
-          /**/           /**/           /**/           /**/
-          /*===============*/           /**/           /**/
-          /**/           /**/           /**/           /**/
-          /**/ _______,  /**/ _______,  /**/ _______   /**/
-          /**/           /**/           /**/           /**/
-          /*=============================================*/
-    ),
-
-    [_WINDOWS] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LGUI(LSFT(KC_S)),
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LCTL(KC_BSPC),
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-              KC_LGUI, /**/ KC_LCTL,  /**/  KC_LALT,   MO(_WM_WINDOWS), MO(_ARROWS_WINDOWS),
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/LGUI(KC_L),/**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ KC_LCTL,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                  LALT(KC_PSCR),   /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                              MO(_ARROWS_WINDOWS), MO(_WM_WINDOWS),  KC_RALT,  /**/ KC_RCTL,  /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/LGUI(KC_L),/**/ _______,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______   /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [_NUMPAD] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/ _______,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ XXXXXXX,  /**/ KC_ESCAPE, LALT(KC_KP_MINUS),  KC_PERC, /**/KC_KP_SLASH,    _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ XXXXXXX,  /**/ KC_KP_7,  /**/ KC_KP_8,  /**/ KC_KP_9,  /**/KC_KP_ASTERISK, _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/ KC_COLN,  /**/ KC_KP_4,  /**/ KC_KP_5,  /**/ KC_KP_6,  /**/KC_KP_MINUS,    _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ KC_COMMA, /**/ KC_KP_1,  /**/ KC_KP_2,  /**/ KC_KP_3,  /**/KC_KP_PLUS,/**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/  KC_0,    /**/   KC_0,   /**/  KC_DOT,  /**/KC_KP_ENTER,     ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ KC_0      /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [_SYMBOLS] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/  KC_F1,   /**/  KC_F2,   /**/  KC_F3,   /**/  KC_F4,   /**/  KC_F5,   /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_EXLM,  /**/  KC_AT,   /**/ KC_LCBR,  /**/ KC_RCBR,  /**/ KC_PERC,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-       LGUI(KC_BSPC),  /**/ KC_HASH,  /**/ KC_UNDS,  /**/ KC_LPRN,  /**/ KC_RPRN,  /**/ KC_AMPR,  /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_BSLS,  /**/ KC_SLASH, /**/KC_LBRC,        KC_RBRC,  /**/ KC_TILD,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/ _______,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/  KC_F6,   /**/   KC_F7,  /**/  KC_F8,   /**/  KC_F9,   /**/  KC_F10,  /**/  KC_F11,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ KC_CIRC,  /**/KC_KP_PLUS,/**/KC_KP_MINUS,    KC_GRAVE, /**/ KC_SCLN,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/ KC_PIPE,  /**/ KC_EQUAL, /**/ KC_QUOTE, /**/ KC_COLN,  /**/ KC_DQUO,  /**/LGUI(KC_DELETE),
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/  KC_DLR,  /**/ KC_ASTR,  /**/  KC_LABK, /**/ KC_RABK,  /**/ KC_SLASH, /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______   /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [_WM_MAC] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/  OC(KC_C), /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ OC(KC_U), OC(LGUI(KC_LEFT)),OC(KC_ENTER),OC(LGUI(KC_RIGHT)), OC(KC_I),/**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ OC(KC_J),    OC(KC_LEFT),  OC(KC_BSPC),    OC(KC_RIGHT),    OC(KC_K), /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/   KC_UP,  /**/ OC(KC_E), /**/ OC(KC_F), /**/ OC(KC_T), /**/ OC(KC_G), /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/KC_LEFT,     KC_DOWN, /**/ KC_RIGHT, /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/ _______,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/  OC(KC_C), /**/ _______,  /**/ _______, /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ OC(KC_U), OC(LGUI(KC_LEFT)),OC(KC_ENTER),OC(LGUI(KC_RIGHT)), OC(KC_I),/**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/ OC(KC_J),    OC(KC_LEFT),  OC(KC_BSPC),    OC(KC_RIGHT),    OC(KC_K), /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ OC(KC_D), /**/ OC(KC_E), /**/ OC(KC_F), /**/ OC(KC_T), /**/  KC_UP,   /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/ _______,  /**/ _______,  /**/ KC_LEFT,  /**/  KC_DOWN, /**/KC_RIGHT,//
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______   /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [_ARROWS_MAC] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/LGUI(KC_Q),/**/LGUI(KC_W),/**/LGUI(KC_F),/**/LGUI(KC_P),/**/LGUI(KC_G),/**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_LCTL,  /**/ KC_LGUI,  /**/ KC_LSFT,  /**/ KC_LALT,  /**/LGUI(KC_D),/*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/LGUI(KC_Z),/**/LGUI(KC_X),/**/LGUI(KC_C),/**/LGUI(KC_V),/**/LGUI(KC_B),/**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/ _______,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/RGUI(KC_J),/**/ KC_BSPC,  /**/  KC_UP,   /**/ KC_DELETE,  RGUI(KC_SCLN),    _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/RGUI(KC_H),/**/ KC_LEFT,  /**/ KC_DOWN,  /**/ KC_RIGHT, /**/ KC_ENTER, /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/RGUI(KC_K),/**/RGUI(KC_M),  RGUI(KC_COMMA), RGUI(KC_DOT), RGUI(KC_SLASH),   _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______   /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [_ARROWS_WINDOWS] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/LCTL(KC_Q),/**/LCTL(KC_W),/**/LCTL(KC_F),/**/LCTL(KC_P),/**/LCTL(KC_G),/**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ KC_LGUI,  /**/ KC_HYPR,  /**/ KC_LSFT,  /**/ KC_LCTL,  /**/LCTL(KC_D),/*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/LCTL(KC_Z),/**/LCTL(KC_X),/**/LCTL(KC_C),/**/LCTL(KC_V),/**/LCTL(KC_B),/**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ _______,  /**/ _______,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/RCTL(KC_J),/**/ KC_BSPC,  /**/  KC_UP,   /**/ KC_DELETE,  RCTL(KC_SCLN),    _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/RCTL(KC_H),/**/ KC_LEFT,  /**/ KC_DOWN,  /**/ KC_RIGHT, /**/ KC_ENTER, /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/RCTL(KC_K),/**/RCTL(KC_M),  RCTL(KC_COMMA), RCTL(KC_DOT), RCTL(KC_SLASH),   _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______   /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [_MISC] = LAYOUT_ergodox(
-        /* Left hand */
-
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/  KC_F14,  /**/  KC_F15,  /**/ _______,  /**/ _______,  /**/ _______,  /**/   QK_BOOT,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ KC_MS_UP, /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/KC_MS_LEFT,/**/KC_MS_DOWN,/**/KC_MS_RIGHT,    _______,  /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/ RGB_MOD,  /**/HSV_0_255_255,
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/HSV_120_255_128,
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/KC_MS_BTN1,/**/KC_MS_BTN2,/**/HSV_240_255_255,
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-        /* Right hand */
-
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/KC_MEDIA_EJECT,
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/DF(_DVORAK),   DF(_QWERTY),   DF(_COLEMAK),//
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/ _______,  /**/ _______,     WINDOWS_MODE,    MAC_MODE, /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/ RGB_TOG,  /**/ RGB_SLD,  /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/ RGB_VAI,  /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/ RGB_VAD,  /**/ RGB_HUD,  /**/ RGB_HUI   /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    /* clang-format on */
-};
-
-bool suspended = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QK_CLEAR_EEPROM:
-            if (record->event.pressed) {
-                eeconfig_init();
-            }
-            return false;
-            break;
-        case RGB_SLD:
-            if (record->event.pressed) {
-                rgblight_mode(1);
-            }
-            return false;
-            break;
-        case HSV_0_255_255:
-            if (record->event.pressed) {
-#ifdef RGBLIGHT_ENABLE
-                rgblight_enable();
-                rgblight_mode(1);
-                rgblight_sethsv(0, 255, 255);
-#endif
-            }
-            return false;
-            break;
-        case HSV_120_255_128:
-            if (record->event.pressed) {
-#ifdef RGBLIGHT_ENABLE
-                rgblight_enable();
-                rgblight_mode(1);
-                rgblight_sethsv(120, 255, 128);
-#endif
-            }
-            return false;
-            break;
-        case HSV_240_255_255:
-            if (record->event.pressed) {
-#ifdef RGBLIGHT_ENABLE
-                rgblight_enable();
-                rgblight_mode(1);
-                rgblight_sethsv(240, 255, 255);
-#endif
-            }
-            return false;
-            break;
-        case MAC_MODE:
-            if (record->event.pressed) {
-                layer_on(_MAC);
-                layer_off(_WINDOWS);
-            }
-            return false;
-            break;
-        case WINDOWS_MODE:
-            if (record->event.pressed) {
-                layer_on(_WINDOWS);
-                layer_off(_MAC);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    uint8_t layer = get_highest_layer(state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-
-    if (layer == _ARROWS_MAC || layer == _ARROWS_WINDOWS) {
-        ergodox_right_led_1_on();
-    } else if (layer == _SYMBOLS) {
-        ergodox_right_led_2_on();
-    } else if (layer == _NUMPAD) {
-        ergodox_right_led_1_on();
-        ergodox_right_led_2_on();
-    } else if (layer == _WM_MAC || layer == _WM_WINDOWS) {
-        ergodox_right_led_2_on();
-        ergodox_right_led_3_on();
-    } else if (layer == _MISC) {
-        ergodox_right_led_1_on();
-        ergodox_right_led_2_on();
-        ergodox_right_led_3_on();
-    } else if (layer == _WINDOWS) {
-        ergodox_right_led_3_on();
-    } else if (layer == _MAC) {
-        /* do nothing */
-    }
-
-    return state;
-};
-
-void keyboard_post_init_user(void) {
-    /* This layer is always on */
-    layer_on(_COMMON);
-
-    /* Default to Mac layout */
-    layer_on(_MAC);
-}
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/readme.md b/keyboards/ergodox_ez/keymaps/nfriend/readme.md
deleted file mode 100644
index 0a19e2d0429..00000000000
--- a/keyboards/ergodox_ez/keymaps/nfriend/readme.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# [nfriend](https://gitlab.com/nfriend)'s ErgoDox EZ configuration
-
-![nfriend's ErgoDox EZ keymap](https://i.imgur.com/CMMmdBc.png)
-
-[View this keymap on
-keyboard-layout-editor.com.](http://www.keyboard-layout-editor.com/#/gists/01283b322a647c96ef75955a9b0bac68)
-
-Color legend:
-
--   **Black:** Primary layer.
--   **Blue:** Symbol layer. Accessed by holding either of the <kbd>to sym</kbd>
-    keys on either end of the keyboard.
--   **Green:** Numpad layer. Accessed by holding the <kbd>to numpad</kbd> key.
--   **Red:** Arrow layer. Accessed by holding either of the <kbd>to arrows</kbd>
-    thumb keys.
--   **Teal:** Window management layer. Accessed by holding either of the <kbd>to
-    WM</kbd> thumb keys.
-    -   Note: this layer is not pictured on this keymap since is tightly coupled
-        to [Magnet](https://magnet.crowdcafe.com/).
--   **Yellow:** Miscellaneous layer. Includes LED control, layout toggling
-    (Colemak/Dvorak/QWERTY), platform toggling (Windows/Mac), and other
-    experimental features.
-    -   Note: this layer is only partially pictured on this keymap
-
-## Caveats
-
-In its current state, this keymap is fairly Mac-centric. Some of the features
-implemented in the Mac layers have not yet been ported to the corresponding
-Windows layers.
-
-## Building
-
-To build this layout, open a command window in the root directory of this
-repository and run:
-
-```bash
-make ergodox_ez:nfriend
-```
-
-This will create a `.build/ergodox_ez_nfriend.hex` file which can be flashed
-using the [Teensy loader](https://www.pjrc.com/teensy/loader.html). After the
-`.hex` file has been loaded into Teensy, the keyboard can be reprogrammed by
-pressing the bottom-right key of the right half of the keyboard and the
-top-right key of the left half (the <kbd>RESET</kbd> key in the screenshot
-above).
-
-## Developing
-
-Use the template in `./template.c` to help create new layers quickly.
-
-This layout was originally based on [this EZ Configurator
-configuration](https://configure.ergodox-ez.com/ergodox-ez/layouts/x9MWL/latest/0).
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/rules.mk b/keyboards/ergodox_ez/keymaps/nfriend/rules.mk
deleted file mode 100644
index 721d8036010..00000000000
--- a/keyboards/ergodox_ez/keymaps/nfriend/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Set any rules.mk overrides for your specific keymap here.
-# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
-DEBOUNCE_TYPE = sym_eager_pk
-LTO_ENABLE = yes
-COMMAND_ENABLE = no
-UNICODE_ENABLE = no
-UNICODEMAP_ENABLE = no
-DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/template.c b/keyboards/ergodox_ez/keymaps/nfriend/template.c
deleted file mode 100644
index dc4294d595b..00000000000
--- a/keyboards/ergodox_ez/keymaps/nfriend/template.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright (C) 2020 Nathan Friend
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* clang-format off */
-
-[LAYER_NAME] = LAYOUT_ergodox(
-    /* Left hand */
-
-    /*=========================================================================================================*/
-    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-    /*=========================================================================================================*/
-    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-    /*==========================================================================================*/           /**/
-    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
-    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-    /*==========================================================================================*/           /**/
-    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-    /*=========================================================================================================*/
-        /**/       /**/           /**/           /**/           /**/           /**/
-        /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-        /**/       /**/           /**/           /**/           /**/           /**/
-        /*=======================================================================*/
-                                                                                           /*==============================*/
-                                                                                           /**/           /**/           /**/
-                                                                                           /**/ _______,  /**/ _______,  /**/
-                                                                                           /**/           /**/           /**/
-                                                                            /*=============================================*/
-                                                                            /**/           /**/           /**/           /**/
-                                                                            /**/           /**/           /**/ _______,  /**/
-                                                                            /**/           /**/           /**/           /**/
-                                                                            /**/           /**/           /*===============*/
-                                                                            /**/           /**/           /**/           /**/
-                                                                            /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                                                                            /**/           /**/           /**/           /**/
-                                                                            /*=============================================*/
-    /* Right hand */
-
-                /*=========================================================================================================*/
-                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                /*=========================================================================================================*/
-                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                /**/           /*==========================================================================================*/
-                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                /**/           /*==========================================================================================*/
-                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
-                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                /*=========================================================================================================*/
-                                              /**/           /**/           /**/           /**/           /**/       /**/
-                                              /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
-                                              /**/           /**/           /**/           /**/           /**/       /**/
-                                              /*=======================================================================*/
-    /*==============================*/
-    /**/           /**/           /**/
-    /**/ _______,  /**/ _______,  /**/
-    /**/           /**/           /**/
-    /*=============================================*/
-    /**/           /**/           /**/           /**/
-    /**/ _______,  /**/           /**/           /**/
-    /**/           /**/           /**/           /**/
-    /*===============*/           /**/           /**/
-    /**/           /**/           /**/           /**/
-    /**/ _______,  /**/ _______,  /**/ _______   /**/
-    /**/           /**/           /**/           /**/
-    /*=============================================*/
-),
diff --git a/keyboards/ergodox_ez/keymaps/saha/keymap.c b/keyboards/ergodox_ez/keymaps/saha/keymap.c
deleted file mode 100644
index 4aaf326587b..00000000000
--- a/keyboards/ergodox_ez/keymaps/saha/keymap.c
+++ /dev/null
@@ -1,254 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#include "debug.h"
-#include "action_layer.h"
-
-#define BASE   0  // Base layer - QWERTY
-#define SPEC   1  // Special keys favoring programming in c-like languages
-#define NUM    2  // Numeric layer with number row functional keys
-
-#define ___     KC_TRNS
-#define BSLASH  LSFT(KC_SLSH)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [BASE] = LAYOUT_ergodox(
-
-    // Left side
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/  KC_VOLU, /**/   KC_1,   /**/   KC_2,   /**/   KC_3,   /**/   KC_4,   /**/   KC_5,   /**/  KC_F11,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/  KC_VOLD, /**/   KC_Q,   /**/    KC_W,  /**/   KC_E,   /**/   KC_R,   /**/   KC_T,   /**/  KC_ESC,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/  KC_MPLY, /**/   KC_A,   /**/   KC_S,   /**/   KC_D,   /**/   KC_F,   /**/   KC_G,   /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/  KC_MUTE, /**/   KC_Z,   /**/    KC_X,  /**/   KC_C,   /**/   KC_V,   /**/   KC_B,   /**/  KC_BSPC, /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/   ___,    /**/    ___,   /**/  KC_RALT, /**/ KC_LCTL,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-
-
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/    ___,   /**/  KC_DEL,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/  KC_LALT, /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ KC_SPACE, /**/  KC_LGUI, /**/ KC_LCTL,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-    // Right side
-        //
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/  KC_F12,  /**/   KC_1,   /**/   KC_2,   /**/   KC_3,   /**/   KC_4,   /**/   KC_5,   /**/    ___,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/    ___,   /**/   KC_Y,   /**/   KC_U,   /**/   KC_I,   /**/   KC_O,   /**/   KC_P,   /**/    ___,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/   KC_H,   /**/   KC_J,   /**/   KC_K,   /**/   KC_L,   /**/  KC_SCLN, /**/    ___,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/  KC_ENT,  /**/   KC_N,   /**/   KC_M,   /**/  KC_COMM, /**/  KC_DOT,  /**/  KC_SLSH, /**/    ___,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/  MO(NUM), /**/   ___,    /**/    ___,   /**/    ___,   /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/    ___,   /**/    ___,   /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/    ___,   /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/    ___,   /**/  KC_RSFT, /**/ MO(SPEC)  /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-
-    [SPEC] = LAYOUT_ergodox(
-
-    // Left side
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/    ___,   /**/  KC_EXLM, /**/   KC_AT,  /**/  KC_HASH, /**/  KC_DLR,  /**/  KC_PERC, /**/    ___,   /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/    ___,   /**/  KC_GRV,  /**/  KC_QUOT, /**/  KC_LCBR, /**/  KC_RCBR, /**/  KC_PLUS, /**/  KC_ESC,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/    ___,   /**/  KC_TAB,  /**/  KC_ASTR, /**/  KC_LPRN, /**/  KC_RPRN, /**/ KC_EQUAL, /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/    ___,   /**/  KC_HASH, /**/  KC_PERC, /**/  KC_LBRC, /**/  KC_RBRC, /**/ KC_MINUS, /**/  KC_BSPC, /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/   ___,    /**/    ___,   /**/  KC_LALT, /**/ KC_LCTL,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-
-
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/    ___,   /**/  KC_DEL,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/  KC_LALT, /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ KC_SPACE, /**/  KC_LGUI, /**/ KC_LCTL,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-    // Right side
-        //
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/    ___,   /**/  KC_CIRC, /**/  KC_AMPR, /**/  KC_ASTR, /**/  KC_LPRN, /**/  KC_RPRN, /**/    ___,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/    ___,   /**/  KC_AMPR, /**/  KC_HOME, /**/   KC_UP,  /**/  KC_END,  /**/  KC_CIRC, /**/   KC_F7,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/  KC_EXLM, /**/  KC_LEFT, /**/  KC_DOWN, /**/ KC_RIGHT, /**/  KC_COLN, /**/   KC_F8,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/  KC_ENT,  /**/  KC_PIPE, /**/  KC_UNDS, /**/   KC_LT,  /**/   KC_GT,  /**/  KC_BSLS, /**/   KC_F9,  /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/    ___,   /**/   ___,    /**/    ___,   /**/    ___,   /**/KC_F10,/**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/    ___,   /**/    ___,   /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/    ___,   /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/    ___,   /**/  KC_RSFT, /**/    ___    /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-    [NUM] = LAYOUT_ergodox(
-
-    // Left side
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/    ___,   /**/   KC_F1,  /**/   KC_F2,  /**/   KC_F3,  /**/   KC_F4,  /**/   KC_F5,  /**/  KC_F11,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/    ___,   /**/  KC_EXLM, /**/   KC_AT,  /**/  KC_HASH, /**/  KC_DLR,  /**/  KC_PERC, /**/  KC_ESC,  /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/    ___,   /**/   KC_1,   /**/   KC_2,   /**/   KC_3,   /**/   KC_4,   /**/   KC_5,   /*===============*/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*==========================================================================================*/           /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /**/    ___,   /**/  KC_HASH, /**/  KC_PERC, /**/  KC_LBRC, /**/  KC_RBRC, /**/ KC_MINUS, /**/  KC_BSPC, /**/
-        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-        /*=========================================================================================================*/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /**/  ___, /**/   ___,    /**/    ___,   /**/  KC_LALT, /**/ KC_LCTL,  /**/
-            /**/       /**/           /**/           /**/           /**/           /**/
-            /*=======================================================================*/
-
-
-                                                                                               /*==============================*/
-                                                                                               /**/           /**/           /**/
-                                                                                               /**/    ___,   /**/  KC_DEL,  /**/
-                                                                                               /**/           /**/           /**/
-                                                                                /*=============================================*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /**/  KC_LALT, /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/           /**/           /*===============*/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /**/ KC_SPACE, /**/  KC_LGUI, /**/ KC_LCTL,  /**/
-                                                                                /**/           /**/           /**/           /**/
-                                                                                /*=============================================*/
-
-    // Right side
-        //
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/  KC_F12,  /**/   KC_F6,  /**/   KC_F7,  /**/   KC_F8,  /**/   KC_F9,  /**/  KC_F10,  /**/    ___,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/    ___,   /**/  KC_CIRC, /**/  KC_AMPR, /**/  KC_ASTR, /**/  KC_LPRN, /**/  KC_RPRN, /**/    ___,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*===============*/   KC_6,   /**/   KC_7,   /**/   KC_8,   /**/   KC_9,   /**/   KC_0,   /**/    ___,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/           /*==========================================================================================*/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /**/  KC_ENT,  /**/  KC_PIPE, /**/  KC_UNDS, /**/  KC_COMM, /**/  KC_DOT,  /**/  KC_BSLS, /**/    ___,   /**/
-                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
-                    /*=========================================================================================================*/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /**/    ___,   /**/   ___,    /**/    ___,   /**/    ___,   /**/  ___, /**/
-                                                  /**/           /**/           /**/           /**/           /**/       /**/
-                                                  /*=======================================================================*/
-
-        /*==============================*/
-        /**/           /**/           /**/
-        /**/    ___,   /**/    ___,   /**/
-        /**/           /**/           /**/
-        /*=============================================*/
-        /**/           /**/           /**/           /**/
-        /**/    ___,   /**/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /*===============*/           /**/           /**/
-        /**/           /**/           /**/           /**/
-        /**/    ___,   /**/  KC_RSFT, /**/    ___    /**/
-        /**/           /**/           /**/           /**/
-        /*=============================================*/
-    ),
-
-};
diff --git a/keyboards/ergodox_ez/keymaps/skug/config.h b/keyboards/ergodox_ez/keymaps/skug/config.h
deleted file mode 100644
index abf1c635f10..00000000000
--- a/keyboards/ergodox_ez/keymaps/skug/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
-
-#undef LSPO_KEY
-#undef RSPC_KEY
-#define LSPO_KEY KC_8 // Nordic Left SpaceCadet
-#define RSPC_KEY KC_9 // Nordic Right SpaceCadet
diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c
deleted file mode 100644
index d878b8a9da0..00000000000
--- a/keyboards/ergodox_ez/keymaps/skug/keymap.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Copyright 2018 Andreas Lindhé, Christoffer Holmberg
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
-
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "keymap_swedish.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-#define ARRW 3 // arrow + soon mouse
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  Esc   |   !  |  "   |  #   |  #   |  %   | Ins  |           |  L1  |   &  |  /   |  (   |  )   |  =   |  ?     |
- * |        |   1  |  2 @ |  3 £ |  4 $ |  5   |      |           |      |   6  |  7 { |  8 [ |  9 ] |  0 } |  + \   |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  Tab   |   Q  |   W  |   E  |   R  |   T  |  L2  |           |  L2  |   Y  |   U  |   I  |   O  |   P  |   Å    |
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   L4   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |Ö / L3|   Ä/L2 |
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------| Back |           |Forwd |------+------+------+------+------+--------|
- * | LShift/|  Z   |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ;  |   :  |  _   | RShift/|
- * |    (   |      |      |      |      |      |      |           |      |      |      |   ,  |   .  |  -   |   )    |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | '/   |  `   |Alt   | Left | Right|                                       |  Spc | Bksp | AltGr|  *   |  ~/  |
- *   | Ctrl |  '   |      |      |      |                                       |      |      |      |      | Ctrl |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,---------------.
- *                                        | <>|  | End  |       | Home |   ^    |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 | Left | Right| PgDn |       | PgUp |   Up   | Down |
- *                                 |------|------|------|       |------|--------|------|
- *                                 | Ctrl/| Alt/ |      |       |      |  Alt/  | Ctrl/|
- *                                 | Enter| Esc  | Lgui |       | Lgui |  Esc   | Enter|
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox_80(  // layer 0 : default
-    // left hand
-    KC_ESC,           KC_1,           KC_2,          KC_3,    KC_4,    KC_5,   KC_INS,
-    KC_TAB,           KC_Q,           KC_W,          KC_E,    KC_R,    KC_T,   TG(SYMB),
-    MO(ARRW),         KC_A,           KC_S,          KC_D,    KC_F,    KC_G,
-    SC_LSPO,          CTL_T(KC_Z),    KC_X,          KC_C,    KC_V,    KC_B,   KC_WBAK,
-    CTL_T(SE_QUOT),   SE_ACUT,        KC_LALT,       KC_BSPC, KC_SPC,
-                                                                             SE_LABK,   KC_END,
-                                                              KC_LEFT,      KC_RIGHT,  KC_PGDN,
-                                                        CTL_T(KC_ENT), ALT_T(KC_ESC),  KC_LGUI,
-
-    // right hand
-         TO(ARRW),       KC_6,   KC_7,   KC_8,    KC_9,    KC_0,              SE_PLUS,
-         TG(SYMB),       KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,              SE_ARNG,
-                         KC_H,   KC_J,   KC_K,    KC_L,    LT(MDIA, SE_ODIA), LT(SYMB, SE_ADIA),
-         KC_WFWD,        KC_N,   KC_M,   KC_COMM, KC_DOT,  SE_MINS,           SC_RSPC,
-                                 KC_SPC, KC_BSPC, KC_ALGR, SE_ASTR,           CTL_T(SE_TILD),
-        KC_HOME,  SE_CIRC,
-        KC_PGUP,  KC_UP,         KC_DOWN,
-        KC_LGUI,  ALT_T(KC_ESC), CTL_T(KC_ENT)
-),
-/* Keymap: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   -  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |   <  |   >  |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |------|------|------|       |------|------|------|
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox_80(
-       // left hand
-       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  _______,
-       _______,KC_EXLM,SE_AT,  SE_LCBR,SE_RCBR,SE_PIPE,_______,
-       _______,KC_HASH,SE_DLR, SE_LPRN,SE_RPRN,SE_GRV,
-       _______,KC_PERC,SE_CIRC,SE_LBRC,SE_RBRC,SE_TILD,_______,
-          EPRM, _______, _______, SE_LABK  , SE_RABK,
-                                       _______,_______,
-                               _______,_______,_______,
-                               _______,_______,_______,
-       // right hand
-       _______, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       _______, KC_UP,   KC_7,   KC_8,    KC_9,    SE_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    SE_PLUS, _______,
-       _______, SE_AMPR, KC_1,   KC_2,    KC_3,    SE_MINS, _______,
-                         _______,KC_DOT,  KC_0,    SE_EQL,  _______,
-       _______, _______,
-       _______, _______, _______,
-       _______, _______, _______
-),
-
-/* Keymap: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      | MsUp |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |MsLeft|MsDown|MsRght|      |      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |------|------|       |------|------|------|
- *                                 |      |      |      |       |      |      |BrBck |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox_80(
-        _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, KC_MS_U, _______, _______, _______, _______,
-        _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, KC_BTN1, KC_BTN2,
-                                            _______, _______,
-                                   _______, _______, _______,
-                                   _______, _______, _______,
-     // right hand
-        _______,  _______, _______, _______, _______, _______, _______,
-        _______,  _______, _______, _______, _______, _______, _______,
-                  _______, _______, _______, _______, _______, KC_MPLY,
-        _______,  _______, _______, KC_MPRV, KC_MNXT, _______, _______,
-                           KC_VOLU, KC_VOLD, KC_MUTE, _______, _______,
-        _______, _______,
-        _______, _______, _______,
-        _______, _______, KC_WBAK
-),
- // Keymap: Ducky Style arrows
-[ARRW] = LAYOUT_ergodox_80(
-        SE_HALF, _______, _______, _______, _______, _______, _______,
-        _______, _______, KC_UP  , _______, _______, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, KC_DEL,  _______,
-                                            _______, _______,
-                                   _______, _______, _______,
-                                   _______, _______, _______,
-     // right hand
-        TO(BASE),  _______, _______, _______, _______, _______, _______,
-        _______,   _______, _______, _______, _______, _______, _______,
-                   _______, _______, _______, _______, _______, _______,
-        _______,   _______, _______, _______, _______, _______, _______,
-                            _______, _______, _______, _______, _______,
-        _______, _______,
-        _______, _______, _______,
-        _______, _______, _______
-),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // Binary: lsb at bottom
-        case 1:
-          ergodox_right_led_3_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_board_led_on();
-        default:
-            // none
-            break;
-    }
-};
diff --git a/keyboards/ergodox_ez/keymaps/skug/readme.md b/keyboards/ergodox_ez/keymaps/skug/readme.md
deleted file mode 100644
index 5c155619c05..00000000000
--- a/keyboards/ergodox_ez/keymaps/skug/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Nordic Qwerty layout for ErgoDox EZ, based on Andreas Lindhe's version 
-
-*NOTE:* it might still be desirable to set the software layout to sv_SE in your
-OS.
diff --git a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
deleted file mode 100644
index 65a7a08ec71..00000000000
--- a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
+++ /dev/null
@@ -1,205 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define MDIA 1 // media keys
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD
-};
-
-bool capsOn = false;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   1  |   2  |   3  |   4  |   5  |   6  |           |   7  |   8  |   9  |   0  |   -  |   =  |  Bksp  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |  {   |           |  }   |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |HyperCaps|  A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L1| Enter  |
- * |--------+------+------+------+------+------| Alt  |           |  L1  |------+------+------+------+------+--------|
- * | LShift | Z/L1 |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   ?  | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |lCrtr |   [  |   ]  |   `  |   '  |                                       | Left |  Up  | Down | Right| PlayWin |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |PRTSRN| Win  |       | Home | End  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Ins  |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Enter |Space |
- *                                 |      |ace   | Del  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        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_LCBR,
-        ALL_T(KC_CAPS), KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,        LT(MDIA,KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   KC_LALT,
-        KC_LCTL,        KC_LBRC,      KC_RBRC,        KC_GRV, KC_QUOT,
-                                                     KC_PSCR, KC_LGUI,
-                                                              KC_INS,
-                                               KC_SPC,KC_BSPC,KC_DEL,
-        // right hand
-                 KC_7,    KC_8,   KC_9,  KC_0,KC_MINS, KC_EQL,             KC_BSPC,
-              KC_RCBR,    KC_Y,   KC_U,  KC_I,   KC_O,   KC_P,             KC_BSLS,
-                          KC_H,   KC_J,  KC_K,   KC_L,   LT(MDIA, KC_SCLN),KC_ENT,
-             TG(MDIA),    KC_N,   KC_M,  KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,
-                                  KC_LEFT, KC_UP,KC_DOWN,KC_RGHT,          GUI_T(KC_MPLY),
-             KC_HOME,        KC_END,
-             KC_PGUP,
-             KC_PGDN,KC_ENT, KC_SPC
-    ),
-/* Keymap 1: Media and mouse keys
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |        |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |BootLoad |      | Lclk | MsUp | Rclk |      |      |           |      |      |      |  Up  |      |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      |MsLeft|MsDown|MsRght|      |------|           |------|      | Left | Down | Right|      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      |MsAcl0|MsAcl1|MsAcl2|      |      |           |      |      |      | Mute | Mute |      |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       | Prev |VolUp |VolDn | Next |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// Functions
-[MDIA] = LAYOUT_ergodox(
-       // left hand
-          VRSN,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
-         QK_BOOT,_______,KC_BTN1,KC_MS_U,KC_BTN2,_______,_______,
-       _______,_______,KC_MS_L,KC_MS_D,KC_MS_R,_______,
-       _______,_______,KC_ACL0,KC_ACL1,KC_ACL2,_______,_______,
-        _______,_______,_______,_______,_______,
-                                       _______,_______,
-                                               _______,
-                               _______,_______,_______,
-       // right hand
-         KC_F7, KC_F8,  KC_F9, KC_F10,  KC_F11, KC_F12,_______,
-       _______,_______,_______, KC_UP ,_______,_______,_______,
-               _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,
-       _______,_______,_______,KC_MUTE,KC_MUTE,_______,_______,
-                       KC_MPRV,KC_VOLU,KC_VOLD,KC_MNXT,_______,
-       _______, _______,
-       _______,
-       _______, _______, _______
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-#ifdef RGBLIGHT_COLOR_LAYER_0
-  rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0);
-#endif
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-   uint8_t layer = get_highest_layer(layer_state);
-
-   if(layer == 1)
-   {
-      ergodox_right_led_2_on();
-      ergodox_right_led_3_on();
-
-      ergodox_right_led_2_set (LED_BRIGHTNESS_HI);
-      ergodox_right_led_3_set (LED_BRIGHTNESS_HI);
-   }
-
-   if(capsOn)
-   {
-      ergodox_right_led_1_set (LED_BRIGHTNESS_HI);
-      ergodox_right_led_1_on ();
-   }
-
-  if(keyboard_report->mods & MOD_BIT(KC_LSFT))
-  {
-      ergodox_right_led_1_set (LED_BRIGHTNESS_HI);
-      ergodox_right_led_1_on ();
-  } else {
-      ergodox_right_led_1_set (LED_BRIGHTNESS_LO);
-
-      if(!capsOn)
-      {
-        ergodox_right_led_1_off ();
-      }
-  }
-
-  if(keyboard_report->mods & MOD_BIT(KC_LALT))
-  {
-      ergodox_right_led_2_set (LED_BRIGHTNESS_HI);
-      ergodox_right_led_2_on ();
-  } else {
-      ergodox_right_led_2_set (LED_BRIGHTNESS_LO);
-     if(layer != 1)
-     {
-       ergodox_right_led_2_off ();
-     }
-  }
-
-  if(keyboard_report->mods & MOD_BIT(KC_LCTL))
-  {
-      ergodox_right_led_3_set (LED_BRIGHTNESS_HI);
-      ergodox_right_led_3_on ();
-  } else {
-      ergodox_right_led_3_set (LED_BRIGHTNESS_LO);
-     if(layer != 1)
-     {
-       ergodox_right_led_3_off ();
-     }
-  }
-};
-
-bool led_update_user(led_t led_state){
- if (led_state.caps_lock)
-   {
-      capsOn = true;
-   }else {
-      capsOn = false;
-   }
-   return false;
-}
diff --git a/keyboards/ergodox_ez/keymaps/stamm/config.h b/keyboards/ergodox_ez/keymaps/stamm/config.h
deleted file mode 100644
index 1262ce65597..00000000000
--- a/keyboards/ergodox_ez/keymaps/stamm/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 Rustam Zagirov
- *
- * 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/>.
- */
-
-/*
- Set any config.h overrides for your specific keymap here.
- See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
-*/
-#pragma once
-
-#define ORYX_CONFIGURATOR
-#define LEADER_TIMEOUT 500
-#define LEADER_PER_KEY_TIMING
-
-#define TAPPING_TERM 200
-#define TAPPING_TERM_PER_KEY
-#define PERMISSIVE_HOLD
-/* #define PERMISSIVE_HOLD_PER_KEY */
-
-#define HOLD_ON_OTHER_KEY_PRESS
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-
-#define QUICK_TAP_TERM 0
-#define QUICK_TAP_TERM_PER_KEY
-
-/* #define RETRO_TAPPING */
-#undef LED_BRIGHTNESS_DEFAULT
-#define LED_BRIGHTNESS_DEFAULT (LED_BRIGHTNESS_LO)
diff --git a/keyboards/ergodox_ez/keymaps/stamm/keymap.c b/keyboards/ergodox_ez/keymaps/stamm/keymap.c
deleted file mode 100644
index b7be1f72c13..00000000000
--- a/keyboards/ergodox_ez/keymaps/stamm/keymap.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* Copyright 2020 Rustam Zagirov
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-#define KC_MAC_UNDO LGUI(KC_Z)
-#define KC_MAC_CUT LGUI(KC_X)
-#define KC_MAC_COPY LGUI(KC_C)
-#define KC_MAC_PASTE LGUI(KC_V)
-#define KC_PC_UNDO LCTL(KC_Z)
-#define KC_PC_CUT LCTL(KC_X)
-#define KC_PC_COPY LCTL(KC_C)
-#define KC_PC_PASTE LCTL(KC_V)
-#define ES_LABK_MAC KC_GRAVE
-#define ES_RABK_MAC LSFT(KC_GRAVE)
-#define ES_BSLS_MAC ALGR(KC_6)
-#define NO_PIPE_ALT KC_GRAVE
-#define NO_BSLS_ALT KC_EQUAL
-#define LSA_T(kc) MT(MOD_LSFT | MOD_LALT, kc)
-
-#define E_NUMBERS LT(_1_NUMBERS, KC_E)
-#define R_MOUSE LT(_2_MOUSE, KC_R)
-
-#define ARROWS MO(_3_ARROW)
-
-enum custom_keycodes {
-  RGB_SLD = SAFE_RANGE,
-  ALT_TAB,
-};
-
-bool is_alt_tab_active = false;    // ADD this near the begining of keymap.c
-uint16_t alt_tab_timer = 0;        // we will be using them soon.
-
-enum layers {
-  _0_BASE,
-  _1_NUMBERS,
-  _2_MOUSE,
-  _3_ARROW,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_0_BASE] = LAYOUT_ergodox(
-  KC_NUBS,              KC_EXLM,              KC_AT,         KC_HASH,        KC_DLR,       KC_PERC,   KC_AUDIO_MUTE,
-  QK_LEAD,              KC_Q,                 KC_W,          E_NUMBERS,      R_MOUSE,      KC_T,      XXXXXXX,
-  LCTL(KC_B),           LSFT_T(KC_A),         LCTL_T(KC_S),  LALT_T(KC_D),   LGUI_T(KC_F), KC_G,
-  KC_BSLS,              KC_Z,                 KC_X,          KC_C,           KC_V,         KC_B,      XXXXXXX,
-  ALT_TAB,              XXXXXXX,              XXXXXXX,       MO(_1_NUMBERS), ARROWS,
-  KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,
-  XXXXXXX,
-  KC_ENTER,             KC_TAB,               KC_ESCAPE,
-  KC_CAPS,              KC_CIRC,              KC_AMPR,       KC_ASTR,       KC_LPRN,            KC_RPRN,   KC_MINUS,
-  XXXXXXX,              KC_Y,                 KC_U,          KC_I,          KC_O,               KC_P,      KC_LBRC,
-  KC_H,                 RGUI_T(KC_J),         RALT_T(KC_K),  RCTL_T(KC_L),  RSFT_T(KC_SCLN),    KC_QUOTE,
-  KC_RBRC,              KC_N,                 KC_M,          KC_COMMA,      KC_DOT,             KC_SLASH,  KC_EQUAL,
-  XXXXXXX,              XXXXXXX,              XXXXXXX,       XXXXXXX,       XXXXXXX,
-  KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,
-  XXXXXXX,
-  KC_ESCAPE,            KC_BSPC,              KC_SPACE
-),
-[_1_NUMBERS] = LAYOUT_ergodox(
-  _______,  KC_F1,      KC_F2,    KC_F3,     KC_F4,    KC_F5,      _______,
-  _______,  _______,    _______,  _______,   _______,  _______,    _______,
-  _______,  _______,    _______,  _______,   _______,  _______,
-  _______,  _______,    _______,  _______,   _______,  _______,    _______,
-  QK_BOOT,  _______,    _______,  _______,   _______,
-                                              _______,  _______,
-                                              _______,
-                                              _______,  _______,    _______,
-
-  _______,  KC_F6,      KC_F7,    KC_F8,     KC_F9,    KC_F10,     KC_F11,
-  _______,  _______,    KC_7,     KC_8,      KC_9,     KC_ASTR,    KC_F12,
-  _______,  KC_4,       KC_5,     KC_6,      KC_PLUS,  _______,
-  _______,  _______,    KC_1,     KC_2,      KC_3,     KC_BSLS,    _______,
-  KC_0,     KC_KP_DOT,  _______,  KC_EQUAL,  _______,
-  _______,  _______,
-  _______,
-  _______,  _______,    _______
-),
-[_2_MOUSE] = LAYOUT_ergodox(
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,
-
-                                      RGB_HUI,        RGB_HUD,
-                                      _______,
-                                      _______, _______, _______,
-
-  _______,            _______, _______,     _______,    _______,       _______, _______,
-  RGB_MOD,            RGB_TOG, KC_MS_BTN1,  KC_MS_UP,   KC_MS_BTN2,    _______, _______,
-                      RGB_SLD, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_RIGHT,   _______, _______,
-  TOGGLE_LAYER_COLOR, _______, KC_MS_WH_UP, _______,    KC_MS_WH_DOWN, _______, _______,
-  _______,            _______, _______,     _______,    _______,
-
-  RGB_VAD, RGB_VAI,
-  _______,
-  _______, _______, _______
-),
-[_3_ARROW] = LAYOUT_ergodox(
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,
-
-                                      _______, _______,
-                                      _______,
-                                      _______, _______, _______,
-
-  _______, _______, _______, _______, _______, _______,  _______,
-  _______, _______, _______, _______, _______, _______,  _______,
-                    KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______,  _______,
-                    _______, _______, _______, _______,  _______,
-
-  _______, _______,
-  _______,
-  _______, _______, _______
-),
-};
-
-
-/* bool suspended = false; */
-void keyboard_post_init_user(void) {
-  rgblight_disable();
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case RGB_SLD:
-      if (record->event.pressed) {
-        rgblight_mode(1);
-      }
-      return false;
-    case ALT_TAB:
-      if (record->event.pressed) {
-        if (!is_alt_tab_active) {
-          is_alt_tab_active = true;
-          register_code(KC_LGUI);
-        }
-        alt_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-  }
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    ergodox_led_all_off();
-    /* rgblight_disable(); */
-    switch (get_highest_layer(state)) {
-      case _1_NUMBERS:
-        ergodox_right_led_1_on();
-        /* rgblight_enable();
-        rgblight_mode(1);
-        rgblight_sethsv(HSV_BLUE);*/
-        break;
-      case _2_MOUSE:
-        ergodox_right_led_2_on();
-        break;
-      case _3_ARROW:
-        ergodox_right_led_3_on();
-        break;
-      /* case 7: */
-      /*   ergodox_right_led_1_on(); */
-      /*   ergodox_right_led_2_on(); */
-      /*   ergodox_right_led_3_on(); */
-      /*   break; */
-      default:
-        break;
-    }
-    return state;
-
-};
-
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    /* case SFT_T(KC_SPC): */
-    /*   return TAPPING_TERM + 1250; */
-    case E_NUMBERS:
-      return 200;
-    case LT(_2_MOUSE, KC_R):
-      return 200;
-    /* case LGUI_T(KC_F): */
-    /*   return 50; */
-    default:
-      return TAPPING_TERM;
-  }
-}
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case E_NUMBERS:
-    case R_MOUSE:
-    case LSFT_T(KC_A):
-    case LCTL_T(KC_S):
-    case LALT_T(KC_D):
-    case LGUI_T(KC_F):
-    case RGUI_T(KC_J):
-    case RALT_T(KC_K):
-    case RCTL_T(KC_L):
-    case RSFT_T(KC_SEMICOLON):
-    case ARROWS:
-      return false;
-    default:
-      return false;
-  }
-}
-
-uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LT(_1_NUMBERS, KC_E):
-        case R_MOUSE:
-        case LSFT_T(KC_A):
-        case LCTL_T(KC_S):
-        case LALT_T(KC_D):
-        case LGUI_T(KC_F):
-        case RGUI_T(KC_J):
-        case RALT_T(KC_K):
-        case RCTL_T(KC_L):
-        case RSFT_T(KC_SEMICOLON):
-        case ARROWS:
-            return QUICK_TAP_TERM;
-        default:
-            return 0;
-    }
-}
-
-void leader_end_user(void) {
-  if (leader_sequence_one_key(KC_F)) {
-    SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-  }
-  if (leader_sequence_one_key(KC_S)) {
-    SEND_STRING ("sudo -i\n");
-  }
-  if (leader_sequence_one_key(KC_H)) {
-    SEND_STRING ("--help\n");
-  }
-  if (leader_sequence_two_keys(KC_D, KC_D)) {
-    SEND_STRING(SS_LGUI("ac"));
-    /* SEND_STRING(SS_LGUI("a") SS_LGUI("c")); */
-  }
-  if (leader_sequence_three_keys(KC_D, KC_D, KC_S)) {
-    SEND_STRING("https://start.duckduckgo.com\n");
-  }
-  if (leader_sequence_two_keys(KC_A, KC_S)) {
-    register_code(KC_LGUI);
-    register_code(KC_S);
-    unregister_code(KC_S);
-    unregister_code(KC_LGUI);
-  }
-}
-
-void matrix_scan_user(void) {
-  if (is_alt_tab_active) {
-    if (timer_elapsed(alt_tab_timer) > 1000) {
-      unregister_code(KC_LGUI);
-      is_alt_tab_active = false;
-    }
-  }
-}
diff --git a/keyboards/ergodox_ez/keymaps/stamm/readme.md b/keyboards/ergodox_ez/keymaps/stamm/readme.md
deleted file mode 100644
index 9ca886aa922..00000000000
--- a/keyboards/ergodox_ez/keymaps/stamm/readme.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Stamm layouts for ergodox_ez
-
-4 layers:
-
-* QUERTY
-* Numbers
-* Mouse
-* Arrows
-
-On home row there are hold dual keys:
-- shift, ctrl, alt, cmd — on the fingers on the left hand
-- cmd, alt, ctrl, shift — mirrored on the finger on the righ hand
-
-Top row behaves like shifter numbers row.
-Hold E switch to layer with numbers.
-Hold R switch to mouse controll layer.
-
-```
-                                              0_Base
-╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
-│   `    │  !  │  @  │  #  │  $  │  %  │Mute │      │Capsl│  ^  │  &  │  *  │  (  │  )  │   -    │
-├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
-│  Lead  │  Q  │  W  │E|LT1│R|LT2│  T  │     │      │     │  Y  │  U  │  I  │  O  │  P  │   [    │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│Ctrl + B│A | ⇧│S | ⌃│D | ⌥│F | ⌘│  G  ├─────┤      ├─────┤  H  │J | ⌘│K | ⌥│L | ⌃│; | ⇧│   '    │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │  ]  ├─────┼─────┼─────┼─────┼─────┼────────┤
-│   \    │  Z  │  X  │  C  │  V  │  B  │     │      │     │  N  │  M  │  ,  │  .  │  /  │   =    │
-╰──┬─────┼─────┼─────┼─────┼─────┼─────┴─────╯      ╰─────┴─────┼─────┼─────┼─────┼─────┼─────┬──╯
-   │⎇ + T│     │     │     │Arrow│                              │     │     │     │     │     │
-   ╰─────┴─────┴─────┴─────┴─────╯ ╭─────┬─────╮  ╭─────┬─────╮ ╰─────┴─────┴─────┴─────┴─────╯
-                                   │Vol- │Vol+ │  │Play │Next │
-                             ╭─────┼─────┼─────┤  ├─────┼─────┼─────╮
-                             │     │     │     │  │     │     │     │
-                             │Enter│ Tab ├─────┤  ├─────┤Bspac│  ⎵  │
-                             │     │     │ Esc │  │ Esc │     │     │
-                             ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯
-
-                                            1_Numbers
-╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
-│        │ F1  │ F2  │ F3  │ F4  │ F5  │     │      │     │ F6  │ F7  │ F8  │ F9  │ F10 │  F11   │
-├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │     │     │     │     │      │     │     │  7  │  8  │  9  │  *  │  F12   │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │     │     │     ├─────┤      ├─────┤     │  4  │  5  │  6  │  +  │        │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │     │     │     │     │      │     │     │  1  │  2  │  3  │  \  │        │
-╰──┬─────┼─────┼─────┼─────┼─────┼─────┴─────╯      ╰─────┴─────┼─────┼─────┼─────┼─────┼─────┬──╯
-   │Reset│     │     │     │     │                              │  0  │  .  │     │  =  │     │
-   ╰─────┴─────┴─────┴─────┴─────╯ ╭─────┬─────╮  ╭─────┬─────╮ ╰─────┴─────┴─────┴─────┴─────╯
-                                   │     │     │  │     │     │
-                             ╭─────┼─────┼─────┤  ├─────┼─────┼─────╮
-                             │     │     │     │  │     │     │     │
-                             │     │     ├─────┤  ├─────┤     │     │
-                             │     │     │     │  │     │     │     │
-                             ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯
-
-                                             2_Mouse
-╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
-│        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
-├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │     │     │     │     │      │RgbMo│RgbTo│MsBtn│MsUp │MsBtn│     │        │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │     │     │     ├─────┤      ├─────┤RgbSl│MsLef│MsDow│MsRig│     │        │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │Toggl├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │     │     │     │     │      │     │     │MsWhU│     │MsWhD│     │        │
-╰──┬─────┼─────┼─────┼─────┼─────┼─────┴─────╯      ╰─────┴─────┼─────┼─────┼─────┼─────┼─────┬──╯
-   │     │     │     │     │     │                              │     │     │     │     │     │
-   ╰─────┴─────┴─────┴─────┴─────╯ ╭─────┬─────╮  ╭─────┬─────╮ ╰─────┴─────┴─────┴─────┴─────╯
-                                   │RgbHu│RgbHu│  │RgbVa│RgbVa│
-                             ╭─────┼─────┼─────┤  ├─────┼─────┼─────╮
-                             │     │     │     │  │     │     │     │
-                             │     │     ├─────┤  ├─────┤     │     │
-                             │     │     │     │  │     │     │     │
-                             ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯
-
-                                             3_Arrow
-╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
-│        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
-├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │     │     │     ├─────┤      ├─────┤  ←  │  ↓  │  ↑  │  →  │     │        │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
-╰──┬─────┼─────┼─────┼─────┼─────┼─────┴─────╯      ╰─────┴─────┼─────┼─────┼─────┼─────┼─────┬──╯
-   │     │     │     │     │     │                              │     │     │     │     │     │
-   ╰─────┴─────┴─────┴─────┴─────╯ ╭─────┬─────╮  ╭─────┬─────╮ ╰─────┴─────┴─────┴─────┴─────╯
-                                   │     │     │  │     │     │
-                             ╭─────┼─────┼─────┤  ├─────┼─────┼─────╮
-                             │     │     │     │  │     │     │     │
-                             │     │     ├─────┤  ├─────┤     │     │
-                             │     │     │     │  │     │     │     │
-                             ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯
-
-```
-
-Copyright &copy; 2020 Rustam Zagirov. Released under [GPL-2.0](/LICENSE).
diff --git a/keyboards/ergodox_ez/keymaps/stamm/rules.mk b/keyboards/ergodox_ez/keymaps/stamm/rules.mk
deleted file mode 100644
index 619224bef45..00000000000
--- a/keyboards/ergodox_ez/keymaps/stamm/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Set any rules.mk overrides for your specific keymap here.
-# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
-LTO_ENABLE = yes
-COMMAND_ENABLE = no
-LEADER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
-TAP_DANCE_ENABLE = no
diff --git a/keyboards/ergodox_ez/keymaps/steno/keymap.c b/keyboards/ergodox_ez/keymaps/steno/keymap.c
deleted file mode 100644
index 84c18fbd95c..00000000000
--- a/keyboards/ergodox_ez/keymaps/steno/keymap.c
+++ /dev/null
@@ -1,247 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-#define TXBOLT 3 // TxBolt Steno Virtual Serial
-#define TXBOLT2 4 // TxBolt Steno Virtual Serial Alternative Layout
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  TX  |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           | BOLT |------+------+------+------+------+--------|
- * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
- * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
-        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
-        KC_BSPC,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
-                                              ALT_T(KC_APP),  KC_LGUI,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-             KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             TG(TXBOLT),  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
-                          KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
-             MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
-                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          TT(SYMB),
-             KC_LALT,        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | QK_BOOT  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_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_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
-                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-/* Keymap 3: TxBolt (Serial)
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | BKSPC  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   #  |   #  |   #  |   #  |   #  |      |           |      |   #  |   #  |   #  |   #  |   #  |   #    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   S  |   T  |   P  |   H  |   *  |------|           |------|   *  |   F  |   P  |   L  |   T  |   D    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   S  |   K  |   W  |   R  |   *  |      |           |      |   *  |   R  |   B  |   G  |   S  |   Z    |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |   A  |   O  |------|       |------|   E  |   U  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// TxBolt over Serial
-[TXBOLT] = LAYOUT_ergodox(
-       KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-       KC_NO,   STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  KC_NO,
-       KC_NO,   STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1,
-       KC_NO,   STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, KC_NO,
-       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-                                           KC_NO,   KC_NO,
-                                                    KC_NO,
-                                  STN_A,   STN_O,   KC_NO,
-    // right hand
-       KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-       KC_TRNS,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,
-                 STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
-       KC_NO,    STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR,
-                          KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-       KC_NO,   KC_NO,
-       KC_NO,
-       KC_NO,   STN_E,   STN_U
-),
-/* Keymap 4: TxBolt (Serial) Alternative
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |   #  |   #  |   #  |   #  |   #  |      |           |      |   #  |   #  |   #  |   #  |   #  |   #    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   S  |   T  |   P  |   H  |   *  |      |           |      |   *  |   F  |   P  |   L  |   T  |   D    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   S  |   K  |   W  |   R  |   *  |------|           |------|   *  |   R  |   B  |   G  |   S  |   Z    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |   A  |   O  |                                       |   E  |   U  |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// TxBolt over Serial
-[TXBOLT2] = LAYOUT_ergodox(
-       KC_NO,   STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  KC_NO,
-       KC_NO,   STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, KC_NO,
-       KC_NO,   STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2,
-       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-       KC_NO,   KC_NO,   KC_NO,   STN_A,   STN_O,
-                                           KC_NO,   KC_NO,
-                                                    KC_NO,
-                                  KC_NO,   KC_NO,   KC_NO,
-    // right hand
-       KC_NO,    STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,
-       KC_TRNS,  STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
-                 STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR,
-       KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-                          STN_E,   STN_U,   KC_NO,   KC_NO,   KC_NO,
-       KC_NO,   KC_NO,
-       KC_NO,
-       KC_NO,   KC_NO,   KC_NO
-),
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-    steno_set_mode(STENO_MODE_BOLT); // or STENO_MODE_GEMINI
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/ergodox_ez/keymaps/steno/readme.md b/keyboards/ergodox_ez/keymaps/steno/readme.md
deleted file mode 100644
index d67cde2a3cf..00000000000
--- a/keyboards/ergodox_ez/keymaps/steno/readme.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# ErgoDox EZ Steno Configuration
-
-This layout has a layer that uses the TxBolt Stenograph protocol over a Virtual Serial port. It requires something like Plover in order to function.
-
-In Plover, you can select TX Bolt as the Stenotype Machine, and find the COM port that was assigned. In this way, your regular keyboard will still function normally, and you can switch back and forth between the Steno and Keyboard layers.
-
-<pre><code>
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  TX  |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           | BOLT |------+------+------+------+------+--------|
- * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
- * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-/* Keymap 2: Media keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | RESET  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-/* Keymap 3: TxBolt (Serial)
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | BKSPC  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   #  |   #  |   #  |   #  |   #  |      |           |      |   #  |   #  |   #  |   #  |   #  |   #    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   S  |   T  |   P  |   H  |   *  |------|           |------|   *  |   F  |   P  |   L  |   T  |   D    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   S  |   K  |   W  |   R  |   *  |      |           |      |   *  |   R  |   B  |   G  |   S  |   Z    |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |   A  |   O  |------|       |------|   E  |   U  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-</code></pre>
diff --git a/keyboards/ergodox_ez/keymaps/steno/rules.mk b/keyboards/ergodox_ez/keymaps/steno/rules.mk
deleted file mode 100644
index 4b64fd22de6..00000000000
--- a/keyboards/ergodox_ez/keymaps/steno/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-STENO_ENABLE = yes          # Additional protocols for Stenography(+1700), requires VIRTSER
-# Not enough interupts, so something has to go
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/ergodox_ez/keymaps/vim/config.h b/keyboards/ergodox_ez/keymaps/vim/config.h
deleted file mode 100644
index 12928595010..00000000000
--- a/keyboards/ergodox_ez/keymaps/vim/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-#endif
-
-#define NORMAL_MODE 0
-#define INSERT_MODE 1
-#define SYMB 2
-#define MOUSE 3
-
-#include "../../config.h"
diff --git a/keyboards/ergodox_ez/keymaps/vim/keymap.c b/keyboards/ergodox_ez/keymaps/vim/keymap.c
deleted file mode 100644
index c1c037ef234..00000000000
--- a/keyboards/ergodox_ez/keymaps/vim/keymap.c
+++ /dev/null
@@ -1,370 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "quantum_keycodes.h"
-#include "action_layer.h"
-#include "version.h"
-#include "vim.h"
-
-#define VERSION_STRING QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION
-#define X_____X KC_TRNS
-#define KC_ATM LGUI(LSFT(KC_P))
-#define KC_ATP LGUI(LCTL(KC_P))
-#define TO_NORM TO(NORMAL_MODE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Normal mode
-  *
-  * ,--------------------------------------------------.           ,--------------------------------------------------.
-  * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-  * |  TAB   |      | WORD |  END |      |      |      |           |      | YANK | UNDO |      | OPEN |  PUT |        |
-  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-  * |    ⎋   |      |      |  DEL |      |      |------|           |------|  ←   |  ↓   |  ↑   |  →   |      |    ⎋   |
-  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-  * | SHIFT  |      |      |      |VISUAL| BACK |      |           |      |      |      |      |      |      | SHIFT  |
-  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  *   |      |      |      |      |      |                                       |      |      |      |      |      |
-  *   `----------------------------------'                                       `----------------------------------'
-  *                                        ,-------------.       ,-------------.
-  *                                        |      |      |       |      |      |
-  *                                 ,------|------|------|       |------+------+------.
-  *                                 |      |      |      |       |      |      |      |
-  *                                 |SPACE |DELETE|------|       |------|ENTER |BACKSP|
-  *                                 |      |      |      |       |      |      |      |
-  *                                 `--------------------'       `--------------------'
-  */
-  [NORMAL_MODE] = LAYOUT_ergodox(
-    // Layer 2 Left Hand
-    X_____X,X_____X,X_____X,X_____X,X_____X,X_____X,X_____X,
-    KC_TAB ,X_____X,VIM_W,  VIM_E  ,X_____X,X_____X,X_____X,
-    X_____X,VIM_A  ,VIM_S  ,VIM_D  ,X_____X,X_____X,
-    KC_LSFT,X_____X,VIM_X  ,VIM_C  ,VIM_V  ,VIM_B  ,X_____X,
-    KC_LCTL,KC_LALT,X_____X,X_____X,X_____X,
-
-                                            KC_HOME,KC_END ,
-                                            TO(SYMB),
-                                            GUI_T(KC_SPC),  KC_ESC ,_______,
-
-
-    // Layer 2 Right Hand
-                              X_____X,X_____X,X_____X,X_____X,X_____X,X_____X,X_____X,
-                              X_____X,VIM_Y  ,VIM_U  ,VIM_I  ,VIM_O  ,VIM_P  ,X_____X,
-                                      VIM_H  ,VIM_J  ,VIM_K  ,VIM_L  ,X_____X,X_____X,
-                              X_____X,X_____X,X_____X,X_____X,X_____X,X_____X,KC_LSFT,
-                                              X_____X,X_____X,X_____X,KC_RALT,KC_RCTL,
-
-    KC_PGUP,  KC_PGDN,
-    TO(SYMB),
-    KC_DEL , KC_ENT, GUI_T(KC_BSPC)
-),
-
-  /* Insert mode
-  *
-  * ,--------------------------------------------------.           ,--------------------------------------------------.
-  * | NORMAL |   1  |   2  |   3  |   4  |   5  | ⇧⌘P  |           | PROJ |   6  |   7  |   8  |   9  |   0  |   -    |
-  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-  * |    ⇥   |   Q  |   W  |   E  |   R  |   T  |  `   |           |   -  |   Y  |   U  |   I  |   O  |   P  |   \    |
-  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-  * |    ⎋   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
-  * |--------+------+------+------+------+------|   =  |           |   +  |------+------+------+------+------+--------|
-  * |   L⇧   |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  |   R⇧   |
-  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  *   |  ⌃  |   ⌥  |  (   |  [   |   {  |                                       |  }   |  ]   |   )  |   ⌥   |   ⌃  |
-  *   `----------------------------------'                                       `----------------------------------'
-  *                                        ,-------------.       ,-------------.
-  *                                        | HOME | END  |       | PGDN | PGUP |
-  *                                 ,------|------|------|       |------+------+------.
-  *                                 |SPACE |      |      |       |      |      | BSPC |
-  *                                 |      |NORMAL|------|       |------| ENTER|      |
-  *                                 |   ⌘  |      |      |       |      |      |   ⌘  |
-  *                                 `--------------------'       `--------------------'
-  */
-  [INSERT_MODE] = LAYOUT_ergodox(
-    // Left Hand
-    NOR_MOD,KC_1,   KC_2,   KC_3,    KC_4,   KC_5, KC_ATM,
-    KC_TAB ,KC_Q,   KC_W,   KC_E,    KC_R,   KC_T, KC_GRV,
-    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_EQL,
-    KC_LCTL,KC_LALT,KC_LPRN,KC_LBRC, KC_LCBR,
-
-                                            KC_HOME,KC_END ,
-                                            TO(SYMB),
-                                            GUI_T(KC_SPC),KC_ESC ,TO_NORM,
-
-
-    // Right Hand
-                              KC_ATP , KC_6, KC_7,   KC_8,    KC_9,   KC_0,   KC_MINS,
-                              KC_MINS, KC_Y, KC_U,   KC_I,    KC_O,   KC_P,   KC_BSLS,
-                                       KC_H, KC_J,   KC_K,    KC_L,   KC_SCLN,KC_QUOT,
-                              KC_PLUS, KC_N, KC_M,   KC_COMM, KC_DOT, KC_SLSH,KC_RSFT,
-                                             KC_RCBR,KC_RBRC, KC_RPRN,KC_RALT,KC_RCTL,
-
-    KC_PGUP,  KC_PGDN,
-    TO(SYMB),
-    MO(MOUSE) , KC_ENT, GUI_T(KC_BSPC)
-  ),
-
-  [SYMB] = LAYOUT_ergodox(
-    // Left Hand
-    NOR_MOD,KC_1,   KC_2,   KC_3,    KC_4,   KC_5, KC_ATM,
-    KC_TAB ,KC_Q,   KC_W,   KC_E,    KC_R,   KC_T, KC_GRV,
-    _______,KC_A,   KC_S,   KC_D,    KC_F,   KC_G,
-    KC_LSFT,KC_Z,   KC_X,   KC_C,    KC_V,   KC_B, KC_EQL,
-    KC_LCTL,KC_LALT,KC_LPRN,KC_LBRC, KC_LCBR,
-
-                                                                _______,_______,
-                                                                        _______,
-                                                        _______,_______,TO_NORM,
-
-    // Right Hand
-                              KC_ATP , KC_6, KC_7,   KC_8,    KC_9,   KC_0,   KC_MINS,
-                              KC_MINS, KC_Y, KC_U,   KC_I,    KC_O,   KC_P,   KC_BSLS,
-                                       KC_H, KC_J,   KC_K,    KC_L,   KC_SCLN,KC_QUOT,
-                              KC_PLUS, KC_N, KC_M,   KC_COMM, KC_DOT, KC_SLSH,KC_RSFT,
-                                             KC_RCBR,KC_RBRC, KC_RPRN,KC_RALT,KC_RCTL,
-
-    _______,_______,
-    _______,
-    _______,_______,_______
-  ),
-
-  [MOUSE] = LAYOUT_ergodox(
-    // Left Hand
-    _______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,
-
-                                                                _______,_______,
-                                                                        _______,
-                                                        _______,_______,_______,
-
-    // Right Hand
-                              _______,_______,_______,_______,_______,_______,_______,
-                              _______,_______,KC_BTN1,KC_BTN3,KC_BTN2,_______,_______,
-                                      KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______,
-                              _______,_______,_______,_______,_______,_______,_______,
-                                              _______,_______,_______,_______,_______,
-
-    _______,_______,
-    _______,
-    _______,_______,_______
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  bool SHIFTED = (keyboard_report->mods & MOD_BIT(KC_LSFT)) |
-                 (keyboard_report->mods & MOD_BIT(KC_RSFT));
-
-  switch (keycode) {
-
-    case VIM_A:
-      if (record->event.pressed) { SHIFTED ? VIM_APPEND_LINE() : VIM_APPEND(); }
-      return false;
-
-    case VIM_B:
-      if (record->event.pressed) {
-        switch(VIM_QUEUE) {
-          case KC_NO: VIM_BACK(); break;
-          case VIM_C: VIM_CHANGE_BACK(); break;
-          case VIM_D: VIM_DELETE_BACK(); break;
-          case VIM_V: VIM_VISUAL_BACK(); break;
-        }
-      }
-      return false;
-
-    case VIM_C:
-      if (record->event.pressed) {
-        switch(VIM_QUEUE) {
-          case KC_NO: SHIFTED ? VIM_CHANGE_LINE() : VIM_LEADER(VIM_C); break;
-          case VIM_C: VIM_CHANGE_WHOLE_LINE(); break;
-        }
-      }
-      return false;
-
-    case VIM_D:
-      if (record->event.pressed) {
-        switch(VIM_QUEUE) {
-          case KC_NO: SHIFTED ? VIM_DELETE_LINE() : VIM_LEADER(VIM_D); break;
-          case VIM_D: VIM_DELETE_WHOLE_LINE(); break;
-        }
-      }
-      return false;
-
-    case VIM_E:
-      if (record->event.pressed) {
-        switch (VIM_QUEUE) {
-          case KC_NO: VIM_END(); break;
-          case VIM_C: VIM_CHANGE_END(); break;
-          case VIM_D: VIM_DELETE_END(); break;
-          case VIM_V: VIM_VISUAL_END(); break;
-        }
-      }
-      return false;
-
-    case VIM_H:
-      if (record->event.pressed) {
-        switch (VIM_QUEUE) {
-          case KC_NO: VIM_LEFT(); break;
-          case VIM_C: VIM_CHANGE_LEFT(); break;
-          case VIM_D: VIM_DELETE_LEFT(); break;
-          case VIM_V: VIM_VISUAL_LEFT(); break;
-        }
-      }
-      return false;
-
-    case VIM_I:
-      if (record->event.pressed) {
-        switch (VIM_QUEUE) {
-          case KC_NO: layer_on(INSERT_MODE); break;
-          case VIM_C: VIM_LEADER(VIM_CI); break;
-          case VIM_D: VIM_LEADER(VIM_DI); break;
-          case VIM_V: VIM_LEADER(VIM_VI); break;
-        }
-      }
-      return false;
-
-    case VIM_J:
-      if (record->event.pressed) {
-        switch (VIM_QUEUE) {
-          case KC_NO: SHIFTED ? VIM_JOIN() : VIM_DOWN(); break;
-          case VIM_C: VIM_CHANGE_DOWN(); break;
-          case VIM_D: VIM_DELETE_DOWN(); break;
-          case VIM_V: VIM_VISUAL_DOWN(); break;
-        }
-      }
-      return false;
-
-    case VIM_K:
-      if (record->event.pressed) {
-        switch (VIM_QUEUE) {
-          case KC_NO: VIM_UP(); break;
-          case VIM_C: VIM_CHANGE_UP(); break;
-          case VIM_D: VIM_DELETE_UP(); break;
-          case VIM_V: VIM_VISUAL_UP(); break;
-        }
-      }
-      return false;
-
-    case VIM_L:
-      if (record->event.pressed) {
-        switch (VIM_QUEUE) {
-          case KC_NO: VIM_RIGHT(); break;
-          case VIM_C: VIM_CHANGE_RIGHT(); break;
-          case VIM_D: VIM_DELETE_RIGHT(); break;
-          case VIM_V: VIM_VISUAL_RIGHT(); break;
-        }
-      }
-      return false;
-
-    case VIM_O:
-      if (record->event.pressed) { SHIFTED ? VIM_OPEN_ABOVE() : VIM_OPEN(); }
-      return false;
-
-    case VIM_P:
-      if (record->event.pressed) { SHIFTED ? VIM_PUT_BEFORE() : VIM_PUT(); }
-      return false;
-
-    case VIM_S:
-      if (record->event.pressed) { SHIFTED ? VIM_CHANGE_WHOLE_LINE() : VIM_SUBSTITUTE(); }
-      return false;
-
-    case VIM_U:
-      if (record->event.pressed) { VIM_UNDO(); }
-      return false;
-
-    case VIM_V:
-      if (record->event.pressed) { VIM_LEADER(VIM_V); }
-      return false;
-
-    case VIM_W:
-      if (record->event.pressed) {
-        switch (VIM_QUEUE) {
-          case KC_NO: VIM_WORD(); break;
-          case VIM_C: VIM_CHANGE_WORD(); break;
-          case VIM_CI: VIM_CHANGE_INNER_WORD(); break;
-          case VIM_D: VIM_DELETE_WORD(); break;
-          case VIM_DI: VIM_DELETE_INNER_WORD(); break;
-          case VIM_V: VIM_VISUAL_WORD(); break;
-          case VIM_VI: VIM_VISUAL_INNER_WORD(); break;
-        }
-      }
-      return false;
-
-    case VIM_X:
-      if (record->event.pressed) { VIM_CUT(); }
-      return false;
-
-    case VIM_Y:
-      if (record->event.pressed) { SHIFTED ? VIM_YANK_LINE() : VIM_YANK(); }
-      return false;
-
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) { eeconfig_init(); }
-      return false;
-    case VRSN:
-      if (record->event.pressed) { SEND_STRING(VERSION_STRING); }
-      return false;
-    case RGB_SLD:
-      if (record->event.pressed) { rgblight_mode(1); }
-      return false;
-  }
-
-  // End by clearing the queue unless keycode is a
-  // if ((record->event.pressed) &&
-  //     (keycode != VIM_I ||
-  //     keycode != VIM_C ||
-  //     keycode != VIM_D ||
-  //     keycode != VIM_V)) {
-  //   VIM_LEADER(KC_NO);
-  // }
-
-  return true;
-};
-
-void matrix_init_user(void) {
-  debug_enable = true;
-  VIM_LEADER(KC_NO);
-};
-
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            break;
-        case 5:
-            ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-            break;
-        case 6:
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        case 7:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        default:
-            break;
-    }
-
-};
diff --git a/keyboards/ergodox_ez/keymaps/vim/readme.md b/keyboards/ergodox_ez/keymaps/vim/readme.md
deleted file mode 100644
index 8f7c6852446..00000000000
--- a/keyboards/ergodox_ez/keymaps/vim/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Vim-like keymap for macOS
-
-This keymap adds vim emulation to the keyboard firmware. Layer 0 is 'normal mode', providing a number of commands like `w`, `e`, `a`, `dw`, etc.
-
-The keymap works by using macOS text-editing shortcuts, so currently it only chooches on macOS.
diff --git a/keyboards/ergodox_ez/keymaps/vim/rules.mk b/keyboards/ergodox_ez/keymaps/vim/rules.mk
deleted file mode 100644
index 6c605daecf5..00000000000
--- a/keyboards/ergodox_ez/keymaps/vim/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/ergodox_ez/keymaps/vim/vim.h b/keyboards/ergodox_ez/keymaps/vim/vim.h
deleted file mode 100644
index 2f3b859943d..00000000000
--- a/keyboards/ergodox_ez/keymaps/vim/vim.h
+++ /dev/null
@@ -1,755 +0,0 @@
-#include "config.h"
-#include "print.h"
-#include "keycode.h"
-#include "quantum.h"
-#include "quantum_keycodes.h"
-
-#define NOR_MOD TO(NORMAL_MODE)
-#define INS_MOD TO(INSERT_MODE)
-
-#define PRESS(keycode) register_code16(keycode)
-#define RELEASE(keycode) unregister_code16(keycode)
-
-uint16_t VIM_QUEUE = KC_NO;
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VIM_A,
-  VIM_B,
-  VIM_C,
-  VIM_CI,
-  VIM_D,
-  VIM_DI,
-  VIM_E,
-  VIM_H,
-  VIM_I,
-  VIM_J,
-  VIM_K,
-  VIM_L,
-  VIM_O,
-  VIM_P,
-  VIM_S,
-  VIM_U,
-  VIM_V,
-  VIM_VI,
-  VIM_W,
-  VIM_X,
-  VIM_Y,
-  EPRM,
-  VRSN,
-  RGB_SLD,
-};
-
-void VIM_APPEND(void);
-void VIM_APPEND_LINE(void);
-void VIM_BACK(void);
-void VIM_CHANGE_BACK(void);
-void VIM_CHANGE_DOWN(void);
-void VIM_CHANGE_END(void);
-void VIM_CHANGE_INNER_WORD(void);
-void VIM_CHANGE_LEFT(void);
-void VIM_CHANGE_LINE(void);
-void VIM_CHANGE_RIGHT(void);
-void VIM_CHANGE_UP(void);
-void VIM_CHANGE_WHOLE_LINE(void);
-void VIM_CHANGE_WORD(void);
-void VIM_CUT(void);
-void VIM_DELETE_BACK(void);
-void VIM_DELETE_DOWN(void);
-void VIM_DELETE_END(void);
-void VIM_DELETE_INNER_WORD(void);
-void VIM_DELETE_LEFT(void);
-void VIM_DELETE_LINE(void);
-void VIM_DELETE_RIGHT(void);
-void VIM_DELETE_UP(void);
-void VIM_DELETE_WHOLE_LINE(void);
-void VIM_DELETE_WORD(void);
-void VIM_END(void);
-void VIM_JOIN(void);
-void VIM_OPEN(void);
-void VIM_OPEN_ABOVE(void);
-void VIM_PUT(void);
-void VIM_SUBSTITUTE(void);
-void VIM_UNDO(void);
-void VIM_VISUAL_BACK(void);
-void VIM_VISUAL_DOWN(void);
-void VIM_VISUAL_END(void);
-void VIM_VISUAL_INNER_WORD(void);
-void VIM_VISUAL_LEFT(void);
-void VIM_VISUAL_RIGHT(void);
-void VIM_VISUAL_UP(void);
-void VIM_VISUAL_WORD(void);
-void VIM_WORD(void);
-void VIM_YANK(void);
-
-void TAP(uint16_t keycode) {
-    PRESS(keycode);
-    RELEASE(keycode);
-}
-
-void CMD(uint16_t keycode) {
-  PRESS(KC_LGUI);
-    TAP(keycode);
-  RELEASE(KC_LGUI);
-}
-
-void CTRL(uint16_t keycode) {
-  PRESS(KC_LCTL);
-    TAP(keycode);
-  RELEASE(KC_LCTL);
-}
-
-void SHIFT(uint16_t keycode) {
-  PRESS(KC_LSFT);
-    TAP(keycode);
-  RELEASE(KC_LSFT);
-}
-
-void ALT(uint16_t keycode) {
-  PRESS(KC_LALT);
-    TAP(keycode);
-  RELEASE(KC_LALT);
-}
-
-/**
- * Sets the `VIM_QUEUE` variable to the incoming keycode.
- * Pass `KC_NO` to cancel the operation.
- * @param keycode
- */
-void VIM_LEADER(uint16_t keycode) {
-  VIM_QUEUE = keycode;
-  switch(keycode) {
-    case VIM_C: print("\e[32mc\e[0m"); break;
-    case VIM_CI: print("\e[32mi\e[0m"); break;
-    case VIM_D: print("\e[32md\e[0m"); break;
-    case VIM_DI: print("\e[32mi\e[0m"); break;
-    case VIM_V: print("\e[32mv\e[0m"); break;
-    case VIM_VI: print("\e[32mi\e[0m"); break;
-    case KC_NO: print("❎"); break;
-  }
-}
-
-/***
- *     #######  #     #  #######       #####   #     #  #######  #######
- *     #     #  ##    #  #            #     #  #     #  #     #     #
- *     #     #  # #   #  #            #        #     #  #     #     #
- *     #     #  #  #  #  #####         #####   #######  #     #     #
- *     #     #  #   # #  #                  #  #     #  #     #     #
- *     #     #  #    ##  #            #     #  #     #  #     #     #
- *     #######  #     #  #######       #####   #     #  #######     #
- *
- */
-
-/**
- * Vim-like `append` command.
- * Works by sending →.
- */
-void VIM_APPEND(void) {
-  print("\e[31ma\e[0m");
-  TAP(KC_RIGHT);
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `back` command
- * Simulates vim's `b` command by sending ⌥←
- */
-void VIM_BACK(void) {
-  print("\e[31mb\e[0m");
-  ALT(KC_LEFT);
-}
-
-/**
- * Vim-like `cut` command
- * Simulates vim's `x` command by sending ⇧→ then ⌘X.
- */
-void VIM_CUT(void) {
-  print("\e[31mx\e[0m");
-  SHIFT(KC_RIGHT);
-  CMD(KC_X);
-}
-
-/**
- * Vim-like `down` command
- * Sends ↓
- */
-void VIM_DOWN(void) {
-  print("\e[31mj\e[0m");
-  TAP(KC_DOWN);
-}
-
-/**
- * Vim-like `end` command
- * Simulates vim's `e` command by sending ⌥→
- */
-void VIM_END(void) {
-  print("\e[31me\e[0m");
-  ALT(KC_RIGHT);
-}
-
-/**
- * Vim-like `left` command
- * Sends ←
- */
-void VIM_LEFT(void) {
-  print("\e[31mh\e[0m");
-  VIM_LEADER(KC_NO);
-  TAP(KC_LEFT);
-}
-
-/**
- * Vim-like `open` command.
- * Works by sending ⌘→ to move to the end of the line, `enter` to open a new line,
- * then switching to insert mode.
- */
-void VIM_OPEN(void) {
-  print("\e[31mo\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_RIGHT);
-  TAP(KC_ENTER);
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `put` command
- * Simulates vim's `p` command by sending ⌘V
- */
-void VIM_PUT(void) {
-  print("\e[31mp\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_V);
-}
-
-/**
- * Vim-like `put before` command
- * Simulates vim's `P` command by sending ↑, ⌘←, then ⌘V
- */
-void VIM_PUT_BEFORE(void) {
-  print("\e[31mP\e[0m");
-  VIM_LEADER(KC_NO);
-  TAP(KC_UP);
-  CMD(KC_LEFT);
-  CMD(KC_V);
-}
-
-/**
- * Vim-like `right` command
- * Sends →
- */
-void VIM_RIGHT(void) {
-  print("\e[31ml\e[0m");
-  VIM_LEADER(KC_NO);
-  TAP(KC_RIGHT);
-}
-
-/**
- * Vim-like `substitute` command
- * Simulates vim's `s` command by sending ⇧→ to select the next character, then
- * ⌘X to cut it, then entering insert mode.
- */
-void VIM_SUBSTITUTE(void) {
-  print("\e[31ms\e[0m");
-  VIM_LEADER(KC_NO);
-  SHIFT(KC_RIGHT);
-  CMD(KC_X);
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `undo` command
- * Simulates vim's `u` command by sending ⌘Z
- */
-void VIM_UNDO(void) {
-  print("\e[31mu\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_Z);
-}
-
-/**
- * Vim-like `up` command
- * Sends ↑
- */
-void VIM_UP(void) {
-  print("\e[31mk\e[0m");
-  VIM_LEADER(KC_NO);
-  TAP(KC_UP);
-}
-
-/**
- * Vim-like `word` command
- * Simulates vim's `w` command by moving the cursor first to the
- * end of the current word, then to the end of the next word,
- * then to the beginning of that word.
- */
-void VIM_WORD(void) {
-  print("\e[31mw\e[0m");
-  VIM_LEADER(KC_NO);
-  PRESS(KC_LALT);
-    TAP(KC_RIGHT);
-    TAP(KC_RIGHT);
-    TAP(KC_LEFT);
-  RELEASE(KC_LALT);
-}
-
-/**
- * Vim-like `yank` command
- * Simulates vim's `y` command by sending ⌘C
- */
-void VIM_YANK(void) {
-  print("\e[31my\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_C);
-}
-
-/**
- * Vim-like `yank line` command
- * Simulates vim's `y` command by sending ⌘← then ⇧⌘→ then ⌘C
- */
-void VIM_YANK_LINE(void) {
-  print("\e[31mY\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_LEFT);
-  PRESS(KC_LSFT);
-    CMD(KC_RIGHT);
-  RELEASE(KC_LSFT);
-  CMD(KC_C);
-}
-
-/***
- *      #####   #     #  ###  #######  #######  #######  ######
- *     #     #  #     #   #   #           #     #        #     #
- *     #        #     #   #   #           #     #        #     #
- *      #####   #######   #   #####       #     #####    #     #
- *           #  #     #   #   #           #     #        #     #
- *     #     #  #     #   #   #           #     #        #     #
- *      #####   #     #  ###  #           #     #######  ######
- *
- */
-
-/**
- * Vim-like `append to line` command
- * Simulates vim's `A` command by sending ⌘→ then switching to insert mode.
- */
-void VIM_APPEND_LINE(void) {
-  print("\e[31mA\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_RIGHT);
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `change line` command
- * Simulates vim's `C` command by sending ⌃K then switching to insert mode.
- */
-void VIM_CHANGE_LINE(void) {
-  print("\e[31mC\e[0m");
-  VIM_LEADER(KC_NO);
-  VIM_DELETE_LINE();
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like 'delete line' command
- * Simulates vim's `D` command by sending ⌃K to kill the line
- */
-void VIM_DELETE_LINE(void) {
-  print("\e[31mD\e[0m");
-  VIM_LEADER(KC_NO);
-  CTRL(KC_K);
-}
-
-/**
- * Vim-like 'join lines' command
- * Simulates vim's `J` command by sending ⌘→ to go to the end of the line, then
- * DELETE to join the lines
- */
-void VIM_JOIN(void) {
-  print("\e[31mJ\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_RIGHT);
-  TAP(KC_DELETE);
-  VIM_LEADER(KC_NO);
-}
-
-/**
- * Vim-like 'open above' command
- * Simulates vim's `O` command by sending ⌘→ to go to the start of the line,
- * enter to move the line down, ↑ to move up to the new line, then switching to
- * insert mode.
- */
-void VIM_OPEN_ABOVE(void) {
-  print("\e[31mO\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_LEFT);
-  TAP(KC_ENTER);
-  TAP(KC_UP);
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like 'change whole line' command
- * Simulates vim's `S` `cc` or `c$` commands by sending ⌘← to go to the start of the line,
- * ⌃K to kill the line, then switching to insert mode.
- */
-void VIM_CHANGE_WHOLE_LINE(void) {
-  print("\e[31mS\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_LEFT);
-  VIM_CHANGE_LINE();
-}
-
-/***
- *     ######       ######   ######   #######  #######  ###  #     #  #######  ######
- *     #     #      #     #  #     #  #        #         #    #   #   #        #     #
- *     #     #      #     #  #     #  #        #         #     # #    #        #     #
- *     #     #      ######   ######   #####    #####     #      #     #####    #     #
- *     #     #      #        #   #    #        #         #     # #    #        #     #
- *     #     #      #        #    #   #        #         #    #   #   #        #     #
- *     ######       #        #     #  #######  #        ###  #     #  #######  ######
- *
- */
-
-/**
- * Vim-like `delete to end` command
- * Simulates vim's `de` command by sending ⌥⇧→ then ⌘X.
- */
-void VIM_DELETE_END(void) {
-  print("\e[31me\e[0m");
-  VIM_LEADER(KC_NO);
-  PRESS(KC_LALT);
-    SHIFT(KC_RIGHT); // select to end of this word
-  RELEASE(KC_LALT);
-  CMD(KC_X);
-}
-
-/**
- * Vim-like `delete whole line` command
- * Simulates vim's `dd` command by sending ⌘← to move to start of line,
- * selecting the whole line, then sending ⌘X to cut the line.
- * alternate method: ⌘⌫, ⌃K
- */
-void VIM_DELETE_WHOLE_LINE(void) {
-  print("\e[31md\e[0m");
-  VIM_LEADER(KC_NO);
-  CMD(KC_LEFT);
-  PRESS(KC_LSFT);
-    CMD(KC_RIGHT);
-  RELEASE(KC_LSFT);
-  CMD(KC_X);
-}
-
-/**
- * Vim-like `delete word` command
- * Simulates vim's `dw` command by sending ⌥⇧→→← then ⌘X to select to the start
- * of the next word then cut.
- */
-void VIM_DELETE_WORD(void) {
-  print("\e[31mw\e[0m");
-  VIM_LEADER(KC_NO);
-  PRESS(KC_LALT);
-    SHIFT(KC_RIGHT); // select to end of this word
-    SHIFT(KC_RIGHT); // select to end of next word
-    SHIFT(KC_LEFT); // select to start of next word
-  RELEASE(KC_LALT);
-  CMD(KC_X); // delete selection
-}
-
-/**
- * Vim-like `delete back` command
- * Simulates vim's `db` command by selecting to the end of the word then deleting.
- */
-void VIM_DELETE_BACK(void) {
-  print("\e[31mb\e[0m");
-  VIM_LEADER(KC_NO);
-  PRESS(KC_LALT);
-    SHIFT(KC_LEFT); // select to start of word
-    SHIFT(KC_DEL); // delete selection
-  RELEASE(KC_LSFT);
-}
-
-/**
- * Vim-like `delete left` command
- * Simulates vim's `dh` command by sending ⇧← then ⌘X.
- */
-void VIM_DELETE_LEFT(void) {
-  print("\e[31mh\e[0m");
-  VIM_LEADER(KC_NO);
-  SHIFT(KC_LEFT);
-  CMD(KC_X);
-}
-
-/**
- * Vim-like `delete right` command
- * Simulates vim's `dl` command by sending ⇧→ then ⌘X.
- */
-void VIM_DELETE_RIGHT(void) {
-  print("\e[31ml\e[0m");
-  VIM_LEADER(KC_NO);
-  SHIFT(KC_RIGHT);
-  CMD(KC_X);
-}
-
-/**
- * Vim-like `delete up` command
- * Simulates vim's `dk` command by sending ↑ then deleting the line.
- */
-void VIM_DELETE_UP(void) {
-  print("\e[31mk\e[0m");
-  VIM_LEADER(KC_NO);
-  TAP(KC_UP);
-  VIM_DELETE_LINE();
-}
-
-/**
- * Vim-like `delete down` command
- * Simulates vim's `dj` command by sending ↓ then deleting the line.
- */
-void VIM_DELETE_DOWN(void) {
-  print("\e[31mj\e[0m");
-  VIM_LEADER(KC_NO);
-  TAP(KC_DOWN);
-  VIM_DELETE_LINE();
-}
-
-/***
- *     ######   ###      ######   ######   #######  #######  ###  #     #  #######  ######
- *     #     #   #       #     #  #     #  #        #         #    #   #   #        #     #
- *     #     #   #       #     #  #     #  #        #         #     # #    #        #     #
- *     #     #   #       ######   ######   #####    #####     #      #     #####    #     #
- *     #     #   #       #        #   #    #        #         #     # #    #        #     #
- *     #     #   #       #        #    #   #        #         #    #   #   #        #     #
- *     ######   ###      #        #     #  #######  #        ###  #     #  #######  ######
- *
- */
-
-/**
- * Vim-like `delete inner word` command
- * Simulates vim's `diw` command by moving back then cutting to the end of the word.
- */
-void VIM_DELETE_INNER_WORD(void) {
-  print("\e[31mw\e[0m");
-  VIM_LEADER(KC_NO);
-  VIM_BACK();
-  VIM_DELETE_END();
-}
-
-/***
- *      #####        ######   ######   #######  #######  ###  #     #  #######  ######
- *     #     #       #     #  #     #  #        #         #    #   #   #        #     #
- *     #             #     #  #     #  #        #         #     # #    #        #     #
- *     #             ######   ######   #####    #####     #      #     #####    #     #
- *     #             #        #   #    #        #         #     # #    #        #     #
- *     #     #       #        #    #   #        #         #    #   #   #        #     #
- *      #####        #        #     #  #######  #        ###  #     #  #######  ######
- *
- */
-
-/**
- * Vim-like `change back` command
- * Simulates vim's `cb` command by first deleting to the start of the word,
- * then switching to insert mode.
- */
-void VIM_CHANGE_BACK(void) {
-  print("\e[31mb\e[0m");
-  VIM_LEADER(KC_NO);
-  VIM_DELETE_BACK();
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `change down` command
- * Simulates vim's `cj` command by sending ↓ then changing the line.
- */
-void VIM_CHANGE_DOWN(void) {
-  print("\e[31mj\e[0m");
-  VIM_LEADER(KC_NO);
-  VIM_DELETE_DOWN();
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `change to end` command
- * Simulates vim's `ce` command by first deleting to the end of the word,
- * then switching to insert mode.
- */
-void VIM_CHANGE_END(void) {
-  print("\e[31mce\e[0m");
-  VIM_LEADER(KC_NO);
-  VIM_DELETE_END();
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `change left` command
- * Simulates vim's `ch` command by deleting left then switching to insert mode.
- */
-void VIM_CHANGE_LEFT(void) {
-  print("\e[31mch\e[0m");
-  VIM_LEADER(KC_NO);
-  VIM_DELETE_LEFT();
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `change right` command
- * Simulates vim's `cl` command by deleting right then switching to insert mode.
- */
-void VIM_CHANGE_RIGHT(void) {
-  print("\e[31mcl\e[0m");
-  VIM_DELETE_RIGHT();
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `change up` command
- * Simulates vim's `ck` command by deleting up then switching to insert mode.
- */
-void VIM_CHANGE_UP(void) {
-  print("\e[31mck\e[0m");
-  VIM_DELETE_UP();
-  layer_on(INSERT_MODE);
-}
-
-/**
- * Vim-like `change word` command
- * Simulates vim's `cw` command by first deleting to the end of the word,
- * then switching to insert mode.
- */
-void VIM_CHANGE_WORD(void) {
-  print("\e[31mcw\e[0m");
-  VIM_LEADER(KC_NO);
-  VIM_DELETE_WORD();
-  layer_on(INSERT_MODE);
-}
-
-/***
- *      #####   ###      ######   ######   #######  #######  ###  #     #  #######  ######
- *     #     #   #       #     #  #     #  #        #         #    #   #   #        #     #
- *     #         #       #     #  #     #  #        #         #     # #    #        #     #
- *     #         #       ######   ######   #####    #####     #      #     #####    #     #
- *     #         #       #        #   #    #        #         #     # #    #        #     #
- *     #     #   #       #        #    #   #        #         #    #   #   #        #     #
- *      #####   ###      #        #     #  #######  #        ###  #     #  #######  ######
- *
- */
-
-/**
- * Vim-like `change inner word` command
- * Simulates vim's `ciw` command by deleting the inner word then switching to insert mode.
- */
-void VIM_CHANGE_INNER_WORD(void) {
-  print("\e[31mciw\e[0m");
-  VIM_DELETE_INNER_WORD();
-  layer_on(INSERT_MODE);
-}
-
-/***
- *     #     #      ######   ######   #######  #######  ###  #     #  #######  ######
- *     #     #      #     #  #     #  #        #         #    #   #   #        #     #
- *     #     #      #     #  #     #  #        #         #     # #    #        #     #
- *     #     #      ######   ######   #####    #####     #      #     #####    #     #
- *      #   #       #        #   #    #        #         #     # #    #        #     #
- *       # #        #        #    #   #        #         #    #   #   #        #     #
- *        #         #        #     #  #######  #        ###  #     #  #######  ######
- *
- */
-
-/**
- * Vim-like `visual select back` command
- * Simulates vim's `vb` command by selecting to the enc of the word.
- */
-void VIM_VISUAL_BACK(void) {
-  print("\e[31mvb\e[0m");
-  VIM_LEADER(KC_NO);
-  PRESS(KC_LALT);
-    SHIFT(KC_LEFT); // select to start of word
-  RELEASE(KC_LALT);
-}
-
-/**
- * Vim-like `visual select to end` command
- * Simulates vim's `ve` command by selecting to the end of the word.
- */
-void VIM_VISUAL_END(void) {
-  print("\e[31mve\e[0m");
-  VIM_LEADER(KC_NO);
-  PRESS(KC_LALT);
-    SHIFT(KC_RIGHT); // select to end of this word
-  RELEASE(KC_LALT);
-}
-
-/**
- * Vim-like `visual select word` command
- * Simulates vim's `vw` command by selecting to the end of the word.
- */
-void VIM_VISUAL_WORD(void) {
-  print("\e[31mvw\e[0m");
-  VIM_LEADER(KC_NO);
-  PRESS(KC_LALT);
-    SHIFT(KC_RIGHT); // select to end of this word
-    SHIFT(KC_RIGHT); // select to end of next word
-    SHIFT(KC_LEFT); // select to start of next word
-  RELEASE(KC_LALT);
-}
-
-/**
- * Vim-like `visual left` command
- * Simulates vim's `vh` command by sending ⇧←.
- */
-void VIM_VISUAL_LEFT(void) {
-  print("\e[31mvh\e[0m");
-  VIM_LEADER(KC_NO);
-  SHIFT(KC_LEFT);
-}
-
-/**
- * Vim-like `visual right` command
- * Simulates vim's `vl` command by sending ⇧→.
- */
-void VIM_VISUAL_RIGHT(void) {
-  print("\e[31mvl\e[0m");
-  VIM_LEADER(KC_NO);
-  SHIFT(KC_RIGHT);
-}
-
-/**
- * Vim-like `visual up` command
- * Simulates vim's `vk` command by sending ⇧↑.
- */
-void VIM_VISUAL_UP(void) {
-  print("\e[31mvk\e[0m");
-  VIM_LEADER(KC_NO);
-  SHIFT(KC_UP);
-}
-
-/**
- * Vim-like `visual down` command
- * Simulates vim's `vj` command by sending ⇧↓.
- */
-void VIM_VISUAL_DOWN(void) {
-  print("\e[31mdj\e[0m");
-  VIM_LEADER(KC_NO);
-  SHIFT(KC_DOWN);
-}
-
-/***
- *     #     #  ###      ######   ######   #######  #######  ###  #     #  #######  ######
- *     #     #   #       #     #  #     #  #        #         #    #   #   #        #     #
- *     #     #   #       #     #  #     #  #        #         #     # #    #        #     #
- *     #     #   #       ######   ######   #####    #####     #      #     #####    #     #
- *      #   #    #       #        #   #    #        #         #     # #    #        #     #
- *       # #     #       #        #    #   #        #         #    #   #   #        #     #
- *        #     ###      #        #     #  #######  #        ###  #     #  #######  ######
- *
- */
-
-/**
- * Vim-like `visual inner word` command
- * Simulates vim's `viw` command by moving back then selecting to the end of the word.
- */
-void VIM_VISUAL_INNER_WORD(void) {
-  print("\e[31mviw\e[0m");
-  VIM_LEADER(KC_NO);
-  VIM_BACK();
-  VIM_VISUAL_END();
-}
diff --git a/keyboards/ergodox_ez/led_i2c.c b/keyboards/ergodox_ez/led_i2c.c
index 23ef91b74fe..80dabf48150 100644
--- a/keyboards/ergodox_ez/led_i2c.c
+++ b/keyboards/ergodox_ez/led_i2c.c
@@ -21,35 +21,50 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
 
 #    include "ergodox_ez.h"
+#    include "ws2812.h"
 
-void rgblight_call_driver(rgb_led_t *led, uint8_t led_num) {
-    i2c_init();
-    i2c_start(0x84, ERGODOX_EZ_I2C_TIMEOUT);
+void setleds_custom(rgb_led_t *led, uint16_t led_num) {
+    uint16_t length = 0;
     int i = 0;
+    int j = 0;
+#    ifdef RGBW
+    int bytes_per_led = 4;
+#    else
+    int bytes_per_led = 3;
+#    endif
 #    if defined(ERGODOX_LED_30)
     // prevent right-half code from trying to bitbang all 30
     // so with 30 LEDs, we count from 29 to 15 here, and the
     // other half does 0 to 14.
-    uint8_t half_led_num = RGBLED_NUM / 2;
+    uint8_t half_led_num = RGBLIGHT_LED_COUNT / 2;
+    length = half_led_num * bytes_per_led;
+    uint8_t data[length];
     for (i = half_led_num + half_led_num - 1; i >= half_led_num; --i)
 #    elif defined(ERGODOX_LED_15_MIRROR)
+    length = led_num * bytes_per_led;
+    uint8_t data[length];
     for (i = 0; i < led_num; ++i)
 #    else  // ERGDOX_LED_15 non-mirrored
+    length = led_num * bytes_per_led;
+    uint8_t data[length];
     for (i = led_num - 1; i >= 0; --i)
 #    endif
     {
-        uint8_t *data = (uint8_t *)(led + i);
-        i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
-        i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
-        i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
+        uint8_t *data_byte = (uint8_t *)(led + i);
+        data[j++] = data_byte[0];
+        data[j++] = data_byte[1];
+        data[j++] = data_byte[2];
 #ifdef RGBW
-        i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
+        data[j++] = data_byte[3];
 #endif
     }
-    i2c_stop();
+    i2c_transmit(0x84, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT);
 
     ws2812_setleds(led, led_num);
 }
 
+const rgblight_driver_t rgblight_driver = {
+    .setleds = setleds_custom,
+};
 
 #endif  // RGBLIGHT_ENABLE
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index e84a5e2bd38..28bee05779c 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -146,13 +146,8 @@ static matrix_row_t read_cols(uint8_t row) {
             uint8_t data = 0;
             // reading GPIOB (column port) since in mcp23018's sequential mode
             // it is addressed directly after writing to GPIOA in select_row()
-            mcp23018_status = i2c_start(I2C_ADDR_READ, ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-            mcp23018_status = i2c_read_nack(ERGODOX_EZ_I2C_TIMEOUT);               if (mcp23018_status < 0) goto out;
-            data            = ~((uint8_t)mcp23018_status);
-            mcp23018_status = I2C_STATUS_SUCCESS;
-        out:
-            i2c_stop();
-            return data;
+            mcp23018_status = i2c_receive(I2C_ADDR, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
+            return ~data;
         }
     } else {
         /* read from teensy
@@ -196,11 +191,9 @@ static void select_row(uint8_t row) {
         if (!mcp23018_status) {
             // set active row low  : 0
             // set other rows hi-Z : 1
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT);                 if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(0xFF & ~(1 << row), ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-        out:
-            i2c_stop();
+            uint8_t data;
+            data = 0xFF & ~(1 << row);
+            mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
         }
     } else {
         // select on teensy
diff --git a/keyboards/ergodox_ez/post_config.h b/keyboards/ergodox_ez/post_config.h
index 0d4fe5c6832..eb22439ae4f 100644
--- a/keyboards/ergodox_ez/post_config.h
+++ b/keyboards/ergodox_ez/post_config.h
@@ -33,8 +33,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef ERGODOX_LED_30
 // If using 30 LEDs, then define that many
-#    define RGBLED_NUM 30  // Number of LEDs
+#    define RGBLIGHT_LED_COUNT 30  // Number of LEDs
 #else
 // If not, then only define 15
-#    define RGBLED_NUM 15  // Number of LEDs
+#    define RGBLIGHT_LED_COUNT 15  // Number of LEDs
 #endif
diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/info.json
index 11c3a8b209b..181ac52e6ce 100644
--- a/keyboards/ergodox_ez/shine/info.json
+++ b/keyboards/ergodox_ez/shine/info.json
@@ -2,5 +2,8 @@
     "keyboard_name": "ErgoDox EZ Shine",
     "usb": {
         "pid": "0x4975"
+    },
+    "rgblight": {
+        "driver": "custom"
     }
 }
diff --git a/keyboards/ergodox_ez/shine/rules.mk b/keyboards/ergodox_ez/shine/rules.mk
index 1e3cebb1451..b035c368503 100644
--- a/keyboards/ergodox_ez/shine/rules.mk
+++ b/keyboards/ergodox_ez/shine/rules.mk
@@ -1 +1,2 @@
 RGBLIGHT_ENABLE = yes
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/ergodox_stm32/ergodox_stm32.c
index 2a919506dc5..99d51866f7b 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.c
+++ b/keyboards/ergodox_stm32/ergodox_stm32.c
@@ -59,16 +59,16 @@ uint8_t init_mcp23017(void) {
     uint8_t data[2];
     data[0] = 0x0;
     data[1] = 0b00111111;
-    mcp23017_status = i2c_writeReg(I2C_ADDR, I2C_IODIRA, data, 2, 50000);
+    mcp23017_status = i2c_write_register(I2C_ADDR, I2C_IODIRA, data, 2, 50000);
     if (mcp23017_status) goto out;
     data[0] = 0xFFU;
-    mcp23017_status = i2c_writeReg(I2C_ADDR, I2C_GPIOA, data, 1, 5000);
+    mcp23017_status = i2c_write_register(I2C_ADDR, I2C_GPIOA, data, 1, 5000);
     if (mcp23017_status) goto out;
-    mcp23017_status = i2c_writeReg(I2C_ADDR, I2C_GPPUB, data+1, 1, 2);
+    mcp23017_status = i2c_write_register(I2C_ADDR, I2C_GPPUB, data+1, 1, 2);
     if (mcp23017_status) goto out;
 
  out:
     return mcp23017_status;
-    // i2c_readReg(I2C_ADDR, );
+    // i2c_read_register(I2C_ADDR, );
 }
 
diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/ergodox_stm32/matrix.c
index 3eb35cd7bbe..6acd2dda225 100644
--- a/keyboards/ergodox_stm32/matrix.c
+++ b/keyboards/ergodox_stm32/matrix.c
@@ -134,7 +134,7 @@ static matrix_row_t read_cols(uint8_t row) {
     uint8_t data = 0xFF;
     if (!mcp23017_status) {
       uint8_t regAddr = I2C_GPIOB;
-      mcp23017_status = i2c_readReg(I2C_ADDR, regAddr, &data, 1, 10);
+      mcp23017_status = i2c_read_register(I2C_ADDR, regAddr, &data, 1, 10);
     }
     if (mcp23017_status) {
       return 0;
@@ -174,7 +174,7 @@ static void select_row(uint8_t row) {
   if (row < MATRIX_ROWS_PER_SIDE) {
     if (!mcp23017_status) {
       uint8_t data = (0xFF & ~(1 << row));
-      mcp23017_status = i2c_writeReg(I2C_ADDR, I2C_GPIOA, &data, 1, 10);
+      mcp23017_status = i2c_write_register(I2C_ADDR, I2C_GPIOA, &data, 1, 10);
     }
   } else {
     GPIOB->BRR = 0x1 << (row+1);
diff --git a/keyboards/ergotravel/keymaps/default/config.h b/keyboards/ergotravel/keymaps/default/config.h
index d047f718d67..746e60da5a5 100644
--- a/keyboards/ergotravel/keymaps/default/config.h
+++ b/keyboards/ergotravel/keymaps/default/config.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
+#define RGBLIGHT_LED_COUNT 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ergotravel/keymaps/ian/config.h b/keyboards/ergotravel/keymaps/ian/config.h
deleted file mode 100644
index fcec22e2d48..00000000000
--- a/keyboards/ergotravel/keymaps/ian/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Pierre Constantineau <jpconstantineau@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
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-#define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ergotravel/keymaps/ian/keymap.c b/keyboards/ergotravel/keymaps/ian/keymap.c
deleted file mode 100644
index cd1e01043eb..00000000000
--- a/keyboards/ergotravel/keymaps/ian/keymap.c
+++ /dev/null
@@ -1,91 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum custom_layers {
-    _COLEMAK,
-    _ADJUST,
-    _RAISE,
-    _LOWER,
-    _QWERTY
-};
-
-#define BASELYR TO(_COLEMAK) // base layer
-#define LOWER MO(_LOWER) // momentary lower layer
-#define RAISE MO(_RAISE) // momentary raise layer
-#define ADJUST MO(_ADJUST) // momentary adjust layer
-#define QWERTY TG(_QWERTY)
-#define LLOWER TG(_LOWER) // lock for lower layer
-#define LRAISE TG(_RAISE) // lock for raise layer
-#define LHALF LALT(LGUI(KC_LEFT)) // spec left half screen
-#define TLHALF LCTL(LGUI(KC_LEFT)) // spec top left half
-#define BLHALF LCTL(LSFT(LGUI(KC_LEFT))) // spec bottom left half
-#define RHALF LALT(LGUI(KC_RIGHT)) // spec right half screen
-#define TRHALF LCTL(LGUI(KC_RIGHT)) // spec top right half
-#define BRHALF LCTL(LSFT(LGUI(KC_RIGHT))) // spec bottom right half
-#define SAFBCK LGUI(KC_LBRC) // safari back
-#define SAFFWD LGUI(KC_RBRC) // safari forward
-#define CENTER LALT(LGUI(KC_C)) // spec center
-#define FULL LALT(LGUI(KC_F)) // spec full screen
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_COLEMAK] = LAYOUT(
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      KC_ESC ,  KC_Q ,  KC_W ,  KC_F ,  KC_P ,  KC_G ,KC_LCBR,      KC_RCBR,  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_LPRN,      KC_RPRN, KC_H  ,  KC_N ,  KC_E ,  KC_I , KC_O  ,KC_QUOT,
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      KC_BSLS, KC_Z  ,  KC_X ,  KC_C ,  KC_V ,  KC_B ,KC_LBRC ,      KC_RBRC ,  KC_K ,  KC_M ,KC_COMM, KC_DOT,KC_SLSH,KC_ENT ,
-    //,------+-------+-------+-------+-------+-------+-------.     .-------+-------+-------+-------+-------+-------+-------.
-      ADJUST ,KC_LCTL,KC_LALT,KC_LGUI, LOWER, KC_SPC,                       KC_LSFT, RAISE, KC_LEFT, KC_DOWN, KC_UP,KC_RGHT
-    //,------+-------+-------+-------+-------/-------/                     \-------\-------+-------+-------+-------+-------'
-  ),
-
-  [_ADJUST] = LAYOUT(
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      BASELYR,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,      XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, QK_BOOT ,
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,      XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,      XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    //|------+-------+-------+-------+-------+-------+-------.     .-------+-------+-------+-------+-------+-------+-------.
-      _______,KC_F10 ,KC_F11 ,KC_F12 ,LLOWER ,XXXXXXX,                      XXXXXXX,LRAISE ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX
-    //`------+-------+-------+-------+-------/-------/                      \------\-------+-------+-------+-------+-------'
-  ),
-
-  [_RAISE] = LAYOUT(
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      BASELYR,KC_EXLM, KC_AT, KC_HASH, KC_DLR,KC_LCBR,XXXXXXX,      XXXXXXX, KC_RCBR, TLHALF,  CENTER,  TRHALF, XXXXXXX, KC_BSPC,
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      KC_TILD,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,XXXXXXX,      XXXXXXX, KC_RPRN, LHALF,   FULL,    RHALF,  XXXXXXX, KC_VOLU,
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      KC_GRV, KC_MINS,KC_PLUS,KC_UNDS,KC_EQL, KC_LBRC,XXXXXXX,      XXXXXXX, KC_RBRC, BLHALF,  XXXXXXX, BRHALF, XXXXXXX, KC_VOLD,
-    //|-------+-------+-------+-------+-------+-------+-------.    .-------+-------+-------+-------+-------+-------+-------|
-       XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_TRNS,KC_SPC,                     KC_LSFT, KC_TRNS, XXXXXXX, KC_F14, KC_F15,  KC_MUTE
-    //`-------+-------+-------+-------+-------/-------/                     \------\-------+-------+-------+-------+-------'
-  ),
-
-  [_LOWER] = LAYOUT(
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      BASELYR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR,XXXXXXX,      XXXXXXX, KC_RCBR, KC_7,  KC_8, KC_9,   KC_MINS,  KC_BSPC,
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      XXXXXXX, XXXXXXX, SAFBCK,  XXXXXXX, SAFFWD,  KC_LPRN,XXXXXXX,      XXXXXXX, KC_RPRN, KC_4,  KC_5, KC_6,   KC_PLUS,  XXXXXXX,
-    //,------+-------+-------+-------+-------+-------+-------.     ,-------+-------+-------+-------+-------+-------+-------.
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC,XXXXXXX,      XXXXXXX, KC_RBRC, KC_1,  KC_2, KC_3,   KC_ASTR,  KC_ENT,
-    //|-------+-------+-------+-------+-------+-------+-------.    .-------+-------+-------+-------+-------+-------+-------|
-       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS, KC_SPC,                  KC_LSFT, KC_0,  KC_0, KC_DOT, KC_SLASH, XXXXXXX 
-    //`-------+-------+-------+-------+-------/-------/                     \------\-------+-------+-------+-------+-------'
-  )
-
-};
-
-   
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    
-  }
-  return true;
-}
-
diff --git a/keyboards/ergotravel/keymaps/via/config.h b/keyboards/ergotravel/keymaps/via/config.h
index 409e3efde45..d42b738adc1 100644
--- a/keyboards/ergotravel/keymaps/via/config.h
+++ b/keyboards/ergotravel/keymaps/via/config.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-// #undef RGBLED_NUM
-// #define RGBLED_NUM 14
+// #undef RGBLIGHT_LED_COUNT
+// #define RGBLIGHT_LED_COUNT 14
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
 // #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/eternal_keypad/keymaps/kyek/config.h b/keyboards/eternal_keypad/keymaps/kyek/config.h
deleted file mode 100644
index 36ab46334c0..00000000000
--- a/keyboards/eternal_keypad/keymaps/kyek/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 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
diff --git a/keyboards/eternal_keypad/keymaps/kyek/keymap.c b/keyboards/eternal_keypad/keymaps/kyek/keymap.c
deleted file mode 100644
index 1dd2f2f0b3f..00000000000
--- a/keyboards/eternal_keypad/keymaps/kyek/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* 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(
-		         _______, _______, _______, _______, RGB_MODE_RGBTEST, RGB_TOG, RGB_HUI,
-		         _______, _______, KC_UP, _______, _______, RGB_MODE_PLAIN, RGB_HUD, 
-		_______, KC_DEL , KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_MODE_BREATHE, RGB_VAI, 
-		_______, _______, _______, _______, _______, _______, RGB_MODE_SWIRL, RGB_VAD, 
-		QK_BOOT, _______, _______, _______, _______, _______
-    ),
-  /* 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
deleted file mode 100644
index d4c6162b0f2..00000000000
--- a/keyboards/eternal_keypad/keymaps/kyek/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Kyek's personal keymap for eternal_keypad
diff --git a/keyboards/eternal_keypad/keymaps/lefty/config.h b/keyboards/eternal_keypad/keymaps/lefty/config.h
deleted file mode 100644
index 36ab46334c0..00000000000
--- a/keyboards/eternal_keypad/keymaps/lefty/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 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
diff --git a/keyboards/eternal_keypad/keymaps/lefty/keymap.c b/keyboards/eternal_keypad/keymaps/lefty/keymap.c
deleted file mode 100644
index 2b14774aebe..00000000000
--- a/keyboards/eternal_keypad/keymaps/lefty/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* 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 |  D|  S|  A|  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_D, KC_S, KC_A, 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_LCTL, OSL(_FN), KC_LALT, KC_SPC, LT(_ARROW, KC_0)
-    ),
-  /* Arrows Layer
-   * ,--------------------------------------------------.
-   * |     |       |    |    |     |    |       |       |
-	 * |		 |-------+----+----+-----+----+-------+-------|
-   * |     |       |    |  UP|     |RGB?|  HUE+ |  HUE- |
-	 * |----||-------+----+----+-----+----+-------+-------|
-   * |    ||       |LEFT|DOWN|RIGHT|    |BRIGHT+|BRIGHT-|
-	 * |----||-------+----+----+-----+----+-------+-------|
-   * |    ||       |    |    |     |    | MODE+ | MODE- |
-   * |----||--------------------------------------------|
-   * | RST||       |       |     |         |            |
-   * `----'`--------------------------------------------'
-   */
-    [_ARROW] = LAYOUT(
-		         _______, _______, _______, _______, _______, _______, _______,
-		         _______, _______, KC_UP, _______, RGB_TOG, RGB_HUI, RGB_HUD, 
-		_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_VAI, RGB_VAD, 
-		_______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD, 
-		QK_BOOT, _______, _______, _______, _______, _______
-    ),
-  /* 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
-    )
-};
diff --git a/keyboards/etiennecollin/wave/keymaps/feature/config.h b/keyboards/etiennecollin/wave/keymaps/feature/config.h
deleted file mode 100644
index 42421b33d39..00000000000
--- a/keyboards/etiennecollin/wave/keymaps/feature/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2023 Etienne Collin (@etiennecollin)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Activate caps word by pressing Left Shift + Right Shift
-#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
-
-// Maximum time between taps of tap dances
-#define TAPPING_TERM 175
-
-// Max time between taps to prevent hold function and hold auto-repeat
-#define QUICK_TAP_TERM 100
-
-// Perform hold action if pressing a dual-role key, tapping another key and
-// releasing the dual-role key withing tapping term
-#define PERMISSIVE_HOLD
-
-// Mouse key speed and acceleration.
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_INTERVAL       16
-#define MOUSEKEY_WHEEL_DELAY    0
-#define MOUSEKEY_MAX_SPEED      6
-#define MOUSEKEY_TIME_TO_MAX    64
-
-// Thumb Combos
-#define COMBO_COUNT 2
-#define COMBO_TERM 200
-#define EXTRA_SHORT_COMBOS
diff --git a/keyboards/etiennecollin/wave/keymaps/feature/keymap.c b/keyboards/etiennecollin/wave/keymaps/feature/keymap.c
deleted file mode 100644
index 24bc85d5b49..00000000000
--- a/keyboards/etiennecollin/wave/keymaps/feature/keymap.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright 2023 Etienne Collin (@etiennecollin)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-    COL,
-    QWE,
-    GAM,
-    MED,
-    NAV,
-    MOS,
-    SYM,
-    NUM,
-    FUN,
-    SYS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [COL] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // |   q   |   w   |   f   |   p   |   b   |                    |   j   |   l   |   u   |   y   |   '   |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |   a   |   r   |   s   |   t   |   g   |                    |   m   |   n   |   e   |   i   |   o   |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |   z   |   x   |   c   |   d   |   v   |                    |   k   |   h   |   ,   |   .   |   /   |
-  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |  esc  |  spc  |  tab  |                    |  ent  |  bsp  |  del  |
-  //                 --------+-------+--------                    --------+-------+--------
-    KC_Q,               KC_W,               KC_F,               KC_P,               KC_B,               KC_J,               KC_L,               KC_U,               KC_Y,               KC_QUOT,
-    LGUI_T(KC_A),       LALT_T(KC_R),       LCTL_T(KC_S),       LSFT_T(KC_T),       KC_G,               KC_M,               LSFT_T(KC_N),       LCTL_T(KC_E),       LALT_T(KC_I),       LGUI_T(KC_O),
-    KC_Z,               KC_X,               KC_C,               KC_D,               KC_V,               KC_K,               KC_H,               KC_COMM,            KC_DOT,             KC_SLSH,
-                                            LT(MED, KC_ESC),    LT(NAV, KC_SPC),    LT(MOS, KC_TAB),    LT(SYM, KC_ENT),    LT(NUM, KC_BSPC),    LT(FUN, KC_DEL)
-  ),
-  [QWE] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // |   q   |   w   |   e   |   r   |   t   |                    |   y   |   u   |   i   |   o   |   p   |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |   a   |   s   |   d   |   f   |   g   |                    |   h   |   j   |   k   |   l   |   '   |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |   z   |   x   |   c   |   v   |   b   |                    |   n   |   m   |   ,   |   .   |   /   |
-  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |  esc  |  spc  |  tab  |                    |  ent  |  bsp  |  del  |
-  //                 --------+-------+--------                    --------+-------+--------
-    KC_Q,               KC_W,               KC_E,               KC_R,               KC_T,               KC_Y,               KC_U,               KC_I,               KC_O,               KC_P,
-    LGUI_T(KC_A),       LALT_T(KC_S),       LCTL_T(KC_D),       LSFT_T(KC_F),       KC_G,               KC_H,               LSFT_T(KC_J),       LCTL_T(KC_K),       LALT_T(KC_L),       LGUI_T(KC_QUOT),
-    KC_Z,               KC_X,               KC_C,               KC_V,               KC_B,               KC_N,               KC_M,               KC_COMM,            KC_DOT,             KC_SLSH,
-                                            LT(MED, KC_ESC),    LT(NAV, KC_SPC),    LT(MOS, KC_TAB),    LT(SYM, KC_ENT),    LT(NUM, KC_BSPC),    LT(FUN, KC_DEL)
-  ),
-  [GAM] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // |  tab  |   q   |   w   |   e   |   r   |                    |   t   |   y   |   u   |   i   |   o   |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |  sht  |   a   |   s   |   d   |   f   |                    |   g   |   h   |   j   |   k   |   l   |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |  ctl  |   z   |   x   |   c   |   v   |                    |   b   |   n   |   m   |   ,   |   .   |
-  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |  alt  |  cps  |  spc  |                    |  ent  |  bsp  |  esc  |
-  //                 --------+-------+--------                    --------+-------+--------
-    KC_TAB,             KC_Q,               KC_W,               KC_E,               KC_R,               KC_T,               KC_Y,               KC_U,               KC_I,               KC_O,
-    KC_LSFT,            KC_A,               KC_S,               KC_D,               KC_F,               KC_G,               KC_H,               KC_J,               KC_K,               KC_L,
-    KC_LCTL,            KC_Z,               KC_X,               KC_C,               KC_V,               KC_B,               KC_N,               KC_M,               KC_COMM,            KC_DOT,
-                                            KC_LALT,            KC_CAPS,            KC_SPC,             LT(SYM, KC_ENT),    LT(NUM, KC_BSPC),   LT(FUN, KC_ESC)
-  ),
-  [MED] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // |       |       |       |       |       |                    |       |       |       |       |       |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |  gui  |  alt  |  ctl  |  sht  |       |                    |       |  prev | vol - | vol + |  next |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |       |       |       |       |       |                    |       |       |       |       |       |
-  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |  ___  |       |       |                    |  stop | pause |  mute |
-  //                 --------+-------+--------                    --------+-------+--------
-    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-    KC_LGUI,            KC_LALT,            KC_LCTL,            KC_LSFT,            XXXXXXX,            XXXXXXX,            KC_MPRV,            KC_VOLD,            KC_VOLU,            KC_MNXT,
-    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            KC_MRWD,            XXXXXXX,            XXXXXXX,            KC_MFFD,
-                                            _______,            XXXXXXX,            XXXXXXX,            KC_MSTP,            KC_MPLY,            KC_MUTE
-  ),
-  [NAV] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // |       |       |       |       |       |                    |       |       |       |       |       |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |  gui  |  alt  |  ctl  |  sht  |       |                    |  cps  |   ←   |   ↓   |   ↑   |   →   |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |       |       |       |       |       |                    | insrt | home  | pageu | paged |  end  |
-  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |       |  ___  |       |                    |  ent  |  bsp  |  del  |
-  //                 --------+-------+--------                    --------+-------+--------
-    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-    KC_LGUI,            KC_LALT,            KC_LCTL,            KC_LSFT,            XXXXXXX,            KC_CAPS,            KC_LEFT,            KC_DOWN,            KC_UP,              KC_RGHT,
-    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            KC_INS,             KC_HOME,            KC_PGDN,            KC_PGUP,            KC_END,
-                                            XXXXXXX,            _______,            XXXXXXX,            KC_ENT,             KC_BSPC,            KC_DEL
-  ),
-  [MOS] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // |       |       |       |       |       |                    |       | acc0  | acc1  |  acc2 |       |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |  gui  |  alt  |  ctl  |  sht  |       |                    |       |   ←   |   ↓   |   ↑   |   →   |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |       |       |       |       |       |                    |       |  w←   |  w↓   |  w↑   |  w→   |
-  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |       |       |  ___  |                    | left  | right |  mid  |
-  //                 --------+-------+--------                    --------+-------+--------
-    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            KC_ACL0,            KC_ACL1,            KC_ACL2,            XXXXXXX,
-    KC_LGUI,            KC_LALT,            KC_LCTL,            KC_LSFT,            XXXXXXX,            XXXXXXX,            KC_MS_L,            KC_MS_D,            KC_MS_U,            KC_MS_R,
-    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            KC_WH_L,            KC_WH_D,            KC_WH_U,            KC_WH_R,
-                                            XXXXXXX,            XXXXXXX,            _______,            KC_BTN1,            KC_BTN2,            KC_BTN3
-  ),
-  [SYM] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // |   {   |   &   |   *   |   (   |   }   |                    |       |       |       |       |       |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |   :   |   $   |   %   |   ^   |   +   |                    |       |  sht  |  ctl  |  alt  |  gui  |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |   ~   |   !   |   @   |   #   |   |   |                    |       |       |       |       |       |
-  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |   (   |   )   |   _   |                    |  ___  |       |       |
-  //                 --------+-------+--------                    --------+-------+--------
-    KC_LCBR,            KC_AMPR,            KC_ASTR,            KC_LPRN,            KC_RCBR,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-    KC_COLN,            KC_DLR,             KC_PERC,            KC_CIRC,            KC_PLUS,            XXXXXXX,            KC_LSFT,            KC_LCTL,            KC_LALT,            KC_LGUI,
-    KC_TILD,            KC_EXLM,            KC_AT,              KC_HASH,            KC_PIPE,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-                                            KC_LPRN,            KC_RPRN,            KC_UNDS,            _______,            XXXXXXX,            XXXXXXX
-  ),
-  [NUM] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // |  [ {  |  7 &  |  8 *  |  9 (  |  ] }  |                    |       |       |       |       |       |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |  ; :  |  4 $  |  5 %  |  6 ^  |  = +  |                    |       |  sht  |  ctl  |  alt  |  gui  |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |  ` ~  |  1 !  |  2 @  |  3 #  |  \ |  |                    |       |       |       |       |       |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |  . >  |  0 )  |  - _  |                    |       |  ___  |       |
-  //                 --------+-------+--------                    --------+-------+--------
-    KC_LBRC,            KC_7,               KC_8,               KC_9,               KC_RBRC,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-    KC_SCLN,            KC_4,               KC_5,               KC_6,               KC_EQL,             XXXXXXX,            KC_LSFT,            KC_LCTL,            KC_LALT,            KC_LGUI,
-    KC_GRV,             KC_1,               KC_2,               KC_3,               KC_BSLS,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-                                            KC_DOT,             KC_0,               KC_MINS,            XXXXXXX,            _______,            XXXXXXX
-  ),
-  [FUN] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // |  F12  |  F 7  |  F 8  |  F 9  | PrScr |                    |       |       |       |       |       |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |  F11  |  F 4  |  F 5  |  F 6  | pause |                    |       |  sht  |  ctl  |  alt  |  gui  |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |  F10  |  F 1  |  F 2  |  F 3  | scrlk |                    |       |       |       |       |       |
-  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |  app  |  spc  |  tab  |                    |       |       |  ___  |
-  //                 --------+-------+--------                    --------+-------+--------
-    KC_F12,             KC_F7,              KC_F8,              KC_F9,              KC_PSCR,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-    KC_F11,             KC_F4,              KC_F5,              KC_F6,              KC_PAUS,            XXXXXXX,            KC_LSFT,            KC_LCTL,            KC_LALT,            KC_LGUI,
-    KC_F10,             KC_F1,              KC_F2,              KC_F3,              KC_SCRL,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-                                            KC_APP,             KC_SPC,             KC_TAB,             XXXXXXX,            XXXXXXX,            _______
-  ),
-  [SYS] = LAYOUT_split_3x5_3(
-  // -----------------------------------------                    -----------------------------------------
-  // | BOOT  |       | GAME  | QWERT | COLMK |                    | COLMK | QWERT | GAME  |       | BOOT  |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |       |       |       |       |       |                    |       |       |       |       |       |
-  // |-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  // |       |       |       |       |       |                    |       |       |       |       |       |
-  // --------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------|
-  //                 |       |       |       |                    |       |       |       |
-  //                 --------+-------+--------                    --------+-------+--------
-    QK_BOOT,            XXXXXXX,            DF(GAM),            DF(QWE),            DF(COL),            DF(COL),            DF(QWE),            DF(GAM),            XXXXXXX,            QK_BOOT,
-    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-    XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,
-                                            _______,            XXXXXXX,            XXXXXXX,            XXXXXXX,            XXXXXXX,            _______
-  )
-};
-
-const uint16_t PROGMEM combo_sys[] = {LT(MED, KC_ESC), LT(FUN, KC_DEL), COMBO_END};
-const uint16_t PROGMEM combo_sys_gam[] = {KC_LALT, LT(FUN, KC_ESC), COMBO_END};
-
-combo_t key_combos[] = {
-  COMBO(combo_sys, MO(SYS)),
-  COMBO(combo_sys_gam, MO(SYS))
-};
diff --git a/keyboards/etiennecollin/wave/keymaps/feature/readme.md b/keyboards/etiennecollin/wave/keymaps/feature/readme.md
deleted file mode 100644
index d9971b352b1..00000000000
--- a/keyboards/etiennecollin/wave/keymaps/feature/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Feature keymap
-
-This keymap is heavily inspired by the [miryoku](https://github.com/manna-harbour/miryoku) layout.
-
-It defaults to a [COLEMAK mod dh](https://colemakmods.github.io/mod-dh/) layer, but a QWERTY and a gaming layer are available from the `sys` layer.
-
-It uses the following features:
-
--   Home row modifiers
--   Usual special layers (`media`, `navigation`, `mouse`, `symbols`, `numbers`, `functions`, `system`)
--   Combos (to access the `sys` layer by pressing both external thumb keys)
diff --git a/keyboards/etiennecollin/wave/keymaps/feature/rules.mk b/keyboards/etiennecollin/wave/keymaps/feature/rules.mk
deleted file mode 100644
index 96093b82013..00000000000
--- a/keyboards/etiennecollin/wave/keymaps/feature/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CAPS_WORD_ENABLE = yes
-COMBO_ENABLE = yes
diff --git a/keyboards/eu_isolation/eu_isolation.c b/keyboards/eu_isolation/eu_isolation.c
deleted file mode 100644
index 9794e34e5c3..00000000000
--- a/keyboards/eu_isolation/eu_isolation.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Austin "TuckTuckFloof" Ashmore
-* 
-* 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 "eu_isolation.h"
diff --git a/keyboards/eu_isolation/eu_isolation.h b/keyboards/eu_isolation/eu_isolation.h
deleted file mode 100644
index 90ff29e69ff..00000000000
--- a/keyboards/eu_isolation/eu_isolation.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2020 Austin "TuckTuckFloof" Ashmore
-* 
-* This program is free software: you can redistribute it and/or modify 
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation, either version 2 of the License, or 
-* (at your option) any later version. 
-* 
-* This program is distributed in the hope that it will be useful, 
-* but WITHOUT ANY WARRANTY; without even the implied warranty of 
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-* GNU General Public License for more details. 
-* You should have received a copy of the GNU General Public License 
-* along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/ 
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT_euiso_mit( \
-              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, \
-              k32, k33, k34, k35, k36,      k37, k39, k3a, k3b, k3c, k3d \
-) \
-{ \
-    { ___, ___, 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 }, \
-    { ___, ___, k32, k33, k34, k35, k36, k37, ___, k39, k3a, k3b, k3c, k3d } \
-}
-
-#define LAYOUT_euiso_ortho( \
-              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, \
-              k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d  \
-) \
-{ \
-    { ___, ___, 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 }, \
-    { ___, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d } \
-}
-
-#define LAYOUT_euiso_bigspace( \
-              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, \
-              k32, k33,                    k37,                 k3c, k3d \
-) \
-{ \
-    { ___, ___, 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 }, \
-    { ___, ___, k32, k33, ___, ___, ___, k37, ___, ___, ___, ___, k3c, k3d } \
-}
diff --git a/keyboards/eu_isolation/keymaps/bigspace/keymap.c b/keyboards/eu_isolation/keymaps/bigspace/keymap.c
deleted file mode 100644
index 7568659de0d..00000000000
--- a/keyboards/eu_isolation/keymaps/bigspace/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2020 Austin "TuckTuckFloof" Ashmore
-*
-* 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 {
-    _BASE,
-    _FN1,
-    _FN2
-};
-
-// I put these combos in because they're easy to impliment and it gives you an idea of what you need to do
-// Go nuts, have fun! It's why I build the board :)
-enum WOMBO_COMBOS {
-    VOLUME_UP = 0,
-    VOLUME_DOWN
-};
-
-const uint16_t PROGMEM VOLUME_UP_COMBO[] = { KC_F1, KC_F2, COMBO_END };
-const uint16_t PROGMEM VOLUME_DN_COMBO[] = { KC_F3, KC_F4, COMBO_END };
-
-combo_t key_combos[] = {
-    [VOLUME_UP] = COMBO(VOLUME_UP_COMBO, KC_VOLU),
-    [VOLUME_DOWN] = COMBO(VOLUME_DN_COMBO, KC_VOLD)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_euiso_bigspace(
-                        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-        KC_F1,  KC_F2,  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_F3,  KC_F4,  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_LGUI, KC_LALT,                          KC_SPC,                                 MO(_FN2), MO(_FN1)
-    ),
-
-    [_FN1] = LAYOUT_euiso_bigspace(
-                          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_ESC , KC_PIPE, KC_DQUO, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______, _______, _______,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,  _______,
-                          _______, _______,                         _______,                                        KC_VOLD,  KC_MNXT
-    ),
-
-    [_FN2] = LAYOUT_euiso_bigspace(
-                          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_ESC , KC_BSLS, KC_QUOT, KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC,    KC_4,    KC_5,    KC_6, _______,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_1,    KC_2,    KC_3, KC_VOLU,  _______,
-                          _______, _______,                         _______,                                        KC_VOLD,  KC_MNXT
-    )
-};
diff --git a/keyboards/eu_isolation/keymaps/bigspace/readme.md b/keyboards/eu_isolation/keymaps/bigspace/readme.md
deleted file mode 100644
index 48b22cbd097..00000000000
--- a/keyboards/eu_isolation/keymaps/bigspace/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default layout for B I G S P A C E
-
-Default keymap for the 7u layout
-A L L H A I L B I G S P A C E
diff --git a/keyboards/eu_isolation/keymaps/default/config.h b/keyboards/eu_isolation/keymaps/default/config.h
deleted file mode 100644
index ad4389af3e4..00000000000
--- a/keyboards/eu_isolation/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Austin "TuckTuckFloof" Ashmore
-*
-* 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 COMBO_TERM 175
diff --git a/keyboards/eu_isolation/keymaps/mit/config.h b/keyboards/eu_isolation/keymaps/mit/config.h
deleted file mode 100644
index ad4389af3e4..00000000000
--- a/keyboards/eu_isolation/keymaps/mit/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Austin "TuckTuckFloof" Ashmore
-*
-* 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 COMBO_TERM 175
diff --git a/keyboards/eu_isolation/keymaps/mit/keymap.c b/keyboards/eu_isolation/keymaps/mit/keymap.c
deleted file mode 100644
index 68cdaa750a6..00000000000
--- a/keyboards/eu_isolation/keymaps/mit/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2020 Austin "TuckTuckFloof" Ashmore
-*
-* 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 {
-	_BASE,
-	_FN1,
-	_FN2
-};
-
-// I put these combos in because they're easy to impliment and it gives you an idea of what you need to do
-// Go nuts, have fun! It's why I build the board :)
-enum WOMBO_COMBOS {
-    VOLUME_UP = 0,
-    VOLUME_DOWN
-};
-
-const uint16_t PROGMEM VOLUME_UP_COMBO[] = { KC_F1, KC_F2, COMBO_END };
-const uint16_t PROGMEM VOLUME_DN_COMBO[] = { KC_F3, KC_F4, COMBO_END };
-
-combo_t key_combos[] = {
-    [VOLUME_UP] = COMBO(VOLUME_UP_COMBO, KC_VOLU),
-    [VOLUME_DOWN] = COMBO(VOLUME_DN_COMBO, KC_VOLD)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_euiso_mit(
-                        KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,   KC_Y,    KC_U,      KC_I,    KC_O,    KC_P,    KC_BSPC,
-        KC_F1,  KC_F2,  LT(2,KC_ESC),    KC_A,    KC_S,    KC_D,    KC_F,     KC_G,   KC_H,    KC_J,      KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_F3,  KC_F4,  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_DEL,  KC_LALT, KC_LGUI, MO(_FN1),     KC_SPC,      MO(_FN1),  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-    [_FN1] = LAYOUT_euiso_mit(
-                          KC_UNDS, KC_HASH, KC_EXLM, KC_TILD, KC_LPRN, KC_RPRN, KC_DQUO, KC_7,    KC_8,    KC_9,    KC_0,     KC_EQL,
-        KC_TRNS, KC_TRNS, KC_MINS, KC_AT,   KC_AMPR, KC_PIPE, KC_LCBR, KC_RCBR, KC_QUOT, KC_4,    KC_5,    KC_6,    KC_PLUS,  KC_MINS,
-        KC_TRNS, KC_TRNS, KC_BSLS, KC_CIRC, KC_DLR,  KC_PERC, KC_LBRC, KC_RBRC, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_ASTR,  KC_SLSH,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
-    ),
-
-    [_FN2] = LAYOUT_euiso_mit(
-                          KC_F1,   KC_F2,   KC_F3,   KC_F4, _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_TRNS, KC_TRNS, KC_F5,   KC_F6,   KC_F7,   KC_F8, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-        KC_TRNS, KC_TRNS, KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
-                          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/eu_isolation/keymaps/mit/readme.md b/keyboards/eu_isolation/keymaps/mit/readme.md
deleted file mode 100644
index 81ad5f4a21d..00000000000
--- a/keyboards/eu_isolation/keymaps/mit/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default layout for MIT
-
-2u ortho space, fairly standard
diff --git a/keyboards/eu_isolation/keymaps/mit/rules.mk b/keyboards/eu_isolation/keymaps/mit/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/eu_isolation/keymaps/mit/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/eu_isolation/readme.md b/keyboards/eu_isolation/readme.md
deleted file mode 100644
index c1272ea6a99..00000000000
--- a/keyboards/eu_isolation/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# EU ISOlation
-
-![euisolation](https://i.imgur.com/5LGsiJZh.jpg)
-
-EU ISOlation is an ortholinear 40% keyboard designed to use up your spare iso
-enters from you collection of keyboard kits.
-
-* Keyboard Maintainer: Originally by [TuckTuckFloof](https://github.com/TuckTuckFloof)
- cleaned up and merged to QMK by [aadriance](https://github.com/aadriance)
-* Hardware Supported: EU ISOlation
-* Hardware Availability: Originally a [P3DStore](https://p3dstore.com/) group buy. 
- Open source pcb info available on [TuckTuckFloofs github](https://github.com/TuckTuckFloof/EUISO-pcb)
-
-## Bootloader
-
-Enter the bootloader in 3 ways:
-
-* **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 `QK_BOOT` if it is available
-
-## Information
-
-Make example for this keyboard (after setting up your build environment):
-
-    make eu_isolation:default
-
-Flashing example for this keyboard:
-
-    make eu_isolation: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/evolv/keymaps/gondolindrim/keymap.c b/keyboards/evolv/keymaps/gondolindrim/keymap.c
deleted file mode 100755
index 992901a86d9..00000000000
--- a/keyboards/evolv/keymaps/gondolindrim/keymap.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
-Copyright 2021 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-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/>.
-*/
-
-/* ---------------------------------------------- EVOLV75 GONDOLINDRIM LAYOUT
-This is the firmware for the Evolv75 CE (pre-Alpha) PCBs as designed by Gondolindrim.
-
-The final objective is to achieve a joystic encoder feature where the encoder can exhibit multiple behaviours, hereby called "encoder modes", which can be switched seamlessly by the user. In order to make the user know what encoder mode is active at a given instant, the keyboard has RGB underglow LEDs that shine a particular color; each mode has its own color.
-
-Modes, their behaviours and their colors are user-customizable.
-*/
-
-/* ---------------------------------------------- BASIC DEFINITIONS
-DON"T CHANGE ANY OF THESE.
-*/
-
-#include QMK_KEYBOARD_H
-typedef uint8_t color[3];
-#define COLOR(h,s,v) ((color){h,s,v})
-
-// Defining custom keycodes
-enum keyboard_keycodes {
-        ENCCLK = 0x5F80,	// For "encoder click"
-	ENCNTH,			// "Encoder north"
-	ENCSTH,			// "Encoder south"
-	ENCEST,			// "Encoder east"
-	ENCWST,			// "Encoder west"
-	ALTTABN,		// For alt-tab-switch, next
-	ALTTABP,		// For alt-tab-switch, previous
-	ALTTABC, 		// For alt-tab-click
-	ENCMUP,			// Encoder mode up
-	ENCMDN			// Encoder mode down
-};
-
-// Defining the encoder mode data structure
-typedef struct _encoder_mode_t {
-	color indicator_color;
-	uint16_t clockwise_key[4];
-	uint16_t counterclockwise_key[4];
-	uint16_t clicked_key[4];
-	uint16_t north_key[4];
-	uint16_t south_key[4];
-	uint16_t east_key[4];
-	uint16_t west_key[4];
-} encoder_mode_t;
-
-/* ---------------------------------------------- COLORS
-Colors are defined as HSV values where the values range from 0 to 255. Template:
-
-#define <COLOR NAME> COLOR( <HSV CODE> )
-
-Use these to define the colors for encoder modes.
-*/
-
-#define CYAN COLOR(128,255,255)
-#define PINK COLOR(191,255,255)
-#define YELLOW COLOR(36,255,255)
-#define WHITE COLOR(0,0,255)
-#define STARTUP_COLOR WHITE
-
-/* ---------------------------------------------- DELAYS
-These delays define some important behaviours on the firmware.
-
-MEDIA_KEY_DELAY is used throughout the code to hold certain keycodes for a time before holding them; this allows the use of media keys like volume up and down everywhere.
-
-ALT_TAB_DELAY is the time delay the firmware holds the LALT key before letting it go; in practical use this means once you rotate the encoder in alt-tabbing mode, it will keep the alt-tab window held for this amount of time.
-
-ENCODER_CLICK_DELAY defines a delayed behavior for the encoder click. Once you click it, a timer is triggered and monitored. If the click is held for more than this macro (defaults to 1000 or 1 second), encoder modes start cycling, each per second, and stops when you release. If you hold the click for shorter than the time defined in this macro, then the firmware registers the key contained in the .clicked_key list of that mode.
-*/
-
-#define MEDIA_KEY_DELAY 20
-#define ALT_TAB_DELAY 2000
-#define ENCODER_CLICK_DELAY 1000
-
-// -------------------------------------------- ENCODER MODES
-/* Encoder mode list
-WARNING: DO NOT, ABSOLUTELY DO NOT use ENCNTH, ENCSTH, ENCWST or ENCEST in any of the encoder mode keys. The reason is because these keycodes are used in process_record_user and they point to these very same encoder mode keys; this could generate a loop in process_record_user and freeze the keyboard.
-
-You can add and remove modes at will as long as you have at least one.
-*/
-const encoder_mode_t encoder_modes[] = {
-	// PINK MODE: "media mode". Encoder controls volume (and mode change on layer 1); click does media pause (mute on layer 1), directionals do arrows.
-	{ .indicator_color = PINK,
-	  .clockwise_key = {KC_VOLU, ENCMUP, KC_VOLU, KC_VOLU},
-	  .counterclockwise_key = {KC_VOLD, ENCMDN, KC_VOLD, KC_VOLD},
-	  .clicked_key = {KC_MUTE, KC_MUTE, KC_MPLY, KC_MUTE},
-	  .north_key = {KC_UP, KC_UP, KC_UP, KC_UP},
-	  .south_key = {KC_DOWN, KC_DOWN, KC_DOWN, KC_DOWN},
-	  .east_key = {KC_RGHT, KC_RGHT, KC_RGHT, KC_RGHT},
-	  .west_key = {KC_LEFT, KC_LEFT, KC_LEFT, KC_LEFT}
-	},
-	/* CYAN MODE: "application mode". Switches back and forth between applications ("alt-tabbing"); click stops the alt-tabbing at the selected application. When on layer 1, encoder changes modes. East-west switches tabs ("ctrl-tabbing") and north-sourh maximizes/minimizes windows (GUI plus up and down). Note: these are modifier keys defined natively in QMK
-	- C(kc) means hold left control and press kc
-	- MEH(kc) means hold left control, left shift and press kc
-	- G(kc) means hold LGUI and press kc
-*/
-	{ .indicator_color = CYAN,
-	  .clockwise_key = {ALTTABN, ENCMUP, ALTTABN, ALTTABN},
-	  .counterclockwise_key = {ALTTABP, ENCMDN, ALTTABP, ALTTABP},
-	  .clicked_key = {ALTTABC, ALTTABC, ALTTABC, ALTTABC},
-	  .north_key = {G(KC_UP),G(KC_UP), G(KC_UP), G(KC_UP)},
-	  .south_key = {G(KC_DOWN), G(KC_DOWN), G(KC_DOWN), G(KC_DOWN)},
-	  .east_key = {C(KC_TAB), C(KC_TAB), C(KC_TAB), C(KC_TAB)},
-	  .west_key = {S(C(KC_TAB)), S(C(KC_TAB)), S(C(KC_TAB)), S(C(KC_TAB))}
-	},
-	// YELLOW MODE: "navigation mode". Encoder mimicks mousehwheel, click does mouseclick. North-wouth does page up/down, east-west do home and end.
-	{ .indicator_color = YELLOW,
-	  .clockwise_key = {KC_WH_U, ENCMUP, KC_WH_U, KC_WH_U},
-	  .counterclockwise_key = {KC_WH_D, ENCMDN, KC_WH_D, KC_WH_D},
-	  .clicked_key = {KC_BTN1, KC_BTN2, KC_BTN1, KC_BTN1},
-	  .north_key = {KC_PGUP, KC_PGUP, KC_PGUP, KC_PGUP},
-	  .south_key = {KC_PGDN, KC_PGDN, KC_PGDN, KC_PGDN},
-	  .east_key = {KC_END, KC_END, KC_END, KC_END},
-	  .west_key = {KC_HOME, KC_HOME, KC_HOME, KC_HOME}
-	}
-	// Insert your custom encoder mode here
-};
-
-#define NUM_ENCODER_MODES ARRAY_SIZE(encoder_modes) // DO NOT CHANGE THIS. NUM_ENCODER_MODES calculates how many modes there are.
-
-// This counter is used to track what encoder mode is being used at a certain time
-int encoder_mode_count = 0;
-
-/* ---------------------------------------------- RGB STARTING COLOR
-Due to the way rgblight.c stores to and re-stores RGB configurations from EEPROM, the first time the MCU boots up, the EEPROM will not have stored the default value for the RGB animation which in QMK is the static red light; however, during the first bootup, this EEPROM will be set so that, in all subsequent bootups, the RGBs will glow red instead of whatever color the first encoder mode is. What these lines do is re-define the default RGB color so that the default RGB color is defined the same as encoder mode [0] so that the RGB will glow this color once the keyboard boots. DONT CHANGE THIS.
-*/
-#define RGBLIGHT_DEFAULT_HUE encoder_modes[0].indicator_color[0]
-#define RGBLIGHT_DEFAULT_SAT encoder_modes[0].indicator_color[1]
-#define RGBLIGHT_DEFAULT_VAL encoder_modes[0].indicator_color[2]
-
-/* ---------------------------------------------- DEFINING DEFAULT KEYMAP
-Adapt this at will with the caveat that you should not have more nor less than four layers. And let's be honest, if you find yourself needing more than four layers on a 75% keyboard you are probably doing something wrong.
-*/
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_iso( 
-        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_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_BSPC, KC_DEL ,          ENCNTH,
-        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_ENT ,          KC_PGUP, ENCWST , ENCCLK, ENCEST,
-        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_PGDN,          ENCSTH,
-        KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , 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_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
-   [1] = LAYOUT_iso(                                                                                                                                                  
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           ENCNTH,        
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  ENCWST , ENCCLK, ENCEST,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,           ENCSTH,        
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_TRNS,  
-        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______),
-   [2] = LAYOUT_iso(                                                                                                                                                  
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           ENCNTH,        
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  ENCWST , ENCCLK, ENCEST,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,           ENCSTH,        
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,  
-        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______),
-   [3] = LAYOUT_iso(                                                                                                                                                  
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            ENCNTH,        
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   ENCWST , ENCCLK, ENCEST,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,            ENCSTH,        
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,  
-        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______)
-};
-
-/* ---------------------------------------------- END OF USER CUSTOMIZABLE CODE
-Everything past here are functions that operate the firmware. There is nothing to be customized by the user for encoder modes or keyboard keymap.
-*/
-
-/* ---------------------------------------------- SET INDICATOR COLOR FUNCTION
-This is the function used when the RGB colors need to change.
-*/
-void set_indicator_colors(const color target_color){
-	rgblight_sethsv(target_color[0],target_color[1],target_color[2]);
-};
-
-// Board init: RGB indicator is set to the first encoder mode color, also encoder mode is set to first mode.
-void keyboard_pre_init_user(void){
-        set_indicator_colors(STARTUP_COLOR);
-        encoder_mode_count = 0;
-};
-
-void keyboard_post_init_user(void){
-	set_indicator_colors(encoder_modes[0].indicator_color);
-};
-
-/* ---------------------------------------------- SPECIAL KEYCODE PROCESSING
-	The heart of this firmware is the process_custom_keycode function; this allows all the customized keycodes ENCMUP, ENCMDN, ALTTABN, ALLTABP and so on to be used in any place including the encoder callback. Its main mechanic is calling the process_record_user function, where there is a function for each one of the customized keycodes.
-	What process_custom_keycode does is, if a "normal" keycode is passed on, then it is registered and held for a small period of time (MEDIA_KEY_DELAY to be more specific). This "holding" allows it to correctly register media keys. However, if a custom keycode is used, then the function executes process_record_user again, but now with a new argument keycode that will be whatever is mapped inside the special key requested.
-	Admittedly, this implementation looks redundant: process_record_user calls process_custom_keycode which calls process_record_user again. However, the ingenuity of this recursion is this allows any of the custom keycodes to be mappable both to encoder action as well as keys by having their behavior mapped to a single function in a switch-case structure. For instance, by having the encoder update function encoder_update_user use process_custom_keycode, the code for each custom keycode can be present in a single place in the code, that is, in process_record_user. On another hand, if the user wants to map a certain special keycode to a particular key, they can do so; for instance, if the user wants to map the encoder mode switch keys ENCMUP/ENCMDN to, say, left and right keys of layer 1, they can also do so.
-	The glaring problem with this approach is the same as with all recursions: a recursion mapped to itself is a loop, meaning that it is very easy to put the program in a loop within process_record_user by nesting the custom keycodes, for instance, using the keycode ENCNTH in a north key in any of the modes. This then requires a certain care from whoever is adapting or customizing their encoder modes to not use ENCNTH, ENCSTH, ENCWST, ENCEST in the keymap or the encoder modes. The way the firmware deals with this is by only processing keycodes inside the 0x5F85 and 0x5F89 range which exclude these keys; if the given keycode is in the 0x5F80 to 0x5F84 range, which pertains to these forbidden keycodes, nothing is done; to the user it will seem like nothing happens.
-	In the case of the encoder rotating action, in order to call process_record_user a placeholder record is used, the idea being to use values not obtainable phisically on the keyboard like col 20, row 20, with a timer right at the begginig of the code initialization.
-keyrecord_t record {
-  keyevent_t event {
-    keypos_t key {
-      uint8_t col
-      uint8_t row
-    }
-    bool     pressed
-    uint16_t time
-  }
-}
-
-Despite this long description, process_custom_kc is fairly simple. It tests the passed keycode and, if it is one of the custom-defined keys in the forbidden range, nothing is done; if it's one of the good ones, process_record_user is called and the function for that particular keycode will be executed. In other cases, if the event was a press the keycode is registered and held for MEDIA_KEY_DELAY ms. In the case the event was a release, the keycode is unregistered.
-*/
-
-keyrecord_t placeholder_record ;
-//placeholder_record->event.key.col = 20;
-//placeholder_record.event.key.row = 20;
-//placeholder_record.event.time = timer_read32();
-
-uint16_t mapped_code = 0;
-uint32_t held_keycode_timer = 0;
-void process_custom_keycode(uint16_t keycode, keyrecord_t *record){
-	if (keycode >= 0x05F80 && keycode < 0x5F85) ;
-	else if (keycode >= 0x5F85 && keycode <= 0x5F89) process_record_user(keycode, record);
-	else {
-		// Note: (un)register_keycode16 need to be the 16 bit versions in case modifier keys like C(), G() and so on are used. This is specially true for the "application control" encoder mode.
-		if (record->event.pressed){
-			register_code16(keycode);
-			held_keycode_timer = timer_read32();
-			while (timer_elapsed32(held_keycode_timer) < MEDIA_KEY_DELAY);
-		} else unregister_code16(keycode);
-	}
-}
-
-// Basically calls process_custom_keycode in a press event and then in a release event. This is basically done to tap custom keycodes.
-void tap_custom_keycode(uint16_t keycode){
-	placeholder_record.event.pressed = true;
-	process_custom_keycode(keycode, &placeholder_record);
-	placeholder_record.event.pressed = false;
-	process_custom_keycode(keycode, &placeholder_record);
-}
-
-/* ---------------------------------------------- LAYER UPDATING
-Keeps track of the highest active layer.
-*/
-int current_layer = 0 ; // Updated in layer_state_set_user each time a layer change is made
-layer_state_t layer_state_set_user(layer_state_t state) {
-	current_layer = get_highest_layer(state);
-	return state;
-}
-
-/* ---------------------------------------------- ENCODER MDOE CYCLING
-Pretty straightforward: cycles encoder mode forwards if passed a true value and backwards otherwise.
-
-Some care is taken for two edge cases:
-	- The user is at mode 0 and the encoder mode is changed backwards
-	- The user is at the last mode and changes it forward.
-
-The program deals with this last case by taking the division remainder, which will take encoder_mode_count to 0. For the first case, encoder_mode_count is just made equal to the last (highest) mode.
-*/
-void cycle_encoder_mode(bool forward){
-	forward ? encoder_mode_count++ : encoder_mode_count-- ;
-	if (encoder_mode_count == -1) encoder_mode_count = NUM_ENCODER_MODES - 1;
-	encoder_mode_count = encoder_mode_count%NUM_ENCODER_MODES ; // This makes sure encoder_mode_count keeps cycling between 0,1,...,NUM_ENCODER_MODES and doesnt eventually overflow
-	set_indicator_colors( encoder_modes[ encoder_mode_count ].indicator_color ); // Set indicator color to the corresponding defined color
-}
-
-/* ---------------------------------------------- PROCESSING ALT-TABBING
-This function process the alt-tabbing keycode ALTTABS. The process works in a few steps:
-- At first, the flag is_alt_tab_active is false. When the user first uses this keycode (rotating the encoder, for instance) then the function turns the flag and "presses" left alt (KC_LALT), also triggering a timer alt_tab_timer.
-- The alt_tab_timer is supposed to keep track of how many miliseconds the alt-tab window should be kept, that is, how much time the LALT keycode should be held. The objective being, once the user cycles through the applications to the desired one, they select it either by not rotating the applications anymore or clicking the encoder.
-- Finally, the function shoots out the KC_TAB keycode if the encoder was rotated clockwise or the S(KC_TAB) (shift + tab) if the encoder was rotated counterclockwise.
-- If the user cycles the encoder still while alt-tab is active, then the function refreshes the timer and shoots out tab or shift+tab.
-- The function that keeps track of the timer expiration is housekeeping_task_user, where if the alt_tab_timer surpasses the defined ALT_TAB_DELAY macro (defaults to 2 seconds or 2000 ms) then the release_alt_tab function is called: the LALT keycode is released and the is_alt_tab_active flag is set to false again
-- The release_alt_tab function is also called when the ALTTABC keycode is hit, thus selecting the desired application.
-*/
-
-// This bool records if LALT is pressed or not. Due to the automatic disabling of the ALT-TAB of the ALTTABS custom keystroke, the automatic disabling can un-register KC_LALT even when the LALT key is phisically pressed. Hence there needs to be two bools: one that keebs track of the ALT-TAB activity and one that keeps track of LALT so that the automatic disabling will not disable LALT if it is phisically pressed.
-bool is_lalt_pressed = false;
-bool is_alt_tab_active = false; // Flag to check if alt tab is active
-uint32_t alt_tab_timer = 0;     // Time trigger for alt tab
-void process_alt_tabbing(bool next){
-	if(!is_alt_tab_active) {
-		is_alt_tab_active = true;
-		register_code(KC_LALT);
-		}
-	alt_tab_timer = timer_read32();
-	tap_code16(next ? KC_TAB : S(KC_TAB));
-}
-
-void release_alt_tab(void){
-	is_alt_tab_active = false;
-	unregister_code(KC_LALT);
-}
-
-/* ---------------------------------------------- ENCODER UPDATE CALLBACK
-This taps the keycode stored in the encoder mode struct, at the current encoder mode, at the current layer. Because the user can use non-QMK-native keycodes in the encoder, like the alt-tabbing keycodes like ALTTABP and ATLTTABN, the tap function is the custom tap one.
-*/
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-	mapped_code = clockwise ? encoder_modes[ encoder_mode_count ].clockwise_key[ current_layer ] : encoder_modes[ encoder_mode_count ].counterclockwise_key[ current_layer ] ; // mapped code is the clockwise key if a clockwise motion is sensed, otherwise it registers the counterclockwise key
-	tap_custom_keycode(mapped_code);
-	return false; 	// This function needs to return false in order to inhibit the action of encoder_update_user as defined in evolv.c
-}
-
-/* ---------------------------------------------- DEALING WITH THE ENCODER CLICK
-The encoder used in the Evolv has a construction particularity in that not only it has rotation and clicking but also directional joystic capabilities in the four cardinal directions, as in, it can also register four directions. The way that this works is, there are A,B and a common pin for the encoder rotation , with a PUSH and a COM pin. The encoder pins work pretty much like common encoders, as does the switch click: once you click it, PUSH and COM short-circuit, so the pushing mechanic can be easily integrated into a switch matrix and treated like a switch would.
-
-The problem, however, lies in the directionals. For each directional, say N,S,W,E, there is a corresponding pin on the encoder; once one directional is hit its pin is shorted with PUSH and COM. This means that the directionals can be treated as four short-circuit keys and integrated into the matrix, but with the added hassle that every time one of them is registered, the encoder push is also registered.
-
-The way this firmware deals with this problem is threefold.
-
-- First, there is a is_click_blocked flag that is set true whenever one of the directionals is sensed by the matrix; the name suggests that in this case the click keycode processing should be "blocked". This allows the firmware to differentiate between an event where a directional was hit (the encoder push is recognized but is_click_blocked is true) and an event where only the push was used (is_click_blocked is false albeit the push being sensed).
-- Second, in order to prevent the encoder push key from registering before the flag is set, a 20ms delay takes place when the encoder click was sensed; this means that when a directional is hit, the encoder action is guaranteed to be processed only after the is_click_blocked flag is true.
-- Finally, held_click_timer and is_click_held are used to differentiate between a click short push and a long push; when a directional key is hit, is_click_held is immediately reset, further preventing any action corresponding to the encoder push click being held down.
-
-automatic_encoder_mode_cycle is a flag used by the housekeeping function to communicate an encoder mode change was made during an encoder push, meaning that the user has held the encoder enough to trigger an encoder mode change. What the housekeeping function does is constantly monitor the timer so that, when it extrapolates the designated ENCODER_CLICK_DELAY, a mode change takes place; the held_click_timer timer is refreshed. The problem is that, once the user reaches their desired mode and releases the encoder, the timer had been refreshed and is lower than the designated delay, which would cause the "fast click" keycode to be triggered, which is of course unwanted. Hence the algorithm filters out these situations by knowing when the automatic mode change has taken place and not registering the click key, only resetting the automatic_encoder_mode_cycle flag.
-
-Finally, the process_encoder_click function has two parts. In a click press event, it sets the flag is_click_held and triggers a timer. When the encoder push is released, the timer is sampled and the pertinent action is taken depending on how much time the encoder was held for.
-*/
-
-uint32_t held_click_timer = 0;
-bool is_click_held = false;
-bool is_shift_held = false;
-bool automatic_encoder_mode_cycle = false; // This flag registers if the encoder mode was automatically cycled 
-bool is_click_blocked = false;
-void process_encoder_click(bool clickpress){
-	// What to do when the encoder is pressed: turn the flag to true, start (or refresh) timer
-	if (clickpress) { 
-		is_click_held = true;
-		held_click_timer = timer_read32();
-	} else { // What to do when encoder is released
-		is_click_held = false;
-		// Checking if the time the encoder click was held was smaller than the delay defined and if an automatic mode change was not already performed. If it was, just register whatever it is the click does.
-		if (timer_elapsed32(held_click_timer) < ENCODER_CLICK_DELAY && !automatic_encoder_mode_cycle ) tap_custom_keycode(encoder_modes[ encoder_mode_count ].clicked_key[ current_layer ]);
-		automatic_encoder_mode_cycle = false;
-	}
-}
-
-bool process_directional(uint16_t keycode, keyrecord_t *record){
-	is_click_held = false;
-	is_click_blocked = record->event.pressed ;
-	process_custom_keycode( keycode , record );
-	return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		case KC_LSFT:
-		case KC_RSFT:
-			is_shift_held = record->event.pressed;
-			break;
-		case KC_LALT: // If this is not defined, if the encoder is activated in the alt-tab mode while the LALT key is pressed, the menu goes away.
-			is_lalt_pressed = record->event.pressed;				
-			break;
-// ---------------------------------------------- CUSTOM KEYCODES: they do their thing and retun false right away to prevent any further action
-// --------------------- Encoder directionals (note: process_directional always returns false)
-		case ENCNTH: return process_directional( encoder_modes[ encoder_mode_count ].north_key[ current_layer ] , record);
-		case ENCSTH: return process_directional( encoder_modes[ encoder_mode_count ].south_key[ current_layer ] , record);
-		case ENCEST: return process_directional( encoder_modes[ encoder_mode_count ].east_key[ current_layer ] , record);
-		case ENCWST: return process_directional( encoder_modes[ encoder_mode_count ].west_key[ current_layer ] , record);
-// --------------------- Encoder click
-		case ENCCLK:
-			held_keycode_timer = timer_read32();
-			while (timer_elapsed32(held_keycode_timer) < 20);
-			if(!is_click_blocked) process_encoder_click(record->event.pressed);
-			return false; // Skip all further processing of this key
-// --------------------- Alt-tabbing
-		case ALTTABN:
-		case ALTTABP:
-			if(record->event.pressed) process_alt_tabbing(keycode == ALTTABN); // alt-tabs forward if the keycode is ALTTABN, else alt-tabs backwards if it's ALTTABP
-			return false;
-		case ALTTABC:
-			if(record->event.pressed) release_alt_tab();
-			return false;
-// --------------------- Encoder mode up/down
-		case ENCMUP:
-		case ENCMDN:
-			if(record->event.pressed) cycle_encoder_mode(keycode == ENCMUP); // Cycles encoder mode up if keycode is ENCMUP, else cycles backwards if the keycode is ENCMDN
-			return false;
-// ---------------------------------------------- DEFAULT
-		default:
-			return true;
-	}
-	return true;
-}
-
-/* ---------------------------------------------- HOUSEKEEPING
-Housekeeping keeps track of three events:
-- Keeps track of the alt-tabbing timer. If it surpasses ALT_TAB_DELAY the release_alt_tab function is called;
-- Keeps track of the encoder click hold timer; if the encoder click is held for more than a certain delay, cycles encoder mode and sets the automatic_mode_change flag.
-- The is_click_blocked flag marks if the encoder click has been registered with a directional key (recall that in this encoder, when a directional key is hit, both the directional key and the encoder push key are triggered in the keymap). In this case, only the directional should be registered. Hence, this housekeeping function resets the held_click_timer timer because, if this is not done, if the directional key is held for more than ENCODER_CLICK_DELAY then this will trigger an automatic mode change.
-*/
-void housekeeping_task_user(void) {
-	if (is_alt_tab_active){ 
-		if (is_lalt_pressed) alt_tab_timer = timer_read32(); // If the user is holding the LALT key, refresh the timer
-		else if (timer_elapsed32(alt_tab_timer) > ALT_TAB_DELAY) release_alt_tab(); // If the timer surpasses the delay, release alt tab
-	}
-	if (is_click_blocked) held_click_timer = timer_read32(); // To prevent mode changing when directionals are held
-	if (is_click_held && timer_elapsed32(held_click_timer) > ENCODER_CLICK_DELAY ){
-		automatic_encoder_mode_cycle = true;
-		held_click_timer = timer_read32();
-		if (is_shift_held) cycle_encoder_mode(false);
-		else cycle_encoder_mode(true);
-	}
-}
diff --git a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c b/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
deleted file mode 100644
index f244bb88218..00000000000
--- a/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-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
-
-// These are all aliases for the  function layers.
-#define _L0 0
-#define _L1 1
-#define _L2 2
-#define _L3 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_L0] = LAYOUT_split_space(
-  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_BSPC,
-  KC_TAB,		KC_A,		KC_S,		KC_D,		KC_F,		KC_G,		KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,				KC_ENT,
-  KC_LSFT,		KC_Z,		KC_X,		KC_C,		KC_V,		KC_B,		KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_RSFT,				MO(_L1),
-  KC_LCTL,		KC_LGUI,	KC_LALT,	TG(_L3),	KC_SPC, 				KC_SPC,					MO(_L2),	KC_RALT,	KC_APP,					KC_RCTL),
- 
-[_L2] = LAYOUT_split_space(
-  _______,		KC_VOLD,	KC_VOLU,	KC_MUTE,	QK_BOOT,		_______,	KC_CALC,	KC_PGUP,	KC_UP,		KC_PGDN,	KC_PSCR,	KC_SCRL,	KC_PAUS,
-  KC_CAPS,		KC_MPRV,	KC_MPLY,	KC_MNXT,	_______,	_______,	KC_HOME,	KC_LEFT,	KC_DOWN,	KC_RIGHT,	KC_INS,					_______,
-  _______,		_______,	_______,	_______,	_______,	_______,	_______,	BL_TOGG,	BL_DOWN,		BL_UP, 		_______,				_______,
-  _______,		_______,	_______,	_______,	_______, 				_______,				_______,	_______,	_______,				_______),
- 
-[_L1] = LAYOUT_split_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_1,			KC_2,		KC_3,		KC_4,		KC_5,		KC_6,		KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,				KC_EQL,
-  _______,		_______,	_______,	_______,	_______,	KC_QUOT,	KC_SLSH,	KC_LBRC,	KC_RBRC,	KC_BSLS,	KC_RSFT,				_______,
-  _______,		_______,	_______,	_______,	_______, 				_______,				_______,	_______,	_______,				_______),
- 
-[_L3] = LAYOUT_split_space(
-  _______,		_______,	_______,	   KC_7,	   KC_8,	   KC_9,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-  _______,		_______,	_______,	   KC_4,	   KC_5,	   KC_6,	_______,	_______,	_______,	_______,	_______,				_______,
-  _______,		_______,	_______,	   KC_1,	   KC_2,	   KC_3,	_______,	_______,	_______,	_______,	_______,				_______,
-  _______,		_______,	_______,	   _______,    KC_0,	  KC_DOT, 	        	            _______,	_______,	_______,				QK_BOOT)
-};
diff --git a/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c b/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
deleted file mode 100644
index 9bd33618000..00000000000
--- a/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-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.
-
-#define _MA 0 //Main layer
-#define _LO 1 //FN1
-#define _RA 2 //FN
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_MA] = LAYOUT_split_space(
-  QK_GESC,  KC_Q,     KC_W,       KC_E,      KC_R,        KC_T,       KC_Y,    KC_U,      KC_I,     KC_O,      KC_P,     KC_DEL,   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_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,    MO(_LO),                KC_SPC,              KC_SPC,              MO(_RA),   KC_RALT,  KC_APP,   KC_RCTL),
-
-[_LO] = LAYOUT_split_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_1,     KC_2,     KC_3,       KC_4,       KC_5,       KC_6,       KC_7,     KC_8,     KC_9,     KC_0,      KC_MINS,            KC_EQL,
-  _______,            LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______,  _______,  KC_QUOT,  KC_LBRC,   KC_RBRC,  KC_BSLS,  _______,
-  _______,  _______,  _______,    _______,                _______,              _______,            _______,   _______,  _______,  QK_BOOT),
-
-[_RA] = LAYOUT_split_space(
-  _______,  _______,  _______,    _______,    _______,    _______,    _______,  KC_PGUP,  KC_UP,    KC_PGDN,   _______,  _______,  _______,
-  KC_CAPS,  _______,  _______,    _______,    _______,    _______,    _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,            _______,
-  _______,            _______,    _______,    _______,    _______,    _______,  _______,  _______,  KC_VOLD,   KC_VOLU,  KC_MPLY,  KC_PSCR,
-  _______,  _______,  _______,    _______,                _______,              _______,            _______,   _______,  _______,  _______)
-
-};
-
diff --git a/keyboards/evyd13/atom47/keymaps/evyd13/readme.md b/keyboards/evyd13/atom47/keymaps/evyd13/readme.md
deleted file mode 100644
index 67959538571..00000000000
--- a/keyboards/evyd13/atom47/keymaps/evyd13/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-This is the default keymap as found on the Vortex Core, with some added buttons for RGB and backlight control.
diff --git a/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c b/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
deleted file mode 100644
index da90eae9d36..00000000000
--- a/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-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 custom_keycodes {
-  SHIFTEN = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  SPACFNL,
-  SPACFNR,
-  MAIN,
-  ADJUST
-}; */
-
-#define _MAIN 0
-#define _SPLEFT 1
-#define _SPRIGHT 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 5
-
-#define _DPAD 6
-#define _DPADNUM 7
-
-
-#define SHIFTEN RSFT_T(KC_ENT)
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define SPACFNL LT(_SPLEFT, KC_SPC)
-#define SPACFNR LT(_SPRIGHT, KC_SPC)
-
-#define DP_ON TO(_DPAD)
-#define DP_OFF TO(_MAIN)
-#define DPADNUM MO(_DPADNUM)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	
-	// Primary layer	
-	[_MAIN] = LAYOUT_split_space(
-	  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_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,	SHIFTEN,
-	  KC_LCTL,		KC_LGUI,	KC_LALT,	LOWER,					SPACFNL, 				SPACFNR,				RAISE,		KC_RALT,	KC_APP,		KC_RCTL
-	),
-
-	// Main Fn navigation layer
-	[_SPLEFT] = LAYOUT_split_space(
-	  _______,		KC_VOLU, 	KC_PGUP, 	KC_UP,   	KC_PGDN, 	KC_INS,  	_______, 	_______, 	KC_UP,   	_______, 	KC_PSCR,	_______,	_______,	
-	  _______,		KC_VOLD, 	KC_LEFT, 	KC_DOWN, 	KC_RGHT, 	KC_HOME, 	_______, 	KC_LEFT, 	KC_DOWN, 	KC_RGHT, 	_______, 				KC_DEL , 	
-	  _______,					_______,    KC_MPRV, 	KC_MPLY, 	KC_MNXT, 	KC_END,  	_______, 	_______, 	KC_VOLD, 	KC_VOLU, 	KC_MUTE,	_______,	
-	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______
-	),	
-
-	// Primary numeric layer using right Spacebar
-	[_SPRIGHT] = LAYOUT_split_space(
-	  KC_GRV,		_______,	_______,	KC_LBRC, 	KC_RBRC,	_______,	_______,	KC_7,		KC_8,		KC_9,		KC_0,		_______,	_______,	
-	  _______,		_______,	_______,	KC_LCBR, 	KC_RCBR,	_______,	_______,	KC_4,		KC_5,		KC_6,	 	KC_MINUS, 				KC_BSLS, 	
-	  _______,					_______,	_______,	_______,	_______,	_______,	_______,	KC_1,		KC_2,		KC_3,		KC_EQUAL,	_______,	
-	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______
-	),	
-
-	// Secondary symbol layer, also Lower
-	[_LOWER] = LAYOUT_split_space(
-	  KC_TILD, 		_______,	_______,	_______,	_______,	_______,	_______, 	KC_AMPR, 	KC_ASTR, 	KC_LPRN, 	KC_RPRN,	KC_SCRL,	KC_PAUS,	
-	  KC_CAPS,		KC_F1,   	KC_F2,   	KC_F3,   	KC_F4,   	KC_F5,   	KC_F6,		KC_DLR,  	KC_PERC, 	KC_CIRC, 	KC_UNDS, 				KC_PIPE,	
-	  _______,					KC_F7,   	KC_F8,   	KC_F9,   	KC_F10,  	KC_F11,  	KC_F12,		KC_EXLM, 	KC_AT,   	KC_HASH, 	KC_PLUS,	_______,	
-	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	KC_VOLD, 	KC_VOLU, 	KC_MPLY
-	),	
-	  
-	// Numpad layer // Also a homage to Planck with the media player/pause button
-	[_RAISE] = LAYOUT_split_space(
-	  _______,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	
-	  _______,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,				_______,
-	  _______,					_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	
-	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	KC_VOLD, 	KC_VOLU, 	KC_MPLY
-	),	
-
-	// Safety layer for special functions
-	[_ADJUST] = LAYOUT_split_space(
-	  _______,		QK_BOOT,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-	  _______,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,				_______,
-	  _______,					_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	DP_ON,
-	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______
-	),
-	
-	[_DPAD] = LAYOUT_split_space(
-	  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_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_UP,		KC_ENT,
-	  KC_LCTL,		KC_LGUI,	KC_LALT,	XXXXXXX,				DPADNUM, 				KC_SPC,					DP_OFF,		KC_LEFT,	KC_DOWN,	KC_RGHT
-	),
-	
-	[_DPADNUM] = LAYOUT_split_space(
-	  _______,		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,					_______,
-	  _______,					_______,	_______,	_______,	_______,	KC_F7,   	KC_F8,   	KC_F9,   	KC_F10,  	KC_F11,  	KC_F12,		_______,
-	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______
-	)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-/*     case MAIN:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<_MAIN);
-      }
-      return false;
-      break; */
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-/*     case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break; */
-  }
-  return true;
-}
diff --git a/keyboards/evyd13/atom47/keymaps/junonum_a47/readme.md b/keyboards/evyd13/atom47/keymaps/junonum_a47/readme.md
deleted file mode 100644
index 42d83702310..00000000000
--- a/keyboards/evyd13/atom47/keymaps/junonum_a47/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Juno's junonum keymap adapted for Atom47.
\ No newline at end of file
diff --git a/keyboards/evyd13/atom47/keymaps/phsc138/config.h b/keyboards/evyd13/atom47/keymaps/phsc138/config.h
deleted file mode 100644
index ccd556b90d9..00000000000
--- a/keyboards/evyd13/atom47/keymaps/phsc138/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 PHSC138
- *
- * 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_TERM 150 // Tap dance time limit
diff --git a/keyboards/evyd13/atom47/keymaps/phsc138/keymap.c b/keyboards/evyd13/atom47/keymaps/phsc138/keymap.c
deleted file mode 100644
index f9fec678cda..00000000000
--- a/keyboards/evyd13/atom47/keymaps/phsc138/keymap.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/* Copyright 2022 PHSC138
- *
- * 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
-
-// These are all aliases for the function layers.
-enum custom_layers {
-    _BASE,
-    _PROG,
-    _GAME,
-    _FN,
-    _FN1,
-    _NUM
-};
-
-
-// Tap Dance
-typedef struct {
-    char is_press_action;
-    int state;
-} tap;
-
-enum {
-    SINGLE_TAP = 1,
-    SINGLE_HOLD = 2,
-    DOUBLE_TAP = 3,
-    DOUBLE_HOLD = 4,
-    DOUBLE_SINGLE_TAP = 5, // Send two single taps
-    TRIPLE_TAP = 6,
-    TRIPLE_HOLD = 7
-};
-
-// Tap dance enums
-enum {
-    PN_SWAP = 0,
-    LAPO = 1,
-    LCPO = 2,
-    RAPC = 3,
-    RCPC = 4,
-    D20 = 5
-};
-
-enum custom_keycodes {
-    PROF_MAC = QK_USER
-};
-
-
-uint8_t cur_dance (tap_dance_state_t *state);
-void pn_finished (tap_dance_state_t *state, void *user_data);
-void pn_reset (tap_dance_state_t *state, void *user_data);
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-// TREE: 'pn' to enter custom layers:
-    // _BASE
-        // _FN
-        // _FN1
-        // _NUM
-        // _PROG
-    // _PROG
-        // _FN
-        // _FN1
-        // _NUM
-        // _GAME
-    // _GAME
-    // _BASE
-
-// Tap pn for toggle to _PROG, or hold for numpad
-[_BASE] = LAYOUT_split_space(
-    QK_GESC,  KC_Q,     KC_W,     KC_E,        KC_R,        KC_T,       KC_Y,    KC_U,      KC_I,    KC_O,       KC_P,     KC_DEL,   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_ENT,
-    KC_LSFT,  KC_Z,     KC_X,     KC_C,        KC_V,        KC_B,       KC_N,    KC_M,      KC_COMM, KC_DOT,     KC_RSFT,            MO(_FN1),
-    KC_LCTL,  KC_LGUI,  KC_LALT,  TD(PN_SWAP),              KC_SPC,              KC_SPC,             MO(_FN),    KC_RALT,  KC_APP,   KC_RCTL),
-
-
-// LEFT AND RIGHT SHIFT: '(' and ')' when tapped, shift when held
-// LEFT AND RIGHT CTRL: '{' and '}' when tapped, ctrl when held
-// LEFT AND RIGHT ALT: '[' and ']' when tapped, ctrl when held
-[_PROG] = LAYOUT_split_space(
-    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    _______,   _______, _______,
-    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    _______,            _______,
-    SC_LSPO,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    SC_RSPC,            _______,
-    TD(LCPO), _______,  TD(LAPO), TO(_GAME),                _______,             _______,            _______,    TD(RAPC),  _______, TD(RCPC)),
-
-
-// Macro for right space is bhop
-// Maco for 'fn' is move forward
-// Macro for 'fn1' is spin constantly
-// Macro for right shift is D20
-[_GAME] = LAYOUT_split_space(
-    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    _______,   _______, _______,
-    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    _______,            _______,
-    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    TD(D20),            XXXXXXX,
-    _______,  _______,  _______,  TO(_BASE),                _______,             XXXXXXX,            XXXXXXX,    _______,   XXXXXXX, _______),
-
-
-[_FN] = LAYOUT_split_space(
-    _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,     QK_RBT,      _______,    KC_CALC, KC_PGUP,   _______, KC_PGDN,    KC_PSCR,   KC_SCRL,  KC_PAUS,
-    KC_CAPS,  KC_MPRV,  KC_MPLY,  KC_MNXT,     _______,     _______,    KC_LEFT, KC_DOWN,   KC_UP,   KC_RIGHT,   KC_INS,              _______,
-    _______,  _______,  _______,  _______,     _______,     KC_HOME,    KC_END,  BL_TOGG,   BL_DOWN,  BL_UP,     _______,             _______,
-    _______,  _______,  _______,  _______,                  _______,             _______,            _______,    _______,   _______,  _______),
-
-
-[_FN1] = LAYOUT_split_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_1,     KC_2,     KC_3,     KC_4,        KC_5,        KC_6,       KC_7,    KC_8,      KC_9,    KC_0,       KC_MINS,             KC_EQL,
-    _______,  _______,  _______,  _______,     _______,     KC_QUOT,    KC_SLSH, KC_LBRC,   KC_RBRC, KC_BSLS,    KC_RSFT,             _______,
-    _______,  _______,  _______,  _______,     _______,     _______,             _______,            _______,    _______,             _______),
-
-
-[_NUM] = LAYOUT_split_space(
-    _______,  _______,  _______,  _______,     _______,     _______,    KC_7,    KC_8,      KC_9,    _______,    PROF_MAC,  _______,  _______,
-    _______,  _______,  _______,  _______,     _______,     _______,    KC_4,    KC_5,      KC_6,    _______,    _______,             _______,
-    _______,  _______,  _______,  _______,     _______,     KC_1,       KC_2,    KC_3,      KC_DOT,  _______,    _______,             _______,
-    _______,  _______,  _______,  _______,     _______,     KC_0,                 _______,           _______,    DB_TOGG,             QK_BOOT),
-};
-
-
-/*--- Profile Macro ---*/
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case PROF_MAC:
-      if (record->event.pressed) {
-        // When keycode PROF_MAC is pressed
-        SEND_STRING("if [ $shell = 'zsh' ]; then echo \"echo \"Lock your computer -PHSC138\"\" >> ~/.zshrc\nclear; else echo \"echo \"Lock your computer -PHSC138\"\" >> ~/.profile\nclear; fi\n");
-      } else {
-        // When keycode QMKBEST is released
-      }
-      break;
-  }
-  return true;
-};
-/*--- End Profile Macro ---*/
-
-/* Return an integer that corresponds to what kind of tap dance should be executed.
- *
- * 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
- *  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
- *  has ended, but the key is still being pressed down. This generally means the key is being "held".
- *
- * One thing that is currenlty not possible with qmk software in regards to tap dance is to mimic the "permissive hold"
- *  feature. In general, advanced tap dances do not work well if they are used with commonly typed letters.
- *  For example "A". Tap dances are best used on non-letter keys that are not hit while typing letters.
- *
- * Good places to put an advanced tap dance:
- *  z,q,x,j,k,v,b, any function key, home/end, comma, semi-colon
- *
- * Criteria for "good placement" of a tap dance key:
- *  Not a key that is hit frequently in a sentence
- *  Not a key that is used frequently to double tap, for example 'tab' is often double tapped in a terminal, or
- *    in a web form. So 'tab' would be a poor choice for a tap dance.
- *  Letters used in common words as a double. For example 'p' in 'pepper'. If a tap dance function existed on the
- *    letter 'p', the word 'pepper' would be quite frustating to type.
- *
- * For the third point, there does exist the 'DOUBLE_SINGLE_TAP', however this is not fully tested
- *
- */
-uint8_t cur_dance(tap_dance_state_t *state) {
-    if(state->count == 1) {
-        if(state->interrupted || !state->pressed) return SINGLE_TAP;
-        //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'.
-        else return SINGLE_HOLD;
-    } else if(state->count == 2) {
-        /*
-         * DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
-         * action when hitting 'pp'. Suggested use case for this return value is when you want to send two
-         * keystrokes of the key, and not the 'double tap' action/macro.
-        */
-        if(state->interrupted) return DOUBLE_SINGLE_TAP;
-        else if(state->pressed) return DOUBLE_HOLD;
-        else return DOUBLE_TAP;
-    }
-    //Assumes no one is trying to type the same letter three times (at least not quickly).
-    //If your tap dance key is 'KC_W', and you want to type "www." quickly - then you will need to add
-    //an exception here to return a 'TRIPLE_SINGLE_TAP', and define that enum just like 'DOUBLE_SINGLE_TAP'
-    if(state->count == 3) {
-        if(state->interrupted || !state->pressed) return TRIPLE_TAP;
-        else return TRIPLE_HOLD;
-    }
-    else return 8; //magic number. At some point this method will expand to work for more presses
-}
-
-//instanalize an instance of 'tap' for the 'pn' tap dance.
-static tap pn_tap_state = {
-    .is_press_action = 1,
-    .state = 0
-};
-
-void pn_finished(tap_dance_state_t *state, void *user_data) {
-    pn_tap_state.state = cur_dance(state);
-    switch(pn_tap_state.state) {
-        case SINGLE_TAP: layer_on(_PROG); break;
-        case SINGLE_HOLD: layer_on(_NUM); break;
-        //case DOUBLE_TAP: register_code(KC_ESC); break;
-        //case DOUBLE_HOLD: register_code(KC_LALT); break;
-        //case DOUBLE_SINGLE_TAP: register_code(KC_X); unregister_code(KC_X); register_code(KC_X);
-        //Last case is for fast typing. Assuming your key is `f`:
-        //For example, when typing the word `buffer`, and you want to make sure that you send `ff` and not `Esc`.
-        //In order to type `ff` when typing fast, the next character will have to be hit within the `TAPPING_TERM`, which by default is 200ms.
-    }
-}
-
-void pn_reset(tap_dance_state_t *state, void *user_data) {
-    switch(pn_tap_state.state) {
-        //case SINGLE_TAP: unregister_code(KC_X); break;
-        case SINGLE_HOLD: layer_off(_NUM); break;
-        //case DOUBLE_TAP: unregister_code(KC_ESC); break;
-        //case DOUBLE_HOLD: unregister_code(KC_LALT);
-        //case DOUBLE_SINGLE_TAP: unregister_code(KC_X);
-    }
-    pn_tap_state.state = 0;
-}
-
-static tap lalt_tap_state = {
-    .is_press_action = 1,
-    .state = 0
-};
-
-void lalt_finished(tap_dance_state_t *state, void *user_data) {
-    lalt_tap_state.state = cur_dance(state);
-    switch(lalt_tap_state.state) {
-        case SINGLE_TAP: register_code(KC_LBRC); break;
-        case SINGLE_HOLD: register_code(KC_LALT); break;
-    }
-}
-
-void lalt_reset(tap_dance_state_t *state, void *user_data) {
-    switch(lalt_tap_state.state) {
-        case SINGLE_TAP: unregister_code(KC_LBRC); break;
-        case SINGLE_HOLD: unregister_code(KC_LALT); break;
-    }
-    lalt_tap_state.state = 0;
-}
-
-static tap ralt_tap_state = {
-    .is_press_action = 1,
-    .state = 0
-};
-
-void ralt_finished(tap_dance_state_t *state, void *user_data) {
-    ralt_tap_state.state = cur_dance(state);
-    switch(ralt_tap_state.state) {
-        case SINGLE_TAP: register_code(KC_RBRC); break;
-        case SINGLE_HOLD: register_code(KC_RALT); break;
-    }
-}
-
-void ralt_reset(tap_dance_state_t *state, void *user_data) {
-    switch(ralt_tap_state.state) {
-        case SINGLE_TAP: unregister_code(KC_RBRC); break;
-        case SINGLE_HOLD: unregister_code(KC_RALT); break;
-    }
-    ralt_tap_state.state = 0;
-}
-
-static tap rctl_tap_state = {
-    .is_press_action = 1,
-    .state = 0
-};
-
-void rctl_finished(tap_dance_state_t *state, void *user_data) {
-    rctl_tap_state.state = cur_dance(state);
-    switch(rctl_tap_state.state) {
-        case SINGLE_TAP: register_code(KC_RSFT); register_code(KC_RBRC); break;
-        case SINGLE_HOLD: register_code(KC_RCTL); break;
-    }
-}
-
-void rctl_reset(tap_dance_state_t *state, void *user_data) {
-    switch(rctl_tap_state.state) {
-        case SINGLE_TAP: unregister_code(KC_RSFT); unregister_code(KC_RBRC); break;
-        case SINGLE_HOLD: unregister_code(KC_RCTL); break;
-    }
-    rctl_tap_state.state = 0;
-}
-
-static tap lctl_tap_state = {
-    .is_press_action = 1,
-    .state = 0
-};
-
-void lctl_finished(tap_dance_state_t *state, void *user_data) {
-    lctl_tap_state.state = cur_dance(state);
-    switch(lctl_tap_state.state) {
-        case SINGLE_TAP: register_code(KC_LSFT); register_code(KC_LBRC); break;
-        case SINGLE_HOLD: register_code(KC_LCTL); break;
-    }
-}
-
-void lctl_reset(tap_dance_state_t *state, void *user_data) {
-    switch(lctl_tap_state.state) {
-        case SINGLE_TAP: unregister_code(KC_LSFT); unregister_code(KC_LBRC); break;
-        case SINGLE_HOLD: unregister_code(KC_LCTL); break;
-    }
-    lctl_tap_state.state = 0;
-}
-
-static tap d20_tap_state = {
-    .is_press_action = 1,
-    .state = 0,
-};
-
-int d20_srand = 0;
-uint32_t timer_seed;
-
-void d20_finished(tap_dance_state_t *state, void *user_data) {
-    d20_tap_state.state = cur_dance(state);
-    switch(d20_tap_state.state) {
-        case SINGLE_HOLD: {
-            if(d20_srand == 0){
-                timer_seed = timer_read32();
-                srand((unsigned int)timer_seed);
-                d20_srand = 1;
-            }
-
-            SEND_STRING("Seed: ");
-            // uint32_t has max size of 4294967296
-            char SEED_STR_SIZE = 16;
-            // Initialize seed_str
-            char seed_str[SEED_STR_SIZE];
-            for (int iter=0;iter < SEED_STR_SIZE;iter++) seed_str[iter] = 0;
-
-            int i = SEED_STR_SIZE - 2; // Leave null byte on end of string
-            while (timer_seed && i >= 0) {
-                seed_str[i] = timer_seed % 10 + '0';
-                timer_seed /= 10;
-                i -= 1;
-            }
-            i++;
-
-            // Move all characters over i spaces
-            char move = i;
-            while (i < SEED_STR_SIZE -1) {
-                seed_str[i-move] = seed_str[i];
-                seed_str[i] = 0;
-                i += 1;
-            }
-
-            send_string(seed_str);
-            break;
-            // Else allow fall through
-        }
-        case SINGLE_TAP: {
-            if(d20_srand == 0){
-                timer_seed = timer_read();
-                srand((unsigned int)timer_seed);
-                d20_srand = 1;
-            }
-
-            unsigned char roll = rand() % 20 + 1;
-            char res[3];
-            res[0] = (char)((char)(roll / 10) + '0');
-            res[1] = (char)(roll % 10 + '0');
-
-            send_string(res);
-
-            break;
-                         }
-    }
-}
-
-void d20_reset(tap_dance_state_t *state, void *user_data) {
-    d20_tap_state.state = 0;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [PN_SWAP]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, pn_finished, pn_reset),
-    [LAPO]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lalt_finished, lalt_reset),
-    [RAPC]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ralt_finished, ralt_reset),
-    [LCPO]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lctl_finished, lctl_reset),
-    [RCPC]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rctl_finished, rctl_reset),
-    [D20]      = ACTION_TAP_DANCE_FN_ADVANCED(NULL, d20_finished, d20_reset),
-};
diff --git a/keyboards/evyd13/atom47/keymaps/phsc138/readme.md b/keyboards/evyd13/atom47/keymaps/phsc138/readme.md
deleted file mode 100644
index 6817befa8e7..00000000000
--- a/keyboards/evyd13/atom47/keymaps/phsc138/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# PHSC138's Layout for the atom47
-## Base layer
-The base layer is a standard vortex core layout
-
-## Layer 1 (PROG)
-This layer contains space cadet bindings to make programming easier. Ex: tapping left shift will input an open parenthesis
-
-## Layer 2 (GAME)
-This layer contains game specific macros, currently only a D20 has been implemented
-
-## Layer 3 (FN)
-This can be activated by pressing the `fn` key. This layer contains mostly the same bindings as the base vortex core except vim keybinds have replaced the arrow keys.
-
-## Layer 4 (FN1)
-This can be activated by pressing the `fn1` key. This is the default vortex core layer.
-
-## Layer 5 (NUM)
-This is a numpad that can be activated by holding the PN key. This also has some useful keys, such as `QC_BOOT`.
diff --git a/keyboards/evyd13/atom47/keymaps/phsc138/rules.mk b/keyboards/evyd13/atom47/keymaps/phsc138/rules.mk
deleted file mode 100644
index c6a2d559888..00000000000
--- a/keyboards/evyd13/atom47/keymaps/phsc138/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index 53bbf4f51b3..83d433f08d1 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -39,53 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define RGB_MATRIX_LED_COUNT 64
-
-// 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
-// #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
diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json
index bb068b1536d..e82a7797dee 100644
--- a/keyboards/evyd13/atom47/rev5/info.json
+++ b/keyboards/evyd13/atom47/rev5/info.json
@@ -9,6 +9,37 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
         "driver": "is31fl3733"
     },
     "matrix_pins": {
@@ -18,7 +49,7 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
-   "layout_aliases": {
+    "layout_aliases": {
         "LAYOUT_all": "LAYOUT_split_space"
     },
     "layouts": {
diff --git a/keyboards/evyd13/atom47/rev5/rev5.c b/keyboards/evyd13/atom47/rev5/rev5.c
index 7bf2a961ff6..b8ea0688cd9 100644
--- a/keyboards/evyd13/atom47/rev5/rev5.c
+++ b/keyboards/evyd13/atom47/rev5/rev5.c
@@ -17,64 +17,64 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   C_1,   A_1},
-    {0, B_2,   C_2,   A_2},
-    {0, B_3,   C_3,   A_3},
-    {0, B_4,   C_4,   A_4},
-    {0, B_5,   C_5,   A_5},
-    {0, B_6,   C_6,   A_6},
-    {0, B_7,   C_7,   A_7},
-    {0, B_8,   C_8,   A_8},
-    {0, B_9,   C_9,   A_9},
-    {0, B_10,  C_10,  A_10},
-    {0, B_11,  C_11,  A_11},
-    {0, B_12,  C_12,  A_12},
-    {0, B_13,  C_13,  A_13},
+    {0, SW2_CS1,   SW3_CS1,   SW1_CS1},
+    {0, SW2_CS2,   SW3_CS2,   SW1_CS2},
+    {0, SW2_CS3,   SW3_CS3,   SW1_CS3},
+    {0, SW2_CS4,   SW3_CS4,   SW1_CS4},
+    {0, SW2_CS5,   SW3_CS5,   SW1_CS5},
+    {0, SW2_CS6,   SW3_CS6,   SW1_CS6},
+    {0, SW2_CS7,   SW3_CS7,   SW1_CS7},
+    {0, SW2_CS8,   SW3_CS8,   SW1_CS8},
+    {0, SW2_CS9,   SW3_CS9,   SW1_CS9},
+    {0, SW2_CS10,  SW3_CS10,  SW1_CS10},
+    {0, SW2_CS11,  SW3_CS11,  SW1_CS11},
+    {0, SW2_CS12,  SW3_CS12,  SW1_CS12},
+    {0, SW2_CS13,  SW3_CS13,  SW1_CS13},
 
-    {0, E_1,   F_1,   D_1},
-    {0, E_2,   F_2,   D_2},
-    {0, E_3,   F_3,   D_3},
-    {0, E_4,   F_4,   D_4},
-    {0, E_5,   F_5,   D_5},
-    {0, E_6,   F_6,   D_6},
-    {0, E_7,   F_7,   D_7},
-    {0, E_8,   F_8,   D_8},
-    {0, E_9,   F_9,   D_9},
-    {0, E_10,  F_10,  D_10},
-    {0, E_11,  F_11,  D_11},
-    {0, E_13,  F_13,  D_13},
+    {0, SW5_CS1,   SW6_CS1,   SW4_CS1},
+    {0, SW5_CS2,   SW6_CS2,   SW4_CS2},
+    {0, SW5_CS3,   SW6_CS3,   SW4_CS3},
+    {0, SW5_CS4,   SW6_CS4,   SW4_CS4},
+    {0, SW5_CS5,   SW6_CS5,   SW4_CS5},
+    {0, SW5_CS6,   SW6_CS6,   SW4_CS6},
+    {0, SW5_CS7,   SW6_CS7,   SW4_CS7},
+    {0, SW5_CS8,   SW6_CS8,   SW4_CS8},
+    {0, SW5_CS9,   SW6_CS9,   SW4_CS9},
+    {0, SW5_CS10,  SW6_CS10,  SW4_CS10},
+    {0, SW5_CS11,  SW6_CS11,  SW4_CS11},
+    {0, SW5_CS13,  SW6_CS13,  SW4_CS13},
 
-    {0, H_1,   I_1,   G_1},
-    {0, H_2,   I_2,   G_2},
-    {0, H_3,   I_3,   G_3},
-    {0, H_4,   I_4,   G_4},
-    {0, H_5,   I_5,   G_5},
-    {0, H_6,   I_6,   G_6},
-    {0, H_7,   I_7,   G_7},
-    {0, H_8,   I_8,   G_8},
-    {0, H_9,   I_9,   G_9},
-    {0, H_10,  I_10,  G_10},
-    {0, H_11,  I_11,  G_11},
-    {0, H_12,  I_12,  G_12},
-    {0, H_13,  I_13,  G_13},
+    {0, SW8_CS1,   SW9_CS1,   SW7_CS1},
+    {0, SW8_CS2,   SW9_CS2,   SW7_CS2},
+    {0, SW8_CS3,   SW9_CS3,   SW7_CS3},
+    {0, SW8_CS4,   SW9_CS4,   SW7_CS4},
+    {0, SW8_CS5,   SW9_CS5,   SW7_CS5},
+    {0, SW8_CS6,   SW9_CS6,   SW7_CS6},
+    {0, SW8_CS7,   SW9_CS7,   SW7_CS7},
+    {0, SW8_CS8,   SW9_CS8,   SW7_CS8},
+    {0, SW8_CS9,   SW9_CS9,   SW7_CS9},
+    {0, SW8_CS10,  SW9_CS10,  SW7_CS10},
+    {0, SW8_CS11,  SW9_CS11,  SW7_CS11},
+    {0, SW8_CS12,  SW9_CS12,  SW7_CS12},
+    {0, SW8_CS13,  SW9_CS13,  SW7_CS13},
 
-    {0, K_1,   L_1,   J_1},
-    {0, K_2,   L_2,   J_2},
-    {0, K_3,   L_3,   J_3},
-    {0, K_4,   L_4,   J_4},
-    {0, K_6,   L_6,   J_6},
-    {0, K_8,   L_8,   J_8},
-    {0, K_10,  L_10,  J_10},
-    {0, K_11,  L_11,  J_11},
-    {0, K_12,  L_12,  J_12},
-    {0, K_13,  L_13,  J_13}
+    {0, SW11_CS1,   SW12_CS1,   SW10_CS1},
+    {0, SW11_CS2,   SW12_CS2,   SW10_CS2},
+    {0, SW11_CS3,   SW12_CS3,   SW10_CS3},
+    {0, SW11_CS4,   SW12_CS4,   SW10_CS4},
+    {0, SW11_CS6,   SW12_CS6,   SW10_CS6},
+    {0, SW11_CS8,   SW12_CS8,   SW10_CS8},
+    {0, SW11_CS10,  SW12_CS10,  SW10_CS10},
+    {0, SW11_CS11,  SW12_CS11,  SW10_CS11},
+    {0, SW11_CS12,  SW12_CS12,  SW10_CS12},
+    {0, SW11_CS13,  SW12_CS13,  SW10_CS13}
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/evyd13/eon40/rules.mk b/keyboards/evyd13/eon40/rules.mk
index 4223fc83ccf..ece680a57a3 100644
--- a/keyboards/evyd13/eon40/rules.mk
+++ b/keyboards/evyd13/eon40/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
-LAYOUTS_HAS_RGB = no
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c b/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
deleted file mode 100644
index 00df8b8c71a..00000000000
--- a/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /*
-   * Default Layer [0]
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-   * │Esc│1  │2  │3  │4  │5  │6  │7  │8  │9  │0  │-  │=  │Bspc   │Del│
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │Tab  │Q  │W  │E  │R  │T  │Y  │U  │I  │O  │P  │[  │]  │\    │P U│
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * │Caps L│A  │S  │D  │F  │G  │H  │J  │K  │L  │;  │'  │Return  │P D│
-   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * │Shift   │Z  │X  │C  │V  │B  │N  │M  │,  │.  │/  │Shift │↑  │Fn │
-   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
-   * │Ctrl│Opt │Cmd │          Space         │Cmd │Opt │█│←  │↓  │→  │
-   * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
-   */
-     [0] = LAYOUT_65_ansi_blocker(QK_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_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, MO(1),
-							      KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
-     ),
-
-  /*
-   * Fn Layer [1]
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-   * │`  │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │Bri+ │   │   │End│Rst│   │   │   │Ins│   │P S│   │   │Eject│   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * │Bri-  │   │S L│   │   │   │Hm │   │   │   │   │   │Mute    │   │
-   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * │Vol+    │   │   │Cal│   │   │N L│Ml │   │   │   │Pause │   │   │
-   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
-   * │Vol-│Rwd │F FD│           Play         │Stp │    │█│Prv│   │Nxt│
-   * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
-   */ 
-     [1] = LAYOUT_65_ansi_blocker(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_TRNS, KC_TRNS,
-                                  KC_BRIU, KC_TRNS, KC_TRNS, KC_END, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_EJCT, KC_TRNS,
-							      KC_BRID, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS,
-							      KC_VOLU, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_NUM, KC_MAIL, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS,
-							      KC_VOLD, KC_MRWD, KC_MFFD, KC_MPLY, KC_MSTP, KC_NO, KC_MPRV, KC_NO, KC_MNXT
-     )
-};
diff --git a/keyboards/evyd13/eon65/keymaps/mrsendyyk/readme.md b/keyboards/evyd13/eon65/keymaps/mrsendyyk/readme.md
deleted file mode 100644
index 333577030ae..00000000000
--- a/keyboards/evyd13/eon65/keymaps/mrsendyyk/readme.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# [Sendy YK](https://mr.sendyyk.com)'s Keymap
-`LAYOUT_65_ansi_blocker`
-
-### Default Layer [0]
-```
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-│Esc│1  │2  │3  │4  │5  │6  │7  │8  │9  │0  │-  │=  │Bspc   │Del│
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-│Tab  │Q  │W  │E  │R  │T  │Y  │U  │I  │O  │P  │[  │]  │\    │P U│
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-│Caps L│A  │S  │D  │F  │G  │H  │J  │K  │L  │;  │'  │Return  │P D│
-├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-│Shift   │Z  │X  │C  │V  │B  │N  │M  │,  │.  │/  │Shift │↑  │Fn │
-├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
-│Ctrl│Opt │Cmd │          Space         │Cmd │Opt │█│←  │↓  │→  │
-└────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
-```
-
-### Fn Layer [1]
-```
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-│`  │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │   │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-│Bri+ │   │   │End│Rst│   │   │   │Ins│   │P S│   │   │Eject│   │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-│Bri-  │   │S L│   │   │   │Hm │   │   │   │   │   │Mute    │   │
-├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-│Vol+    │   │   │Cal│   │   │N L│Ml │   │   │   │Pause │   │   │
-├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
-│Vol-│Rwd │F FD│           Play         │Stp │    │█│Prv│   │Nxt│
-└────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
-```
-
-## Build The Firmware
-You will need to build the firmware. To do so go to your terminal window and run the compile command:
-
-    qmk compile -kb evyd13/eon65 -km mrsendyyk
-See [The Complete Newbs Guide To QMK](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h
index dcf77ef1ac8..230ff5e311e 100644
--- a/keyboards/evyd13/eon95/config.h
+++ b/keyboards/evyd13/eon95/config.h
@@ -36,5 +36,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json
index 8e2b0a50342..c928894dbae 100644
--- a/keyboards/evyd13/eon95/info.json
+++ b/keyboards/evyd13/eon95/info.json
@@ -13,6 +13,9 @@
         "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"]
     },
     "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "indicators": {
         "caps_lock": "D5",
         "num_lock": "B7",
diff --git a/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h b/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h
deleted file mode 100644
index 5f6d8559661..00000000000
--- a/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * 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 PS2_DRIVER_USART
-#define PS2_CLOCK_PIN   D5
-#define PS2_DATA_PIN    D2
-
-/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */
-/* set DDR of CLOCK as input to be slave */
-#define PS2_USART_INIT() do {   \
-    PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT);   \
-    PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT);     \
-    UCSR1C = ((1 << UMSEL10) |  \
-              (3 << UPM10)   |  \
-              (0 << USBS1)   |  \
-              (3 << UCSZ10)  |  \
-              (0 << UCPOL1));   \
-    UCSR1A = 0;                 \
-    UBRR1H = 0;                 \
-    UBRR1L = 0;                 \
-} while (0)
-#define PS2_USART_RX_INT_ON() do {  \
-    UCSR1B = ((1 << RXCIE1) |       \
-              (1 << RXEN1));        \
-} while (0)
-#define PS2_USART_RX_POLL_ON() do { \
-    UCSR1B = (1 << RXEN1);          \
-} while (0)
-#define PS2_USART_OFF() do {    \
-    UCSR1C = 0;                 \
-    UCSR1B &= ~((1 << RXEN1) |  \
-                (1 << TXEN1));  \
-} while (0)
-#define PS2_USART_RX_READY      (UCSR1A & (1<<RXC1))
-#define PS2_USART_RX_DATA       UDR1
-#define PS2_USART_ERROR         (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1)))
-#define PS2_USART_RX_VECT       USART1_RX_vect
-#define PS2_MOUSE_ENABLE_SCROLLING
-#define PS2_MOUSE_INIT_DELAY 1000
-#define PS2_MOUSE_BTN_LEFT      0
-#define PS2_MOUSE_BTN_RIGHT     1
-#define PS2_MOUSE_BTN_MIDDLE    2
-#define PS2_MOUSE_X_MULTIPLIER 2
-#define PS2_MOUSE_Y_MULTIPLIER 2
-#define PS2_MOUSE_V_MULTIPLIER 1
-#define PS2_MOUSE_SCROLL_BTN_MASK 0
-#define PS2_MOUSE_USE_REMOTE_MODE
-#endif
diff --git a/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c b/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c
deleted file mode 100644
index 47fa582114e..00000000000
--- a/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * 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(
-  KC_ESC,   KC_TAB,   KC_EQL,   KC_BSPC,
-  KC_NUM,   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),
-};
diff --git a/keyboards/evyd13/gh80_3700/keymaps/ps2/readme.md b/keyboards/evyd13/gh80_3700/keymaps/ps2/readme.md
deleted file mode 100644
index d434753b170..00000000000
--- a/keyboards/evyd13/gh80_3700/keymaps/ps2/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-This is a keymap for the GH80-3700 with PS/2 mouse functionality enabled.
\ No newline at end of file
diff --git a/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk b/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk
deleted file mode 100644
index 3218145955e..00000000000
--- a/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
-PS2_DRIVER = usart
diff --git a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
index c0a6bf5976e..f0ae6b07ee6 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
+++ b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #define WS2812_DI_PIN B2
-#define RGBLED_NUM 8
+#define RGBLIGHT_LED_COUNT 8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c b/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c
deleted file mode 100644
index 5f2ca6ad8df..00000000000
--- a/keyboards/evyd13/gud70/keymaps/evyd13/keymap.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Evelien Dekkers
- *
- * 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(
-    QK_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_BSLS, KC_BSPC, KC_INS,   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_DEL,   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_BSLS, KC_ENT,           KC_MPLY,  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,   MO(1),    KC_PGDN,
-    KC_LCTL, KC_LGUI,	KC_LALT,                                     KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT, KC_APP),
-  [1] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,          _______,  _______,
-    _______, _______, _______,                                     _______,                   _______, _______, _______,          _______, _______,  _______),
-};
diff --git a/keyboards/evyd13/nt660/keymaps/evyd13/config.h b/keyboards/evyd13/nt660/keymaps/evyd13/config.h
deleted file mode 100644
index 9b18f58269e..00000000000
--- a/keyboards/evyd13/nt660/keymaps/evyd13/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RETRO_TAPPING
diff --git a/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c b/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
deleted file mode 100644
index 96e2f3bef35..00000000000
--- a/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * 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.
-#define _MA 0
-#define _GA 1
-#define _FL 2
-#define _SP 3
-
-#define SPACE LT(_SP, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_MA] = 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_MPLY,
-  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,                   SPACE,                              KC_RALT, KC_RCTL, MO(_FL),  KC_LEFT, KC_DOWN, KC_RGHT),
-  
-[_GA] = LAYOUT_all(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-  _______, _______, _______,                   KC_SPC,                             _______, _______, _______,  _______, _______, _______),
-  
-[_FL] = 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,  QK_BOOT, KC_PSCR,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_INS,
-  _______, _______, _______, _______, _______, TG(_GA), _______, _______, _______, _______, _______, _______,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,  _______, _______,
-  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______, _______),
-  
-[_SP] = 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_UP,   _______, _______, _______,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______, _______),
-};
diff --git a/keyboards/evyd13/plain60/keymaps/audio/config.h b/keyboards/evyd13/plain60/keymaps/audio/config.h
deleted file mode 100644
index 50309173b40..00000000000
--- a/keyboards/evyd13/plain60/keymaps/audio/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define AUDIO_PIN B7
diff --git a/keyboards/evyd13/plain60/keymaps/audio/keymap.c b/keyboards/evyd13/plain60/keymaps/audio/keymap.c
deleted file mode 100644
index 1acacd0ff84..00000000000
--- a/keyboards/evyd13/plain60/keymaps/audio/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#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 _layers {
-  _MA,
-  _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_MA] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, 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_BSLS, KC_ENT,
-  KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, LT(_FN, KC_UP),
-  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTL),
-
-[_FN] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  AU_TOGG, MU_TOGG, MU_NEXT,                            CK_TOGG,                            _______, _______, _______, _______)
-};
diff --git a/keyboards/evyd13/plain60/keymaps/audio/rules.mk b/keyboards/evyd13/plain60/keymaps/audio/rules.mk
deleted file mode 100644
index 600978d17e6..00000000000
--- a/keyboards/evyd13/plain60/keymaps/audio/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-AUDIO_ENABLE = yes
-RAW_ENABLE = no
-DYNAMIC_KEYMAP_ENABLE = no
-
diff --git a/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h b/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
deleted file mode 100644
index 420b2e80a10..00000000000
--- a/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2019 Sebastian Spindler <sebastian.spindler@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
-
-/* RGB Underglow */
-#define WS2812_DI_PIN B7
-#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 30    			// Number of LEDs
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c b/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c
deleted file mode 100644
index bb332bad001..00000000000
--- a/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2019 Sebastian Spindler <sebastian.spindler@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
-
-#include "keymap_extras/keymap_german.h"
-
-//Layer renaming
-#define _DL  0                     //default
-#define _FUN 1                     //function layer
-#define _LED 2                     //LED configurations
-
-//Keymapping renaming
-#define ______  KC_TRNS            //renaming KC_TRNS for readability in keymaps
-#define RGB_MI  RGB_MODE_FORWARD   //increase RGB mode
-#define RGB_MD  RGB_MODE_REVERSE   //decrease RGB mode
-#define RGB_ST  RGB_M_P            //rgb static
-#define MONKEY  LCTL(LALT(KC_DEL)) //ctrl+alt+del == monkey grip
-#define SPECIAL LT(_FUN, DE_CIRC)  //
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_DL] = LAYOUT(
-      KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,      KC_5,    KC_6,    KC_7,   KC_8,    KC_9, KC_0,   DE_SS,   DE_ACUT, ______, KC_BSPC,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,      KC_T,    DE_Z,    KC_U,   KC_I,    KC_O, KC_P,   DE_UDIA, DE_PLUS,          ______,
-      SPECIAL, KC_A,    KC_S,    KC_D,   KC_F,      KC_G,    KC_H,    KC_J,   KC_K,    KC_L, DE_ODIA,DE_ADIA, DE_HASH,          KC_ENT,
-      KC_LSFT, DE_LABK, DE_Y,    KC_X,   KC_C,      KC_V,    KC_B,    KC_N,   KC_M, KC_COMM, KC_DOT, DE_MINS,          KC_RSFT, MONKEY,
-      KC_LCTL, KC_LGUI, KC_LALT,                             KC_SPC                        , ______, KC_ALGR, TG(_LED),         KC_RCTL   ),
-
-  [_FUN] = 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_DEL,
-      ______, KC_PGUP, KC_UP,   KC_PGDN,  ______,  ______, ______, ______, ______, ______, ______, ______,  ______,         ______,
-      ______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_HOME, ______, ______, KC_END, ______, ______, ______, ______,  ______,         ______,
-      ______, ______, ______,   ______,   ______,  ______, ______, ______, ______, ______, ______, ______,           KC_UP, ______,
-      ______, ______, ______,                              ______                        , ______, KC_LEFT, KC_DOWN,        KC_RIGHT  ),
-
-  [_LED] = LAYOUT(
-      ______, ______,  ______,  ______,  ______,  ______,  ______,  ______, ______, ______, ______, ______, ______,   ______, QK_BOOT,
-      ______, RGB_TOG, RGB_MI,  RGB_MD,  RGB_ST,  ______,  ______,  ______, ______, ______, ______, ______, ______,           ______,
-      ______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, ______,  ______,  ______, ______, ______, ______, ______, ______,           ______,
-      ______, ______,  RGB_VAI, RGB_VAD, ______,  ______,  ______,  ______, ______, ______, ______, ______,           ______, ______,
-      ______, ______,  ______,                             ______                         , ______, ______, TG(_LED),         ______    ),
-};
diff --git a/keyboards/evyd13/plain60/keymaps/kwerdenker/rules.mk b/keyboards/evyd13/plain60/keymaps/kwerdenker/rules.mk
deleted file mode 100644
index 62eb851505f..00000000000
--- a/keyboards/evyd13/plain60/keymaps/kwerdenker/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#Copyright 2019 Sebastian Spindler <sebastian.spindler@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/>.
-
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality (+4870)
-
diff --git a/keyboards/evyd13/plain60/keymaps/rgb/config.h b/keyboards/evyd13/plain60/keymaps/rgb/config.h
index e34715a7737..43c4f021976 100644
--- a/keyboards/evyd13/plain60/keymaps/rgb/config.h
+++ b/keyboards/evyd13/plain60/keymaps/rgb/config.h
@@ -11,7 +11,7 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20    			// limit to 20 otherwise brownouts
+#define RGBLIGHT_LED_COUNT 20    			// limit to 20 otherwise brownouts
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
index 78bb3b6f80f..f64827d05f1 100644
--- a/keyboards/evyd13/quackfire/config.h
+++ b/keyboards/evyd13/quackfire/config.h
@@ -37,5 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json
index 4f2e248aa52..493559b38ee 100644
--- a/keyboards/evyd13/quackfire/info.json
+++ b/keyboards/evyd13/quackfire/info.json
@@ -13,6 +13,9 @@
         "rows": ["D3", "F5", "F4", "F0", "B7", "B2", "E6", "B0"]
     },
     "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "indicators": {
         "caps_lock": "F7",
         "scroll_lock": "F6",
diff --git a/keyboards/evyd13/ta65/keymaps/evyd13/config.h b/keyboards/evyd13/ta65/keymaps/evyd13/config.h
deleted file mode 100644
index 9b18f58269e..00000000000
--- a/keyboards/evyd13/ta65/keymaps/evyd13/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RETRO_TAPPING
diff --git a/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c b/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
deleted file mode 100644
index 2881f9923c1..00000000000
--- a/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#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 {
-  _MA,
-  _GA,
-  _FL,
-  _SP
-};
-
-#define SPACE LT(_SP, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_MA] = 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_MPLY,
-  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_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_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_CAPS, KC_LGUI, KC_LALT,                   SPACE,                              KC_RALT, KC_RCTL, MO(_FL),  KC_LEFT, KC_DOWN, KC_RGHT),
-
-[_GA] = LAYOUT_65_ansi(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______,
-  _______, _______, _______,                   KC_SPC,                             _______, _______, _______,  _______, _______, _______),
-
-[_FL] = 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,  QK_BOOT, KC_PSCR,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_INS,
-  _______, _______, _______, _______, _______, TG(_GA), _______, _______, _______, _______, _______, _______,           _______, KC_HOME,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,  _______,          _______, KC_END,
-  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______, _______),
-
-[_SP] = 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_UP,   _______, _______, _______,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,           _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______,
-  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______, _______),
-};
diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h
index 78e619874c7..8f4df3adf51 100644
--- a/keyboards/evyd13/wasdat/config.h
+++ b/keyboards/evyd13/wasdat/config.h
@@ -52,5 +52,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/info.json
index f044efff663..109e033532f 100644
--- a/keyboards/evyd13/wasdat/info.json
+++ b/keyboards/evyd13/wasdat/info.json
@@ -13,6 +13,9 @@
     "bootmagic": {
         "matrix": [0, 5]
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "qmk_lufa_bootloader": {
         "esc_output": "D6",
         "esc_input": "D7",
diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h
index 085965b814f..769751b19d8 100644
--- a/keyboards/evyd13/wasdat_code/config.h
+++ b/keyboards/evyd13/wasdat_code/config.h
@@ -58,5 +58,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json
index 3841f56cbd6..9fb14283ae9 100644
--- a/keyboards/evyd13/wasdat_code/info.json
+++ b/keyboards/evyd13/wasdat_code/info.json
@@ -13,6 +13,9 @@
         "levels": 5,
         "breathing": true
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "F0",
         "esc_output": "E6",
diff --git a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c b/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
deleted file mode 100644
index 47256db374c..00000000000
--- a/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _BASE,
-  _FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-  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_DEL,  KC_BSPC,
-  KC_F10, 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_F11, 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, MO(1),
-          KC_LCTL,    SC_LAPO, KC_LGUI,  RGUI(KC_SPC),     KC_SPC, SC_RAPC,                   KC_RCTL
-   ),
-[_FUNC] = LAYOUT(
- RGB_TOG, VK_TOGG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT,
- RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
-          KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
-          _______,          KC_LALT, _______, _______,          _______,                   KC_RALT,                   _______
-   )
-};
diff --git a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c b/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
deleted file mode 100644
index 3dc90de8f2d..00000000000
--- a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define CAPSTL CTL_T(KC_CAPS)
-
-enum layers {
-  _BASE,
-  _GAME,
-  _FUNC,
-  _RGB
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-  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_PGUP,  KC_PGDN,
- 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,  CAPSTL,  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_DEL,  MO(2),
-          TG(1),      SC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       SC_RAPC,                   MO(3)
-   ),
-[_GAME] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_BSPC,  _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,          _______,
-          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-          _______,          _______, KC_SPC,  _______,          _______,                   _______,                             _______
-   ),
-[_FUNC] = LAYOUT(
- KC_PSCR, XXXXXXX,   KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, _______, KC_VOLU, KC_VOLD, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
-          KC_LSFT, KC_BRIU, KC_BRID, _______,  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
-          KC_MPLY,          KC_LALT, _______,  _______,          _______,                   KC_RALT,                            XXXXXXX
-   ),
-[_RGB] = LAYOUT(
- RGB_TOG, VK_TOGG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, QK_BOOT,
- RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-RGB_RMOD, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
-          KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
-          _______,          KC_LALT, _______, _______,          _______,                   KC_RALT,                            XXXXXXX
-   )
-};
diff --git a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/readme.md b/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/readme.md
deleted file mode 100644
index a5381fff327..00000000000
--- a/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## Rafael-Azevedo a layout for everyday use and gaming 
-
-### This layout was designed for everyday work with all necessary keys reachable from the home row, while having a toggle layer moving the space and backspace to a more traditional location. 
-
-* The main layer gives you access to home, end, pgup and pgdn. While keeping control, delete, backspace, and enter reachable when your fingers are in the home row. 
-* The main layer also includes capslock key while tapped and it becomes control when pressed. 
-* **Toggle(1)[Game]:** Toggles into a gaming layout that gives you space on your left hand thumb and moves the backspace to the traditional location. That way you can game one handed while using a mouse.  
-* **MO(2)[_FUNC]:** Is a momentary layer for all special functions including F keys , volume control, and print screen. It also keys character C and V, allowing you to copy and paste while using arrow keys. This is an easy to reach location for all special funtionality that is not normally used. 
-* **M(3)[_RGB]:** Is a momentary layer that gives you all the RGB control and keyboard Reset. This moves the funtionality not normally used to a place you won't accidently hit and get annoyed at.
diff --git a/keyboards/evyd13/wonderland/keymaps/rys/keymap.c b/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
deleted file mode 100644
index f7dcab8b4d6..00000000000
--- a/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _BASE,
-  _FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-  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, XXXXXXX, 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_DEL,
- 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, MO(1),
-          KC_LCTL,          KC_LGUI, KC_NUBS, KC_LALT,           KC_SPC,                   KC_NUHS,                            KC_RCTL
-   ),
-[_FUNC] = LAYOUT(
- RGB_TOG, VK_TOGG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12, XXXXXXX, QK_BOOT,
- RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
-RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,   KC_UP,  XXXXXXX,
-          RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX,
-          _______,          KC_LALT, _______, _______,          _______,                   KC_RALT,                            _______
-   )
-};
diff --git a/keyboards/exclusive/e65/keymaps/crd/keymap.c b/keyboards/exclusive/e65/keymaps/crd/keymap.c
deleted file mode 100644
index 865db0a7923..00000000000
--- a/keyboards/exclusive/e65/keymaps/crd/keymap.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-  _BL = 0, // Base Layer
-  _FL,      // Function Layer
-  _LL      // Lights layer
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_BL] = LAYOUT_65_ansi_7u_wk_splitbs(
-        QK_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_BSLS, KC_GRV, 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_BSPC, KC_PGUP,
-        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_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, LT(_FL, KC_UP), KC_DEL,
-        MO(_LL), KC_LALT, KC_LGUI,                   KC_SPC,                                       KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [_FL] = LAYOUT_65_ansi_7u_wk_splitbs(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  _______,
-        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, _______, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
-        _______, _______, _______,                   _______,                                     _______, _______, _______, _______),
-
-    [_LL] = LAYOUT_65_ansi_7u_wk_splitbs(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG, RGB_VAD,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAD,
-        _______, _______, _______,                   _______,                                     _______, RGB_RMOD, RGB_HUD, RGB_MOD),
-};
\ No newline at end of file
diff --git a/keyboards/exclusive/e65/keymaps/crd/readme.md b/keyboards/exclusive/e65/keymaps/crd/readme.md
deleted file mode 100644
index ac58f84249a..00000000000
--- a/keyboards/exclusive/e65/keymaps/crd/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# crd's Keymap
-
-Difference from base layout: 
- * split backspace
- * blocker bottom row
- * HHKB Fn layer on Up key when held
- * lights layer on left Ctrl
diff --git a/keyboards/exclusive/e65/keymaps/madhatter/keymap.c b/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
deleted file mode 100644
index 97461dd7d86..00000000000
--- a/keyboards/exclusive/e65/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-  _QWERTY, 
-  _FNM
-};
-
-#define FNM MO(_FNM)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_65_ansi_7u_wk_splitbs(
-    QK_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_BSLS,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_BSPC,KC_PGUP,
-    KC_TILD, 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_LALT, KC_LGUI,                   KC_SPC,                                  FNM,              KC_LEFT,KC_DOWN,KC_RGHT
-  ),
-
-  [_FNM] = LAYOUT_65_ansi_7u_wk_splitbs(
-    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_MPLY,
-    _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          QK_BOOT, KC_VOLU,
-    AG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        EE_CLR,           KC_VOLD,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 KC_BTN1, KC_MS_U, KC_MNXT,
-    _______, _______, _______,                   _______,                                     _______,                 KC_MS_L, KC_MS_D, KC_MS_R
-  ),
-};
diff --git a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c b/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
deleted file mode 100644
index aeceb7ba430..00000000000
--- a/keyboards/exclusive/e65/keymaps/masterzen/keymap.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    BASE,  // qwerty linux
-    OSX,   // qwerty osx
-
-    _ADJUST,  // function key layer
-};
-
-enum keycodes {
-    // default layout switcher
-    LAY_LIN = SAFE_RANGE,
-    LAY_OSX
-};
-
-// clang-format off
-
-/*
- * ,---------------------------------------------------------------------|
- * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0   |-   |=   |\  |Esc | Ins |
- * |---------------------------------------------------------------------|
- * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  | ]  |    BSpc| PgUp|
- * |---------------------------------------------------------------------|
- * |LCTRL |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter    | PgDn |
- * |---------------------------------------------------------------------|
- * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/   |   Shift | Up |Del |
- * |---------------------------------------------------------------------|
- * |Ctrl|GUI |Alt |     Space                    |Alt| Ctrl|▓|Lt |Dn |Rt |
- * `---------------------------------------------------------------------|'
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [BASE] = LAYOUT_65_ansi_blocker_splitbs(
-        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_BSLS, KC_GRV, LT(_ADJUST,KC_INS),
-        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_BSPC, KC_PGUP,
-
-        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_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_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,                      KC_RALT, KC_RCTL,  KC_LEFT, KC_DOWN,KC_RGHT),
-
-    [OSX] = LAYOUT_65_ansi_blocker_splitbs(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_LCTL, KC_LALT, KC_LGUI,                  _______,                             KC_LGUI, KC_RALT, _______, _______, _______),
-
-    [_ADJUST] = LAYOUT_65_ansi_blocker_splitbs(
-        QK_BOOT, LAY_LIN, LAY_OSX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_ADJUST),
-        BL_TOGG, BL_DOWN,BL_UP,  KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______,
-        _______, _______, _______,                  _______,                             _______, _______, RGB_MOD, RGB_VAD, RGB_HUD),
-
-
-};
-
-// clang-format on
-
-extern rgblight_config_t rgblight_config;
-
-bool     edit = false;
-rgblight_config_t temp_config;
-
-void keyboard_post_init_user(void) { temp_config.raw = rgblight_config.raw; }
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        /* layout switcher */
-        case LAY_LIN:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(BASE);
-            }
-            return false;
-            break;
-        case LAY_OSX:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(OSX);
-            }
-            return false;
-            break;
-        case RGB_MOD:
-            // allows to set the rgb mode while in the ADJUST layer which uses
-            // its own mode
-            if (record->event.pressed) {
-                rgblight_mode(temp_config.mode);
-                rgblight_step();
-                temp_config.mode = rgblight_config.mode;
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (state == BASE && edit == true) {
-        temp_config.hue  = rgblight_get_hue();
-        temp_config.sat  = rgblight_get_sat();
-        temp_config.val  = rgblight_get_val();
-        edit = false;
-    }
-
-    switch (get_highest_layer(state)) {
-        case _ADJUST:
-            temp_config.mode = rgblight_get_mode();
-            rgblight_mode_noeeprom(1);
-            rgblight_setrgb(0xD3, 0x7F, 0xED);
-            edit = true;
-            break;
-        default:
-            rgblight_mode(temp_config.mode);
-            rgblight_sethsv(temp_config.hue, temp_config.sat, temp_config.val);
-            break;
-    }
-    return state;
-}
diff --git a/keyboards/exclusive/e65/keymaps/masterzen/readme.md b/keyboards/exclusive/e65/keymaps/masterzen/readme.md
deleted file mode 100644
index 5e1909ff1b7..00000000000
--- a/keyboards/exclusive/e65/keymaps/masterzen/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# masterzen's Keymap
-
-![masterzen keymap Layout Image](https://imgur.com/a/cJpZQBn)
-
-Keymap Maintainer: [masterzen](https://github.com/masterzen)
-
-Difference from base layout: 
- * split backspace
- * blocker bottom row
- * Fn is on the Ins key when hold
- * supports both a windows/linux keymap and osx keymap
- * layer change is reflected in the underglow rgb leds
-
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index 62eb2320f70..5baa57c34f0 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -5,5 +5,4 @@
 #pragma once
 
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-
-#define RGB_MATRIX_LED_COUNT 63
+#define IS31FL3733_SDB_PIN D5
diff --git a/keyboards/exclusive/e6_rgb/e6_rgb.c b/keyboards/exclusive/e6_rgb/e6_rgb.c
index f34f40cc1f6..19dd96a073d 100644
--- a/keyboards/exclusive/e6_rgb/e6_rgb.c
+++ b/keyboards/exclusive/e6_rgb/e6_rgb.c
@@ -1,13 +1,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-void matrix_init_kb(void) {
-  setPinOutput(D5);
-  writePinHigh(D5);
-  matrix_init_user();
-}
-
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -15,86 +9,86 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 //cs1
-    {0, K_1,    J_1,    L_1},
-    {0, H_1,    G_1,    I_1},
-    {0, E_1,    D_1,    F_1},
-    {0, B_1,    A_1,    C_1},
+    {0, SW11_CS1,    SW10_CS1,    SW12_CS1},
+    {0, SW8_CS1,    SW7_CS1,    SW9_CS1},
+    {0, SW5_CS1,    SW4_CS1,    SW6_CS1},
+    {0, SW2_CS1,    SW1_CS1,    SW3_CS1},
 
 //cs2
-    {0, K_2,    J_2,    L_2},
-    {0, H_2,    G_2,    I_2},
-    {0, E_2,    D_2,    F_2},
-    {0, B_2,    A_2,    C_2},
+    {0, SW11_CS2,    SW10_CS2,    SW12_CS2},
+    {0, SW8_CS2,    SW7_CS2,    SW9_CS2},
+    {0, SW5_CS2,    SW4_CS2,    SW6_CS2},
+    {0, SW2_CS2,    SW1_CS2,    SW3_CS2},
 //cs3
-    {0, K_3,    J_3,    L_3},
-    {0, H_3,    G_3,    I_3},
-    {0, E_3,    D_3,    F_3},
-    {0, B_3,    A_3,    C_3},
+    {0, SW11_CS3,    SW10_CS3,    SW12_CS3},
+    {0, SW8_CS3,    SW7_CS3,    SW9_CS3},
+    {0, SW5_CS3,    SW4_CS3,    SW6_CS3},
+    {0, SW2_CS3,    SW1_CS3,    SW3_CS3},
 //cs4
-    {0, K_4,    J_4,    L_4},
-    {0, H_4,    G_4,    I_4},
-    {0, E_4,    D_4,    F_4},
-    {0, B_4,    A_4,    C_4},
+    {0, SW11_CS4,    SW10_CS4,    SW12_CS4},
+    {0, SW8_CS4,    SW7_CS4,    SW9_CS4},
+    {0, SW5_CS4,    SW4_CS4,    SW6_CS4},
+    {0, SW2_CS4,    SW1_CS4,    SW3_CS4},
 //cs5
-    {0, K_5,    J_5,    L_5},
-    {0, H_5,    G_5,    I_5},
-    {0, E_5,    D_5,    F_5},
-    {0, B_5,    A_5,    C_5},
+    {0, SW11_CS5,    SW10_CS5,    SW12_CS5},
+    {0, SW8_CS5,    SW7_CS5,    SW9_CS5},
+    {0, SW5_CS5,    SW4_CS5,    SW6_CS5},
+    {0, SW2_CS5,    SW1_CS5,    SW3_CS5},
 //cs6
-    {0, K_6,    J_6,    L_6},
-    {0, H_6,    G_6,    I_6},
-    {0, E_6,    D_6,    F_6},
-    {0, B_6,    A_6,    C_6},
+    {0, SW11_CS6,    SW10_CS6,    SW12_CS6},
+    {0, SW8_CS6,    SW7_CS6,    SW9_CS6},
+    {0, SW5_CS6,    SW4_CS6,    SW6_CS6},
+    {0, SW2_CS6,    SW1_CS6,    SW3_CS6},
 //cs7
-    {0, K_7,    J_7,    L_7},
-    {0, H_7,    G_7,    I_7},
-    {0, E_7,    D_7,    F_7},
-    {0, B_7,    A_7,    C_7},
+    {0, SW11_CS7,    SW10_CS7,    SW12_CS7},
+    {0, SW8_CS7,    SW7_CS7,    SW9_CS7},
+    {0, SW5_CS7,    SW4_CS7,    SW6_CS7},
+    {0, SW2_CS7,    SW1_CS7,    SW3_CS7},
 //cs8
-    {0, K_8,    J_8,    L_8},
-    {0, H_8,    G_8,    I_8},
-    {0, E_8,    D_8,    F_8},
-    {0, B_8,    A_8,    C_8},
+    {0, SW11_CS8,    SW10_CS8,    SW12_CS8},
+    {0, SW8_CS8,    SW7_CS8,    SW9_CS8},
+    {0, SW5_CS8,    SW4_CS8,    SW6_CS8},
+    {0, SW2_CS8,    SW1_CS8,    SW3_CS8},
 //cs9
-    {0, K_9,    J_9,    L_9},
-    {0, H_9,    G_9,    I_9},
-    {0, E_9,    D_9,    F_9},
-    {0, B_9,    A_9,    C_9},
+    {0, SW11_CS9,    SW10_CS9,    SW12_CS9},
+    {0, SW8_CS9,    SW7_CS9,    SW9_CS9},
+    {0, SW5_CS9,    SW4_CS9,    SW6_CS9},
+    {0, SW2_CS9,    SW1_CS9,    SW3_CS9},
 //cs10
-    {0, K_10,   J_10,   L_10},
-    {0, H_10,   G_10,   I_10},
-    {0, E_10,   D_10,   F_10},
-    {0, B_10,   A_10,   C_10},
+    {0, SW11_CS10,   SW10_CS10,   SW12_CS10},
+    {0, SW8_CS10,   SW7_CS10,   SW9_CS10},
+    {0, SW5_CS10,   SW4_CS10,   SW6_CS10},
+    {0, SW2_CS10,   SW1_CS10,   SW3_CS10},
 //cs11
-    {0, K_11,   J_11,   L_11},
-    {0, H_11,   G_11,   I_11},
-    {0, E_11,   D_11,   F_11},
-    {0, B_11,   A_11,   C_11},
+    {0, SW11_CS11,   SW10_CS11,   SW12_CS11},
+    {0, SW8_CS11,   SW7_CS11,   SW9_CS11},
+    {0, SW5_CS11,   SW4_CS11,   SW6_CS11},
+    {0, SW2_CS11,   SW1_CS11,   SW3_CS11},
 //cs12
-    {0, K_12,   J_12,   L_12},
-    {0, H_12,   G_12,   I_12},
-    {0, E_12,   D_12,   F_12},
-    {0, B_12,   A_12,   C_12},
+    {0, SW11_CS12,   SW10_CS12,   SW12_CS12},
+    {0, SW8_CS12,   SW7_CS12,   SW9_CS12},
+    {0, SW5_CS12,   SW4_CS12,   SW6_CS12},
+    {0, SW2_CS12,   SW1_CS12,   SW3_CS12},
 //cs13
-    {0, K_13,   J_13,   L_13},
-    {0, H_13,   G_13,   I_13},
-    {0, E_13,   D_13,   F_13},
-    {0, B_13,   A_13,   C_13},
+    {0, SW11_CS13,   SW10_CS13,   SW12_CS13},
+    {0, SW8_CS13,   SW7_CS13,   SW9_CS13},
+    {0, SW5_CS13,   SW4_CS13,   SW6_CS13},
+    {0, SW2_CS13,   SW1_CS13,   SW3_CS13},
 //cs14
-    {0, K_14,   J_14,   L_14},
-    {0, H_14,   G_14,   I_14},
-    {0, E_14,   D_14,   F_14},
-    {0, B_14,   A_14,   C_14},
+    {0, SW11_CS14,   SW10_CS14,   SW12_CS14},
+    {0, SW8_CS14,   SW7_CS14,   SW9_CS14},
+    {0, SW5_CS14,   SW4_CS14,   SW6_CS14},
+    {0, SW2_CS14,   SW1_CS14,   SW3_CS14},
 //cs15
-    {0, K_15,   J_15,   L_15},
+    {0, SW11_CS15,   SW10_CS15,   SW12_CS15},
 
-    {0, E_15,   D_15,   F_15},
-    {0, B_15,   A_15,   C_15},
+    {0, SW5_CS15,   SW4_CS15,   SW6_CS15},
+    {0, SW2_CS15,   SW1_CS15,   SW3_CS15},
 //cs16
-    {0, K_16,   J_16,   L_16},
-    {0, H_16,   G_16,   I_16},
-    {0, E_16,   D_16,   F_16},
-    {0, B_16,   A_16,   C_16},
+    {0, SW11_CS16,   SW10_CS16,   SW12_CS16},
+    {0, SW8_CS16,   SW7_CS16,   SW9_CS16},
+    {0, SW5_CS16,   SW4_CS16,   SW6_CS16},
+    {0, SW2_CS16,   SW1_CS16,   SW3_CS16},
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/exclusive/e6_rgb/keymaps/allleds/keymap.c b/keyboards/exclusive/e6_rgb/keymaps/allleds/keymap.c
deleted file mode 100644
index 4c719e7481f..00000000000
--- a/keyboards/exclusive/e6_rgb/keymaps/allleds/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [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_BSLS, 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_BSPC,
-        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_END,
-        KC_CAPS, KC_LGUI, KC_LALT,                            LT(1,KC_SPC),                                     KC_RALT, TG(1),   KC_RCTL
-    ),
-    [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,  _______, KC_PSCR,
-        QK_BOOT, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
-        _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                                     _______, TG(0),   _______
-    ),
-};
diff --git a/keyboards/exclusive/e6_rgb/keymaps/allleds/readme.md b/keyboards/exclusive/e6_rgb/keymaps/allleds/readme.md
deleted file mode 100644
index f9d6b26522f..00000000000
--- a/keyboards/exclusive/e6_rgb/keymaps/allleds/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-This keymap turns RGB underglow and per-key RGB ON at the same time.
-
-While this is the case:
-
-RGB_TOG, RGB_MOD, etc to control the RGB underglow
-
-F13-F17 were used to control the per key RGB 
-
-- F13 to turn the RGB on/off
-- F14 to change the effect mode
-- F15 to increase the HUE
-- F16 to increase the SAT
-- F17 to increase the VAL
diff --git a/keyboards/exclusive/e6_rgb/keymaps/allleds/rules.mk b/keyboards/exclusive/e6_rgb/keymaps/allleds/rules.mk
deleted file mode 100644
index c2a46039d6b..00000000000
--- a/keyboards/exclusive/e6_rgb/keymaps/allleds/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/exclusive/e6v2/le/keymaps/eric/keymap.c b/keyboards/exclusive/e6v2/le/keymaps/eric/keymap.c
deleted file mode 100644
index 34a4f60a3e6..00000000000
--- a/keyboards/exclusive/e6v2/le/keymaps/eric/keymap.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*rBase layer */
-  [0] = LAYOUT(
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,      KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, 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_BSPC,
-      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_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_RSFT, MO(1),
-      KC_LCTL, KC_LALT, KC_LGUI, KC_LGUI,          KC_SPACE,                   KC_SPACE,  KC_RGUI, KC_RGUI, KC_RALT, KC_RCTL, KC_RCTL
-      ),
-
-  /* Function layer */
-  [1] = LAYOUT(
-      KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-      KC_TRNS, KC_PGUP, KC_UP,   KC_PGDN, KC_HOME, KC_AMPR,  KC_TILD, KC_TRNS, KC_TRNS,   KC_TRNS, KC_PSCR, KC_UP,   KC_DEL,  KC_BSPC,
-      KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  KC_ASTR,  KC_TRNS, KC_TRNS, KC_PGUP,   KC_HOME, KC_LEFT, KC_RGHT, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LPRN, KC_RPRN,  KC_PIPE, KC_TRNS, KC_TRNS,   KC_PGDN, KC_END,  KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                    KC_TRNS,   KC_TRNS, KC_TRNS, MO(2),   MO(2),   KC_TRNS
-      ),
-
-  /* Reset layer */
-  [2] = LAYOUT(
-      QK_BOOT, KC_A,    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,    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,   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,   KC_NO,   KC_NO,            KC_NO,                      KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
-      ),
-
-};
diff --git a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c b/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
deleted file mode 100644
index 20c449dab1c..00000000000
--- a/keyboards/exclusive/e6v2/le/keymaps/johu/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-#define _SL 2
-#define _CL 3
-
-// Tap dance defines
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-#define KC_SPFN     LT(_SL, KC_SPC)             // Tap for space, hold for function layer (aka SpaceFN)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Layer 0: Base layer (Default layer)
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * |Tab/Hyper|  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl/Esc  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter  |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | Shift/Ent | FN  |
- * |-----------------------------------------------------------------------------------------+
- *           |LGUI | LAlt  |               Space                   | RAlt   |RGUI |
- *           `--------------------------------------------------------------------'
- */
-  [_BL] = LAYOUT_60_hhkb(
-      QK_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_BSLS, KC_GRV,
-      HPR_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_BSPC,
-      CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SFT_ENT, MO(_FL),
-               KC_LGUI, KC_LALT,                       KC_SPFN,                        KC_RALT, KC_RGUI
-      ),
-
-/* Layer 1: FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * |  CL | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |        |     |     |     |     |     |     |     | Psc | Slck| Paus| Up  |     | Del    |
- * |-----------------------------------------------------------------------------------------+
- * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
- * |-----------------------------------------------------------------------------------------+
- *           |       |       |                                    | Stop  |  CL   |
- *           `--------------------------------------------------------------------'
- */
-  [_FL] = LAYOUT_60_hhkb(
-      TG(_CL),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-       _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_DEL,
-       _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
-       _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,          _______, _______,
-                _______, _______,                       _______,                        KC_MSTP, MO(_CL)
-      ),
-
-/* Layer 2: Space FN Layer
-* ,-----------------------------------------------------------------------------------------.
-* |  CL | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
-* |-----------------------------------------------------------------------------------------+
-* |        |     |     |     |     |     |     | PgUp|     | PgDn|     |     |     | Del    |
-* |-----------------------------------------------------------------------------------------+
-* |         | Vol-| Vol+| Mute|     |     | Left| Down| Up  |Right|     |     |             |
-* |-----------------------------------------------------------------------------------------+
-* |           | Prev| Play| Next|     |     | Home| End |     |     |     |           |     |
-* |-----------------------------------------------------------------------------------------+
-*            |       |       |                                    |       |  CL   |
-*            `--------------------------------------------------------------------'
-*/
-  [_SL] = LAYOUT_60_hhkb(
-      TG(_CL), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-      _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, KC_PGDN, _______, _______, _______, KC_DEL,
-      _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,
-      _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_END,  _______, _______, _______,          _______, _______,
-               _______, _______,                        _______,                       _______, MO(_CL)
-      ),
-
-/* Layer 3: Control Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        | BL- | BL+ | BL  |     |     |     |     |     |     |     |     |     | QK_BOOT  |
- * |-----------------------------------------------------------------------------------------+
- * |         | RGBT| RGBM|     |     |     |     |     |     |     |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |  CAPS     | Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |      |    |     |           |     |
- * |-----------------------------------------------------------------------------------------+
- *           |       |       |                                     |       |      |
- *           `--------------------------------------------------------------------'
- */
-  [_CL] = LAYOUT_60_hhkb(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
-      _______, BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   _______, _______, _______, _______, _______,  _______, _______, _______, QK_BOOT,
-      _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-      KC_CAPS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,  _______,          _______, _______,
-               _______, _______,                        _______,                       _______,  _______
-      )
-};
diff --git a/keyboards/exclusive/e6v2/le/keymaps/johu/readme.md b/keyboards/exclusive/e6v2/le/keymaps/johu/readme.md
deleted file mode 100644
index 605a14a1c3f..00000000000
--- a/keyboards/exclusive/e6v2/le/keymaps/johu/readme.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# johu's E6-V2 Last Edition (LE) HHKB
-Make example for this keyboard (after setting up your build environment):
-```bash
-$ make e6v2/le:johu
-```
-
-Or to make and flash:
-```bash
-$ make e6v2/le:johu:dfu
-```
-
-See the [build environment setup] and the [make instructions] for more
-information. Brand new to QMK? Start with our [Complete Newbs Guide].
-
-## Layer 0: Base Layer
-* HHKB Qwerty layout plus some specials:
-  * The Space key sends `Space` when tapped, toggles to *Space FN Layer* when held
-  * [Grave Escape]
-  * The Ctrl key sends `Esc` when tapped, `Ctrl` when held
-  * The Tab key sends `Tab` when tapped, [Hyper] (`Super+Ctrl+Alt+Shift`) when held
-  * The right Shift key sends `Enter` when tapped, `Shift` when held
-
-## Layer 1: Function Layer
-* Default HHKB function layer includig the iconic diamond arrow cluster
-* Multimedia controls
-
-## Layer 2: Space FN Layer
-* VIM style arrow cluster
-* Multimedia controls
-
-## Layer 3: Control Layer
-* Reset button
-* RGB controls
-* Caps Lock
-
-[build environment setup]: https://docs.qmk.fm/#/getting_started_build_tools
-[make instructions]: https://docs.qmk.fm/#/getting_started_make_guide
-[Complete Newbs Guide]: https://docs.qmk.fm/#/newbs
-[Grave Escape]: https://beta.docs.qmk.fm/features/feature_grave_esc
-[Hyper]: http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key
diff --git a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c b/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
deleted file mode 100644
index 1605f8da7ce..00000000000
--- a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#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.
-#define _BL  0
-#define _HLa 1
-#define _HLb 2
-#define _HL  3
-#define _XL  4
-
-enum hype_keycodes {
-  FN_HLa = SAFE_RANGE,
-  FN_HLb
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BL] = LAYOUT_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_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_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_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,   KC_DOT,     KC_SLSH,    KC_RSFT,  FN_HLb,
-                KC_LGUI, KC_LALT,               KC_SPACE,                               KC_RALT, FN_HLa
-        ),
-    [_HLa] = LAYOUT_hhkb(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_CAPS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP,    KC_LEFT,   KC_RGHT,      KC_TRNS,
-        KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,   KC_PGDN, KC_DOWN, KC_TRNS,    KC_TRNS,
-                 KC_TRNS, KC_TRNS,               KC_MPLY,                               KC_TRNS,  KC_TRNS
-        ),
-    [_HLb] = LAYOUT_hhkb(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_CAPS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP,    KC_LEFT,   KC_RGHT,      KC_TRNS,
-        KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,   KC_PGDN, KC_DOWN, KC_TRNS,    KC_TRNS,
-                 KC_TRNS, KC_TRNS,               KC_MPLY,                               KC_TRNS,  KC_TRNS
-        ),
-    [_HL] = LAYOUT_hhkb(
-        RGB_TOG, RGB_M_P, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_OFF,  BL_STEP, BL_ON, BL_DOWN,BL_UP,      LALT(KC_F4),
-        QK_BOOT, RGB_HUI, RGB_SAI,  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_HUD, RGB_SAD,  RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   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_MPRV, KC_MNXT,               KC_MPLY,                               KC_TRNS, KC_TRNS
-        ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case FN_HLa:
-      if (record->event.pressed)
-      {
-        layer_on(_HLa);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      else
-      {
-        layer_off(_HLa);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      return false;
-      break;
-    case FN_HLb:
-      if (record->event.pressed)
-      {
-        layer_on(_HLb);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      else
-      {
-        layer_off(_HLb);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/readme.md b/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/readme.md
deleted file mode 100644
index 4cc97aef046..00000000000
--- a/keyboards/exclusive/e6v2/oe/keymaps/amnesia0287/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-amnesia0287's Keymap
-===
-
-Keymap Maintainer: [amnesia0287](https://github.com/amnesia0287)
-
-Difference from base layout: Primarily the HHKB-ness
-
-Intended usage: Daily driver for programming 
diff --git a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c b/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
deleted file mode 100644
index 8550b72091e..00000000000
--- a/keyboards/exclusive/e7v1/keymaps/masterzen/keymap.c
+++ /dev/null
@@ -1,138 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-  BASE, // qwerty linux
-  OSX,  // qwerty osx
-
-  _ADJUST, // function key layer
-};
-
-enum keycodes {
-  // default layout switcher
-  LAY_LIN = SAFE_RANGE,
-  LAY_OSX
-};
-
-/*
- * ,---------------------------------------------------------------------|
- * |Esc|▓|F1 |F2 |F3 |F4 |▓|F5 |F6 |F7 |F8 |▓|F9 |F10|F11|F12|▓|Hom|▓|End|
- * |---------------------------------------------------------------------|
- * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0   |-   |=   |\   |Del|▓PgU |
- * |---------------------------------------------------------------------|
- * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  | ]  |    BSpc|▓PgDn|
- * |---------------------------------------------------------------------|
- * |LCTRL |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter   |▓▓▓▓▓▓▓|
- * |---------------------------------------------------------------------|
- * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift     |▓| Up |▓▓|
- * |---------------------------------------------------------------------|
- * |Ctrl|GUI |Alt |     Space                    |Alt |Fn  |▓|Lt |Dn |Rt |
- * `---------------------------------------------------------------------|'
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_75_ansi_splitbs(
-		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_HOME,   LT(_ADJUST,KC_END),
-		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_BSLS,KC_DEL, 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_BSPC, 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_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),
-
-  [OSX] = LAYOUT_75_ansi_splitbs(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		KC_LCTL, KC_LALT, KC_LGUI,                  _______,                             KC_LGUI, KC_RALT, _______, _______, _______),
-
-	[_ADJUST] = LAYOUT_75_ansi_splitbs(
-		QK_BOOT, LAY_LIN, LAY_OSX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_ADJUST),
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		BL_TOGG, BL_DOWN,BL_UP,  KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
-		_______, _______, _______,                  _______,                             _______, _______, RGB_MOD, RGB_VAD, RGB_HUD),
-
-
-};
-
-extern rgblight_config_t rgblight_config;
-
-bool edit = false;
-uint32_t mode;
-uint16_t hue;
-uint8_t sat;
-uint8_t val;
-
-void matrix_init_user(void)
-{
-  mode = rgblight_config.mode;
-}
-
-
-void persistent_default_layer_set(uint16_t default_layer)
-{
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  switch (keycode)
-  {
-  /* layout switcher */
-  case LAY_LIN:
-    if (record->event.pressed)
-    {
-      persistent_default_layer_set(1UL << BASE);
-    }
-    return false;
-    break;
-  case LAY_OSX:
-    if (record->event.pressed)
-    {
-      persistent_default_layer_set(1UL << OSX);
-    }
-    return false;
-    break;
-  case RGB_MOD:
-    // allows to set the rgb mode while in the ADJUST layer which uses
-    // its own mode
-    if (record->event.pressed)
-    {
-      rgblight_mode(mode);
-      rgblight_step();
-      mode = rgblight_config.mode;
-    }
-    return false;
-    break;
-  }
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state)
-{
-  if (state == BASE && edit == true)
-  {
-    hue = rgblight_get_hue();
-    sat = rgblight_get_sat();
-    val = rgblight_get_val();
-    edit = false;
-  }
-
-  switch (get_highest_layer(state))
-  {
-  case _ADJUST:
-    mode = rgblight_get_mode();
-    rgblight_mode_noeeprom(1);
-    rgblight_setrgb(0xD3, 0x7F, 0xED);
-    edit = true;
-    break;
-  default:
-    rgblight_mode(mode);
-    rgblight_sethsv(hue, sat, val);
-    break;
-  }
-  return state;
-}
diff --git a/keyboards/exclusive/e7v1/keymaps/masterzen/readme.md b/keyboards/exclusive/e7v1/keymaps/masterzen/readme.md
deleted file mode 100644
index ee4f2a531f5..00000000000
--- a/keyboards/exclusive/e7v1/keymaps/masterzen/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# masterzen's Keymap
-
-![masterzen keymap Layout Image](https://imgur.com/SF4UP2j)
-
-Keymap Maintainer: [masterzen](https://github.com/masterzen)
-
-
-Difference from base layout: 
- * split backspace
- * Home & End on last keys of row 0 instead of Insert/Del
- * Fn is on the End key when hold
- * supports both a windows/linux keymap and osx keymap
- * layer change is reflected in the rgb leds of the logo
-
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/bghull/combos.def b/keyboards/eyeohdesigns/babyv/keymaps/bghull/combos.def
deleted file mode 100644
index a525113a093..00000000000
--- a/keyboards/eyeohdesigns/babyv/keymaps/bghull/combos.def
+++ /dev/null
@@ -1,14 +0,0 @@
-//   name     result    chord keys
-COMB(QW_ESC,	KC_ESC,   	KC_Q, KC_W)
-COMB(CV_DEL,	KC_DEL,   	KC_C, KC_V)
-COMB(XC_BSPC,	KC_BSPC,   	KC_X, KC_C)
-COMB(WE_LBRC,	KC_LBRC, 	KC_W, KC_E)
-COMB(ER_RBRC, 	KC_RBRC,	KC_E, KC_R)
-COMB(SD_LPRN, 	KC_LPRN,	KC_S, KC_D)
-COMB(DF_RPRN, 	KC_RPRN,	KC_D, KC_F)
-COMB(FG_BSLS, 	KC_BSLS,	KC_F, KC_G)
-COMB(HJ_SLSH, 	KC_SLSH,	KC_H, KC_J)
-COMB(DQ_LGUI, 	KC_LGUI,	KC_DOT, KC_QUOT)
-COMB(CD_LALT, 	KC_LALT,	KC_COMM, KC_DOT)
-COMB(MC_LSFT, 	KC_LSFT,	KC_M, KC_COMM)
-COMB(NM_LCTL, 	KC_LCTL,	KC_N, KC_M)
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/bghull/config.h b/keyboards/eyeohdesigns/babyv/keymaps/bghull/config.h
deleted file mode 100644
index 96a6aefb0e5..00000000000
--- a/keyboards/eyeohdesigns/babyv/keymaps/bghull/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2021 Your Name (@bghull)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#define AUTO_SHIFT_TIMEOUT 135
-#define ONESHOT_TIMEOUT 1000
-#define COMBO_TERM 20
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/bghull/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/bghull/keymap.c
deleted file mode 100644
index 7bccc6a46aa..00000000000
--- a/keyboards/eyeohdesigns/babyv/keymaps/bghull/keymap.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2020 Eye Oh! 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
- */
-
-#include QMK_KEYBOARD_H
-#include "g/keymap_combo.h"
-
-
-#define COMBO_ONLY_FROM_LAYER QWERTY
-
-enum layer_names {
-  QWERTY,
-  COLMAK,
-  NAVNUM,
-  FUNC,
-  STENO
-};
-
-#define BspNAV LT(NAVNUM, KC_BSPC)
-#define SpcFUN LT(FUNC, KC_SPC)
-#define OneSFT OSM(MOD_LSFT)
-#define OneALT OSM(MOD_LALT)
-#define OneCTL OSM(MOD_LCTL)
-#define OneWIN OSM(MOD_LGUI)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 
-/* QWERTY
- * ,-----------------------------------------------------------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |  ; : |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  | ,  < | .  > |  ' " |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |                    | Ctrl |NAVNUM|             |Space |BspNAV|                    |
- * `-----------------------------------------------------------------------------------'
- */
-[QWERTY] = LAYOUT_2u(
-    KC_Q,   KC_W,    KC_E,     KC_R,    KC_T,	   _______, _______, KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,
-    KC_A,   KC_S,    KC_D,     KC_F,    KC_G,	   _______, _______, KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,
-    KC_Z,   KC_X,    KC_C,     KC_V,    KC_B,	   _______, _______, KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_QUOT,
-    _______,                   KC_LCTL, MO(NAVNUM),                     KC_SPC, BspNAV,                   _______
-),
-
-[COLMAK] = LAYOUT_2u(
-    KC_Q,   KC_W,    KC_F,     KC_P,    KC_B,	   _______, _______, KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN,
-    KC_A,   KC_R,    KC_S,     KC_T,    KC_G,	   _______, _______, KC_M,   KC_N,   KC_E,    KC_I,    KC_O,
-    KC_Z,   KC_X,    KC_C,     KC_D,    KC_V,	   _______, _______, KC_K,   KC_H,   KC_COMM, KC_DOT,  KC_QUOT,
-    _______,                   KC_LCTL, MO(NAVNUM),                     KC_SPC, BspNAV,                   _______
-
-),
-/* NAVNUM
- * ,-----------------------------------------------------------------------------------.
- * |Enter | Home |  Up  | End  |      |         RST |  -   |   7  |   8  |   9  |   0  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |OneSFT| Left | Down |Right | ` ~  |        CLMK |  +   |   4  |   5  |   6  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |OneCTL|OneALT| Tab  |   _  |OneWIN|        QWER |  =   |   1  |   2  |   3  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |                    |      |      |             |SpcFUN| Ctrl |                    |
- * `-----------------------------------------------------------------------------------'
- */
-[NAVNUM] = LAYOUT_2u(
-  KC_ENT,  KC_HOME, KC_UP,   KC_END,  _______, _______, QK_BOOT,    KC_PMNS, KC_7,    KC_8,   KC_9,     KC_0,
-  OneSFT,  KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV,  _______, DF(COLMAK), KC_PPLS, KC_4,    KC_5,   KC_6,     KC_ENT,
-  OneCTL,   OneALT, KC_TAB,  KC_UNDS, OneWIN,  _______, DF(QWERTY), KC_EQL,  KC_1,    KC_2,   KC_3,     _______,
-  _______,                   _______, _______,                      SpcFUN,  KC_LCTL,                   _______
-),
-/* FUNC: Mousekeys + F keys
- * ,-----------------------------------------------------------------------------------.
- * |      |Rclick| MsUp |Lclick| WhUp |             |      |  F7  |  F8  |  F9  |  F10 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | MsLt | MsDn | MsRt | WhDn |             |OneALT|  F4  |  F5  |  F6  |  F11 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |Mclick|      |      |             |      |  F1  |  F2  |  F3  |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |                    |      |      |             |      |      |                    |
- * `-----------------------------------------------------------------------------------'
- */
-[FUNC] = LAYOUT_2u(
-  _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,
-  _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, OneALT , KC_F4,   KC_F5,   KC_F6,   KC_F11,
-  _______, _______, KC_BTN3, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
-  _______,                  _______, _______,                   _______, _______,                   DF(STENO)
-),
-
-/* STENO
- * ,----------------------------------------------------------------------------------------.
- * |      |   #  |   #  |   #  |   #  |   #    / \    #  |   #  |   #  |   #  |   #  |      |
- * |------+------+------+------+------+--------   -------+------+------+------+------+------|
- * |      |   S  |   T  |   P  !   H  !   *   /   \   *  !   F  !   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+-------     ------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  /     \  *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------       -----+------+------+------+------+------|
- * |      |             |   A  |      O     |       |     E     |   U  |             |QWERTY|
- * `----------------------------------------------------------------------------------------'
-*/
-[STENO] = LAYOUT_2u(
-  STN_N1,  STN_N2,  STN_N3,     STN_N4,      STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-  STN_FN,  STN_S1,  STN_TL,     STN_PL,      STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-  XXXXXXX, STN_S2,  STN_KL,     STN_WL,      STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-  XXXXXXX,                    STN_A, STN_O,                             STN_E,   STN_U,   DF(QWERTY)
-  ),
-};
-
-
-void matrix_init_user(void) {
-  steno_set_mode(STENO_MODE_GEMINI);
-};
-
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/bghull/rules.mk b/keyboards/eyeohdesigns/babyv/keymaps/bghull/rules.mk
deleted file mode 100644
index db78b5957b4..00000000000
--- a/keyboards/eyeohdesigns/babyv/keymaps/bghull/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-NKRO_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-STENO_ENABLE = yes
-COMBO_ENABLE = yes
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-VPATH += keyboards/gboards
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c
deleted file mode 100644
index 23a85635956..00000000000
--- a/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2020 melonbred
- *
- * 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 {
-    LAYER0,
-    LAYER1,
-    LAYER2,
-};
-
-
-// Tap Dance Declarations
-enum {
-  TD_M_D = 0,
-  TD_P_M
-};
-  
-// Tap Dance Definition
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for minus, tap twice for divide
-  [TD_M_D] = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_PSLS),
-  //Tap once for plus, tap twice for multiply
-  [TD_P_M] = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_PAST)
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [LAYER0] = LAYOUT_2u(
-        KC_ESC,        KC_Q,    KC_W,    KC_E,      KC_R,       KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,     KC_P,    KC_BSPC,
-        CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,      KC_F,       KC_G,    KC_H,    KC_J,    KC_K,      KC_L,     KC_SCLN, KC_ENT, 
-        KC_LSFT,       KC_Z,    KC_X,    KC_C,      KC_V,       KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,   KC_SLSH, KC_RSFT,
-        MO(LAYER2),                      KC_LALT,   LT(LAYER1, KC_SPC),           KC_SPC,  KC_RALT,                      KC_LGUI
-    ),
-
-   [LAYER1] = LAYOUT_2u(
-        KC_GRV,  KC_QUOT, _______, KC_UP,   _______, _______, KC_7, KC_8, KC_9, KC_PMNS, KC_PSLS, KC_DEL,
-        KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_4, KC_5, KC_6, KC_PPLS, KC_PAST, KC_ENT,
-        KC_LSFT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_1, KC_2, KC_3, XXXXXXX, XXXXXXX, KC_RSFT,
-        XXXXXXX,                   _______, _______,                   KC_0,       KC_PDOT,       _______
-    ),
-
-    [LAYER2] = LAYOUT_2u(
-        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_VOLU, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-        KC_VOLD, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,  XXXXXXX, 
-        _______,                   KC_NUM,  XXXXXXX,                   XXXXXXX, XXXXXXX,                   XXXXXXX
-    ),
-};
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c
deleted file mode 100644
index 2028e09daaa..00000000000
--- a/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 IOD
- *
- * 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 custom_layers {
-    _QWERTY,
-    _FUNCTN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_acs(/* Base */
-        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,
-               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_UP,
-       KC_LGUI,  KC_LCTL,     KC_LALT,  MO(_FUNCTN),                 KC_SPC,                KC_RALT, KC_RCTL, MO(_FUNCTN),        KC_LEFT, KC_DOWN, KC_RIGHT
-         ),
-
-    [_FUNCTN] = LAYOUT_acs(/* Base */
-        QK_BOOT, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
-             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
-           _______,         _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,        KC_PGUP,
-       _______,    _______,     _______,   _______,   _______,                     _______,                   _______,  _______,         KC_HOME, KC_PGDN, KC_END
-         )
-};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c
deleted file mode 100644
index 37388cb15ef..00000000000
--- a/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 IOD
- *
- * 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 custom_layers {
-    _QWERTY,
-    _FUNCTN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_ad5(/* Base */
-        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,
-               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_RGUI, KC_UP,
-       KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPACE,                      MO(_FUNCTN),  KC_RALT,         KC_LEFT, KC_DOWN, KC_RIGHT
-         ),
-
-    [_FUNCTN] = LAYOUT_ad5(/* Base */
-        QK_BOOT, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
-             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
-        _______, _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
-       KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPC,                      MO(_FUNCTN),  KC_RALT,         KC_HOME, KC_PGDN, KC_END
-         )
-};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c
deleted file mode 100644
index 9038281e3f3..00000000000
--- a/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 IOD
- *
- * 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 custom_layers {
-    _QWERTY,
-    _FUNCTN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_ads(/* Base */
-        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,
-               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_RGUI, KC_UP,
-       KC_LGUI,  KC_LCTL,     KC_LALT,  MO(_FUNCTN),                 KC_SPC,                KC_RALT, KC_RCTL, MO(_FUNCTN),        KC_LEFT, KC_DOWN, KC_RIGHT
-         ),
-
-    [_FUNCTN] = LAYOUT_ads(/* Base */
-        QK_BOOT, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
-             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
-        _______,          _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
-       _______,    _______,     _______,   _______,   _______,                     _______,                   _______,  _______,         KC_HOME, KC_PGDN, KC_END
-         )
-};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c
deleted file mode 100644
index bb0c60eb21b..00000000000
--- a/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 EOD
- *
- * 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 custom_layers {
-    _QWERTY,
-    _FUNCTN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_bc5(/* Base */
-        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_BSPC, KC_DEL,  KC_MINS, KC_EQL,
-               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_UP,
-           KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPACE,                      MO(_FUNCTN),  KC_RALT,         KC_LEFT, KC_DOWN, KC_RIGHT
-         ),
-
-    [_FUNCTN] = LAYOUT_bc5(/* Base */
-        QK_BOOT, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
-             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
-           KC_LSFT,       _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,             KC_PGUP,
-           KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPC,                      MO(_FUNCTN),  KC_RALT,         KC_HOME, KC_PGDN, KC_END
-         )
-};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c
deleted file mode 100644
index c6c878702e1..00000000000
--- a/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 EOD
- *
- * 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 custom_layers {
-    _QWERTY,
-    _FUNCTN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_bcs(/* Base */
-        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_BSPC, KC_DEL,  KC_MINS, KC_EQL,
-               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_UP,
-           KC_LGUI,  KC_LCTL,     KC_LALT,  MO(_FUNCTN),                 KC_SPC,                KC_RALT, KC_RCTL, MO(_FUNCTN),        KC_LEFT, KC_DOWN, KC_RIGHT
-         ),
-
-    [_FUNCTN] = LAYOUT_bcs(/* Base */
-        QK_BOOT, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
-             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
-           KC_LSFT,       _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,             KC_PGUP,
-           _______,    _______,     _______,   _______,   _______,                     _______,                   _______,  _______,         KC_HOME, KC_PGDN, KC_END
-         )
-};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c
deleted file mode 100644
index ab2a3134203..00000000000
--- a/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 IOD
- *
- * 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 custom_layers {
-    _QWERTY,
-    _FUNCTN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_bd5(/* Base */
-        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_BSPC, KC_DEL,  KC_MINS, KC_EQL, 
-               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_RGUI, KC_UP,
-       KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPACE,                      MO(_FUNCTN),  KC_RALT,         KC_LEFT, KC_DOWN, KC_RIGHT
-         ),
-
-    [_FUNCTN] = LAYOUT_bd5(/* Base */
-        QK_BOOT, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
-             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
-        _______,          _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
-       KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPC,                      MO(_FUNCTN),  KC_RALT,         KC_HOME, KC_PGDN, KC_END
-         )
-};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c
deleted file mode 100644
index ec7550b2623..00000000000
--- a/keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 IOD
- *
- * 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 custom_layers {
-    _QWERTY,
-    _FUNCTN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_bds(/* Base */
-        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_BSPC, KC_DEL,  KC_MINS, KC_EQL, 
-               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_RGUI, KC_UP,
-       KC_LGUI,  KC_LCTL,     KC_LALT,  MO(_FUNCTN),                 KC_SPC,                KC_RALT, KC_RCTL, MO(_FUNCTN),        KC_LEFT, KC_DOWN, KC_RIGHT
-         ),
-
-    [_FUNCTN] = LAYOUT_bds(/* Base */
-        QK_BOOT, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
-             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
-        _______,          _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
-       _______,    _______,     _______,   _______,   _______,                     _______,                   _______,  _______,         KC_HOME, KC_PGDN, KC_END
-         )
-};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c
deleted file mode 100644
index 6f08ef45d31..00000000000
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 eye oh 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
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _QWERTY,
-    _FUNCTN,
-    _NUMBRS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_stagger1(
-        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F1,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y, KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
-        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
-        KC_F4,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT, MO(_NUMBRS),  KC_SPACE,   MO(_FUNCTN), MO(_NUMBRS), KC_RALT, KC_RCTL, KC_RGUI
-         ),
-
-    [_FUNCTN] = LAYOUT_stagger1(
-        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
-        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
-        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
-        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
-        KC_F8,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT, MO(_NUMBRS),  KC_SPACE,    MO(_FUNCTN), MO(_NUMBRS), KC_RALT,  KC_RCTL, KC_RGUI
-         ),
-    [_NUMBRS] = LAYOUT_stagger1(
-        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F9,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y,    KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
-        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
-        KC_F12,  KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT, MO(_NUMBRS),  KC_SPACE,      MO(_FUNCTN), MO(_NUMBRS), KC_RALT, KC_RCTL, KC_RGUI
-         )
-};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c
deleted file mode 100644
index db24f6798bc..00000000000
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 eye oh 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
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _QWERTY,
-    _FUNCTN,
-    _NUMBRS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_stagger2(
-        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F1,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y, KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
-        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
-        KC_F4,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT,    MO(_NUMBRS),      KC_SPACE,         MO(_FUNCTN), KC_RALT, KC_RCTL, KC_RGUI
-         ),
-
-    [_FUNCTN] = LAYOUT_stagger2(
-        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
-        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
-        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
-        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
-        KC_F8,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT,    MO(_NUMBRS),      KC_SPACE,         MO(_FUNCTN), KC_RALT, KC_RCTL, KC_RGUI
-         ),
-    [_NUMBRS] = LAYOUT_stagger2(
-        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F9,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y,    KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
-        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
-        KC_F12,  KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT,    MO(_NUMBRS),      KC_SPACE,         MO(_FUNCTN), KC_RALT, KC_RCTL, KC_RGUI
-         )
-};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c
deleted file mode 100644
index cc2071e72cf..00000000000
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 eye oh 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
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _QWERTY,
-    _FUNCTN,
-    _NUMBRS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_stagger3(
-        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F1,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y, KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
-        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
-        KC_F4,   KC_LCTL, KC_LGUI, KC_LALT,         MO(_NUMBRS),      KC_SPACE,                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
-         ),
-
-    [_FUNCTN] = LAYOUT_stagger3(
-        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
-        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
-        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
-        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
-        KC_F8,   KC_LCTL, KC_LGUI, KC_LALT,         MO(_NUMBRS),      KC_SPACE,                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
-         ),
-    [_NUMBRS] = LAYOUT_stagger3(
-        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F9,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y,    KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
-        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
-        KC_F12,  KC_LCTL, KC_LGUI, KC_LALT,         MO(_NUMBRS),      KC_SPACE,                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
-         )
-};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c
deleted file mode 100644
index aef725fcd4c..00000000000
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 eye oh 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
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _QWERTY,
-    _FUNCTN,
-    _NUMBRS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_stagger4(
-        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F1,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y, KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
-        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
-        KC_F4,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
-         ),
-
-    [_FUNCTN] = LAYOUT_stagger4(
-        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
-        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
-        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
-        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
-        KC_F8,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
-         ),
-    [_NUMBRS] = LAYOUT_stagger4(
-        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F9,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y,    KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
-        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
-        KC_F12,  KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
-         )
-};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c
deleted file mode 100644
index 26e6865832c..00000000000
--- a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 eye oh 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
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _QWERTY,
-    _FUNCTN,
-    _NUMBRS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_stagger5(
-        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F1,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y, KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
-        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
-        KC_F4,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                                    MO(_FUNCTN),  KC_RGUI
-         ),
-
-    [_FUNCTN] = LAYOUT_stagger5(
-        QK_BOOT, RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
-        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
-        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
-        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
-        KC_F8,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                                    MO(_FUNCTN),  KC_RGUI
-         ),
-    [_NUMBRS] = LAYOUT_stagger5(
-        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
-        KC_F9,   KC_TAB,  KC_Q,    KC_W,        KC_E,    KC_R,      KC_T,    KC_Y,    KC_U,        KC_I,        KC_O,    KC_P,    KC_BSPC,
-        KC_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
-        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
-        KC_F12,  KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                                    MO(_FUNCTN),  KC_RGUI
-         )
-};
diff --git a/keyboards/fallacy/indicators.c b/keyboards/fallacy/indicators.c
index b95786db417..41d27b0972c 100755
--- a/keyboards/fallacy/indicators.c
+++ b/keyboards/fallacy/indicators.c
@@ -15,7 +15,7 @@
  */
 
 #include "indicators.h"
-#include "drivers/led/issi/is31fl3731-simple.h"
+#include "drivers/led/issi/is31fl3731-mono.h"
 #include "i2c_master.h"
 
 /* Set up IS31FL3731 for use in powering indicator LEDs. Absolutely overkill for this job but it was already in the design.
diff --git a/keyboards/fallacy/rules.mk b/keyboards/fallacy/rules.mk
index 7fa230bae23..ee1a36c9108 100755
--- a/keyboards/fallacy/rules.mk
+++ b/keyboards/fallacy/rules.mk
@@ -13,5 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 
 # project specific files
 SRC += indicators.c \
-       drivers/led/issi/is31fl3731-simple.c
+       drivers/led/issi/is31fl3731-mono.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/fancytech/fancyalice66/config.h b/keyboards/fancytech/fancyalice66/config.h
deleted file mode 100644
index 9f56bd3a203..00000000000
--- a/keyboards/fancytech/fancyalice66/config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2022 chent7 (@chent7)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 82
-
-    /* RGB Matrix effect */
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#endif
\ No newline at end of file
diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json
index 21c89849fde..b2e219c1c90 100644
--- a/keyboards/fancytech/fancyalice66/info.json
+++ b/keyboards/fancytech/fancyalice66/info.json
@@ -9,11 +9,13 @@
             {"pin_a": "F0", "pin_b": "F1", "resolution": 2}
         ]
     },
+    "build": {
+        "lto": true
+    },
     "features": {
         "bootmagic": true,
         "encoder": false,
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": true,
         "rgb_matrix": true
diff --git a/keyboards/fc660c/ad5258.c b/keyboards/fc660c/ad5258.c
index f7ff2f3dc18..9d33c10ce49 100644
--- a/keyboards/fc660c/ad5258.c
+++ b/keyboards/fc660c/ad5258.c
@@ -35,18 +35,18 @@ void ad5258_init(void) {
 uint8_t ad5258_read_rdac(void) {
     // read RDAC register
     uint8_t ret = 0;
-    i2c_readReg(AD5258_I2C_ADDRESS, AD5258_INST_RDAC, &ret, 1, 100);
+    i2c_read_register(AD5258_I2C_ADDRESS, AD5258_INST_RDAC, &ret, 1, 100);
     return ret;
 }
 
 uint8_t ad5258_read_eeprom(void) {
     uint8_t ret = 0;
-    i2c_readReg(AD5258_I2C_ADDRESS, AD5258_INST_EEPROM, &ret, 1, 100);
+    i2c_read_register(AD5258_I2C_ADDRESS, AD5258_INST_EEPROM, &ret, 1, 100);
     return ret;
 }
 
 void ad5258_write_rdac(uint8_t rdac) {
     // write RDAC register:
     uint8_t data = rdac & 0x3F;
-    i2c_writeReg(AD5258_I2C_ADDRESS, AD5258_INST_RDAC, &data, 1, 100);
+    i2c_write_register(AD5258_I2C_ADDRESS, AD5258_INST_RDAC, &data, 1, 100);
 }
diff --git a/keyboards/fc660c/keymaps/via_rgb/config.h b/keyboards/fc660c/keymaps/via_rgb/config.h
new file mode 100644
index 00000000000..1953964f88d
--- /dev/null
+++ b/keyboards/fc660c/keymaps/via_rgb/config.h
@@ -0,0 +1,40 @@
+/* Copyright 2017 Balz Guenat
+ *
+ * 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
+
+// place overrides here
+
+/*RGB*/
+/*Repurpose Insert LED */
+#define WS2812_DI_PIN B5
+   #define RGBLIGHT_LED_COUNT 16
+   #define RGBLIGHT_DEFAULT_HUE 127
+   #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_PLAIN
+   #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
diff --git a/keyboards/fc980c/ad5258.c b/keyboards/fc980c/ad5258.c
index f7ff2f3dc18..9d33c10ce49 100644
--- a/keyboards/fc980c/ad5258.c
+++ b/keyboards/fc980c/ad5258.c
@@ -35,18 +35,18 @@ void ad5258_init(void) {
 uint8_t ad5258_read_rdac(void) {
     // read RDAC register
     uint8_t ret = 0;
-    i2c_readReg(AD5258_I2C_ADDRESS, AD5258_INST_RDAC, &ret, 1, 100);
+    i2c_read_register(AD5258_I2C_ADDRESS, AD5258_INST_RDAC, &ret, 1, 100);
     return ret;
 }
 
 uint8_t ad5258_read_eeprom(void) {
     uint8_t ret = 0;
-    i2c_readReg(AD5258_I2C_ADDRESS, AD5258_INST_EEPROM, &ret, 1, 100);
+    i2c_read_register(AD5258_I2C_ADDRESS, AD5258_INST_EEPROM, &ret, 1, 100);
     return ret;
 }
 
 void ad5258_write_rdac(uint8_t rdac) {
     // write RDAC register:
     uint8_t data = rdac & 0x3F;
-    i2c_writeReg(AD5258_I2C_ADDRESS, AD5258_INST_RDAC, &data, 1, 100);
+    i2c_write_register(AD5258_I2C_ADDRESS, AD5258_INST_RDAC, &data, 1, 100);
 }
diff --git a/keyboards/fc980c/config.h b/keyboards/fc980c/config.h
index 776b8ef35fc..4937e9e801c 100644
--- a/keyboards/fc980c/config.h
+++ b/keyboards/fc980c/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Maximum dynamic keymap layers (constrained by EEPROM space) */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 16
diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json
new file mode 100644
index 00000000000..5060885c695
--- /dev/null
+++ b/keyboards/fc980c/info.json
@@ -0,0 +1,142 @@
+{
+  "keyboard_name": "FC980C",
+  "manufacturer": "Hasu",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4853",
+    "pid": "0x980C",
+    "device_version": "1.0.0"
+  },
+  "dynamic_keymap": {
+    "layer_count": 3
+  },
+  "indicators": {
+    "caps_lock": "B5",
+    "num_lock": "B4",
+    "scroll_lock": "B6"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "debounce": 0,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 13], "x": 0, "y": 0},
+
+        {"matrix": [2, 13], "x": 2, "y": 0},
+        {"matrix": [5, 13], "x": 3, "y": 0},
+        {"matrix": [3, 13], "x": 4, "y": 0},
+        {"matrix": [6, 13], "x": 5, "y": 0},
+
+        {"matrix": [7, 13], "x": 6.5, "y": 0},
+        {"matrix": [7, 15], "x": 7.5, "y": 0},
+        {"matrix": [7, 14], "x": 8.5, "y": 0},
+        {"matrix": [7, 12], "x": 9.5, "y": 0},
+
+        {"matrix": [7, 2], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [7, 0], "x": 13, "y": 0},
+        {"matrix": [7, 3], "x": 14, "y": 0},
+
+        {"matrix": [7, 4], "x": 15.5, "y": 0},
+        {"matrix": [7, 6], "x": 16.5, "y": 0},
+        {"matrix": [7, 7], "x": 17.5, "y": 0},
+        {"matrix": [7, 5], "x": 18.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 0, "y": 1.5},
+        {"matrix": [6, 9], "x": 1, "y": 1.5},
+        {"matrix": [5, 9], "x": 2, "y": 1.5},
+        {"matrix": [5, 8], "x": 3, "y": 1.5},
+        {"matrix": [5, 11], "x": 4, "y": 1.5},
+        {"matrix": [6, 15], "x": 5, "y": 1.5},
+        {"matrix": [5, 15], "x": 6, "y": 1.5},
+        {"matrix": [5, 14], "x": 7, "y": 1.5},
+        {"matrix": [6, 12], "x": 8, "y": 1.5},
+        {"matrix": [5, 12], "x": 9, "y": 1.5},
+        {"matrix": [5, 2], "x": 10, "y": 1.5},
+        {"matrix": [5, 1], "x": 11, "y": 1.5},
+        {"matrix": [5, 0], "x": 12, "y": 1.5},
+        {"matrix": [5, 5], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [5, 4], "x": 15.5, "y": 1.5},
+        {"matrix": [5, 6], "x": 16.5, "y": 1.5},
+        {"matrix": [5, 7], "x": 17.5, "y": 1.5},
+        {"matrix": [6, 5], "x": 18.5, "y": 1.5},
+
+        {"matrix": [6, 10], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [3, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [6, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [6, 11], "x": 3.5, "y": 2.5},
+        {"matrix": [3, 11], "x": 4.5, "y": 2.5},
+        {"matrix": [3, 15], "x": 5.5, "y": 2.5},
+        {"matrix": [6, 14], "x": 6.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 7.5, "y": 2.5},
+        {"matrix": [3, 12], "x": 8.5, "y": 2.5},
+        {"matrix": [6, 2], "x": 9.5, "y": 2.5},
+        {"matrix": [6, 1], "x": 10.5, "y": 2.5},
+        {"matrix": [6, 0], "x": 11.5, "y": 2.5},
+        {"matrix": [3, 3], "x": 12.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [6, 4], "x": 15.5, "y": 2.5},
+        {"matrix": [6, 6], "x": 16.5, "y": 2.5},
+        {"matrix": [6, 7], "x": 17.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 18.5, "y": 2.5, "h": 2},
+
+        {"matrix": [3, 10], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [2, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [2, 8], "x": 3.75, "y": 3.5},
+        {"matrix": [2, 11], "x": 4.75, "y": 3.5},
+        {"matrix": [2, 15], "x": 5.75, "y": 3.5},
+        {"matrix": [2, 14], "x": 6.75, "y": 3.5},
+        {"matrix": [2, 12], "x": 7.75, "y": 3.5},
+        {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 1], "x": 10.75, "y": 3.5},
+        {"matrix": [2, 0], "x": 11.75, "y": 3.5},
+        {"matrix": [6, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 4], "x": 15.5, "y": 3.5},
+        {"matrix": [2, 6], "x": 16.5, "y": 3.5},
+        {"matrix": [2, 7], "x": 17.5, "y": 3.5},
+
+        {"matrix": [2, 10], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 8], "x": 2.25, "y": 4.5},
+        {"matrix": [0, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 11], "x": 4.25, "y": 4.5},
+        {"matrix": [0, 11], "x": 5.25, "y": 4.5},
+        {"matrix": [1, 15], "x": 6.25, "y": 4.5},
+        {"matrix": [1, 14], "x": 7.25, "y": 4.5},
+        {"matrix": [0, 14], "x": 8.25, "y": 4.5},
+        {"matrix": [2, 2], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 1], "x": 10.25, "y": 4.5},
+        {"matrix": [2, 1], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 0], "x": 12.25, "y": 4.5, "w": 1.75},
+
+        {"matrix": [3, 4], "x": 14.25, "y": 4.75},
+
+        {"matrix": [1, 4], "x": 15.5, "y": 4.5},
+        {"matrix": [1, 6], "x": 16.5, "y": 4.5},
+        {"matrix": [1, 7], "x": 17.5, "y": 4.5},
+        {"matrix": [1, 5], "x": 18.5, "y": 4.5, "h": 2},
+
+        {"matrix": [1, 10], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 9], "x": 1.25, "y": 5.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 15], "x": 3.5, "y": 5.5, "w": 6},
+        {"matrix": [0, 2], "x": 9.5, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 1], "x": 10.75, "y": 5.5},
+        {"matrix": [1, 0], "x": 11.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 0], "x": 13.25, "y": 5.75},
+        {"matrix": [0, 4], "x": 14.25, "y": 5.75},
+        {"matrix": [0, 6], "x": 15.25, "y": 5.75},
+
+        {"matrix": [0, 7], "x": 16.5, "y": 5.5},
+        {"matrix": [0, 5], "x": 17.5, "y": 5.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/fc980c/keymaps/actuation-point-example/config.h b/keyboards/fc980c/keymaps/actuation-point-example/config.h
deleted file mode 100644
index a4ecab70fde..00000000000
--- a/keyboards/fc980c/keymaps/actuation-point-example/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2017 Balz Guenat
- *
- * 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
-
-// higher value means deeper actuation point, less sensitive
-// be careful and only make small adjustments (steps of 1 or 2).
-// too high and keys will fail to actuate. too low and keys will actuate spontaneously.
-// test all keys before further adjustment.
-// this should probably stay in the range +/-5.
-#undef ACTUATION_DEPTH_ADJUSTMENT
-#define ACTUATION_DEPTH_ADJUSTMENT +1
diff --git a/keyboards/fc980c/keymaps/actuation-point-example/keymap.c b/keyboards/fc980c/keymaps/actuation-point-example/keymap.c
deleted file mode 100644
index 50b6a9ff40b..00000000000
--- a/keyboards/fc980c/keymaps/actuation-point-example/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright 2017 Balz Guenat
-
-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 custom_keycodes
-{
-    AP_UP = SAFE_RANGE, // Higher actuation point, more sensitive
-    AP_DN,              // Lower actuation point, less sensitive
-    AP_READ_RDAC,       // Prints current RDAC value to console
-    AP_READ_EEPROM,     // Prints base RDAC value to console
-};
-
-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_INS, KC_PGUP, 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_NUM, 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_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
-        MO(1), 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_P4, KC_P5, KC_P6,
-        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_P1, KC_P2, KC_P3, KC_PENT,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
-    [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, AP_READ_RDAC, AP_READ_EEPROM, AP_DN, AP_UP, _______, _______, KC_HOME, KC_END,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, KC_PGUP, KC_INS, KC_HOME, LCTL(KC_LEFT), LCTL(KC_RGHT), KC_END, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______,
-        _______, KC_MUTE, KC_VOLD, KC_MPLY, KC_PGDN, KC_DEL, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, LCTL(KC_BSPC), LCTL(KC_DEL), _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, KC_APP, _______, KC_HOME, KC_PGDN, KC_END, _______, _______),
-};
-
-void matrix_init_user(void){};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    if (record->event.pressed)
-    {
-        switch (keycode)
-        {
-        case AP_UP:
-        {
-            actuation_point_up();
-            return false;
-        }
-        case AP_DN:
-        {
-            actuation_point_down();
-            return false;
-        }
-        case AP_READ_RDAC:
-        {
-            xprintf("RDAC: %d", ad5258_read_rdac());
-            return false;
-        }
-        case AP_READ_EEPROM:
-        {
-            xprintf("EEPROM: %d", ad5258_read_eeprom());
-            return false;
-        }
-
-        default:
-            return true;
-        }
-    }
-    else
-    {
-        return true;
-    }
-};
diff --git a/keyboards/feker/ik75/config.h b/keyboards/feker/ik75/config.h
index b49621bda01..1a9c401fb2e 100644
--- a/keyboards/feker/ik75/config.h
+++ b/keyboards/feker/ik75/config.h
@@ -17,62 +17,5 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-    /* RGB Matrix config */
-    #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_VCC_VCC
-    #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND
-    #define DRIVER_1_LED_TOTAL 63
-    #define DRIVER_2_LED_TOTAL 64
-
-    /* RGB Matrix effect */
-    #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
-
-    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-    #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
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_VCC_VCC
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/feker/ik75/ik75.c b/keyboards/feker/ik75/ik75.c
index 826afab01b4..c4da77a8448 100644
--- a/keyboards/feker/ik75/ik75.c
+++ b/keyboards/feker/ik75/ik75.c
@@ -18,148 +18,148 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  G location
  *   |  |     B location
  *   |  |     |     R location
  *   |  |     |     | */
-    {0, A_1,  C_1,  B_1},  // 0,   `~,              K10
-    {0, A_2,  C_2,  B_2},  // 1,   1!,              K11
-    {0, A_3,  C_3,  B_3},  // 2,   2@,              K12
-    {0, A_4,  C_4,  B_4},  // 3,   3#,              K13
-    {0, A_5,  C_5,  B_5},  // 4,   4$,              K14
-    {0, A_6,  C_6,  B_6},  // 5,   5%,              K15
-    {0, A_7,  C_7,  B_7},  // 6,   6^,              K16
-    {0, A_8,  C_8,  B_8},  // 7,   7&,              K17
-    {0, A_9,  C_9,  B_9},  // 8,   8*,              K18
-    {0, A_10, C_10, B_10}, // 9,   9(,              K19
-    {0, A_11, C_11, B_11}, // 10,  0),              K1A
-    {0, A_12, C_12, B_12}, // 11,  -_,              K1B
-    {0, A_13, C_13, B_13}, // 12,  =+,              K1C
-    {0, A_14, C_14, B_14}, // 13,  Backspace,       K1D
-    {0, A_15, C_15, B_15}, // 14,  Left Alt,        K52
-    {0, A_16, C_16, B_16}, // 15,  Space,           K56
+    {0, SW1_CS1,  SW3_CS1,  SW2_CS1},  // 0,   `~,              K10
+    {0, SW1_CS2,  SW3_CS2,  SW2_CS2},  // 1,   1!,              K11
+    {0, SW1_CS3,  SW3_CS3,  SW2_CS3},  // 2,   2@,              K12
+    {0, SW1_CS4,  SW3_CS4,  SW2_CS4},  // 3,   3#,              K13
+    {0, SW1_CS5,  SW3_CS5,  SW2_CS5},  // 4,   4$,              K14
+    {0, SW1_CS6,  SW3_CS6,  SW2_CS6},  // 5,   5%,              K15
+    {0, SW1_CS7,  SW3_CS7,  SW2_CS7},  // 6,   6^,              K16
+    {0, SW1_CS8,  SW3_CS8,  SW2_CS8},  // 7,   7&,              K17
+    {0, SW1_CS9,  SW3_CS9,  SW2_CS9},  // 8,   8*,              K18
+    {0, SW1_CS10, SW3_CS10, SW2_CS10}, // 9,   9(,              K19
+    {0, SW1_CS11, SW3_CS11, SW2_CS11}, // 10,  0),              K1A
+    {0, SW1_CS12, SW3_CS12, SW2_CS12}, // 11,  -_,              K1B
+    {0, SW1_CS13, SW3_CS13, SW2_CS13}, // 12,  =+,              K1C
+    {0, SW1_CS14, SW3_CS14, SW2_CS14}, // 13,  Backspace,       K1D
+    {0, SW1_CS15, SW3_CS15, SW2_CS15}, // 14,  Left Alt,        K52
+    {0, SW1_CS16, SW3_CS16, SW2_CS16}, // 15,  Space,           K56
 
-    {0, D_1,  F_1,  E_1},  // 16,  Tab,             K20
-    {0, D_2,  F_2,  E_2},  // 17,  Q,               K21
-    {0, D_3,  F_3,  E_3},  // 18,  W,               K22
-    {0, D_4,  F_4,  E_4},  // 19,  E,               K23
-    {0, D_5,  F_5,  E_5},  // 20,  R,               K24
-    {0, D_6,  F_6,  E_6},  // 21,  T,               K25
-    {0, D_7,  F_7,  E_7},  // 22,  Y,               K26
-    {0, D_8,  F_8,  E_8},  // 23,  U,               K27
-    {0, D_9,  F_9,  E_9},  // 24,  I,               K28
-    {0, D_10, F_10, E_10}, // 25,  O,               K29
-    {0, D_11, F_11, E_11}, // 26,  P,               K2A
-    {0, D_12, F_12, E_12}, // 27,  [{,              K2B
-    {0, D_13, F_13, E_13}, // 28,  ]},              K2C
-    {0, D_14, F_14, E_14}, // 29,  \|,              K2D
-    {0, D_15, F_15, E_15}, // 30,  Right Ctrl,      K5C
-    {0, D_16, F_16, E_16}, // 31,  Function,        K5A
+    {0, SW4_CS1,  SW6_CS1,  SW5_CS1},  // 16,  Tab,             K20
+    {0, SW4_CS2,  SW6_CS2,  SW5_CS2},  // 17,  Q,               K21
+    {0, SW4_CS3,  SW6_CS3,  SW5_CS3},  // 18,  W,               K22
+    {0, SW4_CS4,  SW6_CS4,  SW5_CS4},  // 19,  E,               K23
+    {0, SW4_CS5,  SW6_CS5,  SW5_CS5},  // 20,  R,               K24
+    {0, SW4_CS6,  SW6_CS6,  SW5_CS6},  // 21,  T,               K25
+    {0, SW4_CS7,  SW6_CS7,  SW5_CS7},  // 22,  Y,               K26
+    {0, SW4_CS8,  SW6_CS8,  SW5_CS8},  // 23,  U,               K27
+    {0, SW4_CS9,  SW6_CS9,  SW5_CS9},  // 24,  I,               K28
+    {0, SW4_CS10, SW6_CS10, SW5_CS10}, // 25,  O,               K29
+    {0, SW4_CS11, SW6_CS11, SW5_CS11}, // 26,  P,               K2A
+    {0, SW4_CS12, SW6_CS12, SW5_CS12}, // 27,  [{,              K2B
+    {0, SW4_CS13, SW6_CS13, SW5_CS13}, // 28,  ]},              K2C
+    {0, SW4_CS14, SW6_CS14, SW5_CS14}, // 29,  \|,              K2D
+    {0, SW4_CS15, SW6_CS15, SW5_CS15}, // 30,  Right Ctrl,      K5C
+    {0, SW4_CS16, SW6_CS16, SW5_CS16}, // 31,  Function,        K5A
 
-    {0, G_1,  I_1,  H_1},  // 32,  Caps Lock,       K30
-    {0, G_2,  I_2,  H_2},  // 33,  A,               K31
-    {0, G_3,  I_3,  H_3},  // 34,  S,               K32
-    {0, G_4,  I_4,  H_4},  // 35,  D,               K33
-    {0, G_5,  I_5,  H_5},  // 36,  F,               K34
-    {0, G_6,  I_6,  H_6},  // 37,  G,               K35
-    {0, G_7,  I_7,  H_7},  // 38,  H,               K36
-    {0, G_8,  I_8,  H_8},  // 39,  J,               K37
-    {0, G_9,  I_9,  H_9},  // 40,  K,               K38
-    {0, G_10, I_10, H_10}, // 41,  L,               K39
-    {0, G_11, I_11, H_11}, // 42,  ;:,              K3A
-    {0, G_12, I_12, H_12}, // 43,  '",              K3B
-    {0, G_13, I_13, H_13}, // 44,  Enter,           K3D
-    {0, G_14, I_14, H_14}, // 45,  Up,              K4E
-    {0, G_15, I_15, H_15}, // 46,  Num Lock LED
-    {0, G_16, I_16, H_16}, // 47,  Right Alt,       K59
+    {0, SW7_CS1,  SW9_CS1,  SW8_CS1},  // 32,  Caps Lock,       K30
+    {0, SW7_CS2,  SW9_CS2,  SW8_CS2},  // 33,  A,               K31
+    {0, SW7_CS3,  SW9_CS3,  SW8_CS3},  // 34,  S,               K32
+    {0, SW7_CS4,  SW9_CS4,  SW8_CS4},  // 35,  D,               K33
+    {0, SW7_CS5,  SW9_CS5,  SW8_CS5},  // 36,  F,               K34
+    {0, SW7_CS6,  SW9_CS6,  SW8_CS6},  // 37,  G,               K35
+    {0, SW7_CS7,  SW9_CS7,  SW8_CS7},  // 38,  H,               K36
+    {0, SW7_CS8,  SW9_CS8,  SW8_CS8},  // 39,  J,               K37
+    {0, SW7_CS9,  SW9_CS9,  SW8_CS9},  // 40,  K,               K38
+    {0, SW7_CS10, SW9_CS10, SW8_CS10}, // 41,  L,               K39
+    {0, SW7_CS11, SW9_CS11, SW8_CS11}, // 42,  ;:,              K3A
+    {0, SW7_CS12, SW9_CS12, SW8_CS12}, // 43,  '",              K3B
+    {0, SW7_CS13, SW9_CS13, SW8_CS13}, // 44,  Enter,           K3D
+    {0, SW7_CS14, SW9_CS14, SW8_CS14}, // 45,  Up,              K4E
+    {0, SW7_CS15, SW9_CS15, SW8_CS15}, // 46,  Num Lock LED
+    {0, SW7_CS16, SW9_CS16, SW8_CS16}, // 47,  Right Alt,       K59
 
-    {0, J_1,  L_1,  K_1},  // 48,  Left Shift,      K40
-//  {0, J_2,  L_2,  K_2},  //      Unused LED
-    {0, J_3,  L_3,  K_3},  // 49,  Z,               K42
-    {0, J_4,  L_4,  K_4},  // 50,  X,               K43
-    {0, J_5,  L_5,  K_5},  // 51,  C,               K44
-    {0, J_6,  L_6,  K_6},  // 52,  V,               K45
-    {0, J_7,  L_7,  K_7},  // 53,  B,               K46
-    {0, J_8,  L_8,  K_8},  // 54,  N,               K47
-    {0, J_9,  L_9,  K_9},  // 55,  M,               K48
-    {0, J_10, L_10, K_10}, // 56,  ,<,              K49
-    {0, J_11, L_11, K_11}, // 57,  .>,              K4A
-    {0, J_12, L_12, K_12}, // 58,  /?,              K4B
-    {0, J_13, L_13, K_13}, // 59,  Right Shift,     K4D
-    {0, J_14, L_14, K_14}, // 60,  Left,            K5D
-    {0, J_15, L_15, K_15}, // 61,  Down,            K5E
-    {0, J_16, L_16, K_16}, // 62,  Right,           K5F
+    {0, SW10_CS1,  SW12_CS1,  SW11_CS1},  // 48,  Left Shift,      K40
+//  {0, SW10_CS2,  SW12_CS2,  SW11_CS2},  //      Unused LED
+    {0, SW10_CS3,  SW12_CS3,  SW11_CS3},  // 49,  Z,               K42
+    {0, SW10_CS4,  SW12_CS4,  SW11_CS4},  // 50,  X,               K43
+    {0, SW10_CS5,  SW12_CS5,  SW11_CS5},  // 51,  C,               K44
+    {0, SW10_CS6,  SW12_CS6,  SW11_CS6},  // 52,  V,               K45
+    {0, SW10_CS7,  SW12_CS7,  SW11_CS7},  // 53,  B,               K46
+    {0, SW10_CS8,  SW12_CS8,  SW11_CS8},  // 54,  N,               K47
+    {0, SW10_CS9,  SW12_CS9,  SW11_CS9},  // 55,  M,               K48
+    {0, SW10_CS10, SW12_CS10, SW11_CS10}, // 56,  ,<,              K49
+    {0, SW10_CS11, SW12_CS11, SW11_CS11}, // 57,  .>,              K4A
+    {0, SW10_CS12, SW12_CS12, SW11_CS12}, // 58,  /?,              K4B
+    {0, SW10_CS13, SW12_CS13, SW11_CS13}, // 59,  Right Shift,     K4D
+    {0, SW10_CS14, SW12_CS14, SW11_CS14}, // 60,  Left,            K5D
+    {0, SW10_CS15, SW12_CS15, SW11_CS15}, // 61,  Down,            K5E
+    {0, SW10_CS16, SW12_CS16, SW11_CS16}, // 62,  Right,           K5F
 
-    {1, A_1,  C_1,  B_1},  // 63,  Underglow 20
-    {1, A_2,  C_2,  B_2},  // 64,  Underglow 19
-    {1, A_3,  C_3,  B_3},  // 65,  Underglow 18
-    {1, A_4,  C_4,  B_4},  // 66,  Underglow 17
-    {1, A_5,  C_5,  B_5},  // 67,  Underglow 16
-    {1, A_6,  C_6,  B_6},  // 68,  Underglow 15
-    {1, A_7,  C_7,  B_7},  // 69,  Underglow 14
-    {1, A_8,  C_8,  B_8},  // 70,  Underglow 13
-    {1, A_9,  C_9,  B_9},  // 71,  Underglow 12
-    {1, A_10, C_10, B_10}, // 72,  Underglow 11
-    {1, A_11, C_11, B_11}, // 73,  Underglow 10
-    {1, A_12, C_12, B_12}, // 74,  Underglow 9
-    {1, A_13, C_13, B_13}, // 75,  Underglow 8
-    {1, A_14, C_14, B_14}, // 76,  Underglow 7
-    {1, A_15, C_15, B_15}, // 77,  Underglow 6
-    {1, A_16, C_16, B_16}, // 78,  Underglow 5
+    {1, SW1_CS1,  SW3_CS1,  SW2_CS1},  // 63,  Underglow 20
+    {1, SW1_CS2,  SW3_CS2,  SW2_CS2},  // 64,  Underglow 19
+    {1, SW1_CS3,  SW3_CS3,  SW2_CS3},  // 65,  Underglow 18
+    {1, SW1_CS4,  SW3_CS4,  SW2_CS4},  // 66,  Underglow 17
+    {1, SW1_CS5,  SW3_CS5,  SW2_CS5},  // 67,  Underglow 16
+    {1, SW1_CS6,  SW3_CS6,  SW2_CS6},  // 68,  Underglow 15
+    {1, SW1_CS7,  SW3_CS7,  SW2_CS7},  // 69,  Underglow 14
+    {1, SW1_CS8,  SW3_CS8,  SW2_CS8},  // 70,  Underglow 13
+    {1, SW1_CS9,  SW3_CS9,  SW2_CS9},  // 71,  Underglow 12
+    {1, SW1_CS10, SW3_CS10, SW2_CS10}, // 72,  Underglow 11
+    {1, SW1_CS11, SW3_CS11, SW2_CS11}, // 73,  Underglow 10
+    {1, SW1_CS12, SW3_CS12, SW2_CS12}, // 74,  Underglow 9
+    {1, SW1_CS13, SW3_CS13, SW2_CS13}, // 75,  Underglow 8
+    {1, SW1_CS14, SW3_CS14, SW2_CS14}, // 76,  Underglow 7
+    {1, SW1_CS15, SW3_CS15, SW2_CS15}, // 77,  Underglow 6
+    {1, SW1_CS16, SW3_CS16, SW2_CS16}, // 78,  Underglow 5
 
-    {1, D_1,  F_1,  E_1},  // 79,  Esc,             K00
-    {1, D_2,  F_2,  E_2},  // 80,  F1,              K01
-    {1, D_3,  F_3,  E_3},  // 81,  F2,              K02
-    {1, D_4,  F_4,  E_4},  // 82,  F3,              K03
-    {1, D_5,  F_5,  E_5},  // 83,  F4,              K04
-    {1, D_6,  F_6,  E_6},  // 84,  F5,              K05
-    {1, D_7,  F_7,  E_7},  // 85,  F6,              K06
-    {1, D_8,  F_8,  E_8},  // 86,  F7,              K07
-    {1, D_9,  F_9,  E_9},  // 87,  F8,              K08
-    {1, D_10, F_10, E_10}, // 88,  F9,              K09
-    {1, D_11, F_11, E_11}, // 89,  F10,             K0A
-    {1, D_12, F_12, E_12}, // 90,  F11,             K0B
-    {1, D_13, F_13, E_13}, // 91,  F12,             K0C
-    {1, D_14, F_14, E_14}, // 92,  Delete,          K0D
-    {1, D_15, F_15, E_15}, // 93,  Left Ctrl,       K50
-    {1, D_16, F_16, E_16}, // 94,  Left Windows,    K51
+    {1, SW4_CS1,  SW6_CS1,  SW5_CS1},  // 79,  Esc,             K00
+    {1, SW4_CS2,  SW6_CS2,  SW5_CS2},  // 80,  F1,              K01
+    {1, SW4_CS3,  SW6_CS3,  SW5_CS3},  // 81,  F2,              K02
+    {1, SW4_CS4,  SW6_CS4,  SW5_CS4},  // 82,  F3,              K03
+    {1, SW4_CS5,  SW6_CS5,  SW5_CS5},  // 83,  F4,              K04
+    {1, SW4_CS6,  SW6_CS6,  SW5_CS6},  // 84,  F5,              K05
+    {1, SW4_CS7,  SW6_CS7,  SW5_CS7},  // 85,  F6,              K06
+    {1, SW4_CS8,  SW6_CS8,  SW5_CS8},  // 86,  F7,              K07
+    {1, SW4_CS9,  SW6_CS9,  SW5_CS9},  // 87,  F8,              K08
+    {1, SW4_CS10, SW6_CS10, SW5_CS10}, // 88,  F9,              K09
+    {1, SW4_CS11, SW6_CS11, SW5_CS11}, // 89,  F10,             K0A
+    {1, SW4_CS12, SW6_CS12, SW5_CS12}, // 90,  F11,             K0B
+    {1, SW4_CS13, SW6_CS13, SW5_CS13}, // 91,  F12,             K0C
+    {1, SW4_CS14, SW6_CS14, SW5_CS14}, // 92,  Delete,          K0D
+    {1, SW4_CS15, SW6_CS15, SW5_CS15}, // 93,  Left Ctrl,       K50
+    {1, SW4_CS16, SW6_CS16, SW5_CS16}, // 94,  Left Windows,    K51
 
-    {1, G_1,  I_1,  H_1},  // 95,  Underglow 21
-    {1, G_2,  I_2,  H_2},  // 96,  Underglow 22
-    {1, G_3,  I_3,  H_3},  // 97,  Underglow 23
-    {1, G_4,  I_4,  H_4},  // 98,  Underglow 24
-    {1, G_5,  I_5,  H_5},  // 99,  Knob LED 3,      K53
-    {1, G_6,  I_6,  H_6},  // 100, Knob LED 2,      K54
-    {1, G_7,  I_7,  H_7},  // 101, Knob LED 1,      K4F
-    {1, G_8,  I_8,  H_8},  // 102, Insert,          K1F
-    {1, G_9,  I_9,  H_9},  // 103, Page Up,         K3E
-    {1, G_10, I_10, H_10}, // 104, Caps/Win/Scr LED
-    {1, G_11, I_11, H_11}, // 105, End,             K2F
-    {1, G_12, I_12, H_12}, // 106, Page Down,       K3F
-    {1, G_13, I_13, H_13}, // 107, Underglow 1
-    {1, G_14, I_14, H_14}, // 108, Underglow 2
-    {1, G_15, I_15, H_15}, // 109, Underglow 3
-    {1, G_16, I_16, H_16}, // 110, Underglow 4
+    {1, SW7_CS1,  SW9_CS1,  SW8_CS1},  // 95,  Underglow 21
+    {1, SW7_CS2,  SW9_CS2,  SW8_CS2},  // 96,  Underglow 22
+    {1, SW7_CS3,  SW9_CS3,  SW8_CS3},  // 97,  Underglow 23
+    {1, SW7_CS4,  SW9_CS4,  SW8_CS4},  // 98,  Underglow 24
+    {1, SW7_CS5,  SW9_CS5,  SW8_CS5},  // 99,  Knob LED 3,      K53
+    {1, SW7_CS6,  SW9_CS6,  SW8_CS6},  // 100, Knob LED 2,      K54
+    {1, SW7_CS7,  SW9_CS7,  SW8_CS7},  // 101, Knob LED 1,      K4F
+    {1, SW7_CS8,  SW9_CS8,  SW8_CS8},  // 102, Insert,          K1F
+    {1, SW7_CS9,  SW9_CS9,  SW8_CS9},  // 103, Page Up,         K3E
+    {1, SW7_CS10, SW9_CS10, SW8_CS10}, // 104, Caps/Win/Scr LED
+    {1, SW7_CS11, SW9_CS11, SW8_CS11}, // 105, End,             K2F
+    {1, SW7_CS12, SW9_CS12, SW8_CS12}, // 106, Page Down,       K3F
+    {1, SW7_CS13, SW9_CS13, SW8_CS13}, // 107, Underglow 1
+    {1, SW7_CS14, SW9_CS14, SW8_CS14}, // 108, Underglow 2
+    {1, SW7_CS15, SW9_CS15, SW8_CS15}, // 109, Underglow 3
+    {1, SW7_CS16, SW9_CS16, SW8_CS16}, // 110, Underglow 4
 
-    {1, J_1,  L_1,  K_1},  // 111, Underglow 25
-    {1, J_2,  L_2,  K_2},  // 112, Underglow 26
-    {1, J_3,  L_3,  K_3},  // 113, Underglow 27
-    {1, J_4,  L_4,  K_4},  // 114, Underglow 28
-    {1, J_5,  L_5,  K_5},  // 115, Underglow 29
-    {1, J_6,  L_6,  K_6},  // 116, Underglow 30
-    {1, J_7,  L_7,  K_7},  // 117, Underglow 31
-    {1, J_8,  L_8,  K_8},  // 118, Underglow 32
-    {1, J_9,  L_9,  K_9},  // 119, Underglow 33
-    {1, J_10, L_10, K_10}, // 120, Underglow 34
-    {1, J_11, L_11, K_11}, // 121, Underglow 35
-    {1, J_12, L_12, K_12}, // 122, Underglow 36
-    {1, J_13, L_13, K_13}, // 123, Underglow 37
-    {1, J_14, L_14, K_14}, // 124, Underglow 38
-    {1, J_15, L_15, K_15}, // 125, Underglow 39
-    {1, J_16, L_16, K_16}, // 126, Underglow 40
+    {1, SW10_CS1,  SW12_CS1,  SW11_CS1},  // 111, Underglow 25
+    {1, SW10_CS2,  SW12_CS2,  SW11_CS2},  // 112, Underglow 26
+    {1, SW10_CS3,  SW12_CS3,  SW11_CS3},  // 113, Underglow 27
+    {1, SW10_CS4,  SW12_CS4,  SW11_CS4},  // 114, Underglow 28
+    {1, SW10_CS5,  SW12_CS5,  SW11_CS5},  // 115, Underglow 29
+    {1, SW10_CS6,  SW12_CS6,  SW11_CS6},  // 116, Underglow 30
+    {1, SW10_CS7,  SW12_CS7,  SW11_CS7},  // 117, Underglow 31
+    {1, SW10_CS8,  SW12_CS8,  SW11_CS8},  // 118, Underglow 32
+    {1, SW10_CS9,  SW12_CS9,  SW11_CS9},  // 119, Underglow 33
+    {1, SW10_CS10, SW12_CS10, SW11_CS10}, // 120, Underglow 34
+    {1, SW10_CS11, SW12_CS11, SW11_CS11}, // 121, Underglow 35
+    {1, SW10_CS12, SW12_CS12, SW11_CS12}, // 122, Underglow 36
+    {1, SW10_CS13, SW12_CS13, SW11_CS13}, // 123, Underglow 37
+    {1, SW10_CS14, SW12_CS14, SW11_CS14}, // 124, Underglow 38
+    {1, SW10_CS15, SW12_CS15, SW11_CS15}, // 125, Underglow 39
+    {1, SW10_CS16, SW12_CS16, SW11_CS16}, // 126, Underglow 40
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/feker/ik75/info.json b/keyboards/feker/ik75/info.json
index 0da1ff08ea7..4b7e4915198 100644
--- a/keyboards/feker/ik75/info.json
+++ b/keyboards/feker/ik75/info.json
@@ -9,7 +9,53 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "is31fl3733",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "E2"],
diff --git a/keyboards/feker/ik75/keymaps/bkzshen/keymap.c b/keyboards/feker/ik75/keymaps/bkzshen/keymap.c
deleted file mode 100644
index 53d8145b7ac..00000000000
--- a/keyboards/feker/ik75/keymaps/bkzshen/keymap.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Copyright 2022 Feker
- * 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,
-    _FN1,
-    _FN2,
-};
-
-// enum layer_keycodes { };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
-       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
-       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││Del│ │Mut│
-       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
-       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bckspc│ │Hom│
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
-       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │ │End│
-       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
-       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │ │PgU│
-       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
-       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │┌───┐│PgD│
-       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│ ↑ │└───┘
-       │LCrl│GUI │LAlt│         Space          │RAt│Fn │Rcl│┌───┼───┼───┐
-       └────┴────┴────┴────────────────────────┴───┴───┴───┘│ ← │ ↓ │ → │
-                                                            └───┴───┴───┘
-       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
-       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
-       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
-       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ │   │
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
-       │     │ 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 │┌───┐│   │
-       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│   │└───┘
-       │    │    │    │                        │   │   │   │┌───┼───┼───┐
-       └────┴────┴────┴────────────────────────┴───┴───┴───┘│   │   │   │
-                                                            └───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3      4      5      6       7      8      9        10       11       12       13       14       15     */
-    [_BASE] = 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(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
-            ),
-
-/*
-       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
-       │Rst││Mcm│Hom│Cal│Sel││Prv│Nxt│Ply│Stp││Mut│VoD│VoU│Mai││Ins│ │Tog│
-       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
-       │NKO│   │   │   │   │   │   │   │   │   │   │Spd│Spi│       │ │Mod│
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
-       │     │   │   │   │   │   │   │   │   │   │Prt│   │   │     │ │Hui│
-       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
-       │      │   │Scr│   │   │   │   │   │   │   │   │   │        │ │Sai│
-       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
-       │        │   │   │   │   │   │Num│   │   │   │   │      │┌───┐│Sad│
-       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│Vai│└───┘
-       │    │GTog│    │                        │    │    │  ┌───┼───┼───┐
-       └────┴────┴────┴────────────────────────┴────┴────┘  │   │Vad│   │
-                                                            └───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
-    [_FN] = LAYOUT(
-                QK_BOOT, KC_MYCM, KC_WHOM, KC_CALC, KC_SLCT, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL, KC_INS,           RGB_TOG,
-                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______,          RGB_MOD,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          RGB_HUI,
-                _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
-                _______,          _______, _______, _______, _______, _______, KC_NUM,  _______, _______, _______, _______,          _______, RGB_VAI, RGB_SAD,
-                _______, GUI_TOG, _______,                            _______,                   _______, _______,          _______, _______, RGB_VAD, _______
-            ),
-
-/*
-       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
-       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
-       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
-       │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
-       │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │
-       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
-       │      │   │   │   │   │   │   │   │   │   │   │   │        │ │   │
-       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
-       │        │   │   │   │   │   │   │   │   │   │   │      │┌───┐│   │
-       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│   │└───┘
-       │    │    │    │                        │    │    │  ┌───┼───┼───┐
-       └────┴────┴────┴────────────────────────┴────┴────┘  │   │   │   │
-                                                            └───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
-    [_FN1] = LAYOUT(
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-                _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______, _______
-            ),
-
-/*
-       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐
-       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   │ │   │
-       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐
-       │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤
-       │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │
-       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤
-       │      │   │   │   │   │   │   │   │   │   │   │   │        │ │   │
-       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤
-       │        │   │   │   │   │   │   │   │   │   │   │      │┌───┐│   │
-       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│   │└───┘
-       │    │    │    │                        │    │    │  ┌───┼───┼───┐
-       └────┴────┴────┴────────────────────────┴────┴────┘  │   │   │   │
-                                                            └───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
-    [_FN2] = LAYOUT(
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-                _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______, _______
-            ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case RGB_TOG:
-            if (record->event.pressed) {
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case (LED_FLAG_UNDERGLOW): {
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();
-                    }
-                    break;
-                }
-            }
-            return false;
-	}
-
-    return true;
-}
-
-bool rgb_matrix_indicators_user(void) {
-    rgb_matrix_set_color(46, 0, 0, 0);
-    rgb_matrix_set_color(104, 0, 0, 0);
-
-    uint8_t red = host_keyboard_led_state().caps_lock ? 255 : 0;
-    uint8_t blue = host_keyboard_led_state().scroll_lock ? 255 : 0;
-    uint8_t green = keymap_config.no_gui ? 255 : 0;
-
-
-    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
-        if (host_keyboard_led_state().num_lock) {
-            rgb_matrix_set_color(46, 255, 0, 0);
-        }
-        rgb_matrix_set_color(104, red, green, blue);
-    } else {
-        if (host_keyboard_led_state().num_lock) {
-            rgb_matrix_set_color(46, 255, 0, 0);
-        } else {
-            rgb_matrix_set_color(46, 0, 0, 0);
-        }
-        rgb_matrix_set_color(104, red, green, blue);
-    }
-    return false;
-}
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_FN]   = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN1]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    [_FN2]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-};
-#endif
diff --git a/keyboards/feker/ik75/keymaps/bkzshen/rules.mk b/keyboards/feker/ik75/keymaps/bkzshen/rules.mk
deleted file mode 100644
index d76c12896fc..00000000000
--- a/keyboards/feker/ik75/keymaps/bkzshen/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = yes
-
-# Encoder enabled
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/ferris/0_2/bling/bling.c b/keyboards/ferris/0_2/bling/bling.c
index 07f58149cc9..69fbe411ebe 100644
--- a/keyboards/ferris/0_2/bling/bling.c
+++ b/keyboards/ferris/0_2/bling/bling.c
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 |    | 4  |   |    ||   |   | 4  |   |
 | 6  |    |   | 2  || 2 |   |    | 5 |
 */
-const is31fl3731_led_t g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
      *   driver
      *   |  R location
diff --git a/keyboards/ferris/0_2/bling/config.h b/keyboards/ferris/0_2/bling/config.h
index 64e7a6de2d9..2325463e1f0 100644
--- a/keyboards/ferris/0_2/bling/config.h
+++ b/keyboards/ferris/0_2/bling/config.h
@@ -20,55 +20,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LED Drivers */
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
-#define DRIVER_1_LED_TOTAL 7
-#define DRIVER_2_LED_TOTAL 7
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
-// 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
-#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_LED_COUNT 14
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json
index 1e9703f5994..06a826450b4 100644
--- a/keyboards/ferris/0_2/bling/info.json
+++ b/keyboards/ferris/0_2/bling/info.json
@@ -4,6 +4,51 @@
         "pid": "0x0002"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "is31fl3731"
     }
 }
diff --git a/keyboards/ferris/0_2/matrix.c b/keyboards/ferris/0_2/matrix.c
index af4b045eb8c..cf26385f4c8 100644
--- a/keyboards/ferris/0_2/matrix.c
+++ b/keyboards/ferris/0_2/matrix.c
@@ -42,9 +42,7 @@ extern i2c_status_t mcp23017_status;
 // All address pins of the mcp23017 are connected to the ground on the ferris
 // | 0  | 1  | 0  | 0  | A2 | A1 | A0 |
 // | 0  | 1  | 0  | 0  | 0  | 0  | 0  |
-#define I2C_ADDR 0b0100000
-#define I2C_ADDR_WRITE ((I2C_ADDR << 1) | I2C_WRITE)
-#define I2C_ADDR_READ ((I2C_ADDR << 1) | I2C_READ)
+#define I2C_ADDR (0b0100000 << 1)
 
 // Register addresses
 // See https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library/blob/master/Adafruit_MCP23017.h
@@ -77,9 +75,9 @@ uint8_t init_mcp23017(void) {
     // - driving : output : 0
     // This means: we will read all the bits on GPIOA
     // This means: we will write to the pins 0-4 on GPIOB (in select_rows)
-    uint8_t buf[] = {IODIRA, 0b11111111, 0b11110000};
+    uint8_t buf[] = {0b11111111, 0b11110000};
     print("before transmit\n");
-    mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), MCP23017_I2C_TIMEOUT);
+    mcp23017_status = i2c_writeReg(I2C_ADDR, IODIRA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT)
     uprintf("after transmit %i\n", mcp23017_status);
     if (!mcp23017_status) {
         // set pull-up
@@ -88,8 +86,7 @@ uint8_t init_mcp23017(void) {
         // - driving : off : 0
         // This means: we will read all the bits on GPIOA
         // This means: we will write to the pins 0-4 on GPIOB (in select_rows)
-        uint8_t pullup_buf[] = {GPPUA, 0b11111111, 0b11110000};
-        mcp23017_status      = i2c_transmit(I2C_ADDR_WRITE, pullup_buf, sizeof(pullup_buf), MCP23017_I2C_TIMEOUT);
+        mcp23017_status = i2c_writeReg(I2C_ADDR, GPPUA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT)
         uprintf("after transmit2 %i\n", mcp23017_status);
     }
     return mcp23017_status;
@@ -189,18 +186,13 @@ static matrix_row_t read_cols(uint8_t row) {
         if (mcp23017_status) {  // if there was an error
             return 0;
         } else {
-            uint8_t buf[]   = {MCP23017_GPIOA};
-            mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), MCP23017_I2C_TIMEOUT);
             // We read all the pins on GPIOA.
             // The initial state was all ones and any depressed key at a given column for the currently selected row will have its bit flipped to zero.
             // The return value is a row as represented in the generic matrix code were the rightmost bits represent the lower columns and zeroes represent non-depressed keys while ones represent depressed keys.
             // Since the pins connected to eact columns are sequential, and counting from zero up (col 5 -> GPIOA0, col 6 -> GPIOA1 and so on), the only transformation needed is a bitwise not to swap all zeroes and ones.
             uint8_t data[] = {0};
-            if (!mcp23017_status) {
-                mcp23017_status = i2c_receive(I2C_ADDR_READ, data, sizeof(data), MCP23017_I2C_TIMEOUT);
-                data[0]         = ~(data[0]);
-            }
-            return data[0];
+            mcp23017_status = i2c_readReg(I2C_ADDR, MCP23017_GPIOA, data, sizeof(data), MCP23017_I2C_TIMEOUT);
+            return ~data[0];
         }
     }
 }
@@ -244,8 +236,8 @@ static void select_row(uint8_t row) {
         } else {
             // Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one.
             // Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus.
-            uint8_t buf[]   = {MCP23017_GPIOB, 0xFF & ~(1 << (row - MATRIX_ROWS_PER_SIDE))};
-            mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
+            uint8_t buf[]   = {0xFF & ~(1 << (row - MATRIX_ROWS_PER_SIDE))};
+            mcp23017_status = i2c_writeReg(I2C_ADDR, MCP23017_GPIOB, buf, sizeof(buf), MCP23017_I2C_TIMEOUT);
         }
     }
 }
diff --git a/keyboards/ferris/keymaps/bruun-baer/config.h b/keyboards/ferris/keymaps/bruun-baer/config.h
deleted file mode 100644
index fce5cb445b9..00000000000
--- a/keyboards/ferris/keymaps/bruun-baer/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2022 Alexander Bruun <alex@bruun.xyz>
-
-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
-// Set the mouse settings to a comfortable speed/accuracy trade-off,
-// assuming a screen refresh rate of 60 Htz or higher
-// The default is 50. This makes the mouse ~3 times faster and more accurate
-#define MOUSEKEY_INTERVAL 16
-// The default is 20. Since we made the mouse about 3 times faster with the previous setting,
-// give it more time to accelerate to max speed to retain precise control over short distances.
-#define MOUSEKEY_TIME_TO_MAX 40
-// The default is 300. Let's try and make this as low as possible while keeping the cursor responsive
-#define MOUSEKEY_DELAY 100
-// It makes sense to use the same delay for the mouseweel
-#define MOUSEKEY_WHEEL_DELAY 100
-// The default is 100
-#define MOUSEKEY_WHEEL_INTERVAL 50
-// The default is 40
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
-
-// Pick good defaults for enabling homerow modifiers
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-#define QUICK_TAP_TERM 0
diff --git a/keyboards/ferris/keymaps/bruun-baer/keymap.json b/keyboards/ferris/keymaps/bruun-baer/keymap.json
deleted file mode 100644
index ee966ab1b50..00000000000
--- a/keyboards/ferris/keymaps/bruun-baer/keymap.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "version": 1,
-    "notes": "Personal keymap",
-    "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-    "keyboard": "ferris/sweep",
-    "keymap": "bruun-baer",
-    "layout": "LAYOUT_split_3x5_2",
-    "layers": [
-        ["KC_Q"        , "KC_D"        , "KC_R"        , "KC_W"          , "KC_B",
-         "KC_J"        , "KC_F"        , "KC_U"        , "KC_P"          , "KC_QUOT",
-
-         "LGUI_T(KC_A)", "LALT_T(KC_S)", "LSFT_T(KC_H)", "LCTL_T(KC_T)"  , "KC_G",
-         "KC_Y"        , "LCTL_T(KC_N)", "LSFT_T(KC_E)", "LALT_T(KC_O)"  , "LGUI_T(KC_I)",
-
-         "KC_Z"        , "RALT_T(KC_X)", "KC_M"        , "KC_C"          , "KC_V",
-         "KC_K"        , "KC_L"        , "KC_COMM"     , "RALT_T(KC_DOT)", "KC_SLSH",
-
-         "LT(3,KC_SPC)", "LT(4,KC_TAB)",
-         "LT(2,KC_ENT)", "LT(1,KC_BSPC)"
-        ],
-        ["KC_LBRC"     , "KC_7"        , "KC_8"        , "KC_9"          , "KC_RBRC",
-         "KC_NO"       , "KC_NO"       , "KC_NO"       , "KC_NO"         , "KC_NO",
-
-         "KC_SCLN"     , "KC_4"        , "KC_5"        , "KC_6"          , "KC_EQL",
-         "KC_NO"       , "KC_LCTL"     , "KC_LSFT"     , "KC_LALT"       , "KC_LGUI",
-
-         "KC_GRV"      , "KC_1"        , "KC_2"        , "KC_3"          , "KC_BSLS",
-         "KC_NO"       , "KC_NO"       , "KC_NO"       , "KC_RALT"       , "KC_NO",
-
-         "KC_0"        , "KC_MINS",
-         "KC_NO"       , "KC_NO"
-        ],
-        ["KC_LCBR"     , "KC_AMPR"     , "KC_ASTR"     , "KC_LPRN"       , "KC_RCBR",
-         "KC_NO"       ,  "KC_NO"      , "KC_NO"       , "KC_NO"         , "KC_NO",
-
-         "KC_COLN"     , "KC_DLR"      , "KC_PERC"     , "KC_CIRC"       , "KC_PLUS",
-         "KC_NO"       , "KC_LCTL"     , "KC_LSFT"     , "KC_LALT"       , "KC_LGUI",
-
-         "KC_TILD"     , "KC_EXLM"     , "KC_AT"       , "KC_HASH"       , "KC_PIPE",
-         "KC_NO"       , "KC_NO"       , "KC_NO"       , "KC_RALT"       , "KC_NO",
-
-         "KC_RPRN"     , "KC_UNDS",
-         "KC_NO"       , "KC_NO"
-        ],
-        ["KC_F12"      , "KC_F7"       , "KC_F8"       , "KC_F9"         , "KC_PSCR",
-         "KC_AGIN"     , "KC_PSTE"     , "KC_COPY"     , "KC_CUT"        , "KC_UNDO",
-
-         "KC_F11"      , "KC_F4"       , "KC_F5"       , "KC_F6"         , "KC_SCRL",
-         "KC_CAPS"     , "KC_LEFT"     , "KC_DOWN"     , "KC_UP"         , "KC_RGHT",
-
-         "KC_F10"      , "KC_F1"       , "KC_F2"       , "KC_F3"         , "KC_PAUS",
-         "KC_INS"      , "KC_HOME"     , "KC_PGDN"     , "KC_PGUP"       , "KC_END",
-
-         "KC_NO"       , "KC_NO",
-         "KC_ESC"      , "KC_DEL"
-        ],
-        ["KC_NO"       , "KC_NO"       , "KC_NO"       , "KC_NO"         , "KC_NO",
-         "KC_MPLY"     , "KC_MPRV"     , "KC_VOLD"     , "KC_VOLU"       , "KC_MNXT",
-
-         "KC_LGUI"     , "KC_LALT"     , "KC_LSFT"     , "KC_LCTL"       , "KC_NO",
-         "KC_MUTE"     , "KC_MS_L"     , "KC_MS_D"     , "KC_MS_U"       , "KC_MS_R",
-
-         "KC_NO"       , "KC_RALT"     , "KC_NO"       , "KC_NO"         , "KC_NO",
-         "KC_BTN3"     , "KC_WH_L"     , "KC_WH_D"     , "KC_WH_U"       , "KC_WH_R",
-
-         "KC_NO"       , "KC_NO",
-         "KC_BTN1"     , "KC_BTN2"
-        ]
-    ],
-    "author": "@bruun-baer"
-}
diff --git a/keyboards/ferris/keymaps/bruun-baer/readme.md b/keyboards/ferris/keymaps/bruun-baer/readme.md
deleted file mode 100644
index 7d1d78b5f17..00000000000
--- a/keyboards/ferris/keymaps/bruun-baer/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Personal Ferris Sweep Keymap
-===============================================
diff --git a/keyboards/ferris/keymaps/madhatter/config.h b/keyboards/ferris/keymaps/madhatter/config.h
deleted file mode 100644
index 65a14e6622a..00000000000
--- a/keyboards/ferris/keymaps/madhatter/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2020 Pierre Chevalier <pierrechevalier83@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
-
-// Pick good defaults for enabling homerow modifiers
-#define TAPPING_TERM 200
diff --git a/keyboards/ferris/keymaps/madhatter/keymap.c b/keyboards/ferris/keymaps/madhatter/keymap.c
deleted file mode 100644
index 7b0c2e82bf8..00000000000
--- a/keyboards/ferris/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#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 ferris_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE
-};
-
-enum ferris_tap_dances {
-  TD_Q_ESC
-};
-
-#define KC_CTSC RCTL_T(KC_SCLN)
-#define KC_CTLA LCTL_T(KC_A)
-#define KC_LSHZ LSFT_T(KC_Z)
-#define KC_RLSH RSFT_T(KC_SLSH)
-#define KC_SPM2 LT(2, KC_SPC)
-#define KC_BSM1 LT(1, KC_BSPC)
-#define KC_GUTA GUI_T(KC_TAB)
-#define KC_CLGV CTL_T(KC_GRV)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT( /* QWERTY */
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,
-    KC_CTLA, KC_S,    KC_D,    KC_F,    KC_G,            KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN,
-    KC_LSHZ, KC_X,    KC_C,    KC_V,    KC_B,            KC_N,    KC_M,  KC_COMM, KC_DOT, KC_RLSH,
-                                    KC_CLGV, KC_BSM1, KC_SPM2, KC_GUTA
-  ),
-
-  [_LOWER] = LAYOUT( /* [> LOWER <] */
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-    QK_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,         KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ENT,
-                                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
-  ),
-
-  [_RAISE] = LAYOUT( /* [> RAISE <] */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-    KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_PIPE,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, QK_BOOT,
-                                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  )
-};
-
-// Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Q, twice for ESC
-    [TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC)
-};
diff --git a/keyboards/ferris/keymaps/madhatter/rules.mk b/keyboards/ferris/keymaps/madhatter/rules.mk
deleted file mode 100644
index 25e61e4d5bb..00000000000
--- a/keyboards/ferris/keymaps/madhatter/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-TAP_DANCE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/ferris/keymaps/pierrec83/config.h b/keyboards/ferris/keymaps/pierrec83/config.h
deleted file mode 100644
index 1a4d15ff425..00000000000
--- a/keyboards/ferris/keymaps/pierrec83/config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2020 Pierre Chevalier <pierrechevalier83@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
-// Set the mouse settings to a comfortable speed/accuracy trade-off,
-// assuming a screen refresh rate of 60 Htz or higher
-// The default is 50. This makes the mouse ~3 times faster and more accurate
-#define MOUSEKEY_INTERVAL 16
-// The default is 20. Since we made the mouse about 3 times faster with the previous setting,
-// give it more time to accelerate to max speed to retain precise control over short distances.
-#define MOUSEKEY_TIME_TO_MAX 40
-// The default is 300. Let's try and make this as low as possible while keeping the cursor responsive
-#define MOUSEKEY_DELAY 100
-// It makes sense to use the same delay for the mouseweel
-#define MOUSEKEY_WHEEL_DELAY 100
-// The default is 100
-#define MOUSEKEY_WHEEL_INTERVAL 50
-// The default is 40
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
-
-// Pick good defaults for enabling homerow modifiers
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-#define QUICK_TAP_TERM 0
-
-// Underglow configuration
-#ifdef RGBLIGHT_ENABLE
-#    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 RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/ferris/keymaps/pierrec83/keymap.json b/keyboards/ferris/keymaps/pierrec83/keymap.json
deleted file mode 100644
index 2cbc47d9127..00000000000
--- a/keyboards/ferris/keymaps/pierrec83/keymap.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{    "version": 1,
-    "notes": "My awesome keymap",
-    "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-    "keyboard": "ferris/0_1",
-    "keymap": "pierrec83",
-    "layout": "LAYOUT",
-    "layers": [
-        ["KC_Q"                   , "KC_D"                 , "KC_R"           , "KC_W"                 , "KC_B",
-         "KC_J"                   , "KC_F"                 , "KC_U"           , "KC_P"                 , "KC_SCLN",
-
-         "LSFT_T(KC_A)"           , "LT(6,KC_S)"           , "LT(2,KC_H)"     , "LT(4,KC_T)"           , "KC_G",
-         "KC_Y"                   , "LT(5,KC_N)"           , "LT(3,KC_E)"     , "LT(7,KC_O)"           , "LSFT_T(KC_I)",
-
-         "KC_Z"                   , "LCTL_T(KC_X)"         , "LALT_T(KC_M)"   , "KC_C"                 , "KC_V",
-         "KC_K"                   , "KC_L"                 , "LALT_T(KC_COMM)", "LCTL_T(KC_DOT)"       , "KC_SLSH",
-
-         "LCA(KC_UP)"             , "KC_BSPC",
-         "LT(8,KC_SPC)"           , "LCA(KC_DOWN)"
-        ],
-        ["KC_Q"                   , "KC_C"                 , "KC_M"           , "KC_Y"                 , "KC_COLN",
-         "KC_Z"                   , "KC_W"                 , "KC_COMM"        , "KC_U"                 , "KC_J",
-
-         "LSFT_T(KC_R)"           , "LT(6,KC_S)"           , "LT(2,KC_T)"     , "LT(4,KC_H)"           , "KC_X",
-         "KC_TRNS"                , "LT(5,KC_N)"           , "LT(3,KC_A)"     , "LT(7,KC_I)"           , "LSFT_T(KC_O)",
-
-         "KC_B"                   , "LCTL_T(KC_F)"         , "LALT_T(KC_G)"   , "KC_D"                 , "KC_V",
-         "KC_ESC"                 , "KC_L"                 , "LALT_T(KC_DOT)" , "LCTL_T(KC_BSPC)"      , "KC_K",
-
-         "LCA(KC_UP)"             , "KC_E",
-         "LT(8,KC_SPC)"           , "LCA(KC_DOWN)"
-        ],
-        ["KC_TRNS"                , "ANY(LCTL(LSFT(KC_C)))", "KC_TRNS"        , "ANY(LCTL(LSFT(KC_V)))", "KC_TRNS",
-         "KC_TRNS"                , "KC_BTN1"              , "KC_WH_U"        , "KC_BTN2"              , "KC_TRNS",
-
-         "KC_TRNS"                , "KC_BTN2"              , "KC_NO"          , "KC_BTN1"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_MS_L"              , "KC_MS_D"        , "KC_MS_U"              , "KC_MS_R",
-
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_WH_L"              , "KC_WH_D"        , "KC_WH_R"              , "KC_TRNS",
-
-         "ANY(LCTL(LSFT(KC_TAB)))", "KC_TRNS",
-         "KC_TRNS"                , "LCTL(KC_TAB)"
-        ],
-        ["KC_TRNS"                , "KC_TRNS"              , "KC_PGUP"        , "KC_TRNS"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-
-         "KC_LEFT"                , "KC_UP"                , "KC_DOWN"        , "KC_RGHT"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_LGUI"              , "KC_NO"          , "LCTL(KC_LALT)"        , "LCA(KC_LSFT)",
-
-         "KC_TRNS"                , "KC_HOME"              , "KC_PGDN"        , "KC_END"               , "KC_TRNS",
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-
-         "RGB_RMOD"               , "KC_TRNS",
-         "KC_TRNS"                , "RGB_MOD"
-        ],
-        ["KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_UNDS"              , "KC_PIPE"        , "KC_QUOT"              , "KC_TRNS",
-
-         "KC_CIRC"                , "KC_ASTR"              , "KC_AMPR"        , "KC_NO"                , "KC_TRNS",
-         "KC_HASH"                , "KC_TILD"              , "KC_SLSH"        , "KC_DQUO"              , "KC_DLR",
-
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_MINS"              , "KC_BSLS"        , "KC_GRV"               , "KC_TRNS",
-
-         "KC_BRID"                , "KC_TRNS",
-         "KC_TRNS"                , "KC_BRIU"
-        ],
-        ["KC_TRNS"                , "KC_COLN"              , "KC_LT"          , "KC_GT"                , "KC_SCLN",
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-
-         "KC_LCBR"                , "KC_RCBR"              , "KC_LPRN"        , "KC_RPRN"              , "KC_AT",
-         "KC_TRNS"                , "KC_NO"                , "KC_EQL"         , "KC_PLUS"              , "KC_PERC",
-
-         "KC_TRNS"                , "KC_EXLM"              , "KC_LBRC"        , "KC_RBRC"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-
-         "KC_VOLD"                , "KC_TRNS",
-         "KC_TRNS"                , "KC_VOLU"
-        ],
-        ["KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_F7"                , "KC_F8"          , "KC_F9"                , "KC_F10",
-
-         "KC_TRNS"                , "KC_TRNS"              , "LCTL(KC_LALT)"  , "KC_TRNS"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_F4"                , "KC_F5"          , "KC_F6"                , "KC_F11",
-
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-         "KC_TRNS"                , "KC_F1"                , "KC_F2"          , "KC_F3"                , "KC_F12",
-
-         "KC_TRNS"                , "KC_TRNS",
-         "KC_TRNS"                , "KC_TRNS"
-        ],
-        ["KC_PSLS"                , "KC_7"                 , "KC_8"           , "KC_9"                 , "KC_PPLS",
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-
-         "KC_0"                   , "KC_1"                 , "KC_2"           , "KC_3"                 , "KC_PMNS",
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_NO"                , "KC_TRNS",
-
-         "KC_PAST"                , "KC_4"                 , "KC_5"           , "KC_6"                 , "KC_PEQL",
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-
-         "KC_TRNS"                , "KC_TRNS",
-         "KC_TRNS"                , "KC_TRNS"
-        ],
-        ["KC_TRNS"                , "KC_ESC"               , "KC_COLN"        , "KC_TRNS"              , "KC_TRNS",
-         "DF(2)"                  , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_DEL",
-
-         "KC_TRNS"                , "KC_PERC"              , "KC_SLSH"        , "KC_ENT"               , "KC_EXLM",
-         "DF(1)"                  , "KC_LGUI"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-
-         "KC_TRNS"                , "KC_TRNS"              , "KC_TRNS"        , "KC_TRNS"              , "KC_TRNS",
-         "DF(0)"                  , "KC_TRNS"              , "RALT_T(KC_COMM)", "RCTL_T(KC_DOT)"       , "QK_BOOT",
-
-         "KC_TRNS"                , "KC_TAB",
-         "KC_NO"                  , "KC_TRNS"
-        ]
-    ],
-    "author": "@pierrec83"
-}
diff --git a/keyboards/ferris/keymaps/pierrec83/readme.md b/keyboards/ferris/keymaps/pierrec83/readme.md
deleted file mode 100644
index d96a3bb8110..00000000000
--- a/keyboards/ferris/keymaps/pierrec83/readme.md
+++ /dev/null
@@ -1,43 +0,0 @@
-@pierrec83's personal keymap for the Ferris keyboard
-====================================================
-
-This keymap shares many commonalities with the default keymap.
-See its readme for a write-up on many of the decisions, including
-how to generate the formatted json file with json2crab.py and the
-general philosophy for each layer.
-
-Because this is my own keymap, I didn't refrain from using shortcuts
-that make sense for me and may not make sense for most.
-
-Key differences from the default keymap include:
-
-Alpha layers:
--------------
-
-Because I only learned to touch type when I switched from qwerty to workman,
-my base layer is workman and my layout doesn't contain a qwerty layer.
-
-My layer 1 hosts a variant of RSTHD that I am developing, inspired from workman's
-focus on reducing side-index-motion. It should become my end game keymap eventually,
-but I still haven't found the time to learn it to a working proficiency.
-
-Secondary thumbs:
------------------
-
-Instead of a placeholder 0 and 1, the secondary thumbs on my keymap
-perform the following actions:
-* Navigate to previous and next workspace the base layer
-* Navigate to previous and next tab on the mouse layer
-* Volume control on layer
-* Brightness control on layer
-
-Mouse layer:
-------------
-
-* Copy/Paste shortcuts on the left hand, on the upper row.
-
-Always available layer:
------------------------
-
-* Esc and column are placed differently to allow easy vim navigation with the positions of w and q in the workman base layer
-* Enable permanent switch to the RSTHD layer in addition to the mouse layer
diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h
deleted file mode 100644
index 35cf8d41514..00000000000
--- a/keyboards/ferris/sweep/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2018-2020
-// ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
-// David Philip Barr <@davidphilipbarr>
-// Pierre Chevalier <pierrechevalier83@gmail.com>
-// SPDX-License-Identifier: GPL-2.0+
-
-#pragma once
-
-#define EE_HANDS
diff --git a/keyboards/ferris/sweep/readme.md b/keyboards/ferris/sweep/readme.md
index b6dd436a8b1..7e9eddbfa12 100644
--- a/keyboards/ferris/sweep/readme.md
+++ b/keyboards/ferris/sweep/readme.md
@@ -17,27 +17,6 @@ Make example for this keyboard (after setting up your build environment):
 
 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).
 
-## Setting Handedness
-
-Firmware uses [handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default and it must be *configured once* on each side. The make commands for Pro micros are:
-
-    make ferris/sweep:default:avrdude-split-left
-    make ferris/sweep:default:avrdude-split-right
-
-For Elite-C or compatible controllers using `DFU` bootloader, add the line `BOOTLOADER = atmel-dfu` into the user keymap `rules.mk` file and use the following make commands:
-
-    make ferris/sweep:default:dfu-split-left
-    make ferris/sweep:default:dfu-split-right
-
-[QMK Toolbox](http://qmk.fm/toolbox) can also be used to set EEPROM handedness. Place the controller in bootloader mode and select menu option Tools -> EEPROM -> Set Left/Right Hand
-
-### RP2040 Controllers
-
-Pro Micro RP2040 controllers are supported with [QMK Converters](https://docs.qmk.fm/#/feature_converters). The make command example with handedness setting for Adafruit's KB2040 are:
-
-    make CONVERT_TO=kb2040 ferris/sweep:default:uf2-split-left
-    make CONVERT_TO=kb2040 ferris/sweep:default:uf2-split-right
-
 ## Bootloader
 
 Enter the bootloader in 3 ways:
diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h
index 19b030cdc1a..ced239c8334 100644
--- a/keyboards/ffkeebs/puca/config.h
+++ b/keyboards/ffkeebs/puca/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT  
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
index d1875f650f6..46df2a0d6af 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/config.h
@@ -21,7 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
index 96f969146fd..77b5fbe9566 100644
--- a/keyboards/fjlabs/avalon/info.json
+++ b/keyboards/fjlabs/avalon/info.json
@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "ws2812": {
diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
index 9bee3167926..084c49212ca 100644
--- a/keyboards/fjlabs/kyuu/config.h
+++ b/keyboards/fjlabs/kyuu/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json
index 9028c3dc8d9..ed02d7d3b42 100644
--- a/keyboards/fjlabs/kyuu/info.json
+++ b/keyboards/fjlabs/kyuu/info.json
@@ -26,6 +26,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "ws2812": {
diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h
index afdacdd0803..b352868d2d4 100644
--- a/keyboards/fjlabs/mk61rgbansi/config.h
+++ b/keyboards/fjlabs/mk61rgbansi/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json
index 01a859e0ba9..8c42aa97b64 100644
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ b/keyboards/fjlabs/mk61rgbansi/info.json
@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h
index afdacdd0803..b352868d2d4 100644
--- a/keyboards/fjlabs/tf60ansi/config.h
+++ b/keyboards/fjlabs/tf60ansi/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json
index b45f7258b6a..f161284ae01 100644
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ b/keyboards/fjlabs/tf60ansi/info.json
@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
index afdacdd0803..b352868d2d4 100644
--- a/keyboards/fjlabs/tf60v2/config.h
+++ b/keyboards/fjlabs/tf60v2/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json
index 7f6b3ce970e..e3051c0da7b 100644
--- a/keyboards/fjlabs/tf60v2/info.json
+++ b/keyboards/fjlabs/tf60v2/info.json
@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h
index afdacdd0803..b352868d2d4 100644
--- a/keyboards/fjlabs/tf65rgbv2/config.h
+++ b/keyboards/fjlabs/tf65rgbv2/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json
index 2101e17f032..ab105ff4a9f 100644
--- a/keyboards/fjlabs/tf65rgbv2/info.json
+++ b/keyboards/fjlabs/tf65rgbv2/info.json
@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/flashquark/horizon_z/config.h b/keyboards/flashquark/horizon_z/config.h
index ddeafe578d1..360a170626d 100755
--- a/keyboards/flashquark/horizon_z/config.h
+++ b/keyboards/flashquark/horizon_z/config.h
@@ -14,64 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #pragma once
 
-
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-// #    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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 62
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/flashquark/horizon_z/horizon_z.c b/keyboards/flashquark/horizon_z/horizon_z.c
index a9faa5a943f..79bd503ff68 100755
--- a/keyboards/flashquark/horizon_z/horizon_z.c
+++ b/keyboards/flashquark/horizon_z/horizon_z.c
@@ -17,68 +17,68 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, B_1,    A_1,    C_1},
-    {0, B_2,    A_2,    C_2},
-    {0, B_3,    A_3,    C_3},
-    {0, B_4,    A_4,    C_4},
-    {0, B_5,    A_5,    C_5},
-    {0, B_6,    A_6,    C_6},
-    {0, B_7,    A_7,    C_7},
-    {0, B_8,    A_8,    C_8},
-    {0, B_9,    A_9,    C_9},
-    {0, B_10,   A_10,   C_10},
-    {0, B_11,   A_11,   C_11},
-    {0, B_12,   A_12,   C_12},
-    {0, B_13,   A_13,   C_13},
-    {0, B_14,   A_14,   C_14},
-    {0, E_1,    D_1,    F_1},
-    {0, E_2,    D_2,    F_2},
-    {0, E_3,    D_3,    F_3},
-    {0, E_4,    D_4,    F_4},
-    {0, E_5,    D_5,    F_5},
-    {0, E_6,    D_6,    F_6},
-    {0, E_7,    D_7,    F_7},
-    {0, E_8,    D_8,    F_8},
-    {0, E_9,    D_9,    F_9},
-    {0, E_10,   D_10,   F_10},
-    {0, E_11,   D_11,   F_11},
-    {0, E_12,   D_12,   F_12},
-    {0, E_13,   D_13,   F_13},
-    {0, E_14,   D_14,   F_14},
-    {0, H_1,    G_1,    I_1},
-    {0, H_2,    G_2,    I_2},
-    {0, H_3,    G_3,    I_3},
-    {0, H_4,    G_4,    I_4},
-    {0, H_5,    G_5,    I_5},
-    {0, H_6,    G_6,    I_6},
-    {0, H_7,    G_7,    I_7},
-    {0, H_8,    G_8,    I_8},
-    {0, H_9,    G_9,    I_9},
-    {0, H_10,   G_10,   I_10},
-    {0, H_11,   G_11,   I_11},
-    {0, H_12,   G_12,   I_12},
-    {0, H_13,   G_13,   I_13},
-    {0, K_1,    J_1,    L_1},
-    {0, K_2,    J_2,    L_2},
-    {0, K_3,    J_3,    L_3},
-    {0, K_4,    J_4,    L_4},
-    {0, K_5,    J_5,    L_5},
-    {0, K_6,    J_6,    L_6},
-    {0, K_7,    J_7,    L_7},
-    {0, K_8,    J_8,    L_8},
-    {0, K_9,    J_9,    L_9},
-    {0, K_10,   J_10,   L_10},
-    {0, K_11,   J_11,   L_11},
-    {0, K_14,   J_14,   L_14},
-    {0, B_16,   A_16,   C_16},
-    {0, E_16,   D_16,   F_16},
-    {0, H_16,   G_16,   I_16},
-    {0, K_16,   J_16,   L_16},
-    {0, K_15,   J_15,   L_15},
-    {0, K_12,   J_12,   L_12},
-    {0, K_13,   J_13,   L_13},
-    {0, H_14,   G_14,   I_14},
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    {0, SW2_CS1,    SW1_CS1,    SW3_CS1},
+    {0, SW2_CS2,    SW1_CS2,    SW3_CS2},
+    {0, SW2_CS3,    SW1_CS3,    SW3_CS3},
+    {0, SW2_CS4,    SW1_CS4,    SW3_CS4},
+    {0, SW2_CS5,    SW1_CS5,    SW3_CS5},
+    {0, SW2_CS6,    SW1_CS6,    SW3_CS6},
+    {0, SW2_CS7,    SW1_CS7,    SW3_CS7},
+    {0, SW2_CS8,    SW1_CS8,    SW3_CS8},
+    {0, SW2_CS9,    SW1_CS9,    SW3_CS9},
+    {0, SW2_CS10,   SW1_CS10,   SW3_CS10},
+    {0, SW2_CS11,   SW1_CS11,   SW3_CS11},
+    {0, SW2_CS12,   SW1_CS12,   SW3_CS12},
+    {0, SW2_CS13,   SW1_CS13,   SW3_CS13},
+    {0, SW2_CS14,   SW1_CS14,   SW3_CS14},
+    {0, SW5_CS1,    SW4_CS1,    SW6_CS1},
+    {0, SW5_CS2,    SW4_CS2,    SW6_CS2},
+    {0, SW5_CS3,    SW4_CS3,    SW6_CS3},
+    {0, SW5_CS4,    SW4_CS4,    SW6_CS4},
+    {0, SW5_CS5,    SW4_CS5,    SW6_CS5},
+    {0, SW5_CS6,    SW4_CS6,    SW6_CS6},
+    {0, SW5_CS7,    SW4_CS7,    SW6_CS7},
+    {0, SW5_CS8,    SW4_CS8,    SW6_CS8},
+    {0, SW5_CS9,    SW4_CS9,    SW6_CS9},
+    {0, SW5_CS10,   SW4_CS10,   SW6_CS10},
+    {0, SW5_CS11,   SW4_CS11,   SW6_CS11},
+    {0, SW5_CS12,   SW4_CS12,   SW6_CS12},
+    {0, SW5_CS13,   SW4_CS13,   SW6_CS13},
+    {0, SW5_CS14,   SW4_CS14,   SW6_CS14},
+    {0, SW8_CS1,    SW7_CS1,    SW9_CS1},
+    {0, SW8_CS2,    SW7_CS2,    SW9_CS2},
+    {0, SW8_CS3,    SW7_CS3,    SW9_CS3},
+    {0, SW8_CS4,    SW7_CS4,    SW9_CS4},
+    {0, SW8_CS5,    SW7_CS5,    SW9_CS5},
+    {0, SW8_CS6,    SW7_CS6,    SW9_CS6},
+    {0, SW8_CS7,    SW7_CS7,    SW9_CS7},
+    {0, SW8_CS8,    SW7_CS8,    SW9_CS8},
+    {0, SW8_CS9,    SW7_CS9,    SW9_CS9},
+    {0, SW8_CS10,   SW7_CS10,   SW9_CS10},
+    {0, SW8_CS11,   SW7_CS11,   SW9_CS11},
+    {0, SW8_CS12,   SW7_CS12,   SW9_CS12},
+    {0, SW8_CS13,   SW7_CS13,   SW9_CS13},
+    {0, SW11_CS1,    SW10_CS1,    SW12_CS1},
+    {0, SW11_CS2,    SW10_CS2,    SW12_CS2},
+    {0, SW11_CS3,    SW10_CS3,    SW12_CS3},
+    {0, SW11_CS4,    SW10_CS4,    SW12_CS4},
+    {0, SW11_CS5,    SW10_CS5,    SW12_CS5},
+    {0, SW11_CS6,    SW10_CS6,    SW12_CS6},
+    {0, SW11_CS7,    SW10_CS7,    SW12_CS7},
+    {0, SW11_CS8,    SW10_CS8,    SW12_CS8},
+    {0, SW11_CS9,    SW10_CS9,    SW12_CS9},
+    {0, SW11_CS10,   SW10_CS10,   SW12_CS10},
+    {0, SW11_CS11,   SW10_CS11,   SW12_CS11},
+    {0, SW11_CS14,   SW10_CS14,   SW12_CS14},
+    {0, SW2_CS16,   SW1_CS16,   SW3_CS16},
+    {0, SW5_CS16,   SW4_CS16,   SW6_CS16},
+    {0, SW8_CS16,   SW7_CS16,   SW9_CS16},
+    {0, SW11_CS16,   SW10_CS16,   SW12_CS16},
+    {0, SW11_CS15,   SW10_CS15,   SW12_CS15},
+    {0, SW11_CS12,   SW10_CS12,   SW12_CS12},
+    {0, SW11_CS13,   SW10_CS13,   SW12_CS13},
+    {0, SW8_CS14,   SW7_CS14,   SW9_CS14},
 };
 
 
diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/info.json
index 9127042f714..0fe14e7c603 100755
--- a/keyboards/flashquark/horizon_z/info.json
+++ b/keyboards/flashquark/horizon_z/info.json
@@ -20,6 +20,36 @@
     },
     "processor": "atmega32u4",
     "rgb_matrix": {
+        "animations": {
+           "alphas_mods": true,
+           "gradient_left_right": true,
+           "breathing": true,
+           "band_val": true,
+           "band_pinwheel_val": true,
+           "band_spiral_val": true,
+           "cycle_all": true,
+           "cycle_left_right": true,
+           "cycle_up_down": true,
+           "rainbow_moving_chevron": true,
+           "cycle_out_in": true,
+           "cycle_out_in_dual": true,
+           "cycle_pinwheel": true,
+           "cycle_spiral": true,
+           "dual_beacon": true,
+           "rainbow_beacon": true,
+           "rainbow_pinwheels": true,
+           "raindrops": true,
+           "jellybean_raindrops": true,
+           "hue_breathing": true,
+           "hue_pendulum": true,
+           "hue_wave": true,
+           "pixel_rain": true,
+           "pixel_flow": true,
+           "pixel_fractal": true,
+           "typing_heatmap": true,
+           "solid_reactive_simple": true,
+           "solid_reactive": true
+        },
         "driver": "is31fl3733",
         "layout": [
             { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
@@ -83,7 +113,8 @@
             { "flags": 1, "matrix": [4, 10], "x": 182, "y": 64 },
             { "flags": 1, "matrix": [4, 12], "x": 202, "y": 64 },
             { "flags": 1, "matrix": [4, 13], "x": 222, "y": 64 }
-        ]
+        ],
+        "sleep": true
     },
     "url": "https://flashquark.com/product/flashquark-horizon-z-qmk-edition-custom-kit/",
     "usb": {
diff --git a/keyboards/flehrad/tradestation/keymaps/tradestation/keymap.c b/keyboards/flehrad/tradestation/keymaps/tradestation/keymap.c
deleted file mode 100644
index 344b446f19d..00000000000
--- a/keyboards/flehrad/tradestation/keymaps/tradestation/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2019 flehrad
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-     [0] = LAYOUT_tradestation(
-        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/fleuron/keymaps/dollartacos/config.h b/keyboards/fleuron/keymaps/dollartacos/config.h
deleted file mode 100644
index 1ce0a168f5c..00000000000
--- a/keyboards/fleuron/keymaps/dollartacos/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2018 James Underwood
- *
- * 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
-// Place overrides here
\ No newline at end of file
diff --git a/keyboards/fleuron/keymaps/dollartacos/keymap.c b/keyboards/fleuron/keymaps/dollartacos/keymap.c
deleted file mode 100644
index 90490bb02f6..00000000000
--- a/keyboards/fleuron/keymaps/dollartacos/keymap.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright 2018 James Underwood
- *
- * 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 custom_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  DZ,
-  LOWER,
-  RAISE
-};
-
-/*
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_fleuron_grid(
-  /* Qwerty
-   * ,---------------------------------------------------------------------------------------------------------------.
-   * |  Esc |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  |  F12 | Mute | Play | Next |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |  Del |  /   |  *   |  /   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |  7   |  8   |  9   |  *   |
-   * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------+------|
-   * | Caps |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |  4   |  5   |  6   |  -   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |  1   |  2   |  3   |  +   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | RGB  | Ctrl | Alt  |Lower | Cmd  |Enter | Bksp |Space | Raise| Left | Down | Up   |Right |  0   |  .   |Enter |
-   * `---------------------------------------------------------------------------------------------------------------'
-   */
-  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_MUTE,  KC_MPLY, KC_MFFD,
-  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_DEL,  KC_PSLS,  KC_PAST, KC_PSLS,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_BSLS, KC_P7,   KC_P8,    KC_P9,   KC_PAST,
-  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_P4,   KC_P5,    KC_P6,   KC_PMNS,
-  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_P1,   KC_P2,    KC_P3,   KC_PPLS,
-  RGB_MOD, KC_LCTL, KC_LALT, LOWER,   KC_LGUI, KC_ENT, KC_BSPC, KC_SPC, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_P0,    KC_PDOT, KC_PENT
-),
-
-[_LOWER] = LAYOUT_fleuron_grid(
-  /* Lower
-   * ,---------------------------------------------------------------------------------------------------------------.
-   * |QK_BOOT |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      | _    | +    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      | {    | }    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |RGBtog|      |      |      |      |      |      |      |      | Home | PgUp | PgDn | End  |      |      |      |
-   * `---------------------------------------------------------------------------------------------------------------'
-   */
-  QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_UNDS,  KC_PLUS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_LCBR,  KC_RCBR,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  RGB_TOG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   _______,  _______,  _______
-),
-
-[_RAISE] = LAYOUT_fleuron_grid(
-  /* Raise
-   * ,---------------------------------------------------------------------------------------------------------------.
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      | -    | =    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      | [    | ]    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      | Prev | Vol- | Vol+ | Next |      |      |      |
-   * `---------------------------------------------------------------------------------------------------------------'
-   */
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MINS,  KC_EQL,   _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_LBRC,  KC_RBRC,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MRWD,  KC_VOLD,  KC_VOLU,  KC_MFFD,  _______,  _______,  _______
-)
-};
-
-/*
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case DZ:
-              SEND_STRING("00"); // Double 0 macro for numpad
-              return false;
-              break;
-            case LOWER:
-              
-        }
-    }
-    return true;
-};
-*/
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-      } else {
-        layer_off(_LOWER);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-      } else {
-        layer_off(_RAISE);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/fleuron/keymaps/dollartacos/readme.md b/keyboards/fleuron/keymaps/dollartacos/readme.md
deleted file mode 100644
index d370b574c0e..00000000000
--- a/keyboards/fleuron/keymaps/dollartacos/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Dollartaco's keymap for fleuron
\ No newline at end of file
diff --git a/keyboards/flygone60/rev3/readme.md b/keyboards/flygone60/rev3/readme.md
deleted file mode 100644
index d5e8cbcc251..00000000000
--- a/keyboards/flygone60/rev3/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# flygone60
-
-![Flygone60](https://i.imgur.com/x63gMG2h.jpeg)
-
-A 60% that takes arrow keys seriously!
-
-* Keyboard Maintainer: [ShandonCodes](https://github.com/ShandonCodes)
-* Hardware Supported: Flygone60
-* Hardware Availability: [Kit](https://www.etsy.com/listing/1025415290/flygone60-keyboard-kit?ga_order=most_relevant&ga_search_type=all&ga_view_type=gallery&ga_search_query=flygone60&ref=sr_gallery-1-13&organic_search_click=1&frs=1)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make flygone60/rev3:default
-
-Flashing example for this keyboard:
-
-    make flygone60/rev3: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/flygone60/rev3/rev3.c b/keyboards/flygone60/rev3/rev3.c
deleted file mode 100644
index 0de52610ae3..00000000000
--- a/keyboards/flygone60/rev3/rev3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 ShandonCodes
- *
- * 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 "rev3.h"
diff --git a/keyboards/flygone60/rev3/rev3.h b/keyboards/flygone60/rev3/rev3.h
deleted file mode 100644
index 66d738dc473..00000000000
--- a/keyboards/flygone60/rev3/rev3.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 ShandonCodes
- *
- * 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_60_ansi_arrow( \
-    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, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
-    k40, k41, k42,           k45,           k48, k49, k4a, k4b, k4c \
-) { \
-    { 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, KC_NO}, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO}, \
-    { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c, KC_NO} \
-}
diff --git a/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c b/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c
deleted file mode 100644
index 8e79d5a4f80..00000000000
--- a/keyboards/foostan/cornelius/keymaps/gipsy-king/keymap.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright 2021 gipsy-king
- *
- * 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
-
-// Raise layer or enter on tap
-#define RAISE LT(1, KC_ENT)
-// Xmonad layer with LGUI always on
-#define MOD4 LM(2, MOD_LGUI)
-// Oneshot
-#define ONESHOT OSL(3)
-// Mic-mute-tap or Fn layer (F20 is mic-mute on thinkpads)
-#define FNLAY LT(3, KC_F20)
-
-enum custom_keycodes {
-    EMAIL = SAFE_RANGE,
-    EMAIL_W,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * .-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |Backsp|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   -  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | LCTR | LGUI | LALT | MOD4 |  ^(  | Space|Ent/Ra|  ^)  | RALT | MUTE | RGUI | RCTR |
- * '-----------------------------------------------------------------------------------'
- */
-[0] = LAYOUT(
-  KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSPC,
-  KC_ESC, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
-  KC_MINS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_EQL,
-  KC_LCTL,KC_LALT,KC_LGUI,MOD4,   SC_LSPO,KC_SPC, RAISE,  SC_RSPC,KC_RALT,KC_RGUI,FNLAY,  KC_RCTL
-),
-/* Raise
- * .-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   \  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   ~  |   {  | PgUp | PgDn |  End | Home |  <-  |  \/  |  /\  |  ->  |   }  |   |  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   [  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   ]  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * '-----------------------------------------------------------------------------------'
- */
-[1] = LAYOUT(
-  KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSLS,
-  KC_TILD,KC_LCBR,KC_PGUP,KC_PGDN,KC_END, KC_HOME,KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_RCBR,KC_PIPE,
-  KC_LBRC,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_RBRC,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,ONESHOT,_______,_______
-),
-/* XMONAD 
- * Top row: Quit, Workspace shortcuts, Run
- * Middle row: Float, HJKL
- * Bottom row: Shift, Close, Border, Keyboard reset
- * Thumbs: Estra shifts, Space, Enter, Shifts
- */
-[2] = LAYOUT(
-  KC_Q,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_P,   KC_MUTE,
-  KC_LSFT,_______,_______,_______,_______,KC_T,   KC_H,   KC_J,   KC_K,   KC_L,   _______,_______,
-  KC_LSFT,_______,_______,KC_C,   _______,KC_B,   _______,_______,_______,_______,_______,_______,
-  _______,_______,_______,KC_LSFT,KC_LSFT,KC_SPC, KC_ENT, KC_LSFT,_______,_______,KC_VOLD,KC_VOLU
-),
-/* Fn
- * Some macros, Keyboard-reset, mouse and audio.
- */
-[3] = LAYOUT(
-  _______,_______,EMAIL_W,EMAIL,  _______,_______,_______,_______,_______,_______,_______,QK_BOOT,
-  _______,_______,_______,_______,_______,_______,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______,
-  _______,_______,_______,_______,_______,_______,KC_BTN1,KC_MUTE,KC_VOLD,KC_VOLU,KC_BRID,KC_BRIU,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case EMAIL:
-                SEND_STRING("ste3ls@gmail.com");
-                break;
-            case EMAIL_W:
-                SEND_STRING("benjamin@midokura.com");
-                break;
-        }
-    }
-    return true;
-};
diff --git a/keyboards/foostan/cornelius/keymaps/gipsy-king/readme.md b/keyboards/foostan/cornelius/keymaps/gipsy-king/readme.md
deleted file mode 100644
index f0bce9fc95f..00000000000
--- a/keyboards/foostan/cornelius/keymaps/gipsy-king/readme.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Gipsy-King's Cornelius layout
-
-Common typing only needs a base and a symbols layer. Layer changes are on the
-thumbs *including* shift and non-english variants.
-
-The importance of having shift on your thumbs is that you don't need to press
-some letters with pinky OR ring, depending on shift.
-
-## Base QWERTY layer
-
-* Tab, Backspace, Space, Ctrl/Alt/Mod are similar to a generic keyboard.
-* Esc is like when you remap CapsLock to Esc on a generic keyboard (vim).
-* Enter is on right thumb and raises Symbol layer on hold, because you rarely
-  hold.
-* Shifts are on both thumbs!
-* Leftmost thumb changes to Xmonad window management layer.
-* Rightmost thumb is Right-Alt which is for `us-intl-altgr` layout (althoug I
-  use kmonad to universally map international characters on all keyboards).
-* `-` and `=` are on the lower pinkies.
-* `F20` is mic-mute on my thinkpad laptop.
-
-## Symbol layer (Raise)
-
-* Top row is numbers, bottom row are their symbols. Most people do it the other
-  way 'round.
-* Middle row has curly brackets, and some navigation and arrows.
-* Square brackets are on the lower pinkies.
-* ```~\|`` are places aroung top/outer corners.
-
-## Xmonad layer (Window management)
-
-I use Xmonad to completely manage windows with just my keyboard. This layer
-accommodates most shortcuts.
-
-## Fn layer
-
-Lastly, some macros, mousekeys (not used, really), some media keys, and the
-function-keys (I use them maybe once in a decade).
-
diff --git a/keyboards/fortitude60/keymaps/default/config.h b/keyboards/fortitude60/keymaps/default/config.h
deleted file mode 100644
index 7e9b510ff69..00000000000
--- a/keyboards/fortitude60/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
diff --git a/keyboards/fortitude60/keymaps/via/config.h b/keyboards/fortitude60/keymaps/via/config.h
deleted file mode 100644
index 7e9b510ff69..00000000000
--- a/keyboards/fortitude60/keymaps/via/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
diff --git a/keyboards/foxlab/key65/universal/readme.md b/keyboards/foxlab/key65/universal/readme.md
index 967b9565f24..36f63b1abaf 100644
--- a/keyboards/foxlab/key65/universal/readme.md
+++ b/keyboards/foxlab/key65/universal/readme.md
@@ -19,4 +19,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## RGB LED support
 
-The universal PCB supports RGB LEDs as an LED strip, but is not supplied with one. To use RGB LEDs, you should configure the RGBLED_NUM to match the number of LEDs on your strip.
+The universal PCB supports RGB LEDs as an LED strip, but is not supplied with one. To use RGB LEDs, you should configure the RGBLIGHT_LED_COUNT to match the number of LEDs on your strip.
diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
deleted file mode 100644
index 3662c57c4be..00000000000
--- a/keyboards/foxlab/leaf60/hotswap/keymaps/crd/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-  _BL = 0, // Base Layer
-  _FL,     // Function Layer
-  _CL      // Control Layer
-};
-
-#define KC_CTES CTL_T(KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_BL] = LAYOUT_60_tsangan_hhkb(
-    QK_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_BSLS, 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_BSPC,
-    KC_CTES, 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, MO(_FL),
-    KC_LCTL, XXXXXXX, KC_LGUI,                            KC_SPC,                                      KC_RALT, XXXXXXX, TO(_CL)
-  ),
-	[_FL] = 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,  KC_INS, KC_DEL,
-    _______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
-    _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
-    _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
-    _______, _______, _______,                            _______,                                     _______, _______, _______
-  ),
-  [_CL] = LAYOUT_60_tsangan_hhkb(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_ON,   XXXXXXX, XXXXXXX,
-    XXXXXXX, BL_DOWN, BL_UP,   BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_BRTG, BL_STEP,          XXXXXXX,
-    XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_OFF,  XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                                     XXXXXXX, XXXXXXX, TO(_BL)
-  )
-};
diff --git a/keyboards/fractal/rules.mk b/keyboards/fractal/rules.mk
index 6beb2824318..ee623488daa 100755
--- a/keyboards/fractal/rules.mk
+++ b/keyboards/fractal/rules.mk
@@ -10,8 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS_HAS_RGB = no
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/frobiac/blackbowl/matrix.c b/keyboards/frobiac/blackbowl/matrix.c
index 727e26ddc19..2a2c2618ab3 100644
--- a/keyboards/frobiac/blackbowl/matrix.c
+++ b/keyboards/frobiac/blackbowl/matrix.c
@@ -45,10 +45,10 @@ void matrix_init_custom(void) {
     uint8_t pullup[2]    = {0, expander_input_mask};
 
     for (uint8_t i = 0; i < 2; ++i) {
-        expander_status = i2c_writeReg(i2c_addr[i], IODIRA, direction, 2, I2C_TIMEOUT);
+        expander_status = i2c_write_register(i2c_addr[i], IODIRA, direction, 2, I2C_TIMEOUT);
         if (expander_status) return;
 
-        expander_status = i2c_writeReg(i2c_addr[i], GPPUA, pullup, 2, I2C_TIMEOUT);
+        expander_status = i2c_write_register(i2c_addr[i], GPPUA, pullup, 2, I2C_TIMEOUT);
     }
 }
 
@@ -79,7 +79,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     // On both expanders: select col and read rows
     for (size_t i = 0; i < 2; ++i) {
         if (!expander_status) {
-            expander_status = i2c_writeReg(i2c_addr[i], EXPANDER_COL_REGISTER, &port, 1, I2C_TIMEOUT);
+            expander_status = i2c_write_register(i2c_addr[i], EXPANDER_COL_REGISTER, &port, 1, I2C_TIMEOUT);
         }
         wait_us(30);
 
@@ -87,7 +87,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
             return false;
         }
 
-        expander_status = i2c_readReg(i2c_addr[i], EXPANDER_ROW_REGISTER, &column_state[i], 1, I2C_TIMEOUT);
+        expander_status = i2c_read_register(i2c_addr[i], EXPANDER_ROW_REGISTER, &column_state[i], 1, I2C_TIMEOUT);
         column_state[i] = (~column_state[i]) & ((1 << MATRIX_ROWS_PER_SIDE) - 1);
     }
 
diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h
index d28c057500a..b316a918d4a 100644
--- a/keyboards/frooastboard/nano/config.h
+++ b/keyboards/frooastboard/nano/config.h
@@ -16,8 +16,4 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_HUE 234
-
-#define RGBLIGHT_DEFAULT_VAL 190
-
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD + 2
diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json
index 6112c4832c1..c81d7a3dfb0 100644
--- a/keyboards/frooastboard/nano/info.json
+++ b/keyboards/frooastboard/nano/info.json
@@ -35,6 +35,10 @@
             "rainbow_swirl": true,
             "snake": true,
             "twinkle": true
+        },
+        "default": {
+            "hue": 234,
+            "val": 190
         }
     },
     "ws2812": {
diff --git a/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
deleted file mode 100644
index 83d7c07da28..00000000000
--- a/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021-2022 frooastside
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(
-		KC_Z, KC_X,
-		TO(1), KC_TILD),
-
-	[1] = LAYOUT(
-		RGB_TOG, RGB_MOD,
-		TO(2), TO(0)),
-
-	[2] = LAYOUT(
-		RGB_HUD, RGB_HUI,
-		TO(3), TO(1)),
-
-	[3] = LAYOUT(
-		RGB_SAD, RGB_SAI,
-		TO(4), TO(2)),
-
-	[4] = LAYOUT(
-		RGB_VAD, RGB_VAI,
-		TO(5), TO(3)),
-
-	[5] = LAYOUT(
-		KC_TRNS, KC_TRNS,
-		QK_BOOT, TO(4))
-};
diff --git a/keyboards/frooastboard/walnut/config.h b/keyboards/frooastboard/walnut/config.h
index 710cd193420..c9ee79eecbd 100644
--- a/keyboards/frooastboard/walnut/config.h
+++ b/keyboards/frooastboard/walnut/config.h
@@ -3,42 +3,5 @@
 
 #pragma once
 
-#define IS31FL3737_PWM_FREQUENCY IS31FL3737_PWM_FREQUENCY_26K7_HZ
-#define RGB_MATRIX_LED_COUNT 48
 #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 191
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#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 RGB_MATRIX_LED_FLUSH_LIMIT 16
-#define RGB_MATRIX_DEFAULT_SPD 191
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define IS31FL3737_PWM_FREQUENCY IS31FL3737_PWM_FREQUENCY_26K7_HZ
diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/info.json
index fc8ca2130fd..4864e12fbcf 100644
--- a/keyboards/frooastboard/walnut/info.json
+++ b/keyboards/frooastboard/walnut/info.json
@@ -15,7 +15,42 @@
         "nkro": true
     },
     "rgb_matrix": {
-        "driver": "is31fl3737"
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true
+        },
+        "default": {
+            "animation": "rainbow_moving_chevron",
+            "speed": 191
+        },
+        "driver": "is31fl3737",
+        "max_brightness": 191,
+        "sleep": true
     },
     "build": {
         "lto": true
diff --git a/keyboards/frooastboard/walnut/walnut.c b/keyboards/frooastboard/walnut/walnut.c
index 48d1677f7ac..0de3467ae46 100644
--- a/keyboards/frooastboard/walnut/walnut.c
+++ b/keyboards/frooastboard/walnut/walnut.c
@@ -5,61 +5,61 @@
 
 #if defined(RGB_MATRIX_ENABLE)
 
-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |        G location
  *   |  |        |        B location
  *   |  |        |        | */
-    {0, K_1,     J_1,     L_1},
-    {0, K_2,     J_2,     L_2},
-    {0, K_3,     J_3,     L_3},
-    {0, K_4,     J_4,     L_4},
-    {0, K_5,     J_5,     L_5},
-    {0, K_6,     J_6,     L_6},
-    {0, K_7,     J_7,     L_7},
-    {0, K_8,     J_8,     L_8},
-    {0, K_9,     J_9,     L_9},
-    {0, K_10,    J_10,    L_10},
-    {0, K_11,    J_11,    L_11},
-    {0, K_12,    J_12,    L_12},
-    {0, H_1,     G_1,     I_1},
-    {0, H_2,     G_2,     I_2},
-    {0, H_3,     G_3,     I_3},
-    {0, H_4,     G_4,     I_4},
-    {0, H_5,     G_5,     I_5},
-    {0, H_6,     G_6,     I_6},
-    {0, H_7,     G_7,     I_7},
-    {0, H_8,     G_8,     I_8},
-    {0, H_9,     G_9,     I_9},
-    {0, H_10,    G_10,    I_10},
-    {0, H_11,    G_11,    I_11},
-    {0, H_12,    G_12,    I_12},
-    {0, E_1,     D_1,     F_1},
-    {0, E_2,     D_2,     F_2},
-    {0, E_3,     D_3,     F_3},
-    {0, E_4,     D_4,     F_4},
-    {0, E_5,     D_5,     F_5},
-    {0, E_6,     D_6,     F_6},
-    {0, E_7,     D_7,     F_7},
-    {0, E_8,     D_8,     F_8},
-    {0, E_9,     D_9,     F_9},
-    {0, E_10,    D_10,    F_10},
-    {0, E_11,    D_11,    F_11},
-    {0, E_12,    D_12,    F_12},
-    {0, B_1,     A_1,     C_1},
-    {0, B_2,     A_2,     C_2},
-    {0, B_3,     A_3,     C_3},
-    {0, B_4,     A_4,     C_4},
-    {0, B_5,     A_5,     C_5},
-    {0, B_6,     A_6,     C_6},
-    {0, B_7,     A_7,     C_7},
-    {0, B_8,     A_8,     C_8},
-    {0, B_9,     A_9,     C_9},
-    {0, B_10,    A_10,    C_10},
-    {0, B_11,    A_11,    C_11},
-    {0, B_12,    A_12,    C_12}
+    {0, SW11_CS1,     SW10_CS1,     SW12_CS1},
+    {0, SW11_CS2,     SW10_CS2,     SW12_CS2},
+    {0, SW11_CS3,     SW10_CS3,     SW12_CS3},
+    {0, SW11_CS4,     SW10_CS4,     SW12_CS4},
+    {0, SW11_CS5,     SW10_CS5,     SW12_CS5},
+    {0, SW11_CS6,     SW10_CS6,     SW12_CS6},
+    {0, SW11_CS7,     SW10_CS7,     SW12_CS7},
+    {0, SW11_CS8,     SW10_CS8,     SW12_CS8},
+    {0, SW11_CS9,     SW10_CS9,     SW12_CS9},
+    {0, SW11_CS10,    SW10_CS10,    SW12_CS10},
+    {0, SW11_CS11,    SW10_CS11,    SW12_CS11},
+    {0, SW11_CS12,    SW10_CS12,    SW12_CS12},
+    {0, SW8_CS1,     SW7_CS1,     SW9_CS1},
+    {0, SW8_CS2,     SW7_CS2,     SW9_CS2},
+    {0, SW8_CS3,     SW7_CS3,     SW9_CS3},
+    {0, SW8_CS4,     SW7_CS4,     SW9_CS4},
+    {0, SW8_CS5,     SW7_CS5,     SW9_CS5},
+    {0, SW8_CS6,     SW7_CS6,     SW9_CS6},
+    {0, SW8_CS7,     SW7_CS7,     SW9_CS7},
+    {0, SW8_CS8,     SW7_CS8,     SW9_CS8},
+    {0, SW8_CS9,     SW7_CS9,     SW9_CS9},
+    {0, SW8_CS10,    SW7_CS10,    SW9_CS10},
+    {0, SW8_CS11,    SW7_CS11,    SW9_CS11},
+    {0, SW8_CS12,    SW7_CS12,    SW9_CS12},
+    {0, SW5_CS1,     SW4_CS1,     SW6_CS1},
+    {0, SW5_CS2,     SW4_CS2,     SW6_CS2},
+    {0, SW5_CS3,     SW4_CS3,     SW6_CS3},
+    {0, SW5_CS4,     SW4_CS4,     SW6_CS4},
+    {0, SW5_CS5,     SW4_CS5,     SW6_CS5},
+    {0, SW5_CS6,     SW4_CS6,     SW6_CS6},
+    {0, SW5_CS7,     SW4_CS7,     SW6_CS7},
+    {0, SW5_CS8,     SW4_CS8,     SW6_CS8},
+    {0, SW5_CS9,     SW4_CS9,     SW6_CS9},
+    {0, SW5_CS10,    SW4_CS10,    SW6_CS10},
+    {0, SW5_CS11,    SW4_CS11,    SW6_CS11},
+    {0, SW5_CS12,    SW4_CS12,    SW6_CS12},
+    {0, SW2_CS1,     SW1_CS1,     SW3_CS1},
+    {0, SW2_CS2,     SW1_CS2,     SW3_CS2},
+    {0, SW2_CS3,     SW1_CS3,     SW3_CS3},
+    {0, SW2_CS4,     SW1_CS4,     SW3_CS4},
+    {0, SW2_CS5,     SW1_CS5,     SW3_CS5},
+    {0, SW2_CS6,     SW1_CS6,     SW3_CS6},
+    {0, SW2_CS7,     SW1_CS7,     SW3_CS7},
+    {0, SW2_CS8,     SW1_CS8,     SW3_CS8},
+    {0, SW2_CS9,     SW1_CS9,     SW3_CS9},
+    {0, SW2_CS10,    SW1_CS10,    SW3_CS10},
+    {0, SW2_CS11,    SW1_CS11,    SW3_CS11},
+    {0, SW2_CS12,    SW1_CS12,    SW3_CS12}
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/fs_streampad/config.h b/keyboards/fs_streampad/config.h
new file mode 100644
index 00000000000..567c985a63b
--- /dev/null
+++ b/keyboards/fs_streampad/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Matthijs Muller
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
diff --git a/keyboards/fs_streampad/info.json b/keyboards/fs_streampad/info.json
new file mode 100644
index 00000000000..5adefff443d
--- /dev/null
+++ b/keyboards/fs_streampad/info.json
@@ -0,0 +1,95 @@
+{
+    "manufacturer": "Forward Slash",
+    "keyboard_name": "FS streampad",
+    "maintainer": "Matthijs Muller",
+    "url": "https://github.com/smollchungus",
+    "usb": {
+        "vid": "0x5363",
+        "pid": "0x3333",
+        "device_version": "0.0.1"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["GP10", "GP9",  "GP23"],
+        "cols": ["GP25", "GP26", "GP24"]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 }
+            ]
+        }
+    },
+    "ws2812": {
+        "pin": "GP8",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true
+        },
+        "default": {
+            "animation": "cycle_left_right"
+        },
+        "sleep": true,
+        "layout": [
+            {"matrix": [0, 0], "flags": 4, "x": 0,   "y": 0 },
+            {"matrix": [0, 1], "flags": 4, "x": 112, "y": 0 },
+            {"matrix": [0, 2], "flags": 4, "x": 224, "y": 0 },
+            {"matrix": [1, 2], "flags": 4, "x": 224, "y": 32},
+            {"matrix": [1, 1], "flags": 4, "x": 112, "y": 32},
+            {"matrix": [1, 0], "flags": 4, "x": 0,   "y": 32},
+            {"matrix": [2, 0], "flags": 4, "x": 0,   "y": 64},
+            {"matrix": [2, 1], "flags": 4, "x": 112, "y": 64},
+            {"matrix": [2, 2], "flags": 4, "x": 224, "y": 64}
+        ]
+    }
+}
diff --git a/keyboards/fs_streampad/keymaps/default/keymap.c b/keyboards/fs_streampad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..15997a0839e
--- /dev/null
+++ b/keyboards/fs_streampad/keymaps/default/keymap.c
@@ -0,0 +1,19 @@
+// Copyright 2023 Matthijs Muller
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+		KC_1, KC_2, KC_3,
+		KC_4, KC_5, KC_6,
+		KC_7, KC_8, MO(1)
+	),
+
+	[1] = LAYOUT(
+		RGB_TOG, RGB_MOD, RGB_RMOD,
+		KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS
+	)
+};
diff --git a/keyboards/fs_streampad/keymaps/via/keymap.c b/keyboards/fs_streampad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..15997a0839e
--- /dev/null
+++ b/keyboards/fs_streampad/keymaps/via/keymap.c
@@ -0,0 +1,19 @@
+// Copyright 2023 Matthijs Muller
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+		KC_1, KC_2, KC_3,
+		KC_4, KC_5, KC_6,
+		KC_7, KC_8, MO(1)
+	),
+
+	[1] = LAYOUT(
+		RGB_TOG, RGB_MOD, RGB_RMOD,
+		KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS
+	)
+};
diff --git a/keyboards/mnk1800s/keymaps/via/rules.mk b/keyboards/fs_streampad/keymaps/via/rules.mk
old mode 100755
new mode 100644
similarity index 100%
rename from keyboards/mnk1800s/keymaps/via/rules.mk
rename to keyboards/fs_streampad/keymaps/via/rules.mk
diff --git a/keyboards/fs_streampad/readme.md b/keyboards/fs_streampad/readme.md
new file mode 100644
index 00000000000..24a80e7611c
--- /dev/null
+++ b/keyboards/fs_streampad/readme.md
@@ -0,0 +1,24 @@
+# FS streampad
+
+A 3x3 hotswap macropad.
+
+* Keyboard Maintainer: [Matthijs Muller](https://github.com/Smollchungus)
+* Hardware Supported: FS streampad
+
+Make example for this keyboard (after setting up your build environment):
+
+    make fs_streampad:default
+
+Flashing example for this keyboard:
+
+    make fs_streampad: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 `QK_BOOT` if it is available
diff --git a/keyboards/fs_streampad/rules.mk b/keyboards/fs_streampad/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/fs_streampad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/galile0/glyphkbd_v2/info.json b/keyboards/galile0/glyphkbd_v2/info.json
new file mode 100644
index 00000000000..664b4c491ff
--- /dev/null
+++ b/keyboards/galile0/glyphkbd_v2/info.json
@@ -0,0 +1,104 @@
+{
+    "manufacturer": "galile0",
+    "keyboard_name": "glyphkbd_v2",
+    "maintainer": "galile0-designs",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B1", "A1", "B0", "A0", "C5", "C3", "C4", "C2", "A7", "C1", "A6", "C0", "A5", "B12", "B13", "B14"],
+        "rows": ["B10", "B2", "A2", "F0", "F1"]
+    },
+    "processor": "STM32F072",
+    "url": "https://github.com/galile0-designs/glyphkbd",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x4744"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 14.5, "y": 1},
+                {"matrix": [1, 15], "x": 15.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4},
+                {"matrix": [4, 14], "x": 14.5, "y": 4},
+                {"matrix": [4, 15], "x": 15.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/galile0/glyphkbd_v2/keymaps/default/keymap.c b/keyboards/galile0/glyphkbd_v2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..15ad99b61fb
--- /dev/null
+++ b/keyboards/galile0/glyphkbd_v2/keymaps/default/keymap.c
@@ -0,0 +1,105 @@
+/*
+ *Copyright 2024 Fabian Leijström (@galile0-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] = {
+
+    /* LAYER
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐   ┌─────┬─────┬─────┐
+     * │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │ BS  │   │ INS │HOME │PGUP │ 
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ├─────┼─────┼─────┤
+     * │ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   │ DEL │ END │PGDN │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   └─────┴─────┴─────┘
+     * │CAPS │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │ENTER│
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤         ┌─────┐
+     * │SHIFT│  \  │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │SHIFT│         │ UP  │ 
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │     
+     * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ┌─────┼─────┼─────┐
+     * │CTRL │     │ SYS │ ALT │LOWER│   SPACE   │SPACE│RAISE│ ALT │ SYS │     │CTRL │   │LEFT │DOWN │RIGHT│
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘   └─────┴─────┴─────┘
+     */
+
+    [0] = LAYOUT(
+        //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** **********
+        KC_ESC,    KC_1,      KC_2,      KC_3,      KC_4,      KC_5,      KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      KC_MINS,   KC_BSPC,   KC_INS,    KC_HOME,   KC_PGUP,
+        KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,      KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_LBRC,   KC_RBRC,   KC_DEL,    KC_END,    KC_PGDN,
+        KC_CAPS,   KC_A,      KC_S,      KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_QUOT,   KC_ENT, 
+        KC_LSFT,   KC_BSLS,   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_NO,     KC_LGUI,   KC_LALT,   MO(1),            KC_SPC,        KC_SPC,    MO(2),     KC_RALT,   KC_RGUI,   KC_NO,     KC_RCTL,   KC_LEFT,   KC_DOWN,   KC_RGHT
+    ),
+
+    /* FUNCTION LAYER
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐   ┌─────┬─────┬─────┐
+     * │PAUSE│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │   │ PRT │     │     │ 
+     * │PLAY │     │     │     │     │     │     │     │     │     │     │     │     │   │ SCR │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ├─────┼─────┼─────┤
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   └─────┴─────┴─────┘
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤         ┌─────┐
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │ 
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │     
+     * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ┌─────┼─────┼─────┐
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘   └─────┴─────┴─────┘
+     */
+
+    [1] = LAYOUT(
+        //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** **********
+        KC_MPLY,   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_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,     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,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,                KC_NO,
+        KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_TRNS,          KC_NO,         KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO
+    ),
+
+    /* SYMBOLS LAYER
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐   ┌─────┬─────┬─────┐
+     * │     │     │     │     │     │     │     │     │     │  `  │  =  │  +  │     │   │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ├─────┼─────┼─────┤
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   └─────┴─────┴─────┘
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤         ┌─────┐
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │ 
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │     
+     * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ┌─────┼─────┼─────┐
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘   └─────┴─────┴─────┘
+     */
+
+    [2] = LAYOUT(
+        //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** **********
+        KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_GRV,    KC_EQL,    KC_PPLS,   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,     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,     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_TRNS,   KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO
+    )
+};
diff --git a/keyboards/galile0/glyphkbd_v2/keymaps/via/keymap.c b/keyboards/galile0/glyphkbd_v2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..15ad99b61fb
--- /dev/null
+++ b/keyboards/galile0/glyphkbd_v2/keymaps/via/keymap.c
@@ -0,0 +1,105 @@
+/*
+ *Copyright 2024 Fabian Leijström (@galile0-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] = {
+
+    /* LAYER
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐   ┌─────┬─────┬─────┐
+     * │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │ BS  │   │ INS │HOME │PGUP │ 
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ├─────┼─────┼─────┤
+     * │ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   │ DEL │ END │PGDN │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   └─────┴─────┴─────┘
+     * │CAPS │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │ENTER│
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤         ┌─────┐
+     * │SHIFT│  \  │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │SHIFT│         │ UP  │ 
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │     
+     * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ┌─────┼─────┼─────┐
+     * │CTRL │     │ SYS │ ALT │LOWER│   SPACE   │SPACE│RAISE│ ALT │ SYS │     │CTRL │   │LEFT │DOWN │RIGHT│
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘   └─────┴─────┴─────┘
+     */
+
+    [0] = LAYOUT(
+        //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** **********
+        KC_ESC,    KC_1,      KC_2,      KC_3,      KC_4,      KC_5,      KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      KC_MINS,   KC_BSPC,   KC_INS,    KC_HOME,   KC_PGUP,
+        KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,      KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_LBRC,   KC_RBRC,   KC_DEL,    KC_END,    KC_PGDN,
+        KC_CAPS,   KC_A,      KC_S,      KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_QUOT,   KC_ENT, 
+        KC_LSFT,   KC_BSLS,   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_NO,     KC_LGUI,   KC_LALT,   MO(1),            KC_SPC,        KC_SPC,    MO(2),     KC_RALT,   KC_RGUI,   KC_NO,     KC_RCTL,   KC_LEFT,   KC_DOWN,   KC_RGHT
+    ),
+
+    /* FUNCTION LAYER
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐   ┌─────┬─────┬─────┐
+     * │PAUSE│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │   │ PRT │     │     │ 
+     * │PLAY │     │     │     │     │     │     │     │     │     │     │     │     │   │ SCR │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ├─────┼─────┼─────┤
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   └─────┴─────┴─────┘
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤         ┌─────┐
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │ 
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │     
+     * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ┌─────┼─────┼─────┐
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘   └─────┴─────┴─────┘
+     */
+
+    [1] = LAYOUT(
+        //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** **********
+        KC_MPLY,   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_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,     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,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,                KC_NO,
+        KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_TRNS,          KC_NO,         KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO
+    ),
+
+    /* SYMBOLS LAYER
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐   ┌─────┬─────┬─────┐
+     * │     │     │     │     │     │     │     │     │     │  `  │  =  │  +  │     │   │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ├─────┼─────┼─────┤
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │   │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤   └─────┴─────┴─────┘
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤         ┌─────┐
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │ 
+     * │     │     │     │     │     │     │     │     │     │     │     │     │     │         │     │     
+     * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┼─────┤   ┌─────┼─────┼─────┐
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * │     │     │     │     │     │           │     │     │     │     │     │     │   │     │     │     │
+     * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┴─────┘   └─────┴─────┴─────┘
+     */
+
+    [2] = LAYOUT(
+        //******** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** ********** **********
+        KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_GRV,    KC_EQL,    KC_PPLS,   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,     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,     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_TRNS,   KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO
+    )
+};
diff --git a/keyboards/lw67/keymaps/via/rules.mk b/keyboards/galile0/glyphkbd_v2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lw67/keymaps/via/rules.mk
rename to keyboards/galile0/glyphkbd_v2/keymaps/via/rules.mk
diff --git a/keyboards/galile0/glyphkbd_v2/readme.md b/keyboards/galile0/glyphkbd_v2/readme.md
new file mode 100644
index 00000000000..378238c38d4
--- /dev/null
+++ b/keyboards/galile0/glyphkbd_v2/readme.md
@@ -0,0 +1,27 @@
+# glyphkbd_v2
+
+![glyphkbd_v2](https://i.imgur.com/9PxLaPlh.jpeg)
+
+5x13 ortholinear plus TKL nav and arrow clusters.
+
+* Keyboard Maintainer: [Fabian Leijström](https://github.com/galile0-designs)
+* Hardware Supported: glyphkbd_v2 PCB
+* Hardware Availability: [Github Repository](https://github.com/galile0-designs/glyphkbd)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make galile0/glyphkbd_v2:default
+
+Flashing example for this keyboard:
+
+    make galile0/glyphkbd_v2: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 `QK_BOOT` if it is available
diff --git a/keyboards/galile0/glyphkbd_v2/rules.mk b/keyboards/galile0/glyphkbd_v2/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/galile0/glyphkbd_v2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/gboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
index daeba1e0a62..694e07f0314 100644
--- a/keyboards/gboards/ergotaco/ergotaco.c
+++ b/keyboards/gboards/ergotaco/ergotaco.c
@@ -49,23 +49,17 @@ uint8_t init_mcp23018(void) {
     // - unused  : input  : 1
     // - input   : input  : 1
     // - driving : output : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(IODIRA, ERGODOX_EZ_I2C_TIMEOUT);            if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00000000, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    i2c_stop();
-
-    // set pull-up
-    // - unused  : on  : 1
-    // - input   : on  : 1
-    // - driving : off : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(GPPUA, ERGODOX_EZ_I2C_TIMEOUT);             if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00000000, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-
-out:
-    i2c_stop();
+    uint8_t data[] = {0b00000000, 0b00111111};
+    mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT);
+
+    if (!mcp23018_status) {
+        // set pull-up
+        // - unused  : on  : 1
+        // - input   : on  : 1
+        // - driving : off : 0
+        mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), ERGODOX_EZ_I2C_TIMEOUT);
+    }
+
     // SREG=sreg_prev;
     //uprintf("Init %x\n", mcp23018_status);
     return mcp23018_status;
diff --git a/keyboards/gboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h
index e23fc264f49..6ab47ced74c 100644
--- a/keyboards/gboards/ergotaco/ergotaco.h
+++ b/keyboards/gboards/ergotaco/ergotaco.h
@@ -11,10 +11,7 @@ extern i2c_status_t mcp23018_status;
 #define ERGODOX_EZ_I2C_TIMEOUT 1000
 
 // I2C aliases and register addresses (see "mcp23018.md")
-//#define I2C_ADDR        0b0100000
-#define I2C_ADDR        0x20
-#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
-#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define I2C_ADDR        (0x20<<1)
 #define IODIRA          0x00            // i/o direction register
 #define IODIRB          0x01
 #define GPPUA           0x0C            // GPIO pull-up resistor register
diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 63d4c4f5f31..3c49f2802ea 100644
--- a/keyboards/gboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
@@ -234,15 +234,8 @@ static matrix_row_t read_cols(uint8_t row)
             return 0;
         } else {
             uint8_t data = 0;
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOB, ERGODOX_EZ_I2C_TIMEOUT);             if (mcp23018_status) goto out;
-            mcp23018_status = i2c_start(I2C_ADDR_READ, ERGODOX_EZ_I2C_TIMEOUT);     if (mcp23018_status) goto out;
-            mcp23018_status = i2c_read_nack(ERGODOX_EZ_I2C_TIMEOUT);                if (mcp23018_status < 0) goto out;
-            data = (~((uint8_t)mcp23018_status) >> 2) & 0x01 ;
-            mcp23018_status = I2C_STATUS_SUCCESS;
-        out:
-            i2c_stop();
-
+            mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
+            data = (~((uint8_t)data) >> 2) & 0x01 ;
 #ifdef DEBUG_MATRIX
             if (data != 0x00) xprintf("I2C: %d\n", data);
 #endif
@@ -274,11 +267,8 @@ static void select_row(uint8_t row)
         if (mcp23018_status) { // do nothing on error
 			// Read using bitmask
         } else { // set active row low  : 0 // set other rows hi-Z : 1
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT);                 if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(~(1<<row), ERGODOX_EZ_I2C_TIMEOUT);      		if (mcp23018_status) goto out;
-        out:
-            i2c_stop();
+            uint8_t data = ~(1<<row);
+            mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
         }
     } else {
         // Output low(DDR:1, PORT:0) to select
diff --git a/keyboards/gboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
index dd95b593f11..745e8ab35dc 100644
--- a/keyboards/gboards/georgi/georgi.c
+++ b/keyboards/gboards/georgi/georgi.c
@@ -45,23 +45,17 @@ uint8_t init_mcp23018(void) {
     // - unused  : input  : 1
     // - input   : input  : 1
     // - driving : output : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(IODIRA, ERGODOX_EZ_I2C_TIMEOUT);            if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b10000000, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    i2c_stop();
-
-    // set pull-up
-    // - unused  : on  : 1
-    // - input   : on  : 1
-    // - driving : off : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(GPPUA, ERGODOX_EZ_I2C_TIMEOUT);             if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b10000000, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+    uint8_t data[] = {0b10000000, 0b11111111};
+    mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
+
+    if (!mcp23018_status) {
+        // set pull-up
+        // - unused  : on  : 1
+        // - input   : on  : 1
+        // - driving : off : 0
+        mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, 2, ERGODOX_EZ_I2C_TIMEOUT);
+    }
 
-out:
-    i2c_stop();
     // SREG=sreg_prev;
     //uprintf("Init %x\n", mcp23018_status);
     return mcp23018_status;
diff --git a/keyboards/gboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h
index e23fc264f49..6ab47ced74c 100644
--- a/keyboards/gboards/georgi/georgi.h
+++ b/keyboards/gboards/georgi/georgi.h
@@ -11,10 +11,7 @@ extern i2c_status_t mcp23018_status;
 #define ERGODOX_EZ_I2C_TIMEOUT 1000
 
 // I2C aliases and register addresses (see "mcp23018.md")
-//#define I2C_ADDR        0b0100000
-#define I2C_ADDR        0x20
-#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
-#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define I2C_ADDR        (0x20<<1)
 #define IODIRA          0x00            // i/o direction register
 #define IODIRB          0x01
 #define GPPUA           0x0C            // GPIO pull-up resistor register
diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
index b66b1a194c6..d1151ae80e4 100644
--- a/keyboards/gboards/georgi/matrix.c
+++ b/keyboards/gboards/georgi/matrix.c
@@ -254,14 +254,7 @@ static matrix_row_t read_cols(uint8_t row)
             return 0;
         } else {
             uint8_t data = 0;
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOB, ERGODOX_EZ_I2C_TIMEOUT);             if (mcp23018_status) goto out;
-            mcp23018_status = i2c_start(I2C_ADDR_READ, ERGODOX_EZ_I2C_TIMEOUT);     if (mcp23018_status) goto out;
-            mcp23018_status = i2c_read_nack(ERGODOX_EZ_I2C_TIMEOUT);                if (mcp23018_status < 0) goto out;
-            data = ~((uint8_t)mcp23018_status);
-            mcp23018_status = I2C_STATUS_SUCCESS;
-        out:
-            i2c_stop();
+            mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
 
 #ifdef DEBUG_MATRIX
             if (data != 0x00) xprintf("I2C: %d\n", data);
@@ -304,11 +297,9 @@ static void select_row(uint8_t row)
         // select on mcp23018
         if (mcp23018_status) { // do nothing on error
         } else { // set active row low  : 0 // set other rows hi-Z : 1
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT);                 if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(0xFF & ~(1<<row), ERGODOX_EZ_I2C_TIMEOUT);      if (mcp23018_status) goto out;
-        out:
-            i2c_stop();
+        uint8_t data = 0xFF & ~(1<<row);
+        mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, ERGODOX_EZ_I2C_TIMEOUT);
+
         }
     } else {
         // Output low(DDR:1, PORT:0) to select
diff --git a/keyboards/gboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c
index da2a3007a8a..41d383d4086 100644
--- a/keyboards/gboards/gergo/gergo.c
+++ b/keyboards/gboards/gergo/gergo.c
@@ -43,23 +43,17 @@ uint8_t init_mcp23018(void) {
     // - unused  : input  : 1
     // - input   : input  : 1
     // - driving : output : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(IODIRA, I2C_TIMEOUT);            if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b10000000, I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111, I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    i2c_stop();
+    uint8_t data[] = {0b10000000, 0b11111111};
+    mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
 
-    // set pull-up
-    // - unused  : on  : 1
-    // - input   : on  : 1
-    // - driving : off : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(GPPUA, I2C_TIMEOUT);             if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b10000000, I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111, I2C_TIMEOUT);        if (mcp23018_status) goto out;
+    if (!mcp23018_status) {
+        // set pull-up
+        // - unused  : on  : 1
+        // - input   : on  : 1
+        // - driving : off : 0
+        mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
+    }
 
-out:
-    i2c_stop();
     // SREG=sreg_prev;
     //uprintf("Init %x\n", mcp23018_status);
     return mcp23018_status;
diff --git a/keyboards/gboards/gergo/gergo.h b/keyboards/gboards/gergo/gergo.h
index ea6368e2f1c..f6dc1498f0f 100644
--- a/keyboards/gboards/gergo/gergo.h
+++ b/keyboards/gboards/gergo/gergo.h
@@ -11,10 +11,7 @@ extern i2c_status_t mcp23018_status;
 #define I2C_TIMEOUT 1000
 
 // I2C aliases and register addresses (see "mcp23018.md")
-//#define I2C_ADDR        0b0100000
-#define I2C_ADDR        0x20
-#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
-#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define I2C_ADDR        (0x20<<1)
 #define IODIRA          0x00            // i/o direction register
 #define IODIRB          0x01
 #define GPPUA           0x0C            // GPIO pull-up resistor register
diff --git a/keyboards/gboards/gergo/keymaps/abstractkb/config.h b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
deleted file mode 100644
index d3c17757c80..00000000000
--- a/keyboards/gboards/gergo/keymaps/abstractkb/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#undef DEBOUNCE
-#define DEBOUNCE    10
diff --git a/keyboards/gboards/gergo/keymaps/abstractkb/keymap.c b/keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
deleted file mode 100644
index 6ee37f8175e..00000000000
--- a/keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Good on you for modifying your layout! if you don't have
- * time to read the QMK docs, a list of keycodes can be found at
- *
- * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md
- *
- * There's also a template for adding new layers at the bottom of this file!
- */
-
-#include QMK_KEYBOARD_H
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define NUMB 2 // numbers/motion
-
-// Blank template at the bottom
-
-enum customKeycodes {
-	URL  = 1
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,-------------------------------------------.                         ,-------------------------------------------.
- * | L1/ESC |   Q  |   W  |   E  |   R  |   T  |                         |   Y  |   U  |   I  |   O  |   P  |  | \   |
- * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
- * |Ctrl/BS |   A  |   S  |  D   |   F  |   G  | RMB  |           |      |   H  |   J  |   K  |   L  | ;  : |  ' "   |
- * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  | LMB  |           |      |   N  |   M  | ,  < | . >  | /  ? |RShft/-_|
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *                    .----------.   .-------.                                 .------.   .-----.
- *                    | GUI/Del  |   |Ent/ALT|                                 | Tab  |   |GUI |
- *                    '----------'   '-------'                                 `------.   '-----'
- *                                        ,-------.                      ,-------.
- *                                        | MMB   |                      | PgDn  |
- *                                 ,------|-------|                      |-------|------.
- *                                 | SYMB | NUMB  |                      | SYMB  | NUMB |
- *                                 | Space| Escape|                      | Mod   |Space |
- *                                 |      |       |                      |       |      |
- *                                 `--------------'                      `--------------'
- */
-[BASE] = LAYOUT_gergo(
-    LT(NUMB, KC_ESC),       KC_Q,  KC_W,   KC_E,   KC_R, KC_T,                                          KC_Y,    KC_U, KC_I, KC_O,   KC_P,    KC_PIPE,
-    MT(MOD_LCTL, KC_BSPC),  KC_A,  KC_S,   KC_D,   KC_F, KC_G, KC_BTN2,                       KC_TRNS,  KC_H,    KC_J, KC_K, KC_L,   KC_SCLN, KC_QUOT,
-    KC_RSFT,                KC_Z,  KC_X,   KC_C,   KC_V, KC_B, KC_BTN1, KC_BTN3,     KC_PGDN, KC_BSPC,  KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_RSFT, KC_MINS),
-  MT(MOD_LGUI, KC_DEL), MT(MOD_LALT, KC_ENT), LT(SYMB, KC_SPC), LT(NUMB, KC_ESC),    LT(SYMB, KC_ENT), LT(NUMB, KC_SPC), KC_TAB, KC_LGUI
-    ),
-/* Keymap 1: Symbols layer
- *
- * ,-------------------------------------------.                         ,-------------------------------------------.
- * |        |  !   |  @   |  {   |  }   |  |   |                         |      |      |      |      |      |  \ |   |
- * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
- * |        |  #   |  $   |  (   |  )   |  `   |      |           |      |   +  |  -   |  /   |  *   |  %   |  ' "   |
- * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
- * |        |  %   |  ^   |  [   |  ]   |  ~   |      |           |      |   &  |  =   |  ,   |  .   |  / ? | - _    |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *                        .------.   .------.                                 .------.   .-----.
- *                        |      |   |      |                                 |      |   | DEL |
- *                        '------'   '------'                                 `------.   '-----'
- *                                        ,-------.                     ,-------.
- *                                        |       |                     | PgUp  |
- *                                 ,------|-------|                     |-------|------.
- *                                 |      |       |                     |       |      |
- *                                 |   ;  |   =   |                     |   =   |   ;  |
- *                                 |      |       |                     |       |      |
- *                                 `--------------'                     `--------------'
- */
-[SYMB] = LAYOUT_gergo(
-    KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
-    KC_TRNS, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,  KC_TRNS,                          KC_TRNS, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_PERC, KC_QUOT,
-    KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_AMPR, KC_EQL,  KC_COMM, KC_DOT,  KC_SLSH, KC_MINS,
-                                        KC_TRNS, KC_TRNS, KC_SCLN, KC_EQL,         KC_EQL,  KC_SCLN, KC_PGUP, KC_DEL
-    ),
-/* Keymap 2: Pad/Function layer
- *
- * ,-------------------------------------------.                         ,-------------------------------------------.
- * |        |   1  |  2   |  3   |  4   |  5   |                         |  6   |  7   |  8   |  9   |  0   |        |
- * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
- * |  F1    |  F2  | F3   | F4   | F5   | F6   | BTN1 |           |      | LEFT | DOWN |  UP  | RIGHT|VolDn | VolUp  |
- * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
- * |  F7    |  F8  | F9   | F10  | F11  | F12  | BTN2 |           |      | MLFT | MDWN | MUP  | MRGHT|Ply/Pa|  Skip  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *                        .------.   .------.                                 .------.   .-----.
- *                        |      |   |      |                                 |      |   |     |
- *                        '------'   '------'                                 `------.   '-----'
- *                                        ,-------.                     ,-------.
- *                                        |       |                     | PgUp  |
- *                                 ,------|-------|                     |-------|------.
- *                                 |      |       |                     |       |      |
- *                                 |      |       |                     |       |      |
- *                                 |      |       |                     |       |      |
- *                                 `--------------'                     `--------------'
- */
-[NUMB] = LAYOUT_gergo(
-    KC_TRNS, KC_1, 	  KC_2,    KC_3,    KC_4,    KC_5,                                             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
-    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                         KC_TRNS,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_VOLD, KC_VOLU,
-    KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS,     KC_TRNS, KC_TRNS,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_MPLY, KC_MNXT,
-                                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-};
-
-/* Keymap template
- *
- * ,-------------------------------------------.                         ,-------------------------------------------.
- * |        |      |      |      |      |      |                         |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *                        .------.   .------.                                 .------.   .-----.
- *                        |      |   |      |                                 |      |   |     |
- *                        '------'   '------'                                 `------.   '-----'
- *                                        ,-------.       ,-------.
- *                                        |       |       |       |
- *                                 ,------|-------|       |-------|------.
- *                                 |      |       |       |       |      |
- *                                 |      |       |       |       |      |
- *                                 |      |       |       |       |      |
- *                                 `--------------'       `--------------'
-[SYMB] = LAYOUT_gergo(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/gboards/gergo/keymaps/abstractkb/readme.md b/keyboards/gboards/gergo/keymaps/abstractkb/readme.md
deleted file mode 100644
index 863b21e8e23..00000000000
--- a/keyboards/gboards/gergo/keymaps/abstractkb/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# [Gergo! By g Heavy Industries](http://gboards.ca)
-
-![Gergo image](https://4.bp.blogspot.com/-889nMXxgSM0/XCNxwnO5kUI/AAAAAAAA6mI/tZbWgZVCBW0dyZOCGJDkjN06DVax7j8XwCLcBGAs/s1600/48422820_967732713413298_485744639215665152_n.jpg)
-
-This is my personal modification to the stock gergo keymap.
-
-## Settings
-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/gboards/gergo/keymaps/abstractkb/rules.mk b/keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
deleted file mode 100644
index 4b4e56c4a04..00000000000
--- a/keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#----------------------------------------------------------------------------
-# make gergo:germ:dfu
-# Make sure you have dfu-programmer installed!
-#----------------------------------------------------------------------------
-# Firmware options
-BALLER = no 			# Enable to ball out
-BALLSTEP = 20  			# Multiple in px to move, multiplied by layer number
-SCROLLSTEP = 1 			# Lines to scroll with ball
-MOUSEKEY_ENABLE = yes  		# Mouse keys, needed for baller
-
-#Debug options
-VERBOSE 		 = yes
-DEBUG_MATRIX_SCAN_RATE   = no
-DEBUG_BALLER 		 = no
-DEBUG_MATRIX		 = yes
-
-# A bunch of stuff that you shouldn't touch unless you
-# know what you're doing.
-#
-# No touchy, capiche?
-
-ifneq ($(strip $(BALLSTEP)),)
-    OPT_DEFS += -DTRKSTEP=$(strip $(BALLSTEP))
-endif
-ifneq ($(strip $(SCROLLSTEP)),)
-    OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP))
-endif
-ifeq ($(strip $(BALLER)), yes)
-	POINTING_DEVICE_ENABLE	= yes
-    POINTING_DEVICE_DRIVER = custom
-    OPT_DEFS += -DBALLER
-endif
-ifeq ($(strip $(DEBUG_BALLER)), yes)
-    OPT_DEFS += -DDEBUG_BALLER
-endif
-ifeq ($(strip $(DEBUG_MATRIX)), yes)
-    OPT_DEFS += -DDEBUG_MATRIX
-endif
diff --git a/keyboards/gboards/gergo/keymaps/default/config.h b/keyboards/gboards/gergo/keymaps/default/config.h
deleted file mode 100644
index 3f59c932d39..00000000000
--- a/keyboards/gboards/gergo/keymaps/default/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-
diff --git a/keyboards/gboards/gergo/keymaps/germ/config.h b/keyboards/gboards/gergo/keymaps/germ/config.h
deleted file mode 100644
index 3f59c932d39..00000000000
--- a/keyboards/gboards/gergo/keymaps/germ/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-
diff --git a/keyboards/gboards/gergo/keymaps/gotham/config.h b/keyboards/gboards/gergo/keymaps/gotham/config.h
deleted file mode 100644
index 3f59c932d39..00000000000
--- a/keyboards/gboards/gergo/keymaps/gotham/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-
diff --git a/keyboards/gboards/gergo/keymaps/gotham/keymap.c b/keyboards/gboards/gergo/keymaps/gotham/keymap.c
deleted file mode 100644
index ff6df266f20..00000000000
--- a/keyboards/gboards/gergo/keymaps/gotham/keymap.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Good on you for modifying your layout! if you don't have
- * time to read the QMK docs, a list of keycodes can be found at
- *
- * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md
- *
- * There's also a template for adding new layers at the bottom of this file!
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    BASE, // default layer
-    SYMB, // symbols
-    NUMB, // number/navigation
-    MOUS, // mouse navigation
-};
-
-#define KC_ANGL LSFT(KC_COMM)
-#define KC_ANGR LSFT(KC_DOT)
-
-// Blank template at the bottom
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,-------------------------------------------.                         ,-------------------------------------------.
- * |  ESC   |   Q  |   W  |   E  |   R  |   T  |                         |   Y  |   U  |   I  |   O  |   P  |  \ |   |
- * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
- * | LShift |   A  |   S  |   D  |   F  |   G  |      |           | VolUp|   H  |   J  |   K  |   L  | ;  : |RSft/' "|
- * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
- * | LCtrl  |   Z  |   X  |   C  |   V  |   B  |      |           | VolDn|   N  |   M  | ,  < | . >  | /  ? |RCtl/- _|
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *                    .----------.   .----------.                          .-----------.   .------.
- *                    |   LAlt   |   |SYMB/Space|                          | NUMB/Bksp |   | MOUS |
- *                    '----------'   '----------'                          `-----------'   '------'
- *                                        ,-------.                   ,-------.
- *                                        |       |                   |VolMute|
- *                                 ,------|-------|                   |-------|------.
- *                                 | NUMB |       |                   |       | SYMB |
- *                                 | Tab  |  LGui |                   |   =   | Enter|
- *                                 |      |       |                   |       |      |
- *                                 `--------------'                   `--------------'
- */
-[BASE] = LAYOUT_gergo(
-    KC_ESC,  KC_Q,  KC_W,   KC_E,   KC_R, KC_T,                                          KC_Y,    KC_U, KC_I, KC_O,   KC_P,    KC_BSLS,
-    KC_LSFT, KC_A,  KC_S,   KC_D,   KC_F, KC_G, XXXXXXX,                       KC_VOLU,  KC_H,    KC_J, KC_K, KC_L,   KC_SCLN, MT(MOD_RSFT, KC_QUOT),
-    KC_LCTL, KC_Z,  KC_X,   KC_C,   KC_V, KC_B, XXXXXXX,  XXXXXXX,    KC_MUTE, KC_VOLD,  KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_RCTL, KC_MINS),
-             KC_LALT, LT(SYMB, KC_SPC), LT(NUMB, KC_TAB), KC_LGUI,    KC_EQL, LT(SYMB, KC_ENT), LT(NUMB, KC_BSPC), MO(MOUS)
-    ),
-/* Keymap 1: Symbols layer
- *
- * ,-------------------------------------------.                         ,-------------------------------------------.
- * |        |  #   |  $   |  {   |  }   |      |                         |      |  <   |  >   |      |      |   |    |
- * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
- * |        |  !   |  @   |  (   |  )   |  `   |      |           |      |   -  |  &   |  +   |  *   |  ;   |  ' "   |
- * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
- * |        |  %   |  ^   |  [   |  ]   |  ~   |      |           |      |   _  |  |   |  ,   |  .   |  / ? |  - _   |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *                    .----------.   .----------.                               .-----.   .------.
- *                    |   LAlt   |   |SYMB/Space|                               | Del |   | MOUS |
- *                    '----------'   '----------'                               `-----'   '------'
- *                                        ,-------.                   ,-------.
- *                                        |       |                   |       |
- *                                 ,------|-------|                   |-------|------.
- *                                 | NUMB |       |                   |       | SYMB |
- *                                 | Tab  |  LGui |                   |   =   | Enter|
- *                                 |      |       |                   |       |      |
- *                                 `--------------'                   `--------------'
- */
-[SYMB] = LAYOUT_gergo(
-    _______, KC_HASH, KC_DLR,  KC_LCBR, KC_RCBR, XXXXXXX,                                            XXXXXXX, KC_ANGL, KC_ANGR, XXXXXXX, XXXXXXX, KC_PIPE,
-    _______, KC_EXLM, KC_AT,   KC_LPRN, KC_RPRN, KC_GRV,  XXXXXXX,                          XXXXXXX, KC_MINS, KC_AMPR, KC_PLUS, KC_ASTR, KC_SCLN, KC_QUOT,
-    _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, XXXXXXX, XXXXXXX,        XXXXXXX, XXXXXXX, KC_UNDS, KC_PIPE, KC_COMM, KC_DOT,  KC_SLSH, KC_MINS,
-                                        _______, _______, _______, _______,        _______, _______, KC_DEL,  _______
-    ),
-/* Keymap 2: Pad/Function layer
- *
- * ,-------------------------------------------.                         ,-------------------------------------------.
- * |        |   1  |  2   |  3   |  4   |  5   |                         |  6   |  7   |  8   |  9   |  0   |        |
- * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
- * |        |  F1  |  F2  | F3   | F4   | F5   | F6   |           |      | PgUp | LEFT |  UP  | RIGHT|      |        |
- * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
- * |        |  F7  |  F8  | F9   | F10  | F11  | F12  |           |      |PgDown| HOME | DOWN | END  |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *                    .----------.   .----------.                          .-----------.   .------.
- *                    |   LAlt   |   |SYMB/Space|                          | NUMB/Bksp |   | MOUS |
- *                    '----------'   '----------'                          `-----------'   '------'
- *                                        ,-------.                   ,-------.
- *                                        |       |                   |       |
- *                                 ,------|-------|                   |-------|------.
- *                                 | NUMB |       |                   |       | SYMB |
- *                                 | Tab  |  LGui |                   |   =   | Enter|
- *                                 |      |       |                   |       |      |
- *                                 `--------------'                   `--------------'
- */
-[NUMB] = LAYOUT_gergo(
-    _______, KC_1, 	  KC_2,    KC_3,    KC_4,    KC_5,                                            KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    XXXXXXX,
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                         XXXXXXX, KC_PGUP, KC_LEFT, KC_UP,   KC_RIGHT, XXXXXXX, XXXXXXX,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,     XXXXXXX, XXXXXXX, KC_PGDN, KC_HOME, KC_DOWN, KC_END,   XXXXXXX, XXXXXXX,
-                                        _______, _______, _______, _______,     _______, _______, _______, _______
-    ),
-/* Keymap 3: Mouse layer
- *
- * ,-------------------------------------------.                         ,-------------------------------------------.
- * |        |   1  |  2   |  3   |  4   |  5   |                         |  6   |  7   |  8   |  9   |  0   |        |
- * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
- * |        |  F1  |  F2  | F3   | F4   | F5   | F6   |           |      |      |  M_L |  M_U |  M_R | M_Clk|        |
- * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
- * |        |  F7  |  F8  | F9   | F10  | F11  | F12  |           |      |      | L_Clk|  M_D | R_Clk|      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *                    .----------.   .----------.                          .-----------.   .------.
- *                    |   LAlt   |   |SYMB/Space|                          | NUMB/Bksp |   | MOUS |
- *                    '----------'   '----------'                          `-----------'   '------'
- *                                        ,-------.                   ,-------.
- *                                        |       |                   |       |
- *                                 ,------|-------|                   |-------|------.
- *                                 | NUMB |       |                   |       | SYMB |
- *                                 | Tab  |  LGui |                   |   =   | Enter|
- *                                 |      |       |                   |       |      |
- *                                 `--------------'                   `--------------'
- */
-[MOUS] = LAYOUT_gergo(
-    _______, _______, _______, _______, _______, _______,                                         _______, _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______,                       _______, XXXXXXX, KC_MS_L, KC_MS_U,  KC_MS_R, KC_BTN3, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, XXXXXXX, KC_BTN1, KC_MS_D,  KC_BTN2, _______, _______,
-                                        _______, _______, _______, _______,     _______, _______, _______, _______
-    ),
-};
-
-/* Keymap template
- *
- * ,-------------------------------------------.                         ,-------------------------------------------.
- * |        |      |      |      |      |      |                         |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *                        .------.   .------.                                 .------.   .-----.
- *                        |      |   |      |                                 |      |   |     |
- *                        '------'   '------'                                 `------.   '-----'
- *                                        ,-------.       ,-------.
- *                                        |       |       |       |
- *                                 ,------|-------|       |-------|------.
- *                                 |      |       |       |       |      |
- *                                 |      |       |       |       |      |
- *                                 |      |       |       |       |      |
- *                                 `--------------'       `--------------'
-[SYMB] = LAYOUT_gergo(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/gboards/gergo/keymaps/gotham/readme.md b/keyboards/gboards/gergo/keymaps/gotham/readme.md
deleted file mode 100644
index 2b1c5ab1dab..00000000000
--- a/keyboards/gboards/gergo/keymaps/gotham/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a modified version of the default keymap for Gergo with some changes.
-
-## Changes:
- - Rehaul thumb keys. For my hand size, the L and R thumbs rest on space and backspace, and one finger outward, are tab and enter.
- - = has its own dedicated key to facilitate typing "<space>=<space>", which is a very common trigram in programming.
- - Change navigation into a T-shaped cluster and add Home and End keys. T-shaped, because it's similar to arrow key cluster and most keys are on the home row, while sharing the number layer.
- - Separated mouse navigation into a separate layer (in favor of T-shaped arrows, which require 2 rows).
- - Difficult-to-reach key positions are mostly unused.
diff --git a/keyboards/gboards/gergo/keymaps/gotham/rules.mk b/keyboards/gboards/gergo/keymaps/gotham/rules.mk
deleted file mode 100644
index 6f203da1bd4..00000000000
--- a/keyboards/gboards/gergo/keymaps/gotham/rules.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#----------------------------------------------------------------------------
-# make gergo:germ:dfu
-# Make sure you have dfu-programmer installed!
-#----------------------------------------------------------------------------
-# Firmware options
-BALLER = no 			# Enable to ball out
-BALLSTEP = 20  			# Multiple in px to move, multiplied by layer number
-SCROLLSTEP = 1 			# Lines to scroll with ball
-MOUSEKEY_ENABLE = yes  		# Mouse keys, needed for baller
-
-#Debug options
-VERBOSE 		 = yes
-DEBUG_MATRIX_SCAN_RATE   = no
-DEBUG_BALLER 		 = no
-DEBUG_MATRIX		 = yes
-
-# A bunch of stuff that you shouldn't touch unless you
-# know what you're doing.
-#
-# No touchy, capiche?
-SRC += matrix.c
-I2C_DRIVER_REQUIRED = yes
-ifneq ($(strip $(BALLSTEP)),)
-    OPT_DEFS += -DTRKSTEP=$(strip $(BALLSTEP))
-endif
-ifneq ($(strip $(SCROLLSTEP)),)
-    OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP))
-endif
-ifeq ($(strip $(BALLER)), yes)
-	POINTING_DEVICE_ENABLE	= yes
-    POINTING_DEVICE_DRIVER = custom
-    OPT_DEFS += -DBALLER
-endif
-ifeq ($(strip $(DEBUG_BALLER)), yes)
-    OPT_DEFS += -DDEBUG_BALLER
-endif
-ifeq ($(strip $(DEBUG_MATRIX)), yes)
-    OPT_DEFS += -DDEBUG_MATRIX
-endif
diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
index 8a6b38bf73b..b4885361fbd 100644
--- a/keyboards/gboards/gergo/matrix.c
+++ b/keyboards/gboards/gergo/matrix.c
@@ -297,19 +297,12 @@ static matrix_row_t read_cols(uint8_t row) {
             return 0;
         } else {
             uint8_t data = 0;
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);    if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOB, I2C_TIMEOUT);             if (mcp23018_status) goto out;
-            mcp23018_status = i2c_start(I2C_ADDR_READ, I2C_TIMEOUT);     if (mcp23018_status) goto out;
-            mcp23018_status = i2c_read_nack(I2C_TIMEOUT);                if (mcp23018_status < 0) goto out;
-            data = ~((uint8_t)mcp23018_status);
-            mcp23018_status = I2C_STATUS_SUCCESS;
-        out:
-            i2c_stop();
+            mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT);
 
 #ifdef DEBUG_MATRIX
-            if (data != 0x00) xprintf("I2C: %d\n", data);
+            if (~data != 0x00) xprintf("I2C: %d\n", ~data);
 #endif
-            return data;
+            return ~data;
         }
     } else {
          /* read from teensy
@@ -350,11 +343,8 @@ static void select_row(uint8_t row)
         // select on mcp23018
         if (mcp23018_status) { // do nothing on error
         } else { // set active row low  : 0 // set other rows hi-Z : 1
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);        if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOA, I2C_TIMEOUT);                 if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(0xFF & ~(1<<row), I2C_TIMEOUT);      if (mcp23018_status) goto out;
-        out:
-            i2c_stop();
+            uint8_t data = 0xFF & ~(1<<row);
+            mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
         }
     } else {
         // Output low(DDR:1, PORT:0) to select
diff --git a/keyboards/gboards/gergoplex/gergoplex.c b/keyboards/gboards/gergoplex/gergoplex.c
index 1e44583895a..b621201c166 100644
--- a/keyboards/gboards/gergoplex/gergoplex.c
+++ b/keyboards/gboards/gergoplex/gergoplex.c
@@ -39,30 +39,16 @@ uint8_t init_mcp23018(void) {
     // - unused  : input  : 1
     // - input   : input  : 1
     // - driving : output : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(IODIRA, I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11000001, I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111, I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    i2c_stop();
-
-    // set pull-up
-    // - unused  : on  : 1
-    // - input   : on  : 1
-    // - driving : off : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(GPPUA, I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11000001, I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b11111111, I2C_TIMEOUT);
-    if (mcp23018_status) goto out;
+    uint8_t data[] = {0b11000001, 0b11111111};
+    mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
+
+    if (!mcp23018_status) {
+        // set pull-up
+        // - unused  : on  : 1
+        // - input   : on  : 1
+        // - driving : off : 0
+        mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
+    }
 
-out:
-    i2c_stop();
     return mcp23018_status;
 }
diff --git a/keyboards/gboards/gergoplex/gergoplex.h b/keyboards/gboards/gergoplex/gergoplex.h
index 549228104a0..217cb8dff18 100644
--- a/keyboards/gboards/gergoplex/gergoplex.h
+++ b/keyboards/gboards/gergoplex/gergoplex.h
@@ -25,9 +25,7 @@ extern i2c_status_t mcp23018_status;
 #define XXX KC_NO
 
 // I2C aliases and register addresses (see "mcp23018.md")
-#define I2C_ADDR 0x20  // 0b0100000
-#define I2C_ADDR_WRITE ((I2C_ADDR << 1) | I2C_WRITE)
-#define I2C_ADDR_READ ((I2C_ADDR << 1) | I2C_READ)
+#define I2C_ADDR (0x20 << 1)  // 0b0100000
 #define IODIRA 0x00  // i/o direction register
 #define IODIRB 0x01
 #define GPPUA 0x0C  // GPIO pull-up resistor register
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def b/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def
deleted file mode 100644
index a9205c028a0..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def
+++ /dev/null
@@ -1,11 +0,0 @@
-// List any combo dictionaries you want loaded to your device below!
-
-// QMK wide includes
-//#include "combos/germ-vim-helpers.def"
-#include "combos/germ-mouse-keys.def"
-
-// User includes
-#include "gergoplex.def"
-
-// Word completion
-// #include "combos/eng-combos.def"
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
deleted file mode 100644
index e2c27583fab..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@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/>.
-*/
-
-// Copy and worked on with love from the EZ team
-
-#pragma once
-
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-
-#undef DEBOUNCE
-#define DEBOUNCE 25
-
-#define COMBO_ALLOW_ACTION_KEYS
-#define COMBO_VARIABLE_LEN
-
-#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def b/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def
deleted file mode 100644
index d50d431c8b7..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def
+++ /dev/null
@@ -1,7 +0,0 @@
-// Gergoplex specfic combos
-
-COMB(hjEnt,         KC_ENT,         KC_H, KC_J)
-COMB(loDel,         KC_DEL,         KC_L, KC_O)
-COMB(pscBspace,     KC_BSPC,        KC_P, KC_SCLN)
-COMB(sdEsc,         KC_ESC,         KC_D, KC_F)
-COMB(fgEsc,         KC_ESC,         KC_F, KC_G)
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c
deleted file mode 100644
index 44c570b42cd..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* Copyright 2021 Jane Bernhardt
-  *
-  * 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/>.
-  */
-
-/* Good on you for modifying your layout! if you don't have
- * time to read the QMK docs, a list of keycodes can be found at
- * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md
- */
-
-#include QMK_KEYBOARD_H
-#include "g/keymap_combo.h"
-
-enum {
-    _ALPHA,   // default
-    _GAME,    // gaming
-    _SPECIAL, // special characters
-    _NUMBERS  // numbers/function/motion
-};
-
-typedef enum {
-    TD_NONE,
-    TD_UNKNOWN,
-    TD_SINGLE_TAP,
-    TD_DOUBLE_TAP,
-    TD_TRIPLE_TAP
-} td_state_t;
-
-typedef struct {
-    bool is_press_action;
-    td_state_t state;
-} td_tap_t;
-
-enum {
-    GAME
-};
-
-td_state_t cur_dance(tap_dance_state_t *state);
-
-void ql_finished(tap_dance_state_t *state, void *user_data);
-void ql_reset(tap_dance_state_t *state, void *user_data);
-
-#define KC_CTL_A  MT(MOD_LCTL, KC_A)     // Tap for A, hold for Control
-#define KC_SFT_Z  MT(MOD_RSFT, KC_Z)     // Tap for Z, hold for Shift
-#define KC_SFT_SL MT(MOD_RSFT, KC_SLSH)  // Tap for slash, hold for Shift
-#define KC_SPE_SPC LT(_SPECIAL, KC_SPC)  // Tap for Space, hold for Special layer
-#define KC_NUM_SPC LT(_NUMBERS, KC_SPC)  // Tap for Space, hold for Numbers layer
-
-    /* Combomap
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |       |     |     |     |     |      |     |     |     |     |       |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-DEL-+-BSPC--|
-     * |       |     |    ESC   ESC    |      |    ENT    |     |     |       |
-     * |-------+-----+-----+-RMB-+-LMB-|      |-----+-----+-----+-----+-------|
-     * |       |     |     |     |     |      |     |     |     |     |       |
-     * `-------------------------------'      `-------------------------------'
-     *            .-----------------.            .-----------------.
-     *            |     |     |     |            |     |     |     |
-     *            '-----------------'            '-----------------'
-     */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Alpha layer
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |     Q |  W  |  E  |  R  |  T  |      |  Y  |  U  |  I  |  O  |   P   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * | CTRL A|  S  |  D  |  F  |  G  |      |  H  |  J  |  K  |  L  |   ;   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * | SHFT Z|  X  |  C  |  V  |  B  |      |  N  |  M  |  ,  |  .  |SHFT / |
-     * `-------------------------------'      `-------------------------------'
-     *       .----------------------.           .----------------------.
-     *       | META | ALT | SPC SPE |           | SPC NUM | TAB | SHFT |
-     *       '----------------------'           '----------------------'
-     */
-    [_ALPHA] = LAYOUT_split_3x5_3(
-         KC_Q,     KC_W,   KC_E,   KC_R,   KC_T,          KC_Y,   KC_U,   KC_I,     KC_O,   KC_P,
-         KC_CTL_A, KC_S,   KC_D,   KC_F,   KC_G,          KC_H,   KC_J,   KC_K,     KC_L,   KC_SCLN,
-         KC_SFT_Z, KC_X,   KC_C,   KC_V,   KC_B,          KC_N,   KC_M,   TD(GAME), KC_DOT, KC_SFT_SL,
-                   KC_LGUI, KC_LALT, KC_SPE_SPC,          KC_NUM_SPC, KC_TAB, KC_RSFT),
-
-    /* Gaming layer
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |   ~   |  Q  |  W  |  E  |  R  |      |  Y  |  U  |  I  |  O  |   P   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |  CTRL |  A  |  S  |  D  |  F  |      |  H  |  J  |  K  |  L  |   ;   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |  SHFT |  Z  |  X  |  C  |  V  |      |  N  |  M  |  ,  |  .  |SHFT / |
-     * `-------------------------------'      `-------------------------------'
-     *           .------------------.           .----------------------.
-     *           | META | ALT | SPC |           | SPC NUM | TAB | SHFT |
-     *           '------------------'           '----------------------'
-     */
-    [_GAME] = LAYOUT_split_3x5_3(
-         KC_TILD,  KC_Q,   KC_W,   KC_E,   KC_R,          KC_Y,   KC_U,   KC_I,     KC_O,   KC_P,
-         KC_LCTL , KC_A,   KC_S,   KC_D,   KC_F,          KC_H,   KC_J,   KC_K,     KC_L,   KC_SCLN,
-         KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,          KC_N,   KC_M,   TD(GAME), KC_DOT, KC_SFT_SL,
-                       KC_LGUI, KC_LALT, KC_SPC,          KC_NUM_SPC, KC_TAB, KC_RSFT),
-
-    /* Special characters layer
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |    !  |  @  |  {  |  }  |  |  |      |  `  |  -  |  =  |  /  |   \   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |    #  |  $  |  (  |  )  |     |      | LFT | DWN | UP  | RGT |   '   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |    %  |  ^  |  [  |  ]  |     |      |  &  |  ~  |  +  |  *  |       |
-     * `-------------------------------'      `-------------------------------'
-     *           .-------------------.          .-----------------.
-     *           |       |     |     |          |     |  "  |  _  |
-     *           '-------------------'          '-----------------'
-     */
-    [_SPECIAL] = LAYOUT_split_3x5_3(
-         KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,          KC_GRV,  KC_MINS, KC_EQL , KC_SLSH, KC_BSLS,
-         KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_TRNS,          KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, KC_QUOT,
-         KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TRNS,          KC_AMPR, KC_TILD, KC_PLUS, KC_ASTR, KC_TRNS,
-                           KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, LSFT(KC_QUOTE), LSFT(KC_MINS)),
-
-    /* Numbers/Function/Motion layer
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |   1   |  2  |  3  |  4  |  5  |      |  6  |  7  |  8  |  9  |   0   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |  F1   | F2  | F3  | F4  | F5  |      |     |     |     |     |       |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |  F6   | F7  | F8  | F9  | F10 |      | MLFT| MDWN| MUP | MRGT|       |
-     * `-------------------------------'      `-------------------------------'
-     *             .-----------------.          .-----------------.
-     *             | F11 | F12 |     |          |     |     |     |
-     *             '-----------------'          '-----------------'
-     */
-    [_NUMBERS] = LAYOUT_split_3x5_3(
-         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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-         KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,         KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS,
-                    KC_F11, KC_F12, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_CTL_A:
-            return false;
-        default:
-            return true;
-    }
-}
-
-td_state_t cur_dance(tap_dance_state_t *state) {
-    if (state->count == 1)
-        return TD_SINGLE_TAP;
-    if (state->count == 2)
-        return TD_DOUBLE_TAP;
-    else if (state->count == 3)
-	return TD_TRIPLE_TAP;
-    return TD_UNKNOWN;
-}
-
-static td_tap_t ql_tap_state = {
-    .is_press_action = true,
-    .state = TD_NONE
-};
-
-void ql_finished(tap_dance_state_t *state, void *user_data) {
-    ql_tap_state.state = cur_dance(state);
-    switch (ql_tap_state.state) {
-        case TD_SINGLE_TAP:
-            tap_code(KC_COMMA);
-            break;
-        case TD_DOUBLE_TAP:
-            tap_code(KC_COMMA);
-            tap_code(KC_COMMA);
-            break;
-        case TD_TRIPLE_TAP:
-            if (layer_state_is(_GAME))
-                layer_off(_GAME);
-            else
-                layer_on(_GAME);
-            break;
-        default:
-            break;
-    }
-}
-
-void ql_reset(tap_dance_state_t *state, void *user_data) {
-    ql_tap_state.state = TD_NONE;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [GAME] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ql_finished, ql_reset)
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QK_TAP_DANCE ... QK_TAP_DANCE_MAX:
-            return 275;
-        default:
-            return TAPPING_TERM;
-    }
-}
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md b/keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md
deleted file mode 100644
index 7c8a6f20234..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# George Petri's Gergoplex layout
-Vim and programming focused layout.
-```
-qmk compile -kb gboards/gergoplex -km georgepetri
-qmk flash -kb gboards/gergoplex -km georgepetri
-```
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk b/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk
deleted file mode 100644
index 74d02c23bd5..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#----------------------------------------------------------------------------
-# make gboards/gergoplex:default:flash
-# Make sure you have dfu-programmer installed!
-#----------------------------------------------------------------------------
-
-#Debug options
-VERBOSE                = no
-DEBUG_MATRIX_SCAN_RATE = no
-DEBUG_MATRIX           = no
-CONSOLE_ENABLE         = no
-
-#Combos!
-COMBO_ENABLE = yes
-VPATH                  +=  keyboards/gboards/
-
-ifeq ($(strip $(DEBUG_MATRIX)), yes)
-    OPT_DEFS += -DDEBUG_MATRIX
-endif
-
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def b/keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def
deleted file mode 100644
index ef953d53f59..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def
+++ /dev/null
@@ -1,11 +0,0 @@
-// List any combo dictionaries you want loaded to your device below!
-
-// QMK wide includes
-//#include "combos/germ-vim-helpers.def"
-//#include "combos/germ-mouse-keys.def"
-
-// User includes
-#include "gergoplex.def"
-
-// Word completion
-// #include "combos/eng-combos.def"
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h b/keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h
deleted file mode 100644
index 1b30cc73b3d..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define COMBO_ALLOW_ACTION_KEYS
-#define COMBO_VARIABLE_LEN
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def b/keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def
deleted file mode 100644
index c7a93ed294e..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def
+++ /dev/null
@@ -1,17 +0,0 @@
-// Gergoplex specfic combos
-
-COMB(qwGrav,      KC_GRV,           KC_W, KC_Q)
-COMB(wsEsc,       KC_ESC,           KC_W, KC_S)
-COMB(sdBackspace, KC_BSPC,          KC_S, KC_D)
-COMB(dfTab,       KC_TAB,           KC_D, KC_F)
-COMB(cvEnter,     KC_ENT,           KC_C, KC_V)
-
-COMB(ioMinus,     KC_MINS,          KC_I, KC_O)
-COMB(opBackslash, KC_BSLS,          KC_O, KC_P)
-COMB(hjLess,      KC_LT,            KC_H, KC_J)
-COMB(klGreat,     KC_GT,            KC_K, KC_L)
-COMB(jkColon,     KC_COLN,          KC_J, KC_K)
-COMB(mcUnder,     KC_UNDS,          KC_M, KC_COMM)
-COMB(nmQuote,     KC_QUOT,          KC_N, KC_M)
-
-SUBS(pasta,       "I'd just like to interject for a moment.",       KC_H, KC_J, KC_K, KC_L)
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c b/keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c
deleted file mode 100644
index 74c0899fdb1..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/* Copyright 2022 Tony Grosinger
- *
- * 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 "g/keymap_combo.h"
-
-enum {
-  _ALPHA,  // Default
-  _SYMB,   // Symbols
-  _NUMB,   // Numbers
-  _ARROWS, // Arrows and OS
-  _TMUX,   // TMUX Nav layer
-  _POPOS,  // Gnome Shell, aka PopOS
-};
-
-
-// Macros
-enum custom_keycodes {
-  TMUX_NEW = SAFE_RANGE,
-  TMUX_ZOOM,
-  TMUX_SCROLL,
-  TMUX_PN_LT,
-  TMUX_PN_UP,
-  TMUX_PN_DN,
-  TMUX_PN_RT,
-  TMUX_WN_LT,
-  TMUX_WN_RT,
-  TMUX_SP_VT,
-  TMUX_SP_HZ,
-  VIM_CLIP_CP,
-  VIM_CLIP_PST,
-  VIM_MACRO,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case TMUX_NEW:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("c");
-      }
-      break;
-    case TMUX_ZOOM:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("z");
-      }
-      break;
-    case TMUX_SCROLL:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("[");
-      }
-      break;
-    case TMUX_PN_LT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        tap_code(KC_LEFT);
-      }
-      break;
-    case TMUX_PN_DN:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        tap_code(KC_DOWN);
-      }
-      break;
-    case TMUX_PN_UP:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        tap_code(KC_UP);
-      }
-      break;
-    case TMUX_PN_RT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        tap_code(KC_RIGHT);
-      }
-      break;
-    case TMUX_WN_LT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("p");
-      }
-      break;
-    case TMUX_WN_RT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("n");
-      }
-      break;
-    case TMUX_SP_VT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("%");
-      }
-      break;
-    case TMUX_SP_HZ:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("\"");
-      }
-      break;
-    case VIM_CLIP_CP:
-      if (record->event.pressed) {
-        tap_code16(S(KC_QUOTE));
-        tap_code16(S(KC_EQUAL));
-        tap_code(KC_Y);
-      }
-      break;
-    case VIM_CLIP_PST:
-      if (record->event.pressed) {
-        tap_code16(S(KC_QUOTE));
-        tap_code16(S(KC_EQUAL));
-        tap_code(KC_P);
-      }
-      break;
-    case VIM_MACRO:
-      if (record->event.pressed) {
-        tap_code16(S(KC_2));
-        tap_code(KC_Q);
-      }
-      break;
-    /*
-    case LAYRMOD:
-      // Act as a mod key if held, or toggle a layer if tapped
-      // replace KC_LCTL with desired mod, and _TARGET with desired layer name / number
-      if (record->event.pressed) {
-        uint8_t key_timer = timer_read();
-        register_mods(MOD_BIT(KC_LCTL));
-      } else {
-        unregister_mods(MOD_BIT(KC_LCTL));
-        if (timer_elapsed(key_timer) < 200) {
-          layer_invert(_TARGET);
-        }
-      }
-      return false;
-      break;
-    */
-  }
-  return true;
-}
-
-/* Combos
- *
- * ,-----------------------------.      ,-----------------------------.
- * |     `     |     |     |     |      |     |    MINS   |    BSLH   |
- * |-----+----ESC----+-----+-----|      |-----+-----+-----+-----------|
- * |     |   BSPC   TAB    |     |      |    LES   COLN  GRT    |     |
- * |-----+-----+-----+--RMB+-LMB-|      |-----+-----+-----+-----------|
- * |     |     |    ENT    |     |      |    QUO   UNDR   |     |     |
- * `-----+-----+-----+-----+-----'      `-----------------------------'
- *     .-------------------------.           .-------------------.
- *     |        |       |        |           |        |    |     |
- *     '-------------------------'           '-------------------'
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap 0: Default layer
-  * ,------------------------------.      ,----------------------------------.
-  * |  Q   |  W  |  E  |  R  |  T  |      |  Y  |  U  |  I  |   O   |    P   |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-------+--------|
-  * |CTRL/A|  S  |  D  |  F  |  G  |      |  H  |  J  |  K  |   L   | CTRL/; |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-------+--------|
-  * |SHFT/Z|ALT/X|  C  |  V  |  B  |      |  N  |  M  |  <  | ALT/> | SHFT/? |
-  * `------+-----+-----+------+----'      `----------------------------------'
-  *           .-----------------.             .----------------------.
-  *           |   |GUI |SPC(NUM)|             |SPC(SYM)|TMUX | PopOS |
-  *           '-----------------'             '----------------------'
-  */
-  [_ALPHA] = LAYOUT_split_3x5_3(
-      KC_Q,              KC_W,               KC_E, KC_R, KC_T,    KC_Y, KC_U, KC_I,    KC_O,   KC_P, 
-      MT(MOD_LCTL, KC_A),KC_S,               KC_D, KC_F, KC_G,    KC_H, KC_J, KC_K,    KC_L,   MT(MOD_LCTL, KC_SCLN),
-      MT(MOD_LSFT, KC_Z),MT(MOD_LALT, KC_X), KC_C, KC_V, KC_B,    KC_N, KC_M, KC_COMM, MT(MOD_LALT, KC_DOT), MT(MOD_RSFT, KC_SLSH),
-              
-      KC_NO,   KC_LGUI, LT(_NUMB, KC_SPC),       // Left
-      LT(_SYMB, KC_SPC), MO(_TMUX), MO(_POPOS)   // Right
-      ),
-
-  /* Keymap 1: Symbols layer
-  * ,------------------------------.      ,-------------------------------.
-  * |  !   |  @  |  #  |  $  |  %  |      |  ^  |  &  |  *  |  +  |   =   |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-  * |  F1  | F2  | F3  | F4  | F5  |      | F6  | F7  | F8  | F9  |  F10  |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-  * |      |     |     |     |     |      |     |     |     | F11 |  F12  |
-  * `------+-----+-----+-----+-----'      `-------------------------------'
-  *        .-----------------.                  .-----------------.
-  *        |     | DEL | MO3 |                  | HLD | SPC |     |
-  *        '-----------------'                  '-----------------'
-  */
-  [_SYMB] = LAYOUT_split_3x5_3(
-      KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,   KC_CIRC, KC_AMPR, KC_ASTR, KC_PLUS, KC_EQL,
-      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_F11,  KC_F12,
-                KC_NO, KC_DEL, MO(_ARROWS),                 KC_TRNS,  KC_SPC, KC_NO
-      ),
-
-  /* Keymap 2: Number layer
-  * ,------------------------------.      ,-------------------------------.
-  * |  1   |  2  |  3  |  4  |  5  |      |  6  |  7  |  8  |  9  |   0   |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-  * | CTRL |     |  (  |  )  |     |      |     |  4  |  7  |  6  |       |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-  * | SHFT |     |  [  |  ]  |     |      |     |  1  |  2  |  3  |   .   |
-  * `------+-----+-----+-----+-----'      `-------------------------------'
-  *        .-----------------.                  .-----------------.
-  *        |     |     | HLD |                  | MO3 |  0  |     |
-  *        '-----------------'                  '-----------------'
-  */
-  [_NUMB] = LAYOUT_split_3x5_3(
-      KC_1,    KC_2,  KC_3,    KC_4,    KC_5,       KC_6,  KC_7, KC_8, KC_9,  KC_0,
-      KC_LCTL, KC_NO, KC_LPRN, KC_RPRN, KC_NO,      KC_NO, KC_4, KC_5, KC_6,  KC_NO,
-      KC_LSFT, KC_NO, KC_LBRC, KC_RBRC, KC_NO,      KC_NO, KC_1, KC_2, KC_3,  KC_DOT,
-                  KC_NO,KC_NO,KC_TRNS,                   MO(_ARROWS),KC_0,KC_NO
-      ),
-
-  /* Keymap 3: Arrows and OS
-  * ,------------------------------.      ,------------------------------------.
-  * |      |     |     |     |     |      |       |       |      |       |     |
-  * |------+-----+-----+-----+-----|      |-------+-------+------+-------+-----|
-  * | CTRL |HOME | PUP |     |     |      | LEFT  | DOWN  |  UP  | RIGHT |     |
-  * |------+-----+-----+-----+-----|      |-------+-------+------+-------+-----|
-  * | SHFT |END  | PDN |     |     |      |       |       |      |       |     |
-  * `------+-----+-----+-----+-----'      `------------------------------------'
-  *        .-----------------.                   .-----------------.
-  *        |     |     | HLD |                   | HLD |     |     |
-  *        '-----------------'                   '-----------------'
-  */
-  [_ARROWS] = LAYOUT_split_3x5_3(
-      KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,     KC_NO,        KC_NO,         KC_NO,         KC_NO,         KC_NO,
-      KC_LCTL, KC_HOME, KC_PGUP, KC_NO, KC_NO,     KC_LEFT,      KC_DOWN,       KC_UP,         KC_RGHT,       KC_NO,
-      KC_LSFT, KC_END,  KC_PGDN, KC_NO, KC_NO,     KC_NO,        KC_NO,         KC_NO,         KC_NO,         KC_NO,
-                  KC_NO,KC_NO,KC_TRNS,                   KC_TRNS,KC_NO,KC_NO
-      ),
-      
-  /* Keymap 4: Tmux navigation layer
-  * ,----------------------------------.      ,---------------------------------------.
-  * | Vi Mcr |     |     |     | SP VT |      | Vi Ynk|       |       |       | Vi PT |
-  * |--------+-----+-----+-----+-------|      |-------+-------+-------+-------+-------|
-  * |        | SCRL|     |     |       |      | PN LT | PN DN | PN UP | PN RT | SP HZ |
-  * |--------+-----+-----+-----+-------|      |-------+-------+-------+-------+-------|
-  * |  ZOOM  | KILL| NEW |     |       |      | W LT  |       |       | W RT  |       |
-  * `--------+-----+-----+-----+-------'      `---------------------------------------'
-  *          .-----------------.                   .-----------------.
-  *          |     |     |     |                   |     | HLD |     |
-  *          '-----------------'                   '-----------------'
-  */
-  [_TMUX] = LAYOUT_split_3x5_3(
-      VIM_MACRO, KC_NO,       KC_NO,    KC_NO, TMUX_SP_VT,      VIM_CLIP_CP, KC_NO,      KC_NO,      KC_NO,      VIM_CLIP_PST,
-      KC_NO,     TMUX_SCROLL, KC_NO,    KC_NO, KC_NO,           TMUX_PN_LT,  TMUX_PN_DN, TMUX_PN_UP, TMUX_PN_RT, TMUX_SP_HZ,
-      TMUX_ZOOM, KC_NO,       TMUX_NEW, KC_NO, KC_NO,           TMUX_WN_LT,  KC_NO,      KC_NO,      TMUX_WN_RT, KC_NO,
-                  KC_NO,KC_NO,KC_NO,                              KC_NO,KC_TRNS,KC_NO
-      ),
-
-  /* Keymap 5: Gnome Shell (PopOS)
-  * ,------------------------------.      ,--------------------------------------.
-  * |      |     |     |     |     |      | MV-DWN| D-DWN | D-UP  | MV-UP | Flip |
-  * |------+-----+-----+-----+-----|      |-------+-------+-------+-------+------|
-  * |      |     |     |     |     |      |  W-L  | W-DWN | W-UP  | W-R   |      |
-  * |------+-----+-----+-----+-----|      |-------+-------+-------+-------+------|
-  * |      |     |     |     |     |      | Scrns | Apps  | Close |       |      |
-  * `------+-----+-----+-----+-----'      `--------------------------------------'
-  *        .-----------------.                   .-----------------.
-  *        |     |     |     |                   |     |     | HLD |
-  *        '-----------------'                   '-----------------'
-  */
-  [_POPOS] = LAYOUT_split_3x5_3(
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     SGUI(KC_J), LCTL(LGUI(KC_J)), LCTL(LGUI(KC_K)), SGUI(KC_K), LGUI(KC_O),
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     LGUI(KC_H), LGUI(KC_J),       LGUI(KC_K),       LGUI(KC_L), KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     LGUI(KC_D), LGUI(KC_A),       LGUI(KC_Q),       KC_NO,      KC_NO,
-                  KC_NO,KC_NO,KC_NO,                   KC_NO,KC_NO,KC_TRNS
-      ),
-};
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md b/keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md
deleted file mode 100644
index 0a53aa1cbfa..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# GergoPlex
-
-This keymap I created for the GergoPlex with a focus on:
-
-- Keeping keys close to their normal locations when possible (number/symbol rows)
-- Work well for vim, tmux, and Ubuntu default desktop shortcuts
-- Work okay for OSx shortcuts
-
-## Firmware Building
-
-    util/docker_build.sh gboards/gergoplex:tgrosinger
-    util/docker_build.sh gboards/gergoplex:tgrosinger:flash
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk b/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
deleted file mode 100644
index 620cab16c03..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#----------------------------------------------------------------------------
-# make gboards/gergoplex:default:flash
-# Make sure you have dfu-programmer installed!
-#----------------------------------------------------------------------------
-
-#Debug options
-VERBOSE                = no
-DEBUG_MATRIX_SCAN_RATE = no
-DEBUG_MATRIX           = no
-CONSOLE_ENABLE         = no
-
-#Combos!
-COMBO_ENABLE = yes
-VPATH                  +=  keyboards/gboards/
-
-ifeq ($(strip $(DEBUG_MATRIX)), yes)
-    OPT_DEFS += -DDEBUG_MATRIX
-endif
diff --git a/keyboards/gboards/gergoplex/matrix.c b/keyboards/gboards/gergoplex/matrix.c
index c9f5528b749..9437b243779 100644
--- a/keyboards/gboards/gergoplex/matrix.c
+++ b/keyboards/gboards/gergoplex/matrix.c
@@ -177,20 +177,12 @@ static matrix_row_t read_cols(uint8_t row) {
         if (mcp23018_status) {  // if there was an error
             return 0;
         } else {
-            uint8_t data    = 0;
-            mcp23018_status = i2c_start(I2C_ADDR_READ, I2C_TIMEOUT);
-            if (mcp23018_status) goto out;
-            mcp23018_status = i2c_read_nack(I2C_TIMEOUT);
-            if (mcp23018_status < 0) goto out;
-            data            = ~((uint8_t)mcp23018_status);
-            mcp23018_status = I2C_STATUS_SUCCESS;
-        out:
-            i2c_stop();
-
+            uint8_t data = 0;
+            mcp23018_status = i2c_receive(I2C_ADDR, &data, 1, I2C_TIMEOUT);
 #ifdef DEBUG_MATRIX
-            if (data != 0x00) xprintf("I2C: %d\n", data);
+            if (~data != 0x00) xprintf("I2C: %d\n", ~data);
 #endif
-            return data;
+            return ~data;
         }
     } else {
         return ~((((PINF & COL4) >> 1) | ((PINF & (COL1 | COL2 | COL3)) >> 3)) & 0xF);
@@ -213,14 +205,10 @@ static void select_row(uint8_t row) {
         // select on mcp23018
         if (mcp23018_status) {  // do nothing on error
         } else {                // set active row low  : 0 // set other rows hi-Z : 1
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);
-            if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOA, I2C_TIMEOUT);
-            if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(0xFF & ~(1 << (row + 1)), I2C_TIMEOUT);
-            if (mcp23018_status) goto out;
-        out:
-            i2c_stop();
+            uint8_t data;
+            data = 0xFF & ~(1 << (row + 1));
+            mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
+
         }
     } else {
         setPinOutput(row_pins[row - MATRIX_ROWS_PER_SIDE]);
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 47f9064e451..6aed50ec2f6 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -16,72 +16,10 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 42
-
-// PWM RGB Underglow Defines
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
-#    define RGB_MATRIX_DEFAULT_SAT 255
-#    define RGB_MATRIX_DEFAULT_VAL 192
-#    define RGB_MATRIX_DEFAULT_SPD 30
-#endif //RGB_MATRIX_ENABLE
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define WAIT_FOR_USB
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index 95b1ca94d7d..cb8c3b81be9 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -16,7 +16,42 @@
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "ws2812"
+    "animations": {
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "dual_beacon": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true,
+      "solid_multisplash": true
+    },
+    "default": {
+      "animation": "cycle_up_down",
+      "sat": 255,
+      "speed": 30,
+      "val": 192
+    },
+    "driver": "ws2812",
+    "sleep": true
   },
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index c71ee9f3515..1c78a34e604 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -1,63 +1,6 @@
 #pragma once
 
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+
 #define LOCKING_SUPPORT_ENABL
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_WHEN_USB_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
-#    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 IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
-#    define DRIVER_1_LED_TOTAL 8
-#    define DRIVER_2_LED_TOTAL 0
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#endif
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index 363ab895a5f..03fb6827512 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -9,6 +9,47 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true
+        },
         "driver": "is31fl3731"
     },
     "matrix_pins": {
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index 187d887d581..11d2eb4db29 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -1,6 +1,6 @@
 #include "quantum.h"
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/info.json
index 571740b7163..079dd8d6d9a 100644
--- a/keyboards/geistmaschine/geist/info.json
+++ b/keyboards/geistmaschine/geist/info.json
@@ -9,7 +9,7 @@
         "command": false,
         "console": false,
         "extrakey": true,
-        "mousekey": false,
+        "mousekey": true,
         "nkro": true,
         "encoder": true
     },
diff --git a/keyboards/geistmaschine/geist/keymaps/default/keymap.c b/keyboards/geistmaschine/geist/keymaps/default/keymap.c
index 6d96c572ba3..19b4ba2210d 100644
--- a/keyboards/geistmaschine/geist/keymaps/default/keymap.c
+++ b/keyboards/geistmaschine/geist/keymaps/default/keymap.c
@@ -19,14 +19,14 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        LT(2, 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_TRNS, KC_DEL,
+        LT(2, 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_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_NUHS, KC_ENT,  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_SPC,           KC_SPC,           KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
-        KC_MPLY,        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_TRNS, KC_INS,
+        KC_MPLY,        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_DEL,  KC_INS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_END,
diff --git a/keyboards/geistmaschine/geist/keymaps/via/keymap.c b/keyboards/geistmaschine/geist/keymaps/via/keymap.c
index 068f500fb01..f4d07036bda 100644
--- a/keyboards/geistmaschine/geist/keymaps/via/keymap.c
+++ b/keyboards/geistmaschine/geist/keymaps/via/keymap.c
@@ -19,14 +19,14 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        LT(2, 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_TRNS, KC_DEL,
+        LT(2, 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_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_NUHS, KC_ENT,  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_SPC,           KC_SPC,           KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
-        KC_MPLY,        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_TRNS, KC_INS,
+        KC_MPLY,        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_DEL,  KC_INS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_END,
diff --git a/keyboards/geonworks/ee_at/ee_at.c b/keyboards/geonworks/ee_at/ee_at.c
new file mode 100644
index 00000000000..b2e6320851b
--- /dev/null
+++ b/keyboards/geonworks/ee_at/ee_at.c
@@ -0,0 +1,30 @@
+/* Copyright 2023 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 "quantum.h"
+
+void led_init_ports(void) {
+    // Set our LED pins as open drain outputs
+    setPinOutputOpenDrain(LED_CAPS_LOCK_PIN);
+    setPinOutputOpenDrain(LED_NUM_LOCK_PIN);
+    setPinOutputOpenDrain(LED_SCROLL_LOCK_PIN);
+    setPinOutputOpenDrain(LED_KANA_PIN);
+    setPinOutputOpenDrain(A14);
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    writePin(A14, !layer_state_cmp(state, 1));
+    return layer_state_set_user(state);
+}
diff --git a/keyboards/geonworks/ee_at/info.json b/keyboards/geonworks/ee_at/info.json
new file mode 100644
index 00000000000..803e0d36403
--- /dev/null
+++ b/keyboards/geonworks/ee_at/info.json
@@ -0,0 +1,499 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "EE-AT",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "kana": "A13",
+        "num_lock": "B3",
+        "on_state": 0,
+        "scroll_lock": "A15"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x5755",
+        "vid": "0x8968"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_split_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [4, 19], "x": 20.5, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4},
+                {"matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2},
+                {"matrix": [4, 18], "x": 19.5, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/geonworks/ee_at/keymaps/default/keymap.c b/keyboards/geonworks/ee_at/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f0eb9ba7a83
--- /dev/null
+++ b/keyboards/geonworks/ee_at/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2023 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_F1, KC_F2,     QK_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_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
+    KC_F3, KC_F4,     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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_F5, KC_F6,     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_P4,   KC_P5,   KC_P6,
+    KC_F7, KC_F8,     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_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_F9, KC_F10,    KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                                    KC_RALT, KC_RGUI, KC_RCTL,            KC_P0,            KC_PDOT),
+
+[1] = LAYOUT_all( /* FN */
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_VOLD, 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_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,          KC_TRNS)
+};
diff --git a/keyboards/geonworks/ee_at/keymaps/via/keymap.c b/keyboards/geonworks/ee_at/keymaps/via/keymap.c
new file mode 100644
index 00000000000..f0eb9ba7a83
--- /dev/null
+++ b/keyboards/geonworks/ee_at/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2023 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_F1, KC_F2,     QK_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_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
+    KC_F3, KC_F4,     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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_F5, KC_F6,     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_P4,   KC_P5,   KC_P6,
+    KC_F7, KC_F8,     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_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_F9, KC_F10,    KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                                    KC_RALT, KC_RGUI, KC_RCTL,            KC_P0,            KC_PDOT),
+
+[1] = LAYOUT_all( /* FN */
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_VOLD, 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_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,          KC_TRNS)
+};
diff --git a/keyboards/mnk50/keymaps/via/rules.mk b/keyboards/geonworks/ee_at/keymaps/via/rules.mk
old mode 100755
new mode 100644
similarity index 100%
rename from keyboards/mnk50/keymaps/via/rules.mk
rename to keyboards/geonworks/ee_at/keymaps/via/rules.mk
diff --git a/keyboards/geonworks/ee_at/matrix_diagram.md b/keyboards/geonworks/ee_at/matrix_diagram.md
new file mode 100644
index 00000000000..382487564d7
--- /dev/null
+++ b/keyboards/geonworks/ee_at/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Yiancar-Designs EE-AT
+
+```
+                                                             ┌───────┐
+                                                2u Backspace │0F     │
+                                                             └───────┘
+┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┬───┐
+│00 │01 ││02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │2E ││0G │0H │0I │0J │
+├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┼───┤
+│10 │11 ││12   │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F   ││1G │1H │1I │   │
+├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┼───┼───┤1J │
+│20 │21 ││22    │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F      ││2G │2H │2I │   │
+├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤├───┼───┼───┼───┤
+│30 │31 ││32  │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E    │3F ││3G │3H │3I │   │
+├───┼───┤├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤├───┼───┼───┤4J │
+│40 │41 ││42   │43 │44   │48                         │4D   │4E │4F   ││4G │4H │4I │   │
+└───┴───┘└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┴───┘
+                                                          ┌──────────┐
+                                             2.75u RShift │3E        │
+                                                          └──────────┘
+```
diff --git a/keyboards/geonworks/ee_at/readme.md b/keyboards/geonworks/ee_at/readme.md
new file mode 100644
index 00000000000..0c7c8d1926a
--- /dev/null
+++ b/keyboards/geonworks/ee_at/readme.md
@@ -0,0 +1,32 @@
+# EE-AT
+
+This is a standard weird layout PCB, now with Hotswap. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A keyboard with STM32F072CB
+* Hardware Availability: https://geon.works/ 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make geonworks/ee_at: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 geonworks/ee_at:<keymap>:flash`)
diff --git a/keyboards/geonworks/ee_at/rules.mk b/keyboards/geonworks/ee_at/rules.mk
new file mode 100644
index 00000000000..0ab54aaaf71
--- /dev/null
+++ b/keyboards/geonworks/ee_at/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/geonworks/w1_at/info.json b/keyboards/geonworks/w1_at/info.json
new file mode 100644
index 00000000000..8b7991c03d8
--- /dev/null
+++ b/keyboards/geonworks/w1_at/info.json
@@ -0,0 +1,507 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "W1-AT",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "kana": "A13",
+        "num_lock": "B3",
+        "on_state": 0,
+        "scroll_lock": "A15"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x5754",
+        "vid": "0x8968"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_wkl": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "#", "matrix": [1, 15], "x": 15, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
+                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
+                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
+                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
+                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
+                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "#", "matrix": [1, 15], "x": 15, "y": 2},
+                {"label": "Enter", "matrix": [2, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
+                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
+                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
+                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
+                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
+                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
+                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
+                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
+                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
+                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
+                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
+                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/geonworks/w1_at/keymaps/default/keymap.c b/keyboards/geonworks/w1_at/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f69fa8a4261
--- /dev/null
+++ b/keyboards/geonworks/w1_at/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/* 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
+
+enum custom_keycodes {
+    KC_P00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    KC_F1, KC_F2,     QK_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_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
+    KC_F3, KC_F4,     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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_F5, KC_F6,     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_P4,   KC_P5,   KC_P6,   KC_PMNS,
+    KC_F7, KC_F8,     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, MO(1),              KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
+    KC_F9, KC_F10,    KC_LCTL,          KC_LALT,                        KC_SPC,                                    KC_RALT,          KC_RCTL,            KC_P0,   KC_P00,  KC_PDOT, KC_PENT),
+
+[1] = LAYOUT_all( /* FN */
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_VOLD, 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_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case KC_P00:
+                tap_code(KC_P0);
+                tap_code(KC_P0);
+                return false;
+        }
+    }
+    return true;
+}
diff --git a/keyboards/w1_at/keymaps/via/keymap.c b/keyboards/geonworks/w1_at/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/w1_at/keymaps/via/keymap.c
rename to keyboards/geonworks/w1_at/keymaps/via/keymap.c
diff --git a/keyboards/mnk75/keymaps/via/rules.mk b/keyboards/geonworks/w1_at/keymaps/via/rules.mk
old mode 100755
new mode 100644
similarity index 100%
rename from keyboards/mnk75/keymaps/via/rules.mk
rename to keyboards/geonworks/w1_at/keymaps/via/rules.mk
diff --git a/keyboards/w1_at/matrix_diagram.md b/keyboards/geonworks/w1_at/matrix_diagram.md
similarity index 100%
rename from keyboards/w1_at/matrix_diagram.md
rename to keyboards/geonworks/w1_at/matrix_diagram.md
diff --git a/keyboards/geonworks/w1_at/readme.md b/keyboards/geonworks/w1_at/readme.md
new file mode 100644
index 00000000000..16296ef6d6b
--- /dev/null
+++ b/keyboards/geonworks/w1_at/readme.md
@@ -0,0 +1,32 @@
+# W1-AT
+
+This is a standard weird layout PCB, best build with a 10U spacebar. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A keyboard with STM32F072CB
+* Hardware Availability: https://geon.works/ 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make geonworks/w1_at: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 geonworks/w1_at:<keymap>:flash`)
diff --git a/keyboards/geonworks/w1_at/rules.mk b/keyboards/geonworks/w1_at/rules.mk
new file mode 100644
index 00000000000..0ab54aaaf71
--- /dev/null
+++ b/keyboards/geonworks/w1_at/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/geonworks/w1_at/w1_at.c b/keyboards/geonworks/w1_at/w1_at.c
new file mode 100644
index 00000000000..9858561bc58
--- /dev/null
+++ b/keyboards/geonworks/w1_at/w1_at.c
@@ -0,0 +1,30 @@
+/* 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 "quantum.h"
+
+void led_init_ports(void) {
+    // Set our LED pins as open drain outputs
+    setPinOutputOpenDrain(LED_CAPS_LOCK_PIN);
+    setPinOutputOpenDrain(LED_NUM_LOCK_PIN);
+    setPinOutputOpenDrain(LED_SCROLL_LOCK_PIN);
+    setPinOutputOpenDrain(LED_KANA_PIN);
+    setPinOutputOpenDrain(A14);
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    writePin(A14, !layer_state_cmp(state, 1));
+    return layer_state_set_user(state);
+}
diff --git a/keyboards/gh60/revc/keymaps/bluezio/keymap.c b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
deleted file mode 100644
index 23692edb19c..00000000000
--- a/keyboards/gh60/revc/keymaps/bluezio/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// lshift split, backspace split, full ANSI enter, full right shift
-#define LAYOUT_BZIO(                                                         \
-               K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
-               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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-               K40, K41, K42,           K45,                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, KC_NO, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D }, \
-    { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    KC_NO,    K49, K4A, K4B, K4C, K4D } \
-  }
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: HHKB with hyper key where ctrl used to be, and right half of left
-       shift used as a key lock */
-    LAYOUT_BZIO(
-        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_BSLS, 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_BSPC,
-        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_LSFT, QK_LOCK, KC_Z,    KC_X,    KC_C,  KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-        KC_HYPR, KC_LGUI, KC_LALT, LT(1, KC_SPC),                                           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
-
-    /* 1: spacefn with WASD arrows/navigation block and extra space key for
-       realignment of source code, plus IJKL mouse arrows, volume up/down in <>,
-       and caps lock where it used to be */
-    LAYOUT_BZIO(
-        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_TRNS, KC_TRNS,
-        KC_TRNS,          KC_PGUP, KC_UP,   KC_PGDN,   KC_INSERT,  KC_MS_BTN2, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-        KC_TRNS,          KC_LEFT, KC_DOWN, KC_RGHT,   KC_DELETE,  KC_MS_BTN1, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_HOME, KC_SPC,  KC_END,    KC_PSCR,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/gh60/revc/keymaps/bluezio/rules.mk b/keyboards/gh60/revc/keymaps/bluezio/rules.mk
deleted file mode 100644
index 116d505b7ee..00000000000
--- a/keyboards/gh60/revc/keymaps/bluezio/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/gh60/revc/keymaps/chaser/README.md b/keyboards/gh60/revc/keymaps/chaser/README.md
deleted file mode 100644
index e6ec9e82bed..00000000000
--- a/keyboards/gh60/revc/keymaps/chaser/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# [dragonchasers](https://github.com/dragonchaser) GH60 layout
-
-Layout derived from the default GH60 keymap.
-
-![Photo of the keyboard](https://pbs.twimg.com/media/DQzlD0yX0AA8spX.jpg)
-
-## Layers
-
-### Base Layer
-```
-,-----------------------------------------------------------.
-|Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-|-----------------------------------------------------------|
-|Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-|-----------------------------------------------------------|
-|FN     |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-|-----------------------------------------------------------|
-|Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Up  |FN |
-|-----------------------------------------------------------|
-|Ctrl|Gui |Alt |      Space           |Alt |Left |Down|Right|
-`-----------------------------------------------------------'
-
-Note: right FN triggers function layer,
-      left FN(CAPS) is a one-shot button for the macro layer
-```
-
-### Function Layer
-```
-,-----------------------------------------------------------.
-|GRV|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   DEL |
-|-----------------------------------------------------------|
-|  MB3|MB2|MUP|MB1|MWU|   |   |   |INS|   |RST|   |   |Print|
-|-----------------------------------------------------------|
-|      | ML|MDN|MR |MWD|   |   |       |   |   |   |        |
-|-----------------------------------------------------------|
-|CAPS    |   |   |   |   |   |   |   |   |   |   |PGUP|     |
-|-----------------------------------------------------------|
-|    |    |    |                        |Ctrl|HOME|PGD |END |
-`-----------------------------------------------------------'
-```
-
-### Macro Layer
-```
-,-----------------------------------------------------------.
-|DEF|   |DUE|   |   |   |   |   |   |   |   |   |GAM|    ARR|
-|-----------------------------------------------------------|
-|     |MAG|CLO|DUT|RBS|TIG|   |   |   |COU|PSH|   |   |     |
-|-----------------------------------------------------------|
-|      |ADD|STS|DFF|FTC|PLL|   |       |LOG|   |   |        |
-|-----------------------------------------------------------|
-|         |   |   |COM|   |BRN|   |   |   |   |MUT|VOL+|PLPA|
-|-----------------------------------------------------------|
-|    |    |    |                        |APP |PREV|VOL-|NEXT|
-`-----------------------------------------------------------'
-
-Abbreviations:
---------------
-DEF  - return to default layer
-DUE  - enable git duet mode
-GAM  - backlight WASD
-ARR  - backlight arrows
--
-MAG  - git submodule sync --recursive \
-       && git submodule update --init --recursive \
-       && git submodule foreach --recursive "git co . \
-       && git reset --hard && git clean -dffx"
-CLO  - git clone
-DUT  - git duet (when in duet mode)
-RBS  - git rebase
-TIG  - tig
-COU  - git checkout
-PSH  - git push
--
-ADD  - git add
-STS  - git status
-DFF  - git diff
-FTC  - git fetch
-PLL  - git pull
-LOG  - git log
--
-COM  - git commit (or git duet commit if in duet mode)
-BRN  - git branch
-MUT  - audio mute
-VOL+ - increase volume
-PLPA - play/pause
--
-APP  - application (windows menu key)
-PREV - previous song
-VOL- - decrease volume
-NEXT - next song
-
-Note: git commands are SEND_STRING macros sent to the
-      currently focused window Make sure it is your terminal :)
- ```
-
-**NOTE:** an outdated version of this keymap is also present for the Satan keyboard, which is no longer maintained since I could not get my hands on a properly working PCB.
diff --git a/keyboards/gh60/revc/keymaps/chaser/keymap.c b/keyboards/gh60/revc/keymaps/chaser/keymap.c
deleted file mode 100644
index e04367d86bf..00000000000
--- a/keyboards/gh60/revc/keymaps/chaser/keymap.c
+++ /dev/null
@@ -1,328 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <util/delay.h>
-
-
-extern keymap_config_t keymap_config;
-
-
-// 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 _QW 0
-#define _FL 1
-#define _MC 2
-
-bool git_duet = false;
-bool backlight_arrows = false;
-bool backlight_gaming = false;
-enum custom_keycodes {
-  /* GIT related keycodes */
-  G_ADD = SAFE_RANGE, G_BRN, G_COM, G_COU, G_CLO,
-  G_DFF, G_DUE, G_DUT, G_FTC, G_LOG, G_MAG, G_MRG,
-  G_MRT, G_PSH, G_PLL, G_RBS, G_STH, G_STS, G_TIG,
-
-  /* Multi-media related keycodes */
-  A_MUTE, A_NEXT, A_PLPA, A_PREV, A_VOUP, A_VDWN,
-
-  /* System related shortcuts */
-  F_BTN, M_WAPP, K_ARR, K_WASD,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /*
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |FN     |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  FN  |Up |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space           |Alt |Left |Down|Right|
-   * `-----------------------------------------------------------'
-   *
-   * Note: right FN triggers function layer,
-   *       left FN is a one-shot button for the macro layer
-   */
-  /* Layer 0: Qwerty */
-  [_QW] = LAYOUT_60_ansi_split_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_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,
-    OSL(_MC), 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,          F_BTN,   KC_UP,
-    KC_LCTL,  KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /*
-   * ,-----------------------------------------------------------.
-   * |GRV|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   DEL |
-   * |-----------------------------------------------------------|
-   * |  MB3|MB2|MUP|MB1|MWU|   |   |   |INS|   |RST|   |   |Print|
-   * |-----------------------------------------------------------|
-   * |      | ML|MDN|MR |MWD|   |   |       |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |CAPS    |   |   |   |   |   |   |   |   |   |   |PGUP|     |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |Ctrl|HOME|PGD |END |
-   * `-----------------------------------------------------------'
-   */
-  /* Layer 1: Functions */
-  [_FL] = LAYOUT_60_ansi_split_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,
-    KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, _______, _______, KC_INS,  _______, QK_BOOT, _______, _______, KC_PSCR,
-    KC_CAPS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, _______, _______, _______, _______,          KC_TILD,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP,
-    _______, _______, _______,                   _______,                                     KC_RCTL, KC_HOME, KC_PGDN, KC_END
-  ),
-
-  /*
-   * ,-----------------------------------------------------------.
-   * |DEF|   |DUE|   |   |   |   |   |   |   |   |   |GAM|    ARR|
-   * |-----------------------------------------------------------|
-   * |     |MAG|CLO|DUT|RBS|TIG|MRT|   |   |COU|PSH|   |   |     |
-   * |-----------------------------------------------------------|
-   * |      |ADD|STS|DFF|FTC|PLL|MRG|   |STH|LOG|   |   |   F_OFF|
-   * |-----------------------------------------------------------|
-   * |         |   |   |COM|   |BRN|   |   |   |   |MUT|VOL+|PLPA|
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |APP |PREV|VOL-|NEXT|
-   * `-----------------------------------------------------------'
-   *
-   * Abbreviations:
-   * --------------
-   * DEF  - return to default layer
-   * DUE  - enable git duet mode
-   * CLO  - git clone
-   * DUT  - git duet (when in duet mode)
-   * RBS  - git rebase
-   * MAG  - git submodule sync --recursive && git submodule update --init --recursive && git submodule foreach --recursive "git co . && git reset --hard && git clean -dffx"
-   * TIG  - tig
-   * MRG  - git merge
-   * MRT  - git mergetool
-   * COU  - git checkout
-   * PSH  - git push
-   * ADD  - git add
-   * STS  - git status
-   * DFF  - git diff
-   * FTC  - git fetch
-   * PLL  - git pull
-   * STH  - git stash
-   * LOG  - git log
-   * COM  - git commit (or git duet commit if in duet mode)
-   * BRN  - git branch
-   * APP  - application (windows menu key)
-   * MUT  - audio mute
-   * VOL+ - increase volume
-   * VOL- - decrease volume
-   * PLPA - play/pause
-   * PREV - previous song
-   * NEXT - next song
-   * ARR  - backlight arrow keys
-   * GAM  - backlight WASD
-   *
-   * Note: git commands are SEND_STRING macros sent to the
-   *       currently focused window Make sure it is your terminal :)
-   */
-  /* Layer 2: Macros (Git & Multimedia) */
-  [_MC] = LAYOUT_60_ansi_split_rshift(
-    TO(_QW), XXXXXXX, G_DUE,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, K_WASD,  K_ARR,
-    XXXXXXX, G_MAG,   G_CLO,   G_DUT,   G_RBS,   G_TIG,   G_MRT,   XXXXXXX, XXXXXXX, G_COU,   G_PSH,   XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, G_ADD,   G_STS,   G_DFF,   G_FTC,   G_PLL,   G_MRG,   XXXXXXX, G_STH,   G_LOG,   XXXXXXX, XXXXXXX,          XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, G_COM,   XXXXXXX, G_BRN,   XXXXXXX, XXXXXXX, XXXXXXX, A_MUTE,           A_PLPA,  A_VOUP,
-    XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,                                     M_WAPP,  A_PREV,  A_VDWN,  A_NEXT
-  ),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      /*
-       * Begin git layer
-       */
-      case G_ADD:
-        SEND_STRING("git add ");
-        layer_off(_MC);
-        return false;break;
-      case G_BRN:
-        SEND_STRING("git branch\n");
-        layer_off(_MC);
-        return false;break;
-      case G_CLO:
-        SEND_STRING("git clone ");
-        layer_off(_MC);
-        return false;break;
-      case G_COM:
-        if(git_duet) {
-          SEND_STRING("git duet-commit ");
-        } else {
-          SEND_STRING("git commit ");
-        }
-        layer_off(_MC);
-        return false;break;
-      case G_COU:
-        SEND_STRING("git checkout ");
-        layer_off(_MC);
-        return false;break;
-      case G_DFF:
-        SEND_STRING("git diff\n");
-        layer_off(_MC);
-        return false;break;
-      case G_DUE:
-        git_duet = !git_duet;
-        if(git_duet) {
-          gh60_esc_led_on();
-        } else {
-          gh60_esc_led_off();
-        }
-        layer_off(_MC);
-        return false;break;
-      case G_DUT:
-        if(git_duet) {
-          SEND_STRING("git duet ");
-        }
-        layer_off(_MC);
-        return false; break;
-      case G_FTC:
-        SEND_STRING("git fetch ");
-        layer_off(_MC);
-        return false;break;
-      case G_LOG:
-        SEND_STRING("git log --graph\n");
-        layer_off(_MC);
-        return false;break;
-      case G_MAG:
-        // This is some git-magic to resync recursive submodule structures inside git projects (thx to https://github.com/jimmykarily)
-        SEND_STRING("git submodule sync --recursive && git submodule update --init --recursive && git submodule foreach --recursive \" git co . && git reset --hard && git clean -dffx \" \n");
-        layer_off(_MC);
-        return false; break;
-      case G_MRG:
-        SEND_STRING("git merge ");
-        layer_off(_MC);
-        return false;break;
-      case G_MRT:
-        SEND_STRING("git mergetool ");
-        layer_off(_MC);
-        return false;break;
-      case G_PLL:
-        SEND_STRING("git pull ");
-        layer_off(_MC);
-        return false;break;
-      case G_PSH:
-        SEND_STRING("git push ");
-        layer_off(_MC);
-        return false;break;
-      case G_RBS:
-        SEND_STRING("git rebase ");
-        layer_off(_MC);
-        return false;break;
-      case G_STH:
-        SEND_STRING("git stash ");
-        layer_off(_MC);
-        return false;break;
-      case G_STS:
-        SEND_STRING("git status\n");
-        layer_off(_MC);
-        return false;break;
-      case G_TIG:
-        SEND_STRING("tig\n");
-        layer_off(_MC);
-        return false;break;
-      /*
-       * End git layer
-       */
-
-      /*
-       * Begin multimedia keys
-       */
-      case A_MUTE:
-        register_code(KC_AUDIO_MUTE);
-        unregister_code(KC_AUDIO_MUTE);
-        layer_off(_MC);
-        return false;break;
-      case A_PLPA:
-        register_code(KC_MEDIA_PLAY_PAUSE);
-        unregister_code(KC_MEDIA_PLAY_PAUSE);
-        layer_off(_MC);
-        return false;break;
-      case A_VOUP:
-        register_code(KC_AUDIO_VOL_UP);
-        return false;break;
-      case A_VDWN:
-        register_code(KC_AUDIO_VOL_DOWN);
-        return false;break;
-      case A_PREV:
-        register_code(KC_MEDIA_PREV_TRACK);
-        unregister_code(KC_MEDIA_PREV_TRACK);
-        layer_off(_MC);
-        return false;break;
-      case A_NEXT:
-        register_code(KC_MEDIA_NEXT_TRACK);
-        unregister_code(KC_MEDIA_NEXT_TRACK);
-        layer_off(_MC);
-        return false;break;
-      /*
-       * End multimedia keys
-       */
-
-      // Tap dance to get the app button mapped
-      case M_WAPP:
-        register_code(KC_APP);
-        unregister_code(KC_APP);
-        layer_off(_MC);
-        return false;break;
-
-      /*
-       * Begin multimedia keys
-       */
-      case K_ARR:
-        backlight_arrows = !backlight_arrows;
-        if(backlight_arrows) {
-          gh60_poker_leds_on();
-        } else {
-          gh60_poker_leds_off();
-        }
-        layer_off(_MC);
-        return false;break;
-      case K_WASD:
-        backlight_gaming = !backlight_gaming;
-        if(backlight_gaming) {
-          gh60_wasd_leds_on();
-        } else {
-          gh60_wasd_leds_off();
-        }
-        layer_off(_MC);
-        return false; break;
-      case F_BTN:
-        gh60_fn_led_on();
-        layer_on(_FL);
-        return false;break;
-    }
-    /*
-     * End multimedia keys
-     */
-
-  } else {
-    switch(keycode) {
-      /*
-       * Oneshots that will switch back to the default layer on KEY_UP
-       */
-      case A_VOUP:
-        unregister_code(KC_AUDIO_VOL_UP);
-        layer_off(_MC);
-        return false;break;
-      case A_VDWN:
-        unregister_code(KC_AUDIO_VOL_DOWN);
-        layer_off(_MC);
-        return false;break;
-      case F_BTN:
-        layer_off(_FL);
-        gh60_fn_led_off();
-        return false;break;
-    }
-  }
-  return true;
-};
diff --git a/keyboards/gh60/revc/keymaps/danbee/keymap.c b/keyboards/gh60/revc/keymaps/danbee/keymap.c
deleted file mode 100644
index 0dabb8b07f0..00000000000
--- a/keyboards/gh60/revc/keymaps/danbee/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-  _QW,
-  _L1,
-  _L2,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: qwerty */
-  /*┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-    │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bcksp │
-    ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-    │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ Ent │
-    ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
-    │ Ctrl │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │    │
-    ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
-    │Shft│ ` │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  Shift   │
-    ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-    │ Fn │Alt │Cmd │         Space          │Cmd │Hypr│Ctrl│Fn 2│
-    └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘*/
-  [_QW] = LAYOUT_60_iso( /* Layer 0: Qwerty */
-    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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT ,
-    KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_L1), KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_HYPR, KC_RCTL, MO(_L2)
-  ),
-  /* 1: fn */
-  /*┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-    │ § │Br-│Br+│   │   │BL-│BL+│Pre│Pau│Nxt│Mut│Vo-│Vo+│  Del  │
-    ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-    │     │   │   │   │   │   │   │   │   │   │   │   │   │ Ins │
-    ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
-    │      │   │   │   │   │   │ ◀ │ ▼ │ ▲ │ ▶ │   │   │   │    │
-    ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
-    │    │   │   │   │   │   │BL~│   │   │   │   │   │          │
-    ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-    │    │    │    │                        │    │    │    │    │
-    └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘*/
-  [_L1] = LAYOUT_60_iso( /* Layer 1: Functions */
-    KC_NUBS, KC_BRID, KC_BRIU, _______, _______, BL_DOWN, BL_UP,   KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL ,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______, KC_INS ,
-    _______, _______, _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  ),
-  /* 2: fn 2 */
-  /*┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-    │Pwr│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ Eject │
-    ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-    │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
-    ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
-    │ Caps │   │   │   │   │   │Hom│PgD│PgU│End│   │   │   │    │
-    ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
-    │    │   │   │   │   │   │   │   │   │   │   │   │          │
-    ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-    │    │    │    │                        │    │    │    │    │
-    └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘*/
-  [_L2] = LAYOUT_60_iso( /* Layer 2: Functions */
-    KC_PWR,   KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_EJCT,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_CAPS, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  ),
-};
diff --git a/keyboards/gh60/revc/keymaps/danbee/rules.mk b/keyboards/gh60/revc/keymaps/danbee/rules.mk
deleted file mode 100644
index 0a5b666e855..00000000000
--- a/keyboards/gh60/revc/keymaps/danbee/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/gh60/revc/keymaps/dbroqua/config.h b/keyboards/gh60/revc/keymaps/dbroqua/config.h
deleted file mode 100644
index a65ca08e657..00000000000
--- a/keyboards/gh60/revc/keymaps/dbroqua/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define WS2812_DI_PIN F4
-#define RGBLED_NUM 11
-#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 RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gh60/revc/keymaps/dbroqua/keymap.c b/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
deleted file mode 100644
index 3e4bda26f4d..00000000000
--- a/keyboards/gh60/revc/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _DEFAULT 0
-#define _FN 1
-#define _WASD 2
-#define _SFX 3
-
-//bool esc_led_on;
-
-enum planck_keycodes {
-  DEFAULT = SAFE_RANGE
-};
-
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty gui/alt/space/alt/gui
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
- * |-----------------------------------------------------------------------------------------+
- *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
- *         `-----------------------------------------------------------------'
- */
-  [_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift( /* Basic QWERTY */
-      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_BSLS, 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_BSPC,
-      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_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),
-      ______,  KC_LGUI, KC_LALT,             KC_SPC,             KC_RALT, KC_RGUI, ______,  ______
-      ),
-
-/* FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |  CAPS  |     |     |     |     |     |     |     | Psc | Slck| Paus| Up  |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 | Stop  |       |
- *         `-----------------------------------------------------------------'
- */
-  [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
-      TG(_SFX),KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS,  KC_DEL,
-      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  ______, ______,
-      ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______,
-      ______,  KC_MPRV, KC_MPLY, KC_MNXT, ______, ______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, ______, ______,
-      ______,  ______,  ______,                   TG(_WASD),                   KC_MSTP, ______,  ______,  ______
-      ),
-
-/* WASD Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        |     | Up  |     |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | Left| Down|Right|     |     |     |     |     |     |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |           |     |     |     |     |     |     |     |      |    |     |           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 |       |       |
- *         `-----------------------------------------------------------------'
- */
-  [_WASD] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 2 */
-      ______,   ______,  ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  ______,
-      ______,   ______,  KC_UP,  ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   KC_LEFT, KC_DOWN,KC_RGHT,______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   ______,  ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,
-      ______,   ______,  ______,                ______,                 ______, ______, ______, ______
-      ),
-
-/* SFX Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        | BL- | BL+ | BL  |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | RGBT| RGBM|     |     |     |     |     |     |     |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |      |    |     |           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 |       |       |
- *         `-----------------------------------------------------------------'
- */
-  [_SFX] = LAYOUT_60_ansi_split_bs_rshift(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   RGB_TOG,RGB_MOD,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,______, ______, ______, ______, ______, ______,
-      ______,   ______, ______,                 ______,                 ______, ______, ______, ______
-      )
-};
-
-void matrix_scan_user(void) {
-    layer_state_t layer = layer_state;
-
-    if (layer & (1<<1)) {
-        gh60_fn_led_on();
-    } else {
-        gh60_fn_led_off();
-    }
-
-    if (layer & (1<<2)) {
-        gh60_wasd_leds_on();
-    } else {
-        gh60_wasd_leds_off();
-    }
-
-    if (layer & (1<<3)) {
-        gh60_esc_led_on();
-    } else {
-        gh60_esc_led_off();
-    }
-};
diff --git a/keyboards/gh60/revc/keymaps/dbroqua/rules.mk b/keyboards/gh60/revc/keymaps/dbroqua/rules.mk
deleted file mode 100644
index b56ad10c50d..00000000000
--- a/keyboards/gh60/revc/keymaps/dbroqua/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SLEEP_LED_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c b/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c
deleted file mode 100644
index 639c0ded91f..00000000000
--- a/keyboards/gh60/revc/keymaps/dbroqua_7U/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _DEFAULT 0
-#define _FN 1
-
-enum custom_keycodes {
-    LED_TOGGLE = SAFE_RANGE
-};
-
-int esc_led = 0;
-
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty gui/alt/space/alt/gui
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
- * |-----------------------------------------------------------------------------------------+
- *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
- *         `-----------------------------------------------------------------'
- */
-  [_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift( /* Basic QWERTY */
-      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_BSLS, 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_BSPC,
-      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_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),
-      ______,  KC_LGUI, KC_LALT,             KC_SPC,             ______,  KC_RALT, KC_RGUI, ______
-      ),
-
-/* FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * | Led | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |  CAPS  |     |     |     |     |     |     |     | Psc | Slck| Paus| Up  |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 | Stop  |       |
- *         `-----------------------------------------------------------------'
- */
-  [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
-      LED_TOGGLE,KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS,  KC_DEL,
-      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  ______, ______,
-      ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______,
-      ______,  KC_MPRV, KC_MPLY, KC_MNXT, ______, ______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, ______, ______,
-      ______,  ______,  ______,                   ______,                   ______,  KC_MSTP, ______,  ______
-      )
-};
-
-void esc_led_toggle(void) {
-    if (esc_led == 0){
-        esc_led = 1;
-        gh60_esc_led_on();
-    } else {
-        esc_led = 0;
-        gh60_esc_led_off();
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LED_TOGGLE:
-            if (record->event.pressed) {
-                esc_led_toggle();
-            }
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/gh60/revc/keymaps/dbroqua_7U/rules.mk b/keyboards/gh60/revc/keymaps/dbroqua_7U/rules.mk
deleted file mode 100644
index 9e00b7531a2..00000000000
--- a/keyboards/gh60/revc/keymaps/dbroqua_7U/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SLEEP_LED_ENABLE = yes
diff --git a/keyboards/gh60/revc/keymaps/emiilsd/keymap.c b/keyboards/gh60/revc/keymaps/emiilsd/keymap.c
deleted file mode 100644
index 75e7691c433..00000000000
--- a/keyboards/gh60/revc/keymaps/emiilsd/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2018 Funderburker
- *
- * 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] = {
-  /*
-    ISO HHKB layout:
-
-    * 2u Backspace
-    * ISO Enter
-    * split left Shift
-    * split right Shift
-    * Caps as Control
-    * 1u/1.5u/7u/1.5u//1u bottom row
-  */
-
-  /* 0: QWERTY */
-  [0] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NO,
-    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-    KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(1),    KC_RSFT,
-    KC_NO,   KC_LALT, KC_LGUI,                   KC_SPC,                             KC_NO,   KC_NO,   KC_RALT, KC_CAPS, KC_NO
-  ),
-
-  /* 1: Fn layer */
-  [1] = 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_HOME, KC_END,  KC_UP,   _______, _______,
-    _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
-    _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_DOWN, _______, _______,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
-  ),
-
-};
diff --git a/keyboards/gh60/revc/keymaps/maxr1998/config.h b/keyboards/gh60/revc/keymaps/maxr1998/config.h
deleted file mode 100644
index bc926a289f3..00000000000
--- a/keyboards/gh60/revc/keymaps/maxr1998/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2017 Max Rumpf alias Maxr1998 <max.rumpf1998@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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define WS2812_DI_PIN          F4 // pin the DI on the WS2812B is hooked-up to
-#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          6  // number of LEDs
-#define RGBLIGHT_HUE_STEP   12 // units to step when in/decreasing hue
-#define RGBLIGHT_SAT_STEP   25 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP   12 // units to step when in/decreasing value (brightness)
-
-#endif
diff --git a/keyboards/gh60/revc/keymaps/maxr1998/keymap.c b/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
deleted file mode 100644
index bd1a47d1f19..00000000000
--- a/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright 2017 Max Rumpf alias Maxr1998 <max.rumpf1998@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
-
-#define KC_EURO RALT(KC_5)
-
-#define SWITCH_LANG SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)))
-#define PRINT_UMLAUT(str) SWITCH_LANG;_delay_ms(90);SEND_STRING(str);SWITCH_LANG;
-
-enum custom_keycodes {
-    MCO_AE = SAFE_RANGE,
-    MCO_OE = SAFE_RANGE + 1,
-    MCO_UE = SAFE_RANGE + 2,
-    MCO_SS = SAFE_RANGE + 3,
-    TP_REQ = SAFE_RANGE + 10,
-    TP_ACC = SAFE_RANGE + 11
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: qwertz */
-  LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NO,
-    QK_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HOME, KC_ENT,
-    KC_LSFT, KC_BSLS, KC_Y,    KC_X,    KC_C,    KC_V,    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_NO,   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
-  /* 1: fn */
-  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_TRNS, KC_TRNS, KC_TRNS, KC_EURO, TP_REQ,  TP_ACC,  KC_TRNS, MCO_UE,  KC_TRNS, MCO_OE,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MCO_AE,  MCO_SS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_SW,KC_TRNS, KC_GRV,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch (keycode) {
-      case MCO_AE:
-      PRINT_UMLAUT("'"); // ä
-      return false;
-      case MCO_OE:
-      PRINT_UMLAUT(";"); // ö
-      return false;
-      case MCO_UE:
-      PRINT_UMLAUT("["); // ü
-      return false;
-      case MCO_SS:
-      PRINT_UMLAUT("-"); // ß
-      return false;
-      case TP_REQ:
-      SEND_STRING("/tpa ");
-      return false;
-      case TP_ACC:
-      SEND_STRING("/tpaccept"SS_TAP(X_ENTER));
-      return false;
-    }
-  }
-  return true;
-}
diff --git a/keyboards/gh60/revc/keymaps/maxr1998/rules.mk b/keyboards/gh60/revc/keymaps/maxr1998/rules.mk
deleted file mode 100644
index d64f11e1f04..00000000000
--- a/keyboards/gh60/revc/keymaps/maxr1998/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   comment out to disable the options.
-#
-RGBLIGHT_ENABLE = yes # Enable RGB Underglow
-KEY_LOCK_ENABLE = yes # Enable key lock option
-SKIP_GIT = yes
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
deleted file mode 100644
index cef899ee126..00000000000
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define WS2812_DI_PIN F4
-#define RGBLED_NUM 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
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c b/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
deleted file mode 100644
index 4651af4f52b..00000000000
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _AL 1
-#define _FL 2
-#define _UL 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   /*
-   *  Base layer, pretty standard ANSI layout.
-   * ,-----------------------------------------------------------.
-   * |F(12)| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
-   * |-----------------------------------------------------------|
-   * |Caps/Fn|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space             |Alt |Fn  |Menu|Ctrl|
-   * `-----------------------------------------------------------'
-   */
-  [_BL] = LAYOUT(
-        QK_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_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,
-        LT(2, 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_NO,KC_ENT,
-        KC_LSFT,KC_NO,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_NO,KC_RSFT,
-        KC_LCTL,KC_LGUI,KC_LALT,        KC_SPC,      KC_NO,KC_RALT,MO(2),KC_APP,KC_RCTL),
-
-   /*
-   * Locking arrow keys to WASD for when you need dedicated arrow keys
-   * ,-----------------------------------------------------------.
-   * |    |  |   |   |   |   |   |   |   |   |   |   |   |       |
-   * |-----------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |
-   * |-----------------------------------------------------------|
-   * |       |Left|Down|Rght|   |   |   |   |   |   |   |   |    |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-  [_AL] = LAYOUT(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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,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_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,          KC_TRNS,               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS),
-
-
-   /*
-   * Primary function layer, mostly the same as the traditional Pok3r layout.
-   * ,-------------------------------------------------------------.
-   * |`~ | F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|DEL   |
-   * |-------------------------------------------------------------|
-   * |    |_AL|   |   |  |  |Calc|PgUp|Up|PgDn|Ptscn|Srlck|Pause|  |
-   * |-------------------------------------------------------------|
-   * |      |   |   |   |   |   |Home|Left|Down|Rght|Ins|   |      |
-   * |-------------------------------------------------------------|
-   * |        |_UL|   |   |   |   |   |    |    |    |   |         |
-   * |-------------------------------------------------------------|
-   * |    |    |    |                          |    |    |    |    |
-   * `-------------------------------------------------------------'
-   */
-  [_FL] = LAYOUT(
-        KC_GRAVE,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_DELETE,
-        KC_TRNS,TG(1),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,
-        KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU,KC_TRNS,KC_TRNS,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,TG(3),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_END,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,          KC_TRNS,               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS),
-
-   /*
-   * Locking layer for controlling the underglow.
-   *
-   * ,-----------------------------------------------------------.
-   * |    |  |   |   |   |   |   |   |   |   |   |   |   |       |
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |
-   * |-----------------------------------------------------------|
-   * |       |On|Mode|   |   |   |   |   |   |   |   |   |       |
-   * |-----------------------------------------------------------|
-   * |        |   |Hue+|Hue-|Sat+|Sat-|Val+|Val-|  |  |   |      |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-  [_UL] = LAYOUT(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,RGB_TOG,RGB_MOD,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,          KC_TRNS,               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS),
-};
-
-void matrix_scan_user(void) {
-
-// Layer LED indicators
-// ESC led on when in function layer, WASD cluster leds enabled when on arrow cluster
-    layer_state_t layer = layer_state;
-    if (layer & (1<<1)) {
-        gh60_wasd_leds_on();
-    } else {
-        gh60_wasd_leds_off();
-    }
-
-    if (layer & (1<<2)) {
-        gh60_esc_led_on();
-    } else {
-        gh60_esc_led_off();
-    }
-};
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/readme.md b/keyboards/gh60/revc/keymaps/robotmaxtron/readme.md
deleted file mode 100644
index 8db7b3f65b4..00000000000
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-robotmaxtron's GH60 Layout
-=====================
-
-##Quantum MK Firmware
-For the full Quantum feature list, see the parent readme.md.
-
-* Standard ANSI layout with Pok3r styled function layers
-* ESC key led enables when on function layer
-* Lockable layer with arrow keys on WASD with backlighting to indicate locked on arrow layer
-* Neopixel/WS2812 RGB Underglow Support
-
-## Reference Images
-![Wiring Refererence](https://i.imgur.com/BkJ39JD.jpg)
-
-### Additional Credits
-Keymap has been based on various keymaps available from the QMK Repo for the GH60-SATAN and KC60 keyboards.
diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/rules.mk b/keyboards/gh60/revc/keymaps/robotmaxtron/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/gh60/revc/keymaps/robotmaxtron/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/gh60/revc/keymaps/sethbc/keymap.c b/keyboards/gh60/revc/keymaps/sethbc/keymap.c
deleted file mode 100644
index 7d511001601..00000000000
--- a/keyboards/gh60/revc/keymaps/sethbc/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: qwerty */
-  LAYOUT_60_ansi_split_bs_rshift(
-        QK_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_BSLS,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_BSPC,
-        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_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_LALT,KC_LGUI,      KC_SPC,            KC_RGUI,KC_RALT,KC_APP,KC_RCTL),
-    /* 1: 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_TRNS,KC_TRNS,
-        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_UP,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT,KC_PENT,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PPLS,KC_PMNS,KC_END,KC_PGDN,KC_DOWN,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,      KC_TRNS,           KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS),
-};
diff --git a/keyboards/gh60/satan/keymaps/abhixec/keymap.c b/keyboards/gh60/satan/keymaps/abhixec/keymap.c
deleted file mode 100644
index f599d2f6dbb..00000000000
--- a/keyboards/gh60/satan/keymaps/abhixec/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-// Each layer gets a name for readability, which is then used in the keymap matix 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 _BL 0
-#define _FL 2
-#define _CL 1
-#define _EL 3
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift| Del|
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
-   * `-----------------------------------------------------------'
-   */
-[_BL] = LAYOUT_60_ansi_split_rshift(
-  QK_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_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,
-  LT(_EL, KC_BSPC), 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_DEL,
-  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                                 KC_RALT,KC_RGUI, MO(_FL),KC_RCTL),
-
-/* Keymap _CL: (Colemak Layer) 
- */
-[_CL] = LAYOUT_60_ansi_split_rshift(
-  QK_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_TAB,  KC_Q,   KC_W,   KC_F,   KC_P,   KC_G,   KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,   KC_LBRC, KC_RBRC,KC_BSLS,
-  LT(_EL, KC_BSPC), KC_A,   KC_R,   KC_S,   KC_T,   KC_D,   KC_H,   KC_N,   KC_E,   KC_I,   KC_O,KC_QUOT,         KC_ENT,
-  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_LALT,KC_LGUI,                KC_SPC,                                 KC_RALT,KC_RGUI, MO(_FL),KC_RCTL),
-
-[_EL] = LAYOUT_60_ansi_split_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_LCTL,KC_WH_U,_______,_______,KC_MS_U,KC_PGUP,KC_HOME,KC_UP,KC_END,KC_DEL, QK_GESC, _______,_______,
-  _______,KC_LALT,KC_WH_D, KC_LSFT,_______,KC_MS_D,KC_PGDN,KC_LEFT,KC_DOWN,KC_RIGHT, KC_BSPC,_______,_______,
-_______,KC_UNDO,KC_CUT,KC_COPY,KC_PASTE, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2,KC_MS_LEFT,KC_MS_RIGHT,_______,_______, _______,
-  _______,_______,_______,                _______,                        _______,_______,_______,_______),
-
- 
-  /* Keymap _FL: Function Layer
-   * ,-----------------------------------------------------------.
-   * | KC_GRV|F1|F2|F3|F4|F5|F6|F7| F8 | F9  |10|F11|F12|        |
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
-   * |-----------------------------------------------------------|
-   * |      |   |   |   |   |   |   |       |   |HOME|   |       |
-   * |-----------------------------------------------------------|
-   * |        |   |  |   |   |   |V_DWN|V_UP|MUTE | END || |_CL  |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-
-[_FL] = LAYOUT_60_ansi_split_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_PSCR, BL_DOWN,BL_UP, BL_TOGG,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,_______,_______,
-  _______,_______,_______,_______,_______,_______,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_AUDIO_MUTE,KC_END,_______,_______, TG(_CL),
-  _______,_______,_______,                _______,                        _______,_______,_______,_______)
-  
-};
-
diff --git a/keyboards/gh60/satan/keymaps/abhixec/readme.md b/keyboards/gh60/satan/keymaps/abhixec/readme.md
deleted file mode 100644
index 59a95b7fcf5..00000000000
--- a/keyboards/gh60/satan/keymaps/abhixec/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# default Satan GH60 layout
-
-The layout for this keyboard is:
-![Layout-2](https://i.imgur.com/Eqp8hov.jpg)
-
-Currently there are 3 layers:
-
-1. Base Layer is qwerty
-2. 1st layer is colemak
-3. 2nd layer is function layer 
-4. 3rd layer is extend layer
-
-How to use the layers:
-1. Base is default. If you want Colemak then press function key and del next to the right shift (this combination will be used to toggle the layer on and off)
-2. Function layer is accessible by holding down the function key.
-3. Extend layer is accsessible by holding down the capslock.
-   Which when tapped acts like backspace when held triggers the Extend layer capability.
-   
-
diff --git a/keyboards/gh60/satan/keymaps/abhixec/rules.mk b/keyboards/gh60/satan/keymaps/abhixec/rules.mk
deleted file mode 100644
index 4cd8e19f370..00000000000
--- a/keyboards/gh60/satan/keymaps/abhixec/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c b/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
deleted file mode 100644
index 91f37bf4166..00000000000
--- a/keyboards/gh60/satan/keymaps/addcninblue/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "rgblight.h"
-
-#define _DEFAULT 0
-#define _FN 1
-#define _VIM 10
-#define _VIM_SHIFT 11
-#define _VIM_CONTROL 12
-
-enum custom_keycodes {
-  DYNAMIC_MACRO_RANGE = SAFE_RANGE,
-  a_MACRO,
-  A_MACRO,
-  I_MACRO,
-  O_MACRO,
-};
-
-#define KC_PREV_WORD LCTL(KC_LEFT)
-#define KC_NEXT_WORD LCTL(KC_RIGHT)
-#define KC_UNDO LCTL(KC_Z)
-#define KC_CUT LCTL(KC_X)
-#define KC_COPY LCTL(KC_C)
-#define KC_PASTE LCTL(KC_V)
-
-#include "dynamic_macro.h"
-
-static uint8_t old_layer = 0;
-
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-#define XXXXXX KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty gui/alt/space/alt/gui
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | VIM |
- * |-----------------------------------------------------------------------------------------+
- *         | FN  | LAlt  |               Space                | RAlt   |RGUI |
- *         `-----------------------------------------------------------------'
- */
-  [_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift( /* Basic QWERTY */
-      QK_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_BSLS , 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_BSPC ,
-      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_LSFT , KC_Z    , KC_X    , KC_C   , KC_V    , KC_B    , KC_N   , KC_M     , KC_COMM , KC_DOT , KC_SLSH , KC_RSFT , TO(_VIM) ,
-      ______  , MO(_FN) , KC_LALT , KC_SPC , KC_RALT , KC_RGUI , ______ , ______
-      ),
-
-/* FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * |GRAVE| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |  CAPS  | Vol-| Mute| Vol+|MAC+ |MAC  |MAC- | PgUp| Home|     |Print| Up  |     | Del    |
- * |-----------------------------------------------------------------------------------------+
- * |  Ctrl   | End |     | PgDn|     |     | Left| Down| Up  |Right| Left|Right|    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * |  Shift    | Prev| Play| Next| BL- | BL  | BL+ |     |     |     | Down| RShift    | DEF |
- * |-----------------------------------------------------------------------------------------+
- *         |       | LAlt  |             Space               | RAlt  | Reset |
- *         `-----------------------------------------------------------------'
- */
-  [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 2 */
-      KC_GRAVE , KC_F1   , KC_F2   , KC_F3   , KC_F4          , KC_F5           , KC_F6        , KC_F7    , KC_F8   , KC_F9    , KC_F10  , KC_F11  , KC_F12       , KC_INS , KC_DEL ,
-      KC_CAPS  , KC_VOLD , KC_MUTE , KC_VOLU , DM_REC1        , DM_PLY1         , DM_RSTP      , KC_PGUP  , KC_HOME , ______   , KC_PSCR , KC_UP   , ______       , KC_DEL ,
-      KC_LCTL  , KC_END  , ______  , KC_PGDN , ______         , ______          , KC_LEFT      , KC_DOWN  , KC_UP   , KC_RIGHT , KC_LEFT , KC_RGHT , KC_ENT       ,
-      KC_LSFT  , KC_MPRV , KC_MPLY , KC_MNXT , BL_DOWN        , BL_TOGG         , BL_UP        , ______   , ______  , ______   , KC_DOWN , KC_RSFT , TO(_DEFAULT) ,
-      ______   , ______  , KC_LALT , KC_SPC  , KC_RALT        , QK_BOOT           , ______       , ______
-      ),
-
-/* VIM Layer
- * ,-----------------------------------------------------------------------------------------.
- * | DEF |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * |        |     | WORD| WORD|     |     | COPY| UNDO| DEF |ENTER|PASTE|     |     | Del    |
- * |-----------------------------------------------------------------------------------------+
- * | V_Ctrl  |a_ins|     |     |     |     | Left| Down| Up  |Right|     |     |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * |  V_Shift  |     |     |     |     | PREV|     |     |     |     |     | RShift    | Def |
- * |-----------------------------------------------------------------------------------------+
- *         |       | LAlt  |             Space               | RAlt  |       |
- *         `-----------------------------------------------------------------'
- */
-  [_VIM] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 10 */
-      TO(_DEFAULT)     , 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_BSLS , KC_GRV ,
-      XXXXXX           , XXXXXX  , KC_NEXT_WORD , KC_NEXT_WORD , XXXXXX  , XXXXXX       , KC_COPY , KC_UNDO  , TO(_DEFAULT) , KC_ENTER , KC_PASTE , XXXXXX  , XXXXXX       , KC_DEL  ,
-      MO(_VIM_CONTROL) , a_MACRO , XXXXXX       , XXXXXX       , XXXXXX  , XXXXXX       , KC_LEFT , KC_DOWN  , KC_UP        , KC_RIGHT , XXXXXX   , XXXXXX  , KC_ENTER     ,
-      MO(_VIM_SHIFT)   , XXXXXX  , XXXXXX       , XXXXXX       , XXXXXX  , KC_PREV_WORD , XXXXXX  , XXXXXX   , XXXXXX       , XXXXXX   , XXXXXX   , KC_RSFT , TO(_DEFAULT) ,
-      XXXXXX           , XXXXXX  , KC_LALT      , KC_SPC       , KC_RALT , XXXXXX       , XXXXXX  , XXXXXX
-      ),
-
-/* VIM Layer
- * ,-----------------------------------------------------------------------------------------.
- * | DEF |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * |        |     | WORD| WORD|     |     |     |     |I_ins|ENTER|     |     |     | Del    |
- * |-----------------------------------------------------------------------------------------+
- * |         |A_ins|     |     |     |     | Left| Down| Up  |Right|     |     |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * |           |     |     |     |     | PREV|     |     |     |     |     | RShift    | Def |
- * |-----------------------------------------------------------------------------------------+
- *         |       | LAlt  |             Space               | RAlt  |       |
- *         `-----------------------------------------------------------------'
- */
-  [_VIM_SHIFT] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 11 */
-      TO(_DEFAULT) , 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_BSLS , KC_GRV ,
-      XXXXXX       , XXXXXX  , KC_NEXT_WORD , KC_NEXT_WORD , XXXXXX  , XXXXXX       , XXXXXX  , XXXXXX   , I_MACRO , O_MACRO  , XXXXXX , XXXXXX  , XXXXXX       , KC_DEL  ,
-      XXXXXX       , A_MACRO , XXXXXX       , KC_PGDN      , XXXXXX  , XXXXXX       , KC_LEFT , KC_DOWN  , KC_UP   , KC_RIGHT , XXXXXX , XXXXXX  , KC_ENTER     ,
-      XXXXXX       , XXXXXX  , XXXXXX       , XXXXXX       , XXXXXX  , KC_PREV_WORD , XXXXXX  , XXXXXX   , XXXXXX  , XXXXXX   , XXXXXX , KC_RSFT , TO(_DEFAULT) ,
-      XXXXXX       , XXXXXX  , KC_LALT      , KC_SPC       , KC_RALT , QK_BOOT        , XXXXXX  , XXXXXX
-      ),
-
-/* FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |        | Vol-| Mute| Vol+|     |     |     | PgUp| Ins |     |Print| Up  |     | Del    |
- * |-----------------------------------------------------------------------------------------+
- * |  Ctrl   | App |     | PgDn|     |     | Left| Down| Up  |Right| Left|Right|    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * |  Shift    | Prev| Play| Next| BL- | BL  | BL+ |     |     |     | Down| RShift    | Def |
- * |-----------------------------------------------------------------------------------------+
- *         |       | LAlt  |             Space               | RAlt  | Reset |
- *         `-----------------------------------------------------------------'
- */
-  [_VIM_CONTROL] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 12 */
-      TO(_DEFAULT) , 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_BSLS , KC_GRV ,
-      XXXXXX       , XXXXXX  , KC_NEXT_WORD , KC_NEXT_WORD , XXXXXX  , XXXXXX       , XXXXXX  , XXXXXX   , I_MACRO , O_MACRO  , XXXXXX , XXXXXX  , XXXXXX       , KC_DEL  ,
-      XXXXXX       , A_MACRO , XXXXXX       , KC_PGDN      , XXXXXX  , XXXXXX       , KC_LEFT , KC_DOWN  , KC_UP   , KC_RIGHT , XXXXXX , XXXXXX  , KC_ENTER     ,
-      XXXXXX       , XXXXXX  , XXXXXX       , XXXXXX       , XXXXXX  , KC_PREV_WORD , XXXXXX  , XXXXXX   , XXXXXX  , XXXXXX   , XXXXXX , KC_RSFT , TO(_DEFAULT) ,
-      XXXXXX       , XXXXXX  , KC_LALT      , KC_SPC       , KC_RALT , QK_BOOT        , XXXXXX  , XXXXXX
-      )            ,
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    if (record->event.pressed) {
-        switch(keycode) {
-            case a_MACRO:
-                SEND_STRING(SS_TAP(X_RIGHT));
-                layer_off(_VIM);
-                return false;
-                break;
-            case A_MACRO:
-                SEND_STRING(SS_TAP(X_END));
-                layer_off(_VIM_SHIFT);
-                layer_off(_VIM);
-                return false;
-                break;
-            case I_MACRO:
-                SEND_STRING(SS_TAP(X_HOME));
-                layer_off(_VIM_SHIFT);
-                layer_off(_VIM);
-                return false;
-                break;
-            case O_MACRO:
-                SEND_STRING(SS_TAP(X_ENTER));
-                layer_off(_VIM_SHIFT);
-                layer_off(_VIM);
-                return false;
-                break;
-        }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-  uint8_t layer = get_highest_layer(layer_state);
-
-  if (old_layer != layer) {
-    switch (layer) {
-      case _DEFAULT:
-      case _FN:
-        backlight_set(1);
-      break;
-      case _VIM:
-      case _VIM_SHIFT:
-      case _VIM_CONTROL:
-        backlight_set(4);
-      break;
-    }
-    old_layer = layer;
-  }
-};
diff --git a/keyboards/gh60/satan/keymaps/addcninblue/readme.md b/keyboards/gh60/satan/keymaps/addcninblue/readme.md
deleted file mode 100644
index 7e652053455..00000000000
--- a/keyboards/gh60/satan/keymaps/addcninblue/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Addcninblue's HHKB-ish Layout
-
-Inspired by Dbroqua's layout
-
-[Layer 1](http://www.keyboard-layout-editor.com/#/gists/0e7798cb81c8f76baa5066ec1c34df8e): pretty standard layout. Shift + esc = ~, unlike normal hhkb.
-[Layer 2](http://www.keyboard-layout-editor.com/#/gists/096099221ac48d4d0c84a2b859bbb7c0): Vim-like layout.
-[Layer Vim](http://www.keyboard-layout-editor.com/#/gists/73b27b51c5e18d7999cc5fa39b4f3389) : vim layout until exit layout
-
-## Programming Instructions:
-Enter into programming mode and run the following command:
-```
-$ sudo make satan:addcninblue:dfu
-```
diff --git a/keyboards/gh60/satan/keymaps/addcninblue/rules.mk b/keyboards/gh60/satan/keymaps/addcninblue/rules.mk
deleted file mode 100644
index fe07e497f9c..00000000000
--- a/keyboards/gh60/satan/keymaps/addcninblue/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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
-SLEEP_LED_ENABLE = no      # Enables your LED to breathe while your computer is sleeping.
-NKRO_ENABLE = yes          # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ # nkro-doesnt-work
-BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
-MIDI_ENABLE = no           # MIDI controls
-AUDIO_ENABLE = no          # Audio output on port C6
-UNICODEMAP_ENABLE = no
-UNICODE_ENABLE = no        # Unicode
-UCIS_ENABLE = no           # Keep in mind that not all will work (See WinCompose for details on Windows).
-BLUETOOTH_ENABLE = no      # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no      # Breathing sleep LED during USB suspend
diff --git a/keyboards/gh60/satan/keymaps/ben_iso/config.h b/keyboards/gh60/satan/keymaps/ben_iso/config.h
deleted file mode 100644
index 34add127271..00000000000
--- a/keyboards/gh60/satan/keymaps/ben_iso/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-/*MOUSE CONFIG OPTIONS */
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    45
-#define MOUSEKEY_MAX_SPEED      3
-#define MOUSEKEY_WHEEL_DELAY 	0
diff --git a/keyboards/gh60/satan/keymaps/ben_iso/keymap.c b/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
deleted file mode 100644
index 5a61a854e75..00000000000
--- a/keyboards/gh60/satan/keymaps/ben_iso/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-#define BASE    0    // Default layer
-#define SPACE   1    // Space layer
-#define NUMPAD  2    // Alt layer
-#define CAPS    3    // Caps layer
-#define FN1     4    // Generic function layer
-
-#define MAC0 M(0) //
-#define MAC1 M(1) //
-#define MAC2 M(2) //
-#define MAC3 M(3) //
-#define MAC4 M(4) //
-#define MAC5 M(5) //
-#define MAC6 M(6) //
-#define MAC7 M(7) //
-#define MAC8 M(8) //
-#define MAC9 M(9) //
-#define GRAV KC_GRV //
-#define MEDI F(FNO1)//
-
-// General shortenings
-#define ESCA KC_ESC
-#define MINS KC_MINS
-#define EQUL KC_EQL
-#define BSPC KC_BSPC
-#define DELE KC_DEL
-#define LBRC KC_LBRC
-#define RBRC KC_RBRC
-#define ALTR KC_RALT
-#define SCLN KC_SCLN
-#define QUOT KC_QUOT
-#define NUHS KC_NUHS
-#define ENTE KC_ENT
-#define NUBS KC_NUBS  // Less/ greater sign
-#define COMM KC_COMM  // Comma
-#define FSTO KC_DOT   // Full stop
-#define SLSH KC_SLSH
-#define ALTL KC_LALT
-#define GUIL KC_LGUI
-#define GUIR KC_RGUI
-#define MENO KC_MENU
-
-// Special Actions and Media Keys
-#define INSE KC_INS   // Insert here
-#define HOME KC_HOME  // Go to beginning of line
-#define ENDI  KC_END  // go to end of line
-#define PSCR  KC_PSCR   // Print Screen
-#define SLCK  KC_SCRL   // go to end of line
-#define PGDN  KC_PGDN   // go to end of line
-#define PGUP  KC_PGUP   // go to end of line
-#define PLPS KC_MPLY  // Play/Pause
-#define PAUS KC_PAUS  // Pause button
-#define MUTE KC_MUTE  // Mute sound
-#define VOLU KC_VOLU  // Volume increase
-#define VOLD KC_VOLD  // Volume decrease
-#define MNXT KC_MNXT  // next track
-#define MPRV KC_MPRV  // prev track
-#define MSTP KC_MSTP  // stop playing
-#define MSEL KC_MSEL  // Select media (Start playing it)
-#define MAIL KC_MAIL  // Open default mail app
-#define CALC KC_CALC  // Open default calculator app
-#define MYCM KC_MYCM  // Open default file manager
-
-// increase readability
-#define XXXXX    KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Keymap BASE: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  R  |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| # | R |
-   * |-----------------------------------------------------------|
-   * |Shft| \ |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
-   * `-----------------------------------------------------------|
-   */
-
-  [BASE] = LAYOUT_60_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_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,
-    OSL(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,
-    SC_LSPO,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,              KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC,
-    KC_LCTL,   KC_LGUI, KC_LALT,                   LT(SPACE, KC_SPC),                                     KC_RALT, OSL(FN1), TG(NUMPAD), KC_RCTL
-  ),
-
-  [SPACE] = LAYOUT_60_iso(
-    KC_GRAVE, 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,
-    _______,  _______, _______, _______, MAIL,    _______, _______,     HOME,    KC_UP,   PSCR,     SLCK,    PAUS,    PGUP,
-    _______,  _______, _______, PGUP,    PGDN,    _______, LALT(KC_F4), KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______,
-    _______,  _______, _______, _______, CALC,    _______, _______,     _______, MUTE,    VOLD,     VOLU,    _______, _______,
-    _______,  _______, _______,                   _______,                                          _______, _______, _______, _______
-  ),
-
-  [NUMPAD] = LAYOUT_60_iso( //Numpad and alt shortcuts
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_1,    KC_2,    KC_3,    _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_4,    KC_5,    KC_6,    _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,    KC_0,    _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  ),
-
-  [CAPS] = LAYOUT_60_iso( //Mostly mouse layer with option for caps too
-    _______, _______, _______,      _______,      _______,      _______,    _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______,    _______, _______, KC_MS_U, _______, _______, _______, _______,
-    _______, KC_CAPS, _______,      _______,      KC_MS_BTN1,   KC_MS_BTN2, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______,
-    _______, _______, _______,      _______,      _______,      _______,    _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                                  _______,                                        _______, _______, _______, _______
-  ),
-
-  [FN1] = LAYOUT_60_iso( //Functions/settings
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  ),
-
-};
-
-
diff --git a/keyboards/gh60/satan/keymaps/ben_iso/readme.md b/keyboards/gh60/satan/keymaps/ben_iso/readme.md
deleted file mode 100644
index 74b7680b2f1..00000000000
--- a/keyboards/gh60/satan/keymaps/ben_iso/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# UK ISO layout for the Satan GH60 
-## By Ben James
------
-This layout has a few unique features including:
-* Spacebar activates special features when held:
-  * Arrow keys directly under right hand
-  * Volume control
-  * Fn keys on number row
-  * PageUp/PageDn/Home/other general buttons
-* Mouse control when CAPS is held. Right hand controls mouse direction, left hand controls speed and mouse buttons.
-* Space cadet style brackets when left/right shift are tapped
-
diff --git a/keyboards/gh60/satan/keymaps/ben_iso/rules.mk b/keyboards/gh60/satan/keymaps/ben_iso/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/gh60/satan/keymaps/ben_iso/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/gh60/satan/keymaps/bri/keymap.c b/keyboards/gh60/satan/keymaps/bri/keymap.c
deleted file mode 100644
index c7068595b20..00000000000
--- a/keyboards/gh60/satan/keymaps/bri/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-#define _BL 0
-#define _FL 1
-#define _NAV 2
-
-#define ALEFT  LALT(KC_LEFT)
-#define ARGHT  LALT(KC_RGHT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
-   * `-----------------------------------------------------------'
-   */
-[_BL] = LAYOUT_60_ansi(
-  QK_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_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,
-  MO(2),   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_LALT,KC_LGUI,                KC_SPC,                                 KC_RGUI,KC_RALT, KC_RCTL, MO(_FL) ),
-
-  /* Keymap _FL: Function Layer
-   * ,-----------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
-   * |-----------------------------------------------------------|
-   * |      |   |   |   |   |   |   |       |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |        | F1|F2 | F3|F4 | F5| F6| F7| F8|   |   |          |
-   * |-----------------------------------------------------------|
-   * |QK_BOOT|    |    |                       |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-[_FL] = LAYOUT_60_ansi(
-  #ifdef RGBLIGHT_ENABLE
-  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,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN,BL_UP,  BL_TOGG,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
-  _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______,
-  QK_BOOT,_______,_______,                 _______,                       _______,_______,_______, _______
-  #else
-  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,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN,BL_UP, BL_TOGG,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  QK_BOOT,_______,_______,                _______,                        _______,_______,_______,_______
-  #endif
-  ),
-    
-[_NAV] = LAYOUT_60_ansi(
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,ALEFT  , KC_UP ,ARGHT  ,_______,_______,_______,_______,
-    _______,_______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,        _______,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-    _______,_______,_______,              _______,                        _______,_______,_______,_______),
-    
-};
diff --git a/keyboards/gh60/satan/keymaps/bri/readme.md b/keyboards/gh60/satan/keymaps/bri/readme.md
deleted file mode 100644
index bed305997d5..00000000000
--- a/keyboards/gh60/satan/keymaps/bri/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-#QWERTY keymap for Satan GH60 with layers for arrow keys, function keys, and backlight controls.
-#The layout of modifiers is intended to mimic the MacBook Air keyboard.
\ No newline at end of file
diff --git a/keyboards/gh60/satan/keymaps/chaser/keymap.c b/keyboards/gh60/satan/keymaps/chaser/keymap.c
deleted file mode 100644
index 15251e99c90..00000000000
--- a/keyboards/gh60/satan/keymaps/chaser/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Up  |FN |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space           |Alt |Left |Down|Right|
-   * `-----------------------------------------------------------'
-   */
-[_BL] = LAYOUT_all(
-    QK_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_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_UP  ,MO(_FL)    ,
-    KC_LCTL     ,KC_LGUI,KC_LALT,                        KC_SPC                 ,KC_RALT,KC_LEFT,KC_DOWN,KC_RIGHT),
-  /* Keymap _FL: Function Layer
-   * ,-----------------------------------------------------------.
-   * |GRV|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   DEL |
-   * |-----------------------------------------------------------|
-   * |  MB3|MB2|MUP|MB1|MWU|   |   |   |INS|   |RST|   |   |Print|
-   * |-----------------------------------------------------------|
-   * |      | ML|MDN|MR |MWD|   |   |       |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |PGUP|     |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |Ctrl|HOME|PGD |END |
-   * `-----------------------------------------------------------'
-   */
-[_FL] = 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_DEL     ,_______,
-    KC_MS_BTN3  ,KC_MS_BTN2 ,KC_MS_UP   ,KC_MS_BTN1 ,KC_MS_WH_UP  ,_______,_______,_______,KC_INS ,_______,QK_BOOT,_______,_______    ,KC_PSCR    ,
-    _______     ,KC_MS_LEFT ,KC_MS_DOWN ,KC_MS_RIGHT,KC_MS_WH_DOWN,_______,_______,_______,_______,_______,_______,_______,_______    ,_______    ,
-    _______     ,_______    ,_______    ,_______    ,_______      ,_______,_______,_______,_______,_______,_______,_______,KC_PGUP    ,_______    ,
-    KC_LCTL     ,_______    ,KC_LALT    ,                                  _______,                        KC_RCTL,KC_HOME,KC_PGDN    ,KC_END ),
-};
diff --git a/keyboards/gh60/satan/keymaps/chaser/readme.md b/keyboards/gh60/satan/keymaps/chaser/readme.md
deleted file mode 100644
index c6e70b18866..00000000000
--- a/keyboards/gh60/satan/keymaps/chaser/readme.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# [dragonchasers](https://github.com/dragonchaser) Satan GH60 layout
-
-Layout derived from the default Satan GH60 keymap.
-
-![Photo of the keyboard](https://pbs.twimg.com/media/DQzlD0yX0AA8spX.jpg)
-
-## Layers
-
-### Base
-```
-,-----------------------------------------------------------.
-|Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-|-----------------------------------------------------------|
-|Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-|-----------------------------------------------------------|
-|CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-|-----------------------------------------------------------|
-|Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Up  |FN |
-|-----------------------------------------------------------|
-|Ctrl|Gui |Alt |      Space           |Alt |Left |Down|Right|
-`-----------------------------------------------------------'
-```
-
-### Function Layer
-
-```
-,-----------------------------------------------------------.
-|GRV|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   DEL |
-|-----------------------------------------------------------|
-|  MB3|MB2|MUP|MB1|MWU|   |   |   |INS|   |RST|   |   |Print|
-|-----------------------------------------------------------|
-|      | ML|MDN|MR |MWD|   |   |       |   |   |   |        |
-|-----------------------------------------------------------|
-|        |   |   |   |   |   |   |   |   |   |   |PGUP|     |
-|-----------------------------------------------------------|
-|    |    |    |                        |Ctrl|HOME|PGD |END |
-`-----------------------------------------------------------'
-```
diff --git a/keyboards/gh60/satan/keymaps/chaser/rules.mk b/keyboards/gh60/satan/keymaps/chaser/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/gh60/satan/keymaps/chaser/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/gh60/satan/keymaps/dbroqua/keymap.c b/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
deleted file mode 100644
index 296e5505f4f..00000000000
--- a/keyboards/gh60/satan/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "rgblight.h"
-
-#define _DEFAULT 0
-#define _FN 1
-#define _SFX 2
-
-enum planck_keycodes {
-  DEFAULT = SAFE_RANGE
-};
-
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty gui/alt/space/alt/gui
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
- * |-----------------------------------------------------------------------------------------+
- *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
- *         `-----------------------------------------------------------------'
- */
-  [_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift( /* Basic QWERTY */
-      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_BSLS,    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_BSPC,
-      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_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,    MO(_FN),
-      ______,   KC_LGUI,KC_LALT,                KC_SPC,                          KC_RALT,KC_RGUI,    ______,     ______
-      ),
-
-/* FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |  CAPS  | BL- | BL+ | BL  |     |     |     |     | Psc | Slck| Paus| Up  |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 | Stop  |       |
- *         `-----------------------------------------------------------------'
- */
-  [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
-      TG(_SFX), KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,  KC_DEL,
-      KC_CAPS,  ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   ______, ______,
-      ______,   KC_VOLD,KC_VOLU,KC_MUTE,______, ______, KC_PAST,KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______,
-      ______,   KC_MPRV,KC_MPLY,KC_MNXT,______, ______, KC_PPLS,KC_PMNS,KC_END,  KC_PGDN, KC_DOWN, ______,  ______,
-      ______,   ______, ______,                 ______,                 KC_MSTP, ______,  ______,  ______
-      ),
-
-/* SFX Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |QK_BOOT|
- * |-----------------------------------------------------------------------------------------+
- * |        | BL- | BL+ | BL  |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | RGBT| RGBM|     |     |     |     |     |     |     |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |      |    |     |           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 |       |       |
- *         `-----------------------------------------------------------------'
- */
-  [_SFX] = LAYOUT_60_ansi_split_bs_rshift(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  QK_BOOT,
-      ______,   BL_DOWN,BL_UP,  BL_TOGG,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   RGB_TOG,RGB_MOD,______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,______, ______, ______, ______, ______, ______,
-      ______,   ______, ______,                 ______,                 ______, ______, ______, ______
-      )
-};
diff --git a/keyboards/gh60/satan/keymaps/dbroqua/readme.md b/keyboards/gh60/satan/keymaps/dbroqua/readme.md
deleted file mode 100644
index 39e71beedd0..00000000000
--- a/keyboards/gh60/satan/keymaps/dbroqua/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Dbroqua HHKB like Layout
-
-Like the HHKB but with a Satan GH60 PCB :D.
-
-# Programming Instructions:
-Enter into programming mode and run the following command.
-```
-$ sudo KEYMAP=dbroqua_hhkb make dfu
-```
\ No newline at end of file
diff --git a/keyboards/gh60/satan/keymaps/dende_iso/keymap.c b/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
deleted file mode 100644
index 94c8a22392c..00000000000
--- a/keyboards/gh60/satan/keymaps/dende_iso/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#include "keymap_extras/keymap_german.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.
-#define _DEF 0
-#define _FNK 1
-#define _MEDIA 2
-
-// dual-role shortcuts
-#define FN_CAPS   LT(_MEDIA, KC_CAPS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _DEF: Default Layer
-  * ,------------------------------------------------------------.
-  * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  ß| ´|bcksp|fn1|
-  * |------------------------------------------------------------|
-  * |Tab  |  Q|  W|  E|  R|  T|  Z|  U|  I|  O|  P|  Ü|  +|      |
-  * |----------------------------------------------------- Return|
-  * |fn2   | A|  S|  D|  F|  G|  H|  J|  K|  L|  Ö|  Ä|  # |     |
-  * |------------------------------------------------------------|
-  * |Sft | < |  Y|  X|  C|  V|  B|  N|  M|  ,|  .|  -| RSft| del |
-  * |------------------------------------------------------------|
-  * |Ctrl|Win |Alt |         Space          |RAlt |Win |App|RCtrl|
-  * `------------------------------------------------------------'
-  */
-[_DEF] = LAYOUT_60_iso_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,    DE_SS,   DE_ACUT, KC_BSPC, MO(_FNK),
-  KC_TAB,       KC_Q,    KC_W,    KC_E, KC_R, KC_T, DE_Z, KC_U, KC_I, KC_O,    KC_P,    DE_UDIA, DE_PLUS,
-  FN_CAPS,      KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    DE_ODIA, DE_ADIA, DE_HASH, KC_ENT,
-  KC_LSFT,      DE_LABK, DE_Y,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  DE_MINS, KC_RSFT, KC_DELETE,
-  KC_LCTL,      KC_LGUI, KC_LALT,              KC_SPACE,                       KC_ALGR, KC_RGUI, KC_APP,  KC_RCTL),
-
-
-  /* Keymap _FNK: Function Keys
-  * ,------------------------------------------------------------.
-  * | ^ | F1| F2| F3| F4| F5| F6| F7| F8| F9| F0|F11|F12| Ins |  |
-  * |------------------------------------------------------------|
-  * |     |PGU| Up|PGD|   |   |   |Ins|Hom|PDU|   |   |   |      |
-  * |-----------------------------------------------------       |
-  * |     |Lft|Dwn|Rgt|   |   |   |Del|End|PGD|   |   |    |     |
-  * |------------------------------------------------------------|
-  * |    |   |   |   |   |   |   |   |   |   |   |   |     |     |
-  * |------------------------------------------------------------|
-  * |    |    |    |                        |     |    |   |     |
-  * `------------------------------------------------------------'
-  */
-[_FNK] = LAYOUT_60_iso_split_bs_rshift(
-  DE_CIRC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS, _______,
-  _______, KC_PGUP, KC_UP,  KC_PGDN,   _______, _______, _______, _______,  KC_INS, KC_HOME, KC_PGUP, _______, _______,
-  _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN,   _______, _______, _______,
-  _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______,                             _______,                             _______, _______, _______, _______),
-
-  /* Keymap _MEDIA: Media and Mouse Layer
-  * ,------------------------------------------------------------.
-  * |   |   |   |   |   |   |   |   |   |   |   |   |   |     |  |
-  * |------------------------------------------------------------|
-  * |     |   |   |   |   |   |   |MLC| MU|MRC|   |   |   |      |
-  * |-----------------------------------------------------       |
-  * |     |PRV|VLD|VLU|NXT|   |   | ML| MD| MR|   |   |    |     |
-  * |------------------------------------------------------------|
-  * |    |   |   |   |   |   |   |   |   |   |   |   | UP  |     |
-  * |------------------------------------------------------------|
-  * |    |    |    |        PLAY            |     |LEFT|DWN|RIGHT|
-  * `------------------------------------------------------------'
-  */
-
-[_MEDIA] = LAYOUT_60_iso_split_bs_rshift(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______,
-  _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______,
-  _______, _______, _______,                            KC_MPLY,                            _______, KC_LEFT, KC_DOWN, KC_RIGHT),
-  };
diff --git a/keyboards/gh60/satan/keymaps/dende_iso/readme.md b/keyboards/gh60/satan/keymaps/dende_iso/readme.md
deleted file mode 100644
index 238a2f725f0..00000000000
--- a/keyboards/gh60/satan/keymaps/dende_iso/readme.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Satan GH60 ISO-DE Layout with split backspace and right shift
-
-![Layout Image](https://i.imgur.com/a7znS69.jpg)
-
-## Default Layer
-This ISO-DE based layout has a split backspace. the left part is the actual backspace and the right parts serves as a FN key.
-The right shift is also split, with the right part serving as the del key.
-```
-/* Keymap _DEF: Default Layer
- * ,------------------------------------------------------------.
- * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  ß| ´|bcksp|fn1|
- * |------------------------------------------------------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Z|  U|  I|  O|  P|  Ü|  +|      |
- * |----------------------------------------------------- Return|
- * |fn2   | A|  S|  D|  F|  G|  H|  J|  K|  L|  Ö|  Ä|  # |     |
- * |------------------------------------------------------------|
- * |Sft | < |  Y|  X|  C|  V|  B|  N|  M|  ,|  .|  -| RSft| del |
- * |------------------------------------------------------------|
- * |Ctrl|Win |Alt |         Space          |RAlt |Win |App|RCtrl|
- * `------------------------------------------------------------'
- */
-```
-
-
-## FN Key Layer 
-The Function keys can be accessed when holding fn1 (right part of backspace)
-
-```
-/* Keymap _FNK: Function Keys
- * ,------------------------------------------------------------.
- * | ^ | F1| F2| F3| F4| F5| F6| F7| F8| F9| F0|F11|F12| Ins |  |
- * |------------------------------------------------------------|
- * |     |PGU| Up|PGD|   |   |   |Ins|Hom|PDU|   |   |   |      |
- * |-----------------------------------------------------       |
- * |     |Lft|Dwn|Rgt|   |   |   |Del|End|PGD|   |   |    |     |
- * |------------------------------------------------------------|
- * |    |   |   |   |   |   |   |   |   |   |   |   |     |     |
- * |------------------------------------------------------------|
- * |    |    |    |                        |     |    |   |     |
- * `------------------------------------------------------------'
- */
-```
-
-## Media and Mouse Layer
-The Media Keys and Mouse control can be accessed when holding capslock (fn2)
-
-```
-/* Keymap _MEDIA: Media and Mouse Layer
- * ,------------------------------------------------------------.
- * |   |   |   |   |   |   |   |   |   |   |   |   |   |     |  |
- * |------------------------------------------------------------|
- * |     |   |   |   |   |   |   |MLC| MU|MRC|   |   |   |      |
- * |-----------------------------------------------------       |
- * |     |PRV|VLD|VLU|NXT|   |   | ML| MD| MR|   |   |    |     |
- * |------------------------------------------------------------|
- * |    |   |   |   |   |   |   |   |   |   |   |   | UP  |     |
- * |------------------------------------------------------------|
- * |    |    |    |        PLAY            |     |LEFT|DWN|RIGHT|
- * `------------------------------------------------------------'
- */
-```
\ No newline at end of file
diff --git a/keyboards/gh60/satan/keymaps/dende_iso/rules.mk b/keyboards/gh60/satan/keymaps/dende_iso/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/gh60/satan/keymaps/dende_iso/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/gh60/satan/keymaps/denolfe/README.md b/keyboards/gh60/satan/keymaps/denolfe/README.md
deleted file mode 100644
index 147ea4288a6..00000000000
--- a/keyboards/gh60/satan/keymaps/denolfe/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# denolfe's Layout
-Customized Satan keymap 
-
-![Layout](https://i.imgur.com/IrSUSMR.png "Practical Keymap")
-
-## Programming Instructions:
-`cd` into keymap directory, `make dfu`
-
-## Features
-- Movement keys with <kbd>CapsLock</kbd> + <kbd>h</kbd>, <kbd>j</kbd>, <kbd>k</kbd>, <kbd>l</kbd>
-- Media Keys
-- Backlight control
diff --git a/keyboards/gh60/satan/keymaps/denolfe/keymap.c b/keyboards/gh60/satan/keymaps/denolfe/keymap.c
deleted file mode 100644
index a9931561f35..00000000000
--- a/keyboards/gh60/satan/keymaps/denolfe/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-#ifdef RGBLIGHT_ENABLE
-#include "rgblight.h"
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BL 0
-#define _FL 1
-#define _SL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
-   * `-----------------------------------------------------------'
-   */
-[_BL] = LAYOUT_60_ansi(
-  QK_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_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,
-  MO(_FL),   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, MO(_FL),  KC_RGUI,  KC_RCTL),
-
-  /* Keymap _FL: Function Layer
-   * ,-----------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  QK_BOOT|
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
-   * |-----------------------------------------------------------|
-   * |      |   |   |   |   |   |   |       |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |        | F1|F2 | F3|F4 | F5| F6| F7| F8|   |   |          |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-[_FL] = LAYOUT_60_ansi(
-  #ifdef RGBLIGHT_ENABLE
-  KC_GRV,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_UP,   BL_TOGG,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-  KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI,  RGB_VAD, KC_TRNS, KC_TRNS,                   KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  #else
-  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PGDN,        KC_PGUP,      KC_TRNS,        KC_END,   KC_MPRV, KC_MNXT, KC_MPLY,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,        KC_UP,        KC_RIGHT,       KC_TRNS,  KC_TRNS,          KC_TRNS,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  BL_DOWN,   BL_TOGG,  BL_UP,    KC_HOME,  LCTL(KC_LEFT),  LCTL(KC_END), LCTL(KC_RIGHT), KC_TRNS,                    QK_BOOT,
-  KC_TRNS,  KC_TRNS,  LM(2, MOD_LSFT),                         KC_TRNS,                                                KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS
-  #endif
-  ),
-
-[_SL] = 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,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_PGDN,             KC_PGUP,            KC_TRNS,              LSFT(KC_END), KC_MPRV, KC_MNXT, KC_MPLY,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_LEFT), LSFT(KC_DOWN),       LSFT(KC_UP),        LSFT(KC_RIGHT),       KC_TRNS,      KC_TRNS,          KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   LSFT(KC_HOME), LCTL(LSFT(KC_LEFT)), LCTL(LSFT(KC_END)), LCTL(LSFT(KC_RIGHT)), KC_TRNS,                        QK_BOOT,
-  KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                                                      KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/gh60/satan/keymaps/denolfe/rules.mk b/keyboards/gh60/satan/keymaps/denolfe/rules.mk
deleted file mode 100644
index 07feaa8a407..00000000000
--- a/keyboards/gh60/satan/keymaps/denolfe/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE = yes	# Console for debug(+400)
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = no   # Enable keyboard underlight functionality (+4870)
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality (+1150)
-MIDI_ENABLE = no 		# MIDI controls
-AUDIO_ENABLE = no
-UNICODE_ENABLE = no 		# Unicode
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-
diff --git a/keyboards/gh60/satan/keymaps/dkrieger/config.h b/keyboards/gh60/satan/keymaps/dkrieger/config.h
deleted file mode 100644
index faea4d660fe..00000000000
--- a/keyboards/gh60/satan/keymaps/dkrieger/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "../../config.h"
-
-/* Tap Dance */
-#define TAPPING_TERM 200
-
-#endif
diff --git a/keyboards/gh60/satan/keymaps/dkrieger/keymap.c b/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
deleted file mode 100644
index 949e5bf2d91..00000000000
--- a/keyboards/gh60/satan/keymaps/dkrieger/keymap.c
+++ /dev/null
@@ -1,166 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _DEFAULT 0
-#define _FN 1
-#define _MOUSE 2
-#define _MOUSESHIFT 3
-#define _UTIL 4
-
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-
-enum {
-  SUPER_FN = 0,
-  SINGLE_HOLD = 1,
-  DOUBLE_HOLD = 2,
-  TRIPLE_HOLD = 3
-};
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} tap;
-
-int cur_dance (tap_dance_state_t *state) {
-  if (state->interrupted == false || state->pressed) {
-    if (state->count < 2) return SINGLE_HOLD;
-    if (state->count < 3) return DOUBLE_HOLD;
-    else return TRIPLE_HOLD;
-  }
-  else return 9;
-}
-
-//instantiate an instance of 'tap' for the 'fn' tap dance.
-static tap fn_tap_state = {
-  .is_press_action  = true,
-  .state = 0
-};
-
-void fn_finished (tap_dance_state_t *state, void *user_data) {
-  fn_tap_state.state = cur_dance(state);
-  switch (fn_tap_state.state) {
-    /* case SINGLE_HOLD: register_code(MO(_FN)); break; */
-    case SINGLE_HOLD: layer_on(_FN); break;
-    case DOUBLE_HOLD: layer_on(_MOUSE); break;
-    case TRIPLE_HOLD: layer_on(_UTIL);
-  }
-}
-
-void fn_reset (tap_dance_state_t *state, void *user_data) {
-  switch (fn_tap_state.state) {
-    case SINGLE_HOLD: layer_off(_FN); break;
-    case DOUBLE_HOLD: layer_off(_MOUSE); layer_off(_MOUSESHIFT); break;
-    case TRIPLE_HOLD: layer_off(_UTIL);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [SUPER_FN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, fn_finished, fn_reset)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty gui/alt/space/alt/gui
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
- * |-----------------------------------------------------------------------------------------+
- *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
- *         `-----------------------------------------------------------------'
- */
-  [_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift( /* Basic QWERTY */
-      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_BSLS,    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_BSPC,
-      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_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,    TD(SUPER_FN),
-      ______,   KC_LGUI,KC_LALT,                KC_SPC,                          KC_RALT,KC_RGUI,    ______,     ______
-      ),
-
-/* FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |  CAPS  | BL- | BL+ | BL  |     |     |     |     | Psc | Slck| Paus| Up  |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 | Stop  |       |
- *         `-----------------------------------------------------------------'
- */
-  [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
-      ______, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_INS,  KC_DEL,
-      KC_CAPS,  ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   ______, ______,
-      ______,   KC_VOLD,KC_VOLU,KC_MUTE,______, ______, KC_PAST,KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______,
-      ______,   KC_MPRV,KC_MPLY,KC_MNXT,______, ______, KC_PPLS,KC_PMNS,KC_END,  KC_PGDN, KC_DOWN, ______,  ______,
-      ______,   ______, ______,                 ______,                 KC_MSTP, ______,  ______,  ______
-      ),
-
-/* MOUSE Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |QK_BOOT|
- * |-----------------------------------------------------------------------------------------
- * |        |     |     |     |     |     |     |     |     |     |     |UCurs|     |        |
- * |-----------------------------------------------------------------------------------------
- * |         |     |     |     |     |     |     |     |     |     |LCurs|RCurs|             |
- * |-----------------------------------------------------------------------------------------
- * | ScrollHold|     |     |     |     |     |     |     |      |    |DCurs| ScrollHold|     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                          LClick | MClick| RClick|
- *         `-----------------------------------------------------------------'
- */
-  [_MOUSE] = LAYOUT_60_ansi_split_bs_rshift(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  QK_BOOT,
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_UP, ______, ______,
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_LEFT, KC_MS_RIGHT, ______,
-      MO(_MOUSESHIFT), ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_DOWN, MO(_MOUSESHIFT), ______,
-      ______,   ______, ______,                 KC_MS_BTN1,                 KC_MS_BTN3, KC_MS_BTN2, ______, ______
-      ),
-
-/* MOUSESHIFT Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------
- * |        |     |     |     |     |     |     |     |     |     |     |UScrl|     |        |
- * |-----------------------------------------------------------------------------------------
- * |         |     |     |     |     |     |     |     |     |     |LScrl|RScrl|             |
- * |-----------------------------------------------------------------------------------------
- * |           |     |     |     |     |     |     |     |      |    |DScrl|           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 |       |       |
- *         `-----------------------------------------------------------------'
- */
-  [_MOUSESHIFT] = LAYOUT_60_ansi_split_bs_rshift(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_WH_UP, ______, ______,
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_WH_LEFT, KC_MS_WH_RIGHT, ______,
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MS_WH_DOWN, ______, ______,
-      ______,   ______, ______,                 ______,                 ______, ______, ______, ______
-      ),
-
-/* UTIL Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |QK_BOOT|
- * |-----------------------------------------------------------------------------------------
- * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------
- * |         |     |     |     |     |     |     |     |     |     |     |     |             |
- * |-----------------------------------------------------------------------------------------
- * |           |     |     |     |     |     |     |     |      |    |     |           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 |       |       |
- *         `-----------------------------------------------------------------'
- */
-  [_UTIL] = LAYOUT_60_ansi_split_bs_rshift(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, QK_BOOT,
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   ______, ______,                 ______,                 ______, ______, ______, ______
-      )
-};
diff --git a/keyboards/gh60/satan/keymaps/dkrieger/readme.md b/keyboards/gh60/satan/keymaps/dkrieger/readme.md
deleted file mode 100644
index 8941132391e..00000000000
--- a/keyboards/gh60/satan/keymaps/dkrieger/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# dkrieger HHKB like Layout
-
-Base derived from dbroqua (special thanks)
-
-Based on HHKB with the following [dip switches][1] engaged:
-
-- SW3: delete key -> backspace
-- SW5: swap alt and meta keys
-- SW2: Mac Mode (partial implementation, includes media keys
-    - Note: this was copied from dbroqua, there seem to have been some
-      modifications from stock Mac Mode
-
-Additionally, this layout includes a mouse layer engaged by tapping Fn 3 times,
-holding on the third time. The arrow keys move the mouse, scrolling when shift
-is held (either left or right). Right alt is left click, right meta is right
-click.
-
-# Programming Instructions:
-Enter into programming mode and run the following command.
-```
-$ sudo KEYMAP=dkrieger_hhkb make dfu
-```
-[1]: http://www.elitekeyboards.com/products.php?sub=pfu_keyboards,hhkbpro2&pid=pdkb400b
diff --git a/keyboards/gh60/satan/keymaps/dkrieger/rules.mk b/keyboards/gh60/satan/keymaps/dkrieger/rules.mk
deleted file mode 100644
index a0c892505c7..00000000000
--- a/keyboards/gh60/satan/keymaps/dkrieger/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes
-
diff --git a/keyboards/gh60/satan/keymaps/fakb/config.h b/keyboards/gh60/satan/keymaps/fakb/config.h
deleted file mode 100644
index 5ca8aa1da59..00000000000
--- a/keyboards/gh60/satan/keymaps/fakb/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 8
-
-#define NO_ACTION_ONESHOT
-
-#define MOUSEKEY_DELAY             0
-#define MOUSEKEY_INTERVAL          1
-#define MOUSEKEY_MAX_SPEED         4
-#define MOUSEKEY_TIME_TO_MAX       77
-#define MOUSEKEY_WHEEL_MAX_SPEED   1
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
-
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN B2
diff --git a/keyboards/gh60/satan/keymaps/fakb/keymap.c b/keyboards/gh60/satan/keymaps/fakb/keymap.c
deleted file mode 100644
index 8b8570ad1eb..00000000000
--- a/keyboards/gh60/satan/keymaps/fakb/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define LCTL_MA LCTL_T(KC_UP)
-#define LSFT_MA LSFT_T(KC_DOWN)
-#define RSFT_MA SFT_T(KC_DOWN)
-#define TABS_MA LT(1,KC_TAB)
-#define SPCE_MA LT(2,KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[0] = LAYOUT_all(
- QK_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_BSLS,KC_NUBS,
- TABS_MA,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,
- LCTL_MA,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,XXXXXXX,KC_ENT ,
- LSFT_MA,KC_NUBS,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,RSFT_MA,MO(1)  ,
- XXXXXXX,KC_LALT,KC_LGUI,                          SPCE_MA,                      KC_RGUI,KC_RALT,XXXXXXX,XXXXXXX),
-
-[1] = LAYOUT_all(
- KC_PSCR,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_INS ,_______,
- _______,_______,_______,KC_PGUP,KC_PGDN,KC_HOME,KC_END ,KC_PGDN,KC_PGUP,_______,_______,_______,_______,KC_DEL ,
- KC_CAPS,KC_NUBS,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,_______,_______,_______,_______,
- _______,_______,BL_TOGG,BL_UP  ,BL_DOWN,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______,_______,_______,
- _______,_______,_______,                _______,                                _______,_______,_______,_______),
-
-[2] = LAYOUT_all(
- _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,
- KC_BTN5,KC_BTN4,KC_BTN3,KC_BTN2,KC_BTN1,KC_HOME,KC_END ,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,KC_WH_L,KC_WH_U,KC_WH_D,KC_WH_R,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______,_______,_______,
- _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,_______,                _______,                                _______,_______,_______,_______),
-
-
-};
diff --git a/keyboards/gh60/satan/keymaps/fakb/readme.md b/keyboards/gh60/satan/keymaps/fakb/readme.md
deleted file mode 100644
index b02b41816c7..00000000000
--- a/keyboards/gh60/satan/keymaps/fakb/readme.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# FabulousAnomalyKeyBoard
-
-This layout features an efficient layout for people without
-a mouse.
-
-## layers
-
-Layer Base:	complete basic keyboard
-Layer Fn-Tab:	F1-F12, Arrow Keys, Home, End, Backlight, Media
-Layer Fn-Space: mouse keys in a vim like manner
-
-For detailed info check out keymap.c
-
-## the CTRL key
-
-It is where you would suspect CAPSLOCK to be.
-WHO NEEDS CAPSLOCK ANYWAYS?
-For those rare cases you need to shout at somebody in a comment
-section you can still do a capslock by using TABCTRL
-
-## the SUPER key
-
-There are two super keys. They are next to the space bar.
-The intention is easing the use of tiling window mangers
-
-## emergency mouse
-
-Without a mouse you will find yourself in a situation where all
-your tiling goodness will just not be able to click onto that 
-"close ads" button.
-This keymap integrates a basic mouse pointer directly into the keyboard.
-Mouse is accessible via holding SPACE and tapping keys:
-```
-SPACE
-h	Move cursor left
-j	Move cursor down
-k	Move cursor up
-l	Move cursor right
-
-w	Middle Mouse Click
-r	Right click
-e	Left click
-
-s	Scroll wheel left
-d	Scroll wheel down
-f	Scroll wheel up
-g	Scroll wheel right
-```
-
-## shell focused
-
-Working in a shell the up and down arrow keys are often needed to
-look at old commands or reuse some.
-When held, the left ctrl and left shift will act as expected,
-but when tapped they will become UP and DOWN arrow-keys.
-
-## krautfriend
-The keys <|> are accessible even without a 102nd key
diff --git a/keyboards/gh60/satan/keymaps/fakb/rules.mk b/keyboards/gh60/satan/keymaps/fakb/rules.mk
deleted file mode 100644
index c29a61a77f9..00000000000
--- a/keyboards/gh60/satan/keymaps/fakb/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes  # Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = no # Console for debug(+400)
-COMMAND_ENABLE   = no # Commands for debug and configuration
-NKRO_ENABLE      = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE  = no # Enable keyboard underlight functionality (+4870)
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality (+1150)
-MIDI_ENABLE      = no  # MIDI controls
-AUDIO_ENABLE     = no
-UNICODE_ENABLE   = no  # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-
diff --git a/keyboards/gh60/satan/keymaps/gipsy-king/config.h b/keyboards/gh60/satan/keymaps/gipsy-king/config.h
deleted file mode 100644
index 62deb0dc5a4..00000000000
--- a/keyboards/gh60/satan/keymaps/gipsy-king/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#undef RGBLED_NUM
-#define RGBLED_NUM 17
-#undef RGBLIGHT_HUE_STEP
-#define RGBLIGHT_HUE_STEP 5
-#undef RGBLIGHT_SAT_STEP
-#define RGBLIGHT_SAT_STEP 5
-#undef RGBLIGHT_VAL_STEP
-#define RGBLIGHT_VAL_STEP 5
-
-#undef RGBLIGHT_EFFECT_BREATHING
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c b/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c
deleted file mode 100644
index 8de03bf80c7..00000000000
--- a/keyboards/gh60/satan/keymaps/gipsy-king/keymap.c
+++ /dev/null
@@ -1,161 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "rgblight.h"
-
-enum layer_names {
-  _BL,
-  _FL
-};
-
-/**
- * HHKB style.
- * Esc on capslock, space-hold is fn.
- * Fn layer has hjkl arrows, home on backspace, rgb stuff.
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BL] = LAYOUT_60_ansi(
-    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_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_ESC,  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_LALT,                            LT(_FL,KC_SPC),                     KC_LGUI, KC_RALT, KC_RCTL, _______
-  ),
-
-  [_FL] = LAYOUT_60_ansi(
-    QK_BOOT, 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,
-    RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG,
-    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
-    _______,          RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______
-  )
-};
-
-/**
- * Terminal Prompt
- * Mimicks a terminal prompt. On keystrokes, the led bar is filled. Backspace
- * removes from bar. Enter clears bar. After some timeout, the bar is also cleared.
- * A blinking cursor is displayed at the right of the bar.
- * This can't be defined as an animation, because animations only are called on an
- * interval, not on keypress. In the future all animations could be enhanced to
- * react to keystrokes in QMK.
- */
-
-uint8_t cursor_pos;
-
-uint16_t interval_time = 10; // maybe too short...
-uint16_t reset_time = 10000;
-uint16_t last_timer = 0;
-uint16_t timer_pos = 0;
-uint16_t reset_timer = 0;
-
-void reset_chars(void);
-void add_char(bool space);
-void remove_char(void);
-void animate_cursor(uint16_t);
-
-// animate, like the built-in animations, with timer_* functions
-void matrix_scan_user(void) {
-  if (timer_elapsed(reset_timer) > reset_time) {
-      reset_chars();
-      reset_timer = timer_read();
-      return;
-  }
-  if (timer_elapsed(last_timer) < interval_time) {
-    return;
-  }
-  last_timer += interval_time;
-  timer_pos += 4;
-  if (timer_pos >= 255) {
-    timer_pos = 0;
-    last_timer = timer_read();
-  }
-  animate_cursor(timer_pos);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-    keycode = keycode & 0xFF;
-  }
-  switch (keycode) {
-    case KC_A ... KC_Z:
-    case KC_1 ... KC_0:
-    case KC_LBRC:
-    case KC_RBRC:
-    case KC_SCLN:
-    case KC_QUOT:
-    case KC_COMM:
-    case KC_DOT:
-    case KC_SLSH:
-    case KC_BSLS:
-      if (record->event.pressed) {
-        add_char(false);
-      }
-      break;
-    case KC_ENTER:
-    case KC_ESC:
-      if (record->event.pressed) {
-        reset_chars();
-      }
-      break;
-    case KC_BSPC:
-      if (record->event.pressed) {
-        remove_char();
-      }
-      break;
-    case KC_SPACE:
-      if (!record->event.pressed) {
-        add_char(true);
-      }
-      break;
-  }
-  reset_timer = timer_read();
-  return true;
-}
-
-void keyboard_post_init_user(void) {
-  // reset the bar and animation
-  rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-  cursor_pos = 0;
-  reset_chars();
-  reset_timer = last_timer = timer_read();
-}
-
-
-void reset_chars(void) {
-  // flush the whole thing, gets rid of previous animations
-  for (uint8_t i = 0; i < RGBLED_NUM; i++) {
-    // don't flicker the cursor if bar was empty on reset_timer
-    if (i == 0 && cursor_pos == 0) {
-        continue;
-    }
-    rgblight_sethsv_at(0, 0, 0, i);
-  }
-  cursor_pos = 0;
-}
-
-void add_char(bool space) {
-  if (cursor_pos == RGBLED_NUM - 1) {
-    cursor_pos = 0;
-    reset_chars();
-    return;
-  }
-
-  if (space) {
-    rgblight_sethsv_at(0, 0, 0, cursor_pos);
-  } else {
-    rgblight_sethsv_at(rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val(), cursor_pos);
-  }
-  cursor_pos += 1;
-}
-
-void remove_char(void) {
-  if (cursor_pos == 0) return;
-
-  rgblight_sethsv_at(0, 0, 0, cursor_pos);
-  rgblight_sethsv_at(0, 0, 0, cursor_pos - 1);
-  cursor_pos -= 1;
-}
-
-void animate_cursor(uint16_t pos) {
-  uint16_t value = pos < 196 ? fmin(255, pos * 16) : (255 - (pos * 2));
-  rgblight_sethsv_at(rgblight_get_hue(), rgblight_get_sat(), value, cursor_pos);
-}
diff --git a/keyboards/gh60/satan/keymaps/gipsy-king/readme.md b/keyboards/gh60/satan/keymaps/gipsy-king/readme.md
deleted file mode 100644
index c366147df39..00000000000
--- a/keyboards/gh60/satan/keymaps/gipsy-king/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# default Satan GH60 layout
diff --git a/keyboards/gh60/satan/keymaps/gipsy-king/rules.mk b/keyboards/gh60/satan/keymaps/gipsy-king/rules.mk
deleted file mode 100644
index 935d3544ace..00000000000
--- a/keyboards/gh60/satan/keymaps/gipsy-king/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-EXTRAKEY_ENABLE = no
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-NKRO_ENABLE = no
-UNICODE_ENABLE = yes
-SLEEP_LED_ENABLE = yes
diff --git a/keyboards/gh60/satan/keymaps/lepa/keymap.c b/keyboards/gh60/satan/keymaps/lepa/keymap.c
deleted file mode 100644
index 88196862a87..00000000000
--- a/keyboards/gh60/satan/keymaps/lepa/keymap.c
+++ /dev/null
@@ -1,146 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define MY_ESC LT(1, KC_ESC)
-#define MY_ENT LT(1, KC_ENT)
-#define MY_APP LT(2, KC_APP)
-
-#define MY_LCA TD(TD_LCTL_ALT)
-#define MY_RCA TD(TD_RCTL_ALT)
-#define MY_LGA TD(TD_LGUI_ALT)
-#define MY_RGA TD(TD_RGUI_ALT)
-#define MY_LCG TD(TD_LCTL_GUI)
-#define MY_RCG TD(TD_RCTL_GUI)
-#define MY_LSH TD(TD_LSFT_HPR)
-#define MY_RSH TD(TD_RSFT_HPR)
-
-enum {
-    TD_LCTL_ALT,
-    TD_RCTL_ALT,
-    TD_LGUI_ALT,
-    TD_RGUI_ALT,
-    TD_LCTL_GUI,
-    TD_RCTL_GUI,
-    TD_LSFT_HPR,
-    TD_RSFT_HPR
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT_60_ansi(
-            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_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,
-            MY_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          MY_ENT,
-            MY_LSH,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          MY_RSH,
-            MY_LGA,  MY_LCG,  MY_LCA,                    KC_SPC,                             MY_RCA,  MY_RCG,  MY_APP, MY_RGA),
-
-    LAYOUT_60_ansi(
-            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_DEL,
-            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   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_TRNS),
-
-    LAYOUT_60_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, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-            KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-            KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-            KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-enum {
-    SINGLE_TAP        = 1,
-    SINGLE_HOLD       = 2,
-    DOUBLE_TAP        = 3,
-    DOUBLE_HOLD       = 4,
-    DOUBLE_SINGLE_TAP = 5,
-    UNKNOWN_TAP       = 6
-};
-
-typedef struct {
-    bool is_press_action;
-    int state;
-} tap;
-
-int cur_dance(tap_dance_state_t *state) {
-    switch (state->count) {
-        case 1:
-            if (state->interrupted || state->pressed == 0) {
-                return SINGLE_TAP;
-            }
-            return SINGLE_HOLD;
-        case 2:
-            if (state->interrupted) {
-                return DOUBLE_SINGLE_TAP;
-            }
-            if (state->pressed) {
-                return DOUBLE_HOLD;
-            }
-            return DOUBLE_TAP;
-    }
-    return UNKNOWN_TAP;
-}
-
-#define my_dance_combo(N, K0, REGFN, UNREGFN) my_dance_combo_expanded(N, K0, REGFN, UNREGFN)
-#define my_dance_combo_expanded(N, K0, REGFN, UNREGFN)              \
-static tap N ## _state = {                                          \
-    .is_press_action = true,                                        \
-    .state = 0                                                      \
-};                                                                  \
-                                                                    \
-void N ## _finished(tap_dance_state_t *state, void *user_data) { \
-    N ## _state.state = cur_dance(state);                           \
-    switch (N ## _state.state) {                                    \
-        case SINGLE_TAP: case SINGLE_HOLD:                          \
-            register_code(K0);                                      \
-            break;                                                  \
-        case DOUBLE_TAP: case DOUBLE_SINGLE_TAP: case DOUBLE_HOLD:  \
-            register_code(K0);                                      \
-            REGFN;                                                  \
-            break;                                                  \
-    }                                                               \
-}                                                                   \
-                                                                    \
-void N ## _reset(tap_dance_state_t *state, void *user_data) {    \
-    switch (N ## _state.state) {                                    \
-        case SINGLE_TAP: case SINGLE_HOLD:                          \
-            unregister_code(K0);                                    \
-            break;                                                  \
-        case DOUBLE_TAP: case DOUBLE_SINGLE_TAP: case DOUBLE_HOLD:  \
-            UNREGFN;                                                \
-            unregister_code(K0);                                    \
-            break;                                                  \
-    }                                                               \
-    N ## _state.state = 0;                                          \
-}
-
-#define my_dance_reg_code_1(K1) register_code(K1)
-#define my_dance_unreg_code_1(K1) unregister_code(K1)
-#define my_dance_combo_1(N, K0, K1) \
-    my_dance_combo(N, K0, my_dance_reg_code_1(K1), my_dance_unreg_code_1(K1))
-
-#define my_dance_reg_code_3(K1, K2, K3) \
-    do { register_code(K1); register_code(K2); register_code(K3); } while (0)
-#define my_dance_unreg_code_3(K1, K2, K3) \
-    do { unregister_code(K3); unregister_code(K2); unregister_code(K1); } while (0)
-#define my_dance_combo_3(N, K0, K1, K2, K3) \
-    my_dance_combo(N, K0, my_dance_reg_code_3(K1, K2, K3), my_dance_unreg_code_3(K1, K2, K3))
-
-my_dance_combo_1(lca, KC_LCTL, KC_LALT)
-my_dance_combo_1(rca, KC_RCTL, KC_RALT)
-my_dance_combo_1(lga, KC_LGUI, KC_LALT)
-my_dance_combo_1(rga, KC_RGUI, KC_RALT)
-my_dance_combo_1(lcg, KC_LCTL, KC_LGUI)
-my_dance_combo_1(rcg, KC_RCTL, KC_RGUI)
-my_dance_combo_3(lsh, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI)
-my_dance_combo_3(rsh, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI)
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_LCTL_ALT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lca_finished, lca_reset),
-    [TD_RCTL_ALT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rca_finished, rca_reset),
-    [TD_LGUI_ALT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lga_finished, lga_reset),
-    [TD_RGUI_ALT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rga_finished, rga_reset),
-    [TD_LCTL_GUI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lcg_finished, lcg_reset),
-    [TD_RCTL_GUI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rcg_finished, rcg_reset),
-    [TD_LSFT_HPR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lsh_finished, lsh_reset),
-    [TD_RSFT_HPR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rsh_finished, rsh_reset)
-};
diff --git a/keyboards/gh60/satan/keymaps/lepa/readme.md b/keyboards/gh60/satan/keymaps/lepa/readme.md
deleted file mode 100644
index a53693d03f5..00000000000
--- a/keyboards/gh60/satan/keymaps/lepa/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Satan GH60 ANSI Layout that uses tap dance
-
-![Satan GH60 Image](https://i.imgur.com/T5FX7Sn.png)
-
-Notes:
-- Enter and Esc keys activate layer Fn1 when held, and work as usual when tapped.
-- Menu key activates layer Fn2 when held, and works as usual when tapped.
-- For the next keys a first key is used when held, and a second one is used when tapped 2 times:
-  - Shift and Hyper;
-  - Win and Win+Alt;
-  - Ctrl and Ctrl+Alt;
-  - Alt and Win+Ctrl.
-
diff --git a/keyboards/gh60/satan/keymaps/lepa/rules.mk b/keyboards/gh60/satan/keymaps/lepa/rules.mk
deleted file mode 100644
index 0eceeb297e9..00000000000
--- a/keyboards/gh60/satan/keymaps/lepa/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes
-
diff --git a/keyboards/gh60/satan/keymaps/mark1/keymap.c b/keyboards/gh60/satan/keymaps/mark1/keymap.c
deleted file mode 100644
index de9b80da18d..00000000000
--- a/keyboards/gh60/satan/keymaps/mark1/keymap.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-#define KC_____ KC_TRNS
-#define KC_FN MO(1) // Fn
-#define KC_FNLK TG(1) // Fn lock
-#define KC_HOME LGUI(KC_LEFT) // Home, or cmd-left
-#define KC_END LGUI(KC_RGHT) // End, or cmd-right
-#define KC_SLP LGUI(LALT(KC_PWR)) // sleep, or cmd-option-power
-#define KC_SCLK LCTL(LSFT(KC_PWR)) // lock screen, or ctrl-shift-power
-
-// Mark I keyboard layout for GH60 Satan
-// http://www.keyboard-layout-editor.com/#/gists/e1cde292bd2094cc3b763206d4d2cfb5
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // 0: qwerty
-  [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_NO,
-    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_NO,   KC_ENT,
-    KC_LSFT, KC_FN,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_FN,
-    KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_RALT, KC_RCTL, KC_FNLK
-  ),
-  // 1: fn layer
-  [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_DEL,  _______,
-    _______, KC_VOLU, _______, _______, _______, _______, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______,
-    _______, KC_VOLD, KC_MRWD, KC_MPLY, KC_MFFD, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______,
-    _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, KC_SCLK, KC_SLP,  _______, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  )
-};
\ No newline at end of file
diff --git a/keyboards/gh60/satan/keymaps/mark1/readme.md b/keyboards/gh60/satan/keymaps/mark1/readme.md
deleted file mode 100644
index 060faf80cd1..00000000000
--- a/keyboards/gh60/satan/keymaps/mark1/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Mark I layout for GH60 Satan
-
-A Mac keyboard for touch typists who enjoy having a Fn key on both the left-hand and right-hand side.
-
-[Layout](http://www.keyboard-layout-editor.com/#/gists/e1cde292bd2094cc3b763206d4d2cfb5)
diff --git a/keyboards/gh60/satan/keymaps/midi/config.h b/keyboards/gh60/satan/keymaps/midi/config.h
deleted file mode 100644
index 59250b49e24..00000000000
--- a/keyboards/gh60/satan/keymaps/midi/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/gh60/satan/keymaps/midi/keymap.c b/keyboards/gh60/satan/keymaps/midi/keymap.c
deleted file mode 100644
index 625f07f8810..00000000000
--- a/keyboards/gh60/satan/keymaps/midi/keymap.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#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.
-#define _BL 0
-#define _ML 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |Midi|Ctrl |
-   * `-----------------------------------------------------------'
-   */
-  [_BL] = 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, TG(_ML), KC_RCTL
-  ),
-
-  #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
-  /* Keymap _ML: MIDI Layer (Advanced)
-   * ,------------------------------------------------------------------------.
-   * | Exit |    |    |    |    |    |    |    |    |    |    |    |    |     |
-   * |------------------------------------------------------------------------|
-   * |  Ch+ |    | C# | D# |    | F# | G# | A# |    | C# | D# |    |    |     |
-   * |------------------------------------------------------------------------|
-   * |  Mod  | C  | D  | E  | F  | G  | A  | B  | C  | D  | E  | F  |         |
-   * |------------------------------------------------------------------------|
-   * | Sustain |Oct-|Oct+|Mod-|Mod+|    |    |    |Tns-|Tns+|Tns0|   Sustain  |
-   * |------------------------------------------------------------------------|
-   * |     |     |     |         All notes off        |     |     |     |     |
-   * `------------------------------------------------------------------------'
-   */
-  [_ML] = LAYOUT_60_ansi(
-    TG(_ML), MI_VL1,   MI_VL2,   MI_VL3,    MI_VL4,   MI_VL5,   MI_VL6,   MI_VL7,   MI_VL8,   MI_VL9,   MI_VL10,   XXXXXXX,   XXXXXXX, XXXXXXX,
-    MI_CHNU, XXXXXXX,  MI_Cs,    MI_Ds,     XXXXXXX,  MI_Fs,    MI_Gs,    MI_As,    XXXXXXX,  MI_Cs1,  MI_Ds1,   XXXXXXX,   XXXXXXX, XXXXXXX,
-    MI_MOD,  MI_C,     MI_D,     MI_E,      MI_F,     MI_G,     MI_A,     MI_B,     MI_C1,   MI_D1,   MI_E1,    MI_F1,             _______,
-    MI_SUST,           MI_OCTD,  MI_OCTU,   MI_MODD,  MI_MODU,  XXXXXXX,  XXXXXXX,  XXXXXXX,  MI_TRSD,  MI_TRSU,   MI_TR0,             MI_SUST,
-    _______, _______,  _______,                       MI_AOFF,                                          _______,   _______,   _______, _______
-  ),
-  #elif defined(MIDI_ENABLE) && defined(MIDI_BASIC)
-  /* Keymap _ML: MIDI Layer (Advanced)
-   * ,------------------------------------------------------------------------.
-   * | Exit |    |    |    |    |    |    |    |    |    |    |    |    |     |
-   * |------------------------------------------------------------------------|
-   * |      |    |    |    |    |    |    |    |    |    |    |    |    |     |
-   * |------------------------------------------------------------------------|
-   * |       |    |    |    |    |    |    |    |    |    |    |    |         |
-   * |------------------------------------------------------------------------|
-   * |         |MuOn|MuOf|MiOn|MiOf|    |    |    |    |    |    |            |
-   * |------------------------------------------------------------------------|
-   * |     |     |     |                              |     |     |     |     |
-   * `------------------------------------------------------------------------'
-   */
-
-  [_ML] = LAYOUT_60_ansi(
-    TG(_ML), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______,          MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  ),
-  #endif
-};
diff --git a/keyboards/gh60/satan/keymaps/midi/readme.md b/keyboards/gh60/satan/keymaps/midi/readme.md
deleted file mode 100644
index 87844a854b5..00000000000
--- a/keyboards/gh60/satan/keymaps/midi/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Satan GH60 layout demonstrating MIDI key mapping
diff --git a/keyboards/gh60/satan/keymaps/midi/rules.mk b/keyboards/gh60/satan/keymaps/midi/rules.mk
deleted file mode 100644
index 2df79c4ed62..00000000000
--- a/keyboards/gh60/satan/keymaps/midi/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = yes            # MIDI support
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/gh60/satan/keymaps/no_caps_lock/keymap.c b/keyboards/gh60/satan/keymaps/no_caps_lock/keymap.c
deleted file mode 100644
index 45889c02321..00000000000
--- a/keyboards/gh60/satan/keymaps/no_caps_lock/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#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 {
-  _BL,
-  _FL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   /* Keymap _BL: (Base Layer) Default Layer
-    * ,-----------------------------------------------------------.
-    * | ~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  Backsp |
-    * |-----------------------------------------------------------|
-    * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-    * |-----------------------------------------------------------|
-    * |ESC    |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-    * |-----------------------------------------------------------|
-    * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-    * |-----------------------------------------------------------|
-    * |Ctrl|Gui |Alt |      Space          |Alt |FL |Gui  |FL(tgl)|
-    * `-----------------------------------------------------------'
-    */
-    [_BL] = LAYOUT_60_ansi(
-        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_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_ESC,  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, MO(_FL), KC_RGUI, TG(_FL)
-    ),
-
-   /* Keymap _FL: Function Layer
-    * ,-----------------------------------------------------------.
-    * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  DEL  |
-    * |-----------------------------------------------------------|
-    * |     |Home|PgUp|   |  |  |  |  |  |   |   |BR- |BR+ |      |
-    * |-----------------------------------------------------------|
-    * |      |End|PgDn|  |  |  |Left|Down|Up|Right|Prv|Nxt|Ply    |
-    * |-----------------------------------------------------------|
-    * |        |   |   |   |   |   |   |   |Vdn|Vup|Mute|         |
-    * |-----------------------------------------------------------|
-    * |    |    |    |                        |    |    |    |    |
-    * `-----------------------------------------------------------'
-    * hjkl for arrows because vim
-    */
-    [_FL] = LAYOUT_60_ansi(
-        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_DEL,
-        KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_F14,  KC_F15,  KC_TRNS,
-        KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN,  KC_UP,   KC_RGHT, KC_MPRV, KC_MNXT,          KC_MPLY,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_VOLD, KC_VOLU, KC_MUTE,                   KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-};
diff --git a/keyboards/gh60/satan/keymaps/no_caps_lock/readme.md b/keyboards/gh60/satan/keymaps/no_caps_lock/readme.md
deleted file mode 100644
index b3bfe7988e9..00000000000
--- a/keyboards/gh60/satan/keymaps/no_caps_lock/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Standard layout with caps lock replaced by esc. Navigation and multimedia keys are on the second layer.
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
deleted file mode 100644
index 75c16329086..00000000000
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Backlight configuration
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 10
-
-// Underlight configuration
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN B2
-#undef RGBLED_NUM
-#define RGBLED_NUM 16        // Number of LEDs
-#undef RGBLIGHT_HUE_STEP
-#define RGBLIGHT_HUE_STEP 8
-#undef RGBLIGHT_SAT_STEP
-#define RGBLIGHT_SAT_STEP 8
-#undef RGBLIGHT_VAL_STEP
-#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/gh60/satan/keymaps/olligranlund_iso/keymap.c b/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
deleted file mode 100644
index a5bcccfafa3..00000000000
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define BASE    0    // Default layer
-#define MOUSE   1    // Space layer
-#define NUMPAD  2    // Alt layer
-#define CAPS    3    // Caps layer
-
-// General shortenings
-#define ESCA KC_ESC
-#define MINS KC_MINS
-#define EQUL KC_EQL
-#define BSPC KC_BSPC
-#define DELE KC_DEL
-#define LBRC KC_LBRC
-#define RBRC KC_RBRC
-#define ALTR KC_RALT
-#define SCLN KC_SCLN
-#define QUOT KC_QUOT
-#define NUHS KC_NUHS
-#define ENTE KC_ENT
-#define NUBS KC_NUBS  // Less/ greater sign
-#define COMM KC_COMM  // Comma
-#define FSTO KC_DOT   // Full stop
-#define SLSH KC_SLSH
-#define ALTL KC_LALT
-#define GUIL KC_LGUI
-#define GUIR KC_RGUI
-#define MENO KC_MENU
-
-// Special Actions and Media Keys
-#define INSE KC_INS   // Insert here
-#define HOME KC_HOME  // Go to beginning of line
-#define ENDI  KC_END  // go to end of line
-#define PSCR  KC_PSCR   // Print Screen
-#define SLCK  KC_SCRL   // go to end of line
-#define PGDN  KC_PGDN   // go to end of line
-#define PGUP  KC_PGUP   // go to end of line
-#define PLPS KC_MPLY  // Play/Pause
-#define PAUS KC_PAUS  // Pause button
-#define MUTE KC_MUTE  // Mute sound
-#define VOLU KC_VOLU  // Volume increase
-#define VOLD KC_VOLD  // Volume decrease
-#define MNXT KC_MNXT  // next track
-#define MPRV KC_MPRV  // prev track
-#define MSTP KC_MSTP  // stop playing
-#define MSEL KC_MSEL  // Select media (Start playing it)
-#define MAIL KC_MAIL  // Open default mail app
-#define CALC KC_CALC  // Open default calculator app
-#define MYCM KC_MYCM  // Open default file manager
-
-// increase readability
-#define XXXXX    KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Keymap BASE: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  R  |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| # | R |
-   * |-----------------------------------------------------------|
-   * |Shft| \ |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
-   * `-----------------------------------------------------------|
-   */
-
-[ BASE ] = KEYMAP_ISO_SPLITRSHIFT(
-  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,     XXXXX,
-  LT(CAPS, KC_CAPS), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS,     KC_ENT,
-  KC_LSFT,        KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,     XXXXX,
-  KC_LCTL,        KC_LGUI,KC_LALT,                KC_SPC,                     KC_RALT, MO(CAPS), TG(NUMPAD),    TG(MOUSE)),
-
-[ MOUSE ] = KEYMAP( // Mouse controls
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,
-		_______, _______, _______, _______, _______, _______, _______, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,
-		_______, _______, _______,           _______,           _______, _______, _______, _______),
-
-[ NUMPAD ] = KEYMAP( //Numpad and alt shortcuts
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,
-        _______, BL_TOGG, BL_DOWN,BL_UP,  _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, _______,
-        _______, _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_7, KC_8, KC_9, KC_0, _______, _______, XXXXX,
-        _______, _______, _______,           _______,             _______, _______, _______, _______),
-
-[ CAPS ] = KEYMAP( // Main "function" key, arrows, media control
-        KC_GRAVE, 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, XXXXX,
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, PGDN, KC_UP, PGUP, PSCR, SLCK, PAUS, _______,
-        _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXX,
-        _______, _______, _______,           _______,           _______, _______, _______, _______)
-
-};
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/readme.md b/keyboards/gh60/satan/keymaps/olligranlund_iso/readme.md
deleted file mode 100644
index e0801ef8584..00000000000
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# ISO layout for the Satan GH60
-### Originally by Ben James, forked by Oliver Granlund
-
-![Finished product](https://i.imgur.com/s5HAgr6.jpg)
-
-I've wanted to make this as close to a P0ker as possible, but some macros in
-the P0ker don't make sense...
-
-Some of the features:
-* Caps activates special features when held:
-  * Arrow keys directly under right hand
-  * Volume control
-  * Fn keys on number row
-  * PageUp/PageDn/Home/other general buttons
-* Mouse control
-* Numpad (works so much better if this would be ortho)
-### RGB-strip
-![Behind the scenes](https://i.imgur.com/reHLXrc.jpg)
diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk b/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk
deleted file mode 100644
index 7041837aabb..00000000000
--- a/keyboards/gh60/satan/keymaps/olligranlund_iso/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/gh60/satan/keymaps/rask63/keymap.c b/keyboards/gh60/satan/keymaps/rask63/keymap.c
deleted file mode 100644
index f12aaa5d3dd..00000000000
--- a/keyboards/gh60/satan/keymaps/rask63/keymap.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-#define _BASE 0
-#define _FNO 1
-#define _FNT 2
-
-#define ________ KC_TRNS
-#define XXXXXXXX KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /*
-   * Base layer
-   *
-   * -------------------------------------------------------------------------------------------
-   * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  | Del |
-   * -------------------------------------------------------------------------------------------
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
-   * -------------------------------------------------------------------------------------------
-   * | Fn1      |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |  Enter     |
-   * -------------------------------------------------------------------------------------------
-   * | Shift       |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  Up     | Fn2 |
-   * -------------------------------------------------------------------------------------------
-   * | Ctrl  | Win   | Alt   |              Space              | AltGr | Left  | Down  | Right |
-   * -------------------------------------------------------------------------------------------
-   */
-  [_BASE] = LAYOUT_60_ansi_split_bs_rshift(
-    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_BSLS,  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_BSPC,
-    MO(_FNO), 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_UP,    MO(_FNT),
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                           KC_RALT,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-
-  /*
-   * Fn1 layer
-   *
-   * -------------------------------------------------------------------------------------------
-   * | Esc | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Prsc| Ins |
-   * -------------------------------------------------------------------------------------------
-   * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
-   * -------------------------------------------------------------------------------------------
-   * | NONE     |     |     |     |     |     |     |     |     |     |     |     |            |
-   * -------------------------------------------------------------------------------------------
-   * |             |     |     |     |     |     |     |     |     |     |     |  PgUp   |     |
-   * -------------------------------------------------------------------------------------------
-   * |       |       |       |                                 |       | Home  | PgDn  | End   |
-   * -------------------------------------------------------------------------------------------
-   */
-  [_FNO] = LAYOUT_60_ansi_split_bs_rshift(
-    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_INS,
-    ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________,
-    ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________,           ________,
-    ________,           ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, KC_PGUP,  ________,
-    ________, ________, ________,                     ________,                                         ________, KC_HOME,  KC_PGDN,  KC_END
-  ),
-
-  /*
-   * Fn2 layer
-   *
-   * TODO: macro buttons
-   *
-   * -------------------------------------------------------------------------------------------
-   * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-   * -------------------------------------------------------------------------------------------
-   * |        |     |     |     |     |     |     |     |     | Prev| Play| Next|     |        |
-   * -------------------------------------------------------------------------------------------
-   * | CapsLk   |     |     |     |     |     |     |     |     | Vol-| Vol+| Mute|            |
-   * -------------------------------------------------------------------------------------------
-   * |             |     |     |     |     |     |     |     |     | Stop|     |         | NONE|
-   * -------------------------------------------------------------------------------------------
-   * | Reset | Menu  |       |                                 |  M1   |  M2   |  M3   |  M4   |
-   * -------------------------------------------------------------------------------------------
-   */
-  [_FNT] = LAYOUT_60_ansi_split_bs_rshift(
-    ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________,
-    ________, ________, ________, ________, ________, ________, ________, ________, ________, KC_MPRV,  KC_MPLY,  KC_MNXT,  ________, ________,
-    KC_CAPS,  ________, ________, ________, ________, ________, ________, ________, ________, KC_VOLD,  KC_VOLU,  KC_MUTE,            ________,
-    ________,           ________, ________, ________, ________, ________, ________, ________, ________, KC_MSTP,  ________, ________, ________,
-    QK_BOOT,  KC_MENU,  ________,                     ________,                                         ________, ________, ________, ________
-  ),
-};
diff --git a/keyboards/gh60/satan/keymaps/sethbc/keymap.c b/keyboards/gh60/satan/keymaps/sethbc/keymap.c
deleted file mode 100644
index f1195ba5a0e..00000000000
--- a/keyboards/gh60/satan/keymaps/sethbc/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| \ | ~ |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|bksp |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift| fn |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
-   * `-----------------------------------------------------------'
-   */
-  [_BL] = LAYOUT_60_ansi_split_bs_rshift(
-    QK_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_BSLS, 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_BSPC,
-    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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FL),
-    KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_RALT, KC_MENU, KC_RCTL
-  ),
-
-  [_FL] = LAYOUT_60_ansi_split_bs_rshift(
-  #ifdef RGBLIGHT_ENABLE
-    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,  _______, QK_BOOT,
-    KC_CAPS, _______, RGB_TOG, RGB_MOD, RGB_HUI, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_DEL,
-    _______, KC_VOLD, RGB_HUD, RGB_SAI, RGB_SAD, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT,
-    _______,          RGB_VAI, RGB_VAD, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  #else
-    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,  _______, QK_BOOT,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_DEL,
-    _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_PENT,
-    _______,          _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  #endif
-  ),
-};
diff --git a/keyboards/gh60/satan/keymaps/sethbc/readme.md b/keyboards/gh60/satan/keymaps/sethbc/readme.md
deleted file mode 100644
index ed0eb870165..00000000000
--- a/keyboards/gh60/satan/keymaps/sethbc/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# sethbc's Satan GH60 layout
-
-HHKB style split right shift and split backspace.  Largely based on the HHKB layout.
diff --git a/keyboards/gh60/satan/keymaps/sethbc/rules.mk b/keyboards/gh60/satan/keymaps/sethbc/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/gh60/satan/keymaps/sethbc/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/gh60/satan/keymaps/smt/keymap.c b/keyboards/gh60/satan/keymaps/smt/keymap.c
deleted file mode 100644
index a50d4571265..00000000000
--- a/keyboards/gh60/satan/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-
-// Used for SHIFT_ESC
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
-
-// 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 1
-#define _DVORAK 2
-#define _FUNC 3
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK
-};
-
-// Custom macros
-#define ALT_GRV     ALT_T(KC_GRV)               // Tap for Backtick, hold for Alt
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _QWERTY: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |         Space         |Alt |Fn |Gui  |Ctrl |
-   * `-----------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_60_ansi(
-    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,
-    HPR_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,
-    CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,      KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,
-    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            SFT_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                        KC_RALT, MO(_FUNC), KC_RGUI, KC_RCTL
-  ),
-
-  /* Keymap _COLEMAK: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |CAPS   |  A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  K|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |         Space         |Alt |Fn |Gui  |Ctrl |
-   * `-----------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT_60_ansi(
-    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,
-    HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,      KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC,   KC_RBRC, KC_BSLS,
-    CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,      KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,            KC_ENT,
-    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            SFT_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                        KC_RALT, MO(_FUNC), KC_RGUI, KC_RCTL
-  ),
-
-  /* Keymap _DVORAK: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]|Backsp |
-   * |-----------------------------------------------------------|
-   * |HypTb|  '|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|  \  |
-   * |-----------------------------------------------------------|
-   * |CtrlEsc|  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z|ShiftEnter|
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |         Space         |Alt |Fn |Gui  |Ctrl |
-   * `-----------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT_60_ansi(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,      KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC,   KC_RBRC, KC_BSPC,
-    HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,      KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,   KC_EQL,  KC_BSLS,
-    CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,      KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,            KC_ENT,
-    KC_LSFT,          KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,      KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,               SFT_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                        KC_RALT, MO(_FUNC), KC_RGUI, KC_RCTL
-  ),
-
-  /* Keymap _FUNC: Function Layer
-   * ,-----------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  BL   |
-   * |-----------------------------------------------------------|
-   * |     |Hom| UP|End|   |   |   |Qwt|Cmk|Dvk|   |UP |BL-| BL+ |
-   * |-----------------------------------------------------------|
-   * |      |LFT| DN| RT|   |   |   |   |   |Pg+|LFT|RGT|        |
-   * |-----------------------------------------------------------|
-   * |        |   |   |Prv|Ply|Nxt|   |   |   |Pg-|DN |          |
-   * |-----------------------------------------------------------|
-   * |QK_BOOT|    |    |                       |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-  [_FUNC] = LAYOUT_60_ansi(
-    _______, 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_TOGG,
-    _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_UP,   BL_DOWN, BL_UP,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
-    _______,          _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGDN, KC_DOWN,          _______,
-    QK_BOOT, _______, _______,                   _______,                                     _______, _______, _______, _______
-  )
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/gh60/satan/keymaps/smt/readme.md b/keyboards/gh60/satan/keymaps/smt/readme.md
deleted file mode 100644
index 7b706d60142..00000000000
--- a/keyboards/gh60/satan/keymaps/smt/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# smt's Satan GH60 layout
diff --git a/keyboards/gh60/satan/keymaps/smt/rules.mk b/keyboards/gh60/satan/keymaps/smt/rules.mk
deleted file mode 100644
index edf8c518731..00000000000
--- a/keyboards/gh60/satan/keymaps/smt/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c b/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c
deleted file mode 100644
index b923ca40c6c..00000000000
--- a/keyboards/gh60/satan/keymaps/spacemanspiff/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-#define _BL 0
-#define _FL 1
-#define _CL 3
-
-// Add names for complex momentary keys, to keep the keymap matrix aligned better.
-#define CTL_ESC MT(MOD_LCTL,KC_ESC)
-#define GUI_ENT MT(MOD_RGUI, KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |   `| F1| F2| F3| F4| F5| F6| F7| F8| F9| F0|  -|  =|Del   |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |Ctl/Esc|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Alt |Gui |      Space            |Gui |Alt |FN  |Ctrl |
-   * `-----------------------------------------------------------'
-   */
-[_BL] = LAYOUT_60_ansi(
-  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_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,
-  CTL_ESC,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_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,
-  MO(_CL),  KC_RALT,  KC_LGUI,                      KC_SPC,                                           GUI_ENT,  KC_RALT,  KC_RCTL,  MO(_FL)),
-
-
-  /* Keymap _FL: Function Layer
-   * ,-----------------------------------------------------------.
-   * |  `|   |   |   |   |   |   |   |   |   |   |   |   |  QK_BOOT|
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |
-   * |-----------------------------------------------------------|
-   * |     |VDN|VUP|MUTE|   |   |   |       |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-[_FL] = LAYOUT_60_ansi(
-  KC_GRV,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-  _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-  _______,  _______,  _______,                      _______,                                          _______,  _______,  _______,  _______),
-
-  /* Keymap _CL: Control+ Layer
-   * ,-----------------------------------------------------------.
-   * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del   |
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |PGU|   |   |     |
-   * |-----------------------------------------------------------|
-   * |       |   |   |   |   |   |LFT| DN| UP|RGT|   |   |       |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |PGD|   |   |   |   |          |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                       |    |    |     |    |
-   * `-----------------------------------------------------------'
-   */
-
-[_CL] = LAYOUT_60_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_DEL,
-  KC_TAB,  LCTL(KC_Q),    LCTL(KC_W),    LCTL(KC_E),   LCTL(KC_R),   LCTL(KC_T),   LCTL(KC_Y),   LCTL(KC_U),   LCTL(KC_I),   LCTL(KC_O),    KC_PGUP,        KC_ESC,         LCTL(KC_RBRC),  LCTL(KC_BSLS),
-  _______, LCTL(KC_A),    LCTL(KC_S),    LCTL(KC_D),   LCTL(KC_F),   LCTL(KC_G),   KC_LEFT,      KC_DOWN,      KC_UP,        KC_RIGHT,      LCTL(KC_SCLN),  LCTL(KC_QUOT),                  LCTL(KC_ENT),
-  KC_LSFT,                LCTL(KC_Z),    LCTL(KC_X),   LCTL(KC_C),   LCTL(KC_V),   KC_PGDN,      LCTL(KC_N),   LCTL(KC_M),   LCTL(KC_COMM), LCTL(KC_DOT),   LCTL(KC_SLSH),                  LCTL(KC_RSFT),
-  _______, LCTL(KC_LALT), LCTL(KC_LGUI),                             LCTL(KC_SPC),                                                          LCTL(KC_RGUI),  LCTL(KC_RALT),  KC_RCTL,        MO(_FL)),
-};
-
diff --git a/keyboards/gh60/satan/keymaps/spacemanspiff/readme.md b/keyboards/gh60/satan/keymaps/spacemanspiff/readme.md
deleted file mode 100644
index 1d592509de1..00000000000
--- a/keyboards/gh60/satan/keymaps/spacemanspiff/readme.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Spaceman Spiff Layout for GH60 Satan
-
-![Keyboard Layout](https://i.imgur.com/M9glFON.png)
-
-<!-- http://www.keyboard-layout-editor.com/#/gists/32feaaa31c29afb8198a8ef591db6ddf -->
-
-Designed specifically to make switching back-n-forth with the Apple's MacBook Pro keyboard intuitive. Has a slight tendency toward readline/vim keybindings.
-
-Caps locks becomes an `Esc` when pressed alone, or a `Ctrl` when pressed with another key.
-
-# Base Layer
-
-As simalar to the Apple keyboard as possible. Notiable exception is `Caps Lock`:
-- `Esc` when pressed alone
-- `Ctrl` when pressed with another key
-
-# Control+ Layer
-
-Left Ctrl key switches to the "Control+ Layer". This layer mostly acts like a control key in most cases, with a few exceptions:
-
-- `Ctl+` + `hjkl` are vim-style motion keys
-- `Ctl+` + `p` and `Ctl+` + `n` are page up and down
-- `Ctl+` + `Backspace` is forward delete
-
-# Fn Layer
-
-Audio Controls:
-- `Fn` + `a` Volume Down
-- `Fn` + `s` Volume Up
-- `Fn` + `d` Mute
-
-To flash this layout you need to press `Fn+Backspace`
-
-
diff --git a/keyboards/gh60/satan/keymaps/stanleylai/config.h b/keyboards/gh60/satan/keymaps/stanleylai/config.h
deleted file mode 100644
index 7f4bb441c41..00000000000
--- a/keyboards/gh60/satan/keymaps/stanleylai/config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "../../config.h"
-
-// Backlight configuration
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 3
-
-// Underlight configuration
-#undef RGBLED_NUM
-#define RGBLED_NUM 6        // Number of LEDs
-#undef RGBLIGHT_HUE_STEP
-#define RGBLIGHT_HUE_STEP 8
-#undef RGBLIGHT_SAT_STEP
-#define RGBLIGHT_SAT_STEP 8
-#undef RGBLIGHT_VAL_STEP
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/gh60/satan/keymaps/stanleylai/keymap.c b/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
deleted file mode 100644
index 4caf2dce57b..00000000000
--- a/keyboards/gh60/satan/keymaps/stanleylai/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#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.
-#define _BL   0
-#define _FL   1
-#define _RGBL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // See base_layer.png and rgb_layer.png for layout reference
-
-  // Base Default Layer
-  // Mac Modifier Layout. Use BootMagic to toggle GUI and ALT positions.
-  [_BL] = LAYOUT_60_ansi_split_bs_rshift(
-    QK_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, XXXXXXX,
-    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,
-    LT(_FL, 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_UP,   MO(_FL),
-    KC_LCTL,          KC_LALT, KC_LGUI,                 KC_SPC,                                   KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  // Function layer
-  [_FL] = 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,  XXXXXXX,
-    XXXXXXX, KC_MPRV, KC_UP,   KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS,            KC_INS,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                     XXXXXXX,
-    _______,          KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LT(_RGBL, KC_PGUP), _______,
-    _______, _______, _______,                   KC_MPLY,                                     _______, KC_HOME, KC_PGDN,            KC_END
-  ),
-
-  // RGB Layer
-  [_RGBL] = LAYOUT_60_ansi_split_bs_rshift(
-  #ifdef RGBLIGHT_ENABLE
-    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, BL_TOGG, BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-    _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  #else
-    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, BL_TOGG, BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-    _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  #endif
-  ),
-};
diff --git a/keyboards/gh60/satan/keymaps/unxmaal/README.md b/keyboards/gh60/satan/keymaps/unxmaal/README.md
deleted file mode 100644
index 50ad0cf1feb..00000000000
--- a/keyboards/gh60/satan/keymaps/unxmaal/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Unxmaal's GH60 Satan Layout
-=====================
-* Mostly stolen from /u/robotmaxtron
-
-##Quantum MK Firmware
-For the full Quantum feature list, see the parent readme.md.
-
-* Standard Mac ANSI layout
-* Spacebar acts as space when tapped, Fn when held
-* Menu acts as menu when tapped, Fn2 when held
-* Layer1:
-  * Top row = `~, F1-F12, Del
-  * JKIL = arrow cluster
-* Layer2:
-  * Top row = media controls
-  * JKIL = PgDn/Up/Home/Insert
-  * Backspace = Reset
-
-### Additional Credits
-Keymap has been based on various keymaps available from the QMK Repo for the GH60-SATAN and KC60 keyboards.
\ No newline at end of file
diff --git a/keyboards/gh60/satan/keymaps/unxmaal/keymap.c b/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
deleted file mode 100644
index d70b8054ed8..00000000000
--- a/keyboards/gh60/satan/keymaps/unxmaal/keymap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#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.
-#define _BL 0
-#define _AL 1
-#define _FL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-   *  ANSI Base, Mac style
-   * ,-----------------------------------------------------------------------------.
-   * |Esc   |  1|   2|   3|   4|   5|   6|   7|   8|   9|   0|   -|   = |   Backsp |
-   * |-----------------------------------------------------------------------------|
-   * |Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I|   O|  P|  [|  ]|     \|
-   * |-----------------------------------------------------------------------------|
-   * |Caps/Fn      |    A|    S|    D|    F|   G|  H|  J|  K|  L|  ;|  '|   Enter  |
-   * |-----------------------------------------------------------------------------|
-   * |Shift      |    Z|     X|    C|     V|  B|  N|  M|  ,|  .|  /|     Shift     |
-   * |-----------------------------------------------------------------------------|
-   * |Fn|Alt |Gui | Space(tapped), Fn(held) |Gui |Alt  |Menu(tapped, Fn2(held)|Ctrl|
-   * `-----------------------------------------------------------------------------'
-   */
-  [_BL] = 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_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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,                   KC_RSFT,
-    MO(_AL), KC_LALT, KC_LGUI,                   LT(_AL, KC_SPACE),                            KC_RGUI, KC_RALT, LT(_FL, KC_MENU), KC_RCTL
-  ),
-
-  /*
-   * Pok3r style arrow cluster
-   * ,-----------------------------------------------------------.
-   * |`~ | F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|DEL |
-   * |-----------------------------------------------------------|
-   * |     |   |    |   |   |   |   |   |Up|   |   |   |   |     |
-   * |-----------------------------------------------------------|
-   * |       |   |   |   |   |   |   |Left|Down|Right|   |   |   |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-  [_AL] = 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_DELETE,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  ),
-
-  /* Keymap _FL: Function Layer
-   * ,-----------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |  QK_BOOT|
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   |
-   * |-----------------------------------------------------------|
-   * |      |   |   |   |   |   |   |       |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |  | RGB on|RGB step|Hue+|Hue- |Sat+|Sat-|Val+| Val-| | |   |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-  [_FL] = LAYOUT_60_ansi(
-  #ifdef RGBLIGHT_ENABLE
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,          _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  #else
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______,                   _______,                                     _______, _______, _______, _______
-  #endif
-  ),
-};
diff --git a/keyboards/gh60/satan/keymaps/unxmaal/rules.mk b/keyboards/gh60/satan/keymaps/unxmaal/rules.mk
deleted file mode 100644
index 91ba6cd9e9a..00000000000
--- a/keyboards/gh60/satan/keymaps/unxmaal/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h
index e4946a3bb39..bd501c1f769 100644
--- a/keyboards/giabalanai/config.h
+++ b/keyboards/giabalanai/config.h
@@ -33,19 +33,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // for "Generic" Promicro to be detected correctly as lefthand side (slave)
 #define SPLIT_USB_DETECT
 
-#   define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS
 
 #ifdef RGB_MATRIX_ENABLE
 /* ws2812 RGB MATRIX */
-#   define RGB_MATRIX_LED_COUNT 123
-#   define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-
 //  for all fingers used at once.
 #   define LED_HITS_TO_REMEMBER 10
 
-#   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-
-// the above brighness setting has no effect on rgb_matrix_set_color().
+// the max brightness setting has no effect on rgb_matrix_set_color().
 // Use darker colors instead.
 /*              RGB darker COLORS             */
 #   define RGB_DARKWHITE 0x66, 0x66, 0x66
@@ -66,50 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define RGB_DARKPURPLE 0x30, 0x0, 0x66
 #   define RGB_DARKMAGENTA 0x66, 0x0, 0x66
 #   define RGB_DARKPINK 0x66, 0x33, 0x4C
-
-//  https://docs.qmk.fm/#/feature_rgb_matrix
-//  Enable suspend mode.
-// #    define RGB_DISABLE_WHEN_USB_SUSPENDED true
-
-#   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_TYPING_HEATMAP
-// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// #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  // RGB_MATRIX_ENABLE
 
 /*
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
index 592d7a6966f..b10cbe943ec 100644
--- a/keyboards/giabalanai/info.json
+++ b/keyboards/giabalanai/info.json
@@ -9,7 +9,15 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations" :{
+            "gradient_up_down": true,
+            "rainbow_moving_chevron": true,
+            "hue_breathing": true,
+            "solid_reactive": true,
+            "multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 50
     },
     "rgblight": {
         "led_count": 123,
diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h b/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h
index dd10d213a0b..01ad55eec0f 100644
--- a/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h
+++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/config.h
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    undef MATRIX_COL_PINS_RIGHT
 
 #    ifdef RGBLIGHT_ENABLE
-#        undef RGBLED_NUM
-#        define RGBLED_NUM 120
+#        undef RGBLIGHT_LED_COUNT
+#        define RGBLIGHT_LED_COUNT 120
 #        undef RGBLIGHT_LED_MAP
 #        define RGBLIGHT_LED_MAP { \
            108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, \
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/config.h b/keyboards/giabalanai/keymaps/giabarinaix2led/config.h
index dd10d213a0b..01ad55eec0f 100644
--- a/keyboards/giabalanai/keymaps/giabarinaix2led/config.h
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/config.h
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    undef MATRIX_COL_PINS_RIGHT
 
 #    ifdef RGBLIGHT_ENABLE
-#        undef RGBLED_NUM
-#        define RGBLED_NUM 120
+#        undef RGBLIGHT_LED_COUNT
+#        define RGBLIGHT_LED_COUNT 120
 #        undef RGBLIGHT_LED_MAP
 #        define RGBLIGHT_LED_MAP { \
            108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, \
diff --git a/keyboards/giabalanai/keymaps/party/keymap.c b/keyboards/giabalanai/keymaps/party/keymap.c
deleted file mode 100644
index e4ff3369305..00000000000
--- a/keyboards/giabalanai/keymaps/party/keymap.c
+++ /dev/null
@@ -1,818 +0,0 @@
-/* Copyright 2020 3araht
- *
- * 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 "print.h"
-#include "version.h"
-
-// Alias layout macros that expand groups of keys.
-#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
-
-#define DF_QWER  DF(_QWERTY)
-#define DF_COLE  DF(_COLEMAK)
-#define MO_ADJ   MO(_ADJUST)
-// Long press: go to _FN layer, tap: MUTE
-#define FN_MUTE  LT(_FN, KC_MUTE)
-#define SHIF_UP  RSFT_T(KC_UP)
-#define ADJ_EIS  LT(_ADJUST,KC_LNG2)
-#define MIS_KAN  LT(_MISC,KC_LNG1)
-
-// Used to set octave to 0
-extern midi_config_t midi_config;
-uint8_t midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
-
-// UNISON flags
-static bool melody_dyad_high = false;  //  true when +1 octave unison dyad is enabled.
-static bool melody_dyad_low  = false;  //  true when -1 octave unison dyad is enabled.
-
-static bool melody_unison_suppress  = true;  //  true: velocity of octave unison note is suppressd to UNISON_VELOCITY_RATIO
-
-// To record the status of Bass Chord (single or dyad, default: dyad.)
-typedef union {
-    uint32_t raw;
-    struct {
-        bool isSingleBass:1;
-    };
-} user_config_t;
-user_config_t user_config;
-
-#define IS_SINGLE_BASS()   (user_config.isSingleBass)
-
-#ifdef RGBLIGHT_ENABLE
-/* used to specify there is no LED on the keylocation. */
-#    define NO_LED 255
-#endif  //  RGBLIGHT_ENABLE
-
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _C_SYSTEM_BASE,          //  MIDI C-system
-    _FAKE_B_SYSTEM,          //  MIDI fake B-system doesn't have correct assignments on top two rows. The bottom 3 rows are B-system.
-    _C_SYSTEM_BASS2ROW,      //  counter bass system
-    _FAKE_B_SYSTEM_BASS2ROW, //  MIDI fake B-system doesn't have correct assignments on top two rows. The bottom 3 rows are B-system. Counter bass version.
-    _C_SYSTEM_ENTIRELY,      //  single notes for both left and right keybaords.
-    _C_SYSTEM_FREEBASS,      //  C-system Free Bass
-    _CHROMATONE,
-    _CFLIP_BASS2ROW,         //  180 degree flipped layout on right side keyboard
-    _QWERTY,
-    _COLEMAK,
-    _ADJUST,                 //  for Fn keys, etc.
-    _FN                      //  for changing layers, octaves, etc.
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-
-    // MIDI Chord Keycodes - Root notes
-    MY_CHORD_MIN = SAFE_RANGE,
-
-    MI_CH_Cr = MY_CHORD_MIN,
-    MI_CH_Csr,
-    MI_CH_Dbr = MI_CH_Csr,
-    MI_CH_Dr,
-    MI_CH_Dsr,
-    MI_CH_Ebr = MI_CH_Dsr,
-    MI_CH_Er,
-    MI_CH_Fr,
-    MI_CH_Fsr,
-    MI_CH_Gbr = MI_CH_Fsr,
-    MI_CH_Gr,
-    MI_CH_Gsr,
-    MI_CH_Abr = MI_CH_Gsr,
-    MI_CH_Ar,
-    MI_CH_Asr,
-    MI_CH_Bbr = MI_CH_Asr,
-    MI_CH_Br,
-
-    // MIDI Chord Keycodes - Major
-
-    MI_CH_C,
-    MI_CH_Cs,
-    MI_CH_Db = MI_CH_Cs,
-    MI_CH_D,
-    MI_CH_Ds,
-    MI_CH_Eb = MI_CH_Ds,
-    MI_CH_E,
-    MI_CH_F,
-    MI_CH_Fs,
-    MI_CH_Gb = MI_CH_Fs,
-    MI_CH_G,
-    MI_CH_Gs,
-    MI_CH_Ab = MI_CH_Gs,
-    MI_CH_A,
-    MI_CH_As,
-    MI_CH_Bb = MI_CH_As,
-    MI_CH_B,
-
-    // MIDI Chord Keycodes Minor
-
-    MI_CH_Cm,
-    MI_CH_Csm,
-    MI_CH_Dbm = MI_CH_Csm,
-    MI_CH_Dm,
-    MI_CH_Dsm,
-    MI_CH_Ebm = MI_CH_Dsm,
-    MI_CH_Em,
-    MI_CH_Fm,
-    MI_CH_Fsm,
-    MI_CH_Gbm = MI_CH_Fsm,
-    MI_CH_Gm,
-    MI_CH_Gsm,
-    MI_CH_Abm = MI_CH_Gsm,
-    MI_CH_Am,
-    MI_CH_Asm,
-    MI_CH_Bbm = MI_CH_Asm,
-    MI_CH_Bm,
-
-    //MIDI Chord Keycodes Dominant Seventh
-
-    MI_CH_CDom7,
-    MI_CH_CsDom7,
-    MI_CH_DbDom7 = MI_CH_CsDom7,
-    MI_CH_DDom7,
-    MI_CH_DsDom7,
-    MI_CH_EbDom7 = MI_CH_DsDom7,
-    MI_CH_EDom7,
-    MI_CH_FDom7,
-    MI_CH_FsDom7,
-    MI_CH_GbDom7 = MI_CH_FsDom7,
-    MI_CH_GDom7,
-    MI_CH_GsDom7,
-    MI_CH_AbDom7 = MI_CH_GsDom7,
-    MI_CH_ADom7,
-    MI_CH_AsDom7,
-    MI_CH_BbDom7 = MI_CH_AsDom7,
-    MI_CH_BDom7,
-
-    // MIDI Chord Keycodes Diminished Seventh
-
-    MI_CH_CDim7,
-    MI_CH_CsDim7,
-    MI_CH_DbDim7 = MI_CH_CsDim7,
-    MI_CH_DDim7,
-    MI_CH_DsDim7,
-    MI_CH_EbDim7 = MI_CH_DsDim7,
-    MI_CH_EDim7,
-    MI_CH_FDim7,
-    MI_CH_FsDim7,
-    MI_CH_GbDim7 = MI_CH_FsDim7,
-    MI_CH_GDim7,
-    MI_CH_GsDim7,
-    MI_CH_AbDim7 = MI_CH_GsDim7,
-    MI_CH_ADim7,
-    MI_CH_AsDim7,
-    MI_CH_BbDim7 = MI_CH_AsDim7,
-    MI_CH_BDim7,
-
-    MY_CHORD_MAX = MI_CH_BDim7,
-
-    VERSION,
-    CSYSTEM,  // C-SYSTEM layout
-    BSYSTEM,  // B-SYSTEM layout
-    CNTBASC,  // CouNTer BASs C-system layout
-    CNTBASB,  // CouNTer BASs B-system layout
-    CSYSALL,  // C-SYStem ALL layout
-    CSYSFBS,  // C-SYStem Free BaSs
-    CHRTONE,  // CHRomaTONE layout
-    CFLIP2B,  // C-system FLIPped 2(to) Backwards
-    TGLBASS,  // ToGgLe BASS unison
-    TGLMICH,  // ToGgLe MIdi CHannel separation
-    MELDYAL,  // MELody DYad Low
-    MELODYS,  // MELODY Single
-    MELDYAH,  // MELody DYad High
-    TGLUVEL   // ToGgLe Unison VELocity
-};
-
-#define MY_CHORD_COUNT (MY_CHORD_MAX - MY_CHORD_MIN + 1)
-static uint8_t chord_status[MY_CHORD_COUNT];
-static uint8_t my_tone_status[MIDI_TONE_COUNT];
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* C-system Base */
-  [_C_SYSTEM_BASE] = LAYOUT(
-    MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
-      MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
-        MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
-          MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
-            MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, MI_CH_FDim7, MI_CH_CDim7, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_FsDim7,
-
-    MI_Fs2,
-      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
-    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
-      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
-  ),
-
-  /* fake B-system */
-  [_FAKE_B_SYSTEM] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-
-    MI_Ab2,
-      MI_A2,  MI_C3,  MI_Eb3, MI_Gb3, MI_A3, MI_C4,  MI_Eb4, MI_Gb4, MI_A4, MI_C5,  MI_Eb5, MI_Gb5,     _______,
-    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3, MI_Bb3, MI_Db4, MI_E4,  MI_G4, MI_Bb4, MI_Db5, MI_E5,  MI_G5,
-      MI_Ab2, MI_B2,  MI_D3,  MI_F3, MI_Ab3, MI_B3,  MI_D4,  MI_F4, MI_Ab4, MI_B4,  MI_D5,  MI_F5
-  ),
-
-  /* BASS2row */
-  [_C_SYSTEM_BASS2ROW] = LAYOUT(
-    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
-      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
-        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
-          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
-            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
-
-    MI_Fs2,
-      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    _______,
-    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
-      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
-  ),
-
-  /* fake B-system */
-  [_FAKE_B_SYSTEM_BASS2ROW] = LAYOUT(
-    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
-      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
-        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
-          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
-            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
-
-    MI_Ab2,
-      MI_A2,  MI_C3,  MI_Eb3, MI_Gb3, MI_A3, MI_C4,  MI_Eb4, MI_Gb4, MI_A4, MI_C5,  MI_Eb5, MI_Gb5,     _______,
-    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3, MI_Bb3, MI_Db4, MI_E4,  MI_G4, MI_Bb4, MI_Db5, MI_E5,  MI_G5,
-      MI_Ab2, MI_B2,  MI_D3,  MI_F3, MI_Ab3, MI_B3,  MI_D4,  MI_F4, MI_Ab4, MI_B4,  MI_D5,  MI_F5
-  ),
-
-  /* C-system entirely */
-  [_C_SYSTEM_ENTIRELY] = LAYOUT(
-    MI_BNDU, XXXXXXX, XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2,
-      MI_BNDD, XXXXXXX, MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2,
-        XXXXXXX, XXXXXXX, MI_D,    MI_F,    MI_Ab,   MI_B,    MI_D1,  MI_F1,  MI_Ab1, MI_B1,  MI_D2,  MI_F2,
-          XXXXXXX, MI_Db,   MI_E,    MI_G,    MI_Bb,   MI_Db1, MI_E1,  MI_G1,  MI_Bb1, MI_Db2, MI_E2,  MI_G2,
-            MI_C,    MI_Eb,   MI_Fs,   MI_A,    MI_C1,  MI_Eb1, MI_Fs1, MI_A1,  MI_C2,  MI_Eb2, MI_Fs2, MI_A2,
-
-    MI_Fs2,
-      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
-    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
-      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
-  ),
-
-  /* C-system free bass */
-  [_C_SYSTEM_FREEBASS] = LAYOUT(
-    MI_Db3,  MI_Bb2,  MI_G2,   MI_E2,   MI_Db2,  MI_Bb1, MI_G1,   MI_E1,  MI_Db1,  MI_Bb,  MI_G,  MI_E,
-      MI_C3,   MI_A2,   MI_Fs2,  MI_Eb2,  MI_C2,   MI_A1,  MI_Fs1,  MI_Eb1,  MI_C1,  MI_A,   MI_Fs, MI_Eb,
-        MI_B2,   MI_Ab2,  MI_F2,   MI_D2,   MI_B1,  MI_Ab1,   MI_F1,  MI_D1,   MI_B,    MI_Ab,  MI_F,  MI_D,
-          MI_Bb2, MI_G2,   MI_E2,   MI_Db2,  MI_Bb1, MI_G1,    MI_E1,  MI_Db1,   MI_Bb,  MI_G,   MI_E,  MI_Db,
-            MI_A2,  MI_Fs2,  MI_Eb2,  MI_C2,   MI_A1,  MI_Fs1,   MI_Eb1,  MI_C1,   MI_A,   MI_Fs,  MI_Eb, MI_C,
-
-    MI_Fs2,
-      MI_Ab2, MI_B2,  MI_D3,  MI_F3,  MI_Ab3, MI_B3,  MI_D4,  MI_F4,  MI_Ab4, MI_B4,  MI_D5,  MI_F5,    FN_MUTE,
-    MI_G2,  MI_Bb2, MI_Db3, MI_E3,  MI_G3,  MI_Bb3, MI_Db4, MI_E4,  MI_G4,  MI_Bb4, MI_Db5, MI_E5,  MI_G5,
-      MI_A2,  MI_C3,  MI_Eb3, MI_Fs3, MI_A3,  MI_C4,  MI_Eb4, MI_Fs4, MI_A4,  MI_C5,  MI_Eb5, MI_Fs5
-  ),
-
-  /* Chromatone */
-  [_CHROMATONE] = LAYOUT(
-    MI_Db,   MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,
-      MI_D,    MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1, MI_Bb1, MI_C2,
-        MI_Eb,   MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,  MI_Db2,
-          MI_E,    MI_Fs,   MI_Ab,   MI_Bb,   MI_C1,  MI_D1,  MI_E1,  MI_Fs1, MI_Ab1, MI_Bb1, MI_C2,  MI_D2,
-            MI_F,    MI_G,    MI_A,    MI_B,    MI_Db1, MI_Eb1, MI_F1,  MI_G1,  MI_A1,  MI_B1,  MI_Db2, MI_Eb2,
-
-    MI_C2,
-      MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3, MI_Eb3, MI_F3,  MI_G3,  MI_A3,  MI_B3,    FN_MUTE,
-    MI_C2,  MI_D2,  MI_E2,  MI_Gb2, MI_Ab2, MI_Bb2, MI_C3,  MI_D3,  MI_E3,  MI_Gb3, MI_Ab3, MI_Bb3, MI_C4,
-      MI_Db2, MI_Eb2, MI_F2,  MI_G2,  MI_A2,  MI_B2,  MI_Db3, MI_Eb3, MI_F3,  MI_G3,  MI_A3,  MI_B3
-  ),
-
-  [_CFLIP_BASS2ROW] = LAYOUT(
-    MI_CH_Fr,     MI_CH_Cr,     MI_CH_Gr,     MI_CH_Dr,     MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,   MI_CH_Csr,   MI_CH_Gsr,   MI_CH_Dsr,   MI_CH_Asr,
-      MI_CH_Dbr,    MI_CH_Abr,    MI_CH_Ebr,    MI_CH_Bbr,    MI_CH_Fr,    MI_CH_Cr,    MI_CH_Gr,    MI_CH_Dr,    MI_CH_Ar,    MI_CH_Er,    MI_CH_Br,    MI_CH_Fsr,
-        MI_CH_Db,     MI_CH_Ab,     MI_CH_Eb,     MI_CH_Bb,     MI_CH_F,     MI_CH_C,     MI_CH_G,     MI_CH_D,     MI_CH_A,     MI_CH_E,     MI_CH_B,     MI_CH_Fs,
-          MI_CH_Dbm,    MI_CH_Abm,    MI_CH_Ebm,    MI_CH_Bbm,    MI_CH_Fm,    MI_CH_Cm,    MI_CH_Gm,    MI_CH_Dm,    MI_CH_Am,    MI_CH_Em,    MI_CH_Bm,    MI_CH_Fsm,
-            MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
-
-    MI_G5,
-      MI_F5,  MI_D5,  MI_B4,  MI_Ab4, MI_F4,  MI_D4,  MI_B3,  MI_Ab3, MI_F3,  MI_D3,  MI_B2,  MI_Ab2,   FN_MUTE,
-    MI_Fs5, MI_Eb5, MI_C5,  MI_A4,  MI_Fs4, MI_Eb4, MI_C4,  MI_A3,  MI_Fs3, MI_Eb3, MI_C3,  MI_A2,  MI_Fs2,
-      MI_E5,  MI_Db5, MI_Bb4, MI_G4,  MI_E4,  MI_Db4, MI_Bb3, MI_G3,  MI_E3,  MI_Db3, MI_Bb2, MI_G2
-  ),
-
-  /* QWERTY */
-  [_QWERTY] = LAYOUT_wrapper(
-    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
-      KC_TAB,  _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_DEL,
-        KC_CAPS, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_ENT,
-          KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT,
-            KC_LCTL, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LNG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
-
-    _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  /* COLEMAK */
-  [_COLEMAK] = LAYOUT_wrapper(
-    QK_GESC, _________________NUMBER_L__________________, _________________NUMBER_R__________________, KC_BSPC,
-      KC_TAB,  _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_DEL,
-        KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT,
-          KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, SHIF_UP,
-            KC_CAPS, KC_LGUI, KC_LALT, ADJ_EIS, KC_SPC,  KC_SPC,  KC_LNG1, KC_APP, MO_ADJ,  KC_LEFT, KC_DOWN, KC_RGHT,
-
-    _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  /* ADJUST */
-  [_ADJUST] = LAYOUT_wrapper(
-    _______, _________________FUNC__L___________________, _________________FUNC__R___________________, _______,
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_GRV,  _______,
-          _______, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, _______,
-            _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_BSLS, _______,
-
-    _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-
-  /* Fn */
-  [_FN] = LAYOUT(
-    CSYSTEM, BSYSTEM, CNTBASC, CSYSALL, CHRTONE, CFLIP2B, CSYSFBS, CNTBASB, XXXXXXX, XXXXXXX, RGB_MOD, RGB_TOG,
-      DF_QWER, TGLBASS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TGLMICH,
-          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-
-    XXXXXXX,
-      MI_OCN2, MI_OCN1, MI_OC0,  MI_OC1,  MI_OC2,  XXXXXXX, XXXXXXX, MI_OCTD, MI_OCTU, XXXXXXX, VERSION, EE_CLR, _______,
-    CSYSTEM, BSYSTEM,  CNTBASC,  CSYSALL,  CHRTONE,  CFLIP2B, CSYSFBS, CNTBASB, XXXXXXX, MI_VELD, MI_VELU, RGB_MOD, RGB_TOG,
-      XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, MI_TRSD, MI_TRSU, TGLUVEL, MELDYAL, MELODYS, MELDYAH
-  )
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_C_SYSTEM_BASE]          = { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
-    [_FAKE_B_SYSTEM]          = { ENCODER_CCW_CW(_______,  _______) },
-    [_C_SYSTEM_BASS2ROW]      = { ENCODER_CCW_CW(_______,  _______) },
-    [_FAKE_B_SYSTEM_BASS2ROW] = { ENCODER_CCW_CW(_______,  _______) },
-    [_C_SYSTEM_ENTIRELY]      = { ENCODER_CCW_CW(_______,  _______) },
-    [_C_SYSTEM_FREEBASS]      = { ENCODER_CCW_CW(_______,  _______) },
-    [_CHROMATONE]             = { ENCODER_CCW_CW(_______,  _______) },
-    [_CFLIP_BASS2ROW]         = { ENCODER_CCW_CW(_______,  _______) },
-    [_QWERTY]                 = { ENCODER_CCW_CW(_______,  _______) },
-    [_COLEMAK]                = { ENCODER_CCW_CW(_______,  _______) },
-    [_ADJUST]                 = { ENCODER_CCW_CW(_______,  _______) },
-    [_FN]                     = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
-};
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-
-// Light up adjust layer keys (left keyboard)
-const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS({1,  10, HSV_ORANGE},
-                                                                             {21,  2, HSV_ORANGE},
-                                                                             {25,  3, HSV_ORANGE},
-                                                                             {30,  5, HSV_ORANGE},
-                                                                             {37,  2, HSV_ORANGE},
-                                                                             {45,  2, HSV_ORANGE},
-                                                                             {57,  2, HSV_ORANGE}
-);
-
-// Light up fn layer keys
-const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(                           //  left keyboard
-                                                                         {0,   8, HSV_ORANGE},      //  MIDI layouts
-                                                                         {11,  1, HSV_RED},         //  RGB_TOG
-                                                                         {12,  1, HSV_WHITE},       //  DF_QWER
-                                                                         {13,  1, HSV_CORAL},       //  TGLBASS
-                                                                         {24,  1, HSV_WHITE},       //  DF_COLE
-                                                                         {35,  1, HSV_TEAL},        //  TGLMICH
-#if 0  //  Color Test
-                                                                         {36,  1, HSV_WHITE},
-                                                                         {37,  1, HSV_RED},
-                                                                         {38,  1, HSV_CORAL},
-                                                                         {39,  1, HSV_ORANGE},
-                                                                         {40,  1, HSV_GOLDENROD},
-                                                                         {41,  1, HSV_GOLD},
-                                                                         {42,  1, HSV_YELLOW},
-                                                                         {43,  1, HSV_CHARTREUSE},
-                                                                         {44,  1, HSV_GREEN},
-                                                                         {45,  1, HSV_SPRINGGREEN},
-                                                                         {46,  1, HSV_TURQUOISE},
-                                                                         {47,  1, HSV_TEAL},
-                                                                         {48,  1, HSV_CYAN},
-                                                                         {49,  1, HSV_AZURE},
-                                                                         {50,  1, HSV_BLUE},
-                                                                         {51,  1, HSV_PURPLE},
-                                                                         {52,  1, HSV_MAGENTA},
-                                                                         {53,  1, HSV_PINK},
-#endif
-                                                                                                    //  right keyboard
-                                                                         {60,  8, HSV_ORANGE},      //  MIDI layouts
-                                                                         {74,  1, HSV_CORAL},       //  TGLBASS
-                                                                         {85,  1, HSV_BLUE},        //  MIDI Oct
-                                                                         {86,  1, HSV_CYAN},        //  MIDI Oct
-                                                                         {87,  1, HSV_SPRINGGREEN}, //  MIDI Oct
-                                                                         {88,  1, HSV_GREEN},       //  MIDI Oct
-                                                                         {89,  1, HSV_CHARTREUSE},  //  MIDI Oct
-                                                                         {95,  1, HSV_GOLD},        //  VERSION
-                                                                         {96,  1, HSV_PINK},        //  EE_CLR
-                                                                         {98,  8, HSV_ORANGE},      //  MIDI layouts
-                                                                         {107, 1, HSV_YELLOW},      //  MI_VELD
-                                                                         {108, 1, HSV_GREEN},       //  MI_VELU
-                                                                         {110, 1, HSV_RED},         //  RGB_TOG
-                                                                         {112, 1, HSV_CORAL},       //  TGLBASS
-                                                                         {119, 1, HSV_CORAL},       //  TGLUVEL
-                                                                         {120, 1, HSV_CYAN},        //  MELDYAL
-                                                                         {121, 1, HSV_GOLD},        //  MELODYS
-                                                                         {122, 1, HSV_SPRINGGREEN}  //  MELDYAH
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_fn_layer, my_adjust_layer);
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // Both layers will light up if both kb layers are active
-    rgblight_set_layer_state(0, layer_state_cmp(state, _FN));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _ADJUST));
-    return state;
-};
-
-#endif  //  RGBLIGHT_ENABLE
-
-void my_init(void){
-    //  Set octave to 0
-    midi_config.octave = QK_MIDI_OCTAVE_0 - MIDI_OCTAVE_MIN;
-    // avoid using 127 since it is used as a special number in some sound sources.
-    midi_config.velocity = MIDI_INITIAL_VELOCITY;
-}
-
-void eeconfig_init_user(void) {
-    midi_init();
-    my_init();
-
-    // Used to set octave to 0
-    midi_bass_ch = 0, midi_chord_ch = 0;  // By default, all use the same channel.
-
-    // UNISON flags
-    melody_dyad_high = false;  //  true when +1 octave unison dyad is enabled.
-    melody_dyad_low  = false;  //  true when -1 octave unison dyad is enabled.
-    melody_unison_suppress  = true;  //  true: velocity of octave unison note is suppressd to UNISON_VELOCITY_RATIO
-
-    //  Reset Bass setting
-    user_config.raw = 0;  // default: dyad
-    eeconfig_update_user(user_config.raw);
-
-    //  Reset the midi keyboard layout
-    set_single_persistent_default_layer(_C_SYSTEM_BASS2ROW);
-
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_sethsv(HSV_BLUE);
-        //  party mode (for LED soldering test.)
-    rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
-#endif
-}
-
-#ifdef RGB_MATRIX_ENABLE
-bool rgb_matrix_indicators_user(void) {
-    uint8_t i;
-    // uint32_t mode = rgblight_get_mode();
-
-    if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
-
-        uint8_t layer = biton32(layer_state);
-
-        switch (layer) {
-            case _ADJUST:
-                rgb_matrix_set_color(30, RGB_DARKORANGE);
-                rgb_matrix_set_color(34, RGB_DARKORANGE);
-                // rgb_matrix_set_color(72, RGB_DARKORANGE);
-                break;
-            case _FN:
-                for (i = 0;i < 8;i++) {
-                    rgb_matrix_set_color(74 - i, RGB_DARKORANGE);      //  MIDI layouts
-                    //  right keyboard
-                    rgb_matrix_set_color(i, RGB_DARKORANGE);      //  MIDI layouts
-                    rgb_matrix_set_color(50 - i, RGB_DARKORANGE);      //  MIDI layouts
-                }
-
-                // rgb_matrix_set_color(pgm_read_byte(&convert_led_location2number[11]),  RGB_RED);         //  RGB_TOG  <- too heavy.
-                rgb_matrix_set_color(64,  RGB_DARKBLUE);         //  RGB_MOD
-                rgb_matrix_set_color(63,  RGB_DARKRED);         //  RGB_TOG
-                rgb_matrix_set_color(76,  RGB_DARKCORAL);       //  TGLBASS
-
-                rgb_matrix_set_color(75,  RGB_DARKWHITE);       //  DF_QWER
-                rgb_matrix_set_color(98,  RGB_DARKWHITE);       //  DF_COLE
-                rgb_matrix_set_color(87,  RGB_DARKTEAL);        //  TGLMICH
-
-                rgb_matrix_set_color(23, RGB_DARKCORAL);       //  TGLBASS
-                rgb_matrix_set_color(26, RGB_DARKBLUE);        //  MIDI Oct
-                rgb_matrix_set_color(27, RGB_DARKCYAN);        //  MIDI Oct
-                rgb_matrix_set_color(28, RGB_DARKSPRINGGREEN); //  MIDI Oct
-                rgb_matrix_set_color(29, RGB_DARKGREEN);       //  MIDI Oct
-                rgb_matrix_set_color(30, RGB_DARKCHARTREUSE);  //  MIDI Oct
-                rgb_matrix_set_color(36, RGB_DARKGOLD);        //  VERSION
-                rgb_matrix_set_color(37, RGB_DARKPINK);        //  EE_CLR
-                rgb_matrix_set_color(41, RGB_DARKYELLOW);      //  MI_VELD
-                rgb_matrix_set_color(40, RGB_DARKGREEN);       //  MI_VELU
-                rgb_matrix_set_color(39, RGB_DARKBLUE);        //  RGB_MOD
-                rgb_matrix_set_color(38, RGB_DARKRED);         //  RGB_TOG
-                rgb_matrix_set_color(52, RGB_DARKCORAL);       //  TGLBASS
-                rgb_matrix_set_color(59, RGB_DARKCORAL);       //  TGLUVEL
-                rgb_matrix_set_color(60, RGB_DARKCYAN);        //  MELDYAL
-                rgb_matrix_set_color(61, RGB_DARKGOLD);        //  MELODYS
-                rgb_matrix_set_color(62, RGB_DARKSPRINGGREEN);  //  MELDYAH
-                break;
-        }
-    }
-    return false;
-}
-#endif
-
-void keyboard_post_init_user(void) {
-    my_init();
-
-    for (uint8_t i = 0; i < MY_CHORD_COUNT; i++) {
-        chord_status[i] = MIDI_INVALID_NOTE;
-    }
-
-    for (uint8_t i = 0; i < MIDI_TONE_COUNT; i++) {
-        my_tone_status[i] = MIDI_INVALID_NOTE;
-    }
-    //  load EEPROM data for isSingleBass
-    user_config.raw = eeconfig_read_user();
-
-#ifdef RGBLIGHT_ENABLE
-
-    rgblight_layers = my_rgb_layers;
-
-    // Reset LED off
-    rgblight_sethsv(HSV_BLACK);
-#    if defined(RGBLIGHT_EFFECT_KNIGHT) || defined(RGBLIGHT_EFFECT_TWINKLE)
-    rgblight_sethsv(30, 50, 40);
-#        ifdef RGBLIGHT_EFFECT_KNIGHT
-    rgblight_mode(RGBLIGHT_MODE_KNIGHT);
-#        elif defined(RGBLIGHT_EFFECT_TWINKLE)
-    rgblight_mode(RGBLIGHT_MODE_TWINKLE+3);
-#        endif
-#    endif
-#endif  // RGBLIGHT_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_sethsv(HSV_BLUE);
-    //  party mode (for LED soldering test.)
-    rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
-#endif
-};
-
-void toggle_isSingleBass(void) {
-#ifdef CONSOLE_ENABLE
-    uprintf("isSingleBass(before) %u\n", user_config.isSingleBass);
-#endif
-    user_config.isSingleBass = !user_config.isSingleBass;
-#ifdef CONSOLE_ENABLE
-    uprintf("isSingleBass(after) %u\n", user_config.isSingleBass);
-#endif
-
-    eeconfig_update_user(user_config.raw);
-}
-
-void toggle_MIDI_channel_separation(void) {
-    if (midi_chord_ch > 0) {
-        midi_chord_ch = 0;
-        midi_bass_ch  = 0;
-    } else {
-        midi_chord_ch = 1;
-        midi_bass_ch  = 2;
-    }
-}
-
-#ifdef RGBLIGHT_ENABLE
-void keylight_manager(keyrecord_t *record, uint8_t hue, uint8_t sat, uint8_t val, uint8_t keylocation) {
-    if (keylocation == NO_LED) {
-        return;  // do nothing.
-#    ifdef CONSOLE_ENABLE
-        uprintf("keylight_manager, NO_LED\n");
-#    endif
-    }
-
-    if (record->event.pressed) {
-        rgblight_sethsv_at(hue, sat, val, keylocation);
-    } else {
-        rgblight_sethsv_at(HSV_BLACK, keylocation);
-    }
-}
-#endif  // RGBLIGHT_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint16_t root_note = MIDI_INVALID_NOTE;  // Starting value for the root note of each chord
-
-#ifdef RGBLIGHT_ENABLE
-    /* prepare for turning on LEDs when keys are pressed. */
-    uint8_t r            = record->event.key.row;
-    uint8_t c            = record->event.key.col;
-    // uint8_t keylocation  = convert_key_to_led[MATRIX_COLS * r + c];
-    // uint8_t keylocation2 = convert_key_to_led2[MATRIX_COLS * r + c];
-    uint8_t keylocation  = pgm_read_byte(&convert_key_to_led[MATRIX_COLS * r + c]);
-    uint8_t keylocation2 = pgm_read_byte(&convert_key_to_led2[MATRIX_COLS * r + c]);
-#endif  // RGBLIGHT_ENABLE
-
-    uint8_t chord        = keycode - MY_CHORD_MIN;
-
-    switch (keycode) {
-        case VERSION: // Output firmware info.
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
-            }
-            break;
-
-        //  set default layer and save it to EEPROM when MIDI key layers are selected.
-        case CSYSTEM:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_C_SYSTEM_BASE);
-            }
-            break;
-
-        case BSYSTEM:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_FAKE_B_SYSTEM);
-            }
-            break;
-
-        case CNTBASC:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_C_SYSTEM_BASS2ROW);
-            }
-            break;
-
-        case CNTBASB:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_FAKE_B_SYSTEM_BASS2ROW);
-            }
-            break;
-
-        case CSYSALL:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_C_SYSTEM_ENTIRELY);
-            }
-            break;
-
-        case CHRTONE:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_CHROMATONE);
-            }
-            break;
-
-        case CFLIP2B:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_CFLIP_BASS2ROW);
-            }
-            break;
-
-        case CSYSFBS:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_C_SYSTEM_FREEBASS);
-            }
-            break;
-
-        case TGLBASS:
-            if (record->event.pressed) {
-                toggle_isSingleBass();
-            };
-            break;
-
-        case TGLMICH:
-            if (record->event.pressed) {
-                toggle_MIDI_channel_separation();
-            };
-            break;
-
-        case MELDYAL:
-            if (record->event.pressed) {
-                melody_dyad_low  = true;
-                melody_dyad_high = false;
-            };
-            break;
-
-        case MELODYS:
-            if (record->event.pressed) {
-                melody_dyad_low  = false;
-                melody_dyad_high = false;
-            };
-            break;
-
-        case MELDYAH:
-            if (record->event.pressed) {
-                melody_dyad_low  = false;
-                melody_dyad_high = true;
-            };
-            break;
-
-        case TGLUVEL:
-            if (record->event.pressed) {
-                melody_unison_suppress = !melody_unison_suppress;
-            };
-            break;
-
-        // MIDI Chord Keycodes, on the left side.
-        case MI_CH_Cr ... MI_CH_Br:  // Root Notes
-            root_note = keycode - MI_CH_Cr + MI_C1;
-            my_process_midi4Bass(midi_bass_ch, record, chord_status, chord, root_note, IS_SINGLE_BASS());
-#ifdef RGBLIGHT_ENABLE
-            keylight_manager(record, HSV_GOLDENROD, keylocation);
-#endif
-            break;
-
-        case MI_CH_C ... MI_CH_B:  // Major Chords
-            root_note = keycode - MI_CH_C + MI_C2;
-            // Root, Major Third, and Fifth Notes
-            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 4, 7);
-#ifdef RGBLIGHT_ENABLE
-            keylight_manager(record, HSV_GOLDENROD, keylocation);
-#endif
-            break;
-
-        case MI_CH_Cm ... MI_CH_Bm:  // Minor Chord
-            root_note = keycode - MI_CH_Cm + MI_C2;
-            // Root, Minor Third, and Fifth Notes
-            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 7);
-#ifdef RGBLIGHT_ENABLE
-            keylight_manager(record, HSV_GOLDENROD, keylocation);
-#endif
-            break;
-
-        case MI_CH_CDom7 ... MI_CH_BDom7:  // Dominant 7th Chord
-            root_note = keycode - MI_CH_CDom7 + MI_C2;
-            // Major Third, Major Fifth, and Minor Seventh Notes
-            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 4, 7, 10);
-#ifdef RGBLIGHT_ENABLE
-            keylight_manager(record, HSV_GOLDENROD, keylocation);
-#endif
-            break;
-
-        case MI_CH_CDim7 ... MI_CH_BDim7:                // Diminished 7th Chord
-            root_note = keycode - MI_CH_CDim7 + MI_C2;
-            // Root, Minor Third, and Diminished 5th Note
-            my_process_midi4TriadChords(midi_chord_ch, record, chord_status, chord, root_note, 0, 3, 6);
-#ifdef RGBLIGHT_ENABLE
-            keylight_manager(record, HSV_GOLDENROD, keylocation);
-#endif
-            break;
-
-#ifdef RGBLIGHT_ENABLE
-        case KC_A ... KC_RGUI:                // for QWERTY
-        case QK_GRAVE_ESCAPE:
-        case ADJ_EIS:
-        case MO_ADJ:
-        case SHIF_UP:
-            keylight_manager(record, HSV_GOLDENROD, keylocation);
-            break;
-#endif
-
-        // Keycodes on the right side.
-        case MIDI_TONE_MIN ... MIDI_TONE_MAX:  // notes on the right side keyboard.
-            //  root_note is played by process_midi().
-            if ( melody_dyad_high == true ) {        //  play 1 octave higher as well.
-                my_process_midi(0, keycode, record, my_tone_status, 12, melody_unison_suppress);
-            } else if ( melody_dyad_low == true ) {  //  play 1 octave lower as well.
-                my_process_midi(0, keycode, record, my_tone_status, -12, melody_unison_suppress);
-            }
-#ifdef RGBLIGHT_ENABLE
-            keylight_manager(record, HSV_GOLDENROD, keylocation);
-            keylight_manager(record, HSV_GOLDENROD, keylocation2);
-#endif
-            break;
-
-#ifdef RGBLIGHT_ENABLE
-        // case KC_MUTE:
-        case FN_MUTE:
-            keylight_manager(record, HSV_GOLDENROD, keylocation);
-            break;
-#endif
-    }
-    // If console is enabled, it will print the matrix position and status of each key pressed
-#if defined(CONSOLE_ENABLE) && defined(RGBLIGHT_ENABLE)
-    uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
-    uprintf("r=%d, c=%d, keyloc=%d, keyloc2=%d, matrix_col x r + c = %d\n", r, c, keylocation, keylocation2, MATRIX_COLS * r + c);
-#endif
-    return true;
-}
diff --git a/keyboards/giabalanai/keymaps/party/readme.md b/keyboards/giabalanai/keymaps/party/readme.md
deleted file mode 100644
index 797fed76f83..00000000000
--- a/keyboards/giabalanai/keymaps/party/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The fancy LED ver. for giabalanai
-# warning: There is little space left for the firmware. You can't do anything further with this firmware.
-#          Power consumption might exceed 5 V * 500 mA = 2.5 W or so.
diff --git a/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc b/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc
deleted file mode 100644
index 6159968a69b..00000000000
--- a/keyboards/giabalanai/keymaps/party/rgb_matrix_user.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
-RGB_MATRIX_EFFECT(my_solid_reactive_with_CnoteIndicator)
-RGB_MATRIX_EFFECT(my_party_rocks)
-
-#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-bool my_solid_reactive_with_CnoteIndicator(effect_params_t* params) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
-    uint16_t max_tick = 65535 / rgb_matrix_config.speed;
-    for (uint8_t i = led_min; i < led_max; i++) {
-        RGB_MATRIX_TEST_LED_FLAGS();
-        HSV hsv = rgb_matrix_config.hsv;
-        switch (i) {
-            //  C note indicator
-            case 15:
-            case 19:
-            case 23:
-            case 52:
-            case 56:
-            case 60:
-            case 80:  //  left hand side, bass C note when counter bass is chosen.
-                // HSV_GOLDENROD
-                hsv.h = 30;
-                hsv.s = 218;
-                hsv.v = 218;
-                break;
-        }
-        uint16_t tick = max_tick;
-        // Reverse search to find most recent key hit
-        for (int8_t j = g_last_hit_tracker.count - 1; j >= 0; j--) {
-            if (g_last_hit_tracker.x[j] == g_led_config.point[i].x && g_last_hit_tracker.y[j] == g_led_config.point[i].y && g_last_hit_tracker.tick[j] < tick) {
-                tick = g_last_hit_tracker.tick[j];
-                break;
-            }
-        }
-
-        uint16_t offset = scale16by8(tick, rgb_matrix_config.speed);
-        hsv.h += qsub8(130, offset);
-        RGB      rgb    = rgb_matrix_hsv_to_rgb(hsv);
-        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-    }
-    return led_max < RGB_MATRIX_LED_COUNT;
-}
-
-bool my_party_rocks(effect_params_t* params) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    HSV hsv = {rand() & 0xFF, rand() & 0xFF, rgb_matrix_config.hsv.v};
-    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
-    // rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-    rgb_matrix_set_color_all(rgb.r, rgb.g, rgb.b);
-    return led_max < RGB_MATRIX_LED_COUNT;
-}
-
-
-#    endif      // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/keyboards/giabalanai/keymaps/party/rules.mk b/keyboards/giabalanai/keymaps/party/rules.mk
deleted file mode 100644
index c05207feebe..00000000000
--- a/keyboards/giabalanai/keymaps/party/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-CONSOLE_ENABLE =  no        # Console for debug
-RGB_MATRIX_ENABLE = yes    # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_CUSTOM_USER = yes  #
-
-ENCODER_MAP_ENABLE = yes    # replacing ENCODERS_CW_KEY method to this on 2022/08/31.
diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h b/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h
index 01905b8dfec..decc2e2dc18 100644
--- a/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h
+++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/config.h
@@ -7,8 +7,8 @@
 #    undef MATRIX_COL_PINS_RIGHT
 
 #    ifdef RGBLIGHT_ENABLE
-#        undef RGBLED_NUM
-#        define RGBLED_NUM 120
+#        undef RGBLIGHT_LED_COUNT
+#        define RGBLIGHT_LED_COUNT 120
 #        undef RGBLIGHT_LED_MAP
 #        define RGBLIGHT_LED_MAP { \
            108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, \
diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h
index 5204496e661..f5ba3570fb0 100755
--- a/keyboards/gizmo_engineering/gk6/config.h
+++ b/keyboards/gizmo_engineering/gk6/config.h
@@ -21,30 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 
-#define DRIVER_1_LED_TOTAL 32
-#define DRIVER_2_LED_TOTAL 32
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// 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_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 25
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-
diff --git a/keyboards/gizmo_engineering/gk6/gk6.c b/keyboards/gizmo_engineering/gk6/gk6.c
index 18883727b88..fe85ecc2353 100755
--- a/keyboards/gizmo_engineering/gk6/gk6.c
+++ b/keyboards/gizmo_engineering/gk6/gk6.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
     {0, C1_8, C2_8, C3_8},     //0 led1
     {0, C1_7, C2_7, C3_7},     //1 led2
     {0, C1_6, C2_6, C3_6},     //2 led3
diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json
index c9581479711..8a50b365f59 100644
--- a/keyboards/gizmo_engineering/gk6/info.json
+++ b/keyboards/gizmo_engineering/gk6/info.json
@@ -9,7 +9,23 @@
         "device_version": "30.3.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "cycle_up_down": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "hue_breathing": true,
+            "typing_heatmap": true,
+            "solid_reactive": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multicross": true
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B5", "C6", "C7", "F7", "F6", "D5", "D3", "D2", "F1", "F4", "B7", "F5"],
diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h
index 88debbe193a..82f451e0065 100644
--- a/keyboards/gkeyboard/gpad8_2r/config.h
+++ b/keyboards/gkeyboard/gpad8_2r/config.h
@@ -3,59 +3,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 16
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json
index 9aa63091c97..52e733f9617 100644
--- a/keyboards/gkeyboard/gpad8_2r/info.json
+++ b/keyboards/gkeyboard/gpad8_2r/info.json
@@ -36,6 +36,51 @@
         ]
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [1, 0], "x": 28, "y": 12},
@@ -54,7 +99,8 @@
             {"flags": 2, "x": 84, "y": 60},
             {"flags": 2, "x": 140, "y": 60},
             {"flags": 2, "x": 196, "y": 60}
-        ]
+        ],
+        "sleep": true
     },
     "ws2812": {
         "pin": "GP19",
diff --git a/keyboards/gkeyboard/greatpad/config.h b/keyboards/gkeyboard/greatpad/config.h
new file mode 100644
index 00000000000..4c745779b4a
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/config.h
@@ -0,0 +1,11 @@
+// Copyright 2023 gkeyboard (@gkeyboard)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define OLED_DISPLAY_128X64
+#define I2C1_SCL_PIN        GP21
+#define I2C1_SDA_PIN        GP20
+#define I2C_DRIVER I2CD0
+#define OLED_BRIGHTNESS 128
+#define OLED_FONT_H  "lib/glcdfont.c"
diff --git a/keyboards/gkeyboard/greatpad/greatpad.c b/keyboards/gkeyboard/greatpad/greatpad.c
new file mode 100644
index 00000000000..54a6f173e86
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/greatpad.c
@@ -0,0 +1,577 @@
+/* Copyright 2023 gkeyboard (@gkeyboard)
+ *
+ * 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 "quantum.h"
+
+#ifdef OLED_ENABLE
+uint16_t startup_timer;
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+static void render_logo(void) {
+    static const char PROGMEM raw_logo[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x02, 0x82, 0xc2,
+        0xe2, 0xe2, 0xe2, 0xc2, 0x82, 0x02, 0x02, 0x02, 0x02, 0x02, 0xe2, 0xe2, 0xe2, 0xe2, 0xe2, 0xe2,
+        0xe2, 0xe2, 0xe2, 0xe2, 0xe2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x82, 0xc2, 0xe2, 0xe2, 0xe2, 0xc2,
+        0x82, 0x02, 0x02, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x03, 0x07,
+        0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+        0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x07,
+        0x03, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x3e,
+        0x3e, 0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x3e, 0x3e, 0x3e,
+        0x3e, 0x3e, 0x00, 0x00, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e,
+        0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x9f,
+        0x9f, 0x9f, 0x9f, 0x9f, 0x00, 0x00, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x00, 0x00, 0x9f, 0x9f, 0x9f,
+        0x9f, 0x9f, 0x00, 0x00, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x00, 0x00, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f,
+        0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xcf,
+        0xcf, 0xcf, 0xcf, 0xcf, 0x00, 0x00, 0xcf, 0xcf, 0xcf, 0xcf, 0xcf, 0x00, 0x00, 0xcf, 0xcf, 0xcf,
+        0xcf, 0xcf, 0x00, 0x00, 0xcf, 0xcf, 0xcf, 0xcf, 0xcf, 0x00, 0x00, 0xcf, 0xcf, 0xcf, 0xcf, 0xcf,
+        0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x40, 0x40, 0x40, 0x47,
+        0x47, 0x47, 0x47, 0x47, 0x40, 0x40, 0x47, 0x47, 0x47, 0x47, 0x47, 0x40, 0x40, 0x47, 0x47, 0x47,
+        0x47, 0x47, 0x40, 0x40, 0x47, 0x47, 0x47, 0x47, 0x47, 0x40, 0x40, 0x47, 0x47, 0x47, 0x47, 0x47,
+        0x40, 0x40, 0x40, 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, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+static void render_LAYER_0(void) {
+    static const char PROGMEM raw_LAYER_0[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_0, sizeof(raw_LAYER_0));
+}
+
+static void render_LAYER_1(void) {
+    static const char PROGMEM raw_LAYER_1[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0,
+        0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
+        0xc0, 0xc0, 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, 0xff, 0xff,
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_1, sizeof(raw_LAYER_1));
+}
+
+static void render_LAYER_2(void) {
+    static const char PROGMEM raw_LAYER_2[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+        0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 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,
+        0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8,
+        0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_2, sizeof(raw_LAYER_2));
+}
+
+static void render_LAYER_3(void) {
+    static const char PROGMEM raw_LAYER_3[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+        0x0e, 0x0e, 0x0e, 0x0e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+        0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_3, sizeof(raw_LAYER_3));
+}
+
+static void render_LAYER_4(void) {
+    static const char PROGMEM raw_LAYER_4[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+        0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        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, 0x0f, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+        0x0e, 0x0e, 0x0e, 0x0e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+        0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_4, sizeof(raw_LAYER_4));
+}
+
+static void render_LAYER_5(void) {
+    static const char PROGMEM raw_LAYER_5[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+        0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        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, 0x0f, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+        0x0e, 0x0e, 0x0e, 0x0e, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+        0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_5, sizeof(raw_LAYER_5));
+}
+
+static void render_LAYER_6(void) {
+    static const char PROGMEM raw_LAYER_6[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+        0x80, 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, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d,
+        0x6d, 0x6d, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+        0x0e, 0x0e, 0x0e, 0x0e, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+        0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_6, sizeof(raw_LAYER_6));
+}
+
+static void render_LAYER_7(void) {
+    static const char PROGMEM raw_LAYER_7[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0,
+        0xb0, 0xb0, 0xb0, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d,
+        0x6d, 0x6d, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+        0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_7, sizeof(raw_LAYER_7));
+}
+
+static void render_LAYER_8(void) {
+    static const char PROGMEM raw_LAYER_8[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6,
+        0xb6, 0xb6, 0xb6, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d,
+        0x6d, 0x6d, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+        0x0e, 0x0e, 0x0e, 0x0e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+        0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_8, sizeof(raw_LAYER_8));
+}
+
+static void render_LAYER_9(void) {
+    static const char PROGMEM raw_LAYER_9[] = {
+        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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6,
+        0xb6, 0xb6, 0xb6, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d,
+        0x6d, 0x6d, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        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, 0x0f, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+        0x0e, 0x0e, 0x0e, 0x0e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+        0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_9, sizeof(raw_LAYER_9));
+}
+
+static void render_LAYER_UNDEF(void) {
+    static const char PROGMEM raw_LAYER_UNDEF[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    oled_write_raw_P(raw_LAYER_UNDEF, sizeof(raw_LAYER_UNDEF));
+}
+
+/* Shows the name of the current layer and locks for the host (Cap etc.) */
+static void render_info(void) {
+    oled_write_P(PSTR("       GreatPad\n"), false);
+    oled_write_P(PSTR("\n"), false);
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.caps_lock ? PSTR("Cap(x) ") : PSTR("Cap( ) "), false);
+    oled_write_P(led_state.num_lock ? PSTR("Num(x) ") : PSTR("Num( ) "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("Scrl(x)") : PSTR("Scrl( )"), false);
+    oled_write_P(PSTR("\n"), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            render_LAYER_0();
+            break;
+        case 1:
+            render_LAYER_1();
+            break;
+        case 2:
+            render_LAYER_2();
+            break;
+        case 3:
+            render_LAYER_3();
+            break;
+        case 4:
+            render_LAYER_4();
+            break;
+        case 5:
+            render_LAYER_5();
+            break;
+        case 6:
+            render_LAYER_6();
+            break;
+        case 7:
+            render_LAYER_7();
+            break;
+        case 8:
+            render_LAYER_8();
+            break;
+        case 9:
+            render_LAYER_9();
+            break;
+        default:
+            render_LAYER_UNDEF();
+    }
+}
+
+#define SHOW_LOGO 5000
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    static bool finished_timer = false;
+    if (!finished_timer && (timer_elapsed(startup_timer) < SHOW_LOGO)) {
+        render_logo();
+    } else {
+        if (!finished_timer) {
+            oled_clear();
+            finished_timer = true;
+        }
+        render_info();
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/gkeyboard/greatpad/halconf.h b/keyboards/gkeyboard/greatpad/halconf.h
new file mode 100644
index 00000000000..f4403a0ff0f
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/gkeyboard/greatpad/info.json b/keyboards/gkeyboard/greatpad/info.json
new file mode 100644
index 00000000000..6f55141333c
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/info.json
@@ -0,0 +1,151 @@
+{
+    "manufacturer": "gkeyboard",
+    "keyboard_name": "GreatPad",
+    "maintainer": "gkeyboard",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP25", "pin_b": "GP26"},
+            {"pin_a": "GP0", "pin_b": "GP1"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP24", "GP23", "GP16", "GP11", "GP10"],
+        "rows": ["GP6", "GP5", "GP4", "GP3", "GP2"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_color": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [1, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 1], "x": 56, "y": 0, "flags": 4},
+            {"matrix": [1, 2], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [1, 3], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [1, 4], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 21, "flags": 4},
+            {"matrix": [2, 1], "x": 56, "y": 21, "flags": 4},
+            {"matrix": [2, 2], "x": 112, "y": 21, "flags": 4},
+            {"matrix": [2, 3], "x": 168, "y": 21, "flags": 4},
+            {"matrix": [2, 4], "x": 224, "y": 21, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 43, "flags": 4},
+            {"matrix": [3, 1], "x": 56, "y": 43, "flags": 4},
+            {"matrix": [3, 2], "x": 112, "y": 43, "flags": 4},
+            {"matrix": [3, 3], "x": 168, "y": 43, "flags": 4},
+            {"matrix": [3, 4], "x": 224, "y": 43, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [4, 1], "x": 56, "y": 64, "flags": 4},
+            {"matrix": [4, 2], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [4, 3], "x": 168, "y": 64, "flags": 4},
+            {"matrix": [4, 4], "x": 224, "y": 64, "flags": 4},
+            {"x": 196, "y": 53, "flags": 2},
+            {"x": 196, "y": 10, "flags": 2},
+            {"x": 140, "y": 10, "flags": 2},
+            {"x": 84, "y": 10, "flags": 2},
+            {"x": 28, "y": 10, "flags": 2},
+            {"x": 28, "y": 53, "flags": 2},
+            {"x": 84, "y": 53, "flags": 2},
+            {"x": 140, "y": 53, "flags": 2}
+        ],
+        "max_brightness": 170,
+        "sleep": true
+    },
+    "url": "https://github.com/gkeyboard/GreatPad",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4203",
+        "vid": "0x474B"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP22"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5},
+                {"matrix": [3, 4], "x": 4, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5},
+                {"matrix": [4, 4], "x": 4, "y": 4.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/gkeyboard/greatpad/keymaps/default/keymap.c b/keyboards/gkeyboard/greatpad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..1fd0edc5ca3
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_MUTE,                                    RGB_TOG,
+        KC_P7,    KC_P8,    KC_P9,      KC_PSLS,    KC_NUM,
+        KC_P4,    KC_P5,    KC_P6,      KC_PAST,    KC_PGUP,
+        KC_P1,    KC_P2,    KC_P3,      KC_PMNS,    KC_PGDN,
+        KC_P0,    KC_PDOT,  KC_PENT,    KC_PPLS,    _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),  ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
diff --git a/keyboards/gkeyboard/greatpad/keymaps/default/rules.mk b/keyboards/gkeyboard/greatpad/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/gkeyboard/greatpad/keymaps/via/keymap.c b/keyboards/gkeyboard/greatpad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..1fd0edc5ca3
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_MUTE,                                    RGB_TOG,
+        KC_P7,    KC_P8,    KC_P9,      KC_PSLS,    KC_NUM,
+        KC_P4,    KC_P5,    KC_P6,      KC_PAST,    KC_PGUP,
+        KC_P1,    KC_P2,    KC_P3,      KC_PMNS,    KC_PGDN,
+        KC_P0,    KC_PDOT,  KC_PENT,    KC_PPLS,    _______
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),  ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
diff --git a/keyboards/gkeyboard/greatpad/keymaps/via/rules.mk b/keyboards/gkeyboard/greatpad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/gkeyboard/greatpad/lib/glcdfont.c b/keyboards/gkeyboard/greatpad/lib/glcdfont.c
new file mode 100644
index 00000000000..10ced2bb2b9
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/lib/glcdfont.c
@@ -0,0 +1,236 @@
+// Copyright 2023 gkeyboard (@gkeyboard)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
+// See gfxfont.h for newer custom bitmap font info.
+
+#pragma once
+
+#include "progmem.h"
+
+static const unsigned char PROGMEM font[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+    0x94, 0xB6, 0xFF, 0xB6, 0x94, 0x00,
+    0x08, 0x0C, 0x7E, 0x0C, 0x08, 0x00,
+    0x10, 0x30, 0x7E, 0x30, 0x10, 0x00,
+    0x08, 0x08, 0x3E, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x3E, 0x08, 0x08, 0x00,
+    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+    0x14, 0x3E, 0x14, 0x3E, 0x14, 0x00,
+    0x2E, 0x2A, 0x7F, 0x2A, 0x3A, 0x00,
+    0x20, 0x12, 0x08, 0x24, 0x02, 0x00,
+    0x37, 0x49, 0x49, 0x37, 0x50, 0x00,
+    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+    0x7F, 0x51, 0x49, 0x45, 0x7F, 0x00,
+    0x08, 0x04, 0x02, 0x7F, 0x00, 0x00,
+    0x71, 0x49, 0x49, 0x49, 0x4F, 0x00,
+    0x41, 0x41, 0x49, 0x49, 0x77, 0x00,
+    0x0F, 0x10, 0x10, 0x10, 0x7F, 0x00,
+    0x4F, 0x49, 0x49, 0x49, 0x71, 0x00,
+    0x7E, 0x49, 0x49, 0x49, 0x70, 0x00,
+    0x01, 0x01, 0x71, 0x09, 0x07, 0x00,
+    0x77, 0x49, 0x49, 0x49, 0x77, 0x00,
+    0x07, 0x49, 0x49, 0x49, 0x3F, 0x00,
+    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+    0x01, 0x01, 0x59, 0x09, 0x0F, 0x00,
+    0x7F, 0x41, 0x5D, 0x59, 0x4F, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x7F, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x76, 0x00,
+    0x7F, 0x41, 0x41, 0x41, 0x41, 0x00,
+    0x7F, 0x41, 0x41, 0x41, 0x7E, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x49, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x09, 0x00,
+    0x7F, 0x41, 0x41, 0x49, 0x7B, 0x00,
+    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+    0x00, 0x00, 0x7F, 0x00, 0x00, 0x00,
+    0x70, 0x40, 0x40, 0x40, 0x7F, 0x00,
+    0x7F, 0x08, 0x08, 0x08, 0x77, 0x00,
+    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x7F, 0x01, 0x1F, 0x01, 0x7F, 0x00,
+    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+    0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x0F, 0x00,
+    0x7F, 0x41, 0x71, 0x41, 0x7F, 0x00,
+    0x7F, 0x09, 0x09, 0x19, 0x6F, 0x00,
+    0x47, 0x49, 0x49, 0x49, 0x79, 0x00,
+    0x01, 0x01, 0x7F, 0x01, 0x01, 0x00,
+    0x7F, 0x40, 0x40, 0x40, 0x7F, 0x00,
+    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+    0x7F, 0x40, 0x7F, 0x40, 0x7F, 0x00,
+    0x77, 0x08, 0x08, 0x08, 0x77, 0x00,
+    0x4F, 0x48, 0x48, 0x48, 0x7F, 0x00,
+    0x61, 0x51, 0x49, 0x45, 0x43, 0x00,
+    0x00, 0x7F, 0x41, 0x41, 0x00, 0x00,
+    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+    0x00, 0x41, 0x41, 0x7F, 0x00, 0x00,
+    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x00, 0x00, 0x07, 0x08, 0x00, 0x00,
+    0x60, 0x54, 0x54, 0x54, 0x7C, 0x00,
+    0x7F, 0x44, 0x44, 0x44, 0x78, 0x00,
+    0x7C, 0x44, 0x44, 0x44, 0x44, 0x00,
+    0x78, 0x44, 0x44, 0x44, 0x7F, 0x00,
+    0x7C, 0x54, 0x54, 0x54, 0x5C, 0x00,
+    0x08, 0x7F, 0x09, 0x09, 0x09, 0x00,
+    0x38, 0xA4, 0xA4, 0xA4, 0xFC, 0x00,
+    0x7F, 0x04, 0x04, 0x04, 0x78, 0x00,
+    0x00, 0x00, 0x7D, 0x00, 0x00, 0x00,
+    0x70, 0x40, 0x40, 0x7D, 0x00, 0x00,
+    0x7F, 0x08, 0x08, 0x08, 0x76, 0x00,
+    0x00, 0x00, 0x7F, 0x40, 0x00, 0x00,
+    0x7C, 0x04, 0x7C, 0x04, 0x7C, 0x00,
+    0x7C, 0x04, 0x04, 0x04, 0x78, 0x00,
+    0x7C, 0x44, 0x44, 0x44, 0x7C, 0x00,
+    0xFC, 0x24, 0x24, 0x24, 0x38, 0x00,
+    0x38, 0x24, 0x24, 0x24, 0xFC, 0x00,
+    0x7C, 0x04, 0x04, 0x04, 0x04, 0x00,
+    0x5C, 0x54, 0x54, 0x54, 0x74, 0x00,
+    0x04, 0x04, 0x7F, 0x04, 0x04, 0x00,
+    0x7C, 0x40, 0x40, 0x40, 0x7C, 0x00,
+    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+    0x7C, 0x40, 0x7C, 0x40, 0x7C, 0x00,
+    0x6C, 0x10, 0x10, 0x10, 0x6C, 0x00,
+    0xBC, 0xA0, 0xA0, 0xA0, 0xFC, 0x00,
+    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+    0x00, 0x00, 0xE0, 0xF0, 0xF0, 0xF0,
+    0xF0, 0xFE, 0xFF, 0x9F, 0x0F, 0x0F,
+    0x9F, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
+    0x0F, 0x0F, 0x9F, 0xFF, 0xFE, 0xF0,
+    0xF0, 0xF0, 0xF0, 0xE0, 0x00, 0x00,
+    0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xC0, 0x30, 0x0C, 0x03, 0x00,
+    0x00, 0x00, 0x00, 0xFF, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xE0, 0x10, 0x08, 0x04, 0x02, 0x02,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x02, 0x02, 0x02, 0x04, 0x08,
+    0x10, 0xE0, 0x00, 0x00, 0x00, 0x00,
+    0xFF, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0xFF,
+    0x7F, 0x51, 0x55, 0x55, 0x45, 0x7F,
+    0x41, 0x5F, 0x5F, 0x5F, 0x7F, 0x00,
+    0x7F, 0x41, 0x7B, 0x77, 0x41, 0x7F,
+    0x41, 0x5F, 0x5F, 0x5F, 0x7F, 0x00,
+    0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x7F,
+    0x41, 0x5F, 0x5F, 0x5F, 0x7F, 0x00,
+    0xC0, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0,
+    0xE6, 0xF7, 0xF3, 0xF0, 0x60, 0x00,
+    0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x00,
+    0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x00,
+    0xF8, 0x1C, 0xDE, 0x1F, 0xFF, 0xFF,
+    0xFF, 0x1F, 0xDE, 0x1C, 0xF8, 0x00,
+    0xC0, 0xE2, 0xB4, 0xF8, 0xF8, 0xF8,
+    0xF8, 0xF8, 0xB4, 0xE2, 0xC0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x07, 0x0F, 0x0F, 0x0F,
+    0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
+    0x87, 0xE1, 0xF9, 0xF9, 0xE1, 0x87,
+    0x9F, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F,
+    0x0F, 0x0F, 0x0F, 0x07, 0x00, 0x00,
+    0xFF, 0x00, 0x00, 0xC0, 0x30, 0x0C,
+    0x33, 0xC0, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xFF, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x3F,
+    0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xC0, 0x3F, 0x00, 0x00, 0x00,
+    0xFF, 0x08, 0x08, 0x08, 0x08, 0x08,
+    0x08, 0x38, 0xC8, 0x08, 0x08, 0x0F,
+    0x7E, 0x00, 0x00, 0x7F, 0x00, 0x00,
+    0x78, 0x00, 0x00, 0x7E, 0x00, 0x00,
+    0x24, 0x24, 0x12, 0x12, 0x24, 0x24,
+    0x48, 0x48, 0x24, 0x24, 0x12, 0x12,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x3F,
+    0x3F, 0x7F, 0x7F, 0x38, 0x10, 0x00,
+    0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x00,
+    0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x00,
+    0x0F, 0x14, 0x21, 0x40, 0x45, 0x41,
+    0x45, 0x40, 0x21, 0x14, 0x0F, 0x00,
+    0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D,
+    0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3F, 0x0C, 0x03, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x0C, 0x30, 0x00,
+    0x00, 0x00, 0x00, 0x3F, 0x20, 0x20,
+    0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+    0x01, 0x02, 0x04, 0x08, 0x10, 0x10,
+    0x10, 0x20, 0x20, 0x20, 0x20, 0x20,
+    0x20, 0x10, 0x10, 0x10, 0x08, 0x04,
+    0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x3F, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x03, 0x0C, 0x30,
+    0x40, 0x00, 0x00, 0x40, 0x00, 0x00,
+    0x40, 0x00, 0x00, 0x40, 0x00, 0x00,
+    0x1C, 0x3E, 0x3E, 0x3E, 0x1C, 0x00,
+    0x3E, 0x1C, 0x1C, 0x08, 0x08, 0x00,
+    0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
diff --git a/keyboards/gkeyboard/greatpad/mcuconf.h b/keyboards/gkeyboard/greatpad/mcuconf.h
new file mode 100644
index 00000000000..443e9e0f448
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 TRUE
diff --git a/keyboards/gkeyboard/greatpad/readme.md b/keyboards/gkeyboard/greatpad/readme.md
new file mode 100644
index 00000000000..d8a0443d2b1
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/readme.md
@@ -0,0 +1,25 @@
+# GreatPad
+
+20 Keys Custom Macro Pad, 2 Encoders, OLED 128x64, with USB Type-C, RGB underglow, RGB Per Key Lighting. 
+
+* Keyboard Maintainer: [gkeyboard](https://github.com/gkeyboard)
+* Hardware Supported: GreatPad PCB
+* Hardware Availability: http://www.mltelectronic.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gkeyboard/greatpad:default
+
+Flashing example for this keyboard:
+
+    make gkeyboard/greatpad: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 boot button**: Hold down the boot button on RP2040 and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/gkeyboard/greatpad/rules.mk b/keyboards/gkeyboard/greatpad/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/gl516/a52gl/keymaps/salicylic/config.h b/keyboards/gl516/a52gl/keymaps/salicylic/config.h
deleted file mode 100644
index 0e221d844d5..00000000000
--- a/keyboards/gl516/a52gl/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c b/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c
deleted file mode 100644
index 4a2e09501db..00000000000
--- a/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-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_japanese.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/j73gl/keymaps/via_rgb_matrix/config.h b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
index 0f71fedd0ec..2289031f11d 100644
--- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
@@ -21,8 +21,8 @@
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 180
 
-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
+#ifdef RGBLIGHT_LED_COUNT
+  #undef RGBLIGHT_LED_COUNT
 #endif
 
 #define RGB_MATRIX_LED_COUNT 73
@@ -31,7 +31,7 @@
   #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 //  #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 //  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
-  #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+  #define RGB_MATRIX_SLEEP // turn off effects when suspended
   #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
index 774006d5291..d1f01fc8cb5 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
+++ b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
@@ -18,105 +18,105 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to AW20216S manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1  },  //  0  Esc
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2  },  //  1  1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3  },  //  2  2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4  },  //  3  3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5  },  //  4  4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6  },  //  5  5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7  },  //  6  6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8  },  //  7  7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9  },  //  8  8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10 },  //  9  9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11 },  //  10 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12 },  //  11 -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5  },  //  12 =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7  },  //  13 Backspace
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4  },  //  14 Del
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3  },  //  0  Esc
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6  },  //  1  1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6  },  //  2  2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6  },  //  3  3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6  },  //  4  4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6  },  //  5  5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6  },  //  6  6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6  },  //  7  7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6  },  //  8  8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6 },  //  9  9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6 },  //  10 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6 },  //  11 -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3  },  //  12 =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3  },  //  13 Backspace
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6  },  //  14 Del
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1  },  //  15 Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2  },  //  16 Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3  },  //  17 W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4  },  //  18 E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5  },  //  19 R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6  },  //  20 T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7  },  //  21 Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8  },  //  22 U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9  },  //  23 I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10 },  //  24 O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11 },  //  25 P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12 },  //  26 [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8  },  //  27 ]
-    {1, CS1_SW9,   CS2_SW9,   CS3_SW9  },  //  28 \|
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7  },  //  29 PgUp
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9  },  //  15 Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9  },  //  16 Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9  },  //  17 W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9  },  //  18 E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9  },  //  19 R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9  },  //  20 T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9  },  //  21 Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9  },  //  22 U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9  },  //  23 I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9 },  //  24 O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9 },  //  25 P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9 },  //  26 [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3  },  //  27 ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3  },  //  28 \|
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6  },  //  29 PgUp
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1 },  //  30 Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2 },  //  31 A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3 },  //  32 S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4 },  //  33 D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5 },  //  34 F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6 },  //  35 G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7 },  //  36 H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8 },  //  37 J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9 },  //  38 K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  39 L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  40 ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  41 '
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11 },  //  42 Enter
-    {1, CS4_SW5,   CS5_SW5,   CS6_SW5  },  //  43 PgDn
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12 },  //  30 Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12 },  //  31 A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12 },  //  32 S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12 },  //  33 D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12 },  //  34 F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12 },  //  35 G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12 },  //  36 H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12 },  //  37 J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12 },  //  38 K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  39 L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  40 ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  41 '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3 },  //  42 Enter
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6  },  //  43 PgDn
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1 },  //  44 Shift_L
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3 },  //  45 Z
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4 },  //  46 X
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5 },  //  47 C
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6 },  //  48 V
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7 },  //  49 B
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8 },  //  50 N
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9 },  //  51 M
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  52 ,
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  53 .
-    {0, CS13_SW12, CS14_SW12, CS15_SW12},  //  54 /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8  },  //  55 Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9  },  //  56 Up
-    {1, CS4_SW6,   CS5_SW6,   CS6_SW6  },  //  57 END
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15 },  //  44 Shift_L
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15 },  //  45 Z
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15 },  //  46 X
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15 },  //  47 C
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15 },  //  48 V
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15 },  //  49 B
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15 },  //  50 N
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15 },  //  51 M
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  52 ,
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  53 .
+    {0, SW12_CS13, SW12_CS14, SW12_CS15},  //  54 /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6  },  //  55 Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6  },  //  56 Up
+    {1, SW6_CS4,   SW6_CS5,   SW6_CS6  },  //  57 END
 
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1 },  //  58 Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2 },  //  59 Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3 },  //  60 Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6 },  //  61 Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9 },  //  62 Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  63 FN
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10 },  //  64 Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11 },  //  65 Down
-    {1, CS4_SW12,  CS5_SW12,  CS6_SW12 },  //  66 Right
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18 },  //  58 Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18 },  //  59 Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18 },  //  60 Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18 },  //  61 Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18 },  //  62 Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  63 FN
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6 },  //  64 Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6 },  //  65 Down
+    {1, SW12_CS4,  SW12_CS5,  SW12_CS6 },  //  66 Right
 
-    {1, CS13_SW1,  CS14_SW1,  CS15_SW1 },  //  69 LED 1
-    {1, CS13_SW2,  CS14_SW2,  CS15_SW2 },  //  70 LED 2
-    {1, CS13_SW3,  CS14_SW3,  CS15_SW3 },  //  71 LED 3
-    {1, CS13_SW4,  CS14_SW4,  CS15_SW4 },  //  72 LED 4
-    {1, CS13_SW5,  CS14_SW5,  CS15_SW5 },  //  73 LED 5
-    {1, CS13_SW6,  CS14_SW6,  CS15_SW6 },  //  74 LED 6
-    {1, CS13_SW7,  CS14_SW7,  CS15_SW7 },  //  75 LED 7
-    {1, CS13_SW8,  CS14_SW8,  CS15_SW8 },  //  76 LED 8
-    {1, CS13_SW9,  CS14_SW9,  CS15_SW9 },  //  77 LED 9
-    {1, CS13_SW10, CS14_SW10, CS15_SW10},  //  78 LED 10
-    {1, CS16_SW1,  CS17_SW1,  CS18_SW1 },  //  79 LED 11
-    {1, CS16_SW2,  CS17_SW2,  CS18_SW2 },  //  80 LED 12
-    {1, CS16_SW3,  CS17_SW3,  CS18_SW3 },  //  81 LED 13
-    {1, CS16_SW4,  CS17_SW4,  CS18_SW4 },  //  82 LED 14
-    {1, CS16_SW5,  CS17_SW5,  CS18_SW5 },  //  83 LED 15
-    {1, CS16_SW6,  CS17_SW6,  CS18_SW6 },  //  84 LED 16
-    {1, CS16_SW7,  CS17_SW7,  CS18_SW7 },  //  85 LED 17
-    {1, CS16_SW8,  CS17_SW8,  CS18_SW8 },  //  86 LED 18
-    {1, CS16_SW9,  CS17_SW9,  CS18_SW9 },  //  87 LED 19
-    {1, CS16_SW10, CS17_SW10, CS18_SW10}   //  88 LED 20
+    {1, SW1_CS13,  SW1_CS14,  SW1_CS15 },  //  69 LED 1
+    {1, SW2_CS13,  SW2_CS14,  SW2_CS15 },  //  70 LED 2
+    {1, SW3_CS13,  SW3_CS14,  SW3_CS15 },  //  71 LED 3
+    {1, SW4_CS13,  SW4_CS14,  SW4_CS15 },  //  72 LED 4
+    {1, SW5_CS13,  SW5_CS14,  SW5_CS15 },  //  73 LED 5
+    {1, SW6_CS13,  SW6_CS14,  SW6_CS15 },  //  74 LED 6
+    {1, SW7_CS13,  SW7_CS14,  SW7_CS15 },  //  75 LED 7
+    {1, SW8_CS13,  SW8_CS14,  SW8_CS15 },  //  76 LED 8
+    {1, SW9_CS13,  SW9_CS14,  SW9_CS15 },  //  77 LED 9
+    {1, SW10_CS13, SW10_CS14, SW10_CS15},  //  78 LED 10
+    {1, SW1_CS16,  SW1_CS17,  SW1_CS18 },  //  79 LED 11
+    {1, SW2_CS16,  SW2_CS17,  SW2_CS18 },  //  80 LED 12
+    {1, SW3_CS16,  SW3_CS17,  SW3_CS18 },  //  81 LED 13
+    {1, SW4_CS16,  SW4_CS17,  SW4_CS18 },  //  82 LED 14
+    {1, SW5_CS16,  SW5_CS17,  SW5_CS18 },  //  83 LED 15
+    {1, SW6_CS16,  SW6_CS17,  SW6_CS18 },  //  84 LED 16
+    {1, SW7_CS16,  SW7_CS17,  SW7_CS18 },  //  85 LED 17
+    {1, SW8_CS16,  SW8_CS17,  SW8_CS18 },  //  86 LED 18
+    {1, SW9_CS16,  SW9_CS17,  SW9_CS18 },  //  87 LED 19
+    {1, SW10_CS16, SW10_CS17, SW10_CS18}   //  88 LED 20
 };
 
 #define __ NO_LED
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json
index cd9296b81a2..2d2230a3b91 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json
@@ -11,9 +11,6 @@
     "qmk": {
         "tap_keycode_delay": 10
     },
-    "rgb_matrix": {
-        "driver": "aw20216s"
-    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
         "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"]
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c
deleted file mode 100644
index 8ca676273be..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2022 Eugenio Pastoral
- *
- * 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.
-enum custom_layers {
-    _BL,
-    _FL,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_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_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,    KC_DEL,  RGB_TOG,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
-  _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,   RGB_VAI,  _______,
-  EE_CLR,  _______,  _______,                                 QK_BOOT,                                _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD)
-};
-
-// Turns side LEDs to white for caps lock and layer indicators.
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    if (host_keyboard_led_state().caps_lock || get_highest_layer(layer_state | default_layer_state)) {
-        for (uint8_t i = led_min; i < led_max; i++) {
-            if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW
-                rgb_matrix_set_color(i, 0xff, 0xff, 0xff);
-            }
-        }
-    }
-    return false;
-};
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md
deleted file mode 100644
index 4f80a5b9566..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# ANSI GMMKV2 65% Layout
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc
deleted file mode 100644
index 2966fe25862..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc
+++ /dev/null
@@ -1,72 +0,0 @@
- /* Copyright 2022 Eugenio Pastoral
-  *
-  * 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/>.
-  */
-
-RGB_MATRIX_EFFECT(SOLID_UNDERGLOW)
-RGB_MATRIX_EFFECT(HOLOGRAPHICS_UNDERGLOW)
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-// This is a side lights only configuration where the solid color is following the current HSV setting.
-static bool SOLID_UNDERGLOW(effect_params_t* params) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
-    RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
-    for (uint8_t i = led_min; i < led_max; i++) {
-        if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW
-            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-        } else {
-            rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
-        }
-    }
-    return rgb_matrix_check_finished_leds(led_max);
-}
-
-// This is a side lights only configuration where the color is set to a static gradient.
-static bool HOLOGRAPHICS_UNDERGLOW(effect_params_t* params) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
-    for (uint8_t i = led_min; i < led_max; i++) {
-        if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW
-            // RIGHT-HAND SIDE LEDS || LEFT-HAND SIDE LEDS
-            if (i == 67 || i == 77) {
-                rgb_matrix_set_color(i, 0xff, 0x00, 0xee);
-            } else if (i == 68 || i == 78) {
-                rgb_matrix_set_color(i, 0xcc, 0x00, 0xff);
-            } else if (i == 69 || i == 79) {
-                rgb_matrix_set_color(i, 0x9e, 0x00, 0xff);
-            } else if (i == 70 || i == 80) {
-                rgb_matrix_set_color(i, 0x70, 0x00, 0xff);
-            } else if (i == 71 || i == 81) {
-                rgb_matrix_set_color(i, 0x52, 0x00, 0xff);
-            } else if (i == 72 || i == 82) {
-                rgb_matrix_set_color(i, 0x33, 0x00, 0xff);
-            } else if (i == 73 || i == 83) {
-                rgb_matrix_set_color(i, 0x00, 0x38, 0xff);
-            } else if (i == 74 || i == 84) {
-                rgb_matrix_set_color(i, 0x00, 0x57, 0xff);
-            } else if (i == 75 || i == 85) {
-                rgb_matrix_set_color(i, 0x00, 0x85, 0xff);
-            } else if (i == 76 || i == 86) {
-                rgb_matrix_set_color(i, 0x00, 0xb2, 0xff);
-            } else {
-                rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
-            }
-        }
-    }
-    return rgb_matrix_check_finished_leds(led_max);
-}
-
-#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk
deleted file mode 100644
index 6245023e803..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
deleted file mode 100644
index c5f90e3fee0..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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
-
-// 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.
-enum custom_layers {
-    _BL,
-    _FL,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_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_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),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,    _______,  KC_INS,
-  RGB_M_P,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
-  _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,   RGB_VAI,  RGB_TOG,
-  KC_MUTE,  KC_VOLU,  KC_VOLD,                                QK_BOOT,                                _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD)
-};
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md
deleted file mode 100644
index 4f80a5b9566..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# ANSI GMMKV2 65% Layout
diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h
index ce9ff694336..4ea6b3d7392 100644
--- a/keyboards/gmmk/gmmk2/p65/config.h
+++ b/keyboards/gmmk/gmmk2/p65/config.h
@@ -21,8 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* SPI Config for LED Driver */
 #define SPI_DRIVER SPIDM2
 #define SPI_SCK_PIN B13
@@ -31,60 +29,4 @@
 
 #define AW20216S_CS_PIN_1 A15
 #define AW20216S_CS_PIN_2 B9
-#define AW20216S_EN_PIN_1 C13
-#define AW20216S_EN_PIN_2 C13
-
-#define DRIVER_1_LED_TOTAL 54
-#define DRIVER_2_LED_TOTAL 34
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-// 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 RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#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 RGB_MATRIX_KEYPRESSES
-#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 AW20216S_EN_PIN C13
diff --git a/keyboards/gmmk/gmmk2/p65/info.json b/keyboards/gmmk/gmmk2/p65/info.json
new file mode 100644
index 00000000000..91080575194
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p65/info.json
@@ -0,0 +1,51 @@
+{
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "aw20216s",
+        "sleep": true
+    }
+}
\ No newline at end of file
diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json
index c286cb7ba05..aa31b50f612 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p65/iso/info.json
@@ -11,9 +11,6 @@
     "qmk": {
         "tap_keycode_delay": 10
     },
-    "rgb_matrix": {
-        "driver": "aw20216s"
-    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
         "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"]
diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.c b/keyboards/gmmk/gmmk2/p65/iso/iso.c
index 80c0dc2e0de..2be52853941 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/iso.c
+++ b/keyboards/gmmk/gmmk2/p65/iso/iso.c
@@ -18,106 +18,106 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to AW20216S manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1  },  //  0  Esc
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2  },  //  1  1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3  },  //  2  2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4  },  //  3  3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5  },  //  4  4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6  },  //  5  5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7  },  //  6  6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8  },  //  7  7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9  },  //  8  8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10 },  //  9  9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11 },  //  10 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12 },  //  11 -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5  },  //  12 =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7  },  //  13 Backspace
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4  },  //  14 HOME
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3  },  //  0  Esc
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6  },  //  1  1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6  },  //  2  2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6  },  //  3  3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6  },  //  4  4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6  },  //  5  5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6  },  //  6  6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6  },  //  7  7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6  },  //  8  8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6 },  //  9  9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6 },  //  10 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6 },  //  11 -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3  },  //  12 =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3  },  //  13 Backspace
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6  },  //  14 HOME
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1  },  //  15 Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2  },  //  16 Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3  },  //  17 W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4  },  //  18 E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5  },  //  19 R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6  },  //  20 T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7  },  //  21 Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8  },  //  22 U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9  },  //  23 I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10 },  //  24 O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11 },  //  25 P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12 },  //  26 [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8  },  //  27 ]
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11 },  //  28 ENTER
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7  },  //  29 PgUp
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9  },  //  15 Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9  },  //  16 Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9  },  //  17 W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9  },  //  18 E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9  },  //  19 R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9  },  //  20 T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9  },  //  21 Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9  },  //  22 U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9  },  //  23 I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9 },  //  24 O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9 },  //  25 P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9 },  //  26 [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3  },  //  27 ]
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3 },  //  28 ENTER
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6  },  //  29 PgUp
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1 },  //  30 Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2 },  //  31 A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3 },  //  32 S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4 },  //  33 D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5 },  //  34 F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6 },  //  35 G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7 },  //  36 H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8 },  //  37 J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9 },  //  38 K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  39 L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  40 ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  41 '
-    {1, CS1_SW10,  CS2_SW10,  CS3_SW10 },  //  42 k42
-    {1, CS4_SW5,   CS5_SW5,   CS6_SW5  },  //  43 PgDn
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12 },  //  30 Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12 },  //  31 A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12 },  //  32 S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12 },  //  33 D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12 },  //  34 F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12 },  //  35 G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12 },  //  36 H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12 },  //  37 J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12 },  //  38 K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  39 L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  40 ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  41 '
+    {1, SW10_CS1,  SW10_CS2,  SW10_CS3 },  //  42 k42
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6  },  //  43 PgDn
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1 },  //  44 Shift_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2 },  //  45 k45
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3 },  //  46 Z
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4 },  //  47 X
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5 },  //  48 C
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6 },  //  49 V
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7 },  //  50 B
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8 },  //  51 N
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9 },  //  52 M
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  53 ,
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  54 .
-    {0, CS13_SW12, CS14_SW12, CS15_SW12},  //  55 /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8  },  //  56 Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9  },  //  57 Up
-    {1, CS4_SW6,   CS5_SW6,   CS6_SW6  },  //  58 END
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15 },  //  44 Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15 },  //  45 k45
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15 },  //  46 Z
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15 },  //  47 X
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15 },  //  48 C
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15 },  //  49 V
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15 },  //  50 B
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15 },  //  51 N
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15 },  //  52 M
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  53 ,
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  54 .
+    {0, SW12_CS13, SW12_CS14, SW12_CS15},  //  55 /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6  },  //  56 Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6  },  //  57 Up
+    {1, SW6_CS4,   SW6_CS5,   SW6_CS6  },  //  58 END
 
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1 },  //  59 Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2 },  //  60 Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3 },  //  61 Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6 },  //  62 Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9 },  //  63 Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  64 FN
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10 },  //  65 Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11 },  //  66 Down
-    {1, CS4_SW12,  CS5_SW12,  CS6_SW12 },  //  67 Right
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18 },  //  59 Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18 },  //  60 Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18 },  //  61 Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18 },  //  62 Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18 },  //  63 Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  64 FN
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6 },  //  65 Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6 },  //  66 Down
+    {1, SW12_CS4,  SW12_CS5,  SW12_CS6 },  //  67 Right
 
-    {1, CS13_SW1,  CS14_SW1,  CS15_SW1 },  //  68 LED 1
-    {1, CS13_SW2,  CS14_SW2,  CS15_SW2 },  //  69 LED 2
-    {1, CS13_SW3,  CS14_SW3,  CS15_SW3 },  //  70 LED 3
-    {1, CS13_SW4,  CS14_SW4,  CS15_SW4 },  //  71 LED 4
-    {1, CS13_SW5,  CS14_SW5,  CS15_SW5 },  //  72 LED 5
-    {1, CS13_SW6,  CS14_SW6,  CS15_SW6 },  //  73 LED 6
-    {1, CS13_SW7,  CS14_SW7,  CS15_SW7 },  //  74 LED 7
-    {1, CS13_SW8,  CS14_SW8,  CS15_SW8 },  //  75 LED 8
-    {1, CS13_SW9,  CS14_SW9,  CS15_SW9 },  //  76 LED 9
-    {1, CS13_SW10, CS14_SW10, CS15_SW10},  //  77 LED 10
-    {1, CS16_SW1,  CS17_SW1,  CS18_SW1 },  //  78 LED 11
-    {1, CS16_SW2,  CS17_SW2,  CS18_SW2 },  //  79 LED 12
-    {1, CS16_SW3,  CS17_SW3,  CS18_SW3 },  //  80 LED 13
-    {1, CS16_SW4,  CS17_SW4,  CS18_SW4 },  //  81 LED 14
-    {1, CS16_SW5,  CS17_SW5,  CS18_SW5 },  //  82 LED 15
-    {1, CS16_SW6,  CS17_SW6,  CS18_SW6 },  //  83 LED 16
-    {1, CS16_SW7,  CS17_SW7,  CS18_SW7 },  //  84 LED 17
-    {1, CS16_SW8,  CS17_SW8,  CS18_SW8 },  //  85 LED 18
-    {1, CS16_SW9,  CS17_SW9,  CS18_SW9 },  //  86 LED 19
-    {1, CS16_SW10, CS17_SW10, CS18_SW10}   //  87 LED 20
+    {1, SW1_CS13,  SW1_CS14,  SW1_CS15 },  //  68 LED 1
+    {1, SW2_CS13,  SW2_CS14,  SW2_CS15 },  //  69 LED 2
+    {1, SW3_CS13,  SW3_CS14,  SW3_CS15 },  //  70 LED 3
+    {1, SW4_CS13,  SW4_CS14,  SW4_CS15 },  //  71 LED 4
+    {1, SW5_CS13,  SW5_CS14,  SW5_CS15 },  //  72 LED 5
+    {1, SW6_CS13,  SW6_CS14,  SW6_CS15 },  //  73 LED 6
+    {1, SW7_CS13,  SW7_CS14,  SW7_CS15 },  //  74 LED 7
+    {1, SW8_CS13,  SW8_CS14,  SW8_CS15 },  //  75 LED 8
+    {1, SW9_CS13,  SW9_CS14,  SW9_CS15 },  //  76 LED 9
+    {1, SW10_CS13, SW10_CS14, SW10_CS15},  //  77 LED 10
+    {1, SW1_CS16,  SW1_CS17,  SW1_CS18 },  //  78 LED 11
+    {1, SW2_CS16,  SW2_CS17,  SW2_CS18 },  //  79 LED 12
+    {1, SW3_CS16,  SW3_CS17,  SW3_CS18 },  //  80 LED 13
+    {1, SW4_CS16,  SW4_CS17,  SW4_CS18 },  //  81 LED 14
+    {1, SW5_CS16,  SW5_CS17,  SW5_CS18 },  //  82 LED 15
+    {1, SW6_CS16,  SW6_CS17,  SW6_CS18 },  //  83 LED 16
+    {1, SW7_CS16,  SW7_CS17,  SW7_CS18 },  //  84 LED 17
+    {1, SW8_CS16,  SW8_CS17,  SW8_CS18 },  //  85 LED 18
+    {1, SW9_CS16,  SW9_CS17,  SW9_CS18 },  //  86 LED 19
+    {1, SW10_CS16, SW10_CS17, SW10_CS18}   //  87 LED 20
 };
 
 #define __ NO_LED
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
index bc05ab63010..d60b9e2254f 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
@@ -18,138 +18,138 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to AW20216S manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   0, k00, Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   1, k10, F1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   2, k20, F2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   3, k30, F3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   4, k40, F4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   5, k50, F5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   6, k60, F6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   7, k70, F7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   8, k80, F8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //   9, k90, F9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  10, ka0, F10
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  11, kb0, F11
-    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  12, kc0, F12
-    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  13, kd0, Printscreen
-    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  14, k06, Delete
-    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  15, k16, Insert
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  16, k26, Page Up
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  17, k36, Page Down
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   0, k00, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   1, k10, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   2, k20, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   3, k30, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   4, k40, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   5, k50, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   6, k60, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   7, k70, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   8, k80, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //   9, k90, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  10, ka0, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  11, kb0, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  12, kc0, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  13, kd0, Printscreen
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  14, k06, Delete
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  15, k16, Insert
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  16, k26, Page Up
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  17, k36, Page Down
 
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  18, k01, `
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  19, k11, 1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  20, k21, 2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  21, k31, 3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  22, k41, 4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  23, k51, 5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  24, k61, 6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  25, k71, 7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  26, k81, 8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  27, k91, 9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  28, ka1, 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  29, kb1, -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  30, kc1, =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  31, kd1, Backspace
-    {1, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  32, k46, Num Lock
-    {1, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  33, k56, Num /
-    {1, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  34, k66, Num *
-    {1, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  35, k76, Num -
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  18, k01, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  19, k11, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  20, k21, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  21, k31, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  22, k41, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  23, k51, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  24, k61, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  25, k71, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  26, k81, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  27, k91, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  28, ka1, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  29, kb1, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  30, kc1, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  31, kd1, Backspace
+    {1, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  32, k46, Num Lock
+    {1, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  33, k56, Num /
+    {1, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  34, k66, Num *
+    {1, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  35, k76, Num -
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  36, k02, Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  37, k12, Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  38, k22, W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  39, k32, E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  40, k42, R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  41, k52, T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  42, k62, Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  43, k72, U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  44, k82, I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  45, k92, O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  46, ka2, P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  47, kb2, [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  48, kc2, ]
-    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  49, kd3, "\\"
-    {1, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  50, k86, Num 7
-    {1, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  51, k96, Num 8
-    {1, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  52, ka6, Num 9
-    {1, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  53, kb6, Num +
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  36, k02, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  37, k12, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  38, k22, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  39, k32, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  40, k42, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  41, k52, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  42, k62, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  43, k72, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  44, k82, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  45, k92, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  46, ka2, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  47, kb2, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  48, kc2, ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  49, kd3, "\\"
+    {1, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  50, k86, Num 7
+    {1, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  51, k96, Num 8
+    {1, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  52, ka6, Num 9
+    {1, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  53, kb6, Num +
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  54, k03, Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  55, k13, A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  56, k23, S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  57, k33, D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  58, k43, F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  59, k53, G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  60, k63, H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  61, k73, J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  62, k83, K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  63, k93, L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  64, ka3, ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  65, kb3, '
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  66, kc3, Enter
-    {1, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  67, ka7, Num 4
-    {1, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  68, kb7, Num 5
-    {1, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  69, kc7, Num 6
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  54, k03, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  55, k13, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  56, k23, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  57, k33, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  58, k43, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  59, k53, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  60, k63, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  61, k73, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  62, k83, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  63, k93, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  64, ka3, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  65, kb3, '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  66, kc3, Enter
+    {1, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  67, ka7, Num 4
+    {1, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  68, kb7, Num 5
+    {1, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  69, kc7, Num 6
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  70, k04, Shift_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  71, k24, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  72, k34, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  73, k44, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  74, k54, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  75, k64, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  76, k74, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  77, k84, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  78, k94, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  79, ka4, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  80, kb4, /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  81, kd4, Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  82, k17, Up
-    {1, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  83, k67, Num 1
-    {1, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  84, k77, Num 2
-    {1, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  85, k87, Num 3
-    {1, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  86, k97, Enter_R
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  70, k04, Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  71, k24, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  72, k34, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  73, k44, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  74, k54, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  75, k64, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  76, k74, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  77, k84, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  78, k94, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  79, ka4, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  80, kb4, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  81, kd4, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  82, k17, Up
+    {1, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  83, k67, Num 1
+    {1, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  84, k77, Num 2
+    {1, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  85, k87, Num 3
+    {1, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  86, k97, Enter_R
 
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  87, k05, Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  88, k15, Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  89, k25, Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  90, k65, Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  91, k95, Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  92, ka5, FN
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  93, kc5, Ctrl_R
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  94, k07, Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  95, k27, Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  96, k37, Right
-    {1, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  97, k47, Num 0
-    {1, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  98, k57, Num .
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  87, k05, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  88, k15, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  89, k25, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  90, k65, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  91, k95, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  92, ka5, FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  93, kc5, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  94, k07, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  95, k27, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  96, k37, Right
+    {1, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  97, k47, Num 0
+    {1, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  98, k57, Num .
 
-    {1, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  101, LED 1
-    {1, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  102, LED 2
-    {1, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  103, LED 3
-    {1, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  104, LED 4
-    {1, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  105, LED 5
-    {1, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  106, LED 6
-    {1, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  107, LED 7
-    {1, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  108, LED 8
-    {1, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  109, LED 9
-    {1, CS13_SW10, CS14_SW10, CS15_SW10}, //  110, LED 10
-    {1, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  111, LED 11
-    {1, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  112, LED 12
-    {1, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  113, LED 13
-    {1, CS16_SW4,  CS17_SW4,  CS18_SW4},  //  114, LED 14
-    {1, CS16_SW5,  CS17_SW5,  CS18_SW5},  //  115, LED 15
-    {1, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  116, LED 16
-    {1, CS16_SW7,  CS17_SW7,  CS18_SW7},  //  117, LED 17
-    {1, CS16_SW8,  CS17_SW8,  CS18_SW8},  //  118, LED 18
-    {1, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  119, LED 19
-    {1, CS16_SW10, CS17_SW10, CS18_SW10}  //  120, LED 20
+    {1, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  101, LED 1
+    {1, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  102, LED 2
+    {1, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  103, LED 3
+    {1, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  104, LED 4
+    {1, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  105, LED 5
+    {1, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  106, LED 6
+    {1, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  107, LED 7
+    {1, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  108, LED 8
+    {1, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  109, LED 9
+    {1, SW10_CS13, SW10_CS14, SW10_CS15}, //  110, LED 10
+    {1, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  111, LED 11
+    {1, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  112, LED 12
+    {1, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  113, LED 13
+    {1, SW4_CS16,  SW4_CS17,  SW4_CS18},  //  114, LED 14
+    {1, SW5_CS16,  SW5_CS17,  SW5_CS18},  //  115, LED 15
+    {1, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  116, LED 16
+    {1, SW7_CS16,  SW7_CS17,  SW7_CS18},  //  117, LED 17
+    {1, SW8_CS16,  SW8_CS17,  SW8_CS18},  //  118, LED 18
+    {1, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  119, LED 19
+    {1, SW10_CS16, SW10_CS17, SW10_CS18}  //  120, LED 20
 };
 
 #define __ NO_LED
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json
index e4eaddbfe8e..d7e0e38ceb1 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -11,9 +11,6 @@
     "qmk": {
         "tap_keycode_delay": 10
     },
-    "rgb_matrix": {
-        "driver": "aw20216s"
-    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
         "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"]
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
index fb21c571f53..2b73b4a396c 100644
--- a/keyboards/gmmk/gmmk2/p96/config.h
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -21,8 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
 
@@ -34,58 +32,4 @@
 
 #define AW20216S_CS_PIN_1 A15
 #define AW20216S_CS_PIN_2 B15
-#define AW20216S_EN_PIN_1 C13
-#define AW20216S_EN_PIN_2 C13
-
-#define DRIVER_1_LED_TOTAL 66
-#define DRIVER_2_LED_TOTAL 54
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-// 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
-#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 AW20216S_EN_PIN C13
diff --git a/keyboards/gmmk/gmmk2/p96/info.json b/keyboards/gmmk/gmmk2/p96/info.json
new file mode 100644
index 00000000000..91080575194
--- /dev/null
+++ b/keyboards/gmmk/gmmk2/p96/info.json
@@ -0,0 +1,51 @@
+{
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "aw20216s",
+        "sleep": true
+    }
+}
\ No newline at end of file
diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json
index d9f53b76f1e..c5079a22dd6 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -11,9 +11,6 @@
     "qmk": {
         "tap_keycode_delay": 10
     },
-    "rgb_matrix": {
-        "driver": "aw20216s"
-    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
         "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"]
diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c
index f6b3528cb41..af2ee17c4ae 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/iso.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c
@@ -18,139 +18,139 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to AW20216S manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   0, k00, Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   1, k10, F1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   2, k20, F2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   3, k30, F3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   4, k40, F4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   5, k50, F5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   6, k60, F6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   7, k70, F7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   8, k80, F8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //   9, k90, F9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  10, ka0, F10
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  11, kb0, F11
-    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  12, kc0, F12
-    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  13, kd0, Printscreen
-    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  14, k06, Delete
-    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  15, k16, Insert
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  16, k26, Page Up
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  17, k36, Page Down
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   0, k00, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   1, k10, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   2, k20, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   3, k30, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   4, k40, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   5, k50, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   6, k60, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   7, k70, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   8, k80, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //   9, k90, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  10, ka0, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  11, kb0, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  12, kc0, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  13, kd0, Printscreen
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  14, k06, Delete
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  15, k16, Insert
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  16, k26, Page Up
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  17, k36, Page Down
 
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  18, k01, `
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  19, k11, 1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  20, k21, 2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  21, k31, 3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  22, k41, 4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  23, k51, 5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  24, k61, 6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  25, k71, 7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  26, k81, 8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  27, k91, 9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  28, ka1, 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  29, kb1, -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  30, kc1, =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  31, kd1, Backspace
-    {1, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  32, k46, Num Lock
-    {1, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  33, k56, Num /
-    {1, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  34, k66, Num *
-    {1, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  35, k76, Num -
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  18, k01, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  19, k11, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  20, k21, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  21, k31, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  22, k41, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  23, k51, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  24, k61, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  25, k71, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  26, k81, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  27, k91, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  28, ka1, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  29, kb1, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  30, kc1, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  31, kd1, Backspace
+    {1, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  32, k46, Num Lock
+    {1, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  33, k56, Num /
+    {1, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  34, k66, Num *
+    {1, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  35, k76, Num -
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  36, k02, Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  37, k12, Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  38, k22, W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  39, k32, E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  40, k42, R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  41, k52, T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  42, k62, Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  43, k72, U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  44, k82, I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  45, k92, O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  46, ka2, P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  47, kb2, [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  48, kc2, ]
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  49, kd3, Enter
-    {1, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  50, k86, Num 7
-    {1, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  51, k96, Num 8
-    {1, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  52, ka6, Num 9
-    {1, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  53, kb6, Num +
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  36, k02, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  37, k12, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  38, k22, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  39, k32, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  40, k42, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  41, k52, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  42, k62, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  43, k72, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  44, k82, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  45, k92, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  46, ka2, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  47, kb2, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  48, kc2, ]
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  49, kd3, Enter
+    {1, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  50, k86, Num 7
+    {1, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  51, k96, Num 8
+    {1, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  52, ka6, Num 9
+    {1, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  53, kb6, Num +
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  54, k03, Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  55, k13, A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  56, k23, S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  57, k33, D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  58, k43, F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  59, k53, G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  60, k63, H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  61, k73, J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  62, k83, K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  63, k93, L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  64, ka3, ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  65, kb3, '
-    {1, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  66, kc3, #
-    {1, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  67, ka7, Num 4
-    {1, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  68, kb7, Num 5
-    {1, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  69, kc7, Num 6
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  54, k03, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  55, k13, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  56, k23, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  57, k33, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  58, k43, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  59, k53, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  60, k63, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  61, k73, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  62, k83, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  63, k93, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  64, ka3, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  65, kb3, '
+    {1, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  66, kc3, #
+    {1, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  67, ka7, Num 4
+    {1, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  68, kb7, Num 5
+    {1, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  69, kc7, Num 6
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  70, k04, Shift_L
-    {0, CS13_SW12, CS14_SW12, CS15_SW12}, //  71, k14, "\\"
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  72, k24, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  73, k34, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  74, k44, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  75, k54, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  76, k64, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  77, k74, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  78, k84, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  79, k94, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  80, ka4, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  81, kb4, /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  82, kd4, Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  83, k17, Up
-    {1, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  84, k67, Num 1
-    {1, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  85, k77, Num 2
-    {1, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  86, k87, Num 3
-    {1, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  87, k97, Enter_R
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  70, k04, Shift_L
+    {0, SW12_CS13, SW12_CS14, SW12_CS15}, //  71, k14, "\\"
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  72, k24, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  73, k34, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  74, k44, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  75, k54, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  76, k64, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  77, k74, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  78, k84, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  79, k94, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  80, ka4, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  81, kb4, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  82, kd4, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  83, k17, Up
+    {1, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  84, k67, Num 1
+    {1, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  85, k77, Num 2
+    {1, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  86, k87, Num 3
+    {1, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  87, k97, Enter_R
 
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  88, k05, Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  89, k15, Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  90, k25, Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  91, k65, Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  92, k95, Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  93, ka5, FN
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  94, kc5, Ctrl_R
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  95, k07, Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  96, k27, Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  97, k37, Right
-    {1, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  98, k47, Num 0
-    {1, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  99, k57, Num .
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  88, k05, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  89, k15, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  90, k25, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  91, k65, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  92, k95, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  93, ka5, FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  94, kc5, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  95, k07, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  96, k27, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  97, k37, Right
+    {1, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  98, k47, Num 0
+    {1, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  99, k57, Num .
 
-    {1, CS13_SW1,  CS14_SW1,  CS15_SW1},  // 101, LED 1
-    {1, CS13_SW2,  CS14_SW2,  CS15_SW2},  // 102, LED 2
-    {1, CS13_SW3,  CS14_SW3,  CS15_SW3},  // 103, LED 3
-    {1, CS13_SW4,  CS14_SW4,  CS15_SW4},  // 104, LED 4
-    {1, CS13_SW5,  CS14_SW5,  CS15_SW5},  // 105, LED 5
-    {1, CS13_SW6,  CS14_SW6,  CS15_SW6},  // 106, LED 6
-    {1, CS13_SW7,  CS14_SW7,  CS15_SW7},  // 107, LED 7
-    {1, CS13_SW8,  CS14_SW8,  CS15_SW8},  // 108, LED 8
-    {1, CS13_SW9,  CS14_SW9,  CS15_SW9},  // 109, LED 9
-    {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 110, LED 10
-    {1, CS16_SW1,  CS17_SW1,  CS18_SW1},  // 111, LED 11
-    {1, CS16_SW2,  CS17_SW2,  CS18_SW2},  // 112, LED 12
-    {1, CS16_SW3,  CS17_SW3,  CS18_SW3},  // 113, LED 13
-    {1, CS16_SW4,  CS17_SW4,  CS18_SW4},  // 114, LED 14
-    {1, CS16_SW5,  CS17_SW5,  CS18_SW5},  // 115, LED 15
-    {1, CS16_SW6,  CS17_SW6,  CS18_SW6},  // 116, LED 16
-    {1, CS16_SW7,  CS17_SW7,  CS18_SW7},  // 117, LED 17
-    {1, CS16_SW8,  CS17_SW8,  CS18_SW8},  // 118, LED 18
-    {1, CS16_SW9,  CS17_SW9,  CS18_SW9},  // 119, LED 19
-    {1, CS16_SW10, CS17_SW10, CS18_SW10}  // 120, LED 20
+    {1, SW1_CS13,  SW1_CS14,  SW1_CS15},  // 101, LED 1
+    {1, SW2_CS13,  SW2_CS14,  SW2_CS15},  // 102, LED 2
+    {1, SW3_CS13,  SW3_CS14,  SW3_CS15},  // 103, LED 3
+    {1, SW4_CS13,  SW4_CS14,  SW4_CS15},  // 104, LED 4
+    {1, SW5_CS13,  SW5_CS14,  SW5_CS15},  // 105, LED 5
+    {1, SW6_CS13,  SW6_CS14,  SW6_CS15},  // 106, LED 6
+    {1, SW7_CS13,  SW7_CS14,  SW7_CS15},  // 107, LED 7
+    {1, SW8_CS13,  SW8_CS14,  SW8_CS15},  // 108, LED 8
+    {1, SW9_CS13,  SW9_CS14,  SW9_CS15},  // 109, LED 9
+    {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 110, LED 10
+    {1, SW1_CS16,  SW1_CS17,  SW1_CS18},  // 111, LED 11
+    {1, SW2_CS16,  SW2_CS17,  SW2_CS18},  // 112, LED 12
+    {1, SW3_CS16,  SW3_CS17,  SW3_CS18},  // 113, LED 13
+    {1, SW4_CS16,  SW4_CS17,  SW4_CS18},  // 114, LED 14
+    {1, SW5_CS16,  SW5_CS17,  SW5_CS18},  // 115, LED 15
+    {1, SW6_CS16,  SW6_CS17,  SW6_CS18},  // 116, LED 16
+    {1, SW7_CS16,  SW7_CS17,  SW7_CS18},  // 117, LED 17
+    {1, SW8_CS16,  SW8_CS17,  SW8_CS18},  // 118, LED 18
+    {1, SW9_CS16,  SW9_CS17,  SW9_CS18},  // 119, LED 19
+    {1, SW10_CS16, SW10_CS17, SW10_CS18}  // 120, LED 20
 };
 
 #define __ NO_LED
diff --git a/keyboards/gmmk/numpad/config.h b/keyboards/gmmk/numpad/config.h
index 3627ab503c8..8f8c893af44 100644
--- a/keyboards/gmmk/numpad/config.h
+++ b/keyboards/gmmk/numpad/config.h
@@ -29,53 +29,7 @@
 #define SPI_MISO_PIN B4
 
 #define AW20216S_CS_PIN_1 B12
-#define AW20216S_EN_PIN_1 A15
-#define AW20216S_PW_EN_PIN_1 B13
-
-#define RGB_MATRIX_LED_COUNT 31
+#define AW20216S_EN_PIN A15
+#define AW20216S_PW_EN_PIN B13
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B6
-
-#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
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#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
\ No newline at end of file
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
index 83f7d840dcb..63ae544ad32 100644
--- a/keyboards/gmmk/numpad/info.json
+++ b/keyboards/gmmk/numpad/info.json
@@ -21,6 +21,51 @@
         ]
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "aw20216s"
     },
     "processor": "WB32F3G71",
diff --git a/keyboards/gmmk/numpad/numpad.c b/keyboards/gmmk/numpad/numpad.c
index 5cdb34c7bd2..5a2bbdb1f61 100644
--- a/keyboards/gmmk/numpad/numpad.c
+++ b/keyboards/gmmk/numpad/numpad.c
@@ -19,44 +19,44 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to AW20216S manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS4_SW1,  CS5_SW1,  CS6_SW1  },  //  0  NUM
-    {0, CS4_SW2,  CS5_SW2,  CS6_SW2  },  //  1  /
-    {0, CS7_SW1,  CS8_SW1,  CS9_SW1  },  //  2  *
-    {0, CS7_SW2,  CS8_SW2,  CS9_SW2  },  //  3  -
-    {0, CS4_SW3,  CS5_SW3,  CS6_SW3  },  //  4  7
-    {0, CS4_SW4,  CS5_SW4,  CS6_SW4  },  //  5  8
-    {0, CS7_SW3,  CS8_SW3,  CS9_SW3  },  //  6  9
-    {0, CS7_SW4,  CS8_SW4,  CS9_SW4  },  //  7  +
-    {0, CS4_SW5,  CS5_SW5,  CS6_SW5  },  //  8  4
-    {0, CS4_SW6,  CS5_SW6,  CS6_SW6  },  //  9  5
-    {0, CS7_SW5,  CS8_SW5,  CS9_SW5  },  //  10 6
-    {0, CS4_SW7,  CS5_SW7,  CS6_SW7  },  //  11 1
-    {0, CS4_SW8,  CS5_SW8,  CS6_SW8  },  //  12 2
-    {0, CS7_SW7,  CS8_SW7,  CS9_SW7  },  //  13 3
-    {0, CS7_SW8,  CS8_SW8,  CS9_SW8  },  //  14 ENTER
-    {0, CS4_SW9,  CS5_SW9,  CS6_SW9  },  //  15 0
-    {0, CS7_SW9,  CS8_SW9,  CS9_SW9  },  //  16 .
-    {0, CS1_SW1,  CS2_SW1,  CS3_SW1  },  //  17 LED18
-    {0, CS1_SW2,  CS2_SW2,  CS3_SW2  },  //  18 LED19
-    {0, CS1_SW3,  CS2_SW3,  CS3_SW3  },  //  19 LED20
-    {0, CS1_SW4,  CS2_SW4,  CS3_SW4  },  //  20 LED21
-    {0, CS1_SW5,  CS2_SW5,  CS3_SW5  },  //  21 LED22
-    {0, CS1_SW6,  CS2_SW6,  CS3_SW6  },  //  22 LED23
-    {0, CS1_SW7,  CS2_SW7,  CS3_SW7  },  //  23 LED24
-    {0, CS10_SW1, CS11_SW1, CS12_SW1 },  //  24 LED27
-    {0, CS10_SW2, CS11_SW2, CS12_SW2 },  //  25 LED28
-    {0, CS10_SW3, CS11_SW3, CS12_SW3 },  //  26 LED29
-    {0, CS10_SW4, CS11_SW4, CS12_SW4 },  //  27 LED30
-    {0, CS10_SW5, CS11_SW5, CS12_SW5 },  //  28 LED31
-    {0, CS10_SW6, CS11_SW6, CS12_SW6 },  //  29 LED32
-    {0, CS10_SW7, CS11_SW7, CS12_SW7 },  //  30 LED33
+    {0, SW1_CS4,  SW1_CS5,  SW1_CS6  },  //  0  NUM
+    {0, SW2_CS4,  SW2_CS5,  SW2_CS6  },  //  1  /
+    {0, SW1_CS7,  SW1_CS8,  SW1_CS9  },  //  2  *
+    {0, SW2_CS7,  SW2_CS8,  SW2_CS9  },  //  3  -
+    {0, SW3_CS4,  SW3_CS5,  SW3_CS6  },  //  4  7
+    {0, SW4_CS4,  SW4_CS5,  SW4_CS6  },  //  5  8
+    {0, SW3_CS7,  SW3_CS8,  SW3_CS9  },  //  6  9
+    {0, SW4_CS7,  SW4_CS8,  SW4_CS9  },  //  7  +
+    {0, SW5_CS4,  SW5_CS5,  SW5_CS6  },  //  8  4
+    {0, SW6_CS4,  SW6_CS5,  SW6_CS6  },  //  9  5
+    {0, SW5_CS7,  SW5_CS8,  SW5_CS9  },  //  10 6
+    {0, SW7_CS4,  SW7_CS5,  SW7_CS6  },  //  11 1
+    {0, SW8_CS4,  SW8_CS5,  SW8_CS6  },  //  12 2
+    {0, SW7_CS7,  SW7_CS8,  SW7_CS9  },  //  13 3
+    {0, SW8_CS7,  SW8_CS8,  SW8_CS9  },  //  14 ENTER
+    {0, SW9_CS4,  SW9_CS5,  SW9_CS6  },  //  15 0
+    {0, SW9_CS7,  SW9_CS8,  SW9_CS9  },  //  16 .
+    {0, SW1_CS1,  SW1_CS2,  SW1_CS3  },  //  17 LED18
+    {0, SW2_CS1,  SW2_CS2,  SW2_CS3  },  //  18 LED19
+    {0, SW3_CS1,  SW3_CS2,  SW3_CS3  },  //  19 LED20
+    {0, SW4_CS1,  SW4_CS2,  SW4_CS3  },  //  20 LED21
+    {0, SW5_CS1,  SW5_CS2,  SW5_CS3  },  //  21 LED22
+    {0, SW6_CS1,  SW6_CS2,  SW6_CS3  },  //  22 LED23
+    {0, SW7_CS1,  SW7_CS2,  SW7_CS3  },  //  23 LED24
+    {0, SW1_CS10, SW1_CS11, SW1_CS12 },  //  24 LED27
+    {0, SW2_CS10, SW2_CS11, SW2_CS12 },  //  25 LED28
+    {0, SW3_CS10, SW3_CS11, SW3_CS12 },  //  26 LED29
+    {0, SW4_CS10, SW4_CS11, SW4_CS12 },  //  27 LED30
+    {0, SW5_CS10, SW5_CS11, SW5_CS12 },  //  28 LED31
+    {0, SW6_CS10, SW6_CS11, SW6_CS12 },  //  29 LED32
+    {0, SW7_CS10, SW7_CS11, SW7_CS12 },  //  30 LED33
 };
 
 led_config_t g_led_config = {{
@@ -111,8 +111,8 @@ led_config_t g_led_config = {{
 
 void keyboard_pre_init_user(void) {
     wait_ms(2000);
-    setPinOutput(AW20216S_PW_EN_PIN_1);
-    writePinHigh(AW20216S_PW_EN_PIN_1);
+    setPinOutput(AW20216S_PW_EN_PIN);
+    writePinHigh(AW20216S_PW_EN_PIN);
 }
 #    endif
 
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index 995dd95ec81..258b57e49d6 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -28,56 +28,4 @@
 
 #define AW20216S_CS_PIN_1 B13
 #define AW20216S_CS_PIN_2 B14
-#define AW20216S_EN_PIN_1 C13
-#define AW20216S_EN_PIN_2 C13
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// 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
-#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 AW20216S_EN_PIN C13
diff --git a/keyboards/gmmk/pro/info.json b/keyboards/gmmk/pro/info.json
new file mode 100644
index 00000000000..91080575194
--- /dev/null
+++ b/keyboards/gmmk/pro/info.json
@@ -0,0 +1,51 @@
+{
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "aw20216s",
+        "sleep": true
+    }
+}
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.c b/keyboards/gmmk/pro/rev1/ansi/ansi.c
index a06594cb884..77e0a8c1a11 100644
--- a/keyboards/gmmk/pro/rev1/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.c
@@ -136,106 +136,106 @@ led_config_t g_led_config = {{
     4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
 }};
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
-    {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
-    {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
-    {0, CS10_SW1, CS11_SW1, CS12_SW1},     //  3, Caps, k21
-    {0, CS13_SW1, CS14_SW1, CS15_SW1},     //  4, Sh_L, k00
-    {0, CS16_SW1, CS17_SW1, CS18_SW1},     //  5, Ct_L, k06
-    {0, CS1_SW2, CS2_SW2, CS3_SW2},        //  6, F1, k26
-    {0, CS4_SW2, CS5_SW2, CS6_SW2},        //  7, 1, k17
-    {0, CS7_SW2, CS8_SW2, CS9_SW2},        //  8, Q, k10
-    {0, CS10_SW2, CS11_SW2, CS12_SW2},     //  9, A, k12
-    {0, CS13_SW2, CS14_SW2, CS15_SW2},     //  10, Z, k14
-    {0, CS16_SW2, CS17_SW2, CS18_SW2},     //  11, Win_L, k90
-    {0, CS1_SW3, CS2_SW3, CS3_SW3},        //  12, F2, k36
-    {0, CS4_SW3, CS5_SW3, CS6_SW3},        //  13, 2, k27
-    {0, CS7_SW3, CS8_SW3, CS9_SW3},        //  14, W, k20
-    {0, CS10_SW3, CS11_SW3, CS12_SW3},     //  15, S, k22
-    {0, CS13_SW3, CS14_SW3, CS15_SW3},     //  16, X, k24
-    {0, CS16_SW3, CS17_SW3, CS18_SW3},     //  17, Alt_L, k93
-    {0, CS1_SW4, CS2_SW4, CS3_SW4},        //  18, F3, k31
-    {0, CS4_SW4, CS5_SW4, CS6_SW4},        //  19, 3, k37
-    {0, CS7_SW4, CS8_SW4, CS9_SW4},        //  20, E, k30
-    {0, CS10_SW4, CS11_SW4, CS12_SW4},     //  21, D, k32
-    {0, CS13_SW4, CS14_SW4, CS15_SW4},     //  22, C, k34
-    {0, CS1_SW5, CS2_SW5, CS3_SW5},        //  23, F4, k33
-    {0, CS4_SW5, CS5_SW5, CS6_SW5},        //  24, 4, k47
-    {0, CS7_SW5, CS8_SW5, CS9_SW5},        //  25, R, k40
-    {0, CS10_SW5, CS11_SW5, CS12_SW5},     //  26, F, k42
-    {0, CS13_SW5, CS14_SW5, CS15_SW5},     //  27, V, k44
-    {0, CS1_SW6, CS2_SW6, CS3_SW6},        //  28, F5, k07
-    {0, CS4_SW6, CS5_SW6, CS6_SW6},        //  29, 5, k46
-    {0, CS7_SW6, CS8_SW6, CS9_SW6},        //  30, T, k41
-    {0, CS10_SW6, CS11_SW6, CS12_SW6},     //  31, G, k43
-    {0, CS13_SW6, CS14_SW6, CS15_SW6},     //  32, B, k45
-    {0, CS16_SW6, CS17_SW6, CS18_SW6},     //  33, SPACE, k94
-    {0, CS1_SW7, CS2_SW7, CS3_SW7},        //  34, F6, k63
-    {0, CS4_SW7, CS5_SW7, CS6_SW7},        //  35, 6, k56
-    {0, CS7_SW7, CS8_SW7, CS9_SW7},        //  36, Y, k51
-    {0, CS10_SW7, CS11_SW7, CS12_SW7},     //  37, H, k53
-    {0, CS13_SW7, CS14_SW7, CS15_SW7},     //  38, N, k55
-    {0, CS1_SW8, CS2_SW8, CS3_SW8},        //  39, F7, k71
-    {0, CS4_SW8, CS5_SW8, CS6_SW8},        //  40, 7, k57
-    {0, CS7_SW8, CS8_SW8, CS9_SW8},        //  41, U, k50
-    {0, CS10_SW8, CS11_SW8, CS12_SW8},     //  42, J, k52
-    {0, CS13_SW8, CS14_SW8, CS15_SW8},     //  43, M, k54
-    {0, CS1_SW9, CS2_SW9, CS3_SW9},        //  44, F8, k76
-    {0, CS4_SW9, CS5_SW9, CS6_SW9},        //  45, 8, k67
-    {0, CS7_SW9, CS8_SW9, CS9_SW9},        //  46, I, k60
-    {0, CS10_SW9, CS11_SW9, CS12_SW9},     //  47, K, k62
-    {0, CS13_SW9, CS14_SW9, CS15_SW9},     //  48, ,, k64
-    {0, CS16_SW9, CS17_SW9, CS18_SW9},     //  49, Alt_R, k95
-    {0, CS1_SW10, CS2_SW10, CS3_SW10},     //  50, F9, ka6
-    {0, CS4_SW10, CS5_SW10, CS6_SW10},     //  51, 9, k77
-    {0, CS7_SW10, CS8_SW10, CS9_SW10},     //  52, O, k70
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  53, L, k72
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  54, ., k74
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  55, FN, k92
-    {0, CS1_SW11, CS2_SW11, CS3_SW11},     //  56, F10, ka7
-    {0, CS4_SW11, CS5_SW11, CS6_SW11},     //  57, 0, k87
-    {0, CS7_SW11, CS8_SW11, CS9_SW11},     //  58, P, k80
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  59, ;, k82
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  60, ?, k85
-    {0, CS1_SW12, CS2_SW12, CS3_SW12},     //  61, F11, ka3
-    {0, CS4_SW12, CS5_SW12, CS6_SW12},     //  62, -, k86
-    {0, CS7_SW12, CS8_SW12, CS9_SW12},     //  63, [, k81
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  64, ", k83
-    {0, CS16_SW12, CS17_SW12, CS18_SW12},  //  65, Ct_R, k04
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},        //  0, ESC, k13
+    {0, SW1_CS4, SW1_CS5, SW1_CS6},        //  1, ~, k16
+    {0, SW1_CS7, SW1_CS8, SW1_CS9},        //  2, Tab, k11
+    {0, SW1_CS10, SW1_CS11, SW1_CS12},     //  3, Caps, k21
+    {0, SW1_CS13, SW1_CS14, SW1_CS15},     //  4, Sh_L, k00
+    {0, SW1_CS16, SW1_CS17, SW1_CS18},     //  5, Ct_L, k06
+    {0, SW2_CS1, SW2_CS2, SW2_CS3},        //  6, F1, k26
+    {0, SW2_CS4, SW2_CS5, SW2_CS6},        //  7, 1, k17
+    {0, SW2_CS7, SW2_CS8, SW2_CS9},        //  8, Q, k10
+    {0, SW2_CS10, SW2_CS11, SW2_CS12},     //  9, A, k12
+    {0, SW2_CS13, SW2_CS14, SW2_CS15},     //  10, Z, k14
+    {0, SW2_CS16, SW2_CS17, SW2_CS18},     //  11, Win_L, k90
+    {0, SW3_CS1, SW3_CS2, SW3_CS3},        //  12, F2, k36
+    {0, SW3_CS4, SW3_CS5, SW3_CS6},        //  13, 2, k27
+    {0, SW3_CS7, SW3_CS8, SW3_CS9},        //  14, W, k20
+    {0, SW3_CS10, SW3_CS11, SW3_CS12},     //  15, S, k22
+    {0, SW3_CS13, SW3_CS14, SW3_CS15},     //  16, X, k24
+    {0, SW3_CS16, SW3_CS17, SW3_CS18},     //  17, Alt_L, k93
+    {0, SW4_CS1, SW4_CS2, SW4_CS3},        //  18, F3, k31
+    {0, SW4_CS4, SW4_CS5, SW4_CS6},        //  19, 3, k37
+    {0, SW4_CS7, SW4_CS8, SW4_CS9},        //  20, E, k30
+    {0, SW4_CS10, SW4_CS11, SW4_CS12},     //  21, D, k32
+    {0, SW4_CS13, SW4_CS14, SW4_CS15},     //  22, C, k34
+    {0, SW5_CS1, SW5_CS2, SW5_CS3},        //  23, F4, k33
+    {0, SW5_CS4, SW5_CS5, SW5_CS6},        //  24, 4, k47
+    {0, SW5_CS7, SW5_CS8, SW5_CS9},        //  25, R, k40
+    {0, SW5_CS10, SW5_CS11, SW5_CS12},     //  26, F, k42
+    {0, SW5_CS13, SW5_CS14, SW5_CS15},     //  27, V, k44
+    {0, SW6_CS1, SW6_CS2, SW6_CS3},        //  28, F5, k07
+    {0, SW6_CS4, SW6_CS5, SW6_CS6},        //  29, 5, k46
+    {0, SW6_CS7, SW6_CS8, SW6_CS9},        //  30, T, k41
+    {0, SW6_CS10, SW6_CS11, SW6_CS12},     //  31, G, k43
+    {0, SW6_CS13, SW6_CS14, SW6_CS15},     //  32, B, k45
+    {0, SW6_CS16, SW6_CS17, SW6_CS18},     //  33, SPACE, k94
+    {0, SW7_CS1, SW7_CS2, SW7_CS3},        //  34, F6, k63
+    {0, SW7_CS4, SW7_CS5, SW7_CS6},        //  35, 6, k56
+    {0, SW7_CS7, SW7_CS8, SW7_CS9},        //  36, Y, k51
+    {0, SW7_CS10, SW7_CS11, SW7_CS12},     //  37, H, k53
+    {0, SW7_CS13, SW7_CS14, SW7_CS15},     //  38, N, k55
+    {0, SW8_CS1, SW8_CS2, SW8_CS3},        //  39, F7, k71
+    {0, SW8_CS4, SW8_CS5, SW8_CS6},        //  40, 7, k57
+    {0, SW8_CS7, SW8_CS8, SW8_CS9},        //  41, U, k50
+    {0, SW8_CS10, SW8_CS11, SW8_CS12},     //  42, J, k52
+    {0, SW8_CS13, SW8_CS14, SW8_CS15},     //  43, M, k54
+    {0, SW9_CS1, SW9_CS2, SW9_CS3},        //  44, F8, k76
+    {0, SW9_CS4, SW9_CS5, SW9_CS6},        //  45, 8, k67
+    {0, SW9_CS7, SW9_CS8, SW9_CS9},        //  46, I, k60
+    {0, SW9_CS10, SW9_CS11, SW9_CS12},     //  47, K, k62
+    {0, SW9_CS13, SW9_CS14, SW9_CS15},     //  48, ,, k64
+    {0, SW9_CS16, SW9_CS17, SW9_CS18},     //  49, Alt_R, k95
+    {0, SW10_CS1, SW10_CS2, SW10_CS3},     //  50, F9, ka6
+    {0, SW10_CS4, SW10_CS5, SW10_CS6},     //  51, 9, k77
+    {0, SW10_CS7, SW10_CS8, SW10_CS9},     //  52, O, k70
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  53, L, k72
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  54, ., k74
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  55, FN, k92
+    {0, SW11_CS1, SW11_CS2, SW11_CS3},     //  56, F10, ka7
+    {0, SW11_CS4, SW11_CS5, SW11_CS6},     //  57, 0, k87
+    {0, SW11_CS7, SW11_CS8, SW11_CS9},     //  58, P, k80
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  59, ;, k82
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  60, ?, k85
+    {0, SW12_CS1, SW12_CS2, SW12_CS3},     //  61, F11, ka3
+    {0, SW12_CS4, SW12_CS5, SW12_CS6},     //  62, -, k86
+    {0, SW12_CS7, SW12_CS8, SW12_CS9},     //  63, [, k81
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  64, ", k83
+    {0, SW12_CS16, SW12_CS17, SW12_CS18},  //  65, Ct_R, k04
 
-    {1, CS1_SW1, CS2_SW1, CS3_SW1},     //  66, F12, ka5
-    {1, CS13_SW1, CS14_SW1, CS15_SW1},  //  67, LED, l01
-    {1, CS16_SW1, CS17_SW1, CS18_SW1},  //  68, LED, l11
-    {1, CS4_SW2, CS5_SW2, CS6_SW2},     //  69, Prt, k97
-    {1, CS13_SW2, CS14_SW2, CS15_SW2},  //  70, LED, l02
-    {1, CS16_SW2, CS17_SW2, CS18_SW2},  //  71, LED, l12
-    {1, CS4_SW3, CS5_SW3, CS6_SW3},     //  72, Del, k65
-    {1, CS13_SW3, CS14_SW3, CS15_SW3},  //  73, LED, l03
-    {1, CS16_SW3, CS17_SW3, CS18_SW3},  //  74, LED, l13
-    {1, CS4_SW4, CS5_SW4, CS6_SW4},     //  75, PgUp, k15
-    {1, CS13_SW4, CS14_SW4, CS15_SW4},  //  76, LED, l04
-    {1, CS16_SW4, CS17_SW4, CS18_SW4},  //  77, LED, l14
-    {1, CS1_SW5, CS2_SW5, CS3_SW5},     //  78, =, k66
-    {1, CS10_SW5, CS11_SW5, CS12_SW5},  //  79, Right, k05
-    {1, CS13_SW5, CS14_SW5, CS15_SW5},  //  80, LED, l05
-    {1, CS16_SW5, CS17_SW5, CS18_SW5},  //  81, LED, l15
-    {1, CS4_SW6, CS5_SW6, CS6_SW6},     //  82, End, k75
-    {1, CS13_SW6, CS14_SW6, CS15_SW6},  //  83, LED, l06
-    {1, CS16_SW6, CS17_SW6, CS18_SW6},  //  84, LED, l16
-    {1, CS1_SW7, CS2_SW7, CS3_SW7},     //  85, BSpc, ka1
-    {1, CS4_SW7, CS5_SW7, CS6_SW7},     //  86, PgDn, k25
-    {1, CS13_SW7, CS14_SW7, CS15_SW7},  //  87, LED, l07
-    {1, CS16_SW7, CS17_SW7, CS18_SW7},  //  88, LED, l17
-    {1, CS1_SW8, CS2_SW8, CS3_SW8},     //  89, ], k61
-    {1, CS4_SW8, CS5_SW8, CS6_SW8},     //  90, Sh_R, k91
-    {1, CS13_SW8, CS14_SW8, CS15_SW8},  //  91, LED, l08
-    {1, CS16_SW8, CS17_SW8, CS18_SW8},  //  92, LED, l18
-    {1, CS1_SW9, CS2_SW9, CS3_SW9},     //  93, \, ka2
-    {1, CS4_SW9, CS5_SW9, CS6_SW9},     //  94, Up, k35
-    {1, CS4_SW10, CS5_SW10, CS6_SW10},  //  95, Left, k03
-    {1, CS1_SW11, CS2_SW11, CS3_SW11},  //  96, Enter, ka4
-    {1, CS4_SW11, CS5_SW11, CS6_SW11},  //  97, Down, k73
+    {1, SW1_CS1, SW1_CS2, SW1_CS3},     //  66, F12, ka5
+    {1, SW1_CS13, SW1_CS14, SW1_CS15},  //  67, LED, l01
+    {1, SW1_CS16, SW1_CS17, SW1_CS18},  //  68, LED, l11
+    {1, SW2_CS4, SW2_CS5, SW2_CS6},     //  69, Prt, k97
+    {1, SW2_CS13, SW2_CS14, SW2_CS15},  //  70, LED, l02
+    {1, SW2_CS16, SW2_CS17, SW2_CS18},  //  71, LED, l12
+    {1, SW3_CS4, SW3_CS5, SW3_CS6},     //  72, Del, k65
+    {1, SW3_CS13, SW3_CS14, SW3_CS15},  //  73, LED, l03
+    {1, SW3_CS16, SW3_CS17, SW3_CS18},  //  74, LED, l13
+    {1, SW4_CS4, SW4_CS5, SW4_CS6},     //  75, PgUp, k15
+    {1, SW4_CS13, SW4_CS14, SW4_CS15},  //  76, LED, l04
+    {1, SW4_CS16, SW4_CS17, SW4_CS18},  //  77, LED, l14
+    {1, SW5_CS1, SW5_CS2, SW5_CS3},     //  78, =, k66
+    {1, SW5_CS10, SW5_CS11, SW5_CS12},  //  79, Right, k05
+    {1, SW5_CS13, SW5_CS14, SW5_CS15},  //  80, LED, l05
+    {1, SW5_CS16, SW5_CS17, SW5_CS18},  //  81, LED, l15
+    {1, SW6_CS4, SW6_CS5, SW6_CS6},     //  82, End, k75
+    {1, SW6_CS13, SW6_CS14, SW6_CS15},  //  83, LED, l06
+    {1, SW6_CS16, SW6_CS17, SW6_CS18},  //  84, LED, l16
+    {1, SW7_CS1, SW7_CS2, SW7_CS3},     //  85, BSpc, ka1
+    {1, SW7_CS4, SW7_CS5, SW7_CS6},     //  86, PgDn, k25
+    {1, SW7_CS13, SW7_CS14, SW7_CS15},  //  87, LED, l07
+    {1, SW7_CS16, SW7_CS17, SW7_CS18},  //  88, LED, l17
+    {1, SW8_CS1, SW8_CS2, SW8_CS3},     //  89, ], k61
+    {1, SW8_CS4, SW8_CS5, SW8_CS6},     //  90, Sh_R, k91
+    {1, SW8_CS13, SW8_CS14, SW8_CS15},  //  91, LED, l08
+    {1, SW8_CS16, SW8_CS17, SW8_CS18},  //  92, LED, l18
+    {1, SW9_CS1, SW9_CS2, SW9_CS3},     //  93, \, ka2
+    {1, SW9_CS4, SW9_CS5, SW9_CS6},     //  94, Up, k35
+    {1, SW10_CS4, SW10_CS5, SW10_CS6},  //  95, Left, k03
+    {1, SW11_CS1, SW11_CS2, SW11_CS3},  //  96, Enter, ka4
+    {1, SW11_CS4, SW11_CS5, SW11_CS6},  //  97, Down, k73
 };
 // clang-format on
 #endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/config.h b/keyboards/gmmk/pro/rev1/ansi/config.h
deleted file mode 100644
index 9f21a6bf716..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Gigahawk
- *
- * 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 DRIVER_1_LED_TOTAL 66
-#define DRIVER_2_LED_TOTAL 32
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index fc2197a0d76..533a3796568 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
-    "rgb_matrix": {
-        "driver": "aw20216s"
-    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
         "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
deleted file mode 100644
index 838aee86523..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-   Copyright 2021 alexmarmon
-
-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] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Alt_L    Win_L                               SPACE                               Ct_R        Alt_R   FN     Left     Down     Right
-
-
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-    [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_PSCR,          KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RCTL, KC_RALT,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          RGB_MODE_FORWARD,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          RGB_MODE_REVERSE,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, RGB_TOG,
-        _______, _______, _______,                            _______,                            _______, _______, _______, KC_MEDIA_PREV_TRACK, _______, KC_MEDIA_NEXT_TRACK
-    ),
-
-
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    //return true; //set to return false to counteract enabled encoder in pro.c
-    return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/readme.md
deleted file mode 100644
index 36ad42b1af3..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-![Layout Image](https://i.imgur.com/MizMvsI.jpg)
-
-# Simple MacOS like keymap with RGB
-
-* Working basic RGB thanks to https://github.com/qmk/qmk_firmware/pull/13430
-* Restore working rotary knob volume control
-* Add media_previous and media_next to FN+left and FN+right
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
deleted file mode 100644
index 18271fb4d25..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2022 Andre Brait
- *
- * 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 RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_TIMEOUT 1200000 // 20 minutes (20 * 60 * 1000ms)
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#endif
-
-// A debounce of 8 represents a minimum key press time of just under 1 refresh at 120Hz
-// Slightly higher than the default because we are using sym_eager_pk
-#ifdef DEBOUNCE
-#    undef DEBOUNCE
-#endif
-#define DEBOUNCE 8
-
-// 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
-// #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_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
deleted file mode 100644
index 3d2792b4a64..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
+++ /dev/null
@@ -1,510 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-   Copyright 2022 Andre Brait <andrebrait@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 layers { WIN_BASE = 0, WIN_FN, MAC_BASE, MAC_FN };
-
-enum custom_keycodes {
-    CMDQ_TOG = QK_KB_2 // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
-};
-
-#define KC_TASK LWIN(KC_TAB) // Open Task Manager
-#define KC_FLXP LWIN(KC_E)   // Open File Explorer
-#define DF_WINB DF(WIN_BASE) // Switch to WIN_BASE layer
-#define MO_WINF MO(WIN_FN)   // Toggle to WIN_FN layer
-#define DF_MACB DF(MAC_BASE) // Switch to MAX_BASE layer
-#define MO_MACF MO(MAC_FN)   // Toggle to MAC_FN layer
-
-// clang-format off
-uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// The GMMK Pro default layout is:
-//
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Del          Rotary(Play/Pause)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Home
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-    //
-    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
-    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
-    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
-    //
-    // RGB and function keys are inspired by the Keychron Q1 layouts instead of using the default keys.
-    // To clean the EEPROM, hold the ESC key while connecting the keyboard.
-
-    [WIN_BASE] = LAYOUT(
-        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
-        KC_GRV,  KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,
-        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_HOME,
-        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_LWIN,  KC_LALT,                            KC_SPC,                             KC_RALT, MO_WINF, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [WIN_FN] = LAYOUT(
-        EE_CLR,  KC_BRID,  KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,          XXXXXXX,
-        XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_PAUS,
-        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,          KC_SCRL,
-        DF_MACB, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          KC_PGUP,
-        XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, KC_PGDN,
-        XXXXXXX, XXXXXXX,  XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    [MAC_BASE] = LAYOUT(
-        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
-        KC_GRV,  KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,
-        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_HOME,
-        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_LOPT,  KC_LCMD,                            KC_SPC,                             KC_RCMD, MO_MACF, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [MAC_FN] = LAYOUT(
-        EE_CLR,  KC_BRID,  KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,          XXXXXXX,
-        XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_BRMU,
-        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,          KC_BRMD,
-        DF_WINB, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          KC_PGUP,
-        XXXXXXX,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, KC_PGDN,
-        XXXXXXX, XXXXXXX,  CMDQ_TOG,                           XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-};
-// clang-format on
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [WIN_FN]   = {ENCODER_CCW_CW(XXXXXXX, XXXXXXX)},
-    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [MAC_FN]   = {ENCODER_CCW_CW(XXXXXXX, XXXXXXX)},
-};
-#endif
-
-/* To record user preferences */
-typedef union {
-    uint32_t raw; // set to 32-bit of size
-    struct {
-        bool rgb_enabled : 1;         // Artificial RGB ON/OFF flag (1 bit)
-        bool cmd_q_delay_enabled : 1; // Toggle CMD+Q delay (1 bit)
-    };
-} user_config_t;
-user_config_t user_config;
-
-/* Delayed keypresses variables and functions */
-static fast_timer_t delayed_press_delay        = 0;
-static uint16_t     delayed_press_keycode      = KC_NO;
-static fast_timer_t delayed_press_start_time   = 0;
-static uint16_t     delayed_press_sent_keycode = KC_NO;
-static void         start_delayed_press(fast_timer_t delay, uint16_t keycode);
-static void         mark_delayed_press_sent(void);
-static void         mark_delayed_release_sent(void);
-static void         cancel_delayed_press(void);
-
-#define IS_ANY_DELAYED_PRESS_PENDING() (delayed_press_start_time > 0 && delayed_press_keycode != KC_NO)
-#define IS_DELAYED_PRESS_PENDING(keycode) (delayed_press_start_time > 0 && delayed_press_keycode == (keycode))
-#define IS_DELAYED_PRESS_SENT(keycode) (delayed_press_sent_keycode != KC_NO && delayed_press_sent_keycode == (keycode))
-
-/* CMD+Q delay */
-#ifndef CMD_Q_DELAY
-#    define CMD_Q_DELAY 1000
-#endif
-#if CMD_Q_DELAY <= 0 || CMD_Q_DELAY >= UINT16_MAX / 2
-#    error "CMD_Q_DELAY must be a positive integer smaller than UINT16_MAX / 2"
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-
-#    define CAPS_LOCK_COLOR RGB_RED
-#    define WIN_BASE_COLOR RGB_BLUE
-#    define WIN_FN_COLOR RGB_BLUE
-#    define MAC_BASE_COLOR RGB_WHITE
-#    define MAC_FN_COLOR RGB_WHITE
-#    define UNKNOWN_LAYER_COLOR RGB_PINK
-
-/* The maximum effects duration */
-#    ifndef EFFECTS_DURATION
-#        define EFFECTS_DURATION 2000
-#    endif
-#    if EFFECTS_DURATION <= 0 || EFFECTS_DURATION >= UINT16_MAX / 2
-#        error "EFFECTS_DURATION must be a positive integer smaller than UINT16_MAX / 2"
-#    endif
-/* The interval for the flashing effect */
-#    ifndef FLASHING_EFFECT_INTERVAL
-#        define FLASHING_EFFECT_INTERVAL 250
-#    endif
-#    if FLASHING_EFFECT_INTERVAL <= 0 || FLASHING_EFFECT_INTERVAL >= UINT16_MAX / 2
-#        error "FLASHING_EFFECT_INTERVAL must be a positive integer smaller than UINT16_MAX / 2"
-#    endif
-
-static void set_rgb_layer_winfn(void);
-static void set_rgb_layer_macfn(void);
-
-/* Effects functions */
-static float flashing_effect(fast_timer_t delta_time);
-static float static_effect(fast_timer_t delta_time);
-static float increasing_effect(fast_timer_t delta_time);
-
-/* Effect variables and functions */
-static fast_timer_t effect_started_time = 0;
-static fast_timer_t effect_max_duration = EFFECTS_DURATION;
-static uint8_t      effect_r = 0x0, effect_g = 0x0, effect_b = 0x0;
-static float (*effect_multiplier)(fast_timer_t) = static_effect;
-static void start_effects(fast_timer_t max_duration, uint8_t r_color, uint8_t g_color, uint8_t b_color, float (*multiplier)(fast_timer_t));
-static void stop_effects(void);
-
-/* Delayed keypresses variables with RGB variant */
-static void start_delayed_press_with_effects(fast_timer_t delay, uint16_t keycode, uint8_t r_color, uint8_t g_color, uint8_t b_color);
-
-#endif // RGB_MATRIX_ENABLE
-
-void eeconfig_init_user(void) { // EEPROM is getting reset!
-    user_config.raw                 = 0;
-    user_config.rgb_enabled         = true; // We want this enabled by default
-    user_config.cmd_q_delay_enabled = true; // We want this enabled by default
-    eeconfig_update_user(user_config.raw);  // Write default value to EEPROM now
-}
-
-void keyboard_post_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    // Enable the RGB matrix, if not enabled
-    if (!rgb_matrix_is_enabled()) {
-        rgb_matrix_enable();
-    }
-    // Set the flags to ALL, if not already set
-    if (rgb_matrix_get_flags() != LED_FLAG_ALL) {
-        rgb_matrix_set_flags(LED_FLAG_ALL);
-    }
-#endif
-
-    // Read the user config from EEPROM
-    user_config.raw = eeconfig_read_user();
-}
-
-void matrix_scan_user(void) {
-    if (IS_ANY_DELAYED_PRESS_PENDING()) {
-        if (timer_elapsed_fast(delayed_press_start_time) > delayed_press_delay) {
-            register_code(delayed_press_keycode);
-            mark_delayed_press_sent();
-        }
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (IS_DELAYED_PRESS_SENT(keycode)) {
-        if (!record->event.pressed) {
-            /* Send key-up event and clear the keycode and stop processing */
-            unregister_code(keycode);
-            mark_delayed_release_sent();
-            return false;
-        }
-    } else if (IS_DELAYED_PRESS_PENDING(keycode)) {
-        if (!record->event.pressed) {
-            /* Cancel the pending press and stop processing */
-            cancel_delayed_press();
-            return false;
-        }
-    } else if (IS_ANY_DELAYED_PRESS_PENDING()) {
-        /* Cancel the pending press and resume processing */
-        cancel_delayed_press();
-    }
-    switch (keycode) {
-        case QK_DEF_LAYER ... QK_DEF_LAYER_MAX:
-            if (record->event.pressed) {
-                /* Set the default layout on the EEPROM, let the default layer change callback handle the rest */
-                set_single_persistent_default_layer(QK_DEF_LAYER_GET_LAYER(keycode));
-            }
-            return false;
-        case CMDQ_TOG:
-            if (record->event.pressed) {
-#ifdef RGB_MATRIX_ENABLE
-                if (user_config.cmd_q_delay_enabled) {
-                    /* Turning delay OFF */
-                    start_effects(EFFECTS_DURATION, RGB_RED, flashing_effect);
-                } else {
-                    /* Turning delay ON */
-                    start_effects(EFFECTS_DURATION, RGB_GREEN, flashing_effect);
-                }
-#endif
-                user_config.cmd_q_delay_enabled = !user_config.cmd_q_delay_enabled;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;
-        case KC_Q:
-            if (user_config.cmd_q_delay_enabled) {
-                if (layer_state_is(MAC_BASE)) {
-                    uint8_t mods = get_mods();
-                    if (mods == MOD_BIT(KC_LCMD) || mods == MOD_BIT(KC_RCMD)) {
-                        if (record->event.pressed) {
-#ifdef RGB_MATRIX_ENABLE
-                            start_delayed_press_with_effects(CMD_Q_DELAY, KC_Q, RGB_ORANGE);
-#else
-                            start_delayed_press(CMD_Q_DELAY, KC_Q);
-#endif
-                        }
-                        return false;
-                    }
-                }
-            }
-            break;
-#ifdef RGB_MATRIX_ENABLE
-#    ifdef NKRO_ENABLE
-        case NK_TOGG:
-            if (record->event.pressed) {
-                if (keymap_config.nkro) {
-                    /* Turning NKRO OFF */
-                    start_effects(EFFECTS_DURATION, RGB_RED, flashing_effect);
-                } else {
-                    /* Turning NKRO ON */
-                    start_effects(EFFECTS_DURATION, RGB_GREEN, flashing_effect);
-                }
-            }
-            break;
-#    endif // NKRO_ENABLE
-        case RGB_TOG:
-            if (record->event.pressed) {
-                user_config.rgb_enabled = !user_config.rgb_enabled;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;
-        case RGB_MODE_FORWARD ... RGB_MODE_TWINKLE:
-            if (!user_config.rgb_enabled) {
-                /* Ignore changes to RGB settings while only it's supposed to be OFF */
-                return false; // Skip all further processing of this key
-            }
-            break;
-#endif // RGB_MATRIX_ENABLE
-    }
-    return true;
-}
-
-static void start_delayed_press(fast_timer_t delay, uint16_t keycode) {
-    delayed_press_delay        = delay;
-    delayed_press_keycode      = keycode;
-    delayed_press_start_time   = timer_read_fast();
-    delayed_press_sent_keycode = KC_NO;
-}
-
-static void mark_delayed_press_sent(void) {
-    delayed_press_sent_keycode = delayed_press_keycode;
-    cancel_delayed_press();
-}
-
-static void mark_delayed_release_sent(void) {
-    delayed_press_sent_keycode = KC_NO;
-}
-
-static void cancel_delayed_press(void) {
-    delayed_press_delay      = 0;
-    delayed_press_keycode    = KC_NO;
-    delayed_press_start_time = 0;
-#ifdef RGB_MATRIX_ENABLE
-    stop_effects();
-#endif
-}
-
-#ifdef RGB_MATRIX_ENABLE
-
-static void start_delayed_press_with_effects(fast_timer_t delay, uint16_t keycode, uint8_t r_color, uint8_t g_color, uint8_t b_color) {
-    start_delayed_press(delay, keycode);
-    start_effects(delay, r_color, g_color, b_color, increasing_effect);
-}
-
-/*
-Effects when switching layers
-*/
-
-static uint8_t previous_layer = UINT8_MAX;
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    uint8_t current_layer = get_highest_layer(state);
-    if (previous_layer != current_layer) {
-        // For some reason, setting the default layer alone doesn't change it fully
-        layer_move(current_layer);
-        switch (current_layer) {
-            case WIN_BASE:
-                start_effects(EFFECTS_DURATION, WIN_BASE_COLOR, flashing_effect);
-                break;
-            case MAC_BASE:
-                start_effects(EFFECTS_DURATION, MAC_BASE_COLOR, flashing_effect);
-                break;
-            default:
-                // This should not ever happen, but let's display something if it does!
-                start_effects(EFFECTS_DURATION, UNKNOWN_LAYER_COLOR, static_effect);
-                break;
-        }
-        previous_layer = current_layer;
-    }
-    return state;
-}
-
-static void start_effects(fast_timer_t max_duration, uint8_t r_color, uint8_t g_color, uint8_t b_color, float (*multiplier)(fast_timer_t)) {
-    effect_r            = r_color;
-    effect_g            = g_color;
-    effect_b            = b_color;
-    effect_multiplier   = multiplier;
-    effect_max_duration = max_duration;
-    effect_started_time = timer_read_fast();
-}
-
-static void stop_effects(void) {
-    effect_r            = 0x0;
-    effect_g            = 0x0;
-    effect_b            = 0x0;
-    effect_multiplier   = static_effect;
-    effect_max_duration = EFFECTS_DURATION;
-    effect_started_time = 0;
-}
-
-static float flashing_effect(fast_timer_t delta_time) {
-    return ((delta_time / FLASHING_EFFECT_INTERVAL) + 1) & 0x01;
-}
-
-static float static_effect(fast_timer_t delta_time) {
-    return 1.0;
-}
-
-static float increasing_effect(fast_timer_t delta_time) {
-    return ((float)delta_time) / effect_max_duration;
-}
-
-bool rgb_matrix_indicators_user(void) {
-    if (effect_started_time > 0) {
-        fast_timer_t delta_time = timer_elapsed_fast(effect_started_time);
-        if (delta_time <= effect_max_duration) {
-            /* Render effect */
-            float   multiplier = effect_multiplier(delta_time);
-            uint8_t val_r      = multiplier * effect_r;
-            uint8_t val_g      = multiplier * effect_g;
-            uint8_t val_b      = multiplier * effect_b;
-            rgb_matrix_set_color_all(val_r, val_g, val_b);
-            return false;
-        } else {
-            /* Effect duration is finished */
-            stop_effects();
-        }
-    }
-    if (host_keyboard_led_state().caps_lock) {
-        rgb_matrix_set_color_all(CAPS_LOCK_COLOR);
-    } else if (!user_config.rgb_enabled) {
-        rgb_matrix_set_color_all(RGB_OFF);
-    }
-    switch (get_highest_layer(layer_state)) {
-        case WIN_BASE:
-        case MAC_BASE:
-            break;
-        case WIN_FN:
-            set_rgb_layer_winfn();
-            return false;
-        case MAC_FN:
-            set_rgb_layer_macfn();
-            return false;
-        default:
-            // This should never happen, but if it does, let's display something!
-            rgb_matrix_set_color_all(UNKNOWN_LAYER_COLOR);
-            return false;
-    }
-    return true;
-}
-
-// RGB led number layout, function of the key
-
-//  67, led 01   0, ESC    6, F1      12, F2      18, F3   23, F4   28, F5      34, F6   39, F7   44, F8      50, F9   56, F10   61, F11    66, F12    69, Prt       Rotary(Mute)   68, led 12
-//  70, led 02   1, ~      7, 1       13, 2       19, 3    24, 4    29, 5       35, 6    40, 7    45, 8       51, 9    57, 0     62, -_     78, (=+)   85, BackSpc   72, Home       71, led 13
-//  73, led 03   2, Tab    8, Q       14, W       20. E    25, R    30, T       36, Y    41, U    46, I       52, O    58, P     63, [{     89, ]}     93, \|        75, PgUp       74, led 14
-//  76, led 04   3, Caps   9, A       15, S       21, D    26, F    31, G       37, H    42, J    47, K       53, L    59, ;:    64, '"                96, Enter     86, PgDn       77, led 15
-//  80, led 05   4, Sh_L   10, Z      16, X       22, C    27, V    32, B       38, N    43, M    48, ,<      54, .<   60, /?               90, Sh_R   94, Up        82, End        81, led 16
-//  83, led 06   5, Ct_L   11,Win_L   17, Alt_L                     33, SPACE                     49, Alt_R   55, FN             65, Ct_R   95, Left   97, Down      79, Right      84, led 17
-//  87, led 07                                                                                                                                                                      88, led 18
-//  91, led 08                                                                                                                                                                      92, led 19
-
-static void set_rgb_layer_winfn(void) {
-    rgb_matrix_set_color(0, WIN_FN_COLOR);
-    rgb_matrix_set_color(6, WIN_FN_COLOR);
-    rgb_matrix_set_color(12, WIN_FN_COLOR);
-    rgb_matrix_set_color(18, WIN_FN_COLOR);
-    rgb_matrix_set_color(23, WIN_FN_COLOR);
-    rgb_matrix_set_color(28, WIN_FN_COLOR);
-    rgb_matrix_set_color(34, WIN_FN_COLOR);
-    rgb_matrix_set_color(39, WIN_FN_COLOR);
-    rgb_matrix_set_color(44, WIN_FN_COLOR);
-    rgb_matrix_set_color(50, WIN_FN_COLOR);
-    rgb_matrix_set_color(56, WIN_FN_COLOR);
-    rgb_matrix_set_color(61, WIN_FN_COLOR);
-    rgb_matrix_set_color(66, WIN_FN_COLOR);
-    rgb_matrix_set_color(2, WIN_FN_COLOR);
-    rgb_matrix_set_color(3, WIN_FN_COLOR);
-    rgb_matrix_set_color(8, WIN_FN_COLOR);
-    rgb_matrix_set_color(9, WIN_FN_COLOR);
-    rgb_matrix_set_color(14, WIN_FN_COLOR);
-    rgb_matrix_set_color(15, WIN_FN_COLOR);
-    rgb_matrix_set_color(20, WIN_FN_COLOR);
-    rgb_matrix_set_color(21, WIN_FN_COLOR);
-    rgb_matrix_set_color(25, WIN_FN_COLOR);
-    rgb_matrix_set_color(26, WIN_FN_COLOR);
-    rgb_matrix_set_color(38, WIN_FN_COLOR);
-    rgb_matrix_set_color(93, WIN_FN_COLOR);
-    rgb_matrix_set_color(72, WIN_FN_COLOR);
-    rgb_matrix_set_color(75, WIN_FN_COLOR);
-    rgb_matrix_set_color(86, WIN_FN_COLOR);
-    rgb_matrix_set_color(82, WIN_FN_COLOR);
-}
-
-static void set_rgb_layer_macfn(void) {
-    rgb_matrix_set_color(0, MAC_FN_COLOR);
-    rgb_matrix_set_color(6, MAC_FN_COLOR);
-    rgb_matrix_set_color(12, MAC_FN_COLOR);
-    rgb_matrix_set_color(18, MAC_FN_COLOR);
-    rgb_matrix_set_color(23, MAC_FN_COLOR);
-    rgb_matrix_set_color(28, MAC_FN_COLOR);
-    rgb_matrix_set_color(34, MAC_FN_COLOR);
-    rgb_matrix_set_color(39, MAC_FN_COLOR);
-    rgb_matrix_set_color(44, MAC_FN_COLOR);
-    rgb_matrix_set_color(50, MAC_FN_COLOR);
-    rgb_matrix_set_color(56, MAC_FN_COLOR);
-    rgb_matrix_set_color(61, MAC_FN_COLOR);
-    rgb_matrix_set_color(66, MAC_FN_COLOR);
-    rgb_matrix_set_color(2, MAC_FN_COLOR);
-    rgb_matrix_set_color(3, MAC_FN_COLOR);
-    rgb_matrix_set_color(8, MAC_FN_COLOR);
-    rgb_matrix_set_color(9, MAC_FN_COLOR);
-    rgb_matrix_set_color(14, MAC_FN_COLOR);
-    rgb_matrix_set_color(15, MAC_FN_COLOR);
-    rgb_matrix_set_color(20, MAC_FN_COLOR);
-    rgb_matrix_set_color(21, MAC_FN_COLOR);
-    rgb_matrix_set_color(25, MAC_FN_COLOR);
-    rgb_matrix_set_color(26, MAC_FN_COLOR);
-    rgb_matrix_set_color(38, MAC_FN_COLOR);
-    rgb_matrix_set_color(93, MAC_FN_COLOR);
-    rgb_matrix_set_color(72, MAC_FN_COLOR);
-    rgb_matrix_set_color(75, MAC_FN_COLOR);
-    rgb_matrix_set_color(86, MAC_FN_COLOR);
-    rgb_matrix_set_color(82, MAC_FN_COLOR);
-    rgb_matrix_set_color(17, MAC_FN_COLOR);
-}
-
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md
deleted file mode 100644
index 2b21bd2821f..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# andrebrait's GMMK Pro layout
-
-This is pretty much the stock layout with a few things moved around.
-It basically reflects my needs for both Delete and Insert being readily available for coding, as well as a full Home/PgUp/PgDwn/End column.
-
-The differences are as follows:
-
-- Dedicated MacOS and Windows/Linux layers
-  - Switching between them by pressing Fn + CAPS LOCK
-- VIA support
-- Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway)
-- RGB turns off after 20 minutes of inactivity
-- RGB turns off when USB is suspended
-- Layer 0:
-  - Delete -> Insert
-  - Page Up -> Delete
-  - Page Down -> Home
-- Layer 1 (accessed by pressing Fn):
-  - Fn + Insert -> Pause
-  - Fn + Delete -> Scroll Lock
-  - Fn + Esc -> Clear EEPROM
-  - Fn + (Left) CMD (macOS layout) -> Toggle the CMD + Q delay
-
-On the Mac layer, pressing CMD + Q will not immediately send the combination.\
-There's a configurable delay (defaults to 1 second) to send it.\
-This is done mainly to prevent hitting CMD + Q by mistake when alternating between applications with CMD + Tab.
-
-This keymap also includes CAPS LOCK ON indicator.\
-All left and right side LEDs, and the Caps key LED will turn solid red while CAPS LOCK is ON.
-
-No other changes have been made. \
-The other keys on each layer have been kept intact.
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
deleted file mode 100644
index 14e41063218..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Enable additional features.
-
-# Disabling MouseKey because it breaks my KVM switch
-MOUSEKEY_ENABLE = no
-
-# Use sym_eager_pk for better latency when gaming.
-#
-# Previous issues with sym_defer_pk (and sym_eager_pk and debounce times
-# shorter than 8ms) were due to Glorious' horrible hot-swap sockets. 
-# These issues were 100% resolved after I replaced them with Gateron hot-swap sockets.
-#
-# The old sockets apparently didn't hold onto the legs of the switches at all.
-#
-# Using eager might not be a good idea with other switch types, but I only use 
-# linears now, so this should be ok.
-#
-# asym_eager_defer_pk also works well and it is more resistant to chatter at
-# the cost of delay when releasing a key being slightly higher.
-DEBOUNCE_TYPE = sym_eager_pk
-
-# Useful for debugging
-# CONSOLE_ENABLE = yes
-# DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
-# DEBUG_MATRIX_SCAN_RATE = yes
-
-# Encoder Map support
-ENCODER_MAP_ENABLE = yes
-
-# Enables VIA
-VIA_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
deleted file mode 100644
index dc3dfefab0a..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Andrew Charnley
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
-#define RGBLIGHT_DEFAULT_SAT 0
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-
-
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
deleted file mode 100644
index 52fd7a5a34f..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2021 Andrew Charnley
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// Windows key changed to second FN key. Use KC_LGUI to revert.
-
-enum userspace_layers {
-  QWERTY,
-  FNLAYER
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-
-    [QWERTY] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, MO(FNLAYER), KC_LALT,                            KC_SPC,                       KC_RALT, MO(FNLAYER),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [FNLAYER] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MEDIA_PLAY_PAUSE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_VAD, _______
-    ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if(IS_LAYER_ON(FNLAYER)) {
-     if (clockwise) {
-       tap_code(KC_MEDIA_NEXT_TRACK);
-     } else {
-       tap_code(KC_MEDIA_PREV_TRACK);
-     }
-  } else {
-     if (clockwise) {
-       tap_code(KC_VOLU);
-     } else {
-       tap_code(KC_VOLD);
-     }
-  }
-  return false;
-}
-
-static uint8_t val;
-
-void keyboard_post_init_user(void) {
-
-  val = rgb_matrix_get_val();
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-
-  if (host_keyboard_led_state().caps_lock) {
-    rgb_matrix_set_color_all(val,0,0);
-  } else {
-    rgb_matrix_set_color_all(val, val, val);
-    val = rgb_matrix_get_val();
-  }
-    return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/readme.md
deleted file mode 100644
index e064edd83ae..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Description
-A keymap designed to be functional for development purposes - no flashing lights or gimmicks. PRTSC and DEL key in the top right corner.
-Solid backlight that changes red if CAPS is on and reverts back afterwards. Brightness retained in both cases.
-Backlight is disabled on suspend and restored upon wake-up.
-The 'Windows' key is a second FN key. This makes it more natural to use the encoder wheel (good luck trying to do it with one hand).
-
-Compile using `qmk compile -kb gmmk/pro/ansi -km andrewcharnley`
-
-# Encoder
-FN + Encoder scroll = media next/prev
-FN + Encoder press = media pause
-default encoder behavior = volume up/down
-
-# Function Layer
-FN + Up = increase brightness
-FN + Down = decrease brightness
-FN + Backslash = bootloader
-
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c
deleted file mode 100644
index 9d84e868894..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-      KC_ESC,  KC_F1,   KC_F2,   KC_BRID, KC_BRIU, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, KC_F9,    KC_MPRV, KC_MPLY, KC_MNXT, KC_PSCR,       KC_MUTE,
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,     KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_DEL, 
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_PGUP, 
-      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_ENT,                 KC_PGDN, 
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,     KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT,            KC_UP,       KC_END, 
-      KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                              KC_RGUI,  MO(1),   KC_RCTL, KC_LEFT,   KC_DOWN,  KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F10,  KC_F12,  _______, KC_MUTE, 
-      _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-      _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, 
-      _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          RGB_MOD, 
-      _______, _______, _______,                   _______,                   _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
-    ),
-};
-// clang-format on
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
deleted file mode 100644
index b536a8535a4..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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 userspace_layers {
-  QWERTY,
-	FNLAYER,
-	POPTAB,
-};
-
-//custom keycodes
-#define MODS_ALT_MASK (MOD_BIT(KC_LALT)) // Make ALT layer for encoder use
-#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)) // Make CTRL layer for encoder use
-#define SWAP_L SGUI(KC_LEFT) // Swap application to left display
-#define SWAP_R SGUI(KC_RGHT) // Swap application to right display
-#define MINI LGUI(KC_DOWN) // Shrink window
-#define MAXI LGUI(KC_UP) // Maximize window
-#define CLOSEAPPLICATION LALT(KC_F4) // Kill application
-#define CLOSETAB LCTL(KC_W) // Kill current tab
-#define POPOUT LCTL(LSFT(KC_K))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-
-    [QWERTY] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(FNLAYER),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [FNLAYER] = LAYOUT(
-        CLOSEAPPLICATION, CLOSETAB,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MEDIA_PLAY_PAUSE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, SWAP_L ,  MAXI  , SWAP_R , _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-        _______, _______,  MINI  , _______, POPOUT,  _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, KC_TRNS, _______, _______, _______
-    ),
-
-
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (get_mods() & MODS_ALT_MASK) {
-        if (clockwise) {
-            tap_code(KC_TAB);
-        } else {
-            tap_code16(S(KC_TAB));
-        }
-    } else if (get_mods() & MODS_CTRL_MASK) {
-        if (clockwise) {
-            tap_code(KC_TAB);
-        } else {
-            tap_code16(S(KC_TAB));
-        }
-    } else if(IS_LAYER_ON(FNLAYER)) {
-        if (clockwise) {
-            tap_code(KC_MEDIA_NEXT_TRACK);
-        } else {
-            tap_code(KC_MEDIA_PREV_TRACK);
-        }
-    } else {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    switch(get_highest_layer(layer_state)) {
-    // special handling per layer
-        case 0:  //layer one
-            if (host_keyboard_led_state().caps_lock)
-                rgb_matrix_set_color_all(255,0,0);
-            else
-                rgb_matrix_set_color_all(0,255,56);
-            break;
-        case 1:
-            for (uint8_t i = led_min; i < led_max; i++) {
-                 RGB_MATRIX_INDICATOR_SET_COLOR(i,0,0,0);
-            }
-            RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 255) //esc
-            RGB_MATRIX_INDICATOR_SET_COLOR(6, 0, 0, 255) //f1
-            RGB_MATRIX_INDICATOR_SET_COLOR(8, 0, 0, 255) //q
-            RGB_MATRIX_INDICATOR_SET_COLOR(14, 0, 0, 255) //w
-            RGB_MATRIX_INDICATOR_SET_COLOR(20, 0, 0, 255) //e
-            RGB_MATRIX_INDICATOR_SET_COLOR(15, 0, 0, 255) //s
-            RGB_MATRIX_INDICATOR_SET_COLOR(26, 0, 0, 255) //f
-            RGB_MATRIX_INDICATOR_SET_COLOR(49, 0, 0, 255) //R_Alt
-            break;
-        default:
-            break;
-    }
-    return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/readme.md
deleted file mode 100644
index 8162002892a..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Description
-Pretty simple keymap with a few handy tools on a 2nd layer and rotary encoder.
-
-# Encoder
-Holding tab and scrolling encoder will allow scrolling through applications, as if using alt + tab  
-Holding ctrl and scrolling encoder will allow scrolling through chrome tabs  
-FN + Encoder scroll is media next/prev  
-FN + Encoder press is media pause  
-default encoder behavior is volume up/down  
-
-# Function Layer
-FN + \ is used to put keyboard into bootloader mode  
-FN + ESC is the same as alt F4, for closing applications  
-FN + F1 is to close current browser tab  
-FN + Q moves current application one monitor to the left  
-FN + W maximizes current application  
-FN + E moves current application one monitor to the right  
-FN + S minimizes current application  
-FN + F is used in junction with the "Popout tab" extension to chrome (https://chrome.google.com/webstore/detail/popout-tab/pcfcieidiaaobigemjnkclebhnmgfbco) to pop out current tab to its own window
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/config.h
deleted file mode 100644
index 6b06448f71f..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-   Copyright 2021 Cory Ginsberg (@coryginsberg)
-
-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
-// TT set to two taps
-
-#define TAPPING_TERM 250
-#define RGBLIGHT_DEFAULT_MODE SOLID_WHITE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
deleted file mode 100644
index 49e2050ea01..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-   Copyright 2021 Cory Ginsberg (@coryginsberg)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-void dance_media(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);
-    }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for shift, twice for Caps Lock
-    [0] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-    [1] = ACTION_TAP_DANCE_FN(dance_media)};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Alt_L    Win_L                               SPACE                               Ct_R        Alt_R   FN     Left     Down     Right
-
-   // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-    [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_PSCR,          TO(1),
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(4),   TO(2), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = 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,  TD(1),            TO(0),
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RALT, MO(4),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [2] = 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,  TD(1),            TO(0),
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RALT, MO(4),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [3] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_7,    KC_8,    KC_9,    KC_PPLS, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_4,    KC_5,    KC_6,    KC_PPLS, XXXXXXX,          KC_PENT,          XXXXXXX,
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1,    KC_2,    KC_3,    KC_EQL,           XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            KC_0,                               KC_DOT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    [4] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TD(1),                                    _______,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                  _______,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_P, XXXXXXX, XXXXXXX, QK_BOOT,                                  RGB_MODE_FORWARD,
-        XXXXXXX, XXXXXXX, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,                                  RGB_MODE_REVERSE,
-        _______,          XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          _______,             XXXXXXX,             RGB_TOG,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, XXXXXXX, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK
-    ),
-    [5] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
-    ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (clockwise) {
-    tap_code(KC_VOLU);
-  }
-  else {
-    tap_code(KC_VOLD);
-  }
-  //return true; //set to return false to counteract enabled encoder in pro.c
-  return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/readme.md
deleted file mode 100644
index e4485215725..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description
-Mac and Windows profiles with special touches for the Mac profile.
-
-## Windows Profile
-Should be nearly identical to the default profile for GMMK Pro. Only major difference is the button next to F12 is now PrintScreen and clicking the rotary dial switches profiles instead of muting.
-
-## Mac Profile
-Besides the usual swapping of the alt and windows/cmd placement also changes the following:
-* Double press shift to activate caps lock
-* Capslock is escape
-* Button next to F12:
-    * 1 press: play/pause
-    * 2 presses: skip
-    * 3 presses: previous
-* Clicking Rotary Dial switches profiles
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/rules.mk
deleted file mode 100644
index 1dd6809223d..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-TAP_DANCE_ENABLE = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-UNICODE_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h
deleted file mode 100644
index a4e1173e4f8..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 Jasper Chan (@Gigahawk)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_SPD 0
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
deleted file mode 100644
index c693bd90d85..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2021 Jasper Chan (@Gigahawk)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _BASE,
-    _GAME,
-    _TRAN,
-};
-
-#define _BASE_COLOR_RGB 156, 123, 85
-#define _GAME_COLOR_RGB 147, 21, 21
-#define _TRAN_COLOR_RGB 45, 89, 24
-#define _CAPS_COLOR_RGB 146, 140, 16
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_BASE] = 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_PGUP,
-        KC_ESC,  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(2),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_GAME] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
-    ),
-
-    [_TRAN] = LAYOUT(
-        KC_CAPS, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_INS,           _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        TG(1),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            KC_MPLY,                            _______, _______, _______, KC_MPRV, _______, KC_MNXT
-    ),
-
-};
-// clang-format on
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    //return true; //set to return false to counteract enabled encoder in pro.c
-    return false;
-}
-
-bool rgb_matrix_indicators_user(void) {
-    if (IS_LAYER_ON(_TRAN)) {
-        rgb_matrix_set_color_all(_TRAN_COLOR_RGB);
-    } else if (IS_LAYER_ON(_GAME)) {
-        rgb_matrix_set_color_all(_GAME_COLOR_RGB);
-    } else if (IS_LAYER_ON(_BASE)) {
-        rgb_matrix_set_color_all(_BASE_COLOR_RGB);
-    }
-
-    if (host_keyboard_led_state().caps_lock) {
-        for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-            if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-                rgb_matrix_set_color(i, _CAPS_COLOR_RGB);
-            }
-        }
-    }
-    return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
deleted file mode 100644
index 845262b7e85..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Andre Brait
- *
- * 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 RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
deleted file mode 100644
index 3b378ba5723..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-   Copyright 2021 Andre Brait <andrebrait@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
-
-#ifdef RGB_MATRIX_ENABLE
-    #ifndef RGB_CONFIRMATION_BLINKING_TIME
-        #define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds
-    #endif
-#endif // RGB_MATRIX_ENABLE
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Del          Rotary(Play/Pause)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Home
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-    //
-    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
-    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
-    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
-    [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_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_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_INS,           _______,
-        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
-    ),
-
-
-};
-// clang-format on
-
-const key_override_t up_key_override = ko_make_basic(MOD_MASK_CTRL, KC_UP, KC_PGUP);
-const key_override_t dn_key_override = ko_make_basic(MOD_MASK_CTRL, KC_DOWN, KC_PGDN);
-
-// This globally defines all key overrides to be used
-const key_override_t **key_overrides = (const key_override_t *[]){
-       &up_key_override,
-       &dn_key_override,
-       NULL // Null terminate the array of overrides!
-};
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    //return true; //set to return false to counteract enabled encoder in pro.c
-    return false;
-}
-#endif // ENCODER_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-
-/* Renaming those to make the purpose on this keymap clearer */
-#define LED_FLAG_CAPS LED_FLAG_NONE
-#define LED_FLAG_EFFECTS LED_FLAG_INDICATOR
-
-static void set_rgb_caps_leds(void);
-
-#if RGB_CONFIRMATION_BLINKING_TIME > 0
-static uint16_t effect_started_time = 0;
-static uint8_t r_effect = 0x0, g_effect = 0x0, b_effect = 0x0;
-static void start_effects(void);
-
-/* The higher this is, the slower the blinking will be */
-#ifndef TIME_SELECTED_BIT
-    #define TIME_SELECTED_BIT 8
-#endif
-#if TIME_SELECTED_BIT < 0 || TIME_SELECTED_BIT >= 16
-    #error "TIME_SELECTED_BIT must be a positive integer smaller than 16"
-#endif
-#define effect_red() r_effect = 0xFF, g_effect = 0x0, b_effect = 0x0
-#define effect_green() r_effect = 0x0, g_effect = 0xFF, b_effect = 0x0
-#endif // RGB_CONFIRMATION_BLINKING_TIME > 0
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        if (!rgb_matrix_is_enabled()) {
-            /* Turn ON the RGB Matrix for CAPS LOCK */
-            rgb_matrix_set_flags(LED_FLAG_CAPS);
-            rgb_matrix_enable();
-        }
-    } else if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
-        /* RGB Matrix was only ON because of CAPS LOCK. Turn it OFF. */
-        rgb_matrix_set_flags(LED_FLAG_ALL);
-        rgb_matrix_disable();
-    }
-    return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    #ifdef NKRO_ENABLE
-    #if RGB_CONFIRMATION_BLINKING_TIME > 0
-        case NK_TOGG:
-            if (record->event.pressed) {
-                if (keymap_config.nkro) {
-                    /* Turning NKRO OFF */
-                    effect_red();
-                } else {
-                    /* Turning NKRO ON */
-                    effect_green();
-                }
-                start_effects();
-            }
-            break;
-        case NK_ON:
-            if (record->event.pressed) {
-                if (!keymap_config.nkro) {
-                    /* Turning NKRO ON */
-                    effect_green();
-                    start_effects();
-                }
-            }
-            break;
-        case NK_OFF:
-            if (record->event.pressed) {
-                if (keymap_config.nkro) {
-                    /* Turning NKRO OFF */
-                    effect_red();
-                    start_effects();
-                }
-            }
-            break;
-    #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
-    #endif // NKRO_ENABLE
-        case RGB_MOD:
-        case RGB_RMOD:
-        case RGB_HUI:
-        case RGB_HUD:
-        case RGB_SAI:
-        case RGB_SAD:
-        case RGB_VAI:
-        case RGB_VAD:
-        case RGB_SPI:
-        case RGB_SPD:
-            if (record->event.pressed) {
-                if (rgb_matrix_get_flags() != LED_FLAG_ALL) {
-                    /* Ignore changes to RGB settings while only it's supposed to be OFF */
-                    return false;
-                }
-            }
-            break;
-        case RGB_TOG:
-            if (record->event.pressed) {
-                if (rgb_matrix_is_enabled()) {
-                    switch (rgb_matrix_get_flags()) {
-                        #if RGB_CONFIRMATION_BLINKING_TIME > 0
-                        case LED_FLAG_EFFECTS:
-                        #endif
-                        case LED_FLAG_CAPS:
-                            /* Turned ON because of EFFECTS or CAPS, is actually OFF */
-                            /* Change to LED_FLAG_ALL to signal it's really ON */
-                            rgb_matrix_set_flags(LED_FLAG_ALL);
-                            /* Will be re-enabled by the processing of the toggle */
-                            rgb_matrix_disable_noeeprom();
-                            break;
-                        case LED_FLAG_ALL:
-                            /* Is actually ON */
-                            #if RGB_CONFIRMATION_BLINKING_TIME > 0
-                            if (effect_started_time > 0) {
-                                /* Signal EFFECTS */
-                                rgb_matrix_set_flags(LED_FLAG_EFFECTS);
-                                /* Will be re-enabled by the processing of the toggle */
-                                rgb_matrix_disable_noeeprom();
-                            } else
-                            #endif
-                            if (host_keyboard_led_state().caps_lock) {
-                                /* Signal CAPS */
-                                rgb_matrix_set_flags(LED_FLAG_CAPS);
-                                /* Will be re-enabled by the processing of the toggle */
-                                rgb_matrix_disable_noeeprom();
-                            }
-                            break;
-                    }
-                }
-            }
-            break;
-    }
-    return true;
-}
-
-
-bool rgb_matrix_indicators_user(void) {
-    #if RGB_CONFIRMATION_BLINKING_TIME > 0
-    if (effect_started_time > 0) {
-        /* Render blinking EFFECTS */
-        const uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
-        if (deltaTime <= RGB_CONFIRMATION_BLINKING_TIME) {
-            const uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01;
-            const uint8_t val_r = led_state * r_effect;
-            const uint8_t val_g = led_state * g_effect;
-            const uint8_t val_b = led_state * b_effect;
-            rgb_matrix_set_color_all(val_r, val_g, val_b);
-            if (host_keyboard_led_state().caps_lock) {
-                set_rgb_caps_leds();
-            }
-            return;
-        } else {
-            /* EFFECTS duration is finished */
-            effect_started_time = 0;
-            if (rgb_matrix_get_flags() == LED_FLAG_EFFECTS) {
-                /* It was turned ON because of EFFECTS */
-                if (host_keyboard_led_state().caps_lock) {
-                    /* CAPS is still ON. Demote to CAPS */
-                    rgb_matrix_set_flags(LED_FLAG_CAPS);
-                } else {
-                    /* There is nothing else keeping RGB enabled. Reset flags and turn if off. */
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_disable_noeeprom();
-                }
-            }
-        }
-    }
-    #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
-    if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
-        rgb_matrix_set_color_all(0x0, 0x0, 0x0);
-    }
-    if (host_keyboard_led_state().caps_lock) {
-        set_rgb_caps_leds();
-    }
-    return false;
-}
-
-#if RGB_CONFIRMATION_BLINKING_TIME > 0
-static void start_effects(void) {
-    effect_started_time = sync_timer_read();
-    if (!rgb_matrix_is_enabled()) {
-        /* Turn it ON, signal the cause (EFFECTS) */
-        rgb_matrix_set_flags(LED_FLAG_EFFECTS);
-        rgb_matrix_enable_noeeprom();
-    } else if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
-        /* It's already ON, promote the cause from CAPS to EFFECTS */
-        rgb_matrix_set_flags(LED_FLAG_EFFECTS);
-    }
-}
-#endif // RGB_CONFIRMATION_BLINKING_TIME > 0
-
-// RGB led number layout, function of the key
-
-//  67, led 01   0, ESC    6, F1      12, F2      18, F3   23, F4   28, F5      34, F6   39, F7   44, F8      50, F9   56, F10   61, F11    66, F12    69, Prt       Rotary(Mute)   68, led 12
-//  70, led 02   1, ~      7, 1       13, 2       19, 3    24, 4    29, 5       35, 6    40, 7    45, 8       51, 9    57, 0     62, -_     78, (=+)   85, BackSpc   72, Home       71, led 13
-//  73, led 03   2, Tab    8, Q       14, W       20. E    25, R    30, T       36, Y    41, U    46, I       52, O    58, P     63, [{     89, ]}     93, \|        75, PgUp       74, led 14
-//  76, led 04   3, Caps   9, A       15, S       21, D    26, F    31, G       37, H    42, J    47, K       53, L    59, ;:    64, '"                96, Enter     86, PgDn       77, led 15
-//  80, led 05   4, Sh_L   10, Z      16, X       22, C    27, V    32, B       38, N    43, M    48, ,<      54, .<   60, /?               90, Sh_R   94, Up        82, End        81, led 16
-//  83, led 06   5, Ct_L   11,Win_L   17, Alt_L                     33, SPACE                     49, Alt_R   55, FN             65, Ct_R   95, Left   97, Down      79, Right      84, led 17
-//  87, led 07                                                                                                                                                                      88, led 18
-//  91, led 08                                                                                                                                                                      92, led 19
-
-static void set_rgb_caps_leds(void) {
-    rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1
-    rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1
-    rgb_matrix_set_color(70, 0xFF, 0x0, 0x0); // Left side LED 2
-    rgb_matrix_set_color(71, 0xFF, 0x0, 0x0); // Right side LED 2
-    rgb_matrix_set_color(73, 0xFF, 0x0, 0x0); // Left side LED 3
-    rgb_matrix_set_color(74, 0xFF, 0x0, 0x0); // Right side LED 3
-    rgb_matrix_set_color(76, 0xFF, 0x0, 0x0); // Left side LED 4
-    rgb_matrix_set_color(77, 0xFF, 0x0, 0x0); // Right side LED 4
-    rgb_matrix_set_color(80, 0xFF, 0x0, 0x0); // Left side LED 5
-    rgb_matrix_set_color(81, 0xFF, 0x0, 0x0); // Right side LED 5
-    rgb_matrix_set_color(83, 0xFF, 0x0, 0x0); // Left side LED 6
-    rgb_matrix_set_color(84, 0xFF, 0x0, 0x0); // Right side LED 6
-    rgb_matrix_set_color(87, 0xFF, 0x0, 0x0); // Left side LED 7
-    rgb_matrix_set_color(88, 0xFF, 0x0, 0x0); // Right side LED 7
-    rgb_matrix_set_color(91, 0xFF, 0x0, 0x0); // Left side LED 8
-    rgb_matrix_set_color(92, 0xFF, 0x0, 0x0); // Right side LED 8
-    rgb_matrix_set_color(3, 0xFF, 0x0, 0x0); // CAPS LED
-}
-
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/readme.md
deleted file mode 100644
index bc8c580dbb8..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# hachetmans's GMMK Pro layout
-
-This is pretty much the stock layout with a few things moved around.
-It basically reflects my needs for both Delete and Insert being readily available for coding, as well as a full Home/PgUp/PgDwn/End column.
-
-The differences are as follows:
-
-- Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway)
-- Short DEBOUNCE time (5 ms)
-- Per-key debounce algorithm (sym_defer_pk)
-- RGB turns off after 20 minutes of inactivity
-- RGB turns off when USB is suspended
-- Layer 0:
-  - Print Screen (default) -> Delete
-  - Delete (default) -> Home
-- Layer 1 (accessed by pressing Fn):
-  - Fn + Delete -> Insert
-  - Fn + Home -> Print Screen
-- override CTRL + UP -> PGUP
-- override CTRL + DOWN -> PGDN
-
-This keymap also includes CAPS LOCK ON indicator.\
-All left and right side LEDs, and the Caps key LED will turn solid red while CAPS LOCK is ON.
-
-No other changes have been made. \
-The other keys on each layer have been kept intact.
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/rules.mk
deleted file mode 100644
index 9995f3f4d23..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Enable additional features.
-
-DEBOUNCE_TYPE = sym_defer_pk
-MOUSEKEY_ENABLE = no
-KEY_OVERRIDE_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
deleted file mode 100644
index 1bedcab41f1..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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] = {
-
-  //      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
-  //      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-  //      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-  //      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-  //      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-  //      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-      // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-      // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-      // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-      // if that's your preference.
-      //
-      // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
-      // it'll be back to normal when you plug it back in.
-      [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_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_HOME,
-          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_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-
-      [1] = LAYOUT(
-          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,           KC_PSCR,
-          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-          KC_INS,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-          _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-          _______, _______, _______,                            QK_BOOT,                            KC_RGUI, _______, _______, _______, _______, _______
-      ),
-
-
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (clockwise) {
-    tap_code(KC_VOLU);
-  }
-  else {
-    tap_code(KC_VOLD);
-  }
-  //return true; //set to return false to counteract enabled encoder in pro.c
-  return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h
deleted file mode 100644
index 74c018f7f14..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 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/rev1/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
deleted file mode 100644
index 7ec0e8c4b69..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* 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 QK_PROGRAMMABLE_BUTTON_1
-#define L1_NUM2 QK_PROGRAMMABLE_BUTTON_2
-#define L1_NUM3 QK_PROGRAMMABLE_BUTTON_3
-#define L1_NUM4 QK_PROGRAMMABLE_BUTTON_4
-#define L1_NUM5 QK_PROGRAMMABLE_BUTTON_5
-#define L1_NUM6 QK_PROGRAMMABLE_BUTTON_6
-#define L1_NUM7 QK_PROGRAMMABLE_BUTTON_7
-#define L1_NUM8 QK_PROGRAMMABLE_BUTTON_8
-#define L1_NUM9 QK_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,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
-    ),
-};
-
-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(void) {
-    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
-}
-
-bool rgb_matrix_indicators_user(void) {
-    rgb_matrix_set_color_all(0x0, 0x0, 0x0);
-    if (host_keyboard_led_state().caps_lock) {
-        rgb_matrix_set_color(3, RGB_WHITE); // CAPS
-    }
-    set_rgb_side_leds();
-    return false;
-}
-
-#endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/rules.mk
deleted file mode 100644
index 0a5b666e855..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
deleted file mode 100644
index f37ff59c445..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 zvuc <https://github.com/zvuc>
- *
- * 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
-
-// At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best.
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
-
-// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-
-// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// Effects
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS  // Heatmap, Rain
-    #define RGB_MATRIX_KEYPRESSES           // REACTIVE, SPLASH modes
-
-    // Disable effects you don't like.
-    // Soon, you'll have to explicitly enable effects you want: https://github.com/qmk/qmk_firmware/pull/13758
-    // #define DISABLE_RGB_MATRIX_SOLID_COLOR,             // Static single hue, no speed support
-    // #define DISABLE_RGB_MATRIX_ALPHAS_MODS,             // Static dual hue, speed is hue for secondary hue
-    // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN,        // Static gradient top to bottom, speed controls how much gradient changes
-    // #define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT,     // Static gradient left to right, speed controls how much gradient changes
-    // #define DISABLE_RGB_MATRIX_BREATHING,               // Single hue brightness cycling animation
-    // #define DISABLE_RGB_MATRIX_BAND_SAT,                // Single hue band fading saturation scrolling left to right
-    // #define DISABLE_RGB_MATRIX_BAND_VAL,                // Single hue band fading brightness scrolling left to right
-    // #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT,       // Single hue 3 blade spinning pinwheel fades saturation
-    // #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL,       // Single hue 3 blade spinning pinwheel fades brightness
-    // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT,         // Single hue spinning spiral fades saturation
-    // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL,         // Single hue spinning spiral fades brightness
-    // #define DISABLE_RGB_MATRIX_CYCLE_ALL,               // Full keyboard solid hue cycling through full gradient
-    // #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT,        // Full gradient scrolling left to right
-    // #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN,           // Full gradient scrolling top to bottom
-    // #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN,            // Full gradient scrolling out to in
-    // #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL,       // Full dual gradients scrolling out to in
-    // #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON,  // Full gradent Chevron shapped scrolling left to right
-    // #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL,          // Full gradient spinning pinwheel around center of keyboard
-    // #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL,            // Full gradient spinning spiral around center of keyboard
-    // #define DISABLE_RGB_MATRIX_DUAL_BEACON,             // Full gradient spinning around center of keyboard
-    // #define DISABLE_RGB_MATRIX_RAINBOW_BEACON,          // Full tighter gradient spinning around center of keyboard
-    // #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS,       // Full dual gradients spinning two halfs of keyboard
-    // #define DISABLE_RGB_MATRIX_RAINDROPS,               // Randomly changes a single key's hue
-    // #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS,     // Randomly changes a single key's hue and saturation
-    // #define DISABLE_RGB_MATRIX_HUE_BREATHING,           // Hue shifts up a slight ammount at the same time, then shifts back
-    // #define DISABLE_RGB_MATRIX_HUE_PENDULUM,            // Hue shifts up a slight ammount in a wave to the right, then back to the left
-    // #define DISABLE_RGB_MATRIX_HUE_WAVE,                // Hue shifts up a slight ammount and then back down in a wave to the right
-
-    // Framebuffer effects
-    // #define DISABLE_RGB_MATRIX_TYPING_HEATMAP,          // How hot is your WPM!
-    // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN,            // That famous computer simulation
-
-    // Reactive effects
-    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE,      // Pulses keys hit to hue & value then fades value out
-    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE,             // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE         // Hue & value pulse near a single key hit then fades value out
-    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE    // Hue & value pulse near multiple key hits then fades value out
-    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS        // Hue & value pulse the same column and row of a single key hit then fades value out
-    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS   // Hue & value pulse the same column and row of multiple key hits then fades value out
-    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS        // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS   // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    // #define DISABLE_RGB_MATRIX_SPLASH,                     // Full gradient & value pulse away from a single key hit then fades value out
-    // #define DISABLE_RGB_MATRIX_MULTISPLASH,                // Full gradient & value pulse away from multiple key hits then fades value out
-    // #define DISABLE_RGB_MATRIX_SOLID_SPLASH,               // Hue & value pulse away from a single key hit then fades value out
-    // #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH,          // Hue & value pulse away from multiple key hits then fades value out
-
-#endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
deleted file mode 100644
index 60bd53f4071..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
+++ /dev/null
@@ -1,431 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-
-   GMMK Pro Standard keymap for macOS
-   by zvuc <https://github.com/zvuc>
-
-   with code snippets from
-   Andre Brait <andrebrait@gmail.com>, stickandgum
-
-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 my_keycodes {
-  LED_TLDE = SAFE_RANGE,
-  LED_1,
-  LED_2,
-  LED_3,
-  LED_4,
-  LED_5,
-  LED_6,
-  LED_7,
-  LED_8,
-  LED_9,
-  LED_0,
-  LED_MINS,
-  LED_EQL
-};
-
-#ifdef RGB_MATRIX_ENABLE
-  #ifndef RGB_CONFIRMATION_BLINKING_TIME
-    #define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds
-  #endif
-#endif // RGB_MATRIX_ENABLE
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12      Eject          Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)      BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       F13
-//      Ct_L     Opt_L    Cmd_L                               SPACE                               Cmd_R    Opt_R    FN       Left     Down     Right
-
-
-  // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-  // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-  // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-  // if that's your preference.
-  //
-  // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
-  // it'll be back to normal when you plug it back in.
-  //
-  // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
-  // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
-  // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
-  [0] = LAYOUT(
-    KC_ESC,  KC_BRID, KC_BRIU, KC_MSCTRL,  KC_LNPD, RGB_VAD, RGB_VAI, KC_F7,   KC_F8,   KC_MRWD, KC_MPLY, KC_MFFD, KC_F12,  KC_EJCT,          KC_MUTE,
-    KC_GRV,  KC_1,    KC_2,    KC_3,       KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,       KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-    KC_CAPS, KC_A,    KC_S,    KC_D,       KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-    KC_LSFT,          KC_Z,    KC_X,       KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_F13,
-    KC_LCTL, KC_LOPT, KC_LCMD,                               KC_SPC,                             KC_RCMD, KC_ROPT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [1] = 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,  _______,           RGB_TOG,
-    LED_TLDE, LED_1,   LED_2,   LED_3,   LED_4,   LED_5,   LED_6,   LED_7,   LED_8,   LED_9,   LED_0,   LED_MINS, LED_EQL, _______,           KC_PSCR,
-    _______,  RGB_HUI, RGB_VAI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,  _______, QK_BOOT,           _______,
-    _______,  RGB_HUD, RGB_VAD, RGB_SAD, TG(2),   _______, _______, _______, _______, _______, _______, _______,           _______,           _______,
-    _______,           _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,           _______, RGB_MOD,  RGB_TOG,
-    _______,  _______, _______,                            _______,                            _______, _______,  _______, RGB_SPD, RGB_RMOD, RGB_SPI
-  ),
-
-  // This is an alternative togglable layer to change default function row to standard F keys
-  [2] = 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_F24,           _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
-  ),
-
-
-};
-// clang-format on
-
-#ifdef ENCODER_ENABLE
-  bool encoder_update_user(uint8_t index, bool clockwise) {
-    // https://beta.docs.qmk.fm/using-qmk/simple-keycodes/feature_advanced_keycodes#alt-escape-for-alt-tab-id-alt-escape-for-alt-tab
-    if (get_mods() & MOD_MASK_CTRL) { // If CTRL is held
-      uint8_t mod_state = get_mods(); // Store all  modifiers that are held
-      unregister_mods(MOD_MASK_CTRL); // Immediately unregister the CRTL key (don't send CTRL-PgDn) - del_mods doesn't work here (not immediate)
-      if (clockwise) {
-        rgblight_increase_hue();
-      } else {
-        rgblight_decrease_hue();
-      }
-      set_mods(mod_state); // Add back in the CTRL key - so ctrl-key will work if ctrl was never released after paging.
-    } else if (get_mods() & MOD_MASK_ALT) {
-      uint8_t mod_state = get_mods();
-      unregister_mods(MOD_MASK_ALT);
-      if (clockwise) {
-        rgblight_increase_sat();
-      } else {
-        rgblight_decrease_sat();
-      }
-      set_mods(mod_state);
-    } else if (get_mods() & MOD_MASK_GUI) {
-      uint8_t mod_state = get_mods();
-      unregister_mods(MOD_MASK_GUI);
-      if (clockwise) {
-        rgblight_increase_val();
-      } else {
-        rgblight_decrease_val();
-      }
-      set_mods(mod_state);
-    } else if (get_mods() & MOD_MASK_SHIFT) {
-      uint8_t mod_state = get_mods();
-      unregister_mods(MOD_MASK_SHIFT);
-      if (clockwise) {
-        rgblight_increase_speed();
-      } else {
-        rgblight_decrease_speed();
-      }
-      set_mods(mod_state);
-    } else if (clockwise) { // All else volume.
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    //return true; //set to return false to counteract enabled encoder in pro.c
-    return false;
-  }
-#endif //ENCODER_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-
-  // Called on powerup and is the last _init that is run.
-  void keyboard_post_init_user(void) {
-
-     int mods[35] = {0,2,3,4,5,11,17,33,49,55,65,95,97,79,94,85,93,96,90,69,92,67,76,80,91,75,86,68,77,81,92,28,34,39,44};
-     int j;
-
-     /* output each array element's value */
-     for (j = 0; j < 35; j++ ) {
-        g_led_config.flags[mods[j]] = LED_FLAG_MODIFIER;
-     }
-
-    if (!rgb_matrix_is_enabled()) {
-        rgb_matrix_enable();
-        #ifdef CONSOLE_ENABLE
-          uprintf("ERROR! RGB Matrix Enabled and wrote to EEPROM! -How was the RGB Matrix Disabled?");
-        #endif
-    }
-  }
-
-  /* Renaming those to make the purpose on this keymap clearer */
-  #define LED_FLAG_CAPS LED_FLAG_NONE
-  #define LED_FLAG_EFFECTS LED_FLAG_INDICATOR
-
-  static void set_rgb_caps_leds(void);
-
-  #if RGB_CONFIRMATION_BLINKING_TIME > 0
-    static uint16_t effect_started_time = 0;
-    static uint8_t r_effect = 0x0, g_effect = 0x0, b_effect = 0x0;
-    static void start_effects(void);
-
-    /* The higher this is, the slower the blinking will be */
-    #ifndef TIME_SELECTED_BIT
-      #define TIME_SELECTED_BIT 8
-    #endif
-    #if TIME_SELECTED_BIT < 0 || TIME_SELECTED_BIT >= 16
-      #error "TIME_SELECTED_BIT must be a positive integer smaller than 16"
-    #endif
-    #define effect_red() r_effect = 0xFF, g_effect = 0x0, b_effect = 0x0
-    #define effect_green() r_effect = 0x0, g_effect = 0xFF, b_effect = 0x0
-  #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
-
-  bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-      if (!rgb_matrix_is_enabled()) {
-        /* Turn ON the RGB Matrix for CAPS LOCK */
-        rgb_matrix_set_flags(LED_FLAG_CAPS);
-        rgb_matrix_enable();
-      }
-    } else if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
-      /* RGB Matrix was only ON because of CAPS LOCK. Turn it OFF. */
-      rgb_matrix_set_flags(LED_FLAG_ALL);
-      rgb_matrix_disable();
-    }
-    return true;
-  }
-
-  bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-      #ifdef NKRO_ENABLE
-        #if RGB_CONFIRMATION_BLINKING_TIME > 0
-          case NK_TOGG:
-            if (record->event.pressed) {
-              if (keymap_config.nkro) {
-                /* Turning NKRO OFF */
-                effect_red();
-              } else {
-                /* Turning NKRO ON */
-                effect_green();
-              }
-              start_effects();
-            }
-            break;
-        #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
-      #endif // NKRO_ENABLE
-
-      #if RGB_CONFIRMATION_BLINKING_TIME > 0
-        case TG(2):
-          if (record->event.pressed) {
-            if (IS_LAYER_OFF(2)) {
-              effect_red();
-            } else {
-              effect_green();
-            }
-            start_effects();
-          }
-          break;
-      #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
-
-      /* LED quick preset keys assignments */
-      case LED_TLDE:
-        rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);          // Can use RGB_M_P built-in keycode instead.
-        break;
-      case LED_1:
-        rgb_matrix_mode(RGB_MATRIX_ALPHAS_MODS);
-        break;
-      case LED_2:
-        rgb_matrix_mode(RGB_MATRIX_GRADIENT_UP_DOWN);
-        break;
-      case LED_3:
-        rgb_matrix_mode(RGB_MATRIX_JELLYBEAN_RAINDROPS);
-        break;
-      case LED_4:
-        rgb_matrix_mode(RGB_MATRIX_BAND_SAT);
-        break;
-      case LED_5:
-        rgb_matrix_mode(RGB_MATRIX_BAND_VAL);
-        break;
-      case LED_6:
-        rgb_matrix_mode(RGB_MATRIX_BAND_SPIRAL_VAL);
-        break;
-      case LED_7:
-        rgb_matrix_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT);    // Can use RGB_M_R built-in keycode instead.
-        break;
-      case LED_8:
-        rgb_matrix_mode(RGB_MATRIX_CYCLE_PINWHEEL);      // Can use RGB_M_SW built-in keycode instead.
-        break;
-      case LED_9:
-         rgb_matrix_mode(RGB_MATRIX_BREATHING);          // Can use RGB_M_B built-in keycode instead.
-        break;
-
-      #ifdef RGB_MATRIX_KEYPRESSES                         // Reactive effects require RGB_MATRIX_KEYPRESSES in config.h
-        case LED_0:
-          rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE_WIDE);
-          break;
-      #endif //RGB_MATRIX_KEYPRESSES
-
-      #ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS               // Heatmap and Rain require #define RGB_MATRIX_FRAMEBUFFER_EFFECTS in config.h
-        case LED_MINS:
-          rgb_matrix_mode(RGB_MATRIX_DIGITAL_RAIN);
-          break;
-        case LED_EQL:
-          rgb_matrix_mode(RGB_MATRIX_TYPING_HEATMAP);
-          break;
-      #endif //RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-
-      // case RGB_MOD:
-      // case RGB_RMOD:
-      // case RGB_HUI:
-      // case RGB_HUD:
-      // case RGB_SAI:
-      // case RGB_SAD:
-      // case RGB_VAI:
-      // case RGB_VAD:
-      // case RGB_SPI:
-      case RGB_SPD:
-        if (record->event.pressed) {
-          if (rgb_matrix_get_flags() != LED_FLAG_ALL) {
-            /* Ignore changes to RGB settings while only it's supposed to be OFF */
-            return false;
-          }
-        }
-        break;
-
-      case RGB_TOG:
-        // if (record->event.pressed) {
-        //     if (rgb_matrix_get_flags() == LED_FLAG_ALL) {
-        //         rgb_matrix_set_flags(LED_FLAG_NONE);
-        //         rgb_matrix_set_color_all(0, 0, 0);
-        //     } else {
-        //         rgb_matrix_set_flags(LED_FLAG_ALL);
-        //     }
-        // }
-        // return false;
-        if (record->event.pressed) {
-          if (rgb_matrix_is_enabled()) {
-            switch (rgb_matrix_get_flags()) {
-              #if RGB_CONFIRMATION_BLINKING_TIME > 0
-              case LED_FLAG_EFFECTS:
-              #endif
-              case LED_FLAG_CAPS:
-                /* Turned ON because of EFFECTS or CAPS, is actually OFF */
-                /* Change to LED_FLAG_ALL to signal it's really ON */
-                rgb_matrix_set_flags(LED_FLAG_ALL);
-                /* Will be re-enabled by the processing of the toggle */
-                rgb_matrix_disable_noeeprom();
-                break;
-              case LED_FLAG_ALL:
-                /* Is actually ON */
-                #if RGB_CONFIRMATION_BLINKING_TIME > 0
-                if (effect_started_time > 0) {
-                  /* Signal EFFECTS */
-                  rgb_matrix_set_flags(LED_FLAG_EFFECTS);
-                  /* Will be re-enabled by the processing of the toggle */
-                  rgb_matrix_disable_noeeprom();
-                } else
-                #endif
-                if (host_keyboard_led_state().caps_lock) {
-                  /* Signal CAPS */
-                  rgb_matrix_set_flags(LED_FLAG_CAPS);
-                  /* Will be re-enabled by the processing of the toggle */
-                  rgb_matrix_disable_noeeprom();
-                }
-                break;
-            }
-          }
-        }
-        break;
-
-    }
-    return true;
-  }
-
-
-  bool rgb_matrix_indicators_user(void) {
-    #if RGB_CONFIRMATION_BLINKING_TIME > 0
-    if (effect_started_time > 0) {
-      /* Render blinking EFFECTS */
-      uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
-      if (deltaTime <= RGB_CONFIRMATION_BLINKING_TIME) {
-        uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01;
-        uint8_t val_r = led_state * r_effect;
-        uint8_t val_g = led_state * g_effect;
-        uint8_t val_b = led_state * b_effect;
-        rgb_matrix_set_color_all(val_r, val_g, val_b);
-        if (host_keyboard_led_state().caps_lock) {
-          set_rgb_caps_leds();
-        }
-        return;
-      } else {
-        /* EFFECTS duration is finished */
-        effect_started_time = 0;
-        if (rgb_matrix_get_flags() == LED_FLAG_EFFECTS) {
-          /* It was turned ON because of EFFECTS */
-          if (host_keyboard_led_state().caps_lock) {
-            /* CAPS is still ON. Demote to CAPS */
-            rgb_matrix_set_flags(LED_FLAG_CAPS);
-          } else {
-            /* There is nothing else keeping RGB enabled. Reset flags and turn if off. */
-            rgb_matrix_set_flags(LED_FLAG_ALL);
-            rgb_matrix_disable_noeeprom();
-          }
-        }
-      }
-    }
-    #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
-    if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
-      rgb_matrix_set_color_all(0x0, 0x0, 0x0);
-    }
-    if (host_keyboard_led_state().caps_lock) {
-      set_rgb_caps_leds();
-    }
-    return false;
-  }
-
-  #if RGB_CONFIRMATION_BLINKING_TIME > 0
-  static void start_effects(void) {
-    effect_started_time = sync_timer_read();
-    if (!rgb_matrix_is_enabled()) {
-      /* Turn it ON, signal the cause (EFFECTS) */
-      rgb_matrix_set_flags(LED_FLAG_EFFECTS);
-      rgb_matrix_enable_noeeprom();
-    } else if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
-      /* It's already ON, promote the cause from CAPS to EFFECTS */
-      rgb_matrix_set_flags(LED_FLAG_EFFECTS);
-    }
-  }
-  #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
-
-  static void set_rgb_caps_leds(void) {
-    rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1
-    rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1
-    rgb_matrix_set_color(70, 0xFF, 0x0, 0x0); // Left side LED 2
-    rgb_matrix_set_color(71, 0xFF, 0x0, 0x0); // Right side LED 2
-    rgb_matrix_set_color(73, 0xFF, 0x0, 0x0); // Left side LED 3
-    rgb_matrix_set_color(74, 0xFF, 0x0, 0x0); // Right side LED 3
-    rgb_matrix_set_color(76, 0xFF, 0x0, 0x0); // Left side LED 4
-    rgb_matrix_set_color(77, 0xFF, 0x0, 0x0); // Right side LED 4
-    rgb_matrix_set_color(80, 0xFF, 0x0, 0x0); // Left side LED 5
-    rgb_matrix_set_color(81, 0xFF, 0x0, 0x0); // Right side LED 5
-    rgb_matrix_set_color(83, 0xFF, 0x0, 0x0); // Left side LED 6
-    rgb_matrix_set_color(84, 0xFF, 0x0, 0x0); // Right side LED 6
-    rgb_matrix_set_color(87, 0xFF, 0x0, 0x0); // Left side LED 7
-    rgb_matrix_set_color(88, 0xFF, 0x0, 0x0); // Right side LED 7
-    rgb_matrix_set_color(91, 0xFF, 0x0, 0x0); // Left side LED 8
-    rgb_matrix_set_color(92, 0xFF, 0x0, 0x0); // Right side LED 8
-    rgb_matrix_set_color(3, 0xFF, 0x0, 0x0); // CAPS LED
-  }
-
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/readme.md
deleted file mode 100644
index 8024e77cc10..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/readme.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# GMMK Pro Standard Layout for macOS by zvuc
-
-As you may know, Glorious does not (yet) provide their Glorious Core software for macOS; so with stock firmware, there aren't any ways to customize layouts on the hardware level unless you turn to software-based override solutions such as [Karabiner Elements](https://karabiner-elements.pqrs.org/). This is my attempt to try to create the most macOS-like experience on the GMMK Pro, taking close notes from Apple's Magic Keyboard, also referencing code from other community keymaps.
-
-## Keymap
-Layer 0
-<img width="1092" alt="Layer0" src="https://user-images.githubusercontent.com/2870726/132235505-64ac1c89-ecf9-49b5-a030-1d94389fc66d.png">
-
-Layer 1 (Hold <kbd>Fn</kbd>)
-<img width="1088" alt="Layer1" src="https://user-images.githubusercontent.com/2870726/133090831-5e84fb69-a8bf-463e-a8f6-f1f38a5901d6.png">
-
-Layer 2 (Togglable alternative function row layout by pressing <kbd>Fn</kbd>+<kbd>F</kbd>)
-<img width="1094" alt="Layer2" src="https://user-images.githubusercontent.com/2870726/133090841-0c6a8b16-bf46-4e6c-b8fa-79f213f95765.png">
-
-
-## Notable differences from stock key layout for Windows:
-- <kbd>Delete</kbd> key placed right next to backspace (under rotary encoder)
-- <kbd>F13</kbd> key for the bottommost row (Assign it to a shortcut you like in macOS preferences! [For example: "Emoji & Symbols" to bring up the emoji input popup instantly](https://user-images.githubusercontent.com/2870726/132237211-7e13c156-96a8-4a91-b215-28d310228feb.png))
-- <kbd>Eject</kbd> key for the last key in function row: Needed for macOS native global "Sleep" hotkey (<kbd>⌘</kbd><kbd>⌥</kbd><kbd>Eject</kbd>)
-
-## Notable Features
-- VIA support
-- Rotary Encoder support (Defaults to stock behavior Volume Up/Down)
-- Standard order for macOS modifier keys: 
-    * Left: <kbd>⌃ Control</kbd><kbd>⌥ Option</kbd><kbd>⌘ Command</kbd> 
-    * Right: <kbd>⌘ Command</kbd><kbd>⌥ Option</kbd><kbd>Fn</kbd>
-- Apple Magic Keyboard-like Function Row Mode (Toggle with <kbd>Fn</kbd>+<kbd>F</kbd>)
-    * <kbd>F1</kbd>: Decrease display brightness
-    * <kbd>F2</kbd>: Increase display brightness
-    * <kbd>F3</kbd>: Mission Control
-    * <kbd>F4</kbd>: Launchpad
-    * <kbd>F5</kbd>: Decrease keyboard backlight brightness
-    * <kbd>F6</kbd>: Increase keyboard backlight brightness
-    * <kbd>F7</kbd>: (none)
-    * <kbd>F8</kbd>: (none)
-    * <kbd>F9</kbd>: Media Rewind 
-    * <kbd>F10</kbd>: Media Play/Pause
-    * <kbd>F11</kbd>: Media Fast Forward
-    * <kbd>F12</kbd>: (none)
-
-> #### NOTE
-> - Media key mappings follow Apple Magic Keyboard except <kbd>F8</kbd> thru <kbd>F12</kbd>, where keys have been shifted by one to the right. It's because I wanted to get over the awkward gap between <kbd>F8</kbd> and <kbd>F9</kbd> that the GMMK Pro has—and also because we don't need dedicated keys for volume control when we have the more convenient rotary knob.
-> - To access standard <kbd>F1</kbd> - <kbd>F12</kbd> keys, press the Function keys while holding <kbd>Fn</kbd>.
-> - If you're planning to use Karabiner Elements, use the standard Function row mode (<kbd>F1</kbd> - <kbd>F12</kbd>) because Karabiner Elements always overrides function keys even if you want to just use simple or complex modifications, and it doesn't catch custom keys like Mission Control, Launchpad or <kbd>Eject</kbd>. (<kbd>Eject</kbd> is mapped as <kbd>F24</kbd> so you can replace it with 'Eject' within Karabiner.)
-
-## RGB Lighting
-- Retains Glorious stock firmware key mappings for control
-    * <kbd>Fn</kbd><kbd>Up</kbd> / <kbd>Fn</kbd><kbd>Down</kbd>: Cycle presets
-    * <kbd>Fn</kbd><kbd>Left</kbd> / <kbd>Fn</kbd><kbd>Right</kbd>: Adjust speed
-    * <kbd>Fn</kbd><kbd>W</kbd> / <kbd>Fn</kbd><kbd>S</kbd>: Adjust brightness
-- Quickly switch to popular presets:
-    * <kbd>Fn</kbd><kbd>`</kbd> : Solid color (no animation)
-    * <kbd>Fn</kbd><kbd>1</kbd> : Solid duotone (no animation) - <kbd>Shift</kbd><kbd>Knob</kbd> to change secondary color.
-    * <kbd>Fn</kbd><kbd>2</kbd> : Vertical gradient - <kbd>Shift</kbd><kbd>Knob</kbd> to change secondary color.
-    * <kbd>Fn</kbd><kbd>3</kbd> : "Jellybean Raindrops"
-    * <kbd>Fn</kbd><kbd>4</kbd> : Horizontal wipe with white backlight
-    * <kbd>Fn</kbd><kbd>5</kbd> : Horizontal wipe
-    * <kbd>Fn</kbd><kbd>6</kbd> : Single color pinwheel
-    * <kbd>Fn</kbd><kbd>7</kbd> : Horizontal rainbow
-    * <kbd>Fn</kbd><kbd>8</kbd> : Rainbow pinwheel
-    * <kbd>Fn</kbd><kbd>9</kbd> : Breathing
-    * <kbd>Fn</kbd><kbd>0</kbd> : Reactive (light up on keypress)
-    * <kbd>Fn</kbd><kbd>-</kbd> : "Digital Rain"
-    * <kbd>Fn</kbd><kbd>=</kbd> : "Heatmap"
-- RGB turns off after 20 minutes of inactivity
-- RGB turns off when USB is suspended / enters sleep
-- <kbd>Caps Lock</kbd> toggle indicator (<kbd>Caps Lock</kbd> key and side lights will turn red)
-- Easy RGB control using Rotary Encoder
-    - <kbd>Control</kbd>+<kbd>Rotate Knob</kbd>: Adjust hue
-    - <kbd>Option</kbd>+<kbd>Rotate Knob</kbd>: Adjust saturation
-    - <kbd>Command</kbd>+<kbd>Rotate Knob</kbd>: Adjust brightness
-
-> All latest QMK effects [(41 as of now)](https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#rgb-matrix-effects-id-rgb-matrix-effects) are enabled by default and will apply in order when cycling through using <kbd>Fn</kbd><kbd>Up</kbd> / <kbd>Fn</kbd><kbd>Down</kbd>. You can disable specific effects by uncommenting (remove the `//` at the beginning of line) respective lines (ex: `#define DISABLE_RGB_MATRIX_BREATHING`) in `qmk_firmware/keyboards/gmmk/pro/ansi/keymaps/zvuc/config.h` then recompiling the firmware.
-
-## Other Features
-- 1000hz polling rate
-- Short DEBOUNCE time (5 ms)
-- Per-key debounce algorithm (`sym_defer_pk`)
-- NKRO toggle (<kbd>Fn</kbd>+<kbd>N</kbd>)
-
-## Warning regarding VIA support
-When observing this keyboard firmware in VIA, some custom-implemented keys such as Mission Control/Launchpad and RGB preset shortcuts appear as keycodes such as `0x5d62`. **These must not be modified!** There is no way to get their default functionality back unless you re-flash the firmware through QMK Toolbox.
-
-## Download pre-compiled firmware binary file
-[Download BIN file from here](https://github.com/zvuc/qmk_firmware/releases/tag/zvuc-1.0.1)
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/rules.mk
deleted file mode 100644
index e9073d44a02..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enable additional features.
-
-DEBOUNCE_TYPE = sym_defer_pk
-VIA_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/.gitignore b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/.gitignore
deleted file mode 100644
index 03b2b466681..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-secrets.h
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/README.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/README.md
deleted file mode 100644
index cb17239882b..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-QMK layout for gmmk/pro
-=======================
-
-## Secrets
-The format is the same as [drashna's](../../../../users/drashna/readme_secrets.md) secrets implementation. Create a `secret.h` and define your secrets like this:
-
-```c
-static const char* secrets[] = {"secret1", "secret2", "secret3", "secret4", "secret5"};
-```
-
-## Rotary encoder knob
-You can hookup your encoder functions by defining new encoder states in [encoder.h](./encoder.h), then in [encoder.c](./encoder.c) assign static variable `state` your new state depending on your desired condition and add callbacks to `encoder_mapping` array. 
-
-## RGB Matrix Ledmaps
-RGB Matrix ledmaps is the future allowing you assign colors to individual keys on every keymap layer. 
-
-You can see some examples of my usage in the bottom of [keymap.c](./keymap.c).
-
-Color defines are just HSV colors wrapped in curly braces, like `#define RED { HSV_RED }`.
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
deleted file mode 100644
index ece08ecfee2..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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/>.
- */
-
-#define COMBO_TERM 100
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_TIMEOUT 90000
-
-#define MACRO_TIMER 5
-
-#define TAPPING_TOGGLE 3
-
-#define WPM_SMOOTHING 0.1
-
-// this is for macOS so keyboard can work after sleep
-#define NO_USB_STARTUP_CHECK
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
deleted file mode 100644
index c9128062176..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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 "encoder.h"
-#include "mike1808.h"
-#include "print.h"
-#include "utils.h"
-#include "process_record.h"
-#include "rgb_matrix_ledmaps.h"
-
-static uint8_t state = ENCODER_DEFAULT;
-
-// clang-format off
-const encoder_callback encoder_mapping[][2] = {
-    [ENCODER_VOLUME] = {&volume_up, &volume_down},
-#ifdef RGB_MATRIX_ENABLE
-    [ENCODER_RGB_HUE] = {&rgb_matrix_increase_hue_noeeprom, &rgb_matrix_decrease_hue_noeeprom},
-    [ENCODER_RGB_SAT] = {&rgb_matrix_increase_sat_noeeprom, &rgb_matrix_decrease_sat_noeeprom},
-    [ENCODER_RGB_VAL] = {&rgb_matrix_increase_val_noeeprom, &rgb_matrix_decrease_val_noeeprom},
-    [ENCODER_RGB_EFFECT] = {&rgb_matrix_step_noeeprom, &rgb_matrix_step_reverse_noeeprom},
-    [ENCODER_RGB_EFFECT_SPEED] = {&rgb_matrix_increase_speed_noeeprom, &rgb_matrix_decrease_speed_noeeprom},
-#endif // RGB_MATRIX_ENABLE
-};
-
-// clang-format on
-
-void volume_up(void) { tap_code(KC_VOLU); }
-
-void volume_down(void) { tap_code(KC_VOLD); }
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    dprintf("current encoder state is: %d\n", state);
-
-    if (clockwise) {
-        (*encoder_mapping[state][0])();
-    } else {
-        (*encoder_mapping[state][1])();
-    }
-
-    //return true; //set to return false to counteract enabled encoder in pro.c
-    return false;
-}
-
-void handle_rgb_key(bool pressed) {
-    dprintf("handle_rgb_key %d\f", pressed);
-
-    if (pressed) {
-        rgb_matrix_layers_disable();
-    } else {
-        rgb_matrix_layers_enable();
-    }
-}
-
-static KeyPressState *rgb_state;
-
-void keyboard_post_init_encoder(void) {
-    rgb_state = NewKeyPressState(handle_rgb_key);
-}
-
-bool process_record_encoder(uint16_t keycode, keyrecord_t *record) {
-#ifdef RGB_MATRIX_ENABLE
-    switch (keycode) {
-        case KC_RGB_ENC_HUE ... KC_RGB_ENC_EFFECT:
-            if (record->event.pressed) {
-#    ifdef RGB_MATRIX_LEDMAPS_ENABLED
-                // disable layers so we can adjust RGB effects
-                rgb_state->press(rgb_state);
-#    endif  // RGB_MATRIX_LEDMAPS_ENABLED
-
-                switch (keycode) {
-                    case KC_RGB_ENC_HUE:
-                        state = ENCODER_RGB_HUE;
-                        break;
-                    case KC_RGB_ENC_SAT:
-                        state = ENCODER_RGB_SAT;
-                        break;
-                    case KC_RGB_ENC_VAL:
-                        state = ENCODER_RGB_VAL;
-                        break;
-                    case KC_RGB_ENC_EFFECT_SPEED:
-                        state = ENCODER_RGB_EFFECT_SPEED;
-                        break;
-                    case KC_RGB_ENC_EFFECT:
-                        state = ENCODER_RGB_EFFECT;
-                        break;
-                }
-            } else {
-#    ifdef RGB_MATRIX_LEDMAPS_ENABLED
-                rgb_state->release(rgb_state);
-#    endif  // RGB_MATRIX_LEDMAPS_ENABLED
-                state = ENCODER_DEFAULT;
-                store_rgb_state_to_eeprom();
-            }
-
-            return false;
-    }
-#endif  // RGB_MATRIX_ENABLE
-
-    return true;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.h
deleted file mode 100644
index 204922730ec..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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/>.
- */
-
-// To add a new functionality define a new state here and then assign
-// the handler to the `encoder_callback`
-#include "quantum.h"
-
-enum encoder_state {
-    ENCODER_VOLUME = 0,
-    ENCODER_RGB_HUE,
-    ENCODER_RGB_SAT,
-    ENCODER_RGB_VAL,
-    ENCODER_RGB_EFFECT_SPEED,
-    ENCODER_RGB_EFFECT,
-};
-
-typedef void (*encoder_callback)(void);
-
-#define ENCODER_DEFAULT ENCODER_VOLUME
-
-void volume_up(void);
-void volume_down(void);
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
deleted file mode 100644
index cb47824c802..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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 "mike1808.h"
-#include "print.h"
-
-static bool wpm_rgb_enabled = false;
-static uint8_t rgb_mode;
-
-bool rgb_matrix_indicators_keymap(void) {
-    if (wpm_rgb_enabled && rgb_matrix_is_enabled()) {
-        uint8_t wpm = get_current_wpm();
-        dprintf("WPM = %d\n", wpm);
-        HSV hsv = rgb_matrix_get_hsv();
-        hsv.h = wpm;
-        RGB rgb = hsv_to_rgb(hsv);
-        rgb_matrix_set_color_all(rgb.r, rgb.g, rgb.b);
-    }
-    return false;
-}
-
-bool process_record_fun(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed && keycode == KC_WPM_RGB) {
-        if (wpm_rgb_enabled) {
-            wpm_rgb_enabled = false;
-            rgb_matrix_mode(rgb_mode);
-        } else {
-            wpm_rgb_enabled = true;
-            rgb_mode = rgb_matrix_get_mode();
-            rgb_matrix_enable();
-            rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
-        }
-
-        return false;
-    }
-
-    return true;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c
deleted file mode 100644
index 70b60526cea..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>, Mikael Manukyan <arm.localhost@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 "mike1808.h"
-
-const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
-
-combo_t key_combos[] = {
-    [JK_ESC] = COMBO(jk_combo, KC_ESC),
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-    [LINUX] = 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_PGUP,
-        KC_ESC,  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,   TT_FN, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [WINDOWS] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
-    ),
-
-    [MACOS] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, KC_LALT, KC_LGUI,                            _______,                            _______, _______, _______, _______, _______, _______
-    ),
-
-    [FUNCTIONS] = LAYOUT(
-        _______, KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_PSCR,          _______,
-        _______, KC_LINX, KC_MAC,  KC_WIN,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_INS,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_RST,          _______,
-        KC_CAPS, _______, _______, _______, _______,  OS_GIT, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          KC_RGBH, KC_RGBS, KC_RGBV, KC_RGBE, KC_RGBP, KC_WRGB, _______, _______, _______, _______,          _______, KC_PGUP, _______,
-        _______, _______, _______,                            RGB_TOG,                            _______, _______, _______, KC_HOME, KC_PGDN, KC_END
-    ),
-
-    [GIT] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,  G_DIFF, _______, _______, _______, _______, _______, _______,  G_PULL,   G_PUSH, _______, _______,          _______,
-        _______,   G_ADD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, G_CHECK, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
-    ),
-};
-
-#ifdef RGB_MATRIX_LEDMAPS_ENABLED
-
-#define ______ {0, 0, 0}
-
-const ledmap PROGMEM ledmaps[] = {
-         //  LU = Left Underglow, RU = Right Underglow
-         //  LU_1    ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)  RU_1
-         //  LU_2    ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del       RU_2
-         //  LU_3    Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp         RU_3
-         //  LU_4    Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn         RU_4
-         //  LU_5    Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End          RU_5
-         //  LU_6    Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right        RU_6
-    [LINUX] = RGB_MATRIX_LAYOUT_LEDMAP(
-          PURPLE,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,    PURPLE,
-          PURPLE,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,    PURPLE,
-          PURPLE,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,    PURPLE,
-          PURPLE,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,         ______,    PURPLE,
-          PURPLE,    ______,         ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______, ______, ______,    PURPLE,
-          PURPLE,    ______,    RED, ______,                         ______,                         ______, ______, ______, ______, ______, ______,    PURPLE
-    ),
-    [WINDOWS] = RGB_MATRIX_LAYOUT_LEDMAP(
-          GREEN,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,    PURPLE,
-          GREEN,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,    PURPLE,
-          GREEN,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,    PURPLE,
-          GREEN,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,         ______,    PURPLE,
-          GREEN,    ______,         ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______, ______, ______,    PURPLE,
-          GREEN,    ______,    RED, ______,                         ______,                         ______, ______, ______, ______, ______, ______,    PURPLE
-    ),
-    [MACOS] = RGB_MATRIX_LAYOUT_LEDMAP(
-          YELLOW,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,    PURPLE,
-          YELLOW,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,    PURPLE,
-          YELLOW,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,    PURPLE,
-          YELLOW,    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______,         ______,    PURPLE,
-          YELLOW,    ______,         ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,         ______, ______, ______,    PURPLE,
-          YELLOW,    ______, ______,    RED,                         ______,                         ______, ______, ______, ______, ______, ______,    PURPLE
-    ),
-
-    [FUNCTIONS] = RGB_MATRIX_LAYOUT_LEDMAP(
-          CYAN,    GREEN,  GREEN,  GREEN,  GREEN,  GREEN,  GREEN, ______, ______, ______, ______,  GREEN,  GREEN,  GREEN,  GREEN,         ______,    PURPLE,
-          CYAN,   ______,   GOLD,   GOLD,   GOLD, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,           GOLD,    PURPLE,
-          CYAN,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,   TEAL,         ______,    PURPLE,
-          CYAN,     TURQ, ______, ______, ______, ______,   TURQ, ______, ______, ______, ______, ______, ______,         ______,         ______,    PURPLE,
-          CYAN,   ______,            RED,    RED,    RED,    RED,    RED,    RED, ______, ______, ______, ______,         ______,    RED, ______,    PURPLE,
-          CYAN,   ______, ______,   BLUE,                         ______,                         ______, ______, ______, ______, ______, ______,    PURPLE
-    ),
-};
-
-#endif // RGB_MATRIX_LEDMAPS_ENABLED
-// clang-format on
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
deleted file mode 100644
index 607606b3e72..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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 "mike1808.h"
-
-#if (__has_include("secrets.h") && !defined(NO_SECRETS))
-#    include "secrets.h"
-#else
-// `PROGMEM const char secret[][x]` may work better, but it takes up more space in the firmware
-// And I'm not familiar enough to know which is better or why...
-static const char *const secrets[] = {"test1", "test2", "test3", "test4", "test5"};
-#endif
-
-// userspace_config_t userspace_config;
-
-bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_SECRET_1 ... KC_SECRET_5:  // Secrets!  Externally defined strings, not stored in repo
-            if (!record->event.pressed) {
-                clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                send_string_with_delay(secrets[keycode - KC_SECRET_1], MACRO_TIMER);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-void suspend_power_down_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_set_suspend_state(true);
-#endif  // RGB_MATRIX_ENABLE
-}
-
-void suspend_wakeup_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_set_suspend_state(false);
-#endif  // RGB_MATRIX_ENABLE
-}
-
-#ifdef RGB_MATRIX_ENABLE
-bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
-    // Turn on sideglow when CAPS LOCK is activated
-    if (host_keyboard_led_state().caps_lock) {
-        HSV hsv = {CAPS_LOCK_COLOR};
-        hsv.v = rgb_matrix_get_val();
-        RGB rgb = hsv_to_rgb(hsv);
-
-        for (uint8_t i = led_min; i < led_max; i++) {
-            if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-                RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b);
-            }
-        }
-    }
-    return false;
-}
-#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
deleted file mode 100644
index b35ad7590df..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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 QMK_KEYBOARD_H
-#include "rgb_matrix_ledmaps.h"
-
-enum layout_names {
-    LINUX = 0,  // Base Layout: The main keyboard layout that has all the characters
-    WINDOWS,    // Base ayout for Windows
-    MACOS,      // Base Layout for MacOS
-    FUNCTIONS,  // Function Layout: The function key activated layout with default functions and
-                // some added ones
-    GIT,        // GIT Layout: GIT shortcuts and macros
-    SECRETS,    // Layer with secrets
-};
-
-enum custom_keycodes {
-    KC_CCCV = SAFE_RANGE,  // Hold to copy, tap to paste
-    KC_LINUX,
-    KC_MAC,
-    KC_WIN,
-
-    KC_SECRET_1,
-    KC_SECRET_2,
-    KC_SECRET_3,
-    KC_SECRET_4,
-    KC_SECRET_5,
-
-    KC_RGB_ENC_HUE,
-    KC_RGB_ENC_SAT,
-    KC_RGB_ENC_VAL,
-    KC_RGB_ENC_EFFECT_SPEED,
-    KC_RGB_ENC_EFFECT,
-
-    KC_WPM_RGB,
-};
-
-enum git_macros {
-    // The start of this enum should always be equal to end of ctrl_keycodes + 1
-    G_INIT = KC_WPM_RGB + 1,  // git init
-    G_CLONE,                  // git clone
-    G_CONF,                   // git config --global
-    G_ADD,                    // git add
-    G_DIFF,                   // git diff
-    G_QK_BOOT,                // git reset
-    G_REBAS,                  // git rebase
-    G_BRANH,                  // git branch
-    G_CHECK,                  // git checkout
-    G_MERGE,                  // git merge
-    G_REMTE,                  // git remote add
-    G_FETCH,                  // git fetch
-    G_PULL,                   // git pull
-    G_PUSH,                   // git push
-    G_COMM,                   // git commit
-    G_STAT,                   // git status
-    G_LOG,                    // git log
-    NEW_SAFE_RANGE,
-};
-
-enum combos {
-    JK_ESC,  // jk to ESC for Vim
-};
-
-#define KC_SEC1 KC_SECRET_1
-#define KC_SEC2 KC_SECRET_2
-#define KC_SEC3 KC_SECRET_3
-#define KC_SEC4 KC_SECRET_4
-#define KC_SEC5 KC_SECRET_5
-
-#define KC_RGBH KC_RGB_ENC_HUE
-#define KC_RGBS KC_RGB_ENC_SAT
-#define KC_RGBV KC_RGB_ENC_VAL
-#define KC_RGBE KC_RGB_ENC_EFFECT
-#define KC_RGBP KC_RGB_ENC_EFFECT_SPEED
-
-#define KC_WRGB KC_WPM_RGB
-
-#define KC_LINX KC_LINUX
-
-#define KC_RESET QK_BOOT
-#define KC_RST KC_RESET
-
-#define OS_GIT OSL(GIT)
-#define TT_FN TT(FUNCTIONS)
-
-#define OS_LGUI OSM(MOD_LGUI)
-#define OS_RGUI OSM(MOD_RGUI)
-#define OS_LSFT OSM(MOD_LSFT)
-#define OS_RSFT OSM(MOD_RSFT)
-#define OS_LCTL OSM(MOD_LCTL)
-#define OS_RCTL OSM(MOD_RCTL)
-#define OS_LALT OSM(MOD_LALT)
-#define OS_RALT OSM(MOD_RALT)
-#define OS_MEH OSM(MOD_MEH)
-#define OS_HYPR OSM(MOD_HYPR)
-
-#define CAPS_LOCK_COLOR HSV_RED
-
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c
deleted file mode 100644
index a21b58a36cb..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>,
-    Mikael Manukyan <arm.localhost@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 "mike1808.h"
-#include "print.h"
-#include "process_record.h"
-
-uint16_t copy_paste_timer;
-
-__attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-__attribute__((weak)) bool process_record_encoder(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-__attribute__((weak)) bool process_record_fun(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-__attribute__((weak)) void keyboard_post_init_encoder(void) { return; }
-
-static const char *git_commands[] = {
-    "git init ",     "git clone ", "git config --global ", "git add ",
-    "git diff ",     "git reset ", "git rebase ",          "git branch -b \"",
-    "git checkout ", "git merge ", "git remote add ",      "git fetch ",
-    "git pull ",     "git push ",  "git commit ",          "git status ",
-    "git log ",
-};
-
-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 KEYLOGGER_ENABLE
-    uprintf("KL: kc: 0x%04X, col: %2u, row: %2u, pressed: %b, time: %5u, int: %b, count: %u\n",
-            keycode, record->event.key.col, record->event.key.row, record->event.pressed,
-            record->event.time, record->tap.interrupted, record->tap.count);
-#endif  // KEYLOGGER_ENABLE
-    switch (keycode) {
-        case KC_LINUX ... KC_WIN:
-            if (record->event.pressed) {
-                dprintf("set_single_persistent_default_layer %d\n", keycode - KC_LINUX + LINUX);
-                set_single_persistent_default_layer(keycode - KC_LINUX + LINUX);
-                return false;
-            }
-
-            break;
-
-        case KC_CCCV:  // One key copy/paste
-            if (record->event.pressed) {
-                copy_paste_timer = timer_read();
-            } else {
-                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
-                    if (layer_state_is(MACOS)) {
-                        tap_code16(LGUI(KC_C));
-                    } else {
-                        tap_code16(LCTL(KC_C));
-                    }
-                } else {  // Tap, paste
-                    if (layer_state_is(MACOS)) {
-                        tap_code16(LGUI(KC_V));
-                    } else {
-                        tap_code16(LCTL(KC_V));
-                    }
-                }
-            }
-            break;
-
-        case G_INIT ... G_LOG:
-            if (record->event.pressed) {
-                clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                send_string_with_delay(git_commands[keycode - G_INIT], MACRO_TIMER);
-                return false;
-            }
-            break;
-#ifdef RGB_MATRIX_ENABLE
-        case RGB_TOG:
-            if (record->event.pressed) {
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    } break;
-                    case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    } break;
-                    case LED_FLAG_UNDERGLOW: {
-                        // This line is for LED idle timer. It disables the toggle so you can turn
-                        // off LED completely if you like
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_disable();
-                    } break;
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable();
-                    } break;
-                }
-            }
-            return false;
-#endif  // RGB_MATRIX_ENABLE
-    }
-
-    return process_record_encoder(keycode, record) && process_record_secrets(keycode, record) &&
-           process_record_fun(keycode, record);
-}
-
-void keyboard_post_init_user(void) { keyboard_post_init_encoder(); }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.h
deleted file mode 100644
index 10217516551..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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 "mike1808.h"
-
-
-bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
-
-bool process_record_encoder(uint16_t keycode, keyrecord_t *record);
-
-bool process_record_fun(uint16_t keycode, keyrecord_t *record);
-
-void keyboard_post_init_encoder(void);
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
deleted file mode 100644
index b213abc998d..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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 "rgb_matrix_ledmaps.h"
-
-__attribute__((weak)) bool rgb_matrix_indicators_keymap(void) { return true; }
-__attribute__((weak)) bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
-    return true;
-}
-
-#ifdef RGB_MATRIX_LEDMAPS_ENABLED
-
-static bool enabled = true;
-
-#endif  // RGB_MATRIX_LEDMAPS_ENABLED
-
-bool rgb_matrix_indicators_user(void) { return rgb_matrix_indicators_keymap(); }
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-#ifdef RGB_MATRIX_LEDMAPS_ENABLED
-    if (rgb_matrix_is_enabled() && enabled) {
-        set_layer_rgb(led_min, led_max, get_highest_layer(layer_state | default_layer_state));
-    }
-
-#endif  // RGB_MATRIX_LEDMAPS_ENABLED
-    return rgb_matrix_indicators_advanced_keymap(led_min, led_max);
-}
-
-#ifdef RGB_MATRIX_LEDMAPS_ENABLED
-
-void set_layer_rgb(uint8_t led_min, uint8_t led_max, int layer) {
-    const ledmap *l = &(ledmaps[layer]);
-
-    uint8_t val = rgb_matrix_get_val();
-
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        HSV hsv = {
-            .h = (*l)[i][0],
-            .s = (*l)[i][1],
-            .v = val,
-        };
-
-        if (hsv.h || hsv.s) {
-            RGB rgb = hsv_to_rgb(hsv);
-            RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b);
-        }
-    }
-}
-
-void rgb_matrix_layers_enable(void) {
-    dprintf("ledmaps are enabled\n");
-    enabled = true;
-}
-
-void rgb_matrix_layers_disable(void) {
-    dprintf("ledmaps are disabled\n");
-    enabled = false;
-}
-
-#endif  // RGB_MATRIX_LEDMAPS_ENABLED
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
deleted file mode 100644
index 931dfa07040..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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"
-
-#ifdef RGB_MATRIX_LEDMAPS_ENABLED
-
-// no association keycode
-#    define XXX \
-        { 0, 0, 0 }
-
-// clang-format off
-#   define RGB_MATRIX_LAYOUT_LEDMAP( \
-        ul1,   k13, k26, k36, k31, k33, k07, k63, k71, k76, ka6, ka7, ka3, ka5, k97,     k01,   ur1, \
-        ul2,   k16, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, ka1,     k65,   ur2, \
-        ul3,   k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, ka2,     k15,   ur3, \
-        ul4,   k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83,     ka4,      k25,   ur4, \
-        ul5,   k00, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85,    k91,       k35, k75,   ur5, \
-        ul6,   k06,    k90,    k93,       k94,          k95,     k92, k04,     k03, k73, k05,   ur6 \
-    ) \
-    { \
-        k13, k16, k11, k21, k00, k06, k26, k17, \
-        k10, k12, k14, k90, k36, k27, k20, k22, \
-        k24, k93, k31, k37, k30, k32, k34, k33, \
-        k47, k40, k42, k44, k07, k46, k41, k43, \
-        k45, k94, k63, k56, k51, k53, k55, k71, \
-        k57, k50, k52, k54, k76, k67, k60, k62, \
-        k64, k95, ka6, k77, k70, k72, k74, k92, \
-        ka7, k87, k80, k82, k85, ka3, k86, k81, \
-        k83, k04, ka5, ul1, ur1, k97, ul2, ur2, \
-        k65, ul2, ur2, k15, ul3, ur3, k66, k05, \
-        ul3, ur3, k75, ul4, ur4, ka1, k25, ul5, \
-        ur5, k61, k91, ul6, ur6, ka2, k35, k03, \
-        ka4, k73 \
-    }
-// clang-format on
-typedef uint8_t ledmap[RGB_MATRIX_LED_COUNT][3];
-extern const ledmap ledmaps[];
-
-void set_layer_rgb(uint8_t led_min, uint8_t led_max, int layer);
-
-void rgb_matrix_layers_enable(void);
-void rgb_matrix_layers_disable(void);
-
-// Just a handy defines to make our ledmaps look better
-#    define RED \
-        { HSV_RED }
-#    define CORAL \
-        { HSV_CORAL }
-#    define ORANGE \
-        { HSV_ORANGE }
-#    define GOLDEN \
-        { HSV_GOLDENROD }
-#    define GOLD \
-        { HSV_GOLD }
-#    define YELLOW \
-        { HSV_YELLOW }
-#    define CHART \
-        { HSV_CHARTREUSE }
-#    define GREEN \
-        { HSV_GREEN }
-#    define SPRING \
-        { HSV_SPRINGGREEN }
-#    define TURQ \
-        { HSV_TURQUOISE }
-#    define TEAL \
-        { HSV_TEAL }
-#    define CYAN \
-        { HSV_CYAN }
-#    define AZURE \
-        { HSV_AZURE }
-#    define BLUE \
-        { HSV_BLUE }
-#    define PURPLE \
-        { HSV_PURPLE }
-#    define MAGENT \
-        { HSV_MAGENTA }
-#    define PINK \
-        { HSV_PINK }
-#    define BLACK \
-        { HSV_BLACK }
-
-#endif  // RGB_MATRIX_LEDMAPS_ENABLED
-
-bool rgb_matrix_indicators_keymap(void);
-bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max);
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rules.mk
deleted file mode 100644
index a6d4e6259c5..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rules.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-VIA_ENABLE = no
-
-COMBO_ENABLE = yes
-COMMAND_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-RAW_ENABLE = no
-CONSOLE_ENABLE = yes
-
-WPM_ENABLE = no
-
-RGB_MATRIX_LEDMAPS = yes
-
-SRC += utils.c
-SRC += mike1808.c
-SRC += process_record.c
-SRC += encoder.c
-
-ifeq ($(strip $(WPM_ENABLE)), yes)
-	SRC += fun.c
-endif
-
-ifeq ($(strip $(RGB_MATRIX_LEDMAPS)), yes)
-	SRC += rgb_matrix_ledmaps.c
-	OPT_DEFS += -DRGB_MATRIX_LEDMAPS_ENABLED
-endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c
deleted file mode 100644
index 009e826423b..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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 "utils.h"
-
-void store_rgb_state_to_eeprom(void) {
-    uint8_t mode  = rgb_matrix_get_mode();
-    uint8_t speed = rgb_matrix_get_speed();
-    HSV     color = rgb_matrix_get_hsv();
-
-    rgb_matrix_mode(mode);
-    rgb_matrix_set_speed(speed);
-    rgb_matrix_sethsv(color.h, color.s, color.v);
-}
-
-void press(KeyPressState *self) {
-    self->_count++;
-
-    dprintf("KPS: press: %d\n", self->_count);
-
-    // pressed the first time
-    if (self->_count == 1) {
-        self->hander(true);
-    }
-}
-
-void release(KeyPressState *self) {
-    self->_count--;
-
-    dprintf("KPS: release: %d\n", self->_count);
-
-    // all keys are relased
-    if (self->_count == 0) {
-        self->hander(false);
-    }
-}
-
-void reset(KeyPressState *self) {
-    self->_count = 0;
-}
-
-KeyPressState *NewKeyPressState(key_press_handler handler) {
-    KeyPressState *kps = (KeyPressState *)(malloc(sizeof(KeyPressState)));
-
-    kps->_count = 0;
-    kps->press = press;
-    kps->release = release;
-    kps->reset = reset;
-    kps->hander = handler;
-
-    return kps;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.h
deleted file mode 100644
index 49d0745cf87..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Mikael Manukyan <arm.localhost@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"
-
-void store_rgb_state_to_eeprom(void);
-
-typedef void (*key_press_handler)(bool);
-
-typedef struct KeyPressState KeyPressState;
-struct KeyPressState {
-        int _count;
-        void (*press)(KeyPressState *self);
-        void (*release)(KeyPressState *self);
-        void (*reset)(KeyPressState *self);
-        key_press_handler hander;
-};
-
-KeyPressState *NewKeyPressState(key_press_handler);
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
deleted file mode 100644
index 8d8c35af492..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Tomas Guinan
- *
- * 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 RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#endif
-
-#define FORCE_NKRO
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
deleted file mode 100644
index f4184525fc4..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
+++ /dev/null
@@ -1,475 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-   Copyright 2021 Tomas Guinan
-
-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 "rgb_matrix_map.h"
-#include "paddlegame.h"
-#include <math.h>
-
-enum custom_layers {
-    _BASE,
-    _FN1,
-    _MO2,
-    _MO3,
-};
-
-enum custom_keycodes {
-  KC_00 = SAFE_RANGE,
-  KC_WINLK,    //Toggles Win key on and off
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case KC_00:
-        if (record->event.pressed) {
-            // when keycode KC_00 is pressed
-            SEND_STRING("00");
-        } else {
-            // when keycode KC_00 is released
-        }
-        break;
-
-    case KC_WINLK:
-        if (record->event.pressed) {
-            if(!keymap_config.no_gui) {
-                process_magic(GUI_OFF, record);
-            } else {
-                process_magic(GUI_ON, record);
-            }
-        } else  unregister_code16(keycode);
-        break;
-    }
-    return true;
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Del           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Home
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    [_BASE] = 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_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(_FN1), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-    ),
-
-    [_FN1] = LAYOUT(
-        KC_SLEP,  KC_MYCM,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MNXT,  KC_MPLY,  KC_MSTP,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  KC_INS,             _______,
-        RGB_TOG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_HUD,  RGB_HUI,  _______,            RGB_M_P,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  TO(_MO2), RGB_SAD,  RGB_SAI,  QK_BOOT,            RGB_M_B,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_RMOD, RGB_MOD,            _______,            RGB_M_R,
-        _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  RGB_VAI,  RGB_M_SW,
-        _______,  KC_WINLK, _______,                                _______,                                _______,  _______,  _______,  RGB_SPD,  RGB_VAD,  RGB_SPI
-    ),
-
-    [_MO2] = LAYOUT(
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
-        _______,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
-        _______,   _______,  _______,                                _______,                                _______,  TG(_MO2), _______,  _______,  _______,  _______
-    ),
-
-   [_MO3] = LAYOUT(
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
-        _______,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
-        _______,   _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______
-    ),
-
-};
-
-#ifdef ENCODER_ENABLE       // Encoder Functionality
-
-    bool encoder_update_user(uint8_t index, bool clockwise) {
-
-		switch(get_highest_layer(layer_state)) {
-			case _FN1:
-			if ( clockwise ) {
-				tap_code16(KC_PGDN);
-			} else {
-				tap_code16(KC_PGUP);
-			}
-			break;
-
-			case _MO2:
-			// Game: Paddle movement
-			if (damage_count == 0) {
-				if ( clockwise ) {
-					if (paddle_pos_full < 15) ++paddle_pos_full;
-				} else {
-					if (paddle_pos_full > 0) --paddle_pos_full;
-				}
-			}
-			break;
-
-			case _BASE:
-			default:
-			if ( clockwise ) {
-				tap_code(KC_VOLU);
-			} else {
-				tap_code(KC_VOLD);
-			}
-			break;
-		}
-        //return true; //set to return false to counteract enabled encoder in pro.c
-        return false;
-    }
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-	void init_ball(uint8_t i) {
-		i &= 1;
-		ball[i].on = true;
-		ball[i].up = false;
-		ball[i].y = 0;
-		ball[i].x = rand() % 16;
-
-		// Set initial ball state
-		if (ball[i].x < 8) {
-			ball[i].left = false;
-		} else {
-			ball[i].x -= 4;
-			ball[i].left = true;
-		}
-
-		// 1/4 chance of being an enemy ball after level 6
-		if (level_number > 3) {
-			ball[i].enemy = ((rand() % 4) == 0);
-		} else {
-			ball[i].enemy = false;
-		}
-	}
-
-	void hurt_paddle(void) {
-		if (paddle_lives > 0) {
-			--paddle_lives;
-		}
-		damage_timer = timer_read();
-		damage_count = 10;
-
-		// Reset board
-		init_ball(0);
-		ball[1].on = false;
-	}
-
-    // Capslock, Scroll lock and Numlock  indicator on Left side lights.
-    bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-		switch(get_highest_layer(layer_state)) {
-			case _FN1:
-			// Light up FN layer keys
-			if (!fn_active) {
-				fn_active = true;
-				rgb_value.r = 0xff;
-				rgb_value.g = 0x00;
-				rgb_value.b = 0x00;
-			}
-
-			if (rgb_value.r == 0xff && rgb_value.g < 0xff) {
-				if (rgb_value.b > 0) { --rgb_value.b; }
-				else { ++rgb_value.g; }
-			} else if (rgb_value.g == 0xff && rgb_value.b < 0xff) {
-				if (rgb_value.r > 0) { --rgb_value.r; }
-				else { ++rgb_value.b; }
-			} else if (rgb_value.b == 0xff && rgb_value.r < 0xff) {
-				if (rgb_value.g > 0) { --rgb_value.g; }
-				else { ++rgb_value.r; }
-			}
-
-            for (uint8_t i=0; i<ARRAY_SIZE(LED_RGB); i++) {
-                rgb_matrix_set_color(LED_RGB[i], rgb_value.r, rgb_value.g, rgb_value.b);
-            }
-
-            for (uint8_t i=0; i<ARRAY_SIZE(LED_WHITE); i++) {
-                rgb_matrix_set_color(LED_WHITE[i], RGB_WHITE);
-            }
-
-            for (uint8_t i=0; i<ARRAY_SIZE(LED_GREEN); i++) {
-                rgb_matrix_set_color(LED_GREEN[i], RGB_GREEN);
-            }
-
-			rgb_matrix_set_color(LED_ESC,  RGB_RED);
-
-			rgb_matrix_set_color(LED_LWIN, RGB_BLUE);
-			break;
-
-			case _MO2:
-			// Paddle game
-			if (!game_start) {
-				srand((unsigned int)timer_read());
-
-				// Store user light settings
-				last_hsv = rgb_matrix_get_hsv();
-				rgb_matrix_sethsv_noeeprom(0, 0, 0);
-
-				rgb_value.r = 0xff;
-				rgb_value.g = 0x00;
-				rgb_value.b = 0x00;
-
-				paddle_pos_full = 8;
-				paddle_lives = 4;
-				bounce_count = 0;
-				level_number = 0;
-				damage_count = 0;
-
-				init_ball(0);
-				ball[1].on = false;
-				ball_timer = timer_read();
-
-				game_start = true;
-			}
-
-			// Set level indicator
-			if (level_number < 12) {
-				rgb_matrix_set_color(GAME_R0[level_number], RGB_BLUE);
-			}
-
-			// Set life bar
-			for (uint8_t i=0; i < paddle_lives ; i++) {
-				rgb_matrix_set_color(GAME_LIVES[i], RGB_GREEN);
-			}
-
-			uint8_t paddle_pos = paddle_pos_full >> 1;
-
-			if (damage_count > 0) {
-				// Flash paddle when receiving damage
-				if (timer_elapsed(damage_timer) > 500) {
-					--damage_count;
-					damage_timer = timer_read();
-				}
-				if ((damage_count & 1) == 0) {
-					for (uint8_t i=0; i < 3 ; i++) {
-						rgb_matrix_set_color(GAME_PADDLE[paddle_pos + i], RGB_RED);
-					}
-				}
-				if (damage_count == 0) {
-					ball_timer = timer_read();
-				}
-
-
-			} else if (paddle_lives == 0) {
-				// Game over
-				for (uint8_t i=0; i<ARRAY_SIZE(LED_GAME_OVER); i++) {
-					rgb_matrix_set_color(LED_GAME_OVER[i], RGB_RED);
-				}
-
-			} else if (level_number >= 12) {
-				// You win
-				if (rgb_value.r == 0xff && rgb_value.g < 0xff) {
-					if (rgb_value.b > 0) { --rgb_value.b; }
-					else { ++rgb_value.g; }
-				} else if (rgb_value.g == 0xff && rgb_value.b < 0xff) {
-					if (rgb_value.r > 0) { --rgb_value.r; }
-					else { ++rgb_value.b; }
-				} else if (rgb_value.b == 0xff && rgb_value.r < 0xff) {
-					if (rgb_value.g > 0) { --rgb_value.g; }
-					else { ++rgb_value.r; }
-				}
-
-				for (uint8_t i=0; i < 3 ; i++) {
-					rgb_matrix_set_color(GAME_PADDLE[paddle_pos + i], rgb_value.r, rgb_value.g, rgb_value.b);
-				}
-				rgb_matrix_set_color(GAME_SMILE1[paddle_pos], rgb_value.r, rgb_value.g, rgb_value.b);
-				rgb_matrix_set_color(GAME_SMILE1[paddle_pos + 3], rgb_value.r, rgb_value.g, rgb_value.b);
-				rgb_matrix_set_color(GAME_SMILE2[paddle_pos], rgb_value.r, rgb_value.g, rgb_value.b);
-				rgb_matrix_set_color(GAME_SMILE2[paddle_pos + 3], rgb_value.r, rgb_value.g, rgb_value.b);
-
-			} else {
-				// normal game loop
-
-				// Set paddle position
-				for (uint8_t i=0; i < 3 ; i++) {
-					rgb_matrix_set_color(GAME_PADDLE[paddle_pos + i], RGB_GREEN);
-				}
-
-				// Ball movement logic happens at intervals
-				if (timer_elapsed(ball_timer) > GAME_TIMER[level_number]) {
-					for (int i=0; i<2; ++i) {
-						if (ball[i].on) {
-							// Ball movement
-							if (ball[i].up) {
-								if (ball[i].y > 0) {
-									--ball[i].y;
-									if (!ball[i].left) ++ball[i].x;
-								} else {
-									// Count reflections. If > 10, increase level
-									++bounce_count;
-									if (bounce_count >= 10) {
-										bounce_count = 0;
-										++level_number;
-									}
-									ball[i].on = false;
-								}
-							} else {
-								++ball[i].y;
-								if (ball[i].left) --ball[i].x;
-								if (ball[i].y > 4) {
-									// Remove a life if ball isn't returned and isn't enemy
-									if (!ball[i].enemy) {
-										hurt_paddle();
-										i = 2;
-									} else {
-										ball[i].on = false;
-									}
-								}
-							}
-						}
-					}
-					if (ball[0].y == 4 && !ball[1].on) {
-						init_ball(1);
-					}
-					if (ball[1].y == 4 && !ball[0].on) {
-						init_ball(0);
-					}
-					if (!ball[0].on && !ball[1].on) {
-						init_ball(0);
-					}
-					ball_timer = timer_read();
-				}
-
-				// Other ball stuff
-				for (int i=0; i<2; ++i) {
-					if (ball[i].on) {
-						// Ball deflection logic
-						if (!ball[i].up && ball[i].y == 4 && (ball[i].x == paddle_pos || ball[i].x == paddle_pos - 1 || ball[i].x == paddle_pos + 1)) {
-							if (!ball[i].enemy) {
-								--ball[i].y;
-								if (!ball[i].left) { ++ball[i].x; }
-								ball[i].up = true;
-							} else {
-								hurt_paddle();
-								i = 2;
-							}
-						}
-
-						// Ball display
-						switch (ball[i].y) {
-							case 0:
-							if (ball[i].enemy) {
-								rgb_matrix_set_color(GAME_R0[ball[i].x], RGB_RED);
-							} else {
-								rgb_matrix_set_color(GAME_R0[ball[i].x], RGB_WHITE);
-							}
-							break;
-
-							case 1:
-							if (ball[i].enemy) {
-								rgb_matrix_set_color(GAME_R1[ball[i].x], RGB_RED);
-							} else {
-								rgb_matrix_set_color(GAME_R1[ball[i].x], RGB_WHITE);
-							}
-							break;
-
-							case 2:
-							if (ball[i].enemy) {
-								rgb_matrix_set_color(GAME_R2[ball[i].x], RGB_RED);
-							} else {
-								rgb_matrix_set_color(GAME_R2[ball[i].x], RGB_WHITE);
-							}
-							break;
-
-							case 3:
-							if (ball[i].enemy) {
-								rgb_matrix_set_color(GAME_R3[ball[i].x], RGB_RED);
-							} else {
-								rgb_matrix_set_color(GAME_R3[ball[i].x], RGB_WHITE);
-							}
-							break;
-
-							case 4:
-							if (ball[i].enemy) {
-								rgb_matrix_set_color(GAME_R4[ball[i].x], RGB_RED);
-							} else {
-								rgb_matrix_set_color(GAME_R4[ball[i].x], RGB_WHITE);
-							}
-							break;
-						}
-					}
-				}
-			}
-
-
-			break;
-
-			default:
-			fn_active = false;
-			if (game_start) {
-				// Reset lighting settings
-				game_start = false;
-				rgb_matrix_sethsv_noeeprom(last_hsv.h, last_hsv.s, last_hsv.v);
-			}
-			break;
-		}
-
-		led_t led_state = host_keyboard_led_state();
-
-        if (led_state.caps_lock) {
-			if (!caps_active) {
-				caps_active = true;
-				caps_flash_on = true;
-				caps_flasher = timer_read();
-			}
-			if (timer_elapsed(caps_flasher) > 500) {
-				caps_flasher = timer_read();
-				caps_flash_on = !caps_flash_on;
-			}
-
-            rgb_matrix_set_color(LED_CAPS, RGB_WHITE);
-            if (caps_flash_on) {
-				for (uint8_t i=0; i<ARRAY_SIZE(LED_SIDE_LEFT); i++) {
-					rgb_matrix_set_color(LED_SIDE_LEFT[i], RGB_RED);
-					rgb_matrix_set_color(LED_SIDE_RIGHT[i], RGB_RED);
-				}
-			} else {
-				for (uint8_t i=0; i<ARRAY_SIZE(LED_SIDE_LEFT); i++) {
-					rgb_matrix_set_color(LED_SIDE_LEFT[i], 0, 0, 0);
-					rgb_matrix_set_color(LED_SIDE_RIGHT[i], 0, 0, 0);
-				}
-			}
-        } else {
-			caps_active = false;
-		}
-        if (led_state.scroll_lock) {
-            rgb_matrix_set_color(LED_F10,  RGB_WHITE);
-        }
-        if (keymap_config.no_gui) {
-            rgb_matrix_set_color(LED_LWIN, RGB_RED);  //light up Win key when disabled
-        }
-    return false;
-    }
-
-#endif
-
-void keyboard_post_init_user(void) {
-
-    #ifdef RGB_MATRIX_ENABLE
-       rgb_matrix_set_color_all(RGB_RED); // Default startup colour
-    #endif
-
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/paddlegame.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/paddlegame.h
deleted file mode 100644
index 27df2dd703e..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/paddlegame.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-   Copyright 2021 Tomas Guinan
-
-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/>.
-*/
-
-
-const uint16_t GAME_TIMER[] = { 
-	400, 350, 300, 250, 400, 350, 300, 250, 225, 200, 175, 150
-};
-
-bool game_start = false;
-HSV last_hsv;
-static uint8_t paddle_pos_full;
-static uint8_t paddle_lives;
-static uint8_t level_number;
-static uint8_t bounce_count;
-static uint8_t damage_count;
-static uint16_t damage_timer;
-static uint16_t ball_timer;
-
-struct BallStruct
-{
-	uint8_t x;
-	uint8_t y;
-	bool on;
-	bool up;
-	bool left;
-	bool enemy;
-};
-	
-struct BallStruct ball[2];
-
-void init_ball(uint8_t i);
-void hurt_paddle(void);
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/readme.md
deleted file mode 100644
index c6da7f5f47f..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-![GMMK Pro Paddle Game zLayout Image](https://i.imgur.com/RYcKyOj.png)
-
-# Paddle Game GMMK Pro layout by Tomas Guinan
-
-- Add Print Screen, Scroll Lock, Pause/Break, Insert to Fn layer
-- Toggle backlight using Fn+`
-	- If you don't like using a backlight but wnat to play the paddle game or
-	  use other RGB features, turn RGB on and set brightness to 0
-- Usable Fn layer keys are backlit
-- Implement Win key lock using Fn+Win like in Glorious Core firmware
-- Caps Lock and Scroll Lock keys light up white when active
-- Caps Lock has red flashing side lights like in Glorious Core firmware
-- Layer 2 includes Paddle Game, playable by pressing Fn+P
-	- Use rotary encoder to control paddle
-	- Contains 12 levels, indicated by blue LED on F row
-	- Player has 4 lives, indicated by nav cluster
-	- Deflect white balls while avoiding red ones
-	- Press Fn to quit game
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rgb_matrix_map.h
deleted file mode 100644
index 06d34ba6cb1..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rgb_matrix_map.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright 2021 Tomas Guinan
- *
- * 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/>.
- */
-
-
-#ifdef RGB_MATRIX_ENABLE
-
-	bool fn_active = false;
-	bool caps_active = false;
-	bool caps_flash_on = false;
-
-	static uint16_t caps_flasher = 0;
-	RGB rgb_value;
-
-    // RGB LED locations
-    enum led_location_map {
-        LED_ESC, // 0, ESC, k13
-        LED_GRV, // 1, ~, k16
-        LEB_TAB, // 2, Tab, k11
-        LED_CAPS, // 3, Caps, k21
-        LED_LSFT, // 4, Sh_L, k00
-        LED_LCTL, // 5, Ct_L, k06
-        LED_F1, // 6, F1, k26
-        LED_1, // 7, 1, k17
-        LED_Q, // 8, Q, k10
-        LED_A, // 9, A, k12
-        LED_Z, // 10, Z, k14
-        LED_LWIN, // 11, Win_L, k90
-        LED_F2, // 12, F2, k36
-        LED_2, // 13, 2, k27
-        LED_W, // 14, W, k20
-        LED_S, // 15, S, k22
-        LED_X, // 16, X, k24
-        LED_LALT, // 17, Alt_L, k93
-        LED_F3, // 18, F3, k31
-        LED_3, // 19, 3, k37
-        LED_E, // 20, E, k30
-        LED_D, // 21, D, k32
-        LED_C, // 22, C, k34
-        LED_F4, // 23, F4, k33
-        LED_4, // 24, 4, k47
-        LED_R, // 25, R, k40
-        LED_F, // 26, F, k42
-        LED_V, // 27, V, k44
-        LED_F5, // 28, F5, k07
-        LED_5, // 29, 5, k46
-        LED_T, // 30, T, k41
-        LED_G, // 31, G, k43
-        LED_B, // 32, B, k45
-        LED_SPC, // 33, SPACE, k94
-        LED_F6, // 34, F6, k63
-        LED_6, // 35, 6, k56
-        LED_Y, // 36, Y, k51
-        LED_H, // 37, H, k53
-        LED_N, // 38, N, k55
-        LED_F7, // 39, F7, k71
-        LED_7, // 40, 7, k57
-        LED_U, // 41, U, k50
-        LED_J, // 42, J, k52
-        LED_M, // 43, M, k54
-        LED_F8, // 44, F8, k76
-        LED_8, // 45, 8, k67
-        LED_I, // 46, I, k60
-        LED_K, // 47, K, k62
-        LED_COMM, // 48, ,, k64
-        LED_RALT, // 49, Alt_R, k95
-        LED_F9, // 50, F9, ka6
-        LED_9, // 51, 9, k77
-        LED_O, // 52, O, k70
-        LED_L, // 53, L, k72
-        LED_DOT, // 54, ., k74
-        LED_FN, // 55, FN, k92
-        LED_F10, // 56, F10, ka7
-        LED_0, // 57, 0, k87
-        LED_P, // 58, P, k80
-        LED_SCLN, // 59, ;, k82
-        LED_SLSH, // 60, ?, k85
-        LED_F11, // 61, F11, ka3
-        LED_MINS, // 62, -, k86
-        LED_LBRC, // 63, [, k81
-        LED_QUOT, // 64, ", k83
-        LED_RCTL, // 65, Ct_R, k04
-        LED_F12, // 66, F12, ka5
-        LED_L1, // 67, LED, l01
-        LED_R1, // 68, LED, l11
-        LED_DEL, // 69, Del, k97
-        LED_L2, // 70, LED, l02
-        LED_R2, // 71, LED, l12
-        LED_HOME, // 72, Home, k65
-        LED_L3, // 73, LED, l03
-        LED_R3, // 74, LED, l13
-        LED_PGUP, // 75, PgUp, k15
-        LED_L4, // 76, LED, l04
-        LED_R4, // 77, LED, l14
-        LED_EQL, // 78, =, k66
-        LED_RIGHT, // 79, Right, k05
-        LED_L5, // 80, LED, l05
-        LED_R5, // 81, LED, l15
-        LED_END, // 82, End, k75
-        LED_L6, // 83, LED, l06
-        LED_R6, // 84, LED, l16
-        LED_BSPC, // 85, BSpc, ka1
-        LED_PGDN, // 86, PgDn, k25
-        LED_L7, // 87, LED, l07
-        LED_R7, // 88, LED, l17
-        LED_RBRC, // 89, ], k61
-        LED_RSFT, // 90, Sh_R, k91
-        LED_L8, // 91, LED, l08
-        LED_R8, // 92, LED, l18
-        LED_BSLS, // 93, \, ka2
-        LED_UP, // 94, Up, k35
-        LED_LEFT, // 95, Left, k03
-        LED_ENT, // 96, Enter, ka4
-        LED_DOWN // 97, Down, k73
-    };
-
-    const uint8_t LED_RGB[] = { 
-		LED_MINS, LED_EQL, 
-		LED_LBRC, LED_RBRC, 
-		LED_SCLN, LED_QUOT, 
-		LED_HOME, LED_PGUP, LED_PGDN, LED_END, 
-		LED_UP, LED_DOWN, LED_LEFT, LED_RIGHT
-	};
-
-    const uint8_t LED_GREEN[] = { 
-		LED_F1, LED_F2, LED_F3, LED_F4,
-		LED_F5, LED_F6, LED_F7, LED_F8
-	};
-
-    const uint8_t LED_WHITE[] = { 
-		LED_F9, LED_F10, LED_F11, LED_DEL
-	};
-
-    const uint8_t LED_SIDE_LEFT[] = { LED_L1, LED_L2, LED_L3, LED_L4, LED_L5, LED_L6, LED_L7, LED_L8};
-
-    const uint8_t LED_SIDE_RIGHT[] = { LED_R1, LED_R2, LED_R3, LED_R4, LED_R5, LED_R6, LED_R7, LED_R8};
-	
-	// Breakout LED rules
-	
-	const uint8_t GAME_LIVES[] = { LED_HOME, LED_PGUP, LED_PGDN, LED_END };
-	const uint8_t GAME_PADDLE[] = {
-		LED_Z, LED_X, LED_C, LED_V, LED_B, LED_N, LED_M, LED_COMM, LED_DOT, LED_SLSH
-	};
-	const uint8_t GAME_SMILE1[] = {
-		LED_A, LED_S, LED_D, LED_F, LED_G, LED_H, LED_J, LED_K, LED_L, LED_SCLN, LED_QUOT
-	};
-	const uint8_t GAME_SMILE2[] = {
-		LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LED_9, LED_0, LED_MINS, LED_EQL
-	};
-	const uint8_t GAME_R4[] = {
-		LED_X, LED_C, LED_V, LED_B, LED_N, LED_M, LED_COMM, LED_DOT
-	};
-	const uint8_t GAME_R3[] = {
-		LED_S, LED_D, LED_F, LED_G, LED_H, LED_J, LED_K, LED_L, LED_SCLN
-	};
-	const uint8_t GAME_R2[] = {
-		LED_W, LED_E, LED_R, LED_T, LED_Y, LED_U, LED_I, LED_O, LED_P, LED_LBRC
-	};
-	const uint8_t GAME_R1[] = {
-		LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LED_9, LED_0, LED_MINS, LED_EQL
-	};
-	const uint8_t GAME_R0[] = { 
-		LED_F1, LED_F2, LED_F3, LED_F4, LED_F5, LED_F6, LED_F7, LED_F8, LED_F9, LED_F10, LED_F11, LED_F12
-	};
-	
-    const uint8_t LED_GAME_OVER[] = { LED_5, LED_8, LED_F, LED_G, LED_H, LED_J, LED_C, LED_M };
-
-
-#endif
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rules.mk
deleted file mode 100644
index a3f5bfd35c0..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE = no
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-RGB_MATRIX_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
deleted file mode 100644
index 91d731facab..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2021 stickandgum
- *
- * 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
-
-// I like NKRO.. but let's not force it. @drashna pointed out some older hardware has issues - Toggle it via keycode if you like.
-// #define FORCE_NKRO
-
-// At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best.
-#ifdef RGB_MATRIX_ENABLE
-
-// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-
-// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
-    #define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes
-
-// Soon we need to ENABLE modes by DEFAULT soon as per: https://github.com/qmk/qmk_firmware/pull/13758 Thanks @noroadsleft
-//    #undef ENABLE_RGB_MATRIX_SOLID_COLOR               // BUILT IN (MAPPED!) Static single color.
-//    #undef ENABLE_RGB_MATRIX_ALPHAS_MODS               // Accenting various keys on the keyboard.
-//    #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Top down rainbow!
-#    undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT        // Left Right Rainbow (the top-down is better imho).
-                                                        //    #undef ENABLE_RGB_MATRIX_BREATHING                 // Built in (MAPPED!)
-                                                        //    #undef ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right (with white)
-                                                        //    #undef ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right (with black)
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT          // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL)
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL          // See above
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT            // See above
-                                                        //    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness (with black)
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL                  // Full keyboard cycling through rainbow
-                                                        //    #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // BUILT IN (MAPPED!) Full Rainbow Left to Right
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN              // Full gradient scrolling top to bottom
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN               // Rainbow circles coming to center.
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL          // Two Rainbow circles coming to 1/3 and 2/3 points.
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON     // Full gradent Chevron shapped scrolling left to right
-                                                        //    #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes.
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL               // Full gradient spinning spiral around center of keyboard
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON                // Two rainbows spinning around keyboards
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON             // Similar to above.
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS          // Enough of the spinning rainbows - we get it! :-)
-#    undef ENABLE_RGB_MATRIX_RAINDROPS                  // Jellybeans are better.
-                                                        //    #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation - better than above.
-#    undef ENABLE_RGB_MATRIX_HUE_BREATHING              // Hue shifts up a slight ammount at the same time, then shifts back
-#    undef ENABLE_RGB_MATRIX_HUE_PENDULUM               // Hue shifts up a slight ammount in a wave to the right, then back to the left
-#    undef ENABLE_RGB_MATRIX_HUE_WAVE                   // Hue shifts up a slight ammount and then back down in a wave to the right
-                                                        //    #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP            // Hot keys!
-                                                        //    #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN              // The Matrix!
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE      // Key hits shown in current hue - all other keys black: wide slightly better imo
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE             // Key hits shown in current hue - all other keys shifted hue
-                                                        //    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse around a single key hit then fades value out (black otherwise)
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE   // same as above but a bit too intense imo.
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS       // Column and Row single color fade.
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS  // Column and Row single color fade. (Multi-keys)
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS       // Hue & value pulse away on the same column and row of key hit then fades
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS  // Hue & value pulse away on the same column and row of multi-key hit then fades
-#    undef ENABLE_RGB_MATRIX_SPLASH                     // Full rainbow pulses from key hit. All else black.
-#    undef ENABLE_RGB_MATRIX_MULTISPLASH                // Full rainbow pulses from multi-keys. All else black.
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH               // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead).
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH          // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead).
-#endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
deleted file mode 100644
index 9a3123a0a7e..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Copyright 2021 stickandgum GMMK Pro ANSI Enhanced Keymap File
- *
- * 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 my_keycodes {
-  LED_TILDE = SAFE_RANGE,
-  LED_1,
-  LED_2,
-  LED_3,
-  LED_4,
-  LED_5,
-  LED_6,
-  LED_7,
-  LED_8,
-  LED_9,
-  LED_0,
-  LED_MINS,
-  LED_EQL,
-  QMKBEST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5        F6       F7       F8       F9       F10      F11      F12      Prt           Rotary(Mute)
-//      ~        1        2        3        4        5         6        7        8        9        0         -       (=)      BackSpc           Del
-//      Tab      Q        W        E        R        T         Y        U        I        O        P        [        ]        \                 PgUp
-//      Caps     A        S        D        F        G         H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V         B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                                SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-    [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_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_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_DEL, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        _______, KC_CALC, KC_MYCM, KC_MSEL, KC_MAIL,  KC_WHOM, _______, _______, _______, _______, _______, KC_WAKE, KC_SLEP, KC_PAUS,         _______,
-      LED_TILDE, LED_1,  LED_2,   LED_3,   LED_4,    LED_5,   LED_6,   LED_7,   LED_8,   LED_9,   LED_0,   LED_MINS, LED_EQL,  KC_INS,         KC_SCRL,
-        _______, RGB_SAI, RGB_VAI, RGB_HUI, RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,         KC_BRIU,
-       _______, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_SPI, _______,  _______, _______, _______, QMKBEST, _______, _______,         _______,          KC_BRID,
-        _______,          _______, _______, _______, _______,  _______, NK_TOGG, _______, _______, _______, _______,         _______, KC_MPLY, KC_PWR,
-        _______, _______, _______,                             _______,                            KC_RALT, _______, KC_APP, KC_MPRV, KC_MSTP, KC_MNXT
-    ),
-
-};
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  // https://beta.docs.qmk.fm/using-qmk/simple-keycodes/feature_advanced_keycodes#alt-escape-for-alt-tab-id-alt-escape-for-alt-tab
-  if (get_mods() & MOD_MASK_CTRL) { // If CTRL is held
-    uint8_t mod_state = get_mods(); // Store all  modifiers that are held
-    unregister_mods(MOD_MASK_CTRL); // Immediately unregister the CRTL key (don't send CTRL-PgDn) - del_mods doesn't work here (not immediate)
-    if (clockwise) {
-      tap_code(KC_PGDN);
-    } else {
-      tap_code(KC_PGUP);
-    }
-    set_mods(mod_state); // Add back in the CTRL key - so ctrl-key will work if ctrl was never released after paging.
-  } else if (get_mods() & MOD_MASK_SHIFT) {
-    uint8_t mod_state = get_mods();
-    unregister_mods(MOD_MASK_SHIFT);
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE   // If using the mouse scroll - make sure MOUSEKEY is enabled
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_VOLU);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_VOLD);
-      #endif
-    }
-    set_mods(mod_state);
-  } else if (clockwise) { // All else volume.
-    tap_code(KC_VOLU);
-  } else {
-    tap_code(KC_VOLD);
-  }
-  //return true; //set to return false to counteract enabled encoder in pro.c
-  return false;
-}
-#endif //ENCODER_ENABLE
-
-#ifdef RGB_MATRIX_ENABLE
-static void set_rgb_caps_leds_on(void);
-static void set_rgb_scroll_leds_on(void);
-static void set_rgb_caps_leds_off(void);
-static void set_rgb_scroll_leds_off(void);
-
-// Called on powerup and is the last _init that is run.
-void keyboard_post_init_user(void) {
-
-   int mods[35] = {0,2,3,4,5,11,17,33,49,55,65,95,97,79,94,85,93,96,90,69,92,67,76,80,91,75,86,68,77,81,92,28,34,39,44};
-   int j;
-
-   /* output each array element's value */
-   for (j = 0; j < 35; j++ ) {
-      g_led_config.flags[mods[j]] = LED_FLAG_MODIFIER;
-   }
-
-  if (!rgb_matrix_is_enabled()) {
-      rgb_matrix_enable();
-#ifdef CONSOLE_ENABLE
-      uprintf("ERROR! RGB Matrix Enabled and wrote to EEPROM! -How was the RGB Matrix Disabled?");
-#endif
-     }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#ifdef CONSOLE_ENABLE
-      switch(rgb_matrix_get_flags()) {
-          case 0x08:
-           uprintf("FLAG: LED_FLAG_INDICATOR ");
-           break;
-          case 0x04:
-           uprintf("FLAG: LED_FLAG_KEYLIGHT ");
-           break;
-          case 0x02:
-           uprintf("FLAG: LED_FLAG_UNDERGLOW ");
-           break;
-          case 0x01:
-           uprintf("FLAG: LED_FLAG_MODIFIER ");
-           break;
-          case 0xFF:
-           uprintf("FLAG: LED_FLAG_ALL ");
-           break;
-          case 0x00:
-           uprintf("FLAG: LED_FLAG_NONE ");
-           break;
-          default:
-           uprintf("FLAG Other: %u ", rgb_matrix_get_flags());
-      }
-      uprintf("Caps? %d Scroll? %d - MATRIX: %d\n", host_keyboard_led_state().caps_lock, host_keyboard_led_state().scroll_lock, rgb_matrix_is_enabled());
-#endif //CONSOLE_ENABLE
-
-  switch (keycode) {
-     case RGB_TOG:
-      if (record->event.pressed) {
-         if (rgb_matrix_get_flags() == LED_FLAG_ALL) {
-              rgb_matrix_set_flags(LED_FLAG_NONE);
-              rgb_matrix_set_color_all(0, 0, 0);
-          } else {
-              rgb_matrix_set_flags(LED_FLAG_ALL);
-          }
-      }
-      return false;
-    case LED_TILDE:
-        rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);          // Can use RGB_M_P built-in keycode instead.
-        break;
-     case LED_1:
-        rgb_matrix_mode(RGB_MATRIX_ALPHAS_MODS);
-        break;
-    case LED_2:
-        rgb_matrix_mode(RGB_MATRIX_GRADIENT_UP_DOWN);
-        break;
-    case LED_3:
-        rgb_matrix_mode(RGB_MATRIX_JELLYBEAN_RAINDROPS);
-        break;
-    case LED_4:
-        rgb_matrix_mode(RGB_MATRIX_BAND_SAT);
-        break;
-    case LED_5:
-        rgb_matrix_mode(RGB_MATRIX_BAND_VAL);
-        break;
-    case LED_6:
-        rgb_matrix_mode(RGB_MATRIX_BAND_SPIRAL_VAL);
-        break;
-    case LED_7:
-        rgb_matrix_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT);    // Can use RGB_M_R built-in keycode instead.
-        break;
-    case LED_8:
-        rgb_matrix_mode(RGB_MATRIX_CYCLE_PINWHEEL);      // Can use RGB_M_SW built-in keycode instead.
-        break;
-    case LED_9:
-         rgb_matrix_mode(RGB_MATRIX_BREATHING);          // Can use RGB_M_B built-in keycode instead.
-        break;
-    #ifdef RGB_MATRIX_KEYPRESSES                         // Reactive effects require RGB_MATRIX_KEYPRESSES in config.h
-    case LED_0:
-        rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE_WIDE);
-        break;
-    #endif //RGB_MATRIX_KEYPRESSES
-    #ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS               // Heatmap and Rain require #define RGB_MATRIX_FRAMEBUFFER_EFFECTS in config.h
-    case LED_MINS:
-        rgb_matrix_mode(RGB_MATRIX_DIGITAL_RAIN);
-        break;
-    case LED_EQL:
-        rgb_matrix_mode(RGB_MATRIX_TYPING_HEATMAP);
-        break;
-    #endif //RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    case QMKBEST:
-      if (record->event.pressed) { // when keycode QMKBEST is pressed
-          SEND_STRING("QMK rocks");
-        } else { // when keycode QMKBEST key is released
-          SEND_STRING("!!");
-        }
-        break;
-  }
- return true;
-}
-
-bool rgb_matrix_indicators_user(void) {
-    if (host_keyboard_led_state().caps_lock) {
-        set_rgb_caps_leds_on();
-    } else {
-      if (rgb_matrix_get_flags() == LED_FLAG_NONE){
-        set_rgb_caps_leds_off();
-      }
-    }
-    if (host_keyboard_led_state().scroll_lock) {
-        set_rgb_scroll_leds_on();
-    } else {
-      if (rgb_matrix_get_flags() == LED_FLAG_NONE){
-        set_rgb_scroll_leds_off();
-      }
-    }
-    return false;
-}
-
-// RGB led number layout, function of the key
-
-//  67, led 01   0, ESC    6, F1      12, F2      18, F3   23, F4   28, F5      34, F6   39, F7   44, F8      50, F9   56, F10   61, F11    66, F12    69, Prt       Rotary(Mute)   68, led 12
-//  70, led 02   1, ~      7, 1       13, 2       19, 3    24, 4    29, 5       35, 6    40, 7    45, 8       51, 9    57, 0     62, -_     78, (=+)   85, BackSpc   72, Home       71, led 13
-//  73, led 03   2, Tab    8, Q       14, W       20. E    25, R    30, T       36, Y    41, U    46, I       52, O    58, P     63, [{     89, ]}     93, \|        75, PgUp       74, led 14
-//  76, led 04   3, Caps   9, A       15, S       21, D    26, F    31, G       37, H    42, J    47, K       53, L    59, ;:    64, '"                96, Enter     86, PgDn       77, led 15
-//  80, led 05   4, Sh_L   10, Z      16, X       22, C    27, V    32, B       38, N    43, M    48, ,<      54, .<   60, /?               90, Sh_R   94, Up        82, End        81, led 16
-//  83, led 06   5, Ct_L   11,Win_L   17, Alt_L                     33, SPACE                     49, Alt_R   55, FN             65, Ct_R   95, Left   97, Down      79, Right      84, led 17
-//  87, led 07                                                                                                                                                                      88, led 18
-//  91, led 08                                                                                                                                                                      92, led 19
-
-static void set_rgb_caps_leds_on(void) {
-        rgb_matrix_set_color(0, 255, 0, 0);       //Escape Key
-        rgb_matrix_set_color(3, 255, 0, 0);       //capslock key
-        rgb_matrix_set_color(5, 255, 0, 0);       //Left CTRL key
-        rgb_matrix_set_color(67, 255, 0, 0);      //Left LED 01
-        rgb_matrix_set_color(68, 255, 0, 0);      //Right LED 12
-        rgb_matrix_set_color(70, 255, 127, 0);    //Left LED 02
-        rgb_matrix_set_color(71, 255, 127, 0);    //Right LED 13
-        rgb_matrix_set_color(73, 255, 255, 0);    //Left LED 03
-        rgb_matrix_set_color(74, 255, 255, 0);    //Right LED 14
-        rgb_matrix_set_color(76, 0, 255, 0);      //Left LED 04
-        rgb_matrix_set_color(77, 0, 255, 0);      //Right LED 15
-        rgb_matrix_set_color(80, 0, 0, 255);      //Left LED 05
-        rgb_matrix_set_color(81, 0, 0, 255);      //Right LED 16
-        rgb_matrix_set_color(83, 46, 43, 95);     //Left LED 06
-        rgb_matrix_set_color(84, 46, 43, 95);     //Right LED 17
-        rgb_matrix_set_color(87, 139, 0, 255);    //Left LED 07
-        rgb_matrix_set_color(88, 139, 0, 255);    //Right LED 18
-        rgb_matrix_set_color(91, 255, 255, 255);  //Left LED 08
-        rgb_matrix_set_color(92, 255, 255, 255);  //Right LED 19
-}
-
-static void set_rgb_caps_leds_off(void) {
-        rgb_matrix_set_color(0,  0, 0, 0); //Escape Key
-        rgb_matrix_set_color(3,  0, 0, 0); //capslock key
-        rgb_matrix_set_color(5,  0, 0, 0); //Left CTRL key
-        rgb_matrix_set_color(67, 0, 0, 0); //Left LED 01
-        rgb_matrix_set_color(68, 0, 0, 0); //Right LED 12
-        rgb_matrix_set_color(70, 0, 0, 0); //Left LED 02
-        rgb_matrix_set_color(71, 0, 0, 0); //Right LED 13
-        rgb_matrix_set_color(73, 0, 0, 0); //Left LED 03
-        rgb_matrix_set_color(74, 0, 0, 0); //Right LED 14
-        rgb_matrix_set_color(76, 0, 0, 0); //Left LED 04
-        rgb_matrix_set_color(77, 0, 0, 0); //Right LED 15
-        rgb_matrix_set_color(80, 0, 0, 0); //Left LED 05
-        rgb_matrix_set_color(81, 0, 0, 0); //Right LED 16
-        rgb_matrix_set_color(83, 0, 0, 0); //Left LED 06
-        rgb_matrix_set_color(84, 0, 0, 0); //Right LED 17
-        rgb_matrix_set_color(87, 0, 0, 0); //Left LED 07
-        rgb_matrix_set_color(88, 0, 0, 0); //Right LED 18
-        rgb_matrix_set_color(91, 0, 0, 0); //Left LED 08
-        rgb_matrix_set_color(92, 0, 0, 0); //Right LED 19
-}
-
-static void set_rgb_scroll_leds_on(void) {
-        rgb_matrix_set_color(72, 255, 255, 255); // Under Rotary (HOME)
-}
-
-static void set_rgb_scroll_leds_off(void) {
-        rgb_matrix_set_color(72, 0, 0, 0); // Under Rotary (HOME)
-}
-
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/readme.md
deleted file mode 100644
index c4e2225433e..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/readme.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# Glorious GMMK Pro / ANSI - Enhanced Keyboard
-
-Tried to incorporate full featured GMMK Pro keyboard functionality without adding unnecessary features. Included Scroll Lock and Caps LEDs. NKRO can be toggled (Fn + N).
-SHIFT and Ctrl keys for scrolling with the rotary, Fn-keys also used for screen brightness, media, PowerOff, Suspend, App Shortcuts, and RGB Toggle/Modifications. Trimmed down the amazing (currently 41) built-in RGB effects down to about 13 or so reasonable effects that feel are just enough for your entertainment without being too excessive.
-
-BIG thank you to [AndreBrait](https://github.com/andrebrait), And of course, @drashna and @filterpaper, @noroadsleft and the entire discord community.
-
-* Keymap Creator: [StickAndGum](https://github.com/StickAndGum)
-* Keyboard: [More info on GMMK Pro](https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black)
-* Controller [STM32F303CCT6](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html)
-
-* Layout:  
-  ![keyboard-layout](https://user-images.githubusercontent.com/22257588/130371838-875ba65b-88ea-4f81-a44a-bb24194c4989.png)
-
-Features are as follows:
-
-Rotary:
-  - Default:  Volume Up/Down
-  - Shift:    Mouse Wheel Down/Up
-  - Ctrl:     Page Down/Up
-
-Top/Default Layer:
-  - Print Screen -> Print Screen (Left of rotary)
-  - Delete -> Home (Under Rotary)
-  - Right Alt -> Delete (Right of Spacebar)
-  - All other keys defaults.
-
-Fn Layer:
-  - Fn + \ -> Bootloader Mode (Can also hold ESC while powering up) - If hit by mistake, just unplug and replug in.
-  - Fn + Backspace -> Insert
-  - Fn + Print  -> Pause/Break
-  - Fn + Home -> Scroll Lock (Lights up white!)
-  - Fn + Del (right of space) -> Right-Alt key.
-  - Fn + RCtrl (right of Fn) -> Menu/App key.
-  - Fn + N -> Toggle NKRO
-  - Fn + End -> Power Off Computer
-  - Fn + F12 -> Suspend Computer
-  - Fn + F11 -> Wake Computer (Necessary on MAC OS?)
-  - Fn + Page Up / Down -> Laptop Screen Brightness Up/Down
-  - Fn + F1 - F5 -> Launch Calc, My Comp (Explorer), Media Player, Mail Client, Web Browser.
-  - Fn + Up, Down, Left, Right Arrows -> Media Play, Stop, Previous, Next respectively.
-
-- RGB Information:
-  - Toggle for RGB via Fn-r (CAPS & ScrlLock still Light/Indicate)
-  - CAPS: Side Light Rainbow Indicators and Left-side RED Indicators
-  - Scroll-Lock: Fn-Home (Under Rotary) white indicator.
-  - Modifiers identified around most of the edge of keyboard / Side lights also accented (Fn-1 looks GREAT IMHO)
-  
-- RGB Modifing (all via Function key) all via wasdqerf (common gaming keys) - easy to remember.
-  - Fn + r -> Toggle RGB
-  - Fn + w,s -> Brightness Up, Down
-  - Fn + a,d -> Cycle Forward/Backward through rgb effects
-  - Fn + q   -> Increase or Decrease Saturation (use SHIFT key to lower)
-  - Fn + e   -> Increase or Decrease Hue/Color (use SHIFT key to lower)
-  - Fn + f   -> Increase or Decrease Speed (Using "F" for Fast!) (Use SHIFT for slower)
-  - Fn + ~, 0-9, - = keys (2nd row keys) -> 13 RGB different effects arranged to my liking. Fn-1 is my favorite.
-  - Fn + L -> My easter egg... "QMK rocks!"
-  
-- Known issues:
-  - The Heatmap and Matrix FrameBuffer effects (Fn - and =) are a bit buggy - F-keys light up when they shouldn't and the Caps/Scroll lights don't turn off properly when using. Just change the effect to something else to fix this. 
-    - If you find a fix for this, please let me know.
-
-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/gmmk/pro/rev1/ansi/keymaps/stickandgum/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/rules.mk
deleted file mode 100644
index 6440dc6d412..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE_ENABLE = no
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/config.h
deleted file mode 100644
index 1cc3cdf2289..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2021 a (@trwnh on Github)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#ifdef RGB_MATRIX_ENABLE
-	#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
-	#define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes
-
-	// #undef ENABLE_RGB_MATRIX_SOLID_COLOR               // BUILT IN (MAPPED!) Static single color.
-	#undef ENABLE_RGB_MATRIX_ALPHAS_MODS                // Accenting various keys on the keyboard.
-	// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN           // Top down rainbow!
-	// #undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT        // Left Right Rainbow (the top-down is better imho).
-	// #undef ENABLE_RGB_MATRIX_BREATHING                  // Built in (MAPPED!)
-	#undef ENABLE_RGB_MATRIX_BAND_SAT                   // Single hue band fading saturation scrolling left to right (with white)
-	#undef ENABLE_RGB_MATRIX_BAND_VAL                   // Single hue band fading brightness scrolling left to right (with black)
-	#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT          // Single hue 3 blade spinning pinwheel fades sat (RGB_MATRIX_CYCLE_PINWHEEL)
-	#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL          // See above
-	#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT            // See above
-	#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL            // Single hue spinning spiral fades brightness (with black)
-	#undef ENABLE_RGB_MATRIX_CYCLE_ALL                  // Full keyboard cycling through rainbow
-	// #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT           // BUILT IN (MAPPED!) Full Rainbow Left to Right
-	// #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN              // Full gradient scrolling top to bottom
-	// #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN               // Rainbow circles coming to center.
-	// #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL          // Two Rainbow circles coming to 1/3 and 2/3 points.
-	#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON     // Full gradent Chevron shapped scrolling left to right
-	// #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL             // BUILT IN (MAPPED!) - Consider disabling this - my poor eyes.
-	// #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL               // Full gradient spinning spiral around center of keyboard
-	// #undef ENABLE_RGB_MATRIX_DUAL_BEACON                // Two rainbows spinning around keyboards
-	// #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON             // Similar to above.
-	// #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS          // Enough of the spinning rainbows - we get it! :-)
-	#undef ENABLE_RGB_MATRIX_RAINDROPS                  // Jellybeans are better.
-	#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS        // Randomly changes a single key's hue and saturation - better than above.
-	#undef ENABLE_RGB_MATRIX_HUE_BREATHING              // Hue shifts up a slight ammount at the same time, then shifts back
-	#undef ENABLE_RGB_MATRIX_HUE_PENDULUM               // Hue shifts up a slight ammount in a wave to the right, then back to the left
-	#undef ENABLE_RGB_MATRIX_HUE_WAVE                   // Hue shifts up a slight ammount and then back down in a wave to the right
-	#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL              // Single hue fractal filled keys pulsing horizontally out to edges
-	#undef ENABLE_RGB_MATRIX_PIXEL_FLOW                 // Pulsing RGB flow along LED wiring with random hues
-	#undef ENABLE_RGB_MATRIX_PIXEL_RAIN                 // Randomly light keys with random hues
-	#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP             // Hot keys!
-	#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN               // The Matrix!
-	#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE      // Key hits shown in current hue - all other keys black: wide slightly better imo
-	// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE             // Key hits shown in current hue - all other keys shifted hue
-	// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE        // Hue & value pulse around a single key hit then fades value out (black otherwise)
-	#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE   // same as above but a bit too intense imo.
-	#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS       // Column and Row single color fade.
-	#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS  // Column and Row single color fade. (Multi-keys)
-	#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS       // Hue & value pulse away on the same column and row of key hit then fades
-	#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS  // Hue & value pulse away on the same column and row of multi-key hit then fades
-	// #undef ENABLE_RGB_MATRIX_SPLASH                     // Full rainbow pulses from key hit. All else black.
-	// #undef ENABLE_RGB_MATRIX_MULTISPLASH                // Full rainbow pulses from multi-keys. All else black.
-	// #undef ENABLE_RGB_MATRIX_SOLID_SPLASH               // Single color pulses from key hit. All else black. (Using solid_reactive_wide instead).
-	// #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH          // Single color pulses from muli-keys. All else black. (Using solid_reactive_wide instead).
-#endif
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c
deleted file mode 100644
index 7daa1548269..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2021 a (@trwnh on Github)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// clang-format off
-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_PSCR,          KC_MUTE,
-		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, KC_UP,   KC_END,
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-	),
-
-	[1] = LAYOUT(
-		KC_KB_POWER, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  _______,          _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
-		_______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PAUS,
-		_______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_SCRL,
-		KC_MSTP, RGB_MOD, RGB_RMOD,_______, _______, _______, NK_TOGG, _______, _______, _______, _______,                   _______, KC_PGUP, KC_APP,
-		KC_MPRV, KC_MPLY, KC_MNXT,                            QK_BOOT,                              MO(2),   _______, _______, KC_HOME, KC_PGDN, KC_END
-	),
-
-	[2] = LAYOUT(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_BTN3,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_BTN1,          _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_BTN2, KC_MS_U, _______,
-		_______, _______, _______,                            _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-	),
-
-
-};
-
-#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
-    [1] =  { ENCODER_CCW_CW(KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP) },
-    [2] =  { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
-};
-#endif
-// clang-format on
-
-// RGB led number layout, function of the key
-
-//  67, led 01   0, ESC    6, F1      12, F2      18, F3   23, F4   28, F5      34, F6   39, F7   44, F8      50, F9   56, F10   61, F11    66, F12    69, Prt       Rotary(Mute)   68, led 12
-//  70, led 02   1, ~      7, 1       13, 2       19, 3    24, 4    29, 5       35, 6    40, 7    45, 8       51, 9    57, 0     62, -_     78, (=+)   85, BackSpc   72, Home       71, led 13
-//  73, led 03   2, Tab    8, Q       14, W       20. E    25, R    30, T       36, Y    41, U    46, I       52, O    58, P     63, [{     89, ]}     93, \|        75, PgUp       74, led 14
-//  76, led 04   3, Caps   9, A       15, S       21, D    26, F    31, G       37, H    42, J    47, K       53, L    59, ;:    64, '"                96, Enter     86, PgDn       77, led 15
-//  80, led 05   4, Sh_L   10, Z      16, X       22, C    27, V    32, B       38, N    43, M    48, ,<      54, .<   60, /?               90, Sh_R   94, Up        82, End        81, led 16
-//  83, led 06   5, Ct_L   11,Win_L   17, Alt_L                     33, SPACE                     49, Alt_R   55, FN             65, Ct_R   95, Left   97, Down      79, Right      84, led 17
-//  87, led 07                                                                                                                                                                      88, led 18
-//  91, led 08
-
-#ifdef RGB_MATRIX_ENABLE
-	static void set_rgb_caps_leds_on(void);
-	static void set_rgb_scroll_leds_on(void);
-	static void set_rgb_caps_leds_off(void);
-	static void set_rgb_scroll_leds_off(void);
-
-	static void set_rgb_caps_leds_on(void) {
-		// Set alpha and capslock to red
-
-		rgb_matrix_set_color( 3, 255, 0, 0);	// Caps
-
-		rgb_matrix_set_color( 8, 255, 0, 0);	// Q
-		rgb_matrix_set_color(14, 255, 0, 0);	// W
-		rgb_matrix_set_color(20, 255, 0, 0);	// E
-		rgb_matrix_set_color(25, 255, 0, 0);	// R
-		rgb_matrix_set_color(30, 255, 0, 0);	// T
-		rgb_matrix_set_color(36, 255, 0, 0);	// Y
-		rgb_matrix_set_color(41, 255, 0, 0);	// U
-		rgb_matrix_set_color(46, 255, 0, 0);	// I
-		rgb_matrix_set_color(52, 255, 0, 0);	// O
-		rgb_matrix_set_color(58, 255, 0, 0);	// P
-
-		rgb_matrix_set_color( 9, 255, 0, 0);	// A
-		rgb_matrix_set_color(15, 255, 0, 0);	// S
-		rgb_matrix_set_color(21, 255, 0, 0);	// D
-		rgb_matrix_set_color(26, 255, 0, 0);	// F
-		rgb_matrix_set_color(31, 255, 0, 0);	// G
-		rgb_matrix_set_color(37, 255, 0, 0);	// H
-		rgb_matrix_set_color(42, 255, 0, 0);	// J
-		rgb_matrix_set_color(47, 255, 0, 0);	// K
-		rgb_matrix_set_color(53, 255, 0, 0);	// L
-
-		rgb_matrix_set_color(10, 255, 0, 0);	// Z
-		rgb_matrix_set_color(16, 255, 0, 0);	// X
-		rgb_matrix_set_color(22, 255, 0, 0);	// C
-		rgb_matrix_set_color(27, 255, 0, 0);	// V
-		rgb_matrix_set_color(32, 255, 0, 0);	// B
-		rgb_matrix_set_color(38, 255, 0, 0);	// N
-		rgb_matrix_set_color(43, 255, 0, 0);	// M
-	}
-
-	static void set_rgb_caps_leds_off(void) {
-		// Set alpha and capslock to black
-
-		rgb_matrix_set_color( 3, 0, 0, 0);	// Caps
-
-		rgb_matrix_set_color( 8, 0, 0, 0);	// Q
-		rgb_matrix_set_color(14, 0, 0, 0);	// W
-		rgb_matrix_set_color(20, 0, 0, 0);	// E
-		rgb_matrix_set_color(25, 0, 0, 0);	// R
-		rgb_matrix_set_color(30, 0, 0, 0);	// T
-		rgb_matrix_set_color(36, 0, 0, 0);	// Y
-		rgb_matrix_set_color(41, 0, 0, 0);	// U
-		rgb_matrix_set_color(46, 0, 0, 0);	// I
-		rgb_matrix_set_color(52, 0, 0, 0);	// O
-		rgb_matrix_set_color(58, 0, 0, 0);	// P
-
-		rgb_matrix_set_color( 9, 0, 0, 0);	// A
-		rgb_matrix_set_color(15, 0, 0, 0);	// S
-		rgb_matrix_set_color(21, 0, 0, 0);	// D
-		rgb_matrix_set_color(26, 0, 0, 0);	// F
-		rgb_matrix_set_color(31, 0, 0, 0);	// G
-		rgb_matrix_set_color(37, 0, 0, 0);	// H
-		rgb_matrix_set_color(42, 0, 0, 0);	// J
-		rgb_matrix_set_color(47, 0, 0, 0);	// K
-		rgb_matrix_set_color(53, 0, 0, 0);	// L
-
-		rgb_matrix_set_color(10, 0, 0, 0);	// Z
-		rgb_matrix_set_color(16, 0, 0, 0);	// X
-		rgb_matrix_set_color(22, 0, 0, 0);	// C
-		rgb_matrix_set_color(27, 0, 0, 0);	// V
-		rgb_matrix_set_color(32, 0, 0, 0);	// B
-		rgb_matrix_set_color(38, 0, 0, 0);	// N
-		rgb_matrix_set_color(43, 0, 0, 0);	// M
-	}
-
-	static void set_rgb_scroll_leds_on(void) {
-		rgb_matrix_set_color(72, 255, 255, 255); // Under Rotary (HOME)
-	}
-
-	static void set_rgb_scroll_leds_off(void) {
-		rgb_matrix_set_color(72, 0, 0, 0); // Under Rotary (HOME)
-	}
-
-	bool rgb_matrix_indicators_user(void) {
-		// Left side rainbow
-		rgb_matrix_set_color(67, 255,   0,   0);	// Left LED 01
-		rgb_matrix_set_color(70, 255, 127,   0);	// Left LED 02
-		rgb_matrix_set_color(73, 255, 255,   0);	// Left LED 03
-		rgb_matrix_set_color(76,   0, 255,   0);	// Left LED 04
-		rgb_matrix_set_color(80,   0,   0, 255);	// Left LED 05
-		rgb_matrix_set_color(83,  46,  43,  95);	// Left LED 06
-		rgb_matrix_set_color(87, 139,   0, 255);	// Left LED 07
-		rgb_matrix_set_color(91, 255, 255, 255);	// Left LED 08
-
-		// Right side rainbow
-		rgb_matrix_set_color(68, 255,   0,   0);	// Right LED 12
-		rgb_matrix_set_color(71, 255, 127,   0);	// Right LED 13
-		rgb_matrix_set_color(74, 255, 255,   0);	// Right LED 14
-		rgb_matrix_set_color(77,   0, 255,   0);	// Right LED 15
-		rgb_matrix_set_color(81,   0,   0, 255);	// Right LED 16
-		rgb_matrix_set_color(84,  46,  43,  95);	// Right LED 17
-		rgb_matrix_set_color(88, 139,   0, 255);	// Right LED 18
-		rgb_matrix_set_color(92, 255, 255, 255);	// Right LED 19
-
-		if (host_keyboard_led_state().caps_lock) {
-			set_rgb_caps_leds_on();
-		} else {
-			if (rgb_matrix_get_flags() == LED_FLAG_NONE){
-			set_rgb_caps_leds_off();
-			}
-		}
-		if (host_keyboard_led_state().scroll_lock) {
-			set_rgb_scroll_leds_on();
-		} else {
-			if (rgb_matrix_get_flags() == LED_FLAG_NONE){
-			set_rgb_scroll_leds_off();
-			}
-		}
-    return false;
-	}
-
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/readme.md
deleted file mode 100644
index 12be0cdcc36..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/readme.md
+++ /dev/null
@@ -1,91 +0,0 @@
-### features
-
-- via enable
-- rgb matrix reactive and animation modes enabled
-- disable rgb when usb is suspended
-- mouse control
-	- fn+ralt+arrow keys to move
-	- fn+ralt+enter = left click
-	- fn+ralt+rshift = right click
-	- fn+ralt+rotary = scroll up/down (click for middle click)
-- fn+n = toggle n key rollover
-
-### changes
-
-- fn+space to reset (instead of fn+backslash)
-- fn+del = ins
-- fn+pgup = pause/break (brightness up on macos)
-- fn+pgdn = scroll lock (brightness down on macos)
-- fn+end = app menu
-- lower left mod key cluster = media controls
-	- fn+lctrl = prev
-	- fn+lsuper = play/pause
-	- fn+lalt = next
-	- fn+lshift = stop
-- function keys = 2nd row function keys
-	- fn+f1 = f13
-	- fn+f2 = f14
-	- ...
-	- fn+f12 = f24
-- fn + arrow keys used for nav
-	- fn + left = home
-	- fn + right = end
-	- fn + up = page up
-	- fn + down = page down
-- rgb control moved to qwer/asdf + z/x + t
-	- fn+q/a = hue increase/decrease
-	- fn+w/s = saturation increase/decrease
-	- fn+e/d = value increase/decrease
-	- fn+r/f = speed increase/decrease
-	- fn+z = rgb mode forward
-	- fn+x = rgb mode reverse
-	- fn+t = rgb toggle
-
-### rgb effects enabled
-
-sidebars are constant rainbow. alpha and capslock turn red when caps is on
-
-- solid color
-- rainbow gradient
-	- gradient up down
-	- gradient left right
-- breathing
-- rainbow cycles
-	- cycle all
-	- cycle left right
-	- cycle up down
-	- cycle out in
-	- cycle out in dual
-	- cycle pinwheel
-	- cycle spiral
-	- rainbow beacon
-	- rainbow pinwheels
-- reactive
-	- splash
-	- multisplash
-	- solid splash
-	- solid multisplash
-
-### layers
-
-source code for keyboard layout editor images here: https://gist.github.com/trwnh/94e48f132c49043373918df29409ab48
-
-#### layer 0
-
-![](https://i.imgur.com/P1hSkZT.png)
-
-#### layer 1
-
-![](https://i.imgur.com/qqiObxP.png)
-
-#### layer 2
-
-![](https://i.imgur.com/W0i1D0C.png)
-
-### misc
-
-i am taking suggestions for possible improvements to this keymap; you may contact me via the following
-
-- email: mailto:a@trwnh.com
-- chat: xmpp:a@trwnh.com
-- fediverse: https://mastodon.social/@trwnh
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/rules.mk
deleted file mode 100644
index 4253f570f0b..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h
index 00e66fa38c3..7229d0b2e79 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h
@@ -19,7 +19,6 @@
 
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 32
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 //enable RGB Matrix Effects for Vial
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
deleted file mode 100644
index 13c58d0392b..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt             Rotary
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-//      Ct_L     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       Win_R
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    [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_PSCR,          KC_MEDIA_PLAY_PAUSE,
-        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_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_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_RGUI,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS,
-        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,          KC_INS,
-        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_PSCR,   KC_SCRL,   KC_PAUS,  KC_TRNS, KC_TRNS,  KC_TRNS,          KC_HOME,
-        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_END,
-        KC_TRNS,             KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_MPRV,   KC_MNXT,  QK_BOOT,           KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS,   KC_TRNS,                                    KC_TRNS,                                    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_HOME, KC_TRNS, KC_END
-    ),
-
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_MS_WH_RIGHT);
-    } else {
-      tap_code(KC_MS_WH_LEFT);
-    }
-    //return true; //set to return false to counteract enabled encoder in pro.c
-    return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
deleted file mode 100644
index 5343f1b6491..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    //      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Del           Rotary(Mute)
-    //      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Home
-    //      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
-    //      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
-    //      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-    //      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-    [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_PGUP,
-        MO(1),   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_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,            _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,           _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,           _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP,  _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, KC_HOME, KC_PGDN,  KC_END
-    ),
-
-    [2] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
-    ),
-
-    [3] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
-    ),
-};
-// clang-format on
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    //return true; //set to return false to counteract enabled encoder in pro.c
-    return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json
deleted file mode 100644
index bdb9e95264e..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "version": 1,
-  "notes": "",
-  "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-  "keyboard": "gmmk/pro",
-  "keymap": "willwm",
-  "layout": "LAYOUT",
-  "layers": [
-    [
-      "KC_ESC",
-      "KC_F1",
-      "KC_F2",
-      "KC_F3",
-      "KC_F4",
-      "KC_F5",
-      "KC_F6",
-      "KC_F7",
-      "KC_F8",
-      "KC_F9",
-      "KC_F10",
-      "KC_F11",
-      "KC_F12",
-      "KC_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_PGUP",
-      "MO(1)",
-      "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_RCTL",
-      "KC_LEFT",
-      "KC_DOWN",
-      "KC_RGHT"
-    ],
-    [
-      "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_INS",
-      "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_PSCR",
-      "KC_CAPS",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "QK_BOOT",
-      "KC_NO",
-      "KC_TRNS",
-      "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",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_PGUP",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_TRNS",
-      "KC_NO",
-      "KC_HOME",
-      "KC_PGDN",
-      "KC_END"
-    ]
-  ],
-  "author": ""
-}
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/readme.md
deleted file mode 100644
index 1c169faac6e..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<img width="567" alt="layer0" src="https://user-images.githubusercontent.com/303042/118893170-da3e3280-b8b6-11eb-9459-f6c339c59bde.png">
-<img width="566" alt="layer1" src="https://user-images.githubusercontent.com/303042/118893191-e0341380-b8b6-11eb-8641-a4fdeeb7cbb2.png">
-
-# willwm GMMK Pro Layout 
-
-Based on [gmmk/pro/keymaps/default](../default/keymap.c), with [VIA support](./rules.mk)
-
-Layer 0
-
-* Delete between F12 and rotary encoder (replaces PrtSc)
-* Home below rotary encoder (replaces Del)
-* MO(1) in default location and Caps Lock location
-
-Layer 1
-
-* Tab -> Caps Lock
-* Del -> Insert
-* Home -> PrtSc
-* Left Arrow -> Home
-* Right Arrow -> End
-* Up Arrow -> PgUp
-* Down Arrow -> PgDn
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/rules.mk
deleted file mode 100644
index 511b50e19ce..00000000000
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-UNICODE_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev1/iso/config.h b/keyboards/gmmk/pro/rev1/iso/config.h
deleted file mode 100644
index 8ed1802803e..00000000000
--- a/keyboards/gmmk/pro/rev1/iso/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Jasper Chan
- *
- * 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 DRIVER_1_LED_TOTAL 66
-#define DRIVER_2_LED_TOTAL 33
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 492a5cf486d..90f66171aa4 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -8,9 +8,6 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
-    "rgb_matrix": {
-        "driver": "aw20216s"
-    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
         "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev1/iso/iso.c b/keyboards/gmmk/pro/rev1/iso/iso.c
index 9744447587f..932c6a1f494 100644
--- a/keyboards/gmmk/pro/rev1/iso/iso.c
+++ b/keyboards/gmmk/pro/rev1/iso/iso.c
@@ -137,107 +137,107 @@ led_config_t g_led_config = {{
     2, 4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
 }};
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
-    {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
-    {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
-    {0, CS10_SW1, CS11_SW1, CS12_SW1},     //  3, Caps, k21
-    {0, CS13_SW1, CS14_SW1, CS15_SW1},     //  4, Sh_L, k00
-    {0, CS16_SW1, CS17_SW1, CS18_SW1},     //  5, Ct_L, k06
-    {0, CS1_SW2, CS2_SW2, CS3_SW2},        //  6, F1, k26
-    {0, CS4_SW2, CS5_SW2, CS6_SW2},        //  7, 1, k17
-    {0, CS7_SW2, CS8_SW2, CS9_SW2},        //  8, Q, k10
-    {0, CS10_SW2, CS11_SW2, CS12_SW2},     //  9, A, k12
-    {0, CS13_SW2, CS14_SW2, CS15_SW2},     //  10, Z, k14
-    {0, CS16_SW2, CS17_SW2, CS18_SW2},     //  11, Win_L, k90
-    {0, CS1_SW3, CS2_SW3, CS3_SW3},        //  12, F2, k36
-    {0, CS4_SW3, CS5_SW3, CS6_SW3},        //  13, 2, k27
-    {0, CS7_SW3, CS8_SW3, CS9_SW3},        //  14, W, k20
-    {0, CS10_SW3, CS11_SW3, CS12_SW3},     //  15, S, k22
-    {0, CS13_SW3, CS14_SW3, CS15_SW3},     //  16, X, k24
-    {0, CS16_SW3, CS17_SW3, CS18_SW3},     //  17, Alt_L, k93
-    {0, CS1_SW4, CS2_SW4, CS3_SW4},        //  18, F3, k31
-    {0, CS4_SW4, CS5_SW4, CS6_SW4},        //  19, 3, k37
-    {0, CS7_SW4, CS8_SW4, CS9_SW4},        //  20, E, k30
-    {0, CS10_SW4, CS11_SW4, CS12_SW4},     //  21, D, k32
-    {0, CS13_SW4, CS14_SW4, CS15_SW4},     //  22, C, k34
-    {0, CS1_SW5, CS2_SW5, CS3_SW5},        //  23, F4, k33
-    {0, CS4_SW5, CS5_SW5, CS6_SW5},        //  24, 4, k47
-    {0, CS7_SW5, CS8_SW5, CS9_SW5},        //  25, R, k40
-    {0, CS10_SW5, CS11_SW5, CS12_SW5},     //  26, F, k42
-    {0, CS13_SW5, CS14_SW5, CS15_SW5},     //  27, V, k44
-    {0, CS1_SW6, CS2_SW6, CS3_SW6},        //  28, F5, k07
-    {0, CS4_SW6, CS5_SW6, CS6_SW6},        //  29, 5, k46
-    {0, CS7_SW6, CS8_SW6, CS9_SW6},        //  30, T, k41
-    {0, CS10_SW6, CS11_SW6, CS12_SW6},     //  31, G, k43
-    {0, CS13_SW6, CS14_SW6, CS15_SW6},     //  32, B, k45
-    {0, CS16_SW6, CS17_SW6, CS18_SW6},     //  33, SPACE, k94
-    {0, CS1_SW7, CS2_SW7, CS3_SW7},        //  34, F6, k63
-    {0, CS4_SW7, CS5_SW7, CS6_SW7},        //  35, 6, k56
-    {0, CS7_SW7, CS8_SW7, CS9_SW7},        //  36, Y, k51
-    {0, CS10_SW7, CS11_SW7, CS12_SW7},     //  37, H, k53
-    {0, CS13_SW7, CS14_SW7, CS15_SW7},     //  38, N, k55
-    {0, CS1_SW8, CS2_SW8, CS3_SW8},        //  39, F7, k71
-    {0, CS4_SW8, CS5_SW8, CS6_SW8},        //  40, 7, k57
-    {0, CS7_SW8, CS8_SW8, CS9_SW8},        //  41, U, k50
-    {0, CS10_SW8, CS11_SW8, CS12_SW8},     //  42, J, k52
-    {0, CS13_SW8, CS14_SW8, CS15_SW8},     //  43, M, k54
-    {0, CS1_SW9, CS2_SW9, CS3_SW9},        //  44, F8, k76
-    {0, CS4_SW9, CS5_SW9, CS6_SW9},        //  45, 8, k67
-    {0, CS7_SW9, CS8_SW9, CS9_SW9},        //  46, I, k60
-    {0, CS10_SW9, CS11_SW9, CS12_SW9},     //  47, K, k62
-    {0, CS13_SW9, CS14_SW9, CS15_SW9},     //  48, ,, k64
-    {0, CS16_SW9, CS17_SW9, CS18_SW9},     //  49, Alt_R, k95
-    {0, CS1_SW10, CS2_SW10, CS3_SW10},     //  50, F9, ka6
-    {0, CS4_SW10, CS5_SW10, CS6_SW10},     //  51, 9, k77
-    {0, CS7_SW10, CS8_SW10, CS9_SW10},     //  52, O, k70
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  53, L, k72
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  54, ., k74
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  55, FN, k92
-    {0, CS1_SW11, CS2_SW11, CS3_SW11},     //  56, F10, ka7
-    {0, CS4_SW11, CS5_SW11, CS6_SW11},     //  57, 0, k87
-    {0, CS7_SW11, CS8_SW11, CS9_SW11},     //  58, P, k80
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  59, ;, k82
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  60, ?, k85
-    {0, CS1_SW12, CS2_SW12, CS3_SW12},     //  61, F11, ka3
-    {0, CS4_SW12, CS5_SW12, CS6_SW12},     //  62, -, k86
-    {0, CS7_SW12, CS8_SW12, CS9_SW12},     //  63, [, k81
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  64, ", k83
-    {0, CS16_SW12, CS17_SW12, CS18_SW12},  //  65, Ct_R, k04
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},        //  0, ESC, k13
+    {0, SW1_CS4, SW1_CS5, SW1_CS6},        //  1, ~, k16
+    {0, SW1_CS7, SW1_CS8, SW1_CS9},        //  2, Tab, k11
+    {0, SW1_CS10, SW1_CS11, SW1_CS12},     //  3, Caps, k21
+    {0, SW1_CS13, SW1_CS14, SW1_CS15},     //  4, Sh_L, k00
+    {0, SW1_CS16, SW1_CS17, SW1_CS18},     //  5, Ct_L, k06
+    {0, SW2_CS1, SW2_CS2, SW2_CS3},        //  6, F1, k26
+    {0, SW2_CS4, SW2_CS5, SW2_CS6},        //  7, 1, k17
+    {0, SW2_CS7, SW2_CS8, SW2_CS9},        //  8, Q, k10
+    {0, SW2_CS10, SW2_CS11, SW2_CS12},     //  9, A, k12
+    {0, SW2_CS13, SW2_CS14, SW2_CS15},     //  10, Z, k14
+    {0, SW2_CS16, SW2_CS17, SW2_CS18},     //  11, Win_L, k90
+    {0, SW3_CS1, SW3_CS2, SW3_CS3},        //  12, F2, k36
+    {0, SW3_CS4, SW3_CS5, SW3_CS6},        //  13, 2, k27
+    {0, SW3_CS7, SW3_CS8, SW3_CS9},        //  14, W, k20
+    {0, SW3_CS10, SW3_CS11, SW3_CS12},     //  15, S, k22
+    {0, SW3_CS13, SW3_CS14, SW3_CS15},     //  16, X, k24
+    {0, SW3_CS16, SW3_CS17, SW3_CS18},     //  17, Alt_L, k93
+    {0, SW4_CS1, SW4_CS2, SW4_CS3},        //  18, F3, k31
+    {0, SW4_CS4, SW4_CS5, SW4_CS6},        //  19, 3, k37
+    {0, SW4_CS7, SW4_CS8, SW4_CS9},        //  20, E, k30
+    {0, SW4_CS10, SW4_CS11, SW4_CS12},     //  21, D, k32
+    {0, SW4_CS13, SW4_CS14, SW4_CS15},     //  22, C, k34
+    {0, SW5_CS1, SW5_CS2, SW5_CS3},        //  23, F4, k33
+    {0, SW5_CS4, SW5_CS5, SW5_CS6},        //  24, 4, k47
+    {0, SW5_CS7, SW5_CS8, SW5_CS9},        //  25, R, k40
+    {0, SW5_CS10, SW5_CS11, SW5_CS12},     //  26, F, k42
+    {0, SW5_CS13, SW5_CS14, SW5_CS15},     //  27, V, k44
+    {0, SW6_CS1, SW6_CS2, SW6_CS3},        //  28, F5, k07
+    {0, SW6_CS4, SW6_CS5, SW6_CS6},        //  29, 5, k46
+    {0, SW6_CS7, SW6_CS8, SW6_CS9},        //  30, T, k41
+    {0, SW6_CS10, SW6_CS11, SW6_CS12},     //  31, G, k43
+    {0, SW6_CS13, SW6_CS14, SW6_CS15},     //  32, B, k45
+    {0, SW6_CS16, SW6_CS17, SW6_CS18},     //  33, SPACE, k94
+    {0, SW7_CS1, SW7_CS2, SW7_CS3},        //  34, F6, k63
+    {0, SW7_CS4, SW7_CS5, SW7_CS6},        //  35, 6, k56
+    {0, SW7_CS7, SW7_CS8, SW7_CS9},        //  36, Y, k51
+    {0, SW7_CS10, SW7_CS11, SW7_CS12},     //  37, H, k53
+    {0, SW7_CS13, SW7_CS14, SW7_CS15},     //  38, N, k55
+    {0, SW8_CS1, SW8_CS2, SW8_CS3},        //  39, F7, k71
+    {0, SW8_CS4, SW8_CS5, SW8_CS6},        //  40, 7, k57
+    {0, SW8_CS7, SW8_CS8, SW8_CS9},        //  41, U, k50
+    {0, SW8_CS10, SW8_CS11, SW8_CS12},     //  42, J, k52
+    {0, SW8_CS13, SW8_CS14, SW8_CS15},     //  43, M, k54
+    {0, SW9_CS1, SW9_CS2, SW9_CS3},        //  44, F8, k76
+    {0, SW9_CS4, SW9_CS5, SW9_CS6},        //  45, 8, k67
+    {0, SW9_CS7, SW9_CS8, SW9_CS9},        //  46, I, k60
+    {0, SW9_CS10, SW9_CS11, SW9_CS12},     //  47, K, k62
+    {0, SW9_CS13, SW9_CS14, SW9_CS15},     //  48, ,, k64
+    {0, SW9_CS16, SW9_CS17, SW9_CS18},     //  49, Alt_R, k95
+    {0, SW10_CS1, SW10_CS2, SW10_CS3},     //  50, F9, ka6
+    {0, SW10_CS4, SW10_CS5, SW10_CS6},     //  51, 9, k77
+    {0, SW10_CS7, SW10_CS8, SW10_CS9},     //  52, O, k70
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  53, L, k72
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  54, ., k74
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  55, FN, k92
+    {0, SW11_CS1, SW11_CS2, SW11_CS3},     //  56, F10, ka7
+    {0, SW11_CS4, SW11_CS5, SW11_CS6},     //  57, 0, k87
+    {0, SW11_CS7, SW11_CS8, SW11_CS9},     //  58, P, k80
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  59, ;, k82
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  60, ?, k85
+    {0, SW12_CS1, SW12_CS2, SW12_CS3},     //  61, F11, ka3
+    {0, SW12_CS4, SW12_CS5, SW12_CS6},     //  62, -, k86
+    {0, SW12_CS7, SW12_CS8, SW12_CS9},     //  63, [, k81
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  64, ", k83
+    {0, SW12_CS16, SW12_CS17, SW12_CS18},  //  65, Ct_R, k04
 
-    {1, CS1_SW1, CS2_SW1, CS3_SW1},     //  66, F12, ka5
-    {1, CS4_SW1, CS5_SW1, CS6_SW1},     //  67, \, k23
-    {1, CS13_SW1, CS14_SW1, CS15_SW1},  //  68, LED, l01
-    {1, CS16_SW1, CS17_SW1, CS18_SW1},  //  69, LED, l11
-    {1, CS4_SW2, CS5_SW2, CS6_SW2},     //  70, Prt, k97
-    {1, CS13_SW2, CS14_SW2, CS15_SW2},  //  71, LED, l02
-    {1, CS16_SW2, CS17_SW2, CS18_SW2},  //  72, LED, l12
-    {1, CS4_SW3, CS5_SW3, CS6_SW3},     //  73, Del, k65
-    {1, CS13_SW3, CS14_SW3, CS15_SW3},  //  74, LED, l03
-    {1, CS16_SW3, CS17_SW3, CS18_SW3},  //  75, LED, l13
-    {1, CS4_SW4, CS5_SW4, CS6_SW4},     //  76, PgUp, k15
-    {1, CS13_SW4, CS14_SW4, CS15_SW4},  //  77, LED, l04
-    {1, CS16_SW4, CS17_SW4, CS18_SW4},  //  78, LED, l14
-    {1, CS1_SW5, CS2_SW5, CS3_SW5},     //  79, =, k66
-    {1, CS10_SW5, CS11_SW5, CS12_SW5},  //  80, Right, k05
-    {1, CS13_SW5, CS14_SW5, CS15_SW5},  //  81, LED, l05
-    {1, CS16_SW5, CS17_SW5, CS18_SW5},  //  82, LED, l15
-    {1, CS4_SW6, CS5_SW6, CS6_SW6},     //  83, End, k75
-    {1, CS13_SW6, CS14_SW6, CS15_SW6},  //  84, LED, l06
-    {1, CS16_SW6, CS17_SW6, CS18_SW6},  //  85, LED, l16
-    {1, CS1_SW7, CS2_SW7, CS3_SW7},     //  86, BSpc, ka1
-    {1, CS4_SW7, CS5_SW7, CS6_SW7},     //  87, PgDn, k25
-    {1, CS13_SW7, CS14_SW7, CS15_SW7},  //  88, LED, l07
-    {1, CS16_SW7, CS17_SW7, CS18_SW7},  //  89, LED, l17
-    {1, CS1_SW8, CS2_SW8, CS3_SW8},     //  90, ], k61
-    {1, CS4_SW8, CS5_SW8, CS6_SW8},     //  91, Sh_R, k91
-    {1, CS13_SW8, CS14_SW8, CS15_SW8},  //  92, LED, l08
-    {1, CS16_SW8, CS17_SW8, CS18_SW8},  //  93, LED, l18
-    {1, CS4_SW9, CS5_SW9, CS6_SW9},     //  94, Up, k35
-    {1, CS1_SW10, CS2_SW10, CS3_SW10},  //  95, #, k84
-    {1, CS4_SW10, CS5_SW10, CS6_SW10},  //  96, Left, k03
-    {1, CS1_SW11, CS2_SW11, CS3_SW11},  //  97, Enter, ka4
-    {1, CS4_SW11, CS5_SW11, CS6_SW11},  //  98, Down, k73
+    {1, SW1_CS1, SW1_CS2, SW1_CS3},     //  66, F12, ka5
+    {1, SW1_CS4, SW1_CS5, SW1_CS6},     //  67, \, k23
+    {1, SW1_CS13, SW1_CS14, SW1_CS15},  //  68, LED, l01
+    {1, SW1_CS16, SW1_CS17, SW1_CS18},  //  69, LED, l11
+    {1, SW2_CS4, SW2_CS5, SW2_CS6},     //  70, Prt, k97
+    {1, SW2_CS13, SW2_CS14, SW2_CS15},  //  71, LED, l02
+    {1, SW2_CS16, SW2_CS17, SW2_CS18},  //  72, LED, l12
+    {1, SW3_CS4, SW3_CS5, SW3_CS6},     //  73, Del, k65
+    {1, SW3_CS13, SW3_CS14, SW3_CS15},  //  74, LED, l03
+    {1, SW3_CS16, SW3_CS17, SW3_CS18},  //  75, LED, l13
+    {1, SW4_CS4, SW4_CS5, SW4_CS6},     //  76, PgUp, k15
+    {1, SW4_CS13, SW4_CS14, SW4_CS15},  //  77, LED, l04
+    {1, SW4_CS16, SW4_CS17, SW4_CS18},  //  78, LED, l14
+    {1, SW5_CS1, SW5_CS2, SW5_CS3},     //  79, =, k66
+    {1, SW5_CS10, SW5_CS11, SW5_CS12},  //  80, Right, k05
+    {1, SW5_CS13, SW5_CS14, SW5_CS15},  //  81, LED, l05
+    {1, SW5_CS16, SW5_CS17, SW5_CS18},  //  82, LED, l15
+    {1, SW6_CS4, SW6_CS5, SW6_CS6},     //  83, End, k75
+    {1, SW6_CS13, SW6_CS14, SW6_CS15},  //  84, LED, l06
+    {1, SW6_CS16, SW6_CS17, SW6_CS18},  //  85, LED, l16
+    {1, SW7_CS1, SW7_CS2, SW7_CS3},     //  86, BSpc, ka1
+    {1, SW7_CS4, SW7_CS5, SW7_CS6},     //  87, PgDn, k25
+    {1, SW7_CS13, SW7_CS14, SW7_CS15},  //  88, LED, l07
+    {1, SW7_CS16, SW7_CS17, SW7_CS18},  //  89, LED, l17
+    {1, SW8_CS1, SW8_CS2, SW8_CS3},     //  90, ], k61
+    {1, SW8_CS4, SW8_CS5, SW8_CS6},     //  91, Sh_R, k91
+    {1, SW8_CS13, SW8_CS14, SW8_CS15},  //  92, LED, l08
+    {1, SW8_CS16, SW8_CS17, SW8_CS18},  //  93, LED, l18
+    {1, SW9_CS4, SW9_CS5, SW9_CS6},     //  94, Up, k35
+    {1, SW10_CS1, SW10_CS2, SW10_CS3},  //  95, #, k84
+    {1, SW10_CS4, SW10_CS5, SW10_CS6},  //  96, Left, k03
+    {1, SW11_CS1, SW11_CS2, SW11_CS3},  //  97, Enter, ka4
+    {1, SW11_CS4, SW11_CS5, SW11_CS6},  //  98, Down, k73
 };
 // clang-format on
 #endif
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
deleted file mode 100644
index 971e0821a32..00000000000
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]                          PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "        #        Enter             PgDn
-//      Sh_L     /        Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backspace. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-    //
-    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
-    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
-    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
-    [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_HOME,          KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_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, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PSCR,          _______,
-        _______, RGB_TOG, RGB_M_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-        _______, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_INS, _______,          _______,
-        _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
-    ),
-
-
-};
-// clang-format on
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    static uint32_t cycle_led_timer = 0;
-    static uint8_t  current_value   = 0;
-    static uint8_t  left_side_leds[8] = {68, 71, 74, 77, 81, 84, 88, 92};
-    static uint8_t  right_side_leds[8] = {69, 72, 75, 78, 82, 85, 89, 93};
-
-    if (host_keyboard_led_state().caps_lock) {
-        if (timer_elapsed32(cycle_led_timer) > 500) {
-            current_value = current_value == 0 ? 255 : 0;
-            cycle_led_timer = timer_read32();
-        }
-    HSV tempHSV = {.h = 0, .s = 255, .v = current_value};
-    RGB tempRGB = hsv_to_rgb(tempHSV);
-    for (uint8_t i = 0; i < ARRAY_SIZE(left_side_leds); i++) {
-        rgb_matrix_set_color(left_side_leds[i], tempRGB.r, tempRGB.g, tempRGB.b);
-        rgb_matrix_set_color(right_side_leds[i], tempRGB.r, tempRGB.g, tempRGB.b);
-        }
-    }
-
-    static uint8_t l2_functions[26] = {6, 7, 8, 12, 13, 14, 15, 16, 18, 23, 28, 34, 38, 39, 44, 50, 56, 61, 66, 70, 80, 86, 94, 95, 96, 98};
-    switch(get_highest_layer(layer_state)){  // special handling per layer
-       case 2:  //layer one
-         break;
-       case 1:
-         for (uint8_t i = 0; i < ARRAY_SIZE(l2_functions); i++) {
-             RGB_MATRIX_INDICATOR_SET_COLOR(l2_functions[i], 255, 0, 0);
-         }
-         break;
-       default:
-         break;
-       break;
-    }
-    return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md
deleted file mode 100644
index da66c447ada..00000000000
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# chofstede GMMK Pro layout
-
-- Added Print-Screen to FN+POS1
-- Added Insert to FN+#
-- The LED bars on the left and right side of the keyboard blink red when CAPS Lock is enabled
-- All mapped keys light up red when FN is being pressed
-
-
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c
deleted file mode 100644
index 694fd80e197..00000000000
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]                          PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "        #        Enter             PgDn
-//      Sh_L     /        Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backspace. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-    //
-    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
-    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
-    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
-    [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_MPLY,
-        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_PGUP,
-        MO(1),   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, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP,          KC_MNXT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-        _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-        _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, RGB_VAD, RGB_TOG, RGB_VAI, RGB_HUI, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
-    ),
-
-
-};
-// clang-format on
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/readme.md b/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/readme.md
deleted file mode 100644
index 4239e0dcb8d..00000000000
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Falke Carlsen keymap for GMMK PRO ISO
-Based on the default keymap, inheriting rotary encoder and LED configs without modification.
-
-## Changes:
-- Fixes layer 1 of top-row to correspond to 'Keychron ISO Q1 & K2 Dye-Sub PBT Nordic' printed legend multimedia keys.
-- Adds early 2010s Ducky layer 1 mouse-emulation to WASD with left+right click and scroll in the 2x4 cluster.
-- Remaps default keymaps LED-handling to 2nd-row due to addition of mouse-emulation.
-- Swap layer 0 rotary encoder click to play/pause, and layer 1 click to next.
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h
index 5948625784a..0ff5fc0a1e6 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h
@@ -19,7 +19,6 @@
 
 #define DRIVER_1_LED_TOTAL 66
 #define DRIVER_2_LED_TOTAL 33
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 //enable RGB Matrix Effects for Vial
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.c b/keyboards/gmmk/pro/rev2/ansi/ansi.c
index 322e94c938c..a3f957ef0a2 100644
--- a/keyboards/gmmk/pro/rev2/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev2/ansi/ansi.c
@@ -136,106 +136,106 @@ led_config_t g_led_config = {{
     4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
 }};
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
-    {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
-    {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
-    {0, CS10_SW1, CS11_SW1, CS12_SW1},     //  3, Caps, k21
-    {0, CS13_SW1, CS14_SW1, CS15_SW1},     //  4, Sh_L, k00
-    {0, CS16_SW1, CS17_SW1, CS18_SW1},     //  5, Ct_L, k06
-    {0, CS1_SW2, CS2_SW2, CS3_SW2},        //  6, F1, k26
-    {0, CS4_SW2, CS5_SW2, CS6_SW2},        //  7, 1, k17
-    {0, CS7_SW2, CS8_SW2, CS9_SW2},        //  8, Q, k10
-    {0, CS10_SW2, CS11_SW2, CS12_SW2},     //  9, A, k12
-    {0, CS13_SW2, CS14_SW2, CS15_SW2},     //  10, Z, k14
-    {0, CS16_SW2, CS17_SW2, CS18_SW2},     //  11, Win_L, k90
-    {0, CS1_SW3, CS2_SW3, CS3_SW3},        //  12, F2, k36
-    {0, CS4_SW3, CS5_SW3, CS6_SW3},        //  13, 2, k27
-    {0, CS7_SW3, CS8_SW3, CS9_SW3},        //  14, W, k20
-    {0, CS10_SW3, CS11_SW3, CS12_SW3},     //  15, S, k22
-    {0, CS13_SW3, CS14_SW3, CS15_SW3},     //  16, X, k24
-    {0, CS16_SW3, CS17_SW3, CS18_SW3},     //  17, Alt_L, k93
-    {0, CS1_SW4, CS2_SW4, CS3_SW4},        //  18, F3, k31
-    {0, CS4_SW4, CS5_SW4, CS6_SW4},        //  19, 3, k37
-    {0, CS7_SW4, CS8_SW4, CS9_SW4},        //  20, E, k30
-    {0, CS10_SW4, CS11_SW4, CS12_SW4},     //  21, D, k32
-    {0, CS13_SW4, CS14_SW4, CS15_SW4},     //  22, C, k34
-    {0, CS1_SW5, CS2_SW5, CS3_SW5},        //  23, F4, k33
-    {0, CS4_SW5, CS5_SW5, CS6_SW5},        //  24, 4, k47
-    {0, CS7_SW5, CS8_SW5, CS9_SW5},        //  25, R, k40
-    {0, CS10_SW5, CS11_SW5, CS12_SW5},     //  26, F, k42
-    {0, CS13_SW5, CS14_SW5, CS15_SW5},     //  27, V, k44
-    {0, CS1_SW6, CS2_SW6, CS3_SW6},        //  28, F5, k07
-    {0, CS4_SW6, CS5_SW6, CS6_SW6},        //  29, 5, k46
-    {0, CS7_SW6, CS8_SW6, CS9_SW6},        //  30, T, k41
-    {0, CS10_SW6, CS11_SW6, CS12_SW6},     //  31, G, k43
-    {0, CS13_SW6, CS14_SW6, CS15_SW6},     //  32, B, k45
-    {0, CS16_SW6, CS17_SW6, CS18_SW6},     //  33, SPACE, k94
-    {0, CS1_SW7, CS2_SW7, CS3_SW7},        //  34, F6, k63
-    {0, CS4_SW7, CS5_SW7, CS6_SW7},        //  35, 6, k56
-    {0, CS7_SW7, CS8_SW7, CS9_SW7},        //  36, Y, k51
-    {0, CS10_SW7, CS11_SW7, CS12_SW7},     //  37, H, k53
-    {0, CS13_SW7, CS14_SW7, CS15_SW7},     //  38, N, k55
-    {0, CS1_SW8, CS2_SW8, CS3_SW8},        //  39, F7, k71
-    {0, CS4_SW8, CS5_SW8, CS6_SW8},        //  40, 7, k57
-    {0, CS7_SW8, CS8_SW8, CS9_SW8},        //  41, U, k50
-    {0, CS10_SW8, CS11_SW8, CS12_SW8},     //  42, J, k52
-    {0, CS13_SW8, CS14_SW8, CS15_SW8},     //  43, M, k54
-    {0, CS1_SW9, CS2_SW9, CS3_SW9},        //  44, F8, k76
-    {0, CS4_SW9, CS5_SW9, CS6_SW9},        //  45, 8, k67
-    {0, CS7_SW9, CS8_SW9, CS9_SW9},        //  46, I, k60
-    {0, CS10_SW9, CS11_SW9, CS12_SW9},     //  47, K, k62
-    {0, CS13_SW9, CS14_SW9, CS15_SW9},     //  48, ,, k64
-    {0, CS16_SW9, CS17_SW9, CS18_SW9},     //  49, Alt_R, k95
-    {0, CS1_SW10, CS2_SW10, CS3_SW10},     //  50, F9, ka6
-    {0, CS4_SW10, CS5_SW10, CS6_SW10},     //  51, 9, k77
-    {0, CS7_SW10, CS8_SW10, CS9_SW10},     //  52, O, k70
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  53, L, k72
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  54, ., k74
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  55, FN, k92
-    {0, CS1_SW11, CS2_SW11, CS3_SW11},     //  56, F10, ka7
-    {0, CS4_SW11, CS5_SW11, CS6_SW11},     //  57, 0, k87
-    {0, CS7_SW11, CS8_SW11, CS9_SW11},     //  58, P, k80
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  59, ;, k82
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  60, ?, k85
-    {0, CS1_SW12, CS2_SW12, CS3_SW12},     //  61, F11, ka3
-    {0, CS4_SW12, CS5_SW12, CS6_SW12},     //  62, -, k86
-    {0, CS7_SW12, CS8_SW12, CS9_SW12},     //  63, [, k81
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  64, ", k83
-    {0, CS16_SW12, CS17_SW12, CS18_SW12},  //  65, Ct_R, k04
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},        //  0, ESC, k13
+    {0, SW1_CS4, SW1_CS5, SW1_CS6},        //  1, ~, k16
+    {0, SW1_CS7, SW1_CS8, SW1_CS9},        //  2, Tab, k11
+    {0, SW1_CS10, SW1_CS11, SW1_CS12},     //  3, Caps, k21
+    {0, SW1_CS13, SW1_CS14, SW1_CS15},     //  4, Sh_L, k00
+    {0, SW1_CS16, SW1_CS17, SW1_CS18},     //  5, Ct_L, k06
+    {0, SW2_CS1, SW2_CS2, SW2_CS3},        //  6, F1, k26
+    {0, SW2_CS4, SW2_CS5, SW2_CS6},        //  7, 1, k17
+    {0, SW2_CS7, SW2_CS8, SW2_CS9},        //  8, Q, k10
+    {0, SW2_CS10, SW2_CS11, SW2_CS12},     //  9, A, k12
+    {0, SW2_CS13, SW2_CS14, SW2_CS15},     //  10, Z, k14
+    {0, SW2_CS16, SW2_CS17, SW2_CS18},     //  11, Win_L, k90
+    {0, SW3_CS1, SW3_CS2, SW3_CS3},        //  12, F2, k36
+    {0, SW3_CS4, SW3_CS5, SW3_CS6},        //  13, 2, k27
+    {0, SW3_CS7, SW3_CS8, SW3_CS9},        //  14, W, k20
+    {0, SW3_CS10, SW3_CS11, SW3_CS12},     //  15, S, k22
+    {0, SW3_CS13, SW3_CS14, SW3_CS15},     //  16, X, k24
+    {0, SW3_CS16, SW3_CS17, SW3_CS18},     //  17, Alt_L, k93
+    {0, SW4_CS1, SW4_CS2, SW4_CS3},        //  18, F3, k31
+    {0, SW4_CS4, SW4_CS5, SW4_CS6},        //  19, 3, k37
+    {0, SW4_CS7, SW4_CS8, SW4_CS9},        //  20, E, k30
+    {0, SW4_CS10, SW4_CS11, SW4_CS12},     //  21, D, k32
+    {0, SW4_CS13, SW4_CS14, SW4_CS15},     //  22, C, k34
+    {0, SW5_CS1, SW5_CS2, SW5_CS3},        //  23, F4, k33
+    {0, SW5_CS4, SW5_CS5, SW5_CS6},        //  24, 4, k47
+    {0, SW5_CS7, SW5_CS8, SW5_CS9},        //  25, R, k40
+    {0, SW5_CS10, SW5_CS11, SW5_CS12},     //  26, F, k42
+    {0, SW5_CS13, SW5_CS14, SW5_CS15},     //  27, V, k44
+    {0, SW6_CS1, SW6_CS2, SW6_CS3},        //  28, F5, k07
+    {0, SW6_CS4, SW6_CS5, SW6_CS6},        //  29, 5, k46
+    {0, SW6_CS7, SW6_CS8, SW6_CS9},        //  30, T, k41
+    {0, SW6_CS10, SW6_CS11, SW6_CS12},     //  31, G, k43
+    {0, SW6_CS13, SW6_CS14, SW6_CS15},     //  32, B, k45
+    {0, SW6_CS16, SW6_CS17, SW6_CS18},     //  33, SPACE, k94
+    {0, SW7_CS1, SW7_CS2, SW7_CS3},        //  34, F6, k63
+    {0, SW7_CS4, SW7_CS5, SW7_CS6},        //  35, 6, k56
+    {0, SW7_CS7, SW7_CS8, SW7_CS9},        //  36, Y, k51
+    {0, SW7_CS10, SW7_CS11, SW7_CS12},     //  37, H, k53
+    {0, SW7_CS13, SW7_CS14, SW7_CS15},     //  38, N, k55
+    {0, SW8_CS1, SW8_CS2, SW8_CS3},        //  39, F7, k71
+    {0, SW8_CS4, SW8_CS5, SW8_CS6},        //  40, 7, k57
+    {0, SW8_CS7, SW8_CS8, SW8_CS9},        //  41, U, k50
+    {0, SW8_CS10, SW8_CS11, SW8_CS12},     //  42, J, k52
+    {0, SW8_CS13, SW8_CS14, SW8_CS15},     //  43, M, k54
+    {0, SW9_CS1, SW9_CS2, SW9_CS3},        //  44, F8, k76
+    {0, SW9_CS4, SW9_CS5, SW9_CS6},        //  45, 8, k67
+    {0, SW9_CS7, SW9_CS8, SW9_CS9},        //  46, I, k60
+    {0, SW9_CS10, SW9_CS11, SW9_CS12},     //  47, K, k62
+    {0, SW9_CS13, SW9_CS14, SW9_CS15},     //  48, ,, k64
+    {0, SW9_CS16, SW9_CS17, SW9_CS18},     //  49, Alt_R, k95
+    {0, SW10_CS1, SW10_CS2, SW10_CS3},     //  50, F9, ka6
+    {0, SW10_CS4, SW10_CS5, SW10_CS6},     //  51, 9, k77
+    {0, SW10_CS7, SW10_CS8, SW10_CS9},     //  52, O, k70
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  53, L, k72
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  54, ., k74
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  55, FN, k92
+    {0, SW11_CS1, SW11_CS2, SW11_CS3},     //  56, F10, ka7
+    {0, SW11_CS4, SW11_CS5, SW11_CS6},     //  57, 0, k87
+    {0, SW11_CS7, SW11_CS8, SW11_CS9},     //  58, P, k80
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  59, ;, k82
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  60, ?, k85
+    {0, SW12_CS1, SW12_CS2, SW12_CS3},     //  61, F11, ka3
+    {0, SW12_CS4, SW12_CS5, SW12_CS6},     //  62, -, k86
+    {0, SW12_CS7, SW12_CS8, SW12_CS9},     //  63, [, k81
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  64, ", k83
+    {0, SW12_CS16, SW12_CS17, SW12_CS18},  //  65, Ct_R, k04
 
-    {1, CS1_SW1, CS2_SW1, CS3_SW1},     //  66, F12, ka5
-    {1, CS13_SW1, CS14_SW1, CS15_SW1},  //  67, LED, l01
-    {1, CS16_SW1, CS17_SW1, CS18_SW1},  //  68, LED, l11
-    {1, CS4_SW2, CS5_SW2, CS6_SW2},     //  69, Prt, k97
-    {1, CS13_SW2, CS14_SW2, CS15_SW2},  //  70, LED, l02
-    {1, CS16_SW2, CS17_SW2, CS18_SW2},  //  71, LED, l12
-    {1, CS4_SW3, CS5_SW3, CS6_SW3},     //  72, Del, k65
-    {1, CS13_SW3, CS14_SW3, CS15_SW3},  //  73, LED, l03
-    {1, CS16_SW3, CS17_SW3, CS18_SW3},  //  74, LED, l13
-    {1, CS4_SW4, CS5_SW4, CS6_SW4},     //  75, PgUp, k15
-    {1, CS13_SW4, CS14_SW4, CS15_SW4},  //  76, LED, l04
-    {1, CS16_SW4, CS17_SW4, CS18_SW4},  //  77, LED, l14
-    {1, CS1_SW5, CS2_SW5, CS3_SW5},     //  78, =, k66
-    {1, CS10_SW5, CS11_SW5, CS12_SW5},  //  79, Right, k05
-    {1, CS13_SW5, CS14_SW5, CS15_SW5},  //  80, LED, l05
-    {1, CS16_SW5, CS17_SW5, CS18_SW5},  //  81, LED, l15
-    {1, CS4_SW6, CS5_SW6, CS6_SW6},     //  82, End, k75
-    {1, CS13_SW6, CS14_SW6, CS15_SW6},  //  83, LED, l06
-    {1, CS16_SW6, CS17_SW6, CS18_SW6},  //  84, LED, l16
-    {1, CS1_SW7, CS2_SW7, CS3_SW7},     //  85, BSpc, ka1
-    {1, CS4_SW7, CS5_SW7, CS6_SW7},     //  86, PgDn, k25
-    {1, CS13_SW7, CS14_SW7, CS15_SW7},  //  87, LED, l07
-    {1, CS16_SW7, CS17_SW7, CS18_SW7},  //  88, LED, l17
-    {1, CS1_SW8, CS2_SW8, CS3_SW8},     //  89, ], k61
-    {1, CS4_SW8, CS5_SW8, CS6_SW8},     //  90, Sh_R, k91
-    {1, CS13_SW8, CS14_SW8, CS15_SW8},  //  91, LED, l08
-    {1, CS16_SW8, CS17_SW8, CS18_SW8},  //  92, LED, l18
-    {1, CS1_SW9, CS2_SW9, CS3_SW9},     //  93, \, ka2
-    {1, CS4_SW9, CS5_SW9, CS6_SW9},     //  94, Up, k35
-    {1, CS4_SW10, CS5_SW10, CS6_SW10},  //  95, Left, k03
-    {1, CS1_SW11, CS2_SW11, CS3_SW11},  //  96, Enter, ka4
-    {1, CS4_SW11, CS5_SW11, CS6_SW11},  //  97, Down, k73
+    {1, SW1_CS1, SW1_CS2, SW1_CS3},     //  66, F12, ka5
+    {1, SW1_CS13, SW1_CS14, SW1_CS15},  //  67, LED, l01
+    {1, SW1_CS16, SW1_CS17, SW1_CS18},  //  68, LED, l11
+    {1, SW2_CS4, SW2_CS5, SW2_CS6},     //  69, Prt, k97
+    {1, SW2_CS13, SW2_CS14, SW2_CS15},  //  70, LED, l02
+    {1, SW2_CS16, SW2_CS17, SW2_CS18},  //  71, LED, l12
+    {1, SW3_CS4, SW3_CS5, SW3_CS6},     //  72, Del, k65
+    {1, SW3_CS13, SW3_CS14, SW3_CS15},  //  73, LED, l03
+    {1, SW3_CS16, SW3_CS17, SW3_CS18},  //  74, LED, l13
+    {1, SW4_CS4, SW4_CS5, SW4_CS6},     //  75, PgUp, k15
+    {1, SW4_CS13, SW4_CS14, SW4_CS15},  //  76, LED, l04
+    {1, SW4_CS16, SW4_CS17, SW4_CS18},  //  77, LED, l14
+    {1, SW5_CS1, SW5_CS2, SW5_CS3},     //  78, =, k66
+    {1, SW5_CS10, SW5_CS11, SW5_CS12},  //  79, Right, k05
+    {1, SW5_CS13, SW5_CS14, SW5_CS15},  //  80, LED, l05
+    {1, SW5_CS16, SW5_CS17, SW5_CS18},  //  81, LED, l15
+    {1, SW6_CS4, SW6_CS5, SW6_CS6},     //  82, End, k75
+    {1, SW6_CS13, SW6_CS14, SW6_CS15},  //  83, LED, l06
+    {1, SW6_CS16, SW6_CS17, SW6_CS18},  //  84, LED, l16
+    {1, SW7_CS1, SW7_CS2, SW7_CS3},     //  85, BSpc, ka1
+    {1, SW7_CS4, SW7_CS5, SW7_CS6},     //  86, PgDn, k25
+    {1, SW7_CS13, SW7_CS14, SW7_CS15},  //  87, LED, l07
+    {1, SW7_CS16, SW7_CS17, SW7_CS18},  //  88, LED, l17
+    {1, SW8_CS1, SW8_CS2, SW8_CS3},     //  89, ], k61
+    {1, SW8_CS4, SW8_CS5, SW8_CS6},     //  90, Sh_R, k91
+    {1, SW8_CS13, SW8_CS14, SW8_CS15},  //  91, LED, l08
+    {1, SW8_CS16, SW8_CS17, SW8_CS18},  //  92, LED, l18
+    {1, SW9_CS1, SW9_CS2, SW9_CS3},     //  93, \, ka2
+    {1, SW9_CS4, SW9_CS5, SW9_CS6},     //  94, Up, k35
+    {1, SW10_CS4, SW10_CS5, SW10_CS6},  //  95, Left, k03
+    {1, SW11_CS1, SW11_CS2, SW11_CS3},  //  96, Enter, ka4
+    {1, SW11_CS4, SW11_CS5, SW11_CS6},  //  97, Down, k73
 };
 // clang-format on
 #endif
diff --git a/keyboards/gmmk/pro/rev2/ansi/config.h b/keyboards/gmmk/pro/rev2/ansi/config.h
deleted file mode 100644
index cc489b9c637..00000000000
--- a/keyboards/gmmk/pro/rev2/ansi/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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 DRIVER_1_LED_TOTAL 66
-#define DRIVER_2_LED_TOTAL 32
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
index cd1fd31bf00..56150443166 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -8,9 +8,6 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
-    "rgb_matrix": {
-        "driver": "aw20216s"
-    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
         "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev2/iso/config.h b/keyboards/gmmk/pro/rev2/iso/config.h
deleted file mode 100644
index 9a115d9194c..00000000000
--- a/keyboards/gmmk/pro/rev2/iso/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.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 DRIVER_1_LED_TOTAL 66
-#define DRIVER_2_LED_TOTAL 33
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index 62333566164..3b7c0ca5445 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -8,9 +8,6 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
-    "rgb_matrix": {
-        "driver": "aw20216s"
-    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
         "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev2/iso/iso.c b/keyboards/gmmk/pro/rev2/iso/iso.c
index 3a5b21c0149..7a34f2432fe 100644
--- a/keyboards/gmmk/pro/rev2/iso/iso.c
+++ b/keyboards/gmmk/pro/rev2/iso/iso.c
@@ -137,107 +137,107 @@ led_config_t g_led_config = {{
     2, 4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
 }};
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
-    {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
-    {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
-    {0, CS10_SW1, CS11_SW1, CS12_SW1},     //  3, Caps, k21
-    {0, CS13_SW1, CS14_SW1, CS15_SW1},     //  4, Sh_L, k00
-    {0, CS16_SW1, CS17_SW1, CS18_SW1},     //  5, Ct_L, k06
-    {0, CS1_SW2, CS2_SW2, CS3_SW2},        //  6, F1, k26
-    {0, CS4_SW2, CS5_SW2, CS6_SW2},        //  7, 1, k17
-    {0, CS7_SW2, CS8_SW2, CS9_SW2},        //  8, Q, k10
-    {0, CS10_SW2, CS11_SW2, CS12_SW2},     //  9, A, k12
-    {0, CS13_SW2, CS14_SW2, CS15_SW2},     //  10, Z, k14
-    {0, CS16_SW2, CS17_SW2, CS18_SW2},     //  11, Win_L, k90
-    {0, CS1_SW3, CS2_SW3, CS3_SW3},        //  12, F2, k36
-    {0, CS4_SW3, CS5_SW3, CS6_SW3},        //  13, 2, k27
-    {0, CS7_SW3, CS8_SW3, CS9_SW3},        //  14, W, k20
-    {0, CS10_SW3, CS11_SW3, CS12_SW3},     //  15, S, k22
-    {0, CS13_SW3, CS14_SW3, CS15_SW3},     //  16, X, k24
-    {0, CS16_SW3, CS17_SW3, CS18_SW3},     //  17, Alt_L, k93
-    {0, CS1_SW4, CS2_SW4, CS3_SW4},        //  18, F3, k31
-    {0, CS4_SW4, CS5_SW4, CS6_SW4},        //  19, 3, k37
-    {0, CS7_SW4, CS8_SW4, CS9_SW4},        //  20, E, k30
-    {0, CS10_SW4, CS11_SW4, CS12_SW4},     //  21, D, k32
-    {0, CS13_SW4, CS14_SW4, CS15_SW4},     //  22, C, k34
-    {0, CS1_SW5, CS2_SW5, CS3_SW5},        //  23, F4, k33
-    {0, CS4_SW5, CS5_SW5, CS6_SW5},        //  24, 4, k47
-    {0, CS7_SW5, CS8_SW5, CS9_SW5},        //  25, R, k40
-    {0, CS10_SW5, CS11_SW5, CS12_SW5},     //  26, F, k42
-    {0, CS13_SW5, CS14_SW5, CS15_SW5},     //  27, V, k44
-    {0, CS1_SW6, CS2_SW6, CS3_SW6},        //  28, F5, k07
-    {0, CS4_SW6, CS5_SW6, CS6_SW6},        //  29, 5, k46
-    {0, CS7_SW6, CS8_SW6, CS9_SW6},        //  30, T, k41
-    {0, CS10_SW6, CS11_SW6, CS12_SW6},     //  31, G, k43
-    {0, CS13_SW6, CS14_SW6, CS15_SW6},     //  32, B, k45
-    {0, CS16_SW6, CS17_SW6, CS18_SW6},     //  33, SPACE, k94
-    {0, CS1_SW7, CS2_SW7, CS3_SW7},        //  34, F6, k63
-    {0, CS4_SW7, CS5_SW7, CS6_SW7},        //  35, 6, k56
-    {0, CS7_SW7, CS8_SW7, CS9_SW7},        //  36, Y, k51
-    {0, CS10_SW7, CS11_SW7, CS12_SW7},     //  37, H, k53
-    {0, CS13_SW7, CS14_SW7, CS15_SW7},     //  38, N, k55
-    {0, CS1_SW8, CS2_SW8, CS3_SW8},        //  39, F7, k71
-    {0, CS4_SW8, CS5_SW8, CS6_SW8},        //  40, 7, k57
-    {0, CS7_SW8, CS8_SW8, CS9_SW8},        //  41, U, k50
-    {0, CS10_SW8, CS11_SW8, CS12_SW8},     //  42, J, k52
-    {0, CS13_SW8, CS14_SW8, CS15_SW8},     //  43, M, k54
-    {0, CS1_SW9, CS2_SW9, CS3_SW9},        //  44, F8, k76
-    {0, CS4_SW9, CS5_SW9, CS6_SW9},        //  45, 8, k67
-    {0, CS7_SW9, CS8_SW9, CS9_SW9},        //  46, I, k60
-    {0, CS10_SW9, CS11_SW9, CS12_SW9},     //  47, K, k62
-    {0, CS13_SW9, CS14_SW9, CS15_SW9},     //  48, ,, k64
-    {0, CS16_SW9, CS17_SW9, CS18_SW9},     //  49, Alt_R, k95
-    {0, CS1_SW10, CS2_SW10, CS3_SW10},     //  50, F9, ka6
-    {0, CS4_SW10, CS5_SW10, CS6_SW10},     //  51, 9, k77
-    {0, CS7_SW10, CS8_SW10, CS9_SW10},     //  52, O, k70
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  53, L, k72
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  54, ., k74
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  55, FN, k92
-    {0, CS1_SW11, CS2_SW11, CS3_SW11},     //  56, F10, ka7
-    {0, CS4_SW11, CS5_SW11, CS6_SW11},     //  57, 0, k87
-    {0, CS7_SW11, CS8_SW11, CS9_SW11},     //  58, P, k80
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  59, ;, k82
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  60, ?, k85
-    {0, CS1_SW12, CS2_SW12, CS3_SW12},     //  61, F11, ka3
-    {0, CS4_SW12, CS5_SW12, CS6_SW12},     //  62, -, k86
-    {0, CS7_SW12, CS8_SW12, CS9_SW12},     //  63, [, k81
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  64, ", k83
-    {0, CS16_SW12, CS17_SW12, CS18_SW12},  //  65, Ct_R, k04
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},        //  0, ESC, k13
+    {0, SW1_CS4, SW1_CS5, SW1_CS6},        //  1, ~, k16
+    {0, SW1_CS7, SW1_CS8, SW1_CS9},        //  2, Tab, k11
+    {0, SW1_CS10, SW1_CS11, SW1_CS12},     //  3, Caps, k21
+    {0, SW1_CS13, SW1_CS14, SW1_CS15},     //  4, Sh_L, k00
+    {0, SW1_CS16, SW1_CS17, SW1_CS18},     //  5, Ct_L, k06
+    {0, SW2_CS1, SW2_CS2, SW2_CS3},        //  6, F1, k26
+    {0, SW2_CS4, SW2_CS5, SW2_CS6},        //  7, 1, k17
+    {0, SW2_CS7, SW2_CS8, SW2_CS9},        //  8, Q, k10
+    {0, SW2_CS10, SW2_CS11, SW2_CS12},     //  9, A, k12
+    {0, SW2_CS13, SW2_CS14, SW2_CS15},     //  10, Z, k14
+    {0, SW2_CS16, SW2_CS17, SW2_CS18},     //  11, Win_L, k90
+    {0, SW3_CS1, SW3_CS2, SW3_CS3},        //  12, F2, k36
+    {0, SW3_CS4, SW3_CS5, SW3_CS6},        //  13, 2, k27
+    {0, SW3_CS7, SW3_CS8, SW3_CS9},        //  14, W, k20
+    {0, SW3_CS10, SW3_CS11, SW3_CS12},     //  15, S, k22
+    {0, SW3_CS13, SW3_CS14, SW3_CS15},     //  16, X, k24
+    {0, SW3_CS16, SW3_CS17, SW3_CS18},     //  17, Alt_L, k93
+    {0, SW4_CS1, SW4_CS2, SW4_CS3},        //  18, F3, k31
+    {0, SW4_CS4, SW4_CS5, SW4_CS6},        //  19, 3, k37
+    {0, SW4_CS7, SW4_CS8, SW4_CS9},        //  20, E, k30
+    {0, SW4_CS10, SW4_CS11, SW4_CS12},     //  21, D, k32
+    {0, SW4_CS13, SW4_CS14, SW4_CS15},     //  22, C, k34
+    {0, SW5_CS1, SW5_CS2, SW5_CS3},        //  23, F4, k33
+    {0, SW5_CS4, SW5_CS5, SW5_CS6},        //  24, 4, k47
+    {0, SW5_CS7, SW5_CS8, SW5_CS9},        //  25, R, k40
+    {0, SW5_CS10, SW5_CS11, SW5_CS12},     //  26, F, k42
+    {0, SW5_CS13, SW5_CS14, SW5_CS15},     //  27, V, k44
+    {0, SW6_CS1, SW6_CS2, SW6_CS3},        //  28, F5, k07
+    {0, SW6_CS4, SW6_CS5, SW6_CS6},        //  29, 5, k46
+    {0, SW6_CS7, SW6_CS8, SW6_CS9},        //  30, T, k41
+    {0, SW6_CS10, SW6_CS11, SW6_CS12},     //  31, G, k43
+    {0, SW6_CS13, SW6_CS14, SW6_CS15},     //  32, B, k45
+    {0, SW6_CS16, SW6_CS17, SW6_CS18},     //  33, SPACE, k94
+    {0, SW7_CS1, SW7_CS2, SW7_CS3},        //  34, F6, k63
+    {0, SW7_CS4, SW7_CS5, SW7_CS6},        //  35, 6, k56
+    {0, SW7_CS7, SW7_CS8, SW7_CS9},        //  36, Y, k51
+    {0, SW7_CS10, SW7_CS11, SW7_CS12},     //  37, H, k53
+    {0, SW7_CS13, SW7_CS14, SW7_CS15},     //  38, N, k55
+    {0, SW8_CS1, SW8_CS2, SW8_CS3},        //  39, F7, k71
+    {0, SW8_CS4, SW8_CS5, SW8_CS6},        //  40, 7, k57
+    {0, SW8_CS7, SW8_CS8, SW8_CS9},        //  41, U, k50
+    {0, SW8_CS10, SW8_CS11, SW8_CS12},     //  42, J, k52
+    {0, SW8_CS13, SW8_CS14, SW8_CS15},     //  43, M, k54
+    {0, SW9_CS1, SW9_CS2, SW9_CS3},        //  44, F8, k76
+    {0, SW9_CS4, SW9_CS5, SW9_CS6},        //  45, 8, k67
+    {0, SW9_CS7, SW9_CS8, SW9_CS9},        //  46, I, k60
+    {0, SW9_CS10, SW9_CS11, SW9_CS12},     //  47, K, k62
+    {0, SW9_CS13, SW9_CS14, SW9_CS15},     //  48, ,, k64
+    {0, SW9_CS16, SW9_CS17, SW9_CS18},     //  49, Alt_R, k95
+    {0, SW10_CS1, SW10_CS2, SW10_CS3},     //  50, F9, ka6
+    {0, SW10_CS4, SW10_CS5, SW10_CS6},     //  51, 9, k77
+    {0, SW10_CS7, SW10_CS8, SW10_CS9},     //  52, O, k70
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  53, L, k72
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  54, ., k74
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  55, FN, k92
+    {0, SW11_CS1, SW11_CS2, SW11_CS3},     //  56, F10, ka7
+    {0, SW11_CS4, SW11_CS5, SW11_CS6},     //  57, 0, k87
+    {0, SW11_CS7, SW11_CS8, SW11_CS9},     //  58, P, k80
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  59, ;, k82
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  60, ?, k85
+    {0, SW12_CS1, SW12_CS2, SW12_CS3},     //  61, F11, ka3
+    {0, SW12_CS4, SW12_CS5, SW12_CS6},     //  62, -, k86
+    {0, SW12_CS7, SW12_CS8, SW12_CS9},     //  63, [, k81
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  64, ", k83
+    {0, SW12_CS16, SW12_CS17, SW12_CS18},  //  65, Ct_R, k04
 
-    {1, CS1_SW1, CS2_SW1, CS3_SW1},     //  66, F12, ka5
-    {1, CS4_SW1, CS5_SW1, CS6_SW1},     //  67, \, k23
-    {1, CS13_SW1, CS14_SW1, CS15_SW1},  //  68, LED, l01
-    {1, CS16_SW1, CS17_SW1, CS18_SW1},  //  69, LED, l11
-    {1, CS4_SW2, CS5_SW2, CS6_SW2},     //  70, Prt, k97
-    {1, CS13_SW2, CS14_SW2, CS15_SW2},  //  71, LED, l02
-    {1, CS16_SW2, CS17_SW2, CS18_SW2},  //  72, LED, l12
-    {1, CS4_SW3, CS5_SW3, CS6_SW3},     //  73, Del, k65
-    {1, CS13_SW3, CS14_SW3, CS15_SW3},  //  74, LED, l03
-    {1, CS16_SW3, CS17_SW3, CS18_SW3},  //  75, LED, l13
-    {1, CS4_SW4, CS5_SW4, CS6_SW4},     //  76, PgUp, k15
-    {1, CS13_SW4, CS14_SW4, CS15_SW4},  //  77, LED, l04
-    {1, CS16_SW4, CS17_SW4, CS18_SW4},  //  78, LED, l14
-    {1, CS1_SW5, CS2_SW5, CS3_SW5},     //  79, =, k66
-    {1, CS10_SW5, CS11_SW5, CS12_SW5},  //  80, Right, k05
-    {1, CS13_SW5, CS14_SW5, CS15_SW5},  //  81, LED, l05
-    {1, CS16_SW5, CS17_SW5, CS18_SW5},  //  82, LED, l15
-    {1, CS4_SW6, CS5_SW6, CS6_SW6},     //  83, End, k75
-    {1, CS13_SW6, CS14_SW6, CS15_SW6},  //  84, LED, l06
-    {1, CS16_SW6, CS17_SW6, CS18_SW6},  //  85, LED, l16
-    {1, CS1_SW7, CS2_SW7, CS3_SW7},     //  86, BSpc, ka1
-    {1, CS4_SW7, CS5_SW7, CS6_SW7},     //  87, PgDn, k25
-    {1, CS13_SW7, CS14_SW7, CS15_SW7},  //  88, LED, l07
-    {1, CS16_SW7, CS17_SW7, CS18_SW7},  //  89, LED, l17
-    {1, CS1_SW8, CS2_SW8, CS3_SW8},     //  90, ], k61
-    {1, CS4_SW8, CS5_SW8, CS6_SW8},     //  91, Sh_R, k91
-    {1, CS13_SW8, CS14_SW8, CS15_SW8},  //  92, LED, l08
-    {1, CS16_SW8, CS17_SW8, CS18_SW8},  //  93, LED, l18
-    {1, CS4_SW9, CS5_SW9, CS6_SW9},     //  94, Up, k35
-    {1, CS1_SW10, CS2_SW10, CS3_SW10},  //  95, #, k84
-    {1, CS4_SW10, CS5_SW10, CS6_SW10},  //  96, Left, k03
-    {1, CS1_SW11, CS2_SW11, CS3_SW11},  //  97, Enter, ka4
-    {1, CS4_SW11, CS5_SW11, CS6_SW11},  //  98, Down, k73
+    {1, SW1_CS1, SW1_CS2, SW1_CS3},     //  66, F12, ka5
+    {1, SW1_CS4, SW1_CS5, SW1_CS6},     //  67, \, k23
+    {1, SW1_CS13, SW1_CS14, SW1_CS15},  //  68, LED, l01
+    {1, SW1_CS16, SW1_CS17, SW1_CS18},  //  69, LED, l11
+    {1, SW2_CS4, SW2_CS5, SW2_CS6},     //  70, Prt, k97
+    {1, SW2_CS13, SW2_CS14, SW2_CS15},  //  71, LED, l02
+    {1, SW2_CS16, SW2_CS17, SW2_CS18},  //  72, LED, l12
+    {1, SW3_CS4, SW3_CS5, SW3_CS6},     //  73, Del, k65
+    {1, SW3_CS13, SW3_CS14, SW3_CS15},  //  74, LED, l03
+    {1, SW3_CS16, SW3_CS17, SW3_CS18},  //  75, LED, l13
+    {1, SW4_CS4, SW4_CS5, SW4_CS6},     //  76, PgUp, k15
+    {1, SW4_CS13, SW4_CS14, SW4_CS15},  //  77, LED, l04
+    {1, SW4_CS16, SW4_CS17, SW4_CS18},  //  78, LED, l14
+    {1, SW5_CS1, SW5_CS2, SW5_CS3},     //  79, =, k66
+    {1, SW5_CS10, SW5_CS11, SW5_CS12},  //  80, Right, k05
+    {1, SW5_CS13, SW5_CS14, SW5_CS15},  //  81, LED, l05
+    {1, SW5_CS16, SW5_CS17, SW5_CS18},  //  82, LED, l15
+    {1, SW6_CS4, SW6_CS5, SW6_CS6},     //  83, End, k75
+    {1, SW6_CS13, SW6_CS14, SW6_CS15},  //  84, LED, l06
+    {1, SW6_CS16, SW6_CS17, SW6_CS18},  //  85, LED, l16
+    {1, SW7_CS1, SW7_CS2, SW7_CS3},     //  86, BSpc, ka1
+    {1, SW7_CS4, SW7_CS5, SW7_CS6},     //  87, PgDn, k25
+    {1, SW7_CS13, SW7_CS14, SW7_CS15},  //  88, LED, l07
+    {1, SW7_CS16, SW7_CS17, SW7_CS18},  //  89, LED, l17
+    {1, SW8_CS1, SW8_CS2, SW8_CS3},     //  90, ], k61
+    {1, SW8_CS4, SW8_CS5, SW8_CS6},     //  91, Sh_R, k91
+    {1, SW8_CS13, SW8_CS14, SW8_CS15},  //  92, LED, l08
+    {1, SW8_CS16, SW8_CS17, SW8_CS18},  //  93, LED, l18
+    {1, SW9_CS4, SW9_CS5, SW9_CS6},     //  94, Up, k35
+    {1, SW10_CS1, SW10_CS2, SW10_CS3},  //  95, #, k84
+    {1, SW10_CS4, SW10_CS5, SW10_CS6},  //  96, Left, k03
+    {1, SW11_CS1, SW11_CS2, SW11_CS3},  //  97, Enter, ka4
+    {1, SW11_CS4, SW11_CS5, SW11_CS6},  //  98, Down, k73
 };
 // clang-format on
 #endif
diff --git a/keyboards/gon/nerd60/keymaps/mauin/keymap.c b/keyboards/gon/nerd60/keymaps/mauin/keymap.c
deleted file mode 100644
index e410d6c0cfe..00000000000
--- a/keyboards/gon/nerd60/keymaps/mauin/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright 2017 Marvin Ramin (@Mauin)
- *
- * 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
-
-// Keymap layers
-enum layer_names {
-    _BS, // Base Layer
-    _FN, // Function Layer
-    _SY  // System Layer
-};
-
-enum custom_keycodes {
-    ESC_GRV = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Layer 0: Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  = |  BSp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
-   * |-----------------------------------------------------------|
-   * |Funct |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter   |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|    Shift |
-   * |-----------------------------------------------------------'
-   * |  Ctl|Alt|Gui  |         Space         |Gui  |Alt| F2| Ctl |
-   * `-----------------------------------------------------------'
-   */
-  [_BS] = LAYOUT_all(
-      ESC_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,  XXXXXXX, 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,
-      MO(1),   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, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXXXX,
-      KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RALT, MO(2),   KC_RCTL
-  ),
-
-  /* Layer 1: Function Layer
-   * ,-----------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11| F12|  Del |
-   * |-----------------------------------------------------------|
-   * |     |Prv|Ply|Nxt|   |   |Pg^|Hme|Up |End|   |Br-|Br+|     |
-   * |-----------------------------------------------------------|
-   * |Hold  |Mte|Vl-|Vl+|   |   |Pgv|Lft|Dwn|Rgt|   |   |        |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------'
-   * |     |   |     |                       |     |   |   |     |
-   * `-----------------------------------------------------------'
-   */
-  [_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,  XXXXXXX, KC_DEL,
-      XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_UP,   KC_END,  XXXXXXX, KC_SCRL, KC_PAUS, XXXXXXX,
-      KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* Layer 2: System Layer
-   * ,-----------------------------------------------------------.
-   * |Reset|   |   |   |   |   |   |   |   |   |   |    |   |    |
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |
-   * |-----------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------'
-   * |     |   |     |                       |     |   |   |     |
-   * `-----------------------------------------------------------'
-   */
-  [_SY] = LAYOUT_all(
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint8_t esc_grv_mask = get_mods() & MOD_BIT(KC_LGUI);
-    switch (keycode) {
-        case ESC_GRV:
-            if (esc_grv_mask) {
-                if (record->event.pressed) {
-                    register_code16(G(KC_GRV));
-                } else {
-                    unregister_code16(G(KC_GRV));
-                }
-            } else {
-                if (record->event.pressed) {
-                    register_code(KC_ESC);
-                } else {
-                    unregister_code(KC_ESC);
-                }
-            }
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/gon/nerd60/keymaps/mauin/readme.md b/keyboards/gon/nerd60/keymaps/mauin/readme.md
deleted file mode 100644
index 63be7c3923f..00000000000
--- a/keyboards/gon/nerd60/keymaps/mauin/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Mauin's keymap for the GON NerD
-
-This layout is based on a Pok3r style layout with a standard base layer.
-
-Function layers provide access to navigation and media keys.
diff --git a/keyboards/gon/nerd60/keymaps/mauin/rules.mk b/keyboards/gon/nerd60/keymaps/mauin/rules.mk
deleted file mode 100644
index 4bf836c22a2..00000000000
--- a/keyboards/gon/nerd60/keymaps/mauin/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 = yes        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/config.h b/keyboards/gon/nerdtkl/keymaps/gam3cat/config.h
deleted file mode 100644
index 334beb0ac2b..00000000000
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-//Force NKRO to be enabled.
-#define FORCE_NKRO
-
-//GRAVE_ESC override for CTRL+SHIFT+ESC Windows task manager shortcut.
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-//Delay matrix scan for tap dance, reduce to activate modifier keys faster.
-//#define TAPPING_TERM 200
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
deleted file mode 100644
index 065cf3eddc0..00000000000
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
+++ /dev/null
@@ -1,261 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layers {
-    _BL = 0,    // Base Layer
-    _WL,        // Workman Layer
-    _NL,        // Norman Layer
-    _DL,        // Dvorak Layer
-    _CL,        // Base Layer
-    _FL,        // Function Layer
-    _AL,        // Adjust Layer
-};
-
-enum custom_keycodes {
-    QMK_REV = SAFE_RANGE,
-    KC_WEB,
-    KC_SP4,
-    DYNAMIC_MACRO_RANGE
-};
-
-extern backlight_config_t backlight_config;
-
-#include "dynamic_macro.h"
-#define FN_CAPS LT(_FL, KC_CAPS)
-#define KC_DMR1 DM_REC1
-#define KC_DMR2 DM_REC2
-#define KC_DMP1 DM_PLY1
-#define KC_DMP2 DM_PLY2
-#define KC_DMRS DM_RSTP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*#### _BL: Base Layer - Standard TKL QWERTY layout.
-    *    .-----------------------------------------------------------------------.
-    *    |Esc|||||F1 |F2 |F3 |F4 |||F5 |F6 |F7 |F8 |||F9 |F10|F11|F12|PSc|SLk|Pau|
-    *    |-----------------------------------------------------------|-----------|
-    *    |~  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|Hom|PgU|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|End|PgD|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Fn |   | Up|   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Ctrl |Win|Alt  |      Space                |RAlt |Fn |Ctrl |Lft|Dwn|Rgt|
-    *    *-----------------------------------------------------------------------*
-    */
-    [_BL] = LAYOUT_tkl(
-        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_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,
-        KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FL),          KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RGUI, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*#### _WL: Workman Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_WL] = LAYOUT_tkl(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_D   , KC_R   , KC_W   , KC_B   , KC_J   , KC_F   , KC_U   , KC_P   , KC_SCLN, _______, _______, _______, _______, _______, _______,
-        _______, KC_A   , KC_S   , KC_H   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_E   , KC_O   , KC_I   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_M   , KC_C   , KC_V   , KC_K   , KC_L   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _NL: Norman Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_NL] = LAYOUT_tkl(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_W   , KC_D   , KC_F   , KC_K   , KC_J   , KC_U   , KC_R   , KC_L   , KC_SCLN, _______, _______, _______, _______, _______, _______,
-        _______, KC_A   , KC_S   , KC_E   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_I   , KC_O   , KC_H   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_P   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _DL: Dvorak Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_DL] = LAYOUT_tkl(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______, _______,
-        _______, KC_QUOT, KC_COMM, KC_DOT , KC_P   , KC_Y   , KC_F   , KC_G   , KC_C   , KC_R   , KC_L   , KC_SLSH, KC_EQL , _______, _______, _______, _______,
-        _______, KC_A   , KC_O   , KC_E   , KC_U   , KC_I   , KC_D   , KC_H   , KC_T   , KC_N   , KC_S   , KC_MINS, _______, _______,
-        _______, _______, KC_SCLN, KC_Q   , KC_J   , KC_K   , KC_X   , KC_B   , KC_M   , KC_W   , KC_V   , KC_Z   , _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _CL: Colmak Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_CL] = LAYOUT_tkl(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, _______, _______, _______, _______, _______, _______,
-        _______, KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _FL: Function Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |VlM|VlD|VlU|   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |Web|   |   |   |   |   |   |   |   |   |   |   |   |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |   |   |   |   |   |   |Lft|Dwn|Up |Rgt|   |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |   |   |   |   |   |   |   |   |   |   |      |Fn |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |      SP4                  |     |Fn |     |WBk|   |WFw|
-    *    *-----------------------------------------------------------------------*
-    */
-    [_FL] = LAYOUT_tkl(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_WEB,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        MO(_AL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,          XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_MENU,                            KC_SP4,                             XXXXXXX, _______, XXXXXXX, XXXXXXX, KC_WBAK, XXXXXXX, KC_WFWD
-    ),
-    /*#### _AL: Adjust Layer - Keymap select, LED backlight, and Dynamic Macro settings.
-    *    .-----------------------------------------------------------------------.
-    *    |Rst|||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |   |MR1|MP1|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     | MS|MR2|MP2|
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |   |   |_DL|   |   |   |   |   |   |   |   |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |Fn |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |Fn |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_AL] = LAYOUT_tkl(
-        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        QMK_REV, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, BL_TOGG, BL_DOWN, BL_UP,   XXXXXXX, XXXXXXX, KC_DMR1, KC_DMP1,
-        _______, DF(_BL), DF(_WL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DMRS, KC_DMR2, KC_DMP2,
-        XXXXXXX, XXXXXXX, XXXXXXX, DF(_DL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(_CL), XXXXXXX, DF(_BL), DF(_NL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,          XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QMK_REV:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION ":" QMK_BUILDDATE);
-            }
-            return false;
-            break;
-        case KC_WEB:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LGUI("r"));
-                wait_ms(100);
-                SEND_STRING("chrome.exe\n");
-            }
-            return false;
-            break;
-        case KC_SP4:
-            if (record->event.pressed) {
-                SEND_STRING ("    ");
-            }
-            return false;
-            break;
-    }
-    // Dynamic Macros.
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    return true;
-}
-
-void custom_backlight_level(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS)
-        level = BACKLIGHT_LEVELS;
-    backlight_config.level = level;
-    backlight_config.enable = !!backlight_config.level;
-    backlight_set(backlight_config.level);
-}
-
-void matrix_init_user(void) {
-    #ifdef BACKLIGHT_ENABLE
-        custom_backlight_level(0);
-    #endif
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _BL:
-            custom_backlight_level(0);
-            break;
-        case _WL:
-        case _NL:
-        case _DL:
-        case _CL:
-            custom_backlight_level(1);
-            break;
-        case _FL:
-            custom_backlight_level(2);
-            break;
-        case _AL:
-            custom_backlight_level(3);
-            break;
-        default:
-            custom_backlight_level(0);
-            break;
-    }
-    return state;
-}
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/readme.md b/keyboards/gon/nerdtkl/keymaps/gam3cat/readme.md
deleted file mode 100644
index 8630ea2966c..00000000000
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/readme.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# Keymap Maintainer: Gam3cat
-make gonnerd:gam3cat
-## Layout Config:
-2u backspace, 2.25u lshift/enter, [2.75u rshift] or [1.75u rshift, 1u Fn].
-[1.5u, 1u, 1.5u 1x7.0u, 1.5u, 1u, 1.5u, 3x1u] or [2x1.5u, 1x7.0u, 2x1.5u, 3x1u] bottom row.
-
-## Base Layer Selection:
-(Fn+TAB+(  )): (Q)WERTY, (W)orkman, (N)orman, (D)vorak, (C)olmak
-
-### Base Layer Options:
-#### _BL: Base Layer - Standard TKL QWERTY layout.
-    .-----------------------------------------------------------------------.
-    |Esc|||||F1 |F2 |F3 |F4 |||F5 |F6 |F7 |F8 |||F9 |F10|F11|F12|PSc|SLk|Pau|
-    |-----------------------------------------------------------|-----------|
-    |~  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|Hom|PgU|
-    |-----------------------------------------------------------|-----------|
-    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|End|PgD|
-    |-----------------------------------------------------------|-----------|
-    |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |           |
-    |-----------------------------------------------------------|-----------|
-    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Fn |   | Up|   |
-    |-----------------------------------------------------------|-----------|
-    |Ctrl |Win|Alt  |      Space                |RAlt |Fn |Ctrl |Lft|Dwn|Rgt|
-    *-----------------------------------------------------------------------*
-
-#### _WL: Workman Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _NL: Norman Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _DL: Dvorak Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _CL: Colmak Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _FL: Function Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |VlM|VlD|VlU|   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |Web|   |   |   |   |   |   |   |   |   |   |   |   |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |   |   |   |   |   |   |Lft|Dwn|Up |Rgt|   |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |   |   |   |   |   |   |   |   |   |   |      |Fn |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |      SP4                  |     |Fn |     |WBk|   |WFw|
-    *-----------------------------------------------------------------------*
-
-#### _AL: Adjust Layer - Keymap select, LED backlight, and Dynamic Macro settings.
-    .-----------------------------------------------------------------------.
-    |Rst|||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |   |MR1|MP1|
-    |-----------------------------------------------------------|-----------|
-    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     | MS|MR2|MP2|
-    |-----------------------------------------------------------|-----------|
-    |      |   |   |_DL|   |   |   |   |   |   |   |   |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |Fn |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |Fn |     |   |   |   |
-    *-----------------------------------------------------------------------*
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/rules.mk b/keyboards/gon/nerdtkl/keymaps/gam3cat/rules.mk
deleted file mode 100644
index c82cafd606b..00000000000
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover - If this doesn't work, add this to config.h: #define FORCE_NKRO
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = no      # Enable extended unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-#VARIABLE_TRACE = no         # Use this to debug changes to variable values
-KEY_LOCK_ENABLE = no        # This enables key lock
-SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
-TAP_DANCE_ENABLE = no       # Enable TapDance functionality
diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h
index 633ca727de3..13791b50735 100644
--- a/keyboards/gopolar/gg86/config.h
+++ b/keyboards/gopolar/gg86/config.h
@@ -18,52 +18,3 @@
 
 /* Use the custom font */
 #define OLED_FONT_H "lib/glcdfont.c"
-
-#ifdef RGB_MATRIX_ENABLE
-    /* RGB Matrix config */
-    #define RGB_MATRIX_LED_COUNT 100
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-    #define RGB_MATRIX_KEYPRESSES
-
-    /* RGB Matrix effect */
-    #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_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
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
index 470709ca752..13669a85420 100644
--- a/keyboards/gopolar/gg86/info.json
+++ b/keyboards/gopolar/gg86/info.json
@@ -13,7 +13,49 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 150
     },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/config.h b/keyboards/gopolar/gg86/keymaps/bongocat/config.h
deleted file mode 100644
index 72550165316..00000000000
--- a/keyboards/gopolar/gg86/keymaps/bongocat/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 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
-
-/* Additional thing to reduce compiled size */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-#define NO_ACTION_ONESHOT
-
-#ifdef RGB_MATRIX_ENABLE
-    /* RGB Matrix config */
-    #undef RGB_MATRIX_KEYPRESSES
-
-    /* RGB Matrix effect */
-    #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-    #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-    #undef ENABLE_RGB_MATRIX_BREATHING
-    #undef ENABLE_RGB_MATRIX_BAND_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_VAL
-    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-    #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-    #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-    #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-    #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-    #undef ENABLE_RGB_MATRIX_RAINDROPS
-    #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-    #undef ENABLE_RGB_MATRIX_HUE_PENDULUM
-    #undef ENABLE_RGB_MATRIX_HUE_WAVE
-    #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-#endif
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c b/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
deleted file mode 100644
index e0c17f868a7..00000000000
--- a/keyboards/gopolar/gg86/keymaps/bongocat/keymap.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright 2023 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
-
-// OLED animation
-#include "oled/bongocat.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│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
-       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
-       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bckspc│ │Hom│Scr│Pse│
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
-       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │ │End│Scr│Pse│
-       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
-       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │   Enter│
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
-       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │RSt│     │ ↑ │
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
-       │LCrl │GUI│ LAlt│           Space           │ RAlt│ Fn│ RCrl│ │ ← │ ↓ │ → │
-       └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
-       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-       │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
-       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
-       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ │   │   │   │
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
-       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │ │   │   │   │
-       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
-       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
-       │LSft│ | │ 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       15       16      */
-	[_BASE] = 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_PSCR, KC_SCRL, KC_PAUSE,
-                KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-                KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-                KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-                KC_LSFT, KC_NUBS, 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_UP,
-                KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                               KC_RALT, MO(_FN), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-
-/*
-       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
-       │Slp│   │M_T│F13│F14│F15│ │F16│Rfh│Stp│   │ │   │   │   │Est│ │   │VoD│VoU│
-       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
-       │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │Hui│Sai│Spi│
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
-       │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │Hud│Sad│Spd│
-       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
-       │      │   │   │   │   │   │   │   │   │   │   │   │ RGB_Tog│
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
-       │    │   │   │   │Cal│   │   │   │   │   │   │   │      │   │     │Vai│
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
-       │     │   │     │                           │     │   │     │ │Rod│Vad│Mod│
-       └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14        15       16     */
-	[_FN] = LAYOUT_all(
-                KC_SLEP, RGB_M_T, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, EE_CLR,           _______,  KC_VOLD, KC_VOLU,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,  RGB_SAI, RGB_SPI,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,  RGB_SAD, RGB_SPD,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
-                _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, _______, _______,           RGB_VAI,
-                _______, _______, _______,                   _______,                                     _______, _______, _______,          RGB_RMOD, RGB_VAD, RGB_MOD
-    ),
-};
-
-#ifdef OLED_ENABLE
-    bool oled_task_user(void) {
-        led_t led_usb_state = host_keyboard_led_state();
-
-        render_bongocat();
-        oled_set_cursor(14, 0);                                // sets cursor to (column, row) using charactar spacing (4 rows on 128x32 screen, anything more will overflow back to the top)
-        oled_write_P(PSTR("WPM:"), false);
-        oled_write(get_u8_str(get_current_wpm(), '0'), false); // writes wpm on top right corner of string
-        oled_set_cursor(17, 2);
-        oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-        oled_set_cursor(17, 3);
-        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
-
-        return true;
-    }
-#endif
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/readme.md b/keyboards/gopolar/gg86/keymaps/bongocat/readme.md
deleted file mode 100644
index 9e02220c4ce..00000000000
--- a/keyboards/gopolar/gg86/keymaps/bongocat/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Keymap with VIA and Bongo Cat on OLED
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/rules.mk b/keyboards/gopolar/gg86/keymaps/bongocat/rules.mk
deleted file mode 100644
index 05f6cfd5010..00000000000
--- a/keyboards/gopolar/gg86/keymaps/bongocat/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SRC += oled/bongocat.c
-
-VIA_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h
index d00df8f11f6..57da6a8ac13 100644
--- a/keyboards/gray_studio/aero75/config.h
+++ b/keyboards/gray_studio/aero75/config.h
@@ -3,10 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json
index 476ee33d617..f6de1b9f966 100644
--- a/keyboards/gray_studio/aero75/info.json
+++ b/keyboards/gray_studio/aero75/info.json
@@ -28,6 +28,13 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
         }
     },
     "matrix_pins": {
@@ -50,15 +57,15 @@
                 {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
                 {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
 
-                {"label": "F5", "matrix": [0, 5], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
 
-                {"label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 13, "y": 0},
 
                 {"label": "PrtSc", "matrix": [0, 15], "x": 15, "y": 0},
 
diff --git a/keyboards/gray_studio/aero75/matrix_diagram.md b/keyboards/gray_studio/aero75/matrix_diagram.md
index 64bb3af675c..d777c6cd447 100644
--- a/keyboards/gray_studio/aero75/matrix_diagram.md
+++ b/keyboards/gray_studio/aero75/matrix_diagram.md
@@ -1,9 +1,9 @@
 # Matrix Diagram for GrayStudio Aero 75 Hotswap
 
 ```
-┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
-│00 │ │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0D │ │0F │
-└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘
+┌───┐ ┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐   ┌───┐
+│00 │ │01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0D │   │0F │
+└───┘ └───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘   └───┘
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
 │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │1F │
 ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h
deleted file mode 100644
index d8a6abbc38c..00000000000
--- a/keyboards/gray_studio/apollo80/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json
index bbaa577c923..21fa7c72d25 100644
--- a/keyboards/gray_studio/apollo80/info.json
+++ b/keyboards/gray_studio/apollo80/info.json
@@ -28,6 +28,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {
diff --git a/keyboards/gray_studio/cod67/keymaps/rys/keymap.c b/keyboards/gray_studio/cod67/keymaps/rys/keymap.c
deleted file mode 100644
index 06532a84607..00000000000
--- a/keyboards/gray_studio/cod67/keymaps/rys/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _TOP,
-    _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_TOP] = LAYOUT(
-        KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
-        KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-        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_DEL,
-        KC_LCTL, KC_LALT, KC_LGUI, _______, _______,  KC_SPC, _______, _______, _______, KC_RGUI, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FN] = 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, _______,
-        _______, RGB_TOG, RGB_MOD,RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_TOGG,
-        _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/gray_studio/cod67/keymaps/rys/readme.md b/keyboards/gray_studio/cod67/keymaps/rys/readme.md
deleted file mode 100644
index 8214809bba3..00000000000
--- a/keyboards/gray_studio/cod67/keymaps/rys/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Rys's keymap for a COD67
-
-The COD67 supports really nice RGB underglow which you can see through the mid diffuser. I've put control for that on layer 1, along with reset on `Space`, backlight toggle on `Enter`, and the function row. The board supports all of the QMK RGB effects.
-
-Look at the excellent [RGB Lighting](https://docs.qmk.fm/#/feature_rgblight) docs on the QMK site for more controls.
diff --git a/keyboards/gray_studio/space65/keymaps/billiams/config.h b/keyboards/gray_studio/space65/keymaps/billiams/config.h
deleted file mode 100644
index c2fdc91084f..00000000000
--- a/keyboards/gray_studio/space65/keymaps/billiams/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019 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
-
-// place overrides here
-#define GRAVE_ESC_GUI_OVERRIDE    # Always send Escape if GUI is pressed
diff --git a/keyboards/gray_studio/space65/keymaps/billiams/keymap.c b/keyboards/gray_studio/space65/keymaps/billiams/keymap.c
deleted file mode 100644
index 3c22e2aaed5..00000000000
--- a/keyboards/gray_studio/space65/keymaps/billiams/keymap.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2019 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] = {
-
-  /* Qwerty
-   * ,------------------------------------------------------------------------------------------------.
-   * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | \ |  DEL  |  INS |
-   * |------------------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  | Bkspc  | PGUP |
-   * |------------------------------------------------------------------------------------------------+
-   * |   Fn1   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    | PGDN |
-   * |------------------------------------------------------------------------------------------------+
-   * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | ?/ |    Shift   | Up  |  ESC |
-   * |------------------------------------------------------------------------------------------------+
-   * | Ctrl |  Alt  |  Cmd  |              Space               |  Alt |  Ctrl |  Left  | Down | Right |
-   * `------------------------------------------------------------------------------------------------'
-   */
-
-[0] = LAYOUT(
-        KC_GRAVE, 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_BSLS, KC_DEL, KC_INS,
-        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_BSPC, KC_PGUP,
-        MO(1),    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_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_ESC,
-        KC_LCTL,  KC_LALT, KC_LGUI,                KC_SPC, KC_SPC, KC_SPC,         KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-  /* 1st Layer
-   * ,------------------------------------------------------------------------------------------------.
-   * |     |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |Vol- |Vol+ | Next |
-   * |------------------------------------------------------------------------------------------------+
-   * |        |RGB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+|      |      |    |      |      | Prev |
-   * |------------------------------------------------------------------------------------------------+
-   * |         | RGBP | RGPG | RGPK |    |     | Left| Down| Up |Right|     |     | Play/Pause |      |
-   * |------------------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |    | Scr- | Scr+ |    |    | PGUP |      |
-   * |------------------------------------------------------------------------------------------------+
-   * |      |       |       |                                  |      |  Fn2  |  HOME  | PGDN  |  END |
-   * `------------------------------------------------------------------------------------------------'
-   */
-
-[1] = LAYOUT(
-             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_VOLD, KC_VOLU, KC_MFFD,
-             KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD,  RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD,
-             KC_TRNS, RGB_M_P, RGB_M_G, RGB_M_K, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, 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_BRID,  KC_BRIU, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  MO(2),            KC_HOME, KC_PGDN, KC_END
-    ),
-
-  /* 2nd Layer
-   * ,------------------------------------------------------------------------------------------------.
-   * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |      |
-   * |------------------------------------------------------------------------------------------------+
-   * |        |     |     |     |     |     |     |     |     |      |     |     |      |      |      |
-   * |------------------------------------------------------------------------------------------------+
-   * |         |     |     |     |     |     |     |     |    |    |      |      |            |       |
-   * |------------------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |     |     |    | QK_BOOT |
-   * |------------------------------------------------------------------------------------------------+
-   * |      |       |       |                                   |      |       |       |       |      |
-   * `------------------------------------------------------------------------------------------------'
-   */
-
-[2] = LAYOUT(
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-             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/gray_studio/space65/keymaps/billiams/readme.md b/keyboards/gray_studio/space65/keymaps/billiams/readme.md
deleted file mode 100644
index bf14fbfe949..00000000000
--- a/keyboards/gray_studio/space65/keymaps/billiams/readme.md
+++ /dev/null
@@ -1,80 +0,0 @@
-## Billiam's Space65 layout (with split backspace)
-
-This layout is optimized for vim users on MacOS with a split backspace.
-
-Settings:
-
-* The `CAPS LOCK` key is a function key.
-* The `ALT` and `CMD` keys are swapped to replicate the Mac layout.
-* RESET is available as `Fn`+ `Right Ctrl` + `ESC`
-* Underglow toggle is available as `Fn` + `Q`.
-* vim-style arrow key bindings H J K L in layer 1
-
-### Initial Installation
-
-I found the instructions to be longer than they had to be, and I ended up having to Google some steps anyway. These are the steps I took to get my keyboard setup, in case you are new to the process.
-
-1. Fork and Clone the qmk_firmware repo locally
-```
-# Choose one:
-git clone git@github.com:qmk/qmk_firmware.git # OR
-git clone https://github.com/qmk/qmk_firmware.git
-```
-2. Customize your layout by starting with a [keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/gray_studio/space65/keymaps). I copied  the default and changed it to my liking.
-3. Before plugging in your keyboard into your computer, hold `ESC` key down
-4. Plug the keyboard into your computer, which will put the keyboard in bootloader mode.
-5. Build your hex file and flash your keyboard
-```
-make gray_studio/space65:billiams:flash # be in the qmk_firmware directory to do this
-```
-
-Notes:
-- If you are using QMK Toolbox, use `make gray_studio/space65:<keymap>` in the base qmk_firmware directory instead of step 5 above which will create a hex file `gray_studio_space65_billiams.hex` which you can then choose in the toolbox and hit flash
-- If you accidentally loaded the default keymap, then to `RESET` the keyboard and kick it into bootloader mode again, hold the `ESC` key and plug the board in.
-
-Hope this helps!
-
-### 0 Qwerty
-```
-,------------------------------------------------------------------------------------------------.
-|  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | \ | Del   |  INS |
-|------------------------------------------------------------------------------------------------+
-| Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  | Bkspc  | PGUP |
-|------------------------------------------------------------------------------------------------+
-|   Fn1   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    | PGDN |
-|------------------------------------------------------------------------------------------------+
-| Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | ?/ |    Shift   | up  |  ESC |
-|------------------------------------------------------------------------------------------------+
-| Ctrl |  Alt  |  Cmd  |              Space               |  Alt |  Ctrl |  Left  | Down | Right |
-`------------------------------------------------------------------------------------------------'
-```
-
-### 1 Fn Layer
-```
-,------------------------------------------------------------------------------------------------.
-|     |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |Vol- |Vol+ | Next |
-|------------------------------------------------------------------------------------------------+
-|        |RGB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+| Spd- | Spd+ |    |      |      | Prev |
-|------------------------------------------------------------------------------------------------+
-|         | RGBP | RGBG | RGBK |    |     | Left| Down| Up |Right|     |     | Play/Pause |      |
-|------------------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |    | Scr- | Scr+ |    |     |PGUP |      |
-|------------------------------------------------------------------------------------------------+
-|      |       |       |                                  |      |  Fn2  |  HOME  | PGDN  |  END |
-`------------------------------------------------------------------------------------------------'
-```
-
-### 2 Fn Layer - Just for bootloader mode button
-```
-,------------------------------------------------------------------------------------------------.
-|     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |      |
-|------------------------------------------------------------------------------------------------+
-|        |     |     |     |     |     |     |     |     |      |     |     |      |      |      |
-|------------------------------------------------------------------------------------------------+
-|         |     |     |     |     |     |     |     |    |    |      |      |            |       |
-|------------------------------------------------------------------------------------------------+
-|           |     |     |     |     |     |     |     |     |     |     |     |     |    | RESET |
-|------------------------------------------------------------------------------------------------+
-|      |       |       |                                   |      |       |       |       |      |
-`------------------------------------------------------------------------------------------------'
-```
diff --git a/keyboards/gray_studio/space65/keymaps/conor/config.h b/keyboards/gray_studio/space65/keymaps/conor/config.h
deleted file mode 100644
index e32150b1a4f..00000000000
--- a/keyboards/gray_studio/space65/keymaps/conor/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Conor Burns
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define GRAVE_ESC_GUI_OVERRIDE
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
-#define RGBLIGHT_DEFAULT_HUE 152
-#define RGBLIGHT_DEFAULT_SAT 232
-#define RGBLIGHT_DEFAULT_VAR 255
-#define RGBLIGHT_DEFAULT_SPD 2
\ No newline at end of file
diff --git a/keyboards/gray_studio/space65/keymaps/conor/keymap.c b/keyboards/gray_studio/space65/keymaps/conor/keymap.c
deleted file mode 100644
index 975c0c6072b..00000000000
--- a/keyboards/gray_studio/space65/keymaps/conor/keymap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 2021 Conor Burns
- *
- * 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 {
-  _HOME,
-  _FN2,
-  _FN3,
-  _FN4
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_HOME] = LAYOUT(
-        QK_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_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_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,  MO(1),   KC_SPC,           KC_RALT, KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FN2] = 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,  _______, _______, _______,
-        _______,          _______,    _______, _______, _______, _______, _______, RALT(KC_U), _______, RALT(KC_O), _______, _______, _______, _______, _______,
-        _______,          _______,    _______, _______, _______, _______, _______, _______,    _______, _______,    _______, _______, _______,          _______,
-        _______, _______, RALT(KC_A), _______, _______, _______, _______, _______, _______,    _______, _______,    _______, _______,          _______, _______,
-        _______, _______, _______,                      MO(2),   _______, _______,             _______, _______,                      _______, _______, _______
-    ),
-    [_FN3] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                   _______, _______, MO(3),            _______, _______,                   _______, _______, _______
-    ),
-    [_FN4] = LAYOUT(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                   _______, _______, _______,          _______, _______,                   _______, _______, _______
-    ),
-};
-
-// RGB LED Indicators
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 3, HSV_PURPLE}    // Light 3 LEDs, starting with LED 0
-);
-const rgblight_segment_t PROGMEM my_2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {3, 1, HSV_PURPLE}    // Light 1 LED, starting with LED 3
-);
-const rgblight_segment_t PROGMEM my_3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {4, 1, HSV_PURPLE}    // Light 1 LED, starting with LED 4
-);
-const rgblight_segment_t PROGMEM my_4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {5, 1, HSV_PURPLE}    // Light 1 LED, starting with LED 5
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_capslock_layer,  // 0
-    my_2_layer,  // 1
-    my_3_layer,  // 2
-    my_4_layer  // 3
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(1, layer_state_cmp(state, _FN2));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _FN3));
-    rgblight_set_layer_state(3, layer_state_cmp(state, _FN4));
-    return state;
-}
\ No newline at end of file
diff --git a/keyboards/gray_studio/space65/keymaps/madhatter/config.h b/keyboards/gray_studio/space65/keymaps/madhatter/config.h
deleted file mode 100644
index b591b6d76fb..00000000000
--- a/keyboards/gray_studio/space65/keymaps/madhatter/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#undef PRODUCT
-#define PRODUCT "MadHatter's Custom Spacc"
diff --git a/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c b/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c
deleted file mode 100644
index be9d9b283c8..00000000000
--- a/keyboards/gray_studio/space65/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 Khader Syed
- *
- * 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 keyboard_layers {
-  _QWERTY,
-  _FNM
-};
-
-#define FNM MO(_FNM)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT(
-        QK_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_BSLS, 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_BSPC, KC_PGUP,
-        KC_GRV, 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_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_LALT, KC_LGUI,                KC_SPC, KC_SPC, KC_SPC,         FNM, KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-[_FNM] = LAYOUT(
-        QK_GESC,  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_VOLD, KC_VOLU, KC_MFFD,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD,  RGB_SPI, KC_TRNS, KC_TRNS, QK_BOOT, KC_MRWD,
-        KC_TRNS, RGB_M_P, RGB_M_G, RGB_M_K, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS,
-        AG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRID,  KC_BRIU, 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_HOME, KC_PGDN, KC_END
-    ),
-
-};
diff --git a/keyboards/gray_studio/space65/keymaps/madhatter/rules.mk b/keyboards/gray_studio/space65/keymaps/madhatter/rules.mk
deleted file mode 100644
index 1e9835b3bd6..00000000000
--- a/keyboards/gray_studio/space65/keymaps/madhatter/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-SLEEP_LED_ENABLE = no
-NKRO_ENABLE = yes
diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h
index 27d4b4a6e56..67315123e53 100644
--- a/keyboards/gray_studio/space65r3/config.h
+++ b/keyboards/gray_studio/space65r3/config.h
@@ -2,10 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #pragma once
 
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json
index 85e0978a598..7e559ab3fa8 100644
--- a/keyboards/gray_studio/space65r3/info.json
+++ b/keyboards/gray_studio/space65r3/info.json
@@ -28,6 +28,13 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
         }
     },
     "matrix_pins": {
diff --git a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
deleted file mode 100644
index 884efb7b960..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/* Copyright 2021 Qiaowei Tang
- *
- * 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
-
-
- /*
- * LED ranges for Think6.5v2 2U
- * These values were derived from manual testing. Derived from keymaps/rys.
- * ┌───────┬───────┬─────────────┬───────────────────────────────────────────┐
- * │ 00 01 │ 02 03 │ 04 05 06 07 │ 08 09 10 11 12 13 14 15 16 17 18 19 20 21 │
- * │ badge │ badge │    (?)      │              underglow (?)                │
- * │  bar  │ icon  │             │                                           │
- * └───────┴───────┴─────────────┴───────────────────────────────────────────┘
- */
-
-// Define the LED ranges                  start, end
-#define THINK65_LED_RANGE_OFF                 0, 0
-#define THINK65_LED_RANGE_CAPS                0, 2
-#define THINK65_LED_RANGE_BADGE               0, 4
-#define THINK65_LED_RANGE_UNDERGLOW           4, 22
-#define THINK65_LED_RANGE_ALL                 0, 22
-
-// Turn the LEDs off by setting HSV to 0, 0, 0
-#define THINK65_LEDS_OFF                      0, 0, 0
-
-// Caps Lock indicator LED
-#define THINK65_LEDS_CAPS                    0, 0, 255
-
-#define THINK65_LED_STATE_OFF                 0x0 // 0b00000000
-#define THINK65_LED_STATE_CAPS                0x1 // 0b00000001
-#define THINK65_LED_STATE_BADGE               0x2 // 0b00000010
-#define THINK65_LED_STATE_CAPS_AND_BADGE      0x3 // 0b00000011
-
-// Define each LED range as a bit flag
-#define THINK65_LED_CAPS_RANGE_BIT            0
-#define THINK65_LED_BADGE_RANGE_BIT           1
-
-// Setup some keycodes to control cycling and range toggling
-enum {
-    KVM_SW1 = SAFE_RANGE,
-    KVM_SW2,
-    CYC_LED,
-    TOG_BDG
-};
-
-// setup the user EEPROM space we need
-typedef union {
-    uint8_t raw;
-    struct {
-        uint8_t current_led_state:8;
-    };
-} user_config_t;
-
-user_config_t user_config;
-
-// toggle one of the range flag bits
-void toggle_led_state(unsigned int led_range) {
-    if (led_range >= THINK65_LED_CAPS_RANGE_BIT && led_range <= THINK65_LED_BADGE_RANGE_BIT) {
-        user_config.current_led_state ^= 1 << led_range;
-    }
-}
-
-// set one of the range flag bits
-void set_led_state(unsigned int led_range) {
-    if (led_range >= THINK65_LED_CAPS_RANGE_BIT && led_range <= THINK65_LED_BADGE_RANGE_BIT) {
-        user_config.current_led_state |= 1 << led_range;
-    }
-}
-
-// clear one of the range flag bits
-void clear_led_state(unsigned int led_range) {
-    if (led_range >= THINK65_LED_CAPS_RANGE_BIT && led_range <= THINK65_LED_BADGE_RANGE_BIT) {
-        user_config.current_led_state &= ~(1 << led_range);
-    }
-}
-
-// cycle LED states: Off -> Esc -> Badge -> Underglow -> Esc+Badge -> Esc+Underglow -> Badge+Underglow -> All
-void cycle_led_state(void) {
-    switch(user_config.current_led_state) {
-        case THINK65_LED_STATE_OFF:
-            user_config.current_led_state = THINK65_LED_STATE_CAPS;
-            break;
-        case THINK65_LED_STATE_CAPS:
-            user_config.current_led_state = THINK65_LED_STATE_BADGE;
-            break;
-        case THINK65_LED_STATE_BADGE:
-            user_config.current_led_state = THINK65_LED_STATE_CAPS_AND_BADGE;
-            break;
-        case THINK65_LED_STATE_CAPS_AND_BADGE:
-            user_config.current_led_state = THINK65_LED_STATE_OFF;
-            break;
-        default:
-            break;
-    }
-}
-
-void apply_led_state(void) {
-    uint8_t h = rgblight_get_hue();
-    uint8_t s = rgblight_get_sat();
-    uint8_t v = rgblight_get_val();
-
-    // Set the RGB ranges based on the current state
-    switch(user_config.current_led_state) {
-        case THINK65_LED_STATE_OFF:
-            rgblight_sethsv_range(THINK65_LEDS_OFF,     THINK65_LED_RANGE_ALL);
-            break;
-        case THINK65_LED_STATE_CAPS:
-            rgblight_sethsv_range(THINK65_LEDS_OFF,     THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(THINK65_LEDS_CAPS,    THINK65_LED_RANGE_CAPS);
-            break;
-        case THINK65_LED_STATE_BADGE:
-            rgblight_sethsv_range(THINK65_LEDS_OFF,     THINK65_LED_RANGE_CAPS);
-            rgblight_sethsv_range(h, s, v,              THINK65_LED_RANGE_BADGE);
-            break;
-        case THINK65_LED_STATE_CAPS_AND_BADGE:
-            rgblight_sethsv_range(h, s, v,              THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(THINK65_LEDS_CAPS,    THINK65_LED_RANGE_CAPS);
-            break;
-        default:
-            break;
-    }
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-
-    if (user_config.current_led_state >= THINK65_LED_STATE_OFF && user_config.current_led_state <= THINK65_LED_STATE_CAPS_AND_BADGE) {
-        // If the current state read from user EEPROM is valid, apply it
-        apply_led_state();
-    } else {
-        // Setup a new default state of off
-        user_config.current_led_state = THINK65_LED_STATE_OFF;
-        apply_led_state();
-        eeconfig_update_user(user_config.raw);
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KVM_SW1:
-            if (record->event.pressed) {
-                SEND_STRING(SS_TAP(X_RCTL) SS_TAP(X_RCTL) "1");
-            } else {}
-            break;
-        case KVM_SW2:
-            if(record->event.pressed) {
-                SEND_STRING(SS_TAP(X_RCTL) SS_TAP(X_RCTL) "2");
-            } else {}
-            break;
-        case CYC_LED:
-            if (record->event.pressed) {
-                cycle_led_state();
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-        case TOG_BDG:
-            if (record->event.pressed) {
-                toggle_led_state(THINK65_LED_BADGE_RANGE_BIT);
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-        case KC_CAPS:
-            if (!record->event.pressed) {
-                // connect capslock LED control to the badge LEDs
-                host_keyboard_led_state().caps_lock ? set_led_state(THINK65_LED_CAPS_RANGE_BIT) : clear_led_state(THINK65_LED_CAPS_RANGE_BIT);
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base Layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-    * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│` ~│
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-    * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│Del│
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│   │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   │
-    * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│   │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-    * │Ctrl│ Opt│ Cmd│          Space         │Cmd │FnPy│ │Lef│Dow│Rig│
-    * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
-    */
-    [0] = LAYOUT_65_ansi_blocker(
-        QK_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_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_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,           XXXXXXX,
-        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,   XXXXXXX,
-        KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                          MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────────┬───┐
-     * │RST│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│        │SW1│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┼───┤
-     * │ TOG │PLN│MOD│HU+│HU-│SA+│SA-│VA+│VA-│   │   │Hom│End│      │SW2│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┼───┤
-     * │      │CYC│BDG│UGL│CAP│   │   │   │   │   │   │   │         │   │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬────┤   │
-     * │        │   │   │   │   │   │   │   │   │   │   │      │Vol+│   │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼────┼───┤
-     * │    │    │    │                        │    │    │ │   │Vol-│   │
-     * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴────┴───┘
-     */
-    [1] = LAYOUT_65_ansi_blocker(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KVM_SW1,
-        TOG_BDG, RGB_M_P, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_HOME, KC_END,  _______, KVM_SW2,
-        _______, CYC_LED, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, _______,
-        _______, _______, _______,                      _______,                         _______, _______,          _______, KC_VOLD, _______
-    ),
-
-};
-
diff --git a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/readme.md b/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/readme.md
deleted file mode 100644
index 520e7e0752e..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# dangjoeltang's Think6.5v2 keymap
-
-My personal keymap for the Think6.5v2. Using the `LAYOUT_65_ansi_blocker` LAYOUT for a 2U blocker version. I added functionality to enable the Caps-lock indicator LED above the badge. This functionality shipped with the original board; however, for those who reflash their boards using the default `gray_studio/think65/solder` keymaps that functionality disappeared.
-
-## [Base Layer](http://www.keyboard-layout-editor.com/#/gists/9c6a905a643b77249958f28662348f53)
-![Base Layer](https://imgur.com/Gyim08a)
-
-## [Function Layer](http://www.keyboard-layout-editor.com/#/gists/1c061d3664ea5caf5cb64c759339278d)
-![Function Layer](https://imgur.com/H2Yqnv3)
diff --git a/keyboards/gray_studio/think65/solder/keymaps/rys/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/rys/keymap.c
deleted file mode 100644
index e0d9e00448f..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/rys/keymap.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Copyright 2019 Rys Sommefeldt
- *
- * 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
-
-/*
- * LED ranges
- * ┌─────────────┬─────────────┬───────────────────────────────────────────┐
- * │ 00 01 02 03 │ 04 05 06 07 │ 08 09 10 11 12 13 14 15 16 17 18 19 20 21 │
- * │   escape    │    badge    │              underglow                    │
- * └─────────────┴─────────────┴───────────────────────────────────────────┘
- */
-
-// Define the LED ranges                  start, end
-#define THINK65_LED_RANGE_OFF                 0, 0
-#define THINK65_LED_RANGE_ESC                 0, 4
-#define THINK65_LED_RANGE_BADGE               4, 8
-#define THINK65_LED_RANGE_UNDERGLOW           8, 22
-#define THINK65_LED_RANGE_ALL                 0, 22
-
-// Turn the LEDs off by setting HSV to 0, 0, 0
-#define THINK65_LEDS_OFF                      0, 0, 0
-
-// There are 3 ranges, so we can store all combinations in 2^3 values
-// Define all of them to make it easier to write the cycling code
-#define THINK65_LED_STATE_OFF                 0x0 // 0b00000000
-#define THINK65_LED_STATE_ESC                 0x1 // 0b00000001
-#define THINK65_LED_STATE_BADGE               0x2 // 0b00000010
-#define THINK65_LED_STATE_UNDERGLOW           0x4 // 0b00000100
-#define THINK65_LED_STATE_ESC_AND_BADGE       0x3 // 0b00000011
-#define THINK65_LED_STATE_ESC_AND_UNDERGLOW   0x5 // 0b00000101
-#define THINK65_LED_STATE_BADGE_AND_UNDERGLOW 0x6 // 0b00000110
-#define THINK65_LED_STATE_ON                  0x7 // 0b00000111
-
-// Define each LED range as a bit flag
-#define THINK65_LED_ESC_RANGE_BIT             0
-#define THINK65_LED_BADGE_RANGE_BIT           1
-#define THINK65_LED_UNDERGLOW_RANGE_BIT       2
-
-// Setup some keycodes to control cycling and range toggling
-enum rys_keycodes {
-    CYC_LED = SAFE_RANGE,
-    TOG_ESC,
-    TOG_BDG,
-    TOG_UGL
-};
-
-// setup the user EEPROM space we need
-typedef union {
-    uint8_t raw;
-    struct {
-        uint8_t current_led_state:8;
-    };
-} user_config_t;
-
-user_config_t user_config;
-
-// toggle one of the range flag bits
-void toggle_led_state(unsigned int led_range) {
-    if (led_range >= THINK65_LED_ESC_RANGE_BIT && led_range <= THINK65_LED_UNDERGLOW_RANGE_BIT) {
-        user_config.current_led_state ^= 1 << led_range;
-    }
-}
-
-// set one of the range flag bits
-void set_led_state(unsigned int led_range) {
-    if (led_range >= THINK65_LED_ESC_RANGE_BIT && led_range <= THINK65_LED_UNDERGLOW_RANGE_BIT) {
-        user_config.current_led_state |= 1 << led_range;
-    }
-}
-
-// clear one of the range flag bits
-void clear_led_state(unsigned int led_range) {
-    if (led_range >= THINK65_LED_ESC_RANGE_BIT && led_range <= THINK65_LED_UNDERGLOW_RANGE_BIT) {
-        user_config.current_led_state &= ~(1 << led_range);
-    }
-}
-
-// cycle LED states: Off -> Esc -> Badge -> Underglow -> Esc+Badge -> Esc+Underglow -> Badge+Underglow -> All
-void cycle_led_state(void) {
-    switch(user_config.current_led_state) {
-        case THINK65_LED_STATE_OFF:
-            user_config.current_led_state = THINK65_LED_STATE_ESC;
-            break;
-        case THINK65_LED_STATE_ESC:
-            user_config.current_led_state = THINK65_LED_STATE_BADGE;
-            break;
-        case THINK65_LED_STATE_BADGE:
-            user_config.current_led_state = THINK65_LED_STATE_UNDERGLOW;
-            break;
-        case THINK65_LED_STATE_UNDERGLOW:
-            user_config.current_led_state = THINK65_LED_STATE_ESC_AND_BADGE;
-            break;
-        case THINK65_LED_STATE_ESC_AND_BADGE:
-            user_config.current_led_state = THINK65_LED_STATE_ESC_AND_UNDERGLOW;
-            break;
-        case THINK65_LED_STATE_ESC_AND_UNDERGLOW:
-            user_config.current_led_state = THINK65_LED_STATE_BADGE_AND_UNDERGLOW;
-            break;
-        case THINK65_LED_STATE_BADGE_AND_UNDERGLOW:
-            user_config.current_led_state = THINK65_LED_STATE_ON;
-            break;
-        case THINK65_LED_STATE_ON:
-            user_config.current_led_state = THINK65_LED_STATE_OFF;
-            break;
-        default:
-            break;
-    }
-}
-
-void apply_led_state(void) {
-    uint8_t h = rgblight_get_hue();
-    uint8_t s = rgblight_get_sat();
-    uint8_t v = rgblight_get_val();
-
-    // Set the RGB ranges based on the current state
-    switch(user_config.current_led_state) {
-        case THINK65_LED_STATE_OFF:
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_ALL);
-            break;
-        case THINK65_LED_STATE_ESC:
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_ESC);
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_UNDERGLOW);
-            break;
-        case THINK65_LED_STATE_BADGE:
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_ESC);
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_UNDERGLOW);
-            break;
-        case THINK65_LED_STATE_UNDERGLOW:
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_ESC);
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_UNDERGLOW);
-            break;
-        case THINK65_LED_STATE_ESC_AND_BADGE:
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_ESC);
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_UNDERGLOW);
-            break;
-        case THINK65_LED_STATE_ESC_AND_UNDERGLOW:
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_ESC);
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_UNDERGLOW);
-            break;
-        case THINK65_LED_STATE_BADGE_AND_UNDERGLOW:
-            rgblight_sethsv_range(THINK65_LEDS_OFF, THINK65_LED_RANGE_ESC);
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_UNDERGLOW);
-            break;
-        case THINK65_LED_STATE_ON:
-            rgblight_sethsv_range(h, s, v,          THINK65_LED_RANGE_ALL);
-            break;
-        default:
-            break;
-    }
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-
-    if (user_config.current_led_state >= THINK65_LED_STATE_OFF && user_config.current_led_state <= THINK65_LED_STATE_ON) {
-        // If the current state read from user EEPROM is valid, apply it
-        apply_led_state();
-    } else {
-        // Setup a new default state of off
-        user_config.current_led_state = THINK65_LED_STATE_OFF;
-        apply_led_state();
-        eeconfig_update_user(user_config.raw);
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case CYC_LED:
-            if (record->event.pressed) {
-                cycle_led_state();
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-        case TOG_ESC:
-            if (record->event.pressed) {
-                toggle_led_state(THINK65_LED_ESC_RANGE_BIT);
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-        case TOG_BDG:
-            if (record->event.pressed) {
-                toggle_led_state(THINK65_LED_BADGE_RANGE_BIT);
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-        case TOG_UGL:
-            if (record->event.pressed) {
-                toggle_led_state(THINK65_LED_UNDERGLOW_RANGE_BIT);
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-        case KC_CAPS:
-            if (!record->event.pressed) {
-                // connect capslock LED control to the badge LEDs
-                host_keyboard_led_state().caps_lock ? set_led_state(THINK65_LED_BADGE_RANGE_BIT) : clear_led_state(THINK65_LED_BADGE_RANGE_BIT);
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-        default:
-            break;
-    }
-    return true;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_iso_badge(
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ ` │
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
-     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │   │
-     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤   │
-     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │   │
-     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │Ctrl│LAlt│GUI │      Spaaaaaaace       │RAlt│ L1 │ │ ← │ ↓ │ → │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-        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_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_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_NUHS, KC_ENT,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
-        KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_65_iso_badge(
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │RST│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│       │   │
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ TOG │PLN│MOD│HU+│HU-│SA+│SA-│VA+│VA-│   │   │   │   │     │   │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
-     * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
-     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤   │
-     * │    │   │   │   │   │   │   │   │   │   │   │   │      │CYC│   │
-     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │    │    │                        │    │    │ │ESC│BDG│UGL│
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-        QK_BOOT, 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_M_P, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CYC_LED,
-        _______, _______, _______,                   _______,                            _______, _______,          TOG_ESC, TOG_BDG, TOG_UGL
-    ),
-
-};
diff --git a/keyboards/gray_studio/think65/solder/keymaps/rys/readme.md b/keyboards/gray_studio/think65/solder/keymaps/rys/readme.md
deleted file mode 100644
index ed73e306472..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/rys/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Personal keymap for the Think 6.5 with compatible soldered PCB
-
-The layout is UK ISO with some small personal tweaks.
-
-The LED cycling code is based on code posted to the Gray Studio Discord by `MudkipMao` on Nov 22nd 2019. Thanks!
-
-## LED cycling
-
-This map saves and restores your current active LED group choice to user EEPROM and restores it on keyboard init, which you can cycle through all combinations of, or toggle individually.
-
-The cycle is `Off -> Esc -> Badge -> Underglow -> Esc+Badge -> Esc+Underglow -> Badge+Underglow -> All`. Look at the keymap for the controls on layer 1.
diff --git a/keyboards/gray_studio/think65/solder/keymaps/yt/config.h b/keyboards/gray_studio/think65/solder/keymaps/yt/config.h
deleted file mode 100644
index 6bdff5008e4..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/yt/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Yt Liu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
diff --git a/keyboards/gray_studio/think65/solder/keymaps/yt/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/yt/keymap.c
deleted file mode 100644
index d4d6a7157af..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/yt/keymap.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright 2021 Qiaowei Tang
- *
- * 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/>.
- */
-
-
-
- /*
- * LED ranges for Think6.5v2 2U
- * These values were derived from manual testing. Derived from keymaps/rys.
- * ┌───────┬───────┬─────────────┬───────────────────────────────────────────┐
- * │ 00 01 │ 02 03 │ 04 05 06 07 │ 08 09 10 11 12 13 14 15 16 17 18 19 20 21 │
- * │ badge │ badge │    (?)      │              underglow (?)                │
- * │  bar  │ icon  │             │                                           │
- * └───────┴───────┴─────────────┴───────────────────────────────────────────┘
- */
-
-
-// Setup some layers to control mac/win layouts
-#include QMK_KEYBOARD_H
-
-enum bs_layers {
-    _WIN,
-    _MAC,
-    _FN,
-    _BLANC
-};
-
-// Setup some keycodes to control cycling and range toggling
-enum bs_keycodes {
-  WIN = SAFE_RANGE,
-  MAC
-};
-
-// Light LEDs 6 to 9 and 12 to 15 red when caps lock is active. Hard to ignore!
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 4, HSV_WHITE}     // Light 4 LEDs, starting with LED 12
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_capslock_layer     // Overrides other layers
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-};
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    return true;
-};
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    if (get_highest_layer(state) == _MAC) {
-        rgblight_mode_noeeprom(6);
-    } else {
-        rgblight_mode_noeeprom(9);
-    }
-    return state;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Win Layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-    * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│pup│
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-    * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│pdw│
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │lTCap │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│   │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   │
-    * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│   │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴───┴┬─┬───┼───┼───┤
-    * │Ctrl│ win│ alt│          Space         │   Func  │ │Lef│Dow│Rig│
-    * └────┴────┴────┴────────────────────────┴─────────┴─┴───┴───┴───┘
-    */
-    [_WIN] = LAYOUT_65_ansi_blocker(
-        QK_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_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,
-        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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        KC_UP,   _______,
-        KC_LCTL,            KC_LGUI, KC_LALT,                      KC_SPC,                          KC_1,   MO(_FN),          KC_LEFT, KC_DOWN,  KC_RGHT
-    ),
-    /* Mac Layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-    * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│pup│
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-    * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│pdw│
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │lTCap │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│   │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   │
-    * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│   │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴───┴┬─┬───┼───┼───┤
-    * │Ctrl│ Opt│ Cmd│          Space         │   Func  │ │Lef│Dow│Rig│
-    * └────┴────┴────┴────────────────────────┴─────────┴─┴───┴───┴───┘
-    */
-    [_MAC] = LAYOUT_65_ansi_blocker(
-        QK_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_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,
-        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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   _______,
-        KC_LCTL,            KC_LOPT, KC_LCMD,                      KC_SPC,                          KC_1,   MO(_FN),           KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /* Fn Layer
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────────┬───┐
-     * │lck│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ delete │mac│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┼───┤
-     * │ TOG │MB1│MSU│MB2│MDU│   │   │   │UP │   │Hom│pgu│End│      │win│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┼───┤
-     * │MO(2) │MSL│MSD│MSR│MWD│   │   │Lft│Dwn│rgt│END│pgd│  reset  │   │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬────┤   │
-     * │ RGB_mod│F13│F14│F15│F16│F17│F18│F19│F20│F21│F22│F23   │Bri+│   │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼────┼───┤
-     * │Vold│Mute│Volu│                        │    │    │ │   │Bri-│   │
-     * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴────┴───┘
-     */
-    [_FN] = LAYOUT_65_ansi_blocker(
-        QK_LOCK, 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,    MAC,
-        RGB_TOG, KC_MS_BTN1, KC_MS_UP,   KC_MS_BTN2,  KC_MS_WH_UP,    _______,  _______,  _______,  KC_UP,   _______,  KC_HOME, KC_PGUP, _______, _______,   WIN,
-        _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN,  _______,  _______,  KC_LEFT,  KC_DOWN, KC_RIGHT, KC_END,  KC_PGDN,          QK_BOOT,     _______,
-        RGB_MOD, KC_F13,     KC_F14,     KC_F15,      KC_F16,         KC_F17,   KC_F18,   KC_F19,   KC_F20,  KC_F21,   KC_F22,  KC_F23,           KC_BRIU,   _______, 
-        KC_VOLD, KC_MUTE,    KC_VOLU,                 _______,                            _______,  _______,                             _______, KC_BRID,   _______
-    ),
-
-};
-
-    
diff --git a/keyboards/gray_studio/think65/solder/keymaps/yt/readme.md b/keyboards/gray_studio/think65/solder/keymaps/yt/readme.md
deleted file mode 100644
index 84286c5e342..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/yt/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# YT45's Think6.5v2 keymap
-
-My personal keymap for the Think6.5v2. Using the dangjoeltang as a the base and adding a quick switch from mac to win layouts. also with indication of the current layer with RGB lights.
diff --git a/keyboards/gray_studio/think65/solder/keymaps/yt/rules.mk b/keyboards/gray_studio/think65/solder/keymaps/yt/rules.mk
deleted file mode 100644
index 37868485298..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/yt/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LTO_ENABLE = yes
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-KEY_LOCK_ENABLE = yes
-CONSOLE_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/gray_studio/think65v3/config.h b/keyboards/gray_studio/think65v3/config.h
index 0a0596e64c6..6b1f49b5925 100644
--- a/keyboards/gray_studio/think65v3/config.h
+++ b/keyboards/gray_studio/think65v3/config.h
@@ -1,7 +1,7 @@
 // Copyright 2023 Yizhen Liu (@edwardslau)
 // SPDX-License-Identifier: GPL-2.0
 #pragma once
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/gray_studio/think65v3/info.json b/keyboards/gray_studio/think65v3/info.json
index 8fba691fa48..a61dd5efe1d 100644
--- a/keyboards/gray_studio/think65v3/info.json
+++ b/keyboards/gray_studio/think65v3/info.json
@@ -46,6 +46,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "layout_aliases": {
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index c9fc1028f82..4fc8d1feaf6 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -107,8 +107,4 @@
 #define DRV2605L_ZC_DET_TIME 0
 #define DRV2605L_AUTO_CAL_TIME 3
 
-#define RGB_MATRIX_LED_COUNT 10
-
-// #define RGB_MATRIX_KEYPRESSES
-
 #define SOLENOID_PIN A14
diff --git a/keyboards/hadron/ver3/keymaps/sebaslayout/config.h b/keyboards/hadron/ver3/keymaps/sebaslayout/config.h
deleted file mode 100644
index 6f70f09beec..00000000000
--- a/keyboards/hadron/ver3/keymaps/sebaslayout/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c b/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
deleted file mode 100644
index fcae7f07c6c..00000000000
--- a/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include QMK_KEYBOARD_H
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PSCR, 
-		KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_P7, KC_P8, KC_P9, 
-		KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_SCLN, KC_P4, KC_P5, KC_P6, 
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH, KC_P1, KC_P2, KC_P3, 
-		KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT),
-/* Primary
- * ,------+------+------+------+------+------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   10 | PRTSN|
- * |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
- * |  ˜   |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | BKSP |  7   |   8  |   9  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Tab |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  '   |   ;  |  4   |   5  |   6  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |  .   |  Up  |  /?  |   1  |   2  |  3   |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Raise|         Space      | Raise| Ctrl | Left | Down |Right |   0  |   .  | Enter|
- * `--------------------------------------------------------------------------------------------------------'
- */
-	LAYOUT(
-		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_HOME, KC_INS, KC_PGUP, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_DEL, KC_PGDN, 
-		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_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-/* Secondary
- * ,------+------+------+------+------+------------------------------------------------.
- * |  Esc |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
- * |      |      |      |      |      |      |      |      |      |  F11 | F12  |      | Home | Ins  | PgUP |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      | End  |  Del | PgDN |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      | Vol+ |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      | Vol- |      |      |      |      |
- * `--------------------------------------------------------------------------------------------------------'
- */
-};
-
diff --git a/keyboards/hadron/ver3/keymaps/sebaslayout/readme.md b/keyboards/hadron/ver3/keymaps/sebaslayout/readme.md
deleted file mode 100644
index ce6974ce096..00000000000
--- a/keyboards/hadron/ver3/keymaps/sebaslayout/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-![Hadron v3 Layout Image](https://i.imgur.com/Mi5L57j.png)
-
-# My Custome Hadron Layout
-
-+ Moved numpad to the right
-+ changed F row to standard numbers
-+ Bottom row subject to change
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/config.h b/keyboards/handwired/3dfoxc/keymaps/dlg/config.h
deleted file mode 100644
index d824330b04c..00000000000
--- a/keyboards/handwired/3dfoxc/keymaps/dlg/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 david l goodrich <dlg@dsrw.org>
- *
- * 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 GRAVE_ESC_ALT_OVERRIDE
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c b/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
deleted file mode 100644
index 2af98020497..00000000000
--- a/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright 2022 david l goodrich <dlg@dsrw.org>
- *
- * 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 custom_layers {
-    _BL,
-    _FL,
-    _MAC,
-    _LA,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,---------------------------------------------------------------.
-   * |~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Bks|???|Esc|
-   * |---------------------------------------------------------------|
-   * |Tab  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |Del|
-   * |---------------------------------------------------------------|
-   * |Ctrl  | A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PUp|
-   * |---------------------------------------------------------------|
-   * |Shift   | Z | X | C | V | B | N | M | , | . | / |Shift |Up |PDn|
-   * |---------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space            |Alt |Fn  ||Lt |Dn |Rt |
-   * `--------------------------------------------------''-----------'
-   */
-    [_BL] = LAYOUT(
-       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, XXXXXXX, 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_RBRC, KC_BSLS,     KC_DEL,
-       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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,     KC_UP,   KC_PGDN,
-       KC_LCTL,    KC_LGUI,    LM(_LA, MOD_LALT),               KC_SPC,                          KC_LALT,    MO(_FL),       KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-  /* Keymap _FL: Function Layer
-   * ,---------------------------------------------------------------.
-   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del|RST|   |
-   * |---------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |mac|   |PSc|Br-|Br+|     |Ins|
-   * |---------------------------------------------------------------|
-   * |      |   |   |   |   |   |Lt |Dn |Up |Rt |   |   |        |Hme|
-   * |---------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End|
-   * |---------------------------------------------------------------|
-   * |    |    |    |                         |    |    ||Hme|PDn|End|
-   * `--------------------------------------------------''-----------'
-   */
-    [_FL] = 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_DEL,  QK_BOOT, _______,
-        _______,      _______, _______, _______, _______, _______, _______, _______, TG(_MAC),_______, KC_PSCR, KC_BRID, KC_BRIU, _______,     KC_INS,
-        _______,          _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,          KC_HOME,
-        _______,               _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,     KC_PGUP, KC_END,
-        _______,    _______,    _______,                         _______,                         _______,    _______,       KC_HOME, KC_PGDN, KC_END
-    ),
-
-   /* Keymap _MAC: Mac Layer
-   * ,---------------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
-   * |---------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
-   * |---------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |   |
-   * |---------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |   |
-   * |---------------------------------------------------------------|
-   * |Ctrl|Alt |Win |                         |Win |    ||   |   |   |
-   * `--------------------------------------------------''-----------'
-   */
-   [_MAC] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______,
-        KC_LCTL,    KC_LALT,    KC_LGUI,                         _______,                         KC_RGUI,    _______,       _______, _______, _______
-    ),
-
-  /* Keymap _LA: Left Alt Layer - LALT-4 maps to LALT-F4 so I can quit apps
-   * ,---------------------------------------------------------------.
-   * |   |   |   |   |F4 |   |   |   |   |   |   |   |   |   |   |   |
-   * |---------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
-   * |---------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |   |
-   * |---------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |   |
-   * |---------------------------------------------------------------|
-   * |    |    |    |                         |    |    ||   |   |   |
-   * `--------------------------------------------------''-----------'
-   */
-    [_LA] = LAYOUT(
-        _______, _______, _______, _______, KC_F4,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______,
-        _______,    _______,    _______,                         _______,                         _______,    _______,       _______, _______, _______
-    )
-
-};
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/readme.md b/keyboards/handwired/3dfoxc/keymaps/dlg/readme.md
deleted file mode 100755
index 487086e5725..00000000000
--- a/keyboards/handwired/3dfoxc/keymaps/dlg/readme.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# dlg's layout
-
-Inspired heavily by [my tada68 layout](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tada68/keymaps/dlg).
-
-Notable deviation from the default keymap includes correctly placing `KC_BSLS` and moving `KC_BSPC` up to the top row where it belongs. The additional key on the top-row is a NOOP while I think of something fun.  I also swapped `Esc` and `~` as in my tada68 layout.
-
-
-### Base Layer
-
-```
-,---------------------------------------------------------------.
-|~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Bks|???|Esc|
-|---------------------------------------------------------------|
-|Tab  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |Del|
-|---------------------------------------------------------------|
-|Ctrl  | A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PUp|
-|---------------------------------------------------------------|
-|Shift   | Z | X | C | V | B | N | M | , | . | / |Shift |Up |PDn|
-|---------------------------------------------------------------|
-|Ctrl|Win |Alt |        Space            |Alt |Fn  ||Lt |Dn |Rt |
-`--------------------------------------------------''-----------'
-```
-
-
-### Fn Layer
-
-```
-,---------------------------------------------------------------.
-|   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del|RST|   |
-|---------------------------------------------------------------|
-|     |   |   |   |   |   |   |   |mac|   |PSc|Br-|Br+|     |Ins|
-|---------------------------------------------------------------|
-|      |   |   |   |   |   |Lt |Dn |Up |Rt |   |   |        |Hme|
-|---------------------------------------------------------------|
-|        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End|
-|---------------------------------------------------------------|
-|    |    |    |                         |    |    ||Hme|PDn|End|
-`--------------------------------------------------''-----------'
-```
-
-### Mac Layer
-
-```
-,---------------------------------------------------------------.
-|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
-|---------------------------------------------------------------|
-|     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
-|---------------------------------------------------------------|
-|      |   |   |   |   |   |   |   |   |   |   |   |        |   |
-|---------------------------------------------------------------|
-|        |   |   |   |   |   |   |   |   |   |   |      |   |   |
-|---------------------------------------------------------------|
-|Ctrl|Alt |Win |                         |Win |    ||   |   |   |
-`--------------------------------------------------''-----------'
-```
-
-### `LALT` Layer
-
-Left Alt Layer - LALT-4 maps to LALT-F4 so I can quit apps
-
-```
-,---------------------------------------------------------------.
-|   |   |   |   |F4 |   |   |   |   |   |   |   |   |   |   |   |
-|---------------------------------------------------------------|
-|     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
-|---------------------------------------------------------------|
-|      |   |   |   |   |   |   |   |   |   |   |   |        |   |
-|---------------------------------------------------------------|
-|        |   |   |   |   |   |   |   |   |   |   |      |   |   |
-|---------------------------------------------------------------|
-|    |    |    |                         |    |    ||   |   |   |
-`--------------------------------------------------''-----------'
-```
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
deleted file mode 100644
index 248e43f88e7..00000000000
--- a/keyboards/handwired/6macro/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2019 joaofbmaia
-
-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_MATRIX_LED_COUNT 10
diff --git a/keyboards/handwired/6macro/keymaps/default/config.h b/keyboards/handwired/6macro/keymaps/default/config.h
deleted file mode 100644
index 64ba57443f8..00000000000
--- a/keyboards/handwired/6macro/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 joaofbmaia
- *
- * 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
-
diff --git a/keyboards/handwired/6macro/keymaps/osu/config.h b/keyboards/handwired/6macro/keymaps/osu/config.h
deleted file mode 100644
index 64ba57443f8..00000000000
--- a/keyboards/handwired/6macro/keymaps/osu/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 joaofbmaia
- *
- * 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
-
diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/keycodes.h b/keyboards/handwired/aek64/keymaps/4sstylz/keycodes.h
deleted file mode 100644
index 9898fe0df36..00000000000
--- a/keyboards/handwired/aek64/keymaps/4sstylz/keycodes.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    Version 2, December 2004
- *
- * Copyright (C) 2019 4sStylZ <4sstylz@protonmail.ch>
- *
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
- */
-#include QMK_KEYBOARD_H
-
-/**
- * Macro for selecting all the text in the document.
- * Usual shortcut : Ctrl+A.
- *
- * @param keyrecord_t *record
- *
- * @return void
- */
-void select_all(keyrecord_t *record) {
-    if (record->event.pressed) {
-        register_code(KC_LCTL);
-        tap_code(KC_A);
-        unregister_code(KC_LCTL);
-    }
-}
-
-/**
- * Macro for selecting the current row.
- *
- * @param keyrecord_t *record
- *
- * @return void
- */
-void select_row(keyrecord_t *record) {
-    if (record->event.pressed) {
-        tap_code(KC_HOME);
-        register_code(KC_LSFT);
-        tap_code(KC_END);
-        unregister_code(KC_LSFT);
-    }
-}
-
-/**
- * Macro for selecting the current word.
- * Usage : You need to have the cursor into the word or directly at the right.
- *
- *
- * Usual shortcut : Ctrl+A.
- *
- * @param keyrecord_t *record
- *
- * @return void
- */
-void select_word(keyrecord_t *record) {
-    if (record->event.pressed) {
-        register_code(KC_LCTL);
-        tap_code(KC_LEFT);
-        register_code(KC_LSFT);
-        tap_code(KC_RIGHT);
-        unregister_code(KC_LSFT);
-        unregister_code(KC_LCTL);
-    }
-}
-
-/**
- * Macro for inserting two 0 with keypad.
- * Be carefull to have the keypad lock enabled
- *
- * @param keyrecord_t *record
- *
- * @return void
- */
-void insert_00(keyrecord_t *record) {
-    if (record->event.pressed) {
-        tap_code(KC_P0);
-        tap_code(KC_P0);
-    }
-}
diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
deleted file mode 100644
index 8f136b51fd0..00000000000
--- a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <keycodes.h>
-
-// Implement Super-alt↯tab
-// See https://docs.qmk.fm/#/feature_macros?id=super-alt↯tab
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-
-// Defining all the custom keycodes.
-enum custom_keycodes {
-  ALT_TAB = SAFE_RANGE,
-  SLC_ROW,
-  SLC_ALL,
-  SLC_WRD
-};
-
-const uint16_t PROGMEM lock_combo[] = {KC_J, KC_K, KC_L, KC_SCLN, COMBO_END};
-combo_t key_combos[] = {COMBO(lock_combo, LGUI(KC_O))};
-
-// Define the keycodes for one qwerty layer and one Fn layer.
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: qwerty
-   * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬─────────────┐
-   * │ ` Esc│   1  │   2  │   3  │   4  │   5  │   6  │   7  │   8  │   9  │   0  │  -   │  =   │ Bksp        │
-   * ├──────┴──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼─────┬───────┤
-   * │ Tab         │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │  [   │  ]  │       │
-   * ├─────────────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼─────┴┐ Enter│
-   * │ Layer 2     │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │   ;  │   '  │   #  │      │
-   * ├──────┬──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┤
-   * │ Shift│  \   │   Z  │   X  │   C  │   V  │   B  │   N  │   M  │   ,  │   .  │   /  │        Shift       │
-   * ├──────┼──────┼──────┼──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┼──────┬──────┬──────┤
-   * │ Ctrl │ Alt  │↯ATab │                            Space                             │ Gui  │ Alt  │ Ctrl │
-   * └──────┴──────┴──────┴──────────────────────────────────────────────────────────────┴──────┴──────┴──────┘
-   *
-   * Hidden features :
-   *  - Left Shift is also Home on a single tap.
-   *  - Left Ctrl is also End on a single tap.
-   *  - Right Shift is also page-up on a single tap.
-   *  - Right Ctrl is also page-down on a single tap.
-   *  - Press JKLM for Windows + L (Session lock)
-   */
-  [0] = LAYOUT(
-    QK_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_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,
-    MO(1)          , 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 ,
-    SC_LSPO        , KC_NUBS, KC_Z   , KC_X , KC_C , KC_V , KC_B  , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, SC_RSPC         ,
-    SC_LCPO        , KC_LGUI, KC_LALT,                      KC_SPC,                                 KC_APP , KC_RALT, SC_RCPC
-  ),
-
-  /* 1: second layer for media keys and many advanced features ç
-   * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬─────────────┐
-   * │Alt F4│  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │             │
-   * ├──────┴──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼─────┬───────┤
-   * │             │      │PrtScn│ Brt+ │ Brt- │Ctrl A│ Home │  Up  │  End │   ‽   │  ↑      │  ⸮    │     │       │
-   * ├─────────────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼─────┴┐      │
-   * │             │ Cut  │ Copy │Paste │ Del  │ Del  │ Left │ Down │Right │  ←   │  ↓   │  →   │      │      │
-   * ├──────┬──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┤
-   * │      │      │ Mute │ Vol- │ Vol+ │      │      │      │      │      │      │Reset │                    │
-   * ├──────┼──────┼──────┼──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┼──────┬──────┬──────┤
-   * │      │      │      │                                                              │      │      │      │
-   * └──────┴──────┴──────┴──────────────────────────────────────────────────────────────┴──────┴──────┴──────┘
-   */
-  [1] = LAYOUT(
-    LALT(KC_F4), 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 ,
-    _______    , _______   , SLC_ALL     , SLC_ROW     , SLC_WRD     , _______, KC_BSPC, KC_HOME, KC_UP  , KC_END  , KC_BRIU, KC_BRID   , KC_PSCR,
-    _______    , _______   , LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), KC_DEL , KC_ENT , KC_LEFT, KC_DOWN, KC_RIGHT, BL_TOGG, BL_STEP   , BL_BRTG, _______,
-    _______    , _______   , KC_MUTE     , KC_VOLD     , KC_VOLU     , ALT_TAB, _______, _______, _______, _______ , _______, QK_BOOT     , _______         ,
-    _______    , _______   , _______     ,                             _______,                                               _______   , _______, _______
-  )
-};
-
-// Set the unicode input mode for using UC.
-void matrix_init_user(void) {
-  set_unicode_input_mode(UNICODE_MODE_LINUX);
-}
-
-// Processing all the key pressed.
-// Alt+tab.
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  // Depending keycodes…
-  switch (keycode) { // This will do most of the grunt work with the keycodes.
-    case ALT_TAB:
-      if (record->event.pressed) {
-        if (!is_alt_tab_active) {
-          is_alt_tab_active = true;
-          register_code(KC_LALT);
-        }
-        alt_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-    case SLC_ALL:
-      select_all(record);
-      break;
-    case SLC_ROW:
-      select_row(record);
-      break;
-    case SLC_WRD:
-      select_word(record);
-      break;
-  }
-  return true;
-}
-
-void matrix_scan_user(void) {     // The very important timer.
-  if (is_alt_tab_active) {
-    if (timer_elapsed(alt_tab_timer) > 750) {
-      unregister_code(KC_LALT);
-      is_alt_tab_active = false;
-    }
-  }
-}
diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/rules.mk b/keyboards/handwired/aek64/keymaps/4sstylz/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/handwired/aek64/keymaps/4sstylz/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/handwired/aim65/keymaps/bonnee/keymap.c b/keyboards/handwired/aim65/keymaps/bonnee/keymap.c
deleted file mode 100644
index 7884841b21a..00000000000
--- a/keyboards/handwired/aim65/keymaps/bonnee/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 Matteo Bonora
- *
- * 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 CTESC LCTL_T(KC_ESC)
-
-enum layer_names {
-    BL,
-    FL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BL] = LAYOUT(
-             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_GRV,    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_RGUI,
-         CTESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,   KC_QUOT,   KC_BSLS,      KC_ENT,
-       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-                                                           LT(FL, KC_SPC)
-    ),
-
-    [FL] = 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_DEL,
-     KC_TAB, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-         _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______, _______, _______, _______,
-         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                             _______
-    )
-};
diff --git a/keyboards/handwired/alcor_dactyl/config.h b/keyboards/handwired/alcor_dactyl/config.h
index cf2dd7aa8c5..42c45acdbf9 100644
--- a/keyboards/handwired/alcor_dactyl/config.h
+++ b/keyboards/handwired/alcor_dactyl/config.h
@@ -22,9 +22,9 @@
 
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
+
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP10
 #define SERIAL_USART_RX_PIN GP9
-#define RGB_MATRIX_LED_COUNT 2
-#define RGB_MATRIX_SPLIT { 1, 1 }
+
 #define EE_HANDS
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json
index 405436b6f5f..65f1f804aa9 100644
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -31,7 +31,8 @@
         "layout": [
             {"x": 0, "y": 0.375},
             {"x": 16.5, "y": 0.38}
-        ]
+        ],
+        "split_count": [1, 1]
     },
     "ws2812": {
         "pin": "GP16",
diff --git a/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
deleted file mode 100644
index 82277e21584..00000000000
--- a/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright 2021 Fernando "ManoShu" Rodrigues
- *
- * 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_brazilian_abnt2.h"
-#include "sendstring_brazilian_abnt2.h"
-
-enum { 
-    LAYER_BASE, 
-    LAYER_FUNCTIONS 
-};
-
-#define L_FUNCT MO(LAYER_FUNCTIONS)
-#define W_CHOLD LGUI_T(KC_CAPS)
-
-//Combination keycodes
-#define KC_PSBR C(KC_PAUSE)    // Ctrl+Pause/Break
-#define KC_SNIP SGUI(BR_S)     // Screen Snip (GUI + Shift + S)
-#define KC_WRUN G(BR_R)        // Run (GUI + R)
-#define KC_WLCK G(BR_L)        // Lock (GUI + L)
-#define KC_WDSK G(BR_D)        // Desktop (GUI + D)
-#define KC_WEXP G(BR_E)        // Explorer (GUI + E)
-#define KC_WPSE G(KC_PAUSE)    // System Properties (GUI + Pause)
-#define KC_WMGP G(BR_EQL)      // Magnify (+)
-#define KC_WMGM G(BR_MINS)     // Magnify (-)
-
-enum custom_keycodes {
-    KC_WPRN = SAFE_RANGE,  // Project (P)
-    KC_WSPC                // Input Select (Space)
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (get_highest_layer(state) == LAYER_BASE) {
-        unregister_mods(MOD_MASK_GUI);
-    }
-    return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if(keycode == KC_WPRN || keycode == KC_WSPC) {
-        if (record->event.pressed) {
-
-            register_code(KC_LGUI);
-
-            if(keycode == KC_WPRN) {
-                tap_code(KC_P);
-            } else if (keycode == KC_WSPC) {
-                tap_code(KC_SPACE);
-            }
-        }
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [LAYER_BASE] = 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,
-        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
-             BR_QUOT,   BR_1,     BR_2,     BR_3,      BR_4,    BR_5,     BR_6,      BR_7,    BR_8,     BR_9,     BR_0,    BR_MINS,  BR_EQL,        KC_BSPC,
-        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
-                KC_TAB,      BR_Q,     BR_W,     BR_E,     BR_R,     BR_T,     BR_Y,     BR_U,     BR_I,     BR_O,     BR_P,    BR_ACUT,  BR_LBRC,      KC_ENT,
-        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
-                  W_CHOLD,      BR_A,     BR_S,      BR_D,    BR_F,     BR_G,     BR_H,     BR_J,     BR_K,     BR_L,    BR_CCED,  BR_TILD,  BR_RBRC,
-        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
-              KC_LSFT,   BR_BSLS,   BR_Z,     BR_X,     BR_C,     BR_V,     BR_B,     BR_N,     BR_M,    BR_COMM,  BR_DOT,   BR_SCLN,      BR_SLSH,       KC_UP,
-        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
-              KC_LCTL,   L_FUNCT,    KC_LALT,                                 KC_SPC,                            KC_APP,    KC_DEL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-    ),
-    [LAYER_FUNCTIONS] = LAYOUT(
-        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-              QK_BOOT,           _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  KC_PSBR,  KC_SNIP, 
-        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
-             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_WMGM,  KC_WMGP,       _______,
-        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
-               _______,     KC_MPLY,  KC_MUTE,  KC_WEXP,  KC_WRUN,  _______,  _______,  _______,  _______,  _______,  KC_WPRN,  _______,  _______,      _______,
-        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
-                 _______,      KC_MPRV,  KC_MNXT,  KC_WDSK,  _______,  _______,  _______,  _______,  _______,  KC_WLCK,  _______,  _______,  _______,    
-        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
-              _______,   _______,  KC_VOLU,  KC_VOLD,  KC_CALC,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      KC_PGUP, 
-        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
-              _______,    _______,    _______,                                KC_WSPC,                           _______,   KC_INS,  KC_HOME,  KC_PGDN,  KC_END
-        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-    )
-};
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md b/keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md
deleted file mode 100644
index 1852a0fbc20..00000000000
--- a/keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-![BareDev Layout Image](https://i.imgur.com/FXye4Hn.png)
-
-# ManoShu's custom layout
-
-Has all the functions of a ABNT TKL keyboard, sans right shift.
-
-Basic media functions also included.
-
-Trying to emulate where notebooks/smaller OEM keyboard put the function key, for this reason the GUI key was moved and it can be used by holding the Caps Lock key.
-
-To not use the new GUI position very often, commonly used GUI + [X] commands are sent using `SEND_STRING()`, `(un)register_code()` and `tap_code()`.
-
-## Why you didn't used `LT(FUNCTIONS, KC_LGUI)` on the GUI/FN key?
-Because I don't want rely on the tapping term to determine I will send either KC_HOME or snap the active window to the left.
-
-If there is a better way to solve this, please let me know.
\ No newline at end of file
diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h
index f2eee84a577..9853f7f39d7 100644
--- a/keyboards/handwired/battleship_gamepad/config.h
+++ b/keyboards/handwired/battleship_gamepad/config.h
@@ -18,7 +18,6 @@
 
 /* joystick configuration */
 #define JOYSTICK_BUTTON_COUNT 25
-#define JOYSTICK_AXIS_COUNT 2
 #define JOYSTICK_AXIS_RESOLUTION 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/handwired/bento/keymaps/cbc02009/keymap.c b/keyboards/handwired/bento/keymaps/cbc02009/keymap.c
deleted file mode 100644
index 57c107b9fc9..00000000000
--- a/keyboards/handwired/bento/keymaps/cbc02009/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 cbc02009
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-
-/* LAYER 1
-  * ,---------------+-------.
-  * |KC_MPRV|KC_MNXT|KC_MUTE|
-  * |-------+-------+-------,
-  * |KC_MPLY|KC_MSTP|KC_MUTE|
-  * `-------+-------+-------'
-  */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(KC_MPRV, KC_MNXT, KC_MUTE, KC_MPLY, KC_MSTP, KC_MUTE)
-};
-
-#ifdef ENCODER_ENABLE
-#include "encoder.h"
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
-  return true;
-}
-#endif
diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h
index c373743a39c..5d8a8a083da 100644
--- a/keyboards/handwired/chiron/keymaps/default/config.h
+++ b/keyboards/handwired/chiron/keymaps/default/config.h
@@ -30,8 +30,8 @@
 #define MOUSEKEY_WHEEL_MAX_SPEED   8
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 40
 
-#undef  RGBLED_NUM
-#define RGBLED_NUM 2
+#undef  RGBLIGHT_LED_COUNT
+#define RGBLIGHT_LED_COUNT 2
 #define RGBLED_SPLIT {1, 1}
 
 // Don't turn off lights when the host goes to sleep.
diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h
index 5c52df9ffa5..a85f398caec 100644
--- a/keyboards/handwired/colorlice/config.h
+++ b/keyboards/handwired/colorlice/config.h
@@ -21,60 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* RGB LEDs */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_MATRIX_LED_COUNT 70
-
-// 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
-#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
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json
index 0f8383a2aaa..d81cd849ade 100644
--- a/keyboards/handwired/colorlice/info.json
+++ b/keyboards/handwired/colorlice/info.json
@@ -12,7 +12,55 @@
       "pin": "B1"
     },
     "rgb_matrix": {
-      "driver": "ws2812"
+      "animations":{
+        "alphas_mods": true,
+        "gradient_up_down": true,
+        "gradient_left_right": true,
+        "breathing": true,
+        "band_sat": true,
+        "band_val": true,
+        "band_pinwheel_sat": true,
+        "band_pinwheel_val": true,
+        "band_spiral_sat": true,
+        "band_spiral_val": true,
+        "cycle_all": true,
+        "cycle_left_right": true,
+        "cycle_up_down": true,
+        "rainbow_moving_chevron": true,
+        "cycle_out_in": true,
+        "cycle_out_in_dual": true,
+        "cycle_pinwheel": true,
+        "cycle_spiral": true,
+        "dual_beacon": true,
+        "rainbow_beacon": true,
+        "rainbow_pinwheels": true,
+        "raindrops": true,
+        "jellybean_raindrops": true,
+        "hue_breathing": true,
+        "hue_pendulum": true,
+        "hue_wave": true,
+        "pixel_rain": true,
+        "pixel_flow": true,
+        "pixel_fractal": true,
+        "typing_heatmap": true,
+        "digital_rain": true,
+        "solid_reactive_simple": true,
+        "solid_reactive": true,
+        "solid_reactive_wide": true,
+        "solid_reactive_multiwide": true,
+        "solid_reactive_cross": true,
+        "solid_reactive_multicross": true,
+        "solid_reactive_nexus": true,
+        "solid_reactive_multinexus": true,
+        "splash": true,
+        "multisplash": true,
+        "solid_splash": true,
+        "solid_multisplash": true
+      },
+      "driver": "ws2812",
+      "led_flush_limit": 26,
+      "led_process_limit": 4,
+      "sleep": true
     },
     "matrix_pins": {
       "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
diff --git a/keyboards/handwired/d48/ds1307.c b/keyboards/handwired/d48/ds1307.c
index f6b57d50d2e..5f4931bbf8c 100644
--- a/keyboards/handwired/d48/ds1307.c
+++ b/keyboards/handwired/d48/ds1307.c
@@ -8,13 +8,12 @@ void ds1307_set_time(uint8_t h, uint8_t m, uint8_t s) {
         ((h % 10) | ((h / 10) << 4)) & 0x3F,
         0, 0, 0, 0, 0
     }; // 24-hour mode
-    i2c_writeReg(DS1307_ADDR, 0, data, 8, 100);
+    i2c_write_register(DS1307_ADDR, 0, data, 8, 100);
 }
 
 void ds1307_get_time(uint8_t *h, uint8_t *m, uint8_t *s) {
     uint8_t data[3];
-    i2c_readReg(DS1307_ADDR, 0, data, 3, 100);
-    i2c_stop();
+    i2c_read_register(DS1307_ADDR, 0, data, 3, 100);
     *s = (data[0] & 0b1111) + ((data[0] & 0b1110000) >> 4) * 10;
     *m = (data[1] & 0b1111) + ((data[1] & 0b1110000) >> 4) * 10;
     *h = (data[2] & 0b1111) + ((data[2] & 0b0110000) >> 4) * 10;
diff --git a/keyboards/handwired/dactyl/matrix.c b/keyboards/handwired/dactyl/matrix.c
index d87fe4cbd1a..140f4236c18 100644
--- a/keyboards/handwired/dactyl/matrix.c
+++ b/keyboards/handwired/dactyl/matrix.c
@@ -216,10 +216,10 @@ void init_expander(void) {
 #endif
 
 
-    expander_status = i2c_writeReg(I2C_ADDR, IODIRA, direction, 2, I2C_TIMEOUT);
+    expander_status = i2c_write_register(I2C_ADDR, IODIRA, direction, 2, I2C_TIMEOUT);
     if (expander_status) return;
 
-    expander_status = i2c_writeReg(I2C_ADDR, GPPUA, pullup, 2, I2C_TIMEOUT);
+    expander_status = i2c_write_register(I2C_ADDR, GPPUA, pullup, 2, I2C_TIMEOUT);
 }
 
 uint8_t matrix_scan(void)
@@ -333,7 +333,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
     // Read columns from expander, unless it's in an error state
     if (! expander_status) {
         uint8_t state = 0;
-        expander_status = i2c_readReg(I2C_ADDR, EXPANDER_COL_REGISTER, &state, 1, I2C_TIMEOUT);
+        expander_status = i2c_read_register(I2C_ADDR, EXPANDER_COL_REGISTER, &state, 1, I2C_TIMEOUT);
         if (! expander_status) {
             current_matrix[current_row] |= (~state) & expander_input_pin_mask;
         }
@@ -359,7 +359,7 @@ static void select_row(uint8_t row) {
         // set active row low  : 0
         // set other rows hi-Z : 1
         uint8_t port = 0xFF & ~(1<<row);
-        expander_status = i2c_writeReg(I2C_ADDR, EXPANDER_ROW_REGISTER, &port, 1, I2C_TIMEOUT);
+        expander_status = i2c_write_register(I2C_ADDR, EXPANDER_ROW_REGISTER, &port, 1, I2C_TIMEOUT);
     }
 
     // select on teensy
@@ -415,7 +415,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
             return false;
         }
 
-        expander_status = i2c_readReg(I2C_ADDR, EXPANDER_ROW_REGISTER, &column_state, 1, I2C_TIMEOUT);
+        expander_status = i2c_read_register(I2C_ADDR, EXPANDER_ROW_REGISTER, &column_state, 1, I2C_TIMEOUT);
 
         column_state = ~column_state;
     } else {
@@ -460,7 +460,7 @@ static void select_col(uint8_t col)
             // set active col low  : 0
             // set other cols hi-Z : 1
             uint8_t port = 0xFF & ~(1<<col);
-            expander_status = i2c_writeReg(I2C_ADDR, EXPANDER_COL_REGISTER, &port, 1, I2C_TIMEOUT);
+            expander_status = i2c_write_register(I2C_ADDR, EXPANDER_COL_REGISTER, &port, 1, I2C_TIMEOUT);
         }
     } else {
         // select on teensy
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
deleted file mode 100644
index 5774ab7f3bd..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2022 Shem Sedrick (@ssedrick)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "print.h"
-
-enum key_layers {
-    _BASE,
-    _COLEMAK,
-    _RAISE,
-    _LOWER
-};
-
-enum layer_keycodes {
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-};
-
-#define RAISE  TT(_RAISE)
-#define LOWER  MO(_LOWER)
-#define SH_ESC SFT_T(KC_ESC)
-#define UNDSC  RSFT(KC_MINS)
-#define MAC_LOCK C(G(KC_D))
-#define ____   KC_TRANSPARENT
-
-#undef TAPPING_TOGGLE
-#define TAPPING_TOGGLE 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,                        KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,
-        KC_A,    KC_S,    KC_D,    KC_F,   KC_G,                        KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN,
-        KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,                        KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH,
-                 KC_LCBR, KC_RCBR,                                                       KC_QUOT, KC_GRV,
-                                   SH_ESC, KC_LGUI, KC_TAB,    KC_RSFT, KC_SPC,  KC_ENT,
-                                   RAISE,  KC_LCTL,                     KC_BSPC, LOWER
-    ),
-
-    [_COLEMAK] = LAYOUT(
-        KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                  KC_J, KC_L, KC_U,    KC_Y,   KC_SCLN,
-        KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                  KC_H, KC_N, KC_E,    KC_I,   KC_O,
-        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH,
-                 KC_LCBR, KC_RCBR,                                             KC_QUOT, KC_GRV,
-                                   ____,    ____,  ____,     ____, ____, ____,
-                                   ____,    ____,                  ____, ____
-    ),
-
-    [_RAISE] = LAYOUT(
-        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-     S(KC_9), S(KC_0), KC_LBRC, KC_RBRC,  KC_EQL,            KC_MINS,  KC_4,    KC_5,    KC_6, KC_QUOT,
-      QK_RBT, QK_BOOT,    ____,    ____,    ____,             ____,    KC_1,    KC_2,    KC_3,    ____,
-             MAC_LOCK,    ____,                                                 KC_0,  KC_DOT,
-                                   ____,    ____,  ____,     ____, ____,    ____,
-                                   ____,    ____,                  ____,    ____
-    ),
-
-    [_LOWER] = LAYOUT(
-     KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-     S(KC_9), S(KC_0), KC_LBRC, KC_RBRC,  KC_EQL,              UNDSC, KC_MINS,  KC_EQL, KC_BSLS, KC_PIPE,
-     KC_MNXT, KC_MPLY, KC_VOLU, KC_VOLD,    ____,               ____, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,
-                 ____,    ____,                                              QWERTY, COLEMAK,
-                                   ____,    ____,  ____,     ____, ____,    ____,
-                                   ____,    ____,                  ____,    ____
-    )
-};
-
-
-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: 0x%04X, col: %u, row: %u, pressed: %d, time: %u, interrupt: %d, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-#endif 
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_BASE);
-            }
-            return false;
-            break;
-        case COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h
deleted file mode 100644
index 68900af390b..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-//#define EE_HANDS
-// Rows are doubled-up
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
deleted file mode 100644
index 3f3ae258486..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-
-/* A QWERTY 3 Layer layout for the Dactyl Manuform 5x6 Keyboard */ 
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-  [_QWERTY] = LAYOUT_5x6(
-     KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,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_MINS,
-     KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
-                      KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
-                                      RAISE,KC_SPC,                           KC_ENT, LOWER,
-                                      KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
-                                      KC_BSPC,KC_GRV,                         KC_LGUI, KC_LALT
-  ),
-
-
-  [_LOWER] = LAYOUT_5x6(
-     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_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
-     _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
-     _______,_______,_______,_______,_______,_______,                        _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS,
-                                             _______,KC_PSCR,            _______, KC_P0,
-                                             _______,_______,            _______,_______,
-                                             _______,_______,            _______,_______,
-                                             _______,_______,            _______,_______
-
-),
-
-  [_RAISE] = LAYOUT_5x6(
-     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                         KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-     _______,_______,_______,_______,_______,KC_LBRC,                         KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
-     _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                         KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,KC_VOLD,
-                                     _______,_______,                         KC_EQL ,_______,
-                                     _______,_______,                         _______,_______,
-                                     _______,_______,                         _______,_______,
-                                     _______,_______,                         _______,_______
-  ),
-
-  };
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h
deleted file mode 100644
index 2ab0c912a34..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2022 Nabos <nabos at glargh dot fr>
-
-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 EE_HANDS
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
deleted file mode 100644
index d118eec92ab..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright 2022 Nabos <nabos at glargh dot fr>
-
-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 {
-    _QWERTY,
-    _FUNCTIONS,
-    _NUMPAD,
-    _GAMING
-};
-
-#define FUNCTIONS MO(_FUNCTIONS)
-#define NUMPAD MO(_NUMPAD)
-#define GAMING TG(_GAMING)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_5x6(
-     QK_GESC, KC_1 , KC_2  ,  KC_3  , KC_4  , KC_5  ,         KC_6     , KC_7  , KC_8  , KC_9 , KC_0  ,KC_RBRC,
-     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_PGUP, KC_A , KC_S  ,  KC_D  , KC_F  , KC_G  ,         KC_H     , KC_J  , KC_K  , KC_L ,KC_SCLN,KC_QUOT,
-     KC_PGDN, KC_Z , KC_X  ,  KC_C  , KC_V  , KC_B  ,         KC_N     , KC_M  ,KC_COMM,KC_DOT,KC_SLSH,_______,
-                    KC_LEFT,KC_RIGHT,                                           KC_DOWN,KC_UP ,
-                                     KC_LSFT,KC_SPC ,         KC_ENT   ,KC_BSPC,
-                                     KC_LGUI,KC_LALT,         FUNCTIONS,KC_RALT,
-                                     KC_DEL ,GAMING ,         NUMPAD   ,KC_RCTL
-  ),
-
-  [_FUNCTIONS] = LAYOUT_5x6(
-     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,         KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
-                     _______,_______,                                         _______,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______
-  ),
-
-  [_NUMPAD] = LAYOUT_5x6(
-     _______,_______,_______,_______,_______,_______,         _______,KC_NUM ,_______,_______,KC_MINS,KC_EQL ,
-     _______,_______,_______,_______,_______,_______,         _______,KC_KP_7,KC_KP_8,KC_KP_9,_______,_______,
-     _______,_______,_______,_______,_______,_______,         _______,KC_KP_4,KC_KP_5,KC_KP_6,_______,_______,
-     _______,_______,_______,_______,_______,_______,         _______,KC_KP_1,KC_KP_2,KC_KP_3,_______,KC_PSCR,
-                     _______,_______,                                         KC_KP_0,KC_PDOT,
-                                     _______,_______,         KC_PENT,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______
-  ),
-
-  [_GAMING] = LAYOUT_5x6(
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
-      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_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  ,         _______,_______,_______,_______,_______,_______,
-                     _______,_______,                                         _______,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______
-  )
-};
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
deleted file mode 100644
index e97810f8bc3..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#pragma once
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-//#define EE_HANDS
-
-// Mouse
-#undef MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL       15
-#undef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX    60
-#undef MOUSEKEY_WHEEL_MAX_SPEED
-#define MOUSEKEY_WHEEL_MAX_SPEED   	3
-
-// RGB backlight
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN D3
-#undef RGBLED_NUM
-#define RGBLED_NUM 30
-#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 RGBLIGHT_LIMIT_VAL 95
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
deleted file mode 100644
index c4887a3dbb5..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* A standard layout for the Dactyl Manuform 5x6 Keyboard */
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _MAC,
-    _WINDOWS,
-    _MOUSE,
-    _ARROWS,
-    _SYMBOLS,
-    _NUMBERS,
-    _MEDIA,
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_MAC] = LAYOUT_5x6(
-     KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_GRAVE,
-     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_BSPC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     KC_LSFT, CTL_T(KC_Z)  , KC_X  , KC_C  , KC_V  , KC_B  ,                  KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
-                      KC_LALT,KC_LCTL,                                                        KC_DEL, KC_PMNS,
-                                      KC_SPC, MO(_ARROWS),                          MO(_MOUSE), KC_ENT,
-                                      KC_LCMD, MO(_SYMBOLS),                        KC_EQL, KC_RALT,
-                                      KC_LALT, MO(_NUMBERS),                        MO(_MEDIA), KC_EJCT
-  ),
-
-  [_WINDOWS] = LAYOUT_5x6(
-
-   _______,_______, _______ ,_______,_______ ,_______,                        _______,_______,_______,_______,_______,_______,
-   _______,_______,_______,_______,_______,_______,                        _______, _______ , _______ , _______ ,_______,_______,
-   _______,_______,_______,_______,_______ ,_______,                        _______, _______ , _______ , _______ ,_______,_______,
-     _______,_______,_______,_______,_______,_______,                        _______, _______ , _______ , _______ ,_______ ,_______,
-                          KC_LCMD,KC_LALT,                                                       _______, _______,
-                                             _______,_______,            _______,_______,
-                                             KC_LCTL,_______,            _______,_______,
-                                             _______,_______,            _______,_______
-
-  ),
-
-  [_MOUSE] = LAYOUT_5x6(
-
-                 KC_F11,KC_F1, KC_F2 ,KC_F3,KC_F4 ,KC_F5,                        KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F12,
-                 _______,_______,_______,KC_WH_U,_______,_______,                        _______, _______ , KC_MS_U , _______ ,_______,_______,
-                 _______,_______,KC_WH_L,KC_WH_D,KC_WH_R ,_______,                        KC_BTN1, KC_MS_L , KC_MS_D , KC_MS_R ,_______,_______,
-                  _______,_______,KC_ACL0,KC_ACL1,KC_ACL2,_______,                        _______, KC_BTN2 , _______ , _______ ,_______ ,_______,
-                                       _______,_______,                                                       _______, QK_BOOT,
-                                                          KC_BTN1,KC_BTN2,            _______,_______,
-                                                          _______,KC_BTN2,            _______,_______,
-                                                          _______,_______,            _______,_______
-
-               ),
-  [_ARROWS] = LAYOUT_5x6(
-
-                   QK_BOOT,_______, _______ ,_______,_______ ,TG(_WINDOWS),                        _______,_______,_______,_______,_______,_______,
-                   _______,_______,_______,_______,_______,_______,                        _______, KC_HOME , KC_UP , KC_END ,_______,_______,
-                   _______,_______,_______,_______,_______ ,_______,                        KC_HOME, KC_LEFT , KC_DOWN , KC_RIGHT ,KC_END,_______,
-                   _______,_______,_______,_______,_______,_______,                        _______, KC_PGDN ,   _______ , KC_PGUP ,_______ ,_______,
-                                        QK_BOOT,_______,                                                       _______, _______,
-                                                           _______,_______,            _______,_______,
-                                                           _______,_______,            _______,_______,
-                                                           _______,_______,            _______,_______
-
-                ),
-  [_SYMBOLS] = LAYOUT_5x6(
-
-                    _______,_______, _______ ,_______,_______ ,_______,                        KC_CIRC,KC_CIRC,KC_LABK,KC_RABK,_______,_______,
-                    _______,_______,_______,_______,_______,_______,                        KC_LABK, KC_AT , KC_LCBR , KC_RCBR ,KC_HASH,KC_RABK,
-                    _______,_______,_______,_______,_______ ,_______,                        KC_PERC, KC_EQL , KC_LPRN , KC_RPRN ,KC_DLR,KC_AMPR,
-                    _______,_______,_______,_______,_______,_______,                        KC_TILD, KC_GRAVE , KC_LBRC , KC_RBRC ,KC_PIPE ,KC_EXLM,
-                                         _______,_______,                                                       KC_PPLS, KC_PMNS,
-                                                            _______,_______,            _______,_______,
-                                                            _______,_______,            _______,_______,
-                                                            _______,_______,            _______,_______
-
-                 ),
-  [_NUMBERS] = LAYOUT_5x6(
-
-                    QK_BOOT,_______, _______ ,_______,_______ ,_______,                        KC_PSLS,KC_PAST,KC_PPLS,KC_PMNS,_______,_______,
-                    _______,_______,_______,KC_PSLS,KC_PAST,_______,                        _______, KC_7 , KC_8 , KC_9 ,_______,_______,
-                    _______,_______,_______,KC_PMNS,KC_PPLS ,_______,                        _______, KC_4 , KC_5 , KC_6 ,_______,_______,
-                    _______,_______,_______,_______,_______,_______,                        _______, KC_1 , KC_2 , KC_3 ,_______ ,_______,
-                                         _______,_______,                                                       KC_0, KC_DOT,
-                                                            _______,_______,            _______,_______,
-                                                            _______,_______,            _______,_______,
-                                                            _______,_______,            _______,_______
-
-                 ),
-  [_MEDIA] = LAYOUT_5x6(
-
-                  KC_MSTP,KC_MPRV, KC_MPLY ,KC_MNXT,_______ ,_______,                        _______,_______,_______,_______,_______,_______,
-                  _______,_______,_______,_______,KC_VOLU,_______,                        RGB_SPI, _______ , _______ , _______ ,_______,_______,
-                  _______,_______,_______,_______,KC_VOLD ,_______,                        RGB_TOG, RGB_MODE_FORWARD , RGB_HUI , RGB_SAI ,RGB_VAI,_______,
-                  _______,_______,_______,_______,KC_MUTE,_______,                        RGB_SPD, RGB_MODE_REVERSE , RGB_HUD , RGB_SAD ,RGB_VAD ,_______,
-                                       _______,_______,                                                       _______, _______,
-                                                          _______,_______,            _______,_______,
-                                                          _______,_______,            _______,_______,
-                                                          _______,_______,            _______,_______
-
-               ),
-};
-
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
deleted file mode 100644
index 0d3e3d88d28..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2021 Tyler Tolley <thattolleyguy@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 MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-// Rows are doubled-up
-
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN F5
-
-#undef SOFT_SERIAL_PIN
-#define SOFT_SERIAL_PIN D0
-// #define RGB_MATRIX_LED_COUNT 32
-
-#define RGB_MATRIX_KEYPRESSES
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 80
-#undef RGBLED_NUM
-#define RGBLED_NUM       64 // Number of LEDs
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#define RGB_MATRIX_SPLIT \
-        { 32, 32  }
-#define SPLIT_TRANSPORT_MIRROR
-
-// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP // Sets the default mode, if none has been set
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-#endif
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
deleted file mode 100644
index 05920d16e82..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-Copyright 2021 Tyler Tolley <thattolleyguy@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 dactyl_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-#define KC_CBP LCTL(KC_F11) //Clipboard previous
-#define KC_CBN LCTL(KC_F12) //Clipboard previous
-#define KC_DSKD LCA(KC_DOWN)
-#define KC_DSKU LCA(KC_UP)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT_5x6(
-
-
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     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, KC_RSFT,
-  //└────────┴────────┼────────┼────────┼────────┼────────┘                          └────────┴────────┼────────┼────────┼────────┼────────┘
-                       KC_DSKU, KC_DSKD,                                                                KC_PGUP, KC_PGDN,
-  //                  └────────┴────────┘        ┌────────┬────────┐        ┌────────┬────────┐        └────────┴────────┘
-                                                  LOWER,   KC_ENT,           KC_SPC,  RAISE,
-  //                                             ├────────┼────────┤        ├────────┼────────┤
-                                                  KC_LGUI, KC_GRV,           KC_DEL,  KC_RALT,
-  //                                             ├────────┼────────┤        ├────────┼────────┤
-                                                  KC_CBP,  KC_CBN,           KC_APP,  KC_RCTL
-  //                                             └────────┴────────┘        └────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT_5x6(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX, KC_VOLU, KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,                            XXXXXXX, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_VOLD, RGB_M_SW,RGB_TOG, XXXXXXX, XXXXXXX,                            XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, XXXXXXX,                            XXXXXXX, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  KC_PSCR,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ┌────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,XXXXXXX,                            XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PDOT, _______,
-  //└────────┴────────┼────────┼────────┼────────┼────────┘                          └────────┴────────┼────────┼────────┼────────┼────────┘
-                       KC_PGUP, KC_PGDN,                                                                KC_P0,   Debug,
-  //                  └────────┴────────┘        ┌────────┬────────┐        ┌────────┬────────┐        └────────┴────────┘
-                                                  _______, _______,          _______,  _______,
-  //                                             ├────────┼────────┤        ├────────┼────────┤
-                                                  _______, _______,          _______,  _______,
-  //                                             ├────────┼────────┤        ├────────┼────────┤
-                                                  _______, QK_BOOT,          _______, _______
-  //                                             └────────┴────────┘        └────────┴────────┘
-
-  ),
-
-  [_RAISE] = LAYOUT_5x6(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, _______, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX,                            XXXXXXX, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_UNDS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGUP,                            KC_INS,  KC_HOME, KC_PPLS, KC_MINS, KC_TILD, KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ┌────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN,                            KC_DEL,  KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  //└────────┴────────┼────────┼────────┼────────┼────────┘                          └────────┴────────┼────────┼────────┼────────┼────────┘
-                       DM_REC1, DM_REC2,                                                                DM_PLY1, DM_PLY2,
-  //                  └────────┴────────┘        ┌────────┬────────┐        ┌────────┬────────┐        └────────┴────────┘
-                                                  LOWER,   KC_ENT,           KC_SPC,  RAISE,
-  //                                             ├────────┼────────┤        ├────────┼────────┤
-                                                  KC_LGUI, KC_GRV,           KC_DEL,  KC_RALT,
-  //                                             ├────────┼────────┤        ├────────┼────────┤
-                                                  XXXXXXX, XXXXXXX,          QK_BOOT, XXXXXXX
-  //                                             └────────┴────────┘        └────────┴────────┘
-  ),
-};
-
-
-#ifdef RGB_MATRIX_ENABLE
-
-  // Logical Layout
-  // Columns
-  // Left
-  // 0  1  2  3  4  5
-  //                   ROWS
-  // 25 24 19 18 11 10   0
-  //    03    02    01
-  // 26 23 20 17 12 09   1
-  //    04    05    06
-  // 27 22 21 16 13 08   2
-  //
-  //          15 14 07   3
-  //
-  // Right
-  // 0  1  2  3  4  5
-  //                    ROWS
-  // 25 24 19 18 11 10   4
-  //    03    02    01
-  // 26 23 20 17 12 09   5
-  //    04    05    06
-  // 27 22 21 16 13 08   6
-  //
-  //          15 14 07   7
-  //
-  // Physical Layout
-  // Columns
-  // 0  1  2  3  4  5  6  7  8  9  10 11 12 13
-  //                                           ROWS
-  // 25 24 19 18 11 10       10 11 18 19 24 25  0
-  //    03    02    01       01    02    03
-  // 26 23 20 17 12 09       09 12 17 20 23 26  1
-  //    04                               04
-  // 27 22 21 16 13 08       08 13 16 21 22 27  2
-  //          05    06       06    05
-  //           15 14 07     07 14 15              3
-
-led_config_t g_led_config = { {
-    {      0,      1,  2,  3,      4,      5 },
-    {     11,     10,  9,  8,      7,      6 },
-    {     12,     13, 14, 15,     16,     17 },
-    {     23,     22, 21, 20,     19,     18 },
-    { NO_LED, NO_LED, 24, 25,     26,     27 },
-    { NO_LED, NO_LED, 30, 31,     28,     29 },
-    {     37,     36, 35, 34,     33,     32 },
-    {     43,     42, 41, 40,     39,     38 },
-    {     49,     48, 47, 46,     45,     44 },
-    {     55,     54, 53, 52,     51,     50 },
-    // {     NO_LED,     NO_LED, 57, 56, NO_LED, NO_LED},
-    // {     NO_LED,     NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
-    {     59,     58, 57, 56, NO_LED, NO_LED},
-    {     61,     60, 62, 63, NO_LED, NO_LED }
-
-}, {
-    {  0,  0 }, {  17,  0 }, {  34,  0 }, {  52,  0 }, {  69,  0 }, {  86,  0 }, {  86,  9 }, {  69,  9 },
-    {  52,  9 }, {  34,   9 }, {  17,   9 }, {  0,  9 }, {  0,  18 }, {  17,  18 }, {  34,  18 }, {  52,  18 },
-     {  60,  18 }, {  86,   18 }, {  86,   27 }, {  69,  27 }, {  52,  27 }, {  34,  27 }, {  17,  27 }, {  0,   27 },
-      {  34,   37 }, {   52,  37 }, {   69,  45 }, { 86,  45 }, { 103,  55 }, { 103,  64 }, { 86,  55 }, { 86,  64 },
-
-
-    { 224,  0 }, { 207,  0 }, { 190,  0 }, { 172,  0 }, { 155,   0 }, { 138,   0 }, { 224,  9 }, { 207,  9 },
-    { 190,  9 }, { 172,  9 }, { 155,  9 }, { 138,  9 }, { 224,  18 }, { 207,  18 }, { 190,  18 },{ 172,  18 },
-    { 155,   18 }, { 138,   18 }, { 224,  27 }, { 207,  27 }, { 190,  27}, { 172,  27 },{ 155,  27 }, { 138,  27 },
-    { 190,  37 }, { 172,  37 }, { 155,  45}, { 138,  45 }, { 121,  55 }, { 121,  64 },  { 138,  64 }, { 138,  55 }
-}, {
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2
-} };
-
-#endif
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/rules.mk
deleted file mode 100644
index 09e4c42d693..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = ws2812
-DYNAMIC_MACRO_ENABLE = yes
-# CONSOLE_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h
deleted file mode 100644
index 6a28251c6bf..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2021 Christian Eiden, cykedev
-//
-// 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
-
-#undef SOFT_SERIAL_PIN
-#undef DIODE_DIRECTION
-#undef MATRIX_ROW_PINS
-#undef MATRIX_COL_PINS
-#undef BOOTMAGIC_LITE_ROW
-#undef BOOTMAGIC_LITE_COLUMN
-#undef BOOTMAGIC_LITE_ROW_RIGHT
-#undef BOOTMAGIC_LITE_COLUMN_RIGHT
-
-
-#define SOFT_SERIAL_PIN D2
-#define EE_HANDS
-// #define SPLIT_USB_DETECT
-
-// wiring of each half
-// ../../../../docs/proton_c_conversion.md
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-
-// Configure the global tapping term (default: 200ms)
-#define TAPPING_TERM 200
-
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
-
-#define FORCE_NKRO
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c
deleted file mode 100644
index 9687e77d884..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright 2021 Christian Eiden, cykedev
-//
-// 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 CM_R    LCTL_T(KC_R)
-#define CM_S    LALT_T(KC_S)
-#define CM_T    LGUI_T(KC_T)
-
-#define CM_N    RGUI_T(KC_N)
-#define CM_E    RALT_T(KC_E)
-#define CM_I    RCTL_T(KC_I)
-
-#define QU_S    LCTL_T(KC_S)
-#define QU_D    LALT_T(KC_D)
-#define QU_F    LGUI_T(KC_F)
-
-#define QU_J    RGUI_T(KC_J)
-#define QU_K    RALT_T(KC_K)
-#define QU_L    RCTL_T(KC_L)
-
-#define SPC_L   LSFT_T(KC_SPC)
-#define SPC_R   RSFT_T(KC_SPC)
-#define ENT_L   LSFT_T(KC_ENT)
-#define ENT_R   RSFT_T(KC_ENT)
-
-#define UNDO    LGUI(KC_Z)
-#define REDO    LGUI(KC_Y)
-#define CUT     LGUI(KC_X)
-#define COPY    LGUI(KC_C)
-#define PASTE   LGUI(KC_V)
-#define ALL     LGUI(KC_A)
-
-#define RAISE   MO(_RAISE)
-#define LOWER   MO(_LOWER)
-
-#define QWERT   DF(_QWERTY)
-#define COLEM   DF(_COLEMAK_DH)
-
-enum layer_names {
-  _COLEMAK_DH,
-  _QWERTY,
-  _RAISE,
-  _LOWER,
-  _ADJUST
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_COLEMAK_DH] = LAYOUT_5x6_5(
-  /* COLEMAK_DH
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * | Esc  |   1  |   2  |   3  |   4  |   5  |                                  |   6  |   7  |   8  |   9  |   0  |  Bsp |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   F  |   P  |   B  |                                  |   J  |   L  |   U  |   Y  |   ;  |  \   |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Del  |   A  |R /CTL|S /ALT|T /CMD|   G  |                                  |   M  |N /CMD|E /ALT|I /CTL|   O  |  '   |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Shft |   Z  |   X  |   C  |   D  |   V  |                                  |   K  |   H  |   ,  |   .  |   /  | Shft |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *               |      |      |    / RAISE /---------------.    .---------------\ LOWER \    |      |      |
-   *               |      |      |   /       / Space / Enter /      \ Enter \ Space \       \   |      |      |
-   *               '-------------'  '-------/ Shift / Shift /        \ Shift \ Shift \-------'  '-------------'
-   *                                       /---------------/          \---------------\
-   *                                      /   =   / Home  /            \  End  \   -   \
-   *                                     /   +   /       /              \       \   _   \
-   *                                    '---------------'                '---------------'
-   */
-   KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSPC,
-   KC_TAB , KC_Q   , KC_W   , KC_F   , KC_P   , KC_B   ,                                     KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSLS,
-   KC_DEL , KC_A   , CM_R   , CM_S   , CM_T   , KC_G   ,                                     KC_M   , CM_N   , CM_E   , CM_I   , KC_O   , KC_QUOT,
-   KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_D   , KC_V   ,                                     KC_K   , KC_H   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
-                     XXXXXXX, XXXXXXX,          RAISE  , SPC_L , ENT_L   , ENT_R  , SPC_R  , LOWER  ,          XXXXXXX, XXXXXXX,
-                                                         KC_EQL, KC_HOME , KC_END , KC_MINS
-   ),
-  [_QWERTY] = LAYOUT_5x6_5(
-  /* QWERTY
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * | Esc  |   1  |   2  |   3  |   4  |   5  |                                  |   6  |   7  |   8  |   9  |   0  |  Bsp |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |                                  |   Y  |   U  |   I  |   O  |   P  |  \   |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Del  |   A  |S /CTL|D /ALT|F /CMD|   G  |                                  |   H  |J /CMD|K /ALT|L /CTL|   ;  |  '   |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * | Shft |   Z  |   X  |   C  |   V  |   B  |                                  |   N  |   M  |   ,  |   .  |   /  | Shft |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *               |      |      |    / RAISE /---------------.    .---------------\ LOWER \    |      |      |
-   *               |      |      |   /       / Space / Enter /      \ Enter \ Space \       \   |      |      |
-   *               '-------------'  '-------/ Shift /       /        \       \ Shift \-------'  '-------------'
-   *                                       /---------------/          \---------------\
-   *                                      /   =   / Home  /            \  End  \   -   \
-   *                                     /   +   /       /              \       \   _   \
-   *                                    '---------------'                '---------------'
-   */
-   KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , 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_BSLS,
-   KC_DEL , KC_A   , QU_S   , QU_D   , QU_F   , KC_G   ,                                     KC_H   , QU_J   , QU_K   , QU_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,
-                     XXXXXXX, XXXXXXX,          RAISE  , SPC_L , ENT_L   , ENT_R  , SPC_R  , LOWER  ,          XXXXXXX, XXXXXXX,
-                                                         KC_EQL, KC_HOME , KC_END , KC_MINS
-   ),
-  [_RAISE] = LAYOUT_5x6_5(
-  /* RAISE
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                                  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      | Redo |      |      |      |      |                                  |   %  |   $  |  #   |   `  |      |  F12 |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      | All  | Cut  | Copy | Paste|      |                                  |   ^  |   /  |  *   |   ~  |  ?   |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      | Undo |      |      |      |      |                                  |      |   &  |  |   |      |      |      |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *               | RST  |      |    /       /---------------.    .---------------\       \    |      |      |
-   *               |      |      |   /       /       /       /      \       \       \       \   |      |      |
-   *               '-------------'  '-------/       /       /        \       \       \-------'  '-------------'
-   *                                       /---------------/          \---------------\
-   *                                      /       / Page  /            \  Page \       \
-   *                                     /       /  Up   /              \  Down \       \
-   *                                    '---------------'                '---------------'
-   */
-   _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                                     KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-   XXXXXXX, REDO   , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     KC_PERC, KC_DLR , KC_HASH, KC_GRV , XXXXXXX, KC_F12 ,
-   XXXXXXX, ALL    , CUT    , COPY   , PASTE  , XXXXXXX,                                     KC_CIRC, KC_SLSH, KC_ASTR, KC_TILD, KC_QUES, XXXXXXX,
-   _______, UNDO   , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, KC_AMPR, KC_PIPE, XXXXXXX, XXXXXXX, _______,
-                     QK_BOOT, XXXXXXX,          _______, _______, _______, _______, _______, _______,          XXXXXXX, XXXXXXX,
-                                                         _______, KC_PGUP, KC_PGDN, _______
-   ),
-  [_LOWER] = LAYOUT_5x6_5(
-  /* LOWER
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                                  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |   [  |   ]  |      |                                  |      |      |  up  |      |      |  F12 |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |  Ins |  !   |  @   |   (  |   )  |      |                                  |      | left | down | rght |  ?   |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |   {  |   }  |      |                                  |      |      |      |      |      |      |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *               |      |      |    /       /---------------.    .---------------\       \    |      | RST  |
-   *               |      |      |   /       /       /       /      \       \       \       \   |      |      |
-   *               '-------------'  '-------/       /       /        \       \       \-------'  '-------------'
-   *                                       /---------------/          \---------------\
-   *                                      /       / Page  /            \  Page \       \
-   *                                     /       /  Up   /              \  Down \       \
-   *                                    '---------------'                '---------------'
-   */
-   _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                                     KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-   XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX,                                     XXXXXXX, XXXXXXX, KC_UP  , XXXXXXX, XXXXXXX, KC_F12 ,
-   KC_INS , KC_EXLM, KC_AT  , KC_LPRN, KC_RPRN, XXXXXXX,                                     XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUES, XXXXXXX,
-   _______, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-                     XXXXXXX, XXXXXXX,          _______, _______, _______, _______, _______, _______,          XXXXXXX, QK_BOOT,
-                                                         _______, KC_PGUP, KC_PGDN, _______
-   ),
-  [_ADJUST] = LAYOUT_5x6_5(
-  /* ADJUST
-   * .-----------------------------------------.                                  .-----------------------------------------.
-   * |      |      |      |      |      | QWERT|                                  |COLEM |      |      |      |      |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |      |      |  V+  |                                  |  B + |      |      |      |      |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |      |      |  V-  |                                  |  B - |  <<  | play |  >>  |      |      |
-   * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-   * |      |      |      |      |      | Mute |                                  |      |      |      |      |      |      |
-   * '-----------------------------------------/                                  \-----------------------------------------'
-   *               |      |      |    /       /---------------.    .---------------\       \    |      |      |
-   *               |      |      |   /       /       /       /      \       \       \       \   |      |      |
-   *               '-------------'  '-------/       /       /        \       \       \-------'  '-------------'
-   *                                       /---------------/          \---------------\
-   *                                      /       /       /            \       \       \
-   *                                     /       /       /              \       \       \
-   *                                    '---------------'                '---------------'
-   */
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERT  ,                                     COLEM  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,                                     KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,                                     KC_BRID, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE,                                     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);
-}
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case SPC_L:
-      return true;
-   case SPC_R:
-      return false;
-   case ENT_L:
-      return true;
-   case ENT_R:
-      return true;
-    default:
-      return false;
-  }
-}
-
-// Flexible macOS-friendly Grave Escape
-// https://docs.qmk.fm/#/feature_key_overrides?id=flexible-macos-friendly-grave-escape
-
-const key_override_t tilde_esc_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, S(KC_GRAVE));
-const key_override_t grave_esc_override = ko_make_basic(MOD_MASK_GUI, KC_ESC, KC_GRAVE);
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &tilde_esc_override,
-    &grave_esc_override,
-    NULL
-};
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/rules.mk
deleted file mode 100644
index 88d1fb309dd..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE  = no
-KEY_OVERRIDE_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
deleted file mode 100644
index 421a1e62474..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2021 Bartosz Nowak (@dumam)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-    _QWERTY,   // daily use and coding
-    _MOVE,     // mouse, arrows, browsing useful keys
-    _CONF,     // machine settings, keyboard settings, backlight
-};
-#define _KC_SPC LT(_CONF, KC_SPC)
-#define _KC_ENT LT(_MOVE, KC_ENT)
-
-#define KC_SPEC SC_SENT // Right Shift when held, Enter when tapped
-#define KC_INS_ KC_INS
-#define KC_TAB_ KC_TAB
-#define RESET__ QK_BOOT
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT_6x6_5_thumb(
-
-    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_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,                          KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
-    KC_BSLS,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                          KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_EQL ,
-    KC_SLSH,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                          KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_LBRC,KC_RBRC,
-    KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,                          KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SCLN,KC_QUOT,
-                    KC_LGUI,KC_ESC ,                                                          KC_HOME,KC_END ,
-                                    _KC_SPC,                                          _KC_ENT,
-                                            KC_TAB_,KC_BSPC,          KC_DEL ,KC_RSFT,
-                                            KC_LCTL,KC_LALT,          KC_RALT,KC_RCTL
-  ),
-
-  [_CONF] = LAYOUT_6x6_5_thumb(
-
-    RESET__,XXXXXXX,XXXXXXX,XXXXXXX,KC_SLEP,KC_WAKE,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RESET__,
-    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_PGUP,XXXXXXX,                          XXXXXXX,KC_PGUP,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,KC_CAPS,KC_MENU,XXXXXXX,KC_PGDN,KC_LGUI,                          KC_LGUI,KC_PGDN,XXXXXXX,KC_INS_,KC_PSCR,XXXXXXX,
-                    _______,_______,                                                          _______,_______,
-                                    _______,                                          _______,
-                                            _______,_______,          _______,_______,
-                                            _______,_______,          _______,_______
-  ),
-
-  [_MOVE] = LAYOUT_6x6_5_thumb(
-
-    RESET__,XXXXXXX,XXXXXXX,KC_MPRV,KC_MPLY,KC_MPLY,                          KC_MUTE,KC_VOLD,KC_VOLU,XXXXXXX,XXXXXXX,RESET__,
-    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,KC_UP  ,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,KC_MS_L,KC_MS_D,KC_MS_R,XXXXXXX,                          XXXXXXX,KC_LEFT,KC_DOWN,KC_RGHT,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,KC_BTN1,KC_BTN3,KC_BTN2,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-                    _______,_______,                                                          _______,_______,
-                                    _______,                                          _______,
-                                            _______,_______,          _______,_______,
-                                            _______,_______,          _______,_______
-  ),
-};
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c
deleted file mode 100644
index d96ae996a59..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-Copyright 2021 Raphael Megzari <raphael@megzari.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 custom_layers {
- _COLEMAK_DH,
- _LEFT,
- _LEFT_UP,
- _RIGHT,
- _RIGHT_UP,
- _QWERTY
-};
-
-#define COLMAK TO(_COLEMAK_DH)
-#define QWERTY TO(_QWERTY)
-
-enum custom_keycodes {
-  EQ_SUP = SAFE_RANGE,
-  INF_EQ,
-  SUP_EQ,
-  INF_MIN,
-  MIN_SUP,
-  PIPE_R,
-  SUP_SUP,
-  INF_INF,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_COLEMAK_DH] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     QWERTY ,KC_Q   ,KC_W   ,KC_F   ,KC_P   ,KC_K   ,                         KC_Z   ,KC_L   ,KC_U   ,KC_Y   ,KC_COLN,_______,
-     _______,KC_A   ,KC_R   ,KC_S   ,KC_T   ,KC_G   ,                         KC_M   ,KC_N   ,KC_E   ,KC_I   ,KC_O   ,_______,
-     KC_LSFT,KC_J   ,KC_B   ,KC_C   ,KC_D   ,KC_V   ,                         KC_X   ,KC_H   ,KC_COMM,KC_DOT ,KC_QUES,KC_RSFT,
-                     KC_K   ,KC_V   ,                                                         KC_X   ,KC_Z   ,
-                     LT(_RIGHT_UP,KC_BSPC),LSFT_T(KC_ESC),            LT(_LEFT, KC_ENT),LT(_LEFT_UP,KC_SPC),
-                                   _______,LCTL_T(KC_DEL),               LGUI_T(KC_TAB),_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_QWERTY] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     COLMAK ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                         KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,_______,
-     _______,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                         KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_COLN,_______,
-     KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,                         KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_QUES,KC_RSFT,
-                     _______,_______,                                                         _______,_______,
-                     LT(_RIGHT_UP,KC_BSPC),LSFT_T(KC_ESC),            LT(_LEFT, KC_ENT),LT(_LEFT_UP,KC_SPC),
-                                   _______,LCTL_T(KC_DEL),               LGUI_T(KC_TAB),_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_LEFT] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,KC_PLUS,KC_CIRC,KC_AMPR,_______,                         _______,KC_EQL ,KC_PERC,KC_HASH,_______,_______,
-     _______,_______,KC_TILD,KC_DQUO,KC_PIPE,_______,                         _______,KC_LPRN,KC_LCBR,KC_LBRC,_______,_______,
-     _______,_______,KC_BSLS,KC_ASTR,KC_SLSH,_______,                         _______,KC_RPRN,KC_RCBR,KC_RBRC,_______,_______,
-                     _______,_______,                                                         _______,_______,
-                                     _______,_______,                         _______,_______,
-                                             _______,_______,         _______,_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_LEFT_UP] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,KC_LABK,KC_MINS,KC_RABK,_______,                         _______,KC_7   ,KC_8   ,KC_9   ,_______,_______,
-     _______,_______,KC_UNDS,KC_QUOT,KC_DLR ,KC_GRV ,                         _______,KC_4   ,KC_5   ,KC_6   ,KC_0   ,_______,
-     _______,_______,KC_SCLN,KC_AT  ,KC_EXLM,_______,                         _______,KC_1   ,KC_2   ,KC_3   ,_______,_______,
-                     _______,_______,                                                         _______,_______,
-                                     _______,_______,                         _______,_______,
-                                             _______,_______,         _______,_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_RIGHT] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-                     _______,_______,                                                         _______,_______,
-                                     _______,_______,                         _______,_______,
-                                             _______,_______,         _______,_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_RIGHT_UP] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______      ,_______    ,_______      ,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______      ,_______    ,_______      ,_______,_______,
-     _______,_______,INF_INF,_______,SUP_SUP,_______,                         _______,LCTL(KC_LEFT),KC_UP      ,LCTL(KC_RGHT),_______,_______,
-     _______,_______,MIN_SUP,EQ_SUP ,PIPE_R ,_______,                         _______,KC_LEFT      ,KC_DOWN    ,KC_RGHT      ,LGUI(KC_UP),_______,
-     _______,_______,INF_MIN,INF_EQ ,_______,_______,                         _______,_______      ,KC_CAPS    ,_______      ,_______,_______,
-                     _______,_______,                                                               _______    ,_______      ,
-                                     _______,_______,                         _______,_______,
-                                             _______,_______,         _______,_______,
-                                             _______,_______,         _______,_______
-  ),
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case PIPE_R:
-      if (record->event.pressed) {
-        SEND_STRING("|> ");
-      }
-      break;
-    case EQ_SUP:
-      if (record->event.pressed) {
-        SEND_STRING("=> ");
-      }
-      break;
-    case INF_EQ:
-      if (record->event.pressed) {
-        SEND_STRING("<= ");
-      }
-      break;
-    case MIN_SUP:
-      if (record->event.pressed) {
-        SEND_STRING("-> ");
-      }
-      break;
-    case INF_MIN:
-      if (record->event.pressed) {
-        SEND_STRING("<- ");
-      }
-      break;
-    case INF_INF:
-      if (record->event.pressed) {
-        SEND_STRING("<<");
-      }
-      break;
-    case SUP_SUP:
-      if (record->event.pressed) {
-        SEND_STRING(">>");
-      }
-      break;
-  }
-  return true;
-}
-
-
diff --git a/keyboards/handwired/dactyl_minidox/config.h b/keyboards/handwired/dactyl_minidox/config.h
index d84e9b64402..21ef0b32c28 100644
--- a/keyboards/handwired/dactyl_minidox/config.h
+++ b/keyboards/handwired/dactyl_minidox/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// WS2812 RGB LED strip input and number of LEDs
-#define RGB_MATRIX_LED_COUNT 36
-#define RGB_MATRIX_SPLIT { 18, 18 }
-#define RGB_MATRIX_CENTER { 133, 54 }
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #undef LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/dactyl_minidox/info.json b/keyboards/handwired/dactyl_minidox/info.json
index a94f517b52c..36f71ea525e 100644
--- a/keyboards/handwired/dactyl_minidox/info.json
+++ b/keyboards/handwired/dactyl_minidox/info.json
@@ -20,7 +20,9 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "center_point": [133, 54],
+        "driver": "ws2812",
+        "split_count": [18, 18]
     },
     "matrix_pins": {
         "cols": ["C6", "D7", "E6", "B4", "B5"],
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h b/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
index 783a2c46b14..a37a54c8fc1 100644
--- a/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
+++ b/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
@@ -43,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 // #  define RGB_MATRIX_TIMEOUT 300000 // number of milliseconds to wait until disabling effects
-// #  define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+// #  define RGB_MATRIX_SLEEP // turn off effects when suspended
 #  define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash. 
diff --git a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/config.h b/keyboards/handwired/dactyl_promicro/keymaps/impstyle/config.h
deleted file mode 100644
index bbcd4fdcf64..00000000000
--- a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MASTER_RIGHT
-// #define MASTER_RIGHT
-//#define EE_HANDS
-// Rows are doubled-up
diff --git a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c b/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c
deleted file mode 100644
index 7a579aef075..00000000000
--- a/keyboards/handwired/dactyl_promicro/keymaps/impstyle/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/* A QWERTY 3 Layer layout for the Dactyl Manuform 6x6 Keyboard */ 
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-  [_QWERTY] = LAYOUT_6x6(
-     KC_ESC  ,  KC_1  , KC_2  , KC_3  ,  KC_4  , KC_5  ,      KC_6  , KC_7   , KC_8   , KC_9   , KC_0  ,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_MINS,
-     KC_LSFT ,  KC_A  , KC_S  , KC_D  ,  KC_F  , KC_G  ,      KC_H  , KC_J   , KC_K   , KC_L   ,KC_SCLN,KC_QUOT,
-     KC_LCTL ,  KC_Z  , KC_X  , KC_C  ,  KC_V  , KC_B  ,      KC_N  , KC_M   ,KC_COMM , KC_DOT ,KC_SLSH,KC_BSLS,
-     KC_PLUS , KC_LEFT,KC_UP  ,KC_DOWN, KC_RGHT, RAISE ,      LOWER , KC_HOME, KC_PGUP, KC_PGDN,KC_END ,KC_EQL,
-               _______,KC_LALT,KC_PSCR, KC_LGUI, KC_SPC,      KC_ENT,KC_GRAVE, KC_AT  ,KC_PSCR ,_______
-                                                             
-  ),
-
-
-  [_LOWER] = LAYOUT_6x6(
-     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_LBRC,         KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
-     _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,         KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
-     _______,_______,_______,_______,_______,KC_PSCR,         KC_P0  , KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS,
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,             
-             _______,_______,_______,_______,_______,         _______,_______,_______,_______,_______
-),
-
-  [_RAISE] = LAYOUT_6x6(
-     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,         KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-     _______,_______,_______,_______,_______,KC_LBRC,         KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
-     _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,         KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,KC_VOLD,
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
-             _______,_______,_______,_______,_______,         _______,_______,_______,_______,_______
-  ),
-
-  };
diff --git a/keyboards/handwired/dygma/raise/config.h b/keyboards/handwired/dygma/raise/config.h
index f32a9ea4f08..af073f49881 100644
--- a/keyboards/handwired/dygma/raise/config.h
+++ b/keyboards/handwired/dygma/raise/config.h
@@ -20,35 +20,3 @@
 // rows are doubled for split
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8
-
-#define RGB_MATRIX_LED_COUNT 132
-
-#ifdef RGB_MATRIX_ENABLE
-// At the default flush limit of 16ms (~62.5 fps), the matrix scan rate is approximately
-// ~140 scans per second under full load (when changes are being made to the LED state).
-// Such a low scan rate will have impact the keyboard's accuracy for faster typists.
-//
-// With RGB completely disabled, the matrix scan rate is ~660 scans per second, and typing
-// accuracy feels on par with the Dygma Raise Neuron.
-//
-// At 100ms (10 fps), the matrix scan rate is ~355 scans per second under full load, and typing
-// accuracy is reasonably good.
-#define RGB_MATRIX_LED_FLUSH_LIMIT 100
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// 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
-#endif
diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json
index 5c287bcc7e6..b9bcd2e639c 100644
--- a/keyboards/handwired/dygma/raise/info.json
+++ b/keyboards/handwired/dygma/raise/info.json
@@ -9,7 +9,20 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "custom"
+        "animations": {
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true
+        },
+        "driver": "custom",
+        "led_flush_limit": 100,
+        "sleep": true
     },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/handwired/frenchdev/frenchdev.c b/keyboards/handwired/frenchdev/frenchdev.c
index 6eed4de5ff0..65f1ccce4b9 100644
--- a/keyboards/handwired/frenchdev/frenchdev.c
+++ b/keyboards/handwired/frenchdev/frenchdev.c
@@ -83,23 +83,16 @@ uint8_t init_mcp23018(void) {
     // - unused  : input  : 1
     // - input   : input  : 1
     // - driving : output : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(IODIRA, I2C_TIMEOUT);            if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00000000, I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00111111, I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    i2c_stop();
-
-    // set pull-up
-    // - unused  : on  : 1
-    // - input   : on  : 1
-    // - driving : off : 0
-    mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);    if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(GPPUA, I2C_TIMEOUT);             if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00000000, I2C_TIMEOUT);        if (mcp23018_status) goto out;
-    mcp23018_status = i2c_write(0b00111111, I2C_TIMEOUT);        if (mcp23018_status) goto out;
-
-out:
-    i2c_stop();
+    uint8_t data[] = {0b00000000, 0b00111111};
+    mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
+
+    if (!mcp23018_status) {
+        // set pull-up
+        // - unused  : on  : 1
+        // - input   : on  : 1
+        // - driving : off : 0
+        mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
+    }
 
     // SREG=sreg_prev;
 
diff --git a/keyboards/handwired/frenchdev/frenchdev.h b/keyboards/handwired/frenchdev/frenchdev.h
index 6bea49d87b9..0f1ac7dcaad 100644
--- a/keyboards/handwired/frenchdev/frenchdev.h
+++ b/keyboards/handwired/frenchdev/frenchdev.h
@@ -7,9 +7,7 @@
 #include <util/delay.h>
 
 // I2C aliases and register addresses (see "mcp23018.md" on tmk repository)
-#define I2C_ADDR        0b0100000
-#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
-#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define I2C_ADDR        (0b0100000<<1)
 #define IODIRA          0x00            // i/o direction register
 #define IODIRB          0x01
 #define GPPUA           0x0C            // GPIO pull-up resistor register
diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c
index 3e859d47ef7..af7c8b54442 100644
--- a/keyboards/handwired/frenchdev/matrix.c
+++ b/keyboards/handwired/frenchdev/matrix.c
@@ -151,7 +151,7 @@ uint8_t matrix_scan(void)
         if (matrix_debouncing[i] != cols) {
             matrix_debouncing[i] = cols;
             if (debouncing) {
-                debug("bounce!: "); debug_hex(debouncing); debug("\n");
+                dprintf("bounce!: %02X\n", debouncing);
             }
             debouncing = DEBOUNCE;
         }
@@ -224,15 +224,9 @@ static matrix_row_t read_cols(uint8_t row)
             return 0;
         } else {
             uint8_t data = 0;
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);   if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOB, I2C_TIMEOUT);            if (mcp23018_status) goto out;
-            mcp23018_status = i2c_start(I2C_ADDR_READ, I2C_TIMEOUT);    if (mcp23018_status) goto out;
-            data = i2c_read_nack(I2C_TIMEOUT);                         if (mcp23018_status < 0) goto out;
-            data = ~((uint8_t)mcp23018_status);
-            mcp23018_status = I2C_STATUS_SUCCESS;
-        out:
-            i2c_stop();
-            return data;
+            mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT);
+
+            return ~data;
         }
     } else {
         // read from teensy
@@ -263,11 +257,10 @@ static void unselect_rows(void)
         // do nothing
     } else {
         // set all rows hi-Z : 1
-        mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);    if (mcp23018_status) goto out;
-        mcp23018_status = i2c_write(GPIOA, I2C_TIMEOUT);             if (mcp23018_status) goto out;
-        mcp23018_status = i2c_write( 0xFF & ~(0<<8), I2C_TIMEOUT);   if (mcp23018_status) goto out;
-    out:
-        i2c_stop();
+        uint8_t data;
+        data = 0xFF & ~(0<<8);
+        mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
+
     }
 
     // unselect on teensy
@@ -289,11 +282,8 @@ static void select_row(uint8_t row)
         } else {
             // set active row low  : 0
             // set other rows hi-Z : 1
-            mcp23018_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);                          if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write(GPIOA, I2C_TIMEOUT);                                   if (mcp23018_status) goto out;
-            mcp23018_status = i2c_write( 0xFF & ~(1<<row) & ~(0<<8), I2C_TIMEOUT);             if (mcp23018_status) goto out;
-        out:
-            i2c_stop();
+            uint8_t data = 0xFF & ~(1<<row) & ~(0<<8);
+            mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
         }
     } else {
         // select on teensy
diff --git a/keyboards/handwired/freoduo/keymaps/default/keymap.c b/keyboards/handwired/freoduo/keymaps/default/keymap.c
index bd01de7585f..791e6af318d 100644
--- a/keyboards/handwired/freoduo/keymaps/default/keymap.c
+++ b/keyboards/handwired/freoduo/keymaps/default/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
     {0, 7, 0},
     {7, 24, HSV_RED},
-    {24, RGBLED_NUM, 0}
+    {24, RGBLIGHT_LED_COUNT, 0}
 );
 // Light all LEDs in green when keyboard layer 1 is active
 const rgblight_segment_t PROGMEM layer_lower[] = RGBLIGHT_LAYER_SEGMENTS(
diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h
index bfa158713df..9f9d81bea91 100644
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/config.h
@@ -17,56 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 30
-// 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
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json
index a399ffedf5d..63017532e3e 100644
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/info.json
@@ -9,6 +9,51 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812"
     },
     "matrix_pins": {
diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h
deleted file mode 100644
index 7b61de013bc..00000000000
--- a/keyboards/handwired/hnah40rgb/config.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright 2019 HnahKB
-
-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 RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 50
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#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 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
-// 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
-#    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
diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json
index fce74cefef5..51a934564c3 100644
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/info.json
@@ -12,7 +12,58 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "ws2812",
+        "led_flush_limit": 16,
+        "max_brightness": 200,
+        "react_on_keyup": true
     },
     "matrix_pins": {
         "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/handwired/hnah40rgb/keymaps/default/config.h b/keyboards/handwired/hnah40rgb/keymaps/default/config.h
deleted file mode 100644
index aa9325a59db..00000000000
--- a/keyboards/handwired/hnah40rgb/keymaps/default/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * 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
diff --git a/keyboards/handwired/jotlily60/info.json b/keyboards/handwired/jotlily60/info.json
new file mode 100644
index 00000000000..65faa354a51
--- /dev/null
+++ b/keyboards/handwired/jotlily60/info.json
@@ -0,0 +1,104 @@
+{
+    "manufacturer": "Jotix",
+    "keyboard_name": "jotlily60",
+    "maintainer" : "jotix",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/jotlily60",
+    "usb": {
+        "vid": "0x4A4F",
+        "pid": "0x2332",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": [ "D0", "D4", "C6", "D7", "E6", "B4", "B5" ],
+        "rows": [ "F7", "B1", "B3", "B2", "B6" ],
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 10, "y": 0.25},
+                {"matrix": [5, 4], "x": 11, "y": 0.25},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0.25},
+                {"matrix": [5, 1], "x": 14, "y": 0.5},
+                {"matrix": [5, 0], "x": 15, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 10, "y": 1.25},
+                {"matrix": [6, 4], "x": 11, "y": 1.25},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1.25},
+                {"matrix": [6, 1], "x": 14, "y": 1.5},
+                {"matrix": [6, 0], "x": 15, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 10, "y": 2.25},
+                {"matrix": [7, 4], "x": 11, "y": 2.25},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 2], "x": 13, "y": 2.25},
+                {"matrix": [7, 1], "x": 14, "y": 2.5},
+                {"matrix": [7, 0], "x": 15, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6, "y": 3.5},
+
+                {"matrix": [8, 6], "x":  9, "y": 3.5},
+                {"matrix": [8, 5], "x": 10, "y": 3.25},
+                {"matrix": [8, 4], "x": 11, "y": 3.25},
+                {"matrix": [8, 3], "x": 12, "y": 3},
+                {"matrix": [8, 2], "x": 13, "y": 3.25},
+                {"matrix": [8, 1], "x": 14, "y": 3.5},
+                {"matrix": [8, 0], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.25},
+                {"matrix": [4, 5], "x": 5, "y": 4.5},
+                {"matrix": [4, 6], "x": 6, "y": 4.75},
+
+                {"matrix": [9, 6], "x": 9,  "y": 4.75},
+                {"matrix": [9, 5], "x": 10, "y": 4.5},
+                {"matrix": [9, 4], "x": 11, "y": 4.25},
+                {"matrix": [9, 3], "x": 12, "y": 4},
+                {"matrix": [9, 2], "x": 13, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jotlily60/keymaps/default/keymap.c b/keyboards/handwired/jotlily60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..bccd8225770
--- /dev/null
+++ b/keyboards/handwired/jotlily60/keymaps/default/keymap.c
@@ -0,0 +1,65 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+enum layers {
+    _QWERTY,
+    _FN,
+    _ADJUST
+};
+
+#define FN MO(_FN)
+#define ADJUST MO(_ADJUST)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * +-------+-------+-------+-------+-------+-------+               +-------+-------+-------+-------+-------+-------+
+ * |   =   |   1   |   2   |   3   |   4   |   5   |               |   6   |   7   |   8   |   9   |   0   |   -   |
+ * +-------+-------+-------+-------+-------+-------+               +-------+-------+-------+-------+-------+-------+
+ * |  esc  |   Q   |   W   |   E   |   R   |   T   |               |   Y   |   U   |   I   |   O   |   P   |  tab  |
+ * +-------+-------+-------+-------+-------+-------+               +-------+-------+-------+-------+-------+-------+
+ * | caps  |   A   |   S   |   D   |   F   |   G   |               |   H   |   J   |   K   |   L   |   ;   |   '   |
+ * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+ * | shift |   Z   |   X   |   C   |   V   |   B   |   {   |   }   |   N   |   M   |   ,   |   .   |   /   | enter |
+ * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+ *                 |  alt  | super |  ctrl | space |   fn  |   fn  | bspc  |  del  |  meh  |  ralt |
+ *                 +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+ */
+[_QWERTY] = LAYOUT (
+    KC_EQL, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,                   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,
+    KC_ESC, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_TAB,
+    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_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_LCBR,KC_RCBR,KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_ENT,
+                    KC_LALT,KC_LGUI,KC_LCTL,KC_SPC, FN,     FN,     KC_BSPC,KC_DEL, KC_MEH, KC_RALT
+),
+
+/* +-------+-------+-------+-------+-------+-------+               +-------+-------+-------+-------+-------+-------+
+ * |   +   |   !   |   @   |   #   |   $   |   %   |               |   ^   |   &   |   *   |   (   |   )   |   _   |
+ * +-------+-------+-------+-------+-------+-------+               +-------+-------+-------+-------+-------+-------+
+ * |adjust |   F1  |   F2  |   F3  |   F4  |   F5  |               |   F6  |   F7  |   F8  |   F9  |  F10  |       |
+ * +-------+-------+-------+-------+-------+-------+               +-------+-------+-------+-------+-------+-------+
+ * |       |  F11  |  F12  |  F13  |  F14  |  F15  |               |  left |  down |   up  | right |   |   |   "   |
+ * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+ * |       |  vol- |  mute |  vol+ |   `   |   ~   |   [   |   ]   |  home |  end  | pgup  | pgdn  |   \   |       |
+ * +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+ *                 |       |       |       |       |       |       |       |       |       |       |
+ *                 +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+ */
+[_FN] = LAYOUT (
+    KC_PLUS,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,                KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,
+    ADJUST, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,                  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, _______,  
+    _______,KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,                 KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_BSLS,KC_DQUO,
+    _______,KC_VOLD,KC_MUTE,KC_VOLU,KC_GRV, KC_TILD,KC_LBRC,KC_RBRC,KC_HOME,KC_END, KC_PGUP,KC_PGDN,KC_PIPE,_______, 
+                    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+),
+
+[_ADJUST] = LAYOUT (
+    _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
+    _______,QK_BOOT,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,DB_TOGG,_______,_______,                _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+                    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+),
+};
+
diff --git a/keyboards/handwired/jotlily60/keymaps/via/keymap.c b/keyboards/handwired/jotlily60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d498a72cf6f
--- /dev/null
+++ b/keyboards/handwired/jotlily60/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT (
+    KC_EQL, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,                   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,
+    KC_ESC, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_TAB,
+    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_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_LCBR,KC_RCBR,KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_ENT,
+                    KC_LALT,KC_LGUI,KC_LCTL,KC_SPC, MO(1),  MO(1),  KC_BSPC,KC_DEL, KC_MEH, KC_RALT
+),
+
+[1] = LAYOUT (
+    KC_PLUS,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,                KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,
+    MO(2),  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,                  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, _______,  
+    _______,KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,                 KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_BSLS,KC_DQUO,
+    _______,KC_VOLD,KC_MUTE,KC_VOLU,KC_GRV, KC_TILD,KC_LBRC,KC_RBRC,KC_HOME,KC_END, KC_PGUP,KC_PGDN,KC_PIPE,_______, 
+                    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+),
+
+[2] = LAYOUT (
+    _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
+    _______,QK_BOOT,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+                    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+)
+};
diff --git a/keyboards/moonlander/keymaps/via/rules.mk b/keyboards/handwired/jotlily60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/moonlander/keymaps/via/rules.mk
rename to keyboards/handwired/jotlily60/keymaps/via/rules.mk
diff --git a/keyboards/handwired/jotlily60/keymaps/vial/config.h b/keyboards/handwired/jotlily60/keymaps/vial/config.h
new file mode 100644
index 00000000000..164a4dc0fa1
--- /dev/null
+++ b/keyboards/handwired/jotlily60/keymaps/vial/config.h
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Configuration for Vial 
+#define VIAL_KEYBOARD_UID {0x6B, 0xD2, 0xFF, 0x76, 0x26, 0xEE, 0x35, 0xE2}
+
+// to unlock the keyboard
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 6 }
+
+// number of layers
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
\ No newline at end of file
diff --git a/keyboards/handwired/jotlily60/keymaps/vial/keymap.c b/keyboards/handwired/jotlily60/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..d498a72cf6f
--- /dev/null
+++ b/keyboards/handwired/jotlily60/keymaps/vial/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT (
+    KC_EQL, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,                   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,
+    KC_ESC, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_TAB,
+    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_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_LCBR,KC_RCBR,KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_ENT,
+                    KC_LALT,KC_LGUI,KC_LCTL,KC_SPC, MO(1),  MO(1),  KC_BSPC,KC_DEL, KC_MEH, KC_RALT
+),
+
+[1] = LAYOUT (
+    KC_PLUS,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,                KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,
+    MO(2),  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,                  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, _______,  
+    _______,KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,                 KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_BSLS,KC_DQUO,
+    _______,KC_VOLD,KC_MUTE,KC_VOLU,KC_GRV, KC_TILD,KC_LBRC,KC_RBRC,KC_HOME,KC_END, KC_PGUP,KC_PGDN,KC_PIPE,_______, 
+                    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+),
+
+[2] = LAYOUT (
+    _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
+    _______,QK_BOOT,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+                    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______
+)
+};
diff --git a/keyboards/handwired/jotlily60/keymaps/vial/rules.mk b/keyboards/handwired/jotlily60/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..b1f3ec8e4d0
--- /dev/null
+++ b/keyboards/handwired/jotlily60/keymaps/vial/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+KEY_OVERRIDE_ENABLE = no
diff --git a/keyboards/handwired/jotlily60/keymaps/vial/vial.json b/keyboards/handwired/jotlily60/keymaps/vial/vial.json
new file mode 100755
index 00000000000..9faf8b21bec
--- /dev/null
+++ b/keyboards/handwired/jotlily60/keymaps/vial/vial.json
@@ -0,0 +1,19 @@
+{
+    "name": "jotlily60",
+    "vendorId": "0x4A4F",
+    "productId": "0x2332",
+    "matrix":
+    {
+        "rows": 10,
+        "cols": 7
+    },
+    "layouts": {
+        "keymap": [
+            [ "0,0", "0,1", "0,2", "0,3", "0,4", "0,5", {"x": 3}, "5,5", "5,4", "5,3", "5,2", "5,1", "5,0" ],
+            [ "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", {"x": 3}, "6,5", "6,4", "6,3", "6,2", "6,1", "6,0" ],
+            [ "2,0", "2,1", "2,2", "2,3", "2,4", "2,5", {"x": 3}, "7,5", "7,4", "7,3", "7,2", "7,1", "7,0" ],
+            [ "3,0", "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", {"x": 1}, "8,6", "8,5", "8,4", "8,3", "8,2", "8,1", "8,0" ],
+            [ {"x": 2}, "4,2", "4,3", "4,4", "4,5", "4,6", {"x": 1},  "9,6", "9,5", "9,4", "9,3", "9,2" ]
+        ]
+    }
+}
diff --git a/keyboards/handwired/jotlily60/readme.md b/keyboards/handwired/jotlily60/readme.md
new file mode 100644
index 00000000000..d0a8750d0ef
--- /dev/null
+++ b/keyboards/handwired/jotlily60/readme.md
@@ -0,0 +1,55 @@
+# jotlily60
+
+![jotlily60](https://i.imgur.com/I68WGmJh.jpg)
+
+A split keyboard kit made by jotix, inspired in the Lily58 keyboard.
+
+* Keyboard Maintainer: [jotix](https://github.com/jotix)
+* Hardware Supported: Arduino Pro Micro
+
+---
+
+### Arduino Pro Micro Pinout
+
+| Rows        | 0  | 1  | 2  | 3  | 4  |
+|-------------|----|----|----|----|----|
+| Arduino pin | A0 | 15 | 14 | 16 | 10 |
+| QMK pin     | F7 | B1 | B3 | B2 | B6 |
+
+| Columns     | 0  | 1  | 2  | 3  | 4  | 5  | 6  |
+|-------------|----|----|----|----|----|----|----|
+| Arduino pin |  3 |  4 |  5 |  6 |  7 |  8 |  9 |
+| QMK pin     | D0 | D4 | C6 | D7 | E6 | B4 | B5 |
+
+| Serial      |     |
+|-------------|-----|
+| Arduino pin | TX0 |
+| QMK pin     |  D3 |
+
+---
+
+### Compiling the Firmware
+
+Compile example for this keyboard (after setting up your build environment):
+    
+    qmk compile -kb handwired/jotlily60 -km default 
+   
+---
+
+### The Defaukt Keymap
+
+    +-------+-------+-------+-------+-------+-------+               +-------+-------+-------+-------+-------+-------+
+    |   =   |   1   |   2   |   3   |   4   |   5   |               |   6   |   7   |   8   |   9   |   0   |   -   |
+    +-------+-------+-------+-------+-------+-------+               +-------+-------+-------+-------+-------+-------+
+    |  esc  |   Q   |   W   |   E   |   R   |   T   |               |   Y   |   U   |   I   |   O   |   P   |  tab  |
+    +-------+-------+-------+-------+-------+-------+               +-------+-------+-------+-------+-------+-------+
+    | caps  |   A   |   S   |   D   |   F   |   G   |               |   H   |   J   |   K   |   L   |   ;   |   '   |
+    +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+    | shift |   Z   |   X   |   C   |   V   |   B   |   {   |   }   |   N   |   M   |   ,   |   .   |   /   | enter |
+    +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+                    |  alt  | super |  ctrl | space |   fn  |   fn  | bspc  |  del  |  meh  |  ralt |
+                    +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
+
+---
+
+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/handwired/jotlily60/rules.mk b/keyboards/handwired/jotlily60/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/jotlily60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c b/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c
deleted file mode 100644
index fdbc3c8a391..00000000000
--- a/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include QMK_KEYBOARD_H
-
-//Tap Dance Declarations
-enum {
-  TD_DOT_COMMAS = 0
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Esc, twice for Caps Lock
-  [TD_DOT_COMMAS]  = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_COMMA)
-// Other declarations would go here, separated by commas, if you have them
-};
-
-//In Layer declaration, add tap dance item in place of a key code
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-   * ,-------------------.
-   * |bcsp| /  | *  | -  |
-   * |----|----|----|----|
-   * | 7  | 8  | 9  |    |
-   * |----|----|----| +  |
-   * | 4  | 5  | 6  |    |
-   * |----|----|----|----|
-   * | 1  | 2  | 3  |    |
-   * |----|----|----| En |
-   * |   FN/0  | .  |    |
-   * `-------------------'
-   */
-
-  [0] = LAYOUT_numpad_5x4(
-    KC_BSPC, 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,   
-    LT(1, KC_P0), TD(TD_DOT_COMMAS),  KC_PENT  
-  ),
-  /*
-   * ,-------------------.
-   * | F10| F11| F12| -  |
-   * |----|----|----|----|
-   * | F7 | F8 | F9 |    |
-   * |----|----|----| vol|
-   * | F4 | F5 | F6 |  + |
-   * |----|----|----|----|
-   * | F1 | F2 | F3 | vol|
-   * |----|----|----|  - |
-   * |    FN   | .  |    |
-   * `-------------------'
-   */
-  [1] = LAYOUT_numpad_5x4(
-    KC_F10, KC_F11, KC_F12, KC_NO, 
-    KC_F7,   KC_F8,   KC_F9,   
-    KC_F4,   KC_F5,   KC_F6, KC_VOLU, 
-    KC_F1,   KC_F2,   KC_F3,   
-    KC_NO, KC_PDOT,  KC_VOLD  
-  )
-};
diff --git a/keyboards/handwired/k_numpad17/keymaps/karlssn/rules.mk b/keyboards/handwired/k_numpad17/keymaps/karlssn/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/handwired/k_numpad17/keymaps/karlssn/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
deleted file mode 100644
index 0114d6c7f92..00000000000
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Dimitris Papavasiliou <dpapavas@protonmail.ch>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 175
-#define TAPPING_TERM_PER_KEY
-#define PERMISSIVE_HOLD_PER_KEY
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
deleted file mode 100644
index 8d2ecd9c791..00000000000
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* Copyright 2020 Dimitris Papavasiliou <dpapavas@protonmail.ch>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#define CAPS_SFT MT(MOD_LSFT, KC_CAPS)
-#define QUOT_SFT MT(MOD_RSFT, KC_QUOT)
-#define PSCR_SFT MT(MOD_LSFT, KC_PSCR)
-#define PAUSE_SFT MT(MOD_RSFT, KC_PAUSE)
-#define F_SFT MT(MOD_LSFT, KC_F)
-#define J_SFT MT(MOD_RSFT, KC_J)
-#define PGUP_GUI MT(MOD_LGUI, KC_PGUP)
-#define END_GUI MT(MOD_LGUI, KC_END)
-#define UP_GUI MT(MOD_RGUI, KC_UP)
-#define LEFT_GUI MT(MOD_RGUI, KC_LEFT)
-#define EQL_CTL MT(MOD_RCTL, KC_EQL)
-#define MINS_CTL MT(MOD_LCTL, KC_MINS)
-#define BSPC_ALT LALT_T(KC_BSPC)
-#define ENT_ALT LALT_T(KC_ENT)
-#define SPC_ALT RALT_T(KC_SPC)
-#define DEL_ALT RALT_T(KC_DEL)
-
-enum tapdance_keycodes {
-    TD_LEFT,
-    TD_RGHT,
-    TD_C_X
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-                           /* Left hand */                                                                                       /* Right hand */
-
-        KC_GRV,   KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                   KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    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_BSLS,
-        CAPS_SFT, KC_A,    KC_S,    KC_D,     F_SFT,    KC_G,                                                   KC_H,    J_SFT,   KC_K,     KC_L,     KC_SCLN, QUOT_SFT,
-        PSCR_SFT, KC_Z,    KC_X,    KC_C,     KC_V,     KC_B,                                                   KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, PAUSE_SFT,
-
-        TD(TD_LEFT),       KC_INS,  KC_LBRC, MINS_CTL, BSPC_ALT, DEL_ALT, TD(TD_C_X),   TD(TD_C_X), ENT_ALT,  SPC_ALT,  EQL_CTL, KC_RBRC, KC_DEL,          TD(TD_RGHT),
-                                             KC_HOME,  PGUP_GUI, END_GUI,                           LEFT_GUI, UP_GUI,   KC_RGHT,
-                                                       KC_PGDN,                                               KC_DOWN
-        ),
-
-  [1] = LAYOUT(
-                          /* Left hand */                                                                        /* Right hand */
-
-        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11,
-        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, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,
-                                                     KC_TRNS,                                   KC_TRNS
-        ),
-};
-
-/* The following helper macros define tap dances that support
- * separated press, release, tap and double-tap functions. */
-
-#define STEPS(DANCE) [DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(            \
-        NULL,                                                           \
-        dance_ ## DANCE ## _finished,                                   \
-        dance_ ## DANCE ## _reset)
-
-#define CHOREOGRAPH(DANCE, PRESS, RELEASE, TAP, DOUBLETAP)              \
-    static bool dance_ ## DANCE ## _pressed;                            \
-                                                                        \
-    void dance_ ## DANCE ## _finished(tap_dance_state_t *state, void *user_data) { \
-        if (state->count == 1) {                                        \
-            if (state->pressed) {                                       \
-                dance_ ## DANCE ## _pressed = true;                     \
-                PRESS;                                                  \
-            } else {                                                    \
-                TAP;                                                    \
-            }                                                           \
-        } else if (state->count == 2) {                                 \
-            if (!state->pressed) {                                      \
-                DOUBLETAP;                                              \
-            }                                                           \
-        }                                                               \
-    }                                                                   \
-                                                                        \
-    void dance_ ## DANCE ## _reset(tap_dance_state_t *state, void *user_data) { \
-        if (state->count == 1) {                                        \
-            if (dance_ ## DANCE ## _pressed) {                          \
-                RELEASE;                                                \
-                dance_ ## DANCE ## _pressed = false;                    \
-            }                                                           \
-        }                                                               \
-    }
-
-/* Define dance for left palm key. */
-
-CHOREOGRAPH(TD_LEFT,
-            layer_invert(1),    /* Temporarily toggle layer when held. */
-            layer_invert(1),
-
-            /* Press and release both shifts on tap, to change
-             * keyboard layout (i.e. language). */
-
-            SEND_STRING(SS_DOWN(X_LSFT) SS_DOWN(X_RSFT)
-                        SS_UP(X_LSFT) SS_UP(X_RSFT)),
-
-            layer_invert(1));   /* Toggle layer (permanently) on
-                                 * double-tap. */
-
-/* Define dance for right palm key. */
-
-CHOREOGRAPH(TD_RGHT,
-            layer_invert(1),    /* Same as above */
-            layer_invert(1),
-            /* Send a complex macro: C-x C-s Mod-t up.  (Save in
-             * Emacs, switch to terminal and recall previous command,
-             * hopefully a compile command.) */
-            SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_X) SS_TAP(X_S) SS_UP(X_LCTL)
-                        SS_DOWN(X_LGUI) SS_TAP(X_T) SS_UP(X_LGUI) SS_TAP(X_UP)),
-            layer_invert(1));
-
-/* This facilitates C-x chords in Emacs.  Used as a modifier along
- * with, say, the s-key, it saves, by sending C-x C-s.  When tapped it
- * just sends C-x. */
-
-CHOREOGRAPH(TD_C_X,
-            SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_X)),
-            SEND_STRING(SS_UP(X_LCTL)),
-            SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_X) SS_UP(X_LCTL)),);
-
-tap_dance_action_t tap_dance_actions[] = {
-    STEPS(TD_LEFT), STEPS(TD_RGHT), STEPS(TD_C_X)
-};
-
-/* Set a longer tapping term for palm keys to allow comfortable
- * permanent layer toggle.  Also set an essentially infinite tapping
- * term for certain mod-tap keys one tends to keep pressed (such as
- * space, backspace, etc.).  This prevents sending the modifier
- * keycode by accident (allowing re-tap to get repeated key-press)
- * and, in combination with permissive hold, they can still be used
- * fine as modifiers. */
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_LEFT):
-        case TD(TD_RGHT):
-             return 250;
-        case BSPC_ALT:
-        case UP_GUI:
-        case LEFT_GUI:
-            return 5000;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_LEFT):
-        case TD(TD_RGHT):
-        case BSPC_ALT:
-        case UP_GUI:
-        case LEFT_GUI:
-            return true;
-        default:
-            return false;
-    }
-}
-
-/* Use the first LED to indicate the active layer. */
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(D0, (get_highest_layer(state) > 0));
-
-    return state;
-}
-
-/* Cycle through the LEDs after initialization. */
-
-void keyboard_post_init_user(void) {
-    const pin_t pins[] = {D0, D1, D2};
-    uint8_t i, j;
-
-    for (i = 0 ; i < ARRAY_SIZE(pins) + 2 ; i += 1) {
-        for (j = 0 ; j < ARRAY_SIZE(pins); j += 1) {
-            setPinOutput(pins[j]);
-            writePin(pins[j], (j == i || j == i - 1));
-        }
-
-        wait_ms(100);
-    }
-}
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/rules.mk b/keyboards/handwired/lagrange/keymaps/dpapavas/rules.mk
deleted file mode 100644
index 42f42f627ac..00000000000
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enable additional features.
-
-DEBOUNCE_TYPE = sym_defer_pk
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/macro3/info.json b/keyboards/handwired/macro3/info.json
similarity index 100%
rename from keyboards/macro3/info.json
rename to keyboards/handwired/macro3/info.json
diff --git a/keyboards/macro3/keymaps/default/keymap.c b/keyboards/handwired/macro3/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/macro3/keymaps/default/keymap.c
rename to keyboards/handwired/macro3/keymaps/default/keymap.c
diff --git a/keyboards/handwired/macro3/keymaps/default/rules.mk b/keyboards/handwired/macro3/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/handwired/macro3/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/macro3/macro3.c b/keyboards/handwired/macro3/macro3.c
similarity index 100%
rename from keyboards/macro3/macro3.c
rename to keyboards/handwired/macro3/macro3.c
diff --git a/keyboards/handwired/macro3/readme.md b/keyboards/handwired/macro3/readme.md
new file mode 100644
index 00000000000..185496ac8bd
--- /dev/null
+++ b/keyboards/handwired/macro3/readme.md
@@ -0,0 +1,26 @@
+# Macro3
+
+![Macro3](https://github.com/filterpaper/filterpaper.github.io/raw/main/images/macro3.png)
+
+Macro3 is a low-profile macro pad with dual encoder support designed by [@davidphilipbarr](https://github.com/davidphilipbarr).
+
+## Keyboard Info
+
+* Keyboard Maintainer: [filterpaper](https://github.com/filterpaper)
+* Hardware Supported: Macro3
+* Hardware Availability: [Open-source](https://github.com/davidphilipbarr/Macropads/tree/main/macro3)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/macro3: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 right key and plug in the controller.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured.
+* **Physical reset pins**: Briefly short the RST and GND pins on the microcontroller using tweezers, a paperclip, or any other conductive material.
+
diff --git a/keyboards/handwired/macro3/rules.mk b/keyboards/handwired/macro3/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/macro3/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/marauder/keymaps/orvia/keymap.c b/keyboards/handwired/marauder/keymaps/orvia/keymap.c
deleted file mode 100644
index 53463fa002a..00000000000
--- a/keyboards/handwired/marauder/keymaps/orvia/keymap.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Copyright 2021 BB-66
- *
- * 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
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-
-char wpm_str[4];
-
-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_PAUS, KC_PSCR, KC_SCRL, 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_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,
-        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_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,
-        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_KP_4, KC_KP_5, KC_KP_6,
-        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_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,
-        KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_KP_0,          KC_KP_DOT
-    ),
-    [1] = LAYOUT(
-        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,    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,    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,    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,    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
-    ),
-    [2] = LAYOUT(
-        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,    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,    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,    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,    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(
-        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,    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,    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,    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,    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
-    ),
-
-};
-
-
-#ifdef OLED_ENABLE
-// WPM-responsive animation stuff here
-#    define IDLE_FRAMES 5
-#    define IDLE_SPEED 20  // below this wpm value your animation will idle
-
-// #define PREP_FRAMES 1 // uncomment if >1
-
-#    define TAP_FRAMES 2
-#    define TAP_SPEED 40  // above this wpm value typing animation to trigger
-
-#    define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
-// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#    define ANIM_SIZE 610  // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
-uint8_t current_tap_frame = 0;
-
-// Code containing pixel art, contains:
-// 5 idle frames, 1 prep frame, and 2 tap frames
-
-// To make your own pixel art:
-// save a png/jpeg of an 128x32 image (resource: https://www.pixilart.com/draw )
-// follow this guide up to and including "CONVERT YOUR IMAGE" https://docs.splitkb.com/hc/en-us/articles/360013811280-How-do-I-convert-an-image-for-use-on-an-OLED-display-
-// replace numbers in brackets with your own
-// if you start getting errors when compiling make sure you didn't accedentally delete a bracket
-static void render_anim(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-    static const char PROGMEM prep[][ANIM_SIZE]            = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00}};
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE]   = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    };
-
-    // assumes 1 frame prep stage
-    void animation_phase(void) {
-        if (get_current_wpm() <= IDLE_SPEED) {
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
-        }
-        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-            // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
-            oled_write_raw_P(prep[0], ANIM_SIZE);  // remove if IDLE_FRAMES >1
-        }
-        if (get_current_wpm() >= TAP_SPEED) {
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
-        }
-    }
-    if (get_current_wpm() != 000) {
-        oled_on();  // not essential but turns on animation OLED with any alpha keypress
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {
-        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-// Used to draw on to the oled screen
-bool oled_task_user(void) {
-    render_anim();  // renders pixelart
-
-    oled_set_cursor(0, 0);                            // sets cursor to (row, column) using charactar spacing (4 rows, 21 full columns on a 128x32 screen, anything more will overflow back to the top)
-    uint8_t n = get_current_wpm();
-    wpm_str[3] = '\0';
-    wpm_str[2] = '0' + n % 10;
-    wpm_str[1] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
-    wpm_str[0] = n / 10 ? '0' + n / 10 : ' ';
-    oled_write_P(PSTR("WPM:"), false);
-    oled_write(wpm_str, false);
-
-    led_t led_state = host_keyboard_led_state();  // caps lock stuff, prints CAPS on new line if caps led is on
-    oled_set_cursor(0, 1);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-    oled_set_cursor(0, 2);
-    oled_write_P(led_state.num_lock ? PSTR("NUM") : PSTR("   "), false);
-    oled_set_cursor(4, 2);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR("    "), false);
-    oled_set_cursor(0, 3);
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_P(PSTR("Base Layer\n"), false);
-            break;
-        case 1:
-            oled_write_P(PSTR("Base Enhanced\n"), false);
-            break;
-        case 2:
-            oled_write_P(PSTR("Gaming\n"), false);
-            break;
-        case 3:
-            oled_write_P(PSTR("Gaming Enh\n"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undefined"), false);
-    }
-    oled_set_cursor(17, 3);
-    oled_write_P(PSTR("NKRO"), keymap_config.nkro);
-    return false;
-}
-#endif
diff --git a/keyboards/handwired/marauder/keymaps/orvia/rules.mk b/keyboards/handwired/marauder/keymaps/orvia/rules.mk
deleted file mode 100644
index e39f8c6e9e8..00000000000
--- a/keyboards/handwired/marauder/keymaps/orvia/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes			# WPM counting Enable
diff --git a/keyboards/handwired/minorca/keymaps/rgb/config.h b/keyboards/handwired/minorca/keymaps/rgb/config.h
index 4bee6b205d7..16e748dd70b 100644
--- a/keyboards/handwired/minorca/keymaps/rgb/config.h
+++ b/keyboards/handwired/minorca/keymaps/rgb/config.h
@@ -12,7 +12,7 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 13     // Number of LEDs
+#define RGBLIGHT_LED_COUNT 13     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/rules.mk b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/rules.mk
deleted file mode 100644
index 916b1154bdd..00000000000
--- a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Build Overrides
diff --git a/keyboards/handwired/onekey/keymaps/apa102/config.h b/keyboards/handwired/onekey/keymaps/apa102/config.h
index 756ebb35936..bb618d77fbc 100644
--- a/keyboards/handwired/onekey/keymaps/apa102/config.h
+++ b/keyboards/handwired/onekey/keymaps/apa102/config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define RGBLED_NUM 40
+#define RGBLIGHT_LED_COUNT 40
 #define APA102_DEFAULT_BRIGHTNESS 5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
index 65983c8dd8d..361a08a7604 100644
--- a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
@@ -13,20 +13,20 @@ static inline void chThdSleepMicroseconds(uint32_t us) {
 #endif
 
 void keyboard_post_init_user(void) {
-    setPinOutput(QMK_WAITING_TEST_BUSY_PIN);
-    setPinOutput(QMK_WAITING_TEST_YIELD_PIN);
+    gpio_set_pin_output(QMK_WAITING_TEST_BUSY_PIN);
+    gpio_set_pin_output(QMK_WAITING_TEST_YIELD_PIN);
 }
 
 static inline void wait_us_polling_with_strobe(uint32_t us) {
-    writePinHigh(QMK_WAITING_TEST_BUSY_PIN);
+    gpio_write_pin_high(QMK_WAITING_TEST_BUSY_PIN);
     wait_us(us);
-    writePinLow(QMK_WAITING_TEST_BUSY_PIN);
+    gpio_write_pin_low(QMK_WAITING_TEST_BUSY_PIN);
 }
 
 static inline void wait_us_yield_with_strobe(uint32_t us) {
-    writePinHigh(QMK_WAITING_TEST_YIELD_PIN);
+    gpio_write_pin_high(QMK_WAITING_TEST_YIELD_PIN);
     chThdSleepMicroseconds(us);
-    writePinLow(QMK_WAITING_TEST_YIELD_PIN);
+    gpio_write_pin_low(QMK_WAITING_TEST_YIELD_PIN);
 }
 
 static const uint32_t waiting_values[] = {0, 1, 5, 10, 25, 50, 100, 150, 200, 500, 1000};
diff --git a/keyboards/handwired/onekey/keymaps/dip_switch_map/config.h b/keyboards/handwired/onekey/keymaps/dip_switch_map/config.h
new file mode 100644
index 00000000000..7e5b6c0b911
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/dip_switch_map/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+// TODO: Remove reuse of pin
+#define DIP_SWITCH_PINS { WS2812_DI_PIN }
diff --git a/keyboards/handwired/onekey/keymaps/dip_switch_map/keymap.c b/keyboards/handwired/onekey/keymaps/dip_switch_map/keymap.c
new file mode 100644
index 00000000000..35bb16d4586
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/dip_switch_map/keymap.c
@@ -0,0 +1,14 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_1x1(KC_A),
+    [1] = LAYOUT_ortho_1x1(KC_B),
+};
+
+#if defined(DIP_SWITCH_MAP_ENABLE)
+const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = {
+    DIP_SWITCH_OFF_ON(DF(0), DF(1))
+};
+#endif
diff --git a/keyboards/handwired/onekey/keymaps/dip_switch_map/rules.mk b/keyboards/handwired/onekey/keymaps/dip_switch_map/rules.mk
new file mode 100644
index 00000000000..b2429854f14
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/dip_switch_map/rules.mk
@@ -0,0 +1,2 @@
+DIP_SWITCH_ENABLE = yes
+DIP_SWITCH_MAP_ENABLE = yes
diff --git a/keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c b/keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c
index ea8443709df..1d1a7c2b006 100644
--- a/keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/i2c_scanner/keymap.c
@@ -8,16 +8,6 @@
 // TODO: remove patch
 #ifdef PROTOCOL_CHIBIOS
 #    pragma message("ChibiOS is currently 'best effort' and might not report accurate results")
-
-i2c_status_t i2c_start_bodge(uint8_t address, uint16_t timeout) {
-    i2c_start(address);
-
-    // except on ChibiOS where the only way is do do "something"
-    uint8_t data = 0;
-    return i2c_readReg(address, 0, &data, sizeof(data), TIMEOUT);
-}
-
-#    define i2c_start i2c_start_bodge
 #endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -31,10 +21,9 @@ void do_scan(void) {
 
     for (uint8_t address = 1; address < 127; address++) {
         // The i2c_scanner uses the return value of
-        // i2c_start to see if a device did acknowledge to the address.
-        i2c_status_t error = i2c_start(address << 1, TIMEOUT);
+        // i2c_ping_address to see if a device did acknowledge to the address.
+        i2c_status_t error = i2c_ping_address(address << 1, TIMEOUT);
         if (error == I2C_STATUS_SUCCESS) {
-            i2c_stop();
             dprintf("  I2C device found at address 0x%02X\n", address);
             nDevices++;
         } else {
diff --git a/keyboards/handwired/onekey/keymaps/joystick/config.h b/keyboards/handwired/onekey/keymaps/joystick/config.h
index 8a4e461b277..589e4dbf3d6 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/config.h
+++ b/keyboards/handwired/onekey/keymaps/joystick/config.h
@@ -1,4 +1,3 @@
 #pragma once
 
-#define JOYSTICK_AXIS_COUNT 2
 #define JOYSTICK_BUTTON_COUNT 1
diff --git a/keyboards/handwired/onekey/keymaps/rgb/config.h b/keyboards/handwired/onekey/keymaps/rgb/config.h
index 1e543837698..1434c4d0c82 100644
--- a/keyboards/handwired/onekey/keymaps/rgb/config.h
+++ b/keyboards/handwired/onekey/keymaps/rgb/config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define RGBLED_NUM 9
+#define RGBLIGHT_LED_COUNT 9
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/onekey/stm32f3_disco/config.h b/keyboards/handwired/onekey/stm32f3_disco/config.h
index a0e3c54ec1c..0927767772a 100644
--- a/keyboards/handwired/onekey/stm32f3_disco/config.h
+++ b/keyboards/handwired/onekey/stm32f3_disco/config.h
@@ -4,3 +4,9 @@
 #pragma once
 
 #define ADC_PIN A0
+
+#define UART_TX_PIN C4
+#define UART_RX_PIN C5
+
+#define SERIAL_USART_TX_PIN C4
+#define SERIAL_USART_RX_PIN C4
diff --git a/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h b/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
index 9172860b0f1..520a5dc3048 100644
--- a/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
+++ b/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
@@ -7,3 +7,9 @@
 
 #undef STM32_ADC_USE_ADC1
 #define STM32_ADC_USE_ADC1 TRUE
+
+#undef STM32_SIO_USE_USART1
+#define STM32_SIO_USE_USART1 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/handwired/orbweaver/config.h b/keyboards/handwired/orbweaver/config.h
index 6a6670a6f6c..95a46677c9f 100644
--- a/keyboards/handwired/orbweaver/config.h
+++ b/keyboards/handwired/orbweaver/config.h
@@ -18,6 +18,4 @@
 #pragma once
 
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#define RGB_MATRIX_LED_COUNT 20
 #define I2C1_CLOCK_SPEED 100000
-#define RGB_MATRIX_CENTER { 40, 30 }
diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/info.json
index 489a7e28887..14c87182563 100644
--- a/keyboards/handwired/orbweaver/info.json
+++ b/keyboards/handwired/orbweaver/info.json
@@ -13,6 +13,7 @@
         "nkro": true
     },
     "rgb_matrix": {
+        "center_point": [40, 30],
         "driver": "is31fl3731"
     },
     "matrix_pins": {
diff --git a/keyboards/handwired/orbweaver/orbweaver.c b/keyboards/handwired/orbweaver/orbweaver.c
index 63778ea52be..f89d1ca363b 100644
--- a/keyboards/handwired/orbweaver/orbweaver.c
+++ b/keyboards/handwired/orbweaver/orbweaver.c
@@ -22,7 +22,7 @@
 
 #include "rgb_matrix.h"
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -60,7 +60,7 @@ led_config_t g_led_config = {
          { 11, 12, 13, 14, 15 },
          { 16, 17, 18, 19, 19 },
          { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-         { NO_LED, NO_LED }
+         { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
      },
 
      // LED index to physical location
diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h
index 326789b9983..9a446a904b2 100644
--- a/keyboards/handwired/p65rgb/config.h
+++ b/keyboards/handwired/p65rgb/config.h
@@ -17,60 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define RGB_MATRIX_LED_COUNT 83
-// 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
-#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
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json
index 2fa35c2cbfd..3d8e02cf402 100644
--- a/keyboards/handwired/p65rgb/info.json
+++ b/keyboards/handwired/p65rgb/info.json
@@ -12,7 +12,55 @@
         "pin": "B4"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "rgblight": {
         "max_brightness": 180
diff --git a/keyboards/handwired/petruziamini/info.json b/keyboards/handwired/petruziamini/info.json
new file mode 100644
index 00000000000..dcd60f2dc7a
--- /dev/null
+++ b/keyboards/handwired/petruziamini/info.json
@@ -0,0 +1,66 @@
+{
+    "manufacturer": "LLLKST",
+    "keyboard_name": "PetruziaMini",
+    "maintainer": "LLLKST",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "C6", "D4", "D0", "D1", "F4", "F5", "F6", "F7", "B1"],
+        "rows": ["B4", "E6", "B3", "B2"]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/petruziamini/keymaps/default/keymap.c b/keyboards/handwired/petruziamini/keymaps/default/keymap.c
new file mode 100644
index 00000000000..c0972785d42
--- /dev/null
+++ b/keyboards/handwired/petruziamini/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │ A │ B │   │ D │   │   │ G │   │ I │ J │
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        KC_A,    KC_B,    KC_C,    KC_D,    KC_E,    KC_F,    KC_G,    KC_H,    KC_I,    KC_J,
+        KC_A,    KC_B,    KC_C,    KC_D,    KC_E,    KC_F,    KC_G,    KC_H,    KC_I,    KC_J,
+        KC_A,    KC_B,    KC_C,    KC_D,    KC_E,    KC_F,    KC_G,    KC_H,    KC_I,    KC_J,
+        KC_A,    KC_B,    KC_C,    KC_D,    LT(1, KC_E),    KC_F
+    ),
+    [1] = LAYOUT(
+    KC_NO,    QK_BOOT,    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,    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/handwired/petruziamini/readme.md b/keyboards/handwired/petruziamini/readme.md
new file mode 100644
index 00000000000..1b303c49c63
--- /dev/null
+++ b/keyboards/handwired/petruziamini/readme.md
@@ -0,0 +1,26 @@
+# PetruziaMini
+
+![PetruziaMini](https://i.imgur.com/uk2BSazh.jpeg)
+
+36 key ortholinear keyboard intended to be mapped as a split keyboard.
+
+* Keyboard Maintainer: [LLLKST](https://github.com/LLLKST)
+* Hardware Supported: *promicro compatible controller*
+* Hardware Availability: [Aliexpress Pro Micro](https://www.aliexpress.us/item/3256805781371913.html)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/petruziamini:default
+
+Flashing example for this keyboard:
+
+    make handwired/petruziamini: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 with:
+
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` (3,5) + (0,1) in the matrix
\ No newline at end of file
diff --git a/keyboards/handwired/petruziamini/rules.mk b/keyboards/handwired/petruziamini/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/petruziamini/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/README.md b/keyboards/handwired/promethium/keymaps/priyadi/README.md
deleted file mode 100644
index 48824b9f73b..00000000000
--- a/keyboards/handwired/promethium/keymaps/priyadi/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-Priyadi Keymap for Planck-like Keyboards
-========================================
-
-Main layer modifications from default Planck layout:
-
-* Enter moved to quotes position
-* Quotes moved to semicolon position.
-* QWERTZ style colon & semicolon. shift-. = :  shift-, = ;  This is done in hardware, no layout switching needed in software.
-* < & > occupied precious real estate, and so they are moved down to punctuation layer.
-* Right-shift on Enter position.
-* Removed arrow keys, they are on another layer now.
-* Put Ctrl-Alt-Super and Super-AltGr-Ctrl in left & right corners.
-* Lower & Raise is now called Num and Fun.
-* OS & Left keys become another thumb modifier: Empty & Greek (Empty because I used this for another use and my muscle memory is not adapted to it yet)
-
-On Promethium, Trackpoint is enabled on PD2 and PD3. We impersonate a Thinkpad keyboard to be able to use Thinkpad driver on Windows (still needs verification).
-
-AltGr & Compose dual use key. Tap for Compose (mapped to Scroll Lock in hardware) and press for AltGr.
-
-Supported layouts: QWERTY, DVORAK, Colemak, Workman, Norman. Switchable from SYS layer. In DVORAK, semicolon is replaced by /? key.
-
-Num activates NUM layer: hexkeypad on the right side and most punctuation on the left side. Hexkeypad is optimized for C-style hex, IPv6, HTML RGB triplets, etc.
-
-Fun activates FUN layer: arrow cluster on right home row, F-numbers on left side.
-
-Pressing Num+Fun activates PUNC layer: same punctuations as NUM layer on the left side, parens on the right side.
-
-Greek activates either GREEKU or GREEKL layer, depending whether shift is pressed or not. Shift state changes are also taken into account when the layer is active.
-
-Greek+Empty activates EMOJI layer. The whole keyboard now outputs emojis!
-
-Pressing both spacebars (spacekeys, actually) activates GUI layer. QWERTYUIOP switches to a virtual desktop. J & L switches virtual desktop to the left or right. S & F behaves like Alt-Tab and Alt-Shift-Tab. This works by sending Alt press when entering the layer, and Alt release when other than S or F keys are pressed.
-
-Pressing both Ctrls activates SYS layer for configuring the keyboard.
-
-On Promethium, USB or Bluetooth output is detected on startup. If USB is connected, then USB is used initially. SYS-U and SYS-B switch output to USB or Bluetooth at runtime. Current active output is indicated with LEDs.
-
-SYS-W, SYS-L, SYS-M switch Unicode input method. SYS-Q, SYS-D, SYS-C, SYS-K, SYS-N switch to QWERTY, DVORAK, Colemak, Workman and Norman, respectively.
-
-SYS-A (mnemonic: audio) toggles faux clicky: use buzzer to emit clicks on key presses and releases.
-
-On Promethium there are 16 indicator LEDs, and under switch LEDs on each switches, including Trackpoint buttons. Totaling 67 LEDs. Output is limited to 0xF for each LEDs to conserve power. SYS-G (mnemonic: glow) toggles various backlighting modes.
-
-On Promethium, there's a LED to indicate battery level. Hue indicates level: green is full, red is empty.
\ No newline at end of file
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/config.h b/keyboards/handwired/promethium/keymaps/priyadi/config.h
deleted file mode 100644
index 1e5e8906ed9..00000000000
--- a/keyboards/handwired/promethium/keymaps/priyadi/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#define PRIYADI_PROMETHIUM
-
-#define RGBSPS_ENABLE
-#define RGBSPS_DEMO_ENABLE
-
-#define UNICODE_TYPE_DELAY 0
-
-#define LAYOUT_DVORAK
-#define LAYOUT_COLEMAK
-#define LAYOUT_NORMAN
-#define LAYOUT_WORKMAN
-
-#define DOUBLESPACE_LAYER_ENABLE
-// #define TOLELOT_ENABLE
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
deleted file mode 100644
index 37cff59cb1f..00000000000
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ /dev/null
@@ -1,1358 +0,0 @@
-/*
-Copyright 2017 Priyadi Iman Nurcahyo
-
-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 "action_layer.h"
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-  #include "musical_notes.h"
-#endif
-#include "eeconfig.h"
-#include "process_unicode.h"
-#include "quantum.h"
-#ifdef RGBSPS_ENABLE
-#include "rgbsps.h"
-#include "rgbtheme.h"
-#endif
-#ifdef PS2_MOUSE_ENABLE
-#include "ps2_mouse.h"
-#include "ps2.h"
-#endif
-#ifdef FAUXCLICKY_ENABLE
-#include "fauxclicky.h"
-#ifdef RGBSPS_ENABLE
-#undef FAUXCLICKY_OFF
-#define FAUXCLICKY_OFF do { \
-    fauxclicky_enabled = false; \
-    rgbsps_set(LED_AUDIO, COLOR_BLANK); \
-    fauxclicky_stop(); \
-} while (0)
-#undef FAUXCLICKY_ON
-#define FAUXCLICKY_ON do { \
-    fauxclicky_enabled = true; \
-    rgbsps_set(LED_AUDIO, THEME_COLOR_AUDIO); \
-} while (0)
-#endif
-#endif
-#ifdef __AVR__
-#include "outputselect.h"
-#endif
-#include "led.h"
-#define COUNT(x) ARRAY_SIZE((x))
-
-#define KC_WWWB KC_WWW_BACK
-#define KC_WWWF KC_WWW_FORWARD
-
-// hybrid right-alt & scroll lock (mapped to Compose in OS)
-#define C_RALT MT(MOD_RALT, KC_SCRL)
-
-// dual use right-shift & del key
-// #define C_RSFT MT(MOD_RSFT, KC_DEL)
-
-bool capslock = false;
-#ifdef DOUBLESPACE_LAYER_ENABLE
-bool lspace_active = false;
-bool rspace_active = false;
-bool lspace_emitted = false;
-bool rspace_emitted = false;
-bool space_layer_entered = false;
-#endif
-
-// glow
-enum glow_modes {
-  GLOW_NONE,
-  GLOW_MIN,
-  GLOW_FULL
-};
-uint8_t glow_mode = GLOW_MIN;
-
-void turn_off_capslock(void);
-extern keymap_config_t keymap_config;
-
-// layers, ordering is important!
-enum layers {
-  _QWERTY,
-  _DVORAK,
-  _COLEMAK,
-  _WORKMAN,
-  _NORMAN,
-  _DEFAULT_LAYER_MAX = _NORMAN,
-
-  _GREEKU,
-  _GREEKL,
-
-  _NUM,
-  _FUN,
-  _PUNC,
-
-  _EMPTY,
-  _EMOJI,
-  _GUI,
-  _SYS
-};
-
-// double-space layer
-#define _SPACE _GUI
-
-enum planck_keycodes {
-  // layouts
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  COLEMAK,
-  WORKMAN,
-  NORMAN,
-
-  // layer switchers
-  EMOJI,
-  GUI,
-  GREEK,
-
-  // os switchers
-  LINUX,
-  WIN,
-  OSX,
-
-  // others
-  LSPACE,
-  RSPACE,
-  GLOW,
-
-  // stub
-#ifndef FAUXCLICKY_ENABLE
-  FC_TOG,
-#endif
-  RGBDEMO,
-  KEYCODE_END
-};
-
-#define EMPTY MO(_EMPTY)
-#define NUM MO(_NUM)
-#define FUN MO(_FUN)
-#define FUN0 LT(_FUN, KC_0)
-
-// unicode map
-
-enum unicode_name {
-  GRIN, // grinning face 😊
-  TJOY, // tears of joy 😂
-  SMILE, // grining face with smiling eyes 😁
-  HEART, // heart ❤
-  EYERT, // smiling face with heart shaped eyes 😍
-  CRY, // crying face 😭
-  SMEYE, // smiling face with smiling eyes 😊
-  UNAMU, // unamused 😒
-  KISS, // kiss 😘
-  HART2, // two hearts 💕
-  WEARY, // weary 😩
-  OKHND, // ok hand sign 👌
-  PENSV, // pensive 😔
-  SMIRK, // smirk 😏
-  RECYC, // recycle ♻
-  WINK, // wink 😉
-  THMUP, // thumb up 👍
-  THMDN, // thumb down 👎
-  PRAY, // pray 🙏
-  PHEW, // relieved 😌
-  MUSIC, // musical notes
-  FLUSH, // flushed 😳
-  CELEB, // celebration 🙌
-  CRY2, // crying face 😢
-  COOL, // smile with sunglasses 😎
-  NOEVS, // see no evil
-  NOEVH, // hear no evil
-  NOEVK, // speak no evil
-  POO, // pile of poo
-  EYES, // eyes
-  VIC, // victory hand
-  BHART, // broken heart
-  SLEEP, // sleeping face
-  SMIL2, // smiling face with open mouth & sweat
-  HUNRD, // 100
-  CONFU, // confused
-  TONGU, // face with tongue & winking eye
-  DISAP, // disappointed
-  YUMMY, // face savoring delicious food
-  CLAP, // hand clapping
-  FEAR, // face screaming in fear
-  HORNS, // smiling face with horns
-  HALO, // smiling face with halo
-  BYE, // waving hand
-  SUN, // sun
-  MOON, // moon
-  SKULL, // skull
-
-  // greek letters
-  UALPH,
-  UBETA,
-  UGAMM,
-  UDELT,
-  UEPSI,
-  UZETA,
-  UETA,
-  UTHET,
-  UIOTA,
-  UKAPP,
-  ULAMB,
-  UMU,
-  UNU,
-  UXI,
-  UOMIC,
-  UPI,
-  URHO,
-  USIGM,
-  UTAU,
-  UUPSI,
-  UPHI,
-  UCHI,
-  UPSI,
-  UOMEG,
-
-  LALPH,
-  LBETA,
-  LGAMM,
-  LDELT,
-  LEPSI,
-  LZETA,
-  LETA,
-  LTHET,
-  LIOTA,
-  LKAPP,
-  LLAMB,
-  LMU,
-  LNU,
-  LXI,
-  LOMIC,
-  LPI,
-  LRHO,
-  LSIGM,
-  LTAU,
-  LUPSI,
-  LPHI,
-  LCHI,
-  LPSI,
-  LOMEG,
-
-  FSIGM,
-
-  LTEQ,
-  GTEQ,
-  NOTEQ,
-  PLMIN,
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-  [GRIN] = 0x1F600,
-  [TJOY] = 0x1F602,
-  [SMILE] = 0x1F601,
-  [HEART] = 0x2764,
-  [EYERT] = 0x1f60d,
-  [CRY] = 0x1f62d,
-  [SMEYE] = 0x1F60A,
-  [UNAMU] = 0x1F612,
-  [KISS] = 0x1F618,
-  [HART2] = 0x1F495,
-  [WEARY] = 0x1F629,
-  [OKHND] = 0x1F44C,
-  [PENSV] = 0x1F614,
-  [SMIRK] = 0x1F60F,
-  [RECYC] = 0x267B,
-  [WINK] = 0x1F609,
-  [THMUP] = 0x1F44D,
-  [THMDN] = 0x1F44E,
-  [PRAY] = 0x1F64F,
-  [PHEW] = 0x1F60C,
-  [MUSIC] = 0x1F3B6,
-  [FLUSH] = 0x1F633,
-  [CELEB] = 0x1F64C,
-  [CRY2] = 0x1F622,
-  [COOL] = 0x1F60E,
-  [NOEVS] = 0x1F648,
-  [NOEVH] = 0x1F649,
-  [NOEVK] = 0x1F64A,
-  [POO] = 0x1F4A9,
-  [EYES] = 0x1F440,
-  [VIC] = 0x270C,
-  [BHART] = 0x1F494,
-  [SLEEP] = 0x1F634,
-  [SMIL2] = 0x1F605,
-  [HUNRD] = 0x1F4AF,
-  [CONFU] = 0x1F615,
-  [TONGU] = 0x1F61C,
-  [DISAP] = 0x1F61E,
-  [YUMMY] = 0x1F60B,
-  [CLAP] = 0x1F44F,
-  [FEAR] = 0x1F631,
-  [HORNS] = 0x1F608,
-  [HALO] = 0x1F607,
-  [BYE] = 0x1F44B,
-  [SUN] = 0x2600,
-  [MOON] = 0x1F314,
-  [SKULL] = 0x1F480,
-
-  // greek letters
-  [UALPH] = 0x0391,
-  [UBETA] = 0x0392,
-  [UGAMM] = 0x0393,
-  [UDELT] = 0x0394,
-  [UEPSI] = 0x0395,
-  [UZETA] = 0x0396,
-  [UETA] = 0x0397,
-  [UTHET] = 0x0398,
-  [UIOTA] = 0x0399,
-  [UKAPP] = 0x039A,
-  [ULAMB] = 0x039B,
-  [UMU] = 0x039C,
-  [UNU] = 0x039D,
-  [UXI] = 0x039E,
-  [UOMIC] = 0x039F,
-  [UPI] = 0x03A0,
-  [URHO] = 0x03A1,
-  [USIGM] = 0x03A3,
-  [UTAU] = 0x03A4,
-  [UUPSI] = 0x03A5,
-  [UPHI] = 0x03A6,
-  [UCHI] = 0x03A7,
-  [UPSI] = 0x03A8,
-  [UOMEG] = 0x03A9,
-  [LALPH] = 0x03B1,
-  [LBETA] = 0x03B2,
-  [LGAMM] = 0x03B3,
-  [LDELT] = 0x03B4,
-  [LEPSI] = 0x03B5,
-  [LZETA] = 0x03B6,
-  [LETA] = 0x03B7,
-  [LTHET] = 0x03B8,
-  [LIOTA] = 0x03B9,
-  [LKAPP] = 0x03BA,
-  [LLAMB] = 0x03BB,
-  [LMU] = 0x03BC,
-  [LNU] = 0x03BD,
-  [LXI] = 0x03BE,
-  [LOMIC] = 0x03BF,
-  [LPI] = 0x03C0,
-  [LRHO] = 0x03C1,
-  [LSIGM] = 0x03C3,
-  [LTAU] = 0x03C4,
-  [LUPSI] = 0x03C5,
-  [LPHI] = 0x03C6,
-  [LCHI] = 0x03C7,
-  [LPSI] = 0x03C8,
-  [LOMEG] = 0x03C9,
-  [FSIGM] = 0x03C2,
-
-  // other
-  [LTEQ] = 0x2264, // less than or equal
-  [GTEQ] = 0x2265, // greater than or equal
-  [NOTEQ] = 0x2260, // not equal
-  [PLMIN] = 0xB1, // plus minus
-};
-
-// RGBSPS
-
-#ifdef RGBSPS_ENABLE
-const uint8_t PROGMEM LED_ALNUM[] = {
-  LED_Z,
-  LED_A,
-  LED_Q,
-  LED_W,
-  LED_S,
-  LED_X,
-  LED_C,
-  LED_D,
-  LED_E,
-  LED_R,
-  LED_F,
-  LED_V,
-  LED_B,
-  LED_G,
-  LED_T,
-  LED_N,
-  LED_HH,
-  LED_Y,
-  LED_U,
-  LED_J,
-  LED_M,
-  LED_COMM,
-  LED_K,
-  LED_I,
-  LED_O,
-  LED_L,
-  LED_DOT,
-  LED_SLSH,
-  LED_SCLN,
-  LED_P,
-  LED_LSPC,
-  LED_RSPC
-};
-
-const uint8_t PROGMEM LED_HOMING[] = {
-  LED_A,
-  LED_S,
-  LED_D,
-  LED_F,
-  LED_J,
-  LED_K,
-  LED_L,
-  LED_SCLN
-};
-
-const uint8_t PROGMEM LED_MODS[] = {
-  LED_TAB,
-  LED_ESC,
-  LED_LSFT,
-  LED_LCTL,
-  LED_LGUI,
-  LED_LALT,
-  LED_RALT,
-  LED_RGUI,
-  LED_BKSP,
-  LED_ENT,
-  LED_RSFT,
-  LED_RCTL
-};
-
-const uint8_t PROGMEM LED_FN[] = {
-  LED_EMPTY,
-  LED_NUM,
-  LED_FUN,
-  LED_GREEK
-};
-
-const uint8_t PROGMEM LED_INDICATORS[] = {
-  LED_IND_LINUX,
-  LED_IND_APPLE,
-  LED_IND_WINDOWS,
-  LED_IND_QWERTY,
-  LED_IND_ALT,
-  LED_IND_AUDIO,
-  LED_IND_BLUETOOTH,
-  LED_IND_USB,
-
-  LED_IND_BATTERY,
-  LED_IND_CAPSLOCK,
-  LED_IND_GUI,
-  LED_IND_FUN,
-  LED_IND_NUM,
-  LED_IND_PUNC,
-  LED_IND_EMOJI,
-  LED_IND_GREEK,
-};
-
-const uint8_t PROGMEM LED_TRACKPOINT[] = {
-  LED_TRACKPOINT1,
-  LED_TRACKPOINT2,
-  LED_TRACKPOINT3,
-};
-
-void led_turnoff_keys(void) {
-  for(uint8_t i = 0; i < COUNT(LED_ALNUM); i++) {
-    rgbsps_set(pgm_read_byte(&LED_ALNUM[i]), COLOR_BLACK);
-  }
-  for(uint8_t i = 0; i < COUNT(LED_MODS); i++) {
-    rgbsps_set(pgm_read_byte(&LED_MODS[i]), COLOR_BLACK);
-  }
-  for(uint8_t i = 0; i < COUNT(LED_FN); i++) {
-    rgbsps_set(pgm_read_byte(&LED_FN[i]), COLOR_BLACK);
-  }
-}
-
-#ifdef RGBSPS_DEMO_ENABLE
-void led_demo(void) {
-  rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
-  rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
-  rgbsps_set(LED_IND_WINDOWS, THEME_COLOR_WINDOWS);
-  rgbsps_set(LED_IND_QWERTY, THEME_COLOR_QWERTY);
-  rgbsps_set(LED_IND_ALT, THEME_COLOR_ALT);
-  rgbsps_set(LED_IND_AUDIO, THEME_COLOR_AUDIO);
-  rgbsps_set(LED_IND_BLUETOOTH, THEME_COLOR_BLUETOOTH);
-  rgbsps_set(LED_IND_USB, THEME_COLOR_USB);
-  rgbsps_set(LED_IND_CAPSLOCK, THEME_COLOR_CAPSLOCK);
-  rgbsps_set(LED_IND_GUI, THEME_COLOR_GUI);
-  rgbsps_set(LED_IND_FUN, THEME_COLOR_FUN);
-  rgbsps_set(LED_IND_NUM, THEME_COLOR_NUM);
-  rgbsps_set(LED_IND_PUNC, THEME_COLOR_PUNC);
-  rgbsps_set(LED_IND_GREEK, THEME_COLOR_GREEK);
-  rgbsps_set(LED_IND_EMOJI, THEME_COLOR_EMOJI);
-  rgbsps_send();
-}
-#endif
-
-void led_reset(void) {
-  switch (glow_mode) {
-    case GLOW_NONE:
-      led_turnoff_keys();
-      break;
-    case GLOW_MIN:
-      led_turnoff_keys();
-      for(uint8_t i = 0; i < COUNT(LED_HOMING); i++) {
-        rgbsps_set(pgm_read_byte(&LED_HOMING[i]), THEME_COLOR_GLOW1_HOME);
-      }
-      rgbsps_set(LED_F, THEME_COLOR_GLOW1_HOMING);
-      rgbsps_set(LED_J, THEME_COLOR_GLOW1_HOMING);
-      break;
-    case GLOW_FULL:
-      for(uint8_t i = 0; i < COUNT(LED_ALNUM); i++) {
-        rgbsps_set(pgm_read_byte(&LED_ALNUM[i]), THEME_COLOR_GLOW2_ALPHA);
-      }
-      for(uint8_t i = 0; i < COUNT(LED_MODS); i++) {
-        rgbsps_set(pgm_read_byte(&LED_MODS[i]), THEME_COLOR_GLOW2_MODS);
-      }
-      for(uint8_t i = 0; i < COUNT(LED_FN); i++) {
-        rgbsps_set(pgm_read_byte(&LED_FN[i]), THEME_COLOR_GLOW2_FN);
-      }
-      for(uint8_t i = 0; i < COUNT(LED_HOMING); i++) {
-        rgbsps_set(pgm_read_byte(&LED_HOMING[i]), THEME_COLOR_GLOW2_HOME);
-      }
-      rgbsps_set(LED_F, THEME_COLOR_GLOW2_HOMING);
-      rgbsps_set(LED_J, THEME_COLOR_GLOW2_HOMING);
-      break;
-  }
-}
-
-void led_set_default_layer_indicator(void) {
-  uint8_t default_layer = get_highest_layer(default_layer_state);
-  if (default_layer == _QWERTY) {
-    rgbsps_set(LED_IND_QWERTY, THEME_COLOR_QWERTY);
-    rgbsps_set(LED_IND_ALT, COLOR_BLANK);
-  } else {
-    rgbsps_set(LED_IND_QWERTY, COLOR_BLANK);
-    rgbsps_set(LED_IND_ALT, THEME_COLOR_ALT);
-  }
-  rgbsps_send();
-  return;
-}
-
-void led_set_layer_indicator(void) {
-  static uint8_t oldlayer = 255;
-
-  led_reset();
-
-  rgbsps_set(LED_IND_GUI, COLOR_BLANK);
-  rgbsps_set(LED_IND_FUN, COLOR_BLANK);
-  rgbsps_set(LED_IND_NUM, COLOR_BLANK);
-  rgbsps_set(LED_IND_PUNC, COLOR_BLANK);
-  rgbsps_set(LED_IND_GREEK, COLOR_BLANK);
-  rgbsps_set(LED_IND_EMOJI, COLOR_BLANK);
-
-  uint8_t layer = get_highest_layer(layer_state);
-  if (oldlayer == layer) {
-    return;
-  }
-
-  oldlayer = layer;
-
-  if (layer <= _DEFAULT_LAYER_MAX) {
-    rgbsps_send();
-    return;
-  }
-
-  switch(layer) {
-    case _GUI:
-      rgbsps_set(LED_IND_GUI, THEME_COLOR_GUI);
-      break;
-    case _FUN:
-      rgbsps_set(LED_IND_FUN, THEME_COLOR_FUN);
-      break;
-    case _NUM:
-      rgbsps_set(LED_IND_NUM, THEME_COLOR_NUM);
-      break;
-    case _PUNC:
-      rgbsps_set(LED_IND_PUNC, THEME_COLOR_PUNC);
-      break;
-    case _GREEKL:
-    case _GREEKU:
-      rgbsps_set(LED_IND_GREEK, THEME_COLOR_GREEK);
-      break;
-    case _EMOJI:
-      rgbsps_set(LED_IND_EMOJI, THEME_COLOR_EMOJI);
-      break;
-    default:
-      rgbsps_set(LED_IND_GUI, THEME_COLOR_OTHERLAYER);
-      rgbsps_set(LED_IND_FUN, THEME_COLOR_OTHERLAYER);
-      rgbsps_set(LED_IND_NUM, THEME_COLOR_OTHERLAYER);
-      rgbsps_set(LED_IND_PUNC, THEME_COLOR_OTHERLAYER);
-      rgbsps_set(LED_IND_GREEK, THEME_COLOR_OTHERLAYER);
-      rgbsps_set(LED_IND_EMOJI, THEME_COLOR_OTHERLAYER);
-  }
-
-  rgbsps_send();
-}
-
-void led_set_unicode_input_mode(void) {
-  rgbsps_set(LED_IND_LINUX, COLOR_BLANK);
-  rgbsps_set(LED_IND_APPLE, COLOR_BLANK);
-  rgbsps_set(LED_IND_WINDOWS, COLOR_BLANK);
-
-  switch (get_unicode_input_mode()) {
-    case UNICODE_MODE_LINUX:
-      rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
-      break;
-    case UNICODE_MODE_MACOS:
-      rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
-      break;
-    case UNICODE_MODE_WINDOWS:
-    case UNICODE_MODE_WINCOMPOSE:
-      rgbsps_set(LED_IND_WINDOWS, THEME_COLOR_WINDOWS);
-      break;
-  }
-  rgbsps_send();
-}
-
-void led_set_output_ble(void) {
-  rgbsps_set(LED_IND_BLUETOOTH, THEME_COLOR_BLUETOOTH);
-  rgbsps_set(LED_IND_USB, COLOR_BLANK);
-  rgbsps_send();
-}
-
-void led_set_output_usb(void) {
-  rgbsps_set(LED_IND_BLUETOOTH, COLOR_BLANK);
-  rgbsps_set(LED_IND_USB, THEME_COLOR_USB);
-  rgbsps_send();
-}
-
-void led_set_output_none(void) {
-  rgbsps_set(LED_IND_BLUETOOTH, COLOR_BLANK);
-  rgbsps_set(LED_IND_USB, COLOR_BLANK);
-  rgbsps_send();
-}
-
-void led_init(void) {
-  // turn off all
-  rgbsps_turnoff();
-
-  // set trackpoint color
-  rgbsps_set(LED_TRACKPOINT1, THEME_COLOR_TP1);
-  rgbsps_set(LED_TRACKPOINT2, THEME_COLOR_TP2);
-  rgbsps_set(LED_TRACKPOINT3, THEME_COLOR_TP3);
-
-  // unicode input mode
-  led_set_unicode_input_mode();
-
-  // layer indicator
-  led_set_layer_indicator();
-  led_set_default_layer_indicator();
-
-  // clicky
-#ifdef FAUXCLICKY_ENABLE
-  if (fauxclicky_enabled) {
-    rgbsps_set(LED_IND_AUDIO, THEME_COLOR_AUDIO);
-  } else {
-    rgbsps_set(LED_IND_AUDIO, COLOR_BLANK);
-  }
-#endif
-
-  rgbsps_send();
-}
-
-
-#endif // RGBSPS_ENABLE
-
-// keymaps
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   '  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Fun  |Greek | GUI  |AltGr | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    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_LALT, KC_LGUI, EMPTY,   NUM,     LSPACE,  RSPACE,  FUN,     GREEK,   KC_RGUI, C_RALT,  KC_RCTL,
-                                           _______, _______, _______
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   /  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Func |Greek | GUI  |AltGr | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-#ifdef LAYOUT_DVORAK
-[_DVORAK] = LAYOUT(
-  _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______,
-  _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    _______,
-  _______, KC_SLSH, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                           _______, _______, _______
-),
-#endif
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Func |Greek | GUI  |AltGr | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-
-#ifdef LAYOUT_COLEMAK
-[_COLEMAK] = LAYOUT(
-  _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT, _______,
-  _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    _______,
-  _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                           _______, _______, _______
-),
-#endif
-
-/* Norman
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   D  |   F  |   K  |   J  |   U  |   R  |   L  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   E  |   T  |   G  |   Y  |   N  |   I  |   O  |   H  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   P  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Func |Greek | GUI  |AltGr | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-
-#ifdef LAYOUT_NORMAN
-[_NORMAN] = LAYOUT(
-  _______, KC_Q,    KC_W,    KC_D,    KC_F,    KC_K,    KC_J,    KC_U,    KC_R,    KC_L,    KC_QUOT, _______,
-  _______, KC_A,    KC_S,    KC_E,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_I,    KC_O,    KC_H,    _______,
-  _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                           _______, _______, _______
-),
-#endif
-
-/* Workman
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   D  |   R  |   W  |   B  |   J  |   F  |   U  |   P  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   H  |   T  |   G  |   Y  |   N  |   E  |   O  |   I  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   M  |   C  |   V  |   K  |   K  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Func |Greek | GUI  |AltGr | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-
-#ifdef LAYOUT_WORKMAN
-[_WORKMAN] = LAYOUT(
-  _______, KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_QUOT, _______,
-  _______, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    _______,
-  _______, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                           _______, _______, _______
-),
-#endif
-
-/* Punc
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   ≤  |   ≥  |   `  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   *  |   \  |   -  |   =  |   /  |   ≠  |   (  |   )  |   <  |   >  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   &  |   ^  |   |  |   _  |   +  |   ?  |   ±  |   [  |   ]  |   {  |   }  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |   :  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PUNC] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, UM(LTEQ), UM(GTEQ), _______,
-  KC_GRV,  KC_ASTR, KC_BSLS, KC_MINS,  KC_EQL, KC_SLSH, UM(NOTEQ),KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______,
-  KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, UM(PLMIN),KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COLN, _______,
-                                           _______, _______, _______
-),
-
-/* Num
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   A  |   7  |   8  |   9  |   D  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   `  |   *  |   \  |   -  |   =  |   /  |   B  |   4  |   5  |   6  |   E  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   &  |   ^  |   |  |   _  |   +  |   ?  |   C  |   1  |   2  |   3  |   F  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |   x  |      |      |      |      |   0  |   ,  |   .  |   :  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUM] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, S(KC_A),  KC_1,    KC_2,    KC_3,   S(KC_D), _______,
-  KC_GRV,  KC_ASTR, KC_BSLS, KC_MINS,  KC_EQL, KC_SLSH, S(KC_B),  KC_4,    KC_5,    KC_6,   S(KC_E), _______,
-  KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, S(KC_C),  KC_7,    KC_8,    KC_9,   S(KC_F), _______,
-  _______, _______, KC_X,    _______, _______, _______, _______,  FUN0 ,   KC_COMM, KC_DOT, KC_COLN, _______,
-                                           _______, _______, _______
-),
-
-/* Func
- * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  | Ins  |      | PgUp |  Up  | PgDn | PgUp |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |  F5  |  F6  |  F7  |  F8  |PrtSc |      | Left | Down | Right| PgDn |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |Pause |      |      | Home |  End |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUN] = LAYOUT(
-  XXXXXXX,   KC_F1,   KC_F2,   KC_F3,  KC_F4,   KC_INS,  XXXXXXX, KC_PGUP,   KC_UP, KC_PGDN, KC_PGUP, KC_DEL,
-  KC_CAPS,   KC_F5,   KC_F6,   KC_F7,  KC_F8,   KC_PSCR, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
-  _______,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_PAUS, XXXXXXX, XXXXXXX, KC_HOME,  KC_END, XXXXXXX, _______,
-  _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
-                                           _______, _______, _______
-),
-
-/* Uppercase Greek
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_GREEKU] = LAYOUT(
-  _______, XXXXXXX, XXXXXXX,UM(UEPSI), UM(URHO), UM(UTAU),UM(UUPSI),UM(UTHET),UM(UIOTA),UM(UOMIC),  UM(UPI), _______,
-  _______,UM(UALPH),UM(USIGM),UM(UDELT), UM(UPHI),UM(UGAMM), UM(UETA),  UM(UXI),UM(UKAPP),UM(ULAMB), KC_QUOT, _______,
-  _______,UM(UZETA), UM(UCHI), UM(UPSI),UM(UOMEG),UM(UBETA),  UM(UNU),  UM(UMU), KC_COMM, KC_DOT,  KC_SLSH, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                           _______, _______, _______
-),
-
-/* Lowercase Greek
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_GREEKL] = LAYOUT(
-  _______, XXXXXXX,UM(FSIGM),UM(LEPSI), UM(LRHO), UM(LTAU),UM(LUPSI),UM(LTHET),UM(LIOTA),UM(LOMIC),  UM(LPI), _______,
-  _______,UM(LALPH),UM(LSIGM),UM(LDELT), UM(LPHI),UM(LGAMM), UM(LETA),  UM(LXI),UM(LKAPP),UM(LLAMB), KC_QUOT, _______,
-  _______,UM(LZETA), UM(LCHI), UM(LPSI),UM(LOMEG),UM(LBETA),  UM(LNU),  UM(LMU), KC_COMM, KC_DOT,  KC_SLSH, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                           _______, _______, _______
-),
-
-/* Empty
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_EMPTY] = 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,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                           _______, _______, _______
-),
-
-/* Emoji
- * ,-----------------------------------------------------------------------------------.
- * |  💕  |  😢  |  😩  | 😍   |  😏  |  😂  |  ♻  |  😒  |  🎶  | 👌  |  😔  |  😌  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  👍  |  🙏  |  😁  |  😅  |  😳  |  😊  |  ❤  |  👋  |  😘  | 🙌  |  😎  | 🙈   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  👎  |  😴  |  👏  |  😭  |  ✌  |  💔  |  ☀  |  😊  |  😉  |  🌔  |  😕  |  🙉  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  💩  |  👀  |  💯  |      |  💀  |  😈  |  😇  |  😱  |     |  😋  |  😞  |  🙊  |
- * `-----------------------------------------------------------------------------------'
- */
-[_EMOJI] = LAYOUT(
-  UM(HART2), UM(CRY2),UM(WEARY),UM(EYERT),UM(SMIRK), UM(TJOY),UM(RECYC),UM(UNAMU),UM(MUSIC),UM(OKHND),UM(PENSV), UM(PHEW),
-  UM(THMUP), UM(PRAY),UM(SMILE),UM(SMIL2),UM(FLUSH), UM(GRIN),UM(HEART),  UM(BYE), UM(KISS),UM(CELEB), UM(COOL),UM(NOEVS),
-  UM(THMDN),UM(SLEEP), UM(CLAP),  UM(CRY),  UM(VIC),UM(BHART),  UM(SUN),UM(SMEYE), UM(WINK), UM(MOON),UM(CONFU),UM(NOEVH),
-    UM(POO), UM(EYES), UM(HUNRD),_______, UM(SKULL),UM(HORNS), UM(HALO), UM(FEAR),_______,UM(YUMMY),UM(DISAP),UM(NOEVK),
-                                           _______, _______, _______
-),
-
-/* GUI
- * ,-----------------------------------------------------------------------------------.
- * |      |  D1  |  D2  |  D3  |  D4  |  D5  |  D6  |  D7  |  D8  |  D9  |  D10 |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |      | Btab | Esc  | Tab  |      |      | Prev |      | Next |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      | Prev | Play | Next |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_GUI] = LAYOUT(
-  XXXXXXX, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), G(KC_0), XXXXXXX,
-  KC_ESC,  XXXXXXX, S(KC_TAB),KC_ESC, KC_TAB,  XXXXXXX, XXXXXXX, KC_WWWB, XXXXXXX, KC_WWWF, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, KC_SPC,  KC_SPC,  KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                           _______, _______, _______
-),
-
-/* Sys
- * ,-----------------------------------------------------------------------------------.
- * |      |Qwerty| Win  |      |Reset |      |      | USB  |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |Audio |      |Dvorak|      | Glow |      |      |WorkMn|Linux |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Colmak|      | BLE  |Norman|MacOS |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_SYS] = LAYOUT(
-  DB_TOGG, QWERTY,  WIN,     XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, OU_USB,  XXXXXXX, XXXXXXX, XXXXXXX, RGBDEMO,
-  XXXXXXX, FC_TOG,  XXXXXXX, DVORAK,  XXXXXXX, GLOW,    XXXXXXX, XXXXXXX, WORKMAN, LINUX,   XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, XXXXXXX, OU_BT,   NORMAN,  OSX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-                                           _______, _______, _______
-),
-
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-#ifdef RGBSPS_ENABLE
-  led_set_default_layer_indicator();
-#endif
-}
-
-#ifdef DOUBLESPACE_LAYER_ENABLE
-void process_doublespace(bool pressed, bool *isactive, bool *otheractive, bool *isemitted) {
-  if (pressed) {
-    *isactive = true;
-    if (*otheractive) {
-      layer_on(_SPACE);
-      register_code(KC_LALT);  // sends alt and enter layer
-      space_layer_entered = true;
-    }
-  } else {
-    *isactive = false;
-    if (space_layer_entered) {
-      unregister_code(KC_LALT);  // release alt and exit layer
-      layer_off(_SPACE);
-      if (!*otheractive) {
-        space_layer_entered = false;
-      }
-    } else {
-      if (!*isemitted) {
-        register_code(KC_SPC);
-        unregister_code(KC_SPC);
-      }
-      *isemitted = false;
-    }
-  }
-}
-#endif
-
-layer_state_t layer_state_set_kb(layer_state_t state)
-{
-  // turn on punc layer if both fun & num are on
-  if ((state & ((1UL<<_NUM) | (1UL<<_FUN))) == ((1UL<<_NUM) | (1UL<<_FUN))) {
-    state |= (1UL<<_PUNC);
-  } else {
-    state &= ~(1UL<<_PUNC);
-  }
-
-  // turn on emoji layer if empty and greek layer are on
-  if (
-    (state & ((1UL<<_EMPTY) | (1UL<<_GREEKU))) == ((1UL<<_EMPTY) | (1UL<<_GREEKU))
-    || (state & ((1UL<<_EMPTY) | (1UL<<_GREEKL))) == ((1UL<<_EMPTY) | (1UL<<_GREEKL))
-  ) {
-    state |= (1UL<<_EMOJI);
-  } else {
-    state &= ~(1UL<<_EMOJI);
-  }
-  return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  static bool lshift = false;
-  static bool rshift = false;
-  static uint8_t layer = 0;
-
-  lshift = keyboard_report->mods & MOD_BIT(KC_LSFT);
-  rshift = keyboard_report->mods & MOD_BIT(KC_RSFT);
-  layer = get_highest_layer(layer_state);
-
-#ifdef DOUBLESPACE_LAYER_ENABLE
-  // double-space: send space immediately if any other key depressed before space is released
-  if ((lspace_active ^ rspace_active)
-      && keycode != LSPACE
-      && keycode != RSPACE
-      && record->event.pressed)
-  {
-    if (lspace_active) {
-      if (!lspace_emitted) {
-        register_code(KC_SPC);
-        unregister_code(KC_SPC);
-      }
-      lspace_emitted = true;
-    }
-    if (rspace_active) {
-      if (!rspace_emitted) {
-        register_code(KC_SPC);
-        unregister_code(KC_SPC);
-      }
-      rspace_emitted = true;
-    }
-  }
-
-  if (layer == _SPACE && keycode != S(KC_TAB) && keycode != KC_TAB && keycode != KC_ESC && keycode != XXXXXXX) {
-    if (record->event.pressed) {
-      unregister_code(KC_LALT);
-    } else {
-      register_code(KC_LALT);
-    }
-  }
-#endif
-
-  switch (keycode) {
-
-#ifdef DOUBLESPACE_LAYER_ENABLE
-    // double-space enter space layer
-    case LSPACE:
-      process_doublespace(record->event.pressed, &lspace_active, &rspace_active, &lspace_emitted);
-      return false;
-      break;
-    case RSPACE:
-      process_doublespace(record->event.pressed, &rspace_active, &lspace_active, &rspace_emitted);
-      return false;
-      break;
-#endif
-
-    // handle greek layer shift
-    case KC_LSFT:
-    case KC_RSFT:
-      ;
-      if (layer == _GREEKU || layer == _GREEKL) {
-        if (record->event.pressed) {
-          layer_on(_GREEKU);
-          layer_off(_GREEKL);
-        } else {
-          if (lshift ^ rshift) { // if only one shift was pressed
-            layer_on(_GREEKL);
-            layer_off(_GREEKU);
-          }
-        }
-      }
-      return true;
-      break;
-
-    // press both ctrls to activate SYS layer
-    case KC_LCTL:
-    case KC_RCTL:
-      ;
-      bool lctrl = keyboard_report->mods & MOD_BIT(KC_LCTL);
-      bool rctrl = keyboard_report->mods & MOD_BIT(KC_RCTL);
-      if (record->event.pressed) {
-        if (lctrl ^ rctrl) { // if only one ctrl was pressed
-          layer_on(_SYS);
-        }
-      } else {
-        layer_off(_SYS);
-      }
-      return true;
-      break;
-
-    // QWERTZ style comma and dot: semicolon and colon when shifted
-    case KC_COMM:
-      if (record->event.pressed) {
-        if (lshift || rshift) {
-          if (lshift) unregister_code(KC_LSFT);
-          if (rshift) unregister_code(KC_RSFT);
-          register_code(KC_SCLN);
-          unregister_code(KC_SCLN);
-          if (lshift) register_code(KC_LSFT);
-          if (rshift) register_code(KC_RSFT);
-        } else {
-          register_code(KC_COMM);
-          unregister_code(KC_COMM);
-        }
-      }
-      return false;
-      break;
-    case KC_DOT:
-      if (record->event.pressed) {
-        if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT))) {
-          register_code(KC_SCLN);
-          unregister_code(KC_SCLN);
-        } else {
-          register_code(KC_DOT);
-          unregister_code(KC_DOT);
-        }
-      }
-      return false;
-      break;
-
-    // layout switchers
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-#ifdef LAYOUT_DVORAK
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-#endif
-#ifdef LAYOUT_COLEMAK
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-#endif
-#ifdef LAYOUT_WORKMAN
-    case WORKMAN:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_WORKMAN);
-      }
-      return false;
-      break;
-#endif
-#ifdef LAYOUT_NORMAN
-    case NORMAN:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_NORMAN);
-      }
-      return false;
-      break;
-#endif
-
-    // only process Fnumber on key release, and only when layer switcher is still pressed.
-    // this is to avoid accidental presses on potentially destructive keys
-    case KC_F1 ... KC_F12:
-    case KC_PAUS:
-    case KC_PSCR:
-    case KC_INS:
-      if (!record->event.pressed && layer == _FUN) { // key released and still in FUN layer
-          register_code(keycode);
-          unregister_code(keycode);
-      }
-      return false;
-      break;
-
-    // layer switcher
-    //
-    case GREEK:
-      if (record->event.pressed) {
-        if (lshift || rshift) {
-          layer_on(_GREEKU);
-          layer_off(_GREEKL);
-        } else {
-          layer_on(_GREEKL);
-          layer_off(_GREEKU);
-        }
-      } else {
-        layer_off(_GREEKU);
-        layer_off(_GREEKL);
-      }
-      return false;
-      break;
-
-    // OS switchers
-    case LINUX:
-      set_unicode_input_mode(UNICODE_MODE_LINUX);
-#ifdef RGBSPS_ENABLE
-      led_set_unicode_input_mode();
-#endif
-      return false;
-      break;
-    case WIN:
-      set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
-#ifdef RGBSPS_ENABLE
-      led_set_unicode_input_mode();
-#endif
-      return false;
-      break;
-    case OSX:
-      set_unicode_input_mode(UNICODE_MODE_MACOS);
-#ifdef RGBSPS_ENABLE
-      led_set_unicode_input_mode();
-#endif
-      return false;
-      break;
-
-    // glow mode changer
-#ifdef RGBSPS_ENABLE
-    case GLOW:
-      if (record->event.pressed) {
-        glow_mode++;
-        if (glow_mode > GLOW_FULL) {
-          glow_mode = GLOW_NONE;
-        }
-        led_reset();
-        rgbsps_send();
-      }
-      return false;
-      break;
-#endif
-
-    // faux clicky indicator
-#ifdef FAUXCLICKY_ENABLE
-    case FC_TOG:
-#ifdef RGBSPS_ENABLE
-      if (fauxclicky_enabled) {
-        rgbsps_set(LED_IND_AUDIO, THEME_COLOR_AUDIO);
-      } else {
-        rgbsps_set(LED_IND_AUDIO, COLOR_BLANK);
-      }
-      rgbsps_send();
-#endif
-      return true;
-      break;
-#endif
-
-#ifdef RGBSPS_DEMO_ENABLE
-    case RGBDEMO:
-      led_demo();
-      return false;
-      break;
-#endif
-  }
-  return true;
-}
-
-void set_output_user(uint8_t output) {
-#ifdef BLUETOOTH_BLUEFRUIT_LE
-  switch(output) {
-    case OUTPUT_USB:
-      led_set_output_usb();
-      break;
-    case OUTPUT_BLUETOOTH:
-      led_set_output_ble();
-      break;
-    default:
-      led_set_output_none();
-  }
-#endif
-}
-
-void matrix_init_user(void) {
-  wait_ms(500); // give time for usb to initialize
-
-  set_unicode_input_mode(UNICODE_MODE_LINUX);
-
-#ifdef RGBSPS_ENABLE
-  led_init();
-#endif
-
-  // auto detect output on init
-#ifdef BLUETOOTH_BLUEFRUIT_LE
-  uint8_t output = auto_detect_output();
-  if (output == OUTPUT_USB) {
-    set_output(OUTPUT_USB);
-  } else {
-    set_output(OUTPUT_BLUETOOTH);
-  }
-#endif
-}
-
-void turn_off_capslock(void) {
-  if (capslock) {
-    register_code(KC_CAPS);
-    unregister_code(KC_CAPS);
-  }
-}
-
-#ifdef RGBSPS_ENABLE
-  void matrix_scan_user(void) {
-    led_set_layer_indicator();
-  }
-
-  void battery_poll(uint8_t level) {
-    rgbsps_sethsv(LED_IND_BATTERY, level * 120/255, 255, 15);
-    rgbsps_send();
-  }
-
-  bool led_update_user(led_t led_state) {
-    bool new_capslock = led_state.caps_lock;
-    if (new_capslock ^ capslock) { // capslock state is different
-      if ((capslock = new_capslock)) {
-        rgbsps_set(LED_IND_CAPSLOCK, THEME_COLOR_CAPSLOCK);
-      } else {
-        rgbsps_set(LED_IND_CAPSLOCK, COLOR_BLANK);
-      }
-      rgbsps_send();
-    }
-    return false;
-  }
-#endif
-
-#ifdef PS2_MOUSE_ENABLE
-  void ps2_mouse_init_user(void) {
-      uint8_t rcv;
-
-      // set TrackPoint sensitivity
-      PS2_MOUSE_SEND(0xE2, "tpsens: 0xE2");
-      PS2_MOUSE_SEND(0x81, "tpsens: 0x81");
-      PS2_MOUSE_SEND(0x4A, "tpsens: 0x4A");
-      PS2_MOUSE_SEND(0x49, "tpsens: 0x59");
-
-      // set TrackPoint Negative Inertia factor
-      PS2_MOUSE_SEND(0xE2, "tpnegin: 0xE2");
-      PS2_MOUSE_SEND(0x81, "tpnegin: 0x81");
-      PS2_MOUSE_SEND(0x4D, "tpnegin: 0x4D");
-      PS2_MOUSE_SEND(0x06, "tpnegin: 0x06");
-
-      // set TrackPoint speed
-      // (transfer function upper plateau speed)
-      PS2_MOUSE_SEND(0xE2, "tpsp: 0xE2");
-      PS2_MOUSE_SEND(0x81, "tpsp: 0x81");
-      PS2_MOUSE_SEND(0x60, "tpsp: 0x60");
-      PS2_MOUSE_SEND(0x61, "tpsp: 0x61");
-
-      // inquire pts status
-      rcv = ps2_host_send(0xE2);
-      rcv = ps2_host_send(0x2C);
-      rcv = ps2_host_recv_response();
-      if ((rcv & 1) == 1) {
-        // if on, disable pts
-        rcv = ps2_host_send(0xE2);
-        rcv = ps2_host_send(0x47);
-        rcv = ps2_host_send(0x2C);
-        rcv = ps2_host_send(0x01);
-      }
-  }
-#endif
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/rgbtheme.h b/keyboards/handwired/promethium/keymaps/priyadi/rgbtheme.h
deleted file mode 100644
index e6097103513..00000000000
--- a/keyboards/handwired/promethium/keymaps/priyadi/rgbtheme.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "rgbtheme_default.h"
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/rgbtheme_carbon.h b/keyboards/handwired/promethium/keymaps/priyadi/rgbtheme_carbon.h
deleted file mode 100644
index 8e0a98b0928..00000000000
--- a/keyboards/handwired/promethium/keymaps/priyadi/rgbtheme_carbon.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "color.h"
-
-#define THEME_COLOR_LINUX                 COLOR_WHITE
-#define THEME_COLOR_APPLE                 COLOR_WHITE
-#define THEME_COLOR_WINDOWS               COLOR_WHITE
-
-#define THEME_COLOR_QWERTY                COLOR_RED
-#define THEME_COLOR_ALT                   COLOR_RED
-
-#define THEME_COLOR_AUDIO                 COLOR_GREEN
-
-#define THEME_COLOR_BLUETOOTH             7,7,15
-#define THEME_COLOR_USB                   COLOR_WHITE
-
-#define THEME_COLOR_CAPSLOCK              COLOR_RED
-
-#define THEME_COLOR_GUI                   COLOR_MAGENTA
-#define THEME_COLOR_FUN                   COLOR_RED
-#define THEME_COLOR_NUM                   7,7,15
-#define THEME_COLOR_PUNC                  COLOR_GREEN
-#define THEME_COLOR_GREEK                 COLOR_CYAN
-#define THEME_COLOR_EMOJI                 COLOR_YELLOW
-#define THEME_COLOR_OTHERLAYER            COLOR_GRAY
-
-#define THEME_COLOR_GLOW1_HOME            COLOR_ORANGE
-#define THEME_COLOR_GLOW1_HOMING          COLOR_RED
-
-#define THEME_COLOR_GLOW2_ALPHA           COLOR_ORANGE
-#define THEME_COLOR_GLOW2_MODS            COLOR_ORANGE
-#define THEME_COLOR_GLOW2_FN              COLOR_ORANGE
-#define THEME_COLOR_GLOW2_HOME            COLOR_ORANGE
-#define THEME_COLOR_GLOW2_HOMING          COLOR_RED
-
-#define THEME_COLOR_TP1                   COLOR_ORANGE
-#define THEME_COLOR_TP2                   COLOR_RED
-#define THEME_COLOR_TP3                   COLOR_ORANGE
\ No newline at end of file
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/rgbtheme_default.h b/keyboards/handwired/promethium/keymaps/priyadi/rgbtheme_default.h
deleted file mode 100644
index 4c3fb136934..00000000000
--- a/keyboards/handwired/promethium/keymaps/priyadi/rgbtheme_default.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "color.h"
-
-#define THEME_COLOR_LINUX                 COLOR_WHITE
-#define THEME_COLOR_APPLE                 COLOR_WHITE
-#define THEME_COLOR_WINDOWS               COLOR_WHITE
-
-#define THEME_COLOR_QWERTY                COLOR_RED
-#define THEME_COLOR_ALT                   COLOR_RED
-
-#define THEME_COLOR_AUDIO                 COLOR_GREEN
-
-#define THEME_COLOR_BLUETOOTH             COLOR_BLUE
-#define THEME_COLOR_USB                   COLOR_WHITE
-
-#define THEME_COLOR_CAPSLOCK              COLOR_RED
-
-#define THEME_COLOR_GUI                   COLOR_MAGENTA
-#define THEME_COLOR_FUN                   COLOR_RED
-#define THEME_COLOR_NUM                   COLOR_BLUE
-#define THEME_COLOR_PUNC                  COLOR_GREEN
-#define THEME_COLOR_GREEK                 COLOR_CYAN
-#define THEME_COLOR_EMOJI                 COLOR_YELLOW
-#define THEME_COLOR_OTHERLAYER            COLOR_GRAY
-
-#define THEME_COLOR_GLOW1_HOME            COLOR_GRAY
-#define THEME_COLOR_GLOW1_HOMING          COLOR_RED
-
-#define THEME_COLOR_GLOW2_ALPHA           COLOR_GRAY
-#define THEME_COLOR_GLOW2_MODS            COLOR_GREEN
-#define THEME_COLOR_GLOW2_FN              COLOR_BLUE
-#define THEME_COLOR_GLOW2_HOME            COLOR_RED
-#define THEME_COLOR_GLOW2_HOMING          COLOR_YELLOW
-
-#define THEME_COLOR_TP1                   COLOR_RED
-#define THEME_COLOR_TP2                   COLOR_BLUE
-#define THEME_COLOR_TP3                   COLOR_RED
\ No newline at end of file
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/rules.mk b/keyboards/handwired/promethium/keymaps/priyadi/rules.mk
deleted file mode 100644
index 9db01c0a68c..00000000000
--- a/keyboards/handwired/promethium/keymaps/priyadi/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = yes
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
-PS2_DRIVER = interrupt
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c
index bc98bdd634a..0dff65eda60 100644
--- a/keyboards/handwired/pterodactyl/matrix.c
+++ b/keyboards/handwired/pterodactyl/matrix.c
@@ -29,9 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define I2C_TIMEOUT 100
 
-#define I2C_ADDR        0b0100000
-#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
-#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define I2C_ADDR        (0b0100000<<1)
 #define IODIRA          0x00            // i/o direction register
 #define IODIRB          0x01
 #define GPPUA           0x0C            // GPIO pull-up resistor register
@@ -159,9 +157,6 @@ void init_expander(void) {
 #endif
     }
 
-    expander_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT); if (expander_status) goto out;
-    expander_status = i2c_write(IODIRA, I2C_TIMEOUT);         if (expander_status) goto out;
-
     /*
     Pin direction and pull-up depends on both the diode direction
     and on whether the column register is GPIOA or GPIOB
@@ -176,50 +171,27 @@ void init_expander(void) {
 
 #if (EXPANDER_COL_REGISTER == GPIOA)
 #   if (DIODE_DIRECTION == COL2ROW)
-        expander_status = i2c_write(expander_input_pin_mask, I2C_TIMEOUT); if (expander_status) goto out;
-        expander_status = i2c_write(0, I2C_TIMEOUT);                       if (expander_status) goto out;
+    uint8_t data[] = { expander_input_pin_mask, 0};
 #   elif (DIODE_DIRECTION == ROW2COL)
-        expander_status = i2c_write(0, I2C_TIMEOUT);                       if (expander_status) goto out;
-        expander_status = i2c_write(expander_input_pin_mask, I2C_TIMEOUT); if (expander_status) goto out;
+    uint8_t data[] = { 0, expander_input_pin_mask};
 #   endif
 #elif (EXPANDER_COL_REGISTER == GPIOB)
 #   if (DIODE_DIRECTION == COL2ROW)
-        expander_status = i2c_write(0, I2C_TIMEOUT);                       if (expander_status) goto out;
-        expander_status = i2c_write(expander_input_pin_mask, I2C_TIMEOUT); if (expander_status) goto out;
+    uint8_t data[] = { 0, expander_input_pin_mask};
 #   elif (DIODE_DIRECTION == ROW2COL)
-        expander_status = i2c_write(expander_input_pin_mask, I2C_TIMEOUT); if (expander_status) goto out;
-        expander_status = i2c_write(0, I2C_TIMEOUT);                       if (expander_status) goto out;
-#   endif
-#endif
-
-    i2c_stop();
-
-    // set pull-up
-    // - unused  : off : 0
-    // - input   : on  : 1
-    // - driving : off : 0
-    expander_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);              if (expander_status) goto out;
-    expander_status = i2c_write(GPPUA, I2C_TIMEOUT);                       if (expander_status) goto out;
-#if (EXPANDER_COL_REGISTER == GPIOA)
-#   if (DIODE_DIRECTION == COL2ROW)
-        expander_status = i2c_write(expander_input_pin_mask, I2C_TIMEOUT); if (expander_status) goto out;
-        expander_status = i2c_write(0, I2C_TIMEOUT);                       if (expander_status) goto out;
-#   elif (DIODE_DIRECTION == ROW2COL)
-        expander_status = i2c_write(0, I2C_TIMEOUT);                       if (expander_status) goto out;
-        expander_status = i2c_write(expander_input_pin_mask, I2C_TIMEOUT); if (expander_status) goto out;
-#   endif
-#elif (EXPANDER_COL_REGISTER == GPIOB)
-#   if (DIODE_DIRECTION == COL2ROW)
-        expander_status = i2c_write(0, I2C_TIMEOUT);                       if (expander_status) goto out;
-        expander_status = i2c_write(expander_input_pin_mask, I2C_TIMEOUT); if (expander_status) goto out;
-#   elif (DIODE_DIRECTION == ROW2COL)
-        expander_status = i2c_write(expander_input_pin_mask, I2C_TIMEOUT); if (expander_status) goto out;
-        expander_status = i2c_write(0, I2C_TIMEOUT);                       if (expander_status) goto out;
+    uint8_t data[] = { expander_input_pin_mask, 0};
 #   endif
 #endif
+    expander_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
+
+    if (!expander_status) {
+        // set pull-up
+        // - unused  : off : 0
+        // - input   : on  : 1
+        // - driving : off : 0
+        expander_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
+    }
 
-out:
-    i2c_stop();
 }
 
 uint8_t matrix_scan(void)
@@ -332,14 +304,9 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
 
     // Read columns from expander, unless it's in an error state
     if (! expander_status) {
-        expander_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);           if (expander_status) goto out;
-        expander_status = i2c_write(EXPANDER_COL_REGISTER, I2C_TIMEOUT);    if (expander_status) goto out;
-        expander_status = i2c_start(I2C_ADDR_READ, I2C_TIMEOUT);            if (expander_status) goto out;
-
-        current_matrix[current_row] |= (~i2c_read_nack(I2C_TIMEOUT)) & expander_input_pin_mask;
-
-        out:
-            i2c_stop();
+        uint8_t data;
+        i2c_readReg(I2C_ADDR, EXPANDER_COL_REGISTER, &data, 1, I2C_TIMEOUT);
+        current_matrix[current_row] |= (~data) & expander_input_pin_mask;
     }
 
     // Read columns from onboard pins
@@ -361,11 +328,8 @@ static void select_row(uint8_t row) {
     if (! expander_status) {
         // set active row low  : 0
         // set other rows hi-Z : 1
-        expander_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);           if (expander_status) goto out;
-        expander_status = i2c_write(EXPANDER_ROW_REGISTER, I2C_TIMEOUT);    if (expander_status) goto out;
-        expander_status = i2c_write(0xFF & ~(1<<row), I2C_TIMEOUT);         if (expander_status) goto out;
-    out:
-        i2c_stop();
+        uint8_t data = 0xFF & ~(1<<row);
+        i2c_writeReg(I2C_ADDR, EXPANDER_ROW_REGISTER, &data, 1, I2C_TIMEOUT);
     }
 
     // select on teensy
@@ -421,14 +385,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
             return false;
         }
 
-        expander_status = i2c_start(I2C_ADDR_WRITE, I2C_TIMEOUT);           if (expander_status) goto out;
-        expander_status = i2c_write(EXPANDER_ROW_REGISTER, I2C_TIMEOUT);    if (expander_status) goto out;
-        expander_status = i2c_start(I2C_ADDR_READ, I2C_TIMEOUT);            if (expander_status) goto out;
-        column_state = i2c_read_nack(I2C_TIMEOUT);
-
-        out:
-            i2c_stop();
-
+        i2c_writeReg(I2C_ADDR, EXPANDER_ROW_REGISTER, &column_state, 1, I2C_TIMEOUT);
         column_state = ~column_state;
     } else {
         for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
diff --git a/keyboards/handwired/pteron/keymaps/FSund/keymap.c b/keyboards/handwired/pteron/keymaps/FSund/keymap.c
deleted file mode 100644
index 14ad23cd43e..00000000000
--- a/keyboards/handwired/pteron/keymaps/FSund/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum pteron_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-// alt gr
-#undef G
-#define G(kc) RALT(kc)
-
-// custom keycodes
-// use F_ prefix to avoid problems
-
-// NB! I use Norwegian keyboard layout on my machines, so the keymap probably
-// doesn't make much sense for US/ANSI users
-
-#define F_FSLH S(KC_7) // forward slash
-#define F_BSLH KC_EQL // backward slash
-#define F_EQL S(KC_0) // equals sign
-#define F_APOS KC_BSLS // '
-#define F_TIMES S(KC_BSLS) // *
-#define F_PLUS KC_MINS // +
-#define F_QUEST S(KC_MINS) // ?
-#define F_HAT S(KC_RBRC) // ^
-#define F_TILD G(KC_RBRC) // ~
-#define F_UML KC_RBRC // ¨ (umlaut)
-#define F_SECT S(KC_GRV) // section sign ("law sign") (shifted key below esc)
-#define F_GRAVE S(KC_EQL)
-#define F_ACUTE G(KC_EQL)
-
-#define KC_AA KC_LBRC
-#define KC_OE KC_SCLN
-#define KC_AE KC_QUOT
-
-// brackets
-#define F_SBRL G(KC_8) // square bracket left
-#define F_SBRR G(KC_9) // square bracket right
-#define F_CBRL G(KC_7) // curly bracket left
-#define F_CBRR G(KC_0) // curly bracket right
-#define F_RBRL S(KC_8) // round bracket left
-#define F_RBRR S(KC_9) // round bracket right
-#define F_ABRL KC_NUBS // angle bracket left
-#define F_ABRR S(KC_NUBS) // angle bracket right
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * +-----------------------------------------+                                +-----------------------------------------+
- * | Esc  |   1  |   2  |   3  |   4  |   5  |                                |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                                |   Y  |   U  |   I  |   O  |   P  |   Å  |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |                                |   H  |   J  |   K  |   L  |   Ø  |   Æ  |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * | Shft |   Z  |   X  |   C  |   V  |   B  |                                |   N  |   M  |   ,  |   .  |   -  | Shft |
- * +---------------------------+------+------+-------------+    +-------------+------+------+---------------------------+
- *                             | LOWR | Spc  | Alt  | Win  |    | Win  | Alt  | Spc  | RISE |
- *                             +---------------------------+    +---------------------------+
- */
-
-[_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_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_AA,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_OE,   KC_AE,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                          LOWER,   KC_SPC,  KC_LALT, KC_LGUI,          KC_RGUI, KC_RALT, KC_ENT,  RAISE
-    ),
-
-/* LOWER
- * +-----------------------------------------+                                +-----------------------------------------+
- * |      |      |      |      |      |      |                                |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                                |   \  |   /  |   [  |   ]  |   =  | Del  |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                                |   <  |   >  |   (  |   )  |   *  |   ~  |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * |      |  F6  |  F7  |  F8  |  F9  |  F10 |                                |  F11 |  F12 |   {  |   }  |   +  |      |
- * +---------------------------+------+------+-------------+    +-------------+------+------+---------------------------+
- *                             |      |      |      |      |    |      |      |      |      |
- *                             +---------------------------+    +---------------------------+
- */
-
-[_LOWER] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,          F_BSLH,  F_FSLH,  F_SBRL,  F_SBRR,  F_EQL,   KC_DEL,
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,            F_ABRL,  F_ABRR,  F_RBRL,  F_RBRR,  F_TIMES, F_TILD,
-        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,           KC_F11,  KC_F12,  F_CBRL,  F_CBRR,  F_PLUS,  _______,
-                          _______, _______, _______, _______,          _______, _______, _______, _______
-    ),
-
-[_RAISE] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_AA,
-        F_SECT,  S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5),          F_QUEST, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, F_APOS,
-        _______, S(KC_6), G(KC_2), G(KC_3), G(KC_4), G(KC_5),          F_HAT,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
-                          _______, _______, _______, _______,          _______, _______, _______, _______
-    ),
-
-[_ADJUST] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-        _______, F_UML,   F_GRAVE, F_ACUTE, _______, QK_BOOT,          _______, _______, _______, _______, KC_PSCR, _______,
-        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,          _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,
-                          _______, _______, _______, _______,          _______, _______, _______, _______
-    )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/config.h b/keyboards/handwired/pteron/keymaps/alzafacon/config.h
deleted file mode 100644
index 3bc36a62ae5..00000000000
--- a/keyboards/handwired/pteron/keymaps/alzafacon/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
- /* Copyright 2021 Fidel Coria
-  * 
-  * 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
-
-/* override diode direction from keyboard config */
-/* COL2ROW or ROW2COL */
-#undef DIODE_DIRECTION
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c b/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
deleted file mode 100644
index 1d030599fd8..00000000000
--- a/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
+++ /dev/null
@@ -1,120 +0,0 @@
- /* Copyright 2021 Fidel Coria
-  * 
-  * 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 pteron_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * +-----------------------------------------+      +-----------------------------------------+
- * |   `  |   1  |   2  |   3  |   4  |   5  |      |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |      |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |      |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |      |   N  |   M  |   ,  |   .  |   /  |Enter |
- * +-------------+------+------+------+------|      |------+------+------+------+-------------+
- *               |Lower | SPC  | Alt  | GUI  |      | Alt  | GUI  | SPC  |Raise |
- *               +---------------------------+      +---------------------------+
- */
-[_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_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  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, KC_ENT,
-                    LOWER,   KC_SPC,  KC_LALT, KC_LGUI,         KC_RALT, KC_RGUI, KC_SPC,  RAISE
-),
-
-/* Lower
- * +-----------------------------------------+      +-----------------------------------------+
- * |   ~  |   !  |   @  |   #  |   $  |   %  |      |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |      |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |      |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |      |  F12 |ISO ~ |ISO | |      |      |      |
- * +-------------+------+------+------+------|      |------+------+------+------+-------------+
- *               |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- *               +---------------------------+      +---------------------------+
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END, _______,
-                    _______, _______, _______, _______,         KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * +-----------------------------------------+      +-----------------------------------------+
- * |   `  |   1  |   2  |   3  |   4  |   5  |      |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |      |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |      |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |      |  F12 |ISO # |ISO / |      |      |      |
- * +-------------+------+------+------+------|      |------+------+------+------+-------------+
- *               |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- *               +---------------------------+      +---------------------------+
- */
-[_RAISE] = LAYOUT(
-  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_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_PGUP, KC_PGDN, _______,
-                    _______, _______, _______, _______,         KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * +-----------------------------------------+      +-----------------------------------------+
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|      |AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|      |MidOff|      |      |      |      |      |
- * +-------------+------+------+------+------|      |------+------+------+------+-------------+
- *               |      |      |      |      |      |      |      |      |      |      
- *               +---------------------------+      +---------------------------+
- */
-[_ADJUST] = 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,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______,         _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,         _______, _______, _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/readme.md b/keyboards/handwired/pteron/keymaps/alzafacon/readme.md
deleted file mode 100644
index 0bc5f2704fd..00000000000
--- a/keyboards/handwired/pteron/keymaps/alzafacon/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# alzafacon pteron layout
-
-This keymap is for builds with elite-c controllers.
-Also notice `DIODE_DIRECTION COL2ROW`. I prefer to hand-wire this way.
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/rules.mk b/keyboards/handwired/pteron/keymaps/alzafacon/rules.mk
deleted file mode 100644
index 03323308e77..00000000000
--- a/keyboards/handwired/pteron/keymaps/alzafacon/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# for elite-c
-BOOTLOADER = atmel-dfu
diff --git a/keyboards/handwired/qc60/keymaps/wntrmln/config.h b/keyboards/handwired/qc60/keymaps/wntrmln/config.h
deleted file mode 100644
index 10887bdf189..00000000000
--- a/keyboards/handwired/qc60/keymaps/wntrmln/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define MASTER_LEFT
diff --git a/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c b/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
deleted file mode 100644
index dd12206b261..00000000000
--- a/keyboards/handwired/qc60/keymaps/wntrmln/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2018 Michael Pio Mayol <mfmayol@up.edu.ph>
- *
- * 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
-
-extern keymap_config_t keymap_config;
-
-// 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 _BASE 0
-#define _FN 1
-
-#define FN MO(_FN)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_hhkb_split_lshift(
-    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_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_BSPC,
-    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_LSFT, KC_RSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,     KC_RSFT,      KC_CAPS,
-                      FN,   KC_LALT,      KC_SPC,       KC_F13,        KC_BSLS,      KC_SPC,      KC_RALT, KC_LGUI
-  ),
-
-  [_FN] = LAYOUT_hhkb_split_lshift(
-    QK_BOOT, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_UP,   _______, _______, _______,                 _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                 _______, _______, _______, _______, _______, _______,     _______,
-    _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,     _______,      _______,
-                      _______, _______,     _______,      KC_NUM,         _______,      _______,     _______, _______
-  ),
-
-};
diff --git a/keyboards/handwired/rd_61_qmk/config.h b/keyboards/handwired/rd_61_qmk/config.h
new file mode 100644
index 00000000000..7281c45662d
--- /dev/null
+++ b/keyboards/handwired/rd_61_qmk/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 abhiakl (@abhijithabhiakl)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+/* QK_MAKE support*/
+#define ENABLE_COMPILE_KEYCODE
diff --git a/keyboards/handwired/rd_61_qmk/info.json b/keyboards/handwired/rd_61_qmk/info.json
new file mode 100644
index 00000000000..be07d95924f
--- /dev/null
+++ b/keyboards/handwired/rd_61_qmk/info.json
@@ -0,0 +1,126 @@
+{
+    "manufacturer": "abhiakl",
+    "keyboard_name": "rd_61_qmk",
+    "maintainer": "abhijithabhiakl",
+    "backlight": {
+        "driver": "pwm",
+        "levels": 5,
+        "pin": "B7"
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x7421",
+        "vid": "0xFEED"
+    },
+    "development_board": "promicro",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D4", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "brightness_steps": 8,
+        "led_count": 1,
+        "saturation_steps": 8
+    },
+    "url": "",
+    "ws2812": {
+        "pin": "C7"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/rd_61_qmk/keymaps/default/keymap.c b/keyboards/handwired/rd_61_qmk/keymaps/default/keymap.c
new file mode 100644
index 00000000000..b32fa614a7d
--- /dev/null
+++ b/keyboards/handwired/rd_61_qmk/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        [0] = 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,  MO(1),   KC_LALT,                                    KC_SPC,                              KC_RALT, MO(3),   KC_RCTL, KC_PENT
+            ),
+
+        [1] = 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_TRNS,
+            KC_PSCR,  DF(0),   KC_UP,        KC_MUTE,   KC_VOLD,  KC_VOLU,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+            KC_DEL,   KC_LEFT, KC_DOWN,      KC_RGHT,   KC_BRID,  KC_BRIU,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+            KC_LSFT,           C(S(KC_TAB)), C(KC_TAB), KC_MPLY,  KC_MPRV,  KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_RSFT,
+            KC_RGUI,  KC_TRNS, MO(2),                                       KC_TRNS,                            KC_TRNS, MO(3),   KC_TRNS, KC_TRNS
+            ),
+
+        [2] = LAYOUT_60_ansi(
+            QK_RBT,   KC_TRNS, KC_TRNS,      KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_BSPC,
+            KC_PSCR,  KC_P7,   KC_P8,        KC_P9,     KC_PSLS,  KC_PAST,  KC_LEFT, KC_TRNS, KC_TRNS, KC_7,    KC_8,    KC_9,    KC_TRNS, KC_PSCR,
+            KC_DEL,   KC_P4,   KC_P5,        KC_P6,     KC_PMNS,  KC_PPLS,  KC_RGHT, KC_TRNS, KC_TRNS, KC_4,    KC_5,    KC_6,             KC_TRNS,
+            KC_LSFT,           KC_P1,        KC_P2,     KC_P3,    KC_PDOT,  KC_P0,   KC_ENT,  KC_TRNS, KC_1,    KC_2,    KC_3,             KC_RSFT,
+            KC_TRNS,  KC_TRNS, KC_TRNS,                                     KC_TRNS,                            KC_TRNS, MO(3),   KC_TRNS, KC_TRNS
+            ),
+
+        [3] = LAYOUT_60_ansi(
+            KC_TRNS,  KC_TRNS, KC_TRNS,      KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DB_TOGG, QK_RBT,  QK_BOOT, QK_MAKE,
+            KC_TRNS,  KC_TRNS, KC_TRNS,      KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+            KC_TRNS,  KC_TRNS, KC_TRNS,      KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+            KC_TRNS,           KC_TRNS,      KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI,          KC_TRNS,
+            KC_TRNS,  KC_TRNS, KC_TRNS,                                     KC_TRNS,                            RGB_MOD, KC_TRNS, RGB_HUI, RGB_SAI
+  )
+};
diff --git a/keyboards/handwired/rd_61_qmk/readme.md b/keyboards/handwired/rd_61_qmk/readme.md
new file mode 100644
index 00000000000..f9e40ac81bf
--- /dev/null
+++ b/keyboards/handwired/rd_61_qmk/readme.md
@@ -0,0 +1,53 @@
+# Redragon K617 (QMK ported)
+
+![Keyboard image](https://imagizer.imageshack.com/img922/3464/qUpU8k.png)
+
+*Firmware,layout and schematics for porting Redragon K617 keyboard to qmk*
+
+* Keyboard Maintainer: *[abhijithabhiakl](https://github.com/abhijithabhiakl)*
+* Hardware Supported: *Redragon K617, Pro micro(caterina)*
+* Hardware Availability: *[Redragon K617](https://redragon.in/products/fizz-k617-60-wired-mechanical-keyboard-white-and-grey-red-switches)*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/rd_61_qmk:default
+
+Flashing example for this keyboard:
+
+    make handwired/rd_61_qmk:default:flash
+    
+Also can be flashed with QMK *[QMK toolbox](https://github.com/qmk/qmk_toolbox)* or *[avrdudess](https://blog.zakkemble.net/avrdudess-a-gui-for-avrdude/)*
+
+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).
+
+See [QMK repo cloning](https://docs.qmk.fm/#/getting_started_github) for information about cloning the repo
+
+## Hardware details: 
+
+Note : Before doing any modifications in the PCB make sure that the stock microcontroller is removed.
+
+#### Matrix layout:
+![Keyboard image](https://imagizer.imageshack.com/img924/8415/hX5gAb.jpg)
+
+#### Schematic:
+![Keyboard image](https://imagizer.imageshack.com/img922/5585/vXorPx.png)
+
+* *The header `J0` in not present in the normal pro mirco, for my purpose i directly soldered the `D5`, `C7` and `F0` pins to the pad of the microcontroller with micro soldering tools.
+
+* **To connect the promicro to PCB - Micro USB to the USB C, i made use of an old micro usb cable lying around, cut the cable to approprite length and exposed the wires, connected the male connector to female port of  pro micro, Connected the Vcc and Gnd wires to Vcc and Gnd in the PCB, In PCB there's a differential pair (D+, D-) running from USB C port in the PCB to microcontroller in the PCB, in between the connection there's a resistor and filter capacitors, after removing both (bypassing the connection) i connected the D+ and D- wires to the bypassed point respectively (make sure the cable wires are also impedance matched)
+
+#### RGB Lighting:
+
+The stock RGB Lighting used on the keyboard is [this](https://www.luckylight.cn/en/products/smd-led/multi-color-smd-led/?series_code=sr187-rgb-series) `SR187RGBC` `Multi-color PLCC SMD LEDs`, to use this kind of LED with qmk I either have to write a custom led matrix code ( I don't know for sure if qmk already have any support this neither currently have the knowledge or time to do so ) or need to make a led matrix with qmk supported led matrix drivers, due to above mentioned reasons I haven't did any RGB lightings in the keyboard except a single ws2812 led 
+
+I'm  trying to make a custom PCB for this keyboard (will work for all redragon 60% keyboard (ig) ),  I'll update here 
+
+## Bootloader
+
+Entering the bootloader:
+
+* **Physical reset button**: Briefly press the button soldered to promicro (In my case i soldered the reset button to the promicro with wires and glued in outside in front of the case)
+* **Bootmagic key at [0,0]**: Hold this key down when plugging the keyboard in. Just the single key
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`. Also in `layer #3` keys `DB_TOGG` `QK_RBT` `QK_BOOT` `QK_MAKE` are present at the top right corner for debug mode, keyboard reboot, bootloader mode and qmk make (`qmk flash` if shift is held ) in the respective order to make the flasing easier.
+`QK_MAKE` will type `qmk compile -kb handwired/rd_61_qmk -km default` in the terminal and `qmk flash` will type `qmk flash -kb handwired/rd_61_qmk -km default`
+
diff --git a/keyboards/handwired/rd_61_qmk/rules.mk b/keyboards/handwired/rd_61_qmk/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/rd_61_qmk/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto108/info.json b/keyboards/handwired/scottokeebs/scotto108/info.json
new file mode 100644
index 00000000000..0781bb4cae3
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto108/info.json
@@ -0,0 +1,138 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "Scotto108",
+    "maintainer": "joe-scotto",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+    },
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP29", "GP28", "GP27", "GP26", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5"]
+    },
+    "processor": "RP2040",
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1022",
+        "vid": "0x534B"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
+                {"matrix": [0, 18], "x": 19, "y": 0},
+                {"matrix": [0, 19], "x": 20, "y": 0},
+                {"matrix": [0, 20], "x": 21, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18, "y": 1.5},
+                {"matrix": [1, 18], "x": 19, "y": 1.5},
+                {"matrix": [1, 19], "x": 20, "y": 1.5},
+                {"matrix": [1, 20], "x": 21, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6, "y": 2.5},
+                {"matrix": [2, 7], "x": 7, "y": 2.5},
+                {"matrix": [2, 8], "x": 8, "y": 2.5},
+                {"matrix": [2, 9], "x": 9, "y": 2.5},
+                {"matrix": [2, 10], "x": 10, "y": 2.5},
+                {"matrix": [2, 11], "x": 11, "y": 2.5},
+                {"matrix": [2, 12], "x": 12, "y": 2.5},
+                {"matrix": [2, 13], "x": 13, "y": 2.5},
+                {"matrix": [2, 14], "x": 14.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18, "y": 2.5},
+                {"matrix": [2, 18], "x": 19, "y": 2.5},
+                {"matrix": [2, 19], "x": 20, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5},
+                {"matrix": [3, 4], "x": 4, "y": 3.5},
+                {"matrix": [3, 5], "x": 5, "y": 3.5},
+                {"matrix": [3, 6], "x": 6, "y": 3.5},
+                {"matrix": [3, 7], "x": 7, "y": 3.5},
+                {"matrix": [3, 8], "x": 8, "y": 3.5},
+                {"matrix": [3, 9], "x": 9, "y": 3.5},
+                {"matrix": [3, 10], "x": 10, "y": 3.5},
+                {"matrix": [3, 11], "x": 11, "y": 3.5},
+                {"matrix": [3, 13], "x": 12, "y": 3.5, "w": 2},
+                {"matrix": [3, 17], "x": 18, "y": 3.5},
+                {"matrix": [3, 18], "x": 19, "y": 3.5},
+                {"matrix": [3, 19], "x": 20, "y": 3.5},
+                {"matrix": [3, 20], "x": 21, "y": 2.5, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5},
+                {"matrix": [4, 4], "x": 4, "y": 4.5},
+                {"matrix": [4, 5], "x": 5, "y": 4.5},
+                {"matrix": [4, 6], "x": 6, "y": 4.5},
+                {"matrix": [4, 7], "x": 7, "y": 4.5},
+                {"matrix": [4, 8], "x": 8, "y": 4.5},
+                {"matrix": [4, 9], "x": 9, "y": 4.5},
+                {"matrix": [4, 10], "x": 10, "y": 4.5},
+                {"matrix": [4, 12], "x": 11, "y": 4.5, "w": 3},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18, "y": 4.5},
+                {"matrix": [4, 18], "x": 19, "y": 4.5},
+                {"matrix": [4, 19], "x": 20, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5},
+                {"matrix": [5, 2], "x": 2, "y": 5.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.5},
+                {"matrix": [5, 11], "x": 11, "y": 5.5},
+                {"matrix": [5, 12], "x": 12, "y": 5.5},
+                {"matrix": [5, 13], "x": 13, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18, "y": 5.5, "w": 2},
+                {"matrix": [5, 19], "x": 20, "y": 5.5},
+                {"matrix": [5, 20], "x": 21, "y": 4.5, "h": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scotto108/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scotto108/keymaps/default/keymap.c
new file mode 100644
index 00000000000..472318e1f5b
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto108/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2023 Joe Scotto
+
+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,      KC_PSCR, KC_SCRL, KC_PAUS,      KC_1,   KC_2,    KC_3,    KC_4,
+        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_EQUAL, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,      KC_NUM, 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_BSLS,     KC_DEL,  KC_END,  KC_PGDN,      KC_P7,  KC_P8,   KC_P9,
+        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_P4,  KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,  KC_N,   KC_M,  KC_COMMA,  KC_DOT, KC_SLSH,                    KC_RSFT,              KC_UP,                 KC_P1,  KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                           KC_RALT, KC_RGUI, KC_APP,   KC_RCTL,     KC_LEFT, KC_DOWN, KC_RIGHT,     KC_P0,           KC_PDOT, KC_PENT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scotto108/readme.md b/keyboards/handwired/scottokeebs/scotto108/readme.md
new file mode 100644
index 00000000000..1875adbc309
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto108/readme.md
@@ -0,0 +1,29 @@
+# Scotto108
+
+![Scotto108](https://i.imgur.com/ss4BEujh.jpg)
+
+A 108-key full-sized ortholinear keyboard with a 7u spacebar and 4 macro keys above the numpad.
+
+*   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+*   Hardware Supported: Raspberry Pi Pico
+*   Hardware Availability: [ScottoKeebs](https://scottokeebs.com), [Amazon](https://amazon.com), [AliExpress](https://aliexpress.com)
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/scottokeebs/scotto108:default
+
+Flashing example for this keyboard:
+
+    make handwired/scottokeebs/scotto108: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 `QK_BOOT` if it is available
diff --git a/keyboards/handwired/scottokeebs/scotto108/rules.mk b/keyboards/handwired/scottokeebs/scotto108/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto108/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto61/info.json b/keyboards/handwired/scottokeebs/scotto61/info.json
index fe08843b978..8614ec81ebe 100644
--- a/keyboards/handwired/scottokeebs/scotto61/info.json
+++ b/keyboards/handwired/scottokeebs/scotto61/info.json
@@ -41,7 +41,7 @@
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 4},
+                {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1, "y": 1},
                 {"matrix": [1, 2], "x": 2, "y": 1},
                 {"matrix": [1, 3], "x": 3, "y": 1},
@@ -67,7 +67,7 @@
                 {"matrix": [2, 9], "x": 9, "y": 2},
                 {"matrix": [2, 10], "x": 10, "y": 2},
                 {"matrix": [2, 11], "x": 11, "y": 2},
-                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 12, "y": 2, "w": 2},
                 {"matrix": [3, 0], "x": 0, "y": 3},
                 {"matrix": [3, 1], "x": 1, "y": 3},
                 {"matrix": [3, 2], "x": 2, "y": 3},
@@ -79,11 +79,11 @@
                 {"matrix": [3, 8], "x": 8, "y": 3},
                 {"matrix": [3, 9], "x": 9, "y": 3},
                 {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 11, "y": 3, "w": 3},
                 {"matrix": [4, 0], "x": 0, "y": 4},
                 {"matrix": [4, 1], "x": 1, "y": 4},
                 {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
                 {"matrix": [4, 10], "x": 10, "y": 4},
                 {"matrix": [4, 11], "x": 11, "y": 4},
                 {"matrix": [4, 12], "x": 12, "y": 4},
diff --git a/keyboards/handwired/scottokeebs/scottodeck/info.json b/keyboards/handwired/scottokeebs/scottodeck/info.json
new file mode 100644
index 00000000000..0607918cae3
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottodeck/info.json
@@ -0,0 +1,52 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoDeck",
+    "maintainer": "joe-scotto",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP2", "pin_b": "GP3"},
+            {"pin_a": "GP27", "pin_b": "GP28"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP9", null, null, "GP21"],
+            ["GP7", "GP8", "GP20", "GP23"],
+            ["GP5", "GP6", "GP26", "GP22"]
+        ]
+    },
+    "processor": "RP2040",
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0024",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c
new file mode 100644
index 00000000000..181c1e309df
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2024 Joe Scotto
+
+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
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(HYPR(KC_RIGHT), HYPR(KC_LEFT)), ENCODER_CCW_CW(HYPR(KC_UP), HYPR(KC_DOWN))  }
+    //                  Encoder 1                                     Encoder 2
+};
+#endif
+
+// Keymap
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        HYPR(KC_9),                         HYPR(KC_0),
+        HYPR(KC_5), HYPR(KC_6), HYPR(KC_7), HYPR(KC_8),
+        HYPR(KC_1), HYPR(KC_2), HYPR(KC_3), HYPR(KC_4)
+    )
+};
diff --git a/keyboards/handwired/scottokeebs/scottodeck/readme.md b/keyboards/handwired/scottokeebs/scottodeck/readme.md
new file mode 100644
index 00000000000..86224acb3c9
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottodeck/readme.md
@@ -0,0 +1,27 @@
+# ScottoDeck
+
+![ScottoDeck](https://i.imgur.com/xUl70qqh.jpeg)
+
+An 8-key macropad with two EC11 encoders designed for live streaming. Case files available [here](https://github.com/joe-scotto/scottokeebs).
+
+*   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+*   Hardware Supported: ATmega32U4
+*   Hardware Availability: [Amazon](https://amazon.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/scottokeebs/scottodeck:default
+
+Flashing example for this keyboard:
+
+    make handwired/scottokeebs/scottodeck: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottodeck/rules.mk b/keyboards/handwired/scottokeebs/scottodeck/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottodeck/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottokatana/info.json b/keyboards/handwired/scottokeebs/scottokatana/info.json
new file mode 100644
index 00000000000..4b5779b6d91
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottokatana/info.json
@@ -0,0 +1,65 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoKatana",
+    "maintainer": "joe-scotto",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP3", "GP4", "GP5", "GP6", "GP7", "GP29", "GP28", "GP27", "GP26", "GP22"],
+        "rows": ["GP10", "GP0", "GP1", "GP2"]
+    },
+    "processor": "RP2040",
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0023",
+        "vid": "0x534B"
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x10_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [0, 6], "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "x": 9.5, "y": 0},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [1, 6], "x": 8.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 8, "y": 2},
+                {"matrix": [2, 6], "x": 9, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [3, 1], "x": 1.875, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 3.375, "y": 3, "w": 6.25},
+                {"matrix": [3, 8], "x": 9.625, "y": 3, "w": 1.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottokatana/keymaps/default/config.h b/keyboards/handwired/scottokeebs/scottokatana/keymaps/default/config.h
new file mode 100644
index 00000000000..eb03070d83a
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottokatana/keymaps/default/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2024 Joe Scotto
+
+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 options
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/scottokeebs/scottokatana/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottokatana/keymaps/default/keymap.c
new file mode 100644
index 00000000000..b3ef7e97580
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottokatana/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2024 Joe Scotto
+
+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_3x10_3(
+        KC_Q,         KC_W, KC_E, KC_R, KC_T, KC_Y,          KC_U, KC_I,     KC_O,   KC_P,
+        KC_A,         KC_S, KC_D, KC_F, KC_G, KC_H,          KC_J, KC_K,     KC_L,   KC_BSPC,
+        LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N,          KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+        KC_LGUI,                              LT(1, KC_SPC),                         LT(2, KC_TAB)
+    ),
+    [1] = LAYOUT_ortho_3x10_3(
+        KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN, KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+        KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,
+        LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+        KC_TRNS,                                             KC_TRNS,                             KC_TRNS
+    ),
+    [2] = LAYOUT_ortho_3x10_3(
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+        KC_1,    KC_2,  KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        KC_LSFT, KC_NO, KC_NO,   KC_NO,  MO(3),   KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),
+        KC_TRNS,                                  KC_TRNS,                            KC_TRNS
+    ),
+    [3] = LAYOUT_ortho_3x10_3(
+        KC_NO,  KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_F1,  KC_F2, KC_F3, KC_F4,   KC_F5,   KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+        KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+        KC_TRNS,                       KC_TRNS,                             KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottokatana/readme.md b/keyboards/handwired/scottokeebs/scottokatana/readme.md
new file mode 100644
index 00000000000..915062f653f
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottokatana/readme.md
@@ -0,0 +1,27 @@
+# ScottoKatana
+
+![ScottoKatana](https://i.imgur.com/pgXehiIh.jpeg)
+
+A 33-key katana staggered keyboard with a 6.25u spacebar and two 1.5u function keys. Case files available [here](https://github.com/joe-scotto/scottokeebs).
+
+* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+* Hardware Supported: RP2040
+* Hardware Availability: [Amazon](https://amazon.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/scottokeebs/scottokatana:default
+
+Flashing example for this keyboard:
+
+    make handwired/scottokeebs/scottokatana: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottokatana/rules.mk b/keyboards/handwired/scottokeebs/scottokatana/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottokatana/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
deleted file mode 100644
index 60327794228..00000000000
--- a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2023 DmNosachev
- *
- * 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 LAYOUT_debug( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20, K21, 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, K3C, K3D, K3E, K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \
-    K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \
-    K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, K21, 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, K3C, K3D, K3E, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \
-    { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [0] = LAYOUT_debug(
-        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, 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, 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, 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, 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, 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, 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
-    )
-};
-
-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("row: %u, col: %u, pressed: %u\n", record->event.key.row, record->event.key.col, record->event.pressed);
-#endif 
-  return true;
-}
\ No newline at end of file
diff --git a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/rules.mk b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/rules.mk
deleted file mode 100644
index 032f2ee316a..00000000000
--- a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONSOLE_ENABLE = yes        # Console for debug
diff --git a/keyboards/handwired/selene/keymaps/bpendragon/keymap.c b/keyboards/handwired/selene/keymaps/bpendragon/keymap.c
deleted file mode 100644
index 4723250e354..00000000000
--- a/keyboards/handwired/selene/keymaps/bpendragon/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 Bpendragon
- *
- * 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 custom_keycodes {
-    DBL_0 = SAFE_RANGE,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case DBL_0:
-            if(record->event.pressed) {
-                SEND_STRING("00");
-            }
-            break;
-    }
-    return true;
-};
-
-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_PSCR, KC_SCRL, KC_PAUS, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,
-    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, 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_BSLS, KC_DEL, KC_END, KC_PGDN, 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_ENT, KC_P4, KC_P5, KC_P6,
-    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_P1, KC_P2, KC_P3, KC_PENT,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, DBL_0, KC_PDOT
-  )
-};
diff --git a/keyboards/handwired/sono1/keymaps/debug/keymap.c b/keyboards/handwired/sono1/keymaps/debug/keymap.c
deleted file mode 100644
index 77f2f52d1e1..00000000000
--- a/keyboards/handwired/sono1/keymaps/debug/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * 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 LAYOUT_debug( \
-    K00, K01, K02, K03, K04, K05, K06, K07, \
-    K10, K11, K12, K13, K14, K15, K16, K17, \
-    K20, K21, K22, K23, K24, K25, K26, K27, \
-    K30, K31, K32, K33, K34, K35, K36, K37, \
-    K40, K41, K42, K43, K44, K45, K46, K47, \
-    K50, K51, K52, K53, K54, K55, K56, K57, \
-    K60, K61, K62, K63, K64, K65, K66, K67, \
-    K70, K71, K72, K73, K74, K75, K76, K77, \
-    K80, K81, K82, K83, K84, K85, K86, K87, \
-    K90, K91, K92, K93, K94, K95, K96, K97, \
-    KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, \
-    KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7, \
-    KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7, \
-    KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7, \
-    KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { K70, K71, K72, K73, K74, K75, K76, K77 }, \
-    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-    { K90, K91, K92, K93, K94, K95, K96, K97 }, \
-    { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }, \
-    { KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7 }, \
-    { KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7 }, \
-    { KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7 }, \
-    { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 } \
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [0] = LAYOUT_debug(
-        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, 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, 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, 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, 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, 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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-    )
-};
-
-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("row: %u, col: %u, pressed: %u\n", record->event.key.row, record->event.key.col, record->event.pressed);
-#endif 
-  return true;
-}
\ No newline at end of file
diff --git a/keyboards/handwired/sono1/keymaps/debug/readme.md b/keyboards/handwired/sono1/keymaps/debug/readme.md
deleted file mode 100644
index 8342cd4974d..00000000000
--- a/keyboards/handwired/sono1/keymaps/debug/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for sono1
diff --git a/keyboards/handwired/steamvan/keymaps/jmdaly/config.h b/keyboards/handwired/steamvan/keymaps/jmdaly/config.h
deleted file mode 100644
index 271f48d0011..00000000000
--- a/keyboards/handwired/steamvan/keymaps/jmdaly/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-// place overrides here
diff --git a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c b/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
deleted file mode 100644
index 21ba0e5b3d5..00000000000
--- a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2019 John M Daly <jmdaly@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
-
-
-// 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 {
-  // Layers
-  _L1,
-  _L2,
-  _L3,
-  _L4,
-  _L5
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_L1] = LAYOUT_standard( /* Qwerty */
-    LT(_L5, KC_TAB),        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,    KC_BSPC,
-    CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, LT(_L2, KC_QUOT),
-    SC_LSPO,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, SC_RSPC,
-    MO(_L2),       KC_LGUI, MO(_L3),          KC_ENT,  LT(_L2, KC_SPC),                    KC_RALT, KC_BSLS,           MO(_L4)
-  ),
-  [_L2] = LAYOUT_standard( /* LAYER 2 */
-    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-    _______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL,  KC_LBRC, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-    _______, KC_ESC,  _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_LBRC, KC_RBRC, KC_MNXT, _______,
-    _______, KC_LGUI, _______,          _______, _______,                   _______, _______,          MO(_L4)
-  ),
-  [_L3] = LAYOUT_standard( /* LAYER 3 */
-    KC_MINS, KC_1,     KC_2,     KC_3,     KC_4,    KC_5,          KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    KC_EQL,  KC_PIPE,  KC_TILD,  KC_UNDS,  KC_PLUS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_4,    KC_5,    KC_6,    KC_VOLU, KC_INS,
-    _______, RGB_TOG,  RGB_MOD,  RGB_RMOD, KC_DQUO, _______,       KC_0,          KC_1,    KC_2,    KC_3,    KC_VOLD, _______,
-    _______, _______,  _______,            _______, _______,                               _______, _______,          _______
-  ),
-  [_L4] = LAYOUT_standard( /* LAYER 4 */
-    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_PGUP,   _______,
-    KC_ESC,  _______, _______, _______, _______, _______, _______, KC_F5,   KC_F6,   KC_HOME,   KC_END,    _______,
-    KC_LSFT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_F9,   KC_F10,  KC_PGDN,   KC_F12,    _______,
-    _______, KC_LSFT, KC_B,             KC_SPC,  KC_C,                      _______, _______,              _______
-  ),
-  [_L5] = LAYOUT_standard( /* LAYER 5 */
-    _______,   LGUI(KC_1),   LGUI(KC_2),   LGUI(KC_3),   LGUI(KC_4),   LGUI(KC_5),   LGUI(KC_6),   LGUI(KC_7),   LGUI(KC_8),   LGUI(KC_9),     LGUI(KC_0),   LGUI(KC_MINS),
-    KC_ESC,  _______, _______, _______, _______, _______, _______, KC_F5,   KC_F6,   KC_HOME,   KC_END,    _______,
-    KC_LSFT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_F9,   KC_F10,  KC_PGDN,   KC_F12,    _______,
-    _______, KC_LSFT, KC_B,             KC_SPC,  KC_C,                      _______, _______,              _______
-  )
-};
diff --git a/keyboards/handwired/steamvan/keymaps/jmdaly/readme.md b/keyboards/handwired/steamvan/keymaps/jmdaly/readme.md
deleted file mode 100644
index 5aeae7064f1..00000000000
--- a/keyboards/handwired/steamvan/keymaps/jmdaly/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# jmdaly's keymap for the steamvan
diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h
index a779dcccabd..b1137a0122a 100644
--- a/keyboards/handwired/steamvan/rev1/config.h
+++ b/keyboards/handwired/steamvan/rev1/config.h
@@ -24,5 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_SPI_DRIVER SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 5
-
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/technicpad/info.json b/keyboards/handwired/technicpad/info.json
new file mode 100644
index 00000000000..92a0be7f27a
--- /dev/null
+++ b/keyboards/handwired/technicpad/info.json
@@ -0,0 +1,38 @@
+{
+    "manufacturer": "nwhirschfeld",
+    "keyboard_name": "TechnicPad",
+    "maintainer": "nwhirschfeld",
+    "build": {
+        "lto": true
+    },
+    "development_board": "promicro",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["D1"],
+            ["D0"],
+            ["D4"],
+            ["C6"]
+        ]
+    },
+    "url": "https://github.com/nwhirschfeld/TechnicPad",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x5450",
+        "vid": "0x4E57"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "D1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "D0", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "D4", "matrix": [2, 0], "x": 1, "y": 0},
+                {"label": "C6", "matrix": [3, 0], "x": 1, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/technicpad/keymaps/default/keymap.json b/keyboards/handwired/technicpad/keymaps/default/keymap.json
new file mode 100644
index 00000000000..5d662bf780c
--- /dev/null
+++ b/keyboards/handwired/technicpad/keymaps/default/keymap.json
@@ -0,0 +1,8 @@
+{
+    "keyboard": "handwired/technicpad",
+    "keymap": "default",
+    "layers": [
+        ["KC_A", "KC_B", "KC_C", "KC_D"]
+    ],
+    "layout": "LAYOUT"
+}
diff --git a/keyboards/handwired/technicpad/keymaps/via/keymap.json b/keyboards/handwired/technicpad/keymaps/via/keymap.json
new file mode 100644
index 00000000000..040881546c1
--- /dev/null
+++ b/keyboards/handwired/technicpad/keymaps/via/keymap.json
@@ -0,0 +1,13 @@
+{
+    "keyboard": "handwired/technicpad",
+    "keymap": "via",
+    "config": {
+        "features": {
+            "via": true
+        }
+    },
+    "layers": [
+        ["KC_A", "KC_B", "KC_C", "KC_D"]
+    ],
+    "layout": "LAYOUT"
+}
diff --git a/keyboards/handwired/technicpad/readme.md b/keyboards/handwired/technicpad/readme.md
new file mode 100644
index 00000000000..3ca28c984aa
--- /dev/null
+++ b/keyboards/handwired/technicpad/readme.md
@@ -0,0 +1,27 @@
+# TechnicPad
+
+![TechnicPad](https://i.imgur.com/LPD0KSL.jpg)
+
+A 4% (2x2) macropad, that is compatible to technic building blocks. 
+
+* Keyboard Maintainer: [Niclas Hirschfeld](https://github.com/nwhirschfeld)
+* Hardware Supported: Pro Micro boards
+* Hardware Availability: for now TechnicPad is handwired and uses an Arduino pro micro. [TechnicPad repository](https://github.com/nwhirschfeld/TechnicPad) 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/technicpad:default
+
+Flashing example for this keyboard:
+
+    make handwired/technicpad: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 upper left key and plug in the keyboard
+* **Physical reset**: Short the _RST_ and _GND_ pins of the PCB
+* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available
diff --git a/keyboards/handwired/technicpad/rules.mk b/keyboards/handwired/technicpad/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/technicpad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index a1cbfedc0cb..9d283866b4f 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -18,15 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// WS2812 RGB LED strip input and number of LEDs
-#define RGB_MATRIX_LED_COUNT 62
-#define RGB_MATRIX_SPLIT { 32, 30 }
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-// #define RGB_MATRIX_KEYRELEASES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 80
-
 #define SPLIT_TRANSPORT_MIRROR
 #define SPLIT_HAND_PIN A6
 
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index 9e172c8089a..321202383f6 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -7,7 +7,10 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "max_brightness": 80,
+        "sleep": true,
+        "split_count": [32, 30]
     },
     "matrix_pins": {
         "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
index 10986fd25ff..a0c3ee0f4e4 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
@@ -24,7 +24,7 @@ void matrix_scan_sub_kb(void) {
     }
 }
 
-__attribute__((weak)) void bootmagic_lite(void) {
+__attribute__((weak)) void bootmagic_scan(void) {
     // We need multiple scans because debouncing can't be turned off.
     matrix_scan();
 #if defined(DEBOUNCE) && DEBOUNCE > 0
@@ -34,13 +34,13 @@ __attribute__((weak)) void bootmagic_lite(void) {
 #endif
     matrix_scan();
 
-    uint8_t row = BOOTMAGIC_LITE_ROW;
-    uint8_t col = BOOTMAGIC_LITE_COLUMN;
+    uint8_t row = BOOTMAGIC_ROW;
+    uint8_t col = BOOTMAGIC_COLUMN;
 
-#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_LITE_ROW_RIGHT) && defined(BOOTMAGIC_LITE_COLUMN_RIGHT)
+#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_ROW_RIGHT) && defined(BOOTMAGIC_COLUMN_RIGHT)
     if (!is_keyboard_left()) {
-        row = BOOTMAGIC_LITE_ROW_RIGHT;
-        col = BOOTMAGIC_LITE_COLUMN_RIGHT;
+        row = BOOTMAGIC_ROW_RIGHT;
+        col = BOOTMAGIC_COLUMN_RIGHT;
     }
 #endif
 
diff --git a/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
deleted file mode 100644
index ce4066dca23..00000000000
--- a/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include QMK_KEYBOARD_H
-
-void keyboard_pre_init_user(void)
-{
-	// Set layer LED as an output
-    setPinOutput(B0);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state)
-{
-	// Switch layer LED accordingly
-    switch (get_highest_layer(state)) {
-    case 0:
-        writePinHigh(B0);
-        break;
-    case 1:
-        writePinLow(B0);
-        break;
-	}
-    return state;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_ortho_6x4(
-		KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-		KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-		KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-		KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-		KC_P0,   KC_UP,   KC_PDOT, TT(1),
-		KC_LEFT, KC_DOWN, KC_RGHT, BL_STEP
-	),
-	[1] = LAYOUT_ortho_6x4(
-		KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   KC_K,    KC_NO,   KC_NO,
-		KC_H,    KC_NO,   KC_L,    KC_NO,
-		KC_NO,   KC_J,    KC_NO,   KC_NO,
-		KC_LSFT, KC_Z,    KC_X,    KC_TRNS,
-		KC_NO,   KC_NO,   KC_NO,   KC_NO
-	)
-};
diff --git a/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json b/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json
deleted file mode 100644
index fca4d01591e..00000000000
--- a/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json
+++ /dev/null
@@ -1 +0,0 @@
-[["KC_NUM", "KC_PSLS", "KC_PAST", "KC_PMNS", "KC_P7", "KC_P8", "KC_P9", "KC_PPLS", "KC_P4", "KC_P5", "KC_P6", "KC_BSPC", "KC_P1", "KC_P2", "KC_P3", "KC_PENT", "KC_P0", "KC_UP", "KC_PDOT", "TT(1)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "BL_STEP"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_K", "KC_NO", "KC_NO", "KC_H", "KC_NO", "KC_L", "KC_NO", "KC_NO", "KC_J", "KC_NO", "KC_NO", "KC_LSFT", "KC_Z", "KC_X", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/handwired/tritium_numpad/keymaps/blu/readme.md b/keyboards/handwired/tritium_numpad/keymaps/blu/readme.md
deleted file mode 100644
index fd07b155fb7..00000000000
--- a/keyboards/handwired/tritium_numpad/keymaps/blu/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated Keymap Layout
-
-This layout was generated by the QMK API. You can find the JSON data used to
-generate this keymap in the file layers.json.
-
-To make use of this file you will need follow the following steps:
-
-* Download or Clone QMK Firmware: <https://github.com/qmk/qmk_firmware/>
-* Extract QMK Firmware to a location on your hard drive
-* Copy this folder into %s
-* You are now ready to compile or use your keymap with the source
-
-More information can be found in the QMK docs: <https://docs.qmk.fm>
\ No newline at end of file
diff --git a/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c
deleted file mode 100644
index 540cbe8c592..00000000000
--- a/keyboards/handwired/tritium_numpad/keymaps/max/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,-------------------.
-   * |Esc |Setp| -  | =  |
-   * |----|----|----|----|
-   * | F1 | F2 | F3 | F4 |
-   * |----|----|----|----|
-   * | 7  | 8  | 9  |  - |
-   * |----|----|----|----|
-   * | 4  | 5  | 6  | LF |
-   * |----|----|----|----|
-   * | 1  | 2  | 3  | \  |
-   * |----|----|----|----|
-   * |Left|Down| Up |Rght|
-   * `-------------------'
-   */
-
-  [_BL] = LAYOUT_ortho_6x4(
-    KC_ESC,  KC_TAB,  KC_MINS,KC_EQL,  
-    KC_F1,   KC_F2,   KC_F3,  KC_F4,   
-    KC_P7,   KC_P8,   KC_P9,  KC_PMNS,
-    KC_P4,   KC_P5,   KC_P6,  KC_PENT, 
-    KC_P1,   KC_P2,   KC_P3,  KC_BSLS, 
-    KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT
-  ),
-
-  /* Keymap _FL: Function Layer
-   * ,-------------------.
-   * |Esc |TAB |BS  | =  |
-   * |----|----|----|----|
-   * | NL | /  | *  | -  |
-   * |----|----|----|----|
-   * | 7  | 8  | 9  |    |
-   * |----|----|----|RST |
-   * | 4  | 5  | 6  |    |
-   * |----|----|----|----|
-   * | 1  | 2  | 3  |    |
-   * |----|----|----| En |
-   * |   0     |./FN|    |
-   * `-------------------'
-   */
-  [_FL] = LAYOUT_ortho_6x4(
-    KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL, 
-    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 
-    KC_P7,   KC_P8,   KC_P9,   QK_BOOT, 
-    KC_P4,   KC_P5,   KC_P6,   KC_PENT, 
-    KC_P1,   KC_P2,   KC_P3,   KC_PENT, 
-    KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-  ),
-};
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
deleted file mode 100644
index f4c4fda7cf6..00000000000
--- a/keyboards/handwired/uthol/rev2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * 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
-
-//RGB Stuff
-#define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json
index 89515a8fefb..9185e97c432 100644
--- a/keyboards/handwired/uthol/rev2/info.json
+++ b/keyboards/handwired/uthol/rev2/info.json
@@ -4,7 +4,10 @@
         "device_version": "0.0.2"
     },
     "rgblight": {
-        "led_count": 39
+        "led_count": 39,
+        "default": {
+            "hue": 201
+        }
     },
     "ws2812": {
         "pin": "E6"
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index a3a2eb1ca09..569a38c699d 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -32,5 +32,3 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define PERMISSIVE_HOLD
-
-#define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
index 79818d46704..dbbce9139dc 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/info.json
@@ -16,6 +16,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "hue": 201
         }
     },
     "tapping": {
diff --git a/keyboards/handwired/wwa/mercury/info.json b/keyboards/handwired/wwa/mercury/info.json
new file mode 100644
index 00000000000..bb89858da27
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/info.json
@@ -0,0 +1,40 @@
+{
+    "manufacturer": "spacehangover",
+    "keyboard_name": "Mercury",
+    "maintainer": "spacehangover",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP0", "GP1", "GP2", "GP3"],
+        "rows": ["GP4", "GP5"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0003",
+        "vid": "0x5757"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/mercury/keymaps/default/keymap.c b/keyboards/handwired/wwa/mercury/keymaps/default/keymap.c
new file mode 100644
index 00000000000..eb2187e59a3
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/keymaps/default/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_F17,   KC_F18,   KC_F19,   KC_F20
+    )
+};
diff --git a/keyboards/handwired/wwa/mercury/keymaps/via/keymap.c b/keyboards/handwired/wwa/mercury/keymaps/via/keymap.c
new file mode 100644
index 00000000000..eb2187e59a3
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/keymaps/via/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_F17,   KC_F18,   KC_F19,   KC_F20
+    )
+};
diff --git a/keyboards/macro1/keymaps/via/rules.mk b/keyboards/handwired/wwa/mercury/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/macro1/keymaps/via/rules.mk
rename to keyboards/handwired/wwa/mercury/keymaps/via/rules.mk
diff --git a/keyboards/handwired/wwa/mercury/readme.md b/keyboards/handwired/wwa/mercury/readme.md
new file mode 100644
index 00000000000..32d346dbe9d
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/readme.md
@@ -0,0 +1,27 @@
+# mercury
+
+![mercury](https://i.imgur.com/flE9SPwh.jpeg)
+
+8 Key VIA Compatible Macropad
+
+* Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
+* Hardware Supported: RP2040 Handwired
+* Hardware Availability: RP2040
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/wwa/mercury:default
+
+Flashing example for this keyboard:
+
+    make handwired/wwa/mercury: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/mercury/rules.mk b/keyboards/handwired/wwa/mercury/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/soyuz/info.json b/keyboards/handwired/wwa/soyuz/info.json
new file mode 100644
index 00000000000..9670f312a6a
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/info.json
@@ -0,0 +1,55 @@
+{
+    "manufacturer": "spacehangover",
+    "keyboard_name": "Soyuz",
+    "maintainer": "spacehangover",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6"],
+        "rows": ["GP7", "GP8", "GP9"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x5757"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c b/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c
new file mode 100644
index 00000000000..af0eb592dc7
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c
@@ -0,0 +1,13 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,     KC_F10,
+        KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,   KC_F16,    KC_F17,
+        KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,   KC_F23,    KC_F24 
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuz/keymaps/via/keymap.c b/keyboards/handwired/wwa/soyuz/keymaps/via/keymap.c
new file mode 100644
index 00000000000..41c76826a9b
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/keymaps/via/keymap.c
@@ -0,0 +1,12 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,     KC_F10,
+        KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,   KC_F16,    KC_F17,
+        KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,   KC_F23,    KC_F24 
+    )
+};
\ No newline at end of file
diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/rules.mk b/keyboards/handwired/wwa/soyuz/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechlovin/hex4b/keymaps/nazzer/rules.mk
rename to keyboards/handwired/wwa/soyuz/keymaps/via/rules.mk
diff --git a/keyboards/handwired/wwa/soyuz/readme.md b/keyboards/handwired/wwa/soyuz/readme.md
new file mode 100644
index 00000000000..69f8ef9d760
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/readme.md
@@ -0,0 +1,27 @@
+# soyuz
+
+![soyuz](https://i.imgur.com/KwwORGSh.jpeg)
+
+21 Key and 3 MIDI Potentiometers Macro Keyboard
+
+* Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
+* Hardware Supported: RP2040 Handwired
+* Hardware Availability: RP2040 Pico
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/wwa/soyuz:default
+
+Flashing example for this keyboard:
+
+    make handwired/wwa/soyuz: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 `QK_BOOT` if it is available
diff --git a/keyboards/kudox/rev1/rules.mk b/keyboards/handwired/wwa/soyuz/rules.mk
similarity index 100%
rename from keyboards/kudox/rev1/rules.mk
rename to keyboards/handwired/wwa/soyuz/rules.mk
diff --git a/keyboards/handwired/wwa/soyuzxl/info.json b/keyboards/handwired/wwa/soyuzxl/info.json
new file mode 100644
index 00000000000..9180344176c
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuzxl/info.json
@@ -0,0 +1,55 @@
+{
+    "manufacturer": "spacehangover",
+    "keyboard_name": "SoyuzXL",
+    "maintainer": "spacehangover",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"],
+        "rows": ["B5", "B2", "B3"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0005",
+        "vid": "0x5757"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuzxl/keymaps/default/keymap.c b/keyboards/handwired/wwa/soyuzxl/keymaps/default/keymap.c
new file mode 100644
index 00000000000..af0eb592dc7
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuzxl/keymaps/default/keymap.c
@@ -0,0 +1,13 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,     KC_F10,
+        KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,   KC_F16,    KC_F17,
+        KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,   KC_F23,    KC_F24 
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuzxl/keymaps/via/keymap.c b/keyboards/handwired/wwa/soyuzxl/keymaps/via/keymap.c
new file mode 100644
index 00000000000..af0eb592dc7
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuzxl/keymaps/via/keymap.c
@@ -0,0 +1,13 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,     KC_F10,
+        KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,   KC_F16,    KC_F17,
+        KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,   KC_F23,    KC_F24 
+    )
+};
\ No newline at end of file
diff --git a/keyboards/mino_plus/hotswap/keymaps/via/rules.mk b/keyboards/handwired/wwa/soyuzxl/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mino_plus/hotswap/keymaps/via/rules.mk
rename to keyboards/handwired/wwa/soyuzxl/keymaps/via/rules.mk
diff --git a/keyboards/handwired/wwa/soyuzxl/readme.md b/keyboards/handwired/wwa/soyuzxl/readme.md
new file mode 100644
index 00000000000..329acb36b6b
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuzxl/readme.md
@@ -0,0 +1,27 @@
+# soyuzxl
+
+![soyuzxl](https://i.imgur.com/njUq2s3h.jpeg)
+
+21 Keys, 4 Potentiometers and 1 Fader MIDI Macro Keyboard
+
+* Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
+* Hardware Supported: Arduino Pro Micro, B103K Slide Pot, 10k Pots Handwired
+* Hardware Availability: Arduino Pro Micro
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/wwa/soyuzxl:default
+
+Flashing example for this keyboard:
+
+    make handwired/wwa/soyuzxl: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 `QK_BOOT` if it is available
diff --git a/keyboards/kudox/rev2/rules.mk b/keyboards/handwired/wwa/soyuzxl/rules.mk
similarity index 100%
rename from keyboards/kudox/rev2/rules.mk
rename to keyboards/handwired/wwa/soyuzxl/rules.mk
diff --git a/keyboards/handwired/z150/keymaps/zyxx/keymap.c b/keyboards/handwired/z150/keymaps/zyxx/keymap.c
deleted file mode 100644
index 76ee90d9dc0..00000000000
--- a/keyboards/handwired/z150/keymaps/zyxx/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * 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
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * ,---------------------------------------------------------------------------------------------------------------------------.
- * |  F1 |  F2 | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |Backspace| ~`  |  ScrLk |  FN1   |
- * |---------------------------------------------------------------------------------------------------------------------------|
- * |  F3 |  F4 |  Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]   |      |Home |  ↑  |PgUp |PrnSc|
- * |---------------------------------------------------------------------------------------------      ------------------------|
- * |  F5 |  F6 |  Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;: |  '" |     Enter  |  ←  |  ↓  |  →  | wh+ |
- * |---------------------------------------------------------------------------------------------------------------------------|
- * |  F7 |  F8 |   Shift   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /? |  Shift  |  |\ |End  |     |PgDn | wh- |
- * |----------------------------------------------------------------------------------------------------------------------     |
- * |  F9 | F10 |  Alt   |FN1 |                        Space                            |  Alt    |    Ins    |   Del     |     |
- * `---------------------------------------------------------------------------------------------------------------------------'
-*/
-    [_BASE] = LAYOUT(
-    KC_F1,  KC_F2, 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_GRV,   KC_SCRL,       MO(_FN1),
-    KC_F3,  KC_F4, 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_UP,   KC_PGUP, KC_PSCR,
-    KC_F5,  KC_F6, 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_LEFT, KC_DOWN, KC_RGHT, KC_WH_U,
-    KC_F7,  KC_F8, 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_BSLS,   KC_END,  KC_NO,   KC_PGDN, KC_WH_D,
-    KC_F9,  KC_F10,KC_LALT,        MO(_FN1),                                KC_SPC,                                            KC_RALT,       KC_INS,            KC_DEL
-    ),
-/*
- * ,---------------------------------------------------------------------------------------------------------------------------.
- * |reset|     |    | F11 | F12 | au+ | au- | clk | clk+| clk-| clkr|     |     |     |     |  Delete  |NumLk|   /    |  FN1   |
- * |---------------------------------------------------------------------------------------------------------------------------|
- * |     |     |       |     | mlb | m↑  | mrb |     |     |     |     |     |     |     |      |      |  7  |  8  |  9  |  *  |
- * |---------------------------------------------------------------------------------------------      ------------------------|
- * |     |     |        |     | m←  | m↓  | m→  |     |     |     |     |     |     |     |            |  4  |  5  |  6  |  -  |
- * |---------------------------------------------------------------------------------------------------------------------------|
- * |     |     |           |     |     |     |     |     |     |     |     |     |     |         |     |  1  |  2  |  3  |  +  |
- * |----------------------------------------------------------------------------------------------------------------------     |
- * |     |     |        |FN1 |                                                         | CapsLock|   0 Ins   |    . Del  |     |
- * `---------------------------------------------------------------------------------------------------------------------------'
-*/
-    [_FN1] = LAYOUT(
-    QK_BOOT, _______, _______,  KC_F11,  KC_F12,  AU_ON,   AU_OFF,  CK_TOGG, CK_UP,   CK_DOWN, CK_RST,  _______, _______, _______, _______, KC_DEL,    KC_NUM,     KC_PSLS,       _______,
-    _______, _______, _______,  _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______,            KC_P7,   KC_P8,   KC_P9,   KC_PAST,
-    _______, _______, _______ , _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______,          _______,   KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
-    _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_P1,   KC_P2,   KC_P3,   KC_PPLS,
-    _______, _______, _______,         _______,                                 _______,                                           KC_CAPS,       KC_P0,            KC_PDOT
-    )
-};
diff --git a/keyboards/handwired/ziyoulang_k3_mod/config.h b/keyboards/handwired/ziyoulang_k3_mod/config.h
new file mode 100644
index 00000000000..304ca5eb282
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Coom (@coomstoolbox)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define I2C1_SCL_PIN B10
+#define I2C1_SDA_PIN B11
+#define I2C_DRIVER I2CD2
diff --git a/keyboards/handwired/ziyoulang_k3_mod/halconf.h b/keyboards/handwired/ziyoulang_k3_mod/halconf.h
new file mode 100644
index 00000000000..44602147bbc
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/ziyoulang_k3_mod/info.json b/keyboards/handwired/ziyoulang_k3_mod/info.json
index 127cc51299c..5d4ca7a254c 100644
--- a/keyboards/handwired/ziyoulang_k3_mod/info.json
+++ b/keyboards/handwired/ziyoulang_k3_mod/info.json
@@ -2,7 +2,7 @@
     "keyboard_name": "ziyoulang k3 mod",
     "development_board": "bluepill",
     "usb": {
-        "device_version": "1.0.0",
+        "device_version": "1.2.0",
         "pid": "0xE002",
         "vid": "0x5006"
     },
@@ -11,10 +11,14 @@
         "command": false,
         "console": false,
         "extrakey": true,
-        "mousekey": true,
-        "nkro": false
+        "mousekey": false,
+        "nkro": false,
+        "oled": true
     },
-    "diode_direction": "COL2ROW",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "ROW2COL",
     "dynamic_keymap": {
         "layer_count": 3
     },
@@ -78,7 +82,7 @@
                 {"label":"P", "x":10.5, "y":2.25, "matrix": [2, 10]},
                 {"label":"{", "x":11.5, "y":2.25, "matrix": [2, 11]},
                 {"label":"}", "x":12.5, "y":2.25, "matrix": [2, 12]},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+                {"label":"|", "x":13.5, "y":2.25, "w":1.5, "matrix": [3, 13]},
                 {"label":"7", "x":15.5, "y":2.25, "matrix": [2, 17]},
                 {"label":"8", "x":16.5, "y":2.25, "matrix": [2, 18]},
                 {"label":"9", "x":17.5, "y":2.25, "matrix": [2, 19]},
@@ -96,7 +100,7 @@
                 {"label":"L", "x":9.75, "y":3.25, "matrix": [3, 10]},
                 {"label":":", "x":10.75, "y":3.25, "matrix": [3, 11]},
                 {"label":"\"", "x":11.75, "y":3.25, "matrix": [3, 12]},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25, "matrix": [3, 13]},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25, "matrix": [2, 13]},
                 {"label":"4", "x":15.5, "y":3.25, "matrix": [3, 17]},
                 {"label":"5", "x":16.5, "y":3.25, "matrix": [3, 18]},
                 {"label":"6", "x":17.5, "y":3.25, "matrix": [3, 19]},
@@ -139,4 +143,4 @@
     "manufacturer": "Coom",
     "maintainer": "coomstoolbox",
     "url": ""
-}
\ No newline at end of file
+}
diff --git a/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk b/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk
index ea877d67869..1e5b99807cb 100644
--- a/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk
+++ b/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/ziyoulang_k3_mod/mcuconf.h b/keyboards/handwired/ziyoulang_k3_mod/mcuconf.h
new file mode 100644
index 00000000000..8f1da10fe2b
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 QMK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C2
+#define STM32_I2C_USE_I2C2 TRUE
diff --git a/keyboards/handwired/ziyoulang_k3_mod/readme.md b/keyboards/handwired/ziyoulang_k3_mod/readme.md
index 7e247fde198..553f735d4c6 100644
--- a/keyboards/handwired/ziyoulang_k3_mod/readme.md
+++ b/keyboards/handwired/ziyoulang_k3_mod/readme.md
@@ -23,7 +23,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 [KiCAD wiring diagram](https://github.com/coomstoolbox/ZK3-BP-MOD-wiring-diagram)
 
-![explanation](https://i.imgur.com/yvhvhoBh.png)
+![explanation](https://i.imgur.com/thGIdOth.png)
 
 ## Bootloader
 
diff --git a/keyboards/handwired/ziyoulang_k3_mod/ziyoulang_k3_mod.c b/keyboards/handwired/ziyoulang_k3_mod/ziyoulang_k3_mod.c
new file mode 100644
index 00000000000..cadae4aa286
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/ziyoulang_k3_mod.c
@@ -0,0 +1,117 @@
+// Copyright 2023 Coom (@coomstoolbox)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+#include <stdio.h>
+
+void keyboard_post_init_kb(void) {
+#ifdef CONSOLE_ENABLE
+    debug_enable=true;
+    debug_matrix=true;
+#endif
+    keyboard_post_init_user();
+}
+
+static uint16_t last_keycode = KC_NO;
+static keypos_t last_key = {0, 0};
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+   // コンソールが有効化されている場合、マトリックス上の位置とキー押下状態を出力します
+#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
+    if (record->event.pressed) {
+        if (last_keycode != keycode) {
+            last_keycode = keycode;
+            last_key = record->event.key;
+        }
+    }
+    return true;
+}
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+static void render_logo(void) {
+    static const char PROGMEM qmk_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+    };
+    oled_write_P(qmk_logo, false);
+#ifdef CONSOLE_ENABLE
+    uprintf("Ziyoulang K3 Mod\n");
+    oled_set_cursor(3, 0);
+    oled_write_P(PSTR("Ziyoulang K3 Mod"), false);
+#endif
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    int uptime_seconds = (int)(timer_read32() / 1000);
+    if (uptime_seconds < 5) {
+        render_logo();
+        return false;
+    }
+
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state | default_layer_state)) {
+        case 0:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("2\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("3\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    if (led_state.num_lock) {
+        oled_write_P(PSTR("NUM"), true);
+        oled_write_P(PSTR(" "), false);
+    } else {
+        oled_write_P(PSTR("    "), false);
+    }
+    if (led_state.caps_lock) {
+        oled_write_P(PSTR("CAP"), true);
+        oled_write_P(PSTR(" "), false);
+    } else {
+        oled_write_P(PSTR("    "), false);
+    }
+    if (led_state.scroll_lock) {
+        oled_write_P(PSTR("SCR"), true);
+        oled_write_ln_P(PSTR(" "), false);
+    } else {
+        oled_write_ln_P(PSTR("    "), false);
+    }
+
+    // Last Key pressed info
+    oled_write_P(PSTR("kc : "), false);
+    if (last_keycode > 21000) {
+      oled_write_ln_P(PSTR("    Fn"), false);
+    } else {
+      oled_write_ln_P(get_u16_str(last_keycode, ' '), false);
+    }
+    oled_write_P(PSTR("col: "), false);
+    oled_write_P(get_u8_str(last_key.col, ' '), false);
+    oled_write_P(PSTR(",row: "), false);
+    oled_write_P(get_u8_str(last_key.row, ' '), false);
+
+    return false;
+}
+#endif
diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h b/keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h
deleted file mode 100644
index 035419eee68..00000000000
--- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2023 Jason Hazel (@jasonhazel)
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM_PER_KEY
-#define ONESHOT_TAP_TOGGLE 10
-#define ONESHOT_TIMEOUT 500
-#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
-#define CIRQUE_PINNACLE_TAP_ENABLE
-#define CIRQUE_PINNACLE_POSITION_MODE  CIRQUE_PINNACLE_ABSOLUTE_MODE
-
-#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE
\ No newline at end of file
diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c b/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c
deleted file mode 100644
index 0c3d9c70afa..00000000000
--- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2023 Jason Hazel (@jasonhazel)
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _ALPHA,
-  _SYMBOL,
-  _NUMBER,
-  _NAVIGATION,
-  LAYER_LENGTH
-};
-
-
-enum tapdances {
-  TD_QESC,
-  TD_SBKT,
-  TD_CBKT,
-  TD_PARN,
-  TD_LTGT,
-  TD_ATAB,
-  TAPDANCE_LENGTH
-};
-
-enum combos {
-  COMBO_NAVIGATION,
-  COMBO_LENGTH
-};
-
-
-// begin tapdances
-#define KC_QESC     TD(TD_QESC)
-#define KC_SBKT     TD(TD_SBKT)
-#define KC_CBKT     TD(TD_CBKT)
-#define KC_PARN     TD(TD_PARN)
-#define KC_LTGT     TD(TD_LTGT)
-#define KC_ATAB     TD(TD_ATAB)
-
-#define KC_GUIX     LGUI_T(KC_X)
-#define KC_ALTC     LALT_T(KC_C)
-
-// oneshots
-#define KC_OSFT   OSM(MOD_LSFT)
-#define KC_OALT   OSM(MOD_LALT)
-
-// layer changing
-#define KC_OSYM   OSL(_SYMBOL)
-#define KC_ONUM   LT(_NUMBER, KC_BSPC)
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch(keycode) {
-        case KC_GUIX:
-        case KC_ALTC:
-            return TAPPING_TERM * 2;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-// tapdances
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_QESC]   = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC),
-    [TD_SBKT]   = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
-    [TD_CBKT]   = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
-    [TD_PARN]   = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN),
-    [TD_LTGT]   = ACTION_TAP_DANCE_DOUBLE(KC_LABK, KC_RABK),
-    [TD_ATAB]   = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB)
-};
-// end tapdances
-
-uint16_t COMBO_LEN = COMBO_LENGTH;
-
-const uint16_t PROGMEM combo_navigation[] = { KC_OSYM, KC_ONUM, COMBO_END };
-combo_t key_combos[] = {
-  [COMBO_NAVIGATION]        = COMBO(combo_navigation, OSL(_NAVIGATION)),
-};
-
-uint16_t get_combo_term(uint16_t index, combo_t *combo) {
-  switch(index) {
-    case COMBO_NAVIGATION: // extending the combo term here helps reduce sticky layers some more.
-      return 250;
-    default:
-      return COMBO_TERM;
-  }
-}
-// end combos
-
-
-// begin layers
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_ALPHA] = LAYOUT_split_3x5_3(
-    KC_QESC,    KC_W,       KC_E,       KC_R,       KC_T,             KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,
-    KC_A,       KC_S,       KC_D,       KC_F,       KC_G,             KC_H,       KC_J,       KC_K,       KC_L,       KC_QUOT,
-    KC_Z,       KC_GUIX,    KC_ALTC,    KC_V,       KC_B,             KC_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,
-                            KC_LCTL,    KC_OSYM,    KC_OSFT,          KC_SPC,     KC_ONUM,    KC_ENT
-  ),
-  [_SYMBOL] = LAYOUT_split_3x5_3(
-    KC_EXLM,    KC_AT,      KC_HASH,    KC_DLR,     KC_PERC,          KC_CIRC,     KC_AMPR,   KC_ASTR,    KC_PIPE,    KC_NO,
-    KC_GRV,     KC_TILD,      KC_UNDS,    KC_EQL,     KC_NO,          KC_SBKT,     KC_CBKT,   KC_PARN,    KC_LTGT,  KC_BACKSLASH,
-    KC_NO,      KC_NO,      KC_PLUS,    KC_MINS,    KC_NO,            KC_NO,       KC_NO,     KC_COLN,    KC_DOT,     KC_SCLN,
-                             KC_LCTL,    KC_OSYM,    KC_OSFT,          KC_SPC,     KC_ONUM,    KC_ENT
-  ),
-  [_NUMBER] = LAYOUT_split_3x5_3(
-    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,            KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-    KC_1,       KC_2,       KC_3,       KC_4,       KC_5,             KC_6,       KC_7,       KC_8,       KC_9,       KC_0,
-    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,            KC_NO,      KC_NO,      KC_NO,      KC_DOT,     KC_NO,
-                            KC_LCTL,    KC_OSYM,    KC_OSFT,          KC_SPC,     KC_ONUM,    KC_ENT
-  ),
-  [_NAVIGATION] = LAYOUT_split_3x5_3(
-    KC_NO,      KC_F2,      KC_NO,      KC_NO,      KC_NO,          KC_NO,      KC_HOME,    KC_UP,      KC_END,     KC_BSPC,
-    KC_TAB,     KC_NO,      KC_NO,      KC_NO,      KC_NO,          KC_NO,      KC_LEFT,    KC_DOWN,    KC_RIGHT,   KC_ENT,
-    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,          KC_NO,      KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_DEL,
-                            KC_LCTL,    KC_OSYM,    KC_OSFT,        KC_SPC,     KC_ONUM,    KC_ENT 
-  )
-};
-
-
-
diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk b/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk
deleted file mode 100644
index 26d76a0df6e..00000000000
--- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE			= yes
-EXTRAKEY_ENABLE			= yes
-COMBO_ENABLE				= yes
-TAP_DANCE_ENABLE		= yes
\ No newline at end of file
diff --git a/keyboards/heliotrope/config.h b/keyboards/heliotrope/config.h
deleted file mode 100644
index 15d1d772765..00000000000
--- a/keyboards/heliotrope/config.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2022 MATTMCCA (@MATTMCCA)
- *
- * 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 RGB_MATRIX_ENABLE
-
-    #define RGB_MATRIX_LED_COUNT 61                     // The number of LEDs connected
-    
-    #define RGB_MATRIX_KEYPRESSES                       // reacts to keypresses
-    #define RGB_MATRIX_KEYRELEASES                      // reacts to keyreleases (instead of keypresses)
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS              // enable framebuffer effects
-
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
-
-    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS) */
-    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-    /* RGB_MATRIX_KEYPRESSES) | defined(RGB_MATRIX_KEYRELEASES) */
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-    
-#endif
-
diff --git a/keyboards/heliotrope/info.json b/keyboards/heliotrope/info.json
index 3b382c7bc91..e173c785e08 100644
--- a/keyboards/heliotrope/info.json
+++ b/keyboards/heliotrope/info.json
@@ -28,6 +28,48 @@
         "pin": "A4"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 7, "y": 5},
@@ -91,7 +133,8 @@
             {"flags": 4, "matrix": [4, 10], "x": 177, "y": 54},
             {"flags": 4, "matrix": [4, 11], "x": 196, "y": 54},
             {"flags": 4, "matrix": [4, 13], "x": 215, "y": 54}
-        ]
+        ],
+        "react_on_keyup": true
     },
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index f5eb4c13e10..e1cd9c2e909 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -50,20 +50,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Helix keyboard RGB LED support
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
 #ifdef RGBLED_BACK
-  #define RGBLED_NUM 25
+  #define RGBLIGHT_LED_COUNT 25
 #else
-  #define RGBLED_NUM 6
+  #define RGBLIGHT_LED_COUNT 6
 #endif
 
 #ifndef IOS_DEVICE_ENABLE
-  #if RGBLED_NUM <= 6
+  #if RGBLIGHT_LED_COUNT <= 6
     #define RGBLIGHT_LIMIT_VAL 255
   #else
     #define RGBLIGHT_LIMIT_VAL 130
   #endif
   #define RGBLIGHT_VAL_STEP 17
 #else
-  #if RGBLED_NUM <= 6
+  #if RGBLIGHT_LED_COUNT <= 6
     #define RGBLIGHT_LIMIT_VAL 90
   #else
     #define RGBLIGHT_LIMIT_VAL 45
diff --git a/keyboards/helix/pico/keymaps/biacco/config.h b/keyboards/helix/pico/keymaps/biacco/config.h
deleted file mode 100644
index 7653185198b..00000000000
--- a/keyboards/helix/pico/keymaps/biacco/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-// place overrides here
-
-#ifdef AUDIO_ENABLE
-  #define STARTUP_SONG SONG(STARTUP_SOUND)
-  #define AUDIO_CLICKY
-#endif
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_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
-#endif
diff --git a/keyboards/helix/pico/keymaps/biacco/keymap.c b/keyboards/helix/pico/keymaps/biacco/keymap.c
deleted file mode 100644
index 39e1d948c2f..00000000000
--- a/keyboards/helix/pico/keymaps/biacco/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright 2018 Biacco42
- *
- * 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 {
-    BASE = 0,
-    META,
-    SYMB,
-    GAME
-};
-
-//Macros
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
-   * | Ctrl | GUI  | App  | PrtSc| ESC/ |Space/|Tab/  |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      | ~SYMB|RCtrl |Shift |Space |~META |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-
-[BASE] = 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_LALT, 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,    SFT_T(KC_INT1) ,
-      KC_LCTL, KC_LGUI, KC_APP,  KC_PSCR, LT(SYMB, KC_ESC), RCTL_T(KC_SPC), SFT_T(KC_TAB),  KC_BSPC,  LT(META, KC_ENT), KC_DEL,  KC_PSCR, TG(GAME), TG(SYMB),   KC_INT3
-      ),
-
-  /* META
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   1  |   2  |   3  |   4  |   5  |   6  |             |   7  |   8  |   9  |   0  |   -  |  ^   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Alt  |  F1  |      |Muhen | Henk |      |             | Left | Down |  Up  |Right |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Sft  |  F2  |  F3  |  F4  |  F5  |  F6  |             |  F7  |  F8  |  F9  | F10  | F11  |\/Sft |
-   * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |Back  |Enter/| Del  |Reset |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |Space |~META |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [META] = LAYOUT(
-    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_F1,   XXXXXXX, KC_INT5, KC_INT4, XXXXXXX,                   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX,
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9, KC_F10,  KC_F11,  SFT_T(KC_INT1),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______
-  ),
-
-  /* SYMB
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   !  |   "  |   #  |   $  |   %  |   &  |             |   '  |   (  |   )  |   ~  |   =  |  ~   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Alt  |      |      |      |      |      |             |   (  |   )  |   {  |   }  |   +  |  *   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Sft  |      |      |      |      |      |             |   [  |   ]  |   <  |   >  |   ?  |  \   |
-   * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc |ESC/  |Space/|Tab/  |Back  |Enter/| Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |~SYMB |RCtrl |Shift |Space |~META |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [SYMB] = LAYOUT(
-    S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6),                   S(KC_7), S(KC_8), S(KC_9),    S(KC_0),    S(KC_MINS), S(KC_EQL),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   S(KC_8), S(KC_9), S(KC_RBRC), S(KC_BSLS), S(KC_SCLN), S(KC_QUOT),
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_RBRC, KC_BSLS, S(KC_COMM), S(KC_DOT),  S(KC_SLSH), S(KC_INT1),
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______,    _______
-  ),
-
-  /* GAME
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |  @   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Alt  |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  :   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Sft  |   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |\/Sft |
-   * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
-   * | Ctrl | GUI  |  App |PrtSc | ESC  |Space |Tab   |Back  |Enter | Del  |PrtSc |=>GAME|=>SYMB|  \   |
-   * |      |      |      |      |      |      |      |Space |      |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [GAME] = 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_LALT,  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, SFT_T(KC_INT1),
-    KC_LCTL,  KC_LGUI, KC_APP, KC_PSCR, KC_ESC, KC_SPC, KC_TAB,     KC_BSPC,    KC_ENT, KC_DEL,  KC_PSCR,  _______, _______, KC_INT3
-  )
-
-};
diff --git a/keyboards/helix/pico/keymaps/biacco/rules.mk b/keyboards/helix/pico/keymaps/biacco/rules.mk
deleted file mode 100644
index d9713594610..00000000000
--- a/keyboards/helix/pico/keymaps/biacco/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# QMK Standard Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-#   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
-#   See TOP/docs/config_options.md for more information.
-#
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-AUDIO_ENABLE = yes           # Audio output on port B5
-LTO_ENABLE = no  # if firmware size over limit, try this option
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 4 Variables
-#  jp: 以下の4つの変数を必要に応じて編集し、コメントアウトをはずします。
-# LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = no           # LED animations
-# IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 7ab494522a8..8af2a44ecc7 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -31,20 +31,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Helix keyboard RGB LED support
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
 #ifdef RGBLED_BACK
-  #define RGBLED_NUM 32
+  #define RGBLIGHT_LED_COUNT 32
 #else
-  #define RGBLED_NUM 6
+  #define RGBLIGHT_LED_COUNT 6
 #endif
 
 #ifndef IOS_DEVICE_ENABLE
-  #if RGBLED_NUM <= 6
+  #if RGBLIGHT_LED_COUNT <= 6
     #define RGBLIGHT_LIMIT_VAL 255
   #else
     #define RGBLIGHT_LIMIT_VAL 120
   #endif
   #define RGBLIGHT_VAL_STEP 17
 #else
-  #if RGBLED_NUM <= 6
+  #if RGBLIGHT_LED_COUNT <= 6
     #define RGBLIGHT_LIMIT_VAL 90
   #else
     #define RGBLIGHT_LIMIT_VAL 35
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/config.h b/keyboards/helix/rev2/keymaps/fraanrosi/config.h
deleted file mode 100644
index 6c816d0accd..00000000000
--- a/keyboards/helix/rev2/keymaps/fraanrosi/config.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2021 Franco Rosi <fraanrosi@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
-
-// place overrides here
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-#ifndef LED_ANIMATIONS
-#    define LED_ANIMATIONS
-#endif
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_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 RGBLIGHT_EFFECT_TWINKLE
-#endif
-
-#undef RGBLIGHT_HUE_STEP
-#define RGBLIGHT_HUE_STEP 4
-
-#ifdef MOUSEKEY_ENABLE
-   #undef MOUSEKEY_INTERVAL
-   #define MOUSEKEY_INTERVAL 20
-
-   #undef MOUSEKEY_TIME_TO_MAX
-   #define MOUSEKEY_TIME_TO_MAX 40
-
-   #undef MOUSEKEY_MAX_SPEED
-   #define MOUSEKEY_MAX_SPEED 6
-
-   #undef MOUSEKEY_MOVE_DELTA
-   #define MOUSEKEY_MOVE_DELTA 5
-
-   #undef MOUSEKEY_DELAY
-   #define MOUSEKEY_DELAY 0
-#endif
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c b/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
deleted file mode 100644
index 1bd43ab24a0..00000000000
--- a/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2021 Franco Rosi <fraanrosi@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
-
-// Following line allows macro to read current RGB settings
-#ifdef RGBLIGHT_ENABLE
-uint8_t                  RGB_current_mode;
-HSV                      CURRENT_COLOR;
-bool                     caps_is_active = false;
-/*Here I set the first rgb mode*/
-void keyboard_post_init_user(void) {
-    rgblight_enable();  // Enables RGB, without saving settings
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 3);
-    RGB_current_mode = rgblight_get_mode();
-    rgblight_sethsv(HSV_RED);
-    CURRENT_COLOR = rgblight_get_hsv();
-}
-#endif
-
-extern uint8_t is_master;
-
-// 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
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    RGBRST,
-    RGB_1,
-    RGB_2,
-    RGB_3,
-    RGB_4,
-    RGB_5,
-    RGB_6,
-    RGB_7,
-    RGB_8,
-    RGB_9
-};
-
-#define LOWER MO(1)
-#define RAISE MO(2)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   |  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | CAPS |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   Ñ  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Shift |   Z  |   X  |   C  |   V  |   B  |   {  |   }  |   N  |   M  |   ,  |   .  |   -  |Shift |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl | Esc  | Win  | Alt  |Raise |Lower |Space |Space |Alt Gr| Left |  Up  | Down |Right | Ctrl |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-    [_QWERTY] = LAYOUT(
-        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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_QUOT,  KC_NUHS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-        KC_LCTL, KC_ESC,  KC_LGUI, KC_LALT, MO(2),   MO(1),  KC_SPC,   KC_SPC,  KC_RALT, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_RCTL
-        ),
-
-    /*Lower
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |             |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      | Mute | Play |Mouse1|Mouse2|      |             |Print |      |Insert|' ? \ | ¿  ¡ |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |Shine+|Shine-| Vol -| Vol +|      |             |      |Mouse↑|      | ´  ¨ |+ * ~ |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | <  > |      |      |      |      |      |      |Mouse←|Mouse↓|Mouse→|      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      | Home |PageUp|PageDn| End  |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-    [_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_TRNS, KC_MUTE, KC_MPLY, KC_BTN1, KC_BTN2, KC_TRNS,                   KC_PSCR, KC_TRNS, KC_INS,  KC_MINS, KC_EQL,  KC_TRNS,
-        KC_NO,   KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_TRNS,                   KC_TRNS, KC_MS_U, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS,
-        KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,  KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,  KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_TRNS
-        ),
-
-    /* Raise
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | RGB1 | RGB2 | RGB3 | RGB4 |RGB ON|      |             |      | MODE+| MODE-|      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | RGB5 | RGB6 | RGB7 | RGB8 | RGB9 |      |             |      | HUE+ | HUE- |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | MODE+| MODE-| HUE+ | HUE- |      | Reset|      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-    [_RAISE] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        RGB_1,   RGB_2,   RGB_3,   RGB_4,   RGB_TOG, KC_NO,                     KC_NO,   RGB_MOD, RGB_RMOD,KC_NO,   KC_NO,   KC_NO,
-        RGB_5,   RGB_6,   RGB_7,   RGB_8,   RGB_9,   KC_NO,                     KC_NO,   RGB_HUI, RGB_HUD, KC_NO,   KC_NO,   KC_NO,
-        KC_NO,   RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, KC_NO,  QK_BOOT,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_NO,  KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
-        )
-};
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LOWER:
-            if (record->event.pressed) {
-                // not sure how to have keyboard check mode and set it to a variable, so my work around
-                // uses another variable that would be set to true after the first time a reactive key is pressed.
-                if (TOG_STATUS) {  // TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-                } else {
-                    TOG_STATUS = !TOG_STATUS;
-                    #ifdef RGBLIGHT_ENABLE
-                        if (!caps_is_active) {
-                            RGB_current_mode = rgblight_get_mode();
-                            CURRENT_COLOR    = rgblight_get_hsv();
-                        }
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        rgblight_sethsv(HSV_BLUE);
-                    #endif
-                }
-                layer_on(_LOWER);
-            } else {
-                #ifdef RGBLIGHT_ENABLE
-                    if (!caps_is_active) {
-                        rgblight_mode(RGB_current_mode);
-                        rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                    } else {
-                        rgblight_mode(RGBLIGHT_MODE_ALTERNATING);
-                        rgblight_sethsv(HSV_WHITE);
-                    }
-                #endif
-                TOG_STATUS = false;
-                layer_off(_LOWER);
-            }
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                // not sure how to have keyboard check mode and set it to a variable, so my work around
-                // uses another variable that would be set to true after the first time a reactive key is pressed.
-                if (TOG_STATUS) {  // TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-                } else {
-                    TOG_STATUS = !TOG_STATUS;
-                    #ifdef RGBLIGHT_ENABLE
-                        if (!caps_is_active) {
-                            RGB_current_mode = rgblight_get_mode();
-                            CURRENT_COLOR    = rgblight_get_hsv();
-                        }
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        rgblight_sethsv(HSV_RED);
-                    #endif
-                }
-                layer_on(_RAISE);
-            } else {
-                #ifdef RGBLIGHT_ENABLE
-                    if (!caps_is_active) {
-                        rgblight_mode(RGB_current_mode);
-                        rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                    } else {
-                        rgblight_mode(RGBLIGHT_MODE_ALTERNATING);
-                        rgblight_sethsv(HSV_WHITE);
-                    }
-                #endif
-                layer_off(_RAISE);
-                TOG_STATUS = false;
-            }
-            return false;
-            break;
-            //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-        case RGB_1 ... RGB_9:
-            if (record->event.pressed) {
-                rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                //this to have each custom mode separately, but sharing logic
-                switch(keycode){
-                    case RGB_1:
-                        rgblight_mode(RGBLIGHT_MODE_RAINBOW_MOOD + 1);
-                        break;
-                    case RGB_2:
-                        rgblight_mode(RGBLIGHT_MODE_KNIGHT);
-                        break;
-                    case RGB_3:
-                        rgblight_mode(RGBLIGHT_MODE_SNAKE);
-                        break;
-                    case RGB_4:
-                        rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 3);
-                        break;
-                    case RGB_5:
-                        rgblight_mode(RGBLIGHT_MODE_TWINKLE + 5);
-                        break;
-                    case RGB_6:
-                        rgblight_mode(RGBLIGHT_MODE_BREATHING + 3);
-                        break;
-                    case RGB_7:
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        break;
-                    case RGB_8:
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 5);
-                        break;
-                    case RGB_9:
-                        rgblight_mode(RGBLIGHT_MODE_CHRISTMAS);
-                        break;
-                }
-                RGB_current_mode = rgblight_get_mode();
-                CURRENT_COLOR = rgblight_get_hsv();
-            }
-            return false;
-            break;
-        case RGB_TOG ... RGB_HUD:
-            if (record->event.pressed) {
-                rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                rgblight_mode(RGB_current_mode);
-                process_rgb(keycode, record);
-                RGB_current_mode = rgblight_get_mode();
-                CURRENT_COLOR = rgblight_get_hsv();
-            }
-            return false;
-            break;
-        case KC_CAPS:
-            if (record->event.pressed) {
-                register_code(KC_CAPS);
-                caps_is_active = !caps_is_active;
-                if (caps_is_active) {
-                    CURRENT_COLOR    = rgblight_get_hsv();
-                    rgblight_mode(RGBLIGHT_MODE_ALTERNATING);
-                    rgblight_sethsv(HSV_WHITE);
-                } else if (!caps_is_active) {
-                    unregister_code(KC_CAPS);
-                    rgblight_mode(RGB_current_mode);
-                    rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                }
-            }
-            return false;
-            break;
-        case RGBRST:
-            #ifdef RGBLIGHT_ENABLE
-                if (record->event.pressed) {
-                    eeconfig_update_rgblight_default();
-                    rgblight_enable();
-                    RGB_current_mode = rgblight_get_mode();
-                }
-            #endif
-            break;
-    }
-    return true;
-}
-
-void matrix_init_user(void) {
-#ifdef RGBLIGHT_ENABLE
-    RGB_current_mode = rgblight_get_mode();
-    CURRENT_COLOR    = rgblight_get_hsv();
-#endif
-}
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/readme.md b/keyboards/helix/rev2/keymaps/fraanrosi/readme.md
deleted file mode 100644
index 71f71bbb99f..00000000000
--- a/keyboards/helix/rev2/keymaps/fraanrosi/readme.md
+++ /dev/null
@@ -1,40 +0,0 @@
- <!---Copyright 2021 Franco Rosi <fraanrosi@gmail.com> -->
-## Fraanrosi
-A **Latin American Spanish** keymap for Helix/rev2/under, 5 rows.   
-Designed to be as simple and more touch typing oriented as possible.    
-It was inspired by a DELL Latitude E5470.
-
-## Layers
-
-The Helix obviously does not have enough keys compared to a typical keyboard.  
-The keymap has multiple layers, moving extra keys to different layers.
-
-|Priority|Layer ID|Layer Name|Contents|
-| ---- | ---- | --- | --- |
-||0|Qwerty|Qwerty layout (Base)|
-||1|Lower|Symbols, media, function keys and mouse.(Blue)|
-||2|Raise|Underglow RGB config(Red)|
-
-Keymap : http://www.keyboard-layout-editor.com/#/gists/4cd7b4ccda1de5cf9edc56d29b64da30
-### First layer (qwerty).
-
-It contains the "**Ñ**" letter.         
-"Caps Lock" key toggle an RGB mode, to alert.           
-@ is typed with AltGr+q 
-![first-layer](https://i.imgur.com/BaVDVdB.png)
-### Second layer (Lower).
-
-While "Lower" key is pressed, the RBG mode remains BLUE.           
-It has the "Symbols, media, function keys and mouse" features.              
-It completes the rest of the needed qwerty and F keys.              
-![second-layer](https://i.imgur.com/HbDVTfp.png)
-### Third layer (Raise).
-
-While "Raise" key is pressed, the RBG mode remains RED.             
-This is the underglow RGB's layer , where can be controlled the modes and hue.                  
-With reset button for the micros.
-![third-layer](https://i.imgur.com/MF8jjbu.png)
-### All the layers.
- ![all-the-layers](https://i.imgur.com/jn1VI4V.png)
- 
- <!---![Keyboard](https://i.imgur.com/Onwmsss.png) -->
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
deleted file mode 100644
index 688813ce399..00000000000
--- a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# QMK Standard Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-#   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
-#   See TOP/docs/config_options.md for more information.
-#
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes         # if firmware size over limit, try this option
-MOUSEKEY_ENABLE = yes    # Mouse keys
-EXTRAKEY_ENABLE = yes    # Audio control and System control
-# AUDIO_ENABLE = yes       # Audio output on port C6
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-#  jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = no            # OLED_ENABLE
-# LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-# LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes        # LED animations
-# IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-LED_BACK_ENABLE = no
-LED_UNDERGLOW_ENABLE = yes
diff --git a/keyboards/helix/rev2/keymaps/froggy/config.h b/keyboards/helix/rev2/keymaps/froggy/config.h
deleted file mode 100644
index fea362bcd61..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-#define ONESHOT_TAP_TOGGLE 5 /* Tapping this number of times holds the key until tapped this number of times again. */
-#define ONESHOT_TIMEOUT 5000 /* Time (in ms) before the one shot key is released */
-
-// the froggy keymap does not use the right hand side, so sync_timer is not needed
-#define DISABLE_SYNC_TIMER
-// For the same reason, the following are also not needed
-#undef SPLIT_LAYER_STATE_ENABLE
-#undef SPLIT_LED_STATE_ENABLE
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_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
-#endif
-
-#endif /* CONFIG_USER_H */
diff --git a/keyboards/helix/rev2/keymaps/froggy/helixfont.h b/keyboards/helix/rev2/keymaps/froggy/helixfont.h
deleted file mode 100644
index 5360eace95b..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/helixfont.h
+++ /dev/null
@@ -1,235 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#pragma once
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-
-static const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, 
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, 
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, 
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 
-0xFC, 0xFE, 0x02, 0x82, 0x82, 0x82, 
-0x82, 0x82, 0x82, 0xC2, 0x82, 0x02, 
-0x02, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0x02, 0x62, 0x62, 0x62, 0x62, 0xE2, 
-0x62, 0x62, 0xE2, 0x02, 0x02, 0xFC, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 
-0x30, 0x40, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x00, 0x00, 0x24, 0xA4, 
-0xA4, 0xBC, 0xA4, 0x24, 0x24, 0x00, 
-0x00, 0x00, 0x24, 0xA4, 0x24, 0x24, 
-0x3C, 0x04, 0x04, 0x00, 0x00, 0x00, 
-0xB8, 0xA4, 0xA4, 0xA4, 0xBC, 0x00, 
-0x00, 0x00, 0x00, 0xFC, 0x00, 0xFC, 
-0x00, 0x44, 0x44, 0x44, 0xDC, 0x44, 
-0x04, 0x3C, 0x00, 0x00, 0x00, 0x00, 
-0xFC, 0xFE, 0xFE, 0x7E, 0x7E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x3E, 0x7E, 0xFE, 
-0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0xFE, 0x9E, 0x9E, 0x9E, 0x9E, 0x1E, 
-0x9E, 0x9E, 0x1E, 0xFE, 0xFE, 0xFC, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 
-0x7F, 0x7F, 0x40, 0x41, 0x41, 0x41, 
-0x41, 0x41, 0x41, 0x41, 0x41, 0x40, 
-0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 
-0x40, 0x40, 0x43, 0x40, 0x40, 0x7F, 
-0x00, 0x00, 0x00, 0xF0, 0xFB, 0xFB, 
-0x00, 0x50, 0x60, 0xFF, 0xFC, 0x3C, 
-0x1E, 0x0E, 0x0C, 0xFC, 0xF8, 0xE8, 
-0xE8, 0xE8, 0x30, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x02, 0x02, 0x0D, 0x02, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x57, 0x50, 
-0x57, 0x54, 0x57, 0x10, 0x50, 0x00, 
-0x00, 0x00, 0x97, 0x94, 0x97, 0x94, 
-0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xE4, 0x14, 0xF4, 0x94, 0xF7, 0x00, 
-0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 
-0x00, 0x38, 0xA4, 0xA4, 0xA5, 0x3C, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x7F, 0x7F, 0x7F, 0x7E, 0x7E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7F, 
-0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 
-0x7F, 0x7F, 0x7C, 0x7F, 0x7F, 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, 
-0xFE, 0xFE, 0x02, 0x62, 0x62, 0x62, 
-0xE2, 0x62, 0x62, 0x62, 0xC2, 0x02, 
-0x02, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0x02, 0x82, 0xC2, 0xE2, 0xF2, 0x82, 
-0x82, 0x82, 0x82, 0x02, 0x02, 0xFE, 
-0x00, 0x00, 0x00, 0x07, 0x7F, 0xDF, 
-0x00, 0x05, 0x03, 0x7F, 0x1F, 0x1E, 
-0x3C, 0x38, 0x18, 0x1F, 0x0F, 0x0D, 
-0x0D, 0x0D, 0x06, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x20, 0x20, 0x50, 
-0x8C, 0x50, 0x20, 0x20, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 
-0x40, 0x30, 0x40, 0x80, 0x89, 0x09, 
-0x06, 0x09, 0x09, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x1C, 0x12, 0x12, 0x12, 
-0x1E, 0x10, 0x10, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0xFF, 0x00, 0x73, 
-0x84, 0xE7, 0x94, 0x94, 0x94, 0x67, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFE, 0xFE, 0xFE, 0x9E, 0x9E, 0x9E, 
-0x1E, 0x9E, 0x9E, 0x9E, 0x3E, 0xFE, 
-0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0xFE, 0x7E, 0x3E, 0x1E, 0x0E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0xFE, 0xFE, 0xFE, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3F, 0x7F, 0x40, 0x46, 0x46, 0x46, 
-0x47, 0x46, 0x46, 0x46, 0x43, 0x40, 
-0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x40, 0x41, 0x43, 0x47, 0x4F, 0x41, 
-0x41, 0x41, 0x41, 0x40, 0x40, 0x3F, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
-0x06, 0x01, 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, 0x04, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x06, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 
-0x36, 0x08, 0x08, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x1F, 0x00, 0x0E, 
-0x10, 0x1C, 0x12, 0x12, 0x12, 0x12, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3F, 0x7F, 0x7F, 0x79, 0x79, 0x79, 
-0x78, 0x79, 0x79, 0x79, 0x7C, 0x7F, 
-0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x7F, 0x7E, 0x7C, 0x78, 0x70, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x3F, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
diff --git a/keyboards/helix/rev2/keymaps/froggy/keymap.c b/keyboards/helix/rev2/keymaps/froggy/keymap.c
deleted file mode 100644
index 1680147157d..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/keymap.c
+++ /dev/null
@@ -1,696 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <string.h>
-
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
-#define MAX(x, y) (((x) > (y)) ? (x) : (y))
-
-#define LAYOUT_half( \
-    L00, L01, L02, L03, L04, L05,       \
-    L10, L11, L12, L13, L14, L15,       \
-    L20, L21, L22, L23, L24, L25,       \
-    L30, L31, L32, L33, L34, L35, L36,  \
-    L40, L41, L42, L43, L44, L45, L46   \
-) { \
-    { L00, L01, L02, L03, L04, L05, KC_NO }, \
-    { L10, L11, L12, L13, L14, L15, KC_NO }, \
-    { L20, L21, L22, L23, L24, L25, KC_NO }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, _______ }, \
-    { _______, _______, _______, _______, _______, _______, _______ } \
-}
-
-#define DELAY_TIME  75
-static uint16_t key_timer;
-static uint16_t tap_timer;
-static uint16_t delay_registered_code;
-static uint8_t delay_mat_row;
-static uint8_t delay_mat_col;
-static bool delay_key_stat;
-static bool delay_key_pressed;
-static bool tapping_key;
-
-// 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 _BASE 0
-#define _OPT 1
-#define _FUNC 2
-#define _SYM 3
-#define _NUM 4
-
-bool RGBAnimation = false; //Flag for LED Layer color Refresh.
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  EISU,
-  KANA,
-  RGBRST,
-  RGBOFF,
-  RGB1,
-  RGB2,
-  RGB3,
-  OPT_TAP_SP,
-  DESKTOP,
-  MAC,
-  WIN,
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base
-   * ,-----------------------------------------.
-   * |  C+z |   ;  |   [  |   (  |   <  |   {  |
-   * |------+------+------+------+------+------|
-   * | KANA |   P  |   K  |   R  |   A  |   F  |
-   * |------+------+------+------+------+------|
-   * |  BS  |   D  |   T  |   H  |   E  |   O  |
-   * |------+------+------+------+------+------+------.
-   * | Shift|   Y  |   S  |   N  |   I  |   U  |Space |
-   * |------+------+------+------+------+------+------|
-   * | Ctrl | Alt  | Gui  | Sym  | Num  | OPT  | Ent  |
-   * `------------------------------------------------'
-   */
-  [_BASE] = LAYOUT_half(
-      LCTL(KC_Z),    KC_SCLN,       KC_LBRC,       KC_LPRN,   KC_LT,     KC_LCBR,
-      KANA,          KC_P,          KC_K,          KC_R,      KC_A,      KC_F,
-      KC_BSPC,       KC_D,          KC_T,          KC_H,      KC_E,      KC_O,
-      OSM(MOD_LSFT), KC_Y,          KC_S,          KC_N,      KC_I,      KC_U,       KC_SPC,
-      OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), MO(_SYM),  MO(_NUM),  OPT_TAP_SP, KC_ENT ),
-
-  /* Opt
-   * ,-----------------------------------------.
-   * |  Esc |  :   |  ]   |  )   |  >   |  }   |
-   * |------+------+------+------+------+------|
-   * |  EISU|   J  |   M  |   B  |   '  |  Tab |
-   * |------+------+------+------+------+------|
-   * |   .  |   V  |   C  |   L  |   Z  |  Q   |
-   * |------+------+------+------+------+------+------.
-   * |      |   X  |   G  |   W  |   -  |  Del | Esc  |
-   * |------+------+------+------+------+------+------|
-   * |      |      |      |   ,  | DTOP |      |      |
-   * `------------------------------------------------'
-   */
-  [_OPT] = LAYOUT_half(
-      KC_ESC,  KC_COLN,KC_RBRC, KC_RPRN,KC_GT,     KC_RCBR,
-      EISU,    KC_J,   KC_M,    KC_B,   KC_QUOT,   KC_TAB,
-      KC_DOT,  KC_V,   KC_C,    KC_L,   KC_Z,      KC_Q,
-      _______, KC_X,   KC_G,    KC_W,   KC_MINUS,  KC_DEL,  KC_ESC,
-      _______, _______,_______, KC_COMM,DESKTOP,   _______, _______
-      ),
-
-  /* Func
-   * ,-----------------------------------------.
-   * |RGBRST|  Hue |      |  RST |  Mac |  Win |
-   * |------+------+------+------+------+------|
-   * | RGB1 | VAL+ |  F7  |  F8  |  F9  |      |
-   * |------+------+------+------+------+------|
-   * | RGB2 | VAL- |  F4  |  F5  |  F6  | F12  |
-   * |------+------+------+------+------+------+------.
-   * | RGB3 |  F10 |  F1  |  F2  |  F3  | F11  |      |
-   * |------+------+------+------+------+------+------|
-   * |RGBOFF|      |      |      |      |      |      |
-   * `------------------------------------------------'
-   */
-  [_FUNC] = LAYOUT_half(
-      RGBRST,RGB_HUI, _______, QK_BOOT, MAC,     WIN,
-      RGB1,  RGB_VAI, KC_F7,   KC_F8,   KC_F9,   _______,
-      RGB2,  RGB_VAD, KC_F4,   KC_F5,   KC_F6,   KC_F12,
-      RGB3,  KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F11,   _______,
-      RGBOFF,_______, _______, _______, _______, _______,  _______
-      ),
-
-  /* Sym
-   * ,-----------------------------------------.
-   * |  Ins |  GRV |      |  PU  |  PD  |   ^  |
-   * |------+------+------+------+------+------|
-   * |      |   \  |   #  |   =  |   ?  |   %  |
-   * |------+------+------+------+------+------|
-   * |      |   $  |  upA |   @  |   !  |   |  |
-   * |------+------+------+------+------+------+------.
-   * |  CL  |  <-  |  dwA |  ->  |   _  |   &  |      |
-   * |------+------+------+------+------+------+------|
-   * |      |      |  PS  |      |   ~  |      |      |
-   * `------------------------------------------------'
-   */
-  [_SYM] = LAYOUT_half(
-      KC_INS,  KC_GRV,  _______, KC_PGUP, KC_PGDN, KC_CIRC,
-      _______, KC_BSLS, KC_HASH, KC_EQL,  KC_QUES, KC_PERC,
-      _______, KC_DLR,  KC_UP,   KC_AT,   KC_EXLM, KC_PIPE,
-      KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_UNDS, KC_AMPR, _______,
-      _______, _______, KC_PSCR, _______, KC_TILD, _______, _______
-      ),
-
-  /* Raise
-   * ,-----------------------------------------.
-   * |      |      | Func | home |  End |      |
-   * |------+------+------+------+------+------|
-   * |      |   *  |  7   |  8   |  9   |  -   |
-   * |------+------+------+------+------+------|
-   * |  .   |   /  |  4   |  5   |  6   |  +   |
-   * |------+------+------+------+------+------+------.
-   * |  LN  |  0   |  1   |  2   |  3   |C+S+F1|      |
-   * |------+------+------+------+------+------+------|
-   * |      |      |      |  ,   |      |      |      |
-   * `------------------------------------------------'
-   */
-  [_NUM] = LAYOUT_half(
-      _______,  _______, OSL(_FUNC), KC_HOME, KC_END,  _______,
-      _______,  KC_ASTR, KC_P7,      KC_P8,   KC_P9,   KC_MINS,
-      KC_PDOT,  KC_SLSH, KC_P4,      KC_P5,   KC_P6,   KC_PLUS,
-      KC_NUM,   KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______,
-      _______,  _______, KC_PDOT,    KC_COMM, _______, _______,        _______
-      )
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-// define variables for reactive RGB
-//bool TOG_STATUS = false;
-int RGB_current_mode;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool find_mairix(uint16_t keycode, uint8_t *row, uint8_t *col){
-  for(uint8_t i=0; i<MATRIX_ROWS; i++){
-    for(uint8_t j=0; j<MATRIX_COLS; j++){
-      if( pgm_read_word(&(keymaps[_BASE][i][j]))==keycode){
-        *row = i;
-        *col = j;
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-void unregister_delay_code(void){
-  if(delay_registered_code){
-    unregister_code(delay_registered_code);
-    if (delay_registered_code & QK_LSFT){
-      unregister_code(KC_LSFT);
-    }
-    if (delay_registered_code & QK_LCTL){
-      unregister_code(KC_LCTL);
-    }
-    if (delay_registered_code & QK_LALT){
-      unregister_code(KC_LALT);
-    }
-    if (delay_registered_code & QK_LGUI){
-      unregister_code(KC_LGUI);
-    }
-    delay_registered_code=0;
-  }
-}
-
-void register_delay_code(uint8_t layer){
-  if(delay_key_stat){
-    unregister_delay_code();
-
-    uint16_t code = pgm_read_word(&(keymaps[layer][delay_mat_row][delay_mat_col]));
-    if (code & QK_LSFT){
-      register_code(KC_LSFT);
-    }
-    if (code & QK_LCTL){
-      register_code(KC_LCTL);
-    }
-    if (code & QK_LALT){
-      register_code(KC_LALT);
-    }
-    if (code & QK_LGUI){
-      register_code(KC_LGUI);
-    }
-    register_code(code);
-    delay_registered_code = code;
-    delay_key_stat = false;
-    tapping_key = true;
-  }
-}
-
-#ifdef RGBLIGHT_ENABLE
-struct keybuf {
-  char col, row;
-  char frame;
-};
-struct keybuf keybufs[256];
-unsigned char keybuf_begin, keybuf_end;
-
-int col, row;
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  #ifdef RGBLIGHT_ENABLE
-    col = record->event.key.col;
-    row = record->event.key.row;
-    if (record->event.pressed && ((row < 5 && is_keyboard_master()) || (row >= 5 && !is_keyboard_master()))) {
-      int end = keybuf_end;
-      keybufs[end].col = col;
-      keybufs[end].row = row % 5;
-      keybufs[end].frame = 0;
-      keybuf_end ++;
-    }
-  #endif
-
-  if(tap_timer&&keycode!=OPT_TAP_SP){
-    tapping_key = true;
-  }
-
-  if(keycode==delay_registered_code){
-      if (!record->event.pressed){
-        unregister_delay_code();
-      }
-  }
-
-  switch (keycode) {
-    case KC_SCLN:
-    case KC_LBRC:
-    case KC_LPRN:
-    case KC_LT:
-    case KC_LCBR:
-    case KC_P:
-    case KC_K:
-    case KC_R:
-    case KC_A:
-    case KC_F:
-    case KC_BSPC:
-    case KC_D:
-    case KC_T:
-    case KC_H:
-    case KC_E:
-    case KC_O:
-    case KC_Y:
-    case KC_S:
-    case KC_N:
-    case KC_I:
-    case KC_U:
-    case LCTL(KC_Z):
-    case KC_SPC:
-      if (record->event.pressed) {
-        register_delay_code(_BASE);
-        if(find_mairix(keycode, &delay_mat_row, &delay_mat_col)){
-          key_timer = timer_read();
-          delay_key_stat = true;
-          delay_key_pressed = true;
-        }
-      }else{
-        delay_key_pressed = false;
-      }
-      return false;
-      break;
-    case OPT_TAP_SP:
-      if (record->event.pressed) {
-        tapping_key = false;
-        register_delay_code(_OPT);
-        layer_on(_OPT);
-        tap_timer = timer_read();
-      }else{
-        layer_off(_OPT);
-        if(tapping_key==false && timer_elapsed(tap_timer) < TAPPING_TERM){
-          SEND_STRING(" ");
-        }
-        tap_timer = 0;
-      }
-      return false;
-      break;
-   case EISU:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG2);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG2);
-      }
-      return false;
-      break;
-    case KANA:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG1);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG1);
-      }
-      return false;
-      break;
-    case DESKTOP:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_F11);
-        }else{
-          SEND_STRING(SS_LGUI("d"));
-        }
-      } else {
-        unregister_code(KC_F11);
-      }
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_get_mode();
-          RGBAnimation = false;
-        }
-      #endif
-      break;
-    case RGBOFF:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_disable();
-        }
-      #endif
-      break;
-    case RGB1:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_RAINBOW_MOOD);
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      break;
-    case RGB2:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 1);
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      break;
-    case RGB3:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_KNIGHT);
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      break;
-    case MAC:
-      if (record->event.pressed) {
-        keymap_config.swap_lalt_lgui = false;
-        keymap_config.swap_ralt_rgui = false;
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(ag_norm_song);
-        #endif
-      }
-      break;
-    case WIN:
-      if (record->event.pressed) {
-        keymap_config.swap_lalt_lgui = true;
-        keymap_config.swap_ralt_rgui = true;
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(ag_swap_song);
-        #endif
-      }
-      break;
-    }
-  return true;
-}
-
-
-//keyboard start-up code. Runs once when the firmware starts up.
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_get_mode();
-    #endif
-}
-
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_OPT 2
-#define L_FUNC 4
-#define L_SYM 8
-#define L_NUM 16
-#define L_FNLAYER 64
-#define L_NUMLAY 128
-#define L_NLOWER 136
-#define L_NFNLAYER 192
-#define L_MOUSECURSOR 256
-
-// LED Effect
-#ifdef RGBLIGHT_ENABLE
-unsigned char rgb[7][5][3];
-void led_ripple_effect(char r, char g, char b) {
-    static int scan_count = -10;
-    static int keys[] = { 6, 6, 6, 7, 7 };
-    static int keys_sum[] = { 0, 6, 12, 18, 25 };
-
-    if (scan_count == -1) {
-      rgblight_enable_noeeprom();
-      rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-    } else if (scan_count >= 0 && scan_count < 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        // FIXME:
-
-        int y = scan_count;
-        int dist_y = abs(y - keybufs[i].row);
-        for (int x=0; x<keys[y]; x++) {
-          int dist = abs(x - keybufs[i].col) + dist_y;
-          if (dist <= keybufs[i].frame) {
-            int elevation = MAX(0, (8 + dist - keybufs[i].frame)) << 2;
-            if (elevation) {
-              if ((rgb[x][y][0] != 255) && r) { rgb[x][y][0] = MIN(255, elevation + rgb[x][y][0]); }
-              if ((rgb[x][y][1] != 255) && g) { rgb[x][y][1] = MIN(255, elevation + rgb[x][y][1]); }
-              if ((rgb[x][y][2] != 255) && b) { rgb[x][y][2] = MIN(255, elevation + rgb[x][y][2]); }
-            }
-          }
-        }
-      }
-    } else if (scan_count == 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        if (keybufs[i].frame < 18) {
-          keybufs[i].frame ++;
-        } else {
-          keybuf_begin ++;
-        }
-      }
-    } else if (scan_count >= 6 && scan_count <= 10) {
-      int y = scan_count - 6;
-      for (int x=0; x<keys[y]; x++) {
-        int at = keys_sum[y] + ((y & 1) ? x : (keys[y] - x - 1));
-        led[at].r = rgb[x][y][0];
-        led[at].g = rgb[x][y][1];
-        led[at].b = rgb[x][y][2];
-      }
-      rgblight_set();
-    } else if (scan_count == 11) {
-      memset(rgb, 0, sizeof(rgb));
-    }
-    scan_count++;
-    if (scan_count >= 12) { scan_count = 0; }
-}
-#endif
-
-uint8_t layer_state_old;
-
-//runs every scan cycle (a lot)
-void matrix_scan_user(void) {
-  if(delay_key_stat && (timer_elapsed(key_timer) > DELAY_TIME)){
-    register_delay_code(_BASE);
-    if(!delay_key_pressed){
-      unregister_delay_code();
-    }
-  }
-
-  if(layer_state_old != layer_state){
-    switch (layer_state) {
-      case L_BASE:
-        break;
-      case L_OPT:
-        register_delay_code(_OPT);
-        break;
-      case L_NUM:
-        register_delay_code(_NUM);
-        break;
-      case L_SYM:
-        register_delay_code(_SYM);
-        break;
-      case L_FUNC:
-        register_delay_code(_FUNC);
-        break;
-    }
-    layer_state_old = layer_state;
-  }
-
-  #ifdef RGBLIGHT_ENABLE
-    if(!RGBAnimation){
-      switch (layer_state) {
-        case L_BASE:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(0,112,127);
-          #else
-            rgblight_setrgb(0,112,127);
-          #endif
-          break;
-        case L_OPT:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(127,0,100);
-          #else
-            rgblight_setrgb(127,0,100);
-          #endif
-          break;
-        case L_NUM:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(127,23,0);
-          #else
-            rgblight_setrgb(127,23,0);
-          #endif
-          break;
-        case L_SYM:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(0,127,0);
-          #else
-            rgblight_setrgb(0,127,0);
-          #endif
-          break;
-        case L_FUNC:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(127,0,61);
-          #else
-            rgblight_setrgb(127,0,61);
-          #endif
-          break;
-        }
-    }
-  #endif
-}
-
-//OLED update loop
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_0;
-}
-
-// Render to OLED
-void render_status(void) {
-
-  // froggy logo
-  static char logo[4][1][17]=
-  {
-    {
-      {0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0}
-    },
-    {
-      {0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,0}
-    },
-    {
-      {0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,0}
-    },
-    {
-      {0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0}
-    }
-  };
-
-  static char indctr[8][2][4]=
-  {
-    // white icon
-    {
-      {0x60,0x61,0x62,0},
-      {0x63,0x64,0}
-    },
-    {
-      {0x80,0x81,0x82,0},
-      {0x83,0x84,0}
-    },
-    {
-      {0xa0,0xa1,0xa2,0},
-      {0xa3,0xa4,0}
-    },
-    {
-      {0xc0,0xc1,0xc2,0},
-      {0xc3,0xc4,0}
-    },
-    // Black icon
-    {
-      {0x75,0x76,0x77,0},
-      {0x78,0x79,0}
-    },
-    {
-      {0x95,0x96,0x97,0},
-      {0x98,0x99,0}
-    },
-    {
-      {0xb5,0xb6,0xb7,0},
-      {0xb8,0xb9,0}
-    },
-    {
-      {0xd5,0xd6,0xd7,0},
-      {0xd8,0xd9,0}
-    },
-  };
-
-  int rown = 0;
-  int rowf = 0;
-  int rowa = 0;
-  int rows = 0;
-
-  //Set Indicator icon
-  led_t led_state = host_keyboard_led_state();
-  if (led_state.num_lock) { rown = 4; } else { rown = 0; }
-  if (led_state.caps_lock) { rowa = 4; } else { rowa = 0; }
-  if (led_state.scroll_lock) { rows = 4; } else { rows = 0; }
-  if (layer_state == L_FUNC) { rowf = 4; }
-
-  oled_write(indctr[rown]  [0], false);
-  oled_write(indctr[rowf]  [1], false);
-  oled_write(logo  [0]     [0], false);
-  oled_write(indctr[rown+1][0], false);
-  oled_write(indctr[rowf+1][1], false);
-  oled_write(logo  [1]     [0], false);
-  oled_write(indctr[rowa+2][0], false);
-  oled_write(indctr[rows+2][1], false);
-  oled_write(logo  [2]     [0], false);
-  oled_write(indctr[rowa+3][0], false);
-  oled_write(indctr[rows+3][1], false);
-  oled_write(logo  [3]     [0], false);
-
-}
-
-bool oled_task_user(void) {
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  if (is_keyboard_master()) {
-    render_status();
-  }
-  return false;
-}
-
-#endif // end of OLED_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/froggy/readme.md b/keyboards/helix/rev2/keymaps/froggy/readme.md
deleted file mode 100644
index 624e738a6c9..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/readme.md
+++ /dev/null
@@ -1,83 +0,0 @@
-Froggy -one hand Helix-
-======
-
-![Imgur](https://i.imgur.com/S1Dw3XW.jpg)
-
-## Features
-It is a one-handed keyboard with reference to Frogpad. Layout Designed by タクマ ([@humid](https://twitter.com/humid)).
-
-## Layout
-### Base
-```
-,-----------------------------------------.
-|  C+z |   ;  |   [  |   (  |   <  |   {  |
-|------+------+------+------+------+------|
-| KANA |   P  |   K  |   R  |   A  |   F  |
-|------+------+------+------+------+------|
-|  BS  |   D  |   T  |   H  |   E  |   O  |
-|------+------+------+------+------+------+------.
-| Shift|   Y  |   S  |   N  |   I  |   U  | Space|
-|------+------+------+------+------+------+------|
-| Ctrl |  Alt |  win |  Sym |  Num |  OPT |  Ent |
-`------------------------------------------------'
-```
-
-### Opt
-```
-,-----------------------------------------.
-|  Esc |   :  |   ]  |   )  |   >  |   }  |
-|------+------+------+------+------+------|
-| EISU |   J  |   M  |   B  |   '  |  Tab |
-|------+------+------+------+------+------|
-|   .  |   V  |   C  |   L  |   Z  |   Q  |
-|------+------+------+------+------+------+------.
-|      |   X  |   G  |   W  |   -  |  Del |  Esc |
-|------+------+------+------+------+------+------|
-|      |      |      |   ,  | DTOP |      |      |
-`------------------------------------------------'
-```
-
-### Num
-```
-,-----------------------------------------.
-|      |      | Func | home |  End |      |
-|------+------+------+------+------+------|
-|      |   *  |   7  |   8  |   9  |   -  |
-|------+------+------+------+------+------|
-|   .  |   /  |   4  |   5  |   6  |   +  |
-|------+------+------+------+------+------+------.
-|  LN  |   0  |   1  |   2  |   3  |C+S+F1|      |
-|------+------+------+------+------+------+------|
-|      |      |      |   ,  |      |      |      |
-`------------------------------------------------'
-```
-
-### Sym
-```
-,-----------------------------------------.
-|  Ins |  GRV |      |  PU  |  PD  |   ^  |
-|------+------+------+------+------+------|
-|      |   \  |   #  |   =  |   ?  |   %  |
-|------+------+------+------+------+------|
-|      |   $  |  upA |   @  |   !  |   |  |
-|------+------+------+------+------+------+------.
-|  CL  |  <-  |  dwA |  ->  |   _  |   &  |      |
-|------+------+------+------+------+------+------|
-|      |      |  PS  |      |   ~  |      |      |
- `-----------------------------------------------'
-```
-
-### Func
-```
-,-----------------------------------------.
-|RGBRST|  Hue |      |  RST |  Mac |  Win |
-|------+------+------+------+------+------|
-| RGB1 | VAL+ |  F7  |  F8  |  F9  |      |
-|------+------+------+------+------+------|
-| RGB2 | VAL- |  F4  |  F5  |  F6  |  F12 |
-|------+------+------+------+------+------+------.
-| RGB3 |  F10 |  F1  |  F2  |  F3  |  F11 |      |
-|------+------+------+------+------+------+------|
-|RGBOFF|      |      |      |      |      |      |
-`------------------------------------------------'
-```
diff --git a/keyboards/helix/rev2/keymaps/froggy/rules.mk b/keyboards/helix/rev2/keymaps/froggy/rules.mk
deleted file mode 100644
index 048ecefff38..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# QMK Standard Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-#   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
-#   See TOP/docs/config_options.md for more information.
-#
-LTO_ENABLE = no  # if firmware size over limit, try this option
-SPLIT_KEYBOARD = yes
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-#  jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-OLED_ENABLE = yes           # OLED_ENABLE
-LOCAL_GLCDFONT = yes        # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-LED_BACK_ENABLE = yes       # LED backlight (Enable WS2812 RGB underlight.)
-LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes        # LED animations
-# IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-# OLED_ENABLE が yes のとき
-#   OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
-#   OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
-# If OLED_ENABLE is 'yes'
-#   If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
-#   If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
-OLED_SELECT = core
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/config.h b/keyboards/helix/rev2/keymaps/froggy_106/config.h
deleted file mode 100644
index 9affa1d296a..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-#define ONESHOT_TAP_TOGGLE 5 /* Tapping this number of times holds the key until tapped this number of times again. */
-#define ONESHOT_TIMEOUT 5000 /* Time (in ms) before the one shot key is released */
-
-// the froggy keymap does not use the right hand side, so sync_timer is not needed
-#define DISABLE_SYNC_TIMER
-// For the same reason, the following are also not needed
-#undef SPLIT_LAYER_STATE_ENABLE
-#undef SPLIT_LED_STATE_ENABLE
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_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
-#endif
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/helixfont.h b/keyboards/helix/rev2/keymaps/froggy_106/helixfont.h
deleted file mode 100644
index 3a79a1937ba..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/helixfont.h
+++ /dev/null
@@ -1,235 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#pragma once
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-
-static const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, 
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, 
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, 
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 
-0xFC, 0xFE, 0x02, 0x82, 0x82, 0x82, 
-0x82, 0x82, 0x82, 0xC2, 0x82, 0x02, 
-0x02, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0x02, 0x62, 0x62, 0x62, 0x62, 0xE2, 
-0x62, 0x62, 0xE2, 0x02, 0x02, 0xFC, 
-0x00, 0x00, 0x00, 0xF0, 0xFC, 0xFC, 
-0xFC, 0x00, 0xFC, 0xFC, 0xF0, 0x80, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 
-0x30, 0x40, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x20, 0x00, 0x00, 0x24, 0xA4, 
-0xA4, 0xBC, 0xA4, 0x24, 0x24, 0x00, 
-0x00, 0x00, 0x24, 0xA4, 0x24, 0x24, 
-0x3C, 0x04, 0x04, 0x00, 0x00, 0x00, 
-0xB8, 0xA4, 0xA4, 0xA4, 0xBC, 0x00, 
-0x00, 0x00, 0x00, 0xFC, 0x00, 0xFC, 
-0x00, 0x44, 0x44, 0x44, 0xDC, 0x44, 
-0x04, 0x3C, 0x00, 0x00, 0x00, 0x00, 
-0xFC, 0xFE, 0xFE, 0x7E, 0x7E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x3E, 0x7E, 0xFE, 
-0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0xFE, 0x9E, 0x9E, 0x9E, 0x9E, 0x1E, 
-0x9E, 0x9E, 0x1E, 0xFE, 0xFE, 0xFC, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 
-0x7F, 0x7F, 0x40, 0x41, 0x41, 0x41, 
-0x41, 0x41, 0x41, 0x41, 0x41, 0x40, 
-0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 
-0x40, 0x40, 0x43, 0x40, 0x40, 0x7F, 
-0x00, 0x20, 0x3C, 0x3E, 0x3E, 0x3E, 
-0x3E, 0x00, 0x3E, 0x3E, 0x3E, 0x3E, 
-0x38, 0x00, 0x00, 0xF0, 0xFB, 0xFB, 
-0x00, 0x50, 0x60, 0xFF, 0xFC, 0x3C, 
-0x1E, 0x0E, 0x0C, 0xFC, 0xF8, 0xE8, 
-0xE8, 0xE8, 0x30, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x04, 0x04, 0x1B, 0x04, 0x04, 
-0x00, 0x00, 0x00, 0x00, 0x57, 0x50, 
-0x57, 0x54, 0x57, 0x10, 0x50, 0x00, 
-0x00, 0x00, 0x97, 0x94, 0x97, 0x94, 
-0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xE4, 0x14, 0xF4, 0x94, 0xF7, 0x00, 
-0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 
-0x00, 0x38, 0xA4, 0xA4, 0xA5, 0x3C, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x7F, 0x7F, 0x7F, 0x7E, 0x7E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7F, 
-0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 
-0x7F, 0x7F, 0x7C, 0x7F, 0x7F, 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, 
-0xFE, 0xFE, 0x02, 0x62, 0x62, 0x62, 
-0xE2, 0x62, 0x62, 0x62, 0xC2, 0x02, 
-0x02, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0x02, 0x82, 0xC2, 0xE2, 0xF2, 0x82, 
-0x82, 0x82, 0x82, 0x02, 0x02, 0xFE, 
-0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 
-0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
-0x00, 0x00, 0x00, 0x07, 0x7F, 0xDF, 
-0x00, 0x05, 0x03, 0x7F, 0x1F, 0x1E, 
-0x3C, 0x38, 0x18, 0x1F, 0x0F, 0x0D, 
-0x0D, 0x0D, 0x06, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x20, 0x20, 0x50, 
-0x8C, 0x50, 0x20, 0x20, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 
-0x06, 0x09, 0x09, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x1C, 0x12, 0x12, 0x12, 
-0x1E, 0x10, 0x10, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0xFF, 0x00, 0x73, 
-0x84, 0xE7, 0x94, 0x94, 0x94, 0x67, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFE, 0xFE, 0xFE, 0x9E, 0x9E, 0x9E, 
-0x1E, 0x9E, 0x9E, 0x9E, 0x3E, 0xFE, 
-0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0xFE, 0x7E, 0x3E, 0x1E, 0x0E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0xFE, 0xFE, 0xFE, 
-0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 
-0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-0x00, 0x00, 0x00, 0x07, 0x7F, 0xDF, 
-0x00, 0x00, 0xE0, 0xF8, 0xFC, 0xFC, 
-0xFC, 0xFC, 0xFC, 0xFC, 0xF0, 0x80, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 
-0x3F, 0x7F, 0x40, 0x46, 0x46, 0x46, 
-0x47, 0x46, 0x46, 0x46, 0x43, 0x40, 
-0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x40, 0x41, 0x43, 0x47, 0x4F, 0x41, 
-0x41, 0x41, 0x41, 0x40, 0x40, 0x3F, 
-0x00, 0x00, 0x00, 0x3E, 0x73, 0x60, 
-0x70, 0x3E, 0x07, 0x03, 0x67, 0x3E, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
-0x06, 0x01, 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, 0x04, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 
-0x36, 0x08, 0x08, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x1F, 0x00, 0x0E, 
-0x10, 0x1C, 0x12, 0x12, 0x12, 0x12, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3F, 0x7F, 0x7F, 0x79, 0x79, 0x79, 
-0x78, 0x79, 0x79, 0x79, 0x7C, 0x7F, 
-0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x7F, 0x7E, 0x7C, 0x78, 0x70, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x3F, 
-0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 
-0x03, 0x3F, 0x63, 0x63, 0x63, 0x3F, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
-0x00, 0x00, 0x07, 0x1F, 0x3F, 0x0F, 
-0x07, 0x0F, 0x3F, 0x3F, 0x0F, 0x00, 
-0x03, 0x06, 0x00, 0xF0, 0xFB, 0xFB, 
-};
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
deleted file mode 100644
index d0a17cb4ae6..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
+++ /dev/null
@@ -1,810 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-#include <string.h>
-
-#define LAYOUT_half( \
-    L00, L01, L02, L03, L04, L05,       \
-    L10, L11, L12, L13, L14, L15,       \
-    L20, L21, L22, L23, L24, L25,       \
-    L30, L31, L32, L33, L34, L35, L36,  \
-    L40, L41, L42, L43, L44, L45, L46   \
-) { \
-    { L00, L01, L02, L03, L04, L05, KC_NO }, \
-    { L10, L11, L12, L13, L14, L15, KC_NO }, \
-    { L20, L21, L22, L23, L24, L25, KC_NO }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, _______ }, \
-    { _______, _______, _______, _______, _______, _______, _______ } \
-}
-
-#define DELAY_TIME  75
-static uint16_t key_timer;
-static uint16_t tap_timer;
-static uint16_t delay_registered_code;
-static uint8_t delay_registered_layer;
-static uint8_t delay_mat_row;
-static uint8_t delay_mat_col;
-static bool delay_key_stat;
-static bool delay_key_pressed;
-static bool tapping_key;
-
-// 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 {
-  _BASE = 0,
-  _BASE_106,
-  _OPT,
-  _OPT_106,
-  _SYM,
-  _SYM_106,
-  _NUM,
-  _NUM_106,
-  _FUNC,
-  _LAYER_NUM,
-};
-bool RGBAnimation = false; //Flag for LED Layer color Refresh.
-
-typedef union {
-  uint32_t raw;
-  struct {
-    bool mac_mode:1;
-  };
-} user_config_t;
-user_config_t user_config;
-
-#define IS_MODE_106()   ((default_layer_state & (1UL << _BASE_106)) != 0)
-#define IS_MODE_MAC()   (user_config.mac_mode)
-#ifndef MAX
-#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
-#endif
-#ifndef MIN
-#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
-#endif
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  EISU,
-  KANA,
-  RGBRST,
-  RGBOFF,
-  RGB1,
-  RGB2,
-  RGB3,
-  OPT_TAP_SP,
-  DESKTOP,
-  MAC,
-  WIN,
-  L_SYM,
-  L_NUM,
-  TO_106,
-  TO_101,
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base
-   * ,-----------------------------------------.
-   * |  C+z |   ;  |   [  |   (  |   <  |   {  |
-   * |------+------+------+------+------+------|
-   * | KANA |   P  |   K  |   R  |   A  |   F  |
-   * |------+------+------+------+------+------|
-   * |  BS  |   D  |   T  |   H  |   E  |   O  |
-   * |------+------+------+------+------+------+------.
-   * | Shift|   Y  |   S  |   N  |   I  |   U  |Space |
-   * |------+------+------+------+------+------+------|
-   * | Ctrl | Alt  | Gui  | Sym  | Num  | OPT  | Ent  |
-   * `------------------------------------------------'
-   */
-  [_BASE] = LAYOUT_half(
-      LCTL(KC_Z),    KC_SCLN,       KC_LBRC,       KC_LPRN,   KC_LT,     KC_LCBR,
-      KANA,          KC_P,          KC_K,          KC_R,      KC_A,      KC_F,
-      KC_BSPC,       KC_D,          KC_T,          KC_H,      KC_E,      KC_O,
-      OSM(MOD_LSFT), KC_Y,          KC_S,          KC_N,      KC_I,      KC_U,       KC_SPC,
-      OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), L_SYM,     L_NUM,     OPT_TAP_SP, KC_ENT
-      ),
-  [_BASE_106] = LAYOUT_half(
-      LCTL(KC_Z),    JP_SCLN,       JP_LBRC,       JP_LPRN,   JP_LABK,   JP_LCBR,
-      KANA,          KC_P,          KC_K,          KC_R,      KC_A,      KC_F,
-      KC_BSPC,       KC_D,          KC_T,          KC_H,      KC_E,      KC_O,
-      OSM(MOD_LSFT), KC_Y,          KC_S,          KC_N,      KC_I,      KC_U,       KC_SPC,
-      OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), L_SYM,     L_NUM,     OPT_TAP_SP, KC_ENT
-      ),
-
-  /* Opt
-   * ,-----------------------------------------.
-   * |  Esc |  :   |  ]   |  )   |  >   |  }   |
-   * |------+------+------+------+------+------|
-   * |  EISU|   J  |   M  |   B  |   '  |  Tab |
-   * |------+------+------+------+------+------|
-   * |   .  |   V  |   C  |   L  |   Z  |  Q   |
-   * |------+------+------+------+------+------+------.
-   * |      |   X  |   G  |   W  |   -  |  Del | Esc  |
-   * |------+------+------+------+------+------+------|
-   * |      |      |      |   ,  | DTOP |      |      |
-   * `------------------------------------------------'
-   */
-  [_OPT] = LAYOUT_half(
-      KC_ESC,  KC_COLN,KC_RBRC, KC_RPRN,KC_GT,     KC_RCBR,
-      EISU,    KC_J,   KC_M,    KC_B,   KC_QUOT,   KC_TAB,
-      KC_DOT,  KC_V,   KC_C,    KC_L,   KC_Z,      KC_Q,
-      _______, KC_X,   KC_G,    KC_W,   KC_MINUS,  KC_DEL,  KC_ESC,
-      _______, _______,_______, KC_COMM,DESKTOP,   _______, _______
-      ),
-  [_OPT_106] = LAYOUT_half(
-      KC_ESC,  JP_COLN,JP_RBRC, JP_RPRN,JP_RABK,   JP_RCBR,
-      EISU,    KC_J,   KC_M,    KC_B,   JP_QUOT,   KC_TAB,
-      KC_DOT,  KC_V,   KC_C,    KC_L,   KC_Z,      KC_Q,
-      _______, KC_X,   KC_G,    KC_W,   JP_MINS,   KC_DEL,  KC_ESC,
-      _______, _______,_______, KC_COMM,DESKTOP,   _______, _______
-      ),
-
-  /* Sym
-   * ,-----------------------------------------.
-   * |  Ins |  GRV |      |  PU  |  PD  |   ^  |
-   * |------+------+------+------+------+------|
-   * |      |   \  |   #  |   =  |   ?  |   %  |
-   * |------+------+------+------+------+------|
-   * |      |   $  |  upA |   @  |   !  |   |  |
-   * |------+------+------+------+------+------+------.
-   * |  CL  |  <-  |  dwA |  ->  |   _  |   &  |      |
-   * |------+------+------+------+------+------+------+
-   * |      |      |  PS  |      |   ~  |      |      |
-   * `------------------------------------------------'
-   */
-  [_SYM] = LAYOUT_half(
-      KC_INS,  KC_GRV,  _______, KC_PGUP, KC_PGDN, KC_CIRC,
-      _______, KC_BSLS, KC_HASH, KC_EQL,  KC_QUES, KC_PERC,
-      _______, KC_DLR,  KC_UP,   KC_AT,   KC_EXLM, KC_PIPE,
-      KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_UNDS, KC_AMPR, _______,
-      _______, _______, KC_PSCR, _______, KC_TILD, _______, _______
-      ),
-  [_SYM_106] = LAYOUT_half(
-      KC_INS,  JP_GRV,  _______, KC_PGUP, KC_PGDN, JP_CIRC,
-      _______, JP_BSLS, JP_HASH, JP_EQL,  JP_QUES, JP_PERC,
-      _______, JP_DLR,  KC_UP,   JP_AT,   JP_EXLM, JP_PIPE,
-      KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT,JP_UNDS, JP_AMPR, _______,
-      _______, _______, KC_PSCR, _______, JP_TILD, _______, _______
-      ),
-  
-  /* Raise
-   * ,-----------------------------------------.
-   * |      |      | Func | home |  End |      |
-   * |------+------+------+------+------+------|
-   * |      |   *  |  7   |  8   |  9   |  -   |
-   * |------+------+------+------+------+------|
-   * |  .   |   /  |  4   |  5   |  6   |  +   |
-   * |------+------+------+------+------+------+------.
-   * |  LN  |  0   |  1   |  2   |  3   |C+S+F1|      |
-   * |------+------+------+------+------+------+------|
-   * |      |      |  .   |  ,   |      |      |      |
-   * `------------------------------------------------'
-   */
-  [_NUM] = LAYOUT_half(
-      _______,  _______, OSL(_FUNC), KC_HOME, KC_END,  _______,
-      _______,  KC_ASTR, KC_P7,      KC_P8,   KC_P9,   KC_MINS,
-      KC_DOT,   KC_SLSH, KC_P4,      KC_P5,   KC_P6,   KC_PLUS,
-      KC_NUM,   KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______,
-      _______,  _______, KC_PDOT,    KC_COMM, _______, _______,        _______
-      ),
-  [_NUM_106] = LAYOUT_half(
-      _______,  _______, OSL(_FUNC), KC_HOME, KC_END,  _______,
-      _______,  JP_ASTR, KC_P7,      KC_P8,   KC_P9,   JP_MINS,
-      KC_DOT,   JP_SLSH, KC_P4,      KC_P5,   KC_P6,   JP_PLUS,
-      KC_NUM,   KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______,
-      _______,  _______, KC_PDOT,    JP_COMM, _______, _______,        _______
-      ),
-  
-  /* Func
-   * ,-----------------------------------------.
-   * |RGBRST|  Hue |To101 |  RST |  Mac |  Win |
-   * |------+------+------+------+------+------|
-   * | RGB1 | VAL+ |  F7  |  F8  |  F9  |To106 |
-   * |------+------+------+------+------+------|
-   * | RGB2 | VAL- |  F4  |  F5  |  F6  | F12  |
-   * |------+------+------+------+------+------+------.
-   * | RGB3 |  F10 |  F1  |  F2  |  F3  | F11  |      |
-   * |------+------+------+------+------+------+------|
-   * |RGBOFF|      |      |      |      |      |      |
-   * `------------------------------------------------'
-   */
-  [_FUNC] = LAYOUT_half(
-      RGBRST,RGB_HUI, TO_101,  QK_BOOT, MAC,     WIN,
-      RGB1,  RGB_VAI, KC_F7,   KC_F8,   KC_F9,   TO_106,
-      RGB2,  RGB_VAD, KC_F4,   KC_F5,   KC_F6,   KC_F12,
-      RGB3,  KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F11,   _______,
-      RGBOFF,_______, _______, _______, _______, _______,  _______
-      )
-};
-
-void set_mac_mode(bool enable) {
-  if(enable){
-    user_config.mac_mode = true;
-    keymap_config.swap_lalt_lgui = false;
-    keymap_config.swap_ralt_rgui = false;
-  }else{
-    user_config.mac_mode = false;
-    keymap_config.swap_lalt_lgui = true;
-    keymap_config.swap_ralt_rgui = true;
-  }
-  eeconfig_update_user(user_config.raw);
-}
-
-void eeconfig_init_user(void) {
-  user_config.raw = 0;
-  eeconfig_update_user(user_config.raw);
-}
-
-void keyboard_post_init_user(void) {
-  user_config.raw = eeconfig_read_user();
-  set_mac_mode(user_config.mac_mode);
-}
-
-bool find_mairix(uint16_t keycode, uint8_t *row, uint8_t *col){
-  int base_keymap = IS_MODE_106() ? _BASE_106 : _BASE;
-  for(uint8_t i=0; i<MATRIX_ROWS; i++){
-    for(uint8_t j=0; j<MATRIX_COLS; j++){
-      if( pgm_read_word(&(keymaps[base_keymap][i][j]))==keycode){
-        *row = i;
-        *col = j;
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-void unregister_delay_code(void){
-  if(delay_registered_code){
-    unregister_code(delay_registered_code);
-    if (delay_registered_code & QK_LSFT){
-      unregister_code(KC_LSFT);
-    }
-    if (delay_registered_code & QK_LCTL){
-      unregister_code(KC_LCTL);
-    }
-    if (delay_registered_code & QK_LALT){
-      unregister_code(KC_LALT);
-    }
-    if (delay_registered_code & QK_LGUI){
-      unregister_code(KC_LGUI);
-    }
-    delay_registered_code=0;
-    delay_registered_layer=0;
-  }
-}
-
-void register_delay_code(uint8_t layer){
-  if(delay_key_stat){
-    unregister_delay_code();
-
-    uint16_t code = pgm_read_word(&(keymaps[layer][delay_mat_row][delay_mat_col]));
-    if (code & QK_LSFT){
-      register_code(KC_LSFT);
-    }
-    if (code & QK_LCTL){
-      register_code(KC_LCTL);
-    }
-    if (code & QK_LALT){
-      register_code(KC_LALT);
-    }
-    if (code & QK_LGUI){
-      register_code(KC_LGUI);
-    }
-    register_code(code);
-    delay_registered_code = code;
-    delay_registered_layer = layer;
-    delay_key_stat = false;
-    tapping_key = true;
-  }
-}
-
-#ifdef RGBLIGHT_ENABLE
-struct keybuf {
-  char col, row;
-  char frame;
-};
-struct keybuf keybufs[256];
-unsigned char keybuf_begin, keybuf_end;
-
-int col, row;
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  #ifdef RGBLIGHT_ENABLE
-    col = record->event.key.col;
-    row = record->event.key.row;
-    if (record->event.pressed && ((row < 5 && is_keyboard_master()) || (row >= 5 && !is_keyboard_master()))) {
-      int end = keybuf_end;
-      keybufs[end].col = col;
-      keybufs[end].row = row % 5;
-      keybufs[end].frame = 0;
-      keybuf_end ++;
-    }
-  #endif
-
-  if(tap_timer&&keycode!=OPT_TAP_SP){
-    tapping_key = true;
-  }
-
-  if(keycode==delay_registered_code){
-    if (!record->event.pressed){
-      unregister_delay_code();
-    }
-  }
-
-  switch (keycode) {
-    case KC_SCLN:
-    case KC_LBRC:
-    case KC_LPRN:
-    case KC_LT:
-    case KC_LCBR:
-    case KC_P:
-    case KC_K:
-    case KC_R:
-    case KC_A:
-    case KC_F:
-    case KC_BSPC:
-    case KC_D:
-    case KC_T:
-    case KC_H:
-    case KC_E:
-    case KC_O:
-    case KC_Y:
-    case KC_S:
-    case KC_N:
-    case KC_I:
-    case KC_U:
-    case LCTL(KC_Z):
-    case KC_SPC:
-    //case JP_SCLN: // == KC_SCLN
-    case JP_LBRC:
-    case JP_LPRN:
-    //case JP_LABK: // == KC_LT
-    case JP_LCBR:
-      if (IS_MODE_106()) {
-          if (keycode == KC_LBRC || keycode == KC_LPRN || keycode == KC_LCBR)
-            break;
-      }else{
-          if (keycode == JP_LBRC || keycode == JP_LPRN || keycode == JP_LCBR)
-            break;
-      }
-      if (record->event.pressed) {
-        if (IS_MODE_106())
-          register_delay_code(_BASE_106);
-        else
-          register_delay_code(_BASE);
-        if(find_mairix(keycode, &delay_mat_row, &delay_mat_col)){
-          key_timer = timer_read();
-          delay_key_stat = true;
-          delay_key_pressed = true;
-        }
-      }else{
-        delay_key_pressed = false;
-      }
-      return false;
-      break;
-    case L_SYM:
-      if (record->event.pressed) {
-        if (IS_MODE_106()) {
-          register_delay_code(_SYM_106);
-          layer_on(_SYM_106);
-        }else{
-          register_delay_code(_SYM);
-          layer_on(_SYM);
-        }
-      }else{
-        layer_off(_SYM);
-        layer_off(_SYM_106);
-        if(delay_registered_layer == _SYM || delay_registered_layer == _SYM_106) {
-          unregister_delay_code();
-        }
-      }
-      return false;
-      break;
-    case L_NUM:
-      if (record->event.pressed) {
-        if (IS_MODE_106()) {
-          register_delay_code(_NUM_106);
-          layer_on(_NUM_106);
-        }else{
-          register_delay_code(_NUM);
-          layer_on(_NUM);
-        }
-      }else{
-        layer_off(_NUM);
-        layer_off(_NUM_106);
-        if(delay_registered_layer == _NUM || delay_registered_layer == _NUM_106) {
-          unregister_delay_code();
-        }
-      }
-      return false;
-      break;
-    case OPT_TAP_SP:
-      if (record->event.pressed) {
-        tapping_key = false;
-        if (IS_MODE_106()) {
-          register_delay_code(_OPT_106);
-          layer_on(_OPT_106);
-        }else{
-          register_delay_code(_OPT);
-          layer_on(_OPT);
-        }
-        tap_timer = timer_read();
-      }else{
-        layer_off(_OPT);
-        layer_off(_OPT_106);
-        if(tapping_key==false && timer_elapsed(tap_timer) < TAPPING_TERM){
-          SEND_STRING(" ");
-        }else if(delay_registered_layer == _OPT || delay_registered_layer == _OPT_106) {
-          unregister_delay_code();
-        }
-        tap_timer = 0;
-      }
-      return false;
-      break;
-   case EISU:
-      if (record->event.pressed) {
-        if(IS_MODE_MAC()){
-          register_code(KC_LNG2);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG2);
-      }
-      return false;
-      break;
-    case KANA:
-      if (record->event.pressed) {
-        if(IS_MODE_MAC()){
-          register_code(KC_LNG1);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG1);
-      }
-      return false;
-      break;
-    case DESKTOP:
-      if (record->event.pressed) {
-        if(IS_MODE_MAC()){
-          register_code(KC_F11);
-        }else{
-          SEND_STRING(SS_LGUI("d"));
-        }
-      } else {
-        unregister_code(KC_F11);
-      }
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGBAnimation = false;
-        }
-      #endif
-      break;
-    case RGBOFF:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_disable();
-        }
-      #endif
-      break;
-    case RGB1:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_RAINBOW_MOOD);
-        }
-      #endif
-      break;
-    case RGB2:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 1);
-        }
-      #endif
-      break;
-    case RGB3:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_KNIGHT);
-        }
-      #endif
-      break;
-    case MAC:
-      if (record->event.pressed) {
-        set_mac_mode(true);
-      }
-      break;
-    case WIN:
-      if (record->event.pressed) {
-        set_mac_mode(false);
-      }
-      break;
-    case TO_101:
-      if (record->event.pressed) {
-        if (IS_MODE_106()) {
-          set_single_persistent_default_layer(_BASE);
-        }
-      }
-      break;
-    case TO_106:
-      if (record->event.pressed) {
-        if (!IS_MODE_106()) {
-          set_single_persistent_default_layer(_BASE_106);
-        }
-      }
-      break;
-  }
-  return true;
-}
-
-// LED Effect
-#ifdef RGBLIGHT_ENABLE
-unsigned char rgb[7][5][3];
-void led_ripple_effect(char r, char g, char b) {
-    static int scan_count = -10;
-    static int keys[] = { 6, 6, 6, 7, 7 };
-    static int keys_sum[] = { 0, 6, 12, 18, 25 };
-
-    if (scan_count == -1) {
-      rgblight_enable_noeeprom();
-      rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-    } else if (scan_count >= 0 && scan_count < 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        // FIXME:
-
-        int y = scan_count;
-        int dist_y = abs(y - keybufs[i].row);
-        for (int x=0; x<keys[y]; x++) {
-          int dist = abs(x - keybufs[i].col) + dist_y;
-          if (dist <= keybufs[i].frame) {
-            int elevation = MAX(0, (8 + dist - keybufs[i].frame)) << 2;
-            if (elevation) {
-              if ((rgb[x][y][0] != 255) && r) { rgb[x][y][0] = MIN(255, elevation + rgb[x][y][0]); }
-              if ((rgb[x][y][1] != 255) && g) { rgb[x][y][1] = MIN(255, elevation + rgb[x][y][1]); }
-              if ((rgb[x][y][2] != 255) && b) { rgb[x][y][2] = MIN(255, elevation + rgb[x][y][2]); }
-            }
-          }
-        }
-      }
-    } else if (scan_count == 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        if (keybufs[i].frame < 18) {
-          keybufs[i].frame ++;
-        } else {
-          keybuf_begin ++;
-        }
-      }
-    } else if (scan_count >= 6 && scan_count <= 10) {
-      int y = scan_count - 6;
-      for (int x=0; x<keys[y]; x++) {
-        int at = keys_sum[y] + ((y & 1) ? x : (keys[y] - x - 1));
-        led[at].r = rgb[x][y][0];
-        led[at].g = rgb[x][y][1];
-        led[at].b = rgb[x][y][2];
-      }
-      rgblight_set();
-    } else if (scan_count == 11) {
-      memset(rgb, 0, sizeof(rgb));
-    }
-    scan_count++;
-    if (scan_count >= 12) { scan_count = 0; }
-}
-#endif
-
-layer_state_t layer_state_old;
-
-//runs every scan cycle (a lot)
-void matrix_scan_user(void) {
-  if(delay_key_stat && (timer_elapsed(key_timer) > DELAY_TIME)){
-    if (IS_MODE_106())
-      register_delay_code(_BASE_106);
-    else
-      register_delay_code(_BASE);
-    if(!delay_key_pressed){
-      unregister_delay_code();
-    }
-  }
-
-  if(layer_state_old != layer_state){
-    for (int8_t i = _LAYER_NUM-1; i > _BASE_106; i--) {
-      if(IS_LAYER_ON(i)){
-        register_delay_code(i);
-        break;
-      }
-    }
-    layer_state_old = layer_state;
-  }
-
-  #ifdef RGBLIGHT_ENABLE
-    if(!RGBAnimation){
-      if(IS_LAYER_ON(_FUNC)){
-        #ifdef RGBLED_BACK
-          led_ripple_effect(127,23,0);
-        #else
-          rgblight_setrgb(127,23,0);
-        #endif
-      }else if(IS_LAYER_ON(_NUM)||IS_LAYER_ON(_NUM_106)){
-        #ifdef RGBLED_BACK
-          led_ripple_effect(127,0,61);
-        #else
-          rgblight_setrgb(127,0,61);
-        #endif
-      }else if(IS_LAYER_ON(_SYM)||IS_LAYER_ON(_SYM_106)){
-        #ifdef RGBLED_BACK
-          led_ripple_effect(0,127,0);
-        #else
-          rgblight_setrgb(0,127,0);
-        #endif
-      }else if(IS_LAYER_ON(_OPT)||IS_LAYER_ON(_OPT_106)){
-        #ifdef RGBLED_BACK
-          led_ripple_effect(127,0,100);
-        #else
-          rgblight_setrgb(127,0,100);
-        #endif
-      } else {
-        #ifdef RGBLED_BACK
-          led_ripple_effect(0,112,127);
-        #else
-          rgblight_setrgb(0,112,127);
-        #endif
-      }
-    }
-  #endif
-}
-
-//OLED update loop
-#ifdef OLED_ENABLE
-
-// Render to OLED
-void render_status(void) {
-
-  // froggy logo
-  static char logo[4][17]=
-  {
-    {0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0},
-    {0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,0},
-    {0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,0},
-    {0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0},
-  };
-
-  static char modectl[4][2][4]=
-  {
-    {
-      {0x65,0x66,0x67,0}, //WIN
-      {0x85,0x86,0x87,0}, //WIN
-    },
-    {
-      {0xa5,0xa6,0xa7,0}, //US(101)
-      {0xc5,0xc6,0xc7,0}, //US(101)
-    },
-    {
-      {0xbd,0xbe,0xbf,0}, //MAC
-      {0xdd,0xde,0xdf,0}, //MAC
-    },
-    {
-      {0xba,0xbb,0xbc,0}, //JP(106)
-      {0xda,0xdb,0xdc,0}, //JP(106)
-    },
-  };
-
-  static char indctr[8][2][4]=
-  {
-    // white icon
-    {
-      {0x60,0x61,0x62,0}, //NUM
-      {0x63,0x64,0}       //FUNC
-    },
-    {
-      {0x80,0x81,0x82,0}, //NUM
-      {0x83,0x84,0}       //FUNC
-    },
-    {
-      {0xa0,0xa1,0xa2,0}, //CAPS
-      {0xa3,0xa4,0}       //SCLK
-    },
-    {
-      {0xc0,0xc1,0xc2,0}, //CAPS
-      {0xc3,0xc4,0}       //SCLK
-    },
-    // Black icon
-    {
-      {0x75,0x76,0x77,0}, //NUM
-      {0x78,0x79,0}       //FUNC
-    },
-    {
-      {0x95,0x96,0x97,0}, //NUM
-      {0x98,0x99,0}       //FUNC
-    },
-    {
-      {0xb5,0xb6,0xb7,0}, //CAPS
-      {0xb8,0xb9,0}       //SCLK
-    },
-    {
-     {0xd5,0xd6,0xd7,0}, //CAPS
-     {0xd8,0xd9,0}       //SCLK
-    },
-  };
-
-  int rown = 0;
-  int rowf = 0;
-  int rowa = 0;
-  int rows = 0;
-  int rowm = 0;
-  int rowj = 1;
-
-  //Set Indicator icon
-  led_t led_state = host_keyboard_led_state();
-  if (led_state.num_lock) { rown = 4; }
-  if (led_state.caps_lock) { rowa = 4; }
-  if (led_state.scroll_lock) { rows = 4; }
-  if (IS_LAYER_ON(_FUNC)) { rowf = 4; }
-
-  //Set Mode icon
-  if (IS_MODE_MAC()) { rowm = 2; }
-  if (IS_MODE_106()) { rowj = 3; }
-
-  oled_write(indctr[rown]  [0], false);
-  oled_write(indctr[rowf]  [1], false);
-  oled_write(modectl[rowm] [0], false);
-  oled_write(logo[0],           false);
-  oled_write(indctr[rown+1][0], false);
-  oled_write(indctr[rowf+1][1], false);
-  oled_write(modectl[rowm] [1], false);
-  oled_write(logo[1],           false);
-  oled_write(indctr[rowa+2][0], false);
-  oled_write(indctr[rows+2][1], false);
-  oled_write(modectl[rowj] [0], false);
-  oled_write(logo[2],           false);
-  oled_write(indctr[rowa+3][0], false);
-  oled_write(indctr[rows+3][1], false);
-  oled_write(modectl[rowj] [1], false);
-  oled_write(logo[3],           false);
-
-}
-
-bool oled_task_user(void) {
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  if (is_keyboard_master()) {
-    render_status();
-  }
-  return false;
-}
-
-#endif // end of OLED_ENABLE
-
-// Local Variables:
-// mode: c++
-// truncate-lines: t
-// indent-tabs-mode: nil
-// End:
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/readme.md b/keyboards/helix/rev2/keymaps/froggy_106/readme.md
deleted file mode 100644
index 911fb404321..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/readme.md
+++ /dev/null
@@ -1,85 +0,0 @@
-Froggy -one hand Helix- with 106-key mode
-======
-
-![Imgur](https://i.imgur.com/S1Dw3XW.jpg)
-
-## Features
-It is a one-handed keyboard with reference to Frogpad. Layout Designed by タクマ ([@humid](https://twitter.com/humid)).
-
-This keymap has 106-key mode, This is usable when keyboard setting of OS is OADG 106/109 keyboard.
-
-## Layout
-### Base
-```
-,-----------------------------------------.
-|  C+z |   ;  |   [  |   (  |   <  |   {  |
-|------+------+------+------+------+------|
-| KANA |   P  |   K  |   R  |   A  |   F  |
-|------+------+------+------+------+------|
-|  BS  |   D  |   T  |   H  |   E  |   O  |
-|------+------+------+------+------+------+------.
-| Shift|   Y  |   S  |   N  |   I  |   U  | Space|
-|------+------+------+------+------+------+------|
-| Ctrl |  Alt |  win |  Sym |  Num |  OPT |  Ent |
-`------------------------------------------------'
-```
-
-### Opt
-```
-,-----------------------------------------.
-|  Esc |   :  |   ]  |   )  |   >  |   }  |
-|------+------+------+------+------+------|
-| EISU |   J  |   M  |   B  |   '  |  Tab |
-|------+------+------+------+------+------|
-|   .  |   V  |   C  |   L  |   Z  |   Q  |
-|------+------+------+------+------+------+------.
-|      |   X  |   G  |   W  |   -  |  Del |  Esc |
-|------+------+------+------+------+------+------|
-|      |      |      |   ,  | DTOP |      |      |
-`------------------------------------------------'
-```
-
-### Num
-```
-,-----------------------------------------.
-|      |      | Func | home |  End |      |
-|------+------+------+------+------+------|
-|      |   *  |   7  |   8  |   9  |   -  |
-|------+------+------+------+------+------|
-|   .  |   /  |   4  |   5  |   6  |   +  |
-|------+------+------+------+------+------+------.
-|  LN  |   0  |   1  |   2  |   3  |C+S+F1|      |
-|------+------+------+------+------+------+------|
-|      |      |      |   ,  |      |      |      |
-`------------------------------------------------'
-```
-
-### Sym
-```
-,-----------------------------------------.
-|  Ins |  GRV |      |  PU  |  PD  |   ^  |
-|------+------+------+------+------+------|
-|      |   \  |   #  |   =  |   ?  |   %  |
-|------+------+------+------+------+------|
-|      |   $  |  upA |   @  |   !  |   |  |
-|------+------+------+------+------+------+------.
-|  CL  |  <-  |  dwA |  ->  |   _  |   &  |      |
-|------+------+------+------+------+------+------|
-|      |      |  PS  |      |   ~  |      |      |
- `-----------------------------------------------'
-```
-
-### Func
-```
-,-----------------------------------------.
-|RGBRST|  Hue | to101|  RST |  Mac |  Win |
-|------+------+------+------+------+------|
-| RGB1 | VAL+ |  F7  |  F8  |  F9  | to106|
-|------+------+------+------+------+------|
-| RGB2 | VAL- |  F4  |  F5  |  F6  |  F12 |
-|------+------+------+------+------+------+------.
-| RGB3 |  F10 |  F1  |  F2  |  F3  |  F11 |      |
-|------+------+------+------+------+------+------|
-|RGBOFF|      |      |      |      |      |      |
-`------------------------------------------------'
-```
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk b/keyboards/helix/rev2/keymaps/froggy_106/rules.mk
deleted file mode 100644
index b77e8af4f2a..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# QMK Standard Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-#   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
-#   See TOP/docs/config_options.md for more information.
-#
-LTO_ENABLE = yes  # if firmware size over limit, try this option
-SPLIT_KEYBOARD = yes
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-#  jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-OLED_ENABLE = yes           # OLED_ENABLE
-LOCAL_GLCDFONT = yes        # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-LED_BACK_ENABLE = yes       # LED backlight (Enable WS2812 RGB underlight.)
-LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes        # LED animations
-# IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-# OLED_ENABLE が yes のとき
-#   OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
-#   OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
-# If OLED_ENABLE is 'yes'
-#   If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
-#   If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
-OLED_SELECT = core
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/config.h b/keyboards/helix/rev2/keymaps/yshrsmz/config.h
deleted file mode 100644
index b8c1041cdc7..00000000000
--- a/keyboards/helix/rev2/keymaps/yshrsmz/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-// place overrides here
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_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
-#endif
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
deleted file mode 100644
index 6c060aadec9..00000000000
--- a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
+++ /dev/null
@@ -1,442 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <stdio.h>
-#include <string.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,
-    _COLEMAK,
-    _DVORAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  EISU,
-  KANA,
-  RGBRST
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   [  |   ]  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Esc  | Alt  | GUI  | EISU |Lower |Space |Space |Raise | KANA | Left | Down |  Up  |Right |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-      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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-      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_ENT ,
-      ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, EISU,    LOWER,   KC_SPC,  KC_SPC,  RAISE,   KANA,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Colemak
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |             |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   R  |   S  |   T  |   D  |             |   H  |   N  |   E  |   I  |   O  |  '   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   [  |   ]  |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Esc  | Alt  | GUI  | EISU |Lower |Space |Space |Raise | KANA | Left | Down |  Up  |Right |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT(
-      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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-      KC_LCTL, 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_LBRC, KC_RBRC, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-      ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, EISU,    LOWER,   KC_SPC,  KC_SPC,  RAISE,   KANA,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Dvorak
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   '  |   ,  |   .  |   P  |   Y  |             |   F  |   G  |   C  |   R  |   L  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   O  |   E  |   U  |   I  |             |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   [  |   ]  |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Esc  | Alt  | GUI  | EISU |Lower |Space |Space |Raise | KANA | Left | Down |  Up  |Right |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT(
-      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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
-      KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_LBRC, KC_RBRC, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-      ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, EISU,    LOWER,   KC_SPC,  KC_SPC,  RAISE,   KANA,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Lower
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |             |   ^  |   &  |   *  |   (  |   )  |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |             |   ^  |   &  |   *  |   (  |   )  |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |             |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  (   |   )  |  F12 |      |      | Home | End  |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT(
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-      _______, 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_LPRN, KC_RPRN, KC_F12,  _______, _______, KC_HOME, KC_END,  _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-      ),
-
-  /* Raise
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |             |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |      |      |  F12 |      |      |PageDn|PageUp|      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-      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_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_PGDN, KC_PGUP, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-      ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |             |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      | Reset|RGBRST|      |      |      |             |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |Aud on|Audoff| Mac  |             | Win  |Qwerty|Colemk|Dvorak|      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |RGB ON| HUE+ | SAT+ | VAL+ |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      | MODE | HUE- | SAT- | VAL- |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-  [_ADJUST] =  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,
-      _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL,
-      _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,                   AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD
-      )
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    #ifdef RGBLIGHT_ENABLE
-      //rgblight_mode(RGB_current_mode);
-    #endif
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-          //not sure how to have keyboard check mode and set it to a variable, so my work around
-          //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          #ifdef RGBLIGHT_ENABLE
-            //rgblight_mode(RGBLIGHT_MODE_SNAKE + 1);
-          #endif
-        }
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          //rgblight_mode(RGB_current_mode);   // revert RGB to initial mode prior to RGB mode change
-        #endif
-        TOG_STATUS = false;
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        //not sure how to have keyboard check mode and set it to a variable, so my work around
-        //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          #ifdef RGBLIGHT_ENABLE
-            //rgblight_mode(RGBLIGHT_MODE_SNAKE);
-          #endif
-        }
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          //rgblight_mode(RGB_current_mode);  // revert RGB to initial mode prior to RGB mode change
-        #endif
-        layer_off(_RAISE);
-        TOG_STATUS = false;
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      return false;
-      break;
-    case EISU:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG2);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG2);
-      }
-      return false;
-      break;
-    case KANA:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG1);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG1);
-      }
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_get_mode();
-    #endif
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_0;
-    } else {
-        return OLED_ROTATION_180;
-    }
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_LOWER (1<<_LOWER)
-#define L_RAISE (1<<_RAISE)
-#define L_ADJUST (1<<_ADJUST)
-#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
-
-static void render_logo(void) {
-
-  static const char helix_logo[] PROGMEM ={
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
-    0};
-  oled_write_P(helix_logo, false);
-  //matrix_write_P(&matrix, PSTR(" Split keyboard kit"));
-}
-
-static void render_rgbled_status(bool full) {
-#    ifdef RGBLIGHT_ENABLE
-  char buf[30];
-  if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
-      if (full) {
-          snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
-                   rgblight_get_mode(),
-                   rgblight_get_hue()/RGBLIGHT_HUE_STEP,
-                   rgblight_get_sat()/RGBLIGHT_SAT_STEP,
-                   rgblight_get_val()/RGBLIGHT_VAL_STEP);
-      } else {
-          snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
-      }
-      oled_write(buf, false);
-  }
-#    endif
-}
-
-static void render_layer_status(void) {
-  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-  char buf[10];
-  oled_write_P(PSTR("Layer: "), false);
-    switch (layer_state) {
-        case L_BASE:
-           oled_write_P(PSTR("Default"), false);
-           break;
-        case L_RAISE:
-           oled_write_P(PSTR("Raise"), false);
-           break;
-        case L_LOWER:
-           oled_write_P(PSTR("Lower"), false);
-           break;
-        case L_ADJUST:
-        case L_ADJUST_TRI:
-           oled_write_P(PSTR("Adjust"), false);
-           break;
-        default:
-           oled_write_P(PSTR("Undef-"), false);
-           snprintf(buf,sizeof(buf), "%ld", layer_state);
-           oled_write(buf, false);
-    }
-    oled_write_P(PSTR("\n"), false);
-}
-
-void render_status(void) {
-  // Render to mode icon
-  static const char os_logo[][2][3] PROGMEM  ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-  if (keymap_config.swap_lalt_lgui==false) {
-    oled_write_P(os_logo[0][0], false);
-    oled_write_P(PSTR("\n"), false);
-    oled_write_P(os_logo[0][1], false);
-  } else {
-    oled_write_P(os_logo[1][0], false);
-    oled_write_P(PSTR("\n"), false);
-    oled_write_P(os_logo[1][1], false);
-  }
-
-  oled_write_P(PSTR(" "), false);
-  render_layer_status();
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(led_state.num_lock ? PSTR("NUMLOCK") : PSTR("       "), false);
-  oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-  oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR("    "), false);
-  oled_write_P(PSTR("\n"), false);
-  render_rgbled_status(true);
-  oled_write_P(PSTR("\n"), false);
-}
-
-bool oled_task_user(void) {
-#    if DEBUG_TO_SCREEN
-    if (debug_enable) {
-        return;
-    }
-#    endif
-
-    if (is_keyboard_master()) {
-        render_status();
-    } else {
-        render_logo();
-        render_rgbled_status(false);
-        render_layer_status();
-    }
-    return false;
-}
-#endif // end of OLED_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk b/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk
deleted file mode 100644
index a2cf28f3bfa..00000000000
--- a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# QMK Standard Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-#   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
-#   See TOP/docs/config_options.md for more information.
-#
-LTO_ENABLE = no  # if firmware size over limit, try this option
-SPLIT_KEYBOARD = yes
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-#  jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-OLED_ENABLE = yes            # OLED_ENABLE
-# LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-# LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = no        # LED animations
-# IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-# OLED_ENABLE が yes のとき
-#   OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
-#   OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
-# If OLED_ENABLE is 'yes'
-#   If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
-#   If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
-OLED_SELECT = core
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index 000f99834a4..cc1a9252959 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -39,18 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Split hand configration */
 #define SPLIT_HAND_MATRIX_GRID D7,B2
-#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
-
-#ifdef RGB_MATRIX_ENABLE
-  #define RGB_MATRIX_LED_COUNT 50
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash.
-#endif
 
 /* Custom font */
 #define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index 79d4847c7b0..a1752d01236 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -12,7 +12,10 @@
     "driver": "ws2812",
     "sat_steps": 8,
     "val_steps": 8,
-    "speed_steps": 10
+    "speed_steps": 10,
+    "max_brightness": 150,
+    "split_count": [25, 25],
+    "sleep": true
   },
   "dip_switch": {
     "matrix_grid": [ [0,6], [1,6], [5,6], [6,6] ]
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index 44bbc5f194c..733f8b5a55f 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -39,18 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Split hand configration */
 #define SPLIT_HAND_MATRIX_GRID D7,B2
-#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
-
-#ifdef RGB_MATRIX_ENABLE
-  #define RGB_MATRIX_LED_COUNT 64
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash.
-#endif
 
 /* Custom font */
 #define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index 5eb5aee93fe..57d4e11dfe5 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -12,7 +12,7 @@
     "driver": "ws2812",
     "sat_steps": 8,
     "val_steps": 8,
-    "speed_steps": 10
+    "speed_steps": 10,
     "layout": [
         {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
         {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
@@ -80,7 +80,8 @@
         {"matrix": [9, 0], "x": 224, "y": 64, "flags": 4}
     ],
     "max_brightness": 128,
-    "split_count": [32, 32]
+    "split_count": [32, 32],
+    "sleep": true
   },
   "dip_switch": {
     "matrix_grid": [ [0,6], [1,6], [5,6], [6,6] ]
@@ -102,8 +103,7 @@
     "split_count": [32, 32],
     "animations": {
       "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "static_gradient": true
+      "rainbow_swirl": true
     }
   },
   "processor": "atmega32u4",
diff --git a/keyboards/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h
index 7d38c7392c0..e069609fad2 100644
--- a/keyboards/hfdkb/ac001/config.h
+++ b/keyboards/hfdkb/ac001/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* ws2812 RGB LED */
-#define RGB_MATRIX_LED_COUNT 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -33,60 +30,4 @@
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
-
-// 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
-//#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 USB_SUSPEND_WAKEUP_DELAY 1500              //Wakeup host USB
-
diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json
index 3f896d59881..4c45251504b 100644
--- a/keyboards/hfdkb/ac001/info.json
+++ b/keyboards/hfdkb/ac001/info.json
@@ -10,7 +10,16 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "rainbow_moving_chevron": true,
+            "multisplash": true
+        },
+        "driver": "ws2812",
+        "react_on_keyup": true,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A5", "A6", "A7", "C4", "C5"],
diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/README.md b/keyboards/hhkb/ansi/keymaps/blakedietz/README.md
deleted file mode 100644
index 4dff47a6e88..00000000000
--- a/keyboards/hhkb/ansi/keymaps/blakedietz/README.md
+++ /dev/null
@@ -1,134 +0,0 @@
-# QMK HHKB Keymap: blakedietz
-
-<!-- TODO: Link to Hasu's geekhack page from his name -->
-<!-- TODO: Link to the ergodox ez layout in this repository -->
-
-This is my (Blake Dietz's) own take on a QMK keymap for the Happy Hacking Keyboard Pro 2 alternate controller made by Hasu. A lot of the
- functionality was inspired by the ergodox ez default layout. 
-
-## Dependencies
-
-### macOS
-
-```bash
-brew tap osx-cross/avr
-brew install avr-libc
-brew install dfu-programmer
-```
-
-### Windows/Linux
-
-[Build Environment Setup](https://github.com/jackhumbert/qmk_firmware/wiki#build-environment-setup)
-
-## Flashing
-
-You will need to make sure that you have something that you can use to press the button on the alternate controller in
-order to put it into boot mode.
-
-From the hhkb directory run the following:
-
-```bash
-make clean
-make hhkb:blakedietz:dfu
-```
-
-Press the button on the alternate controller to put the board into boot mode.
-
-You'll see an output similar to the following:
-
-```bash
-make hhkb:blakedietz:dfu
-
-Making hhkb with keymap blakedietz and target dfu
-
-avr-gcc (GCC) 6.2.0
-Copyright (C) 2016 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-Size before:
-   text    data     bss     dec     hex filename
-      0   22162       0   22162    5692 hhkb_blakedietz.hex
-
-Compiling: keyboards/hhkb/keymaps/blakedietz/keymap.c                                               [OK]
-Compiling: ./tmk_core/common/command.c                                                              [OK]
-Linking: .build/hhkb_blakedietz.elf                                                                 [OK]
-Creating load file for Flash: .build/hhkb_blakedietz.hex                                            [OK]
-
-Size after:
-   text    data     bss     dec     hex filename
-      0   22162       0   22162    5692 hhkb_blakedietz.hex
-
-dfu-programmer: no device present.
-Error: Bootloader not found. Trying again in 5s.
-dfu-programmer: no device present.
-Error: Bootloader not found. Trying again in 5s.
-Bootloader Version: 0x00 (0)
-Erasing flash...  Success
-Checking memory from 0x0 to 0x6FFF...  Empty.
-Checking memory from 0x0 to 0x56FF...  Empty.
-0%                            100%  Programming 0x5700 bytes...
-[>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-0%                            100%  Reading 0x7000 bytes...
-[>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-Validating...  Success
-0x5700 bytes written into 0x7000 bytes memory (77.68%).
-```
-
-### Layers 
-
-#### Default
-
-##### A more "standard" layout
-
-This layout places tilde in the standard location. Backspace is moved to the two upper-right-most keys and pipe
-is put back where it belongs (where backspace is on the default hhkb2 keymapping).
-
-##### Hyper key
-
-<!-- TODO: Link to Brett's article about the thyper key -->
-
-This layout throws out the HHKB's control key in favor of a Hyper key. Ctrl is instead placed on the z and / keys and
-can be activated with a long press. I find that this is far more ergonomic as it's less of a reach and it allows you to
-alternate to either hand when you need to use `ctrl` as a modifier.
-
-The hyper key can be held for hyper and tapped for escape. You'll find that this is quite nice for vim.
-
-Enter is also a hyper key. This allows for symmetry between control and enter. Hold for hyper, tap for enter.
-
-##### Tap to Hold
-
-###### CTL, ALT, GUI
-
-Since the HHKB does not have three super/meta keys, these keys were moved to pinky, ring and middle finger for ctrl, alt/
- option and super respectively. This is closer to home row which I've found causes less strain.
- 
-The Alt and Super keys are instead replaced with layer toggle keys to go to dev and mouse mode respectively.
-
-###### Space
-
-Hold space to switch to dev mode. This will put you on a layer to have vim like arrow functionality on h,j,k and l. Use
-this in editors that don't have vim keybindings.
-
-### Dev 
-
-The Dev layer can be activated holding space or hitting the HHKB's Alt key. This will put you in a mode
-where all function keys are available and left, right, up and down are mapped to their vim equivalents. The function
- keys are mapped in such a way that you can use them for debugging. Typically I map debugging functions in all IDEs to
- the following for a seamless debugging experience (e.g. jumping from Intellij to chrome dev tools and back):
- 
- - f1 -> step over
- - f2 -> step into
- - f3 -> step out
- - f4 -> continue
- - f5 -> set break point on current line
-
-### Media
-
-The media layer can be activated by pressing and holding the semi-colon. I've also placed the play and pause key on the
-apostrophe key in the media layer. This allows you to easily roll your pinky from the media toggle (semi-colon) to the
-play/pause key in one fluid motion.
-
-I've also tried to logically map next/previous track along with volume up/down vim behavior. In vim since middle finger
-goes up on k and index finger goes down on j, next/prev track is k/j respectively. ,/m changes volume up/down
-respectively while toggled to the media layer.
diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
deleted file mode 100644
index 8d281f2604b..00000000000
--- a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Based off of this section:
-// https://github.com/qmk/qmk_firmware/blob/master/doc/BUILD_GUIDE.md#the-configh-file
-#ifndef CONFIG_BLAKEDIETZ_H
-#define CONFIG_BLAKEDIETZ_H
-
-// Bring in original defaults
-#include "../../config.h"
-
-// Define mousekey settings
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_MAX_SPEED      2
-#define MOUSEKEY_TIME_TO_MAX    5
-#define MOUSEKEY_WHEEL_DELAY    0
-
-// Set up tapdance functionality
-//#define TAPPING_TOGGLE  1
-// TAPPING_TERM is set in config.h this defaults to 200
-
-#endif
diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c b/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c
deleted file mode 100644
index 370bc8774ea..00000000000
--- a/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Layer names
-#define BASE 0
-#define DEV 1
-#define MOUSE 2
-#define MEDIA 3
-
-// Required for leader function. Measured in ms
-// #define LEADER_TIMEOUT 300
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* BASE Level: Default Layer
-     |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----|
-     |     `     |  1    | 2      | 3     |   4   |   5   |   6   | 7     | 8     | 9     | 0     | -     | =     | Bksp |Lead|
-     |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----|
-     |    Tab    |  Q    | W      | E     |   R   |   T   |   Y   |  U    | I     | O     | P     | [     | ]     |      | \  |
-     |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----|
-     | Esc/Hyper |   A   | S      | D     |   F   |   G   |   H   |  J    | K     | L     |;/Media| '     | Enter |      |    |
-     |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----|
-     |   Shift   | Z/Ctl | X/Alt  | C/Gui |   V   |   B   |   N   |  M    | ,/Gui | ./Alt | //Ctl | Shift | Dev   |      |    |
-     |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----|
-     TODO: Maybe add a photoshop layer for when I need to hold spacebar down. Maybe just make it a layer that you
-                 |------+------+-----------------------+------+------|
-                 | Dev  |Mouse | ******* Space ******* | Dev  |Mouse |
-                 |------+------+-----------------------+------+------|
-    */
-
-    [BASE] = LAYOUT( //  default layer
-        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, QK_LEAD,
-        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,
-        ALL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(MEDIA, KC_SCLN), KC_QUOT, ALL_T(KC_ENT),
-        KC_LSFT, CTL_T(KC_Z), ALT_T(KC_X), GUI_T(KC_C), KC_V, KC_B, KC_N, KC_M, GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_SLSH), KC_RSFT, TG(DEV),
-        TG(DEV), TG(MOUSE), LT(DEV, KC_SPC), TG(MOUSE), TG(DEV)),
-
-    /* Layer DEV: DEV mode (DEV Fn)
-      TODO: Add a cmd/tab function to the developer layer for quick switching between different applications when debugging
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |        |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |        |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      | F1  | F2  | F3  | F4 | F5 | Left   |  Down          | Up           | Right     |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |        |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-     */
-
-    [DEV] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(DEV),
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    /* Layer MOUSE: MOUSE mode (MOUSE Fn)
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |        |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |        |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |        |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |        |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-     */
-
-    [MOUSE] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(DEV),
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    /* Layer MEDIA: mode (Hold Semi-colon)
-      |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |    |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |    |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |    |  Previous      | Next         |           |  Play/Pause |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |     |     |     |    |    |    |  Volume Down   | Volume Up    | Mute      |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-
-     */
-
-    [MEDIA] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_MUTE, KC_TRNS, KC_MPLY, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, TG(DEV),
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/rules.mk b/keyboards/hhkb/ansi/keymaps/blakedietz/rules.mk
deleted file mode 100644
index 7d97e7a5240..00000000000
--- a/keyboards/hhkb/ansi/keymaps/blakedietz/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TAP_DANCE_ENABLE = no
-UNICODE_ENABLE   = no
-LEADER_ENABLE = yes
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/README.md b/keyboards/hhkb/ansi/keymaps/cinaeco/README.md
deleted file mode 100644
index c1c48e60937..00000000000
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# QMK Keyboard Firmware for HHKB
-
-## Modifications
-
-### HHKB Fn Layer
-
-Added some Media keys.
-
-### Utility Layer (SpaceFN)
-
-Hold `Space` for:
-
-- Vi-style direction keys.
-- WASD-style mouse keys.
-- Dynamic macro playback on `1` and `2`.
-- Qwerty/Colemak/Dvorak layout selection on `-`, `=` and `\ `
-
-### Dynamic Macros
-
-Hold `q` and press:
-
-- `1` or `2` to record macro 1 or 2.
-- `s` to stop recording.
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/config.h b/keyboards/hhkb/ansi/keymaps/cinaeco/config.h
deleted file mode 100644
index ed660722c21..00000000000
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#undef MANUFACTURER
-#undef PRODUCT
-#define MANUFACTURER    "QMK"
-#define PRODUCT         "HHKB QMK cinaeco"
-
-// Increase "Tap" detection window. Avoid missing 'q' or 'z' when typing slowly.
-#undef TAPPING_TERM
-#define TAPPING_TERM 230
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
deleted file mode 100644
index 5ad8bee6412..00000000000
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * cinaeco's HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-// Layers.
-#define QWER 0
-#define COLE 1
-#define DVOR 2
-#define HHKB 3
-#define UTIL 4
-#define MREC 5
-
-// Easier-to-read Layer Arrays.
-#define ____ KC_TRNS
-
-enum hhkb_keycodes
-{
-    DYNAMIC_MACRO_RANGE = SAFE_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* QWER Layer: Qwerty Default
-     *
-     * ,--------------------------------------------------------------.
-     * |Esc|    1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|
-     * |--------------------------------------------------------------|
-     * |Tab  |Q/MREC|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Backs|
-     * |--------------------------------------------------------------|
-     * |Ctrl  |     A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Ent/Ctrl|
-     * |--------------------------------------------------------------|
-     * |Shift   |     Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn0|
-     * `--------------------------------------------------------------'
-     *       |Alt|Gui  |       Space/UTIL      |Gui  |Alt|
-     *       `-------------------------------------------'
-     *
-     */
-
-    [QWER] = LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
-        KC_TAB, LT(MREC, 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,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, CTL_T(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, MO(HHKB),
-        KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT),
-
-    /* COLE Layer: Colemak
-     *
-     * ,--------------------------------------------------------------.
-     * |Esc|    1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|
-     * |--------------------------------------------------------------|
-     * |Tab  |Q/MREC|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|Backs|
-     * |--------------------------------------------------------------|
-     * |Ctrl  |     A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '|Ent/Ctrl|
-     * |--------------------------------------------------------------|
-     * |Shift   |     Z|  X|  C|  V|  K|  B|  M|  ,|  .|  /|Shift |Fn0|
-     * `--------------------------------------------------------------'
-     *       |Alt|Gui  |       Space/UTIL      |Gui  |Alt|
-     *       `-------------------------------------------'
-     *
-     */
-
-    [COLE] = LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
-        KC_TAB, LT(MREC, KC_Q), KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,
-        KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, CTL_T(KC_ENT),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_K, KC_B, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(HHKB),
-        KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT),
-
-    /* DVOR Layer: Dvorak
-     *
-     * ,--------------------------------------------------------------.
-     * |Esc|    1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]|  \|  `|
-     * |--------------------------------------------------------------|
-     * |Tab  |'/MREC|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|Backs|
-     * |--------------------------------------------------------------|
-     * |Ctrl  |     A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -|Ent/Ctrl|
-     * |--------------------------------------------------------------|
-     * |Shift   |     ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z|Shift |Fn0|
-     * `--------------------------------------------------------------'
-     *       |Alt|Gui  |       Space/UTIL      |Gui  |Alt|
-     *       `-------------------------------------------'
-     *
-     */
-
-    [DVOR] = LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
-        KC_TAB, LT(MREC, KC_QUOT), KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC,
-        KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, CTL_T(KC_ENT),
-        KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, MO(HHKB),
-        KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT),
-
-    /* HHKB Layer: HHKB mode (HHKB Fn)
-     *
-     * ,-----------------------------------------------------------.
-     * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
-     * |-----------------------------------------------------------|
-     * |Caps |PLA|PRV|NXT|   |   |   |   |Psc|Slk|Pus|Up |   |Backs|
-     * |-----------------------------------------------------------|
-     * |      |VoD|VoU|Mut|Ejc|   |  *|  /|Hom|PgU|Lef|Rig|Enter   |
-     * |-----------------------------------------------------------|
-     * |        |   |   |   |   |   |  +|  -|End|PgD|Dow|      |   |
-     * `-----------------------------------------------------------'
-     *       |   |     |                       |STOP |   |
-     *       `-------------------------------------------'
-     */
-
-    [HHKB] = LAYOUT(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_MPLY, KC_MPRV, KC_MNXT, ____, ____, ____, ____, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, ____, KC_BSPC,
-        ____, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, ____, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        ____, ____, ____, ____, ____, ____, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, ____, ____,
-        ____, ____, ____, KC_MSTP, ____),
-
-    /* UTIL Layer: Extra utilities
-     *
-     * ,-------------------------------------------------------------.
-     * |DFU|PLY1|PLY2|   |   |   |   |   |   |   |   |QWE|COL|DVO|DBG|
-     * |-------------------------------------------------------------|
-     * |     |MLB |M-Up|MRB|MwU|   |Hom|PgD|PgU|End|   |   |   |     |
-     * |-------------------------------------------------------------|
-     * |      |M-Lt|M-Dn|M-R|MwD|   |LEF|DOW|UP |RIG|   |   |        |
-     * |-------------------------------------------------------------|
-     * |        |    |    |   |   |SPC|   |   |   |   |   |      |   |
-     * `-------------------------------------------------------------'
-     *       |   |     |                       |     |   |
-     *       `-------------------------------------------'
-     *
-     */
-
-    [UTIL] = LAYOUT(
-        QK_BOOT, DM_PLY1, DM_PLY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DB_TOGG,
-        ____, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, ____, KC_HOME, KC_PGDN, KC_PGUP, KC_END, ____, ____, ____, ____,
-        ____, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ____, ____, ____,
-        ____, ____, ____, ____, ____, KC_SPC, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, ____, ____, ____),
-
-    /* MREC Layer: Record macros with `q`
-     *
-     * ,-------------------------------------------------------------.
-     * |   |REC1|REC2|   |   |   |   |   |   |   |   |   |   |   |   |
-     * |-------------------------------------------------------------|
-     * |     |    |    |   |   |   |   |   |   |   |   |   |   |     |
-     * |-------------------------------------------------------------|
-     * |      |    |RSTP|   |   |   |   |   |   |   |   |   |        |
-     * |-------------------------------------------------------------|
-     * |        |    |    |   |   |   |   |   |   |   |   |      |   |
-     * `-------------------------------------------------------------'
-     *       |   |     |                       |     |   |
-     *       `-------------------------------------------'
-     *
-     */
-
-    [MREC] = LAYOUT(
-        ____, DM_REC1, DM_REC2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, DM_RSTP, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, ____, ____, ____)
-
-};
-
-// For Dynamic Macros.
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    if (!process_record_dynamic_macro(keycode, record))
-    {
-        return false;
-    }
-    return true;
-}
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk b/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk
deleted file mode 100644
index 4e4deffa122..00000000000
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# cinaeco's HHKB firmware
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c b/keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c
deleted file mode 100644
index 3a8d2ed2a39..00000000000
--- a/keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * dbroqua HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-enum planck_layers {
-  _DEFAULT,
-  _ALTERNATE,
-  _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* BASE layer: Default Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-     * |-----------------------------------------------------------------------------------------+
-     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | Shift     | fn  |
-     * +-----------------------------------------------------------------------------------------+
-     *         | Alt |  Gui   |               Space               | Gui   |RCtrl|
-     *         `----------------------------------------------------------------´
-     */
-    [_DEFAULT] = LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC,
-        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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN),
-        KC_LALT, KC_LGUI, /*        */ KC_SPC, KC_RGUI, KC_RCTL),
-    /* Alternamte layer: swap alt/gui
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-     * |-----------------------------------------------------------------------------------------+
-     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | Shift     | fn  |
-     * +-----------------------------------------------------------------------------------------+
-     *         | Gui |  Alt   |               Space               | AltGr |RCtrl|
-     *         `----------------------------------------------------------------´
-     */
-    [_ALTERNATE] = LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC,
-        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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN),
-        KC_LGUI, KC_LALT, /*        */ KC_SPC, KC_RALT, KC_RCTL),
-
-    /* FN Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Pwr |  F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F0  | F11 | F12 | Ins | Del|
-     * |-----------------------------------------------------------------------------------------+
-     * | Caps   |     |     |     |     |     |     |     |PrtSc| Slck| Paus|  Up |     |        |
-     * |-----------------------------------------------------------------------------------------+
-     * |         | Vol-| Vol+| Mute|Eject|     | *   | /   | Home| PgUp| Left |Right|            |
-     * |-----------------------------------------------------------------------------------------+
-     * |           | Prev| Play| Next|     |     | +   | -   | End |PgDwn| Down|           |     |
-     * +-----------------------------------------------------------------------------------------+
-     *         |     |        |            Adjust                 | Stop  |     |
-     *         `----------------------------------------------------------------´
-     */
-    [_FN] = LAYOUT(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
-        KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
-        DF(_DEFAULT), DF(_ALTERNATE), KC_TRNS, KC_MSTP, KC_TRNS)};
diff --git a/keyboards/hhkb/ansi/keymaps/dbroqua/readme.md b/keyboards/hhkb/ansi/keymaps/dbroqua/readme.md
deleted file mode 100644
index 3b8950fee0b..00000000000
--- a/keyboards/hhkb/ansi/keymaps/dbroqua/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Dbroqua Layout
-
-*   Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/78eaf35e80bb714eea80cb4049dedb01
-
-## Switch layout
-
-Default bottom layer:
-
-* LALT / LGUI / SPACE / RGUI / RCTRL
-
-Alternate bottom layer:
-
-* LGUI / LALT / SPACE / RALT / RCTRL
-
-To switch from default to alternate (or alternate to default) simple press FN + (LALT/LGUI).
-
-
-## Media keys :
-
-* fn + a = vol_dn
-* fn + s = vol_up
-* fn + d = mute
-* fn + z = previous song
-* fn + x = play/pause
-* fn + c = next song
-* fn + (RGUI/RALT) = stop
diff --git a/keyboards/hhkb/ansi/keymaps/eric/keymap.c b/keyboards/hhkb/ansi/keymaps/eric/keymap.c
deleted file mode 100644
index 2cfc9785bbf..00000000000
--- a/keyboards/hhkb/ansi/keymaps/eric/keymap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * default HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-#define BASE 0
-#define HHKB 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* BASE Level: Default Layer
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Esc   | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -     | =   | \     | ` |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Tab   | Q | W | E | R | T | Y | U | I | O | P | [     | ]   | Backs |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Cont  | A | S | D | F | G | H | J | K | L | ; | '     | Ent |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Fn0 |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-            |------+------+-----------------------+------+------|
-            | LAlt | LGUI | ******* Space ******* | RGUI | RAlt |
-            |------+------+-----------------------+------+------|
-    */
-
-    [BASE] = LAYOUT( //  default layer
-        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_BSLS, 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_BSPC,
-        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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(HHKB),
-        KC_LALT, KC_LGUI, /*        */ KC_SPC, KC_RGUI, KC_RALT),
-
-    /* Layer HHKB: HHKB mode (HHKB Fn)
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Caps  | F1  | F2  | F3  | F4 | F5 | F6 | F7 | F8  | F9  | F10 | F11 | F12   | Ins  | Del |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      | PgU |  Up | PgD | Hm |  & |  ~ |    |     |     | Psc | Up  |  Del  | Backs |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      | Lef | Dow | Rig | En |  * |    |    | PgU | Hom | Lef | Rig | Enter |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      |  _  |  +  |  (  |  ) |  | |    |    | PgD | End | Dow |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-
-     */
-
-    [HHKB] = LAYOUT(
-        KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_AMPR, KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_DEL, KC_BSPC,
-        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_ASTR, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_LEFT, KC_RGHT, KC_TRNS,
-        KC_TRNS, KC_UNDS, KC_PLUS, KC_LPRN, KC_RPRN, KC_PIPE, KC_TRNS, KC_TRNS, KC_PGDN, KC_END, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
diff --git a/keyboards/hhkb/ansi/keymaps/krusli/config.h b/keyboards/hhkb/ansi/keymaps/krusli/config.h
deleted file mode 100644
index af2fb9d8a52..00000000000
--- a/keyboards/hhkb/ansi/keymaps/krusli/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/hhkb/ansi/keymaps/krusli/keymap.c b/keyboards/hhkb/ansi/keymaps/krusli/keymap.c
deleted file mode 100644
index 461a1b73b9a..00000000000
--- a/keyboards/hhkb/ansi/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * default HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-#define BASE 0
-#define HHKB 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* BASE Level: Default Layer
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Esc   | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -     | =   | \     | ` |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Tab   | Q | W | E | R | T | Y | U | I | O | P | [     | ]   | Backs |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Cont  | A | S | D | F | G | H | J | K | L | ; | '     | Ent |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Fn0 |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-
-            |------+------+-----------------------+------+------|
-            | LAlt | LGUI | ******* Space ******* | RGUI | RAlt |
-            |------+------+-----------------------+------+------|
-    */
-
-    [BASE] = LAYOUT( //  default layer
-        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_BSLS, 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_BSPC,
-        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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(HHKB),
-        KC_LALT, KC_LGUI, /*        */ KC_SPC, KC_RGUI, KC_RALT),
-
-    /* Layer HHKB: HHKB mode (HHKB Fn)
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Pwr  | F1  | F2  | F3  | F4 | F5 | F6 | F7 | F8  | F9  | F10 | F11 | F12   | Ins   | Del |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Caps |     |     |     |    |    |    |    | Psc | Slk | Pus | Up  |       | Backs |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      | VoD | VoU | Mut |    |    | *  | /  | Hom | PgU | Lef | Rig | Enter |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      |     |     |     |    |    | +  | -  | End | PgD | Dow |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-
-     */
-
-    [HHKB] = LAYOUT(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
diff --git a/keyboards/hhkb/ansi/keymaps/lxol/keymap.c b/keyboards/hhkb/ansi/keymaps/lxol/keymap.c
deleted file mode 100644
index 25e75c8f991..00000000000
--- a/keyboards/hhkb/ansi/keymaps/lxol/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * lxol HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-#define BASE 0
-#define WIN 1
-#define HHKB 2
-#define RGUILEV 3
-#define LGUILEV 4
-#define RALTLEV 5
-#define LALTLEV 6
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Layer 0: Default Layer
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K | L | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | RGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [BASE] = LAYOUT( // layer 0 : default
-
-        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_BSLS, 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_BSPC,
-        KC_LCTL, LT(LALTLEV, KC_A), LT(LGUILEV, KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, LT(RGUILEV, KC_L), LT(RALTLEV, KC_SCLN), KC_QUOT, MT(MOD_RCTL, 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, MO(HHKB),
-        KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT),
-
-    /* Layer 1: HHKB mode (HHKB Fn)
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Pwr  | F1  | F2  | F3  | F4 | F5 | F6 | F7 | F8  | F9  | F10 | F11 | F12   | Ins   | Del |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Caps |     |     |     |    |    |    |    | Psc | Slk | Pus | Up  |       | Backs |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      | VoD | VoU | Mut |    |    | *  | /  | Hom | PgU | Lef | Rig | Enter |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      |     |     |     |    |    | +  | -  | End | PgD | Dow |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-
-                      |---+---+---+---+---|
-                      |   |   |   |   |   |
-                      |---+---+---+---+---|
-     */
-
-    [HHKB] = LAYOUT(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    /* Layer LGUI: All keys with RGUI modifier
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K |   | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | RGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [RGUILEV] = LAYOUT( // Right GUI layer  by KC_L
-
-        RGUI(KC_ESC), RGUI(KC_1), RGUI(KC_2), RGUI(KC_3), RGUI(KC_4), RGUI(KC_5), RGUI(KC_6), RGUI(KC_7), RGUI(KC_8), RGUI(KC_9), RGUI(KC_0), RGUI(KC_MINS), RGUI(KC_EQL), RGUI(KC_BSLS), RGUI(KC_GRV),
-        RGUI(KC_TAB), RGUI(KC_Q), RGUI(KC_W), RGUI(KC_E), RGUI(KC_R), RGUI(KC_T), RGUI(KC_Y), RGUI(KC_U), RGUI(KC_I), RGUI(KC_O), RGUI(KC_P), RGUI(KC_LBRC), RGUI(KC_RBRC), RGUI(KC_BSPC),
-        RGUI(KC_LCTL), RGUI(KC_A), RGUI(KC_S), RGUI(KC_D), RGUI(KC_F), RGUI(KC_G), RGUI(KC_H), RGUI(KC_J), RGUI(KC_K), KC_TRNS, KC_TRNS, RGUI(KC_QUOT), MT(MOD_RCTL, KC_ENT),
-        RGUI(KC_LSFT), RGUI(KC_Z), RGUI(KC_X), RGUI(KC_C), RGUI(KC_V), RGUI(KC_B), RGUI(KC_N), RGUI(KC_M), RGUI(KC_COMM), RGUI(KC_DOT), RGUI(KC_SLSH), RGUI(KC_RSFT), KC_TRNS,
-        KC_LALT, KC_LGUI, RGUI(KC_SPC), KC_RGUI, KC_RALT),
-
-    /* Layer LGUI: All keys with LGUI modifier
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K |   | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | LGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [LGUILEV] = LAYOUT( // Right GUI layer  by KC_L
-
-        LGUI(KC_ESC), LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), LGUI(KC_MINS), LGUI(KC_EQL), LGUI(KC_BSLS), LGUI(KC_GRV),
-        LGUI(KC_TAB), LGUI(KC_Q), LGUI(KC_W), LGUI(KC_E), LGUI(KC_R), LGUI(KC_T), LGUI(KC_Y), LGUI(KC_U), LGUI(KC_I), LGUI(KC_O), LGUI(KC_P), LGUI(KC_LBRC), LGUI(KC_RBRC), LGUI(KC_BSPC),
-        LGUI(KC_LCTL), KC_TRNS, KC_TRNS, LGUI(KC_D), LGUI(KC_F), LGUI(KC_G), LGUI(KC_H), LGUI(KC_J), LGUI(KC_K), LGUI(KC_L), LGUI(KC_SCLN), LGUI(KC_QUOT), MT(MOD_RCTL, KC_ENT),
-        KC_LSFT, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), LGUI(KC_B), LGUI(KC_N), LGUI(KC_M), LGUI(KC_COMM), LGUI(KC_DOT), LGUI(KC_SLSH), KC_RSFT, KC_TRNS,
-        KC_LALT, KC_LGUI, LGUI(KC_SPC), KC_LGUI, KC_RALT),
-
-    /* Layer LALT: All keys with RALT modifier
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K |   | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | RGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [RALTLEV] = LAYOUT( // Right ALT layer  by KC_L
-
-        RALT(KC_ESC), RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5), RALT(KC_6), RALT(KC_7), RALT(KC_8), RALT(KC_9), RALT(KC_0), RALT(KC_MINS), RALT(KC_EQL), RALT(KC_BSLS), RALT(KC_GRV),
-        RALT(KC_TAB), RALT(KC_Q), RALT(KC_W), RALT(KC_E), RALT(KC_R), RALT(KC_T), RALT(KC_Y), RALT(KC_U), RALT(KC_I), RALT(KC_O), RALT(KC_P), RALT(KC_LBRC), RALT(KC_RBRC), RALT(KC_BSPC),
-        RALT(KC_LCTL), RALT(KC_A), RALT(KC_S), RALT(KC_D), RALT(KC_F), RALT(KC_G), RALT(KC_H), RALT(KC_J), RALT(KC_K), KC_TRNS, KC_TRNS, RALT(KC_QUOT), MT(MOD_RCTL, KC_ENT),
-        RALT(KC_LSFT), RALT(KC_Z), RALT(KC_X), RALT(KC_C), RALT(KC_V), RALT(KC_B), RALT(KC_N), RALT(KC_M), RALT(KC_COMM), RALT(KC_DOT), RALT(KC_SLSH), RALT(KC_RSFT), KC_TRNS,
-        KC_LALT, KC_LGUI, RALT(KC_SPC), KC_RGUI, KC_RALT),
-
-    /* Layer LALT: All keys with LALT modifier
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K |   | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | LGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [LALTLEV] = LAYOUT( // Right ALT layer  by KC_L
-
-        LALT(KC_ESC), LALT(KC_1), LALT(KC_2), LALT(KC_3), LALT(KC_4), LALT(KC_5), LALT(KC_6), LALT(KC_7), LALT(KC_8), LALT(KC_9), LALT(KC_0), LALT(KC_MINS), LALT(KC_EQL), LALT(KC_BSLS), LALT(KC_GRV),
-        LALT(KC_TAB), LALT(KC_Q), LALT(KC_W), LALT(KC_E), LALT(KC_R), LALT(KC_T), LALT(KC_Y), LALT(KC_U), LALT(KC_I), LALT(KC_O), LALT(KC_P), LALT(KC_LBRC), LALT(KC_RBRC), LALT(KC_BSPC),
-        LALT(KC_LCTL), KC_TRNS, KC_TRNS, LALT(KC_D), LALT(KC_F), LALT(KC_G), LALT(KC_H), LALT(KC_J), LALT(KC_K), LALT(KC_L), LALT(KC_SCLN), LALT(KC_QUOT), MT(MOD_RCTL, KC_ENT),
-        KC_LSFT, LALT(KC_Z), LALT(KC_X), LALT(KC_C), LALT(KC_V), LALT(KC_B), LALT(KC_N), LALT(KC_M), LALT(KC_COMM), LALT(KC_DOT), LALT(KC_SLSH), KC_RSFT, KC_TRNS,
-        KC_LALT, KC_LGUI, LALT(KC_SPC), KC_LGUI, KC_RALT),
-
-    /* Layer WIN: Win layer
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K | L | ; | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LGui | LAlt | Space | RGui | Ralt |
-                 |------+------+-------+------+------|
-    */
-
-    [WIN] = LAYOUT( // BASE level with swapped GUI/ALT
-
-        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_BSLS, 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_BSPC,
-        KC_LCTL, LT(LGUILEV, KC_A), LT(LALTLEV, KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, LT(RALTLEV, KC_L), LT(RGUILEV, KC_SCLN), KC_QUOT, MT(MOD_RCTL, 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, MO(HHKB),
-        KC_RGUI, KC_RALT, KC_SPC, KC_RALT, KC_RGUI)};
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/config.h b/keyboards/hhkb/ansi/keymaps/mjt/config.h
deleted file mode 100644
index 41d1557c6f1..00000000000
--- a/keyboards/hhkb/ansi/keymaps/mjt/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define USB_MAX_POWER_CONSUMPTION 50
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c b/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
deleted file mode 100644
index 54a041b93c8..00000000000
--- a/keyboards/hhkb/ansi/keymaps/mjt/keymap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * default HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-#define BASE 0
-#define HHKB 1
-#define FUNK 2
-#define DYN 3
-#define CTL_ESC CTL_T(KC_ESC)
-#define MACSLEEP LCTL(LSFT(KC_PWR))
-
-enum hhkb_keycodes
-{
-    QWERTY = SAFE_RANGE,
-    DYNKEY,
-    DYNAMIC_MACRO_RANGE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* BASE Level: Default Layer
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Esc   | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -     | =   | \     | ` |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Tab   | Q | W | E | R | T | Y | U | I | O | P | [     | ]   | Backs |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Cont  | A | S | D | F | G | H | J | K | L | ; | '     | Ent |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Fn0 |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-
-            |------+------+-----------------------+------+------|
-            | LAlt | LGUI | ******* Space ******* | RGUI | RAlt |
-            |------+------+-----------------------+------+------|
-    */
-
-    [BASE] = LAYOUT( //  default layer
-        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_BSLS, 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_BSPC,
-        CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT), TT(FUNK),
-        KC_LALT, KC_LGUI, /*        */ KC_SPC, MO(DYN), KC_RALT),
-
-    /* Layer HHKB: HHKB mode (HHKB Fn)
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Pwr  | F1  | F2  | F3  | F4 | F5 | F6 | F7 | F8  | F9  | F10 | F11 | F12   | Ins   | Del |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Caps |     |     |     |    |    |    |    | Psc | Slk | Pus | Up  |       | Backs |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      | VoD | VoU | Mut |    |    | *  | /  | Hom | PgU | Lef | Rig | Enter |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      |     |     |     |    |    | +  | -  | End | PgD | Dow |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-
-
-
-  [HHKB] = LAYOUT(
-  KC_PWR,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,
-  KC_CAPS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    KC_TRNS,  KC_BSPC,
-  KC_TRNS,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  KC_PAST,  KC_PSLS,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  KC_PENT,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PPLS,  KC_PMNS,  KC_END,   KC_PGDN,  KC_DOWN,  KC_TRNS,  KC_TRNS,
-                     KC_TRNS, KC_TRNS,           KC_TRNS,                KC_TRNS, KC_TRNS),
-
-  */
-    [FUNK] = LAYOUT(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
-        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-    [DYN] = LAYOUT(
-        KC_TRNS, DM_REC1, DM_REC2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DM_PLY1, DM_PLY2,
-        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_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MACSLEEP, KC_HOME, KC_END, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, DM_RSTP, KC_TRNS, KC_TRNS)};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    uint16_t macro_kc = (keycode == MO(DYN) ? DM_RSTP : keycode);
-    if (!process_dynamic_macro(macro_kc, record))
-    {
-        return false;
-    }
-
-    return true;
-}
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/readme.md b/keyboards/hhkb/ansi/keymaps/mjt/readme.md
deleted file mode 100644
index ff575ce247e..00000000000
--- a/keyboards/hhkb/ansi/keymaps/mjt/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Mike's HHKB
-
-- Surprisingly stock for the most part
-- Dynamic macros
-- ctrl key has tapkey for escape
-- right shift has tapkey for enter 
-- Works with iPhone Camera Adapter
-
-## Layers
-
-Base for letters and mods.
-
-Funk layer is my tweaked function layer
-
-Dyn layer has dynamic macros.  Record with 1 and 2, playback with \ and
-upper-right-most key.  Also turns the arrow clusters into nav keys.
diff --git a/keyboards/hhkb/ansi/keymaps/mjt/rules.mk b/keyboards/hhkb/ansi/keymaps/mjt/rules.mk
deleted file mode 100644
index 9e6797ed307..00000000000
--- a/keyboards/hhkb/ansi/keymaps/mjt/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/hhkb/ansi/keymaps/schaeferdev/README.md b/keyboards/hhkb/ansi/keymaps/schaeferdev/README.md
deleted file mode 100644
index 15b87c498d3..00000000000
--- a/keyboards/hhkb/ansi/keymaps/schaeferdev/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
- # QMK HHKB Keymap: schaeferdev
-
-This is my QMK keymap for the Happy Hacking Keyboard Pro 2 alternate controller made by Hasu.
-
-
-## Movement Layer
-
-The main difference from the Default layer is the introduction of a Movement layer than can be used by holding the right command button. This layer enables to move the mouse and scroll using Page up and Page down. Additionally it allows to use Arrow-keys in VIM-like fashion on hjkl.
-
-I prefer this movement to the default HHKB FN layer as  it allows all my fingers to remain on the home row.
-
-## Minor Changes
-
-- swapped Y and Z (as I am German and used to the different order).
-- changed position of Delete Key
-- both ` and ~
-
-
-## Setup (for macOS)
-```bash
-brew tap osx-cross/avr
-brew install avr-gcc
-brew install dfu-programmer
-```
-
-
-## Flashing
-
-```bash
-make clean
-make hhkb:schaeferdev:dfu
-```
-
-
-## Troubleshooting
-For some reason I ran into the issue that my CMD key no longer recognized. I am not entirely sure what caused this but the problem occured regardless of the layout I flashed (was also broken for the default hhkb layout). I was able to fix this issue by resetting EEPROM of the keyboard. The easiest way to do this is probably to use the QMK Toolbox.
diff --git a/keyboards/hhkb/ansi/keymaps/schaeferdev/config.h b/keyboards/hhkb/ansi/keymaps/schaeferdev/config.h
deleted file mode 100644
index b3c799bb82a..00000000000
--- a/keyboards/hhkb/ansi/keymaps/schaeferdev/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Based off of this section:
-// https://github.com/qmk/qmk_firmware/blob/master/doc/BUILD_GUIDE.md#the-configh-file
-#pragma once
-
-// Define mousekey settings
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_INTERVAL 4
-#define MOUSEKEY_MAX_SPEED 1
-#define MOUSEKEY_TIME_TO_MAX 70
\ No newline at end of file
diff --git a/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c b/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c
deleted file mode 100644
index d1f56e0362c..00000000000
--- a/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * default HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-#define BASE 0
-#define HHKB 1
-#define MOVEMENT 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* BASE Level: Default Layer
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-     | ESC    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -     | =   | Backs |Backs|
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P | [     | ]   | \     |     |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-     |Ctrl/ESC| A | S | D | F | G | H | J | K | L | ; | '     | Ent |       |     |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-     | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift | Fn0 |       |     |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-            |------+------+-----------------------+------+------|
-            | LAlt | LGUI | ******* Space ******* | MOUSE| RAlt |
-            |------+------+-----------------------+------+------|
-    */
-
-    [BASE] = LAYOUT( //  default layer
-        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_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-        CTL_T(KC_ESC), 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_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(HHKB),
-        KC_LALT, KC_LCMD, /*          */ KC_SPC, /*       */ MO(MOVEMENT), KC_RALT),
-
-    /* Layer HHKB: HHKB mode (HHKB Fn)
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Pwr  | F1  | F2  | F3  | F4 | F5 | F6 | F7 | F8  | F9  | F10 | F11 | F12   | DEL   | DEL |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Caps |     |     |     |    |    |    |    | Psc | Slk | Pus | Up  |       | Backs |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      | VoD | VoU | Mut |    |    | *  | /  | Hom | PgU | Lef | Rig | Enter |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      |     |     |     |    |    | +  | -  | End | PgD | Dow |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-     */
-
-    [HHKB] = LAYOUT(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    /* Layer MOUSE: MOUSE mode (MOUSE Fn)
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      | `~   |ACC1 |ACC2 |ACC3 |    |    |        |                |              |           |             |     |       | DEL   | DEL |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |MBTN2|     | up  |    | PgU|        |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |MBTN1|right|down |left| PgD|  <-    |  down arrow    |   up arrow   |  ->       |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |MBTN3|     |     |    |    |        |     ~ (N)      |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-     */
-
-    [MOVEMENT] = LAYOUT(
-        KC_GRV, KC_ACL0, KC_ACL1, KC_ACL2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_BTN2, KC_TRNS, KC_MS_U, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TILD, 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/hhkb/ansi/keymaps/schaeferdev/rules.mk b/keyboards/hhkb/ansi/keymaps/schaeferdev/rules.mk
deleted file mode 100644
index 35591533cc6..00000000000
--- a/keyboards/hhkb/ansi/keymaps/schaeferdev/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c b/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c
deleted file mode 100644
index 9c2b6e8ca52..00000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Copyright 2020 shela
- *
- * 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 "quantum.h"
-#include "command.h"
-#include "action_pseudo.h"
-
-static uint8_t send_key_shift_bit[SHIFT_BIT_SIZE];
-
-/*
- * Action Pseudo Process.
- * Gets the keycode in the same position of the specified layer.
- * The keycode is sent after conversion according to the conversion keymap.
- */
-void action_pseudo_process(keyrecord_t *record, uint8_t base_layer, const uint16_t (*keymap)[2]) {
-    uint8_t  prev_shift;
-    uint16_t keycode;
-    uint16_t pseudo_keycode;
-
-    /* Get keycode from specified layer */
-    keycode = keymap_key_to_keycode(base_layer, record->event.key);
-
-    prev_shift = get_mods() & MOD_MASK_SHIFT;
-
-    if (record->event.pressed) {
-        /* If magic commands entered, keycode is not converted */
-        if (IS_COMMAND()) {
-            if (prev_shift) {
-                add_shift_bit(keycode);
-            }
-            register_code(keycode);
-            return;
-        }
-
-        if (prev_shift) {
-            pseudo_keycode = convert_keycode(keymap, keycode, true);
-            dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-            add_shift_bit(keycode);
-
-            if (IS_LSFT(pseudo_keycode)) {
-                register_code(QK_LSFT ^ pseudo_keycode);
-            } else {
-                /* Delete shift mod temporarily */
-                unregister_mods(prev_shift);
-                register_code(pseudo_keycode);
-                register_mods(prev_shift);
-            }
-        } else {
-            pseudo_keycode = convert_keycode(keymap, keycode, false);
-            dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-            if (IS_LSFT(pseudo_keycode)) {
-                register_weak_mods(MOD_LSFT);
-                register_code(QK_LSFT ^ pseudo_keycode);
-                /* Prevent key repeat to avoid unintended output on Windows */
-                unregister_code(QK_LSFT ^ pseudo_keycode);
-                unregister_weak_mods(MOD_LSFT);
-            } else {
-                register_code(pseudo_keycode);
-            }
-        }
-    } else {
-        if (get_shift_bit(keycode)) {
-            del_shift_bit(keycode);
-            pseudo_keycode = convert_keycode(keymap, keycode, true);
-        } else {
-            pseudo_keycode = convert_keycode(keymap, keycode, false);
-        }
-        dprintf("released: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-        if (IS_LSFT(pseudo_keycode)) {
-            unregister_code(QK_LSFT ^ pseudo_keycode);
-        } else {
-            unregister_code(pseudo_keycode);
-        }
-    }
-}
-
-/* Convert keycode according to the keymap */
-uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shift_modded) {
-    uint16_t pseudo_keycode = 0x00; /* default value */
-
-    switch (keycode) {
-        case KC_A ... KC_CAPS_LOCK:
-#if defined(__AVR__)
-            if (shift_modded) {
-                pseudo_keycode = pgm_read_word(&keymap[keycode][1]);
-            } else {
-                pseudo_keycode = pgm_read_word(&keymap[keycode][0]);
-            }
-#else
-            if (shift_modded) {
-                pseudo_keycode = keymap[keycode][1];
-            } else {
-                pseudo_keycode = keymap[keycode][0];
-            }
-#endif
-            break;
-    }
-
-    /* If pseudo keycode is the default value, use the keycode as it is */
-    if (pseudo_keycode == 0x00) {
-        if (shift_modded) {
-            pseudo_keycode = S(keycode);
-        } else {
-            pseudo_keycode = keycode;
-        }
-    }
-
-    return pseudo_keycode;
-}
-
-uint8_t get_shift_bit(uint16_t keycode) {
-    if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-        return send_key_shift_bit[keycode >> 3] & (1 << (keycode & 7));
-    } else {
-        dprintf("get_shift_bit: Can't get shift bit. keycode: %02X\n", keycode);
-        return 0;
-    }
-}
-
-void add_shift_bit(uint16_t keycode) {
-    if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-        send_key_shift_bit[keycode >> 3] |= (1 << (keycode & 7));
-    } else {
-        dprintf("add_shift_bit: Can't add shift bit. keycode: %02X\n", keycode);
-    }
-}
-
-void del_shift_bit(uint16_t keycode) {
-    if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-        send_key_shift_bit[keycode >> 3] &= ~(1 << (keycode & 7));
-    } else {
-        dprintf("del_shift_bit: Can't delete shift bit. keycode: %02X\n", keycode);
-    }
-}
diff --git a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.h b/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.h
deleted file mode 100644
index 7c3d38fa07a..00000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 shela
- *
- * 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 SHIFT_BIT_SIZE (0xE7 / 8 + 1) /* 1bit per 1key */
-#define IS_LSFT(kc) ((QK_LSFT & (kc)) == QK_LSFT)
-
-void     action_pseudo_process(keyrecord_t *, uint8_t, const uint16_t (*)[2]);
-uint16_t convert_keycode(const uint16_t (*)[2], uint16_t, bool);
-
-uint8_t get_shift_bit(uint16_t);
-void    add_shift_bit(uint16_t);
-void    del_shift_bit(uint16_t);
diff --git a/keyboards/hhkb/ansi/keymaps/shela/config.h b/keyboards/hhkb/ansi/keymaps/shela/config.h
deleted file mode 100644
index db66659165b..00000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 shela
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* USB Device descriptor parameter */
-#undef VENDOR_ID
-#define VENDOR_ID 0x0853
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0100
-#undef DEVICE_VER
-#define DEVICE_VER 0x0102
-#undef MANUFACTURER
-#define MANUFACTURER "Topre Corporation"
-#undef PRODUCT
-#define PRODUCT "HHKB Professional"
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 210
-#define SPFN_TAPPING_TERM 190 /* SpaceFN tapping term */
-
-#define ONESHOT_TAP_TOGGLE 3
-#define ONESHOT_TIMEOUT 2000
diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap.c b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
deleted file mode 100644
index 922ec02c416..00000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/keymap.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/* Copyright 2020 shela
- *
- * 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_jis2us.h"
-#include "action_pseudo.h"
-
-// clang-format off
-enum keyboard_layers {
-    _QWERTY = 0,
-    _DVORAK,
-    _COLEMAK,
-    _PSEUDO,
-    _TENKEY,
-    _MOUSE,
-    _HHKB,
-    _SPACE_FN
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    DVORAK,
-    COLEMAK,
-    PSEUDO,
-    TENKEY,
-    MOUSE,
-    L_INNER,
-    R_INNER,
-    L_OUTER,
-    R_OUTER,
-    PSE_FN,
-    MACMODE,
-    DYNAMIC_MACRO_RANGE
-};
-// clang-format on
-
-/* Additional custom keycodes */
-#define MO_HHKB MO(_HHKB)
-#define LT_SPFN LT(_SPACE_FN, KC_SPC)
-#define DM_STA1 DM_REC1
-#define DM_PLY1 DM_PLY1
-
-/* User settings structure for the EEPROM */
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t base_layer : 8;
-        bool    mac_mode : 1;
-    };
-} user_config_t;
-
-user_config_t   user_config;
-static uint8_t  base_layer     = _QWERTY;
-static bool     mac_mode       = false;
-static bool     l_long_pressed = false;
-static bool     l_pressed      = false;
-static uint16_t l_time         = 0;
-static bool     r_long_pressed = false;
-static bool     r_pressed      = false;
-static uint16_t r_time         = 0;
-
-static uint16_t l_inner = KC_NO;
-static uint16_t l_outer = KC_NO;
-static uint16_t r_inner = KC_NO;
-static uint16_t r_outer = KC_NO;
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Qwerty Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  `  | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_QWERTY] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_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_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, R_INNER, R_OUTER
-        ),
-
-    /* Dvorak Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  [  |  ]  |  `  | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |  '  |  ,  |  .  |  P  |  Y  |  F  |  G  |  C  |  R  |  L  |  /  |  =  |   \    |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |  A  |  O  |  E  |  U  |  I  |  D  |  H  |  T  |  N  |  S  |  -  |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |  ;  |  Q  |  J  |  K  |  X  |  B  |  M  |  W  |  V  |  Z  | RShift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_DVORAK] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_GRV,  KC_BSPC,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS,
-        KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, KC_ENT,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, R_INNER, R_OUTER
-        ),
-
-    /* Colemak Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  `  | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |  Q  |  W  |  F  |  P  |  G  |  J  |  L  |  U  |  Y  |  ;  |  [  |  ]  |   \    |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |  A  |  R  |  S  |  T  |  D  |  H  |  N  |  E  |  I  |  O  |  '  |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |  Z  |  X  |  C  |  V  |  B  |  K  |  M  |  ,  |  .  |  /  | RShift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_COLEMAK] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, R_INNER, R_OUTER
-        ),
-
-    /* Pseudo Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn| BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn| PseFn  |
-     * |-----------------------------------------------------------------------------------------|
-     * | Control  |PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |    Shift    |PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|  Shift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_PSEUDO] = LAYOUT(
-        KC_ESC,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  KC_BSPC,
-        KC_TAB,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,
-        KC_LCTL, PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  KC_ENT,
-        KC_LSFT, PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  KC_RSFT, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, R_INNER, R_OUTER
-        ),
-
-    /* Tenkey layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |     |     |     |     |     |     |     |     |     |  /  |  *  |  -  |     | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |     |     |     |     |     |     |     |     |  7  |  8  |  9  |  +  |        |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |     |     |     |     |     |     |     |     |  4  |  5  |  6  |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |     |     |     |     |     |     |     |  1  |  2  |  3  |    +    |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              |   0    |  .  |
-     *           `-----------------------------------------------------------------'
-     */
-    [_TENKEY] = LAYOUT(
-        KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, KC_BSPC,
-        KC_TAB,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX,
-        KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   KC_PENT,
-        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PPLS, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, KC_P0,   KC_PDOT
-        ),
-
-    /* Mouse layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |     | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |     |     |     |     |     | WhL | WhD | WhU | WhR |     |     |     |        |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |     |     |     |     |     | MsL | MsD | MsU | MsR |     |     |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |     |     |     |     |     | Mb1 | Mb2 | Mb3 |     |     | RShift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |                Mb1                | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_MOUSE] = 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,  XXXXXXX, KC_BSPC,
-        KC_TAB,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, XXXXXXX, KC_ENT,
-        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, KC_BTN3, XXXXXXX, XXXXXXX, KC_RSFT, MO_HHKB,
-        L_OUTER, L_INNER, KC_BTN1, R_INNER, R_OUTER
-        ),
-
-    /* HHKB Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * |Power| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Caps  |Qwert|Dvork|Colmk|Psedo|Tenky|Mouse|     |PScr |SLck |Paus | Up  |     | Clear  |
-     * |-----------------------------------------------------------------------------------------|
-     * |          |VolD |VolU |Mute |Ejct |     |  *  |  /  |Home |PgUp |Left |Rght |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |             |Sta1 |Ply1 |     | Mac |     |  +  |  -  | End |PgDn |Down |         |     |
-     * `-----------------------------------------------------------------------------------------'
-     *           |     |        |               Space               |        |     |
-     *           `-----------------------------------------------------------------'
-     */
-    [_HHKB] = LAYOUT(
-        KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, QWERTY,  DVORAK,  COLEMAK, PSEUDO,  TENKEY,  MOUSE,   XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   XXXXXXX, KC_NUM,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, XXXXXXX, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        _______, DM_STA1, DM_PLY1, XXXXXXX, MACMODE, XXXXXXX, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
-        _______, _______, KC_SPC,  _______, _______
-        ),
-
-    /* SpaceFN Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |     | Del |
-     * |-----------------------------------------------------------------------------------------|
-     * |        |Home | Up  | End |     |     |     |Home | End |     |PScr |SLck |Paus |  Ins   |
-     * |-----------------------------------------------------------------------------------------|
-     * |          |Left |Down |Rght |PgUp |     |Left |Down | Up  |Rght |     |     |            |
-     * |-----------------------------------------------------------------------------------------|
-     * |             |     |     |PgDn |     | Spc |     |PgDn |PgUp |     |     |         |     |
-     * `-----------------------------------------------------------------------------------------'
-     *           |     |        |                                   |        |     |
-     *           `-----------------------------------------------------------------'
-     */
-    [_SPACE_FN] = 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,  XXXXXXX, KC_DEL,
-        _______, KC_HOME, KC_UP,   KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END,  XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGUP, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______,
-        _______, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, KC_SPC,  XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, _______, XXXXXXX,
-        _______, _______, _______, _______, _______
-        ),
-};
-// clang-format on
-
-void set_mac_mode_keys(bool mac_mode) {
-    if (mac_mode) {
-        l_inner = KC_LCMD;
-        l_outer = KC_LOPT;
-        r_inner = KC_RCMD;
-        r_outer = KC_ROPT;
-    } else {
-        l_inner = KC_LALT;
-        l_outer = KC_LGUI;
-        r_inner = KC_RALT;
-        r_outer = KC_RGUI;
-    }
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-    mac_mode        = user_config.mac_mode;
-    base_layer      = user_config.base_layer;
-    set_mac_mode_keys(mac_mode);
-}
-
-/* Set default values for the EEPROM */
-void eeconfig_init_user(void) {
-    user_config.raw        = 0;
-    user_config.base_layer = _QWERTY;
-    user_config.mac_mode   = false;
-    eeconfig_update_user(user_config.raw);
-    base_layer = _QWERTY;
-    mac_mode   = false;
-    set_mac_mode_keys(mac_mode);
-}
-
-void persistent_default_layer_set(uint8_t layer) {
-    set_single_persistent_default_layer(layer);
-    user_config.base_layer = layer;
-    eeconfig_update_user(user_config.raw);
-    base_layer = layer;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                persistent_default_layer_set(_QWERTY);
-            }
-            return false;
-        case DVORAK:
-            if (record->event.pressed) {
-                persistent_default_layer_set(_DVORAK);
-            }
-            return false;
-        case COLEMAK:
-            if (record->event.pressed) {
-                persistent_default_layer_set(_COLEMAK);
-            }
-            return false;
-        case PSEUDO:
-            if (record->event.pressed) {
-                if (l_pressed && !l_long_pressed) {
-                    register_code(l_inner);
-                    l_long_pressed = true;
-                }
-                if (r_pressed && !r_long_pressed) {
-                    register_code(r_inner);
-                    r_long_pressed = true;
-                }
-                // set_single_persistent_default_layer(_PSEUDO);
-            }
-            return false;
-        case TENKEY:
-            if (record->event.pressed) {
-                default_layer_set(1U << _TENKEY);
-            }
-            return false;
-        case MOUSE:
-            if (record->event.pressed) {
-                default_layer_set(1U << _MOUSE);
-            }
-            return false;
-        case L_INNER:
-            if (record->event.pressed) {
-                l_pressed = true;
-                l_time    = record->event.time;
-            } else {
-                if (l_pressed) {
-                    if (l_long_pressed) {
-                        unregister_code(l_inner);
-                        l_long_pressed = false;
-                    } else {
-                        if (TIMER_DIFF_16(record->event.time, l_time) < TAPPING_TERM) {
-                            if (mac_mode) {
-                                register_code(KC_LNG2);
-                                unregister_code(KC_LNG2);
-                            } else {
-                                register_code(KC_INT5);
-                                unregister_code(KC_INT5);
-                            }
-                        } else {
-                            register_code(l_inner);
-                            unregister_code(l_inner);
-                        }
-                    }
-                    l_pressed = false;
-                }
-            }
-            return false;
-        case R_INNER:
-            if (record->event.pressed) {
-                r_pressed = true;
-                r_time    = record->event.time;
-            } else {
-                if (r_pressed) {
-                    if (r_long_pressed) {
-                        unregister_code(r_inner);
-                        r_long_pressed = false;
-                    } else {
-                        if (TIMER_DIFF_16(record->event.time, r_time) < TAPPING_TERM) {
-                            if (mac_mode) {
-                                register_code(KC_LNG1);
-                                unregister_code(KC_LNG1);
-                            } else {
-                                register_code(KC_INT2);
-                                unregister_code(KC_INT2);
-                            }
-                        } else {
-                            register_code(r_inner);
-                            unregister_code(r_inner);
-                        }
-                    }
-                    r_pressed = false;
-                }
-            }
-            return false;
-        case L_OUTER:
-            if (record->event.pressed) {
-                register_code(l_outer);
-            } else {
-                unregister_code(l_outer);
-            }
-            return false;
-        case R_OUTER:
-            if (record->event.pressed) {
-                register_code(r_outer);
-            } else {
-                unregister_code(r_outer);
-            }
-            return false;
-        case MACMODE:
-            if (record->event.pressed) {
-                /* Toggle Mac mode value */
-                mac_mode             = !mac_mode;
-                user_config.mac_mode = mac_mode;
-                eeconfig_update_user(user_config.raw);
-                set_mac_mode_keys(mac_mode);
-            }
-            return false;
-        case PSE_FN:
-            if (record->event.pressed) {
-                if (l_pressed && !l_long_pressed) {
-                    register_code(l_inner);
-                    l_long_pressed = true;
-                }
-                if (r_pressed && !r_long_pressed) {
-                    register_code(r_inner);
-                    r_long_pressed = true;
-                }
-            }
-            action_pseudo_process(record, base_layer, keymap_jis2us);
-            return false;
-        default:
-            if (record->event.pressed) {
-                if (l_pressed && !l_long_pressed) {
-                    register_code(l_inner);
-                    l_long_pressed = true;
-                }
-                if (r_pressed && !r_long_pressed) {
-                    register_code(r_inner);
-                    r_long_pressed = true;
-                }
-            }
-    }
-    return true;
-}
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LT_SPFN:
-            return SPFN_TAPPING_TERM;
-        default:
-            return TAPPING_TERM;
-    }
-}
diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h b/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h
deleted file mode 100644
index 163ae84fb40..00000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2020 shela
- *
- * 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 "keymap_japanese.h"
-
-// clang-format off
-/* Keymap for converting JIS to US */
-const uint16_t PROGMEM keymap_jis2us[][2] = {
-    [KC_A ... KC_CAPS] = { 0x00, 0x00 }, /* default value */
-
-    [KC_1]    = { KC_1,    JP_EXLM }, /* 1 and ! -> 1 and ! */
-    [KC_2]    = { KC_2,    JP_AT   }, /* 2 and " -> 2 and @ */
-    [KC_3]    = { KC_3,    JP_HASH }, /* 3 and # -> 3 and # */
-    [KC_4]    = { KC_4,    JP_DLR  }, /* 4 and $ -> 4 and $ */
-    [KC_5]    = { KC_5,    JP_PERC }, /* 5 and % -> 5 and % */
-    [KC_6]    = { KC_6,    JP_CIRC }, /* 6 and & -> 6 and ^ */
-    [KC_7]    = { KC_7,    JP_AMPR }, /* 7 and ' -> 7 and & */
-    [KC_8]    = { KC_8,    JP_ASTR }, /* 8 and ( -> 8 and * */
-    [KC_9]    = { KC_9,    JP_LPRN }, /* 9 and ) -> 9 and ( */
-    [KC_0]    = { KC_0,    JP_RPRN }, /* 0       -> 0 and ) */
-    [KC_MINS] = { JP_MINS, JP_UNDS }, /* - and = -> - and _ */
-    [KC_EQL]  = { JP_EQL,  JP_PLUS }, /* ^ and ~ -> = and + */
-    [KC_LBRC] = { JP_LBRC, JP_LCBR }, /* @ and ` -> [ and { */
-    [KC_RBRC] = { JP_RBRC, JP_RCBR }, /* [ and { -> ] and } */
-    [KC_BSLS] = { JP_YEN,  JP_PIPE }, /* ] and } -> \ and | */
-    [KC_NUHS] = { JP_YEN,  JP_PIPE }, /* ] and } -> \ and | */
-    [KC_SCLN] = { JP_SCLN, JP_COLN }, /* ; and + -> ; and : */
-    [KC_QUOT] = { JP_QUOT, JP_DQUO }, /* : and * -> ' and " */
-    [KC_GRV]  = { JP_GRV,  JP_TILD }, /* Han/Zen -> ` and ~ */
-    [KC_COMM] = { JP_COMM, JP_LABK }, /* , and < -> , and < */
-    [KC_DOT]  = { JP_DOT,  JP_RABK }, /* . and > -> . and > */
-    [KC_SLSH] = { JP_SLSH, JP_QUES }, /* / and ? -> / and ? */
-};
-// clang-format on
diff --git a/keyboards/hhkb/ansi/keymaps/shela/readme.md b/keyboards/hhkb/ansi/keymaps/shela/readme.md
deleted file mode 100644
index 36e15c2c483..00000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/readme.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Shela's keymap for HHKB Pro 2 US Layout with Alternate Controller
-
-## Layers
-
-Layer 1: Qwerty Layer  
-Layer 2: Dvorak Layer  
-Layer 3: Colemak Layer  
-Layer 4: Pseudo US Layer  
-Layer 5: Tenkey Layer  
-Layer 6: Mouse Layer  
-Layer 7: HHKB Fn Layer  
-Layer 8: SpaceFN Layer  
-
-### Qwerty/Dvorak/Colemak Layer
-
-Basic keymap layer for each keyboard layout.
-
-### Pseudo US Layer
-
-A layer that can be used with the same physical layout as the previously activated basic (Qwerty/Dvorak/Colemak) keymap layer, with the keyboard still configured as a Japanese keyboard on the OS.
-
-This is useful when using virtual environments and remote desktops, because you can use Japanese Windows with the same keyboard without changing the OS keyboard settings. Also, when using the keyboard as a US keyboard on Windows OS, all keys existing only on Japanese keyboards are ignored and it is not possible to assign these keys to the desired function of any application. You can avoid such problems.
-
-### Tenkey/Mouse Layer
-
-Tenkey (numeric keypad) and mouse layers. For the Tenkey to work, Numlock must be turned on in the OS.
-
-### HHKB Fn Layer
-
-A layer that is equivalent to Fn key of Happy Hacking Keyboard. There are also some layer switching keys and special function keys.
-
-### SpaceFN Layer
-
-Customized [SpaceFN](https://geekhack.org/index.php?topic=51069.0) layer. There are left-hand and right-hand Arrows/Home/End/PageUp/PageDown keys. Frequently used keys in HHKB Fn layer are configured to this layer and can be used as an alternative layer to the HHKB Fn layer.
-
-## Special function keycodes
-
-### Pseudo US keycode
-
-A special keycode that implements Pseudo US Layout.
-
-### Mac mode keycode
-
-A special keycode that toggles Mac mode. When Mac mode is enabled, the keymap of the Left Inner/Outer and Right Inner/Outer keys are changed for macOS. See _Left Inner/Outer, Right Inner/Outer keys_ for details.
-
-### Left Inner/Outer, Right Inner/Outer keycodes
-
-If you tap a Mod-Tap key and another key within the time specified by TAPPING_TERM, QMK interprets these keys as if they were pressed at the same time even if they were not pressed simultaneously. Therefore, for fast typists, Mod-Tap can accidentally send a keycode with modifier. These special keycodes allow you to work around this issue and change the keymap in Mac mode.
-
-These keys work as follows:
-
-Mac mode: Disabled
-
-| Key         | Keycode | Tap     | Hold    |
-| ----------- | ------- | ------- | ------- |
-| Left Inner  | L_INNER | KC_INT5 | KC_LALT |
-| Left Outer  | L_OUTER | KC_LGUI | KC_LGUI |
-| Right Inner | R_INNER | KC_INT2 | KC_RALT |
-| Right Outer | R_OUTER | KC_RGUI | KC_RGUI |
-
-Mac mode: Enabled
-
-| Key         | Keycode | Tap     | Hold    |
-| ----------- | ------- | ------- | ------- |
-| Left Inner  | L_INNER | KC_LNG2 | KC_LCMD |
-| Left Outer  | L_OUTER | KC_LOPT | KC_LOPT |
-| Right Inner | R_INNER | KC_LNG1 | KC_RCMD |
-| Right Outer | R_OUTER | KC_ROPT | KC_ROPT |
diff --git a/keyboards/hhkb/ansi/keymaps/shela/rules.mk b/keyboards/hhkb/ansi/keymaps/shela/rules.mk
deleted file mode 100644
index 84f6395a485..00000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-DYNAMIC_MACRO_ENABLE = yes
-
-SRC += action_pseudo.c
diff --git a/keyboards/hhkb/ansi/keymaps/smt/keymap.c b/keyboards/hhkb/ansi/keymaps/smt/keymap.c
deleted file mode 100644
index 81314e01b7b..00000000000
--- a/keyboards/hhkb/ansi/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * default HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _HHKB 3
-
-enum planck_keycodes
-{
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-    DVORAK,
-    HHKB
-};
-
-// Custom macros
-#define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl
-#define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift
-#define HPR_TAB ALL_T(KC_TAB) // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define MEH_GRV MEH_T(KC_GRV) // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Layer QWERTY: Qwerty Layer
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Esc   | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -     | =   | \     | ` |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Tab   | Q | W | E | R | T | Y | U | I | O | P | [     | ]   | Backs |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Cont  | A | S | D | F | G | H | J | K | L | ; | '     | Ent |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Fn  |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-
-            |------+------+-----------------------+------+------|
-            | LAlt | LGUI | ******* Space ******* | RGUI | RAlt |
-            |------+------+-----------------------+------+------|
-    */
-
-    [_QWERTY] = LAYOUT( //  Qwerty layer
-        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_BSLS, MEH_GRV,
-        HPR_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_BSPC,
-        CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, SFT_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, MO(_HHKB),
-        KC_LALT, KC_LGUI, /*        */ KC_SPC, KC_RGUI, KC_RALT),
-
-    /* Layer COLEMAK: Colemak Layer
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Esc   | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -     | =   | \     | ` |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Tab   | Q | W | F | P | G | J | L | U | Y | ; | [     | ]   | Backs |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Cont  | A | R | S | T | D | H | N | E | I | O | '     | Ent |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Shift | Z | X | C | V | B | K | M | , | . | / | Shift | Fn  |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-
-            |------+------+-----------------------+------+------|
-            | LAlt | LGUI | ******* Space ******* | RGUI | RAlt |
-            |------+------+-----------------------+------+------|
-    */
-
-    [_COLEMAK] = LAYOUT( //  Colemak layer
-        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_BSLS, MEH_GRV,
-        HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,
-        CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, SFT_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_HHKB),
-        KC_LALT, KC_LGUI, /*        */ KC_SPC, KC_RGUI, KC_RALT),
-
-    /* Layer DVORAK: Dvorak Layer
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Esc   | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | [     | ]   | \     | ` |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Tab   | ' | , | . | P | Y | F | G | C | R | L | /     | =   | Backs |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Cont  | A | O | E | U | I | D | H | T | N | S | -     | Ent |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-     | Shift | ; | Q | J | K | X | B | M | W | V | Z | Shift | Fn  |       |   |
-     |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
-
-            |------+------+-----------------------+------+------|
-            | LAlt | LGUI | ******* Space ******* | RGUI | RAlt |
-            |------+------+-----------------------+------+------|
-    */
-
-    [_DVORAK] = LAYOUT( //  Dvorak layer
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, MEH_GRV,
-        HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC,
-        CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, SFT_ENT,
-        KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, MO(_HHKB),
-        KC_LALT, KC_LGUI, /*        */ KC_SPC, KC_RGUI, KC_RALT),
-
-    /* Layer HHKB: HHKB mode (HHKB Fn)
-      |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------+-------+-----|
-      | Pwr  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12   | Ins   | Del |
-      |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------+-------+-----|
-      | Caps |     |     |     |     |     |     |     | Psc | Slk | Pus | Up  |       | Backs |     |
-      |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------+-------+-----|
-      |      | VoD | VoU | Mut |     |     | *   | /   | Hom | PgU | Lef | Rig | Enter |       |     |
-      |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------+-------+-----|
-      |      |     | Qwt | Cmk | Dvk |     | +   | -   | End | PgD | Dow |     |       |       |     |
-      |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------+-------+-----|
-
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-
-     */
-
-    [_HHKB] = LAYOUT(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, KC_BSPC,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______,
-        _______, _______, _______, _______, _______)};
-
-void persistent_default_layer_set(uint16_t default_layer)
-{
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    switch (keycode)
-    {
-    case QWERTY:
-        if (record->event.pressed)
-        {
-            persistent_default_layer_set(1UL << _QWERTY);
-        }
-        return false;
-        break;
-    case COLEMAK:
-        if (record->event.pressed)
-        {
-            persistent_default_layer_set(1UL << _COLEMAK);
-        }
-        return false;
-        break;
-    case DVORAK:
-        if (record->event.pressed)
-        {
-            persistent_default_layer_set(1UL << _DVORAK);
-        }
-        return false;
-        break;
-    }
-    return true;
-}
diff --git a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c b/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c
deleted file mode 100644
index 4f0451f7a9e..00000000000
--- a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define SPACE_FN LT(1, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT( //  default layer
-        QK_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_RBRC, 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_NUHS, KC_BSPC,
-        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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT, KC_NUBS,
-        KC_LALT, KC_LGUI,              SPACE_FN,                    KC_RGUI, KC_RALT),
-
-    [1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, KC_PGUP, KC_UP,   KC_PGDN,  _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, KC_END,           _______,
-        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______,                             _______,                            _______, _______)
-};
diff --git a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/readme.md b/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/readme.md
deleted file mode 100644
index 0da9d96ee4b..00000000000
--- a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# tobiasvl's ISO layout for HHKB
-
-This is my attempt to adapt my regular 60% Norwegian ISO layout to the physical HHKB layout, on the Happy Hacking Keyboard Pro 2 keyboard with the alternate QMK-compatible Hasu controller.
-
-## Base layer
-
-![HHKB ISO](https://i.imgur.com/8n4Kixw.png)
-
-The following changes have been made from standard HHKB:
-
-* The ] and \ keys are swapped so they're in the ISO locations, but a row higher. Whether or not this is a good idea depends heavily on what specific language layout you're using, but it makes sense for Norwegian, I think.
-* The Fn key is replaced with the ISO key (ie. "non-US backslash"). It's gotta go somewhere!
-* The spacebar doubles as space when tapped and Fn when held (ie. SpaceFN). This is a personal preference, but my second and more traditional choice would probably be to replace right GUI/Super with Fn.
-* Grave Escape has been added (shift + Esc produces ~).
-
-## Function layer
-
-This is just how I personally prefer to set up my function layer, and doesn't have anything to do with ISO. You probably want to swap out this wholesale for your own function layer.
-
-* Navigation is moved: Arrow keys on WASD, Page Up and Page Down on QE, Home and End on the right (I have them to the left of the vertical Enter on ISO layouts).
-* Grave Escape has been added (Fn + Esc produces \`).
-* No media keys or anything. I don't use them.
diff --git a/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c b/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
deleted file mode 100644
index 4e89c9290fc..00000000000
--- a/keyboards/hhkb/ansi/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-Xyverz's HHKB layout
-
-Rev 0.1, initial commit.
-
-This is my initial keymap for the HHKB with Hasu's alternate controller.
-The default layer is Dvorak, with Qwerty and Colemak being optional.
-Will probably add to it later, but for now I'm going to enjoy this as it is.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QW,
-    _DV,
-    _CM,
-    _FL,
-};
-
-enum planck_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK };
-
-#define FN_TAB  LT(_FL, KC_TAB) 
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /*
-   *  _QW: Qwerty Layer
-   * ,-----------------------------------------------------------.
-   * |ESC | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| \ |Del|
-   * |-----------------------------------------------------------|
-   * |Fn/Tb|  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|BkSpc|
-   * |-----------------------------------------------------------|
-   * |Control|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return|
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Shift |Fn|
-   * |-----------------------------------------------------------|
-   * |        |Alt |Gui |      Space        |Gui |Alt |          |
-   * `-----------------------------------------------------------'
-   */
-  /* Layer 0: Qwerty */
-  [_QW] = LAYOUT(
-    QK_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_BSLS, KC_DEL ,
-    FN_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_BSPC,
-    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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(_FL),
-             KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_RALT
-  ),
-
-  /*
-   *  _DV: Dvorak Layer
-   * ,-----------------------------------------------------------.
-   * |ESC | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]| \ |Del|
-   * |-----------------------------------------------------------|
-   * |Fn/Tb|  '|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|BkSpc|
-   * |-----------------------------------------------------------|
-   * |Control|  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -| Return|
-   * |-----------------------------------------------------------|
-   * |Shift   |  ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z| Shift |Fn|
-   * |-----------------------------------------------------------|
-   * |        |Alt |Gui |      Space        |Gui |Alt |          |
-   * `-----------------------------------------------------------'
-   */
-  /* Layer 1: Dvorak */
-  [_DV] = LAYOUT(
-    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
-    FN_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSPC,
-    KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          KC_ENT,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,             KC_RSFT, MO(_FL),
-             KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_RALT
-  ),
-
-  /*
-   *  _CM: Colemak Layer
-   * ,-----------------------------------------------------------.
-   * |ESC | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| \ |Del|
-   * |-----------------------------------------------------------|
-   * |Fn/Tb|  Q|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|BkSpc|
-   * |-----------------------------------------------------------|
-   * |Control|  A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '| Return|
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  K|  M|  ,|  .|  /| Shift |Fn|
-   * |-----------------------------------------------------------|
-   * |        |Alt |Gui |      Space        |Gui |Alt |          |
-   * `-----------------------------------------------------------'
-   */
-  /* Layer 2: Colemak */
-  [_CM] = LAYOUT(
-    QK_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_BSLS, KC_DEL ,
-    FN_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,
-    KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,          KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(_FL),
-             KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_RALT
-  ),
-
-  /*
-   *  _FL: Function Layer
-   * ,-----------------------------------------------------------.
-   * |Grv |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |RST|
-   * |-----------------------------------------------------------|
-   * |     |   |_QW|_DV|_CM|   |   |PgU| Up|PgD|PSc|SLk|Pau|     |
-   * |-----------------------------------------------------------|
-   * |       |   |MPr|MPl|MNx|   |Hom| Lt| Dn| Rt|   |   |       |
-   * |-----------------------------------------------------------|
-   * |CAPS    |   |Mut|VlD|VlU|   |End|   |   |   |   |       |  |
-   * |-----------------------------------------------------------|
-   * |        |    |    |        Ins        |    |    |          |
-   * `-----------------------------------------------------------'
-   */
-  /* Layer 3: Functions */
-  [_FL] = LAYOUT(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, QK_BOOT,
-    _______, _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-    KC_CAPS, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,
-    _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_END,  _______, _______, _______, _______,          _______, _______,
-             _______, _______,                   _______,                                     _______, _______
-  ),
-
-};
-// clang-format on
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case DVORAK:
-                set_single_persistent_default_layer(_DV);
-                return false;
-            case QWERTY:
-                set_single_persistent_default_layer(_QW);
-                return false;
-            case COLEMAK:
-                set_single_persistent_default_layer(_CM);
-                return false;
-        }
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c b/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c
deleted file mode 100644
index cfcd5714058..00000000000
--- a/keyboards/hhkb/jp/keymaps/bakingpy/keymap.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_BSLS,
-        MO(1), KC_GRV, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_BSPC, KC_RGUI, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [1] = LAYOUT_jp(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
-        _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______)};
diff --git a/keyboards/hhkb/jp/keymaps/bakingpy/rules.mk b/keyboards/hhkb/jp/keymaps/bakingpy/rules.mk
deleted file mode 100644
index a7f700f019c..00000000000
--- a/keyboards/hhkb/jp/keymaps/bakingpy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OPT_DEFS += -DHHKB_JP
diff --git a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
deleted file mode 100644
index 18529203458..00000000000
--- a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/* Layer 0: HHKB JP
-* ,-----------------------------------------------------------.
-* |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9| 10|  -|  =|Yen|Bsp|
-* |-----------------------------------------------------------|
-* |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |
-* |------------------------------------------------------` Ent|
-* |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  `|    |
-* |-----------------------------------------------------------|
-* |Shft   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  \| Up|Sft|
-* |-----------------------------------------------------------|
-* |   ||Ctl|Alt|Cmd|   |   Spc   |Bsp|   |   |   ||Lft|Dwn|Rgh|
-* `-----------------------------------------------------------'
-*/
-
-/* Layer 1: HHKB mode (HHKB Fn)
-* ,-----------------------------------------------------------.
-* |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
-* |-----------------------------------------------------------|
-* |Caps |MPrev|MPlay|MNext|   |   |   |   |Psc|Slk|Pus|Up |   |
-* |------------------------------------------------------`    |
-* |      |VoD|VoU|Mut|   |   |  *|  /|Hom|PgU|Lef|Rig|   |    |
-* |-----------------------------------------------------------|
-* |       |   |   |   |   |   |  +|  -|End|PgD|Dow|   |   |   |
-* |-----------------------------------------------------------|
-* |   ||   |   |   |   |         |   |   |   |   ||   |   |   |
-* `-----------------------------------------------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRAVE, KC_BSPC,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_BSLS,
-        KC_BSPC, KC_GRV, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_BSPC, KC_RSFT, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [1] = LAYOUT_jp(
-        _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, _______, KC_PENT,
-        _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
diff --git a/keyboards/hhkb/jp/keymaps/enoch_jp/rules.mk b/keyboards/hhkb/jp/keymaps/enoch_jp/rules.mk
deleted file mode 100644
index d35c58b777d..00000000000
--- a/keyboards/hhkb/jp/keymaps/enoch_jp/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-NKRO_ENABLE = yes
-
-OPT_DEFS += -DHHKB_JP
diff --git a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/README.md b/keyboards/hhkb/jp/keymaps/halfqwerty_jp/README.md
deleted file mode 100644
index 222ad898efa..00000000000
--- a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# harfqwerty_jp
-
-half-QWERTY is a keyboard layout for one-handed typing on QWERTY keyboard.
-
-* When hold space bar, the keyboard enters mirror mode.
-* To type a space, just tap the space bar.
-
-## BASE
-
-    ,-----------------------------------------------------------.
-    |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9| 10|  -|  =|Yen|Bsp|
-    |-----------------------------------------------------------|
-    |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |
-    |------------------------------------------------------` Ent|
-    |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  `|    |
-    |-----------------------------------------------------------|
-    |Shft   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  \| Up|Sft|
-    |-----------------------------------------------------------|
-    |   ||Ctl|Alt|Cmd|   |   Spc   |   |   |   |   ||Lft|Dwn|Rgh|
-    `-----------------------------------------------------------'
-
-## HHKB mode (HHKB Fn)
-
-    ,-----------------------------------------------------------.
-    |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
-    |-----------------------------------------------------------|
-    |Caps |   |   |   |   |   |   |   |Psc|Slk|Pus|Up |   |     |
-    |------------------------------------------------------`    |
-    |      |VoD|VoU|Mut|   |   |  *|  /|Hom|PgU|Lef|Rig|   |    |
-    |-----------------------------------------------------------|
-    |       |   |   |   |   |   |  +|  -|End|PgD|Dow|   |   |   |
-    |-----------------------------------------------------------|
-    |   ||   |   |   |   |         |   |   |   |   ||   |   |   |
-    `-----------------------------------------------------------'
-
-
-## Mirror mode
-
-    ,-----------------------------------------------------------.
-    |   |  0|  9|  8|  7|  6|  5|  4|  3|  2|  1|   |   |   |   |
-    |-----------------------------------------------------------|
-    |     |  P|  O|  I|  U|  Y|  T|  R|  E|  W|  Q|   |   |     |
-    |------------------------------------------------------`    |
-    |      |  ;|  L|  K|  J|  H|  G|  F|  D|  S|  A|   |   |    |
-    |-----------------------------------------------------------|
-    |       |  .|  ,|  M|  N|  B|  V|  C|  X|  Z|   |   |   |   |
-    |-----------------------------------------------------------|
-    |   ||   |   |   |   |         |   |   |   |   ||   |   |   |
-    `-----------------------------------------------------------'
diff --git a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c b/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
deleted file mode 100644
index 7fc59c84c60..00000000000
--- a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * default HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-enum
-{
-    BASE,
-    HHKB,
-    MIRROR,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* BASE Level: Default Layer
-       ,-----------------------------------------------------------.
-       |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9| 10|  -|  =|Yen|Bsp|
-       |-----------------------------------------------------------|
-       |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |
-       |------------------------------------------------------` Ent|
-       |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  `|    |
-       |-----------------------------------------------------------|
-       |Shft   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  \| Up|Sft|
-       |-----------------------------------------------------------|
-       |   ||Ctl|Alt|Cmd|   |   Spc   |   |   |   |   ||Lft|Dwn|Rgh|
-       `-----------------------------------------------------------'
-    */
-    [BASE] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_UP, KC_RSFT,
-        MO(HHKB), KC_GRV, KC_LGUI, KC_LALT, KC_INT5, LT(MIRROR, KC_SPC), KC_INT4, KC_INT2, KC_RALT, MO(HHKB), KC_LEFT, KC_DOWN, KC_RGHT),
-
-    /* Layer HHKB: HHKB mode (HHKB Fn)
-       ,-----------------------------------------------------------.
-       |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
-       |-----------------------------------------------------------|
-       |Caps |   |   |   |   |   |   |   |Psc|Slk|Pus|Up |   |     |
-       |------------------------------------------------------`    |
-       |      |VoD|VoU|Mut|   |   |  *|  /|Hom|PgU|Lef|Rig|   |    |
-       |-----------------------------------------------------------|
-       |       |   |   |   |   |   |  +|  -|End|PgD|Dow|   |   |   |
-       |-----------------------------------------------------------|
-       |   ||   |   |   |   |         |   |   |   |   ||   |   |   |
-       `-----------------------------------------------------------'
-     */
-
-    [HHKB] = LAYOUT_jp(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
-        _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-    /* Mirror Level: when hold space bar
-       ,-----------------------------------------------------------.
-       |   |  0|  9|  8|  7|  6|  5|  4|  3|  2|  1|   |   |   |   |
-       |-----------------------------------------------------------|
-       |     |  P|  O|  I|  U|  Y|  T|  R|  E|  W|  Q|   |   |     |
-       |------------------------------------------------------`    |
-       |      |  ;|  L|  K|  J|  H|  G|  F|  D|  S|  A|   |   |    |
-       |-----------------------------------------------------------|
-       |       |  .|  ,|  M|  N|  B|  V|  C|  X|  Z|   |   |   |   |
-       |-----------------------------------------------------------|
-       |   ||   |   |   |   |         |   |   |   |   ||   |   |   |
-       `-----------------------------------------------------------'
-    */
-    [MIRROR] = LAYOUT_jp(
-        _______, KC_0, KC_9, KC_8, KC_7, KC_6, KC_5, KC_4, KC_3, KC_2, KC_1, _______, _______, _______, _______,
-        _______, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_T, KC_R, KC_E, KC_W, KC_Q, _______, _______,
-        _______, KC_SCLN, KC_L, KC_K, KC_J, KC_H, KC_G, KC_F, KC_D, KC_S, KC_A, _______, _______, _______,
-        _______, KC_DOT, KC_COMM, KC_M, KC_N, KC_B, KC_V, KC_C, KC_X, KC_Z, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______, _______, _______)};
-
diff --git a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/rules.mk b/keyboards/hhkb/jp/keymaps/halfqwerty_jp/rules.mk
deleted file mode 100644
index a7f700f019c..00000000000
--- a/keyboards/hhkb/jp/keymaps/halfqwerty_jp/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OPT_DEFS += -DHHKB_JP
diff --git a/keyboards/hhkb/jp/keymaps/rdg_jp/keymap.c b/keyboards/hhkb/jp/keymaps/rdg_jp/keymap.c
deleted file mode 100644
index b4eec445477..00000000000
--- a/keyboards/hhkb/jp/keymaps/rdg_jp/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum
-{
-    ZER,
-    HDN,
-    OSY
-};
-
-#define CTL_ESC CTL_T(KC_ESC)
-#define SFT_BSP SFT_T(KC_BSPC)
-
-#define SCRNS3 LGUI(LCTL(LSFT(KC_3)))
-#define SCRNS4 LGUI(LCTL(LSFT(KC_4)))
-
-/* hhkb jp ~ layout
- * ,-----------------------------------------------------------.
- * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9| 10|  -|  =|Yen|Bsp|
- * |-----------------------------------------------------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |
- * |------------------------------------------------------` Ent|
- * |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  `|    |
- * |-----------------------------------------------------------|
- * |Shft   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  \| Up|Sft|
- * |-----------------------------------------------------------|
- * |   ||Ctl|Alt|Cmd|   |   Spc   |Bsp|   |   |   ||Lft|Dwn|Rgh|
- * `-----------------------------------------------------------'
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [ZER] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INS, KC_BSPC,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
-        CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_GRV, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_UP, KC_RSFT,
-        MO(HDN), KC_LCTL, KC_LALT, KC_LGUI, MO(HDN), KC_SPC, SFT_BSP, MO(HDN), MO(OSY), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [HDN] = LAYOUT_jp(
-        KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
-        _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______,
-        _______, KC_TILD, KC_GRV, KC_BSLS, KC_PIPE, KC_MINS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TILD, KC_GRV, _______, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, _______, KC_ENT, _______, _______, _______, _______, KC_PGUP, _______,
-        _______, _______, _______, _______, _______, KC_UNDS, KC_DEL, _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
-
-    [OSY] = LAYOUT_jp(
-        _______, _______, _______, SCRNS3, SCRNS4, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
diff --git a/keyboards/hhkb/jp/keymaps/rdg_jp/rules.mk b/keyboards/hhkb/jp/keymaps/rdg_jp/rules.mk
deleted file mode 100644
index a7f700f019c..00000000000
--- a/keyboards/hhkb/jp/keymaps/rdg_jp/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OPT_DEFS += -DHHKB_JP
diff --git a/keyboards/hhkb/jp/keymaps/sh_jp/README.md b/keyboards/hhkb/jp/keymaps/sh_jp/README.md
deleted file mode 100644
index 4f82f2f4e93..00000000000
--- a/keyboards/hhkb/jp/keymaps/sh_jp/README.md
+++ /dev/null
@@ -1,86 +0,0 @@
-###Keymaps with both Dvorak layout and QWER layout for HHKB JP.  
-
-1. The default layout is Dvorak.
-2. Use `Tog` to toggle between Dvorak and QWER
-3. Holding `NewCmd`, the original `LftCmd`,  will activate the `NewCmd` layer which means `NewCmd+key` is the same as `Cmd+key` in normal QWER layout.<sup>[1](#cmdTab)</sup>
-  - For example, no matter you are in Dvorak layout or QWER layout, you can use `Cmd+s` to save a currently editing file.
-4. `Symb` makes type symbols easier
-  - for example: `Symb+a` is `!`.
-5. `Spc+key` equals to `Shft+key` while using `Spc` alone will yield a space as usual.
-6. There's an extra `Tab` in the last line.
-    
-```
-Layer DVOR:
-,-----------------------------------------------------------.
-|Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   |Bsp|
-|-----------------------------------------------------------|
-|Tab  |  '|   ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|    |
-|------------------------------------------------------` Ent|
-|Ctrl  |  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -|  \|    |
-|-----------------------------------------------------------|
-|Shft   |  ;|  Q|  J|  K|  X|  B|  M| W|  V|  Z|   | Up|    |
-|-----------------------------------------------------------|
-|FN| `| Alt|NewCmd|Symb|  Spc |Symb|Tab|RCmd|Tog|Lft|Dwn|Rgh|
-`-----------------------------------------------------------'
-```
-
-```
-Layer QWER:
-,-----------------------------------------------------------.
-|Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9| 10|  -|  =|   |Bsp|
-|-----------------------------------------------------------|
-|Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |
-|------------------------------------------------------` Ent|
-|Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  \|    |
-|-----------------------------------------------------------|
-|Shft   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|   | Up|   |
-|-----------------------------------------------------------|
-|FN| `| Alt|NewCmd|Symb|  Spc  |Symb|Tab|Cmd|Tog|Lft|Dwn|Rgh|
-`-----------------------------------------------------------'
-```
-
-```
-Layer Symb:
-,-----------------------------------------------------------.
-|   |   |   |   |   |   |   |   |   |   |  |   |   |   |    |
-|-----------------------------------------------------------|
-|     |   |   |   [|   ]|   |   |  {|  }|   |   |   |   |   |
-|------------------------------------------------------`    |
-|      |  !|  @|  #|  $|  %|  ^|  &|  *|  (|  )|  '|  \|    |
-|-----------------------------------------------------------|
-|       |   |   |   |   |   |   |   |   |   |   |   |   |   |
-|-----------------------------------------------------------|
-|  |  |    |      |    |       |    |   |   |   |   |   |   |
-`-----------------------------------------------------------'
-```
-
-```
-Layer FUNC: HHKB mode (HHKB Fn)
-,-----------------------------------------------------------.
-|Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
-|-----------------------------------------------------------|
-|Caps |   |   |   |   |   |   |   |Psc|Slk|Pus|Up |   |     |
-|------------------------------------------------------`    |
-|      |VoD|VoU|Mut|   |   |  *|  /|Hom|PgU|Lef|Rig|   |    |
-|-----------------------------------------------------------|
-|       |   |   |   |   |   |  +|  -|End|PgD|Dow|   |   |   |
-|-----------------------------------------------------------|
-|   ||   |   |   |   |         |   |   |   |   ||   |   |   |
-`-----------------------------------------------------------'
-```
-
-```
-Empty Layer:
-,-----------------------------------------------------------.
-|   |   |   |   |   |   |   |   |   |   |  |   |   |   |    |
-|-----------------------------------------------------------|
-|     |   |   |   |   |   |   |   |   |   |   |   |   |     |
-|------------------------------------------------------`    |
-|      |   |   |   |   |   |   |   |   |   |   |   |   |    |
-|-----------------------------------------------------------|
-|       |   |   |   |   |   |   |   |   |   |   |   |   |   |
-|-----------------------------------------------------------|
-|  |  |    |      |    |       |    |   |   |   |   |   |   |
-`-----------------------------------------------------------'
-```
-<a name="cmdTab">1</a>: `NewCmd + Tab` does not work, you can use `RCmd+Tab` to switch among applications.
diff --git a/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c b/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
deleted file mode 100644
index 3ba9ac5d901..00000000000
--- a/keyboards/hhkb/jp/keymaps/sh_jp/keymap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum
-{
-    DVOR,
-    QWER,
-    NEW_CMD,
-    SYMB,
-    FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [DVOR] = LAYOUT_jp(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_INT3, KC_BSPC,
-        KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL,
-        KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_INT1, KC_UP, KC_RSFT,
-        MO(FUNC), KC_GRV, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, TG(QWER), KC_LEFT, KC_DOWN, KC_RGHT),
-    [QWER] = LAYOUT_jp(
-        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_INT3, KC_BSPC,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_UP, KC_RSFT,
-        MO(FUNC), KC_GRV, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [NEW_CMD] = LAYOUT_jp(
-        _______, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), _______, _______, _______, LGUI(KC_BSPC),
-        _______, LGUI(KC_Q), LGUI(KC_W), LGUI(KC_E), LGUI(KC_R), LGUI(KC_T), LGUI(KC_Y), LGUI(KC_U), LGUI(KC_I), LGUI(KC_O), LGUI(KC_P), LGUI(KC_LBRC), LGUI(KC_RBRC),
-        _______, LGUI(KC_A), LGUI(KC_S), LGUI(KC_D), LGUI(KC_F), LGUI(KC_G), LGUI(KC_H), LGUI(KC_J), LGUI(KC_K), LGUI(KC_L), _______, _______, _______, _______,
-        LGUI(KC_LSFT), LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), LGUI(KC_B), LGUI(KC_N), LGUI(KC_M), LGUI(KC_COMM), LGUI(KC_DOT), LGUI(KC_SLSH), _______, _______, _______,
-        _______, _______, _______, _______, _______, LGUI(KC_SPC), _______, _______, _______, _______, LGUI(KC_LEFT), LGUI(KC_DOWN), LGUI(KC_RGHT)),
-
-    [SYMB] = LAYOUT_jp(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, LSFT(KC_LBRC), LSFT(KC_RBRC), _______, _______, _______, _______,
-        _______, LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-    [FUNC] = LAYOUT_jp(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
-        _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
diff --git a/keyboards/hhkb/jp/keymaps/sh_jp/rules.mk b/keyboards/hhkb/jp/keymaps/sh_jp/rules.mk
deleted file mode 100644
index a7f700f019c..00000000000
--- a/keyboards/hhkb/jp/keymaps/sh_jp/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OPT_DEFS += -DHHKB_JP
diff --git a/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c b/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
deleted file mode 100644
index 257f43e610d..00000000000
--- a/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2021 Joschua Gandert
- *
- * 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_german.h"
-
-
-enum layer_names {
-    _BASE,
-    _GAME, /* WASD shifted right once  */
-    _LOWER,
-    _RAISE,
-    _ADJUST /* when both LOWER and RAISE pressed */
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    KC_ESC , KC_1  ,  KC_2  ,  KC_3  , KC_4  , KC_5  ,              KC_6  , KC_7  , KC_8   , KC_9  , KC_0   , DE_SS  ,
-    KC_TAB , KC_Q  ,  KC_W  ,  KC_E  , KC_R  , KC_T  ,              DE_Z  , KC_U  , KC_I   , KC_O  , KC_P   , DE_UDIA,
-    KC_LSFT, KC_A  ,  KC_S  ,  KC_D  , KC_F  , KC_G  ,              KC_H  , KC_J  , KC_K   , KC_L  , DE_ODIA, DE_ADIA,
-    KC_LCTL, DE_Y  ,  KC_X  ,  KC_C  , KC_V  , KC_B  ,              KC_N  , KC_M  , KC_COMM, KC_DOT, DE_MINS, DE_PLUS,
-
-                                  RAISE,  KC_SPC,   KC_LCTL,    KC_RALT,  KC_BSPC,  LOWER,
-                                          KC_ENT,   KC_LALT,    KC_LGUI,  KC_RSFT
-  ),
-
-  [_GAME] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    KC_T   , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   ,           _______, _______, KC_UP,   _______, _______, _______,
-    KC_G   , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   ,           _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-    KC_B   , KC_LCTL, DE_Y   , KC_X   , KC_C   , KC_V   ,           _______, _______, _______, _______, _______, _______,
-
-                                  _______, _______, _______,    _______, _______, _______,
-                                           _______, _______,    _______, _______
-  ),
-
-  [_LOWER] = LAYOUT(
-    KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,           KC_CIRC, KC_AMPR, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL     ,
-    _______, DE_HASH, DE_CIRC, KC_PGUP, DE_LABK, _______,           _______, KC_P7  , KC_P8  , KC_P9  , KC_PPLS, KC_BSPC    ,
-    _______, DE_ACUT, KC_HOME, KC_PGDN, KC_END , KC_LPRN,           KC_RPRN, KC_P4  , KC_P5  , KC_P6  , KC_PDOT, _______    ,
-    _______, KC_PLUS, KC_PIPE, KC_UNDS, _______, _______,           KC_P0  , KC_P1  , KC_P2  , KC_P3  , KC_PENT, KC_KP_EQUAL,
-
-                                  _______, KC_RGHT, _______,    _______, _______, _______,
-                                           KC_LEFT, _______,    QK_BOOT, _______
-  ),
-
-  [_RAISE] = LAYOUT(
-    KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NUM  ,  KC_CALC, KC_PSCR   , KC_MUTE,
-    _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
-    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SCRL   , KC_VOLD,
-
-                                  _______, _______, _______,    _______, KC_UP  , _______,
-                                           _______, _______,    _______, KC_DOWN
-  ),
-
-  [_ADJUST] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, QK_BOOT, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, DF(_GAME),         _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, DF(_BASE),         _______, _______, _______, _______, _______, _______,
-
-                                   _______, _______, _______,    _______, _______, _______,
-                                            _______, _______,    _______, _______
-  ),
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/hidtech/bastyl/keymaps/german_gaming/readme.md b/keyboards/hidtech/bastyl/keymaps/german_gaming/readme.md
deleted file mode 100644
index 9e6a328bcb8..00000000000
--- a/keyboards/hidtech/bastyl/keymaps/german_gaming/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-![German Gaming Layout Image](https://i.imgur.com/0y938rG.png)
-
-Despite being less accurate, the columns in the image are shifted up and down to avoid the [Hermann grid illusion](https://en.wikipedia.org/wiki/Grid_illusion).
-​
-
-# German Gaming Layout
-​
-This layout was build with gaming in mind for a german user. As a result I added a "game" layer that shifts the keys of the left side (below the number row) one to the right, so that <kbd>WASD</kbd> is on the <kbd>ESDF</kbd> keys. The reason this layer was added is that using <kbd>WASD</kbd> is less comfortable with a contoured Dactyl-style keyboard, where each column is adjusted for the respective fingers. <kbd>ESDF</kbd> also has the upside of allowing one to stay in the home row. Note that the rightmost column of the default layer, so <kbd>TGB</kbd>, ends up in the leftmost position.
-
-Of course, one could just be forced to reconfigure every game, but that wouldn't be very user-friendly and likely reduce satisfaction with the layout. When in game mode, the right side of keys also features arrow keys on <kbd>IJKL</kbd>.
-
-
-## Raise and Lower layer
-
-Additionally, via the RAISE layer, it's always possible to access the arrow keys, which are often used in game menues. On the exact same position one can access <kbd>Home</kbd>, <kbd>End</kbd>, <kbd>Page Down</kbd> and <kbd>Page Up</kbd> via the LOWER layer. The left side of the LOWER layer also contains the few characters that would usually have their own key in a traditional german keyboard.
-
-The right side features various media keys in the RAISE layer, and a numpad in the LOWER layer.
-
-
-## Firmware
-
-The keyboard can be put into Reset mode (for flashing a keymap) by pressing <kbd>**LOWER**</kbd> + <kbd>Super</kbd> (also known as Windows key), or by pressing <kbd>**LOWER**</kbd> + <kbd>**RAISE**</kbd> + <kbd>R</kbd>.
-
-`MOUSEKEY_ENABLE` was set to `no` for this keymap, since it wasn't used and the size of the firmware ended up being too large.
diff --git a/keyboards/hidtech/bastyl/keymaps/german_gaming/rules.mk b/keyboards/hidtech/bastyl/keymaps/german_gaming/rules.mk
deleted file mode 100644
index 0a5b666e855..00000000000
--- a/keyboards/hidtech/bastyl/keymaps/german_gaming/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h b/keyboards/hidtech/bastyl/keymaps/xyverz/config.h
deleted file mode 100644
index 4fa185e9564..00000000000
--- a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 300
-#define PERMISSIVE_HOLD
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 300
\ No newline at end of file
diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c b/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c
deleted file mode 100644
index 0e8ce2dc837..00000000000
--- a/keyboards/hidtech/bastyl/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* 
- * Copyright 2021 Ian Sterling <xyverz on Github.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 { _WINDOWS, _MAC, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { WINDOWS = SAFE_RANGE, MAC, ADJUST };
-
-// Aliases to keep the keymap tidy
-#define GUIBSPC GUI_T(KC_BSPC)  // GUI when held, BSPC when tapped.
-#define RGB_SWR RGB_M_SW        // Swirl Animation alias
-#define RGB_SNK RGB_M_SN        // Snake Animation alias
-#define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook!
-#define WINLOCK LGUI(KC_L)      // Lock my PC!
-#define DELGUI GUI_T(KC_DEL)
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-
-#define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook!
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_WINDOWS] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,        KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,        KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,        KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                             LOWER,   KC_BSPC, KC_DEL,      KC_ENT,  KC_SPC,  RAISE,
-                                      KC_LCTL, KC_LALT,     KC_RGUI, KC_RCTL
-  ),
-
-[_MAC] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,        KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,        KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,        KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                             LOWER,   KC_BSPC, DELGUI,      KC_ENT,  KC_SPC,  RAISE,
-                                      KC_LCTL, KC_LALT,     KC_RGUI, KC_RCTL
-  ),
-
-[_LOWER] = LAYOUT(
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  QK_BOOT, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
-  KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-                             _______, KC_DEL,  _______,     _______, _______, _______,
-                                      MACLOCK, _______,     _______, WINLOCK
-  ),
-
-[_RAISE] = LAYOUT(
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12, 
-  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, QK_BOOT,
-  KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-                             _______, KC_DEL,  _______,     _______, _______, _______,
-                                      MACLOCK, _______,     _______, WINLOCK
-  ),
-
-[_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,     _______, WINDOWS, MAC,     _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-                             _______, _______, _______,     _______, _______, _______,
-                                      _______, _______,     _______, _______
-  ),
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case WINDOWS:
-                set_single_persistent_default_layer(_WINDOWS);
-                return false;
-            case MAC:
-                set_single_persistent_default_layer(_MAC);
-                return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/readme.md b/keyboards/hidtech/bastyl/keymaps/xyverz/readme.md
deleted file mode 100644
index 89d11347d2a..00000000000
--- a/keyboards/hidtech/bastyl/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Bastyl
-
-A split ergonomic keyboard.
-
-* Keyboard Maintainer: [HID Technologies](https://github.com/HID-Technologies)
-* Hardware Supported: elite-C V4
-* Hardware Availability: [Hidtech.ca](https://www.hidtech.ca/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make hidtech/bastyl: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).
-
-See the [keyboard build instructions](https://hid-technologies.github.io/Bastyl-DIY-instructions/)
-
-
-## Important information regarding the reset
-
-If you modify this firmware, make sure to always have a `QK_BOOT` key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
-
-Otherwise if you're stuck, open the case and reset manually by shorting Gnd and Rst, or pressing the RST button.
diff --git a/keyboards/hillside/46/0_1/config.h b/keyboards/hillside/46/0_1/config.h
index 20c4deca40c..136be2f581f 100644
--- a/keyboards/hillside/46/0_1/config.h
+++ b/keyboards/hillside/46/0_1/config.h
@@ -6,6 +6,7 @@
 
 /* Split */
 #define SPLIT_HAND_MATRIX_GRID B5, F6
+#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
 #define MATRIX_MASKED
 
 /* Haptic hardware */
diff --git a/keyboards/hillside/52/0_1/config.h b/keyboards/hillside/52/0_1/config.h
index 20c4deca40c..136be2f581f 100644
--- a/keyboards/hillside/52/0_1/config.h
+++ b/keyboards/hillside/52/0_1/config.h
@@ -6,6 +6,7 @@
 
 /* Split */
 #define SPLIT_HAND_MATRIX_GRID B5, F6
+#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
 #define MATRIX_MASKED
 
 /* Haptic hardware */
diff --git a/keyboards/hineybush/h101/matrix_diagram.md b/keyboards/hineybush/h101/matrix_diagram.md
new file mode 100644
index 00000000000..48281f12eed
--- /dev/null
+++ b/keyboards/hineybush/h101/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Hineybush H101
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0B │0C │0D ││0E │ │0F │0G │0H │ │0I │0J │0K │0L │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ └───┴───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐   ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │1F │1G │1H │ │1I │1J │1K │1L │   │1E     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ├───┼───┼───┼───┤   └───────┘            ┌───┐
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2F │2G │2H │ │2I │2J │2K │2L │                        │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┼───┤                        │2L │ Numpad "+"
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │               │3I │3J │3K │3L │                        │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐     ├───┼───┼───┼───┤                        ├───┤
+│40      │42 │43 │44 │45 │46 │47 │48 │49 │3A │3B │4C    │4D │     │4G │     │4I │4J │4K │4L │                        │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ ├───┼───┼───┼───┤            ┌───────┐   │4L │ Numpad Enter
+│50  │51  │52  │57                      │5A  │5B  │5C  │5D  │ │5F │5G │5H │ │5I │5J │5K │5L │   Numpad 0 │5J     │   │   │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───┴───┴───┴───┘            └───────┘   └───┘
+                                                 ┌──────────┐
+                                    2.75u RShift │4C        │
+                                                 └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │57                         │5B   │5C │5D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/hineybush/h87_g2/config.h b/keyboards/hineybush/h87_g2/config.h
new file mode 100644
index 00000000000..f37f589f0a9
--- /dev/null
+++ b/keyboards/hineybush/h87_g2/config.h
@@ -0,0 +1,19 @@
+/*
+ * 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 BACKLIGHT_PWM_DRIVER PWMD3
+#define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_PAL_MODE 1
\ No newline at end of file
diff --git a/keyboards/hineybush/h87_g2/halconf.h b/keyboards/hineybush/h87_g2/halconf.h
new file mode 100644
index 00000000000..976d17d8919
--- /dev/null
+++ b/keyboards/hineybush/h87_g2/halconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2024 Josh Hinnebusch
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/hineybush/h87_g2/info.json b/keyboards/hineybush/h87_g2/info.json
index ea360f01ee7..13c17caa98f 100644
--- a/keyboards/hineybush/h87_g2/info.json
+++ b/keyboards/hineybush/h87_g2/info.json
@@ -2,9 +2,13 @@
     "manufacturer": "Hiney LLC",
     "keyboard_name": "h87_g2",
     "maintainer": "hineybush",
+    "backlight": {
+        "pin": "A6"
+    },
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
     "features": {
+        "backlight": true,
         "bootmagic": true,
         "command": false,
         "console": false,
@@ -12,6 +16,10 @@
         "mousekey": true,
         "nkro": true
     },
+    "indicators": {
+        "caps_lock": "B12",
+        "scroll_lock": "B14"
+    },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A5", "A4", "A3", "F1", "C15", "C14", "F0", "C13", "B9", "B8", "B5"],
         "rows": ["A15", "B3", "B4", "A0", "B6", "B7"]
@@ -23,95 +31,554 @@
         "pid": "0x0001",
         "vid": "0x4069"
     },
+    "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_ansi_split_bs_rshift",
+        "LAYOUT": "LAYOUT_tkl_ansi_tsangan"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
             "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-                {"label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25},
-                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25},
-                {"label": "PgUp", "matrix": [2, 16], "x": 17.25, "y": 1.25},
-                {"label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25},
-                {"label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "PgDn", "matrix": [4, 16], "x": 17.25, "y": 2.25},
-                {"label": "Caps", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "Apos", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25},
-                {"label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25},
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-                {"label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25},
-                {"label": "Win", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25},
-                {"matrix": [5, 6], "w": 7, "x": 4, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11, "y": 5.25},
-                {"label": "Win", "matrix": [5, 11], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25},
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/hineybush/h87_g2/keymaps/default/keymap.c b/keyboards/hineybush/h87_g2/keymaps/default/keymap.c
index b34ebaff829..d1432afc79d 100644
--- a/keyboards/hineybush/h87_g2/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h87_g2/keymaps/default/keymap.c
@@ -1,5 +1,6 @@
 // Copyright 2023 Josh Hinnebusch
 // SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -19,23 +20,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│GUI │Alt │                             │ Fn │ GUI│Ctrl│ │ ← │ ↓ │ → │
      * └────┴────┴────┴─────────────────────────────┴────┴────┴────┘ └───┴───┴───┘
      */
-    [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_PSCR, KC_SCRL, KC_PAUS,
+    [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_PSCR, KC_SCRL, KC_PAUS,
 
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_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_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,              KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1), KC_RGUI,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+        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_TRNS,                       KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_MENU, MO(1),  KC_RGUI,  KC_RCTL,              KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,                       KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                             KC_MPLY,                                    KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS
-    )
+    [1] = LAYOUT_all(
+		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/hineybush/h87_g2/keymaps/via/keymap.c b/keyboards/hineybush/h87_g2/keymaps/via/keymap.c
index 840b2f30a6d..d1432afc79d 100644
--- a/keyboards/hineybush/h87_g2/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h87_g2/keymaps/via/keymap.c
@@ -20,23 +20,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│GUI │Alt │                             │ Fn │ GUI│Ctrl│ │ ← │ ↓ │ → │
      * └────┴────┴────┴─────────────────────────────┴────┴────┴────┘ └───┴───┴───┘
      */
-    [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_PSCR, KC_SCRL, KC_PAUS,
+    [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_PSCR, KC_SCRL, KC_PAUS,
 
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_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_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,              KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1), KC_RGUI,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+        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_TRNS,                       KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_MENU, MO(1),  KC_RGUI,  KC_RCTL,              KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,                       KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                             KC_MPLY,                                    KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS
-    )
+    [1] = LAYOUT_all(
+		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/hineybush/h87_g2/mcuconf.h b/keyboards/hineybush/h87_g2/mcuconf.h
new file mode 100644
index 00000000000..7e226e43711
--- /dev/null
+++ b/keyboards/hineybush/h87_g2/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2024 Josh Hinnebusch
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3                  TRUE
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/config.h b/keyboards/hineybush/h87a/keymaps/gam3cat/config.h
deleted file mode 100644
index 334beb0ac2b..00000000000
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-//Force NKRO to be enabled.
-#define FORCE_NKRO
-
-//GRAVE_ESC override for CTRL+SHIFT+ESC Windows task manager shortcut.
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-//Delay matrix scan for tap dance, reduce to activate modifier keys faster.
-//#define TAPPING_TERM 200
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
deleted file mode 100644
index 6d064455b36..00000000000
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
+++ /dev/null
@@ -1,293 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layers {
-    _BL = 0,    // Base Layer
-    _WL,        // Workman Layer
-    _NL,        // Norman Layer
-    _DL,        // Dvorak Layer
-    _CL,        // Base Layer
-    _FL,        // Function Layer
-    _AL,        // Adjust Layer
-};
-
-enum custom_keycodes {
-    QMK_REV = SAFE_RANGE,
-    KC_WEB,
-    KC_SP4,
-    DYNAMIC_MACRO_RANGE
-};
-
-extern backlight_config_t backlight_config;
-
-#include "dynamic_macro.h"
-#define FN_CAPS LT(_FL, KC_CAPS)
-#define KC_DMR1 DM_REC1
-#define KC_DMR2 DM_REC2
-#define KC_DMP1 DM_PLY1
-#define KC_DMP2 DM_PLY2
-#define KC_DMRS DM_RSTP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*#### _BL: Base Layer - Standard TKL QWERTY layout.
-    *    .-----------------------------------------------------------------------.
-    *    |Esc|||||F1 |F2 |F3 |F4 |||F5 |F6 |F7 |F8 |||F9 |F10|F11|F12|PSc|SLk|Pau|
-    *    |-----------------------------------------------------------|-----------|
-    *    |~  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|Hom|PgU|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|End|PgD|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Fn |   | Up|   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Ctrl |Win|Alt  |      Space                |RAlt |Fn |Ctrl |Lft|Dwn|Rgt|
-    *    *-----------------------------------------------------------------------*
-    */
-    [_BL] = 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_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,
-        KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FL),                   KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RGUI, KC_RALT, MO(_FL), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*#### _WL: Workman Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_WL] = LAYOUT_all(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_D   , KC_R   , KC_W   , KC_B   , KC_J   , KC_F   , KC_U   , KC_P   , KC_SCLN, _______, _______, _______,          _______, _______, _______,
-        _______, KC_A   , KC_S   , KC_H   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_E   , KC_O   , KC_I   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_M   , KC_C   , KC_V   , KC_K   , KC_L   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    /*#### _NL: Norman Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_NL] = LAYOUT_all(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_W   , KC_D   , KC_F   , KC_K   , KC_J   , KC_U   , KC_R   , KC_L   , KC_SCLN, _______, _______, _______,          _______, _______, _______,
-        _______, KC_A   , KC_S   , KC_E   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_I   , KC_O   , KC_H   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_P   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    /*#### _DL: Dvorak Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_DL] = LAYOUT_all(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______,
-        _______, KC_QUOT, KC_COMM, KC_DOT , KC_P   , KC_Y   , KC_F   , KC_G   , KC_C   , KC_R   , KC_L   , KC_SLSH, KC_EQL , _______,          _______, _______, _______,
-        _______, KC_A   , KC_O   , KC_E   , KC_U   , KC_I   , KC_D   , KC_H   , KC_T   , KC_N   , KC_S   , KC_MINS, _______, _______,
-        _______, _______, KC_SCLN, KC_Q   , KC_J   , KC_K   , KC_X   , KC_B   , KC_M   , KC_W   , KC_V   , KC_Z   , _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    /*#### _CL: Colmak Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_CL] = LAYOUT_all(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, _______, _______, _______,          _______, _______, _______,
-        _______, KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    /*#### _FL: Function Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |VlM|VlD|VlU|   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |Web|   |   |   |   |   |   |   |   |   |   |   |   |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |   |   |   |   |   |   |Lft|Dwn|Up |Rgt|   |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |   |   |   |   |   |   |   |   |   |   |      |Fn |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |      SP4                  |     |Fn |     |WBk|   |WFw|
-    *    *-----------------------------------------------------------------------*
-    */
-    [_FL] = LAYOUT_all(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU,          XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_WEB,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        MO(_AL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                   XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_MENU,                            KC_SP4,                             XXXXXXX, _______, XXXXXXX, XXXXXXX,          KC_WBAK, XXXXXXX, KC_WFWD
-    ),
-    /*#### _AL: Adjust Layer - Keymap select, LED backlight, and Dynamic Macro settings.
-    *    .-----------------------------------------------------------------------.
-    *    |Rst|||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |   |MR1|MP1|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     | MS|MR2|MP2|
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |   |   |_DL|   |   |   |   |   |   |   |   |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |Fn |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |Fn |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_AL] = LAYOUT_all(
-        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
-        QMK_REV, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, BL_TOGG, BL_DOWN, BL_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_DMR1, KC_DMP1,
-        _______, DF(_BL), DF(_WL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_DMRS, KC_DMR2, KC_DMP2,
-        XXXXXXX, XXXXXXX, XXXXXXX, DF(_DL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(_CL), XXXXXXX, DF(_BL), DF(_NL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                   XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QMK_REV:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION ":" QMK_BUILDDATE);
-            }
-            return false;
-            break;
-        case KC_WEB:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LGUI("r"));
-                wait_ms(100);
-                SEND_STRING("chrome.exe\n");
-            }
-            return false;
-            break;
-        case KC_SP4:
-            if (record->event.pressed) {
-                SEND_STRING ("    ");
-            }
-            return false;
-            break;
-    }
-    // Dynamic Macros.
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    return true;
-}
-
-void custom_backlight_level(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS)
-        level = BACKLIGHT_LEVELS;
-    backlight_config.level = level;
-    backlight_config.enable = !!backlight_config.level;
-    backlight_set(backlight_config.level);
-}
-
-void matrix_init_user(void) {
-    #ifdef BACKLIGHT_ENABLE
-        custom_backlight_level(0);
-    #endif
-    #ifdef RGBLIGHT_ENABLE
-        rgblight_mode(1);
-        rgblight_sethsv_noeeprom(180,100,100);
-    #endif
-}
-
-void matrix_scan_user(void) {
-
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _BL:
-            custom_backlight_level(0);
-            rgblight_sethsv_noeeprom(180,100,255);
-            break;
-        case _WL:
-        case _NL:
-        case _DL:
-        case _CL:
-            custom_backlight_level(1);
-            rgblight_sethsv_noeeprom(230,255,255);
-            break;
-        case _FL:
-            custom_backlight_level(2);
-            rgblight_sethsv_noeeprom(240,255,255);
-            break;
-        case _AL:
-            custom_backlight_level(3);
-            rgblight_sethsv_noeeprom(255,255,255);
-            break;
-        default:
-            custom_backlight_level(0);
-            rgblight_sethsv_noeeprom(180,100,100);
-            break;
-    }
-    return state;
-}
-
-void led_init_ports(void) {
-  DDRD |= (1<<5); // OUT
-  DDRE |= (1<<6); // OUT
-}
-
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    DDRD |= (1 << 5); PORTD &= ~(1 << 5);
-  } else {
-    DDRD &= ~(1 << 5); PORTD &= ~(1 << 5);
-  }
-  if (led_state.scroll_lock) {
-    DDRE |= (1 << 6); PORTE &= ~(1 << 6);
-  } else {
-    DDRE &= ~(1 << 6); PORTE &= ~(1 << 6);
-  }
-  return false;
-}
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/readme.md b/keyboards/hineybush/h87a/keymaps/gam3cat/readme.md
deleted file mode 100644
index 5eb4c7d611e..00000000000
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/readme.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# Keymap Maintainer: Gam3cat
-make h87a:gam3cat
-## Layout Config:
-2u backspace, 2.25u lshift/enter, [2.75u rshift] or [1.75u rshift, 1u Fn].
-[1.5u, 1u, 1.5u 1x7.0u, 1.5u, 1u, 1.5u, 3x1u] or [2x1.5u, 1x7.0u, 2x1.5u, 3x1u] bottom row.
-
-## Base Layer Selection:
-(Fn+TAB+(  )): (Q)WERTY, (W)orkman, (N)orman, (D)vorak, (C)olmak
-
-### Base Layer Options:
-#### _BL: Base Layer - Standard TKL QWERTY layout.
-    .-----------------------------------------------------------------------.
-    |Esc|||||F1 |F2 |F3 |F4 |||F5 |F6 |F7 |F8 |||F9 |F10|F11|F12|PSc|SLk|Pau|
-    |-----------------------------------------------------------|-----------|
-    |~  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|Hom|PgU|
-    |-----------------------------------------------------------|-----------|
-    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|End|PgD|
-    |-----------------------------------------------------------|-----------|
-    |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |           |
-    |-----------------------------------------------------------|-----------|
-    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Fn |   | Up|   |
-    |-----------------------------------------------------------|-----------|
-    |Ctrl |Win|Alt  |      Space                |RAlt |Fn |Ctrl |Lft|Dwn|Rgt|
-    *-----------------------------------------------------------------------*
-
-#### _WL: Workman Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _NL: Norman Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _DL: Dvorak Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _CL: Colmak Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _FL: Function Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |VlM|VlD|VlU|   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |Web|   |   |   |   |   |   |   |   |   |   |   |   |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |   |   |   |   |   |   |Lft|Dwn|Up |Rgt|   |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |   |   |   |   |   |   |   |   |   |   |      |Fn |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |      SP4                  |     |Fn |     |WBk|   |WFw|
-    *-----------------------------------------------------------------------*
-
-#### _AL: Adjust Layer - Keymap select, LED backlight, and Dynamic Macro settings.
-    .-----------------------------------------------------------------------.
-    |Rst|||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |   |MR1|MP1|
-    |-----------------------------------------------------------|-----------|
-    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     | MS|MR2|MP2|
-    |-----------------------------------------------------------|-----------|
-    |      |   |   |_DL|   |   |   |   |   |   |   |   |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |Fn |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |Fn |     |   |   |   |
-    *-----------------------------------------------------------------------*
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/rules.mk b/keyboards/hineybush/h87a/keymaps/gam3cat/rules.mk
deleted file mode 100644
index 7b35b90178b..00000000000
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-TAP_DANCE_ENABLE = no       # Enable TapDance functionality
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+1500)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes           # Nkey Rollover - If this doesn't work, add this to config.h: #define FORCE_NKRO
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = no      # Enable extended unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-#VARIABLE_TRACE = no         # Use this to debug changes to variable values
-KEY_LOCK_ENABLE = no        # This enables key lock(+260)
-SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
diff --git a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c b/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
deleted file mode 100644
index 0c142e5759b..00000000000
--- a/keyboards/hineybush/h87a/keymaps/peott-fr/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Pierre-Emmanuel Ott
- *
- * 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
-
-/* This is a very basic TKL keymap. Note that I use Split Backspace AND Split right shift, to use fewer stabilizers and due to muscle-memory from 60% boards.
- * That's about it really... there's really nothing fancy here besides media key on base layer through Mod Tap.
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [0] = LAYOUT_all(KC_NO, 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_SCRL, KC_PAUS, 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_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL, KC_END, 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_ENT, SC_LSPO, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, LT(2,KC_HOME), KC_UP, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_APP, RCTL_T(KC_END), KC_LEFT, KC_DOWN, KC_RGHT),
-        [1] = LAYOUT_all(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DOWN,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-        [2] = LAYOUT_all(KC_TRNS, 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, QK_BOOT, 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, RGB_TOG, RGB_MOD, RGB_HUI, 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, RGB_SAI, RGB_VAI, RGB_SPI, KC_CAPS, 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, 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, KC_NO)
-};
\ No newline at end of file
diff --git a/keyboards/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c
index df17650f27f..754b63b2009 100644
--- a/keyboards/hineybush/hbcp/hbcp.c
+++ b/keyboards/hineybush/hbcp/hbcp.c
@@ -70,7 +70,7 @@ bool led_update_kb(led_t led_state) {
 
 __attribute__ ((weak))
 void keyboard_post_init_user(void) {
-    rgblight_set_effect_range(3, RGBLED_NUM-3);
+    rgblight_set_effect_range(3, RGBLIGHT_LED_COUNT-3);
     led_t led_state = {
         .caps_lock = true,
         .num_lock = true,
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
deleted file mode 100644
index 04f132f4a44..00000000000
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* 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
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_LED_COUNT 86
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-    /* RGB Matrix effect */
-    #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
-
-    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-    #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
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
index 7f8a448d077..6146bd517a8 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
@@ -10,7 +10,53 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["B1", "B0", "B5", "B6", "C6", "C7", "E2", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index f957465cd07..bc7924165d9 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -40,27 +40,4 @@
     #define OLED_FONT_H "lib/glcdfont.c"
 #endif
 
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_LED_COUNT 24
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-
-    /* RGB Matrix effect */
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-    #define ENABLE_RGB_MATRIX_BREATHING
-    #define ENABLE_RGB_MATRIX_BAND_VAL
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_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_PINWHEEL
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-    #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
-#endif
+#define RGB_MATRIX_LED_COUNT 24
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
index b064df38c2d..6eb5cbd80ec 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -13,7 +13,28 @@
         "pin": "C14"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"],
diff --git a/keyboards/horrortroll/lemon40/lemon40.c b/keyboards/horrortroll/lemon40/lemon40.c
index 75321f41b33..ad42e93e676 100644
--- a/keyboards/horrortroll/lemon40/lemon40.c
+++ b/keyboards/horrortroll/lemon40/lemon40.c
@@ -20,18 +20,21 @@
 #include "lib/bongocat.h"
 
 #ifdef OLED_ENABLE
-    bool oled_task_kb(void) {
-        led_t led_usb_state = host_keyboard_led_state();
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    led_t led_usb_state = host_keyboard_led_state();
 
-        render_bongocat();
-        oled_set_cursor(14, 0); // sets cursor to (column, row) using charactar spacing (4 rows on 128x32 screen, anything more will overflow back to the top)
-        oled_write_P(PSTR("WPM:"), false);
-        oled_write(get_u8_str(get_current_wpm(), '0'), false); // writes wpm on top right corner of string
-        oled_set_cursor(17, 2);
-        oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-        oled_set_cursor(17, 3);
-        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
+    render_bongocat();
+    oled_set_cursor(14, 0); // sets cursor to (column, row) using charactar spacing (4 rows on 128x32 screen, anything more will overflow back to the top)
+    oled_write_P(PSTR("WPM:"), false);
+    oled_write(get_u8_str(get_current_wpm(), '0'), false); // writes wpm on top right corner of string
+    oled_set_cursor(17, 2);
+    oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+    oled_set_cursor(17, 3);
+    oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
 
-        return true;
-    }
+    return true;
+}
 #endif
diff --git a/keyboards/horrortroll/nyx/rev1/config.h b/keyboards/horrortroll/nyx/rev1/config.h
deleted file mode 100644
index 9126bfe0855..00000000000
--- a/keyboards/horrortroll/nyx/rev1/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2023 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
-
-/* RGB Matrix config */
-#define RGB_MATRIX_LED_COUNT 67
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/hotdox/keymaps/bliss/keymap.c b/keyboards/hotdox/keymaps/bliss/keymap.c
deleted file mode 100644
index b83114d0248..00000000000
--- a/keyboards/hotdox/keymaps/bliss/keymap.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2021 Benjamin Chausse
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {
-    BASE, // default layer
-    FUNC, // functions keys, numbpad, and arrows
-};
-
-enum custom_keycodes {
-  VRSN = SAFE_RANGE,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: default layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |    `   |   1  |   2  |   3  |   4  |   5  |   6  |           |   7  |   8  |   9  |   0  |   -  |   =  |  BkSp  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |   {  |           |  }   |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | TUX    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | '/TUX  |
- * |--------+------+------+------+------+------|   ^  |           |  &   |------+------+------+------+------+--------|
- * | Shft/( |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  | Shft/) |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Ctrl |  Alt | Caps |  MP1 | FUNC |                                       |  MR1 |  MS1 |   [  |   ]  | TFUNC |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,---------------.
- *                                        |      | Prnt |       | INS  |  HOME  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Vol+ |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Enter |  :   |
- *                                 |      |ace   | Vol- |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- *
- * MR1: Record macro 1               Prnt: Print Screen
- * MS1: Stop recording macro 1       INS: INSERT
- * MP1: Play macro 1                 TFUNC: Goto FUNC only while pressed
- * FUNC: Set FUNC as default layer
- *
- *
- */
-
-/* If it accepts an argument (i.e, is a function), it doesn't need KC_. */
-/* Otherwise, it needs KC_* */
-	[BASE] = LAYOUT_ergodox( /* layer 0: default */
-      /* Left hand */
-      KC_GRV,               KC_1,    KC_2,    KC_3,    KC_4,  KC_5, KC_6,
-      KC_TAB,               KC_Q,    KC_W,    KC_E,    KC_R,  KC_T, LSFT(KC_LBRC),
-      MT(MOD_LGUI, KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,  KC_G,
-      SC_LSPO,              KC_Z,    KC_X,    KC_C,    KC_V,  KC_B, LSFT(KC_6),
-      KC_LCTL,              KC_LALT, KC_CAPS, DM_PLY1, DF(1),
-
-      KC_NO, KC_PSCR,
-      KC_VOLU,
-      KC_SPC, KC_BSPC, KC_VOLD,
-
-      /* right hand */
-      KC_7,          KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,                KC_BSPC,
-      RSFT(KC_RBRC), KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,                  KC_BSLS,
-      KC_H,          KC_J,    KC_K,    KC_L,    KC_SCLN, MT(MOD_RGUI, KC_QUOT),
-      RSFT(KC_7),    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,               SC_RSPC,
-      DM_REC1,       DM_RSTP, KC_LBRC, KC_RBRC, MO(1),
-
-      KC_INS,  KC_HOME,
-      KC_PGUP,
-      KC_PGDN, KC_ENT,  RSFT(KC_SCLN)),
-
-/* Keymap 1: function keys, numpad, and arrows
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  | F10  | F11  | F12  |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |  UP  |      |      |      |           |      |   /  |   7  |   8  |   9  |   -  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      | LEFT | DOWN |RIGHT |      |------|           |------|   *  |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |   %  |   1  |   2  |   3  |   ,  | Shft/) |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Ctrl |  Alt | Caps |      | MAIN |                                       |   0  |   .  |  [   |   ]  |       |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,---------------.
- *                                        |      | Prnt |       | Ins  |  Home  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Vol+ |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Enter | Equal|
- *                                 |      |ace   | Vol- |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-
-	[FUNC] = LAYOUT_ergodox( /* layer 1: func */
-    /* left hand */
-    KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,
-    KC_NO,   KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_NO, KC_NO,
-    KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,
-    KC_LCTL, KC_LALT, KC_CAPS, KC_NO,   DF(0),
-
-    KC_NO,   KC_PSCR,
-    KC_VOLU,
-    KC_SPC,  KC_BSPC, KC_VOLD,
-
-    /* right hand */
-    KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,
-    KC_NO,   KC_PSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_BSLS,
-    KC_PAST, KC_P4,      KC_P5,   KC_P6,   KC_PPLS, KC_NO,
-    KC_NO,   LSFT(KC_5), KC_P1,   KC_P2,   KC_P3,   KC_PCMM, SC_RSPC,
-    KC_P0,   KC_PDOT,    KC_LBRC, KC_RBRC, KC_NO,
-
-    KC_INS,  KC_HOME,
-    KC_PGUP,
-    KC_PGDN, KC_ENT,  KC_PEQL)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-};
diff --git a/keyboards/hotdox/keymaps/bliss/readme.md b/keyboards/hotdox/keymaps/bliss/readme.md
deleted file mode 100644
index a31ee2826ec..00000000000
--- a/keyboards/hotdox/keymaps/bliss/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Bliss for Hotdox
-
-This keymap for the ergodox hotdox is a take on a development setup I quite
-enjoy. Developers constantly use brackets and they should therefore be
-accessible instead of hidden away behind a shift key. Also this setup aims to minimize hand travel with a layer containing a numpad as well as arrows. Finally,
-this setup incorporates a dynamic macro recorder for an easy, software agnostic way to program macros.
-
-All keybinding diagrams can be read in the `keymap.c` file. It is quite well documented.
diff --git a/keyboards/hotdox/keymaps/bliss/rules.mk b/keyboards/hotdox/keymaps/bliss/rules.mk
deleted file mode 100644
index ca616d75eed..00000000000
--- a/keyboards/hotdox/keymaps/bliss/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-
-EXTRAKEY_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/hotdox/keymaps/eozaki/keymap.c b/keyboards/hotdox/keymaps/eozaki/keymap.c
deleted file mode 100644
index d30308fa285..00000000000
--- a/keyboards/hotdox/keymaps/eozaki/keymap.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   1  |   2  |   3  |   4  |   5  |  ~   |           |  '   |   6  |   7  |   8  |   9  |   0  |   =    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  ~   |           |  "   |   Y  |   U  |   I  |   O  |   P  |   -    |
- * |--------+------+------+------+------+------|  `   |           |      |------+------+------+------+------+--------|
- * | Ctrl   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   |    \   |
- * |--------+------+------+------+------+------|  {   |           |  }   |------+------+------+------+------+--------|
- * | LAlt   |   Z  |   X  |   C  |   V  |   B  |  [   |           |  ]   |   N  |   M  |   ,  |   .  |  /   | LShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | LT-1 |  F4  |  F5  |  F6  |  F11 |                                       | Left | Down |  Up  | Right|  RAlt  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |  L1  | Prev |       | Vol+ |  L2  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Play |       | Vol- |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | Next |       | Mute |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LSFT(KC_GRV),
-        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_GRV,
-        KC_LCTL,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LALT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_LBRC,
-        LT(SYMB, KC_F2),       KC_F4,        KC_F5,  KC_F6,  KC_F11,
-                                                   TG(SYMB),  KC_MPRV,
-                                                              KC_MPLY,
-                                               KC_SPC,KC_BSPC,KC_MNXT,
-        // right hand
-             KC_QUOT,         KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_EQL,
-             LSFT(KC_QUOT),  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_MINS,
-                              KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),KC_BSLS,
-             KC_RBRC,         KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_LSFT,
-                              KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_RALT,
-             KC_VOLU,        TG(MDIA),
-             KC_VOLD,
-             KC_MUTE,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- * | EE_CLR  |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |Animat|      |       |Toggle|Solid |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |Bright|Bright|      |       |      |Hue-  |Hue+  |
- *                                 |ness- |ness+ |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       EE_CLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       RGB_MOD,KC_TRNS,
-                                               KC_TRNS,
-                               RGB_VAD,RGB_VAI,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       RGB_TOG, RGB_SLD,
-       KC_TRNS,
-       KC_TRNS, RGB_HUD, RGB_HUI
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_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_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
-                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/hotdox/keymaps/kloki/keymap.c b/keyboards/hotdox/keymaps/kloki/keymap.c
deleted file mode 100644
index 2550b68978b..00000000000
--- a/keyboards/hotdox/keymaps/kloki/keymap.c
+++ /dev/null
@@ -1,210 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-#define BASE 0 // default layer
-#define QW 1 // qwerty
-#define SYMB 2 // symbols
-#define NUM 3 // media keys
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   1  |   2  |   3  |   4  |   5  | SHIFT|           | SYM  |   6  |   7  |   8  |   9  |   0  |   Bck  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   D  |   R  |   W  |   B  | `~   |           |  "'  |   J  |   F  |   U  |   P  |   :  |   \ |  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Ctr/Es |   A  |   S  |   H  |   T  |   G  |------|           |------|   Y  |   N  |   E  |   O  |  I   | Enter  |
- * |--------+------+------+------+------+------| = +  |           |  -_  |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   M  |   C  |   V  |      |           |      |   K  |   L  |   ,  |   .  | /    | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |MEH   |  Gui |AltShf| Left | Right|                                       | DOWN | UP   |   [  |   ]  | ~SYM |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | ESC  |Home  |       | PgUp  | QW  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |  ENT | End  |       | PgDn |        |      |
- *                                 | Space| WIN  |------|       |------|  Tab   |Back  |
- *                                 |  SYM |      | SCTR |       | SALT |   SYM  |      |
- *                                 `--------------------'       `----------------------'
- */
-
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,         KC_1,        KC_2,     KC_3,   KC_4,   KC_5,   KC_LSFT,
-        KC_TAB,         KC_Q,        KC_D,     KC_R,   KC_W,   KC_B,   KC_GRV,
-        CTL_T(KC_ESC),  KC_A,        KC_S,     KC_H,   KC_T,   KC_G,
-        KC_LSFT,        KC_Z,        KC_X,     KC_M,   KC_C,   KC_V,   KC_EQL,
-        KC_MEH,         KC_LGUI,     KC_LALT,  KC_LEFT,KC_RGHT,
-                                                       KC_ESC,  KC_HOME,
-                                                                KC_END,
-                            LT(SYMB, KC_SPC),   LGUI_T(KC_ENT), S(KC_LGUI),
-        // right hand
-             TG(NUM),     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,     KC_BSPC,
-             KC_QUOT,     KC_J,   KC_F,   KC_U,   KC_P,   KC_SCLN,  KC_BSLS,
-                          KC_Y,   KC_N,   KC_E,   KC_O,   KC_I ,    KC_ENT,
-             KC_MINS,     KC_K,   KC_L,   KC_COMM,KC_DOT, KC_SLSH,  KC_RSFT,
-                                  KC_DOWN,KC_UP,  KC_LBRC,KC_RBRC,  MO(SYMB),
-                       KC_PGUP,  TG(QW),
-             KC_PGDN,
-             S(KC_LALT),LT(SYMB, KC_TAB), KC_BSPC
-    ),
-
-[QW] = LAYOUT_ergodox(
-       _______, _______, _______, _______, _______, _______, _______,
-       _______, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______,
-       _______, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-       _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______,
-       _______, _______, _______, _______, _______,
-                                           _______, _______,
-                                                    _______,
-                                  _______, _______, _______,
-    // right hand
-       _______,  _______, _______, _______, _______, _______, _______,
-       _______,  KC_Y,    KC_U,    KC_I   , KC_O,    KC_P,    _______,
-                 KC_H,    KC_J,    KC_K   , KC_L,    KC_SCLN, _______,
-       _______,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
-                          _______, _______, _______, _______, _______,
-       _______, _______,
-       _______,
-       _______, _______, _______
-),
-/* Keymap 1: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |         |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   DEL  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   !  |   @  |   {  |   }  |   *  |      |           |      |   <  |  H  |   U  |   PU  |   *  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   #  |   $  |   (  |   )  |   `  |------|           |------|   >  |   L  |   D  |   R  |   +  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   E  |   D  |  PD  |   \  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |      |      |      |      |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  _______,
-       _______,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_ASTR,_______,
-       _______,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       _______,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,_______,
-       _______,_______,_______,_______,_______,
-                                       _______,_______,
-                                               _______,
-                               _______,_______,_______,
-       // right hand
-       _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_DEL,
-       _______, KC_LABK, KC_HOME, KC_UP,   KC_PGUP,  KC_ASTR, _______,
-                KC_RABK, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PLUS, _______,
-       _______, KC_AMPR, KC_END,  KC_DOWN, KC_PGDN,  KC_BSLS, _______,
-                         _______, _______, _______,  _______, _______,
-       _______, _______,
-       _______,
-       _______, _______, _______
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |  L   | MsUp |   R  |      |      |           |      |      |  4   |   5  |  6   |      |  TAB   |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |  1   |   2  |   3  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |   0  |   0  |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[NUM] = LAYOUT_ergodox(
-       _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______,
-       _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
-       _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______,
-                                           _______, _______,
-                                                    _______,
-                                  _______, _______, _______,
-    // right hand
-       _______,  _______, _______, _______, _______, _______, _______,
-       _______,  _______, KC_4,    KC_5   , KC_6,    _______, KC_TAB,
-                 _______, KC_1,    KC_2   , KC_3,    _______, _______,
-       _______,  _______, _______, KC_0,    KC_0,    _______, _______,
-                          _______, _______, _______, _______, _______,
-       _______, _______,
-       _______,
-       _______, _______, _______
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case 1:
-            ergodox_board_led_on();
-            break;
-        case 3:
-            ergodox_board_led_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/hotdox/left.c b/keyboards/hotdox/left.c
index 970d36f1b56..f963ecdae78 100644
--- a/keyboards/hotdox/left.c
+++ b/keyboards/hotdox/left.c
@@ -5,8 +5,8 @@
 bool i2c_initialized = false;
 
 void left_config(void);
-uint8_t left_write(uint8_t reg, uint8_t data);
-uint8_t left_read(uint8_t reg, uint8_t *data);
+i2c_status_t left_write(uint8_t reg, uint8_t data);
+i2c_status_t left_read(uint8_t reg, uint8_t *data);
 
 uint8_t init_mcp23017(void)
 {
@@ -35,12 +35,11 @@ void left_init(void)
 
 void left_scan(void)
 {
-    uint8_t ret = i2c_start(I2C_ADDR_WRITE, HOTDOX_I2C_TIMEOUT);
+    
+    i2c_status_t ret = i2c_ping_address(I2C_ADDR, HOTDOX_I2C_TIMEOUT);
 
-    if (ret == 0)
+    if (ret == I2C_STATUS_SUCCESS)
     {
-        i2c_stop();
-
         if (!i2c_initialized)
         {
             i2c_initialized = true;
@@ -91,40 +90,29 @@ void left_config(void)
   left_write(MCP23017_B0_GPIOB,  0xC0);
 }
 
-uint8_t left_write(uint8_t reg, uint8_t data)
+i2c_status_t left_write(uint8_t reg, uint8_t data)
 {
   if (!i2c_initialized)
   {
     return 0;
   }
 
-  uint8_t ret;
+  i2c_status_t ret;
 
-  ret = i2c_start(I2C_ADDR_WRITE, HOTDOX_I2C_TIMEOUT);     if (ret) goto out;
-  ret = i2c_write(reg, HOTDOX_I2C_TIMEOUT);                if (ret) goto out;
-  ret = i2c_write(data, HOTDOX_I2C_TIMEOUT);
+  ret = i2c_writeReg(I2C_ADDR, reg,  &data, sizeof(data), HOTDOX_I2C_TIMEOUT); 
 
-out:
-  i2c_stop();
   return ret;
 }
 
-uint8_t left_read(uint8_t reg, uint8_t *data)
+i2c_status_t left_read(uint8_t reg, uint8_t *data)
 {
   if (!i2c_initialized)
   {
     return 0;
   }
 
-  uint8_t ret = 0;
-
-  ret = i2c_start(I2C_ADDR_WRITE, HOTDOX_I2C_TIMEOUT);     if (ret) goto out;
-  ret = i2c_write(reg, HOTDOX_I2C_TIMEOUT);                if (ret) goto out;
-  ret = i2c_start(I2C_ADDR_READ, HOTDOX_I2C_TIMEOUT);      if (ret) goto out;
-
-  *data = i2c_read_nack(HOTDOX_I2C_TIMEOUT);
+  i2c_status_t ret = 0;
+  ret = i2c_readReg(I2C_ADDR, reg, data, 1, HOTDOX_I2C_TIMEOUT);
 
-out:
-  i2c_stop();
   return ret;
 }
diff --git a/keyboards/hotdox/left.h b/keyboards/hotdox/left.h
index 3d8b5a6ead8..32faadba219 100644
--- a/keyboards/hotdox/left.h
+++ b/keyboards/hotdox/left.h
@@ -10,10 +10,7 @@
 #define MCP23017_A1 0
 #define MCP23017_A2 0
 
-#define I2C_ADDR        (0x20)
-#define I2C_ADDR_WRITE  ((I2C_ADDR << 1) | I2C_WRITE)
-#define I2C_ADDR_READ   ((I2C_ADDR << 1) | I2C_READ)
-
+#define I2C_ADDR        ((0x20) << 1)
 
 #define MCP23017_B0_IODIRA     0x00
 #define MCP23017_B0_IODIRB     0x01
@@ -40,8 +37,6 @@
 
 #define HOTDOX_I2C_TIMEOUT     100
 
-typedef int16_t i2c_status_t;
-
 void left_init(void);
 void left_scan(void);
 
diff --git a/keyboards/hotdox76v2/config.h b/keyboards/hotdox76v2/config.h
index 3d80775073f..f3b95890b2f 100644
--- a/keyboards/hotdox76v2/config.h
+++ b/keyboards/hotdox76v2/config.h
@@ -20,19 +20,4 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGB_MATRIX_SPLIT \
-    { 43, 43 }
-
-#define RGB_MATRIX_LED_COUNT 86
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_CENTER \
-    { 112, 32 }
-
 #define SPLIT_TRANSACTION_IDS_KB KEYBOARD_CURRENT_ALPA_SYNC
-
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json
index a42bdb3a799..30fd71f62a6 100644
--- a/keyboards/hotdox76v2/info.json
+++ b/keyboards/hotdox76v2/info.json
@@ -11,7 +11,6 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "lto": true,
         "oled": true,
         "rgb_matrix": true
     },
@@ -19,7 +18,17 @@
         "lto": true
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "cycle_left_right": true,
+            "cycle_out_in_dual": true
+        },
+        "center_point": [112, 32],
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sleep": true,
+        "split_count": [43, 43]
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6"],
diff --git a/keyboards/hotdox76v2/keymaps/dancxjo/config.h b/keyboards/hotdox76v2/keymaps/dancxjo/config.h
deleted file mode 100644
index fac328091d3..00000000000
--- a/keyboards/hotdox76v2/keymaps/dancxjo/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2023 Travis Reed (@dancxjo)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
-#define EE_HANDS
diff --git a/keyboards/hotdox76v2/keymaps/dancxjo/keymap.c b/keyboards/hotdox76v2/keymaps/dancxjo/keymap.c
deleted file mode 100644
index 1f55685de06..00000000000
--- a/keyboards/hotdox76v2/keymaps/dancxjo/keymap.c
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2023 Travis Reed (@dancxjo)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layer {
-    _ENGRAM = 0,
-    _QWERTY,
-    _ENGRAM_SHIFT,
-    _FUNCTION,
-    _MEDIA
-};
-
-/* Combines the compose key (right super) and the AltGr */
-#define KC_COMP MT(MOD_RALT, KC_RGUI)
-#define KC_SCMP MT(MOD_RSFT | MOD_RALT, KC_RGUI)
-
-#define KC_STAB MT(MOD_LSFT, KC_TAB)
-
-/* Use a fake shift layer since Engram switches level 2 assignments */
-#define KC_PSFT MO(_ENGRAM_SHIFT)
-
-#define KC_FUNC TT(_FUNCTION)
-#define KC_MEDI TT(_MEDIA)
-
-/* Easily switch between MacOS & other OSes*/
-#define KC_HLM1 LM(1, MOD_LCTL)
-#define KC_HLM2 LM(1, MOD_LGUI)
-#define KC_SHM1 LM(1, MOD_LCTL | MOD_LSFT)
-#define KC_SHM2 LM(1, MOD_LGUI | MOD_LSFT)
-#define KC_STRN RSFT(KC_TRNS)
-
-#define KC_FORW LGUI(KC_TAB)
-#define KC_BACK LGUI(LSFT(KC_TAB))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        /* Differs slightly from official Engram in that {} are the level 1 and [] are the level 2 */
-        [_ENGRAM] = LAYOUT_ergodox_pretty(
-            KC_LCBR, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    CG_NORM, KC_PAUSE, KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_RCBR,
-            KC_TAB,  KC_B,    KC_Y,    KC_O,    KC_U,    KC_QUOT, KC_AT,   KC_HASH,  KC_DQUO, KC_L,    KC_D,    KC_W,   KC_V,    KC_Z,
-            KC_CAPS, KC_C,    KC_I,    KC_E,    KC_A,    KC_COMM,                    KC_DOT,  KC_H,    KC_T,    KC_S,   KC_N,    KC_Q,
-            KC_PSFT, KC_G,    KC_X,    KC_J,    KC_K,    KC_MINS, KC_SLSH, KC_PSCR,  KC_QUES, KC_R,    KC_M,    KC_F,   KC_P,    KC_PSFT,
-            KC_HLM1, KC_FUNC, KC_MEDI, KC_LALT, KC_HLM2,                             KC_RGUI, KC_RALT, KC_MEDI, KC_FUNC,KC_HLM1,
-                                       KC_INS,  KC_HOME,                             KC_END,  KC_DEL,
-                                                KC_PGUP,                             KC_PGDN,
-                                       KC_ENT,  KC_ESC,  KC_LSFT,                    KC_RSFT, KC_BSPC, KC_SPC
-        ),
-        [_ENGRAM_SHIFT] = LAYOUT_ergodox_pretty(
-            KC_LBRC, KC_PIPE,    KC_EQL,     KC_TILD,    KC_PLUS,    KC_LT,   CG_SWAP, KC_STRN, KC_GT,   KC_CIRC,    KC_AMPR,    KC_PERC,    KC_ASTR,    KC_RBRC,
-            KC_STRN, RSFT(KC_B), RSFT(KC_Y), RSFT(KC_O), RSFT(KC_U), KC_LPRN, KC_GRV,  KC_DLR,  KC_RPRN, RSFT(KC_L), RSFT(KC_D), RSFT(KC_W), RSFT(KC_V), RSFT(KC_Z),
-            KC_STRN, RSFT(KC_C), RSFT(KC_I), RSFT(KC_E), RSFT(KC_A), KC_SCLN,                   KC_COLN, RSFT(KC_H), RSFT(KC_T), RSFT(KC_S), RSFT(KC_N), RSFT(KC_Q),
-            KC_TRNS, RSFT(KC_G), RSFT(KC_X), RSFT(KC_J), RSFT(KC_K), KC_UNDS, KC_BSLS, KC_STRN, KC_EXLM, RSFT(KC_R), RSFT(KC_M), RSFT(KC_F), RSFT(KC_P), KC_TRNS,
-            KC_SHM1, KC_STRN,    KC_STRN,    KC_STRN,    KC_SHM2,                               KC_STRN, KC_STRN,    KC_STRN,    KC_STRN,    KC_SHM1,
-                                             KC_STRN,    KC_STRN,                               KC_HYPR, KC_STRN,
-                                                         KC_STRN,                               KC_STRN,
-                                             KC_SHM1,    KC_STRN,    KC_STRN,                   KC_SHM2, KC_STRN, KC_STRN
-        ),
-        [_QWERTY] = LAYOUT_ergodox_pretty(
-            KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS, KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-            KC_TRNS, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-            KC_TRNS, 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_EQL, KC_TRNS,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                       KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS,
-                                                KC_TRNS,                            KC_TRNS,
-                                       KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-        [_FUNCTION] = LAYOUT_ergodox_pretty(
-            KC_PSCR, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_BRID, KC_BRIU, KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10, KC_PWR,
-            KC_APP,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  TG(1),   TG(1),   KC_F16,  KC_F17,  KC_F18,  KC_F19,   KC_F20, KC_SLEP,
-            KC_SCRL, KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,  KC_WAKE,
-            KC_PAUS, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE, KC_NO,   CG_SWAP, CG_NORM, KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,  QK_BOOT,
-            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,                                   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,
-                                       RGB_SAD, RGB_HUD,                                     RGB_HUI, RGB_SAI,
-                                                RGB_RMOD,                                     RGB_MOD,
-                                       RGB_SPD, RGB_VAD, KC_TRNS,                  KC_TRNS, RGB_VAI, RGB_SPI
-        ),
-        [_MEDIA] = LAYOUT_ergodox_pretty(
-            KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_WREF, 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_WREF, KC_NO,   KC_NO, KC_NO, KC_NO,   KC_PGUP, KC_UP,   KC_PGDN, KC_MSEL, KC_NO,
-            KC_NO,   KC_NO, KC_WSTP, KC_MYCM, KC_WSCH, KC_FIND,               KC_WHOM, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO,   KC_NO,
-            KC_LSFT, KC_NO, KC_NO,   KC_CALC, KC_NO,   KC_WFAV, KC_NO, KC_NO, KC_NO,   KC_HOME, KC_MAIL, KC_END, KC_NO,   KC_NO,
-            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,                                   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,
-                                   KC_MUTE, KC_EJCT,                                 KC_MSTP, KC_MPLY,
-                                            KC_MPRV,                                 KC_MNXT,
-                                   KC_MRWD, KC_VOLD, KC_TRNS,                        KC_TRNS, KC_VOLU, KC_MFFD
-        )
-};
-
-char* get_layer_name(uint8_t layer, bool capitalized) {
-    char *layer_name = "Unknown ";
-
-    switch (layer) {
-        case _ENGRAM:
-        case _ENGRAM_SHIFT:
-            if (capitalized) {
-                layer_name = "ENGRAM  ";
-            } else {
-                layer_name = "engram  ";
-            }
-            break;
-        case _QWERTY:
-            if (capitalized) {
-                layer_name = "QWERTY  ";
-            } else {
-                layer_name = "qwerty  ";
-            }
-            break;
-        case _MEDIA:
-            layer_name = "Media+  ";
-            break;
-        case _FUNCTION:
-            layer_name = "Function";
-            break;
-    }
-    return layer_name;
-}
-
-void render_locks(led_t led_state) {
-    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-}
-
-void render_mods(uint8_t modifiers, uint8_t layer) {
-    oled_write_P(modifiers & MOD_MASK_GUI ? PSTR("Super") : PSTR("     "), false);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(modifiers & MOD_MASK_ALT ? PSTR("Alt") : PSTR("   "), false);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(modifiers & MOD_MASK_CTRL ? PSTR("Ctl") : PSTR("   "), false);
-    oled_write_P(PSTR(" "), false);
-
-    if (layer == _ENGRAM_SHIFT) {
-        oled_write_P(PSTR("Pseudo"), false);
-    } else {
-        oled_write_P(modifiers & MOD_MASK_SHIFT ? PSTR("Shift ") : PSTR("      "), false);
-    }
-}
-
-char* get_helm_key(void) {
-    if (keymap_config.swap_lctl_lgui) {
-        return "Super";
-    } else {
-        return "Control";
-    }
-}
-
-bool oled_task_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-    uint8_t modifiers = get_mods()|get_oneshot_mods();
-    led_t led_state = host_keyboard_led_state();
-
-    bool real_shifted = modifiers & MOD_MASK_SHIFT;
-    bool pseudo_shifted = layer == _ENGRAM_SHIFT;
-    bool shifted = real_shifted || pseudo_shifted;
-    bool caps = led_state.caps_lock;
-    bool capitalized = (caps && !shifted) || (!caps && shifted);
-
-    oled_write_P(PSTR("Layer: "), false);
-    oled_write(get_layer_name(layer, capitalized), false);
-    oled_write_P(PSTR("\n"), false);
-
-    // Only the master knows if we've swapped the gui and ctl key
-    if (is_keyboard_master()) {
-        oled_write_P(PSTR(" Helm: "), false);
-        oled_write(get_helm_key(), false);
-    }
-
-    oled_write_P(PSTR("\n"), false);
-
-    render_mods(modifiers, layer);
-    oled_write_P(PSTR("\n"), false);
-
-    render_locks(led_state);
-
-    return false;
-}
diff --git a/keyboards/hotdox76v2/keymaps/dancxjo/rules.mk b/keyboards/hotdox76v2/keymaps/dancxjo/rules.mk
deleted file mode 100644
index bc20eb20b7c..00000000000
--- a/keyboards/hotdox76v2/keymaps/dancxjo/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMMAND_ENABLE = yes
-VIA_ENABLE = yes
-EXTRAKEY_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/hotdox76v2/keymaps/ifohancroft/README.md b/keyboards/hotdox76v2/keymaps/ifohancroft/README.md
deleted file mode 100644
index d51eda066f9..00000000000
--- a/keyboards/hotdox76v2/keymaps/ifohancroft/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-![IFo Hancroft HotDox76v2 Layout Image](https://i.imgur.com/AqUHXYXh.png)
-
-# IFo Hancroft's HotDox76v2 Layout
-
-- Layer 0: A QWERTY Layer.
-- Layer 1: A Function Layer.
-- Layer 2: Empty Layer.
-- Layer 3: Empty Layer.
-
-This keymap also does the following:
-
-- Forces NKRO on
-- Enables:
-    - The Command Feature
-    - VIA
-    - The Swap Hands feature
-- Disables:
-    - Mouse Key
-    - Extra Key
-    - RGB Matrix
diff --git a/keyboards/hotdox76v2/keymaps/ifohancroft/config.h b/keyboards/hotdox76v2/keymaps/ifohancroft/config.h
deleted file mode 100644
index 1cd6c6fc2d1..00000000000
--- a/keyboards/hotdox76v2/keymaps/ifohancroft/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 IFo Hancroft
- *
- * 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
-
-// place overrides here
-#define FORCE_NKRO
-#ifdef TAPPING_TOGGLE
-#    undef TAPPING_TOGGLE
-#endif
-#define TAPPING_TOGGLE 3
diff --git a/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c b/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c
deleted file mode 100644
index ed37ea1a4a2..00000000000
--- a/keyboards/hotdox76v2/keymaps/ifohancroft/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Copyright 2022 IFo Hancroft
- *
- * 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] = {
-
-    /* Default Layer
-    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
-    * | `       | 1       | 2       | 3       | 4       | 5       | -       |                             | =       | 6       | 7       | 8       | 9       | 0       | Del     |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * | Tab     | Q       | W       | E       | R       | T       | [       |                             | ]       | Y       | U       | I       | O       | P       | \       |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * | Esc     | A       | S       | D       | F       | G       |         |                             |         | H       | J       | K       | L       | ;       | '       |
-    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
-    * | Shift   | Z       | X       | C       | V       | B       |                                                 | N       | M       | ,       | .       | /       | Shift   |
-    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
-    * | Ctrl    | Super   | Alt     |         | OSL(1)  |                                                                     | TT(1)   |         | Alt     | Super   | Ctrl    |
-    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
-    *
-    *                                                             *-------------------*         *-------------------*
-    *                                                             |         |         |         |         |         |
-    *                                                   *---------+---------+---------|         |---------+---------+---------*
-    *                                                   |         |         |         |         |         |         |         |
-    *                                                   | Bckspc  | Enter   |---------|         |---------| Enter   | Space   |
-    *                                                   |         |         | SH_OS   |         |         |         |         |
-    *                                                   *---------+---------+---------*         *---------+---------+---------*
-    */
-
-    LAYOUT_ergodox_pretty(
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_MINS,                                KC_EQL,   KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,                                KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
-        KC_ESC,   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_NO,                                  KC_NO,    KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
-        KC_LCTL,  KC_LGUI,  KC_LALT,  KC_NO,    OSL(1),                                                                         TT(1),    KC_NO,    KC_RALT,  KC_RGUI,  KC_RCTL,
-
-                                                                    KC_NO,    KC_NO,              KC_NO,    KC_NO,
-                                                                              KC_NO,              KC_NO,
-                                                          KC_BSPC,  KC_ENT,   SH_OS,              KC_NO,    KC_ENT,   KC_SPC 
-    ),
-
-    /* Function Keys Layer
-    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
-    * | NumLock | F1      | F2      | F3      | F4      | F5      | F11     |                             | F12     | F6      | F7      | F8      | F9      | F10     |         |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * |         | +       | 7       | 8       | 9       | *       |         |                             |         |         |         |         |         |         |         |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * |         | -       | 4       | 5       | 6       | /       |         |                             |         | Left    | Down    | Up      | Right   |         |         |
-    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
-    * |         | 0       | 1       | 2       | 3       | .       |                                                 | NK_TOGG |         |         |         |         |         |
-    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
-    * |         |         |         |         |         |                                                                     |         | Left    | Down    | Up      | Right   |
-    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
-    *
-    *                                                             *-------------------*         *-------------------*
-    *                                                             |         |         |         |         |         |
-    *                                                   *---------+---------+---------|         |---------+---------+---------*
-    *                                                   |         |         |         |         |         |         |         |
-    *                                                   |         | Enter   |---------|         |---------|         |         |
-    *                                                   | PgUp    |         |         |         |         |         | PgDn    |
-    *                                                   *---------+---------+---------*         *---------+---------+---------*
-    */
-
-    LAYOUT_ergodox_pretty(
-        KC_NUM,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,                                 KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
-        _______,  KC_PPLS,  KC_P7,    KC_P8,    KC_P9,    KC_PAST,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  KC_PMNS,  KC_P4,    KC_P5,    KC_P6,    KC_PSLS,                                                    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,
-        _______,  KC_P0,    KC_P1,    KC_P2,    KC_P3,    KC_PDOT,  _______,                                _______,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,                                                                        _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,
-
-                                                                    _______,  _______,            _______,  _______,
-                                                                              _______,            _______,
-                                                          KC_PGUP,  KC_PENT,  _______,            _______,  _______,  KC_PGDN   
-    ),
-
-    /* Empty Layer */
-    LAYOUT_ergodox_pretty(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
-
-                                                                    _______,  _______,            _______,  _______,
-                                                                              _______,            _______,
-                                                          _______,  _______,  _______,            _______,  _______,  _______ 
-    ),
-
-    /* Empty Layer */
-    LAYOUT_ergodox_pretty(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
-
-                                                                    _______,  _______,            _______,  _______,
-                                                                              _______,            _______,
-                                                          _______,  _______,  _______,            _______,  _______,  _______ 
-    )
-};
-
-    /* Swap Hands
-    * *---------------------------------------------------------------------*
-    * | Delete  | 0       | 9       | 8       | 7       | 6       | =       |
-    * |---------+---------+---------+---------+---------+---------+---------|
-    * | \       | P       | O       | I       | U       | Y       | ]       |
-    * |---------+---------+---------+---------+---------+---------+---------|
-    * | '       | ;       | L       | K       | J       | H       |         |
-    * |---------+---------+---------+---------+---------+---------+---------*
-    * | R Shift | /       | .       | ,       | M       | N       |
-    * |---------+---------+---------+---------+---------+---------*
-    * | R Ctrl  | R Super | R Alt   |         | TT(1)   |
-    * *-------------------------------------------------*
-    *
-    *                                                             *-------------------*
-    *                                                             |         |         |
-    *                                                   *---------+---------+---------|
-    *                                                   |         |         |         |
-    *                                                   | Space   |         |---------|
-    *                                                   |         |         |         |
-    *                                                   *---------+---------+---------*
-    */
-
-const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
-    {{0,  6}, {5,  6}, {4,  6}, {3,  6}, {2,  6}, {1,  6}, {6,  6}},
-    {{0,  7}, {5,  7}, {4,  7}, {3,  7}, {2,  7}, {1,  7}, {6,  7}}, 
-    {{0,  8}, {5,  8}, {4,  8}, {3,  8}, {2,  8}, {1,  8}, {6,  8}},
-    {{0,  9}, {5,  9}, {4,  9}, {3,  9}, {2,  9}, {1,  9}, {6,  9}},
-    {{0, 10}, {5, 10}, {4, 10}, {3, 10}, {2, 10}, {1, 10}, {6, 10}},
-    {{0, 11}, {5, 11}, {4, 11}, {3, 11}, {2, 11}, {1, 11}, {6, 11}}
-};
diff --git a/keyboards/hotdox76v2/keymaps/ifohancroft/rules.mk b/keyboards/hotdox76v2/keymaps/ifohancroft/rules.mk
deleted file mode 100644
index fb3efc2f48e..00000000000
--- a/keyboards/hotdox76v2/keymaps/ifohancroft/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-COMMAND_ENABLE = yes
-EXTRAKEY_ENABLE = no
-MOUSEKEY_ENABLE = no
-RGB_MATRIX_ENABLE = no
-SWAP_HANDS_ENABLE = yes
-VIA_ENABLE = yes
diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h
index c8644643902..95730e10e46 100644
--- a/keyboards/hs60/v1/config.h
+++ b/keyboards/hs60/v1/config.h
@@ -33,72 +33,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* disable print */
 //#define NO_PRINT
 
-/* Backlight options */
-
-//This is experimental do not enable yet
-//#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
-
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 215
-
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
 
-#define DRIVER_1_LED_TOTAL 30
-
 #ifdef  HS60_ANSI
-#define DRIVER_2_LED_TOTAL 31
+#define RGB_MATRIX_LED_COUNT 61
 #else
-#define DRIVER_2_LED_TOTAL 32
+#define RGB_MATRIX_LED_COUNT 62
 #endif
-
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-// 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
-#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
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json
index c87ca19e3b8..f9d77c3513a 100644
--- a/keyboards/hs60/v1/info.json
+++ b/keyboards/hs60/v1/info.json
@@ -9,7 +9,53 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "is31fl3731"
+    "animations": {
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_val": true,
+      "band_pinwheel_sat": true,
+      "band_pinwheel_val": true,
+      "band_spiral_sat": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true,
+      "solid_multisplash": true
+    },
+    "driver": "is31fl3731",
+    "max_brightness": 215
   },
   "matrix_pins": {
     "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c
index 50f6215a02d..f68bcbdf9e7 100644
--- a/keyboards/hs60/v1/v1.c
+++ b/keyboards/hs60/v1/v1.c
@@ -91,7 +91,7 @@ void raw_hid_receive( uint8_t *data, uint8_t length )
 
 #ifdef HS60_ANSI
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -199,7 +199,7 @@ led_config_t g_led_config = { {
 
 #else
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/config.h b/keyboards/hs60/v2/hhkb/keymaps/goatmaster/config.h
deleted file mode 100644
index 50c76489e65..00000000000
--- a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2018 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/>.
-*/
-#pragma once
-
-/* Include overwrites for specific keymap */
-
-#undef RGB_BACKLIGHT_CAPS_LOCK_INDICATOR
-#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 0, .s = 255 }, .index = 3-1 } //red
diff --git a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c b/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c
deleted file mode 100644
index 374dc6ad4b5..00000000000
--- a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2018 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 QMK_KEYBOARD_H
-
-//This is the HHKB version of the PCB
-
-enum macro_keys {
-	KC_EML = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_60_hhkb( /* Base */
-    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_BSLS,
-    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_BSPC,
-    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_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_60_hhkb( /* FN */
-    QK_BOOT, 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, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  BR_DEC,  BR_INC,   ES_DEC,  ES_INC,   KC_UP,    KC_TRNS,           KC_DEL,
-    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,  KC_PGUP, KC_LEFT,  KC_RGHT,            KC_TRNS,
-    KC_TRNS,          KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS,  KC_END,  KC_PGDN,  KC_DOWN,  KC_TRNS,           KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,                                        KC_TRNS,  KC_TRNS,            KC_TRNS         ),
-
-[2] = LAYOUT_60_hhkb( /* 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          ),
-
-[3] = LAYOUT_60_hhkb( /* 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          ),
-};
-
-void matrix_init_user(void) {
-  //user initialization
-}
-
-void matrix_scan_user(void) {
-  //user matrix
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case KC_EML: //use "KC_EML" as keycode in layers above to call macro
-    if (!record->event.pressed) {
-      send_string_with_delay_P(PSTR("example@email.com"), 10); //change email value here
-    }
-  break;
-  }
-  return true;
-}
diff --git a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/readme.md b/keyboards/hs60/v2/hhkb/keymaps/goatmaster/readme.md
deleted file mode 100644
index ea9803cc0bb..00000000000
--- a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-The default keymap for HHKB HS60 V2. VIA support enabled.
-=========================================================
-
-![Layout image](https://imgur.com/usbrQWL.png)
-
-Default layer is normal HHKB with 7U space. Fn layer is used for RGB functions, Volume control and arrow cluster
\ No newline at end of file
diff --git a/keyboards/hs60/v2/v2.c b/keyboards/hs60/v2/v2.c
index 45b1f54d5f5..5cb6f79fc7f 100644
--- a/keyboards/hs60/v2/v2.c
+++ b/keyboards/hs60/v2/v2.c
@@ -28,69 +28,69 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 };
 #endif
diff --git a/keyboards/hub16/hub16.c b/keyboards/hub16/hub16.c
deleted file mode 100755
index e18ba552691..00000000000
--- a/keyboards/hub16/hub16.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Josh Johnson
- *
- * 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 "hub16.h"
\ No newline at end of file
diff --git a/keyboards/hub16/hub16.h b/keyboards/hub16/hub16.h
deleted file mode 100755
index 36830bf5c08..00000000000
--- a/keyboards/hub16/hub16.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 Josh Johnson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments 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( \
-       k40,     k41,    \
-    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, }, \
-    { k40, k41, ___, ___, }  \
-}
-
diff --git a/keyboards/hub16/keymaps/ahk_companion/ahk_companion.ahk b/keyboards/hub16/keymaps/ahk_companion/ahk_companion.ahk
deleted file mode 100644
index becab49e5cc..00000000000
--- a/keyboards/hub16/keymaps/ahk_companion/ahk_companion.ahk
+++ /dev/null
@@ -1,104 +0,0 @@
-#Persistent
-#SingleInstance force
-
-;=================================================================
-;                      Macro Pad Shortcuts                       ;
-;=================================================================
-
-;=================================================================
-;                       Layer 0
-;;=================================================================
-;Row 1
-
-F13::Send a
-F14::Send b
-F15::Send c
-F16::Send d
-
-;Row 2
-
-F17::Send e
-F18::Send f
-F19::Send g
-F20::Send h
-
-;Row 3
-
-F21::Send i
-F22::Send j
-F23::Send k
-F24::Send l
-
-
-;=================================================================
-;                       Layer 1
-;;=================================================================
-;Row 1
-
-!F13::Send m
-!F14::Send n
-!F15::Send o
-!F16::Send p
-
-;Row 2
-
-!F17::Send q
-!F18::Send r
-!F19::Send s
-!F20::Send t
-
-;Row 3
-
-!F21::Send u
-!F22::Send v
-!F23::Send w
-!F24::Send x
-
-
-;=================================================================
-;                       Layer 2
-;;=================================================================
-;Row 1
-
-+F13::Send y
-+F14::Send z
-+F15::Send A
-+F16::Send B
-
-;Row 2
-
-+F17::Send C
-+F18::Send D
-+F19::Send E
-+F20::Send F
-
-;Row 3
-
-+F21::Send G
-+F22::Send H
-+F23::Send I
-+F24::Send J
-
-;=================================================================
-;                       Layer 3
-;;=================================================================
-;Row 1
-
-^F13::Send K
-^F14::Send L
-^F15::Send M
-^F16::Send N
-
-;Row 2
-
-^F17::Send O
-^F18::Send P
-^F19::Send Q
-^F20::Send R
-
-;Row 3
-
-^F21::Send S
-^F22::Send T
-^F23::Send U
-^F24::Send V
diff --git a/keyboards/hub16/keymaps/ahk_companion/config.h b/keyboards/hub16/keymaps/ahk_companion/config.h
deleted file mode 100644
index 62b0df937bb..00000000000
--- a/keyboards/hub16/keymaps/ahk_companion/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2019 Josh Johnson
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== 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
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 20
-
-// Time out one shot layers after 3 seconds
-#define ONESHOT_TIMEOUT 3000
-
-// Undef and redefine default brightness to half of 255
-#undef RGBLIGHT_LIMIT_VAL
-#define RGBLIGHT_LIMIT_VAL 255
-
-//Define a preview timeout for RGB reviews
-#define PREVIEW_TIMEOUT 5000
-
-// Enable Light Layers implementation
-#define RGBLIGHT_LAYERS
-// Allow Light Layers to override RGB off configuration
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/hub16/keymaps/ahk_companion/keymap.c b/keyboards/hub16/keymaps/ahk_companion/keymap.c
deleted file mode 100644
index a5148f97e1c..00000000000
--- a/keyboards/hub16/keymaps/ahk_companion/keymap.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-Copyright 2019 Josh Johnson
-
-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
-
-#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-static uint32_t rgb_preview_timer = 0;
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        //Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3 or Toggle Layer 4)
-        [0] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                KC_F13, KC_F14, KC_F15, KC_F16,
-                KC_F17, KC_F18, KC_F19, KC_F20,
-                KC_F21, KC_F22, KC_F23, KC_F24,
-                OSL(1), OSL(2), OSL(3), TG(4)    //Transparent to let you go between layers
-		),
-
-        [1] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                LALT(KC_F13), LALT(KC_F14), LALT(KC_F15), LALT(KC_F16),
-                LALT(KC_F17), LALT(KC_F18), LALT(KC_F19), LALT(KC_F20),
-                LALT(KC_F21), LALT(KC_F22), LALT(KC_F23), LALT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 2 - Shift + Function Key Layer
-        [2] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                LSFT(KC_F13), LSFT(KC_F14), LSFT(KC_F15), LSFT(KC_F16),
-                LSFT(KC_F17), LSFT(KC_F18), LSFT(KC_F19), LSFT(KC_F20),
-                LSFT(KC_F21), LSFT(KC_F22), LSFT(KC_F23), LSFT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 3 - Control + Function Key
-        [3] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                LCTL(KC_F13), LCTL(KC_F14), LCTL(KC_F15), LCTL(KC_F16),
-                LCTL(KC_F17), LCTL(KC_F18), LCTL(KC_F19), LCTL(KC_F20),
-                LCTL(KC_F21), LCTL(KC_F22), LCTL(KC_F23), LCTL(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 4 - Multimedia
-        [4] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                KC_MPRV, KC_MPLY, KC_U,   KC_K,
-                KC_NO,   KC_NO,   KC_ENT, KC_X,
-                KC_NO,   QK_BOOT, LSFT(KC_HASH),   KC_J,
-                TG(5),   KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 5 - Keyboard Lights, Programming and Special Functions
-        [5] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
-                RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_LSFT,
-                KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        ),
-};
-
-const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_ORANGE}
-    );
-const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_GREEN}
-    );
-const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_RED}
-    );
-const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_BLUE}
-    );
-const rgblight_segment_t PROGMEM my_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_WHITE}
-    );
-const rgblight_segment_t PROGMEM my_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_TEAL}
-    );
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-        my_layer0_layer,
-        my_layer1_layer,
-        my_layer2_layer,
-        my_layer3_layer,
-        my_layer4_layer,
-        my_layer5_layer
-    );
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* Left Encoder */
-        if (clockwise) {
-            tap_code(KC_MPRV);
-        } else {
-            tap_code(KC_MNXT);
-        }
-    } else if (index == 1) { /* Right Encoder */
-        if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
-            tap_code(KC_VOLU);
-        }
-    }
-    return true;
-}
-void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Allow for a preview of changes when modifying RGB
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-  switch (keycode) {
-    case RGB_TOG ... QK_VELOCIKEY_TOGGLE:
-      for (uint8_t i = 0; i < RGBLIGHT_MAX_LAYERS; i++) {
-        rgblight_set_layer_state(i, false);
-      }
-      rgb_preview_timer = timer_read32();
-      break;
-  }
-# endif
-  return;
-}
-
-//Set the appropriate layer color
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 3));
-    rgblight_set_layer_state(4, layer_state_cmp(state, 4));
-    rgblight_set_layer_state(5, layer_state_cmp(state, 5));
-    return state;
-}
-
-void keyboard_post_init_user(void) {
-	//Enable the LED layers
-	rgblight_layers = my_rgb_layers;
-	layer_state_set_user(layer_state);
-}
-
-void matrix_scan_user(void) {
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-    // Allow preview for
-    if (rgb_preview_timer && TIMER_DIFF_32(timer_read32(), rgb_preview_timer) > PREVIEW_TIMEOUT) {
-        rgb_preview_timer = 0;
-        default_layer_state_set_user(default_layer_state);
-        layer_state_set_user(layer_state);
-        led_update_user((led_t) host_keyboard_leds());
-    }
-# endif
-}
-
-//EEPROM Reset Function
-void eeconfig_init_user(void) {
-  rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv(HSV_ORANGE);  // Set it to orange by default
-}
diff --git a/keyboards/hub16/keymaps/ahk_companion/readme.md b/keyboards/hub16/keymaps/ahk_companion/readme.md
deleted file mode 100644
index a6163a3d563..00000000000
--- a/keyboards/hub16/keymaps/ahk_companion/readme.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# AutoHotKey Companion
-
-## Overview
-AutoHotKey Companion Keymap for <a href="https://www.tindie.com/products/joshajohnson/hub16-programmable-macro-keyboard/">Hub16 macropad</a> is designed be a quick and easy way to get started with AutoHotKey and to provide a foundation for customizing your own macropad. I upgraded to the Hub16 from a Super16 because it kept the RGB underglow lights for an easy way (RGB) to identify what layer I was on with a quick glance or peripheral vision and added 2 rotary encoders and a USB 2.0 hub with USB-C ports. The F13 to F24 keys were selected as they are rarely used so you won't run into conflicts with existing application shortcuts and AutoHotKey recognizes them without any issues. *Note:* MacOS does not support/recognize F21 to F24 so these would need to be remapped for Mac users. 
-
-Same functionality can be accomplished with other similar applications on the host system like Keyboard Maestro, AutoIt, etc. 
-
-* <a href="https://www.autohotkey.com">AutoHotKey</a>(Windows)
-* <a href="https://www.autoitscript.com/site/autoit/">AutoIT</a> (Windows)
-* <a href="https://www.keyboardmaestro.com/main/">Keyboard Maestro</a>(Mac)
-* <a href="https://github.com/autokey/autokey">AutoKey</a>(Linux)
-
-This keymap allows for a total of 48 Function/Macro keys that are accessible within 2 sequential key presses (or more when extended with your own code and additional layers) 
-
-## Encoders
-Encoder functionality was made based on my needs but it can be remapped as desired by changing the keycodes. 
-
-Left Encoder:
- * Counter clockwise: Previous Multimedia
- * Clockwise: Next Multimedia
- * Click: Play/Pause
- 
- Right Encoder:
- * Counter clockwise: Volume Down
- * Clockwise: Volume Up
- * Click: Mute/Unmute
-
-## Alternate Implementations
-I chose to use <a href="https://docs.qmk.fm/#/feature_layers?id=switching-and-toggling-layers">QMK OSL</a> (One Shot Layer) functionality to avoid having to hold a key while selecting the next key and to have my layers always go back to the default layer as the starting point. This also helps me avoid having to cognitively remember what layer I am on. 
-
-If persistent behavior is prefered, OSL can be swapped for TG which will toggle the layer on/off with a key press instead of clearing the layer once the Function key is pressed. This is useful if a layer contains several keys that need to be used in sequence. I also added a OSL timeout of 3 seconds, so that if the key is not pressed within 3 seconds the layer will go back to default. This can be adjusted in the config.h file by increasing 3000 to a desired value: `#define ONESHOT_TIMEOUT 3000` 
-
-
-
-
-## Layers
-
-While the first 5 layers are accessible with only 1 key press at most, the 5th (less frequently used) layer is accessed by first going to the 4th layer, which makes the TG(5) button available on the bottom left. Space for additional 2 more layer toggles is available on the 2 middle buttons on the bottom row. Please refer to the layer diagrams.
-
-
-* Layer 0 (Base Layer) - the default layer and functions like sending the F13 to F24 keys along with the bottom row to activate another 4 layers. 
-
-    ![Image of Base Layer ](https://i.imgur.com/0LhityX.png)
-
-* Layer 1 (Alt Layer) - Equivalent to Alt+Fxx key being pressed 
-
-    ![Image of Layer 1 ](https://i.imgur.com/ZblqLZt.png)
-
-* Layer 2 (Shift Layer) - Equivalent to Shift+Fxx key being pressed
-
-    ![Image of Layer 2 ](https://i.imgur.com/ZQHwLC0.png)
-
-* Layer 3 (Control Layer) - Equivalent to Ctrl+Fxx key being pressed
-
-    ![Image of Layer 3 ](https://i.imgur.com/JkM8bqV.png)
-
-* Layer 4 (Config Layer) - Layer for multimedia. You can replace the KC_TRNS on this layer in keymap.c to TG(x) to enable additional layers.
-
-    ![Image of Layer 4 ](https://i.imgur.com/srDp5Lv.png)
-    
-* Layer 5 (RGB Control/QMK) - RGB control layer and Quantum functions (Reset, EEPROM Reset, )
-
-    ![Image of Layer 5 ](https://i.imgur.com/Os3n8dx.png)
-    
-## Host Configuration
-
-Once the keymap has been flashed to the Hub16, you can download the accompanying AutoHotKey file or create your own and have it start automatically either via a Windows Task or another way. Using AutoHotKey allows adjustment of functionality of the buttons without the need to change your map and reflash the macropad every time.
-Starting the AHK file can be done either by:
-* Creating a Windows Task 
-* Adding the AHK to the startup folder
-* Launch manually
diff --git a/keyboards/hub16/keymaps/macro/keymap.c b/keyboards/hub16/keymaps/macro/keymap.c
deleted file mode 100755
index 5200cf35dd6..00000000000
--- a/keyboards/hub16/keymaps/macro/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2019 Josh Johnson
- *
- * 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
-
-// Function key we are 'wrapping' usual key presses in
-#define KC_WRAP KC_F24
-
-// Keyboard Layers
-enum keyboard_layers{
-    _BASE = 0,
-    _CTRL
-};
-
-// Tap Dance Declarations
-void td_ctrl (tap_dance_state_t *state, void *user_data);
-
-enum tap_dance { CTRL = 0, BASE = 1 };
-
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for standard key on base layer, twice to toggle to control layer
-    [CTRL] = ACTION_TAP_DANCE_FN(td_ctrl),
-    [BASE] = ACTION_TAP_DANCE_LAYER_MOVE(_______, _BASE)};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT( /* Base */
-        KC_S,      KC_V,
-    KC_A, KC_B, KC_C, KC_D,
-    KC_E, KC_F, KC_G, KC_H,
-    KC_I, KC_J, KC_K, KC_L,
-    KC_M, KC_N, KC_O, TD(CTRL)
-  ),
-
-  [_CTRL] = LAYOUT( /* Control */
-          KC_NO,            KC_NO,
-    _______, RGB_MOD, RGB_RMOD, RGB_TOG,
-    RGB_VAD, RGB_VAI, RGB_HUD,  RGB_HUI,
-    RGB_SAD, RGB_SAI, _______,  _______,
-    _______, _______, QK_BOOT,  TD(BASE)
-  ),
-};
-
-// Keyboard is setup to 'wrap' the pressed key with an unused Fxx key,
-// allowing for easy differentiation from a real keyboard.
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* Left Encoder */
-        if (clockwise) {
-            register_code(KC_WRAP);
-            tap_code(KC_R);
-            unregister_code(KC_WRAP);
-        } else {
-            register_code(KC_WRAP);
-            tap_code(KC_Q);
-            unregister_code(KC_WRAP);
-        }
-    } else if (index == 1) { /* Right Encoder */
-        if (clockwise) {
-            register_code(KC_WRAP);
-            tap_code(KC_U);
-            unregister_code(KC_WRAP);
-        } else {
-            register_code(KC_WRAP);
-            tap_code(KC_T);
-            unregister_code(KC_WRAP);
-        }
-    }
-    return true;
-}
-
-// Below stolen from TaranVH (https://github.com/TaranVH/2nd-keyboard/blob/master/HASU_USB/F24/keymap.c)
-// Shoutout to drashna on the QMK discord for basically writing this for me.... :P
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint8_t f24_tracker;
-    switch (keycode) {
-        case KC_A ... KC_F23:
-        case KC_EXECUTE ... KC_EXSEL:
-            if (record->event.pressed) {
-                register_code(KC_WRAP);
-                f24_tracker++;
-                register_code(keycode);
-            } else {
-                unregister_code(keycode);
-                f24_tracker--;
-                if (!f24_tracker) {
-                    unregister_code(KC_WRAP);
-                }
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-// Below works around TD() not running key press through process_record_user.
-// Fixes bug of CTRL layer move key not being wrapped in by modifier on single tap
-void td_ctrl (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code(KC_WRAP);
-    tap_code(KC_P);
-    unregister_code(KC_WRAP);
-  } else if (state->count == 2) {
-    layer_move(_CTRL);
-  }
-}
diff --git a/keyboards/hub16/keymaps/macro/rules.mk b/keyboards/hub16/keymaps/macro/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/hub16/keymaps/macro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/hub16/keymaps/peepeetee/config.h b/keyboards/hub16/keymaps/peepeetee/config.h
deleted file mode 100644
index 62b0df937bb..00000000000
--- a/keyboards/hub16/keymaps/peepeetee/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2019 Josh Johnson
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== 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
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 20
-
-// Time out one shot layers after 3 seconds
-#define ONESHOT_TIMEOUT 3000
-
-// Undef and redefine default brightness to half of 255
-#undef RGBLIGHT_LIMIT_VAL
-#define RGBLIGHT_LIMIT_VAL 255
-
-//Define a preview timeout for RGB reviews
-#define PREVIEW_TIMEOUT 5000
-
-// Enable Light Layers implementation
-#define RGBLIGHT_LAYERS
-// Allow Light Layers to override RGB off configuration
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/hub16/keymaps/peepeetee/keymap.c
deleted file mode 100644
index dac88c8482e..00000000000
--- a/keyboards/hub16/keymaps/peepeetee/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-Copyright 2019 Josh Johnson 2021 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/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-static uint32_t rgb_preview_timer = 0;
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-        // Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3 or Toggle Layer 4)
-        [0] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                TG(3), TG(2), TG(1), TG(0),
-                KC_PSCR, KC_SCRL, KC_PAUS, A(KC_F4),
-                KC_INS, KC_HOME, KC_PGUP, KC_F12,    //Transparent to let you go between layers
-                KC_DEL, A(KC_F4), KC_PGDN, KC_CALCULATOR
-
-		),
-
-        [1] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-                KC_F7, KC_F8, KC_F9,                KC_F10,
-                KC_F4, KC_F5, KC_F6,                KC_F11,
-                KC_F1,      KC_F2,      KC_F3,      KC_F12         //Transparent to let you go between layers
-        ),
-
-
-                //Layer 5 - Keyboard Lights, Programming and Special Functions
-        [2] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,         //Transparent to let you go between layers
-                RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
-                RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_TRNS
-        ),
-
-        [3] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,         //Transparent to let you go between layers
-                RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
-                RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_TRNS
-        )
-
-
-        //Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3 or Toggle Layer 4)
-        // [0] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         KC_F13, KC_F14, KC_F15, KC_F16,
-        //         KC_F17, KC_F18, KC_F19, KC_F20,
-        //         KC_F21, KC_F22, KC_F23, KC_F24,
-        //         OSL(1), OSL(2), OSL(3), TG(4)    //Transparent to let you go between layers
-		// ),
-
-        // [1] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         LALT(KC_F13), LALT(KC_F14), LALT(KC_F15), LALT(KC_F16),
-        //         LALT(KC_F17), LALT(KC_F18), LALT(KC_F19), LALT(KC_F20),
-        //         LALT(KC_F21), LALT(KC_F22), LALT(KC_F23), LALT(KC_F24),
-        //         KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        // ),
-
-        //Layer 2 - Shift + Function Key Layer
-        // [2] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         LSFT(KC_F13), LSFT(KC_F14), LSFT(KC_F15), LSFT(KC_F16),
-        //         LSFT(KC_F17), LSFT(KC_F18), LSFT(KC_F19), LSFT(KC_F20),
-        //         LSFT(KC_F21), LSFT(KC_F22), LSFT(KC_F23), LSFT(KC_F24),
-        //         KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        // ),
-
-        // //Layer 3 - Control + Function Key
-        // [3] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         LCTL(KC_F13), LCTL(KC_F14), LCTL(KC_F15), LCTL(KC_F16),
-        //         LCTL(KC_F17), LCTL(KC_F18), LCTL(KC_F19), LCTL(KC_F20),
-        //         LCTL(KC_F21), LCTL(KC_F22), LCTL(KC_F23), LCTL(KC_F24),
-        //         KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        // ),
-
-        // //Layer 4 - Multimedia
-        // [4] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         KC_MPRV, KC_MPLY, KC_U,   KC_K,
-        //         KC_NO,   KC_NO,   KC_ENT, KC_X,
-        //         KC_NO,   QK_BOOT, LSFT(KC_HASH),   KC_J,
-        //         TG(5),   KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        // ),
-
-        // //Layer 5 - Keyboard Lights, Programming and Special Functions
-        // [5] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
-        //         RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-        //         RGB_TOG,  EE_CLR,  QK_BOOT,   KC_LSFT,
-        //         KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        // ),
-};
-
-const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_WHITE}
-    );
-const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_ORANGE}
-    );
- const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-         {0,16,HSV_RED}
-     );
- const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-         {0,16,HSV_BLUE}
-     );
-// const rgblight_segment_t PROGMEM my_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-//         {0,16,HSV_WHITE}
-//     );
-// const rgblight_segment_t PROGMEM my_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-//         {0,16,HSV_TEAL}
-//     );
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-        my_layer0_layer,
-        my_layer1_layer,
-        my_layer2_layer,
-        my_layer3_layer//,
-        // my_layer4_layer,
-        // my_layer5_layer
-    );
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* Left Encoder */
-        if (clockwise) {
-            tap_code(KC_MPRV);
-        } else {
-            tap_code(KC_MNXT);
-        }
-    } else if (index == 1) { /* Right Encoder */
-        if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
-            tap_code(KC_VOLU);
-        }
-    }
-    return true;
-}
-void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Allow for a preview of changes when modifying RGB
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-  switch (keycode) {
-    case RGB_TOG ... QK_VELOCIKEY_TOGGLE:
-      for (uint8_t i = 0; i < RGBLIGHT_MAX_LAYERS; i++) {
-        rgblight_set_layer_state(i, false);
-      }
-      rgb_preview_timer = timer_read32();
-      break;
-  }
-# endif
-  return;
-}
-
-//Set the appropriate layer color
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, false);
-    rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 3));
-    // rgblight_set_layer_state(4, layer_state_cmp(state, 4));
-    // rgblight_set_layer_state(5, layer_state_cmp(state, 5));
-    return state;
-}
-
-void keyboard_post_init_user(void) {
-	//Enable the LED layers
-	rgblight_layers = my_rgb_layers;
-	layer_state_set_user(layer_state);
-}
-
-void matrix_scan_user(void) {
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-    // Allow preview for
-    if (rgb_preview_timer && TIMER_DIFF_32(timer_read32(), rgb_preview_timer) > PREVIEW_TIMEOUT) {
-        rgb_preview_timer = 0;
-        default_layer_state_set_user(default_layer_state);
-        layer_state_set_user(layer_state);
-        led_update_user((led_t) host_keyboard_leds());
-    }
-# endif
-}
-
-//EEPROM Reset Function
-void eeconfig_init_user(void) {
-  rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv(HSV_ORANGE);  // Set it to orange by default
-}
diff --git a/keyboards/hub16/keymaps/peepeetee/rules.mk b/keyboards/hub16/keymaps/peepeetee/rules.mk
deleted file mode 100644
index f6737b8e4ab..00000000000
--- a/keyboards/hub16/keymaps/peepeetee/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
\ No newline at end of file
diff --git a/keyboards/hub16/readme.md b/keyboards/hub16/readme.md
deleted file mode 100755
index f2bcf4b0a7c..00000000000
--- a/keyboards/hub16/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Hub16
-
-Hub16 is a 16 Key Macro Pad with an inbuilt USB 2.0 hub and dual rotary encoders.
-
-For more information regarding the keyboard, please visit the [Hub16 Website](https://www.joshajohnson.com/hub16-keyboard/) or [GitHub Repo](https://github.com/joshajohnson/Hub16).
-
-* Keyboard Maintainer: [Josh Johnson](https://github.com/joshajohnson)
-* Hardware Supported: Hub16 PCB (atmega32u4)
-* Hardware Availability: [Josh Johnson](https://www.joshajohnson.com/hub16-keyboard/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make hub16:default
-
-Flashing example for this keyboard:
-
-    make hub16:default:flash
-
-To reset the board into bootloader mode, do one of the following:
-
-* Press the reset switch between the center two USB-C ports while the board is plugged in
-* Hold the top left key while connecting the USB cable (also erases persistent settings)
-
-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/hub20/config.h b/keyboards/hub20/config.h
deleted file mode 100644
index a72b1389ad6..00000000000
--- a/keyboards/hub20/config.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright 2020 joshajohnson
-Copyright 2021 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
-
-#define RGB_MATRIX_LED_COUNT 27
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#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
-// #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
-
-/* 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/hub20/hub20.h b/keyboards/hub20/hub20.h
deleted file mode 100644
index a86cc02c774..00000000000
--- a/keyboards/hub20/hub20.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright 2020 joshajohnson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* This 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.
- */
-
-
-    /* LAYOUT_all
-
-
-     *     ┌───┬───┐ 
-     *     │01 │02 │    
-     * ┌───┼───┼───┼───┐
-     * │10 │11 │12 │13 │
-     * ├───┼───┼───┼───┤
-     * │20 │21 │22 │23 │
-     * ├───┼───┼───┼───┤
-     * │30 │31 │32 │33 │
-     * ├───┼───┼───┼───┤
-     * │40 │41 │42 │43 │
-     * ├───┼───┼───┼───┤
-     * │50 │51 │52 │53 │
-     * └───┴───┴───┴───┘
-     */
-#define LAYOUT_all(   \
-      K01,      K02,    \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43, \
-    K50, K51, K52, K53  \
-) \
-{ \
-    { ___, K01, K02, ___, }, \
-    { K10, K11, K12, K13, }, \
-    { K20, K21, K22, K23, }, \
-    { K30, K31, K32, K33, }, \
-    { K40, K41, K42, K43, }, \
-    { K50, K51, K52, K53, }, \
-}
-
-    /* LAYOUT_left_handed
-
-
-     *     ┌───┬───┐ 
-     *     │01 │02 │    
-     * ┌───┼───┼───┼───┐
-     * │10 │11 │12 │13 │
-     * ├───┼───┼───┼───┤
-     * │   │21 │22 │23 │
-     * │20 ├───┼───┼───┤
-     * │   │31 │32 │33 │
-     * ├───┼───┼───┼───┤
-     * │   │41 │42 │43 │
-     * │40 ├───┼───┴───┤
-     * │   │51 │  52   │
-     * └───┴───┴───────┘
-     */
-#define LAYOUT_left_handed(   \
-      K01,      K02,    \
-    K10, K11, K12, K13, \
-         K21, K22, K23, \
-    K20, K31, K32, K33, \
-         K41, K42, K43, \
-    K40, K51, K52       \
-) \
-{ \
-    { ___, K01, K02, ___, }, \
-    { K10, K11, K12, K13, }, \
-    { K20, K21, K22, K23, }, \
-    { ___, K31, K32, K33, }, \
-    { K40, K41, K42, K43, }, \
-    { ___, K51, K52, ___, }, \
-}
-
-
-    /* LAYOUT_right_handed
-
-
-     *     ┌───┬───┐ 
-     *     │01 │02 │    
-     * ┌───┼───┼───┼───┐
-     * │10 │11 │12 │13 │
-     * ├───┼───┼───┼───┤
-     * │20 │21 │22 │   │
-     * ├───┼───┼───┤23 │
-     * │30 │31 │32 │   │
-     * ├───┼───┼───┼───┤
-     * │40 │41 │42 │   │
-     * ├───┴───┼───┤43 │
-     * │  50(not sure, confirm)   │52 │   │
-     * └───────┴───┴───┘
-     */
-        //NOT TESTED, WAITING ENDORSEMENT FROM MANUFACTURER
-#define LAYOUT_right_handed(   \
-      K01,      K02,    \
-    K10, K11, K12, K13, \
-    K20, K21, K22,      \
-    K30, K31, K32, K23, \
-    K40, K41, K42,      \
-    K50,      K52, K43  \
-) \
-{ \
-    { ___, K01, K02, ___, }, \
-    { K10, K11, K12, K13, }, \
-    { K20, K21, K22, K23, }, \
-    { K30, K31, K32, ___, }, \
-    { K40, K41, K42, K43, }, \
-    { K50, ___, K52, ___, }, \
-}
-
-
diff --git a/keyboards/hub20/info.json b/keyboards/hub20/info.json
deleted file mode 100644
index 92aa3605a96..00000000000
--- a/keyboards/hub20/info.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-    "keyboard_name": "Hub20",
-    "manufacturer": "Josh Johnson",
-    "url": "https://github.com/joshajohnson/hub20",
-    "maintainer": "joshajohnson",
-    "usb": {
-      "vid": "0x6A6A",
-      "pid": "0x4414",
-      "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-      "driver": "ws2812"
-    },
-    "matrix_pins": {
-      "cols": ["A6", "A7", "B7", "B6"],
-      "rows": ["A13", "B14", "A10", "A0", "A2", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-      "rotary": [
-        {"pin_a": "B12", "pin_b": "B13"},
-        {"pin_a": "A8", "pin_b": "A9"}
-      ]
-    },
-    "qmk": {
-      "tap_keycode_delay": 10
-    },
-    "rgblight": {
-      "led_count": 27
-    },
-    "ws2812": {
-      "pin": "B15"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-      "LAYOUT_all": {
-        "layout": [
-          {"matrix": [0, 1], "x": 0.5, "y": 0},
-
-          {"matrix": [0, 2], "x": 2.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1},
-          {"matrix": [1, 1], "x": 1, "y": 1},
-          {"matrix": [1, 2], "x": 2, "y": 1},
-          {"matrix": [1, 3], "x": 3, "y": 1},
-
-          {"matrix": [2, 0], "x": 0, "y": 2},
-          {"matrix": [2, 1], "x": 1, "y": 2},
-          {"matrix": [2, 2], "x": 2, "y": 2},
-          {"matrix": [2, 3], "x": 3, "y": 2},
-
-          {"matrix": [3, 0], "x": 0, "y": 3},
-          {"matrix": [3, 1], "x": 1, "y": 3},
-          {"matrix": [3, 2], "x": 2, "y": 3},
-          {"matrix": [3, 3], "x": 3, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4},
-          {"matrix": [4, 1], "x": 1, "y": 4},
-          {"matrix": [4, 2], "x": 2, "y": 4},
-          {"matrix": [4, 3], "x": 3, "y": 4},
-
-          {"matrix": [5, 0], "x": 0, "y": 5},
-          {"matrix": [5, 1], "x": 1, "y": 5},
-          {"matrix": [5, 2], "x": 2, "y": 5},
-          {"matrix": [5, 3], "x": 3, "y": 5}
-        ]
-      },
-      "LAYOUT_left_handed": {
-        "layout": [
-          {"matrix": [0, 1], "x": 0.5, "y": 0},
-
-          {"matrix": [0, 2], "x": 2.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1},
-          {"matrix": [1, 1], "x": 1, "y": 1},
-          {"matrix": [1, 2], "x": 2, "y": 1},
-          {"matrix": [1, 3], "x": 3, "y": 1},
-
-          {"matrix": [2, 1], "x": 1, "y": 2},
-          {"matrix": [2, 2], "x": 2, "y": 2},
-          {"matrix": [2, 3], "x": 3, "y": 2},
-
-          {"matrix": [2, 0], "x": 0, "y": 2, "h": 2},
-          {"matrix": [3, 1], "x": 1, "y": 3},
-          {"matrix": [3, 2], "x": 2, "y": 3},
-          {"matrix": [3, 3], "x": 3, "y": 3},
-
-          {"matrix": [4, 1], "x": 0, "y": 4, "h": 2},
-          {"matrix": [4, 2], "x": 1, "y": 4},
-          {"matrix": [4, 3], "x": 2, "y": 4},
-          {"matrix": [4, 0], "x": 3, "y": 4},
-
-          {"matrix": [5, 1], "x": 1, "y": 5},
-          {"matrix": [5, 2], "x": 2, "y": 5, "w": 2}
-        ]
-      },
-      "LAYOUT_right_handed": {
-        "layout": [
-          {"matrix": [0, 1], "x": 0.5, "y": 0},
-
-          {"matrix": [0, 2], "x": 2.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1},
-          {"matrix": [1, 1], "x": 1, "y": 1},
-          {"matrix": [1, 2], "x": 2, "y": 1},
-          {"matrix": [1, 3], "x": 3, "y": 1},
-
-          {"matrix": [2, 0], "x": 0, "y": 2},
-          {"matrix": [2, 1], "x": 1, "y": 2},
-          {"matrix": [2, 2], "x": 2, "y": 2},
-
-          {"matrix": [3, 0], "x": 0, "y": 3},
-          {"matrix": [3, 1], "x": 1, "y": 3},
-          {"matrix": [3, 2], "x": 2, "y": 3},
-          {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
-
-          {"matrix": [4, 0], "x": 0, "y": 4},
-          {"matrix": [4, 1], "x": 1, "y": 4},
-          {"matrix": [4, 2], "x": 2, "y": 4},
-
-          {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
-          {"matrix": [5, 2], "x": 2, "y": 5},
-          {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
-        ]
-      }
-    }
-}
diff --git a/keyboards/hub20/keymaps/macro/keymap.c b/keyboards/hub20/keymaps/macro/keymap.c
deleted file mode 100644
index c9e735d3896..00000000000
--- a/keyboards/hub20/keymaps/macro/keymap.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2020 joshajohnson
- *
- * 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
-
-// Function key we are 'wrapping' usual key presses in
-#define KC_WRAP KC_F23
-
-// Keyboard Layers
-enum keyboard_layers{
-    _BASE = 0,
-    _CTRL
-};
-
-// Tap Dance stuff
-void td_ctrl (tap_dance_state_t *state, void *user_data);
-
-enum tap_dance {
-    CTRL = 0,
-    BASE = 1
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for standard key, twice to toggle layers
-    [CTRL] = ACTION_TAP_DANCE_FN(td_ctrl),
-    [BASE] = ACTION_TAP_DANCE_LAYER_MOVE(_______, _BASE)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_all(
-              KC_W,  KC_Z,
-       KC_A,  KC_B,  KC_C,  TD(CTRL),
-       KC_E,  KC_F,  KC_G,  KC_H,
-       KC_I,  KC_J,  KC_K,  KC_L,
-       KC_M,  KC_N,  KC_O,  KC_P,
-       KC_Q,  KC_R,  KC_S,  KC_T
-),
-    [_CTRL] = LAYOUT_all(
-                   QK_BOOT,  _______,
-       RGB_TOG, RGB_RMOD,  RGB_MOD,   TD(BASE),
-       _______,  RGB_VAD,  RGB_VAI,    _______,
-       _______,  RGB_HUD,  RGB_HUI,    _______,
-       _______,  RGB_SAD,  RGB_SAI,    _______,
-       _______,  _______,  _______,    _______
-)
-};
-
-// Keyboard is setup to 'wrap' the pressed key with an unused Fxx key,
-// allowing for easy differentiation from a real keyboard.
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* Left Encoder */
-        if (clockwise) {
-            register_code(KC_WRAP);
-            tap_code(KC_U);
-            unregister_code(KC_WRAP);
-        } else {
-            register_code(KC_WRAP);
-            tap_code(KC_V);
-            unregister_code(KC_WRAP);
-        }
-    } else if (index == 1) { /* Right Encoder */
-        if (clockwise) {
-            register_code(KC_WRAP);
-            tap_code(KC_X);
-            unregister_code(KC_WRAP);
-        } else {
-            register_code(KC_WRAP);
-            tap_code(KC_Y);
-            unregister_code(KC_WRAP);
-        }
-    }
-    return true;
-}
-
-// Below stolen from TaranVH (https://github.com/TaranVH/2nd-keyboard/blob/master/HASU_USB/F24/keymap.c)
-// Shoutout to drashna on the QMK discord for basically writing this for me.... :P
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint8_t f23_tracker;
-    switch (keycode) {
-        // Wrap sent keys in KC_WRAP
-        case KC_A ... KC_F22:
-        case KC_EXECUTE ... KC_EXSEL:
-            if (record->event.pressed) {
-                register_code(KC_WRAP);
-                f23_tracker++;
-                register_code(keycode);
-            } else {
-                unregister_code(keycode);
-                f23_tracker--;
-                if (!f23_tracker) {
-                    unregister_code(KC_WRAP);
-                }
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-// Below works around TD() not running key press through process_record_user
-void td_ctrl (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code(KC_WRAP);
-    tap_code(KC_D);
-    unregister_code(KC_WRAP);
-  } else if (state->count == 2) {
-    layer_move(_CTRL);
-  }
-}
diff --git a/keyboards/hub20/keymaps/macro/rules.mk b/keyboards/hub20/keymaps/macro/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/hub20/keymaps/macro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/hub20/readme.md b/keyboards/hub20/readme.md
deleted file mode 100755
index 1abfa0dea84..00000000000
--- a/keyboards/hub20/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Hub20
-
-Hub20 is a 20 key macro pad with an inbuilt USB 2.0 hub and dual rotary encoders. It can be configured to be a left / right hand numberpad, along with a 4x5 1u layout.
-
-For more information regarding the keyboard, please visit the [Hub20 Website](https://www.joshajohnson.com/hub20) or [GitHub Repo](https://github.com/joshajohnson/Hub20).
-
-* Keyboard Maintainer: [Josh Johnson](https://github.com/joshajohnson)
-* Hardware Supported: Hub20 PCB (STM32F072)
-* Hardware Availability: [Josh Johnson](https://www.joshajohnson.com/hub20)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make hub20:default
-
-Flashing example for this keyboard:
-
-    make hub20:default:flash
-
-To reset the board into bootloader mode, do one of the following:
-
-* Press the reset switch between the center two USB-C ports while the board is plugged in
-* Hold the top left key while connecting the USB cable (also erases persistent settings)
-
-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/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h
deleted file mode 100644
index 59cec330103..00000000000
--- a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * 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
-
-// place overrides here
-
-
-/* Add combos */
-#define COMBO_TERM 200
diff --git a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c
deleted file mode 100644
index e8df1f0c815..00000000000
--- a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * 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_fullsize_ansi_wkl( /* Base layer */
-    KC_ESC,           KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_MEDIA_PLAY_PAUSE,  KC_AUDIO_MUTE, KC_AUDIO_VOL_UP,   KC_NUM, 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_BSLS,   KC_MEDIA_PREV_TRACK,  KC_MEDIA_NEXT_TRACK,  KC_AUDIO_VOL_DOWN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    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_P4,   KC_P5,   KC_P6,
-    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_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LGUI,          KC_LALT,                           KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT
-  ),
-};
-
-enum combo_events {
-  CTRL_PAUS_RESET,
-};
-
-const uint16_t PROGMEM reset_combo[] = {KC_LCTL, KC_PAUS, COMBO_END};
-
-combo_t key_combos[] = {
-  [CTRL_PAUS_RESET] = COMBO_ACTION(reset_combo),
-};
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-  switch(combo_index) {
-    case CTRL_PAUS_RESET:
-      if (pressed) {
-        reset_keyboard();
-      }
-      break;
-  }
-}
diff --git a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk
deleted file mode 100644
index 23b7c173b8b..00000000000
--- a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes          # Reset combo
\ No newline at end of file
diff --git a/keyboards/ibm/model_m/mschwingen/matrix.c b/keyboards/ibm/model_m/mschwingen/matrix.c
index 9997b659756..361803edec4 100644
--- a/keyboards/ibm/model_m/mschwingen/matrix.c
+++ b/keyboards/ibm/model_m/mschwingen/matrix.c
@@ -60,8 +60,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     row_data = spi_read() << 8;
     row_data |= spi_read();
 
-    debug_hex8(~row_data);
-    dprint(" ");
+    dprintf("%02X ", ~row_data);
 
     // For each row...
     for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
diff --git a/keyboards/ibm/model_m/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c
index 8e3810cd234..03dfcdc2f2c 100644
--- a/keyboards/ibm/model_m/mschwingen/mschwingen.c
+++ b/keyboards/ibm/model_m/mschwingen/mschwingen.c
@@ -36,10 +36,10 @@ static bool     blink_state = false;
 static uint8_t  isRecording = 0;
 
 #ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812
-#    if RGBLED_NUM < 3
+#    if RGBLIGHT_LED_COUNT < 3
 #        error we need at least 3 RGB LEDs!
 #    endif
-static rgb_led_t led[RGBLED_NUM] = {{255, 255, 255}, {255, 255, 255}, {255, 255, 255}};
+static rgb_led_t led[RGBLIGHT_LED_COUNT] = {{255, 255, 255}, {255, 255, 255}, {255, 255, 255}};
 
 #    define BRIGHT 32
 #    define DIM 6
@@ -84,13 +84,13 @@ void sleep_led_enable(void) {
     led[0] = black;
     led[1] = black;
     led[2] = black;
-    ws2812_setleds(led, RGBLED_NUM);
+    ws2812_setleds(led, RGBLIGHT_LED_COUNT);
 #endif
 }
 
 void keyboard_pre_init_kb(void) {
 #ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812
-    ws2812_setleds(led, RGBLED_NUM);
+    ws2812_setleds(led, RGBLIGHT_LED_COUNT);
 #else
     /* Set status LEDs pins to output and Low (on) */
     setPinOutput(MODELM_LED_CAPSLOCK);
@@ -146,7 +146,7 @@ static void led_update_rgb(void) {
             break;
     }
     if (!suspend_active) {
-	ws2812_setleds(led, RGBLED_NUM);
+	ws2812_setleds(led, RGBLIGHT_LED_COUNT);
     }
 }
 
diff --git a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/config.h b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/config.h
deleted file mode 100644
index 779e5a858f9..00000000000
--- a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 iw0rm3r
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c
deleted file mode 100644
index 4ec0a0cbc08..00000000000
--- a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2019 iw0rm3r
- *
- * 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( /* Base layer */
-    KC_ESC,           KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  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_BSLS,   KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_LGUI, 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_CAPS,
-    KC_LCTL,          KC_LALT,                           KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_APP,           KC_PDOT
-  ),
-};
diff --git a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/readme.md b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/readme.md
deleted file mode 100644
index 17b0f40da27..00000000000
--- a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# This is my personal keymap for modelm101
-
-Caps Lock is mapped as LGUI (Windows key).  
-Num Enter is mapped as Caps Lock.  
-Num0 is mapped as App key (context menu). 
\ No newline at end of file
diff --git a/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c b/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c
deleted file mode 100644
index a92c877814a..00000000000
--- a/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2022 an_achronism <87213873+an-achronism@users.noreply.github.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 keyboard_layers {
-    _BL, // Base Layer
-    _FN  // Function Layer
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: Default Layer
-     * ,-------------------------------------------------------------------------------------------------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12|    |PSc|ScL|Cap|                    |
-     * |                                                                                                 |
-     * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |BSp|Pse|    |Ins|Hom|PgU|    |Num|/  |*  |=  |
-     * |-----------------------------------------------------------|    |-----------|    |---------------|
-     * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |RCtrl|    |Del|End|PgD|    |7  |8  |9  |-  |
-     * |-----------------------------------------------------------|                     |---------------|
-     * |LCtrl |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |#  |Rtn |                     |4  |5  |6  |+  |
-     * |-----------------------------------------------------------|                     |---------------|
-     * |LShift|\  |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |RShift  |        |Up |        |1  |2  |3  |Ent|
-     * |-----------------------------------------------------------|        |---|        |-----------|   |
-     * |Esc/LAlt| |LGUI |           Space           |BS/Fn|  |RAlt |    |Lt |Dn |Rt |    |0  |Fn |  .|   |
-     * `-------------------------------------------------------------------------------------------------'
-     */
-    [_BL] = 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_PSCR, KC_SCRL, KC_CAPS,
-      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_PAUS,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PEQL,
-      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_RCTL,            KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-      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,                                          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-      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_INT1, KC_RSFT,                     KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-      LALT_T(KC_ESC),   KC_LGUI,                            KC_SPC,                                      LT(_FN, KC_BSPC), KC_RALT,            KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   MO(_FN), KC_PDOT, KC_NO),
-    [_FN] = LAYOUT_all(
-      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, C(KC_BRK), _______, _______, _______,   KC_F10,  KC_F11,  KC_F12,  KC_PWR,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_MPRV, KC_MNXT, KC_APP,             _______, _______, _______,   KC_F7,   KC_F8,   KC_F9,   KC_SLEP,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,                                         KC_F4,   KC_F5,   KC_F6,   KC_CALC,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,            KC_F1,   KC_F2,   KC_F3,   KC_EJCT,
-      _______,          _______,                            _______,                                     _______,          _______,            _______, _______, _______,   _______, _______, _______, _______),
-};
diff --git a/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md b/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md
deleted file mode 100644
index 6d3a7ff5d99..00000000000
--- a/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# an_achronism's custom 106-key layout (107-key if you stick the appropriate keys on RShift and JIS backslash, which are already mapped for convenience).
-
-# With the exception of a single extra matrix position between LAlt and Space which only appears on certain later membranes and is almost never actually used, the only unmapped key is the bottom right corner of the numpad (the unused lower half of the vertical 2u key most commonly used as either Enter or Field +). If you like, you can easily add that into the keymap by changing the appropriate KC_NO to whatever you want.
diff --git a/keyboards/ibm/model_m_122/ibm122m/keymaps/andresteare/keymap.c b/keyboards/ibm/model_m_122/ibm122m/keymaps/andresteare/keymap.c
deleted file mode 100644
index 6d6d09a0a5e..00000000000
--- a/keyboards/ibm/model_m_122/ibm122m/keymaps/andresteare/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2018 andresteare
- *
- * 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] = {
-  // Programmer's Dvorak
-  [0] = 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,
-                     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_ESC, KC_NO,   KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    KC_NO,  KC_NO,   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_NO,  KC_NO,   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_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-    KC_NO,  KC_NO,   KC_LSFT, KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            KC_LEFT, KC_NO,   KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_NO,  KC_NO,   KC_LCTL, KC_LALT,                                        KC_SPC,                           KC_RALT, KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
-  ),
-};
diff --git a/keyboards/ibm/model_m_122/ibm122m/keymaps/default/config.h b/keyboards/ibm/model_m_122/ibm122m/keymaps/default/config.h
deleted file mode 100644
index 0453a72580b..00000000000
--- a/keyboards/ibm/model_m_122/ibm122m/keymaps/default/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * 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
-
-// place overrides below
diff --git a/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/config.h b/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/config.h
deleted file mode 100644
index bf338e196db..00000000000
--- a/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * 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
-// place overrides here
-
diff --git a/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/keymap.c b/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/keymap.c
deleted file mode 100644
index 4e33b0af29f..00000000000
--- a/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/keymap.c
+++ /dev/null
@@ -1,554 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * 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 custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE,
-
-  DVP_ESC, // Grave escape basically i think
-  DVP_AMPR,
-  DVP_LBRACKET,
-  DVP_LCBR,
-  DVP_RCBR,
-  DVP_LPRN,
-  DVP_AT,
-  DVP_EQUAL,
-  DVP_ASTERISK,
-  DVP_RPRN,
-  DVP_PLUS,
-  DVP_RBRACKET,
-  DVP_EXLM,
-  DVP_HASH,
-  SHFT_DOT,
-  SHFT_COMMA
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Programmer's Dvorak
-  [0] = 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,
-                            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_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    KC_NO,      TO(2),      KC_TAB,   KC_SCLN,  KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_NO,      KC_NO,      MO(3),    KC_A,     KC_O,         KC_E,     KC_U,     KC_I,     KC_D,     KC_H,         KC_T,     KC_N,     KC_S,         KC_MINUS, KC_BSLS,                       KC_UP,               KC_P4,   KC_P5,   KC_P6,   MO(4),
-    LCTL(KC_F), KC_LALT,    KC_LSFT,  KC_ESC,   KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    LCTL(KC_C), LCTL(KC_V), KC_LCTL,  KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTL,                       KC_DOWN,             KC_P0,            KC_PDOT
-  ),
-
-  // Qwerty layer + function
-  [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,
-                    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_ESC, TO(0),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    KC_NO,  KC_NO,  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_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_NO,  KC_NO,  MO(3),    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,     KC_SCLN,   KC_QUOT,  KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-    KC_NO,  KC_NO,  KC_LSFT,  KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_NO,  KC_LALT,KC_LCTL,  KC_LGUI,                                      KC_SPC,                                KC_RALT,  KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
-  ),
-
-  // Orirginal Layer
-  [2] = 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,
-                    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_ESC, TO(1),  KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,      KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    KC_NO,  TO(0),  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_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_NO,  KC_NO,  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_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-    KC_NO,  KC_NO,  KC_LSFT,  KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMMA, KC_DOT,    KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_NO,  KC_LALT,KC_LCTL,  KC_LGUI,                                        KC_SPC,                              KC_RALT,  KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
-  ),
-
-  // Function Layer
-  [3] = 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_F13,   KC_F14, KC_F15,               KC_F16,               KC_F17,               KC_F18,   KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,     KC_F24,
-    MU_TOGG,KC_NO,    KC_ESC,   KC_1,   KC_2,                 KC_3,                 KC_4,                 KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,       KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
-    MU_NEXT,KC_NO,    KC_TAB,   KC_NO,  KC_MEDIA_PREV_TRACK,  KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,  KC_NO,    KC_NO,    KC_PGUP,  KC_DEL,   KC_NO,    KC_NO,      KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
-    KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,      KC_AUDIO_MUTE,        KC_NO,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_SCLN,    KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
-    KC_NO,  KC_LALT,  KC_LSFT,  KC_NO,  KC_NO,                KC_NO,                KC_NO,                KC_NO,    KC_NO,    KC_NO,    KC_PGDN,  KC_COMMA, KC_DOT,     KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
-    KC_NO,  KC_NO,    KC_LCTL,  KC_LGUI,                                                                            KC_SPC,                                 KC_RALT,    KC_CAPS,                               KC_DOWN,             LSFT(KC_A),             KC_PDOT
-  ),
-
-  // Literally just the numpad is different
-  [4] = 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,
-                          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_ESC,     TO(1),      DVP_ESC,  DVP_AMPR, DVP_LBRACKET, DVP_LCBR, DVP_RCBR, DVP_LPRN, DVP_EQUAL,DVP_ASTERISK, DVP_RPRN, DVP_PLUS, DVP_RBRACKET, DVP_EXLM, DVP_HASH, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
-  KC_NO,      TO(2),      KC_TAB,   KC_SCLN,  KC_COMMA,     KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,         KC_C,     KC_R,     KC_L,         KC_SLSH,  DVP_AT,   KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_BTN1,  KC_MS_U,  KC_BTN2,  KC_NO,
-  KC_NO,      KC_NO,      TO(0),    KC_A,     KC_O,         KC_E,     KC_U,     KC_I,     KC_D,     KC_H,         KC_T,     KC_N,     KC_S,         KC_MINUS, KC_BSLS,                       KC_UP,               KC_MS_L,  KC_NO,    KC_MS_R,  KC_TRNS,
-  LCTL(KC_F), KC_LALT,    KC_LSFT,  KC_NO,    KC_QUOT,      KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,         KC_M,     KC_W,     KC_V,         KC_Z,     KC_RSFT,              KC_LEFT, KC_BTN3, KC_RIGHT,   KC_GT,    KC_MS_D,  KC_GT,    KC_PENT,
-  LCTL(KC_C), LCTL(KC_V), KC_LCTL,  KC_LGUI,                                    KC_SPC,                                                             KC_RALT,  KC_RCTL,                       KC_DOWN,             KC_BTN1,            KC_PDOT
-
-  ),
-
-  /*
-  [4] = 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,
-                      KC_F1,    KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,   KC_F11, KC_F12,
-    MU_TOGG,TO(0),    KC_DLR,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,     KC_0,   KC_MINUS, KC_EQL, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,     KC_PSLS,    KC_PAST,    KC_PMNS,
-    MU_NEXT,KC_NO,    KC_TAB,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_LBRC,  KC_RBRC,KC_ENTER,   KC_DEL,  KC_END,  KC_PGDN,    KC_NO,      KC_NO,      KC_NO,      KC_PPLS,
-    KC_NO,  KC_NO,    KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_QUOT,  KC_BSLS,                     KC_UP,               LSFT(KC_E), LSFT(KC_F), KC_NO,      KC_BSPC,
-    KC_NO,  KC_LALT,  KC_LSFT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_COMMA, KC_DOT, KC_SLSH,  KC_RSFT,            KC_LEFT, KC_WH_D, KC_RIGHT,   LSFT(KC_B), LSFT(KC_C), LSFT(KC_D), KC_PENT,
-    KC_NO,  KC_LGUI,  KC_LCTL,  KC_LALT,                                                  KC_SPC,                 KC_RALT,  KC_RCTL,                     KC_DOWN,             LSFT(KC_A),             KC_PDOT
-
-  ),*/
-  /*[0] = LAYOUT(
-     KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_NO,TO(1),KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1,
-     KC_2, KC_2, KC_2, KC_2, KC_2, KC_2, KC_2, KC_2, KC_2, KC_2, KC_2, TO(2),KC_2, KC_2, KC_2, KC_2, KC_2, KC_2, KC_2, KC_2,
-     KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3, KC_3,
-     KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_4, KC_BSPC,KC_4,KC_4,KC_4, KC_4,
-     KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5, KC_5,
-     KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6, KC_6,
-     KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7, KC_7,
-     KC_8, KC_SPC,KC_8,KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, KC_8, TO(1)
-
-  ),
-  [1] = LAYOUT(
-     KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, TO(0),KC_NO,KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, KC_T,
-     KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, TO(2),KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, KC_T,
-     KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, KC_T,
-     KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O, KC_BSPC,KC_Q,KC_R,KC_S, KC_T,
-     KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, KC_T,
-     KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, KC_T,
-     KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, KC_T,
-     KC_A, KC_SPC,KC_C,KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R, KC_S, TO(0)
-  ),
-  [2] = LAYOUT(
-     KC_LCTL,     KC_LALT,  KC_C,     KC_RALT,    KC_E,       KC_F, KC_G, KC_G, KC_H, KC_J, TO(0),  TO(1),  KC_M,     KC_N,   KC_QUOT,    KC_DOWN,  KC_UP,  KC_R,     KC_S,       KC_ENTER,
-     KC_PPLS,     KC_B,     KC_C,     KC_D,       KC_A,       KC_S, KC_D, KC_F, KC_J, KC_J, KC_K,   KC_NO,  KC_K,     KC_L,   KC_SCLN,    KC_P4,    KC_DEL, KC_P5,    KC_P6,      KC_RIGHT,
-     KC_PMNS,     KC_1,     KC_C,    KC_D,       KC_1,       KC_2, KC_3, KC_4, KC_7, KC_J, KC_K,   KC_L,   KC_8,     KC_9,   KC_0,       KC_NUM,   KC_PGUP,KC_PSLS,  KC_PAST,    KC_T,
-     KC_A,        KC_ESC,   TO(0),KC_D,     KC_GRV,     KC_F, KC_G, KC_5, KC_6, KC_J, KC_K,   KC_L,   KC_EQL,   KC_N,   KC_MINUS,   KC_BSPC,  KC_INS, KC_HOME,  KC_S,       KC_T,
-     KC_PPLS,     KC_NO,    KC_TAB,   KC_D,       KC_Q,       KC_W, KC_E, KC_R, KC_U, KC_J, KC_K,   KC_L,   KC_I,     KC_O,   KC_P,       KC_P7,    KC_PGDN,KC_P8,    KC_P9,      KC_T,
-     KC_A,        KC_B,     KC_C,     KC_D,       KC_E,       KC_F, KC_G, KC_T, KC_Y, KC_J, KC_K,   KC_L,   KC_RBRC,  KC_N,   KC_LBRC,    KC_P,     KC_END, KC_R,     KC_S,       KC_T,
-     KC_LEFT,     KC_P1,    KC_CAPS,  KC_RSFT,    KC_Z,       KC_X, KC_C, KC_V, KC_M, KC_J, KC_K,   KC_L,   KC_COMMA, KC_DOT, KC_BSLS,    KC_PENT,  KC_Q,   KC_P2,    KC_P3,      KC_T,
-     KC_LGUI,     KC_SPACE, KC_RCTL,  KC_LSFT,    KC_E,       KC_F, KC_G, KC_B, KC_N, KC_J, KC_K,   KC_L,   KC_M,     KC_N,   KC_SLSH,    KC_P,     KC_Q,   KC_P0,    KC_PDOT,    KC_KP_ENTER
-    ),*/
-};
-
-bool left_shift_down = false;
-bool right_shift_down = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-     switch (keycode) {
-    case KC_LEFT_SHIFT:
-    if (record->event.pressed)
-      {
-        left_shift_down = true;
-      return true;
-      }
-      else
-      {
-        left_shift_down = false;
-        return true;
-      }
-    break;
-    case KC_RIGHT_SHIFT:
-
-      if (record->event.pressed)
-      {
-        right_shift_down = true;
-      return true;
-      }
-      else
-      {
-        right_shift_down = false;
-        return true;
-      }
-    break;
-
-
-    case DVP_ESC:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-        SEND_STRING("~");
-      return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("$");
-      return false;
-    }
-    break;
-
-    case DVP_AMPR:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        SEND_STRING("%");
-
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("&");
-      return false;
-    }
-    break;
-
-    case DVP_LBRACKET:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-        {
-          if(left_shift_down)
-            unregister_code(KC_LEFT_SHIFT);
-          if(right_shift_down)
-            unregister_code(KC_RIGHT_SHIFT);
-
-          register_code(KC_7);
-          unregister_code(KC_7);
-
-          if(left_shift_down)
-            register_code(KC_LEFT_SHIFT);
-          if(right_shift_down)
-            register_code(KC_RIGHT_SHIFT);
-        }
-      return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("[");
-      return false;
-    }
-    break;
-
-    case DVP_LCBR:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-       {
-          if(left_shift_down)
-            unregister_code(KC_LEFT_SHIFT);
-          if(right_shift_down)
-            unregister_code(KC_RIGHT_SHIFT);
-
-          register_code(KC_5);
-          unregister_code(KC_5);
-
-          if(left_shift_down)
-            register_code(KC_LEFT_SHIFT);
-          if(right_shift_down)
-            register_code(KC_RIGHT_SHIFT);
-        }
-      return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("{");
-      return false;
-    }
-    break;
-
-    case DVP_RCBR:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_3);
-        unregister_code(KC_3);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-      return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("}");
-      return false;
-    }
-    break;
-
-
-    case DVP_LPRN:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_1);
-        unregister_code(KC_1);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("(");
-    return false;
-    }
-    break;
-//
-    case DVP_AT:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_LEFT_SHIFT);
-        register_code(KC_6);
-        unregister_code(KC_6);
-        unregister_code(KC_LEFT_SHIFT);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("@");
-    return false;
-    }
-    break;
-
-
-    case DVP_EQUAL:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_9);
-        unregister_code(KC_9);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("=");
-    return false;
-    }
-    break;
-
-    case DVP_ASTERISK:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_0);
-        unregister_code(KC_0);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("*");
-    return false;
-    }
-    break;
-
-    case DVP_RPRN:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_2);
-        unregister_code(KC_2);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    return false;
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING(")");
-    return false;
-    }
-    break;
-
-    case DVP_PLUS:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_4);
-        unregister_code(KC_4);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("+");
-    }
-    return false;
-    break;
-
-    case DVP_RBRACKET:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_6);
-        unregister_code(KC_6);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("]");
-    }
-    return false;
-    break;
-
-    case DVP_EXLM:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_8);
-        unregister_code(KC_8);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("!");
-    }
-    return false;
-    break;
-
-    case DVP_HASH:
-    if (left_shift_down || right_shift_down)
-    {
-      if(record->event.pressed)
-      {
-        if(left_shift_down)
-          unregister_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          unregister_code(KC_RIGHT_SHIFT);
-
-        register_code(KC_GRAVE);
-        unregister_code(KC_GRAVE);
-
-        if(left_shift_down)
-          register_code(KC_LEFT_SHIFT);
-        if(right_shift_down)
-          register_code(KC_RIGHT_SHIFT);
-      }
-    }
-    else
-    {
-      if(record->event.pressed)
-        SEND_STRING("#");
-    }
-    return false;
-    break;
-     case SHFT_DOT:
-      if(record->event.pressed)
-        SEND_STRING(">");
-      break;
-
-    case SHFT_COMMA:
-      if(record->event.pressed)
-        SEND_STRING("<");
-      break;
-
-  }
-
-
-
-  return true;
-}
diff --git a/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/readme.md b/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/readme.md
deleted file mode 100644
index 5d3f6abe15f..00000000000
--- a/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Lukaus' for ibm122m2
-Programmer's Dvorak as the default layer with a Qwerty layer that can access a function layer. Also includes the default layout, slightly modified
diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/config.h b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/config.h
deleted file mode 100644
index 151118fdf67..00000000000
--- a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 tiltowait
- *
- * 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
-
-// place overrides here
-
-#define PERMISSIVE_HOLD
diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/keymap.c b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/keymap.c
deleted file mode 100644
index 4836ad329e7..00000000000
--- a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2021 tiltowait
- *
- * 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 custom_layers {
-    _BASE,
-    _SECOND,
-    _NUMPAD,
-};
-
-enum custom_keycodes {
-  NUM_SCRL = SAFE_RANGE /* Dual-purpose Scroll Lock / Numlock button as on original hardware */
-};
-
-void toggle_numlock_layer(int set_state);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT( /* Base layer */
-    KC_ESC,                KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_MUTE, KC_F10,  KC_VOLD, KC_VOLU,   S(G(KC_4)), NUM_SCRL, KC_PAUS,
-
-    KC_GRV,       KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,   KC_INS,  KC_HOME,  KC_PGUP,
-    LT(_SECOND,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_BSPC,   KC_DEL,  KC_END,   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_NUHS, KC_ENT,
-    KC_LSFT,      KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,            KC_UP,
-    KC_LALT,               LGUI_T(KC_ENT),                    KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN,  KC_RGHT
-  ),
-  [_SECOND] = LAYOUT( /* Layer 1 */
-     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,       KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,    S(A(KC_MINS)), KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(KC_LEFT), C(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_LEFT, KC_DOWN,    KC_UP,      KC_RGHT, S(A(KC_M)), KC_TRNS,       KC_TRNS, KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_ENT,     KC_TRNS, KC_TRNS,    KC_TRNS,                KC_TRNS,            KC_TRNS,
-     KC_TRNS,          KC_TRNS,                            C(KC_SPC),                                            KC_TRNS,                KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-  [_NUMPAD] = LAYOUT( /* Numpad Layer */
-     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,     KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_7, KC_KP_8, KC_KP_9, KC_TRNS,        KC_KP_MINUS, KC_KP_PLUS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_TRNS,        KC_TRNS,     KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ASTERISK, KC_TRNS,     KC_TRNS,    KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_0, KC_TRNS, KC_KP_DOT,      KC_KP_SLASH,             KC_TRNS,            KC_TRNS,
-     KC_TRNS,          KC_TRNS,                            KC_TRNS,                                            KC_TRNS,                 KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  static uint16_t last_num_scroll = 0; /* For unregistering the proper key */
-
-  switch (keycode) {
-    case NUM_SCRL:
-    if (record->event.pressed) {
-      if (get_mods() & MOD_MASK_SHIFT) {
-        /* Remove the shift modifiers */
-        uint8_t shift_mods = get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT));
-        set_mods(get_mods() & ~(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) );
-
-        last_num_scroll = KC_NUM_LOCK;
-        register_code(last_num_scroll);
-        toggle_numlock_layer(-1);
-
-        /* Reset the shift modifiers */
-        set_mods(shift_mods);
-      } else {
-        last_num_scroll = KC_SCROLL_LOCK;
-        register_code(last_num_scroll);
-      }
-    } else {
-      unregister_code(last_num_scroll);
-    }
-    break;
-  }
-  return true;
-}
-
-void toggle_numlock_layer(int set_state) {
-  static uint8_t numlock_enabled = 0;
-
-  /* set_state allows us to explicitly change the numlock state
-     rather than merely toggling it. */
-  if (set_state == -1) {
-    numlock_enabled = !numlock_enabled;
-  } else {
-    numlock_enabled = set_state;
-  }
-
-  if (numlock_enabled) {
-    layer_on(_NUMPAD);
-  }
-  else {
-    layer_off(_NUMPAD);
-  }
-}
-
-bool led_update_kb(led_t led_state) {
-  static int8_t numlock_state = -1;
-
-  if (led_state.num_lock != numlock_state) {
-    numlock_state = led_state.num_lock;
-    toggle_numlock_layer(led_state.num_lock);
-  }
-  return true;
-}
diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/readme.md b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/readme.md
deleted file mode 100644
index aecdd89b82d..00000000000
--- a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# The maintainer's personal keymap for modelm_ssk
-
-This is a keymap suitable for macOS use.
-
-* Backspace and backslash have been swapped (HHKB style)
-* Capslock is LCTRL
-* LCTRL is LALT
-* LALT is LGUI
-* Tab shifts to layer 1 on hold
-* Layer 1 has a couple of Mac shortcuts, plus Vim-style arrow keys
-* Shift+Numlock enables numlock
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
deleted file mode 100644
index d4b4480810a..00000000000
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Ibnu D. Aji
- *
- * 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 COMBO_TERM  50
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 175
-#define TAPPING_TERM 175
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
deleted file mode 100644
index 9c1f0cb63ea..00000000000
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* Copyright 2021 Ibnu D. Aji
- *
- * 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 CONSOLE_ENABLE
-#include "print.h"
-#endif
-
-// enum for combos.
-enum combos {
-    // left hand combinations.
-    L_U_PINKY_RING,
-    L_U_RING_MIDDLE,
-    L_U_RING_INDEX,
-    L_U_MIDDLE_INDEX,
-    L_U_MIDDLE_INNER_INDEX,
-    L_U_INDEX_INNER_INDEX,
-    L_L_PINKY_RING,
-    L_L_RING_MIDDLE,
-    L_L_RING_INDEX,
-    L_L_MIDDLE_INDEX,
-    L_L_INDEX_INNER_INDEX,
-
-    L_U_RING_MIDDLE_INDEX,
-    L_L_RING_MIDDLE_INDEX,
-
-    // right hand combinations.
-    R_U_PINKY_RING,
-    R_U_RING_MIDDLE,
-    R_U_RING_INDEX,
-    R_U_MIDDLE_INDEX,
-    R_U_MIDDLE_INNER_INDEX,
-    R_U_INNER_INNER_INDEX,
-    R_L_PINKY_RING,
-    R_L_RING_MIDDLE,
-    R_L_MIDDLE_INDEX,
-    R_L_RING_INDEX,
-    R_L_INDEX_INNER_INDEX,
-
-    R_U_RING_MIDDLE_INDEX,
-    R_L_RING_MIDDLE_INDEX,
-
-    // both hands combinations.
-    B_L_MIDDLE_MIDDLE,
-};
-
-enum {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// keycode abstraction
-#define LUP  KC_Q
-#define LUR  KC_V
-#define LUM  KC_C
-#define LUI  KC_P
-#define LUII KC_B
-#define LMP  KC_R
-#define LMR  KC_S
-#define LMM  KC_T
-#define LMI  KC_H
-#define LMII KC_D
-#define LLP  KC_QUOT
-#define LLR  KC_J
-#define LLM  KC_G
-#define LLI  KC_K
-#define LLII KC_X
-
-#define RUP  KC_Z
-#define RUR  KC_Y
-#define RUM  KC_U
-#define RUI  KC_L
-#define RUII KC_DOT
-#define RMP  KC_O
-#define RMR  KC_I
-#define RMM  KC_A
-#define RMI  KC_N
-#define RMII KC_F
-#define RLP  KC_SLSH
-#define RLR  KC_COMM
-#define RLM  KC_W
-#define RLI  KC_M
-#define RLII KC_SCLN
-
-// thumb keys.
-#define TRAISE   TG(_RAISE)
-#define AL_ENT   ALT_T(KC_ENT)
-#define SF_BSPC  SFT_T(KC_BSPC)
-#define CT_ESC   CTL_T(KC_ESC)
-
-// home row mods.
-#define CTLR    LCTL_T(LMR)
-#define CTRR    RCTL_T(RMR)
-#define CT_LEFT LCTL_T(KC_LEFT)
-#define CT_SIX  RCTL_T(KC_6)
-
-#define SHLP    LSFT_T(LMP)
-#define SHRP    RSFT_T(RMP)
-#define SH_HASH LSFT_T(KC_HASH)
-#define SH_ZERO RSFT_T(KC_0)
-
-#define ALLM    LALT_T(LMM)
-#define ALRM    RALT_T(RMM)
-#define AL_DOWN LALT_T(KC_DOWN)
-#define AL_FIVE RALT_T(KC_5)
-
-#define GULII   RGUI_T(LMII)
-#define GURII   LGUI_T(RMII)
-#define GU_DLR  RGUI_T(KC_DLR)
-#define GU_EQL  LGUI_T(KC_EQL)
-
-// layer toggle.
-#define LW_E     LT(_LOWER, KC_E)
-#define RS_SPC   LT(_RAISE, KC_SPC)
-#define LW_RMI   LT(_LOWER, RMI)
-#define RS_LMI   LT(_RAISE, LMI)
-
-// idk, man. not used, i guess.
-#define ADDDD    MO(_ADJUST)
-
-// common shortcuts for windows and linux that i use.
-#define NXTTAB LCTL(KC_PGDN)
-#define PRVTAB LCTL(KC_PGUP)
-#define UPTAB  LCTL(LSFT(KC_PGUP))
-#define DNTAB  LCTL(LSFT(KC_PGDN))
-#define NXTWIN LALT(KC_TAB)
-#define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define EXPLR  LGUI(KC_E)
-#define LCKGUI LGUI(KC_L)
-#define CONPST LSFT(KC_INS)
-#define CLSGUI LALT(KC_F4)
-
-// left hand combinations.
-const uint16_t PROGMEM lu_p_r_combo[]     = {LUP, LUR,  COMBO_END};
-const uint16_t PROGMEM lu_r_m_combo[]     = {LUR, LUM,  COMBO_END};
-const uint16_t PROGMEM lu_r_i_combo[]     = {LUR, LUI,  COMBO_END};
-const uint16_t PROGMEM lu_m_i_combo[]     = {LUM, LUI,  COMBO_END};
-const uint16_t PROGMEM lu_m_ii_combo[]    = {LUM, LUII, COMBO_END};
-const uint16_t PROGMEM lu_i_ii_combo[]    = {LUI, LUII, COMBO_END};
-const uint16_t PROGMEM ll_p_r_combo[]     = {LLP, LLR,  COMBO_END};
-const uint16_t PROGMEM ll_r_m_combo[]     = {LLR, LLM,  COMBO_END};
-const uint16_t PROGMEM ll_r_i_combo[]     = {LLR, LLI,  COMBO_END};
-const uint16_t PROGMEM ll_m_i_combo[]     = {LLM, LLI,  COMBO_END};
-const uint16_t PROGMEM ll_i_ii_combo[]    = {LLI, LLII, COMBO_END};
-
-const uint16_t PROGMEM lu_r_m_i_combo[]   = {LUR, LUM, LUI, COMBO_END};
-const uint16_t PROGMEM ll_r_m_i_combo[]   = {LLR, LLM, LLI, COMBO_END};
-
-// right hand combinations.
-const uint16_t PROGMEM ru_p_r_combo[]      = {RUP, RUR,  COMBO_END};
-const uint16_t PROGMEM ru_r_m_combo[]      = {RUR, RUM,  COMBO_END};
-const uint16_t PROGMEM ru_r_i_combo[]      = {RUR, RUI,  COMBO_END};
-const uint16_t PROGMEM ru_m_i_combo[]      = {RUM, RUI,  COMBO_END};
-const uint16_t PROGMEM ru_m_ii_combo[]     = {RUM, RUII, COMBO_END};
-const uint16_t PROGMEM ru_i_ii_combo[]     = {RUI, RUII, COMBO_END};
-const uint16_t PROGMEM rl_p_r_combo[]      = {RLP, RLR,  COMBO_END};
-const uint16_t PROGMEM rl_r_m_combo[]      = {RLR, RLM,  COMBO_END};
-const uint16_t PROGMEM rl_r_i_combo[]      = {RLR, RLI,  COMBO_END};
-const uint16_t PROGMEM rl_m_i_combo[]      = {RLM, RLI,  COMBO_END};
-const uint16_t PROGMEM rl_i_ii_combo[]     = {RLI, RLII, COMBO_END};
-
-const uint16_t PROGMEM ru_r_m_i_combo[]   =  {RUR, RUM, RUI, COMBO_END};
-const uint16_t PROGMEM rl_r_m_i_combo[]   =  {RLR, RLM, RLI, COMBO_END};
-
-// both hand combinations.
-const uint16_t PROGMEM bl_m_m_combo[]      = {LLM, RLM, COMBO_END};
-
-combo_t key_combos[] = {
-    // left hand combinations.
-    [L_U_PINKY_RING]          = COMBO(lu_p_r_combo,  KC_TAB),
-    [L_U_RING_MIDDLE]         = COMBO(lu_r_m_combo,  KC_QUES),
-    [L_U_RING_INDEX]          = COMBO(lu_r_i_combo,  PRVTAB),
-    [L_U_MIDDLE_INDEX]        = COMBO(lu_m_i_combo,  KC_UNDS),
-    [L_U_MIDDLE_INNER_INDEX]  = COMBO(lu_m_ii_combo, KC_ENT),
-    [L_U_INDEX_INNER_INDEX]   = COMBO(lu_i_ii_combo, KC_PIPE),
-    [L_L_PINKY_RING]          = COMBO(ll_p_r_combo,  KC_ENT),
-    [L_L_RING_MIDDLE]         = COMBO(ll_r_m_combo,  LCTL(KC_W)),
-    [L_L_RING_INDEX]          = COMBO(ll_r_i_combo,  KC_TAB),
-    [L_L_MIDDLE_INDEX]        = COMBO(ll_m_i_combo,  KC_DEL),
-    [L_L_INDEX_INNER_INDEX]   = COMBO(ll_i_ii_combo, KC_TILD),
-
-    [L_U_RING_MIDDLE_INDEX]   = COMBO(lu_r_m_i_combo, KC_PIPE),
-    [L_L_RING_MIDDLE_INDEX]   = COMBO(ll_r_m_i_combo, KC_TILD),
-
-    // right hand combinations.
-    [R_U_PINKY_RING]          = COMBO(ru_p_r_combo,  KC_BSPC),
-    [R_U_RING_MIDDLE]         = COMBO(ru_r_m_combo,  KC_SLSH),
-    [R_U_RING_INDEX]          = COMBO(ru_r_i_combo,  NXTTAB),
-    [R_U_MIDDLE_INDEX]        = COMBO(ru_m_i_combo,  KC_MINS),
-    [R_U_MIDDLE_INNER_INDEX]  = COMBO(ru_m_ii_combo, KC_ENT),
-    [R_U_INNER_INNER_INDEX]   = COMBO(ru_i_ii_combo, KC_BSLS),
-    [R_L_PINKY_RING]          = COMBO(rl_p_r_combo,  KC_BSLS),
-    [R_L_RING_MIDDLE]         = COMBO(rl_r_m_combo,  KC_APP),
-    [R_L_RING_INDEX]          = COMBO(rl_r_i_combo,  LSFT(KC_TAB)),
-    [R_L_MIDDLE_INDEX]        = COMBO(rl_m_i_combo,  KC_DEL),
-    [R_L_INDEX_INNER_INDEX]   = COMBO(rl_i_ii_combo, KC_GRV),
-
-    [R_U_RING_MIDDLE_INDEX]   = COMBO(ru_r_m_i_combo, KC_BSLS),
-    [R_L_RING_MIDDLE_INDEX]   = COMBO(rl_r_m_i_combo, KC_GRV),
-
-    // both hand combinations.
-    [B_L_MIDDLE_MIDDLE]       = COMBO(bl_m_m_combo,  KC_ENT),
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-        KC_ESC, LUP,    LUR,    LUM,    LUI,    LUII,            RUII,   RUI,    RUM,    RUR,    RUP,   KC_BSPC, KC_BSPC,
-        KC_LCTL,SHLP,   CTLR,   ALLM,   RS_LMI, GULII,           GURII,  LW_RMI, ALRM,   CTRR,   SHRP,  KC_ENT,
-        KC_LSFT,LLP,    LLR,    LLM,    LLI,    LLII,            RLII,   RLI,    RLM,    RLR,    RLP,   KC_RSFT,MO(1),
-        KC_LGUI,KC_LALT,        KC_LGUI,LW_E,   SF_BSPC,         AL_ENT, RS_SPC, KC_LALT,               KC_RGUI,KC_RCTL
-    ),
-    [1] = 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_DEL, KC_BSPC,
-        KC_LCTL,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,         KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,   KC_SCLN,
-        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(2),
-        KC_LGUI,KC_LALT,        KC_LGUI,LW_E,   SF_BSPC,         AL_ENT, RS_SPC, KC_LALT,                KC_RGUI,KC_RCTL
-    ),
-    [2] = LAYOUT_all(
-        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_LCTL,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,         KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,   KC_SCLN,
-        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   QK_BOOT,         KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1),
-        KC_LGUI,KC_LALT,        KC_LGUI,LW_E,   SF_BSPC,         AL_ENT, RS_SPC, KC_LALT,                KC_RGUI,KC_RCTL
-    ),
-};
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md b/keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md
deleted file mode 100644
index 2bfb2a96fae..00000000000
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Rick's Keymap for Alicia Cook
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk b/keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk
deleted file mode 100644
index 6ecc620954c..00000000000
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMBO_ENABLE = yes
-CONSOLE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
deleted file mode 100644
index 2392b46be68..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#define COMBO_TERM 100
-#define PERMISSIVE_HOLD
-
-#define LEADER_TIMEOUT 300
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
deleted file mode 100644
index b28fc844997..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * 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 for combos.
-enum combos {
-    // left hand combinations.
-    COLON_COMMA,
-    COMMA_DOT,
-    DOT_P,
-    P_Y,
-    COMMA_P,
-    QUOT_Q,
-    Q_J,
-    J_K,
-    Q_K,
-    K_X,
-
-    // right hand combinations.
-    L_R,
-    R_C,
-    C_G,
-    R_G,
-    G_F,
-    V_W,
-    W_M,
-    V_M,
-    M_B,
-
-    // both hands combinations.
-    J_W,
-};
-
-enum {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// thumb keys.
-#define ALT_ENT   ALT_T(KC_ENT)
-#define SFT_ESC   SFT_T(KC_ESC)
-
-// home row mods.
-#define CT_O LCTL_T(KC_O)
-#define CT_N RCTL_T(KC_N)
-#define SH_A LSFT_T(KC_A)
-#define SH_S RSFT_T(KC_S)
-#define AL_E LALT_T(KC_E)
-#define AL_T RALT_T(KC_T)
-#define GU_I LGUI_T(KC_I)
-#define GU_D RGUI_T(KC_D)
-
-// layer toggle.
-#define LW_BSPC  LT(_LOWER, KC_BSPC)
-#define RS_SPC   LT(_RAISE, KC_SPC)
-#define RS_D     LT(_RAISE, KC_D)
-#define LW_I     LT(_LOWER, KC_I)
-
-// idk, man. not used, i guess.
-#define ADDDD    MO(_ADJUST)
-
-// common shortcuts for windows and linux that i use.
-#define NXTTAB LCTL(KC_PGDN)
-#define PRVTAB LCTL(KC_PGUP)
-#define UPTAB  LCTL(LSFT(KC_PGUP))
-#define DNTAB  LCTL(LSFT(KC_PGDN))
-#define NXTWIN LALT(KC_TAB)
-#define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define EXPLR  LGUI(KC_E)
-#define LCKGUI LGUI(KC_L)
-#define CONPST LSFT(KC_INS)
-#define CLSGUI LALT(KC_F4)
-
-// left hand combinations.
-const uint16_t PROGMEM colon_comma_combo[] = {KC_SCLN, KC_COMM, COMBO_END};
-const uint16_t PROGMEM comma_dot_combo[]   = {KC_COMM, KC_DOT, COMBO_END};
-const uint16_t PROGMEM dot_p_combo[]       = {KC_DOT, KC_P, COMBO_END};
-const uint16_t PROGMEM p_y_combo[]         = {KC_P, KC_Y, COMBO_END};
-const uint16_t PROGMEM comma_p_combo[]     = {KC_COMM, KC_P, COMBO_END};
-const uint16_t PROGMEM quot_q_combo[]      = {KC_QUOT, KC_Q, COMBO_END};
-const uint16_t PROGMEM q_j_combo[]         = {KC_Q, KC_J, COMBO_END};
-const uint16_t PROGMEM j_k_combo[]         = {KC_J, KC_K, COMBO_END};
-const uint16_t PROGMEM q_k_combo[]         = {KC_Q, KC_K, COMBO_END};
-const uint16_t PROGMEM k_x_combo[]         = {KC_K, KC_X, COMBO_END};
-
-// right hand combinations.
-const uint16_t PROGMEM l_r_combo[]         = {KC_L, KC_R, COMBO_END};
-const uint16_t PROGMEM r_c_combo[]         = {KC_R, KC_C, COMBO_END};
-const uint16_t PROGMEM c_g_combo[]         = {KC_C, KC_G, COMBO_END};
-const uint16_t PROGMEM r_g_combo[]         = {KC_R, KC_G, COMBO_END};
-const uint16_t PROGMEM g_f_combo[]         = {KC_G, KC_F, COMBO_END};
-const uint16_t PROGMEM v_w_combo[]         = {KC_V, KC_W, COMBO_END};
-const uint16_t PROGMEM w_m_combo[]         = {KC_W, KC_M, COMBO_END};
-const uint16_t PROGMEM v_m_combo[]         = {KC_V, KC_M, COMBO_END};
-const uint16_t PROGMEM m_b_combo[]         = {KC_M, KC_B, COMBO_END};
-
-// both hand combinations.
-const uint16_t PROGMEM j_w_combo[]         = {KC_J, KC_W, COMBO_END};
-
-combo_t key_combos[] = {
-    // left hand combinations.
-    [COLON_COMMA]   = COMBO(colon_comma_combo,  KC_TAB),
-    [COMMA_DOT]     = COMBO(comma_dot_combo,    KC_QUES),
-    [DOT_P]         = COMBO(dot_p_combo,        KC_UNDS),
-    [P_Y]           = COMBO(p_y_combo,          KC_PIPE),
-    [COMMA_P]       = COMBO(comma_p_combo,      PRVTAB),
-    [QUOT_Q]        = COMBO(quot_q_combo,       KC_ENT),
-    [Q_J]           = COMBO(q_j_combo,          LCTL(KC_W)),
-    [J_K]           = COMBO(j_k_combo,          KC_DEL),
-    [Q_K]           = COMBO(q_k_combo,          KC_TAB),
-    [K_X]           = COMBO(k_x_combo,          KC_TILD),
-
-    // right hand combinations.
-    [L_R]           = COMBO(l_r_combo,          KC_BSPC),
-    [R_C]           = COMBO(r_c_combo,          KC_SLSH),
-    [C_G]           = COMBO(c_g_combo,          KC_MINS),
-    [R_G]           = COMBO(r_g_combo,          NXTTAB),
-    [G_F]           = COMBO(g_f_combo,          KC_BSLS),
-    [V_W]           = COMBO(v_w_combo,          KC_APP),
-    [W_M]           = COMBO(w_m_combo,          KC_DEL),
-    [V_M]           = COMBO(v_m_combo,          LSFT(KC_TAB)),
-    [M_B]           = COMBO(m_b_combo,          KC_GRV),
-
-    // both hand combinations.
-    [J_W]           = COMBO(j_w_combo,          KC_ENT),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT_complicated(
-    KC_SCLN,KC_COMM,KC_DOT, KC_P,   KC_Y,       KC_F,   KC_G,   KC_C,   KC_R,   KC_L,
-    SH_A,   CT_O,   AL_E,   KC_U,   GU_I,       GU_D,   KC_H,   AL_T,   CT_N,   SH_S,
-    KC_QUOT,KC_Q,   KC_J,   KC_K,   KC_X,       KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,
-                            LW_BSPC,QK_LEAD,    ALT_ENT,RS_SPC,
-                            LW_BSPC,SFT_ESC,    ALT_ENT,RS_SPC
-),
-
-[_RAISE] = LAYOUT_complicated(
-    KC_EXLM,KC_AT,  KC_UP,  KC_LCBR,KC_RCBR,    KC_BSLS,KC_7,   KC_8,   KC_9,   KC_ASTR ,
-    KC_HASH,KC_LEFT,KC_DOWN,KC_RGHT,KC_DLR,     KC_EQL, KC_4,   KC_5,   KC_6,   KC_0 ,
-    KC_LBRC,KC_RBRC,KC_LPRN,KC_RPRN,KC_AMPR,    KC_GRV, KC_1,   KC_2,   KC_3,   KC_PLUS ,
-                            ADDDD  ,_______,    _______,_______,
-                            ADDDD  ,_______,    _______,_______
-),
-[_LOWER] = LAYOUT_complicated(
-    _______,_______,_______,KC_F1,  KC_F2,      KC_F3,  KC_F4,  _______,_______,_______ ,
-    KC_LSFT,KC_TAB, KC_PGUP,KC_F5,  KC_F6,      KC_F7,  KC_F8,  KC_HOME,KC_LALT,KC_ENT  ,
-    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, _______ ,
-                            _______,_______,    _______,ADDDD,
-                            _______,_______,    _______,ADDDD
-),
-[_ADJUST] = LAYOUT_complicated(
-    _______,EXPLR,  KC_UP,  PRVTAB, PRVWIN,     NXTWIN, NXTTAB, _______,_______,LCKGUI,
-    TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB,      DNTAB,  KC_ENT, KC_LGUI,_______,CALDL,
-    _______,CLSGUI, _______,CONPST, QK_BOOT,    _______,_______,_______,_______,_______,
-                            _______,_______,    _______,_______,
-                            _______,_______,    _______,_______
-),
-};
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(KC_U)) {
-        SEND_STRING(":luvu:\n");
-    }
-}
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md
deleted file mode 100644
index d14eb193c05..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# goldberg keymap
-
-ricky rick's keymap on squiggle goldberg. ayyy.
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk
deleted file mode 100644
index 00c78275d97..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMBO_ENABLE = yes
-LEADER_ENABLE = yes
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
deleted file mode 100644
index 22ceb2f9967..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define COMBO_TERM 100
-#define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
deleted file mode 100644
index 75ea54c5481..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * 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 for combos.
-enum combos {
-    // left hand combinations.
-    COLON_COMMA,
-    COMMA_DOT,
-    DOT_P,
-    P_Y,
-    COMMA_P,
-    QUOT_Q,
-    Q_J,
-    J_K,
-    Q_K,
-    K_X,
-
-    // right hand combinations.
-    L_R,
-    R_C,
-    C_G,
-    R_G,
-    G_F,
-    V_W,
-    W_M,
-    V_M,
-    M_B,
-
-    // both hands combinations.
-    J_W,
-};
-
-enum {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// thumb keys.
-#define ALT_ENT   ALT_T(KC_ENT)
-#define SFT_ESC   SFT_T(KC_ESC)
-
-// home row mods.
-#define CT_O LCTL_T(KC_O)
-#define CT_N RCTL_T(KC_N)
-#define SH_A LSFT_T(KC_A)
-#define SH_S RSFT_T(KC_S)
-#define AL_E LALT_T(KC_E)
-#define AL_T RALT_T(KC_T)
-#define GU_I LGUI_T(KC_I)
-#define GU_D RGUI_T(KC_D)
-
-// layer toggle.
-#define LW_BSPC  LT(_LOWER, KC_BSPC)
-#define RS_SPC   LT(_RAISE, KC_SPC)
-#define RS_D     LT(_RAISE, KC_D)
-#define LW_I     LT(_LOWER, KC_I)
-
-// idk, man. not used, i guess.
-#define ADDDD    MO(_ADJUST)
-
-// common shortcuts for windows and linux that i use.
-#define NXTTAB LCTL(KC_PGDN)
-#define PRVTAB LCTL(KC_PGUP)
-#define UPTAB  LCTL(LSFT(KC_PGUP))
-#define DNTAB  LCTL(LSFT(KC_PGDN))
-#define NXTWIN LALT(KC_TAB)
-#define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define EXPLR  LGUI(KC_E)
-#define LCKGUI LGUI(KC_L)
-#define CONPST LSFT(KC_INS)
-#define CLSGUI LALT(KC_F4)
-
-// left hand combinations.
-const uint16_t PROGMEM colon_comma_combo[] = {KC_SCLN, KC_COMM, COMBO_END};
-const uint16_t PROGMEM comma_dot_combo[]   = {KC_COMM, KC_DOT, COMBO_END};
-const uint16_t PROGMEM dot_p_combo[]       = {KC_DOT, KC_P, COMBO_END};
-const uint16_t PROGMEM p_y_combo[]         = {KC_P, KC_Y, COMBO_END};
-const uint16_t PROGMEM comma_p_combo[]     = {KC_COMM, KC_P, COMBO_END};
-const uint16_t PROGMEM quot_q_combo[]      = {KC_QUOT, KC_Q, COMBO_END};
-const uint16_t PROGMEM q_j_combo[]         = {KC_Q, KC_J, COMBO_END};
-const uint16_t PROGMEM j_k_combo[]         = {KC_J, KC_K, COMBO_END};
-const uint16_t PROGMEM q_k_combo[]         = {KC_Q, KC_K, COMBO_END};
-const uint16_t PROGMEM k_x_combo[]         = {KC_K, KC_X, COMBO_END};
-
-// right hand combinations.
-const uint16_t PROGMEM l_r_combo[]         = {KC_L, KC_R, COMBO_END};
-const uint16_t PROGMEM r_c_combo[]         = {KC_R, KC_C, COMBO_END};
-const uint16_t PROGMEM c_g_combo[]         = {KC_C, KC_G, COMBO_END};
-const uint16_t PROGMEM r_g_combo[]         = {KC_R, KC_G, COMBO_END};
-const uint16_t PROGMEM g_f_combo[]         = {KC_G, KC_F, COMBO_END};
-const uint16_t PROGMEM v_w_combo[]         = {KC_V, KC_W, COMBO_END};
-const uint16_t PROGMEM w_m_combo[]         = {KC_W, KC_M, COMBO_END};
-const uint16_t PROGMEM v_m_combo[]         = {KC_V, KC_M, COMBO_END};
-const uint16_t PROGMEM m_b_combo[]         = {KC_M, KC_B, COMBO_END};
-
-// both hand combinations.
-const uint16_t PROGMEM j_w_combo[]         = {KC_J, KC_W, COMBO_END};
-
-combo_t key_combos[] = {
-    // left hand combinations.
-    [COLON_COMMA]   = COMBO(colon_comma_combo,  KC_TAB),
-    [COMMA_DOT]     = COMBO(comma_dot_combo,    KC_QUES),
-    [DOT_P]         = COMBO(dot_p_combo,        KC_UNDS),
-    [P_Y]           = COMBO(p_y_combo,          KC_PIPE),
-    [COMMA_P]       = COMBO(comma_p_combo,      PRVTAB),
-    [QUOT_Q]        = COMBO(quot_q_combo,       KC_ENT),
-    [Q_J]           = COMBO(q_j_combo,          LCTL(KC_W)),
-    [J_K]           = COMBO(j_k_combo,          KC_DEL),
-    [Q_K]           = COMBO(q_k_combo,          KC_TAB),
-    [K_X]           = COMBO(k_x_combo,          KC_TILD),
-
-    // right hand combinations.
-    [L_R]           = COMBO(l_r_combo,          KC_BSPC),
-    [R_C]           = COMBO(r_c_combo,          KC_SLSH),
-    [C_G]           = COMBO(c_g_combo,          KC_MINS),
-    [R_G]           = COMBO(r_g_combo,          NXTTAB),
-    [G_F]           = COMBO(g_f_combo,          KC_BSLS),
-    [V_W]           = COMBO(v_w_combo,          KC_APP),
-    [W_M]           = COMBO(w_m_combo,          KC_DEL),
-    [V_M]           = COMBO(v_m_combo,          LSFT(KC_TAB)),
-    [M_B]           = COMBO(m_b_combo,          KC_GRV),
-
-    // both hand combinations.
-    [J_W]           = COMBO(j_w_combo,          KC_ENT),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-    KC_SCLN,KC_COMM,KC_DOT, KC_P,   KC_Y,       KC_F,   KC_G,   KC_C,   KC_R,   KC_L,
-    SH_A,   CT_O,   AL_E,   KC_U,   GU_I,       GU_D,   KC_H,   AL_T,   CT_N,   SH_S,
-    KC_QUOT,KC_Q,   KC_J,   KC_K,   KC_X,       KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,
-                            LW_BSPC,SFT_ESC,    ALT_ENT,RS_SPC
-),
-
-[_RAISE] = LAYOUT(
-    KC_EXLM,KC_AT,  KC_UP,  KC_LCBR,KC_RCBR,    KC_BSLS,KC_7,   KC_8,   KC_9,   KC_ASTR ,
-    KC_HASH,KC_LEFT,KC_DOWN,KC_RGHT,KC_DLR,     KC_EQL, KC_4,   KC_5,   KC_6,   KC_0 ,
-    KC_LBRC,KC_RBRC,KC_LPRN,KC_RPRN,KC_AMPR,    KC_GRV, KC_1,   KC_2,   KC_3,   KC_PLUS ,
-                            ADDDD  ,_______,    _______,_______
-),
-[_LOWER] = LAYOUT(
-    KC_ESC, KC_QUES,KC_UNDS,KC_F1,  KC_F2,      KC_F3,  KC_F4,  KC_MINS,KC_SLSH,KC_BSPC ,
-    KC_LSFT,KC_TAB, KC_PGUP,KC_F5,  KC_F6,      KC_F7,  KC_F8,  KC_HOME,KC_LALT,KC_ENT  ,
-    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
-                            _______,_______,    _______,ADDDD
-),
-[_ADJUST] = LAYOUT(
-    _______,EXPLR,  KC_UP,  PRVTAB, PRVWIN,     NXTWIN, NXTTAB, _______,_______,LCKGUI,
-    TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB,      DNTAB,  KC_ENT, KC_LGUI,_______,CALDL,
-    _______,CLSGUI, _______,CONPST, QK_BOOT,    _______,_______,_______,_______,_______,
-                            _______,_______,    _______,_______
-),
-};
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/readme.md b/keyboards/ibnuda/squiggle/keymaps/rick/readme.md
deleted file mode 100644
index aaff442b905..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# water
-
-ricky rick's keymap. ayyy.
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk b/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/idb/idb_60/keymaps/pngu/keymap.c b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
deleted file mode 100644
index 23649e791b0..00000000000
--- a/keyboards/idb/idb_60/keymaps/pngu/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT(
-        QK_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_NO,
-        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        LT(2, 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_NUBS, KC_Y,    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_MENU, KC_RGUI
-    ),
-    [1] = LAYOUT(
-        QK_BOOT, 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,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                                     _______,                            _______, _______, _______
-    ),
-    [2] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                                     _______,                            _______, _______, _______
-    )
-
-};
diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h
deleted file mode 100755
index bac9dbf1bd6..00000000000
--- a/keyboards/idobao/id42/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* LED Matrix & Animations */
-#ifdef RGB_MATRIX_ENABLE
-
-    #define RGB_MATRIX_LED_COUNT 42
-
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
-
-    #define RGB_MATRIX_KEYPRESSES              // enable key press effects
-
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
-
-    /* #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES) */
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-    /* #endif  // RGB_MATRIX_KEYPRESSES | RGB_MATRIX_KEYRELEASES */
-#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json
index b874f51806e..b0702aaa94d 100644
--- a/keyboards/idobao/id42/info.json
+++ b/keyboards/idobao/id42/info.json
@@ -18,7 +18,49 @@
         "pin": "B3"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"],
diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h
index 5513787c4e3..3766a8ef1da 100644
--- a/keyboards/idobao/id61/config.h
+++ b/keyboards/idobao/id61/config.h
@@ -3,70 +3,12 @@
 
 #pragma once
 
-
-/* ----------------
- * RGB Matrix stuff
- * ---------------- */
-
-// RGB Matrix config
 #if defined(RGB_MATRIX_ENABLE)
-
     #ifndef ID61_DISABLE_UNDERGLOW
         #define RGB_MATRIX_LED_COUNT 71
     #else
         #define RGB_MATRIX_LED_COUNT 61  // = 71 - 10
     #endif
-
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200  // limits maximum brightness of LEDs to {x} out of 255. If not defined maximum brightness is set to 255
-
-    #define RGB_MATRIX_KEYPRESSES
-
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
-
-    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS) */
-    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-    /* RGB_MATRIX_KEYPRESSES) | defined(RGB_MATRIX_KEYRELEASES) */
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
 #endif  // RGB_MATRIX_ENABLE
 
 /* -----------------------
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
index cf7892ec9f0..255e88fc056 100644
--- a/keyboards/idobao/id61/info.json
+++ b/keyboards/idobao/id61/info.json
@@ -18,7 +18,49 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 170,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
diff --git a/keyboards/idobao/id63/config.h b/keyboards/idobao/id63/config.h
index 214fb6ba6db..5a7df9028e9 100644
--- a/keyboards/idobao/id63/config.h
+++ b/keyboards/idobao/id63/config.h
@@ -3,83 +3,12 @@
 
 #pragma once
 
-
-/* NB: Most configuration information resides in `info.json` */
-
-/* ----------------
- * RGB Matrix stuff
- * ---------------- */
-
-// RGB Matrix config
 #if defined(RGB_MATRIX_ENABLE)
-
-    /* Denwir case is solid back. Please disable underglow at compile with compile command line:
-     *
-     * `make idobao/id63:default UNDERGLOW=off`
-     *
-     * */
     #ifndef ID63_DISABLE_UNDERGLOW
         #define RGB_MATRIX_LED_COUNT 75
     #else
         #define RGB_MATRIX_LED_COUNT (75 - 12)
     #endif
-
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
-
-    #define RGB_MATRIX_KEYPRESSES
-    // do not enable RGB_MATRIX_FRAMEBUFFER_EFFECTS as these effects don't work will with this LED placement
-
-    // changes to this list will break the sequence set in the VIA `json` file.
-    /* Standard animation set */
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
-    // #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL  // ** do not enable
-    // #define ENABLE_RGB_MATRIX_PIXEL_FLOW  // ** do not enable
-    // #define ENABLE_RGB_MATRIX_PIXEL_RAIN  // ** do not enable
-
-    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS */
-    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP  // ** do not enable
-    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN  // ** do not enable
-
-    /* RGB_MATRIX_KEYPRESSES */
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
 #endif  // RGB_MATRIX_ENABLE
 
 /* -----------------------
diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json
index 32651f918fe..02c4d41bf4b 100644
--- a/keyboards/idobao/id63/info.json
+++ b/keyboards/idobao/id63/info.json
@@ -18,7 +18,49 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h
index 7834bd33bbd..8f454d1ff41 100644
--- a/keyboards/idobao/id67/config.h
+++ b/keyboards/idobao/id67/config.h
@@ -5,64 +5,12 @@
 
 #pragma once
 
-// RGB Matrix config
 #if defined(RGB_MATRIX_ENABLE)
     #ifndef ID67_DISABLE_UNDERGLOW
         #define RGB_MATRIX_LED_COUNT 77
     #else
         #define RGB_MATRIX_LED_COUNT (77 - 10)
     #endif
-
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180    // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
-
-    #define RGB_MATRIX_KEYPRESSES
-
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
-
-    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS -- don't enable */
-    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-    /* RGB_MATRIX_KEYPRESSES || RGB_MATRIX_KEYRELEASES */
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
 #endif  // RGB_MATRIX_ENABLE
 
 /* -----------------------
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
index eff8333a803..5618311141f 100644
--- a/keyboards/idobao/id67/info.json
+++ b/keyboards/idobao/id67/info.json
@@ -18,7 +18,49 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
diff --git a/keyboards/idobao/id67/keymaps/thewerther/config.h b/keyboards/idobao/id67/keymaps/thewerther/config.h
deleted file mode 100644
index 4cd526feeaa..00000000000
--- a/keyboards/idobao/id67/keymaps/thewerther/config.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2021 Werther (@thewerther)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define DRIVER_LED_UNDERGLOW 10
-#define TAPPING_TERM 500
-#define PERMISSIVE_HOLD
-
-#if defined(RGB_MATRIX_ENABLE)
-    #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-
-    // change saturation and hue step size
-    #undef RGBLIGHT_HUE_STEP
-    #undef RGBLIGHT_SAT_STEP
-    #define RGBLIGHT_SAT_STEP 5
-    #define RGBLIGHT_HUE_STEP 5
-
-    #define RGB_MATRIX_KEYPRESSES
-
-    // disable effects from keyboard level config.h
-    #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-    #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-    #undef ENABLE_RGB_MATRIX_BREATHING
-    #undef ENABLE_RGB_MATRIX_BAND_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_VAL
-    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-    #undef ENABLE_RGB_MATRIX_CYCLE_ALL
-    #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-    #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-    #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-    #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-    #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-    #undef ENABLE_RGB_MATRIX_DUAL_BEACON
-    #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-    #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-    #undef ENABLE_RGB_MATRIX_RAINDROPS
-    #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-    #undef ENABLE_RGB_MATRIX_HUE_BREATHING
-    #undef ENABLE_RGB_MATRIX_HUE_PENDULUM
-    #undef ENABLE_RGB_MATRIX_HUE_WAVE
-    #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-    #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-    #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-    #undef ENABLE_RGB_MATRIX_SPLASH
-    #undef ENABLE_RGB_MATRIX_MULTISPLASH
-    #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-    #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-    // only enable a few
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-
-    // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE// Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE       // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH    // Hue & value pulse away from multiple key hits then fades value out
-    // #endif // # if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-#endif // # if defined(RGB_MATRIX_ENABLE)
-
diff --git a/keyboards/idobao/id67/keymaps/thewerther/keymap.c b/keyboards/idobao/id67/keymaps/thewerther/keymap.c
deleted file mode 100644
index a47a54db375..00000000000
--- a/keyboards/idobao/id67/keymaps/thewerther/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2021 Werther (@thewerther)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = 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_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_DEL,
-        KC_RALT,       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,                       LT(1, KC_SPC),                       MO(2),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
-    ),
-    [1] = LAYOUT_65_ansi_blocker(
-        _______, 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_PGUP, _______, _______, _______, _______, _______, _______,     _______,
-        _______,        _______, _______, KC_PGDN, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,  _______, _______, _______,            _______,
-        _______,           _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______,    _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
-    [2] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,     _______,
-        _______,     RGB_TOG, _______,  RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_MPLY, KC_MPRV, KC_MNXT, _______,     _______,
-        _______,        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_HOME,
-        _______,         QK_BOOT,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,  _______,  _______,  _______,      KC_END,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    )
-
-};
-
-void matrix_scan_user(void) {
-    #if defined(RGB_MATRIX_ENABLE)
-    int current_effect = rgb_matrix_get_mode();
-    if (current_effect >= RGB_MATRIX_SOLID_REACTIVE_SIMPLE && current_effect <= RGB_MATRIX_SOLID_MULTISPLASH) {
-        // set all underglow leds to current color
-        RGB current_color = hsv_to_rgb(rgb_matrix_get_hsv());
-        for (int i = RGB_MATRIX_LED_COUNT - DRIVER_LED_UNDERGLOW; i < RGB_MATRIX_LED_COUNT; i++) {
-            rgb_matrix_set_color(i, current_color.r, current_color.g, current_color.b);
-        }
-    }
-    #endif
-}
diff --git a/keyboards/idobao/id67/keymaps/thewerther/rules.mk b/keyboards/idobao/id67/keymaps/thewerther/rules.mk
deleted file mode 100644
index acd3adaa9a4..00000000000
--- a/keyboards/idobao/id67/keymaps/thewerther/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
deleted file mode 100644
index f7ada65953c..00000000000
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*
- * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
- */
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-    #define ID67_DISABLE_UNDERGLOW
-
-    #ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-        #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #endif
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200  // limits maximum brightness of LEDs to x out of 255
-
-    //// #define RGB_MATRIX_KEYPRESSES
-
-    // RGB Matrix config, nit-pick a few animations. "////" = already defined in base `config.h`, `#undef` disables it
-
-    //// #define ENABLE_RGB_MATRIX_ALPHAS_MODS             // Static dual hue, speed is hue for secondary hue
-    //// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN        // Static gradient top to bottom, speed controls how much gradient changes
-    //// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT     // Static gradient left to right, speed controls how much gradient changes
-    //// #define ENABLE_RGB_MATRIX_BREATHING               // Single hue brightness cycling animation
-    //// #define ENABLE_RGB_MATRIX_BAND_SAT                // Single hue band fading saturation scrolling left to right
-    //// #define ENABLE_RGB_MATRIX_BAND_VAL                // Single hue band fading brightness scrolling left to right
-    //// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT       // Single hue 3 blade spinning pinwheel fades saturation
-    //// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL       // Single hue 3 blade spinning pinwheel fades brightness
-    //// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT         // Single hue spinning spiral fades saturation
-    //// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL         // Single hue spinning spiral fades brightness
-    //// #define ENABLE_RGB_MATRIX_CYCLE_ALL               // Full keyboard solid hue cycling through full gradient
-    //// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT        // Full gradient scrolling left to right
-    //// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN           // Full gradient scrolling top to bottom
-    //// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN            // Full gradient scrolling out to in
-    //// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL       // Full dual gradients scrolling out to in
-    //// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradient Chevron shaped scrolling left to right
-    //// #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL          // Full gradient spinning pinwheel around center of keyboard
-    //// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL            // Full gradient spinning spiral around center of keyboard
-    //// #define ENABLE_RGB_MATRIX_DUAL_BEACON             // Full gradient spinning around center of keyboard
-    //// #define ENABLE_RGB_MATRIX_RAINBOW_BEACON          // Full tighter gradient spinning around center of keyboard
-    //// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS       // Full dual gradients spinning two halfs of keyboard
-    //// #define ENABLE_RGB_MATRIX_RAINDROPS               // Randomly changes a single key's hue
-    //// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS     // Randomly changes a single key's hue and saturation
-    //// #define ENABLE_RGB_MATRIX_HUE_BREATHING           // Hue shifts up a slight amount at the same time, then shifts back
-    //// #define ENABLE_RGB_MATRIX_HUE_PENDULUM            // Hue shifts up a slight amount in a wave to the right, then back to the left
-    //// #define ENABLE_RGB_MATRIX_HUE_WAVE                // Hue shifts up a slight amount and then back down in a wave to the right
-
-    #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-    #undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-    //// #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-    // don't need `#if`, animation modes themselves check defines
-    // #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
-    //// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    //// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-    // #endif
-
-    // don't need `#if`, animation modes themselves check defines
-    // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    //// #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-    // #endif
-#endif
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
deleted file mode 100644
index d34c70fa633..00000000000
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*
- * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum {
-    _BASE = 0,
-    _FN1,
-    _FN2,
-    _FN3
-};
-
-enum {
-    KB_VRSN = SAFE_RANGE
-};
-
-#define LT1_C_L LT(_FN1, KC_CAPS)
-
-#ifndef MIN
-    #define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backspc│ ~ │
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │*Caps*│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PUp│  *Caps* => `LT(1, KC_CAPS)`
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shft │Up │PDn│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │Ctrl│Opt │Comm│                        │Fn1 │Fn2 │ │Lf │Dn │Rt │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [_BASE] = LAYOUT_65_ansi_blocker(
-        QK_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_GRAVE,
-        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,
-        LT1_C_L,  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_LALT,           KC_LGUI,                    KC_SPC,                             FN_MO13, FN_MO23,   KC_LEFT, KC_DOWN,   KC_RIGHT),
-
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │ ~ │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ ERASE │F13│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │     │   │Up │   │   │   │   │   │   │   │PSc│Hom│End│Eject│Ins│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │ Caps │Lf │Dn │Rt │   │   │   │   │   │   │PUp│PDn│ enter  │Hom│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │  Shft  │   │   │   │   │   │   │   │   │Ins│Del│Shift │   │End│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │ctrl│opt │comm│                        │    │Fn3 │ │   │   │   │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [_FN1] = LAYOUT_65_ansi_blocker(
-        KC_GRAVE, 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_ERAS,   KC_F13,
-        _______,  XXXXXXX,  KC_UP,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_HOME,   KC_END,  KC_EJCT,   KC_INS,
-        KC_CAPS,  KC_LEFT,  KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_PGDN,            KC_PENT,   KC_HOME,
-        KC_RSFT,            XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_DELETE, KC_LSFT, _______,   KC_END,
-        KC_RCTL,  KC_RALT,           KC_RGUI,                    _______,                            _______, _______,   _______, _______,   _______),
-
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │Esc│SB-│SB+│mMC│mLP│Br-│Br+│Prv│Ply│Nxt│Mut│Vl-│Vl+│  out  │F14│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ Tog │Mod│   │   │   │   │   │   │   │   │   │   │   │     │PSc│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │      │mod│   │   │   │   │   │   │   │   │Hu+│Sa+│        │SLk│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │        │   │   │   │   │   │   │   │   │Hu-│Sa-│      │Br+│Pau│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │    │    │                        │Fn3 │    │ │Sp-│Br-│Sp+│
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [_FN2] = LAYOUT_65_ansi_blocker(
-        KC_ESC,   KC_BRID,  KC_BRIU, KC_MCON,  KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,   KC_VOLU, KC_OUT,    KC_F14,
-        RGB_TOG,  RGB_MOD,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX,   KC_PSCR,
-        XXXXXXX,  RGB_RMOD, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI,            XXXXXXX,   KC_SCRL,
-        XXXXXXX,            XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD,   XXXXXXX, RGB_VAI,   KC_PAUS,
-        XXXXXXX,  XXXXXXX,           XXXXXXX,                    XXXXXXX,                            XXXXXXX, XXXXXXX,   RGB_SPD, RGB_VAD,   RGB_SPI),
-
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │RST│M01│M02│M03│M04│M05│M06│M07│M08│M09│M10│M11│M12│ Power │F15│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │     │   │   │   │   │   │   │   │   │   │   │   │   │Sleep│   │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │      │   │   │   │   │   │   │   │   │   │   │   │ Debug  │   │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │        │   │   │   │Ver│   │   │   │   │   │   │      │M00│   │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │    │    │          Wake          │    │    │ │M13│M14│M15│
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [_FN3] = LAYOUT_65_ansi_blocker(
-        QK_BOOT,  MC_1,     MC_2,    MC_3,    MC_4,    MC_5,    MC_6,    MC_7,    MC_8,    MC_9,    MC_10,   MC_11,     MC_12,   KC_PWR,    KC_F15,
-        XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, KC_SLEP,   XXXXXXX,
-        XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            DB_TOGG,   XXXXXXX,
-        XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, MC_0,      XXXXXXX,
-        XXXXXXX,  XXXXXXX,           XXXXXXX,                   KC_WAKE,                            XXXXXXX, XXXXXXX,   MC_13,   MC_14,     MC_15)
-};
-
-#ifdef RGB_MATRIX_ENABLE
-
-/*
- * RGB Stuff
- */
-
-#ifdef RGBLIGHT_VAL_STEP
-    #define RGB_BRIGHTER_BY RGBLIGHT_VAL_STEP
-#else
-    #define RGB_BRIGHTER_BY 26  // about 10%
-#endif
-
-#define LED_FLAG_ALPHA_KEY 0x10  // Alpha keys (for Caps Lock)
-#define LED_FLAG_LAYER_IND 0x20  // Layer indicator
-
-const uint8_t g_led_config_new_flags[RGB_MATRIX_LED_COUNT] = {
-    // Extended LED Index to Flag
-    // ** Remember: on ID67 this is in reverse order
-    0x21, 0x01, 0x01, 0x01, 0x01,                   0x04,             0x01,       0x01, 0x21,  // Spc row
-    0x21, 0x01, 0x01, 0x04, 0x04, 0x04, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14,       0x21,  // ZXC row
-    0x21, 0x01,       0x04, 0x04, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x29,  // ASD row
-    0x21, 0x04, 0x04, 0x04, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x21,  // QWE row
-    0x21, 0x01, 0x04, 0x04, 0x04, 0x04, 0x24, 0x24, 0x24, 0x24, 0x04, 0x04, 0x04, 0x04, 0x21   // 123 row
-};
-
-#define ID67_CAPS_LOCK_KEY_INDEX 36  // position of Caps Lock key
-
-bool isRGBOff = false;
-bool isCapsBlink = false;
-static uint16_t recording_timer;
-
-void keyboard_pre_init_user(void) {
-    // override `config.h` flags with new values
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) g_led_config.flags[i] = g_led_config_new_flags[i];
-}
-
-void keyboard_post_init_user(void) {
-    isRGBOff = false;
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-
-    uint8_t v = MIN( rgblight_get_val() + RGB_BRIGHTER_BY, 0xFF );
-    uint8_t current_layer = get_highest_layer(layer_state);
-
-    // Caps Lock key stuff
-
-    if (host_keyboard_led_state().caps_lock) {
-        if (isRGBOff) {
-            rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v);  // white
-        } else {
-            // Caps Lock key/LED
-            if (timer_elapsed(recording_timer) > 500) {
-                isCapsBlink = !isCapsBlink;
-                recording_timer = timer_read();
-            }
-            if (isCapsBlink) {
-                rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v);  // white
-            }
-
-            // Alpha keys/LEDs
-            for (uint8_t i = led_min; i <= led_max; i++) {
-                if ((g_led_config.flags[i] & LED_FLAG_ALPHA_KEY) != 0)  {
-                    rgb_matrix_set_color(i, v, 0, 0);  //red
-                }
-            }
-        }
-    } else if (isRGBOff) {
-        uint8_t r = 0;
-        uint8_t g = 0;
-        uint8_t b = 0;
-
-        if ((g_led_config.flags[ID67_CAPS_LOCK_KEY_INDEX] & LED_FLAG_LAYER_IND) != 0) {
-            switch (current_layer) {
-                case _FN1: b = v; break;  // blue
-                case _FN2: g = v; break;  // green
-                case _FN3: r = v; break;  // red
-            }
-        }
-
-        rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, r, g, b);  // off
-    }
-
-    // Layer indicator stuff
-
-    switch (current_layer) {
-        case _FN1:
-            for (uint8_t i = led_min; i <= led_max; i++) {
-                if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
-                    rgb_matrix_set_color(i, 0, 0, v);  // blue
-                }
-            }
-            break;
-
-        case _FN2:
-            for (uint8_t i = led_min; i <= led_max; i++) {
-                if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
-                    rgb_matrix_set_color(i, 0, v, 0);  // green
-                }
-            }
-            break;
-
-        case _FN3:
-            for (uint8_t i = led_min; i <= led_max; i++) {
-                if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
-                    rgb_matrix_set_color(i, v, 0, 0);  // red
-                }
-            }
-            break;
-
-        default:
-            if (isRGBOff) {
-                // switch layer indicators off only if in OFF mode
-                for (uint8_t i = led_min; i <= led_max; i++) {
-                    if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
-                        rgb_matrix_set_color(i, 0, 0, 0);  // red
-                    }
-                }
-            }
-            break;
-    }
-    return false;
-}
-
-#endif
-
-/*
- * Mac Fn-key stuff
- */
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    switch (keycode) {
-        // handle RGB toggle key
-        case RGB_TOG:
-            if (record->event.pressed) {
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL:
-                        isRGBOff = true;
-                        rgb_matrix_set_flags(LED_FLAG_INDICATOR | LED_FLAG_LAYER_IND);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                        break;
-                    default:
-                        isRGBOff = false;
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();  // turn the lights back on
-                }
-            }
-            return false;
-
-        // print firmware version
-        case KB_VRSN:
-            if (!get_mods()) {
-                if (!record->event.pressed) {
-                    SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " (v" QMK_VERSION ")");
-                }
-            }
-            return false;
-
-        default:
-            return true; /* Process all other keycodes normally */
-    }
-}
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk b/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
deleted file mode 100644
index cf6371fda0f..00000000000
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LTO_ENABLE = yes
-VIA_ENABLE = yes
-NKRO_ENABLE = no  # N-Key Rollover must be OFF for mac keys to work
diff --git a/keyboards/idobao/id75/keymaps/drewdobo/config.h b/keyboards/idobao/id75/keymaps/drewdobo/config.h
deleted file mode 100644
index 58787ce12b9..00000000000
--- a/keyboards/idobao/id75/keymaps/drewdobo/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-
-// place overrides here
-
-
-#define TAPPING_TOGGLE 5
diff --git a/keyboards/idobao/id75/keymaps/drewdobo/keymap.c b/keyboards/idobao/id75/keymaps/drewdobo/keymap.c
deleted file mode 100644
index c27aa3bf742..00000000000
--- a/keyboards/idobao/id75/keymaps/drewdobo/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2020 Drew Smathers
- *
- * 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
-
-// Keyboard Layers
-enum layer_names {
-    _QW,
-    _QW_MAC,
-    _FN,
-    _MOUSE,
-};
-
-// Some short-cut aliases
-#define Z_LALT LALT_T(KC_ESC)
-#define Z_MAC DF(_QW_MAC)
-#define Z_PC DF(_QW)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-    KC_ESC,  KC_1,     KC_2,    KC_3,       KC_4,    KC_5,    XXXXXXX, XXXXXXX, XXXXXXX, KC_6,   KC_7,     KC_8,     KC_9,    KC_0,    KC_BSLS,
-    KC_TAB,  KC_Q,     KC_W,    KC_E,       KC_R,    KC_T,    XXXXXXX, XXXXXXX, XXXXXXX, KC_Y,   KC_U,     KC_I,     KC_O,    KC_P,    KC_QUOT,
-    Z_LALT,  KC_A,     KC_S,    KC_D,       KC_F,    KC_G,    XXXXXXX, XXXXXXX, XXXXXXX, KC_H,   KC_J,     KC_K,     KC_L,    KC_SCLN, KC_RALT,
-    KC_LSFT, KC_Z,     KC_X,    KC_C,       KC_V,    KC_B,    KC_LCTL, XXXXXXX, KC_RCTL, KC_N,   KC_M,     KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT,
-    TT(_FN), XXXXXXX,  XXXXXXX, TT(_MOUSE), KC_EQL,  KC_BSPC, KC_DEL,  XXXXXXX, KC_ENT,  KC_SPC, KC_MINUS, KC_GRAVE, KC_LBRC, KC_RBRC, XXXXXXX
- ),
- 
- [_QW_MAC] = LAYOUT_ortho_5x15( /* QWERTY MAC */
-    KC_ESC,  KC_1,     KC_2,    KC_3,       KC_4,    KC_5,    KC_BRMU, KC_MUTE, KC_VOLU,     KC_6,   KC_7,     KC_8,     KC_9,    KC_0,    KC_BSLS,
-    KC_TAB,  KC_Q,     KC_W,    KC_E,       KC_R,    KC_T,    KC_BRMD, XXXXXXX, KC_VOLD,     KC_Y,   KC_U,     KC_I,     KC_O,    KC_P,    KC_QUOT,
-    Z_LALT,  KC_A,     KC_S,    KC_D,       KC_F,    KC_G,    XXXXXXX, XXXXXXX, XXXXXXX,     KC_H,   KC_J,     KC_K,     KC_L,    KC_SCLN, KC_RALT,
-    KC_LSFT, KC_Z,     KC_X,    KC_C,       KC_V,    KC_B,    KC_LCMD, XXXXXXX, KC_RCMD,     KC_N,   KC_M,     KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT,
-    TT(_FN), KC_LCTL,  XXXXXXX, TT(_MOUSE), KC_EQL,  KC_BSPC, KC_DEL,  XXXXXXX, KC_ENT,      KC_SPC, KC_MINUS, KC_GRAVE, KC_LBRC, KC_RBRC, KC_RCTL
- ),
-
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, QK_BOOT, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, Z_MAC,   _______, XXXXXXX, KC_HOME, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX,
-    TT(_FN), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, Z_PC,    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
- ),
-
- [_MOUSE] = LAYOUT_ortho_5x15( /* MOUSE */
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    TT(_FN), XXXXXXX, XXXXXXX, TT(_MOUSE), XXXXXXX, KC_ACL1, KC_ACL2, XXXXXXX, KC_BTN2, KC_BTN1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
- )
-};
diff --git a/keyboards/idobao/id75/keymaps/drewdobo/readme.md b/keyboards/idobao/id75/keymaps/drewdobo/readme.md
deleted file mode 100644
index 209808ca87f..00000000000
--- a/keyboards/idobao/id75/keymaps/drewdobo/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Drew's thumb-friendly keymap for idobo boards
diff --git a/keyboards/idobao/id75/keymaps/drewdobo/rules.mk b/keyboards/idobao/id75/keymaps/drewdobo/rules.mk
deleted file mode 100644
index f9bbfd4948c..00000000000
--- a/keyboards/idobao/id75/keymaps/drewdobo/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/idobao/id75/keymaps/egstad/config.h b/keyboards/idobao/id75/keymaps/egstad/config.h
deleted file mode 100644
index 7e1868813f0..00000000000
--- a/keyboards/idobao/id75/keymaps/egstad/config.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2020 Jordan Egstad
- *
- * 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_TERM 200
-#define RGBLIGHT_SLEEP
-
-
-
-/* Leader Key
-   ========================================================================== */
-
-// Activates the leader key
-// #define LEADER_PER_KEY_TIMING
-// resets the timeout after each key is tapped
-// #define LEADER_TIMEOUT 240
-
-
-
-
-
-
-/* Autoshifting
-   ========================================================================== */
-
-// This controls how long you have to hold a key before you get the shifted state.
-#define AUTO_SHIFT_TIMEOUT 150
-
-// Do not Auto Shift special keys -_, =+, [{, ]}, ;:, '", ,<, .>, and /?
-// #define NO_AUTO_SHIFT_SPECIAL
-
-// Do not Auto Shift numeric keys, zero through nine.
-#define NO_AUTO_SHIFT_NUMERIC
-
-// Do not Auto Shift alpha characters, which include A through Z.
-// #define NO_AUTO_SHIFT_ALPHA
-
-// Lower the Auto Shift timeout variable (down)
-// AS_DOWN
-
-// Raise the Auto Shift timeout variable (up)
-// AS_UP
-
-// Report your current Auto Shift timeout value
-// AS_RPT
-
-// Turns on the Auto Shift Function
-// AS_ON
-
-// Turns off the Auto Shift Function
-// AS_OFF
-
-// Toggles the state of the Auto Shift feature
-// AS_TOGG
diff --git a/keyboards/idobao/id75/keymaps/egstad/keymap.c b/keyboards/idobao/id75/keymaps/egstad/keymap.c
deleted file mode 100644
index 1bfeb740422..00000000000
--- a/keyboards/idobao/id75/keymaps/egstad/keymap.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/* Copyright 2020 Jordan Egstad
- *
- * 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
-
-
-
-
-
-
-/* ==========================================================================
-    LAYERS
-   ========================================================================== */
-
-// qwerty
-#define _QW 0
-// functions
-#define _FN 1
-
-
-
-
-
-
-/* ==========================================================================
-    CUSTOM KEYS
-   ========================================================================== */
-
-// Tap dances
-#define TD_ESCP TD(TD_GV_ESC)           // Tap for grave, twice for escape
-#define TD_MINS TD(TD_MIN)              // Tap for minus, twice for equal
-#define TD_BRAC TD(TD_BRC)              // Tap for open brace, twice for close
-
-// Layers
-#define FN_SPC LT(_FN, KC_SPC)          // Tap for space, hold for _FN
-
-// Modifiers
-#define LG_ZMIN LGUI(KC_EQUAL)          // Command + plus (zoom in)
-#define LG_ZMOT LGUI(KC_MINUS)          // Command + minus (zoom out)
-#define MT_SHFT MT(MOD_RSFT, KC_ENT)    // Tap for enter, hold for shift
-
-// Tap Dances
-enum {
-  TD_BRC = 0,
-  TD_MIN,
-  TD_GV_ESC,
-  TD_BS
-};
-
-// Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  // Tap once for Left Brace, twice for Right Brace
-  [TD_BRC]  = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
-  //Tap once for Minus, twice for Equal
-  [TD_MIN]  = ACTION_TAP_DANCE_DOUBLE(KC_MINUS, KC_EQUAL),
-  // Tap once for Grave, tap twice for Escape
-  [TD_GV_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_GRAVE, KC_ESCAPE)
-};
-
-
-
-
-
-
-/* ==========================================================================
-    KEYMAPS
-   ========================================================================== */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY (_QW)
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      |   \|   | 6      | 7      | 8      | 9      | 0      |  -  +  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      |  [  ]  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      |        |        |        | H      | J      | K      | L      | ;      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      |        |        |        | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | ZOOM-  | ZOOM+  | LALT   | FN     | CMD    | BSPC   |        |        | FN     | SPACE  | ENTER  | LEFT   | UP     | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-    TD_ESCP, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_PIPE, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    TD_MINS,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    TD_BRAC,
-    _______, 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, MT_SHFT,
-    LG_ZMOT, LG_ZMIN, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, _______, QK_BOOT, _______, FN_SPC,  KC_ENT,  KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
- ),
-
-
-/* FUNCTION (_FN)
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F1     | F2     | F3     | F4     | F5     | F6     |        | P      |        | F7     | F8     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | RGB HD | RGB HI |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | A-SFT  |        |        |        |        |        | RGB SD | RGB SI |        |        | LEFT   | UP     | DOWN   | RIGHT  |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RGB    |        |        |        |        |        | RGB VD | RGB VI |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | QK_BOOT  |        |        |        |        |        | RGB RMD| RGB MD |        |        | PLAY   | PREV   | VOL UP | VOL DN | NEXT   |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    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_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
-    AS_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, _______,
-    RGB_TOG, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______,
-    QK_BOOT, _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, KC_MPLY, KC_MRWD, KC_VOLU, KC_VOLD, KC_MFFD
- ),
-};
-
-
-
-
-
-
-/* ==========================================================================
-    LEDs
-   ========================================================================== */
-
-// RGB MODES
-// 1 = Static
-// 2-5 = Breathing
-// 6-8 = Rainbow
-// 9-14 = Swirl
-// 15-20 = Snake
-// 21-24 = Nightrider
-// 25 = Christmas
-// 26-30 = Static Gradient
-
-// Default LED colors
-uint8_t h = 170;
-uint8_t s = 255;
-uint8_t v;
-
-// default animation
-uint8_t rgbMode = RGBLIGHT_MODE_STATIC_LIGHT;
-// boot animation
-uint8_t rgbBootMode = RGBLIGHT_MODE_SNAKE;
-// boot timeout vars
-uint8_t bootComplete = 0;
-int bootTimeoutDuration = 2000;
-int bootTimeout;
-
-
-void init_hsv(void) {
-    // fetch what the brightness was last sesion
-	v = rgblight_get_val();
-    rgblight_sethsv(h,s,v);
-}
-
-// fetch current HSV vals
-void get_hsv(void) {
-	h = rgblight_get_hue();
-	s = rgblight_get_sat();
-	v = rgblight_get_val();
-}
-
-// reset HSV vals
-void reset_hsv(void) {
-    int currentV = rgblight_get_val();
-	rgblight_sethsv(h,s,currentV);
-}
-
-// deterimes when to stop bootup animation
-void bootupAnimation(void) {
-  bootComplete = (timer_elapsed(bootTimeout) > bootTimeoutDuration) ? 1 : 0;
-
-  if (bootComplete) {
-    rgblight_mode(rgbMode);
-  }
-}
-
-
-
-
-
-
-/* ==========================================================================
-    INITIALIZATION FUNCTION
-   ========================================================================== */
-
-void keyboard_post_init_user(void) {
-  // start a timeout
-  bootTimeout = timer_read();
-  // set rgb color
-  init_hsv();
-  // init rgb
-  rgblight_enable();
-  // animate in snake ledGreende
-  rgblight_mode(rgbBootMode);
-};
-
-
-
-
-
-
-/* ==========================================================================
-    ALWAYS RUNNING
-   ========================================================================== */
-void matrix_scan_user(void) {
-    // keep an eye on these layers
-    uint8_t layer = get_highest_layer(layer_state);
-    // handle boot-up sequence
-    bootupAnimation();
-    // watch the brightness for changes
-    v = rgblight_get_val();
-
-    switch (layer) {
-      case _FN:
-        // set leds to white
-        rgblight_sethsv_noeeprom(h,0,v);
-        break;
-      default:
-        break;
-    }
-};
-
-
-
-
-
-
-/* ==========================================================================
-    KEYPRESS CALLBACKS
-   ========================================================================== */
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  // keep an eye on these layers
-  uint8_t layer = get_highest_layer(layer_state);
-
-  switch (keycode) {
-    case FN_SPC:
-      // stash and pop color on key down and key up
-      (record->event.pressed) ? get_hsv() : reset_hsv();
-      return true;
-    default:
-      switch (layer) {
-          case _QW:
-            // tick the hue up with each keypress
-            rgblight_increase_hue();
-            break;
-          default:
-            break;
-      }
-      return true; // Process all other keycodes normally
-  }
-}
diff --git a/keyboards/idobao/id75/keymaps/egstad/readme.md b/keyboards/idobao/id75/keymaps/egstad/readme.md
deleted file mode 100644
index 2de44ad9cc5..00000000000
--- a/keyboards/idobao/id75/keymaps/egstad/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Egstad's Idobo
-
-## LEDs
-By default, LEDs are enabled. There is a short bootup animation (`bootupAnimation()`) to indicate that the keyboard has powered up correctly.
-
-On each keypress, the LEDs hue increases. This increase is determined the the `RGBLIGHT_HUE_STEP` value, which is assigned in `../config.h` (parent idobo directory). My local copy has this value set to `1`, so the incremental color shift is rather slow.
-
-
-## Keeping up to date
-To update your fork’s master, run the following, hitting the Enter key after each line:
-
-```bash
-git checkout master
-git fetch upstream
-git pull upstream master
-git push origin master
-```
diff --git a/keyboards/idobao/id75/keymaps/egstad/rules.mk b/keyboards/idobao/id75/keymaps/egstad/rules.mk
deleted file mode 100644
index ca3becc3835..00000000000
--- a/keyboards/idobao/id75/keymaps/egstad/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TAP_DANCE_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/idobao/id75/keymaps/gkbd/config.h b/keyboards/idobao/id75/keymaps/gkbd/config.h
deleted file mode 100644
index 35e479fdf6e..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Giorgi Chavchanidze
- *
- * 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 UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE
-
-/* Selected Unicode input method relies on WinCompose
- * https://docs.qmk.fm/#/feature_unicode?id=input-modes
- * Linux users are better served by xkb configuration
- * https://gitlab.com/lykt/geotype/-/blob/master/xkb/dsae
- */
diff --git a/keyboards/idobao/id75/keymaps/gkbd/keymap.c b/keyboards/idobao/id75/keymaps/gkbd/keymap.c
deleted file mode 100644
index 3b59e8ee2b2..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 Giorgi Chavchanidze
- *
- * 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_5x15(/* Latin base */
-		KC_ESC, KC_PSLS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_PSCR, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_DEL,
-		KC_TAB, KC_SCLN, KC_P, KC_Y, KC_T, KC_U, KC_G, KC_PGUP, KC_H, KC_N, KC_V, KC_K, KC_X, KC_MINS, KC_INS,
-		KC_CAPS, KC_W, KC_D, KC_S, KC_A, KC_E, KC_O, KC_PGDN, KC_L, KC_R, KC_I, KC_M, KC_B, KC_C, KC_ENT,
-		KC_LSFT, KC_BSLS, KC_J, KC_LBRC, KC_RBRC, KC_COMM, KC_DOT, KC_UP, KC_QUOT, KC_Z, KC_Q, KC_F, KC_SLSH, KC_GRV, KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT, MO(2), KC_HOME, KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC, KC_END, MO(2), KC_RALT, RGUI_T(KC_APP), KC_RCTL
-	),
-	[1] = LAYOUT_ortho_5x15(/* Unicode layer */
-		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, KC_TRNS, KC_TRNS,
-		KC_TRNS, UC(0x10EB), UC(0x10DE), UC(0x10E8), UC(0x10E2), UC(0x10E3), UC(0x10D2), KC_TRNS, UC(0x10EE), UC(0x10DC), UC(0x10D5), UC(0x10D9), UC(0x10E9), KC_TRNS, KC_TRNS,
-		KC_SCLN, UC(0x10D7), UC(0x10D3), UC(0x10E1), UC(0x10D0), UC(0x10D4), UC(0x10DD), KC_TRNS, UC(0x10DA), UC(0x10E0), UC(0x10D8), UC(0x10DB), UC(0x10D1), UC(0x10EA), KC_TRNS,
-		KC_TRNS, UC(0x10DF), UC(0x10EF), UC(0x10E7), UC(0x10EC), KC_TRNS, KC_TRNS, KC_TRNS, UC(0x10E6), UC(0x10D6), UC(0x10E5), UC(0x10E4), UC(0x10F0), UC(0x10ED), KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, 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_5x15(/* Function keys */
-		QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG,
-		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_SCRL, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, KC_PAUS,
-		KC_TRNS, 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_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_F11, KC_NO, KC_NO, KC_NO, KC_F12, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-	)
-};
diff --git a/keyboards/idobao/id75/keymaps/gkbd/readme.md b/keyboards/idobao/id75/keymaps/gkbd/readme.md
deleted file mode 100644
index 3951f3e5646..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-![Georgian linear layout](https://lykt.xyz/kbd/linear/dsae.svg)
-
-# Georgian linear layout configuration for idobo
-
-Based on Georgian Carpalx optimized linear layout from [https://gitlab.com/lykt](https://gitlab.com/lykt)
-
-Some documentation (in Georgian) and resources (xkb, klc, json configurations) are available at [https://lykt.xyz/kbd/linear/](https://lykt.xyz/kbd/linear/)
diff --git a/keyboards/idobao/id75/keymaps/gkbd/rules.mk b/keyboards/idobao/id75/keymaps/gkbd/rules.mk
deleted file mode 100644
index 039f07c8e35..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-UNICODE_ENABLE = yes
diff --git a/keyboards/idobao/id75/keymaps/gkbd_75/config.h b/keyboards/idobao/id75/keymaps/gkbd_75/config.h
deleted file mode 100644
index d969bd88a2f..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd_75/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Giorgi Chavchanidze
- *
- * 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_TERM 200
-#define PERMISSIVE_HOLD
diff --git a/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c b/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
deleted file mode 100644
index 33df46a9478..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Giorgi Chavchanidze
- *
- * 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_5x15(
-			KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_F1, KC_F4, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_F7,
-			KC_TAB, KC_K, KC_P, KC_L, KC_R, KC_C, KC_F2, KC_F5, KC_M, KC_U, KC_O, KC_W, KC_X, KC_SLSH, KC_F8,
-			KC_CAPS, KC_D, KC_S, KC_T, KC_F, KC_N, KC_F3, KC_F6, KC_I, RSFT_T(KC_J), KC_E, KC_A, KC_H, KC_ENT, KC_F9,
-			KC_PGUP, KC_Q, KC_B, KC_G, KC_COMM, KC_DOT, KC_LGUI, KC_RALT, KC_MINS, KC_V, KC_Y, KC_QUOT, KC_Z, KC_UP, KC_F10,
-			KC_PGDN, KC_PSCR, KC_INS, KC_DEL, LT(1,KC_F11), KC_BSPC, KC_LSFT, KC_RCTL, KC_SPC, LT(1,KC_F12), KC_HOME, KC_END, KC_LEFT, KC_DOWN, KC_RGHT
-		),
-	[1] = LAYOUT_ortho_5x15(
-			QK_BOOT, 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, RGB_TOG,
-			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_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_SCRL, KC_NO, KC_NO, KC_PAUS, KC_BSLS, KC_PIPE, KC_SCLN, KC_COLN, KC_NO, KC_NO,
-			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-			KC_WAKE, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_GRV, KC_TRNS, KC_TRNS, KC_TILD, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_APP
-		)
-};
-
diff --git a/keyboards/idobao/id75/keymaps/gkbd_75/readme.md b/keyboards/idobao/id75/keymaps/gkbd_75/readme.md
deleted file mode 100644
index aa14049420d..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd_75/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-![Orthocarpus layout](https://lykt.xyz/jnsf/ortho/ortho.jpg)
-
-# Orthocarpus layout configuration for idobo
-
-Based on ortholinear carpalx optimized layout from [https://gitlab.com/lykt](https://gitlab.com/lykt)
-
-Some documentation and resources (carpalx report, json configuration) are available at [https://lykt.xyz/jnsf/ortho/](https://lykt.xyz/jnsf/ortho/)
diff --git a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
deleted file mode 100644
index 3e8dcc75704..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Giorgi Chavchanidze
- *
- * 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_TERM 200
diff --git a/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c b/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
deleted file mode 100644
index 462bb3feee2..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2021 Giorgi Chavchanidze
- *
- * 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 MIN_PROXIMITY 8000
-
-uint16_t predecessor_key = KC_NO;
-uint16_t adaptive_key = KC_NO;
-
-static uint16_t vowel_proximity;
-
-enum custom_keycodes {
-    ON = SAFE_RANGE,
-};
-
-bool promote_consonants(void) {
-	return predecessor_key == KC_O && timer_elapsed(vowel_proximity) < MIN_PROXIMITY && !(get_mods() & ~MOD_MASK_SHIFT & MOD_MASK_CAG);
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    if (keycode == ON) {
-		
-        if (record->event.pressed) {
-
-			keycode = promote_consonants()?KC_N:KC_O;	
-			register_code(keycode);
-			adaptive_key = keycode;
-
-		}
-		else {
-			unregister_code(adaptive_key);
-		}
-	}
-
-	if (!IS_MODIFIER_KEYCODE(keycode) && record->event.pressed) {
-		if(keycode == KC_E || keycode == KC_A || keycode == KC_O || keycode == KC_I || keycode == KC_U) {
-			predecessor_key = KC_O;
-			vowel_proximity = timer_read();
-		}
-		else {
-			predecessor_key = keycode;
-		}
-	}
-
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_ortho_5x15(/* Base */
-			KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC, KC_APP, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
-			KC_QUOT, KC_Z, KC_Y, KC_U, KC_F, KC_W, KC_LCBR, KC_PSCR, KC_RCBR, KC_G, KC_M, KC_P, KC_N, KC_J, KC_MINS,
-			KC_ESC, KC_H, KC_I, KC_E, KC_A, KC_C, KC_LPRN, MO(1), KC_RPRN, KC_L, KC_R, KC_T, KC_S, KC_D, KC_ENT,
-			KC_TAB, KC_SCLN, KC_X, KC_O, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI, KC_BSLS, KC_K, KC_V, KC_B, RSFT_T(KC_Q), KC_UP, KC_INS,
-			KC_CAPS, KC_HOME, KC_END, KC_DEL, KC_BSPC, ON, KC_LSFT, KC_RCTL, KC_RALT, KC_SPC, KC_PGDN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT
-		),
-	[1] = LAYOUT_ortho_5x15(/* Function keys */
-			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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-			KC_SCRL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PAUS,
-			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-			QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG
-		)
-};
diff --git a/keyboards/idobao/id75/keymaps/gkbd_orthon/readme.md b/keyboards/idobao/id75/keymaps/gkbd_orthon/readme.md
deleted file mode 100644
index 36479ff9ba1..00000000000
--- a/keyboards/idobao/id75/keymaps/gkbd_orthon/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-![Orthon layout](https://lykt.xyz/rtsd/orthon.svg)
-
-# Orthon layout
-
-Ortholinear carpalx optimized layout with adaptive thumb key.
-
-Adaptive key is
- * **n** after **eaoiu** vowels
- * **o** otherwise
-
-Some documentation and resources (carpalx report, json configuration) are available at [https://lykt.xyz/rtsd/#orthon](https://lykt.xyz/rtsd/#orthon)
diff --git a/keyboards/idobao/id75/keymaps/ifohancroft/config.h b/keyboards/idobao/id75/keymaps/ifohancroft/config.h
deleted file mode 100644
index 09467b43621..00000000000
--- a/keyboards/idobao/id75/keymaps/ifohancroft/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 IFo Hancroft
- *
- * 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
-
-// place overrides here
-#define USB_POLLING_INTERVAL_MS 1
-#undef RGBLIGHT_HUE_STEP
-#define RGBLIGHT_HUE_STEP 1
-#undef RGBLIGHT_SAT_STEP
-#define RGBLIGHT_SAT_STEP 1
-#undef RGBLIGHT_VAL_STEP
-#define RGBLIGHT_VAL_STEP 1
-#define FORCE_NKRO
diff --git a/keyboards/idobao/id75/keymaps/ifohancroft/keymap.c b/keyboards/idobao/id75/keymaps/ifohancroft/keymap.c
deleted file mode 100644
index d71dcee6a98..00000000000
--- a/keyboards/idobao/id75/keymaps/ifohancroft/keymap.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2021 IFo Hancroft
-  *
-  * 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] = {
-
-    /* Default Layer
-    * ---------------------------------------------------------------------------------------------------------------------------------------
-    * | `     || 1     || 2     || 3     || 4     || 5     || 6     || 7     || 8     || 9     || 0     || -     || =     || Bkspc || Del   |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * | Tab   || Q     || W     || E     || R     || T     || Y     || U     || I     || O     || P     || [     || ]     || \     || Home  |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * | ESC   || A     || S     || D     || F     || G     || H     || J     || K     || L     || ;     || "     || Enter || Enter || PgUp  |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * | Shift || Z     || X     || C     || V     || B     || N     || M     || ,     || .     || /     || Shift || Shift || Up    || PgDn  |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * | Ctrl  || Super || Alt   || MO(1) || Bkspc || Space || Space || Bkspc || MO(1) || Alt   || Super || Ctrl  || Left  || Down  || Right |
-    * ---------------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_ortho_5x15(
-        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_HOME,
-        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,  KC_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_RSFT, KC_UP,   KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_BSPC, KC_SPC,  KC_SPC,  KC_BSPC, MO(1),   KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Function Layer
-    * ---------------------------------------------------------------------------------------------------------------------------------------
-    * |       || F1    || F2    || F3    || F4    || F5    || F6    || F7    || F8    || F9    || F10   || F11   || F12   ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||RGB MOD||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |RGB TOG||RGB HUI||RGB SAI||RGB VAI||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ---------------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_ortho_5x15(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_INS,
-        _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
-        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Empty Layer
-    * ---------------------------------------------------------------------------------------------------------------------------------------
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ---------------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_ortho_5x15(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Empty Layer
-    * ---------------------------------------------------------------------------------------------------------------------------------------
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ---------------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_ortho_5x15(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/idobao/id75/keymaps/ifohancroft/readme.md b/keyboards/idobao/id75/keymaps/ifohancroft/readme.md
deleted file mode 100644
index 6a6c2cd34bd..00000000000
--- a/keyboards/idobao/id75/keymaps/ifohancroft/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-![IFo Hancroft Idobo Layout Image](https://i.imgur.com/ml1olw4.png)
-
-# IFo Hancroft's Idobo Layout
-
- - Layer 1: A standard ANSI QWERTY layer.
- - Layer 2: A fuction layer. It contains the F1-F12 keys, RGB control keys and the Insert and End keys.
- - Layer 3: An empty layer in-case I need something on-the-fly so I can remap with VIA.
- - Layer 4: An empty layer in-case I need something on-the-fly so I can remap with VIA.
-
-This keymap also sets the polling rate of the keyboard to 1ms, the HUE, VALUE and SATURATION of the RGB to steps of 1, disables the MOUSEKEY, EXTRAKEY and CONSOLE features, and enables the following features:
-
- - COMMAND
- - NKRO (forced on)
- - VIA
diff --git a/keyboards/idobao/id75/keymaps/ifohancroft/rules.mk b/keyboards/idobao/id75/keymaps/ifohancroft/rules.mk
deleted file mode 100644
index 6609b4097b0..00000000000
--- a/keyboards/idobao/id75/keymaps/ifohancroft/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-NKRO_ENABLE = yes
-VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/idobao/id75/keymaps/paryz/config.h b/keyboards/idobao/id75/keymaps/paryz/config.h
deleted file mode 100644
index 625ce7a2576..00000000000
--- a/keyboards/idobao/id75/keymaps/paryz/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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
-#define RGBLIGHT_SLEEP
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/idobao/id75/keymaps/paryz/keymap.c b/keyboards/idobao/id75/keymaps/paryz/keymap.c
deleted file mode 100644
index 2d03c205ae8..00000000000
--- a/keyboards/idobao/id75/keymaps/paryz/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ht 2018 Milton Griffin
- *
- * 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
-
-// Keyboard Layers
-enum layers {
-    _QWERTY,
-    _FN,
-    _LOWER,
-    _RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAPS   | A      | S      | D      | F      | G      | HOME   | DEL    | PG UP  | H      | J      | K      | L      | ;      | ' RAISE|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | END    | UP     | PG DN  | N      | M      | ,      | .      | UP     |? RSHIFT|
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |  CTRL  | ADJUST | ALT    | GUI    | SPACE  | SPACE  | LEFT   | DOWN   | RIGHT  | BSPACE | BSPACE |   ALT  | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_QWERTY] = LAYOUT_ortho_5x15( /* QWERTY */
-    QK_GESC,            KC_1,   KC_2,    KC_3,    KC_4,   KC_5,  KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-    KC_TAB,             KC_Q,   KC_W,    KC_E,    KC_R,   KC_T,  KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT,
-    LT(_LOWER,KC_CAPS), KC_A,   KC_S,    KC_D,    KC_F,   KC_G,  KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, LT(_RAISE, KC_QUOT),
-    KC_LSFT,            KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,  KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   RSFT_T(KC_SLSH),
-    KC_LCTL,            MO(_FN),KC_LGUI, KC_LALT, KC_SPC, KC_SPC,KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, KC_BSPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
- [_FN] = LAYOUT_ortho_5x15(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_PSCR, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_MINS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS,
-    KC_MPRV, KC_MPLY, KC_MNXT, RGB_HUI, KC_NO,   KC_NO,   KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_NO,   QK_BOOT, KC_NO,   KC_NO,   KC_TRNS,
-    KC_VOLD, KC_MUTE, KC_VOLU, RGB_SAI, RGB_SPD, RGB_RMOD,KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_NO,   RGB_TOG, RGB_VAI, RGB_SPI, RGB_MOD, KC_P0,   KC_NO,   KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
- [_LOWER] = LAYOUT_ortho_5x15(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NO,   KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_TRNS, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_NO,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_P4,   KC_P5,   KC_P6,   KC_NO,   KC_NUHS, KC_NUBS, KC_NO,   KC_NO,   KC_TRNS,
-    KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0,   KC_NO,   KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-[_RAISE] = LAYOUT_ortho_5x15(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NO,   KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_TRNS, KC_NO,   KC_HOME, KC_UP,   KC_END,  KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_NO,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_TRNS, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_P4,   KC_P5,   KC_P6,   KC_NO,   KC_NUHS, KC_NUBS, KC_NO,   KC_NO,   KC_TRNS,
-    KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0,   KC_NO,   KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-)
-};
-
-#ifdef RGB_MATRIX_ENABLE
-void keyboard_post_init_user(void) {
-    g_led_config = (led_config_t){{
-            // Key Matrix to LED Index
-            { 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70 },
-            { 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55 },
-            { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40 },
-            { 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25 },
-            { 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10 }
-        }, {
-            // LED Index to Physical Position
-            {8, 12},{60, 12},{112, 12},{164, 12},{216, 12},
-            {216, 60},{164, 60},{112, 60},{60, 60},{8, 60},
-            {224, 64}, {208, 64}, {192, 64}, {176, 64}, {160, 64}, {144, 64}, {128, 64}, {112, 64}, {96, 64}, {80, 64}, {64, 64}, {48, 64}, {32, 64}, {16, 64}, {0, 64},
-            {224, 48}, {208, 48}, {192, 48}, {176, 48}, {160, 48}, {144, 48}, {128, 48}, {112, 48}, {96, 48}, {80, 48}, {64, 48}, {48, 48}, {32, 48}, {16, 48}, {0, 48},
-            {224, 32}, {208, 32}, {192, 32}, {176, 32}, {160, 32}, {144, 32}, {128, 32}, {112, 32}, {96, 32}, {80, 32}, {64, 32}, {48, 32}, {32, 32}, {16, 32}, {0, 32},
-            {224, 16}, {208, 16}, {192, 16}, {176, 16}, {160, 16}, {144, 16}, {128, 16}, {112, 16}, {96, 16}, {80, 16}, {64, 16}, {48, 16}, {32, 16}, {16, 16}, {0, 16},
-            {224,  0}, {208,  0}, {192,  0}, {176,  0}, {160,  0}, {144,  0}, {128,  0}, {112,  0}, {96,  0}, {80,  0}, {64,  0}, {48,  0}, {32,  0}, {16,  0}, {0,  0}
-        }, {
-            // LED Index to Flag
-            2,2,2,2,2,2,2,2,2,2,
-            1,1,1,1,4,4,9,9,9,4,4,1,1,1,1,
-            1,4,4,4,4,4,9,9,9,4,4,4,4,4,1,
-            1,4,4,4,4,4,9,9,9,4,4,4,4,4,1,
-            1,4,4,4,4,4,9,9,9,4,4,4,4,4,1,
-            1,4,4,4,4,4,9,9,9,4,4,4,4,4,1
-        }
-    };
-};
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    if (host_keyboard_led_state().caps_lock) {
-        for (int i = 10; i <= 84; i++) {
-            if (g_led_config.flags[i] & LED_FLAG_MODIFIER) {
-                rgb_matrix_set_color(i, RGB_RED);
-            }
-        }
-    }
-
-    if ( get_highest_layer(layer_state) > _QWERTY) {
-        HSV hsv = {0, 255, 255};
-
-        switch (get_highest_layer(layer_state)) {
-            case _FN:
-                hsv.h = 32;
-                break;
-            case _LOWER:
-                hsv.h = 116;
-                break;
-            case _RAISE:
-                hsv.h = 200;
-                break;
-            default:
-                break;
-        };
-
-        if (hsv.v > rgb_matrix_get_val()) {
-            hsv.v = RGB_MATRIX_MAXIMUM_BRIGHTNESS;
-        }
-        RGB rgb = hsv_to_rgb(hsv);
-
-        for (int i = 10; i <= 84; i++) {
-            if ( g_led_config.flags[i] & LED_FLAG_INDICATOR) {
-                rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-            }
-        };
-    }
-    return false;
-};
-#endif
diff --git a/keyboards/idobao/id75/keymaps/paryz/rules.mk b/keyboards/idobao/id75/keymaps/paryz/rules.mk
deleted file mode 100644
index 8ce8a7d06e0..00000000000
--- a/keyboards/idobao/id75/keymaps/paryz/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-NKRO_ENABLE = yes
diff --git a/keyboards/idobao/id75/keymaps/pathnirvana/config.h b/keyboards/idobao/id75/keymaps/pathnirvana/config.h
deleted file mode 100644
index dd95794254a..00000000000
--- a/keyboards/idobao/id75/keymaps/pathnirvana/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 PathNirvana
- *
- * 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
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#undef DEBOUNCE
-#define DEBOUNCE 40
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 6
diff --git a/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c b/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
deleted file mode 100644
index 1ba1e071ec0..00000000000
--- a/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 pathnirvana (pathnirvana@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_ortho_5x15(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F5, 
-		KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_LBRC, KC_BSLS, KC_RBRC, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_QUOT, 
-		KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_PGUP, KC_DEL, KC_PGDN, KC_M, KC_N, KC_E, KC_I, KC_O, KC_ENT, 
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_HOME, KC_UP, KC_END, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_NO, 
-		KC_LCTL, KC_MS_BTN3, KC_LALT, LT(2,KC_F2), KC_SPC, LSFT_T(KC_SPC), KC_LEFT, KC_DOWN, KC_RGHT, LT(3,KC_DEL), RSFT_T(KC_BSPC), LALT(KC_LSFT), KC_NO, DF(1), KC_ENT),
-	[1] = LAYOUT_ortho_5x15(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F5, 
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_BSLS, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT, 
-		KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_PGUP, KC_DEL, KC_PGDN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, 
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_HOME, KC_UP, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, 
-		KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_F2), KC_SPC, LSFT_T(KC_SPC), KC_LEFT, KC_DOWN, KC_RGHT, LT(3,KC_DEL), RSFT_T(KC_BSPC), LALT(KC_LSFT), KC_NO, DF(0), KC_ENT),
-	[2] = LAYOUT_ortho_5x15(
-		KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_MUTE, KC_VOLD, KC_VOLU, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
-		KC_MSEL, BL_BRTG, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_UP), LSFT(KC_RGHT), KC_NO, KC_NO, 
-		KC_SLEP, BL_STEP, RGB_SAD, RGB_SAI, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, QK_BOOT, 
-		KC_NO, BL_TOGG, RGB_VAD, RGB_VAI, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NO, LCTL(KC_LEFT), LCTL(KC_DOWN), LCTL(KC_UP), LCTL(KC_RGHT), KC_NO, KC_NO, 
-		KC_NO, RGB_TOG, RGB_RMOD, RGB_MOD, KC_NO, KC_NO, KC_WBAK, KC_NO, KC_WFWD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-	[3] = LAYOUT_ortho_5x15(
-		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_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TILD, KC_UNDS, KC_PLUS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO, 
-		KC_NO, KC_QUOT, KC_BSLS, KC_LCBR, KC_LBRC, KC_LT, KC_NO, KC_NO, KC_NO, KC_GT, KC_RBRC, KC_RCBR, KC_PIPE, KC_DQUO, KC_NO, 
-		KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, 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/idobao/id75/keymaps/pathnirvana/rules.mk b/keyboards/idobao/id75/keymaps/pathnirvana/rules.mk
deleted file mode 100644
index 6bfd2bac6af..00000000000
--- a/keyboards/idobao/id75/keymaps/pathnirvana/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-DEBOUNCE_TYPE = sym_eager_pk
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/idobao/id75/keymaps/revok75/config.h b/keyboards/idobao/id75/keymaps/revok75/config.h
deleted file mode 100644
index f5c4659880a..00000000000
--- a/keyboards/idobao/id75/keymaps/revok75/config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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/>.
- */
diff --git a/keyboards/idobao/id75/keymaps/revok75/keymap.c b/keyboards/idobao/id75/keymaps/revok75/keymap.c
deleted file mode 100644
index f251e5d5cc7..00000000000
--- a/keyboards/idobao/id75/keymaps/revok75/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _QW_M 0
-#define _QW_W 1
-#define _FN 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	/* QWERTY-Mac
-	 * .--------------------------------------------------------------------------------------------------------------------------------------.
-	 * | ESC    | 1      | 2      | 3      | 4      | %      | 6     | 7      | 8      | 9      | 0      | -       | =    | Cut    | BACKSP   |
-	 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-	 * | TAB    | Q      | W      | E      | R      | T      | Y     | U      | I      | O      | P      | {      | }     | Copy   | Paste    |
-	 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-	 * | CAP LK | A      | S      | D      | F      | G      | H     | J      | K      | L      | ;      | '      | ENTER  | ENTER | REF      |
-	 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-	 * | LSHIFT | Z      | X      | C      | V      | B      | N     | M      | ,      | .      | /      | \      | RSHIFT| UP     | SAVE     |
-	 * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-	 * |  LALT   | LGUI   | LALT	|	FIND	| CMD T   | SPACE  | SPACE | ALFRED | FN-MO  | RALT   | RGUI   | RCTRL  | LEFT  | DOWN   | RIGHT    |
-	 * '--------------------------------------------------------------------------------------------------------------------------------------'
-	 */
-
-	[_QW_M] = LAYOUT_ortho_5x15( /* QWERTY MAC*/
-		QK_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,     LGUI(KC_X),  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_LCBR,    KC_RCBR,    LGUI(KC_C),  LGUI(KC_V),
-		KC_CAPS,  KC_A,     KC_S,     KC_D,     	KC_F,     	KC_G, 	KC_H,   KC_J,   				KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    LGUI(KC_R), KC_NO,       KC_ENT,
-		KC_LSFT,  KC_Z,     KC_X,     KC_C,     	KC_V,     	KC_B, 	KC_N,   KC_M,   				KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS,    KC_RSFT,    KC_UP,       LGUI(KC_S),
-		KC_LCTL,  KC_LALT,  KC_LGUI,	LGUI(KC_F), LGUI(KC_T), KC_SPC, KC_NO, 	LALT(KC_SPACE),	MO(_FN), 	KC_RGUI,  KC_RALT,  KC_RCTL,    KC_LEFT,    KC_DOWN,     KC_RGHT
-	),
-
-	 /* QWERTY-Win
-	  * .--------------------------------------------------------------------------------------------------------------------------------------.
-	  * | ESC    | 1      | 2      | 3      | 4      | %      | 6     | 7      | 8      | 9      | 0      | -       | =    | Cut    | BACKSP   |
-	  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-	  * | TAB    | Q      | W      | E      | R      | T      | Y     | U      | I      | O      | P      | {      | }     | Copy   | Paste    |
-	  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-	  * | CAP LK | A      | S      | D      | F      | G      | H     | J      | K      | L      | ;      | '      | ENTER  | ENTER | REF      |
-	  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-	  * | LSHIFT | Z      | X      | C      | V      | B      | N     | M      | ,      | .      | /      | \      | RSHIFT | UP    | SAVE     |
-	  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-	  * | LALT   | LGUI   | LALT   |  FIND  | CMD T	 | SPACE | SPACE  | START  | FN-MO  | RALT   | RGUI   | RCTRL  | LEFT  | DOWN   | RIGHT    |
-	  * '--------------------------------------------------------------------------------------------------------------------------------------'
-	  */
-
-  [_QW_W] = LAYOUT_ortho_5x15( /* QWERTY WIN*/
-  	QK_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,     LCTL(KC_X),  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_LCBR,     KC_RCBR,    LCTL(KC_C),  LCTL(KC_V),
-  	KC_CAPS,  KC_A,     KC_S,     KC_D,     		KC_F,     	KC_G, 	KC_H,   KC_J,   				KC_K,     KC_L,     KC_SCLN,  KC_QUOT,     LCTL(KC_R), KC_NO,       KC_ENT,
-  	KC_LSFT,  KC_Z,     KC_X,     KC_C,     		KC_V,     	KC_B, 	KC_N,   KC_M,   				KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS,     KC_RSFT,    KC_UP,       LCTL(KC_S),
-  	KC_LCTL,  KC_LALT,  KC_LGUI,  LCTL(KC_F), 	LCTL(KC_T), KC_SPC, KC_NO,	LCTL(QK_GESC),	MO(_FN), 	KC_RGUI,  KC_RALT,  KC_RCTL,     KC_LEFT,    KC_DOWN,     KC_RGHT
- 	),
-
-	/* FUNCTION
-	* .--------------------------------------------------------------------------------------------------------------------------------------.
-	* | ESC    | F1     | F2     | F3     | F4     | F5     | F6    | F7     | F8     | F9     | F10    | VOLDN   | VOLUP  | MUTE   | DEL    |
-	* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-	* | TAB    | -      | WIN    | -      | -      | RGB_TOG| -     | -      | OPTION  | QK_BOOT  | -      | [      | ]     | -       | -      |
-	* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-	* | CAP LK | MAC    | RAINBOW| PLAIN  | -      | -      | -     | -      | -      | -      | ;      | '       | ENTER |  ENTER  | REF    |
-	* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-	* | LSHIFT | INC    | DEC    | HUE I  | HUE D  | SAT I  | SAT D | -      | -      | .      | /       | \      | RSHIFT|  HOME   | SAVE   |
-	* |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-	* | LALT   | LGUI   | LALT   |  FIND  | CMD T	 | SPACE | SPACE  | ALFRED | FN-MO  | RALT   | RGUI    | RCTRL  | PGUP   | END    | PGDN   |
-	* '--------------------------------------------------------------------------------------------------------------------------------------'
-	*/
-
- 	[_FN] = LAYOUT_ortho_5x15( /* OSLAYOUT + NUMPAD + MEDIA + LIGHTING */
-  	KC_TRNS, KC_F1,     KC_F2,						 KC_F3,    		   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_VOLD, KC_VOLU, KC_MUTE, KC_DEL,
-  	KC_TRNS, KC_NO,     DF(_QW_W),    		 KC_NO,    		   KC_NO,   RGB_TOG, KC_NO,   KC_NO,   KC_RALT, QK_BOOT, KC_NO,   KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS,
-  	KC_TRNS, DF(_QW_M), RGB_MODE_RAINBOW,  RGB_MODE_PLAIN, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  	KC_TRNS, RGB_VAI,   RGB_VAD,  				 RGB_HUI,  		   RGB_HUD, RGB_SAI, RGB_SAD, KC_NO,   KC_NO,   KC_DOT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS,
-  	KC_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_END,	 KC_PGDN
-	),
-};
diff --git a/keyboards/idobao/id75/keymaps/revok75/readme.md b/keyboards/idobao/id75/keymaps/revok75/readme.md
deleted file mode 100644
index 780c5401c45..00000000000
--- a/keyboards/idobao/id75/keymaps/revok75/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for Revok 75 --idobo version
diff --git a/keyboards/idobao/id75/keymaps/revok75/rules.mk b/keyboards/idobao/id75/keymaps/revok75/rules.mk
deleted file mode 100644
index 7efceba50a8..00000000000
--- a/keyboards/idobao/id75/keymaps/revok75/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/keyboards/idobao/id75/keymaps/xaceofspaidsx/config.h b/keyboards/idobao/id75/keymaps/xaceofspaidsx/config.h
deleted file mode 100644
index a3ed4f762a6..00000000000
--- a/keyboards/idobao/id75/keymaps/xaceofspaidsx/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 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
-
-// place overrides here
diff --git a/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c b/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
deleted file mode 100644
index cd2d294c00d..00000000000
--- a/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2018 xAceOfSpaidsx
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _QW 0
-#define _FN 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY - based off xd75 default map with a couple modifications for my preference
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | F2     | `      | F5     | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | -      | \      | =      | Y      | U      | I      | O      | P      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | HOME   | DEL    | PG UP  | H      | J      | K      | L      | ;      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | END    | UP     | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | LGUI   | LALT   | FN     | SPACE  | SPACE  | LEFT   | DOWN   | RIGHT  | [      | ]      | FN     | RALT   | RGUI   | RCTRL  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_F2,   KC_GRV,  KC_F5,   KC_6,     KC_7,     KC_8,    KC_9,    KC_0,    KC_BSPC,
-   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_MINS, KC_BSLS, KC_EQL,  KC_Y,     KC_U,     KC_I,    KC_O,    KC_P,    KC_QUOT,
-   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,     KC_J,     KC_K,    KC_L,    KC_SCLN, KC_ENT,
-   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,     KC_M,     KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-   KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC,  KC_RBRC,  MO(_FN), KC_RALT, KC_RGUI, KC_RCTL
- ),
-
-/* FUNCTION Layer - removed the rgb hue saturation and vibrance for audio controls and added some functionality I use from other boards.
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F1     | F2     | F3     | F4     | F5     | F6     | NUM LK | P/     | P*     | F7     | F8     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | SELECT | CALC   | UP     |        |        | NEXT   | P7     | P8     | P9     | -      |        |        | PR SCR | SCR LK | PAUSE  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | PREV   | LEFT   | DOWN   | RIGHT  | DEL    | PLAY   | P4     | P5     | P6     | +      |        | QK_BOOT  |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | VOL-   | MUTE   | VOL+   | APP    |        | STOP   | P1     | P2     | P3     | PENT   |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        | RGB TG | FN     | RGB RMD| RGB MD | P0     |        | P.     | PENT   | PENT   | FN     |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-   KC_MSEL, KC_CALC, KC_UP  , _______, _______, KC_MNXT, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
-   KC_MPRV, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , KC_MPLY, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT, _______, _______, _______,
-   KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  _______, KC_MSTP, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
-   _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
- ),
-};
diff --git a/keyboards/idobao/id75/keymaps/xaceofspaidsx/readme.md b/keyboards/idobao/id75/keymaps/xaceofspaidsx/readme.md
deleted file mode 100644
index ac6e74702c0..00000000000
--- a/keyboards/idobao/id75/keymaps/xaceofspaidsx/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Updated the keymap, based off XD75 default, to meet my needs. Refer to rules.mk to enable or disable rgb and other features.
diff --git a/keyboards/idobao/id75/keymaps/xaceofspaidsx/rules.mk b/keyboards/idobao/id75/keymaps/xaceofspaidsx/rules.mk
deleted file mode 100644
index b973e9d8b3d..00000000000
--- a/keyboards/idobao/id75/keymaps/xaceofspaidsx/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#Had to disable the first 2 to get the firmware size down enough after enabling the rgb controls.
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
diff --git a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
deleted file mode 100644
index 19c0780463d..00000000000
--- a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
+++ /dev/null
@@ -1,190 +0,0 @@
-[
-  {
-    "name": "gsm-idobo",
-    "notes": "Massdrop xd75\n\nFront Legend = \"Adust\" layer (both lower and Raise)"
-  },
-  [
-    {
-      "a": 3
-    },
-    "Esc\n\n\n\nreset",
-    {
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "\nF1\n\n\n\n\n\n\n\n1 !",
-    "\nF2\n\n\n\n\n\n\n\n2 @",
-    "\nF3\n\n\n\n\n\n\n\n3 #",
-    "\nF4\n\n\n\n\n\n\n\n4 $",
-    "\nF5\n\n\n\n\n\n\n\n5 %",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "= +",
-    "",
-    "- _",
-    {
-      "t": "#0000ff\n#ff0000",
-      "a": 0
-    },
-    "\nF6\n\n\nrgbplain\n\n\n\n\n6 ^",
-    "\nF7\n\n\nrgbtest\n\n\n\n\n7 &",
-    "\nF8\n\n\nrgbmode\n\n\n\n\n8 *",
-    {
-      "a": 4
-    },
-    "\nF9\n\n\n\n\n\n\n\n9 (",
-    "\nF10\n\n\n\n\n\n\n\n0 )",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "Bksp"
-  ],
-  [
-    "Tab",
-    "Q",
-    {
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "PgUp\nUP\n\n\n\n\n\n\n\nW",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "E",
-    {
-      "a": 3
-    },
-    "R\n\n\n\nrgb_tog",
-    "T\n\n\n\nbl_tog",
-    {
-      "a": 7
-    },
-    "",
-    "",
-    "[ {",
-    "T",
-    "Y",
-    "I",
-    "O",
-    "P",
-    "]"
-  ],
-  [
-    {
-      "c": "#0000ff",
-      "t": "#ffffff"
-    },
-    "Raise",
-    {
-      "c": "#cccccc",
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "Home\nLEFT\n\n\n\n\n\n\n\nA",
-    {
-      "a": 0
-    },
-    "PgDwn\nDOWN\n\n\nrgb_hai\n\n\n\n\nS",
-    "End\nRIGHT\n\n\nrgb_sai\n\n\n\n\nD",
-    {
-      "t": "#000000",
-      "a": 3
-    },
-    "F\n\n\n\nrgb_vai",
-    "G\n\n\n\nbl_inc",
-    {
-      "a": 7
-    },
-    "",
-    "UP",
-    "PrtScr",
-    "H",
-    "J",
-    "K",
-    "L",
-    "; :",
-    "' \""
-  ],
-  [
-    {
-      "a": 3
-    },
-    "Shift\n\n\n\neep_rst",
-    {
-      "a": 7
-    },
-    "Z",
-    {
-      "a": 3
-    },
-    "X\n\n\n\nrgb_hud",
-    "C\n\n\n\nrgb_sad",
-    "V\n\n\n\nrgb_vad",
-    "B\n\n\n\nbl_dec",
-    {
-      "a": 7
-    },
-    "LEFT",
-    "DOWN",
-    "RIGHT",
-    "N",
-    "M",
-    ", <",
-    ". >",
-    "/ ?",
-    {
-      "a": 6
-    },
-    "Shift"
-  ],
-  [
-    {
-      "a": 7
-    },
-    "` ~",
-    "\\ |",
-    "Alt",
-    "Ctrl",
-    {
-      "c": "#ff0000"
-    },
-    "Lower",
-    {
-      "c": "#eb7c15"
-    },
-    "Space",
-    {
-      "c": "#cccccc",
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "\nApp\n\n\n\n\n\n\n\nOS",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "Del",
-    "Enter",
-    {
-      "c": "#eb7c15"
-    },
-    "Space",
-    {
-      "c": "#0000ff",
-      "t": "#ffffff"
-    },
-    "Raise",
-    {
-      "c": "#cccccc",
-      "t": "#000000"
-    },
-    "Left",
-    "Down",
-    "Up",
-    "Right"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keymap.c b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keymap.c
deleted file mode 100644
index 84830e47c65..00000000000
--- a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-};
-
-enum layer_names {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | =      |        | -      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      |        |        | [      | Y      | U      | I      | O      | P      | ]      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | RAISE  | A      | S      | D      | F      | G      |        | UP     | PrtScr | H      | J      | K      | L      | ;      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | LEFT   | DOWN   | RIGHT  | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | `      | \      | LALT   | LCTRL  | LOWER  | SPACE  | LGUI   | DEL    | ENTER  | SPACE  | RAISE  |  LEFT  |  DOWN  |  UP    | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_5x15( 
-    KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL,  XXXXXXX,   KC_MINS,   KC_6,    KC_7,    KC_8,       KC_9,     KC_0, KC_BSPC,  
-    KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    XXXXXXX, XXXXXXX,   KC_LBRC,   KC_Y,    KC_U,    KC_I,       KC_O,     KC_P, KC_RBRC,  
-     RAISE,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    XXXXXXX,   KC_UP,   KC_PSCR,   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_LEFT, KC_DOWN,   KC_RGHT,   KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT, 
-  KC_GRAVE,  KC_BSLS, KC_LALT, KC_LCTL,   LOWER,  KC_SPC,    KC_LGUI,  KC_DEL,    KC_ENT, KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP, KC_RGHT  
-),
-
-
-/* LOWER
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     |        |        |        | F6     | F7     | F8     | F9     | F10    |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |  UP    |        |        |        |        |        |        |        |        |        | PR SCR |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RAISE  | LEFT   |  DOWN  |  RIGHT |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        | LOWER  |        |  APP   |        |        |        |  RAISE |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_5x15( 
-    XXXXXXX,   KC_F1,   KC_F2,   KC_F3, XXXXXXX,   KC_F5, XXXXXXX, XXXXXXX, XXXXXXX,    KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, XXXXXXX,  
-    XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
-      RAISE, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX,  KC_APP, XXXXXXX, XXXXXXX,  XXXXXXX,   RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX  
-),
-
- /* RAISE
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |  pgup  |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RAISE  | home   |  pgdn  | end    |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        | LOWER  |        |        |        |        |        |  RAISE |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_5x15( 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
-    XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
-      RAISE, KC_HOME, KC_PGDN,  KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX  
-),
-
-
- /* ADJUST
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | QK_BOOT  |        |        |        |        |        |        |        |        |rgbplain|rgbtest | rgbmode|        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |rgb tog | bl_tog |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RAISE  |        | rgb hi | rgb sai|rgb vai | bl inc |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | EEP Rst|        | rgb hd | rgb sad|rgb vad | bl dec |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        | LOWER  |        |        |        |        |        |  RAISE |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_5x15( 
-    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RGB_M_P, RGB_M_T, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX,  
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
-    RAISE, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI,  BL_UP,  XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-  EE_CLR,  XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DOWN,XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX  
-),
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/readme.md b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/readme.md
deleted file mode 100644
index 7b6f654c71f..00000000000
--- a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# GreenShadowMaker keymap for idobo
-
-make idobo:greenshadowmaker:dfu
-
-Note: keyboard-layout-editor-gsm-idobo.json shoudl be the matching layout for http://www.keyboard-layout-editor.com
diff --git a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/rules.mk b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/rules.mk
deleted file mode 100644
index f6587a835e3..00000000000
--- a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
index 54d74c8da57..51d84749a5d 100644
--- a/keyboards/idobao/id75/v2/config.h
+++ b/keyboards/idobao/id75/v2/config.h
@@ -16,48 +16,6 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 85 /* 10 Bottom 75 top*/
-// 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
-// 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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json
index 4cb46c2564d..f24145b9180 100644
--- a/keyboards/idobao/id75/v2/info.json
+++ b/keyboards/idobao/id75/v2/info.json
@@ -12,6 +12,39 @@
         "pin": "F0"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812"
     },
     "matrix_pins": {
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h b/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h
deleted file mode 100644
index 2a432a5b2e4..00000000000
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 msf@github
- *
- * 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/>.
- */
-
-/*
-  Set any config.h overrides for your specific keymap here.
-  See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
-*/
-#pragma once
-
-#define COMBO_TERM 200
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
deleted file mode 100644
index bdcb153413f..00000000000
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 Miguel Filipe <miguel.filipe@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_ansi(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_VOLD, KC_VOLU, KC_F8,     KC_F9,   KC_F10,  KC_PSTE, KC_PSCR,    KC_DEL,    MO(1),
-        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_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_ansi(
-        QK_BOOT,   KC_CALC, _______, _______, _______,    KC_MUTE, KC_F6, KC_F7, KC_MPLY,      KC_MSTP, KC_BRID, KC_BRIU, KC_F11,     KC_F12,    _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_INS,
-        _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        KC_DEL,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, BL_DOWN, BL_TOGG, BL_UP,   NK_TOGG, _______, _______, _______, _______, _______,          BL_UP,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DOWN, BL_STEP
-    ),
-    [2] = LAYOUT_ansi(
-        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        _______, _______, _______
-    ),
-};
-
-enum combos {
-  SLSHDN_PGDN,
-  SLSHUP_PGUP,
-  RALTBKSPC_DELETE,
-};
-
-const uint16_t PROGMEM slashDown_combo[] = {KC_SLSH, KC_DOWN, COMBO_END};
-const uint16_t PROGMEM slashUp_combo[] = {KC_SLSH, KC_UP, COMBO_END};
-const uint16_t PROGMEM raltBackspace_combo[] = {KC_RALT, KC_BSPC, COMBO_END};
-
-combo_t key_combos[] = {
-  [SLSHDN_PGDN] = COMBO(slashDown_combo, KC_PGDN),
-  [SLSHUP_PGUP] = COMBO(slashUp_combo, KC_PGUP),
-  [RALTBKSPC_DELETE] = COMBO(raltBackspace_combo, KC_DEL),
-};
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/readme.md b/keyboards/idobao/id80/v2/ansi/keymaps/msf/readme.md
deleted file mode 100644
index 7ab300f672b..00000000000
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# slightly modified:
-- some key combos
-- don't use f-keys,
-- pgup/down, home/end tweaks
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/rules.mk b/keyboards/idobao/id80/v2/ansi/keymaps/msf/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h
deleted file mode 100644
index afe880fa8af..00000000000
--- a/keyboards/idobao/id80/v3/ansi/config.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* ----------------
- * RGB Matrix stuff
- * ---------------- */
-
-// RGB Matrix config
-#if defined(RGB_MATRIX_ENABLE)
-
-    #define RGB_MATRIX_LED_COUNT 94
-
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
-
-    #define RGB_MATRIX_KEYPRESSES
-
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
-
-    /* don't need `#if`, animation modes themselves check defines
-     * #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) */
-    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-    /* #endif  // RGB_MATRIX_FRAMEBUFFER_EFFECTS */
-
-    /* don't need `#if`, animation modes themselves check defines
-     * #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES) */
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-    /* #endif  // RGB_MATRIX_KEYPRESSES | RGB_MATRIX_KEYRELEASES */
-#endif  // RGB_MATRIX_ENABLE
-
-/* -----------------------
- * 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
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
index cf21d3abb15..5cca0260ea0 100644
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -15,7 +15,49 @@
         "rgblight": false
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
deleted file mode 100644
index 17b63471fa4..00000000000
--- a/keyboards/idobao/id87/v2/config.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2022 vinorodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-/* ----------------
- * RGB Matrix stuff
- * ---------------- */
-
-// RGB Matrix config
-#if defined(RGB_MATRIX_ENABLE)
-
-    #define RGB_MATRIX_LED_COUNT 103
-
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180  // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
-
-    #define RGB_MATRIX_KEYPRESSES
-
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-    #define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
-    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-    #define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
-
-    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS -- do not enable */
-    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-    /* RGB_MATRIX_KEYPRESSES | RGB_MATRIX_KEYRELEASES */
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-#endif  // RGB_MATRIX_ENABLE
-
-
-/* -----------------------
- * 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
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
index 783cd04a03f..cb94ee763e9 100644
--- a/keyboards/idobao/id87/v2/info.json
+++ b/keyboards/idobao/id87/v2/info.json
@@ -18,7 +18,49 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h
deleted file mode 100755
index 789479de053..00000000000
--- a/keyboards/idobao/montex/v1rgb/config.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#if defined(RGB_MATRIX_ENABLE)
-
-    // The number of LEDs connected
-    #define RGB_MATRIX_LED_COUNT 31
-
-    #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-    #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
-    /* *** Items disabled are visually unappealing in a 5x6 key matrix *** */
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR
-    #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
-    #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
diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json
index 31c06d08090..08c62297ac2 100755
--- a/keyboards/idobao/montex/v1rgb/info.json
+++ b/keyboards/idobao/montex/v1rgb/info.json
@@ -7,7 +7,33 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 170
     },
     "matrix_pins": {
         "cols": ["D5", "D3", "D2", "D1", "D0"],
diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h
index a7cd0d6114e..548f3f62e71 100755
--- a/keyboards/idobao/montex/v2/config.h
+++ b/keyboards/idobao/montex/v2/config.h
@@ -9,65 +9,6 @@
     #else
         #define RGB_MATRIX_LED_COUNT 27  // -4 disabled underglow LEDs
     #endif
-
-    // #define RGB_MATRIX_FRAMEBUFFER_EFFECTS  // don't use, too few key to make it look good
-    #define RGB_MATRIX_KEYPRESSES
-
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED    // turn off effects when suspended
-    #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
-    /* *** Items disabled are visually unappealing in a 5x6 key matrix *** */
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR
-    #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
-    #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  // RGB_MATRIX_ENABLE
 
 /* -----------------------
diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json
index 74a69d60fe1..774cde114f9 100755
--- a/keyboards/idobao/montex/v2/info.json
+++ b/keyboards/idobao/montex/v2/info.json
@@ -18,7 +18,34 @@
         "pin": "B1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D5", "D3", "D2", "D1", "D0"],
diff --git a/keyboards/idyllic/tinny50_rgb/config.h b/keyboards/idyllic/tinny50_rgb/config.h
deleted file mode 100644
index 0cb5eac4324..00000000000
--- a/keyboards/idyllic/tinny50_rgb/config.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2022 Zykrah
-
-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 RGB_MATRIX_ENABLE
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS * 7/8
-
-/* The number of LEDs connected */
-#define RGB_MATRIX_LED_COUNT 30
-
-/* Enable 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
-#endif
diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/info.json
index 7e68b960f5b..5407bd9c26a 100644
--- a/keyboards/idyllic/tinny50_rgb/info.json
+++ b/keyboards/idyllic/tinny50_rgb/info.json
@@ -30,6 +30,40 @@
         "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP20", "GP19", "GP1", "GP6", "GP5"]
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "default": {
+            "val": 223
+        },
         "driver": "ws2812"
     },
     "ws2812": {
diff --git a/keyboards/illuminati/is0/keymaps/ctrlaltdel/keymap.c b/keyboards/illuminati/is0/keymaps/ctrlaltdel/keymap.c
deleted file mode 100644
index 4ba60a99590..00000000000
--- a/keyboards/illuminati/is0/keymaps/ctrlaltdel/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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( /* Base */
-    LCTL(LALT(KC_DEL))
-  ),
-};
diff --git a/keyboards/illuminati/is0/keymaps/ctrlaltdel/readme.md b/keyboards/illuminati/is0/keymaps/ctrlaltdel/readme.md
deleted file mode 100644
index 5d9e162c1c2..00000000000
--- a/keyboards/illuminati/is0/keymaps/ctrlaltdel/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The ctrlaltdel keymap for is0
-
-A simple keymap to send Ctrl + Alt + Del on keypress.
\ No newline at end of file
diff --git a/keyboards/illusion/rosa/keymaps/oggi/keymap.c b/keyboards/illusion/rosa/keymaps/oggi/keymap.c
deleted file mode 100644
index 3ddf9b8d2c6..00000000000
--- a/keyboards/illusion/rosa/keymaps/oggi/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 Brandon Lee
-
-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,
-    _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_60_ansi_tsangan_split_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_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_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_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_LGUI, KC_TRNS, KC_LALT,                                    KC_SPC,                                      KC_RALT, KC_TRNS, KC_RCTL
-    ),
-    [_FN] = LAYOUT_60_ansi_tsangan_split_rshift(
-        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_DEL,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RIGHT, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, 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/illusion/rosa/keymaps/oggi/readme.md b/keyboards/illusion/rosa/keymaps/oggi/readme.md
deleted file mode 100644
index 54db9b5630f..00000000000
--- a/keyboards/illusion/rosa/keymaps/oggi/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Oggi's custom Rosa keymap
\ No newline at end of file
diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index 7978b495deb..6bff92d3ea6 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -16,60 +16,4 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define DRIVER_1_LED_TOTAL 61
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-#define DRIVER_INDICATOR_LED_TOTAL 0
-
-// 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
-// #    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
diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json
index 80a738f4cfa..9f8f5f014a4 100644
--- a/keyboards/ilumkb/simpler61/info.json
+++ b/keyboards/ilumkb/simpler61/info.json
@@ -9,7 +9,44 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/ilumkb/simpler61/simpler61.c b/keyboards/ilumkb/simpler61/simpler61.c
index f29f05defe6..99cefc7844c 100644
--- a/keyboards/ilumkb/simpler61/simpler61.c
+++ b/keyboards/ilumkb/simpler61/simpler61.c
@@ -17,72 +17,72 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
-    {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
-    {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
-    {0,  CS3_SW4,  CS2_SW4,  CS1_SW4},
-    {0,  CS3_SW5,  CS2_SW5,  CS1_SW5},
-    {0,  CS3_SW6,  CS2_SW6,  CS1_SW6},
-    {0,  CS3_SW7,  CS2_SW7,  CS1_SW7},
-    {0,  CS3_SW8,  CS2_SW8,  CS1_SW8},
-    {0,  CS3_SW9,  CS2_SW9,  CS1_SW9},
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0,  SW1_CS3,  SW1_CS2,  SW1_CS1},
+    {0,  SW2_CS3,  SW2_CS2,  SW2_CS1},
+    {0,  SW3_CS3,  SW3_CS2,  SW3_CS1},
+    {0,  SW4_CS3,  SW4_CS2,  SW4_CS1},
+    {0,  SW5_CS3,  SW5_CS2,  SW5_CS1},
+    {0,  SW6_CS3,  SW6_CS2,  SW6_CS1},
+    {0,  SW7_CS3,  SW7_CS2,  SW7_CS1},
+    {0,  SW8_CS3,  SW8_CS2,  SW8_CS1},
+    {0,  SW9_CS3,  SW9_CS2,  SW9_CS1},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
 
-    {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, CS21_SW9, CS20_SW9, CS19_SW9},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0,  SW1_CS6,  SW1_CS5,  SW1_CS4},
+    {0,  SW2_CS6,  SW2_CS5,  SW2_CS4},
+    {0,  SW3_CS6,  SW3_CS5,  SW3_CS4},
+    {0,  SW4_CS6,  SW4_CS5,  SW4_CS4},
+    {0,  SW5_CS6,  SW5_CS5,  SW5_CS4},
+    {0,  SW6_CS6,  SW6_CS5,  SW6_CS4},
+    {0,  SW7_CS6,  SW7_CS5,  SW7_CS4},
+    {0,  SW8_CS6,  SW8_CS5,  SW8_CS4},
+    {0,  SW9_CS6,  SW9_CS5,  SW9_CS4},
+	{0, SW9_CS21, SW9_CS20, SW9_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
 
-    {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, CS24_SW9, CS23_SW9, CS22_SW9},
-	{0, CS24_SW8, CS23_SW8, CS22_SW8},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
-	{0, CS24_SW5, CS23_SW5, CS22_SW5},
+    {0,  SW1_CS9,  SW1_CS8,  SW1_CS7},
+    {0,  SW2_CS9,  SW2_CS8,  SW2_CS7},
+    {0,  SW3_CS9,  SW3_CS8,  SW3_CS7},
+    {0,  SW4_CS9,  SW4_CS8,  SW4_CS7},
+    {0,  SW5_CS9,  SW5_CS8,  SW5_CS7},
+    {0,  SW6_CS9,  SW6_CS8,  SW6_CS7},
+    {0,  SW7_CS9,  SW7_CS8,  SW7_CS7},
+    {0,  SW8_CS9,  SW8_CS8,  SW8_CS7},
+    {0,  SW9_CS9,  SW9_CS8,  SW9_CS7},
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},
+	{0, SW8_CS24, SW8_CS23, SW8_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
+	{0, SW5_CS24, SW5_CS23, SW5_CS22},
 
-    {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_SW9, CS26_SW9, CS25_SW9},
-	{0, CS27_SW8, CS26_SW8, CS25_SW8},
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
+    {0, SW9_CS27, SW9_CS26, SW9_CS25},
+	{0, SW8_CS27, SW8_CS26, SW8_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS30_SW8, CS29_SW8, CS28_SW8},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW8_CS30, SW8_CS29, SW8_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index 09dc7dc80f7..6bff92d3ea6 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -16,61 +16,4 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define DRIVER_1_LED_TOTAL 64
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-#define DRIVER_INDICATOR_LED_TOTAL 0
-
-
-// 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
-// #    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
diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json
index a7939071480..af617da861b 100644
--- a/keyboards/ilumkb/simpler64/info.json
+++ b/keyboards/ilumkb/simpler64/info.json
@@ -9,7 +9,44 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/ilumkb/simpler64/simpler64.c b/keyboards/ilumkb/simpler64/simpler64.c
index a562fa5c8ba..21892a55f49 100644
--- a/keyboards/ilumkb/simpler64/simpler64.c
+++ b/keyboards/ilumkb/simpler64/simpler64.c
@@ -17,75 +17,75 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
-    {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
-    {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
-    {0,  CS3_SW4,  CS2_SW4,  CS1_SW4},
-    {0,  CS3_SW5,  CS2_SW5,  CS1_SW5},
-    {0,  CS3_SW6,  CS2_SW6,  CS1_SW6},
-    {0,  CS3_SW7,  CS2_SW7,  CS1_SW7},
-    {0,  CS3_SW8,  CS2_SW8,  CS1_SW8},
-    {0,  CS3_SW9,  CS2_SW9,  CS1_SW9},
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0,  SW1_CS3,  SW1_CS2,  SW1_CS1},
+    {0,  SW2_CS3,  SW2_CS2,  SW2_CS1},
+    {0,  SW3_CS3,  SW3_CS2,  SW3_CS1},
+    {0,  SW4_CS3,  SW4_CS2,  SW4_CS1},
+    {0,  SW5_CS3,  SW5_CS2,  SW5_CS1},
+    {0,  SW6_CS3,  SW6_CS2,  SW6_CS1},
+    {0,  SW7_CS3,  SW7_CS2,  SW7_CS1},
+    {0,  SW8_CS3,  SW8_CS2,  SW8_CS1},
+    {0,  SW9_CS3,  SW9_CS2,  SW9_CS1},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
 
-    {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, CS21_SW9, CS20_SW9, CS19_SW9},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0,  SW1_CS6,  SW1_CS5,  SW1_CS4},
+    {0,  SW2_CS6,  SW2_CS5,  SW2_CS4},
+    {0,  SW3_CS6,  SW3_CS5,  SW3_CS4},
+    {0,  SW4_CS6,  SW4_CS5,  SW4_CS4},
+    {0,  SW5_CS6,  SW5_CS5,  SW5_CS4},
+    {0,  SW6_CS6,  SW6_CS5,  SW6_CS4},
+    {0,  SW7_CS6,  SW7_CS5,  SW7_CS4},
+    {0,  SW8_CS6,  SW8_CS5,  SW8_CS4},
+    {0,  SW9_CS6,  SW9_CS5,  SW9_CS4},
+	{0, SW9_CS21, SW9_CS20, SW9_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
 
-    {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, CS24_SW9, CS23_SW9, CS22_SW9},
-	{0, CS24_SW8, CS23_SW8, CS22_SW8},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
-	{0, CS24_SW5, CS23_SW5, CS22_SW5},
+    {0,  SW1_CS9,  SW1_CS8,  SW1_CS7},
+    {0,  SW2_CS9,  SW2_CS8,  SW2_CS7},
+    {0,  SW3_CS9,  SW3_CS8,  SW3_CS7},
+    {0,  SW4_CS9,  SW4_CS8,  SW4_CS7},
+    {0,  SW5_CS9,  SW5_CS8,  SW5_CS7},
+    {0,  SW6_CS9,  SW6_CS8,  SW6_CS7},
+    {0,  SW7_CS9,  SW7_CS8,  SW7_CS7},
+    {0,  SW8_CS9,  SW8_CS8,  SW8_CS7},
+    {0,  SW9_CS9,  SW9_CS8,  SW9_CS7},
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},
+	{0, SW8_CS24, SW8_CS23, SW8_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
+	{0, SW5_CS24, SW5_CS23, SW5_CS22},
 
-    {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_SW9, CS26_SW9, CS25_SW9},
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},
-	{0, CS27_SW7, CS26_SW7, CS25_SW7},
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
+    {0, SW9_CS27, SW9_CS26, SW9_CS25},
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},
+	{0, SW7_CS27, SW7_CS26, SW7_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS30_SW9, CS29_SW9, CS28_SW9},
-    {0, CS30_SW8, CS29_SW8, CS28_SW8},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW9_CS30, SW9_CS29, SW9_CS28},
+    {0, SW8_CS30, SW8_CS29, SW8_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/info.json b/keyboards/inett_studio/sq80/hotswap_layout_i/info.json
new file mode 100644
index 00000000000..f9e61e716aa
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/info.json
@@ -0,0 +1,129 @@
+{
+    "keyboard_name": "SQUARE 80 % Hotswap Layout I",
+    "manufacturer": "iNETT Studio",
+    "url": "https://geekhack.org/index.php?topic=100769.0",
+    "maintainer": "Wraul",
+    "usb": {
+        "vid": "0x694E",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": [ "C7", "C6", "B6", "B3", "B4", "D7", "D6", "E6", "F0", "F1", "F4", "F5", "F7", "D5", "D3" ],
+        "rows": ["B0", "B1", "B2", "F6", "B5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "D0",
+        "scroll_lock": "D1",
+        "num_lock": "D2",
+        "on_state": 0
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 2, "y": 0 },
+                { "matrix": [0, 2], "x": 3, "y": 0 },
+                { "matrix": [0, 3], "x": 4, "y": 0 },
+                { "matrix": [0, 4], "x": 5, "y": 0 },
+                { "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "matrix": [0, 9], "x": 11, "y": 0 },
+                { "matrix": [0, 10], "x": 12, "y": 0 },
+                { "matrix": [0, 11], "x": 13, "y": 0 },
+                { "matrix": [0, 12], "x": 14, "y": 0 },
+                { "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "matrix": [3, 14], "x": 17.25, "y": 0 },
+
+                { "matrix": [5, 0], "x": 0, "y": 1.5 },
+                { "matrix": [1, 0], "x": 1, "y": 1.5 },
+                { "matrix": [1, 1], "x": 2, "y": 1.5 },
+                { "matrix": [1, 2], "x": 3, "y": 1.5 },
+                { "matrix": [1, 3], "x": 4, "y": 1.5 },
+                { "matrix": [1, 4], "x": 5, "y": 1.5 },
+                { "matrix": [1, 5], "x": 6, "y": 1.5 },
+                { "matrix": [1, 6], "x": 7, "y": 1.5 },
+                { "matrix": [1, 7], "x": 8, "y": 1.5 },
+                { "matrix": [1, 8], "x": 9, "y": 1.5 },
+                { "matrix": [1, 9], "x": 10, "y": 1.5 },
+                { "matrix": [1, 10], "x": 11, "y": 1.5 },
+                { "matrix": [1, 11], "x": 12, "y": 1.5 },
+                { "matrix": [1, 12], "w": 2, "x": 13, "y": 1.5 },
+                { "matrix": [1, 13], "x": 15.25, "y": 1.5 },
+                { "matrix": [1, 14], "x": 16.25, "y": 1.5 },
+                { "matrix": [3, 13], "x": 17.25, "y": 1.5 },
+
+                { "matrix": [5, 1], "w": 1.5, "x": 0, "y": 2.5 },
+                { "matrix": [2, 0], "x": 1.5, "y": 2.5 },
+                { "matrix": [2, 1], "x": 2.5, "y": 2.5 },
+                { "matrix": [2, 2], "x": 3.5, "y": 2.5 },
+                { "matrix": [2, 3], "x": 4.5, "y": 2.5 },
+                { "matrix": [2, 4], "x": 5.5, "y": 2.5 },
+                { "matrix": [2, 5], "x": 6.5, "y": 2.5 },
+                { "matrix": [2, 6], "x": 7.5, "y": 2.5 },
+                { "matrix": [2, 7], "x": 8.5, "y": 2.5 },
+                { "matrix": [2, 8], "x": 9.5, "y": 2.5 },
+                { "matrix": [2, 9], "x": 10.5, "y": 2.5 },
+                { "matrix": [2, 10], "x": 11.5, "y": 2.5 },
+                { "matrix": [2, 11], "x": 12.5, "y": 2.5 },
+                { "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 2.5 },
+                { "matrix": [2, 13], "x": 15.25, "y": 2.5 },
+                { "matrix": [2, 14], "x": 16.25, "y": 2.5 },
+                { "matrix": [4, 14], "x": 17.25, "y": 2.5 },
+
+                { "matrix": [5, 2], "w": 1.75, "x": 0, "y": 3.5 },
+                { "matrix": [3, 0], "x": 1.75, "y": 3.5 },
+                { "matrix": [3, 1], "x": 2.75, "y": 3.5 },
+                { "matrix": [3, 2], "x": 3.75, "y": 3.5 },
+                { "matrix": [3, 3], "x": 4.75, "y": 3.5 },
+                { "matrix": [3, 4], "x": 5.75, "y": 3.5 },
+                { "matrix": [3, 5], "x": 6.75, "y": 3.5 },
+                { "matrix": [3, 6], "x": 7.75, "y": 3.5 },
+                { "matrix": [3, 7], "x": 8.75, "y": 3.5 },
+                { "matrix": [3, 8], "x": 9.75, "y": 3.5 },
+                { "matrix": [3, 9], "x": 10.75, "y": 3.5 },
+                { "matrix": [3, 10], "x": 11.75, "y": 3.5 },
+                { "matrix": [3, 11], "w": 2.25, "x": 12.75, "y": 3.5 },
+
+                { "matrix": [5, 3], "w": 2.25, "x": 0, "y": 4.5 },
+                { "matrix": [4, 0], "x": 2.25, "y": 4.5 },
+                { "matrix": [4, 1], "x": 3.25, "y": 4.5 },
+                { "matrix": [4, 2], "x": 4.25, "y": 4.5 },
+                { "matrix": [4, 3], "x": 5.25, "y": 4.5 },
+                { "matrix": [4, 4], "x": 6.25, "y": 4.5 },
+                { "matrix": [4, 5], "x": 7.25, "y": 4.5 },
+                { "matrix": [4, 6], "x": 8.25, "y": 4.5 },
+                { "matrix": [4, 7], "x": 9.25, "y": 4.5 },
+                { "matrix": [4, 8], "x": 10.25, "y": 4.5 },
+                { "matrix": [4, 9], "x": 11.25, "y": 4.5 },
+                { "matrix": [4, 10], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "matrix": [4, 13], "x": 16.25, "y": 4.5 },
+
+                { "matrix": [5, 4], "w": 1.25, "x": 0, "y": 5.5 },
+                { "matrix": [5, 5], "w": 1.25, "x": 1.25, "y": 5.5 },
+                { "matrix": [5, 6], "w": 1.25, "x": 2.5, "y": 5.5 },
+                { "matrix": [5, 7], "w": 6.25, "x": 3.75, "y": 5.5 },
+                { "matrix": [5, 8], "w": 1.25, "x": 10, "y": 5.5 },
+                { "matrix": [5, 9], "w": 1.25, "x": 11.25, "y": 5.5 },
+                { "matrix": [5, 10], "w": 1.25, "x": 12.5, "y": 5.5 },
+                { "matrix": [5, 11], "w": 1.25, "x": 13.75, "y": 5.5 },
+                { "matrix": [5, 12], "x": 15.25, "y": 5.5 },
+                { "matrix": [5, 13], "x": 16.25, "y": 5.5 },
+                { "matrix": [5, 14], "x": 17.25, "y": 5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/default/keymap.json b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/default/keymap.json
new file mode 100644
index 00000000000..3b3555d62c4
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/default/keymap.json
@@ -0,0 +1,18 @@
+{
+    "keyboard": "inett_studio/sq80/hotswap_layout_i",
+    "keymap": "default",
+    "layout": "LAYOUT_tkl_ansi",
+    "layers": [
+        [
+            "KC_ESC",  "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",              "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_PSCR", "KC_SCRL", "KC_PAUS",
+            "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC", "KC_INS" , "KC_HOME", "KC_PGUP",
+            "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL" , "KC_END",  "KC_PGDN",
+            "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT",            "KC_ENT",
+            "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT",                       "KC_UP",
+            "KC_LCTL", "KC_LGUI", "KC_LALT",                       "KC_SPC",                                   "KC_RALT", "KC_RGUI", "KC_APP",  "KC_RCTL",            "KC_LEFT", "KC_DOWN", "KC_RGHT"
+        ]
+    ],
+    "author": "Wraul",
+    "notes": "",
+    "version": 1
+}
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/via/keymap.json b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/via/keymap.json
new file mode 100644
index 00000000000..da50359f649
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/via/keymap.json
@@ -0,0 +1,23 @@
+{
+    "keyboard": "inett_studio/sq80/hotswap_layout_i",
+    "keymap": "via",
+    "layout": "LAYOUT_tkl_ansi",
+    "config": {
+        "features": {
+            "via": true
+        }
+    },
+    "layers": [
+        [
+            "KC_ESC",  "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",              "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_PSCR", "KC_SCRL", "KC_PAUS",
+            "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC", "KC_INS" , "KC_HOME", "KC_PGUP",
+            "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL" , "KC_END",  "KC_PGDN",
+            "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT",            "KC_ENT",
+            "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT",                       "KC_UP",
+            "KC_LCTL", "KC_LGUI", "KC_LALT",                       "KC_SPC",                                   "KC_RALT", "KC_RGUI", "KC_APP",  "KC_RCTL",            "KC_LEFT", "KC_DOWN", "KC_RGHT"
+        ]
+    ],
+    "author": "Wraul",
+    "notes": "",
+    "version": 1
+}
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk b/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/inett_studio/sq80/readme.md b/keyboards/inett_studio/sq80/readme.md
new file mode 100644
index 00000000000..5e10ace9043
--- /dev/null
+++ b/keyboards/inett_studio/sq80/readme.md
@@ -0,0 +1,34 @@
+# FOX × iNETT Studio SQUARE 80%
+
+![sq80](https://i.imgur.com/LM1aSMEh.jpg)
+
+_A TKL keyboard from the iNETT Studio's SQUARE series._
+
+-   Keyboard Maintainer: [Wraul](https://github.com/Wraul)
+-   Hardware Supported: The QMK compatible hot swappable PCB offered during the GB
+-   Hardware Availability: [Geekhack Group Buy](https://geekhack.org/index.php?topic=100769.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make inett_studio/sq80:default
+
+Flashing example for this keyboard:
+
+    make inett_studio/sq80: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
+
+The PCB is delivered with a forked version of QMK.  
+At this moment it is not apparent if the stock firmware comes with a keybinding for entering the bootloader.
+
+Enter the bootloader with the stock firmware:
+
+-   **Physical reset button**: Briefly press the button on the back of the PCB
+
+After flashing it is possible to enter the bootloader in 3 ways:
+
+-   **Bootmagic reset**: Hold down the escape 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 `QK_BOOT` if it is available
diff --git a/keyboards/inett_studio/sq80/rules.mk b/keyboards/inett_studio/sq80/rules.mk
new file mode 100644
index 00000000000..d4f8260d939
--- /dev/null
+++ b/keyboards/inett_studio/sq80/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = inett_studio/sq80/hotswap_layout_i
diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h
index a53a2132fa8..0759616004e 100644
--- a/keyboards/inett_studio/sqx/hotswap/config.h
+++ b/keyboards/inett_studio/sqx/hotswap/config.h
@@ -29,63 +29,9 @@
 /* disable print */
 //#define NO_PRINT
 
-//rgb matrix setting
-#define DRIVER_1_LED_TOTAL 33
-#define DRIVER_2_LED_TOTAL 31
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
     #define RGB_MATRIX_DISABLE_KEYCODES
 #endif
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
-// 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
-// #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
diff --git a/keyboards/inett_studio/sqx/hotswap/hotswap.c b/keyboards/inett_studio/sqx/hotswap/hotswap.c
index 4d77a4829e5..079889e7274 100644
--- a/keyboards/inett_studio/sqx/hotswap/hotswap.c
+++ b/keyboards/inett_studio/sqx/hotswap/hotswap.c
@@ -20,7 +20,7 @@
 #include "hotswap.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json
index 90fe00d167f..f1526594f95 100644
--- a/keyboards/inett_studio/sqx/hotswap/info.json
+++ b/keyboards/inett_studio/sqx/hotswap/info.json
@@ -12,7 +12,36 @@
         "pin": "D7"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_pinwheel_sat": true,
+            "band_spiral_sat": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "driver": "is31fl3731",
+        "max_brightness": 170
     },
     "rgblight": {
         "saturation_steps": 8,
diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index dd123bd7a98..737addf725b 100644
--- a/keyboards/inett_studio/sqx/universal/config.h
+++ b/keyboards/inett_studio/sqx/universal/config.h
@@ -29,63 +29,9 @@
 /* disable print */
 //#define NO_PRINT
 
-//rgb matrix setting
-#define DRIVER_1_LED_TOTAL 36
-#define DRIVER_2_LED_TOTAL 36
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
 #    define RGB_MATRIX_DISABLE_KEYCODES
 #endif
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
-// 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
-// #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
diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json
index 15744fbbbcd..d84ad5fc631 100644
--- a/keyboards/inett_studio/sqx/universal/info.json
+++ b/keyboards/inett_studio/sqx/universal/info.json
@@ -12,7 +12,36 @@
         "pin": "D7"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_pinwheel_sat": true,
+            "band_spiral_sat": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "driver": "is31fl3731",
+        "max_brightness": 170
     },
     "rgblight": {
         "saturation_steps": 8,
diff --git a/keyboards/inett_studio/sqx/universal/universal.c b/keyboards/inett_studio/sqx/universal/universal.c
index 3ba42e99951..519df575055 100644
--- a/keyboards/inett_studio/sqx/universal/universal.c
+++ b/keyboards/inett_studio/sqx/universal/universal.c
@@ -20,7 +20,7 @@
 #include "universal.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/ingenieurrr/config.h b/keyboards/ingenieurrr/config.h
new file mode 100644
index 00000000000..ea710de4a9e
--- /dev/null
+++ b/keyboards/ingenieurrr/config.h
@@ -0,0 +1,10 @@
+// Copyright 2023 contact@vwolf.be
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_PWM_DRIVER PWMD4
+#define WS2812_PWM_CHANNEL 4
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
+#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_TARGET_PERIOD 800000
diff --git a/keyboards/ingenieurrr/halconf.h b/keyboards/ingenieurrr/halconf.h
new file mode 100644
index 00000000000..6c00f380849
--- /dev/null
+++ b/keyboards/ingenieurrr/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/ingenieurrr/info.json b/keyboards/ingenieurrr/info.json
new file mode 100644
index 00000000000..f560e205cbe
--- /dev/null
+++ b/keyboards/ingenieurrr/info.json
@@ -0,0 +1,170 @@
+{
+    "manufacturer": "Sedelky",
+    "keyboard_name": "ingenieurrr",
+    "maintainer": "Sedelky",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "D8", "D9", "D10", "D11", "D12", "D13",  "C6", "C7", "C8", "C9", "C1", "C13", "C14", "C11", "A14", "A13", "A10", "A8"],
+        "rows": ["B1", "E8", "E9", "E12", "E13", "E14"]
+    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "processor": "STM32F407",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
+        },
+        "driver": "ws2812",
+        "led_count": 20,
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x496E",
+        "vid": "0x5093"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "D15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+		        {"matrix": [0, 15], "x": 16.5, "y": 0},
+		        {"matrix": [0, 16], "x": 17.5, "y": 0},
+		        {"matrix": [0, 17], "x": 18.5, "y": 0},
+		        {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x":   0, "y": 1.5},
+                {"matrix": [1, 1], "x":   1, "y": 1.5},
+                {"matrix": [1, 2], "x":   2, "y": 1.5},
+                {"matrix": [1, 3], "x":   3, "y": 1.5},
+                {"matrix": [1, 4], "x":   4, "y": 1.5},
+                {"matrix": [1, 5], "x":   5, "y": 1.5},
+                {"matrix": [1, 6], "x":   6, "y": 1.5},
+                {"matrix": [1, 7], "x":   7, "y": 1.5},
+                {"matrix": [1, 8], "x":   8, "y": 1.5},
+                {"matrix": [1, 9], "x":   9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+		        {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+		        {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+		        {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+		        {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+                
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 14, "y": 2.5, "w": 1.25, "h": 2},
+		        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+		        {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+		        {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+		        {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+		        {"matrix": [2, 18], "x": 19.5, "y": 2.5, "h": 2},
+
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.5},
+		    	{"matrix": [3, 15], "x": 16.25, "y": 3.5},
+		        {"matrix": [3, 16], "x": 17.25, "y": 3.5},
+		        {"matrix": [3, 17], "x": 18.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+		        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+		        {"matrix": [4, 14], "x": 14.25, "y": 4.75},
+		        {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+		        {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+		        {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+		        {"matrix": [4, 18], "x": 19.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5},
+                {"matrix": [5, 11], "x": 11, "y": 5.5},
+                {"matrix": [5, 12], "x": 12, "y": 5.5},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.75},
+		        {"matrix": [5, 15], "x": 15.25, "y": 5.75},
+		        {"matrix": [5, 16], "x": 16.5, "y": 5.5, "w": 2},
+		        {"matrix": [5, 17], "x": 18.5, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/ingenieurrr/keymaps/default/keymap.c b/keyboards/ingenieurrr/keymaps/default/keymap.c
new file mode 100644
index 00000000000..dbf9da49175
--- /dev/null
+++ b/keyboards/ingenieurrr/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2023 contact@vwolf.be
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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,     RGB_MOD,    RGB_TOG,    RGB_VAI,    RGB_VAD,    RGB_SPI,
+        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_NUM,     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_ENT,     KC_DEL,     KC_P7,      KC_P8,      KC_P9,      KC_PPLS,
+        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_END,     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(
+        _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,                                        _______,                                        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______
+    )
+};
\ No newline at end of file
diff --git a/keyboards/ingenieurrr/keymaps/via/keymap.c b/keyboards/ingenieurrr/keymaps/via/keymap.c
new file mode 100644
index 00000000000..8a6218fc548
--- /dev/null
+++ b/keyboards/ingenieurrr/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 contact@vwolf.be
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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,     RGB_MOD,    RGB_TOG,    RGB_VAI,    RGB_VAD,    RGB_SPI,
+        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_NUM,     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_ENT,     KC_DEL,     KC_P7,      KC_P8,      KC_P9,      KC_PPLS,
+        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_END,     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(
+        _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,                                        _______,                                        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______
+    )
+};
\ No newline at end of file
diff --git a/keyboards/redox_w/keymaps/via/rules.mk b/keyboards/ingenieurrr/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/redox_w/keymaps/via/rules.mk
rename to keyboards/ingenieurrr/keymaps/via/rules.mk
diff --git a/keyboards/ingenieurrr/keymaps/vial/config.h b/keyboards/ingenieurrr/keymaps/vial/config.h
new file mode 100644
index 00000000000..52f002586d5
--- /dev/null
+++ b/keyboards/ingenieurrr/keymaps/vial/config.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0xB9, 0x11, 0x8C, 0xCE, 0xD1, 0x7E, 0x38, 0xAD}
+
+// Press Escape and Enter to unlock security-sensitive settings 
+#define VIAL_UNLOCK_COMBO_ROWS { 3, 8 }
+#define VIAL_UNLOCK_COMBO_COLS { 2, 7 }
+
+#define BACKLIGHT_BREATHING
diff --git a/keyboards/ingenieurrr/keymaps/vial/keymap.c b/keyboards/ingenieurrr/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..404d92a47e1
--- /dev/null
+++ b/keyboards/ingenieurrr/keymaps/vial/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 contact@vwolf.be
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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,     RGB_MOD,    RGB_TOG,    RGB_VAI,    RGB_VAD,    RGB_SPI,
+        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_NUM,     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_ENT,     KC_DEL,     KC_P7,      KC_P8,      KC_P9,      KC_PPLS,
+        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_END,     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(
+        _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,
+        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,    _______,    _______,     _______,
+        _______,    _______,    _______,                                        _______,                                        _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______    )
+};
\ No newline at end of file
diff --git a/keyboards/ingenieurrr/keymaps/vial/rules.mk b/keyboards/ingenieurrr/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..2ae0f8e3a04
--- /dev/null
+++ b/keyboards/ingenieurrr/keymaps/vial/rules.mk
@@ -0,0 +1,9 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+
+//VIALRGB_ENABLE = yes
+//BACKLIGHT_ENABLE = yes
+//RGB_MATRIX_ENABLE = yes
+//RGB_MATRIX_DRIVER = ws2812
+
diff --git a/keyboards/ingenieurrr/keymaps/vial/vial.json b/keyboards/ingenieurrr/keymaps/vial/vial.json
new file mode 100644
index 00000000000..5834423c1fa
--- /dev/null
+++ b/keyboards/ingenieurrr/keymaps/vial/vial.json
@@ -0,0 +1,256 @@
+{
+    "productId": "0x496E",
+    "vendorId": "0x5053",
+    "name": "ingenieurrr",
+    "lighting": "qmk_rgblight",
+    "matrix":{
+        "rows":6,
+        "cols":18
+    },
+    "layouts":{
+        "labels":[
+            "Split Backspace",
+            "ISO Enter",
+            "Split Left Shift",
+            "Full Right Shift",
+            [
+                "Bottom Row",
+                "WKL",
+                "Blockerless",
+                "MX HHKB",
+                "True HHKB"
+            ]
+        ],
+        "keymap":[
+            [
+                {
+                    "c":"#777777"
+                },
+                "0,0",
+                {
+                    "c":"#cccccc"
+                },
+                {
+                    "x":1
+                },
+                "0,1",
+                "0,2",
+                "0,3",
+                "0,4",
+                {
+                    "x":0.5
+                },
+                "0,6",
+                "0,7",
+                "0,8",
+                "0,9",
+                {
+                    "x":0.5
+                },
+                "0,10",
+                "0,11",
+                "0,12",
+                "0,13",
+                {
+                    "x":0.5
+                },
+                "0,14",
+                "0,15",
+                "0,16",
+                "0,17",
+                "0,18"             
+                
+            ],
+            [   
+                {
+                    "y":0.5
+                },
+                "1,0",
+                {
+                    "c":"#cccccc"
+                },
+                "1,1",
+                "1,2",
+                "1,3",
+                "1,4",
+                "1,5",
+                "1,6",
+                "1,7",
+                "1,8",
+                "1,9",
+                "1,10",
+                "1,11",
+                "1,12",
+                {
+
+                    "c":"#aaaaaa",
+                    "w":2
+
+                },
+                "1,13",
+                {
+                    "x":0.25
+                },
+                "1,14",
+    	        {
+    	            "x":0.25
+    	        },
+                "1,15",
+                "1,16",
+                "1,17",
+                "1,18"
+            ],
+            [
+                {
+                    "c":"#aaaaaa",
+                    "w":1.5
+                },
+                "2,0",
+                {
+                    "c":"#cccccc"
+                },
+                "2,1",
+                "2,2",
+                "2,3",
+                "2,4",
+                "2,5",
+                "2,6",
+                "2,7",
+                "2,8",
+                "2,9",
+                "2,10",
+                "2,11",
+		        "2,12",
+                {
+                    "c":"#777777",
+                    "x":0.25,
+                    "w":1.25,
+                    "h":2
+                },
+		        "2,13",
+                {
+                    "x":0.25
+                },
+                "2,14",
+                {
+                    "x":0.25
+                },
+                "2,15",
+                "2,16",
+                "2,17",
+                {
+                    "h":2
+                },
+                "2,18"
+                
+            ],
+            [
+                {
+                    "c":"#aaaaaa",
+                    "w":1.75
+                },
+                "3,0",
+                {
+                    "c":"#cccccc"
+                },
+                "3,1",
+                "3,2",
+                "3,3",
+                "3,4",
+                "3,5",
+                "3,6",
+                "3,7",
+                "3,8",
+                "3,9",
+                "3,10",
+                "3,11",
+                "3,12",
+                {
+                    "x":1.5
+                },
+                "3,14",
+                {
+                    "x":0.25
+                },
+                "3,15",
+                "3,16",
+                "3,17"
+            ],
+            [
+                {
+                    "w":1.25
+                },
+                "4,0",
+                "4,1",
+                "4,2",
+                "4,3",
+                "4,4",
+                "4,5",
+                "4,6",
+                "4,7",
+                "4,8",
+                "4,9",
+                "4,10",
+                "4,11",
+                {
+                    "w":1.75
+                },
+                "4,12",
+                {
+                    "x":0.25,
+                    "y":0.25
+                },
+                "4,13",
+                {
+                    "x":1.25,
+                    "y":-0.25
+                },
+                "4,15",
+                "4,16",
+                "4,17",
+                {
+                    "h":2
+                },
+                "4,18"
+            ],
+            [
+                {
+                    "w":1.25
+                },
+                "5,0",
+                {
+                    "w":1.25
+                },
+                "5,1",
+                {
+                    "w":1.25
+                },
+                "5,2",
+                {
+                    "w":6.25
+                },
+                "5,6",
+                "5,10",
+                "5,11",
+                "5,12",
+                {
+                    "x":0.25,
+                    "y":0.25
+                },
+                "5,13",
+                "5,14",
+                "5,15",
+                {
+                    "x":0.25,
+                    "y":-0.25
+                },
+                "5,16",
+                {
+                    "w":2
+                },
+                "5,17"
+
+            ]
+        ]
+    }
+}
diff --git a/keyboards/ingenieurrr/mcuconf.h b/keyboards/ingenieurrr/mcuconf.h
new file mode 100644
index 00000000000..0b044526b29
--- /dev/null
+++ b/keyboards/ingenieurrr/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
\ No newline at end of file
diff --git a/keyboards/ingenieurrr/readme.md b/keyboards/ingenieurrr/readme.md
new file mode 100644
index 00000000000..585311fd7d6
--- /dev/null
+++ b/keyboards/ingenieurrr/readme.md
@@ -0,0 +1,13 @@
+
+* Keyboard Maintainer: [Pascal Sedelky](https://github.com/Pascal0816)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb ingenieurrr -km default
+
+Flash to :
+
+    qmk flash -kb ingenieurrr  -km 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/ingenieurrr/rules.mk b/keyboards/ingenieurrr/rules.mk
new file mode 100644
index 00000000000..6968c523355
--- /dev/null
+++ b/keyboards/ingenieurrr/rules.mk
@@ -0,0 +1,2 @@
+# This file intentionally left blank
+
diff --git a/keyboards/ingrained/matrix.c b/keyboards/ingrained/matrix.c
index 154a275d7a0..3ba9d8dcf3b 100644
--- a/keyboards/ingrained/matrix.c
+++ b/keyboards/ingrained/matrix.c
@@ -41,9 +41,7 @@ extern i2c_status_t mcp23017_status;
 // All address pins of the mcp23017 are connected to the ground on the ferris
 // | 0  | 1  | 0  | 0  | A2 | A1 | A0 |
 // | 0  | 1  | 0  | 0  | 0  | 0  | 0  |
-#define I2C_ADDR 0b0100000
-#define I2C_ADDR_WRITE ((I2C_ADDR << 1) | I2C_WRITE)
-#define I2C_ADDR_READ ((I2C_ADDR << 1) | I2C_READ)
+#define I2C_ADDR (0b0100000<<1)
 
 // Register addresses
 // See https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library/blob/master/Adafruit_MCP23017.h
@@ -77,7 +75,7 @@ uint8_t init_mcp23017(void) {
     // This means: we will read all the bits on GPIOA
     // This means: we will write to the pins 0-4 on GPIOB (in select_rows)
     uint8_t buf[]   = {IODIRA, 0b11111111, 0b11110000};
-    mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
+    mcp23017_status = i2c_transmit(I2C_ADDR, buf, sizeof(buf), I2C_TIMEOUT);
     if (!mcp23017_status) {
         // set pull-up
         // - unused  : on  : 1
@@ -86,7 +84,7 @@ uint8_t init_mcp23017(void) {
         // This means: we will read all the bits on GPIOA
         // This means: we will write to the pins 0-4 on GPIOB (in select_rows)
         uint8_t pullup_buf[] = {GPPUA, 0b11111111, 0b11110000};
-        mcp23017_status      = i2c_transmit(I2C_ADDR_WRITE, pullup_buf, sizeof(pullup_buf), I2C_TIMEOUT);
+        mcp23017_status      = i2c_transmit(I2C_ADDR, pullup_buf, sizeof(pullup_buf), I2C_TIMEOUT);
     }
     return mcp23017_status;
 }
@@ -205,14 +203,14 @@ static matrix_row_t read_cols(uint8_t row) {
             return 0;
         } else {
             uint8_t buf[]   = {GPIOA};
-            mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
+            mcp23017_status = i2c_transmit(I2C_ADDR, buf, sizeof(buf), I2C_TIMEOUT);
             // We read all the pins on GPIOA.
             // The initial state was all ones and any depressed key at a given column for the currently selected row will have its bit flipped to zero.
             // The return value is a row as represented in the generic matrix code were the rightmost bits represent the lower columns and zeroes represent non-depressed keys while ones represent depressed keys.
             // Since the pins connected to eact columns are sequential, and counting from zero up (col 5 -> GPIOA0, col 6 -> GPIOA1 and so on), the only transformation needed is a bitwise not to swap all zeroes and ones.
             uint8_t data[] = {0};
             if (!mcp23017_status) {
-                mcp23017_status = i2c_receive(I2C_ADDR_READ, data, sizeof(data), I2C_TIMEOUT);
+                mcp23017_status = i2c_receive(I2C_ADDR, data, sizeof(data), I2C_TIMEOUT);
                 data[0]         = ~(data[0]);
             }
             return data[0];
@@ -249,7 +247,7 @@ static void select_row(uint8_t row) {
             // Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one.
             // Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus.
             uint8_t buf[]   = {GPIOB, 0xFF & ~(1 << (row - MATRIX_ROWS_PER_SIDE))};
-            mcp23017_status = i2c_transmit(I2C_ADDR_WRITE, buf, sizeof(buf), I2C_TIMEOUT);
+            mcp23017_status = i2c_transmit(I2C_ADDR, buf, sizeof(buf), I2C_TIMEOUT);
         }
     }
 }
diff --git a/keyboards/inland/kb83/config.h b/keyboards/inland/kb83/config.h
index be26cf869c9..c003d218c28 100644
--- a/keyboards/inland/kb83/config.h
+++ b/keyboards/inland/kb83/config.h
@@ -40,36 +40,3 @@
 #define I2C1_SCL_PAL_MODE 4
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
-
-#define DRIVER_1_LED_TOTAL 61
-#define DRIVER_2_LED_TOTAL 21
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + 10)
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
-
-// 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_BREATHING
-#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_RAINDROPS
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-//  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_MULTISPLASH
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 /* The maximum brightness level */
diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json
index d8e029c5faf..b4396fb630e 100644
--- a/keyboards/inland/kb83/info.json
+++ b/keyboards/inland/kb83/info.json
@@ -9,7 +9,28 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "multisplash": true
+        },
+        "driver": "snled27351",
+        "max_brightness": 200,
+        "react_on_keyup": true,
+        "sleep": true
     },
     "processor": "WB32FQ95",
     "bootloader": "wb32-dfu",
diff --git a/keyboards/inland/kb83/kb83.c b/keyboards/inland/kb83/kb83.c
index 49604b93be4..65093a3c383 100644
--- a/keyboards/inland/kb83/kb83.c
+++ b/keyboards/inland/kb83/kb83.c
@@ -18,114 +18,114 @@
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
     
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
-
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
+
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
  
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
-
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
-
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
+
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
+
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
    
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/inland/mk47/config.h b/keyboards/inland/mk47/config.h
index e5026bd0e7a..13ebb83ba6a 100644
--- a/keyboards/inland/mk47/config.h
+++ b/keyboards/inland/mk47/config.h
@@ -30,10 +30,3 @@
 /* WB32 MCU has no default definition */
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000
-
-#define RGB_MATRIX_LED_COUNT 47
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-
diff --git a/keyboards/inland/mk47/info.json b/keyboards/inland/mk47/info.json
index e647723ed8d..b6404f58b20 100644
--- a/keyboards/inland/mk47/info.json
+++ b/keyboards/inland/mk47/info.json
@@ -105,7 +105,8 @@
             { "flags": 4, "matrix": [3, 9],   "x": 183, "y": 64},
             { "flags": 4, "matrix": [3, 10],  "x": 204, "y": 64},
             { "flags": 4, "matrix": [3, 11],  "x": 224, "y": 64}
-        ]
+        ],
+        "sleep": true
     },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_planck_mit"
diff --git a/keyboards/inland/mk47/mk47.c b/keyboards/inland/mk47/mk47.c
index 5a34527c6c2..ca417af19f2 100644
--- a/keyboards/inland/mk47/mk47.c
+++ b/keyboards/inland/mk47/mk47.c
@@ -16,63 +16,63 @@
 
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
 
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {0, D_15,  E_15,  F_15},
-    {0, G_13,  H_13,  I_13},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 };
 
 #endif
diff --git a/keyboards/inland/v83p/config.h b/keyboards/inland/v83p/config.h
index c39cb6421f7..a636a7891e5 100644
--- a/keyboards/inland/v83p/config.h
+++ b/keyboards/inland/v83p/config.h
@@ -13,9 +13,6 @@
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000
 
-#define RGB_MATRIX_LED_COUNT 92
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* SPI Config for spi flash*/
 #define SPI_DRIVER SPIDQ
 #define SPI_SCK_PIN B3
@@ -24,7 +21,3 @@
 #define SPI_MOSI_PAL_MODE 5
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/inland/v83p/info.json b/keyboards/inland/v83p/info.json
index 69df93e6d00..139cfb693bf 100644
--- a/keyboards/inland/v83p/info.json
+++ b/keyboards/inland/v83p/info.json
@@ -46,7 +46,6 @@
         "driver": "snled27351",
         "max_brightness": 180,
         "animations": {
-            "solid_color": true,
             "breathing": true,
             "cycle_all": true,
             "cycle_left_right": true,
@@ -164,7 +163,9 @@
             { "flags": 2, "x": 224, "y": 32},
             { "flags": 2, "x": 224, "y": 48},
             { "flags": 2, "x": 224, "y": 64}
-        ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_ansi": {
diff --git a/keyboards/inland/v83p/v83p.c b/keyboards/inland/v83p/v83p.c
index 3cb9c06cb05..e14b082ceb8 100644
--- a/keyboards/inland/v83p/v83p.c
+++ b/keyboards/inland/v83p/v83p.c
@@ -5,114 +5,114 @@
 // clang-format off
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |   R location
  *   |   |     G location
  *   |   |     |     B location
  *   |   |     |     | */
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
 
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
 
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
 };
 #endif
 
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index 3757ca3d605..bf9ebc980f9 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -44,35 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* LED matrix driver */
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#define LED_MATRIX_LED_COUNT 76
-#define LED_MATRIX_SPLIT { 38, 38 }
-#define LED_DISABLE_WHEN_USB_SUSPENDED
-
-// LED Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
-#define ENABLE_LED_MATRIX_ALPHAS_MODS
-#define ENABLE_LED_MATRIX_BREATHING
-#define ENABLE_LED_MATRIX_BAND
-#define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#define ENABLE_LED_MATRIX_BAND_SPIRAL
-#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#define ENABLE_LED_MATRIX_DUAL_BEACON
-#if defined(LED_MATRIX_KEYREACTIVE_ENABLED)
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SPLASH
-#    define ENABLE_LED_MATRIX_MULTISPLASH
-#endif
-#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#define ENABLE_LED_MATRIX_WAVE_UP_DOWN
+#define IS31FL3731_SDB_PIN B16
 
 /* i2c (for LED matrix) */
 #define I2C1_CLOCK_SPEED 400000
diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
index 8f245d9fa3b..7660a41f56c 100644
--- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
@@ -95,11 +95,6 @@ __attribute__ ((weak)) void matrix_scan_user(void) {}
 
 
 void keyboard_pre_init_kb(void) {
-#ifdef LED_MATRIX_ENABLE
-    // Turn on LED controller
-    setPinOutput(B16);
-    writePinHigh(B16);
-#endif
     // The backlight always has to be initialized, otherwise it will stay lit
     lcd_backlight_hal_init();
 #ifdef ST7565_ENABLE
@@ -171,7 +166,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 #endif
 
 #ifdef LED_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 // The numbers in the comments are the led numbers DXX on the PCB
 /* Refer to IS31 manual for these locations
  *  driver
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index d69aeb5d0cd..d2d1e73943a 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -7,7 +7,31 @@
         "device_version": "0.0.1"
     },
     "led_matrix": {
-        "driver": "is31fl3731"
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "band": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "wave_left_right": true,
+            "wave_up_down": true
+        },
+        "driver": "is31fl3731",
+        "sleep": true,
+        "split_count": [38, 38]
     },
     "matrix_pins": {
         "cols": ["D1", "D4", "D5", "D6", "D7"],
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
deleted file mode 100644
index ec3972c0ae5..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ /dev/null
@@ -1,243 +0,0 @@
-// Nordic layout for Ergodox infinity
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "keymap_nordic.h"
-#include "keymap_german.h"
-
-enum layer_names {
-    BASE,
-    FUNCL,
-    SYMB,
-    MDIA
-};
-
-enum custom_keycodes {
-    VRSN = SAFE_RANGE,
-    RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- *
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  Esc   |   1  |   2  |   3  |   4  |   5  |  §½  |           | PRSC |   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  Tab   |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   Å    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  Caps  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   Ö  |   Ä    |
- * |--------+------+------+------+------+------|  L2  |           |  L2  |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  -   | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Ctrl |  ¨^  |  <|>  | LGui | Alt  |                                       | Ctrl |  Alt  |  ´`  |   +  | RGui |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | LEFT |RIGHT |       | DOWN | UP   |
- *                                 ,------+------+------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Del   |------|       |------|  Enter | Bkspc|
- *                                 |      |      | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-    // left hand
-    KC_ESC,   KC_1,   KC_2,   KC_3,   KC_4,  KC_5,   KC_GRV,
-    KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,  KC_T,   TG(1),
-    KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,  KC_G,
-    KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,  KC_B,   MO(2),
-    KC_LCTL,  MO(3),  KC_EQL, KC_LGUI, KC_LALT,
-                                            KC_NUM,   KC_SCRL,
-                                            KC_HOME,
-                                            KC_SPC,   KC_DEL, KC_END,
-
-    // right hand
-    KC_BSLS,  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,
-    TG(1),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,
-              KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
-    MO(2),    KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_NUBS,
-    KC_LEFT,  KC_DOWN, KC_UP, KC_RIGHT, KC_RBRC,
-    KC_RGUI,  KC_RALT,
-    KC_PGUP,
-    KC_PGDN,  KC_ENT, KC_BSPC
-),
-/* Keymap 1: Basic layer with functions
- *
- *
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F11 |           | F12  |  F6  |  F7  |  F8  |  F9  |   0  |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |  ¨   |       |     |       |                                       |      |       |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------+------+------|       |------+--------+------.
- *                                 |      |      |      |       |      |        |      |
- *                                 |      |      |------|       |------|        |      |
- *                                 |      |      |      |       |      |        |      |
- *                                 `--------------------'       `----------------------'
- */
-
-[FUNCL] = LAYOUT_ergodox(  // layer 1 : functions
-    // left hand
-    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,
-                                            _______,  _______,
-                                            _______,
-                                            _______,  _______,  _______,
-    // right hand
-    KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,
-    _______,  _______,
-    _______,
-    _______,  _______,  _______
-),
-
-/* Keymap 2: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |Animat| BLTOG|       |Toggle|Solid |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |Bright|Bright|  BL+ |       |      |Hue-  |Hue+  |
- *                                 |ness- |ness+ |------|       |------|      |      |
- *                                 |      |      |  BL- |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-   // left hand
-   _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-   _______,  DE_EXLM,  DE_AT,    DE_LCBR,  DE_RCBR,  DE_PIPE,  _______,
-   _______,  DE_HASH,  DE_DLR,   DE_LPRN,  DE_RPRN,  DE_GRV,
-   _______,  DE_PERC,  DE_CIRC,  DE_LBRC,  DE_RBRC,  DE_TILD,  _______,
-   _______,  _______,  _______,  _______,  _______,
-                                           RGB_MOD,  BL_TOGG,
-                                           BL_UP, 
-                                           RGB_VAD,  RGB_VAI,  BL_DOWN,
-   // right hand
-   KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,
-   _______,  KC_UP,    KC_7,     KC_8,     KC_9,     DE_ASTR,  _______,
-             KC_DOWN,  KC_4,     KC_5,     KC_6,     DE_PLUS,  _______,
-   _______,  DE_AMPR,  KC_1,     KC_2,     KC_3,     DE_BSLS,  _______,
-   _______,  KC_DOT,   KC_0,     DE_EQL,   _______,
-   RGB_TOG,  RGB_SLD,
-   _______,
-   _______,  RGB_HUD,  RGB_HUI
-),
-
-/* Keymap 3: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | QK_BOOT  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      | Lclk | MsUp | Rclk |      |      |           |      |      |VolDwn| Mute |VolUp |      |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | Btn4 |MsLeft|MsDown|MsRght| Btn5 |------|           |------|      | Prev | Stop | Play | Next |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |WhRght|WhDown| WhUp |WhLeft|WhClk |      |           |      |BwSrch|BwBack|BwHome|BwRefr|BwFwd |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |MsAcl0|MsAcl1|MsAcl2|                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |Brwser|Brwser|
- *                                 | Lclk | Rclk |------|       |------|Back  |Forwd |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-   QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-   _______,  _______,  KC_BTN1,  KC_MS_U,  KC_BTN2,  _______,  _______,
-   _______,  KC_BTN4,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_BTN5,
-   _______,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN3,  _______,
-   _______,  _______,  KC_ACL0,  KC_ACL1,  KC_ACL2,
-                                           _______,  _______,
-                                           _______,
-                                           KC_BTN1,  KC_BTN2,  _______,
-   // right hand
-   KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
-   _______, _______,   KC_VOLD,  KC_MUTE,  KC_VOLU,  _______,  _______,
-            _______,   KC_MPRV,  KC_MSTP,  KC_MPLY,  KC_MNXT,  _______,
-   _______, KC_WSCH,   KC_WBAK,  KC_WHOM,  KC_WREF,  KC_WFWD,  _______,
-   _______, _______,   _______,  _______,  _______,
-   _______, _______,
-   _______,
-   _______, KC_WBAK, KC_WFWD
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case VRSN:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-            }
-            return false;
-            break;
-        case RGB_SLD:
-            if (record->event.pressed) {
-#ifdef RGBLIGHT_ENABLE
-                rgblight_mode(1);
-#endif
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void){
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        default:
-            break;
-    }
-};
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
deleted file mode 100644
index 2ed52686491..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Nordic Ergodox Infinity layout
-
-QWERTY Nordic layout for ergodox infinity.
-
-Features:
-
-- Basic ISO Nordic qwerty layout.
-- Backlight control.
-- Still work in progress.
\ No newline at end of file
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/rask/README.md b/keyboards/input_club/ergodox_infinity/keymaps/rask/README.md
deleted file mode 100644
index 8a13994301d..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/rask/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# rask's Infinity ErgoDox Layout
-
-A basic ErgoDox layout that follows regular-ish QWERTY where it
-makes sense.
-
-![ErgoDox Layout](https://i.imgur.com/jYDInaY.png)
-
-## Features
-
--   Regular QWERTY alphas and symbols (apart from `[]{}\|` and shifted `/?`)
--   Regular numrow to make Fn-F-row simpler
--   CapsLock Fn1 with F-row behind it
--   Media controls and mouse controls on Fn2
--   Dedicated arrows
-
-## Building and flashing
-
-Follow the main Infinity ErgoDox guide but use the following layout:
-
-    $ sudo make ergodox_infinity:rask
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
deleted file mode 100644
index e8df522bee2..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
+++ /dev/null
@@ -1,201 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define FL1 1 // symbols
-#define FL2 2 // media keys
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   `    |   1  |   2  |   3  |   4  |   5  |  6   |           |   7  |   8  |   9  |   0  |   -  |   =  | Del    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |  [   |           |   ]  |   Y  |   U  |   I  |   O  |   P  | Bsp    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Fn1    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | Enter  |
- * |--------+------+------+------+------+------|  \   |           | Meh  |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  Up  |   '    |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Ctrl | Home | LGui | End  | LAlt |                                       | RAlt | Fn2  |  Le  |  Do  |  Ri  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | Ins  | PtSc |       | Calc  | Esc    |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Del  |       | PgUp |        |      |
- *                                 | Space| Bsp  |------|       |------| Enter  |Space |
- *                                 |      |      | Tab  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_GRV, 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_LBRC,
-        MO(FL1),KC_A,   KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_BSLS,
-        KC_LCTL,KC_HOME,KC_LGUI,KC_END,KC_LALT,
-                                        KC_INS, KC_PSCR,
-                                                        KC_DEL,
-                                        KC_SPC, KC_BSPC,KC_TAB,
-        // right hand
-             KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_DEL,
-             KC_RBRC,KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSPC,
-                     KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
-             MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,KC_DOT, KC_UP,  KC_SLSH,
-                             KC_RALT,MO(FL2),KC_LEFT,KC_DOWN,KC_RIGHT,
-             KC_CALC,        KC_ESC,
-             KC_PGUP,
-             KC_PGDN,KC_ENT, KC_SPC
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * | Esc     |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  | F10  | F11  | F12  |        |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * | Version |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      |      |      |      |      |      |           |      |      |      |      |      | PgUp |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |      |      | Home | PgDn | End  |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[FL1] = LAYOUT_ergodox(
-       // left hand
-       KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
-       VRSN,   KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-          EPRM,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_TRNS,KC_TRNS,
-       // right hand
-       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_PGUP, KC_TRNS,
-                         KC_TRNS,KC_TRNS, KC_HOME, KC_PGDN, KC_END,
-       KC_TRNS,   KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      | Prev | Play | Next |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | CapsLk |      |MsLeft|MsDown|MsRght|      |------|           |------|      | VolD | Mute | VolU |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Stop |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |EEPROM| Menu |      | Lclk | Rclk |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       | Reset|      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[FL2] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_CAPS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       EPRM,    KC_APP,  KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       QK_BOOT, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
deleted file mode 100644
index 0fb88de421f..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
- * Copyright 2021 Rob Hilgefort <@rjhilgefort>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-
-enum custom_layers {
-    BASEMAC, // Base Mac Layer
-    BASELNX, // Base Linux Layer
-    SYMB,    // Symbols Layer
-    MANMAC,  // Media Numbers Mac Layer
-    MANLNX,  // Media Numbers Linux Layer
-    EXA,     // Extra Layer
-};
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-};
-
-#define ALT_ESC ALT_T(KC_ESC)
-#define CTL_ESC CTL_T(KC_ESC)
-#define GUI_ESC GUI_T(KC_ESC)
-#define HYPER LGUI(LSFT(KC_LALT))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Keymap 0: Base (Mac)
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Ct/Esc |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |Ctrl/;|   '    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Shift  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |Ctrl//| Enter  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |Shift | Tab  | ↑ L3 |Alt/Ec|                                       | ↑ L2 |Hyper |   '  |Enter |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,---------------.
- *                                        |      |      |       |      |        |
- *                                 ,------+------+------|       |------+--------+------.
- *                                 |      |      |      |       |      |        |      |
- *                                 | LGui | Bksp |------|       |------|  Bksp  | Spc  |
- *                                 |      |      |      |       |      |        |      |
- *                                 `--------------------'       `----------------------'
- */
-[BASEMAC] = LAYOUT_ergodox(
-    // left hand
-    _______, _______, _______, _______,    _______, _______, _______,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,       KC_R,    KC_T,    _______,
-    CTL_ESC, KC_A,    KC_S,    KC_D,       KC_F,    KC_G,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,       KC_V,    KC_B,    _______,
-    _______, KC_LSFT, KC_TAB,  MO(MANMAC), ALT_ESC,
-                                                    _______, _______,
-                                                             _______,
-                                           KC_LGUI, KC_BSPC, _______,
-    // right hand
-    _______, _______, _______,  _______, _______, _______,        _______,
-    _______, KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,           KC_BSPC,
-             KC_H,    KC_J,     KC_K,    KC_L,    CTL_T(KC_SCLN), KC_QUOT,
-    _______, KC_N,    KC_M,     KC_COMM, KC_DOT,  CTL_T(KC_SLSH), KC_ENTER,
-                      MO(SYMB), HYPER,   KC_QUOT, KC_ENTER,       _______,
-    _______, _______,
-    _______,
-    _______, KC_BSPC, KC_SPC
-),
-
-/* Keymap 1: Base (Linux)
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Ct/Esc |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |Ctrl/;|   '    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Shift  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |Ctrl//| Enter  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |Shift | Tab  | ↑ L4 |Gui/Ec|                                       | ↑ L2 | Hyper|   '  |Enter |      |
- *   `-----------------------------------'                                      `----------------------------------'
- *                                        ,-------------.       ,---------------.
- *                                        |      |      |       |      |        |
- *                                 ,------+------+------|       |------+--------+------.
- *                                 |      |      |      |       |      |        |      |
- *                                 | Ctrl | Bksp |------|       |------|  Bksp  | Spc  |
- *                                 |      |      |      |       |      |        |      |
- *                                 `--------------------'       `----------------------'
- */
-[BASELNX] = LAYOUT_ergodox(
-    // left hand
-    _______, _______, _______, _______,    _______, _______, _______,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,       KC_R,    KC_T,    _______,
-    ALT_ESC, KC_A,    KC_S,    KC_D,       KC_F,    KC_G,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,       KC_V,    KC_B,    _______,
-    _______, KC_LSFT, KC_TAB,  MO(MANLNX), GUI_ESC,
-                                                    _______, _______,
-                                                             _______,
-                                          KC_LCTL,  KC_BSPC, _______,
-    // right hand
-    _______, _______, _______,  _______, _______, _______,        _______,
-    _______, KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,           KC_BSPC,
-             KC_H,    KC_J,     KC_K,    KC_L,    CTL_T(KC_SCLN), KC_QUOT,
-    _______, KC_N,    KC_M,     KC_COMM, KC_DOT,  CTL_T(KC_SLSH), KC_ENTER,
-                      MO(SYMB), HYPER,   KC_QUOT, KC_ENTER,       _______,
-    _______, _______,
-    _______,
-    _______, KC_BSPC, KC_SPC
-),
-
-/* Keymap 2: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |         |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   \  |   /  |   [  |   ]  |   ~  |      |           |      |   |  |   =  |   +  |   -  |   _  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   {  |   }  |   (  |   )  |   `  |------|           |------|   ←  |   ↓  |   ↑  |   →  |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   !  |   @  |   #  |   $  |   %  |      |           |      |   ^  |   &  |   *  |   (  |   )  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      | ↑ L5 |      |                                       | TRNS |      |      |      |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------+------+------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      | Del  |------|       |------| Del  |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[SYMB] = LAYOUT_ergodox(
-    // left hand
-    _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD, _______,
-    _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_GRV,
-    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
-    _______, _______, _______, MO(EXA), _______,
-                                                 _______, _______,
-                                                          _______,
-                                        _______, KC_DEL,  _______,
-    // right hand
-    _______, _______, _______, _______, _______,  _______, _______,
-    _______, KC_PIPE, KC_EQL,  KC_PLUS, KC_MINS,  KC_UNDS, _______,
-             KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______,
-    _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,  KC_RPRN, _______,
-                      KC_TRNS, _______, _______,  _______, _______,
-    _______, _______,
-    _______,
-    _______, KC_DEL,  _______
-),
-
-/* Keymap 3: Media & Numbers (MAC)
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |Scrn -| Vol+ |Scrn +|      |      |           |      |      |   7  |   8  |   9  |   *  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |VolMut|Trak ←|Ply/Ps|Trak →|      |------|           |------|      |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      | Vol- |      |      |      |           |      |      |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | TRNS |      |                                       | ↑ L5 |   0  |   .  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------+------+------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |   0  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[MANMAC] = LAYOUT_ergodox(
-    // left hand
-    _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_BRMD, KC_VOLU, KC_BRMU, _______, _______,
-    _______, KC_MUTE, KC_MRWD, KC_MPLY, KC_MFFD, _______,
-    _______, _______, _______, KC_VOLD, _______, _______, _______,
-    _______, _______, _______, KC_TRNS, _______,
-                                                 _______, _______,
-                                                          _______,
-                                        _______, _______, _______,
-    // right hand
-    _______,  _______, _______, _______, _______, _______, _______,
-    _______,  _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
-              _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
-    _______,  _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
-                       MO(EXA),    KC_0,  KC_DOT,  KC_EQL, _______,
-    _______, _______,
-    _______,
-    _______, _______, KC_0
-),
-
-/* Keymap 4: Media & Numbers (Linux)
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |Scrn -| Vol+ |Scrn +|      |      |           |      |      |   7  |   8  |   9  |   *  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |VolMut|Trak ←|Ply/Ps|Trak →|      |------|           |------|      |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      | Vol- |      |      |      |           |      |      |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | TRNS |      |                                       | ↑ L5 |   0  |   .  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------+------+------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |   0  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[MANLNX] = LAYOUT_ergodox(
-    // left hand
-    _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_BRID, KC_VOLU, KC_BRIU, _______, _______,
-    _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______,
-    _______, _______, _______, KC_VOLD, _______, _______, _______,
-    _______, _______, _______, KC_TRNS, _______,
-                                                 _______, _______,
-                                                          _______,
-                                        _______, _______, _______,
-    // right hand
-    _______,  _______, _______, _______, _______, _______, _______,
-    _______,  _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
-              _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
-    _______,  _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
-                       MO(EXA),    KC_0,  KC_DOT,  KC_EQL, _______,
-    _______, _______,
-    _______,
-    _______, _______, KC_0
-),
-
-/* Keymap 5: Extra
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        | → L0 | → L1 |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------| Home | PGDN | PGUP | End  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | TRNS |      |                                       | TRNS |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------+------+       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[EXA] = LAYOUT_ergodox(
-    // left hand
-    _______, _______,     _______,     _______, _______, _______, _______,
-    _______, DF(BASEMAC), DF(BASELNX), _______, _______, _______, _______,
-    _______, _______,     _______,     _______, _______, _______,
-    _______, _______,     _______,     _______, _______, _______, _______,
-    _______, _______,     _______,     KC_TRNS, _______,
-                                                         _______, _______,
-                                                                  _______,
-                                                _______, _______, _______,
-    // right hand
-    _______,  _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______,
-              KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______,
-                       KC_TRNS, _______, _______, _______, _______,
-    _______, _______,
-    _______,
-    _______, _______, _______
-),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-            ergodox_right_led_3_on();
-            break;
-        case 5:
-            ergodox_right_led_1_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
-
-/*
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------+------+       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-/*
- * [EXTRA] = LAYOUT_ergodox(
- *     // left hand
- *     _______, _______, _______, _______, _______, _______, _______,
- *     _______, _______, _______, _______, _______, _______, _______,
- *     _______, _______, _______, _______, _______, _______,
- *     _______, _______, _______, _______, _______, _______, _______,
- *     _______, _______, _______, _______, _______,
- *                                                  _______, _______,
- *                                                           _______,
- *                                         _______, _______, _______,
- *     // right hand
- *     _______,  _______, _______, _______, _______, _______, _______,
- *     _______,  _______, _______, _______, _______, _______, _______,
- *               _______, _______, _______, _______, _______, _______,
- *     _______,  _______, _______, _______, _______, _______, _______,
- *     _______,  _______, _______, _______, _______, _______, _______,
- *                        _______, _______, _______, _______, _______,
- *     _______, _______,
- *     _______,
- *     _______, _______, _______
- * ),
- */
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/readme.md
deleted file mode 100644
index bb141b99dcc..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/readme.md
+++ /dev/null
@@ -1,175 +0,0 @@
-# [🐦 @rjhilgefort](https://twitter.com/rjhilgefort)'s Ergodox Infinity Layout
-
-The layout is heavily inspired by my [Atreus 2](https://atreus.technomancy.us/2) and the layout I use for it. Hence, I basically treat my Ergodox Infinity like it's a 40% keyboard and have even taken off the caps of the keys that I don't make use of to further emphasize this. This allows for easy interop between my office setup (Ergodox) and my laptop setup (Atreus 2).
-
-![](https://imgur.com/rJnSjLq.jpg)
-![](https://imgur.com/8aSSGP1.jpg)
-
-## Features
-
-Here's some highlights/features of the layout.
-
--   Inspired by 40% keyboards, doesn't use keys that don't exist on those boards.
--   Ergonomic symbols layer.
--   Media and Numpad layer.
--   Planck-like extra tri-layer when holding the other two layers.
--   Planck conformability- leaves gutter keys for familiarity if coming from there.
--   Supports Mac and Linux as 1st class citizens giving each a dedicated base layer and a media layer for each that matches media keys for each OS. The Linux default layer focuses on `Ctrl` instead of `Super` and vice versa for Mac. (When you set Linux as your base layer, the Linux media layer is what you shift into. Same for the Mac layer when that's the base)
-
-## Layers
-
-#### Keymap 0: Base (Mac)
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-| Tab    |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-| Ct/Esc |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |Ctrl/;|   '    |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-| Shift  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |Ctrl//| Enter  |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |Shift | Tab  | ↑ L3 |Alt/Ec|                                       | ↑ L2 |Hyper |   '  |Enter |      |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,---------------.
-                                       |      |      |       |      |        |
-                                ,------+------+------|       |------+--------+------.
-                                |      |      |      |       |      |        |      |
-                                | LGui | Bksp |------|       |------| Bkspc  | Spc  |
-                                |      |      |      |       |      |        |      |
-                                `--------------------'       `----------------------'
-```
-
-#### Keymap 1: Base (Linux)
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-| Tab    |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-| Ct/Esc |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |Ctrl/;|   '    |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-| Shift  |   Z  |   X  |   C  |   V  |   B  |      |           | LAlt |   N  |   M  |   ,  |   .  |Ctrl//| Enter  |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |Shift | Tab  | ↑ L4 |Gui/Ec|                                       | ↑ L2 |Hyper |   '  |Enter |      |
-  `-----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,---------------.
-                                       |      |      |       |      |        |
-                                ,------+------+------|       |------+--------+------.
-                                |      |      |      |       |      |        |      |
-                                | Ctrl | Bksp |------|       |------| Bkspc  | Spc  |
-                                |      |      |      |       |      |        |      |
-                                `--------------------'       `----------------------'
-```
-
-#### Keymap 2: Symbol Layer
-
-```
-,---------------------------------------------------.           ,--------------------------------------------------.
-|         |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-|---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
-|         |   \  |   /  |   [  |   ]  |   ~  |      |           |      |   |  |   =  |   +  |   -  |   _  |        |
-|---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|         |   {  |   }  |   (  |   )  |   `  |------|           |------|   ←  |   ↓  |   ↑  |   →  |      |        |
-|---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|         |   !  |   @  |   #  |   $  |   %  |      |           |      |   ^  |   &  |   *  |   (  |   )  |        |
-`---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |       |      |      | ↑ L5 |      |                                       | TRNS |      |      |      |      |
-  `-----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------+------+------|       |------+------+------.
-                                |      |      |      |       |      |      |      |
-                                |      | Del  |------|       |------| Del  |      |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-
-#### Keymap 3: Media & Numbers (MAC)
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|        |      |Scrn -| Vol+ |Scrn +|      |      |           |      |      |   7  |   8  |   9  |   *  |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |VolMut|Trak ←|Ply/Ps|Trak →|      |------|           |------|      |   4  |   5  |   6  |   +  |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |      |      | Vol- |      |      |      |           |      |      |   1  |   2  |   3  |   \  |        |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |      |      | TRNS |      |                                       | ↑ L5 |      |   .  |   =  |      |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------+------+------|       |------+------+------.
-                                |      |      |      |       |      |      |      |
-                                |      |      |------|       |------|      |   0  |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-
-#### Keymap 4: Media & Numbers (Linux)
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|        |      |Scrn -| Vol+ |Scrn +|      |      |           |      |      |   7  |   8  |   9  |   *  |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |VolMut|Trak ←|Ply/Ps|Trak →|      |------|           |------|      |   4  |   5  |   6  |   +  |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |      |      | Vol- |      |      |      |           |      |      |   1  |   2  |   3  |   \  |        |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |      |      | TRNS |      |                                       | ↑ L5 |      |   .  |   =  |      |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------+------+------|       |------+------+------.
-                                |      |      |      |       |      |      |      |
-                                |      |      |------|       |------|      |   0  |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-
-#### Keymap 5: Extra
-
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|        | → L0 | → L1 |      |      |      |      |           |      |      |      |      |      |      |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |      |      |      |      |      |------|           |------| Home | PGDN | PGUP | End  |      |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |      |      | TRNS |      |                                       | TRNS |      |      |      |      |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------|------+------+       |------+------+------.
-                                |      |      |      |       |      |      |      |
-                                |      |      |------|       |------|      |      |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
-
-## TODO
-
-1. Get the LEDs to work: https://www.reddit.com/r/ergodox/comments/80hgxj/infinity_lcd_configuration_in_qmk/duxklzh/
-
-## Building And Flashing
-
-See the default building and flashing documentation for the Ergodox Infinity, I don't do anything beyond that.
-
-## FAQs
-
-> What's the case you have for your Ergodox Infinity?
-
-It's a case made by Datamancer and I got it [on Drop.com as a group buy](https://drop.com/buy/datamancer-infinity-ergodox-hardwood-case).
-
-> Why don't you just use the other keys?
-
-I bounce between my Ergodox, Atreus 2, CorneKBD, and a couple of Planck keyboards. If I start using keys on my Ergo that I can't on my 40% boards, then my layouts start to diverge and muscle memory is diminished. I like to constrain my bigger boards to my smaller for continuity.
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
deleted file mode 100644
index 1e248742ee1..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Truly Ergonomic like layout
-
-A basic ErgoDox layout that imitates the Truly Ergonomic keyboard layout.
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
deleted file mode 100644
index bbc24ea27f9..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE  0 // default layer
-#define EXTRA 1 // extra
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  ESC   |   1  |   2  |   3  |   4  |   5  | LGui |           | LGui |   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |  Del |           | Tab  |   Y  |   U  |   I  |   O  |   P  |   =    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | LShift |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | RShift |
- * |--------+------+------+------+------+------| Back |           | Back |------+------+------+------+------+--------|
- * | LCtrl  |   Z  |   X  |   C  |   V  |   B  | space|           | space|   N  |   M  |   ,  |   .  |   '  | RCtrl  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | LAlt | Home | PgUp | PgDn |  End |                                       | Left |  Up  | Down | Rigth| RAlt |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.        ,-------------.
- *                                        |  ~   |   |  |        |   [  |   ]  |
- *                                 ,------|------|------|        |------+------+------.
- *                                 |      |      |  L1  |        | Grv  |      |      |
- *                                 | Space|Enter |------|        |------| Enter|Space |
- *                                 |      |      |  /   |        |   \  |      |      |
- *                                 `--------------------'        `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,    KC_1,      KC_2,      KC_3,      KC_4,     KC_5,   KC_LGUI,
-        KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,     KC_T,   KC_DEL,
-        KC_LSFT,   KC_A,      KC_S,      KC_D,      KC_F,     KC_G,
-        KC_LCTL,   KC_Z,      KC_X,      KC_C,      KC_V,     KC_B,   KC_BSPC,
-        KC_LALT,   KC_HOME,   KC_PGUP,   KC_PGDN,   KC_END,
-                                                    KC_TILD,  KC_PIPE,
-                                                              TG(EXTRA),
-                                         KC_SPC,    KC_ENT,   KC_SLSH,
-        // right hand
-             KC_LGUI,   KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      KC_MINS,
-             KC_TAB,    KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_EQL,
-                        KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_RSFT,
-             KC_BSPC,   KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_QUOT,   KC_RCTL,
-                                   KC_LEFT,   KC_UP,     KC_DOWN,   KC_RGHT,   KC_RALT,
-             KC_LBRC,   KC_RBRC,
-             KC_GRV,
-             KC_BSLS,   KC_ENT,    KC_SPC
-    ),
-/* Keymap 1: Extra Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |         |  F1  |  F2  |  F3  |  F4  |  F5  |      |           | PSCR |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  Caps   |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |   0  |   ,  |   .  |   =  |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |VolUp |VolDn |       | Prev | Next |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       | Stop |Bright|Bright|
- *                                 | Mute |Pause |------|       |------|ness- |ness+ |
- *                                 |      |      |      |       | Play |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[EXTRA] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_CAPS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_VOLU,KC_VOLD,
-                                               KC_TRNS,
-                               KC_MUTE,KC_PAUS,KC_TRNS,
-       // right hand
-       KC_PSCR, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_0,   KC_COMM, KC_DOT,  KC_EQL,  KC_TRNS,
-       KC_MPRV, KC_MNXT,
-       KC_STOP,
-       KC_MPLY, RGB_VAD, RGB_VAI
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/input_club/infinity60/keymaps/depariel/keymap.c b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
deleted file mode 100755
index 22ac4fa5fa9..00000000000
--- a/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: Default Layer
-     * ,-----------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| Bksp|
-     * |-----------------------------------------------------------|
-     * |Contro|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter   |
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn2|
-     * |-----------------------------------------------------------'
-     * |Fn2 |Gui |Alt |         Space           |RAlt|Prv|PlPs|Next|
-     * `-----------------------------------------------------------'
-     */
-    [0] = 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_BSLS,  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_BSPC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, LT(5, KC_ENT),
-        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, MO(4),
-        MO(4),   KC_LGUI, KC_LALT,               LT(3, KC_SPC),                 KC_RALT, KC_MPRV, KC_MPLY, KC_MNXT),
-
-    /* Layer 1: "Toggle" off SpaceFn for League of Legends
-     */
-    [1] = 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_BSLS,  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_BSPC,
-        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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(4),
-        MO(4),   KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_MPRV, KC_MPLY, KC_MNXT),
-           
-    /* Layer 2: "Toggle" off SpaceFn for MapleRoyals
-     */
-    [2] = 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_BSLS,  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_BSPC,
-        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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_LSFT,
-        MO(4),   KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
-
-    /* Layer 3: FN layer 1
-     */ 
-    [3] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_NO,           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_NO,   KC_NO,
-        KC_NO,           KC_BTN1, KC_MS_U, KC_BTN2, LALT(KC_F4),    KC_HOME, KC_PGUP, KC_PSCR, KC_SCRL, KC_UP,   KC_NO,   KC_LPRN, KC_RPRN, KC_DEL,
-        MO(6),           KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,          KC_END,  KC_PGDN, KC_TILD, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,
-        LGUI(KC_SPC),    KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_CALC, KC_MENU, KC_TRNS, TG(4),
-        KC_TRNS,         KC_TRNS, KC_TRNS,                       LT(3, KC_SPC),                KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU),
-    
-    /* Layer 4: FN layer 2
-     */ 
-    [4] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PMNS, KC_PPLS, KC_PSLS, TG(2),
-        KC_CAPS, KC_NO,   KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_BSPC,
-        KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P4,   KC_P5,   KC_P6,   KC_PENT,
-        KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_RSFT, MO(4),
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_P0,   KC_PDOT, KC_NO,   TG(1)),
-    
-    /* Layer 5: FN layer 3
-     */ 
-    [5] = LAYOUT_60_ansi_split_bs_rshift(
-        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_TAB , KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_NO,            KC_TRNS,
-        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F17,  KC_F18,  KC_F19,  KC_F20,  LT(5, KC_ENT),
-        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_RALT, KC_NO,   KC_NO,  KC_NO),
-    
-    /* Layer 6: FN layer 4
-     */ 
-    [6] = LAYOUT_60_ansi_split_bs_rshift(
-        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,
-        LCTL(LSFT(KC_TAB)),    KC_NO,            LGUI(KC_UP),    KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        MO(6),                 LGUI(KC_LEFT),    LGUI(KC_DOWN),  LGUI(KC_RGHT),    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_TRNS,               KC_NO,            KC_NO,          KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,
-        KC_TRNS,               KC_TRNS,          KC_TRNS,                   KC_TRNS,                 KC_TRNS, KC_NO,   KC_NO,   KC_NO),
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-};
diff --git a/keyboards/input_club/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h
index 293b192d602..b6f28a017e0 100644
--- a/keyboards/input_club/infinity60/led/config.h
+++ b/keyboards/input_club/infinity60/led/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define LED_MATRIX_LED_COUNT 63
-
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 
 #define I2C1_CLOCK_SPEED 400000
diff --git a/keyboards/input_club/infinity60/led/led.c b/keyboards/input_club/infinity60/led/led.c
index a6a63e202df..e54f30d7b4b 100644
--- a/keyboards/input_club/infinity60/led/led.c
+++ b/keyboards/input_club/infinity60/led/led.c
@@ -4,7 +4,7 @@
 #include "quantum.h"
 
 #ifdef LED_MATRIX_ENABLE
-const is31fl3731_led_t g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *  driver
  *  |   LED address
diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h
index c188038a824..e46ede7b7b7 100644
--- a/keyboards/input_club/k_type/config.h
+++ b/keyboards/input_club/k_type/config.h
@@ -33,80 +33,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#ifdef RGB_MATRIX_ENABLE
-// 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 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
-
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-
 // i2c_master defines
-#    define I2C_COUNT 2
-#    define I2C1_CLOCK_SPEED 400000
-
-#    define I2C1_SCL_PIN B0 // A2 on pinout = B0
-#    define I2C1_SDA_PIN B1 // A2 on pinout = B1
-#    define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
-#    define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2
-
-#    define USE_I2C2
-#    define I2C2_SCL_PIN C10 // A2 on pinout = C10
-#    define I2C2_SDA_PIN C11 // A2 on pinout = C11
-#    define I2C2_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
-#    define I2C2_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2
-
-#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define IS31FL3733_DRIVER_COUNT 2
-#    define IS31FL3733_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#    define DRIVER_1_LED_TOTAL 64
-#    define DRIVER_2_LED_TOTAL 55
-#    define RGB_MATRIX_LED_COUNT IS31FL3733_LED_COUNT
-#endif
+#define I2C_COUNT 2
+#define I2C1_CLOCK_SPEED 400000
+
+#define I2C1_SCL_PIN B0 // A2 on pinout = B0
+#define I2C1_SDA_PIN B1 // A2 on pinout = B1
+#define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
+#define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2
+
+#define USE_I2C2
+#define I2C2_SCL_PIN C10 // A2 on pinout = C10
+#define I2C2_SDA_PIN C11 // A2 on pinout = C11
+#define I2C2_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
+#define I2C2_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2
+
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_SDB_PIN B16
diff --git a/keyboards/input_club/k_type/i2c_master.c b/keyboards/input_club/k_type/i2c_master.c
index af34d55ef6a..e25ae2ef6f1 100644
--- a/keyboards/input_club/k_type/i2c_master.c
+++ b/keyboards/input_club/k_type/i2c_master.c
@@ -114,7 +114,7 @@ i2c_status_t i2c_receive(uint8_t index, uint8_t address, uint8_t* data, uint16_t
     return chibios_to_qmk(&status);
 }
 
-i2c_status_t i2c_writeReg(uint8_t index, uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
+i2c_status_t i2c_write_register(uint8_t index, uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
     if(index >= I2C_COUNT) {
         return I2C_STATUS_ERROR;
     }
@@ -131,7 +131,7 @@ i2c_status_t i2c_writeReg(uint8_t index, uint8_t devaddr, uint8_t regaddr, const
     return chibios_to_qmk(&status);
 }
 
-i2c_status_t i2c_readReg(uint8_t index, uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
+i2c_status_t i2c_read_register(uint8_t index, uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
     if(index >= I2C_COUNT) {
         return I2C_STATUS_ERROR;
     }
diff --git a/keyboards/input_club/k_type/i2c_master.h b/keyboards/input_club/k_type/i2c_master.h
index db4f12e43c4..aa6ffe48b25 100644
--- a/keyboards/input_club/k_type/i2c_master.h
+++ b/keyboards/input_club/k_type/i2c_master.h
@@ -123,6 +123,6 @@ void         i2c_init(I2CDriver *driver, ioline_t scl_pin, ioline_t sda_pin);
 i2c_status_t i2c_start(uint8_t index, uint8_t address);
 i2c_status_t i2c_transmit(uint8_t index, uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout);
 i2c_status_t i2c_receive(uint8_t index, uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_writeReg(uint8_t index, uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_readReg(uint8_t index, uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_write_register(uint8_t index, uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_read_register(uint8_t index, uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
 void         i2c_stop(uint8_t index);
diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json
index 7279c8a9335..17076a82d8f 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
@@ -9,6 +9,51 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "custom"
     },
     "matrix_pins": {
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c
index e471cf0b719..9e1e6b57f76 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.c
+++ b/keyboards/input_club/k_type/is31fl3733-dual.c
@@ -18,6 +18,7 @@
 
 #include "is31fl3733-dual.h"
 #include "i2c_master.h"
+#include "gpio.h"
 #include "wait.h"
 
 #define IS31FL3733_PWM_REGISTER_COUNT 192
@@ -60,130 +61,128 @@
 #    define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE
 #endif
 
-// Transfer buffer for TWITransmitData()
-uint8_t g_twi_transfer_buffer[20];
+const uint8_t i2c_addresses[IS31FL3733_DRIVER_COUNT] = {
+    IS31FL3733_I2C_ADDRESS_1,
+#ifdef IS31FL3733_I2C_ADDRESS_2
+    IS31FL3733_I2C_ADDRESS_2,
+#endif
+};
+
+const uint8_t driver_sync[IS31FL3733_DRIVER_COUNT] = {
+    IS31FL3733_SYNC_1,
+#ifdef IS31FL3733_I2C_ADDRESS_2
+    IS31FL3733_SYNC_2,
+#endif
+};
 
 // These buffers match the IS31FL3733 PWM registers.
-// The control buffers match the PG0 LED On/Off registers.
+// The control buffers match the page 0 LED On/Off registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 // We could optimize this and take out the unused registers from these
 // buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
-uint8_t g_pwm_buffer[IS31FL3733_DRIVER_COUNT][IS31FL3733_PWM_REGISTER_COUNT];
-bool    g_pwm_buffer_update_required[IS31FL3733_DRIVER_COUNT] = {false};
-
-uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][IS31FL3733_LED_CONTROL_REGISTER_COUNT] = {0};
-bool    g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT]                        = {false};
-
-bool is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data) {
-    // If the transaction fails function returns false.
-    g_twi_transfer_buffer[0] = reg;
-    g_twi_transfer_buffer[1] = data;
-
+typedef struct is31fl3733_driver_t {
+    uint8_t pwm_buffer[IS31FL3733_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3733_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3733_driver_t;
+
+is31fl3733_driver_t driver_buffers[IS31FL3733_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3733_write_register(uint8_t bus, uint8_t index, uint8_t reg, uint8_t data) {
 #if IS31FL3733_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-        if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
-            return false;
-        }
+        if (i2c_write_register(bus, i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 2, IS31FL3733_I2C_TIMEOUT) != 0) {
-        return false;
-    }
+    i2c_write_register(bus, i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT);
 #endif
-    return true;
 }
 
-bool is31fl3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffer) {
-    // Assumes PG1 is already selected.
-    // If any of the transactions fails function returns false.
+void is31fl3733_select_page(uint8_t bus, uint8_t index, uint8_t page) {
+    is31fl3733_write_register(bus, index, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3733_write_register(bus, index, IS31FL3733_REG_COMMAND, page);
+}
+
+void is31fl3733_write_pwm_buffer(uint8_t bus, uint8_t index) {
+    // Assumes page 1 is already selected.
     // Transmit PWM registers in 12 transfers of 16 bytes.
-    // g_twi_transfer_buffer[] is 20 bytes
 
     // Iterate over the pwm_buffer contents at 16 byte intervals.
-    for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) {
-        g_twi_transfer_buffer[0] = i;
-        // Copy the data from i to i+15.
-        // Device will auto-increment register for data after the first byte
-        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
-        for (int j = 0; j < 16; j++) {
-            g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
-        }
-
+    for (uint8_t i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) {
 #if IS31FL3733_I2C_PERSISTENCE > 0
-        for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) {
-            if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
-                return false;
-            }
+        for (uint8_t j = 0; j < IS31FL3733_I2C_PERSISTENCE; j++) {
+            if (i2c_write_register(bus, i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
 #else
-        if (i2c_transmit(index, addr << 1, g_twi_transfer_buffer, 17, IS31FL3733_I2C_TIMEOUT) != 0) {
-            return false;
-        }
+        i2c_write_register(bus, i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3733_I2C_TIMEOUT);
 #endif
     }
-    return true;
 }
 
 void is31fl3733_init_drivers(void) {
+#if defined(IS31FL3733_SDB_PIN)
+    setPinOutput(IS31FL3733_SDB_PIN);
+    writePinHigh(IS31FL3733_SDB_PIN);
+#endif
+
     i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN);
-    is31fl3733_init(0, IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_1);
+
+    is31fl3733_init(0, 0);
 #    ifdef USE_I2C2
     i2c_init(&I2CD2, I2C2_SCL_PIN, I2C2_SDA_PIN);
-    is31fl3733_init(1, IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_2);
+    is31fl3733_init(1, 1);
 #    endif
 
     for (int i = 0; i < IS31FL3733_LED_COUNT; i++) {
         is31fl3733_set_led_control_register(i, true, true, true);
     }
 
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
+    is31fl3733_update_led_control_registers(0, 0);
 #    ifdef USE_I2C2
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_2, 1);
+    is31fl3733_update_led_control_registers(1, 1);
 #    endif
 }
 
-void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync) {
+void is31fl3733_init(uint8_t bus, uint8_t index) {
     // In order to avoid the LEDs being driven with garbage data
     // in the LED driver's PWM registers, shutdown is enabled last.
     // Set up the mode and other settings, clear the PWM registers,
     // then disable software shutdown.
-    // Sync is passed so set it according to the datasheet.
 
-    // Unlock the command register.
-    is31fl3733_write_register(bus, addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_LED_CONTROL);
 
-    // Select PG0
-    is31fl3733_write_register(bus, addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
     // Turn off all LEDs.
     for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
-        is31fl3733_write_register(bus, addr, i, 0x00);
+        is31fl3733_write_register(bus, index, i, 0x00);
     }
 
-    // Unlock the command register.
-    is31fl3733_write_register(bus, addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_PWM);
 
-    // Select PG1
-    is31fl3733_write_register(bus, addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);
     // Set PWM on all LEDs to 0
     // No need to setup Breath registers to PWM as that is the default.
     for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) {
-        is31fl3733_write_register(bus, addr, i, 0x00);
+        is31fl3733_write_register(bus, index, i, 0x00);
     }
 
-    // Unlock the command register.
-    is31fl3733_write_register(bus, addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_FUNCTION);
+
+    uint8_t sync = driver_sync[index];
 
-    // Select PG3
-    is31fl3733_write_register(bus, addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_FUNCTION);
     // Set de-ghost pull-up resistors (SWx)
-    is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
+    is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP);
     // Set de-ghost pull-down resistors (CSx)
-    is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN);
+    is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN);
     // Set global current to maximum.
-    is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT);
+    is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT);
     // Disable software shutdown.
-    is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+    is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
@@ -191,16 +190,18 @@ void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync) {
 
 void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31fl3733_led_t led;
+
     if (index >= 0 && index < IS31FL3733_LED_COUNT) {
         memcpy_P(&led, (&g_is31fl3733_leds[index]), sizeof(led));
 
-        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
             return;
         }
-        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;
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
     }
 }
 
@@ -222,54 +223,49 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo
     uint8_t bit_b              = led.b % 8;
 
     if (red) {
-        g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] |= (1 << bit_r);
     } else {
-        g_led_control_registers[led.driver][control_register_r] &= ~(1 << bit_r);
+        driver_buffers[led.driver].led_control_buffer[control_register_r] &= ~(1 << bit_r);
     }
     if (green) {
-        g_led_control_registers[led.driver][control_register_g] |= (1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] |= (1 << bit_g);
     } else {
-        g_led_control_registers[led.driver][control_register_g] &= ~(1 << bit_g);
+        driver_buffers[led.driver].led_control_buffer[control_register_g] &= ~(1 << bit_g);
     }
     if (blue) {
-        g_led_control_registers[led.driver][control_register_b] |= (1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] |= (1 << bit_b);
     } else {
-        g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
+        driver_buffers[led.driver].led_control_buffer[control_register_b] &= ~(1 << bit_b);
     }
 
-    g_led_control_registers_update_required[led.driver] = true;
+    driver_buffers[led.driver].led_control_buffer_dirty = true;
 }
 
-void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG1.
-        is31fl3733_write_register(index, addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3733_write_register(index, addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_PWM);
+void is31fl3733_update_pwm_buffers(uint8_t bus, uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_PWM);
 
-        // If any of the transactions fail we risk writing dirty PG0,
-        // refresh page 0 just in case.
-        if (!is31fl3733_write_pwm_buffer(index, addr, g_pwm_buffer[index])) {
-            g_led_control_registers_update_required[index] = true;
-        }
+        is31fl3733_write_pwm_buffer(bus, index);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
     }
-    g_pwm_buffer_update_required[index] = false;
 }
 
-void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required[index]) {
-        // Firstly we need to unlock the command register and select PG0
-        is31fl3733_write_register(index, addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC);
-        is31fl3733_write_register(index, addr, IS31FL3733_REG_COMMAND, IS31FL3733_COMMAND_LED_CONTROL);
+void is31fl3733_update_led_control_registers(uint8_t bus, uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_LED_CONTROL);
+
         for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) {
-            is31fl3733_write_register(index, addr, i, g_led_control_registers[index][i]);
+            is31fl3733_write_register(bus, index, i, driver_buffers[index].led_control_buffer[i]);
         }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
     }
-    g_led_control_registers_update_required[index] = false;
 }
 
 void is31fl3733_flush(void) {
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
+    is31fl3733_update_pwm_buffers(0, 0);
 #    ifdef USE_I2C2
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_2, 1);
+    is31fl3733_update_pwm_buffers(1, 1);
 #    endif
 }
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
index 2f7d58f7e7b..be6e4f9ce95 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.h
+++ b/keyboards/input_club/k_type/is31fl3733-dual.h
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "progmem.h"
+#include "util.h"
 
 #define IS31FL3733_REG_INTERRUPT_MASK 0xF0
 #define IS31FL3733_REG_INTERRUPT_STATUS 0xF1
@@ -58,19 +59,33 @@
 #define IS31FL3733_I2C_ADDRESS_VCC_SDA 0x5E
 #define IS31FL3733_I2C_ADDRESS_VCC_VCC 0x5F
 
+#if !defined(IS31FL3733_LED_COUNT)
+#    define IS31FL3733_LED_COUNT RGB_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3733_I2C_ADDRESS_4)
+#    define IS31FL3733_DRIVER_COUNT 4
+#elif defined(IS31FL3733_I2C_ADDRESS_3)
+#    define IS31FL3733_DRIVER_COUNT 3
+#elif defined(IS31FL3733_I2C_ADDRESS_2)
+#    define IS31FL3733_DRIVER_COUNT 2
+#elif defined(IS31FL3733_I2C_ADDRESS_1)
+#    define IS31FL3733_DRIVER_COUNT 1
+#endif
+
 typedef struct is31fl3733_led_t {
     uint8_t driver : 2;
     uint8_t r;
     uint8_t g;
     uint8_t b;
-} __attribute__((packed)) is31fl3733_led_t;
+} PACKED is31fl3733_led_t;
 
 extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT];
 
 void is31fl3733_init_drivers(void);
-void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync);
-bool is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data);
-bool is31fl3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffer);
+void is31fl3733_init(uint8_t bus, uint8_t index);
+void is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data);
+void is31fl3733_select_page(uint8_t index, uint8_t addr, uint8_t page);
 
 void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void is31fl3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
@@ -81,8 +96,8 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index); // index is the driver index
-void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index);
+void is31fl3733_update_pwm_buffers(uint8_t bus, uint8_t index);
+void is31fl3733_update_led_control_registers(uint8_t bus, uint8_t index);
 
 void is31fl3733_flush(void);
 
@@ -114,206 +129,206 @@ void is31fl3733_flush(void);
 #define IS31FL3733_SYNC_MASTER 0b01
 #define IS31FL3733_SYNC_SLAVE 0b10
 
-#define A_1 0x00
-#define A_2 0x01
-#define A_3 0x02
-#define A_4 0x03
-#define A_5 0x04
-#define A_6 0x05
-#define A_7 0x06
-#define A_8 0x07
-#define A_9 0x08
-#define A_10 0x09
-#define A_11 0x0A
-#define A_12 0x0B
-#define A_13 0x0C
-#define A_14 0x0D
-#define A_15 0x0E
-#define A_16 0x0F
-
-#define B_1 0x10
-#define B_2 0x11
-#define B_3 0x12
-#define B_4 0x13
-#define B_5 0x14
-#define B_6 0x15
-#define B_7 0x16
-#define B_8 0x17
-#define B_9 0x18
-#define B_10 0x19
-#define B_11 0x1A
-#define B_12 0x1B
-#define B_13 0x1C
-#define B_14 0x1D
-#define B_15 0x1E
-#define B_16 0x1F
-
-#define C_1 0x20
-#define C_2 0x21
-#define C_3 0x22
-#define C_4 0x23
-#define C_5 0x24
-#define C_6 0x25
-#define C_7 0x26
-#define C_8 0x27
-#define C_9 0x28
-#define C_10 0x29
-#define C_11 0x2A
-#define C_12 0x2B
-#define C_13 0x2C
-#define C_14 0x2D
-#define C_15 0x2E
-#define C_16 0x2F
-
-#define D_1 0x30
-#define D_2 0x31
-#define D_3 0x32
-#define D_4 0x33
-#define D_5 0x34
-#define D_6 0x35
-#define D_7 0x36
-#define D_8 0x37
-#define D_9 0x38
-#define D_10 0x39
-#define D_11 0x3A
-#define D_12 0x3B
-#define D_13 0x3C
-#define D_14 0x3D
-#define D_15 0x3E
-#define D_16 0x3F
-
-#define E_1 0x40
-#define E_2 0x41
-#define E_3 0x42
-#define E_4 0x43
-#define E_5 0x44
-#define E_6 0x45
-#define E_7 0x46
-#define E_8 0x47
-#define E_9 0x48
-#define E_10 0x49
-#define E_11 0x4A
-#define E_12 0x4B
-#define E_13 0x4C
-#define E_14 0x4D
-#define E_15 0x4E
-#define E_16 0x4F
-
-#define F_1 0x50
-#define F_2 0x51
-#define F_3 0x52
-#define F_4 0x53
-#define F_5 0x54
-#define F_6 0x55
-#define F_7 0x56
-#define F_8 0x57
-#define F_9 0x58
-#define F_10 0x59
-#define F_11 0x5A
-#define F_12 0x5B
-#define F_13 0x5C
-#define F_14 0x5D
-#define F_15 0x5E
-#define F_16 0x5F
-
-#define G_1 0x60
-#define G_2 0x61
-#define G_3 0x62
-#define G_4 0x63
-#define G_5 0x64
-#define G_6 0x65
-#define G_7 0x66
-#define G_8 0x67
-#define G_9 0x68
-#define G_10 0x69
-#define G_11 0x6A
-#define G_12 0x6B
-#define G_13 0x6C
-#define G_14 0x6D
-#define G_15 0x6E
-#define G_16 0x6F
-
-#define H_1 0x70
-#define H_2 0x71
-#define H_3 0x72
-#define H_4 0x73
-#define H_5 0x74
-#define H_6 0x75
-#define H_7 0x76
-#define H_8 0x77
-#define H_9 0x78
-#define H_10 0x79
-#define H_11 0x7A
-#define H_12 0x7B
-#define H_13 0x7C
-#define H_14 0x7D
-#define H_15 0x7E
-#define H_16 0x7F
-
-#define I_1 0x80
-#define I_2 0x81
-#define I_3 0x82
-#define I_4 0x83
-#define I_5 0x84
-#define I_6 0x85
-#define I_7 0x86
-#define I_8 0x87
-#define I_9 0x88
-#define I_10 0x89
-#define I_11 0x8A
-#define I_12 0x8B
-#define I_13 0x8C
-#define I_14 0x8D
-#define I_15 0x8E
-#define I_16 0x8F
-
-#define J_1 0x90
-#define J_2 0x91
-#define J_3 0x92
-#define J_4 0x93
-#define J_5 0x94
-#define J_6 0x95
-#define J_7 0x96
-#define J_8 0x97
-#define J_9 0x98
-#define J_10 0x99
-#define J_11 0x9A
-#define J_12 0x9B
-#define J_13 0x9C
-#define J_14 0x9D
-#define J_15 0x9E
-#define J_16 0x9F
-
-#define K_1 0xA0
-#define K_2 0xA1
-#define K_3 0xA2
-#define K_4 0xA3
-#define K_5 0xA4
-#define K_6 0xA5
-#define K_7 0xA6
-#define K_8 0xA7
-#define K_9 0xA8
-#define K_10 0xA9
-#define K_11 0xAA
-#define K_12 0xAB
-#define K_13 0xAC
-#define K_14 0xAD
-#define K_15 0xAE
-#define K_16 0xAF
-
-#define L_1 0xB0
-#define L_2 0xB1
-#define L_3 0xB2
-#define L_4 0xB3
-#define L_5 0xB4
-#define L_6 0xB5
-#define L_7 0xB6
-#define L_8 0xB7
-#define L_9 0xB8
-#define L_10 0xB9
-#define L_11 0xBA
-#define L_12 0xBB
-#define L_13 0xBC
-#define L_14 0xBD
-#define L_15 0xBE
-#define L_16 0xBF
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
+
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x16
+#define SW2_CS8 0x17
+#define SW2_CS9 0x18
+#define SW2_CS10 0x19
+#define SW2_CS11 0x1A
+#define SW2_CS12 0x1B
+#define SW2_CS13 0x1C
+#define SW2_CS14 0x1D
+#define SW2_CS15 0x1E
+#define SW2_CS16 0x1F
+
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x26
+#define SW3_CS8 0x27
+#define SW3_CS9 0x28
+#define SW3_CS10 0x29
+#define SW3_CS11 0x2A
+#define SW3_CS12 0x2B
+#define SW3_CS13 0x2C
+#define SW3_CS14 0x2D
+#define SW3_CS15 0x2E
+#define SW3_CS16 0x2F
+
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x36
+#define SW4_CS8 0x37
+#define SW4_CS9 0x38
+#define SW4_CS10 0x39
+#define SW4_CS11 0x3A
+#define SW4_CS12 0x3B
+#define SW4_CS13 0x3C
+#define SW4_CS14 0x3D
+#define SW4_CS15 0x3E
+#define SW4_CS16 0x3F
+
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x46
+#define SW5_CS8 0x47
+#define SW5_CS9 0x48
+#define SW5_CS10 0x49
+#define SW5_CS11 0x4A
+#define SW5_CS12 0x4B
+#define SW5_CS13 0x4C
+#define SW5_CS14 0x4D
+#define SW5_CS15 0x4E
+#define SW5_CS16 0x4F
+
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x56
+#define SW6_CS8 0x57
+#define SW6_CS9 0x58
+#define SW6_CS10 0x59
+#define SW6_CS11 0x5A
+#define SW6_CS12 0x5B
+#define SW6_CS13 0x5C
+#define SW6_CS14 0x5D
+#define SW6_CS15 0x5E
+#define SW6_CS16 0x5F
+
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x66
+#define SW7_CS8 0x67
+#define SW7_CS9 0x68
+#define SW7_CS10 0x69
+#define SW7_CS11 0x6A
+#define SW7_CS12 0x6B
+#define SW7_CS13 0x6C
+#define SW7_CS14 0x6D
+#define SW7_CS15 0x6E
+#define SW7_CS16 0x6F
+
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x76
+#define SW8_CS8 0x77
+#define SW8_CS9 0x78
+#define SW8_CS10 0x79
+#define SW8_CS11 0x7A
+#define SW8_CS12 0x7B
+#define SW8_CS13 0x7C
+#define SW8_CS14 0x7D
+#define SW8_CS15 0x7E
+#define SW8_CS16 0x7F
+
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x86
+#define SW9_CS8 0x87
+#define SW9_CS9 0x88
+#define SW9_CS10 0x89
+#define SW9_CS11 0x8A
+#define SW9_CS12 0x8B
+#define SW9_CS13 0x8C
+#define SW9_CS14 0x8D
+#define SW9_CS15 0x8E
+#define SW9_CS16 0x8F
+
+#define SW10_CS1 0x90
+#define SW10_CS2 0x91
+#define SW10_CS3 0x92
+#define SW10_CS4 0x93
+#define SW10_CS5 0x94
+#define SW10_CS6 0x95
+#define SW10_CS7 0x96
+#define SW10_CS8 0x97
+#define SW10_CS9 0x98
+#define SW10_CS10 0x99
+#define SW10_CS11 0x9A
+#define SW10_CS12 0x9B
+#define SW10_CS13 0x9C
+#define SW10_CS14 0x9D
+#define SW10_CS15 0x9E
+#define SW10_CS16 0x9F
+
+#define SW11_CS1 0xA0
+#define SW11_CS2 0xA1
+#define SW11_CS3 0xA2
+#define SW11_CS4 0xA3
+#define SW11_CS5 0xA4
+#define SW11_CS6 0xA5
+#define SW11_CS7 0xA6
+#define SW11_CS8 0xA7
+#define SW11_CS9 0xA8
+#define SW11_CS10 0xA9
+#define SW11_CS11 0xAA
+#define SW11_CS12 0xAB
+#define SW11_CS13 0xAC
+#define SW11_CS14 0xAD
+#define SW11_CS15 0xAE
+#define SW11_CS16 0xAF
+
+#define SW12_CS1 0xB0
+#define SW12_CS2 0xB1
+#define SW12_CS3 0xB2
+#define SW12_CS4 0xB3
+#define SW12_CS5 0xB4
+#define SW12_CS6 0xB5
+#define SW12_CS7 0xB6
+#define SW12_CS8 0xB7
+#define SW12_CS9 0xB8
+#define SW12_CS10 0xB9
+#define SW12_CS11 0xBA
+#define SW12_CS12 0xBB
+#define SW12_CS13 0xBC
+#define SW12_CS14 0xBD
+#define SW12_CS15 0xBE
+#define SW12_CS16 0xBF
diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
index e97007fc704..85bdc7ea739 100644
--- a/keyboards/input_club/k_type/k_type.c
+++ b/keyboards/input_club/k_type/k_type.c
@@ -21,133 +21,133 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "is31fl3733-dual.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1,  A_1,  C_1  },
-    { 0, B_2,  A_2,  C_2  },
-    { 0, B_3,  A_3,  C_3  },
-    { 0, B_4,  A_4,  C_4  },
-    { 0, B_5,  A_5,  C_5  },
-    { 0, B_6,  A_6,  C_6  },
-    { 0, B_7,  A_7,  C_7  },
-    { 0, B_8,  A_8,  C_8  },
-    { 0, B_9,  A_9,  C_9  },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_15, A_15, C_15 },
-    { 0, B_16, A_16, C_16 },
-
-    { 0, E_1,  D_1,  F_1  },
-    { 0, E_2,  D_2,  F_2  },
-    { 0, E_3,  D_3,  F_3  },
-    { 0, E_4,  D_4,  F_4  },
-    { 0, E_5,  D_5,  F_5  },
-    { 0, E_6,  D_6,  F_6  },
-    { 0, E_7,  D_7,  F_7  },
-    { 0, E_8,  D_8,  F_8  },
-    { 0, E_9,  D_9,  F_9  },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
-    { 0, E_16, D_16, F_16 },
-
-    { 0, H_1,  G_1,  I_1  },
-    { 0, H_2,  G_2,  I_2  },
-    { 0, H_3,  G_3,  I_3  },
-    { 0, H_4,  G_4,  I_4  },
-    { 0, H_5,  G_5,  I_5  },
-    { 0, H_6,  G_6,  I_6  },
-    { 0, H_7,  G_7,  I_7  },
-    { 0, H_8,  G_8,  I_8  },
-    { 0, H_9,  G_9,  I_9  },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_16, G_16, I_16 },
-
-    { 0, K_1,  J_1,  L_1  },
-    { 0, K_2,  J_2,  L_2  },
-    { 0, K_3,  J_3,  L_3  },
-    { 0, K_4,  J_4,  L_4  },
-    { 0, K_5,  J_5,  L_5  },
-    { 0, K_6,  J_6,  L_6  },
-    { 0, K_7,  J_7,  L_7  },
-    { 0, K_8,  J_8,  L_8  },
-    { 0, K_9,  J_9,  L_9  },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
 
     // Driver 2 is on I2C2
-    { 1, B_1,  A_1,  C_1  },
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, B_12, A_12, C_12 },
-    { 1, B_13, A_13, C_13 },
-    { 1, B_14, A_14, C_14 },
-    { 1, B_15, A_15, C_15 },
-    { 1, B_16, A_16, C_16 },
-
-    { 1, E_1,  D_1,  F_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, E_14, D_14, F_14 },
-    { 1, E_15, D_15, F_15 },
-    { 1, E_16, D_16, F_16 },
-
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_6,  G_6,  I_6  },
-    { 1, H_7,  G_7,  I_7  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10 },
-    { 1, H_11, G_11, I_11 },
-    { 1, H_12, G_12, I_12 },
-    { 1, H_13, G_13, I_13 },
-    { 1, H_14, G_14, I_14 },
-    { 1, H_15, G_15, I_15 },
-    { 1, H_16, G_16, I_16 },
-
-    { 1, K_1,  J_1,  L_1  },
-    { 1, K_2,  J_2,  L_2  },
-    { 1, K_3,  J_3,  L_3  },
-    { 1, K_4,  J_4,  L_4  },
-    { 1, K_5,  J_5,  L_5  },
-    { 1, K_6,  J_6,  L_6  },
-    { 1, K_7,  J_7,  L_7  }
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
+
+    { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 1, SW5_CS16, SW4_CS16, SW6_CS16 },
+
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 1, SW8_CS16, SW7_CS16, SW9_CS16 },
+
+    { 1, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 1, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 1, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 1, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 1, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 1, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 1, SW11_CS7,  SW10_CS7,  SW12_CS7  }
 };
 
 led_config_t g_led_config = {
@@ -201,14 +201,6 @@ led_config_t g_led_config = {
     }
 };
 
-void keyboard_pre_init_kb(void) {
-    // Turn on LED controller
-    setPinOutput(B16);
-    writePinHigh(B16);
-
-    keyboard_pre_init_user();
-}
-
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
deleted file mode 100644
index c40495c8de8..00000000000
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2021 Andrew Fahmy
- *
- * 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 RGB_MATRIX_ENABLE
-// #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINDROPS
-
-// #    define DEBUG_MATRIX_SCAN_RATE
-
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 100
-// #    define RGB_MATRIX_LED_PROCESS_LIMIT 2
-
-// i2c_master defines
-#    define I2C_COUNT 2
-
-#    define I2C1_BANK GPIOB
-#    define I2C1_SCL 0 // A2 on pinout = B0
-#    define I2C1_SDA 1 // A2 on pinout = B1
-#    define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
-#    define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2
-
-#    define USE_I2C2
-#    define I2C2_BANK GPIOC
-#    define I2C2_SCL 10 // A2 on pinout = C10
-#    define I2C2_SDA 11 // A2 on pinout = C11
-#    define I2C2_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
-#    define I2C2_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2
-
-#    define DRIVER_ADDR_1 0b1010000
-#    define DRIVER_ADDR_2 0b1010000
-#    define DRIVER_COUNT 2
-#    define DRIVER_1_LED_TOTAL 64
-#    define DRIVER_2_LED_TOTAL 55
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#endif
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
deleted file mode 100644
index 264c760414e..00000000000
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2021 Andrew Fahmy
- *
- * 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 {
-    _MAIN,
-    _L1
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MAIN] = LAYOUT_tkl_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_SCRL, KC_PAUS,
-
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
-        MO(_L1), 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_LALT,                            KC_SPC,                             KC_RALT, MO(_L1), KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_L1] = LAYOUT_tkl_ansi(
-        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG, RGB_MOD, _______,
-
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______,          RGB_HUI, RGB_SAI, RGB_VAI,
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_HUD, RGB_SAD, RGB_VAD,
-        _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   _______,
-        _______, KC_LGUI, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    )
-};
-
-void keyboard_post_init_user(void) {
-    // Customise these values to desired behaviour
-    // debug_enable=true;
-    // debug_matrix=true;
-    // debug_keyboard=true;
-    // debug_mouse=true;
-}
-
-#ifdef RGB_MATRIX_ENABLE
-// Turn off SDB
-void keyboard_pre_init_user(void) {
-    palSetPadMode(GPIOB, 16, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPad(GPIOB, 16);
-}
-
-#endif
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk b/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/input_club/k_type/keymaps/belak/keymap.c b/keyboards/input_club/k_type/keymaps/belak/keymap.c
deleted file mode 100644
index 1d47acb129d..00000000000
--- a/keyboards/input_club/k_type/keymaps/belak/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QW,
-    _L1
-};
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QW] = LAYOUT_tkl_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_SCRL, KC_PAUS,
-
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
-        MO(_L1), 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_RGUI, MO(_L1), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_L1] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY, KC_MNXT, KC_VOLU,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MSTP, KC_MPRV, KC_VOLD,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   KC_PGUP,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          KC_HOME, KC_PGDN, KC_END
-    )
-};
diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index 2d6affe84ab..664fcf9dc12 100644
--- a/keyboards/input_club/whitefox/config.h
+++ b/keyboards/input_club/whitefox/config.h
@@ -22,8 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* LED matrix driver */
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#define LED_MATRIX_LED_COUNT 71
-#define LED_DISABLE_WHEN_USB_SUSPENDED
+#define IS31FL3731_SDB_PIN B16
 
 /* i2c (for LED matrix) */
 #define I2C1_CLOCK_SPEED 400000
diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json
index cb578e99b45..0428907fb8d 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
@@ -8,7 +8,30 @@
         "device_version": "0.0.1"
     },
     "led_matrix": {
-        "driver": "is31fl3731"
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "band": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "wave_left_right": true,
+            "wave_up_down": true
+        },
+        "driver": "is31fl3731",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"],
diff --git a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
deleted file mode 100644
index 798616548ac..00000000000
--- a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: Default Layer
-     * ,---------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backsp|Ins|
-     * |---------------------------------------------------------------|
-     * | Tab |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del|
-     * |---------------------------------------------------------------|
-     * |  FN  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Enter  |PgU|
-     * |---------------------------------------------------------------|
-     * | Shift |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Shift |Up |PgD|
-     * |---------------------------------------------------------------|
-     * |Ctrl|Gui |Alt |         Space         |Alt |Ctrl|  |Lef|Dow|Rig|
-     * `---------------------------------------------------------------'
-     */
-    [0] = LAYOUT(
-        QK_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_NO,KC_BSPC,KC_INS,
-        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,
-        MO(1),   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,KC_RCTL,KC_NO,       KC_LEFT,KC_DOWN,KC_RGHT
-    ),
-    /* Layer 1: FN Layer
-     * ,---------------------------------------------------------------.
-     * | ` | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|       |   |
-     * |---------------------------------------------------------------|
-     * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
-     * |---------------------------------------------------------------|
-     * |      |   |   |   |   |   |   |   |   |   |   |   |        |   |
-     * |---------------------------------------------------------------|
-     * |       |   |   |   |   |   |   |   |   |   |   |       |pup|   |
-     * |---------------------------------------------------------------|
-     * |    |    |    |                       |    |    |  |hom|pdn|end|
-     * `---------------------------------------------------------------'
-     */
-    [1] = LAYOUT(
-        KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_TRNS,KC_TRNS,KC_MUTE,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,BL_TOGG,KC_TRNS,KC_TRNS,BL_UP,  KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,        KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,BL_DOWN,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_PGUP,KC_VOLD,
-        KC_TRNS,KC_TRNS,KC_TRNS,                        KC_TRNS,                KC_TRNS,KC_TRNS,KC_TRNS,        KC_HOME,KC_PGDN,KC_END
-    ),
-};
diff --git a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/readme.md b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/readme.md
deleted file mode 100644
index 2c714f067ac..00000000000
--- a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-#Jetpacktuxedo's keymap for whitefox aria
-
-This is designed for the aria layout so you may have some keys that don't line up properly, namely around the split backspace area and the right hand bottom row mods. Additionally I use capslock as fn.
diff --git a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/rules.mk b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/rules.mk
deleted file mode 100644
index c9c8cbea51c..00000000000
--- a/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes
-
diff --git a/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
deleted file mode 100644
index 1d5e36bd20d..00000000000
--- a/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2017 Lukmanul Hakim <lukmanulhakim14@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/>.
-*/
-
-/* NOTE : This is compatible to TrueFox Layout only */
-
-#include QMK_KEYBOARD_H
-
-// Fillers to make layering more clear
-#define ___T___ KC_TRNS
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: Default Layer
-     * ,----------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|Pscr|
-     * |----------------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Backs|Del |
-     * |----------------------------------------------------------------|
-     * |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter   |PgUp|
-     * |----------------------------------------------------------------|
-     * |Shif|   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |PgDn|
-     * |----------------------------------------------------------------|
-     * |Alt|Fn0 |Gui |         Space    |Gui |Alt |     |  |Lef|Dow|Rght|
-     * `----------------------------------------------------------------'
-     */
-    [0] = LAYOUT(
-        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS,KC_GRV, KC_PSCR,
-        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_BSPC,     KC_DEL,
-        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,      KC_PGUP,
-        KC_LSFT,XXXXXXX,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_LALT,MO(1), KC_LGUI,               KC_SPC,           KC_RGUI,KC_RALT, XXXXXXX,     KC_LEFT,KC_DOWN,KC_RGHT
-    ),
-    [1] = 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_MPRV,KC_MNXT,KC_VOLU,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______ ,     BL_TOGG ,
-        _______,KC_MPLY,KC_MSTP,KC_VOLD,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT,   BL_UP,
-        _______,_______,_______,KC_MUTE,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,BL_DOWN,
-        _______,_______,_______,               _______,          _______,_______,_______,     KC_HOME,_______,KC_END
-    ),
-};
diff --git a/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c b/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
deleted file mode 100644
index 76237d4d30c..00000000000
--- a/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-    AL_FILE = SAFE_RANGE,
-    AL_WWW,
-    AL_HELP,
-    AL_CMD
-};
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: Default Layer
-     * ,---------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|Ins|
-     * |---------------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Backs|Del|
-     * |---------------------------------------------------------------|
-     * |CapsLo|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter   |PgU|
-     * |---------------------------------------------------------------|
-     * |Shif|   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |PgD|
-     * |---------------------------------------------------------------|
-     * |Ctrl|Gui |Alt |         Space    |Fn0 |Alt |Gui |  |Lef|Dow|Rig|
-     * `---------------------------------------------------------------'
-     */
-    [0] = LAYOUT(
-        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS,KC_GRV, KC_MUTE,
-        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_BSPC,     KC_DEL,
-        MO(1),  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(2),  KC_RCTL,     KC_LEFT,KC_DOWN,KC_RGHT
-    ),
-    [1] = LAYOUT(
-        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_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_DEL ,     KC_INS ,
-        KC_TRNS,KC_TRNS,KC_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_PGUP,KC_VOLD,
-        KC_TRNS,KC_TRNS,KC_TRNS,               KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,     KC_HOME,KC_PGDN,KC_END
-    ),
-    [2] = LAYOUT(
-        KC_SLEP,KC_P1,  KC_P2,  KC_P3,  KC_P4,  KC_P5,  KC_P6,  KC_P7,  KC_P8,  KC_P9,  KC_P0,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,
-        KC_TRNS,KC_TRNS,AL_WWW ,AL_HELP ,KC_TRNS,AL_CMD ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_TRNS,KC_TRNS,KC_TRNS,     KC_NO,
-        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,AL_FILE ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_TRNS,KC_TRNS,KC_MAIL,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,               KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS,KC_TRNS
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case AL_FILE:
-            if (record->event.pressed) {
-                host_consumer_send(0x1B4); // AL File Browser
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-        case AL_WWW:
-            if (record->event.pressed) {
-                host_consumer_send(0x196); // AL Internet Browser
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-        case AL_HELP:
-            if (record->event.pressed) {
-                host_consumer_send(0x1A6); // AL Integrated Help Center
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-        case AL_CMD:
-            if (record->event.pressed) {
-                host_consumer_send(0x1A0); // AL Command Line Processor/Run
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c b/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
deleted file mode 100644
index 584719ed253..00000000000
--- a/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-
- /*
- Copyright 2021 Mattia Righetti
-
- 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 layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-    * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │   │
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-    * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │Del│
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │PgU│
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-    * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │RSfRCt│ ↑ │PgD│
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-    * │LCtl│LAlt│LGUI│         Space          │RAlt│Lay1│ │ ← │ ↓ │ → │
-    * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-    */
-    [0] = LAYOUT_truefox(
-        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_BSLS, _______,
-        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_BSPC, 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_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_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /* Function layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
-    * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │   │     │
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼─────┤
-    * │     │   │ ↑ │   │   │   │   │   │   │   │   │   │   │Reset│     │
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼─────┤
-    * │      │ ← │ ↓ │ → │   │   │   │   │   │   │   │   │        │     │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼─────┤
-    * │        │VoU│VoD│VoM│   │   │   │   │   │   │   │      │   │     │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼─────┤
-    * │    │    │    │                        │Lay2│    │ │   │   │     │
-    * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴─────┘
-    */
-    [1] = LAYOUT_truefox(
-        _______, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, MO(2), KC_TRNS, _______, _______, _______
-    ),
-    /* Third layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-    * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-    * │     │1  │2  │3  │4  │5  │6  │7  │8  │9  │0  │   │   │     │   │
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-    * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-    * │    │    │    │                        │    │    │ │   │   │   │
-    * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-    */
-    [2] = LAYOUT_truefox(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk b/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
deleted file mode 100644
index 7a421cc9ae5..00000000000
--- a/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-
-# Keyboard-specific features
-BACKLIGHT_ENABLE   = no
-VISUALIZER_ENABLE  = no
-
-# Firmware size reduction
-GRAVE_ESC_ENABLE   = no
-MAGIC_ENABLE       = no
-SPACE_CADET_ENABLE = no
diff --git a/keyboards/input_club/whitefox/keymaps/truefox/keymap.c b/keyboards/input_club/whitefox/keymaps/truefox/keymap.c
deleted file mode 100644
index 2af54673119..00000000000
--- a/keyboards/input_club/whitefox/keymaps/truefox/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ~ │ \ │PrS│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-     * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Backs│Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │Enter   │PgU│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │Shift   │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │Ctrl│GUI │Alt │                        │Alt │Fn  │ │ ← │ ↓ │ → │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [0] = LAYOUT_65_ansi_blocker_split_bs(
-        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_BSLS, KC_PSCR,
-        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_BSPC,         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_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_LEFT, KC_DOWN,     KC_RGHT
-    ),
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │Fla│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PrS│ \ │Mut│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-     * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Delet│Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │Enter   │Vl+│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │Shift   │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │PgU│Vl-│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │Ctrl│GUI │Alt │                        │Alt │Fn  │ │Hom│PgD│End│
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [1] = LAYOUT_65_ansi_blocker_split_bs(
-        QK_BOOT, 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_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,               KC_VOLU,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_PGUP,      KC_VOLD,
-        _______, _______, _______,                            _______,                   _______, _______,              KC_HOME, KC_PGDN,      KC_END
-    )
-};
diff --git a/keyboards/input_club/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c
index 63c6a492403..773dbd3dc9d 100644
--- a/keyboards/input_club/whitefox/whitefox.c
+++ b/keyboards/input_club/whitefox/whitefox.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 #ifdef LED_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 // The numbers in the comments are the led numbers DXX on the PCB
 /* Refer to IS31 manual for these locations
  *  driver
@@ -65,15 +65,6 @@ led_config_t g_led_config = {
 };
 #endif
 
-void keyboard_pre_init_kb(void) {
-#ifdef LED_MATRIX_ENABLE
-    // Turn on LED controller
-    setPinOutput(B16);
-    writePinHigh(B16);
-#endif
-    keyboard_pre_init_user();
-}
-
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
diff --git a/keyboards/itstleo/itstleo40/info.json b/keyboards/itstleo/itstleo40/info.json
index 8748072f4f4..637f8e5d7eb 100644
--- a/keyboards/itstleo/itstleo40/info.json
+++ b/keyboards/itstleo/itstleo40/info.json
@@ -8,7 +8,6 @@
     "features": {
         "bootmagic": true,
         "command": false,
-        "combo": false,
         "console": false,
         "leader": true,
         "extrakey": true,
diff --git a/keyboards/j80/keymaps/vial/config.h b/keyboards/j80/keymaps/vial/config.h
new file mode 100644
index 00000000000..8a28607f06f
--- /dev/null
+++ b/keyboards/j80/keymaps/vial/config.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x17, 0x02, 0x25, 0x86, 0xE8, 0x06, 0x80, 0x02}
+
+// ESC + Enter
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/j80/keymaps/vial/keymap.c b/keyboards/j80/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..d7c78fbb20f
--- /dev/null
+++ b/keyboards/j80/keymaps/vial/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2019 JER
+ *
+ * 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_tkl_ansi_split_rshift(
+  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_SCRL, KC_PAUS,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_APP, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/j80/keymaps/vial/rules.mk b/keyboards/j80/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..c79bece395f
--- /dev/null
+++ b/keyboards/j80/keymaps/vial/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE      = yes # Enable VIA
+VIAL_ENABLE     = yes # Enable VIAL
+LTO_ENABLE      = yes
+
+MOUSEKEY_ENABLE = yes
diff --git a/keyboards/j80/keymaps/vial/vial.json b/keyboards/j80/keymaps/vial/vial.json
new file mode 100644
index 00000000000..09859caea64
--- /dev/null
+++ b/keyboards/j80/keymaps/vial/vial.json
@@ -0,0 +1,249 @@
+{
+    "lighting": "qmk_backlight",
+    "matrix": {
+        "rows": 7,
+        "cols": 14
+    },
+    "layouts": {
+        "labels": [
+            "ISO Enter",
+            "Split Right Shift",
+            [
+                "Bottom Row",
+                "WKL",
+                "WK"
+            ]
+        ],
+        "keymap": [
+            [
+                {
+                    "x": 2.5
+                },
+                "0,0",
+                {
+                    "x": 1
+                },
+                "0,2",
+                "0,3",
+                "0,4",
+                "0,5",
+                {
+                    "x": 0.5
+                },
+                "0,7",
+                "0,8",
+                "0,9",
+                "0,10",
+                {
+                    "x": 0.5
+                },
+                "0,11",
+                "0,13",
+                "0,12",
+                "0,1",
+                {
+                    "x": 0.25
+                },
+                "6,1",
+                "6,2",
+                "6,13"
+            ],
+            [
+                {
+                    "y": 0.5,
+                    "x": 2.5
+                },
+                "1,0",
+                "1,1",
+                "1,2",
+                "1,3",
+                "1,4",
+                "1,5",
+                "1,6",
+                "1,7",
+                "1,8",
+                "1,9",
+                "1,10",
+                "1,11",
+                "1,13",
+                {
+                    "w": 2
+                },
+                "1,12",
+                {
+                    "x": 0.25
+                },
+                "6,6",
+                "6,5",
+                "6,4"
+            ],
+            [
+                {
+                    "x": 2.5,
+                    "w": 1.5
+                },
+                "2,0",
+                "2,1",
+                "2,2",
+                "2,3",
+                "2,4",
+                "2,5",
+                "2,6",
+                "2,7",
+                "2,8",
+                "2,9",
+                "2,10",
+                "2,11",
+                "2,13",
+                {
+                    "w": 1.5
+                },
+                "2,12\n\n\n0,0",
+                {
+                    "x": 0.25
+                },
+                "6,12",
+                "6,8",
+                "6,7",
+                {
+                    "x": 1.75,
+                    "w": 1.25,
+                    "h": 2,
+                    "w2": 1.5,
+                    "h2": 1,
+                    "x2": -0.25
+                },
+                "3,13\n\n\n0,1"
+            ],
+            [
+                {
+                    "x": 2.5,
+                    "w": 1.75
+                },
+                "3,0",
+                "3,1",
+                "3,2",
+                "3,3",
+                "3,4",
+                "3,5",
+                "3,6",
+                "3,7",
+                "3,8",
+                "3,9",
+                "3,10",
+                "3,11",
+                {
+                    "w": 2.25
+                },
+                "3,13\n\n\n0,0",
+                {
+                    "x": 4
+                },
+                "2,12\n\n\n0,1"
+            ],
+            [
+                {
+                    "w": 1.25
+                },
+                "4,0\n\n\n0,1",
+                "3,12\n\n\n0,1",
+                {
+                    "x": 0.25,
+                    "w": 2.25
+                },
+                "4,0\n\n\n0,0",
+                "4,1",
+                "4,2",
+                "4,3",
+                "4,4",
+                "4,5",
+                "4,6",
+                "4,7",
+                "4,8",
+                "4,9",
+                "4,10",
+                {
+                    "w": 2.75
+                },
+                "4,11\n\n\n1,0",
+                {
+                    "x": 1.25
+                },
+                "4,12",
+                {
+                    "x": 1.25,
+                    "w": 1.75
+                },
+                "4,11\n\n\n1,1",
+                "4,13\n\n\n1,1"
+            ],
+            [
+                {
+                    "x": 2.5,
+                    "w": 1.5
+                },
+                "5,0\n\n\n2,0",
+                "5,1\n\n\n2,0",
+                {
+                    "w": 1.5
+                },
+                "5,2\n\n\n2,0",
+                {
+                    "w": 7
+                },
+                "5,4\n\n\n2,0",
+                {
+                    "w": 1.5
+                },
+                "5,9\n\n\n2,0",
+                "5,10\n\n\n2,0",
+                {
+                    "w": 1.5
+                },
+                "5,11\n\n\n2,0",
+                {
+                    "x": 0.25
+                },
+                "5,13",
+                "5,12",
+                "5,7"
+            ],
+            [
+                {
+                    "y": 0.25,
+                    "x": 2.5,
+                    "w": 1.25
+                },
+                "5,0\n\n\n2,1",
+                {
+                    "w": 1.25
+                },
+                "5,1\n\n\n2,1",
+                {
+                    "w": 1.25
+                },
+                "5,2\n\n\n2,1",
+                {
+                    "w": 6.25
+                },
+                "5,4\n\n\n2,1",
+                {
+                    "w": 1.25
+                },
+                "5,8\n\n\n2,1",
+                {
+                    "w": 1.25
+                },
+                "5,9\n\n\n2,1",
+                {
+                    "w": 1.25
+                },
+                "5,10\n\n\n2,1",
+                {
+                    "w": 1.25
+                },
+                "5,11\n\n\n2,1"
+            ]
+        ]
+    }
+}
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index 17cd8ea9ab0..805f9ad0542 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -8,5 +8,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLIGHT_DEFAULT_VAL 50
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
index 325bc3c6d77..098817dedb1 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -41,6 +41,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 50
         }
     },
     "indicators": {
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index d853b3a3208..52e8354fabd 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -41,6 +41,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 50
         }
     },
     "indicators": {
diff --git a/keyboards/jacky_studio/piggy60/rev2/config.h b/keyboards/jacky_studio/piggy60/rev2/config.h
index fa884d5f187..2747834991f 100644
--- a/keyboards/jacky_studio/piggy60/rev2/config.h
+++ b/keyboards/jacky_studio/piggy60/rev2/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 14
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/jacky_studio/piggy60/rev2/info.json b/keyboards/jacky_studio/piggy60/rev2/info.json
index 6d5db8874f7..2a3c7e3313d 100644
--- a/keyboards/jacky_studio/piggy60/rev2/info.json
+++ b/keyboards/jacky_studio/piggy60/rev2/info.json
@@ -72,7 +72,8 @@
             {"flags": 2, "x": 45, "y": 0},
             {"flags": 2, "x": 0, "y": 0},
             {"flags": 2, "x": 32, "y": 32}
-        ]
+        ],
+        "sleep": true
     },
     "usb": {
         "device_version": "2.0.0",
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index 8e0534fa2cb..4d138814be6 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -18,61 +18,5 @@
 
 #define RGB_MATRIX_LED_COUNT 67
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-
- // 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
-#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 LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json
index e097b47ce55..1f5d79032e8 100644
--- a/keyboards/jadookb/jkb65/info.json
+++ b/keyboards/jadookb/jkb65/info.json
@@ -10,7 +10,58 @@
         "pin": "F0"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true,
         "timeout": 90000
     },
     "processor": "atmega32u4",
diff --git a/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c b/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c
deleted file mode 100644
index cfe39559e13..00000000000
--- a/keyboards/jc65/v32a/keymaps/ptillemans/keymap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-#define _QWERTY 0
-#define _RAISE 1
-
-#define KC_CTES LCTL_T(KC_ESC)
-#define KC_RAIS MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(
-                 QK_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_BSLS,KC_BSPC, KC_INS,
-                 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_HASH,KC_PGUP,
-                 KC_CTES,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,KC_HASH,         KC_ENT,KC_PGDN,
-                 KC_LSFT,KC_BSLS,   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_RAIS,KC_LGUI,KC_LALT,         KC_SPC, KC_SPC, KC_SPC,                        KC_RALT,KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT
-    ),
-    [_RAISE] = LAYOUT(
-                 KC_GRV,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11,KC_F12,KC_BSLS,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_PSCR,KC_LBRC,KC_RBRC,          QK_BOOT,KC_PGUP,
-                 KC_CTES,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,  QK_BOOT,       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_HOME,
-                 KC_LCTL,KC_LGUI,KC_LALT,         KC_SPC, KC_SPC, KC_SPC,                        KC_RALT,KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT
-                 ),
-};
-
-bool shift_pressed(void) {
-  return get_mods() & MOD_MASK_SHIFT;
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  static bool tilde_pressed = false;
-
-  switch (keycode) {
-  case KC_HASH:
-    if (shift_pressed()) {
-      if (record->event.pressed) {
-        tilde_pressed = true;
-        register_code(KC_GRV);
-        return false;
-      }
-      else if (tilde_pressed) {
-        unregister_code(KC_GRV);
-        tilde_pressed = false;
-        return false;
-      }
-    }
-    return true;
-  default:
-    return true; // Process all other keycodes normally
-  }
-}
diff --git a/keyboards/jc65/v32a/keymaps/ptillemans/readme.md b/keyboards/jc65/v32a/keymaps/ptillemans/readme.md
deleted file mode 100644
index 61e55f3ce85..00000000000
--- a/keyboards/jc65/v32a/keymaps/ptillemans/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Default Keymap
-=======
-
-Default plain keymap with only a base layer.
-
-Keymap Maintainer: [Jason Barnachea](https://github.com/nautxx)
-
-Difference from base layout: None.
-
-Intended usage: Reference layout.
diff --git a/keyboards/jc65/v32a/keymaps/ptillemans/rules.mk b/keyboards/jc65/v32a/keymaps/ptillemans/rules.mk
deleted file mode 100644
index 1d2d9e5a9c4..00000000000
--- a/keyboards/jc65/v32a/keymaps/ptillemans/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/jc65/v32a/keymaps/rys/keymap.c b/keyboards/jc65/v32a/keymaps/rys/keymap.c
deleted file mode 100644
index a88c7a8685f..00000000000
--- a/keyboards/jc65/v32a/keymaps/rys/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _BASE,
-    _FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-         KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_NUBS,  KC_DEL,  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_BSPC, KC_PGUP,
-        KC_NUHS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT, XXXXXXX,           KC_ENT, KC_PGDN,
-        KC_LSFT, XXXXXXX,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,   KC_UP, MO(_FUNC),
-        KC_LCTL, KC_LALT, KC_LGUI,          XXXXXXX,  KC_SPC, XXXXXXX,                            XXXXXXX, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FUNC] = LAYOUT(
-        RGB_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX,   QK_BOOT,
-        RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,
-       RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, _______,
-        RGB_HUI, RGB_SAI, RGB_VAI,          XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD
-    )
-};
diff --git a/keyboards/jc65/v32a/keymaps/rys/rules.mk b/keyboards/jc65/v32a/keymaps/rys/rules.mk
deleted file mode 100644
index d7463419b4f..00000000000
--- a/keyboards/jc65/v32a/keymaps/rys/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/jc65/v32u4/keymaps/coth/config.h b/keyboards/jc65/v32u4/keymaps/coth/config.h
deleted file mode 100644
index a5568e400de..00000000000
--- a/keyboards/jc65/v32u4/keymaps/coth/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../config.h"
diff --git a/keyboards/jc65/v32u4/keymaps/coth/keymap.c b/keyboards/jc65/v32u4/keymaps/coth/keymap.c
deleted file mode 100644
index 025c585852f..00000000000
--- a/keyboards/jc65/v32u4/keymaps/coth/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-      QK_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_BSLS, KC_GRV, KC_INS,
-      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_BSPC, KC_DEL,
-      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_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_LALT, KC_LCTL, KC_LGUI, KC_SPACE, KC_SPACE, KC_SPACE, MO(1),  KC_NO, MO(2),  KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-  [1] = LAYOUT(
-      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_BTN2, KC_MS_U, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_UP,   KC_HOME,  KC_END,  KC_DEL,  KC_TRNS,
-      KC_CAPS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_LEFT,  KC_DOWN, KC_RGHT, KC_TRNS, KC_VOLU,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN,  KC_PGUP, KC_TRNS,  KC_TRNS, KC_PGUP, KC_VOLD,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,  KC_PGDN, KC_END
-      ),
-  [2] = LAYOUT(
-      RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_MOD, RGB_RMOD, BL_STEP, BL_TOGG, KC_TRNS, KC_TRNS, QK_BOOT,
-      KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,  RGB_TOG,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,  RGB_HUD,  RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,  KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD,  RGB_VAI,  KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      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/jc65/v32u4/keymaps/coth/readme.md b/keyboards/jc65/v32u4/keymaps/coth/readme.md
deleted file mode 100644
index 3d621859e7a..00000000000
--- a/keyboards/jc65/v32u4/keymaps/coth/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-ChildoftheHorn's Keymap
-===
- 
-Layer 1: "HHKB Mac" Split backspace, 6.25u space, caps is cntl
-
-Layer 2: V60++ with mouse controls on WASD
-
-Layer 3: RGB control on number row, LED controls, and Reset
-
-Keymap Maintainer: [Stacy Devino](https://github.com/childofthehorn)
-
-Difference from base layout: Primarily the HHKB-ness
-
-Intended usage: Daily driver for programming 
diff --git a/keyboards/jc65/v32u4/keymaps/dead_encryption/config.h b/keyboards/jc65/v32u4/keymaps/dead_encryption/config.h
deleted file mode 100644
index a5568e400de..00000000000
--- a/keyboards/jc65/v32u4/keymaps/dead_encryption/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../config.h"
diff --git a/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c b/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
deleted file mode 100644
index 0fca214f772..00000000000
--- a/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include QMK_KEYBOARD_H
-// How long (in ms) to wait between animation steps for the breathing mode
-const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
-
-// How long (in ms) to wait between animation steps for the rainbow mode
-const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {120, 60, 30};
-
-// How long (in ms) to wait between animation steps for the swirl mode
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {30, 20, 3};
-
-// How long (in ms) to wait between animation steps for the snake mode
-const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 50, 20};
-
-// How long (in ms) to wait between animation steps for the knight modes
-const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31};
-
-// These control which colors are selected for the gradient mode
-const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-      QK_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_BSLS, KC_GRV, KC_PSCR,
-      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_BSPC, 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_DEL,
-      KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_SPACE, KC_SPACE, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-  [1] = LAYOUT(
-      QK_BOOT,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_PAUS, KC_TRNS,
-      KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_MOD, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS,
-      KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_DOWN, KC_HOME, KC_PGUP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, BL_TOGG, BL_STEP, BL_UP,   BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,   KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MPLY, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-      ),
-};
diff --git a/keyboards/jc65/v32u4/keymaps/dead_encryption/readme.md b/keyboards/jc65/v32u4/keymaps/dead_encryption/readme.md
deleted file mode 100644
index b48075db9f8..00000000000
--- a/keyboards/jc65/v32u4/keymaps/dead_encryption/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Dead's Keymap
-===
-
-Split backspace, 6.25u space, 2 Function Layers, reset + rgb controls on layer(2)
-
-Intended usage: This is my daily driver keymap
-
-===
-
-Encryption Complete
\ No newline at end of file
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/config.h b/keyboards/jc65/v32u4/keymaps/gam3cat/config.h
deleted file mode 100644
index e4df94be701..00000000000
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-//Force NKRO to be enabled.
-#define FORCE_NKRO
-
-//GRAVE_ESC override for CTRL+SHIFT+ESC Windows task manager shortcut.
-#define GRAVE_ESC_CTRL_OVERRIDE
-
-//Delay matrix scan for tap dance, reduce to activate modifier keys faster.
-//#define TAPPING_TERM 200
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
deleted file mode 100644
index e0046073c64..00000000000
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
+++ /dev/null
@@ -1,258 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layers {
-    _BL = 0,    // Base Layer
-    _WL,        // Workman Layer
-    _NL,        // Norman Layer
-    _DL,        // Dvorak Layer
-    _CL,        // Base Layer
-    _FL,        // Function Layer
-    _AL,        // Adjust Layer
-};
-
-enum custom_keycodes {
-    QMK_REV = SAFE_RANGE,
-    KC_WEB,
-    KC_SP4,
-    DYNAMIC_MACRO_RANGE
-};
-
-extern backlight_config_t backlight_config;
-
-#include "dynamic_macro.h"
-#define FN_CAPS LT(_FL, KC_CAPS)
-#define KC_DMR1 DM_REC1
-#define KC_DMR2 DM_REC2
-#define KC_DMP1 DM_PLY1
-#define KC_DMP2 DM_PLY2
-#define KC_DMRS DM_RSTP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*#### _BL: Base Layer - Mostly standard 65% QWERTY layout.
-    *  .---------------------------------------------------------------.
-    *  |GrE|1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|
-    *  |---------------------------------------------------------------|
-    *  |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|
-    *  |---------------------------------------------------------------|
-    *  |FnCaps|A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |PgU|
-    *  |---------------------------------------------------------------|
-    *  |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Up |PgD|
-    *  |---------------------------------------------------------------|
-    *  |Ctrl|Gui |Alt |      Space             |RAlt |Ctrl |Lft|Dwn|Rgt|
-    *  *---------------------------------------------------------------*
-    */
-    [_BL] = LAYOUT(
-        QK_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,  XXXXXXX, KC_BSPC, KC_INS,
-        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,
-        FN_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, XXXXXXX, 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_SPC,           KC_SPC,           KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*#### _WL: Workman Layer.
-    *  .---------------------------------------------------------------.
-    *  |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    *  |---------------------------------------------------------------|
-    *  |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |
-    *  |---------------------------------------------------------------|
-    *  |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |   |
-    *  |---------------------------------------------------------------|
-    *  |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |
-    *  |---------------------------------------------------------------|
-    *  |    |    |    |                        |     |     |   |   |   |
-    *  *---------------------------------------------------------------*
-    */
-    [_WL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          KC_Q   , KC_D   , KC_R   , KC_W   , KC_B   , KC_J   , KC_F   , KC_U   , KC_P   , KC_SCLN, _______, _______, _______, _______,
-        _______,          KC_A   , KC_S   , KC_H   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_E   , KC_O   , KC_I   , _______, _______,          _______,
-        _______, _______, KC_Z   , KC_X   , KC_M   , KC_C   , KC_V   , KC_K   , KC_L   , KC_COMM, KC_DOT , KC_SLSH,          _______, _______, _______,
-        _______, _______,          _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _NL: Norman Layer.
-    *  .---------------------------------------------------------------.
-    *  |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    *  |---------------------------------------------------------------|
-    *  |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |
-    *  |---------------------------------------------------------------|
-    *  |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |   |
-    *  |---------------------------------------------------------------|
-    *  |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |
-    *  |---------------------------------------------------------------|
-    *  |    |    |    |                        |     |     |   |   |   |
-    *  *---------------------------------------------------------------*
-    */
-    [_NL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          KC_Q   , KC_W   , KC_D   , KC_F   , KC_K   , KC_J   , KC_U   , KC_R   , KC_L   , KC_SCLN, _______, _______, _______, _______,
-        _______,          KC_A   , KC_S   , KC_E   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_I   , KC_O   , KC_H   , _______, _______,          _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_P   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          _______, _______, _______,
-        _______, _______,          _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _DL: Dvorak Layer.
-    *  .---------------------------------------------------------------.
-    *  |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |
-    *  |---------------------------------------------------------------|
-    *  |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |
-    *  |---------------------------------------------------------------|
-    *  |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |   |
-    *  |---------------------------------------------------------------|
-    *  |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |
-    *  |---------------------------------------------------------------|
-    *  |    |    |    |                        |     |     |   |   |   |
-    *  *---------------------------------------------------------------*
-    */
-    [_DL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______,
-        _______,          KC_QUOT, KC_COMM, KC_DOT , KC_P   , KC_Y   , KC_F   , KC_G   , KC_C   , KC_R   , KC_L   , KC_SLSH, KC_EQL , _______, _______,
-        _______,          KC_A   , KC_O   , KC_E   , KC_U   , KC_I   , KC_D   , KC_H   , KC_T   , KC_N   , KC_S   , KC_MINS, _______,          _______,
-        _______, _______, KC_SCLN, KC_Q   , KC_J   , KC_K   , KC_X   , KC_B   , KC_M   , KC_W   , KC_V   , KC_Z   ,          _______, _______, _______,
-        _______, _______,          _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _CL: Colmak Layer.
-    *  .---------------------------------------------------------------.
-    *  |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    *  |---------------------------------------------------------------|
-    *  |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |
-    *  |---------------------------------------------------------------|
-    *  |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |   |
-    *  |---------------------------------------------------------------|
-    *  |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |
-    *  |---------------------------------------------------------------|
-    *  |    |    |    |                        |     |     |   |   |   |
-    *  *---------------------------------------------------------------*
-    */
-    [_CL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, _______, _______, _______, _______,
-        _______,          KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , _______, _______,          _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          _______, _______, _______,
-        _______, _______,          _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _FL: Function Layer.
-    *  .---------------------------------------------------------------.
-    *  |Web|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|SLock  |PSc|
-    *  |---------------------------------------------------------------|
-    *  |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |Pau|
-    *  |---------------------------------------------------------------|
-    *  |FnCaps|   |   |   |   |   |Lft|Dwn|Up |Rgt|   |   |        |Hme|
-    *  |---------------------------------------------------------------|
-    *  |        |   |   |   |   |   |   |   |   |   |   |VlMute|VlU|End|
-    *  |---------------------------------------------------------------|
-    *  |    |    |Menu|      SP4               |     |     |WBk|VlD|WFw|
-    *  *---------------------------------------------------------------*
-    */
-    [_FL] = LAYOUT(
-        KC_WEB,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_SCRL, KC_PSCR,
-        MO(_AL),          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAUS,
-        _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX,          KC_HOME,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_MUTE, KC_VOLU, KC_END,
-        XXXXXXX, XXXXXXX,          KC_MENU, KC_SP4,           KC_SP4,           KC_SP4,           XXXXXXX, XXXXXXX, XXXXXXX, KC_WBAK, KC_VOLD, KC_WFWD
-    ),
-    /*#### _AL: Adjust Layer - Keymap select, RGB Underglow, LED backlight, and Dynamic Macro settings.
-    *  .---------------------------------------------------------------.
-    *  |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |MP1|
-    *  |---------------------------------------------------------------|
-    *  |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     |MR1|
-    *  |---------------------------------------------------------------|
-    *  |FnCaps|   |   |_DL|   |   |   |   |   |   |   |   |        |MS |
-    *  |---------------------------------------------------------------|
-    *  |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |   |MR2|
-    *  |---------------------------------------------------------------|
-    *  |Rst |    |    |                        |     |     |   |   |MP2|
-    *  *---------------------------------------------------------------*
-    */
-    [_AL] = LAYOUT(
-        QMK_REV, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, BL_TOGG, BL_DOWN, BL_UP,   XXXXXXX, XXXXXXX, KC_DMP1,
-        _______,          DF(_BL), DF(_WL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DMR1,
-        _______,          XXXXXXX, XXXXXXX, DF(_DL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_DMRS,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(_CL), XXXXXXX, DF(_BL), DF(_NL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, KC_DMR2,
-        QK_BOOT, XXXXXXX,          XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DMP2
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QMK_REV:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION ":" QMK_BUILDDATE);
-            }
-            return false;
-            break;
-        case KC_WEB:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LGUI("r"));
-                wait_ms(100);
-                SEND_STRING("chrome.exe https://geekhack.org/index.php?topic=86756.new;topicseen#new\n");
-            }
-            return false;
-            break;
-        case KC_SP4:
-            if (record->event.pressed) {
-                SEND_STRING ("    ");
-            }
-            return false;
-            break;
-    }
-    // Dynamic Macros.
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    return true;
-}
-
-void custom_backlight_level(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS)
-        level = BACKLIGHT_LEVELS;
-    backlight_config.level = level;
-    backlight_config.enable = !!backlight_config.level;
-    backlight_set(backlight_config.level);
-}
-
-void matrix_init_user(void) {
-    #ifdef BACKLIGHT_ENABLE
-        custom_backlight_level(0);
-    #endif
-    #ifdef RGBLIGHT_ENABLE
-        rgblight_mode(1);
-        rgblight_sethsv_noeeprom(180,100,100);
-    #endif
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-       case _BL:
-           custom_backlight_level(0);
-           rgblight_sethsv_noeeprom(180,100,255);
-           break;
-       case _WL:
-           custom_backlight_level(1);
-           rgblight_sethsv_noeeprom(180,95,240);
-           break;
-       case _NL:
-           custom_backlight_level(1);
-           rgblight_sethsv_noeeprom(180,90,225);
-           break;
-       case _DL:
-           custom_backlight_level(1);
-           rgblight_sethsv_noeeprom(180,85,210);
-           break;
-       case _CL:
-           custom_backlight_level(1);
-           rgblight_sethsv_noeeprom(180,80,195);
-           break;
-       case _FL:
-           custom_backlight_level(2);
-           rgblight_sethsv_noeeprom(230,255,255);
-           break;
-       case _AL:
-           custom_backlight_level(3);
-           rgblight_sethsv_noeeprom(250,255,255);
-           break;
-       default:
-           custom_backlight_level(0);
-           rgblight_sethsv_noeeprom(180,100,100);
-           break;
-    }
-    return state;
-}
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/readme.md b/keyboards/jc65/v32u4/keymaps/gam3cat/readme.md
deleted file mode 100644
index e79ce4ff7fd..00000000000
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/readme.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Keymap Maintainer: Gam3cat
-make jc65/v32u4:gam3cat
-## Layout Config:
-2u backspace, 2.25u left shift/enter, 1.75u right shift.
-(2x1.5u, 1x7.0u, 2x1.5u, 3x1u), (3x1.25u, 1x6.25u, 2x1.5u, 3x1u), or
-(3x1.25u, 1x6.25u, 6x1u) bottom row.
-
-    FN_CAPS = MO(_FL) when held, CAPS when tapped.
-    GRAVE_ESC + GUI = `
-    GRAVE_ESC + SHIFT = ~
-
-## Base Layer Selection:
-(Caps+TAB+(  )): (Q)WERTY, (W)orkman, (N)orman, (D)vorak, (C)olmak
-
-### Base Layer Options:
-#### _BL: Base Layer - Mostly standard 65% QWERTY layout.
-    .---------------------------------------------------------------.
-    |GrE|1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|
-    |---------------------------------------------------------------|
-    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|
-    |---------------------------------------------------------------|
-    |FnCaps|A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |PgU|
-    |---------------------------------------------------------------|
-    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Up |PgD|
-    |---------------------------------------------------------------|
-    |Ctrl|Gui |Alt |      Space             |RAlt |Ctrl |Lft|Dwn|Rgt|
-    *---------------------------------------------------------------*
-
-#### _WL: Workman Layer.
-    .---------------------------------------------------------------.
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    |---------------------------------------------------------------|
-    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |
-    |---------------------------------------------------------------|
-    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |   |
-    |---------------------------------------------------------------|
-    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |
-    |---------------------------------------------------------------|
-    |    |    |    |                        |     |     |   |   |   |
-    *---------------------------------------------------------------*
-
-#### _NL: Norman Layer.
-    .---------------------------------------------------------------.
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    |---------------------------------------------------------------|
-    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |
-    |---------------------------------------------------------------|
-    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |   |
-    |---------------------------------------------------------------|
-    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |
-    |---------------------------------------------------------------|
-    |    |    |    |                        |     |     |   |   |   |
-    *---------------------------------------------------------------*
-
-#### _DL: Dvorak Layer.
-    .---------------------------------------------------------------.
-    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |
-    |---------------------------------------------------------------|
-    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |
-    |---------------------------------------------------------------|
-    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |   |
-    |---------------------------------------------------------------|
-    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |
-    |---------------------------------------------------------------|
-    |    |    |    |                        |     |     |   |   |   |
-    *---------------------------------------------------------------*
-
-#### _CL: Colmak Layer.
-    .---------------------------------------------------------------.
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    |---------------------------------------------------------------|
-    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |
-    |---------------------------------------------------------------|
-    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |   |
-    |---------------------------------------------------------------|
-    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |
-    |---------------------------------------------------------------|
-    |    |    |    |                        |     |     |   |   |   |
-    *---------------------------------------------------------------*
-
-#### _FL: Function Layer.
-    .---------------------------------------------------------------.
-    |Web|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|SLock  |PSc|
-    |---------------------------------------------------------------|
-    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |Pau|
-    |---------------------------------------------------------------|
-    |FnCaps|   |   |   |   |   |Lft|Dwn|Up |Rgt|   |   |        |Hme|
-    |---------------------------------------------------------------|
-    |        |   |   |   |   |   |   |   |   |   |   |VlMute|VlU|End|
-    |---------------------------------------------------------------|
-    |    |    |Menu|      SP4               |     |     |WBk|VlD|WFw|
-    *---------------------------------------------------------------*
-
-#### _AL: Adjust Layer - Keymap select, RGB Underglow, LED backlight, and Dynamic Macro settings.
-    .---------------------------------------------------------------.
-    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |MP1|
-    |---------------------------------------------------------------|
-    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     |MR1|
-    |---------------------------------------------------------------|
-    |FnCaps|   |   |_DL|   |   |   |   |   |   |   |   |        |MS |
-    |---------------------------------------------------------------|
-    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |   |MR2|
-    |---------------------------------------------------------------|
-    |Rst |    |    |                        |     |     |   |   |MP2|
-    *---------------------------------------------------------------*
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk b/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk
deleted file mode 100644
index 5ff16d47103..00000000000
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-TAP_DANCE_ENABLE = no       # Enable TapDance functionality
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+1500)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes           # Nkey Rollover - If this doesn't work, add this to config.h: #define FORCE_NKRO
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = no      # Enable extended unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6#VARIABLE_TRACE = no         # Use this to debug changes to variable values
-KEY_LOCK_ENABLE = no        # This enables key lock(+260)
-SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
diff --git a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/config.h b/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/config.h
deleted file mode 100644
index a5568e400de..00000000000
--- a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../config.h"
diff --git a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c b/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c
deleted file mode 100644
index 00068afe95c..00000000000
--- a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-      QK_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_BSLS, KC_GRV, KC_INS,
-      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_BSPC, KC_DEL,
-      MO(1), 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_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_SPACE, KC_SPACE, KC_SPACE, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-  [1] = LAYOUT(
-      KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_DEL, KC_TRNS,
-      MO(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, 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_PGDN, KC_PGUP, KC_TRNS, KC_TRNS, KC_PGUP, KC_VOLD,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_HOME, KC_PGDN, KC_END
-      ),
-  [2] = LAYOUT(
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      MO(1), RGB_SAD, RGB_SAI, KC_TRNS, KC_TRNS, RGB_HUD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS
-      ),
-};
diff --git a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/readme.md b/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/readme.md
deleted file mode 100644
index 4083d8f470f..00000000000
--- a/keyboards/jc65/v32u4/keymaps/jetpacktuxedo/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Jetpacktuxedo's Keymap
-===
-
-Split backspace, 6.25u space, caps is fn, my standard fn layer, reset + rgb controls on layer(2)
-
-Keymap Maintainer: [Ethan Madden](https://github.com/jetpacktuxedo)
-
-Difference from base layout: The base layer is the same, except caps is fn, and there are additional tools on layers
-
-Intended usage: This is my daily driver keymap
diff --git a/keyboards/jc65/v32u4/keymaps/na7thana/config.h b/keyboards/jc65/v32u4/keymaps/na7thana/config.h
deleted file mode 100644
index a5568e400de..00000000000
--- a/keyboards/jc65/v32u4/keymaps/na7thana/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../config.h"
diff --git a/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c b/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
deleted file mode 100644
index 70ae80044d1..00000000000
--- a/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-      QK_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_NO, KC_BSLS, 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_BSPC, KC_PGUP,
-      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_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, MO(1),
-      KC_LCTL, KC_LALT, KC_LALT, KC_SPACE, KC_SPACE, KC_SPACE, KC_SPACE, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-  [1] = LAYOUT(
-      QK_BOOT, 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_HOME, KC_END, KC_DEL, KC_TRNS,
-      KC_CAPS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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_MPRV, KC_MNXT, KC_MPLY, KC_MPLY, KC_VOLU, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_VOLD, KC_TRNS
-      ),
-};
diff --git a/keyboards/jc65/v32u4/keymaps/na7thana/readme.md b/keyboards/jc65/v32u4/keymaps/na7thana/readme.md
deleted file mode 100644
index 13430a630b8..00000000000
--- a/keyboards/jc65/v32u4/keymaps/na7thana/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Default Keymap
-===
-
-Super simple default keymap with only a base layer.
-
-Keymap Maintainer: [Ethan Madden](https://github.com/jetpacktuxedo)
-
-Difference from base layout: This is (as close as I can tell) the same as the layout that ships on the boards other than default underglow color.
-
-Intended usage: This is mostly provided for testing before you build your own keymap and as a reference to a stock(ish) configuration
diff --git a/keyboards/jd40/keymaps/myoung34/keymap.c b/keyboards/jd40/keymaps/myoung34/keymap.c
deleted file mode 100644
index 4798dbac49c..00000000000
--- a/keyboards/jd40/keymaps/myoung34/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _AL 1
-#define _UL 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BL] = LAYOUT(
-        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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,     KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,    KC_N,    KC_M,    KC_COMM, KC_UP,   KC_DOT,
-        _______, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC,  KC_SPC,  MO(_AL), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_AL] = LAYOUT(
-         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_TAB,     KC_F1,     KC_F2,     KC_F3,        KC_F4,       KC_F5,      KC_F6,     KC_F7,    KC_F8,     KC_F9,    KC_ENT,
-        _______,   _______, KC_SCLN,    KC_QUOTE,  KC_LBRC, KC_RBRC,  KC_BSLS,    KC_MINUS,  KC_EQUAL,   KC_PGUP,  KC_SLASH,
-        _______,   _______,   _______,   _______,      MO(_UL),     TG(_UL),    _______,   KC_HOME,  KC_PGDN,    KC_END
-    ),
-
-    [_UL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-        ),
-    };
diff --git a/keyboards/jd40/keymaps/vanagon/README.md b/keyboards/jd40/keymaps/vanagon/README.md
deleted file mode 100644
index 09a4e23a6ee..00000000000
--- a/keyboards/jd40/keymaps/vanagon/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Vanagon
-===
-Port of [evangs'](https://thevankeyboards.com) [MiniVan layout](https://www.massdrop.com/talk/115/where-did-all-my-keys-go-a-look-into-the-function-layers-of-the-mini-van) to the JD40. Includes colon/semicolon support, which is missing from the MiniVan layout.
-
-This layout uses a 44 key configuration similar to the following:
-
-```
-,------+------+------+------+------+------+------+------+------+------+------+------.
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------`------`------`------`------`------`------`------`------`------`------`------|
-|       |      |      |      |      |      |      |      |      |      |            |
-|-------`------`------`------`------`------`------`------`------`------`------------|
-|         |      |      |      |      |      |       |      |      |      |         |
-|---------`------`------`------`------`------'-------`------`------`------`---------|
-|      |      |      |       |            |            |       |      |      |      |
-`------+------+------+-------+----^^^-----+----^^^-----+-------+------+------+------'
-```
diff --git a/keyboards/jd40/keymaps/vanagon/config.h b/keyboards/jd40/keymaps/vanagon/config.h
deleted file mode 100644
index ed09b50ee4d..00000000000
--- a/keyboards/jd40/keymaps/vanagon/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "../../config.h"
-
-#define LAYOUT_VANAGON(\
-	K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, \
-	K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \
-	K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, \
-	K35, K36, K37, K38, K39, K40, K41, K42, K43, K44 \
-) { \
-	{ K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12 }, \
-	{ K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23 }, \
-	{ K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34 }, \
-	{ K35, K36, K37, K38, K39, KC_NO, K40, K41, K42, K43, K44 } \
-}
diff --git a/keyboards/jd40/keymaps/vanagon/keymap.c b/keyboards/jd40/keymaps/vanagon/keymap.c
deleted file mode 100644
index 5f1cfc35795..00000000000
--- a/keyboards/jd40/keymaps/vanagon/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-enum
-{
-    _BL = 0,
-    _AL1,
-    _AL2,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BL] = LAYOUT_VANAGON(
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        MO(_AL1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, MO(_AL1),
-        SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
-        MO(_AL2), KC_LCTL, KC_LALT, KC_LGUI, KC_ENT, KC_SPC, KC_RGUI, KC_RALT, SC_RSPC, MO(_AL2)),
-    [_AL1] = LAYOUT_VANAGON(
-        KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC, KC_TRNS,
-        KC_TRNS, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL, KC_COLN, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS,
-        KC_TRNS, KC_ESC, KC_VOLD, KC_VOLU, 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_TRNS, KC_TRNS),
-    [_AL2] = LAYOUT_VANAGON(
-        KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
-        KC_TRNS, KC_PIPE, KC_DQT, KC_UNDS, KC_PLUS, KC_SCLN, KC_TRNS, KC_4, KC_5, KC_6, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_1, KC_2, KC_3, 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/jd45/keymaps/mjt6u/config.h b/keyboards/jd45/keymaps/mjt6u/config.h
deleted file mode 100644
index 41d1557c6f1..00000000000
--- a/keyboards/jd45/keymaps/mjt6u/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define USB_MAX_POWER_CONSUMPTION 50
diff --git a/keyboards/jd45/keymaps/mjt6u/keymap.c b/keyboards/jd45/keymaps/mjt6u/keymap.c
deleted file mode 100644
index 30c6daaf390..00000000000
--- a/keyboards/jd45/keymaps/mjt6u/keymap.c
+++ /dev/null
@@ -1,153 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum jd45_layers
-{
-    _QWERTY,
-    _QWERTYNUMMODS,
-    _NUMSYM,
-    _FUNCTION,
-    _NUMPAD,
-    _FKEYNUMPAD,
-    _ADJUST
-};
-
-enum jd45_keycodes
-{
-    NUMSYM = SAFE_RANGE,
-    MACSLEEP,
-    USEFNMODS,
-    USENUMMODS,
-    DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-#define LONGPRESS_DELAY 150
-#define LAYER_TOGGLE_DELAY 900
-
-#define __MOD__ KC_TRNS
-#define F_FNSPC LT(_NUMSYM, KC_SPC)
-#define F_NUMSPC LT(_NUMPAD, KC_SPC)
-#define F_FNTAB LT(_FUNCTION, KC_TAB)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-    F_FNTAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,          KC_MINS,     KC_BSPC,
-    CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,                    LT(_ADJUST, KC_QUOT),
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    SFT_T(KC_ENT),
-    XXXXXXX,       KC_LALT, KC_LGUI, XXXXXXX,          XXXXXXX,          F_FNSPC,          XXXXXXX, MO(_FUNCTION), MO(_ADJUST), XXXXXXX
-  ),
-
-  [_QWERTYNUMMODS] = LAYOUT(
-    F_FNTAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,            KC_MINS,     KC_BSPC,
-    CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L,    KC_SCLN,                      LT(_ADJUST, KC_QUOT),
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,     KC_COMM, KC_DOT,  KC_SLSH,                      SFT_T(KC_ENT),
-    XXXXXXX,       KC_LALT, KC_LGUI, XXXXXXX,          XXXXXXX,          F_NUMSPC,          XXXXXXX, MO(_FKEYNUMPAD), MO(_ADJUST), XXXXXXX
-  ),
-
-  [_NUMSYM] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, KC_DEL,
-    __MOD__, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,          _______,
-    _______, _______, _______, _______, _______, KC_SPC,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,          _______,
-    XXXXXXX, __MOD__, __MOD__, XXXXXXX,          XXXXXXX,          _______,          XXXXXXX, __MOD__, __MOD__, XXXXXXX
-  ),
-
-  [_FUNCTION] = LAYOUT(
-    __MOD__, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    __MOD__, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    XXXXXXX, __MOD__, __MOD__, XXXXXXX,          XXXXXXX,          _______,          XXXXXXX, __MOD__, __MOD__, XXXXXXX
-  ),
-
-  [_NUMPAD] = LAYOUT(
-    KC_GRV,  _______, KC_UP,   _______, KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_PSCR, KC_LBRC, KC_RBRC,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_4,    KC_5,    KC_6,    KC_INS,  KC_HOME, KC_PGUP, _______,          _______,
-    _______, _______, _______, _______, KC_1,    KC_2,    KC_3,    KC_DEL,  KC_END,  KC_PGDN, _______,          _______,
-    XXXXXXX, _______, _______, XXXXXXX,          XXXXXXX,          _______,          XXXXXXX, __MOD__, __MOD__, XXXXXXX
-  ),
-
-  [_FKEYNUMPAD] = LAYOUT(
-    _______, _______, KC_VOLU, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, _______, _______,
-    _______, KC_MPRV, KC_VOLD, KC_MNXT, KC_F4,   KC_F5,   KC_F6,   KC_J,    KC_K,    KC_L,    KC_SCLN,          _______,
-    _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_MUTE, KC_MPRV, KC_MNXT, KC_MSTP,          _______,
-    XXXXXXX, _______, _______, XXXXXXX,          XXXXXXX,          _______,          XXXXXXX, __MOD__, __MOD__, XXXXXXX
-  ),
-
-  [_ADJUST] = LAYOUT(
-    _______, QK_BOOT, _______, _______, _______,   _______, _______,    DM_REC1,  DM_REC2,  _______,  KC_PSCR, _______, _______,
-    _______, _______, _______, _______, USEFNMODS, _______, _______,    DM_PLY1,  DM_PLY2, MACSLEEP, _______,          _______,
-    _______, _______, _______, _______, _______,   _______, USENUMMODS, _______,         _______,         _______,  _______,          _______,
-    XXXXXXX, _______, _______, XXXXXXX,            XXXXXXX,             _______,                          XXXXXXX, __MOD__,  __MOD__, XXXXXXX
-  )
-};
-
-void persistent_default_layer_set(uint16_t default_layer)
-{
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-static bool singular_key = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    uint16_t macro_kc = (keycode == MO(_ADJUST) ? DM_RSTP : keycode);
-    if (!process_record_dynamic_macro(macro_kc, record))
-    {
-        return false;
-    }
-    println(" ");
-    print("process record");
-
-    switch (keycode)
-    {
-    case MACSLEEP:
-        if (record->event.pressed)
-        {
-            // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
-            register_code(KC_RSFT);
-            register_code(KC_RCTL);
-            register_code(KC_PWR);
-            unregister_code(KC_PWR);
-            unregister_code(KC_RCTL);
-            unregister_code(KC_RSFT);
-        }
-        return false;
-        break;
-    case USEFNMODS:
-        if (record->event.pressed)
-        {
-            persistent_default_layer_set(1UL << _QWERTY);
-#ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_fnpc);
-#endif
-            print("Space-FN");
-        }
-        return false;
-        break;
-    case USENUMMODS:
-        if (record->event.pressed)
-        {
-            persistent_default_layer_set(1UL << _QWERTYNUMMODS);
-#ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_fnmac);
-#endif
-            print("Space-Numpad");
-        }
-        return false;
-        break;
-    default:
-        singular_key = false;
-        break;
-    }
-
-    return true;
-};
-
-void matrix_init_user(void)
-{
-#ifdef AUDIO_ENABLE
-    startup_user();
-#endif
-    // debug_enable = true;
-}
diff --git a/keyboards/jd45/keymaps/mjt6u/readme.md b/keyboards/jd45/keymaps/mjt6u/readme.md
deleted file mode 100644
index a43ddf5fcac..00000000000
--- a/keyboards/jd45/keymaps/mjt6u/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Mike's JD45 with 6u Spacebar
-
-- Early draft of numsym that misses a lot of symbols
-- Numpad layer available for evaluation
-- Works with iPhone Camera Adapter
-- Dynamic macros
-
-## Layers
-
-Qwerty for letters and mods.
-
-Qwertymods layer switches some Modifiers around
-
-Numsym puts the number keys across the top row like a Planck. Arrows are on hjkl
-which makes the other NumSym dynamic from my other boards fall apart
-
-Function layer replaces the top row numbers with Fkeys.
-
-Numpad layer makes a number pad in the center.
-
-Fkeynumpad replaces the numpad numbers with Fkeys.
-
-Adjust layer has macros and configuration.
diff --git a/keyboards/jd45/keymaps/mjt6u/rules.mk b/keyboards/jd45/keymaps/mjt6u/rules.mk
deleted file mode 100644
index 1d2e0f09e18..00000000000
--- a/keyboards/jd45/keymaps/mjt6u/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
-DEBUG_ENABLE = yes
-
diff --git a/keyboards/jels/jels60/v2/config.h b/keyboards/jels/jels60/v2/config.h
index 02d9619a301..274e7fcf628 100644
--- a/keyboards/jels/jels60/v2/config.h
+++ b/keyboards/jels/jels60/v2/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#define WS2812_PIO_USE_PIO1
-#define RGBLIGHT_DEFAULT_VAL 0
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/jels/jels60/v2/info.json b/keyboards/jels/jels60/v2/info.json
index 1945b101cfc..69ec00193a0 100644
--- a/keyboards/jels/jels60/v2/info.json
+++ b/keyboards/jels/jels60/v2/info.json
@@ -31,6 +31,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 0
         }
     },
     "indicators": {
diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index 0b1d1154951..2d5641fa699 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_VAL 0  // start off
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index cc8e525525c..598075fd424 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -34,6 +34,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 0
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/jian/keymaps/default/config.h b/keyboards/jian/keymaps/default/config.h
deleted file mode 100644
index 314836a54df..00000000000
--- a/keyboards/jian/keymaps/default/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
diff --git a/keyboards/jian/keymaps/left_hand/config.h b/keyboards/jian/keymaps/left_hand/config.h
deleted file mode 100644
index cae66a5c3aa..00000000000
--- a/keyboards/jian/keymaps/left_hand/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
diff --git a/keyboards/jian/keymaps/via/config.h b/keyboards/jian/keymaps/via/config.h
deleted file mode 100644
index cae66a5c3aa..00000000000
--- a/keyboards/jian/keymaps/via/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 5025847259a..7df400367fc 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -22,14 +22,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_TIMER
 
 #ifndef IOS_DEVICE_ENABLE
-#if RGBLED_NUM <= 6
+#if RGBLIGHT_LED_COUNT <= 6
 #define RGBLIGHT_LIMIT_VAL 255
 #else
 #define RGBLIGHT_LIMIT_VAL 130
 #endif
 #define RGBLIGHT_VAL_STEP 8
 #else
-#if RGBLED_NUM <= 6
+#if RGBLIGHT_LED_COUNT <= 6
 #define RGBLIGHT_LIMIT_VAL 90
 #else
 #define RGBLIGHT_LIMIT_VAL 45
diff --git a/keyboards/jian/rev1/post_config.h b/keyboards/jian/rev1/post_config.h
index fade065e192..935d0d1f015 100644
--- a/keyboards/jian/rev1/post_config.h
+++ b/keyboards/jian/rev1/post_config.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #ifndef IOS_DEVICE_ENABLE
-#    if RGBLED_NUM <= 6
+#    if RGBLIGHT_LED_COUNT <= 6
 #        define RGBLIGHT_LIMIT_VAL 255
 #    else
 #        define RGBLIGHT_LIMIT_VAL 130
 #    endif
 #    define RGBLIGHT_VAL_STEP 8
 #else
-#    if RGBLED_NUM <= 6
+#    if RGBLIGHT_LED_COUNT <= 6
 #        define RGBLIGHT_LIMIT_VAL 90
 #    else
 #        define RGBLIGHT_LIMIT_VAL 45
diff --git a/keyboards/jian/rev2/post_config.h b/keyboards/jian/rev2/post_config.h
index fade065e192..935d0d1f015 100644
--- a/keyboards/jian/rev2/post_config.h
+++ b/keyboards/jian/rev2/post_config.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #ifndef IOS_DEVICE_ENABLE
-#    if RGBLED_NUM <= 6
+#    if RGBLIGHT_LED_COUNT <= 6
 #        define RGBLIGHT_LIMIT_VAL 255
 #    else
 #        define RGBLIGHT_LIMIT_VAL 130
 #    endif
 #    define RGBLIGHT_VAL_STEP 8
 #else
-#    if RGBLED_NUM <= 6
+#    if RGBLIGHT_LED_COUNT <= 6
 #        define RGBLIGHT_LIMIT_VAL 90
 #    else
 #        define RGBLIGHT_LIMIT_VAL 45
diff --git a/keyboards/jidohun/km113/config.h b/keyboards/jidohun/km113/config.h
new file mode 100644
index 00000000000..aaf717eca42
--- /dev/null
+++ b/keyboards/jidohun/km113/config.h
@@ -0,0 +1,15 @@
+// Copyright 2023 wind (@yelishang)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI Config */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+/* SPI Flash Config */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+
diff --git a/keyboards/jidohun/km113/halconf.h b/keyboards/jidohun/km113/halconf.h
new file mode 100644
index 00000000000..6ff2f1ec677
--- /dev/null
+++ b/keyboards/jidohun/km113/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 wind (@yelishang)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/jidohun/km113/info.json b/keyboards/jidohun/km113/info.json
new file mode 100644
index 00000000000..05fb901d4c6
--- /dev/null
+++ b/keyboards/jidohun/km113/info.json
@@ -0,0 +1,269 @@
+{
+    "manufacturer": "JIDOHUN",
+    "keyboard_name": "KM113",
+    "maintainer": "wind",
+    "bootloader": "wb32-dfu",
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096,
+            "driver": "spi_flash"
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A9"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "A5", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "C13"]
+    },
+    "processor": "WB32FQ95",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [5, 8], "x": 119, "y": 64, "flags": 4},
+            {"matrix": [5, 9], "x": 134, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 149, "y": 64, "flags": 4},
+            {"matrix": [5, 11], "x": 164, "y": 64, "flags": 4},
+            {"matrix": [5, 12], "x": 179, "y": 64, "flags": 4},
+            {"matrix": [5, 13], "x": 194, "y": 64, "flags": 4},
+            {"matrix": [5, 14], "x": 209, "y": 64, "flags": 4},
+            {"matrix": [5, 15], "x": 224, "y": 64, "flags": 4},
+            {"matrix": [4, 15], "x": 224, "y": 51, "flags": 4},
+            {"matrix": [4, 14], "x": 209, "y": 51, "flags": 4},
+            {"matrix": [4, 13], "x": 194, "y": 51, "flags": 4},
+            {"matrix": [4, 12], "x": 179, "y": 51, "flags": 4},
+            {"matrix": [4, 11], "x": 164, "y": 51, "flags": 4},
+            {"matrix": [4, 10], "x": 149, "y": 51, "flags": 4},
+            {"matrix": [4, 9], "x": 134, "y": 51, "flags": 4},
+            {"matrix": [4, 8], "x": 119, "y": 51, "flags": 4},
+            {"matrix": [4, 7], "x": 105, "y": 51, "flags": 4},
+            {"matrix": [4, 6], "x": 90, "y": 51, "flags": 4},
+            {"matrix": [4, 5], "x": 75, "y": 51, "flags": 4},
+            {"matrix": [4, 4], "x": 60, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 45, "y": 51, "flags": 4},
+            {"matrix": [4, 2], "x": 30, "y": 51, "flags": 4},
+            {"matrix": [3, 1], "x": 15, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 30, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 60, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 75, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 90, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 105, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 119, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 134, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 149, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 164, "y": 38, "flags": 4},
+            {"matrix": [3, 12], "x": 179, "y": 38, "flags": 4},
+            {"matrix": [3, 14], "x": 209, "y": 38, "flags": 4},
+            {"matrix": [3, 15], "x": 224, "y": 38, "flags": 4},
+            {"matrix": [2, 15], "x": 224, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 209, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 194, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 179, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 164, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 149, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 134, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 119, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 90, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 75, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 60, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 45, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 1], "x": 15, "y": 26, "flags": 4},
+            {"matrix": [1, 1], "x": 15, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 30, "y": 13, "flags": 4},
+            {"matrix": [1, 3], "x": 45, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 60, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 75, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 90, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 105, "y": 13, "flags": 4},
+            {"matrix": [1, 8], "x": 119, "y": 13, "flags": 4},
+            {"matrix": [1, 9], "x": 134, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 149, "y": 13, "flags": 4},
+            {"matrix": [1, 11], "x": 164, "y": 13, "flags": 4},
+            {"matrix": [1, 12], "x": 179, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 194, "y": 13, "flags": 4},
+            {"matrix": [0, 13], "x": 194, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4},
+            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [5, 1], "x": 15, "y": 64, "flags": 4},
+            {"matrix": [5, 2], "x": 30, "y": 64, "flags": 4},
+            {"matrix": [5, 5], "x": 75, "y": 64, "flags": 4}
+        ],
+        "max_brightness": 108
+    },
+    "url": "http://www.frscn.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3671",
+        "suspend_wakeup_delay": 1000,
+        "vid": "0x3555"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 17, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 16.5, "y": 2},
+                {"matrix": [2, 15], "x": 17.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 16.5, "y": 3},
+                {"matrix": [3, 15], "x": 17.5, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.5, "y": 4},
+                {"matrix": [4, 15], "x": 17.5, "y": 4},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5},
+                {"matrix": [5, 9], "x": 11, "y": 5},
+                {"matrix": [5, 10], "x": 12, "y": 5},
+                {"matrix": [5, 11], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 16.5, "y": 5},
+                {"matrix": [5, 15], "x": 17.5, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jidohun/km113/keymaps/default/keymap.c b/keyboards/jidohun/km113/keymaps/default/keymap.c
new file mode 100644
index 00000000000..088adc8742c
--- /dev/null
+++ b/keyboards/jidohun/km113/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2023 wind (@yelishang)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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,
+        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_MUTE,
+        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,                  TO(0),    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,                   TO(1),    KC_END,
+        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,                    TO(2),    KC_PGUP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3),    KC_PGDN
+    ),
+
+    [1] = LAYOUT(
+        EE_CLR,           KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV,  KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_MYCM, KC_CALC,
+        _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, RGB_RMOD, RGB_MOD, _______,                 _______,
+        _______, _______, _______, _______, RGB_MOD, _______, _______, KC_PSCR,  KC_PGUP, KC_DEL,  _______, _______, _______, _______,                  TO(0),   _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_INS,   KC_PGDN, KC_END,  _______, _______,          _______,                  TO(1),   _______,
+        _______,          _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, RGB_VAI,                  TO(2),   _______,
+        _______, GU_TOGG, _______,                           RGB_TOG,                              _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI,TO(3),   _______
+    ),
+
+    [2] = 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_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_MUTE,
+        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,                  TO(0),    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,                   TO(1),    KC_END,
+        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,                    TO(2),    KC_PGUP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3),    KC_PGDN
+    ),
+
+    [3] = 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_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_MUTE,
+        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,                  TO(0),    _______,
+        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,                   TO(1),    _______,
+        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,                    TO(2),    _______,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3),    _______
+    )
+};
diff --git a/keyboards/jidohun/km113/keymaps/via/keymap.c b/keyboards/jidohun/km113/keymaps/via/keymap.c
new file mode 100644
index 00000000000..b87dc22614d
--- /dev/null
+++ b/keyboards/jidohun/km113/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+// Copyright 2023 wind (@yelishang)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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,
+        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_MUTE,
+        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,                  TO(0),    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,                   TO(1),    KC_END,
+        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,                    TO(2),    KC_PGUP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3),    KC_PGDN
+    ),
+
+    [1] = LAYOUT(
+        EE_CLR,           KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV,  KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_MYCM, KC_CALC,
+        _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, RGB_RMOD, RGB_MOD, _______,                 _______,
+        _______, _______, _______, _______, RGB_MOD, _______, _______, KC_PSCR,  KC_PGUP, KC_DEL,  _______, _______, _______, _______,                  TO(0),   _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_INS,   KC_PGDN, KC_END,  _______, _______,          _______,                  TO(1),   _______,
+        _______,          _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, RGB_VAI,                  TO(2),   _______,
+        _______, GU_TOGG, _______,                           RGB_TOG,                              _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI,TO(3),   _______
+    ),
+
+    [2] = 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_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_MUTE,
+        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,                  TO(0),    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,                   TO(1),    KC_END,
+        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,                    TO(2),    KC_PGUP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3),    KC_PGDN
+    ),
+
+    [3] = 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_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_MUTE,
+        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,                  TO(0),    _______,
+        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,                   TO(1),    _______,
+        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,                    TO(2),    _______,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, TO(3),    _______
+    )
+};
+
+/* encoder; start */
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/jidohun/km113/keymaps/via/rules.mk b/keyboards/jidohun/km113/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/jidohun/km113/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/jidohun/km113/mcuconf.h b/keyboards/jidohun/km113/mcuconf.h
new file mode 100644
index 00000000000..bdf256bc1a1
--- /dev/null
+++ b/keyboards/jidohun/km113/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 wind (@yelishang)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
diff --git a/keyboards/jidohun/km113/readme.md b/keyboards/jidohun/km113/readme.md
new file mode 100644
index 00000000000..0951a474c0a
--- /dev/null
+++ b/keyboards/jidohun/km113/readme.md
@@ -0,0 +1,23 @@
+
+# KM113
+
+* Keyboard Maintainer: [wind](https://github.com/yelishang)
+* Hardware Supported: KM113 PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jidohun/km113:default
+
+Flashing example for this keyboard:
+
+    make jidohun/km113: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 `QK_BOOT` if it is available
diff --git a/keyboards/jidohun/km113/rules.mk b/keyboards/jidohun/km113/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/jidohun/km113/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/jkdlab/binary_monkey/keymaps/ascii/keymap.c b/keyboards/jkdlab/binary_monkey/keymaps/ascii/keymap.c
deleted file mode 100644
index e10df7ce08c..00000000000
--- a/keyboards/jkdlab/binary_monkey/keymaps/ascii/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2021 JKDLAB. <jkdlab.co@gmail.com>
- * Copyright 2021 Jaehee <ljh34210329@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 3 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see https://www.gnu.org/licenses/.
- */
- 
-#include QMK_KEYBOARD_H
-
-char ascii = 0;
-
-enum custom_keycodes {
-    BIN_0 = SAFE_RANGE,
-    BIN_1,
-    BIN_RETURN
-};
-
-enum layers {
-    _BASE = 0
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        BIN_0,   BIN_1,
-          BIN_RETURN
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        case BIN_0:
-            if (record->event.pressed) {   
-                ascii = ascii << 1;
-            }
-
-            return true;
-        case BIN_1:
-            if (record->event.pressed) {
-                    ascii = ascii << 1;
-                    ++ascii;
-                }
-
-            return true;
-        case BIN_RETURN:
-            if (record->event.pressed) {
-                char str[2] = { ascii & 127, '\0' };
-
-                send_string(str);
-
-                ascii = 0;
-            }
-
-            return true;
-        default:
-            return true;
-    }
-
-    return true;
-}
diff --git a/keyboards/jkeys_design/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h
deleted file mode 100644
index 70ddb0cf5a2..00000000000
--- a/keyboards/jkeys_design/gentleman65/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 Omar Afzal
-
-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_MATRIX_LED_COUNT 14
diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json
index bd929c6faa3..734916fb404 100644
--- a/keyboards/jkeys_design/gentleman65/info.json
+++ b/keyboards/jkeys_design/gentleman65/info.json
@@ -26,9 +26,6 @@
     "ws2812": {
         "pin": "F4"
     },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
     "matrix_pins": {
         "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "B2", "B1", "B3", "B0", "B7", "D0"],
         "rows": ["D3", "D2", "D1", "F7", "F1"]
diff --git a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/features/custom_shift_keys.c b/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/features/custom_shift_keys.c
deleted file mode 100644
index e217adcf09e..00000000000
--- a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/features/custom_shift_keys.c
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2021-2023 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.
-
-/**
- * @file custom_shift_keys.c
- * @brief Custom Shift Keys implementation
- *
- * For full documentation, see
- * <https://getreuer.info/posts/keyboards/custom-shift-keys>
- */
-
-#include "custom_shift_keys.h"
-
-bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record) {
-    static uint16_t registered_keycode = KC_NO;
-
-    // If a custom shift key is registered, then this event is either releasing
-    // it or manipulating another key at the same time. Either way, we release
-    // the currently registered key.
-    if (registered_keycode != KC_NO) {
-        unregister_code16(registered_keycode);
-        registered_keycode = KC_NO;
-    }
-
-    if (record->event.pressed) { // Press event.
-        const uint8_t mods = get_mods();
-#ifndef NO_ACTION_ONESHOT
-        if ((mods | get_weak_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-#else
-        if ((mods | get_weak_mods()) & MOD_MASK_SHIFT) { // Shift is held.
-#endif // NO_ACTION_ONESHOT
-            // Continue default handling if this is a tap-hold key being held.
-            if ((IS_QK_MOD_TAP(keycode) || IS_QK_LAYER_TAP(keycode)) && record->tap.count == 0) {
-                return true;
-            }
-
-            // Search for a custom shift key whose keycode is `keycode`.
-            for (int i = 0; i < NUM_CUSTOM_SHIFT_KEYS; ++i) {
-                if (keycode == custom_shift_keys[i].keycode) {
-                    registered_keycode = custom_shift_keys[i].shifted_keycode;
-                    if (IS_QK_MODS(registered_keycode) && // Should keycode be shifted?
-                        (QK_MODS_GET_MODS(registered_keycode) & MOD_LSFT) != 0) {
-                        register_code16(registered_keycode); // If so, press it directly.
-                    } else {
-                        // Otherwise cancel shift mods, press the key, and restore mods.
-                        del_weak_mods(MOD_MASK_SHIFT);
-#ifndef NO_ACTION_ONESHOT
-                        del_oneshot_mods(MOD_MASK_SHIFT);
-#endif // NO_ACTION_ONESHOT
-                        unregister_mods(MOD_MASK_SHIFT);
-                        register_code16(registered_keycode);
-                        set_mods(mods);
-                    }
-                    return false;
-                }
-            }
-        }
-    }
-
-    return true; // Continue with default handling.
-}
\ No newline at end of file
diff --git a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/features/custom_shift_keys.h b/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/features/custom_shift_keys.h
deleted file mode 100644
index 7d1ee13a459..00000000000
--- a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/features/custom_shift_keys.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// 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.
-
-/**
- * @file custom_shift_keys.h
- * @brief Custom shift keys: customize what keycode is produced when shifted.
- *
- * Overview
- * --------
- *
- * This library implements custom shift keys, keys where you can customize
- * what keycode is produced when shifted.
- *
- * Step 1: In your keymap.c, define a table of custom shift keys like
- *
- *     #include "features/custom_shift_keys.h"
- *
- *     const custom_shift_key_t custom_shift_keys[] = {
- *       {KC_DOT , KC_QUES}, // Shift . is ?
- *       {KC_COMM, KC_EXLM}, // Shift , is !
- *       {KC_MINS, KC_EQL }, // Shift - is =
- *       {KC_COLN, KC_SCLN}, // Shift : is ;
- *     };
- *
- * Each row defines one key. The first field is the keycode as it appears in
- * your layout and determines what is typed normally. The second entry is what
- * you want the key to type when shifted.
- *
- * Step 2: Handle custom shift keys from your `process_record_user` function as
- *
- *     bool process_record_user(uint16_t keycode, keyrecord_t* record) {
- *       if (!process_custom_shift_keys(keycode, record)) { return false; }
- *       // Your macros ...
- *
- *       return true;
- *     }
- *
- * Step 3: add `features/custom_shift_keys.c` to your rules.mk as
- *
- *     SRC += features/custom_shift_keys.c
- *
- *
- * For full documentation, see
- * <https://getreuer.info/posts/keyboards/custom-shift-keys>
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Custom shift key entry. The `keycode` field is the keycode as it appears in
- * your layout and determines what is typed normally. The `shifted_keycode` is
- * what you want the key to type when shifted.
- */
-typedef struct {
-    uint16_t keycode;
-    uint16_t shifted_keycode;
-} custom_shift_key_t;
-
-/** Table of custom shift keys. */
-extern const custom_shift_key_t custom_shift_keys[];
-/** Number of entries in the `custom_shift_keys` table. */
-extern uint8_t NUM_CUSTOM_SHIFT_KEYS;
-
-/**
- * Handler function for custom shift keys.
- *
- * In keymap.c, call this function from your `process_record_user` function as
- *
- *     #include "features/custom_shift_keys.h"
- *
- *     bool process_record_user(uint16_t keycode, keyrecord_t* record) {
- *       if (!process_custom_shift_keys(keycode, record)) { return false; }
- *       // Your macros ...
- *
- *       return true;
- *     }
- */
-bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record);
-
-#ifdef __cplusplus
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/keymap.c b/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/keymap.c
deleted file mode 100644
index cb6fff1a0fd..00000000000
--- a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/keymap.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2021 Omar Afzal
- *
- * 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 "features/custom_shift_keys.h"
-
-#define FN_ESC LT(_FUNC, KC_ESC)
-
-enum gentleman_layers {
-    _QWERTY,
-    _WORKMAN,
-    _FUNC,
-};
-
-enum gentleman_keycodes {
-    QWERTY = SAFE_RANGE,
-    WORKMAN,
-    FUNC,
-};
-
-const custom_shift_key_t custom_shift_keys[] = {{KC_ESC, KC_TILD}};
-
-uint8_t NUM_CUSTOM_SHIFT_KEYS = sizeof(custom_shift_keys) / sizeof(custom_shift_key_t);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_QWERTY] = LAYOUT_65_ansi_rwkl_split_bs(
-		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_TRNS,
-		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,
-		FN_ESC,   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,  KC_RCTL,          KC_LEFT, KC_DOWN,  KC_RGHT
-    ),
-
-	[_WORKMAN] = LAYOUT_65_ansi_rwkl_split_bs(
-		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_TRNS,
-		KC_TAB,   KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC,          KC_BSLS,  KC_DEL,
-		FN_ESC,   KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT,          KC_ENT,            KC_PGUP,
-		KC_LSFT,           KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            KC_UP,  KC_PGDN,
-		KC_LCTL,  KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT,  KC_RCTL,          KC_LEFT, KC_DOWN,  KC_RGHT
-    ),
-
-    [_FUNC] = LAYOUT_65_ansi_rwkl_split_bs(
-        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_TRNS, KC_TRNS, QK_BOOT,
-        KC_TRNS,  KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   AG_NORM, AG_SWAP, QWERTY,  WORKMAN,          KC_TRNS, KC_INS,
-        KC_TRNS,  KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_END,           KC_TRNS,          KC_HOME,
-        KC_TRNS,           KC_WH_L, KC_BTN3, KC_WH_R, KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_SAI, RGB_SAD, KC_TRNS,          RGB_HUI, KC_END,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_MPLY,                            KC_TRNS, KC_TRNS,          KC_MPRV, RGB_HUD, KC_MNXT
-    ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            case _FUNC:
-                // Vertical Scroll
-                clockwise ? tap_code(KC_WH_D) : tap_code(KC_WH_U);
-                return false;
-                break;
-            default:
-                // Horizontal Scroll
-                if ((get_mods() & MOD_BIT(KC_LSFT)) == MOD_BIT(KC_LSFT)) {
-                    clockwise ? tap_code(KC_WH_D) : tap_code(KC_WH_U);
-                    return false;
-                }
-                // Volume
-                clockwise ? tap_code(KC_AUDIO_VOL_UP) : tap_code(KC_AUDIO_VOL_DOWN);
-                break;
-        }
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!process_custom_shift_keys(keycode, record)) {
-        return false;
-    }
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return false;
-        case WORKMAN:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_WORKMAN);
-            }
-            return false;
-    }
-
-    return true;
-}
diff --git a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/readme.md b/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/readme.md
deleted file mode 100644
index feebedc544e..00000000000
--- a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Gentleman65 Keyboard Compilation
-
-## Features
-
-- Base Layers
-  - QWERTY
-  - Workman
-- Entertainment Keys
-
-## Building and flashing
-
-```
-make jkeys_design/gentleman65:briianpowell:flash
-```
diff --git a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/rules.mk b/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/rules.mk
deleted file mode 100644
index ac89d139028..00000000000
--- a/keyboards/jkeys_design/gentleman65/keymaps/briianpowell/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += features/custom_shift_keys.c
diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
deleted file mode 100644
index 70ddb0cf5a2..00000000000
--- a/keyboards/jkeys_design/gentleman65_se_s/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 Omar Afzal
-
-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_MATRIX_LED_COUNT 14
diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json
index 76d6b445dc2..b19e5ef9a38 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/info.json
+++ b/keyboards/jkeys_design/gentleman65_se_s/info.json
@@ -26,9 +26,6 @@
     "ws2812": {
         "pin": "F7"
     },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
     "matrix_pins": {
         "cols": ["D5", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "D4", "D6", "D7", "C7", "C6", "B6", "B5", "B4"],
         "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/jlw/bruce_le_clavier/info.json b/keyboards/jlw/bruce_le_clavier/info.json
new file mode 100644
index 00000000000..fa37be65b69
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/info.json
@@ -0,0 +1,81 @@
+{
+    "keyboard_name": "Bruce the Keyboard",
+    "manufacturer": "jlw",
+    "url": "https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources",
+    "maintainer": "jlw",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0xA459",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A4", "A3", "B7", "B6", "B5", "B4", "B3", "B14"],
+        "rows": ["B11", "B9", "A5", "A6", "B15"]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true
+    },
+    "bootmagic": {
+        "matrix": [4, 10]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B12", "pin_b": "B13"}
+        ]
+    },
+    "ws2812": {
+        "pin": "B8"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "h":1.75},
+                {"matrix": [0, 1], "x": 1, "y": 0, "h":1.5},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0, "h":1.25},
+                {"matrix": [0, 4], "x": 4, "y": 0, "h":1.25},
+                {"matrix": [0, 5], "x": 5, "y": 0, "h":1.25},
+                {"matrix": [0, 6], "x": 6, "y": 0, "h":1.25},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0, "h":1.5},
+                {"matrix": [0, 9], "x": 9, "y": 0, "h":1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75, "h":1.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5, "h":1.75},
+                {"matrix": [2, 2], "x": 2, "y": 2, "h":1.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.25},
+                {"matrix": [2, 7], "x": 7, "y": 2, "h":1.25},
+                {"matrix": [2, 8], "x": 8, "y": 2.5, "h":1.75},
+                {"matrix": [2, 9], "x": 9, "y": 2.75, "h":1.5},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25, "w": 2},
+                {"matrix": [3, 5], "x": 5, "y": 3.25, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3.25},
+
+                {"matrix": [4, 10], "x": 4, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c b/keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c
new file mode 100644
index 00000000000..01ac81a49b4
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2023 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define HM_A	LGUI_T(KC_A)
+#define HM_R	LALT_T(KC_R)
+#define HM_S	LCTL_T(KC_S)
+
+#define HM_E	RCTL_T(KC_E)
+#define HM_I	LALT_T(KC_I)
+#define HM_O	LGUI_T(KC_O)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_Q,   KC_W,   KC_F,   KC_P,   KC_B,    QK_BOOT,       KC_J,   KC_L,   KC_U,    KC_Y,   KC_QUOT,
+         HM_A,   HM_R,   HM_S,   KC_T,   KC_G,                   KC_M,   KC_N,   HM_E,    HM_I,   HM_O,
+         KC_Z,   KC_X,   KC_C,   KC_D,   KC_V,                   KC_K,   KC_H,   KC_COMM, KC_DOT, KC_SLSH,
+                         LT(3, KC_TAB), SFT_T(KC_BSPC),          LT(1, KC_SPC),  LT(2,KC_ENT)
+    ),
+
+    [1] = LAYOUT(
+         KC_GRAVE, KC_F2,    XXXXXXX,  KC_F4,    KC_F5,    XXXXXXX,  KC_BSLS,  KC_MINUS, KC_EQUAL, KC_LBRC,  KC_RBRC,
+         KC_1,     KC_2,     KC_3,     KC_4,     KC_5,               KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            DF(1),    XXXXXXX,  _______,  _______,  KC_SCLN,
+                                       _______,  _______,            _______,  _______
+    ),
+
+    [2] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_F11,   KC_F12,   XXXXXXX,  XXXXXXX,
+         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,              KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______,            _______,  _______
+    ),
+    [3] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  LSG(KC_4),LSG(KC_S),XXXXXXX,  XXXXXXX,  KC_HOME,  XXXXXXX,  KC_UP,    XXXXXXX,  KC_PGUP,
+         KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LGUI,  XXXXXXX,            KC_END,   KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDN,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______,            _______,  _______
+    )
+};
+
+// Encoder Map
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [0] =   { ENCODER_CCW_CW(S(KC_F2), KC_F2) },
+        [1] =   { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+        [2] =   { ENCODER_CCW_CW(_______, _______) },
+        [3] =   { ENCODER_CCW_CW(_______, _______) }
+    };
+#endif
diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/default/rules.mk b/keyboards/jlw/bruce_le_clavier/keymaps/default/rules.mk
new file mode 100644
index 00000000000..17ab7c1dccc
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/keymaps/default/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank.
\ No newline at end of file
diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/vial/config.h b/keyboards/jlw/bruce_le_clavier/keymaps/vial/config.h
new file mode 100644
index 00000000000..aabbee30d62
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/keymaps/vial/config.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x5F, 0xAD, 0x10, 0x37, 0x92, 0xA3, 0xA7, 0x6A}
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 9 }
+
+#define VIAL_COMBO_ENTRIES 69
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/vial/keymap.c b/keyboards/jlw/bruce_le_clavier/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..34ff15f2585
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/keymaps/vial/keymap.c
@@ -0,0 +1,56 @@
+// Copyright 2023 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define HM_A	LGUI_T(KC_A)
+#define HM_R	LALT_T(KC_R)
+#define HM_S	LCTL_T(KC_S)
+
+#define HM_E	RCTL_T(KC_E)
+#define HM_I	LALT_T(KC_I)
+#define HM_O	LGUI_T(KC_O)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_Q,   KC_W,   KC_F,   KC_P,   KC_B,                   KC_J,   KC_L,   KC_U,    KC_Y,   KC_QUOT,
+         HM_A,   HM_R,   HM_S,   KC_T,   KC_G,                   KC_M,   KC_N,   HM_E,    HM_I,   HM_O,
+         KC_Z,   KC_X,   KC_C,   KC_D,   KC_V,                   KC_K,   KC_H,   KC_COMM, KC_DOT, KC_SLSH,
+                LT(3, KC_TAB), SFT_T(KC_BSPC),                   LT(1, KC_SPC),  LT(2,KC_ENT),
+                                                    KC_MUTE
+    ),
+
+    [1] = LAYOUT(
+         KC_GRAVE, KC_F2,    XXXXXXX,  KC_F4,    KC_F5,              KC_BSLS,  KC_MINUS, KC_EQUAL, KC_LBRC,  KC_RBRC,
+         KC_1,     KC_2,     KC_3,     KC_4,     KC_5,               KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            DF(1),    XXXXXXX,  _______,  _______,  KC_SCLN,
+                                       _______,  _______,            _______,  _______,
+                                                           XXXXXXX
+    ),
+
+    [2] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            XXXXXXX,  KC_F11,   KC_F12,   XXXXXXX,  XXXXXXX,
+         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,              KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______,            _______,  _______,
+                                                           XXXXXXX
+    ),
+    [3] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  LSG(KC_4),LSG(KC_S),XXXXXXX,            KC_HOME,  XXXXXXX,  KC_UP,    XXXXXXX,  KC_PGUP,
+         KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LGUI,  XXXXXXX,            KC_END,   KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDN,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______,            _______,  _______,
+                                                           XXXXXXX
+    )
+};
+
+// Encoder Map
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [0] =   { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+        [1] =   { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+        [2] =   { ENCODER_CCW_CW(_______, _______) },
+        [3] =   { ENCODER_CCW_CW(_______, _______) }
+    };
+#endif
diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/vial/rules.mk b/keyboards/jlw/bruce_le_clavier/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..31e3e6a6ecd
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/keymaps/vial/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/jlw/bruce_le_clavier/keymaps/vial/vial.json b/keyboards/jlw/bruce_le_clavier/keymaps/vial/vial.json
new file mode 100644
index 00000000000..21db13f2982
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/keymaps/vial/vial.json
@@ -0,0 +1,254 @@
+{
+    "lighting": "none",
+    "matrix": {
+        "rows": 5,
+        "cols": 11
+    },
+    "layouts": {
+        "labels": [["Centre", "Encodeur rotatif", "Clé", "Aucun"]],
+        "keymap":
+        [
+            [
+                {
+                  "y": 0.75,
+                  "x": 5.69
+                },
+                "4,10\n\n\n0,0"
+              ],
+              [
+                {
+                  "x": 5.69
+                },
+                "0,0\n\n\n0,0\n\n\n\n\n\ne"
+              ],
+              [
+                {
+                  "x": 5.69
+                },
+                "0,1\n\n\n0,0\n\n\n\n\n\ne"
+              ],
+              [
+                {
+                  "y": 1.25,
+                  "x": 0.5
+                },
+                "4,10\n\n\n0,1",
+                {
+                  "x": 0.25,
+                  "d": true
+                },
+                "4,10\n\n\n0,2"
+              ],
+              [
+                {
+                  "x": 0.5,
+                  "d": true
+                },
+                "0,0\n\n\n0,1\n\n\n\n\n\ne",
+                {
+                  "x": 0.25,
+                  "d": true
+                },
+                "0,0\n\n\n0,2\n\n\n\n\n\ne"
+              ],
+              [
+                {
+                  "x": 0.5,
+                  "d": true
+                },
+                "0,1\n\n\n0,1\n\n\n\n\n\ne",
+                {
+                  "x": 0.25,
+                  "d": true
+                },
+                "0,1\n\n\n0,2\n\n\n\n\n\ne"
+              ],
+              [
+                {
+                  "r": 7,
+                  "rx": 4.25,
+                  "y": 0.5,
+                  "x": -3.75,
+                  "h": 1.75
+                },
+                "0,0",
+                {
+                  "h": 1.5
+                },
+                "0,1",
+                "0,2",
+                {
+                  "h": 1.25
+                },
+                "0,3",
+                {
+                  "h": 1.25
+                },
+                "0,4"
+              ],
+              [
+                {
+                  "x": -1.75
+                },
+                "1,2"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": -0.75
+                },
+                "1,3",
+                "1,4"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": -2.75
+                },
+                "1,1"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": -3.75
+                },
+                "1,0"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": -1.75,
+                  "h": 1.25
+                },
+                "2,2"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": -0.75
+                },
+                "2,3",
+                "2,4"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": -2.75,
+                  "h": 1.75
+                },
+                "2,1"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": -3.75,
+                  "h": 1.5
+                },
+                "2,0"
+              ],
+              [
+                {
+                  "y": -0.5,
+                  "x": -1.75
+                },
+                "3,2",
+                {
+                  "w": 2
+                },
+                "3,3"
+              ],
+              [
+                {
+                  "r": -7,
+                  "rx": 8.5,
+                  "ry": 7,
+                  "y": -6.5,
+                  "x": -0.75,
+                  "h": 1.25
+                },
+                "0,5",
+                {
+                  "h": 1.25
+                },
+                "0,6",
+                "0,7",
+                {
+                  "h": 1.5
+                },
+                "0,8",
+                {
+                  "h": 1.75
+                },
+                "0,9"
+              ],
+              [
+                {
+                  "x": 1.25
+                },
+                "1,7"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": -0.75
+                },
+                "1,5",
+                "1,6"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": 2.25
+                },
+                "1,8"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": 3.25
+                },
+                "1,9"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": 1.25,
+                  "h": 1.25
+                },
+                "2,7"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": -0.75
+                },
+                "2,5",
+                "2,6"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": 2.25,
+                  "h": 1.75
+                },
+                "2,8"
+              ],
+              [
+                {
+                  "y": -0.75,
+                  "x": 3.25,
+                  "h": 1.5
+                },
+                "2,9"
+              ],
+              [
+                {
+                  "y": -0.5,
+                  "x": -0.75,
+                  "w": 2
+                },
+                "3,5",
+                "3,7"
+              ]
+          ]
+}}
diff --git a/keyboards/jlw/bruce_le_clavier/readme.md b/keyboards/jlw/bruce_le_clavier/readme.md
new file mode 100644
index 00000000000..3bd14626742
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/readme.md
@@ -0,0 +1,5 @@
+# Ceci est le micrologiciel pour Bruce le clavier
+
+Notez bien que Bruce le clavier n'est pas un humain.
+
+Bruce le clavier est un clavier de 34 touches colonnaire créé par [jlw](github.com/josh-l-wang). Il y a une option d'ajouter un encodeur rotatif ou une 35ème touche au centre.
diff --git a/keyboards/jlw/bruce_le_clavier/rules.mk b/keyboards/jlw/bruce_le_clavier/rules.mk
new file mode 100644
index 00000000000..d4f87a82781
--- /dev/null
+++ b/keyboards/jlw/bruce_le_clavier/rules.mk
@@ -0,0 +1 @@
+#This file intentionally left blank
diff --git a/keyboards/jlw/bruce_the_keyboard/info.json b/keyboards/jlw/bruce_the_keyboard/info.json
index 6f819bb4255..99022e2a863 100644
--- a/keyboards/jlw/bruce_the_keyboard/info.json
+++ b/keyboards/jlw/bruce_the_keyboard/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Bruce the Keyboard",
-    "manufacturer": "whydobearsexplod",
-    "url": "https://github.com/josh-l-wang/bruce-the-keyboard",
+    "manufacturer": "jlw",
+    "url": "https://github.com/josh-l-wang/Bruce-the-Keyboard-the-Resources",
     "maintainer": "jlw",
     "usb": {
         "vid": "0x1209",
@@ -63,6 +63,6 @@
                 {"matrix": [3, 7], "x": 7, "y": 3.25},
             ]
         }
-        
+
     }
 }
diff --git a/keyboards/jlw/deskcheck/info.json b/keyboards/jlw/deskcheck/info.json
new file mode 100644
index 00000000000..8a247e48b76
--- /dev/null
+++ b/keyboards/jlw/deskcheck/info.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "deskcheck",
+    "manufacturer": "jlw",
+    "url": "https://github.com/josh-l-wang/deskcheck",
+    "maintainer": "jlw",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0xA460",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "direct": [ [ "B12", "A2", "A3", "A4" ] ]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B4"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "flower_blooming": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "riverflow": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "starlight": true,
+            "starlight_dual_hue": true,
+            "starlight_dual_sat": true,
+            "typing_heatmap": true,
+            "twinkle": true
+        },
+        "driver": "ws2812",
+        "sleep": true,
+        "layout": [
+            {"flags": 4, "matrix": [0, 3], "x": 19, "y": 20},
+            {"flags": 4, "matrix": [0, 2], "x": 10, "y": 20},
+            {"flags": 4, "matrix": [0, 1], "x": 3, "y": 20},
+            {"flags": 4, "matrix": [0, 0], "x": 3, "y": 9},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 9},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 6},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 2},
+            {"flags": 4, "matrix": [0, 0], "x": 1, "y": 1},
+            {"flags": 4, "matrix": [0, 0], "x": 3, "y": 1},
+            {"flags": 4, "matrix": [0, 0], "x": 5, "y": 1},
+            {"flags": 4, "matrix": [0, 0], "x": 6, "y": 3},
+            {"flags": 4, "matrix": [0, 0], "x": 6, "y": 6},
+            {"flags": 4, "matrix": [0, 0], "x": 6, "y": 10},
+            {"flags": 4, "matrix": [0, 2], "x": 7, "y": 12},
+            {"flags": 4, "matrix": [0, 2], "x": 9, "y": 12},
+            {"flags": 4, "matrix": [0, 2], "x": 11, "y": 12},
+            {"flags": 4, "matrix": [0, 2], "x": 13, "y": 12},
+            {"flags": 4, "matrix": [0, 3], "x": 15, "y": 12},
+            {"flags": 4, "matrix": [0, 3], "x": 17, "y": 12},
+            {"flags": 4, "matrix": [0, 3], "x": 19, "y": 12},
+            {"flags": 4, "matrix": [0, 3], "x": 21, "y": 12},
+            {"flags": 4, "matrix": [0, 3], "x": 24, "y": 12},
+            {"flags": 4, "matrix": [0, 3], "x": 24, "y": 22},
+            {"flags": 4, "matrix": [0, 3], "x": 21, "y": 22},
+            {"flags": 4, "matrix": [0, 3], "x": 19, "y": 22},
+            {"flags": 4, "matrix": [0, 3], "x": 17, "y": 22},
+            {"flags": 4, "matrix": [0, 3], "x": 15, "y": 22},
+            {"flags": 4, "matrix": [0, 2], "x": 13, "y": 22},
+            {"flags": 4, "matrix": [0, 2], "x": 11, "y": 22},
+            {"flags": 4, "matrix": [0, 2], "x": 9, "y": 22},
+            {"flags": 4, "matrix": [0, 2], "x": 7, "y": 22},
+            {"flags": 4, "matrix": [0, 1], "x": 5, "y": 22},
+            {"flags": 4, "matrix": [0, 1], "x": 3, "y": 22},
+            {"flags": 4, "matrix": [0, 1], "x": 1, "y": 22},
+            {"flags": 4, "matrix": [0, 1], "x": 0, "y": 18},
+            {"flags": 4, "matrix": [0, 1], "x": 0, "y": 14}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 0, "y": 1},
+                {"matrix": [0, 2], "x": 1, "y": 1},
+                {"matrix": [0, 3], "x": 2, "y": 1, "w":1.75}
+            ]
+        }
+
+    }
+}
diff --git a/keyboards/jlw/deskcheck/keymaps/default/keymap.c b/keyboards/jlw/deskcheck/keymaps/default/keymap.c
new file mode 100644
index 00000000000..0240f5fb6e6
--- /dev/null
+++ b/keyboards/jlw/deskcheck/keymaps/default/keymap.c
@@ -0,0 +1,12 @@
+// Copyright 2023 sporkus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_6,   KC_9,   KC_6,   KC_9 
+    )
+};
+
diff --git a/keyboards/jlw/deskcheck/keymaps/default/rules.mk b/keyboards/jlw/deskcheck/keymaps/default/rules.mk
new file mode 100644
index 00000000000..17ab7c1dccc
--- /dev/null
+++ b/keyboards/jlw/deskcheck/keymaps/default/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank.
\ No newline at end of file
diff --git a/keyboards/jlw/deskcheck/keymaps/vial/config.h b/keyboards/jlw/deskcheck/keymaps/vial/config.h
new file mode 100644
index 00000000000..9ca8e435e22
--- /dev/null
+++ b/keyboards/jlw/deskcheck/keymaps/vial/config.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x25, 0x2C, 0x3E, 0x99, 0x55, 0x61, 0xC3, 0x58}
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 3 }
+
+#define VIAL_COMBO_ENTRIES 69
+#define DYNAMIC_KEYMAP_LAYER_COUNT 32
+#define TAPPING_TERM 200
\ No newline at end of file
diff --git a/keyboards/jlw/deskcheck/keymaps/vial/keymap.c b/keyboards/jlw/deskcheck/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..0240f5fb6e6
--- /dev/null
+++ b/keyboards/jlw/deskcheck/keymaps/vial/keymap.c
@@ -0,0 +1,12 @@
+// Copyright 2023 sporkus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_6,   KC_9,   KC_6,   KC_9 
+    )
+};
+
diff --git a/keyboards/jlw/deskcheck/keymaps/vial/rules.mk b/keyboards/jlw/deskcheck/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..d013bc62daa
--- /dev/null
+++ b/keyboards/jlw/deskcheck/keymaps/vial/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIALRGB_ENABLE = yes
diff --git a/keyboards/jlw/deskcheck/keymaps/vial/vial.json b/keyboards/jlw/deskcheck/keymaps/vial/vial.json
new file mode 100644
index 00000000000..07dc10989bf
--- /dev/null
+++ b/keyboards/jlw/deskcheck/keymaps/vial/vial.json
@@ -0,0 +1,25 @@
+{
+    "name": "deskcheck",
+    "lighting": "vialrgb",
+    "matrix": {
+        "rows": 4,
+        "cols": 10
+    },
+    "layouts": {
+        "keymap":
+        [
+  [
+    "0,0"
+  ],
+  [
+    "0,1",
+    "0,2",
+    {
+      "w": 1.75
+    },
+    "0,3"
+  ]
+]
+
+}
+}
\ No newline at end of file
diff --git a/keyboards/jlw/deskcheck/readme.md b/keyboards/jlw/deskcheck/readme.md
new file mode 100644
index 00000000000..727990383fe
--- /dev/null
+++ b/keyboards/jlw/deskcheck/readme.md
@@ -0,0 +1,3 @@
+# This is the firmware for the Deskcheck cacropad
+
+Bruce the Keyboard is a column staggered 34-key board created by Swear_Wolf and [jlw](github.com/josh-l-wang) with a single layout.
\ No newline at end of file
diff --git a/keyboards/jlw/deskcheck/rules.mk b/keyboards/jlw/deskcheck/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/jlw/deskcheck/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/jlw/isobae/info.json b/keyboards/jlw/isobae/info.json
new file mode 100644
index 00000000000..d8126416a09
--- /dev/null
+++ b/keyboards/jlw/isobae/info.json
@@ -0,0 +1,74 @@
+{
+    "keyboard_name": "isobae",
+    "manufacturer": "jlw",
+    "url": "https://github.com/josh-l-wang/isobae",
+    "maintainer": "jlw",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0xA459",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "A13", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B8", "B9", "A5", "A4"]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0],  "x": 0, "y": 0.5},
+                {"matrix": [0, 1],  "x": 1, "y": 0.25},
+                {"matrix": [0, 2],  "x": 2, "y": 0},
+                {"matrix": [0, 3],  "x": 3, "y": 0.25},
+                {"matrix": [0, 4],  "x": 4, "y": 0.25},
+                 
+                 
+                {"matrix": [0, 7],  "x": 7, "y": 0.25},
+                {"matrix": [0, 8],  "x": 8, "y": 0.25},
+                {"matrix": [0, 9],  "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 7, "y": 0.25},
+                {"matrix": [0, 11], "x": 8, "y": 0.5},
+
+
+                {"matrix": [1, 0],  "x": 0, "y": 1.5},
+                {"matrix": [1, 1],  "x": 1, "y": 1.25},
+                {"matrix": [1, 2],  "x": 2, "y": 1},
+                {"matrix": [1, 3],  "x": 3, "y": 1.25},
+                {"matrix": [1, 4],  "x": 4, "y": 1.25},
+                {"matrix": [1, 5],  "x": 5, "y": 0.25, "h": 2.75},
+                {"matrix": [1, 6],  "x": 6, "y": 0.25, "h": 2.25},
+                {"matrix": [1, 7],  "x": 7, "y": 1.25}, 
+                {"matrix": [1, 8],  "x": 8, "y": 1.25}, 
+                {"matrix": [1, 9],  "x": 9, "y": 1}, 
+                {"matrix": [1, 10], "x": 7, "y": 1.25}, 
+                {"matrix": [1, 11], "x": 8, "y": 1.5}, 
+ 
+ 
+                {"matrix": [2, 0],  "x": 0, "y": 2.5}, 
+                {"matrix": [2, 1],  "x": 1, "y": 2.25}, 
+                {"matrix": [2, 2],  "x": 2, "y": 2}, 
+                {"matrix": [2, 3],  "x": 3, "y": 2.25}, 
+                {"matrix": [2, 4],  "x": 4, "y": 2.25}, 
+                {"matrix": [2, 5],  "x": 5, "y": 3,    "h": 1.75},
+                {"matrix": [2, 6],  "x": 6, "y": 3.25, "h": 2.25},
+                {"matrix": [2, 7],  "x": 7, "y": 2.25},
+                {"matrix": [2, 8],  "x": 8, "y": 2.25},
+                {"matrix": [2, 9],  "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 7, "y": 2.25},
+                {"matrix": [2, 11], "x": 8, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.25}
+            ]
+        }
+        
+    }
+}
diff --git a/keyboards/jlw/isobae/keymaps/default/keymap.c b/keyboards/jlw/isobae/keymaps/default/keymap.c
new file mode 100644
index 00000000000..b182bd4c528
--- /dev/null
+++ b/keyboards/jlw/isobae/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2023 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define HM_A	LGUI_T(KC_A)
+#define HM_R	LALT_T(KC_R)
+#define HM_S	LCTL_T(KC_S)
+
+#define HM_E	RCTL_T(KC_E)
+#define HM_I	LALT_T(KC_I)
+#define HM_O	LGUI_T(KC_O)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_Q,   KC_W,   KC_F,   KC_P,   KC_B,                                  KC_J,   KC_L,   KC_U,    KC_Y,   KC_QUOT,
+         HM_A,   HM_R,   HM_S,   KC_T,   KC_G,    LT(3, KC_TAB), LT(2,KC_ENT),  KC_M,   KC_N,   HM_E,    HM_I,   HM_O,
+         KC_Z,   KC_X,   KC_C,   KC_D,   KC_V,    SFT_T(KC_BSPC),LT(1, KC_SPC), KC_K,   KC_H,   KC_COMM, KC_DOT, KC_SLSH,
+         KC_ESC, QK_BOOT                         
+    ),
+
+    [1] = LAYOUT(
+         KC_GRAVE, KC_F2,    XXXXXXX,  KC_F4,    KC_F5,                         KC_BSLS,  KC_MINUS, KC_EQUAL, KC_LBRC,  KC_RBRC,
+         KC_1,     KC_2,     KC_3,     KC_4,     KC_5,    _______,  _______,    KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, _______,  _______,    DF(1),    XXXXXXX,  _______,  _______,  KC_SCLN,
+                                       _______,  _______
+    ),
+
+    [2] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,                       XXXXXXX,  KC_F11,   KC_F12,   XXXXXXX,  XXXXXXX,
+         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   _______,  _______,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, _______,  _______,    DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______
+    ),
+    [3] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  LSG(KC_4),LSG(KC_S),XXXXXXX,                       KC_HOME,  XXXXXXX,  KC_UP,    XXXXXXX,  KC_PGUP,
+         KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LGUI,  XXXXXXX, _______,  _______,    KC_END,   KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDN,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, _______,  _______,    DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______
+    )
+};
+
+// Encoder Map
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [0] =   { ENCODER_CCW_CW(S(KC_F2), KC_F2) },
+        [1] =   { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+        [2] =   { ENCODER_CCW_CW(_______, _______) },
+        [3] =   { ENCODER_CCW_CW(_______, _______) }
+    };
+#endif
\ No newline at end of file
diff --git a/keyboards/jlw/isobae/keymaps/default/rules.mk b/keyboards/jlw/isobae/keymaps/default/rules.mk
new file mode 100644
index 00000000000..17ab7c1dccc
--- /dev/null
+++ b/keyboards/jlw/isobae/keymaps/default/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank.
\ No newline at end of file
diff --git a/keyboards/jlw/isobae/keymaps/vial/config.h b/keyboards/jlw/isobae/keymaps/vial/config.h
new file mode 100644
index 00000000000..e2583f91b22
--- /dev/null
+++ b/keyboards/jlw/isobae/keymaps/vial/config.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0xA9, 0xA0, 0x51, 0x63, 0xBB, 0xAA, 0xD5, 0x3C}
+#define VIAL_UNLOCK_COMBO_ROWS { 2, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 5, 6 }
+
+#define VIAL_COMBO_ENTRIES 69
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/jlw/isobae/keymaps/vial/keymap.c b/keyboards/jlw/isobae/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..b182bd4c528
--- /dev/null
+++ b/keyboards/jlw/isobae/keymaps/vial/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2023 jlw
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define HM_A	LGUI_T(KC_A)
+#define HM_R	LALT_T(KC_R)
+#define HM_S	LCTL_T(KC_S)
+
+#define HM_E	RCTL_T(KC_E)
+#define HM_I	LALT_T(KC_I)
+#define HM_O	LGUI_T(KC_O)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_Q,   KC_W,   KC_F,   KC_P,   KC_B,                                  KC_J,   KC_L,   KC_U,    KC_Y,   KC_QUOT,
+         HM_A,   HM_R,   HM_S,   KC_T,   KC_G,    LT(3, KC_TAB), LT(2,KC_ENT),  KC_M,   KC_N,   HM_E,    HM_I,   HM_O,
+         KC_Z,   KC_X,   KC_C,   KC_D,   KC_V,    SFT_T(KC_BSPC),LT(1, KC_SPC), KC_K,   KC_H,   KC_COMM, KC_DOT, KC_SLSH,
+         KC_ESC, QK_BOOT                         
+    ),
+
+    [1] = LAYOUT(
+         KC_GRAVE, KC_F2,    XXXXXXX,  KC_F4,    KC_F5,                         KC_BSLS,  KC_MINUS, KC_EQUAL, KC_LBRC,  KC_RBRC,
+         KC_1,     KC_2,     KC_3,     KC_4,     KC_5,    _______,  _______,    KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, _______,  _______,    DF(1),    XXXXXXX,  _______,  _______,  KC_SCLN,
+                                       _______,  _______
+    ),
+
+    [2] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,                       XXXXXXX,  KC_F11,   KC_F12,   XXXXXXX,  XXXXXXX,
+         KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,   _______,  _______,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, _______,  _______,    DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______
+    ),
+    [3] = LAYOUT(
+         XXXXXXX,  XXXXXXX,  LSG(KC_4),LSG(KC_S),XXXXXXX,                       KC_HOME,  XXXXXXX,  KC_UP,    XXXXXXX,  KC_PGUP,
+         KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LGUI,  XXXXXXX, _______,  _______,    KC_END,   KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_PGDN,
+         DF(0),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, _______,  _______,    DF(2),    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                       _______,  _______
+    )
+};
+
+// Encoder Map
+#ifdef ENCODER_MAP_ENABLE
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [0] =   { ENCODER_CCW_CW(S(KC_F2), KC_F2) },
+        [1] =   { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+        [2] =   { ENCODER_CCW_CW(_______, _______) },
+        [3] =   { ENCODER_CCW_CW(_______, _______) }
+    };
+#endif
\ No newline at end of file
diff --git a/keyboards/jlw/isobae/keymaps/vial/rules.mk b/keyboards/jlw/isobae/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..4f7618e9b21
--- /dev/null
+++ b/keyboards/jlw/isobae/keymaps/vial/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
diff --git a/keyboards/jlw/isobae/keymaps/vial/vial.json b/keyboards/jlw/isobae/keymaps/vial/vial.json
new file mode 100644
index 00000000000..4a13ab6f200
--- /dev/null
+++ b/keyboards/jlw/isobae/keymaps/vial/vial.json
@@ -0,0 +1,184 @@
+{
+    "lighting": "none",
+    "matrix": {
+        "rows": 4,
+        "cols": 12
+    },
+    "layouts": {
+        "keymap":
+[
+  [
+    {
+      "x": 2
+    },
+    "0,2",
+    {
+      "x": 6
+    },
+    "0,9"
+  ],
+  [
+    {
+      "y": -0.75,
+      "x": 1
+    },
+    "0,1",
+    {
+      "x": 1
+    },
+    "0,3",
+    "0,4",
+    {
+      "h": 2.75
+    },
+    "1,5",
+    {
+      "h": 2.25
+    },
+    "1,6",
+    "0,7",
+    "0,8",
+    {
+      "x": 1
+    },
+    "0,10"
+  ],
+  [
+    {
+      "y": -0.75
+    },
+    "0,0",
+    {
+      "x": 10
+    },
+    "0,11"
+  ],
+  [
+    {
+      "y": -0.5,
+      "x": 2
+    },
+    "1,2",
+    {
+      "x": 6
+    },
+    "1,9"
+  ],
+  [
+    {
+      "y": -0.75,
+      "x": 1
+    },
+    "1,1",
+    {
+      "x": 1
+    },
+    "1,3",
+    "1,4",
+    {
+      "x": 2
+    },
+    "1,7",
+    "1,8",
+    {
+      "x": 1
+    },
+    "1,10"
+  ],
+  [
+    {
+      "y": -0.75
+    },
+    "1,0",
+    {
+      "x": 10
+    },
+    "1,11"
+  ],
+  [
+    {
+      "y": -0.5,
+      "x": 2
+    },
+    "2,2",
+    {
+      "x": 6
+    },
+    "2,9"
+  ],
+  [
+    {
+      "y": -0.75,
+      "x": 1
+    },
+    "2,1",
+    {
+      "x": 1
+    },
+    "2,3",
+    "2,4",
+    {
+      "x": 2
+    },
+    "2,7",
+    "2,8",
+    {
+      "x": 1
+    },
+    "2,10"
+  ],
+  [
+    {
+      "y": -0.75
+    },
+    "2,0",
+    {
+      "x": 10
+    },
+    "2,11"
+  ],
+  [
+    {
+      "y": -0.25,
+      "x": 1
+    },
+    "3,1"
+  ],
+  [
+    {
+      "y": -0.75
+    },
+    "3,0"
+  ],
+  [
+    {
+      "r": 90,
+      "rx": 4.75,
+      "ry": 4.25,
+      "y": -1.25,
+      "x": -1,
+      "w": 1.25,
+      "h": 2,
+      "w2": 1.5,
+      "h2": 1,
+      "x2": -0.25
+    },
+    "2,5"
+  ],
+  [
+    {
+      "rx": 7.25,
+      "ry": 4,
+      "y": -0.75,
+      "x": -0.75,
+      "w": 1.5,
+      "h": 2,
+      "w2": 2.25,
+      "h2": 1,
+      "x2": -0.75,
+      "y2": 1
+    },
+    "2,6"
+  ]
+]
+}}
\ No newline at end of file
diff --git a/keyboards/jlw/isobae/readme.md b/keyboards/jlw/isobae/readme.md
new file mode 100644
index 00000000000..20549818af1
--- /dev/null
+++ b/keyboards/jlw/isobae/readme.md
@@ -0,0 +1,3 @@
+# This is the firmware for isobae
+
+isobae is a column staggered 36-key board created by [jlw](github.com/josh-l-wang) with a single layout, supporting ISO and ANSI big enters for thumb keys.
\ No newline at end of file
diff --git a/keyboards/jlw/isobae/rules.mk b/keyboards/jlw/isobae/rules.mk
new file mode 100644
index 00000000000..17ab7c1dccc
--- /dev/null
+++ b/keyboards/jlw/isobae/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank.
\ No newline at end of file
diff --git a/keyboards/jlw/lestmovoz/halconf.h b/keyboards/jlw/lestmovoz/halconf.h
new file mode 100644
index 00000000000..2eb5f8985c1
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/halconf.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/jlw/lestmovoz/info.json b/keyboards/jlw/lestmovoz/info.json
new file mode 100644
index 00000000000..b89526780e1
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "leSTMovoz",
+    "manufacturer": "calvin-mcd",
+    "url": "https://github.com/calvin-mcd/LeSTMovoz",
+    "maintainer": "jlw",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0xA459",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "B3", "B0", "C5", "C4", "A7", "A6"],
+        "rows": ["C13", "C14", "A1", "A0"]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+               {"label": "Q", "matrix": [0, 0], "x": 0, "y": 0},
+               {"label": "W", "matrix": [0, 1], "x": 1, "y": 0},
+               {"label": "E", "matrix": [0, 2], "x": 2, "y": 0},
+               {"label": "R", "matrix": [0, 3], "x": 3, "y": 0},
+               {"label": "T", "matrix": [0, 4], "x": 4, "y": 0},
+               {"label": "Y", "matrix": [0, 5], "x": 5, "y": 0},
+               {"label": "U", "matrix": [0, 6], "x": 6, "y": 0},
+               {"label": "I", "matrix": [0, 7], "x": 7, "y": 0},
+               {"label": "O", "matrix": [0, 8], "x": 8, "y": 0},
+               {"label": "P", "matrix": [0, 9], "x": 9, "y": 0},
+
+               {"label": "A", "matrix": [1, 0], "x": 0, "y": 1},
+               {"label": "S", "matrix": [1, 1], "x": 1, "y": 1},
+               {"label": "D", "matrix": [1, 2], "x": 2, "y": 1},
+               {"label": "F", "matrix": [1, 3], "x": 3, "y": 1},
+               {"label": "G", "matrix": [1, 4], "x": 4, "y": 1},
+               {"label": "H", "matrix": [1, 5], "x": 5, "y": 1},
+               {"label": "J", "matrix": [1, 6], "x": 6, "y": 1},
+               {"label": "K", "matrix": [1, 7], "x": 7, "y": 1},
+               {"label": "L", "matrix": [1, 8], "x": 8, "y": 1},
+               {"label": "Enter", "matrix": [1, 9], "x": 9, "y": 1},
+
+               {"label": "Z", "matrix": [2, 0], "x": 0, "y": 2},
+               {"label": "X", "matrix": [2, 1], "x": 1, "y": 2},
+               {"label": "C", "matrix": [2, 2], "x": 2, "y": 2},
+               {"label": "V", "matrix": [2, 3], "x": 3, "y": 2},
+               {"label": "B", "matrix": [2, 4], "x": 4, "y": 2},
+               {"label": "N", "matrix": [2, 5], "x": 5, "y": 2},
+               {"label": "M", "matrix": [2, 6], "x": 6, "y": 2},
+               {"label": ",", "matrix": [2, 7], "x": 7, "y": 2},
+               {"label": ".", "matrix": [2, 8], "x": 8, "y": 2},
+               {"label": "/", "matrix": [2, 9], "x": 9, "y": 2},
+
+               {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
+               {"label": "Alt", "matrix": [3, 1], "x": 1, "y": 3},
+               {"label": "Fn", "matrix": [3, 2], "x": 2, "y": 3},
+               {"label": "Fn2", "matrix": [3, 3], "x": 3, "y": 3},
+               {"label": "Backspace", "matrix": [3, 4], "x": 4, "y": 3},
+               {"label": "Space", "matrix": [3, 5], "x": 5, "y": 3},
+               {"label": "Space", "matrix": [3, 6], "x": 6, "y": 3},
+               {"label": "Ctrl", "matrix": [3, 7], "x": 7, "y": 3},
+               {"label": "Ctrl", "matrix": [3, 8], "x": 8, "y": 3},
+               {"label": "Fn2", "matrix": [3, 9], "x": 9, "y": 3},
+           ]
+       }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 4], "x": 132, "y": 16, "flags": 8},
+            {"matrix": [0, 5], "x": 172, "y": 16, "flags": 8},
+        ],
+        "driver": "ws2812"
+    },
+    "ws2812": {
+        "pin": "A8",
+        "driver": "pwm"
+    }
+}
diff --git a/keyboards/jlw/lestmovoz/keymaps/default/keymap.c b/keyboards/jlw/lestmovoz/keymaps/default/keymap.c
new file mode 100644
index 00000000000..3f51526fb8e
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2023 sporkus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define HM_A	LSFT_T(KC_A)
+#define HM_S	LALT_T(KC_S)
+#define HM_D	LGUI_T(KC_D)
+#define HM_F	LCTL_T(KC_F)
+#define HM_J	RCTL_T(KC_J)
+#define HM_K	RGUI_T(KC_K)
+#define HM_L	RALT_T(KC_L)
+#define HM_Z	LSFT_T(KC_Z)
+#define HM_SLSH	LSFT_T(KC_SLSH)
+#define HM_QUOT	RSFT_T(KC_QUOT)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
+         KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                   KC_H,   KC_J,   KC_K,    KC_L,   KC_QUOT,
+         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,                   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,
+                 MO(1),  KC_ENT,                                 MO(2),  KC_BSPC, _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    [1] = LAYOUT(
+         _______,  _______,  _______,  _______,  _______,            _______,  KC_7,     KC_8,     KC_9,     KC_0,
+         _______,  _______,  _______,  _______,  _______,            _______,  KC_4,     KC_5,     KC_6,     _______,
+         _______,  _______,  _______,  _______,  _______,            _______,  KC_1,     KC_2,     KC_3,     _______,
+                                       _______,  _______,            _______,  _______, _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    [2] = LAYOUT(
+         _______,  _______,  _______,  _______,  _______,            _______,  _______,   _______,   _______,    _______,
+         _______,  _______,  _______,  _______,  _______,            KC_LEFT,  KC_DOWN,   KC_UP,     KC_LEFT,    _______,
+         _______,  _______,  _______,  _______,  _______,            _______,  _______,   _______,   _______,    _______,
+                                       _______,  _______,            _______,  _______, _______,  _______,  _______,  _______,  _______,  _______
+    )
+};
+
diff --git a/keyboards/jlw/lestmovoz/keymaps/default/rules.mk b/keyboards/jlw/lestmovoz/keymaps/default/rules.mk
new file mode 100644
index 00000000000..17ab7c1dccc
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/keymaps/default/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank.
\ No newline at end of file
diff --git a/keyboards/jlw/lestmovoz/keymaps/vial/config.h b/keyboards/jlw/lestmovoz/keymaps/vial/config.h
new file mode 100644
index 00000000000..c1365c4e925
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/keymaps/vial/config.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x92, 0xC4, 0xA5, 0xA6, 0x78, 0xBC, 0x8C, 0x30}
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 1 }
+
+#define VIAL_COMBO_ENTRIES 69
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/jlw/lestmovoz/keymaps/vial/keymap.c b/keyboards/jlw/lestmovoz/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..58951b2b419
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/keymaps/vial/keymap.c
@@ -0,0 +1,93 @@
+// Copyright 2023 sporkus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define HM_A	LSFT_T(KC_A)
+#define HM_S	LALT_T(KC_S)
+#define HM_D	LGUI_T(KC_D)
+#define HM_F	LCTL_T(KC_F)
+#define HM_J	RCTL_T(KC_J)
+#define HM_K	RGUI_T(KC_K)
+#define HM_L	RALT_T(KC_L)
+#define HM_Z	LSFT_T(KC_Z)
+#define HM_SLSH	LSFT_T(KC_SLSH)
+#define HM_QUOT	RSFT_T(KC_QUOT)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+         KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
+         KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                   KC_H,   KC_J,   KC_K,    KC_L,   KC_QUOT,
+         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,                   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,
+                 MO(1),  KC_ENT,                                 MO(2),  KC_BSPC, _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    [1] = LAYOUT(
+         _______,  _______,  _______,  _______,  _______,            _______,  KC_7,     KC_8,     KC_9,     KC_0,
+         _______,  _______,  _______,  _______,  _______,            _______,  KC_4,     KC_5,     KC_6,     _______,
+         _______,  _______,  _______,  _______,  _______,            _______,  KC_1,     KC_2,     KC_3,     _______,
+                                       _______,  _______,            _______,  _______, _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    [2] = LAYOUT(
+         _______,  _______,  _______,  _______,  _______,            _______,  _______,   _______,   _______,    _______,
+         _______,  _______,  _______,  _______,  _______,            KC_LEFT,  KC_DOWN,   KC_UP,     KC_LEFT,    _______,
+         _______,  _______,  _______,  _______,  _______,            _______,  _______,   _______,   _______,    _______,
+                                       _______,  _______,            _______,  _______, _______,  _______,  _______,  _______,  _______,  _______
+    )
+};
+
+#ifdef RGB_MATRIX_ENABLE
+
+#define RGB_LAYER_INDICATOR_ENABLE
+#define RGB_MODS_INDICATOR_ENABLE
+#define RGB_INDICATOR_BRIGHTNESS 69
+
+#define LED_RIGHT 1
+#define LED_LEFT 0
+
+#define LAYER_R layer_colors[layer][0] *  RGB_INDICATOR_BRIGHTNESS / 255
+#define LAYER_G layer_colors[layer][1] *  RGB_INDICATOR_BRIGHTNESS / 255
+#define LAYER_B layer_colors[layer][2] *  RGB_INDICATOR_BRIGHTNESS / 255
+
+#define MODS_ACTIVE(mods) ((get_mods()|get_oneshot_mods()) & MOD_MASK_##mods ? RGB_INDICATOR_BRIGHTNESS:0)
+#define SHIFT_ACTIVE (get_mods() & MOD_MASK_SHIFT ? RGB_INDICATOR_BRIGHTNESS/4:0)
+#define MODS_R MODS_ACTIVE(CTRL) + SHIFT_ACTIVE
+#define MODS_G MODS_ACTIVE(GUI) + SHIFT_ACTIVE
+#define MODS_B MODS_ACTIVE(ALT) + SHIFT_ACTIVE
+
+const uint8_t PROGMEM layer_colors[][3] = {
+    {RGB_OFF},
+    {RGB_RED},
+    {RGB_GREEN},
+    {RGB_BLUE},
+    {RGB_YELLOW},
+    {RGB_PURPLE},
+    {RGB_PINK},
+    {RGB_TEAL}
+};
+
+void set_rgb_matrix_indicators(uint8_t led_min, uint8_t led_max) {
+    #if defined(RGB_LAYER_INDICATOR_ENABLE)
+    int layer = get_highest_layer(layer_state|default_layer_state);
+    RGB_MATRIX_INDICATOR_SET_COLOR(LED_RIGHT, LAYER_R, LAYER_G, LAYER_B);
+    /* uprintf("layer RGB: (%u, %u, %u)\n", LAYER_R, LAYER_G, LAYER_B); */
+    #else
+    RGB_MATRIX_INDICATOR_SET_COLOR(LED_RIGHT, 0, 0, 0);
+    #endif
+
+    #if defined(RGB_MODS_INDICATOR_ENABLE)
+    RGB_MATRIX_INDICATOR_SET_COLOR(LED_LEFT, MODS_R, MODS_G, MODS_B);
+    /* uprintf("mod RGB: (%u, %u, %u)\n", MODS_R, MODS_G, MODS_B); */
+    #else
+    RGB_MATRIX_INDICATOR_SET_COLOR(LED_LEFT, 0, 0, 0);
+    #endif
+}
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    set_rgb_matrix_indicators(led_min, led_max);
+    return false;
+}
+
+#endif
diff --git a/keyboards/jlw/lestmovoz/keymaps/vial/rules.mk b/keyboards/jlw/lestmovoz/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..31bb6d699f9
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/keymaps/vial/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIALRGB_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jlw/lestmovoz/keymaps/vial/vial.json b/keyboards/jlw/lestmovoz/keymaps/vial/vial.json
new file mode 100644
index 00000000000..9969a54fcfe
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/keymaps/vial/vial.json
@@ -0,0 +1,104 @@
+{
+    "lighting": "vialrgb",
+    "matrix": {
+        "rows": 4,
+        "cols": 10
+    },
+    "layouts": {
+      "labels":[
+        ["Left Space Options", "Ortho", "3u", "2u"],
+          ["Right Space Options", "Ortho", "3u", "2u"]
+      ],
+        "keymap":
+        [
+          [
+            "0,0",
+            "0,1",
+            "0,2",
+            "0,3",
+            "0,4",
+            {
+              "x": 1
+            },
+            "0,5",
+            "0,6",
+            "0,7",
+            "0,8",
+            "0,9"
+          ],
+          [
+            "1,0",
+            "1,1",
+            "1,2",
+            "1,3",
+            "1,4",
+            {
+              "x": 1
+            },
+            "1,5",
+            "1,6",
+            "1,7",
+            "1,8",
+            "1,9"
+          ],
+          [
+            "2,0",
+            "2,1",
+            "2,2",
+            "2,3",
+            "2,4",
+            {
+              "x": 1
+            },
+            "2,5",
+            "2,6",
+            "2,7",
+            "2,8",
+            "2,9"
+          ],
+          [
+            "3,0",
+            "3,1",
+            "3,2\n\n\n0,0",
+            "3,3\n\n\n0,0",
+            "3,4\n\n\n0,0",
+            {
+              "x": 1
+            },
+            "3,5\n\n\n1,0",
+            "3,6\n\n\n1,0",
+            "3,7\n\n\n1,0",
+            "3,8",
+            "3,9"
+          ],
+          [
+            {
+              "y": 0.25,
+              "x": 2,
+              "w": 3
+            },
+            "3,3\n\n\n0,1",
+            {
+              "x": 1,
+              "w": 3
+            },
+            "3,6\n\n\n1,1"
+          ],
+          [
+            {
+              "x": 2
+            },
+            "3,2\n\n\n0,2",
+            {
+              "w": 2
+            },
+            "3,4\n\n\n0,2",
+            {
+              "x": 1,
+              "w": 2
+            },
+            "3,5\n\n\n1,2",
+            "3,7\n\n\n1,2"
+          ]
+        ]
+}}
\ No newline at end of file
diff --git a/keyboards/jlw/lestmovoz/mcuconf.h b/keyboards/jlw/lestmovoz/mcuconf.h
new file mode 100644
index 00000000000..f0daf52b305
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/mcuconf.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
+
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_DMA_CHANNEL 5
+
+#undef WS2812_BYTE_ORDER
+#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
\ No newline at end of file
diff --git a/keyboards/jlw/lestmovoz/readme.md b/keyboards/jlw/lestmovoz/readme.md
new file mode 100644
index 00000000000..716ce391d32
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/readme.md
@@ -0,0 +1,3 @@
+# This is the firmware for leSTMovoz
+
+https://github.com/calvin-mcd/LeSTMovoz
\ No newline at end of file
diff --git a/keyboards/jlw/lestmovoz/rules.mk b/keyboards/jlw/lestmovoz/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/jlw/lestmovoz/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/jm60/keymaps/default/keymap.c b/keyboards/jm60/keymaps/default/keymap.c
deleted file mode 100644
index 2bb26fccf6d..00000000000
--- a/keyboards/jm60/keymaps/default/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _BL,
-    _FL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap _BL: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------.
-     * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-     * |-----------------------------------------------------------|
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-     * |-----------------------------------------------------------|
-     * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
-     * `-----------------------------------------------------------'
-     */
-    [_BL] = LAYOUT_60_ansi(
-        QK_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_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(_FL), KC_RCTL
-    ),
-
-    /* Keymap _FL: Function Layer
-     */
-    [_FL] = LAYOUT_60_ansi(
-        KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/jm60/readme.md b/keyboards/jm60/readme.md
deleted file mode 100644
index bb790d6d07f..00000000000
--- a/keyboards/jm60/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# JM60
-
-A compact 60% keyboard with full RGB led support.
-
-* Keyboard Maintainer: QMK Community
-* Hardware Supported: JM60
-* Hardware Availability: https://kbdfans.myshopify.com/ (is no longer sold)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make jm60: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).
-
-## Flashing Instructions
-
-1) rename 'jm60_default.bin' to 'jm60_default.firmware'
-
-2) Press 'R' and reconnect the keyboard.
-
-3) Start the original Configuration Tool and flash 'jm60_default.bin'
diff --git a/keyboards/jorne/post_config.h b/keyboards/jorne/post_config.h
index 8da923087e7..7d159c0de20 100644
--- a/keyboards/jorne/post_config.h
+++ b/keyboards/jorne/post_config.h
@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#ifndef BOOTMAGIC_LITE_ROW
-#    define BOOTMAGIC_LITE_ROW 0
+#ifndef BOOTMAGIC_ROW
+#    define BOOTMAGIC_ROW 0
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN
-#    define BOOTMAGIC_LITE_COLUMN 1
+#ifndef BOOTMAGIC_COLUMN
+#    define BOOTMAGIC_COLUMN 1
 #endif
 
-#ifndef BOOTMAGIC_LITE_ROW_RIGHT
-#    define BOOTMAGIC_LITE_ROW_RIGHT 4
+#ifndef BOOTMAGIC_ROW_RIGHT
+#    define BOOTMAGIC_ROW_RIGHT 4
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 1
+#ifndef BOOTMAGIC_COLUMN_RIGHT
+#    define BOOTMAGIC_COLUMN_RIGHT 1
 #endif
 
 #ifdef RGBLIGHT_ENABLE
@@ -21,9 +21,3 @@
 #        define RGBLIGHT_LIMIT_VAL 120
 #    endif
 #endif
-
-#ifdef RGB_MATRIX_ENABLE
-#    ifndef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-#    endif
-#endif
diff --git a/keyboards/hub16/config.h b/keyboards/joshajohnson/hub16/config.h
similarity index 100%
rename from keyboards/hub16/config.h
rename to keyboards/joshajohnson/hub16/config.h
diff --git a/keyboards/hub16/info.json b/keyboards/joshajohnson/hub16/info.json
similarity index 100%
rename from keyboards/hub16/info.json
rename to keyboards/joshajohnson/hub16/info.json
diff --git a/keyboards/hub16/keymaps/default/keymap.c b/keyboards/joshajohnson/hub16/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/hub16/keymaps/default/keymap.c
rename to keyboards/joshajohnson/hub16/keymaps/default/keymap.c
diff --git a/keyboards/hub16/keymaps/via/keymap.c b/keyboards/joshajohnson/hub16/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/hub16/keymaps/via/keymap.c
rename to keyboards/joshajohnson/hub16/keymaps/via/keymap.c
diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/rules.mk b/keyboards/joshajohnson/hub16/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/primekb/prime_e/keymaps/gwillad/rules.mk
rename to keyboards/joshajohnson/hub16/keymaps/via/rules.mk
diff --git a/keyboards/hub16/matrix.c b/keyboards/joshajohnson/hub16/matrix.c
similarity index 100%
rename from keyboards/hub16/matrix.c
rename to keyboards/joshajohnson/hub16/matrix.c
diff --git a/keyboards/joshajohnson/hub16/readme.md b/keyboards/joshajohnson/hub16/readme.md
new file mode 100755
index 00000000000..9735079e244
--- /dev/null
+++ b/keyboards/joshajohnson/hub16/readme.md
@@ -0,0 +1,24 @@
+# Hub16
+
+Hub16 is a 16 Key Macro Pad with an inbuilt USB 2.0 hub and dual rotary encoders.
+
+For more information regarding the keyboard, please visit the [Hub16 Website](https://www.joshajohnson.com/hub16-keyboard/) or [GitHub Repo](https://github.com/joshajohnson/Hub16).
+
+* Keyboard Maintainer: [Josh Johnson](https://github.com/joshajohnson)
+* Hardware Supported: Hub16 PCB (atmega32u4)
+* Hardware Availability: [Josh Johnson](https://www.joshajohnson.com/hub16-keyboard/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make joshajohnson/hub16:default
+
+Flashing example for this keyboard:
+
+    make joshajohnson/hub16:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Press the reset switch between the center two USB-C ports while the board is plugged in
+* Hold the top left key while connecting the USB cable (also erases persistent settings)
+
+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/hub16/rules.mk b/keyboards/joshajohnson/hub16/rules.mk
similarity index 100%
rename from keyboards/hub16/rules.mk
rename to keyboards/joshajohnson/hub16/rules.mk
diff --git a/keyboards/hub20/chconf.h b/keyboards/joshajohnson/hub20/chconf.h
similarity index 100%
rename from keyboards/hub20/chconf.h
rename to keyboards/joshajohnson/hub20/chconf.h
diff --git a/keyboards/joshajohnson/hub20/config.h b/keyboards/joshajohnson/hub20/config.h
new file mode 100644
index 00000000000..29471149d15
--- /dev/null
+++ b/keyboards/joshajohnson/hub20/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2020 joshajohnson
+Copyright 2021 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
+
+/* 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/hub20/halconf.h b/keyboards/joshajohnson/hub20/halconf.h
similarity index 100%
rename from keyboards/hub20/halconf.h
rename to keyboards/joshajohnson/hub20/halconf.h
diff --git a/keyboards/hub20/hub20.c b/keyboards/joshajohnson/hub20/hub20.c
similarity index 100%
rename from keyboards/hub20/hub20.c
rename to keyboards/joshajohnson/hub20/hub20.c
diff --git a/keyboards/joshajohnson/hub20/info.json b/keyboards/joshajohnson/hub20/info.json
new file mode 100644
index 00000000000..b1b25dc1d48
--- /dev/null
+++ b/keyboards/joshajohnson/hub20/info.json
@@ -0,0 +1,147 @@
+{
+    "keyboard_name": "Hub20",
+    "manufacturer": "Josh Johnson",
+    "url": "https://github.com/joshajohnson/hub20",
+    "maintainer": "joshajohnson",
+    "usb": {
+      "vid": "0x6A6A",
+      "pid": "0x4414",
+      "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+      "animations": {
+        "gradient_up_down": true,
+        "gradient_left_right": true,
+        "breathing": true,
+        "cycle_left_right": true,
+        "cycle_up_down": true,
+        "raindrops": true,
+        "jellybean_raindrops": true,
+        "hue_breathing": true,
+        "hue_pendulum": true,
+        "hue_wave": true,
+        "pixel_rain": true,
+        "pixel_flow": true,
+        "pixel_fractal": true,
+        "typing_heatmap": true,
+        "digital_rain": true,
+        "solid_reactive_simple": true,
+        "solid_reactive": true
+      },
+      "driver": "ws2812"
+    },
+    "matrix_pins": {
+      "cols": ["A6", "A7", "B7", "B6"],
+      "rows": ["A13", "B14", "A10", "A0", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+      "rotary": [
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "A8", "pin_b": "A9"}
+      ]
+    },
+    "qmk": {
+      "tap_keycode_delay": 10
+    },
+    "rgblight": {
+      "led_count": 27
+    },
+    "ws2812": {
+      "pin": "B15"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+      "LAYOUT_all": {
+        "layout": [
+          {"matrix": [0, 1], "x": 0.5, "y": 0},
+
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+
+          {"matrix": [5, 0], "x": 0, "y": 5},
+          {"matrix": [5, 1], "x": 1, "y": 5},
+          {"matrix": [5, 2], "x": 2, "y": 5},
+          {"matrix": [5, 3], "x": 3, "y": 5}
+        ]
+      },
+      "LAYOUT_left_handed": {
+        "layout": [
+          {"matrix": [0, 1], "x": 0.5, "y": 0},
+
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "h": 2},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+
+          {"matrix": [4, 1], "x": 0, "y": 4, "h": 2},
+          {"matrix": [4, 2], "x": 1, "y": 4},
+          {"matrix": [4, 3], "x": 2, "y": 4},
+          {"matrix": [4, 0], "x": 3, "y": 4},
+
+          {"matrix": [5, 1], "x": 1, "y": 5},
+          {"matrix": [5, 2], "x": 2, "y": 5, "w": 2}
+        ]
+      },
+      "LAYOUT_right_handed": {
+        "layout": [
+          {"matrix": [0, 1], "x": 0.5, "y": 0},
+
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+
+          {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+          {"matrix": [5, 2], "x": 2, "y": 5},
+          {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
+        ]
+      }
+    }
+}
diff --git a/keyboards/hub20/keymaps/default/keymap.c b/keyboards/joshajohnson/hub20/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/hub20/keymaps/default/keymap.c
rename to keyboards/joshajohnson/hub20/keymaps/default/keymap.c
diff --git a/keyboards/hub20/keymaps/left_hand_numpad/keymap.c b/keyboards/joshajohnson/hub20/keymaps/left_hand_numpad/keymap.c
similarity index 100%
rename from keyboards/hub20/keymaps/left_hand_numpad/keymap.c
rename to keyboards/joshajohnson/hub20/keymaps/left_hand_numpad/keymap.c
diff --git a/keyboards/hub20/keymaps/right_hand_numpad/keymap.c b/keyboards/joshajohnson/hub20/keymaps/right_hand_numpad/keymap.c
similarity index 100%
rename from keyboards/hub20/keymaps/right_hand_numpad/keymap.c
rename to keyboards/joshajohnson/hub20/keymaps/right_hand_numpad/keymap.c
diff --git a/keyboards/hub20/keymaps/via/keymap.c b/keyboards/joshajohnson/hub20/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/hub20/keymaps/via/keymap.c
rename to keyboards/joshajohnson/hub20/keymaps/via/keymap.c
diff --git a/keyboards/pw88/keymaps/via/rules.mk b/keyboards/joshajohnson/hub20/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pw88/keymaps/via/rules.mk
rename to keyboards/joshajohnson/hub20/keymaps/via/rules.mk
diff --git a/keyboards/hub20/mcuconf.h b/keyboards/joshajohnson/hub20/mcuconf.h
similarity index 100%
rename from keyboards/hub20/mcuconf.h
rename to keyboards/joshajohnson/hub20/mcuconf.h
diff --git a/keyboards/joshajohnson/hub20/readme.md b/keyboards/joshajohnson/hub20/readme.md
new file mode 100755
index 00000000000..a3b5aba6410
--- /dev/null
+++ b/keyboards/joshajohnson/hub20/readme.md
@@ -0,0 +1,24 @@
+# Hub20
+
+Hub20 is a 20 key macro pad with an inbuilt USB 2.0 hub and dual rotary encoders. It can be configured to be a left / right hand numberpad, along with a 4x5 1u layout.
+
+For more information regarding the keyboard, please visit the [Hub20 Website](https://www.joshajohnson.com/hub20) or [GitHub Repo](https://github.com/joshajohnson/Hub20).
+
+* Keyboard Maintainer: [Josh Johnson](https://github.com/joshajohnson)
+* Hardware Supported: Hub20 PCB (STM32F072)
+* Hardware Availability: [Josh Johnson](https://www.joshajohnson.com/hub20)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make joshajohnson/hub20:default
+
+Flashing example for this keyboard:
+
+    make joshajohnson/hub20:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Press the reset switch between the center two USB-C ports while the board is plugged in
+* Hold the top left key while connecting the USB cable (also erases persistent settings)
+
+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/hub20/rules.mk b/keyboards/joshajohnson/hub20/rules.mk
similarity index 100%
rename from keyboards/hub20/rules.mk
rename to keyboards/joshajohnson/hub20/rules.mk
diff --git a/keyboards/jpe230/big_knob/config.h b/keyboards/jpe230/big_knob/config.h
index a7d6b2382c1..c4001447d25 100644
--- a/keyboards/jpe230/big_knob/config.h
+++ b/keyboards/jpe230/big_knob/config.h
@@ -30,7 +30,6 @@
 // Backlight configuration
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 2
-#define BACKLIGHT_DEFAULT_LEVEL 6
 
 // Timeout configuration
 #define QUANTUM_PAINTER_DISPLAY_TIMEOUT 10000
diff --git a/keyboards/jpe230/big_knob/info.json b/keyboards/jpe230/big_knob/info.json
index 4f72cfca487..083a1ae690a 100644
--- a/keyboards/jpe230/big_knob/info.json
+++ b/keyboards/jpe230/big_knob/info.json
@@ -31,7 +31,9 @@
     "backlight": {
         "pin": "GP7",
         "levels": 7,
-        "breathing": false
+        "default": {
+            "brightness": 6
+        }
     },
     "rgblight": {
         "driver": "ws2812",
diff --git a/keyboards/jukaie/jk01/config.h b/keyboards/jukaie/jk01/config.h
index 62c709a9172..e66f9227796 100644
--- a/keyboards/jukaie/jk01/config.h
+++ b/keyboards/jukaie/jk01/config.h
@@ -21,8 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
 
@@ -32,11 +30,6 @@
 #define SPI_MOSI_PIN A7
 #define SPI_MISO_PIN A6
 
-#define DRIVER_1_CS A15
-#define DRIVER_2_CS B15
-#define DRIVER_1_EN C13
-#define DRIVER_2_EN C13
-
-#define DRIVER_1_LED_TOTAL 66
-#define DRIVER_2_LED_TOTAL 19
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define AW20216S_CS_PIN_1 A15
+#define AW20216S_CS_PIN_2 B15
+#define AW20216S_EN_PIN C13
diff --git a/keyboards/jukaie/jk01/info.json b/keyboards/jukaie/jk01/info.json
index c53a59a5a31..c713fe2749a 100644
--- a/keyboards/jukaie/jk01/info.json
+++ b/keyboards/jukaie/jk01/info.json
@@ -87,7 +87,7 @@
             "solid_multisplash": true
         },
         "center_point": [76, 25],
-        "driver": "aw20216",
+        "driver": "aw20216s",
         "layout": [
             { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
             { "flags": 4, "matrix": [2, 6], "x": 20, "y": 0 },
@@ -174,7 +174,8 @@
             { "flags": 4, "matrix": [0, 5], "x": 150, "y": 50 },
             { "flags": 4, "matrix": [11, 0], "x": 0, "y": 1 },
             { "flags": 4, "matrix": [11, 1], "x": 0, "y": 2 }
-        ]
+        ],
+        "sleep": true
     },
     "url": "",
     "usb": {
diff --git a/keyboards/jukaie/jk01/jk01.c b/keyboards/jukaie/jk01/jk01.c
index 8f694194760..913e77a55e7 100644
--- a/keyboards/jukaie/jk01/jk01.c
+++ b/keyboards/jukaie/jk01/jk01.c
@@ -18,106 +18,106 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, k00, Esc
-
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   1, k13, Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   2, k26, F1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   3, k36, F2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   4, k31, F3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   5, k33, F4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   6, k07, F5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   7, k63, F6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   8, k71, F7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   9, k76, F8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  10, ka6, F9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  11, ka7, F10
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  12, ka3, F11
-    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  13, ka5, F12
-    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  14, k97, Printscreen
-    {1, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  15, k02, Del
-
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  16, k16, `
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  17, k17, 1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  18, k27, 2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  19, k37, 3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  20, k47, 4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  21, k46, 5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  22, k56, 6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  23, k57, 7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  24, k67, 8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  25, k77, 9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  26, k87, 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  27, k86, -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  28, k66, =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  29, ka1, Backspace
-    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  30, kc6, Home
-
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  31, k11, Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  32, k10, Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  33, k20, W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  34, k30, E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  35, k40, R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  36, k41, T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  37, k51, Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  38, k50, U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  39, k60, I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  40, k70, O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  41, k80, P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  42, k81, [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  43, k61, ]
-    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  44, ka2, "\\"
-    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  45, k65, End
-
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  46, k21, Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  47, k12, A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  48, k22, S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  49, k32, D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  50, k42, F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  51, k43, G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  52, k53, H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  53, k52, J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  54, k62, K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  55, k72, L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  56, k82, ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  57, k83, '
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  58, ka4, Enter
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  59, k15, PgUp
-
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  60, k00, Shift_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  61, k14, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  62, k24, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  63, k34, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  64, k44, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  65, k45, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  66, k55, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  67, k54, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  68, k64, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  69, k74, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  70, k85, /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  71, k91, Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  72, k35, Up
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  73, k25, PgDn
-
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  74, k06, Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  75, k90, Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  76, k93, Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  77, k94, Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  78, k95, Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  79, k92, FN
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  80, k04, Ctrl_R
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  81, k03, Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  82, k73, Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  83, k05, Right
-
-    {1, CS10_SW10, CS11_SW10, CS12_SW10}, //  84, kb0, Z1
-    {1, CS10_SW11, CS11_SW11, CS12_SW11}, //  85, kb1, Z2
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   0, k00, Esc
+
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   1, k13, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   2, k26, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   3, k36, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   4, k31, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   5, k33, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   6, k07, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   7, k63, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   8, k71, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   9, k76, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  10, ka6, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  11, ka7, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  12, ka3, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  13, ka5, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  14, k97, Printscreen
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  15, k02, Del
+
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  16, k16, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  17, k17, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  18, k27, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  19, k37, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  20, k47, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  21, k46, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  22, k56, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  23, k57, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  24, k67, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  25, k77, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  26, k87, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  27, k86, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  28, k66, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  29, ka1, Backspace
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  30, kc6, Home
+
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  31, k11, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  32, k10, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  33, k20, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  34, k30, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  35, k40, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  36, k41, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  37, k51, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  38, k50, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  39, k60, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  40, k70, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  41, k80, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  42, k81, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  43, k61, ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  44, ka2, "\\"
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  45, k65, End
+
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  46, k21, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  47, k12, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  48, k22, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  49, k32, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  50, k42, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  51, k43, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  52, k53, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  53, k52, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  54, k62, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  55, k72, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  56, k82, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  57, k83, '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  58, ka4, Enter
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  59, k15, PgUp
+
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  60, k00, Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  61, k14, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  62, k24, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  63, k34, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  64, k44, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  65, k45, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  66, k55, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  67, k54, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  68, k64, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  69, k74, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  70, k85, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  71, k91, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  72, k35, Up
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  73, k25, PgDn
+
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  74, k06, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  75, k90, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  76, k93, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  77, k94, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  78, k95, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  79, k92, FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  80, k04, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  81, k03, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  82, k73, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  83, k05, Right
+
+    {1, SW10_CS10, SW10_CS11, SW10_CS12}, //  84, kb0, Z1
+    {1, SW11_CS10, SW11_CS11, SW11_CS12}, //  85, kb1, Z2
 };
 
 #endif
diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
index 4c9b3ae6bae..6956ab4834b 100644
--- a/keyboards/junco/info.json
+++ b/keyboards/junco/info.json
@@ -18,7 +18,8 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "split_count": [37, 37]
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/junco/keymaps/default/config.h b/keyboards/junco/keymaps/default/config.h
index 43c47b9122a..8a1acc5fd38 100644
--- a/keyboards/junco/keymaps/default/config.h
+++ b/keyboards/junco/keymaps/default/config.h
@@ -23,7 +23,7 @@
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
 
 // Turns off RGB effects when there is no longer a USB connection
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_SLEEP
 
 // Key press reactive animations
 #    define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations
diff --git a/keyboards/junco/keymaps/deluxe/config.h b/keyboards/junco/keymaps/deluxe/config.h
deleted file mode 100644
index bec55fbd4c3..00000000000
--- a/keyboards/junco/keymaps/deluxe/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Dane Skalski (@Daneski13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Indicator LEDs */
-// LED index for caps lock key on the extension layer
-#define CAPS_LOCK_LED_INDEX 25
-// LED index for num lock key on the symbol layer
-#define NUM_LOCK_LED_INDEX 62
-// LED index for key that sticks the adjust layer
-#define ADJST_LED_INDEX 19
-
-// Number of Layers that can be used by VIA.
-// Change this if you want more layers
-#define DYNAMIC_KEYMAP_LAYER_COUNT 6
-
-/* - Encoder settings - */
-#ifdef ENCODER_ENABLE
-#    define ENCODER_RESOLUTION 4
-#endif
-#ifdef ENCODER_MAP_ENABLE
-// Key delay for encoders (necessary for some keycodes)
-#    define ENCODER_MAP_KEY_DELAY 10
-#endif
-
-/*
-    - RGB Stuff -
-    All effects can be found in the QMK docs:
-    https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-*/
-#ifdef RGB_MATRIX_ENABLE
-
-// Allows the indicator LEDs to work
-#    define SPLIT_LED_STATE_ENABLE
-#    define SPLIT_LAYER_STATE_ENABLE
-
-// Default effect when EEPROM cleared
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-
-// Turns off RGB effects when there is no longer a USB connection
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// Throttling of RGB to increase keyboard responsiveness, set to 1.5x the default limits
-#    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 6 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 24                               // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms), the default, is equivalent to limiting to 60fps
-
-// Key press reactive animations
-#    define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations
-#    define RGB_MATRIX_KEYPRESSES  // Enables key press effects
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-
-// Normal effects
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#endif
diff --git a/keyboards/junco/keymaps/deluxe/keymap.c b/keyboards/junco/keymaps/deluxe/keymap.c
deleted file mode 100644
index 42b6429b971..00000000000
--- a/keyboards/junco/keymaps/deluxe/keymap.c
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright 2022 Dane Skalski (@Daneski13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// Layers enum
-enum junco_layers { _QWERTY, _COLEMAK_DH, _SYMB, _EXT, _ADJUST };
-
-// Custom keycodes
-enum custom_keycodes {
-    // Keycode for toggling between macOS and Windows key mappings
-    // Actually just an alias to the GUI and Alt swap Magic keycode
-    KC_OS = MAGIC_TOGGLE_ALT_GUI,
-    // Keycode for swapping the base layer between QWERTY and Colemak-DH
-    KC_TOGGLE_BASE = SAFE_RANGE,
-    // Keycode for redo action (Ctrl + Y on windows, Ctrl + Shift + Z on macOS)
-    KC_REDO,
-    // Keycodes for next/previous word
-    KC_WNXT,
-    KC_WPRV,
-    // Keycode for sticking/unsticking the adjust layer
-    KC_ADJST
-};
-
-/* LED indicators */
-bool is_caps_lock_enabled(void) { // Caps lock
-    return (host_keyboard_led_state().caps_lock);
-}
-bool is_num_lock_enabled(void) { // Num lock
-    return (host_keyboard_led_state().num_lock);
-}
-bool is_adjust_layer_sticky(layer_state_t state) { // Adjust layer sticky
-    // Checks if the state is equal to just the adjust layer being active.
-    // Doing it this way can leverage SPLIT_LAYER_STATE_ENABLE
-    return (state == (1UL << _ADJUST)) ? true : false;
-}
-// Indicator color based on the RGB Matrix mode
-RGB indicator_color(void) {
-    RGB rgb;
-    // Normally the indicator color is white to stand out in the RGB rainbow.
-    // When using the custom RGB mode that already is white, the indicator color
-    // is green to stand out.
-    if (rgb_matrix_config.mode == RGB_MATRIX_CUSTOM_WHITE_UNDERGLOW_CYCLE) {
-        // Green
-        rgb.r = 0;
-        rgb.g = 255;
-        rgb.b = 0;
-    } else {
-        // White
-        rgb.r = 255;
-        rgb.g = 255;
-        rgb.b = 255;
-    }
-    return rgb;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // clang-format off
-    /*
-        Traditional QWERTY
-        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
-        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Tab│ Q │ W │ E │ R │ T │               │ Y │ U │ I │ O │ P │Ent│
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Esc│ A │ S │ D │ F │ G │               │ H │ J │ K │ L │ ; │ ' │
-        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
-        │Sft│ Z │ X │ C │ V │ B │Mut│       │▶⏸ │ N │ M │ , │ . │ / │Sft│
-        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
-                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
-                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
-                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
-                For macOS - GUI (cmd) and Alt (opt) swapped
-    */
-    [_QWERTY] = LAYOUT_split4x6_r1(
-        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
-        KC_TAB,   KC_Q, KC_W,    KC_E,    KC_R,    KC_T,                                KC_Y,               KC_U,    KC_I,    KC_O,   KC_P,         KC_ENTER,
-        KC_ESC,   KC_A, KC_S,    KC_D,    KC_F,    KC_G,                                KC_H,               KC_J,    KC_K,    KC_L,   KC_SEMICOLON, KC_QUOTE,
-        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_V,    KC_B,             KC_MUTE,  KC_MPLY, KC_N,               KC_M,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
-                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
-    ),
-
-    /*
-        Colemak-DH
-        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
-        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Tab│ Q │ W │ F │ P │ B │               │ J │ L │ U │ Y │ ; │Ent│
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Esc│ A │ R │ S │ T │ G │               │ M │ N │ E │ I │ O │ ' │
-        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
-        │Sft│ Z │ X │ C │ D │ V │Mut│       │▶⏸ │ K │ H │ , │ . │ / │Sft│
-        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
-                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
-                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
-                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
-                For macOS - GUI/Win (cmd) and Alt (opt) swapped
-    */
-    [_COLEMAK_DH] = LAYOUT_split4x6_r1(
-        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
-        KC_TAB,   KC_Q, KC_W,    KC_F,    KC_P,    KC_B,                                KC_J,               KC_L,    KC_U,    KC_Y,   KC_SEMICOLON, KC_ENTER,
-        KC_ESC,   KC_A, KC_R,    KC_S,    KC_T,    KC_G,                                KC_M,               KC_N,    KC_E,    KC_I,   KC_O,         KC_QUOTE,
-        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_D,    KC_V,             KC_MUTE,  KC_MPLY, KC_K,               KC_H,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
-                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
-    ),
-
-    /*
-        Symbols/Numpad Layer
-        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
-        │F1 │F2 │F3 │F4 │F5 │F6 │               │F7 │F8 │F9 │F10│F11│F12│
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Tab│ ! │ @ │ # │ $ │ % │               │ * │ 7 │ 8 │ 9 │ + │Ent│
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │ \ │ _ │ [ │ { │ ( │ ^ │               │ = │ 4 │ 5 │ 6 │ 0 │NUM│
-        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
-        │___│ | │ ] │ } │ ) │ & │___│       │___│ / │ 1 │ 2 │ 3 │ - │___│
-        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
-                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
-                │___│___│___│___│___│       │___│___│___│___│___│
-                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
-    */
-    [_SYMB] = LAYOUT_split4x6_r1(
-        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_TAB,   KC_EXLM,  KC_AT,   KC_HASH,    KC_DLR,   KC_PERC,                     KC_PAST,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_ENTER,
-        KC_BSLS,  KC_UNDS,  KC_LBRC, KC_LCBR,    KC_LPRN,  KC_CIRC,                     KC_PEQL,  KC_P4,    KC_P5,    KC_P6,    KC_P0,    KC_NUM,
-        _______,  KC_PIPE,  KC_RBRC, KC_RCBR,    KC_RPRN,  KC_AMPR, _______,  _______,  KC_PSLS,  KC_P1,    KC_P2,    KC_P3,    KC_PMNS,  _______,
-                            _______, _______,    _______,  _______, _______,  _______,  _______,  _______,  _______,  _______
-    ),
-
-    /*
-        Extension/Function Layer
-        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
-        │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │               │ F7 │ F8 │ F9 │ F10│ F11│ F12│
-        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
-        │ ⇤  │PGUP│End │ ↑  │Home│    │               │BRIU│ F7 │ F8 │ F9 │ F10│____│
-        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
-        │Cps │PGDN│ ←  │ ↓  │ →  │    │               │BRID│ F4 │ F5 │ F6 │ F11│____│
-        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
-        │____│    │    │    │    │    │____│     │____│    │ F1 │ F2 │ F3 │ F12│____│
-        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
-                      ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
-                      │___│___│___│___│___│       │___│___│___│___│___│
-                      └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
-    */
-    [_EXT] = LAYOUT_split4x6_r1(
-        KC_F1,     KC_F2,      KC_F3,      KC_F4,      KC_F5,       KC_F6,                       KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,
-        S(KC_TAB), KC_PGUP,    KC_END,     KC_UP,      KC_HOME,     _______,                     KC_BRIU, KC_F7,    KC_F8,   KC_F9,   KC_F10,   _______,
-        KC_CAPS,   KC_PGDN,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,                     KC_BRID, KC_F4,    KC_F5,   KC_F6,   KC_F11,   _______,
-        _______,   _______,    _______,    _______,    _______,     _______, _______,  _______,  _______, KC_F1,    KC_F2,   KC_F3,   KC_F12,   _______,
-                               _______,    _______,    _______,     _______, _______,  _______,  _______, _______,  _______, _______
-    ),
-
-    /*
-        Adjust Layer, Keyboard Settings
-        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
-        │    │    │    │    │    │    │               │    │    │    │    │    │    │
-        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
-        │SpdU│HueU│SatU│ValU│Rnxt│Stck│               │    │EClr│Rbt │DBUG│BOOT│    │
-        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
-        │SpdD│HueD│SatD│ValD│Rprv│RTgl│               │    │LOUT│ OS │    │    │    │
-        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
-        │    │    │    │    │    │    │RTgl│     │    │    │    │    │    │    │    │
-        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
-                       ┌───┬───┬───┬───┬───┐     ┌───┬───┬───┬───┬───┐
-                       │___│___│___│___│___│     │___│___│___│___│___│
-                       └───┴───┴───┴───┴───┘     └───┴───┴───┴───┴───┘
-    */
-    [_ADJUST] = LAYOUT_split4x6_r1(
-        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                       KC_NO,       KC_NO,          KC_NO,   KC_NO,      KC_NO,    KC_NO,
-        RGB_SPI,   RGB_HUI,    RGB_SAI,    RGB_VAI,    RGB_MOD,    KC_ADJST,                    KC_NO,       EE_CLR,         QK_RBT,  DB_TOGG,    QK_BOOT,  KC_NO,
-        RGB_SPD,   RGB_HUD,    RGB_SAD,    RGB_VAD,    RGB_RMOD,   RGB_TOG,                     KC_NO,       KC_TOGGLE_BASE, KC_OS,   KC_NO,      KC_NO, KC_NO,
-        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   RGB_TOG,  KC_NO,    KC_NO,       KC_NO,          KC_NO,   KC_NO,      KC_NO,    KC_NO,
-                               _______,    _______,    _______,    _______, _______,  _______,  _______,     _______,        _______, _______
-    )
-    // clang-format on
-};
-
-/*
-    --- Rotary Encoder Mappings ---
-
-    Encoder mappings go from leftmost encoder to rightmost encoder on the physical board.
-    index 0 is the the optional leftmost encoder on the left half, index 1 is the right encoder
-    on the left half (by the thumb keys), index 2 is the left encoder on the right half (by the
-    thumb keys), and index 3 is the optional rightmost encoder on the right half.
-
-    If you are only using the 2 required encoders by the thumb keys, you only need to worry about
-    index 1 and index 2.
-
-    Note that the key to be sent for counter-clockwise rotation (CCW) goes first and then the key for
-    clockwise (CW) within ENCODER_CCW_CW.
-*/
-#ifdef ENCODER_MAP_ENABLE
-// clang-format off
-
-// Base layer encoder mappings:
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    // Base layers
-    //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume up/down           index 2: media prev/next          index 3: mouse wheel left/right
-    [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
-    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-
-    // Passes through to base layer
-    [_SYMB] =       { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    //                                                                                    undo/redo                         previous word/next word
-    [_EXT] =        { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_UNDO, KC_REDO), ENCODER_CCW_CW(KC_WPRV, KC_WNXT) },
-    //                RGB Speed down/up                 RGB previous mode/next mode        RGB brightness down/up
-    [_ADJUST] =     { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    // clang-format on
-};
-
-#endif
-
-// Called whenever a layer is changed
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // Make sure the adjust layer isn't sticky
-    if (is_adjust_layer_sticky(state)) return state;
-
-    // When both the symbol and extension layer keys are held, the Adjust layer is active.
-    return update_tri_layer_state(state, _SYMB, _EXT, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // Toggle base layer
-        case KC_TOGGLE_BASE:
-            if (record->event.pressed) {
-                // Toggle swapping base layers between Colemak-DH and QWERTY.
-                // When base layer is QWERTY, swap to Colemak-DH and vice-versa
-                if (get_highest_layer(default_layer_state) == _QWERTY) {
-                    default_layer_set(1UL << _COLEMAK_DH);
-                } else {
-                    default_layer_set(1UL << _QWERTY);
-                }
-            }
-            return false;
-
-        // Override undo in favor of the more modern undo action
-        case KC_UNDO:
-            if (record->event.pressed) {
-                // Use the correct modifier for macOS or Windows
-                uint16_t mod = keymap_config.swap_lalt_lgui ? KC_LGUI : KC_LCTL;
-                // Send Ctrl+Z/Cmd+Z
-                register_code(mod);
-                tap_code_delay(KC_Z, 10);
-                unregister_code(mod);
-            }
-            return false;
-
-        //  Redo action
-        case KC_REDO:
-            if (record->event.pressed) {
-                // Whether or not macOS mapping is enabled
-                if (keymap_config.swap_lalt_lgui) {
-                    // macOS - Send Cmd+Shift+Z
-                    register_code(KC_LGUI);
-                    register_code(KC_LSFT);
-                    tap_code_delay(KC_Z, 10);
-                    unregister_code(KC_LSFT);
-                    unregister_code(KC_LGUI);
-                } else {
-                    // Windows - Send Ctrl+Y
-                    register_code(KC_LCTL);
-                    tap_code_delay(KC_Y, 10);
-                    unregister_code(KC_LCTL);
-                }
-            }
-            return false;
-
-        // Next word
-        case KC_WNXT:
-            if (record->event.pressed) {
-                // Use the correct modifier for macOS or Windows
-                uint16_t mod = keymap_config.swap_lalt_lgui ? KC_LALT : KC_LCTL;
-                // Send Ctrl+Right/Option+Right
-                register_code(mod);
-                tap_code_delay(KC_RGHT, 10);
-                unregister_code(mod);
-            }
-            return false;
-
-        // Previous word
-        case KC_WPRV:
-            if (record->event.pressed) {
-                // Use the correct modifier for macOS or Windows
-                uint16_t mod = keymap_config.swap_lalt_lgui ? KC_LALT : KC_LCTL;
-                // Send Ctrl+Left/Option+Left
-                register_code(mod);
-                tap_code_delay(KC_LEFT, 10);
-                unregister_code(mod);
-            }
-            return false;
-
-        // Stick / Unstick the adjust layer
-        case KC_ADJST:
-            if (record->event.pressed) {
-                // If currently not sticky, we want only the adjust layer to be active to make it stick.
-                // Otherwise we want the default layer, un-stick.
-                is_adjust_layer_sticky(layer_state) ? layer_state_set(default_layer_state) : layer_move(_ADJUST);
-                dprintf("Adjust layer is now %s\n", is_adjust_layer_sticky(layer_state) ? "stuck" : "un-stuck");
-            }
-            return false;
-        default:
-            return true;
-    }
-}
-
-/* Indicators (Caps Lock / Num Lock / Adjust Layer Sticky) */
-bool rgb_matrix_indicators_user(void) {
-    layer_state_t curr_layer_state = layer_state;
-    layer_state_t layer            = get_highest_layer(curr_layer_state);
-    RGB           rgb              = indicator_color();
-
-    /* Only show the indicator on their respective layers */
-    // Caps Lock is only on the extension layer
-    if (is_caps_lock_enabled() && layer == _EXT) {
-        rgb_matrix_set_color(CAPS_LOCK_LED_INDEX, rgb.r, rgb.g, rgb.b);
-    }
-
-    // Num Lock is only on the symbol layer
-    if (is_num_lock_enabled() && layer == _SYMB) {
-        rgb_matrix_set_color(NUM_LOCK_LED_INDEX, rgb.r, rgb.g, rgb.b);
-    }
-
-    // If the adjust layer is stuck/sticky, light it up. Don't need to care about
-    // checking the layer since it can only be active on the adjust layer anyway
-    if (is_adjust_layer_sticky(curr_layer_state)) rgb_matrix_set_color(ADJST_LED_INDEX, rgb.r, rgb.g, rgb.b);
-
-    return false;
-}
diff --git a/keyboards/junco/keymaps/deluxe/readme.md b/keyboards/junco/keymaps/deluxe/readme.md
deleted file mode 100644
index d52d315f7d4..00000000000
--- a/keyboards/junco/keymaps/deluxe/readme.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Deluxe Junco Keymap
-
-This is my personal keymap for Junco at time of writing. It departs from the [default layout](../default/README.md) with the encoder mappings and some extra keycodes. This keymap also adds indicators when caps lock and num lock are enabled. When enabled, that key will become a static white (green on the white backlight mode) but only when the layer that respective key is on is active.
-
-I wanted that classic rainbow barf RGB effect for the underglow even if the per-key lighting is something else, so I added 2 custom RGB matrix animations: white per-key lighting with rainbow underglow and pixel rain with rainbow underglow.
-
-Here are some gifs of the animations:
-
-![White + Underglow Animation](https://i.imgur.com/2vCiZz0.gif)
-
-![Pixel Rain + Underglow Animation](https://i.imgur.com/f6t0OfD.gif)
-
-## Base Layers
-
-The base layers are the same as the default layout, except the right side's left encoder (by the thumb keys) is now media controls. Since I am using all 4 encoders it doesn't make sense to have 2 mouse scroll up/down, but for someone with just 2 encoders it may make sense to have media controls on a layer.
-
-QWERTY:
-
-![QWERTY Layer](https://i.imgur.com/vkS9Tceh.png)
-
-Colemak-DH:
-
-![Colemak-DH Layer](https://i.imgur.com/5YYgaUAh.png)
-
-## Symbol Layer
-
-Symbol layer is identical to the default layout.
-
-![Symbol Layer](https://i.imgur.com/6F35Z4Wh.png)
-
-## Extension Layer
-
-Encoders on the right side become undo/redo and scrolling horizontally by word.
-
-![Extension Layer](https://i.imgur.com/0VCStS8h.png)
-
-## Adjust Layer
-
-Pressing "Stick Adj Layer" will "stick" the adjust layer so you can use the rotary encoders for RGB settings rather than holding down both backspace and delete. To go back to the default layer, press that stick key again or press and release either Del or Backspace. When the adjust layer is currently "sticky" the sticky key will become the indicator color mentioned earlier.
-
-"Toggle Base" will toggle between QWERTY and Colemak-DH and toggle OS will toggle between macOS and Windows key-mappings (swapping WIN/Command with Alt/Option by the thumb keys and properly mapping redo/word scrolling).
-
-![Adjust layer](https://i.imgur.com/71ftNoNh.png)
diff --git a/keyboards/junco/keymaps/deluxe/rgb_matrix_user.inc b/keyboards/junco/keymaps/deluxe/rgb_matrix_user.inc
deleted file mode 100644
index 3efe5067497..00000000000
--- a/keyboards/junco/keymaps/deluxe/rgb_matrix_user.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2022 Dane Skalski (@Daneski13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-RGB_MATRIX_EFFECT(WHITE_UNDERGLOW_CYCLE)
-RGB_MATRIX_EFFECT(PIXEL_RAIN_UNDERGLOW_CYCLE)
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-// This is a modified version of the effect_runner_dx_dy_dist function from rgb_matrix
-// that only applies the effect to the underglow LEDs of this keyboard
-static bool underglow_effect_runner(effect_params_t* params, dx_dy_dist_f underglow_effect_func, bool backlight_white) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
-    HSV hsv = rgb_matrix_config.hsv;
-    HSV white = {0, 0, hsv.v};
-    RGB rgb = rgb_matrix_hsv_to_rgb(white);
-    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
-    for (uint8_t i = led_min; i < led_max; i++) {
-        // Underglow LEDs are indicies 0 - 7 and 37 - 44
-        if ((i <= 7) || (37 <= i && i <= 44)) {
-            // Apply the maths and colors to the underglow LEDs
-            RGB_MATRIX_TEST_LED_FLAGS();
-            int16_t dx   = g_led_config.point[i].x - k_rgb_matrix_center.x;
-            int16_t dy   = g_led_config.point[i].y - k_rgb_matrix_center.y;
-            uint8_t dist = sqrt16(dx * dx + dy * dy);
-            RGB     rgb  = rgb_matrix_hsv_to_rgb(underglow_effect_func(hsv, dx, dy, dist, time));
-            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-        } else {
-            // Set the backlight to white if needed
-            if (!backlight_white) continue;
-            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-        }
-    }
-    return rgb_matrix_check_finished_leds(led_max);
-}
-
-// Solid white but the underglow is a rainbow spiral
-static bool WHITE_UNDERGLOW_CYCLE(effect_params_t* params) {
-    return underglow_effect_runner(params, &CYCLE_SPIRAL_math, true);
-}
-
-// Pixel rain effect but the underglow is a rainbow spiral
-static bool PIXEL_RAIN_UNDERGLOW_CYCLE(effect_params_t* params) {
-    PIXEL_RAIN(params);
-    return underglow_effect_runner(params, &CYCLE_SPIRAL_math, false);
-}
-
-#endif
diff --git a/keyboards/junco/keymaps/deluxe/rules.mk b/keyboards/junco/keymaps/deluxe/rules.mk
deleted file mode 100644
index b788c6155b4..00000000000
--- a/keyboards/junco/keymaps/deluxe/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Enables Audio control and System control Keycodes
-EXTRAKEY_ENABLE = yes
-# Enables Mousekeys
-MOUSEKEY_ENABLE = yes
-# Encoder Support
-ENCODER_ENABLE = yes
-# Use Enocoder Mapping
-ENCODER_MAP_ENABLE = yes
-
-# Enables RGB Lighting Effects
-RGB_MATRIX_ENABLE = yes
-
-# Allows use of `qmk console` for debugging
-CONSOLE_ENABLE = yes
-
-# Enables VIA
-VIA_ENABLE = yes
-
-# Custom RGB Matrix Effect
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/junco/keymaps/via/config.h b/keyboards/junco/keymaps/via/config.h
index c4ce821594d..897313cd668 100644
--- a/keyboards/junco/keymaps/via/config.h
+++ b/keyboards/junco/keymaps/via/config.h
@@ -26,7 +26,7 @@
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
 
 // Turns off RGB effects when there is no longer a USB connection
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_SLEEP
 
 // Allow keypress reactive animations
 #    define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations on a split
diff --git a/keyboards/junco/rev1/config.h b/keyboards/junco/rev1/config.h
index 713d651d478..17d9e33be00 100644
--- a/keyboards/junco/rev1/config.h
+++ b/keyboards/junco/rev1/config.h
@@ -8,12 +8,3 @@
 #define SERIAL_USART_FULL_DUPLEX // Use full duplex communication (TRRS)
 #define SERIAL_USART_TX_PIN GP0  // USART TX pin
 #define SERIAL_USART_RX_PIN GP1  // USART RX pin
-
-/* RGB Stuff */
-#ifdef RGB_MATRIX_ENABLE
-
-#    define RGB_MATRIX_LED_COUNT 74
-#    define RGB_MATRIX_SPLIT \
-        { 37, 37 } // 37 LEDs on each side
-
-#endif
diff --git a/keyboards/junco/rev1/post_config.h b/keyboards/junco/rev1/post_config.h
index bcc15a941a0..d9fa5e4c603 100644
--- a/keyboards/junco/rev1/post_config.h
+++ b/keyboards/junco/rev1/post_config.h
@@ -7,9 +7,9 @@
 // Top left for left side is default in core
 
 // Top right for right side
-#ifndef BOOTMAGIC_LITE_ROW_RIGHT
-#    define BOOTMAGIC_LITE_ROW_RIGHT 5
+#ifndef BOOTMAGIC_ROW_RIGHT
+#    define BOOTMAGIC_ROW_RIGHT 5
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 0
+#ifndef BOOTMAGIC_COLUMN_RIGHT
+#    define BOOTMAGIC_COLUMN_RIGHT 0
 #endif
diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h
index 64013a3a7fb..514a1121b35 100644
--- a/keyboards/kabedon/kabedon98e/config.h
+++ b/keyboards/kabedon/kabedon98e/config.h
@@ -24,5 +24,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json
index 42f0796a533..6f99aa6c308 100644
--- a/keyboards/kabedon/kabedon98e/info.json
+++ b/keyboards/kabedon/kabedon98e/info.json
@@ -33,6 +33,9 @@
         "rows": ["A4", "B10", "B2", "B1", "B0", "B15", "B13", "B14", "B12", "A10", "A9", "A8"]
     },
     "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B5"},
diff --git a/keyboards/kagizaraya/chidori/board.c b/keyboards/kagizaraya/chidori/board.c
index e00156eb903..34e57a88741 100644
--- a/keyboards/kagizaraya/chidori/board.c
+++ b/keyboards/kagizaraya/chidori/board.c
@@ -69,8 +69,8 @@ static void board_set_slave_led(board_info_t* board, uint8_t led_index, bool sta
     board->led_status[led_index] = status;
     uint8_t iodir                = board_merge_led_config(board, 0xff);
     uint8_t data                 = board_merge_led_status(board, 0x00);
-    i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&iodir, sizeof(iodir), BOARD_I2C_TIMEOUT);
-    i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_OLATB, (const uint8_t*)&data, sizeof(data), BOARD_I2C_TIMEOUT);
+    i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&iodir, sizeof(iodir), BOARD_I2C_TIMEOUT);
+    i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_OLATB, (const uint8_t*)&data, sizeof(data), BOARD_I2C_TIMEOUT);
 }
 
 static uint8_t board_merge_led_config(board_info_t* board, uint8_t iodir) {
@@ -86,30 +86,30 @@ static bool board_slave_config(board_info_t* board) {
     i2c_status_t res   = 0;
 
     // Set to input
-    res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRA, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT);
+    res = i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRA, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT);
     if (res < 0) return false;
     // RESTRICTION: LEDs only on PORT B.
     set = board_merge_led_config(board, set);
-    res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT);
+    res = i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT);
     if (res < 0) return false;
     set = 0xff;
 
     // Pull up for input - enable
-    res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPPUA, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT);
+    res = i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPPUA, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT);
     if (res < 0) return false;
-    res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPPUB, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT);
+    res = i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPPUB, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT);
     if (res < 0) return false;
 
     // Disable interrupt
-    res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPINTENA, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT);
+    res = i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPINTENA, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT);
     if (res < 0) return false;
-    res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPINTENB, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT);
+    res = i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPINTENB, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT);
     if (res < 0) return false;
 
     // Polarity - same logic
-    res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IPOLA, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT);
+    res = i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_IPOLA, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT);
     if (res < 0) return false;
-    res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IPOLB, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT);
+    res = i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_IPOLB, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT);
     if (res < 0) return false;
 
     return true;
@@ -124,10 +124,9 @@ static void board_slave_init(void) {
         if (board_is_master(board)) {
             continue;
         }
-        if (i2c_start(EXPANDER_ADDR(board->i2c_address), BOARD_I2C_TIMEOUT) != I2C_STATUS_SUCCESS) {
+        if (i2c_ping_address(EXPANDER_ADDR(board->i2c_address), BOARD_I2C_TIMEOUT) != I2C_STATUS_SUCCESS) {
             continue;
         }
-        i2c_stop();
         if (board_slave_config(board)) {
             board->initialized = true;
         }
@@ -203,7 +202,7 @@ static uint8_t board_read_slave_cols(board_info_t* board) {
         return 0xff;
     }
     uint8_t      data = 0xff;
-    i2c_status_t res  = i2c_readReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPIOA, &data, sizeof(data), BOARD_I2C_TIMEOUT);
+    i2c_status_t res  = i2c_read_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPIOA, &data, sizeof(data), BOARD_I2C_TIMEOUT);
     return (res < 0) ? 0xff : data;
 }
 
@@ -214,8 +213,8 @@ static void board_select_slave_row(board_info_t* board, uint8_t board_row) {
     uint8_t pin    = board->row_pins[board_row];
     uint8_t iodir  = board_merge_led_config(board, PIN2MASK(pin));
     uint8_t status = board_merge_led_status(board, PIN2MASK(pin));
-    i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&iodir, sizeof(iodir), BOARD_I2C_TIMEOUT);
-    i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_OLATB, (const uint8_t*)&status, sizeof(status), BOARD_I2C_TIMEOUT);
+    i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&iodir, sizeof(iodir), BOARD_I2C_TIMEOUT);
+    i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_OLATB, (const uint8_t*)&status, sizeof(status), BOARD_I2C_TIMEOUT);
 }
 
 static void board_unselect_slave_rows(board_info_t* board) {
@@ -224,8 +223,8 @@ static void board_unselect_slave_rows(board_info_t* board) {
     }
     uint8_t iodir = board_merge_led_config(board, 0xff);
     uint8_t data  = board_merge_led_status(board, 0x00);
-    i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&iodir, sizeof(iodir), BOARD_I2C_TIMEOUT);
-    i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_OLATB, (const uint8_t*)&data, sizeof(data), BOARD_I2C_TIMEOUT);
+    i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&iodir, sizeof(iodir), BOARD_I2C_TIMEOUT);
+    i2c_write_register(EXPANDER_ADDR(board->i2c_address), EXPANDER_OLATB, (const uint8_t*)&data, sizeof(data), BOARD_I2C_TIMEOUT);
 }
 
 static void board_unselect_slave_row(board_info_t* board, uint8_t board_row) { board_unselect_slave_rows(board); }
diff --git a/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c b/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
deleted file mode 100644
index 856a32a8eb9..00000000000
--- a/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- * Copyright 2020 Masaya Uno
- *
- * 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 "board.h"
-
-enum layer_number {
-    _QWERTY,
-    _COLEMAK,
-    _DVORAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-    DVORAK,
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |ADJUST| Esc  | Alt  | GUI  |LOWER |Space |             | Space| RAISE| Left | Down |  Up  | Right|
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-    [_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_BSPC,
-      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, KC_ENT,
-      ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,            KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-  /* Colemak
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |             |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   R  |   S  |   T  |   D  |             |   H  |   N  |   E  |   I  |   O  |  '   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |ADJUST| Esc  | Alt  | GUI  |LOWER |Space |             | Space| RAISE| Left | Down |  Up  | Right|
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-    [_COLEMAK] = LAYOUT(
-      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,              KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-      KC_LCTL, 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_ENT,
-      ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,            KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-  /* Dvorak
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   '  |   ,  |   .  |   P  |   Y  |             |   F  |   G  |   C  |   R  |   L  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   O  |   E  |   U  |   I  |             |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |             |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |ADJUST| Esc  | Alt  | GUI  |LOWER |Space |             | Space| RAISE| Left | Down |  Up  | Right|
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-    [_DVORAK] = LAYOUT(
-      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,              KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-      KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,              KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,              KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-      ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,            KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-  /* Lower
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |             |   ^  |   &  |   *  |   (  |   )  |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |   -  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |      | Home | End  |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-    [_LOWER] = LAYOUT(
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,           KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-      _______, _______, _______, _______, _______, _______,           KC_MINS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-      _______, _______, _______, _______, _______, _______,           _______, _______, _______, KC_HOME, KC_END,  _______,
-      _______, _______, _______, _______, _______, _______,           _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-    ),
-
-  /* Raise
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |             |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |             |  F12 |      |      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-    [_RAISE] = LAYOUT(
-      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_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_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-    ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |      | Reset|      |      |      |      |             |      |Qwerty|Colemk|Dvorak|      | Ins  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Caps |      |      |      |      | Mac  |             | Win  |  -   |   =  |Print |ScLock|Pause |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             | KANA |      | Home |PageDn|PageUp| End  |
-   * `-----------------------------------------'             `-----------------------------------------'
-   */
-    [_ADJUST] = LAYOUT(
-      _______, QK_BOOT, _______, _______, _______, _______,           _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS,
-      KC_CAPS, _______, _______, _______, _______, AG_NORM,           AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS,
-      _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______,           _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-    )
-};
-// clang-format on
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return false;
-        case COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            return false;
-        case DVORAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_DVORAK);
-            }
-            return false;
-    }
-    return true;
-}
-
-bool led_update_user(led_t led_state) {
-    board_set_led_by_index(0, LED_YELLOW, led_state.caps_lock);
-    board_set_led_by_index(1, LED_YELLOW, led_state.scroll_lock);
-
-    return false;
-}
-
-#ifdef OLED_ENABLE
-
-void oled_write_layer_state(void) {
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state | default_layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("Qwerty"), false);
-            break;
-        case _COLEMAK:
-            oled_write_ln_P(PSTR("Colemak"), false);
-            break;
-        case _DVORAK:
-            oled_write_ln_P(PSTR("Dvorak"), false);
-            break;
-        case _LOWER:
-            oled_write_ln_P(PSTR("Lower"), false);
-            break;
-        case _RAISE:
-            oled_write_ln_P(PSTR("Raise"), false);
-            break;
-        case _ADJUST:
-            oled_write_ln_P(PSTR("Adjust"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-            break;
-    }
-}
-
-bool oled_task_user(void) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_layer_state();
-    return false;
-}
-#endif
diff --git a/keyboards/kagizaraya/chidori/keymaps/oled_sample/readme.md b/keyboards/kagizaraya/chidori/keymaps/oled_sample/readme.md
deleted file mode 100644
index 38f8a146a5c..00000000000
--- a/keyboards/kagizaraya/chidori/keymaps/oled_sample/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# An OLED enabled keymap based on the default keymap for chidori
diff --git a/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk b/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
deleted file mode 100644
index 80b82b2a5cc..00000000000
--- a/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enable SSD1306 OLED
-OLED_ENABLE = yes
diff --git a/keyboards/miniaxe/config.h b/keyboards/kagizaraya/miniaxe/config.h
similarity index 100%
rename from keyboards/miniaxe/config.h
rename to keyboards/kagizaraya/miniaxe/config.h
diff --git a/keyboards/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/info.json
similarity index 100%
rename from keyboards/miniaxe/info.json
rename to keyboards/kagizaraya/miniaxe/info.json
diff --git a/keyboards/miniaxe/keymaps/default/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/miniaxe/keymaps/default/keymap.c
rename to keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
diff --git a/keyboards/miniaxe/keymaps/underglow/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
similarity index 100%
rename from keyboards/miniaxe/keymaps/underglow/keymap.c
rename to keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
diff --git a/keyboards/aleblazer/zodiark/keymaps/slimoled/rules.mk b/keyboards/kagizaraya/miniaxe/keymaps/underglow/rules.mk
similarity index 100%
rename from keyboards/aleblazer/zodiark/keymaps/slimoled/rules.mk
rename to keyboards/kagizaraya/miniaxe/keymaps/underglow/rules.mk
diff --git a/keyboards/kagizaraya/miniaxe/readme.md b/keyboards/kagizaraya/miniaxe/readme.md
new file mode 100644
index 00000000000..bf2a4b0e986
--- /dev/null
+++ b/keyboards/kagizaraya/miniaxe/readme.md
@@ -0,0 +1,16 @@
+MiniAxe
+===
+
+![MiniAxe](https://i.imgur.com/1ApzrCz.jpg)
+
+Yet another split ortholinear keyboard with 3x5+3 keys.
+
+Keyboard Maintainer: [ka2hiro](https://github.com/ka2hiro) [@ka2hiro](https://twitter.com/ka2hiro)  
+Hardware Supported: MiniAxe PCB, ATMEGA32U4  
+Hardware Availability: [@ka2hiro](https://twitter.com/ka2hiro)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kagizaraya/miniaxe: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/miniaxe/rules.mk b/keyboards/kagizaraya/miniaxe/rules.mk
similarity index 100%
rename from keyboards/miniaxe/rules.mk
rename to keyboards/kagizaraya/miniaxe/rules.mk
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
deleted file mode 100644
index 024bc9d952d..00000000000
--- a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * 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 the keycodes used by our macros in process_record_user
-enum layer_names {
-    _QWERTY,
-    _HAPPY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  HAPPY,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-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  | BkSp |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           | Ctrl |   A  |   S  |   D  |   F  |   G  |   `  |       |   '  |   H  |   J  |   K  |   L  |   ;  |Enter |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
- *           |Shift |   Z  |   X  |   C  |   V  |   B  | Caps |       |  Del |   N  |   M  |   ,  |   .  |   /  |Shift | Fn   |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                | LAlt | LGUI | LOWER|Ctr/Esc|      |Spc/Sft | RAISE| LGUI | LAlt |
- *                                `---------------------------'       `---------------------------'
- */
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,      KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,      KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_GRV,       KC_QUOT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_CAPS,      KC_DEL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  HAPPY,
-                             KC_LALT, KC_LGUI, LOWER,   MT(MOD_LCTL, KC_ESC),      MT(MOD_LSFT, KC_SPC),  RAISE,   KC_RGUI, KC_RALT
-),
-
-/* Happy
- *
- *           ,------------------------------------------------.       ,------------------------------------------------.
- *           |  Pwr |  F1  |  F2  |  F3  |  F4  |  F5  |      |       |      |  F6  |  F7  |  F8  |  F9  |  F0  |  Del |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           | Caps |  F11 |  F12 |BLTOGG|      |BL INC|BL DEC|       |      |      | Psc  | Slk  | Pus  | Up   |  Ins |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      | Vol- | Vol+ | Mute |RGBHUI|RGBSAI|RGBVAI|       |   *  |   /  | Home | PgUp | Left | Right|      |
- *           |------+------+------+------+------+------+------|       +------+------+------+------+------+------+------+------.
- *           |      |RGBTOG|RGBMOD|RGBRMD|RGBHUD|RGBSAD|RGBVAD|       |   +  |   -  | End  | PgDn | Down |      |      |      |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                |      |      |      |      |       |      |      |      |      |
- *                                `---------------------------'       `---------------------------'
- */
-[_HAPPY] = LAYOUT(
-  KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  KC_CAPS, KC_F10,  KC_F12,  BL_TOGG, _______, BL_UP  , BL_DOWN,      _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_INS,
-  _______, KC_VOLD, KC_VOLU, KC_MUTE, RGB_HUI, RGB_SAI, RGB_VAI,      KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
-  _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD,      KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,  _______, _______, _______,
-                             _______, _______, _______, _______,      _______, _______, _______, _______
-),
-
-
-/* Raise
- *
- *           ,------------------------------------------------.       ,------------------------------------------------.
- *           |      |      |      |      |      |      |      |       |      |      |      |      |      |      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |   !  |   @  |   #  |   $  |   %  |      |       |      |   ^  |   &  |   *  |   (  |   )  |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |      |   _  |   +  |  |   |  ~   |      |       |      |   :  |   "  |   >  |   {  |   }  |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
- *           |      |      |   -  |   =  |  \   |  `   |      |       |      |   ;  |   '  |   <  |   [  |   ]  |      |      |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                |      |      |      |      |       |      |      |      |      |
- *                                `---------------------------'       `---------------------------'
- */
-[_RAISE] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,      _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, _______, KC_UNDS, KC_PLUS, KC_PIPE, KC_TILD, _______,      _______, KC_COLN, KC_DQUO, KC_GT,   KC_LCBR, KC_RCBR, _______,
-  _______, _______, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  _______,      _______, KC_SCLN, KC_QUOT, KC_LT,   KC_LBRC, KC_RBRC, _______, _______,
-                             _______, _______, _______, _______,      _______, _______, _______, _______
-),
-
-
-/* Lower
- *
- *           ,------------------------------------------------.       ,------------------------------------------------.
- *           |      |      |      |      |      |      |      |       |      |      |      |      |      |      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |   1  |   2  |   3  |   4  |   5  |      |       |      |   6  |   7  |   8  |   9  |   0  |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |      |      |      |      |      | Enter|       |      | Left | Down |  Up  | Right|      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
- *           |      |      |      |      |      |      | Del  |       | BkSp |      | PgUp | PgDn |      |      |      |      |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                |      |      |      |      |       |      |      |      |      |
- *                                `---------------------------'       `---------------------------'
- */
-[_LOWER] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,      _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  _______, _______, _______, _______, _______, _______, KC_ENT,       _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_DEL,       KC_BSPC, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______,
-                             _______, _______, _______, _______,      _______, _______, _______, _______
-),
-
-
-/* Adjust
- *
- *           ,------------------------------------------------.       ,------------------------------------------------.
- *           |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |       |      |  F6  |  F7  |  F8  |  F9  |  F0  |  Del |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      | F11  | F12  |BLTOGG|      |BL INC|BL DEC|       |      |      |      |      |      |      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |      |      |RGBMOD|RGBHUI|RGBSAI|RGBVAI|       |      |      |      |      |      |      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
- *           |      | Reset|      |RGBTOG|RGBHUD|RGBSAD|RGBVAD|       |      | Prev | Next | Vol- | Vol+ | Play |      |      |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                |      |      |      |      |       |      |      |      |      |
- *                                `---------------------------'       `---------------------------'
- */
-[_ADJUST] = LAYOUT(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  _______, KC_F10,  KC_F12,  BL_TOGG, _______, BL_UP  , BL_DOWN,      _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,      _______, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD,      _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______,
-                             _______, _______, _______, _______,      _______, _______, _______, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        // persistant_default_layer_set(1UL<<_QWERTY);
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case HAPPY:
-      if (record->event.pressed) {
-        layer_on(_HAPPY);
-      } else {
-        layer_off(_HAPPY);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/readme.md b/keyboards/kagizaraya/scythe/keymaps/forties/readme.md
deleted file mode 100644
index 162792dc375..00000000000
--- a/keyboards/kagizaraya/scythe/keymaps/forties/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The forty percent compatible keymap for scythe
-
diff --git a/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/config.h b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/config.h
deleted file mode 100644
index bf1149ebc63..00000000000
--- a/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c
deleted file mode 100644
index 31bc5aaebe0..00000000000
--- a/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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/>.
- */
-#define USE_LED_RIPPLE_EFFECT
-// #define RANDOM_RIPPLE_EFFECT
-
-#include QMK_KEYBOARD_H
-#include "lufa.h"
-
-#ifdef USE_LED_RIPPLE_EFFECT
-struct keybuf {
-  char col, row;
-  char frame;
-};
-struct keybuf keybufs[256];
-unsigned char keybuf_begin, keybuf_end;
-
-unsigned char r = 0;
-unsigned char g = 112;
-unsigned char b = 255;
-int col, row;
-#endif
-
-
-enum layers{
-    BASE = 0,
-    COMMAND
-};
-
-#define KC_COMMAND_NUM    LT(COMMAND,KC_F13)
-#define KC_COMMAND_KANA   LT(COMMAND,KC_F14)
-#define KC_COMMAND        LT(COMMAND,KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BASE] = LAYOUT_all(
-        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_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_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_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_LALT, KC_LGUI, KC_COMMAND_NUM, KC_SPC, KC_SPC, KC_SPC, KC_COMMAND_KANA, KC_RALT, MO(COMMAND),KC_RCTL),
-    [COMMAND] = 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_BSPC,
-        KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_LCTL, KC_NO,  KC_NO, _______, KC_NO, RGB_MOD, KC_NO,  _______, KC_NO,  _______, KC_NO),
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#ifdef USE_LED_RIPPLE_EFFECT
-    col = record->event.key.col;
-    row = record->event.key.row;
-    if (record->event.pressed) {
-      int end = keybuf_end;
-      keybufs[end].col = col;
-      keybufs[end].row = row;
-      keybufs[end].frame = 0;
-      keybuf_end ++;
-    }
-#endif
-  return true;
-}
-
-void keyboard_post_init_user(void) {
-#ifdef USE_LED_RIPPLE_EFFECT
-    rgblight_enable_noeeprom();
-    rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-#endif
-}
-
-#ifdef USE_LED_RIPPLE_EFFECT
-int scan_count = -10;
-int keys[] = { 14, 14, 13, 12, 11 };
-int keys_sum[] = { 0, 14, 28, 41, 53 };
-unsigned char rgb[14][5][3];
-int row_max = 12;
-int ToIndex(char _col, char _row) {
-    return (_col * row_max) + _row;
-}
-
-void led_ripple_effect(void){
-    if (scan_count == -1) {
-      rgblight_enable_noeeprom();
-      rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-    } else if (scan_count >= 0 && scan_count < 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        // FIXME:
-
-        int index = ToIndex(keybufs[i].col,keybufs[i].row);
-        int coll = 0;
-        for(int s = 4; s >= 0; --s){
-            if( index >= keys_sum[s]){
-                coll = s;
-                break;
-            }
-        }
-        int roww = MAX(0,index - keys_sum[coll]);
-
-        int y = scan_count;
-        int dist_y = abs(y - coll);
-        for (int x=0; x<keys[y]; x++) {
-          int dist = abs(x - roww) + dist_y;
-          if (dist <= keybufs[i].frame) {
-            int elevation = MAX(0, (8 + dist - keybufs[i].frame)) << 2;
-            if (elevation) {
-              if ((rgb[x][y][0] != 255) && r) { rgb[x][y][0] = MIN(255, elevation + rgb[x][y][0]); }
-              if ((rgb[x][y][1] != 255) && g) { rgb[x][y][1] = MIN(255, elevation + rgb[x][y][1]); }
-              if ((rgb[x][y][2] != 255) && b) { rgb[x][y][2] = MIN(255, elevation + rgb[x][y][2]); }
-            }
-          }
-        }
-      }
-    } else if (scan_count == 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        if (keybufs[i].frame < 64) {
-          keybufs[i].frame ++;
-        } else {
-          keybuf_begin ++;
-        }
-      }
-    } else if (scan_count >= 6 && scan_count <= 10) {
-      int y = scan_count - 6;
-      for (int x=0; x<keys[y]; x++) {
-        int at = keys_sum[y] + x;
-        led[at].r = rgb[x][y][0];
-        led[at].g = rgb[x][y][1];
-        led[at].b = rgb[x][y][2];
-      }
-      rgblight_set();
-    } else if (scan_count == 11) {
-      memset(rgb, 0, sizeof(rgb));
-    }
-    scan_count++;
-    if (scan_count >= 12) { scan_count = 0; }
-}
-
-#endif
-
-void matrix_scan_user(void) {
-#ifdef USE_LED_RIPPLE_EFFECT
-#ifdef RANDOM_RIPPLE_EFFECT
-    static int timer = 0;
-    static int timeout = 300;
-    timer++;
-    if(timer > timeout){
-      int end = keybuf_end;
-      col = rand() % 6;
-      row = rand() % 12;
-      keybufs[end].col = col;
-      keybufs[end].row = row;
-      keybufs[end].frame = 0;
-      keybuf_end ++;
-      timer = rand() % timeout;
-    }
-#endif
-    led_ripple_effect();
-#endif
-}
-
-#ifdef OLED_ENABLE
-bool oled_task_user(void) {
-  oled_write_P(PSTR("Layer: "), false);
-  switch (get_highest_layer(layer_state)) {
-    case BASE:
-      oled_write_P(PSTR("Default\n"), false);
-      break;
-    case COMMAND:
-      oled_write_P(PSTR("COMMAND\n"), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding 'n' to the end of your string
-      oled_write_ln_P(PSTR("Undefined"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR("       "), false);
-  oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false);
-  oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-    return false;
-}
-#endif
diff --git a/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/readme.md b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/readme.md
deleted file mode 100644
index ca7d7961fc6..00000000000
--- a/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The kakunpc keymap for angel64
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
deleted file mode 100644
index 6c0f83240d8..00000000000
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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
-{
-  BASE = 0,
-  COMMAND
-};
-
-#define KC_COMMAND LT(COMMAND, KC_F13)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BASE] = 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_PSCR,KC_SCRL,KC_PAUSE,
-
-        KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NUM,  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_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
-        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_P4,   KC_P5,   KC_P6,   KC_NO,
-        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_P1,   KC_P2,   KC_P3, KC_PENT,
-        KC_LCTL,KC_LGUI,KC_LALT,KC_COMMAND,KC_SPC,KC_SPC,KC_SPC,KC_F14,KC_RALT,KC_NO,KC_NO,KC_COMMAND,   KC_LEFT,KC_DOWN,KC_RIGHT,           KC_P0,   KC_NO, KC_PDOT,   KC_NO ),
-    [COMMAND] = LAYOUT_all( /* COMMAND */
-        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_SCRL,KC_PAUSE,
-
-        KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,         KC_NUM,  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_BSLS,       KC_DEL,  KC_END, KC_PGDN,           KC_P7,   KC_P8,   KC_P9, KC_PPLS,
-        KC_LCAP, 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_P4,   KC_P5,   KC_P6,   KC_NO,
-        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_P1,   KC_P2,   KC_P3, KC_PENT,
-        KC_LCTL,KC_LGUI,KC_LALT,_______,KC_SPC,KC_SPC,KC_SPC,KC_F14,KC_RALT,KC_NO,KC_NO,_______,   KC_LEFT,KC_DOWN,KC_RIGHT,           KC_P0,   KC_NO, KC_PDOT,   KC_NO ),
-};
diff --git a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/readme.md b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/readme.md
deleted file mode 100644
index 66eab07b94f..00000000000
--- a/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The kakunpc keymap for thedogkeyboard
diff --git a/keyboards/kalakos/bahrnob/info.json b/keyboards/kalakos/bahrnob/info.json
index 6905ceb38da..2e127e555a0 100644
--- a/keyboards/kalakos/bahrnob/info.json
+++ b/keyboards/kalakos/bahrnob/info.json
@@ -28,8 +28,11 @@
         "rows": ["D7", "B4", "B5", "B6", "C6"],
         "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5"]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -47,7 +50,7 @@
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [1, 14], "x": 14, "y": 0},
 
-                {"matrix": [0, 14], "x": 15.75, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
@@ -108,6 +111,1938 @@
                 {"matrix": [4, 11], "x": 11, "y": 4},
                 {"matrix": [4, 12], "x": 12, "y": 4},
 
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_lwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_lwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_rwkl_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_rwkl_split_space_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_split_space_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_lwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_lwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_rwkl_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_rwkl_split_space_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
+                {"matrix": [3, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_split_space_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0, "encoder": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+
                 {"matrix": [3, 13], "x": 13.25, "y": 4.25},
                 {"matrix": [4, 13], "x": 14.25, "y": 4.25},
                 {"matrix": [4, 14], "x": 15.25, "y": 4.25}
diff --git a/keyboards/kalakos/bahrnob/keymaps/default/keymap.c b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c
index 08ed92c0a82..7866b4dfd30 100644
--- a/keyboards/kalakos/bahrnob/keymaps/default/keymap.c
+++ b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[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_DEL,  KC_MUTE,
 		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_END,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           MO(1),   KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
 	),
 
-	[1] = LAYOUT(
+	[1] = LAYOUT_all(
 		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  	       KC_TRNS,
 		KC_TRNS, KC_TRNS, 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/kalakos/bahrnob/keymaps/via/keymap.c b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c
index 77f5db6e23a..e71375f9f11 100644
--- a/keyboards/kalakos/bahrnob/keymaps/via/keymap.c
+++ b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[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_DEL,  KC_MUTE,
 		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_END,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           MO(1),   KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
 	),
 
-	[1] = LAYOUT(
+	[1] = LAYOUT_all(
 		QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  	       KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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(
+	[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,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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] = 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,
diff --git a/keyboards/kalakos/bahrnob/matrix_diagram.md b/keyboards/kalakos/bahrnob/matrix_diagram.md
index 30e120b75b3..316f2ad9d80 100644
--- a/keyboards/kalakos/bahrnob/matrix_diagram.md
+++ b/keyboards/kalakos/bahrnob/matrix_diagram.md
@@ -1,17 +1,16 @@
 # Matrix Diagram for Kalakos Bahrnob65
 
-
 ```
                                                     ┌───────┐
                                        2u Backspace │0D     │
                                                     └───────┘
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐  ┌───┐
-│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1E │  │0E │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤  └───┘      ┌─────┐
-│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │ ┌───┐       │     │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ │2E │    ┌──┴┐1D  │ ISO Enter
-│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │ ├───┤    │2C │    │
-├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ │3E │    └───┴────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1E │ │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └───┘      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │ ┌───┐      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ │2E │   ┌──┴┐1D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │ ├───┤   │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ │3E │   └───┴────┘
 │30  │44 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C    │┌───┐└───┘
 ├────┼───┴┬──┴─┬─┴───┴───┴─┬─┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│2D │
 │40  │41  │42  │43         │46          │4A │4B │4C │┌───┼───┼───┐
diff --git a/keyboards/kapcave/arya/config.h b/keyboards/kapcave/arya/config.h
index 94220763159..6cd36572279 100644
--- a/keyboards/kapcave/arya/config.h
+++ b/keyboards/kapcave/arya/config.h
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h
index 64135cabcdc..40a7c6ec47e 100644
--- a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h
+++ b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
+#define RGBLIGHT_LED_COUNT 14
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c b/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
deleted file mode 100755
index 9b17187d05c..00000000000
--- a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* QWERTY */
-	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_GRV, KC_BSLS,
-		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_BSPC,
-		MO(3), 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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(3),
-		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LCTL), 
-
-    /* DVORAK */
-	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_LBRC, KC_RBRC, KC_GRV, KC_BSLS, 
-		KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC,  
-		MO(3), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT,
-		KC_LSFT, KC_NUBS, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LSFT, MO(3),
-		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL), 
-
-    /* COLEMAK */
-	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_GRV, KC_BSLS,
-		KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,
-		MO(3), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, 
-		KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(3),
-		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL), 
-
-    /* FUNCTION */
-	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_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSPC,
-		KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_TOG)
-
-};
diff --git a/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c b/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
deleted file mode 100644
index 26168f7d2b9..00000000000
--- a/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-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] = {
-
-    /* DEFAULT */
-	LAYOUT_numpad_aek(
-		MO(1), KC_PEQL, KC_PSLS, KC_PAST,
-		KC_P7, KC_P8, KC_P9, KC_PMNS, 
-		KC_P4, KC_P5, KC_P6, KC_PPLS,
-		KC_P1, KC_P2, KC_P3,
-		       KC_P0, KC_PDOT, KC_PENT), 
-
-    /* FUNCTION */
-	LAYOUT_numpad_aek(
-		KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS,
-        RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,
-        RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,
-		         KC_TRNS, QK_BOOT, KC_NUM)
-};
-
diff --git a/keyboards/kapcave/paladinpad/keymaps/aek/readme.md b/keyboards/kapcave/paladinpad/keymaps/aek/readme.md
deleted file mode 100644
index 44b106fa6bc..00000000000
--- a/keyboards/kapcave/paladinpad/keymaps/aek/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-The keymap for PaladinPad which resembles the AEK Numpad
\ No newline at end of file
diff --git a/keyboards/kapl/keymaps/default/config.h b/keyboards/kapl/keymaps/default/config.h
deleted file mode 100644
index cc82705192a..00000000000
--- a/keyboards/kapl/keymaps/default/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2022 Alexander Lozyuk (@keyzog)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
diff --git a/keyboards/kapl/keymaps/via/config.h b/keyboards/kapl/keymaps/via/config.h
deleted file mode 100644
index cc82705192a..00000000000
--- a/keyboards/kapl/keymaps/via/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2022 Alexander Lozyuk (@keyzog)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
index db7eaaee49b..8b9c2f14ee8 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -5,37 +5,6 @@
 /* Select hand configuration */
 #define MASTER_LEFT
 
-#define RGB_MATRIX_LED_COUNT 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.
-
-#ifdef RGB_MATRIX_ENABLE
-// 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
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index b649c055ac6..0d95b99e294 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -12,8 +12,32 @@
     "pin": "D4"
   },
   "rgb_matrix": {
+    "animations":{
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_spiral_sat": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "cycle_out_in": true,
+      "cycle_spiral": true,
+      "hue_breathing": true,
+      "hue_wave": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_multinexus": true,
+      "multisplash": true,
+      "solid_multisplash": true
+    },
     "driver": "ws2812",
-    "speed_steps": 10
+    "max_brightness": 120,
+    "speed_steps": 10,
+    "split_count": [44, 44]
   },
   "rgblight": {
     "saturation_steps": 16,
diff --git a/keyboards/karn/info.json b/keyboards/karn/info.json
index c15801da35d..b088f61425d 100644
--- a/keyboards/karn/info.json
+++ b/keyboards/karn/info.json
@@ -23,52 +23,54 @@
     "split": {
         "enabled": true
     },
-    "community_layouts": ["split_3x6_3"],
     "layouts": {
-        "LAYOUT_split_3x6_3": {
+        "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
                 {"matrix": [0, 2], "x": 2, "y": 0},
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [4, 0], "x": 8, "y": 0},
-                {"matrix": [4, 1], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 3], "x": 11, "y": 0},
-                {"matrix": [4, 4], "x": 12, "y": 0},
-                {"matrix": [4, 5], "x": 13, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [4, 0], "x": 9, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 0.75, "h": 1.5},
                 {"matrix": [1, 1], "x": 1, "y": 1},
                 {"matrix": [1, 2], "x": 2, "y": 1},
                 {"matrix": [1, 3], "x": 3, "y": 1},
                 {"matrix": [1, 4], "x": 4, "y": 1},
                 {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [5, 0], "x": 8, "y": 1},
-                {"matrix": [5, 1], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 3], "x": 11, "y": 1},
-                {"matrix": [5, 4], "x": 12, "y": 1},
-                {"matrix": [5, 5], "x": 13, "y": 1},
-                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 4], "x": 13, "y": 1},
+                {"matrix": [5, 5], "x": 14, "y": 0.75, "h": 1.5},
+
                 {"matrix": [2, 1], "x": 1, "y": 2},
                 {"matrix": [2, 2], "x": 2, "y": 2},
                 {"matrix": [2, 3], "x": 3, "y": 2},
                 {"matrix": [2, 4], "x": 4, "y": 2},
                 {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [6, 0], "x": 8, "y": 2},
-                {"matrix": [6, 1], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 3], "x": 11, "y": 2},
-                {"matrix": [6, 4], "x": 12, "y": 2},
-                {"matrix": [6, 5], "x": 13, "y": 2},
-                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
-                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
-                {"matrix": [3, 2], "x": 5.5, "y": 3.75},
-                {"matrix": [7, 0], "x": 7.5, "y": 3.75},
-                {"matrix": [7, 1], "x": 8.5, "y": 3.5},
-                {"matrix": [7, 2], "x": 9.5, "y": 3.25}
+
+                {"matrix": [6, 0], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 4], "x": 13, "y": 2},
+
+                {"matrix": [3, 0], "x": 4, "y": 3, "h": 1.5},
+                {"matrix": [3, 1], "x": 5, "y": 3.25, "h": 1.5},
+                {"matrix": [3, 2], "x": 6, "y": 3.5, "h": 1.5},
+
+                {"matrix": [7, 0], "x": 8, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 1], "x": 9, "y": 3.25, "h": 1.5},
+                {"matrix": [7, 2], "x": 10, "y": 3, "h": 1.5}
             ]
         }
     }
diff --git a/keyboards/karn/keymaps/colemak/keymap.c b/keyboards/karn/keymaps/colemak/keymap.c
index 585798e8a1d..13f23170e1e 100644
--- a/keyboards/karn/keymaps/colemak/keymap.c
+++ b/keyboards/karn/keymaps/colemak/keymap.c
@@ -31,34 +31,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
     // default (colemak)
-    [0] = LAYOUT_split_3x6_3(
-        KC_NO,         KC_Q,       KC_W,       KC_F,       KC_P,       KC_G,                        KC_J,  KC_L,       KC_U,          KC_Y,         KC_SCLN,        KC_NO,
+    [0] = LAYOUT(
+                       KC_Q,       KC_W,       KC_F,       KC_P,       KC_G,                        KC_J,  KC_L,       KC_U,          KC_Y,         KC_SCLN,
         HYPR_T(KC_TAB),KC_A,       KC_R,       KC_S,       KC_T,       KC_D,                        KC_H,  KC_N,       KC_E,          KC_I,         KC_O,           HYPR_T(KC_ENT),
-        KC_NO,         SFT_T(KC_Z),CTL_T(KC_X),ALT_T(KC_C),CMD_T(KC_V),KC_B,                        KC_K,  CMD_T(KC_M),ALT_T(KC_COMM),CTL_T(KC_DOT),RSFT_T(KC_SLSH),KC_NO,
+                       SFT_T(KC_Z),CTL_T(KC_X),ALT_T(KC_C),CMD_T(KC_V),KC_B,                        KC_K,  CMD_T(KC_M),ALT_T(KC_COMM),CTL_T(KC_DOT),RSFT_T(KC_SLSH),
                                                            MO(1),      SFT_T(KC_ESC),MO(3), KC_BSPC,KC_SPC,MO(2)
     ),
 
     // symbols
-    [1] = LAYOUT_split_3x6_3(
-        _______, KC_BSLS, KC_GRV,  KC_QUOT, KC_DQT,  KC_LCBR,                    KC_RCBR, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+    [1] = LAYOUT(
+                 KC_BSLS, KC_GRV,  KC_QUOT, KC_DQT,  KC_LCBR,                    KC_RCBR, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
         _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______,
                                             _______, _______, _______,  KC_DEL,  _______, _______
     ),
 
     // nav
-    [2] = LAYOUT_split_3x6_3(
-        _______, _______, KC_Q,      _______,   _______,   KC_VOLU,                    _______, _______, _______, KC_SCLN, _______, _______,
+    [2] = LAYOUT(
+                 _______, KC_Q,      _______,   _______,   KC_VOLU,                    _______, _______, _______, KC_SCLN, _______,
         _______, C(KC_UP),C(KC_DOWN),G(KC_GRV), G(KC_TAB), KC_VOLD,                    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_CAPS, _______,
-        _______, _______, _______,   _______,   _______,   KC_MUTE,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______,   _______,   _______,   KC_MUTE,                    _______, _______, _______, _______, _______,
                                                 _______,   _______, _______,  _______, _______, _______
     ),
 
     // numbers
-    [3] = LAYOUT_split_3x6_3(
-        _______, TD(TD_F1_F11), TD(TD_F2_F12), KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+    [3] = LAYOUT(
+                 TD(TD_F1_F11), TD(TD_F2_F12), KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
         _______, KC_1,          KC_2,          KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        _______, _______,       _______,       _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+                 _______,       _______,       _______, _______, _______,                    _______, _______, _______, _______, _______,
                                                         _______, _______, _______,  _______, _______, _______
     )
 };
diff --git a/keyboards/karn/keymaps/default/keymap.c b/keyboards/karn/keymaps/default/keymap.c
index 5f679552d97..b39fe99d5df 100644
--- a/keyboards/karn/keymaps/default/keymap.c
+++ b/keyboards/karn/keymaps/default/keymap.c
@@ -7,34 +7,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
     // default (qwerty)
-    [0] = LAYOUT_split_3x6_3(
-        KC_NO,         KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,                        KC_Y,  KC_U,       KC_I,          KC_O,         KC_P,           KC_NO,
-        HYPR_T(KC_TAB),KC_A,       KC_S,       KC_D,       KC_F,       KC_G,                        KC_H,  KC_J,       KC_K,          KC_L,         KC_SCLN,           HYPR_T(KC_ENT),
-        KC_NO,         SFT_T(KC_Z),CTL_T(KC_X),ALT_T(KC_C),CMD_T(KC_V),KC_B,                        KC_N,  CMD_T(KC_M),ALT_T(KC_COMM),CTL_T(KC_DOT),RSFT_T(KC_SLSH),KC_NO,
+    [0] = LAYOUT(
+                       KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,                        KC_Y,  KC_U,       KC_I,          KC_O,         KC_P,
+        HYPR_T(KC_TAB),KC_A,       KC_S,       KC_D,       KC_F,       KC_G,                        KC_H,  KC_J,       KC_K,          KC_L,         KC_SCLN,         HYPR_T(KC_ENT),
+                       SFT_T(KC_Z),CTL_T(KC_X),ALT_T(KC_C),CMD_T(KC_V),KC_B,                        KC_N,  CMD_T(KC_M),ALT_T(KC_COMM),CTL_T(KC_DOT),RSFT_T(KC_SLSH),
                                                            MO(1),      SFT_T(KC_ESC),MO(3), KC_BSPC,KC_SPC,MO(2)
     ),
 
     // symbols
-    [1] = LAYOUT_split_3x6_3(
-        _______, KC_BSLS, KC_GRV,  KC_QUOT, KC_DQT,  KC_LCBR,                    KC_RCBR, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+    [1] = LAYOUT(
+                 KC_BSLS, KC_GRV,  KC_QUOT, KC_DQT,  KC_LCBR,                    KC_RCBR, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
         _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______,
                                             _______, _______, _______,  KC_DEL,  _______, _______
     ),
 
     // nav
-    [2] = LAYOUT_split_3x6_3(
-        _______, _______, _______,   _______,   _______,   KC_VOLU,                    _______, _______, _______, _______, _______, _______,
+    [2] = LAYOUT(
+                 _______, _______,   _______,   _______,   KC_VOLU,                    _______, _______, _______, _______, _______,
         _______, C(KC_UP),C(KC_DOWN),G(KC_GRV), G(KC_TAB), KC_VOLD,                    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_CAPS, _______,
-        _______, _______, _______,   _______,   _______,   KC_MUTE,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______,   _______,   _______,   KC_MUTE,                    _______, _______, _______, _______, _______,
                                                 _______,   _______, _______,  _______, _______, _______
     ),
 
     // numbers
-    [3] = LAYOUT_split_3x6_3(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+    [3] = LAYOUT(
+                 KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
         _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______,
                                             _______, _______, _______,  _______, _______, _______
     )
 };
diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h
index 92630de5b47..085db9791c7 100644
--- a/keyboards/kb_elmo/aek2_usb/config.h
+++ b/keyboards/kb_elmo/aek2_usb/config.h
@@ -22,6 +22,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* reduce EEPROM usage */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
 #define LAYER_STATE_8BIT
diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json
index 693f452f20b..884390278d1 100644
--- a/keyboards/kb_elmo/aek2_usb/info.json
+++ b/keyboards/kb_elmo/aek2_usb/info.json
@@ -13,6 +13,9 @@
         "rows": ["D5", "C1", "C4", "D0", "C3", "C2", "B3", "B4"]
     },
     "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "indicators": {
         "caps_lock": "B1",
         "num_lock": "B2",
@@ -131,22 +134,22 @@
                 {"matrix": [7, 11], "x": 19, "y": 5},
                 {"matrix": [6, 10], "x": 20, "y": 5},
                 {"matrix": [6, 9], "x": 21, "y": 5},
-                {"matrix": [5, 0], "x": 22, "y": 5, "h": 2},
-
-                {"matrix": [5, 1], "x": 0, "y": 6, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.5, "y": 6, "w": 1.25},
-                {"matrix": [5, 5], "x": 2.75, "y": 6, "w": 1.5},
-                {"matrix": [5, 10], "x": 4.25, "y": 6, "w": 6.5},
-                {"matrix": [5, 11], "x": 10.75, "y": 6, "w": 1.5},
-                {"matrix": [5, 13], "x": 12.25, "y": 6, "w": 1.25},
-                {"matrix": [5, 7], "x": 13.5, "y": 6, "w": 1.5},
-
-                {"matrix": [5, 9], "x": 15.5, "y": 6},
-                {"matrix": [5, 6], "x": 16.5, "y": 6},
-                {"matrix": [7, 10], "x": 17.5, "y": 6},
-
-                {"matrix": [7, 9], "x": 19, "y": 6, "w": 2},
-                {"matrix": [7, 8], "x": 21, "y": 6}
+
+                {"matrix": [5, 0], "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 6, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.75, "y": 6, "w": 1.5},
+                {"matrix": [5, 5], "x": 4.25, "y": 6, "w": 6.5},
+                {"matrix": [5, 10], "x": 10.75, "y": 6, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.25, "y": 6, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.5, "y": 6},
+                {"matrix": [5, 9], "x": 16.5, "y": 6},
+                {"matrix": [5, 6], "x": 17.5, "y": 6},
+
+                {"matrix": [7, 10], "x": 19, "y": 6, "w": 2},
+                {"matrix": [7, 9], "x": 21, "y": 6},
+                {"matrix": [7, 8], "x": 22, "y": 5, "h": 2}
             ]
         }
     }
diff --git a/keyboards/kb_elmo/bm42/info.json b/keyboards/kb_elmo/bm42/info.json
new file mode 100644
index 00000000000..a06019ca0bc
--- /dev/null
+++ b/keyboards/kb_elmo/bm42/info.json
@@ -0,0 +1,72 @@
+{
+    "manufacturer": "kb_elmo",
+    "keyboard_name": "BM42",
+    "url": "https://github.com/kb-elmo/bm42",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xDC9B",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": ["C5", "D1", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D4"],
+        "rows": ["D2", "D3", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [3, 10], "x": 11, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [3, 9], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/bm42/keymaps/default/keymap.c b/keyboards/kb_elmo/bm42/keymaps/default/keymap.c
new file mode 100644
index 00000000000..77dac80a1e1
--- /dev/null
+++ b/keyboards/kb_elmo/bm42/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2022 kb-elmo<mail@elmo.space> (@kb-elmo)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_BSPC,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             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_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    MO(1),            KC_RALT, KC_RGUI, MO(2)
+    ),
+    [1] = LAYOUT(
+        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_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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,    
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_PSCR,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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
+    ),
+};
diff --git a/keyboards/kb_elmo/bm42/keymaps/via/keymap.c b/keyboards/kb_elmo/bm42/keymaps/via/keymap.c
new file mode 100644
index 00000000000..77dac80a1e1
--- /dev/null
+++ b/keyboards/kb_elmo/bm42/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2022 kb-elmo<mail@elmo.space> (@kb-elmo)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_BSPC,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             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_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    MO(1),            KC_RALT, KC_RGUI, MO(2)
+    ),
+    [1] = LAYOUT(
+        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_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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,    
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_PSCR,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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
+    ),
+};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/rules.mk b/keyboards/kb_elmo/bm42/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/rules.mk
rename to keyboards/kb_elmo/bm42/keymaps/via/rules.mk
diff --git a/keyboards/kb_elmo/bm42/readme.md b/keyboards/kb_elmo/bm42/readme.md
new file mode 100644
index 00000000000..422d6080c5d
--- /dev/null
+++ b/keyboards/kb_elmo/bm42/readme.md
@@ -0,0 +1,28 @@
+# BM42
+
+![BM42](https://i.imgur.com/DljDoaTh.jpeg)
+
+A simple drop-in replacement PCB for the KPRepublic BM43 keyboard.
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: BM42 rev.1 PCB
+* Hardware Availability: [Open source project](https://github.com/kb-elmo/bm42)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kb_elmo/bm42:default
+
+Flashing example for this keyboard:
+
+    make kb_elmo/bm42: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 top left key and plug in the keyboard
+* **Physical reset**: Briefly short the two contacts labeled "RESET" on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kb_elmo/bm42/rules.mk b/keyboards/kb_elmo/bm42/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kb_elmo/bm42/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kb_elmo/dizzy40/info.json b/keyboards/kb_elmo/dizzy40/info.json
new file mode 100644
index 00000000000..0bac157c443
--- /dev/null
+++ b/keyboards/kb_elmo/dizzy40/info.json
@@ -0,0 +1,91 @@
+{
+    "manufacturer": "kb_elmo",
+    "keyboard_name": "Dizzy40",
+    "url": "https://github.com/kb-elmo/dizzy40",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x7BB2",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": ["C6", "C7", "B7", "B6", "B5", "D2", "B1", "B0", "D3", "D4", "D5"],
+        "rows": ["C4", "C5", "C2", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "nkro": false
+    },
+    "rgblight": {
+        "led_count": 8,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B4"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [3, 10], "x": 11, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [3, 9], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/dizzy40/keymaps/default/keymap.c b/keyboards/kb_elmo/dizzy40/keymaps/default/keymap.c
new file mode 100644
index 00000000000..77dac80a1e1
--- /dev/null
+++ b/keyboards/kb_elmo/dizzy40/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2022 kb-elmo<mail@elmo.space> (@kb-elmo)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_BSPC,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             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_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    MO(1),            KC_RALT, KC_RGUI, MO(2)
+    ),
+    [1] = LAYOUT(
+        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_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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,    
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_PSCR,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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
+    ),
+};
diff --git a/keyboards/kb_elmo/dizzy40/keymaps/via/keymap.c b/keyboards/kb_elmo/dizzy40/keymaps/via/keymap.c
new file mode 100644
index 00000000000..77dac80a1e1
--- /dev/null
+++ b/keyboards/kb_elmo/dizzy40/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2022 kb-elmo<mail@elmo.space> (@kb-elmo)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_BSPC,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             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_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    MO(1),            KC_RALT, KC_RGUI, MO(2)
+    ),
+    [1] = LAYOUT(
+        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_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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,    
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_PSCR,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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
+    ),
+};
diff --git a/keyboards/kira80/keymaps/via/rules.mk b/keyboards/kb_elmo/dizzy40/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kira80/keymaps/via/rules.mk
rename to keyboards/kb_elmo/dizzy40/keymaps/via/rules.mk
diff --git a/keyboards/kb_elmo/dizzy40/readme.md b/keyboards/kb_elmo/dizzy40/readme.md
new file mode 100644
index 00000000000..0fb02c36ae7
--- /dev/null
+++ b/keyboards/kb_elmo/dizzy40/readme.md
@@ -0,0 +1,28 @@
+# Dizzy40
+
+![Dizzy40](https://i.imgur.com/TNXHaUGh.jpeg)
+
+A simple drop-in replacement PCB for the KPRepublic Daisy40 keyboard.
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: Dizzy40 rev.1 PCB
+* Hardware Availability: [Open source project](https://github.com/kb-elmo/dizzy40)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kb_elmo/dizzy40:default
+
+Flashing example for this keyboard:
+
+    make kb_elmo/dizzy40: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 top left key and plug in the keyboard
+* **Physical reset**: Briefly short the two contacts labeled "RESET" on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kb_elmo/dizzy40/rules.mk b/keyboards/kb_elmo/dizzy40/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kb_elmo/dizzy40/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kb_elmo/eliza/info.json b/keyboards/kb_elmo/eliza/info.json
new file mode 100644
index 00000000000..37c12b5ca97
--- /dev/null
+++ b/keyboards/kb_elmo/eliza/info.json
@@ -0,0 +1,71 @@
+{
+    "manufacturer": "kb_elmo",
+    "keyboard_name": "Eliza",
+    "url": "https://github.com/kb-elmo/eliza",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xC762",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": ["C7", "B7", "B6", "B5", "B4", "B3", "D1", "B1", "B0", "D6", "D5", "D4"],
+        "rows": ["D0", "D2", "B2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.35, "y": 0},
+                {"matrix": [0, 1], "x": 1.35, "y": 0},
+                {"matrix": [0, 2], "x": 2.65, "y": 0},
+                {"matrix": [0, 3], "x": 3.65, "y": 0},
+                {"matrix": [0, 4], "x": 4.65, "y": 0},
+                {"matrix": [0, 5], "x": 5.65, "y": 0},
+                {"matrix": [0, 6], "x": 7.9, "y": 0},
+                {"matrix": [0, 7], "x": 8.9, "y": 0},
+                {"matrix": [0, 8], "x": 9.9, "y": 0},
+                {"matrix": [0, 9], "x": 10.9, "y": 0},
+                {"matrix": [0, 10], "x": 12.2, "y": 0},
+                {"matrix": [0, 11], "x": 13.2, "y": 0},
+                {"matrix": [1, 0], "x": 0.2, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.45, "y": 1},
+                {"matrix": [1, 2], "x": 2.9, "y": 1},
+                {"matrix": [1, 3], "x": 3.9, "y": 1},
+                {"matrix": [1, 4], "x": 4.9, "y": 1},
+                {"matrix": [1, 5], "x": 5.9, "y": 1},
+                {"matrix": [1, 6], "x": 8.15, "y": 1},
+                {"matrix": [1, 7], "x": 9.15, "y": 1},
+                {"matrix": [1, 8], "x": 10.15, "y": 1},
+                {"matrix": [1, 9], "x": 11.15, "y": 1},
+                {"matrix": [1, 11], "x": 12.6, "y": 1, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 3.4, "y": 2},
+                {"matrix": [2, 3], "x": 4.4, "y": 2},
+                {"matrix": [2, 4], "x": 5.4, "y": 2},
+                {"matrix": [2, 5], "x": 6.4, "y": 2},
+                {"matrix": [2, 6], "x": 7.65, "y": 2},
+                {"matrix": [2, 7], "x": 8.65, "y": 2},
+                {"matrix": [2, 8], "x": 9.65, "y": 2},
+                {"matrix": [2, 9], "x": 10.65, "y": 2},
+                {"matrix": [2, 10], "x": 12.3, "y": 2},
+                {"matrix": [2, 11], "x": 13.3, "y": 2, "w": 1.25},
+                {"matrix": [3, 0], "x": 0.2, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "x": 3.15, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.4, "y": 3, "w": 2.75},
+                {"matrix": [3, 7], "x": 7.9, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 10.15, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 12.85, "y": 3, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/eliza/keymaps/default/keymap.c b/keyboards/kb_elmo/eliza/keymaps/default/keymap.c
new file mode 100644
index 00000000000..9a8b1e1965d
--- /dev/null
+++ b/keyboards/kb_elmo/eliza/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2022 kb-elmo<mail@elmo.space> (@kb-elmo)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_BSPC,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             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_LCTL,          KC_LALT,          KC_SPC,                    MO(1),            KC_RALT,          MO(2)
+    ),
+    [1] = LAYOUT(
+        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_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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,    
+        KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_PSCR,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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
+    ),
+};
diff --git a/keyboards/kb_elmo/eliza/keymaps/via/keymap.c b/keyboards/kb_elmo/eliza/keymaps/via/keymap.c
new file mode 100644
index 00000000000..9a8b1e1965d
--- /dev/null
+++ b/keyboards/kb_elmo/eliza/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2022 kb-elmo<mail@elmo.space> (@kb-elmo)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_BSPC,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             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_LCTL,          KC_LALT,          KC_SPC,                    MO(1),            KC_RALT,          MO(2)
+    ),
+    [1] = LAYOUT(
+        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_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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,    
+        KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_GRV,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_PSCR,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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
+    ),
+};
diff --git a/keyboards/kmac/keymaps/via/rules.mk b/keyboards/kb_elmo/eliza/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kmac/keymaps/via/rules.mk
rename to keyboards/kb_elmo/eliza/keymaps/via/rules.mk
diff --git a/keyboards/kb_elmo/eliza/readme.md b/keyboards/kb_elmo/eliza/readme.md
new file mode 100644
index 00000000000..fd8b9e74e52
--- /dev/null
+++ b/keyboards/kb_elmo/eliza/readme.md
@@ -0,0 +1,28 @@
+# Eliza
+
+![Eliza](https://i.imgur.com/OGpPhReh.jpeg)
+
+40% alice-style ergo keyboard with a seamless 3D printed gasket-mount case.
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: Eliza rev.1 PCB
+* Hardware Availability: [Open source project](https://github.com/kb-elmo/eliza)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kb_elmo/eliza:default
+
+Flashing example for this keyboard:
+
+    make kb_elmo/eliza: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 top left key and plug in the keyboard
+* **Physical reset**: Briefly short the two contacts labeled "RESET" on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kb_elmo/eliza/rules.mk b/keyboards/kb_elmo/eliza/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kb_elmo/eliza/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kb_elmo/gamehand/info.json b/keyboards/kb_elmo/gamehand/info.json
new file mode 100644
index 00000000000..39795bf2502
--- /dev/null
+++ b/keyboards/kb_elmo/gamehand/info.json
@@ -0,0 +1,61 @@
+{
+    "manufacturer": "kb-elmo",
+    "keyboard_name": "GameHand",
+    "url": "https://github.com/kb-elmo/gamehand",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x4D90",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "B7", "C7", "C6"],
+        "rows": ["D6", "D5", "D4", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+    },
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb_elmo/gamehand/keymaps/default/keymap.c b/keyboards/kb_elmo/gamehand/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d22614cb0b2
--- /dev/null
+++ b/keyboards/kb_elmo/gamehand/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 kb-elmo<mail@elmo.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 QMK_KEYBOARD_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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,
+        KC_LCTL, KC_M,    KC_H,                      KC_SPC
+    ),
+    [1] = LAYOUT(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+        KC_TRNS, KC_TRNS, KC_UP,   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_ENT
+    )
+};
diff --git a/keyboards/kb_elmo/gamehand/keymaps/via/keymap.c b/keyboards/kb_elmo/gamehand/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d9e5dc747c6
--- /dev/null
+++ b/keyboards/kb_elmo/gamehand/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 kb-elmo<mail@elmo.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 QMK_KEYBOARD_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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,
+        KC_LCTL, KC_M,    KC_H,                      KC_SPC
+    ),
+    [1] = LAYOUT(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+        KC_TRNS, KC_TRNS, KC_UP,   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_ENT
+    ),
+};
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/rules.mk b/keyboards/kb_elmo/gamehand/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm80v2/keymaps/saph1s/rules.mk
rename to keyboards/kb_elmo/gamehand/keymaps/via/rules.mk
diff --git a/keyboards/kb_elmo/gamehand/readme.md b/keyboards/kb_elmo/gamehand/readme.md
new file mode 100644
index 00000000000..a78e1ee205c
--- /dev/null
+++ b/keyboards/kb_elmo/gamehand/readme.md
@@ -0,0 +1,28 @@
+# GameHand
+
+![gamehand](https://i.imgur.com/ia3bcUBh.jpg)
+
+A left-hand gaming keypad with a 3D printed case
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: GameHand rev.1 PCB
+* Hardware Availability: [OpenSource Project](https://github.com/kb-elmo/GameHand)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kb_elmo/gamehand:default
+
+Flashing example for this keyboard:
+
+    make kb_elmo/gamehand: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 top left key and plug in the keyboard
+* **Physical reset**: Briefly short the two contacts labeled "RESET" on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kb_elmo/gamehand/rules.mk b/keyboards/kb_elmo/gamehand/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kb_elmo/gamehand/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kbdcraft/adam64/adam64.c b/keyboards/kbdcraft/adam64/adam64.c
index b0712aec392..db32d2856e1 100644
--- a/keyboards/kbdcraft/adam64/adam64.c
+++ b/keyboards/kbdcraft/adam64/adam64.c
@@ -19,80 +19,80 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |     G location
  *   |  |     |     B location
  *   |  |     |     | */
-    {0, CS14_SW1, CS13_SW1, CS15_SW1},
-    {0, CS14_SW2, CS13_SW2, CS15_SW2},
-    {0, CS14_SW3, CS13_SW3, CS15_SW3},
-    {0, CS14_SW4, CS13_SW4, CS15_SW4},
-    {0, CS14_SW5, CS13_SW5, CS15_SW5},
-    {0, CS14_SW6, CS13_SW6, CS15_SW6},
-    {0, CS14_SW7, CS13_SW7, CS15_SW7},
-    {0, CS32_SW1, CS31_SW1, CS33_SW1},
-    {0, CS32_SW2, CS31_SW2, CS33_SW2},
-    {0, CS32_SW3, CS31_SW3, CS33_SW3},
-    {0, CS32_SW4, CS31_SW4, CS33_SW4},
-    {0, CS32_SW5, CS31_SW5, CS33_SW5},
-    {0, CS32_SW6, CS31_SW6, CS33_SW6},
-    {0, CS32_SW7, CS31_SW7, CS33_SW7},
+    {0, SW1_CS14, SW1_CS13, SW1_CS15},
+    {0, SW2_CS14, SW2_CS13, SW2_CS15},
+    {0, SW3_CS14, SW3_CS13, SW3_CS15},
+    {0, SW4_CS14, SW4_CS13, SW4_CS15},
+    {0, SW5_CS14, SW5_CS13, SW5_CS15},
+    {0, SW6_CS14, SW6_CS13, SW6_CS15},
+    {0, SW7_CS14, SW7_CS13, SW7_CS15},
+    {0, SW1_CS32, SW1_CS31, SW1_CS33},
+    {0, SW2_CS32, SW2_CS31, SW2_CS33},
+    {0, SW3_CS32, SW3_CS31, SW3_CS33},
+    {0, SW4_CS32, SW4_CS31, SW4_CS33},
+    {0, SW5_CS32, SW5_CS31, SW5_CS33},
+    {0, SW6_CS32, SW6_CS31, SW6_CS33},
+    {0, SW7_CS32, SW7_CS31, SW7_CS33},
 
-    {0, CS23_SW1, CS24_SW1, CS22_SW1},
-    {0, CS23_SW2, CS24_SW2, CS22_SW2},
-    {0, CS23_SW3, CS24_SW3, CS22_SW3},
-    {0, CS23_SW4, CS24_SW4, CS22_SW4},
-    {0, CS23_SW5, CS24_SW5, CS22_SW5},
-    {0, CS23_SW6, CS24_SW6, CS22_SW6},
-    {0, CS23_SW7, CS24_SW7, CS22_SW7},
-    {0, CS35_SW1, CS34_SW1, CS36_SW1},
-    {0, CS35_SW2, CS34_SW2, CS36_SW2},
-    {0, CS35_SW3, CS34_SW3, CS36_SW3},
-    {0, CS35_SW4, CS34_SW4, CS36_SW4},
-    {0, CS35_SW5, CS34_SW5, CS36_SW5},
-    {0, CS35_SW6, CS34_SW6, CS36_SW6},
-    {0, CS35_SW7, CS34_SW7, CS36_SW7},
+    {0, SW1_CS23, SW1_CS24, SW1_CS22},
+    {0, SW2_CS23, SW2_CS24, SW2_CS22},
+    {0, SW3_CS23, SW3_CS24, SW3_CS22},
+    {0, SW4_CS23, SW4_CS24, SW4_CS22},
+    {0, SW5_CS23, SW5_CS24, SW5_CS22},
+    {0, SW6_CS23, SW6_CS24, SW6_CS22},
+    {0, SW7_CS23, SW7_CS24, SW7_CS22},
+    {0, SW1_CS35, SW1_CS34, SW1_CS36},
+    {0, SW2_CS35, SW2_CS34, SW2_CS36},
+    {0, SW3_CS35, SW3_CS34, SW3_CS36},
+    {0, SW4_CS35, SW4_CS34, SW4_CS36},
+    {0, SW5_CS35, SW5_CS34, SW5_CS36},
+    {0, SW6_CS35, SW6_CS34, SW6_CS36},
+    {0, SW7_CS35, SW7_CS34, SW7_CS36},
 
-    {0, CS17_SW1, CS16_SW1, CS18_SW1},
-    {0, CS17_SW2, CS16_SW2, CS18_SW2},
-    {0, CS17_SW3, CS16_SW3, CS18_SW3},
-    {0, CS17_SW4, CS16_SW4, CS18_SW4},
-    {0, CS17_SW5, CS16_SW5, CS18_SW5},
-    {0, CS17_SW6, CS16_SW6, CS18_SW6},
-    {0, CS17_SW7, CS16_SW7, CS18_SW7},
-    {0, CS26_SW1, CS25_SW1, CS27_SW1},
-    {0, CS26_SW2, CS25_SW2, CS27_SW2},
-    {0, CS26_SW3, CS25_SW3, CS27_SW3},
-    {0, CS26_SW4, CS25_SW4, CS27_SW4},
-    {0, CS26_SW5, CS25_SW5, CS27_SW5},
-    {0, CS26_SW7, CS25_SW7, CS27_SW7},
+    {0, SW1_CS17, SW1_CS16, SW1_CS18},
+    {0, SW2_CS17, SW2_CS16, SW2_CS18},
+    {0, SW3_CS17, SW3_CS16, SW3_CS18},
+    {0, SW4_CS17, SW4_CS16, SW4_CS18},
+    {0, SW5_CS17, SW5_CS16, SW5_CS18},
+    {0, SW6_CS17, SW6_CS16, SW6_CS18},
+    {0, SW7_CS17, SW7_CS16, SW7_CS18},
+    {0, SW1_CS26, SW1_CS25, SW1_CS27},
+    {0, SW2_CS26, SW2_CS25, SW2_CS27},
+    {0, SW3_CS26, SW3_CS25, SW3_CS27},
+    {0, SW4_CS26, SW4_CS25, SW4_CS27},
+    {0, SW5_CS26, SW5_CS25, SW5_CS27},
+    {0, SW7_CS26, SW7_CS25, SW7_CS27},
 
-    {0, CS20_SW1, CS19_SW1, CS21_SW1},
-    {0, CS20_SW2, CS19_SW2, CS21_SW2},
-    {0, CS20_SW3, CS19_SW3, CS21_SW3},
-    {0, CS20_SW4, CS19_SW4, CS21_SW4},
-    {0, CS20_SW5, CS19_SW5, CS21_SW5},
-    {0, CS20_SW6, CS19_SW6, CS21_SW6},
-    {0, CS20_SW7, CS19_SW7, CS21_SW7},
-    {0, CS29_SW1, CS28_SW1, CS30_SW1},
-    {0, CS29_SW2, CS28_SW2, CS30_SW2},
-    {0, CS29_SW3, CS28_SW3, CS30_SW3},
-    {0, CS29_SW4, CS28_SW4, CS30_SW4},
-    {0, CS29_SW5, CS28_SW5, CS30_SW5},
-    {0, CS29_SW6, CS28_SW6, CS30_SW6},
-    {0, CS29_SW7, CS28_SW7, CS30_SW7},
+    {0, SW1_CS20, SW1_CS19, SW1_CS21},
+    {0, SW2_CS20, SW2_CS19, SW2_CS21},
+    {0, SW3_CS20, SW3_CS19, SW3_CS21},
+    {0, SW4_CS20, SW4_CS19, SW4_CS21},
+    {0, SW5_CS20, SW5_CS19, SW5_CS21},
+    {0, SW6_CS20, SW6_CS19, SW6_CS21},
+    {0, SW7_CS20, SW7_CS19, SW7_CS21},
+    {0, SW1_CS29, SW1_CS28, SW1_CS30},
+    {0, SW2_CS29, SW2_CS28, SW2_CS30},
+    {0, SW3_CS29, SW3_CS28, SW3_CS30},
+    {0, SW4_CS29, SW4_CS28, SW4_CS30},
+    {0, SW5_CS29, SW5_CS28, SW5_CS30},
+    {0, SW6_CS29, SW6_CS28, SW6_CS30},
+    {0, SW7_CS29, SW7_CS28, SW7_CS30},
 
-    {0, CS9_SW1, CS10_SW1, CS8_SW1},
-    {0, CS9_SW2, CS10_SW2, CS8_SW2},
-    {0, CS9_SW3, CS10_SW3, CS8_SW3},
-    {0, CS9_SW6, CS10_SW6, CS8_SW6},
-    {0, CS2_SW3, CS1_SW3, CS3_SW3},
-    {0, CS2_SW4, CS1_SW4, CS3_SW4},
-    {0, CS2_SW5, CS1_SW5, CS3_SW5},
-    {0, CS2_SW6, CS1_SW6, CS3_SW6},
-    {0, CS2_SW7, CS1_SW7, CS3_SW7}
+    {0, SW1_CS9, SW1_CS10, SW1_CS8},
+    {0, SW2_CS9, SW2_CS10, SW2_CS8},
+    {0, SW3_CS9, SW3_CS10, SW3_CS8},
+    {0, SW6_CS9, SW6_CS10, SW6_CS8},
+    {0, SW3_CS2, SW3_CS1, SW3_CS3},
+    {0, SW4_CS2, SW4_CS1, SW4_CS3},
+    {0, SW5_CS2, SW5_CS1, SW5_CS3},
+    {0, SW6_CS2, SW6_CS1, SW6_CS3},
+    {0, SW7_CS2, SW7_CS1, SW7_CS3}
 };
 #endif
diff --git a/keyboards/kbdcraft/adam64/config.h b/keyboards/kbdcraft/adam64/config.h
index 511eb7f8ab6..5e1cc30cf9b 100644
--- a/keyboards/kbdcraft/adam64/config.h
+++ b/keyboards/kbdcraft/adam64/config.h
@@ -24,10 +24,3 @@
 #define I2C1_DUTY_CYCLE	FAST_DUTY_CYCLE_16_9
 
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define RGB_MATRIX_LED_COUNT 64
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
\ No newline at end of file
diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json
index be24ef4c191..d7a96fa5779 100644
--- a/keyboards/kbdcraft/adam64/info.json
+++ b/keyboards/kbdcraft/adam64/info.json
@@ -133,7 +133,8 @@
             {"flags": 4, "matrix": [4, 11], "x": 176, "y": 40},
             {"flags": 4, "matrix": [4, 12], "x": 192, "y": 40},
             {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40}
-        ]
+        ],
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_64_ansi": {
diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h
index c989f1b1214..d309ba55eeb 100644
--- a/keyboards/kbdfans/baguette66/rgb/config.h
+++ b/keyboards/kbdfans/baguette66/rgb/config.h
@@ -17,37 +17,5 @@
 #pragma once
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 
-#define RGB_MATRIX_LED_COUNT 66
-#define RGB_MATRIX_KEYPRESSES
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#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
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspendedz
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json
index c5ed4717a52..70f0098d40b 100644
--- a/keyboards/kbdfans/baguette66/rgb/info.json
+++ b/keyboards/kbdfans/baguette66/rgb/info.json
@@ -26,8 +26,41 @@
         "pin": "E6"
     },
     "rgb_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
+        "max_brightness": 150,
         "sat_steps": 8,
+        "sleep": true,
         "val_steps": 8,
         "speed_steps": 10
     },
diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
index 754f4e1eb80..39e9cce080c 100644
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@@ -15,64 +15,4 @@
  */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define RGB_MATRIX_LED_COUNT 108
-#define DRIVER_INDICATOR_LED_TOTAL 0
-#endif
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json
index b3b4e385f19..c6486e0b39d 100644
--- a/keyboards/kbdfans/bella/rgb/info.json
+++ b/keyboards/kbdfans/bella/rgb/info.json
@@ -9,7 +9,55 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c
index 8bdc1d8fdf8..4818c990053 100644
--- a/keyboards/kbdfans/bella/rgb/rgb.c
+++ b/keyboards/kbdfans/bella/rgb/rgb.c
@@ -15,107 +15,107 @@
  */
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},    /* RGB6 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},    /* RGB32 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},    /* RGB45 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},    /* RGB58 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},    /* RGB71 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},    /* RGB84 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},    /* RGB97 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},    /* RGB7 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},    /* RGB20 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},    /* RGB33 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},    /* RGB46 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},    /* RGB59 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},    /* RGB72 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},    /* RGB85 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},    /* RGB6 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},    /* RGB32 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},    /* RGB45 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},    /* RGB58 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},    /* RGB71 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},    /* RGB84 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},    /* RGB97 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},    /* RGB7 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},    /* RGB20 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},    /* RGB33 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},    /* RGB46 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},    /* RGB59 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},    /* RGB72 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},    /* RGB85 */
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},    /* RGB5 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},    /* RGB18 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},    /* RGB31 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},    /* RGB44 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},    /* RGB57 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},    /* RGB70 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},    /* RGB83 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},    /* RGB96 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},    /* RGB8 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},    /* RGB21 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},    /* RGB34 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},    /* RGB47 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},    /* RGB60 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},    /* RGB73 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},    /* RGB86 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},    /* RGB5 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},    /* RGB18 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},    /* RGB31 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},    /* RGB44 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},    /* RGB57 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},    /* RGB70 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},    /* RGB83 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},    /* RGB96 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},    /* RGB8 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},    /* RGB21 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},    /* RGB34 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},    /* RGB47 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},    /* RGB60 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},    /* RGB73 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},    /* RGB86 */
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},    /* RGB4 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},    /* RGB17 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},    /* RGB30 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},    /* RGB43 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},    /* RGB56 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},    /* RGB69 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},    /* RGB82 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},    /* RGB95 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},    /* RGB9 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},    /* RGB22 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},    /* RGB35 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},    /* RGB48 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},    /* RGB61 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},    /* RGB74 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},    /* RGB87 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},    /* RGB4 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},    /* RGB17 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},    /* RGB30 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},    /* RGB43 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},    /* RGB56 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},    /* RGB69 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},    /* RGB82 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},    /* RGB95 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},    /* RGB9 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},    /* RGB22 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},    /* RGB35 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},    /* RGB48 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},    /* RGB61 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},    /* RGB74 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},    /* RGB87 */
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},    /* RGB3 */
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},    /* RGB16 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},    /* RGB29*/
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},    /* RGB42 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},    /* RGB55 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},    /* RGB68 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},    /* RGB81 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},    /* RGB94 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},    /* RGB10 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},    /* RGB23 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},    /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},    /* RGB49 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},    /* RGB62 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},    /* RGB88 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},    /* RGB3 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},    /* RGB16 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},    /* RGB29*/
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},    /* RGB42 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},    /* RGB55 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},    /* RGB68 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},    /* RGB81 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},    /* RGB94 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},    /* RGB10 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},    /* RGB23 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},    /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},    /* RGB49 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},    /* RGB62 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},    /* RGB88 */
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},    /* RGB2 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},    /* RGB28 */
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},    /* RGB41 */
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},    /* RGB54 */
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},    /* RGB67 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},    /* RGB80 */
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},    /* RGB93 */
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},    /* RGB11 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},    /* RGB24 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},    /* RGB37 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},    /* RGB50 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},    /* RGB63 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},    /* RGB76 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},    /* RGB2 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},    /* RGB28 */
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},    /* RGB41 */
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},    /* RGB54 */
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},    /* RGB67 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},    /* RGB80 */
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},    /* RGB93 */
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},    /* RGB11 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},    /* RGB24 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},    /* RGB37 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},    /* RGB50 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},    /* RGB63 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},    /* RGB76 */
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},    /* RGB1 */
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},    /* RGB14 */
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},    /* RGB27 */
-    {0, CS36_SW8, CS35_SW8, CS34_SW8},    /* RGB103 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},    /* RGB38 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},    /* RGB51 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},    /* RGB64 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},    /* RGB77 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},    /* RGB90 */
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},    /* RGB1 */
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},    /* RGB14 */
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},    /* RGB27 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34},    /* RGB103 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},    /* RGB38 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},    /* RGB51 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},    /* RGB64 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},    /* RGB77 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},    /* RGB90 */
 
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},    /* RGB110 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2},    /* RGB19 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},    /* RGB108 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},    /* RGB98 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9},    /* RGB112 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8},    /* RGB99 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},    /* RGB107 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},    /* RGB100 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},    /* RGB89 */
-    {0, CS33_SW9, CS32_SW9, CS31_SW9},    /* RGB115 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9},    /* RGB116 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},    /* RGB25 */
-    {0, CS3_SW9, CS2_SW9, CS1_SW9},    /* RGB105 */
-    {0, CS3_SW4, CS2_SW4, CS1_SW4},    /* RGB40 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},    /* RGB110 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},    /* RGB19 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},    /* RGB108 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},    /* RGB98 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},    /* RGB112 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22},    /* RGB99 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},    /* RGB107 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},    /* RGB100 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},    /* RGB89 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31},    /* RGB115 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34},    /* RGB116 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},    /* RGB25 */
+    {0, SW9_CS3, SW9_CS2, SW9_CS1},    /* RGB105 */
+    {0, SW4_CS3, SW4_CS2, SW4_CS1},    /* RGB40 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
index 48284a5160d..39e9cce080c 100644
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@@ -15,64 +15,4 @@
  */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define RGB_MATRIX_LED_COUNT 109
-#define DRIVER_INDICATOR_LED_TOTAL 0
-#endif
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json
index d407cb0f7b9..17ca4333fd9 100644
--- a/keyboards/kbdfans/bella/rgb_iso/info.json
+++ b/keyboards/kbdfans/bella/rgb_iso/info.json
@@ -9,7 +9,55 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
index e36b811bbc8..8d9349e295f 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
+++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
@@ -15,108 +15,108 @@
  */
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},    /* RGB6 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},    /* RGB32 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},    /* RGB45 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},    /* RGB58 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},    /* RGB71 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},    /* RGB84 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},    /* RGB97 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},    /* RGB7 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},    /* RGB20 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},    /* RGB33 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},    /* RGB46 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},    /* RGB59 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},    /* RGB72 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},    /* RGB85 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},    /* RGB6 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},    /* RGB32 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},    /* RGB45 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},    /* RGB58 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},    /* RGB71 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},    /* RGB84 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},    /* RGB97 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},    /* RGB7 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},    /* RGB20 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},    /* RGB33 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},    /* RGB46 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},    /* RGB59 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},    /* RGB72 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},    /* RGB85 */
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},    /* RGB5 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},    /* RGB18 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},    /* RGB31 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},    /* RGB44 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},    /* RGB57 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},    /* RGB70 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},    /* RGB83 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},    /* RGB96 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},    /* RGB8 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},    /* RGB21 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},    /* RGB34 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},    /* RGB47 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},    /* RGB60 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},    /* RGB73 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},    /* RGB86 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},    /* RGB5 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},    /* RGB18 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},    /* RGB31 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},    /* RGB44 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},    /* RGB57 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},    /* RGB70 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},    /* RGB83 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},    /* RGB96 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},    /* RGB8 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},    /* RGB21 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},    /* RGB34 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},    /* RGB47 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},    /* RGB60 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},    /* RGB73 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},    /* RGB86 */
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},    /* RGB4 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},    /* RGB17 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},    /* RGB30 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},    /* RGB43 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},    /* RGB56 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},    /* RGB69 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},    /* RGB82 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},    /* RGB95 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},    /* RGB9 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},    /* RGB22 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},    /* RGB35 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},    /* RGB48 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},    /* RGB61 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},    /* RGB74 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},    /* RGB87 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},    /* RGB4 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},    /* RGB17 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},    /* RGB30 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},    /* RGB43 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},    /* RGB56 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},    /* RGB69 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},    /* RGB82 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},    /* RGB95 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},    /* RGB9 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},    /* RGB22 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},    /* RGB35 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},    /* RGB48 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},    /* RGB61 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},    /* RGB74 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},    /* RGB87 */
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},    /* RGB3 */
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},    /* RGB16 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},    /* RGB29*/
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},    /* RGB42 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},    /* RGB55 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},    /* RGB68 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},    /* RGB81 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},    /* RGB94 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},    /* RGB10 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},    /* RGB23 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},    /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},    /* RGB49 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},    /* RGB62 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},    /* RGB88 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},    /* RGB3 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},    /* RGB16 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},    /* RGB29*/
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},    /* RGB42 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},    /* RGB55 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},    /* RGB68 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},    /* RGB81 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},    /* RGB94 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},    /* RGB10 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},    /* RGB23 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},    /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},    /* RGB49 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},    /* RGB62 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},    /* RGB88 */
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},    /* RGB2 */
-    {0, CS6_SW2, CS5_SW2, CS4_SW2},    /* RGB15 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},    /* RGB28 */
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},    /* RGB41 */
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},    /* RGB54 */
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},    /* RGB67 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},    /* RGB80 */
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},    /* RGB93 */
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},    /* RGB11 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},    /* RGB24 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},    /* RGB37 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},    /* RGB50 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},    /* RGB63 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},    /* RGB76 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},    /* RGB2 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4},    /* RGB15 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},    /* RGB28 */
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},    /* RGB41 */
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},    /* RGB54 */
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},    /* RGB67 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},    /* RGB80 */
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},    /* RGB93 */
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},    /* RGB11 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},    /* RGB24 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},    /* RGB37 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},    /* RGB50 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},    /* RGB63 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},    /* RGB76 */
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},    /* RGB1 */
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},    /* RGB14 */
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},    /* RGB27 */
-    {0, CS36_SW8, CS35_SW8, CS34_SW8},    /* RGB103 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},    /* RGB38 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},    /* RGB51 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},    /* RGB64 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},    /* RGB77 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},    /* RGB90 */
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},    /* RGB1 */
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},    /* RGB14 */
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},    /* RGB27 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34},    /* RGB103 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},    /* RGB38 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},    /* RGB51 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},    /* RGB64 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},    /* RGB77 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},    /* RGB90 */
 
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},    /* RGB110 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2},    /* RGB19 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},    /* RGB108 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},    /* RGB98 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9},    /* RGB112 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8},    /* RGB99 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},    /* RGB107 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},    /* RGB100 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},    /* RGB89 */
-    {0, CS33_SW9, CS32_SW9, CS31_SW9},    /* RGB115 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9},    /* RGB116 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},    /* RGB25 */
-    {0, CS3_SW9, CS2_SW9, CS1_SW9},    /* RGB105 */
-    {0, CS3_SW4, CS2_SW4, CS1_SW4},    /* RGB40 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},    /* RGB110 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},    /* RGB19 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},    /* RGB108 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},    /* RGB98 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},    /* RGB112 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22},    /* RGB99 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},    /* RGB107 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},    /* RGB100 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},    /* RGB89 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31},    /* RGB115 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34},    /* RGB116 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},    /* RGB25 */
+    {0, SW9_CS3, SW9_CS2, SW9_CS1},    /* RGB105 */
+    {0, SW4_CS3, SW4_CS2, SW4_CS1},    /* RGB40 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h
index e37e2d17635..daf59859966 100644
--- a/keyboards/kbdfans/boop65/rgb/config.h
+++ b/keyboards/kbdfans/boop65/rgb/config.h
@@ -18,61 +18,6 @@
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#    define RGB_MATRIX_LED_COUNT 83
-#    define DRIVER_INDICATOR_LED_TOTAL 0
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/boop65/rgb/info.json b/keyboards/kbdfans/boop65/rgb/info.json
index cc780177dc1..fc7196bec02 100644
--- a/keyboards/kbdfans/boop65/rgb/info.json
+++ b/keyboards/kbdfans/boop65/rgb/info.json
@@ -9,7 +9,58 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "is31fl3741"
+    "animations": {
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_val": true,
+      "band_pinwheel_sat": true,
+      "band_pinwheel_val": true,
+      "band_spiral_sat": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_fractal": true,
+      "pixel_rain": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true,
+      "solid_multisplash": true
+    },
+    "default": {
+      "animation": "cycle_all"
+    },
+    "driver": "is31fl3741",
+    "led_flush_limit": 26,
+    "led_process_limit": 4,
+    "max_brightness": 200,
+    "sleep": true
   },
  "matrix_pins": {
     "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
diff --git a/keyboards/kbdfans/boop65/rgb/rgb.c b/keyboards/kbdfans/boop65/rgb/rgb.c
index f2b58589665..f70c92812f9 100644
--- a/keyboards/kbdfans/boop65/rgb/rgb.c
+++ b/keyboards/kbdfans/boop65/rgb/rgb.c
@@ -18,98 +18,98 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {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, CS24_SW7, CS23_SW7, CS22_SW7},
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
 
-    {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, 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, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
 
-    {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, 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, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {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, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
 
-    {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, 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_SW7, CS38_SW7, CS37_SW7},
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37},
 
 /* underglow */
 
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},
-    {0, CS39_SW1, CS38_SW1, CS37_SW1},
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h
index 79f79fdf505..56a23d83219 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -17,6 +17,5 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json
index ee6f380e4e0..f467e2a909e 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/info.json
+++ b/keyboards/kbdfans/bounce/75/hotswap/info.json
@@ -33,6 +33,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {
diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h
index 79f79fdf505..56a23d83219 100644
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -17,6 +17,5 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json
index 8dd809d5c83..5fc246655d7 100644
--- a/keyboards/kbdfans/bounce/75/soldered/info.json
+++ b/keyboards/kbdfans/bounce/75/soldered/info.json
@@ -34,6 +34,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {
diff --git a/keyboards/kbdfans/d45/v1/info.json b/keyboards/kbdfans/d45/v1/info.json
index bf2dab87d98..f26193e581e 100644
--- a/keyboards/kbdfans/d45/v1/info.json
+++ b/keyboards/kbdfans/d45/v1/info.json
@@ -14,7 +14,6 @@
         "command": false,
         "console": false,
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": false,
         "rgb_matrix": false,
@@ -31,7 +30,6 @@
         "command": false,
         "console": false,
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": false,
         "rgb_matrix": false,
@@ -58,7 +56,7 @@
     "processor_type": "avr",
     "protocol": "LUFA",
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
         "animations": {
diff --git a/keyboards/epoch80/info.json b/keyboards/kbdfans/epoch80/info.json
similarity index 100%
rename from keyboards/epoch80/info.json
rename to keyboards/kbdfans/epoch80/info.json
diff --git a/keyboards/epoch80/keymaps/default/keymap.c b/keyboards/kbdfans/epoch80/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/default/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/default/keymap.c
diff --git a/keyboards/epoch80/keymaps/iso/keymap.c b/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/iso/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/iso/keymap.c
diff --git a/keyboards/epoch80/keymaps/tsangan/keymap.c b/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/tsangan/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c
diff --git a/keyboards/epoch80/keymaps/via/keymap.c b/keyboards/kbdfans/epoch80/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/via/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/via/keymap.c
diff --git a/keyboards/w1_at/keymaps/via/rules.mk b/keyboards/kbdfans/epoch80/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/w1_at/keymaps/via/rules.mk
rename to keyboards/kbdfans/epoch80/keymaps/via/rules.mk
diff --git a/keyboards/epoch80/keymaps/wkl/keymap.c b/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/wkl/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c
diff --git a/keyboards/kbdfans/epoch80/readme.md b/keyboards/kbdfans/epoch80/readme.md
new file mode 100644
index 00000000000..b029b5bd994
--- /dev/null
+++ b/keyboards/kbdfans/epoch80/readme.md
@@ -0,0 +1,20 @@
+# Epoch 80 / Dolch.CR 80
+
+![epoch80](https://i.imgur.com/xNvEKBOl.png)
+
+Dolch PAC inspired TKL keyboard designed by Cary Works and made by KBDFans.  
+The board was also sold in a zFrontier groupbuy under the name Dolch.CR 80.
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: Epoch 80 / Dolch.CR 80 PCB
+* Hardware Availability: https://kbdfans.com/collections/80-diy-kit/products/coming-soon-epoch-80-mechanical-keyboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/epoch80:default
+
+Flashing example for this keyboard:
+
+    make kbdfans/epoch80: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/epoch80/rules.mk b/keyboards/kbdfans/epoch80/rules.mk
similarity index 100%
rename from keyboards/epoch80/rules.mk
rename to keyboards/kbdfans/epoch80/rules.mk
diff --git a/keyboards/jm60/board.h b/keyboards/kbdfans/jm60/board.h
similarity index 100%
rename from keyboards/jm60/board.h
rename to keyboards/kbdfans/jm60/board.h
diff --git a/keyboards/jm60/chconf.h b/keyboards/kbdfans/jm60/chconf.h
similarity index 100%
rename from keyboards/jm60/chconf.h
rename to keyboards/kbdfans/jm60/chconf.h
diff --git a/keyboards/jm60/config.h b/keyboards/kbdfans/jm60/config.h
similarity index 100%
rename from keyboards/jm60/config.h
rename to keyboards/kbdfans/jm60/config.h
diff --git a/keyboards/jm60/info.json b/keyboards/kbdfans/jm60/info.json
similarity index 100%
rename from keyboards/jm60/info.json
rename to keyboards/kbdfans/jm60/info.json
diff --git a/keyboards/jm60/jm60.c b/keyboards/kbdfans/jm60/jm60.c
similarity index 100%
rename from keyboards/jm60/jm60.c
rename to keyboards/kbdfans/jm60/jm60.c
diff --git a/keyboards/kbdfans/jm60/keymaps/default/keymap.c b/keyboards/kbdfans/jm60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d063afa0fd3
--- /dev/null
+++ b/keyboards/kbdfans/jm60/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+// Copyright QMK
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BL,
+    _FL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Keymap _BL: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------.
+     * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
+     * |-----------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
+     * |-----------------------------------------------------------|
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+     * |-----------------------------------------------------------|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
+     * |-----------------------------------------------------------|
+     * |Ctrl|Gui |Alt |      Space            |Alt |Gui |FN  |Ctrl |
+     * `-----------------------------------------------------------'
+     */
+    [_BL] = LAYOUT_60_ansi(
+        QK_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_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(_FL), KC_RCTL
+    ),
+
+    /* Keymap _FL: Function Layer
+     */
+    [_FL] = LAYOUT_60_ansi(
+        KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/jm60/keymaps/poker3/keymap.c b/keyboards/kbdfans/jm60/keymaps/poker3/keymap.c
similarity index 100%
rename from keyboards/jm60/keymaps/poker3/keymap.c
rename to keyboards/kbdfans/jm60/keymaps/poker3/keymap.c
diff --git a/keyboards/jm60/ld/jm60_bootloader.ld b/keyboards/kbdfans/jm60/ld/jm60_bootloader.ld
similarity index 100%
rename from keyboards/jm60/ld/jm60_bootloader.ld
rename to keyboards/kbdfans/jm60/ld/jm60_bootloader.ld
diff --git a/keyboards/jm60/mcuconf.h b/keyboards/kbdfans/jm60/mcuconf.h
similarity index 100%
rename from keyboards/jm60/mcuconf.h
rename to keyboards/kbdfans/jm60/mcuconf.h
diff --git a/keyboards/kbdfans/jm60/readme.md b/keyboards/kbdfans/jm60/readme.md
new file mode 100644
index 00000000000..545124f3aaa
--- /dev/null
+++ b/keyboards/kbdfans/jm60/readme.md
@@ -0,0 +1,21 @@
+# JM60
+
+A compact 60% keyboard with full RGB led support.
+
+* Keyboard Maintainer: QMK Community
+* Hardware Supported: JM60
+* Hardware Availability: https://kbdfans.myshopify.com/ (is no longer sold)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/jm60: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).
+
+## Flashing Instructions
+
+1) rename 'jm60_default.bin' to 'jm60_default.firmware'
+
+2) Press 'R' and reconnect the keyboard.
+
+3) Start the original Configuration Tool and flash 'jm60_default.bin'
diff --git a/keyboards/jm60/rules.mk b/keyboards/kbdfans/jm60/rules.mk
similarity index 100%
rename from keyboards/jm60/rules.mk
rename to keyboards/kbdfans/jm60/rules.mk
diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index c37e3587e25..f2b28e4a086 100644
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -46,6 +46,130 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 1.5},
+                {"matrix": [7, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.5, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 5], "x": 9.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 7], "x": 11.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 5.5}
+            ]
+        },
         "LAYOUT_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
@@ -85,7 +209,367 @@
                 {"matrix": [1, 6], "x": 10, "y": 1.5},
                 {"matrix": [1, 7], "x": 11, "y": 1.5},
                 {"matrix": [1, 8], "x": 12, "y": 1.5},
-                {"matrix": [7, 1], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [7, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.5, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 5], "x": 9.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 7], "x": 11.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 1.5},
+                {"matrix": [7, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.5, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 5], "x": 9.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 7], "x": 11.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 5], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 1.5},
+                {"matrix": [7, 1], "x": 14, "y": 1.5},
 
                 {"matrix": [1, 9], "x": 15.5, "y": 1.5},
                 {"matrix": [1, 10], "x": 16.5, "y": 1.5},
@@ -150,13 +634,11 @@
                 {"matrix": [4, 11], "x": 17.5, "y": 4.5},
                 {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
 
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 9], "x": 3.5, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 5], "x": 9.75, "y": 5.5},
-                {"matrix": [5, 6], "x": 10.75, "y": 5.5},
-                {"matrix": [5, 7], "x": 11.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 5], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5.5, "w": 1.5},
 
                 {"matrix": [5, 8], "x": 13.25, "y": 5.75},
                 {"matrix": [5, 3], "x": 14.25, "y": 5.75},
@@ -286,7 +768,7 @@
                 {"matrix": [5, 11], "x": 17.5, "y": 5.5}
             ]
         },
-        "LAYOUT_all": {
+        "LAYOUT_iso_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
 
@@ -346,12 +828,10 @@
                 {"matrix": [2, 6], "x": 10.5, "y": 2.5},
                 {"matrix": [2, 7], "x": 11.5, "y": 2.5},
                 {"matrix": [2, 8], "x": 12.5, "y": 2.5},
-                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
-
                 {"matrix": [2, 9], "x": 15.5, "y": 2.5},
                 {"matrix": [2, 10], "x": 16.5, "y": 2.5},
                 {"matrix": [2, 11], "x": 17.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.5},
@@ -365,12 +845,12 @@
                 {"matrix": [3, 5], "x": 9.75, "y": 3.5},
                 {"matrix": [3, 6], "x": 10.75, "y": 3.5},
                 {"matrix": [3, 7], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
 
                 {"matrix": [3, 9], "x": 15.5, "y": 3.5},
                 {"matrix": [3, 10], "x": 16.5, "y": 3.5},
                 {"matrix": [3, 11], "x": 17.5, "y": 3.5},
-                {"matrix": [3, 12], "x": 18.5, "y": 3.5},
 
                 {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4.5},
@@ -391,7 +871,7 @@
                 {"matrix": [4, 9], "x": 15.5, "y": 4.5},
                 {"matrix": [4, 10], "x": 16.5, "y": 4.5},
                 {"matrix": [4, 11], "x": 17.5, "y": 4.5},
-                {"matrix": [4, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
 
                 {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.5},
@@ -406,8 +886,244 @@
                 {"matrix": [5, 4], "x": 15.25, "y": 5.75},
 
                 {"matrix": [5, 10], "x": 16.5, "y": 5.5},
-                {"matrix": [5, 11], "x": 17.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 18.5, "y": 5.5}
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 5], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 1.5},
+                {"matrix": [7, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 5], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd19x/matrix_diagram.md b/keyboards/kbdfans/kbd19x/matrix_diagram.md
new file mode 100644
index 00000000000..5c7aa98557b
--- /dev/null
+++ b/keyboards/kbdfans/kbd19x/matrix_diagram.md
@@ -0,0 +1,28 @@
+# Matrix Diagram for KBDfans KBD19x
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┬───┐
+│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 │      │     │                │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┼───┤   ┌──┴┐38  │ ISO Enter      │2C │ 2u Numpad Plus
+│30    │31 │32 │33 │34 │6C │75 │76 │77 │35 │36 │37 │38      │ │39 │3A │3B │3C │   │73 │    │                │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤   └───┴────┘                ├───┤
+│40  │41 │42 │43 │44 │78 │79 │7A │7B │45 │46 │47 │48    │┌───┐│49 │4A │4B │4C │                             │   │
+├────┼───┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴─┬─┴─┬─┴──┬───┘│74 │└───┼───┼───┼───┤                             │4C │ 2u Numpad Enter
+│50  │51 │52  │59                      │55 │56 │57  │┌───┼───┼───┐│5A │5B │5C │                             │   │
+└────┴───┴────┴────────────────────────┴───┴───┴────┘│58 │53 │54 │└───┴───┴───┘                             └───┘
+                                                     └───┴───┴───┘
+┌────────┐
+│40      │ 2.25u LShift
+└────────┘
+┌────┬───┬────┬───────────────────────┬────┬───┬────┐
+│50  │51 │52  │59                     │55  │56 │57  │ 6u Space
+└────┴───┴────┴───────────────────────┴────┴───┴────┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┐
+│50   │52   │59                         │55   │57   │ WKL (7u Space)
+└─────┴─────┴───────────────────────────┴─────┴─────┘
+```
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/config.h
deleted file mode 100644
index 798dd7b2977..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Khader Syed
- *
- * 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
-
-#undef PRODUCT
-#define PRODUCT "MadHatter's Hotswap Kbd67 rev1"
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/keymap.c
deleted file mode 100644
index cced6df8d74..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Khader Syed
- *
- * 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_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, 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_BSPC,          KC_PGUP,
-  KC_GRV,  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_LALT, KC_LGUI,                KC_SPC,                          MO(1),   KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT),
-
-[1] = 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_TRNS,  KC_TRNS, KC_MFFD,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   QK_BOOT,         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_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/config.h
deleted file mode 100644
index 16497ddf0f8..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
-
-#define MOUSEKEY_DELAY             50
-#define MOUSEKEY_INTERVAL          15
-#define MOUSEKEY_MAX_SPEED         4
-#define MOUSEKEY_TIME_TO_MAX       50
-#define MOUSEKEY_WHEEL_MAX_SPEED   1
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 50
-
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_MACRO
-#define NO_ACTION_ONESHOT
-
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM        200
-#define TAPPING_TOGGLE      2
-#define TAP_HOLD_CAPS_DELAY 50
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
deleted file mode 100644
index 4b00cc63ff6..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define FN      MO(L_FN)
-#define FN_CAPS LT(L_FN, KC_CAPS)
-#define FN_ESC  LT(L_FN, KC_ESC)
-#define FN_FNLK TT(L_FN)
-
-#define MV_UP   LCTL(KC_UP)
-#define MV_DOWN LCTL(KC_DOWN)
-#define MV_LEFT LCTL(KC_LEFT)
-#define MV_RGHT LCTL(KC_RGHT)
-#define TOP     LCTL(KC_HOME)
-#define BOTTOM  LCTL(KC_END)
-
-enum keycodes {
-    CLEAR = SAFE_RANGE,
-};
-
-enum layers {
-    L_BASE,
-    L_FN,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case CLEAR:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LCTL("a") SS_TAP(X_DELETE));
-        }
-        return false;
-
-    default:
-        return true;
-    }
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base layer
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │PSc│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │FnEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │PgU│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │RShift│ ↑ │PgD│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │LCtl│LGui│LAlt│         Space          │RAlt│FnLk│ │ ← │ ↓ │ → │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [L_BASE] = LAYOUT(
-        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_BSLS, KC_GRV,  KC_PSCR,
-        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_BSPC, KC_DEL,
-        FN_ESC,  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, FN_FNLK,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Function layer
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│NLk│SLk│Pau│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-     * │     │M2 │M↑ │M1 │M3 │   │   │   │   │Stp│Ply│Prv│Nxt│Clear│Ins│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │      │M← │M↓ │M→ │MW↑│   │   │Mv←│ ↓ │ ↑ │Mv→│   │        │Top│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │        │MA0│MA2│MW←│MW→│   │   │App│Vo-│Vo+│Mut│      │PgU│Btm│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │DtPR│DtNA│          MW↓           │    │    │ │Hom│PgD│End│
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [L_FN] = 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_NUM,  KC_SCRL, KC_PAUS,
-        _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, _______, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,   KC_INS,
-        _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, MV_LEFT, KC_DOWN, KC_UP,   MV_RGHT, _______, _______,          _______, TOP,
-        _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, KC_APP,  KC_VOLD, KC_VOLU, KC_MUTE,          _______, KC_PGUP, BOTTOM,
-        _______, _______, _______,                   KC_WH_D,                            _______, _______,          KC_HOME, KC_PGDN, KC_END
-    ),
-};
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk
deleted file mode 100644
index 0bef91295ed..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMMAND_ENABLE    = yes
-CONSOLE_ENABLE    = yes
-EXTRAKEY_ENABLE   = yes
-MOUSEKEY_ENABLE   = yes
-NKRO_ENABLE       = yes
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/config.h
deleted file mode 100644
index cc06440e0dd..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2018 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
-
-// Enable cmd-option-escape on mac.
-#define GRAVE_ESC_ALT_OVERRIDE
-
-// place overrides here
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
deleted file mode 100644
index 33245acc51d..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Copyright 2019 Yonatan Zunger
- *
- * 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 custom_keycodes {
-  // Use this instead of RALT, so we can use it to switch layers but not trigger other alt-related
-  // behavior (like GRAVE_ESC_ALT_OVERRIDE).
-  MAGIC = SAFE_RANGE,
-};
-
-enum layers_keymap {
-  _QWERTY = 0,
-  _FUNCTION,
-
-  _MAGIC,
-  _SHIFTMAGIC,
-};
-
-// This is so that H(xxxx) has the same width as _______, which makes the grids more legible.
-#define H(x) UC(0x##x)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Del|Brk|Home|
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |End |
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |Win |        Space          |Alt| FN |||||Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_QWERTY] = LAYOUT(
-  QK_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_BRK,  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_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_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_LALT, KC_LGUI,                KC_SPC,                          MAGIC,   MO(_FUNCTION),             KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap Fn Layer. Blank keys are deliberately NO, not TRNS.
-   * ,----------------------------------------------------------------.
-   * |Rst |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|F13|PSc|PAUS|
-   * |----------------------------------------------------------------|
-   * |Debug|   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |Ctrl   |   |Vo+|   |   |   |   |   |   |   |   |   |       |    |
-   * |----------------------------------------------------------------|
-   * |Shift   |REV|Vo-|FWD|   |   |   |   |   |   |   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |Win |                       |Alt|    |||||MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_FUNCTION] = LAYOUT(
-   QK_BOOT, 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_PSCR,  KC_MPLY,
-   DB_TOGG, 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_VOLU,     KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,          KC_NO,            KC_NO,
-   _______, KC_MRWD, KC_VOLD,     KC_MFFD, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,                  KC_BTN1, KC_MS_U, KC_BTN2,
-   _______, _______, _______,                      KC_NO,                          _______, _______,                KC_MS_L, KC_MS_D, KC_MS_R),
-
-  /* Mathematical lower layer. Blank keys are TRNS.
-   * Note that escape turns into grave here. This doesn't just generalize GRAVE_ESC; it means that
-   * magic+esc is a way to create backticks without a dedicated key.
-   * ,----------------------------------------------------------------.
-   * | `  | ¹| ² | ³ | ⁴ | ⁵ | ⁶ | ⁷ | ⁸ | ⁹ | ⁰ | ⁻ | ⁺ | ⊕ | ≠ | √  |
-   * |----------------------------------------------------------------|
-   * |     | ± | ω | ε | ρ | τ | θ | υ | ι | ο | π | ∃ | ∀ |  ℚ  | ℝ  |
-   * |----------------------------------------------------------------|
-   * |       | α | σ | δ | φ | γ | η | ∅ | κ | λ | ∨ | ∧ |       | ℕ  |
-   * |----------------------------------------------------------------|
-   * |        | ζ | ξ | χ | ψ | β | ν | μ | ≲ | ≳ | ∈ |      | ↑ | ↔  |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |    ||||| ← | ↓ | →  |
-   * `----------------------------------------------------------------'
-  */
-[_MAGIC] = LAYOUT(
- KC_GRV,  H(00b9), H(00b2), H(00b3), H(2074), H(2075), H(2076), H(2077), H(2078), H(2079), H(2070), H(207b), H(207a), H(2295), H(2260), H(221a),
- _______, H(00b1), H(03c9), H(03b5), H(03c1), H(03c4), H(03b8), H(03c5), H(03b9), H(03bf), H(03c0), H(2203), H(2200), H(211a),          H(211d),
- _______, H(03b1), H(03c3), H(03b4), H(03c6), H(03b3), H(03b7), H(2205), H(03ba), H(03bb), H(2228), H(2227),          _______,          H(2115),
- _______, H(03b6), H(03be), H(03c7), H(03c8), H(03b2), H(03bd), H(03bc), H(2272), H(2273), H(2208),                   _______, H(2191), H(2194),
- _______, _______, _______,                   _______,                            _______, _______,                   H(2190), H(2193), H(2192)),
-
-  /* Mathematical upper layer. Blank keys are TRNS.
-   * ,----------------------------------------------------------------.
-   * | `  | ₁| ₂ | ₃ | ₄ | ₅ | ₆ | ₇ | ₈ | ₉ | ₀ | ₋ | ₊ | ⊗ | ≈ | ∂  |
-   * |----------------------------------------------------------------|
-   * |     | ∓ | Ω | Ε | Ρ | Τ | Θ | Υ | Ι | Ο | Π | ∄ | ∞ |  ⊙  | ℂ  |
-   * |----------------------------------------------------------------|
-   * |       | Α | Σ | Δ | Φ | Γ | Η | ¬ | Κ | Λ | ∪ | ∩ |       | ℤ  |
-   * |----------------------------------------------------------------|
-   * |        | Ζ | Ξ | Χ | Ψ | Β | Ν | Μ | ⊆ | ⊇ | ∉ |      | ⇑ | ⇔  |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |    ||||| ⇐ | ⇓ | ⇒  |
-   * `----------------------------------------------------------------'
-  */
-[_SHIFTMAGIC] = LAYOUT(
- KC_GRV,  H(2081), H(2082), H(2083), H(2084), H(2085), H(2086), H(2087), H(2088), H(2089), H(2080), H(208b), H(208a), H(2297), H(2248), H(2202),
- _______, H(2213), H(03a9), H(0395), H(03a1), H(03a4), H(0398), H(03a5), H(0399), H(039f), H(03a0), H(2204), H(221e), H(2299),          H(2102),
- _______, H(0391), H(03a3), H(0394), H(03a6), H(0393), H(0397), H(00ac), H(039a), H(039b), H(222a), H(2229),          _______,          H(2124),
- _______, H(0396), H(039e), H(03a7), H(03a8), H(0392), H(039d), H(039c), H(2286), H(2287), H(2209),                   _______, H(21d1), H(21d4),
- _______, _______, _______,                   _______,                            _______, _______,                   H(21d0), H(21d3), H(21d2)),
-};
-
-// Layer bitfields.
-#define MAGIC_LAYER (1UL << _MAGIC)
-#define SHIFTMAGIC_LAYER (1UL << _SHIFTMAGIC)
-// The layers we don't touch.
-#define LAYER_MASK ~(MAGIC_LAYER|SHIFTMAGIC_LAYER)
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  // Activate the appropriate magic layer:
-  //   User is holding AltGr+Shift => _SHIFTMAGIC
-  //   User is holding AltGr       => _MAGIC
-  //   Not holding AltGr           => None
-  // We do this the efficient way, by grabbing the non-magic bits from the current layer bitmap,
-  // setting the appropriate magic or shiftmagic bit, and doing an absolute layer set. (Layer
-  // sets are nontrivial, so we don't want to do extras!)
-
-  // We track shift and AltGr state on our own, because this function is called before get_mods is
-  // updated!
-  static bool shifted = false;
-  static bool magic = false;
-
-  if (keycode == KC_LSFT || keycode == KC_RSFT) {
-    shifted = record->event.pressed;
-  } else if (keycode == MAGIC) {
-    magic = record->event.pressed;
-  } else if (keycode == QK_BOOT) {
-    // Safe reset: Only actually let this keycode through if shift is held as well. Since there's no
-    // right-shift in the function layer, this means that reset is Fn+LShift+Esc, something you're
-    // not likely to hit by accident. (Especially since AltGr+Esc is backtick!)
-    return (record->event.pressed && shifted);
-  }
-
-  // Update the layer.
-  uint32_t new_layer_state = layer_state & LAYER_MASK;
-  if (magic) {
-    new_layer_state |= (shifted ? SHIFTMAGIC_LAYER : MAGIC_LAYER);
-  }
-  if (layer_state != new_layer_state) {
-    layer_state_set(new_layer_state);
-  }
-
-  return true;
-}
-
-void eeconfig_init_user(void) {
-  set_unicode_input_mode(UNICODE_MODE_MACOS);
-}
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/readme.md b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/readme.md
deleted file mode 100644
index 923a4824a52..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-* Custom keymap for kbd67, for those who need to both code and type math.
-* Author: Yonatan Zunger (zunger@gmail.com)
-
-This keymap is presently rather Mac-centric, as it uses Mac media keys in its function layer and the
-OS X Unicode input mode for the "magic" layers.
-
-*Layer 0 (Base QWERTY):* The layout has a few minor quirks: grave escape, Home/End/PgUp/PgDn in the
-right-hand column (rather than the more common Home/PgUp/PgDn/End), and a pause key between
-backspace and home -- this being something I use for screen lock, a necessity when one works with
-and sits next to security engineers. (Using a heavier switch on the pause key greatly reduces the
-risk of accidental triggering) In OS X style, alt and win are swapped on the left-hand side.
-
-The right-hand alt and gui keys take on a different meaning: right-alt lives up to its old name of
-AltGr by invoking Greek (the "magic" layers, 2 and 3), and right-gui invokes the function layer.
-
-*Layer 1 (Functions):* This layer deliberately sets KC_NO for the keys it doesn't use. I realize
-this isn't common, but I like to keep my functions quite distinct from all other layers.
-
-RESET can be accessed at Fn+Left Shift+Escape.
-
-*Layers 2 and 3*: These are invoked by the "magic" key (AltGr) and by magic+shift. The
-letters mostly produce Greek; the numbers, superscripts (magic) and subscripts (magic+shift); and
-the various other keys, mathematical symbols. There unfortunately aren't nearly enough keys for all
-the symbols I'd like, so magic+alt and magic+alt+shift may end up existing as well, giving this a
-proper Space Cadet effect; but that said, it's going to be hard to remember where all these symbols
-are without some extremely custom keycaps. In the limit of arbitrarily complex layers, the keyboard
-will probably start running LISP and turn into EMACS.
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/rules.mk b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/rules.mk
deleted file mode 100644
index a61cfa33fa9..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# You need Unicode for this map.
-UNICODE_ENABLE = yes        # Unicode
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/config.h b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/config.h
deleted file mode 100644
index 4fcd7735526..00000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 200
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
deleted file mode 100644
index 637ea3e2c8a..00000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Compile from qmk_firmware folder with the following command:
-// $ make kbdfans/kbd67/mkii-soldered:adamdehaven
-
-// Each layer gets a name for readability. 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, and you can also skip them entirely and just use numbers.
-#define _QWERTY 0
-#define _FN1 1
-
-// Tap Dance Definitions
-enum tapdance {
-    TD_HOME = 0,
-    TD_END
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Home, twice for PageUp
-    [TD_HOME] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_PGUP),
-    // Tap once for End, twice for PageDown
-    [TD_END] = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_PGDN)
-};
-
-/*
- *  You can use _______ in place for KC_TRNS (transparent)
- *  Or you can use XXXXXXX for KC_NO (NOOP)
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* 0: _QWERTY
-     * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐
-     * │ QK_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 (2)    │ 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    │ TD_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         │ TD_END  │
-     * ├────────────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────────────┬─────────┼─────────┤
-     * │     KC_LSFT (2)     │ KC_Z    │ KC_X    │ KC_C    │ KC_V    │ KC_B    │ KC_N    │ KC_M    │ KC_COMM │ KC_DOT  │ KC_SLSH │     KC_RSFT     │ KC_UP   │ MO(_FN1)│
-     * ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬┴────────┬─┴───────┬─────────┼─────────┼─────────┤
-     * │  KC_LCTL  │  KC_LGUI  │  KC_LALT  │                            KC_SPC                             │ KC_RALT │ KC_RCTL │         │ KC_LEFT │ KC_DOWN │ KC_RGHT │
-     * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
-     */
-    [_QWERTY] = LAYOUT_all(
-        QK_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, TD(TD_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, TD(TD_END),
-        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_UP, MO(_FN1),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* 1: _FN1
-     * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬───────────────────┬─────────┐
-     * │ QK_BOOT   │ 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)    │ KC_MUTE │
-     * ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤
-     * │   _______    │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ KC_PSCR │ _______ │ _______ │   _______    │ KC_VOLU │
-     * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────────┼─────────┤
-     * │    _______     │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │       _______        │ KC_VOLD │
-     * ├────────────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────────────┬─────────┼─────────┤
-     * │     _______ (2)     │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │     _______     │ KC_MPLY │ _______ │
-     * ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤
-     * │  _______  │  _______  │  _______  │                            _______                            │ _______ │ _______ │         │ KC_MPRV │ KC_MPLY │ KC_MNXT │
-     * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
-     */
-    [_FN1] = LAYOUT_all(
-        QK_BOOT, 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_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,          _______, KC_VOLU,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_VOLD,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY, _______,
-        _______, _______, _______,          _______,          _______,          _______,          _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
-    )
-};
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/rules.mk b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c
deleted file mode 100644
index 1904d616f74..00000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/keymap.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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_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_END,
-	MO(1),   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_BSLS, 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_PSCR,
-	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_GRV,  KC_DEL,           KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT_all( /* FN */
-	QK_BOOT, 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_CAPS, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP,   _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______, _______,
-	_______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          BL_UP, 
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP, BL_DOWN,
-	_______, _______, _______,          _______,          _______,          _______,          _______, _______,          KC_HOME, KC_PGDN, KC_END
-  )
-};
-
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/readme.md b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/readme.md
deleted file mode 100644
index 91306e82af0..00000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/ai03/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The ai03 keymap for KBD67 MKII
-
-Tweaked slightly for more functionality closer to home position.
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/king/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/king/keymap.c
deleted file mode 100644
index 2158d6d1263..00000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/king/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
- /* Copyright 2020 King Wang Wong 
-  * 
-  * 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: _QWERTY
-     * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬───────┬───────┬─────────┐
-     * │ 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_INS│ 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 │
-     * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────┼─────────┤
-     * │    CTRL        │ 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   │ MO(1)   │
-     * ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴───────┬─┴─────────┼─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───┬─────────┼─────────┼─────────┤
-     * │  KC_LCTL  │  KC_LGUI  │  KC_LALT  │       KC_SPC          │    MO(1)  │        KC_BSPC            │ KC_RALT │ KC_RCTL │     │ KC_LEFT │ KC_DOWN │ KC_RGHT │
-     * └───────────┴───────────┴───────────┴───────────────────────┴───────────┴───────────────────────────┴─────────┴─────────┴─────┴─────────┴─────────┴─────────┘
-     */
-    [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_GRV, KC_INS,    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_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_PGDN,
-        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_UP,    MO(1),
-        KC_LCTL,  KC_LGUI,  KC_LALT,           KC_SPC,       MO(1),                 KC_BSPC,                 KC_RALT,  KC_RCTL,        KC_LEFT,  KC_DOWN,  KC_RGHT
-    ),
-
-    /* 1: _FN1
-     * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬───────┬───────┬─────────┐
-     * │ GRAVE   │ 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) │ QK_BOOT   │
-     * ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──┴───────┼─────────┤
-     * │   _______    │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │  _______ │ KC_VOLU │
-     * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────┼─────────┤
-     * │    CAPS        │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │     _______      │ KC_VOLD │
-     * ├────────────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────────┬─────────┼─────────┤
-     * │     _______         │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │    _______  │ _______ │ _______ │
-     * ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───┬─────────┼─────────┼─────────┤
-     * │  _______  │  _______  │  _______  │                            _______                            │ _______ │ _______ │     │ _______ │ _______ │ _______ │
-     * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────┴─────────┴─────────┴─────────┘
-     */
-    [1] = LAYOUT_all(
-        QK_BOOT,   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_MUTE,
-        _______,   _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______, _______,          _______,        KC_VOLU,
-        KC_CAPS,    _______, KC_LEFT,  KC_DOWN, KC_RIGHT, KC_PGDN,  _______, _______, _______, _______, _______, _______,            _______,        KC_VOLD,
-        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     _______,
-        _______, _______, _______,          _______,          _______,          _______,          _______, _______,            _______, _______,     _______
-    )
-};
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
deleted file mode 100644
index b1bdefb4d4f..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base layer
-   * ,--------------------------------------------------------------------------------------------------.
-   * |Esc ~|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  Backspace  | Home |
-   * |-------------------------------------------------------------------------------------------+------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \     | End  |
-   * |-------------------------------------------------------------------------------------------+------+
-   * | CtrlCaps |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     Enter    | PgUp |
-   * |-------------------------------------------------------------------------------------------+------+
-   * | Shift      |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |   MO(2)    | Up  | PgDn |
-   * +-------------------------------------------------------------------------┬---┬-------------+------+
-   * | LCtrl | LGUI | LAlt |               Space                 | Btn2 | MO(1)|   | Left  |Down | Right|
-   * `-------------------------------------------------------------------------┘   └-------------+------´
-   */
-    [0] = LAYOUT_65_ansi_blocker( /* Base */
-        QK_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_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, 
-        CTL_T(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,  MO(2),             KC_UP,     KC_PGDN,
-        KC_LCTL,       KC_LGUI,  KC_LALT,                KC_SPC,                KC_BTN2,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT
-    ),
-
-    [1] = LAYOUT_65_ansi_blocker( /* MO(1) - Fn */
-        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,
-        _______,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,  KC_PGUP,
-        CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          EE_CLR,   KC_PGDN,
-        KC_LSFT,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          KC_VOLU,  KC_MUTE,
-        _______,       _______,  _______,                  _______,                   _______,          _______,  KC_MPRV,          KC_VOLD,  KC_MNXT
-    ),
-
-    [2] = LAYOUT_65_ansi_blocker( /* MO(2) - RShift */
-        QK_GESC,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
-        LCTL(KC_L),    _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
-        _______,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,           _______, _______,
-        _______,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,           _______, _______,
-        _______,       _______,  _______,                  _______,                   _______,          _______,  _______,           _______, _______
-    )
-};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/rules.mk
deleted file mode 100644
index a4a9db461bc..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE   = yes
-NKRO_ENABLE       = yes
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/config.h
deleted file mode 100644
index 02bde2d2177..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2020 Christian Eiden, cykedev
-//
-// 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
-
-#undef DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
deleted file mode 100644
index 20921aff80b..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2020 Christian Eiden, cykedev
-//
-// 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
-
-// layers, ordering is important!
-enum layers {
-    _BASE,
-    _FN1,
-    _FN2,
-    _FN3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	/* Base layer
-  * ,--------------------------------------------------------------------------------------------------.
-  * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  Backspace  | `    |
-  * |-------------------------------------------------------------------------------------------+------+
-  * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \     | Del  |
-  * |-------------------------------------------------------------------------------------------+------+
-  * | MO(_FN2) |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     Enter    | PgUp |
-  * |-------------------------------------------------------------------------------------------+------+
-  * | Shift      |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |   Shift    | Up  | PgDn |
-  * +-------------------------------------------------------------------------┬---┬-------------+------+
-  * | LCtrl | LAlt | LGUI |               Space                 | RGUI | RAlt |   | Left  | Dn  | Rght |
-  * `-------------------------------------------------------------------------┘   └-------------+------´
-  */
-	[_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_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_DEL,
-		MO(_FN1),  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_LALT,   KC_LGUI,                         KC_SPC,                                     KC_RGUI,   OSM(MOD_RALT),             KC_LEFT,   KC_DOWN,   KC_RGHT
-		),
-
-  /* FN 1 layer
-  * ,--------------------------------------------------------------------------------------------------.
-  * |     |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |             | Mute |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |        |     |     |     |     |     |     |     |     |     |     | Br - |Br +|          | Ins  |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |          |     |     |     |     |     | Lft | Dwn | Up  | Rgt |     |     |              | Home |
-  * |-------------------------------------------------------------------------------------------+------+
-  * | MO(_FN2)   |     |     |     |     |     |     |     |     |     |     |            | V + | End  |
-  * +-------------------------------------------------------------------------┬---┬-------------+------+
-  * |       |      |      |                                     |      |      |   | Prev  | V - | Next |
-  * `-------------------------------------------------------------------------┘   └-------------+------´
-  */
-	[_FN1] = LAYOUT_65_ansi_blocker(
-		_______,    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_MUTE,
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_BRID,   KC_BRIU,   _______,   KC_INS,
-		_______,   _______,   _______,   _______,   _______,   _______,   KC_LEFT,   KC_DOWN,   KC_UP,     KC_RGHT,   _______,   _______,              _______,   KC_HOME,
-		MO(_FN2),  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              KC_VOLU,   KC_END,
-		_______,   _______,   _______,                         _______,                                    _______,   _______,              KC_MRWD,   KC_VOLD,   KC_MFFD
-		),
-
-	/* FN 2 layer
-  * ,--------------------------------------------------------------------------------------------------.
-  * |     |     |     |     |     |     |     |     |     |     |     |     |     |     Reset   | EEPR |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |        |     |     |     |     |     |     |     |     |     |     | Mo- | Mo+ |          |Solid |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |          |     |     |     |     |     |     |     |     |     | Sp- | Sp+ |              |  V + |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |            |     |     |     |     |     |     |     |     |     |     |            | S + |  V - |
-  * +-------------------------------------------------------------------------┬---┬-------------+------+
-  * |       |      |      |             Backlight               |      |      |   |  H -  | S - |  H + |
-  * `-------------------------------------------------------------------------┘   └-------------+------´
-  */
-	[_FN2] = LAYOUT_65_ansi_blocker(
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   QK_BOOT,   EE_CLR,
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_RMOD,  RGB_MOD,   _______,   RGB_M_P,
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_SPD,   RGB_SPI,              _______,   RGB_VAI,
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              RGB_SAI,   RGB_VAD,
-		_______,   _______,   _______,                         RGB_TOG,                                    _______,   _______,              RGB_HUD,   RGB_SAD,   RGB_HUI
-    ),
-
-  /* FN 3 layer
-  * ,--------------------------------------------------------------------------------------------------.
-  * |     |     |     |     |     |     |     |     |     |     |     |     |     |             |      |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |        |     |     |     |     |     |     |     |     |     |     |     |     |          |      |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |          |     |     |     |     |     |     |     |     |     |     |     |              |      |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |            |     |     |     |     |     |     |     |     |     |     |            |     |      |
-  * +-------------------------------------------------------------------------┬---┬-------------+------+
-  * |       |      |      |                                     |      |      |   |       |     |      |
-  * `-------------------------------------------------------------------------┘   └-------------+------´
-  */
-  [_FN3] = LAYOUT_65_ansi_blocker(
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              _______,   _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              _______,   _______,
-    _______,   _______,   _______,                         _______,                                    _______,   _______,              _______,   _______,   _______
-    )
-};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h
deleted file mode 100644
index bb3409256c1..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019 dnsnrk 
- * 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
-
-/* place overrides here */
-#undef DEBOUNCE
-#define DEBOUNCE 8
-#undef TAPPING_TOGGLE
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
deleted file mode 100644
index 826977fbf50..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2019 dnsnrk
- * 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 RC_ENT RCTL_T(KC_ENT)
-#define LC_CPS LCTL_T(KC_CAPS)
-
-enum {
-      _LAYER0 = 0,
-      _LAYER1,
-      _LAYER2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_LAYER0] = LAYOUT_65_ansi_blocker( /* Base Layer */
-                                       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_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_PGUP,
-                                       LC_CPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           RC_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,     TT(2),
-                                       KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           TT(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
-    [_LAYER1] = LAYOUT_65_ansi_blocker( /* FN, RGB Controls */
-                                       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_PWR,
-                                       _______,  RGB_TOG,  RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME,
-                                       _______,  RGB_RMOD, RGB_SPD, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_END,
-                                       _______,  _______,  _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______,          _______, RGB_VAI, _______,
-                                       _______,  _______,  _______,                   _______,                   _______,          _______,          RGB_HUD, RGB_VAD, RGB_HUI),
-    [_LAYER2] = LAYOUT_65_ansi_blocker( /* Media, Programming */
-                                       _______,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE,  KC_VOLD, KC_VOLU, KC_EJCT, _______,
-                                       _______,  _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
-                                       _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______, _______,
-                                       _______,  _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______,  _______,          _______, _______, _______,
-                                       _______,  _______, _______,                   _______,                   _______,           _______,          _______, _______, _______)
-};
-
-void set_hsv_at(HSV hsv, uint8_t index);
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-bool rgb_matrix_indicators_user(void) {
-    if (rgb_matrix_config.enable) {
-        HSV hsv = rgb_matrix_config.hsv;
-        if (host_keyboard_led_state().caps_lock) {
-            HSV hsv_inv_hue = {hsv.h + 128, hsv.s, hsv.v};
-            set_hsv_at(hsv_inv_hue, 30);
-        }
-        // indicate which higher layer is currently active on which key
-        HSV hsv1 = {hsv.h - 64, hsv.s, hsv.v};
-        HSV hsv2 = {hsv.h + 64, hsv.s, hsv.v};
-        // except when we are in any animated LED mode
-        if (rgb_matrix_config.mode < RGB_MATRIX_BREATHING || rgb_matrix_config.mode > RGB_MATRIX_JELLYBEAN_RAINDROPS) {
-            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-                    keypos_t pos = {col, row};
-                    uint8_t key_layer = layer_switch_get_layer(pos);
-                    uint8_t key_led = g_led_config.matrix_co[row][col];
-                    if (key_led != NO_LED) {
-                        switch(key_layer) {
-                        case _LAYER2:
-                            set_hsv_at(hsv2, key_led);
-                            break;
-                        case _LAYER1:
-                            set_hsv_at(hsv1, key_led);
-                            break;
-                        default:
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        // sticky layer indicators regardless of RGB mode. Hardcoded for lack of better idea.
-        set_hsv_at(hsv1, 63);
-        set_hsv_at(hsv2, 57);
-    }
-    return false;
-}
-
-void set_hsv_at(HSV hsv, uint8_t index) {
-    RGB rgb = hsv_to_rgb(hsv);
-    rgb_matrix_set_color(index, rgb.r, rgb.g, rgb.b);
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/readme.md
deleted file mode 100644
index 5554b03e5de..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# dnsnrk's KDB67 MKII Layout
-
-* This is a three layer layout wih some consolidated functionality in the second and third layer.
-* The keyboard is mostly used on macOS, but also on Linux and therefore it can swap ALT/CMD.
-* There are additional CTRL keys for left and right when caps lock or enter key is held.
-* Layers can be toggled (tap twice) or actived momentarily (hold).
-* There are 2 seperate FN keys to activate layer 1 and 2 separately, indicated by different RGB colors.
-* The main custom feature is using RGB to indicate the current active layer for each key. This is best achieved in solid color RGB modes.
-
-## Layer 0
-
-This is the base QUERTY layer.
-
-* Grave is provided in the top right corner.
-* Caps lock is tapped once on and off and indicated by hue inverted LED when on.
-* Caps lock and enter become CTRL when held.
-* Primary Fn in the last row activates layer 1, indicated by hue shifted LED color.
-* Secondary Fn right to the up arrow key activates layer 2, indicated by 2nd hue shifted LED color.
-* Toggle layers by tapping Fn twice or switch on by holding Fn.
-
-## Layer 1
-
-This layer activates function keys and provides RGB controls. Keys acting on this layer are indicated by an LED color matching the current Fn key's LED color.
-
-* Number keys become equivalent function keys.
-* ESC becomes Grave.
-* Grave becomes POWER (very useful on macOS only).
-* Q toggles RGB.
-* WASD for navigating through RGB modes and adjusting speed.
-* <> control RGB saturation.
-* Arrow keys shift hue and adjust brightness.
-* PgUp, PgDown become HOME and END respectively.
-* Backspace acts as delete, pipe as insert.
-
-## Layer 2
-
-This layer comprises most macOS media keys at the top row and some additional programming options. Keys acting on this layer are indicated by an LED color matching the current Fn key's LED color.
-
-* N, M swap ALT/CMD for (N)ormal or (M)acOS.
-* E resets (E)EPROM.
-* R (R)esets keyboard.
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/import-for-qmk-configurator/kemmeldev-4-layered-layout.json b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/import-for-qmk-configurator/kemmeldev-4-layered-layout.json
deleted file mode 100644
index c15ab8c85a0..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/import-for-qmk-configurator/kemmeldev-4-layered-layout.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"kbdfans/kbd67/mkiirgb","keymap":"default_37b6a2a","layout":"LAYOUT_65_ansi_blocker","layers":[["QK_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_CALC","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","MO(1)","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_RCTL","KC_LEFT","KC_DOWN","KC_RGHT"],["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_CALC","KC_CAPS","KC_BTN1","KC_MS_U","KC_BTN2","KC_WH_U","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UP","KC_PSCR","KC_SCRL","KC_PAUS","QK_BOOT","KC_MYCM","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_R","KC_WH_D","KC_TRNS","RGB_SAI","RGB_SAD","KC_LEFT","KC_DOWN","KC_RGHT","KC_TRNS","EE_CLR","KC_HOME","KC_LSFT","RGB_TOG","RGB_MOD","RGB_VAI","RGB_VAD","RGB_SPI","RGB_SPD","RGB_HUI","RGB_HUD","KC_TRNS","KC_TRNS","KC_TRNS","KC_VOLU","KC_MUTE","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","TO(2)","KC_MPRV","KC_VOLD","KC_MNXT"],["QK_GESC","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_BSPC","KC_CALC","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","MO(3)","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_TRNS","KC_LEFT","KC_DOWN","KC_RGHT"],["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_DEL","KC_CALC","KC_CAPS","KC_BTN1","KC_MS_U","KC_BTN2","KC_WH_U","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UP","KC_PSCR","KC_SCRL","KC_PAUS","QK_BOOT","KC_MYCM","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_R","KC_WH_D","KC_TRNS","RGB_SAI","RGB_SAD","KC_LEFT","KC_DOWN","KC_RGHT","KC_TRNS","EE_CLR","KC_HOME","KC_LSFT","RGB_TOG","RGB_MOD","RGB_VAI","RGB_VAD","RGB_SPI","RGB_SPD","RGB_HUI","RGB_HUD","KC_TRNS","KC_TRNS","KC_TRNS","KC_VOLU","KC_MUTE","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","TO(0)","KC_MPRV","KC_VOLD","KC_MNXT"]],"author":"","notes":""}
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
deleted file mode 100644
index 10ccb4ca469..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_65_ansi_blocker(QK_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_CALC, 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, MO(1), 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_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-	[1] = LAYOUT_65_ansi_blocker(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_CALC, KC_CAPS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_MYCM, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_TRNS, RGB_SAI, RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, EE_CLR, KC_HOME, KC_LSFT, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(2), KC_MPRV, KC_VOLD, KC_MNXT),
-	[2] = LAYOUT_65_ansi_blocker(QK_GESC, 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_BSPC, KC_CALC, 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, MO(3), 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_TRNS, KC_LEFT, KC_DOWN, KC_RGHT),
-	[3] = LAYOUT_65_ansi_blocker(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_DEL, KC_CALC, KC_CAPS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_MYCM, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_TRNS, RGB_SAI, RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, EE_CLR, KC_HOME, KC_LSFT, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_MPRV, KC_VOLD, KC_MNXT)
-};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
deleted file mode 100644
index 4fe0b20d9bb..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
+++ /dev/null
@@ -1 +0,0 @@
-[["QK_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_CALC", "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", "MO(1)", "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_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["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_CALC", "KC_CAPS", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_WH_U", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_PSCR", "KC_SCRL", "KC_PAUS", "QK_BOOT", "KC_MYCM", "KC_TRNS", "KC_MS_L", "KC_MS_D", "KC_MS_R", "KC_WH_D", "KC_TRNS", "RGB_SAI", "RGB_SAD", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "EE_CLR", "KC_HOME", "KC_LSFT", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_VAD", "RGB_SPI", "RGB_SPD", "RGB_HUI", "RGB_HUD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "TO(2)", "KC_MPRV", "KC_VOLD", "KC_MNXT"], ["QK_GESC", "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_BSPC", "KC_CALC", "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", "MO(3)", "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_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["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_DEL", "KC_CALC", "KC_CAPS", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_WH_U", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_PSCR", "KC_SCRL", "KC_PAUS", "QK_BOOT", "KC_MYCM", "KC_TRNS", "KC_MS_L", "KC_MS_D", "KC_MS_R", "KC_WH_D", "KC_TRNS", "RGB_SAI", "RGB_SAD", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "EE_CLR", "KC_HOME", "KC_LSFT", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_VAD", "RGB_SPI", "RGB_SPD", "RGB_HUI", "RGB_HUD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "TO(0)", "KC_MPRV", "KC_VOLD", "KC_MNXT"]]
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/readme.md
deleted file mode 100644
index 8a7b230dbf4..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/readme.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Layout description
-
-* This layout features 4 layers. The caps lock key has been replaced by the FN key.
-* The first layer features ESC/~ and numbers and symbols on the top row of the keyboard.
-* The top right key launches calculator.
-* Pressing the FN key activates a temporary second layer. This layer contains:
-	* ESC/~ is now `/~
-	* WASD to move your mouse up, left, down, right respectively.
-		* Q and E click left and right mouse respectively.
-		* R and F scroll mousewheel up and down respectively.
-	* IJKL act as up, left, down, right arrows respectively.
-	* UP/DOWN keys act as volume UP/DOWN
-	* LEFT/RIGHT keys act as previous/next track.
-	* The key below the calculator key launches 'This PC'
-	* RGB Controls
-		* Z toggles ON/OFF
-		* X toggles RGB_MODE
-		* C and V increase/decrease brightness
-		* B and N increase/decrease effect
-		* M and , increase/decrease hue
-		* H and J increase/decrease saturation
-* Pressing RIGHT CTRL whilst holding the FN key allows you to swap to the third layer.
-	* This layer can switch to the fourth layer by holding the FN key.
-* The third and fourth layer are essentially copies of the first and second layer and offer the same functionalities, however the third and fourth layer have the F-keys and Num/Symbol keys swapped.
-
-## Layer 0
-
-![](https://i.imgur.com/9U9PaTw.png)
-
-## Layer 1
-
-![](https://i.imgur.com/rqqjiyn.png)
-
-## Layer 2
-
-![](https://i.imgur.com/A7YkrTF.png)
-
-## Layer 3
-
-![](https://i.imgur.com/sxJ1ocF.png)
-
-# Generated Keymap Layout
-
-This layout was generated by the QMK API. You can find the JSON data used to
-generate this keymap in the file layers.json.
-
-To make use of this file you will need follow the following steps:
-
-* Download or Clone QMK Firmware: <https://github.com/qmk/qmk_firmware/>
-* Extract QMK Firmware to a location on your hard drive
-* Copy this folder into %s
-* You are now ready to compile or use your keymap with the source
-
-More information can be found in the QMK docs: <https://docs.qmk.fm>
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
deleted file mode 100644
index 5f7977e5b5b..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_65_ansi_blocker(
-		QK_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_INS,  
-		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_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_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_CAPS, KC_LGUI, KC_LALT, KC_SPC, 					      KC_RALT, MO(1), 		KC_LEFT, KC_DOWN, KC_RGHT  
-	),
-	[1] = LAYOUT_65_ansi_blocker(
-		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_DEL,  
-		_______, _______,  RGB_VAI, _______, _______, RGB_SAI, RGB_HUI, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,  
-		_______, RGB_SPD,  RGB_VAD, RGB_SPI, _______, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, 	       KC_VOLU, 
-		_______, RGB_RMOD, RGB_TOG, RGB_MOD, _______, _______, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, _______, 	      KC_PGUP, KC_VOLD, 
-		_______, _______,  _______, _______, 						  _______, _______,	     KC_HOME, KC_PGDN, KC_END   
-	)
-};
-
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/readme.md
deleted file mode 100644
index 7e681294f2f..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for hotswap
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
deleted file mode 100644
index dcc998f035d..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Pascal Pfeil
- *
- * 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
-
-/* 1000Hz USB polling */
-#define USB_POLLING_INTERVAL_MS 1
-
-/* Force NKRO on boot up */
-#define FORCE_NKRO
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    undef RGB_MATRIX_TIMEOUT
-#    define RGB_MATRIX_TIMEOUT 900000
-#endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
deleted file mode 100644
index df4bceed3f8..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Pascal Pfeil
- *
- * 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_blocker( 
-		QK_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_PSCR,
-		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_HOME,
-		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,                LT(1, KC_SPC),         KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT
-	),
-	[1] = LAYOUT_65_ansi_blocker( 
-		QK_GESC,       KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  BS_NORM,  RGB_VAI,
-		KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, BS_SWAP,  RGB_HUI,
-		KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          RGB_TOG,  RGB_SPI,
-		KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS,  RGB_MOD,
-		KC_TRNS,       AG_NORM,  AG_SWAP,                   KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS
-	),
-	[2] = LAYOUT_65_ansi_blocker( 
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_65_ansi_blocker( 
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h
deleted file mode 100644
index c66f49213a1..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2022 spx01 (@spx01)
- *
- * 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
-
-/* --- custom defines only used in my own code --- */
-
-/* easily switch on debugging features */
-#define CUSTOM_DEBUG false
-
-/* hexrgb mode special keys, these shouldn't be KC_A to KC_F or KC_0 to KC_9 */
-/* keycode that triggers saving the current rgb_static color into eeprom */
-#define HEXRGB_SAVE_KC KC_S
-/* keycode that triggers resetting rgb_static to the color saved in the eeprom */
-#define HEXRGB_RESET_KC KC_R
-
-/* --- keyboard configuration macros --- */
-
-#if CUSTOM_DEBUG
-#    define NO_DEBUG
-#    define NO_PRINT
-#endif
-
-#define RETRO_TAPPING
-#define PERMISSIVE_HOLD
-
-#undef RGB_MATRIX_DEFAULT_MODE
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CUSTOM_RGB_STATIC
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
deleted file mode 100644
index 8c814b86bbd..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Copyright 2022 spx01 (@spx01)
- *
- * 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 "print.h"
-
-enum CustomKeycodes {
-    CK_HEXRGB = SAFE_RANGE,
-    /* esc when shift is held, grave otherwise; particularly useful for windows' task manager shortcut */
-    CK_ESCG,
-};
-
-enum Layers {
-    _LAYER1,
-    _LAYER2,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // clang-format off
-    [_LAYER1] = LAYOUT_65_ansi_blocker( 
-        QK_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_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,
-        LT(_LAYER2, 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_RIGHT),
-    [_LAYER2] = LAYOUT_65_ansi_blocker( 
-        CK_ESCG,  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_TRNS, EE_CLR,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,   KC_TRNS, KC_TRNS, QK_BOOT,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, CK_HEXRGB, KC_MPLY,          KC_VOLU,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                    RGB_TOG,                   KC_TRNS,          KC_TRNS,   KC_MPRV,          KC_VOLD,  KC_MNXT),
-    /* [] = LAYOUT_65_ansi_blocker(
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                     KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS), */
-    // clang-format on
-};
-
-/* exported by the rgb_static effect */
-void           RGB_STATIC_save_eeprom(void);
-void           RGB_STATIC_reset(void);
-extern uint8_t g_rgb_static_color[3];
-
-/* returns number corresponding to hex digit represented by keycode or -1 if keycode isn't a valid hex digit */
-static int8_t key_hexdigit(uint16_t keycode) {
-    if (keycode >= KC_A && keycode <= KC_F) {
-        return keycode - KC_A + 10;
-    }
-    if (keycode >= KC_1 && keycode <= KC_0) {
-        int8_t res = keycode - KC_1 + 1;
-        /* mod 10 considering res is between 1 and 10 */
-        res *= res != 10;
-        return res;
-    }
-    return -1;
-}
-
-typedef struct {
-    bool    active;
-    uint8_t color[3];
-    uint8_t count;
-} RGBHexState;
-static RGBHexState hexrgb;
-
-/* handles input mode for an rgb value */
-static void hexrgb_input(uint16_t keycode) {
-    /* only check for special keys when input mode has just been triggered */
-    if (hexrgb.count == 0) {
-        switch (keycode) {
-            case HEXRGB_SAVE_KC:
-                RGB_STATIC_save_eeprom();
-                hexrgb.active = false;
-                return;
-            case HEXRGB_RESET_KC:
-                RGB_STATIC_reset();
-                hexrgb.active = false;
-                return;
-            default:
-        }
-    }
-
-    int8_t digit = key_hexdigit(keycode);
-    /* exit input mode if an invalid key has been pressed */
-    if (digit == -1) {
-        hexrgb.count = 0;
-        hexrgb.active = false;
-        return;
-    }
-
-    /* append digit to current color */
-    uint8_t idx = hexrgb.count / 2;
-    hexrgb.color[idx] <<= 4;
-    hexrgb.color[idx] |= digit;
-
-    ++hexrgb.count;
-    /* done with input */
-    if (hexrgb.count == 6) {
-        hexrgb.active = false;
-        hexrgb.count  = 0;
-        /* copy color to rgb_static's buffer */
-        for (int8_t i = 0; i < 3; ++i) {
-            g_rgb_static_color[i] = hexrgb.color[i];
-            hexrgb.color[i]       = 0;
-        }
-    }
-}
-
-void keyboard_post_init_user(void) {
-#if CUSTOM_DEBUG
-    debug_enable = true;
-    debug_matrix = true;
-#endif
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    /* shift status last time ck_escg was pressed so that the correct key can be released */
-    static bool ck_escg_last_shifted;
-
-    if (hexrgb.active && record->event.pressed) {
-        hexrgb_input(keycode);
-        /* while in input mode nothing passes through */
-        return false;
-    }
-
-    switch (keycode) {
-        case CK_HEXRGB:
-            hexrgb.active = record->event.pressed;
-            return false;
-        case CK_ESCG:
-            /* if pressed, inject key, otherwise delete it */
-            if (record->event.pressed) {
-                bool shifted = get_mods() & MOD_BIT(KC_LSFT);
-                add_key(shifted ? KC_ESC : KC_GRV);
-                ck_escg_last_shifted = shifted;
-            } else {
-                del_key(ck_escg_last_shifted ? KC_ESC : KC_GRV);
-            }
-            send_keyboard_report();
-            return false;
-        default:
-    }
-    return true;
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/readme.md
deleted file mode 100644
index 86b90772b02..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# spx01's KBD67 MKIIRGB Layout
-
-This is a fairly simple QWERTY 2 layer layout, full list of particularities below:
-
-* Besides Fn acting like a standard layer switch, CapsLock is set to switch to layer 2 while held and activate CapsLock when tapped.
-* The Esc key/grave key (top left) is set to QMK's "Grave Escape" (sends Esc when tapped alone, Grave when tapped together with Shift/Ctrl/GUI), but on the 2nd layer it's set to the CK_ESCG custom keycode, acting like grave when tapped alone and as Esc when Shift is also held down. This means that there is easy access to both the characters (grave and tilde) and the Esc key while also allowing for shortcuts such as Ctrl+Shift+Esc with Ctrl+Shift+Caps+Esc (the Windows Task Manager shortcut).
-* The default RGB Matrix effect is set to a custom one, RGB_STATIC, which sets a solid RGB color based on a global variable, featuring EEPROM saving and automatic loading independent on the HSV EEPROM memory that the standard effects use. This was done in order to accomodate the next feature.
-* The HexRGB mode is triggered by pressing the '/' key in the second layer (CK_HEXRGB) and enables the user to type a 6 digit hexadecimal color code that is then stored as the color for the RGB_STATIC effect. If any invalid key is pressed during color input, the keymap will go back to its normal behavior without any changes to RGB.
-* Besides keys representing hexadecimal digits (0-9 and a-f), there are also 2 more keys that provide functionality in the HexRGB input mode (only as a first keypress). HEXRGB_SAVE_KC (set by default to S) triggers the RGB_STATIC effect to save the currently set RGB color to EEPROM and the HEXRGB_RESET_KC (set by default to R) resets the RGB color to the one currently saved in EEPROM. These 2 keys can be reassigned in config.h.
-
-Various 2nd layer keys:
-* 1 to '+' for F1-12
-* P for PrtSc/Print
-* Backspace for Delete
-* Home (top right key) for Insert
-* E for resetting EEPROM
-* '\\' for bootloader mode
-* Space for toggling RGB on or off
-* Right Shift for pausing media
-* Left/Right for previous track/next track
-* Up/Down for volume up/down
-
-**Note: I disabled VIA in rules.mk because I don't use it, but there is enough memory space for it to be enabled.**
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rgb_matrix_user.inc b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rgb_matrix_user.inc
deleted file mode 100644
index 85c4dc2cad5..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rgb_matrix_user.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2022 spx01 (@spx01)
- *
- * 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/>.
- */
-
-RGB_MATRIX_EFFECT(RGB_STATIC)
-
-#define UNWRAP_RGB_PARAMS(x) x[0], x[1], x[2]
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-/* eeprom saved data structure */
-typedef struct {
-    union {
-        uint32_t whole;
-        uint8_t  rgb[3];
-    };
-} UserData;
-
-uint8_t g_rgb_static_color[3];
-
-/* save current colors to eeprom */
-void RGB_STATIC_save_eeprom(void) {
-    UserData data = {0};
-    for (int8_t i = 0; i < 3; ++i) {
-        data.rgb[i] = g_rgb_static_color[i];
-    }
-    eeconfig_update_user(data.whole);
-}
-
-/* initialize by loading the eeprom colors */
-static void RGB_STATIC_init(void) {
-    UserData data;
-    data.whole = eeconfig_read_user();
-    for (int8_t i = 0; i < 3; ++i) {
-        g_rgb_static_color[i] = data.rgb[i];
-    }
-}
-
-/* reset colors to eeprom values */
-void RGB_STATIC_reset(void) {
-    RGB_STATIC_init();
-}
-
-static bool RGB_STATIC(effect_params_t *params) {
-    if (params->init) {
-        RGB_STATIC_init();
-    }
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    for (uint8_t i = led_min; i < led_max; i++) {
-        RGB_MATRIX_TEST_LED_FLAGS();
-        rgb_matrix_set_color(i, UNWRAP_RGB_PARAMS(g_rgb_static_color));
-    }
-    return rgb_matrix_check_finished_leds(led_max);
-}
-
-#endif
-#undef UNWRAP_RGB_PARAMS
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rules.mk
deleted file mode 100644
index 2700c035cc0..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = no
-LTO_ENABLE = yes
-CONSOLE_ENABLE = no
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
index 51b88510e5e..55778834015 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h
@@ -1,62 +1,4 @@
 #pragma once
 
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#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
-// #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 RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 32
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
index 7b6795f07f6..adac32cc74f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
@@ -5,7 +5,42 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"],
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
index c70622dd56c..210be85d3ff 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c
@@ -16,7 +16,7 @@
 
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 
     {0, C8_8, C7_8, C6_8},     // LA17
     {0, C9_8, C7_7, C6_7},     // LA16
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
index bba655107dc..55778834015 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
@@ -1,63 +1,4 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-// 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
-// #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 255
-#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#    define DRIVER_1_LED_TOTAL 35
-#    define DRIVER_2_LED_TOTAL 32
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
index e0fe90b6f3f..9285255f36f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
@@ -5,7 +5,39 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
index 7de8060d7a7..50958017a2b 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c
@@ -16,7 +16,7 @@
 
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 
     {0, C8_8,  C7_8, C6_8},   // LA17
     {0, C9_8,  C7_7, C6_7},   // LA16
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
index 8dd12678ee8..1d924ae1eaf 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@@ -16,63 +16,6 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define USB_SUSPEND_WAKEUP_DELAY 5000
-#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
-// #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_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define RGB_MATRIX_LED_COUNT 67
-#define DRIVER_INDICATOR_LED_TOTAL 0
-#endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
index 284461c2a75..1fd3448de49 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
@@ -5,8 +5,42 @@
         "device_version": "0.0.3"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "is31fl3741",
-        "val_steps": 8
+        "val_steps": 8,
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 7347a365bce..0b40afadf9b 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -18,79 +18,79 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {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, CS24_SW7, CS23_SW7, CS22_SW7},
-
-    {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, 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, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
-
-    {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, 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, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
-
-    {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, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
-
-    {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, 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_SW7, CS38_SW7, CS37_SW7}
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
+
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
+
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
+
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
+
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+//    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}
 
 };
 
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index 10f0bc0ec2d..8ed4d909cb4 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -18,59 +18,4 @@
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
-#define RGB_MATRIX_LED_COUNT 68
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-// 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
-// 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
-#endif
-
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
index a1ec2a18334..0f05bd24d05 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
@@ -23,10 +23,40 @@
         "pin": "C7"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
+        "max_brightness": 150,
         "sat_steps": 8,
         "val_steps": 8,
-        "speed_steps": 10
+        "speed_steps": 10,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index 10f0bc0ec2d..f20015619bb 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -17,60 +17,4 @@
 #pragma once
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
-
-#define RGB_MATRIX_LED_COUNT 68
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-// 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
-// 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
-#endif
-
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
index cb8912f9a46..8bbfc9a1500 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
@@ -12,10 +12,40 @@
         "pin": "C7"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
         "sat_steps": 8,
         "val_steps": 8,
-        "speed_steps": 10
+        "speed_steps": 10,
+        "max_brightness": 150,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json
index f279c5a2c95..ba91317906b 100644
--- a/keyboards/kbdfans/kbd67/rev1/info.json
+++ b/keyboards/kbdfans/kbd67/rev1/info.json
@@ -8,10 +8,24 @@
     "pid": "0x6066",
     "device_version": "0.0.1"
   },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "backlight": true,
+    "rgblight": true
+  },
   "matrix_pins": {
     "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F5"],
     "rows": ["D0", "D1", "D2", "D3", "D5"]
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
@@ -38,7 +52,6 @@
       "knight": true,
       "christmas": true,
       "static_gradient": true,
-      "alternating": true,
       "twinkle": true
     }
   },
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h b/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h
deleted file mode 100644
index 90fb10ebbee..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 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
-
-#define LAYER_STATE_8BIT
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
index 21ff6843b3d..50a8bdfee08 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
@@ -15,12 +15,6 @@
  */
 #include QMK_KEYBOARD_H
 
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap (Base Layer) Default Layer
    * ,----------------------------------------------------------------.
@@ -63,25 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
 
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/config.h b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/config.h
deleted file mode 100644
index f4d7de06e5a..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Daisuke Kobayashi
- *
- * 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
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
deleted file mode 100644
index 0000d791b31..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2019 Daisuke Kobayashi
- *
- * 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_japanese.h"
-
-#define RGB_RMO RGB_RMOD
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  ^|  \|BS |Del |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  @|  [| Ent |PgUp|
-   * |------------------------------------------------------.    |----|
-   * |H/Z   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  ]|    |PgDn|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |PScr|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt | Space    |Fn | Space  |Alt |Ctrl|  |Lef|Dow|Rig |
-   * `------------------------------------------------'  `------------'
-   */
-[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, JP_CIRC, JP_YEN, 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,    JP_AT,   JP_LBRC, JP_RBRC,       KC_PGUP,
-  JP_ZKHK,       KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, JP_COLN,       KC_ENT,        KC_PGDN,
-  KC_LSFT, XXXXXXX, 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_PSCR,
-  KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,         MO(1),          KC_SPC,          KC_RALT, KC_RCTL, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |Rst| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |   |Ins |
-   * |----------------------------------------------------------------|
-   * |     |M- |M+ |RGB|H- |H+ |   |   |Prt|SLk|Pau|   |   |     |    |
-   * |------------------------------------------------------.    |----|
-   * |Caps  |Vo-|Vo+|Mut|S- |S+ |  *|  /|Hom|PUp|   |   |   |    |    |
-   * |----------------------------------------------------------------|
-   * |        |BL-|BL+|BL |V- |V+ |  +|  -|End|PDn|  _|      |PUp|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    | Muhenkan |   | Henkan |Kana|Menu|  |Hom|PDn|End |
-   * `------------------------------------------------'  `------------'
-   */
-[1] = LAYOUT_all(
-   QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,
-   _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______,
-   KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______,
-   _______,_______,BL_DOWN,BL_UP,  BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______,
-   _______,_______,_______,        JP_MHEN,        _______,        JP_HENK,        JP_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
-};
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/readme.md b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/readme.md
deleted file mode 100644
index b432436d405..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Koba's keymap for KBD67
-
-![keyboard-layout](https://user-images.githubusercontent.com/1042121/54736578-244ffe80-4bef-11e9-9882-37611b4efdf4.png)
-
-- JIS layout.
-- Fn layer is arranged like HHKB.
-- 3 splitted space bar. (Space-Fn-Space)
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/config.h b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/config.h
deleted file mode 100644
index a3ed4f762a6..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 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
-
-// place overrides here
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
deleted file mode 100644
index 228f6483197..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2018 '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
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |   ~|
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | Del|
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[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_GRAVE,
-  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_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_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),
-
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |Caps |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |End|PDn|Dow|      |PUp|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |Hom|PDn|End |
-   * `----------------------------------------------------------------'
-   */
-[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_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,
-      _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,KC_PGUP,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/readme.md b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/readme.md
deleted file mode 100644
index dfa800d17c2..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# The default keymap for kbd67
-
-```
-/* Keymap (Base Layer) Default Layer
- * ,----------------------------------------------------------------.
- * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |   ~|
- * |----------------------------------------------------------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | Del|
- * |----------------------------------------------------------------|
- * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
- * |----------------------------------------------------------------|
- * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
- * |----------------------------------------------------------------|
- * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
- * `----------------------------------------------------------------'
- */
-```
-
-```
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |Caps |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |End|PDn|Dow|      |PUp|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |Hom|PDn|End |
-   * `----------------------------------------------------------------'
-   */
-```
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c
index 755da6e5cf6..a25c5247320 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c
@@ -29,12 +29,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
    * `----------------------------------------------------------------'
    */
-[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_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_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_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+    [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_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_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_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
   /* Keymap Fn Layer
    * ,----------------------------------------------------------------.
@@ -49,27 +50,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    |    |    |                       |   |   |    |Hom|PDn|End |
    * `----------------------------------------------------------------'
    */
-[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_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,
-      _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,KC_PGUP,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
-
-
-[2] = LAYOUT_65_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,_______,
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,_______,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,_______,_______,_______),
-
-
-[3] = LAYOUT_65_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,_______,
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,_______,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,_______,_______,_______),
-
+    [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_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,
+          _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,_______,
+               _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,KC_PGUP,_______,
+        _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END
+    )
 };
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/via/readme.md b/keyboards/kbdfans/kbd67/rev1/keymaps/via/readme.md
deleted file mode 100644
index f32cf23932c..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The via keymap for kbd67
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/via/rules.mk b/keyboards/kbdfans/kbd67/rev1/keymaps/via/rules.mk
index 36b7ba9cbc9..1e5b99807cb 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/via/rules.mk
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/rev1/readme.md b/keyboards/kbdfans/kbd67/rev1/readme.md
index 0e9c66b2445..9c9e35202c8 100644
--- a/keyboards/kbdfans/kbd67/rev1/readme.md
+++ b/keyboards/kbdfans/kbd67/rev1/readme.md
@@ -10,4 +10,16 @@ Make example for this keyboard (after setting up your build environment):
 
     make kbdfans/kbd67/rev1:default
 
+Flashing example for this keyboard:
+
+    make kbdfans/kbd67/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 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 `QK_BOOT` if it is available
diff --git a/keyboards/kbdfans/kbd67/rev1/rules.mk b/keyboards/kbdfans/kbd67/rev1/rules.mk
index 99067f7d6a3..6e7633bfe01 100644
--- a/keyboards/kbdfans/kbd67/rev1/rules.mk
+++ b/keyboards/kbdfans/kbd67/rev1/rules.mk
@@ -1,12 +1 @@
-# 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 = yes        # 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 = no           # Audio output
+# This file intentionally left blank
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
deleted file mode 100644
index 9746ba09e66..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi(
-        QK_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_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_DEL,
-        LCTL_T(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_LALT, KC_LGUI,                            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_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_PGUP,
-        KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          EE_CLR,  KC_PGDN,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_MPLY, KC_VOLU, KC_MUTE,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_VOLD, KC_MFFD
-    )
-};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/adi/readme.md
deleted file mode 100644
index 638b067cb9b..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/adi/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Adi's KBD67 Layout
-![Layout Visual](https://i.imgur.com/xuFkvVI.png)
-
-This layout modifies the extra row on the right and makes some of the key bindings easier to reach on Layer 1.
-
-Build and flash your firmware: press reset button below keyboard and run build command in directory:
-
-```make kbdfans/kbd67/rev2:adi:flash```
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/config.h
deleted file mode 100644
index 2498b480c9d..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 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 5000
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/keymap.c
deleted file mode 100644
index e993f93fb53..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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,
-  OSM(MOD_LSFT),KC_Z         ,KC_X         ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT       ,KC_SLSH,OSM(MOD_RSFT)        ,KC_UP  ,KC_END ,
-  OSM(MOD_LCTL),OSM(MOD_LGUI),OSM(MOD_LALT),KC_SPC                                         ,OSM(MOD_RALT),OSL(1) ,OSM(MOD_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_INS ,
-   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,
-   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_TILDE,_______        ,_______,
-   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______        ,KC_PGUP,_______,
-   _______,_______,_______,_______                                                ,_______,_______,_______,KC_HOME,KC_PGDN,KC_END ),
-
-};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/readme.md
deleted file mode 100644
index 2e3d2a171bd..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# A keymap for kbd67 with some improvements for accessibility
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/rules.mk b/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/rules.mk
deleted file mode 100644
index 72bbe7ddb27..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/catrielmuller_camilad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONSOLE_ENABLE = no
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
deleted file mode 100644
index f6aa35176a6..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 
-Copyright 2022 Alex K
-
-This program is free software: you can redistribute it and/or modify 
-it under the terms of the GNU General Public License as published by 
-the Free Software Foundation, either version 2 of the License, or 
-(at your option) any later version. 
-
-This program is distributed in the hope that it will be useful, 
-but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-GNU General Public License for more details. 
-
-You should have received a copy of the GNU General Public License 
-along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/ 
-
-#pragma once
-
-/* USB Device descriptor parameter */
-#undef VENDOR_ID
-#undef MANUFACTURER
-#undef PRODUCT
-
-#define VENDOR_ID       0xAF88
-#define MANUFACTURER    "Droxx-FurFuzz"
-#define PRODUCT         "Carbon v2 4rk"
-
-/* force N key rollover even on startup regardless of EEPROM setting */
-#define FORCE_NKRO
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
deleted file mode 100644
index de845d163ce..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-// KBD67 Rev 2 ANSI Layout
-
-/* Copyright 2022 Alex K
- *
- * 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 "droxx.h"
-
-// make keycodes easier to change for the future
-#define DRXX        KC_TRNS
-
-// enumerate custom layer names for the keymap
-enum keymap_layers {
-    _DRXXMAIN = 0,
-    _DRXXFN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap Base Layer
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-   * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ BackSp│Hom│
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ BkSl│PgU│
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│
-   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ ↑ │End│
-   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-   * │Ctrl│ Win│ Alt│          Space         │Alt│Fn │Ctl│ ← │ ↓ │ → │
-   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-   */
-[_DRXXMAIN] = 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,     MO(_DRXXFN),     KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* Keymap Fn Layer
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-   * │~ `│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│    Del│Ins│
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │     │RM-│RB+│RM+│   │RTg│   │   │   │   │   │   │   │     │Pau│
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * │      │RS-│RB-│RS+│   │   │   │   │   │   │   │   │        │SLk│
-   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * │        │   │DGu│EGu│   │   │   │   │   │   │   │      │   │PSr│
-   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-   * │    │    │    │                        │   │   │   │   │   │   │
-   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-   */
-[_DRXXFN] = 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,
-  DRXX  ,   RGB_RMOD, RGB_VAI,  RGB_MOD,  DRXX,     RGB_TOG,  DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     KC_PAUS,
-  DRXX,     RGB_SPD,  RGB_VAD,  RGB_SPI,  DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,               DRXX,     KC_SCRL,
-  DRXX,     DRXX,     GUI_OFF,  GUI_ON,   DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,               DRXX,     KC_PSCR,
-  DRXX,     DRXX,     DRXX,                         DRXX,                         DRXX,          DRXX,          DRXX,     DRXX,     DRXX,     DRXX),
-};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md
deleted file mode 100644
index 26d686c977e..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md
+++ /dev/null
@@ -1,30 +0,0 @@
-## Droxx's ANSI style keymap for the KBD67 REV 2 PCB
-
-* An ANSI keymap layout made by Alex for the KBD67 Rev 2
-* This keymap features two layers using basic Fn alternate keys on the second layer as well as lighting control
-
-![KBD67Rev2 Layout](https://i.imgur.com/DPSMhIX.png)
-
-### Layer 0 (_DRXXMAIN)
-
-The base QWERTY layer
-
-* Basic qwerty key layout with nothing other than an Fn key
-* Fn on the bottom row activates layer 1
-
-### Layer 1 (_DRXXFN)
-
-The function layer
-
-* Backspace will trigger KC_DEL until I find the KC_HOME key less useful.
-* Pressing T will toggle the keyboard underglow feature on and off.
-* Keys Q and E are used to change the underglow style of the keyboard.
-* Keys W and S modify the brightness of the underglow.
-* Keys A and D change the speed of the LED RGB animation.
-
-~~When Fn is held on layer 0, the arrow keys become a control surface for the LED baclighting~~
-~~The up arrow is used to cycle backlight modes, down arrow for toggling the backlight on or off,~~
-~~and the right and left for increasing and decreasing the brightness respectively.~~[^note]
-* X is used to disable the GUI key and C is used to enable the GUI key.
-
-[^note]: I don't have in-switch LEDs installed?
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk
deleted file mode 100644
index c9b5587d59a..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = no
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
deleted file mode 100644
index 56c554ae5b9..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2018 jscatena88
- *
- * 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] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | `~ |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[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_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_DEL,
-  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_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),
-
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |Caps |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |End|PDn|Dow|      |PUp|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |Hom|PDn|End |
-   * `----------------------------------------------------------------'
-   */
-
-[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_TRNS, KC_VOLU,
-  KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_VOLD,
-  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_MUTE,
-  KC_TRNS, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_PGUP, KC_MPLY,
-  LCTL(KC_LALT), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END),
-};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/readme.md
deleted file mode 100644
index 21b28de90d5..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Jscatena88's KBD67 Layout
-![Layout Visual](https://i.imgur.com/7IsPDjR.png)
-
-This modifies the far right column on layer 1, adds RGB control to the second layer, and creates a CTRL+ALT button on the second layer for switching between Linux TTYs (this is the key labelled LCTL(LC_L), it is actually LCTL(KC_LALT) but the visualization software didn't support that)
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/config.h
deleted file mode 100644
index f4d7de06e5a..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Daisuke Kobayashi
- *
- * 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
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
deleted file mode 100644
index 0000d791b31..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2019 Daisuke Kobayashi
- *
- * 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_japanese.h"
-
-#define RGB_RMO RGB_RMOD
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  ^|  \|BS |Del |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  @|  [| Ent |PgUp|
-   * |------------------------------------------------------.    |----|
-   * |H/Z   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  ]|    |PgDn|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |PScr|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt | Space    |Fn | Space  |Alt |Ctrl|  |Lef|Dow|Rig |
-   * `------------------------------------------------'  `------------'
-   */
-[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, JP_CIRC, JP_YEN, 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,    JP_AT,   JP_LBRC, JP_RBRC,       KC_PGUP,
-  JP_ZKHK,       KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, JP_COLN,       KC_ENT,        KC_PGDN,
-  KC_LSFT, XXXXXXX, 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_PSCR,
-  KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,         MO(1),          KC_SPC,          KC_RALT, KC_RCTL, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |Rst| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |   |Ins |
-   * |----------------------------------------------------------------|
-   * |     |M- |M+ |RGB|H- |H+ |   |   |Prt|SLk|Pau|   |   |     |    |
-   * |------------------------------------------------------.    |----|
-   * |Caps  |Vo-|Vo+|Mut|S- |S+ |  *|  /|Hom|PUp|   |   |   |    |    |
-   * |----------------------------------------------------------------|
-   * |        |BL-|BL+|BL |V- |V+ |  +|  -|End|PDn|  _|      |PUp|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    | Muhenkan |   | Henkan |Kana|Menu|  |Hom|PDn|End |
-   * `------------------------------------------------'  `------------'
-   */
-[1] = LAYOUT_all(
-   QK_BOOT,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,_______,KC_INS,
-   _______,   RGB_RMO,RGB_MOD,RGB_TOG,RGB_HUD,RGB_HUI,XXXXXXX,XXXXXXX,KC_PSCR,KC_SCRL,KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX,     _______,
-   KC_CAPS,     KC_VOLD,KC_VOLU,KC_MUTE,RGB_SAD,RGB_SAI,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,XXXXXXX,XXXXXXX,      KC_PENT,     _______,
-   _______,_______,BL_DOWN,BL_UP,  BL_TOGG,RGB_VAD,RGB_VAI,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,JP_UNDS,_______,        KC_PGUP,_______,
-   _______,_______,_______,        JP_MHEN,        _______,        JP_HENK,        JP_KANA,KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
-};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/readme.md
deleted file mode 100644
index b432436d405..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Koba's keymap for KBD67
-
-![keyboard-layout](https://user-images.githubusercontent.com/1042121/54736578-244ffe80-4bef-11e9-9882-37611b4efdf4.png)
-
-- JIS layout.
-- Fn layer is arranged like HHKB.
-- 3 splitted space bar. (Space-Fn-Space)
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/naphtaline/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/naphtaline/keymap.c
deleted file mode 100644
index 27fbf0be53a..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/naphtaline/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2018 '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] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |GESC|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp| Del|
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| Ent |PgUp|
-   * |-------------------------------------------------------.   |----|
-   * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;| '|   |    |PgDn|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|End |
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |  Space  |MS3|  Space  |Alt |MO1|Ctrl|Lef|Dow|Rig|
-   * `----------------------------------------------------------------'
-   */
-[0] = LAYOUT_65_iso_split_space(
-  QK_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_DELETE,
-  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_MS_BTN3,      KC_SPC,          KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Mute|
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Vol+|
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |   |   |   |   |        |Vol-|
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |  Space |Space|  Space |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[1] = LAYOUT_65_iso_split_space(
-        QK_GESC,  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_UP, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,          KC_VOLU,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,      KC_SPC,      KC_SPC,      KC_SPC,          _______, _______, _______, _______, _______, _______),
-};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/naphtaline/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/naphtaline/readme.md
deleted file mode 100644
index d7b9c29e384..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/naphtaline/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Not the default keymap for kbd67
-
- -  this is my personnal layout, but is meant to be used as a base for the new layout LAYOUT_65_iso_split_space
- -  3 splitted space bar. (Space - Mouse click 3 - Space)
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/config.h
deleted file mode 100644
index a3ed4f762a6..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 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
-
-// place overrides here
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/keymap.c
deleted file mode 100644
index 70e6e550069..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2021 Andy Freeland
- *
- * 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] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = | ` | \ |Home|
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] | Bsp |Del |
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L| ; | ' |Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M| , | . | / |Shift | ↑ |PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |GUI |        Space          |GUI   |FN   | ← | ↓ | →  |
-   * `----------------------------------------------------------------'
-   */
-[0] = LAYOUT_65_ansi_split_bs_2_right_mods(
-  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_BSLS, 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_BSPC, KC_DEL,
-  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_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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   |Del|Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |Vol+|
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |End|PDn|Dow|      |   |Vol-|
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |      |     |Prv|Ply|Nxt |
-   * `----------------------------------------------------------------'
-   */
-[1] = LAYOUT_65_ansi_split_bs_2_right_mods(
-  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_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,
-      _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,KC_VOLU,
-           _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,_______,KC_VOLD,
-    _______,  _______,  _______,                     _______,                     _______,_______,KC_MPRV,KC_MPLY,KC_MNXT),
-
-};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/readme.md
deleted file mode 100644
index 2cb43c5e1a3..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/rouge8/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for kbd67
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
deleted file mode 100644
index 9a72f850308..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#undef MANUFACTURER
-#undef PRODUCT
-
-#define MANUFACTURER    "Potato Inc."
-#define PRODUCT         "Qt3.14"
-
-/* send tap key if no layer key was used even after tap delay */
-#define TAPPING_TERM 50
-#define RETRO_TAPPING
-
-/* turn off RGB when computer sleeps */
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
deleted file mode 100644
index 88fe681f142..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY,
-    _FUNC,
-    _NUM
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        
-    /* Keymap (Base Layer) Default Layer
-     * ,----------------------------------------------------------------.
-     * |ENu|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   BS  |Del |
-     * |----------------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  {|  }| Ent |PgUp|
-     * |------------------------------------------------------.    |----|
-     * |CapsFn|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  #|    |PgDn|
-     * |----------------------------------------------------------------|
-     * |Shift| \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |Fn  |
-     * |----------------------------------------------------------------|
-     * |Ctrl|Win |Alt |          Space        |Alt |Ctrl|  |Lef|Dow|Rig |
-     * `------------------------------------------------'  `------------'
-     */
-    [_QWERTY] = LAYOUT_all(
-        LT(_NUM,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_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, 
-        LT(_FUNC,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,        MO(_FUNC), 
-        KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,         KC_SPC,          KC_SPC,          KC_RALT, KC_RCTL, XXXXXXX, KC_LEFT, KC_DOWN,      KC_RGHT),
-
-    /* Keymap Fn Layer
-     * ,----------------------------------------------------------------.
-     * | ` | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|       |Ins |
-     * |----------------------------------------------------------------|
-     * |     |TOG|M+ |H+ |S+ |V+ |Sp+|   |Prt|SLk|Pau|   |   |     |Home|
-     * |------------------------------------------------------.    |----|
-     * |      |VLK|M- |H- |S- |V+ |Sp-|   |   |   |   |   |   |    |End |
-     * |----------------------------------------------------------------|
-     * |       |BL |BL-|BL+|BRTG|   |   |   |   |   |   |      |PUp|    |
-     * |----------------------------------------------------------------|
-     * |Sleep|Reset|    |         C+A+D      |C+A+I|Menu|  |Hom|PDn|End |
-     * `------------------------------------------------'  `------------'
-     */
-    [_FUNC] = 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_INS, 
-         _______,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,_______,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,_______,      KC_HOME, 
-         _______,     VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,_______,_______,_______,_______,_______,      _______,      KC_END, 
-         _______,_______,BL_TOGG, BL_DOWN,BL_UP,  BL_BRTG,_______,_______,_______,_______,_______,_______,_______,        KC_PGUP,_______, 
-         KC_SLEP,QK_BOOT,_______,      LCA(KC_DEL),     LCA(KC_DEL),    LCA(KC_DEL),  LCA(KC_INS),KC_APP, _______,KC_HOME,KC_PGDN,KC_END),
-       
-    /* Keymap Numpad Layer
-     * ,----------------------------------------------------------------.
-     * |   |  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  /|   |       |    |
-     * |----------------------------------------------------------------|
-     * |     |   |   |   |   |   |   |  4|  5|  6|  *|   |   |     |    |
-     * |------------------------------------------------------.    |----|
-     * |      |   |   |   |   |   |   |  1|  2|  3|  -|   |   |    |    |
-     * |----------------------------------------------------------------|
-     * |     |  |NLk|   |   |   |   |   |  0|   |   |  +|      |   |    |
-     * |----------------------------------------------------------------|
-     * |    |    |    |                       |    |    |  |   |   |    |
-     * `------------------------------------------------'  `------------'
-     */
-    [_NUM] = LAYOUT_all(
-        _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_KP_SLASH, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ASTERISK, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_MINUS, _______, _______,             _______, 
-        _______, _______, KC_NUM,  _______, _______, _______, _______, _______, KC_KP_0, _______, _______, KC_KP_PLUS, _______,   _______, _______, 
-        _______, _______, _______,       _______,        _______,         _______,          _______, _______, XXXXXXX, _______, _______, _______),
-    };
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-      rgblight_enable_noeeprom();
-    } else {
-      rgblight_disable_noeeprom();
-    }
-    return false;
-}
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/readme.md
deleted file mode 100644
index 1404ceed5f4..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# TuCZnak's modified layout
-
-This layout is made for the ISO configuration of KBD67 (KBD65 v2 PCB).
-It has a base layer, numpad on LT and a combined
-configuration / macro / media layer.
-
-Since the plate and PCB leak some underglow and the KBD67 case has no use
-for it otherwise, containing no translucent parts, I've used the RGB OLEDs
-as a capslock indicator.
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk
deleted file mode 100644
index 3635874b4ec..00000000000
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # 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           # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality on B7 by default
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
deleted file mode 100644
index 5b8a6fcffd3..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * dbroqua HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-  _DEFAULT,
-  _ALTERNATE,
-  _FN,
-  _RGB
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* BASE layer: Default Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-     * |-----------------------------------------------------------------------------------------+
-     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | Shift     | fn  |
-     * +-----------------------------------------------------------------------------------------+
-     *         | Alt |  Gui   |                    Space                   | Gui   |RCtrl|
-     *         `-------------------------------------------------------------------------´
-      */
-    [_DEFAULT] = LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC,
-        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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN),
-        KC_TRNS, KC_LALT, KC_LGUI, /*        */ KC_SPC, KC_RGUI, KC_RCTL, KC_TRNS),
-    /* Alternamte layer: swap alt/gui
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-     * |-----------------------------------------------------------------------------------------+
-     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | Shift     | fn  |
-     * +-----------------------------------------------------------------------------------------+
-     *         | Gui |  Alt   |                    Space                   | AltGr |RCtrl|
-     *         `-------------------------------------------------------------------------´
-      */
-    [_ALTERNATE] = LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC,
-        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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN),
-        KC_TRNS, KC_LGUI, KC_LALT, /*        */ KC_SPC, KC_RALT, KC_RCTL, KC_TRNS),
-
-    /* FN Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Pwr |  F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F0  | F11 | F12 | Ins | Del|
-     * |-----------------------------------------------------------------------------------------+
-     * | Caps   |     |     |     |     |     |     |     |PrtSc| Slck| Paus|  Up |     |        |
-     * |-----------------------------------------------------------------------------------------+
-     * |         | Vol-| Vol+| Mute|Eject|     | *   | /   | Home| PgUp| Left |Right|            |
-     * |-----------------------------------------------------------------------------------------+
-     * |           | Prev| Play| Next|     |     | +   | -   | End |PgDwn| Down| _RGB      |     |
-     * +-----------------------------------------------------------------------------------------+
-     *         | _DEF| _ALTER |                                            | Stop  |     |
-     *         `-------------------------------------------------------------------------´
-      */
-    [_FN] = LAYOUT(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_CAPS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
-        KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, DF(_RGB), KC_TRNS,
-        KC_TRNS, DF(_DEFAULT), DF(_ALTERNATE), KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS),
-
-
-    /* RGB Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | RST |      |     |     |     |     |     |     |     |     |     |     |     |     |    |
-     * |-----------------------------------------------------------------------------------------+
-     * |        |R_TOG|R_MOD|RRMOD|R_HUI|R_HUD|R_SAI|R_SAD|R_VAI|R_VAD|R_SPI|R_SPD|     |        |
-     * |-----------------------------------------------------------------------------------------+
-     * |         |R_M_P|R_M_B|R_M_R|R_MSW|R_MSN|R_M_K|R_M_X|R_M_G|     |      |     |            |
-     * |-----------------------------------------------------------------------------------------+
-     * |           |BL_TG|BL_ST|BL_ON|BL_OF|BL_IN|BL_DC|BL_BR|     |     |     |           |     |
-     * +-----------------------------------------------------------------------------------------+
-     *         | _DEF| _ALTER |                                            |       |     |
-     *         `-------------------------------------------------------------------------´
-     */
-    [_RGB] = LAYOUT(
-        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP,  BL_DOWN,BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, DF(_DEFAULT), DF(_ALTERNATE), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-
-};
diff --git a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c
deleted file mode 100644
index 4aa8b940b2b..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2019 Devinceble AKA Vimwarrior
- *
- * 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_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC,
-        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_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_LALT, KC_LGUI, KC_SPC, KC_RCTL, MO(2), KC_RGUI
-    ),
-	[1] = 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_INS, KC_DEL,
-        KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-	[2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS,
-        KC_CAPS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP,  BL_DOWN,BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/readme.md b/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/readme.md
deleted file mode 100644
index ebd416aea57..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Devinceble AKA Vimwarrior HHKB Tofu Keymap
-
-Build Hex File:
-
-    make kbdfans/kbd6x:devinceble_hhkb_tofu
-
-Flash Keyboard
-
-    make kbdfans/kbd6x:devinceble_hhkb_tofu:flash
diff --git a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/rules.mk
deleted file mode 100644
index 23f4c567445..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BOOTLOADER = atmel-dfu
-MOUSEKEY_ENABLE    = yes
diff --git a/keyboards/kbdfans/kbd6x/keymaps/mekberg/config.h b/keyboards/kbdfans/kbd6x/keymaps/mekberg/config.h
deleted file mode 100644
index d29180a5aff..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/mekberg/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-// Define some configuration for modtap behavior
-// #define TAPPING_TERM 150
-#define PERMISSIVE_HOLD
diff --git a/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c
deleted file mode 100644
index b7152d49fb1..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/mekberg/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright 2018 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
-
-// #define MY_LOCK C(A(KC_L))      // Mac: Custom lock hotkey in BTT
-#define MY_LOCK C(LCMD(KC_L))      // Mac: Custom lock hotkey in BTT (when Alt/Command have been swapped in macOS)
-
-/*
-KBD6x ANSI physical layout
-1u == 8chars
-    ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-    |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-    |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-    |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
-    |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-    |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
-    |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-    |       2,25u      |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-    └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-                 |        |   1,25u    |                                                        |   1,25u    |        |
-                 └────────────────────────────────────────────────────────────────────────────────────────────────────┘
-*/
-
-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,    KC_MINS, KC_EQL,  KC_NUBS,KC_NUHS,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
-     LT(2,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_BSPC,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
-         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,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-           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),
-//  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-//                   |        |   1,25u    |                                                        |   1,25u    |        |
-         XXXXXXX,     KC_LGUI,   KC_LALT,                         KC_SPACE,                            KC_RALT,   KC_RGUI,      XXXXXXX
-//                   └────────────────────────────────────────────────────────────────────────────────────────────────────┘
-  ),
-
-//  Fn layer, left hand free
-//  F-keys, RGB controls, media controls, Keyboard functions
-  [1] = LAYOUT(
-//  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-//  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______,  QK_BOOT,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
-      _______,   _______,  _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______,   _______,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
-        KC_RCTL,    KC_VOLD, KC_VOLU, KC_MUTE, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______,       MY_LOCK,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-          _______,      BL_TOGG,  BL_UP,   BL_DOWN,BL_STEP, _______, _______, _______, KC_MRWD, KC_MFFD, _______,    _______,     _______,
-//  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-//                   |        |   1,25u    |                                                        |   1,25u    |        |
-         XXXXXXX,     _______,  _______,                          KC_MPLY,                            _______,    _______,      XXXXXXX
-//                   └────────────────────────────────────────────────────────────────────────────────────────────────────┘
-  ),
-
-//  Left Tab-Hold layer, right hand free
-//  Nav-keys
-  [2] = LAYOUT(
-//  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-//  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_INS, KC_BSPC,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
-      _______,    _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_UP,   KC_PGUP, KC_HOME, _______, _______,    KC_DEL,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
-       _______,     _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,       _______,
-//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
-//  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
-          _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,     _______,
-//  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-//                   |        |   1,25u    |                                                        |   1,25u    |        |
-         XXXXXXX,     _______,  _______,                         _______,                             _______,    _______,      XXXXXXX
-//                   └────────────────────────────────────────────────────────────────────────────────────────────────────┘
-  ),
-};
diff --git a/keyboards/kbdfans/kbd6x/keymaps/mekberg/readme.md b/keyboards/kbdfans/kbd6x/keymaps/mekberg/readme.md
deleted file mode 100644
index febe2e1d68a..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/mekberg/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# General Information
-
-This is more or less a HHKB base layout, but with completely different Fn layers. I don't use most of the HHKB secondary key positions because, honestly, they make no sense to me at all.
-
-Fn key layer is focused mostly on keyboard firmware features (like RGB) as well as some of the necessary alternate functions. It also hold media controls, F-keys and Reset.
-
-Left Tab-Hold layer is focused on nav cluster functionality, and turns Backspace into Delete (and moves Backspace up into the top right 1u position).
-
-
-# Build instructions
-
-To simply build the firmware file: `make clean && make kbdfans/kbd6x:mekberg`
-
-To build and immediately flash: `make clean && make kbdfans/kbd6x:mekberg:dfu`
diff --git a/keyboards/kbdfans/kbd6x/keymaps/mekberg/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/mekberg/rules.mk
deleted file mode 100644
index 257214607e2..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/mekberg/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-NKRO_ENABLE = yes            # USB Nkey Rollover
-CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/config.h b/keyboards/kbdfans/kbd6x/keymaps/othi/config.h
deleted file mode 100644
index d5bc8ab7ec7..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-#define ONESHOT_TAP_TOOGLE 2
-#define ONESHOT_TIMEOUT 2000
-// tap dance configurations
-#define TAPPING_TERM 200
-#define TAPPING_TOGGLE 2
-#define PERMISSIVE_HOLD
-// Fix QK_GESC conflict with Cmd+Alt+Esc on macros
-#define GRAVE_ESC_GUI_OVERRIDE
-
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
deleted file mode 100644
index d748a2f7361..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Copyright 2018 Othi
- *
- * 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
-
-// read README.md for rundown of what does what
-
-// #define BL 0
-#define CL 0
-#define NM_MODE 2
-#define VI_MODE 3
-#define FN3 4
-#define ACCENT 5
-#define ACCENT_CAP 6
-
-//Unicode keymaps
-void eeconfig_init_user(void) {
-  set_unicode_input_mode(UNICODE_MODE_LINUX);
-}
-#define DE_ADIA     UC(0x00E4)
-#define DE_SS       UC(0x00DF)
-#define DE_ODIA     UC(0x00F6)
-#define DE_UDIA     UC(0x00FC)
-#define DE_ADIA_CAP UC(0x00C4)
-#define DE_ODIA_CAP UC(0x00D6)
-#define DE_UDIA_CAP UC(0x00DC)
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case NM_MODE:
-        rgblight_setrgb (0x00,  0x66, 0x00);
-        break;
-    case VI_MODE:
-        rgblight_setrgb (0x66,  0x66, 0x00);
-        break;
-    case ACCENT:
-        rgblight_setrgb (0x7A,  0x00, 0xFF);
-        break;
-    case ACCENT_CAP:
-        rgblight_setrgb (0x7A,  0xFF, 0xFF);
-        break;
-    default: //  for any other layers, or the default layer
-        rgblight_setrgb (0xFF,  0x00, 0x00);
-        break;
-    }
-  return state;
-}
-
-//Tap Dance Declarations
-enum {
-  CTL_NM = 0,
-  ALT_NM = 1,
-  SFT_NM = 2,
-  GUI_NM = 3
-};
-
-void dance_CTL_NM_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-	set_oneshot_mods(MOD_LCTL);
-  } else {
-    register_code (KC_LCTL);
-	layer_on(NM_MODE);
-  }
-}
-
-void dance_CTL_NM_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_LCTL);
-  } else {
-    unregister_code (KC_LCTL);
-	layer_off(NM_MODE);
-  }
-}
-
-void dance_GUI_NM_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-	register_code (KC_LGUI);
-  } else {
-    register_code (KC_LGUI);
-	layer_on(NM_MODE);
-  }
-}
-
-void dance_GUI_NM_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_LGUI);
-  } else {
-    unregister_code (KC_LGUI);
-	layer_off(NM_MODE);
-  }
-}
-
-void dance_ALT_NM_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-	register_code (KC_LALT);
-  } else {
-    register_code (KC_LALT);
-	layer_on(NM_MODE);
-  }
-}
-
-void dance_ALT_NM_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_LALT);
-  } else {
-    unregister_code (KC_LALT);
-	layer_off(NM_MODE);
-  }
-}
-
-void dance_SFT_NM_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-	register_code (KC_LSFT);
-	set_oneshot_mods(MOD_LSFT);
-  } else {
-    register_code (KC_LSFT);
-	layer_on(NM_MODE);
-  }
-}
-
-void dance_SFT_NM_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_LSFT);
-  } else {
-    unregister_code (KC_LSFT);
-	layer_off(NM_MODE);
-  }
-}
-
-
-tap_dance_action_t tap_dance_actions[] = {
- [CTL_NM] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_CTL_NM_finished, dance_CTL_NM_reset),
- [GUI_NM] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_GUI_NM_finished, dance_GUI_NM_reset),
- [ALT_NM] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_ALT_NM_finished, dance_ALT_NM_reset),
- [SFT_NM] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_SFT_NM_finished, dance_SFT_NM_reset)
-};
-
-// backup
-// old R3 capslock, LT(NM_MODE,KC_BSPC),
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [CL] = LAYOUT(
-      QK_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_BSLS,    KC_DEL,
-      MT(MOD_LGUI,KC_TAB),       LT(NM_MODE,KC_Q),    KC_W,    LT(ACCENT,KC_F),    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,     KC_LBRC, KC_RBRC, KC_BSPC,
-      MT(MOD_LCTL,KC_BSPC),      KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,           KC_QUOT, KC_ENT,
-      TD(SFT_NM),                KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    MT(MOD_LCTL,KC_COMM), MT(MOD_LSFT,KC_DOT),  MT(MOD_LALT,KC_SLSH),        LM(CL,MOD_LGUI|MOD_LSFT), TT(NM_MODE),
-      _______, TD(CTL_NM),                     TD(ALT_NM),              		KC_SPC,    LM(CL,MOD_LGUI|MOD_LALT), OSL(ACCENT)    , _______
-      ),
-  [NM_MODE] = LAYOUT(
-      KC_GRV,            KC_MPRV,    KC_MNXT,    KC_MPLY,    KC_END,      _______,     _______,     _______,     _______,     _______,     KC_HOME,    _______,  _______,  QK_BOOT, KC_INS,
-      LGUI(KC_TAB),       _______,    LCTL(KC_RGHT),  _______,    _______,    _______,    _______,    KC_UP,    KC_PGUP,    _______,    _______,     _______, TG(CL), KC_DEL,
-      _______,            KC_LEFT,    _______,    KC_RGHT,      _______,    KC_PGDN,    KC_LEFT,   KC_DOWN,   KC_RGHT,     _______,    KC_ENT,  KC_QUOT, KC_LGUI,
-      KC_LSFT,     			_______,    _______,    _______,      _______,    LCTL(KC_LEFT),    _______,    _______,    _______,    _______,    _______,    TG(VI_MODE), TO(CL),
-      _______, TD(CTL_NM),                     TD(ALT_NM),              		KC_SPC,    LM(CL,MOD_LGUI|MOD_LALT), OSL(ACCENT), _______
-      ),
-
-  [VI_MODE] = LAYOUT(
-      KC_GRV,         KC_MPRV,  KC_MNXT, KC_MPLY,    LSFT(KC_END),          KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     LSFT(KC_HOME),    KC_F11,  KC_F12,  QK_BOOT, KC_INS,
-      LGUI(KC_TAB),     _______,    LSFT(LCTL(KC_RGHT)),  _______,    _______,    _______,    _______,    LSFT(KC_UP),    _______,    _______,    _______,     _______, TG(CL), KC_BSPC,
-      _______,            _______,    _______,    _______,      _______,    _______,    LSFT(LCTL(KC_LEFT)),   LSFT(KC_DOWN),   LSFT(KC_RGHT),     _______,    KC_SCLN,  KC_QUOT, KC_LGUI,
-      KC_LSFT,      	    _______,  _______, _______,      _______,    LSFT(LCTL(KC_LEFT)),    _______,    _______,    _______,    _______,    KC_SLSH,    OSM(MOD_LSFT), TO(CL),
-      _______, TD(CTL_NM),                     TD(ALT_NM),              		KC_SPC,    LM(CL,MOD_LGUI|MOD_LALT), OSL(ACCENT), _______
-      ),
-  [ACCENT] = 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,  _______, _______,
-      _______,         RGB_TOG,    RGB_MODE_PLAIN,  _______,    _______,    _______,    _______,    _______,    DE_UDIA,    _______,    _______,     _______, _______, _______,
-      _______,            DE_ADIA,    UC_Z,    DE_SS,      _______,    _______,    _______,   _______,   _______,     _______,    DE_ODIA,  _______, _______,
-      OSL(ACCENT_CAP),     _______,  _______, _______,      _______,    _______,    _______,    _______,    _______,    _______,        _______, _______, TO(CL),
-      _______,             _______,         _______,            _______,         _______, _______,  _______
-      ),
-  [ACCENT_CAP] = LAYOUT(
-      _______,   _______,  _______, _______,    _______,          _______,     _______,     _______,     _______,     _______,     _______,    _______,  _______,  _______, _______,
-      _______,      _______,    _______,  _______,    _______,    _______,    _______,    _______,    DE_UDIA_CAP,    _______,    _______,     _______, _______, _______,
-      _______,        DE_ADIA_CAP,    _______,    DE_SS,      _______,    _______,    _______,   _______,   _______,     _______,    DE_ODIA_CAP,  _______, TO(CL),
-      _______, 	       _______, _______,      _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______, _______,
-      _______,   _______,         _______,         _______,         _______,   _______,      _______
-      ),
-};
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/readme.md b/keyboards/kbdfans/kbd6x/keymaps/othi/readme.md
deleted file mode 100644
index 95be36d057d..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/readme.md
+++ /dev/null
@@ -1,56 +0,0 @@
-## Othi's Universal HHKB keymap
-
-### Goals
-- Colemak layout. If you don't use Colemak then you'll need to also change the arrow key bindigns in other layers
-
-- Vim-like navigation layer so you can use vim binding arrowkeys in non-vim environment
-
-- Good modifier support so you don't have to hold 14 modifier keys at the same time
-
-- RGB indicating layer change(only work with plain colors so far, don't put your rgb to pulsing or any non static animation)
-
-### Layers
-- **CL:**
-
-	The base layer, default is Colemak
-
-- **NM_MODE:**
-
-	Vim-like arrowkeys in the home row, it's `LHNE` for *JENK Colemak* and `HJKL` for *QWERTY*
-
-	Also `HOME`, `END` and next/prev word (`Ctrl + Left/Right`) in `0, 4, w, b` like in vim
-
-- **VI_MODE:**
-
-	The same as `NM_MODE` but with `KC_LSFT` held down for mostly highlighting
-
-- **ACCENT + ACCENT_CAP:**
-
-	Function row and Unicode characters
-
-### Modifiers and Tap Dance keys
-**LHS:**
-
-- Any Tap Dance key with the format of `TD(XXX_NM)` act as normal XXX modifier upon hold, but will hold **and** put you to `NM_MODE` when double click hold(a tap before the hold)(eg you can produce `Alt + PgUp` by pressing `Alt + Alt + U`)
-
-- `KC_TAB` acts as both `KC_TAB` on tap and `KC_LGUI` on hold
-
-- R3 CapsLock acts as both `KC_BSPC` on tap and `KC_LCTL` on hold
-
-- Holding `KC_Q` also puts you into `NM_MODE`
-
-- Holding `KC_F` puts you into `VI_MODE` for fast function keys
-
-**RHS:**
-
-- 3 keys `KC_SCLN`, `KC_DOT` and `KC_SLSH` in `CL` layer can also be held down for respectively `KC_LCTL`, `KC_LSFT`, `KC_LALT` for easier 2-hand modifier holding
-
-- Right modifiers hold the selected modifier with `KC_LGUI` at the same time, mainly for i3wm, you can change this to whatever combination you want
-
-### Misc. functionalities
-
-**Unicode:**
-
-- In case the keyboard output the 4-digit codepoint instead of the actual unicode, you need to change the rewrite input mode of the keyboard into the EEPROM(you only have to do this if the EEPROM was cleared or your current machine use another unicode compose method other than IBus/Linux's `Ctrl + Shift + U`). Change the corresponding Input `void eeconfig_init_user(void)`. See [this](https://docs.qmk.fm/#/feature_unicode) for availble input modes.
-
-- **NOTE:** make sure to keep your qmk env up to date with upstream
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk
deleted file mode 100644
index 9a4459c2891..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes            # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE = yes         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no           # Audio output on port C6
-TAP_DANCE_ENABLE=yes
diff --git a/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
deleted file mode 100644
index 1c951188682..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/peott-fr/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Pierre-Emmanuel Ott
- *
- * 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_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC, 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, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, LT(2,KC_HOME), LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), RALT_T(KC_DEL), KC_APP, RCTL_T(KC_END)),
-        [1] = LAYOUT(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_LBRC, KC_UP, KC_RBRC, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT, KC_BSPC, KC_TRNS, KC_WREF, KC_WBAK, KC_WFWD, KC_WHOM, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_VOLU, KC_TRNS, KC_PGDN),
-        [2] = LAYOUT(RGB_TOG, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_UP, KC_TRNS, KC_TRNS, KC_CAPS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS)
-};
diff --git a/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c b/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
deleted file mode 100644
index 2c3464c9410..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/aaronireland/keymap.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* Copyright 2021 Aaron Ireland
- * 
- * 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
-
-// KBD75 layer indices
-enum custom_layers {
-    _QWERTY,
-    _COLEMAK,
-    _DVORAK,
-    _FL,
-};
-
-enum kbd75_keycodes {
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-    DVORAK
-};
-
-// Mac OS Custom Macros
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-
-// Aaron's shell macros
-#define KC_CTLC LCTL(KC_C)
-#define KC_SNU  LCTL(KC_B)              // Used by vim
-#define KC_SND  LCTL(KC_D)              // Used by vim
-
-/*   ***************** Aaron's KBD75 v2 Layout ********************
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
- * │   │   │   │   │   │   │   │   │   │   │   │   │   │  2U   │   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
- * │1.5U │   │   │   │   │   │   │   │   │   │   │   │   │1.5U │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │1.75U │   │   │   │   │   │   │   │   │   │   │   │2.25U   │   │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │2.25U   │   │   │   │   │   │   │   │   │   │   │1.75U │   │   │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
- * │1.25│1.25│1.25│6.25U                   │1U │1U │1U │1U │1U │1U │
- * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
- *   ************************************************************/
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /*   ******************** 0: QWERTY Base Layer ********************
-   *  PSN: Print Screen
-   *  PUP: Page Up
-   *  PDN: Page Down
-   *  BRK: CTRL + C
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-   * │ESC│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│PSN│BRK│DEL│
-   * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
-   * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │BKSPACE│HOM│
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │  `  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │PUP│
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * │ TAB  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ ENTER  │PDN│
-   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * │ SHIFT  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │SHIFT │UP │END│
-   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-   * │ OS │ ALT│CTRL│          SPACE         │OS │CTL│FN │LFT│DWN│RT │
-   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-   *   ************************************************************/
-
-  [_QWERTY] = LAYOUT_ansi_1u(
-    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_CAPW, KC_CTLC, KC_DEL ,
-    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_GRV , 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_TAB , 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_LGUI, KC_LALT, KC_LCTL,                   KC_SPC ,                                     KC_RGUI, KC_LCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /*   ******************** 1: COLEMAK Base Layer ********************
-   *  PSN: Print Screen
-   *  PUP: Page Up
-   *  PDN: Page Down
-   *  BRK: CTRL + C
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-   * │ESC│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│PSN│BRK│DEL│
-   * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
-   * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │BKSPACE│HOM│
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │  `  │ Q │ W │ F │ P │ G │ J │ L │ U │ Y │ ; │ [ │ ] │  \  │PUP│
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * │ TAB  │ A │ R │ S │ T │ D │ H │ N │ E │ I │ O │ ' │ ENTER  │PDN│
-   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * │ SHIFT  │ Z │ X │ C │ V │ B │ K │ M │ , │ . │ / │SHIFT │UP │END│
-   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-   * │ OS │ ALT│CTRL│          SPACE         │OS │CTL│FN │LFT│DWN│RT │
-   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-   *   ************************************************************/
-
-  [_COLEMAK] = LAYOUT_ansi_1u(
-    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_CAPW, KC_CTLC, KC_DEL ,
-    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_GRV , KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-    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_ENT ,          KC_PGDN,
-    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_UP  , KC_END ,
-    KC_LGUI, KC_LALT, KC_LCTL,                   KC_SPC ,                                     KC_RGUI, KC_LCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /*   ******************** 2: DVORAK Base Layer ********************
-   *  PSN: Print Screen
-   *  PUP: Page Up
-   *  PDN: Page Down
-   *  BRK: CTRL + C
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-   * │ESC│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│PSN│BRK│DEL│
-   * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
-   * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ [ │ ] │BKSPACE│HOM│
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │  `  │ ' │ , │ . │ P │ Y │ F │ G │ C │ R │ L │ / │ = │  \  │PUP│
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * │ TAB  │ A │ O │ E │ U │ I │ D │ H │ T │ N │ S │ - │ ENTER  │PDN│
-   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * │ SHIFT  │ ; │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │SHIFT │UP │END│
-   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-   * │ OS │ ALT│CTRL│          SPACE         │OS │CTL│FN │LFT│DWN│RT │
-   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-   *   ************************************************************/
-
-  [_DVORAK] = LAYOUT_ansi_1u(
-    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_CAPW, KC_CTLC, KC_DEL ,
-    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_HOME,
-    KC_GRV , KC_QUOT, KC_COMM, KC_DOT , KC_P   , KC_Y   , KC_F   , KC_G   , KC_C   , KC_R   , KC_L   , KC_SLSH, KC_EQL , KC_BSLS,          KC_PGUP,
-    KC_TAB , KC_A   , KC_O   , KC_E   , KC_U   , KC_I   , KC_D   , KC_H   , KC_T   , KC_N   , KC_S   , KC_MINS,          KC_ENT ,          KC_PGDN,
-    KC_LSFT,          KC_SCLN, KC_Q   , KC_J   , KC_K   , KC_X   , KC_B   , KC_M   , KC_W   , KC_V   , KC_Z   , KC_RSFT,          KC_UP  , KC_END ,
-    KC_LGUI, KC_LALT, KC_LCTL,                   KC_SPC ,                                     KC_RGUI, KC_LCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /*   ******************** 3: FN Momentary Layer ********************
-   *  F13   - Launchpad
-   *  SNU   - CTRL + B = Neovim Screen Up
-   *  SND   - CTRL + D = Neovim Screen Down
-   *  TOG   - Toggle RGB Underglow
-   *  MOD   - RGB Underglow Mode
-   *  NXT   - FF/Skip
-   *  PLY   - Play/Stop
-   *  VL    - Volume Down/Up
-   *  SN    - Screen Brightness Up/Down
-   *  QRT   - QWERTY Layout
-   *  CLK   - COLEMAK Layout
-   *  DVK   - DVORAK Layout
-   *  QK_BOOT - Put PCB into Bootstrap mode
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │PSN│   │   │
-   * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
-   * │   │TOG│MOD│HU+│HU-│SA+│SA-│VA+│VA-│   │   │   │   │ QK_BOOT │F13│
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │ TAB │QRT│   │   │   │   │   │   │   │   │   │   │   │     │SNU│
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * │ CAPS │   │   │DVK│   │   │   │   │   │   │   │   │        │SND│
-   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * │        │   │   │CLK│DEC│TOG│INC│STP│   │   │   │      │SN+│VL0│
-   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-   * │ OS │ ALT│CTRL│          SPACE         │NXT│PLY│XXX│VL-│SN-│VL+│
-   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-   *   ************************************************************/
-
-  [_FL] = LAYOUT_ansi_1u(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPP, _______, _______,
-    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,          KC_F13 ,
-    KC_TAB , QWERTY , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_SNU ,
-    KC_CAPS, _______, _______, DVORAK , _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_SND ,
-    _______,          _______, _______, COLEMAK, BL_DOWN, BL_TOGG, BL_UP  , BL_STEP, _______, _______, _______, _______,          KC_PAUS, KC_MUTE,
-    KC_LGUI, KC_LALT, KC_LCTL,                   KC_SPC ,                                     KC_MNXT, KC_MPLY, _______, KC_VOLD, KC_SCRL, KC_VOLU
-  ),
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/kbd75/keymaps/aaronireland/readme.md b/keyboards/kbdfans/kbd75/keymaps/aaronireland/readme.md
deleted file mode 100644
index aac4d179687..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/aaronireland/readme.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Aaron's KBD75v2 Mac-friendly ANSI 1u Layout
-
-This layout mimics the default KBD 75% ANSI 1u layout with a few mac-friendly tweaks. Because Mac OS uses a unique keycode
-for the Function key and only recognizes that keycode from keyboards registered with an Apple vendor ID ([see here for more info](https://beta.docs.qmk.fm/faqs/faq_keymap#fn-key-on-macos)),
-this layout uses custom macros and F-keycodes (F12, F13, etc) to provide Mac hotbar functionality (Print Screen, Launchpad, etc...) and maps the
-**Fn** key to the QMK momentary layer `_FN` (layer index 3) so it is listed as `MO(3)`.
-
-| Mac OS Keystroke | Description              | User-defined Macro | Layout Mapping   |
-| ---------------- | ------------------------ | ------------------ | ---------------- |
-| ⌘ + Shift + 3    | Print Screen             | `KC_CAPW`          | `Prt Scn`        |
-| ⌘ + Shift + 4    | Print Screen (selection) | `KC_CAPP`          | `fn` + `Prt Scn` |
-| F13              | Launchpad                |                    | `fn` + `Home`    |
-|                  | Colemak                  | `COLEMAK`          | `fn` + `C`       |
-|                  | Dvorak                   | `DVORAK`           | `fn` + `D`       |
-|                  | Qwerty                   | `QWERTY`           | `fn` + `Q`       |
-| `Ctrl` + `C`     | Quit/Break               | `KC_CTLC`          | `Pse Brk`        |
-| `Ctrl` + `B`     | vim page up              | `KC_SPU`           | `fn` + `Pg Up`   |
-| `Ctrl` + `D`     | vim page down            | `KC_SPD`           | `fn` + `Pg Dn`   |
-
-<br>
-<hr>
-
-### QWERTY - Layer 0
-
-![Layer 0: QWERTY](https://i.imgur.com/haydhHS.png)
-
-### FUNCTION - Layer 3
-
-![Layer 3: FUNCTION](https://i.imgur.com/XHUvgLd.png)
-
-<br><br><hr>
-
-### COLEMAK - Layer 1
-
-![Layer 1: COLEMAK](https://i.imgur.com/sBfHH8K.png)
-
-### DVORAK - Layer 2
-
-![Layer 2: DVORAK](https://i.imgur.com/AaypaN4.png)
diff --git a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/config.h b/keyboards/kbdfans/kbd75/keymaps/adamdehaven/config.h
deleted file mode 100644
index 4fcd7735526..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 200
diff --git a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c b/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c
deleted file mode 100644
index 398f90c6d73..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Compile from qmk_firmware folder with the following command:
-// $ make kbdfans/kbd75/rev2:adamdehaven
-
-// Each layer gets a name for readability. 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, and you can also skip them entirely and just use numbers.
-#define _QWERTY 0
-#define _FN1 1
-
-extern rgblight_config_t rgblight_config;
-static bool RGB_user_wants_enabled;
-uint16_t RGB_current_mode;
-uint16_t RGB_current_hue;
-uint16_t RGB_current_sat;
-uint16_t RGB_current_val;
-
-// Setup RGB
-void keyboard_post_init_user(void) {
-    RGB_user_wants_enabled = rgblight_config.enable;
-    RGB_current_mode = rgblight_config.mode;
-    RGB_current_hue  = rgblight_config.hue;
-    RGB_current_sat  = rgblight_config.sat;
-    RGB_current_val  = rgblight_config.val;
-};
-
-// Restore user settings
-void restore_user_rgb_settings(void) {
-    // First, enable RGB
-    if (RGB_user_wants_enabled && !rgblight_config.enable) {
-        rgblight_enable();
-    } else if (!RGB_user_wants_enabled && rgblight_config.enable) {
-        rgblight_disable();
-    }
-
-    // Restore settings
-    rgblight_sethsv(RGB_current_hue, RGB_current_sat, RGB_current_val); // Restore underglow RGB color
-    rgblight_mode(RGB_current_mode); // Restore RGB mode
-};
-
-// Tap Dance Definitions
-enum tapdance {
-    TD_PGUP = 0,
-    TD_PGDN
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for PageUp, twice for Home
-    [TD_PGUP] = ACTION_TAP_DANCE_DOUBLE(KC_PGUP, KC_HOME),
-    // Tap once for PageDown, twice for End
-    [TD_PGDN] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, KC_END)
-};
-
-// Fire on keypress
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case RGB_TOG:
-            if (!record->event.pressed) {
-                // on keyup
-                RGB_user_wants_enabled = rgblight_config.enable;
-            }
-            break;
-        case RGB_MOD:
-            if (!record->event.pressed) {
-                // on keyup
-                RGB_current_mode = rgblight_config.mode;
-            }
-            break;
-        case RGB_HUI:
-        case RGB_HUD:
-            if (!record->event.pressed) {
-                // on keyup
-                RGB_current_hue = rgblight_config.hue;
-            }
-            break;
-        case RGB_SAI:
-        case RGB_SAD:
-            if (!record->event.pressed) {
-                // on keyup
-                RGB_current_sat = rgblight_config.sat;
-            }
-            break;
-        case RGB_VAI:
-        case RGB_VAD:
-            if (!record->event.pressed) {
-                // on keyup
-                RGB_current_val = rgblight_config.val;
-            }
-            break;
-    }
-    return true;
-};
-
-
-/*
- *  You can use _______ in place for KC_TRNS (transparent)
- *  Or you can use XXXXXXX for KC_NO (NOOP)
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* 0: _QWERTY
-     * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐
-     * │ 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_INSERT│ KC_DEL  │
-     * ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤
-     * │ 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         │ TD_PGUP │
-     * ├────────────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────────────┬─────────┼─────────┤
-     * │     KC_LSFT (2)     │ KC_Z    │ KC_X    │ KC_C    │ KC_V    │ KC_B    │ KC_N    │ KC_M    │ KC_COMM │ KC_DOT  │ KC_SLSH │     KC_RSFT     │ KC_UP   │ TD_PGDN │
-     * ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬┴────────┬─┴───────┬─────────┼─────────┼─────────┤
-     * │  KC_LCTL  │  KC_LGUI  │  KC_LALT  │                            KC_SPC                             │ KC_RALT │MO(_FN1) │ KC_RCTL │ KC_LEFT │ KC_DOWN │ KC_RGHT │
-     * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
-     */
-    [_QWERTY] = LAYOUT(
-        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_INSERT, KC_DEL,
-        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_DEL, 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, TD(TD_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, TD(TD_PGDN),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* 1: _FN1
-     * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐
-     * │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ KC_MUTE │
-     * ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤
-     * │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │      _______      │ _______ │
-     * ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤
-     * │   _______    │ RGB_TOG │ RGB_MOD │ RGB_HUI │ RGB_HUD │ RGB_SAI │ RGB_SAD │ RGB_VAI │ RGB_VAD │ _______ │ _______ │ _______ │ _______ │   _______    │ _______ │
-     * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────────┼─────────┤
-     * │    _______     │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │       _______        │ KC_VOLU │
-     * ├────────────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────────────┬─────────┼─────────┤
-     * │     _______ (2)     │ _______ │ _______ │ BL_DOWN │ BL_TOGG │ BL_UP   │ BL_STEP │ _______ │ _______ │ _______ │ _______ │     _______     │ KC_MPLY │ KC_VOLD │
-     * ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤
-     * │  _______  │  _______  │  _______  │                            _______                            │ _______ │ _______ │ _______ │ KC_MPRV │ KC_MPLY │ KC_MNXT │
-     * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
-     */
-    [_FN1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
-        _______, _______, _______, _______, BL_DOWN,BL_TOGG, BL_UP,  BL_STEP, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT
-    )
-};
-
-void toggle_rgb_caps_lock(bool isActive) {
-    if (isActive) {
-        if (!rgblight_config.enable) {
-            rgblight_enable();
-        }
-
-        // Set underglow color if CAPS_LOCK enabled
-        rgblight_sethsv(HSV_RED);
-        // Set to breathe
-        rgblight_mode(5);
-    } else {
-        restore_user_rgb_settings();
-    }
-};
-
-bool led_update_user(led_t led_state) {
-    toggle_rgb_caps_lock(led_state.caps_lock);
-    return true;
-};
diff --git a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/rules.mk b/keyboards/kbdfans/kbd75/keymaps/adamdehaven/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/adamdehaven/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
deleted file mode 100644
index 80b6c6bfe30..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#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,   KC_PSCR,  KC_SCRL,  KC_DEL,
-    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_PGUP,
-    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_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,    LT(1,KC_END),
-    KC_CAPS,  KC_LALT,  _______,                      _______,  KC_SPC,   _______,                      KC_RGUI,  _______,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-
-	[1] = LAYOUT(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
-  )
-
-};
diff --git a/keyboards/kbdfans/kbd75/keymaps/broswen/README.md b/keyboards/kbdfans/kbd75/keymaps/broswen/README.md
deleted file mode 100644
index d95b3f2805f..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/broswen/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# KBD75 broswen keymap
-
-Almost default keymap for KBD75. 
-
-- Top right extra keys are media keys.
-
-- Vim style motion keys on layer 1
diff --git a/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c b/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c
deleted file mode 100644
index 3f79a130779..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/broswen/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#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,   KC_VOLD,  KC_VOLU,  KC_DEL,
-    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_DEL,   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,  MO(1),    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,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-
-  [1] = LAYOUT(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MNXT,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,
-    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
-  ),
-};
diff --git a/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c b/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c
deleted file mode 100644
index 975246f487f..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/digital/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#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,   KC_MPRV,  KC_MNXT,  KC_MPLY,
-    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_DEL,   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,
-    MO(1),    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,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-
-	[1] = LAYOUT(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,    KC_INS,
-    _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,                      _______,  _______,  _______,                      BL_TOGG,  BL_UP,    BL_DOWN,  _______,  _______,  _______
-  )
-};
diff --git a/keyboards/kbdfans/kbd75/keymaps/digital/readme.md b/keyboards/kbdfans/kbd75/keymaps/digital/readme.md
deleted file mode 100644
index 99c95a00ff9..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/digital/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# digital KBD75 Keymap
-
-ISO KBD75 keymap.
-
-![KBD75 digital keymap](https://i.imgur.com/IMb7eML.png)
diff --git a/keyboards/kbdfans/kbd75/keymaps/edulpn/README.md b/keyboards/kbdfans/kbd75/keymaps/edulpn/README.md
deleted file mode 100644
index e35eb983f37..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/edulpn/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Edulpn Keymap for the KBD75 PCB
-
-## Additional Notes
-75% Keymap for KBD75 with default ANSI layout + default layer switching for Windows and Mac "modes" + custom Fn layers for each mode.
-
-### Windows Mode
-![Edulpn Keymap for the KBD75 PCB Windows Mode](https://imgur.com/doI46vP.png)
-
-### Mac Mode
-![Edulpn Keymap for the KBD75 PCB Mac Mode](https://i.imgur.com/t7oTjjc.png)
-
-## Build
-To build the default keymap, simply run `make kbdfans/kbd75/rev2:edulpn`.
diff --git a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
deleted file mode 100644
index 61552499bd6..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define WINDOWS_LAYER 0
-#define WINDOWS_FN_LAYER 1
-#define MAC_LAYER 2
-#define MAC_FN_LAYER 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [WINDOWS_LAYER] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,                 KC_F11,   KC_F12,   KC_PSCR,  TO(MAC_LAYER),  KC_DEL,
-    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_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_TRNS,  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_LWIN,  KC_LALT,                      KC_SPC,   KC_SPC,   KC_SPC,                       MO(WINDOWS_FN_LAYER),   KC_TRNS,  KC_RCTL,  KC_LEFT,  KC_DOWN,        KC_RGHT
-  ),
-
-  [WINDOWS_FN_LAYER] = LAYOUT(
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_INS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
-  ),
-
-  [MAC_LAYER] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,             KC_F11,   KC_F12,   KC_PSCR,  TO(WINDOWS_LAYER),  KC_DEL,
-    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_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_TRNS,  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_LALT,  KC_LCMD,                      KC_SPC,   KC_SPC,   KC_SPC,                       MO(MAC_FN_LAYER),   KC_TRNS,  KC_RCTL,  KC_LEFT,  KC_DOWN,            KC_RGHT
-  ),
-
-  [MAC_FN_LAYER] = LAYOUT(
-    QK_BOOT,  KC_BRID,  KC_BRIU,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,    KC_VOLD,      KC_VOLU,    KC_TRNS,  KC_TRNS,  KC_INS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS,            KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,                            KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,      KC_TRNS,              KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case WINDOWS_LAYER:
-        rgblight_setrgb(RGB_BLUE);
-        break;
-    case WINDOWS_FN_LAYER:
-        rgblight_setrgb(RGB_BLUE);
-        break;
-    case MAC_LAYER:
-        rgblight_setrgb(RGB_WHITE);
-        break;
-    case MAC_FN_LAYER:
-        rgblight_setrgb(RGB_WHITE)
-        break;
-    default:
-        rgblight_setrgb (0x00,  0xFF, 0xFF);
-        break;
-    }
-    return state;
-}
diff --git a/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c b/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c
deleted file mode 100644
index 075fa78f092..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/ethan605/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2020 @ethan605
- *
- * 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: Qwerty layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │ INS │ DEL │ FN  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
-   * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │   BSPC    │HOME │
-   * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
-   * │  TAB   │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  BSLS  │END  │
-   * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-   * │  LCTRL  │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │    ENTER    │PGUP │
-   * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-   * │   LSHFT    │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  RSHFT   │ UP  │PGDN │
-   * ├──────┬─────┴─┬───┴──┬──┴─────┴─────┴─────┴─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
-   * │ CAPS │ LALT  │ LCMD │                 SPC                 │RCMD │RALT │RCTL │LEFT │DOWN │RIGHT│
-   * └──────┴───────┴──────┴─────────────────────────────────────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-  [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_INS,   KC_DEL,   MO(1),
-    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_DEL,   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_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,  MO(1),    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_CAPS,  KC_LALT,  KC_LCMD,                      KC_SPC,   KC_SPC,   KC_SPC,                       KC_RCMD,  KC_RALT,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-
-  /* 1: Function layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │ FN  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │   QK_BOOT   │     │
-   * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
-   * │        │ TOG │ MOD │ HU+ │ HU- │ SA+ │ SA- │ VA+ │ VA- │     │     │     │     │        │     │ // RGB controls
-   * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-   * │         │     │     │     │     │     │     │     │     │     │     │     │             │     │
-   * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-   * │            │     │     │     │ DEC │ TOG │ INC │STEP │     │     │     │          │     │     │ // Backlight controls
-   * ├──────┬─────┴─┬───┴──┬──┴─────┴─────┴─────┴─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
-   * │      │       │      │                                     │     │     │     │     │     │     │
-   * └──────┴───────┴──────┴─────────────────────────────────────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-  [1] = LAYOUT(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,
-    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
-  ),
-};
diff --git a/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c b/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c
deleted file mode 100644
index b171d25577d..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/kingwangwong/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QW,
-    _FO,
-    _FL,
-    _CL,
-    _DL
-};
-
-
-
-
-// Custom macros
-#define SPC_FUN LT(_FL, KC_SPC)
-#define BSC_CON LT(_CL, KC_BSPC)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: Qwerty layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │PRSCR│ INS │HOME │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │BSLS │ DEL │ END │
-   * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┼─────┤
-   * │TAB     │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │BSPC    │PGUP │
-   * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-   * │CAPS     │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │ENTER        │PGDN │
-   * ├──────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-   * │LSHFT │LSHFT│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │RSHFT     │ UP  │MO_CL│
-   * ├──────┼─────┴─┬───┴──┬──┴─────┴────┬┴─────┼─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
-   * │LCTRL │L_GUI  │L_ALT │SPC          │MO(_FL│BSPC            │R_ALT│R_GUI│R_CTR│LEFT │DOWN │RIGHT│
-   * └──────┴───────┴──────┴─────────────┴──────┴────────────────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 0: QWERTY */
-  [_QW] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_INS,   KC_HOME, 
-    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_BSLS,  KC_DEL,   KC_END,  
-    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_BSPC,            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_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,    MO(_CL), 
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,   MO(_FL),  KC_BSPC,                      KC_RALT,  KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* 1: forty: this layer emulates a forty percent keyboard so I can transition to a forty percent :)
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┼─────┤
-   * │ESC     │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │ENT  │     │        │     │
-   * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-   * │TAB      │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │ '   │             │     │
-   * ├──────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-   * │LSHFT │LSHFT│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │RSHFT     │     │MO_CL│
-   * ├──────┼─────┴─┬───┴──┬──┴─────┴────┬┴─────┼─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
-   * │LCTRL │L_ALT  │MO(DL)│SPCFUN       │BSPC  │MO(_CL)         │R_ALT│R_GUI│R_CTR│     │     │     │
-   * └──────┴───────┴──────┴─────────────┴──────┴────────────────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 1: FORTY */
-  [_FO] = 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, 
-    KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_ENT,   XXXXXXX,  XXXXXXX,            XXXXXXX, 
-    KC_TAB,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            XXXXXXX,            XXXXXXX, 
-    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,  XXXXXXX,  MO(_CL), 
-    KC_LCTL,  KC_LALT,  MO(_DL),                      SPC_FUN,  KC_BSPC,  MO(_CL),                      KC_RALT,  KC_RGUI,  KC_RCTL,  XXXXXXX,  XXXXXXX,  XXXXXXX),
-
-
-  /* 2: Function layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┼─────┤
-   * │        │     │HOME │ UP  │END  │     │     │     │     │     │     │     │     │        │VOLUP│
-   * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-   * │         │     │LEFT │DOWN │RIGHT│     │     │     │     │     │     │     │             │VOLDN│
-   * ├──────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-   * │      │     │     │     │PGDN │PGUP │     │     │     │     │     │     │          │     │     │
-   * ├──────┼─────┴─┬───┴──┬──┴─────┴────┬┴─────┼─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
-   * │      │       │      │             │      │                │VOLDN│VOLUP│     │     │     │     │
-   * └──────┴───────┴──────┴─────────────┴──────┴────────────────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 2: ANSI Fn layer */
-  [_FL] = LAYOUT(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-    _______,  _______,  KC_HOME,  KC_UP,    KC_END,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            KC_VOLU, 
-    _______,  _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            KC_VOLD, 
-    _______,  _______,  _______,  KC_PGDN,  KC_PGUP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______, 
-    _______,  _______,  _______,                      _______,  _______,  _______,                      KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______),
-
-  /* 3: Control layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │QK_BOOT│QWERT│FORTY│     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┼─────┤
-   * │   `    │  !  │  @  │  #  │  $  │  %  │  ^  │  &  │  *  │  (  │  )  │ DEL │     │        │     │
-   * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-   * │         │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  \  │             │     │
-   * ├──────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-   * │      │     │     │     │     │     │     │     │     │     │     │     │          │     │     │
-   * ├──────┼─────┴─┬───┴──┬──┴─────┴────┬┴─────┼─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
-   * │      │       │      │             │      │                │     │     │     │     │     │     │
-   * └──────┴───────┴──────┴─────────────┴──────┴────────────────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 3:  Control layer */
-  [_CL] = LAYOUT(
-    QK_BOOT,  TO(_QW),  TO(_FO),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG, 
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_MOD, 
-    KC_GRV,   KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_DEL,   _______,  _______,            KC_VOLU, 
-    _______,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSLS,            _______,            KC_VOLD, 
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  RGB_SAI,  _______, 
-    _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  RGB_VAD,  RGB_VAI,  RGB_HUD,  RGB_SAD,  RGB_HUI),
-
-    /* 4: Another layer for ease 
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │ KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┼─────┤
-   * │        │     │     │     │     │     │     │  _  │  +  │  {  │  }  │  |  │     │        │     │
-   * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-   * │         │     │     │     │     │     │     │  -  │  =  │  [  │  ]  │  \  │             │     │
-   * ├──────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-   * │      │     │     │     │     │     │     │     │     │     │     │     │          │     │     │
-   * ├──────┼─────┴─┬───┴──┬──┴─────┴────┬┴─────┼─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
-   * │      │       │      │             │      │                │     │     │     │     │     │     │
-   * └──────┴───────┴──────┴─────────────┴──────┴────────────────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 3: D control layer */
-  [_DL] = LAYOUT(
-    QK_BOOT,  TO(_QW),  TO(_FO),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG, 
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_MOD, 
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,  _______,  _______,            KC_VOLU, 
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,            _______,            KC_VOLD, 
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  RGB_SAI,  _______, 
-    _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  RGB_VAD,  RGB_VAI,  RGB_HUD,  RGB_SAD,  RGB_HUI)
-};
diff --git a/keyboards/kbdfans/kbd75/keymaps/smt/keymap.c b/keyboards/kbdfans/kbd75/keymaps/smt/keymap.c
deleted file mode 100644
index c8a36f9b4f9..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,176 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _FL 3
-#define _CL 4
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK
-};
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: Qwerty layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │PRSCR│PAUSE│ DEL │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │  \  │ INS │HOME │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │H_TAB│  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │BKSPC│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │C_ESC│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│ UP  │ END │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_GUI│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ _FL │R_GUI│LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 0: ANSI qwerty */
-  [_QWERTY] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_PAUS,  KC_DEL,
-    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_BSLS,  KC_INS,   KC_HOME,
-    HPR_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_BSPC,            KC_PGUP,
-    CTL_ESC,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_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,            SFT_ENT,  KC_UP,    KC_END,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,   KC_SPC,   KC_SPC,                       KC_RALT,  MO(_FL),  KC_RGUI,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* 1: Colemak layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │PRSCR│PAUSE│ DEL │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │  \  │ INS │HOME │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │H_TAB│  Q  │  W  │  F  │  P  │  G  │  J  │  L  │  U  │  Y  │  ;  │  [  │  ]  │BKSPC│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │C_ESC│  A  │  R  │  S  │  T  │  D  │  H  │  N  │  E  │  I  │  O  │  '  │▒▒▒▒▒│ENTER│█████│PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  K  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│ UP  │ END │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_GUI│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ _FL │R_GUI│LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 1: ANSI colemak */
-  [_COLEMAK] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_PAUS,  KC_DEL,
-    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_BSLS,  KC_INS,   KC_HOME,
-    HPR_TAB,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,     KC_J,     KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_LBRC,  KC_RBRC,  KC_BSPC,            KC_PGUP,
-    CTL_ESC,  KC_A,     KC_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_I,     KC_O,     KC_QUOT,            KC_ENT,             KC_PGDN,
-    KC_LSFT,  _______,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            SFT_ENT,  KC_UP,    KC_END,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,   KC_SPC,   KC_SPC,                       KC_RALT,  MO(_FL),  KC_RGUI,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* 2: Dvorak layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │PRSCR│PAUSE│ DEL │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │  \  │ INS │HOME │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │H_TAB│  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │BKSPC│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │C_ESC│  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│ENTER│█████│PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│RSHFT│ UP  │ END │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_GUI│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ _FL │R_GUI│LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 2: ANSI dvorak */
-  [_DVORAK] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_PAUS,  KC_DEL,
-    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_INS,   KC_HOME,
-    HPR_TAB,  KC_QUOT,  KC_COMM,  KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,     KC_C,     KC_R,     KC_L,     KC_SLSH,  KC_EQL,   KC_BSPC,            KC_PGUP,
-    CTL_ESC,  KC_A,     KC_O,     KC_E,     KC_U,     KC_I,     KC_D,     KC_H,     KC_T,     KC_N,     KC_S,     KC_MINS,            KC_ENT,             KC_PGDN,
-    KC_LSFT,  _______,  KC_SCLN,  KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,     KC_M,     KC_W,     KC_V,     KC_Z,               SFT_ENT,  KC_UP,    KC_END,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,   KC_SPC,   KC_SPC,                       KC_RALT,  MO(_FL),  KC_RGUI,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* 3: Function layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │█████│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │ _CL │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │PG_UP│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │█████│█████│█████│     │█████│█████│█████│     │ _FL │     │HOME │PG_DN│ END │
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 3: ANSI Fn layer */
-  [_FL] = LAYOUT(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,  _______,  MO(_CL),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            KC_PGUP,  _______,
-    _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  MO(_FL),  _______,  KC_HOME,  KC_PGDN,  KC_END),
-
-  /* 4: Control layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │     │     │ RGB │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │QK_BOOT│     │     │QWRTY│COLMK│DVORK│     │     │     │     │█████│RGBV+│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │ _CL │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│RGBV-│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │ _FL │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │RGBS+│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │█████│█████│█████│RGB_M│█████│█████│█████│     │ _FL │     │RGBH-│RGBS-│RGBH+│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 4: ANSI control layer */
-  [_CL] = LAYOUT(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,
-    _______,  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  QWERTY,   COLEMAK,  DVORAK,   _______,  _______,  _______,  _______,            RGB_VAI,
-    _______,  _______,  MO(_CL),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            RGB_VAD,
-    MO(_FL),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_SAI,  _______,
-    _______,  _______,  _______,                      _______,  RGB_MOD,  _______,                      _______,  MO(_FL),  _______,  RGB_HUD,  RGB_SAD,  RGB_HUI),
-};
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
deleted file mode 100644
index 6816c3302d5..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-#define _BL 0 // Base Layer
-#define _FN 1 // Function Layer
-#define _CL 2 // Control+ Layer
-
-// Add names for complex momentary keys, to keep the keymap matrix aligned better.
-#define CTL_ESC MT(MOD_LCTL,KC_ESC)
-#define GUI_ENT MT(MOD_RGUI, KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BL] = 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_F13,   MO(_FN),  KC_DEL,
-    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_DEL,   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,
-    CTL_ESC,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,                      KC_ENT,   KC_PGDN,
-    KC_LSFT,  MO(_FN),  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,
-    MO(_CL),  KC_LALT,  KC_LGUI,                      KC_SPC,   KC_SPC,   KC_SPC,                       GUI_ENT,  KC_RALT,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-
-  [_FN] = LAYOUT(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,
-    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  BL_DOWN,  BL_TOGG,  BL_UP,    BL_STEP,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,  _______,                      _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______
-  ),
-
-  [_CL] = LAYOUT(
-    LCTL(KC_ESC),   LCTL(KC_F1),    LCTL(KC_F2),    LCTL(KC_F3),  LCTL(KC_F4),  LCTL(KC_F5),  LCTL(KC_F6),  LCTL(KC_F7),  LCTL(KC_F8), LCTL(KC_F9),    LCTL(KC_F10),   LCTL(KC_F11),   LCTL(KC_F12),   LCTL(KC_PSCR),  _______,        LCTL(KC_DEL),
-    KC_ESC,         LCTL(KC_1),     LCTL(KC_2),     LCTL(KC_3),   LCTL(KC_4),   LCTL(KC_5),   LCTL(KC_6),   LCTL(KC_7),   LCTL(KC_8),  LCTL(KC_9),     LCTL(KC_0),     LCTL(KC_MINS),  LCTL(KC_EQL),   LCTL(KC_DEL),   KC_DEL,         LCTL(KC_HOME),
-    LCTL(KC_TAB),   LCTL(KC_Q),     LCTL(KC_W),     LCTL(KC_E),   LCTL(KC_R),   LCTL(KC_T),   LCTL(KC_Y),   LCTL(KC_U),   LCTL(KC_I),  LCTL(KC_O),     KC_PGUP,        LCTL(KC_LBRC),  LCTL(KC_RBRC),  LCTL(KC_BSLS),                  LCTL(KC_PGUP),
-    CTL_ESC,        LCTL(KC_A),     LCTL(KC_S),     LCTL(KC_D),   LCTL(KC_F),   LCTL(KC_G),   KC_LEFT,      KC_DOWN,      KC_UP,       KC_RGHT,        LCTL(KC_SCLN),  LCTL(KC_QUOT),                                  LCTL(KC_ENT),   LCTL(KC_PGDN),
-    LCTL(KC_LSFT),  _______,        LCTL(KC_Z),     LCTL(KC_X),   LCTL(KC_C),   LCTL(KC_V),   LCTL(KC_B),   KC_PGDN,      LCTL(KC_M),  LCTL(KC_COMM),  LCTL(KC_DOT),   LCTL(KC_SLSH),  LCTL(KC_RSFT),                  LCTL(KC_UP),    LCTL(KC_END),
-    _______,        LCTL(KC_LALT),  LCTL(KC_LGUI),                              LCTL(KC_SPC), LCTL(KC_SPC), LCTL(KC_SPC),                              LCTL(KC_RGUI),  LCTL(KC_RALT),  LCTL(KC_RCTL),  LCTL(KC_LEFT),  LCTL(KC_DOWN),  LCTL(KC_RGHT)
-  ),
-
-};
diff --git a/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/readme.md b/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/readme.md
deleted file mode 100644
index 6a78140a3d5..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/spacemanspiff/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Spaceman Spiff Layout for KBD75
-
-![Keyboard Layout](https://i.imgur.com/tQLYDvu.png)
-
-<!-- http://www.keyboard-layout-editor.com/#/gists/c1e8a15c68e4c52eed84653f21ae2d29 -->
-
-Designed specifically to make switching back-n-forth with the Apple's MacBook Pro keyboard intuitive. Has a slight tendency toward readline/vim keybindings.
-
-Caps locks becomes an `Esc` when pressed alone, or a `Ctrl` when pressed with another key.
-
-# Base Layer
-
-As simalar to the Apple keyboard as possible. Notiable exception is `Caps Lock`:
-- `Esc` when pressed alone
-- `Ctrl` when pressed with another key
-
-# Control+ Layer
-
-Left Ctrl key switches to the "Control+ Layer". This layer mostly acts like a control key in most cases, with a few exceptions:
-
-- `Ctl+` + `hjkl` are vim-style motion keys
-- `Ctl+` + `p` and `Ctl+` + `n` are page up and down
-- `Ctl+` + `Backspace` is forward delete
-
-# Fn Layer
-
-Audio Controls:
-- `Fn` + `a` Volume Down
-- `Fn` + `s` Volume Up
-- `Fn` + `d` Mute
-
-To flash this layout you need to press `Fn+Backspace`
-
-
-
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
deleted file mode 100644
index e42b60811c8..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#undef MANUFACTURER
-#undef PRODUCT
-
-#define MANUFACTURER    "Potato Inc."
-#define PRODUCT         "Qt3.14"
-
-/* send tap key if no layer key was used even after tap delay */
-#define TAPPING_TERM 250
-#define RETRO_TAPPING
-
-/* turn off RGB when computer sleeps */
-#define RGBLIGHT_SLEEP
-
-#ifdef BACKLIGHT_LEVELS
-#undef BACKLIGHT_LEVELS
-#endif
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 8
-#endif
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
deleted file mode 100644
index c7f05a4e943..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY,
-    _FUNC,
-    _NUMPAD
-};
-
-enum keycodes {
-    QWERTY = SAFE_RANGE,
-    FUNC,
-    NUMPAD,
-    MACRO1,
-    MACRO2,
-    MACROTAB,
-    DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_ansi_1u(
-        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_INS, KC_DEL, KC_PSCR,
-        LT(_NUMPAD, 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(_FUNC), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FUNC] = LAYOUT_ansi_1u(
-        QK_BOOT, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_PAUS,
-        KC_TRNS, MACRO1, MACRO2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        MACROTAB, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS,
-        KC_TRNS, VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, DM_REC2, DM_PLY2, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_TOGG, BL_DOWN,BL_UP,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, DM_RSTP, DM_REC1, DM_PLY1, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, LCA(KC_DEL), KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_NUMPAD] = LAYOUT_ansi_1u(
-        KC_NUM,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_KP_SLASH, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ASTERISK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_MINUS, KC_TRNS, KC_KP_ENTER, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_0, KC_COMM, KC_DOT, KC_KP_PLUS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    
-    switch (keycode) {
-        case MACRO1:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCTL("c") SS_DOWN(X_LALT) SS_TAP(X_TAB) SS_UP(X_LALT) SS_LCTL("v") SS_TAP(X_TAB));
-                _delay_ms(50);
-                SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_TAB) SS_UP(X_LALT) SS_TAP(X_TAB));
-            } else {
-                
-            }
-            break;
-        case MACRO2:
-            if (record->event.pressed) {
-                SEND_STRING("GGWP");
-            } else {
-                
-            }
-            break;
-        case MACROTAB:
-            if (record->event.pressed) {
-                SEND_STRING("    ");
-            } else {
-                
-            }
-            break;
-    }
-    
-    return true;
-}
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        setPinOutput(B2);
-        writePinLow(B2);
-    } else {
-        setPinInput(B2);
-    }
-    return false;
-}
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/readme.md b/keyboards/kbdfans/kbd75/keymaps/tucznak/readme.md
deleted file mode 100644
index 96212584463..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# TuCZnak's modified layout
-
-This layout is made for the ANSI configuration of KBD75.
-It has a base layer, numpad on LT and a combined
-configuration / macro / media layer.
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk b/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk
deleted file mode 100644
index 71b25fcb121..00000000000
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # 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
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes           # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-VELOCIKEY_ENABLE = yes      # RGB memes for quickscoping teens
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd75/readme.md b/keyboards/kbdfans/kbd75/readme.md
index 60e71fdc943..834a70ce813 100644
--- a/keyboards/kbdfans/kbd75/readme.md
+++ b/keyboards/kbdfans/kbd75/readme.md
@@ -1,20 +1,18 @@
 # KBD75
 
-The KBD75 was sold through various rounds, with various PCB changes between them. 
+The KBD75 was sold through various rounds, with various PCB changes between them.
 
 * **Round 1 (2017)**: Black PCB - Bootmapper Client, atmega32a MCU (Use [Winkeyless.kr B.mini](../../winkeyless/bmini/) firmware)
 * **Round 2 (2018)**: White PCB - Bootmapper Client, atmega32a MCU (Use [ymdk/ymd75/rev1](../../ymdk/ymd75/rev1/) firmware)
-* **Round 3-5 (2018)**: White PCB - QMK Firmware, atmega32u4 MCU (Use KBD75 rev1 or rev2(without numpad support)) 
+* **Round 3-5 (2018)**: White PCB - QMK Firmware, atmega32u4 MCU (Use KBD75 rev1 or rev2(without numpad support))
 * **Round 6 (2019)**: White PCB with USB C - QMK Firmware, atmega32u4 MCU (Use KBD75 rev1 or rev2(with numpad support))
 * **V2 (2019-)**: Same as **Round 6** (above).
 
-**Firmware files are SPECIFIC to each board. Firmware files from one, will not work on the other.**
+**Firmware files are SPECIFIC to each board. Firmware files from one, will not work on the others.**
 
 * Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
 * Hardware Supported: KBD75 PCB [rev1](./rev1) and [rev2](./rev2)
-* Hardware Availability:
-  * [KBD75 rev2 Kit – KBDfans.com](https://kbdfans.com/collections/75-diy-kit/products/kbd75v2-custom-keyboard-diy-kit)
-  * [KBD75 rev2 PCB – KBDfans.com](https://kbdfans.com/collections/pcb/products/kbdfans-75-pcb-75)
+* Hardware Availability: no longer available
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json
index d9d149f1e1a..efbfbe60ddc 100644
--- a/keyboards/kbdfans/kbd75/rev1/info.json
+++ b/keyboards/kbdfans/kbd75/rev1/info.json
@@ -239,7 +239,7 @@
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
-        "LAYOUT_75_iso": {
+        "LAYOUT_75_ansi_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -271,7 +271,8 @@
                 {"matrix": [1, 10], "x": 10, "y": 1},
                 {"matrix": [1, 11], "x": 11, "y": 1},
                 {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
                 {"matrix": [1, 15], "x": 15, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
@@ -287,6 +288,7 @@
                 {"matrix": [2, 11], "x": 10.5, "y": 2},
                 {"matrix": [2, 12], "x": 11.5, "y": 2},
                 {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
                 {"matrix": [2, 15], "x": 15, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
@@ -301,12 +303,10 @@
                 {"matrix": [3, 10], "x": 9.75, "y": 3},
                 {"matrix": [3, 11], "x": 10.75, "y": 3},
                 {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
                 {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4},
                 {"matrix": [4, 3], "x": 3.25, "y": 4},
                 {"matrix": [4, 4], "x": 4.25, "y": 4},
@@ -333,6 +333,191 @@
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
+        "LAYOUT_75_ansi_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
         "LAYOUT_75_ansi_wkl": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
@@ -424,7 +609,7 @@
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
-        "LAYOUT_75_iso_wkl": {
+        "LAYOUT_75_ansi_wkl_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -456,7 +641,8 @@
                 {"matrix": [1, 10], "x": 10, "y": 1},
                 {"matrix": [1, 11], "x": 11, "y": 1},
                 {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
                 {"matrix": [1, 15], "x": 15, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
@@ -472,7 +658,7 @@
                 {"matrix": [2, 11], "x": 10.5, "y": 2},
                 {"matrix": [2, 12], "x": 11.5, "y": 2},
                 {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
                 {"matrix": [2, 15], "x": 15, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
@@ -487,11 +673,10 @@
                 {"matrix": [3, 10], "x": 9.75, "y": 3},
                 {"matrix": [3, 11], "x": 10.75, "y": 3},
                 {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
                 {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4},
                 {"matrix": [4, 3], "x": 3.25, "y": 4},
                 {"matrix": [4, 4], "x": 4.25, "y": 4},
@@ -516,7 +701,7 @@
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
-        "LAYOUT_75_ansi_rwkl": {
+        "LAYOUT_75_iso": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -564,7 +749,6 @@
                 {"matrix": [2, 11], "x": 10.5, "y": 2},
                 {"matrix": [2, 12], "x": 11.5, "y": 2},
                 {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
                 {"matrix": [2, 15], "x": 15, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
@@ -579,10 +763,12 @@
                 {"matrix": [3, 10], "x": 9.75, "y": 3},
                 {"matrix": [3, 11], "x": 10.75, "y": 3},
                 {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
                 {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
                 {"matrix": [4, 2], "x": 2.25, "y": 4},
                 {"matrix": [4, 3], "x": 3.25, "y": 4},
                 {"matrix": [4, 4], "x": 4.25, "y": 4},
@@ -601,14 +787,15 @@
                 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
                 {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
                 {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
                 {"matrix": [5, 13], "x": 13, "y": 5},
                 {"matrix": [5, 14], "x": 14, "y": 5},
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
-        "LAYOUT_75_iso_rwkl": {
+        "LAYOUT_75_iso_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -640,7 +827,8 @@
                 {"matrix": [1, 10], "x": 10, "y": 1},
                 {"matrix": [1, 11], "x": 11, "y": 1},
                 {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
                 {"matrix": [1, 15], "x": 15, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
@@ -656,7 +844,6 @@
                 {"matrix": [2, 11], "x": 10.5, "y": 2},
                 {"matrix": [2, 12], "x": 11.5, "y": 2},
                 {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
                 {"matrix": [2, 15], "x": 15, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
@@ -672,6 +859,7 @@
                 {"matrix": [3, 11], "x": 10.75, "y": 3},
                 {"matrix": [3, 12], "x": 11.75, "y": 3},
                 {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
                 {"matrix": [3, 15], "x": 15, "y": 3},
 
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
@@ -694,6 +882,379 @@
                 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
                 {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
                 {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
                 {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
                 {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
                 {"matrix": [5, 13], "x": 13, "y": 5},
diff --git a/keyboards/kbdfans/kbd75/rev1/matrix_diagram.md b/keyboards/kbdfans/kbd75/rev1/matrix_diagram.md
new file mode 100644
index 00000000000..82bc199b538
--- /dev/null
+++ b/keyboards/kbdfans/kbd75/rev1/matrix_diagram.md
@@ -0,0 +1,32 @@
+# Matrix Diagram for KBDfans KBD75 rev1
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │    │1E     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+│20   │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E   │2F │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐3D  │ ISO Enter
+│30    │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D      │3F │   │2E │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │4F │
+├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│50  │51  │53  │54      │56  │58        │5A │5B │5C │5D │5E │5F │
+└────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
+┌────────┐
+│40      │ 2.25u LShift
+└────────┘
+┌────┬────┬────┬────────────────────────┬───┬───┬───┐
+│50  │51  │53  │56                      │5A │5B │5C │ Standard
+└────┴────┴────┴────────────────────────┴───┴───┴───┘
+┌────┬────┬────┬────────────────────────┬─────┬─────┐
+│50  │51  │53  │56                      │5A   │5C   │ RWKL
+└────┴────┴────┴────────────────────────┴─────┴─────┘
+┌─────┬─────┬───────────────────────────┬───┬───┬───┐
+│50   │51   │56                         │5A │5B │5C │ LWKL
+└─────┴─────┴───────────────────────────┴───┴───┴───┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┐
+│50   │51   │56                         │5A   │5C   │ WKL
+└─────┴─────┴───────────────────────────┴─────┴─────┘
+```
diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json
index 7cf43b93a76..12a1737eadd 100644
--- a/keyboards/kbdfans/kbd75/rev2/info.json
+++ b/keyboards/kbdfans/kbd75/rev2/info.json
@@ -239,7 +239,7 @@
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
-        "LAYOUT_75_iso": {
+        "LAYOUT_75_ansi_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -271,7 +271,8 @@
                 {"matrix": [1, 10], "x": 10, "y": 1},
                 {"matrix": [1, 11], "x": 11, "y": 1},
                 {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
                 {"matrix": [1, 15], "x": 15, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
@@ -287,6 +288,7 @@
                 {"matrix": [2, 11], "x": 10.5, "y": 2},
                 {"matrix": [2, 12], "x": 11.5, "y": 2},
                 {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
                 {"matrix": [2, 15], "x": 15, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
@@ -301,12 +303,10 @@
                 {"matrix": [3, 10], "x": 9.75, "y": 3},
                 {"matrix": [3, 11], "x": 10.75, "y": 3},
                 {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
                 {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4},
                 {"matrix": [4, 3], "x": 3.25, "y": 4},
                 {"matrix": [4, 4], "x": 4.25, "y": 4},
@@ -333,6 +333,191 @@
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
+        "LAYOUT_75_ansi_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
         "LAYOUT_75_ansi_wkl": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
@@ -424,7 +609,7 @@
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
-        "LAYOUT_75_iso_wkl": {
+        "LAYOUT_75_ansi_wkl_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -456,7 +641,8 @@
                 {"matrix": [1, 10], "x": 10, "y": 1},
                 {"matrix": [1, 11], "x": 11, "y": 1},
                 {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
                 {"matrix": [1, 15], "x": 15, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
@@ -472,7 +658,7 @@
                 {"matrix": [2, 11], "x": 10.5, "y": 2},
                 {"matrix": [2, 12], "x": 11.5, "y": 2},
                 {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
                 {"matrix": [2, 15], "x": 15, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
@@ -487,11 +673,10 @@
                 {"matrix": [3, 10], "x": 9.75, "y": 3},
                 {"matrix": [3, 11], "x": 10.75, "y": 3},
                 {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
                 {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4},
                 {"matrix": [4, 3], "x": 3.25, "y": 4},
                 {"matrix": [4, 4], "x": 4.25, "y": 4},
@@ -516,7 +701,7 @@
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
-        "LAYOUT_75_ansi_rwkl": {
+        "LAYOUT_75_iso": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -564,7 +749,6 @@
                 {"matrix": [2, 11], "x": 10.5, "y": 2},
                 {"matrix": [2, 12], "x": 11.5, "y": 2},
                 {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
                 {"matrix": [2, 15], "x": 15, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
@@ -579,10 +763,12 @@
                 {"matrix": [3, 10], "x": 9.75, "y": 3},
                 {"matrix": [3, 11], "x": 10.75, "y": 3},
                 {"matrix": [3, 12], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
                 {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
                 {"matrix": [4, 2], "x": 2.25, "y": 4},
                 {"matrix": [4, 3], "x": 3.25, "y": 4},
                 {"matrix": [4, 4], "x": 4.25, "y": 4},
@@ -601,14 +787,15 @@
                 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
                 {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
                 {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
                 {"matrix": [5, 13], "x": 13, "y": 5},
                 {"matrix": [5, 14], "x": 14, "y": 5},
                 {"matrix": [5, 15], "x": 15, "y": 5}
             ]
         },
-        "LAYOUT_75_iso_rwkl": {
+        "LAYOUT_75_iso_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -640,7 +827,8 @@
                 {"matrix": [1, 10], "x": 10, "y": 1},
                 {"matrix": [1, 11], "x": 11, "y": 1},
                 {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
                 {"matrix": [1, 15], "x": 15, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
@@ -656,7 +844,6 @@
                 {"matrix": [2, 11], "x": 10.5, "y": 2},
                 {"matrix": [2, 12], "x": 11.5, "y": 2},
                 {"matrix": [2, 13], "x": 12.5, "y": 2},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
                 {"matrix": [2, 15], "x": 15, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
@@ -672,6 +859,7 @@
                 {"matrix": [3, 11], "x": 10.75, "y": 3},
                 {"matrix": [3, 12], "x": 11.75, "y": 3},
                 {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
                 {"matrix": [3, 15], "x": 15, "y": 3},
 
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
@@ -694,6 +882,379 @@
                 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
                 {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
                 {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 14], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
                 {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
                 {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
                 {"matrix": [5, 13], "x": 13, "y": 5},
diff --git a/keyboards/kbdfans/kbd75/rev2/matrix_diagram.md b/keyboards/kbdfans/kbd75/rev2/matrix_diagram.md
new file mode 100644
index 00000000000..0de62fbefde
--- /dev/null
+++ b/keyboards/kbdfans/kbd75/rev2/matrix_diagram.md
@@ -0,0 +1,35 @@
+# Matrix Diagram for KBDfans KBD75 rev2
+
+```
+                                            ┌───────┬───────┐
+                        Numpad 2u Backspace │1C     │1E     │ 2u Backspace
+                                            └───────┴───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌───┬───┬─────┐      ┌─────┬───┬───┐      ┌─────┬───┬───┐
+│20   │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E   │2F │      │2C │2D │     │      │2C   │2D │2E │      │     │2D │2E │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┬──┴┬──┴┐3D  │   ┌──┴─────┼───┼───┤   ┌──┴┐3B  ├───┼───┤
+│30    │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D      │3F │   │3B │3C │2E │    │   │3B      │3C │3D │   │2C │    │3C │3D │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴───┴───┴────┘   └────────┴───┴───┘   └───┴────┴───┴───┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D    │4E │4F │    ISO Enter            Numpad ANSI Enter    Numpad ISO Enter
+├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│50  │51  │53  │54      │56  │58        │5A │5B │5C │5D │5E │5F │
+└────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
+┌────────┐                               ┌──────┬───┬───┐
+│40      │ 2.25u LShift                  │4A    │4B │4D │ Numpad RShift (1/1/1.75u)
+└────────┘                               └──────┴───┴───┘
+┌────┬────┬────┬────────────────────────┬───┬───┬───┐
+│50  │51  │53  │56                      │5A │5B │5C │ Standard
+└────┴────┴────┴────────────────────────┴───┴───┴───┘
+┌────┬────┬────┬────────────────────────┬─────┬─────┐
+│50  │51  │53  │56                      │5A   │5C   │ RWKL
+└────┴────┴────┴────────────────────────┴─────┴─────┘
+┌─────┬─────┬───────────────────────────┬───┬───┬───┐
+│50   │51   │56                         │5A │5B │5C │ LWKL
+└─────┴─────┴───────────────────────────┴───┴───┴───┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┐
+│50   │51   │56                         │5A   │5C   │ WKL
+└─────┴─────┴───────────────────────────┴─────┴─────┘
+```
diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h
index 6a5b35b5b65..05ad34d3f57 100644
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -17,6 +17,5 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json
index fc2310993ce..097bb6003ad 100644
--- a/keyboards/kbdfans/kbd75hs/info.json
+++ b/keyboards/kbdfans/kbd75hs/info.json
@@ -33,6 +33,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index a8b20051ecf..d7040d41727 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -18,36 +18,3 @@
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-
-#define RGB_MATRIX_LED_COUNT 84
-#define RGB_MATRIX_KEYPRESSES
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#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
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspendedz
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json
index f5019653483..ee8d20a90f9 100644
--- a/keyboards/kbdfans/kbd75rgb/info.json
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@@ -27,10 +27,43 @@
         "pin": "C7"
     },
     "rgb_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
         "sat_steps": 8,
         "val_steps": 8,
-        "speed_steps": 10
+        "speed_steps": 10,
+        "max_brightness": 150,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c
deleted file mode 100644
index 2e91933f442..00000000000
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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( /* 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_PSCR, KC_SCRL, KC_PAUS,
-	KC_LGUI, 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_INS,  KC_HOME, KC_PGUP,
-	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
-	MO(1),   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_BSLS, 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_UP,
-	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_GRV,  BL_TOGG, KC_DEL,           KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT( /* Base */
-    
-	_______,          _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, _______,          _______, _______, _______,
-	_______, 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_BSPC,          _______, _______, _______,
-	KC_CAPS, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP,   _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______,          _______, _______, _______,
-	_______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR, _______,                   KC_PGUP,
-	_______, _______, _______,                            _______,                                     _______, _______, _______, _______,          KC_HOME, KC_PGDN, KC_END
-  )
-};
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/readme.md b/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/readme.md
deleted file mode 100644
index d48343e70da..00000000000
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# The ai03 keymap for KBD8X MKII
-
-A strange layout that focuses functionality into the alphanumerics cluster.  
-Fn row and further keys effectively become nothing more than decoration.
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbdmini/config.h b/keyboards/kbdfans/kbdmini/config.h
index be985880d08..130f99d7b7e 100644
--- a/keyboards/kbdfans/kbdmini/config.h
+++ b/keyboards/kbdfans/kbdmini/config.h
@@ -1,58 +1,3 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-// #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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define RGB_MATRIX_LED_COUNT 52
-#endif
diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/info.json
index 99aa4a4113c..3b16188b32c 100644
--- a/keyboards/kbdfans/kbdmini/info.json
+++ b/keyboards/kbdfans/kbdmini/info.json
@@ -9,7 +9,36 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B3", "B2", "B1", "B0", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
index d46283b973b..7aec00cbdc2 100644
--- a/keyboards/kbdfans/kbdmini/kbdmini.c
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -1,61 +1,61 @@
 #include "quantum.h"
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, B_9,  A_9,  C_9  }, //LA33
-    { 0, B_10, A_10, C_10 }, //LA37
-    { 0, B_11, A_11, C_11 }, //LA41
-    { 0, B_12, A_12, C_12 }, //LA45
-    { 0, B_13, A_13, C_13 }, //LA49
-    { 0, B_14, A_14, C_14 }, //LA53
-    { 0, B_15, A_15, C_15 }, //LA57
-    { 0, B_6,  A_6,  C_6  }, //LA21
-    { 0, B_5,  A_5,  C_5  }, //LA17
-    { 0, B_4,  A_4,  C_4  }, //LA13
-    { 0, B_3,  A_3,  C_3  }, //LA9
-    { 0, B_2,  A_2,  C_2  }, //LA5
-    { 0, B_1,  A_1,  C_1  }, //LA1
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  }, //LA33
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 }, //LA37
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 }, //LA41
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 }, //LA45
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 }, //LA49
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 }, //LA53
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 }, //LA57
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  }, //LA21
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  }, //LA17
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  }, //LA13
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  }, //LA9
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  }, //LA5
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  }, //LA1
 
-    { 0, E_9,  D_9,  F_9  }, //LA34
-    { 0, E_10, D_10, F_10 }, //LA38
-    { 0, E_11, D_11, F_11 }, //LA42
-    { 0, E_12, D_12, F_12 }, //LA46
-    { 0, E_13, D_13, F_13 }, //LA50
-    { 0, E_14, D_14, F_14 }, //LA54
-    { 0, E_15, D_15, F_15 }, //LA58
-    { 0, E_6,  D_6,  F_6  }, //LA22
-    { 0, E_5,  D_5,  F_5  }, //LA18
-    { 0, E_4,  D_4,  F_4  }, //LA14
-    { 0, E_3,  D_3,  F_3  }, //LA10
-    { 0, E_2,  D_2,  F_2  }, //LA6
-    { 0, E_1,  D_1,  F_1  }, //LA2
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  }, //LA34
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 }, //LA38
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 }, //LA42
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 }, //LA46
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 }, //LA50
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 }, //LA54
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 }, //LA58
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  }, //LA22
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  }, //LA18
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  }, //LA14
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  }, //LA10
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  }, //LA6
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  }, //LA2
 
-    { 0, H_9,  G_9,  I_9  }, //LA35
-    { 0, H_10, G_10, I_10 }, //LA39
-    { 0, H_11, G_11, I_11 }, //LA43
-    { 0, H_12, G_12, I_12 }, //LA47
-    { 0, H_13, G_13, I_13 }, //LA51
-    { 0, H_14, G_14, I_14 }, //LA55
-    { 0, H_15, G_15, I_15 }, //LA59
-    { 0, H_6,  G_6,  I_6  }, //LA23
-    { 0, H_5,  G_5,  I_5  }, //LA19
-    { 0, H_4,  G_4,  I_4  }, //LA15
-    { 0, H_3,  G_3,  I_3  }, //LA11
-    { 0, H_2,  G_2,  I_2  }, //LA7
-    { 0, H_1,  G_1,  I_1  }, //LA3
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  }, //LA35
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 }, //LA39
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 }, //LA43
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 }, //LA47
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 }, //LA51
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 }, //LA55
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 }, //LA59
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  }, //LA23
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  }, //LA19
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  }, //LA15
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  }, //LA11
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  }, //LA7
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  }, //LA3
 
-    { 0, K_9,  J_9,  L_9  }, //LA36
-    { 0, K_10, J_10, L_10 }, //LA40
-    { 0, K_11, J_11, L_11 }, //LA44
-    { 0, K_12, J_12, L_12 }, //LA48
-    { 0, K_13, J_13, L_13 }, //LA52
-    { 0, K_14, J_14, L_14 }, //LA56
-    { 0, K_15, J_15, L_15 }, //LA60
-    { 0, K_6,  J_6,  L_6  }, //LA24
-    { 0, K_5,  J_5,  L_5  }, //LA20
-    { 0, K_4,  J_4,  L_4  }, //LA16
-    { 0, K_3,  J_3,  L_3  }, //LA12
-    { 0, K_2,  J_2,  L_2  }, //LA8
-    { 0, K_1,  J_1,  L_1  }  //LA4
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  }, //LA36
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 }, //LA40
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 }, //LA44
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 }, //LA48
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 }, //LA52
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 }, //LA56
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 }, //LA60
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  }, //LA24
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  }, //LA20
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  }, //LA16
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  }, //LA12
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  }, //LA8
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  }  //LA4
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
deleted file mode 100644
index 5bbd8666ae9..00000000000
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2021 Aaron VerDow
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include QMK_KEYBOARD_H
-
-// Layer declarations
-enum {
-    DEF_LAYER,
-    MOD_LAYER,
-};
-
-// Tap Dance declarations
-enum {
-    TD_CAR,
-    TD_PRINT,
-    TD_CAM_UP,
-    TD_CAM_DN
-};
-
-void camera_number(uint16_t tens, uint16_t ones) {
-/* Switch to a specific camera number
- *
- * I haven't been able to find official docs for this.
- *
- * To determine the number click the dropdown in UI and 
- * count from the top.  The list can change with updates.
- *
- * Shift must be held between both * presses or the combo
- * won't be recognized.
- */
-
-    register_code16(KC_LSFT);
-    tap_code(KC_8);
-    tap_code(KC_8);
-    unregister_code16(KC_LSFT);
-    tap_code(tens);
-    tap_code(ones);
-    tap_code(KC_ENT);
-}
-
-void cam_up(tap_dance_state_t *state, void *user_data) {
-    switch (state->count) {
-        case 1:                     
-            tap_code(KC_C);             // tap once for next cam
-            break;
-        case 2:                     
-            camera_number(KC_2,KC_0); // tap twice for reverse chase cam
-            break;
-    }
-}
-
-void cam_down(tap_dance_state_t *state, void *user_data) {
-    switch (state->count) {
-        case 1:                     
-            tap_code16(LSFT(KC_C));     // tap once for prev cam
-            break;
-        case 2:                     
-            camera_number(KC_1,KC_8); // tap twice for chase cam
-            break;
-    }
-}
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_CAR] = ACTION_TAP_DANCE_DOUBLE(
-        LSFT(KC_V),                 // tap once for prev car
-        LCTL(KC_V)                  // tap twice for my car
-    ),
-    [TD_PRINT] = ACTION_TAP_DANCE_DOUBLE(
-        LCTL(LALT(LSFT(KC_S))),     // tap once for iRacing screenshot (must be enabled in options)
-        LGUI(KC_PSCR)               // tap twice for Windows print screen and save to file
-    ),
-    [TD_CAM_UP] = ACTION_TAP_DANCE_FN(cam_up),
-    [TD_CAM_DN] = ACTION_TAP_DANCE_FN(cam_down)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [DEF_LAYER] = LAYOUT_ortho_6x4( /* Base */
-
-    TD(TD_CAM_UP),  // next cam, double tap for reverse chase cam
-    KC_V,           // next car
-    LSFT(KC_P3),    // next lap
-    LCTL(KC_P3),    // next inc
-
-    TD(TD_CAM_DN),  // prev cam, double tap for chase cam
-    TD(TD_CAR),     // prev car, double tap for my car
-    LSFT(KC_P1),    // prev lap
-    LCTL(KC_P1),    // prev inc
-
-    LSFT(KC_P4),    // rewind
-    KC_P5,          // play/pause
-    LSFT(KC_P6),    // fast forward
-    KC_P8,          // slow mo
-
-    KC_P4,          // prev frame
-    KC_W,           // up
-    KC_P6,          // next frame
-    TD(TD_PRINT),   // print screen
-
-    KC_A,           // left
-    KC_S,           // down
-    KC_D,           // right
-    LALT(KC_K),     // toggle click and drag ui elements (in car)
-
-    KC_LCTL,        // ctrl 
-    KC_LALT,        // alt
-    LCTL(KC_F12),   // camera tool
-    LT(MOD_LAYER, KC_SPACE)        // press once for UI, hold for MOD layer
-  ),
-
-  [MOD_LAYER] = LAYOUT_ortho_6x4( /* Base */
-
-    KC_B,           // next sub cam
-    KC_PGUP,        // next driver cam
-    LCTL(KC_P6),    // next session
-    KC_P7,          // start
-
-    LSFT(KC_B),     // prev sub cam
-    KC_PGDN,        // prev driver cam
-    LCTL(KC_P4),    // prev session
-    KC_P1,          // end
-
-    KC_RBRC,        // FOV up
-    KC_EQL,         // step factor up 
-    _______,
-    _______,
-
-    KC_LBRC,        // FOV down
-    KC_MINS,        // step factor down
-    _______,
-    _______,
-
-    _______,
-    _______,
-    _______,
-    _______,
-
-    _______,
-    LALT(KC_M),     // cycle aim
-    RALT(KC_ENTER), // fullscreen (unreliable)
-    _______
-  ),
-};
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md
deleted file mode 100644
index a574499c6b3..00000000000
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# iRacing Replay Tool
-
-![](https://imgur.com/0948eBGh.jpg)
-
-Replay/camera tool for iRacing.  This uses the default keybindings for the game so nothing should need to be mapped.  This makes replays much easier to view in VR and makes waiting through heats a lot more enjoyable.
-
-To make full use of the arrow keys open the camera tool (you can close the UI after) and optionally switch the AIM to static.
-
-The code to generate stl files for the keycap set are ![available here.](https://github.com/AaronVerDow/KeyV2/blob/numpad/src/layouts/numpad/iracing.scad)
-
-Other notes:
-* Hold MOD (UI key) to access features on the front of 
-* Double tap car down is a shortcut for your car
-* Double tap cam down is a shortcut for chase cam
-* Double tap cam up is a shortcut for reverse chase cam
-* The record button takes a screenshot using iRacing.  Double tap record button to auto save a screenshot using Windows.
-* The key above UI is unassigned  
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/kbdfans/kbdpad/mk3/config.h b/keyboards/kbdfans/kbdpad/mk3/config.h
deleted file mode 100644
index 16eb12d1f5e..00000000000
--- a/keyboards/kbdfans/kbdpad/mk3/config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * 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_MATRIX_LED_COUNT 21
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#define RGB_MATRIX_KEYPRESSES
-#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_PINWHEEL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#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_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
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json
index 8ba02f8fa18..735dd3e4ef4 100644
--- a/keyboards/kbdfans/kbdpad/mk3/info.json
+++ b/keyboards/kbdfans/kbdpad/mk3/info.json
@@ -9,7 +9,6 @@
         "command": false,
         "console": false,
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": true,
         "rgb_matrix": true
@@ -23,6 +22,43 @@
     },
     "processor": "atmega32u4",
     "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_pinwheel_sat": true,
+            "band_spiral_sat": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_nexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
@@ -47,7 +83,8 @@
             {"flags": 4, "matrix": [5, 2], "x": 150, "y": 64},
             {"flags": 4, "matrix": [5, 0], "x": 37.5, "y": 64}
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "sleep": true
     },
     "ws2812": {
         "pin": "F5"
diff --git a/keyboards/kbdfans/maja/config.h b/keyboards/kbdfans/maja/config.h
index e07c5adf934..82b582bfe12 100755
--- a/keyboards/kbdfans/maja/config.h
+++ b/keyboards/kbdfans/maja/config.h
@@ -1,61 +1,4 @@
 #pragma once
 
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_DISABLE_WHEN_USB_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
-// #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_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
-#define DRIVER_1_LED_TOTAL 36
-#define DRIVER_2_LED_TOTAL 31
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json
index 8ee6118452f..7b64cae8934 100644
--- a/keyboards/kbdfans/maja/info.json
+++ b/keyboards/kbdfans/maja/info.json
@@ -9,7 +9,41 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
diff --git a/keyboards/kbdfans/maja/maja.c b/keyboards/kbdfans/maja/maja.c
index d30d327113f..cc073930bc7 100755
--- a/keyboards/kbdfans/maja/maja.c
+++ b/keyboards/kbdfans/maja/maja.c
@@ -1,6 +1,6 @@
 #include "quantum.h"
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 	{0, C2_1,  C3_1,  C4_1},  // LA0
     {0, C1_1,  C3_2, C4_2},   // LA1
     {0, C1_2,  C2_2, C4_3},   // LA2
diff --git a/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
deleted file mode 100644
index d54737f47cb..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum layers {
-  _QWERTY,
-  _COLEMAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_mit(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_mit(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_mit(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______,     _______,      _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_mit(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |AG_NRM|AG_SWP|Qwerty|Colemk|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, _______,  _______, _______,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______,  _______,
-  _______, _______, _______,  _______, _______, _______,   _______,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-)
-
-
-};
-
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/abhixec/readme.md b/keyboards/kbdfans/niu_mini/keymaps/abhixec/readme.md
deleted file mode 100644
index 1bc312a0393..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/abhixec/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Abhixec's Layout
-
-This is inspired by planck but removed most of the unwanted and extra features of planck that is not there in this keyboard.
-
-
diff --git a/keyboards/kbdfans/niu_mini/keymaps/abhixec/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/abhixec/rules.mk
deleted file mode 100644
index 3bf3f273145..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/abhixec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_ENABLE = no
diff --git a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
deleted file mode 100644
index 7f6f89589bd..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Layer 0
-     * ,-----------------------------------------------------------------------------------.
-     * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  /   |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl |  GUI | Caps |  Alt |Layer1|    Space    |Layer2| Left | Down |  Up  |Right |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [0] = LAYOUT_planck_mit(
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-        KC_ESC,  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_CAPS, KC_LALT, MO(1),     KC_SPC,     MO(2), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-    /* Layer 1
-     * ,-----------------------------------------------------------------------------------.
-     * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  Del |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      | Vol- | Vol+ | Mute |      |      |      |  F11 |  F12 |      |      |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Reset|      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [1] = LAYOUT_planck_mit(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11,  KC_F12,  _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        QK_BOOT, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-    ),
-
-    /* Layer 2 (r_ Indicates RGB Controls)
-     * ,-----------------------------------------------------------------------------------.
-     * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |r_TOG |r_Mode|r_Hue+|r_Hue-|      |      |   -  |   =  |   [  |   ]  |  \   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |BL_TOG|BL_STEP|     |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [2] = LAYOUT_planck_mit(
-        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/readme.md b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/readme.md
deleted file mode 100644
index 661e24c9fa8..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## CodeCoffeeCode's 40% Keymap
-
-- Added Delete to Layer 1
-- Swapped Tab and Esc like on the Planck EZ
-- Put all the Arrows on the bottom row, moving the Forward Slash to beside Enter
\ No newline at end of file
diff --git a/keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c
deleted file mode 100644
index 752aa519c85..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c
+++ /dev/null
@@ -1,74 +0,0 @@
- /* Copyright 2020 Chus Jara Peinado
- *
- * 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
-     * ,-----------------------------------------------------------------------------------.
-     * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |  ?   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl |  GUI | Alt  |  "   |Layer1|    Space    |Layer2|  -   | Left | Down |Right |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [0] = LAYOUT_planck_mit(
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_UP,   KC_SLSH,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_QUOT, MO(1),     KC_SPC,     MO(2), KC_MINS, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Layer 1
-     * ,-----------------------------------------------------------------------------------.
-     * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | Del  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      | F11  | F12  |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |Reset |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [1] = LAYOUT_planck_mit(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-        _______, KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, QK_BOOT
-    ),
-
-    /* Layer 2 (r_ Indicates RGB Controls)
-     * ,-----------------------------------------------------------------------------------.
-     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |      |  [   |   ]  |   \  |   "  |      |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |  -   |   =  |      |      | Vol+ |PrtScr|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      | Vol- | Mute |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [2] = LAYOUT_planck_mit(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, KC_QUOT, _______, _______,
-        _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, _______, KC_VOLU, KC_PSCR,
-        _______, _______, _______, _______, _______,     _______,      _______, _______, _______, KC_VOLD, KC_MUTE
-    )
-};
diff --git a/keyboards/kbdfans/niu_mini/keymaps/dyesub/readme.md b/keyboards/kbdfans/niu_mini/keymaps/dyesub/readme.md
deleted file mode 100644
index e276c4d0608..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/dyesub/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Dye sub layout
-
-Simple layout based on the keycaps [DYE SUB](https://kbdfans.com/collections/oem-profile/products/40-layou-dye-sub-keycaps) from KDBFans.
-
-## Notes
-- There is a different ESC key position in this layout.
-- The mouse key, backlight and console for debug are disabled (Enable them by just modifying the `rules.mk` file).
diff --git a/keyboards/kbdfans/niu_mini/keymaps/dyesub/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/dyesub/rules.mk
deleted file mode 100644
index c5f09480a39..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/dyesub/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE = no
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
deleted file mode 100644
index fe276bac200..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Copyright 2021 Edvard Sire
- *
- * 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,
-    _NUMPAD,
-    _ARROWS,
-    _SPECIAL,
-    _FPS,
-    _FIGHTING,
-    _MOBA,
-    _MOBA2,
-    _MOUSE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,--------------------------------------------------------------------------------------,
- * |Esc/~ |   Q  |   W  |   E  |   R   |   T  |   Y  |   U    |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+-------+------+------+--------+------+--------------------|
- * | Tab  |   A  |   S  |   D  |   F   |   G  |   H  |   J    |   K  |   L  |   ;  |   "  |
- * |------+------+------+------+-------+------+------+--------+------+--------------------|
- * |Numpad|   Z  |   X  |   C  |   V   |   B  |   N  |   M    |   ,  |   .  |   /  |Arrows|
- * |------+------+------+------+-------+------+---------------+------+--------------------|
- * | Ctrl | GUI  |      |  Alt |Special|    Space    |RS/Enter|Mouse |      | Fps  | Del  |
- * `--------------------------------------------------------------------------------------`
- */
-[_QWERTY] = LAYOUT_planck_mit(
-    QK_GESC, 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,
-    MO(1), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(2),
-    KC_LCTL, KC_LGUI, KC_TRNS, KC_LALT, MO(3), KC_SPC, SC_SENT, MO(8), KC_TRNS, TO(4), KC_DEL
-),
-
-/* NUMPAD
- * ,-----------------------------------------------------------------------------------.
- * |      |      |Power |      |RGBmoG|      |      |  7   |   8  |   9  |      | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | Prev | Play | Next |      |      |  4   |   5  |   6  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Trns |      |RGBmo-|RBGmd+|RGBtog|      |      |  1   |   2  |   3  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |    Space    |  0   |   ,  |   .  |      |Reset |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_planck_mit(
-    KC_NO, KC_NO, KC_PWR, KC_NO, RGB_M_G, KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_NO, KC_BSPC,
-    KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_4, KC_5, KC_6, KC_NO, KC_NO,
-    KC_TRNS, KC_NO, RGB_RMOD, RGB_MOD, RGB_TOG, KC_NO, KC_NO, KC_1, KC_2, KC_3, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPC, KC_0, KC_COMM, KC_DOT, KC_NO, QK_BOOT
-),
-
-/* ARROWS
- * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |      |      |      |  Up  |      |      | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F5  |  F6  |  F7  |  F8  |      |      | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  | F10  | F11  | F12  |      |      |      |      |      |      | Trns |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LCtrl | F13  | F14  | F15  | F16  |   Left Alt  |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ARROWS] = LAYOUT_planck_mit(
-    KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_BSPC,
-    KC_NO, KC_F5, KC_F6, KC_F7, KC_F8, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO,
-    KC_NO, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
-    KC_LCTL, KC_F13, KC_F14, KC_F15, KC_F16, KC_LALT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-),
-
-/* SPECIAL
- * ,-----------------------------------------------------------------------------------.
- * |  ~   |  !   |  @   |  #   |  $   |  %   |  ^   |  *   |  (   |  )   |  \   | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  [   |      |      |      |  &   |      |  -   |  [   |  ]   |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |  =   |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | Trns |    Space    |LShift|      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_SPECIAL] = LAYOUT_planck_mit(
-    KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSLS, KC_BSPC,
-    KC_NO, KC_LBRC, KC_NO, KC_NO, KC_NO, KC_AMPR, KC_NO, KC_MINS, KC_LBRC, KC_RBRC, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_EQL, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_SPC, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO
-),
-
-/* FPS
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |QWERTY|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |RShift|  Q   |  W   |  E   |  R   |  T   |  Y   |QWERTY|      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Tab  |  A   |  S   |  D   |  G   |  B   |  `   |      |      |      | MOBA |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LCtrl |  Z   |  X   | LAlt |LShift|    Space    |Enter |      |      | Trns |FIGHTI|
- * `-----------------------------------------------------------------------------------'
- */
-[_FPS] = LAYOUT_planck_mit(
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, TO(0),
-    KC_RSFT, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, TO(0), KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_TAB, KC_A, KC_S, KC_D, KC_G, KC_B, KC_GRV, KC_NO, KC_NO, KC_NO, TO(6), KC_NO,
-    KC_LCTL, KC_Z, KC_X, KC_LALT, KC_LSFT, KC_SPC, KC_ENT, KC_NO, KC_NO, KC_TRNS, TO(5)
-),
-
-/* FIGHTING
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |      |  W   |      |      |      |      |      |      |      |      |QWERTY|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |  A   |  S   |  D   |      |      |      |  J   |  K   |  L   |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LCtrl |      |      |      |  H   |    Space    |      |      |      |      | Trns |
- * `-----------------------------------------------------------------------------------'
- */
-[_FIGHTING] = LAYOUT_planck_mit(
-    KC_ESC, KC_NO, KC_W, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0),
-    KC_TAB, KC_A, KC_S, KC_D, KC_NO, KC_NO, KC_NO, KC_J, KC_K, KC_L, 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_LCTL, KC_NO, KC_NO, KC_NO, KC_H, KC_SPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
-),
-
-/* MOBA
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |  1   |  2   |  3   |  4   |  5   |  6   |      |      |      |      |QWERTY|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |RShift|  Q   |  W   |  E   |  R   |  T   |  Y   |QWERTY|      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Tab  |  A   |  S   |  D   |  F   |  G   |  B   |      |      |      | Trns |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LCtrl |  Z   |  X   | LAlt |MOBA2 |    Space    |Enter |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MOBA] = LAYOUT_planck_mit(
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_NO, KC_NO, KC_NO, KC_NO, TO(0),
-    KC_RSFT, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, TO(0), KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_B, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO,
-    KC_LCTL, KC_Z, KC_X, KC_LALT, MO(7), KC_SPC, KC_ENT, KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-
-/* MOBA2
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | Trns |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MOBA2] = LAYOUT_planck_mit(
-    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_F1, KC_F2, KC_F3, KC_F4, 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,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-),
-
-/* MOBA2
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      | MUp  |      |      |      | MWUp |MWDown|      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |MLeft |MDown |MRight|      |      |Mouse1|Mouse2|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Trns |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MOUSE] = LAYOUT_planck_mit(
-    KC_NO, KC_NO, KC_NO, KC_MS_U, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_WH_D, KC_NO, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_BTN1, KC_BTN2, 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, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO
-    )
-};
diff --git a/keyboards/kbdfans/niu_mini/keymaps/edvard/readme.md b/keyboards/kbdfans/niu_mini/keymaps/edvard/readme.md
deleted file mode 100644
index 32846b4a55b..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/edvard/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Edvard's layout
-
-An efficient 40% keyboard layout
-
-[Writeup](https://github.com/EdvardSire/keyboard)
diff --git a/keyboards/kbdfans/niu_mini/keymaps/framtava/config.h b/keyboards/kbdfans/niu_mini/keymaps/framtava/config.h
deleted file mode 100644
index 0c42bb50602..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/framtava/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
deleted file mode 100644
index 3735744368b..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _BACKLIT
-};
-
-enum keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Brite |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_mit(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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, BACKLIT, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Brite |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_mit(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  KC_LCTL, KC_LGUI, KC_LALT, BACKLIT, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Brite |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_mit(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  KC_LCTL, KC_LGUI, KC_LALT, BACKLIT, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_mit(
-  _______, 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_TILD,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, KC_PIPE, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, KC_HOME, KC_PGDN, KC_PGUP,  KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |   4  |   5  |   6  |      |      |      |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   7  |   8  |   9  |      |      |      |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |   0  |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_mit(
-  KC_NUM,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,          KC_BSPC,
-  KC_DEL,  KC_4,    KC_5,    KC_6,    _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,  KC_GRV,
-  _______, KC_7,    KC_8,    KC_9,    _______, _______, _______, _______, KC_PSCR, _______, KC_BSLS, _______,
-  _______, _______, _______, KC_0,    _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_mit(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,        XXXXXXX,      KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  TOG |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |  MOD |  HUI |  HUD |
- * `-----------------------------------------------------------------------------------'
- */
-[_BACKLIT] = LAYOUT_planck_mit(
-  _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______,
-  RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_VAD,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, RGB_SAD,
-  _______, _______, _______, _______, _______,     _______,      _______, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        layer_on(_BACKLIT);
-        // update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_BACKLIT);
-        // update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/framtava/readme.md b/keyboards/kbdfans/niu_mini/keymaps/framtava/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/framtava/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/kbdfans/niu_mini/keymaps/framtava/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/framtava/rules.mk
deleted file mode 100644
index 8cf6f7d5cbf..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/framtava/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-CONSOLE_ENABLE = no         # Console for debug(+400)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
\ No newline at end of file
diff --git a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
deleted file mode 100644
index 9b8405b2af8..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum keycodes {
-  LOWER,
-  RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  |  '"  |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Caps | Esc  | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    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, KC_ENT ,
-    KC_CAPS, KC_ESC, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  ~   |  |   |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_planck_mit(
-    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,   KC_ASTR,    KC_LPRN, KC_RPRN, _______,
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,   KC_PLUS,    KC_LCBR, KC_RCBR, _______,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_GRV), S(KC_BSLS), _______, _______, _______,
-    _______, _______, _______, _______, _______,     _______,      _______,   KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      | Ins  | Home | PgUp | Pscr | Slck | Paus |   -  |   =  |   [  |   ]  |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      | Del  | End  | PgDn | Nlck |      |      |   `  |   \  |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_planck_mit(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    _______, KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-    _______, KC_DEL,  KC_END,  KC_PGDN, KC_NUM,  _______, _______, KC_GRV,  KC_BSLS, _______, _______, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      | Reset|      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |BLtogg|BLstep|      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |RGBtog|RGBhui|RGBhud|RGBmod|RGBsai|RGBsad|      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT_planck_mit(
-    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR,
-    _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/README.md b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/README.md
deleted file mode 100644
index 9d57ceb5f7c..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Kbdfans Niu Mini
-
-Here `keymap.c` is generated by [qmk configurator](https://config.qmk.fm) and
-it corresponds to the colemak-dh layout.
-
-To customize, upload the json file to qmk configurator
-
-- `keymap_colemak_dh.json`: colemak-dh layout
-- `keymap_qwerty.json`: qwerty layout
-
-Make the modification via the web interface, "compile" and download "keymap only".
-Then place the generated `keymap.c` in this folder.
-
-To flush the firmware, connect your keyboard and run
-
-```
-make niu_mini:nosarthur:dtu
-```
-in the `qmk_firmware` source folder.
-There will be some prompts saying no device is found. Click the reset button in
-the back of your keyboard and it should work.
-
-# notes from qmk configurator
-
-This layout was generated by the QMK API. You can find the JSON data used to
-generate this keymap in the file layers.json.
-
-To make use of this file you will need follow the following steps:
-
-* Download or Clone QMK Firmware: <https://github.com/qmk/qmk_firmware/>
-* Extract QMK Firmware to a location on your hard drive
-* Copy this folder into %s
-* You are now ready to compile or use your keymap with the source
-
-More information can be found in the QMK docs: <https://docs.qmk.fm>
diff --git a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap.c
deleted file mode 100644
index fe719fc8214..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_planck_mit(KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_MINS, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LGUI, TT(3), KC_LALT, KC_LCTL, LT(2,KC_BSPC), KC_SPC, LT(1,KC_ENT), KC_COLN, KC_2, KC_1, KC_0),
-	[1] = LAYOUT_planck_mit(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_COLN, KC_PIPE, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LCBR, KC_RCBR, KC_DOT, KC_SLSH, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_PLUS),
-	[2] = LAYOUT_planck_mit(KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_VOLU, KC_MUTE, KC_NO, KC_LT, KC_GT, KC_LPRN, KC_RPRN, KC_NO, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_LBRC, KC_RBRC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP),
-	[3] = LAYOUT_planck_mit(KC_F1, KC_F2, KC_MS_U, KC_F3, KC_F4, KC_7, KC_8, KC_9, KC_MINS, KC_F10, KC_F11, KC_F12, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, KC_F5, KC_4, KC_5, KC_6, KC_PLUS, RGB_HUI, RGB_HUD, RGB_TOG, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_1, KC_2, KC_3, KC_ENT, KC_ASTR, KC_SLSH, RGB_MOD, KC_TRNS, TO(0), KC_TRNS, KC_BTN1, KC_TRNS, KC_0, KC_DOT, KC_NO, KC_NO, KC_NO, KC_NO)
-};
diff --git a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json
deleted file mode 100644
index 8dc43350c82..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"niu_mini","keymap":"22","layout":"LAYOUT_planck_mit","layers":[["KC_TAB","KC_Q","KC_W","KC_F","KC_P","KC_B","KC_J","KC_L","KC_U","KC_Y","KC_SCLN","KC_MINS","KC_ESC","KC_A","KC_R","KC_S","KC_T","KC_G","KC_K","KC_N","KC_E","KC_I","KC_O","KC_QUOT","KC_LSFT","KC_Z","KC_X","KC_C","KC_D","KC_V","KC_M","KC_H","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_LGUI","TT(3)","KC_LALT","KC_LCTL","LT(2,KC_BSPC)","KC_SPC","LT(1,KC_ENT)","KC_COLN","KC_2","KC_1","KC_0"],["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_EQL","KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_MINS","KC_COLN","KC_PIPE","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_LCBR","KC_RCBR","KC_DOT","KC_SLSH","KC_BSLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_CAPS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_PLUS"],["KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_PGUP","KC_HOME","KC_UP","KC_END","KC_VOLU","KC_MUTE","KC_NO","KC_LT","KC_GT","KC_LPRN","KC_RPRN","KC_NO","KC_PGDN","KC_LEFT","KC_DOWN","KC_RGHT","KC_VOLD","KC_NO","KC_TRNS","KC_NO","KC_NO","KC_LBRC","KC_RBRC","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_DEL","KC_TRNS","KC_MPRV","KC_MNXT","KC_MPLY","KC_MSTP"],["KC_F1","KC_F2","KC_MS_U","KC_F3","KC_F4","KC_7","KC_8","KC_9","KC_MINS","KC_F10","KC_F11","KC_F12","KC_BTN2","KC_MS_L","KC_MS_D","KC_MS_R","KC_F5","KC_4","KC_5","KC_6","KC_PLUS","RGB_HUI","RGB_HUD","RGB_TOG","KC_TRNS","KC_F6","KC_F7","KC_F8","KC_F9","KC_1","KC_2","KC_3","KC_ENT","KC_ASTR","KC_SLSH","RGB_MOD","KC_TRNS","TO(0)","KC_TRNS","KC_BTN1","KC_TRNS","KC_0","KC_DOT","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Dong Zhou","notes":"My awesome keymap"}
\ No newline at end of file
diff --git a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_qwerty.json b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_qwerty.json
deleted file mode 100644
index ec9b945f4f3..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_qwerty.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"niu_mini","keymap":"14","layout":"LAYOUT_planck_mit","layers":[["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_ESC","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_LGUI","TT(3)","KC_LALT","KC_LCTL","LT(2,KC_BSPC)","KC_SPC","LT(1,KC_ENT)","KC_3","KC_2","KC_1","KC_0"],["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_EQL","KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_NO","KC_COLN","KC_PIPE","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_LCBR","KC_RCBR","KC_DOT","KC_SLSH","KC_BSLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_CAPS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_PLUS"],["KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_NO","KC_NO","KC_UP","KC_VOLD","KC_VOLU","KC_MUTE","KC_NO","KC_LT","KC_GT","KC_LPRN","KC_RPRN","KC_NO","KC_NO","KC_LEFT","KC_DOWN","KC_RGHT","KC_PGDN","KC_PGUP","KC_NO","KC_NO","KC_NO","KC_LBRC","KC_RBRC","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_HOME","KC_TRNS","KC_MPRV","KC_MNXT","KC_MPLY","KC_MSTP"],["KC_F1","KC_F2","KC_MS_U","KC_F3","KC_F4","KC_7","KC_8","KC_9","KC_MINS","KC_F10","KC_F11","KC_F12","KC_BTN2","KC_MS_L","KC_MS_D","KC_MS_R","KC_NO","KC_4","KC_5","KC_6","KC_PLUS","RGB_HUI","RGB_HUD","RGB_TOG","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_1","KC_2","KC_3","KC_ENT","KC_ASTR","KC_SLSH","RGB_MOD","KC_TRNS","TO(0)","KC_TRNS","KC_BTN1","KC_TRNS","KC_0","KC_DOT","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Dong Zhou","notes":"My awesome keymap"}
\ No newline at end of file
diff --git a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/rules.mk
deleted file mode 100644
index 37ba40cdfef..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/nosarthur/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE = yes
-BACKLIGHT_ENABLE = no
-AUDIO_ENABLE = no
-CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/config.h b/keyboards/kbdfans/niu_mini/keymaps/planck/config.h
deleted file mode 100644
index 0c42bb50602..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
deleted file mode 100644
index fb82d320a4f..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_mit(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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 ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_mit(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_mit(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_mit(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______,     _______,      _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_mit(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_mit(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,        XXXXXXX,      KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/readme.md b/keyboards/kbdfans/niu_mini/keymaps/planck/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/planck/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/config.h b/keyboards/kbdfans/niu_mini/keymaps/tobias/config.h
deleted file mode 100644
index ad72b6b6c53..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-//#include "../../config.h"
-
-//#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#define RGBLIGHT_SLEEP
-#define TAPPING_TOGGLE 2
-#define ALT_F4 LALT(KC_F4)
-#define CTALDEL LSFT(LCTL(KC_ESC))
-#define NO_DEBUG
-#define CTLZ LCTL(KC_Z)
-#define CTLX LCTL(KC_X)
-#define CTLC LCTL(KC_C)
-#define CTLV LCTL(KC_V)
-
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
deleted file mode 100644
index 8c7d3b8e0e0..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
+++ /dev/null
@@ -1,383 +0,0 @@
- /* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// extern keymap_config_t keymap_config;
-
-enum layers {
-  _QWERTY,
-  _FNL1,
-  _MOUSE,
-  _LOWER,
-  _RAISE,
-  _FNL2,
-  _ADJUST,
-  _GAMEMODE,
-  _FNL3,      _LOWER2,
-  _RAISE2
-};
-
-enum custom_keycodes {
-  TBMACRO = SAFE_RANGE,
-  DGRMCRO,
-  WRKMOD
-};
-
-bool bnumlock = false;
-bool numlock_changed = false;
-bool workmode = true;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   [  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | FNL1 |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   "  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | Bksp |Lower |    Space    |Raise | Bksp | AltGr|   *  | Esc  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  KC_TAB,     KC_Q,    KC_W,    KC_E,       KC_R,   KC_T,   KC_Y,       KC_U,    KC_I,   KC_O,     KC_P,  KC_LBRC,
-  TT(_FNL1),  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_DEL, TT(_LOWER), KC_SPC, KC_SPC, TT(_RAISE), KC_BSPC, KC_RALT, KC_NUHS,  KC_ESC
-),
-
-
-/* FNL1
- * ,-----------------------------------------------------------------------------------.
- * |TbMacr| Prev | Play | Next | AltF4| CapsL| Esc  | PgUp |  Up  | PgDn |PrScrn| Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | Vol- | Vol+ | Mute | NumL | Home | Left | Down | Right|      |  Del |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      | End  |      |      |      |   ?  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |   !  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FNL1] = LAYOUT_ortho_4x12(
-  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS,  KC_ESC, KC_PGUP,   KC_UP, KC_PGDN, KC_PSCR, KC_BSPC,
-  TT(_FNL1), _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
-  KC_LSFT,    CTLZ,    CTLX,    CTLC,    CTLV, _______,  KC_END, _______, _______, _______, LSFT(KC_MINS), _______,
-  _______, _______, CTALDEL, _______, _______, _______, _______, TO(_MOUSE), _______, _______, LSFT(KC_1), _______
-),
-
-[_MOUSE] = {
-  {     KC_TAB, XXXXXXX, XXXXXXX,      KC_MS_UP,     XXXXXXX,    KC_T, XXXXXXX,    KC_MS_BTN3,   KC_MS_WH_UP,     KC_MS_BTN2, XXXXXXX, KC_MS_ACCEL0  },
-  {TO(_QWERTY), XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, XXXXXXX, XXXXXXX, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, XXXXXXX, KC_MS_ACCEL1},
-  {_______,        KC_Z,       KC_X,      KC_C,        KC_V, XXXXXXX, XXXXXXX,       XXXXXXX,        XXXXXXX,        XXXXXXX, XXXXXXX, KC_MS_ACCEL2},
-  {KC_LCTL,     TO(_QWERTY), KC_LALT, _______, TO(_QWERTY), KC_MS_BTN1, XXXXXXX, TO(_QWERTY), _______, _______, TO(_QWERTY), TO(_QWERTY)}
-},
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   §  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   +  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ´  |   `  |   @  |   £  |   $  |   €  |   ¨  |   {  |   [  |   ]  |   }  |   \  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   <  |   |  |   >  |   °  |      |      |   µ  |   ¨  |   ^  |   ~  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      | AltGr|      |      |             |      |      |      |      | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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, S(KC_EQL),   RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_E), KC_RBRC, RALT(KC_7), RALT(KC_8), RALT(KC_9),    RALT(KC_0), RALT(KC_MINS),
-  KC_LSFT, KC_NUBS, RALT(KC_NUBS), S(KC_NUBS), DGRMCRO, XXXXXXX, XXXXXXX,   RALT(KC_M),   KC_RBRC,  S(KC_RBRC), RALT(KC_RBRC),       _______,
-  _______, _______,       KC_RALT,    _______,TO(_ADJUST), _______, _______,      _______,   _______,     _______,       _______, TO(_QWERTY)
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  Tab |  F1  |  F2  |  F3  |  F4  |  Esc | Bksp |   /  |   7  |   8  |   9  |   -  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | FNL2 |  F5  |  F6  |  F7  |  F8  |Insert| Home | PgUp |   4  |   5  |   6  |   +  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |  Del | End  | PgDn |   1  |   2  |   3  | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |  Alt |      |      |             |   *  |   0  |   ,  |   .  | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_TAB,    KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_ESC, KC_BSPC, KC_PSLS,  KC_P7,  KC_P8,  KC_P9, KC_PMNS,
-  TT(_FNL2), KC_F5,   KC_F6,   KC_F7,   KC_F8,  KC_INS, KC_HOME, KC_PGUP,  KC_P4,  KC_P5,  KC_P6, KC_PPLS,
-  KC_LSFT,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_END, KC_PGDN,  KC_P1,  KC_P2,  KC_P3, KC_PENT,
-  _______, _______, KC_LALT, _______, TO(_QWERTY), _______, _______, KC_PAST,  KC_P0,  KC_PDOT, KC_DOT, TO(_QWERTY)
-),
-
-/* FNL2
- * ,-----------------------------------------------------------------------------------.
- * |TbMacr| Prev | Play | Next | AltF4| CapsL|      |PrScrn|Insert| Home | PgUp |ScrLck|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | Vol- | Vol+ | Mute | NumL |      |      |  Del | End  | PgDn | Pause|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |  Up  |      | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Left | Down | Right| BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_FNL2] = LAYOUT_ortho_4x12(
-  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS, _______, KC_PSCR,  KC_INS, KC_HOME, KC_PGUP, KC_SCRL,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  _______, _______,  KC_DEL,  KC_END, KC_PGDN, KC_PAUS,
-  _______,    CTLZ,    CTLX,    CTLC,    CTLV, _______, _______, _______, _______,   KC_UP, _______, KC_ENT,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, TO(_QWERTY)
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | GAME | Reset|      |      |      |      |      |      |      |      |      |LIGHTS|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |BLtogg|BLstep|      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |RGBtog|RGBhui|RGBhud|RGBmod|RGBsai|RGBsad|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RGB4 |      |      |      |      |             |      |      |      |  NKO | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(
-  TO(_GAMEMODE), QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, WRKMOD,
-    _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, RGB_MODE_FORWARD,
-  _______, _______, _______, _______, _______, _______, _______, _______,  _______, RGB_M_P,  RGB_M_R, TO(_QWERTY)
-),
-
-/* Game mode
- * ,-----------------------------------------------------------------------------------.
- * |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   [  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | FNL1 |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   "  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   1  | Lower| Bksp | Alt  |    Space    | Raise| Bksp | BAIL |   *  | Esc  |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAMEMODE] = LAYOUT_ortho_4x12(
-  KC_TAB,     KC_Q,    KC_W,    KC_E,       KC_R,   KC_T,   KC_Y,       KC_U,    KC_I,   KC_O,     KC_P,  KC_LBRC,
-  TT(_FNL3),  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_1, MO(_LOWER2),  KC_DEL, KC_LALT, KC_SPC, KC_SPC, MO(_RAISE2), KC_BSPC, TO(_QWERTY), KC_NUHS, KC_ESC
-),
-
-/* FNL3
- * ,-----------------------------------------------------------------------------------.
- * |TbMacr| Prev | Play | Next | AltF4| CapsL| Esc  | PgUp |  Up  | PgDn |PrScrn| Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | Vol- | Vol+ | Mute | NumL | Home | Left | Down | Right|      |  Del |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      | End  |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_FNL3] = LAYOUT_ortho_4x12(
-  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS,  KC_ESC, KC_PGUP,   KC_UP, KC_PGDN, KC_PSCR, KC_BSPC,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
-  KC_LSFT, _______, _______, _______, _______, _______,  KC_END, _______, _______, _______, LSFT(KC_MINS), _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LSFT(KC_1), _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  Tab |  F1  |  F2  |  F3  |  F4  |  Esc | Bksp |   /  |   7  |   8  |   9  |   -  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | FNL2 |  F5  |  F6  |  F7  |  F8  |Insert| Home | PgUp |   4  |   5  |   6  |   +  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |  Del | End  | PgDn |   1  |   2  |   3  | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |  Alt |      |      |             |   *  |   0  |   ,  |   .  | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER2] = LAYOUT_ortho_4x12(
-  KC_TAB,    KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_ESC, KC_BSPC, KC_PSLS,  KC_P7,  KC_P8,  KC_P9, KC_PMNS,
-  TT(_FNL2), KC_F5,   KC_F6,   KC_F7,   KC_F8,  KC_INS, KC_HOME, KC_PGUP,  KC_P4,  KC_P5,  KC_P6, KC_PPLS,
-  KC_LSFT,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_END, KC_PGDN,  KC_P1,  KC_P2,  KC_P3, KC_PENT,
-  _______, _______, _______, _______, _______, _______, _______, KC_PAST,  KC_P0,  KC_PDOT, KC_DOT, TO(_GAMEMODE)
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   §  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   +  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ´  |   `  |   @  |   £  |   $  |   €  |   ¨  |   {  |   [  |   ]  |   }  |   \  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   <  |   |  |   >  |   °  |      |      |   µ  |   ¨  |   ^  |   ~  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      | AltGr|      |      |             |      |      |      |      | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE2] = LAYOUT_ortho_4x12(
-  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, S(KC_EQL),   RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_E), KC_RBRC, RALT(KC_7), RALT(KC_8), RALT(KC_9),    RALT(KC_0), RALT(KC_MINS),
-  KC_LSFT, KC_NUBS, RALT(KC_NUBS), S(KC_NUBS), DGRMCRO, XXXXXXX, XXXXXXX,   RALT(KC_M),   KC_RBRC,  S(KC_RBRC), RALT(KC_RBRC),       _______,
-  _______, _______,       KC_RALT,    _______, _______, _______, _______,      _______,   _______,     _______,       _______, TO(_GAMEMODE)
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case TBMACRO:
-                SEND_STRING(SS_TAP(X_TAB) SS_DOWN(X_LSFT) SS_TAP(X_HOME) SS_UP(X_LSFT) SS_TAP(X_DELETE));
-                return false;
-            case DGRMCRO:
-                if(!bnumlock) {
-                    //register_code(KC_NUM);
-                    //unregister_code(KC_NUM);
-                    tap_code(KC_NUM);
-                    bnumlock = true;
-                }
-                //SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P0) SS_TAP(X_P1) SS_TAP(X_P7) SS_TAP(X_P6) SS_UP(X_LALT));
-                SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_KP_0) SS_TAP(X_KP_1) SS_TAP(X_KP_7) SS_TAP(X_KP_6) SS_UP(X_LALT) );
-                return false;
-            case WRKMOD:
-                if(!workmode) {
-                    workmode = true;
-                    return false;
-                }
-                else {
-                    workmode = false;
-                    return false;
-                }
-        }
-
-    }
-    return true;
-}
-
-void rgbflag(uint8_t r, uint8_t g, uint8_t b) {
-  for(int i = 0; i < RGBLED_NUM; i++){
-    switch(i) {
-      case 0 ... 13:
-        // rgblight_setrgb_at(r,g,b,i);
-        led[i].r = r;
-        led[i].g = g;
-        led[i].b = b;
-        break;
-      /* case 9 ... 11:
-        // rgblight_setrgb_at(r,g,b,i);
-        led[i].r = r;
-        led[i].g = g;
-        led[i].b = b;
-        break; */
-      default:
-        // rgblight_setrgb_at(0,0,0,i);
-        led[i].r = 0;
-        led[i].g = 0;
-        led[i].b = 0;
-        break;
-    }
-  }
-  rgblight_set();
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-//  if(rgblight_get_mode() == 1) {
-    switch (get_highest_layer(state)) {
-    case _QWERTY:
-        if(!workmode){
-            rgblight_mode(9);
-        }
-        else if(workmode){
-            rgblight_mode(1);
-            rgbflag(0x00,  0x00, 0x00);
-        }
-        if(bnumlock) {
-            tap_code(KC_NUM);
-        }
-        break;
-    case _LOWER:
-            rgblight_mode(1);
-        if(!bnumlock) {
-            tap_code(KC_NUM);
-        }
-        rgbflag(0xFF,  0x00, 0x00);
-
-        break;
-    case _ADJUST:
-        rgblight_mode(1);
-        rgbflag(0xFF,  0xFF, 0xFF);
-        if(bnumlock) {
-                tap_code(KC_NUM);
-        }
-        break;
-    case _RAISE:
-        rgblight_mode(1);
-        rgbflag(0x00,  0xFF, 0x00);
-        if(bnumlock) {
-                tap_code(KC_NUM);
-        }
-        break;
-    case _FNL1:
-        rgblight_mode(1);
-        rgbflag(0x00,  0x00, 0xFF);
-        if(bnumlock) {
-                tap_code(KC_NUM);
-        }
-        break;
-    case _GAMEMODE:
-            rgblight_mode(1);
-            rgbflag(0xFF,  0x00, 0xFF);
-        break;
-    case _MOUSE:
-        rgblight_mode(1);
-        rgbflag(0x00,  0xFF, 0xFF);
-        if(bnumlock) {
-                tap_code(KC_NUM);
-        }
-        break;
-    default: //  for any other layers, or the default layer
-        rgblight_mode(1);
-        if(bnumlock) {
-            tap_code(KC_NUM);
-        }
-        rgbflag(0xFF,  0xFF, 0xFF);
-        break;
-    }
- // }
-  return state;
-}
-
-/* void matrix_scan_user(void) {
-
-    //Layer LED indicators
-
-    uint32_t layer = layer_state;
-
-
-    if (layer & (1<<2)) {
-        if(!bnumlock) {
-            numlock_changed = true;
-            register_code(KC_NUM);
-            unregister_code(KC_NUM);
-            bnumlock = true;
-        }
-    }
-}
- */
-
-
-bool led_update_user(led_t led_state) {
-  bnumlock = led_state.num_lock;
-  return false;
-}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/readme.md b/keyboards/kbdfans/niu_mini/keymaps/tobias/readme.md
deleted file mode 100644
index 0a8077884d5..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Swedish 40% Layout
-
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/tobias/rules.mk
deleted file mode 100644
index d75595602fc..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-NKRO_ENABLE = YES
-MOUSEKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
deleted file mode 100644
index 437907759db..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#undef MANUFACTURER
-#undef PRODUCT
-
-#define MANUFACTURER    "Potato Inc."
-#define PRODUCT         "Qt3.14"
-
-/* turn off RGB when computer sleeps */
-#define RGBLIGHT_SLEEP
-
-/* send tap key if no layer key was used even after tap delay */
-#define TAPPING_TERM 50
-#define RETRO_TAPPING
\ No newline at end of file
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
deleted file mode 100644
index e4f2eb44cfd..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
+++ /dev/null
@@ -1,120 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _NUM,
-    _FN
-};
-
-enum keycodes {
-    QWERTY = SAFE_RANGE,
-    DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Base layer (0)
-     * ,-----------------------------------------------------------------------------------.
-     * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |Esc/Fn|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Del  |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl |  GUI |  Alt |  \|  |Lower |Sp/Num|Space |Raise |AltGr | Left | Down |Right |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_BASE] = LAYOUT_ortho_4x12(
-        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,       KC_T,             KC_Y,   KC_U,       KC_I,    KC_O,    KC_P,    KC_BSPC,
-        LT(_FN, KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,       KC_G,             KC_H,   KC_J,       KC_K,    KC_L,    KC_SCLN, KC_DEL,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,       KC_B,             KC_N,   KC_M,       KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-        KC_LCTL,          KC_LGUI, KC_LALT, KC_NUBS, MO(_LOWER), LT(_NUM, KC_SPC), KC_SPC, MO(_RAISE), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Lower layer (1)
-     * Function keys, navigation
-     * ,-----------------------------------------------------------------------------------.
-     * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      | Ins  |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |CapsLk|      |PrtSc |ScrLk |Pause |      |      |      |      | PgUp |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      | Menu | Home | PgDn | End  |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_ortho_4x12(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
-        _______, KC_CAPS, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, KC_PGUP, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_APP,  KC_HOME, KC_PGDN, KC_END
-    ),
-    
-     /* Raise layer (2)
-     * National characters, special characters
-     * ,-----------------------------------------------------------------------------------.
-     * |  +1  |  ě2  |  š3  |  č4  |  ř5  |  ž6  |  ý7  |  á8  |  í9  |  é0  |  ´   |  ˇ   |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |  ;°  |      |      |      |      |      |  (   |  )   |  §   |  !   |  ú   |  /   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |  %   |  =   |  ¨   |  '   |  -   |  _   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_ortho_4x12(
-        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,          KC_8,    KC_9,    KC_0,          KC_EQL,  LSFT(KC_EQL),
-        KC_GRV,  _______, _______, _______, _______, _______, LSFT(KC_RBRC), KC_RBRC, KC_QUOT, LSFT(KC_QUOT), KC_LBRC, LSFT(KC_LBRC),
-        _______, _______, _______, _______, _______, _______, LSFT(KC_MINS), KC_MINS, KC_BSLS, LSFT(KC_BSLS), KC_SLSH, LSFT(KC_SLSH),
-        _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______,       _______, _______
-    ),
-    
-    /* Numbers layer - numpad (3)
-     * ,-----------------------------------------------------------------------------------.
-     * |      |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |  4   |  5   |  6   |  /   |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |NumLk |      |      |      |      |      |  1   |  2   |  3   |  *   |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |  .   |  0   |  +   |  -   |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_NUM] = LAYOUT_ortho_4x12(
-        _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PSLS, _______,
-        _______, KC_NUM,  _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PAST, _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_DOT,  KC_KP_0, KC_PPLS, KC_PMNS, _______
-    ),
-    
-    /* Function layer (4)
-     * Backlighting, keyboard controls, etc.
-     * m_ - music, r_ - RGB + backlight, f_ - macro
-     * ,-----------------------------------------------------------------------------------.
-     * |      | r_BL |      |Sleep |      |      |      |f_Rec1|f_Pla1|f_Stop|      |m_Vol+|
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |r_VLK |r_Mod+|r_Hue+|r_Sat+|r_Bri+|      |f_Rec2|f_Pla2|      |      |m_Vol-|
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |r_TOG |r_Mod-|r_Hue-|r_Sat-|r_Bri-|      |      |      |      |m_Stop|m_Mute|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Reset|      |      |      |      |C+A+D |C+A+I |      |      |m_Prev|m_Paus|m_Next|
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_FN] = LAYOUT_ortho_4x12(
-        _______, BL_STEP, _______,  KC_SLEP, _______, _______,     _______,     DM_REC1, DM_PLY1, DM_RSTP, _______, KC_VOLU,
-        _______, VK_TOGG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI,     _______,     DM_REC2, DM_PLY2, _______,      _______, KC_VOLD,
-        _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,     _______,     _______,        _______,         _______,      KC_MSTP, KC_MUTE,
-        QK_BOOT, _______, _______,  _______, _______, LCA(KC_DEL), LCA(KC_INS), _______,        _______,         KC_MPRV,      KC_MPLY, KC_MNXT
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    return true;
-}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/readme.md b/keyboards/kbdfans/niu_mini/keymaps/tucznak/readme.md
deleted file mode 100644
index 95180bc392a..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# TuCZnak's modified layout
-
-This layout is optimized for Czech national QWERTZ keymap.
-It includes separated layers for numbers, national characters,
-special characters and configuration.
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/tucznak/rules.mk
deleted file mode 100644
index 422c96962de..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
-# Userspace defines
-VELOCIKEY_ENABLE = yes
-LAYOUTS_HAS_RGB = no
\ No newline at end of file
diff --git a/keyboards/kbdfans/niu_mini/keymaps/yttyx/README.md b/keyboards/kbdfans/niu_mini/keymaps/yttyx/README.md
deleted file mode 100644
index ff3937c2320..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/yttyx/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Overview
-
-This layout uses a mirror variant of Balance 12, created by Sasha Viminitz. See [this page](https://mathematicalmulticore.wordpress.com/the-keyboard-layout-project/) 
-for more information.
-
-## To build
-
-```
-make niu_mini:yttyx
-```
-
-## To flash (example)
-
-```
-sudo dfu-programmer atmega32u4 erase
-sudo dfu-programmer atmega32u4 flash niu_mini_yttyx.hex --debug 6
-sudo dfu-programmer atmega32u4 launch
-```
-
-## Layers
-
-### Balance 12 base (BA) layer
-![Base layer](https://i.imgur.com/I0TkIHT.png)
-
-### Numeric/Punctuation (NP) layer
-![Numeric/Punctuation layer](https://i.imgur.com/GgZ0PCq.png)
-
-### Function/Cursor (FC) layer
-![Function/Cursor layer](https://i.imgur.com/zcVID2d.png)
-
-### Plover (PL) layer
-![Plover layer](https://i.imgur.com/RikOGXe.png)
diff --git a/keyboards/kbdfans/niu_mini/keymaps/yttyx/config.h b/keyboards/kbdfans/niu_mini/keymaps/yttyx/config.h
deleted file mode 100644
index b9e113ec0bb..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/yttyx/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c
deleted file mode 100644
index 53ed794da89..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _BA,           // Base (Balance Twelve mirror variant)
-  _NP,           // Numeric/Punctuation
-  _FC,           // Function
-  _PL            // Plover
-};
-
-// Abbreviations
-#define KX_SFT_Z   MT(MOD_LSFT, KC_Z)
-#define KX_SFT_X   MT(MOD_LSFT, KC_X)
-#define LT_ESC_FC  LT(_FC, KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base
-     .--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.
-     | P      | L      | C      | D      | W      |        |        | U      | O      | Y      | K      | Q      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | N      | R      | S      | T      | M      |        | BS     | A      | E      | I      | H      | V      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Z Sft  | J      | F      | G      | B      |        | Ent    | ' @    | , <    | . >    | X Sft  |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Ctl    | Alt    | Sup    | NP     | Spc    | Esc FC | Sft    | Sft    | Sup    | Alt    | Ctl    |        |
-     '--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'
-  */
-  [_BA] = LAYOUT(                                                   
-    KC_P,     KC_L,    KC_C,    KC_D,    KC_W,   XXXXXXX,   XXXXXXX, KC_U,    KC_O,    KC_Y,    KC_K,     KC_Q,
-    KC_N,     KC_R,    KC_S,    KC_T,    KC_M,   XXXXXXX,   KC_BSPC, KC_A,    KC_E,    KC_I,    KC_H,     KC_V,
-    KX_SFT_Z, KC_J,    KC_F,    KC_G,    KC_B,   XXXXXXX,   KC_ENT,  KC_QUOT, KC_COMM, KC_DOT,  KX_SFT_X, XXXXXXX,
-    KC_LCTL,  KC_LALT, KC_LGUI, MO(_NP), KC_SPC, LT_ESC_FC, KC_LSFT, KC_LSFT, KC_LGUI, KC_LALT, KC_LCTL,  XXXXXXX
-  ),
-
-  /* Numeric/Punctuation (NP)
-     .--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.
-     | 1 !    | 2 "    | 3 �    | 4 $    | 5 %    | PL     |        | 6 ^    | 7 &    | 8 *    | 9 (    | 0 )    |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Tab    | Ctl-X  | Ctl-C  | Ctl-V  | Ctl-Z  |        |        | [ {    | ] }    | - _    | ; :    | \ |    |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Sft    |        |        | Del    | Ins    |        |        | / ?    | = +    | # ~    | `      |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Ctl    | Alt    | Sup    | NP     | Spc    |        | Sft    | Sft    | Sup    | Alt    | Ctl    |        |
-     '--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'
-  */                                           
-  [_NP] = LAYOUT(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    TO(_PL), XXXXXXX, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-    KC_TAB,  C(KC_X), C(KC_C), C(KC_V), C(KC_Z), XXXXXXX, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_SCLN, KC_NUBS,
-    KC_LSFT, XXXXXXX, XXXXXXX, KC_DEL,  KC_INS,  XXXXXXX, XXXXXXX, KC_SLSH, KC_EQL,  KC_NUHS, KC_GRV,  XXXXXXX, 
-    _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, XXXXXXX
-  ),
-
-  /* Function/Cursor (FC)
-     .--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.
-     | F1     | F2     | F3     | F4     | F5     |        |        | Home   | Up     | End    | PgUp   |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | F6     | F7     | F8     | F9     | F10    |        |        | Left   | Down   | Right  | PgDn   |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Sft    |        |        | F11    | F12    |        |        | PScr   | Break  | ScLk   | Caps   |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Ctl    | Alt    | Sup    |        | Spc    |        | Sft    | Sft    | Sup    | Alt    | Ctl    |        |
-     '--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'
-  */
-  [_FC] = LAYOUT(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX, XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX,
-    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX,
-    _______, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_PSCR, KC_BRK,  KC_SCRL, KC_CAPS, XXXXXXX,
-    _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, XXXXXXX
-  ),
-
-  /* Plover (PL)
-     .--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.
-     | #      | #      | #      | #      | #      | BA     | #      | #      | #      | #      | #      | #      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | S      | T      | P      | H      | *      |        | *      | F      | P      | L      | T      | D      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | S      | K      | W      | R      | *      |        | *      | R      | B      | G      | S      | Z      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     |        |        |        | A      | O      |        | E      | U      |        |        |        |        |
-     '--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'
-  */
-  [_PL] = LAYOUT(
-    STN_NUM, STN_NUM, STN_NUM, STN_NUM, STN_NUM, TO(_BA), STN_NUM, STN_NUM, STN_NUM, STN_NUM, STN_NUM, STN_NUM,
-    STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, XXXXXXX, STN_ST1, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
-    STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, XXXXXXX, STN_ST2, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR,
-    XXXXXXX, XXXXXXX, XXXXXXX, STN_A,   STN_O,   XXXXXXX, STN_E,   STN_U,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  )
-
-};
-
-void matrix_init_user(void) {
-  steno_set_mode(STENO_MODE_GEMINI);
-}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/yttyx/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/yttyx/rules.mk
deleted file mode 100644
index a2566a20b0b..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/yttyx/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build Options
-AUDIO_ENABLE = no
-CONSOLE_ENABLE = no
-EXTRAKEY_ENABLE = no
-MIDI_ENABLE = no
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = yes
-RGBLIGHT_ENABLE = no
-STENO_ENABLE = yes
-VIRTSER_ENABLE = yes
diff --git a/keyboards/kbdfans/niu_mini/rules.mk b/keyboards/kbdfans/niu_mini/rules.mk
index d8d8866c48b..dfaed88540e 100644
--- a/keyboards/kbdfans/niu_mini/rules.mk
+++ b/keyboards/kbdfans/niu_mini/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
-LAYOUTS_HAS_RGB = no
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
deleted file mode 100644
index 9cc883891ad..00000000000
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2021 Dztech
- *
- * 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_MATRIX_LED_COUNT 104
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES 
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json
index 308e9870cc4..064f755f427 100644
--- a/keyboards/kbdfans/odin/rgb/info.json
+++ b/keyboards/kbdfans/odin/rgb/info.json
@@ -12,7 +12,56 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"],
diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
deleted file mode 100644
index e47ec47523b..00000000000
--- a/keyboards/kbdfans/odin/v2/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 lexbrugman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json
index 7714d2407f2..94255371250 100644
--- a/keyboards/kbdfans/odin/v2/info.json
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -34,6 +34,9 @@
             "snake": true,
             "christmas": true,
             "static_gradient": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "processor": "STM32F072",
diff --git a/keyboards/kbdfans/odin75/config.h b/keyboards/kbdfans/odin75/config.h
new file mode 100644
index 00000000000..aa1fe41ccf6
--- /dev/null
+++ b/keyboards/kbdfans/odin75/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 DZTECH <moyi4681@live.cn>
+ *
+ * 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
+
+/* OLED SPI Defines */
+#define OLED_DISPLAY_128X64
+#define OLED_IC OLED_IC_SH1106
+
+/* OLED SPI Pins */
+#define OLED_DC_PIN GP24
+#define OLED_CS_PIN GP22
+#define OLED_RST_PIN GP23
+
+/* Shift OLED columns by 2 pixels */
+#define OLED_COLUMN_OFFSET 2
+
+/* Divisor for OLED */
+#define OLED_SPI_DIVISOR 4
+
+/* ChibiOS SPI definitions */
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN GP26
+#define SPI_MOSI_PIN GP27
+#define SPI_MISO_PIN GP28
diff --git a/keyboards/kbdfans/odin75/halconf.h b/keyboards/kbdfans/odin75/halconf.h
new file mode 100644
index 00000000000..02182141740
--- /dev/null
+++ b/keyboards/kbdfans/odin75/halconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2022 DZTECH <moyi4681@live.cn>
+ *
+ * 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_next <halconf.h>
+
+#undef HAL_USE_SPI
+#define HAL_USE_SPI TRUE
+
+#undef SPI_USE_WAIT
+#define SPI_USE_WAIT TRUE
+
+#undef SPI_SELECT_MODE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
diff --git a/keyboards/kbdfans/odin75/info.json b/keyboards/kbdfans/odin75/info.json
new file mode 100644
index 00000000000..b6fb124c93b
--- /dev/null
+++ b/keyboards/kbdfans/odin75/info.json
@@ -0,0 +1,122 @@
+{
+    "manufacturer": "KBDFans",
+    "keyboard_name": "ODIN75",
+    "maintainer": "KBDFANS",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "wpm": true
+    },
+    "indicators": {
+        "caps_lock": "GP29",
+        "on_state": 1
+    },
+    "matrix_pins": {
+        "cols": ["GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP3", "GP4"],
+        "rows": ["GP0", "GP1", "GP2", "GP21", "GP20", "GP5"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6072",
+        "vid": "0x4B42"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "matrix": [0, 2], "x": 2.25, "y": 0 },
+                { "matrix": [0, 3], "x": 3.25, "y": 0 },
+                { "matrix": [0, 4], "x": 4.25, "y": 0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.75, "y": 0 },
+                { "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "matrix": [0, 11], "x": 11.75, "y": 0 },
+                { "matrix": [0, 12], "x": 12.75, "y": 0 },
+                { "matrix": [0, 13], "x": 14, "y": 0 },
+                { "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.5 },
+                { "matrix": [1, 1], "x": 1, "y": 1.5 },
+                { "matrix": [1, 2], "x": 2, "y": 1.5 },
+                { "matrix": [1, 3], "x": 3, "y": 1.5 },
+                { "matrix": [1, 4], "x": 4, "y": 1.5 },
+                { "matrix": [1, 5], "x": 5, "y": 1.5 },
+                { "matrix": [1, 6], "x": 6, "y": 1.5 },
+                { "matrix": [1, 7], "x": 7, "y": 1.5 },
+                { "matrix": [1, 8], "x": 8, "y": 1.5 },
+                { "matrix": [1, 9], "x": 9, "y": 1.5 },
+                { "matrix": [1, 10], "x": 10, "y": 1.5 },
+                { "matrix": [1, 11], "x": 11, "y": 1.5 },
+                { "matrix": [1, 12], "x": 12, "y": 1.5 },
+                { "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 },
+                { "matrix": [1, 14], "x": 15.25, "y": 1.5 },
+                { "matrix": [1, 15], "x": 16.25, "y": 1.5 },
+                { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 },
+                { "matrix": [2, 1], "x": 1.5, "y": 2.5 },
+                { "matrix": [2, 2], "x": 2.5, "y": 2.5 },
+                { "matrix": [2, 3], "x": 3.5, "y": 2.5 },
+                { "matrix": [2, 4], "x": 4.5, "y": 2.5 },
+                { "matrix": [2, 5], "x": 5.5, "y": 2.5 },
+                { "matrix": [2, 6], "x": 6.5, "y": 2.5 },
+                { "matrix": [2, 7], "x": 7.5, "y": 2.5 },
+                { "matrix": [2, 8], "x": 8.5, "y": 2.5 },
+                { "matrix": [2, 9], "x": 9.5, "y": 2.5 },
+                { "matrix": [2, 10], "x": 10.5, "y": 2.5 },
+                { "matrix": [2, 11], "x": 11.5, "y": 2.5 },
+                { "matrix": [2, 12], "x": 12.5, "y": 2.5 },
+                { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 },
+                { "matrix": [2, 14], "x": 15.25, "y": 2.5 },
+                { "matrix": [2, 15], "x": 16.25, "y": 2.5 },
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 },
+                { "matrix": [3, 1], "x": 1.75, "y": 3.5 },
+                { "matrix": [3, 2], "x": 2.75, "y": 3.5 },
+                { "matrix": [3, 3], "x": 3.75, "y": 3.5 },
+                { "matrix": [3, 4], "x": 4.75, "y": 3.5 },
+                { "matrix": [3, 5], "x": 5.75, "y": 3.5 },
+                { "matrix": [3, 6], "x": 6.75, "y": 3.5 },
+                { "matrix": [3, 7], "x": 7.75, "y": 3.5 },
+                { "matrix": [3, 8], "x": 8.75, "y": 3.5 },
+                { "matrix": [3, 9], "x": 9.75, "y": 3.5 },
+                { "matrix": [3, 10], "x": 10.75, "y": 3.5 },
+                { "matrix": [3, 11], "x": 11.75, "y": 3.5 },
+                { "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5 },
+                { "matrix": [4, 1], "x": 2.25, "y": 4.5 },
+                { "matrix": [4, 2], "x": 3.25, "y": 4.5 },
+                { "matrix": [4, 3], "x": 4.25, "y": 4.5 },
+                { "matrix": [4, 4], "x": 5.25, "y": 4.5 },
+                { "matrix": [4, 5], "x": 6.25, "y": 4.5 },
+                { "matrix": [4, 6], "x": 7.25, "y": 4.5 },
+                { "matrix": [4, 7], "x": 8.25, "y": 4.5 },
+                { "matrix": [4, 8], "x": 9.25, "y": 4.5 },
+                { "matrix": [4, 9], "x": 10.25, "y": 4.5 },
+                { "matrix": [4, 10], "x": 11.25, "y": 4.5 },
+                { "matrix": [4, 11], "w": 1.75, "x": 12.25, "y": 4.5 },
+                { "matrix": [4, 13], "x": 14, "y": 4.5 },
+                { "matrix": [4, 14], "x": 15.25, "y": 4.75 },
+                { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.5 },
+                { "matrix": [5, 1], "x": 1.5, "y": 5.5 },
+                { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.5 },
+                { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.5 },
+                { "matrix": [5, 10], "w": 1.5, "x": 11, "y": 5.5 },
+                { "matrix": [5, 11], "w": 1.5, "x": 12.5, "y": 5.5 },
+                { "matrix": [5, 13], "x": 14.25, "y": 5.75 },
+                { "matrix": [5, 14], "x": 15.25, "y": 5.75 },
+                { "matrix": [5, 15], "x": 16.25, "y": 5.75 }
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/kbdfans/odin75/keymaps/default/keymap.c b/keyboards/kbdfans/odin75/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d49d812716c
--- /dev/null
+++ b/keyboards/kbdfans/odin75/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2022 DZTECH <moyi4681@live.cn>
+ *
+ * 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,  KC_MUTE,  KC_PGUP, 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_HOME, KC_END,
+    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_INS,  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_PAUSE, KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                       KC_RALT, KC_RCTL, KC_LEFT,  KC_DOWN, KC_RGHT
+  )
+};
+
diff --git a/keyboards/kbdfans/odin75/keymaps/via/keymap.c b/keyboards/kbdfans/odin75/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d49d812716c
--- /dev/null
+++ b/keyboards/kbdfans/odin75/keymaps/via/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2022 DZTECH <moyi4681@live.cn>
+ *
+ * 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,  KC_MUTE,  KC_PGUP, 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_HOME, KC_END,
+    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_INS,  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_PAUSE, KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                       KC_RALT, KC_RCTL, KC_LEFT,  KC_DOWN, KC_RGHT
+  )
+};
+
diff --git a/keyboards/mino_plus/soldered/keymaps/via/rules.mk b/keyboards/kbdfans/odin75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mino_plus/soldered/keymaps/via/rules.mk
rename to keyboards/kbdfans/odin75/keymaps/via/rules.mk
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/oled/bongocat.c b/keyboards/kbdfans/odin75/lib/bongocat.c
similarity index 99%
rename from keyboards/gopolar/gg86/keymaps/bongocat/oled/bongocat.c
rename to keyboards/kbdfans/odin75/lib/bongocat.c
index e328efd24a5..05be2173d15 100644
--- a/keyboards/gopolar/gg86/keymaps/bongocat/oled/bongocat.c
+++ b/keyboards/kbdfans/odin75/lib/bongocat.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* 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
@@ -28,7 +28,7 @@
 #define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm
 // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
 #define ANIM_SIZE 525  // number of bytes in array, minimize for adequate firmware size, max is 1024
-#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro
+
 
 uint32_t curr_anim_duration = 0; // variable animation duration
 uint32_t bongo_timer = 0;
diff --git a/keyboards/gopolar/gg86/keymaps/bongocat/oled/bongocat.h b/keyboards/kbdfans/odin75/lib/bongocat.h
similarity index 89%
rename from keyboards/gopolar/gg86/keymaps/bongocat/oled/bongocat.h
rename to keyboards/kbdfans/odin75/lib/bongocat.h
index a7ec3c50287..2ffeca19935 100644
--- a/keyboards/gopolar/gg86/keymaps/bongocat/oled/bongocat.h
+++ b/keyboards/kbdfans/odin75/lib/bongocat.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+/* 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
@@ -14,4 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 void render_bongocat(void);
diff --git a/keyboards/kbdfans/odin75/mcuconf.h b/keyboards/kbdfans/odin75/mcuconf.h
new file mode 100644
index 00000000000..b6f47c04693
--- /dev/null
+++ b/keyboards/kbdfans/odin75/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 DZTECH <moyi4681@live.cn>
+ *
+ * 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_next <mcuconf.h>
+
+#undef RP_SPI_USE_SPI1
+#define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/kbdfans/odin75/odin75.c b/keyboards/kbdfans/odin75/odin75.c
new file mode 100644
index 00000000000..d35c4d605e7
--- /dev/null
+++ b/keyboards/kbdfans/odin75/odin75.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 DZTECH <moyi4681@live.cn>
+*
+* 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 "quantum.h"
+#include "lib/bongocat.h"
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    led_t led_state = host_keyboard_led_state();
+    render_bongocat();
+    oled_set_cursor(14, 0); // sets cursor to (column, row) using charactar spacing (4 rows on 128x32 screen, anything more will overflow back to the top)
+    oled_write_P(PSTR("WPM:"), false);
+    oled_write(get_u8_str(get_current_wpm(), '0'), false); // writes wpm on top right corner of string
+    oled_set_cursor(0, 5);
+    oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+    oled_set_cursor(0, 6);
+    oled_write_P(led_state.num_lock ? PSTR("NUM") : PSTR("    "), false);
+    oled_set_cursor(0, 7);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
+    return false;
+}
+#endif
diff --git a/keyboards/kbdfans/odin75/readme.md b/keyboards/kbdfans/odin75/readme.md
new file mode 100644
index 00000000000..b1ae97217ac
--- /dev/null
+++ b/keyboards/kbdfans/odin75/readme.md
@@ -0,0 +1,26 @@
+# ODIN75
+A customizable 75% keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: ODIN75
+* Hardware Availability: [KBDfans](https://kbdfans.com/products/kbdfans-odin-75-mechanical-keyboard)
+
+## Bootloader mode
+
+Enter the bootloader in 3 ways:
+
+* Bootmagic reset: Hold down the left top key then plug in the USB cable.
+* Physical reset button: Hold down the reset button then plug in the USB cable.
+* Keycode in layout: Press the key mapped to QK_BOOT if it is available.
+
+## Making firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/odin75:default
+
+Flashing example for this keyboard:
+
+    make kbdfans/odin75: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/kbdfans/odin75/rules.mk b/keyboards/kbdfans/odin75/rules.mk
new file mode 100644
index 00000000000..391c46db58b
--- /dev/null
+++ b/keyboards/kbdfans/odin75/rules.mk
@@ -0,0 +1,2 @@
+OLED_TRANSPORT = spi
+SRC += lib/bongocat.c
diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h
index 2dba9f5d357..b090729a50d 100644
--- a/keyboards/kbdfans/phaseone/config.h
+++ b/keyboards/kbdfans/phaseone/config.h
@@ -22,6 +22,5 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json
index 14150a1cdd1..aea255aaf44 100644
--- a/keyboards/kbdfans/phaseone/info.json
+++ b/keyboards/kbdfans/phaseone/info.json
@@ -35,6 +35,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {
diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h
index b2ffcbfd275..b58aa329ecc 100644
--- a/keyboards/kbdfans/tiger80/config.h
+++ b/keyboards/kbdfans/tiger80/config.h
@@ -17,6 +17,5 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json
index 9bdccc58179..1a2258deea8 100644
--- a/keyboards/kbdfans/tiger80/info.json
+++ b/keyboards/kbdfans/tiger80/info.json
@@ -42,6 +42,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {
diff --git a/keyboards/kbdfans/tiger80/keymaps/micros24/config.h b/keyboards/kbdfans/tiger80/keymaps/micros24/config.h
deleted file mode 100644
index adafb144e5b..00000000000
--- a/keyboards/kbdfans/tiger80/keymaps/micros24/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 micros24 <jasperjano.ph@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
-
-/* Disable locking support */
-#ifdef LOCKING_SUPPORT_ENABLE
-	#undef LOCKING_SUPPORT_ENABLE
-#endif
-
-/* Disable locking support */
-#ifdef LOCKING_RESYNC_ENABLE
-	#undef LOCKING_RESYNC_ENABLE
-#endif
-
-/* Increasing performance */
-#define MATRIX_IO_DELAY 20
-#define FORCE_NKRO
-
-/* Disable unused features to save space */
-#define NO_ACTION_LAYER
-#define NO_ACTION_ONESHOT
-
-/* Tap-Hold configuration */
-#define TAPPING_TERM 200
\ No newline at end of file
diff --git a/keyboards/kbdfans/tiger80/keymaps/micros24/keymap.c b/keyboards/kbdfans/tiger80/keymaps/micros24/keymap.c
deleted file mode 100644
index 6b9b70a8a4c..00000000000
--- a/keyboards/kbdfans/tiger80/keymaps/micros24/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2022 micros24 <jasperjano.ph@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 layers {
-    _LAYER0
-};
-
-enum custom_keycodes {
-	M_CHARSELECT = SAFE_RANGE,
-	TAPHOLD_RALT,
-	TAPHOLD_RCTRL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_LAYER0] = LAYOUT_tkl_f13_ansi_tsangan(
-        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_MPLY,    KC_PSCR, KC_VOLD, KC_VOLU,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      TAPHOLD_RALT, M_CHARSELECT, TAPHOLD_RCTRL,    KC_LEFT, KC_DOWN, KC_RGHT
-    )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	static uint16_t my_hash_timer;
-    switch (keycode) {
-		/* RWIN key */
-		case M_CHARSELECT:
-			tap_code(KC_F9);
-			wait_ms(100);
-			tap_code(KC_ENT);
-			break;
-		/* RALT key */
-		case TAPHOLD_RALT:
-			if(record->event.pressed) {
-				my_hash_timer = timer_read();
-				register_code(KC_RALT); // Change the key to be held here
-			} 
-			else {
-				unregister_code(KC_RALT); // Change this key to be the same as above
-				if (timer_elapsed(my_hash_timer) < TAPPING_TERM) {
-					tap_code(KC_MPRV); // The key to be pressed on tap
-				}
-			}
-			return false; // We handled this keypress
-			break;
-		/* RCTRL key */
-		case TAPHOLD_RCTRL:
-					if(record->event.pressed) {
-				my_hash_timer = timer_read();
-				register_code(KC_RCTL); // Change the key to be held here
-			} 
-			else {
-				unregister_code(KC_RCTL); // Change this key to be the same as above
-				if (timer_elapsed(my_hash_timer) < TAPPING_TERM) {
-					tap_code(KC_MNXT); // The key to be pressed on tap
-				}
-			}
-			break;
-			return false; // We handled this keypress
-    }
-    return true;
-};
\ No newline at end of file
diff --git a/keyboards/kbdfans/tiger80/keymaps/micros24/readme.md b/keyboards/kbdfans/tiger80/keymaps/micros24/readme.md
deleted file mode 100644
index 30e28e5f070..00000000000
--- a/keyboards/kbdfans/tiger80/keymaps/micros24/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## KEYMAP BY MICROS24
-Keymap by Micros24 for optimized gaming performance and media controls. RGB underglow is disabled as I don't use it.
-* SCROLL LOCK and PAUSE BREAK keys have been replaced with VOL- and VOL+ respectively.
-* F13 have been replaced with PLAY/PAUSE MEDIA.
-* RWIN is configured as F9 + ENTER macro.
-
-RALT and RCTRL have tap and hold configured as follows:
-
-RALT:
-* TAP is configured as PREVIOUS MEDIA
-* HOLD is configured as normal RALT
-
-RCTRL:
-* TAP is configured as NEXT MEDIA
-* HOLD is configured as normal RCTRL
\ No newline at end of file
diff --git a/keyboards/kbdfans/tiger80/keymaps/micros24/rules.mk b/keyboards/kbdfans/tiger80/keymaps/micros24/rules.mk
deleted file mode 100644
index 670e7c89075..00000000000
--- a/keyboards/kbdfans/tiger80/keymaps/micros24/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-RGBLIGHT_ENABLE = no
-MOUSEKEY_ENABLE = no
-DEBOUNCE_TYPE = sym_eager_pk
-VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kbdfans/tiger80/keymaps/squarecut/keymap.c b/keyboards/kbdfans/tiger80/keymaps/squarecut/keymap.c
deleted file mode 100644
index 99b26ab0636..00000000000
--- a/keyboards/kbdfans/tiger80/keymaps/squarecut/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * 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 {
-    _LAYER0,
-    _LAYER1,
-    _LAYER2,
-    _LAYER3,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_LAYER0] = LAYOUT_tkl_f13_ansi_tsangan(
-        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_MUTE,    KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1), KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_LAYER1] = LAYOUT_tkl_f13_ansi_tsangan(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_MEDIA_PLAY_PAUSE,   KC_CALC,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  KC_MUTE,    KC_7, KC_8, KC_9,
-        KC_GRV,  RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,    RGB_M_SN,    RGB_M_K,    RGB_M_X,    RGB_M_G,    RGB_M_T,    KC_0,    RGB_VAD, RGB_VAI,  KC_ASTERISK,    KC_4,  KC_5, KC_6,
-        KC_TAB,  KC_Q,    RGB_MOD,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_SLSH,    KC_1,  KC_2,  KC_3,
-        KC_CAPS, KC_A,    RGB_RMOD,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    RGB_TOG,    KC_SCLN, KC_QUOT,       KC_PLUS,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_MINUS,             KC_0,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-
-};
-
-
-void eeconfig_init_user(void) {
-    eeconfig_update_user(0);
-    rgblight_disable();
-}
diff --git a/keyboards/kbdfans/tiger80/keymaps/squarecut/readme.txt b/keyboards/kbdfans/tiger80/keymaps/squarecut/readme.txt
deleted file mode 100644
index 2351401fda9..00000000000
--- a/keyboards/kbdfans/tiger80/keymaps/squarecut/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Mostly based off default 
--Add Fn key layer
--Adding Numpad
--RGB Toggle
\ No newline at end of file
diff --git a/keyboards/kmac/config.h b/keyboards/kbdmania/kmac/config.h
similarity index 100%
rename from keyboards/kmac/config.h
rename to keyboards/kbdmania/kmac/config.h
diff --git a/keyboards/kmac/info.json b/keyboards/kbdmania/kmac/info.json
similarity index 100%
rename from keyboards/kmac/info.json
rename to keyboards/kbdmania/kmac/info.json
diff --git a/keyboards/kmac/keymaps/default/keymap.c b/keyboards/kbdmania/kmac/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/default/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/default/keymap.c
diff --git a/keyboards/kmac/keymaps/default/readme.md b/keyboards/kbdmania/kmac/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kmac/keymaps/default/readme.md
rename to keyboards/kbdmania/kmac/keymaps/default/readme.md
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/keymap.c
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi/readme.md b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/readme.md
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi/readme.md
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/readme.md
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/readme.md b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/readme.md
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi_wkl/readme.md
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/readme.md
diff --git a/keyboards/kmac/keymaps/via/keymap.c b/keyboards/kbdmania/kmac/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/via/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/via/keymap.c
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/rules.mk b/keyboards/kbdmania/kmac/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/rules.mk
rename to keyboards/kbdmania/kmac/keymaps/via/rules.mk
diff --git a/keyboards/kmac/kmac.c b/keyboards/kbdmania/kmac/kmac.c
similarity index 100%
rename from keyboards/kmac/kmac.c
rename to keyboards/kbdmania/kmac/kmac.c
diff --git a/keyboards/kmac/matrix.c b/keyboards/kbdmania/kmac/matrix.c
similarity index 100%
rename from keyboards/kmac/matrix.c
rename to keyboards/kbdmania/kmac/matrix.c
diff --git a/keyboards/kbdmania/kmac/readme.md b/keyboards/kbdmania/kmac/readme.md
new file mode 100644
index 00000000000..c9f77462928
--- /dev/null
+++ b/keyboards/kbdmania/kmac/readme.md
@@ -0,0 +1,21 @@
+# KMAC
+
+A Korean custom keyboard designed by Byungho Kim and the KBDMania community.
+
+Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul)  
+Hardware Supported: KMAC & KMAC 2  
+Hardware Availability: [KBDMania](http://www.kbdmania.net/xe/news/5232321)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdmania/kmac: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
+
+The PCB is hardwired to run the bootloader if the key at the `Caps Lock` position is held down when connecting the keyboard.
+
+## PCB versions
+
+The KMAC are available with two different PCB layouts, a winkey version and a winkeyless version. A default keymap are provided for each versions of the PCB.
diff --git a/keyboards/kmac/rules.mk b/keyboards/kbdmania/kmac/rules.mk
similarity index 100%
rename from keyboards/kmac/rules.mk
rename to keyboards/kbdmania/kmac/rules.mk
diff --git a/keyboards/kmac_pad/config.h b/keyboards/kbdmania/kmac_pad/config.h
similarity index 100%
rename from keyboards/kmac_pad/config.h
rename to keyboards/kbdmania/kmac_pad/config.h
diff --git a/keyboards/kmac_pad/info.json b/keyboards/kbdmania/kmac_pad/info.json
similarity index 100%
rename from keyboards/kmac_pad/info.json
rename to keyboards/kbdmania/kmac_pad/info.json
diff --git a/keyboards/kmac_pad/keymaps/default/keymap.c b/keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kmac_pad/keymaps/default/keymap.c
rename to keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c
diff --git a/keyboards/kmac_pad/keymaps/default/readme.md b/keyboards/kbdmania/kmac_pad/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kmac_pad/keymaps/default/readme.md
rename to keyboards/kbdmania/kmac_pad/keymaps/default/readme.md
diff --git a/keyboards/kmac_pad/kmac_pad.c b/keyboards/kbdmania/kmac_pad/kmac_pad.c
similarity index 100%
rename from keyboards/kmac_pad/kmac_pad.c
rename to keyboards/kbdmania/kmac_pad/kmac_pad.c
diff --git a/keyboards/kmac_pad/matrix.c b/keyboards/kbdmania/kmac_pad/matrix.c
similarity index 100%
rename from keyboards/kmac_pad/matrix.c
rename to keyboards/kbdmania/kmac_pad/matrix.c
diff --git a/keyboards/kbdmania/kmac_pad/readme.md b/keyboards/kbdmania/kmac_pad/readme.md
new file mode 100644
index 00000000000..59cc307073d
--- /dev/null
+++ b/keyboards/kbdmania/kmac_pad/readme.md
@@ -0,0 +1,56 @@
+# KMAC PAD
+
+![kmac_pad](https://i.imgur.com/4P1ybgNl.jpg)
+
+KMAC PAD is a num pad keyboard.
+It can be used independently, but can also be used by connecting with KMAC keyboard case.
+
+* Keyboard Maintainer: [talsu](https://github.com/talsu)
+* Hardware Supported: KMAC PAD
+* Hardware Availability: [KBDMania](http://www.kbdmania.net/xe/news/5232321)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdmania/kmac_pad:default
+    
+Flashing example for this keyboard:
+
+    make kbdmania/kmac_pad: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
+
+The PCB is hardwired to run the bootloader if the key at the `FN` position (the only key in first row) is held down when connecting the keyboard.
+
+## PCB
+
+![Imgur](https://i.imgur.com/ML66cvfl.jpg)
+![Imgur](https://i.imgur.com/Kr2Wdtkl.jpg)
+
+### Switch Pins
+
+The FN key in the `Row 0` is directly connected to the E2 pin.   
+The rest of the rows below that use MATRIX. (`Row 1 ~ Row 5`)
+| Row   | Pin                    |
+|:-----:| ---------------------- |
+| 0     | x (Not in Matrix)      |
+| 1     | D0                     |
+| 2     | D1                     |
+| 3     | D2                     |
+| 4     | D3                     |
+| 5     | D5                     |
+
+| Column | Pin                   |
+|:------:| --------------------- |
+| 0      | C7                    |
+| 1      | C6                    |
+| 2      | B6                    |
+| 3      | B5                    |
+
+### Backlight Pins
+
+There are 2 pins for backlight.
+
+The LED of the FN key uses pin `B3`.
+All other keys are connected to the `B1` pin.
diff --git a/keyboards/kmac_pad/rules.mk b/keyboards/kbdmania/kmac_pad/rules.mk
similarity index 100%
rename from keyboards/kmac_pad/rules.mk
rename to keyboards/kbdmania/kmac_pad/rules.mk
diff --git a/keyboards/kbnordic/nordic65/readme.md b/keyboards/kbnordic/nordic65/readme.md
new file mode 100644
index 00000000000..20912c741b1
--- /dev/null
+++ b/keyboards/kbnordic/nordic65/readme.md
@@ -0,0 +1,20 @@
+# nordic65
+
+PCB designed for kbnordic.se
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: nordic65
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbnordic/nordic65/rev_a: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 ESC key
+* **Physical reset button**: Briefly press the button on the back of the PCB or short the two pads in the "RST" header for more than 3 seconds.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kbnordic/nordic65/rev_a/info.json b/keyboards/kbnordic/nordic65/rev_a/info.json
new file mode 100644
index 00000000000..8cd90949ea9
--- /dev/null
+++ b/keyboards/kbnordic/nordic65/rev_a/info.json
@@ -0,0 +1,739 @@
+{
+    "keyboard_name": "Nordic65 Rev A",
+    "manufacturer": "KBNORDIC",
+    "url": "kbnordic.se",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4445",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 20
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A3", "A15", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B3", "B5", "B4"], 
+        "rows": ["B15", "A9", "B8", "B7", "B6"] 
+    },
+    "diode_direction": "COL2ROW",
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "/", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Enter", "matrix": [2, 13], "x":13.75, "y":1, "w":1.25, "h":2}, 
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [2, 12], "x":12.75, "y":2},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3},                
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Del", "matrix": [2, 12], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Del", "matrix": [2, 12], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Del", "matrix": [2, 12], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "layout": [
+                {"label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Del", "matrix": [2, 12], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "End", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbnordic/nordic65/rev_a/keymaps/default/keymap.c b/keyboards/kbnordic/nordic65/rev_a/keymaps/default/keymap.c
new file mode 100644
index 00000000000..9b259a334fa
--- /dev/null
+++ b/keyboards/kbnordic/nordic65/rev_a/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.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_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_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_ENT,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_NUHS,  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_LEFT, KC_DOWN, KC_RIGHT
+  ),
+
+  [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_DEL, _______, QK_BOOT,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+    _______, _______, _______,                    _______,                  _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/kbnordic/nordic65/rev_a/keymaps/via/keymap.c b/keyboards/kbnordic/nordic65/rev_a/keymaps/via/keymap.c
new file mode 100644
index 00000000000..9b259a334fa
--- /dev/null
+++ b/keyboards/kbnordic/nordic65/rev_a/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2023 Stefan Sundin "4pplet" <4pplet@protonmail.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_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_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_ENT,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_NUHS,  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_LEFT, KC_DOWN, KC_RIGHT
+  ),
+
+  [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_DEL, _______, QK_BOOT,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+    _______, _______, _______,                    _______,                  _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/xiudi/xd60/keymaps/fvolpe83/rules.mk b/keyboards/kbnordic/nordic65/rev_a/keymaps/via/rules.mk
old mode 100755
new mode 100644
similarity index 100%
rename from keyboards/xiudi/xd60/keymaps/fvolpe83/rules.mk
rename to keyboards/kbnordic/nordic65/rev_a/keymaps/via/rules.mk
diff --git a/keyboards/kbnordic/nordic65/rev_a/matrix_diagram.md b/keyboards/kbnordic/nordic65/rev_a/matrix_diagram.md
new file mode 100644
index 00000000000..fa1f3b2cbc2
--- /dev/null
+++ b/keyboards/kbnordic/nordic65/rev_a/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for kbnordic nordic65
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │1D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2D   │1E │      │ 2C  │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤   ┌──┴─────┤ ANSI Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │    │2E │   │    2D  │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤   └────────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│40  │41  │42  │             46         │ 4A │ 4B │ │4C │4D │4E │
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │46                         │4B   │ Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘ 
+```
\ No newline at end of file
diff --git a/keyboards/kbnordic/nordic65/rev_a/readme.md b/keyboards/kbnordic/nordic65/rev_a/readme.md
new file mode 100644
index 00000000000..20912c741b1
--- /dev/null
+++ b/keyboards/kbnordic/nordic65/rev_a/readme.md
@@ -0,0 +1,20 @@
+# nordic65
+
+PCB designed for kbnordic.se
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: nordic65
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbnordic/nordic65/rev_a: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 ESC key
+* **Physical reset button**: Briefly press the button on the back of the PCB or short the two pads in the "RST" header for more than 3 seconds.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kbnordic/nordic65/rev_a/rules.mk b/keyboards/kbnordic/nordic65/rev_a/rules.mk
new file mode 100644
index 00000000000..04fe1eba2ac
--- /dev/null
+++ b/keyboards/kbnordic/nordic65/rev_a/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/kc60/keymaps/dbroqua/keymap.c b/keyboards/kc60/keymaps/dbroqua/keymap.c
deleted file mode 100644
index 22ef319103f..00000000000
--- a/keyboards/kc60/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QWERTY,
-    _FNCAPS,
-    _FNRIGHTSHIFT
-};
-
-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  |  [  |  ]  |  Bksp  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Caps/FN1|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-     * |-----------------------------------------------------------------------------------------+
-     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |     Up    | FN2 |
-     * |-----------------------------------------------------------------------------------------+
-     * | Ctrl  | Gui   | Alt   |               Space             | AltGr | Left  | Down  | Right |
-     * `-----------------------------------------------------------------------------------------'
-     */
-    [0] = LAYOUT_all( /* Basic QWERTY */
-        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_BSLS,           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_BSPC,
-        LT(_FNCAPS, 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_NO,   KC_ENT,
-        KC_LSFT,              KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   MO(_FNRIGHTSHIFT),
-        KC_LCTL,              KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-
-    /* Layer 1
-     * ,-----------------------------------------------------------------------------------------.
-     * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
-     * |-----------------------------------------------------------------------------------------+
-     * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
-     * |-----------------------------------------------------------------------------------------+
-     * |         |     |     |     |     |     |     | Psc |     |     |     |     |             |
-     * |-----------------------------------------------------------------------------------------+
-     * |           | Led | Led+| Led-|     | Mute| Vol+| Vol-|     |     |     |    Play   |     |
-     * |-----------------------------------------------------------------------------------------+
-     * |       |       |       |                                 |       | Prev  | Stop  | Next  |
-     * `-----------------------------------------------------------------------------------------'
-     */
-    [_FNCAPS] = LAYOUT_all( /* Layer 1 */
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______,
-        _______, _______, BL_TOGG, BL_UP,   BL_DOWN, _______, KC_MUTE, KC_VOLU, KC_VOLD, _______, _______, _______, KC_MPLY, _______,
-        _______, _______, _______,                   _______,                                     _______, KC_MPRV, KC_MSTP, KC_MNXT
-    ),
-
-    /* Layer 2
-     * ,-----------------------------------------------------------------------------------------.
-     * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-     * |-----------------------------------------------------------------------------------------+
-     * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
-     * |-----------------------------------------------------------------------------------------+
-     * |         |     |     |     |     |     |     |     |     |     |     |     |             |
-     * |-----------------------------------------------------------------------------------------+
-     * |           |     |     |     |     |     |     |     |     |     |     |   PgUp    |     |
-     * |-----------------------------------------------------------------------------------------+
-     * |       |       |       |                                 |       | Home  | PgDown| End   |
-     * `-----------------------------------------------------------------------------------------'
-     */
-    [_FNRIGHTSHIFT] = LAYOUT_all( /* Layer 2 */
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
-        _______, _______, _______,                   _______,                                     _______, KC_HOME, KC_PGDN, KC_END
-    ),
-};
diff --git a/keyboards/kc60/keymaps/dbroqua/readme.md b/keyboards/kc60/keymaps/dbroqua/readme.md
deleted file mode 100644
index b71d10ab04f..00000000000
--- a/keyboards/kc60/keymaps/dbroqua/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dbroqua Layout
-
-* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/24fa7821d4955ec3c76037c8e159a199
-* Online keyboard layout editor (caps layer): http://www.keyboard-layout-editor.com/#/gists/4136d4d1555d6f0d9403c21aaf50fd37
-* Online keyboard layout editor (fn2 layer): http://www.keyboard-layout-editor.com/#/gists/cf4955f73f339020dbb41c15364e7e4f
-
-# Programming Instructions:
-Enter into programming mode and run the following command.
-```
-$ sudo KEYMAP=dbroqua make dfu
-```
\ No newline at end of file
diff --git a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
deleted file mode 100644
index 2189e5bc5c3..00000000000
--- a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QWERTY,
-    _FN
-};
-
-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  |  [  |  ]  |  Bksp  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-     * |-----------------------------------------------------------------------------------------+
-     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
-     * |-----------------------------------------------------------------------------------------+
-     *         | LGUI  | LAlt  |               Space             | RAlt  | RGUI  |
-     *         `-----------------------------------------------------------------'
-     */
-    [0] = LAYOUT_all( /* Basic QWERTY */
-        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_BSLS, 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_BSPC,
-        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_NO,   KC_ENT,
-        KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),
-        _______, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, _______, _______
-    ),
-
-    /* Layer 1
-     * ,-----------------------------------------------------------------------------------------.
-     * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
-     * |-----------------------------------------------------------------------------------------+
-     * |  CAPS  | Led | Led-| Led+|     |     |     |     | Psc | Slck| Paus| Up  |     |        |
-     * |-----------------------------------------------------------------------------------------+
-     * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
-     * |-----------------------------------------------------------------------------------------+
-     * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
-     * |-----------------------------------------------------------------------------------------+
-     *         |       |       |                                 | Stop  |       |
-     *         `-----------------------------------------------------------------'
-     */
-    [_FN] = LAYOUT_all( /* Layer 1 */
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
-        _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
-        _______, _______, _______,                   _______,                                     KC_MSTP, _______, _______, _______
-    )
-};
diff --git a/keyboards/kc60/keymaps/dbroqua_hhkb/readme.md b/keyboards/kc60/keymaps/dbroqua_hhkb/readme.md
deleted file mode 100644
index be99a3bc7e7..00000000000
--- a/keyboards/kc60/keymaps/dbroqua_hhkb/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Dbroqua HHKB like Layout
-
-Like the HHKB but with a KC60 PCB :D.
-
-# Programming Instructions:
-Enter into programming mode and run the following command.
-```
-$ sudo KEYMAP=dbroqua_hhkb make dfu
-```
\ No newline at end of file
diff --git a/keyboards/kc60/keymaps/sgoodwin/keymap.c b/keyboards/kc60/keymaps/sgoodwin/keymap.c
deleted file mode 100644
index e62e89d0166..00000000000
--- a/keyboards/kc60/keymaps/sgoodwin/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * Toggles between colemak and qwerty by tapping the bottom right key.
-     * Holding capslock key gives a layer like the KBParadise v60.
-     */
-    [0] = LAYOUT_all( /* Basic Colemak */
-        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_NO,
-        KC_TAB,   KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,     KC_J,     KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_LBRC,  KC_RBRC,  KC_BSLS,
-        MO(2),    KC_A,     KC_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_I,     KC_O,     KC_QUOT,  KC_NO,    KC_ENT,
-        KC_LSFT,  KC_NO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_NO,
-        KC_LCTL,  KC_LALT,  KC_LGUI,                      KC_SPC,                                           KC_RGUI,  KC_RALT,  KC_RCTL,  DF(1)
-    ),
-    [1] = LAYOUT_all( /* Basic QWERTY */
-        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_NO,
-        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,
-        MO(2),    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NO,    KC_ENT,
-        KC_LSFT,  KC_NO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_NO,
-        KC_LCTL,  KC_LALT,  KC_LGUI,                      KC_SPC,                                           KC_RGUI,  KC_RALT,  KC_RCTL,  DF(0)
-    ),
-    [2] = LAYOUT_all( /* KBP v60-like arrows, media keys, etc */
-        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_NO,
-        KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_UP,    BL_UP,    BL_DOWN,  BL_STEP,
-        KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_NO,    KC_TRNS,
-        KC_TRNS,  KC_NO,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_NO,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_SPC,                                           DB_TOGG,  QK_BOOT,  KC_TRNS,  KC_NO
-    ),
-};
diff --git a/keyboards/kc60/keymaps/stanleylai/keymap.c b/keyboards/kc60/keymaps/stanleylai/keymap.c
deleted file mode 100644
index 6a1503ce648..00000000000
--- a/keyboards/kc60/keymaps/stanleylai/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#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 {
-    _BL,
-    _FL,
-    _RGBL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    // See base_layer.png and rgb_layer.png for layout reference
-
-    // Base Default Layer
-    // Mac Modifier Layout. Use BootMagic to toggle GUI and ALT positions.
-    [_BL] = LAYOUT_all(
-        QK_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_NO,
-        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,
-        LT(_FL, 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_NO,   KC_ENT,
-        KC_LSFT,          KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   MO(_FL),
-        KC_LCTL,          KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT),
-
-    // Function layer
-    [_FL] = 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_DEL,  KC_NO,
-        KC_NO,   KC_MPRV, KC_UP,   KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS,            KC_INS,
-        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,              KC_NO,
-        KC_TRNS, KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   LT(_RGBL, KC_PGUP), KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MPLY,                                     KC_TRNS, KC_HOME, KC_PGDN,            KC_END),
-
-    // RGB Layer
-    [_RGBL] = LAYOUT_all(
-        #ifdef RGBLIGHT_ENABLE
-        QK_BOOT, 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,   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,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_TRNS, KC_NO,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, BL_TOGG, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-        #else
-        QK_BOOT, 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,   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,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   BL_STEP, BL_TOGG, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-        #endif
-    ),
-};
diff --git a/keyboards/kc60/keymaps/stanleylai/readme.md b/keyboards/kc60/keymaps/stanleylai/readme.md
deleted file mode 100644
index 6f5953ded74..00000000000
--- a/keyboards/kc60/keymaps/stanleylai/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Stanley Lai's Split Right Shift with Dedicated Arrow Keys
-======================
-
-## Quantum MK Firmware
-For the full Quantum feature list, see [the parent readme.md](/readme.md).
-
-## Keymap Notes
-- Keymap setup with split Right Shift in mind.
-- Right-side modifiers are setup as dedicated arrow keys
-
-### Base Layer Reference
-- Fn Layer indicated on keycap front legends.
-- Tapping Caps Lock key toggles Caps. Holding it down momentarily switches us to the Fn Layer.
-- Holding down "Fn" and "Page Down" momentarily switches us to the RGB Layer. Tapping "Page Down" behaves as expected.
-![Base Layer](http://imgur.com/aAi6lDe)
-
-### RGB Layer Reference
-![RGB Layer](http://imgur.com/ZWIfuPM)
-
-## WS2812 Support
-By default, it is now setup for 16 LEDs on the PF5 breakout pin.
-
-### Build
-To build this keymap, simply run `make KEYMAP=stanleylai`.
diff --git a/keyboards/kc60/keymaps/stanleylai/rules.mk b/keyboards/kc60/keymaps/stanleylai/rules.mk
deleted file mode 100644
index 9816b082fd5..00000000000
--- a/keyboards/kc60/keymaps/stanleylai/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # 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
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes 			 # Enable WS2812 underglow RGB strip
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
diff --git a/keyboards/kc60/keymaps/wigguno/keymap.c b/keyboards/kc60/keymaps/wigguno/keymap.c
deleted file mode 100644
index ba4571c4e4e..00000000000
--- a/keyboards/kc60/keymaps/wigguno/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-// This keymap was designed to close to the default kc60 layout, with some useful changes, such as adding media keys.
-// It also moves the reset key off the base layer, as in the default kc60 layout for this firmware.
-// I have swapped FN and RGUI as my rainbow keyset has them in the opposite order.
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Basic QWERTY
-     * ,-----------------------------------------------------------.
-     * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-     * |-----------------------------------------------------------|
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-     * |-----------------------------------------------------------|
-     * |Ctrl|Gui |Alt |      Space            |Alt |FN  |Gui |Ctrl |
-     * `-----------------------------------------------------------'
-     */
-    [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_NO,
-        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_NO,    KC_ENT,
-        KC_LSFT,  KC_NO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_NO,
-        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                           KC_RALT,  MO(1),    KC_RGUI,  KC_RCTL
-    ),
-
-    /*
-     * ,-----------------------------------------------------------.
-     * | `  |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del   |
-     * |-----------------------------------------------------------|
-     * |     |   | Up|   |   |   |   |   |   |   | PS|   |   |     |
-     * |-----------------------------------------------------------|
-     * |       |Lft|Dwn|Rgt|   |BL-|BL+|   |   |   |   |   |       |
-     * |-----------------------------------------------------------|
-     * |        |Prv| PP|Nxt|   |   |   |   |Hom|End|   |          |
-     * |-----------------------------------------------------------|
-     * | Rst|    |    |          BL           |    |    |    |     |
-     * `-----------------------------------------------------------'
-     * PS = Print Screen
-     * PP = Play/Pause
-     */
-    [1] = LAYOUT_all( /* Function Layer */
-        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_NO,
-        KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_TRNS,  BL_DOWN,  BL_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_END,   KC_TRNS,  KC_TRNS,  KC_TRNS,
-        QK_BOOT,  KC_TRNS,  KC_TRNS,                      BL_TOGG,                                          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
-    ),
-};
diff --git a/keyboards/kc60/keymaps/wigguno/readme.md b/keyboards/kc60/keymaps/wigguno/readme.md
deleted file mode 100644
index 55a9f60c7c7..00000000000
--- a/keyboards/kc60/keymaps/wigguno/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Wigguno's KC60 Layout
-======================
-
-## Quantum MK Firmware
-For the full Quantum feature list, see [the parent readme.md](/readme.md).
-
-## Changes from default QMK layout
-The default QMK layout for KC60 does not have a function layer. It also has the bootloader-mode reset key bound. This keymap fixes both of these by adding a sensible function layer (including moving the reset key onto it, far away from the FN key).
-
-### Changes from the default KC60 layout
-The default KC60 layout is good, but it was missing media keys. I've added previous, play/pause and next. I've also removed some of the keys from the function layer I didn't use.
-
-### Build
-To enable NKRO you must be in the keymaps/wigguno directory when running make.
diff --git a/keyboards/kc60/keymaps/wigguno/rules.mk b/keyboards/kc60/keymaps/wigguno/rules.mk
deleted file mode 100644
index f9b4b86766b..00000000000
--- a/keyboards/kc60/keymaps/wigguno/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # 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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
diff --git a/keyboards/kc60/mod_rgb_underglow.md b/keyboards/kc60/mod_rgb_underglow.md
index 6aab1e1d2e6..22ade4fa1b5 100644
--- a/keyboards/kc60/mod_rgb_underglow.md
+++ b/keyboards/kc60/mod_rgb_underglow.md
@@ -9,8 +9,8 @@ By default, the source is set up for 16 LEDs on the F5 breakout pin. See [includ
 ```c
 #pragma once
 
-#undef RGBLED_NUM
-#define RGBLED_NUM <number of leds>
+#undef RGBLIGHT_LED_COUNT
+#define RGBLIGHT_LED_COUNT <number of leds>
 ```
 
 To enable RGB Underglow, simply add a `rules.mk` file containing `RGBLIGHT_ENABLE = yes` alongside your `keymap.c` file, and compile as normal:
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index eddc52e8aa0..21ce4672bf5 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -3,52 +3,7 @@
 
 #pragma once
 
-#    define RGBLIGHT_DEFAULT_VAL 120
-#    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_LED_COUNT 32
-#        define RGB_DISABLE_WHEN_USB_SUSPENDED
-#        define RGB_MATRIX_KEYPRESSES
-//#    endif
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 8bb320c6c9e..769f288c512 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -12,7 +12,46 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 160,
+        "sleep": true
     },
     "rgblight": {
         "saturation_steps": 8,
@@ -31,6 +70,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 120
         }
     },
     "matrix_pins": {
diff --git a/keyboards/keebio/bdn9/keymaps/codecoffeecode/config.h b/keyboards/keebio/bdn9/keymaps/codecoffeecode/config.h
deleted file mode 100644
index 5b8b369bc38..00000000000
--- a/keyboards/keebio/bdn9/keymaps/codecoffeecode/config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-/* For USB nonsense in various OSs */
-#define TAP_CODE_DELAY 10
-
-/* For constant mouse speed */
-#define MOUSEKEY_DELAY 300
-#define MOUSEKEY_INTERVAL 50
-#define MOUSEKEY_MAX_SPEED 1
-#define MOUSEKEY_TIME_TO_MAX 0
-#define MOUSEKEY_WHEEL_MAX_SPEED 1
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 0
diff --git a/keyboards/keebio/bdn9/keymaps/codecoffeecode/keymap.c b/keyboards/keebio/bdn9/keymaps/codecoffeecode/keymap.c
deleted file mode 100644
index 89956afd7c4..00000000000
--- a/keyboards/keebio/bdn9/keymaps/codecoffeecode/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2019 Danny Nguyen <danny@keeb.io>
- *
- * 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] = {
-    /*
-        | Knob 1: Scrl Dn/Up |      | Knob 2: Vol Dn/Up  |
-        | Press: Mute        | Up   | Press: Play/Pause  |
-        | Left               | Down | Right              |
-        | Media Previous     | MO(1)| Media Next         |
-     */
-    [0] = LAYOUT(
-        KC_MUTE, KC_UP,   KC_MPLY,
-        KC_LEFT, KC_DOWN, KC_RIGHT,
-        KC_MPRV, MO(1),   KC_MNXT
-    ),
-    /*
-        |       QK_BOOT        | Home |    Media Stop      |
-        |                    | End  |                    |
-        |      CTRL_END      |      |    CTRL_HOME       |
-     */
-    [1] = LAYOUT(
-        QK_BOOT,      KC_HOME, KC_STOP,
-        _______,      KC_END,  _______,
-        LCTL(KC_END), _______, LCTL(KC_HOME)
-    ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_MS_WH_UP);
-        } else {
-            tap_code(KC_MS_WH_DOWN);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk b/keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk
deleted file mode 100644
index ab339e537f8..00000000000
--- a/keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE = yes
-ifneq (, $(findstring rev1, $(KEYBOARD)))
-  CONVERT_TO=proton_c
-endif
diff --git a/keyboards/keebio/bdn9/keymaps/copface/config.h b/keyboards/keebio/bdn9/keymaps/copface/config.h
deleted file mode 100644
index 38881a21086..00000000000
--- a/keyboards/keebio/bdn9/keymaps/copface/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2021 Gustavs Gutmanis (@gustavs-gutmanis)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/keebio/bdn9/keymaps/copface/keymap.c b/keyboards/keebio/bdn9/keymaps/copface/keymap.c
deleted file mode 100644
index c086faa1aa5..00000000000
--- a/keyboards/keebio/bdn9/keymaps/copface/keymap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2021 Gustavs Gutmanis (@gustavs-gutmanis)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _SMITE = 0,
-};
-
-enum custom_keycodes {
-    S_7 = SAFE_RANGE, // [VEL] - laugh
-    S_8, // [VVN] - No
-    S_9, // [VVA] - OK
-
-    S_4, // [VVB] - be right back
-    S_5, // [VVVE] - on my way
-    S_6, // [VVM] - out of mana
-
-    S_1, // [VRR] - retreat
-    S_2, // [VDD] - defend
-    S_3, // [VAA] - attack
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case S_7:
-      if (record->event.pressed) {
-        // VEL
-        SEND_STRING("v" SS_DELAY(20) "e"  SS_DELAY(20) "l");
-      }
-      break;
-    case S_8:
-      if (record->event.pressed) {
-        // VVN
-        SEND_STRING("v" SS_DELAY(20) "v"  SS_DELAY(20) "n");
-      }
-      break;
-    case S_9:
-      if (record->event.pressed) {
-        // VVA
-        SEND_STRING("v" SS_DELAY(20) "v"  SS_DELAY(20) "a");
-      }
-      break;
-
-    case S_4:
-      if (record->event.pressed) {
-        // VVB
-        SEND_STRING("v" SS_DELAY(20) "v"  SS_DELAY(20) "b");
-      }
-      break;
-    case S_5:
-      if (record->event.pressed) {
-        // VVVE
-        SEND_STRING("v" SS_DELAY(20) "v"  SS_DELAY(20) "v"  SS_DELAY(20) "e");
-      }
-      break;
-    case S_6:
-      if (record->event.pressed) {
-        // VVM
-        SEND_STRING("v" SS_DELAY(20) "v"  SS_DELAY(20) "m");
-      }
-      break;
-
-    case S_1:
-      if (record->event.pressed) {
-        // VRR
-        SEND_STRING("v" SS_DELAY(20) "r"  SS_DELAY(20) "r");
-      }
-      break;
-    case S_2:
-      if (record->event.pressed) {
-        // VDD
-        SEND_STRING("v" SS_DELAY(20) "d"  SS_DELAY(20) "d");
-      }
-      break;
-    case S_3:
-      if (record->event.pressed) {
-        // VAA
-        SEND_STRING("v" SS_DELAY(20) "a"  SS_DELAY(20) "a");
-      }
-      break;
-  }
-
-  return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_SMITE] = LAYOUT(
-        S_7, S_8, S_9,
-        S_4, S_5, S_6,
-        S_1, S_2, S_3
-    ),
-};
diff --git a/keyboards/keebio/bdn9/keymaps/eosti/config.h b/keyboards/keebio/bdn9/keymaps/eosti/config.h
deleted file mode 100644
index 98f8eab1a0f..00000000000
--- a/keyboards/keebio/bdn9/keymaps/eosti/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Reid Sox-Harris
- *
- * 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_TERM 275
diff --git a/keyboards/keebio/bdn9/keymaps/eosti/keymap.c b/keyboards/keebio/bdn9/keymaps/eosti/keymap.c
deleted file mode 100644
index 970cd6d6e78..00000000000
--- a/keyboards/keebio/bdn9/keymaps/eosti/keymap.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Copyright 2020 Reid Sox-Harris
- *
- * 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,
-    _MACRO,
-    _MOD
-};
-
-enum custom_keycodes {
-    M801 = SAFE_RANGE,
-    M802,
-    M803,
-    M804,
-    M805,
-    M806,
-};
-
-// tapdance keycodes
-enum td_keycodes {
-    LAY
-};
-
-// define a type containing as many tapdance states as you need
-typedef enum {
-  SINGLE_TAP,
-  SINGLE_HOLD,
-} td_state_t;
-
-// create a global instance of the tapdance state type
-static td_state_t td_state;
-
-// declare your tapdance functions:
-
-// function to determine the current tapdance state
-int cur_dance (tap_dance_state_t *state);
-
-// `finished` and `reset` functions for each tapdance keycode
-void altlp_finished (tap_dance_state_t *state, void *user_data);
-void altlp_reset (tap_dance_state_t *state, void *user_data);
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case M801:
-      if (record->event.pressed) {
-        SEND_STRING("M801" SS_TAP(X_ENTER));
-      }
-      break;
-    case M802:
-      if (record->event.pressed) {
-          SEND_STRING("M802" SS_TAP(X_ENTER));
-      }
-      break;
-    case M803:
-      if (record->event.pressed) {
-          SEND_STRING("M803" SS_TAP(X_ENTER));
-      }
-      break;
-     case M804:
-      if (record->event.pressed) {
-          SEND_STRING("M804" SS_TAP(X_ENTER));
-      }
-      break;
-    case M805:
-      if (record->event.pressed) {
-          SEND_STRING("M805" SS_TAP(X_ENTER));
-      }
-      break;
-    case M806:
-      if (record->event.pressed) {
-          SEND_STRING("M806" SS_TAP(X_ENTER));
-      }
-      break;
-  }
-
-  return true;
-};
-
-#define EX_ARR LCTL(LSFT(KC_ENTER))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-    // ┌────────┬────────┬────────┐
-         KC_MUTE, KC_UP,  TD(LAY),
-    // ├────────┼────────┼────────┤
-         KC_LEFT, KC_DOWN, KC_RGHT,
-    // ├────────┼────────┼────────┤
-         KC_MRWD, KC_MPLY, KC_MFFD
-    // └────────┴────────┴────────┘
-        ),
-    [_MACRO] = LAYOUT(
-    // ┌────────┬────────┬────────┐
-        _______,  KC_SPC, TG(_MACRO),
-    // ├────────┼────────┼────────┤
-          M801,    M802,    M803,
-    // ├────────┼────────┼────────┤
-          KC_NO,  KC_NO,   EX_ARR
-    // └────────┴────────┴────────┘
-        ),
-    [_MOD] = LAYOUT(
-    // ┌────────┬────────┬────────┐
-        _______,  BL_STEP,TG(_MOD),
-    // ├────────┼────────┼────────┤
-        RGB_TOG, RGB_HUI, RGB_SAI,
-    // ├────────┼────────┼────────┤
-        RGB_MOD, RGB_HUD, RGB_SAD
-    // └────────┴────────┴────────┘
-        )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
-            tap_code(KC_VOLU);
-        }
-    }
-    return true;
-}
-
-// Tapdance! Hold to use as a modifier to the _MOD layout, tap to change it between _BASE and _MACRO
-
-// determine the tapdance state to return
-int cur_dance (tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted || !state->pressed) { return SINGLE_TAP; }
-    else { return SINGLE_HOLD; }
-  } else { return 3; } // any number higher than the maximum state value you return above
-}
-
-// handle the possible states for each tapdance keycode you define:
-
-void altlp_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      layer_on(_MACRO);
-      break;
-    case SINGLE_HOLD:
-      layer_on(_MOD);
-      break;
-  }
-}
-
-void altlp_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      break;
-    case SINGLE_HOLD:
-      layer_off(_MOD);
-      break;
-  }
-}
-
-// define `ACTION_TAP_DANCE_FN_ADVANCED()` for each tapdance keycode, passing in `finished` and `reset` functions
-tap_dance_action_t tap_dance_actions[] = {
-  [LAY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altlp_finished, altlp_reset)
-};
diff --git a/keyboards/keebio/bdn9/keymaps/eosti/readme.md b/keyboards/keebio/bdn9/keymaps/eosti/readme.md
deleted file mode 100644
index cafa17827bd..00000000000
--- a/keyboards/keebio/bdn9/keymaps/eosti/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# EosTi's BDN9 Macropad Layout
-
-## Features
-
-- Single encoder in the top left to control volume, push to mute
-- Arrow keys and media keys on home layer
-- Tap upper right to toggle to macro layer
-- Hold upper right to change keyboard functions (aka RGB)
-- 428 entire bytes free!
diff --git a/keyboards/keebio/bdn9/keymaps/eosti/rules.mk b/keyboards/keebio/bdn9/keymaps/eosti/rules.mk
deleted file mode 100644
index ff3294ba752..00000000000
--- a/keyboards/keebio/bdn9/keymaps/eosti/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TAP_DANCE_ENABLE=yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-LTO_ENABLE = yes
diff --git a/keyboards/keebio/bdn9/keymaps/ghostseven/config.h b/keyboards/keebio/bdn9/keymaps/ghostseven/config.h
deleted file mode 100644
index 6df867d5757..00000000000
--- a/keyboards/keebio/bdn9/keymaps/ghostseven/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 GhostSeven <work@ghost7.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
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/keebio/bdn9/keymaps/ghostseven/keymap.c b/keyboards/keebio/bdn9/keymaps/ghostseven/keymap.c
deleted file mode 100644
index 1a1df0d5014..00000000000
--- a/keyboards/keebio/bdn9/keymaps/ghostseven/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2020 GhostSeven <work@ghost7.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 encoder_names {
-  _LEFT,
-  _RIGHT,
-  _MIDDLE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-        | Knob 1: Vol Dn/Up |      | Knob 2: Page Dn/Up |
-        | Press: Mute       | Home | Press: Play/Pause  |
-        | Hold: Layer 2     | Up   | Enter              |
-        | Left              | Down | Right              |
-     */
-    [0] = LAYOUT(
-        KC_MUTE, KC_HOME, KC_MPLY,
-        MO(1)  , KC_UP  , KC_ENT,
-        KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*
-        | QK_BOOT          | Shift+CMD+B (Build VS Code) | Media Stop |
-        | Held: Layer 2  | Home | RGB Mode   |
-        | Media Previous | End  | Media Next |
-     */
-    [1] = LAYOUT(
-        QK_BOOT, S(G(KC_B)), KC_STOP,
-        _______, KC_HOME, RGB_MOD,
-        KC_MPRV, KC_END , KC_MNXT
-    ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == _LEFT) {
-        if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
-            tap_code(KC_VOLU);
-        }
-    }
-    else if (index == _MIDDLE) {
-        if (clockwise) {
-            tap_code(KC_UP);
-        } else {
-            tap_code(KC_DOWN);
-        }
-    }
-    else if (index == _RIGHT) {
-        if (clockwise) {
-            tap_code(KC_PGUP);
-        } else {
-            tap_code(KC_PGDN);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c
deleted file mode 100644
index a7bb7076350..00000000000
--- a/keyboards/keebio/bdn9/keymaps/hbbisenieks/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2019 Danny Nguyen <danny@keeb.io>
- *
- * 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 _AUDACITY 0
-#define _LIGHTS 1
-
-enum custom_keycodes {
-  AUDACITY = SAFE_RANGE,
-  LIGHTS,
-};
-
-#define KC_ KC_TRNS
-#define KC_AUD AUDACITY
-#define KC_LITE LIGHTS
-#define KC_ZNRM LCTL(KC_2) // zoom normal
-#define KC_SAVE LCTL(KC_S) // save
-#define KC_SYNC LALT(KC_S) // sync-lock tracks
-#define KC_SLNC LCTL(KC_L) // silence selection
-#define KC_BL_S BL_STEP
-#define KC_RGBM RGB_MOD
-#define KC_RGBT RGB_TOG
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-        | Knob 1: Vol Dn/Up |      | Knob 2: Page Dn/Up |
-        | Press: Mute       | Home | Press: Play/Pause  |
-        | Hold: Layer 2     | Up   | RGB Mode           |
-        | Left              | Down | Right              |
-     */
-    [_AUDACITY] = LAYOUT(
-    //,-------+-------+-------.
-       KC_LITE,KC_SAVE,KC_ZNRM,
-    //|-------+-------+-------|
-       KC_SYNC,KC_SLNC,KC_BSPC,
-    //|-------+-------+-------|
-       KC_SPC , KC_F1 , KC_F2
-    //`-------+-------+-------'
-    ),
-    /*
-        | QK_BOOT          | N/A  | Media Stop |
-        | Held: Layer 2  | Home | RGB Mode   |
-        | Media Previous | End  | Media Next |
-     */
-    [_LIGHTS] = LAYOUT(
-    //,-------+-------+-------.
-         KC_  ,KC_BL_S,KC_STOP,
-    //|-------+-------+-------|
-       KC_RGBM,KC_HOME,KC_RGBT,
-    //|-------+-------+-------|
-       KC_MPRV,KC_END ,KC_MNXT
-    //`-------+-------+-------'
-    ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_RGHT);
-        } else {
-            tap_code(KC_LEFT);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-	    SEND_STRING(SS_LCTL("1")); // audacity zoom in
-        } else {
-	    SEND_STRING(SS_LCTL("3")); // audacity zoom out
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/bdn9/keymaps/lickel/keymap.c b/keyboards/keebio/bdn9/keymaps/lickel/keymap.c
deleted file mode 100644
index f62e38107ec..00000000000
--- a/keyboards/keebio/bdn9/keymaps/lickel/keymap.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* Copyright 2022 @ Adam Lickel
- *
- * 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 encoder_names {
-    _LEFT,
-    _RIGHT,
-    _MIDDLE,
-};
-
-enum bdn9_layers {
-    _MEDIA = 0,
-    _XCODE,
-    _CUST1,
-    _CUST2,
-};
-
-#define KC_XCRUN LGUI(KC_R)
-#define KC_XCPAUSE LCTL(LGUI(KC_Y))
-#define KC_XCSTOP LGUI(KC_DOT)
-
-// clang-format off
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MEDIA] = LAYOUT(
-        TO(_XCODE), RGB_SPD,    RGB_SPI,
-        RGB_MOD,    KC_MPLY,    KC_MSTP,
-        RGB_RMOD,   KC_MNXT,    KC_MPRV
-    ),
-    [_XCODE] = LAYOUT(
-        TG(_XCODE), KC_NO,      KC_NO,
-        KC_XCRUN,   KC_XCPAUSE, KC_XCSTOP,
-        KC_F6,      KC_F7,      KC_F8
-    ),
-    [_CUST1] = LAYOUT(
-        TG(_CUST1), _______,    _______,
-        _______,    _______,    _______,
-        _______,    _______,    _______
-    ),
-    [_CUST2] = LAYOUT(
-        TG(_CUST2), _______,    _______,
-        _______,    _______,    _______,
-        _______,    _______,    _______
-    ),
-};
-
-// clang-format on
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-    uint8_t layer = get_highest_layer(state);
-
-    switch (layer) {
-        case _MEDIA:  // Reset
-            rgblight_reload_from_eeprom();
-            break;
-
-        case _XCODE:
-            rgblight_sethsv_noeeprom(HSV_BLUE);
-#    if defined(RGB_MATRIX_ENABLE) && defined(ENABLE_RGB_MATRIX_BREATHING)
-            rgb_matrix_mode_noeeprom(RGB_MATRIX_BREATHING);
-#    elif defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_EFFECT_BREATHING)
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 1);
-#    endif
-            break;
-
-        case _CUST1:
-            rgblight_sethsv_noeeprom(HSV_GREEN);
-#    if defined(RGB_MATRIX_ENABLE) && defined(ENABLE_RGB_MATRIX_BREATHING)
-            rgb_matrix_mode_noeeprom(RGB_MATRIX_BREATHING);
-#    elif defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_EFFECT_BREATHING)
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 1);
-#    endif
-            break;
-
-        case _CUST2:
-            rgblight_sethsv_noeeprom(HSV_PURPLE);
-#    if defined(RGB_MATRIX_ENABLE) && defined(ENABLE_RGB_MATRIX_BREATHING)
-            rgb_matrix_mode_noeeprom(RGB_MATRIX_BREATHING);
-#    elif defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_EFFECT_BREATHING)
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 1);
-#    endif
-            break;
-
-        default:
-            break;
-    }
-#endif
-    return state;
-}
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-    [_MEDIA] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
-    [_XCODE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
-#else
-    [_MEDIA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
-    [_XCODE] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-#endif
-    [_CUST1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-    [_CUST2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-};
-#else
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    switch (layer) {
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-        case 0:  // Reset
-            if (index == _LEFT) {
-                if (clockwise) {
-                    rgblight_increase_hue();
-                } else {
-                    rgblight_decrease_hue();
-                }
-            } else if (index == _MIDDLE) {
-                if (clockwise) {
-                    rgblight_increase_sat();
-                } else {
-                    rgblight_decrease_sat();
-                }
-            } else if (index == _RIGHT) {
-                if (clockwise) {
-                    rgblight_increase_val();
-                } else {
-                    rgblight_decrease_val();
-                }
-            }
-            break;
-#endif
-
-        default:
-            if (index == _LEFT) {
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-            } else if (index == _MIDDLE) {
-                if (clockwise) {
-                    tap_code(KC_DOWN);
-                } else {
-                    tap_code(KC_UP);
-                }
-            } else if (index == _RIGHT) {
-                if (clockwise) {
-                    tap_code(KC_PGDN);
-                } else {
-                    tap_code(KC_PGUP);
-                }
-            }
-            break;
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/keebio/bdn9/keymaps/lickel/readme.md b/keyboards/keebio/bdn9/keymaps/lickel/readme.md
deleted file mode 100644
index 72170ce4529..00000000000
--- a/keyboards/keebio/bdn9/keymaps/lickel/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# lickel's BDN9 keymap
-
-- Via support is enabled by default
-- Changing layers to non-zero changes the RGBs to breathing colors
-- Changing to layer 0 resets the RGBs to EEPROM settings
-- Layer 0 encoders are: Hue, Saturation, Value
-- Other layers are: Volume, Arrow, Pg up/down
-
-- Layer 0: Media Controls & RGB Effects
-- Layer 1: Xcode Debugging
-- Layers 2 and 3: Reserved for Via
-
-## Changelog
-
-### 2022-12-09 - 1.1
-
-- Add ENCODER_MAP_ENABLE from default VIA definition
-
-### 2022-01-17 - 1.0
-
-- Initial release
diff --git a/keyboards/keebio/bdn9/keymaps/lickel/rules.mk b/keyboards/keebio/bdn9/keymaps/lickel/rules.mk
deleted file mode 100644
index ec89cb662fa..00000000000
--- a/keyboards/keebio/bdn9/keymaps/lickel/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/bdn9/keymaps/mousepad/config.h b/keyboards/keebio/bdn9/keymaps/mousepad/config.h
deleted file mode 100644
index a2eb1a95f00..00000000000
--- a/keyboards/keebio/bdn9/keymaps/mousepad/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MK_3_SPEED
-#define TERMINAL_HELP
-
diff --git a/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c b/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c
deleted file mode 100644
index 268dd8002ab..00000000000
--- a/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2019 Danny Nguyen <danny@keeb.io>
- *
- * 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
-
-
-bool is_alt_tab_active = false;    // ADD this near the begining of keymap.c
-uint16_t alt_tab_timer = 0;        // we will be using them soon.
-
-enum custom_keycodes {             // Make sure have the awesome keycode ready
-  ALT_TAB = SAFE_RANGE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3,
-        KC_WH_U, ALT_TAB, KC_WH_L,
-        KC_WH_D, TT(1), KC_WH_R
-    ),
-    [1] = LAYOUT(
-        QK_BOOT, KC_ACL0, KC_ACL1,
-        KC_VOLU, KC_ACL2, KC_BRIU,
-        KC_VOLD, TO(1),  KC_BRID
-    ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_MS_LEFT);
-        } else {
-            tap_code(KC_MS_RIGHT);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_MS_U);
-        } else {
-            tap_code(KC_MS_D);
-        }
-    }
-    return true;
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {               // This will do most of the grunt work with the keycodes.
-    case ALT_TAB:
-      if (record->event.pressed) {
-        if (!is_alt_tab_active) {
-          is_alt_tab_active = true;
-          register_code(KC_LALT);
-        }
-        alt_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-  }
-  return true;
-}
-
-void matrix_scan_user(void) {     // The very important timer.
-  if (is_alt_tab_active) {
-    if (timer_elapsed(alt_tab_timer) > 1000) {
-      unregister_code(KC_LALT);
-      is_alt_tab_active = false;
-    }
-  }
-}
diff --git a/keyboards/keebio/bdn9/keymaps/mousepad/readme.md b/keyboards/keebio/bdn9/keymaps/mousepad/readme.md
deleted file mode 100644
index fc843929dbd..00000000000
--- a/keyboards/keebio/bdn9/keymaps/mousepad/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Mousepad layout for BDN9
-##### 2 encoders required
-Why use a movable mouse when you can "Etech-a-sketch" style mousepad. 
-The left encoder will move the X axis; leaving the right to handle the Y axis
-
-|   |   |   |
-|:-:|:-:|:-:|
-| Left Click | Middle Click | Right Click |
-| Scroll Up | Super ALT↯TAB | Scroll Left |
-| Scroll Down | ADJUSTMENT Layer | Scroll Right|
-
-|   |   |   |
-|:-:|:-:|:-:|
-| RESET | Mouse ACL0 | Mouse ACL1 |
-| VOL UP | Mouse ACL2 | Brightness UP |
-| VOL Down | Adjustment Layer OFF | Brightness Down |
diff --git a/keyboards/keebio/bdn9/keymaps/mousepad/rules.mk b/keyboards/keebio/bdn9/keymaps/mousepad/rules.mk
deleted file mode 100644
index ff752ab42ce..00000000000
--- a/keyboards/keebio/bdn9/keymaps/mousepad/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE = yes
-TAPDANCE_ENABLE = yes
diff --git a/keyboards/keebio/bdn9/keymaps/vosechu-browser/keymap.c b/keyboards/keebio/bdn9/keymaps/vosechu-browser/keymap.c
deleted file mode 100644
index 4b0fb147ecc..00000000000
--- a/keyboards/keebio/bdn9/keymaps/vosechu-browser/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Macro keys for some apps
-#define SLACKUP LALT(LSFT(KC_UP))
-#define SLACKDN LALT(LSFT(KC_DOWN))
-#define RELOAD  LGUI(KC_R)
-
-enum custom_keycodes {
-  PAWFIVE = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-    QK_BOOT, PAWFIVE, RELOAD ,
-    SLACKUP, KC_UP  , KC_PGUP,
-    SLACKDN, KC_DOWN, KC_PGDN
-  ),
-};
-
-void keyboard_post_init_user(void) {
-    // Call the post init code.
-    rgblight_enable_noeeprom(); // enables Rgb, without saving settings
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); // sets mode to Slow breathing without saving
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case PAWFIVE:
-      if (record->event.pressed) {
-        SEND_STRING("+:pawfive:\n");
-        return false;
-      }
-  }
-
-  return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-      // Tab right
-      tap_code16(LSFT(LGUI(KC_RBRC)));
-    } else {
-      // Tab left
-      tap_code16(LSFT(LGUI(KC_LBRC)));
-    }
-  }
-  else if (index == 1) {
-    if (clockwise) {
-      // History forward
-      tap_code16(LGUI(KC_RBRC));
-    } else {
-      // History back
-      tap_code16(LGUI(KC_LBRC));
-    }
-  }
-    return true;
-}
diff --git a/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c b/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c
deleted file mode 100644
index 66483b51de3..00000000000
--- a/keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2019 Chuck Lauer Vose <vosechu@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
-
-// // Debugging
-// #include <print.h>
-
-#define BASE   TO(_BASE)
-#define PANIC  TO(_PANIC)
-#define FLIGHT TO(_FLIGHT)
-#define RCS    TO(_RCS)
-
-enum my_layers {
-    _BASE = 0,
-    _PANIC,
-    _FLIGHT,
-    _RCS
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        KC_MUTE, PANIC  , XXXXXXX,
-        FLIGHT , XXXXXXX, RCS    ,
-        XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    [_PANIC] = LAYOUT(
-        QK_BOOT, BASE   , XXXXXXX,
-        _______, XXXXXXX, _______,
-        KC_F2  , KC_F5  , KC_F9
-    ),
-    [_FLIGHT] = LAYOUT(
-        XXXXXXX, _______, KC_M   ,
-        BASE   , KC_W   , _______,
-        KC_A   , KC_S   , KC_D
-    ),
-    [_RCS] = LAYOUT(
-        XXXXXXX, _______, XXXXXXX,
-        _______, KC_I   , BASE   ,
-        KC_J   , KC_K   , KC_L
-    )
-};
-
-bool base_mode = false;
-bool panic_mode = false;
-bool flight_mode = false;
-bool rcs_mode = false;
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    base_mode = false;
-    panic_mode = false;
-    flight_mode = false;
-    rcs_mode = false;
-
-    switch (get_highest_layer(state)) {
-    case _PANIC:
-        panic_mode = true; // For use in encoder evaluation
-        rgblight_sethsv_noeeprom(HSV_RED);
-        break;
-    case _FLIGHT:
-        flight_mode = true; // For use in encoder evaluation
-        rgblight_sethsv_noeeprom(HSV_CYAN);
-        break;
-    case _RCS:
-        rcs_mode = true; // For use in encoder evaluation
-        rgblight_sethsv_noeeprom(HSV_BLUE);
-        break;
-    default: //  for any other layers, or the default layer
-        base_mode = true;
-        rgblight_sethsv_noeeprom(HSV_SPRINGGREEN);
-        break;
-    }
-    return state;
-}
-
-void keyboard_post_init_user(void) {
-    // Call the post init code.
-    rgblight_enable_noeeprom(); // enables Rgb, without saving settings
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 1); // sets mode to Slow breathing without saving
-    rgblight_sethsv_noeeprom(HSV_SPRINGGREEN);
-}
-
-// bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//     switch (keycode) {
-//         uprintf("Keycode: %s\n", keycode);
-//         if (record->event.pressed) {
-//           print("pressed");
-//           // Do something when pressed
-//         } else {
-//           print("unpressed");
-//           // Do something else when release
-//         }
-//     }
-//     return true;
-// }
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if(base_mode == true) {
-        if (index == 0) {
-            if (clockwise) {
-                // Volume up
-                tap_code(KC_VOLU);
-            } else {
-                // Volume down
-                tap_code(KC_VOLD);
-            }
-        }
-        else if (index == 1) {
-            if (clockwise) {
-                // Time warp faster
-                tap_code(KC_DOT);
-            } else {
-                // Time warp slower
-                tap_code(KC_COMM);
-            }
-        }
-    }
-
-    if(rcs_mode == true) {
-        if (index == 0) {
-            if (clockwise) {
-                // RCS Forward
-                tap_code(KC_H);
-            } else {
-                // RCS Backward
-                tap_code(KC_N);
-            }
-        }
-        else if (index == 1) {
-            if (clockwise) {
-                // RCS Rotate Left
-                tap_code(KC_Q);
-            } else {
-                // RCS Rotate Right
-                tap_code(KC_E);
-            }
-        }
-    }
-
-    if(flight_mode == true) {
-        if (index == 0) {
-            if (clockwise) {
-                // Throttle up
-                tap_code(KC_LSFT);
-            } else {
-                // Throttle down
-                tap_code(KC_LCTL);
-            }
-        }
-        else if (index == 1) {
-            if (clockwise) {
-                // Trim left
-                tap_code16(LALT(KC_A));
-            } else {
-                // Trim right
-                tap_code16(LALT(KC_D));
-            }
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index 1974d81f75f..5cfd269d500 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -17,61 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// RGB Matrix
-#    ifdef RGB_MATRIX_ENABLE
-#        define RGB_MATRIX_LED_COUNT 11
-#        define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#        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
-#        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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json
index 324a4000413..74d6dac85be 100644
--- a/keyboards/keebio/bdn9/rev2/info.json
+++ b/keyboards/keebio/bdn9/rev2/info.json
@@ -26,6 +26,51 @@
         "pin": "B15"
     },
     "rgb_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812"
     },
     "encoder": {
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h b/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
deleted file mode 100644
index 2eb4543603b..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-(Modified) Copyright 2019 AbstractKB
-
-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
-
-//my block------------
-#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 RGBLIGHT_SLEEP
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
deleted file mode 100644
index 637a7e04400..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-	_BASE,
-	_LIST
-};
-
-enum my_keycodes {
-	MYRGB_TG = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_BASE] = LAYOUT(
-    KC_MPLY,	KC_PSLS,	KC_PAST,	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,		MYRGB_TG,	KC_PGUP,
-	KC_MUTE,	KC_PPLS,	KC_PMNS,	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_DEL,		KC_PGDN,
-	KC_P7,		KC_P8,		KC_P9,		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_P4,		KC_P5,		KC_P6,		KC_BSPC,	KC_A,		KC_S,		KC_D,		KC_F,		KC_G,			KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,	KC_QUOT,	KC_ENT,		XXXXXXX,	KC_PSCR,
-	KC_P1,		KC_P2,		KC_P3,		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_CAPS,	KC_INS,
-	KC_P0,		KC_PDOT,	KC_PENT,	KC_LCTL,	TO(_LIST),	KC_LGUI,	KC_LALT,	XXXXXXX,	KC_SPC,			KC_SPC,		XXXXXXX,	KC_RALT,	KC_RGUI,	KC_RCTL,	KC_LEFT,	KC_DOWN,	KC_RGHT,	KC_NUM
-),
-
-[_LIST] = LAYOUT(
-	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,			_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,			_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,			_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,			_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,			_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-	_______,	_______,	_______,	_______,	TO(_BASE),	_______,	_______,	_______,	_______,			_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______
-)
-
-};
-
-bool rgbinit = true;
-bool rgbon = true;
-
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {1,5,5}; //only using the first one
-
-void matrix_post_init_user(void) {
-  rgblight_enable_noeeprom();
-  led_set_user(host_keyboard_leds());
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case _LIST:
-      rgblight_sethsv_noeeprom(0,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
-      break;
-    default: //_BASE
-      rgblight_sethsv_noeeprom(0,0,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-  }
-
-  return state;
-}
-
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
-  } else {
-    layer_state_set_user(layer_state);
-  }
-  return false;
-}
-
-void myrgb_toggle(void) {
-  if (rgbon) {
-    rgblight_disable_noeeprom();
-    rgbon = false;
-  } else {
-    rgblight_enable_noeeprom();
-    layer_state_set_user(layer_state);
-    led_set_user(host_keyboard_leds());
-    rgbon = true;
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case MYRGB_TG:
-      if (record->event.pressed) {
-        myrgb_toggle();
-      }
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/readme.md b/keyboards/keebio/bfo9000/keymaps/abstractkb/readme.md
deleted file mode 100644
index 3ba56571fea..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# My personal layout for the BFO-9000
-
-It is an approximation of a 96% layout with a left-hand number pad
-Other things I changed were swapping around delete, backspace, and capslock
-It also uses layer based rgb underglow, and the underglow flashes when capslock is enabled
\ No newline at end of file
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/rules.mk b/keyboards/keebio/bfo9000/keymaps/abstractkb/rules.mk
deleted file mode 100644
index 7ad666d1a38..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
deleted file mode 100644
index 9538405eb29..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-#define USE_I2C
-
-/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define TAPPING_TERM 150
-#define TAPPING_TOGGLE 2
-
-// #undef RGBLED_NUM
-// #define RGBLED_NUM 12
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
deleted file mode 100644
index d2f957e4f86..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/keymap.c
+++ /dev/null
@@ -1,381 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum bfo9000_layers {
-  _COLEMAK,   // Colemak (default layer)
-  _QWERTY,    // Qwerty
-  _COLEMAKGM, // Colemak gaming/vanilla (limited dual-role keys with layer access)
-  _QWERTYGM,  // QWERTY gaming/vanilla (limited dual-role keys with layer access)
-  _NUMBERS,   // Numbers & Symbols
-  _NUMBERS2,  // Numbers & Symbols 2 (identical as _NUMBERS; basically used for tri-layer access to _ADJUST)
-  _FUNCTION,  // Function
-  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
-  _NUMPAD,    // Numpad
-  _ADJUST,    // Adjust layer (accessed via tri-layer feature)
-  _ADJUST2    // Second Adjust layer (accessed outside of tri-layer feature)
-};
-
-enum bfo9000_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  COLEMAKGM,
-  QWERTYGM,
-  NUMPAD = TG(_NUMPAD),
-  ADJUST = MO(_ADJUST2),
-  SPCFN  = LT(_FUNCTION, KC_SPC),
-  BSPCFN = LT(_FUNCTION2, KC_BSPC),
-  ENTNS  = LT(_NUMBERS, KC_ENT),
-  DELNS  = LT(_NUMBERS2, KC_DEL),
-  CTLESC = CTL_T(KC_ESC),
-  ALTAPP = ALT_T(KC_APP),
-  NKROTG = MAGIC_TOGGLE_NKRO
-};
-
-//Tap Dance Declarations
-enum {
-  ADJ = 0,
-  LBCB,
-  RBCB,
-  EQPL,
-  PLEQ,
-  MNUN,
-  SLAS,
-  GVTL,
-  PPLEQ,
-  PMNUN,
-  PSLPAS
-};
-
-void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_on(_ADJUST2);
-     set_oneshot_layer(_ADJUST2, ONESHOT_START);
-  }
-}
-void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_off(_ADJUST2);
-     clear_oneshot_layer_state(ONESHOT_PRESSED);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-[ADJ]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
-[LBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
-[RBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
-[EQPL]   = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
-[PLEQ]   = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
-[MNUN]   = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
-[SLAS]   = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
-[GVTL]   = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
-[PPLEQ]  = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
-[PMNUN]  = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
-[PSLPAS] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Colemak
-   (Default layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------.
-  |  ESC  |   F1  |   F2  |   F3  |   F4  |   F5  |       |       |       |          | Adjust|       |  F12  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |   =   |   1   |   2   |   3   |   4   |   5   |       |       |       |          | Numpad|       |       |   6   |   7   |   8   |   9   |   0   |   -   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  Tab  |   Q   |   W   |   F   |   P   |   G   |       |       |  Home |          | Pause |       |       |   J   |   L   |   U   |   Y   |   ;   |   \   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |Esc/Ctl|   A   |   R   |   S   |   T   |   D   |       |       |  PgUp |          | ScrLck|       |       |   H   |   N   |   E   |   I   |   O   |   '   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |SCShift|   Z   |   X   |   C   |   V   |   B   |Esc/Ctl|App/Alt|  PgDn |          | PrtScr|  RAlt |  RCtl |   K   |   M   |   ,   |   .   |   /   |SCShift|
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/Fn| Ent/NS|  Bspc |  End  |          |       | Enter |Del/NS2|Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
-*/
-[_COLEMAK] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______,     ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______,     NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______, _______, KC_HOME,     KC_PAUS, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* QWERTY
-   (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------.
-  |  ESC  |   F1  |   F2  |   F3  |   F4  |   F5  |       |       |       |          | Adjust|       |  F12  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |   =   |   1   |   2   |   3   |   4   |   5   |       |       |       |          | Numpad|       |       |   6   |   7   |   8   |   9   |   0   |   -   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  Tab  |   Q   |   W   |   E   |   R   |   T   |       |       |  Home |          | Pause |       |       |   Y   |   U   |   I   |   O   |   P   |   \   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |Esc/Ctl|   A   |   S   |   D   |   F   |   G   |       |       |  PgUp |          | ScrLck|       |       |   H   |   J   |   K   |   L   |   ;   |   '   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |SCShift|   Z   |   X   |   C   |   V   |   B   |Esc/Ctl|App/Alt|  PgDn |          | PrtScr|  RAlt |  RCtl |   N   |   M   |   ,   |   .   |   /   |SCShift|
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/Fn| Ent/NS|  Bspc |  End  |          |       | Enter |Del/NS2|Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
-*/
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, 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_Y,    KC_U,    KC_HOME,     KC_PAUS, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Numbers/Symbols layer
-   (Multiple characters: single-tap for first, double-tap for second)
-  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------.
-  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  F12  |   F1  |   F2  |   F3  |   F4  |   F5  |       |       |       |          |       |       |       |   F6  |   F7  |   F8  |   F9  |  F10  |  F12  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |   6   |   7   |   8   |   9   |   0   |       |       |       |          |       |       |       |   ^   |   &   |   *   |   (   |   )   |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |   1   |   2   |   3   |   4   |   5   |       |       |       |          |       |       |       |   !   |   @   |   #   |   $   |   %   |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |       |   .   |  / *  |  - _  |  + =  |       |       |       |          |       |       |       |  ` ~  |  [ {  |  ] }  |       |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |   (   |   )   |  [ {  |  ] }  |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
-  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
-*/
-[_NUMBERS] = LAYOUT(
-  _______, _______, _______,  _______,  _______,  _______,  _______, _______, _______,     _______, _______,  _______,  _______,  _______,  _______,  _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______, _______, _______,     _______, _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,     _______, _______, _______,     _______, _______,  _______,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,     _______, _______, _______,     _______, _______,  _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ), _______, _______, _______,     _______, _______,  _______,  TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,  _______, _______, _______,     _______, _______,  _______,  _______,  _______,  _______,  _______, _______, _______
-),
-
-[_NUMBERS2] = LAYOUT(
-  _______, _______, _______,  _______,  _______,  _______,  _______, _______, _______,     _______, _______,  _______,  _______,  _______,  _______,  _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______, _______, _______,     _______, _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,     _______, _______, _______,     _______, _______,  _______,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,     _______, _______, _______,     _______, _______,  _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ), _______, _______, _______,     _______, _______,  _______,  TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,  _______, _______, _______,     _______, _______,  _______,  _______,  _______,  _______,  _______, _______, _______
-),
-
-/* Function layer
-  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------.
-  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  F12  |   F1  |   F2  |   F3  |   F4  |   F5  |       |       |       |          |       |       |       |   F6  |   F7  |   F8  |   F9  |  F10  |  F12  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |       |       |   Up  |       |       |       |       |       |          |       |       |       |       |       |   Up  | Ctrl+Y|       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       | Ctrl+A|  Left |  Down | Right | C+A+Tb|       |       |       |          |       |       |       |  PgUp | Right |  Down |  Left |  Home |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       | Ctrl+Z| Ctrl+X| Ctrl+C| Ctrl+V|  Bspc |       |       |       |          |       |       |       |  PgDn |  Mute |  Vol- |  Vol+ |  End  |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |  Prev |  Play |  Next |  Stop |
-  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
-*/
-[_FUNCTION] = LAYOUT(
-  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,    _______, _______,
-  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,       _______, _______, _______,     _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,  KC_F11,
-  _______, _______,    _______,    KC_UP,      _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB), _______, _______, _______,     _______, _______, _______, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,     _______, _______, _______,     _______, _______, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP
-),
-
-[_FUNCTION2] = LAYOUT(
-  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,    _______, _______,
-  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,       _______, _______, _______,     _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,  KC_F11,
-  _______, _______,    _______,    KC_UP,      _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB), _______, _______, _______,     _______, _______, _______, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,     _______, _______, _______,     _______, _______, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______,     _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP
-),
-
-/* Numpad layer
-   (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
-  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------.
-  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       | NumLk |       |       |       |       |       |       |       |          |       |       |  Tab  | NumLk |  KP / |  KP * |  KP - |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |  KP 6 |  KP 7 |  KP 8 |  KP 9 |  KP 0 |       |       |       |          |       |       |       |  KP 7 |  KP 8 |  KP 9 |  KP + |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |  KP 1 |  KP 2 |  KP 3 |  KP 4 |  KP 5 |       |       |       |          |       |       |       |  KP 4 |  KP 5 |  KP 6 |   =   |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |       |  KP . |KP/ KP*| KP- _ | KP+ = |       |       |       |          |       |       |       |  KP 1 |  KP 2 |  KP 3 | KP Ent|       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |   (   |   )   |  [ {  |  ] }  |       |       |       |       |       |          |       |       |       |       |  KP 0 |  KP . | KP Ent|       |       |
-  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
-*/
-[_NUMPAD] = LAYOUT(
-  _______, _______, _______,  _______,   _______,   _______,   _______, _______, _______,     _______, _______,  _______,  _______, _______, _______, _______, _______, _______,
-  _______, KC_NUM,  _______,  _______,   _______,   _______,   _______, _______, _______,     _______, _______,  _______,  KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
-  _______, KC_P6,   KC_P7,   KC_P8,      KC_P9,     KC_P0,     _______, _______, _______,     _______, _______,  _______,  _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
-  _______, KC_P1,   KC_P2,   KC_P3,      KC_P4,     KC_P5,     _______, _______, _______,     _______, _______,  _______,  _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
-  _______, _______, KC_PDOT, TD(PSLPAS), TD(PMNUN), TD(PPLEQ), _______, _______, _______,     _______, _______,  _______,  _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),  _______,   _______,   _______, _______, _______,     _______, _______,  _______,  _______, _______, KC_P0,   KC_PDOT, KC_PENT, _______
-),
-
-/* Colemak gaming/vanilla
-   (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Del/NS2 on right side to access Adjust layer)
-  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------.
-  |  ESC  |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |   F7  |   F8  |          | Adjust|       |  F12  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |   =   |   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |          | Numpad|       |       |   6   |   7   |   8   |   9   |   0   |   -   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  Tab  |   Q   |   W   |   F   |   P   |   G   |   J   |   L   |  Home |          | Pause |       |       |   J   |   L   |   U   |   Y   |   ;   |   \   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  LCtl |   A   |   R   |   S   |   T   |   D   |   H   |   N   |  PgUp |          | ScrLck|       |       |   H   |   N   |   E   |   I   |   O   |   '   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  | Shift |   Z   |   X   |   C   |   V   |   B   |  Esc  |  LAlt |  PgDn |          | PrtScr|  RAlt |  RCtl |   K   |   M   |   ,   |   .   |   /   | Shift |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  Ins  |   `   |   [   |   ]   |  LAlt | Space | Enter |  Bspc |  End  |          |       | Ent/NS|Del/NS2|Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
-*/
-[_COLEMAKGM] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_HOME,     KC_PAUS, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_PGUP,     KC_SCRL, _______, _______, 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_ESC,  KC_LALT, KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, KC_LALT, KC_SPC,  KC_ENT,  KC_BSPC, KC_END,      _______, ENTNS,   DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* QWERTY gaming/vanilla
-   (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Del/NS2 on right side to access Adjust layer)
-  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------.
-  |  ESC  |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |   F7  |   F8  |          | Adjust|       |  F12  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |   =   |   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |          | Numpad|       |       |   6   |   7   |   8   |   9   |   0   |   -   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  Tab  |   Q   |   W   |   E   |   T   |   Y   |   U   |   I   |  Home |          | Pause |       |       |   Y   |   U   |   I   |   O   |   P   |   \   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  LCtl |   A   |   S   |   D   |   F   |   G   |   H   |   J   |  PgUp |          | ScrLck|       |       |   H   |   J   |   K   |   L   |   ;   |   '   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  | Shift |   Z   |   X   |   C   |   V   |   B   |  Esc  |  LAlt |  PgDn |          | PrtScr|  RAlt |  RCtl |   N   |   M   |   ,   |   .   |   /   | Shift |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  Ins  |   `   |   [   |   ]   |  LAlt | Space | Enter |  Bspc |  End  |          |       | Ent/NS|Del/NS2|Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
-*/
-[_QWERTYGM] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, 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_Y,    KC_U,    KC_HOME,     KC_PAUS, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SCRL, _______, _______, 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_ESC,  KC_LALT, KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, KC_LALT, KC_SPC,  KC_ENT,  KC_BSPC, KC_END,      _______, ENTNS,   DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Adjust layer
-   (Enter/Number + Delete/Number2 under non-gaming/vanilla layers or press & hold Adjust key on function row; Numpad is a toggle)
-  ,-----------------------------------------------------------------------.          ,-----------------------------------------------------------------------.
-  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |Colemak| Qwerty|       |ColmkGM|  QWGM |       |       |       |          |       |       |       | Numpad|       |       |       |       | QK_BOOT |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |       |       |       |       |       |       |       |       |          |       |       |       |       | NKROTG|       |       |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |       |       |       |       |       |       |       |       |       |          |       |       |       |       |       |       |       |       |       |
-  `-----------------------------------------------------------------------'          `-----------------------------------------------------------------------'
-*/
-[_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_ADJUST2] = LAYOUT(
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	case COLEMAK:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAK);
-//        persistent_default_layer_set(1UL << _COLEMAK);
-        layer_off ( _QWERTY);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _COLEMAKGM);
-        layer_off ( _QWERTYGM);
-        layer_off ( _ADJUST);
-        layer_off ( _ADJUST2);
-	  }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTY);
-//        persistent_default_layer_set(1UL << _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _COLEMAKGM);
-        layer_off ( _QWERTYGM);
-        layer_off ( _ADJUST);
-        layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-    case COLEMAKGM:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAKGM);
-        layer_off ( _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _QWERTYGM);
-        layer_off ( _ADJUST);
-        layer_off ( _ADJUST2);
-	  }
-      return false;
-      break;
-    case QWERTYGM:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTYGM);
-        layer_off ( _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _COLEMAKGM);
-        layer_off ( _ADJUST);
-        layer_off ( _ADJUST2);
-	  }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/readme.md b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/readme.md
deleted file mode 100644
index 0a3bdc45fd1..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-## I've changed my folder name to match my GitHub username.  Please see https://github.com/qmk/qmk_firmware/tree/master/keyboards/keebio/bfo9000/keymaps/tuesdayjohn for my current keymap files.
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/rules.mk b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/rules.mk
deleted file mode 100644
index 390cb3fd60a..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
diff --git a/keyboards/keebio/bfo9000/keymaps/rogthefrog6x9/keymap.c b/keyboards/keebio/bfo9000/keymaps/rogthefrog6x9/keymap.c
deleted file mode 100644
index 8cdf12545bc..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/rogthefrog6x9/keymap.c
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2022 rogthefrog
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-    _BASE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_BASE] = LAYOUT(
-    KC_ESC,  KC_CALC, 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_PSCR, KC_VOLU, KC_MUTE,
-    KC_NUM,  KC_INS,  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_VOLD, KC_HOME,
-    KC_P7,   KC_P8,   KC_P9,   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_P4,   KC_P5,   KC_P6,   KC_BSPC, 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_INS,  KC_PGUP,
-    KC_P1,   KC_P2,   KC_P3,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL, KC_APP,  KC_UP,   KC_PGDN,
-    KC_P0,   KC_PDOT, KC_ENT,  KC_LCTL, KC_LGUI, KC_LALT, KC_CAPS, KC_ENT,  KC_BSPC,       KC_SPC,  KC_BSPC, KC_RGUI, KC_CUT,  KC_COPY, KC_PSTE, KC_LEFT, KC_DOWN, KC_RGHT
-)
-};
diff --git a/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c b/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c
deleted file mode 100644
index 77c91612fc4..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/shadyproject/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2021 Chrisopher S Martin
- *
- * 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 bfo900_layers {
-    _QWERTY,
-    _FUNC,
-};
-
-enum bfo9000_keycodes {
-    QWERTY = SAFE_RANGE,
-    GAMING
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
-QWERTY
-(Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
- ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |   ESC  |  QK_BOOT |   F1   |   F2   |   F3   |   F4   |   F5   |        |        |   |        |        |   F6   |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |    1   |    2   |    3   |    4   |   5    |        |        |   |        |        |   6    |    7   |    8   |    9   |    0   |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |    `   |    Q   |    W   |    E   |    R   |   T    |        |   [    |   |    ]   |        |   Y    |    U   |    I   |    O   |    P   |    +   |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |    A   |    S   |    D   |    F   |   G    |  Tab   |  Fn    |   |   Fn   |  Enter |   H    |    J   |    K   |    L   |    ;   |    '   |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |    Z   |    X   |    C   |    V   |    B   |  ESC   |        |   |        |        |   N    |    M   |    ,   |    .   |    /   |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |PrntScrn| Ctrl   | Bkspc  |Meta/OS | Shift  |   |  Shift |  Alt   | Space  | Ctrl   |        |        |   -    |        |        |
- `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
-*/
-[_QWERTY] = LAYOUT(
-  KC_ESC,  QK_BOOT,  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,    KC_BSLS, _______,
-  _______,  KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______, KC_LBRC,   KC_RBRC, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,  _______,
-  _______, _______,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_TAB,  MO(_FUNC), MO(_FUNC), KC_ENT, KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, _______, // TODO: use OSL instead of MO
-  _______, _______,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,  _______,   _______, _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______, _______,
-  _______, _______,  _______, _______, KC_PSCR, KC_LCTL, KC_BSPC, KC_LGUI, KC_LSFT,   KC_RSFT, KC_RALT, KC_SPC,  KC_RCTL, _______, _______, KC_MINS, _______, _______ //KC_CTL shoudl be double tap for capslock
-),
-
-/*
-Function layer
- ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |   \    |   {    |    }   |   [    |   ]    |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |  LEFT  |  DOWN  |  UP    |  RIGHT |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |   \    |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |   |    |        |        |
- `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
-*/
-[_FUNC] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_BSLS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, KC_BSLS, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, KC_PIPE, _______, _______
-),
-
-};
diff --git a/keyboards/keebio/bfo9000/keymaps/shadyproject/readme.md b/keyboards/keebio/bfo9000/keymaps/shadyproject/readme.md
deleted file mode 100644
index 231d13d49bd..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/shadyproject/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-![Shadyproject BFO-9000 layout image](http://shadyproject.net/images/bfo9000-layout.png)
-
-# Shadyproject BFO-9000 layout
-
-This is a keymap for the [Keebio BFO-9000](https://keeb.io/products/bfo-9000-keyboard-customizable-full-size-split-ortholinear?variant=8116065271914).  
-It is a dual layer (currently) that is inspired by the [Keyboardio Model 01](https://shop.keyboard.io/products/model-01-keyboard?variant=30996744405065) layout.
-
-## Layers
-
-- Qwerty
-- Functions
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
deleted file mode 100644
index 9538405eb29..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-#define USE_I2C
-
-/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define TAPPING_TERM 150
-#define TAPPING_TOGGLE 2
-
-// #undef RGBLED_NUM
-// #define RGBLED_NUM 12
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
deleted file mode 100644
index 76570912a16..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/keymap.c
+++ /dev/null
@@ -1,341 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum bfo9000_layers {
-  _COLEMAK,   // Colemak (default layer)
-  _QWERTY,    // Qwerty
-  _GAMING,    // Gaming/vanilla toggle layer (limited dual-role keys and layer access)
-  _NUMBERS,   // Numbers & Symbols
-  _NUMBERS2,  // Numbers & Symbols 2 (identical as _NUMBERS; basically used for tri-layer access to _ADJUST)
-  _FUNCTION,  // Function
-  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
-  _NUMPAD,    // Numpad
-  _ADJUST,    // Adjust layer (accessed via tri-layer feature)
-  _ADJUST2    // Second Adjust layer (accessed outside of tri-layer feature)
-};
-
-enum bfo9000_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  GAMING
-};
-
-//Tap Dance Declarations
-enum {
-  ADJ = 0,
-  LBCB,
-  RBCB,
-  EQPL,
-  PLEQ,
-  MNUN,
-  SLAS,
-  GVTL,
-  PPEQ,
-  PMUN,
-  PSPA
-};
-
-void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_on(_ADJUST2);
-     set_oneshot_layer(_ADJUST2, ONESHOT_START);
-  }
-}
-void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_off(_ADJUST2);
-     clear_oneshot_layer_state(ONESHOT_PRESSED);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-[ADJ]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
-[LBCB] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
-[RBCB] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
-[EQPL] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
-[PLEQ] = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
-[MNUN] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
-[SLAS] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
-[GVTL] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
-[PPEQ] = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
-[PMUN] = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
-[PSPA] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
-};
-
-//Aliases for longer keycodes
-#define NUMPAD  TG(_NUMPAD)
-#define ADJUST  MO(_ADJUST2)
-#define SPCFN   LT(_FUNCTION, KC_SPC)
-#define BSPCFN  LT(_FUNCTION2, KC_BSPC)
-#define ENTNS   LT(_NUMBERS, KC_ENT)
-#define DELNS   LT(_NUMBERS2, KC_DEL)
-#define CTLESC  CTL_T(KC_ESC)
-#define ALTAPP  ALT_T(KC_APP)
-#define CTL_A   LCTL(KC_A)
-#define CTL_C   LCTL(KC_C)
-#define CTL_V   LCTL(KC_V)
-#define CTL_X   LCTL(KC_X)
-#define CTL_Z   LCTL(KC_Z)
-#define CTL_Y   LCTL(KC_Y)
-#define CA_TAB  LCA(KC_TAB)
-#define HYPER   ALL_T(KC_NO)
-#define TD_ADJ  TD(ADJ)
-#define TD_LBCB TD(LBCB)
-#define TD_RBCB TD(RBCB)
-#define TD_EQPL TD(EQPL)
-#define TD_PLEQ TD(PLEQ)
-#define TD_MNUN TD(MNUN)
-#define TD_SLAS TD(SLAS)
-#define TD_GVTL TD(GVTL)
-#define TD_PPEQ TD(PPEQ)
-#define TD_PMUN TD(PMUN)
-#define TD_PSPA TD(PSPA)
-#define NKROTG  MAGIC_TOGGLE_NKRO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
-Colemak
-(Default layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
- ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |   ESC  |   F1   |   F2   |   F3   |   F4   |   F5   |        |        |        |   | Adjust |        |   F12  |   F6   |   F7   |   F8   |   F9   |   F10  |   F11  |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |    =   |    1   |    2   |    3   |    4   |    5   |        |        |        |   | Numpad |        |        |    6   |    7   |    8   |    9   |    0   |    -   |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |   Tab  |    Q   |    W   |    F   |    P   |    G   |        |        |  Home  |   | Pause  |        |        |    J   |    L   |    U   |    Y   |    ;   |    \   |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- | Esc/Ctl|    A   |    R   |    S   |    T   |    D   |        |        |  PgUp  |   | ScrLck |        |        |    H   |    N   |    E   |    I   |    O   |    '   |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- | SCShift|    Z   |    X   |    C   |    V   |    B   | Esc/Ctl| App/Alt|  PgDn  |   | PrtScr |  RAlt  |  RCtl  |    K   |    M   |    ,   |    .   |    /   | SCShift|
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |   Ins  |    `   |    [   |    ]   | App/Alt| Spc/Fn | Ent/NS |  Bspc  |   End  |   |        |  Enter | Del/NS2| Bsp/Fn2|  RGUI  |  Left  |  Down  |   Up   |  Right |
- `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
-*/
-[_COLEMAK] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______,     ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______,     NUMPAD,  _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______, _______, KC_HOME,     KC_PAUS, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/*
-QWERTY
-(Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
- ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |   ESC  |   F1   |   F2   |   F3   |   F4   |   F5   |        |        |        |   | Adjust |        |   F12  |   F6   |   F7   |   F8   |   F9   |   F10  |   F11  |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |    =   |    1   |    2   |    3   |    4   |    5   |        |        |        |   | Numpad |        |        |    6   |    7   |    8   |    9   |    0   |    -   |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |   Tab  |    Q   |    W   |    E   |    R   |    T   |        |        |  Home  |   |  Pause |        |        |    Y   |    U   |    I   |    O   |    P   |    \   |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- | Esc/Ctl|    A   |    S   |    D   |    F   |    G   |        |        |  PgUp  |   | ScrLck |        |        |    H   |    J   |    K   |    L   |    ;   |    '   |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- | SCShift|    Z   |    X   |    C   |    V   |    B   | Esc/Ctl| App/Alt|  PgDn  |   | PrtScr |  RAlt  |  RCtl  |    N   |    M   |    ,   |    .   |    /   | SCShift|
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |   Ins  |    `   |    [   |    ]   | App/Alt| Spc/Fn | Ent/NS |  Bspc  |   End  |   |        |  Enter | Del/NS2| Bsp/Fn2|  RGUI  |  Left  |  Down  |   Up   |  Right |
- `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
-*/
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,       ADJUST,  _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        NUMPAD,  _______, _______, 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_Y,    KC_U,    KC_HOME,     KC_PAUS, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_PGUP,     KC_SCRL, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLESC,  ALTAPP,  KC_PGDN,     KC_PSCR, KC_RALT, KC_RCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,   ENTNS,   KC_BSPC, KC_END,      _______, KC_ENT,  DELNS,   BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/*
-Numbers/Symbols layer
-(Multiple characters: single-tap for first, double-tap for second)
- ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |   F12  |   F1   |   F2   |   F3   |   F4   |   F5   |        |        |        |   |        |        |        |   F6   |   F7   |   F8   |   F9   |   F10  |   F12  |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |    6   |    7   |    8   |    9   |    0   |        |        |        |   |        |        |        |    ^   |    &   |    *   |    (   |    )   |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |    1   |    2   |    3   |    4   |    5   |        |        |        |   |        |        |        |    !   |    @   |    #   |    $   |    %   |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |    .   |   / *  |   - _  |   + =  |        |        |        |   |        |        |        |   ` ~  |   [ {  |   ] }  |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |    (   |    )   |   [ {  |   ] }  |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
-*/
-[_NUMBERS] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______,     _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______,     _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______,     _______, _______, _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ, _______, _______, _______,     _______, _______, _______, TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_NUMBERS2] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______,     _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______,     _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______,     _______, _______, _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ, _______, _______, _______,     _______, _______, _______, TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/*
-Function layer
- ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |   F12  |   F1   |   F2   |   F3   |   F4   |   F5   |        |        |        |   |        |        |        |   F6   |   F7   |   F8   |   F9   |   F10  |   F12  |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |   Up   |        |        |        |        |        |   |        |        |        |        |        |   Up   | Ctrl+Y |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        | Ctrl+A |  Left  |  Down  |  Right | C+A+Tb |        |        |        |   |        |        |        |  PgUp  |  Right |  Down  |  Left  |  Home  |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        | Ctrl+Z | Ctrl+X | Ctrl+C | Ctrl+V |  Bspc  |        |        |        |   |        |        |        |  PgDn  |  Mute  |  Vol-  |  Vol+  |   End  |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |  Prev  |  Play  |  Next  |  Stop  |
- `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
-*/
-[_FUNCTION] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______,     _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, KC_UP,   CTL_Y,   _______, _______,
-  _______, CTL_A,   KC_LEFT, KC_DOWN, KC_RGHT, CA_TAB,  _______, _______, _______,     _______, _______, _______, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
-  _______, CTL_Z,   CTL_X,   CTL_C,   CTL_V,   KC_BSPC, _______, _______, _______,     _______, _______, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
-),
-
-[_FUNCTION2] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______,     _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, KC_UP,   CTL_Y,   _______, _______,
-  _______, CTL_A,   KC_LEFT, KC_DOWN, KC_RGHT, CA_TAB,  _______, _______, _______,     _______, _______, _______, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
-  _______, CTL_Z,   CTL_X,   CTL_C,   CTL_V,   KC_BSPC, _______, _______, _______,     _______, _______, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
-),
-
-/*
-Numpad layer
-(Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
- ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |  NumLk |        |        |        |        |        |        |        |   |        |        |   Tab  |  NumLk |  KP /  |  KP *  |  KP -  |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |  KP 6  |  KP 7  |   KP 8 |  KP 9  |  KP 0  |        |        |        |   |        |        |        |  KP 7  |  KP 8  |  KP 9  |  KP +  |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |  KP 1  |  KP 2  |   KP 3 |  KP 4  |  KP 5  |        |        |        |   |        |        |        |  KP 4  |  KP 5  |  KP 6  |    =   |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |  KP .  | KP/ KP*|  KP- _ |  KP+ = |        |        |        |   |        |        |        |  KP 1  |  KP 2  |  KP 3  | KP Ent |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |    (   |    )   |   [ {  |   ] }  |        |        |        |        |        |   |        |        |        |        |  KP 0  |  KP .  | KP Ent |        |        |
- `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
-*/
-[_NUMPAD] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_NUM,  _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
-  _______, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, _______, _______,     _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
-  _______, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   _______, _______, _______,     _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
-  _______, _______, KC_PDOT, TD_PSPA, TD_PMUN, TD_PPEQ, _______, _______, _______,     _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-  KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PENT, _______
-),
-
-/*
-Gaming
-(Toggle gaming layer with limited dual-role keys and layer access; NKRO turned on by default; Ent/NS + Delete/Numbers2 to access Adjust layer)
- ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |        |        |        |        |        |        |   F6   |   F7   |   F8   |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |    6   |    7   |    8   |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |    J   |    L   |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |  LCtl  |        |        |        |        |        |    H   |    N   |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |  Shift |        |        |        |        |        |   Esc  |  LAlt  |        |   |        |  RAlt  |  RCtl  |        |        |        |        |        |  Shift |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |  LAlt  |  Space |  Enter |  Bspc  |        |   |        | Ent/NS | Del/NS2| Bsp/Fn2|  RGUI  |        |        |        |        |
- `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
-*/
-[_GAMING] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, KC_F6,   KC_F7,   KC_F8,       _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_6,    KC_7,    KC_8,        _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_J,    KC_L,    _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_LCTL, _______, _______, _______, _______, _______, KC_H,    KC_N,    _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_LSFT, _______, _______, _______, _______, _______, KC_ESC,  KC_LALT, _______,     _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT,
-  _______, _______, _______, _______, KC_LALT, KC_SPC,  KC_ENT,  KC_BSPC, _______,     _______, ENTNS,   _______, _______, _______, _______, _______, _______, _______
-),
-
-/*
-Adjust layer
-(Press and hold Adjust key on the function row or Enter/Number + Delete/Number2 to access; Numpad and NKRO are on toggle)
- ,--------------------------------------------------------------------------------.   ,--------------------------------------------------------------------------------.
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        | Colemak| Qwerty |        | Gaming |        |        |        |        |   |        |        |        | Numpad |        |        |        |        |  QK_BOOT |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        | NKROTG |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |        |        |        |   |        |        |        |        |        |        |        |        |        |
- `--------------------------------------------------------------------------------'   `--------------------------------------------------------------------------------'
-*/
-[_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, GAMING,  _______, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_ADJUST2] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, GAMING,  _______, _______, _______, _______,     _______, _______, _______, NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	case COLEMAK:
-      if (record->event.pressed) {
-//        persistent_default_layer_set(1UL << _COLEMAK);
-        default_layer_set(1UL << _COLEMAK);
-        layer_move (_COLEMAK);
-        keymap_config.nkro = 0;
-	  }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-//        persistent_default_layer_set(1UL << _QWERTY);
-        default_layer_set(1UL << _QWERTY);
-        layer_move (_QWERTY);
-        keymap_config.nkro = 0;
-      }
-      return false;
-      break;
-    case GAMING:
-      if (record->event.pressed) {
-        layer_invert (_GAMING);
-        layer_off (_NUMPAD);
-        keymap_config.nkro = 1;
-	  }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/rules.mk b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/rules.mk
deleted file mode 100644
index 390cb3fd60a..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
diff --git a/keyboards/keebio/bfo9000/keymaps/vladkvit/keymap.c b/keyboards/keebio/bfo9000/keymaps/vladkvit/keymap.c
deleted file mode 100644
index 4409f39549f..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/vladkvit/keymap.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2020 vladkvit
-
-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_NO, KC_NO, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO,        KC_NO, KC_F6, KC_F7, KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_NO,
-                 KC_NO, KC_NO, KC_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_NO,        KC_NO, KC_6,  KC_7,  KC_8,   KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-                 KC_NO, KC_NO, KC_TAB, KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_NO,        KC_NO, KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-                 KC_NO, KC_NO, KC_NO,  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_NO,        KC_NO, KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  KC_NO,
-                 KC_NO, KC_NO, KC_LSFT,KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_NO,        KC_NO, KC_N,  KC_M,  KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP,   KC_NO,
-                 KC_NO, KC_NO, KC_LCTL, KC_LGUI,KC_LALT,KC_NO,KC_NO,KC_SPC,MO(1),       KC_NO, KC_SPC,KC_NO, KC_RALT,KC_RGUI,KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-    [1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/keebio/bfo9000/keymaps/vladkvit/readme.md b/keyboards/keebio/bfo9000/keymaps/vladkvit/readme.md
deleted file mode 100644
index eeb79855c39..00000000000
--- a/keyboards/keebio/bfo9000/keymaps/vladkvit/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# vladkvit's keymap layout for BFO9000
-
-This is pretty much a stock tenkeyless layout, with only a single difference - a function key to access a second layer with 6 "navigation" keys on the home row.
-There's space on the left for extra macro keys.
\ No newline at end of file
diff --git a/keyboards/keebio/cepstrum/rev1/config.h b/keyboards/keebio/cepstrum/rev1/config.h
index 72f182b1567..7c3bb16bad2 100644
--- a/keyboards/keebio/cepstrum/rev1/config.h
+++ b/keyboards/keebio/cepstrum/rev1/config.h
@@ -4,59 +4,17 @@
 #pragma once
 
 #define SPLIT_HAND_PIN GP4
+
 #define USB_VBUS_PIN GP12
+
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP0
 #define SERIAL_USART_RX_PIN GP1
 #define SERIAL_USART_PIN_SWAP
+
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
 #define I2C_DRIVER I2CD2
 #define I2C1_SCL_PIN GP22
 #define I2C1_SDA_PIN GP23
-
-// RGB Matrix
-#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 120
-#define RGB_MATRIX_LED_COUNT 96
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/keebio/cepstrum/rev1/info.json b/keyboards/keebio/cepstrum/rev1/info.json
index b4b764c8899..0b53d127927 100644
--- a/keyboards/keebio/cepstrum/rev1/info.json
+++ b/keyboards/keebio/cepstrum/rev1/info.json
@@ -14,6 +14,11 @@
                 "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP21", "GP15", "GP9", "GP10"],
                 "rows": ["GP2", "GP3", "GP5", "GP8", "GP19"]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "matrix_pins": {
@@ -125,6 +130,43 @@
         "pin": "GP18"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "split_count": [48, 48],
         "layout": [
@@ -225,6 +267,8 @@
             {"matrix": [9,2], "flags":4, "x":158, "y":60},
             {"matrix": [9,1], "flags":4, "x":137, "y":60},
             {"flags":2, "x":126, "y":64}
-        ]
+        ],
+        "max_brightness": 120,
+        "sleep": true
     }
 }
diff --git a/keyboards/keebio/chocopad/keymaps/khord/keymap.c b/keyboards/keebio/chocopad/keymaps/khord/keymap.c
deleted file mode 100644
index fa1e04bde86..00000000000
--- a/keyboards/keebio/chocopad/keymaps/khord/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BASE 0
-#define _FN1 1
-#define _FN2 2
-
-#define KC_L1 LT(1, KC_P0)
-#define KC_L2 LT(2, KC_SPC)
-#define KC_MAC1 ADMIN
-#define KC_MAC2 SMSPC
-#define KC_M192 M192
-#define KC_M255 M255
-
-enum custom_keycodes {
-  NUMPAD = SAFE_RANGE,
-  ADMIN,
-  SMSPC,
-  M192,
-  M255
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT_ortho_4x4(
-    KC_P7,   KC_P8,   KC_P9,   KC_BSPC,
-    KC_P4,   KC_P5,   KC_P6,   KC_TAB ,
-    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_L1,   KC_L2,   KC_PDOT, KC_PSLS
-  ),
-
-  [_FN1] = LAYOUT_ortho_4x4(
-    KC_ESC,  KC_MAC1, KC_MAC2, KC_DEL ,
-    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-    KC_M192, KC_M255, XXXXXXX, XXXXXXX,
-    _______, XXXXXXX, _______, XXXXXXX
-  ),
-
-  [_FN2] = LAYOUT_ortho_4x4(
-    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX,
-    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
-    BL_STEP, _______, XXXXXXX, XXXXXXX
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case ADMIN:
-      if (record->event.pressed) {
-	SEND_STRING("Administrator");
-      }
-      return false;
-      break;
-    case SMSPC:
-      if (record->event.pressed) {
-	SEND_STRING("Simspace1!");
-      }
-      return false;
-      break;
-    case M192:
-      if (record->event.pressed) {
-	SEND_STRING("192.168.");
-      }
-      return false;
-      break;
-    case M255:
-      if (record->event.pressed) {
-	SEND_STRING("255");
-      }
-      return false;
-      break;
-  }
-  return true;
-};
diff --git a/keyboards/keebio/chocopad/rev2/config.h b/keyboards/keebio/chocopad/rev2/config.h
index 366d639bf0b..8b36fb4f3a7 100644
--- a/keyboards/keebio/chocopad/rev2/config.h
+++ b/keyboards/keebio/chocopad/rev2/config.h
@@ -5,9 +5,3 @@
 
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
-
-// RGB Matrix
-#define RGB_MATRIX_LED_COUNT 20
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/chocopad/rev2/info.json b/keyboards/keebio/chocopad/rev2/info.json
index a615aac7ad2..7cc5ef518f9 100644
--- a/keyboards/keebio/chocopad/rev2/info.json
+++ b/keyboards/keebio/chocopad/rev2/info.json
@@ -88,6 +88,7 @@
             {"matrix": [3, 1], "flags": 4, "x": 75, "y": 64},
             {"flags": 2, "x": 37, "y": 64},
             {"matrix": [3, 0], "flags": 4, "x": 0, "y": 64}
-        ]
+        ],
+        "sleep": true
     }
 }
diff --git a/keyboards/keebio/convolution/rev1/config.h b/keyboards/keebio/convolution/rev1/config.h
index b46ba583d78..29191b60546 100644
--- a/keyboards/keebio/convolution/rev1/config.h
+++ b/keyboards/keebio/convolution/rev1/config.h
@@ -16,30 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// RGB Matrix
-#define RGB_MATRIX_LED_COUNT 16
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#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 VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/info.json
index 5255f00ab9c..5ff7c1f8f02 100644
--- a/keyboards/keebio/convolution/rev1/info.json
+++ b/keyboards/keebio/convolution/rev1/info.json
@@ -29,6 +29,29 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 12, "y": 13},
@@ -47,7 +70,8 @@
             {"flags": 2, "x": 75, "y": 51},
             {"flags": 2, "x": 43, "y": 51},
             {"flags": 2, "x": 12, "y": 51}
-        ]
+        ],
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_65xt": {
diff --git a/keyboards/keebio/dilly/keymaps/default/config.h b/keyboards/keebio/dilly/keymaps/default/config.h
deleted file mode 100644
index 6f70f09beec..00000000000
--- a/keyboards/keebio/dilly/keymaps/default/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/keebio/dsp40/keymaps/bakingpy/config.h b/keyboards/keebio/dsp40/keymaps/bakingpy/config.h
deleted file mode 100644
index 21bdbf97e3b..00000000000
--- a/keyboards/keebio/dsp40/keymaps/bakingpy/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-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_TERM 150
diff --git a/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c b/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c
deleted file mode 100644
index 29414c0976e..00000000000
--- a/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-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 {
-    _MAC,
-    _WINDOWS,
-    _TESTMODE,
-    _LOWER,
-    _RAISE,
-    _FKEYS,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  MAC = SAFE_RANGE,
-  WINDOWS,
-  TESTMODE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-#define KC_ KC_TRNS
-
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_ESCC MT(MOD_LCTL, KC_ESC)
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_GRVF LT(_FKEYS, KC_GRV)
-#define KC_ENTS MT(MOD_LSFT, KC_ENT)
-#define KC_BL_S BL_STEP
-#define KC_BL_T BL_TOGG
-#define KC_RMOD RGB_MOD
-
-#ifndef LAYOUT_kc_ortho_4x12
-#define LAYOUT_kc_ortho_4x12( \
-    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 \
-    ) \
-    LAYOUT_ortho_4x12( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-    )
-
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_MAC] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     ESCC, A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     GRVF,LCTL,LALT,LGUI,LOWR,SPC ,     BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_WINDOWS] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     ESCC, A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     GRVF,LALT,LGUI,LCTL,LOWR,SPC ,     BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_TESTMODE] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     RMOD,BL_S, S  , D  , F  , G  ,     RMOD,BL_S, K  , L  ,SCLN,QUOT,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     GRVF,LALT,LGUI,LCTL,LOWR,SPC ,     BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_LOWER] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-         , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     DEL ,CAPP,LEFT,RGHT, UP ,LBRC,     RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,CPYP,    ,    ,DOWN,LCBR,     RCBR, P1 , P2 , P3 ,MINS,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     BL_S,BL_T,    ,    ,    ,DEL ,     DEL ,    , P0 ,PDOT,    ,
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_RAISE] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-         ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,     EQL ,HOME,    ,    ,    ,BSLS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,     PLUS,END ,    ,    ,    ,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_FKEYS] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-     F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______,
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,          AG_SWAP, MAC,     WINDOWS, TESTMODE,_______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______
-  )
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case MAC:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_MAC);
-      }
-      return false;
-      break;
-    case WINDOWS:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WINDOWS);
-      }
-      return false;
-      break;
-    case TESTMODE:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_TESTMODE);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c b/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
deleted file mode 100644
index 024a9aad2e6..00000000000
--- a/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/* Copyright 2022 Forrest Cahoon <forrest.cahoon@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/>.
-*/
-
-
-// Milliseconds the backlight is off (or on) when blinking to show
-// caps lock is on. In other words, half the time of a full blink cycle.
-#define CAPS_LOCK_BLINK_MS 350
-
-#include QMK_KEYBOARD_H
-
-enum layer {
-    _QWERTY,
-    _PG, // for "programming"
-    _MS, // for "mouse"
-};
-
-enum custom_keycodes {
-    PG_ARRO = SAFE_RANGE,
-    PG_BANG,
-    PG_ENDC,
-    PG_EQEQ,
-    PG_EQL,
-    PG_LBRK,
-    PG_LPAR,
-    PG_MINS,
-    PG_NEEQ,
-    PG_RBRK,
-    PG_RPAR,
-    PG_SLAS,
-    PG_VBAR,
-    MS_BTN,
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    MS_BTN,  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,
-// ├────────┼───┬────┴────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    MO(_PG),     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,
-// ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
-    MO(_MS),     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,
-// ├────────┼───┴─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┴────┬────────┬───┘
-    TG(_PG), KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,      TG(_MS),
-// ├────────┼───┬──────────┬──┴──────┬─┴────────┼────────┼────────┼────────┤        ├────────┴─┬──────┴──────┬─┴────────┼────────┴─┬─────────┬─┴────────┤
-    TG(_MS),     KC_LGUI,   KC_LCTL,  KC_LALT,   MO(_PG), KC_SPC,  KC_SPC,           KC_SPC,    KC_SPC,       MO(_PG),   KC_RALT,   KC_RCTL,  KC_RGUI
-// └────────┴───┴──────────┴─────────┴──────────┴────────┴────────┴────────┘        └──────────┴─────────────┴──────────┴──────────┴─────────┴──────────┘
-  ),
-  [_PG] = LAYOUT(
-// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    KC_MUTE, QK_BOOT, _______, 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,
-// ├────────┼───┬────┴────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    _______,     _______,      _______, PG_SLAS, PG_LPAR, PG_RPAR, PG_NEEQ,          _______, KC_HOME, KC_UP,   KC_PGUP, KC_INS,  _______, _______, _______,
-// ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
-    _______,     _______,      PG_ENDC, PG_VBAR, PG_LBRK, PG_RBRK, PG_EQEQ,          _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_BSPC,
-// ├────────┼───┴─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┴────┬────────┬───┘
-    _______, _______,          _______, PG_MINS, PG_EQL,  PG_BANG, PG_ARRO,          _______, KC_END,  KC_DOWN, KC_PGDN, KC_DEL,  _______,      _______,
-// ├────────┼───┬──────────┬──┴──────┬─┴────────┼────────┼────────┼────────┤        ├────────┴─┬──────┴──────┬─┴────────┼────────┴─┬─────────┬─┴────────┤
-    _______,     _______,   _______,  _______,   _______, _______, _______,          _______,   _______,      _______,   _______,   _______,  _______
-// └────────┴───┴──────────┴─────────┴──────────┴────────┴────────┴────────┘        └──────────┴─────────────┴──────────┴──────────┴─────────┴──────────┘
-  ),
-  [_MS] = LAYOUT(
-// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
-// ├────────┼───┬────┴────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    _______,     _______,      _______, _______, _______, _______, _______,          _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______,
-// ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
-    _______,     _______,      _______, _______, _______, _______, _______,          _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN3, _______, _______,
-// ├────────┼───┴─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┴────┬────────┬───┘
-    _______, _______,          _______, _______, _______, _______, _______,          _______, _______, KC_MS_D, _______, _______, _______,      _______,
-// ├────────┼───┬──────────┬──┴──────┬─┴────────┼────────┼────────┼────────┤        ├────────┴─┬──────┴──────┬─┴────────┼────────┴─┬─────────┬─┴────────┤
-    _______,     _______,   _______,  _______,   _______, _______, _______,          _______,   _______,      _______,   _______,   _______,  _______
-// └────────┴───┴──────────┴─────────┴──────────┴────────┴────────┴────────┘        └──────────┴─────────────┴──────────┴──────────┴─────────┴──────────┘
-  ),
-};
-// clang-format on
-
-const key_override_t pg_lbrk_none  = ko_make_with_layers_and_negmods(0, PG_LBRK, KC_LEFT_CURLY_BRACE, ~0, ~0);
-const key_override_t pg_lbrk_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_LBRK, KC_LEFT_BRACKET, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t pg_lpar_none  = ko_make_with_layers_and_negmods(0, PG_LPAR, KC_LEFT_PAREN, ~0, ~0);
-const key_override_t pg_lpar_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_LPAR, KC_LEFT_ANGLE_BRACKET, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t pg_rbrk_none  = ko_make_with_layers_and_negmods(0, PG_RBRK, KC_RIGHT_CURLY_BRACE, ~0, ~0);
-const key_override_t pg_rbrk_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_RBRK, KC_RIGHT_BRACKET, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t pg_rpar_none  = ko_make_with_layers_and_negmods(0, PG_RPAR, KC_RIGHT_PAREN, ~0, ~0);
-const key_override_t pg_rpar_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_RPAR, KC_RIGHT_ANGLE_BRACKET, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t pg_slas_none  = ko_make_with_layers_and_negmods(0, PG_SLAS, KC_SLASH, ~0, ~0);
-const key_override_t pg_slas_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_SLAS, KC_BACKSLASH, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t ms_btn_none  = ko_make_with_layers_and_negmods(0, MS_BTN, KC_MS_BTN1, ~0, ~0);
-const key_override_t ms_btn_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, MS_BTN, KC_MS_BTN2, ~0, ~MOD_MASK_SHIFT);
-
-// clang-format off
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &pg_lbrk_none, &pg_lbrk_shift,
-    &pg_lpar_none, &pg_lpar_shift,
-    &pg_rbrk_none, &pg_rbrk_shift,
-    &pg_rpar_none, &pg_rpar_shift,
-    &pg_slas_none, &pg_slas_shift,
-    &ms_btn_none, &ms_btn_shift,
-    NULL};
-// clang-format on
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint8_t std_mods     = get_mods();
-    uint8_t oneshot_mods = get_oneshot_mods();
-    uint8_t all_mods     = std_mods | oneshot_mods;
-    bool    shift_on     = all_mods & MOD_MASK_SHIFT;
-    bool    ctrl_on      = all_mods & MOD_MASK_CTRL;
-
-    // None of our special keycodes use ALT or GUI mods (so far), so we
-    // check once here at the top and let other code handle it if any of
-    // these are set.
-    if (all_mods & (MOD_MASK_ALT | MOD_MASK_GUI)) return true;
-
-    switch (keycode) {
-        case KC_CAPS:
-            // On caps lock release, if caps lock just got turned off, ensure that
-            // backlight is enabled when it stops blinking.
-            if (!record->event.pressed) {
-                if (!host_keyboard_led_state().caps_lock) {
-                    backlight_enable();
-                    // In this case, we want to continue processing
-                    return true;
-                }
-            }
-            break;
-        case PG_ARRO:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (shift_on) {
-                    if (!ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("=>");
-                    if (!ctrl_on) SEND_STRING(" ");
-                } else {
-                    if (ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("->");
-                    if (ctrl_on) SEND_STRING(" ");
-                }
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_BANG:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (shift_on) {
-                    if (!ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("*");
-                    if (!ctrl_on) SEND_STRING(" ");
-                } else {
-                    if (ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("!");
-                    if (!ctrl_on) SEND_STRING(" ");
-                }
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_ENDC:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                SEND_STRING(SS_TAP(X_END));
-                if (!shift_on) SEND_STRING(";");
-                if (!ctrl_on) SEND_STRING(SS_TAP(X_ENTER));
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_EQEQ:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (!ctrl_on) SEND_STRING(" ");
-                shift_on ? SEND_STRING("==") : SEND_STRING("===");
-                if (!ctrl_on) SEND_STRING(" ");
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_EQL:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (!ctrl_on) SEND_STRING(" ");
-                shift_on ? SEND_STRING("+") : SEND_STRING("=");
-                if (!ctrl_on) SEND_STRING(" ");
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_MINS:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (shift_on) {
-                    if (ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("_");
-                    if (ctrl_on) SEND_STRING(" ");
-                } else {
-                    if (!ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("-");
-                    if (!ctrl_on) SEND_STRING(" ");
-                }
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_NEEQ:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (!ctrl_on) SEND_STRING(" ");
-                shift_on ? SEND_STRING("!=") : SEND_STRING("!==");
-                if (!ctrl_on) SEND_STRING(" ");
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_VBAR:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (!ctrl_on) SEND_STRING(" ");
-                shift_on ? SEND_STRING("&") : SEND_STRING("|");
-                if (!ctrl_on) SEND_STRING(" ");
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-    }
-    return true;
-}
-
-// I have only one encoder on my FoldKB and I want it to always be a scroll wheel.
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_MS_WH_DOWN);
-    } else {
-        tap_code(KC_MS_WH_UP);
-    }
-    return false;
-}
-
-static uint16_t caps_lock_blink_timer = 0;
-
-// This is called after every matrix scan. We make the backlight blink
-// when caps lock is on here. To ensure the backlight is in the on state
-// when caps lock is turned off, we also watch for the relase of the caps
-// lock key in process_record_user().
-void housekeeping_task_user(void) {
-    if (host_keyboard_led_state().caps_lock) {
-        if (timer_elapsed(caps_lock_blink_timer) >= CAPS_LOCK_BLINK_MS) {
-             backlight_toggle();
-            caps_lock_blink_timer = timer_read();
-        }
-    }
-}
-
-// The backlight level shows which layer we are in:
-// Mouse layer: dim | QWERTY layer: medium | Programming layer: bright
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _MS:
-            backlight_level(1);
-            break;
-        case _PG:
-            backlight_level(3);
-            break;
-        default:
-            backlight_level(2);
-            break;
-    }
-    return state;
-}
-
-void keyboard_post_init(void) {
-    backlight_level(2);
-}
diff --git a/keyboards/keebio/foldkb/keymaps/forrcaho/readme.md b/keyboards/keebio/foldkb/keymaps/forrcaho/readme.md
deleted file mode 100644
index 74ac4507b86..00000000000
--- a/keyboards/keebio/foldkb/keymaps/forrcaho/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Keebio FoldKB rev1
-
-My layout for the FoldKB has three layers:
-
-* A default standard QWERTY layer, 
-
-* a second "programming" layer with
-    * function keys for the corresponding numbers
-    * arrow and other navigation keys (such as home) on the right half, and
-    * various alternate keymappings and macros useful for programming on the
-    left half.
-
-* a third "mouse" layer with mouse keys on the right half. No special functions
-have been added to the left half for this layer (yet).
-
-This was written for a FoldKB with one encoder, and that is made to function as
-a mouse scroll wheel on all layers. Pressing it is a mouse left click and
-shift-pressing it is a mouse right click. (Presumably both encoders would do the
-same thing on a FoldKB with two.)
-
-The backgound lighting levels indicate the layer: dimmest for the default
-QWERTY layer, middle brightness for the mouse layer, and brightest for the
-programming layer.
diff --git a/keyboards/keebio/foldkb/keymaps/forrcaho/rules.mk b/keyboards/keebio/foldkb/keymaps/forrcaho/rules.mk
deleted file mode 100644
index 959e4286615..00000000000
--- a/keyboards/keebio/foldkb/keymaps/forrcaho/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-KEY_OVERRIDE_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/fourier/keymaps/maxim/config.h b/keyboards/keebio/fourier/keymaps/maxim/config.h
deleted file mode 100644
index 4f0ea3dc328..00000000000
--- a/keyboards/keebio/fourier/keymaps/maxim/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-
diff --git a/keyboards/keebio/fourier/keymaps/maxim/keymap.c b/keyboards/keebio/fourier/keymaps/maxim/keymap.c
deleted file mode 100644
index 23e65be4770..00000000000
--- a/keyboards/keebio/fourier/keymaps/maxim/keymap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _BASE 0
-#define _FN1 1
-#define _FN2 2
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-
-#define FN1 MO(_FN1)
-#define FN2 MO(_FN2)
-#define SPFN1 LT(_FN1, KC_SPACE)
-#define BSFN2 LT(_FN2, KC_BSPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    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_BSPC,
-    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    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,
-    XXXXXXX, KC_LCTL, KC_LALT, XXXXXXX, KC_SPC,           FN1,                       KC_RCTL, KC_RGUI, FN2,  XXXXXXX
-  ),
-
-  [_FN1] = LAYOUT(
-    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,
-    QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_SCLN,          _______,
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR,          KC_1,    KC_2,    KC_3,    KC_UP,   _______,
-    RGB_TOG, _______, _______, _______, _______,          KC_DEL,                    KC_0,    KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [_FN2] = LAYOUT(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS,
-    _______, _______, _______, KC_INS,  KC_PGUP, KC_HOME, _______, _______, _______, _______, KC_COLN,          _______,
-    _______, _______, _______, KC_DEL,  KC_PGDN, KC_END,  _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, KC_DEL,           _______,                   _______, _______, _______, _______
-  )
-
-};
diff --git a/keyboards/keebio/iris/keymaps/adamgate/config.h b/keyboards/keebio/iris/keymaps/adamgate/config.h
deleted file mode 100644
index 48653a123e0..00000000000
--- a/keyboards/keebio/iris/keymaps/adamgate/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2022 Adam Applegate
-
-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 USE_I2C
-#define EE_HANDS
-#define TAPPING_TOGGLE 3    //# of button presses needed to permanently toggle a layer
-// #define TAPPING_TERM 150     //# of ms before another input is accepted for tap dancing
-// #define RGBLIGHT_LAYERS 4   //# of layer of rgb (max of 8)ASDASDASDASDFASDF
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/adamgate/keymap.c b/keyboards/keebio/iris/keymaps/adamgate/keymap.c
deleted file mode 100644
index e67ceef0917..00000000000
--- a/keyboards/keebio/iris/keymaps/adamgate/keymap.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-  Copyright (c) 2022 Adam Applegate
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-  _QWERTY,
-  _LOWER,
-  _GAMING,
-  _RISE,
-}
-
-/*****************
-*** TAPDANCES ***
-*****************/
-enum custom_tapdances {
-   TD_SHFT_CAPS = 0,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_SHFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS), //shift if pressed 1x, caps lock if pressed 2x
-};
-
-/*****************
-***  KEYMAPS  ***
-*****************/
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-   // layout for everyday use
-  [_QWERTY] = LAYOUT(
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
-     TD(TD_SHFT_CAPS), KC_A,    KC_S,    KC_D,    KC_F,  KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,  KC_DEL,              KC_ENT, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
-                                        KC_RALT, KC_LGUI, KC_BSPC,         KC_SPC, TT(_LOWER), _______
-  ),
-
-  [_LOWER] = LAYOUT(
-     KC_GRAVE, KC_F1,  KC_F2,  KC_F3,  KC_F4,   KC_F5,                               KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PEQL,
-     KC_F11,  KC_F12,  KC_UP,  _______, _______, KC_LPRN,                            KC_RPRN,  KC_7,    KC_8,    KC_9,   KC_PSLS, KC_PAST,
-     KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LCBR,                           KC_RCBR,  KC_4,    KC_5,    KC_6,   KC_PMNS, KC_PPLS,
-     KC_LCTL, _______, _______, _______, _______, KC_LBRC, KC_DEL,            KC_ENT, KC_RBRC,  KC_1,    KC_2,    KC_3,   KC_PDOT, _______,
-                                       _______, TO(_QWERTY), KC_BSPC,         KC_SPC, TG(_GAMING), KC_0
-  ),
-
-  //makes gaming easier, adding a space for jumping closer to the movement keys
-  [_GAMING] = LAYOUT(
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
-     KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,  KC_DEL,             KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
-                                        KC_RALT, KC_SPC, KC_BSPC,           KC_SPC, TG(_RAISE), TO(_LOWER) 
-  ),
-
-  //used for editing rgb settings, sound, and misc commands
-  [_RAISE] = LAYOUT(
-     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            KC_MUTE, KC_VOLU, KC_MNXT, _______, KC_BRIU, KC_CALC,
-    _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                            KC_MSTP, KC_VOLD, KC_MPRV, _______, KC_BRID, KC_MYCM,
-     DM_REC1, DM_REC2, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, KC_WSCH,
-     DM_PLY1, DM_PLY2, _______, _______, _______, _______, _______,         _______, _______, _______,  _______, _______, _______, _______,
-                                       DM_RSTP, TO(_GAMING), _______,        _______, _______, _______
-  )
-};
diff --git a/keyboards/keebio/iris/keymaps/adamgate/rules.mk b/keyboards/keebio/iris/keymaps/adamgate/rules.mk
deleted file mode 100644
index 916d614967d..00000000000
--- a/keyboards/keebio/iris/keymaps/adamgate/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-TAP_DANCE_ENABLE = yes
-# COMBO_ENABLE = yes
-# RGBLIGHT_ENABLE = yes
-
-# Disable unnecessary things to save space
-# LTO_ENABLE = yes  #link time optimization
diff --git a/keyboards/keebio/iris/keymaps/antonlindstrom/config.h b/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
deleted file mode 100644
index b23869f060b..00000000000
--- a/keyboards/keebio/iris/keymaps/antonlindstrom/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2019 Anton Lindström <lindzr@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
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#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
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SLEEP // Turn off RGB light when host is asleep.
-#endif
-
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c b/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c
deleted file mode 100644
index 81426852a6a..00000000000
--- a/keyboards/keebio/iris/keymaps/antonlindstrom/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_swedish.h"
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-
-#define KC_ KC_TRNS
-
-#define RGB
-
-#define KC_LOWR MO(_LOWER)
-#define KC_RASE MO(_RAISE)
-#define KC_RST QK_BOOT
-
-#define KC_LBR SE_LBRC
-#define KC_RBR SE_RBRC
-
-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  ,KC_BSPC,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                     KC_Y   , KC_U  , KC_I  , KC_O  , KC_P  ,SE_ARNG,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                     KC_H   , KC_J  , KC_K  , KC_L  ,SE_ODIA,SE_ADIA,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_LBR ,     KC_RBR ,  KC_N , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_MINS,
-  //`-------+-------+-------+--+----+-------+-------+-------/    \-------+-------+-------+-------+-------+-------+-------'
-                                   KC_LGUI,KC_LOWR,KC_SPC ,         KC_ENT ,KC_RASE,KC_LALT
-  //                              `-------+-------+-------'        `-------+-------+-------'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     SE_TILD,KC_EXLM,SE_AT  ,KC_HASH,SE_DLR ,KC_PERC,                     SE_CIRC,SE_AMPR,SE_ASTR,SE_SLSH,SE_LPRN,SE_RPRN,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     SE_ACUT,RGB_TOG,RGB_MOD,RGB_M_B,RGB_M_K,_______,                     _______,_______,_______,_______,_______,SE_ASTR,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     _______,_______,SE_LABK,SE_RABK,SE_PIPE,SE_SLSH,                     SE_BSLS,SE_LCBR,SE_RCBR,SE_LBRC,SE_RBRC,SE_QUOT,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     _______,KC_NUBS,_______,_______,_______,_______,SE_LCBR,     SE_RCBR,_______,_______,_______,_______,_______,_______,
-  //`-------+-------+-------+--+----+-------+-------+-------/    \-------+-------+-------+-------+-------+-------+-------'
-                                   _______,_______,_______,         _______,_______,_______
-  //                              `-------+-------+-------'        `-------+-------+-------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     KC_F12 ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,                     KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     SE_GRV ,_______,_______,_______,_______,_______,                     _______,KC_PGUP,KC_UP  ,KC_PGDN,KC_PSCR,KC_PAUS,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     _______,_______,_______,_______,_______,_______,                     KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS ,KC_DEL ,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     _______,_______,_______,_______,_______,_______,KC_VOLU,     KC_VOLD,_______,_______,_______,_______,_______,_______,
-  //`-------+-------+-------+--+----+-------+-------+-------/    \-------+-------+-------+-------+-------+-------+-------'
-                                   _______,_______,_______,         _______,_______,_______
-  //                              `-------+-------+-------'        `-------+-------+-------'
-  )
-};
diff --git a/keyboards/keebio/iris/keymaps/antonlindstrom/readme.md b/keyboards/keebio/iris/keymaps/antonlindstrom/readme.md
deleted file mode 100644
index ac929068e5e..00000000000
--- a/keyboards/keebio/iris/keymaps/antonlindstrom/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Iris rev3
-
-Layout for Iris rev3 with a layer for programming and one for navigation. The
-keymap is based on a swedish one and contains the åäö characters and the
-swedish mappings.
diff --git a/keyboards/keebio/iris/keymaps/antonlindstrom/rules.mk b/keyboards/keebio/iris/keymaps/antonlindstrom/rules.mk
deleted file mode 100644
index d7463419b4f..00000000000
--- a/keyboards/keebio/iris/keymaps/antonlindstrom/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/ave-63/config.h b/keyboards/keebio/iris/keymaps/ave-63/config.h
deleted file mode 100644
index 07ae5ff50db..00000000000
--- a/keyboards/keebio/iris/keymaps/ave-63/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 PREVENT_STUCK_MODIFIERS
-#define TAPPING_TERM 150
-
-/* Select hand configuration */
-//#define MASTER_LEFT
-#define MASTER_RIGHT
-// #define EE_HANDS
-
-/*#undef RGBLED_NUMvbvbvbvbvbvbvtesting
-#define RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8*/
diff --git a/keyboards/keebio/iris/keymaps/ave-63/keymap.c b/keyboards/keebio/iris/keymaps/ave-63/keymap.c
deleted file mode 100644
index 81e2170372e..00000000000
--- a/keyboards/keebio/iris/keymaps/ave-63/keymap.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Features of this keymap:
-
---Lots of functionality on left hand for conjunction with mouse or pen in right hand
---_COMMAND layer ESDF arrow keys
---_MEH layer ESDF is super handy for switching tabs (SF) and apps (ED)
---_MEH layer other keys are linked with my AutoHotKey script
---macro for handling parentheses is very nice (credit: u/drashna)
-
-Some things are very non-standard, like position of number keys, etc.
-Will require heavy modification for most people.
-*/
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
-
-enum my_layers {
-  _QWERTY,
-  _SYMBOL,
-  _COMMAND,
-  _MEH
-};
-
-enum custom_keycodes {
-    KC_MPRN = SAFE_RANGE,
-    KC_MBRC,
-    KC_MCBR,
-    KC_MABK
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT(
-   KC_ESC,  KC_GRV,  KC_AT, KC_BSLS,   KC_NO, TG(_SYMBOL),                     KC_NO, KC_LGUI, KC_MBRC, KC_RBRC,   KC_NO,  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_BSPC,
-   KC_LCTL, KC_A,    KC_S,     KC_D,    KC_F,    KC_G,                          KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, MO(_SYMBOL),
-   KC_LALT, KC_Z,    KC_X,     KC_C,    KC_V,    KC_B, MO(_MEH),       KC_QUOT, KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-                                 KC_NO,  KC_LSFT, MO(_COMMAND),            KC_ENT,  KC_SPC, KC_NO
-),
-[_SYMBOL] = LAYOUT(
-   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-   KC_TRNS,  KC_EQL,    KC_9,    KC_8,    KC_7, KC_PLUS,                    KC_HASH, KC_UNDS, KC_MCBR, KC_RCBR, KC_TRNS, KC_TRNS, 
-   KC_TRNS,    KC_0,    KC_6,    KC_5,    KC_4, KC_MINS,                    KC_CIRC, KC_AMPR, KC_MPRN, KC_RPRN, KC_RBRC, KC_TRNS, 
-   KC_TRNS, KC_SLSH,    KC_3,    KC_2,    KC_1, KC_ASTR, KC_TRNS,  KC_TRNS, KC_EXLM, KC_DLR,  KC_MABK, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                 KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,  KC_TRNS,  KC_TRNS 
-),
-[_COMMAND] = LAYOUT(
-    KC_APP, KC_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_HOME,   KC_UP,  KC_END, KC_VOLU,                    KC_SCRL,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_TRNS, 
-   KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD,                    KC_CAPS,   KC_F5,   KC_F6,   KC_F7,   KC_F8, KC_TRNS, 
-   KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_MUTE, KC_TRNS,  KC_TRNS, KC_PAUS,   KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_TRNS, 
-                                 KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,  KC_TRNS,  KC_TRNS 
-),
-[_MEH] = LAYOUT(
-   LALT(KC_F4), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
-   KC_TRNS, MEH(KC_Q), LCTL(KC_W), LSFT(KC_TAB), KC_DEL, MEH(KC_T),          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-   KC_TRNS, MEH(KC_A),LSFT(LCTL(KC_TAB)),KC_TAB,LCTL(KC_TAB),MEH(KC_G),      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-   KC_TRNS,MEH(KC_Z),MEH(KC_X),MEH(KC_C),MEH(KC_V),MEH(KC_B),KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                                 KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,  KC_TRNS,  KC_TRNS 
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  static uint16_t code_timer;
-  switch (keycode) {
-  case KC_MCBR:                                  
-    if(record->event.pressed){
-      code_timer= timer_read();
-      SEND_STRING("{");
-    } else {
-      if (timer_elapsed(code_timer) > TAPPING_TERM) {
-        SEND_STRING("}" SS_TAP(X_LEFT));
-      } 
-    }
-    return false;
-    break;
-  case KC_MBRC:                                  
-    if(record->event.pressed){
-      code_timer= timer_read();
-      SEND_STRING("[");
-    } else {
-      if (timer_elapsed(code_timer) > TAPPING_TERM) {
-        SEND_STRING("]" SS_TAP(X_LEFT));
-      } 
-    }
-    return false;
-    break;
-  case KC_MPRN:                                  
-    if(record->event.pressed){
-      code_timer= timer_read();
-      SEND_STRING("(");
-    } else {
-      if (timer_elapsed(code_timer) > TAPPING_TERM) {
-        SEND_STRING(")" SS_TAP(X_LEFT));
-      } 
-    }
-    return false;
-    break;
-  case KC_MABK:                                  
-    if(record->event.pressed){
-      code_timer= timer_read();
-      if (get_mods() & MODS_SHIFT_MASK){
-        SEND_STRING("<");
-      } else {
-        SEND_STRING(",");
-      }
-    } else {
-      if (timer_elapsed(code_timer) > TAPPING_TERM) {
-        if (get_mods()  & MODS_SHIFT_MASK){
-          SEND_STRING(">" SS_TAP(X_LEFT));
-        }
-      } 
-    }
-    return false;
-    break;
-  }
-  return true;
-}
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/blucky/config.h b/keyboards/keebio/iris/keymaps/blucky/config.h
deleted file mode 100644
index 802e735a4e6..00000000000
--- a/keyboards/keebio/iris/keymaps/blucky/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2019 Brian Luckenbill
-
-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 AUDIO_PIN C6
-
-#undef  RGBLED_NUM
-#define RGBLED_NUM                  12
-#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
-
-
-#define MOUSEKEY_DELAY              300
-#define MOUSEKEY_INTERVAL           50
-#define MOUSEKEY_MAX_SPEED          10
-#define MOUSEKEY_TIME_TO_MAX        20
-#define MOUSEKEY_WHEEL_MAX_SPEED    8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX  40
diff --git a/keyboards/keebio/iris/keymaps/blucky/keymap.c b/keyboards/keebio/iris/keymaps/blucky/keymap.c
deleted file mode 100644
index 2736048b4b7..00000000000
--- a/keyboards/keebio/iris/keymaps/blucky/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QWERTY,
-    _LAYER1,
-    _LAYER2,
-    _LAYER3
-};
-
-#define WM_0     LGUI(KC_ENT)
-#define WM_1     LGUI(KC_BSPC)
-#define WM_2     LGUI(KC_DEL)
-#define WM_3     SGUI(KC_ENT)
-#define WM_4     SGUI(KC_BSPC)
-#define WM_5     SGUI(KC_DEL)
-#define WM_6     SGUI(KC_TAB)
-
-#define LAYER1   TT(_LAYER1)
-#define LAYER2   TT(_LAYER2)
-
-#define CS_U     C(S(KC_UP))
-#define CS_D     C(S(KC_DOWN))
-#define CS_SPC   C(S(KC_SPC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,   KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_TAB,   KC_Q,     KC_W,   KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   KC_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      LAYER1,   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_LGUI,         KC_RGUI,   KC_N,    KC_M,  KC_COMM,  KC_DOT, KC_SLSH,  LAYER2,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                     KC_LCTL, KC_LALT, KC_SPC,                    KC_ENT, KC_RGUI,  WM_0
-  //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-
-  [_LAYER1] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_CAPS,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_MINS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_SCRL,  KC_PSCR, KC_NO,   KC_NO,   KC_NO,    KC_NO,                             KC_PGUP, KC_PGDN, KC_HOME, KC_END,  KC_NO,   KC_DEL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_NO,    KC_NO, C(KC_LEFT), KC_NO, C(KC_RGHT), KC_NO,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_NO,   KC_INS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_RSFT,  KC_NO,    WM_5,    WM_4,    WM_3,    WM_2,   MU_TOGG,           AU_TOGG, KC_NO,  KC_NO,   KC_LBRC, KC_RBRC, KC_BSLS, KC_NO,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                      WM_1,  KC_LGUI,  KC_PIPE,                   KC_UNDS, KC_RCTL, KC_RALT
-  //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-
-  [_LAYER2] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      KC_ESC,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,                             KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_NO,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_NO,   KC_NO,   KC_NO,   CS_SPC,   CS_U,  S(KC_PGUP),                         RGB_VAI, RGB_HUI, RGB_SAI, RGB_M_SW,RGB_M_R,  KC_NO,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_NO,   KC_NO,   KC_NO,   KC_NO,    CS_D,  S(KC_PGDN),                         RGB_VAD, RGB_HUD, RGB_SAD,  KC_NO,   KC_NO,   KC_NO,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, KC_VOLD, KC_VOLU, KC_MUTE, KC_BRID, KC_BRIU,  MU_NEXT,          AU_OFF,  KC_RCTL, KC_LCTL, KC_RALT, KC_LALT, KC_DEL,  KC_NO,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                      WM_6,  VK_TOGG, RGB_MOD,                   RGB_TOG, BL_TOGG,  BL_STEP
-  //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-
-  [_LAYER3] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      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,   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,   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/keebio/iris/keymaps/blucky/rules.md b/keyboards/keebio/iris/keymaps/blucky/rules.md
deleted file mode 100644
index 5c1458faeea..00000000000
--- a/keyboards/keebio/iris/keymaps/blucky/rules.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# blucky's keymap for iris rev 2 w/ speaker, backlight and RGB and rev 3
-
-```shell
-make keebio/iris/rev2:blucky
-
-make keebio/iris/rev3:blucky
-```
diff --git a/keyboards/keebio/iris/keymaps/blucky/rules.mk b/keyboards/keebio/iris/keymaps/blucky/rules.mk
deleted file mode 100644
index 5fdc528057a..00000000000
--- a/keyboards/keebio/iris/keymaps/blucky/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-RGBLIGHT_ENABLE   = yes
-BACKLIGHT_ENABLE  = yes
-VELOCIKEY_ENABLE  = yes
-MOUSEKEY_ENABLE   = yes
-AUDIO_ENABLE      = no
diff --git a/keyboards/keebio/iris/keymaps/bmoorey/config.h b/keyboards/keebio/iris/keymaps/bmoorey/config.h
deleted file mode 100644
index 6871c27410a..00000000000
--- a/keyboards/keebio/iris/keymaps/bmoorey/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 MASTER_RIGHT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define NO_ACTION_TAPPING
-#define NO_ACTION_ONESHOT
diff --git a/keyboards/keebio/iris/keymaps/bmoorey/keymap.c b/keyboards/keebio/iris/keymaps/bmoorey/keymap.c
deleted file mode 100644
index 5f7b026022e..00000000000
--- a/keyboards/keebio/iris/keymaps/bmoorey/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-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,    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_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_SPC,           KC_SPC,  KC_N,    KC_M,    KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LCTL, LOWER,   KC_SPC,                    KC_SPC,  LOWER,   RAISE
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TILD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                            _______,   KC_P7,   KC_P8,   KC_P9, _______,  KC_DEL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     QK_BOOT, _______,   KC_UP, _______, _______, _______,                            _______,   KC_P4,   KC_P5,   KC_P6, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LBRC,                            KC_RBRC,   KC_P1,   KC_P2,   KC_P3, KC_PLUS, KC_PIPE,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, KC_LCBR, _______,          _______, KC_RCBR,   KC_P0,   KC_P0, _______, KC_MINS, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-									_______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_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_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, _______, _______, _______, KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, _______,          _______, KC_PLUS, KC_END,  _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
- 
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     RGB_TOG, RGB_RMOD, RGB_MOD, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, RGB_VAD, RGB_SAI, RGB_VAI,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/bmoorey/readme.md b/keyboards/keebio/iris/keymaps/bmoorey/readme.md
deleted file mode 100644
index 353f59449b0..00000000000
--- a/keyboards/keebio/iris/keymaps/bmoorey/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-This is (what I consider to be) an improvement over the default Iris keymap.
-It includes a QWERTY layer, a general system layer with arrows, volume control
-and a numpad on the right board; a second raised layer with function keys and
-more extensive media controls; and an adjust layer with controls for RGB
-underlighting.
diff --git a/keyboards/keebio/iris/keymaps/bmoorey/rules.mk b/keyboards/keebio/iris/keymaps/bmoorey/rules.mk
deleted file mode 100644
index c9465948e5b..00000000000
--- a/keyboards/keebio/iris/keymaps/bmoorey/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes 
-EXTRAKEY_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/boo/config.h b/keyboards/keebio/iris/keymaps/boo/config.h
deleted file mode 100644
index 101fd6e8ce4..00000000000
--- a/keyboards/keebio/iris/keymaps/boo/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 MASTER_LEFT
-
-#define TAPPING_TERM 200
diff --git a/keyboards/keebio/iris/keymaps/boo/keymap.c b/keyboards/keebio/iris/keymaps/boo/keymap.c
deleted file mode 100644
index e6325ae8763..00000000000
--- a/keyboards/keebio/iris/keymaps/boo/keymap.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _DVORAK,
-    _QWERTY,
-    _CODE,
-};
-
-// work in progress simulation of kakoune behavior
-bool kak_mode = false;
-
-enum tapdances {
-    _LCTLGUI,
-};
-
-enum keycodes {
-    KC_KAK = SAFE_RANGE,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [_LCTLGUI] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_LGUI),
-};
-
-// Layers
-#define DVORAK DF(_DVORAK)
-#define QWERTY DF(_QWERTY)
-#define CODE MO(_CODE)
-
-// Modifiers
-#define COPY LCTL(KC_C)
-#define PASTE LCTL(KC_V)
-
-// Tapdances
-#define LCTLGUI TD(_LCTLGUI)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_DVORAK] = LAYOUT(
-//  ┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_PSCR, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    QWERTY,
-//  ├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                               KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-//  ├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                               KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-//  ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LGUI, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_PGUP,          KC_PGDN, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-//  └────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    LCTLGUI, KC_LALT, KC_LSFT,                   KC_BSPC, KC_SPC,  CODE
-//                                 └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_QWERTY] = LAYOUT(
-//  ┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, DVORAK,
-//  ├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-//  ├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-//  ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______,          _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
-//  └────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-//                                 └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-
-  [_CODE] = LAYOUT(
-//  ┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-//  ├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LABK, KC_LCBR, KC_LBRC, KC_LPRN, KC_AMPR,                            KC_AT,   KC_MINS, KC_SLSH, KC_DLR,  KC_EXLM, KC_BSLS,
-//  ├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_GRAVE,KC_RABK, KC_RCBR, KC_RBRC, KC_RPRN, KC_PIPE,                            KC_CIRC, KC_PLUS, KC_ASTR, KC_PERC, KC_UP,   KC_EQL,
-//  ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     QK_BOOT, _______, _______, _______, _______, _______, KC_HOME,          KC_END,  KC_KAK,  COPY,    PASTE,   KC_LEFT, KC_DOWN, KC_RIGHT,
-//  └────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   KC_DEL,  _______, _______
-//                                 └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_KAK: {
-            if (record->event.pressed) {
-                kak_mode = !kak_mode;
-                return false;
-            }
-        } break;
-    }
-
-    if (kak_mode) {
-        switch (keycode) {
-            case KC_ESC: {
-                if (record->event.pressed) {
-                    kak_mode = false;
-                    return false;
-                }
-            } break;
-            case KC_I: {
-                if (record->event.pressed) {
-                    kak_mode = false;
-                    tap_code(KC_LEFT);
-                    return false;
-                }
-            } break;
-            case KC_A: {
-                if (record->event.pressed) {
-                    kak_mode = false;
-                    tap_code(KC_RIGHT);
-                    return false;
-                }
-            } break;
-            case KC_W: {
-                if (record->event.pressed) {
-                    uint8_t mods = get_mods();
-                    if ((mods & MOD_MASK_SHIFT) == 0)
-                        tap_code(KC_RIGHT);
-                    set_mods(MOD_MASK_CS);
-                    tap_code(KC_RIGHT);
-                    set_mods(mods);
-                    return false;
-                }
-            } break;
-            case KC_B: {
-                if (record->event.pressed) {
-                    uint8_t mods = get_mods();
-                    if ((mods & MOD_MASK_SHIFT) == 0)
-                        tap_code(KC_LEFT);
-                    set_mods(MOD_MASK_CS);
-                    tap_code(KC_LEFT);
-                    set_mods(mods);
-                    return false;
-                }
-            } break;
-            case KC_H: {
-                if (record->event.pressed) {
-                    if ((get_mods() & MOD_MASK_ALT) == 0)
-                        tap_code(KC_LEFT);
-                    else
-                        tap_code(KC_HOME);
-                    return false;
-                }
-            } break;
-            case KC_J: {
-                if (record->event.pressed) {
-                    tap_code(KC_DOWN);
-                    return false;
-                }
-            } break;
-            case KC_K: {
-                if (record->event.pressed) {
-                    tap_code(KC_UP);
-                    return false;
-                }
-            } break;
-            case KC_L: {
-                if (record->event.pressed) {
-                    if ((get_mods() & MOD_MASK_ALT) == 0)
-                        tap_code(KC_RIGHT);
-                    else
-                        tap_code(KC_END);
-                    return false;
-                }
-            } break;
-            case KC_X: {
-                if (record->event.pressed) {
-                    uint8_t mods = get_mods();
-                    tap_code(KC_HOME);
-                    set_mods(MOD_MASK_SHIFT);
-                    tap_code(KC_END);
-                    set_mods(mods);
-                    return false;
-                }
-            } break;
-            case KC_Y: {
-                if (record->event.pressed) {
-                    tap_code16(KC_COPY);
-                    return false;
-                }
-            } break;
-            case KC_D: {
-                if (record->event.pressed) {
-                    tap_code16(KC_COPY);
-                    tap_code(KC_BSPC);
-                    return false;
-                }
-            } break;
-            case KC_C: {
-                if (record->event.pressed) {
-                    tap_code(KC_BSPC);
-                    kak_mode = false;
-                    return false;
-                }
-            } break;
-            case KC_P: {
-                if (record->event.pressed) {
-                    if ((get_mods() & MOD_MASK_SHIFT) == 0)
-                        tap_code(KC_RIGHT);
-                    else
-                        tap_code(KC_LEFT);
-                    tap_code16(KC_PSTE);
-                    return false;
-                }
-            } break;
-            case KC_R: {
-                if (record->event.pressed) {
-                    tap_code16(KC_PSTE);
-                    return false;
-                }
-            } break;
-            case KC_U: {
-                if (record->event.pressed) {
-                    if ((get_mods() & MOD_MASK_SHIFT) == 0)
-                        tap_code16(LCTL(KC_Z));
-                    else
-                        tap_code16(LCTL(KC_Y));
-                    return false;
-                }
-            } break;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/boo/rules.mk b/keyboards/keebio/iris/keymaps/boo/rules.mk
deleted file mode 100644
index 1cd3a2ea251..00000000000
--- a/keyboards/keebio/iris/keymaps/boo/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/compilation-error/config.h b/keyboards/keebio/iris/keymaps/compilation-error/config.h
deleted file mode 100644
index 149a54be7fa..00000000000
--- a/keyboards/keebio/iris/keymaps/compilation-error/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-#define EE_HANDS
diff --git a/keyboards/keebio/iris/keymaps/compilation-error/keymap.c b/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
deleted file mode 100644
index 1143430009c..00000000000
--- a/keyboards/keebio/iris/keymaps/compilation-error/keymap.c
+++ /dev/null
@@ -1,149 +0,0 @@
- /* Copyright 2021 Romeet Chhabra 
-  * 
-  * 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 custom_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     LALT_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_MUTE,           KC_PSCR,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI, LOWER,   KC_SPC,                    KC_ENT,  RAISE,   KC_LCTL
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     RGB_TOG, _______, KC_BTN3,   _______, KC_LBRC,  KC_RBRC,                            KC_EQL, KC_P7, KC_P8, KC_P9, KC_PSLS, KC_DEL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_BTN4, KC_BTN1, KC_MS_U, KC_BTN2, KC_LCBR, KC_RCBR,                            KC_PLUS,  KC_P4,   KC_P5,   KC_P6,  KC_PAST,  _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_BTN5,  KC_MS_L, KC_MS_D, KC_MS_R, KC_LT,   KC_GT,                            KC_MINS, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, KC_UNDS, KC_P0,   KC_PDOT,   KC_PENT,   KC_PPLS, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                    _______,  MO(_ADJUST), _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______,   _______, _______,  _______,                            KC_LBRC, KC_LCBR, KC_LT, KC_GT, KC_RCBR, KC_RBRC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            KC_PGUP,  KC_MINS, KC_UNDS, KC_EQL, KC_PLUS, KC_PGDN,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_END,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, MO(_ADJUST), _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RGB_TOG, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, QK_BOOT,          EE_CLR,  KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_WH_D);
-        } else {
-            tap_code(KC_WH_U);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/compilation-error/rules.mk b/keyboards/keebio/iris/keymaps/compilation-error/rules.mk
deleted file mode 100644
index b0c1afe096e..00000000000
--- a/keyboards/keebio/iris/keymaps/compilation-error/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes        # Mouse keys
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/config.h b/keyboards/keebio/iris/keymaps/davidrambo/config.h
deleted file mode 100644
index 5ab7c3428a0..00000000000
--- a/keyboards/keebio/iris/keymaps/davidrambo/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 PERMISSIVE_HOLD
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-/*
-#undef RGBLED_NUM
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-*/
-#define TAPPING_TERM 200
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
deleted file mode 100644
index 42c6d6fcfe5..00000000000
--- a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-#include QMK_KEYBOARD_H
-
-//keycode shorthands
-#define MACNAV LT(4, KC_TAB)
-#define PCNAV  LT(5, KC_TAB)
-
-//text editor shortcuts for NAV and NAVPC
-#define ALEFT   LALT(KC_LEFT)
-#define ARGHT   LALT(KC_RGHT)
-#define CLEFT   LCTL(KC_LEFT)
-#define CRGHT   LCTL(KC_RGHT)
-#define ABSPC LALT(KC_BSPC)
-#define CBSPC LCTL(KC_BSPC)
-
-//internet browser tab shortcuts and window swapping for Mac and Windows
-#define GSL  LGUI(S(KC_LEFT))
-#define GSR  LGUI(S(KC_RGHT))
-#define CTLPGDN LCTL(KC_PGDN)
-#define CTLPGUP LCTL(KC_PGUP)
-
-#define CMBS  GUI_T(KC_BSPC)
-#define CTBS  CTL_T(KC_BSPC)
-#define C_TAB LCTL(KC_TAB)
-#define G_TAB LGUI(KC_TAB)
-#define A_TAB LALT(KC_TAB)
-
-#define SFLK TD(SFT_LCK)     // alias for tapdance
-
-//layer shorthands
-#define _COLEMAK 0
-#define _PC 1
-#define _GAME 2
-#define _SYMBOL 3
-#define _NAVMAC 4
-#define _NAVPC 5
-
-enum custom_keycodes {
-    SFT_LCK, //tapdance declarations
-    COLEMAK = 0,
-    PC,
-    GAME,
-    SYMBOL,
-    NAV, //Navigation layer for Mac Colemak
-    NAVPC, //Navigation layer for PC Colemak
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[_COLEMAK] = LAYOUT(
-  //,------+------+------+------+------+------.                    ,------+------+------+------+------+------.
-     KC_ESC, KC_1 , KC_2 , KC_3 , KC_4, KC_5,                       KC_6  , KC_7 , KC_8 , KC_9 , KC_0  , KC_MINS,
-  //|------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     KC_GRV, KC_Q , KC_W , KC_F , KC_P, KC_G,                       KC_J  , KC_L , KC_U , KC_Y , KC_SCLN,KC_BSPC,
-  //|------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     MACNAV, 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 , TO(1),        KC_ENT, KC_K, KC_M , KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,
-  //`------+------+------+------+------+----+------/         \-----+------+------+------+------+------+------'
-                              KC_LCTL, KC_LALT, CMBS,         KC_SPC, MO(3), KC_RALT
-  //                          `------+------+------'           `------+------+------'
-  ),
-
-    [_PC] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,                 _______, _______, _______, _______, _______, _______,
-        
-    _______, _______, _______, _______, _______, _______,                 _______, _______, _______, _______, _______, _______,
-        
-    PCNAV  , _______, _______, _______, _______, _______,                 _______, _______, _______, _______, _______, _______,
-        
-    _______, _______, _______, _______, _______, _______, TO(2),    _______, _______, _______, _______, _______, _______, _______, 
-        
-                                    KC_LALT, KC_LGUI, CTBS,            _______, _______, _______
-    ),
-   
-    [_GAME] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,            _______, _______, _______, _______, _______, _______,
-       
-    KC_B   , KC_T   , KC_Q   , KC_W   , KC_E   , KC_R   ,                _______, _______, _______, _______, _______, _______,
-        
-    KC_TAB , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   ,                _______, _______, _______, _______, _______, _______,
-        
-    KC_LALT, KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_M,   KC_P , _______, _______, _______, _______, _______, _______, 
-        
-                                   KC_G, KC_I, KC_SPC,                KC_BSPC, TO(0), _______
-    ), 
-    
-    [_SYMBOL] = LAYOUT(
-    
-    KC_F12 , KC_F1  , KC_F2 , KC_F3  , KC_F4  , KC_F5,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11,
-    
-    KC_LBRC, KC_1   , KC_2  , KC_3   , KC_4   , KC_5,                       KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_RBRC,
-        
-    KC_BSLS, KC_EXLM, KC_AT , KC_HASH, KC_DLR , KC_PERC,                    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL,
-        
-    _______, KC_HOME, KC_END, KC_VOLD, KC_VOLU, KC_MPLY, _______,   _______, _______, KC_MINS, _______, _______, _______, _______, 
-        
-                           _______, _______, _______,                    _______, _______, _______
-    ),
-   
-    [_NAVMAC] = LAYOUT(
-    
-    QK_BOOT, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-        
-    _______, _______, _______, _______, _______, _______,                    C_TAB,   ALEFT  ,  KC_UP , ARGHT  , KC_DEL , _______,
-        
-    _______, _______, _______, _______, _______, _______,                    GSL ,    KC_LEFT, KC_DOWN, KC_RGHT, GSR    , _______,
-        
-    _______, _______, _______, _______, _______, _______, _______,  _______, G_TAB,   ABSPC  , _______, _______, _______, _______, 
-        
-                                   _______, _______, _______,         _______, _______, _______
-    ),
-    
-    [_NAVPC] = LAYOUT(
-    
-    QK_BOOT , _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-        
-    _______, _______, _______, _______, _______, _______,                   C_TAB  , CLEFT  , KC_UP  , CRGHT  , KC_DEL , _______,
-        
-    _______, _______, _______, _______, _______, _______,                   CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
-        
-    _______, _______, _______, _______, _______, _______,_______,  _______, A_TAB  , CBSPC, _______, _______, _______, _______, 
-        
-                              _______, _______, _______,                _______, _______, _______
-    ),
-   
-};
-
-// Shift vs. capslock function. From bbaserdem's Planck keymap (since deprecated).
-void caps_tap (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_code (KC_LSFT);
-    } else if (state->count == 2) {
-        unregister_code (KC_LSFT);
-        register_code (KC_CAPS);
-    }
-}
-void caps_tap_end (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code (KC_LSFT);
-    } else {
-        unregister_code (KC_CAPS);
-    }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    //Tap once for Shift, twice for Caps Lock
-    [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end)
-};
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/readme.md b/keyboards/keebio/iris/keymaps/davidrambo/readme.md
deleted file mode 100644
index 181ff97f364..00000000000
--- a/keyboards/keebio/iris/keymaps/davidrambo/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Iris
-
-This is a simple Colemak layout for Iris rev2.1 with Mac and Windows layers and a Gaming Layer. 
-The Symbol layer is based on my Planck layout. It provides numbers, symbols, and volume controls. 
-There are two Navigation layers, for the Mac and Windows Colemak layers respectively.
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/rules.mk b/keyboards/keebio/iris/keymaps/davidrambo/rules.mk
deleted file mode 100644
index 1e3473a1af6..00000000000
--- a/keyboards/keebio/iris/keymaps/davidrambo/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-TAP_DANCE_ENABLE = yes
-
diff --git a/keyboards/keebio/iris/keymaps/dcompact/config.h b/keyboards/keebio/iris/keymaps/dcompact/config.h
deleted file mode 100644
index 149a54be7fa..00000000000
--- a/keyboards/keebio/iris/keymaps/dcompact/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-#define EE_HANDS
diff --git a/keyboards/keebio/iris/keymaps/dcompact/keymap.c b/keyboards/keebio/iris/keymaps/dcompact/keymap.c
deleted file mode 100644
index 447aff6f9a2..00000000000
--- a/keyboards/keebio/iris/keymaps/dcompact/keymap.c
+++ /dev/null
@@ -1,245 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Custom Keycodes and Combinations Used
-#define DEL_SHF SFT_T(KC_DEL)
-#define QUAKE LCTL(KC_GRV)
-
-#define WKSP_L LALT(LCTL(KC_LEFT))
-#define WKSP_D LALT(LCTL(KC_DOWN))
-#define WKSP_U LALT(LCTL(KC_UP))
-#define WKSP_R LALT(LCTL(KC_RGHT))
-
-#define AM_CYC A(S(KC_SPC))
-#define AM_SHR A(S(KC_COMM))
-#define AM_GRW A(S(KC_DOT))
-#define AM_REL A(S(KC_Z))
-#define AM_LFT A(S(KC_H))
-#define AM_RGH A(S(KC_L))
-#define AM_CW A(S(KC_K))
-#define AM_CCW A(S(KC_J))
-#define AM_TLL A(S(KC_1))
-#define AM_TLW A(S(KC_2))
-#define AM_BSP A(S(KC_3))
-#define AM_FUL A(S(KC_4))
-
-enum custom_layers {
-  _BASE,
-  _LOWER,
-  _RAISE,
-  _FUNC,
-  _GAME,
-  _LNUM,
-  _LFUN,
-  _ADJUST
-};
-
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  FUNC,
-  GAME,
-  EXT_GM,
-  LNUM,
-  LFUN,
-  ADJUST
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                               KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                               KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     DEL_SHF, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,                               KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, GAME,    KC_LGUI, KC_LALT, LOWER,   KC_LSFT, _______,          _______, KC_SPC,  RAISE,   KC_RALT, KC_RGUI, FUNC,    KC_ENT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LALT, LOWER,   KC_LSFT,                   KC_SPC,  RAISE,   KC_RALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX, AM_CYC,  AM_SHR,  AM_GRW,  AM_REL,  XXXXXXX,                            XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, AM_LFT,  AM_CCW,  AM_CW,   AM_RGH,  XXXXXXX,                            XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, AM_TLL,  AM_TLW,  AM_BSP,  AM_FUL,  XXXXXXX,                            XXXXXXX, WKSP_L,  WKSP_D,  WKSP_U,  WKSP_R,  XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX,          XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   XXXXXXX, _______, XXXXXXX
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     QUAKE,   KC_GRV,  KC_TILD, KC_BSLS, KC_PIPE, KC_LPRN,                            KC_RPRN, KC_7,    KC_8,    KC_9,    KC_SLSH, KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_LCBR,                            KC_RCBR, KC_4,    KC_5,    KC_6,    KC_ASTR, KC_PLUS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC,                            KC_RBRC, KC_1,    KC_2,    KC_3,    KC_MINS, KC_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, XXXXXXX, _______, _______, _______, KC_LABK, XXXXXXX,          XXXXXXX, KC_RABK, _______, KC_0,    KC_DOT,  KC_COMM, XXXXXXX,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, KC_LABK,                   KC_RABK, _______, KC_0
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_FUNC] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX, KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX,                            XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, KC_WAKE, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                            XXXXXXX, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, KC_PWR,  KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX,                            XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_GAME] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_H,    KC_Z,                               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, KC_A,    KC_S,    KC_D,    KC_U,    KC_X,                               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, KC_F,    KC_G,    KC_R,    KC_M,    KC_C,                               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ESC,  KC_TILD, KC_LALT, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EXT_GM,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_SPC,  LNUM,    LFUN,                      XXXXXXX, XXXXXXX, XXXXXXX
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LNUM] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, KC_1,    KC_2,    KC_3,    KC_4,    XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_5,    KC_6,    KC_7,    KC_8,    XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_9,    KC_0,    KC_COMM, KC_DOT,  XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LFUN] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, QK_BOOT, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, KC_DEL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, BL_STEP,                            RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, BL_BRTG,                            RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case FUNC:
-      if (record->event.pressed) {
-        layer_on(_FUNC);
-      } else {
-        layer_off(_FUNC);
-      }
-      return false;
-    case GAME:
-       if (!record->event.pressed) {
-         #ifdef AUDIO_ENABLE
-           stop_all_notes();
-           PLAY_SONG(plover_song);
-         #endif
-         rgblight_mode(RGBLIGHT_MODE_SNAKE);
-         layer_on(_GAME);
-       }
-       return false;
-     case EXT_GM:
-       if (record->event.pressed) {
-         #ifdef AUDIO_ENABLE
-           PLAY_SONG(plover_gb_song);
-         #endif
-         rgblight_mode(RGBLIGHT_MODE_RAINBOW_MOOD);
-         layer_off(_GAME);
-       }
-       return false;
-     case LNUM:
-       if (record->event.pressed) {
-         layer_on(_LNUM);
-       } else {
-         layer_off(_LNUM);
-       }
-       return false;
-     case LFUN:
-       if (record->event.pressed) {
-         layer_on(_LFUN);
-       } else {
-         layer_off(_LFUN);
-       }
-       return false;
-  }
-  return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/dcompact/readme.md b/keyboards/keebio/iris/keymaps/dcompact/readme.md
deleted file mode 100644
index f3f3d8ca6ea..00000000000
--- a/keyboards/keebio/iris/keymaps/dcompact/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# DCompact Layout
-
-**Dvorak, Layered, Mouse-Enabled, Compact -- now with Game Mode~**
-
-_See [the layout source](keymap.c) for the actual layout_
-
-## Goals
-
-The following are the goals kept in mind when designing the DCompact
-layout:
-
-- Provide minimal travel distance when typing English or coding
-- Consistent muscle memory translation from standard QWERTY
-- Stateless typing experience
-- OS-agnostic features, macros, and key placement
-- Minimize dependence on mouse usage
-
-These are generally all met or balanced within reason. This layout is
-not intended at all to be a familiar layout for much of anyone (except
-maybe those who already type in Dvorak) -- this is meant to amplify the
-best parts of having limited, ortholinear keys with layering.
-
-## As Reference Material
-
-If you're reading this hoping to find reference material to implement
-your own layout, then please feel free to copy over this layout and
-make edits where you see fit. I removed a lot of the features I felt
-extraneous to my usage and simplified style where I felt needed. This
-would hopefully mean that my code should feel like a good base to
-develop from for those new to QMK.
-
-_Remember that settings defined in the layout directory override and
-merge with those in the keyboard folder_
-
-## Relevant Links
-
-- [Online Dvorak Layout Trainer](https://learn.dvorak.nl/)
-- [Dvorak Wikipedia Page](https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard)
-- [QMK Docs](https://docs.qmk.fm/#/)
-- [QMK KeyCode Reference](https://docs.qmk.fm/#/keycodes)
-
-## Contact
-
-Maintainer: [Dan](https://github.com/loksonarius)
-
diff --git a/keyboards/keebio/iris/keymaps/ddone/config.h b/keyboards/keebio/iris/keymaps/ddone/config.h
deleted file mode 100644
index 0ad1f5f73fa..00000000000
--- a/keyboards/keebio/iris/keymaps/ddone/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Mykyta Poturai <ddone@aruko.org>
-
-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 USE_I2C
-#define EE_HANDS
-#define PERMISSIVE_HOLD_PER_KEY
diff --git a/keyboards/keebio/iris/keymaps/ddone/keymap.c b/keyboards/keebio/iris/keymaps/ddone/keymap.c
deleted file mode 100644
index f787a739ed1..00000000000
--- a/keyboards/keebio/iris/keymaps/ddone/keymap.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Copyright 2021 Mykyta Poturai <ddone@aruko.org>
-  *
-  * 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 custom_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-#define SPCFN1 LT(_LOWER, KC_SPC)
-#define SFTESC LSFT_T(KC_ESC)
-
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  ADJUST,
-};
-
-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,    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_DEL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     SFTESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, SC_SENT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    SPCFN1,           KC_DEL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    LOWER   , KC_LWIN,SPCFN1,                    RAISE,  RAISE,   KC_RALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PGUP,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,   KC_1,    KC_2,    KC_3,    KC_4,    KC_LT,                             KC_GT,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PIPE,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  _______, _______, _______,_______, KC_LBRC,                            KC_RBRC, KC_4,    KC_5,     KC_6,   KC_PLUS, KC_MINS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, KC_LPRN, LOWER,          _______, KC_RPRN,   KC_1,    KC_2,   KC_3,     KC_PAST, KC_PSLS,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, LOWER,                    _______,  _______, KC_0
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, KC_BSLS, KC_EQUAL,KC_QUOTE,KC_UNDS,                            KC_LEFT,  KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, KC_MINS, LOWER,          _______, KC_PLUS, _______,  _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, LOWER,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, QK_BOOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, RGB_VAD, RGB_VAI ,_______ ,                            KC_PSCR, KC_BTN1, KC_BTN2, KC_BTN3, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, RGB_RMOD,RGB_MOD, RGB_TOG ,                           KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, RGB_HUD, RGB_HUI, _______, LOWER,            _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, LOWER,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-	case SFTESC:
-	    return true;
-	default:
-	    return false;
-    }
-}
-
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-
-	switch (get_highest_layer(layer_state)) {
-	    case _LOWER:
-		if (clockwise) {
-		    tap_code(KC_WH_D);
-		} else {
-		    tap_code(KC_WH_U);
-		}
-		break;
-	    default:
-		if (clockwise) {
-		    tap_code(KC_PGDN);
-		} else {
-		    tap_code(KC_PGUP);
-		}
-	}
-    return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/ddone/readme.md b/keyboards/keebio/iris/keymaps/ddone/readme.md
deleted file mode 100644
index 837e79becd6..00000000000
--- a/keyboards/keebio/iris/keymaps/ddone/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-![Ddone's Iris](https://i.imgur.com/0wQ3o53.jpg)
-
-# Dddone's Iris keymap
-
-## Keymap
-
-![Layers 0 and 1](https://i.imgur.com/Mff2AIV.png)
-![Layers 2 and 3](https://i.imgur.com/h2vfPIp.png)
diff --git a/keyboards/keebio/iris/keymaps/ddone/rules.mk b/keyboards/keebio/iris/keymaps/ddone/rules.mk
deleted file mode 100644
index 41c4983e490..00000000000
--- a/keyboards/keebio/iris/keymaps/ddone/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-LTO_ENABLE = yes
-COMMAND_ENABLE = no
-MOUSEKEY_ENABLE = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/keebio/iris/keymaps/dvorak/config.h b/keyboards/keebio/iris/keymaps/dvorak/config.h
index 1fe07656475..0776d7e1798 100644
--- a/keyboards/keebio/iris/keymaps/dvorak/config.h
+++ b/keyboards/keebio/iris/keymaps/dvorak/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MASTER_LEFT
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
+#define RGBLIGHT_LED_COUNT 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/emp/config.h b/keyboards/keebio/iris/keymaps/emp/config.h
deleted file mode 100644
index 0aa25a88bc6..00000000000
--- a/keyboards/keebio/iris/keymaps/emp/config.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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
-
-#undef USE_I2C
-
-/* Select hand configuration */
-#undef MASTER_LEFT
-#undef MASTER_RIGHT
-#define EE_HANDS
-
-/* disable debugging features */
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif // #ifndef NO_DEBUG
-
-/* disable printing features */
-#ifndef NO_PRINT
-#define NO_PRINT
-#endif // #ifndef NO_PRINT
-
-/* force n-key rollover to be enabled every boot */
-#undef FORCE_NKRO
-
-/* disable tap dance and other tapping features */
-#undef NO_ACTION_TAPPING
-
-/* disable one-shot modifiers */
-#undef NO_ACTION_ONESHOT
-
-/* PERMISSIVE_HOLD
- * when on: tap-hold keys are held when typed fast, so long as the modifier key
- *          is pressed before and released after the rodified key(s)
- * when off: tap-hold keys are both tapped when typed fast (within tapping term)
- */
-#undef PERMISSIVE_HOLD
-
-/* TAPPING_TERM x (ms)
- * how long before a tap becomes a hold. if set above 500, a key tapped during
- * the tapping term will turn it into a hold too
- */
-#define TAPPING_TERM 200
-
-/* TAPPING_TOGGLE x (count)
- * If you hold a TT key down, layer is activated, and then is de-activated when
- * you let go (like MO()). If you repeatedly tap it, the layer will be toggled
- * on or off (like TG()). It needs 5 taps by default, but you can change this by
- * defining TAPPING_TOGGLE to another number.
- */
-// #define TAPPING_TOGGLE 1
-
-/* RETRO_TAPPING
- * tap anyway, even after TAPPING_TERM, if there was no other key interruption
- * between press and release
- */
-#undef RETRO_TAPPING
-
-/* ONESHOT_TIMEOUT x (ms)
- * how long before oneshot times out
- */
-// #define ONESHOT_TIMEOUT 2000
-
-/* TAP_CODE_DELAY x (ms)
- * how long tapped keycodes are held down for
- */
-// #define TAP_CODE_DELAY 100
-
-/* NO_USB_STARTUP_CHECK
- * according to:
- * https://github.com/qmk/qmk_firmware/issues/12732
- * defining this can help with boards not being recognized by virtual keymapping
- * software
- */
-#define NO_USB_STARTUP_CHECK
diff --git a/keyboards/keebio/iris/keymaps/emp/keymap.c b/keyboards/keebio/iris/keymaps/emp/keymap.c
deleted file mode 100644
index d89477ed96c..00000000000
--- a/keyboards/keebio/iris/keymaps/emp/keymap.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* Copyright 2022 elliotpatros
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include QMK_KEYBOARD_H
-
-// Layer definitions
-enum custom_layers {
-    _COLEMAK,
-    _FUNCTION,
-};
-
-// Custom keycodes, implemented later, in function: process_record_user()
-enum custom_keycodes {
-    CTL_ESC = SAFE_RANGE,   // mod tap: left control / esc
-    SFT_ENT,                // mod tap: left shift / enter
-    LST_PRN,                // mod tap: left shift / left parenthesis
-    RST_PRN,                // mod tap: right shift / right parenthesis
-};
-
-// Shorthand keycode definitions
-#define OSM_CAG OSM(MOD_LCTL | MOD_LALT | MOD_LGUI)
-#define LT_BSFN LT(_FUNCTION, KC_BSLS)
-
-// The layout
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
-    // Default layer
-    [_COLEMAK] = LAYOUT (
-
-// ┌────────┬────────┬────────┬────────┬────────┬────────┐                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                       KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_EQL,
-// ├────────┼────────┼────────┼────────┼────────┼────────┤                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-    CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                       KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    LST_PRN, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_SPC,   KC_ENT,  KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RST_PRN,
-// └────────┴────────┴────────┴────────┼────────┼────────┼────────┘└────────┼────────┴────────┴────────┴────────┴────────┴────────┘
-                                        KC_LALT, KC_LGUI, SFT_ENT,  KC_SPC,  LT_BSFN, KC_BSPC
-//                                     └────────┴────────┴────────┘└────────┴────────┴────────┘
-    ),
-
-    // Function (and I guess also media & navigation) layer
-    [_FUNCTION] = LAYOUT (
-
-// ┌────────┬────────┬────────┬────────┬────────┬────────┐                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-// ├────────┼────────┼────────┼────────┼────────┼────────┤                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, KC_GRV,  KC_LPRN, KC_RPRN, KC_F11,  KC_F12,                     KC_INS,  KC_HOME, KC_UP,   KC_PGUP, _______, _______,
-// ├────────┼────────┼────────┼────────┼────────┼────────┤                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, OSM_CAG,                    KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, _______,
-// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┐┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, KC_MUTE, _______,  _______, KC_VOLD, KC_DEL,  KC_END,  KC_PGDN, _______, _______,
-// └────────┴────────┴────────┴────────┼────────┼────────┼────────┘└────────┼────────┴────────┴────────┴────────┴────────┴────────┘
-                                        _______, _______, _______,  _______, _______, _______
-//                                     └────────┴────────┴────────┘└────────┴────────┴────────┘
-    )
-
-};
-
-static inline bool dualfunckey_was_tapped(const uint16_t time_when_pressed) {
-    return timer_elapsed(time_when_pressed) < TAPPING_TERM;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    
-    // Static variables
-    static uint16_t timer_control_escape = 0;
-    static uint16_t timer_shift_enter = 0;
-    static uint16_t timer_shift_lparen = 0;
-    static uint16_t timer_shift_rparen = 0;
-
-    static bool dualfunckey_pending = false;
-
-    static bool shift_enter_is_pressed = false;
-    static bool shift_lparen_is_pressed = false;
-
-    // Was this function called to handle a keydown? If not, it was called by a 
-    // key up.
-    const bool pressed = record->event.pressed;
-
-    // Any keydown (at all) spends a pending dual function key check. Why? If,
-    // for example, you use shift to type a capital letter, and shift keys down
-    // and up faster than the tapping term, did you mean to call shift's tapping
-    // key? No. You just meant to call shift.
-    if (pressed) {
-        dualfunckey_pending = false;
-    }
-
-    // Only keycodes >= SAFE_RANGE are handled in this function
-    if (keycode < SAFE_RANGE) {
-        // This keypress was not handled
-        return true;
-    }
-
-    // Handle custom keypresses here
-    switch (keycode) {
-
-    // -------------------------------------------------------------------------
-    // Dual function key (hold: left shift; tap: enter)
-    // -------------------------------------------------------------------------
-    case SFT_ENT:
-            
-        // There are multiple keys that are mapped to left shift. Keep track of
-        // which are pressed
-        shift_enter_is_pressed = pressed;
-
-        // Handle keypress routine
-        if (pressed) {
-            
-            // The [left shift/enter] key was pressed
-            register_code(KC_LSFT);
-
-            // Save keydown time for checking hold/tap on keyup
-            timer_shift_enter = timer_read();
-
-            // Pressing a dual function key requires a hold/tap check on key up
-            dualfunckey_pending = true;
-            
-        } else {
-            
-            // The [left shift/enter] key was unpressed
-            // Note: unregister shift before pressing ENT so that ENT registers
-            // correctly
-
-            // If no other left shift keys are currently pressed, unregister it
-            if (! shift_lparen_is_pressed) {
-                unregister_code(KC_LSFT);
-            }
-
-            // If a pending dual function key hasn't been used yet, use it here
-            if (dualfunckey_pending && dualfunckey_was_tapped(timer_shift_enter)) {
-                tap_code(KC_ENT);
-                dualfunckey_pending = false;
-            }
-        }
-
-        // This keypress was handled
-        return false;
-
-    // -------------------------------------------------------------------------
-    // Dual function key (hold: left control; tap: escape)
-    // -------------------------------------------------------------------------
-    case CTL_ESC:
-
-        // Handle keypress routine
-        if (pressed) {
-            
-            // Control/escape key was pressed
-            register_code(KC_LCTL);
-
-            // Save keydown time for checking hold/tap on keyup
-            timer_control_escape = timer_read();
-
-            // Pressing a dual function key requires a hold/tap check on key up
-            dualfunckey_pending = true;
-            
-        } else {
-            
-            // Control/escape key was unpressed
-            unregister_code(KC_LCTL);
-
-            // If a pending dual function key hasn't been used yet, use it here
-            if (dualfunckey_pending && dualfunckey_was_tapped(timer_control_escape)) {
-                tap_code(KC_ESC);
-                dualfunckey_pending = false;
-            }
-        }
-
-        // This keypress was handled
-        return false;
-
-    // -------------------------------------------------------------------------
-    // Dual function key (hold: left shift; tap: left parenthesis)
-    // -------------------------------------------------------------------------
-    case LST_PRN:
-
-        // There are multiple keys that are mapped to left shift. Keep track of
-        // which are pressed
-        shift_lparen_is_pressed = pressed;
-
-        // Handle keypress routine
-        if (pressed) {
-            
-            // The [left shift/left parenthesis] key was pressed
-            register_code(KC_LSFT);
-
-            // Save keydown time for checking hold/tap on keyup
-            timer_shift_lparen = timer_read();
-
-            // Pressing a dual function key requires a hold/tap check on key up
-            dualfunckey_pending = true;
-            
-        } else {
-            
-            // The [left shift/left parenthesis] key was unpressed
-            // Note: unregister shift after tapping 9 so that left parenthesis
-            // registers correctly
-
-            // If a pending dual function key hasn't been used yet, use it here
-            if (dualfunckey_pending && dualfunckey_was_tapped(timer_shift_lparen)) {
-                tap_code(KC_9);
-                dualfunckey_pending = false;
-            }
-
-            // If no other left shift keys are currently pressed, unregister it
-            if (! shift_enter_is_pressed) {
-                unregister_code(KC_LSFT);
-            }
-        }
-
-        // This keypress was handled
-        return false;
-
-    // -------------------------------------------------------------------------
-    // Dual function key (hold: right shift; tap: right parenthesis)
-    // -------------------------------------------------------------------------
-    case RST_PRN:
-
-        // Handle keypress routine
-        if (pressed) {
-            
-            // The [right shift/right parenthesis] key was pressed
-            register_code(KC_RSFT);
-
-            // Save keydown time for checking hold/tap on keyup
-            timer_shift_rparen = timer_read();
-
-            // Pressing a dual function key requires a hold/tap check on key up
-            dualfunckey_pending = true;
-            
-        } else {
-            
-            // The [right shift/right parenthesis] key was unpressed
-            // Note: unregister shift after tapping 0 so that right parenthesis
-            // registers correctly
-
-            // If a pending dual function key hasn't been used yet, use it here
-            if (dualfunckey_pending && dualfunckey_was_tapped(timer_shift_rparen)) {
-                
-                // Space cadet shift: If the [left shift/left parenthesis] key
-                // is currently pressed, then tap the sequence ()
-                if (shift_lparen_is_pressed) {
-                    tap_code(KC_9);
-                }
-
-                tap_code(KC_0);
-                dualfunckey_pending = false;
-            }
-
-            unregister_code(KC_RSFT);
-        }
-
-        // This keypress was handled
-        return false;
-
-    // -------------------------------------------------------------------------
-    // Some other key was pressed (this shouldn't happen)
-    // -------------------------------------------------------------------------
-    default:
-        // This keypress was not handled
-        return true;        
-    }
-}
diff --git a/keyboards/keebio/iris/keymaps/eosti/config.h b/keyboards/keebio/iris/keymaps/eosti/config.h
deleted file mode 100644
index b3dd92c7494..00000000000
--- a/keyboards/keebio/iris/keymaps/eosti/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 Reid Sox-Harris
-
-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 USE_I2C
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/eosti/keymap.c b/keyboards/keebio/iris/keymaps/eosti/keymap.c
deleted file mode 100644
index f6159211996..00000000000
--- a/keyboards/keebio/iris/keymaps/eosti/keymap.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Copyright 2020 Reid Sox-Harris
- *
- * 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 {
-    _QWERTY,
-    _GAME,
-    _UPPER,
-    _LOWER,
-    _UTILS
-};
-
-enum custom_keycodes {
-  TMUX_WN = SAFE_RANGE,
-  TMUX_WL
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case TMUX_WN:                       // Switches to next window in tmux
-      if (record->event.pressed) {
-        SEND_STRING(SS_LCTL("a") "n"); // Requires a leader of ctrl-a
-      }
-      break;
-
-    case TMUX_WL:                       // Switches to last window in tmux
-      if (record->event.pressed) {
-          SEND_STRING(SS_LCTL("a") "l");
-      }
-      break;
-
-  }
-  return true;
-};
-
-#define UPPER       MO(_UPPER)
-#define LOWER       MO(_LOWER)
-#define GAME        TG(_GAME)
-#define UTILS       MO(_UTILS)
-
-#define WM_R        LCTL(KC_RGHT)       // Moves the MacOS WM to the right
-#define WM_L        LCTL(KC_LEFT)       // ...and to the left
-#define WM_MC       LCTL(KC_UP)         // Enters MacOS Mission Control
-#define WEB_R       LGUI(KC_RCBR)       // Change tabs to the right on Firefox, Chrome
-#define WEB_L       LGUI(KC_LCBR)       // ...and to the left
-#define TMUX_U      RALT(KC_UP)         // tmux navigation, requires tmux.conf change
-#define TMUX_D      RALT(KC_DOWN)
-#define TMUX_R      RALT(KC_RGHT)
-#define TMUX_L      RALT(KC_LEFT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      KC_GRV ,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,   KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      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_ESC,   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_LCTL,          KC_NO,    KC_N,    KC_M,  KC_COMM,  KC_DOT, KC_SLSH, KC_BSPC,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                     KC_LGUI, UPPER,   KC_ENT,                    KC_SPC,  LOWER,   KC_RALT
-  //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-  [_GAME] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, KC_SPC,                     KC_ENT, _______, _______
-  //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-  [_UPPER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                           KC_CIRC , KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,   KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  WEB_L,   WEB_R,   WM_MC,    WM_L,    WM_R,                             KC_LEFT,  KC_DOWN, KC_UP,  KC_RGHT, KC_PGUP, KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  KC_NO,  KC_LABK, KC_LBRC, KC_LPRN, KC_LCBR, _______,          _______, KC_RCBR, KC_RPRN, KC_RBRC, KC_RABK, KC_PGDN,_______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______,  UPPER,  _______,                   _______,  UTILS,  _______
-  //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_CAPS,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                           KC_CIRC , KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, TMUX_WL,  TMUX_WN,  KC_NO,   KC_NO,   KC_NO,                             TMUX_L,  TMUX_D,  TMUX_U,  TMUX_R,  KC_NO,  KC_PIPE,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  KC_NO,  _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,  KC_NO,   KC_DEL,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______,  UTILS,  _______,                   _______,  LOWER,  _______
-  //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-  [_UTILS] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_CAPS,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_CAPS,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                            KC_NO,   KC_INS,  KC_HOME, KC_PGUP, KC_NO,   GAME,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_NO,  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,_______,          _______,  KC_SLEP, KC_DEL,  KC_END,  KC_PGDN, KC_NO,   KC_NO,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______,  KC_NO,  _______,                   _______, _______, _______
-  //                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/keebio/iris/keymaps/eosti/readme.md b/keyboards/keebio/iris/keymaps/eosti/readme.md
deleted file mode 100644
index f62c9cb5ff6..00000000000
--- a/keyboards/keebio/iris/keymaps/eosti/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# EosTi's Iris Layout
-
-## Features
-
-- QWERTY base layer with right thumb space and left thumb enter
-- Gaming layer to swap enter and space so that WASD and space can all be on the same hand
-- MacOS navigation keys for switching windows and entering Mission Control
-- Browser navigation keys for cycling tabs
-- HJKL arrow keys
-- tmux navigation keys for switching focus, panes
-- Plays nicely with my Planck layout for easy switching
-- Probably other stuff too?
diff --git a/keyboards/keebio/iris/keymaps/eosti/rules.mk b/keyboards/keebio/iris/keymaps/eosti/rules.mk
deleted file mode 100644
index d7463419b4f..00000000000
--- a/keyboards/keebio/iris/keymaps/eosti/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/fluffactually/config.h b/keyboards/keebio/iris/keymaps/fluffactually/config.h
deleted file mode 100644
index 44c4fbd1e5e..00000000000
--- a/keyboards/keebio/iris/keymaps/fluffactually/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-#define EE_HANDS
-#define TAPPING_TERM 175
-
diff --git a/keyboards/keebio/iris/keymaps/fluffactually/keymap.c b/keyboards/keebio/iris/keymaps/fluffactually/keymap.c
deleted file mode 100644
index b8c675c9688..00000000000
--- a/keyboards/keebio/iris/keymaps/fluffactually/keymap.c
+++ /dev/null
@@ -1,85 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     LCTL_T(KC_TAB), LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G,    KC_H,    RSFT_T(KC_J), RCTL_T(KC_K), LALT_T(KC_L), RGUI_T(KC_SCLN), KC_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_EQL,          TG(1),   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI, LT(2,KC_ESC),KC_ENT,                KC_SPC,  LT(3, KC_BSPC), KC_RALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-
-  [1] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_A,    KC_S,    KC_D,    KC_F,    _______,                            _______, KC_J,    KC_K,    KC_L,    KC_SCLN, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LALT, _______, _______,                   _______, _______, KC_LGUI
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [2] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TILD, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, KC_PSCR,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_LBRC,          KC_RBRC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [3] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV,  _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, KC_MINUS,KC_UNDS, KC_LBRC,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, KC_EQUAL,KC_PLUS, KC_RBRC, KC_LBRC,          KC_RBRC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [4] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, QK_BOOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  RGB_TOG,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_VOLU, KC_BRIU, KC_MNXT, KC_MPLY, _______, _______,                            _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_VOLD, KC_BRID, KC_MPRV, KC_MSTP, _______, _______, _______,          _______, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, 2, 3, 4);
-}
-
-void keyboard_post_init_user(void) {
-    rgblight_disable_noeeprom();
-}
-
diff --git a/keyboards/keebio/iris/keymaps/fluffactually/readme.md b/keyboards/keebio/iris/keymaps/fluffactually/readme.md
deleted file mode 100644
index 4759296c575..00000000000
--- a/keyboards/keebio/iris/keymaps/fluffactually/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Iris layout by fluffactually
-
-![fluffactually](https://i.imgur.com/vNoNeZ9.png)
-
-[KLE link](http://www.keyboard-layout-editor.com/#/gists/a6e67ca7177e7f5e4e44fbc1f09cdfae)
-
-Basically:
-
-* Home row mods: ASDF is Super, Alt, Ctrl, Shift, JKL; is Shift, Ctrl, ALt,
-  Super
-* Turn off home row mods with a layer toggle (e.g. for gaming)
-* Grave escape
-* Tap Lower for escape
-* Tap Raise for backspace
-* Movement keys on both Raise and Lower layers
-* Access Adjust layer by holding Raise and Lower
-
diff --git a/keyboards/keebio/iris/keymaps/fsck/config.h b/keyboards/keebio/iris/keymaps/fsck/config.h
deleted file mode 100644
index 1680f3d8f8a..00000000000
--- a/keyboards/keebio/iris/keymaps/fsck/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/fsck/keymap.c b/keyboards/keebio/iris/keymaps/fsck/keymap.c
deleted file mode 100644
index bdc707e7550..00000000000
--- a/keyboards/keebio/iris/keymaps/fsck/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-#define _QWERTY 0
-#define _RAISE 1
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    RAISE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_QWERTY] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                            ┌────────┬────────┬────────┬────────┬────────┬────────┐
-        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_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                                   KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                            ├────────┼────────┼────────┼────────┼────────┼────────┤
-        KC_DEL,   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_ENT,             KC_SPC,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                          KC_LCTL,  MO(_RAISE), KC_ENT,                    KC_SPC,   KC_LGUI,   KC_LALT
-                                  //     └────────┴────────┴────────┘                  └────────┴────────┴────────┘
-    ),
-    [_RAISE] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                            ┌────────┬────────┬────────┬────────┬────────┬────────┐
-        KC_F12,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                                  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                            ├────────┼────────┼────────┼────────┼────────┼────────┤
-        _______,  KC_HOME,  KC_UP,    KC_END,   KC_PGUP,  _______,                                _______,  KC_UNDS,  KC_PLUS,  _______,  _______,  _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                            ├────────┼────────┼────────┼────────┼────────┼────────┤
-        KC_ESC,   KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_PGDN,  KC_UNDS,                                _______, KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-        _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  _______,  _______,            _______,  _______,  KC_NUHS,  KC_NUBS,  KC_VOLD,  KC_VOLU,  _______,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                           _______,  _______,  _______,                     _______,  _______,  _______
-                                  //     └────────┴────────┴────────┘                  └────────┴────────┴────────┘
-    ),
-};
diff --git a/keyboards/keebio/iris/keymaps/fsck/readme.md b/keyboards/keebio/iris/keymaps/fsck/readme.md
deleted file mode 100644
index 88f3127658d..00000000000
--- a/keyboards/keebio/iris/keymaps/fsck/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-![iris:fsck Layout Image](https://i.imgur.com/C2XtWR5.png)
-
-# fsck's Iris Layout
diff --git a/keyboards/keebio/iris/keymaps/gsigler/config.h b/keyboards/keebio/iris/keymaps/gsigler/config.h
deleted file mode 100644
index f568452d0a2..00000000000
--- a/keyboards/keebio/iris/keymaps/gsigler/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2018 Grady Sigler <gradysigler@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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define AUTO_SHIFT_TIMEOUT 95
-#define ONESHOT_TAP_TOGGLE 5  /* Tapping this number of times holds the key until tapped this number of times again. */
-#define ONESHOT_TIMEOUT 5000  /* Time (in ms) before the one shot key is released */
diff --git a/keyboards/keebio/iris/keymaps/gsigler/keymap.c b/keyboards/keebio/iris/keymaps/gsigler/keymap.c
deleted file mode 100644
index bac940e39e3..00000000000
--- a/keyboards/keebio/iris/keymaps/gsigler/keymap.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum iris_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-  //|   `/~  |   1    |   2    |   3    |    4   |    5   |                          |    6   |   7    |   8    |   9    |   0    |   _/-  |
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-  //|  TAB   |   Q    |   W    |   E    |    R   |    T   |                          |    Y   |   U    |   I    |   O    |   P    |   +/=  |
-     KC_TAB,   KC_Q,     KC_W,     KC_E,   KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-  //| RAISE  |   A    |   S    |   D    |    F   |    G   |                          |    H   |   J    |   K    |   L    |   :/;  |   "/'  |
-      RAISE,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-  //| LOWER  |   Z    |   X    |   C    |    V   |    B   |   ESC  |        | ALT    |    N   |   M    |   </,  |  >/.   |  ?-/   |   |-\  |
-      LOWER,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_ESC,            KC_LALT,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH, KC_BSLS,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-  //                               |  CTRL  | COMMAND| BKSPACE|                 | SPACE  |  ENTER | SHIFT  |
-                                     KC_LCTL, KC_LGUI, KC_BSPC,                    KC_SPC,  KC_ENT,  KC_LSFT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-//KC_LALT  ALT
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-  //|  `/~   |   F1   |   F2   |   F3   |    F4  |   F5   |                          |   F6   |   F7   |   F8   |   F9   |   F10  |   F11  |
-     KC_TRNS,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,                              KC_F6,    KC_F7,   KC_F8,  KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-  //|  TAB   |    !   |    @   |   {    |   }    |    |   |                          |        |        |   ↑    |        |        |   F12  |
-     KC_TRNS, KC_EXLM,   KC_AT,  KC_LCBR, KC_RCBR, KC_PIPE,                           XXXXXXX, XXXXXXX,  KC_UP,  XXXXXXX, XXXXXXX, KC_F12,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-  //|  RAISE |    #   |    $   |   (    |   )    |    `   |                          |   ?    |    ←   |   ↓    |    →   |        |  VOLUP |
-      KC_TRNS,  KC_HASH, KC_DLR, KC_LPRN, KC_RPRN,  KC_GRV,                            KC_QUES, KC_LEFT,KC_DOWN, KC_RGHT, XXXXXXX,  KC_VOLU,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-  //|        |    %   |    ^   |   [    |   ]    |    ~   |  ESC            | ALT  |    &   |        |        |        |  MUTE  |  VOLDN |
-     XXXXXXX, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,  KC_TRNS,          KC_TRNS, KC_AMPR, XXXXXXX, XXXXXXX,XXXXXXX, KC_MUTE,KC_VOLD,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-  //                               |  CTRL  | COMMAND| BKSPACE|                 | SPACE  |  ENTER | SHIFT|
-                                    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,  KC_TRNS, KC_TRNS
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-  //|        |        |        |        |        |        |                          |        |   7    |    8   |    9   |    *   |    /   |
-     AS_UP,   AS_ON,   AS_RPT,   XXXXXXX, XXXXXXX, XXXXXXX,                           XXXXXXX,   KC_P7,   KC_P8,   KC_P9,  KC_PAST, KC_PSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-  //|        |        |        |        |        |        |                          |        |    4   |    5   |    6   |    +   |    -    |
-     AS_DOWN, AS_OFF,   XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,                            XXXXXXX,  KC_P4,   KC_P5,   KC_P6,  KC_PPLS, KC_PMNS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-  //|        |        |        |        |        |        |                          |        |    1   |    2   |    3   |        |        |
-     XXXXXXX, AS_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                             XXXXXXX,  KC_P1,   KC_P2,   KC_P3,  XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-  //| LOWER  |        |        |        |        |        |  ESC   |        | ALT    |        |   0    |    .   | ENTER  |   =    |        |
-      KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS,         KC_TRNS,  XXXXXXX, KC_P0,   KC_PDOT, KC_PENT, KC_PEQL, XXXXXXX,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-  //                               |  CTRL  | COMMAND| BKSPACE |                 | SPACE  | ENTER  | SHIFT  |
-                                    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-};
diff --git a/keyboards/keebio/iris/keymaps/gsigler/rules.mk b/keyboards/keebio/iris/keymaps/gsigler/rules.mk
deleted file mode 100644
index 0abc28fc595..00000000000
--- a/keyboards/keebio/iris/keymaps/gsigler/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
deleted file mode 100644
index cc229edb943..00000000000
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define TAPPING_TERM 150
-
-#define TAPPING_TOGGLE 2
-#define PERMISSIVE_HOLD
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
deleted file mode 100644
index abbccdc4d9a..00000000000
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  ADJUST,
-  GUSR,
-  HGRP,
-  CHUS,
-};
-
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_ESCC MT(MOD_LCTL, KC_ESC)
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST QK_BOOT
-#define KC_BL_S BL_STEP
-
-// Left and right shift as mot-tap square braces
-#define KC_LSBR MT(MOD_LSFT, KC_LBRC)
-#define KC_RSBR MT(MOD_RSFT, KC_RBRC)
-
-// mod-tap shift/minus
-#define KC_SMIN MT(MOD_LSFT, KC_MINS)
-
-// Tap-toggle layers
-#define KC_TT_L TT(1)
-#define KC_TT_R TT(2)
-
-#define KC_RGBM RGB_MOD
-#define KC_RGBT RGB_TOG
-
-#define KC_SLOK LGUI(LCTL(KC_Q)) // mojave lock screen
-#define KC_GUSR GUSR // "gam info user" macro
-#define KC_HGRP HGRP // "history | grep" macro
-#define KC_CHUS CHUS // "thisisunsafe" chrome browser macro
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     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_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                      KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSLS,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     KC_ESC , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                      KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     KC_LSBR, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_TT_L,     KC_TT_R, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSBR,
-  //`-------+-------+-------+---+---+-------+-------+-------/    \-------+-------+-------+---+---+-------+-------+-------'
-                                 KC_LCTL,KC_SMIN,KC_LGUI,             KC_ENT ,KC_SPC ,KC_LALT
-  //                            `-------+-------+-------'            `-------+-------+-------'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                     KC_CIRC,KC_AMPR,KC_ASTR,KC_MINS,KC_EQL ,_______,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     _______,KC_SLOK,_______, KC_UP ,_______,KC_RGBT,                      KC_P7 , KC_P8 , KC_P9 , KC_E  , KC_F  ,KC_LPRN,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     KC_DEL ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_GUSR,                      KC_P4 , KC_P5 , KC_P6 , KC_C  , KC_D  ,KC_RPRN,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     KC_BL_S,_______,_______,_______,KC_HGRP,KC_CHUS,_______,     _______, KC_P1 , KC_P2 , KC_P3 , KC_A  , KC_B  ,_______,
-  //`-------+-------+-------+---+---+-------+-------+-------/    \-------+-------+-------+---+---+-------+-------+-------'
-				 _______,_______,_______,             KC_DOT , KC_P0 ,KC_COLN
-  //                            `-------+-------+-------'            `-------+-------+-------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                      KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     _______,KC_RGBT,KC_RGBM,_______,_______,_______,                     _______,KC_AMPR,KC_MUTE,_______,_______,_______,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     _______,KC_CAPW,KC_CPYW,KC_CAPP,KC_CPYP,KC_PGUP,                     KC_EQL ,KC_HOME,KC_VOLU,KC_MRWD,KC_MFFD,_______,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     _______,_______,_______,_______,_______,KC_PGDN,_______,     _______,KC_PLUS,KC_END ,KC_VOLD,KC_MPLY,KC_MSTP,_______,
-  //`-------+-------+-------+---+---+-------+-------+-------/    \-------+-------+-------+---+---+-------+-------+-------'
-                                 _______,_______,_______,             _______,_______,_______
-  //                            `-------+-------+-------'            `-------+-------+-------'
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      QK_BOOT, DB_TOGG, RGB_HUD, RGB_SAD, RGB_VAD, _______,                            _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  )
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-    case GUSR:
-      if (record->event.pressed) {
-        SEND_STRING("gam info user ");
-      }
-      break;
-    case HGRP:
-      if (record->event.pressed) {
-        SEND_STRING("history|grep ");
-      }
-      break;
-    case CHUS:
-      if (record->event.pressed) {
-	SEND_STRING("thisisunsafe");
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/readme.md b/keyboards/keebio/iris/keymaps/hbbisenieks/readme.md
deleted file mode 100644
index 57b9491da61..00000000000
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# HBBisenieks' Iris Layout
-
-A modified Iris layout with toggle-tap layers and a hexidecimal
-numpad. Other features include Space-Cadet-like shift keys that can do
-square or curly braces and a home-row escape key.
-
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/rules.mk b/keyboards/keebio/iris/keymaps/hbbisenieks/rules.mk
deleted file mode 100644
index f8de3b808c5..00000000000
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-
-# Comment out for pro-micro board
-BOOTLOADER = atmel-dfu
-
diff --git a/keyboards/keebio/iris/keymaps/impstyle/README.md b/keyboards/keebio/iris/keymaps/impstyle/README.md
deleted file mode 100644
index b341f2d8681..00000000000
--- a/keyboards/keebio/iris/keymaps/impstyle/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## impstyle keymap
-
-the keymap is based on lewisriddens keymap but i changed some stuff.
-
-i removed:
->RGB backgoundlighting layer and functionallity
-
-i added:
->mouse layer
-
-the qwerty, lower and raise layer are more or less the same. here and there some keys are different.
-take a look at the keymap.c
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/impstyle/config.h b/keyboards/keebio/iris/keymaps/impstyle/config.h
deleted file mode 100644
index 6bf02411b5c..00000000000
--- a/keyboards/keebio/iris/keymaps/impstyle/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#define USE_I2C
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define MOUSEKEY_DELAY             300
-#define MOUSEKEY_INTERVAL          50
-#define MOUSEKEY_MAX_SPEED         10
-#define MOUSEKEY_TIME_TO_MAX       20
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-
-#define TAPPING_TOGGLE  2 // double tab
-
-#include "../../config.h"
-
-#endif
diff --git a/keyboards/keebio/iris/keymaps/impstyle/keymap.c b/keyboards/keebio/iris/keymaps/impstyle/keymap.c
deleted file mode 100644
index 0d3d6b640a3..00000000000
--- a/keyboards/keebio/iris/keymaps/impstyle/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-// iris qwerty layout with mouse layer.
-// double tab to toggle is not working atm
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _MOUSE 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  MOUSE,
-};
-
-#define KC_ KC_TRNS
-#define KC_LOWR MO(_LOWER) // Lower layer
-#define KC_RASE MO(_RAISE) // Raise layer
-#define KC_TGLW TG(_LOWER) // toggle lower
-#define KC_TGRS TG(_RAISE) // toggle raise
-#define KC_MOUS TT(_MOUSE) // double tab toggle mouse layer
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // QUERTY LAYER
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-  //  ESC , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-  // TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,MINS ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-  // LSFT, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-  // LCTL, Z  , X  , C  , V  , B  ,PLUS ,     MOUS , N  , M  ,COMM,DOT ,SLSH,BSLASH,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                   LGUI,RASE,SPC ,         ENT ,LOWR,LALT
-  //                  `----+----+----'        `----+----+----'
-
-  [_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_BSPC,
-     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_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_PLUS,         KC_MOUS,KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
-                                     KC_LGUI,KC_RASE,KC_SPC ,         KC_ENT ,KC_LOWR,KC_LALT
-  ),
-
-  // LOWER Layer
-   //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-  // TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //     ,    ,    ,    ,    ,LBRC,               RBRC, P7 , P8 , P9 ,    ,PLUS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //     ,HOME,PGUP,PGDN,END,LPRN,               RPRN, P4 , P5 , P6 ,MINS,PIPE,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-  //     ,    ,    ,    ,    ,    ,    ,         ,    , P1 , P2 , P3 ,EQL ,UNDS ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                       ,    ,DEL ,        BSPC ,    , P0
-  //                  `----+----+----'        `----+----+----'
-
-  [_LOWER] = LAYOUT(
-     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_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
-     _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
-     _______,_______,_______,_______,_______,_______,_______,        _______,_______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS ,
-                                  _______ ,_______,KC_PSCR  ,        _______,_______, KC_P0
-),
-  // RAISE LAYER
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-  // F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //     ,    ,    ,    ,    ,LBRC,               RBRC,    ,NLCK,INS ,SLCK,MUTE,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //     ,LEFT,UP  ,DOWN,RGHT,LPRN,               RPRN,MPRV,MPLY,MNXT,    ,VOLU,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-  //     ,    ,    ,    ,    ,    ,    ,      PLUS ,    ,    ,    ,    ,    ,VOLD,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                       ,    ,    ,          EQL,    ,
-  //                  `----+----+----'        `----+----+----'
-
-  [_RAISE] = LAYOUT(
-       KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-       _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
-       _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
-       _______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,KC_VOLD,
-                                      _______ ,_______,_______,        KC_EQL ,_______,_______
-  ),
-  // MOUSE LAYER
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-  //     ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,   ,   ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-  //     ,    ,     ,   ,    ,    ,               MS_WH_UP,     ,    ,   ,   ,   ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-  // ,,MS_LEFT,MS_UP,MS_DOWN,MS_RGHT,,            MS_WH_DN,MS_BT1,MS_BT2,MS_BT3,  , ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-  //     ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,MS_ACC0,MS_ACC1MS_ACC2
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-  //                       ,    ,    ,          ,    ,
-  //                  `----+----+----'        `----+----+----'
-  [_MOUSE] = LAYOUT(
-       _______,_______,_______,_______,_______,_______,                       _______,_______,_______,_______,_______,_______,
-       _______,_______,_______,_______,_______,_______,                       KC_MS_WH_UP,_______,_______,_______,_______,_______,
-       _______,KC_MS_LEFT,KC_MS_UP,KC_MS_DOWN,KC_MS_RIGHT,_______,            KC_MS_WH_DOWN,KC_MS_BTN1,KC_MS_BTN2,KC_MS_BTN3,_______,_______,
-       _______,_______,_______,_______,_______,_______,_______,            _______,_______,_______,_______,KC_MS_ACCEL0,KC_MS_ACCEL1,KC_MS_ACCEL2,
-                                       _______,_______,_______,            _______,_______,_______
-  ),
-
-};
diff --git a/keyboards/keebio/iris/keymaps/impstyle/rules.mk b/keyboards/keebio/iris/keymaps/impstyle/rules.mk
deleted file mode 100644
index ef4a383d31c..00000000000
--- a/keyboards/keebio/iris/keymaps/impstyle/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-TAP_DANCE_ENABLE = no
-MOUSEKEY_ENABLE = yes
-
diff --git a/keyboards/keebio/iris/keymaps/isolike/config.h b/keyboards/keebio/iris/keymaps/isolike/config.h
deleted file mode 100644
index ff1de19edcb..00000000000
--- a/keyboards/keebio/iris/keymaps/isolike/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/isolike/keymap.c b/keyboards/keebio/iris/keymaps/isolike/keymap.c
deleted file mode 100644
index 0161ee23de4..00000000000
--- a/keyboards/keebio/iris/keymaps/isolike/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _RAISE 1
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  RAISE,
-};
-
-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,    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_DEL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_NUBS, 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_ENT,           KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LCTL, MO(_RAISE),KC_SPC,                  KC_SPC,  MO(_RAISE),KC_LALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_INS,  KC_HOME, KC_UP,   KC_END,  _______, KC_PGUP,                            KC_WH_U, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_PGDN,                            KC_WH_D, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_NUHS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,          _______, KC_LCTL, KC_LALT, KC_RALT, KC_RGUI, KC_RCTL, KC_GRV,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI, _______, _______,                   _______, _______, KC_APP
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/keebio/iris/keymaps/isolike/readme.md b/keyboards/keebio/iris/keymaps/isolike/readme.md
deleted file mode 100644
index 6e8244a0f25..00000000000
--- a/keyboards/keebio/iris/keymaps/isolike/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# isolike keymap
-
-Modelled on the ISO keyboard layout. Key positions should feel quite familiar to
-ISO layout users. There is only two layers. The space, enter and raise keys are
-mirrored on both hands to make it easier to remember and type on.
diff --git a/keyboards/keebio/iris/keymaps/isolike/rules.mk b/keyboards/keebio/iris/keymaps/isolike/rules.mk
deleted file mode 100644
index 1d2d9e5a9c4..00000000000
--- a/keyboards/keebio/iris/keymaps/isolike/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/keebio/iris/keymaps/jasondunsmore/config.h b/keyboards/keebio/iris/keymaps/jasondunsmore/config.h
deleted file mode 100644
index e6fa61d3ddd..00000000000
--- a/keyboards/keebio/iris/keymaps/jasondunsmore/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 EE_HANDS
-#define TAPPING_TERM 150
-#define TAPPING_TOGGLE 2
-#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
diff --git a/keyboards/keebio/iris/keymaps/jasondunsmore/keymap.c b/keyboards/keebio/iris/keymaps/jasondunsmore/keymap.c
deleted file mode 100644
index 7d306083c1e..00000000000
--- a/keyboards/keebio/iris/keymaps/jasondunsmore/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Layers
-#define _QWERTY 0 // Base layer
-#define _NAVI   1 // Navigation layer
-
-// Keys
-#define KC_AGRV LALT_T(KC_GRAVE)
-#define KC_AQUO RALT_T(KC_QUOTE)
-#define KC_GUIE LGUI_T(KC_ESC)
-#define KC_ECTL RCTL_T(KC_EQL)
-#define KC_MCTL LCTL_T(KC_MINS)
-#define KC_NAVI MO(_NAVI)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     KC_GUIE, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,                        KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_DEL,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     KC_TAB,  KC_Q,   KC_W,   KC_F,   KC_P,   KC_B,                        KC_J,   KC_L,   KC_U,   KC_Y,  KC_SCLN,KC_BSPC,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     KC_LALT, KC_A,   KC_R,   KC_S,   KC_T,   KC_G,                        KC_M,   KC_N,   KC_E,   KC_I,   KC_O,  KC_AQUO,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_D,   KC_V,  KC_GRV,      KC_BSLS, KC_K,   KC_H,  KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
-  //`-------+-------+-------+--+----+-------+-------+-------/    \-------+-------+-------+-------+-------+-------+-------'
-                                   KC_NAVI,KC_MCTL, KC_SPC,         KC_ENT, KC_ECTL,KC_NAVI
-  //                              `-------+-------+-------'        `-------+-------+-------'
-   ),
-
-  [_NAVI] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     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_NO, DM_RSTP,KC_MUTE,KC_VOLU, KC_NO,  KC_NO,                      KC_PGUP,KC_HOME, KC_UP, KC_END,  KC_NO, KC_F12,
-  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     KC_TRNS,DM_REC1,KC_BRID,KC_VOLD,KC_BRIU,KC_TRNS,                     KC_PGDN,KC_LEFT,KC_DOWN,KC_RGHT, KC_NO, KC_TRNS,
-  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     KC_TRNS,DM_PLY1, KC_NO,  KC_NO,  KC_NO,  KC_NO, KC_INS,       KC_NO, KC_LCBR,KC_RCBR,KC_LBRC,KC_RBRC, KC_NO, KC_TRNS,
-  //`-------+-------+-------+--+----+-------+-------+-------/    \-------+-------+-------+-------+-------+-------+-------'
-                                    KC_NO, KC_TRNS, KC_NO,           KC_NO, KC_TRNS, KC_NO
-  //                              `-------+-------+-------'        `-------+-------+-------'
-     )
-};
diff --git a/keyboards/keebio/iris/keymaps/jasondunsmore/readme.md b/keyboards/keebio/iris/keymaps/jasondunsmore/readme.md
deleted file mode 100644
index caa0634e28e..00000000000
--- a/keyboards/keebio/iris/keymaps/jasondunsmore/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# jasondunsmore's iris layout
-
-_QWERTY is the default layer, from which all letters, numbers, and
-symbols (with the exception of the square brackets and curly braces)
-can be accessed. The _NAVI layer contains navigation keys, some
-hardware adjustment keys, and lock keys.
diff --git a/keyboards/keebio/iris/keymaps/jasondunsmore/rules.mk b/keyboards/keebio/iris/keymaps/jasondunsmore/rules.mk
deleted file mode 100644
index 6cfd9d2d01d..00000000000
--- a/keyboards/keebio/iris/keymaps/jasondunsmore/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMMAND_ENABLE = no
-CAPS_WORD_ENABLE = yes
-SPLIT_KEYBOARD = yes
-DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/jasonkrasavage/config.h b/keyboards/keebio/iris/keymaps/jasonkrasavage/config.h
deleted file mode 100644
index 751acc6437c..00000000000
--- a/keyboards/keebio/iris/keymaps/jasonkrasavage/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-#define EE_HANDS
-
-#undef RGBLED_NUM
-
-#define RGBLED_NUM 12
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c b/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c
deleted file mode 100644
index ef20fbbea74..00000000000
--- a/keyboards/keebio/iris/keymaps/jasonkrasavage/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-enum layer_names {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_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_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,   KC_ENT,              MO(_LOWER),  KC_SPC,   KC_RALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, KC_UP, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, KC_LCBR,                            KC_RCBR, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, KC_LPRN, _______,          _______, KC_RPRN, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
diff --git a/keyboards/keebio/iris/keymaps/jasonkrasavage/rules.mk b/keyboards/keebio/iris/keymaps/jasonkrasavage/rules.mk
deleted file mode 100644
index 7ad666d1a38..00000000000
--- a/keyboards/keebio/iris/keymaps/jasonkrasavage/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/config.h b/keyboards/keebio/iris/keymaps/jerryhcooke/config.h
deleted file mode 100644
index 2efa4e4382a..00000000000
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 2
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#ifndef NO_DEBUG
-#    define NO_DEBUG
-#endif  // !NO_DEBUG
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#    define NO_PRINT
-#endif  // !NO_PRINT
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c b/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
deleted file mode 100644
index e13745b29cd..00000000000
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_ENT, LCTL_T(KC_LGUI), KC_Z, KC_X, KC_C, KC_D, KC_V, LGUI(KC_L), MEH_T(KC_MINS), KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LGUI, LT(1, KC_QUOT), SC_SENT, KC_SPC, LT(2, KC_BSLS), LALT_T(KC_APP)),
-                                                              [1] = LAYOUT(KC_MPLY, KC_NO, KC_DQUO, KC_NO, LALT(KC_F4), KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, QK_BOOT, KC_MPRV, KC_END, KC_UP, KC_HOME, KC_PGUP, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, RGB_SAI, RGB_SAD, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_P1, KC_P2, KC_P3, KC_PAST, RGB_HUI, RGB_HUD, KC_NO, KC_WBAK, KC_WFWD, KC_WSTP, KC_WREF, KC_NO, LCA(KC_DEL), KC_NUM, KC_P0, KC_P0, KC_PDOT, KC_PENT, RGB_SPI, RGB_SPD, KC_PSCR, KC_NO, KC_LGUI, RGB_TOG, RGB_VAI, RGB_VAD),
-                                                              [2] = LAYOUT(KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_K, KC_NO, KC_WH_D, KC_MS_U, KC_WH_U, KC_NO, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, 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, KC_NO, KC_NO, KC_NO)};
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            case _LOWER:
-                clockwise ? tap_code(KC_MS_WH_UP) : tap_code(KC_MS_WH_DOWN);
-                break;
-            case _RAISE:
-                clockwise ? rgblight_increase_hue() : rgblight_decrease_hue();
-                break;
-            default:
-                clockwise ? tap_code(KC_AUDIO_VOL_UP) : tap_code(KC_AUDIO_VOL_DOWN);
-                break;
-        }
-    } else if (index == 1) {
-        switch (get_highest_layer(layer_state)) {
-            case _LOWER:
-                clockwise ? tap_code(KC_UP) : tap_code(KC_DOWN);
-                break;
-            case _RAISE:
-                clockwise ? tap_code(KC_MEDIA_NEXT_TRACK) : tap_code(KC_MEDIA_PREV_TRACK);
-                break;
-            default:
-                clockwise ? tap_code(KC_RIGHT) : tap_code(KC_LEFT);
-                break;
-        }
-    }
-    return true;
-}
-#endif  // ENCODER_ENABLE
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/readme.md b/keyboards/keebio/iris/keymaps/jerryhcooke/readme.md
deleted file mode 100644
index 8c2a6efef77..00000000000
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-[Jerry's Iris R4 Layout](https://imgur.com/a/JLytcqS)
-
-This is a fairly modified version of the default keymap that I tinkered with to allow the rotary encoder to carry out a different function on each layer.
diff --git a/keyboards/keebio/iris/keymaps/jerryhcooke/rules.mk b/keyboards/keebio/iris/keymaps/jerryhcooke/rules.mk
deleted file mode 100644
index 8e5cd7a4855..00000000000
--- a/keyboards/keebio/iris/keymaps/jerryhcooke/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes 
-BACKLIGHT_ENABLE = yes 
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/jestes5111/config.h b/keyboards/keebio/iris/keymaps/jestes5111/config.h
deleted file mode 100644
index 01d397e2071..00000000000
--- a/keyboards/keebio/iris/keymaps/jestes5111/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2023 Jesse Estes (@jestes5111)
-
-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 EE_HANDS
-#define RGBLIGHT_SPLIT
-#define RGBLIGHT_SLEEP
-#define ENABLE_COMPILE_KEYCODE
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/jestes5111/keymap.c b/keyboards/keebio/iris/keymaps/jestes5111/keymap.c
deleted file mode 100644
index c6c2ae9652a..00000000000
--- a/keyboards/keebio/iris/keymaps/jestes5111/keymap.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-Copyright 2023 Jesse Estes (@jestes5111)
-
-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
-
-// Combinations of two keystrokes for easier reading
-#define CSFT LCTL(KC_LSFT)
-#define GSFT LGUI(KC_LSFT)
-
-enum layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-    _FUNC,
-    _PASTA,
-};
-
-enum custom_keycodes {
-    THUMB = QK_USER,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(
-    // ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐                              ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-        QK_GESC,   KC_1,      KC_2,      KC_3,      KC_4,      KC_5,                                     KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      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_APP,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤                              ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_LCTL,   KC_A,      KC_S,      KC_D,      KC_F,      KC_G,                                     KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_RCTL,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐        ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_LSFT,   KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,      KC_LALT,            KC_RALT,   KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,
-    // └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘        └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
-                                              KC_LGUI,   TL_LOWR,   KC_SPC,                        KC_ENT,    TL_UPPR,   KC_RGUI
-    //                                       └──────────┴──────────┴──────────┘                   └──────────┴──────────┴──────────┘
-    ),
-
-    [_LOWER] = LAYOUT(
-    // ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐                              ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-        KC_MSTP,   KC_MPLY,   KC_MPRV,   KC_MNXT,   KC_VOLU,   KC_VOLD,                                  KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_INS,    KC_DEL,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤                              ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_NO,     KC_F13,    KC_F14,    KC_F15,    KC_F16,    KC_NO,                                    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤                              ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        CSFT,      KC_F17,    KC_F18,    KC_F19,    KC_F20,    KC_NO,                                    KC_LEFT,   KC_DOWN,   KC_UP,     KC_RGHT,   KC_NO,     RCS(KC_L),
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐        ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        GSFT,      KC_F21,    KC_F22,    KC_F23,    KC_F24,    KC_WHOM,   KC_NO,              KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-    // └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘        └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
-                                              KC_NO,     KC_TRNS,   KC_NO,                         KC_UNDS,   KC_TRNS,   KC_NO
-    //                                       └──────────┴──────────┴──────────┘                   └──────────┴──────────┴──────────┘
-    ),
-
-    [_RAISE] = LAYOUT(
-    // ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐                              ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-        KC_F12,    KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,                                    KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤                              ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_TAB,    KC_NO,     KC_NO,     KC_NO,     KC_AMPR,   KC_LPRN,                                  KC_RPRN,   KC_ASTR,   KC_EQL,    KC_MINS,   KC_PLUS,   KC_BSLS,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤                              ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_ENT,    KC_NO,     KC_NO,     KC_NO,     KC_PIPE,   KC_LBRC,                                  KC_RBRC,   KC_NO,     KC_NO,     KC_NO,     KC_DQUO,   KC_QUOT,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐        ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_CAPS,   KC_NO,     KC_NO,     KC_NO,     KC_LABK,   KC_LCBR,   KC_MENU,            KC_NO,     KC_RCBR,   KC_RABK,   KC_NO,     KC_NO,     KC_NO,     KC_NO,
-    // └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘        └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
-                                              KC_NO,     KC_TRNS,   KC_UNDS,                       KC_NO,     KC_TRNS,   KC_NO
-    //                                       └──────────┴──────────┴──────────┘                   └──────────┴──────────┴──────────┘
-    ),
-
-    [_ADJUST] = LAYOUT(
-    // ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐                              ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-        RGB_TOG,   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,     LCA(KC_R), LCA(KC_T),                                KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     QK_BOOT,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤                              ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_NO,     KC_NO,     LCA(KC_V), LCA(KC_D), KC_NO,     KC_NO,                                    KC_NO,     TO(_FUNC), KC_NO,     QK_LOCK,   TO(_PASTA), QK_MAKE,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐        ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_LSFT,   KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,              KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     EE_CLR,
-    // └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘        └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
-                                              KC_NO,     KC_TRNS,   KC_NO,                         KC_NO,     KC_TRNS,   KC_NO
-    //                                       └──────────┴──────────┴──────────┘                   └──────────┴──────────┴──────────┘
-    ),
-
-    [_FUNC] = LAYOUT(
-    // ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐                              ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-        KC_ESC,    KC_SLSH,   KC_ASTR,   KC_MINS,   KC_PLUS,   KC_EQL,                                   KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_BSPC,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤                              ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_TAB,    KC_7,      KC_8,      KC_9,      KC_LPRN,   KC_RPRN,                                  KC_WH_L,   KC_WH_D,   KC_WH_U,   KC_WH_R,   KC_BTN3,   KC_NO,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤                              ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_LCTL,   KC_4,      KC_5,      KC_6,      KC_DOT,    KC_NUM,                                   KC_MS_L,   KC_MS_D,   KC_MS_U,   KC_MS_R,   KC_NO,     KC_NO,
-    // ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐        ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-        KC_LSFT,   KC_1,      KC_2,      KC_3,      KC_0,      KC_ENT,    KC_LALT,            KC_BTN2,   KC_BTN1,   KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-    // └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘        └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
-                                            TO(_QWERTY), KC_CIRC,   KC_SPC,                        KC_ENT,    KC_BTN5,   KC_BTN4
-    //                                       └──────────┴──────────┴──────────┘                   └──────────┴──────────┴──────────┘
-    ),
-
-    [_PASTA] = LAYOUT(
-    // ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐                              ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-        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,                                    THUMB,     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,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,              KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
-    // └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘        └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
-                                            TO(_QWERTY), KC_TRNS,   KC_NO,                         KC_NO,     KC_TRNS,   KC_NO
-    //                                       └──────────┴──────────┴──────────┘                   └──────────┴──────────┴──────────┘
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case THUMB:
-            if (record->event.pressed) {
-                SEND_STRING(":disguised_face: :thumbsup:");
-                wait_ms(100);
-                tap_code(KC_ENTER);
-            }
-            return false;
-    }
-    return true;
-}
-
-void keyboard_post_init_user(void) {
-    rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom(HSV_PURPLE);
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _LOWER:
-            rgblight_sethsv_noeeprom(HSV_GREEN);
-            break;
-        case _RAISE:
-            rgblight_sethsv_noeeprom(HSV_RED);
-            break;
-        case _ADJUST:
-            rgblight_sethsv_noeeprom(HSV_WHITE);
-            break;
-        case _FUNC:
-            rgblight_sethsv_noeeprom(HSV_BLUE);
-            break;
-        case _PASTA:
-            rgblight_sethsv_noeeprom(HSV_ORANGE);
-            break;
-        default:
-            rgblight_sethsv_noeeprom(HSV_PURPLE);
-            break;
-    }
-    return state;
-}
diff --git a/keyboards/keebio/iris/keymaps/jestes5111/readme.md b/keyboards/keebio/iris/keymaps/jestes5111/readme.md
deleted file mode 100644
index 00ccbf92679..00000000000
--- a/keyboards/keebio/iris/keymaps/jestes5111/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-![Keymap SVG](https://i.imgur.com/mPKFzVWh.png)
-
-# My Iris
-
-Designed for creating/editing in VIM and Excel, gaming, and general keyboard-focused media consumption.
-WIP.
diff --git a/keyboards/keebio/iris/keymaps/jestes5111/rules.mk b/keyboards/keebio/iris/keymaps/jestes5111/rules.mk
deleted file mode 100644
index 249ea5750e6..00000000000
--- a/keyboards/keebio/iris/keymaps/jestes5111/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = no
-KEY_LOCK_ENABLE = yes
-UNICODE_ENABLE = yes
-
-ENCODER_ENABLE = no
-TRI_LAYER_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/README.md b/keyboards/keebio/iris/keymaps/jhelvy/README.md
deleted file mode 100644
index 84b924c3796..00000000000
--- a/keyboards/keebio/iris/keymaps/jhelvy/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Keymap for jhelvy's [Iris Rev 2](https://github.com/jhelvy/iris-rev2)
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/config.h b/keyboards/keebio/iris/keymaps/jhelvy/config.h
deleted file mode 100644
index 7ec5b41761d..00000000000
--- a/keyboards/keebio/iris/keymaps/jhelvy/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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
-
-// Had to swap the master to get the right-side rotary encoder supported
-#define MASTER_RIGHT
-
-#define QUICK_TAP_TERM 0
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-#define AUTO_SHIFT_TIMEOUT 150
-
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 16
-#define MOUSEKEY_MAX_SPEED 2
-#define MOUSEKEY_WHEEL_MAX_SPEED 42
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 15
-
-#define ENCODERS_PAD_A { F4 }
-#define ENCODERS_PAD_B { F5 }
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/keymap.c b/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
deleted file mode 100644
index 17fe535611e..00000000000
--- a/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    QWERTY = 0,
-    HOTKEYS,
-    TEXT,
-    SELECT,
-    MOUSE,
-};
-
-enum custom_keycodes {
-    SIG_PROF = SAFE_RANGE,
-    SIG_JOHN,
-    R_PIPE,
-    R_ASSIGN,
-    R_COLS,
-    R_IN,
-    TEX,
-    E_GMAIL,
-    E_GWU,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[QWERTY] = LAYOUT(LALT(KC_A), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_EQL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, MO(4), KC_LGUI, MO(2), KC_SPC, MO(1), TG(1)),
-
-[HOTKEYS] = LAYOUT(KC_F5, LGUI(LALT(KC_1)), LGUI(LALT(KC_2)), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F14, KC_F6, KC_NO, KC_NO, LCTL(KC_U), SGUI(KC_R), KC_F2, SGUI(KC_K), LCTL(KC_9), LCTL(KC_0), KC_NO, KC_F11, KC_F15, KC_F7, LGUI(LCTL(KC_A)), KC_F10, KC_LBRC, KC_RBRC, KC_F9, SIG_JOHN, LSFT(KC_TAB), KC_TAB, E_GMAIL, KC_F12, KC_F16, KC_F8, AS_TOGG, KC_NO, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, SIG_PROF, KC_F3, KC_F4, E_GWU, KC_F13, KC_F17, LALT(KC_SPC), KC_LGUI, KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS),
-
-[TEXT] = LAYOUT(KC_ESC, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), KC_SCLN, KC_PIPE, KC_COLN, KC_NO, KC_UNDS, KC_PLUS, LGUI(KC_BSPC), LGUI(KC_Q), LGUI(KC_W), KC_ESC, LGUI(KC_R), LGUI(KC_T), LCTL(KC_Y), LGUI(KC_LEFT), KC_UP, LGUI(KC_RGHT), KC_TILD, R_PIPE, KC_BSPC, MO(3), LGUI(KC_S), LGUI(KC_C), LGUI(KC_V), LGUI(KC_X), KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV, KC_ENT, KC_F18, LGUI(KC_A), LGUI(KC_D), KC_F1, LGUI(KC_Z), LGUI(KC_Y), KC_NO, KC_NO, KC_BSPC, LGUI(KC_F), SGUI(KC_G), LGUI(KC_G), KC_BSLS, R_ASSIGN, KC_LALT, KC_LGUI, KC_TRNS, KC_SPC, KC_RGUI, KC_NO),
-
-[SELECT] = LAYOUT(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, SGUI(KC_LEFT), LSFT(KC_UP), SGUI(KC_RGHT), KC_NO, R_COLS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_RGHT), KC_NO, R_IN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LALT(LSFT(KC_LEFT)), LALT(LSFT(KC_RIGHT)), KC_NO, TEX, KC_NO, KC_NO, KC_NO, KC_SPC, KC_TRNS, KC_TRNS),
-
-[MOUSE] = LAYOUT(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_LGUI, KC_NO, KC_NO, LGUI(KC_LBRC), KC_MS_U, LGUI(KC_RBRC), KC_NO, KC_NO, LCTL(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, 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_TRNS, KC_NO, KC_NO, KC_BTN1, KC_BTN2, KC_NO)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case SIG_PROF:
-        if (record->event.pressed) {
-            SEND_STRING("Cheers,\nProfessor Helveston");
-        } else {
-        }
-        break;
-
-    case SIG_JOHN:
-        if (record->event.pressed) {
-            SEND_STRING("Cheers,\nJohn");
-        } else {
-        }
-        break;
-
-    case R_PIPE:
-        if (record->event.pressed) {
-            SEND_STRING(" %>% ");
-        } else {
-        }
-        break;
-
-    case R_ASSIGN:
-        if (record->event.pressed) {
-            SEND_STRING(" <- ");
-        } else {
-        }
-        break;
-
-    case R_COLS:
-        if (record->event.pressed) {
-            SEND_STRING(".leftcol[\n]\n.rightcol[\n]\n");
-        } else {
-        }
-        break;
-
-    case R_IN:
-        if (record->event.pressed) {
-            SEND_STRING(" %in% ");
-        } else {
-        }
-        break;
-
-    case TEX:
-        if (record->event.pressed) {
-            SEND_STRING("\\text{}");
-        } else {
-        }
-        break;
-
-    case E_GMAIL:
-        if (record->event.pressed) {
-            SEND_STRING("john.helveston@gmail.com");
-        } else {
-        }
-        break;
-
-    case E_GWU:
-        if (record->event.pressed) {
-            SEND_STRING("jph@gwu.edu");
-        } else {
-        }
-        break;
-
-    }
-
-    return true;
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (IS_LAYER_ON(HOTKEYS)) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (IS_LAYER_ON(TEXT)) {
-        if (clockwise) {
-            tap_code(KC_MS_WH_RIGHT);
-        } else {
-            tap_code(KC_MS_WH_LEFT);
-        }
-    } else if (IS_LAYER_ON(MOUSE)) {
-        if (clockwise) {
-            tap_code16(G(KC_EQL));
-        } else {
-            tap_code16(G(KC_MINS));
-        }
-    } else {
-        if (clockwise) {
-            tap_code(KC_MS_WH_DOWN);
-        } else {
-            tap_code(KC_MS_WH_UP);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/rules.mk b/keyboards/keebio/iris/keymaps/jhelvy/rules.mk
deleted file mode 100644
index 64d3eb2f184..00000000000
--- a/keyboards/keebio/iris/keymaps/jhelvy/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTO_SHIFT_ENABLE = yes # Autoshift by holding down a key
-MOUSEKEY_ENABLE = yes
-ENCODER_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/keebio/iris/keymaps/johnstegeman/config.h b/keyboards/keebio/iris/keymaps/johnstegeman/config.h
deleted file mode 100644
index de2f7b9e80e..00000000000
--- a/keyboards/keebio/iris/keymaps/johnstegeman/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2023 John Stegeman
-
-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 USE_I2C
-#define EE_HANDS
-
-#define RGBLIGHT_LAYERS
-
-#define TAPPING_TOGGLE 1 // tap just once for TT() to toggle the layer
-#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
-#define RGBLIGHT_LAYERS_RETAIN_VAL
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/johnstegeman/keymap.c b/keyboards/keebio/iris/keymaps/johnstegeman/keymap.c
deleted file mode 100644
index 026f39c218b..00000000000
--- a/keyboards/keebio/iris/keymaps/johnstegeman/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-Copyright 2023 John Stegeman
-
-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 "print.h"
-#include "light_layers.h"
-
-enum layers {
-_COLEMAK,
-_NAVNUM,
-_CONTROL,
-};
-
-// Enter when tapped, shift when held
-#define SHEN MT(MOD_LSFT, KC_ENT) 
-
-// Enter when tapped, alt when held
-#define ALEN MT(MOD_LALT, KC_ENT) 
-
-#define CTX LT(0,KC_X)
-#define CPC LT(0,KC_C)
-#define PSV LT(0,KC_V)
-
-// Space when tapped, shift when held 
-#define SHSP MT(MOD_RSFT, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_COLEMAK] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                               KC_J,    KC_L,    KC_U,    KC_Y,    KC_MINS, KC_SCLN,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                               KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, KC_Z,     CTX,     CPC,    KC_D,     PSV,    KC_HOME,          KC_RALT,  KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_EQL,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                     MO(1),    ALEN,  KC_LGUI,                  KC_BSPC,   SHSP,  LT(2,KC_ENT)
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_NAVNUM] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     QK_BOOT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,    _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_DEL,  _______, KC_LEFT, KC_RGHT, KC_UP,   KC_LBRC,                            KC_RBRC, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_PIPE,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______,    _______, _______, KC_DOWN, KC_LCBR, KC_END,           KC_RALT, KC_RCBR, KC_P1,   KC_P2,   KC_P3,   KC_MINS, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, KC_DEL,                    KC_DEL,  _______, KC_P0
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_CONTROL] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RGB_TOG, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN,          _______, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};     
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  switch (keycode) {
-   case LT(0,KC_X):
-      if (!record->tap.count && record->event.pressed) {
-            tap_code16(G(KC_X)); // Intercept hold function to send GUI-X
-            return false;
-      }
-      return true;
-      break;
-   case LT(0,KC_C):
-      if (!record->tap.count && record->event.pressed) {
-            tap_code16(G(KC_C)); // Intercept hold function to send GUI-C
-            return false;
-      }
-      return true;
-      break;
-   case LT(0,KC_V):
-      if (!record->tap.count && record->event.pressed) {
-            tap_code16(G(KC_V)); // Intercept hold function to send GUI-V
-            return false;
-      }
-      return true;
-      break;
-   }
-  return true;
-}
-
-// Key overrides
-
-// GUI + esc = ~
-const key_override_t tilde_esc_override = ko_make_basic(MOD_MASK_GUI, KC_ESC, S(KC_GRV));
-
-// Shift + esc = `
-const key_override_t grave_esc_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, KC_GRV);
-
-// Shift + bkspc = delete word
-const key_override_t shift_bkspc_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, A(KC_BSPC));
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &tilde_esc_override,
-    &grave_esc_override,
-//    &shift_bkspc_override,
-    NULL
-};
-
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = MY_LIGHT_LAYERS;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
- 
-    rgblight_set_layer_state(_COLEMAK, layer_state_cmp(state, _COLEMAK));
-    rgblight_set_layer_state(_NAVNUM, layer_state_cmp(state, _NAVNUM));
-
-    return state;
-}
diff --git a/keyboards/keebio/iris/keymaps/johnstegeman/light_layers.h b/keyboards/keebio/iris/keymaps/johnstegeman/light_layers.h
deleted file mode 100644
index 7c459c1fe3a..00000000000
--- a/keyboards/keebio/iris/keymaps/johnstegeman/light_layers.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright 2023 John Stegeman
-
-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
-
-/*
-
-LED index mapping:
-
-          (31)              (32)              (33)                                    (67)              (66)              (65)
-┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-│0       │1       │2       │3       │4       │5       │                          │39      │38      │37      │36      │35      │34      │
-├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-│11      │10      │9       │8       │7       │6       │                          │40      │41      │42      │43      │44      │45      │
-├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-│12      │13      │14      │15      │16      │17      │                          │51      │50      │49      │48      │47      │46      │
-├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-│23      │22      │21      │20      │19      │18      │27      │        │61      │52      │53      │54      │55      │56      │57      │
-└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                               │24      │25      │26      │                 │60      │59      │58      │
-                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-          (30)              (29)              (28)                                    (62)              (63)              (64)
-
-*/
-
-const rgblight_segment_t PROGMEM COLEMAK_LIGHT_LAYER[] = RGBLIGHT_LAYER_SEGMENTS(
-    // left side
-    {0, 6, HSV_BLUE},
-    {6, 5, HSV_AZURE},
-    {11, 2, HSV_BLUE},
-    {13, 10, HSV_AZURE},
-    {23, 2, HSV_BLUE},
-    {25, 1, HSV_RED},
-    {26, 2, HSV_BLUE},
-    {28, 3, HSV_BLUE}, // underglow
-    {31, 3, HSV_BLUE}, // underglow
-    // right side
-    {34, 6, HSV_BLUE},
-    {40, 4, HSV_AZURE},
-    {44, 3, HSV_BLUE},
-    {47, 7, HSV_AZURE},
-    {54, 5, HSV_BLUE},
-    {59, 1, HSV_RED},
-    {60, 2, HSV_BLUE},
-    {62, 3, HSV_BLUE}, // underglow
-    {65, 3, HSV_BLUE} // underglow
-);
-
-const rgblight_segment_t PROGMEM NAVNUM_LIGHT_LAYER[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 14, HSV_BLACK},
-    {14, 3, HSV_GREEN},
-    {17, 2, HSV_BLACK},
-    {19, 1, HSV_GREEN},
-    {20, 21, RGB_OFF},
-    {41, 3, HSV_GREEN},
-    {44, 4, HSV_BLACK},
-    {48, 3, HSV_GREEN},
-    {51, 2, HSV_BLACK},
-    {53, 3, HSV_GREEN},
-    {56, 2, HSV_BLACK},
-    {58, 1, HSV_GREEN},
-    {59, 9, HSV_BLACK} 
-);
-
-
-const rgblight_segment_t* const PROGMEM MY_LIGHT_LAYERS[] = RGBLIGHT_LAYERS_LIST(
-    COLEMAK_LIGHT_LAYER,
-    NAVNUM_LIGHT_LAYER
-);
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/johnstegeman/readme.md b/keyboards/keebio/iris/keymaps/johnstegeman/readme.md
deleted file mode 100644
index c2f93287730..00000000000
--- a/keyboards/keebio/iris/keymaps/johnstegeman/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Keebio Iris Colemak layout
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/johnstegeman/rules.mk b/keyboards/keebio/iris/keymaps/johnstegeman/rules.mk
deleted file mode 100644
index 56c422e572c..00000000000
--- a/keyboards/keebio/iris/keymaps/johnstegeman/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Build Options
-
-BOOTMAGIC_ENABLE = no
-MOUSEKEY_ENABLE = no
-COMMAND_ENABLE = no
-NKRO_ENABLE = no
-BACKLIGHT_ENABLE = no
-
-AUDIO_ENABLE = no
-ENCODER_ENABLE = no
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no 
-MAGIC_ENABLE = no
-TAP_DANCE_ENABLE = no
-
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-RGBLIGHT_ENABLE = yes 
-RGB_MATRIX_ENABLE = no 
-#RGB_MATRIX_ENABLE = yes
-#RGB_MATRIX_DRIVER = ws2812
-LTO_ENABLE = yes
-VIA_ENABLE = yes
-KEY_OVERRIDE_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/khang/colors.h b/keyboards/keebio/iris/keymaps/khang/colors.h
deleted file mode 100644
index 245e76a8c21..00000000000
--- a/keyboards/keebio/iris/keymaps/khang/colors.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2021 Nguyen Vu Khang <brew4k@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 MINIMAL_BASEx(hue,sat) \
-    rgblight_sethsv_range(hue, sat, 0, 0, 12); \
-    rgblight_sethsv_range(hue, sat, 100, 5, 7)
-
-#define MINIMAL_BASE(hue, sat) \
-    {0, 12, hue, sat, 0}, \
-    {5, 2, hue, sat, 100}
-
-#define MINIMAL(hue, sat) \
-    {0, 12, hue, sat, 0}, \
-    {3, 1, hue, sat, 100}, \
-    {8, 1, hue, sat, 100}
-
-const int yellow = 30;
-const int green = 99;
-const int red = 252;
-const int base_sat = 120;
-
-const rgblight_segment_t PROGMEM _BL_rgblayer[] = RGBLIGHT_LAYER_SEGMENTS(
-    MINIMAL_BASE(yellow,250)
-);
-const rgblight_segment_t PROGMEM _FN_rgblayer[] = RGBLIGHT_LAYER_SEGMENTS(
-    MINIMAL(green,255)
-);
-const rgblight_segment_t PROGMEM _SL_rgblayer[] = RGBLIGHT_LAYER_SEGMENTS(
-    MINIMAL(red,255)
-);
-
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    _BL_rgblayer,
-    _FN_rgblayer,
-    _SL_rgblayer
-);
-
-void keyboard_post_init_user(void) {
-    MINIMAL_BASEx(yellow,200);
-    rgblight_layers = my_rgb_layers;
-}
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, _BL));
-    return state;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(1, layer_state_cmp(state, _FN));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _SL));
-    return state;
-}
diff --git a/keyboards/keebio/iris/keymaps/khang/config.h b/keyboards/keebio/iris/keymaps/khang/config.h
deleted file mode 100644
index 714c1768997..00000000000
--- a/keyboards/keebio/iris/keymaps/khang/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Nguyen Vu Khang <brew4k@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 EE_HANDS
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_MAX_LAYERS 5
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_BREATHING
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_TWINKLE
-#undef MOUSEKEY_ENABLE
diff --git a/keyboards/keebio/iris/keymaps/khang/extrakeys.h b/keyboards/keebio/iris/keymaps/khang/extrakeys.h
deleted file mode 100644
index a9056f8bcfd..00000000000
--- a/keyboards/keebio/iris/keymaps/khang/extrakeys.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2021 Nguyen Vu Khang <brew4k@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
-
-enum my_keycodes {
-    ______ = SAFE_RANGE,
-    HYPR1, HYPR2, HYPR3, HYPR4, HYPR5, HYPR6, HYPR7, HYPR8, HYPR9, HYPR0,
-    HYPRL,
-    HYPRM,
-    HYPRP,
-    HYPRQ,
-    HYPRS,
-    HYPRT,
-    KC_STAB
-};
-
-#undef _______
-#define ______ KC_NO
-
-#define HYPR1 HYPR(KC_1)
-#define HYPR2 HYPR(KC_2)
-#define HYPR3 HYPR(KC_3)
-#define HYPR4 HYPR(KC_4)
-#define HYPR5 HYPR(KC_5)
-#define HYPR6 HYPR(KC_6)
-#define HYPR7 HYPR(KC_7)
-#define HYPR8 HYPR(KC_8)
-#define HYPR9 HYPR(KC_9)
-#define HYPR0 HYPR(KC_0)
-
-#define HYPRL HYPR(KC_L)
-#define HYPRM HYPR(KC_M)
-#define HYPRP HYPR(KC_P)
-#define HYPRQ HYPR(KC_Q)
-#define HYPRS HYPR(KC_S)
-#define HYPRT HYPR(KC_T)
-
-#define KC_STAB LSFT(KC_TAB)
-
-uint8_t mod_state;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    mod_state = get_mods();
-    switch (keycode) {
-        case KC_BSPC: {
-            static bool delkey_registered;
-            if (record->event.pressed) { // on key-down of Backspace
-                if (mod_state & MOD_MASK_CTRL) {
-                    // Ctrl + Backspace -> Forward Delete
-                    del_mods(MOD_MASK_CTRL);
-                    register_code(KC_DEL);
-                    delkey_registered = true;
-                    set_mods(mod_state);
-                    return false;
-                }
-            } else { // on release of Backspace
-                if (delkey_registered) {
-                    unregister_code(KC_DEL);
-                    delkey_registered = false;
-                    return false;
-                }
-            }
-            return true;
-        };
-        break;
-    }
-    return true;
-};
diff --git a/keyboards/keebio/iris/keymaps/khang/keymap.c b/keyboards/keebio/iris/keymaps/khang/keymap.c
deleted file mode 100644
index 69c7d8fe649..00000000000
--- a/keyboards/keebio/iris/keymaps/khang/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-    _BL = 0,
-    _FN,
-    _SL,
-    _BF,
-    _UP
-};
-
-#include "colors.h"
-#include "extrakeys.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_BL] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                    ┌────────┬────────┬────────┬────────┬────────┬────────┐
-        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_TAB ,  KC_Q  ,  KC_W  ,  KC_E  ,  KC_R  ,  KC_T  ,                       KC_Y  ,  KC_U  ,  KC_I  ,  KC_O  ,  KC_P  ,KC_BSLS ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
-        KC_ESC ,  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_MINS ,   KC_PLUS ,  KC_N  ,  KC_M  ,KC_COMM , KC_DOT ,KC_SLSH ,MO(_FN) ,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘  └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                      KC_LGUI ,KC_LCTL , KC_ENT ,             KC_SPC ,MO(_UP) ,KC_RALT
-                                  // └────────┴────────┴────────┘           └────────┴────────┴────────┘
-    ),
-
-    [_UP] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                    ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       KC_TILD ,KC_EXLM , KC_AT  ,KC_HASH , KC_DLR ,KC_PERC ,                      ______ , ______ , ______ ,KC_MINS , KC_EQL , KC_NO  ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
-        ______ , ______ , ______ , ______ , ______ , ______ ,                      ______ , ______ , ______ ,KC_LBRC ,KC_RBRC , ______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
-        ______ , ______ , ______ , ______ , ______ , ______ ,                     KC_LEFT ,KC_DOWN , KC_UP  ,KC_RGHT , ______ , ______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐  ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_LSFT , ______ , ______ , ______ , ______ , ______ , ______ ,    ______ , ______ , ______ , ______ , ______ , ______ , ______ ,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘  └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                      KC_LGUI ,KC_LCTL , ______ ,             ______ , KC_NO  , ______
-                                  // └────────┴────────┴────────┘           └────────┴────────┴────────┘
-    ),
-
-    [_FN] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                    ┌────────┬────────┬────────┬────────┬────────┬────────┐
-        ______ , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_STAB , ______ , ______ , ______ , ______ , HYPRT  ,                      ______ , ______ , ______ , ______ , ______ , KC_F12 ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
-        ______ , ______ , HYPRS  , ______ , ______ , ______ ,                      ______ , ______ ,KC_BRID ,KC_BRIU , ______ , ______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐  ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       MO(_SL) , ______ , ______ , ______ , ______ , ______ , ______ ,    ______ , ______ , HYPRM  ,KC_VOLD ,KC_VOLU , ______ , KC_NO  ,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘  └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                       ______ , ______ , ______ ,            KC_MPLY ,KC_MPRV ,KC_MNXT
-                                  // └────────┴────────┴────────┘           └────────┴────────┴────────┘
-    ),
-
-    [_SL] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                    ┌────────┬────────┬────────┬────────┬────────┬────────┐
-        ______ , HYPR1  , HYPR2  , HYPR3  , HYPR4  , HYPR5  ,                      HYPR6  , HYPR7  , HYPR8  , HYPR9  , HYPR0  , ______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
-        ______ , HYPRQ  , ______ , ______ , ______ , ______ ,                      ______ , ______ , ______ , ______ , HYPRP  , ______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
-        ______ , ______ , ______ , ______ , ______ , ______ ,                      ______ , ______ , ______ ,HYPRL   , ______ , ______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐  ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-        KC_NO  , ______ , ______ , ______ , ______ , ______ , ______ ,    ______ , ______ , ______ , ______ , ______ , ______ , KC_NO  ,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘  └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                       ______ , ______ , ______ ,             QK_BOOT, ______ , ______
-                                  // └────────┴────────┴────────┘           └────────┴────────┴────────┘
-    )
-};
diff --git a/keyboards/keebio/iris/keymaps/khang/readme.md b/keyboards/keebio/iris/keymaps/khang/readme.md
deleted file mode 100644
index c372ba54b2c..00000000000
--- a/keyboards/keebio/iris/keymaps/khang/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Khang's Iris Keymap
-
-- QWERTY at heart
-- Space on right thumb
-- Enter on left thumb
-- Right-Shift as Fn
-- Minimal (disabled everything unused to save space)
diff --git a/keyboards/keebio/iris/keymaps/khang/rules.mk b/keyboards/keebio/iris/keymaps/khang/rules.mk
deleted file mode 100644
index 316ec60f760..00000000000
--- a/keyboards/keebio/iris/keymaps/khang/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-ENCODER_ENABLE = no
-MOUSEKEY_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/khitsule/config.h b/keyboards/keebio/iris/keymaps/khitsule/config.h
deleted file mode 100644
index 22b4d6eac7a..00000000000
--- a/keyboards/keebio/iris/keymaps/khitsule/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-#define EE_HANDS
-
-#undef RGBLED_NUM
diff --git a/keyboards/keebio/iris/keymaps/khitsule/keymap.c b/keyboards/keebio/iris/keymaps/khitsule/keymap.c
deleted file mode 100644
index c7247b1a4fc..00000000000
--- a/keyboards/keebio/iris/keymaps/khitsule/keymap.c
+++ /dev/null
@@ -1,154 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY,
-    _GAME,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-// define keycode macros for readability
-#define KM_DLEFT LGUI(LCTL(KC_LEFT))
-#define KM_DRIGHT LGUI(LCTL(KC_RIGHT))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define KC_LCBR LSFT(KC_LBRC)
-#define KC_RCBR LSFT(KC_RBRC)
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  GAME,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-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,    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_ENT,          KC_DEL,  KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_BSLS,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LALT, LT(_LOWER, KC_TAB), CTL_T(KC_SPC), SFT_T(KC_BSPC),  MO(_RAISE),   KC_LGUI
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_GAME] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______,  KC_F1,   KC_F2,    KC_F3,  KC_F4,   KC_F5,                              _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______,  _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, MO(_LOWER), KC_SPC,                 _______,  TO(_QWERTY), _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     LALT(KC_F4), KC_F6, KC_F7,  KC_F8,   KC_F9,   KC_F10,                            _______, _______, _______, KC_LPRN, KC_RPRN, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_HOME,  KC_UP,   KC_END, KC_PGUP, _______,                            _______, _______, KC_NUM , KC_LBRC, KC_RBRC, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,   _______,                           _______, _______, _______, KC_LCBR, KC_RCBR, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KM_DLEFT, KM_DRIGHT,_______,            _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                 _______,  _______,    _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,   _______, _______, _______, _______, _______,                          _______,  KC_P7,   KC_P8,   KC_P9,   KC_PLUS, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______,  KC_P4,   KC_P5,  KC_P6,   KC_PMNS, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, KC_P0,    KC_P1,   KC_P2,   KC_P3,   KC_EQL, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, TO(_GAME)
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______,  _______, _______,_______,  _______, _______,                           _______,  _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,   _______, _______, _______, _______, _______,                          _______,  _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______,  _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______,  _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/khitsule/readme.md b/keyboards/keebio/iris/keymaps/khitsule/readme.md
deleted file mode 100644
index ad848063174..00000000000
--- a/keyboards/keebio/iris/keymaps/khitsule/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Iris Layout by Khitsule
-
-![Khitsule](https://i.imgur.com/BIzu3RZ.png)
-
-[KLE link](http://www.keyboard-layout-editor.com/#/gists/856ad949a89c47fa84c808ba17ae10c5)
-
-## Layers
-
-| Layer | Legend |
-| ----- | ------ |
-| Base  |  Centre (black) |
-| Game  |  Centre (black) - see below |
-| Lower | Bottom (purple) |
-| Raise | Top (pink) |
-
-## Features
-
-* Raise/lower layers focus first on one-handed use
-* Numpad on right hand with raise layer
-* Game layer to be used as a gamepad
-  * Accessed by gui key in raise layer, return with the raise key
-  * Same as base layer **except** numbers 1-5 replaced with F1-F5; dual function removed from thumb keys (dedicated lower and space)
-  * Numbers to F1-F5 is designed to be used with a mouse such as the Naga that has numbers
-  * Lower layer gives one-handed access to arrows and F6-F10 as well
-* Navigation on left hand with lower layer
-  * D refers to desktop left/right on Win 10 (win+ctrl+left/right)
-* Use of hold/tap dual function keys
-  * Ctrl/Space
-  * Shift/Backspace
-  * Lower/Tab
-* Dedicated ctrl and shift to allow for navigation shortcuts with ctrl+shift+nav
diff --git a/keyboards/keebio/iris/keymaps/khitsule/rules.mk b/keyboards/keebio/iris/keymaps/khitsule/rules.mk
deleted file mode 100644
index b6c9a258059..00000000000
--- a/keyboards/keebio/iris/keymaps/khitsule/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/keebio/iris/keymaps/khord/config.h b/keyboards/keebio/iris/keymaps/khord/config.h
deleted file mode 100644
index a0e8e87abb4..00000000000
--- a/keyboards/keebio/iris/keymaps/khord/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define TAPPING_TERM 150
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/khord/keymap.c b/keyboards/keebio/iris/keymaps/khord/keymap.c
deleted file mode 100644
index 07155d5d171..00000000000
--- a/keyboards/keebio/iris/keymaps/khord/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  ADMIN,
-  SMSPC1
-};
-
-enum {
-  SFT_CAP = 0
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TAB,  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_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-  TD(SFT_CAP),KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, SFT_T(KC_ENT),
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_HOME,          KC_END,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI, LOWER,   KC_ENT,                    KC_SPC,  RAISE,   KC_LALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     QK_BOOT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_DEL,  _______, KC_LEFT, KC_RGHT, KC_UP,   KC_LBRC,                            KC_RBRC, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_PIPE,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     BL_STEP, _______, _______, _______, KC_DOWN, KC_LCBR, KC_LPRN,          KC_RPRN, KC_RCBR, KC_P1,   KC_P2,   KC_P3,   KC_MINS, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, KC_DEL,                    KC_DEL,  _______, KC_P0
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RGB_TOG, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN,          _______, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [SFT_CAP] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-    case ADMIN:       
-      if (record->event.pressed) {
-        SEND_STRING("Administrator");
-      }
-      return false;
-      break;
-    case SMSPC1:
-      if (record->event.pressed) {
-        SEND_STRING("Simspace1!");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/khord/rules.mk b/keyboards/keebio/iris/keymaps/khord/rules.mk
deleted file mode 100644
index c46edbd1282..00000000000
--- a/keyboards/keebio/iris/keymaps/khord/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/krusli/README.md b/keyboards/keebio/iris/keymaps/krusli/README.md
deleted file mode 100644
index fc02aa01cca..00000000000
--- a/keyboards/keebio/iris/keymaps/krusli/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# krusli's Iris keymap
-Based off the default and Planck keymaps.
diff --git a/keyboards/keebio/iris/keymaps/krusli/config.h b/keyboards/keebio/iris/keymaps/krusli/config.h
deleted file mode 100644
index 1048a02198d..00000000000
--- a/keyboards/keebio/iris/keymaps/krusli/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#endif
diff --git a/keyboards/keebio/iris/keymaps/krusli/keymap.c b/keyboards/keebio/iris/keymaps/krusli/keymap.c
deleted file mode 100644
index 67eee220fc5..00000000000
--- a/keyboards/keebio/iris/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-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,       KC_BSLS,
-    KC_TAB,   KC_Q,    KC_W,     KC_E,     KC_R,     KC_T,                       KC_Y,      KC_U,       KC_I,       KC_O,       KC_P,       KC_BSPC,
-    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_HOME,  KC_END,  KC_N,      KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    KC_ENT,
-                                          KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,  RAISE,      KC_LALT
-  ),
-
-  [_LOWER] = LAYOUT(
-    _______,  _______, _______,  _______,  _______,  _______,                    _______,   _______,    _______,    _______,    _______,    KC_PSCR,
-    KC_TILD,  KC_EXLM, KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                    KC_CIRC,   KC_AMPR,    KC_ASTR,    KC_LPRN,    KC_RPRN,    KC_BSPC,
-    _______,  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,    _______,    KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,
-                                           _______,  _______,  _______, _______, _______,   _______
-  ),
-
-  [_RAISE] = LAYOUT(
-    _______,  _______, _______,  _______,  _______,  _______,                    _______,   _______,    _______,    _______,    _______,    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_BSPC,
-    _______,  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_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,
-                                           _______,  _______,  _______, _______, _______,   _______
-  ),
-
-  [_ADJUST] = LAYOUT(
-    _______, _______, _______,  _______,  _______,  _______,                    _______,  _______,    _______,    _______,    _______,    _______,
-    RGB_TOG, RGB_MOD, RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,                    _______,  _______,    _______,    _______,    _______,    _______,
-    _______, _______, RGB_HUD,  RGB_SAD,  RGB_SAD,  RGB_VAD,                    _______,  _______,    _______,    _______,    _______,    _______,
-    BL_STEP, QK_BOOT, _______,  _______,  _______,  _______,  _______, _______, _______,  _______,    _______,    _______,    _______,    _______,
-                                          _______,  _______,  _______, _______, _______,  _______
-  ),
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/krusli/rules.mk b/keyboards/keebio/iris/keymaps/krusli/rules.mk
deleted file mode 100644
index b0e37ec2f4a..00000000000
--- a/keyboards/keebio/iris/keymaps/krusli/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-
diff --git a/keyboards/keebio/iris/keymaps/mojitas/config.h b/keyboards/keebio/iris/keymaps/mojitas/config.h
deleted file mode 100644
index d1c8bda27cb..00000000000
--- a/keyboards/keebio/iris/keymaps/mojitas/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Mathias Strand <m.strand91@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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/keebio/iris/keymaps/mojitas/keymap.c b/keyboards/keebio/iris/keymaps/mojitas/keymap.c
deleted file mode 100644
index ab79e09fa9a..00000000000
--- a/keyboards/keebio/iris/keymaps/mojitas/keymap.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-Copyright 2021 Mathias Strand <m.strand91@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
-#include "keymap_swedish.h"
-
-//Nordic(swedish) signs
-
-enum layer_names {
-    _DVORAK,
-    _COLEMAK,
-    _QWERTY,
-    _GAMING,
-    _NUMPAD,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  COLEMAK,
-  GAMING,
-  NUMPAD,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-#define SE_YEN ALGR(SE_6) //isn't in the swedish_keymap.h
-#define KC_CATDEL LCTL(LALT(KC_DEL)) // Ctrl alt del
-#define KC_TSKMGR LCTL(S(KC_ESC)) // Ctrl shift esc
-#define KC_Close RALT(KC_F4) // Alt F4
-#define KC_MEH1 MEH(KC_1)  // crtl shift alt 1
-#define KC_MEH2 MEH(KC_2)  //
-#define KC_MEH3 MEH(KC_3)  //
-#define KC_MEH4 MEH(KC_4)  //
-#define KC_MEH5 MEH(KC_5)  //
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      KC_DEL , KC_APP , KC_VOLD, KC_MUTE, KC_VOLU, KC_LGUI,                            KC_GRV , KC_MPRV, KC_MPLY, KC_MNXT, KC_DOWN, KC_ESC ,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                            KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , SE_ARNG,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,                            KC_H   , KC_J   , KC_K   , KC_L   , SE_ODIA, SE_ADIA,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , NUMPAD,          KC_ENT , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                     KC_LALT, LOWER, KC_BSPC,                     KC_SPC ,  RAISE , KC_LALT
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  ),
-
-  [_GAMING] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                            KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , 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_DEL ,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,                            KC_H   , KC_J   , KC_K   , KC_L   , SE_ODIA, KC_RCTL,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , NUMPAD,          KC_ENT , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                     KC_LALT, LOWER , KC_BSPC,                   KC_SPC , RAISE, KC_LALT
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  ),
-
- [_DVORAK] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      KC_DEL , KC_APP , KC_VOLD, KC_MUTE, KC_VOLU, KC_LGUI,                            KC_GRV , KC_MPRV, KC_MPLY, KC_MNXT, KC_DOWN, KC_ESC ,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      KC_TAB , SE_ARNG, SE_ADIA, SE_ODIA, KC_P   , KC_Y   ,                            KC_F   , KC_G   , KC_C   , KC_R   , KC_L   ,KC_DEL  ,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, KC_A   , KC_O   , KC_E   , KC_U   , KC_I   ,                            KC_D   , KC_H   , KC_T   , KC_N   , KC_S   ,KC_RCTL ,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      KC_LSFT, KC_DOT , KC_Q   , KC_J   , KC_K   , KC_X   , NUMPAD,          KC_ENT , KC_B   , KC_M   , KC_W   , KC_V   , KC_Z   ,KC_RSFT ,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                     KC_LALT, LOWER, KC_BSPC,                   KC_SPC , RAISE, KC_LALT
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  ),
-
- [_COLEMAK] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      KC_DEL , KC_APP , KC_VOLD, KC_MUTE, KC_VOLU, KC_LGUI,                            KC_GRV , KC_MPRV, KC_MPLY, KC_MNXT, KC_DOWN, KC_ESC ,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      KC_TAB , KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   ,                            KC_J   , KC_L   , KC_U   , KC_Y   , SE_ARNG, SE_ADIA,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, KC_A   , KC_R   , KC_S   , KC_T   , KC_D   ,                            KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , SE_ODIA,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , NUMPAD,          KC_ENT , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                     KC_LALT, LOWER, KC_BSPC,                   KC_SPC , RAISE, KC_LALT
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  ),
-
-
-  [_NUMPAD] = 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_MEH1, KC_BTN2, KC_MS_U, KC_BTN1, KC_CATDEL,                          KC_PIPE, KC_P7  , KC_P8  , KC_P9  , KC_SLSH, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, KC_MEH4, KC_MS_L, KC_MS_D, KC_MS_R, KC_TSKMGR,                          KC_COMM, KC_P4  , KC_P5  , KC_P6  , KC_MINS, _______,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, KC_MEH5, KC_ACL0, KC_ACL1, KC_ACL2, KC_MEH3, _______,         KC_PENT , KC_DOT , KC_P1  , KC_P2  , KC_P3  , KC_P0  , _______,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                     KC_LALT , LOWER, KC_BSPC,                  _______, RAISE, KC_NUM
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  ),
-
-
-  [_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_CAPS, KC_PGUP, KC_UP  , KC_PGDN, KC_ESC,                             KC_RCBR, KC_EXLM, KC_ASTR, KC_LPRN, KC_UNDS, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,                             KC_RPRN, KC_QUES, SE_LBRC, SE_RBRC, KC_LABK, _______,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, KC_ENT , _______, _______, _______, KC_DEL , _______,          _______, KC_RABK, SE_LABK, SE_LCBR, SE_RCBR, SE_RABK, _______,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______ 
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      SE_TILD, KC_EXLM, KC_GRV , KC_EQL , KC_DLR , KC_PERC,                            SE_PND , SE_EURO , SE_YEN, SE_RCBR, KC_RPRN, _______,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-     _______ , SE_PIPE , SE_AT , KC_HASH, KC_DQT , KC_PERC,                            KC_PIPE, KC_7   , KC_8   , KC_9   , KC_PMNS, KC_PSLS,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-     _______ , SE_BSLS, SE_TILD, SE_SLSH, KC_AMPR, KC_BSLS,                            KC_COMM, KC_4   ,  KC_5  ,  KC_6  , KC_PPLS, KC_PAST,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-     _______ , KC_PIPE, SE_CURR, KC_PLUS, KC_CIRC, KC_TILD, _______ ,        KC_PENT , KC_DOT , KC_1   , KC_2   , KC_3   , KC_0   , KC_PEQL,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                     _______ , _______ , KC_DEL  ,               _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
-      _______, GAMING , DVORAK , COLEMAK , QWERTY , QK_BOOT,                         _______, _______, _______, _______, KC_PWR,    QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,LGUI(KC_UP),_______,LALT(KC_F4),                       _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,
-  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
-      _______, _______,LGUI(KC_LEFT),LGUI(KC_DOWN),LGUI(KC_RGHT),_______,             _______,  DB_TOGG, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP,
-  //|--------+--------+--------+--------+--------+--------+--------.        ,--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //`--------+--------+--------+----+---+--------+--------+--------/        \--------+--------+--------+---+----+--------+--------+--------'
-                                      _______, _______, _______,                  _______, _______, _______
-  //                                `--------+--------+--------'                `--------+--------+--------'
-  )
-
-};
-
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {set_single_persistent_default_layer(_QWERTY);}
-      return false;
-
-    case DVORAK:
-      if (record->event.pressed) {set_single_persistent_default_layer(_DVORAK);}
-      return false;
-
-    case NUMPAD:
-      if (record->event.pressed) {layer_invert(_NUMPAD);}
-      return false;
-      
-    case COLEMAK:
-      if (record->event.pressed) {set_single_persistent_default_layer(_COLEMAK);}
-      return false;
-
-    case GAMING:
-      if (record->event.pressed) {set_single_persistent_default_layer(_GAMING);}
-      return false;
-
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/moonfall/config.h b/keyboards/keebio/iris/keymaps/moonfall/config.h
deleted file mode 100644
index ff1de19edcb..00000000000
--- a/keyboards/keebio/iris/keymaps/moonfall/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/moonfall/keymap.c b/keyboards/keebio/iris/keymaps/moonfall/keymap.c
deleted file mode 100644
index 0b6cde45e8b..00000000000
--- a/keyboards/keebio/iris/keymaps/moonfall/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-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,    KC_MINS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     RAISE,   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_DEL,           KC_ENT,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    LOWER,   KC_LALT, KC_BSPC,                   KC_SPC,  KC_LGUI, KC_LCTL
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_EQL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, KC_UP,   _______, _______, _______,                            _______, KC_PLUS, KC_EQL,  KC_TILD, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_UP,   _______,                            KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, KC_GRV, 
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_GRV,  _______, _______, _______, _______, KC_HOME,          KC_PGUP, _______, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, KC_END,                    KC_PGDN, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_EQL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, KC_UP,   _______, _______, _______,                            _______, KC_PLUS, KC_EQL,  KC_TILD, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_UP,   _______,                            KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, KC_GRV, 
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_GRV,  _______, _______, _______, _______, KC_HOME,          KC_PGUP, _______, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, KC_END,                    KC_PGDN, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/moonfall/rules.mk b/keyboards/keebio/iris/keymaps/moonfall/rules.mk
deleted file mode 100644
index db925dd2b6d..00000000000
--- a/keyboards/keebio/iris/keymaps/moonfall/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
deleted file mode 100644
index 490ca53f607..00000000000
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-// #undef RGBLED_NUM
-// #define RGBLED_NUM 18
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
deleted file mode 100644
index 570bc9cf440..00000000000
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/keymap.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright 2020 Oliver Granlund
- * 
- * 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_swedish.h"
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-
-enum custom_keycodes {
-	QWERTY = SAFE_RANGE,
-	LOWER,
-	RAISE,
-	ADJUST
-};
-
-#define KC_ KC_TRNS
-
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_ADJ ADJUST
-#define KC_RST QK_BOOT
-
-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,  KC_MINS,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-LT(_LOWER, KC_TAB),KC_Q,  KC_W, 	KC_E, 	 KC_R, 	  KC_T,                				  KC_Y,    KC_U, 	KC_I, 	 KC_O, 	  KC_P,   SE_ARNG,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	 	KC_LSFT,  KC_A, 	KC_S, 	 KC_D, 	 KC_F, 	  KC_G,         					  KC_H, 	KC_J, 	KC_K, 	  KC_L,  SE_ODIA, SE_ADIA,
-	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-	 	KC_LCTL,   KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   RAISE,           KC_BSPC,  KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_MINS,
-	//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-	                   				   KC_LGUI, KC_LALT, KC_SPC,         			 KC_ENT,  ADJUST, KC_RALT
-								  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-	),
-
-	[_LOWER] = LAYOUT(
-	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-	   SE_TILD,  KC_EXLM, SE_AT,   KC_HASH, SE_DLR, KC_PERC,                     		SE_CIRC,  SE_AMPR, SE_ASTR, SE_SLSH, SE_LPRN, SE_RPRN,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   KC_TRNS,  KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,                     		KC_TRNS,  KC_PGUP, KC_UP, KC_PGDN,   SE_LCBR, SE_RCBR,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	  KC_TRNS,  KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, SE_BSLS,                     		KC_TRNS, KC_LEFT,  KC_DOWN, KC_RGHT, SE_LBRC,  SE_RBRC,
-	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-	   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_DEL, KC_TRNS, KC_GRAVE, KC_CIRC, KC_QUOTE, SE_LABK, SE_RABK,
-	//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-	                               	   KC_TRNS, KC_TRNS, KC_TRNS,         		    KC_TRNS, KC_TRNS, KC_TRNS
-								  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-	),
-
-	[_RAISE] = LAYOUT(
-	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-	 	KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     		 KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	 	SE_GRV, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     		 KC_TRNS,  KC_7,    KC_8,    KC_9,  SE_MINS, SE_ASTR,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     		KC_TRNS,  KC_4,    KC_5,    KC_6,  SE_PLUS, SE_SLSH,
-	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-	 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_1,   KC_2,     KC_3,   KC_0,   KC_TRNS,
-	//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-	                               	   KC_TRNS, KC_TRNS, KC_TRNS,         			KC_TRNS, KC_TRNS, KC_TRNS
-								  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-	),
-
-	[_ADJUST] = LAYOUT(
-	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-	   BL_TOGG, BL_STEP, BL_BRTG, RGB_TOG, RGB_RMOD, RGB_MOD,                            _______, _______, _______, _______, _______, _______,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   BL_DOWN,_______,   BL_UP,  RGB_VAD, RGB_SAI, RGB_VAI,                            _______, _______, _______, _______, _______, _______,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI,                            _______, _______, _______, _______, _______, _______,
-	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-	   _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-	//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-									  _______, _______, _______,                   _______, _______, _______
-								  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-	)
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-	eeconfig_update_default_layer(default_layer);
-	default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-	case QWERTY:
-		if (record->event.pressed) {
-			set_single_persistent_default_layer(_QWERTY);
-		}
-		return false;
-		break;
-	case LOWER:
-		if (record->event.pressed) {
-			layer_on(_LOWER);
-			update_tri_layer(_LOWER, _RAISE, _ADJUST);
-		} else {
-			layer_off(_LOWER);
-			update_tri_layer(_LOWER, _RAISE, _ADJUST);
-		}
-		return false;
-		break;
-	case RAISE:
-		if (record->event.pressed) {
-			layer_on(_RAISE);
-			update_tri_layer(_LOWER, _RAISE, _ADJUST);
-		} else {
-			layer_off(_RAISE);
-			update_tri_layer(_LOWER, _RAISE, _ADJUST);
-		}
-		return false;
-		break;
-	case ADJUST:
-		if (record->event.pressed) {
-			layer_on(_ADJUST);
-		} else {
-			layer_off(_ADJUST);
-		}
-		return false;
-		break;
-	}
-	return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/readme.md b/keyboards/keebio/iris/keymaps/olligranlund_nordic/readme.md
deleted file mode 100644
index c929a15324a..00000000000
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Iris Nordic Layout
-### by Oliver Granlund
-
-![Finished product](https://i.imgur.com/zqSBc3t.jpg)
-
-This is for those who insist to use keyboard with ÅÄÖ. Also thought about the
-gaming aspect with this keyboard, therefore space on left side.
-
-At first I thought about having backspace in the upper right corner of the
-slave side, but that made it really clunky to fix your text. Thumbs should take
-care of this job instead.
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk b/keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk
deleted file mode 100644
index 1964bd0a7c2..00000000000
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h
deleted file mode 100644
index 5e06cb3ac39..00000000000
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#undef RGBLED_NUM
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c
deleted file mode 100644
index d2c1959dac1..00000000000
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright 2020 Oliver Granlund
- *
- * 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,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-	QWERTY = SAFE_RANGE,
-	LOWER,
-	RAISE,
-	ADJUST,
-};
-
-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,  KC_MINS,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-		KC_TAB,	 KC_Q,    KC_W, 	 KC_E, 	 KC_R, 	  KC_T,                				  KC_Y,    KC_U, 	KC_I, 	 KC_O, 	  KC_P,   KC_LBRC,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	 MO(_LOWER),  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_LALT,           KC_BSPC,  KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-	//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-	                   				   KC_LGUI, KC_LCTL, KC_SPC,         			 KC_ENT,MO(_RAISE),KC_RALT
-								  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-	),
-
-	[_LOWER] = LAYOUT(
-	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-	 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                			KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   KC_TRNS,  KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,                     		KC_TRNS,  KC_PGUP, KC_UP, KC_PGDN,   KC_TRNS, KC_RBRC,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS,                     		KC_TRNS, KC_LEFT,  KC_DOWN, KC_RGHT, KC_TRNS, KC_BSLS,
-	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-	   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_DEL, KC_TRNS, KC_GRAVE, KC_CIRC, KC_QUOTE, KC_TRNS, KC_TRNS,
-	//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-	                               	   KC_TRNS, KC_TRNS, KC_TRNS,         		    KC_TRNS, KC_TRNS, KC_TRNS
-								  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-	),
-
-	[_RAISE] = LAYOUT(
-	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-	 	KC_F12,  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,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     		 KC_TRNS,  KC_7,    KC_8,    KC_9,  KC_TRNS, KC_TRNS,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     		KC_TRNS,  KC_4,    KC_5,    KC_6,   KC_TRNS, KC_TRNS,
-	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-	 	KC_LSFT, KC_NUBS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_1,   KC_2,     KC_3,   KC_0,   KC_TRNS,
-	//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-	                               	   KC_TRNS, KC_TRNS, KC_TRNS,         			KC_TRNS, KC_TRNS, KC_TRNS
-								  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-	),
-
-	[_ADJUST] = LAYOUT(
-	//┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-	   BL_TOGG, BL_STEP, BL_BRTG, RGB_TOG, RGB_RMOD, RGB_MOD,                            _______, _______, _______, _______, _______, _______,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   BL_DOWN,_______,   BL_UP,  RGB_VAD, RGB_SAI, RGB_VAI,                            _______, _______, _______, _______, _______, _______,
-	//├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-	   _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI,                            _______, _______, _______, _______, _______, _______,
-	//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-	   _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-	//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-									  _______, _______, _______,                   _______, _______, _______
-								  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-	)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		case QWERTY:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_QWERTY);
-			}
-			return false;
-		case LOWER:
-			if (record->event.pressed) {
-				layer_on(_LOWER);
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			} else {
-				layer_off(_LOWER);
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			}
-			return false;
-		case RAISE:
-			if (record->event.pressed) {
-				layer_on(_RAISE);
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			} else {
-				layer_off(_RAISE);
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			}
-			return false;
-
-		case ADJUST:
-		if (record->event.pressed) {
-			layer_on(_ADJUST);
-		} else {
-			layer_off(_ADJUST);
-		}
-		return false;
-	}
-	return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md
deleted file mode 100644
index 82d460c756a..00000000000
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Iris Nordic Layout V2, now with VIA support
-### by Oliver Granlund
-
-![Finished product](https://i.imgur.com/Y1V9Dvpl.jpg)
-
-After my rebuild I decided on making the layout better for swapping between 60% and Iris.
-
-Still kinda buggy but should work automaticly with VIA
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/rules.mk b/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/rules.mk
deleted file mode 100644
index 545998d122d..00000000000
--- a/keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/omgvee/config.h b/keyboards/keebio/iris/keymaps/omgvee/config.h
deleted file mode 100644
index 1dc32d21194..00000000000
--- a/keyboards/keebio/iris/keymaps/omgvee/config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 15
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-//tap dance shenanigans
-#define TAPPING_TERM 200
-
-//force n-key rollover to be enabled every boot
-#define FORCE_NKRO
-
-//some mouse keys tweaking, as it is generally too slow by default
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 7
-#define MOUSEKEY_WHEEL_DELAY 0
-
-////Leader key timeout
-//#define LEADER_TIMEOUT 500
-//#define LEADER_PER_KEY_TIMING 200
-
-#undef PRODUCT
-#define PRODUCT         "Vee's Home IRIS choc keeb"
diff --git a/keyboards/keebio/iris/keymaps/omgvee/keymap.c b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
deleted file mode 100644
index 035d381baca..00000000000
--- a/keyboards/keebio/iris/keymaps/omgvee/keymap.c
+++ /dev/null
@@ -1,203 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <print.h>
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _MOUSE 3
-#define _ADJUST 4
-#define _HWCT 5
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  MOUSE,
-  ADJUST,
-  HWCT,
-};
-
-#define KC_MOUS TT(_MOUSE) // double tab toggle mouse layer
-#define KC_HWCT TT(_HWCT) // double tab toggle hardware control layer
-#define MS_L KC_MS_LEFT
-#define MS_R KC_MS_RIGHT
-#define MS_U KC_MS_UP 
-#define MS_D KC_MS_DOWN 
-#define MS_B1 KC_MS_BTN1 
-#define MS_B2 KC_MS_BTN2
-#define MW_U KC_MS_WH_UP 
-#define MW_D KC_MS_WH_DOWN 
-#define MW_L KC_MS_WH_LEFT 
-#define MW_R KC_MS_WH_RIGHT
-
-//Tap Dance Declarations
-enum {
-  TD_SCL = 0
-};
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Shift, twice for Caps Lock
-  [TD_SCL]  = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-};
-enum {
-  TD_EBT = 0
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_MOUS,          KC_HWCT, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,TD(TD_SCL),
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI,  LOWER,   KC_ENT,                    KC_SPC,  RAISE,   KC_LALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV,  _______, _______, _______, _______, _______,                            _______, _______, _______, KC_MINS, KC_EQL,  _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______,                            _______, KC_HOME, KC_END,  KC_LBRC, KC_RBRC, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, _______, _______, KC_LT,   KC_LCBR, KC_LBRC, KC_LPRN,          KC_RPRN, KC_RBRC, KC_RCBR, KC_GT,   _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                    KC_DEL, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
- 
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, KC_PGUP, _______,                            _______, _______, _______, _______, _______, KC_INS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, KC_PGDN, _______,                            KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_MENU, KC_PENT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, KC_MINS, KC_F11,           KC_F12,  KC_MINS, KC_EQL,  KC_VOLD, KC_VOLU, KC_PSCR, KC_EJCT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_MOUSE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, MS_B1,   MS_U,    MS_B2,   MW_U,    _______,                            _______, MS_B1,   MS_B2,   _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, MS_L,    MS_D,    MS_R,    MW_D,    _______,                            MS_L,    MS_D   , MS_U,    MS_R    ,_______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, MW_L,    MW_R,    _______, _______,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     BL_BRTG, _______, _______, _______, DB_TOGG, QK_BOOT,                            QK_BOOT, DB_TOGG, _______, RGB_HUI, RGB_SAI, RGB_VAI,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      BL_UP,  _______, _______, _______, _______, EE_CLR,                             EE_CLR,  _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      BL_DOWN,KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY,                            KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY, RGB_MOD,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     BL_TOGG, _______, _______, _______, _______, _______, _______,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, RGB_TOG,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_HWCT] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     BL_BRTG, _______, _______, _______, _______,   QK_BOOT,                            QK_BOOT, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      BL_UP,  _______, _______, _______, _______, _______,                            _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      BL_DOWN,KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY,                            KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY, RGB_MOD,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     BL_TOGG, _______, _______, _______, _______, _______, KC_EJCT,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, RGB_TOG,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        dprintf("Got on layer %s ", LOWER);
-        update_tri_layer(_LOWER, _RAISE, _MOUSE);
-      } else {
-        layer_off(_LOWER);
-        dprintf("Got off layer %s ", LOWER);
-        update_tri_layer(_LOWER, _RAISE, _MOUSE);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        dprintf("Got on layer %s ", RAISE);
-        update_tri_layer(_LOWER, _RAISE, _MOUSE);
-      } else {
-        layer_off(_RAISE);
-        dprintf("Got off layer %s ", RAISE);
-        update_tri_layer(_LOWER, _RAISE, _MOUSE);
-      }
-      return false;
-      break;
-    case MOUSE:
-      if (record->event.pressed) {
-        layer_on(_MOUSE);
-        dprintf("Got on layer %s ", MOUSE);
-        update_tri_layer(_LOWER, _RAISE, _MOUSE);
-      } else {
-        layer_off(_MOUSE);
-        dprintf("Got off layer %s ", MOUSE);
-        update_tri_layer(_LOWER, _RAISE, _MOUSE);
-      }
-      return false;
-      break;
-    case HWCT:
-      if (record->event.pressed) {
-        layer_on(_HWCT);
-        dprintf("Got on layer %s ", HWCT);
-        update_tri_layer(_LOWER, _RAISE, _MOUSE);
-      } else {
-        layer_off(_HWCT);
-        dprintf("Got off layer %s ", HWCT);
-        update_tri_layer(_LOWER, _RAISE, _MOUSE);
-      }
-      return false;
-      break;
-
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/omgvee/readme.md b/keyboards/keebio/iris/keymaps/omgvee/readme.md
deleted file mode 100644
index 275d270fa31..00000000000
--- a/keyboards/keebio/iris/keymaps/omgvee/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Reade.md for what I want from an Iris perfect layout
-======================================================
-
-
-![My beloved IRIS keeb](https://i.imgur.com/wgsb37e.jpg)
-
-![My beloved choc IRIS keeb](https://i.imgur.com/BgbxViq.jpg)
-=======
-
-
-- mouse keys
-- media keys and media controls
-- in-switch LED intensity controls (+/-)
-- underglow RGB hue/color controls
-- underglow RGB intensity controls
-- familiar key arrangement with Enter and symbols on the usual keys (to the right hand side)
-- navigation keys should be the vim ones really, and same ones used for mouse;
-- also have alternates on the same layer, in the form of AWSD, as well as HJKL (keep in mind the order is Left, Up, Down, Right)
-- arrow keys on one layer, however with another modifier key, they become left=home, right=end, up=page up, down=page Down
-
-
-See keymap.c for layouts
-
diff --git a/keyboards/keebio/iris/keymaps/omgvee/rules.mk b/keyboards/keebio/iris/keymaps/omgvee/rules.mk
deleted file mode 100644
index 897c6069c5c..00000000000
--- a/keyboards/keebio/iris/keymaps/omgvee/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-TAP_DANCE_ENABLE = yes
-NKRO_ENABLE = yes
-LEADER_ENABLE = no
-UNICODE_ENABLE = no
diff --git a/keyboards/keebio/iris/keymaps/osiris/config.h b/keyboards/keebio/iris/keymaps/osiris/config.h
deleted file mode 100644
index eac14a72468..00000000000
--- a/keyboards/keebio/iris/keymaps/osiris/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2019 Khader Syed
-
-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 USE_I2C
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-// #undef PERMISSIVE_HOLD
-//#define QUICK_TAP_TERM 0
-//#define RETRO_TAPPING
-#define PERMISSIVE_HOLD
diff --git a/keyboards/keebio/iris/keymaps/osiris/keymap.c b/keyboards/keebio/iris/keymaps/osiris/keymap.c
deleted file mode 100644
index 0d76268c0f1..00000000000
--- a/keyboards/keebio/iris/keymaps/osiris/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum layer_names {
-    _QWERTY,
-    _COLEMAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  LOWER,
-  RAISE
-};
-
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST  QK_BOOT
-#define KC_BL_S BL_STEP
-
-// left shift as a left key too - makes perfect sense
-#define KC_LESF LSFT_T(KC_LEFT)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     QK_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,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_BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     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_LESF, 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_RGHT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       KC_LGUI,KC_LOWR,KC_ENT ,         KC_SPC ,KC_RASE,KC_RALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-
-    [_COLEMAK] = LAYOUT(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     QK_GESC, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     KC_TAB , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  ,                KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     KC_LCTL, KC_A  , KC_R  , KC_S  , KC_T  , KC_D  ,                KC_H  , KC_N  , KC_E  , KC_I  , KC_O  ,KC_QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     KC_LESF, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_LBRC,     KC_RBRC, KC_K  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RGHT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       KC_LGUI,KC_LOWR,KC_ENT ,         KC_SPC ,KC_RASE,KC_RALT
-  //                  `----+----+----'        `----+----+----'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     KC_GRV ,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,               KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,               _______,_______,KC_BTN1,_______,_______,_______,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,               KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     _______,_______,_______,_______,_______, KC_UP ,_______,     _______,KC_DOWN,_______,_______,_______,_______,_______,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       _______,_______,_______,         _______,_______,   _______
-  //                  `----+----+----'        `----+----+----'
-
-),
-  [_RAISE] = LAYOUT(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     _______,_______,KC_VOLU,_______,_______,KC_LBRC,               KC_RBRC,KC_UNDS,KC_PLUS,_______,_______,KC_MUTE,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     _______,KC_MPLY,KC_VOLD,KC_MNXT,_______,KC_LPRN,               KC_RPRN,KC_MINS,KC_EQL ,_______,_______,_______,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,_______,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       _______,_______,_______,         _______,_______, _______
-  //                  `----+----+----'        `----+----+----'
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //,-------+-------+-------+-------+-------+-------.                          ,-------+-------+-------+-------+-------+-------.
-     _______,_______,_______,_______,_______, QWERTY,                           COLEMAK,_______,_______,_______,_______,_______,
-  //|-------+-------+-------+-------+-------+-------|                          |-------+-------+-------+-------+-------+-------|
-     _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_SAI,RGB_VAI,                           _______,_______,_______,_______,_______,_______,
-  //|-------+-------+-------+-------+-------+-------|                          |-------+-------+-------+-------+-------+-------|
-     QK_BOOT,DB_TOGG,_______,RGB_HUD,RGB_SAD,RGB_VAD,                           _______,_______,_______,_______,_______,_______,
-  //|-------+-------+-------+-------+-------+-------+-------.        ,-------|-------+-------+-------+-------+-------+-------|
-     BL_STEP,_______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,_______,
-  //`--------+-------+-------+----+--+-------+-------+-------/        \-------+-------+-------+---+---+-------+-------+-------'
-                                    _______,_______,_______,             _______,_______,_______
-  //                               `-------+-------+-------'            `-------+-------+-------'
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/osiris/readme.md b/keyboards/keebio/iris/keymaps/osiris/readme.md
deleted file mode 100644
index 58469ef164b..00000000000
--- a/keyboards/keebio/iris/keymaps/osiris/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# My Iris Layout
-
-![My Iris Rev3](https://i.imgur.com/7oXacel.jpg)
-
-- mouse keys enabled
-- includes a QWERTY and a COLEMAK layout now
-- keys that I need, while removing keys that I don't
-- more updates with the layout coming soon
-  - the enter needs to move elsewhere, not yet sure where
-- support for VIA Configurator
-
-See keymap.c for layouts
diff --git a/keyboards/keebio/iris/keymaps/osiris/rules.mk b/keyboards/keebio/iris/keymaps/osiris/rules.mk
deleted file mode 100644
index 45c570a3b66..00000000000
--- a/keyboards/keebio/iris/keymaps/osiris/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/config.h b/keyboards/keebio/iris/keymaps/radlinskii/config.h
deleted file mode 100644
index c2ea15af87e..00000000000
--- a/keyboards/keebio/iris/keymaps/radlinskii/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2022 Ignacy Radliński (@radlinskii)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// #define USE_I2C
-#define EE_HANDS
-
-#define TAPPING_TOGGLE 1 // tap just once for TT() to toggle the layer
-#define TAPPING_TERM 200
-
-#define RGBLIGHT_LAYERS
-
-#define RGBLIGHT_DEFAULT_HUE 85
-#define RGBLIGHT_DEFAULT_SAT 255
-
-#undef RGBLIGHT_DEFAULT_MODE
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
-
-#undef RGBLIGHT_EFFECT_BREATHING // fading in and out
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD // rainbow all keys at the same time
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL // rainbow top bottom
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST // red -> green -> blue
-#undef RGBLIGHT_EFFECT_ALTERNATING // blinking
-#undef RGBLIGHT_EFFECT_TWINKLE // randomly fading in and out single keys
-
-#define MOUSEKEY_DELAY 20
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_MAX_SPEED 5
-#define MOUSEKEY_TIME_TO_MAX 40
-#define MOUSEKEY_WHEEL_MAX_SPEED 10
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/keymap.c b/keyboards/keebio/iris/keymaps/radlinskii/keymap.c
deleted file mode 100644
index b7d3e8f9b87..00000000000
--- a/keyboards/keebio/iris/keymaps/radlinskii/keymap.c
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2022 Ignacy Radliński (@radlinskii)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "light_layers.h"
-
-enum my_layers {
-    _COLEMAK,
-    _QWERTY,
-    _NUM_SYM,
-    _NAV,
-    _MOUSE,
-    _MEDIA_MISC,
-};
-
-enum custom_keycodes {
-    COLEMAK = SAFE_RANGE,
-    QWERTY,
-    DEFAULT
-};
-
-#define LALT_KA LALT_T(KC_A)
-#define LCTL_KS LCTL_T(KC_S)
-#define LGUI_KD LGUI_T(KC_D)
-#define LSFT_KF LSFT_T(KC_F)
-#define RSFT_KJ RSFT_T(KC_J)
-#define RGUI_KK RGUI_T(KC_K)
-#define RCTL_KL RCTL_T(KC_L)
-#define RA_SCLN RALT_T(KC_SCLN)
-
-#define LALT_K1 LALT_T(KC_1)
-#define LCTL_K2 LCTL_T(KC_2)
-#define LGUI_K3 LGUI_T(KC_3)
-#define LSFT_K4 LSFT_T(KC_4)
-#define RSFT_K7 RSFT_T(KC_7)
-#define RGUI_K8 RGUI_T(KC_8)
-#define RCTL_K9 RCTL_T(KC_9)
-#define RALT_K0 RALT_T(KC_0)
-
-#define LCTL_KR LCTL_T(KC_R)
-#define LGUI_KS LGUI_T(KC_S)
-#define LSFT_KT LSFT_T(KC_T)
-#define RSFT_KN RSFT_T(KC_N)
-#define RGUI_KE RGUI_T(KC_E)
-#define RCTL_KI RCTL_T(KC_I)
-#define RALT_KO RALT_T(KC_O)
-
-#define LGUI_BS LGUI_T(KC_BSPC)
-#define RALT_TB RALT_T(KC_TAB)
-
-#define TT_N_S TT(_NUM_SYM)
-#define TT_NAV TT(_NAV)
-#define TO_QWRT TO(_QWERTY)
-#define TO_N_S TO(_NUM_SYM)
-#define TO_NAV TO(_NAV)
-#define TO_MOUSE TO(_MOUSE)
-#define TO_M_M TO(_MEDIA_MISC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_COLEMAK] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                               KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_CAPS, LALT_KA, LCTL_KR, LGUI_KS, LSFT_KT, KC_G,                               KC_M,    RSFT_KN, RGUI_KE, RCTL_KI, RALT_KO, KC_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_DEL,           KC_ESC,  KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_BSPC, TT_N_S,  KC_ENT,                     KC_SPC, TT_NAV,  KC_TAB
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-
-    [_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_BSPC,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_LCTL, LALT_KA, LCTL_KS, LGUI_KD, LSFT_KF, KC_G,                               KC_H,    RSFT_KJ, RGUI_KK, RCTL_KL, RA_SCLN, KC_QUOT,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DEL,           KC_ESC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    LGUI_BS, TT_N_S,  KC_ENT,                     KC_SPC, TT_NAV,  RALT_TB
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-    ),
-
-
-    [_NUM_SYM] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-       _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-       _______, LALT_K1, LCTL_K2, LGUI_K3, LSFT_K4, KC_5,                               KC_6,    RSFT_K7, RGUI_K8, RCTL_K9, RALT_K0, KC_PIPE,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______, _______, KC_GRV,  KC_LPRN, KC_LCBR, KC_LBRC, _______,          _______, KC_RBRC, KC_RCBR, KC_RPRN,  KC_MINS, KC_EQL, _______,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, DEFAULT, _______,                   _______, TO_NAV,  _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-    ),
-
-    [_NAV] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-        _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-        _______, _______, _______, _______, _______, _______,                            _______, KC_PGDN, KC_UP,   KC_PGUP, _______, _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-        _______, _______, _______, _______, _______, _______,                            KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, DEFAULT, _______,                   _______, TO_MOUSE, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-    ),
-
-    [_MOUSE] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-       _______, _______, _______, _______, _______, _______,                            _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-        _______, _______, _______, _______, _______, _______,                           KC_WH_R, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_L,  TO_M_M,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-        _______, _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, DEFAULT, KC_BTN2,                   KC_BTN1, TO_NAV,  _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-    ),
-
-    [_MEDIA_MISC] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       QK_BOOT, _______, _______, _______, _______, QWERTY,                             COLEMAK, _______, _______, _______, _______, _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-       _______, _______, _______, KC_MUTE, _______, _______,                            _______, _______, _______, _______, _______, _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_CAPS, KC_MPLY, KC_MNXT, KC_VOLU, KC_BRIU, _______,                            _______, _______, _______, _______, _______, _______,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______, KC_MSTP, KC_MPRV, KC_VOLD, KC_BRID, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                      _______, DEFAULT, _______,                   _______, DEFAULT, _______
-                                  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-    )
-};
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = MY_LIGHT_LAYERS;
-}
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(_COLEMAK, layer_state_cmp(state, _COLEMAK));
-    rgblight_set_layer_state(_QWERTY, layer_state_cmp(state, _QWERTY));
-
-    return state;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(_NUM_SYM, layer_state_cmp(state, _NUM_SYM));
-    rgblight_set_layer_state(_NAV, layer_state_cmp(state, _NAV));
-    rgblight_set_layer_state(_MOUSE, layer_state_cmp(state, _MOUSE));
-    rgblight_set_layer_state(_MEDIA_MISC, layer_state_cmp(state, _MEDIA_MISC));
-
-    return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-                layer_move(_COLEMAK);
-            }
-            return false;
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-                layer_move(_QWERTY);
-            }
-            return false;
-        case DEFAULT:
-            if (record->event.pressed) {
-                if (layer_state_cmp(default_layer_state, _COLEMAK)) {
-                    layer_move(_COLEMAK);
-                } else if (layer_state_cmp(default_layer_state, _QWERTY)) {
-                    layer_move(_QWERTY);
-                }
-            }
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/light_layers.h b/keyboards/keebio/iris/keymaps/radlinskii/light_layers.h
deleted file mode 100644
index a1b754545a4..00000000000
--- a/keyboards/keebio/iris/keymaps/radlinskii/light_layers.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2022 Ignacy Radliński (@radlinskii)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/*
-
-LED index mapping:
-
-          (31)              (32)              (33)                                    (67)              (66)              (65)
-┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-│0       │1       │2       │3       │4       │5       │                          │39      │38      │37      │36      │35      │34      │
-├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-│11      │10      │9       │8       │7       │6       │                          │40      │41      │42      │43      │44      │45      │
-├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-│12      │13      │14      │15      │16      │17      │                          │51      │50      │49      │48      │47      │46      │
-├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-│23      │22      │21      │20      │19      │18      │27      │        │61      │52      │53      │54      │55      │56      │57      │
-└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                               │24      │25      │26      │                 │60      │59      │58      │
-                               └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-          (30)              (29)              (28)                                    (62)              (63)              (64)
-
-*/
-
-const rgblight_segment_t PROGMEM COLEMAK_LIGHT_LAYER[] = RGBLIGHT_LAYER_SEGMENTS(
-    // left side
-    {0, 6, 127, 255, 255},
-    {6, 6, 115, 255, 255},
-    {12, 6, 97, 255, 255},
-    {18, 6, 90, 255, 255},
-    {24, 1, 85, 255, 255},
-    {25, 1, 169, 255, 255}, // TT(_NUM_SYM)
-    {26, 2, 85, 255, 255},
-    {28, 3, 85, 255, 255}, // underglow
-    {31, 3, 127, 255, 255}, // underglow
-    // right side
-    {34, 6, 127, 255, 255},
-    {40, 6, 115, 255, 255},
-    {46, 6, 97, 255, 255},
-    {52, 6, 90, 255, 255},
-    {58, 1, 85, 255, 255},
-    {59, 1, 201, 255, 255}, // TT(_NAV)
-    {60, 2, 85, 255, 255},
-    {62, 3, 85, 255, 255}, // underglow
-    {65, 3, 127, 255, 255} // underglow
-);
-
-const rgblight_segment_t PROGMEM QWERTY_LIGHT_LAYER[] = RGBLIGHT_LAYER_SEGMENTS(
-    // left side
-    {0, 6, 85, 0, 255},
-    {6, 6, 85, 70, 255},
-    {12, 6, 85, 150, 255},
-    {18, 6, 85, 240, 255},
-    {24, 1, 85, 255, 255},
-    {25, 1, 169, 255, 255}, // TT(_NUM_SYM)
-    {26, 2, 85, 255, 255},
-    {28, 3, 85, 255, 255}, // underglow
-    {31, 3, 85, 0, 255}, // underglow
-    // right side
-    {34, 6, 85, 0, 255},
-    {40, 6, 85, 70, 255},
-    {46, 6, 85, 150, 255},
-    {52, 6, 85, 240, 255},
-    {58, 1, 85, 255, 255},
-    {59, 1, 201, 255, 255}, // TT(_NAV)
-    {60, 2, 85, 255, 255},
-    {62, 3, 85, 255, 255}, // underglow
-    {65, 3, 85, 0, 255} // underglow
-);
-
-const rgblight_segment_t PROGMEM NUM_SYM_LIGHT_LAYER[] = RGBLIGHT_LAYER_SEGMENTS(
-    // left side
-    {0, 6, 201, 255, 255},
-    {6, 6, 191, 255, 255},
-    {12, 6, 181, 255, 255},
-    {18, 6, 171, 255, 255},
-    {24, 1, 169, 255, 255},
-    {25, 1, 85, 255, 255}, // TO(DEFAULT)
-    {26, 2, 169, 255, 255},
-    {28, 3, 169, 255, 255}, // underglow
-    {31, 3, 201, 255, 255}, // underglow
-    // right side
-    {34, 6, 201, 255, 255},
-    {40, 6, 191, 255, 255},
-    {46, 6, 181, 255, 255},
-    {52, 6, 171, 255, 255},
-    {58, 1, 169, 255, 255},
-    {59, 1, 201, 255, 255}, // TO(_NAV)
-    {60, 2, 169, 255, 255},
-    {62, 3, 169, 255, 255}, // underglow
-    {65, 3, 201, 255, 255} // underglow
-);
-
-const rgblight_segment_t PROGMEM NAV_LIGHT_LAYER[] = RGBLIGHT_LAYER_SEGMENTS(
-    // left side
-    {0, 6, 248, 255, 255},
-    {6, 6, 240, 255, 255},
-    {12, 6, 225, 255, 255},
-    {18, 6, 210, 255, 255},
-    {24, 1, 201, 255, 255},
-    {25, 1, 85, 255, 255}, // TO(DEFAULT)
-    {26, 2, 201, 255, 255},
-    {28, 3, 201, 255, 255}, // underglow
-    {31, 3, 248, 255, 255}, // underglow
-    // right side
-    {34, 6, 248, 255, 255},
-    {40, 6, 240, 255, 255},
-    {46, 6, 225, 255, 255},
-    {52, 6, 210, 255, 255},
-    {58, 1, 201, 255, 255},
-    {59, 1, 43, 255, 255}, // TO(_MOUSE)
-    {60, 2, 201, 255, 255},
-    {62, 3, 201, 255, 255}, // underglow
-    {65, 3, 248, 255, 255} // underglow
-);
-
-const rgblight_segment_t PROGMEM MOUSE_LIGHT_LAYER[] = RGBLIGHT_LAYER_SEGMENTS(
-    // left side
-    {0, 6, 4, 255, 255},
-    {6, 6, 10, 255, 255},
-    {12, 6, 25, 255, 255},
-    {18, 6, 40, 255, 255},
-    {24, 1, 43, 255, 255},
-    {25, 1, 85, 255, 255}, // TO(DEFAULT)
-    {26, 2, 43, 255, 255},
-    {28, 3, 43, 255, 255}, // underglow
-    {31, 3, 4, 255, 255}, // underglow
-    // right side
-    {34, 6, 4, 255, 255},
-    {40, 6, 10, 255, 255},
-    {46, 1, 0, 255, 255}, // TO(_MEDIA_MISC)
-    {47, 5, 25, 255, 255},
-    {52, 6, 40, 255, 255},
-    {58, 1, 43, 255, 255},
-    {59, 1, 201, 255, 255}, // TO(_NAV)
-    {60, 2, 43, 255, 255},
-    {62, 3, 43, 255, 255}, // underglow
-    {65, 3, 4, 255, 255} // underglow
-);
-
-const rgblight_segment_t PROGMEM MEDIA_MISC_LIGHT_LAYER[] = RGBLIGHT_LAYER_SEGMENTS(
-    // both sides
-    {0, 1, 0, 255, 255}, // RESET
-    {1, 4, 0, 0, 0},
-    {5, 1, 85, 0, 255}, // set QWERTY as default
-    {6, 2, 0, 0, 0},
-    {8, 1, 160, 150, 150}, // MUTE
-    {9, 3, 0, 0, 0},
-    {12, 1, 201, 255, 255}, // CAPS
-    {13, 1, 120, 255, 255}, // PLAY
-    {14, 1, 0, 255, 255}, // NEXT
-    {15, 1, 160, 255, 255}, // VOLUME_UP
-    {16, 1, 43, 255, 255}, // BRIGHTNESS_UP
-    {17, 2, 0, 0, 0},
-    {19, 1, 43, 200, 200}, // BRIGHTNESS_DOWN
-    {20, 1, 160, 220, 200}, // VOLUME_DOWN
-    {21, 1, 0, 220, 200}, // PREV
-    {22, 1, 120, 220, 200}, // STOP
-    {23, 2, 0, 0, 0},
-    {25, 1, 85, 255, 255}, // TO(DEFAULT)
-    {26, 2, 0, 0, 0},
-    {28, 6, 0, 255, 255}, // underglow
-    {34, 5, 0, 0, 0},
-    {39, 1, 127, 255, 255}, // set COLEMAK as default
-    {40, 19, 0, 0, 0},
-    {59, 1, 85, 255, 255}, // TO(DEFAULT)
-    {60, 2, 0, 0, 0},
-    {62, 6, 0, 255, 255} // underglow
-);
-
-const rgblight_segment_t* const PROGMEM MY_LIGHT_LAYERS[] = RGBLIGHT_LAYERS_LIST(
-    COLEMAK_LIGHT_LAYER,
-    QWERTY_LIGHT_LAYER,
-    NUM_SYM_LIGHT_LAYER,
-    NAV_LIGHT_LAYER,
-    MOUSE_LIGHT_LAYER,
-    MEDIA_MISC_LIGHT_LAYER
-);
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/readme.md b/keyboards/keebio/iris/keymaps/radlinskii/readme.md
deleted file mode 100644
index 5a0e929991f..00000000000
--- a/keyboards/keebio/iris/keymaps/radlinskii/readme.md
+++ /dev/null
@@ -1,137 +0,0 @@
-# Iris rev. 6 keymap by radlinskii
-
-![iris rev. 6 by radlinskii lightning demo](https://user-images.githubusercontent.com/26116041/171883033-3c5ababe-88ae-4c9d-8436-3d6ab83dbf4b.gif)
-
-## Features:
-
--   [RGB Lightning layers](https://docs.qmk.fm/#/feature_rgblight?id=lighting-layers)
--   [MOUSE KEYS](https://docs.qmk.fm/#/keycodes?id=mouse-keys)
--   [MOD-TAPS](https://docs.qmk.fm/#/mod_tap)
-
-## Layers:
-
-### colemak - default
-
-> [Colemak DH](https://colemakmods.github.io/mod-dh/) keyboard layout.
-
-<details>
-    <summary>
-        keymap
-    </summary>
-
-<img width="800" alt="colemak layer keymap" src="https://user-images.githubusercontent.com/26116041/173403537-f2222651-c8ea-4c8b-b828-97520a222344.png">
-
-</details>
-<details>
-    <summary>
-        lightning
-    </summary>
-
-
-<img width="800" alt="colemak layer lightning" src="https://user-images.githubusercontent.com/26116041/173681398-cdcff1a5-ae79-4409-950a-1b671c350f07.jpeg">
-
-</details>
-
-### qwerty - alternative default
-
-> Can be set as persistent default layer.
-
-<details>
-    <summary>
-        keymap
-    </summary>
-
-<img width="800" alt="qwerty layer keymap" src="https://user-images.githubusercontent.com/26116041/173403371-1551976a-2f95-4dbd-ba07-96936651871d.png">
-
-</details>
-<details>
-    <summary>
-        lightning
-    </summary>
-
-<img width="800" alt="qwerty layer lightning" src="https://user-images.githubusercontent.com/26116041/173681525-aee3c927-995a-4f83-b688-ed8bfd3f8bb6.jpeg">
-
-</details>
-
-### numeric + symbols
-
-<details>
-    <summary>
-        keymap
-    </summary>
-
-<img width="800" alt="numeric and symbols layer keymap" src="https://user-images.githubusercontent.com/26116041/173403164-b0520501-761b-4567-bf04-57f7b6f7dd4d.png">
-
-</details>
-<details>
-    <summary>
-        lightning
-    </summary>
-
-<img width="800" alt="numeric and symbols layer lightning" src="https://user-images.githubusercontent.com/26116041/173681689-0b864e35-0e02-4204-a469-6e872e704903.jpeg">
-
-</details>
-
-### navigation
-
-> Layer with arrow navigation.
-
-<details>
-    <summary>
-        keymap
-    </summary>
-
-<img width="800" alt="navigation layer keymap" src="https://user-images.githubusercontent.com/26116041/173408142-1e1c297e-57db-42f8-bc18-a04dd4e202c9.png">
-
-</details>
-<details>
-    <summary>
-        lightning
-    </summary>
-
-<img width="800" alt="navigation layer lightning" src="https://user-images.githubusercontent.com/26116041/173681859-fa6f071a-98e9-48f8-a9a0-76d7510b302a.jpeg">
-
-</details>
-
-### mouse
-
-> Layer with mouse navigation on the same keys as arrow navigation.
-
-<details>
-    <summary>
-        keymap
-    </summary>
-
-<img width="800" alt="mouse layer keymap" src="https://user-images.githubusercontent.com/26116041/173402955-050ffd77-7b60-45dc-8e89-54cd43793132.png">
-
-</details>
-<details>
-    <summary>
-        lightning
-    </summary>
-
-<img width="800" alt="mouse layer lightning" src="https://user-images.githubusercontent.com/26116041/173682436-07c32e5e-f415-463d-8c93-d2cbd4e406a1.jpeg">
-
-</details>
-
-### media and miscellaneous
-
-> Used for media keys, switching default layer and keyboard reset.
-
-<details>
-    <summary>
-        keymap
-    </summary>
-
-<img width="800" alt="media and miscellaneous layer keymap" src="https://user-images.githubusercontent.com/26116041/173402837-75ce8ab1-7fbe-454b-b165-b22d171f9ad1.png">
-
-</details>
-<details>
-    <summary>
-        lightning
-    </summary>
-
-<img width="800" alt="media and miscellaneous layer lightning" src="https://user-images.githubusercontent.com/26116041/173682188-3eab9c09-d466-4729-89ac-48e09f55564c.jpeg">
-
-</details>
-
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/rules.mk b/keyboards/keebio/iris/keymaps/radlinskii/rules.mk
deleted file mode 100644
index f1a0d40690c..00000000000
--- a/keyboards/keebio/iris/keymaps/radlinskii/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes # by default this is no, but for the rgb light layers to work it needs to be `yes`
-RGB_MATRIX_ENABLE = no # by default this is yes, but for the rgb light layers to work it needs to be `no`
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/config.h b/keyboards/keebio/iris/keymaps/sq5rix/config.h
deleted file mode 100644
index 59004bfa8ab..00000000000
--- a/keyboards/keebio/iris/keymaps/sq5rix/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 EE_HANDS
-#define TAPPING_TERM 164
-#define PERMISSIVE_HOLD
-#define RGBLIGHT_LAYERS
-#define ENCODER_RESOLUTION 4
-#define ENCODER_DEFAULT_POS 0x3
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
deleted file mode 100644
index 74e1dcd531b..00000000000
--- a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2021 Tomasz Wawer (@sq5rix)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _BEAKL15,
-    _LOWER,
-    _RAISE,
-    _MOUSE
-};
-
-enum custom_keycodes {
-   LT_DAT = SAFE_RANGE,
-   LT_COM,
-   LT_QUOT
-};
-
-#define LOWER  LT(_LOWER, KC_ENT)
-#define LOWER2 LT(_LOWER, KC_T)
-#define RAISE  LT(_RAISE, KC_SPC)
-#define RAISE2 LT(_RAISE, KC_BSPC)
-#define MOUSE  LT(_MOUSE, KC_A)
-
-#define SH_ESC MT(MOD_LSFT, KC_ESC)
-#define SH_CWD MT(MOD_LALT, KC_BSPC)
-#define SH_LTAB MT(MOD_LALT, KC_TAB)
-#define SH_UND MT(MOD_LCTL, KC_UNDS)
-#define SH_Z MT(MOD_LCTL, KC_Z)
-
-#define SH_LGS MT(MOD_LGUI, KC_B)
-#define AL_I ALGR_T(KC_I)
-#define AL_N ALGR_T(KC_N)
-
-// Tap Dance definitions
-enum {
-    TD_S
-};
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_S] = ACTION_TAP_DANCE_DOUBLE(KC_S, KC_Z),
-};
-
-bool sh_key(keyrecord_t *record, uint8_t sk, uint8_t nk);
-bool sh_key8(keyrecord_t *record, uint8_t sk, uint8_t nk);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [_BEAKL15] = LAYOUT(
-  TG(_RAISE),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-     SH_LTAB,  KC_Q,    KC_H,    KC_O,    KC_U,    KC_X,                               KC_G,    KC_C,    KC_R,    KC_F,    KC_Z,    KC_LGUI,
-     SH_UND,   KC_Y,    AL_I,    KC_E,    MOUSE,   LT_DAT,                             KC_D,    TD(TD_S),LOWER2,  AL_N,    KC_B,    KC_SCLN,
-     KC_LSFT,  KC_J,    KC_SLSH, LT_COM,  KC_K,    LT_QUOT, RGB_TOG,          BL_TOGG, KC_W,    KC_M,    KC_L,    KC_P,    KC_V,    KC_RSFT,
-                                       SH_Z, LOWER, RAISE,                      SH_ESC,  RAISE2, SH_LTAB
-  ),
-
-  [_LOWER] = LAYOUT(
-     _______, _______, _______, _______, _______, _______,                             _______, _______, _______, _______, _______, _______,
-     _______, _______, KC_LT,   KC_DLR,  KC_GT,   KC_EXLM,                             _______, KC_LBRC, KC_UNDS, KC_RBRC, KC_EXLM, _______,
-     _______, KC_BSLS, KC_LPRN, KC_DQUO, KC_RPRN, KC_HASH,                             KC_PERC, KC_LCBR, KC_EQL,  KC_RCBR, KC_PIPE, _______,
-     _______, KC_SCLN, KC_SLSH, KC_ASTR, KC_PLUS,  _______, _______,          _______, _______, KC_AMPR, KC_CIRC, KC_TILD, KC_SCLN, _______,
-                                    _______, _______, _______,                    _______, _______, _______
-
-  ),
-
-  [_RAISE] = LAYOUT(
-     _______,  KC_VOLD, KC_VOLU, KC_MUTE, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP,    KC_PSCR,    _______, _______, _______, _______, QK_BOOT,
-     _______,  KC_SLSH, KC_6,    KC_5,    KC_4,    KC_EQL,                            KC_CIRC, KC_PGUP, KC_UP,   KC_PGDN, _______, RGB_VAI,
-     _______,  KC_3,    KC_2,    KC_1,    KC_0,    KC_DOT,                            KC_EQL,  KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-     _______,  KC_ASTR, KC_9,    KC_8,    KC_7,    KC_PLUS,  _______,        _______, KC_PLUS, KC_HOME, KC_COLN, KC_END,  _______, RGB_MOD,
-                                    _______, _______, _______,                    _______, _______, _______
-  ),
-
-  [_MOUSE] = LAYOUT(
-     _______, _______, _______, _______, _______, _______,                             _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______,                             _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______,
-     _______, _______, _______, KC_BTN1, _______, _______,                             _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, KC_BTN3, _______, _______, _______,
-                                    _______, _______, _______,                    _______, _______, _______
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LT_DAT:
-      return sh_key8(record, KC_2, KC_DOT);
-    case LT_COM:
-      return sh_key8(record, KC_1, KC_COMM);
-    case LT_QUOT:
-      return sh_key(record, KC_GRV, KC_QUOT);
-    default:
-      return true;
-  }
-}
-
-bool sh_key(keyrecord_t *record, uint8_t sk, uint8_t nk){
-      if (record->event.pressed) {
-        if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT)){
-           unregister_code(KC_LSFT);
-           unregister_code(KC_RSFT);
-           register_code(sk);
-        } else {
-           register_code(nk);
-        }
-      }
-      else {
-           unregister_code16(sk);
-           unregister_code(nk);
-      }
-      return false;
-}
-
-bool sh_key8(keyrecord_t *record, uint8_t sk, uint8_t nk){
-      if (record->event.pressed) {
-        if (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT)){
-           register_code(sk);
-        } else {
-           register_code(nk);
-        }
-      }
-      else {
-           unregister_code(sk);
-           unregister_code(nk);
-      }
-      return false;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code16(C(G(KC_LEFT)));
-        } else {
-            tap_code16(C(G(KC_RGHT)));
-        }
-    }
-    // tmux screen
-    else if (index == 1) {
-        switch(get_highest_layer(layer_state)){
-             case 0:
-                if (clockwise) {
-                    send_string(SS_LCTL("B")"p");
-                } else {
-                    send_string(SS_LCTL("B")"n");
-                }
-                break;
-             case _RAISE:
-                if (clockwise) {
-                    tap_code16(C(G(KC_PGUP)));
-                } else {
-                    tap_code16(C(G(KC_PGDN)));
-                }
-                break;
-        }
-    }
-    return true;
-}
-
-const rgblight_segment_t PROGMEM raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {1, 12, HSV_RED}
-);
-const rgblight_segment_t PROGMEM lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {1, 12, HSV_BLUE}
-);
-const rgblight_segment_t PROGMEM mouse_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {1, 12, HSV_GREEN}
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    lower_layer,
-    raise_layer,
-    mouse_layer
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(1, layer_state_cmp(state, 3));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 4));
-    return state;
-}
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/readme.md b/keyboards/keebio/iris/keymaps/sq5rix/readme.md
deleted file mode 100644
index 96370c74cd1..00000000000
--- a/keyboards/keebio/iris/keymaps/sq5rix/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-BEAKL-15 keymap for keebio iris
-@sq5rix tom wawer
-https://deskthority.net/wiki/BEAKL#BEAKL_15
-
-Modern keyboard map easy to learn
-very effective to type
-
-esc  F1 F2 F3 F4 F5      F6 F7 F8 F9 F10 Del
-      q  h  o  u  x       g  c  r  f  z
-  -   y  i  e  a  .       d  s  t  n  b  ;
-      j  /  ,  ,  k       w  m  l  p  v
-
-		  z enter space  esc bkspc tab
-
-lots of special functions
-three layers with puncs, numbers and mouse
-
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/rules.mk b/keyboards/keebio/iris/keymaps/sq5rix/rules.mk
deleted file mode 100644
index 3fc2bd9768c..00000000000
--- a/keyboards/keebio/iris/keymaps/sq5rix/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-LTO_ENABLE = yes
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/thattolleyguy/config.h b/keyboards/keebio/iris/keymaps/thattolleyguy/config.h
deleted file mode 100644
index e0ea5e6e257..00000000000
--- a/keyboards/keebio/iris/keymaps/thattolleyguy/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Tyler Tolley <thattolleyguy@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 USE_I2C
-#define EE_HANDS
-#define NO_DEBUG
-#define NO_PRINT
-#define BACKLIGHT_BREATHING
diff --git a/keyboards/keebio/iris/keymaps/thattolleyguy/keymap.c b/keyboards/keebio/iris/keymaps/thattolleyguy/keymap.c
deleted file mode 100644
index 77c7dd06517..00000000000
--- a/keyboards/keebio/iris/keymaps/thattolleyguy/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-Copyright 2021 Tyler Tolley <thattolleyguy@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 iris_layers {
-  _COLEMAK,
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-};
-
-enum custom_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  NUMPAD,
-  RGB_SPDU,
-  RGB_SPDD
-};
-
-#define L_LOWER MO(_LOWER)
-#define L_RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_COLEMAK] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                               KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                               KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_GRV,           KC_DEL,  KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI, L_LOWER, KC_ENT,                    KC_SPC,  L_RAISE, KC_RALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-
-  [_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_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     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_GRV,           KC_DEL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI, L_LOWER, KC_ENT,                    KC_SPC,  L_RAISE, KC_RALT
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-
-  [_LOWER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX, KC_VOLU, KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,                            BL_BRTG, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_VOLD, RGB_M_SW,RGB_TOG, XXXXXXX, XXXXXXX,                            BL_TOGG, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, RGB_SPDU,                           BL_UP,   KC_P4,   KC_P5,   KC_P6,   KC_EQL,  KC_PSCR,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,RGB_SPDD,_______,          _______, BL_DOWN, KC_P1,   KC_P2,   KC_P3,   KC_PDOT, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, L_RAISE, KC_P0
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX, COLEMAK, DM_REC1, KC_UP,   DM_REC2, XXXXXXX,                            XXXXXXX, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_UNDS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, QWERTY,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGUP,                            KC_INS,  KC_HOME, KC_PPLS, KC_MINS, KC_TILD, KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, DF(2),   DM_PLY1, XXXXXXX, DM_PLY2, KC_PGDN, XXXXXXX,          XXXXXXX, KC_DEL,  KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   XXXXXXX, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-   case RGB_SPDD:
-      if (record->event.pressed) {
-         rgblight_decrease_speed();
-      }
-      return false;
-   case RGB_SPDU:
-      if (record->event.pressed) {
-         rgblight_increase_speed();
-      }
-      return false;
-  }
-  return true;
-}
-
diff --git a/keyboards/keebio/iris/keymaps/thattolleyguy/rules.mk b/keyboards/keebio/iris/keymaps/thattolleyguy/rules.mk
deleted file mode 100644
index c84235c923e..00000000000
--- a/keyboards/keebio/iris/keymaps/thattolleyguy/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-DYNAMIC_MACRO_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/keebio/iris/keymaps/two_knob/config.h b/keyboards/keebio/iris/keymaps/two_knob/config.h
deleted file mode 100644
index 83b0fcfc44b..00000000000
--- a/keyboards/keebio/iris/keymaps/two_knob/config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2022 Ryan Neff (@JellyTitan)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define EE_HANDS
-
-/* Turn off RGB light when host is asleep. (Doesn't seem to work for mac)? */
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_LAYERS
-/* Decrease decay of heatmap rgb effect */
-#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
-/* If you're setting colors per key, this is required. */
-#define SPLIT_LAYER_STATE_ENABLE
-
-/* Set tapdance speed */
-#define TAPPING_TERM 210
-
-/* Allows for the setting of constant mouse speed levels. */
-/* Delay between pressing a movement key and cursor movement */
-#define MOUSEKEY_DELAY 10
-/* Time between cursor movements in milliseconds */
-#define MOUSEKEY_INTERVAL 16
-/* Step size */
-#define MOUSEKEY_MOVE_DELTA 8
-/* Maximum cursor speed at which acceleration stops */
-#define MOUSEKEY_MAX_SPEED 2
-/* Time until maximum cursor speed is reached */
-#define MOUSEKEY_TIME_TO_MAX 40
-/* Maximum number of scroll steps per scroll action */
-#define MOUSEKEY_WHEEL_MAX_SPEED 42
-/* Time until maximum scroll speed is reached */
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 15
-
-// Tweak how the mouse cursor moves. https://docs.qmk.fm/#/feature_mouse_keys
-// Accelerated mode (default).
-// MOUSEKEY_DELAY  10  Delady between pressing a movement key and cursor movement
-// MOUSEKEY_INTERVAL 20  Time between cursor movements in milliseconds
-// MOUSEKEY_MOVE_DELTA 8 Step size
-// MOUSEKEY_MAX_SPEED  10  Maximum cursor speed at which acceleration stops
-// MOUSEKEY_TIME_TO_MAX  30  Time until maximum cursor speed is reached
-// MOUSEKEY_WHEEL_DELAY  10  Delay between pressing a wheel key and wheel movement
-// MOUSEKEY_WHEEL_INTERVAL 80  Time between wheel movements
-// MOUSEKEY_WHEEL_MAX_SPEED  8 Maximum number of scroll steps per scroll action
-// MOUSEKEY_WHEEL_TIME_TO_MAX  40  Time until maximum scroll speed is reached
-
-// Kinetic mode, alternate to the default mode.
-// MK_KINETIC_SPEED  undefined Enable kinetic mode
-// MOUSEKEY_DELAY  5 Delay between pressing a movement key and cursor movement
-// MOUSEKEY_INTERVAL 10  Time between cursor movements in milliseconds
-// MOUSEKEY_MOVE_DELTA 5 Step size for accelerating from initial to base speed
-// MOUSEKEY_INITIAL_SPEED  100 Initial speed of the cursor in pixel per second
-// MOUSEKEY_BASE_SPEED 1000  Maximum cursor speed at which acceleration stops
-// MOUSEKEY_DECELERATED_SPEED  400 Decelerated cursor speed
-// MOUSEKEY_ACCELERATED_SPEED  3000  Accelerated cursor speed
-// MOUSEKEY_WHEEL_INITIAL_MOVEMENTS  16  Initial number of movements of the mouse wheel
-// MOUSEKEY_WHEEL_BASE_MOVEMENTS 32  Maximum number of movements at which acceleration stops
-// MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS  48  Accelerated wheel movements
-// MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS  8 Decelerated wheel movements
diff --git a/keyboards/keebio/iris/keymaps/two_knob/keymap.c b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
deleted file mode 100644
index f40392ba1ee..00000000000
--- a/keyboards/keebio/iris/keymaps/two_knob/keymap.c
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright 2022 Ryan Neff (@JellyTitan)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-/* Defines macros for use with the configurators "Any" key. (These are non-standard macros). */
-/* Move active application right half. */
-#define KC_CSGRA LCTL(LSFT(LGUI(KC_RGHT)))
-/* Move active application to left half. */
-#define KC_CSGLA LCTL(LSFT(LGUI(KC_LEFT)))
-/* Maximize active application. */
-#define KC_MAXIM LCTL(LSFT(LGUI(KC_UP)))
-/* Minimize active application. */
-#define KC_MINIM LCTL(LSFT(LGUI(KC_DOWN)))
-
-/* Rotary encoder variables used to hold down Command (GUI) key while cycling through open programs. */
-bool is_cmd_tab_active = false;
-uint16_t cmd_tab_timer = 0;
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    ADJUST,
-    CMD_TAB_CW,
-    CMD_TAB_CCW,
-};
-
-/**
- * Tap Dance declarations
- */
-enum tapdances {
-    _TD_FIVE_ENTER,
-};
-
-/* Tapdance */
-#define TD_FIVE_ENTER TD(_TD_FIVE_ENTER)
-
-/**
- * Tap Dance definitions
- *
- * NOTE - if your not using tapdance, comment out:
- * TAP_DANCE_ENABLE = yes in rules.mk
- * define TAPPING_TERM 175 in config.h
- * else you'll get a compile error.
- *
- * To use this in the configurator, enter the name 'TD_FIVE_ENTER' in the "Any" key.
- */
-tap_dance_action_t tap_dance_actions[] = {
-    /* Tap once for 5, twice for Enter. */
-    [_TD_FIVE_ENTER] = ACTION_TAP_DANCE_DOUBLE(KC_5, KC_ENT),
-};
-
-/**
- * Keymap. Generated via configurator.
- *
- * You can download/upload the two_know.json to the configurator:
- * https://config.qmk.fm/#/keebio/iris/rev6a/LAYOUT
- *
- * If you make changes and download the json, you can run qmk json2c two_knob.json to get converted text.
- * You can copy and paste it here.
- * You will have to reneame the array keys from ints to the custom keycode names.
- *
- * The rotary encoders are programmed manually below because the configurator does not support them yet.
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(KC_EQL, KC_1, KC_2, KC_3, KC_4, TD_FIVE_ENTER, 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_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, LT(1, KC_DEL), LT(2, KC_A), LCTL_T(KC_S), KC_D, LGUI_T(KC_F), KC_G, KC_H, RGUI_T(KC_J), KC_K, RCTL_T(KC_L), LT(2, KC_SCLN), LT(1, KC_QUOT), SC_LSPO, LALT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_MINIM, KC_MAXIM, KC_N, KC_M, KC_COMM, KC_DOT, RALT_T(KC_SLSH), SC_RSPC, QK_GESC, KC_SPC, KC_BSPC, KC_TAB, KC_ENT, KC_DEL),
-    [_LOWER]  = LAYOUT(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_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, DT_PRNT, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, DT_UP, KC_4, KC_5, KC_6, KC_PPLS, KC_TRNS, KC_TRNS, KC_HASH, KC_DLR, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS, KC_TRNS, DT_DOWN, KC_1, KC_2, KC_3, KC_PSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0),
-    [_RAISE]  = LAYOUT(RGB_TOG, KC_ACL0, KC_ACL1, KC_ACL2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_UP, KC_BTN2, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_CSGLA, KC_CSGRA, KC_TRNS, KC_TRNS),
-    [_ADJUST] = LAYOUT(
-        //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-        _______, _______, _______, _______, _______, _______
-        // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case CMD_TAB_CW:
-            if (record->event.pressed) {
-                if (!is_cmd_tab_active) {
-                    is_cmd_tab_active = true;
-                    register_code(KC_LGUI);
-                }
-                cmd_tab_timer = timer_read();
-                register_code(KC_TAB);
-            } else {
-                unregister_code(KC_TAB);
-            }
-            break;
-        case CMD_TAB_CCW:
-            if (record->event.pressed) {
-                if (!is_cmd_tab_active) {
-                    is_cmd_tab_active = true;
-                    register_code(KC_LGUI);
-                }
-                cmd_tab_timer = timer_read();
-                tap_code16(S(KC_TAB));
-            } else {
-                unregister_code(KC_TAB);
-            }
-            break;
-    }
-    return true;
-}
-
-/**
- * Define lighting layers.
- *
- * Iris rev6a uses WS2812 RGB Matrix lighting.
- * The RGB Matrix lighting option has already been enabled in ../../rev6a/config.h
- * You'll need to add #define SPLIT_LAYER_STATE_ENABLE to config.h if you
- * will be customizing the LED's per key.
- *
- * Here's how to customize the colors per layer and per key:
- * https://github.com/qmk/qmk_firmware/blob/master/docs/feature_rgb_matrix.md#direct-operation-iddirect-operation
- *
- * If you start getting real weird with it, your likely to exceed the firmware limit of 28672.
- * You may need to selectively disable some effects:
- * https://github.com/qmk/qmk_firmware/blob/master/docs/feature_rgb_matrix.md#rgb-matrix-effects-idrgb-matrix-effects
- *
- * There are 68 Leds. Printed on the board itself, the led numbers are 1-68.
- * For color addressing, use 0-67 as the index number.
- * rgb_matrix_set_color(index, r, g, b)
- *
- * Here's an LED number guide:
- * FRONT
- * Left Hand                    Right Hand
- * |00|01|02|03|04|05|          |39|38|37|36|35|34|
- * |11|10|09|08|07|06|          |40|41|42|43|44|45|
- * |12|13|14|15|16|17|          |51|50|49|48|47|46|
- * |23|22|21|20|19|18|27|    |61|52|53|54|55|56|57|
- *             |24|25|26|    |60|59|58|
- * REVERSE
- * Right Hand                   Left Hand
- * |65|--|--|66|--|67|          |33|--|32|--|--|31|
- * |--|--|--|--|--|--|          |--|--|--|--|--|--|
- * |--|--|--|--|--|--|          |--|--|--|--|--|--|
- * |64|--|--|63|--|--|--|    |--|--|--|29|--|--|30|
- *             |--|62|--|    |--|28|--|
- */
-// bool rgb_matrix_indicators_user(void) {
-//   if (IS_LAYER_ON(1)) {
-//     /* Upperleft most key red: */
-//     rgb_matrix_set_color(0,255,0,0);
-//     /* Upperright most front key blue: */
-//     rgb_matrix_set_color(0,0,255,0);
-//     /* Bottom right on lefthand Green: */
-//     rgb_matrix_set_color(0, RGB_GREEN);
-//   }
-//   else if (IS_LAYER_ON(2)) {
-//     /* RGB +/- controls. */
-//     rgb_matrix_set_color(35, RGB_RED);
-//     rgb_matrix_set_color(34, RGB_BLUE);
-//     rgb_matrix_set_color(37, RGB_RED);
-//     rgb_matrix_set_color(36, RGB_BLUE);
-//     rgb_matrix_set_color(44, RGB_RED);
-//     rgb_matrix_set_color(45, RGB_BLUE);
-//     rgb_matrix_set_color(47, RGB_RED);
-//     rgb_matrix_set_color(46, RGB_BLUE);
-//     rgb_matrix_set_color(56, RGB_RED);
-//     rgb_matrix_set_color(57, RGB_BLUE);
-//     /* RGB Toggle. */
-//     rgb_matrix_set_color(00, RGB_PURPLE);
-//     /* Move screen left/right. */
-//     rgb_matrix_set_color(26, RGB_YELLOW);
-//     rgb_matrix_set_color(60, RGB_YELLOW);
-//     /* Arrow keys. */
-//     rgb_matrix_set_color(50, RGB_PURPLE);
-//     rgb_matrix_set_color(49, RGB_PURPLE);
-//     rgb_matrix_set_color(48, RGB_PURPLE);
-//     rgb_matrix_set_color(42, RGB_PURPLE);
-//     /* Mouse movement arrows. */
-//     rgb_matrix_set_color(14, RGB_ORANGE);
-//     rgb_matrix_set_color(15, RGB_ORANGE);
-//     rgb_matrix_set_color(16, RGB_ORANGE);
-//     rgb_matrix_set_color(8, RGB_ORANGE);
-//     /* Mouse buttons. */
-//     rgb_matrix_set_color(41, RGB_ORANGE);
-//     rgb_matrix_set_color(43, RGB_ORANGE);
-//     /* Mouse acceleration. */
-//     rgb_matrix_set_color(01, 200, 165, 0);
-//     rgb_matrix_set_color(02, 255, 200, 0);
-//     rgb_matrix_set_color(03, 255, 235, 0);
-//   }
-//    return false;
-// }
-
-/**
- * Rotary Encoder.
- *
- * This can't be programmed through configurator. You must do it here.
- *
- * This uses the amazing "Encoder map" feature which replicates the normal keyswitch layer handling functionality, but with encoders.
- * https://docs.qmk.fm/#/feature_encoders?id=encoder-map
- *
- * Uses a variant of the Super-alt-tab macro to switch between open applications on a mac. (Command-tab)
- * https://docs.qmk.fm/#/feature_macros?id=super-alt%e2%86%aftab
- */
-#if defined(ENCODER_MAP_ENABLE)
-    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-        /* Left Hand */                                                     /* Right Hand */
-        /* Switch between tabs. (Control + Tab). */                         /* Switch between open apps on Mac. (Command + Tab + timer logic) */
-        [_QWERTY] =  { ENCODER_CCW_CW(S(C(KC_TAB)), C(KC_TAB)),             ENCODER_CCW_CW(CMD_TAB_CCW, CMD_TAB_CW)  },
-        /* Scrolls left & right. (Shift + Mouse Wheel Up). */               /* Scrolls up and down. (Page Down & Page Up - mouse wheel scroll incraments are too small) */
-        [_LOWER] =  { ENCODER_CCW_CW(S(KC_MS_WH_UP), S(KC_MS_WH_DOWN)),     ENCODER_CCW_CW(KC_PGDN, KC_PGUP)  },
-        /* Selects adjacent words. (Command + Shift + Right Arrow). */      /* Jumps to end/start of line. Hold shift to select. (Gui + arrow). */
-        [_RAISE] =  { ENCODER_CCW_CW(C(S(KC_LEFT)), C(S(KC_RGHT))),         ENCODER_CCW_CW(G(KC_LEFT), G(KC_RGHT))  },
-        /* Scroll through RGB Modes */                                      /* Right & left arrow */
-        [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD),                    ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
-    };
-#endif
-
-
-/**
- * Helper function for rotary encoder.
- *
- * If the timer has elapsed, the Command/Gui tab will be released.
- * You can adjust the milliseconds to speed up the CMD key release.
- */
-void matrix_scan_user(void) {
-    if (is_cmd_tab_active) {
-        if (timer_elapsed(cmd_tab_timer) > 900) {
-            unregister_code(KC_LGUI);
-            is_cmd_tab_active = false;
-        }
-    }
-}
diff --git a/keyboards/keebio/iris/keymaps/two_knob/readme.md b/keyboards/keebio/iris/keymaps/two_knob/readme.md
deleted file mode 100644
index 728650fcb90..00000000000
--- a/keyboards/keebio/iris/keymaps/two_knob/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Two Knob Keymap for Iris Rev6a
-![two_knobs](https://i.imgur.com/JqGPWCn.png)
-
-This keymap is derived from Ergodox layouts and is adapted for the [Iris6a](https://docs.keeb.io/iris-rev6-build-guide). It is notable for it's semi-complex programming examples that include the use of rotary encoders.
-
-Plenty of useful examples:
-* Advanced knob programming! (Three-layer usage + clicks)
-* Advanced RGB! (Per-key lighting)
-* Macros! (Fancy key combos tied to the rotary encoders)
-* Tap Dance! (Double tap your '5' key for 'Enter')
-* Dynamic Tapping term! (Dial in the double tap speed)
-
-The qwerty key layout is my adaptation of the ergodox defaults. If this is your first split keyboard, you probably want a different key layout. 
-
-I stopped using the fancy RGB programming pretty quickly. It was a complex to get working initially, so I'm leaving the examples here for others. (As a touch typist - not terribly helpful, but it looks nice). YMMV.
diff --git a/keyboards/keebio/iris/keymaps/two_knob/rules.mk b/keyboards/keebio/iris/keymaps/two_knob/rules.mk
deleted file mode 100644
index dd49f77547d..00000000000
--- a/keyboards/keebio/iris/keymaps/two_knob/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2022 Ryan Neff (@JellyTitan)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# Turn on mouse:
-MOUSEKEY_ENABLE = yes
-# Turn on tap dance:
-TAP_DANCE_ENABLE = yes
-# Dynamic Tapping Term:
-DYNAMIC_TAPPING_TERM_ENABLE = yes
-# Replicates the normal keyswitch layer handling functionality, but with encoders:
-ENCODER_MAP_ENABLE = yes
-# Console for debug:
-# This is enabled by the parent iris rev6a config - turning it off saves us some space.
-# You can find the other iris default options here:  keyboards/keebio/iris/rev6a/rules.mk
-CONSOLE_ENABLE = no
diff --git a/keyboards/keebio/iris/keymaps/two_knob/two_knob.json b/keyboards/keebio/iris/keymaps/two_knob/two_knob.json
deleted file mode 100644
index fd1f7b8c42f..00000000000
--- a/keyboards/keebio/iris/keymaps/two_knob/two_knob.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-  "version": 1,
-  "notes": "Based on legacy Ergodox layouts.",
-  "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-  "keyboard": "keebio/iris/rev6a",
-  "keymap": "two_knob",
-  "layout": "LAYOUT",
-  "layers": [
-    [
-      "KC_EQL",
-      "KC_1",
-      "KC_2",
-      "KC_3",
-      "KC_4",
-      "ANY(TD_FIVE_ENTER)",
-      "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_Y",
-      "KC_U",
-      "KC_I",
-      "KC_O",
-      "KC_P",
-      "KC_BSLS",
-      "LT(1,KC_DEL)",
-      "LT(2,KC_A)",
-      "LCTL_T(KC_S)",
-      "KC_D",
-      "LGUI_T(KC_F)",
-      "KC_G",
-      "KC_H",
-      "RGUI_T(KC_J)",
-      "KC_K",
-      "RCTL_T(KC_L)",
-      "LT(2,KC_SCLN)",
-      "LT(1,KC_QUOT)",
-      "SC_LSPO",
-      "LALT_T(KC_Z)",
-      "KC_X",
-      "KC_C",
-      "KC_V",
-      "KC_B",
-      "ANY(KC_MINIM)",
-      "ANY(KC_MAXIM)",
-      "KC_N",
-      "KC_M",
-      "KC_COMM",
-      "KC_DOT",
-      "RALT_T(KC_SLSH)",
-      "SC_RSPC",
-      "QK_GESC",
-      "KC_SPC",
-      "KC_BSPC",
-      "KC_TAB",
-      "KC_ENT",
-      "KC_DEL"
-    ],
-    [
-      "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_TRNS",
-      "KC_EXLM",
-      "KC_AT",
-      "KC_LCBR",
-      "KC_RCBR",
-      "KC_PIPE",
-      "ANY(DT_PRNT)",
-      "KC_7",
-      "KC_8",
-      "KC_9",
-      "KC_ASTR",
-      "KC_F12",
-      "KC_TRNS",
-      "KC_HASH",
-      "KC_DLR",
-      "KC_LPRN",
-      "KC_RPRN",
-      "KC_GRV",
-      "ANY(DT_UP)",
-      "KC_4",
-      "KC_5",
-      "KC_6",
-      "KC_PPLS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_HASH",
-      "KC_DLR",
-      "KC_LBRC",
-      "KC_RBRC",
-      "KC_TILD",
-      "KC_TRNS",
-      "KC_TRNS",
-      "ANY(DT_DOWN)",
-      "KC_1",
-      "KC_2",
-      "KC_3",
-      "KC_PSLS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_P0"
-    ],
-    [
-      "RGB_TOG",
-      "KC_ACL0",
-      "KC_ACL1",
-      "KC_ACL2",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "RGB_MOD",
-      "RGB_RMOD",
-      "RGB_HUI",
-      "RGB_HUD",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_MS_U",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_BTN1",
-      "KC_UP",
-      "KC_BTN2",
-      "RGB_SAI",
-      "RGB_SAD",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_MS_L",
-      "KC_MS_D",
-      "KC_MS_R",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_LEFT",
-      "KC_DOWN",
-      "KC_RGHT",
-      "RGB_VAI",
-      "RGB_VAD",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "RGB_SPI",
-      "RGB_SPD",
-      "KC_TRNS",
-      "KC_TRNS",
-      "ANY(KC_CSGLA)",
-      "ANY(KC_CSGRA)",
-      "KC_TRNS",
-      "KC_TRNS"
-    ]
-  ],
-  "author": "https://github.com/JellyTitan"
-}
diff --git a/keyboards/keebio/iris/keymaps/vyolle/config.h b/keyboards/keebio/iris/keymaps/vyolle/config.h
deleted file mode 100644
index 49ad181d9b6..00000000000
--- a/keyboards/keebio/iris/keymaps/vyolle/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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 USE_I2C
-
-#define FORCE_NKRO  //Cause it's suprisingly handy.
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-
-#define MOUSEKEY_INTERVAL 16
-
-#define MOUSEKEY_DELAY 0
-
-#define MOUSEKEY_TIME_TO_MAX 60
-
-#define MOUSEKEY_MAX_SPEED 7
-
-#define MOUSEKEY_WHEEL_DELAY 0
-
diff --git a/keyboards/keebio/iris/keymaps/vyolle/keymap.c b/keyboards/keebio/iris/keymaps/vyolle/keymap.c
deleted file mode 100644
index 703efe423cc..00000000000
--- a/keyboards/keebio/iris/keymaps/vyolle/keymap.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 4
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-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,    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_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_LGUI, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RGUI,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LALT,          KC_RALT,  KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LCTL, LOWER,   KC_SPC,                    KC_ENT,  RAISE,   KC_RCTL
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_LOWER] = LAYOUT( 
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                              _______,  KC_7,   KC_8,    KC_9, KC_PLUS, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                            KC_PSLS,   KC_4,   KC_5,    KC_6, KC_MINUS, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_VOLU,  KC_HOME, KC_LEFT, KC_UP,   KC_RGHT, KC_PGUP,                            KC_PAST,  KC_1,   KC_2,    KC_3, KC_EQL, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_VOLD,  KC_END,  KC_INS, KC_DOWN, KC_DEL, KC_PGDN, KC_MUTE,          _______, _______,    KC_0,   KC_COMM, KC_DOT,  KC_ENT, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______,_______, _______,  _______,  _______,  _______,                         _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_GRAVE,  KC_TILD, KC_UNDS, KC_EQL,   KC_PIPE,  _______,                          _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_BSLS,KC_LCBR, KC_RCBR, KC_MINUS, KC_LBRC, KC_RBRC,                            _______, KC_LEFT, KC_UP, KC_RGHT, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_COLN,  KC_LT,   KC_GT,  KC_PLUS,  KC_LPRN, KC_RPRN, _______,          _______, _______, _______, KC_DOWN, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      _______,  _______, KC_CAPS, KC_MENU, KC_APP, KC_PSCR,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  _______,  _______, _______, _______, KC_PAUS,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______,  KC_SCRL,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/vyolle/rules.mk b/keyboards/keebio/iris/keymaps/vyolle/rules.mk
deleted file mode 100644
index 3b342b4cef8..00000000000
--- a/keyboards/keebio/iris/keymaps/vyolle/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTRAKEY_ENABLE = yes       # Disable if you run out of usb endpoints. Media keys need this to work.
-MOUSEKEY_ENABLE = yes      # Mouse keys(+4700) Uses extra usb endpoints. 
-STENO_ENABLE = no         # Additional protocols for Stenography(+1700), requires VIRTSER.
-AUDIO_ENABLE = no           # Audio output on port C6
-MIDI_ENABLE = no            # MIDI controls
-NKRO_ENABLE = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/keebio/iris/keymaps/xyverz/config.h b/keyboards/keebio/iris/keymaps/xyverz/config.h
deleted file mode 100644
index c1c6d12cccf..00000000000
--- a/keyboards/keebio/iris/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#define EE_HANDS
-
-#undef PRODUCT
-#define PRODUCT "Iris Keyboard"
-
-#undef MANUFACTURER
-#define MANUFACTURER "Ian Sterling"
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/iris/keymaps/xyverz/keymap.c b/keyboards/keebio/iris/keymaps/xyverz/keymap.c
deleted file mode 100644
index d59fd8fedfe..00000000000
--- a/keyboards/keebio/iris/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,139 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-
-enum layer_names {
-  _DVORAK,
-  _QWERTY,
-  _COLEMAK,
-  _WOW,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  DVORAK = SAFE_RANGE,
-  QWERTY,
-  COLEMAK,
-  WOW,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_RST QK_BOOT
-#define KC_BL_S BL_STEP
-#define KC_QWRT QWERTY
-#define KC_CLMK COLEMAK
-#define KC_DVRK DVORAK
-#define KC_WOW WOW
-#define KC_BSLT ALT_T(KC_BSPC)
-#define ADJUST MO(_ADJUST)
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-  [_DVORAK] = LAYOUT (
-     KC_GRV , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSLS,
-     KC_TAB ,KC_QUOT,KC_COMM,KC_DOT , KC_P  , KC_Y  ,                KC_F  , KC_G  , KC_C  , KC_R  , KC_L  ,KC_SLSH,
-     KC_ESC , KC_A  , KC_O  , KC_E  , KC_U  , KC_I  ,                KC_D  , KC_H  , KC_T  , KC_N  , KC_S  ,KC_MINS,
-     KC_LSFT,KC_SCLN, KC_Q  , KC_J  , KC_K  , KC_X  ,KC_LOWR,     KC_RASE, KC_B  , KC_M  , KC_W  , KC_V  , KC_Z  ,KC_RSFT,
-                       KC_LCTL,KC_BSLT,KC_LGUI,         KC_ENT ,KC_SPC ,KC_LALT
-  ),
-
-  [_QWERTY] = LAYOUT (
-     KC_EQL , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                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_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSLS,
-     KC_ESC , 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_LOWR,     KC_RASE, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
-                       KC_LCTL,KC_BSPC,KC_LGUI,         KC_ENT ,KC_SPC ,KC_LALT
-  ),
-
-  [_COLEMAK] = LAYOUT (
-     KC_EQL , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS,
-     KC_TAB , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  ,                KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_BSPC,
-     KC_ESC , 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_LOWR,     KC_RASE, KC_K  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
-                       KC_LCTL,KC_BSPC,KC_LGUI,         KC_ENT ,KC_SPC ,KC_LALT
-  ),
-
-  [_WOW] = LAYOUT (
-     KC_GRV , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSLS,
-     KC_TAB ,KC_QUOT,KC_COMM,KC_DOT , KC_P  , KC_Y  ,                KC_F  , KC_G  , KC_C  , KC_R  , KC_L  ,KC_SLSH,
-     KC_ESC , KC_A  , KC_O  , KC_E  , KC_U  , KC_I  ,                KC_D  , KC_H  , KC_T  , KC_N  , KC_S  ,KC_MINS,
-     KC_LSFT,KC_SCLN, KC_Q  , KC_J  , KC_K  , KC_X  ,KC_LALT,     KC_RGUI, KC_B  , KC_M  , KC_W  , KC_V  , KC_Z  ,KC_RSFT,
-                       KC_LOWR,KC_BSPC,KC_LCTL,         KC_ENT ,KC_SPC ,KC_RASE
-  ),
-
-  [_LOWER] = LAYOUT (
-     KC_F11 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F12 ,
-     KC_TILD,_______,_______, KC_UP ,_______,_______,               _______,_______,_______,_______,_______,_______,
-     KC_CAPS,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_HOME,               KC_PGUP,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,
-     KC_BL_S,_______,KC_MUTE,KC_VOLD,KC_VOLU,KC_END ,_______,     _______,KC_PGDN,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,
-                       _______,KC_DEL ,_______,         _______,KC_INS ,_______
-  ),
-
-  [_RAISE] = LAYOUT (
-     KC_F11 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F12 ,
-     KC_GRV ,_______,_______, KC_UP ,_______,_______,               _______,_______,_______,_______,_______,_______,
-     KC_CAPS,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_HOME,               KC_PGUP,KC_MINS,KC_EQL ,KC_LBRC,KC_RBRC,KC_BSLS,
-     KC_BL_S,_______,KC_MUTE,KC_VOLD,KC_VOLU,KC_END ,_______,     _______,KC_PGDN,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,
-                       _______,KC_DEL ,_______,         _______,KC_INS ,_______
-  ),
-
-  [_ADJUST] = LAYOUT (
-     KC_F11 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F12 ,
-     _______,KC_RST ,_______,_______,_______,_______,               _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,               _______,KC_QWRT,KC_CLMK,KC_DVRK,KC_WOW ,_______,
-     _______,_______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,_______,
-                       _______,_______,_______,         _______,_______,_______
-  )
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-
-void matrix_init_user(void) {
-   // This will disable the red LEDs on the ProMicros
-   setPinOutput(D5);
-   writePinLow(D5);
-   setPinOutput(B0);
-   writePinLow(B0);
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case WOW:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WOW);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/iris/keymaps/xyverz/rules.mk b/keyboards/keebio/iris/keymaps/xyverz/rules.mk
deleted file mode 100644
index d7463419b4f..00000000000
--- a/keyboards/keebio/iris/keymaps/xyverz/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/yoonbae81/config.h b/keyboards/keebio/iris/keymaps/yoonbae81/config.h
deleted file mode 100644
index f91326ca266..00000000000
--- a/keyboards/keebio/iris/keymaps/yoonbae81/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 25
-#define MOUSEKEY_MAX_SPEED 7
-#define MOUSEKEY_TIME_TO_MAX 30
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c b/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c
deleted file mode 100644
index e8ef651188a..00000000000
--- a/keyboards/keebio/iris/keymaps/yoonbae81/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _MAIN,
-    _FN1,
-    _FN2,
-    _FN3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_MAIN] = 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_BSLS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     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,    LT(2,KC_SPC),     KC_NO,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSPC,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI, KC_LALT, LT(1,KC_ENT),              KC_SPC,LT(1,KC_RALT),LT(2,KC_RCTL)
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_FN1] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LCBR, KC_PGUP, KC_UP,   KC_HOME, KC_RCBR,                            KC_NO,   KC_HOME, KC_PGUP, KC_NO,   KC_NO,   KC_F12,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_MINS, KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LBRC, KC_END,  KC_NO,   KC_PGDN, KC_RBRC, TO(2),            _______, KC_NO,   KC_PGDN, KC_END,  KC_ENT,  KC_INS,  KC_DEL,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                   KC_BSPC, _______, _______ 
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_FN2] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     TO(0),   KC_1,    KC_2,    KC_SCRL, KC_PAUS, KC_PSCR,                            KC_CALC, KC_ESC,  KC_PMNS, KC_PERC, KC_PSLS, MO(3),
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_NO,   KC_WH_U, KC_MS_U, KC_NO,   KC_NO,                              KC_F2,   KC_7,    KC_8,    KC_9,    KC_PAST, KC_NO,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,                              KC_ENT,  KC_4,    KC_5,    KC_6,    KC_MINS, KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_NO,   KC_NO,   KC_NO,   KC_WH_D, KC_NO,   TO(0),            _______, KC_0,    KC_1,    KC_2,    KC_3,    KC_PPLS, KC_BSPC,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_BTN2, KC_BTN1, KC_ACL2,                   _______, KC_PDOT, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ), 
-
-  [_FN3] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, QK_BOOT, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_MPRV, KC_MRWD, KC_MFFD, KC_MNXT, _______,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_VOLD, KC_VOLU, KC_MPLY,                   _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  )
-};
\ No newline at end of file
diff --git a/keyboards/keebio/iris/keymaps/yoonbae81/rules.mk b/keyboards/keebio/iris/keymaps/yoonbae81/rules.mk
deleted file mode 100644
index cbf383fc697..00000000000
--- a/keyboards/keebio/iris/keymaps/yoonbae81/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-ENCODER_ENABLE = no
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 63610ecac50..4b67b6632f4 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -19,7 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D5
 
-#define BACKLIGHT_DEFAULT_LEVEL 3
-
-#define RGBLIGHT_DEFAULT_VAL 128
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index 72b8da80d09..4bb4554f7c0 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -16,7 +16,10 @@
     },
     "backlight": {
         "pin": "B5",
-        "levels": 5
+        "levels": 5,
+        "default": {
+            "brightness": 3
+        }
     },
     "rgblight": {
         "led_count": 12,
@@ -32,6 +35,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 128
         }
     },
     "ws2812": {
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 80e85052dee..f52c020dee5 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -19,50 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D5
 
-#    define RGBLIGHT_DEFAULT_VAL 120
-#    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_LED_COUNT 68
-#        define RGB_MATRIX_SPLIT { 34, 34 }
-#        define RGB_DISABLE_WHEN_USB_SUSPENDED
-#        define RGB_MATRIX_KEYPRESSES
-#    endif
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 94c30211a1b..8563ba64ab7 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -5,7 +5,47 @@
         "device_version": "6.2.0"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 160,
+        "sleep": true,
+        "split_count": [34, 34]
     },
     "matrix_pins": {
         "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
@@ -38,6 +78,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 120
         }
     },
     "split": {
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 37769d67e75..eec56a26203 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -19,50 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D5
 
-#    define RGBLIGHT_DEFAULT_VAL 120
-#    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 120
-#        define RGB_MATRIX_LED_COUNT 68
-#        define RGB_MATRIX_SPLIT { 34, 34 }
-#        define RGB_DISABLE_WHEN_USB_SUSPENDED
-#        define RGB_MATRIX_KEYPRESSES
-//#    endif
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index 08d6c8cd19e..a7b81f9224b 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -5,7 +5,45 @@
         "device_version": "7.0.0"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [34, 34]
     },
     "matrix_pins": {
         "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
@@ -39,6 +77,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 120
         }
     },
     "split": {
diff --git a/keyboards/keebio/iris/rev8/config.h b/keyboards/keebio/iris/rev8/config.h
index 96eb75c97ac..3ea59ffcf68 100644
--- a/keyboards/keebio/iris/rev8/config.h
+++ b/keyboards/keebio/iris/rev8/config.h
@@ -4,19 +4,17 @@
 #pragma once
 
 #define SPLIT_HAND_PIN GP4
+
 #define USB_VBUS_PIN GP8
+
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP12
 #define SERIAL_USART_RX_PIN GP13
 #define SERIAL_USART_PIN_SWAP
+
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
 #define I2C_DRIVER I2CD2
 #define I2C1_SDA_PIN GP10
 #define I2C1_SCL_PIN GP11
-
-// RGB Matrix
-#define RGB_MATRIX_LED_COUNT 68
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev8/info.json b/keyboards/keebio/iris/rev8/info.json
index d425e8d0195..85676067c0c 100644
--- a/keyboards/keebio/iris/rev8/info.json
+++ b/keyboards/keebio/iris/rev8/info.json
@@ -239,6 +239,7 @@
             {"flags":2, "x":144, "y":58},
             {"matrix": [9,4], "flags":4, "x":134, "y":64},
             {"matrix": [9,5], "flags":4, "x":126, "y":52}
-        ]
+        ],
+        "sleep": true
     }
 }
diff --git a/keyboards/keebio/iris_ce/info.json b/keyboards/keebio/iris_ce/info.json
new file mode 100644
index 00000000000..64fa5a05caf
--- /dev/null
+++ b/keyboards/keebio/iris_ce/info.json
@@ -0,0 +1,8 @@
+{
+    "manufacturer": "Keebio",
+    "maintainer": "Keebio",
+    "url": "https://keeb.io",
+    "usb": {
+        "vid": "0xCB10"
+    }
+}
diff --git a/keyboards/keebio/iris_ce/keymaps/default/keymap.c b/keyboards/keebio/iris_ce/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d5021d647d4
--- /dev/null
+++ b/keyboards/keebio/iris_ce/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+// Copyright 2023 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+     _QWERTY,
+     _LOWER,
+     _RAISE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     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_HOME,          KC_END,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                    KC_LGUI, TL_LOWR, KC_ENT,                    KC_SPC,  TL_UPPR, KC_RALT
+                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+  ),
+
+  [_LOWER] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PGUP,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_GRV,  _______, KC_UP,   _______, QK_BOOT, _______,                            _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PGDN,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LBRC,                            KC_RBRC, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_PIPE,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     RGB_MOD, EE_CLR,  _______, _______, _______, KC_LCBR, KC_LPRN,          KC_RPRN, KC_RCBR, KC_P1,   KC_P2,   KC_P3,   KC_MINS, _______,
+  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                    _______, _______, KC_DEL,                    KC_DEL,  _______, KC_P0
+                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+  ),
+
+  [_RAISE] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     RGB_TOG, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, QK_BOOT,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN,          _______, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, EE_CLR,
+  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                    _______, _______, _______,                   _______, _______, _______
+                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+  )
+};
diff --git a/keyboards/keebio/iris_ce/keymaps/default/rules.mk b/keyboards/keebio/iris_ce/keymaps/default/rules.mk
new file mode 100644
index 00000000000..7c9bf212a6f
--- /dev/null
+++ b/keyboards/keebio/iris_ce/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/keebio/iris_ce/keymaps/via/keymap.c b/keyboards/keebio/iris_ce/keymaps/via/keymap.c
new file mode 100644
index 00000000000..7d2a182ad6a
--- /dev/null
+++ b/keyboards/keebio/iris_ce/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+// Copyright 2023 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layer {
+    _MAIN,
+    _FN1,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_MAIN] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     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_HOME,          KC_END,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                    KC_LGUI, TL_LOWR, KC_ENT,                    KC_SPC,  TL_UPPR, KC_RALT
+                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+  ),
+
+  [_FN1] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PGUP,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_GRV,  _______, KC_UP,   _______, QK_BOOT, _______,                            _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PGDN,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LBRC,                            KC_RBRC, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, KC_PIPE,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     RGB_MOD, EE_CLR,  _______, _______, _______, KC_LCBR, KC_LPRN,          KC_RPRN, KC_RCBR, KC_P1,   KC_P2,   KC_P3,   KC_MINS, _______,
+  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                    _______, _______, KC_DEL,                    KC_DEL,  _______, KC_P0
+                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+  ),
+
+  [_FN2] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     RGB_TOG, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, QK_BOOT,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN,          _______, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, EE_CLR,
+  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                    _______, _______, _______,                   _______, _______, _______
+                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+  )
+};
diff --git a/keyboards/keebio/iris_ce/keymaps/via/rules.mk b/keyboards/keebio/iris_ce/keymaps/via/rules.mk
new file mode 100644
index 00000000000..e2a844ab40f
--- /dev/null
+++ b/keyboards/keebio/iris_ce/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+CONSOLE_ENABLE = no
diff --git a/keyboards/keebio/iris_ce/readme.md b/keyboards/keebio/iris_ce/readme.md
new file mode 100644
index 00000000000..7b3ea32dd1f
--- /dev/null
+++ b/keyboards/keebio/iris_ce/readme.md
@@ -0,0 +1,25 @@
+# Iris CE (Compact Edition)
+
+A split ergo 4x6 keyboard with 4 thumb keys made and sold by Keebio. [More info at Keebio](https://keeb.io).
+
+* Keyboard Maintainer: [Bakingpy/nooges](https://github.com/nooges)
+* Hardware Supported: Iris CE PCBs w/RP2040 microcontroller
+* Hardware Availability: [Keebio](https://keeb.io)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebio/iris_ce/rev1:default
+
+Example of flashing this keyboard:
+
+    make keebio/iris_ce/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 3 ways:
+
+* **Bootmagic reset**: Hold down the key at the top left and plug in the keyboard
+* **Physical reset button**: Press and hold the button on the back of the PCB for at least 1 second and let go
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/keebio/iris_ce/rev1/config.h b/keyboards/keebio/iris_ce/rev1/config.h
new file mode 100644
index 00000000000..e5f43f001e2
--- /dev/null
+++ b/keyboards/keebio/iris_ce/rev1/config.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SPLIT_HAND_PIN GP4
+#define USB_VBUS_PIN GP0
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP12
+#define SERIAL_USART_RX_PIN GP13
+#define SERIAL_USART_PIN_SWAP
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+#define I2C_DRIVER I2CD2
+#define I2C1_SDA_PIN GP10
+#define I2C1_SCL_PIN GP11
diff --git a/keyboards/keebio/iris_ce/rev1/info.json b/keyboards/keebio/iris_ce/rev1/info.json
new file mode 100644
index 00000000000..c9fc160001a
--- /dev/null
+++ b/keyboards/keebio/iris_ce/rev1/info.json
@@ -0,0 +1,218 @@
+{
+    "keyboard_name": "Iris CE Rev. 1",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP2", "GP3", "GP14"],
+        "rows": ["GP18", "GP19", "GP20", "GP7", "GP26"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 5, "flags": 4},
+            {"x": 8, "y": 5, "flags": 2},
+            {"matrix": [0, 1], "x": 16, "y": 5, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 2, "flags": 4},
+            {"x": 40, "y": 1, "flags": 2},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 64, "y": 5, "flags": 4},
+            {"x": 72, "y": 3, "flags": 2},
+            {"matrix": [0, 5], "x": 80, "y": 3, "flags": 4},
+            {"matrix": [1, 5], "x": 80, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 64, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 48, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 32, "y": 15, "flags": 4},
+            {"matrix": [1, 1], "x": 16, "y": 18, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 18, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 32, "y": 28, "flags": 4},
+            {"matrix": [2, 3], "x": 48, "y": 27, "flags": 4},
+            {"matrix": [2, 4], "x": 64, "y": 28, "flags": 4},
+            {"matrix": [2, 5], "x": 80, "y": 30, "flags": 4},
+            {"matrix": [3, 5], "x": 80, "y": 43, "flags": 4},
+            {"matrix": [3, 4], "x": 64, "y": 42, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 32, "y": 42, "flags": 4},
+            {"matrix": [3, 1], "x": 16, "y": 45, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 45, "flags": 4},
+            {"x": 8, "y": 43, "flags": 2},
+            {"x": 40, "y": 50, "flags": 2},
+            {"matrix": [4, 2], "x": 56, "y": 47, "flags": 4},
+            {"matrix": [4, 3], "x": 72, "y": 58, "flags": 4},
+            {"x": 80, "y": 58, "flags": 2},
+            {"matrix": [4, 4], "x": 90, "y": 64, "flags": 4},
+            {"matrix": [4, 5], "x": 98, "y": 52, "flags": 4},
+            {"matrix": [5, 0], "x": 224, "y": 5, "flags": 4},
+            {"x": 216, "y": 5, "flags": 2},
+            {"matrix": [5, 1], "x": 208, "y": 5, "flags": 4},
+            {"matrix": [5, 2], "x": 192, "y": 2, "flags": 4},
+            {"x": 184, "y": 1, "flags": 2},
+            {"matrix": [5, 3], "x": 176, "y": 0, "flags": 4},
+            {"matrix": [5, 4], "x": 160, "y": 5, "flags": 4},
+            {"x": 152, "y": 3, "flags": 2},
+            {"matrix": [5, 5], "x": 144, "y": 3, "flags": 4},
+            {"matrix": [6, 5], "x": 144, "y": 17, "flags": 4},
+            {"matrix": [6, 4], "x": 160, "y": 15, "flags": 4},
+            {"matrix": [6, 3], "x": 176, "y": 13, "flags": 4},
+            {"matrix": [6, 2], "x": 192, "y": 15, "flags": 4},
+            {"matrix": [6, 1], "x": 208, "y": 18, "flags": 4},
+            {"matrix": [6, 0], "x": 224, "y": 18, "flags": 4},
+            {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4},
+            {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4},
+            {"matrix": [7, 2], "x": 192, "y": 28, "flags": 4},
+            {"matrix": [7, 3], "x": 176, "y": 27, "flags": 4},
+            {"matrix": [7, 4], "x": 160, "y": 28, "flags": 4},
+            {"matrix": [7, 5], "x": 144, "y": 30, "flags": 4},
+            {"matrix": [8, 5], "x": 144, "y": 43, "flags": 4},
+            {"matrix": [8, 4], "x": 160, "y": 42, "flags": 4},
+            {"matrix": [8, 3], "x": 176, "y": 40, "flags": 4},
+            {"x": 184, "y": 50, "flags": 2},
+            {"matrix": [8, 2], "x": 192, "y": 42, "flags": 4},
+            {"matrix": [8, 1], "x": 208, "y": 45, "flags": 4},
+            {"x": 216, "y": 43, "flags": 2},
+            {"matrix": [8, 0], "x": 224, "y": 45, "flags": 4},
+            {"matrix": [9, 2], "x": 168, "y": 47, "flags": 4},
+            {"matrix": [9, 3], "x": 152, "y": 58, "flags": 4},
+            {"x": 144, "y": 58, "flags": 2},
+            {"matrix": [9, 4], "x": 134, "y": 64, "flags": 4},
+            {"matrix": [9, 5], "x": 126, "y": 52, "flags": 4}
+        ],
+        "max_brightness": 120,
+        "split_count": [34, 34],
+        "sleep": true
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["GP29", "GP28", "GP2", "GP27", "GP18", "GP7"],
+                "rows": ["GP26", "GP24", "GP23", "GP21", "GP3"]
+            }
+        },
+        "transport": {
+            "sync_matrix_state": true
+        }
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1556"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP25"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [5, 5], "x": 9, "y": 0.25},
+                {"matrix": [5, 4], "x": 10, "y": 0.125},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.125},
+                {"matrix": [5, 1], "x": 13, "y": 0.375},
+                {"matrix": [5, 0], "x": 14, "y": 0.375},
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [6, 5], "x": 9, "y": 1.25},
+                {"matrix": [6, 4], "x": 10, "y": 1.125},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.125},
+                {"matrix": [6, 1], "x": 13, "y": 1.375},
+                {"matrix": [6, 0], "x": 14, "y": 1.375},
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [7, 5], "x": 9, "y": 2.25},
+                {"matrix": [7, 4], "x": 10, "y": 2.125},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.125},
+                {"matrix": [7, 1], "x": 13, "y": 2.375},
+                {"matrix": [7, 0], "x": 14, "y": 2.375},
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6.15, "y": 3.75},
+                {"matrix": [9, 5], "x": 7.85, "y": 3.75},
+                {"matrix": [8, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 4], "x": 10, "y": 3.125},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3.125},
+                {"matrix": [8, 1], "x": 13, "y": 3.375},
+                {"matrix": [8, 0], "x": 14, "y": 3.375},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.375},
+                {"matrix": [4, 4], "x": 5.6, "y": 4.75},
+                {"matrix": [9, 4], "x": 8.4, "y": 4.75},
+                {"matrix": [9, 3], "x": 9.5, "y": 4.375},
+                {"matrix": [9, 2], "x": 10.5, "y": 4.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keebio/iris_ce/rev1/rules.mk b/keyboards/keebio/iris_ce/rev1/rules.mk
new file mode 100644
index 00000000000..161ec22b16e
--- /dev/null
+++ b/keyboards/keebio/iris_ce/rev1/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/keebio/levinson/keymaps/atreus/config.h b/keyboards/keebio/levinson/keymaps/atreus/config.h
deleted file mode 100644
index a82c15238a1..00000000000
--- a/keyboards/keebio/levinson/keymaps/atreus/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-#define MASTER_LEFT
diff --git a/keyboards/keebio/levinson/keymaps/atreus/keymap.c b/keyboards/keebio/levinson/keymaps/atreus/keymap.c
deleted file mode 100644
index 9989c9bf254..00000000000
--- a/keyboards/keebio/levinson/keymaps/atreus/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QW 0
-#define _RS 1
-#define _LW 2
-
-/*
- *  q       w      e     r    t        ||       y     u     i     o    p
- *  a       s      d     f    g        ||       h     j     k     l    ;
- *  z       x      c     v    b        ||       n     m     ,     .    /
- * esc     tab    gui  shift bksp ctrl || alt space raise   -     '  enter
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QW] = LAYOUT_ortho_4x12( /* Qwerty */
-	KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_NO,   KC_NO,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-	KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_NO,   KC_NO,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
-	KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_NO,   KC_NO,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
-	KC_ESC, KC_TAB, KC_LGUI,  KC_LSFT, KC_BSPC,  KC_LCTL, KC_LALT, KC_SPC,  MO(_RS), KC_MINS, KC_QUOT, KC_ENT  ),
-/*
- *  !       @     up     {    }        ||     pgup    7     8     9    *
- *  #     left   down  right  $        ||     pgdn    4     5     6    +
- *  [       ]      (     )    &        ||       `     1     2     3    \
- * lower  insert super shift bksp ctrl || alt space   fn    .     0    =
- */
-[_RS] = LAYOUT_ortho_4x12( /* [> RAISE <] */
-	KC_EXLM, KC_AT,   KC_UP,   KC_LCBR, KC_RCBR, KC_NO,   KC_NO,   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR ,
-	KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR,  KC_NO,   KC_NO,   KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS ,
-	KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_NO,   KC_NO,   KC_GRV,  KC_1,    KC_2,   KC_3, KC_BSLS ,
-	TG(_LW), KC_INS,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  KC_TRNS, KC_DOT, KC_0, KC_EQL  ),
-/*
- * insert home   up  end   pgup       ||      up     F7    F8    F9   F10
- *  del   left  down right pgdn       ||     down    F4    F5    F6   F11
- *       volup             reset      ||             F1    F2    F3   F12
- *       voldn  super shift bksp ctrl || alt space   L0  prtsc scroll pause
- */
-[_LW] = LAYOUT_ortho_4x12( /* [> LOWER <] */
-	KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_NO,   KC_NO,   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
-	KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_NO,   KC_NO,   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
-	KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
-	KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
-};
diff --git a/keyboards/keebio/levinson/keymaps/atreus/readme.md b/keyboards/keebio/levinson/keymaps/atreus/readme.md
deleted file mode 100644
index 0b548ace171..00000000000
--- a/keyboards/keebio/levinson/keymaps/atreus/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Atreus layout port
-
-Port the default Atreus layout to the Levinson/Let's Split.
-
-The purpose is to try out the layout to get a sense of what works in it.
-
-The 'extra' keys on the Levinson are dead in this version, to make a
-more faithful emulation of the atreus layout.
diff --git a/keyboards/keebio/levinson/keymaps/dcompact/config.h b/keyboards/keebio/levinson/keymaps/dcompact/config.h
deleted file mode 100644
index be2d71e8f02..00000000000
--- a/keyboards/keebio/levinson/keymaps/dcompact/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-
-/* Select hand configuration */
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/keebio/levinson/keymaps/dcompact/keymap.c b/keyboards/keebio/levinson/keymaps/dcompact/keymap.c
deleted file mode 100644
index 0495649c423..00000000000
--- a/keyboards/keebio/levinson/keymaps/dcompact/keymap.c
+++ /dev/null
@@ -1,236 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Custom Keycodes and Combinations Used
-#define DEL_SHF SFT_T(KC_DEL)
-#define QUAKE LCTL(KC_GRV)
-
-#define WKSP_L LALT(LCTL(KC_LEFT))
-#define WKSP_D LALT(LCTL(KC_DOWN))
-#define WKSP_U LALT(LCTL(KC_UP))
-#define WKSP_R LALT(LCTL(KC_RGHT))
-
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _BASE,
-  _LOWER,
-  _RAISE,
-  _FUNC,
-  _PLOVER,
-  _ADJUST,
-  _MOUSE
-};
-
-enum planck_keycodes {
-  BASE = SAFE_RANGE,
-  PLOVER,
-  LOWER,
-  RAISE,
-  FUNC,
-  MOUSE,
-  ADJUST,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Base
- * ,-----------------------------------------------------------------------------------.
- * | Tab  | " '  | < ,  | > .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | ? /  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  | _ -  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Del/Sf|  : ; |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  | Bspc |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Plover| GUI  | Alt  |Lower |Shift |Space |Raise | Alt  | GUI  |  Fn  |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_BASE] = LAYOUT_ortho_4x12(
-   KC_TAB, KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L, KC_SLSH,
-   KC_ESC,    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S, KC_MINS,
-  DEL_SHF, KC_SCLN,    KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z, KC_BSPC,
-  KC_LCTL,  PLOVER, KC_LGUI, KC_LALT,   LOWER,  KC_LSFT,  KC_SPC,  RAISE, KC_RALT, KC_RGUI,    FUNC,  KC_ENT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      | Home |PgDwn | PgUp | End  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |PrScr | Menu |      |      |      |      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |CapsLk|NumLck| Ins  |      |      |      |WkLeft|WkDown| WkUp |WkRigh|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, XXXXXXX,
-  XXXXXXX, KC_PSCR, KC_MENU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, XXXXXXX,
-  XXXXXXX, KC_CAPS, KC_LNUM,  KC_INS, XXXXXXX, XXXXXXX, XXXXXXX,  WKSP_L,  WKSP_D,  WKSP_U,  WKSP_R, XXXXXXX,
-  _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |Quake |   `  |   ~  |   \  |   |  |   (  |   )  |   7  |   8  |   9  |   /  |  =   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   !  |   @  |   #  |   $  |   {  |   }  |   4  |   5  |   6  |   *  |  +   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   %  |   ^  |   &  |   *  |   [  |   ]  |   1  |   2  |   3  |   -  |Bkspc |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |   <  |   >  |      |   0  |   .  |   ,  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-    QUAKE,  KC_GRV, KC_TILD, KC_BSLS, KC_PIPE, KC_LPRN, KC_RPRN,    KC_7,    KC_8,    KC_9, KC_SLSH,  KC_EQL,
-  XXXXXXX, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_LCBR, KC_RCBR,    KC_4,    KC_5,    KC_6, KC_ASTR, KC_PLUS,
-  XXXXXXX, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC,    KC_1,    KC_2,    KC_3, KC_MINS, KC_BSPC,
-  _______, XXXXXXX, _______, _______, _______, KC_LABK, KC_RABK, _______,    KC_0,  KC_DOT, KC_COMM, XXXXXXX
-),
-
-/* Func
- * ,-----------------------------------------------------------------------------------.
- * |      |Sleep |Prev-W|Ply/Ps|Next-W|      |      |  F9  | F10  | F11  | F12  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Wake | Mute | Vol- | Vol+ |      |      |  F5  |  F6  |  F7  |  F8  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Power |Prev-M|Ply/Ps|Next-M|      |      |  F1  |  F2  |  F3  |  F4  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_ortho_4x12(
-  XXXXXXX, KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX,
-  XXXXXXX, KC_WAKE, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX,   KC_F5,   KC_F6,   KC_F7,   KC_F8, XXXXXXX,
-  XXXXXXX,  KC_PWR, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX,
-  _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX
-),
-
-/* Mouse (Not Reachable on Planck)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |Click1|Click3|Click2|      |      |MouseL|MouseD|MouseU|MouseR|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |Accel0|Accel1|Accel2|      |      |ScrllL|ScrllD|ScrllU|ScrllR|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MOUSE] = LAYOUT_ortho_4x12(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX,
-  XXXXXXX, XXXXXXX, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, XXXXXXX,
-  _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  FN  |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |      |      |   E  |   U  |  PWR | RES1 | RES2 |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_ortho_4x12(
-  STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-  STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-  XXXXXXX, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-  EXT_PLV, XXXXXXX, XXXXXXX, STN_A,   STN_O,   XXXXXXX, XXXXXXX, STN_E,   STN_U,   STN_PWR, STN_RE1, STN_RE2
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|RGBTog|RGBMod|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|Light-|Light+|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP, RGB_TOG, RGB_MOD, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, RGB_VAD, RGB_VAI, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case FUNC:
-      if (record->event.pressed) {
-        layer_on(_FUNC);
-      } else {
-        layer_off(_FUNC);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (!record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_PLOVER);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case MOUSE:
-      if (record->event.pressed) {
-        layer_on(_MOUSE);
-      } else {
-        layer_off(_MOUSE);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-void keyboard_post_init_user(void) {
-  steno_set_mode(STENO_MODE_GEMINI);
-}
diff --git a/keyboards/keebio/levinson/keymaps/dcompact/readme.md b/keyboards/keebio/levinson/keymaps/dcompact/readme.md
deleted file mode 100644
index cd88c3fed34..00000000000
--- a/keyboards/keebio/levinson/keymaps/dcompact/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# DCompact Layout
-
-**Dvorak, Layered, Mouse-Enabled, Compact -- now with Plover~**
-
-_See [the layout source](keymap.c) for the actual layout_
-
-## Goals
-
-The following are the goals kept in mind when designing the DCompact
-layout:
-
-- Provide minimal travel distance when typing English or coding
-- Consistent muscle memory translation from standard QWERTY
-- Stateless typing experience
-- OS-agnostic features, macros, and key placement
-- Minimize dependence on mouse usage
-
-These are generally all met or balanced within reason. This layout is
-not intended at all to be a familiar layout for much of anyone (except
-maybe those who already type in Dvorak) -- this is meant to amplify the
-best parts of having limited, ortholinear keys with layering.
-
-## As Reference Material
-
-If you're reading this hoping to find reference material to implement
-your own layout, then please feel free to copy over this layout and
-make edits where you see fit. I removed a lot of the features I felt
-extraneous to my usage and simplified style where I felt needed. This
-would hopefully mean that my code should feel like a good base to
-develop from for those new to QMK.
-
-_Remember that settings defined in the layout directory override and
-merge with those in the keyboard folder_
-
-## Relevant Links
-
-- [Online Dvorak Layout Trainer](https://learn.dvorak.nl/)
-- [Dvorak Wikipedia Page](https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard)
-- [QMK Docs](https://docs.qmk.fm/#/)
-- [QMK KeyCode Reference](https://docs.qmk.fm/#/keycodes)
-
-## Contact
-
-Maintainer: [Dan](https://github.com/loksonarius)
-
diff --git a/keyboards/keebio/levinson/keymaps/dcompact/rules.mk b/keyboards/keebio/levinson/keymaps/dcompact/rules.mk
deleted file mode 100644
index cd031e0d36a..00000000000
--- a/keyboards/keebio/levinson/keymaps/dcompact/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# https://beta.docs.qmk.fm/reference/config-options#feature-options
-# Features Specifically Wanted
-EXTRAKEY_ENABLE = yes
-STENO_ENABLE = yes
-NKRO_ENABLE = yes
-AUDIO_ENABLE = yes
-
-# Features taking up space
-MOUSEKEY_ENABLE = no
-MIDI_ENABLE = no
-CONSOLE_ENABLE = no
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/keebio/levinson/keymaps/drogglbecher/config.h b/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
deleted file mode 100644
index fda48a463bf..00000000000
--- a/keyboards/keebio/levinson/keymaps/drogglbecher/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-/* #define _MASTER_RIGHT */
-/* #define EE_HANDS */
-
-#endif
diff --git a/keyboards/keebio/levinson/keymaps/drogglbecher/keymap.c b/keyboards/keebio/levinson/keymaps/drogglbecher/keymap.c
deleted file mode 100644
index 6355c142037..00000000000
--- a/keyboards/keebio/levinson/keymaps/drogglbecher/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _FN0 0
-#define _FN1 1
-#define _FN2 2
-
-#define KC_X1 MO(_FN1)
-#define KC_X2 MO(_FN2)
-
-#define KC_LPRN LSFT(KC_9)      // (
-#define KC_RPRN LSFT(KC_0)      // )
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-   /* ┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-    * │ ESC  │  q   │  w   │  e   │  r   │  t   │ │  y   │  u   │  i   │  o   │  p   │ BS   │
-    * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-    * │ CTRL │  a   │  s   │  d   │  f   │  g   │ │  h   │  j   │  k   │  l   │ " '  │ RET  │
-    * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-    * │ SHFT │  z   │  x   │  c   │  v   │  b   │ │  n   │  m   │ [ {  │ ] }  │ ; :  │ SHFT │
-    * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-    * │ L1   │ ALT  │  L2  │ TAB  | SPC  │ SPC  │ │ SPC  │ SPC  │ , <  │ . >  │ - _  │ / ?  │
-    * └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-    */
-
-  [_FN0] = LAYOUT_ortho_4x12(
-     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_LCTL,  KC_A,      KC_S,       KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_QUOT,    KC_ENT,
-     KC_LSFT,  KC_Z,      KC_X,       KC_C,       KC_V,       KC_B,       KC_N,       KC_M,       KC_LBRC,    KC_RBRC,    KC_SCLN,    KC_RSFT,
-     KC_X1,    KC_LALT,   KC_X2,      KC_TAB,     KC_SPC,     KC_SPC,     KC_SPC,     KC_SPC,     KC_COMM,    KC_DOT,     KC_MINS,    KC_SLSH
-  ),
-
-   /* ┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-    * │      │  1   │  2   │  3   │  4   │  5   │ │  6   │  7   │  8   │  9   │  0   │ DEL  │
-    * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-    * │      │  ä   │  ö   │  ü   │  ß   │      │ │ LEFT │ DOWN │  UP  │ RGT  │      │      │
-    * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-    * │      │  Ä   │  Ö   │  Ü   │  €   │      │ │      │      │  (   │  )   │      │      │
-    * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-    * │      |      │      │      | SPC  │ SPC  │ │ SPC  │ SPC  │      │      │      │  \ | │
-    * └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-    */
-
-  [_FN1] = LAYOUT_ortho_4x12(
-    _______,    KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_DEL,
-    _______,    UC(L'ä'),   UC(L'ö'),   UC(L'ü'),   UC(L'ß'),   _______,    KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    _______,    KC_PIPE,
-    _______,    UC(L'Ä'),   UC(L'Ö'),   UC(L'Ü'),   UC(L'€'),   _______,    _______,    _______,    KC_LPRN,    KC_RPRN,    _______,    _______,
-    _______,    _______,    _______,    KC_TAB,     KC_SPC,     KC_SPC,     KC_SPC,     KC_SPC,     _______,    _______,    _______,    KC_BSLS
-  ),
-
-   /* ┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-    * │  `   │  !   │  @   │  #   │  $   │  %   │ │  ^   │  &   │  *   │  ~   │  +   │  =   │
-    * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-    * │      │      │      │      │      │      │ │ HOME │ PGDN │ PGUP │ END  │      │      │
-    * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-    * │  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │ │  F7  │  F8  │  F9  │ F10  │ F11  │ F12  │
-    * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-    * │      │      │      │      │ SPC  │ SPC  │ │ SPC  │ SPC  │      │ VOL+ │ VOL- │ MUTE │
-    * └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-    */
-
-  [_FN2] = LAYOUT_ortho_4x12(
-     KC_GRV,    KC_EXLM,    KC_AT,      KC_HASH,    KC_DLR,     KC_PERC,    KC_CIRC,    KC_AMPR,    KC_ASTR,    KC_TILD,    KC_PLUS,    KC_PEQL,
-     _______,   _______,    _______,    _______,    _______,    _______,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     _______,    _______,
-     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_SPC,     KC_SPC,     KC_SPC,     KC_SPC,     _______,    KC_VOLD,    KC_VOLU,    KC_MUTE
-  )
-
-};
-
-void matrix_init_user(void) {
-    set_unicode_input_mode(UNICODE_MODE_LINUX);
-};
diff --git a/keyboards/keebio/levinson/keymaps/drogglbecher/rules.mk b/keyboards/keebio/levinson/keymaps/drogglbecher/rules.mk
deleted file mode 100644
index a22dc3d2a9a..00000000000
--- a/keyboards/keebio/levinson/keymaps/drogglbecher/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTO_SHIFT_ENABLE = no
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-UNICODE_ENABLE = yes
-DEFAULT_FOLDER = levinson/rev2
-
diff --git a/keyboards/keebio/levinson/keymaps/jyh/keymap.c b/keyboards/keebio/levinson/keymaps/jyh/keymap.c
deleted file mode 100644
index 15a9b489a29..00000000000
--- a/keyboards/keebio/levinson/keymaps/jyh/keymap.c
+++ /dev/null
@@ -1,202 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 3																/* Symbols, Media */
-#define _RAISE 4																/* Numbers, Arrows */
-#define _FUNC  5																/* Function Keys */
-#define _NUMS  6																/* Numpad */
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// tap toggle numpad on
-#define NUMPAD TT(_NUMS)
-
-// Mod Tap Definitions
-// -------------------
-                                      //  Tap     Hold
-                                      //  ------------------
-#define CTL_ESC MT(MOD_LCTL, KC_ESC)  //  Esc     Left Control
-#define SFT_ENT MT(MOD_RSFT, KC_ENT)  //  Enter   Right Shift
-#define CTL_SPC MT(MOD_LCTL, KC_SPC)  //  Space   Left Control
-#define ALT_SPC MT(MOD_LALT, KC_SPC)  //  Space   Left Alt
-#define ALT_BSP MT(MOD_LALT, KC_BSPC) //  Bkspace Left Alt
-#define HPR_TAB MT(MOD_HYPR, KC_TAB)  //  Tab     Hyper (Super+Ctrl+Alt+Shift)
-#define HPR_GRV MT(MOD_HYPR, KC_GRV)  //  `       Hyper
-#define HPR_TIL MT(MOD_HYPR, KC_TILD) //  ~       Hyper
-#define MEH_TIL MT(MOD_MEH,  KC_GRV)  //  `       Meh (Ctrl+Alt+Shift)
-#define SFT_MIN MT(MOD_LSFT, KC_MINS) //  -       Left Shift
-#define NPD_UND LT(_NUMS,    KC_UNDS) //  _       Layer Numpad
-#define FNC_PIP LT(_FUNC,    KC_PIPE) //  |       Layer Function Keys
-
-#define CTL_DEL MT(MOD_LCTL, KC_DEL)  //  Del     Left Control
-#define CTL_QOT MT(MOD_RCTL, KC_QUOT) //  '       Right Control
-#define CTL_BSL MT(MOD_RCTL, KC_BSLS) //  \       Right Control
-#define CTL_PIP MT(MOD_RCTL, KC_PIPE) //  |       Right Control
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- *
- * ,-----------------------------------------.    ,-----------------------------------------.
- * | Tab  |  Q   |  W   |  E   |  R   |  T   |    |  Y   |  U   |  I   |  O   |  P   | Bksp |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Esc  |  A   |  S   |  D   |  F   |  G   |    |  H   |  J   |  K   |  L   |  ;   |  '   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |  -   |  Z   |  X   |  C   |  V   |  B   |    |  N   |  M   |  ,   |  .   |  /   | Enter|
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Numpd| Meh  | Meta | Alt  | Lower| Space|    | Space| Raise| Alt  | Meta | Hyper| Func |
- * `-----------------------------------------'    `-----------------------------------------'
- *
- * with Hold (Emacs-oriented)
- * ,-----------------------------------------.    ,-----------------------------------------.
- * | Hyper|      |      |      |      |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Ctrl |      |      |      |      |      |    |      |      |      |      |      | Ctrl |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |    |      |      |      |      |      | Shift|
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_QWERTY] = LAYOUT_ortho_4x12(
-        HPR_TAB, KC_Q   , KC_W   , KC_E   , KC_R , KC_T   ,    KC_Y   , KC_U , KC_I   , KC_O   , KC_P   , KC_BSPC,
-        CTL_ESC, KC_A   , KC_S   , KC_D   , KC_F , KC_G   ,    KC_H   , KC_J , KC_K   , KC_L   , KC_SCLN, CTL_QOT,
-        SFT_MIN, KC_Z   , KC_X   , KC_C   , KC_V , KC_B   ,    KC_N   , KC_M , KC_COMM, KC_DOT , KC_SLSH, SFT_ENT,
-        NUMPAD , KC_MEH , KC_LGUI, KC_LALT, LOWER, CTL_SPC,    KC_SPC, RAISE, KC_RALT, KC_RGUI, KC_HYPR, MO(_FUNC)
-        ),
-
-
-/* Raise
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |  `   |  1   |  2   |  3   |  4   |  5   |    |  6   |  7   |  8   |  9   |  0   |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      | Left |  Up  | Down | Right|  (   |    |  )   |  -   |  =   |  [   |  ]   |  |   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |  ;   |  '   |  *   |  ,   |  {   |    |  }   |  _   |  +   |  .   |  /   |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_RAISE] = LAYOUT_ortho_4x12(
-        HPR_GRV, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,    KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
-        _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN,    KC_RPRN, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, CTL_PIP,
-        _______, KC_COLN, KC_QUOT, KC_ASTR, KC_COMM, KC_LCBR,    KC_RCBR, KC_UNDS, KC_PLUS, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
-        ),
-
-/* Lower
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |  ~   |  !   |  @   |  #   |  $   |  %   |    |  ^   |  &   |  *   |  (   |  )   |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Del  | Vol+ | Mute | Play | PgUp |  :   |    |  '   |  -   |  =   |  [   |  ]   |  \   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      | Vol- | < M  |  M > | PgDn |  ;   |    |  "   |  |   |  ,   |  .   |  /   |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_LOWER] = LAYOUT_ortho_4x12(
-        HPR_TIL, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        CTL_DEL, KC_VOLU, KC_MUTE, KC_MPLY, KC_PGUP, KC_COLN,    KC_QUOT, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, CTL_BSL,
-        _______, KC_VOLD, KC_MPRV, KC_MNXT, KC_PGDN, KC_SCLN,    KC_DQUO, KC_PIPE, KC_COMM, KC_DOT , KC_SLSH, _______,
-        _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
-        ),
-
-    [_FUNC] = LAYOUT_ortho_4x12(
-        _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,    KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , _______,
-        _______, KC_F11 , KC_F12 , KC_F13 , KC_F14 , KC_F15 ,    KC_F16 , KC_F17 , KC_F18 , KC_F19 , KC_F20 , _______,
-        _______, KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_NO  ,    KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , _______,
-        _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
-        ),
-
-    [_NUMS] = LAYOUT_ortho_4x12(
-        _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,    KC_6   , KC_7   , KC_8   , KC_9   , KC_SLSH, _______,
-        _______, KC_CAPS, KC_INS , KC_HOME, KC_PGUP, KC_LPRN,    KC_RPRN, KC_4   , KC_5   , KC_6   , KC_ASTR, _______,
-        _______, KC_NUM , KC_DEL , KC_END , KC_PGDN, KC_SCLN,    KC_COMM, KC_1   , KC_2   , KC_3   , KC_MINS, _______,
-        _______, _______, _______, _______, _______, _______,    _______, KC_0   , KC_DOT , KC_EQL , KC_PLUS, _______
-        ),
-
-    [_ADJUST] = LAYOUT_ortho_4x12(
-        QK_BOOT, XXXXXXX, KC_UP  , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL ,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,    BL_TOGG, BL_STEP, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
-        )
-};
-
-/* Template
- *
- * ,-----------------------------------------.    ,-----------------------------------------.
- * | Hyper|      |      |      |      |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Ctrl |      |      |      |      |      |    |      |      |      |      |      | Ctrl |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |    |      |      |      |      |      | Shift|
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- *
- *
- */
-//     ,-------+--------+--------+--------+--------+--------.   ,-------+--------+--------+--------+--------+--------.
-//     |       |        |        |        |        |        |   |       |        |        |        |        |        |
-//     ,-------+--------+--------+--------+--------+--------.   ,-------+--------+--------+--------+--------+--------.
-//     |       |        |        |        |        |        |   |       |        |        |        |        |        |
-//     ,-------+--------+--------+--------+--------+--------.   ,-------+--------+--------+--------+--------+--------.
-//     |       |        |        |        |        |        |   |       |        |        |        |        |        |
-//     ,-------+--------+--------+--------+--------+--------.   ,-------+--------+--------+--------+--------+--------.
-//     |       |        |        |        |        |        |   |       |        |        |        |        |        |
-//     `-------+--------+--------+--------+--------+--------'   `-------+--------+--------+--------+--------+--------,
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/levinson/keymaps/jyh/readme.md b/keyboards/keebio/levinson/keymaps/jyh/readme.md
deleted file mode 100644
index e20424e5180..00000000000
--- a/keyboards/keebio/levinson/keymaps/jyh/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# jyh's levinson layout
-
-[Levinson](https://keeb.io/products/levinson-lets-split-w-led-backlight)
-built on rev2 PCBs. A split 4x12 keyboard with LED backlights.
-
-The layout is oriented towards needs for programming, Emacs, XMonad,
-and experience with 60% keyboards with no base layer arrow keys
-(Poker). It makes heavy use of modifiers and layers.
-
-## Layout features
-
-  * Extensive use of _Mod Tap_, e.g.
-     * Tap sends Esc, Hold sends Left Control
-     * Tap sends Enter, Hold sends Right Shift
-     * ... and many more
-  * Hyper and Meh keys
-  * Right modifier keys in place of arrow keys
-    * Arrows are instead available in two alternate locations:
-    * WASD arrows on _Adjust_
-    * Arrow cluster on _Raise_ (inspired by hexwire)
-  * Centered symbol/bracket cluster on _Lower/Raise_
-    * Inspired by hexwire layout
-    * Programming-oriented
-  * Spacebar sends modifier keys on hold (_this is finicky in practice. may shut off completely_)
-    * Control ~~and Alt/Meta~~ on left ~~and right~~ space, respectively
-    * Strict space available on _Function_ and _Numpad_ layers
-    * For Emacs keychords
-  * Extra dedicated layers
-    * Numpad (available with tap toggle)
-    * Function key (F01-24)
-  * Redunant keys where it is convenient to have characters together
-    on one layer
diff --git a/keyboards/keebio/levinson/keymaps/jyh/rules.mk b/keyboards/keebio/levinson/keymaps/jyh/rules.mk
deleted file mode 100644
index 66110cfcc0f..00000000000
--- a/keyboards/keebio/levinson/keymaps/jyh/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE=yes
diff --git a/keyboards/keebio/levinson/keymaps/jyh2/config.h b/keyboards/keebio/levinson/keymaps/jyh2/config.h
deleted file mode 100644
index d4974fe0cfd..00000000000
--- a/keyboards/keebio/levinson/keymaps/jyh2/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-
-/* Tap Dance timing */
-#define TAPPING_TERM 150
-
-/* Toggling layer requires # taps */
-#define TAPPING_TOGGLE 3
-
-#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 12
diff --git a/keyboards/keebio/levinson/keymaps/jyh2/keymap.c b/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
deleted file mode 100644
index 87c02c5a449..00000000000
--- a/keyboards/keebio/levinson/keymaps/jyh2/keymap.c
+++ /dev/null
@@ -1,222 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 3                                                                /* Symbols, Media */
-#define _RAISE 4                                                                /* Numbers, Arrows */
-#define _FUNC  5                                                                /* Function Keys */
-#define _NUMS  6                                                                /* Numpad */
-#define _ADJUST 16
-
-/* short layer aliases */
-#define _QW _QWERTY
-#define _LW _LOWER
-#define _RS _RAISE
-#define _NM _NUMS
-#define _AD _ADJUST
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  MKITPNK,
-  DYNAMIC_MACRO_RANGE
-};
-
-#include "dynamic_macro.h"
-
-#define DREC_1  DM_REC1
-#define DREC_2  DM_REC2
-#define DPLAY_1 DM_PLY1
-#define DPLAY_2 DM_PLY2
-#define DSTOP   DM_RSTP
-
-
-// Mod Tap Definitions
-// -------------------
-                                      //  Tap     Hold
-                                      //  ------------------
-#define GUI_GRV MT(MOD_LGUI, KC_GRV)  //  `       Meta
-#define CTL_ESC MT(MOD_LCTL, KC_ESC)  //  Esc     Left Control
-#define SFT_MIN MT(MOD_LSFT, KC_MINS) //  -       Left Shift
-#define MEH_LBC MT(MOD_MEH,  KC_LBRC) //  [       Meh
-#define CTL_BSP MT(MOD_LCTL, KC_BSPC)  // Bkspce  Left Control
-#define HPR_RBC MT(MOD_HYPR, KC_RBRC) //  ]       Hyper
-#define SFT_EQL MT(MOD_RSFT, KC_EQL)  //  =       Right Shift
-#define GUI_BSL MT(MOD_RGUI, KC_BSLS) //  \       Meta
-
-#define NUM_TAB LT(_NUMS, KC_TAB)     //  Tab     Layer Numpad
-
-#define CTL_DEL MT(MOD_LCTL, KC_DEL)  //  Del     Left Control
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |  `   |  Q   |  W   |  E   |  R   |  T   |    |  Y   |  U   |  I   |  O   |  P   |  \   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Esc  |  A   |  S   |  D   |  F   |  G   |    |  H   |  J   |  K   |  L   |  ;   |  '   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |  -   |  Z   |  X   |  C   |  V   |  B   |    |  N   |  M   |  ,   |  .   |  /   |  =   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Tab  |  [   | Meta | Alt  | Lower| Bksp |    | Space| Raise| Alt  | Meta |  ]   | Enter|
- * `-----------------------------------------'    `-----------------------------------------'
- * with Hold (Emacs-oriented)
- * ,-----------------------------------------.    ,-----------------------------------------.
- * | Meta |      |      |      |      |      |    |      |      |      |      |      | Meta |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Ctrl |      |      |      |      |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |    |      |      |      |      |      | Shift|
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Numpd| Meh  |      |      |      | Ctrl |    |      |      |      |      | Hyper|      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_QW] = LAYOUT_ortho_4x12(
-        GUI_GRV, KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , GUI_BSL,
-        CTL_ESC, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
-        SFT_MIN, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, SFT_EQL,
-        NUM_TAB, MEH_LBC, KC_LGUI, KC_LALT, LOWER  , CTL_BSP, KC_SPC , RAISE  , KC_RALT, KC_RGUI, HPR_RBC, KC_ENT
-        ),
-
-/* Raise
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |      |  1   |  2   |  3   |  4   |  5   |    |  6   |  7   |  8   |  9   |  0   |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      | Left |  Up  | Down | Right|  ;   |    |  '   |  4   |  5   |  6   |  *   |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |  {   |  }   |  (   |  )   |  ,   |    |  -   |  1   |  2   |  3   |  /   |  =   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |Adjust|      |    |      | RAISE|   .  |  0   |  +   | Enter|
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_RS] = LAYOUT_ortho_4x12(
-        _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
-        _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_SCLN, KC_QUOT, KC_4   , KC_5   , KC_6   , KC_ASTR, _______,
-        _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_COMM, KC_MINS, KC_1   , KC_2   , KC_3   , KC_SLSH, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_DOT , KC_0   , KC_PLUS, _______
-        ),
-
-/* Lower
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |  ~   |  !   |  @   |  #   |  $   |  %   |    |  ^   |  &   |  *   |  (   |  )   |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Del  | Vol+ | Mute | Play | PgUp | Home |    |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      | Vol- | < M  |  M > | PgDn | End  |    |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |LOWER |      |    |      |Adjust|      |      |      | Enter|
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_LW] = LAYOUT_ortho_4x12(
-        _______, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        CTL_DEL, KC_VOLU, KC_MUTE, KC_MPLY, KC_PGUP, KC_HOME,    KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,
-        _______, KC_VOLD, KC_MPRV, KC_MNXT, KC_PGDN, KC_END ,    KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
-        _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
-        ),
-
-/* Numpad
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |      |      | PrSc | ScrLk| Pause|      |    |      |  7   |  8   |  9   |  0   | Lock |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      | Ins  | Home | PgUp |      |    |      |  4   |  5   |  6   |  /   |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      | Del  | End  | PgDn |      |    |      |  1   |  2   |  3   |  *   |  =   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |NUMPAD|      |      |      |      |      |    |      |  0   |  .   |  +   |  -   | Enter|
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_NM] = LAYOUT_ortho_4x12(
-        XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX,    XXXXXXX, KC_7   , KC_8   , KC_9   , KC_0   , TO(_NM),
-        XXXXXXX, XXXXXXX, KC_INS , KC_HOME, KC_PGUP, XXXXXXX,    XXXXXXX, KC_4   , KC_5   , KC_6   , KC_SLSH, XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_DEL , KC_END , KC_PGDN, XXXXXXX,    XXXXXXX, KC_1   , KC_2   , KC_3   , KC_ASTR, KC_EQL ,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,    _______, KC_0   , KC_DOT , KC_PLUS, KC_MINS, _______
-        ),
-
-/* Adjust
- * ,-----------------------------------------.    ,-----------------------------------------.
- * | Reset|      |  Up  |      |      | Rec1 |    | Rec2 | Plain| Snake|Gradnt|      | Del  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Caps | Left | Down | Right|MkItPk| Play1|    | Play2| RGB  | HUE+ | SAT+ | BRI+ |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      | Stop1|    | Stop2| MODE | HUE- | SAT- | BRI- |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_ADJUST] = LAYOUT_ortho_4x12(
-        QK_BOOT, XXXXXXX,  KC_UP , XXXXXXX, XXXXXXX, DREC_1 ,    DREC_2 , RGB_M_P, RGB_M_SN,RGB_M_G, XXXXXXX, KC_DEL ,
-        KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, MKITPNK, DPLAY_1,    DPLAY_2, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DSTOP  ,    DSTOP  , RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,
-        _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
-        )
-};
-
-void make_it_pink_blue(void) {
-    uint16_t blue_hue = 210;
-    uint16_t pink_hue = 315;
-
-    /* key is pressed */
-    uint16_t hue = rgblight_get_hue();
-    uint8_t sat = rgblight_get_sat();
-    uint8_t val = rgblight_get_val();
-
-    if (hue != blue_hue)
-        rgblight_sethsv(blue_hue, sat, val);
-    else
-        rgblight_sethsv(pink_hue, sat, val);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_dynamic_macro(keycode, record))
-        return false;
-
-    switch (keycode) {
-      case QWERTY:
-          if (record->event.pressed) {
-              set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-      case LOWER:
-          if (record->event.pressed) {
-              layer_on(_LOWER);
-              update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-              layer_off(_LOWER);
-              update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-      case RAISE:
-          if (record->event.pressed) {
-              layer_on(_RAISE);
-              update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-              layer_off(_RAISE);
-              update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-      case ADJUST:
-          if (record->event.pressed) {
-              layer_on(_ADJUST);
-          } else {
-              layer_off(_ADJUST);
-          }
-          return false;
-          break;
-      case MKITPNK:
-          if (record->event.pressed)
-              make_it_pink_blue();
-          return false;
-          break;
-    }
-    return true;
-}
diff --git a/keyboards/keebio/levinson/keymaps/jyh2/readme.md b/keyboards/keebio/levinson/keymaps/jyh2/readme.md
deleted file mode 100644
index 45ca956922a..00000000000
--- a/keyboards/keebio/levinson/keymaps/jyh2/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# jyh's levinson layout
-
-[Levinson](https://keeb.io/products/levinson-lets-split-w-led-backlight)
-built on rev2 PCBs. A split 4x12 keyboard with LED backlights.
-
-The layout is oriented towards needs for programming, Emacs, XMonad,
-and experience with 60% keyboards with no base layer arrow keys
-(Poker). It makes heavy use of modifiers and layers. It is influenced
-by good ideas from the Atreus keyboard layout.
-
-## Layout features
-
-  * Extensive use of _Mod Tap_, e.g.
-     * Tap sends Esc, Hold sends Left Control
-     * Tap sends Tab, Hold activates Numpad layer
-     * Tap sends  - , Hold sends Shift
-     * ... and many more
-  * Places Tab and Enter on bottom corners, for hitting with palm
-  * Meta is available on top corners, for controlling XMonad
-  * Control on center key, for Emacs (among other things)
-  * Backspace (Control Hold) and Space on center keys
-  * All 60% keys available on base layer, except for numbers
-  * Hyper and Meh keys
-  * Right modifier keys in place of arrow keys
-    * Arrows are instead available in two alternate locations:
-    * WASD arrows on _Adjust_
-    * Arrow cluster on _Raise_ (inspired by hexwire)
-  * Numpad and Numrow on _Raise_ layer. Each is faster in some contexts
-  * Function keys on _Lower_
-  * Dynamic macros from QMK firmware on _Adjust_
-  * Redunant keys where it is convenient to have characters together
-    on one layer
diff --git a/keyboards/keebio/levinson/keymaps/jyh2/rules.mk b/keyboards/keebio/levinson/keymaps/jyh2/rules.mk
deleted file mode 100644
index fb670123ed9..00000000000
--- a/keyboards/keebio/levinson/keymaps/jyh2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE=yes
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/keebio/levinson/keymaps/ksamborski/config.h b/keyboards/keebio/levinson/keymaps/ksamborski/config.h
deleted file mode 100644
index 2b3c4332067..00000000000
--- a/keyboards/keebio/levinson/keymaps/ksamborski/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-
-#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 12
diff --git a/keyboards/keebio/levinson/keymaps/ksamborski/keymap.c b/keyboards/keebio/levinson/keymaps/ksamborski/keymap.c
deleted file mode 100644
index 3833b6a2235..00000000000
--- a/keyboards/keebio/levinson/keymaps/ksamborski/keymap.c
+++ /dev/null
@@ -1,151 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _QW,
-  _LW,
-  _RS,
-  _AD,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  MKITPNK
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------.    ,-----------------------------------------.
- * | Esc  |  Q   |  W   |  E   |  R   |  T   |    |  Y   |  U   |  I   |  O   |  P   | Del  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Tab  |  A   |  S   |  D   |  F   |  G   |    |  H   |  J   |  K   |  L   |  ;   | Bksp |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Shift|  Z   |  X   |  C   |  V   |  B   |    |  N   |  M   |  ,   |  .   |  \   |  =   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Ctrl |      | Meta | Alt  | Lower| Enter|    | Space| Raise| Alt  | Meta |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_QW] = LAYOUT_ortho_4x12(
-        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_BSPC,
-        KC_LSFT , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_BSLS, KC_EQL ,
-        KC_LCTL , _______, KC_LGUI, KC_LALT, LOWER  , KC_ENT , KC_SPC , RAISE  , KC_RALT, KC_LGUI, _______, _______
-        ),
-
-/* Raise
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |   ,  |  1   |  2   |  3   |  +   |  -   |    |  {   |  }   |  (   |  )   |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |   .  |  4   |  5   |  6   |  #   |  *   |    |  F1  | F2   | F3   | F4   | F5   | F6   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Shift|  7   |  8   |  9   |  /   |  =   |    |  F7  | F8   | F9   | F10  | F11  | F12  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |  0   |      |Adjust|      |    |      | RAISE|      |      |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_RS] = LAYOUT_ortho_4x12(
-        KC_COMM , KC_1   , KC_2   , KC_3   , KC_PLUS, KC_MINS, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, _______, _______,
-        KC_DOT  , KC_4   , KC_5   , KC_6   , KC_HASH, KC_ASTR, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,
-        KC_LSFT , KC_7   , KC_8   , KC_9   , KC_SLSH, KC_EQL , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
-        _______ , _______, KC_0   , _______, _______, _______, _______, _______, _______, _______, _______, _______
-        ),
-
-/* Lower
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |  `   |  !   |  @   |  #   |  $   |  %   |    |  Home|  PgDn|  PgUp|  End |  (   |  )   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      | Vol+ | Mute | Play |      | Ins  |    |  Left|  Down|  Up  | Right|  {   |  }   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      | Vol- | < M  |  M > |      |      |    |  ^   |  &   |  *   |  '   |  [   |  ]   |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |LOWER |      |    | Shift|Adjust|      |      |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_LW] = LAYOUT_ortho_4x12(
-        KC_GRV  , KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,    KC_HOME , KC_PGDN, KC_PGUP, KC_END  , KC_LPRN, KC_RPRN,
-        _______ , KC_VOLU, KC_MUTE, KC_MPLY, _______, KC_INS ,    KC_LEFT , KC_DOWN, KC_UP  , KC_RIGHT, KC_LCBR, KC_RCBR,
-        _______ , KC_VOLD, KC_MPRV, KC_MNXT, _______, _______,    KC_CIRC , KC_AMPR, KC_ASTR, KC_QUOT , KC_LBRC, KC_RBRC ,
-        _______ , _______, _______, _______, _______, _______,    KC_LSFT , _______, _______, _______ , _______, _______
-        ),
-
-/* Adjust
- * ,-----------------------------------------.    ,-----------------------------------------.
- * | Reset|      |  Up  |      |      | Rec1 |    | Rec2 | Plain| Snake|Gradnt|      | Del  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Caps | Left | Down | Right|MkItPk| Play1|    | Play2| RGB  | HUE+ | SAT+ | BRI+ |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      | Stop1|    | Stop2| MODE | HUE- | SAT- | BRI- |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-    [_AD] = LAYOUT_ortho_4x12(
-        QK_BOOT, XXXXXXX,  KC_UP , XXXXXXX, XXXXXXX, DM_REC1,    DM_REC2, RGB_M_P, RGB_M_SN,RGB_M_G, XXXXXXX, KC_DEL ,
-        KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, MKITPNK, DM_PLY1,    DM_PLY2, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DM_RSTP,    DM_RSTP, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,
-        _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______
-        )
-};
-
-void make_it_pink_blue(void) {
-    uint16_t blue_hue = 210;
-    uint16_t pink_hue = 315;
-
-    /* key is pressed */
-    uint16_t hue = rgblight_get_hue();
-    uint8_t sat = rgblight_get_sat();
-    uint8_t val = rgblight_get_val();
-
-    if (hue != blue_hue)
-        rgblight_sethsv(blue_hue, sat, val);
-    else
-        rgblight_sethsv(pink_hue, sat, val);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-      case QWERTY:
-          if (record->event.pressed) {
-              set_single_persistent_default_layer(_QW);
-          }
-          return false;
-          break;
-      case LOWER:
-          if (record->event.pressed) {
-              layer_on(_LW);
-              update_tri_layer(_LW, _RS, _AD);
-          } else {
-              layer_off(_LW);
-              update_tri_layer(_LW, _RS, _AD);
-          }
-          return false;
-          break;
-      case RAISE:
-          if (record->event.pressed) {
-              layer_on(_RS);
-              update_tri_layer(_LW, _RS, _AD);
-          } else {
-              layer_off(_RS);
-              update_tri_layer(_LW, _RS, _AD);
-          }
-          return false;
-          break;
-      case ADJUST:
-          if (record->event.pressed) {
-              layer_on(_AD);
-          } else {
-              layer_off(_AD);
-          }
-          return false;
-          break;
-      case MKITPNK:
-          if (record->event.pressed)
-              make_it_pink_blue();
-          return false;
-          break;
-    }
-    return true;
-}
diff --git a/keyboards/keebio/levinson/keymaps/ksamborski/rules.mk b/keyboards/keebio/levinson/keymaps/ksamborski/rules.mk
deleted file mode 100644
index d9c186d4271..00000000000
--- a/keyboards/keebio/levinson/keymaps/ksamborski/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE=yes
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-DYNAMIC_MACRO_ENABLE=yes
diff --git a/keyboards/keebio/levinson/keymaps/mmacdougall/README.md b/keyboards/keebio/levinson/keymaps/mmacdougall/README.md
deleted file mode 100644
index bae8c8a4b83..00000000000
--- a/keyboards/keebio/levinson/keymaps/mmacdougall/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-mmacdougall's Levinson Layout
-============================
-
-Similar to default layout, however RGB & backlight controls are mapped to adjust layer
-
-## Layouts
-
-### Adjust (Lower + Raise)
-
-```
-/* Adjust (Lower + Raise)
- ,-----------------------------------------------------------------------------------.
- |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |B Step|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |      |      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |             |      |      |      |      |      |
- `-----------------------------------------------------------------------------------' 
-```
diff --git a/keyboards/keebio/levinson/keymaps/mmacdougall/config.h b/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
deleted file mode 100644
index 3cfb5587bd5..00000000000
--- a/keyboards/keebio/levinson/keymaps/mmacdougall/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/levinson/keymaps/mmacdougall/keymap.c b/keyboards/keebio/levinson/keymaps/mmacdougall/keymap.c
deleted file mode 100644
index eb4fc106740..00000000000
--- a/keyboards/keebio/levinson/keymaps/mmacdougall/keymap.c
+++ /dev/null
@@ -1,197 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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 ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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_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
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |B Step|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  BL_STEP, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/levinson/keymaps/mmacdougall/rules.mk b/keyboards/keebio/levinson/keymaps/mmacdougall/rules.mk
deleted file mode 100644
index d7463419b4f..00000000000
--- a/keyboards/keebio/levinson/keymaps/mmacdougall/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/levinson/keymaps/numpad/config.h b/keyboards/keebio/levinson/keymaps/numpad/config.h
deleted file mode 100644
index 7e10bc445cf..00000000000
--- a/keyboards/keebio/levinson/keymaps/numpad/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-// Need to flip the rows
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 }
-
-/* Select hand configuration */
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-/* Time in ms until oneshot layer times out */
-#define ONESHOT_TIMEOUT 3000
diff --git a/keyboards/keebio/levinson/keymaps/numpad/keymap.c b/keyboards/keebio/levinson/keymaps/numpad/keymap.c
deleted file mode 100644
index 851abb3657a..00000000000
--- a/keyboards/keebio/levinson/keymaps/numpad/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/* Add the stings you want to send as macros, see
- * https://docs.qmk.fm/#/feature_macros for what all can be used
- */
-#define MACRO_0 "zero"
-#define MACRO_1 "one"
-#define MACRO_2 "two"
-#define MACRO_3 "three"
-#define MACRO_4 "four"
-#define MACRO_5 "five"
-#define MACRO_6 "six"
-#define MACRO_7 "seven"
-#define MACRO_8 "eight"
-#define MACRO_9 "nine"
-
-enum macro_keycodes {
-    M0 = SAFE_RANGE,
-    M1,
-    M2,
-    M3,
-    M4,
-    M5,
-    M6,
-    M7,
-    M8,
-    M9
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Numpad
- * ,-----------------------------------------------------------------------------------.
- * |   0  |   1  |   4  |   7  | BkSp |OSL(1)|      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ,  |   2  |   5  |   8  |   /  | Down |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   .  |   3  |   6  |   9  |   *  | Up   |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |    Enter    |   +  |   -  |   =  | MO(1)|      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[0] = LAYOUT_ortho_4x12(
-    KC_KP_0,     KC_KP_1, KC_KP_4,    KC_KP_7,     KC_BSPC,        OSL(1),  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_COMMA,    KC_KP_2, KC_KP_5,    KC_KP_8,     KC_KP_SLASH,    KC_DOWN, KC_NO, KC_A,  KC_B,  KC_C,  KC_D,  KC_NO,
-    KC_KP_DOT,   KC_KP_3, KC_KP_6,    KC_KP_9,     KC_KP_ASTERISK, KC_UP,   KC_NO, KC_E,  KC_F,  KC_G,  KC_H,  KC_NO,
-    KC_KP_ENTER, KC_NO,   KC_KP_PLUS, KC_KP_MINUS, KC_KP_EQUAL,    MO(1),  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-),
-/* Macro layer - the number keys are macros,
- * other functions on remaining keys
- * ,-----------------------------------------.
- * | M(0) | M(1) | M(4) | M(7) |      | Esc  |
- * |------+------+------+------+------+------|
- * | Left | M(2) | M(5) | M(8) |      |      |
- * |------+------+------+------+------+------|
- * | Right| M(3) | M(6) | M(9) |      |      |
- * |------+------+------+------+------+------|
- * |   NumLock   | QK_BOOT|      |      | Calc |
- * `-----------------------------------------'
- */
-[1] = LAYOUT_ortho_4x12(
-    M0,       M1, M4, M7, KC_NO, KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_LEFT,  M2, M5, M8, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_RIGHT, M3, M6, M8, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NUM,   QK_BOOT, KC_NO, KC_NO, KC_CALC, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case M0:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_0);
-            }
-            break;
-        case M1:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_1);
-            }
-            break;
-        case M2:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_2);
-            }
-            break;
-        case M3:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_3);
-            }
-            break;
-        case M4:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_4);
-            }
-            break;
-        case M5:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_5);
-            }
-            break;
-        case M6:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_6);
-            }
-            break;
-        case M7:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_7);
-            }
-            break;
-        case M8:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_8);
-            }
-            break;
-        case M9:
-            if (record->event.pressed) {
-                SEND_STRING(MACRO_9);
-            }
-            break;
-    }
-    return true;
-};
diff --git a/keyboards/keebio/levinson/keymaps/numpad/readme.md b/keyboards/keebio/levinson/keymaps/numpad/readme.md
deleted file mode 100644
index 0c15ac54d30..00000000000
--- a/keyboards/keebio/levinson/keymaps/numpad/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Numpad Layout
-[Layout Example](http://www.keyboard-layout-editor.com/##@@_c=%23ffd100&a:7%3B&=&_c=%23909596&f:5%3B&=&=&=%3B&@_c=%23c4c8c5&st=MX1A-L1xx&f:6%3B&=Esc&=%2F%2F&=*&=%3F%3B&@=7&=8&=9&=%E2%80%93%3B&@=4&_n:true%3B&=5&=6&=+%3B&@=1&=2&=3&_c=%23ffd100&h:2%3B&=%3B&@_c=%23c4c8c5%3B&=0&_a:5%3B&=%3C%0A,&=%3E%0A.)
-
-Uses a single half of the Levinson a vertical 4x6 numpad/macropad.
diff --git a/keyboards/keebio/levinson/keymaps/numpad/rules.mk b/keyboards/keebio/levinson/keymaps/numpad/rules.mk
deleted file mode 100644
index 639c76834c9..00000000000
--- a/keyboards/keebio/levinson/keymaps/numpad/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Build Options
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
diff --git a/keyboards/keebio/levinson/keymaps/steno/config.h b/keyboards/keebio/levinson/keymaps/steno/config.h
deleted file mode 100644
index 630cc6238f7..00000000000
--- a/keyboards/keebio/levinson/keymaps/steno/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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 USE_I2C
-
-#define FORCE_NKRO  //For Steno.
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-
diff --git a/keyboards/keebio/levinson/keymaps/steno/keymap.c b/keyboards/keebio/levinson/keymaps/steno/keymap.c
deleted file mode 100644
index 067e560d1b7..00000000000
--- a/keyboards/keebio/levinson/keymaps/steno/keymap.c
+++ /dev/null
@@ -1,147 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _PLOVER 0
-#define _QWERTY 1
-#define _LOWER 2
-#define _RAISE 3
-#define _ADJUST 4
-
-enum custom_keycodes 
-{
-  PLOVER = SAFE_RANGE,
-  QWERTY, 
-  LOWER,
-  RAISE,
-  ADJUST,
-  EXT_QWE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = 
-{
-
-  [_PLOVER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-      STN_PWR,  STN_S1, STN_TL,  STN_PL,  STN_HL, STN_ST1,                            STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      STN_FN,  STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2,                           STN_ST4,  STN_RR,  STN_BR, STN_GR,  STN_SR,  STN_ZR,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     STN_N1,    STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,                             STN_N7, STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼                          ┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX,  STN_RE1,  STN_RE2, XXXXXXX, STN_A,   STN_O,                              STN_E,  STN_U, XXXXXXX, XXXXXXX, QWERTY, XXXXXXX
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴                          ┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
- 
-  ),
-
-  [_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_BSPC,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_RSFT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LGUI, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼                          ┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LALT, KC_MINUS, KC_TAB, KC_LCTL, LOWER,    KC_SPC,                            KC_ENT,  RAISE,   KC_RCTL, KC_RGUI,  EXT_QWE, KC_RALT
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴                          ┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                                  
-  ),
-
-  [_LOWER] = LAYOUT( 
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                              _______,  KC_7,   KC_8,    KC_9,   KC_PLUS, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_F7,    KC_F8,   KC_LEFT, KC_UP,  KC_RGHT,  KC_F9,                            KC_PSLS,   KC_4,   KC_5,    KC_6,   KC_MINUS, KC_MUTE,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  KC_F10,   KC_F11,  KC_DOWN, KC_F11, KC_F12,                            KC_PAST,  KC_1,   KC_2,    KC_3,   KC_EQL,   KC_VOLU,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼                          ┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  _______,  _______, _______, _______, _______,                           KC_0,   _______, KC_COMM, KC_DOT,  KC_ENT, KC_VOLD
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴                          ┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-  
-  ),
-
-  [_RAISE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRAVE,  KC_TILD, KC_UNDS, KC_EQL, KC_PIPE,  _______,                         KC_HOME, KC_DEL, _______, KC_INS, KC_PGUP, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_BSLS,KC_LCBR, KC_RCBR, KC_MINUS, KC_LBRC, KC_RBRC,                          KC_END, KC_LEFT, KC_UP, KC_RGHT, KC_PGDN, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_COLN,  KC_LT,   KC_GT,  KC_PLUS,  KC_LPRN, KC_RPRN,                            _______, _______, KC_DOWN, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼                          ┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴                          ┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-  
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______,  _______, KC_CAPS, KC_MENU, KC_APP, KC_PSCR,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______,  _______,_______, _______, _______, KC_PAUS,                            _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______,  KC_SCRL,                           _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼                          ┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴                          ┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-   
-  ),
-
-  
-};
-
-
-void matrix_init_user(void) {
-  steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case PLOVER:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_PLOVER);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (!record->event.pressed) {
-        layer_on(_QWERTY);
-      }
-      return false;
-      break;
-    case EXT_QWE:
-      if (record->event.pressed) {
-        layer_off(_QWERTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/levinson/keymaps/steno/rules.mk b/keyboards/keebio/levinson/keymaps/steno/rules.mk
deleted file mode 100644
index 18c51540bf5..00000000000
--- a/keyboards/keebio/levinson/keymaps/steno/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTRAKEY_ENABLE = no       # Disable if you run out of usb endpoints. Media keys need this to work.
-MOUSEKEY_ENABLE = no        # Mouse keys Uses extra usb enpoints. 
-STENO_ENABLE = yes          # Additional protocols for Stenography, requires VIRTSER.
-AUDIO_ENABLE = no           # Audio output on port C6
-MIDI_ENABLE = no            # MIDI controls
-NKRO_ENABLE = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/keebio/levinson/keymaps/treadwell/config.h b/keyboards/keebio/levinson/keymaps/treadwell/config.h
deleted file mode 100644
index 6965a1251b9..00000000000
--- a/keyboards/keebio/levinson/keymaps/treadwell/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define TAPPING_TERM 150
-
-/* default layer sounds */
-#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                              SONG(GAME_SOUND), \
-                              SONG(COLEMAK_SOUND) \
-                            }
-
-//#undef RGBLED_NUM
-//#define RGBLED_NUM 12
-//#define RGBLIGHT_HUE_STEP 8
-//#define RGBLIGHT_SAT_STEP 8
-//#define RGBLIGHT_VAL_STEP 8
-
-#endif
diff --git a/keyboards/keebio/levinson/keymaps/treadwell/keymap.c b/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
deleted file mode 100644
index 85db1696cde..00000000000
--- a/keyboards/keebio/levinson/keymaps/treadwell/keymap.c
+++ /dev/null
@@ -1,175 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _GAME 2
-#define _NUMB 3
-#define _CODE 4
-#define _SYS 5
-#define _FN4 6
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  GAME,
-  NUMB,
-  CODE,
-  SYS,
-  FN4,
-  ADJUST,
-};
-
-#define KC_X1 CODE
-#define KC_X2 NUMB
-#define KC_X3 MO(_SYS)
-#define KC_X4 MT(MOD_LSFT, KC_ENT)
-
-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_MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     KC_BSPC, 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_X4 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      KC_X3 ,KC_LCTL,KC_LALT,KC_LGUI, KC_X1 ,KC_LALT,     KC_SPC , KC_X2 ,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-
-  [_COLEMAK] = LAYOUT(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     KC_TAB , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  ,      KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_MINS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     KC_BSPC, 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_X4 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      KC_X3 ,KC_LCTL,KC_LALT,KC_LGUI, KC_X1 ,KC_LALT,     KC_SPC , KC_X2 ,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-
-  [_GAME] = LAYOUT(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     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_ESC , 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_UP ,KC_ENT ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     KC_LCTL, KC_X3 ,KC_LGUI,KC_LALT,KC_SPC , KC_X2 ,     KC_BSPC, KC_X1 ,KC_SLSH,KC_LEFT,KC_DOWN,KC_RGHT
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-
-  [_NUMB] = LAYOUT(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     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_GRV , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,      KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_UNDS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     _______,_______,KC_MPRV,KC_MNXT,KC_MPLY,_______,     _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,KC_LALT,     _______,_______,_______,_______,_______,_______
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-
-  [_CODE] = LAYOUT(
-  //,----+------+----+----+----+----.    ,----+----+----+----+----+----.
-     KC_ESC ,  _______,_______, KC_UP ,_______,_______,     KC_PGUP,KC_HOME,KC_LPRN,KC_RPRN,KC_BSLS,KC_PIPE,
-  //|----+------+----+----+----+----|    |----+----+----+----+----+----|
-     KC_CAPS,KC_SELECT,KC_LEFT,KC_DOWN,KC_RGHT,KC_DEL ,     KC_PGDN, KC_END,KC_LBRC,KC_RBRC,KC_MINS,KC_UNDS,
-  //|----+------+----+----+----+----|    |----+----+----+----+----+----|
-     KC_LSFT, KC_UNDO ,KC_CUT ,KC_COPY,KC_PASTE,   _______,     KC_LEFT,KC_RGHT,KC_LCBR,KC_RCBR,KC_PLUS, KC_EQL,
-  //|----+------+----+----+----+----|    |----+----+----+----+----+----|
-     _______,  _______,_______,_______,_______,KC_LALT,     _______,_______,_______,_______,_______,_______
-  //`----+------+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-
-  [_SYS] = LAYOUT(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,      KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
-  ),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______,
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, GAME  ,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case GAME:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_GAME);
-      }
-      return false;
-      break;
-    case NUMB:
-      if (record->event.pressed) {
-        layer_on(_NUMB);
-        update_tri_layer(_NUMB, _CODE, _ADJUST);
-      } else {
-        layer_off(_NUMB);
-        update_tri_layer(_NUMB, _CODE, _ADJUST);
-      }
-      return false;
-      break;
-    case CODE:
-      if (record->event.pressed) {
-        layer_on(_CODE);
-        update_tri_layer(_NUMB, _CODE, _ADJUST);
-      } else {
-        layer_off(_CODE);
-        update_tri_layer(_NUMB, _CODE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/levinson/keymaps/treadwell/rules.mk b/keyboards/keebio/levinson/keymaps/treadwell/rules.mk
deleted file mode 100644
index 1d2d9e5a9c4..00000000000
--- a/keyboards/keebio/levinson/keymaps/treadwell/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/README.md b/keyboards/keebio/nyquist/keymaps/bramver/README.md
deleted file mode 100644
index 2768acdf7d7..00000000000
--- a/keyboards/keebio/nyquist/keymaps/bramver/README.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# Nyquist Layout - rev 02
-
-Standard qwerty layout.  
-Limited emoji support and proper mouse settings.
-
-Mostly based off of my XD75 layout.
-
-## Keymap
-
-```
-
-/* Base
- * ,-----------------------------------------. ,-----------------------------------------.
- * | GEsc |   1  |   2  |   3  |   4  |   5  | |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  | |   Y  |   U  |   I  |   O  |   P  | Entr |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | LOW  |   A  |   S  |   D  |   F  |   G  | |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shft |   Z  |   X  |   C  |   V  |   B  | |   N  |   M  |   ,  |   .  |   /  | Shft |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | EMO  | Alt  | GUI  | SPCE |SP_LMS| |SP_RMS|SP_RMS| GUI  | Alt  | RAI  | Ctrl |
- * `-----------------------------------------' `-----------------------------------------'
- */
-
-
- /* Lower
- * ,-----------------------------------------. ,-----------------------------------------.
- * | GESC |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab  |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  | Entr |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |  \   |  -   |  =   |  [   |  ]   | |  [   |  ]   |  -   |  =   |  \   | Del  |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shft |  ^Z  |  ^X  |  ^C  |  ^V  |      | | Play | Vol+ | Vol- | Mute | Next | Shft |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl |      | Alt  | GUI  |      |      | |      |      | GUI  | Alt  |      | Ctrl |
- * `-----------------------------------------' `-----------------------------------------'
- */
-
-
-/* Raise
- * ,-----------------------------------------. .-----------------------------------------.
- * | GESC |      |      |      |      |      | |      |   =  |   /  |   *  |   -  | Bksp  |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab  |  F9  |  F10 | F11  | F12  |      | |      |   7  |   8  |   9  |   +  | Entr |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |  F5  |  F6  |  F7  |  F8  |      | |      |   4  |   5  |   6  |  ,   | Del  |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shft |  F1  |  F2  |  F3  |  F4  |      | |      |   1  |   2  |   3  |  .   | Shft |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl |      | Alt  | GUI  |      |      | |      |  0   | GUI  | Alt  |      | Ctrl |
- * `-----------------------------------------' `-----------------------------------------'
- */
-
-
-/* LMOUSE (Lower + Raise)
- * ,-----------------------------------------. ,-----------------------------------------.
- * | GESC |      | Home | End  | PGUP | PGDN | |      |      |      |      |      | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab  | WH_L | BTN1 | MS_U | BTN2 | WH_U | |      |      |      |      |      | Entr |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      | WH_R | MS_L | MS_D | MS_R | WH_D | |      |      |      |      |      | Del  |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shft | LEFT | DOWN |  UP  |RIGHT |      | |      |      |      |      |      | Shft |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl |      | Alt  | GUI  |      |      | |      |      | GUI  | Alt  |      | Ctrl |
- * `-----------------------------------------' `-----------------------------------------'
- */
-
-
-/* RMOUSE (Lower + Raise)
- * ,-----------------------------------------. ,-----------------------------------------.
- * | GESC |      |      |      |      |      | | PGUP | PGDN | Home | End  |      | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab  |      |      |      |      |      | | WH_U | BTN1 | MS_U | BTN2 | WH_L | Entr |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      |      |      | | WH_D | MS_L | MS_D | MS_R | WH_R | Del  |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shft |      |      |      |      |      | |      | LEFT | DOWN |  UP  |RIGHT | Shft |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl |      | Alt  | GUI  |      |      | |      |      | GUI  | Alt  |      | Ctrl |
- * `-----------------------------------------' `-----------------------------------------'
- */
-
-
-/* Emojis
- * ,-----------------------------------------. ,-----------------------------------------.
- * | GESC |      |      |      |      |      | | RSET |      |      |      |      | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab  | CLAP | CUM  | BNIS | BUTT | CAR  | | FIRE | REDB | MONY | 100  | SOS | Entr |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      | CELE | PRAY | NAIL |  OK  | THNK | | UNAM | HEYE | COOL | EYES | SMIR | Del  |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shft | TRIU | SCRM | VOMI | DTIV | EXPL | | HAIR | DANC | STRN | LEFT | RGHT | Shft |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl |      | Alt  | GUI  |      |      | |      |      | GUI  | Alt  |      | Ctrl |
- * `-----------------------------------------' `-----------------------------------------'
- */
-```
\ No newline at end of file
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/config.h b/keyboards/keebio/nyquist/keymaps/bramver/config.h
deleted file mode 100644
index 468e59af07f..00000000000
--- a/keyboards/keebio/nyquist/keymaps/bramver/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2018 darm
- *
- * 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 MASTER_LEFT
-
-#define TAPPING_TERM 200
-#define TAPPING_TOGGLE 2
-
-#define MOUSEKEY_DELAY             0
-#define MOUSEKEY_INTERVAL          16
-#define MOUSEKEY_MAX_SPEED         7
-#define MOUSEKEY_TIME_TO_MAX       60
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-#define MOUSEKEY_WHEEL_DELAY 0
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
deleted file mode 100644
index 4518cb326d8..00000000000
--- a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/* Copyright 2018 darm
- *
- * 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.
-#define _BASE 0
-#define _LOWER 1
-#define _RAISE 2
-#define _LMOUSE 3
-#define _RMOUSE 4
-#define _EMOJI 5
-
-enum emoji_map {
-  UNAM, // unamused 😒
-  HEYE, // smiling face with heart shaped eyes 😍
-  OK, // ok hand sign 👌
-  SMIR, // smirk 😏
-  PRAY, // pray 🙏
-  CELE, // celebration 🙌
-  COOL, // smile with sunglasses 😎
-  EYES, // eyes
-  THNK, // BIG THONK
-  NAIL, // Nailcare
-  SOS, // Vuile sos
-  REDB, // Red B
-  HNDR, // 100
-  MONY,
-  FIRE,
-  CAR,
-  BUTT,
-  BNIS,
-  CUM,
-  CLAP,
-  TRIU, // Fart from nose
-  SCRM,
-  VOMI,
-  DTIV, // Detective
-  EXPL, // Brainsplosion
-  HAIR, // Haircut
-  DANC, // Salsa dancer
-  STRN, // Stronk
-  LEFT, // Point Left
-  RGHT, // Point Right
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-  [UNAM] = 0x1F612,
-  [HEYE] = 0x1f60d,
-  [OK]   = 0x1F44C,
-  [SMIR] = 0x1F60F,
-  [PRAY] = 0x1F64F,
-  [CELE] = 0x1F64C,
-  [COOL] = 0x1F60E,
-  [EYES] = 0x1F440,
-  [THNK] = 0x1F914,
-  [NAIL] = 0x1F485,
-  [SOS] = 0x1F198,
-  [REDB] = 0x1F171,
-  [HNDR] = 0x1F4AF,
-  [MONY] = 0x1F480,
-  [FIRE] = 0x1F525,
-  [CAR] = 0x1F697,
-  [BUTT] = 0x1F351,
-  [BNIS] = 0x1F346,
-  [CUM] = 0x1F4A6,
-  [CLAP] = 0x1F44F,
-  [TRIU] = 0x1F624,
-  [SCRM] = 0x1F631,
-  [VOMI] = 0x1F92E,
-  [DTIV] = 0x1F575,
-  [EXPL] = 0x1F92F,
-  [HAIR] = 0x2640,
-  [DANC] = 0x1F483,
-  [STRN] = 0x1F4AA,
-  [LEFT] = 0x1F448,
-  [RGHT] = 0x1F449,
-};
-
-enum custom_keycodes {
-  CTRL_Z = SAFE_RANGE,
-  CTRL_X,
-  CTRL_C,
-  CTRL_V
-};
-
-#define SP_LMS LT(_LMOUSE, KC_SPC)
-#define SP_RMS LT(_RMOUSE, KC_SPC)
-#define LOW TT(_LOWER)
-#define RAI TT(_RAISE)
-#define EMO TT(_EMOJI)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base
-   * ,-----------------------------------------. ,-----------------------------------------.
-   * | GEsc |   1  |   2  |   3  |   4  |   5  | |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  | |   Y  |   U  |   I  |   O  |   P  | Entr |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | LOW  |   A  |   S  |   D  |   F  |   G  | |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Shft |   Z  |   X  |   C  |   V  |   B  | |   N  |   M  |   ,  |   .  |   /  | Shft |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Ctrl | EMO  | Alt  | GUI  | SPCE |SP_LMS| |SP_RMS|SP_RMS| GUI  | Alt  | RAI  | Ctrl |
-   * `-----------------------------------------' `-----------------------------------------'
-   */
-  [_BASE] = LAYOUT(
-    QK_GESC ,   KC_1  ,   KC_2    ,   KC_3    ,   KC_4    ,   KC_5    , /**/    KC_6    ,   KC_7    ,   KC_8    ,   KC_9    , KC_0    ,   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_ENT  ,
-    LOW     ,   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_LCTL ,   EMO   ,   KC_LALT ,   KC_LGUI ,   KC_SPC  ,   SP_LMS  , /**/    SP_RMS  ,   KC_SPC  ,   KC_RGUI ,   KC_RALT , RAI     ,   KC_RCTL
-  ),
-
-
-  /* Lower
-   * ,-----------------------------------------. ,-----------------------------------------.
-   * | GESC |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Tab  |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  | Entr |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * |      |  \   |  -   |  =   |  [   |  ]   | |  [   |  ]   |  -   |  =   |  \   | Del  |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Shft |  ^Z  |  ^X  |  ^C  |  ^V  |      | | Play | Vol+ | Vol- | Mute | Next | Shft |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Ctrl |      | Alt  | GUI  |      |      | |      |      | GUI  | Alt  |      | Ctrl |
-   * `-----------------------------------------' `-----------------------------------------'
-   */
-  [_LOWER] = LAYOUT(
-    TO(0)   ,   KC_EXLM ,   KC_AT   ,   KC_HASH ,   KC_DLR  ,   KC_PERC , /**/    KC_CIRC ,   KC_AMPR ,   KC_ASTR ,   KC_LPRN , KC_RPRN ,   _______ ,
-    _______ ,   KC_EXLM ,   KC_AT   ,   KC_HASH ,   KC_DLR  ,   KC_PERC , /**/    KC_CIRC ,   KC_AMPR ,   KC_ASTR ,   KC_LPRN , KC_RPRN ,   _______ ,
-    _______ ,   KC_RCBR ,   KC_MINS ,   KC_EQL  ,   KC_LBRC ,   KC_RBRC , /**/    KC_LBRC ,   KC_RBRC ,   KC_MINS ,   KC_EQL  , KC_BSLS ,   KC_DEL  ,
-    _______ ,   CTRL_Z  ,   CTRL_X  ,   CTRL_C  ,   CTRL_V  ,   XXXXXXX , /**/    KC_MPLY ,   KC_VOLU ,   KC_VOLD ,   KC_MUTE , KC_MNXT ,   _______ ,
-    _______ ,   XXXXXXX ,   _______ ,   _______ ,   _______ ,   XXXXXXX , /**/    XXXXXXX ,   _______ ,   _______ ,   _______ , XXXXXXX ,   _______
-  ),
-
-  /* Raise
-   * ,-----------------------------------------. .-----------------------------------------.
-   * | GESC |      |      |      |      |      | |      |   =  |   /  |   *  |   -  | Bksp  |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Tab  |  F9  |  F10 | F11  | F12  |      | |      |   7  |   8  |   9  |   +  | Entr |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * |      |  F5  |  F6  |  F7  |  F8  |      | |      |   4  |   5  |   6  |  ,   | Del  |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Shft |  F1  |  F2  |  F3  |  F4  |      | |      |   1  |   2  |   3  |  .   | Shft |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Ctrl |      | Alt  | GUI  |      |      | |      |  0   | GUI  | Alt  |      | Ctrl |
-   * `-----------------------------------------' `-----------------------------------------'
-   */
-
-  [_RAISE] = LAYOUT(
-    TO(0)   ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX , /**/  XXXXXXX ,   KC_EQL  ,   KC_SLSH ,   KC_ASTR ,   KC_MINS , _______ ,
-    _______ ,   KC_F9   ,   KC_F10  ,   KC_F11  ,   KC_F12  ,   XXXXXXX , /**/  XXXXXXX ,   KC_7    ,   KC_8    ,   KC_9    ,   KC_PLUS , _______ ,
-    XXXXXXX ,   KC_F5   ,   KC_F6   ,   KC_F7   ,   KC_F8   ,   XXXXXXX , /**/  XXXXXXX ,   KC_4    ,   KC_5    ,   KC_6    ,   KC_COMM , KC_DEL  ,
-    _______ ,   KC_F1   ,   KC_F2   ,   KC_F3   ,   KC_F4   ,   XXXXXXX , /**/  XXXXXXX ,   KC_1    ,   KC_2    ,   KC_3    ,   KC_DOT  , _______ ,
-    _______ ,   XXXXXXX ,   _______ ,   _______ ,   _______ ,   XXXXXXX , /**/  XXXXXXX ,   KC_0    ,   _______ ,   _______ ,   _______ , _______
-  ),
-
-  /* LMOUSE (Lower + Raise)
-   * ,-----------------------------------------. ,-----------------------------------------.
-   * | GESC |      | Home | End  | PGUP | PGDN | |      |      |      |      |      | Bksp |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Tab  | WH_L | BTN1 | MS_U | BTN2 | WH_U | |      |      |      |      |      | Entr |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * |      | WH_R | MS_L | MS_D | MS_R | WH_D | |      |      |      |      |      | Del  |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Shft | LEFT | DOWN |  UP  |RIGHT |      | |      |      |      |      |      | Shft |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Ctrl |      | Alt  | GUI  |      |      | |      |      | GUI  | Alt  |      | Ctrl |
-   * `-----------------------------------------' `-----------------------------------------'
-   */
-
-  [_LMOUSE] = LAYOUT(
-    TO(0)   ,   XXXXXXX ,   KC_HOME ,   KC_END  ,   KC_PGUP ,   KC_PGDN , /**/  XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX , _______ ,
-    _______ ,   KC_WH_L ,   KC_BTN1 ,   KC_MS_U ,   KC_BTN2 ,   KC_WH_U , /**/  XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX , _______ ,
-    XXXXXXX ,   KC_WH_R ,   KC_MS_L ,   KC_MS_D ,   KC_MS_R ,   KC_WH_D , /**/  XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX , KC_DEL  ,
-    _______ ,   KC_LEFT ,   KC_DOWN ,   KC_UP   ,   KC_RGHT ,   XXXXXXX , /**/  XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX , _______ ,
-    _______ ,   XXXXXXX ,   _______ ,   _______ ,   _______ ,   _______ , /**/  XXXXXXX ,   _______ ,   _______ ,   _______ ,   XXXXXXX , _______
-  ),
-
-  /* RMOUSE (Lower + Raise)
-   * ,-----------------------------------------. ,-----------------------------------------.
-   * | GESC |      |      |      |      |      | | PGUP | PGDN | Home | End  |      | Bksp |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Tab  |      |      |      |      |      | | WH_U | BTN1 | MS_U | BTN2 | WH_L | Entr |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * |      |      |      |      |      |      | | WH_D | MS_L | MS_D | MS_R | WH_R | Del  |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Shft |      |      |      |      |      | |      | LEFT | DOWN |  UP  |RIGHT | Shft |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Ctrl |      | Alt  | GUI  |      |      | |      |      | GUI  | Alt  |      | Ctrl |
-   * `-----------------------------------------' `-----------------------------------------'
-   */
-
-  [_RMOUSE] = LAYOUT(
-    TO(0)   , XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX , /**/  KC_PGUP ,   KC_PGDN ,   KC_HOME ,   KC_END  ,   XXXXXXX ,   _______ ,
-    _______ , XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX , /**/  KC_WH_U ,   KC_BTN1 ,   KC_MS_U ,   KC_BTN2 ,   KC_WH_L ,   _______ ,
-    XXXXXXX , XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX , /**/  KC_WH_D ,   KC_MS_L ,   KC_MS_D ,   KC_MS_R ,   KC_WH_R ,   KC_DEL  ,
-    _______ , XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX ,   XXXXXXX , /**/  XXXXXXX ,   KC_LEFT ,   KC_DOWN ,   KC_UP   ,   KC_RGHT ,   _______ ,
-    _______ , XXXXXXX ,   _______ ,   _______ ,   _______ ,   XXXXXXX , /**/  _______ ,   _______ ,   _______ ,   _______ ,   XXXXXXX ,   _______
-  ),
-
-  /* Emojis
-   * ,-----------------------------------------. ,-----------------------------------------.
-   * | GESC |      |      |      |      |      | | RSET |      |      |      |      | Bksp |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Tab  | CLAP | CUM  | BNIS | BUTT | CAR  | | FIRE | REDB | MONY | 100  | SOS | Entr |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * |      | CELE | PRAY | NAIL |  OK  | THNK | | UNAM | HEYE | COOL | EYES | SMIR | Del  |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Shft | TRIU | SCRM | VOMI | DTIV | EXPL | | HAIR | DANC | STRN | LEFT | RGHT | Shft |
-   * |------+------+------+------+------+------| |------+------+------+------+------+------|
-   * | Ctrl |      | Alt  | GUI  |      |      | |      |      | GUI  | Alt  |      | Ctrl |
-   * `-----------------------------------------' `-----------------------------------------'
-   */
-
-  [_EMOJI] = LAYOUT(
-    TO(0)   , XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     , /**/  QK_BOOT       ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   _______   ,
-    _______ , UM(CLAP)     ,   UM(CUM)      ,   UM(BNIS)     ,   UM(BUTT)     ,   UM(CAR)      , /**/  UM(FIRE)     ,   UM(REDB)     ,   UM(MONY)     ,   UM(HNDR)     ,   UM(SOS)      ,   _______   ,
-    XXXXXXX , UM(CELE)     ,   UM(PRAY)     ,   UM(NAIL)     ,   UM(OK)       ,   UM(THNK)     , /**/  UM(UNAM)     ,   UM(HEYE)     ,   UM(COOL)     ,   UM(EYES)     ,   UM(SMIR)     ,   KC_DEL    ,
-    _______ , UM(TRIU)     ,   UM(SCRM)     ,   UM(VOMI)     ,   UM(DTIV)     ,   UM(EXPL)     , /**/  UM(HAIR)     ,   UM(DANC)     ,   UM(STRN)     ,   UM(LEFT)     ,   UM(RGHT)     ,   _______   ,
-    _______ , _______     ,   _______     ,   _______     ,   _______     ,   XXXXXXX     , /**/  XXXXXXX     ,   _______     ,   _______     ,   _______     ,   XXXXXXX     ,   _______
-  ),
-
-};
-
-void matrix_init_user(void) {
-  set_unicode_input_mode(UNICODE_MODE_LINUX);
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  if (record->event.pressed) {
-    switch(keycode) {
-      case CTRL_Z:
-        SEND_STRING(SS_LCTL("z"));
-        return false;
-      case CTRL_X:
-        SEND_STRING(SS_LCTL("x"));
-        return false;
-      case CTRL_C:
-        SEND_STRING(SS_LCTL("c"));
-        return false;
-      case CTRL_V:
-        SEND_STRING(SS_LCTL("v"));
-        return false;
-    }
-  }
-
-  return true;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/rules.mk b/keyboards/keebio/nyquist/keymaps/bramver/rules.mk
deleted file mode 100644
index d211d7b4cfb..00000000000
--- a/keyboards/keebio/nyquist/keymaps/bramver/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build options
-MOUSEKEY_ENABLE = yes			# Emulates mouse key using keypresses
-EXTRAKEY_ENABLE = yes 		# Use system and audio control key codes
-TAP_DANCE_ENABLE = no 		# Use multi-tap features
-UNICODEMAP_ENABLE = yes  	# Emojify me pls
-NKRO_ENABLE = yes
diff --git a/keyboards/keebio/nyquist/keymaps/bwprobably/config.h b/keyboards/keebio/nyquist/keymaps/bwprobably/config.h
deleted file mode 100644
index 51befaac14c..00000000000
--- a/keyboards/keebio/nyquist/keymaps/bwprobably/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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 USE_I2C
-
-/* Select hand configuration */
-#define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/bwprobably/keymap.c b/keyboards/keebio/nyquist/keymaps/bwprobably/keymap.c
deleted file mode 100644
index 29f711dd7ca..00000000000
--- a/keyboards/keebio/nyquist/keymaps/bwprobably/keymap.c
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2022 bwprobably
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-
-enum custom_layer {
-    _LAYER0,
-    _LAYER1,
-    _LAYER2,
-    _LAYER3,
-};
-
-enum custom_keycodes {
-    LAYER0 = SAFE_RANGE,
-    LAYER1,
-    LAYER2,
-    LAYER3,
-};
-
- const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [_LAYER0] = LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_BSLS, LT(3,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_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_LALT, KC_LGUI, KC_DEL, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-
-[_LAYER1] = LAYOUT(KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TAB, KC_Q, KC_UP, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_CALC, KC_HOME, KC_ESC, KC_LEFT, KC_DOWN, KC_RGHT, KC_T, KC_D, KC_H, KC_N, KC_TRNS, KC_I, KC_MUTE, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_MNXT, KC_MPLY, KC_VOLU, KC_PGDN, MO(3), KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_MPRV, KC_MSTP, KC_VOLD, KC_END),
-
-[_LAYER2] = LAYOUT(KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 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_TRNS, KC_RCBR, KC_PIPE, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, LSFT(KC_NUHS), LSFT(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_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
-
-[_LAYER3] = LAYOUT(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NO, KC_NO, KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_TRNS, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_DEL, KC_TRNS, KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, AG_NORM, KC_NO, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_TRNS) 
-
-};
diff --git a/keyboards/keebio/nyquist/keymaps/bwprobably/rules.mk b/keyboards/keebio/nyquist/keymaps/bwprobably/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/keebio/nyquist/keymaps/bwprobably/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
deleted file mode 100644
index 0efe747f2ab..00000000000
--- a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2017 James Morgan <ja.morgan1@outlook.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_TERM 150
-#define EE_HANDS
diff --git a/keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c b/keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c
deleted file mode 100644
index a65fc3b6886..00000000000
--- a/keyboards/keebio/nyquist/keymaps/danielhklein/keymap.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/*
- Keymap is loosely based on DivergeJM's Nyquist keymap
- Major changes made:
-  - DVORAK, COLEMAK, FUNCTION, MOUSE, and ADJUST layers have been removed
-  - right 2u key performs backspace, not enter
-  - LOWER layer controls function keys, media controls, and underglow
-  - ARROW layer uses JKLI for arrow keys
-  - Bootmagic enabled and bootmagic initialization key changed from space to enter
-*/
-
-extern keymap_config_t keymap_config;
-
-// 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 custom_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ARROW
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ARROW
-};
-
-#define SPC_LWR LT(_LOWER, KC_SPC)
-#define BSP_RSE LT(_RAISE, KC_BSPC)
-#define ARW MO(_ARROW)
-
-// Underglow setup
-#define RGBLIGHT_SLEEP
-
-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  |Enter |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Caps|   A  |   S  |   D  |   F  |   G  |     |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * |Lshft|   Z  |   X  |   C  |   V  |   B  |     |   N  |   M  |   ,  |   .  |  /   |Rshft |
- * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * |Arrow| LCtrl| LAlt | LGui |  Bspc/Raise |     |   Spc/Lower | RGui | RAlt | RCtrl| Del  |
- * `----------------------------------------'     '-----------------------------------------'
- */
-
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,    KC_0,    KC_MINS,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,    KC_P,    KC_ENT,
-  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,  KC_SLSH, KC_RSFT,
-  ARW,     KC_LCTL, KC_LALT, KC_LGUI, BSP_RSE, BSP_RSE, SPC_LWR, SPC_LWR, KC_RGUI,   KC_RALT, KC_RCTL, KC_DEL
-  ),
-
-/* Raise
- * ,-----------------------------------------.    .-----------------------------------------.
- * |      |      |      |      |      |      |    |   =  |   /  |   *  |   -  |   \  |   `  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |   7  |   8  |   9  |   +  |   [  |   ]  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |   4  |   5  |   6  | Enter|      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | Lshft|      |      |      |      |      |    |   1  |   2  |   3  | Space|      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      | LGui |             |    |      0      |   .  | Bspc |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
- */
-
-[_RAISE] = LAYOUT(
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_PEQL, KC_PSLS, KC_PAST, KC_MINS,  KC_BSLS, KC_GRV,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_7,    KC_8,    KC_9,    KC_PPLS,  KC_LBRC, KC_RBRC,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_4,    KC_5,    KC_6,    KC_PENT,  XXXXXXX, XXXXXXX,
-  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_1,    KC_2,    KC_3,    KC_SPC,   XXXXXXX, XXXXXXX,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,  _______,  _______,  KC_0,    KC_0,    KC_DOT,  KC_BSPC,  XXXXXXX, XXXXXXX
-),
-
-/* Lower
- * ,-----------------------------------------.    .-----------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | >/|| | Mute | Vol- | Vol+ | |<<  | >>|  |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |RGB IO|RGB >>|RGB <<|Hue++ |Hue-- |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |Sat++ |Sat-- |Val++ |Val-- |             |    |             |      |      |      |      |
- * `-----------------------------------------'    `-----------------------------------------'
-*/
-
-[_LOWER] = LAYOUT(
-  KC_F1,    KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_F7,    KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_MPLY,  KC_MUTE, KC_VOLD,  KC_VOLU, KC_MPRV, KC_MNXT, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  RGB_TOG,  RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD, XXXXXXX, XXXXXXX, _______,  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-/* Arrow
- * ,-----------------------------------------.     ,----------------------------------------.
- * |      |      |      |      |      |      |     |     |      |      |      |      |      |
- * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
- * |      |      |      |      |      |      |     |     |      |  Up  |      |      |      |
- * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
- * |      |      |      |      |      |      |     |     | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
- * |      |      |      |      |      |      |     |     |      |      |      |      |      |
- * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
- * |      |      |      | Gui  |             |     |            |      |      |      |      |
- * `-----------------------------------------'     `----------------------------------------'
- */
-
-[_ARROW] = LAYOUT(
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX,  XXXXXXX, XXXXXXX,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT,  XXXXXXX, XXXXXXX,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
-  _______,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX
-),
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-/* Cases to switch default layer to QWERTY, COLEMAK or DVORAK
-    and to access ADJUST layer to access the switch keys */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-      } else {
-        layer_off(_LOWER);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-      } else {
-        layer_off(_RAISE);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/danielhklein/rules.mk b/keyboards/keebio/nyquist/keymaps/danielhklein/rules.mk
deleted file mode 100644
index ef7ab042050..00000000000
--- a/keyboards/keebio/nyquist/keymaps/danielhklein/rules.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2017 James Morgan <ja.morgan1@outlook.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/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no       # Enable Tap Dance
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/config.h b/keyboards/keebio/nyquist/keymaps/georgepetri/config.h
deleted file mode 100644
index 3274bb60fd7..00000000000
--- a/keyboards/keebio/nyquist/keymaps/georgepetri/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
-
-#undef RGBLED_NUM
-#define RGBLED_NUM 12
-#define RGBLIGHT_LAYERS
-
-#define TAPPING_TOGGLE 2
-#define TAPPING_TERM 150
-#undef RGBLED_SPLIT
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c b/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c
deleted file mode 100644
index bd11a5ec811..00000000000
--- a/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BASE 0
-#define _L 1
-#define _R 2
-
-#define KC_TL LCTL(KC_PGUP)
-#define KC_TR LCTL(KC_PGDN)
-#define KC_TC LCTL(KC_W)
-#define KC_TRO LCTL(LSFT(KC_T))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    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_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,   KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_DEL ,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_ESC , 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_CAPS, KC_LCTL, KC_LGUI, KC_LALT, MO(_L) , KC_SPC ,   KC_RSFT, TT(_R) , KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT
-//└────────┴────────┴────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-  
-  [_L] = 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_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, _______,   KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, _______,   _______, KC_PGDN, KC_PGUP, KC_HOME, KC_END , _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______
-//└────────┴────────┴────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-  
-  [_R] = LAYOUT(
-//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, KC_TL  , KC_TR  , KC_TC  , KC_TRO , _______,   _______, KC_TL  , KC_TR  , KC_TC  , KC_TRO , _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,   KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, KC_PGDN, KC_PGUP, KC_HOME, KC_END , _______,   _______, KC_PGDN, KC_PGUP, KC_HOME, KC_END , _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______
-//└────────┴────────┴────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
-
-const rgblight_segment_t PROGMEM left[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 12, HSV_MAGENTA}
-);
-
-const rgblight_segment_t PROGMEM right[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 12, HSV_RED}
-);
-
-const rgblight_segment_t PROGMEM capslock[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 3, HSV_GOLD},
-    {6, 3, HSV_GOLD}
-);
-
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(left, right, capslock);
-
-void keyboard_post_init_user(void) {
-    rgblight_sethsv_noeeprom(HSV_SPRINGGREEN);
-    rgblight_layers = rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, _L));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _R));
-    return state;
-}
-
-void suspend_power_down_user(void) {
-    rgblight_disable();
-}
-
-void suspend_wakeup_init_user(void) {
-    rgblight_enable();
-}
-
-bool is_shift_pressed = false;
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(2, is_shift_pressed != led_state.caps_lock);
-    return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        case KC_LSFT:
-        case KC_RSFT:
-            is_shift_pressed = record->event.pressed;
-            rgblight_set_layer_state(2, is_shift_pressed != host_keyboard_led_state().caps_lock);
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/readme.md b/keyboards/keebio/nyquist/keymaps/georgepetri/readme.md
deleted file mode 100644
index 5d1855e933d..00000000000
--- a/keyboards/keebio/nyquist/keymaps/georgepetri/readme.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# George Petri's Nyquist layout
-
-```
-sudo make keebio/nyquist/rev2:georgepetri:dfu
-```
-
-Features a dedicated navigation layer on rise and current layer status on rgb underglow.  
-
-### Base Layer
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│ GRAVE│  1   │  2   │  3   │  4   │  5   │ │  6   │  7   │  8   │  9   │  0   │ BSPC │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│  TAB │  Q   │  W   │  E   │  R   │  T   │ │  Y   │  U   │  I   │  O   │  P   │ DEL  │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│  ESC │  A   │  S   │  D   │  F   │  G   │ │  H   │  J   │  K   │  L   │  SCLN│ QUOT │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│  LSFT│  Z   │  X   │  C   │  V   │  B   │ │  N   │  M   │  COMM│  DOT │  SLSH│ ENT  │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│  CAPS│  LCTL│ LGUI │ LALT │MO(_L)│  SPC │ │  RSFT│MO(_R)│  LEFT│  DOWN│  UP  │ RGHT │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
-
-### Lower
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│      │  F1  │  F2  │  F3  │  F4  │  F5  │ │  F6  │  F7  │  F8  │  F9  │  F10 │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │  F11 │  F12 │      │      │      │ │      │  MINS│  EQL │  LBRC│  RBRC│ BSLS │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │  LEFT│  DOWN│  UP  │  RGHT│      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │  PGDN│ PGUP │  HOME│  END │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │      │      │      │      │      │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
-
-### Rise
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│      │      │      │      │      │      │ │      │      │      │      │      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │ TAB_L│ TAB_R│ TAB_C│ TAB_R│      │ │      │ TAB_L│ TAB_R│ TAB_C│ TAB_R│      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │  LEFT│  DOWN│  UP  │  RGHT│      │ │  LEFT│  DOWN│  UP  │  RGHT│      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │  PGDN│  PGUP│  HOME│  END │      │ │      │  PGDN│  PGUP│  HOME│  END │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │      │      │      │      │      │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/rules.mk b/keyboards/keebio/nyquist/keymaps/georgepetri/rules.mk
deleted file mode 100644
index 072f9b2edcc..00000000000
--- a/keyboards/keebio/nyquist/keymaps/georgepetri/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = no
-COMMAND_ENABLE = no
-RGBLIGHT_ENABLE = yes
-LTO_ENABLE = yes
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri3/config.h b/keyboards/keebio/nyquist/keymaps/georgepetri3/config.h
deleted file mode 100644
index 2e84fa0d531..00000000000
--- a/keyboards/keebio/nyquist/keymaps/georgepetri3/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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 RGBLIGHT_LAYERS
-
-#define TAPPING_TOGGLE 2
-#define TAPPING_TERM 150
-
-#define USE_I2C
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri3/keymap.c b/keyboards/keebio/nyquist/keymaps/georgepetri3/keymap.c
deleted file mode 100644
index a20c0d9351a..00000000000
--- a/keyboards/keebio/nyquist/keymaps/georgepetri3/keymap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#include QMK_KEYBOARD_H
-#define _BASE 0
-#define _L 1
-#define _R 2
-
-#define KC_TL LCTL(KC_PGUP)
-#define KC_TR LCTL(KC_PGDN)
-#define KC_TC LCTL(KC_W)
-#define KC_TRO LCTL(LSFT(KC_T))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    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_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,   KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_DEL ,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_ESC , 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_CAPS, KC_LCTL, KC_LGUI, KC_LALT, MO(_L) , KC_SPC ,   KC_RSFT, TT(_R) , KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT
-//└────────┴────────┴────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-  
-  [_L] = 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_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, _______,   KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, _______,   _______, KC_PGDN, KC_PGUP, KC_HOME, KC_END , _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______
-//└────────┴────────┴────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-  
-  [_R] = LAYOUT(
-//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, KC_TL  , KC_TR  , KC_TC  , KC_TRO , _______,   _______, KC_TL  , KC_TR  , KC_TC  , KC_TRO , _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,   KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, KC_PGDN, KC_PGUP, KC_HOME, KC_END , _______,   _______, KC_PGDN, KC_PGUP, KC_HOME, KC_END , _______,
-//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______
-//└────────┴────────┴────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
-
-const rgblight_segment_t PROGMEM left[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 12, HSV_SPRINGGREEN}
-);
-
-const rgblight_segment_t PROGMEM right[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 12, HSV_RED}
-);
-
-const rgblight_segment_t PROGMEM capslock[] = RGBLIGHT_LAYER_SEGMENTS(
-    {2, 3, HSV_GOLD},
-    {6, 1, HSV_GOLD},
-    {11, 1, HSV_GOLD}
-);
-
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(left, right, capslock);
-
-void keyboard_post_init_user(void) {
-    rgblight_sethsv_noeeprom(HSV_BLUE);
-    rgblight_layers = rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, _L));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _R));
-    return state;
-}
-
-void suspend_power_down_user(void) {
-    rgblight_disable();
-}
-
-void suspend_wakeup_init_user(void) {
-    rgblight_enable();
-}
-
-bool is_shift_pressed = false;
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(2, is_shift_pressed != led_state.caps_lock);
-    return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        case KC_LSFT:
-        case KC_RSFT:
-            is_shift_pressed = record->event.pressed;
-            rgblight_set_layer_state(2, is_shift_pressed != host_keyboard_led_state().caps_lock);
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri3/readme.md b/keyboards/keebio/nyquist/keymaps/georgepetri3/readme.md
deleted file mode 100644
index db4af6b314a..00000000000
--- a/keyboards/keebio/nyquist/keymaps/georgepetri3/readme.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# George Petri's Nyquist rev3 layout
-
-```
-sudo make keebio/nyquist/rev3:georgepetri3:dfu
-```
-
-Features a dedicated navigation layer on rise and current layer status on rgb underglow.  
-
-### Base Layer
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│ GRAVE│  1   │  2   │  3   │  4   │  5   │ │  6   │  7   │  8   │  9   │  0   │ BSPC │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│  TAB │  Q   │  W   │  E   │  R   │  T   │ │  Y   │  U   │  I   │  O   │  P   │ DEL  │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│  ESC │  A   │  S   │  D   │  F   │  G   │ │  H   │  J   │  K   │  L   │  SCLN│ QUOT │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│  LSFT│  Z   │  X   │  C   │  V   │  B   │ │  N   │  M   │  COMM│  DOT │  SLSH│ ENT  │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│  CAPS│  LCTL│ LGUI │ LALT │MO(_L)│  SPC │ │  RSFT│MO(_R)│  LEFT│  DOWN│  UP  │ RGHT │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
-
-### Lower
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│      │  F1  │  F2  │  F3  │  F4  │  F5  │ │  F6  │  F7  │  F8  │  F9  │  F10 │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │  F11 │  F12 │      │      │      │ │      │  MINS│  EQL │  LBRC│  RBRC│ BSLS │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │  LEFT│  DOWN│  UP  │  RGHT│      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │  PGDN│ PGUP │  HOME│  END │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │      │      │      │      │      │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
-
-### Rise
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│      │      │      │      │      │      │ │      │      │      │      │      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │ TAB_L│ TAB_R│ TAB_C│ TAB_R│      │ │      │ TAB_L│ TAB_R│ TAB_C│ TAB_R│      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │  LEFT│  DOWN│  UP  │  RGHT│      │ │  LEFT│  DOWN│  UP  │  RGHT│      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │  PGDN│  PGUP│  HOME│  END │      │ │      │  PGDN│  PGUP│  HOME│  END │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │      │      │      │      │      │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri3/rules.mk b/keyboards/keebio/nyquist/keymaps/georgepetri3/rules.mk
deleted file mode 100644
index 072f9b2edcc..00000000000
--- a/keyboards/keebio/nyquist/keymaps/georgepetri3/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = no
-COMMAND_ENABLE = no
-RGBLIGHT_ENABLE = yes
-LTO_ENABLE = yes
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/keebio/nyquist/keymaps/jojiichan/config.h b/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
deleted file mode 100644
index f5922f93bcc..00000000000
--- a/keyboards/keebio/nyquist/keymaps/jojiichan/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#endif
diff --git a/keyboards/keebio/nyquist/keymaps/jojiichan/keymap.c b/keyboards/keebio/nyquist/keymaps/jojiichan/keymap.c
deleted file mode 100644
index 537d5cf2e4d..00000000000
--- a/keyboards/keebio/nyquist/keymaps/jojiichan/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  LAYOUT(
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_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_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, TG(4), MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN),
-
-  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_PAUS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,
-    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_INS, KC_HOME, KC_PGUP,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN),
-
-  LAYOUT(
-    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_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-    KC_MINS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_PIPE,
-    KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, 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_TRNS),
-
-  LAYOUT(
-    LALT(KC_F4), LSFT(KC_EXLM), LSFT(KC_AT), LSFT(KC_HASH), LSFT(KC_DLR), LSFT(KC_PERC), LSFT(KC_CIRC), LSFT(KC_AMPR), LSFT(KC_ASTR), LSFT(KC_LPRN), LSFT(KC_RPRN), LSFT(KC_DEL),
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_COLN), LSFT(KC_DQUO),
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_LABK), LSFT(KC_RABK), LSFT(KC_QUES), KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-  LAYOUT(
-    KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11, KC_PGDN, KC_SLSH, KC_ASTR, KC_MINS,
-    KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_O, KC_7, KC_8, KC_9, KC_PLUS,
-    KC_TRNS, KC_A, KC_S, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_4, KC_5, KC_6, KC_PLUS,
-    KC_LSFT, KC_TRNS, KC_X, KC_C, KC_TRNS, KC_TRNS, KC_N, KC_TRNS, KC_1, KC_2, KC_3, KC_ENT,
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_0, KC_0, KC_DOT, KC_ENT)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/jojiichan/rules.mk b/keyboards/keebio/nyquist/keymaps/jojiichan/rules.mk
deleted file mode 100644
index a81250cdf6d..00000000000
--- a/keyboards/keebio/nyquist/keymaps/jojiichan/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/keebio/nyquist/keymaps/kim-kim/config.h b/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
deleted file mode 100644
index 941645689c6..00000000000
--- a/keyboards/keebio/nyquist/keymaps/kim-kim/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#endif
diff --git a/keyboards/keebio/nyquist/keymaps/kim-kim/keymap.c b/keyboards/keebio/nyquist/keymaps/kim-kim/keymap.c
deleted file mode 100644
index e5ca7e47800..00000000000
--- a/keyboards/keebio/nyquist/keymaps/kim-kim/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _QW 0
-#define _LW 1
-#define _RS 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* SPLIT QWERTY
- * .-----------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | `      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | BSPACE |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | LCTRL  | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | <      | >      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+-----------------+--------+--------|
- * | LALT   | RAISE  | RAISE  | LGUI   | SPACE  | SPACE  | SPACE  | SPACE  | RGUI   | LOWER  | LOWER  | RALT   |
- * '-----------------------------------------------------------------------------------------------------------'
- */
- [_QW] = 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_BSPC,
-  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, KC_ENT,
-  KC_LALT, MO(_RS), MO(_RS), KC_LGUI, KC_SPC,  KC_SPC,  KC_SPC, KC_SPC,  KC_RGUI, MO(_LW), MO(_LW), KC_RALT
- ),
-
-/* Lower
- * .-----------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | PREV   | NEXT   | VOLUP  | RGBTOG | F11    |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | PLAY   | STOP   | VOLDWN | RGBMOD |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        | MUTE   |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
-[_LW] = LAYOUT(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, _______, _______, _______,
-  _______, KC_MPRV, KC_MNXT, KC_VOLU, RGB_TOG, KC_F11,  _______, _______, _______, _______, _______, _______,
-  _______, KC_MPLY, KC_MSTP, KC_VOLD, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Raise
- * .-----------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        | F6     | F7     | F8     | F9     | F10    | DELETE |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | F12    | [      | ]      | -      | =      | \      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | PRTSCR | LEFT   | DOWN   | UP     | RIGHT  |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        | HOME   | PGDN   | PGUP   | END    |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
-[_RS] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  _______, _______, _______, _______, _______, _______, KC_F12, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_BSLS,
-  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
diff --git a/keyboards/keebio/nyquist/keymaps/kim-kim/rules.mk b/keyboards/keebio/nyquist/keymaps/kim-kim/rules.mk
deleted file mode 100644
index a81250cdf6d..00000000000
--- a/keyboards/keebio/nyquist/keymaps/kim-kim/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c b/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
deleted file mode 100644
index 03aea211eac..00000000000
--- a/keyboards/keebio/nyquist/keymaps/peott-fr/keymap.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2021 Pierre-Emmanuel Ott
- * 
- * 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
-
-/* This keymap is based on a) intuitive layout and b) least amount of layers required for the bare minimum amount of keys.
- * The first layer has most symbols and the usual QWERTY layout, along with all mods. This is similar to what one may make on a Preonic.
- * Second layer is my left-hand layer: if the right hand is on the mouse, this layer has arrows and other keys on the left-hand. This also has a numpad.
- * Last layer is for Functions keys and keyboard functions. 
- * 
- * Note that 'Reset' appears twice: on Nyquist both halves need to be flashed, so we need the full Reset shortcut to be available from any given single half.
- */
-
-enum custom_layers {
-  _QWERTY,
-  _LEFTHAND,
-  _FUNC
-};
-
-#define SPC_LFT LT(_LEFTHAND, KC_SPC)
-#define BSP_FUNC LT(_FUNC, KC_BSPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Base/Qwerty layer
- * .-----------------------------------------.     .-----------------------------------------.
- * |  ~   |   1  |   2  |   3  |   4  |   5  |     |   6  |   7  |   8  |   9  |   0  |  -   |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |     |   Y  |   U  |   I  |   O  |   P  |  [   |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |     |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Lsft(|   Z  |   X  |   C  |   V  |   B  |     |   N  |   M  |   ,  |   .  |  /   | Rsft)|
- * |------+------+------+------+------+------|     |------+------+------+------+------+------|
- * | LCtrl| LGui | LAlt | Del  |  Spc/LftHnd |     |  Bckpc/Func | Left | Down |  Up  | Right|
- * '-----------------------------------------'     '-----------------------------------------'
- */
-	
-	[_QWERTY] = LAYOUT(
-		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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,                                        KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, 
-		LCTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G,                                KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 
-		SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B,                                       KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, 
-		LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_DEL, SPC_LFT, SPC_LFT, BSP_FUNC, BSP_FUNC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-	),
-
-/* Left hand layer 
- * .-----------------------------------------.    .-----------------------------------------.
- * |   +  |      |      |      |      | Rst  |    | NumLk|  /   |  *   |  -   |      |   \  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |  [   |  Up  |   ]  |      |    |   7  |  8   |  9   |  +   |      |   ]  |  
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      | Left | Down | Right|      |    |   4  |  5   |  6   |  ,   |      |Enter |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      | Calc | MyPC |PrtScr| Enter|BckSpc|    |   1  |  2   |  3   |  =   | PgUp | Home |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      | Mute |      |      |      |      |    |      0      |  .   | Enter| PgDn | End  |
- * '-----------------------------------------'    '-----------------------------------------'
- */	
-
-	[_LEFTHAND] = LAYOUT(
-		KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,  KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_BSLS, 
-		KC_TRNS, KC_TRNS, KC_LBRC, KC_UP, KC_RBRC, KC_TRNS,   KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS, KC_RBRC, 
-		KC_LCTL, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_TRNS, KC_ENT, 
-		KC_LSFT, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT, KC_BSPC,  KC_P1, KC_P2, KC_P3, KC_PEQL, KC_PGUP, KC_HOME, 
-		KC_LCTL, KC_MUTE, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_P0, KC_PDOT, KC_PENT, KC_PGDN, KC_END
-	),
-
-/* Func/Numpad layer
- * .-----------------------------------------.    .-----------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | RGBtg|      |      |      |      |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      | Rst  |
- * '-----------------------------------------'    '-----------------------------------------'
-*/	
-
-
-	[_FUNC] = 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, 
-		RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
-	),
-};
\ No newline at end of file
diff --git a/keyboards/keebio/nyquist/keymaps/pipicanim/README.md b/keyboards/keebio/nyquist/keymaps/pipicanim/README.md
deleted file mode 100644
index 8104213913b..00000000000
--- a/keyboards/keebio/nyquist/keymaps/pipicanim/README.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# pipicanim's Nyquist layout
-
-```
-make keebio/nyquist/rev3:pipicanim
-```
-
-## Layers
-+ Lower -> Layer 2
-+ Raise -> Layer 1
-+ Code  -> Layer 3
-
-### Base
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│TAB   │Q     │W     │E     │R     │T     │ │Y     │U     │I     │O     │P     │BCKPC │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│ESC   │A     │S     │D     │F     │G     │ │H     │J     │K     │L     │;     │'     │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│SHIFT │Z     │X     │C     │V     │B     │ │N     │M     │,     │.     │/     │ENTER │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│CTRL  |SUPER │MO(3) │ALT   │MO(2) │SPACE │ │SPACE │MO(1) │ALT   │MO(3) │SUPER │CTRL  │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
-
-### Lower, Numbers/Special Characters and Navigation
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│`     │1     │2     │3     │4     │      │ │      │PGUP  │UP    │PGDOWN│(     │)     │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │5     │6     │7     │8     │      │ │HOME  │LEFT  │DOWN  │RIGHT │[     │]     │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │9     │0     │-     │=     │      │ │END   │      │      │      │\     │|     │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │      │      │      │      │      │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
-
-### Raise, F buttons
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│CAPS  │      │PRSRC │SCLOCK│PAUSE │      │ │      │F1    │F2    │F3    │F4    │DEL   │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │INSERT│HOME  │PGUP  │      │ │      │F5    │F6    │F7    │F8    │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │DEL   │END   │PGDOWN│      │ │      │F9    │F10   │F11   │F12   │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │      │      │      │      │      │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
-
-### Code, RGB and media controls.
-
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
-│RGBTOG│RGBM+ │RGBM- │      │      │      │ |      │      │      │      │      │RESET │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│HUE+  │SAT+  │BRGHT+│EFCT+ │      │      │ │      │PREV  │PLAY  │NEXT  │      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│HUE-  │SAT-  │BRGHT-│EFCT  │      │      │ |      │MUTE  │VOL-  │VOL+  │      │      │
-├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │      │      │      │      │      │
-└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘
-```
diff --git a/keyboards/keebio/nyquist/keymaps/pipicanim/config.h b/keyboards/keebio/nyquist/keymaps/pipicanim/config.h
deleted file mode 100644
index 81fc2cf5fe4..00000000000
--- a/keyboards/keebio/nyquist/keymaps/pipicanim/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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 USE_I2C
-
-/* Select hand configuration */
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c b/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c
deleted file mode 100644
index 813fde36ce5..00000000000
--- a/keyboards/keebio/nyquist/keymaps/pipicanim/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_ortho_4x12(
-     KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSPC,
-     KC_ESC,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,MO(3),KC_LALT,MO(2),KC_SPC,KC_SPC,MO(1),KC_LALT,MO(3),KC_RGUI,KC_RCTL
-   ),
-	[1] = LAYOUT_ortho_4x12(
-     KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_TRNS,KC_TRNS,KC_PGUP,KC_UP,KC_PGDN,KC_LPRN,KC_RPRN,
-     KC_TRNS,KC_5,KC_6,KC_7,KC_8,KC_TRNS,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_LBRC,KC_RBRC,
-     KC_TRNS,KC_9,KC_0,KC_MINS,KC_EQL,KC_TRNS,KC_END,KC_TRNS,KC_TRNS,KC_TRNS,KC_BSLS,KC_PIPE,
-     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_4x12(
-     KC_CAPS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS,KC_F1,KC_F2,KC_F3,KC_F4,KC_DEL,
-     KC_TRNS,KC_TRNS,KC_INS,KC_HOME,KC_PGUP,KC_TRNS,KC_TRNS,KC_F5,KC_F6,KC_F7,KC_F8,KC_TRNS,
-     KC_TRNS,KC_TRNS,KC_DEL,KC_END,KC_PGDN,KC_TRNS,KC_TRNS,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
-   ),
-	[3] = LAYOUT_ortho_4x12(
-     RGB_TOG,RGB_MOD,RGB_RMOD,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,QK_BOOT,
-     RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,KC_TRNS,KC_TRNS,KC_TRNS,KC_MPRV,KC_MPLY,KC_MNXT,KC_TRNS,KC_TRNS,
-     RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD,KC_TRNS,KC_TRNS,KC_TRNS,KC_MUTE,KC_VOLD,KC_VOLU,KC_TRNS,KC_TRNS,
-     KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
-   )
-};
-
diff --git a/keyboards/keebio/nyquist/keymaps/pipicanim/rules.mk b/keyboards/keebio/nyquist/keymaps/pipicanim/rules.mk
deleted file mode 100644
index 7ad666d1a38..00000000000
--- a/keyboards/keebio/nyquist/keymaps/pipicanim/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keebio/nyquist/keymaps/pjanx/config.h b/keyboards/keebio/nyquist/keymaps/pjanx/config.h
deleted file mode 100644
index 81fc2cf5fe4..00000000000
--- a/keyboards/keebio/nyquist/keymaps/pjanx/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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 USE_I2C
-
-/* Select hand configuration */
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c b/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
deleted file mode 100644
index 7c2e4eaae06..00000000000
--- a/keyboards/keebio/nyquist/keymaps/pjanx/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- * Copyright 2021 Přemysl Eric Janouch
- *
- * 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 planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  UNUSED = SAFE_RANGE
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LCtrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |RShift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Caps | LGUI | LAlt |Lower |    Space    |Raise | RAlt | Down |  Up  |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    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, KC_RSFT,
-    KC_ESC,  KC_CAPS, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_RALT, KC_DOWN, KC_UP,   KC_ENT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Ins  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |RCtrl |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | RGUI |      |      |      |             |      | Left | Vol- | Vol+ | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_INS,
-    KC_RCTL, 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_HOME, KC_END, _______,
-    _______, KC_RGUI, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_VOLD, KC_VOLU, KC_RGHT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |RCtrl |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / | PgDn | PgUp |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | App  |      |      |      |             |      | Left | Vol- | Vol+ | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-    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_RCTL, 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_PGDN, KC_PGUP, _______,
-    _______, KC_APP,  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_VOLD, KC_VOLU, KC_RGHT
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  M1  |  M2  |  M3  |      |      |             |      |  <-  |  vv  |  ^^  |  ->  |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,  _______, _______, _______,
-    KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/keebio/nyquist/keymaps/pjanx/rules.mk b/keyboards/keebio/nyquist/keymaps/pjanx/rules.mk
deleted file mode 100644
index 31710b1014b..00000000000
--- a/keyboards/keebio/nyquist/keymaps/pjanx/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h b/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
deleted file mode 100644
index 45494b60d2d..00000000000
--- a/keyboards/keebio/nyquist/keymaps/shovelpaw/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-// Mouse specific settings
-#define MOUSEKEY_INTERVAL 16
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 6
-#define MOUSEKEY_WHEEL_DELAY 0
diff --git a/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c b/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
deleted file mode 100644
index 28b6b581141..00000000000
--- a/keyboards/keebio/nyquist/keymaps/shovelpaw/keymap.c
+++ /dev/null
@@ -1,156 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 1
-#define _RAISE 2
-#define _MIDI 3
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  MIDI,
-  ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------| |-------------------------------------------.
- * | GEsc |   1  |   2  |   3  |   4  |   5  | |   6  |   7   |   8  |   9  |   0  |  Bksp |
- * |------+------+------+------+------+------| |------+-------+------+------+------+-------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  | |   Y  |   U   |   I  |   O  |   P  |  Del  |
- * |------+------+------+------+------+------| |------+-------+------+------+------+-------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  | |   H  |   J   |   K  |   L  |   ;  |   "   |
- * |------+------+------+------+------+------| |------+-------+------+------+------+-------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  | |   N  |   M   |   ,  |   .  |   /  | Enter |
- * |------+------+------+------+------+------| |------+-------+------+------+------+-------|
- * | Ctrl |Adjust| GUI  | Alt  |Lower |Space | | Space |Raise | Left |  Up  | Down | Right |
- * `-----------------------------------------| |-------------------------------------------|
- */
-
-[_QWERTY] = LAYOUT(
-  QK_GESC,  KC_1,        KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL,
-  KC_RCTL,  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,  MO(_ADJUST), KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------| |------------------------------------------.
- * |  `   |  F1  |  F2  |  F3  |      |      | |   -  |   =  |   (  |   )  |      |  Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+-------|
- * |   ~  |  F4  |  F5  |  F6  |      |      | |   &  |   *  |   {  |   }  |      |  Del  |
- * |------+------+------+------+------+------| |------+------+------+------+------+-------|
- * | Del  |  F7  |  F8  |  F9  |      |      | |   _  |   +  |   [  |   ]  |      |   \   |
- * |------+------+------+------+------+------| |------+------+------+------+------+-------|
- * |      |  F10 |  F11 |  F12 |      |      | |      |      |      |  F5  |  Up  | Enter |
- * |------+------+------+------+------+------| |------+------+------+------+------+-------|
- * |      |      |      |      |      | Home | | End  |      |      | Left | Down | Right |
- * `-----------------------------------------| |------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_GRV,  KC_F1,    KC_F2,    KC_F3,    _______, _______, KC_MINS, KC_EQL,  _______, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TILD, KC_F4,    KC_F5,    KC_F6,    _______, _______, KC_AMPR, KC_ASTR, _______, KC_LCBR, KC_RCBR, KC_DEL,
-  KC_DEL,  KC_F7,    KC_F8,    KC_F9,    _______, _______, KC_UNDS, KC_PLUS, _______, KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F10,   KC_F11,   KC_F12,   _______, _______, _______, _______, _______, KC_F5,   KC_UP,   _______,
-  _______, _______,  _______,  _______,  _______, KC_HOME, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT
-),
-
-/* Raise
- * ,-----------------------------------------| |-----------------------------------------.
- * | Back |  m0  |  m1  |  m2  |      |      | |      |   7  |   8  |   9  |  -   | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | For  |  sD  |  mU  |  sU  |      |      | |      |   4  |   5  |   6  |   +  |  Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Del  |  mL  |  mD  |  mR  |      |      | |      |   1  |   2  |   3  |   *  |  \   |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |   0  |  mB1 |  mB1 |  mB2 |      | |      |   0  |   .  |   =  |   /  |Enter |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | MIDI |      |      |      |      |      | |      |      | Mute | Vol- | Vol+ | Play |
- * `-----------------------------------------| |-----------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  LALT(KC_LEFT),  KC_MS_ACCEL0,  KC_MS_ACCEL1, KC_MS_ACCEL2, _______,    _______, _______, KC_7,    KC_8,    KC_9,    KC_MINS, KC_BSPC,
-  LALT(KC_RIGHT), KC_MS_WH_DOWN, KC_MS_UP,     KC_MS_WH_UP,  _______,    _______, _______, KC_4,    KC_5,    KC_6,    KC_PLUS, KC_DEL,
-  KC_DEL,         KC_MS_LEFT,    KC_MS_DOWN,   KC_MS_RIGHT,  _______,    _______, _______, KC_1,    KC_2,    KC_3,    KC_ASTR, KC_BSLS,
-  _______,        KC_P0,         KC_MS_BTN1,   KC_MS_BTN1,   KC_MS_BTN2, _______, _______, KC_0,    KC_DOT,  KC_EQL,  KC_SLSH, _______,
-  MO(_MIDI),      _______,       _______,      _______,      _______,    _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/*
- * MIDI
- */
-
-[_MIDI] = LAYOUT(
-  QWERTY,   MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,    MI_C1,   MI_C2,   MI_C3,   QWERTY,
-  MI_A3,    MI_As3,  MI_B3,   MI_C3,   MI_Cs3,  MI_D3,   MI_Ds3,  MI_E3,   MI_F3,   MI_Fs3,  MI_G3,   MI_Gs3,
-  MI_A2,    MI_As2,  MI_B2,   MI_C2,   MI_Cs2,  MI_D2,   MI_Ds2,  MI_E2,   MI_F2,   MI_Fs2,  MI_G2,   MI_Gs2,
-  MI_A1,    MI_As1,  MI_B1,   MI_C1,   MI_Cs1,  MI_D1,   MI_Ds1,  MI_E1,   MI_F1,   MI_Fs1,  MI_G1,   MI_Gs1,
-  MI_A,     MI_As,   MI_B,    MI_C,    MI_Cs,   MI_D,    MI_Ds,   MI_E,    MI_F,    MI_Fs,   MI_G,    MI_Gs
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------| |-----------------------------------------.
- * |QWERTY|  F2  |  F3  |  F4  |  F5  |  F6  | |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn| |Sat Up|  7   |  8   |  9   |      |  Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm| |AGswap|  6   |  5   |  4   |      |      |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      |      |   [  | |   ]  |  1   |  2   |  3   |      |      |
- * |------+------+------+------+------+------+ |------+------+------+------+------+------|
- * |      |      |      |      |      |   {  | |   }  |  0   |  .   |      |      |      |
- * `-----------------------------------------| |-----------------------------------------'
- */
-[_ADJUST] =  LAYOUT(
-  QWERTY,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, KC_7,    KC_8,    KC_9,    _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, KC_6,    KC_5,    KC_4,    _______, _______,
-  _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_1,    KC_2,    KC_3,    _______, _______,
-  _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_0,    KC_DOT,  _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/shovelpaw/rules.mk b/keyboards/keebio/nyquist/keymaps/shovelpaw/rules.mk
deleted file mode 100644
index 44ca075c340..00000000000
--- a/keyboards/keebio/nyquist/keymaps/shovelpaw/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-MIDI_ENABLE = yes # MIDI support (+2400 to 4200, depending on config)
-
diff --git a/keyboards/keebio/nyquist/keymaps/skug/config.h b/keyboards/keebio/nyquist/keymaps/skug/config.h
deleted file mode 100644
index 6566a247618..00000000000
--- a/keyboards/keebio/nyquist/keymaps/skug/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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 USE_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-
-#undef LSPO_KEY
-#undef RSPC_KEY
-#define LSPO_KEY KC_8 // Nordic Left SpaceCadet
-#define RSPC_KEY KC_9 // Nordic Right SpaceCadet
-
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/skug/keymap.c b/keyboards/keebio/nyquist/keymaps/skug/keymap.c
deleted file mode 100644
index ceb02b676ab..00000000000
--- a/keyboards/keebio/nyquist/keymaps/skug/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Copyright 2019 Christoffer Holmberg
- *
- * 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_swedish.h"
-
-extern keymap_config_t keymap_config;
-
-#define CT_APOS CTL_T(SE_QUOT)
-#define CT_TILD CTL_T(SE_TILD)
-#define MD_ODIA LT(MDIA, SE_ODIA)
-#define SM_ADIA LT(SYMB, SE_ADIA)
-
-enum layer_names {
-      BASE,
-      GAME,
-      SYMB,
-      MDIA,
-      ARRW,
-      _ADJUST,
-};
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE,
-  ADJUST,
-  DVORAK,
-  COLEMAK,
-  QWERTY
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Base layer
- * ,-----------------------------------------.   .-----------------------------------------.
- * |  Esc |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  |   +  |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |   Å  |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * | ARRW |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |   Ö  |   Ä  |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |Shift(|   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |   ,  |   .  |   -  |)Shift|
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |'/Ctrl|  ´   | Alt  |  Bsp |Space |  Win |   | Entr | Space| Bsb  | AlGr |   *  |Ctrl/¨|
- * `-----------------------------------------'   '-----------------------------------------'
- */
-[BASE] = LAYOUT(
-                //       LEFT HAND                                               RIGHT HAND
-  KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    SE_PLUS,
-  KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    SE_ARNG,
-  MO(ARRW), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    MD_ODIA, SM_ADIA,
-  SC_LSPO,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  SE_MINS, SC_RSPC,
-  CT_APOS,  SE_ACUT, KC_LALT, KC_BSPC, KC_SPC,  KC_LGUI,     KC_ENT,  KC_SPC,  KC_BSPC, KC_ALGR, SE_ASTR, CT_TILD
-),
-
-/* Gaming layer
- * ,-----------------------------------------.   .-----------------------------------------.
- * |  Esc |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  |   +  |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |   Å  |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * | ARRW |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |   Ö  |   Ä  |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |Shift |   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |   ,  |   .  |   -  | Shift|
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * | Ctrl |  ´   | Alt  |  Bsp |Space |  Win |   | Entr | Space| Bsb  | AlGr |   *  | Ctrl |
- * `-----------------------------------------'   '-----------------------------------------'
- */
-[GAME] = LAYOUT(
-                //       LEFT HAND                                               RIGHT HAND
-  KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    SE_PLUS,
-  KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    SE_ARNG,
-  MO(ARRW), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    MD_ODIA, SM_ADIA,
-  KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  SE_MINS, KC_RSFT,
-  KC_LCTL,  SE_ACUT, KC_LALT, KC_BSPC, KC_SPC,  KC_LGUI,     KC_ENT,  KC_SPC,  KC_BSPC, KC_ALGR, SE_ASTR, KC_RCTL
-),
-
-/* Symbols layer
- * ,-----------------------------------------.   .-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |   |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |   !  |   @  |   {  |   }  |   |  |   |  Up  |   7  |   8  |   9  |   *  | F12  |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |      |   #  |   $  |   (  |  )   |   `  |   | Down |   4  |   5  |   6  |   +  |      |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |      |   %  |   ^  |   [  |  ]   |   ~  |   |   &  |   1  |   2  |   3  |   -  |      |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |      |      |   <  |  >   |      |   |      |      |   .  |   0  |   =  |      |
- * `-----------------------------------------'   '-----------------------------------------'
- */
-[SYMB] = LAYOUT(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, KC_EXLM, SE_AT,   SE_LCBR, SE_RCBR, SE_PIPE,     KC_UP,   KC_7,    KC_8,    KC_9,    SE_ASTR, KC_F12,
-  _______, KC_HASH, SE_DLR,  SE_LPRN, SE_RPRN, SE_GRV,      KC_DOWN, KC_4,    KC_5,    KC_6,    SE_PLUS, _______,
-  _______, KC_PERC, SE_CIRC, SE_LBRC, SE_RBRC, SE_TILD,     SE_AMPR, KC_1,    KC_2,    KC_3,    SE_MINS, _______,
-  _______, _______, _______, SE_LABK, SE_RABK, _______,     _______, _______, KC_DOT,  KC_0,    SE_EQL,  _______
-),
-
-/* Media layer
- * ,-----------------------------------------.   .-----------------------------------------.
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * `-----------------------------------------'   '-----------------------------------------'
- */
-[MDIA] = LAYOUT(
-  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______
-),
-
-/* Arrow layer
- * ,-----------------------------------------.   .-----------------------------------------.
- * |  §/½ |      |      |      |      |      |   |      |      | BASE | Ins  | Home | PgUp |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |      |  Up  |      |      |      |   |      |      | GAME | Del  | End  | PgDn |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |      | Left | Down | Right|      | Back |   |  Fwd |      |      |      |      |      |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |      |      |  Del |      |      |   |      |      |      |      |      |      |
- * `-----------------------------------------'   '-----------------------------------------'
- */
-[ARRW] = LAYOUT(
-  SE_HALF,  _______,  _______,  _______ ,  _______,  _______,     _______,  _______,  DF(BASE),  KC_INS ,  KC_HOME,  KC_PGUP,
-  _______,  _______,  KC_UP  ,  _______ ,  _______,  _______,     _______,  _______,  DF(GAME),  KC_DEL ,  KC_END ,  KC_PGDN,
-  _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  KC_WBAK,     KC_WFWD,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______ ,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  KC_DEL  ,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______
-),
-
-/* Adjust ()
- * ,-----------------------------------------.   .-----------------------------------------.
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|   |Sat Up|Sat Dn|Val Up|Val Dn|      |      |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|   |AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * `-----------------------------------------'   '-----------------------------------------'
- */
-[_ADJUST] =  LAYOUT(
-  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  QK_BOOT,  RGB_TOG,  RGB_MOD,  RGB_HUD,  RGB_HUI,     RGB_SAD,  RGB_SAI,  RGB_VAD,  RGB_VAI,  _______,  _______,
-  _______,  _______,  _______,  AU_ON,    AU_OFF,   AG_NORM,     AG_SWAP,  QWERTY,   COLEMAK,  DVORAK,   _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______
-)
-
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/skug/rules.mk b/keyboards/keebio/nyquist/keymaps/skug/rules.mk
deleted file mode 100644
index e0ed6f0c2d6..00000000000
--- a/keyboards/keebio/nyquist/keymaps/skug/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/keebio/nyquist/keymaps/winternebs/config.h b/keyboards/keebio/nyquist/keymaps/winternebs/config.h
deleted file mode 100755
index 5f60296faf3..00000000000
--- a/keyboards/keebio/nyquist/keymaps/winternebs/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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 USE_I2C
-
-/* Select hand configuration */
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#define MOUSEKEY_DELAY 80
-#define MOUSEKEY_INTERVAL 16
-#define MOUSEKEY_MAXSPEED 6
-#define MOUSEKEY_TIME_TO_MAX 10
-#define MOUSEKEY_WHEEL_MAX_SPEED 4
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 10
-
-#ifndef FORCE_NKRO
-#    define FORCE_NKRO
-#endif
diff --git a/keyboards/keebio/nyquist/keymaps/winternebs/keymap.c b/keyboards/keebio/nyquist/keymaps/winternebs/keymap.c
deleted file mode 100755
index b673a5f25f8..00000000000
--- a/keyboards/keebio/nyquist/keymaps/winternebs/keymap.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright 2020 winterNebs <winternebs@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
-
-
-// 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 layers {
-    _QWERTY,
-    _WORKMAN,
-    _LOWER,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  WORKMAN,
-};
-
-#define LOWER MO(_LOWER)
-#define ADJUST MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  |      | Alt  |Lower |Space | Bksp |Adjust|      | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_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, LOWER,   KC_SPC,  KC_BSPC, ADJUST,  z, KC_LEFT, KC_DOWN,   KC_RGHT 
-),
-/* Workman
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   Q  |   D  |   R  |   W  |   B  |   J  |   F  |   U  |   P  |   ;  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   H  |   T  |   G  |   Y  |   N  |   E  |   O  |   I  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   M  |   C  |   V  |   K  |   L  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  |      | Alt  |Lower |Space | Bksp |Adjust|      | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_WORKMAN] = LAYOUT( 
-  KC_ESC,  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_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_DEL, 
-  KC_TAB,  KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,	 KC_QUOT, 
-  KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , 
-  KC_LCTL, KC_LGUI, _______, KC_LALT, LOWER,   KC_SPC,  KC_BSPC, ADJUST,  _______, KC_LEFT, KC_DOWN, KC_RGHT 
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |Pg Up |  UP  |Pg Dn |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |PrScr |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT( 
-  KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-  KC_DEL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, 
-  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_PGUP, KC_UP,	 KC_PGDN, 
-  _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|      |      |      |      | ScrL | ScrR |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Sat Up|Sat Dn|Val Up|Val Dn|AGnorm|AGswap| Home |  M1  |  ^   |  M2  |ScrUp |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Qwerty|WORKMN|      | End  |  <   |  v   |  >   |Scrdn |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      | Left | Down | Up   |Right | Vol+ |Pause |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | NKRO |      |      |      |      |             |      |      | Last | Vol- | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT( 
-  QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_WH_L, KC_WH_R, _______,
-  RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, AG_NORM, AG_SWAP, KC_HOME, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, 
-  _______, _______, _______, QWERTY,  WORKMAN, _______, KC_END,  KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______,
-  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_VOLU, KC_MPLY, 
-  MAGIC_TOGGLE_NKRO, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT 
-)
-
-
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case WORKMAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WORKMAN);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/winternebs/rules.mk b/keyboards/keebio/nyquist/keymaps/winternebs/rules.mk
deleted file mode 100755
index bcb6ddebdd0..00000000000
--- a/keyboards/keebio/nyquist/keymaps/winternebs/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-NKRO_ENABLE = yes
diff --git a/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h b/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
deleted file mode 100644
index 6d75a5898aa..00000000000
--- a/keyboards/keebio/nyquist/keymaps/yshrsmz/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
-
-/* auto shift config */
-#define AUTO_SHIFT_TIMEOUT 140
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/nyquist/keymaps/yshrsmz/keymap.c b/keyboards/keebio/nyquist/keymaps/yshrsmz/keymap.c
deleted file mode 100644
index ee730ebfc07..00000000000
--- a/keyboards/keebio/nyquist/keymaps/yshrsmz/keymap.c
+++ /dev/null
@@ -1,191 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 1
-#define _RAISE 2
-#define _FUNC 3
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  FUNC,
-  ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  =   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  -   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Fn  | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | GUI  |Shift |Adjust|  Fn  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
-  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_ESC,  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 ,
-  FUNC,    KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_RGUI, KC_RSFT, ADJUST,  FUNC
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* FUNC
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   `  |  F1  |  F2  |  F3  |  F4  |      |      |      |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F5  |  F6  |  F7  |  F8  |      | LEFT | DOWN |  UP  |RIGHT | PGUP |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  | F10  | F11  | F12  |      | HOME | END  |Alt+← |Alt+→ | PGDN |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT(
-  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_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_PGUP, _______,
-  _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_HOME, KC_END,  LALT(KC_LEFT),LALT(KC_RGHT), KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  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,
-  _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case FUNC:
-      if (record->event.pressed) {
-        layer_on(_FUNC);
-      } else {
-        layer_off(_FUNC);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/nyquist/keymaps/yshrsmz/rules.mk b/keyboards/keebio/nyquist/keymaps/yshrsmz/rules.mk
deleted file mode 100644
index c9383ab8db8..00000000000
--- a/keyboards/keebio/nyquist/keymaps/yshrsmz/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/keebio/nyquist/rev4/config.h b/keyboards/keebio/nyquist/rev4/config.h
index 501e4edaf7f..37b015f8210 100644
--- a/keyboards/keebio/nyquist/rev4/config.h
+++ b/keyboards/keebio/nyquist/rev4/config.h
@@ -4,19 +4,17 @@
 #pragma once
 
 #define SPLIT_HAND_PIN GP23
+
 #define USB_VBUS_PIN GP18
+
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP8
 #define SERIAL_USART_RX_PIN GP9
 #define SERIAL_USART_PIN_SWAP
+
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
 #define I2C_DRIVER I2CD0
 #define I2C0_SDA_PIN GP4
 #define I2C0_SCL_PIN GP5
-
-// RGB Matrix
-#define RGB_MATRIX_LED_COUNT 72
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/nyquist/rev4/info.json b/keyboards/keebio/nyquist/rev4/info.json
index 043bb02f01f..804d1aa5d41 100644
--- a/keyboards/keebio/nyquist/rev4/info.json
+++ b/keyboards/keebio/nyquist/rev4/info.json
@@ -312,6 +312,7 @@
             { "flags": 4, "matrix": [9, 3], "x": 177, "y": 57 },
             { "flags": 4, "matrix": [9, 4], "x": 196, "y": 57 },
             { "flags": 4, "matrix": [9, 5], "x": 214, "y": 57 }
-          ]
+        ],
+        "sleep": true
     }
 }
diff --git a/keyboards/keebio/nyquistpad/config.h b/keyboards/keebio/nyquistpad/config.h
index 82a64e39bff..8b36fb4f3a7 100644
--- a/keyboards/keebio/nyquistpad/config.h
+++ b/keyboards/keebio/nyquistpad/config.h
@@ -5,9 +5,3 @@
 
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
-
-// RGB Matrix
-#define RGB_MATRIX_LED_COUNT 36
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/nyquistpad/info.json b/keyboards/keebio/nyquistpad/info.json
index d999482ef03..1999e9eaa82 100644
--- a/keyboards/keebio/nyquistpad/info.json
+++ b/keyboards/keebio/nyquistpad/info.json
@@ -196,6 +196,7 @@
             { "flags": 4, "matrix": [4, 3], "x": 130, "y": 57 },
             { "flags": 4, "matrix": [4, 4], "x": 192, "y": 57 },
             { "flags": 4, "matrix": [4, 5], "x": 210, "y": 57 }
-        ]
+        ],
+        "sleep": true
     }
 }
diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
deleted file mode 100644
index 1751a65b2e9..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-Copyright 2021 Ben Fiedler <me@bfiedler.ch>
-
-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
-
-// https://docs.qmk.fm/#/tap_hold?id=tap-hold-configuration-options
-#define TAPPING_TERM 120
-//#define PERMISSIVE_HOLD
diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c b/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c
deleted file mode 100644
index b2d51eb4087..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bfiedler/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2021 Ben Fiedler
- *
- * 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 KC_RST QK_BOOT
-
-// 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 custom_layers {
-    _BASE,
-    _FN1,
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_65(
-    QK_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_DEL,  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,
-    LGUI_T(KC_BSPC), KC_A,         KC_S,    KC_D,     KC_F,    KC_G,   KC_H,             KC_J,    KC_K,    KC_L,    KC_SCLN,         KC_QUOT, LGUI_T(KC_ENT), KC_PGUP,
-    KC_LSFT,         LCTL_T(KC_Z), KC_X,    KC_C,     KC_V,    KC_B,   KC_N,             KC_M,    KC_COMM, KC_DOT,  LCTL_T(KC_SLSH), KC_RSFT, KC_UP,          KC_PGDN,
-    KC_LCTL,         KC_LALT,      KC_LGUI, KC_LALT,  KC_SPC,          LT(_FN1, KC_ENT), KC_RALT, _______, KC_RCTL, KC_RGUI,         KC_LEFT, KC_DOWN,        KC_RGHT
-  ),
-
-  [_FN1] = LAYOUT_65(
-    QK_GESC,         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_BSPC, _______,
-    RGB_TOG,         RGB_MOD,      _______, _______, _______, _______, _______,          _______, _______, _______, _______,         _______, _______,        _______, _______,
-    _______,         _______,      _______, _______, _______, _______, KC_LEFT,          KC_DOWN, KC_UP,   KC_RGHT, _______,         _______, _______,        _______,
-    _______,         _______,      _______, _______, _______, _______, _______,          _______, _______, _______, _______,         _______, _______,        _______,
-    KC_RST,          _______,      _______, _______, _______,          _______,          _______, _______, _______, _______,         _______, _______,        KC_RST
-  )
-};
-// clang-format on
-
-// TODO: I don't even have a rotary encoder, do I need this?
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/rules.mk b/keyboards/keebio/quefrency/keymaps/bfiedler/rules.mk
deleted file mode 100644
index f69cb0dfea7..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bfiedler/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Saves a bit of space, and currently (04.03.2021) the
-# case is not see-through.
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
deleted file mode 100644
index 3e2c0978533..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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_TERM 500
-
-#define PERMISSIVE_HOLD
-#define FORCE_NKRO
-#define RETRO_TAPPING
-
-#define TAPPING_TOGGLE 1
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/keebio/quefrency/keymaps/bjohnson/keymap.c b/keyboards/keebio/quefrency/keymaps/bjohnson/keymap.c
deleted file mode 100644
index 28bb0c66b7b..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bjohnson/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _BASE 0
-#define _FN1 1
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_65(
-    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,  XXXXXXX, 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_DEL,
-    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_INS,
-    KC_LCTL, KC_LGUI, KC_LALT, LT(_FN1,KC_SPC),KC_SPC,    KC_SPC,  XXXXXXX,  KC_RALT, KC_RGUI, XXXXXXX, KC_APP,  KC_RCTL, TT(_FN1)
-  ),
-
-  [_FN1] = LAYOUT_65(
-    KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_BSPC, KC_PGUP,
-    _______, _______,  KC_UP,  _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_PGDN,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______,
-    _______, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,          KC_P0,   XXXXXXX, _______, _______, XXXXXXX, _______, _______, _______
-  )
-};
diff --git a/keyboards/keebio/quefrency/keymaps/bjohnson/rules.mk b/keyboards/keebio/quefrency/keymaps/bjohnson/rules.mk
deleted file mode 100644
index 63121acd6b6..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bjohnson/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # 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 = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/README.md b/keyboards/keebio/quefrency/keymaps/bramver/README.md
deleted file mode 100644
index 1665e4fd3eb..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bramver/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Quefrency Layout - initial 60%
-
-Standard qwerty layout.  
-Limited emoji support and proper mouse settings.
-
-Mostly based off of my other XD75 and Nyquist layouts.
-
-## Keymap
-
-```
-/* BASE
- *
- *   QK_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_DEL  ,  KC_BSPC  ,
- *   KC_TAB  , KC_Q    , KC_W    , KC_E     , KC_R   , KC_T    ,   /**/  KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_LBRC , KC_RBRC , KC_BSLS ,
- *   MO_EMOJ , 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_LALT , KC_LGUI , MO_SYMB  , SP_LMS ,             /**/  SP_RMS  , KC_BSPC , KC_RGUI , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT
- *
- */
-
-/* LMSE
- *
- *   _______ , _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  _______ ,
- *   _______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
- *   _______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
- *   _______ , _______ , KC_PGDN , KC_PGUP , KC_END  , KC_HOME ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
- *   _______ , _______ , _______ , _______ , _______ ,             /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ 
- *
- */
-
-/* RMSE
- *
- *   _______ , _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  _______ ,
- *   _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______ , _______ , _______ ,
- *   _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______ , _______ ,
- *   _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  KC_HOME , KC_END  , KC_PGUP , KC_PGDN , _______ , _______ , _______ ,
- *   _______ , _______ , _______ , _______ , _______ ,             /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ 
- *
- */
-
-/* SYMB
- *
- *   QK_GESC , KC_F1   , KC_F12  , KC_F3   , KC_F4   , KC_F5   , KC_F6   ,   /**/  KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_F11  , KC_F12  , KC_DEL  ,  KC_BSPC  ,
- *   _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
- *   _______ , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC ,   /**/  KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , _______ , _______ ,
- *   _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
- *   _______ , _______ , _______ , _______ , _______ ,             /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ 
- *
- */
-
-/* EMOJ
- *
- *   _______ , _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  _______ ,
- *   _______ , UM(CLAP) , UM(CUM)  , UM(BNIS) , UM(BUTT) , UM(CAR)  ,   /**/  UM(FIRE) , UM(REDB) , UM(MONY) , UM(HNDR) , UM(SOS)  , _______ , _______ , _______ ,
- *   _______ , UM(CELE) , UM(PRAY) , UM(NAIL) , UM(OK)   , UM(THNK) ,   /**/  UM(UNAM) , UM(HEYE) , UM(COOL) , UM(EYES) , UM(SMIR) , _______ , _______ ,
- *   _______ , UM(TRIU) , UM(SCRM) , UM(VOMI) , UM(DTIV) , UM(EXPL) ,   /**/  UM(HAIR) , UM(DANC) , UM(STRN) , UM(LEFT) , UM(RGHT) , _______ , _______ ,
- *   _______ , _______ , _______ , _______ , _______ ,             /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ 
- *
- */
-
-```
\ No newline at end of file
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/config.h b/keyboards/keebio/quefrency/keymaps/bramver/config.h
deleted file mode 100644
index 468e59af07f..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bramver/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2018 darm
- *
- * 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 MASTER_LEFT
-
-#define TAPPING_TERM 200
-#define TAPPING_TOGGLE 2
-
-#define MOUSEKEY_DELAY             0
-#define MOUSEKEY_INTERVAL          16
-#define MOUSEKEY_MAX_SPEED         7
-#define MOUSEKEY_TIME_TO_MAX       60
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-#define MOUSEKEY_WHEEL_DELAY 0
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/keymap.c b/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
deleted file mode 100644
index 9c6729e91e2..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
+++ /dev/null
@@ -1,131 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-#define _BASE 0
-#define _LMSE 1
-#define _RMSE 2
-#define _SYMB 3
-#define _EMOJ 4
-
-#define SP_LMS LT(_LMSE, KC_SPC)
-#define SP_RMS LT(_RMSE, KC_SPC)
-#define MO_SYMB TT(_SYMB)
-#define MO_EMOJ TT(_EMOJ)
-
-
-enum emoji_map {
-  UNAM, // unamused 😒
-  HEYE, // smiling face with heart shaped eyes 😍
-  OK, // ok hand sign 👌
-  SMIR, // smirk 😏
-  PRAY, // pray 🙏
-  CELE, // celebration 🙌
-  COOL, // smile with sunglasses 😎
-  EYES, // eyes
-  THNK, // BIG THONK
-  NAIL, // Nailcare
-  SOS, // Vuile sos
-  REDB, // Red B
-  HNDR, // 100
-  MONY,
-  FIRE,
-  CAR,
-  BUTT,
-  BNIS,
-  CUM,
-  CLAP,
-  TRIU, // Fart from nose
-  SCRM,
-  VOMI,
-  DTIV, // Detective
-  EXPL, // Brainsplosion
-  HAIR, // Haircut
-  DANC, // Salsa dancer
-  STRN, // Stronk
-  LEFT, // Point Left
-  RGHT, // Point Right
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-  [UNAM] = 0x1F612,
-  [HEYE] = 0x1f60d,
-  [OK]   = 0x1F44C,
-  [SMIR] = 0x1F60F,
-  [PRAY] = 0x1F64F,
-  [CELE] = 0x1F64C,
-  [COOL] = 0x1F60E,
-  [EYES] = 0x1F440,
-  [THNK] = 0x1F914,
-  [NAIL] = 0x1F485,
-  [SOS] = 0x1F198,
-  [REDB] = 0x1F171,
-  [HNDR] = 0x1F4AF,
-  [MONY] = 0x1F480,
-  [FIRE] = 0x1F525,
-  [CAR] = 0x1F697,
-  [BUTT] = 0x1F351,
-  [BNIS] = 0x1F346,
-  [CUM] = 0x1F4A6,
-  [CLAP] = 0x1F44F,
-  [TRIU] = 0x1F624,
-  [SCRM] = 0x1F631,
-  [VOMI] = 0x1F92E,
-  [DTIV] = 0x1F575,
-  [EXPL] = 0x1F92F,
-  [HAIR] = 0x2640,
-  [DANC] = 0x1F483,
-  [STRN] = 0x1F4AA,
-  [LEFT] = 0x1F448,
-  [RGHT] = 0x1F449,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    QK_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_DEL  ,  KC_BSPC  ,
-    KC_TAB  , KC_Q    , KC_W    , KC_E     , KC_R   , KC_T    , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_LBRC , KC_RBRC , KC_BSLS ,
-    MO_EMOJ , 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_LALT , KC_LGUI , MO_SYMB  , SP_LMS ,           SP_RMS  , KC_BSPC , KC_RGUI , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT
-  ),
-
-  [_LMSE] = LAYOUT(
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  _______ ,
-    _______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
-    _______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
-    _______ , _______ , KC_PGDN , KC_PGUP , KC_END  , KC_HOME , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
-    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______
-  ),
-
-  [_RMSE] = LAYOUT(
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  _______ ,
-    _______ , _______ , _______ , _______ , _______ , _______ , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______ , _______ , _______ ,
-    _______ , _______ , _______ , _______ , _______ , _______ , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______ , _______ ,
-    _______ , _______ , _______ , _______ , _______ , _______ , KC_HOME , KC_END  , KC_PGUP , KC_PGDN , _______ , _______ , _______ ,
-    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______
-  ),
-
-  [_SYMB] = LAYOUT(
-    QK_GESC , KC_F1   , KC_F12  , KC_F3   , KC_F4   , KC_F5   , KC_F6   , KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_F11  , KC_F12  , KC_DEL  ,  KC_BSPC  ,
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
-    _______ , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , _______ , _______ ,
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
-    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______
-  ),
-
-  [_EMOJ] = LAYOUT(
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  _______ ,
-    _______ , UM(CLAP) , UM(CUM)  , UM(BNIS) , UM(BUTT) , UM(CAR)  , UM(FIRE) , UM(REDB) , UM(MONY) , UM(HNDR) , UM(SOS)  , _______ , _______ , _______ ,
-    _______ , UM(CELE) , UM(PRAY) , UM(NAIL) , UM(OK)   , UM(THNK) , UM(UNAM) , UM(HEYE) , UM(COOL) , UM(EYES) , UM(SMIR) , _______ , _______ ,
-    _______ , UM(TRIU) , UM(SCRM) , UM(VOMI) , UM(DTIV) , UM(EXPL) , UM(HAIR) , UM(DANC) , UM(STRN) , UM(LEFT) , UM(RGHT) , _______ , _______ ,
-    _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______
-  ),
-
-};
-
-void matrix_init_user(void) {
-  set_unicode_input_mode(UNICODE_MODE_LINUX);
-};
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/rules.mk b/keyboards/keebio/quefrency/keymaps/bramver/rules.mk
deleted file mode 100644
index d211d7b4cfb..00000000000
--- a/keyboards/keebio/quefrency/keymaps/bramver/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build options
-MOUSEKEY_ENABLE = yes			# Emulates mouse key using keypresses
-EXTRAKEY_ENABLE = yes 		# Use system and audio control key codes
-TAP_DANCE_ENABLE = no 		# Use multi-tap features
-UNICODEMAP_ENABLE = yes  	# Emojify me pls
-NKRO_ENABLE = yes
diff --git a/keyboards/keebio/quefrency/keymaps/default60/config.h b/keyboards/keebio/quefrency/keymaps/default60/config.h
deleted file mode 100644
index 497e05b540c..00000000000
--- a/keyboards/keebio/quefrency/keymaps/default60/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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
diff --git a/keyboards/keebio/quefrency/keymaps/default65/config.h b/keyboards/keebio/quefrency/keymaps/default65/config.h
deleted file mode 100644
index 9aae0fdfc2e..00000000000
--- a/keyboards/keebio/quefrency/keymaps/default65/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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
-
diff --git a/keyboards/keebio/quefrency/keymaps/drashna_ms/config.h b/keyboards/keebio/quefrency/keymaps/drashna_ms/config.h
deleted file mode 100644
index 80a3cb877e2..00000000000
--- a/keyboards/keebio/quefrency/keymaps/drashna_ms/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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 USE_I2C
-#define EE_HANDS
-
-
-#ifdef RGBLIGHT_ENABLE
-    #define RGBLIGHT_SPLIT
-    #undef  RGBLED_NUM
-    #define RGBLED_NUM 17
-    #undef RGBLED_SPLIT
-    #define RGBLED_SPLIT { 9, 8 }
-    #define RGBLIGHT_SLEEP
-#endif
-
-#ifdef AUDIO_ENABLE
-    #define AUDIO_PIN B7
-    #define AUDIO_CLICKY
-#endif
diff --git a/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c b/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
deleted file mode 100644
index e0859e4f626..00000000000
--- a/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layers {
-    _BASE,
-    _FN1,
-};
-
-enum custom_keycodes {
-    KC_MAKE = SAFE_RANGE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_65_with_macro(
-    KC_F1,   KC_F2,   QK_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, XXXXXXX, KC_BSPC, KC_HOME,
-    KC_F3,   KC_F4,   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_F5,   KC_F6,   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_F7,   KC_F8,   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_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,    KC_SPC,  MO(_FN1),     KC_SPC,   XXXXXXX,       KC_RALT, KC_RGUI, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [_FN1] = LAYOUT_65_with_macro(
-    _______, _______, QK_GESC, 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_BSPC, QK_BOOT,
-    _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_TILD, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  )
-};
-
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
-            if (!record->event.pressed)
-                send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP ":dfu" SS_TAP(X_ENTER)), 10);
-
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/keebio/quefrency/keymaps/drashna_ms/rules.mk b/keyboards/keebio/quefrency/keymaps/drashna_ms/rules.mk
deleted file mode 100644
index fb7f940c93f..00000000000
--- a/keyboards/keebio/quefrency/keymaps/drashna_ms/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LTO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-AUDIO_ENABLE = yes
-BOOTLOADER = qmk-dfu
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/config.h b/keyboards/keebio/quefrency/keymaps/georgepetri/config.h
deleted file mode 100644
index fac62b97d66..00000000000
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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
-
-#undef RGBLIGHT_EFFECT_BREATHING
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c b/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c
deleted file mode 100644
index faa5a480e60..00000000000
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c
+++ /dev/null
@@ -1,91 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _BASE 0
-#define _L 1
-#define _R 2
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-#define KC_TL LCTL(KC_PGUP)
-#define KC_TR LCTL(KC_PGDN)
-#define KC_TC LCTL(KC_W)
-#define KC_TRO LCTL(LSFT(KC_T))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_65(
-// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    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_DEL  ,KC_MINS ,KC_EQL  ,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_ESC         ,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_PGDN ,
-// ├──────────┬──────────┴┬───────┴──┬─────┴─────┬──┴────────┴────────┤        ├────────┴────────┴────┬───┴────┬───┴────┬───┴────┬────────┬────────┼────────┤
-    KC_CAPS   ,KC_LCTL    ,KC_LALT   ,MO(_L)   ,KC_SPC                ,         KC_SPC  ,_______      ,KC_LGUI ,TG(_R)  ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-// └──────────┴───────────┴──────────┴───────────┴────────────────────┘        └──────────────────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_L] = LAYOUT_65(
-// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F6   ,         KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,_______ ,_______ ,_______ ,KC_INS  ,
-// ├────────┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┘    ┌───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────────┼────────┤
-    _______      ,KC_F11  ,KC_F12  ,_______ ,_______ ,_______ ,         _______ ,KC_MINS ,KC_EQL  ,_______ ,_______ ,_______ ,_______ ,_______,     KC_PAUS ,
-// ├─────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┐      └─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┼────────┤
-    _______        ,_______ ,_______ ,_______ ,_______ ,_______ ,         KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,_______ ,_______ ,_______            ,_______ ,
-// ├───────────────┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┐  └─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴───────────────────┼────────┤
-    _______              ,_______ ,_______ ,_______ ,_______ ,_______ ,         _______ ,KC_PGDN ,KC_PGUP ,KC_HOME ,KC_END  ,_______ ,_______      ,_______ ,
-// ├──────────┬──────────┴┬───────┴──┬─────┴─────┬──┴────────┴────────┤        ├────────┴────────┴────┬───┴────┬───┴────┬───┴────┬────────┬────────┼────────┤
-    _______   ,_______    ,_______   ,_______    ,_______             ,         _______ ,_______      ,_______ ,_______ ,_______ ,_______ ,_______ ,_______
-// └──────────┴───────────┴──────────┴───────────┴────────────────────┘        └──────────────────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_R] = LAYOUT_65(
-// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,         _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-// ├────────┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┘    ┌───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────────┼────────┤
-    _______      ,KC_TL   ,KC_TR   ,KC_TC   ,KC_TRO  ,_______ ,         _______ ,KC_TL  , KC_TR  , KC_TC  , KC_TRO  ,_______ ,_______ ,_______,     _______ ,
-// ├─────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┐      └─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┼────────┤
-    _______        ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,_______ ,         KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,_______ ,_______ ,_______            ,_______ ,
-// ├───────────────┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┐  └─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴───────────────────┼────────┤
-    _______              ,KC_PGDN ,KC_PGUP ,KC_HOME ,KC_END  ,_______ ,         _______ ,KC_PGDN ,KC_PGUP ,KC_HOME ,KC_END  ,_______ ,_______      ,_______ ,
-// ├──────────┬──────────┴┬───────┴──┬─────┴─────┬──┴────────┴────────┤        ├────────┴────────┴────┬───┴────┬───┴────┬───┴────┬────────┬────────┼────────┤
-    _______   ,_______    ,_______   ,_______    ,_______             ,         _______ ,_______      ,_______ ,_______ ,_______ ,_______ ,_______ ,_______
-// └──────────┴───────────┴──────────┴───────────┴────────────────────┘        └──────────────────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
-
-void keyboard_post_init_user(void) {
-  rgblight_sethsv_noeeprom(HSV_BLUE);
-}
-
-void update_led(void) {
-    switch (get_highest_layer(layer_state)) {
-      case _BASE:
-      rgblight_sethsv_noeeprom(HSV_BLUE);
-      break;
-    case _L:
-      rgblight_sethsv_noeeprom(HSV_CORAL);
-      break;
-    case _R:
-      rgblight_sethsv_noeeprom(HSV_MAGENTA);
-      break;
-    }
-  if (host_keyboard_led_state().caps_lock) {
-    rgblight_sethsv_range(HSV_WHITE,0,4);
-    rgblight_sethsv_range(HSV_WHITE,12,16);
-  }
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  update_led();
-  return state;
-}
-
-void led_set_user(uint8_t usb_led) {
-  update_led();
-}
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/readme.md b/keyboards/keebio/quefrency/keymaps/georgepetri/readme.md
deleted file mode 100644
index bb4e75c27bd..00000000000
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/readme.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# George Petri's Quefrency 65 layout
-
-```
-make keebio/quefrency/rev1:georgepetri
-```
-
-Querty layout with minor changes and dedicated navigation layer.
-
-### Base Layer
-```
-┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
-│  GRV ││  1   ││  2   ││  3   ││  4   ││  5   ││  6   │        │  7   ││  8   ││  9   ││  0   ││  BSPC││  DEL ││  MINS││  EQL ││  HOME│
-└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
-┌──────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────────┐┌──────┐
-│  TAB     ││  Q   ││  W   ││  E   ││  R   ││  T   │        │  Y   ││  U   ││  I   ││  O   ││  P   ││  LBRC││  RBRC││  BSLS    ││  END │
-└──────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────────┘└──────┘
-┌────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────┐┌──────┐
-│  ESC       ││  A   ││  S   ││  D   ││  F   ││  G   │        │  H   ││  J   ││  K   ││  L   ││  SCLN││  QUOT││  ENT           ││  PGUP│
-└────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└────────────────┘└──────┘
-┌────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────────┐┌──────┐
-│  LSFT          ││  Z   ││  X   ││  C   ││  V   ││  B   │        │  N   ││  M   ││  COMM││  DOT ││  SLSH││  RSFT              ││  PGDN│
-└────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└────────────────────┘└──────┘
-┌────────┐┌────────┐┌────────┐┌────────┐┌────────────────┐        ┌────────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
-│  CAPS  ││  LCTL  ││  LALT  ││MO(_L)  ││  SPC           │        │  SPC               ││  LGUI││TG(_R)││  LEFT││  DOWN││  UP  ││  RGHT│
-└────────┘└────────┘└────────┘└────────┘└────────────────┘        └────────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
-```
-
-### Raise
-```
-┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
-│      ││  F1  ││  F2  ││  F3  ││  F4  ││  F5  ││  F6  │        │  F7  ││  F8  ││  F9  ││  F10 ││  F11 ││  F12 ││  BSPC││  DEL ││  INS │
-└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
-┌──────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────────┐┌──────┐
-│          ││  F1  ││  F12 ││      ││      ││      │        │      ││  MINS││  EQL ││      ││      ││      ││      ││          ││  PAUS│
-└──────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────────┘└──────┘
-┌────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────┐┌──────┐
-│            ││      ││      ││      ││      ││      │        │  LEFT││  DOWN││  UP  ││  RGHT││      ││      ││                ││      │
-└────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└────────────────┘└──────┘
-┌────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────────┐┌──────┐
-│                ││      ││      ││      ││      ││      │        │      ││  PGDN││  PGUP││  HOME││  END ││                    ││      │
-└────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└────────────────────┘└──────┘
-┌────────┐┌────────┐┌────────┐┌────────┐┌────────────────┐        ┌────────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
-│        ││        ││        ││        ││                │        │                    ││      ││      ││      ││      ││      ││      │
-└────────┘└────────┘└────────┘└────────┘└────────────────┘        └────────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
-```
-
-### Lower
-```
-┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
-│      ││      ││      ││      ││      ││      ││      │        │      ││      ││      ││      ││      ││      ││      ││      ││      │
-└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
-┌──────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────────┐┌──────┐
-│          ││ TAB_L││ TAB_R││ TAB_C││ TAB_R││      │        │      ││ TAB_L││ TAB_R││ TAB_C││ TAB_R││      ││      ││          ││      │
-└──────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────────┘└──────┘
-┌────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────┐┌──────┐
-│            ││  LEFT││  DOWN││  UP  ││  RGHT││      │        │  LEFT││  DOWN││  UP  ││  RGHT││      ││      ││                ││      │
-└────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└────────────────┘└──────┘
-┌────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────────┐┌──────┐
-│                ││  PGDN││  PGUP││  HOME││  END ││      │        │      ││  PGDN││  PGUP││  HOME││  END ││                    ││      │
-└────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└────────────────────┘└──────┘
-┌────────┐┌────────┐┌────────┐┌────────┐┌────────────────┐        ┌────────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
-│        ││        ││        ││        ││                │        │                    ││      ││      ││      ││      ││      ││      │
-└────────┘└────────┘└────────┘└────────┘└────────────────┘        └────────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
-```
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/rules.mk b/keyboards/keebio/quefrency/keymaps/georgepetri/rules.mk
deleted file mode 100644
index 5bc0b70454b..00000000000
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/README.md b/keyboards/keebio/quefrency/keymaps/joestrong/README.md
deleted file mode 100644
index 717b9ecd54c..00000000000
--- a/keyboards/keebio/quefrency/keymaps/joestrong/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# JoeStrong's Quefrency layout - 60% ISO
-
-* Standard UK ISO qwerty layout
-* Function key in place of Caps Lock
-* Function layer provides vim-like arrows and various function keys
-
-## Default layer
-
-![Default layer layout](https://i.imgur.com/HXeKSGN.png)
-
-([KLE](http://www.keyboard-layout-editor.com/#/gists/f606625fbc4b84a0e9f82fff308aad29))
-
-## Function layer
-
-![Function layer layout](https://i.imgur.com/cVKl9tB.png)
-
-([KLE](http://www.keyboard-layout-editor.com/#/gists/b75402b2838f36e319f1c0a7fef07dd6))
diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/config.h b/keyboards/keebio/quefrency/keymaps/joestrong/config.h
deleted file mode 100644
index 497e05b540c..00000000000
--- a/keyboards/keebio/quefrency/keymaps/joestrong/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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
diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c b/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
deleted file mode 100644
index 3ed4718c301..00000000000
--- a/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 Joseph Strong
- *
- * 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_uk.h"
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN1
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_60_iso(
-        QK_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_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,
-        MO(_FN1),KC_A,    KC_S,     KC_D,    KC_F,    KC_G,                 KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
-        KC_LSFT, UK_BSLS, 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, MO(_FN1), KC_LALT,          KC_SPC,               _______, KC_SPC,  KC_RALT, MO(_FN1), _______,          KC_LGUI, KC_RCTL
-    ),
-
-    [_FN1] = LAYOUT_60_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,  _______, _______,
-        RGB_TOG, RGB_MOD, _______, _______,   _______,  _______,              _______, KC_PGDN, KC_PGUP, _______, _______, _______, _______,
-        _______, _______, KC_VOLD, KC_VOLU,   KC_MUTE,  _______,              KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DEL,  _______, _______, _______,
-        _______, _______, _______, _______,   _______,  _______, _______,     _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______,             _______,              _______, _______, _______, _______, _______,          _______, _______
-    )
-};
diff --git a/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h b/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h
deleted file mode 100644
index f636c954541..00000000000
--- a/keyboards/keebio/quefrency/keymaps/kingwangwong/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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 USB_MAX_POWER_CONSUMPTION 50
-
-
-// #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/keebio/quefrency/keymaps/kingwangwong/keymap.c b/keyboards/keebio/quefrency/keymaps/kingwangwong/keymap.c
deleted file mode 100644
index 72197c09565..00000000000
--- a/keyboards/keebio/quefrency/keymaps/kingwangwong/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _BASE,
-    _FN1
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ESC  │  1  │  2  │  3  │  4  │  5  │  6  │     │  7  │  8  │  9  │  0  │  -  │  =  │BSLS │ DEL │ 
-   * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┘  ┌──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┤
-   * │TAB     │  Q  │  W  │  E  │  R  │  T  │     │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │BSPC    │
-   * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┐    └┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┤
-   * │CAPS     │  A  │  S  │  D  │  F  │  G  │     │  H  │  J  │  K  │  L  │  ;  │  '  │ENTER        │
-   * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┐  └──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┤
-   * │LSHFT       │  Z  │  X  │  C  │  V  │  B  │     │  N  │  M  │  ,  │  .  │  /  │RSHFT     │ UP  │
-   * ├──────┬─────┴─┬───┴──┬──┴─────┴────┬┴─────┤     ├─────┴┬────┴────┬┴────┬┴────┬┴────┬─────┼─────┤
-   * │LCTRL │L_GUI  │L_ALT │SPC          │FN1   │     │SPC   │BSPC     │R_ALT│R_CTR│LEFT │DOWN │RIGHT│
-   * └──────┴───────┴──────┴─────────────┴──────┘     └──────┴─────────┴─────┴─────┴─────┴─────┴─────┘
-   */
-  [_BASE] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS, KC_EQL,  KC_BSLS, 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_BSPC, 
-    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,  MO(_FN1),                               KC_BSPC, KC_BSPC,  KC_RALT,  KC_RCTL, KC_LEFT, KC_RGHT, KC_DOWN
-  ),
-
-  [_FN1] = LAYOUT(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, 
-    _______, _______, KC_HOME, KC_UP,   KC_END,  _______,              _______, _______, _______, _______, _______, _______, _______, _______, 
-    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,                       _______, KC_MINS, KC_EQL,  _______, _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______, _______, 
-    QK_BOOT, _______, _______, _______, _______,                                _______, _______, _______, _______, _______, _______, _______
-
-  )
-};
diff --git a/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c b/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
deleted file mode 100644
index 921b8701077..00000000000
--- a/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
- /* Copyright 2022 peott
-  *
-  * 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
-
-// Only for actual custom keycodes (not just renaming existing tapdance etc...).
-//enum custom_keycodes {
-//  QWERTY = SAFE_RANGE,
-//};
-
-// Layers by name.
-enum custom_layers {
-    _BASE,
-    _FN,
-    _NUM
-};
-
-// Keycodes for cleaner code
-#define L_CTRL LCTL_T(KC_MPRV)
-#define L_GUI LGUI_T(KC_MPLY)
-#define L_ALT LALT_T(KC_MNXT)
-// Layers defined by function
-#define LR_SPC LT(_FN,KC_SPC)
-#define LR_BKSP LT(_FN,KC_BSPC)
-#define LR_NUM LT(_NUM,KC_HOME)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_60_with_macro(
-    KC_F1, KC_F2,  KC_ESC,  KC_1,  KC_2,  KC_3,   KC_4,   KC_5, KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_9,    KC_MINS, KC_GRV,  KC_DEL, 
-    KC_F3, KC_F4,  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_F5, KC_F6,  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_F7, KC_F8,  SC_LSPO, KC_Z,  KC_X,  KC_C,   KC_V,   KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, LR_NUM, 
-    KC_F9, KC_F10, L_CTRL,  L_GUI, L_ALT, KC_APP, LR_SPC,             LR_BKSP, LR_BKSP, KC_RALT, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-    [_FN] = LAYOUT_60_with_macro(
-    KC_TRNS, 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_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, 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_LSFT, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT,  KC_BSPC,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_RALT, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-    ),
-    [_NUM] = LAYOUT_60_with_macro(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P4,   KC_P5,   KC_P6,   KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P1,   KC_P2,   KC_P3,   KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h b/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h
deleted file mode 100644
index 0eefd14dfe8..00000000000
--- a/keyboards/keebio/quefrency/keymaps/rogthefrog/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-Copyright 2021 Roger Billerey-Mosier
-
-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
diff --git a/keyboards/keebio/quefrency/keymaps/rogthefrog/keymap.c b/keyboards/keebio/quefrency/keymaps/rogthefrog/keymap.c
deleted file mode 100644
index 0cc0cfe2b40..00000000000
--- a/keyboards/keebio/quefrency/keymaps/rogthefrog/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  Copyright 2021 Roger Billerey-Mosier
-
-  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 layers {
-    _BASE,
-    _FN1,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_65(
-    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_NO,   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_ESC,  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_RCTL, KC_UP,   KC_PGDN,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_ENT, MO(_FN1),          KC_SPC,  KC_NO,   LCTL(KC_C), LCTL(KC_V), KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [_FN1] = LAYOUT_65(
-    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_PSCR,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
-    _______, _______, _______, _______, _______,          KC_MPLY, _______, _______, _______, KC_MUTE, KC_MPRV, KC_VOLD, KC_MNXT
-  )
-};
diff --git a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h b/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h
deleted file mode 100644
index 497e05b540c..00000000000
--- a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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
diff --git a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/keymap.c b/keyboards/keebio/quefrency/keymaps/unausgeschlafen/keymap.c
deleted file mode 100644
index 33148927a13..00000000000
--- a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _BASE 0
-#define _FN1 1
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Keymap _BL: (Base Layer) Default Layer
- * +-------------------------------------------------------------------------+
- * | ESC | 1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = | BACKSP |
- * +-------------------------------------------------------------------------+
- * | TAB  |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] |   \  |
- * +-------------------------------------------------------------------------+
- * | FN     |  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |  RETURN |
- * +-------------------------------------------------------------------------+
- * | LSHIFT   |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / | SHIFT | FN |
- * +-------------------------------------------------------------------------+
- * |LALT|LMETA|RCTRL|   SPACE | FN | SPACE           | RALT| MENU| RWIN|RCTRL|
- * +-------------------------------------------------------------------------+
- */
-
-  [_BASE] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, _______, KC_BSPC,
-    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    MO(_FN1), 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, MO(_FN1),
-    KC_LALT,  KC_LGUI, KC_LCTL, KC_SPC,  MO(_FN1), KC_SPC,  _______, KC_RALT, KC_APP,  _______, KC_RGUI, KC_RCTL
-  ),
-
-  /* Keymap _FL: Function Layer
-   * ,-----------------------------------------------------------.
-   * | ~  | F1| F2| F3| F4| F5| F6| F7| F8| F9| F0|F11|F12|  DEL |
-   * |-----------------------------------------------------------|
-   * |     |   | UP|  | MSL|MSD|MSU|MSR|   |   |PRT|PGD|PGU|PAUS |
-   * |-----------------------------------------------------------|
-   * |       | LE| DN| RE|   |   | LE| DN| UP| RE|   |   |       |
-   * |-----------------------------------------------------------|
-   * |        |HOM|END|   |   |PRE|NXT|MUT|VOD|VOU|  /|Shift | FN|
-   * |-----------------------------------------------------------|
-   * |    |    |    |    |  PLAY | PLAY     |     |    |    |    |
-   * `-----------------------------------------------------------'
-   */
-
-  [_FN1] = LAYOUT(
-    KC_GRAVE, 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_UP,   _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, KC_PSCR, KC_PGUP, KC_PGDN, KC_PAUS,
-    _______,  KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,
-    _______,  KC_HOME, KC_END,  _______, _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
-    _______,  _______, _______, KC_MPLY, _______,          KC_MPLY,         _______, _______, _______, _______, _______, _______
-  )
-};
diff --git a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/readme.md b/keyboards/keebio/quefrency/keymaps/unausgeschlafen/readme.md
deleted file mode 100644
index a8d0efed0c2..00000000000
--- a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-## UNAUSGESCHLAFEN'S QUEFRENCY
-
-This is the keymap that goes with [unausgeschlafen's Quefrency](https://www.reddit.com/r/MechanicalKeyboards/comments/aquefb/my_daily_driver_quefrency/)
-
-If you are using Ardoinos, comment this line in `rules.mk`:
-```make
-BOOTLOADER = atmel-dfu # comment this line if you use arduinos
-```
-
-Although QMK offers one-shot build and flash, I personally build and flash separately (for the Elite C).
-I used the QMK default for the Arduino Pro Micros.
-However, I do not own them anymore.
-Hence, only the instructions for the Elite C are provided.
-
-Build with:
-```sh
-make keebio/quefrency:unausgeschlafen
-```
-
-Flash with:
-
-```sh
-sudo dfu-programmer atmega32u4 erase
-sudo dfu-programmer atmega32u4 flash keebio_quefrency_rev1_unausgeschlafen.hex
-sudo dfu-programmer atmega32u4 reset
-```
diff --git a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/rules.mk b/keyboards/keebio/quefrency/keymaps/unausgeschlafen/rules.mk
deleted file mode 100644
index 98956243cd2..00000000000
--- a/keyboards/keebio/quefrency/keymaps/unausgeschlafen/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOOTLOADER = atmel-dfu # comment this line if you use arduinos
diff --git a/keyboards/keebio/quefrency/keymaps/yoryer/config.h b/keyboards/keebio/quefrency/keymaps/yoryer/config.h
deleted file mode 100644
index 497e05b540c..00000000000
--- a/keyboards/keebio/quefrency/keymaps/yoryer/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-
-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
diff --git a/keyboards/keebio/quefrency/keymaps/yoryer/keymap.c b/keyboards/keebio/quefrency/keymaps/yoryer/keymap.c
deleted file mode 100644
index 47775ff1755..00000000000
--- a/keyboards/keebio/quefrency/keymaps/yoryer/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#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 {
-    _BASE,
-    _FN1,
-    _RGB2,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_65(
-    QK_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_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_LALT,  KC_LGUI,            KC_SPC,                 MO(_FN1), KC_SPC,   _______,            KC_RALT,  KC_RCTL,  MO(_FN1), KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-
-  [_FN1] = LAYOUT_65(
-    QK_GESC,  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_MUTE,  KC_BRMU,
-    _______,  _______,  _______,  _______,  _______,    _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_BRMD,
-    _______,  _______,  _______,  _______,  _______,    _______,              _______,  _______,  _______,  _______,  _______,  _______,            KC_MPLY,  _______,
-    _______,            _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______,  KC_VOLU,  _______,
-    _______,  _______,  _______,            TG(_RGB2),              _______,  _______,  _______,            _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
-  ),
-
-  [_RGB2] = LAYOUT_65(
-    QK_GESC,    RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW,   RGB_M_SN,   RGB_M_K,  RGB_M_X,  RGB_M_G,  RGB_M_T,  _______,  _______,  _______,  _______,  _______,  RGB_VAI,
-    _______,    _______,  _______,  _______,  _______,    _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_VAD,
-    _______,    _______,  _______,  _______,  _______,    _______,              _______,  _______,  _______,  _______,  _______,  _______,            _______,  RGB_SAI,
-    _______,              _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,            _______,  _______,  RGB_HUI,  RGB_SAD,
-    _______,    _______,  _______,            _______,                _______,  _______,  _______,            _______,  _______,  _______,  RGB_RMOD, RGB_HUD,  RGB_MOD
-  )
-};
diff --git a/keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h b/keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h
deleted file mode 100644
index c87e45d053d..00000000000
--- a/keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-Copyright 2021 Roger Billerey-Mosier
-
-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
-
-/* Use I2C or Serial, not both */
-
-//#define DEBUG_MATRIX_SCAN_RATE
-
-#define FORCE_NKRO
-
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
-
-#define LAYER_STATE_8BIT
-#define MAX_LAYER 3
diff --git a/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c b/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c
deleted file mode 100644
index 530ea8527f5..00000000000
--- a/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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 custom_layer {
-    _BASE,
-    _FN1,
-    _FN2,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_60(
-    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,
-    MO(_FN1), 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, MO(_FN2),KC_SPC,           _______, KC_SPC,  KC_RALT, MO(_FN1), _______, KC_MENU, KC_RCTL
-  ),
-
-  [_FN1] = LAYOUT_60(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
-    KC_CAPS, KC_PGUP, KC_UP,   KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_HOME, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_END,  KC_TRNS, KC_VOLD, KC_VOLU, 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
-  ),
-
-  [_FN2] = LAYOUT_60(
-    KC_GRV,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  _______,  KC_TRNS,
-    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______
-  )
-};
diff --git a/keyboards/keebio/quefrency/rev2/keymaps/xeal/rules.mk b/keyboards/keebio/quefrency/rev2/keymaps/xeal/rules.mk
deleted file mode 100644
index 3d5257b7b45..00000000000
--- a/keyboards/keebio/quefrency/rev2/keymaps/xeal/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-DEBOUNCE_TYPE = sym_eager_pk # Eager; per key
-CONSOLE_ENABLE = no          # debug console
-ENCODER_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
deleted file mode 100644
index c02549e4779..00000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#define USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define TAPPING_TERM 150
-#define TAPPING_TOGGLE 2
-
-// #undef RGBLED_NUM
-// #define RGBLED_NUM 12
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
deleted file mode 100644
index c2aa0c60fad..00000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
+++ /dev/null
@@ -1,281 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum rorschach_layers {
-  _COLEMAK,   // Colemak (default layer)
-  _QWERTY,    // Qwerty
-  _NUMBERS,   // Numbers & Symbols
-  _NUMBERS2,  // Numbers & Function Keys (similar to _NUMBERS; used with _NUMBERS for tri-layer access to _ADJUST)
-  _FUNCTION,  // Function
-  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
-  _NUMPAD,    // Numpad
-  _ADJUST,    // Adjust layer, accessed via tri-layer feature)
-  _ADJUST2    // Second Adjust layer, accessed outside of tri-layer feature)
-};
-
-enum rorschach_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  NUMPAD = TG(_NUMPAD),
-  ADJUST = MO(_ADJUST2),
-  SPCFN  = LT(_FUNCTION, KC_SPC),
-  BSPCFN = LT(_FUNCTION2, KC_BSPC),
-  ENTNS  = LT(_NUMBERS, KC_ENT),
-  DELNS  = LT(_NUMBERS2, KC_DEL),
-  CTLESC = CTL_T(KC_ESC),
-  ALTAPP = ALT_T(KC_APP),
-  NKROTG = MAGIC_TOGGLE_NKRO,
-};
-
-//Tap Dance Declarations
-enum {
-  ADJ = 0,
-  LBCB,
-  RBCB,
-  EQPL,
-  PLEQ,
-  MNUN,
-  SLAS,
-  GVTL,
-  PPLEQ,
-  PMNUN,
-  PSLPAS
-};
-
-void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_on(_ADJUST2);
-     set_oneshot_layer(_ADJUST2, ONESHOT_START);
-  }
-}
-void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_off(_ADJUST2);
-     clear_oneshot_layer_state(ONESHOT_PRESSED);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-[ADJ]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
-[LBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
-[RBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
-[EQPL]   = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
-[PLEQ]   = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
-[MNUN]   = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
-[SLAS]   = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
-[GVTL]   = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
-[PPLEQ]  = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
-[PMNUN]  = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
-[PSLPAS] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Colemak
-*  (Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |  Tab  |   Q   |   W   |   F   |   P   |   G   |                  |   J   |   L   |   U   |   Y   |   ;   |   \   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |Esc/Ctl|   A   |   R   |   S   |   T   |   D   |                  |   H   |   N   |   E   |   I   |   O   |   '   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  | SC Sft|   Z   |   X   |   C   |   V   |   B   |                  |   K   |   M   |   ,   |   .   |   /   | SC Sft|
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/FN|                  |Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          | Ent/NS|  Bspc |  | Enter |Del/NS2|
-*                                          `---------------'  `---------------'
-*/
-[_COLEMAK] = LAYOUT(
-  KC_TAB,  KC_Q,   KC_W,    KC_F,    KC_P,   KC_G,                    KC_J,   KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,   KC_R,    KC_S,    KC_T,   KC_D,                    KC_H,   KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,                    KC_K,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV, KC_LBRC, KC_RBRC, ALTAPP, SPCFN,                   BSPCFN, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                             ENTNS, KC_BSPC,  KC_ENT, DELNS
-),
-
-/* QWERTY
-*  (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |  Tab  |   Q   |   W   |   E   |   R   |   T   |                  |   Y   |   U   |   I   |   O   |   P   |   \   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |Esc/Ctl|   A   |   S   |   D   |   F   |   G   |                  |   H   |   J   |   K   |   L   |   ;   |   '   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  | SC Sft|   Z   |   X   |   C   |   V   |   B   |                  |   N   |   M   |   ,   |   .   |   /   | SC Sft|
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/FN|                  |Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          | Ent/NS|  Bspc |  | Enter |Del/NS2|
-*                                          `---------------'  `---------------'
-*/
-[_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_BSLS,
-  CTLESC,  KC_A,   KC_S,    KC_D,    KC_F,   KC_G,                    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,                    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV, KC_LBRC, KC_RBRC, ALTAPP, SPCFN,                   BSPCFN, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                             ENTNS, KC_BSPC,  KC_ENT, DELNS
-),
-
-/* Number/symbol layer
-*  (Multiple characters: single-tap for first, double-tap for second)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |   6   |   7   |   8   |   9   |   0   |                  |   ^   |   &   |   *   |   (   |   )   |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |   1   |   2   |   3   |   4   |   5   |                  |   !   |   @   |   #   |   $   |   %   |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |   .   |  / *  |  - _  |  + =  |                  |  ` ~  |  [ {  |  ] }  |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |       |       |       |       |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_NUMBERS] = LAYOUT(
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),                   TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,                    _______,  _______,  _______,  _______, _______, _______,
-                                                  _______, _______,  _______, _______
-),
-
-/* Number/Function Key layer
-*  (Multiple characters: single-tap for first, double-tap for second)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |   6   |   7   |   8   |   9   |   0   |                  |   F7  |   F8  |   F9  |   F10 |   F11 |   F12 |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |   1   |   2   |   3   |   4   |   5   |                  |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |   .   |  / *  |  - _  |  + =  |                  |  ` ~  |  [ {  |  ] }  |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |       |       |       |       |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_NUMBERS2] = LAYOUT(
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,  KC_F12,
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,
-  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),                   TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,                    _______,  _______,  _______,  _______, _______, _______,
-                                                  _______, _______,  _______, _______
-),
-
-/* Function layer
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |       |       |   Up  |       |       |                  |       |       |   Up  | Ctrl+Y|       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       | Ctrl+A|  Left |  Down | Right |C+A+Tab|                  |  PgUp | Right |  Down |  Left |  Home |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       | Ctrl+Z| Ctrl+X| Ctrl+C| Ctrl+V|  Bspc |                  |  PgDn |  Mute |  Vol- |  Vol+ |  End  |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |       |       |       |       |       |       |                  |       |       |  Prev |  Play |  Next |  Stop |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_FUNCTION] = LAYOUT(
-  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                    KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-  _______, _______,    _______,    _______,    _______,    _______,                    _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP,
-                                                           _______, _______,  _______, _______
-),
-
-[_FUNCTION2] = LAYOUT(
-  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                    KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-  _______, _______,    _______,    _______,    _______,    _______,                    _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP,
-                                                           _______, _______,  _______, _______
-),
-
-/* Numpad layer
-*  (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |  KP 6 |  KP 7 |  KP 8 |  KP 9 |  KP 0 |                  | NumLk |  KP 7 |  KP 8 |  KP 9 |  KP / |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |  KP 1 |  KP 2 |  KP 3 |  KP 4 |  KP 5 |                  |  Tab  |  KP 4 |  KP 5 |  KP 6 |  KP * |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       | NumLk |  KP . |KP/ KP*| KP- _ | KP+ = |                  |       |  KP 1 |  KP 2 |  KP 3 |  KP - |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |  KP 0 |   =   |  KP . |  KP + |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  | KP Ent|       |
-*                                          `---------------'  `---------------'
-*/
-[_NUMPAD] = LAYOUT(
-  _______, KC_P6,   KC_P7,    KC_P8,      KC_P9,     KC_P0,                      KC_NUM,  KC_P7, KC_P8,  KC_P9,   KC_PSLS, _______,
-  _______, KC_P1,   KC_P2,    KC_P3,      KC_P4,     KC_P5,                      KC_TAB,  KC_P4, KC_P5,  KC_P6,   KC_PAST, _______,
-  _______, KC_NUM,  KC_PDOT,  TD(PSLPAS), TD(PMNUN), TD(PPLEQ),                  _______, KC_P1, KC_P2,  KC_P3,   KC_PMNS, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),   _______,   _______,                    _______, KC_P0, KC_EQL, KC_PDOT, KC_PPLS, _______,
-                                                     _______, _______,  KC_PENT, _______
-),
-
-/* Adjust layer
-*  (Enter/Number + Delete/Number2 to access; Numpad is a toggle)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |Colemak| Qwerty|       |       |       |                  | Numpad|       |       | Ctrl+Y|       | QK_BOOT |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |       |       |       |       |                  |       |NKROTog|       |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |       |       |       |       |                  |       |       |       |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |       |       |       |       |       |       |                  |       |       |       |       |       |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_ADJUST] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-                                               _______, _______,  _______, _______
-),
-
-[_ADJUST2] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-                                               _______, _______,  _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAK);
-        layer_off ( _QWERTY);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _ADJUST);
-		layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _ADJUST);
-		layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/readme.md b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/readme.md
deleted file mode 100644
index 152c8ba01af..00000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-## I've changed my folder name to match my GitHub username.  Please see https://github.com/qmk/qmk_firmware/tree/master/keyboards/keebio/rorschach/keymaps/tuesdayjohn for my current keymap files.
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk
deleted file mode 100644
index 390cb3fd60a..00000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
deleted file mode 100644
index 9d65e8da70c..00000000000
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#define USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define TAPPING_TERM 175
-#define TAPPING_TOGGLE 2
-
-// #undef RGBLED_NUM
-// #define RGBLED_NUM 12
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
deleted file mode 100644
index db5677e3b6d..00000000000
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
+++ /dev/null
@@ -1,296 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum rorschach_layers {
-  _COLEMAK,   // Colemak (default layer)
-  _QWERTY,    // Qwerty
-  _NUMBERS,   // Numbers & Symbols
-  _NUMBERS2,  // Numbers & Function Keys (similar to _NUMBERS; used with _NUMBERS for tri-layer access to _ADJUST)
-  _FUNCTION,  // Function
-  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
-  _NUMPAD,    // Numpad
-  _ADJUST,    // Adjust layer, accessed via tri-layer feature)
-  _ADJUST2    // Second Adjust layer, accessed outside of tri-layer feature)
-};
-
-enum rorschach_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY
-};
-
-//Tap Dance Declarations
-enum {
-  ADJ = 0,
-  LBCB,
-  RBCB,
-  EQPL,
-  PLEQ,
-  MNUN,
-  SLAS,
-  GVTL,
-  PPEQ,
-  PMUN,
-  PSPA
-};
-
-void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_on(_ADJUST2);
-     set_oneshot_layer(_ADJUST2, ONESHOT_START);
-  }
-}
-void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_off(_ADJUST2);
-     clear_oneshot_layer_state(ONESHOT_PRESSED);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-[ADJ]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
-[LBCB] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
-[RBCB] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
-[EQPL] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
-[PLEQ] = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
-[MNUN] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
-[SLAS] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
-[GVTL] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
-[PPEQ] = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
-[PMUN] = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
-[PSPA] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
-};
-
-//Aliases for longer keycodes
-#define NUMPAD  TG(_NUMPAD)
-#define ADJUST  MO(_ADJUST2)
-#define SPCFN   LT(_FUNCTION, KC_SPC)
-#define BSPCFN  LT(_FUNCTION2, KC_BSPC)
-#define ENTNS   LT(_NUMBERS, KC_ENT)
-#define DELNS   LT(_NUMBERS2, KC_DEL)
-#define CTLESC  CTL_T(KC_ESC)
-#define ALTAPP  ALT_T(KC_APP)
-#define CTL_A   LCTL(KC_A)
-#define CTL_C   LCTL(KC_C)
-#define CTL_V   LCTL(KC_V)
-#define CTL_X   LCTL(KC_X)
-#define CTL_Z   LCTL(KC_Z)
-#define CTL_Y   LCTL(KC_Y)
-#define CA_TAB  LCA(KC_TAB)
-#define HYPER   ALL_T(KC_NO)
-#define TD_ADJ  TD(ADJ)
-#define TD_LBCB TD(LBCB)
-#define TD_RBCB TD(RBCB)
-#define TD_EQPL TD(EQPL)
-#define TD_PLEQ TD(PLEQ)
-#define TD_MNUN TD(MNUN)
-#define TD_SLAS TD(SLAS)
-#define TD_GVTL TD(GVTL)
-#define TD_PPEQ TD(PPEQ)
-#define TD_PMUN TD(PMUN)
-#define TD_PSPA TD(PSPA)
-#define NKROTG  MAGIC_TOGGLE_NKRO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
-Colemak
-(Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |  Tab   |    Q   |    W   |    F   |    P   |    G   |                    |    J   |    L   |    U   |    Y   |    ;   |    \   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- | Esc/Ctl|    A   |    R   |    S   |    T   |    D   |                    |    H   |    N   |    E   |    I   |    O   |    '   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |SC Shift|    Z   |    X   |    C   |    V   |    B   |                    |    K   |    M   |    ,   |    .   |    /   |SC Shift|
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------'
- |   Ins  |    `   |    [   |    ]   | App/Alt| Spc/FN |                    | Bsp/Fn2|  RGUI  |  Left  |  Down  |   Up   |  Right |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              | Ent/NS |  Bspc  |  |  Enter | Del/NS2|
-                                              `-----------------'  `-----------------'
-*/
-[_COLEMAK] = LAYOUT(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                         KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                         KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,                        BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                               ENTNS,   KC_BSPC,    KC_ENT,  DELNS
-),
-
-/*
-QWERTY
-(Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |  Tab   |    Q   |    W   |    E   |    R   |    T   |                    |    Y   |    U   |    I   |    O   |    P   |    \   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- | Esc/Ctl|    A   |    S   |    D   |    F   |    G   |                    |    H   |    J   |    K   |    L   |    ;   |    '   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |SC Shift|    Z   |    X   |    C   |    V   |    B   |                    |    N   |    M   |    ,   |    .   |    /   |SC Shift|
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------'
- |   Ins  |    `   |    [   |    ]   | App/Alt| Spc/FN |                    | Bsp/Fn2|  RGUI  |  Left  |  Down  |   Up   |  Right |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              | Ent/NS |  Bspc  |  |  Enter | Del/NS2|
-                                              `-----------------'  `-----------------'
-*/
-[_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_BSLS,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,                        BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                               ENTNS,   KC_BSPC,    KC_ENT,  DELNS
-),
-
-/*
-Number/symbol layer
-(Multiple characters: single-tap for first, double-tap for second)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        |    6   |    7   |    8   |    9   |    0   |                    |    ^   |    &   |    *   |    (   |    )   |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |    1   |    2   |    3   |    4   |    5   |                    |    !   |    @   |    #   |    $   |    %   |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |    .   |   / *  |   - _  |   + =  |                    |   ` ~  |   [ {  |   ] }  |        |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |    (   |    )   |   [ {  |   ] }  |        |        |                    |        |        |        |        |        |        |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  |        |        |
-                                              `-----------------'  `-----------------'
-*/
-[_NUMBERS] = LAYOUT(
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ,                      TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB, _______, _______,                      _______, _______, _______, _______, _______, _______,
-                                               _______, _______,    _______, _______
-),
-
-/*
-Number/Function Key layer
-(Multiple characters: single-tap for first, double-tap for second)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        |    6   |    7   |    8   |    9   |    0   |                    |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |    1   |    2   |    3   |    4   |    5   |                    |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |    .   |   / *  |   - _  |   + =  |                    |   ` ~  |   [ {  |   ] }  |        |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |    (   |    )   |   [ {  |   ] }  |        |        |                    |        |        |        |        |        |        |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  |        |        |
-                                              `-----------------'  `-----------------'
-*/
-[_NUMBERS2] = LAYOUT(
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                         KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
-  _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ,                      TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB, _______, _______,                      _______, _______, _______, _______, _______, _______,
-                                               _______, _______,    _______, _______
-),
-
-/*
-Function layer
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        |        |        |   Up   |        |        |                    |        |        |   Up   | Ctrl+Y |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        | Ctrl+A |  Left  |  Down  |  Right | C+A+Tab|                    |  PgUp  |  Right |  Down  |  Left  |  Home  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        | Ctrl+Z | Ctrl+X | Ctrl+C | Ctrl+V |  Bspc  |                    |  PgDn  |  Mute  |  Vol-  |  Vol+  |   End  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |                    |        |        |  Prev  |  Play  |  Next  |  Stop  |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  |        |        |
-                                              `-----------------'  `-----------------'
-*/
-[_FUNCTION] = LAYOUT(
-  _______, _______, _______, KC_UP,   _______, _______,                      _______, _______, KC_UP,   CTL_Y,   _______, _______,
-  _______, CTL_A,   KC_LEFT, KC_DOWN, KC_RGHT, CA_TAB,                       KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
-  _______, CTL_Z,   CTL_X,   CTL_C,   CTL_V,   KC_BSPC,                      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
-                                               _______, _______,    _______, _______
-),
-
-[_FUNCTION2] = LAYOUT(
-  _______, _______, _______, KC_UP,   _______, _______,                      _______, _______, KC_UP,   CTL_Y,   _______, _______,
-  _______, CTL_A,   KC_LEFT, KC_DOWN, KC_RGHT, CA_TAB,                       KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
-  _______, CTL_Z,   CTL_X,   CTL_C,   CTL_V,   KC_BSPC,                      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
-                                               _______, _______,    _______, _______
-),
-
-/*
-Numpad layer
-(Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        |  KP 6  |  KP 7  |  KP 8  |  KP 9  |  KP 0  |                    |  NumLk |  KP 7  |  KP 8  |  KP 9  |  KP /  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |  KP 1  |  KP 2  |  KP 3  |  KP 4  |  KP 5  |                    |   Tab  |  KP 4  |  KP 5  |  KP 6  |  KP *  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |  NumLk |  KP .  | KP/ KP*|  KP- _ |  KP+ = |                    |        |  KP 1  |  KP 2  |  KP 3  |  KP -  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |    (   |    )   |   [ {  |   ] }  |        |        |                    |        |  KP 0  |    =   |  KP .  |  KP +  |        |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  | KP Ent |        |
-                                              `-----------------'  `-----------------'
-*/
-[_NUMPAD] = LAYOUT(
-  _______, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                        KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______,
-  _______, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,                        KC_TAB,  KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______,
-  _______, KC_NUM,  KC_PDOT, TD_PSPA, TD_PMUN, TD_PPEQ,                      _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______,
-  KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB, _______, _______,                      _______, KC_P0,   KC_EQL,  KC_PDOT, KC_PPLS, _______,
-                                               _______, _______,    KC_PENT, _______
-),
-
-/*
-Adjust layer
-(Enter/Number + Delete/Number2 to access; Numpad is a toggle)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        | Colemak| Qwerty |        |        |        |                    | Numpad |        |        |        |        |  QK_BOOT |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |                    |        |NKRO Tog|        |        |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |                    |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |                    |        |        |        |        |        |        |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  |        |        |
-                                              `-----------------'  `-----------------'
-*/
-[_ADJUST] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                      NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                      _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-                                               _______, _______,    _______, _______
-),
-
-[_ADJUST2] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                      NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                      _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-                                               _______, _______,    _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAK);
-        layer_move (_COLEMAK);
-
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTY);
-        layer_move (_QWERTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/rules.mk b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/rules.mk
deleted file mode 100644
index 390cb3fd60a..00000000000
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
diff --git a/keyboards/keebio/sinc/keymaps/lickel/keymap.c b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
deleted file mode 100644
index 97111e9dda9..00000000000
--- a/keyboards/keebio/sinc/keymaps/lickel/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2021 @ Adam Lickel
- *
- * 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
-
-// clang-format off
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_80_with_macro(
-    KC_MUTE,          KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,  KC_MPLY,
-    KC_F1,   KC_F2,   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_F3,   KC_F4,   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_F5,   KC_F6,   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_F7,   KC_F8,   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_F9,   KC_F10,  KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,           MO(1),   KC_SPC,  KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT_80_with_macro(
-    _______,          _______, 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_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [2] = LAYOUT_80_with_macro(
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [3] = LAYOUT_80_with_macro(
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-};
-
-// clang-format on
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-	[0] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
-	[1] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
-	[2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-	[3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-};
-#endif
diff --git a/keyboards/keebio/sinc/keymaps/lickel/readme.md b/keyboards/keebio/sinc/keymaps/lickel/readme.md
deleted file mode 100644
index faf130dec5e..00000000000
--- a/keyboards/keebio/sinc/keymaps/lickel/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# lickel's Sinc keymap
-
-- Via support is enabled by default
-- Function Row is optimized for macOS
-- RGB controls mimic the stock Keychron Q1 layout
-- F3 opens Mission Control and F4 opens Launchpad
-- Left macros are: F1->F10
-- Right macros are: Play, Home, Pg Up, Pg Dn, End, Right
-
-![Layout](https://i.imgur.com/0uXXrJY.png)
-
-([KLE](http://www.keyboard-layout-editor.com/#/gists/e0350d8914cac3166abcca6abfd093b7))
-
-## Changelog
-
-### 2022-12-09 - 1.2
-
-- Add ENCODER_MAP_ENABLE from default VIA definition
-
-### 2022-03-04 - 1.1
-
-- Correct function row to change LED backlights, not underglow
-
-### 2021-11-27 - 1.0
-
-- Initial release
diff --git a/keyboards/keebio/sinc/keymaps/lickel/rules.mk b/keyboards/keebio/sinc/keymaps/lickel/rules.mk
deleted file mode 100644
index 1189f4ad192..00000000000
--- a/keyboards/keebio/sinc/keymaps/lickel/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h
index 2d2c7724228..e8024190b4b 100644
--- a/keyboards/keebio/sinc/rev1/config.h
+++ b/keyboards/keebio/sinc/rev1/config.h
@@ -27,4 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index 0829cae6e70..b7774fa0edf 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -7,6 +7,9 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "features": {
         "rgblight": true,
         "backlight": true
diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h
index 2d2c7724228..e8024190b4b 100644
--- a/keyboards/keebio/sinc/rev2/config.h
+++ b/keyboards/keebio/sinc/rev2/config.h
@@ -27,4 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index 5b74d17b1ad..ff5ef2667a0 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -7,6 +7,9 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "features": {
         "rgblight": true,
         "backlight": true
diff --git a/keyboards/keebio/sinc/rev3/config.h b/keyboards/keebio/sinc/rev3/config.h
index 66cfe454c43..89c8c0f3d8f 100644
--- a/keyboards/keebio/sinc/rev3/config.h
+++ b/keyboards/keebio/sinc/rev3/config.h
@@ -17,58 +17,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define SPLIT_HAND_PIN GP4
+
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP0
 #define SERIAL_USART_RX_PIN GP1
 #define SERIAL_USART_PIN_SWAP
+
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
 #define I2C_DRIVER I2CD1
 #define I2C1_SCL_PIN GP22
 #define I2C1_SDA_PIN GP23
-
-// RGB Matrix
-#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 120
-#define RGB_MATRIX_LED_COUNT 113
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json
index 8ba35fd1584..e20cd24f192 100644
--- a/keyboards/keebio/sinc/rev3/info.json
+++ b/keyboards/keebio/sinc/rev3/info.json
@@ -27,6 +27,11 @@
                 "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
                 "rows": ["GP16", "GP19", "GP17", "GP9", "GP8", "GP26"]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "matrix_pins": {
@@ -44,6 +49,43 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "split_count": [56, 57],
         "layout": [
@@ -173,7 +215,9 @@
             {"flags": 4, "matrix": [10, 7], "x": 212, "y": 64},
             {"flags": 4, "matrix": [10, 8], "x": 224, "y": 64},
             {"flags": 2, "x": 224, "y": 55}
-          ]
+        ],
+        "max_brightness": 120,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_75": {
diff --git a/keyboards/keebio/sinc/rev4/config.h b/keyboards/keebio/sinc/rev4/config.h
index bed0f112436..0a9b9846eb9 100644
--- a/keyboards/keebio/sinc/rev4/config.h
+++ b/keyboards/keebio/sinc/rev4/config.h
@@ -4,68 +4,17 @@
 #pragma once
 
 #define SPLIT_HAND_PIN GP4
+
 #define USB_VBUS_PIN GP14
+
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP0
 #define SERIAL_USART_RX_PIN GP1
 #define SERIAL_USART_PIN_SWAP
+
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
 #define I2C_DRIVER I2CD1
 #define I2C1_SDA_PIN GP22
 #define I2C1_SCL_PIN GP23
-
-// RGB Matrix
-#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_FRACTAL
-#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
-#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 120
-#define RGB_MATRIX_LED_COUNT 117
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/keebio/sinc/rev4/info.json b/keyboards/keebio/sinc/rev4/info.json
index 31d402c42e3..15b28fb0128 100644
--- a/keyboards/keebio/sinc/rev4/info.json
+++ b/keyboards/keebio/sinc/rev4/info.json
@@ -25,6 +25,11 @@
                 "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
                 "rows": ["GP16", "GP19", "GP17", "GP9", "GP8", "GP26"]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "matrix_pins": {
@@ -42,6 +47,52 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "fractal": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "split_count": [58, 59],
         "layout": [
@@ -175,7 +226,9 @@
             {"flags": 4, "matrix": [10, 7], "x": 212, "y": 64},
             {"flags": 4, "matrix": [10, 8], "x": 224, "y": 64},
             {"flags": 2, "x": 224, "y": 55}
-          ]
+        ],
+        "max_brightness": 120,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_75": {
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
deleted file mode 100644
index b7df7925abd..00000000000
--- a/keyboards/keebio/stick/config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-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
-
-// RGB Matrix
-#    ifdef RGB_MATRIX_ENABLE
-#        define RGB_MATRIX_LED_COUNT 12
-// 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
-#        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
diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json
index cc151647a02..b24d4d64308 100644
--- a/keyboards/keebio/stick/info.json
+++ b/keyboards/keebio/stick/info.json
@@ -9,6 +9,51 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812"
     },
     "encoder": {
diff --git a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
deleted file mode 100644
index 6e5afacff86..00000000000
--- a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _FN1 2
-
-#define WORD_L LALT(KC_LEFT)
-#define WORD_R LALT(KC_RGHT)
-#define LINE_L LGUI(KC_LEFT)
-#define LINE_R LGUI(KC_RGHT)
-
-#define DESK_L LCTL(KC_LEFT)
-#define DESK_R LCTL(KC_RGHT)
-#define MSN_CTL LCTL(KC_UP)
-
-#define LT_FN LT(_FN1, KC_ESC)
-
-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,    KC_MINS, KC_EQL,       KC_BSPC,      KC_INS,  KC_PGUP,
-  //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
-     KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,    KC_BSLS,    KC_DEL,  KC_PGDN,
-  //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
-     LT_FN,         KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_ENTER,
-  //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     SC_LSPO,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,          KC_UP,
-  //├──────────┬───────┴──┬─────┴────┬───┴────────┴────────┴────────┴────────┴────────┴──────┬─┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
-     KC_LCTL,   KC_LGUI,   KC_LALT,                        KC_SPACE,                          KC_RALT,   KC_CAPS,   KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
-  //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
-  ),
-
-    [_COLEMAK] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,       KC_BSPC,      KC_INS,  KC_PGUP,
-  //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
-     KC_TAB,      KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC,    KC_BSLS,    KC_DEL,  KC_PGDN,
-  //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
-     LT_FN,         KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,       KC_ENTER,
-  //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     SC_LSPO,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,          KC_UP,
-  //├──────────┬───────┴──┬─────┴────┬───┴────────┴────────┴────────┴────────┴────────┴──────┬─┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
-     KC_LCTL,   KC_LGUI,   KC_LALT,                        KC_SPACE,                          KC_RALT,   KC_CAPS,   KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
-  //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
-  ),
-
-  [_FN1] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐
-     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       _______,      QK_BOOT, KC_HOME,
-  //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
-     _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,    _______, KC_END,
-  //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
-     _______,       DESK_L,  MSN_CTL, DESK_R,  _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,       _______,
-  //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     _______,           _______, _______, _______, _______, _______, LINE_L,  WORD_L,  WORD_R,  LINE_R,  _______,          _______,          BL_UP, 
-  //├──────────┬───────┴──┬─────┴────┬───┴────────┴────────┴────────┴────────┴────────┴──────┬─┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
-     _______,   _______,   _______,                        KC_BSPC,                           _______,   _______,   KC_MENU,        BL_BRTG, BL_DOWN, BL_TOGG
-  //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
-  )
-};
\ No newline at end of file
diff --git a/keyboards/keebio/viterbi/keymaps/default/config.h b/keyboards/keebio/viterbi/keymaps/default/config.h
index 38c399ff2c2..acc5970dcb5 100644
--- a/keyboards/keebio/viterbi/keymaps/default/config.h
+++ b/keyboards/keebio/viterbi/keymaps/default/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
+#define RGBLIGHT_LED_COUNT 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/viterbi/keymaps/met/keymap.c b/keyboards/keebio/viterbi/keymaps/met/keymap.c
deleted file mode 100644
index 4848038befc..00000000000
--- a/keyboards/keebio/viterbi/keymaps/met/keymap.c
+++ /dev/null
@@ -1,321 +0,0 @@
-#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.
-
-#define CANCEL LCTL(KC_C)
-#define TERM LCTL(LALT(KC_T))
-#define ALPHAMOD LT(_ALPHA, KC_VOLD)
-#define CTLBSP MT(MOD_LCTL, KC_BSPC)
-#define GUIDEL MT(MOD_LGUI, KC_DEL)
-#define ALTSPC MT(MOD_LALT, KC_SPACE)
-#define SPCMOD LT(_MOD, KC_SPACE)
-#define JUMPBACK LSFT(KC_TAB)
-#define NTAB LCTL(KC_T)
-#define CTAB LCTL(KC_W)
-#define TAB1 LCTL(KC_1)
-#define TAB2 LCTL(KC_2)
-#define TAB3 LCTL(KC_3)
-#define TAB4 LCTL(KC_4)
-#define BWORD LCTL(KC_BSPC)
-#define LWORD LCTL(KC_LEFT)
-#define RWORD LCTL(KC_RIGHT)
-#define TABMOD LT(_MOD, KC_TAB)
-#define ENTMOD LT(_ENT, KC_ENTER)
-
-enum layer_names {
-  _BASE,
-  _PLAYING,
-  _PLAYED,
-  _NUMS,
-  _FN,
-  _TEST,
-  _ALPHA,
-  _QWERTY,
-  _REV,
-  _DEL,
-  _MOD,
-  _ENT
-};
-
-enum custom_keycodes {
-  MET = SAFE_RANGE,
-  SET,
-  GO,
-  STOP,
-  RESUME,
-  NEWRESUME,
-  SYNC,
-  SHUTDOWN,
-  REBOOT,
-  SOURCE,
-  PUSH,
-  TEST,
-  TST,
-  ENAME,
-  SNAME,
-  LNAME,
-  BUS,
-  PMERGE,
-  CSPEAK
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case SET:
-  if (record->event.pressed) {
-  layer_on(_NUMS);
-  SEND_STRING("met ");
-}
-  break;
-  case GO:
-  if (record->event.pressed) {
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_TAP(X_ENTER));
-}
-  break;
-  case STOP:
-  if (record->event.pressed) {
-  layer_off(_PLAYING);
-  layer_on(_PLAYED);
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  SEND_STRING(SS_TAP(X_N));
-  SEND_STRING(SS_TAP(X_N));
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-}
-  break;
-  case RESUME:
-  if (record->event.pressed) {
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-  SEND_STRING(SS_TAP(X_UP));
-  SEND_STRING(SS_TAP(X_ENTER));
-}
-  break;
-  case NEWRESUME:
-  if (record->event.pressed) {
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_TAP(X_R));
-  SEND_STRING(SS_TAP(X_ENTER));
-}
-  break;
-  case SYNC:
-  if (record->event.pressed) {
-  SEND_STRING(SS_TAP(X_N));
-}
-  break;
-  case SHUTDOWN:
-  if (record->event.pressed) {
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-  SEND_STRING("shutdown now");
-  SEND_STRING(SS_TAP(X_ENTER));
-}
-  break;
-  case REBOOT:
-  if (record->event.pressed) {
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-  SEND_STRING("reboot");
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case SOURCE:
-  if (record->event.pressed) {
-  SEND_STRING("source .bashrc");
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case PUSH:
-  if (record->event.pressed) {
-  SEND_STRING("ftp rossmontsinger.net");
-  _delay_ms(250);
-  SEND_STRING(SS_TAP(X_ENTER));
-  _delay_ms(2250);
-  SEND_STRING("met@rossmontsinger.net");
-  _delay_ms(250);
-  SEND_STRING(SS_TAP(X_ENTER));
-  _delay_ms(2500);
-  SEND_STRING("metboard");
-  _delay_ms(250);
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case TEST:
-  if (record->event.pressed) {
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-  _delay_ms(250);
-  SEND_STRING("play Desktop/met/a_lazoom.mp3");
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  case TST:
-  if (record->event.pressed) {
-  SEND_STRING("tst");
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case ENAME:
-  if (record->event.pressed) {
-  SEND_STRING("sname ");
-  layer_on(_NUMS);
-  layer_on(_ALPHA);
-  }
-  break;
-  case SNAME:
-  if (record->event.pressed) {
-  SEND_STRING(SS_TAP(X_ENTER));
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  }
-  break;
-  case LNAME:
-  if (record->event.pressed) {
-  SEND_STRING("met $");
-  layer_off(_NUMS);
-  layer_on(_ALPHA);
-  }
-  break;
-  case BUS:
-  if (record->event.pressed) {
-  SEND_STRING("met $bus");
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case PMERGE:
-  if (record->event.pressed) {
-  SEND_STRING(SS_TAP(X_HOME));
-  SEND_STRING(SS_TAP(X_BACKSPACE));
-  SEND_STRING(SS_TAP(X_SPACE));
-  SEND_STRING(SS_LCTL(SS_TAP(X_BACKSPACE)));
-  SEND_STRING(SS_TAP(X_SPACE));
-      }
-break;
-case CSPEAK:
-  if (record->event.pressed) {
-  SEND_STRING(SS_TAP(X_PAGE_DOWN));
-  SEND_STRING(SS_TAP(X_ENTER));
-  SEND_STRING(SS_TAP(X_ENTER));
-  SEND_STRING(SS_TAP(X_PAGE_DOWN));
-}
- break;
-};
-
-  return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_ortho_5x14(
-    KC_NO,   STOP   , TST    , _______, _______, _______, BUS    ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, SET    , SET    , SET    , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, SET    , SET    , SET    , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   LNAME  , SET    , SET    , SET    , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   MO(_FN), _______, SET    , _______, _______, _______,     TG(_QWERTY),KC_B, _______, _______, _______, _______, _______
-  ),
-
-  [_PLAYING] = LAYOUT_ortho_5x14(
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, STOP   ,     _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_PLAYED] = LAYOUT_ortho_5x14(
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______,_______, _______, _______, _______,NEWRESUME,    _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_NUMS] = LAYOUT_ortho_5x14(
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_7   , KC_8   , KC_9   , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_4   , KC_5   , KC_6   , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_1   , KC_2   , KC_3   , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, KC_0   , _______, _______, GO     ,     _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_FN] = LAYOUT_ortho_5x14(
-    KC_NO,   SHUTDOWN,_______, _______, _______, _______, KC_VOLU,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   REBOOT , _______, _______, _______, _______, KC_VOLD,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   ENAME  , _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, SOURCE ,    _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_TEST] = LAYOUT_ortho_5x14(
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______
-  ),
-    
-  [_ALPHA] = LAYOUT_ortho_5x14(
-    KC_NO,   _______, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   KC_N   , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   KC_M   , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_H   , KC_J   , KC_K   , KC_L   , GO     ,     _______, _______, _______, _______, _______, _______, _______
-  ),
-  
- [_QWERTY] = LAYOUT_ortho_5x14(
-    KC_NO,   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_NO,   KC_CAPS, 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_NO,   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_PGUP ,
-    KC_NO,   KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,     KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_UP,   KC_PGDN ,
-    KC_NO,   CTLBSP , GUIDEL , KC_ENTER, ALTSPC, TABMOD , KC_BSPC,     ENTMOD , SPCMOD ,MO(_DEL), KC_BSLS, KC_LEFT, KC_DOWN, KC_RIGHT
-  ),
-
-  
-  [_REV] = LAYOUT_ortho_5x14(
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, KC_TAB , KC_PGDN,     _______, _______, _______, _______, _______, _______, _______
-  ),
-  
-  
- [_DEL] = LAYOUT_ortho_5x14(
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, KC_BSPC, BWORD  ,     _______, _______, _______, _______, _______, _______, _______
-  ),
-  
- [_MOD] = LAYOUT_ortho_5x14(
-    KC_NO  , KC_GRAVE,KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,     KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , NTAB ,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, CTAB,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     KC_HOME, KC_LEFT, KC_UP  ,KC_RIGHT, KC_END , _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, PMERGE , KC_DOWN, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, LWORD  , RWORD  ,     TG(_QWERTY),_______,_______,_______,_______, _______, _______
-  ),
-   
- [_ENT] = LAYOUT_ortho_5x14(
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, CSPEAK ,     _______, _______, _______, _______, _______, _______, _______
-  )
-};
-
diff --git a/keyboards/keebio/viterbi/keymaps/met/rules.mk b/keyboards/keebio/viterbi/keymaps/met/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/keebio/viterbi/keymaps/met/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebwerk/mega/ansi/ansi.c b/keyboards/keebwerk/mega/ansi/ansi.c
index 4b10cdde66e..5218fdd0e19 100755
--- a/keyboards/keebwerk/mega/ansi/ansi.c
+++ b/keyboards/keebwerk/mega/ansi/ansi.c
@@ -28,135 +28,135 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 
-    {1, B_1,   A_1,   C_1}, //LB1
-    {1, E_1,   D_1,   F_1}, //LB2
-    {1, H_1,   G_1,   I_1}, //LB3
-    {1, K_1,   J_1,   L_1}, //LB4
-    {1, B_2,   A_2,   C_2}, //LB5
-    {1, E_2,   D_2,   F_2}, //LB6
-    {1, H_2,   G_2,   I_2}, //LB7
-    {1, K_2,   J_2,   L_2}, //LB8
-    {1, B_3,   A_3,   C_3}, //LB9
-    {1, E_3,   D_3,   F_3}, //LB10
-    {1, H_3,   G_3,   I_3}, //LB11
-    {1, K_3,   J_3,   L_3}, //LB12
-    {1, B_4,   A_4,   C_4}, //LB13
-    {1, E_4,   D_4,   F_4}, //LB14
-    {1, H_4,   G_4,   I_4}, //LB15
-    {1, K_4,   J_4,   L_4}, //LB16
-    {1, B_5,   A_5,   C_5}, //LB17
-    {1, E_5,   D_5,   F_5}, //LB18
-    {1, H_5,   G_5,   I_5}, //LB19
-    {1, K_5,   J_5,   L_5}, //LB20
-    {1, B_6,   A_6,   C_6}, //LB21
-    {1, E_6,   D_6,   F_6}, //LB22
-    {1, H_6,   G_6,   I_6}, //LB23
-    {1, K_6,   J_6,   L_6}, //LB24
-    {1, B_7,   A_7,   C_7}, //LB25
-    {1, E_7,   D_7,   F_7}, //LB26
-    {1, H_7,   G_7,   I_7}, //LB27
-    {1, K_7,   J_7,   L_7}, //LB28
-    {1, B_8,   A_8,   C_8}, //LB29
-    {1, E_8,   D_8,   F_8}, //LB30
-    {1, H_8,   G_8,   I_8}, //LB31
-    {1, K_8,   J_8,   L_8}, //LB32
-    {1, B_9,   A_9,   C_9}, //LB33
-    {1, E_9,   D_9,   F_9}, //LB34
-    {1, H_9,   G_9,   I_9}, //LB35
-    {1, K_9,   J_9,   L_9}, //LB36
-    {1, B_10,  A_10,  C_10}, //LB37
-    {1, E_10,  D_10,  F_10}, //LB38
-    {1, H_10,  G_10,  I_10}, //LB39
-    {1, K_10,  J_10,  L_10}, //LB40
-    {1, B_11,  A_11,  C_11}, //LB41
-    {1, E_11,  D_11,  F_11}, //LB42
-    {1, H_11,  G_11,  I_11}, //LB43
-    {1, K_11,  J_11,  L_11}, //LB44
-    {1, B_12,  A_12,  C_12}, //LB45
-    {1, E_12,  D_12,  F_12}, //LB46
-    {1, H_12,  G_12,  I_12}, //LB47
-    {1, K_12,  J_12,  L_12}, //LB48
-    {1, B_13,  A_13,  C_13}, //LB49
-    {1, E_13,  D_13,  F_13}, //LB50
-    {1, H_13,  G_13,  I_13}, //LB51
-    {1, K_13,  J_13,  L_13}, //LB52
-    {1, B_14,  A_14,  C_14}, //LB53
-    {1, E_14,  D_14,  F_14}, //LB54
-    {1, H_14,  G_14,  I_14}, //LB55
-    {1, K_14,  J_14,  L_14}, //LB56
-    {1, B_15,  A_15,  C_15}, //LB57
-    {1, E_15,  D_15,  F_15}, //LB58
-    {1, H_15,  G_15,  I_15}, //LB59
-    {1, K_15,  J_15,  L_15}, //LB60
-    {1, B_16,  A_16,  C_16}, //LB61
-    {1, E_16,  D_16,  F_16}, //LB62
-    {1, H_16,  G_16,  I_16}, //LB63
-    {1, K_16,  J_16,  L_16}, //LB64
+    {1, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LB1
+    {1, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LB2
+    {1, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LB3
+    {1, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LB4
+    {1, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LB5
+    {1, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LB6
+    {1, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LB7
+    {1, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LB8
+    {1, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LB9
+    {1, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LB10
+    {1, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LB11
+    {1, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LB12
+    {1, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LB13
+    {1, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LB14
+    {1, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LB15
+    {1, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LB16
+    {1, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LB17
+    {1, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LB18
+    {1, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LB19
+    {1, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LB20
+    {1, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LB21
+    {1, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LB22
+    {1, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LB23
+    {1, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LB24
+    {1, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LB25
+    {1, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LB26
+    {1, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LB27
+    {1, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LB28
+    {1, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LB29
+    {1, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LB30
+    {1, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LB31
+    {1, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LB32
+    {1, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LB33
+    {1, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LB34
+    {1, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LB35
+    {1, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LB36
+    {1, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LB37
+    {1, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LB38
+    {1, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LB39
+    {1, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LB40
+    {1, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LB41
+    {1, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LB42
+    {1, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LB43
+    {1, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LB44
+    {1, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LB45
+    {1, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LB46
+    {1, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LB47
+    {1, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LB48
+    {1, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LB49
+    {1, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LB50
+    {1, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LB51
+    {1, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LB52
+    {1, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LB53
+    {1, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LB54
+    {1, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LB55
+    {1, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LB56
+    {1, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LB57
+    {1, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LB58
+    {1, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LB59
+    {1, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LB60
+    {1, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LB61
+    {1, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LB62
+    {1, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LB63
+    {1, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LB64
 };
 #endif
 
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
deleted file mode 100644
index 307eac90e1f..00000000000
--- a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Copyright 2020 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 QMK_KEYBOARD_H
-#include "drivers/led/issi/is31fl3733.h"
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_65_ansi( /* Base */
-    QK_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_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_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-[1] = LAYOUT_65_ansi( /* FN */
-    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_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-[2] = LAYOUT_65_ansi( /* 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),
-
-[3] = LAYOUT_65_ansi( /* 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),
-};
-
-
-static uint16_t ledTimer;
-
-uint8_t r = 0;  /* First led*/
-uint8_t g = 0;  /* Second led*/
-uint8_t b = 0;  /* Third led*/
-
-/* Boot animation parameters */
-
-uint8_t bootFirst=3;    /* Number of increment slides. */
-uint8_t bootSec=3;      /* Number of full blink. */
-
-/* Breathing animation parameters */
-
-const uint16_t travelTime = 1000;   /* Time the leds take to go from off to on or on to off. */
-const uint16_t fadeStep = 5;        /* Steps for the fade in and out, 0-255 by steps of 10. */
-const uint16_t fadeTime = 20;       /* Time between each fade step. */
-const uint8_t maxBrightness=255;    /* keep them multipliers of fade Step between 0 and 255. */
-const uint8_t minBrightness=0;
-
-uint16_t previousTime = 0;
-uint16_t time = 0;
-
-bool bootAnimation(void){
-    if (bootFirst>0 || bootSec>0){    
-        if(bootFirst!=0){
-            if (timer_elapsed(ledTimer) > 150){
-                g = 255;
-                r = 0;
-                b = 0;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-            }
-            if (timer_elapsed(ledTimer) > 300){
-                g = 255;
-                r = 255;
-                b = 0;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-            }
-            if (timer_elapsed(ledTimer) > 400){
-                g = 255;
-                r = 255;
-                b = 255;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-            }
-            if (timer_elapsed(ledTimer) > 500){
-                g = 0;
-                r = 0;
-                b = 0;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-                ledTimer = timer_read();
-                bootFirst--;
-            }
-        }
-        if (bootFirst==0 && bootSec!=0){
-            if (timer_elapsed(ledTimer) > 200) {
-                g = 255;
-                r = 255;
-                b = 255;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-            }
-            if (timer_elapsed(ledTimer) > 400){
-                g = 0;
-                r = 0;
-                b = 0;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-                ledTimer = timer_read();
-                bootSec--;
-            }
-        }
-        return false;
-    }
-    return true;
-}
-
-
-void breathing(void) {
-    if(timer_elapsed(ledTimer)<travelTime){
-        time = timer_elapsed(ledTimer);
-        if((time - previousTime) > fadeTime && r<maxBrightness){
-            g+=fadeStep;
-            r+=fadeStep;
-            b+=fadeStep;
-            is31fl3733_set_color( 6+64-1, r, g, b );
-            previousTime = time;
-        }
-    }
-    else if(timer_elapsed(ledTimer)<(travelTime *  2)){
-        time = timer_elapsed(ledTimer);
-        if((time - previousTime) > fadeTime && r>minBrightness){
-            g-=fadeStep;
-            r-=fadeStep;
-            b-=fadeStep;
-            is31fl3733_set_color( 6+64-1, r, g, b );
-            previousTime = time;
-        } 
-    }
-    else {
-        r=0;
-        g=0;
-        b=0;
-        is31fl3733_set_color( 6+64-1, r, g, b );
-        previousTime = 0;
-        time = 0;
-        ledTimer=timer_read();
-    }
-}
-
-/* this avoids turning off the led each matrix_scan_user() call */
-bool capsState; 
-bool prevCapsState;
-
-void matrix_scan_user(void){
-    if(bootAnimation()){
-        capsState = host_keyboard_led_state().caps_lock; 
-        if (capsState) {
-            breathing();
-            prevCapsState = capsState; 
-        } 
-        else if(!capsState && capsState != prevCapsState){ 
-            g = 0;
-            r = 0;
-            b = 0;
-            is31fl3733_set_color( 6+64-1, r, g, b );
-            prevCapsState = capsState; 
-        }
-    }
-}
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md
deleted file mode 100644
index 5910222a460..00000000000
--- a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# The jesusvallejo keymap for ANSI Keebwerk Mega. VIA support enabled.
-
-![Layer 0](https://i.imgur.com/RcuLofrl.png)
-
-![Layer 1](https://i.imgur.com/NJOORcdl.png)
-
-- Default layer is normal ANSI 65%.
-- Leds slide and blink bootup animation.
-- Leds fade Caps Lock animation.
diff --git a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
deleted file mode 100644
index bd1f399086b..00000000000
--- a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Copyright 2020 Duckle, 2021 Jesús Vallejo
- *
- * 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 "analog.h"
-#include "qmk_midi.h"
-
-/*
-This keymap works with midi2vol: linux version  https://github.com/jesusvallejo/Midi2Vol-Linux  
-and windows version https://github.com/jesusvallejo/Midi2Vol
-
-Enables the user to change the volume on the host computer if running midi2vol software.
-
-Example to extend usability is provided check VLC in: enum custom_keycodes {} and bool process_record_user(uint16_t keycode, keyrecord_t *record) {}
-Remember to give allways the new volume control a hex value not used by other volume control, 
-and add it to the midi2vol software.
-Check respective midi2vol readme on how to do so.In linux change config.json,in windows you can use configuration option.
-
-A compiled version of this keymap is provided in here: https://github.com/jesusvallejo/nanokeymaps/
-
-*/
-
-uint8_t midi2vol = 0x3E;
-
-/* Defines names for use in layer keycodes and the keymap */
-
-enum custom_layers {
-    _MEDIA,    /* Controls Pause, Mute , Forward ... */
-    _NAV,      /* Nav arrows, Enter, Space*/
-    _VOLUME,    /* Changes midi2vol int to interface with midi2vol program: Chrome Volume, General Volume */
-    _DISCORD,  /* FXX unsused keys to interface with Discord: Mute , Silence */
-    _LIGHTS,   /* Edits underglow and retroilumination */
-    _EDIT,     /* Cut, Copy ,Paste */
-    _QK_BOOT,  /* Layer to set nano in bootloader mode */
-    _TOOGLE,   /* Momentary layer to switch between layers */
-};
-
-
-
-/* Defines the keycodes used by our macros in process_record_user */
-enum custom_keycodes { /* In order to add more volume controls, add here a custom keycode, ex: VLC */
-    DEFAULT= SAFE_RANGE,SPOTIFY,DISCORD,CHROME/*,VLC*/
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_MEDIA] = LAYOUT(
-        MO(_TOOGLE),
-        KC_MPLY, KC_MNXT,  KC_COPY,
-        KC_MUTE,  KC_MPRV, KC_PASTE, KC_ENTER
-    ),
-    [_NAV] = LAYOUT(
-        MO(_TOOGLE),
-        KC_SPC, KC_UP, KC_BSPC,
-        KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENTER      
-    ),
-    [_VOLUME] = LAYOUT(
-        MO(_TOOGLE),
-        SPOTIFY, DISCORD, CHROME,
-        KC_NO, KC_NO, KC_NO, DEFAULT
-    ),
-    [_DISCORD] = LAYOUT(
-        MO(_TOOGLE),
-        KC_F18, KC_F19, KC_F20,
-        KC_F21, KC_F22, KC_F23, KC_F24
-    ),
-    [_LIGHTS] = LAYOUT(
-        MO(_TOOGLE),
-        RGB_TOG, RGB_MOD, RGB_VAI,
-        RGB_SAI, BL_BRTG, BL_STEP, KC_LSFT
-    ),
-    [_EDIT] = LAYOUT(
-        MO(_TOOGLE),
-        KC_MENU, KC_CUT, KC_COPY,
-        KC_FIND, KC_UNDO, KC_PASTE, KC_MPLY
-    ),
-    [_RESET] = LAYOUT(
-        MO(_TOOGLE),
-        KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, QK_BOOT 
-    ),
-    [_TOOGLE] = LAYOUT(
-        MO(_TOOGLE),
-        TO(_MEDIA),    TO(_NAV),    TO(_VOLUME),
-        TO(_DISCORD),    TO(_LIGHTS),    TO(_EDIT),    TO(_RESET)
-    )
-};
-/* In order to add more volume controls, add here code to detect custom keycode, ex: VLC */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) { 
-    switch (keycode) {
-        case DEFAULT:
-            if (record->event.pressed) {
-                /* when keycode DEFAULT is pressed */
-                midi2vol= 0x3E;
-            } else {
-                /* when keycode DEFAULT is released */
-            }
-            break;
-        case SPOTIFY:
-            if (record->event.pressed) {                
-                midi2vol= 0x3F;
-            }
-            break;
-        case DISCORD:
-            if (record->event.pressed) {
-                
-                midi2vol= 0x40;
-            } 
-            break;
-        case CHROME:
-            if (record->event.pressed) {
-                
-                midi2vol= 0x41;
-            }
-            break;
-        /*
-        case VLC:
-            if (record->event.pressed) {
-                midi2vol= 0x42;
-            }
-            break;
-        */
-    }
-    return true;
-}
-
-uint8_t divisor = 0;
-
-
-void slider(void) {
-    if (divisor++) { /* only run the slider function 1/256 times it's called */
-        return;
-    }
-    midi_send_cc(&midi_device, 2, midi2vol, 0x7F - (analogReadPin(SLIDER_PIN) >> 3));
-}
-
-void matrix_scan_user(void) {
-    slider();
-}
diff --git a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md
deleted file mode 100644
index 869baef07f5..00000000000
--- a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Midi2Vol keymap for nano_slider
-This keymap has the code for the nano_slider to work with [Midi2Vol](https://github.com/jesusvallejo/Midi2Vol).
diff --git a/keyboards/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h
deleted file mode 100644
index 5c89632272c..00000000000
--- a/keyboards/keybee/keybee65/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-
-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
-
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 68
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/keybee/keybee65/info.json b/keyboards/keybee/keybee65/info.json
index 7ec1979c088..30067891d7b 100644
--- a/keyboards/keybee/keybee65/info.json
+++ b/keyboards/keybee/keybee65/info.json
@@ -12,7 +12,8 @@
         "pin": "B0"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "sleep": true
     },
     "rgblight": {
         "max_brightness": 96
diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
deleted file mode 100644
index 92296cbc55e..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (C) 2019, 2020  Keyboard.io, Inc
-//               2021  Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
-//
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#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 {
-    _QW,
-    _RS,
-    _LW,
-};
-
-// tap: z    // hold: SHIFT
-#define Z_SFT     SFT_T(KC_Z)
-// tap: /    // hold: SHIFT
-#define SLSH_SFT  SFT_T(KC_SLSH)
-
-// tap: `    // hold: SHIFT
-#define GRAVE_SFT SFT_T(KC_GRAVE)
-// tap: [    // hold: SHIFT
-#define RBRC_SFT  SFT_T(KC_RBRC)
-
-// Layer movment
-#define FN0 MO(_RS)  // move to layer 1 (L1)
-#define FN1 TG(_LW)  // move to layer 2 (L2)
-#define FN2 TO(_QW)  // move to layer 0 (L0)
-
-  /*
-   *  q     w     e     r   t      ||     y   u   i/tab o  p
-   *  a     s     d     f   g      ||     h   j   k     l  ;
-   *  z/sft x     c     v   b  `   || \   n   m   ,     .  //sft
-   *  ctl   esc  super  alt L1 spc || spc L1  alt -     '  ctl
-   */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
-    KC_Q,    KC_W,   KC_E,     KC_R,    KC_T,                      KC_Y,   KC_U,    KC_I,    KC_O,    KC_P    ,
-    KC_A,    KC_S,   KC_D,     KC_F,    KC_G,                      KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN ,
-    Z_SFT,   KC_X,   KC_C,     KC_V,    KC_B,   KC_GRAVE, KC_BSLS, KC_N,   KC_M,    KC_COMM, KC_DOT,  SLSH_SFT,
-    KC_LCTL, KC_ESC, KC_LGUI,  KC_LALT, KC_SPC, FN0,      FN0,     KC_SPC, KC_LALT, KC_MINS, KC_QUOT, KC_LCTL
-  ),
-
-  /*
-   *  1     2      3     4   5       ||    6   7   8    9    0
-   *  !     @      #     $   %       ||    ^   &   *    (    )
-   *  `/sft ~      ?     ?   ?   ~   || |  +   -   /    [    ]/sft
-   *  ctl   esc    super alt spc L2  || L2 spc alt =    esc  ctl
-   */
-  [_RS] = LAYOUT( /* [> RAISE <] */
-    KC_1,      KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,     KC_7,    KC_8,    KC_9,    KC_0    ,
-    KC_EXLM,   KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                    KC_CIRC,  KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN ,
-    GRAVE_SFT, KC_TILD, KC_NO,   KC_NO,   KC_NO,    _______, _______, KC_PLUS,  KC_MINS, KC_SLSH, KC_LBRC, RBRC_SFT,
-    _______,   _______, _______, _______, _______, FN1,      FN1,     _______, _______, KC_EQL,   _______,  _______
-  ),
-
-  /*
-   * F1  F2  F3    F4  F5          ||    F6  F7  F8  F9  F10
-   * __  __  __    __  F11         ||    F12 __  __  __  __
-   * __  __  __    dbg rst eep-rst || __ __  __  __  __  __
-   * ctl esc super alt  __ L0      || L0 __ alt  __  esc ctl
-   */
-  [_LW] = LAYOUT( /* [> LOWER <] */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8, KC_F9,  KC_F10,
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F11,                    KC_F12,  KC_NO,   KC_NO, KC_NO,  KC_NO ,
-    KC_NO,   KC_NO,   KC_NO,   DB_TOGG, QK_BOOT, EE_CLR,  _______, KC_NO,   KC_NO,   KC_NO, KC_NO,  KC_NO ,
-    _______, _______, _______, _______, _______, FN2,     FN2,     _______, _______, KC_NO, KC_ESC, _______
-  )
-};
-
-// Initialize variable holding the binary
-// representation of active modifiers.
-uint8_t mod_state;
-
-bool substitute_keycode(uint16_t keycode, keyrecord_t *record, uint8_t mod_state, uint16_t substitute_keycode) {
-    /* Substitute keycode if condition matches */
-    // Initialize a boolean variable that keeps track
-    // of the delete key status: registered or not?
-    static bool key_registered;
-    // ctrl activated?
-    if ((mod_state & MOD_BIT(KC_LCTL)) == MOD_BIT(KC_LCTL)) {
-        if (record->event.pressed) {
-            // No need to register KC_LCTL because it's already active.
-            unregister_code(KC_LCTL);
-            // Send substitute code
-            register_code(substitute_keycode);
-            // Update the boolean variable to reflect the status of the register
-            key_registered = true;
-            // Reapplying modifier state so that the held shift key(s)
-            // still work even after having tapped the Backspace/Delete key.
-            set_mods(mod_state);
-            // Do not let QMK process the keycode further
-            return false;
-        } else {
-            // In case substitude_keycode is still even after release of the key
-            if (key_registered) {
-                unregister_code(substitute_keycode);
-                key_registered = false;
-                // Do not let QMK process the keycode further
-                return false;
-            }
-        }
-    } else { // ctrl got released
-        // In case substitude_keycode is still sent after release of the ctrl key
-        if (key_registered) {
-            unregister_code(substitute_keycode);
-            key_registered = false;
-        }
-    }
-    // Else, let QMK process the keycode as usual
-    return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Store the current modifier state in the variable for later reference
-    mod_state = get_mods();
-    switch (keycode) {
-    case KC_I:
-        return substitute_keycode(keycode, record, mod_state, KC_TAB);
-    case KC_M:
-        return substitute_keycode(keycode, record, mod_state, KC_ENTER);
-    case KC_H:
-        return substitute_keycode(keycode, record, mod_state, KC_BSPC);
-    case KC_D:
-        return substitute_keycode(keycode, record, mod_state, KC_DEL);
-    case KC_N:
-        return substitute_keycode(keycode, record, mod_state, KC_DOWN);
-    case KC_P:
-        return substitute_keycode(keycode, record, mod_state, KC_UP);
-    }
-    return true;
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/readme.md b/keyboards/keyboardio/atreus/keymaps/ardumont/readme.md
deleted file mode 100644
index d2532d7e973..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/ardumont/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-![ardumont layout](https://i.imgur.com/tuk64AI.png)
-
-# ardumont layout
-
-This is a qwerty layout for the keyboardio/atreus. For the most part, it's a
-straightforward layout. Only the modifiers key are not organized like the default
-layout. Those modifier keys are mostly symmetrically configured.
-
-The idea is that when using a modifier key, some users may expect to use both side of
-the keyboard symmetrically (as in emacs, qutebrowser, terminal/tmux).
-
-Exceptions to the rules are the `Escape` and the `Super` which only exists on the left
-Side of the keyboard. Those are mostly unused.
-
-Note that some keys are not present in the keyboard (e.g `Tab`, `Enter`, ...) since they
-are available from the legacy terminal bindings:
-
-- Ctrl-i: Tab
-- Ctrl-m: Enter
-- Ctrl-h: Backspace
-- Ctrl-d: Del
-- Ctrl-n: Down
-- Ctrl-p: Up
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
deleted file mode 100644
index c34fa270b40..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 kkokdae <kkokdae@me.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 PERMISSIVE_HOLD
-#define TAPPING_TERM 200
-#define ONESHOT_TAP_TOGGLE 5
-#define ONESHOT_TIMEOUT 5000
-
-#define AUTO_SHIFT_DISABLED_AT_STARTUP
-#define AUTO_SHIFT_TIMEOUT 0
-#define NO_AUTO_SHIFT_SPECIAL
-#define NO_AUTO_SHIFT_NUMERIC
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c b/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c
deleted file mode 100644
index de8491d2463..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright 2022 kkokdae <kkokdae@me.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 my_layers {
-  _COLEMAK,
-  _QWERTY,
-  _FUNC,
-  _NUMPAD,
-  _SYMBOL
-};
-
-enum my_tds {
-  TdH,
-  TdL
-};
-
-#define FUNC LT(_FUNC, KC_SPC)
-#define NUMPAD  LT(_NUMPAD, KC_BSPC)
-#define DNUMPAD LT(_NUMPAD, KC_DEL)
-#define SYMBOL OSL(_SYMBOL)
-
-#define OSMCMD OSM(MOD_LGUI)
-#define OSMOPT OSM(MOD_LALT)
-#define OSMCTL OSM(MOD_LCTL)
-#define OSMSFT OSM(MOD_LSFT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_COLEMAK] = LAYOUT(
-      KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                      KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT,
-      KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                      KC_M,    KC_N,    KC_E,    KC_I,    KC_O,
-      KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    _______, _______, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_ENT,
-			OSMCMD,  OSMOPT,  OSMCTL,  OSMSFT,  FUNC,    KC_TAB,  KC_ESC,  NUMPAD,  SYMBOL,  OSMCTL,  OSMOPT,  OSMCMD
-      ),
-
-  [_QWERTY] = LAYOUT(
-      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-      KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,
-      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_ENT,
-			OSMCMD,  OSMOPT,  OSMCTL,  OSMSFT,  FUNC,    KC_TAB,  KC_ESC,  NUMPAD,  SYMBOL,  OSMCTL,  OSMOPT,  OSMCMD
-      ),
-
-  [_FUNC] = LAYOUT(
-      KC_MRWD, KC_VOLU, KC_VOLD, KC_MFFD, KC_MPLY,                   KC_INS,  KC_F7,   KC_F8,   KC_F9,   KC_CAPS,
-      KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_BRIU,                   KC_F12,  KC_F4,   KC_F5,   KC_F6,   TD(TdL),
-      KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_BRID, _______, _______, KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F11,
-      _______, _______, _______, CW_TOGG, _______, _______, _______, DNUMPAD, _______, _______, _______, _______
-      ),
-
-  [_NUMPAD] = LAYOUT(
-      _______, _______, _______, _______, _______,                   S(KC_E), KC_7,    KC_8,    KC_9,    S(KC_F),
-      TD(TdL), KC_EQL,  KC_ASTR, KC_PLUS, _______,                   S(KC_C), KC_4,    KC_5,    KC_6,    S(KC_D),
-      TD(TdH), KC_DOT,  KC_SLSH, KC_MINS, _______, _______, _______, S(KC_A), KC_1,    KC_2,    KC_3,    S(KC_B),
-      _______, _______, _______, CW_TOGG, _______, _______, _______, _______, KC_0,    _______, _______, _______
-      ),
-
-  [_SYMBOL] = LAYOUT(
-      KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, KC_CIRC,                   KC_DLR,  KC_BSLS, KC_PERC, KC_AT,   KC_DQUO,
-      KC_QUES, KC_EXLM, KC_HASH, KC_ASTR, KC_AMPR,                   KC_PIPE, KC_MINS, KC_PLUS, KC_UNDS, KC_EQL,
-      KC_LT,   KC_LPRN, KC_RPRN, KC_GT,   KC_GRV,  _______, _______, KC_TILD, KC_SLSH, C(KC_B), KC_COLN, KC_SCLN,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      ),
-};
-
-void dance_hex(tap_dance_state_t *state, void *user_data) {
-  switch(state->count) {
-    case 1:
-			SEND_STRING("0x");
-      break;
-    case 2:
-			SEND_STRING("\\x");
-      break;
-  }
-}
-
-void dance_lang(tap_dance_state_t *state, void *user_data) {
-  uint32_t default_layer;
-  switch(state->count) {
-    case 1:
-			SEND_STRING(SS_LCTL(" ") SS_DELAY(200) SS_TAP(X_ENT));
-    case 2:
-      default_layer = get_highest_layer(default_layer_state);
-      if (default_layer == _COLEMAK) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      else if (default_layer == _QWERTY) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      break;
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TdH] = ACTION_TAP_DANCE_FN(dance_hex),
-  [TdL] = ACTION_TAP_DANCE_FN(dance_lang)
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/readme.md b/keyboards/keyboardio/atreus/keymaps/kkokdae/readme.md
deleted file mode 100644
index f7f85f70a6a..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# kkokdae keymap - Keyboardio Atreus
-
-This is the keymap available for keyboardio/atreus keyboards.
-
-The default layout used [Colemak Mod-DH](https://colemakmods.github.io/mod-dh/). The prefix keys for vim/tmux users. The symbol is designed for ease of use by programmers.
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/rules.mk b/keyboards/keyboardio/atreus/keymaps/kkokdae/rules.mk
deleted file mode 100644
index 75ebcd912b7..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE = no
-COMMAND_ENABLE = no
-TAP_DANCE_ENABLE = yes
-CAPS_WORD_ENABLE = yes
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/config.h b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/config.h
deleted file mode 100644
index 0fa53c2d678..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2023 @PoweredByPorridge
- *
- * 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 AUTO_SHIFT_TIMEOUT 210
-
-#define NO_AUTO_SHIFT_NUMERIC
-// #define NO_AUTO_SHIFT_SPECIAL
-
-// retro shift is auto shift on home row mods
-// I no longer use home row mods, but do find this setting helps
-// avoid 'fat fingered' keypresses.
-
-// If RETRO_SHIFT is defined to a value, hold times greater 
-// than that value will not produce a tap on release. This enables 
-// modifiers to be held for combining with mouse clicks without 
-// generating taps on release.
-#define RETRO_SHIFT 425
-
-// can also be defined without a value
-// #define RETRO_SHIFT
-
-// Configure the global tapping term (default: 200ms)
-// Lower than 210 and I can't tap dance brackets without a run up.
-#define TAPPING_TERM 210
-
-#define TAPPING_TERM_PER_KEY
-
-// Apply the modifier on keys that are tapped during a short hold of a modtap
-// Prevents slurred typing (of home row mods)
-#define PERMISSIVE_HOLD
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/keymap.c b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/keymap.c
deleted file mode 100644
index 40c8b0b5aad..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/keymap.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/* Copyright 2023 @PoweredByPorridge
- *
- * 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
-
-// Tap Dance keycodes
-enum td_keycodes {
-    L_BRAX, // Used in the keymap, add additional keycodes for each tapdance.
-    R_BRAX,
-    QUOTS,  
-    TACHE   
-};
-
-// Define a type containing as many tapdance states as you need
-typedef enum {
-    SINGLE_TAP,
-    DOUBLE_TAP,           // SINGLE_HOLD,
-    TRIPLE_TAP            // DOUBLE_SINGLE_TAP
-} td_state_t;
-
-// Create a global instance of the tapdance state type
-static td_state_t td_state;
-
-// Declare your tapdance functions:
-
-// Function to determine the current tapdance state
-uint8_t cur_dance(tap_dance_state_t *state);
-
-// `finished` and `reset` functions for each tapdance keycode
-void lbrax_finished(tap_dance_state_t *state, void *user_data);
-void lbrax_reset(tap_dance_state_t *state, void *user_data);
-
-void rbrax_finished(tap_dance_state_t *state, void *user_data);
-void rbrax_reset(tap_dance_state_t *state, void *user_data);
-
-void quots_finished(tap_dance_state_t *state, void *user_data);
-void quots_reset(tap_dance_state_t *state, void *user_data);
-
-void tache_finished(tap_dance_state_t *state, void *user_data);
-void tache_reset(tap_dance_state_t *state, void *user_data);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_Q,         KC_W,        KC_E,       KC_R,     KC_T,                              KC_Y,        KC_U,      KC_I,     KC_O,    KC_P,
-		     KC_A,         KC_S,        KC_D,       KC_F,     KC_G,                              KC_H,        KC_J,      KC_K,     KC_L,    KC_SCLN,
-		     KC_Z,         KC_X,        KC_C,       KC_V,     KC_B,      KC_NUBS,     KC_SLSH,   KC_N,        KC_M,      KC_COMM,  KC_DOT,  KC_ENT,
-	   LCTL_T(KC_ESC),         KC_LALT,     KC_LGUI,    KC_LSFT,  MO(1),     KC_SPC,      KC_SPC,    MO(2),       TD(QUOTS), KC_RSFT,  KC_LALT, LCTL_T(KC_TAB)),
-	
-	[1] = LAYOUT(KC_EXLM,      KC_DQUO,     LSFT(KC_3), KC_DLR,   KC_PERC,                           KC_CIRC,     KC_AMPR,   KC_ASTR,  KC_DEL,  KC_BSPC,
-		     KC_F24,       LALT(KC_F3), KC_NO,      KC_NO,    TD(L_BRAX),                        TD(R_BRAX),  KC_LEFT,   KC_DOWN,  KC_UP,   KC_RGHT,
-		     LCTL(KC_F12), LALT(KC_X),  KC_NO,      KC_NO,    KC_NO,      TD(QUOTS),  TD(TACHE), KC_MINS,     KC_EQL,    KC_COMM,  KC_DOT,  KC_ENT,
-		     KC_TRNS,      KC_NO,       KC_NO,      MO(3),    KC_NO,      KC_NO,      KC_NO,     KC_NO,       KC_NO,     KC_NO,    KC_NO,   LSFT(KC_TAB)),
-	
-	[2] = LAYOUT(KC_1,         KC_2,        KC_3,       KC_4,     KC_5,                              KC_6,        KC_7,      KC_8,     KC_9,    KC_0,
-		     KC_NO,        LALT(KC_F3), KC_NO,      KC_NO,    TD(L_BRAX),                        TD(R_BRAX),  KC_HOME,   KC_PGDN,  KC_PGUP, KC_END,
-     		     LCTL(KC_F12), LALT(KC_X),  KC_NO,      KC_NO,    KC_NO,      TD(QUOTS),  TD(TACHE), KC_MINS,     KC_EQL,    KC_COMM,  KC_DOT,  KC_NO,
-		     KC_TRNS,      KC_NO,       KC_NO,      KC_NO,    MO(3),      KC_NO,      KC_NO,     KC_NO,       MO(3),     KC_NO,    KC_NO,   KC_TRNS),
-	
-	[3] = LAYOUT(KC_F1,        KC_F2,       KC_F3,      KC_F4,    KC_F5,                             KC_F6,       KC_F7,     KC_F8,    KC_F9,   KC_F10,
-		     AS_TOGG,      KC_F24,      KC_NO,      KC_NO,    KC_NO,                             KC_NO,       LSA(KC_LEFT), LSA(KC_DOWN), LSA(KC_UP), LSA(KC_RGHT),
-		     KC_LCTL,      LALT(KC_DEL),KC_NO,      KC_NO,    KC_NO,      KC_NO,      KC_VOLU,   KC_NO,       KC_F12,    KC_F13,   KC_F14,  KC_NO,
-		     KC_TRNS,      KC_F23,      KC_LCTL,    KC_NO,    KC_TRNS,    KC_NO,     KC_VOLD,    KC_MPLY,     KC_LSFT,   KC_NO,   KC_NO,  KC_TRNS)
-};
-
-/* 
-Notes on keys
-or, why on earth do I have keymap 
-lower-shift-z is CTRL-F12 - Darkroom mode in emacs
-lower-x is ALT-X - emacs
-layer3-a is toggle autoshift
-layer3-s is F24 - i3 controls popup reminder
-lower-s is ALT-F3 - multi-select in Sublime text
-*/
-
-
-// Determine the tapdance state to return
-uint8_t cur_dance(tap_dance_state_t *state) {
-    if (state->count == 1) {
-        return SINGLE_TAP;
-    } else if (state->count == 2) {
-        return DOUBLE_TAP;
-    } else if (state->count == 3) {
-        return TRIPLE_TAP;
-    } else {
-        reset_tap_dance (state);
-        return 3;
-    }
-}
-
-
-// Handle the possible states for each tapdance keycode you define:
-
-void lbrax_finished(tap_dance_state_t *state, void *user_data) {
-    td_state = cur_dance(state);
-    switch (td_state) {
-        case SINGLE_TAP:
-	    register_code16(LSFT(KC_9));
-            break;
-        case DOUBLE_TAP:
-            register_code16(KC_LBRC);
-            break;
-        case TRIPLE_TAP: 
-  	    register_code16(LSFT(KC_LBRC));
-    }
-}
-
-void lbrax_reset(tap_dance_state_t *state, void *user_data) {
-    switch (td_state) {
-        case SINGLE_TAP:
-	    unregister_code16(LSFT(KC_9));
-	    break; 
-        case DOUBLE_TAP:
-            unregister_code16(KC_LBRC);
-            break;
-        case TRIPLE_TAP:
-            unregister_code16(LSFT(KC_LBRC));
-    }
-}
-
-// Handle the possible states for each tapdance keycode you define:
-
-void rbrax_finished(tap_dance_state_t *state, void *user_data) {
-    td_state = cur_dance(state);
-    switch (td_state) {
-        case SINGLE_TAP:
-            register_code16(LSFT(KC_0));
-            break;
-        case DOUBLE_TAP:
-            register_code16(KC_RBRC);
-            break;
-        case TRIPLE_TAP: 
-            register_code16(LSFT(KC_RBRC));
-    }
-}
-
-
-void rbrax_reset(tap_dance_state_t *state, void *user_data) {
-    switch (td_state) {
-        case SINGLE_TAP:
-	    unregister_code16(LSFT(KC_0));
-            break;
-        case DOUBLE_TAP:
-            unregister_code16(KC_RBRC);
-            break;
-        case TRIPLE_TAP:
-	    unregister_code16(LSFT(KC_RBRC));
-    }
-}
-
-void quots_finished(tap_dance_state_t *state, void *user_data) {
-    td_state = cur_dance(state);
-    switch (td_state) {
-        case SINGLE_TAP:
-            register_code16(KC_QUOT);
-            break;
-        case DOUBLE_TAP:
-            register_code16(KC_AT);
-            break;
-        case TRIPLE_TAP:
-            register_code16(KC_DQUO);
-    }
-}
-
-void quots_reset(tap_dance_state_t *state, void *user_data) {
-    switch (td_state) {
-        case SINGLE_TAP:
-            unregister_code16(KC_QUOT);
-            break;
-        case DOUBLE_TAP:
-            unregister_code16(KC_AT);
-            break;
-        case TRIPLE_TAP:
-            unregister_code16(KC_DQUO);
-    }
-}
-
-void tache_finished(tap_dance_state_t *state, void *user_data) {
-    td_state = cur_dance(state);
-    switch (td_state) {
-        case SINGLE_TAP:
-            register_code16(KC_NUHS);
-            break;
-        case DOUBLE_TAP:
-
-            register_code16(LSFT(KC_NUHS));
-            break;
-        case TRIPLE_TAP:
-            register_code16(KC_GRV);
-    }
-}
-
-void tache_reset(tap_dance_state_t *state, void *user_data) {
-    switch (td_state) {
-        case SINGLE_TAP:
-            unregister_code16(KC_NUHS);
-            break;
-        case DOUBLE_TAP:
-	    unregister_code16(LSFT(KC_NUHS));
-            break;
-        case TRIPLE_TAP:
-            unregister_code16(KC_GRV);
-    }
-}
-
-// Define `ACTION_TAP_DANCE_FN_ADVANCED()` for each tapdance keycode, passing in `finished` and `reset` functions
-
-tap_dance_action_t tap_dance_actions[] = {
-    [L_BRAX] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lbrax_finished, lbrax_reset),
-    [R_BRAX] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rbrax_finished, rbrax_reset),
-    [QUOTS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, quots_finished, quots_reset),
-    [TACHE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tache_finished, tache_reset)
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/readme.md b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/readme.md
deleted file mode 100644
index 619654186de..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Keyboardio Atreus with an SLF layout from PoweredByPorridge
-
-SLF stands for [Stiff Little Fingers](https://en.wikipedia.org/wiki/Stiff_Little_Fingers) who were a great punk band from Belfast, Northern Ireland. Stiff Little Fingers is also a good way of describing my hands, a condition which I ascribe to too many winters cycling without gloves. So, I need a keyboard and layout to cope.
-
-I use a Keyboardio Atreus, in fact, they're so good, I use two. I tried all sorts of layouts, and finally came up with the one that suits my stiff fingers.
-
-It has four layers:
-
-0 - Normal - letters and punctuation.
-
-![layer 0](https://i.imgur.com/3Z8PZtI.png)
-
-1 - Symbols (shifted numbers), arrow keys, assorted function keys, Del and Backspace.
-
-![layer 1](https://i.imgur.com/9rJalxV.png)
-
-2 - Numbers, page up, page down, home, and end. Similar assorted functions.
-
-![layer 2](https://i.imgur.com/TYY11b5.png)
-
-3 - F1 to F14, play/pause, volume up/down, Left-shift-Alt left, right, up, down.
-
-![layer 3](https://i.imgur.com/MuWNPTz.png)
-
-Autoshift is important, I use it all the time.
-
-I use tap dance (one, two, or three key presses) for:
-
-* Braces, brackets, and curly brackets. TD(L_BRAX) and TD(R_BRAX)
-* Hash (pound), tilde, and backtick. TD(TACHE)
-* Single quote, double quote, and @. TD(QUOTS)
-
-There are odd keys that are there for a particular reason:
-* F24 - my [I3](https://i3wm.org/) popup to remind me of stuff I always forget.
-* Alt-shift-left/right/up/down - multi-select in Sublime text.
\ No newline at end of file
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/rules.mk b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/rules.mk
deleted file mode 100644
index 3285414f97d..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-BOOTMAGIC_ENABLE = no
-MOUSEKEY_ENABLE = no
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-UNICODE_ENABLE = no
-AUTO_SHIFT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/autocorrect_data.h b/keyboards/keyboardio/atreus/keymaps/slotthe/autocorrect_data.h
deleted file mode 100644
index 155b1fbc540..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/autocorrect_data.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2023 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*******************************************************************************
-  88888888888 888      d8b                .d888 d8b 888               d8b
-      888     888      Y8P               d88P"  Y8P 888               Y8P
-      888     888                        888        888
-      888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
-      888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
-      888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
-      888     888  888 888      X88      888    888 888 Y8b.          888      X88
-      888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
-                                                        888                 888
-                                                        888                 888
-                                                        888                 888
-     .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
-    d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
-    888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
-    Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
-     "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
-         888
-    Y8b d88P
-     "Y88P"
-*******************************************************************************/
-
-#pragma once
-
-// Autocorrection dictionary (4 entries):
-//   :alot      -> a lot
-//   accesories -> accessories
-//   accomodate -> accommodate
-//   alledge    -> allege
-
-#define AUTOCORRECT_MIN_LENGTH 5 // ":alot"
-#define AUTOCORRECT_MAX_LENGTH 10 // "accesories"
-#define DICTIONARY_SIZE 73
-
-static const uint8_t autocorrect_data[DICTIONARY_SIZE] PROGMEM = {
-    0x48, 0x0A, 0x00, 0x16, 0x2C, 0x00, 0x17, 0x3E, 0x00, 0x00, 0x4A, 0x11, 0x00, 0x17, 0x1B, 0x00,
-    0x00, 0x07, 0x08, 0x0F, 0x0F, 0x04, 0x00, 0x82, 0x67, 0x65, 0x00, 0x04, 0x07, 0x12, 0x10, 0x12,
-    0x06, 0x06, 0x04, 0x00, 0x84, 0x6D, 0x6F, 0x64, 0x61, 0x74, 0x65, 0x00, 0x08, 0x0C, 0x15, 0x12,
-    0x16, 0x08, 0x06, 0x06, 0x04, 0x00, 0x84, 0x73, 0x6F, 0x72, 0x69, 0x65, 0x73, 0x00, 0x12, 0x0F,
-    0x04, 0x2C, 0x00, 0x82, 0x20, 0x6C, 0x6F, 0x74, 0x00
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/config.h b/keyboards/keyboardio/atreus/keymaps/slotthe/config.h
deleted file mode 100644
index 26235c9d916..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* © 2023  Tony Zorman <soliditsallgood@mailbox.org> (@slotThe)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
-#define TAPPING_TERM 175
-#define HOLD_ON_OTHER_KEY_PRESS
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/keymap.c b/keyboards/keyboardio/atreus/keymaps/slotthe/keymap.c
deleted file mode 100644
index 6188f14ab97..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/keymap.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* © 2023  Tony Zorman <soliditsallgood@mailbox.org> (@slotThe)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// NOTE: `M-x occur RET /// RET' gives a good overview.
-
-/// General macros
-
-#define LSPR_SC  LGUI_T(KC_SCLN)
-#define LALT_BR  LALT_T(KC_LBRC)
-#define LSFT_INS LSFT(KC_INS)
-#define OSMSFT   OSM(MOD_LSFT)
-#define Z_SFT    LSFT_T(KC_Z)
-#define ZE_SFT   LSFT_T(KC_0)
-#define SL_SFT   RSFT_T(KC_SLSH)
-#define RETSPR   LGUI_T(KC_ENT)
-
-/// Tap dance declarations
-
-// So far, tap dances do different things on
-//
-//   - a single press,
-//   - a double press,
-//   - when held,
-//
-// so expect this many keys as comments.
-enum tap_dances {
-  ALT_BR,  // [ ] lalt  (also works shifted, which gets us { and } for free)
-  CTL_PR,  // ( ) lctl
-  SFT_CI,  // ^ ^ lsft  (working around LSFT_T not being able to output shifted keys)
-  SFT_EX,  // ! ! lsft  (ditto)
-};
-
-#define CTLPAR TD(CTL_PR)
-#define ALTBRC TD(ALT_BR)
-#define SFTCRC TD(SFT_CI)
-#define SFTEXL TD(SFT_EX)
-
-/// Macro declarations
-
-enum custom_keycodes {
-  // ->              <-    =<<   >>=   <*>  <*    *>    <$>   <&>   <|>   =>     ::
-  RARR = SAFE_RANGE, LARR, LBND, RBND, APP, RAPP, LAPP, FMAP, PAMF, AALT, IMPLS, DCOL,
-};
-
-/// Key overrides
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-  &ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DEL), // S-BSP ≡ DEL
-  // Emacs got me used to these, so let's convince other programs that
-  // we are in fact sending the correct keys.
-  &ko_make_basic(MOD_MASK_CTRL, KC_I, KC_TAB),     // C-i ≡ Tab
-  &ko_make_basic(MOD_MASK_CTRL, KC_M, KC_ENT),     // C-m ≡ Return
-  NULL // Null terminate the array of overrides
-};
-
-/// Layers
-
-enum layer_names { _COLEMAK_DH, _LOWER, _RAISE, _ADJUST };
-
-#define LOWER    MO(_LOWER)
-#define RAISE    MO(_RAISE)
-#define ADJUST   MO(_ADJUST)
-#define D_RAISE  LT(_RAISE, KC_DOT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Colemak base layer
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |  Q  |  W  |  F  |  P  |  B  |           |  J  |  L  |  U  |  Y  | ;+S |
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |  A  |  R  |  S  |  T  |  G  |           |  M  |  N  |  E  |  I  |  O  |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     | S+Z |  X  |  C  |  D  |  V  | ARP | REP |  K  |  H  |  ,  |  .  | S+/ |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     | ESC | TAB | SPR | L1  | SPC | A[] | BSC | C() | L2  |  -  |  '  | RET |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-  */
-  [_COLEMAK_DH] = LAYOUT(
-    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                      KC_J,    KC_L,    KC_U,    KC_Y,    LSPR_SC,
-    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                      KC_M,    KC_N,    KC_E,    KC_I,    KC_O,
-    Z_SFT,   KC_X,    KC_C,    KC_D,    KC_V,    QK_AREP, QK_REP,  KC_K,    KC_H,    KC_COMM, D_RAISE, SL_SFT,
-    KC_ESC,  KC_TAB,  KC_LGUI, LOWER,   KC_SPC,  ALTBRC,  KC_BSPC, CTLPAR,  RAISE,   KC_MINS, KC_QUOT, KC_ENT),
-
-  /* Layer 1 (LOWER)
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-------.
-     |  &  | *>  | >>= | <&> |     |           |  =  |  +  |  *  |  -  | RET+M |
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-------.
-     | ::  | =>  | =<< | <|> |  @  |           | LFT |  UP | DWN | RGT |   \   |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-     | !+S | <*  | <*> | <$> | <-  |     | MEN |  -> |  $  |  #  |  %  |  ^+S  |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-     |     |     |     |     |     |     |     |     | L3  | ALT |     |  S-I  |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-  */
-  [_LOWER] = LAYOUT(
-    KC_AMPR, RAPP,    RBND,    PAMF,    _______,                   KC_EQL,  KC_PLUS, KC_ASTR, KC_MINS, RETSPR,
-    DCOL,    IMPLS,   LBND,    AALT,    KC_AT,                     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_BSLS,
-    SFTEXL,  LAPP,    APP,     FMAP,    LARR,    _______, KC_APP,  RARR,    KC_DLR,  KC_HASH, KC_PERC, SFTCRC,
-    _______, _______, _______, _______, _______, _______, _______, _______, ADJUST,  KC_LALT, _______, LSFT_INS),
-
-  /* Layer 2 (RAISE)
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |     |  7  |  8  |  9  |     |           |     |  +  |  *  |  -  |     |
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |  :  |  4  |  5  |  6  |  =  |           |  &  |  `  |  _  |  '  |  "  |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     | 0+S |  1  |  2  |  3  |     |     |     |     |  !  |  #  |  %  | ^+S |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     |     |     |     | L3  |     |     |     |     |     |     |     |     |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-  */
-  [_RAISE] = LAYOUT(
-    KC_DOT,  KC_7,    KC_8,    KC_9,    _______,                   _______, KC_PLUS, KC_ASTR, KC_MINS, _______,
-    KC_COLN, KC_4,    KC_5,    KC_6,    KC_EQL,                    KC_AMPR, KC_GRV,  KC_UNDS, KC_QUOT, KC_DQT,
-    ZE_SFT,  KC_1,    KC_2,    KC_3,    _______, _______, _______, _______, KC_EXLM, KC_HASH, KC_PERC, SFTCRC,
-    _______, _______, _______, ADJUST,  _______, _______, _______, _______, _______, _______, _______, _______),
-
-  /* Layer 3 (ADJUST)
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |     |     |     |     |     |           |     | F7  | F8  | F9  | F10 |
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |     |     |     |     |     |           |     | F4  | F5  | F6  | F11 |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     |     |     |     |     |     |     |     |     | F1  | F2  | F3  | F12 |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     |     |     |     |     |     |     |     |     |     |     |     |     |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-  */
-  [_ADJUST] = LAYOUT(
-    _______, _______, _______, _______, AC_TOGG,                   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,
-    _______, _______, _______, _______, _______,                   _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-};
-
-/// Macro definitions
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case RARR:
-    if (record->event.pressed) SEND_STRING("->");  break;
-  case LARR:
-    if (record->event.pressed) SEND_STRING("<-");  break;
-  case LBND:
-    if (record->event.pressed) SEND_STRING("=<<"); break;
-  case RBND:
-    if (record->event.pressed) SEND_STRING(">>="); break;
-  case APP:
-    if (record->event.pressed) SEND_STRING("<*>"); break;
-  case RAPP:
-    if (record->event.pressed) SEND_STRING("*>");  break;
-  case LAPP:
-    if (record->event.pressed) SEND_STRING("<*");  break;
-  case FMAP:
-    if (record->event.pressed) SEND_STRING("<$>"); break;
-  case PAMF:
-    if (record->event.pressed) SEND_STRING("<&>"); break;
-  case AALT:
-    if (record->event.pressed) SEND_STRING("<|>"); break;
-  case IMPLS:
-    if (record->event.pressed) SEND_STRING("=>");  break;
-  case DCOL:
-    if (record->event.pressed) SEND_STRING("::");  break;
-  }
-  return true;
-};
-
-//// Tap dance definitions
-
-// Heavily inspired by:
-//
-//     https://docs.qmk.fm/?ref=blog.splitkb.com#/feature_tap_dance?id=example-4
-
-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;
-
-// Return an integer that corresponds to what kind of tap dance should
-// be executed.
-//
-// Interrupted: If the state of a dance is "interrupted", that means
-//  that another key has been hit under the tapping term.
-//
-// Pressed: Whether or not the key is still being pressed. If this value
-//  is true, that means the tapping term has ended, but the key is still
-//  being pressed down. This generally means the key is being "held".
-td_state_t cur_dance(tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->pressed)         return TD_SINGLE_HOLD;
-    else                        return TD_SINGLE_TAP;
-  } else if (state->count == 2) return TD_DOUBLE_TAP;
-  else                          return TD_UNKNOWN;
-}
-
-//// ALT_BR
-
-static td_tap_t alt_br_state = {
-  .is_press_action = true,
-  .state = TD_NONE
-};
-
-void lalt_br_finished(tap_dance_state_t *state, void *user_data) {
-  alt_br_state.state = cur_dance(state);
-  switch (alt_br_state.state) {
-  case TD_SINGLE_TAP:  register_code(KC_LBRC); break;
-  case TD_SINGLE_HOLD: register_code(KC_LALT); break;
-  case TD_DOUBLE_TAP:  register_code(KC_RBRC); break;
-  default:             break;
-  }
-}
-
-void lalt_br_reset(tap_dance_state_t *state, void *user_data) {
-  switch (alt_br_state.state) {
-  case TD_SINGLE_TAP:  unregister_code(KC_LBRC); break;
-  case TD_SINGLE_HOLD: unregister_code(KC_LALT); break;
-  case TD_DOUBLE_TAP:  unregister_code(KC_RBRC); break;
-  default:             break;
-  }
-  alt_br_state.state = TD_NONE;
-}
-
-//// LCTL_PR
-
-static td_tap_t lctl_pr_state = {
-  .is_press_action = true,
-  .state = TD_NONE
-};
-
-void lctl_pr_finished(tap_dance_state_t *state, void *user_data) {
-  lctl_pr_state.state = cur_dance(state);
-  switch (lctl_pr_state.state) {
-  case TD_SINGLE_TAP:  register_code16(KC_LPRN); break;
-  case TD_SINGLE_HOLD: register_code(KC_LCTL);   break;
-  case TD_DOUBLE_TAP:  register_code16(KC_RPRN); break;
-  default:             break;
-  }
-}
-
-void lctl_pr_reset(tap_dance_state_t *state, void *user_data) {
-  switch (lctl_pr_state.state) {
-  case TD_SINGLE_TAP:  unregister_code16(KC_LPRN); break;
-  case TD_SINGLE_HOLD: unregister_code(KC_LCTL);   break;
-  case TD_DOUBLE_TAP:  unregister_code16(KC_RPRN); break;
-  default:             break;
-  }
-  lctl_pr_state.state = TD_NONE;
-}
-
-//// SFT_CI
-
-static td_tap_t lsft_ci_state = {
-  .is_press_action = true,
-  .state = TD_NONE
-};
-
-void lsft_ci_finished(tap_dance_state_t *state, void *user_data) {
-  lsft_ci_state.state = cur_dance(state);
-  switch (lsft_ci_state.state) {
-  case TD_SINGLE_TAP:  register_code16(KC_CIRC); break;
-  case TD_SINGLE_HOLD: register_code(KC_LSFT);   break;
-  default:             break;
-  }
-}
-
-void lsft_ci_reset(tap_dance_state_t *state, void *user_data) {
-  switch (lsft_ci_state.state) {
-  case TD_SINGLE_TAP:  unregister_code16(KC_CIRC); break;
-  case TD_SINGLE_HOLD: unregister_code(KC_LSFT);   break;
-  default:             break;
-  }
-  lsft_ci_state.state = TD_NONE;
-}
-
-//// SFT_EX
-
-static td_tap_t lsft_ex_state = {
-  .is_press_action = true,
-  .state = TD_NONE
-};
-
-void lsft_ex_finished(tap_dance_state_t *state, void *user_data) {
-  lsft_ex_state.state = cur_dance(state);
-  switch (lsft_ex_state.state) {
-  case TD_SINGLE_TAP:  register_code16(KC_EXLM); break;
-  case TD_SINGLE_HOLD: register_code(KC_LSFT);   break;
-  default:             break;
-  }
-}
-
-void lsft_ex_reset(tap_dance_state_t *state, void *user_data) {
-  switch (lsft_ex_state.state) {
-  case TD_SINGLE_TAP:  unregister_code16(KC_EXLM); break;
-  case TD_SINGLE_HOLD: unregister_code(KC_LSFT);   break;
-  default:             break;
-  }
-  lsft_ex_state.state = TD_NONE;
-}
-
-//// Actually define the tap-dance actions
-
-tap_dance_action_t tap_dance_actions[] = {
-  [ALT_BR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lalt_br_finished, lalt_br_reset),
-  [CTL_PR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lctl_pr_finished, lctl_pr_reset),
-  [SFT_CI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lsft_ci_finished, lsft_ci_reset),
-  [SFT_EX] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lsft_ex_finished, lsft_ex_reset),
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/readme.md b/keyboards/keyboardio/atreus/keymaps/slotthe/readme.md
deleted file mode 100644
index d83bce1d2f2..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/readme.md
+++ /dev/null
@@ -1,251 +0,0 @@
-# SlotThe's Keyboardio Atreus Keymap
-
-Note: the following is (a relevant and shortened) excerpt from [this
-rewiev](https://tony-zorman.com/posts/atreus-review.html) of the
-keyboard itself. See there for, e.g., some thoughts about modifier
-placement.
-
-## Base layer
-
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.------.
-    |  Q  |  W  |  F  |  P  |  B  |           |  J  |  L  |  U  |  Y  | M4+; |
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.------.
-    |  A  |  R  |  S  |  T  |  G  |           |  M  |  N  |  E  |  I  |  O   |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.------.
-    | S+Z |  X  |  C  |  D  |  V  | ARP | REP |  K  |  H  |  ,  |  .  | S+/  |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.------.
-    | ESC | TAB | M4  | L1  | SPC | A[] | BSC | C() | L2  |  -  |  '  | RET  |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.------.
-
-I use [Colemak Mod-DH][colemak-dh] as my layout, so this takes up most of the base of the keyboard.
-
-Perhaps strikingly, I opted for not putting Shift on the thumb,
-but recreating the "ordinary" one-on-each-side setup from the good old typewriter days.
-While I already have a key to access the `LOWER` (L1) layer with my left thumb,
-I had to sacrifice Shift so I could fit a key to the `RAISE` (L2) layer on the right thumb.
-This also jumps to the `ADJUST` (L3) layer when both `LOWER` and `RAISE` are held at the same time.
-I will gladly trade two layers for one Shift key.
-
-One of the most basic things—besides having layers—that one can do with QMK is [mod-taps][qmk:mod-tap].
-These are keys that act as modifiers when held, and as "ordinary" keys when pressed.
-For example, all of the `S+«key»` keys emit Shift when held and `«key»` when pressed.
-There is a slight delay between pressing the key and the press registering,
-since we have to wait for a possible tap,
-which keeps me from using modifiers on the home-row, as some people like to do.
-Likewise, the `M4+;` key acts as Super when held and as `;` when pressed.
-At this point, it is actually my main way to press the Super key,
-even though I don't find the real `M4` key particularly hard to hit with my thumb.
-Sometimes these things just happen,
-I suppose,
-though it may help that I press both outer keys of the top row (that is, `q` and `;`) with my ring finger
-instead of my pinky.
-
-The `A[]` and `C()` keys are utilising [tap dances][qmk:tap-dance],
-in order to do even more.
-Tap dances are very similar to mod-taps,
-only in addition to just differentiating between a "pressed" and a "held" state,
-QMK now also keeps track of *how often* a key has been tapped.
-So far, [my setup][qmk:slotthe:tapdances] here is quite basic;
-I only check whether a key was pressed once, twice, or is being held.
-This allows me to not need extra keys for parentheses,
-as they can fit on the modifier keys:
-
-  - `A[]`: Alt when held, `[` when pressed once, and `]` when pressed twice.
-    This one is especially neat, since tap dances play well with other modifiers,
-    so pressing `S-M1` once will result in `{` and pressing it twice gives `}`.
-
-  - `C()`: Control when held, `(` when pressed once, and `)` when pressed twice.
-
-I don't mind having the extra indirection for the respective closed delimiter,
-as [paredit][emacs:paredit],
-[puni][emacs:puni],
-`electric-pair-mode`,
-or a different package of choice usually takes care of inserting it.
-
-The `REP` and `AREP` keys make use of the [Repeat Key][qmk:repeat-key] functionality;
-basically, `REP` executes the key chord that was last pressed.
-On the other hand,
-`AREP` is an alternative, configurable, of "repeating" things;
-by default, it turns some directional movements
-around—e.g., `M-f` becomes `M-b`—but
-it can be made to pretty much input anything one wants.
-
-## Layer 1
-
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-------.
-    |  &  | *>  | >>= | <&> |     |           |  =  |  +  |  *  |  -  | M4+RT |
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-------.
-    | ::  | =>  | =<< | <|> |  @  |           | LFT |  UP | DWN | RGT |   \   |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-    | S+! | <*  | <*> | <$> | <-  |     | MEN |  -> |  $  |  #  |  %  |  S+^  |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-    |     |     |     |     |     |     |     |     | L3  | ALT |     | S-Ins |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-
-Guess which programming language I like based on this layer's [macros][qmk:macros] :).
-
-Crucially, keys that were "Shift when held,
-*something* when pressed" on the base layer retain the Shift part of that functionality.
-This is used for the commutativity of the modifier
-keys—i.e., it does not matter whether I press `S-L1-«key»` or `L1-S-«key»`—which
-would otherwise drive me insane.
-The same goes for all fall-through keys:
-keys that appear blank in the above layout.
-These aren't blocked or anything,
-just no new functionality is added
-so the key falls back to what's on the next lowest layer.
-In plain terms,
-the key to the left of `L3` will still be Control,
-as I can comfortably press that while holding down something with my left hand.
-The same can't be said for the Alt key,
-which is on the left hand by default,
-so a separate binding for it has to be created on the right hand.
-Thus,
-as the two don't commute,
-key chords involving the LOWER layer and Alt are to be avoided if possible.
-
-The `S-Ins` key is not some sort of tap,
-but actually just emits a Shift-Insert,
-which can be used to paste stuff from the [X11 primary selection][x11:clipboard].
-
-## Layer 2
-
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-    |     |  7  |  8  |  9  |     |           |     |  +  |  *  |  -  |     |
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-    |  :  |  4  |  5  |  6  |  =  |           |     |  `  |  _  |  '  |  "  |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-    | S+0 |  1  |  2  |  3  |     |     |     |     |     |  #  |  %  | S+^ |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-    |     |     |     | L3  |     |     |     |     |     |     |     |     |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-
-A relatively unspectacular layer,
-RAISE is mainly used for numbers,
-and number adjacent things.
-Some symbols related to this,
-like `=`, `+`, `*`, and `-`,
-are replicated from the LOWER layer.
-This is due to the above mentioned issues of inserting arithmetic.
-This layer also features \` and `'` quite prominently,
-as these are important for [CDLaTeX].
-Plus, putting `'` and `"` on this layer circumvents the difficult to hit key on the base layer.
-
-## Layer 3
-
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-    |     |     |     |     |     |           |     | F7  | F8  | F9  | F10 |
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-    |     |     |     |     |     |           |     | F4  | F5  | F6  | F11 |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-    |     |     |     |     |     |     |     |     | F1  | F2  | F3  | F12 |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-    |     |     |     |     |     |     |     |     |     |     |     |     |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-
-So far, only the seldom used F-keys are present here.
-As should be obvious, this is the least developed layer,
-and also the one that'll probably change the most in the future.
-Currently, I'm thinking of putting some XMonad specific bindings on here,
-which could even to free up the Super key to be used inside of Emacs
-for certain things—that would certainly be a worthwhile experiment.
-Other thoughts include things like volume and brightness controls,
-although this is less critical since my laptop keyboard is never far away.
-
-## Other features
-
-There are some features that aren't necessarily reflected in the keys themselves,
-yet are quite essential for day-to-day use.
-The TL;DR can be found in [rules.mk][./rules.mk].
-
-### [Key overrides][qmk:key-overrides]
-
-Quoting from the documentation
-
-> Key overrides allow you to override modifier-key combinations to send a different modifier-key combination
-> or perform completely custom actions.
-
-Some keys on the keyboard are quite hard to hit.
-On the default layout,
-one of these turns out to be the Tab key,
-which is nonetheless important in a lot of situations.
-Conveniently, Emacs interprets `C-i` as Tab, so there is less need to actually hit the "real" key.
-However, not all programs are quite so understanding—or old, I guess.
-With key overrides, one can send a real `TAB` whenever `C-i` is pressed;
-no special convention on how to interpret certain key chords required!
-I also rebound `C-m` to `RET` (with the same justification), and `S-BSP` to `DEL`.
-
-This is one of those features that I didn't know I needed,
-yet now couldn't live without anymore.
-I'm definitely looking forward to discovering new and interesting ways of using this!
-
-### [Autocorrect][qmk:autocorrect]
-
-This is a quaint little feature: auto-correct inside of your keyboard's firmware!
-I promise that it's not as bad as it sounds.
-It does not work automatically, thankfully, but is based off a given list of replacements.
-For example,
-
-    widht -> width
-
-would fire anytime one writes `widht`, which then gets replaced by `width`.
-This is based on (a trie of) the most recently pressed keys,
-so whenever one actually wants to write `widht`
-all that's needed is pressing, for example, any modifier during the insertion.
-
-As I've really just been trying this out for a laugh, my current word list is quite short:
-
-    :alot       ->  a lot
-    accesories  ->  accessories
-    accomodate  ->  accommodate
-    alledge     ->  allege
-
-In general,
-I think the solution to stop misspelling a word is not to remap key sequences on the firmware level,
-but to—you know—learn how to spell that word.
-Still,
-I can imagine at least one or two use-cases where something like this could be useful,
-so I figured it might be nice to make people aware of this features' existence.
-
-In addition—as I've found out on three separate occasions so far—using the words "auto-correct, but in firmware"
-makes people stare in utter disbelief and/or disgust at your keyboard.
-That alone makes this feature worth it.
-
-### [Caps Word][qmk:caps-word]
-
-Caps Word is a clever alternative to Caps Lock,
-which I enable by pressing both Shift keys together.
-After that,
-all of the letter keys are shifted,
-and `-` becomes `_`
-until a different key (excluding common sense ones like backspace) is pressed.
-This is very useful for, e.g.,
-writing long constants,
-as these tend to have capital names separated with underscores:
-writing `BOTH_SHIFTS_TURNS_ON_CAPS_WORD` has never been easier!
-
-One thing to note is that,
-while layer switching works just fine in "Caps Word mode",
-the [Tri Layer][qmk:tri-layer] feature does not seem to play nicely with it;
-i.e., the mode gets disabled when switching to these layers.
-This is also the reason why I have an explicit LOWER, RAISE, and ADJUST setup,
-instead of just using Tri Layer.
-One could fiddle with the `caps_word_press_user` callback,
-but it seemed much easier to just create one additional layer toggle instead.
-I haven't looked at how hard it would be to hack this into Caps Word,
-so maybe this is a future pull request.
-
-[CDLaTeX]: https://github.com/cdominik/cdlatex
-[colemak-dh]: https://colemakmods.github.io/mod-dh/
-[emacs:paredit]: https://paredit.org/
-[emacs:puni]: https://github.com/AmaiKinono/puni
-[qmk:autocorrect]: https://docs.qmk.fm/#/feature_autocorrect
-[qmk:caps-word]: https://docs.qmk.fm/#/feature_caps_word
-[qmk:key-overrides]: https://docs.qmk.fm/#/feature_key_overrides
-[qmk:macros]: https://docs.qmk.fm/#/feature_macros
-[qmk:mod-tap]: https://docs.qmk.fm/#/mod_tap
-[qmk:repeat-key]: https://docs.qmk.fm/#/feature_repeat_key
-[qmk:slotthe:tapdances]: https://github.com/slotThe/qmk_firmware/blob/keyboardio/atreus/slotThe/keyboards/keyboardio/atreus/keymaps/slotThe/keymap.c#L187
-[qmk:tap-dance]: https://docs.qmk.fm/#/feature_tap_dance
-[qmk:tri-layer]: https://docs.qmk.fm/#/feature_tri_layer
-[x11:clipboard]: https://www.uninformativ.de/blog/postings/2017-04-02/0/POSTING-en.html
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/rules.mk b/keyboards/keyboardio/atreus/keymaps/slotthe/rules.mk
deleted file mode 100644
index b603193f858..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-TAP_DANCE_ENABLE    = yes
-KEY_OVERRIDE_ENABLE = yes
-AUTOCORRECT_ENABLE  = yes
-CAPS_WORD_ENABLE    = yes
-REPEAT_KEY_ENABLE   = yes
-
-LTO_ENABLE      = yes
-COMMAND_ENABLE  = no
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
deleted file mode 100644
index dde786cd309..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,119 +0,0 @@
- /* Copyright 2020 Ian Sterling 
-  * 
-  * 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
-
-// Xyverz's Keyboardio Atreus keymap
-
-enum layer_names {
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  ADJUST
-};
-
-// Adding macros to make the keymaps below much easier to read.
-#define SFTSCLN SFT_T(KC_SCLN)
-#define SFTZED SFT_T(KC_Z)
-#define ALTENT ALT_T(KC_ENT)
-#define ESCTRL CTL_T(KC_ESC)
-#define TABALT ALT_T(KC_TAB)
-#define DELGUI GUI_T(KC_DEL)
-#define MACLOCK LGUI(LCTL(KC_Q))
-#define WINLOCK LGUI(KC_L)
-#define ADJUST MO(_ADJUST)
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Dvorak Layer with Command key on left thumb instead of Control
-	,----------------------------------.              ,----------------------------------.
-	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|SFT/ ;|   Q  |   J  |   K  |   X  | Home || End  |   B  |   M  |   W  |   V  |SFT/ Z|
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp | LGUI ||ALTENT|  Spc | RAISE|   -  |   /  |   \  |
-	`-----------------------------------------'`-----------------------------------------' */
-  [_DVORAK] = LAYOUT(
-    KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L   ,
-    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S   ,
-    SFTSCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_HOME, KC_END,  KC_B,    KC_M,    KC_W,    KC_V,    SFTZED ,
-    ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, DELGUI,  ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_SLSH, KC_BSLS
-  ),
-
-  /* LOWER Layer
-	,----------------------------------.              ,----------------------------------.
-	|   !  |   @  |   #  |   $  |   %  |              |   ^  |   &  |   *  |   (  |   )  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| CAPS |      |  UP  |      | Home |              | PgDn |      |   +  |   {  |   }  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|      | Left | Down | Right| End  |MacLck||WinLck| PgUp | Mute | Vol- | Vol+ |      |
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|   ~  |      |      |      | Del  |      ||      | Ins  |      |      |      |      |
-	`-----------------------------------------'`-----------------------------------------'*/
-  [_LOWER] = LAYOUT(
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-    KC_CAPS, _______, KC_UP,   _______, KC_HOME,                   KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  MACLOCK, WINLOCK, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-    KC_TILD, KC_LEFT, KC_RGHT, _______, KC_DEL,  _______, _______, KC_INS,  _______, KC_UP,   KC_DOWN, _______
-  ),
-
-  /* RAISE Layer
-	,----------------------------------.              ,----------------------------------.
-	|   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| CAPS |      |  UP  |      | Home |              | PgDn |      |   =  |   [  |   ]  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|      | Left | Down | Right| End  |MacLck||WinLck| PgUp | Prev | Play | Next |      |
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|   `  |      |      |      | Del  |      ||      | Ins  |      |      |      |      |
-	`-----------------------------------------'`-----------------------------------------'*/
-  [_RAISE] = LAYOUT(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0   ,
-    KC_CAPS, _______, KC_UP,   _______, KC_HOME,                   KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  MACLOCK, WINLOCK, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, _______,
-    KC_GRV,  KC_LEFT, KC_RGHT, _______, KC_DEL,  _______, _______, KC_INS,  _______, KC_UP,   KC_DOWN, _______
-  ),
-
-  /* ADJUST Layer
-	,----------------------------------.              ,----------------------------------.
-	|  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  | F10  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|  F11 |      |      |      |      |              |      | PrSc | ScLk | Paus | F12  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|      |      |      |      |      |      ||      |      |      |      |      |      |
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|      |      |      |      |      |      ||      |      |      |      |      |QKBOOT|
-	`-----------------------------------------'`-----------------------------------------'*/
-  [_ADJUST] = LAYOUT(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
-    KC_F11,  _______, _______, _______, _______,                   _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 ,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
-  ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
\ No newline at end of file
diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/readme.md b/keyboards/keyboardio/atreus/keymaps/xyverz/readme.md
deleted file mode 100644
index f9749bb3bd9..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Xyverz's Keyboardio Atreus Keymap
-
-## About this keymap:
-
-This is the first iteration of my Keyboardio Atreus keymap. This is entirely based on my original Atreus keymap
-with a few changes added to reflect the extra two keys, and a code update to current standards.
-
-I'm using MOD_TAP quite a bit in this keymap. On all layers, R4 pinky keys use mod-tap and are SHIFT when held
-and their normal keys when tapped. In addition, ESC and TAB are also set as Ctrl and ALT respectively when held,
-and Enter/ALT on the right thumb key for all alpha layers.
-
-I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
-
-Recently added: Documentation, Formatting, and another Dvorak layer that has Command on the left thumb, instead of
-Control.
-
-## Still to do:
-
- * Enjoy this revision; figure out new things later.
-
-### Layer 0: Dvorak layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|SFT/ ;|   Q  |   J  |   K  |   X  | Home || End  |   B  |   M  |   W  |   V  |SFT/ Z|
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp | LCTL ||ALTENT|  Spc | RAISE|   -  |   /  |   \  |
-	`-----------------------------------------'`-----------------------------------------'
-
-### Layer 1: QWERTY layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   Q  |   W  |   E  |   R  |   T  |              |   Y  |   U  |   I  |   O  |   P  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   S  |   D  |   F  |   G  |              |   H  |   J  |   K  |   L  |   ;  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|SFT/ Z|   X  |   C  |   V  |   B  | Home || End  |   N  |   M  |   ,  |   .  |SFT/ /|
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp | LCTL ||ALTENT|  Spc | RAISE|   -  |   '  |   \  |
-	`-----------------------------------------'`-----------------------------------------'
-	 
-### Layer 2: Colemak layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   Q  |   W  |   F  |   P  |   G  |              |   J  |   L  |   U  |   Y  |   L  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   R  |   S  |   T  |   D  |              |   H  |   N  |   E  |   I  |   S  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|SFT/ Z|   X  |   C  |   V  |   B  | Home || End  |   K  |   M  |   ,  |   .  |SFT/ /|
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp | LCTL ||ALTENT|  Spc | RAISE|   -  |   '  |   \  |
-	`-----------------------------------------'`-----------------------------------------'
-
-### Layer 3: Dvorak for Mac layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|SFT/ ;|   Q  |   J  |   K  |   X  | Home || End  |   B  |   M  |   W  |   V  |SFT/ Z|
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|  Esc |  Tab |  GUI | LOWER| BkSp | LGUI ||ALTENT|  Spc | RAISE|   -  |   /  |   \  |
-	`-----------------------------------------'`-----------------------------------------'
-
-### Layer 4: LOWER layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   !  |   @  |   #  |   $  |   %  |              |   ^  |   &  |   *  |   (  |   )  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| CAPS |      |  UP  |      | Home |              | PgDn |      |   +  |   {  |   }  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|      | Left | Down | Right| End  |      ||      | PgUp | Mute | Vol- | Vol+ |      |
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|   ~  |      |      |      | Del  |      ||      | Ins  |      |      |      |      |
-	`-----------------------------------------'`-----------------------------------------'
-
-
-### Layer 5: RAISE layer
-
-	,----------------------------------.              ,----------------------------------.
-	|   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	| CAPS |      |  UP  |      | Home |              | PgDn |      |   =  |   [  |   ]  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|      | Left | Down | Right| End  |MacLck||      | PgUp | Prev | Play | Next |      |
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|   `  |      |      |      | Del  |      ||      | Ins  |      |      |      |      |
-	`-----------------------------------------'`-----------------------------------------'
-
-### Layer 6: ADJUST layer
-
-	,----------------------------------.              ,----------------------------------.
-	|  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  | F10  |
-	|------+------+------+------+------|              |------+------+------+------+------|
-	|  F11 |      |      |      |      |              |      | PrSc | ScLk | Paus | F12  |
-	|------+------+------+------+------+------.,------+------+------+------+------+------|
-	|      |QWERTY|COLEMK|DVORAK|DVORMC|      ||      |      |      |      |      |      |
-	|------+------+------+------+------+------||------+------+------+------+------+------|
-	|      |      |      |      |      |      ||      |      |      |      |      | RESET|
-	`-----------------------------------------'`-----------------------------------------'
-
diff --git a/keyboards/keyboardio/model01/config.h b/keyboards/keyboardio/model01/config.h
index 2e4101537fe..ec05a34c493 100644
--- a/keyboards/keyboardio/model01/config.h
+++ b/keyboards/keyboardio/model01/config.h
@@ -17,59 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
 /* key matrix size; rows are doubled for split */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
-
-/* RGB matrix constants */
-#define RGB_MATRIX_LED_COUNT 64
-
-// 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
-// #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
diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/info.json
index 6d2ca5ceb1a..fd17535be4b 100644
--- a/keyboards/keyboardio/model01/info.json
+++ b/keyboards/keyboardio/model01/info.json
@@ -9,7 +9,104 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "custom"
+    "animations": {
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_val": true,
+      "band_pinwheel_sat": true,
+      "band_pinwheel_val": true,
+      "band_spiral_sat": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true
+    },
+    "driver": "custom",
+    "layout": [
+        {"matrix": [3, 7], "x": 3, "y": 35, "flags": 4},
+        {"matrix": [2, 7], "x": 0, "y": 26, "flags": 4},
+        {"matrix": [1, 7], "x": 0, "y": 17, "flags": 4},
+        {"matrix": [0, 7], "x": 0, "y": 6, "flags": 4},
+        {"matrix": [0, 6], "x": 14, "y": 5, "flags": 4},
+        {"matrix": [1, 6], "x": 15, "y": 16, "flags": 4},
+        {"matrix": [2, 6], "x": 16, "y": 25, "flags": 4},
+        {"matrix": [3, 6], "x": 17, "y": 34, "flags": 4},
+        {"matrix": [3, 5], "x": 31, "y": 29, "flags": 4},
+        {"matrix": [2, 5], "x": 31, "y": 19, "flags": 4},
+        {"matrix": [1, 5], "x": 30, "y": 11, "flags": 4},
+        {"matrix": [0, 5], "x": 30, "y": 1, "flags": 4},
+        {"matrix": [0, 4], "x": 45, "y": 0, "flags": 4},
+        {"matrix": [1, 4], "x": 45, "y": 8, "flags": 4},
+        {"matrix": [2, 4], "x": 46, "y": 17, "flags": 4},
+        {"matrix": [3, 4], "x": 46, "y": 27, "flags": 4},
+        {"matrix": [3, 3], "x": 60, "y": 27, "flags": 4},
+        {"matrix": [2, 3], "x": 60, "y": 18, "flags": 4},
+        {"matrix": [1, 3], "x": 60, "y": 9, "flags": 4},
+        {"matrix": [0, 3], "x": 60, "y": 0, "flags": 4},
+        {"matrix": [0, 2], "x": 74, "y": 2, "flags": 4},
+        {"matrix": [1, 2], "x": 74, "y": 11, "flags": 4},
+        {"matrix": [2, 2], "x": 75, "y": 20, "flags": 4},
+        {"matrix": [3, 2], "x": 74, "y": 28, "flags": 4},
+        {"matrix": [2, 1], "x": 89, "y": 30, "flags": 4},
+        {"matrix": [1, 1], "x": 89, "y": 19, "flags": 4},
+        {"matrix": [0, 1], "x": 89, "y": 7, "flags": 4},
+        {"matrix": [0, 0], "x": 70, "y": 38, "flags": 1},
+        {"matrix": [1, 0], "x": 82, "y": 41, "flags": 1},
+        {"matrix": [2, 0], "x": 93, "y": 45, "flags": 1},
+        {"matrix": [3, 0], "x": 104, "y": 50, "flags": 1},
+        {"matrix": [3, 1], "x": 74, "y": 64, "flags": 1},
+        {"matrix": [7, 6], "x": 149, "y": 64, "flags": 1},
+        {"matrix": [7, 7], "x": 119, "y": 50, "flags": 1},
+        {"matrix": [6, 7], "x": 130, "y": 45, "flags": 1},
+        {"matrix": [5, 7], "x": 141, "y": 41, "flags": 1},
+        {"matrix": [4, 7], "x": 153, "y": 38, "flags": 1},
+        {"matrix": [4, 6], "x": 134, "y": 7, "flags": 4},
+        {"matrix": [5, 6], "x": 134, "y": 19, "flags": 4},
+        {"matrix": [6, 6], "x": 134, "y": 30, "flags": 4},
+        {"matrix": [7, 5], "x": 149, "y": 28, "flags": 4},
+        {"matrix": [6, 5], "x": 148, "y": 20, "flags": 4},
+        {"matrix": [5, 5], "x": 149, "y": 11, "flags": 4},
+        {"matrix": [4, 5], "x": 149, "y": 2, "flags": 4},
+        {"matrix": [4, 4], "x": 163, "y": 0, "flags": 4},
+        {"matrix": [5, 4], "x": 163, "y": 9, "flags": 4},
+        {"matrix": [6, 4], "x": 163, "y": 18, "flags": 4},
+        {"matrix": [7, 4], "x": 163, "y": 27, "flags": 4},
+        {"matrix": [7, 3], "x": 177, "y": 27, "flags": 4},
+        {"matrix": [6, 3], "x": 177, "y": 17, "flags": 4},
+        {"matrix": [5, 3], "x": 178, "y": 8, "flags": 4},
+        {"matrix": [4, 3], "x": 178, "y": 0, "flags": 4},
+        {"matrix": [4, 2], "x": 193, "y": 1, "flags": 4},
+        {"matrix": [5, 2], "x": 193, "y": 11, "flags": 4},
+        {"matrix": [6, 2], "x": 192, "y": 19, "flags": 4},
+        {"matrix": [7, 2], "x": 192, "y": 29, "flags": 4},
+        {"matrix": [7, 1], "x": 206, "y": 34, "flags": 4},
+        {"matrix": [6, 1], "x": 207, "y": 25, "flags": 4},
+        {"matrix": [5, 1], "x": 208, "y": 16, "flags": 4},
+        {"matrix": [4, 1], "x": 209, "y": 5, "flags": 4},
+        {"matrix": [4, 0], "x": 224, "y": 6, "flags": 4},
+        {"matrix": [5, 0], "x": 223, "y": 17, "flags": 4},
+        {"matrix": [6, 0], "x": 223, "y": 26, "flags": 4},
+        {"matrix": [7, 0], "x": 220, "y": 35, "flags": 4}
+    ]
   },
   "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/config.h b/keyboards/keyboardio/model01/keymaps/pugmajere/config.h
deleted file mode 100644
index ef75a034de9..00000000000
--- a/keyboards/keyboardio/model01/keymaps/pugmajere/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Ryan Anderson <ryan@michonline.com> (@pugmajere)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define USB_MAX_POWER_CONSUMPTION 500
-
-#define RGBLIGHT_LIMIT_VAL 175
-
-#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_SAT
-#undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-/* #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON */
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-/* #undef ENABLE_RGB_MATRIX_DUAL_BEACON */
-/* #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON */
-/* #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS */
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#undef ENABLE_RGB_MATRIX_HUE_BREATHING
-#undef ENABLE_RGB_MATRIX_HUE_PENDULUM
-#undef ENABLE_RGB_MATRIX_HUE_WAVE
-#undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is undefd
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is undefd
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_MULTISPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c b/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c
deleted file mode 100644
index 9520a116fd8..00000000000
--- a/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Copyright 2022 Ryan Anderson <ryan@michonline.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
-
-/* layer constants */
-enum {
-    DEF = 0,
-    FUN,
-};
-
-enum custom_keycode {
-    MACRO_CTRL_PAGE_UP = SAFE_RANGE,
-    KC_MT_LCBRC,
-    KC_MT_RCBRC,
-    KC_MT_LPAR,
-    KC_MT_RPAR,
-    MACRO_KVM_1,
-    MACRO_KVM_2,
-    MACRO_KVM_3,
-    MACRO_KVM_4,
-    MACRO_KVM_TG,
-};
-
-// Work around limitations in mod-tapping
-static uint16_t space_cadet_control_timer    = 0;
-static bool     space_cadet_key_pressed_flag = false;
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[DEF] = LAYOUT(
-  QK_BOOT  , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                      KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , MACRO_CTRL_PAGE_UP,
-  KC_GRV , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , RGB_MOD,    MACRO_KVM_TG, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_EQL ,
-  LCTL_T(KC_PGUP), KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_TAB ,    KC_ENT , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
-  KC_PGDN, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_ESC ,    KC_RALT, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_MINS,
-                                  LCTL_T(KC_LBRC),                                 RCTL_T(KC_RBRC),
-                                            KC_BSPC,                                     KC_SPC ,
-                                          KC_MT_LCBRC,                              KC_MT_RCBRC,
-                                             KC_MT_LPAR,                           KC_MT_RPAR,
-                                                   MO(FUN),                         MO(FUN)
-  ),
-[FUN] = LAYOUT(
-  _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-  KC_TAB , _______, KC_MS_U, KC_WH_U, KC_BTN3, MACRO_KVM_1, RGB_TOG,    KC_MPRV, KC_MNXT, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_F12 ,
-  KC_HOME, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, MACRO_KVM_2, RGB_SPI,    KC_MPLY, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, _______,
-  KC_END , KC_PSCR, KC_INS , KC_WH_D, KC_BTN2, MACRO_KVM_4, RGB_SPD,    _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BSLS, KC_PIPE,
-                                         _______,                                 _______,
-                                            KC_DEL ,                           KC_ENT ,
-                                               _______,                     _______,
-                                                  _______,               _______,
-                                      _______,                                        _______
-  )
-};
-
-/* template for new layouts:
-LAYOUT(
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-                                         _______,                                 _______,
-                                            _______,                           _______,
-                                               _______,                     _______,
-                                                  _______,               _______,
-                                      _______,                                        _______
-  )
-*/
-// clang-format on
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        space_cadet_key_pressed_flag = true;
-    }
-    switch (keycode) {
-        case MACRO_CTRL_PAGE_UP:
-            if (record->event.pressed) {
-                // send some data
-                SEND_STRING(SS_LCTL(SS_TAP(X_PGUP)));
-            } else {
-                // when keycode MACRO_CTRL_PAGE_UP is pressed
-            }
-            break;
-
-            // These next two cases duplicate mod-tap functionality by hand to
-            // work around the lack of support for shifted/modded keys as
-            // "tap" side of things.
-        case KC_MT_LCBRC:
-            if (record->event.pressed) {
-                space_cadet_control_timer    = timer_read();
-                space_cadet_key_pressed_flag = false;
-                register_mods(MOD_BIT(KC_LGUI));
-            } else {
-                unregister_mods(MOD_BIT(KC_LGUI));
-                if (timer_elapsed(space_cadet_control_timer) < TAPPING_TERM && !space_cadet_key_pressed_flag) {
-                    tap_code16(LSFT(KC_LBRC));
-                }
-            }
-            return false;
-            break;
-        case KC_MT_RCBRC:
-            if (record->event.pressed) {
-                space_cadet_control_timer    = timer_read();
-                space_cadet_key_pressed_flag = false;
-                register_mods(MOD_BIT(KC_LALT));
-            } else {
-                unregister_mods(MOD_BIT(KC_LALT));
-                if (timer_elapsed(space_cadet_control_timer) < TAPPING_TERM && !space_cadet_key_pressed_flag) {
-                    tap_code16(LSFT(KC_RBRC));
-                }
-            }
-            return false;
-            break;
-        case KC_MT_LPAR:
-            if (record->event.pressed) {
-                space_cadet_control_timer    = timer_read();
-                space_cadet_key_pressed_flag = false;
-                register_mods(MOD_BIT(KC_LSFT));
-            } else {
-                unregister_mods(MOD_BIT(KC_LSFT));
-                if (timer_elapsed(space_cadet_control_timer) < TAPPING_TERM && !space_cadet_key_pressed_flag) {
-                    tap_code16(LSFT(KC_9));
-                }
-            }
-            return false;
-            break;
-        case KC_MT_RPAR:
-            if (record->event.pressed) {
-                space_cadet_control_timer    = timer_read();
-                space_cadet_key_pressed_flag = false;
-                register_mods(MOD_BIT(KC_RSFT));
-            } else {
-                unregister_mods(MOD_BIT(KC_RSFT));
-                if (timer_elapsed(space_cadet_control_timer) < TAPPING_TERM && !space_cadet_key_pressed_flag) {
-                    tap_code16(LSFT(KC_0));
-                }
-            }
-            return false;
-            break;
-        case MACRO_KVM_1:
-            if (record->event.pressed) {
-                tap_code(KC_SCRL);
-                tap_code(KC_SCRL);
-                tap_code(KC_1);
-            }
-            break;
-        case MACRO_KVM_2:
-            if (record->event.pressed) {
-                tap_code(KC_SCRL);
-                tap_code(KC_SCRL);
-                tap_code(KC_2);
-            }
-            break;
-        case MACRO_KVM_3:
-            if (record->event.pressed) {
-                tap_code(KC_SCRL);
-                tap_code(KC_SCRL);
-                tap_code(KC_3);
-            }
-            break;
-        case MACRO_KVM_4:
-            if (record->event.pressed) {
-                tap_code(KC_SCRL);
-                tap_code(KC_SCRL);
-                tap_code(KC_4);
-            }
-            break;
-        case MACRO_KVM_TG:
-            if (record->event.pressed) {
-                register_code(KC_LSFT);
-                tap_code(KC_NUM);
-                tap_code(KC_NUM);
-                unregister_code(KC_LSFT);
-                tap_code(KC_LCTL);
-            }
-            break;
-    }
-    return true;
-};
-
-/* vim: set ts=2 sw=2 et: */
diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/readme.md b/keyboards/keyboardio/model01/keymaps/pugmajere/readme.md
deleted file mode 100644
index a985158c5b0..00000000000
--- a/keyboards/keyboardio/model01/keymaps/pugmajere/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# pugmajere's fairly modified version of the default keymap
-
-This is fairly modified, but roughly follows the original default
-keymap in spirit.
-
-- The num lock layer is removed.
-- The "any" key is replace with RALT.
-- The thumb keys are converted into combo keys.
-- Page-Up is a combo key with LCTRL.
-- The NUMLOCK key is replaced with LCTRL-PGUP (for bouncing through
-  browser tabs)
-- Mouse scroll keys are added.
-- Some KVM control sequences are worked into a few open slots in the
-  keymap. (FN-[tgb])
-- QMK-standard debouncing is enabled.
-- A bunch of RGB Matrix modes are turned off to save space.
-
-Quite possibly something else that I'm forgetting about.
-
-
diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/rules.mk b/keyboards/keyboardio/model01/keymaps/pugmajere/rules.mk
deleted file mode 100644
index 4db69c92e2d..00000000000
--- a/keyboards/keyboardio/model01/keymaps/pugmajere/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEBOUNCE_TYPE = sym_defer_pk
diff --git a/keyboards/keyboardio/model01/keymaps/tw1t611/config.h b/keyboards/keyboardio/model01/keymaps/tw1t611/config.h
deleted file mode 100644
index 8ab9d8b025a..00000000000
--- a/keyboards/keyboardio/model01/keymaps/tw1t611/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 James Laird-Wah
- *
- * 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
-
-/* place overrides here */
diff --git a/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c b/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c
deleted file mode 100644
index 900a3f29aa9..00000000000
--- a/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-/* layer constants */
-enum {
-  DEF = 0,
-  MOD,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[DEF] = LAYOUT(
-  _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                      KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , DE_SS  ,
-  KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , RGB_MOD,    KC_MUTE, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , DE_ADIA,
-  KC_TAB , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , DE_SECT,    _______, KC_H   , KC_J   , KC_K   , KC_L   , DE_SLSH, DE_ODIA,
-  DE_PIPE, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , _______,    _______, KC_N   , KC_M   , DE_COMM, DE_DOT , DE_MINS, DE_UDIA,
-                                         KC_LALT,                                 KC_LGUI,
-                                            KC_SPC ,                           KC_ENT ,
-                                               KC_LSFT,                     MO(MOD),
-                                                  KC_BSPC,               KC_DEL ,
-                                      KC_LCTL,                                        KC_RCTL
-  ),
-[MOD] = LAYOUT(
-  KC_F12 , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-  DE_CIRC, DE_QUOT, DE_DQUO, DE_LCBR, DE_RCBR, DE_GRV , RGB_TOG,    _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END , DE_EQL , DE_PERC,
-  DE_TILD, DE_EXLM, DE_DLR , DE_LPRN, DE_RPRN, DE_AMPR, _______,    _______, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, DE_QUES, DE_ASTR,
-  DE_BSLS, DE_HASH, DE_LABK, DE_LBRC, DE_RBRC, DE_RABK, _______,    QK_BOOT, DE_AT  , DE_EURO, DE_SCLN, DE_COLN, DE_UNDS, DE_PLUS,
-                                         _______,                                 _______,
-                                            _______,                           _______,
-                                               _______,                     _______,
-                                                  _______,               _______,
-                                      _______,                                        _______
-  )
-};
-
-/* template for new layouts:
-LAYOUT(
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-                                         _______,                                 _______,
-                                            _______,                           _______,
-                                               _______,                     _______,
-                                                  _______,               _______,
-                                      _______,                                        _______
-  )
-*/
-
-/* vim: set ts=2 sw=2 et: */
diff --git a/keyboards/keyboardio/model01/keymaps/tw1t611/readme.md b/keyboards/keyboardio/model01/keymaps/tw1t611/readme.md
deleted file mode 100644
index b9d728831ce..00000000000
--- a/keyboards/keyboardio/model01/keymaps/tw1t611/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Keymap for Keyboardio's Model01 by tw1t611
-
-Features:
-- german keymap
-- vim optimized
diff --git a/keyboards/keyboardio/model01/leds.c b/keyboards/keyboardio/model01/leds.c
index 7e65134bd43..3fb502cb27d 100644
--- a/keyboards/keyboardio/model01/leds.c
+++ b/keyboards/keyboardio/model01/leds.c
@@ -45,37 +45,6 @@ void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b) {
 
 #ifdef RGB_MATRIX_ENABLE
 
-__attribute__ ((weak))
-led_config_t g_led_config = { {
-    {  27,  26,  20,  19,  12,  11,   4,   3 },
-    {  28,  25,  21,  18,  13,  10,   5,   2 },
-    {  29,  24,  22,  17,  14,   9,   6,   1 },
-    {  30,  31,  23,  16,  15,   8,   7,   0 },
-    {  60,  59,  52,  51,  44,  43,  37,  36 },
-    {  61,  58,  53,  50,  45,  42,  38,  35 },
-    {  62,  57,  54,  49,  46,  41,  39,  34 },
-    {  63,  56,  55,  48,  47,  40,  32,  33 }
-}, {
-    {   3,  35 }, {   0,  26 }, {   0,  17 }, {   0,   6 }, {  14,   5 }, {  15,  16 }, {  16,  25 }, {  17,  34 },
-    {  31,  29 }, {  31,  19 }, {  30,  11 }, {  30,   1 }, {  45,   0 }, {  45,   8 }, {  46,  17 }, {  46,  27 },
-    {  60,  27 }, {  60,  18 }, {  60,   9 }, {  60,   0 }, {  74,   2 }, {  74,  11 }, {  75,  20 }, {  74,  28 },
-    {  89,  30 }, {  89,  19 }, {  89,   7 }, {  70,  38 }, {  82,  41 }, {  93,  45 }, { 104,  50 }, {  74,  64 },
-    { 149,  64 }, { 119,  50 }, { 130,  45 }, { 141,  41 }, { 153,  38 }, { 134,   7 }, { 134,  19 }, { 134,  30 },
-    { 149,  28 }, { 148,  20 }, { 149,  11 }, { 149,   2 }, { 163,   0 }, { 163,   9 }, { 163,  18 }, { 163,  27 },
-    { 177,  27 }, { 177,  17 }, { 178,   8 }, { 178,   0 }, { 193,   1 }, { 193,  11 }, { 192,  19 }, { 192,  29 },
-    { 206,  34 }, { 207,  25 }, { 208,  16 }, { 209,   5 }, { 224,   6 }, { 223,  17 }, { 223,  26 }, { 220,  35 }
-}, {
-    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, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 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
-} };
-
-
 static struct {
   uint8_t b;
   uint8_t g;
diff --git a/keyboards/keycapsss/kimiko/glcdfont.c b/keyboards/keycapsss/kimiko/glcdfont.c
index 4c7e6862b6b..ff2f3bdcd55 100644
--- a/keyboards/keycapsss/kimiko/glcdfont.c
+++ b/keyboards/keycapsss/kimiko/glcdfont.c
@@ -1,5 +1,6 @@
 /* Copyright 2019 MechMerlin
  * Copyright 2020 @ben_roe (keycapsss.com)
+ * Copyright 2022 @oriaj3
  *
  * 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
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
deleted file mode 100644
index f52a0fecae0..00000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2019 MechMerlin
- * Copyright 2020 @ben_roe (keycapsss.com)
- * Copyright 2022 @oriaj3
- *
- * 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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c"
-// #define OLED_FONT_WIDTH 5
-// #define OLED_FONT_HEIGHT 7
-
-
-#ifdef RGB_MATRIX_ENABLE
-
-// The pin connected to the data pin of the LEDs
-#define WS2812_DI_PIN D3
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 60
-#define RGBLED_NUM 60
-#define RGB_MATRIX_SPLIT {30,30}
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_TRANSPORT_MIRROR
-
-
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 80 // limits maximum brightness of LEDs to 80 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_VAL_STEP 8
-#    define RGB_MATRIX_SPD_STEP 10
-
-
-
-//  ENABLES EFFECTS. See alls the effects -> https://github.com/samhocevar-forks/qmk-firmware/blob/master/docs/feature_rgb_matrix.md#rgb-matrix-effects
-#   define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
-#   define ENABLE_RGB_MATRIX_BAND_SPLIT
-#   define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#   define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#   define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-//#   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
-#  define ENABLE_RGB_MATRIX_SPLASH
-#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/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c b/keyboards/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c
deleted file mode 100644
index ff2f3bdcd55..00000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Copyright 2019 MechMerlin
- * Copyright 2020 @ben_roe (keycapsss.com)
- * Copyright 2022 @oriaj3
- *
- * 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 "progmem.h"
-
-// Corne 8x6 font
-// Online editor: https://helixfonteditor.netlify.com
-// or https://joric.github.io/qle/
-// See also: https://github.com/soundmonster/glcdfont_converter
-
-const unsigned char font[] PROGMEM = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x00, 0x13, 0x07, 0x08, 0x00, 0x00,
-    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-    0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-    0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-    0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 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, 0x04, 0x22, 0x52, 0xE2,
-    0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
-    0x22, 0x22, 0x42, 0x82, 0x02, 0x02,
-    0x22, 0x22, 0x02, 0x04, 0xF8, 0x00,
-    0x00, 0xF8, 0x04, 0x02, 0x02, 0x82,
-    0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
-    0x02, 0x82, 0x42, 0x22, 0x12, 0x22,
-    0x42, 0x82, 0x02, 0x04, 0xF8, 0x00,
-    0x00, 0xF8, 0xFC, 0xDE, 0xAE, 0x1E,
-    0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
-    0xDE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-    0xDE, 0xDE, 0xFE, 0xFC, 0xF8, 0x00,
-    0x00, 0xF8, 0xFC, 0xFE, 0xFE, 0x7E,
-    0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-    0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-    0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-    0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-    0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
-    0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80,
-    0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-    0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-    0x20, 0x20, 0x40, 0x40, 0x80, 0x80,
-    0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
-    0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
-    0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80,
-    0x1F, 0x1F, 0x0E, 0x1B, 0x11, 0xC0,
-    0x1F, 0x1F, 0x00, 0x1F, 0x1F, 0x06,
-    0x0C, 0xC6, 0x1F, 0x1F, 0x80, 0x5F,
-    0x1F, 0x00, 0x1F, 0x1F, 0x8E, 0x9B,
-    0x91, 0x80, 0x9F, 0x9F, 0x91, 0x1F,
-    0x00, 0x1F, 0x20, 0x44, 0x4A, 0x47,
-    0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
-    0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
-    0x44, 0x44, 0x40, 0x20, 0x1F, 0x00,
-    0x00, 0x1F, 0x20, 0x40, 0x41, 0x40,
-    0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
-    0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
-    0x4F, 0x41, 0x41, 0x20, 0x1F, 0x00,
-    0x00, 0x1F, 0x3F, 0x7B, 0x75, 0x78,
-    0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
-    0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
-    0x7B, 0x7B, 0x7F, 0x3F, 0x1F, 0x00,
-    0x00, 0x1F, 0x3F, 0x7F, 0x7E, 0x7F,
-    0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
-    0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
-    0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88,
-    0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
-    0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
-    0x23, 0x23, 0x55, 0x55, 0x88, 0x88,
-    0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
-    0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
-    0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88,
-    0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
-    0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
-    0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88,
-    0x00, 0x84, 0x87, 0x7D, 0x55, 0x57,
-    0x55, 0x7D, 0x87, 0x84, 0x00, 0x91,
-    0x95, 0x55, 0x55, 0x3F, 0x55, 0x55,
-    0x95, 0x91, 0x00, 0x08, 0x08, 0x08,
-    0x88, 0xFC, 0x0A, 0x09, 0x08, 0x08,
-    0x04, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-    0x20, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-    0xFC, 0xF8, 0x00, 0x00, 0xF8, 0x04,
-    0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x20,
-    0x04, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-    0x20, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-    0xFC, 0xF8, 0x00, 0x00, 0xF8, 0xFC,
-    0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F,
-    0xFE, 0x7E, 0xBE, 0xDE, 0xEE, 0xDE,
-    0xBE, 0x7E, 0xFE, 0xFC, 0xF8, 0x00,
-    0x7E, 0x7E, 0x70, 0x77, 0x77, 0x77,
-    0x70, 0x7E, 0x7E, 0x3F, 0x1F, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-    0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-    0x02, 0x02, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
-    0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
-    0x03, 0x03, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
-    0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
-    0x03, 0x02, 0x01, 0x01, 0x00, 0x00,
-};
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c b/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
deleted file mode 100644
index 243a7d013d4..00000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/* Copyright 2019 Leo Batyuk
- * Copyright 2020 Drashna Jaelre <@drashna>
- * Copyright 2020 @ben_roe (keycapsss.com)
- * Copyright 2022 @oriaj3
- *
- * 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,
-    _LOWER,
-    _RAISE,
-    _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  |  -        |
- * |---------+------+------+------+------+------|                    |------+------+------+------+------+-----------|
- * |  LShift |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '        |
- * |---------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+-----------|
- * |  LCTRL  |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift/Enter|
- * `-------------------------------------------|       /     \      \-----------------------------------------------'
- *                 | LCTRL| LGUI | LALT |LOWER| Space /       \Enter \  |RAISE |BackSP| RGUI | RALT |
- *                 `----------------------------------'       '------------------------------------'
- */
-
- [_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_LSFT, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LCTL, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
-                      KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,   KC_ENT,   RAISE,   KC_BSPC, KC_RGUI, KC_RALT
-),
-/* LOWER
- * ,-------------------------------------------.                    ,-----------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
- * |--------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |        |  1   |  2   |  3   |  4   |  5   |                    |  6   |  7   |  8   |  9   |   0  | F12  |
- * |--------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `    |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   ~  |
- * |--------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |        |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |   \  |
- * `-------------------------------------------|       /     \      \-----------------------------------------------'
- *                 | LCTRL| LGUI | LALT |LOWER| Space /       \Enter \  |RAISE |BackSP| RGUI | RALT |
- *                 `----------------------------------'       '------------------------------------'
- */
-
-[_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_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_BSLS,
-                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                 | LCTRL| LGUI | LALT |LOWER| Space /       \Enter \  |RAISE |BackSP| RGUI | RALT |
- *                 `----------------------------------'       '------------------------------------'
- */
-
-[_RAISE] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______,
-    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,   _______, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-                      _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______
-),
-/* ADJUST (Press LOWER and RAISE together)
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |QK_BOOT |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |RGB ON| HUE+ | SAT+ | VAL+ |      |      |                    | PREV | PLAY | NEXT |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | MODE | HUE- | SAT- | VAL- |      |      |-------.    ,-------| VOL+ | MUTE | VOL- |      |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                 |LCTRL| LGUI | LALT |LOWER| Space /       \Enter \  |RAISE |BackSP| RGUI | RALT |
- *                 `----------------------------------'       '------------------------------------'
- */
-
-[_ADJUST] = LAYOUT(
-    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                   KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                   KC_VOLU, KC_MUTE, KC_VOLD, 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) {
-    state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-    return state;
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    } else {
-        return OLED_ROTATION_270;
-    }
-}
-
-void render_space(void) {
-    oled_write_P(PSTR("     "), false);
-}
-
-void render_mod_status_gui_alt(uint8_t modifiers) {
-    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
-    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
-    static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
-    static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
-
-    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
-    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
-    static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
-    static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_1, false);
-    } else {
-        oled_write_P(gui_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_1, false);
-    } else {
-        oled_write_P(alt_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_2, false);
-    } else {
-        oled_write_P(gui_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_2, false);
-    } else {
-        oled_write_P(alt_off_2, false);
-    }
-}
-
-void render_mod_status_ctrl_shift(uint8_t modifiers) {
-    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
-    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
-    static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
-    static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
-
-    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
-    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
-    static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
-    static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_1, false);
-    } else {
-        oled_write_P(ctrl_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_1, false);
-    } else {
-        oled_write_P(shift_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_2, false);
-    } else {
-        oled_write_P(ctrl_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_2, false);
-    } else {
-        oled_write_P(shift_off_2, false);
-    }
-}
-
-void render_logo(void) {
-    static const char PROGMEM corne_logo[] = {
-        0xA0, 0xA1, 0xA2, 0xA3, 0xA4,
-        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0};
-    oled_write_P(corne_logo, false);
-    // oled_write_P(PSTR("Kimiko"), false);
-}
-
-void render_layer_state(void) {
-    static const char PROGMEM default_layer[] = {
-        0x20, 0x94, 0x95, 0x96, 0x20,
-        0x20, 0xb4, 0xb5, 0xb6, 0x20,
-        0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
-    static const char PROGMEM raise_layer[] = {
-        0x20, 0x97, 0x98, 0x99, 0x20,
-        0x20, 0xb7, 0xb8, 0xb9, 0x20,
-        0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
-    static const char PROGMEM lower_layer[] = {
-        0x20, 0x9a, 0x9b, 0x9c, 0x20,
-        0x20, 0xba, 0xbb, 0xbc, 0x20,
-        0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
-    static const char PROGMEM adjust_layer[] = {
-        0x20, 0x9d, 0x9e, 0x9f, 0x20,
-        0x20, 0xbd, 0xbe, 0xbf, 0x20,
-        0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
-    if(layer_state_is(_ADJUST)) {
-        oled_write_P(adjust_layer, false);
-    } else if(layer_state_is(_LOWER)) {
-        oled_write_P(lower_layer, false);
-    } else if(layer_state_is(_RAISE)) {
-        oled_write_P(raise_layer, false);
-    } else {
-        oled_write_P(default_layer, false);
-    }
-}
-
-void render_status_main(void) {
-    render_space();
-    render_space();
-    render_logo();
-    render_space();
-    render_layer_state();
-    render_space();
-    render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
-    render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-}
-
-void render_status_secondary(void) {
-    render_space();
-    render_space();
-    render_logo();
-    render_space();
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_status_secondary();
-    }
-    return false;
-}
-
-#endif
-
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    // Encoder on master side
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            // If the Default (QWERTY) layer is active
-            case _QWERTY:
-                // Arrow Up/Down
-                if (clockwise) {
-                    tap_code(KC_DOWN);
-                } else {
-                    tap_code(KC_UP);
-                }
-                break;
-
-            // If the RAISE layer is active
-            case _RAISE:
-                // Switch browser tabs
-                if (clockwise) {
-                    tap_code16(LCTL(KC_TAB));
-                } else {
-                    tap_code16(RCS(KC_TAB));
-                }
-                break;
-            // If the ADJUST layer is active
-            case _ADJUST:
-                // RGB brightness up/down
-                if (clockwise) {
-                    rgblight_decrease_val(); // tap_code(RGB_VAD);
-                } else {
-                    rgblight_increase_val(); // tap_code(RGB_VAI);
-                }
-                break;
-        }
-    }
-    // Encoder on slave side
-    else if (index == 1) {
-        switch (get_highest_layer(layer_state)) {
-            // If the Default (QWERTY) layer is active
-            case _QWERTY:
-                // Scroll by Word
-                if (clockwise) {
-                    tap_code16(LCTL(KC_RGHT));
-                } else {
-                    tap_code16(LCTL(KC_LEFT));
-                }
-                break;
-
-            // If the LOWER layer is active
-            case _LOWER:
-                // Volume up/down
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-                break;
-
-            // If the ADJUST layer is active
-            case _ADJUST:
-                // RGB hue up/down
-                if (clockwise) {
-                    // tap_code(RGB_HUI);
-                    rgblight_increase_hue();
-                } else {
-                    // tap_code(RGB_HUD);
-                    rgblight_decrease_hue();
-                }
-                break;
-        }
-    }
-    return false;
-}
-#endif // ENCODER_ENABLE
-
-
-
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
deleted file mode 100644
index 46cb8d8a947..00000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # ENables the use of one or more encoders
-RGBLIGHT_ENABLE = no      # Disable keyboard RGB underglow
-
-# LTO: Link Time Optimizations.
-# Reduce compiled size, but will automatically disable the legacy TMK Macros and Functions features.
-# This does not affect QMK Macros and Layers
-LTO_ENABLE = yes
-
-#ENABLE RGB MATRIX WITH DRIVER WS2812
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = ws2812
-
-#DEFINE SPLIT KEYBOARD AND SPLIT TRANSPORT MIRROR
-SPLIT_KEYBOARD = yes
-
-#DEACTIVATED FOR MEMORY SAVING
-MOUSEKEY_ENABLE = no
-CONSOLE_ENABLE = no
diff --git a/keyboards/keycapsss/kimiko/kimiko.c b/keyboards/keycapsss/kimiko/kimiko.c
index ce5703d86bf..c99a966603a 100644
--- a/keyboards/keycapsss/kimiko/kimiko.c
+++ b/keyboards/keycapsss/kimiko/kimiko.c
@@ -80,217 +80,4 @@ led_config_t g_led_config = { {
 #endif // RGB_MATRIX_ENABLE
 #endif // KEYBOARD_keycapsss_kimiko_rev1
 
-#ifdef KEYBOARD_keycapsss_kimiko_rev2
-enum layers {
-   _QWERTY,
-   _LOWER,
-   _RAISE,
-   _ADJUST
-};
-
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-// NOTE: Most of the OLED code was originally written by Soundmonster for the Corne,
-// and has been copied directly from `crkbd/soundmonster/keymap.c`
-
-void render_mod_status_gui_alt(uint8_t modifiers) {
-    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
-    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
-    static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
-    static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
-
-    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
-    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
-    static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
-    static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_1, false);
-    } else {
-        oled_write_P(gui_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_1, false);
-    } else {
-        oled_write_P(alt_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_2, false);
-    } else {
-        oled_write_P(gui_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_2, false);
-    } else {
-        oled_write_P(alt_off_2, false);
-    }
-}
-
-void render_mod_status_ctrl_shift(uint8_t modifiers) {
-    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
-    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
-    static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
-    static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
-
-    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
-    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
-    static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
-    static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_1, false);
-    } else {
-        oled_write_P(ctrl_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_1, false);
-    } else {
-        oled_write_P(shift_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_2, false);
-    } else {
-        oled_write_P(ctrl_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_2, false);
-    } else {
-        oled_write_P(shift_off_2, false);
-    }
-}
-
-
-void render_logo(void) {
-    static const char PROGMEM kimiko_logo[] = {
-        0xA0, 0xA1, 0xA2, 0xA3, 0xA4,
-        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0};
-    oled_advance_page(false);
-    oled_advance_page(false);
-    oled_write_P(kimiko_logo, false);
-    // oled_write_P(PSTR("Kimiko"), false);
-}
-
-void render_layer_state(void) {
-	static const char PROGMEM default_layer[] = {
-		0x20, 0x94, 0x95, 0x96, 0x20,
-		0x20, 0xb4, 0xb5, 0xb6, 0x20,
-		0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
-	static const char PROGMEM raise_layer[] = {
-		0x20, 0x97, 0x98, 0x99, 0x20,
-		0x20, 0xb7, 0xb8, 0xb9, 0x20,
-		0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
-	static const char PROGMEM lower_layer[] = {
-		0x20, 0x9a, 0x9b, 0x9c, 0x20,
-		0x20, 0xba, 0xbb, 0xbc, 0x20,
-		0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
-	static const char PROGMEM adjust_layer[] = {
-		0x20, 0x9d, 0x9e, 0x9f, 0x20,
-		0x20, 0xbd, 0xbe, 0xbf, 0x20,
-		0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
-
-	if(layer_state_is(_ADJUST)) {
-		oled_write_P(adjust_layer, false);
-	} else if(layer_state_is(_LOWER)) {
-		oled_write_P(lower_layer, false);
-	} else if(layer_state_is(_RAISE)) {
-		oled_write_P(raise_layer, false);
-	} else {
-		oled_write_P(default_layer, false);
-	}
-}
-
-void render_status_main(void) {
-    render_logo();
-    oled_advance_page(false);
-    render_layer_state();
-    oled_advance_page(false);
-    render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
-    render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-}
-
-bool oled_task_kb(void) {
-    if (!oled_task_user()) {
-        return false;
-    }
-
-    if (is_keyboard_master()) {
-        render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_logo();
-    }
-
-    return true;
-}
-#endif // OLED_ENABLE
-#endif // keyboard keycapsss_kimiko_rev2
 
diff --git a/keyboards/keycapsss/kimiko/readme.md b/keyboards/keycapsss/kimiko/readme.md
index 049d460d5c7..32c64010126 100644
--- a/keyboards/keycapsss/kimiko/readme.md
+++ b/keyboards/keycapsss/kimiko/readme.md
@@ -25,7 +25,7 @@ A split keyboard with 4x6 vertically staggered keys and a Kyria style thumb thum
 Make firmware .hex for this keyboard (after setting up your build environment):
 
 ```bash
-qmk compile -kb keycapsss/kimiko/rev2 -km rev2
+qmk compile -kb keycapsss/kimiko/rev2 -km default
 ```
 
 Use [QMK Toolbox](https://github.com/qmk/qmk_toolbox) to flash the firmware hex file to the keyboard controller.
diff --git a/keyboards/keycapsss/kimiko/rev2/info.json b/keyboards/keycapsss/kimiko/rev2/info.json
index 4c15d30a955..f595bd9cc42 100644
--- a/keyboards/keycapsss/kimiko/rev2/info.json
+++ b/keyboards/keycapsss/kimiko/rev2/info.json
@@ -1,195 +1,199 @@
 {
-    "keyboard_name": "Kimiko Rev2",
     "manufacturer": "Keycapsss",
-    "url": "https://keycapsss.com",
+    "keyboard_name": "Kimiko Rev2",
     "maintainer": "BenRoe",
-    "usb": {
-        "vid": "0x7983",
-        "pid": "0x4B69",
-        "device_version": "2.0.0"
+    "build": {
+        "lto": true
     },
+    "development_board": "promicro",
     "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "features": {
+        "encoder": true,
+        "nkro": true,
+        "oled": true
+    },
     "matrix_pins": {
         "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
     },
-    "features": {
-        "oled": true,
-        "encoder": true,
-        "nkro": true
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     },
-    "build": {
-        "lto": true
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            { "matrix": [0, 5], "x": 66, "y": 5, "flags": 4 },
+            { "matrix": [0, 4], "x": 53, "y": 4, "flags": 4 },
+            { "matrix": [0, 3], "x": 40, "y": 0, "flags": 4 },
+            { "matrix": [0, 2], "x": 26, "y": 4, "flags": 4 },
+            { "matrix": [0, 1], "x": 13, "y": 11, "flags": 4 },
+            { "matrix": [0, 0], "x": 0, "y": 11, "flags": 4 },
+            { "matrix": [1, 0], "x": 0, "y": 23, "flags": 4 },
+            { "matrix": [1, 1], "x": 13, "y": 23, "flags": 4 },
+            { "matrix": [1, 2], "x": 26, "y": 15, "flags": 4 },
+            { "matrix": [1, 3], "x": 40, "y": 12, "flags": 4 },
+            { "matrix": [1, 4], "x": 53, "y": 15, "flags": 4 },
+            { "matrix": [1, 5], "x": 66, "y": 17, "flags": 4 },
+            { "matrix": [2, 5], "x": 66, "y": 29, "flags": 4 },
+            { "matrix": [2, 4], "x": 53, "y": 27, "flags": 4 },
+            { "matrix": [2, 3], "x": 40, "y": 24, "flags": 4 },
+            { "matrix": [2, 2], "x": 26, "y": 27, "flags": 4 },
+            { "matrix": [2, 1], "x": 13, "y": 35, "flags": 4 },
+            { "matrix": [2, 0], "x": 0, "y": 35, "flags": 1 },
+            { "matrix": [3, 0], "x": 0, "y": 47, "flags": 1 },
+            { "matrix": [3, 1], "x": 13, "y": 47, "flags": 4 },
+            { "matrix": [3, 2], "x": 26, "y": 39, "flags": 4 },
+            { "matrix": [3, 3], "x": 40, "y": 36, "flags": 4 },
+            { "matrix": [3, 4], "x": 53, "y": 39, "flags": 4 },
+            { "matrix": [3, 5], "x": 66, "y": 41, "flags": 4 },
+            { "matrix": [5, 5], "x": 80, "y": 48, "flags": 4 },
+            { "matrix": [4, 5], "x": 94, "y": 52, "flags": 4 },
+            { "matrix": [4, 4], "x": 87, "y": 64, "flags": 4 },
+            { "matrix": [4, 3], "x": 73, "y": 60, "flags": 1 },
+            { "matrix": [4, 2], "x": 53, "y": 51, "flags": 1 },
+            { "matrix": [4, 1], "x": 40, "y": 47, "flags": 1 },
+            { "matrix": [4, 0], "x": 26, "y": 51, "flags": 1 },
+            { "matrix": [6, 5], "x": 158, "y": 5, "flags": 4 },
+            { "matrix": [6, 4], "x": 171, "y": 4, "flags": 4 },
+            { "matrix": [6, 3], "x": 184, "y": 0, "flags": 4 },
+            { "matrix": [6, 2], "x": 198, "y": 4, "flags": 4 },
+            { "matrix": [6, 1], "x": 211, "y": 11, "flags": 4 },
+            { "matrix": [6, 0], "x": 224, "y": 11, "flags": 4 },
+            { "matrix": [7, 0], "x": 224, "y": 23, "flags": 4 },
+            { "matrix": [7, 1], "x": 211, "y": 23, "flags": 4 },
+            { "matrix": [7, 2], "x": 198, "y": 15, "flags": 4 },
+            { "matrix": [7, 3], "x": 184, "y": 12, "flags": 4 },
+            { "matrix": [7, 4], "x": 171, "y": 15, "flags": 4 },
+            { "matrix": [7, 5], "x": 158, "y": 17, "flags": 4 },
+            { "matrix": [8, 5], "x": 158, "y": 29, "flags": 4 },
+            { "matrix": [8, 4], "x": 171, "y": 27, "flags": 4 },
+            { "matrix": [8, 3], "x": 184, "y": 24, "flags": 4 },
+            { "matrix": [8, 2], "x": 198, "y": 27, "flags": 4 },
+            { "matrix": [8, 1], "x": 211, "y": 35, "flags": 4 },
+            { "matrix": [8, 0], "x": 224, "y": 35, "flags": 4 },
+            { "matrix": [9, 0], "x": 224, "y": 47, "flags": 1 },
+            { "matrix": [9, 1], "x": 211, "y": 47, "flags": 4 },
+            { "matrix": [9, 2], "x": 198, "y": 39, "flags": 4 },
+            { "matrix": [9, 3], "x": 184, "y": 36, "flags": 4 },
+            { "matrix": [9, 4], "x": 171, "y": 39, "flags": 4 },
+            { "matrix": [9, 5], "x": 158, "y": 41, "flags": 4 },
+            { "matrix": [11, 5], "x": 144, "y": 48, "flags": 4 },
+            { "matrix": [10, 5], "x": 130, "y": 52, "flags": 4 },
+            { "matrix": [10, 4], "x": 137, "y": 64, "flags": 4 },
+            { "matrix": [10, 3], "x": 151, "y": 60, "flags": 1 },
+            { "matrix": [10, 2], "x": 171, "y": 51, "flags": 4 },
+            { "matrix": [10, 1], "x": 184, "y": 47, "flags": 1 },
+            { "matrix": [10, 0], "x": 198, "y": 51, "flags": 1 }
+        ],
+        "led_count": 62,
+        "max_brightness": 80,
+        "split_count": [31, 31]
     },
     "rgblight": {
-        "split": true,
         "led_count": 62,
+        "max_brightness": 80,
+        "split": true,
         "split_count": [31, 31]
     },
-    "encoder": {
-        "rotary": [{ "pin_a": "F5", "pin_b": "F4" }]
-    },
     "split": {
-        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F5", "pin_b": "F4"}
+                ]
+            }
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
                 "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
             }
         },
-        "encoder": {
-            "right": {
-                "rotary": [{ "pin_a": "F5", "pin_b": "F4" }]
-            }
-        }
+        "soft_serial_pin": "D2"
+    },
+    "url": "https://keycapsss.com",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x4B69",
+        "vid": "0x7983"
     },
     "ws2812": {
         "pin": "D3"
     },
-    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "L00", "matrix": [0, 0], "x": 0, "y": 0.96 },
-                { "label": "L01", "matrix": [0, 1], "x": 1, "y": 0.96 },
-                { "label": "L02", "matrix": [0, 2], "x": 2, "y": 0.31 },
-                { "label": "L03", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "L04", "matrix": [0, 4], "x": 4, "y": 0.31 },
-                { "label": "L05", "matrix": [0, 5], "x": 5, "y": 0.46 },
-
-                { "label": "R00", "matrix": [6, 5], "x": 12, "y": 0.45 },
-                { "label": "R01", "matrix": [6, 4], "x": 13, "y": 0.31 },
-                { "label": "R02", "matrix": [6, 3], "x": 14, "y": 0 },
-                { "label": "R03", "matrix": [6, 2], "x": 15, "y": 0.31 },
-                { "label": "R04", "matrix": [6, 1], "x": 16, "y": 0.96 },
-                { "label": "R05", "matrix": [6, 0], "x": 17, "y": 0.96 },
-
-                { "label": "L10", "matrix": [1, 0], "x": 0, "y": 1.96 },
-                { "label": "L11", "matrix": [1, 1], "x": 1, "y": 1.96 },
-                { "label": "L12", "matrix": [1, 2], "x": 2, "y": 1.31 },
-                { "label": "L13", "matrix": [1, 3], "x": 3, "y": 1 },
-                { "label": "L14", "matrix": [1, 4], "x": 4, "y": 1.31 },
-                { "label": "L15", "matrix": [1, 5], "x": 5, "y": 1.46 },
-
-                { "label": "R10", "matrix": [7, 5], "x": 12, "y": 1.46 },
-                { "label": "R11", "matrix": [7, 4], "x": 13, "y": 1.31 },
-                { "label": "R12", "matrix": [7, 3], "x": 14, "y": 1 },
-                { "label": "R13", "matrix": [7, 2], "x": 15, "y": 1.31 },
-                { "label": "R14", "matrix": [7, 1], "x": 16, "y": 1.96 },
-                { "label": "R15", "matrix": [7, 0], "x": 17, "y": 1.96 },
-
-                { "label": "L20", "matrix": [2, 0], "x": 0, "y": 2.96 },
-                { "label": "L21", "matrix": [2, 1], "x": 1, "y": 2.96 },
-                { "label": "L22", "matrix": [2, 2], "x": 2, "y": 2.31 },
-                { "label": "L23", "matrix": [2, 3], "x": 3, "y": 2 },
-                { "label": "L24", "matrix": [2, 4], "x": 4, "y": 2.31 },
-                { "label": "L25", "matrix": [2, 5], "x": 5, "y": 2.46 },
-
-                { "label": "R20", "matrix": [8, 5], "x": 12, "y": 2.46 },
-                { "label": "R21", "matrix": [8, 4], "x": 13, "y": 2.31 },
-                { "label": "R22", "matrix": [8, 3], "x": 14, "y": 2 },
-                { "label": "R23", "matrix": [8, 2], "x": 15, "y": 2.31 },
-                { "label": "R24", "matrix": [8, 1], "x": 16, "y": 2.96 },
-                { "label": "R25", "matrix": [8, 0], "x": 17, "y": 2.96 },
-
-                { "label": "L30", "matrix": [3, 0], "x": 0, "y": 3.96 },
-                { "label": "L31", "matrix": [3, 1], "x": 1, "y": 4 },
-                { "label": "L32", "matrix": [3, 2], "x": 2, "y": 3.31 },
-                { "label": "L33", "matrix": [3, 3], "x": 3, "y": 3 },
-                { "label": "L34", "matrix": [3, 4], "x": 4, "y": 3.31 },
-                { "label": "L35", "matrix": [3, 5], "x": 5, "y": 3.46 },
-                { "label": "L50", "matrix": [5, 5], "x": 5.75, "y": 4.51 },
-                { "label": "L40", "matrix": [4, 5], "x": 6.75, "y": 5 },
-
-                { "label": "R40", "matrix": [10, 5], "x": 10.25, "y": 5 },
-                { "label": "R50", "matrix": [11, 5], "x": 11.25, "y": 4.5 },
-                { "label": "R30", "matrix": [9, 5], "x": 12, "y": 3.46 },
-                { "label": "R31", "matrix": [9, 4], "x": 13, "y": 3.31 },
-                { "label": "R32", "matrix": [9, 3], "x": 14, "y": 3 },
-                { "label": "R33", "matrix": [9, 2], "x": 15, "y": 3.31 },
-                { "label": "R34", "matrix": [9, 1], "x": 16, "y": 3.96 },
-                { "label": "R35", "matrix": [9, 0], "x": 17, "y": 3.96 },
-
-                { "label": "L41", "matrix": [4, 0], "x": 2.5, "y": 4.5 },
-                { "label": "L42", "matrix": [4, 1], "x": 3.5, "y": 4.5 },
-                { "label": "L43", "matrix": [4, 2], "x": 4.5, "y": 4.95 },
-                { "label": "L44", "matrix": [4, 3], "x": 5.5, "y": 5.5 },
-                { "label": "L45", "matrix": [4, 4], "x": 6.5, "y": 6 },
-
-                { "label": "R41", "matrix": [10, 4], "x": 10.5, "y": 6 },
-                { "label": "R42", "matrix": [10, 3], "x": 11.5, "y": 5.5 },
-                { "label": "R43", "matrix": [10, 2], "x": 12.5, "y": 4.75 },
-                { "label": "R44", "matrix": [10, 1], "x": 13.5, "y": 4.5 },
-                { "label": "R45", "matrix": [10, 0], "x": 14.5, "y": 4.5 }
+                {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.96},
+                {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.96},
+                {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0.31},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.31},
+                {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0.46},
+                {"label": "R00", "matrix": [6, 5], "x": 12, "y": 0.45},
+                {"label": "R01", "matrix": [6, 4], "x": 13, "y": 0.31},
+                {"label": "R02", "matrix": [6, 3], "x": 14, "y": 0},
+                {"label": "R03", "matrix": [6, 2], "x": 15, "y": 0.31},
+                {"label": "R04", "matrix": [6, 1], "x": 16, "y": 0.96},
+                {"label": "R05", "matrix": [6, 0], "x": 17, "y": 0.96},
+                {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.96},
+                {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.96},
+                {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1.31},
+                {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.31},
+                {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1.46},
+                {"label": "R10", "matrix": [7, 5], "x": 12, "y": 1.46},
+                {"label": "R11", "matrix": [7, 4], "x": 13, "y": 1.31},
+                {"label": "R12", "matrix": [7, 3], "x": 14, "y": 1},
+                {"label": "R13", "matrix": [7, 2], "x": 15, "y": 1.31},
+                {"label": "R14", "matrix": [7, 1], "x": 16, "y": 1.96},
+                {"label": "R15", "matrix": [7, 0], "x": 17, "y": 1.96},
+                {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.96},
+                {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.96},
+                {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2.31},
+                {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.31},
+                {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2.46},
+                {"label": "R20", "matrix": [8, 5], "x": 12, "y": 2.46},
+                {"label": "R21", "matrix": [8, 4], "x": 13, "y": 2.31},
+                {"label": "R22", "matrix": [8, 3], "x": 14, "y": 2},
+                {"label": "R23", "matrix": [8, 2], "x": 15, "y": 2.31},
+                {"label": "R24", "matrix": [8, 1], "x": 16, "y": 2.96},
+                {"label": "R25", "matrix": [8, 0], "x": 17, "y": 2.96},
+                {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3.96},
+                {"label": "L31", "matrix": [3, 1], "x": 1, "y": 4},
+                {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3.31},
+                {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3.31},
+                {"label": "L35", "matrix": [3, 5], "x": 5, "y": 3.46},
+                {"label": "L50", "matrix": [5, 5], "x": 5.75, "y": 4.51},
+                {"label": "L40", "matrix": [4, 5], "x": 6.75, "y": 5},
+                {"label": "R40", "matrix": [10, 5], "x": 10.25, "y": 5},
+                {"label": "R50", "matrix": [11, 5], "x": 11.25, "y": 4.5},
+                {"label": "R30", "matrix": [9, 5], "x": 12, "y": 3.46},
+                {"label": "R31", "matrix": [9, 4], "x": 13, "y": 3.31},
+                {"label": "R32", "matrix": [9, 3], "x": 14, "y": 3},
+                {"label": "R33", "matrix": [9, 2], "x": 15, "y": 3.31},
+                {"label": "R34", "matrix": [9, 1], "x": 16, "y": 3.96},
+                {"label": "R35", "matrix": [9, 0], "x": 17, "y": 3.96},
+                {"label": "L41", "matrix": [4, 0], "x": 2.5, "y": 4.5},
+                {"label": "L42", "matrix": [4, 1], "x": 3.5, "y": 4.5},
+                {"label": "L43", "matrix": [4, 2], "x": 4.5, "y": 4.95},
+                {"label": "L44", "matrix": [4, 3], "x": 5.5, "y": 5.5},
+                {"label": "L45", "matrix": [4, 4], "x": 6.5, "y": 6},
+                {"label": "R41", "matrix": [10, 4], "x": 10.5, "y": 6},
+                {"label": "R42", "matrix": [10, 3], "x": 11.5, "y": 5.5},
+                {"label": "R43", "matrix": [10, 2], "x": 12.5, "y": 4.75},
+                {"label": "R44", "matrix": [10, 1], "x": 13.5, "y": 4.5},
+                {"label": "R45", "matrix": [10, 0], "x": 14.5, "y": 4.5}
             ]
         }
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "split_count": [31, 31],
-        "layout": [
-            { "flags": 4, "matrix": [0, 5], "x": 66, "y": 5 },
-            { "flags": 4, "matrix": [0, 4], "x": 53, "y": 4 },
-            { "flags": 4, "matrix": [0, 3], "x": 40, "y": 0 },
-            { "flags": 4, "matrix": [0, 2], "x": 26, "y": 4 },
-            { "flags": 4, "matrix": [0, 1], "x": 13, "y": 11 },
-            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 11 },
-            { "flags": 4, "matrix": [1, 0], "x": 0, "y": 23 },
-            { "flags": 4, "matrix": [1, 1], "x": 13, "y": 23 },
-            { "flags": 4, "matrix": [1, 2], "x": 26, "y": 15 },
-            { "flags": 4, "matrix": [1, 3], "x": 40, "y": 12 },
-            { "flags": 4, "matrix": [1, 4], "x": 53, "y": 15 },
-            { "flags": 4, "matrix": [1, 5], "x": 66, "y": 17 },
-            { "flags": 4, "matrix": [2, 5], "x": 66, "y": 29 },
-            { "flags": 4, "matrix": [2, 4], "x": 53, "y": 27 },
-            { "flags": 4, "matrix": [2, 3], "x": 40, "y": 24 },
-            { "flags": 4, "matrix": [2, 2], "x": 26, "y": 27 },
-            { "flags": 4, "matrix": [2, 1], "x": 13, "y": 35 },
-            { "flags": 1, "matrix": [2, 0], "x": 0, "y": 35 },
-            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 47 },
-            { "flags": 4, "matrix": [3, 1], "x": 13, "y": 47 },
-            { "flags": 4, "matrix": [3, 2], "x": 26, "y": 39 },
-            { "flags": 4, "matrix": [3, 3], "x": 40, "y": 36 },
-            { "flags": 4, "matrix": [3, 4], "x": 53, "y": 39 },
-            { "flags": 4, "matrix": [3, 5], "x": 66, "y": 41 },
-            { "flags": 4, "matrix": [5, 5], "x": 80, "y": 48 },
-            { "flags": 4, "matrix": [4, 5], "x": 94, "y": 52 },
-            { "flags": 4, "matrix": [4, 4], "x": 87, "y": 64 },
-            { "flags": 1, "matrix": [4, 3], "x": 73, "y": 60 },
-            { "flags": 1, "matrix": [4, 2], "x": 53, "y": 51 },
-            { "flags": 1, "matrix": [4, 1], "x": 40, "y": 47 },
-            { "flags": 1, "matrix": [4, 0], "x": 26, "y": 51 },
-            { "flags": 4, "matrix": [6, 5], "x": 158, "y": 5 },
-            { "flags": 4, "matrix": [6, 4], "x": 171, "y": 4 },
-            { "flags": 4, "matrix": [6, 3], "x": 184, "y": 0 },
-            { "flags": 4, "matrix": [6, 2], "x": 198, "y": 4 },
-            { "flags": 4, "matrix": [6, 1], "x": 211, "y": 11 },
-            { "flags": 4, "matrix": [6, 0], "x": 224, "y": 11 },
-            { "flags": 4, "matrix": [7, 0], "x": 224, "y": 23 },
-            { "flags": 4, "matrix": [7, 1], "x": 211, "y": 23 },
-            { "flags": 4, "matrix": [7, 2], "x": 198, "y": 15 },
-            { "flags": 4, "matrix": [7, 3], "x": 184, "y": 12 },
-            { "flags": 4, "matrix": [7, 4], "x": 171, "y": 15 },
-            { "flags": 4, "matrix": [7, 5], "x": 158, "y": 17 },
-            { "flags": 4, "matrix": [8, 5], "x": 158, "y": 29 },
-            { "flags": 4, "matrix": [8, 4], "x": 171, "y": 27 },
-            { "flags": 4, "matrix": [8, 3], "x": 184, "y": 24 },
-            { "flags": 4, "matrix": [8, 2], "x": 198, "y": 27 },
-            { "flags": 4, "matrix": [8, 1], "x": 211, "y": 35 },
-            { "flags": 4, "matrix": [8, 0], "x": 224, "y": 35 },
-            { "flags": 1, "matrix": [9, 0], "x": 224, "y": 47 },
-            { "flags": 4, "matrix": [9, 1], "x": 211, "y": 47 },
-            { "flags": 4, "matrix": [9, 2], "x": 198, "y": 39 },
-            { "flags": 4, "matrix": [9, 3], "x": 184, "y": 36 },
-            { "flags": 4, "matrix": [9, 4], "x": 171, "y": 39 },
-            { "flags": 4, "matrix": [9, 5], "x": 158, "y": 41 },
-            { "flags": 4, "matrix": [11, 5], "x": 144, "y": 48 },
-            { "flags": 4, "matrix": [10, 5], "x": 130, "y": 52 },
-            { "flags": 4, "matrix": [10, 4], "x": 137, "y": 64 },
-            { "flags": 1, "matrix": [10, 3], "x": 151, "y": 60 },
-            { "flags": 4, "matrix": [10, 2], "x": 171, "y": 51 },
-            { "flags": 1, "matrix": [10, 1], "x": 184, "y": 47 },
-            { "flags": 1, "matrix": [10, 0], "x": 198, "y": 51 }
-        ]
     }
 }
diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h b/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h
index cd63e025fc6..34c2708e865 100644
--- a/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h
+++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h
@@ -18,112 +18,20 @@
 
 #pragma once
 
-/* Select hand configuration */
-//------------------------------------------
-// #define MASTER_LEFT
 #define MASTER_RIGHT
-// #define EE_HANDS
-//------------------------------------------
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS    // Static dual hue, speed is hue for secondary hue
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
 
+// These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available.
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
 
-// 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
-//------------------------------------------
+#define RGB_MATRIX_VAL_STEP 4
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_HUE 0   // Sets the default hue value, if none has been set
+#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
+#define RGB_MATRIX_DEFAULT_VAL 60  // RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
+#define RGB_MATRIX_DEFAULT_SPD 60  // Sets the default animation speed, if none has been set
 
-
-// 'new' RGB Matrix definitions, used when RGB_MATRIX_ENABLE = yes in rules.mk
-//------------------------------------------
-	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-	// #define RGB_MATRIX_KEYPRESSES
-	// #define RGB_MATRIX_KEYRELEASES
-
-	// These modes don’t require any additional defines.
-	#define	   ENABLE_RGB_MATRIX_NONE
-	#define    ENABLE_RGB_MATRIX_SOLID_COLOR     // Static single hue, no speed support
-
-	#define    ENABLE_RGB_MATRIX_ALPHAS_MODS        // Static dual hue, speed is hue for secondary hue
-	// #define    ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN    // Static gradient top to bottom, speed controls how much gradient changes
-	// #define    ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT    // Static gradient left to right, speed controls how much gradient changes
-	// #define    ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
-	// #define    ENABLE_RGB_MATRIX_BAND_SAT        // Single hue band fading saturation scrolling left to right
-	// #define    ENABLE_RGB_MATRIX_BAND_VAL        // Single hue band fading brightness scrolling left to right
-	// #define    ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT   // Single hue 3 blade spinning pinwheel fades saturation
-	// #define    ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL   // Single hue 3 blade spinning pinwheel fades brightness
-	// #define    ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT     // Single hue spinning spiral fades saturation
-	// #define    ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
-	// #define    ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
-	// #define    ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT    // Full gradient scrolling left to right
-	// #define    ENABLE_RGB_MATRIX_CYCLE_UP_DOWN       // Full gradient scrolling top to bottom
-	// #define    ENABLE_RGB_MATRIX_CYCLE_OUT_IN        // Full gradient scrolling out to in
-	// #define    ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL   // Full dual gradients scrolling out to in
-	// #define    ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradient Chevron shapped scrolling left to right
-	// #define    ENABLE_RGB_MATRIX_CYCLE_PINWHEEL      // Full gradient spinning pinwheel around center of keyboard
-	// #define    ENABLE_RGB_MATRIX_CYCLE_SPIRAL        // Full gradient spinning spiral around center of keyboard
-	// #define    ENABLE_RGB_MATRIX_DUAL_BEACON         // Full gradient spinning around center of keyboard
-	#define    ENABLE_RGB_MATRIX_RAINBOW_BEACON      // Full tighter gradient spinning around center of keyboard
-	// #define    ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS   // Full dual gradients spinning two halfs of keyboard
-	// #define    ENABLE_RGB_MATRIX_RAINDROPS           // Randomly changes a single key's hue
-	// #define    ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation
-	// #define    ENABLE_RGB_MATRIX_HUE_BREATHING       // Hue shifts up a slight ammount at the same time, then shifts back
-	// #define    ENABLE_RGB_MATRIX_HUE_PENDULUM        // Hue shifts up a slight ammount in a wave to the right, then back to the left
-	// #define    ENABLE_RGB_MATRIX_HUE_WAVE            // Hue shifts up a slight ammount and then back down in a wave to the right
-	// #define    ENABLE_RGB_MATRIX_PIXEL_FRACTAL       // Single hue fractal filled keys pulsing horizontally out to edges
-	// #define    ENABLE_RGB_MATRIX_PIXEL_FLOW          // Pulsing RGB flow along LED wiring with random hues
-	// #define    ENABLE_RGB_MATRIX_PIXEL_RAIN          // Randomly light keys with random hues
-
-	// These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available.
-	#define    ENABLE_RGB_MATRIX_TYPING_HEATMAP      // How hot is your WPM!
-	// #define    ENABLE_RGB_MATRIX_DIGITAL_RAIN        // That famous computer simulation
-
-	// These modes also require the RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES define to be available.
-	// #define    ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE   // Pulses keys hit to hue & value then fades value out
-	// #define    ENABLE_RGB_MATRIX_SOLID_REACTIVE      // Static single hue, pulses keys hit to shifted hue then fades to current hue
-	// #define    ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-	// #define    ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-	// #define    ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-	// #define    ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-	// #define    ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-	// #define    ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-	// #define    ENABLE_RGB_MATRIX_SPLASH              // Full gradient & value pulse away from a single key hit then fades value out
-	// #define    ENABLE_RGB_MATRIX_MULTISPLASH         // Full gradient & value pulse away from multiple key hits then fades value out
-	// #define    ENABLE_RGB_MATRIX_SOLID_SPLASH        // Hue & value pulse away from a single key hit then fades value out
-	// #define    ENABLE_RGB_MATRIX_SOLID_MULTISPLASH   // Hue & value pulse away from multiple key hits then fades value out
-
-	#define RGB_MATRIX_VAL_STEP 4
-	#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-	#define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set
-	#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
-	#define RGB_MATRIX_DEFAULT_VAL 60 //RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
-	#define RGB_MATRIX_DEFAULT_SPD 60 // Sets the default animation speed, if none has been set
-//------------------------------------------
-
-
-// 'old' RGB Lightning definitions, used when RGBLIGHT_ENABLE = yes in rules.mk
-//------------------------------------------
-#   define RGBLIGHT_HUE_STEP 8
-#   define RGBLIGHT_SAT_STEP 8
-#   define RGBLIGHT_VAL_STEP 8
-#   define RGBLIGHT_SLEEP       /* 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
-#    define RGBLIGHT_EFFECT_TWINKLE
-//------------------------------------------
-
-
-// pointing device definitions
-//------------------------------------------
 #if defined(POINTING_DEVICE_DRIVER_pimoroni_trackball)
 #    define POINTING_DEVICE_ROTATION_180 // may be used for trackball in 2nd position
 #endif
-//------------------------------------------
-
-
diff --git a/keyboards/keycapsss/kimiko/rev2/rev2.c b/keyboards/keycapsss/kimiko/rev2/rev2.c
new file mode 100644
index 00000000000..c5765812c06
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/rev2.c
@@ -0,0 +1,209 @@
+/* Copyright 2023 @BenRoe (keycapsss.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 "quantum.h"
+
+enum layers { _QWERTY, _LOWER, _RAISE, _ADJUST };
+
+#    ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;
+}
+
+// NOTE: Most of the OLED code was originally written by Soundmonster for the Corne,
+// and has been copied directly from `crkbd/soundmonster/keymap.c`
+
+void render_mod_status_gui_alt(uint8_t modifiers) {
+    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
+    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
+    static const char PROGMEM gui_on_1[]  = {0x8d, 0x8e, 0};
+    static const char PROGMEM gui_on_2[]  = {0xad, 0xae, 0};
+
+    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
+    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
+    static const char PROGMEM alt_on_1[]  = {0x8f, 0x90, 0};
+    static const char PROGMEM alt_on_2[]  = {0xaf, 0xb0, 0};
+
+    // fillers between the modifier icons bleed into the icon frames
+    static const char PROGMEM off_off_1[] = {0xc5, 0};
+    static const char PROGMEM off_off_2[] = {0xc6, 0};
+    static const char PROGMEM on_off_1[]  = {0xc7, 0};
+    static const char PROGMEM on_off_2[]  = {0xc8, 0};
+    static const char PROGMEM off_on_1[]  = {0xc9, 0};
+    static const char PROGMEM off_on_2[]  = {0xca, 0};
+    static const char PROGMEM on_on_1[]   = {0xcb, 0};
+    static const char PROGMEM on_on_2[]   = {0xcc, 0};
+
+    if (modifiers & MOD_MASK_GUI) {
+        oled_write_P(gui_on_1, false);
+    } else {
+        oled_write_P(gui_off_1, false);
+    }
+
+    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
+        oled_write_P(on_on_1, false);
+    } else if (modifiers & MOD_MASK_GUI) {
+        oled_write_P(on_off_1, false);
+    } else if (modifiers & MOD_MASK_ALT) {
+        oled_write_P(off_on_1, false);
+    } else {
+        oled_write_P(off_off_1, false);
+    }
+
+    if (modifiers & MOD_MASK_ALT) {
+        oled_write_P(alt_on_1, false);
+    } else {
+        oled_write_P(alt_off_1, false);
+    }
+
+    if (modifiers & MOD_MASK_GUI) {
+        oled_write_P(gui_on_2, false);
+    } else {
+        oled_write_P(gui_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
+        oled_write_P(on_on_2, false);
+    } else if (modifiers & MOD_MASK_GUI) {
+        oled_write_P(on_off_2, false);
+    } else if (modifiers & MOD_MASK_ALT) {
+        oled_write_P(off_on_2, false);
+    } else {
+        oled_write_P(off_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_ALT) {
+        oled_write_P(alt_on_2, false);
+    } else {
+        oled_write_P(alt_off_2, false);
+    }
+}
+
+void render_mod_status_ctrl_shift(uint8_t modifiers) {
+    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
+    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
+    static const char PROGMEM ctrl_on_1[]  = {0x91, 0x92, 0};
+    static const char PROGMEM ctrl_on_2[]  = {0xb1, 0xb2, 0};
+
+    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
+    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
+    static const char PROGMEM shift_on_1[]  = {0xcd, 0xce, 0};
+    static const char PROGMEM shift_on_2[]  = {0xcf, 0xd0, 0};
+
+    // fillers between the modifier icons bleed into the icon frames
+    static const char PROGMEM off_off_1[] = {0xc5, 0};
+    static const char PROGMEM off_off_2[] = {0xc6, 0};
+    static const char PROGMEM on_off_1[]  = {0xc7, 0};
+    static const char PROGMEM on_off_2[]  = {0xc8, 0};
+    static const char PROGMEM off_on_1[]  = {0xc9, 0};
+    static const char PROGMEM off_on_2[]  = {0xca, 0};
+    static const char PROGMEM on_on_1[]   = {0xcb, 0};
+    static const char PROGMEM on_on_2[]   = {0xcc, 0};
+
+    if (modifiers & MOD_MASK_CTRL) {
+        oled_write_P(ctrl_on_1, false);
+    } else {
+        oled_write_P(ctrl_off_1, false);
+    }
+
+    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
+        oled_write_P(on_on_1, false);
+    } else if (modifiers & MOD_MASK_CTRL) {
+        oled_write_P(on_off_1, false);
+    } else if (modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(off_on_1, false);
+    } else {
+        oled_write_P(off_off_1, false);
+    }
+
+    if (modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(shift_on_1, false);
+    } else {
+        oled_write_P(shift_off_1, false);
+    }
+
+    if (modifiers & MOD_MASK_CTRL) {
+        oled_write_P(ctrl_on_2, false);
+    } else {
+        oled_write_P(ctrl_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
+        oled_write_P(on_on_2, false);
+    } else if (modifiers & MOD_MASK_CTRL) {
+        oled_write_P(on_off_2, false);
+    } else if (modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(off_on_2, false);
+    } else {
+        oled_write_P(off_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(shift_on_2, false);
+    } else {
+        oled_write_P(shift_off_2, false);
+    }
+}
+
+void render_logo(void) {
+    static const char PROGMEM kimiko_logo[] = {0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0};
+    oled_advance_page(false);
+    oled_advance_page(false);
+    oled_write_P(kimiko_logo, false);
+    // oled_write_P(PSTR("Kimiko"), false);
+}
+
+void render_layer_state(void) {
+    static const char PROGMEM default_layer[] = {0x20, 0x94, 0x95, 0x96, 0x20, 0x20, 0xb4, 0xb5, 0xb6, 0x20, 0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
+    static const char PROGMEM raise_layer[]   = {0x20, 0x97, 0x98, 0x99, 0x20, 0x20, 0xb7, 0xb8, 0xb9, 0x20, 0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
+    static const char PROGMEM lower_layer[]   = {0x20, 0x9a, 0x9b, 0x9c, 0x20, 0x20, 0xba, 0xbb, 0xbc, 0x20, 0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
+    static const char PROGMEM adjust_layer[]  = {0x20, 0x9d, 0x9e, 0x9f, 0x20, 0x20, 0xbd, 0xbe, 0xbf, 0x20, 0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
+
+    if (layer_state_is(_ADJUST)) {
+        oled_write_P(adjust_layer, false);
+    } else if (layer_state_is(_LOWER)) {
+        oled_write_P(lower_layer, false);
+    } else if (layer_state_is(_RAISE)) {
+        oled_write_P(raise_layer, false);
+    } else {
+        oled_write_P(default_layer, false);
+    }
+}
+
+void render_status_main(void) {
+    render_logo();
+    oled_advance_page(false);
+    render_layer_state();
+    oled_advance_page(false);
+    render_mod_status_gui_alt(get_mods() | get_oneshot_mods());
+    render_mod_status_ctrl_shift(get_mods() | get_oneshot_mods());
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    if (is_keyboard_master()) {
+        render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+    } else {
+        render_logo();
+    }
+
+    return true;
+}
+#    endif // OLED_ENABLE
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c
index 23821853629..789bb7af024 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c
@@ -42,9 +42,8 @@ bool oled_task_user(void) {
 #endif
 
 
-#ifdef ENCODER_ENABLE
+#ifdef ENCODER_MAP_ENABLE
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
 /*
 Rev1.1                      Rev1
 ,-----------------------,   ,-----------------------,
@@ -57,37 +56,12 @@ Rev1.1                      Rev1
 |     |     |     |  E1 |   |     |     |     |     |
 `-----------------------'   `-----------------------'
  */
-
-  // First encoder (E1)
-  if (index == 0) {
-    if (clockwise) {
-      tap_code(KC_F17);
-    } else {
-      tap_code(KC_F18);
-    }
-  // Second encoder (E2)
-  } else if (index == 1) {
-    if (clockwise) {
-      tap_code(KC_F19);
-    } else {
-      tap_code(KC_F20);
-    }
-  // Third encoder (E3)
-  } else if (index == 2) {
-    if (clockwise) {
-      tap_code(KC_F21);
-    } else {
-      tap_code(KC_F22);
-    }
-  // Forth encoder (E4)
-  } else if (index == 3) {
-    if (clockwise) {
-      tap_code(KC_F23);
-    } else {
-      tap_code(KC_F24);
-    }
-  }
-    return true;
-}
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+#ifdef KEYBOARD_keycapsss_plaid_pad_rev1
+  { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19) }
+#else
+  { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19), ENCODER_CCW_CW(KC_F22, KC_F21), ENCODER_CCW_CW(KC_F24, KC_F23) }
+#endif
+};
 
 #endif
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/default/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/keycapsss/plaid_pad/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
index 371e8e99416..944f822fb39 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
+++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
@@ -125,8 +125,7 @@ bool oled_task_user(void) {
 
 #endif
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
+#ifdef ENCODER_MAP_ENABLE
 /*
     ,-----------------------,
     |  E1 |  E2 |  E3 |  E4 |
@@ -138,93 +137,16 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     |     |     |     |  E1 |
     `-----------------------'
  */
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+#ifdef KEYBOARD_keycapsss_plaid_pad_rev1
+  [_NUMPAD]     = { ENCODER_CCW_CW(KC_F18,       KC_F17),    ENCODER_CCW_CW(KC_F20,  KC_F19)  },
+  [_NAVIGATION] = { ENCODER_CCW_CW(C(S(KC_TAB)), C(KC_TAB)), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+  [_MEDIA]      = { ENCODER_CCW_CW(KC_F18,       KC_F17),    ENCODER_CCW_CW(KC_F20,  KC_F19)  }
+#else
+  [_NUMPAD]     = { ENCODER_CCW_CW(KC_F18,       KC_F17),    ENCODER_CCW_CW(KC_F20,  KC_F19),  ENCODER_CCW_CW(KC_F22,  KC_F21),  ENCODER_CCW_CW(KC_F24,  KC_F23)  },
+  [_NAVIGATION] = { ENCODER_CCW_CW(C(S(KC_TAB)), C(KC_TAB)), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_WH_U, KC_WH_D), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+  [_MEDIA]      = { ENCODER_CCW_CW(KC_F18,       KC_F17),    ENCODER_CCW_CW(KC_F20,  KC_F19),  ENCODER_CCW_CW(KC_BRID, KC_BRIU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+#endif
+};
 
-  // First encoder (E1)
-  if (index == 0) {
-    switch (get_highest_layer(layer_state)) {
-      case _NAVIGATION:
-        // Browser tab switching
-        if (clockwise) {
-          tap_code16(LCTL(KC_TAB));
-        } else {
-          tap_code16(LCTL(LSFT(KC_TAB)));
-        }
-        break;
-      default:
-        if (clockwise) {
-          tap_code(KC_F17);
-        } else {
-          tap_code(KC_F18);
-        }
-        break;
-    }
-  // Second encoder (E2)
-  } else if (index == 1) {
-    switch (get_highest_layer(layer_state)) {
-      case _NAVIGATION:
-        // Page Down/Up
-        if (clockwise) {
-          tap_code16(KC_PGDN);
-        } else {
-          tap_code16(KC_PGUP);
-        }
-        break;
-      default:
-        if (clockwise) {
-          tap_code(KC_F19);
-        } else {
-          tap_code(KC_F20);
-        }
-        break;
-    }
-  // Third encoder (E3)
-  } else if (index == 2) {
-    switch (get_highest_layer(layer_state)) {
-      case _NAVIGATION:
-        // Mouse wheel up/down
-        if (clockwise) {
-          tap_code(KC_MS_WH_DOWN);
-        } else {
-          tap_code(KC_MS_WH_UP);
-        }
-        break;
-      case _MEDIA:
-        // BRIGHTNESS Up/Down
-        if (clockwise) {
-          tap_code16(KC_BRIGHTNESS_UP);
-        } else {
-          tap_code16(KC_BRIGHTNESS_DOWN);
-        }
-        break;
-      default:
-        if (clockwise) {
-          tap_code(KC_F21);
-        } else {
-          tap_code(KC_F22);
-        }
-        break;
-    }
-  // Forth encoder (E4)
-  } else if (index == 3) {
-    switch (get_highest_layer(layer_state)) {
-      case _NAVIGATION:
-      case _MEDIA:
-        // Volume Up/Down
-        if (clockwise) {
-          tap_code16(KC_AUDIO_VOL_UP);
-        } else {
-          tap_code16(KC_AUDIO_VOL_DOWN);
-        }
-        break;
-      default:
-        if (clockwise) {
-          tap_code(KC_F23);
-        } else {
-          tap_code(KC_F24);
-        }
-        break;
-    }
-  }
-    return true;
-}
 #endif
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
index dc3e29cf8b2..33bd0c36119 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
@@ -1,2 +1,3 @@
 OLED_ENABLE = yes
 COMBO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c
index 7d48591cd2f..4ca3fc944b5 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c
+++ b/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c
@@ -27,26 +27,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |  0  |  .  |  =  |  +  |
  * `-----------------------'
  */
-  [0] = LAYOUT_ortho_4x4(
+  LAYOUT_ortho_4x4(
       KC_P7,   KC_P8,   KC_P9,   KC_PSLS,
       KC_P4,   KC_P5,   KC_P6,   KC_PAST,
       KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
-      KC_P0,   KC_PDOT, KC_PEQL, KC_PPLS  ),
-  [1] = 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  ),
-  [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  ),
+      KC_P0,   KC_PDOT, KC_PEQL, KC_PPLS
+  ),
 };
 
 
@@ -69,8 +55,7 @@ bool oled_task_user(void) {
 #endif
 
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
+#ifdef ENCODER_MAP_ENABLE
 /*
 Rev1.1                      Rev1
 ,-----------------------,   ,-----------------------,
@@ -84,35 +69,11 @@ Rev1.1                      Rev1
 `-----------------------'   `-----------------------'
  */
 
-  // First encoder (E1)
-  if (index == 0) {
-    if (clockwise) {
-      tap_code(KC_F17);
-    } else {
-      tap_code(KC_F18);
-    }
-  // Second encoder (E2)
-  } else if (index == 1) {
-    if (clockwise) {
-      tap_code(KC_F19);
-    } else {
-      tap_code(KC_F20);
-    }
-  // Third encoder (E3)
-  } else if (index == 2) {
-    if (clockwise) {
-      tap_code(KC_F21);
-    } else {
-      tap_code(KC_F22);
-    }
-  // Forth encoder (E4)
-  } else if (index == 3) {
-    if (clockwise) {
-      tap_code(KC_F23);
-    } else {
-      tap_code(KC_F24);
-    }
-  }
-    return true;
-}
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+#ifdef KEYBOARD_keycapsss_plaid_pad_rev1
+  { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19) }
+#else
+  { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19), ENCODER_CCW_CW(KC_F22, KC_F21), ENCODER_CCW_CW(KC_F24, KC_F23) }
+#endif
+};
 #endif
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
index 36b7ba9cbc9..1189f4ad192 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/config.h b/keyboards/keychron/c1_pro/ansi/rgb/config.h
index a88319a63de..c5e293d1dff 100644
--- a/keyboards/keychron/c1_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/c1_pro/ansi/rgb/config.h
@@ -23,24 +23,10 @@
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 49
-#define DRIVER_2_LED_TOTAL 39
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 /* Set led driver current */
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* Enable caps_lock, win os and mac os indicator */
 #define CAPS_MAC_WIN_LED_INDEX 63
-
-// 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
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/info.json b/keyboards/keychron/c1_pro/ansi/rgb/info.json
index fcd805706b1..64d45e35953 100644
--- a/keyboards/keychron/c1_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/c1_pro/ansi/rgb/info.json
@@ -224,6 +224,7 @@
             {"matrix":[5, 14], "flags":1, "x":198, "y":64},
             {"matrix":[5, 15], "flags":1, "x":211, "y":64},
             {"matrix":[4, 14], "flags":1, "x":224, "y":64}
-        ]
+        ],
+        "sleep": true
     }
 }
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/rgb.c b/keyboards/keychron/c1_pro/ansi/rgb/rgb.c
index c04e82a44ea..e4c640d6bfa 100644
--- a/keyboards/keychron/c1_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/c1_pro/ansi/rgb/rgb.c
@@ -18,107 +18,107 @@
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, I_14,   G_14,   H_14}, // CAPS_MAC_WIN_LED_INDEX
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // CAPS_MAC_WIN_LED_INDEX
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 // clang-format on
diff --git a/keyboards/keychron/c1_pro/ansi/white/config.h b/keyboards/keychron/c1_pro/ansi/white/config.h
index a8a836c5dd1..2db91f7053a 100644
--- a/keyboards/keychron/c1_pro/ansi/white/config.h
+++ b/keyboards/keychron/c1_pro/ansi/white/config.h
@@ -21,26 +21,11 @@
 
 /* LED Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
-
-/* LED Matrix Configuration */
-#define LED_MATRIX_LED_COUNT 90
-
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
-/* Set led driver current */
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 
-/* turn off effects when suspended */
-#define LED_DISABLE_WHEN_USB_SUSPENDED
-
 /* Enbale caps_lcok, win os and mac os indicator */
 #define CAPS_LOCK_LED_INDEX 63
 #define MAC_LOCK_LED_INDEX 64
 #define WIN_LOCK_LED_INDEX 65
-
-// LED Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
-// #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
-#define LED_MATRIX_KEYPRESSES
-#define LED_MATRIX_KEYRELEASES
diff --git a/keyboards/keychron/c1_pro/ansi/white/info.json b/keyboards/keychron/c1_pro/ansi/white/info.json
index 4a6c6e2b8de..c64183a7392 100644
--- a/keyboards/keychron/c1_pro/ansi/white/info.json
+++ b/keyboards/keychron/c1_pro/ansi/white/info.json
@@ -107,8 +107,6 @@
     "led_matrix": {
         "driver": "snled27351",
         "animations": {
-            "none": true,
-            "solid": true,
             "breathing": true,
             "band_pinwheel": true,
             "band_spiral": true,
@@ -221,6 +219,8 @@
             {"matrix":[5, 14], "flags":1, "x":198, "y":64},
             {"matrix":[5, 15], "flags":1, "x":211, "y":64},
             {"matrix":[3, 15], "flags":1, "x":224, "y":64}
-        ]
+        ],
+        "sleep": true,
+        "react_on_keyup": true
     }
 }
diff --git a/keyboards/keychron/c1_pro/ansi/white/white.c b/keyboards/keychron/c1_pro/ansi/white/white.c
index 15f291e80c8..2b41845c9b5 100644
--- a/keyboards/keychron/c1_pro/ansi/white/white.c
+++ b/keyboards/keychron/c1_pro/ansi/white/white.c
@@ -18,107 +18,107 @@
 
 // clang-format off
 #ifdef LED_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[LED_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  LED address
  *   |  |   */
-    {0, A_16}, // esc
-    {0, A_15}, // f1
-    {0, A_14}, // f2
-    {0, A_13}, // f3
-    {0, A_12}, // f4
-    {0, A_11}, // f5
-    {0, A_10}, // f6
-    {0, A_9},  // f7
-    {0, A_8},  // f8
-    {0, A_7},  // f9
-    {0, A_6},  // f10
-    {0, A_5},  // f11
-    {0, A_4},  // f12
-    {0, A_2},  // print
-    {0, A_1},  // siri
-    {0, G_1},  // light
+    {0, CB1_CA16}, // esc
+    {0, CB1_CA15}, // f1
+    {0, CB1_CA14}, // f2
+    {0, CB1_CA13}, // f3
+    {0, CB1_CA12}, // f4
+    {0, CB1_CA11}, // f5
+    {0, CB1_CA10}, // f6
+    {0, CB1_CA9},  // f7
+    {0, CB1_CA8},  // f8
+    {0, CB1_CA7},  // f9
+    {0, CB1_CA6},  // f10
+    {0, CB1_CA5},  // f11
+    {0, CB1_CA4},  // f12
+    {0, CB1_CA2},  // print
+    {0, CB1_CA1},  // siri
+    {0, CB7_CA1},  // light
 
-    {0, B_16}, // ~
-    {0, B_15}, // 1!
-    {0, B_14}, // 2@
-    {0, B_13}, // 3#
-    {0, B_12}, // 4$
-    {0, B_11}, // 5%
-    {0, B_10}, // 6^
-    {0, B_9},  // 7&
-    {0, B_8},  // 8*
-    {0, B_7},  // 9(
-    {0, B_6},  // 0)
-    {0, B_5},  // -_
-    {0, B_4},  // =+
-    {0, B_3},  // back space
-    {0, B_2},  // INS
-    {0, B_1},  // HOME
-    {0, H_1},  // PGUP
+    {0, CB2_CA16}, // ~
+    {0, CB2_CA15}, // 1!
+    {0, CB2_CA14}, // 2@
+    {0, CB2_CA13}, // 3#
+    {0, CB2_CA12}, // 4$
+    {0, CB2_CA11}, // 5%
+    {0, CB2_CA10}, // 6^
+    {0, CB2_CA9},  // 7&
+    {0, CB2_CA8},  // 8*
+    {0, CB2_CA7},  // 9(
+    {0, CB2_CA6},  // 0)
+    {0, CB2_CA5},  // -_
+    {0, CB2_CA4},  // =+
+    {0, CB2_CA3},  // back space
+    {0, CB2_CA2},  // INS
+    {0, CB2_CA1},  // HOME
+    {0, CB8_CA1},  // PGUP
 
-    {0, C_16}, // tab
-    {0, C_15}, // q
-    {0, C_14}, // w
-    {0, C_13}, // e
-    {0, C_12}, // r
-    {0, C_11}, // t
-    {0, C_10}, // y
-    {0, C_9},  // u
-    {0, C_8},  // i
-    {0, C_7},  // o
-    {0, C_6},  // p
-    {0, C_5},  // [{
-    {0, C_4},  // ]}
-    {0, C_3},  // \|
-    {0, C_2},  // DEL
-    {0, C_1},  // END
-    {0, G_6},  // PGDN
+    {0, CB3_CA16}, // tab
+    {0, CB3_CA15}, // q
+    {0, CB3_CA14}, // w
+    {0, CB3_CA13}, // e
+    {0, CB3_CA12}, // r
+    {0, CB3_CA11}, // t
+    {0, CB3_CA10}, // y
+    {0, CB3_CA9},  // u
+    {0, CB3_CA8},  // i
+    {0, CB3_CA7},  // o
+    {0, CB3_CA6},  // p
+    {0, CB3_CA5},  // [{
+    {0, CB3_CA4},  // ]}
+    {0, CB3_CA3},  // \|
+    {0, CB3_CA2},  // DEL
+    {0, CB3_CA1},  // END
+    {0, CB7_CA6},  // PGDN
 
-    {0, D_16}, // caps lock
-    {0, D_15}, // a
-    {0, D_14}, // s
-    {0, D_13}, // d
-    {0, D_12}, // f
-    {0, D_11}, // g
-    {0, D_10}, // h
-    {0, D_9},  // j
-    {0, D_8},  // k
-    {0, D_7},  // l
-    {0, D_6},  // ;:
-    {0, D_5},  // '"
-    {0, D_3},  // enter
+    {0, CB4_CA16}, // caps lock
+    {0, CB4_CA15}, // a
+    {0, CB4_CA14}, // s
+    {0, CB4_CA13}, // d
+    {0, CB4_CA12}, // f
+    {0, CB4_CA11}, // g
+    {0, CB4_CA10}, // h
+    {0, CB4_CA9},  // j
+    {0, CB4_CA8},  // k
+    {0, CB4_CA7},  // l
+    {0, CB4_CA6},  // ;:
+    {0, CB4_CA5},  // '"
+    {0, CB4_CA3},  // enter
 
-    {0, H_7},  // CPAS
-    {0, H_8},  // MAC
-    {0, H_9},  // WIN
+    {0, CB8_CA7},  // CPAS
+    {0, CB8_CA8},  // MAC
+    {0, CB8_CA9},  // WIN
 
-    {0, E_16}, // left shift
-    {0, E_14}, // z
-    {0, E_13}, // x
-    {0, E_12}, // c
-    {0, E_11}, // v
-    {0, E_10}, // b
-    {0, E_9},  // b
-    {0, E_8},  // n
-    {0, E_7},  // m
-    {0, E_6},  // ,<
-    {0, E_5},  // .>
-    {0, E_3},  // right shift
-    {0, E_1},  // up
+    {0, CB5_CA16}, // left shift
+    {0, CB5_CA14}, // z
+    {0, CB5_CA13}, // x
+    {0, CB5_CA12}, // c
+    {0, CB5_CA11}, // v
+    {0, CB5_CA10}, // b
+    {0, CB5_CA9},  // b
+    {0, CB5_CA8},  // n
+    {0, CB5_CA7},  // m
+    {0, CB5_CA6},  // ,<
+    {0, CB5_CA5},  // .>
+    {0, CB5_CA3},  // right shift
+    {0, CB5_CA1},  // up
 
-    {0, F_16}, // left ctrl
-    {0, F_15}, // left command
-    {0, F_14}, // left option
-    {0, F_10}, // space
-    {0, F_6},  // right command
-    {0, F_5},  // right option
-    {0, F_4},  // right ctrl
-    {0, F_3},  // Fn
-    {0, F_2},  // left
-    {0, F_1},  // down
-    {0, G_13}, // right
+    {0, CB6_CA16}, // left ctrl
+    {0, CB6_CA15}, // left command
+    {0, CB6_CA14}, // left option
+    {0, CB6_CA10}, // space
+    {0, CB6_CA6},  // right command
+    {0, CB6_CA5},  // right option
+    {0, CB6_CA4},  // right ctrl
+    {0, CB6_CA3},  // Fn
+    {0, CB6_CA2},  // left
+    {0, CB6_CA1},  // down
+    {0, CB7_CA13}, // right
 };
 
 // clang-format on
diff --git a/keyboards/keychron/c1_pro/c1_pro.c b/keyboards/keychron/c1_pro/c1_pro.c
index 607cd958ade..178dca81215 100644
--- a/keyboards/keychron/c1_pro/c1_pro.c
+++ b/keyboards/keychron/c1_pro/c1_pro.c
@@ -16,19 +16,6 @@
 
 #include "quantum.h"
 
-// clang-format off
-
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111101111,
-};
-
-// clang-format on
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/c1_pro/config.h b/keyboards/keychron/c1_pro/config.h
index 2d814904712..f553399f4b2 100644
--- a/keyboards/keychron/c1_pro/config.h
+++ b/keyboards/keychron/c1_pro/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID { { 5, 4 } }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
 #define I2C1_TIMINGR_SCLDEL 3U
diff --git a/keyboards/keychron/c1_pro/info.json b/keyboards/keychron/c1_pro/info.json
index 9c9b4bf16f8..e40c2b99604 100644
--- a/keyboards/keychron/c1_pro/info.json
+++ b/keyboards/keychron/c1_pro/info.json
@@ -8,6 +8,11 @@
     "usb": {
         "vid": "0x3434"
     },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "features": {
         "bootmagic": true,
         "command": false,
@@ -17,6 +22,9 @@
         "mousekey": true,
         "nkro": true
     },
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "H3"],
         "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/config.h b/keyboards/keychron/c2_pro/ansi/rgb/config.h
index 47b47b920dc..64dc7e87160 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/c2_pro/ansi/rgb/config.h
@@ -24,22 +24,8 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xAA, 0xAA, 0x56, 0xAA, 0xAA, 0x56, 0xAA, 0xAA, 0x56, 0xAA, 0xAA, 0x56 }
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 48
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable indicator LED*/
 #define NUM_LED_INDEX 16
 #define CAPS_LED_INDEX 17
 #define MAC_LED_INDEX 18
 #define WIN_LED_INDEX 19
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// 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
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/info.json b/keyboards/keychron/c2_pro/ansi/rgb/info.json
index 1eee0ee1cd9..a7d91c56e42 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/c2_pro/ansi/rgb/info.json
@@ -261,6 +261,7 @@
             {"matrix":[5, 16], "flags":1, "x":180, "y":64},
             {"matrix":[5, 17], "flags":4, "x":198, "y":64},
             {"matrix":[5, 18], "flags":4, "x":214, "y":64}
-        ]
+        ],
+        "sleep": true
     }
 }
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/rgb.c b/keyboards/keychron/c2_pro/ansi/rgb/rgb.c
index d42c2de39e2..4891ceea74e 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/c2_pro/ansi/rgb/rgb.c
@@ -17,126 +17,126 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
 
-    {0, L_6,    J_6,    K_6}, // CapsLock
-    {0, L_7,    J_7,    K_7}, // NumLock
-    {0, L_8,    J_8,    K_8}, // Mac
-    {0, L_4,    J_4,    K_4}, // Win
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6}, // CapsLock
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7}, // NumLock
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8}, // Mac
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4}, // Win
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
-    {1, L_9,    J_9,    K_9},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
 };
 #endif //RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/c2_pro/ansi/white/config.h b/keyboards/keychron/c2_pro/ansi/white/config.h
index 26c812ffeff..60d004d38e6 100644
--- a/keyboards/keychron/c2_pro/ansi/white/config.h
+++ b/keyboards/keychron/c2_pro/ansi/white/config.h
@@ -18,26 +18,11 @@
 
 /* LED Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
-
-/* Set LED driver current */
 #define SNLED27351_CURRENT_TUNE \
     { 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0 }
 
-/* LED Matrix Configuration */
-#define LED_MATRIX_LED_COUNT 108
-
 /* Enable indicator LED*/
 #define NUM_LED_INDEX 16
 #define CAPS_LED_INDEX 17
 #define MAC_LED_INDEX 18
 #define WIN_LED_INDEX 19
-
-/* turn off effects when suspended */
-#define LED_DISABLE_WHEN_USB_SUSPENDED
-
-// LED Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
-// #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
-#define LED_MATRIX_KEYPRESSES
-#define LED_MATRIX_KEYRELEASES
diff --git a/keyboards/keychron/c2_pro/ansi/white/info.json b/keyboards/keychron/c2_pro/ansi/white/info.json
index 4d9b1e12b8a..4c103e966d8 100644
--- a/keyboards/keychron/c2_pro/ansi/white/info.json
+++ b/keyboards/keychron/c2_pro/ansi/white/info.json
@@ -124,8 +124,6 @@
     "led_matrix": {
         "driver": "snled27351",
         "animations": {
-            "none": true,
-            "solid": true,
             "breathing": true,
             "band_pinwheel": true,
             "band_spiral": true,
@@ -256,6 +254,8 @@
             {"matrix":[5, 16], "flags":1, "x":180, "y":64},
             {"matrix":[5, 17], "flags":4, "x":198, "y":64},
             {"matrix":[5, 19], "flags":4, "x":214, "y":64}
-        ]
+        ],
+        "sleep": true,
+        "react_on_keyup": true
     }
 }
diff --git a/keyboards/keychron/c2_pro/ansi/white/white.c b/keyboards/keychron/c2_pro/ansi/white/white.c
index 9c75e73c6db..3b10e550955 100644
--- a/keyboards/keychron/c2_pro/ansi/white/white.c
+++ b/keyboards/keychron/c2_pro/ansi/white/white.c
@@ -18,124 +18,124 @@
 
 // clang-format off
 #ifdef LED_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[LED_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  LED address
  *   |  |   */
-    {0, A_16},
-    {0, A_15},
-    {0, A_14},
-    {0, A_13},
-    {0, A_12},
-    {0, A_11},
-    {0, A_10},
-    {0, A_9 },
-    {0, A_8 },
-    {0, A_7 },
-    {0, A_6 },
-    {0, A_5 },
-    {0, A_4 },
-    {0, A_2 },
-    {0, A_1 },
-    {0, G_1 },
+    {0, CB1_CA16},
+    {0, CB1_CA15},
+    {0, CB1_CA14},
+    {0, CB1_CA13},
+    {0, CB1_CA12},
+    {0, CB1_CA11},
+    {0, CB1_CA10},
+    {0, CB1_CA9 },
+    {0, CB1_CA8 },
+    {0, CB1_CA7 },
+    {0, CB1_CA6 },
+    {0, CB1_CA5 },
+    {0, CB1_CA4 },
+    {0, CB1_CA2 },
+    {0, CB1_CA1 },
+    {0, CB7_CA1 },
 
-    {0, G_2 },
-    {0, G_3 }, // NumLock
-    {0, G_4 }, // Mac
-    {0, G_5 }, // Win
+    {0, CB7_CA2 },
+    {0, CB7_CA3 }, // NumLock
+    {0, CB7_CA4 }, // Mac
+    {0, CB7_CA5 }, // Win
 
-    {0, B_16},
-    {0, B_15},
-    {0, B_14},
-    {0, B_13},
-    {0, B_12},
-    {0, B_11},
-    {0, B_10},
-    {0, B_9 },
-    {0, B_8 },
-    {0, B_7 },
-    {0, B_6 },
-    {0, B_5 },
-    {0, B_4 },
-    {0, B_3 },
-    {0, B_2 },
-    {0, B_1 },
-    {0, H_1 },
-    {0, H_2 },
-    {0, H_3 },
-    {0, H_4 },
-    {0, H_5 },
+    {0, CB2_CA16},
+    {0, CB2_CA15},
+    {0, CB2_CA14},
+    {0, CB2_CA13},
+    {0, CB2_CA12},
+    {0, CB2_CA11},
+    {0, CB2_CA10},
+    {0, CB2_CA9 },
+    {0, CB2_CA8 },
+    {0, CB2_CA7 },
+    {0, CB2_CA6 },
+    {0, CB2_CA5 },
+    {0, CB2_CA4 },
+    {0, CB2_CA3 },
+    {0, CB2_CA2 },
+    {0, CB2_CA1 },
+    {0, CB8_CA1 },
+    {0, CB8_CA2 },
+    {0, CB8_CA3 },
+    {0, CB8_CA4 },
+    {0, CB8_CA5 },
 
-    {0, C_16},
-    {0, C_15},
-    {0, C_14},
-    {0, C_13},
-    {0, C_12},
-    {0, C_11},
-    {0, C_10},
-    {0, C_9 },
-    {0, C_8 },
-    {0, C_7 },
-    {0, C_6 },
-    {0, C_5 },
-    {0, C_4 },
-    {0, C_3 },
-    {0, C_2 },
-    {0, C_1 },
-    {0, G_6 },
-    {0, G_7 },
-    {0, G_8 },
-    {0, G_9 },
-    {0, G_10},
+    {0, CB3_CA16},
+    {0, CB3_CA15},
+    {0, CB3_CA14},
+    {0, CB3_CA13},
+    {0, CB3_CA12},
+    {0, CB3_CA11},
+    {0, CB3_CA10},
+    {0, CB3_CA9 },
+    {0, CB3_CA8 },
+    {0, CB3_CA7 },
+    {0, CB3_CA6 },
+    {0, CB3_CA5 },
+    {0, CB3_CA4 },
+    {0, CB3_CA3 },
+    {0, CB3_CA2 },
+    {0, CB3_CA1 },
+    {0, CB7_CA6 },
+    {0, CB7_CA7 },
+    {0, CB7_CA8 },
+    {0, CB7_CA9 },
+    {0, CB7_CA10},
 
-    {0, D_16},
-    {0, D_15},
-    {0, D_14},
-    {0, D_13},
-    {0, D_12},
-    {0, D_11},
-    {0, D_10},
-    {0, D_9 },
-    {0, D_8 },
-    {0, D_7 },
-    {0, D_6 },
-    {0, D_5 },
-    {0, D_3 },
-    {0, H_7 },
-    {0, H_8 },
-    {0, H_9 },
+    {0, CB4_CA16},
+    {0, CB4_CA15},
+    {0, CB4_CA14},
+    {0, CB4_CA13},
+    {0, CB4_CA12},
+    {0, CB4_CA11},
+    {0, CB4_CA10},
+    {0, CB4_CA9 },
+    {0, CB4_CA8 },
+    {0, CB4_CA7 },
+    {0, CB4_CA6 },
+    {0, CB4_CA5 },
+    {0, CB4_CA3 },
+    {0, CB8_CA7 },
+    {0, CB8_CA8 },
+    {0, CB8_CA9 },
 
-    {0, E_16},
-    {0, E_14},
-    {0, E_13},
-    {0, E_12},
-    {0, E_11},
-    {0, E_10},
-    {0, E_9 },
-    {0, E_8 },
-    {0, E_7 },
-    {0, E_6 },
-    {0, E_5 },
-    {0, E_3 },
-    {0, E_1 },
-    {0, H_6 },
-    {0, H_11},
-    {0, H_12},
-    {0, H_10},
+    {0, CB5_CA16},
+    {0, CB5_CA14},
+    {0, CB5_CA13},
+    {0, CB5_CA12},
+    {0, CB5_CA11},
+    {0, CB5_CA10},
+    {0, CB5_CA9 },
+    {0, CB5_CA8 },
+    {0, CB5_CA7 },
+    {0, CB5_CA6 },
+    {0, CB5_CA5 },
+    {0, CB5_CA3 },
+    {0, CB5_CA1 },
+    {0, CB8_CA6 },
+    {0, CB8_CA11},
+    {0, CB8_CA12},
+    {0, CB8_CA10},
 
-    {0, F_16},
-    {0, F_15},
-    {0, F_14},
-    {0, F_10},
-    {0, F_6 },
-    {0, F_5 },
-    {0, F_4 },
-    {0, F_3 },
-    {0, F_2 },
-    {0, F_1 },
-    {0, G_13},
-    {0, G_11},
-    {0, G_12},
+    {0, CB6_CA16},
+    {0, CB6_CA15},
+    {0, CB6_CA14},
+    {0, CB6_CA10},
+    {0, CB6_CA6 },
+    {0, CB6_CA5 },
+    {0, CB6_CA4 },
+    {0, CB6_CA3 },
+    {0, CB6_CA2 },
+    {0, CB6_CA1 },
+    {0, CB7_CA13},
+    {0, CB7_CA11},
+    {0, CB7_CA12},
 };
 #endif //LED_MATRIX_ENABLE
diff --git a/keyboards/keychron/c2_pro/c2_pro.c b/keyboards/keychron/c2_pro/c2_pro.c
index 2cd58ab4d79..593e4049970 100644
--- a/keyboards/keychron/c2_pro/c2_pro.c
+++ b/keyboards/keychron/c2_pro/c2_pro.c
@@ -16,18 +16,6 @@
 
 #include "quantum.h"
 
-// clang-format off
-const matrix_row_t matrix_mask[] = {
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111101111,
-};
-
-// clang-format on
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/c2_pro/config.h b/keyboards/keychron/c2_pro/config.h
index 6971ebd1aa8..1ddb0c40062 100644
--- a/keyboards/keychron/c2_pro/config.h
+++ b/keyboards/keychron/c2_pro/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID { { 5, 4 } }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
 #define I2C1_TIMINGR_SCLDEL 3U
diff --git a/keyboards/keychron/c2_pro/info.json b/keyboards/keychron/c2_pro/info.json
index dd97dd7adf2..4b11fc213a4 100644
--- a/keyboards/keychron/c2_pro/info.json
+++ b/keyboards/keychron/c2_pro/info.json
@@ -8,6 +8,11 @@
     "usb": {
         "vid": "0x3434"
     },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "features": {
         "bootmagic": true,
         "command": false,
@@ -17,6 +22,9 @@
         "mousekey": true,
         "nkro": true
     },
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "C14"],
         "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
diff --git a/keyboards/keychron/q0/base/base.c b/keyboards/keychron/q0/base/base.c
index 05803234c0f..af33e5c0a36 100644
--- a/keyboards/keychron/q0/base/base.c
+++ b/keyboards/keychron/q0/base/base.c
@@ -20,38 +20,38 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, F_5,    D_5,    E_5}, // 0
-    {0, I_5,    G_5,    H_5}, // 1
-    {0, L_5,    J_5,    K_5}, // 2
-    {0, C_5,    A_5,    B_5}, // 3
-
-    {0, F_4,    D_4,    E_4}, // 4
-    {0, I_4,    G_4,    H_4}, // 5
-    {0, L_4,    J_4,    K_4}, // 6
-    {0, C_4,    A_4,    B_4}, // 7
-
-    {0, F_6,    D_6,    E_6}, // 8
-    {0, I_6,    G_6,    H_6}, // 9
-    {0, L_6,    J_6,    K_6}, // 10
-
-    {0, F_3,    D_3,    E_3}, // 11
-    {0, I_3,    G_3,    H_3}, // 12
-    {0, L_3,    J_3,    K_3}, // 13
-    {0, C_6,    A_6,    B_6}, // 14
-
-    {0, F_2,    D_2,    E_2}, // 15
-    {0, I_2,    G_2,    H_2}, // 16
-    {0, L_2,    J_2,    K_2}, // 17
-
-    {0, F_1,    D_1,    E_1}, // 18
-    {0, L_1,    J_1,    K_1}, // 19
-    {0, C_2,    A_2,    B_2}, // 20
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5}, // 0
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5}, // 1
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5}, // 2
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5}, // 3
+
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4}, // 4
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4}, // 5
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4}, // 6
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4}, // 7
+
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6}, // 8
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6}, // 9
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6}, // 10
+
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3}, // 11
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3}, // 12
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3}, // 13
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6}, // 14
+
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2}, // 15
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2}, // 16
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2}, // 17
+
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1}, // 18
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1}, // 19
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2}, // 20
 };
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/base/config.h b/keyboards/keychron/q0/base/config.h
index 1d6c1a6757f..61500b272cd 100644
--- a/keyboards/keychron/q0/base/config.h
+++ b/keyboards/keychron/q0/base/config.h
@@ -19,8 +19,5 @@
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 21
-
 /* Enable num-lock LED */
 #define NUM_LOCK_LED_INDEX 4
diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h
index 0a6aa2c15e8..ff142ee597e 100644
--- a/keyboards/keychron/q0/config.h
+++ b/keyboards/keychron/q0/config.h
@@ -17,9 +17,3 @@
 #pragma once
 
 #define SNLED27351_CURRENT_TUNE { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 }
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/q0/info.json b/keyboards/keychron/q0/info.json
index 70a726c5208..a3017468311 100644
--- a/keyboards/keychron/q0/info.json
+++ b/keyboards/keychron/q0/info.json
@@ -42,7 +42,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {
diff --git a/keyboards/keychron/q0/plus/config.h b/keyboards/keychron/q0/plus/config.h
index 01320b1f312..cbfdc955f86 100644
--- a/keyboards/keychron/q0/plus/config.h
+++ b/keyboards/keychron/q0/plus/config.h
@@ -19,9 +19,6 @@
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 26
-
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 
 /* Encoder Configuration*/
diff --git a/keyboards/keychron/q0/plus/plus.c b/keyboards/keychron/q0/plus/plus.c
index 0466e1a584e..55f71d2a230 100644
--- a/keyboards/keychron/q0/plus/plus.c
+++ b/keyboards/keychron/q0/plus/plus.c
@@ -20,43 +20,43 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_9,    D_9,    E_9},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
 };
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
index a9df1609e0e..a4432cd4cea 100644
--- a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
@@ -20,106 +20,106 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_2,  A_2,  B_2},  // ESC
-    {0, C_3,  A_3,  B_3},  // F1
-    {0, C_4,  A_4,  B_4},  // F2
-    {0, C_5,  A_5,  B_5},  // F3
-    {0, C_6,  A_6,  B_6},  // F4
-    {0, C_7,  A_7,  B_7},  // F5
-    {0, C_8,  A_8,  B_8},  // F6
-    {0, C_9,  A_9,  B_9},  // F7
-    {0, C_10, A_10, B_10}, // F8
-    {0, C_11, A_11, B_11}, // F9
-    {0, C_12, A_12, B_12}, // F10
-    {0, C_13, A_13, B_13}, // F11
-    {0, C_14, A_14, B_14}, // F12
-    {0, C_15, A_15, B_15}, // INS
-    {0, C_16, A_16, B_16}, // DEL
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // ESC
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // F1
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // F2
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // F3
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // F4
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // F5
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // F6
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // F7
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
 
-    {0, I_1,  G_1,  H_1},  // M1
-    {0, I_2,  G_2,  H_2},  // `~
-    {0, I_3,  G_3,  H_3},  // 1!
-    {0, I_4,  G_4,  H_4},  // 2@
-    {0, I_5,  G_5,  H_5},  // 3#
-    {0, I_6,  G_6,  H_6},  // 4$
-    {0, I_7,  G_7,  H_7},  // 5%
-    {0, I_8,  G_8,  H_8},  // 6^
-    {0, I_9,  G_9,  H_9},  // 7&
-    {0, I_10, G_10, H_10}, // 8*
-    {0, I_11, G_11, H_11}, // 9(
-    {0, I_12, G_12, H_12}, // 0)
-    {0, I_13, G_13, H_13}, // -_
-    {0, I_14, G_14, H_14}, // =+
-    {0, I_15, G_15, H_15}, // BackSpace
-    {0, I_16, G_16, H_16}, // PgUp
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // M1
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // `~
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // 1!
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // 2@
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // 3#
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // 4$
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // 5%
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // 6^
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // 7&
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
 
-    {0, F_1,  D_1,  E_1},  // M2
-    {0, F_2,  D_2,  E_2},  // TAB
-    {0, F_3,  D_3,  E_3},  // Q
-    {0, F_4,  D_4,  E_4},  // W
-    {0, F_5,  D_5,  E_5},  // E
-    {0, F_6,  D_6,  E_6},  // R
-    {0, F_7,  D_7,  E_7},  // T
-    {0, F_8,  D_8,  E_8},  // Y
-    {0, F_9,  D_9,  E_9},  // U
-    {0, F_10, D_10, E_10}, // I
-    {0, F_11, D_11, E_11}, // O
-    {0, F_12, D_12, E_12}, // P
-    {0, F_13, D_13, E_13}, // [
-    {0, F_14, D_14, E_14}, // ]
-    {0, F_15, D_15, E_15}, // |
-    {0, F_16, D_16, E_16}, // PgDn
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // M2
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // TAB
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Q
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // W
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // E
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // R
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // T
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Y
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // U
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
 
-    {1, C_16, A_16, B_16}, // M3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_8,  A_8,  B_8},  // H
-    {1, C_7,  A_7,  B_7},  // J
-    {1, C_6,  A_6,  B_6},  // K
-    {1, C_5,  A_5,  B_5},  // L
-    {1, C_4,  A_4,  B_4},  // ;
-    {1, C_3,  A_3,  B_3},  // '
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // Home
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // H
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // J
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // K
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // L
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // ;
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // '
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Home
 
-    {1, I_16, G_16, H_16}, // M4
-    {1, I_15, G_15, H_15}, // Shift_L
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // B
-    {1, I_7,  G_7,  H_7},  // N
-    {1, I_6,  G_6,  H_6},  // M
-    {1, I_5,  G_5,  H_5},  // ,
-    {1, I_4,  G_4,  H_4},  // .
-    {1, I_3,  G_3,  H_3},  // ?
-    {1, I_2,  G_2,  H_2},  // Shift_R
-    {1, I_1,  G_1,  H_1},  // Up
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // B
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // N
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // M
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ,
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // .
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // ?
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Shift_R
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Up
 
-    {1, F_16, D_16, E_16}, // M5
-    {1, F_15, D_15, E_15}, // Ctrl_L
-    {1, F_14, D_14, E_14}, // Win_L
-    {1, F_13, D_13, E_13}, // Alt_L
-    {1, F_12, D_12, E_12}, // Space
-    {1, F_9,  D_9,  E_9},  // Fn
-    {1, F_8,  D_8,  E_8},  // Space
-    {1, F_7,  D_7,  E_7},  // Alt_R
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Fn
+    {1, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Space
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // Alt_R
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q10/ansi_encoder/config.h b/keyboards/keychron/q10/ansi_encoder/config.h
index 9012abd4f75..917507abc8a 100644
--- a/keyboards/keychron/q10/ansi_encoder/config.h
+++ b/keyboards/keychron/q10/ansi_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 47
-#define DRIVER_2_LED_TOTAL 41
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json
index da2cb106e3d..c40c6054268 100644
--- a/keyboards/keychron/q10/ansi_encoder/info.json
+++ b/keyboards/keychron/q10/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x01A1",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q10/config.h b/keyboards/keychron/q10/config.h
index eb3a56e9ad7..4a39a5f7620 100644
--- a/keyboards/keychron/q10/config.h
+++ b/keyboards/keychron/q10/config.h
@@ -43,68 +43,3 @@
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 #define SNLED27351_CURRENT_TUNE \
     { 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A }
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5,5} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q10/info.json b/keyboards/keychron/q10/info.json
new file mode 100644
index 00000000000..636ef2d9a23
--- /dev/null
+++ b/keyboards/keychron/q10/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [5, 5] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/q10/iso_encoder/config.h b/keyboards/keychron/q10/iso_encoder/config.h
index 7a5646c56e2..f8ea2080474 100644
--- a/keyboards/keychron/q10/iso_encoder/config.h
+++ b/keyboards/keychron/q10/iso_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 47
-#define DRIVER_2_LED_TOTAL 42
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json
index 08e6b2deae7..ce5223df616 100644
--- a/keyboards/keychron/q10/iso_encoder/info.json
+++ b/keyboards/keychron/q10/iso_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x01A3",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.c b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
index fbe4bca6370..9ff43263b2d 100644
--- a/keyboards/keychron/q10/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
@@ -20,107 +20,107 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_2,  A_2,  B_2},  // ESC
-    {0, C_3,  A_3,  B_3},  // F1
-    {0, C_4,  A_4,  B_4},  // F2
-    {0, C_5,  A_5,  B_5},  // F3
-    {0, C_6,  A_6,  B_6},  // F4
-    {0, C_7,  A_7,  B_7},  // F5
-    {0, C_8,  A_8,  B_8},  // F6
-    {0, C_9,  A_9,  B_9},  // F7
-    {0, C_10, A_10, B_10}, // F8
-    {0, C_11, A_11, B_11}, // F9
-    {0, C_12, A_12, B_12}, // F10
-    {0, C_13, A_13, B_13}, // F11
-    {0, C_14, A_14, B_14}, // F12
-    {0, C_15, A_15, B_15}, // INS
-    {0, C_16, A_16, B_16}, // DEL
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // ESC
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // F1
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // F2
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // F3
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // F4
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // F5
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // F6
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // F7
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
 
-    {0, I_1,  G_1,  H_1},  // M1
-    {0, I_2,  G_2,  H_2},  // `~
-    {0, I_3,  G_3,  H_3},  // 1!
-    {0, I_4,  G_4,  H_4},  // 2@
-    {0, I_5,  G_5,  H_5},  // 3#
-    {0, I_6,  G_6,  H_6},  // 4$
-    {0, I_7,  G_7,  H_7},  // 5%
-    {0, I_8,  G_8,  H_8},  // 6^
-    {0, I_9,  G_9,  H_9},  // 7&
-    {0, I_10, G_10, H_10}, // 8*
-    {0, I_11, G_11, H_11}, // 9(
-    {0, I_12, G_12, H_12}, // 0)
-    {0, I_13, G_13, H_13}, // -_
-    {0, I_14, G_14, H_14}, // =+
-    {0, I_15, G_15, H_15}, // BackSpace
-    {0, I_16, G_16, H_16}, // PgUp
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // M1
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // `~
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // 1!
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // 2@
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // 3#
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // 4$
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // 5%
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // 6^
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // 7&
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
 
-    {0, F_1,  D_1,  E_1},  // M2
-    {0, F_2,  D_2,  E_2},  // TAB
-    {0, F_3,  D_3,  E_3},  // Q
-    {0, F_4,  D_4,  E_4},  // W
-    {0, F_5,  D_5,  E_5},  // E
-    {0, F_6,  D_6,  E_6},  // R
-    {0, F_7,  D_7,  E_7},  // T
-    {0, F_8,  D_8,  E_8},  // Y
-    {0, F_9,  D_9,  E_9},  // U
-    {0, F_10, D_10, E_10}, // I
-    {0, F_11, D_11, E_11}, // O
-    {0, F_12, D_12, E_12}, // P
-    {0, F_13, D_13, E_13}, // [
-    {0, F_14, D_14, E_14}, // ]
-    {0, F_16, D_16, E_16}, // PgDn
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // M2
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // TAB
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Q
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // W
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // E
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // R
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // T
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Y
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // U
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
 
-    {1, C_16, A_16, B_16}, // M3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_8,  A_8,  B_8},  // H
-    {1, C_7,  A_7,  B_7},  // J
-    {1, C_6,  A_6,  B_6},  // K
-    {1, C_5,  A_5,  B_5},  // L
-    {1, C_4,  A_4,  B_4},  // ;
-    {1, C_3,  A_3,  B_3},  // '
-    {0, F_15, D_15, E_15}, // |
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // Home
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // H
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // J
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // K
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // L
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // ;
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // '
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Home
 
-    {1, I_16, G_16, H_16}, // M4
-    {1, I_15, G_15, H_15}, // Shift_L
-    {1, I_14, G_14, H_14},
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // B
-    {1, I_7,  G_7,  H_7},  // N
-    {1, I_6,  G_6,  H_6},  // M
-    {1, I_5,  G_5,  H_5},  // ,
-    {1, I_4,  G_4,  H_4},  // .
-    {1, I_3,  G_3,  H_3},  // ?
-    {1, I_2,  G_2,  H_2},  // Shift_R
-    {1, I_1,  G_1,  H_1},  // Up
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+    {1, CB9_CA14, CB7_CA14, CB8_CA14},
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // B
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // N
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // M
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ,
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // .
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // ?
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Shift_R
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Up
 
-    {1, F_16, D_16, E_16}, // M5
-    {1, F_15, D_15, E_15}, // Ctrl_L
-    {1, F_14, D_14, E_14}, // Win_L
-    {1, F_13, D_13, E_13}, // Alt_L
-    {1, F_12, D_12, E_12}, // Space
-    {1, F_9,  D_9,  E_9},  // Fn
-    {1, F_8,  D_8,  E_8},  // Space
-    {1, F_7,  D_7,  E_7},  // Alt_R
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Fn
+    {1, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Space
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // Alt_R
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q10/q10.c b/keyboards/keychron/q10/q10.c
index 455a2a25f28..754b1481750 100644
--- a/keyboards/keychron/q10/q10.c
+++ b/keyboards/keychron/q10/q10.c
@@ -16,15 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111011111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
index f7acae7addb..49e428bc00d 100644
--- a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
@@ -17,112 +17,112 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, A_2,  C_2,  B_2},  // ESC
-    {0, A_3,  C_3,  B_3},  // F1
-    {0, A_4,  C_4,  B_4},  // F2
-    {0, A_5,  C_5,  B_5},  // F3
-    {0, A_6,  C_6,  B_6},  // F4
-    {0, A_7,  C_7,  B_7},  // F5
-    {0, A_8,  C_8,  B_8},  // F6
+    {0, CB1_CA2,  CB3_CA2,  CB2_CA2},  // ESC
+    {0, CB1_CA3,  CB3_CA3,  CB2_CA3},  // F1
+    {0, CB1_CA4,  CB3_CA4,  CB2_CA4},  // F2
+    {0, CB1_CA5,  CB3_CA5,  CB2_CA5},  // F3
+    {0, CB1_CA6,  CB3_CA6,  CB2_CA6},  // F4
+    {0, CB1_CA7,  CB3_CA7,  CB2_CA7},  // F5
+    {0, CB1_CA8,  CB3_CA8,  CB2_CA8},  // F6
 
-    {0, D_1,  F_1,  E_1},  // M1
-    {0, D_2,  F_2,  E_2},  // `~
-    {0, D_3,  F_3,  E_3},  // 1!
-    {0, D_4,  F_4,  E_4},  // 2@
-    {0, D_5,  F_5,  E_5},  // 3#
-    {0, D_6,  F_6,  E_6},  // 4$
-    {0, D_7,  F_7,  E_7},  // 5%
-    {0, D_8,  F_8,  E_8},  // 6^
+    {0, CB4_CA1,  CB6_CA1,  CB5_CA1},  // M1
+    {0, CB4_CA2,  CB6_CA2,  CB5_CA2},  // `~
+    {0, CB4_CA3,  CB6_CA3,  CB5_CA3},  // 1!
+    {0, CB4_CA4,  CB6_CA4,  CB5_CA4},  // 2@
+    {0, CB4_CA5,  CB6_CA5,  CB5_CA5},  // 3#
+    {0, CB4_CA6,  CB6_CA6,  CB5_CA6},  // 4$
+    {0, CB4_CA7,  CB6_CA7,  CB5_CA7},  // 5%
+    {0, CB4_CA8,  CB6_CA8,  CB5_CA8},  // 6^
 
-    {0, G_1,  I_1,  H_1},  // M2
-    {0, G_2,  I_2,  H_2},  // TAB
-    {0, G_3,  I_3,  H_3},  // Q
-    {0, G_4,  I_4,  H_4},  // W
-    {0, G_5,  I_5,  H_5},  // E
-    {0, G_6,  I_6,  H_6},  // R
-    {0, G_7,  I_7,  H_7},  // T
+    {0, CB7_CA1,  CB9_CA1,  CB8_CA1},  // M2
+    {0, CB7_CA2,  CB9_CA2,  CB8_CA2},  // TAB
+    {0, CB7_CA3,  CB9_CA3,  CB8_CA3},  // Q
+    {0, CB7_CA4,  CB9_CA4,  CB8_CA4},  // W
+    {0, CB7_CA5,  CB9_CA5,  CB8_CA5},  // E
+    {0, CB7_CA6,  CB9_CA6,  CB8_CA6},  // R
+    {0, CB7_CA7,  CB9_CA7,  CB8_CA7},  // T
 
-    {0, J_1,  L_1,  K_1},  // M3
-    {0, J_2,  L_2,  K_2},  // CapsJock
-    {0, J_3,  L_3,  K_3},  // A
-    {0, J_4,  L_4,  K_4},  // S
-    {0, J_5,  L_5,  K_5},  // D
-    {0, J_6,  L_6,  K_6},  // F
-    {0, J_7,  L_7,  K_7},  // G
+    {0, CB10_CA1,  CB12_CA1,  CB11_CA1},  // M3
+    {0, CB10_CA2,  CB12_CA2,  CB11_CA2},  // CapsJock
+    {0, CB10_CA3,  CB12_CA3,  CB11_CA3},  // A
+    {0, CB10_CA4,  CB12_CA4,  CB11_CA4},  // S
+    {0, CB10_CA5,  CB12_CA5,  CB11_CA5},  // D
+    {0, CB10_CA6,  CB12_CA6,  CB11_CA6},  // F
+    {0, CB10_CA7,  CB12_CA7,  CB11_CA7},  // G
 
-    {0, J_9,  L_9,  K_9},  // M4
-    {0, J_11, L_11, K_11}, // Shift_J
-    {0, J_12, L_12, K_12}, // Z
-    {0, J_13, L_13, K_13}, // X
-    {0, J_14, L_14, K_14}, // C
-    {0, J_15, L_15, K_15}, // V
-    {0, J_16, L_16, K_16}, // B
+    {0, CB10_CA9,  CB12_CA9,  CB11_CA9},  // M4
+    {0, CB10_CA11, CB12_CA11, CB11_CA11}, // Shift_J
+    {0, CB10_CA12, CB12_CA12, CB11_CA12}, // Z
+    {0, CB10_CA13, CB12_CA13, CB11_CA13}, // X
+    {0, CB10_CA14, CB12_CA14, CB11_CA14}, // C
+    {0, CB10_CA15, CB12_CA15, CB11_CA15}, // V
+    {0, CB10_CA16, CB12_CA16, CB11_CA16}, // B
 
-    {0, G_9,  I_9,  H_9},  // M5
-    {0, G_10, I_10, H_10}, // Ctrl_L
-    {0, G_11, I_11, H_11}, // WGn_L
-    {0, G_12, I_12, H_12}, // Alt_L
-    {0, G_13, I_13, H_13}, // Fn
-    {0, G_15, I_15, H_15}, // Space
+    {0, CB7_CA9,  CB9_CA9,  CB8_CA9},  // M5
+    {0, CB7_CA10, CB9_CA10, CB8_CA10}, // Ctrl_L
+    {0, CB7_CA11, CB9_CA11, CB8_CA11}, // WGn_L
+    {0, CB7_CA12, CB9_CA12, CB8_CA12}, // Alt_L
+    {0, CB7_CA13, CB9_CA13, CB8_CA13}, // Fn
+    {0, CB7_CA15, CB9_CA15, CB8_CA15}, // Space
 
-    {0, A_16, C_16, B_16}, // F7
-    {0, A_15, C_15, B_15}, // F8
-    {0, A_14, C_14, B_14}, // F9
-    {0, A_13, C_13, B_13}, // F11
-    {0, A_12, C_12, B_12}, // F11
-    {0, A_11, C_11, B_11}, // F12
-    {0, A_10, C_10, B_10}, // INS
-    {0, A_9,  C_9,  B_9},  // DEL
+    {0, CB1_CA16, CB3_CA16, CB2_CA16}, // F7
+    {0, CB1_CA15, CB3_CA15, CB2_CA15}, // F8
+    {0, CB1_CA14, CB3_CA14, CB2_CA14}, // F9
+    {0, CB1_CA13, CB3_CA13, CB2_CA13}, // F11
+    {0, CB1_CA12, CB3_CA12, CB2_CA12}, // F11
+    {0, CB1_CA11, CB3_CA11, CB2_CA11}, // F12
+    {0, CB1_CA10, CB3_CA10, CB2_CA10}, // INS
+    {0, CB1_CA9,  CB3_CA9,  CB2_CA9},  // DEL
 
-    {0, D_16, F_16, E_16}, // 7&
-    {0, D_15, F_15, E_15}, // 8*
-    {0, D_14, F_14, E_14}, // 9(
-    {0, D_13, F_13, E_13}, // 1)
-    {0, D_12, F_12, E_12}, // -_
-    {0, D_11, F_11, E_11}, // =+
-    {0, D_10, F_10, E_10}, // BackSpace
-    {0, D_8,  F_8,  E_8},  // PgUp
+    {0, CB4_CA16, CB6_CA16, CB5_CA16}, // 7&
+    {0, CB4_CA15, CB6_CA15, CB5_CA15}, // 8*
+    {0, CB4_CA14, CB6_CA14, CB5_CA14}, // 9(
+    {0, CB4_CA13, CB6_CA13, CB5_CA13}, // 1)
+    {0, CB4_CA12, CB6_CA12, CB5_CA12}, // -_
+    {0, CB4_CA11, CB6_CA11, CB5_CA11}, // =+
+    {0, CB4_CA10, CB6_CA10, CB5_CA10}, // BackSpace
+    {0, CB4_CA8,  CB6_CA8,  CB5_CA8},  // PgUp
 
-    {0, G_16, I_16, H_16}, // Y
-    {0, G_15, I_15, H_15}, // U
-    {0, G_14, I_14, H_14}, // G
-    {0, G_13, I_13, H_13}, // O
-    {0, G_12, I_12, H_12}, // P
-    {0, G_11, I_11, H_11}, // [
-    {0, G_10, I_10, H_10}, // ]
-    {0, G_9,  I_9,  H_9},  // \||
-    {0, G_8,  I_8,  H_8},  // PgDn
+    {0, CB7_CA16, CB9_CA16, CB8_CA16}, // Y
+    {0, CB7_CA15, CB9_CA15, CB8_CA15}, // U
+    {0, CB7_CA14, CB9_CA14, CB8_CA14}, // G
+    {0, CB7_CA13, CB9_CA13, CB8_CA13}, // O
+    {0, CB7_CA12, CB9_CA12, CB8_CA12}, // P
+    {0, CB7_CA11, CB9_CA11, CB8_CA11}, // [
+    {0, CB7_CA10, CB9_CA10, CB8_CA10}, // ]
+    {0, CB7_CA9,  CB9_CA9,  CB8_CA9},  // \||
+    {0, CB7_CA8,  CB9_CA8,  CB8_CA8},  // PgDn
 
-    {0, J_16, L_16, K_16}, // H
-    {0, J_15, L_15, K_15}, // J
-    {0, J_14, L_14, K_14}, // KKEY_PRESS_HOME
-    {0, J_13, L_13, K_13}, // J
-    {0, J_12, L_12, K_12}, // ;:
-    {0, J_11, L_11, K_11}, // '"
-    {0, J_9,  L_9,  K_9},  // Enter
-    {0, J_8,  L_8,  K_8},  // Home
+    {0, CB10_CA16, CB12_CA16, CB11_CA16}, // H
+    {0, CB10_CA15, CB12_CA15, CB11_CA15}, // J
+    {0, CB10_CA14, CB12_CA14, CB11_CA14}, // KKEY_PRESS_HOME
+    {0, CB10_CA13, CB12_CA13, CB11_CA13}, // J
+    {0, CB10_CA12, CB12_CA12, CB11_CA12}, // ;:
+    {0, CB10_CA11, CB12_CA11, CB11_CA11}, // '"
+    {0, CB10_CA9,  CB12_CA9,  CB11_CA9},  // Enter
+    {0, CB10_CA8,  CB12_CA8,  CB11_CA8},  // Home
 
-    {0, J_7,  L_7,  K_7},  // N
-    {0, J_6,  L_6,  K_6},  // M
-    {0, J_5,  L_5,  K_5},  // ,<
-    {0, J_4,  L_4,  K_4},  // .>
-    {0, J_3,  L_3,  K_3},  // ?/
-    {0, J_2,  L_2,  K_2},  // Shift_R
-    {0, J_1,  L_1,  K_1},  // Up
+    {0, CB10_CA7,  CB12_CA7,  CB11_CA7},  // N
+    {0, CB10_CA6,  CB12_CA6,  CB11_CA6},  // M
+    {0, CB10_CA5,  CB12_CA5,  CB11_CA5},  // ,<
+    {0, CB10_CA4,  CB12_CA4,  CB11_CA4},  // .>
+    {0, CB10_CA3,  CB12_CA3,  CB11_CA3},  // ?/
+    {0, CB10_CA2,  CB12_CA2,  CB11_CA2},  // Shift_R
+    {0, CB10_CA1,  CB12_CA1,  CB11_CA1},  // Up
 
-    {0, G_6,  I_6,  H_6},  // Space
-    {0, G_5,  I_5,  H_5},  // Win_R
-    {0, G_4,  I_4,  H_4},  // Fn
-    {0, G_3,  I_3,  H_3},  // Ctrl_R
-    {0, G_2,  I_2,  H_2},  // Left
-    {0, G_1,  I_1,  H_1},  // Down
-    {0, G_7,  I_7,  H_7},  // Right
+    {0, CB7_CA6,  CB9_CA6,  CB8_CA6},  // Space
+    {0, CB7_CA5,  CB9_CA5,  CB8_CA5},  // Win_R
+    {0, CB7_CA4,  CB9_CA4,  CB8_CA4},  // Fn
+    {0, CB7_CA3,  CB9_CA3,  CB8_CA3},  // Ctrl_R
+    {0, CB7_CA2,  CB9_CA2,  CB8_CA2},  // Left
+    {0, CB7_CA1,  CB9_CA1,  CB8_CA1},  // Down
+    {0, CB7_CA7,  CB9_CA7,  CB8_CA7},  // Right
 };
 #endif
diff --git a/keyboards/keychron/q11/ansi_encoder/config.h b/keyboards/keychron/q11/ansi_encoder/config.h
index 60bdc493de5..08632f0ce72 100644
--- a/keyboards/keychron/q11/ansi_encoder/config.h
+++ b/keyboards/keychron/q11/ansi_encoder/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 89
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 23
diff --git a/keyboards/keychron/q11/config.h b/keyboards/keychron/q11/config.h
index 0d6b9c9c486..b1b40c98ab9 100644
--- a/keyboards/keychron/q11/config.h
+++ b/keyboards/keychron/q11/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-// Connects each switch in the dip switch to the GPIO pin of the MCU
-#define DIP_SWITCH_PINS \
-    { A8 }
-
-/* handedness */
-#define SPLIT_HAND_MATRIX_GRID A2, A15
-#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
-
-#define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `q11.c`
-
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
@@ -39,21 +29,12 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0x80, 0xFF, 0xFF, 0x80, 0xFF, 0xFF, 0x80, 0xFF, 0xFF, 0x80, 0xFF, 0xFF } // 300mA
 
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
 /* Split Keyboard specific options. */
 #define SERIAL_USART_TX_PIN A9 // USART TX pin
 
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// 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
+// Needed as the master side could enter slave state during poweron
+// of host, due to missing VUSB detection.
+#define SPLIT_WATCHDOG_ENABLE
diff --git a/keyboards/keychron/q11/info.json b/keyboards/keychron/q11/info.json
index f240c708010..db70d2b7b68 100644
--- a/keyboards/keychron/q11/info.json
+++ b/keyboards/keychron/q11/info.json
@@ -11,6 +11,14 @@
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "dip_switch": {
+        "pins": ["A8"]
+    },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "features": {
         "bootmagic": true,
         "command": false,
@@ -36,6 +44,9 @@
                 ]
             }
         },
+        "handedness": {
+            "matrix_grid": ["A2", "A15"]
+        },
         "matrix_pins": {
             "right": {
                 "cols": ["A8", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
@@ -84,7 +95,8 @@
             "solid_reactive_multinexus": true,
             "splash": true,
             "solid_splash": true
-        }
+        },
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_91_ansi": {
diff --git a/keyboards/keychron/q11/iso_encoder/config.h b/keyboards/keychron/q11/iso_encoder/config.h
index 57baea4c694..08632f0ce72 100644
--- a/keyboards/keychron/q11/iso_encoder/config.h
+++ b/keyboards/keychron/q11/iso_encoder/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 90
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 23
diff --git a/keyboards/keychron/q11/iso_encoder/iso_encoder.c b/keyboards/keychron/q11/iso_encoder/iso_encoder.c
index a2db569710a..8725598b1c2 100644
--- a/keyboards/keychron/q11/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q11/iso_encoder/iso_encoder.c
@@ -17,113 +17,113 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |     G location
  *   |  |     |     B location
  *   |  |     |     | */
-    {0, A_2,  C_2,  B_2},  // ESC
-    {0, A_3,  C_3,  B_3},  // F1
-    {0, A_4,  C_4,  B_4},  // F2
-    {0, A_5,  C_5,  B_5},  // F3
-    {0, A_6,  C_6,  B_6},  // F4
-    {0, A_7,  C_7,  B_7},  // F5
-    {0, A_8,  C_8,  B_8},  // F6
+    {0, CB1_CA2,  CB3_CA2,  CB2_CA2},  // ESC
+    {0, CB1_CA3,  CB3_CA3,  CB2_CA3},  // F1
+    {0, CB1_CA4,  CB3_CA4,  CB2_CA4},  // F2
+    {0, CB1_CA5,  CB3_CA5,  CB2_CA5},  // F3
+    {0, CB1_CA6,  CB3_CA6,  CB2_CA6},  // F4
+    {0, CB1_CA7,  CB3_CA7,  CB2_CA7},  // F5
+    {0, CB1_CA8,  CB3_CA8,  CB2_CA8},  // F6
 
-    {0, D_1,  F_1,  E_1},  // M1
-    {0, D_2,  F_2,  E_2},  // `~
-    {0, D_3,  F_3,  E_3},  // 1!
-    {0, D_4,  F_4,  E_4},  // 2@
-    {0, D_5,  F_5,  E_5},  // 3#
-    {0, D_6,  F_6,  E_6},  // 4$
-    {0, D_7,  F_7,  E_7},  // 5%
-    {0, D_8,  F_8,  E_8},  // 6^
+    {0, CB4_CA1,  CB6_CA1,  CB5_CA1},  // M1
+    {0, CB4_CA2,  CB6_CA2,  CB5_CA2},  // `~
+    {0, CB4_CA3,  CB6_CA3,  CB5_CA3},  // 1!
+    {0, CB4_CA4,  CB6_CA4,  CB5_CA4},  // 2@
+    {0, CB4_CA5,  CB6_CA5,  CB5_CA5},  // 3#
+    {0, CB4_CA6,  CB6_CA6,  CB5_CA6},  // 4$
+    {0, CB4_CA7,  CB6_CA7,  CB5_CA7},  // 5%
+    {0, CB4_CA8,  CB6_CA8,  CB5_CA8},  // 6^
 
-    {0, G_1,  I_1,  H_1},  // M2
-    {0, G_2,  I_2,  H_2},  // TAB
-    {0, G_3,  I_3,  H_3},  // Q
-    {0, G_4,  I_4,  H_4},  // W
-    {0, G_5,  I_5,  H_5},  // E
-    {0, G_6,  I_6,  H_6},  // R
-    {0, G_7,  I_7,  H_7},  // T
+    {0, CB7_CA1,  CB9_CA1,  CB8_CA1},  // M2
+    {0, CB7_CA2,  CB9_CA2,  CB8_CA2},  // TAB
+    {0, CB7_CA3,  CB9_CA3,  CB8_CA3},  // Q
+    {0, CB7_CA4,  CB9_CA4,  CB8_CA4},  // W
+    {0, CB7_CA5,  CB9_CA5,  CB8_CA5},  // E
+    {0, CB7_CA6,  CB9_CA6,  CB8_CA6},  // R
+    {0, CB7_CA7,  CB9_CA7,  CB8_CA7},  // T
 
-    {0, J_1,  L_1,  K_1},  // M3
-    {0, J_2,  L_2,  K_2},  // CapsJock
-    {0, J_3,  L_3,  K_3},  // A
-    {0, J_4,  L_4,  K_4},  // S
-    {0, J_5,  L_5,  K_5},  // D
-    {0, J_6,  L_6,  K_6},  // F
-    {0, J_7,  L_7,  K_7},  // G
+    {0, CB10_CA1,  CB12_CA1,  CB11_CA1},  // M3
+    {0, CB10_CA2,  CB12_CA2,  CB11_CA2},  // CapsJock
+    {0, CB10_CA3,  CB12_CA3,  CB11_CA3},  // A
+    {0, CB10_CA4,  CB12_CA4,  CB11_CA4},  // S
+    {0, CB10_CA5,  CB12_CA5,  CB11_CA5},  // D
+    {0, CB10_CA6,  CB12_CA6,  CB11_CA6},  // F
+    {0, CB10_CA7,  CB12_CA7,  CB11_CA7},  // G
 
-    {0, J_9,  L_9,  K_9},  // M4
-    {0, J_10, L_10, K_10}, // Shift_L
-    {0, J_11, L_11, K_11}, // NUBS
-    {0, J_12, L_12, K_12}, // Z
-    {0, J_13, L_13, K_13}, // X
-    {0, J_14, L_14, K_14}, // C
-    {0, J_15, L_15, K_15}, // V
-    {0, J_16, L_16, K_16}, // B
+    {0, CB10_CA9,  CB12_CA9,  CB11_CA9},  // M4
+    {0, CB10_CA10, CB12_CA10, CB11_CA10}, // Shift_L
+    {0, CB10_CA11, CB12_CA11, CB11_CA11}, // NUBS
+    {0, CB10_CA12, CB12_CA12, CB11_CA12}, // Z
+    {0, CB10_CA13, CB12_CA13, CB11_CA13}, // X
+    {0, CB10_CA14, CB12_CA14, CB11_CA14}, // C
+    {0, CB10_CA15, CB12_CA15, CB11_CA15}, // V
+    {0, CB10_CA16, CB12_CA16, CB11_CA16}, // B
 
-    {0, G_9,  I_9,  H_9},  // M5
-    {0, G_10, I_10, H_10}, // Ctrl_L
-    {0, G_11, I_11, H_11}, // WGn_L
-    {0, G_12, I_12, H_12}, // Alt_L
-    {0, G_13, I_13, H_13}, // Fn
-    {0, G_15, I_15, H_15}, // Space
+    {0, CB7_CA9,  CB9_CA9,  CB8_CA9},  // M5
+    {0, CB7_CA10, CB9_CA10, CB8_CA10}, // Ctrl_L
+    {0, CB7_CA11, CB9_CA11, CB8_CA11}, // WGn_L
+    {0, CB7_CA12, CB9_CA12, CB8_CA12}, // Alt_L
+    {0, CB7_CA13, CB9_CA13, CB8_CA13}, // Fn
+    {0, CB7_CA15, CB9_CA15, CB8_CA15}, // Space
 
-    {0, A_16, C_16, B_16}, // F7
-    {0, A_15, C_15, B_15}, // F8
-    {0, A_14, C_14, B_14}, // F9
-    {0, A_13, C_13, B_13}, // F11
-    {0, A_12, C_12, B_12}, // F11
-    {0, A_11, C_11, B_11}, // F12
-    {0, A_10, C_10, B_10}, // INS
-    {0, A_9,  C_9,  B_9},  // DEL
+    {0, CB1_CA16, CB3_CA16, CB2_CA16}, // F7
+    {0, CB1_CA15, CB3_CA15, CB2_CA15}, // F8
+    {0, CB1_CA14, CB3_CA14, CB2_CA14}, // F9
+    {0, CB1_CA13, CB3_CA13, CB2_CA13}, // F11
+    {0, CB1_CA12, CB3_CA12, CB2_CA12}, // F11
+    {0, CB1_CA11, CB3_CA11, CB2_CA11}, // F12
+    {0, CB1_CA10, CB3_CA10, CB2_CA10}, // INS
+    {0, CB1_CA9,  CB3_CA9,  CB2_CA9},  // DEL
 
-    {0, D_16, F_16, E_16}, // 7&
-    {0, D_15, F_15, E_15}, // 8*
-    {0, D_14, F_14, E_14}, // 9(
-    {0, D_13, F_13, E_13}, // 1)
-    {0, D_12, F_12, E_12}, // -_
-    {0, D_11, F_11, E_11}, // =+
-    {0, D_10, F_10, E_10}, // BackSpace
-    {0, D_8,  F_8,  E_8},  // PgUp
+    {0, CB4_CA16, CB6_CA16, CB5_CA16}, // 7&
+    {0, CB4_CA15, CB6_CA15, CB5_CA15}, // 8*
+    {0, CB4_CA14, CB6_CA14, CB5_CA14}, // 9(
+    {0, CB4_CA13, CB6_CA13, CB5_CA13}, // 1)
+    {0, CB4_CA12, CB6_CA12, CB5_CA12}, // -_
+    {0, CB4_CA11, CB6_CA11, CB5_CA11}, // =+
+    {0, CB4_CA10, CB6_CA10, CB5_CA10}, // BackSpace
+    {0, CB4_CA8,  CB6_CA8,  CB5_CA8},  // PgUp
 
-    {0, G_16, I_16, H_16}, // Y
-    {0, G_15, I_15, H_15}, // U
-    {0, G_14, I_14, H_14}, // G
-    {0, G_13, I_13, H_13}, // O
-    {0, G_12, I_12, H_12}, // P
-    {0, G_11, I_11, H_11}, // [
-    {0, G_10, I_10, H_10}, // ]
-    {0, G_8,  I_8,  H_8},  // PgDn
+    {0, CB7_CA16, CB9_CA16, CB8_CA16}, // Y
+    {0, CB7_CA15, CB9_CA15, CB8_CA15}, // U
+    {0, CB7_CA14, CB9_CA14, CB8_CA14}, // G
+    {0, CB7_CA13, CB9_CA13, CB8_CA13}, // O
+    {0, CB7_CA12, CB9_CA12, CB8_CA12}, // P
+    {0, CB7_CA11, CB9_CA11, CB8_CA11}, // [
+    {0, CB7_CA10, CB9_CA10, CB8_CA10}, // ]
+    {0, CB7_CA8,  CB9_CA8,  CB8_CA8},  // PgDn
 
-    {0, J_16, L_16, K_16}, // H
-    {0, J_15, L_15, K_15}, // J
-    {0, J_14, L_14, K_14}, // KKEY_PRESS_HOME
-    {0, J_13, L_13, K_13}, // J
-    {0, J_12, L_12, K_12}, // ;:
-    {0, J_11, L_11, K_11}, // '"
-    {0, J_9,  L_9,  K_9},  // NUHS
-    {0, G_9,  I_9,  H_9},  // Enter
-    {0, J_8,  L_8,  K_8},  // Home
+    {0, CB10_CA16, CB12_CA16, CB11_CA16}, // H
+    {0, CB10_CA15, CB12_CA15, CB11_CA15}, // J
+    {0, CB10_CA14, CB12_CA14, CB11_CA14}, // KKEY_PRESS_HOME
+    {0, CB10_CA13, CB12_CA13, CB11_CA13}, // J
+    {0, CB10_CA12, CB12_CA12, CB11_CA12}, // ;:
+    {0, CB10_CA11, CB12_CA11, CB11_CA11}, // '"
+    {0, CB10_CA9,  CB12_CA9,  CB11_CA9},  // NUHS
+    {0, CB7_CA9,  CB9_CA9,  CB8_CA9},  // Enter
+    {0, CB10_CA8,  CB12_CA8,  CB11_CA8},  // Home
 
-    {0, J_7,  L_7,  K_7},  // N
-    {0, J_6,  L_6,  K_6},  // M
-    {0, J_5,  L_5,  K_5},  // ,<
-    {0, J_4,  L_4,  K_4},  // .>
-    {0, J_3,  L_3,  K_3},  // ?/
-    {0, J_2,  L_2,  K_2},  // Shift_R
-    {0, J_1,  L_1,  K_1},  // Up
+    {0, CB10_CA7,  CB12_CA7,  CB11_CA7},  // N
+    {0, CB10_CA6,  CB12_CA6,  CB11_CA6},  // M
+    {0, CB10_CA5,  CB12_CA5,  CB11_CA5},  // ,<
+    {0, CB10_CA4,  CB12_CA4,  CB11_CA4},  // .>
+    {0, CB10_CA3,  CB12_CA3,  CB11_CA3},  // ?/
+    {0, CB10_CA2,  CB12_CA2,  CB11_CA2},  // Shift_R
+    {0, CB10_CA1,  CB12_CA1,  CB11_CA1},  // Up
 
-    {0, G_6,  I_6,  H_6},  // Space
-    {0, G_5,  I_5,  H_5},  // Win_R
-    {0, G_4,  I_4,  H_4},  // Fn
-    {0, G_3,  I_3,  H_3},  // Ctrl_R
-    {0, G_2,  I_2,  H_2},  // Left
-    {0, G_1,  I_1,  H_1},  // Down
-    {0, G_7,  I_7,  H_7},  // Right
+    {0, CB7_CA6,  CB9_CA6,  CB8_CA6},  // Space
+    {0, CB7_CA5,  CB9_CA5,  CB8_CA5},  // Win_R
+    {0, CB7_CA4,  CB9_CA4,  CB8_CA4},  // Fn
+    {0, CB7_CA3,  CB9_CA3,  CB8_CA3},  // Ctrl_R
+    {0, CB7_CA2,  CB9_CA2,  CB8_CA2},  // Left
+    {0, CB7_CA1,  CB9_CA1,  CB8_CA1},  // Down
+    {0, CB7_CA7,  CB9_CA7,  CB8_CA7},  // Right
 };
 #endif
diff --git a/keyboards/keychron/q11/q11.c b/keyboards/keychron/q11/q11.c
index bf7bab4b539..f643113ea3b 100644
--- a/keyboards/keychron/q11/q11.c
+++ b/keyboards/keychron/q11/q11.c
@@ -16,25 +16,6 @@
 
 #include "quantum.h"
 
-// Mask out handedness diode to prevent it
-// from keeping the keyboard awake
-// - just mirroring `KC_NO` in the `LAYOUT`
-//   macro to keep it simple
-const matrix_row_t matrix_mask[] = {
-    0b011111111,
-    0b011111111,
-    0b011011111,
-    0b001111111,
-    0b011111111,
-    0b001011111,
-    0b111111111,
-    0b101111111,
-    0b111111111,
-    0b110111111,
-    0b010111111,
-    0b111011110,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 bool dip_switch_update_kb(uint8_t index, bool active) {
     if (!dip_switch_update_user(index, active)) {
diff --git a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
index 350da52661f..ba32f58fc6a 100644
--- a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
@@ -17,123 +17,123 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    // {0, I_1,    G_1,    H_1}
-    {0, I_2,    G_2,    H_2},  // F13
-    {0, I_3,    G_3,    H_3},  // F14
-    {0, I_4,    G_4,    H_4},  // F15
-    {0, I_5,    G_5,    H_5},  // Esc
-    {0, I_6,    G_6,    H_6},  // F1
-    {0, I_7,    G_7,    H_7},  // F2
-    {0, I_8,    G_8,    H_8},  // F3
-    {0, I_9,    G_9,    H_9},  // F4
-    {0, I_10,   G_10,   H_10}, // F5
-    {0, I_11,   G_11,   H_11}, // F6
-    {0, I_12,   G_12,   H_12}, // F7
-    {0, I_13,   G_13,   H_13}, // F8
-    {0, I_14,   G_14,   H_14}, // F9
-    {0, I_15,   G_15,   H_15}, // F10
-    {0, I_16,   G_16,   H_16}, // F11
-    {0, L_16,   J_16,   K_16}, // F12
-    {0, L_15,   J_15,   K_15}, // DEL
-    {0, L_14,   J_14,   K_14}, // Light
+    // {0, CB9_CA1,    CB7_CA1,    CB8_CA1}
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},  // F13
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},  // F14
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},  // F15
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},  // Esc
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},  // F1
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},  // F2
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},  // F3
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},  // F4
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10}, // F5
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11}, // F6
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12}, // F7
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // F8
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // F9
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15}, // F10
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16}, // F11
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16}, // F12
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15}, // DEL
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14}, // Light
 
 
-    {0, C_1,    A_1,    B_1},  // num_lock
-    {0, C_2,    A_2,    B_2},  // /
-    {0, C_3,    A_3,    B_3},  // *
-    {0, C_4,    A_4,    B_4},  // -
-    {0, C_5,    A_5,    B_5},  // ~`
-    {0, C_6,    A_6,    B_6},  // 1!
-    {0, C_7,    A_7,    B_7},  // 2@
-    {0, C_8,    A_8,    B_8},  // 3#
-    {0, C_9,    A_9,    B_9},  // 4$
-    {0, C_10,   A_10,   B_10}, // 5%
-    {0, C_11,   A_11,   B_11}, // 6^
-    {0, C_12,   A_12,   B_12}, // 7&
-    {0, C_13,   A_13,   B_13}, // 8*
-    {0, C_14,   A_14,   B_14}, // 9(
-    {0, C_15,   A_15,   B_15}, // 0)
-    {0, C_16,   A_16,   B_16}, // -_
-    {0, L_13,   J_13,   K_13}, // =+
-    {0, L_12,   J_12,   K_12}, // BackSpace
-    {0, L_11,   J_11,   K_11}, // PgUp
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // num_lock
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // /
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // *
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // -
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // ~`
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 1!
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 2@
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 3#
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 4$
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 5%
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 6^
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // 7&
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // 8*
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // 9(
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15}, // 0)
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // -_
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13}, // =+
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12}, // BackSpace
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11}, // PgUp
 
-    {0, F_1,    D_1,    E_1},  // 7
-    {0, F_2,    D_2,    E_2},  // 8
-    {0, F_3,    D_3,    E_3},  // 9
-    {0, F_4,    D_4,    E_4},  // +
-    {0, F_5,    D_5,    E_5},  // TAB
-    {0, F_6,    D_6,    E_6},  // Q
-    {0, F_7,    D_7,    E_7},  // W
-    {0, F_8,    D_8,    E_8},  // E
-    {0, F_9,    D_9,    E_9},  // R
-    {0, F_10,   D_10,   E_10}, // T
-    {0, F_11,   D_11,   E_11}, // Y
-    {0, F_12,   D_12,   E_12}, // U
-    {0, F_13,   D_13,   E_13}, // I
-    {0, F_14,   D_14,   E_14}, // O
-    {0, F_15,   D_15,   E_15}, // P
-    {0, F_16,   D_16,   E_16}, // [
-    {0, L_10,   J_10,   K_10}, // ]
-    {0, L_9,    J_9,    K_9},  // \|
-    {0, L_8,    J_8,    K_8},  // PgDn
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},  // 7
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},  // 8
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},  // 9
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // +
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},  // TAB
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Q
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},  // W
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},  // E
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},  // R
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10}, // T
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11}, // Y
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12}, // U
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13}, // I
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14}, // O
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15}, // P
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16}, // [
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10}, // ]
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // \|
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},  // PgDn
 
-    {1, C_16,   A_16,   B_16}, // 4
-    {1, C_15,   A_15,   B_15}, // 5
-    {1, C_14,   A_14,   B_14}, // 6
-    // {0, F_4,    D_4,    E_4},  // +
-    {1, C_12,   A_12,   B_12}, // CapsLock
-    {1, C_11,   A_11,   B_11}, // A
-    {1, C_10,   A_10,   B_10}, // S
-    {1, C_9,    A_9,    B_9},  // D
-    {1, C_8,    A_8,    B_8},  // F
-    {1, C_7,    A_7,    B_7},  // G
-    {1, C_6,    A_6,    B_6},  // H
-    {1, C_5,    A_5,    B_5},  // J
-    {1, C_4,    A_4,    B_4},  // k
-    {1, C_3,    A_3,    B_3},  // l
-    {1, C_2,    A_2,    B_2},  // ；
-    {1, C_1,    A_1,    B_1},  // '
-    {1, L_1,    J_1,    K_1},  // Enter
-    {1, L_2,    J_2,    K_2},  // Home
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16}, // 4
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15}, // 5
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14}, // 6
+    // {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // +
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12}, // CapsLock
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11}, // A
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10}, // S
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},  // D
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},  // F
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},  // G
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},  // H
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},  // J
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},  // k
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},  // l
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},  // ；
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},  // '
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},  // Enter
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},  // Home
 
-    {1, I_16,   G_16,   H_16}, // 1
-    {1, I_15,   G_15,   H_15}, // 2
-    {1, I_14,   G_14,   H_14}, // 3
-    {1, I_13,   G_13,   H_13}, // Enter
-    {1, I_12,   G_12,   H_12}, //Shift_L
-    {1, I_10,   G_10,   H_10}, // Z
-    {1, I_9,    G_9,    H_9},  // X
-    {1, I_8,    G_8,    H_8},  // C
-    {1, I_7,    G_7,    H_7},  // V
-    {1, I_6,    G_6,    H_6},  // B
-    {1, I_5,    G_5,    H_5},  // N
-    {1, I_4,    G_4,    H_4},  // M
-    {1, I_3,    G_3,    H_3},  // ,
-    {1, I_2,    G_2,    H_2},  // .
-    {1, I_1,    G_1,    H_1},  // ?
-    {1, L_3,    J_3,    K_3},  // Shift_R
-    {1, L_4,    J_4,    K_4},  // Up
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16}, // 1
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15}, // 2
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14}, // 3
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13}, // Enter
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12}, //Shift_L
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10}, // Z
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},  // X
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},  // C
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},  // V
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},  // B
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},  // N
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},  // M
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},  // ,
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},  // .
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},  // ?
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},  // Shift_R
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},  // Up
 
-    {1, F_16,   D_16,   E_16}, // 0
-    {1, F_14,   D_14,   E_14}, // .
-    {1, F_12,   D_12,   E_12}, // Ctrl_L
-    {1, F_11,   D_11,   E_11}, // Win_L
-    {1, F_10,   D_10,   E_10}, // Alt_L
-    {1, F_6,    D_6,    E_6},  // Space
-    {1, F_3,    D_3,    E_3},  // Alt_R
-    {1, F_2,    D_2,    E_2},  // Fn
-    {1, F_1,    D_1,    E_1},  // Ctrl_R
-    {1, L_5,    J_5,    K_5},  // Left
-    {1, L_6,    J_6,    K_6},  // Down
-    {1, L_7,    J_7,    K_7},  // Right
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}, // 0
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14}, // .
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12}, // Ctrl_L
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11}, // Win_L
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10}, // Alt_L
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Space
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},  // Alt_R
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},  // Fn
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},  // Ctrl_R
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},  // Left
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},  // Down
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q12/ansi_encoder/config.h b/keyboards/keychron/q12/ansi_encoder/config.h
index 56a1f7505fb..a016f282d8b 100644
--- a/keyboards/keychron/q12/ansi_encoder/config.h
+++ b/keyboards/keychron/q12/ansi_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 56
-#define DRIVER_2_LED_TOTAL 46
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define ENCODER_DEFAULT_POS 0x3
 
 /* Enable caps-lock LED */
diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json
index 291fd1774cc..7b1e46beb71 100644
--- a/keyboards/keychron/q12/ansi_encoder/info.json
+++ b/keyboards/keychron/q12/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x01D1",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A2", "pin_b": "C14"}
diff --git a/keyboards/keychron/q12/config.h b/keyboards/keychron/q12/config.h
index cc24578c16f..91e5fcce1d4 100644
--- a/keyboards/keychron/q12/config.h
+++ b/keyboards/keychron/q12/config.h
@@ -38,72 +38,3 @@
 
 #define SNLED27351_CURRENT_TUNE \
     { 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55 }
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID \
-    {                          \
-        { 5, 4 }               \
-    }
-#define SCAN_COUNT_MAX 100
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-// #define WEAR_LEVELING_LOGICAL_SIZE 2048 // default
-// #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) // default
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q12/info.json b/keyboards/keychron/q12/info.json
new file mode 100644
index 00000000000..b5e7dc1e1c3
--- /dev/null
+++ b/keyboards/keychron/q12/info.json
@@ -0,0 +1,32 @@
+{
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
+    "rgb_matrix": {
+        "animations":{
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/q12/iso_encoder/config.h b/keyboards/keychron/q12/iso_encoder/config.h
index eb0957d7afe..829fa738038 100644
--- a/keyboards/keychron/q12/iso_encoder/config.h
+++ b/keyboards/keychron/q12/iso_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 56
-#define DRIVER_2_LED_TOTAL 47
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define ENCODER_DEFAULT_POS 0x3
 
 /* Enable caps-lock LED */
diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json
index edd0d0ea43d..c66c1bb665c 100644
--- a/keyboards/keychron/q12/iso_encoder/info.json
+++ b/keyboards/keychron/q12/iso_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x01D3",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A2", "pin_b": "C14"}
diff --git a/keyboards/keychron/q12/iso_encoder/iso_encoder.c b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
index 37d9db10b48..f9513e7f418 100644
--- a/keyboards/keychron/q12/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
@@ -18,125 +18,125 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    // {0, I_1,    G_1,    H_1}
-    {0, I_2,    G_2,    H_2},  // F13
-    {0, I_3,    G_3,    H_3},  // F14
-    {0, I_4,    G_4,    H_4},  // F15
-    {0, I_5,    G_5,    H_5},  // Esc
-    {0, I_6,    G_6,    H_6},  // F1
-    {0, I_7,    G_7,    H_7},  // F2
-    {0, I_8,    G_8,    H_8},  // F3
-    {0, I_9,    G_9,    H_9},  // F4
-    {0, I_10,   G_10,   H_10}, // F5
-    {0, I_11,   G_11,   H_11}, // F6
-    {0, I_12,   G_12,   H_12}, // F7
-    {0, I_13,   G_13,   H_13}, // F8
-    {0, I_14,   G_14,   H_14}, // F9
-    {0, I_15,   G_15,   H_15}, // F10
-    {0, I_16,   G_16,   H_16}, // F11
-    {0, L_16,   J_16,   K_16}, // F12
-    {0, L_15,   J_15,   K_15}, // DEL
-    {0, L_14,   J_14,   K_14}, // Light
+    // {0, CB9_CA1,    CB7_CA1,    CB8_CA1}
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},  // F13
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},  // F14
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},  // F15
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},  // Esc
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},  // F1
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},  // F2
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},  // F3
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},  // F4
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10}, // F5
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11}, // F6
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12}, // F7
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // F8
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // F9
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15}, // F10
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16}, // F11
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16}, // F12
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15}, // DEL
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14}, // Light
 
 
-    {0, C_1,    A_1,    B_1},  // num_lock
-    {0, C_2,    A_2,    B_2},  // /
-    {0, C_3,    A_3,    B_3},  // *
-    {0, C_4,    A_4,    B_4},  // -
-    {0, C_5,    A_5,    B_5},  // ~`
-    {0, C_6,    A_6,    B_6},  // 1!
-    {0, C_7,    A_7,    B_7},  // 2@
-    {0, C_8,    A_8,    B_8},  // 3#
-    {0, C_9,    A_9,    B_9},  // 4$
-    {0, C_10,   A_10,   B_10}, // 5%
-    {0, C_11,   A_11,   B_11}, // 6^
-    {0, C_12,   A_12,   B_12}, // 7&
-    {0, C_13,   A_13,   B_13}, // 8*
-    {0, C_14,   A_14,   B_14}, // 9(
-    {0, C_15,   A_15,   B_15}, // 0)
-    {0, C_16,   A_16,   B_16}, // -_
-    {0, L_13,   J_13,   K_13}, // =+
-    {0, L_12,   J_12,   K_12}, // BackSpace
-    {0, L_11,   J_11,   K_11}, // PgUp
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // num_lock
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // /
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // *
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // -
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // ~`
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 1!
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 2@
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 3#
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 4$
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 5%
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 6^
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // 7&
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // 8*
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // 9(
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15}, // 0)
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // -_
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13}, // =+
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12}, // BackSpace
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11}, // PgUp
 
-    {0, F_1,    D_1,    E_1},  // 7
-    {0, F_2,    D_2,    E_2},  // 8
-    {0, F_3,    D_3,    E_3},  // 9
-    {0, F_4,    D_4,    E_4},  // +
-    {0, F_5,    D_5,    E_5},  // TAB
-    {0, F_6,    D_6,    E_6},  // Q
-    {0, F_7,    D_7,    E_7},  // W
-    {0, F_8,    D_8,    E_8},  // E
-    {0, F_9,    D_9,    E_9},  // R
-    {0, F_10,   D_10,   E_10}, // T
-    {0, F_11,   D_11,   E_11}, // Y
-    {0, F_12,   D_12,   E_12}, // U
-    {0, F_13,   D_13,   E_13}, // I
-    {0, F_14,   D_14,   E_14}, // O
-    {0, F_15,   D_15,   E_15}, // P
-    {0, F_16,   D_16,   E_16}, // [
-    {0, L_10,   J_10,   K_10}, // ]
-    // {0, L_9,    J_9,    K_9},  // \|
-    {0, L_8,    J_8,    K_8},  // PgDn
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},  // 7
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},  // 8
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},  // 9
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // +
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},  // TAB
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Q
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},  // W
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},  // E
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},  // R
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10}, // T
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11}, // Y
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12}, // U
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13}, // I
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14}, // O
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15}, // P
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16}, // [
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10}, // ]
+    // {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // \|
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},  // PgDn
 
-    {1, C_16,   A_16,   B_16}, // 4
-    {1, C_15,   A_15,   B_15}, // 5
-    {1, C_14,   A_14,   B_14}, // 6
-    // {0, F_4,    D_4,    E_4},  // +
-    {1, C_12,   A_12,   B_12}, // CapsLock
-    {1, C_11,   A_11,   B_11}, // A
-    {1, C_10,   A_10,   B_10}, // S
-    {1, C_9,    A_9,    B_9},  // D
-    {1, C_8,    A_8,    B_8},  // F
-    {1, C_7,    A_7,    B_7},  // G
-    {1, C_6,    A_6,    B_6},  // H
-    {1, C_5,    A_5,    B_5},  // J
-    {1, C_4,    A_4,    B_4},  // k
-    {1, C_3,    A_3,    B_3},  // l
-    {1, C_2,    A_2,    B_2},  // ；
-    {1, C_1,    A_1,    B_1},  // '
-    {1, L_1,    J_1,    K_1},  // #~
-    {0, L_9,    J_9,    K_9},  // Enter
-    {1, L_2,    J_2,    K_2},  // Home
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16}, // 4
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15}, // 5
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14}, // 6
+    // {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // +
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12}, // CapsLock
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11}, // A
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10}, // S
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},  // D
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},  // F
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},  // G
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},  // H
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},  // J
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},  // k
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},  // l
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},  // ；
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},  // '
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},  // #~
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // Enter
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},  // Home
 
-    {1, I_16,   G_16,   H_16}, // 1
-    {1, I_15,   G_15,   H_15}, // 2
-    {1, I_14,   G_14,   H_14}, // 3
-    {1, I_13,   G_13,   H_13}, // Enter
-    {1, I_12,   G_12,   H_12}, //Shift_L
-    {1, I_11,   G_11,   H_11}, // |
-    {1, I_10,   G_10,   H_10}, // Z
-    {1, I_9,    G_9,    H_9},  // X
-    {1, I_8,    G_8,    H_8},  // C
-    {1, I_7,    G_7,    H_7},  // V
-    {1, I_6,    G_6,    H_6},  // B
-    {1, I_5,    G_5,    H_5},  // N
-    {1, I_4,    G_4,    H_4},  // M
-    {1, I_3,    G_3,    H_3},  // ,
-    {1, I_2,    G_2,    H_2},  // .
-    {1, I_1,    G_1,    H_1},  // ?
-    {1, L_3,    J_3,    K_3},  // Shift_R
-    {1, L_4,    J_4,    K_4},  // Up
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16}, // 1
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15}, // 2
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14}, // 3
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13}, // Enter
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12}, //Shift_L
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11}, // |
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10}, // Z
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},  // X
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},  // C
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},  // V
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},  // B
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},  // N
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},  // M
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},  // ,
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},  // .
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},  // ?
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},  // Shift_R
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},  // Up
 
-    {1, F_16,   D_16,   E_16}, // 0
-    {1, F_14,   D_14,   E_14}, // .
-    {1, F_12,   D_12,   E_12}, // Ctrl_L
-    {1, F_11,   D_11,   E_11}, // Win_L
-    {1, F_10,   D_10,   E_10}, // Alt_L
-    {1, F_6,    D_6,    E_6},  // Space
-    {1, F_3,    D_3,    E_3},  // Alt_R
-    {1, F_2,    D_2,    E_2},  // Fn
-    {1, F_1,    D_1,    E_1},  // Ctrl_R
-    {1, L_5,    J_5,    K_5},  // Left
-    {1, L_6,    J_6,    K_6},  // Down
-    {1, L_7,    J_7,    K_7},  // Right
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}, // 0
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14}, // .
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12}, // Ctrl_L
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11}, // Win_L
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10}, // Alt_L
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Space
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},  // Alt_R
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},  // Fn
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},  // Ctrl_R
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},  // Left
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},  // Down
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q12/q12.c b/keyboards/keychron/q12/q12.c
index 3d8eab56590..9a019af6ace 100644
--- a/keyboards/keychron/q12/q12.c
+++ b/keyboards/keychron/q12/q12.c
@@ -16,16 +16,6 @@
 
 #include "quantum.h"
 
-// clang-format off
-const matrix_row_t matrix_mask[] = {
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111101111,
-};
-// clang-format on
 #ifdef DIP_SWITCH_ENABLE
 bool dip_switch_update_kb(uint8_t index, bool active) {
     if (!dip_switch_update_user(index, active)) {
diff --git a/keyboards/keychron/q1v1/ansi/ansi.c b/keyboards/keychron/q1v1/ansi/ansi.c
index 5f74267bf41..dfd2ee60875 100644
--- a/keyboards/keychron/q1v1/ansi/ansi.c
+++ b/keyboards/keychron/q1v1/ansi/ansi.c
@@ -16,110 +16,101 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b0111111111111101,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-};
-
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+    {0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 
 };
 
diff --git a/keyboards/keychron/q1v1/ansi/config.h b/keyboards/keychron/q1v1/ansi/config.h
index 5eaa1e82f17..83ac22d2b62 100644
--- a/keyboards/keychron/q1v1/ansi/config.h
+++ b/keyboards/keychron/q1v1/ansi/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 82
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 45
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/README.md b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/README.md
deleted file mode 100644
index c2d5799bb8b..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# gtg465x's Keychron Q1 keymap
-
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences
-- RGB lighting turns off when the computer sleeps
-- Caps Lock and alpha keys turn red to indicate when Caps Lock is on
-- When the Fn layer is active, RGB lighting turns off for keys that are not assigned
-
-## Changelog
-
-### 10/3/2021 - 1.0.3
-
-- Feature: When the Fn layer is active, RGB lighting turns off for keys that are not assigned
-
-### 10/1/2021 - 1.0.2
-
-- Added Caps Lock indicator (my implementation is different, but this was inspired by mkillewald)
-- Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so they can be labeled properly in VIA
-
-### 9/28/2021 - 1.0.1
-
-- Initial release
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/config.h b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/config.h
deleted file mode 100644
index 5ac05d04c12..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * 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
-
-/* RGB Matrix Configuration */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-#    define FN_LAYER_TRANSPARENT_KEYS_OFF
-#endif
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap.c
deleted file mode 100644
index 8da475c3c60..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * 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_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[MAC_BASE] = LAYOUT_ansi_82(
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   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_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_HOME,
-     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_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[MAC_FN] = LAYOUT_ansi_82(
-     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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
-     KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-[WIN_BASE] = LAYOUT_ansi_82(
-     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_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_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_HOME,
-     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(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[WIN_FN] = LAYOUT_ansi_82(
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
-     KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap_user.h b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap_user.h
deleted file mode 100644
index 728114d556f..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap_user.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * 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
-
-// clang-format off
-
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
-
-// clang-format on
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.c b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.c
deleted file mode 100644
index b7d12f9466a..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * 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 "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#ifdef FN_LAYER_TRANSPARENT_KEYS_OFF
-            rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-#endif
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-#ifdef CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-    return (KC_A <= keycode && keycode <= KC_Z) || keycode == KC_CAPS;
-#else
-    return keycode == KC_CAPS;
-#endif
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.h b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.h
deleted file mode 100644
index dead4541676..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * 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
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rules.mk
deleted file mode 100644
index 42ba38028d2..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/config.h b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/config.h
deleted file mode 100644
index bc9fe405c35..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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 RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define FN_LAYER_COLOR RGB_ORANGE
-#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap.c
deleted file mode 100644
index 4fc8ad58e54..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-typedef union {
-  uint32_t raw;
-  struct {
-    bool caps_lock_light_tab :1;
-    bool caps_lock_light_alphas :1;
-    bool fn_layer_transparent_keys_off :1;
-    bool fn_layer_color_enable :1;
-  };
-} user_config_t;
-
-user_config_t user_config;
-
-enum custom_keycodes {
-    KC_LIGHT_TAB_TOGGLE = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
-    KC_LIGHT_ALPHAS_TOGGLE,
-    KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE,
-    KC_FN_LAYER_COLOR_TOGGLE
-};
-
-#define KC_LTTOG KC_LIGHT_TAB_TOGGLE
-#define KC_LATOG KC_LIGHT_ALPHAS_TOGGLE
-#define KC_TKTOG KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE
-#define KC_FCTOG KC_FN_LAYER_COLOR_TOGGLE
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[MAC_BASE] = LAYOUT_ansi_82(
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   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_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_HOME,
-     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_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[MAC_FN] = LAYOUT_ansi_82(
-     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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
-     KC_TRNS,            KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-[WIN_BASE] = LAYOUT_ansi_82(
-     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_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_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_HOME,
-     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(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[WIN_FN] = LAYOUT_ansi_82(
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
-     KC_TRNS,            KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-}
-
-void eeconfig_init_user(void) {
-    user_config.raw = 0;
-    user_config.caps_lock_light_tab = false;
-    user_config.caps_lock_light_alphas = false;
-    user_config.fn_layer_transparent_keys_off = true;
-    user_config.fn_layer_color_enable = false;
-    eeconfig_update_user(user_config.raw);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_LIGHT_TAB_TOGGLE:
-            if (record->event.pressed) {
-                user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_LIGHT_ALPHAS_TOGGLE:
-            if (record->event.pressed) {
-                user_config.caps_lock_light_alphas ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE:
-            if (record->event.pressed) {
-                user_config.fn_layer_transparent_keys_off ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_FN_LAYER_COLOR_TOGGLE:
-            if (record->event.pressed) {
-                user_config.fn_layer_color_enable ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        default:
-            return true;  // Process all other keycodes normally
-    }
-}
-
-bool get_caps_lock_light_tab(void) {
-    return user_config.caps_lock_light_tab;
-}
-
-bool get_caps_lock_light_alphas(void) {
-    return user_config.caps_lock_light_alphas;
-}
-
-bool get_fn_layer_transparent_keys_off(void) {
-    return user_config.fn_layer_transparent_keys_off;
-}
-
-bool get_fn_layer_color_enable(void) {
-    return user_config.fn_layer_color_enable;
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap_user.h b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap_user.h
deleted file mode 100644
index 87b1baf47f2..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap_user.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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
-
-// clang-format off
-
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
-
-// clang-format on
-
-bool get_caps_lock_light_tab(void);
-bool get_caps_lock_light_alphas(void);
-bool get_fn_layer_transparent_keys_off(void);
-bool get_fn_layer_color_enable(void);
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/readme.md b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/readme.md
deleted file mode 100644
index 8ff2dbcc2cb..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/readme.md
+++ /dev/null
@@ -1,54 +0,0 @@
-## mkillewald's Keychron Q1 keymap (ANSI rev_0100) v1.0.4
-
-This keymap builds on the keymap by Grayson Carr (gtg465x) but adds a couple options.
-
-## Features:
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences
-- RGB lighting turns off when the computer sleeps
-- Caps Lock RGB indicator
-    - the Caps Lock key will light when Caps Lock is enabled with the following options:
-        - #define CAPS_LOCK_INDICATOR_COLOR [color] in config.h to set the backlight color used for the indicator when Caps Lock is enabled (default: red)
-        - Fn+Z will toggle lighting the TAB key when Caps Lock is enabled. This is useful with non backlit keycaps/legends. (default: off)
-        - Fn+X will toggle lighting all the alpha keys when Caps Lock is enabled. (default: off)
-
-- Dynamic Fn layer RGB indicator
-    - When the Fn key is held down, any keys defined on the Fn layer in this firmware or in VIA will be highlighted with the following options:
-        - #define FN_LAYER_COLOR [color] in config.h to set a static color for defined keys (default: orange)
-        - Fn+C will toggle turning off RGB for keys with no definition (default: RGB off)
-        - Fn+V will toggle lighting the defined Fn layer keys with the static color set with FN_LAYER_COLOR (default: static color off)
-
-- All custom keycodes can be moved to different keys in VIA by using the ANY key with the following keycodes:
-    - USER(0) (default: F3) macOS Mission Control
-    - USER(1) (default: F4) macOS Launchpad
-    - USER(2) (default: Fn+Z) Caps Lock light Tab toggle
-    - USER(3) (default: Fn+X) Caps Lock light alphas toggle
-    - USER(4) (default: Fn+C) Fn layer non-defined keys RGB toggle
-    - USER(5) (default: Fn+V) Fn layer defined keys static color toggle
-
-RGB must be toggled on for all indicators to function. If you do not want an RGB mode active but still want the indicators, toggle RGB on and turn the brightness all the way off. The indicators will remain at full brightness.
-
-Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER(0) through USER(5) custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed.
-    
-#### USE AT YOUR OWN RISK
-
-## Changelog:
-
-v1.0.4  October 9, 2021
-- Caps Lock and Fn layer toggles are now stored in eeprom so settings will remain when Q1 is unplugged
-
-v1.0.3  October 8, 2021
-- now using keycode toggles instead of preprocessor directive to set the various Caps Lock and Fn Layer RGB lighting options. This allows for setting the options from user space without having to recompile.
-
-v1.0.2  October 7, 2021
-- adapted Grayson Carr's (gtg465x) Caps Lock alphas and dynamic Fn layer RGB routines
-- added CAPS_LOCK_INDICATOR_LIGHT_TAB config option to enable/disable lighting Tab with Caps Lock indicator
-- added FN_LAYER_COLOR config option to set FN layer static color
-
-v1.0.1  October 7, 2021
-- Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so thay can be labeled properly in VIA (adopted change from gtg465x)
-
-v1.0.0  September 30, 2021
-- Initial release built upon keymap by Grayson Carr (gtg465x)
-- defined Mission Control (F3) and Launchpad (F4) keycodes for macOs
-- RGB backlight turns off when computer sleeps
-- added Caps Lock indicator lighting both the Caps Lock and Tab LEDs for better effect on non-backlit keycaps
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.c b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.c
deleted file mode 100644
index c6fa5f1f155..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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 "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#ifdef FN_LAYER_COLOR
-            if (get_fn_layer_color_enable()) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_not_transparent, FN_LAYER_COLOR);
-            }
-#endif
-            if (get_fn_layer_transparent_keys_off()) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-            }
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-    bool indicator = keycode == KC_CAPS;
-
-    if (get_caps_lock_light_tab()) {
-        indicator = keycode == KC_TAB || keycode == KC_CAPS;
-    }
-
-    if (get_caps_lock_light_alphas()) {
-        return (KC_A <= keycode && keycode <= KC_Z) || indicator;
-    } else {
-        return indicator;
-    }
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
-bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.h b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.h
deleted file mode 100644
index 1fb79c0b2a1..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
-bool is_not_transparent(uint16_t keycode);
-
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rules.mk
deleted file mode 100644
index af720e37ee7..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/config.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/config.h
deleted file mode 100644
index 4378af4f582..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-
-/* RGB Matrix Configuration */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define MAC_LAYER_DEFAULT_COLOR RGB_CYAN
-#    define WIN_LAYER_DEFAULT_COLOR RGB_GREEN
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define CAPS_LOCK_INDICATOR_LIGHT_60
-#    define FN_LAYER_TRANSPARENT_KEYS_OFF
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR        // Sets the default mode, if none has been set
-#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS  // Sets the default brightness value, if none has been set
-#endif
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap.c
deleted file mode 100644
index 77af30c5b6a..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-#define TG_NKRO MAGIC_TOGGLE_NKRO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_82(
-        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_HOME,
-        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_END,
-        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_LGMAC, 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_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI,  KC_MACFN, KC_RCTL,  KC_LEFT,  KC_DOWN, KC_RGHT),
-
-    [MAC_FN] = LAYOUT_ansi_82(
-        _______,            KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_MACPS, KC_INS,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,            _______,
-        KC_CAPS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  KC_LMAC,  _______,  _______,            _______,            _______,
-        _______,            _______,  _______,  _______,  _______,  _______,  TG_NKRO,  _______,  _______,  _______,  _______,            _______,  _______,
-        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______),
-
-    [WIN_BASE] = LAYOUT_ansi_82(
-        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_HOME,
-        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_END,
-        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_LGWIN, 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,  KC_WINFN, KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-    [WIN_FN] = LAYOUT_ansi_82(
-        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_PSCR,  KC_INS,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,            _______,
-        KC_CAPS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
-        _______,            _______,  _______,  _______,  _______,  _______,  TG_NKRO,  _______,  _______,  _______,  _______,            _______,  _______,
-        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______)
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap_user.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap_user.h
deleted file mode 100644
index 57ac5258c26..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap_user.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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
-
-// clang-format off
-
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
-
-// clang-format on
-
-// Tap dance enums
-enum {
-    MAC_CAPS_LANGUAGE_CHANGE,
-    WIN_CAPS_LANGUAGE_CHANGE,
-};
-
-#ifdef TAP_DANCE_ENABLE
-#   define KC_LGMAC TD(MAC_CAPS_LANGUAGE_CHANGE)
-#   define KC_LGWIN TD(WIN_CAPS_LANGUAGE_CHANGE)
-#else
-#   define KC_LGMAC KC_CAPS
-#   define KC_LGWIN KC_CAPS
-#endif
-#define KC_MACFN MO(MAC_FN)
-#define KC_WINFN MO(WIN_FN)
-#define KC_LMAC C(G(KC_Q))
-#define KC_MACPS G(S(KC_5))
-#define KC_TASK G(KC_TAB)
-#define KC_FLXP G(KC_E)
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/readme.md b/keyboards/keychron/q1v1/ansi/keymaps/teimor/readme.md
deleted file mode 100644
index 9aa16f9a893..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# teimor's Keychron Q1 keymap
-
-- Via Enabled.
-- Tap dance enabled.
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences.
-- RGB lighting turns off when the computer sleeps.
-- The RGB lighting for keys that are not assigned turns off when the Fn layer is active
-- 60% layout turns red to indicate when Caps Lock is on.
-- Windows and macOS: A single tap will quickly change the language, and holding will trigger Caps Lock. (Using Tap Dance)
-- RGB Matrix based on layout - macOS base layout will turn on cyan color, Windows base layout will turn on green color.
-- `fn + N` will toggle NKRO, useful when using the keyboard on freebsd.
-- `fn + L` on macOS will lock the system.
-- `fn + del` will trigger screenshot on macOS and Windows.
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.c
deleted file mode 100644
index fbc37fb5bfb..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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 "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state | default_layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#if defined CAPS_LOCK_INDICATOR_COLOR && defined MAC_LAYER_DEFAULT_COLOR && defined WIN_LAYER_DEFAULT_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            } else if (current_layer == MAC_BASE)
-                rgb_matrix_set_color_all(MAC_LAYER_DEFAULT_COLOR);
-            else if (current_layer == WIN_BASE)
-                rgb_matrix_set_color_all(WIN_LAYER_DEFAULT_COLOR);
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#if defined MAC_LAYER_DEFAULT_COLOR && defined WIN_LAYER_DEFAULT_COLOR
-            if (current_layer == MAC_FN) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_not_transparent, MAC_LAYER_DEFAULT_COLOR);
-            } else if (current_layer == WIN_FN) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_not_transparent, WIN_LAYER_DEFAULT_COLOR);
-            }
-#endif
-#ifdef FN_LAYER_TRANSPARENT_KEYS_OFF
-            rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-#endif
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-#if defined MAC_LAYER_DEFAULT_COLOR && defined WIN_LAYER_DEFAULT_COLOR
-        else {
-            if (layer == MAC_BASE)
-                rgb_matrix_set_color(i, MAC_LAYER_DEFAULT_COLOR);
-            else if (layer == WIN_BASE)
-                rgb_matrix_set_color(i, WIN_LAYER_DEFAULT_COLOR);
-        }
-#endif
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-    bool indicator = keycode == KC_CAPS || keycode == KC_LGMAC || keycode == KC_LGWIN;
-#ifdef CAPS_LOCK_INDICATOR_LIGHT_60
-    return (KC_A <= keycode && keycode <= KC_CAPS) || (KC_LEFT_CTRL <= keycode && keycode <= KC_RIGHT_GUI) || keycode == KC_MACFN || keycode == KC_WINFN || indicator;
-#else
-    return indicator;
-#endif
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
-bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.h
deleted file mode 100644
index 5b53b5b8ec1..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
-bool is_not_transparent(uint16_t keycode);
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rules.mk
deleted file mode 100644
index bafb40484bf..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-TAP_DANCE_ENABLE = yes
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
-
-ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
-    SRC += tap_dance_user.c
-    SRC += tap_dance_setup.c
-    SRC += tap_dance_mac_caps.c
-    SRC += tap_dance_win_caps.c
-endif
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.c
deleted file mode 100644
index dfb0346ff16..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2021 @ Teimor Epstein
- *
- * 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/>.
- */
-
-/* macOS CapsLock language change */
-#include "tap_dance_mac_caps.h"
-
-static td_tap_t mac_caps_language_tap_state = {.is_press_action = true, .state = TD_NONE};
-
-void mac_caps_language_finished(tap_dance_state_t *state, void *user_data) {
-    mac_caps_language_tap_state.state = current_dance(state);
-    switch (mac_caps_language_tap_state.state) {
-        case TD_SINGLE_TAP:
-            register_code(KC_LCTL);
-            register_code(KC_SPACE);
-            break;
-        case TD_SINGLE_HOLD:
-            register_code(KC_CAPS_LOCK);
-            break;
-        default:
-            break;
-    }
-}
-
-void mac_caps_language_reset(tap_dance_state_t *state, void *user_data) {
-    switch (mac_caps_language_tap_state.state) {
-        case TD_SINGLE_TAP:
-            unregister_code(KC_SPACE);
-            unregister_code(KC_LCTL);
-            break;
-        case TD_SINGLE_HOLD:
-            unregister_code(KC_CAPS_LOCK);
-            break;
-        default:
-            break;
-    }
-    mac_caps_language_tap_state.state = TD_NONE;
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.h
deleted file mode 100644
index ef552a2c2c9..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 @ Teimor Epstein
- *
- * 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/>.
- */
-
-/* macOS CapsLock language change */
-#pragma once
-
-#include "tap_dance_setup.h"
-
-void mac_caps_language_finished(tap_dance_state_t *state, void *user_data);
-void mac_caps_language_reset(tap_dance_state_t *state, void *user_data);
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.c
deleted file mode 100644
index 07257e556a1..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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 "tap_dance_setup.h"
-
-td_state_t current_dance(tap_dance_state_t *state) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return TD_SINGLE_TAP;
-        /* Key has not been interrupted, but the key is still held. Means you w ant to send a 'HOLD'. */
-        else
-            return TD_SINGLE_HOLD;
-    } else if (state->count == 2) {
-        /* TD_DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
-           action when hitting 'pp'. Suggested use case for this return value is when you want to send two
-           keystrokes of the key, and not the 'double tap' action/macro. */
-        if (state->interrupted)
-            return TD_DOUBLE_SINGLE_TAP;
-        else if (state->pressed)
-            return TD_DOUBLE_HOLD;
-        else
-            return TD_DOUBLE_TAP;
-    }
-
-    /* Assumes no one is trying to type the same letter three times (at least not quickly).
-      If your tap dance key is 'KC_W', and you want to type "www." quickly - then you will need to add
-      an exception here to return a 'TD_TRIPLE_SINGLE_TAP', and define that enum just like 'TD_DOUBLE_SINGLE_TAP' */
-    if (state->count == 3) {
-        if (state->interrupted)
-            return TD_TRIPLE_SINGLE_TAP;
-        else if (state->pressed)
-            return TD_TRIPLE_HOLD;
-        else
-            return TD_TRIPLE_TAP;
-
-    } else
-        return TD_UNKNOWN;
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.h
deleted file mode 100644
index 5d2f4acd577..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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 QMK_KEYBOARD_H
-
-typedef enum {
-    TD_NONE,
-    TD_UNKNOWN,
-    TD_SINGLE_TAP,
-    TD_SINGLE_HOLD,
-    TD_DOUBLE_TAP,
-    TD_DOUBLE_HOLD,
-    TD_DOUBLE_SINGLE_TAP,  // Send two single taps
-    TD_TRIPLE_TAP,
-    TD_TRIPLE_HOLD,
-    TD_TRIPLE_SINGLE_TAP  // Send three single tap
-} td_state_t;
-
-typedef struct {
-    bool       is_press_action;
-    td_state_t state;
-} td_tap_t;
-
-td_state_t current_dance(tap_dance_state_t *state);
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_user.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_user.c
deleted file mode 100644
index ed8120572ee..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_user.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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 "keymap_user.h"
-#include "tap_dance_mac_caps.h"
-#include "tap_dance_win_caps.h"
-
-// clang-format off
-
-tap_dance_action_t tap_dance_actions[] = {
-    [MAC_CAPS_LANGUAGE_CHANGE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, mac_caps_language_finished, mac_caps_language_reset),
-    [WIN_CAPS_LANGUAGE_CHANGE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, win_caps_language_finished, win_caps_language_reset)
-};
-
-// clang-format on
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.c
deleted file mode 100644
index 1c7c438d2e5..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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/>.
- */
-
-/* Windows CapsLock language change */
-#include "tap_dance_win_caps.h"
-
-static td_tap_t win_caps_language_tap_state = {.is_press_action = true, .state = TD_NONE};
-
-void win_caps_language_finished(tap_dance_state_t *state, void *user_data) {
-    win_caps_language_tap_state.state = current_dance(state);
-    switch (win_caps_language_tap_state.state) {
-        case TD_SINGLE_TAP:
-            register_code(KC_LGUI);
-            register_code(KC_SPACE);
-            break;
-        case TD_SINGLE_HOLD:
-            register_code(KC_CAPS_LOCK);
-            break;
-        default:
-            break;
-    }
-}
-
-void win_caps_language_reset(tap_dance_state_t *state, void *user_data) {
-    switch (win_caps_language_tap_state.state) {
-        case TD_SINGLE_TAP:
-            unregister_code(KC_SPACE);
-            unregister_code(KC_LGUI);
-            break;
-        case TD_SINGLE_HOLD:
-            unregister_code(KC_CAPS_LOCK);
-            break;
-        default:
-            break;
-    }
-    win_caps_language_tap_state.state = TD_NONE;
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.h
deleted file mode 100644
index 2289cce3269..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * 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/>.
- */
-
-/* Windows CapsLock language change */
-#pragma once
-
-#include "tap_dance_setup.h"
-
-void win_caps_language_finished(tap_dance_state_t *state, void *user_data);
-void win_caps_language_reset(tap_dance_state_t *state, void *user_data);
diff --git a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
index c4fc884bc21..d8679ee4821 100644
--- a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
@@ -16,110 +16,101 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b0111111111111101,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-};
-
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+    {0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1v1/ansi_encoder/config.h b/keyboards/keychron/q1v1/ansi_encoder/config.h
index e608b42c8d6..c0d96766a3d 100644
--- a/keyboards/keychron/q1v1/ansi_encoder/config.h
+++ b/keyboards/keychron/q1v1/ansi_encoder/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 82
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v1/config.h b/keyboards/keychron/q1v1/config.h
index ec1bcc5794b..246f147afbc 100644
--- a/keyboards/keychron/q1v1/config.h
+++ b/keyboards/keychron/q1v1/config.h
@@ -18,19 +18,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {0,1} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
 
 /* Encoder Configuration*/
 #define ENCODER_DEFAULT_POS 0x3
-
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/info.json b/keyboards/keychron/q1v1/info.json
index 26c846927bd..0107c60b9ce 100644
--- a/keyboards/keychron/q1v1/info.json
+++ b/keyboards/keychron/q1v1/info.json
@@ -4,17 +4,22 @@
     "maintainer": "lalalademaxiya1",
     "bootloader": "atmel-dfu",
     "diode_direction": "ROW2COL",
+    "build": {
+        "lto": true
+    },
     "features": {
         "bootmagic": true,
         "command": false,
         "console": false,
         "dip_switch": true,
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": true,
         "rgb_matrix": true
     },
+    "dip_switch": {
+        "matrix_grid": [ [0, 1] ]
+    },
     "matrix_pins": {
         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
         "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
@@ -44,7 +49,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "is31fl3733"
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {
diff --git a/keyboards/keychron/q1v1/iso/config.h b/keyboards/keychron/q1v1/iso/config.h
index b6a25639864..4593b410674 100644
--- a/keyboards/keychron/q1v1/iso/config.h
+++ b/keyboards/keychron/q1v1/iso/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 83
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 44
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/iso.c b/keyboards/keychron/q1v1/iso/iso.c
index 874f5c85394..affc41d2196 100644
--- a/keyboards/keychron/q1v1/iso/iso.c
+++ b/keyboards/keychron/q1v1/iso/iso.c
@@ -16,111 +16,102 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b0111111111111101,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-};
-
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-	{0, L_14,   J_14,   K_14},
-	{0, I_14,   G_14,   H_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+	{0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+	{0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS2,    SW1_CS2,    SW2_CS2},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/README.md b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/README.md
deleted file mode 100644
index 3cfae17543b..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# kubahorak's Keychron Q1 keymap
-
-This ISO layout got heavily inspired by gtg465x's ANSI keymap (rev_0100).
-
-Features:
-- The rightest key column is: Ins, Home, PgUp, PgDn, which differs from the default.
-- RGB lighting turns off when the computer sleeps
-- Caps Lock and alpha keys turn red to indicate when Caps Lock is on
-- When the Fn layer is active, RGB lighting turns off for keys that are not assigned
-
-## Changelog
-
-### 2021-10-17 - 1.0.0
-
-- Initial release
-
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/config.h b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/config.h
deleted file mode 100644
index 55dbb74d4a0..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Jakub Horak (@kubahorak)
- *
- * 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 RGB_MATRIX_ENABLE
-/* from rev_0100/keymaps/gtg465x */
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-#    define FN_LAYER_TRANSPARENT_KEYS_OFF
-#endif
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap.c
deleted file mode 100644
index 479988dfa9f..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2021 Jakub Horak (@kubahorak)
- *
- * 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_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_iso_83(
-            KC_ESC,    KC_BRID,   KC_BRIU,   KC_F3,    KC_F4,     RGB_VAD,   RGB_VAI,   KC_MPRV,   KC_MPLY,   KC_MNXT,   KC_MUTE,   KC_VOLD,   KC_VOLU,   KC_DEL,    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_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_LCTL,   KC_LALT,   KC_LGUI,   KC_SPC,   KC_RGUI,   MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,   KC_RGHT
-            ),
-	[1] = LAYOUT_iso_83(
-            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_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_P7,     KC_P8,     KC_P9,     KC_PSLS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            RGB_TOG,   RGB_MOD,    RGB_VAI,   RGB_HUI,   RGB_SAI,   RGB_SPI,   KC_TRNS,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   RGB_RMOD,   RGB_VAD,   RGB_HUD,   RGB_SAD,   RGB_SPD,   KC_TRNS,   KC_P1,     KC_P2,     KC_P3,     KC_PMNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_P0,     KC_PDOT,   KC_PENT,   KC_PPLS,   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_iso_83(
-            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_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_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_LCTL,   KC_LGUI,   KC_LALT,   KC_SPC,   KC_RALT,   MO(3),   KC_RCTL,   KC_LEFT,   KC_DOWN,   KC_RGHT
-            ),
-	[3] = LAYOUT_iso_83(
-            KC_TRNS,   KC_BRID,    KC_BRIU,   LGUI(KC_TAB),   LGUI(KC_E),   RGB_VAD,   RGB_VAI,   KC_MPRV,   KC_MPLY,   KC_MNXT,   KC_MUTE,   KC_VOLD,   KC_VOLU,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,        KC_TRNS,      KC_TRNS,   KC_TRNS,   KC_P7,     KC_P8,     KC_P9,     KC_PSLS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            RGB_TOG,   RGB_MOD,    RGB_VAI,   RGB_HUI,        RGB_SAI,      RGB_SPI,   KC_TRNS,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   RGB_RMOD,   RGB_VAD,   RGB_HUD,        RGB_SAD,      RGB_SPD,   KC_TRNS,   KC_P1,     KC_P2,     KC_P3,     KC_PMNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,        KC_TRNS,      KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_P0,     KC_PDOT,   KC_PENT,   KC_PPLS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,        KC_TRNS,      KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
-            )
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap_user.h b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap_user.h
deleted file mode 100644
index 728114d556f..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap_user.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * 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
-
-// clang-format off
-
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
-
-// clang-format on
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.c b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.c
deleted file mode 100644
index 638aa77eb0a..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * 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 "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#ifdef FN_LAYER_TRANSPARENT_KEYS_OFF
-            rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-#endif
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-    switch (keycode) {
-#ifdef CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-    case KC_A ... KC_Z:
-#endif
-    case KC_CAPS:
-        return true;
-    default:
-        return false;
-    }
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.h b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.h
deleted file mode 100644
index dead4541676..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * 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
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rules.mk
deleted file mode 100644
index af720e37ee7..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/config.h b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/config.h
deleted file mode 100644
index bc9fe405c35..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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 RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define FN_LAYER_COLOR RGB_ORANGE
-#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap.c
deleted file mode 100644
index f86a84e468d..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-typedef union {
-  uint32_t raw;
-  struct {
-    bool caps_lock_light_tab :1;
-    bool caps_lock_light_alphas :1;
-    bool fn_layer_transparent_keys_off :1;
-    bool fn_layer_color_enable :1;
-  };
-} user_config_t;
-
-user_config_t user_config;
-
-enum custom_keycodes {
-    KC_LIGHT_TAB_TOGGLE = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
-    KC_LIGHT_ALPHAS_TOGGLE,
-    KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE,
-    KC_FN_LAYER_COLOR_TOGGLE
-};
-
-#define KC_LTTOG KC_LIGHT_TAB_TOGGLE
-#define KC_LATOG KC_LIGHT_ALPHAS_TOGGLE
-#define KC_TKTOG KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE
-#define KC_FCTOG KC_FN_LAYER_COLOR_TOGGLE
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[MAC_BASE] = LAYOUT_iso_83(
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   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_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[MAC_FN] = LAYOUT_iso_83(
-     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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-[WIN_BASE] = LAYOUT_iso_83(
-     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_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_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[WIN_FN] = LAYOUT_iso_83(
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-}
-
-void eeconfig_init_user(void) {
-    user_config.raw = 0;
-    user_config.caps_lock_light_tab = false;
-    user_config.caps_lock_light_alphas = false;
-    user_config.fn_layer_transparent_keys_off = true;
-    user_config.fn_layer_color_enable = false;
-    eeconfig_update_user(user_config.raw);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_LIGHT_TAB_TOGGLE:
-            if (record->event.pressed) {
-                user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_LIGHT_ALPHAS_TOGGLE:
-            if (record->event.pressed) {
-                user_config.caps_lock_light_alphas ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE:
-            if (record->event.pressed) {
-                user_config.fn_layer_transparent_keys_off ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_FN_LAYER_COLOR_TOGGLE:
-            if (record->event.pressed) {
-                user_config.fn_layer_color_enable ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        default:
-            return true;  // Process all other keycodes normally
-    }
-}
-
-bool get_caps_lock_light_tab(void) {
-    return user_config.caps_lock_light_tab;
-}
-
-bool get_caps_lock_light_alphas(void) {
-    return user_config.caps_lock_light_alphas;
-}
-
-bool get_fn_layer_transparent_keys_off(void) {
-    return user_config.fn_layer_transparent_keys_off;
-}
-
-bool get_fn_layer_color_enable(void) {
-    return user_config.fn_layer_color_enable;
-}
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap_user.h b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap_user.h
deleted file mode 100644
index 87b1baf47f2..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap_user.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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
-
-// clang-format off
-
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
-
-// clang-format on
-
-bool get_caps_lock_light_tab(void);
-bool get_caps_lock_light_alphas(void);
-bool get_fn_layer_transparent_keys_off(void);
-bool get_fn_layer_color_enable(void);
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/readme.md b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/readme.md
deleted file mode 100644
index 25d835b1c02..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/readme.md
+++ /dev/null
@@ -1,54 +0,0 @@
-## mkillewald's Keychron Q1 keymap (ISO rev_0102) v1.0.4
-
-This keymap builds on the keymap by Grayson Carr (gtg465x) but adds a couple options.
-
-## Features:
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences
-- RGB lighting turns off when the computer sleeps
-- Caps Lock RGB indicator
-    - the Caps Lock key will light when Caps Lock is enabled with the following options:
-        - #define CAPS_LOCK_INDICATOR_COLOR [color] in config.h to set the backlight color used for the indicator when Caps Lock is enabled (default: red)
-        - Fn+Z will toggle lighting the TAB key when Caps Lock is enabled. This is useful with non backlit keycaps/legends. (default: off)
-        - Fn+X will toggle lighting all the alpha keys when Caps Lock is enabled. (default: off)
-
-- Dynamic Fn layer RGB indicator
-    - When the Fn key is held down, any keys defined on the Fn layer in this firmware or in VIA will be highlighted with the following options:
-        - #define FN_LAYER_COLOR [color] in config.h to set a static color for defined keys (default: orange)
-        - Fn+C will toggle turning off RGB for keys with no definition (default: RGB off)
-        - Fn+V will toggle lighting the defined Fn layer keys with the static color set with FN_LAYER_COLOR (default: static color off)
-
-- All custom keycodes can be moved to different keys in VIA by using the ANY key with the following keycodes:
-    - USER(0) (default: F3) macOS Mission Control
-    - USER(1) (default: F4) macOS Launchpad
-    - USER(2) (default: Fn+Z) Caps Lock light Tab toggle
-    - USER(3) (default: Fn+X) Caps Lock light alphas toggle
-    - USER(4) (default: Fn+C) Fn layer non-defined keys RGB toggle
-    - USER(5) (default: Fn+V) Fn layer defined keys static color toggle
-
-RGB must be toggled on for all indicators to function. If you do not want an RGB mode active but still want the indicators, toggle RGB on and turn the brightness all the way off. The indicators will remain at full brightness.
-
-Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER(0) through USER(5) custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed.
-    
-#### USE AT YOUR OWN RISK
-
-## Changelog:
-
-v1.0.4  October 9, 2021
-- Caps Lock and Fn layer toggles are now stored in eeprom so settings will remain when Q1 is unplugged
-
-v1.0.3  October 8, 2021
-- now using keycode toggles instead of preprocessor directives to set the various Caps Lock and Fn Layer RGB lighting options. This allows for setting the options from user space without having to recompile.
-
-v1.0.2  October 7, 2021
-- adapted Grayson Carr's (gtg465x) Caps Lock alphas and dynamic Fn layer RGB routines
-- added CAPS_LOCK_INDICATOR_LIGHT_TAB config option to enable/disable lighting Tab with Caps Lock indicator
-- added FN_LAYER_COLOR config option to set FN layer static color
-
-v1.0.1  October 7, 2021
-- Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so thay can be labeled properly in VIA (adopted change from gtg465x)
-
-v1.0.0  September 30, 2021
-- Initial release built upon keymap by Grayson Carr (gtg465x)
-- defined Mission Control (F3) and Launchpad (F4) keycodes for macOs
-- RGB backlight turns off when computer sleeps
-- added Caps Lock indicator lighting both the Caps Lock and Tab LEDs for better effect on non-backlit keycaps
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c
deleted file mode 100644
index c6fa5f1f155..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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 "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#ifdef FN_LAYER_COLOR
-            if (get_fn_layer_color_enable()) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_not_transparent, FN_LAYER_COLOR);
-            }
-#endif
-            if (get_fn_layer_transparent_keys_off()) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-            }
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-    bool indicator = keycode == KC_CAPS;
-
-    if (get_caps_lock_light_tab()) {
-        indicator = keycode == KC_TAB || keycode == KC_CAPS;
-    }
-
-    if (get_caps_lock_light_alphas()) {
-        return (KC_A <= keycode && keycode <= KC_Z) || indicator;
-    } else {
-        return indicator;
-    }
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
-bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h
deleted file mode 100644
index 1fb79c0b2a1..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * 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
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
-bool is_not_transparent(uint16_t keycode);
-
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rules.mk
deleted file mode 100644
index af720e37ee7..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/config.h b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/config.h
deleted file mode 100644
index 02f08db4a7f..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2021 @ Victor-Gabriel Savu
- *
- * 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
-
-// disable all default effects
-#undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_MULTISPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// Allow fancy RGB
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// Simple RGB
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Reactive RGB
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
-
-#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
-
-// Unicode for Linux
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
-#define UNICODE_KEY_LNX  LCTL(LSFT(KC_U))
-
-// Leader config
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 500
diff --git a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/keymap.c
deleted file mode 100644
index 5256c97dca7..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/keymap.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright 2021 @ Victor-Gabriel Savu
- *
- * 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{
-  MAC_BASE,
-  MAC_FN,
-  WIN_BASE,
-  WIN_FN
-};
-
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-enum unicode_names {
-    GRIN,
-    SAD,
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    [GRIN]  = 0x1F600,  // 😀
-    [SAD]   = 0x1F61E,  // 😞
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[MAC_BASE] = LAYOUT_iso_83(
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_F3,    KC_F4,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   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_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[MAC_FN] = LAYOUT_iso_83(
-     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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-[WIN_BASE] = LAYOUT_iso_83(
-     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,   UM(SAD),
-     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,            UM(GRIN),
-     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,
-     QK_LEAD,  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_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[WIN_FN] = LAYOUT_iso_83(
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_CALC,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_TRNS,  KC_PSCR,  KC_MUTE,  KC_VOLD,  KC_VOLU,  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_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_CAPS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  KC_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_HOME,  KC_PGDN,  KC_END)
-
-};
-
-static bool wiggle_mouse;
-static uint16_t wiggle_timer;
-static uint16_t next_wiggle;
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(QK_LEAD)) {
-        tap_code(KC_CAPS);
-    }
-
-    if (leader_sequence_four_keys(KC_I, KC_D, KC_L, KC_E)) {
-        wiggle_mouse = !wiggle_mouse;
-        wiggle_timer = timer_read();
-    }
-
-    if (leader_sequence_two_keys(KC_O, KC_K)) {
-        send_unicode_string("👍");
-    }
-
-    if (leader_sequence_three_keys(KC_S, KC_A, KC_D)) {
-        send_unicode_string("😞");
-    }
-
-    if (leader_sequence_five_keys(KC_C, KC_H, KC_E, KC_C, KC_K)) {
-        send_unicode_string("✅");
-    }
-
-    if (leader_sequence_five_keys(KC_C, KC_R, KC_O, KC_S, KC_S)) {
-        send_unicode_string("❎");
-    }
-
-    if (leader_sequence_five_keys(KC_T, KC_H, KC_A, KC_N, KC_K)) {
-        send_unicode_string("🙏");
-    }
-
-    if (leader_sequence_five_keys(KC_S, KC_M, KC_I, KC_L, KC_E)) {
-        send_unicode_string("😊");
-    }
-
-    if (leader_sequence_five_keys(KC_P, KC_A, KC_R, KC_T, KC_Y)) {
-        send_unicode_string("🎉");
-    }
-
-    if (leader_sequence_four_keys(KC_E, KC_Y, KC_E, KC_S)) {
-        send_unicode_string("(ಠ_ಠ)");
-    }
-
-    if (leader_sequence_five_keys(KC_M, KC_A, KC_G, KC_I, KC_C)) {
-        send_unicode_string("(ಠ_ಠ) 🪄 ⠁⭒*.✫.*⭒⠁");
-    }
-
-    if (leader_sequence_five_keys(KC_T, KC_A, KC_B, KC_L, KC_E)) {
-        send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
-    }
-
-    if (leader_sequence_five_keys(KC_S, KC_H, KC_R, KC_U, KC_G)) {
-        send_unicode_string("¯\\_(ツ)_/¯");
-    }
-}
-
-void matrix_scan_user(void) {
-    if (wiggle_mouse && timer_elapsed(wiggle_timer) > next_wiggle) {
-        wiggle_timer = timer_read();
-
-        uint8_t rval = TCNT0 + TCNT1 + TCNT3 + TCNT4;
-        next_wiggle = rval % 1000;
-
-        if (rval & 1) tap_code(KC_MS_UP);
-        if (rval & 2) tap_code(KC_MS_DOWN);
-        if (rval & 4) tap_code(KC_MS_LEFT);
-        if (rval & 8) tap_code(KC_MS_RIGHT);
-    }
-}
diff --git a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/readme.md b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/readme.md
deleted file mode 100644
index c96130816e9..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# victorsavu3's Keychron Q1 keymap (ISO)
-
-Very similar to the default layout. Enables reactive and framebuffer RGB, but disables most effects enabled by keychron.
-Uses Caps Lock as a leader key for emojis and to enable a random mouse wiggler to prevent the system from going to sleep.
diff --git a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/rules.mk
deleted file mode 100644
index 853c414ec7e..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = yes
-UNICODEMAP_ENABLE = yes
-LEADER_ENABLE = yes
diff --git a/keyboards/keychron/q1v1/iso_encoder/config.h b/keyboards/keychron/q1v1/iso_encoder/config.h
index 0907aa14af3..ee86dc68818 100644
--- a/keyboards/keychron/q1v1/iso_encoder/config.h
+++ b/keyboards/keychron/q1v1/iso_encoder/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 83
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 44
diff --git a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
index 4a7496ed29d..e1c535b3182 100644
--- a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
@@ -16,112 +16,103 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b0111111111111101,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-};
-
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, I_14,   G_14,   H_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+    {0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+    {0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS2,    SW1_CS2,    SW2_CS2},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1v2/ansi/ansi.c b/keyboards/keychron/q1v2/ansi/ansi.c
index 3b80c9d5c49..a0ff08aa483 100644
--- a/keyboards/keychron/q1v2/ansi/ansi.c
+++ b/keyboards/keychron/q1v2/ansi/ansi.c
@@ -18,100 +18,100 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/ansi/config.h b/keyboards/keychron/q1v2/ansi/config.h
index 05ace317783..40df53a7596 100644
--- a/keyboards/keychron/q1v2/ansi/config.h
+++ b/keyboards/keychron/q1v2/ansi/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 37
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
index 3b80c9d5c49..a0ff08aa483 100644
--- a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
@@ -18,100 +18,100 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/ansi_encoder/config.h b/keyboards/keychron/q1v2/ansi_encoder/config.h
index 0dce301c3ce..5d53fb81caf 100644
--- a/keyboards/keychron/q1v2/ansi_encoder/config.h
+++ b/keyboards/keychron/q1v2/ansi_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 37
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/q1v2/config.h b/keyboards/keychron/q1v2/config.h
index 5e2a7eaa54e..326e60e3c0b 100644
--- a/keyboards/keychron/q1v2/config.h
+++ b/keyboards/keychron/q1v2/config.h
@@ -27,31 +27,9 @@
 #define I2C1_TIMINGR_SCLH 15U
 #define I2C1_TIMINGR_SCLL 51U
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID \
-    {                          \
-        { 5, 4 }               \
-    }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 /* Set LED driver current */
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 
-// 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 HOLD_ON_OTHER_KEY_PRESS // Old default behavior of mod-taps
diff --git a/keyboards/keychron/q1v2/info.json b/keyboards/keychron/q1v2/info.json
index b40c41c7606..ed718006e36 100644
--- a/keyboards/keychron/q1v2/info.json
+++ b/keyboards/keychron/q1v2/info.json
@@ -18,6 +18,14 @@
         "rgb_matrix": true,
         "dip_switch": true
     },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", null, null, null, null, null, null, null, null],
         "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
@@ -53,6 +61,7 @@
             "solid_reactive_multinexus": true,
             "splash": true,
             "solid_splash": true
-        }
+        },
+        "sleep": true
     }
 }
diff --git a/keyboards/keychron/q1v2/iso/config.h b/keyboards/keychron/q1v2/iso/config.h
index d9e596e2c57..f73455c9aa2 100644
--- a/keyboards/keychron/q1v2/iso/config.h
+++ b/keyboards/keychron/q1v2/iso/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 44
diff --git a/keyboards/keychron/q1v2/iso/iso.c b/keyboards/keychron/q1v2/iso/iso.c
index d879e550839..eba47a51bed 100644
--- a/keyboards/keychron/q1v2/iso/iso.c
+++ b/keyboards/keychron/q1v2/iso/iso.c
@@ -18,101 +18,101 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/iso_encoder/config.h b/keyboards/keychron/q1v2/iso_encoder/config.h
index ab9be499d98..a61faa7b0fa 100644
--- a/keyboards/keychron/q1v2/iso_encoder/config.h
+++ b/keyboards/keychron/q1v2/iso_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
index d879e550839..eba47a51bed 100644
--- a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
@@ -18,101 +18,101 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/jis/config.h b/keyboards/keychron/q1v2/jis/config.h
index 2e3db213b0c..40df53a7596 100644
--- a/keyboards/keychron/q1v2/jis/config.h
+++ b/keyboards/keychron/q1v2/jis/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v2/jis/jis.c b/keyboards/keychron/q1v2/jis/jis.c
index e8c01126494..5ba663de460 100644
--- a/keyboards/keychron/q1v2/jis/jis.c
+++ b/keyboards/keychron/q1v2/jis/jis.c
@@ -18,104 +18,104 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/jis_encoder/config.h b/keyboards/keychron/q1v2/jis_encoder/config.h
index c80c4238f57..5d53fb81caf 100644
--- a/keyboards/keychron/q1v2/jis_encoder/config.h
+++ b/keyboards/keychron/q1v2/jis_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
index e8c01126494..5ba663de460 100644
--- a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
@@ -18,104 +18,104 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/q1v2.c b/keyboards/keychron/q1v2/q1v2.c
index 4f83a760d38..1de8f205c7e 100644
--- a/keyboards/keychron/q1v2/q1v2.c
+++ b/keyboards/keychron/q1v2/q1v2.c
@@ -16,15 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 bool dip_switch_update_kb(uint8_t index, bool active) {
     if (!dip_switch_update_user(index, active)) {
diff --git a/keyboards/keychron/q2/ansi/ansi.c b/keyboards/keychron/q2/ansi/ansi.c
index d0ff0a18695..f26fa9c697b 100644
--- a/keyboards/keychron/q2/ansi/ansi.c
+++ b/keyboards/keychron/q2/ansi/ansi.c
@@ -17,84 +17,84 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/ansi/config.h b/keyboards/keychron/q2/ansi/config.h
index 41b92074beb..1850088b1f7 100644
--- a/keyboards/keychron/q2/ansi/config.h
+++ b/keyboards/keychron/q2/ansi/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 67
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 30
\ No newline at end of file
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/config.h b/keyboards/keychron/q2/ansi/keymaps/ladduro/config.h
deleted file mode 100644
index a8ad37d0036..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 @ Ionut Micu
- *
- * 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
-
-/* RGB Matrix Configuration */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-#    define FN_LAYER_TRANSPARENT_KEYS_OFF
-#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c b/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c
deleted file mode 100644
index 55ee7a9732c..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2022 @ Ionut Micu
- *
- * 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_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-#define KC_WAVE S(KC_GRV)
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_67(
-        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_INS,
-        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_HOME,
-        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_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [WIN_BASE] = LAYOUT_ansi_67(
-        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_INS,
-        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_HOME,
-        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(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [_FN1] = LAYOUT_ansi_67(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
-        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    [_FN2] = LAYOUT_ansi_67(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
-        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    [_FN3] = LAYOUT_ansi_67(
-        KC_WAVE, 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,
-        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap_user.h b/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap_user.h
deleted file mode 100644
index ded78ae1b8e..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap_user.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 @ Ionut Micu
- *
- * 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
-
-// clang-format off
-
-enum layers{
-    MAC_BASE,
-    WIN_BASE,
-    _FN1,
-    _FN2,
-    _FN3,
-};
\ No newline at end of file
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/readme.md b/keyboards/keychron/q2/ansi/keymaps/ladduro/readme.md
deleted file mode 100644
index 42ca81a1a1e..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Ladduro keymap for Keychron Q2 (ANSI rev_0110) v1.01
-
-This keymap ports Q1 logic (by gtg465x) for RGB caps lock indicator and layer RBG assigned key.
-
-## Features:
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences
-- RGB lighting turns off when the computer sleeps
-- Caps Lock and alpha keys turn red to indicate when Caps Lock is on
-- When the Fn layer is active, RGB lighting turns off for keys that are not assigned
-
-Make example for this keyboard (after setting up your build environment):
-
-    make keychron/q2/rev_0110:ladduro
-
-Flashing example for this keyboard:
-
-    make keychron/q2/rev_0110:ladduro: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).
-
-## Changelog
-
-### 14/03/2021 - 1.
-
-- Initial release
-
-### 02/04/2021 - 1.01
-
-- Remove via enable from rules.mk as it breaks the layout for some reason
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.c b/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.c
deleted file mode 100644
index 604f54a7050..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2022 @ Ionut Micu
- *
- * 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 "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case _FN1:
-        case _FN2:
-        case _FN3:
-#ifdef FN_LAYER_TRANSPARENT_KEYS_OFF
-            rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-#endif
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-#ifdef CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-    return (KC_A <= keycode && keycode <= KC_Z) || keycode == KC_CAPS;
-#else
-    return keycode == KC_CAPS;
-#endif
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.h b/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.h
deleted file mode 100644
index 4d33f483aee..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/* Copyright 2022 @ Ionut Micu
- *
- * 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
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
\ No newline at end of file
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/rules.mk b/keyboards/keychron/q2/ansi/keymaps/ladduro/rules.mk
deleted file mode 100644
index c0ee640cd24..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
index d0ff0a18695..f26fa9c697b 100644
--- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
@@ -17,84 +17,84 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/ansi_encoder/config.h b/keyboards/keychron/q2/ansi_encoder/config.h
index 41b92074beb..1850088b1f7 100644
--- a/keyboards/keychron/q2/ansi_encoder/config.h
+++ b/keyboards/keychron/q2/ansi_encoder/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 67
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 30
\ No newline at end of file
diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index 831612326b3..8b446442cb7 100644
--- a/keyboards/keychron/q2/config.h
+++ b/keyboards/keychron/q2/config.h
@@ -18,23 +18,11 @@
 
 #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4, 4} }
-
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* Encoder Configuration*/
 #define ENCODER_DEFAULT_POS 0x3
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/q2/info.json b/keyboards/keychron/q2/info.json
index 47d9aa83b18..d0bb48d7cbc 100644
--- a/keyboards/keychron/q2/info.json
+++ b/keyboards/keychron/q2/info.json
@@ -22,6 +22,9 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
@@ -51,7 +54,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {
diff --git a/keyboards/keychron/q2/iso/config.h b/keyboards/keychron/q2/iso/config.h
index b463f7886e7..22ddcba3adb 100644
--- a/keyboards/keychron/q2/iso/config.h
+++ b/keyboards/keychron/q2/iso/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 68
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 29
\ No newline at end of file
diff --git a/keyboards/keychron/q2/iso/iso.c b/keyboards/keychron/q2/iso/iso.c
index a54c90bc4be..a54ec4d718b 100644
--- a/keyboards/keychron/q2/iso/iso.c
+++ b/keyboards/keychron/q2/iso/iso.c
@@ -17,85 +17,85 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-	{1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+	{1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/iso_encoder/config.h b/keyboards/keychron/q2/iso_encoder/config.h
index b463f7886e7..22ddcba3adb 100644
--- a/keyboards/keychron/q2/iso_encoder/config.h
+++ b/keyboards/keychron/q2/iso_encoder/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 68
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 29
\ No newline at end of file
diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.c b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
index a54c90bc4be..a54ec4d718b 100644
--- a/keyboards/keychron/q2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
@@ -17,85 +17,85 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-	{1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+	{1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/jis/jis.c b/keyboards/keychron/q2/jis/jis.c
index d877e225d93..b46ee106017 100644
--- a/keyboards/keychron/q2/jis/jis.c
+++ b/keyboards/keychron/q2/jis/jis.c
@@ -18,88 +18,88 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/jis_encoder/jis_encoder.c b/keyboards/keychron/q2/jis_encoder/jis_encoder.c
index d877e225d93..b46ee106017 100644
--- a/keyboards/keychron/q2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q2/jis_encoder/jis_encoder.c
@@ -18,88 +18,88 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/q2.c b/keyboards/keychron/q2/q2.c
index 7ff85556def..1dd839eccc2 100644
--- a/keyboards/keychron/q2/q2.c
+++ b/keyboards/keychron/q2/q2.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c
index 8327ee430b3..f14e9f28cef 100644
--- a/keyboards/keychron/q3/ansi/ansi.c
+++ b/keyboards/keychron/q3/ansi/ansi.c
@@ -18,105 +18,105 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi/config.h b/keyboards/keychron/q3/ansi/config.h
index 77afc9b9b66..a4008b88274 100644
--- a/keyboards/keychron/q3/ansi/config.h
+++ b/keyboards/keychron/q3/ansi/config.h
@@ -19,9 +19,6 @@
 /* We use a pin with a stronger pull resistor than the internal MCU pins */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 87
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
index a386e87a01d..ac6c3757771 100644
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
@@ -18,105 +18,105 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi_encoder/config.h b/keyboards/keychron/q3/ansi_encoder/config.h
index 2a6f9ba4c5e..0d8b3b7c3b7 100644
--- a/keyboards/keychron/q3/ansi_encoder/config.h
+++ b/keyboards/keychron/q3/ansi_encoder/config.h
@@ -20,9 +20,6 @@
 #define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 87
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 
diff --git a/keyboards/keychron/q3/config.h b/keyboards/keychron/q3/config.h
index f93da423532..3f817d28533 100644
--- a/keyboards/keychron/q3/config.h
+++ b/keyboards/keychron/q3/config.h
@@ -29,17 +29,5 @@
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5, 4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
 /* Encoder Configuration*/
 #define ENCODER_DEFAULT_POS 0x3
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/q3/info.json b/keyboards/keychron/q3/info.json
index c08d73f26a1..a07fc670d82 100644
--- a/keyboards/keychron/q3/info.json
+++ b/keyboards/keychron/q3/info.json
@@ -3,6 +3,9 @@
     "maintainer": "lalalademaxiya1",
     "bootloader": "stm32-dfu",
     "diode_direction": "ROW2COL",
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
     "eeprom": {
         "wear_leveling": {
             "backing_size": 4096
@@ -43,7 +46,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {
diff --git a/keyboards/keychron/q3/iso/config.h b/keyboards/keychron/q3/iso/config.h
index 3ffda1ce1e4..997fb73c695 100644
--- a/keyboards/keychron/q3/iso/config.h
+++ b/keyboards/keychron/q3/iso/config.h
@@ -19,9 +19,6 @@
 /* We use a pin with a stronger pull resistor than the internal MCU pins */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 88
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 
diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c
index 725af670069..6a942028d51 100644
--- a/keyboards/keychron/q3/iso/iso.c
+++ b/keyboards/keychron/q3/iso/iso.c
@@ -18,106 +18,106 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso_encoder/config.h b/keyboards/keychron/q3/iso_encoder/config.h
index 6893c2e8ffe..72e8e7271cc 100644
--- a/keyboards/keychron/q3/iso_encoder/config.h
+++ b/keyboards/keychron/q3/iso_encoder/config.h
@@ -20,9 +20,6 @@
 #define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 88
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 }
 
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
index 725af670069..6a942028d51 100644
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
@@ -18,106 +18,106 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis/config.h b/keyboards/keychron/q3/jis/config.h
index 1ea4386bbad..b4839aa33f1 100644
--- a/keyboards/keychron/q3/jis/config.h
+++ b/keyboards/keychron/q3/jis/config.h
@@ -19,9 +19,6 @@
 /* If PH3 used with a stronger pull resistor then the following definition needs be included */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 91
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
 
diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c
index 4b19eca52fa..3c51076020c 100644
--- a/keyboards/keychron/q3/jis/jis.c
+++ b/keyboards/keychron/q3/jis/jis.c
@@ -18,109 +18,109 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},  // ESC
-    {0, I_2,    G_2,    H_2},  // F1
-    {0, I_3,    G_3,    H_3},  // F2
-    {0, I_4,    G_4,    H_4},  // F3
-    {0, I_5,    G_5,    H_5},  // F4
-    {0, I_6,    G_6,    H_6},  // F5
-    {0, I_7,    G_7,    H_7},  // F6
-    {0, I_8,    G_8,    H_8},  // F7
-    {0, I_9,    G_9,    H_9},  // F8
-    {0, I_10,   G_10,   H_10}, // F9
-    {0, I_11,   G_11,   H_11}, // F10
-    {0, I_12,   G_12,   H_12}, // F11
-    {0, I_13,   G_13,   H_13}, // F12
-    {0, I_15,   G_15,   H_15}, // Print
-    {0, I_16,   G_16,   H_16}, // Cortana
-    {1, I_15,   G_15,   H_15}, // Light
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},  // ESC
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},  // F1
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},  // F2
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},  // F3
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},  // F4
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},  // F5
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},  // F6
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},  // F7
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},  // F8
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10}, // F9
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11}, // F10
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12}, // F11
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // F12
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15}, // Print
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16}, // Cortana
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15}, // Light
 
-    {0, C_1,    A_1,    B_1},  // `~
-    {0, C_2,    A_2,    B_2},  // 1!
-    {0, C_3,    A_3,    B_3},  // 2@
-    {0, C_4,    A_4,    B_4},  // 3#
-    {0, C_5,    A_5,    B_5},  // 4$
-    {0, C_6,    A_6,    B_6},  // 5%
-    {0, C_7,    A_7,    B_7},  // 6^
-    {0, C_8,    A_8,    B_8},  // 7&
-    {0, C_9,    A_9,    B_9},  // 8*
-    {0, C_10,   A_10,   B_10}, // 9()
-    {0, C_11,   A_11,   B_11}, // 0)
-    {0, C_12,   A_12,   B_12}, // -_
-    {0, C_13,   A_13,   B_13}, // =+
-    {0, I_13,   G_13,   H_13}, // |
-    {0, I_14,   G_14,   H_14}, // Backspace
-    {0, C_15,   A_15,   B_15}, // Ins
-    {0, C_16,   A_16,   B_16}, // Home
-    {1, I_16,   G_16,   H_16}, // Page Up
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // `~
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // 1!
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // 2@
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // 3#
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // 4$
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 5%
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 6^
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 7&
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 8*
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 9()
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 0)
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // -_
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // =+
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // |
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // Backspace
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15}, // Ins
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Home
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16}, // Page Up
 
-    {0, F_1,    D_1,    E_1},  // tab
-    {0, F_2,    D_2,    E_2},  // Q
-    {0, F_3,    D_3,    E_3},  // W
-    {0, F_4,    D_4,    E_4},  // E
-    {0, F_5,    D_5,    E_5},  // R
-    {0, F_6,    D_6,    E_6},  // T
-    {0, F_7,    D_7,    E_7},  // Y
-    {0, F_8,    D_8,    E_8},  // U
-    {0, F_9,    D_9,    E_9},  // I
-    {0, F_10,   D_10,   E_10}, // O
-    {0, F_11,   D_11,   E_11}, // P
-    {0, F_12,   D_12,   E_12}, // [{
-    {0, F_14,   D_14,   E_14}, // }}
-    {0, F_15,   D_15,   E_15}, // Del
-    {0, F_16,   D_16,   E_16}, // End
-    {1, I_13,   G_13,   H_13}, // Page Down
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},  // tab
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},  // Q
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},  // W
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // E
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},  // R
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},  // T
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},  // Y
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},  // U
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},  // I
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10}, // O
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11}, // P
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12}, // [{
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14}, // }}
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15}, // Del
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16}, // End
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13}, // Page Down
 
-    {1, I_1,    G_1,    H_1},  // Cpas
-    {1, I_2,    G_2,    H_2},  // A
-    {1, I_3,    G_3,    H_3},  // S
-    {1, I_4,    G_4,    H_4},  // D
-    {1, I_5,    G_5,    H_5},  // F
-    {1, I_6,    G_6,    H_6},  // G
-    {1, I_7,    G_7,    H_7},  // H
-    {1, I_8,    G_8,    H_8},  // J
-    {1, I_9,    G_9,    H_9},  // K
-    {1, I_10,   G_10,   H_10}, // L
-    {1, I_11,   G_11,   H_11}, // ;
-    {1, I_12,   G_12,   H_12}, // :
-    {1, I_14,   G_14,   H_14}, // #~
-    {0, F_13,   D_13,   E_13}, // Enter
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},  // Cpas
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},  // A
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},  // S
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},  // D
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},  // F
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},  // G
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},  // H
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},  // J
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},  // K
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10}, // L
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11}, // ;
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12}, // :
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14}, // #~
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13}, // Enter
 
-    {1, C_1,    A_1,    B_1},  // LShift
-    {1, C_3,    A_3,    B_3},  // Z
-    {1, C_4,    A_4,    B_4},  // X
-    {1, C_5,    A_5,    B_5},  // C
-    {1, C_6,    A_6,    B_6},  // V
-    {1, C_7,    A_7,    B_7},  // B
-    {1, C_8,    A_8,    B_8},  // N
-    {1, C_9,    A_9,    B_9},  // M
-    {1, C_10,   A_10,   B_10}, // ,<
-    {1, C_11,   A_11,   B_11}, // .>
-    {1, C_12,   A_12,   B_12}, // /?
-    {1, C_13,   A_13,   B_13}, // |
-    {1, C_14,   A_14,   B_14}, // RShift
-    {1, C_16,   A_16,   B_16}, // Up
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},  // LShift
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},  // Z
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},  // X
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},  // C
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},  // V
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},  // B
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},  // N
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},  // M
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10}, // ,<
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11}, // .>
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12}, // /?
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13}, // |
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14}, // RShift
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Up
 
-    {1, F_1,    D_1,    E_1},  // LCtrl
-    {1, F_2,    D_2,    E_2},  // LWin
-    {1, F_3,    D_3,    E_3},  // LAlt
-    {1, F_4,    D_4,    E_4},  // NUm
-    {1, F_7,    D_7,    E_7},  // Space
-    {1, F_10,   D_10,   E_10}, // Jap
-    {1, F_11,   D_11,   E_11}, // RAlt
-    {1, F_12,   D_12,   E_12}, // RWin
-    {1, F_13,   D_13,   E_13}, // Fn
-    {1, F_14,   D_14,   E_14}, // RCtrl
-    {1, F_15,   D_15,   E_15}, // Left
-    {1, F_16,   D_16,   E_16}, // Down
-    {1, C_15,   A_15,   B_15}, // Right
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},  // LCtrl
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},  // LWin
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},  // LAlt
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},  // NUm
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},  // Space
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10}, // Jap
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11}, // RAlt
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12}, // RWin
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13}, // Fn
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14}, // RCtrl
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15}, // Left
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}, // Down
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15}, // Right
 };
 
 #endif // GB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis_encoder/config.h b/keyboards/keychron/q3/jis_encoder/config.h
index 5c5efb4ff65..d1d1bc758db 100644
--- a/keyboards/keychron/q3/jis_encoder/config.h
+++ b/keyboards/keychron/q3/jis_encoder/config.h
@@ -20,9 +20,6 @@
 #define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 92
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
 
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
index 8770f9d33c6..aa34222bf39 100644
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
@@ -18,110 +18,110 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},  // ESC
-    {0, I_2,    G_2,    H_2},  // F1
-    {0, I_3,    G_3,    H_3},  // F2
-    {0, I_4,    G_4,    H_4},  // F3
-    {0, I_5,    G_5,    H_5},  // F4
-    {0, I_6,    G_6,    H_6},  // F5
-    {0, I_7,    G_7,    H_7},  // F6
-    {0, I_8,    G_8,    H_8},  // F7
-    {0, I_9,    G_9,    H_9},  // F8
-    {0, I_10,   G_10,   H_10}, // F9
-    {0, I_11,   G_11,   H_11}, // F10
-    {0, I_12,   G_12,   H_12}, // F11
-    {0, I_13,   G_13,   H_13}, // F12
-    {0, I_14,   G_14,   H_14}, // Mute
-    {0, I_15,   G_15,   H_15}, // Print
-    {0, I_16,   G_16,   H_16}, // Cortana
-    {1, I_15,   G_15,   H_15}, // Light
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},  // ESC
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},  // F1
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},  // F2
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},  // F3
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},  // F4
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},  // F5
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},  // F6
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},  // F7
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},  // F8
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10}, // F9
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11}, // F10
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12}, // F11
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // F12
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // Mute
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15}, // Print
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16}, // Cortana
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15}, // Light
 
-    {0, C_1,    A_1,    B_1},  // `~
-    {0, C_2,    A_2,    B_2},  // 1!
-    {0, C_3,    A_3,    B_3},  // 2@
-    {0, C_4,    A_4,    B_4},  // 3#
-    {0, C_5,    A_5,    B_5},  // 4$
-    {0, C_6,    A_6,    B_6},  // 5%
-    {0, C_7,    A_7,    B_7},  // 6^
-    {0, C_8,    A_8,    B_8},  // 7&
-    {0, C_9,    A_9,    B_9},  // 8*
-    {0, C_10,   A_10,   B_10}, // 9()
-    {0, C_11,   A_11,   B_11}, // 0)
-    {0, C_12,   A_12,   B_12}, // -_
-    {0, C_13,   A_13,   B_13}, // =+
-    {0, C_14,   A_14,   B_14}, // |
-    {1, F_6,    D_6,    E_6},  // Backspace
-    {0, C_15,   A_15,   B_15}, // Ins
-    {0, C_16,   A_16,   B_16}, // Home
-    {1, I_16,   G_16,   H_16}, // Page Up
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // `~
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // 1!
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // 2@
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // 3#
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // 4$
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 5%
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 6^
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 7&
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 8*
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 9()
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 0)
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // -_
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // =+
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // |
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Backspace
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15}, // Ins
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Home
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16}, // Page Up
 
-    {0, F_1,    D_1,    E_1},  // tab
-    {0, F_2,    D_2,    E_2},  // Q
-    {0, F_3,    D_3,    E_3},  // W
-    {0, F_4,    D_4,    E_4},  // E
-    {0, F_5,    D_5,    E_5},  // R
-    {0, F_6,    D_6,    E_6},  // T
-    {0, F_7,    D_7,    E_7},  // Y
-    {0, F_8,    D_8,    E_8},  // U
-    {0, F_9,    D_9,    E_9},  // I
-    {0, F_10,   D_10,   E_10}, // O
-    {0, F_11,   D_11,   E_11}, // P
-    {0, F_12,   D_12,   E_12}, // [{
-    {0, F_13,   D_13,   E_13}, // }}
-    {0, F_15,   D_15,   E_15}, // Del
-    {0, F_16,   D_16,   E_16}, // End
-    {1, I_13,   G_13,   H_13}, // Page Down
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},  // tab
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},  // Q
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},  // W
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // E
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},  // R
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},  // T
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},  // Y
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},  // U
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},  // I
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10}, // O
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11}, // P
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12}, // [{
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13}, // }}
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15}, // Del
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16}, // End
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13}, // Page Down
 
-    {1, I_1,    G_1,    H_1},  // Cpas
-    {1, I_2,    G_2,    H_2},  // A
-    {1, I_3,    G_3,    H_3},  // S
-    {1, I_4,    G_4,    H_4},  // D
-    {1, I_5,    G_5,    H_5},  // F
-    {1, I_6,    G_6,    H_6},  // G
-    {1, I_7,    G_7,    H_7},  // H
-    {1, I_8,    G_8,    H_8},  // J
-    {1, I_9,    G_9,    H_9},  // K
-    {1, I_10,   G_10,   H_10}, // L
-    {1, I_11,   G_11,   H_11}, // ;
-    {1, I_12,   G_12,   H_12}, // :
-    {1, I_14,   G_14,   H_14}, // #~
-    {0, F_14,   D_14,   E_14}, // Enter
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},  // Cpas
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},  // A
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},  // S
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},  // D
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},  // F
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},  // G
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},  // H
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},  // J
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},  // K
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10}, // L
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11}, // ;
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12}, // :
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14}, // #~
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14}, // Enter
 
-    {1, C_1,    A_1,    B_1},  // LShift
-    {1, C_3,    A_3,    B_3},  // Z
-    {1, C_4,    A_4,    B_4},  // X
-    {1, C_5,    A_5,    B_5},  // C
-    {1, C_6,    A_6,    B_6},  // V
-    {1, C_7,    A_7,    B_7},  // B
-    {1, C_8,    A_8,    B_8},  // N
-    {1, C_9,    A_9,    B_9},  // M
-    {1, C_10,   A_10,   B_10}, // ,<
-    {1, C_11,   A_11,   B_11}, // .>
-    {1, C_12,   A_12,   B_12}, // /?
-    {1, C_13,   A_13,   B_13}, // |
-    {1, C_14,   A_14,   B_14}, // RShift
-    {1, C_16,   A_16,   B_16}, // Up
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},  // LShift
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},  // Z
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},  // X
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},  // C
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},  // V
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},  // B
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},  // N
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},  // M
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10}, // ,<
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11}, // .>
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12}, // /?
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13}, // |
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14}, // RShift
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Up
 
-    {1, F_1,    D_1,    E_1},  // LCtrl
-    {1, F_2,    D_2,    E_2},  // LWin
-    {1, F_3,    D_3,    E_3},  // LAlt
-    {1, F_4,    D_4,    E_4},  // NUm
-    {1, F_7,    D_7,    E_7},  // Space
-    {1, F_10,   D_10,   E_10}, // Jap
-    {1, F_11,   D_11,   E_11}, // RAlt
-    {1, F_12,   D_12,   E_12}, // RWin
-    {1, F_13,   D_13,   E_13}, // Fn
-    {1, F_14,   D_14,   E_14}, // RCtrl
-    {1, F_15,   D_15,   E_15}, // Left
-    {1, F_16,   D_16,   E_16}, // Down
-    {1, C_15,   A_15,   B_15}, // Right
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},  // LCtrl
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},  // LWin
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},  // LAlt
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},  // NUm
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},  // Space
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10}, // Jap
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11}, // RAlt
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12}, // RWin
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13}, // Fn
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14}, // RCtrl
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15}, // Left
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}, // Down
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15}, // Right
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/q3.c b/keyboards/keychron/q3/q3.c
index 2bf8bf08a0b..846b58d4a7b 100644
--- a/keyboards/keychron/q3/q3.c
+++ b/keyboards/keychron/q3/q3.c
@@ -17,19 +17,6 @@
 #include "quantum.h"
 #include "rgb_matrix.h"
 
-// clang-format off
-
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111101111,
-};
-
-// clang-format on
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q4/ansi/v1/config.h b/keyboards/keychron/q4/ansi/v1/config.h
index 2f437c72c67..478b2ff9f92 100644
--- a/keyboards/keychron/q4/ansi/v1/config.h
+++ b/keyboards/keychron/q4/ansi/v1/config.h
@@ -20,7 +20,4 @@
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 61
-
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
diff --git a/keyboards/keychron/q4/ansi/v1/v1.c b/keyboards/keychron/q4/ansi/v1/v1.c
index 6c1fecefec0..ee5551fbb8b 100644
--- a/keyboards/keychron/q4/ansi/v1/v1.c
+++ b/keyboards/keychron/q4/ansi/v1/v1.c
@@ -18,78 +18,78 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
 };
 
 #endif
diff --git a/keyboards/keychron/q4/ansi/v2/config.h b/keyboards/keychron/q4/ansi/v2/config.h
index 029e7727a81..48a6c669089 100644
--- a/keyboards/keychron/q4/ansi/v2/config.h
+++ b/keyboards/keychron/q4/ansi/v2/config.h
@@ -18,6 +18,3 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
-
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 61
diff --git a/keyboards/keychron/q4/ansi/v2/v2.c b/keyboards/keychron/q4/ansi/v2/v2.c
index 468a87af41d..1a0e2711f3e 100644
--- a/keyboards/keychron/q4/ansi/v2/v2.c
+++ b/keyboards/keychron/q4/ansi/v2/v2.c
@@ -18,78 +18,78 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q4/config.h b/keyboards/keychron/q4/config.h
index 62f8294966e..fe4ee38e7d7 100644
--- a/keyboards/keychron/q4/config.h
+++ b/keyboards/keychron/q4/config.h
@@ -16,17 +16,5 @@
 
 #pragma once
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4,4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60 }
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
\ No newline at end of file
diff --git a/keyboards/keychron/q4/info.json b/keyboards/keychron/q4/info.json
index 0a9dcf49578..e314477ab94 100644
--- a/keyboards/keychron/q4/info.json
+++ b/keyboards/keychron/q4/info.json
@@ -4,6 +4,9 @@
     "maintainer": "lalalademaxiya1",
     "bootloader": "stm32-dfu",
     "diode_direction": "ROW2COL",
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
     "dynamic_keymap": {
         "layer_count": 5
     },
@@ -53,7 +56,8 @@
             "splash": true,
             "typing_heatmap": true
         },
-        "driver": "snled27351"
+        "driver": "snled27351",
+        "sleep": true
     },
     "url": "https://github.com/Keychron",
     "usb": {
diff --git a/keyboards/keychron/q4/iso/config.h b/keyboards/keychron/q4/iso/config.h
index 8231b9eba80..9e979229916 100644
--- a/keyboards/keychron/q4/iso/config.h
+++ b/keyboards/keychron/q4/iso/config.h
@@ -19,8 +19,5 @@
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 62
-
 /* Enable CapsLcok LED*/
 #define CAPS_LOCK_LED_INDEX 27
diff --git a/keyboards/keychron/q4/iso/iso.c b/keyboards/keychron/q4/iso/iso.c
index a808c3ad74c..7f796238f5e 100644
--- a/keyboards/keychron/q4/iso/iso.c
+++ b/keyboards/keychron/q4/iso/iso.c
@@ -18,79 +18,79 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, I_14,   G_14,   H_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q4/q4.c b/keyboards/keychron/q4/q4.c
index c3cb67bcc2e..54ad01250fc 100644
--- a/keyboards/keychron/q4/q4.c
+++ b/keyboards/keychron/q4/q4.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b11111111111111,
-    0b11111111111111,
-    0b11111111111111,
-    0b11111111111111,
-    0b11111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c
index 8c80245fbc7..bc6622dd7f6 100644
--- a/keyboards/keychron/q5/ansi/ansi.c
+++ b/keyboards/keychron/q5/ansi/ansi.c
@@ -18,150 +18,118 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
-};
-
-#define __ NO_LED
-
-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 },
-        { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, __, 33, 34, 35 },
-        { 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 70, 51, 52, 53 },
-        { 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 18, 66, 36, 67, 68, 69 },
-        { 71, __, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, __, 82, 83, 84, 85, 86 },
-        { 87, 88, 89, __, __, 99, 90, __, __, __, 91, 92, 93, 94, 95, 96, 97, 98 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {12,0},  {24,0},  {36,0},  {48,0},  {60,0},  {72,0},  {84,0},  {97,0},   {109,0},  {121,0},  {133,0},  {145,0},  {157,0},  {169,0},  {188,0},  {200,0},  {212,0},  {224,0},
-        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {84,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
-        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26}, {166,26},           {188,26}, {200,26}, {212,26},
-        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38},           {161,38},           {188,38}, {200,38}, {212,38}, {224,32},
-        {8,49},          {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49},           {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
-        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    4, 4, 4, 4,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
-        1, 1, 1,          1,          1, 1, 1, 1, 1, 1, 1, 1, 1
-    }
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi/config.h b/keyboards/keychron/q5/ansi/config.h
index 9ed58dd5227..86df6f30569 100644
--- a/keyboards/keychron/q5/ansi/config.h
+++ b/keyboards/keychron/q5/ansi/config.h
@@ -16,13 +16,8 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 55
-#define DRIVER_2_LED_TOTAL 45
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 54
 
 /* Enable num-lock LED */
-// #define NUM_LOCK_LED_INDEX 33
+#define NUM_LOCK_LED_INDEX 33
diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
index 8795957c45d..399b5873da9 100644
--- a/keyboards/keychron/q5/ansi/info.json
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -1,18 +1,112 @@
 {
-    "keyboard_name": "Keychron Q5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0150",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 12, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 36, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 60, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 72, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 84, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 97, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 109, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 121, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 145, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 157, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 188, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 200, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 212, "y": 0, "flags": 1},
+            {"matrix": [3, 12], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 12, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 36, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 84, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 97, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 109, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 121, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 133, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 145, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 163, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 200, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 15, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 91, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 103, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 115, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 127, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 139, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 151, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 166, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+            {"matrix": [3, 0], "x": 5, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 21, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 57, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 81, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 94, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 130, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 161, "y": 38, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+            {"matrix": [4, 0], "x": 8, "y": 49, "flags": 1},
+            {"matrix": [4, 2], "x": 27, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 39, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 51, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 63, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 88, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 152, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 172, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 49, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 17, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 32, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 77, "y": 61, "flags": 1},
+            {"matrix": [5, 10], "x": 121, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 133, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 145, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 160, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 172, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 200, "y": 61, "flags": 1},
+            {"matrix": [5, 17], "x": 212, "y": 61, "flags": 1},
+            {"matrix": [5, 5], "x": 224, "y": 55, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0150"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_100": {
             "layout": [
@@ -107,7 +201,6 @@
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
                 {"matrix": [4, 16], "x": 16.5, "y": 4.25},
                 {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
                 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
@@ -124,4 +217,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/ansi/rules.mk b/keyboards/keychron/q5/ansi/rules.mk
index 465dfa93486..c0d14172990 100644
--- a/keyboards/keychron/q5/ansi/rules.mk
+++ b/keyboards/keychron/q5/ansi/rules.mk
@@ -1,19 +1,4 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
index d5f67f12976..760fdcbc97b 100644
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
@@ -20,150 +20,118 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    // {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    // {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    // {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    // {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
-};
-
-#define __ NO_LED
-
-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 },
-        { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, __, 31, 32, 33 },
-        { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 68, 49, 50, 51 },
-        { 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 16, 64, 34, 65, 66, 67 },
-        { 69, __, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, __, 80, 81, 82, 83, 84 },
-        { 85, 86, 87, __, __, 97, 88, __, __, __, 89, 90, 91, 92, 93, 94, 95, 96 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},           {24,0},  {36,0},  {48,0},  {60,0},  {78,0},  {90,0},  {103,0},  {115,0},  {133,0},  {145,0},  {157,0},  {169,0},            {184,0},  {196,0},  {208,0},  {224,0},
-        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
-        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26}, {166,26},           {188,26}, {200,26}, {212,26},
-        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38},           {161,38},           {188,38}, {200,38}, {212,38}, {224,32},
-        {8,49},          {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49},           {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
-        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
-    },
-    {
-        // RGB LED Index to Flag
-        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    4, 4, 4, 4,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 4, 4, 4, 1
-    }
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi_encoder/config.h b/keyboards/keychron/q5/ansi_encoder/config.h
index 3986c11a027..dc0853bc34f 100644
--- a/keyboards/keychron/q5/ansi_encoder/config.h
+++ b/keyboards/keychron/q5/ansi_encoder/config.h
@@ -16,16 +16,8 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 53
-#define DRIVER_2_LED_TOTAL 45
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 52
 
 /* Enable num-lock LED */
-// #define NUM_LOCK_LED_INDEX 31
+#define NUM_LOCK_LED_INDEX 31
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
index ae4a58e55dc..479ef38e72f 100644
--- a/keyboards/keychron/q5/ansi_encoder/info.json
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -1,23 +1,120 @@
 {
-    "keyboard_name": "Keychron Q5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0151",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 36, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 60, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 78, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 90, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 103, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 115, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 145, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 157, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 184, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 196, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 208, "y": 0, "flags": 1},
+            {"matrix": [3, 12], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 12, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 36, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 85, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 97, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 109, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 121, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 133, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 145, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 163, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 200, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 15, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 15, "flags": 4},
+
+            {"matrix": [2, 0], "x": 3, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 91, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 103, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 115, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 127, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 139, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 151, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 166, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+
+            {"matrix": [3, 0], "x": 5, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 21, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 57, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 81, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 94, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 130, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 161, "y": 38, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+
+            {"matrix": [4, 0], "x": 8, "y": 49, "flags": 1},
+            {"matrix": [4, 2], "x": 27, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 39, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 51, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 63, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 88, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 152, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 172, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 49, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 17, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 32, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 77, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 121, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 133, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 145, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 160, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 172, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 184, "y": 64, "flags": 4},
+            {"matrix": [5, 16], "x": 200, "y": 61, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 61, "flags": 4},
+            {"matrix": [5, 5], "x": 224, "y": 55, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0151"
+    },
     "layouts": {
         "LAYOUT_ansi_98": {
             "layout": [
@@ -110,7 +207,6 @@
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
                 {"matrix": [4, 16], "x": 16.5, "y": 4.25},
                 {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
                 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
@@ -127,4 +223,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/ansi_encoder/rules.mk b/keyboards/keychron/q5/ansi_encoder/rules.mk
index 4c6e5bebf00..c0d14172990 100644
--- a/keyboards/keychron/q5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q5/ansi_encoder/rules.mk
@@ -1,20 +1,4 @@
-# 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 USB 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        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/keychron/q5/config.h b/keyboards/keychron/q5/config.h
index 06403319977..4d297b223a7 100644
--- a/keyboards/keychron/q5/config.h
+++ b/keyboards/keychron/q5/config.h
@@ -26,9 +26,6 @@
 #define MATRIX_COL_PINS \
     { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
@@ -36,67 +33,5 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56 }
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5, 4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
+/* Encoder Configuration*/
+#define ENCODER_DEFAULT_POS 0x3
\ No newline at end of file
diff --git a/keyboards/keychron/q5/info.json b/keyboards/keychron/q5/info.json
new file mode 100644
index 00000000000..b35996d3412
--- /dev/null
+++ b/keyboards/keychron/q5/info.json
@@ -0,0 +1,57 @@
+{
+    "manufacturer": "Keychron",
+    "keyboard_name": "Keychron Q5",
+    "maintainer": "lalalademaxiya1",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "processor": "STM32L432",
+    "rgb_matrix": {
+        "animations": {
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    },
+    "url": "https://github.com/Keychron",
+    "usb": {
+        "vid": "0x3434"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/iso/config.h b/keyboards/keychron/q5/iso/config.h
index df775f11f1f..43c25dc78b0 100644
--- a/keyboards/keychron/q5/iso/config.h
+++ b/keyboards/keychron/q5/iso/config.h
@@ -16,13 +16,8 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 55
-#define DRIVER_2_LED_TOTAL 46
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 53
 
 /* Enable num-lock LED */
-// #define NUM_LOCK_LED_INDEX 33
+#define NUM_LOCK_LED_INDEX 33
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
index 2cc2ce96400..35ba9f9d043 100644
--- a/keyboards/keychron/q5/iso/info.json
+++ b/keyboards/keychron/q5/iso/info.json
@@ -1,18 +1,118 @@
 {
-    "keyboard_name": "Keychron Q5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0152",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 12, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 36, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 60, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 72, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 85, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 97, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 109, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 121, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 145, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 157, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 188, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 200, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 212, "y": 0, "flags": 1},
+            {"matrix": [3, 12], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 12, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 36, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 85, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 97, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 109, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 121, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 133, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 145, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 163, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 200, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 15, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 15, "flags": 4},
+
+            {"matrix": [2, 0], "x": 3, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 91, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 103, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 115, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 127, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 139, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 151, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+
+            {"matrix": [3, 0], "x": 5, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 21, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 57, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 81, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 94, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 130, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 154, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 170, "y": 34, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+
+            {"matrix": [4, 0], "x": 3, "y": 49, "flags": 1},
+            {"matrix": [4, 1], "x": 15, "y": 49, "flags": 4},
+            {"matrix": [4, 2], "x": 27, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 39, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 51, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 63, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 88, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 152, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 172, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 49, "flags": 4},
+
+            {"matrix": [5, 0], "x": 1, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 17, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 32, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 77, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 121, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 133, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 145, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 160, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 172, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 200, "y": 61, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 61, "flags": 4},
+            {"matrix": [5, 5], "x": 224, "y": 55, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0152"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_iso_101": {
             "layout": [
@@ -125,4 +225,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c
index 8a7cb863ec9..e08df9ab65e 100644
--- a/keyboards/keychron/q5/iso/iso.c
+++ b/keyboards/keychron/q5/iso/iso.c
@@ -20,151 +20,119 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
-};
-
-#define __ NO_LED
-
-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 },
-        { 19, 20, 21, 22, 23, 24,  25, 26, 27, 28, 29, 30, 31, 32, __, 33, 34, 35 },
-        { 37, 38, 39, 40, 41, 42,  43, 44, 45, 46, 47, 48, 49, 66, 70, 50, 51, 52 },
-        { 53, 54, 55, 56, 57, 58,  59, 60, 61, 62, 63, 64, 18, 65, 36, 67, 68, 69 },
-        { 71, 72, 73, 74, 75, 76,  77, 78, 79, 80, 81, 82, __, 83, 84, 85, 86, 87 },
-        { 88, 89, 90, __, __, 100, 91, __, __, __, 92, 93, 94, 95, 96, 97, 98, 99 },
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {12,0},  {24,0},  {36,0},  {48,0},  {60,0},  {72,0},  {85,0},  {97,0},   {109,0},  {121,0},  {133,0},  {145,0},  {157,0},  {169,0},  {188,0},  {200,0},  {212,0},  {224,0},
-        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
-        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26},                     {188,26}, {200,26}, {212,26},
-        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38}, {154,38}, {170,34},           {188,38}, {200,38}, {212,38}, {224,32},
-        {3,49}, {15,49}, {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49},           {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
-        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    4, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 4, 4, 1,
-    }
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso/rules.mk b/keyboards/keychron/q5/iso/rules.mk
index 465dfa93486..c0d14172990 100644
--- a/keyboards/keychron/q5/iso/rules.mk
+++ b/keyboards/keychron/q5/iso/rules.mk
@@ -1,19 +1,4 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/keychron/q5/iso_encoder/config.h b/keyboards/keychron/q5/iso_encoder/config.h
index 3a786cbb39b..9611480fad6 100644
--- a/keyboards/keychron/q5/iso_encoder/config.h
+++ b/keyboards/keychron/q5/iso_encoder/config.h
@@ -16,16 +16,8 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 53
-#define DRIVER_2_LED_TOTAL 46
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 51
 
 /* Enable num-lock LED */
-// #define NUM_LOCK_LED_INDEX 31
+#define NUM_LOCK_LED_INDEX 31
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
index a425cf3145a..10e6767eaf7 100644
--- a/keyboards/keychron/q5/iso_encoder/info.json
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -1,23 +1,117 @@
 {
-    "keyboard_name": "Keychron Q5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0153",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 36, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 60, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 78, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 90, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 103, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 115, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 145, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 157, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 184, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 196, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 208, "y": 0, "flags": 1},
+            {"matrix": [3, 12], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 12, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 36, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 85, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 97, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 109, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 121, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 133, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 145, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 163, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 200, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 15, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 91, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 103, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 115, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 127, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 139, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 151, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+            {"matrix": [3, 0], "x": 5, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 21, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 57, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 81, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 94, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 130, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 154, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 170, "y": 34, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+            {"matrix": [4, 0], "x": 3, "y": 49, "flags": 1},
+            {"matrix": [4, 1], "x": 15, "y": 49, "flags": 4},
+            {"matrix": [4, 2], "x": 27, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 39, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 51, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 63, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 88, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 152, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 172, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 49, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 17, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 32, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 77, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 121, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 133, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 145, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 160, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 172, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 200, "y": 61, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 61, "flags": 4},
+            {"matrix": [5, 5], "x": 224, "y": 55, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0153"
+    },
     "layouts": {
         "LAYOUT_iso_99": {
             "layout": [
@@ -38,7 +132,6 @@
                 {"matrix": [0, 16], "x": 16.25, "y": 0},
                 {"matrix": [0, 17], "x": 17.25, "y": 0},
                 {"matrix": [3, 12], "x": 18.5, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -57,7 +150,6 @@
                 {"matrix": [1, 16], "x": 16.5, "y": 1.25},
                 {"matrix": [1, 17], "x": 17.5, "y": 1.25},
                 {"matrix": [3, 14], "x": 18.5, "y": 1.25},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -74,7 +166,6 @@
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
                 {"matrix": [2, 16], "x": 16.5, "y": 2.25},
                 {"matrix": [2, 17], "x": 17.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -93,7 +184,6 @@
                 {"matrix": [3, 16], "x": 16.5, "y": 3.25},
                 {"matrix": [3, 17], "x": 17.5, "y": 3.25},
                 {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -111,7 +201,6 @@
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
                 {"matrix": [4, 16], "x": 16.5, "y": 4.25},
                 {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
                 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
@@ -128,4 +217,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
index 009e8043db7..e0505e6fb9a 100644
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
@@ -20,149 +20,117 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},  // `~
-    {0, C_2,    A_2,    B_2},  // 1!
-    {0, C_3,    A_3,    B_3},  // 2@
-    {0, C_4,    A_4,    B_4},  // 3#
-    {0, C_5,    A_5,    B_5},  // 4$
-    {0, C_6,    A_6,    B_6},  // 5%
-    {0, C_7,    A_7,    B_7},  // 6^
-    {0, C_8,    A_8,    B_8},  // 7&
-    {0, C_9,    A_9,    B_9},  // 8*
-    {0, C_10,   A_10,   B_10}, // 9(
-    {0, C_11,   A_11,   B_11}, // 0)
-    {0, C_12,   A_12,   B_12}, // -_
-    {0, C_13,   A_13,   B_13}, // =+
-    {0, C_14,   A_14,   B_14}, // BackSpace
-    {0, C_16,   A_16,   B_16}, // Numlock
-    {0, L_9,    J_9,    K_9},  // /
-    {0, L_10,   J_10,   K_10}, // *
-    {0, L_11,   J_11,   K_11}, // -
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // `~
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // 1!
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // 2@
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // 3#
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // 4$
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 5%
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 6^
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 7&
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 8*
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 9(
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 0)
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // -_
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // =+
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // BackSpace
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Numlock
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // /
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10}, // *
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11}, // -
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
-};
-
-#define __ NO_LED
-
-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 },
-        { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, __, 31, 32, 33 },
-        { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 64, 68, 48, 49, 50 },
-        { 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 16, 63, 34, 65, 66, 67 },
-        { 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, __, 81, 82, 83, 84, 85 },
-        { 86, 87, 88, __, __, 98, 89, __, __, __, 90, 91, 92, 93, 94, 95, 96, 97 },
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},           {24,0},  {36,0},  {48,0},  {60,0},  {78,0},  {90,0},  {103,0},  {115,0},  {133,0},  {145,0},  {157,0},  {169,0},            {184,0},  {196,0},  {208,0},  {224,0},
-        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
-        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26},                     {188,26}, {200,26}, {212,26},
-        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38}, {154,38}, {170,34},           {188,38}, {200,38}, {212,38}, {224,32},
-        {3,49}, {15,49}, {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49}, {152,49},           {172,52}, {188,49}, {200,49}, {212,49},
-        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
-    },
-    {
-        // RGB LED Index to Flag
-        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    4, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 4, 4, 1,
-    }
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso_encoder/rules.mk b/keyboards/keychron/q5/iso_encoder/rules.mk
index 4c6e5bebf00..c0d14172990 100644
--- a/keyboards/keychron/q5/iso_encoder/rules.mk
+++ b/keyboards/keychron/q5/iso_encoder/rules.mk
@@ -1,20 +1,4 @@
-# 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 USB 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        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c
index 7a1cabcd1a5..4026e9dea83 100644
--- a/keyboards/keychron/q5/q5.c
+++ b/keyboards/keychron/q5/q5.c
@@ -16,15 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q5/readme.md b/keyboards/keychron/q5/readme.md
index ac598392589..b78473cd2c6 100644
--- a/keyboards/keychron/q5/readme.md
+++ b/keyboards/keychron/q5/readme.md
@@ -1,19 +1,27 @@
 # Keychron Q5
 
+![Keychron Q5](https://i.imgur.com/hgBjdtTh.jpg)
+
 A customizable 96% keyboard.
 
 * Keyboard Maintainer: [Keychron](https://github.com/keychron)
 * Hardware Supported: Keychron Q5
-* Hardware Availability: [Keychron](https://www.keychron.com)
+* Hardware Availability: [Keychron Q5 QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q5-qmk-custom-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
-  make keychron/q5/ansi:default
+    make keychron/q5/ansi:default
+    make keychron/q5/ansi_encoder:default
+    make keychron/q5/iso:default
+    make keychron/q5/iso_encoder:default
 
 Flashing example for this keyboard:
 
-  make keychron/q5/ansi:default:flash
+    make keychron/q5/ansi:default:flash
+    make keychron/q5/ansi_encoder:default:flash
+    make keychron/q5/iso:default:flash
+    make keychron/q5/iso_encoder:default:flash
 
 **Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
 
-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).
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/keychron/q6/ansi/ansi.c b/keyboards/keychron/q6/ansi/ansi.c
index 80eaad02b37..62a22971e11 100644
--- a/keyboards/keychron/q6/ansi/ansi.c
+++ b/keyboards/keychron/q6/ansi/ansi.c
@@ -20,126 +20,126 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q6/ansi/config.h b/keyboards/keychron/q6/ansi/config.h
index 703da35636f..fd6fa66fe56 100644
--- a/keyboards/keychron/q6/ansi/config.h
+++ b/keyboards/keychron/q6/ansi/config.h
@@ -24,11 +24,6 @@
 #define NO_PIN_START 11
 #define NO_PIN_OFFSET 1
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 48
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED*/
 #define CAPS_LOCK_LED_INDEX 61
 
diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json
index 108cc46379e..d3dbd4a0922 100644
--- a/keyboards/keychron/q6/ansi/info.json
+++ b/keyboards/keychron/q6/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0160",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
index 9c885336206..b3d8a6bd4ca 100644
--- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
@@ -20,126 +20,126 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q6/ansi_encoder/config.h b/keyboards/keychron/q6/ansi_encoder/config.h
index 573fa614a32..12af24d6977 100644
--- a/keyboards/keychron/q6/ansi_encoder/config.h
+++ b/keyboards/keychron/q6/ansi_encoder/config.h
@@ -25,11 +25,6 @@
 #define NO_PIN_NUM 10
 #define CLR_REG_VAL 0x3FF
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 48
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json
index fc2da19f732..8e85336313f 100644
--- a/keyboards/keychron/q6/ansi_encoder/info.json
+++ b/keyboards/keychron/q6/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0161",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q6/config.h b/keyboards/keychron/q6/config.h
index 2edceb09d78..a9d2a95b97d 100644
--- a/keyboards/keychron/q6/config.h
+++ b/keyboards/keychron/q6/config.h
@@ -29,68 +29,3 @@
 
 #define SNLED27351_CURRENT_TUNE \
     { 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52 }
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5, 4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q6/info.json b/keyboards/keychron/q6/info.json
new file mode 100644
index 00000000000..94a45db562d
--- /dev/null
+++ b/keyboards/keychron/q6/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/q6/iso/config.h b/keyboards/keychron/q6/iso/config.h
index 46c9e1c33a2..cfb2ed5663e 100644
--- a/keyboards/keychron/q6/iso/config.h
+++ b/keyboards/keychron/q6/iso/config.h
@@ -24,11 +24,6 @@
 #define NO_PIN_START 11
 #define NO_PIN_OFFSET 1
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 49
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED*/
 #define CAPS_LOCK_LED_INDEX 60
 
diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json
index 269605ff8b9..b88af93988d 100644
--- a/keyboards/keychron/q6/iso/info.json
+++ b/keyboards/keychron/q6/iso/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0162",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q6/iso/iso.c b/keyboards/keychron/q6/iso/iso.c
index d2aa010c053..eb6cab855ac 100644
--- a/keyboards/keychron/q6/iso/iso.c
+++ b/keyboards/keychron/q6/iso/iso.c
@@ -20,127 +20,127 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q6/iso_encoder/config.h b/keyboards/keychron/q6/iso_encoder/config.h
index 512a33bafde..1320d544fdd 100644
--- a/keyboards/keychron/q6/iso_encoder/config.h
+++ b/keyboards/keychron/q6/iso_encoder/config.h
@@ -25,11 +25,6 @@
 #define NO_PIN_NUM 10
 #define CLR_REG_VAL 0x3FF
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 49
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json
index e5aa0bd8f52..54d4613b9c4 100644
--- a/keyboards/keychron/q6/iso_encoder/info.json
+++ b/keyboards/keychron/q6/iso_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0163",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.c b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
index 66e066b839b..439e1cee50b 100644
--- a/keyboards/keychron/q6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
@@ -20,127 +20,127 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q6/q6.c b/keyboards/keychron/q6/q6.c
index 8a9750e9de4..c1dc38a3fcf 100644
--- a/keyboards/keychron/q6/q6.c
+++ b/keyboards/keychron/q6/q6.c
@@ -16,15 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q60/ansi/ansi.c b/keyboards/keychron/q60/ansi/ansi.c
index ac727371461..8b702eb5a60 100644
--- a/keyboards/keychron/q60/ansi/ansi.c
+++ b/keyboards/keychron/q60/ansi/ansi.c
@@ -20,77 +20,77 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q60/ansi/config.h b/keyboards/keychron/q60/ansi/config.h
deleted file mode 100644
index 05810cce64a..00000000000
--- a/keyboards/keychron/q60/ansi/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 @ 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/>.
- */
-
-#pragma once
-
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 60
diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/info.json
index f5832b2d8f0..1d074c5e3ca 100644
--- a/keyboards/keychron/q60/ansi/info.json
+++ b/keyboards/keychron/q60/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x01C0",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q60/config.h b/keyboards/keychron/q60/config.h
index 6b6c3c5f48c..5e8e40cc5a1 100644
--- a/keyboards/keychron/q60/config.h
+++ b/keyboards/keychron/q60/config.h
@@ -29,69 +29,4 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60 }
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4,4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 6
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q60/info.json b/keyboards/keychron/q60/info.json
new file mode 100644
index 00000000000..553146eb39e
--- /dev/null
+++ b/keyboards/keychron/q60/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/q60/q60.c b/keyboards/keychron/q60/q60.c
index d97f72fb8ea..c6f2d1a38c7 100644
--- a/keyboards/keychron/q60/q60.c
+++ b/keyboards/keychron/q60/q60.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b11111111111111,
-    0b11111111111111,
-    0b11111111111111,
-    0b11111111111111,
-    0b11111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
index 8e9b37b8066..6c4c2abe21d 100644
--- a/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
@@ -18,89 +18,89 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_15, A_15, B_15}, // Esc
-    {0, C_14, A_14, B_14}, // 1!
-    {0, C_13, A_13, B_13}, // 2@
-    {0, C_12, A_12, B_12}, // 3#
-    {0, C_11, A_11, B_11}, // 4$
-    {0, C_10, A_10, B_10}, // 5%
-    {0, C_9,  A_9,  B_9},  // 6^
-    {0, C_8,  A_8,  B_8},  // 7&
-    {0, C_7,  A_7,  B_7},  // 8*
-    {0, C_6,  A_6,  B_6},  // 9(
-    {0, C_5,  A_5,  B_5},  // 0)
-    {0, C_4,  A_4,  B_4},  // -_
-    {0, C_3,  A_3,  B_3},  // =+
-    {0, C_2,  A_2,  B_2},  // BackSpace
-    {0, C_1,  A_1,  B_1},  // Delete
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Esc
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // 1!
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // 2@
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // 3#
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 4$
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 5%
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // 6^
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // 7&
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // 8*
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // 9(
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // 0)
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // -_
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // =+
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // BackSpace
+    {0, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Delete
 
-    {0, F_16, D_16, E_16}, // Macro2
-    {0, F_15, D_15, E_15}, // Tab
-    {0, F_14, D_14, E_14}, // Q
-    {0, F_13, D_13, E_13}, // W
-    {0, F_12, D_12, E_12}, // E
-    {0, F_11, D_11, E_11}, // R
-    {0, F_10, D_10, E_10}, // T
-    {0, F_9,  D_9,  E_9},  // Y
-    {0, F_8,  D_8,  E_8},  // U
-    {0, F_7,  D_7,  E_7},  // I
-    {0, F_6,  D_6,  E_6},  // O
-    {0, F_5,  D_5,  E_5},  // P
-    {0, F_4,  D_4,  E_4},  // [{
-    {0, F_3,  D_3,  E_3},  // ]}
-    {0, F_2,  D_2,  E_2},  // |
-    {0, F_1,  D_1,  E_1},  // PageUp
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // Macro2
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Tab
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Q
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // W
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // E
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // R
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // T
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Y
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // U
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // I
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // O
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // P
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // [{
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // ]}
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // |
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // PageUp
 
-    {1, C_16, A_16, B_16}, // Macro3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_9,  A_9,  B_9},  // H
-    {1, C_8,  A_8,  B_8},  // J
-    {1, C_7,  A_7,  B_7},  // K
-    {1, C_6,  A_6,  B_6},  // L
-    {1, C_5,  A_5,  B_5},  // ;:
-    {1, C_4,  A_4,  B_4},  // '"
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // PageDown
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Macro3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA9,  CB1_CA9,  CB2_CA9},  // H
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // J
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // K
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // L
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // ;:
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // '"
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // PageDown
 
-    {1, I_16, G_16, H_16}, // Macro4
-    {1, I_15, G_15, H_15}, // LeftShift
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // N
-    {1, I_7,  G_7,  H_7},  // M
-    {1, I_6,  G_6,  H_6},  // ,<
-    {1, I_5,  G_5,  H_5},  // .>
-    {1, I_4,  G_4,  H_4},  // /?
-    {1, I_3,  G_3,  H_3},  // RightShift
-    {1, I_2,  G_2,  H_2},  // Up
-    {1, I_1,  G_1,  H_1},  // Home
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Macro4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // LeftShift
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // N
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // M
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // ,<
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // .>
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // /?
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // RightShift
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Up
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Home
 
-    {1, F_16, D_16, E_16}, // Macro5
-    {1, F_15, D_15, E_15}, // LeftControl
-    {1, F_14, D_14, E_14}, // LeftOption
-    {1, F_13, D_13, E_13}, // LeftCommand
-    {1, F_9,  D_9,  E_9},  // Space
-    {1, F_6,  D_6,  E_6},  // RightCommand
-    {1, F_5,  D_5,  E_5},  // Fn1
-    {1, F_4,  D_4,  E_4},  // Fn2
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Macro5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftControl
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftOption
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // LeftCommand
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Space
+    {1, CB6_CA6,  CB4_CA6,  CB5_CA6},  // RightCommand
+    {1, CB6_CA5,  CB4_CA5,  CB5_CA5},  // Fn1
+    {1, CB6_CA4,  CB4_CA4,  CB5_CA4},  // Fn2
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q65/ansi_encoder/config.h b/keyboards/keychron/q65/ansi_encoder/config.h
index f57797677e9..be6e6c94d60 100644
--- a/keyboards/keychron/q65/ansi_encoder/config.h
+++ b/keyboards/keychron/q65/ansi_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 31
-#define DRIVER_2_LED_TOTAL 41
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json
index a42d7d289c9..2d622b869c4 100644
--- a/keyboards/keychron/q65/ansi_encoder/info.json
+++ b/keyboards/keychron/q65/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x01B1",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q65/config.h b/keyboards/keychron/q65/config.h
index 84c4e9fc173..c451568e769 100644
--- a/keyboards/keychron/q65/config.h
+++ b/keyboards/keychron/q65/config.h
@@ -40,69 +40,4 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xB8, 0xB8, 0x58, 0xB8, 0xB8, 0x58, 0xB8, 0xB8, 0x58, 0xB8, 0xB8, 0x58 }
 
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4,4} }
-
-/* Turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q65/info.json b/keyboards/keychron/q65/info.json
new file mode 100644
index 00000000000..553146eb39e
--- /dev/null
+++ b/keyboards/keychron/q65/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/q65/q65.c b/keyboards/keychron/q65/q65.c
index 18fa8697c79..e293733bfe6 100644
--- a/keyboards/keychron/q65/q65.c
+++ b/keyboards/keychron/q65/q65.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q7/ansi/ansi.c b/keyboards/keychron/q7/ansi/ansi.c
index 190c110a77a..ef21433f575 100644
--- a/keyboards/keychron/q7/ansi/ansi.c
+++ b/keyboards/keychron/q7/ansi/ansi.c
@@ -20,118 +20,89 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_15,   G_15,   H_15},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-};
-
-#define __ NO_LED
-
-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, 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, 67, 68, 69, 70, 71 },
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {14,0},  {28,0},  {42,0},  {56,0},  {70,0},  {84,0},  {98,0},   {112,0},  {126,0},  {140,0},  {154,0},  {168,0},  {189,0},            {210,0},  {224,0},
-        {4,16}, {21,16}, {35,16}, {49,16}, {63,16}, {77,16}, {91,16}, {105,16}, {119,16}, {133,16}, {147,16}, {161,16}, {175,16}, {192,16},           {210,16}, {224,16},
-        {5,32}, {25,32}, {38,32}, {52,32}, {66,32}, {80,32}, {94,32}, {108,32}, {122,32}, {136,32}, {150,32}, {164,32},           {187,32},           {210,32}, {224,32},
-        {9,48},          {32,48}, {45,48}, {59,48}, {73,48}, {87,48}, {101,48}, {115,48}, {129,48}, {143,48}, {157,48},           {184,48},           {210,48}, {224,48},
-        {2,64}, {19,64}, {37,64},                            {89,64},                               {140,64}, {154,64}, {168,64}, {182,64}, {196,64}, {210,64}, {224,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1, 1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1,
-    }
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q7/ansi/config.h b/keyboards/keychron/q7/ansi/config.h
index 32727a13ce9..ef9b58298c2 100644
--- a/keyboards/keychron/q7/ansi/config.h
+++ b/keyboards/keychron/q7/ansi/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 37
-#define DRIVER_2_LED_TOTAL 35
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 32
diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/info.json
index 717fe357b72..62cff888e14 100644
--- a/keyboards/keychron/q7/ansi/info.json
+++ b/keyboards/keychron/q7/ansi/info.json
@@ -1,23 +1,88 @@
 {
-    "keyboard_name": "Keychron Q7",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0170",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 14, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 28, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 42, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 56, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 70, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 98, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 126, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 140, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 189, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 210, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+            {"matrix": [1, 1], "x": 21, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 35, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 49, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 63, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 77, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 91, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 105, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 119, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 133, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 161, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 175, "y": 16, "flags": 4},
+            {"matrix": [1, 13], "x": 192, "y": 16, "flags": 4},
+            {"matrix": [1, 14], "x": 210, "y": 16, "flags": 1},
+            {"matrix": [1, 15], "x": 224, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 5, "y": 32, "flags": 8},
+            {"matrix": [2, 1], "x": 25, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 38, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 94, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 108, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 136, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 164, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 187, "y": 32, "flags": 1},
+            {"matrix": [2, 14], "x": 210, "y": 32, "flags": 1},
+            {"matrix": [2, 15], "x": 224, "y": 32, "flags": 1},
+
+            {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+            {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 59, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 73, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 87, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 101, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 129, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 143, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 157, "y": 48, "flags": 4},
+            {"matrix": [3, 13], "x": 184, "y": 48, "flags": 1},
+            {"matrix": [3, 14], "x": 210, "y": 48, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 48, "flags": 1},
+
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 19, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 89, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 140, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 154, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 168, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 182, "y": 64, "flags": 1},
+            {"matrix": [4, 13], "x": 196, "y": 64, "flags": 1},
+            {"matrix": [4, 14], "x": 210, "y": 64, "flags": 1},
+            {"matrix": [4, 15], "x": 224, "y": 64, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0170"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_72": {
             "layout": [
@@ -85,7 +150,6 @@
                 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
                 {"matrix": [3, 14], "x": 15, "y": 3},
                 {"matrix": [3, 15], "x": 16, "y": 3},
-
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
                 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@@ -100,4 +164,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q7/ansi/rules.mk b/keyboards/keychron/q7/ansi/rules.mk
index cf31e094cbf..6e7633bfe01 100644
--- a/keyboards/keychron/q7/ansi/rules.mk
+++ b/keyboards/keychron/q7/ansi/rules.mk
@@ -1,14 +1 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keychron/q7/config.h b/keyboards/keychron/q7/config.h
index 4794c80011a..4a2a6af9e3a 100644
--- a/keyboards/keychron/q7/config.h
+++ b/keyboards/keychron/q7/config.h
@@ -30,70 +30,3 @@
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 #define SNLED27351_CURRENT_TUNE \
     { 0xF8, 0xF8, 0x80, 0xF8, 0xF8, 0x80, 0xF8, 0xF8, 0x80, 0xF8, 0xF8, 0x80 }
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4,4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q7/info.json b/keyboards/keychron/q7/info.json
new file mode 100644
index 00000000000..6b8a94ce991
--- /dev/null
+++ b/keyboards/keychron/q7/info.json
@@ -0,0 +1,64 @@
+{
+    "manufacturer": "Keychron",
+    "keyboard_name": "Keychron Q7",
+    "maintainer": "lalalademaxiya1",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
+    "dynamic_keymap": {
+        "layer_count": 5
+    },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "processor": "STM32L432",
+    "rgb_matrix": {
+        "animations": {
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    },
+    "url": "https://github.com/Keychron",
+    "usb": {
+        "vid": "0x3434"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q7/iso/config.h b/keyboards/keychron/q7/iso/config.h
index dc9813f6e8a..edeb79e2620 100644
--- a/keyboards/keychron/q7/iso/config.h
+++ b/keyboards/keychron/q7/iso/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 37
-#define DRIVER_2_LED_TOTAL 36
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 31
diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/info.json
index d57c5b17b97..d98ec8fa5e9 100644
--- a/keyboards/keychron/q7/iso/info.json
+++ b/keyboards/keychron/q7/iso/info.json
@@ -1,23 +1,89 @@
 {
-    "keyboard_name": "Keychron Q7",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0172",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 14, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 28, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 42, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 56, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 70, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 98, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 126, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 140, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 189, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 210, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+            {"matrix": [1, 1], "x": 21, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 35, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 49, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 63, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 77, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 91, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 105, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 119, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 133, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 161, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 175, "y": 16, "flags": 4},
+            {"matrix": [1, 14], "x": 210, "y": 16, "flags": 1},
+            {"matrix": [1, 15], "x": 224, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 5, "y": 32, "flags": 8},
+            {"matrix": [2, 1], "x": 25, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 38, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 94, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 108, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 136, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 164, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 178, "y": 32, "flags": 4},
+            {"matrix": [1, 13], "x": 197, "y": 27, "flags": 1},
+            {"matrix": [2, 14], "x": 210, "y": 32, "flags": 1},
+            {"matrix": [2, 15], "x": 224, "y": 32, "flags": 1},
+
+            {"matrix": [3, 0], "x": 2, "y": 48, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 59, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 73, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 87, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 101, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 129, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 143, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 157, "y": 48, "flags": 4},
+            {"matrix": [3, 13], "x": 184, "y": 48, "flags": 1},
+            {"matrix": [3, 14], "x": 210, "y": 48, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 48, "flags": 1},
+
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 19, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 89, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 140, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 154, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 168, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 182, "y": 64, "flags": 1},
+            {"matrix": [4, 13], "x": 196, "y": 64, "flags": 1},
+            {"matrix": [4, 14], "x": 210, "y": 64, "flags": 1},
+            {"matrix": [4, 15], "x": 224, "y": 64, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0172"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_iso_73": {
             "layout": [
@@ -101,4 +167,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q7/iso/iso.c b/keyboards/keychron/q7/iso/iso.c
index 13354b9f0b9..dfda79c8435 100644
--- a/keyboards/keychron/q7/iso/iso.c
+++ b/keyboards/keychron/q7/iso/iso.c
@@ -18,119 +18,90 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_15,   G_15,   H_15},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-};
-
-#define __ NO_LED
-
-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, 44, 29, 30 },
-        { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, __, 43, 45, 46 },
-        { 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, __, 59, 60, 61 },
-        { 62, 63, 64, __, __, __, 65, __, __, 66, 67, 68, 69, 70, 71, 72 },
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {14,0},  {28,0},  {42,0},  {56,0},  {70,0},  {84,0},  {98,0},   {112,0},  {126,0},  {140,0},  {154,0},  {168,0},  {189,0},            {210,0},  {224,0},
-        {4,16}, {21,16}, {35,16}, {49,16}, {63,16}, {77,16}, {91,16}, {105,16}, {119,16}, {133,16}, {147,16}, {161,16}, {175,16},                     {210,16}, {224,16},
-        {5,32}, {25,32}, {38,32}, {52,32}, {66,32}, {80,32}, {94,32}, {108,32}, {122,32}, {136,32}, {150,32}, {164,32}, {178,32}, {197,27},           {210,32}, {224,32},
-        {2,48}, {18,48}, {32,48}, {45,48}, {59,48}, {73,48}, {87,48}, {101,48}, {115,48}, {129,48}, {143,48}, {157,48},           {184,48},           {210,48}, {224,48},
-        {2,64}, {19,64}, {37,64},                            {89,64},                               {140,64}, {154,64}, {168,64}, {182,64}, {196,64}, {210,64}, {224,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1, 1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1,
-    }
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q7/iso/rules.mk b/keyboards/keychron/q7/iso/rules.mk
index cf31e094cbf..6e7633bfe01 100644
--- a/keyboards/keychron/q7/iso/rules.mk
+++ b/keyboards/keychron/q7/iso/rules.mk
@@ -1,14 +1 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keychron/q7/q7.c b/keyboards/keychron/q7/q7.c
index abd4ac11f03..d020f6ab430 100644
--- a/keyboards/keychron/q7/q7.c
+++ b/keyboards/keychron/q7/q7.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q7/readme.md b/keyboards/keychron/q7/readme.md
index ea484642226..d6fedb14936 100644
--- a/keyboards/keychron/q7/readme.md
+++ b/keyboards/keychron/q7/readme.md
@@ -1,19 +1,23 @@
 # Keychron Q7
 
+![Keychron Q7](https://i.imgur.com/dMnFpx0h.jpg)
+
 A customizable 70% keyboard.
 
 * Keyboard Maintainer: [Keychron](https://github.com/keychron)
 * Hardware Supported: Keychron Q7
-* Hardware Availability: [Keychron](https://www.keychron.com)
+* Hardware Availability: [Keychron Q7 QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q7-qmk-custom-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
     make keychron/q7/ansi:default
+    make keychron/q7/iso:default
 
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+Flashing example for this keyboard:
 
     make keychron/q7/ansi:default:flash
+    make keychron/q7/iso:default:flash
 
 **Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
 
-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).
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/keychron/q8/ansi/ansi.c b/keyboards/keychron/q8/ansi/ansi.c
index 3bb10b383d4..e60752d7ddb 100644
--- a/keyboards/keychron/q8/ansi/ansi.c
+++ b/keyboards/keychron/q8/ansi/ansi.c
@@ -20,116 +20,87 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    // {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    // {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
-};
-
-#define __ NO_LED
-
-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, 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, 67, 68 },
-    },
-    {
-        // LED Index to Physical Position
-        {7,1},  {20,1},  {33,0},  {48,3},  {61,6},  {74,8 }, {87,11},  {106,11}, {119,8},  {132,6},  {145,3},  {160,0},  {173,1},  {193,1},            {220,0},
-        {7,14}, {24,14}, {39,14}, {52,17}, {65,20}, {78,22}, {103,25}, {116,22}, {129,20}, {142,17}, {155,14}, {170,14}, {183,14}, {200,14},           {222,16},
-        {6,27}, {24,27}, {39,28}, {52,30}, {65,33}, {78,36},           {109,37}, {122,34}, {135,32}, {148,29}, {162,27}, {176,27}, {197,27},           {224,29},
-        {7,40},          {28,40}, {43,42}, {56,44}, {69,47}, {82,50},  {102,52}, {115,49}, {128,46}, {141,44}, {154,41}, {169,40}, {187,40}, {209,43},
-        {0,53}, {17,53}, {42,55},          {65,60},          {86,64},  {107,64},           {131,59},           {156,54},           {196,56}, {209,56}, {222,56},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 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,
-        8, 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, 1, 1,
-        1, 1, 1,    4,    1,    1, 4,    1,    1, 1, 1,
-    }
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/ansi/config.h b/keyboards/keychron/q8/ansi/config.h
index cd2d037bb36..9cd663a2162 100644
--- a/keyboards/keychron/q8/ansi/config.h
+++ b/keyboards/keychron/q8/ansi/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 34
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 30
diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index f7330042703..2580b4163e7 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -1,23 +1,85 @@
 {
-    "keyboard_name": "Keychron Q8",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0180",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 1, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 3, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 6, "flags": 4},
+            {"matrix": [0, 5], "x": 74, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 87, "y": 11, "flags": 4},
+            {"matrix": [0, 7], "x": 106, "y": 11, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 8, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 4},
+            {"matrix": [0, 10], "x": 145, "y": 3, "flags": 4},
+            {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 173, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 193, "y": 1, "flags": 1},
+            {"matrix": [0, 14], "x": 220, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 65, "y": 20, "flags": 4},
+            {"matrix": [1, 5], "x": 78, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 103, "y": 25, "flags": 4},
+            {"matrix": [1, 7], "x": 116, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 129, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 155, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 170, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 183, "y": 14, "flags": 4},
+            {"matrix": [1, 13], "x": 200, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 222, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 27, "flags": 8},
+            {"matrix": [2, 1], "x": 24, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 28, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 33, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 36, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 37, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 176, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 197, "y": 27, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 29, "flags": 1},
+
+            {"matrix": [3, 0], "x": 7, "y": 40, "flags": 1},
+            {"matrix": [3, 2], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 43, "y": 42, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 44, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 82, "y": 50, "flags": 4},
+            {"matrix": [3, 7], "x": 102, "y": 52, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 128, "y": 46, "flags": 4},
+            {"matrix": [3, 10], "x": 141, "y": 44, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 169, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 43, "flags": 1},
+
+            {"matrix": [4, 0], "x": 0, "y": 53, "flags": 1},
+            {"matrix": [4, 1], "x": 17, "y": 53, "flags": 1},
+            {"matrix": [4, 2], "x": 42, "y": 55, "flags": 1},
+            {"matrix": [4, 3], "x": 65, "y": 60, "flags": 4},
+            {"matrix": [4, 6], "x": 86, "y": 64, "flags": 1},
+            {"matrix": [4, 7], "x": 107, "y": 64, "flags": 1},
+            {"matrix": [4, 8], "x": 131, "y": 59, "flags": 4},
+            {"matrix": [4, 9], "x": 156, "y": 54, "flags": 1},
+            {"matrix": [4, 12], "x": 196, "y": 56, "flags": 1},
+            {"matrix": [4, 13], "x": 209, "y": 56, "flags": 1},
+            {"matrix": [4, 14], "x": 222, "y": 56, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0180"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
@@ -97,4 +159,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk
index cf31e094cbf..7ff128fa692 100644
--- a/keyboards/keychron/q8/ansi/rules.mk
+++ b/keyboards/keychron/q8/ansi/rules.mk
@@ -1,14 +1 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
index 3bb10b383d4..e60752d7ddb 100644
--- a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
@@ -20,116 +20,87 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    // {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    // {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
-};
-
-#define __ NO_LED
-
-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, 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, 67, 68 },
-    },
-    {
-        // LED Index to Physical Position
-        {7,1},  {20,1},  {33,0},  {48,3},  {61,6},  {74,8 }, {87,11},  {106,11}, {119,8},  {132,6},  {145,3},  {160,0},  {173,1},  {193,1},            {220,0},
-        {7,14}, {24,14}, {39,14}, {52,17}, {65,20}, {78,22}, {103,25}, {116,22}, {129,20}, {142,17}, {155,14}, {170,14}, {183,14}, {200,14},           {222,16},
-        {6,27}, {24,27}, {39,28}, {52,30}, {65,33}, {78,36},           {109,37}, {122,34}, {135,32}, {148,29}, {162,27}, {176,27}, {197,27},           {224,29},
-        {7,40},          {28,40}, {43,42}, {56,44}, {69,47}, {82,50},  {102,52}, {115,49}, {128,46}, {141,44}, {154,41}, {169,40}, {187,40}, {209,43},
-        {0,53}, {17,53}, {42,55},          {65,60},          {86,64},  {107,64},           {131,59},           {156,54},           {196,56}, {209,56}, {222,56},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 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,
-        8, 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, 1, 1,
-        1, 1, 1,    4,    1,    1, 4,    1,    1, 1, 1,
-    }
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/ansi_encoder/config.h b/keyboards/keychron/q8/ansi_encoder/config.h
index 63d16c21af2..9cd663a2162 100644
--- a/keyboards/keychron/q8/ansi_encoder/config.h
+++ b/keyboards/keychron/q8/ansi_encoder/config.h
@@ -16,13 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 34
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 30
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index ccf9453d53f..b3f82637db8 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -1,28 +1,91 @@
 {
-    "keyboard_name": "Keychron Q8",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0181",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
-    },
-    "diode_direction": "ROW2COL",
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "B5", "pin_b": "A10"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 1, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 3, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 6, "flags": 4},
+            {"matrix": [0, 5], "x": 74, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 87, "y": 11, "flags": 4},
+            {"matrix": [0, 7], "x": 106, "y": 11, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 8, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 4},
+            {"matrix": [0, 10], "x": 145, "y": 3, "flags": 4},
+            {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 173, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 193, "y": 1, "flags": 1},
+            {"matrix": [0, 14], "x": 220, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 65, "y": 20, "flags": 4},
+            {"matrix": [1, 5], "x": 78, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 103, "y": 25, "flags": 4},
+            {"matrix": [1, 7], "x": 116, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 129, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 155, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 170, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 183, "y": 14, "flags": 4},
+            {"matrix": [1, 13], "x": 200, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 222, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 27, "flags": 8},
+            {"matrix": [2, 1], "x": 24, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 28, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 33, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 36, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 37, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 176, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 197, "y": 27, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 29, "flags": 1},
+
+            {"matrix": [3, 0], "x": 7, "y": 40, "flags": 1},
+            {"matrix": [3, 2], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 43, "y": 42, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 44, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 82, "y": 50, "flags": 4},
+            {"matrix": [3, 7], "x": 102, "y": 52, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 128, "y": 46, "flags": 4},
+            {"matrix": [3, 10], "x": 141, "y": 44, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 169, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 43, "flags": 1},
+
+            {"matrix": [4, 0], "x": 0, "y": 53, "flags": 1},
+            {"matrix": [4, 1], "x": 17, "y": 53, "flags": 1},
+            {"matrix": [4, 2], "x": 42, "y": 55, "flags": 1},
+            {"matrix": [4, 3], "x": 65, "y": 60, "flags": 4},
+            {"matrix": [4, 6], "x": 86, "y": 64, "flags": 1},
+            {"matrix": [4, 7], "x": 107, "y": 64, "flags": 1},
+            {"matrix": [4, 8], "x": 131, "y": 59, "flags": 4},
+            {"matrix": [4, 9], "x": 156, "y": 54, "flags": 1},
+            {"matrix": [4, 12], "x": 196, "y": 56, "flags": 1},
+            {"matrix": [4, 13], "x": 209, "y": 56, "flags": 1},
+            {"matrix": [4, 14], "x": 222, "y": 56, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0181"
+    },
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
@@ -87,7 +150,6 @@
                 {"matrix": [3, 12], "x": 14.25, "y": 3.25},
                 {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 14], "x": 17.25, "y": 3.5},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
@@ -102,4 +164,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk
index 5d77f099712..6e7633bfe01 100644
--- a/keyboards/keychron/q8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q8/ansi_encoder/rules.mk
@@ -1,15 +1 @@
-# 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 USB 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        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keychron/q8/config.h b/keyboards/keychron/q8/config.h
index 7ecbf40b236..934e1b54fc1 100644
--- a/keyboards/keychron/q8/config.h
+++ b/keyboards/keychron/q8/config.h
@@ -34,68 +34,5 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60 }
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4, 4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* Turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
+/* Encoder Configuration */
+#define ENCODER_DEFAULT_POS 0x3
diff --git a/keyboards/keychron/q8/info.json b/keyboards/keychron/q8/info.json
new file mode 100644
index 00000000000..da4c9c6f79b
--- /dev/null
+++ b/keyboards/keychron/q8/info.json
@@ -0,0 +1,64 @@
+{
+    "manufacturer": "Keychron",
+    "keyboard_name": "Keychron Q8",
+    "maintainer": "lalalademaxiya1",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
+    "dynamic_keymap": {
+        "layer_count": 5
+    },
+    "eeprom": {
+        "wear_levling": {
+            "backing_size": 4096
+        }  
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "processor": "STM32L432",
+    "rgb_matrix": {
+        "animations": {
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    },
+    "url": "https://github.com/Keychron",
+    "usb": {
+        "vid": "0x3434"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q8/iso/config.h b/keyboards/keychron/q8/iso/config.h
index 99ba64d7134..7a10ce6d653 100644
--- a/keyboards/keychron/q8/iso/config.h
+++ b/keyboards/keychron/q8/iso/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 35
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 29
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index 28d586984ee..fe87955c397 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -1,23 +1,86 @@
 {
-    "keyboard_name": "Keychron Q8",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0182",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 1, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 3, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 6, "flags": 4},
+            {"matrix": [0, 5], "x": 74, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 87, "y": 11, "flags": 4},
+            {"matrix": [0, 7], "x": 106, "y": 11, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 8, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 4},
+            {"matrix": [0, 10], "x": 145, "y": 3, "flags": 4},
+            {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 173, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 193, "y": 1, "flags": 1},
+            {"matrix": [0, 14], "x": 220, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 65, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 78, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 103, "y": 25, "flags": 4},
+            {"matrix": [1, 7], "x": 116, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 129, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 155, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 186, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 222, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 27, "flags": 8},
+            {"matrix": [2, 1], "x": 24, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 33, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 35, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 37, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 31, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 176, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 189, "y": 27, "flags": 4},
+            {"matrix": [1, 13], "x": 207, "y": 22, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 29, "flags": 1},
+
+            {"matrix": [3, 0], "x": 0, "y": 40, "flags": 1},
+            {"matrix": [3, 1], "x": 15, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 43, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 44, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 82, "y": 49, "flags": 4},
+            {"matrix": [3, 7], "x": 102, "y": 51, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 128, "y": 46, "flags": 4},
+            {"matrix": [3, 10], "x": 141, "y": 43, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 169, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 43, "flags": 1},
+
+            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 1},
+            {"matrix": [4, 1], "x": 17, "y": 52, "flags": 1},
+            {"matrix": [4, 2], "x": 42, "y": 54, "flags": 1},
+            {"matrix": [4, 3], "x": 65, "y": 59, "flags": 1},
+            {"matrix": [4, 6], "x": 86, "y": 63, "flags": 1},
+            {"matrix": [4, 7], "x": 104, "y": 64, "flags": 1},
+            {"matrix": [4, 8], "x": 129, "y": 59, "flags": 1},
+            {"matrix": [4, 9], "x": 153, "y": 54, "flags": 1},
+            {"matrix": [4, 12], "x": 196, "y": 56, "flags": 1},
+            {"matrix": [4, 13], "x": 209, "y": 56, "flags": 1},
+            {"matrix": [4, 14], "x": 222, "y": 59, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0182"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
@@ -83,7 +146,6 @@
                 {"matrix": [3, 12], "x": 14.25, "y": 3.25},
                 {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 14], "x": 17.25, "y": 3.5},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
@@ -98,4 +160,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q8/iso/iso.c b/keyboards/keychron/q8/iso/iso.c
index dbcefd76c04..720c1eb34be 100644
--- a/keyboards/keychron/q8/iso/iso.c
+++ b/keyboards/keychron/q8/iso/iso.c
@@ -20,116 +20,87 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
-};
-
-#define __ NO_LED
-
-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, 42, 28 },
-        { 29, 30, 31, 32, 33, 34, __, 35, 36, 37, 38, 39, 40, 41, 43 },
-        { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 },
-        { 59, 60, 61, 62, __, __, 63, 64, 65, 66, __, __, 67, 68, 69 },
-    },
-    {
-        // LED Index to Physical Position
-        {7,1},  {20,1},  {33,0},  {48,3},  {61,6},  {74,8},  {87,11},  {106,11}, {119,8},  {132,6},  {145,3},  {160,0},  {173,1},  {193,1},            {220,0},
-        {7,14}, {24,14}, {39,14}, {52,17}, {65,19}, {78,22}, {103,25}, {116,22}, {129,20}, {142,17}, {155,14}, {172,14}, {186,14},                     {222,16},
-        {6,27}, {24,27}, {39,27}, {52,30}, {65,33}, {78,35}, {109,37}, {122,34}, {135,31}, {148,29}, {162,27}, {176,27}, {189,27}, {207,22},           {224,29},
-        {0,40}, {15,40}, {28,40}, {43,41}, {56,44}, {69,47}, {82,49},  {102,51}, {115,49}, {128,46}, {141,43}, {154,41}, {169,40}, {187,40}, {209,43},
-        {0,52}, {17,52}, {42,54},          {65,59},          {86,63},  {104,64},           {129,59},           {153,54},           {196,56}, {209,56}, {222,59},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 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,       1,
-        8, 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, 1, 1,
-        1, 1, 1,    1,    1,    1, 1,    1,    1, 1, 1,
-    }
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk
index cf31e094cbf..7ff128fa692 100644
--- a/keyboards/keychron/q8/iso/rules.mk
+++ b/keyboards/keychron/q8/iso/rules.mk
@@ -1,14 +1 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q8/iso_encoder/config.h b/keyboards/keychron/q8/iso_encoder/config.h
index cdda41df5d0..7a10ce6d653 100644
--- a/keyboards/keychron/q8/iso_encoder/config.h
+++ b/keyboards/keychron/q8/iso_encoder/config.h
@@ -16,13 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 35
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 29
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index 0d96f3f1933..46a93ec63b6 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -1,28 +1,92 @@
 {
-    "keyboard_name": "Keychron Q8",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0183",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
-    },
-    "diode_direction": "ROW2COL",
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "B5", "pin_b": "A10"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 1, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 3, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 6, "flags": 4},
+            {"matrix": [0, 5], "x": 74, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 87, "y": 11, "flags": 4},
+            {"matrix": [0, 7], "x": 106, "y": 11, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 8, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 4},
+            {"matrix": [0, 10], "x": 145, "y": 3, "flags": 4},
+            {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 173, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 193, "y": 1, "flags": 1},
+            {"matrix": [0, 14], "x": 220, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 65, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 78, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 103, "y": 25, "flags": 4},
+            {"matrix": [1, 7], "x": 116, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 129, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 155, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 186, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 222, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 27, "flags": 8},
+            {"matrix": [2, 1], "x": 24, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 33, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 35, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 37, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 31, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 176, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 189, "y": 27, "flags": 4},
+            {"matrix": [1, 13], "x": 207, "y": 22, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 29, "flags": 1},
+
+            {"matrix": [3, 0], "x": 0, "y": 40, "flags": 1},
+            {"matrix": [3, 1], "x": 15, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 43, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 44, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 82, "y": 49, "flags": 4},
+            {"matrix": [3, 7], "x": 102, "y": 51, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 128, "y": 46, "flags": 4},
+            {"matrix": [3, 10], "x": 141, "y": 43, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 169, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 43, "flags": 1},
+
+            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 1},
+            {"matrix": [4, 1], "x": 17, "y": 52, "flags": 1},
+            {"matrix": [4, 2], "x": 42, "y": 54, "flags": 1},
+            {"matrix": [4, 3], "x": 65, "y": 59, "flags": 1},
+            {"matrix": [4, 6], "x": 86, "y": 63, "flags": 1},
+            {"matrix": [4, 7], "x": 104, "y": 64, "flags": 1},
+            {"matrix": [4, 8], "x": 129, "y": 59, "flags": 1},
+            {"matrix": [4, 9], "x": 153, "y": 54, "flags": 1},
+            {"matrix": [4, 12], "x": 196, "y": 56, "flags": 1},
+            {"matrix": [4, 13], "x": 209, "y": 56, "flags": 1},
+            {"matrix": [4, 14], "x": 222, "y": 59, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0183"
+    },
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
@@ -103,4 +167,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.c b/keyboards/keychron/q8/iso_encoder/iso_encoder.c
index dbcefd76c04..720c1eb34be 100644
--- a/keyboards/keychron/q8/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q8/iso_encoder/iso_encoder.c
@@ -20,116 +20,87 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
-};
-
-#define __ NO_LED
-
-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, 42, 28 },
-        { 29, 30, 31, 32, 33, 34, __, 35, 36, 37, 38, 39, 40, 41, 43 },
-        { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 },
-        { 59, 60, 61, 62, __, __, 63, 64, 65, 66, __, __, 67, 68, 69 },
-    },
-    {
-        // LED Index to Physical Position
-        {7,1},  {20,1},  {33,0},  {48,3},  {61,6},  {74,8},  {87,11},  {106,11}, {119,8},  {132,6},  {145,3},  {160,0},  {173,1},  {193,1},            {220,0},
-        {7,14}, {24,14}, {39,14}, {52,17}, {65,19}, {78,22}, {103,25}, {116,22}, {129,20}, {142,17}, {155,14}, {172,14}, {186,14},                     {222,16},
-        {6,27}, {24,27}, {39,27}, {52,30}, {65,33}, {78,35}, {109,37}, {122,34}, {135,31}, {148,29}, {162,27}, {176,27}, {189,27}, {207,22},           {224,29},
-        {0,40}, {15,40}, {28,40}, {43,41}, {56,44}, {69,47}, {82,49},  {102,51}, {115,49}, {128,46}, {141,43}, {154,41}, {169,40}, {187,40}, {209,43},
-        {0,52}, {17,52}, {42,54},          {65,59},          {86,63},  {104,64},           {129,59},           {153,54},           {196,56}, {209,56}, {222,59},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 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,       1,
-        8, 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, 1, 1,
-        1, 1, 1,    1,    1,    1, 1,    1,    1, 1, 1,
-    }
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk
index 5d77f099712..6e7633bfe01 100644
--- a/keyboards/keychron/q8/iso_encoder/rules.mk
+++ b/keyboards/keychron/q8/iso_encoder/rules.mk
@@ -1,15 +1 @@
-# 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 USB 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        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keychron/q8/q8.c b/keyboards/keychron/q8/q8.c
index a653bdc8b93..c28f992f8e7 100644
--- a/keyboards/keychron/q8/q8.c
+++ b/keyboards/keychron/q8/q8.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q8/readme.md b/keyboards/keychron/q8/readme.md
index da200e2c187..eaa286899a5 100644
--- a/keyboards/keychron/q8/readme.md
+++ b/keyboards/keychron/q8/readme.md
@@ -1,19 +1,27 @@
 # Keychron Q8
 
+![Keychron Q8](https://i.imgur.com/FQnOwRrh.jpg)
+
 A customizable 65% Alice layout keyboard.
 
 * Keyboard Maintainer: [Keychron](https://github.com/keychron)
 * Hardware Supported: Keychron Q8
-* Hardware Availability: [Keychron](https://www.keychron.com)
+* Hardware Availability: [Keychron Q8 (Alice Layout) QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q8-alice-layout-qmk-custom-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
     make keychron/q8/ansi:default
+    make keychron/q8/ansi_encoder:default
+    make keychron/q8/iso:default
+    make keychron/q8/iso_encoder:default
 
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+Flashing example for this keyboard:
 
     make keychron/q8/ansi:default:flash
+    make keychron/q8/ansi_encoder:default:flash
+    make keychron/q8/iso:default:flash
+    make keychron/q8/iso_encoder:default:flash
 
 **Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
 
-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).
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/keychron/q9/ansi/ansi.c b/keyboards/keychron/q9/ansi/ansi.c
index 9178c8dcc75..e00c7f7e9d8 100644
--- a/keyboards/keychron/q9/ansi/ansi.c
+++ b/keyboards/keychron/q9/ansi/ansi.c
@@ -20,94 +20,68 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16,   J_16,   K_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_14,   J_14,   K_14},
-    {0, L_13,   J_13,   K_13},
-    {0, L_12,   J_12,   K_12},
-    {0, L_11,   J_11,   K_11},
-    {0, L_10,   J_10,   K_10},
-    {0, L_9,    J_9,    K_9},
-    {0, L_8,    J_8,    K_8},
-    {0, L_7,    J_7,    K_7},
-    {0, L_6,    J_6,    K_6},
-    {0, L_5,    J_5,    K_5},
-    {0, L_4,    J_4,    K_4},
-    {0, L_3,    J_3,    K_3},
-    {0, L_2,    J_2,    K_2},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {0, C_16,   A_16,   B_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_14,   A_14,   B_14},
-    {0, C_13,   A_13,   B_13},
-    {0, C_12,   A_12,   B_12},
-    {0, C_11,   A_11,   B_11},
-    {0, C_10,   A_10,   B_10},
-    {0, C_9,    A_9,    B_9},
-    {0, C_8,    A_8,    B_8},
-    {0, C_7,    A_7,    B_7},
-    {0, C_6,    A_6,    B_6},
-    {0, C_5,    A_5,    B_5},
-    {0, C_3,    A_3,    B_3},
-    {0, C_2,    A_2,    B_2},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
 
-    {0, I_16,   G_16,   H_16},
-    {0, I_14,   G_14,   H_14},
-    {0, I_13,   G_13,   H_13},
-    {0, I_12,   G_12,   H_12},
-    {0, I_11,   G_11,   H_11},
-    {0, I_10,   G_10,   H_10},
-    {0, I_9,    G_9,    H_9},
-    {0, I_8,    G_8,    H_8},
-    {0, I_7,    G_7,    H_7},
-    {0, I_6,    G_6,    H_6},
-    {0, I_5,    G_5,    H_5},
-    {0, I_3,    G_3,    H_3},
-    {0, I_2,    G_2,    H_2},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
 
-    {0, F_16,   D_16,   E_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_14,   D_14,   E_14},
-    {0, F_10,   D_10,   E_10},
-    {0, F_6,    D_6,    E_6},
-    {0, F_5,    D_5,    E_5},
-    {0, F_4,    D_4,    E_4},
-    {0, F_3,    D_3,    E_3},
-    {0, F_2,    D_2,    E_2},
-    {0, C_4,    A_4,    B_4}
-};
-
-#define __ NO_LED
-
-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, 51, 27, 28 },
-        { 29, __, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40, 41 },
-        { 42, 43, 44, __, __, __, 45, __, __, __, 46, 47, 48, 49, 50 },
-    },
-    {
-        // LED Index to Physical Position
-        {2,0},  {20,0},  {35,0},  {50,0},  {65,0},  {80,0},  {94,0},  {109,0},  {124,0},  {139,0},  {154,0},  {168,0},  {183,0},  {202,0},            {224,0},
-        {4,21}, {24,21}, {39,21}, {54,21}, {68,21}, {83,21}, {98,21}, {113,21}, {128,21}, {142,21}, {157,21}, {172,21},           {196,21},           {224,27},
-        {7,43},          {31,43}, {46,43}, {61,43}, {76,43}, {91,43}, {105,43}, {120,43}, {135,43}, {150,43}, {165,43},           {185,43}, {205,43},
-        {0,64}, {18,64}, {37,64},                            {92,64},                               {146,64}, {161,64}, {176,64}, {190,64}, {205,64}, {220,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1,
-    }
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/ansi/config.h b/keyboards/keychron/q9/ansi/config.h
index f9565bd6f0e..40cc325d43f 100644
--- a/keyboards/keychron/q9/ansi/config.h
+++ b/keyboards/keychron/q9/ansi/config.h
@@ -16,9 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 52
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 15
diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json
index ccb29a749b2..ec5f367ed19 100644
--- a/keyboards/keychron/q9/ansi/info.json
+++ b/keyboards/keychron/q9/ansi/info.json
@@ -1,23 +1,67 @@
 {
-    "keyboard_name": "Keychron Q9",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0190",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 139, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 183, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 202, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 4, "y": 21, "flags": 8},
+            {"matrix": [1, 1], "x": 24, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 68, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 83, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 98, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 113, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 128, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 21, "flags": 4},
+            {"matrix": [1, 13], "x": 196, "y": 21, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 27, "flags": 1},
+
+            {"matrix": [2, 0], "x": 7, "y": 43, "flags": 1},
+            {"matrix": [2, 2], "x": 31, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 46, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [2, 5], "x": 76, "y": 43, "flags": 4},
+            {"matrix": [2, 6], "x": 91, "y": 43, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 43, "flags": 4},
+            {"matrix": [2, 8], "x": 120, "y": 43, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 43, "flags": 4},
+            {"matrix": [2, 11], "x": 165, "y": 43, "flags": 4},
+            {"matrix": [2, 13], "x": 185, "y": 43, "flags": 1},
+            {"matrix": [2, 14], "x": 205, "y": 43, "flags": 1},
+
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [3, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [3, 10], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [3, 11], "x": 161, "y": 64, "flags": 1},
+            {"matrix": [3, 12], "x": 176, "y": 64, "flags": 1},
+            {"matrix": [3, 13], "x": 190, "y": 64, "flags": 1},
+            {"matrix": [3, 14], "x": 205, "y": 64, "flags": 1},
+            {"matrix": [1, 12], "x": 220, "y": 64, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0190"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_52": {
             "layout": [
@@ -65,7 +109,6 @@
                 {"matrix": [2, 11], "x": 11.25, "y": 2.25},
                 {"matrix": [2, 13], "x": 12.25, "y": 2.25, "w": 1.75},
                 {"matrix": [2, 14], "x": 14.25, "y": 2.5},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.25},
                 {"matrix": [3, 2], "x": 2.5, "y": 3.25, "w": 1.25},
@@ -79,4 +122,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk
index cf31e094cbf..6e7633bfe01 100644
--- a/keyboards/keychron/q9/ansi/rules.mk
+++ b/keyboards/keychron/q9/ansi/rules.mk
@@ -1,14 +1 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
index 58d66e04732..e00c7f7e9d8 100644
--- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
@@ -20,94 +20,68 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16,   J_16,   K_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_14,   J_14,   K_14},
-    {0, L_13,   J_13,   K_13},
-    {0, L_12,   J_12,   K_12},
-    {0, L_11,   J_11,   K_11},
-    {0, L_10,   J_10,   K_10},
-    {0, L_9,    J_9,    K_9},
-    {0, L_8,    J_8,    K_8},
-    {0, L_7,    J_7,    K_7},
-    {0, L_6,    J_6,    K_6},
-    {0, L_5,    J_5,    K_5},
-    {0, L_4,    J_4,    K_4},
-    {0, L_3,    J_3,    K_3},
-    {0, L_2,    J_2,    K_2},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {0, C_16,   A_16,   B_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_14,   A_14,   B_14},
-    {0, C_13,   A_13,   B_13},
-    {0, C_12,   A_12,   B_12},
-    {0, C_11,   A_11,   B_11},
-    {0, C_10,   A_10,   B_10},
-    {0, C_9,    A_9,    B_9},
-    {0, C_8,    A_8,    B_8},
-    {0, C_7,    A_7,    B_7},
-    {0, C_6,    A_6,    B_6},
-    {0, C_5,    A_5,    B_5},
-    {0, C_3,    A_3,    B_3},
-    {0, C_2,    A_2,    B_2},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
 
-    {0, I_16,   G_16,   H_16},
-    {0, I_14,   G_14,   H_14},
-    {0, I_13,   G_13,   H_13},
-    {0, I_12,   G_12,   H_12},
-    {0, I_11,   G_11,   H_11},
-    {0, I_10,   G_10,   H_10},
-    {0, I_9,    G_9,    H_9},
-    {0, I_8,    G_8,    H_8},
-    {0, I_7,    G_7,    H_7},
-    {0, I_6,    G_6,    H_6},
-    {0, I_5,    G_5,    H_5},
-    {0, I_3,    G_3,    H_3},
-    {0, I_2,    G_2,    H_2},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
 
-    {0, F_16,   D_16,   E_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_14,   D_14,   E_14},
-    {0, F_10,   D_10,   E_10},
-    {0, F_6,    D_6,    E_6},
-    {0, F_5,    D_5,    E_5},
-    {0, F_4,    D_4,    E_4},
-    {0, F_3,    D_3,    E_3},
-    {0, F_2,    D_2,    E_2},
-    {0, C_4,    A_4,    B_4}
-};
-
-#define __ NO_LED
-
-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, 51, 27, 28 },
-        { 29, __, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40, 41 },
-        { 42, 43, 44, __, __, __, 45, __, __, __, 46, 47, 48, 49, 50 },
-    },
-    {
-        // LED Index to Physical Position
-        {2,0},  {20,0},  {35,0},  {50,0},  {65,0},  {80,0},  {94,0},  {109,0},  {124,0},  {139,0},  {154,0},  {168,0},  {183,0},  {202,0},            {224,0},
-        {4,21}, {24,21}, {39,21}, {54,21}, {68,21}, {83,21}, {98,21}, {113,21}, {128,21}, {142,21}, {157,21}, {172,21},           {196,21},           {224,27},
-        {7,43},          {31,43}, {46,43}, {61,43}, {76,43}, {91,43}, {105,43}, {120,43}, {135,43}, {150,43}, {165,43},           {185,43}, {205,43},
-        {0,64}, {18,64}, {37,64},                            {92,64},                               {146,64}, {161,64}, {176,64}, {190,64}, {205,64}, {220,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          1,          1, 1, 1, 1, 1, 1,
-    }
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/ansi_encoder/config.h b/keyboards/keychron/q9/ansi_encoder/config.h
index 6850e5c2d67..40cc325d43f 100644
--- a/keyboards/keychron/q9/ansi_encoder/config.h
+++ b/keyboards/keychron/q9/ansi_encoder/config.h
@@ -16,12 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 52
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 15
diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json
index 3826a1b768d..0fc135771a8 100644
--- a/keyboards/keychron/q9/ansi_encoder/info.json
+++ b/keyboards/keychron/q9/ansi_encoder/info.json
@@ -1,28 +1,70 @@
 {
-    "keyboard_name": "Keychron Q9",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0191",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["B3", "A15", "A14", "A13"]
-    },
-    "diode_direction": "ROW2COL",
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 139, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 183, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 202, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 4, "y": 21, "flags": 8},
+            {"matrix": [1, 1], "x": 24, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 68, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 83, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 98, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 113, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 128, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 21, "flags": 4},
+            {"matrix": [1, 13], "x": 196, "y": 21, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 27, "flags": 1},
+            {"matrix": [2, 0], "x": 7, "y": 43, "flags": 1},
+            {"matrix": [2, 2], "x": 31, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 46, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [2, 5], "x": 76, "y": 43, "flags": 4},
+            {"matrix": [2, 6], "x": 91, "y": 43, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 43, "flags": 4},
+            {"matrix": [2, 8], "x": 120, "y": 43, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 43, "flags": 4},
+            {"matrix": [2, 11], "x": 165, "y": 43, "flags": 4},
+            {"matrix": [2, 13], "x": 185, "y": 43, "flags": 1},
+            {"matrix": [2, 14], "x": 205, "y": 43, "flags": 1},
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [3, 6], "x": 92, "y": 64, "flags": 1},
+            {"matrix": [3, 10], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [3, 11], "x": 161, "y": 64, "flags": 1},
+            {"matrix": [3, 12], "x": 176, "y": 64, "flags": 1},
+            {"matrix": [3, 13], "x": 190, "y": 64, "flags": 1},
+            {"matrix": [3, 14], "x": 205, "y": 64, "flags": 1},
+            {"matrix": [1, 12], "x": 220, "y": 64, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0191"
+    },
     "layouts": {
         "LAYOUT_ansi_52": {
             "layout": [
@@ -41,7 +83,6 @@
                 {"matrix": [0, 12], "x": 12.5, "y": 0.25},
                 {"matrix": [0, 13], "x": 13.5, "y": 0.25, "w": 1.5},
                 {"matrix": [0, 14], "x": 15.25, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.75},
                 {"matrix": [1, 1], "x": 1.75, "y": 1.25},
                 {"matrix": [1, 2], "x": 2.75, "y": 1.25},
@@ -56,7 +97,6 @@
                 {"matrix": [1, 11], "x": 11.75, "y": 1.25},
                 {"matrix": [1, 13], "x": 12.75, "y": 1.25, "w": 2.25},
                 {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2.25},
                 {"matrix": [2, 2], "x": 2.25, "y": 2.25},
                 {"matrix": [2, 3], "x": 3.25, "y": 2.25},
@@ -70,7 +110,6 @@
                 {"matrix": [2, 11], "x": 11.25, "y": 2.25},
                 {"matrix": [2, 13], "x": 12.25, "y": 2.25, "w": 1.75},
                 {"matrix": [2, 14], "x": 14.25, "y": 2.5},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.25},
                 {"matrix": [3, 2], "x": 2.5, "y": 3.25, "w": 1.25},
@@ -84,4 +123,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk
index ed8fd33800d..6e7633bfe01 100644
--- a/keyboards/keychron/q9/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q9/ansi_encoder/rules.mk
@@ -1,16 +1 @@
-# 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 USB 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        # Enable Encoder
-ENCODER_MAP_ENBALE = no
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keychron/q9/config.h b/keyboards/keychron/q9/config.h
index 4226980d3e7..e0e7e192272 100644
--- a/keyboards/keychron/q9/config.h
+++ b/keyboards/keychron/q9/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID { { 3, 4 } }
-
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
@@ -35,63 +29,5 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70 }
 
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
+/* Encoder Configuration */
+#define ENCODER_DEFAULT_POS 0x3
\ No newline at end of file
diff --git a/keyboards/keychron/q9/info.json b/keyboards/keychron/q9/info.json
new file mode 100644
index 00000000000..322fcfa1ade
--- /dev/null
+++ b/keyboards/keychron/q9/info.json
@@ -0,0 +1,64 @@
+{
+    "manufacturer": "Keychron",
+    "keyboard_name": "Keychron Q9",
+    "maintainer": "lalalademaxiya1",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 5
+    },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        } 
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "dip_switch": {
+        "matrix_grid": [ [3, 4] ]
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+        "rows": ["B3", "A15", "A14", "A13"]
+    },
+    "processor": "STM32L432",
+    "rgb_matrix": {
+        "animations": {
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    },
+    "url": "https://github.com/Keychron",
+    "usb": {
+        "vid": "0x3434"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q9/iso/config.h b/keyboards/keychron/q9/iso/config.h
index eba60f45625..611ed6e267e 100644
--- a/keyboards/keychron/q9/iso/config.h
+++ b/keyboards/keychron/q9/iso/config.h
@@ -16,9 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 53
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 14
diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/info.json
index a9586d6d917..19a818ebb86 100644
--- a/keyboards/keychron/q9/iso/info.json
+++ b/keyboards/keychron/q9/iso/info.json
@@ -1,23 +1,68 @@
 {
-    "keyboard_name": "Keychron Q9",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0192",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 139, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 183, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 4, "y": 21, "flags": 8},
+            {"matrix": [1, 1], "x": 24, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 68, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 83, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 98, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 113, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 128, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 21, "flags": 4},
+            {"matrix": [1, 13], "x": 187, "y": 21, "flags": 4},
+            {"matrix": [0, 13], "x": 207, "y": 14, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 27, "flags": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 43, "flags": 1},
+            {"matrix": [2, 1], "x": 17, "y": 43, "flags": 4},
+            {"matrix": [2, 2], "x": 31, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 46, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [2, 5], "x": 76, "y": 43, "flags": 4},
+            {"matrix": [2, 6], "x": 91, "y": 43, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 43, "flags": 4},
+            {"matrix": [2, 8], "x": 120, "y": 43, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 43, "flags": 4},
+            {"matrix": [2, 11], "x": 165, "y": 43, "flags": 4},
+            {"matrix": [2, 13], "x": 185, "y": 43, "flags": 1},
+            {"matrix": [2, 14], "x": 205, "y": 43, "flags": 1},
+
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [3, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [3, 10], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [3, 11], "x": 161, "y": 64, "flags": 1},
+            {"matrix": [3, 12], "x": 176, "y": 64, "flags": 1},
+            {"matrix": [3, 13], "x": 190, "y": 64, "flags": 1},
+            {"matrix": [3, 14], "x": 205, "y": 64, "flags": 1},
+            {"matrix": [1, 12], "x": 220, "y": 64, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0192"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_iso_53": {
             "layout": [
@@ -66,7 +111,6 @@
                 {"matrix": [2, 11], "x": 11.25, "y": 2},
                 {"matrix": [2, 13], "x": 12.25, "y": 2, "w": 1.75},
                 {"matrix": [2, 14], "x": 14, "y": 2},
-
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
                 {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
@@ -80,4 +124,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q9/iso/iso.c b/keyboards/keychron/q9/iso/iso.c
index 1917b61f376..f059b4bf58e 100644
--- a/keyboards/keychron/q9/iso/iso.c
+++ b/keyboards/keychron/q9/iso/iso.c
@@ -20,95 +20,69 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16, J_16, K_16}, // Tab
-    {0, L_15, J_15, K_15}, // Q
-    {0, L_14, J_14, K_14}, // W
-    {0, L_13, J_13, K_13}, // E
-    {0, L_12, J_12, K_12}, // R
-    {0, L_11, J_11, K_11}, // T
-    {0, L_10, J_10, K_10}, // Y
-    {0, L_9,  J_9,  K_9},  // U
-    {0, L_8,  J_8,  K_8},  // I
-    {0, L_7,  J_7,  K_7},  // O
-    {0, L_6,  J_6,  K_6},  // P
-    {0, L_5,  J_5,  K_5},  // [
-    {0, L_4,  J_4,  K_4},  // ]
-    {0, L_2,  J_2,  K_2},  // Del
+    {0, CB12_CA16, CB10_CA16, CB11_CA16}, // Tab
+    {0, CB12_CA15, CB10_CA15, CB11_CA15}, // Q
+    {0, CB12_CA14, CB10_CA14, CB11_CA14}, // W
+    {0, CB12_CA13, CB10_CA13, CB11_CA13}, // E
+    {0, CB12_CA12, CB10_CA12, CB11_CA12}, // R
+    {0, CB12_CA11, CB10_CA11, CB11_CA11}, // T
+    {0, CB12_CA10, CB10_CA10, CB11_CA10}, // Y
+    {0, CB12_CA9,  CB10_CA9,  CB11_CA9},  // U
+    {0, CB12_CA8,  CB10_CA8,  CB11_CA8},  // I
+    {0, CB12_CA7,  CB10_CA7,  CB11_CA7},  // O
+    {0, CB12_CA6,  CB10_CA6,  CB11_CA6},  // P
+    {0, CB12_CA5,  CB10_CA5,  CB11_CA5},  // [
+    {0, CB12_CA4,  CB10_CA4,  CB11_CA4},  // ]
+    {0, CB12_CA2,  CB10_CA2,  CB11_CA2},  // Del
 
-    {0, C_16, A_16, B_16}, // CapsLock
-    {0, C_15, A_15, B_15}, // A
-    {0, C_14, A_14, B_14}, // S
-    {0, C_13, A_13, B_13}, // D
-    {0, C_12, A_12, B_12}, // F
-    {0, C_11, A_11, B_11}, // G
-    {0, C_10, A_10, B_10}, // H
-    {0, C_9,  A_9,  B_9},  // J
-    {0, C_8,  A_8,  B_8},  // K
-    {0, C_7,  A_7,  B_7},  // L
-    {0, C_6,  A_6,  B_6},  // ;
-    {0, C_5,  A_5,  B_5},  // '
-    {0, C_3,  A_3,  B_3},  // #
-    {0, L_3,  J_3,  K_3},  // Enter
-    {0, C_2,  A_2,  B_2},  // Home
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // CapsLock
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // A
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // S
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // D
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // G
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // H
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // J
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // K
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // L
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // ;
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // '
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // #
+    {0, CB12_CA3,  CB10_CA3,  CB11_CA3},  // Enter
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Home
 
-    {0, I_16, G_16, H_16}, // LeftShift
-    {0, I_15, G_15, H_15}, // |
-    {0, I_14, G_14, H_14}, // Z
-    {0, I_13, G_13, H_13}, // X
-    {0, I_12, G_12, H_12}, // C
-    {0, I_11, G_11, H_11}, // V
-    {0, I_10, G_10, H_10}, // B
-    {0, I_9,  G_9,  H_9},  // N
-    {0, I_8,  G_8,  H_8},  // M
-    {0, I_7,  G_7,  H_7},  // ,
-    {0, I_6,  G_6,  H_6},  // .
-    {0, I_5,  G_5,  H_5},  // ?
-    {0, I_3,  G_3,  H_3},  // RightShift
-    {0, I_2,  G_2,  H_2},  // Up
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // LeftShift
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // |
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Z
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // X
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // C
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // V
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // B
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // N
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // M
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // ,
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // .
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ?
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // RightShift
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Up
 
-    {0, F_16, D_16, E_16}, // LeftCtrl
-    {0, F_15, D_15, E_15}, // LeftWin
-    {0, F_14, D_14, E_14}, // LeftAlt
-    {0, F_10, D_10, E_10}, // Space
-    {0, F_6,  D_6,  E_6},  // RightAlt
-    {0, F_5,  D_5,  E_5},  // Fn1
-    {0, F_4,  D_4,  E_4},  // Fn2
-    {0, F_3,  D_3,  E_3},  // Left
-    {0, F_2,  D_2,  E_2},  // Down
-    {0, C_4,  A_4,  B_4}   // Right
-};
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-     {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 27, 13 },
-        { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 52, 26, 28 },
-        { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, __, 41, 42 },
-        { 43, 44, 45, __, __, __, 46, __, __, __, 47, 48, 49, 50, 51 },
-    },
-    {
-        // LED Index to Physical Position
-        {2,0},  {20,0},  {35,0},  {50,0},  {65,0},  {80,0},  {94,0},  {109,0},  {124,0},  {139,0},  {154,0},  {168,0},  {183,0},                      {224,0},
-        {4,21}, {24,21}, {39,21}, {54,21}, {68,21}, {83,21}, {98,21}, {113,21}, {128,21}, {142,21}, {157,21}, {172,21}, {187,21}, {207,14},           {224,27},
-        {0,43}, {17,43}, {31,43}, {46,43}, {61,43}, {76,43}, {91,43}, {105,43}, {120,43}, {135,43}, {150,43}, {165,43},           {185,43}, {205,43},
-        {0,64}, {18,64}, {37,64},                            {92,64},                               {146,64}, {161,64}, {176,64}, {190,64}, {205,64}, {220,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        8, 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,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1,
-    }
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // LeftCtrl
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftWin
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftAlt
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // Space
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // RightAlt
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // Fn1
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // Fn2
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4}   // Right
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk
index cf31e094cbf..6e7633bfe01 100644
--- a/keyboards/keychron/q9/iso/rules.mk
+++ b/keyboards/keychron/q9/iso/rules.mk
@@ -1,14 +1 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keychron/q9/iso_encoder/config.h b/keyboards/keychron/q9/iso_encoder/config.h
index 65d7ad77082..6b4a67d526f 100644
--- a/keyboards/keychron/q9/iso_encoder/config.h
+++ b/keyboards/keychron/q9/iso_encoder/config.h
@@ -16,12 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 52
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 13
diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json
index 1c74566da1c..087c2f81882 100644
--- a/keyboards/keychron/q9/iso_encoder/info.json
+++ b/keyboards/keychron/q9/iso_encoder/info.json
@@ -1,28 +1,73 @@
 {
-    "keyboard_name": "Keychron Q9",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0193",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
-        "rows": ["B3", "A15", "A14", "A13"]
-    },
-    "diode_direction": "ROW2COL",
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 139, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 183, "y": 0, "flags": 4},
+
+            {"matrix": [1, 0], "x": 4, "y": 21, "flags": 8},
+            {"matrix": [1, 1], "x": 24, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 68, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 83, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 98, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 113, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 128, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 21, "flags": 4},
+            {"matrix": [1, 13], "x": 187, "y": 21, "flags": 4},
+            {"matrix": [0, 13], "x": 207, "y": 14, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 27, "flags": 1},
+
+            {"matrix": [2, 0], "x": 0, "y": 43, "flags": 1},
+            {"matrix": [2, 1], "x": 17, "y": 43, "flags": 4},
+            {"matrix": [2, 2], "x": 31, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 46, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [2, 5], "x": 76, "y": 43, "flags": 4},
+            {"matrix": [2, 6], "x": 91, "y": 43, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 43, "flags": 4},
+            {"matrix": [2, 8], "x": 120, "y": 43, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 43, "flags": 4},
+            {"matrix": [2, 11], "x": 165, "y": 43, "flags": 4},
+            {"matrix": [2, 13], "x": 185, "y": 43, "flags": 1},
+            {"matrix": [2, 14], "x": 205, "y": 43, "flags": 1},
+            
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 37, "y": 64, "flags": 1},
+            {"matrix": [3, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [3, 10], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [3, 11], "x": 161, "y": 64, "flags": 1},
+            {"matrix": [3, 12], "x": 176, "y": 64, "flags": 1},
+            {"matrix": [3, 13], "x": 190, "y": 64, "flags": 1},
+            {"matrix": [3, 14], "x": 205, "y": 64, "flags": 1},
+            {"matrix": [1, 12], "x": 220, "y": 64, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0193"
+    },
     "layouts": {
         "LAYOUT_iso_53": {
             "layout": [
@@ -40,7 +85,6 @@
                 {"matrix": [0, 11], "x": 11.5, "y": 0},
                 {"matrix": [0, 12], "x": 12.5, "y": 0},
                 {"matrix": [0, 14], "x": 15.25, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
                 {"matrix": [1, 1], "x": 1.75, "y": 1},
                 {"matrix": [1, 2], "x": 2.75, "y": 1},
@@ -56,7 +100,6 @@
                 {"matrix": [1, 13], "x": 12.75, "y": 1},
                 {"matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.25, "h": 2},
                 {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
                 {"matrix": [2, 1], "x": 1.25, "y": 2},
                 {"matrix": [2, 2], "x": 2.25, "y": 2},
@@ -71,7 +114,6 @@
                 {"matrix": [2, 11], "x": 11.25, "y": 2},
                 {"matrix": [2, 13], "x": 12.25, "y": 2, "w": 1.75},
                 {"matrix": [2, 14], "x": 14, "y": 2},
-
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
                 {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
@@ -85,4 +127,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.c b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
index 3a161fe9d74..1fdb4fc8cbb 100644
--- a/keyboards/keychron/q9/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
@@ -20,95 +20,69 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16, J_16, K_16}, // Tab
-    {0, L_15, J_15, K_15}, // Q
-    {0, L_14, J_14, K_14}, // W
-    {0, L_13, J_13, K_13}, // E
-    {0, L_12, J_12, K_12}, // R
-    {0, L_11, J_11, K_11}, // T
-    {0, L_10, J_10, K_10}, // Y
-    {0, L_9,  J_9,  K_9},  // U
-    {0, L_8,  J_8,  K_8},  // I
-    {0, L_7,  J_7,  K_7},  // O
-    {0, L_6,  J_6,  K_6},  // P
-    {0, L_5,  J_5,  K_5},  // [
-    {0, L_4,  J_4,  K_4},  // ]
-    // {0, L_2,  J_2,  K_2},  // Mute
+    {0, CB12_CA16, CB10_CA16, CB11_CA16}, // Tab
+    {0, CB12_CA15, CB10_CA15, CB11_CA15}, // Q
+    {0, CB12_CA14, CB10_CA14, CB11_CA14}, // W
+    {0, CB12_CA13, CB10_CA13, CB11_CA13}, // E
+    {0, CB12_CA12, CB10_CA12, CB11_CA12}, // R
+    {0, CB12_CA11, CB10_CA11, CB11_CA11}, // T
+    {0, CB12_CA10, CB10_CA10, CB11_CA10}, // Y
+    {0, CB12_CA9,  CB10_CA9,  CB11_CA9},  // U
+    {0, CB12_CA8,  CB10_CA8,  CB11_CA8},  // I
+    {0, CB12_CA7,  CB10_CA7,  CB11_CA7},  // O
+    {0, CB12_CA6,  CB10_CA6,  CB11_CA6},  // P
+    {0, CB12_CA5,  CB10_CA5,  CB11_CA5},  // [
+    {0, CB12_CA4,  CB10_CA4,  CB11_CA4},  // ]
+    // {0, CB12_CA2,  CB10_CA2,  CB11_CA2},  // Mute
 
-    {0, C_16, A_16, B_16}, // CapsLock
-    {0, C_15, A_15, B_15}, // A
-    {0, C_14, A_14, B_14}, // S
-    {0, C_13, A_13, B_13}, // D
-    {0, C_12, A_12, B_12}, // F
-    {0, C_11, A_11, B_11}, // G
-    {0, C_10, A_10, B_10}, // H
-    {0, C_9,  A_9,  B_9},  // J
-    {0, C_8,  A_8,  B_8},  // K
-    {0, C_7,  A_7,  B_7},  // L
-    {0, C_6,  A_6,  B_6},  // ;
-    {0, C_5,  A_5,  B_5},  // '
-    {0, C_3,  A_3,  B_3},  // #
-    {0, L_3,  J_3,  K_3},  // Enter
-    {0, C_2,  A_2,  B_2},  // Home
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // CapsLock
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // A
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // S
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // D
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // G
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // H
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // J
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // K
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // L
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // ;
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // '
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // #
+    {0, CB12_CA3,  CB10_CA3,  CB11_CA3},  // Enter
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Home
 
-    {0, I_16, G_16, H_16}, // LeftShift
-    {0, I_15, G_15, H_15}, // |
-    {0, I_14, G_14, H_14}, // Z
-    {0, I_13, G_13, H_13}, // X
-    {0, I_12, G_12, H_12}, // C
-    {0, I_11, G_11, H_11}, // V
-    {0, I_10, G_10, H_10}, // B
-    {0, I_9,  G_9,  H_9},  // N
-    {0, I_8,  G_8,  H_8},  // M
-    {0, I_7,  G_7,  H_7},  // ,
-    {0, I_6,  G_6,  H_6},  // .
-    {0, I_5,  G_5,  H_5},  // ?
-    {0, I_3,  G_3,  H_3},  // RightShift
-    {0, I_2,  G_2,  H_2},  // Up
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // LeftShift
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // |
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Z
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // X
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // C
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // V
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // B
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // N
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // M
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // ,
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // .
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ?
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // RightShift
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Up
 
-    {0, F_16, D_16, E_16}, // LeftCtrl
-    {0, F_15, D_15, E_15}, // LeftWin
-    {0, F_14, D_14, E_14}, // LeftAlt
-    {0, F_10, D_10, E_10}, // Space
-    {0, F_6,  D_6,  E_6},  // RightAlt
-    {0, F_5,  D_5,  E_5},  // Fn1
-    {0, F_4,  D_4,  E_4},  // Fn2
-    {0, F_3,  D_3,  E_3},  // Left
-    {0, F_2,  D_2,  E_2},  // Down
-    {0, C_4,  A_4,  B_4}   // Right
-};
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-     {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 26, __ },
-        { 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 51, 25, 27 },
-        { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40, 41 },
-        { 42, 43, 44, __, __, __, 45, __, __, __, 46, 47, 48, 49, 50 },
-    },
-    {
-        // LED Index to Physical Position
-        {2,0},  {20,0},  {35,0},  {50,0},  {65,0},  {80,0},  {94,0},  {109,0},  {124,0},  {139,0},  {154,0},  {168,0},  {183,0},
-        {4,21}, {24,21}, {39,21}, {54,21}, {68,21}, {83,21}, {98,21}, {113,21}, {128,21}, {142,21}, {157,21}, {172,21}, {187,21}, {207,14},           {224,27},
-        {0,43}, {17,43}, {31,43}, {46,43}, {61,43}, {76,43}, {91,43}, {105,43}, {120,43}, {135,43}, {150,43}, {165,43},           {185,43}, {205,43},
-        {0,64}, {18,64}, {37,64},                            {92,64},                               {146,64}, {161,64}, {176,64}, {190,64}, {205,64}, {220,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-        8, 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,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1,
-    }
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // LeftCtrl
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftWin
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftAlt
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // Space
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // RightAlt
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // Fn1
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // Fn2
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4}   // Right
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk
index ed8fd33800d..7ff128fa692 100644
--- a/keyboards/keychron/q9/iso_encoder/rules.mk
+++ b/keyboards/keychron/q9/iso_encoder/rules.mk
@@ -1,16 +1 @@
-# 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 USB 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        # Enable Encoder
-ENCODER_MAP_ENBALE = no
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q9/q9.c b/keyboards/keychron/q9/q9.c
index 51dea886f1c..d020f6ab430 100644
--- a/keyboards/keychron/q9/q9.c
+++ b/keyboards/keychron/q9/q9.c
@@ -16,13 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/q9/readme.md b/keyboards/keychron/q9/readme.md
index e2368ff7587..c7641f1cf99 100644
--- a/keyboards/keychron/q9/readme.md
+++ b/keyboards/keychron/q9/readme.md
@@ -1,19 +1,27 @@
 # Keychron Q9
 
+![Keychron Q9](https://i.imgur.com/G8xJ4TRh.jpg)
+
 A customizable 40% keyboard.
 
 * Keyboard Maintainer: [Keychron](https://github.com/keychron)
 * Hardware Supported: Keychron Q9
-* Hardware Availability: [Keychron](https://www.keychron.com)
+* Hardware Availability: [Keychron Q9 QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q9-qmk-custom-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
     make keychron/q9/ansi:default
+    make keychron/q9/ansi_encoder:default
+    make keychron/q9/iso:default
+    make keychron/q9/iso_enocder:default
 
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+Flashing example for this keyboard:
 
     make keychron/q9/ansi:default:flash
+    make keychron/q9/ansi_encoder:default:flash
+    make keychron/q9/iso:default:flash
+    make keychron/q9/iso_encoder:default:flash
 
-**Reset Key**: Hold down the key located at *K00*, which programmed as *Tab* while plugging in the keyboard.
+**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
 
-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).
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
index d264334fa03..f9277d570b2 100755
--- a/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
@@ -17,69 +17,69 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16,   J_16,   K_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_14,   J_14,   K_14},
-    {0, L_13,   J_13,   K_13},
-    {0, L_12,   J_12,   K_12},
-    {0, L_11,   J_11,   K_11},
-    {0, L_10,   J_10,   K_10},
-    {0, L_9,    J_9,    K_9},
-    {0, L_8,    J_8,    K_8},
-    {0, L_7,    J_7,    K_7},
-    {0, L_6,    J_6,    K_6},
-    {0, L_5,    J_5,    K_5},
-    {0, L_4,    J_4,    K_4},
-    {0, L_3,    J_3,    K_3},
-    // {0, L_2,    J_2,    K_2},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    // {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {0, C_16,   A_16,   B_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_14,   A_14,   B_14},
-    {0, C_13,   A_13,   B_13},
-    {0, C_12,   A_12,   B_12},
-    {0, C_11,   A_11,   B_11},
-    {0, C_10,   A_10,   B_10},
-    {0, C_9,    A_9,    B_9},
-    {0, C_8,    A_8,    B_8},
-    {0, C_7,    A_7,    B_7},
-    {0, C_6,    A_6,    B_6},
-    {0, C_5,    A_5,    B_5},
-    {0, C_3,    A_3,    B_3},
-    {0, C_2,    A_2,    B_2},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
 
-    {0, I_16,   G_16,   H_16},
-    {0, I_14,   G_14,   H_14},
-    {0, I_13,   G_13,   H_13},
-    {0, I_12,   G_12,   H_12},
-    {0, I_11,   G_11,   H_11},
-    {0, I_10,   G_10,   H_10},
-    {0, I_9,    G_9,    H_9},
-    {0, I_8,    G_8,    H_8},
-    {0, I_7,    G_7,    H_7},
-    {0, I_6,    G_6,    H_6},
-    {0, I_5,    G_5,    H_5},
-    {0, I_3,    G_3,    H_3},
-    {0, I_2,    G_2,    H_2},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
 
-    {0, F_16,   D_16,   E_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_14,   D_14,   E_14},
-    {0, F_13,   D_13,   E_13},
-    {0, F_10,   D_10,   E_10},
-    {0, F_7,    D_7,    E_7},
-    {0, F_6,    D_6,    E_6},
-    {0, F_5,    D_5,    E_5},
-    {0, F_4,    D_4,    E_4},
-    {0, F_3,    D_3,    E_3},
-    {0, F_2,    D_2,    E_2},
-    {0, C_4,    A_4,    B_4},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
 };
 #endif
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/config.h b/keyboards/keychron/q9_plus/ansi_encoder/config.h
index 1943a0fb275..7798a0e5cee 100755
--- a/keyboards/keychron/q9_plus/ansi_encoder/config.h
+++ b/keyboards/keychron/q9_plus/ansi_encoder/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 53
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/q9_plus/config.h b/keyboards/keychron/q9_plus/config.h
index c9ef05b613a..340d5654901 100755
--- a/keyboards/keychron/q9_plus/config.h
+++ b/keyboards/keychron/q9_plus/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID {{ 3, 4 }}
-
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
@@ -36,18 +30,5 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70, 0xF8, 0xF8, 0x70 }
 
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-
 /* Old default behavior of mod-taps */
 #define HOLD_ON_OTHER_KEY_PRESS
diff --git a/keyboards/keychron/q9_plus/info.json b/keyboards/keychron/q9_plus/info.json
index 9f8703de37b..927f5094a6b 100755
--- a/keyboards/keychron/q9_plus/info.json
+++ b/keyboards/keychron/q9_plus/info.json
@@ -19,6 +19,14 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [3, 4] ]
+    },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
         "rows": ["B3", "A15", "A14", "A13"]
@@ -119,6 +127,7 @@
             "solid_reactive_multinexus": true,
             "splash": true,
             "solid_splash": true
-        }
+        },
+        "sleep": true
     }
 }
diff --git a/keyboards/keychron/q9_plus/q9_plus.c b/keyboards/keychron/q9_plus/q9_plus.c
index 848117d323b..77fd5f3cb00 100755
--- a/keyboards/keychron/q9_plus/q9_plus.c
+++ b/keyboards/keychron/q9_plus/q9_plus.c
@@ -16,13 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 bool dip_switch_update_kb(uint8_t index, bool active) {
     if (!dip_switch_update_user(index, active)) {
diff --git a/keyboards/keychron/s1/ansi/rgb/config.h b/keyboards/keychron/s1/ansi/rgb/config.h
index 647a877a4cd..7eea6bb476b 100644
--- a/keyboards/keychron/s1/ansi/rgb/config.h
+++ b/keyboards/keychron/s1/ansi/rgb/config.h
@@ -19,68 +19,10 @@
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 #define SNLED27351_CURRENT_TUNE \
     { 0xA0, 0xA0, 0x48, 0xA0, 0xA0, 0x48, 0xA0, 0xA0, 0x48, 0xA0, 0xA0, 0x48 }
 
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 46
-
-// 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
-// #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_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/info.json
index 6b49cb18e0a..2e78ccfe427 100644
--- a/keyboards/keychron/s1/ansi/rgb/info.json
+++ b/keyboards/keychron/s1/ansi/rgb/info.json
@@ -9,7 +9,31 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
diff --git a/keyboards/keychron/s1/ansi/rgb/rgb.c b/keyboards/keychron/s1/ansi/rgb/rgb.c
index ca39b0c7962..af6390f7532 100644
--- a/keyboards/keychron/s1/ansi/rgb/rgb.c
+++ b/keyboards/keychron/s1/ansi/rgb/rgb.c
@@ -20,102 +20,102 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,  G_1,  H_1},  // esc
-    {0, I_2,  G_2,  H_2},  // f1
-    {0, I_3,  G_3,  H_3},  // f2
-    {0, I_4,  G_4,  H_4},  // f3
-    {0, I_5,  G_5,  H_5},  // f4
-    {0, I_6,  G_6,  H_6},  // f4
-    {0, I_7,  G_7,  H_7},  // f6
-    {0, I_8,  G_8,  H_8},  // f7
-    {0, I_9,  G_9,  H_9},  // f8
-    {0, I_10, G_10, H_10}, // f9
-    {0, I_11, G_11, H_11}, // f10
-    {0, I_12, G_12, H_12}, // f11
-    {0, I_13, G_13, H_13}, // f12
-    {0, I_14, G_14, H_14}, // print
-    {0, I_15, G_15, H_15}, // del
-    {0, I_16, G_16, H_16}, // light
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // esc
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // f1
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // f2
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // f3
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // f4
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // f4
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // f6
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // f7
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // f8
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // f9
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // f10
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // f11
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // f12
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // print
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // del
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // light
 
-    {0, F_1,  D_1,  E_1},  // ~
-    {0, F_2,  D_2,  E_2},  // 1!
-    {0, F_3,  D_3,  E_3},  // 2@
-    {0, F_4,  D_4,  E_4},  // 3#
-    {0, F_5,  D_5,  E_5},  // 4$
-    {0, F_6,  D_6,  E_6},  // 5%
-    {0, F_7,  D_7,  E_7},  // 6^
-    {0, F_8,  D_8,  E_8},  // 7&
-    {0, F_9,  D_9,  E_9},  // 8*
-    {0, F_10, D_10, E_10}, // 9(
-    {0, F_11, D_11, E_11}, // 0)
-    {0, F_12, D_12, E_12}, // -_
-    {0, F_13, D_13, E_13}, // =+
-    {0, F_14, D_14, E_14}, // back space
-    {0, F_16, D_16, E_16}, // page up
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // ~
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // 1!
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // 2@
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // 3#
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // 4$
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // 5%
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // 6^
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // 7&
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // 8*
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // 9(
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // 0)
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // -_
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // =+
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // back space
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // page up
 
-    {0, C_1,  A_1,  B_1},  // tab
-    {0, C_2,  A_2,  B_2},  // q
-    {0, C_3,  A_3,  B_3},  // w
-    {0, C_4,  A_4,  B_4},  // e
-    {0, C_5,  A_5,  B_5},  // r
-    {0, C_6,  A_6,  B_6},  // t
-    {0, C_7,  A_7,  B_7},  // y
-    {0, C_8,  A_8,  B_8},  // u
-    {0, C_9,  A_9,  B_9},  // i
-    {0, C_10, A_10, B_10}, // o
-    {0, C_11, A_11, B_11}, // p
-    {0, C_12, A_12, B_12}, // [{
-    {0, C_13, A_13, B_13}, // ]}
-    {0, C_14, A_14, B_14}, // |
-    {0, C_16, A_16, B_16}, // page down
+    {0, CB3_CA1,  CB1_CA1,  CB2_CA1},  // tab
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // q
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // w
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // e
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // r
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // t
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // y
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // u
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // i
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // o
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // p
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // [{
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // ]}
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // |
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // page down
 
-    {1, I_1,  G_1,  H_1},  // caps lock
-    {1, I_2,  G_2,  H_2},  // a
-    {1, I_3,  G_3,  H_3},  // s
-    {1, I_4,  G_4,  H_4},  // d
-    {1, I_5,  G_5,  H_5},  // f
-    {1, I_6,  G_6,  H_6},  // g
-    {1, I_7,  G_7,  H_7},  // h
-    {1, I_8,  G_8,  H_8},  // j
-    {1, I_9,  G_9,  H_9},  // k
-    {1, I_10, G_10, H_10}, // l
-    {1, I_11, G_11, H_11}, // ;:
-    {1, I_12, G_12, H_12}, // '"
-    {1, I_14, G_14, H_14}, // enter
-    {1, I_16, G_16, H_16}, // home
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // caps lock
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // a
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // s
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // d
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // f
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // g
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // h
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // j
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // k
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // l
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;:
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // '"
+    {1, CB9_CA14, CB7_CA14, CB8_CA14}, // enter
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // home
 
-    {1, C_1,  A_1,  B_1},  // left shift
-    {1, C_3,  A_3,  B_3},  // z
-    {1, C_4,  A_4,  B_4},  // x
-    {1, C_5,  A_5,  B_5},  // c
-    {1, C_6,  A_6,  B_6},  // v
-    {1, C_7,  A_7,  B_7},  // b
-    {1, C_8,  A_8,  B_8},  // b
-    {1, C_9,  A_9,  B_9},  // n
-    {1, C_10, A_10, B_10}, // m
-    {1, C_11, A_11, B_11}, // ,<
-    {1, C_12, A_12, B_12}, // .>
-    {1, C_13, A_13, B_13}, // right shift
-    {1, C_14, A_14, B_14}, // up
-    {1, C_16, A_16, B_16}, // end
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // left shift
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // z
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // x
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // c
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // v
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // b
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // b
+    {1, CB3_CA9,  CB1_CA9,  CB2_CA9},  // n
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // m
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // ,<
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // .>
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // right shift
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // up
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // end
 
-    {1, F_1,  D_1,  E_1},  // left
-    {1, F_2,  D_2,  E_2},  // left command
-    {1, F_3,  D_3,  E_3},  // left optin
-    {1, F_7,  D_7,  E_7},  // space
-    {1, F_10, D_10, E_10}, // right command
-    {1, F_11, D_11, E_11}, // fn
-    {1, F_12, D_12, E_12}, // right ctrl
-    {1, F_13, D_13, E_13}, // left
-    {1, F_14, D_14, E_14}, // down
-    {1, F_16, D_16, E_16}, // right
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // left command
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // left optin
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // space
+    {1, CB6_CA10, CB4_CA10, CB5_CA10}, // right command
+    {1, CB6_CA11, CB4_CA11, CB5_CA11}, // fn
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // right ctrl
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // left
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // down
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/s1/ansi/white/config.h b/keyboards/keychron/s1/ansi/white/config.h
index fbe02caeb13..9aedc6b47f5 100644
--- a/keyboards/keychron/s1/ansi/white/config.h
+++ b/keyboards/keychron/s1/ansi/white/config.h
@@ -18,48 +18,10 @@
 
 /* LED Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
-#define DRIVER_1_LED_TOTAL 84
-#define LED_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_6_CHANNEL
 #define SNLED27351_CURRENT_TUNE \
     { 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 } // 250mA
     // { 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40 } // 127mA
 
-/* Disable LED lighting when PC is in suspend */
-#define LED_DISABLE_WHEN_USB_SUSPENDED
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 46
-
-// LED Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
-#define ENABLE_LED_MATRIX_NONE
-#define ENABLE_LED_MATRIX_SOLID                    // Static single val, no speed support
-// #define ENABLE_LED_MATRIX_ALPHAS_MODS              // Static dual val, speed is val for LEDs marked as modifiers
-#define ENABLE_LED_MATRIX_BREATHING                // Cycling brightness animation
-// #define ENABLE_LED_MATRIX_BAND                     // Band fading brightness scrolling left to right
-#define ENABLE_LED_MATRIX_BAND_PINWHEEL            // 3 blade spinning pinwheel fades brightness
-#define ENABLE_LED_MATRIX_BAND_SPIRAL              // Spinning spiral fades brightness
-#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT         // Full gradient scrolling left to right
-#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN            // Full gradient scrolling top to bottom
-#define ENABLE_LED_MATRIX_CYCLE_OUT_IN             // Full gradient scrolling out to in
-#define ENABLE_LED_MATRIX_DUAL_BEACON              // Full gradient spinning around center of keyboard
-// #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
-#define LED_MATRIX_KEYPRESSES
-#define LED_MATRIX_KEYRELEASES
-
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit then fades out
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE       // Value pulses near a single key hit then fades out
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Value pulses near multiple key hits then fades out
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS      // Value pulses the same column and row of a single key hit then fades out
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS // Value pulses the same column and row of multiple key hits then fades out
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS      // Value pulses away on the same column and row of a single key hit then fades out
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS // Value pulses away on the same column and row of multiple key hits then fades out
-#define ENABLE_LED_MATRIX_SOLID_SPLASH              // Value pulses away from a single key hit then fades out
-#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH         // Value pulses away from multiple key hits then fades out
-// #endif
-#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT           // Sine wave scrolling from left to right
-#define ENBALE_LED_MATRIX_WAVE_UP_DOWN              // Sine wave scrolling from up to down
-// #define ENABLE_LED_MATRIX_EFFECT_MAX
diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/info.json
index bcd64eea599..0e20c9ebe65 100644
--- a/keyboards/keychron/s1/ansi/white/info.json
+++ b/keyboards/keychron/s1/ansi/white/info.json
@@ -9,7 +9,31 @@
         "device_version": "1.0.0"
     },
     "led_matrix": {
-        "driver": "snled27351"
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "band": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "wave_left_right": true,
+            "wave_up_down": true
+        },
+        "driver": "snled27351",
+        "sleep": true,
+        "react_on_keyup": true
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
diff --git a/keyboards/keychron/s1/ansi/white/white.c b/keyboards/keychron/s1/ansi/white/white.c
index b3a49ae9eb0..69623863d1f 100644
--- a/keyboards/keychron/s1/ansi/white/white.c
+++ b/keyboards/keychron/s1/ansi/white/white.c
@@ -20,100 +20,100 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[LED_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  LED address
  *   |  |   */
-    {0, F_1},  // esc
-    {0, F_2},  // f1
-    {0, F_3},  // f2
-    {0, F_4},  // f3
-    {0, F_5},  // f4
-    {0, F_6},  // f4
-    {0, F_7},  // f6
-    {0, F_8},  // f7
-    {0, F_9},  // f8
-    {0, F_10}, // f9
-    {0, F_11}, // f10
-    {0, F_12}, // f11
-    {0, F_13}, // f12
-    {0, F_14}, // print
-    {0, F_15}, // del
-    {0, F_16}, // light
+    {0, CB6_CA1},  // esc
+    {0, CB6_CA2},  // f1
+    {0, CB6_CA3},  // f2
+    {0, CB6_CA4},  // f3
+    {0, CB6_CA5},  // f4
+    {0, CB6_CA6},  // f4
+    {0, CB6_CA7},  // f6
+    {0, CB6_CA8},  // f7
+    {0, CB6_CA9},  // f8
+    {0, CB6_CA10}, // f9
+    {0, CB6_CA11}, // f10
+    {0, CB6_CA12}, // f11
+    {0, CB6_CA13}, // f12
+    {0, CB6_CA14}, // print
+    {0, CB6_CA15}, // del
+    {0, CB6_CA16}, // light
 
-    {0, E_1},  // ~
-    {0, E_2},  // 1!
-    {0, E_3},  // 2@
-    {0, E_4},  // 3#
-    {0, E_5},  // 4$
-    {0, E_6},  // 5%
-    {0, E_7},  // 6^
-    {0, E_8},  // 7&
-    {0, E_9},  // 8*
-    {0, E_10}, // 9(
-    {0, E_11}, // 0)
-    {0, E_12}, // -_
-    {0, E_13}, // =+
-    {0, E_14}, // back space
-    {0, E_16}, // page up
+    {0, CB5_CA1},  // ~
+    {0, CB5_CA2},  // 1!
+    {0, CB5_CA3},  // 2@
+    {0, CB5_CA4},  // 3#
+    {0, CB5_CA5},  // 4$
+    {0, CB5_CA6},  // 5%
+    {0, CB5_CA7},  // 6^
+    {0, CB5_CA8},  // 7&
+    {0, CB5_CA9},  // 8*
+    {0, CB5_CA10}, // 9(
+    {0, CB5_CA11}, // 0)
+    {0, CB5_CA12}, // -_
+    {0, CB5_CA13}, // =+
+    {0, CB5_CA14}, // back space
+    {0, CB5_CA16}, // page up
 
-    {0, D_1},  // tab
-    {0, D_2},  // q
-    {0, D_3},  // w
-    {0, D_4},  // e
-    {0, D_5},  // r
-    {0, D_6},  // t
-    {0, D_7},  // y
-    {0, D_8},  // u
-    {0, D_9},  // i
-    {0, D_10}, // o
-    {0, D_11}, // p
-    {0, D_12}, // [{
-    {0, D_13}, // ]}
-    {0, D_14}, // |
-    {0, D_16}, // page down
+    {0, CB4_CA1},  // tab
+    {0, CB4_CA2},  // q
+    {0, CB4_CA3},  // w
+    {0, CB4_CA4},  // e
+    {0, CB4_CA5},  // r
+    {0, CB4_CA6},  // t
+    {0, CB4_CA7},  // y
+    {0, CB4_CA8},  // u
+    {0, CB4_CA9},  // i
+    {0, CB4_CA10}, // o
+    {0, CB4_CA11}, // p
+    {0, CB4_CA12}, // [{
+    {0, CB4_CA13}, // ]}
+    {0, CB4_CA14}, // |
+    {0, CB4_CA16}, // page down
 
-    {0, C_1},  // caps lock
-    {0, C_2},  // a
-    {0, C_3},  // s
-    {0, C_4},  // d
-    {0, C_5},  // f
-    {0, C_6},  // g
-    {0, C_7},  // h
-    {0, C_8},  // j
-    {0, C_9},  // k
-    {0, C_10}, // l
-    {0, C_11}, // ;:
-    {0, C_12}, // '"
-    {0, C_14}, // enter
-    {0, C_16}, // home
+    {0, CB3_CA1},  // caps lock
+    {0, CB3_CA2},  // a
+    {0, CB3_CA3},  // s
+    {0, CB3_CA4},  // d
+    {0, CB3_CA5},  // f
+    {0, CB3_CA6},  // g
+    {0, CB3_CA7},  // h
+    {0, CB3_CA8},  // j
+    {0, CB3_CA9},  // k
+    {0, CB3_CA10}, // l
+    {0, CB3_CA11}, // ;:
+    {0, CB3_CA12}, // '"
+    {0, CB3_CA14}, // enter
+    {0, CB3_CA16}, // home
 
-    {0, B_1},  // left shift
-    {0, B_3},  // z
-    {0, B_4},  // x
-    {0, B_5},  // c
-    {0, B_6},  // v
-    {0, B_7},  // b
-    {0, B_8},  // b
-    {0, B_9},  // n
-    {0, B_10}, // m
-    {0, B_11}, // ,<
-    {0, B_12}, // .>
-    {0, B_13}, // right shift
-    {0, B_14}, // up
-    {0, B_16}, // end
+    {0, CB2_CA1},  // left shift
+    {0, CB2_CA3},  // z
+    {0, CB2_CA4},  // x
+    {0, CB2_CA5},  // c
+    {0, CB2_CA6},  // v
+    {0, CB2_CA7},  // b
+    {0, CB2_CA8},  // b
+    {0, CB2_CA9},  // n
+    {0, CB2_CA10}, // m
+    {0, CB2_CA11}, // ,<
+    {0, CB2_CA12}, // .>
+    {0, CB2_CA13}, // right shift
+    {0, CB2_CA14}, // up
+    {0, CB2_CA16}, // end
 
-    {0, A_1},  // left
-    {0, A_2},  // left command
-    {0, A_3},  // left optin
-    {0, A_7},  // space
-    {0, A_10}, // right command
-    {0, A_11}, // fn
-    {0, A_12}, // right ctrl
-    {0, A_13}, // left
-    {0, A_14}, // down
-    {0, A_16}, // right
+    {0, CB1_CA1},  // left
+    {0, CB1_CA2},  // left command
+    {0, CB1_CA3},  // left optin
+    {0, CB1_CA7},  // space
+    {0, CB1_CA10}, // right command
+    {0, CB1_CA11}, // fn
+    {0, CB1_CA12}, // right ctrl
+    {0, CB1_CA13}, // left
+    {0, CB1_CA14}, // down
+    {0, CB1_CA16}, // right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/s1/config.h b/keyboards/keychron/s1/config.h
index 8c983895227..014faffb92d 100644
--- a/keyboards/keychron/s1/config.h
+++ b/keyboards/keychron/s1/config.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5,4} }
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
 #define I2C1_TIMINGR_SCLDEL 3U
diff --git a/keyboards/keychron/s1/info.json b/keyboards/keychron/s1/info.json
new file mode 100644
index 00000000000..c490aeeb28f
--- /dev/null
+++ b/keyboards/keychron/s1/info.json
@@ -0,0 +1,10 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    }
+}
diff --git a/keyboards/keychron/s1/s1.c b/keyboards/keychron/s1/s1.c
index d8488dd6ea6..2f1b905505f 100644
--- a/keyboards/keychron/s1/s1.c
+++ b/keyboards/keychron/s1/s1.c
@@ -16,15 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/v1/ansi/ansi.c b/keyboards/keychron/v1/ansi/ansi.c
index ed8a6ed1af9..a78d5dd4d78 100644
--- a/keyboards/keychron/v1/ansi/ansi.c
+++ b/keyboards/keychron/v1/ansi/ansi.c
@@ -20,100 +20,100 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/ansi/config.h b/keyboards/keychron/v1/ansi/config.h
index 5d10cae8864..2040fa3862d 100644
--- a/keyboards/keychron/v1/ansi/config.h
+++ b/keyboards/keychron/v1/ansi/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 37
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 
diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json
index 34fdd6ac31a..db2526e244e 100644
--- a/keyboards/keychron/v1/ansi/info.json
+++ b/keyboards/keychron/v1/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0310",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
index ed8a6ed1af9..a78d5dd4d78 100644
--- a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
@@ -20,100 +20,100 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/ansi_encoder/config.h b/keyboards/keychron/v1/ansi_encoder/config.h
index ea0733eeaf7..242e94583b6 100644
--- a/keyboards/keychron/v1/ansi_encoder/config.h
+++ b/keyboards/keychron/v1/ansi_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 37
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 
diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json
index 43e07609ae8..621010039d6 100644
--- a/keyboards/keychron/v1/ansi_encoder/info.json
+++ b/keyboards/keychron/v1/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0311",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v1/config.h b/keyboards/keychron/v1/config.h
index e5b6805859e..80e01e02912 100644
--- a/keyboards/keychron/v1/config.h
+++ b/keyboards/keychron/v1/config.h
@@ -25,12 +25,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5,4} }
-
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
@@ -43,62 +37,3 @@
 #define I2C1_TIMINGR_SCLL 51U
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/v1/info.json b/keyboards/keychron/v1/info.json
new file mode 100644
index 00000000000..94a45db562d
--- /dev/null
+++ b/keyboards/keychron/v1/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/v1/iso/config.h b/keyboards/keychron/v1/iso/config.h
index acb35ac7ac6..e10bd258aec 100644
--- a/keyboards/keychron/v1/iso/config.h
+++ b/keyboards/keychron/v1/iso/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 
diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json
index 6dbf50a931c..9047aa2bb2f 100644
--- a/keyboards/keychron/v1/iso/info.json
+++ b/keyboards/keychron/v1/iso/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0312",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v1/iso/iso.c b/keyboards/keychron/v1/iso/iso.c
index 00909c85e36..a1095dcc926 100644
--- a/keyboards/keychron/v1/iso/iso.c
+++ b/keyboards/keychron/v1/iso/iso.c
@@ -20,101 +20,101 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/iso_encoder/config.h b/keyboards/keychron/v1/iso_encoder/config.h
index 1a928cd9b73..e5ac7f3fb4e 100644
--- a/keyboards/keychron/v1/iso_encoder/config.h
+++ b/keyboards/keychron/v1/iso_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 38
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 
diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json
index 1f009ac0c70..557585f82d9 100644
--- a/keyboards/keychron/v1/iso_encoder/info.json
+++ b/keyboards/keychron/v1/iso_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0313",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v1/iso_encoder/iso_encoder.c b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
index 00909c85e36..a1095dcc926 100644
--- a/keyboards/keychron/v1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
@@ -20,101 +20,101 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/jis/config.h b/keyboards/keychron/v1/jis/config.h
index ef778528fe4..3e719e37041 100644
--- a/keyboards/keychron/v1/jis/config.h
+++ b/keyboards/keychron/v1/jis/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D }
 
diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json
index 28425b5b50a..1678c93c668 100644
--- a/keyboards/keychron/v1/jis/info.json
+++ b/keyboards/keychron/v1/jis/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0314",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v1/jis/jis.c b/keyboards/keychron/v1/jis/jis.c
index 6bc647656d6..d3b3f9aa900 100644
--- a/keyboards/keychron/v1/jis/jis.c
+++ b/keyboards/keychron/v1/jis/jis.c
@@ -20,104 +20,104 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/jis_encoder/config.h b/keyboards/keychron/v1/jis_encoder/config.h
index 25db44a84c5..5709f1ba2e6 100644
--- a/keyboards/keychron/v1/jis_encoder/config.h
+++ b/keyboards/keychron/v1/jis_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D, 0xA0, 0xA0, 0x4D }
 
diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json
index 018f1545372..7064bcdd552 100644
--- a/keyboards/keychron/v1/jis_encoder/info.json
+++ b/keyboards/keychron/v1/jis_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0315",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v1/jis_encoder/jis_encoder.c b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
index 6bc647656d6..d3b3f9aa900 100644
--- a/keyboards/keychron/v1/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
@@ -20,104 +20,104 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/v1.c b/keyboards/keychron/v1/v1.c
index 79c59191747..7f93b37bcc3 100644
--- a/keyboards/keychron/v1/v1.c
+++ b/keyboards/keychron/v1/v1.c
@@ -16,15 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c
index 8b787aad18b..7a58d4deefb 100644
--- a/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c
@@ -20,106 +20,106 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_2,  A_2,  B_2},  // ESC
-    {0, C_3,  A_3,  B_3},  // F1
-    {0, C_4,  A_4,  B_4},  // F2
-    {0, C_5,  A_5,  B_5},  // F3
-    {0, C_6,  A_6,  B_6},  // F4
-    {0, C_7,  A_7,  B_7},  // F5
-    {0, C_8,  A_8,  B_8},  // F6
-    {0, C_9,  A_9,  B_9},  // F7
-    {0, C_10, A_10, B_10}, // F8
-    {0, C_11, A_11, B_11}, // F9
-    {0, C_12, A_12, B_12}, // F10
-    {0, C_13, A_13, B_13}, // F11
-    {0, C_14, A_14, B_14}, // F12
-    {0, C_15, A_15, B_15}, // INS
-    {0, C_16, A_16, B_16}, // DEL
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // ESC
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // F1
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // F2
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // F3
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // F4
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // F5
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // F6
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // F7
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
 
-    {0, I_1,  G_1,  H_1},  // M1
-    {0, I_2,  G_2,  H_2},  // `~
-    {0, I_3,  G_3,  H_3},  // 1!
-    {0, I_4,  G_4,  H_4},  // 2@
-    {0, I_5,  G_5,  H_5},  // 3#
-    {0, I_6,  G_6,  H_6},  // 4$
-    {0, I_7,  G_7,  H_7},  // 5%
-    {0, I_8,  G_8,  H_8},  // 6^
-    {0, I_9,  G_9,  H_9},  // 7&
-    {0, I_10, G_10, H_10}, // 8*
-    {0, I_11, G_11, H_11}, // 9(
-    {0, I_12, G_12, H_12}, // 0)
-    {0, I_13, G_13, H_13}, // -_
-    {0, I_14, G_14, H_14}, // =+
-    {0, I_15, G_15, H_15}, // BackSpace
-    {0, I_16, G_16, H_16}, // PgUp
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // M1
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // `~
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // 1!
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // 2@
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // 3#
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // 4$
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // 5%
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // 6^
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // 7&
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
 
-    {0, F_1,  D_1,  E_1},  // M2
-    {0, F_2,  D_2,  E_2},  // TAB
-    {0, F_3,  D_3,  E_3},  // Q
-    {0, F_4,  D_4,  E_4},  // W
-    {0, F_5,  D_5,  E_5},  // E
-    {0, F_6,  D_6,  E_6},  // R
-    {0, F_7,  D_7,  E_7},  // T
-    {0, F_8,  D_8,  E_8},  // Y
-    {0, F_9,  D_9,  E_9},  // U
-    {0, F_10, D_10, E_10}, // I
-    {0, F_11, D_11, E_11}, // O
-    {0, F_12, D_12, E_12}, // P
-    {0, F_13, D_13, E_13}, // [
-    {0, F_14, D_14, E_14}, // ]
-    {0, F_15, D_15, E_15}, // |
-    {0, F_16, D_16, E_16}, // PgDn
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // M2
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // TAB
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Q
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // W
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // E
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // R
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // T
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Y
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // U
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
 
-    {1, C_16, A_16, B_16}, // M3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_8,  A_8,  B_8},  // H
-    {1, C_7,  A_7,  B_7},  // J
-    {1, C_6,  A_6,  B_6},  // K
-    {1, C_5,  A_5,  B_5},  // L
-    {1, C_4,  A_4,  B_4},  // ;
-    {1, C_3,  A_3,  B_3},  // '
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // Home
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // H
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // J
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // K
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // L
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // ;
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // '
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Home
 
-    {1, I_16, G_16, H_16}, // M4
-    {1, I_15, G_15, H_15}, // Shift_L
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // B
-    {1, I_7,  G_7,  H_7},  // N
-    {1, I_6,  G_6,  H_6},  // M
-    {1, I_5,  G_5,  H_5},  // ,
-    {1, I_4,  G_4,  H_4},  // .
-    {1, I_3,  G_3,  H_3},  // ?
-    {1, I_2,  G_2,  H_2},  // Shift_R
-    {1, I_1,  G_1,  H_1},  // Up
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // B
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // N
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // M
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ,
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // .
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // ?
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Shift_R
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Up
 
-    {1, F_16, D_16, E_16}, // M5
-    {1, F_15, D_15, E_15}, // Ctrl_L
-    {1, F_14, D_14, E_14}, // Win_L
-    {1, F_13, D_13, E_13}, // Alt_L
-    {1, F_12, D_12, E_12}, // Space
-    {1, F_9,  D_9,  E_9},  // Fn
-    {1, F_8,  D_8,  E_8},  // Space
-    {1, F_7,  D_7,  E_7},  // Alt_R
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Fn
+    {1, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Space
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // Alt_R
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v10/ansi_encoder/config.h b/keyboards/keychron/v10/ansi_encoder/config.h
index 8b5595e4d6c..78b48be2173 100644
--- a/keyboards/keychron/v10/ansi_encoder/config.h
+++ b/keyboards/keychron/v10/ansi_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 47
-#define DRIVER_2_LED_TOTAL 41
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json
index a416601d028..6cbc00a7f61 100644
--- a/keyboards/keychron/v10/ansi_encoder/info.json
+++ b/keyboards/keychron/v10/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x03A1",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v10/config.h b/keyboards/keychron/v10/config.h
index d643049c03f..c084c4d47d7 100644
--- a/keyboards/keychron/v10/config.h
+++ b/keyboards/keychron/v10/config.h
@@ -43,68 +43,3 @@
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 #define SNLED27351_CURRENT_TUNE { 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A }
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5,5} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/v10/info.json b/keyboards/keychron/v10/info.json
new file mode 100644
index 00000000000..636ef2d9a23
--- /dev/null
+++ b/keyboards/keychron/v10/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [5, 5] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/v10/iso_encoder/config.h b/keyboards/keychron/v10/iso_encoder/config.h
index 75706949d61..66f54a1f142 100644
--- a/keyboards/keychron/v10/iso_encoder/config.h
+++ b/keyboards/keychron/v10/iso_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 47
-#define DRIVER_2_LED_TOTAL 42
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json
index 4c6b6580e06..30763236ba5 100644
--- a/keyboards/keychron/v10/iso_encoder/info.json
+++ b/keyboards/keychron/v10/iso_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x03A3",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v10/iso_encoder/iso_encoder.c b/keyboards/keychron/v10/iso_encoder/iso_encoder.c
index f7e0a10470b..359646b5426 100644
--- a/keyboards/keychron/v10/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v10/iso_encoder/iso_encoder.c
@@ -20,107 +20,107 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_2,  A_2,  B_2},  // ESC
-    {0, C_3,  A_3,  B_3},  // F1
-    {0, C_4,  A_4,  B_4},  // F2
-    {0, C_5,  A_5,  B_5},  // F3
-    {0, C_6,  A_6,  B_6},  // F4
-    {0, C_7,  A_7,  B_7},  // F5
-    {0, C_8,  A_8,  B_8},  // F6
-    {0, C_9,  A_9,  B_9},  // F7
-    {0, C_10, A_10, B_10}, // F8
-    {0, C_11, A_11, B_11}, // F9
-    {0, C_12, A_12, B_12}, // F10
-    {0, C_13, A_13, B_13}, // F11
-    {0, C_14, A_14, B_14}, // F12
-    {0, C_15, A_15, B_15}, // INS
-    {0, C_16, A_16, B_16}, // DEL
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // ESC
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // F1
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // F2
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // F3
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // F4
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // F5
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // F6
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // F7
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
 
-    {0, I_1,  G_1,  H_1},  // M1
-    {0, I_2,  G_2,  H_2},  // `~
-    {0, I_3,  G_3,  H_3},  // 1!
-    {0, I_4,  G_4,  H_4},  // 2@
-    {0, I_5,  G_5,  H_5},  // 3#
-    {0, I_6,  G_6,  H_6},  // 4$
-    {0, I_7,  G_7,  H_7},  // 5%
-    {0, I_8,  G_8,  H_8},  // 6^
-    {0, I_9,  G_9,  H_9},  // 7&
-    {0, I_10, G_10, H_10}, // 8*
-    {0, I_11, G_11, H_11}, // 9(
-    {0, I_12, G_12, H_12}, // 0)
-    {0, I_13, G_13, H_13}, // -_
-    {0, I_14, G_14, H_14}, // =+
-    {0, I_15, G_15, H_15}, // BackSpace
-    {0, I_16, G_16, H_16}, // PgUp
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // M1
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // `~
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // 1!
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // 2@
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // 3#
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // 4$
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // 5%
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // 6^
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // 7&
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
 
-    {0, F_1,  D_1,  E_1},  // M2
-    {0, F_2,  D_2,  E_2},  // TAB
-    {0, F_3,  D_3,  E_3},  // Q
-    {0, F_4,  D_4,  E_4},  // W
-    {0, F_5,  D_5,  E_5},  // E
-    {0, F_6,  D_6,  E_6},  // R
-    {0, F_7,  D_7,  E_7},  // T
-    {0, F_8,  D_8,  E_8},  // Y
-    {0, F_9,  D_9,  E_9},  // U
-    {0, F_10, D_10, E_10}, // I
-    {0, F_11, D_11, E_11}, // O
-    {0, F_12, D_12, E_12}, // P
-    {0, F_13, D_13, E_13}, // [
-    {0, F_14, D_14, E_14}, // ]
-    {0, F_16, D_16, E_16}, // PgDn
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // M2
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // TAB
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Q
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // W
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // E
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // R
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // T
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Y
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // U
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
 
-    {1, C_16, A_16, B_16}, // M3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_8,  A_8,  B_8},  // H
-    {1, C_7,  A_7,  B_7},  // J
-    {1, C_6,  A_6,  B_6},  // K
-    {1, C_5,  A_5,  B_5},  // L
-    {1, C_4,  A_4,  B_4},  // ;
-    {1, C_3,  A_3,  B_3},  // '
-    {0, F_15, D_15, E_15}, // |
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // Home
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // H
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // J
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // K
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // L
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // ;
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // '
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Home
 
-    {1, I_16, G_16, H_16}, // M4
-    {1, I_15, G_15, H_15}, // Shift_L
-    {1, I_14, G_14, H_14},
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // B
-    {1, I_7,  G_7,  H_7},  // N
-    {1, I_6,  G_6,  H_6},  // M
-    {1, I_5,  G_5,  H_5},  // ,
-    {1, I_4,  G_4,  H_4},  // .
-    {1, I_3,  G_3,  H_3},  // ?
-    {1, I_2,  G_2,  H_2},  // Shift_R
-    {1, I_1,  G_1,  H_1},  // Up
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+    {1, CB9_CA14, CB7_CA14, CB8_CA14},
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // B
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // N
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // M
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ,
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // .
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // ?
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Shift_R
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Up
 
-    {1, F_16, D_16, E_16}, // M5
-    {1, F_15, D_15, E_15}, // Ctrl_L
-    {1, F_14, D_14, E_14}, // Win_L
-    {1, F_13, D_13, E_13}, // Alt_L
-    {1, F_12, D_12, E_12}, // Space
-    {1, F_9,  D_9,  E_9},  // Fn
-    {1, F_8,  D_8,  E_8},  // Space
-    {1, F_7,  D_7,  E_7},  // Alt_R
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Fn
+    {1, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Space
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // Alt_R
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v10/v10.c b/keyboards/keychron/v10/v10.c
index 2e1e3f090f0..1bde388544c 100644
--- a/keyboards/keychron/v10/v10.c
+++ b/keyboards/keychron/v10/v10.c
@@ -16,15 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111011111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/v2/ansi/ansi.c b/keyboards/keychron/v2/ansi/ansi.c
index d98a96fdf95..722aa27b470 100644
--- a/keyboards/keychron/v2/ansi/ansi.c
+++ b/keyboards/keychron/v2/ansi/ansi.c
@@ -20,84 +20,84 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/ansi/config.h b/keyboards/keychron/v2/ansi/config.h
index 094038d5b30..6ca7d7fb081 100644
--- a/keyboards/keychron/v2/ansi/config.h
+++ b/keyboards/keychron/v2/ansi/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 34
-#define DRIVER_2_LED_TOTAL 33
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60 }
 
diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/info.json
index 3b54b90201c..528d4378294 100644
--- a/keyboards/keychron/v2/ansi/info.json
+++ b/keyboards/keychron/v2/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0320",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
index 64153d42514..6203483285f 100644
--- a/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
@@ -20,84 +20,84 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/ansi_encoder/config.h b/keyboards/keychron/v2/ansi_encoder/config.h
index 6ee6d1e7c66..61c6d709bfa 100644
--- a/keyboards/keychron/v2/ansi_encoder/config.h
+++ b/keyboards/keychron/v2/ansi_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 34
-#define DRIVER_2_LED_TOTAL 33
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/info.json
index f1998272e99..42efdae9844 100644
--- a/keyboards/keychron/v2/ansi_encoder/info.json
+++ b/keyboards/keychron/v2/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0321",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/config.h b/keyboards/keychron/v2/config.h
index 7efbf8c549c..1cbc2e49af7 100644
--- a/keyboards/keychron/v2/config.h
+++ b/keyboards/keychron/v2/config.h
@@ -32,69 +32,4 @@
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4,4} }
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/v2/info.json b/keyboards/keychron/v2/info.json
new file mode 100644
index 00000000000..553146eb39e
--- /dev/null
+++ b/keyboards/keychron/v2/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/v2/iso/config.h b/keyboards/keychron/v2/iso/config.h
index b952607d83e..7a10ce6d653 100644
--- a/keyboards/keychron/v2/iso/config.h
+++ b/keyboards/keychron/v2/iso/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 34
-#define DRIVER_2_LED_TOTAL 34
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 29
diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/info.json
index cfc5ef3c5bf..171407e75f1 100644
--- a/keyboards/keychron/v2/iso/info.json
+++ b/keyboards/keychron/v2/iso/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0322",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/iso/iso.c b/keyboards/keychron/v2/iso/iso.c
index 37cac7337d2..aca0879838e 100644
--- a/keyboards/keychron/v2/iso/iso.c
+++ b/keyboards/keychron/v2/iso/iso.c
@@ -20,85 +20,85 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-	{1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+	{1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/iso_encoder/config.h b/keyboards/keychron/v2/iso_encoder/config.h
index f69d6834538..6b4cafa361d 100644
--- a/keyboards/keychron/v2/iso_encoder/config.h
+++ b/keyboards/keychron/v2/iso_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 34
-#define DRIVER_2_LED_TOTAL 34
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/info.json
index d5f630a3c36..75a8bf1f1ff 100644
--- a/keyboards/keychron/v2/iso_encoder/info.json
+++ b/keyboards/keychron/v2/iso_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0323",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/iso_encoder/iso_encoder.c b/keyboards/keychron/v2/iso_encoder/iso_encoder.c
index 37cac7337d2..aca0879838e 100644
--- a/keyboards/keychron/v2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v2/iso_encoder/iso_encoder.c
@@ -20,85 +20,85 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-	{1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+	{1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/jis/config.h b/keyboards/keychron/v2/jis/config.h
index 1b3fd5a27ad..4400cbf2525 100644
--- a/keyboards/keychron/v2/jis/config.h
+++ b/keyboards/keychron/v2/jis/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 36
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xBD, 0xBD, 0x5D, 0xBD, 0xBD, 0x5D, 0xBD, 0xBD, 0x5D, 0xBD, 0xBD, 0x5D }
 
diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/info.json
index 124cb0ecc61..64058d4c130 100644
--- a/keyboards/keychron/v2/jis/info.json
+++ b/keyboards/keychron/v2/jis/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0324",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/jis/jis.c b/keyboards/keychron/v2/jis/jis.c
index 42285e56cad..1269d9b1e69 100644
--- a/keyboards/keychron/v2/jis/jis.c
+++ b/keyboards/keychron/v2/jis/jis.c
@@ -18,88 +18,88 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/jis_encoder/config.h b/keyboards/keychron/v2/jis_encoder/config.h
index aacac818a40..2723c4e09c8 100644
--- a/keyboards/keychron/v2/jis_encoder/config.h
+++ b/keyboards/keychron/v2/jis_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 36
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0xBD, 0xBD, 0x5D, 0xBD, 0xBD, 0x5D, 0xBD, 0xBD, 0x5D, 0xBD, 0xBD, 0x5D }
 
diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/info.json
index d3df93819f2..12fadfec730 100644
--- a/keyboards/keychron/v2/jis_encoder/info.json
+++ b/keyboards/keychron/v2/jis_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0325",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/jis_encoder/jis_encoder.c b/keyboards/keychron/v2/jis_encoder/jis_encoder.c
index 5ccbb807cbd..85aaf165f69 100644
--- a/keyboards/keychron/v2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v2/jis_encoder/jis_encoder.c
@@ -18,88 +18,88 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/v2.c b/keyboards/keychron/v2/v2.c
index 8d337e2dac1..661bbf8af8e 100644
--- a/keyboards/keychron/v2/v2.c
+++ b/keyboards/keychron/v2/v2.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/v3/ansi/ansi.c b/keyboards/keychron/v3/ansi/ansi.c
index 16d6b77131f..7c476786193 100644
--- a/keyboards/keychron/v3/ansi/ansi.c
+++ b/keyboards/keychron/v3/ansi/ansi.c
@@ -18,105 +18,105 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v3/ansi/config.h b/keyboards/keychron/v3/ansi/config.h
index ba64aa96dab..8dea8209160 100644
--- a/keyboards/keychron/v3/ansi/config.h
+++ b/keyboards/keychron/v3/ansi/config.h
@@ -25,11 +25,6 @@
 /* If PH3 used with a stronger pull resistor then the following definition needs be included */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 48
-#define DRIVER_2_LED_TOTAL 39
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x95, 0x95, 0x55, 0x95, 0x95, 0x55, 0x95, 0x95, 0x55, 0x95, 0x95, 0x55 }
 
diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/info.json
index 49792690a73..f01b2394a7b 100644
--- a/keyboards/keychron/v3/ansi/info.json
+++ b/keyboards/keychron/v3/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0330",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c
index 39fa3545394..d85708937aa 100644
--- a/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c
@@ -18,106 +18,106 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    // {0, I_14,   G_14,   H_14}, // Encoder
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    // {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // Encoder
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v3/ansi_encoder/config.h b/keyboards/keychron/v3/ansi_encoder/config.h
index 6310f181a08..9f2de455b4b 100644
--- a/keyboards/keychron/v3/ansi_encoder/config.h
+++ b/keyboards/keychron/v3/ansi_encoder/config.h
@@ -22,11 +22,6 @@
 #define MATRIX_COL_PINS \
     { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 48
-#define DRIVER_2_LED_TOTAL 39
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json
index ad46ae7a62e..2fc194feccd 100644
--- a/keyboards/keychron/v3/ansi_encoder/info.json
+++ b/keyboards/keychron/v3/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0331",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v3/config.h b/keyboards/keychron/v3/config.h
index d3e02d8f81b..bfefedfac7f 100644
--- a/keyboards/keychron/v3/config.h
+++ b/keyboards/keychron/v3/config.h
@@ -31,68 +31,3 @@
 #define I2C1_TIMINGR_SCLL 51U
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5, 4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/v3/info.json b/keyboards/keychron/v3/info.json
new file mode 100644
index 00000000000..94a45db562d
--- /dev/null
+++ b/keyboards/keychron/v3/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/v3/iso/config.h b/keyboards/keychron/v3/iso/config.h
index ca0a03a7102..9ec20f67437 100644
--- a/keyboards/keychron/v3/iso/config.h
+++ b/keyboards/keychron/v3/iso/config.h
@@ -25,10 +25,5 @@
 /* If PH3 used with a stronger pull resistor then the following definition needs be included */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 48
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 49
diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/info.json
index 56796b5eb22..f57ccbd7d0a 100644
--- a/keyboards/keychron/v3/iso/info.json
+++ b/keyboards/keychron/v3/iso/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0332",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v3/iso/iso.c b/keyboards/keychron/v3/iso/iso.c
index 24b406467af..83798392c6b 100644
--- a/keyboards/keychron/v3/iso/iso.c
+++ b/keyboards/keychron/v3/iso/iso.c
@@ -18,106 +18,106 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v3/iso_encoder/config.h b/keyboards/keychron/v3/iso_encoder/config.h
index 7033a2093aa..1769ffd4d2c 100644
--- a/keyboards/keychron/v3/iso_encoder/config.h
+++ b/keyboards/keychron/v3/iso_encoder/config.h
@@ -22,11 +22,6 @@
 #define MATRIX_COL_PINS \
     { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 48
-#define DRIVER_2_LED_TOTAL 40
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json
index 057e4a8d7d7..1edb29a7410 100644
--- a/keyboards/keychron/v3/iso_encoder/info.json
+++ b/keyboards/keychron/v3/iso_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0333",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v3/iso_encoder/iso_encoder.c b/keyboards/keychron/v3/iso_encoder/iso_encoder.c
index 53fe99aac01..ef0567dbe14 100644
--- a/keyboards/keychron/v3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v3/iso_encoder/iso_encoder.c
@@ -18,106 +18,106 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v3/jis/config.h b/keyboards/keychron/v3/jis/config.h
index 10c77c74f02..802a70b646e 100644
--- a/keyboards/keychron/v3/jis/config.h
+++ b/keyboards/keychron/v3/jis/config.h
@@ -25,11 +25,6 @@
 /* If PH3 used with a stronger pull resistor then the following definition needs be included */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 48
-#define DRIVER_2_LED_TOTAL 43
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
 
diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/info.json
index d5601a3b340..cce7372c317 100644
--- a/keyboards/keychron/v3/jis/info.json
+++ b/keyboards/keychron/v3/jis/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0334",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v3/jis/jis.c b/keyboards/keychron/v3/jis/jis.c
index 70dbf812fa3..c04827dc5d9 100644
--- a/keyboards/keychron/v3/jis/jis.c
+++ b/keyboards/keychron/v3/jis/jis.c
@@ -18,109 +18,109 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |    G location
  *   |  |    |    B location
  *   |  |    |    | */
-    {0, I_1, G_1, H_1},    // ESC
-    {0, I_2, G_2, H_2},    // F1
-    {0, I_3, G_3, H_3},    // F2
-    {0, I_4, G_4, H_4},    // F3
-    {0, I_5, G_5, H_5},    // F4
-    {0, I_6, G_6, H_6},    // F5
-    {0, I_7, G_7, H_7},    // F6
-    {0, I_8, G_8, H_8},    // F7
-    {0, I_9, G_9, H_9},    // F8
-    {0, I_10, G_10, H_10}, // F9
-    {0, I_11, G_11, H_11}, // F10
-    {0, I_12, G_12, H_12}, // F11
-    {0, I_13, G_13, H_13}, // F12
-    {0, I_15, G_15, H_15}, // Print
-    {0, I_16, G_16, H_16}, // Cortana
-    {1, I_15, G_15, H_15}, // Light
+    {0, CB9_CA1, CB7_CA1, CB8_CA1},    // ESC
+    {0, CB9_CA2, CB7_CA2, CB8_CA2},    // F1
+    {0, CB9_CA3, CB7_CA3, CB8_CA3},    // F2
+    {0, CB9_CA4, CB7_CA4, CB8_CA4},    // F3
+    {0, CB9_CA5, CB7_CA5, CB8_CA5},    // F4
+    {0, CB9_CA6, CB7_CA6, CB8_CA6},    // F5
+    {0, CB9_CA7, CB7_CA7, CB8_CA7},    // F6
+    {0, CB9_CA8, CB7_CA8, CB8_CA8},    // F7
+    {0, CB9_CA9, CB7_CA9, CB8_CA9},    // F8
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F9
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F10
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F11
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F12
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // Print
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // Cortana
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Light
 
-    {0, C_1, A_1, B_1},    // `~
-    {0, C_2, A_2, B_2},    // 1!
-    {0, C_3, A_3, B_3},    // 2@
-    {0, C_4, A_4, B_4},    // 3#
-    {0, C_5, A_5, B_5},    // 4$
-    {0, C_6, A_6, B_6},    // 5%
-    {0, C_7, A_7, B_7},    // 6^
-    {0, C_8, A_8, B_8},    // 7&
-    {0, C_9, A_9, B_9},    // 8*
-    {0, C_10, A_10, B_10}, // 9()
-    {0, C_11, A_11, B_11}, // 0)
-    {0, C_12, A_12, B_12}, // -_
-    {0, C_13, A_13, B_13}, // =+
-    {0, C_14, A_14, B_14}, // /
-    {0, I_14, G_14, H_14}, // Backspace
-    {0, C_15, A_15, B_15}, // Ins
-    {0, C_16, A_16, B_16}, // Home
-    {1, I_16, G_16, H_16}, // Page Up
+    {0, CB3_CA1, CB1_CA1, CB2_CA1},    // `~
+    {0, CB3_CA2, CB1_CA2, CB2_CA2},    // 1!
+    {0, CB3_CA3, CB1_CA3, CB2_CA3},    // 2@
+    {0, CB3_CA4, CB1_CA4, CB2_CA4},    // 3#
+    {0, CB3_CA5, CB1_CA5, CB2_CA5},    // 4$
+    {0, CB3_CA6, CB1_CA6, CB2_CA6},    // 5%
+    {0, CB3_CA7, CB1_CA7, CB2_CA7},    // 6^
+    {0, CB3_CA8, CB1_CA8, CB2_CA8},    // 7&
+    {0, CB3_CA9, CB1_CA9, CB2_CA9},    // 8*
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9()
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // /
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Backspace
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Ins
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Home
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Page Up
 
-    {0, F_1, D_1, E_1},    // tab
-    {0, F_2, D_2, E_2},    // Q
-    {0, F_3, D_3, E_3},    // W
-    {0, F_4, D_4, E_4},    // E
-    {0, F_5, D_5, E_5},    // R
-    {0, F_6, D_6, E_6},    // T
-    {0, F_7, D_7, E_7},    // Y
-    {0, F_8, D_8, E_8},    // U
-    {0, F_9, D_9, E_9},    // I
-    {0, F_10, D_10, E_10}, // O
-    {0, F_11, D_11, E_11}, // P
-    {0, F_12, D_12, E_12}, // [{
-    {0, F_13, D_13, E_13}, // }}
-    {0, F_15, D_15, E_15}, // Del
-    {0, F_16, D_16, E_16}, // End
-    {1, I_13, G_13, H_13}, // Page Down
+    {0, CB6_CA1, CB4_CA1, CB5_CA1},    // tab
+    {0, CB6_CA2, CB4_CA2, CB5_CA2},    // Q
+    {0, CB6_CA3, CB4_CA3, CB5_CA3},    // W
+    {0, CB6_CA4, CB4_CA4, CB5_CA4},    // E
+    {0, CB6_CA5, CB4_CA5, CB5_CA5},    // R
+    {0, CB6_CA6, CB4_CA6, CB5_CA6},    // T
+    {0, CB6_CA7, CB4_CA7, CB5_CA7},    // Y
+    {0, CB6_CA8, CB4_CA8, CB5_CA8},    // U
+    {0, CB6_CA9, CB4_CA9, CB5_CA9},    // I
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // O
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // P
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // [{
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // }}
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Del
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // End
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Page Down
 
-    {1, I_1, G_1, H_1},    // Cpas
-    {1, I_2, G_2, H_2},    // A
-    {1, I_3, G_3, H_3},    // S
-    {1, I_4, G_4, H_4},    // D
-    {1, I_5, G_5, H_5},    // F
-    {1, I_6, G_6, H_6},    // G
-    {1, I_7, G_7, H_7},    // H
-    {1, I_8, G_8, H_8},    // J
-    {1, I_9, G_9, H_9},    // K
-    {1, I_10, G_10, H_10}, // L
-    {1, I_11, G_11, H_11}, // ;
-    {1, I_12, G_12, H_12}, // :
-    {1, I_14, G_14, H_14}, // #~
-    {0, F_14, D_14, E_14}, // Enter
+    {1, CB9_CA1, CB7_CA1, CB8_CA1},    // Cpas
+    {1, CB9_CA2, CB7_CA2, CB8_CA2},    // A
+    {1, CB9_CA3, CB7_CA3, CB8_CA3},    // S
+    {1, CB9_CA4, CB7_CA4, CB8_CA4},    // D
+    {1, CB9_CA5, CB7_CA5, CB8_CA5},    // F
+    {1, CB9_CA6, CB7_CA6, CB8_CA6},    // G
+    {1, CB9_CA7, CB7_CA7, CB8_CA7},    // H
+    {1, CB9_CA8, CB7_CA8, CB8_CA8},    // J
+    {1, CB9_CA9, CB7_CA9, CB8_CA9},    // K
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // L
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // :
+    {1, CB9_CA14, CB7_CA14, CB8_CA14}, // #~
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Enter
 
-    {1, C_1, A_1, B_1},    // LShift
-    {1, C_3, A_3, B_3},    // Z
-    {1, C_4, A_4, B_4},    // X
-    {1, C_5, A_5, B_5},    // C
-    {1, C_6, A_6, B_6},    // V
-    {1, C_7, A_7, B_7},    // B
-    {1, C_8, A_8, B_8},    // N
-    {1, C_9, A_9, B_9},    // M
-    {1, C_10, A_10, B_10}, // ,<
-    {1, C_11, A_11, B_11}, // .>
-    {1, C_12, A_12, B_12}, // /?
-    {1, C_13, A_13, B_13}, // |
-    {1, C_14, A_14, B_14}, // RShift
-    {1, C_16, A_16, B_16}, // Up
+    {1, CB3_CA1, CB1_CA1, CB2_CA1},    // LShift
+    {1, CB3_CA3, CB1_CA3, CB2_CA3},    // Z
+    {1, CB3_CA4, CB1_CA4, CB2_CA4},    // X
+    {1, CB3_CA5, CB1_CA5, CB2_CA5},    // C
+    {1, CB3_CA6, CB1_CA6, CB2_CA6},    // V
+    {1, CB3_CA7, CB1_CA7, CB2_CA7},    // B
+    {1, CB3_CA8, CB1_CA8, CB2_CA8},    // N
+    {1, CB3_CA9, CB1_CA9, CB2_CA9},    // M
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // ,<
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // .>
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // /?
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // |
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // RShift
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Up
 
-    {1, F_1, D_1, E_1},    // LCtrl
-    {1, F_2, D_2, E_2},    // LWin
-    {1, F_3, D_3, E_3},    // LAlt
-    {1, F_4, D_4, E_4},    // NUm
-    {1, F_7, D_7, E_7},    // Space
-    {1, F_10, D_10, E_10}, // Jap
-    {1, F_11, D_11, E_11}, // RAlt
-    {1, F_12, D_12, E_12}, // RWin
-    {1, F_13, D_13, E_13}, // Fn
-    {1, F_14, D_14, E_14}, // RCtrl
-    {1, F_15, D_15, E_15}, // Left
-    {1, F_16, D_16, E_16}, // Down
-    {1, C_15, A_15, B_15}, // Right
+    {1, CB6_CA1, CB4_CA1, CB5_CA1},    // LCtrl
+    {1, CB6_CA2, CB4_CA2, CB5_CA2},    // LWin
+    {1, CB6_CA3, CB4_CA3, CB5_CA3},    // LAlt
+    {1, CB6_CA4, CB4_CA4, CB5_CA4},    // NUm
+    {1, CB6_CA7, CB4_CA7, CB5_CA7},    // Space
+    {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Jap
+    {1, CB6_CA11, CB4_CA11, CB5_CA11}, // RAlt
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // RWin
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Fn
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // RCtrl
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Left
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Down
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // Right
 };
 
 #    define __ NO_LED
diff --git a/keyboards/keychron/v3/jis_encoder/config.h b/keyboards/keychron/v3/jis_encoder/config.h
index 27f37cbed43..37684f0b6fe 100644
--- a/keyboards/keychron/v3/jis_encoder/config.h
+++ b/keyboards/keychron/v3/jis_encoder/config.h
@@ -22,11 +22,6 @@
 #define MATRIX_COL_PINS \
     { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 49
-#define DRIVER_2_LED_TOTAL 43
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 #define SNLED27351_CURRENT_TUNE \
     { 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44, 0x94, 0x94, 0x44 }
 
diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json
index 968c0396e9f..f9a9202eb00 100644
--- a/keyboards/keychron/v3/jis_encoder/info.json
+++ b/keyboards/keychron/v3/jis_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0335",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v3/jis_encoder/jis_encoder.c b/keyboards/keychron/v3/jis_encoder/jis_encoder.c
index cf1065eed97..bf2018d86f1 100644
--- a/keyboards/keychron/v3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v3/jis_encoder/jis_encoder.c
@@ -18,110 +18,110 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |    G location
  *   |  |    |    B location
  *   |  |    |    | */
-    {0, I_1, G_1, H_1},    // ESC
-    {0, I_2, G_2, H_2},    // F1
-    {0, I_3, G_3, H_3},    // F2
-    {0, I_4, G_4, H_4},    // F3
-    {0, I_5, G_5, H_5},    // F4
-    {0, I_6, G_6, H_6},    // F5
-    {0, I_7, G_7, H_7},    // F6
-    {0, I_8, G_8, H_8},    // F7
-    {0, I_9, G_9, H_9},    // F8
-    {0, I_10, G_10, H_10}, // F9
-    {0, I_11, G_11, H_11}, // F10
-    {0, I_12, G_12, H_12}, // F11
-    {0, I_13, G_13, H_13}, // F12
-    {0, I_14, G_14, H_14}, // Mute
-    {0, I_15, G_15, H_15}, // Print
-    {0, I_16, G_16, H_16}, // Cortana
-    {1, I_15, G_15, H_15}, // Light
+    {0, CB9_CA1, CB7_CA1, CB8_CA1},    // ESC
+    {0, CB9_CA2, CB7_CA2, CB8_CA2},    // F1
+    {0, CB9_CA3, CB7_CA3, CB8_CA3},    // F2
+    {0, CB9_CA4, CB7_CA4, CB8_CA4},    // F3
+    {0, CB9_CA5, CB7_CA5, CB8_CA5},    // F4
+    {0, CB9_CA6, CB7_CA6, CB8_CA6},    // F5
+    {0, CB9_CA7, CB7_CA7, CB8_CA7},    // F6
+    {0, CB9_CA8, CB7_CA8, CB8_CA8},    // F7
+    {0, CB9_CA9, CB7_CA9, CB8_CA9},    // F8
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F9
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F10
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F11
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F12
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Mute
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // Print
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // Cortana
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Light
 
-    {0, C_1, A_1, B_1},    // `~
-    {0, C_2, A_2, B_2},    // 1!
-    {0, C_3, A_3, B_3},    // 2@
-    {0, C_4, A_4, B_4},    // 3#
-    {0, C_5, A_5, B_5},    // 4$
-    {0, C_6, A_6, B_6},    // 5%
-    {0, C_7, A_7, B_7},    // 6^
-    {0, C_8, A_8, B_8},    // 7&
-    {0, C_9, A_9, B_9},    // 8*
-    {0, C_10, A_10, B_10}, // 9()
-    {0, C_11, A_11, B_11}, // 0)
-    {0, C_12, A_12, B_12}, // -_
-    {0, C_13, A_13, B_13}, // =+
-    {0, C_14, A_14, B_14}, // |
-    {1, F_6, D_6, E_6},    // Backspace
-    {0, C_15, A_15, B_15}, // Ins
-    {0, C_16, A_16, B_16}, // Home
-    {1, I_16, G_16, H_16}, // Page Up
+    {0, CB3_CA1, CB1_CA1, CB2_CA1},    // `~
+    {0, CB3_CA2, CB1_CA2, CB2_CA2},    // 1!
+    {0, CB3_CA3, CB1_CA3, CB2_CA3},    // 2@
+    {0, CB3_CA4, CB1_CA4, CB2_CA4},    // 3#
+    {0, CB3_CA5, CB1_CA5, CB2_CA5},    // 4$
+    {0, CB3_CA6, CB1_CA6, CB2_CA6},    // 5%
+    {0, CB3_CA7, CB1_CA7, CB2_CA7},    // 6^
+    {0, CB3_CA8, CB1_CA8, CB2_CA8},    // 7&
+    {0, CB3_CA9, CB1_CA9, CB2_CA9},    // 8*
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9()
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // |
+    {1, CB6_CA6, CB4_CA6, CB5_CA6},    // Backspace
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Ins
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Home
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Page Up
 
-    {0, F_1, D_1, E_1},    // tab
-    {0, F_2, D_2, E_2},    // Q
-    {0, F_3, D_3, E_3},    // W
-    {0, F_4, D_4, E_4},    // E
-    {0, F_5, D_5, E_5},    // R
-    {0, F_6, D_6, E_6},    // T
-    {0, F_7, D_7, E_7},    // Y
-    {0, F_8, D_8, E_8},    // U
-    {0, F_9, D_9, E_9},    // I
-    {0, F_10, D_10, E_10}, // O
-    {0, F_11, D_11, E_11}, // P
-    {0, F_12, D_12, E_12}, // [{
-    {0, F_13, D_13, E_13}, // }}
-    {0, F_15, D_15, E_15}, // Del
-    {0, F_16, D_16, E_16}, // End
-    {1, I_13, G_13, H_13}, // Page Down
+    {0, CB6_CA1, CB4_CA1, CB5_CA1},    // tab
+    {0, CB6_CA2, CB4_CA2, CB5_CA2},    // Q
+    {0, CB6_CA3, CB4_CA3, CB5_CA3},    // W
+    {0, CB6_CA4, CB4_CA4, CB5_CA4},    // E
+    {0, CB6_CA5, CB4_CA5, CB5_CA5},    // R
+    {0, CB6_CA6, CB4_CA6, CB5_CA6},    // T
+    {0, CB6_CA7, CB4_CA7, CB5_CA7},    // Y
+    {0, CB6_CA8, CB4_CA8, CB5_CA8},    // U
+    {0, CB6_CA9, CB4_CA9, CB5_CA9},    // I
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // O
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // P
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // [{
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // }}
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Del
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // End
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Page Down
 
-    {1, I_1, G_1, H_1},    // Cpas
-    {1, I_2, G_2, H_2},    // A
-    {1, I_3, G_3, H_3},    // S
-    {1, I_4, G_4, H_4},    // D
-    {1, I_5, G_5, H_5},    // F
-    {1, I_6, G_6, H_6},    // G
-    {1, I_7, G_7, H_7},    // H
-    {1, I_8, G_8, H_8},    // J
-    {1, I_9, G_9, H_9},    // K
-    {1, I_10, G_10, H_10}, // L
-    {1, I_11, G_11, H_11}, // ;
-    {1, I_12, G_12, H_12}, // :
-    {1, I_14, G_14, H_14}, // #~
-    {0, F_14, D_14, E_14}, // Enter
+    {1, CB9_CA1, CB7_CA1, CB8_CA1},    // Cpas
+    {1, CB9_CA2, CB7_CA2, CB8_CA2},    // A
+    {1, CB9_CA3, CB7_CA3, CB8_CA3},    // S
+    {1, CB9_CA4, CB7_CA4, CB8_CA4},    // D
+    {1, CB9_CA5, CB7_CA5, CB8_CA5},    // F
+    {1, CB9_CA6, CB7_CA6, CB8_CA6},    // G
+    {1, CB9_CA7, CB7_CA7, CB8_CA7},    // H
+    {1, CB9_CA8, CB7_CA8, CB8_CA8},    // J
+    {1, CB9_CA9, CB7_CA9, CB8_CA9},    // K
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // L
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // :
+    {1, CB9_CA14, CB7_CA14, CB8_CA14}, // #~
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Enter
 
-    {1, C_1, A_1, B_1},    // LShift
-    {1, C_3, A_3, B_3},    // Z
-    {1, C_4, A_4, B_4},    // X
-    {1, C_5, A_5, B_5},    // C
-    {1, C_6, A_6, B_6},    // V
-    {1, C_7, A_7, B_7},    // B
-    {1, C_8, A_8, B_8},    // N
-    {1, C_9, A_9, B_9},    // M
-    {1, C_10, A_10, B_10}, // ,<
-    {1, C_11, A_11, B_11}, // .>
-    {1, C_12, A_12, B_12}, // /?
-    {1, C_13, A_13, B_13}, // |
-    {1, C_14, A_14, B_14}, // RShift
-    {1, C_16, A_16, B_16}, // Up
+    {1, CB3_CA1, CB1_CA1, CB2_CA1},    // LShift
+    {1, CB3_CA3, CB1_CA3, CB2_CA3},    // Z
+    {1, CB3_CA4, CB1_CA4, CB2_CA4},    // X
+    {1, CB3_CA5, CB1_CA5, CB2_CA5},    // C
+    {1, CB3_CA6, CB1_CA6, CB2_CA6},    // V
+    {1, CB3_CA7, CB1_CA7, CB2_CA7},    // B
+    {1, CB3_CA8, CB1_CA8, CB2_CA8},    // N
+    {1, CB3_CA9, CB1_CA9, CB2_CA9},    // M
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // ,<
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // .>
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // /?
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // |
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // RShift
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Up
 
-    {1, F_1, D_1, E_1},    // LCtrl
-    {1, F_2, D_2, E_2},    // LWin
-    {1, F_3, D_3, E_3},    // LAlt
-    {1, F_4, D_4, E_4},    // NUm
-    {1, F_7, D_7, E_7},    // Space
-    {1, F_10, D_10, E_10}, // Jap
-    {1, F_11, D_11, E_11}, // RAlt
-    {1, F_12, D_12, E_12}, // RWin
-    {1, F_13, D_13, E_13}, // Fn
-    {1, F_14, D_14, E_14}, // RCtrl
-    {1, F_15, D_15, E_15}, // Left
-    {1, F_16, D_16, E_16}, // Down
-    {1, C_15, A_15, B_15}, // Right
+    {1, CB6_CA1, CB4_CA1, CB5_CA1},    // LCtrl
+    {1, CB6_CA2, CB4_CA2, CB5_CA2},    // LWin
+    {1, CB6_CA3, CB4_CA3, CB5_CA3},    // LAlt
+    {1, CB6_CA4, CB4_CA4, CB5_CA4},    // NUm
+    {1, CB6_CA7, CB4_CA7, CB5_CA7},    // Space
+    {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Jap
+    {1, CB6_CA11, CB4_CA11, CB5_CA11}, // RAlt
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // RWin
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Fn
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // RCtrl
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Left
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Down
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // Right
 };
 
 #    define __ NO_LED
diff --git a/keyboards/keychron/v3/v3.c b/keyboards/keychron/v3/v3.c
index 17ea8f0e979..4452556ca68 100644
--- a/keyboards/keychron/v3/v3.c
+++ b/keyboards/keychron/v3/v3.c
@@ -16,19 +16,6 @@
 
 #include "quantum.h"
 
-// clang-format off
-
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111101111,
-};
-
-// clang-format on
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/v4/ansi/ansi.c b/keyboards/keychron/v4/ansi/ansi.c
index 63264053805..7368144c8d8 100644
--- a/keyboards/keychron/v4/ansi/ansi.c
+++ b/keyboards/keychron/v4/ansi/ansi.c
@@ -20,78 +20,78 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_14,   G_14,   H_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v4/ansi/config.h b/keyboards/keychron/v4/ansi/config.h
index 3cbec723873..bc4da819228 100644
--- a/keyboards/keychron/v4/ansi/config.h
+++ b/keyboards/keychron/v4/ansi/config.h
@@ -16,9 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 61
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
 /* Enable CapsLcok LED*/
 #define CAPS_LOCK_LED_INDEX 28
diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/info.json
index 5fad0ca9b18..a8b980ddd6c 100644
--- a/keyboards/keychron/v4/ansi/info.json
+++ b/keyboards/keychron/v4/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0340",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v4/config.h b/keyboards/keychron/v4/config.h
index 8325317c270..04a5779dd90 100644
--- a/keyboards/keychron/v4/config.h
+++ b/keyboards/keychron/v4/config.h
@@ -29,69 +29,4 @@
 #define SNLED27351_CURRENT_TUNE \
     { 0xD0, 0xD0, 0x60, 0xD0, 0xD0, 0x60, 0xD0, 0xD0, 0x60, 0xD0, 0xD0, 0x60 }
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4,4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/v4/info.json b/keyboards/keychron/v4/info.json
new file mode 100644
index 00000000000..553146eb39e
--- /dev/null
+++ b/keyboards/keychron/v4/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/v4/iso/config.h b/keyboards/keychron/v4/iso/config.h
index db18729155d..2486473b2b0 100644
--- a/keyboards/keychron/v4/iso/config.h
+++ b/keyboards/keychron/v4/iso/config.h
@@ -16,9 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 62
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
 /* Enable CapsLcok LED*/
 #define CAPS_LOCK_LED_INDEX 27
diff --git a/keyboards/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/info.json
index a53d3ee6a45..81153c3621f 100644
--- a/keyboards/keychron/v4/iso/info.json
+++ b/keyboards/keychron/v4/iso/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0342",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v4/iso/iso.c b/keyboards/keychron/v4/iso/iso.c
index 9116135a4ac..dc6a0f44d0b 100644
--- a/keyboards/keychron/v4/iso/iso.c
+++ b/keyboards/keychron/v4/iso/iso.c
@@ -20,79 +20,79 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v4/v4.c b/keyboards/keychron/v4/v4.c
index 402eadf2d77..d020f6ab430 100644
--- a/keyboards/keychron/v4/v4.c
+++ b/keyboards/keychron/v4/v4.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b11111111111111,
-    0b11111111111111,
-    0b11111111111111,
-    0b11111111111111,
-    0b11111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/v5/ansi/ansi.c b/keyboards/keychron/v5/ansi/ansi.c
index 073fb0cde09..b38d5f508f7 100644
--- a/keyboards/keychron/v5/ansi/ansi.c
+++ b/keyboards/keychron/v5/ansi/ansi.c
@@ -20,118 +20,118 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v5/ansi/config.h b/keyboards/keychron/v5/ansi/config.h
index 7985d439015..ac522684978 100644
--- a/keyboards/keychron/v5/ansi/config.h
+++ b/keyboards/keychron/v5/ansi/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 55
-#define DRIVER_2_LED_TOTAL 45
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 54
diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json
index eb5cdca90b5..2f2e33fecdf 100644
--- a/keyboards/keychron/v5/ansi/info.json
+++ b/keyboards/keychron/v5/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0350",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c
index 62ebc3f7b30..bc68731d7de 100644
--- a/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c
@@ -20,118 +20,118 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    // {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    // {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    // {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    // {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v5/ansi_encoder/config.h b/keyboards/keychron/v5/ansi_encoder/config.h
index 6ce87e63ab8..c0648d56b27 100644
--- a/keyboards/keychron/v5/ansi_encoder/config.h
+++ b/keyboards/keychron/v5/ansi_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 53
-#define DRIVER_2_LED_TOTAL 45
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json
index 00079fca47a..1ed410eb7bf 100644
--- a/keyboards/keychron/v5/ansi_encoder/info.json
+++ b/keyboards/keychron/v5/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0351",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v5/config.h b/keyboards/keychron/v5/config.h
index 8c4128a43ef..622c9efe6cd 100644
--- a/keyboards/keychron/v5/config.h
+++ b/keyboards/keychron/v5/config.h
@@ -38,68 +38,3 @@
 
 #define SNLED27351_CURRENT_TUNE \
     { 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56 }
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5, 4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/v5/info.json b/keyboards/keychron/v5/info.json
new file mode 100644
index 00000000000..94a45db562d
--- /dev/null
+++ b/keyboards/keychron/v5/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/v5/iso/config.h b/keyboards/keychron/v5/iso/config.h
index 5074f47a8f1..90802270182 100644
--- a/keyboards/keychron/v5/iso/config.h
+++ b/keyboards/keychron/v5/iso/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 55
-#define DRIVER_2_LED_TOTAL 46
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 53
diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json
index badac7f49a0..522730b2684 100644
--- a/keyboards/keychron/v5/iso/info.json
+++ b/keyboards/keychron/v5/iso/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0352",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v5/iso/iso.c b/keyboards/keychron/v5/iso/iso.c
index 1552de7d476..d8f5ae329cd 100644
--- a/keyboards/keychron/v5/iso/iso.c
+++ b/keyboards/keychron/v5/iso/iso.c
@@ -20,119 +20,119 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v5/iso_encoder/config.h b/keyboards/keychron/v5/iso_encoder/config.h
index dab565612eb..bfaeff971d8 100644
--- a/keyboards/keychron/v5/iso_encoder/config.h
+++ b/keyboards/keychron/v5/iso_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 53
-#define DRIVER_2_LED_TOTAL 46
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json
index cbf77fc93aa..2d4cf28cd1d 100644
--- a/keyboards/keychron/v5/iso_encoder/info.json
+++ b/keyboards/keychron/v5/iso_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0353",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v5/iso_encoder/iso_encoder.c b/keyboards/keychron/v5/iso_encoder/iso_encoder.c
index 95eb62ae1f5..2d2a458577e 100644
--- a/keyboards/keychron/v5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v5/iso_encoder/iso_encoder.c
@@ -20,117 +20,117 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},  // `~
-    {0, C_2,    A_2,    B_2},  // 1!
-    {0, C_3,    A_3,    B_3},  // 2@
-    {0, C_4,    A_4,    B_4},  // 3#
-    {0, C_5,    A_5,    B_5},  // 4$
-    {0, C_6,    A_6,    B_6},  // 5%
-    {0, C_7,    A_7,    B_7},  // 6^
-    {0, C_8,    A_8,    B_8},  // 7&
-    {0, C_9,    A_9,    B_9},  // 8*
-    {0, C_10,   A_10,   B_10}, // 9(
-    {0, C_11,   A_11,   B_11}, // 0)
-    {0, C_12,   A_12,   B_12}, // -_
-    {0, C_13,   A_13,   B_13}, // =+
-    {0, C_14,   A_14,   B_14}, // BackSpace
-    {0, C_16,   A_16,   B_16}, // Numlock
-    {0, L_9,    J_9,    K_9},  // /
-    {0, L_10,   J_10,   K_10}, // *
-    {0, L_11,   J_11,   K_11}, // -
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // `~
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // 1!
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // 2@
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // 3#
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // 4$
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 5%
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 6^
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 7&
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 8*
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 9(
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 0)
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // -_
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // =+
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // BackSpace
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Numlock
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // /
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10}, // *
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11}, // -
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v5/v5.c b/keyboards/keychron/v5/v5.c
index 6d87524b233..050ea18c0cf 100644
--- a/keyboards/keychron/v5/v5.c
+++ b/keyboards/keychron/v5/v5.c
@@ -16,15 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111111111,
-    0b111111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/v6/ansi/ansi.c b/keyboards/keychron/v6/ansi/ansi.c
index a3f1032a1e5..2e055e57af8 100644
--- a/keyboards/keychron/v6/ansi/ansi.c
+++ b/keyboards/keychron/v6/ansi/ansi.c
@@ -18,126 +18,126 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v6/ansi/config.h b/keyboards/keychron/v6/ansi/config.h
index fa9d7e48b31..7f175792dfa 100644
--- a/keyboards/keychron/v6/ansi/config.h
+++ b/keyboards/keychron/v6/ansi/config.h
@@ -29,11 +29,6 @@
 /* Pin used index start of 74HC595 */
 #define PIN_START_74HC595 11
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 48
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED*/
 #define CAPS_LOCK_LED_INDEX 61
 
diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/info.json
index 3eee229ea87..8b2cc055a8a 100644
--- a/keyboards/keychron/v6/ansi/info.json
+++ b/keyboards/keychron/v6/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0360",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
index 02e0de0b3d4..1ebf9479124 100644
--- a/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
@@ -20,126 +20,126 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v6/ansi_encoder/config.h b/keyboards/keychron/v6/ansi_encoder/config.h
index 0d8d843d2f3..748fb4e72e1 100644
--- a/keyboards/keychron/v6/ansi_encoder/config.h
+++ b/keyboards/keychron/v6/ansi_encoder/config.h
@@ -31,11 +31,6 @@
 /* Pin used index start of 74HC595 */
 #define PIN_START_74HC595 10
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 48
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v6/config.h b/keyboards/keychron/v6/config.h
index eb2296a1728..eabfbf2640c 100644
--- a/keyboards/keychron/v6/config.h
+++ b/keyboards/keychron/v6/config.h
@@ -32,69 +32,3 @@
 
 /* Limit the maximum brigtness current of colour white to 500mA */
 #define SNLED27351_CURRENT_TUNE { 0xA8, 0xA8, 0x48, 0xA8, 0xA8, 0x48, 0xA8, 0xA8, 0x48, 0xA8, 0xA8, 0x48 }
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {5, 4} }
-#define SCAN_COUNT_MAX 100
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/v6/info.json b/keyboards/keychron/v6/info.json
new file mode 100644
index 00000000000..94a45db562d
--- /dev/null
+++ b/keyboards/keychron/v6/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [5, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/v6/iso/config.h b/keyboards/keychron/v6/iso/config.h
index 0a9528d03be..f47c2a08fc1 100644
--- a/keyboards/keychron/v6/iso/config.h
+++ b/keyboards/keychron/v6/iso/config.h
@@ -29,11 +29,6 @@
 /* Pin used index start of 74HC595 */
 #define PIN_START_74HC595 11
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 49
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED*/
 #define CAPS_LOCK_LED_INDEX 60
 
diff --git a/keyboards/keychron/v6/iso/iso.c b/keyboards/keychron/v6/iso/iso.c
index 7804ca36001..cc9dbd8c231 100644
--- a/keyboards/keychron/v6/iso/iso.c
+++ b/keyboards/keychron/v6/iso/iso.c
@@ -20,127 +20,127 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v6/iso_encoder/config.h b/keyboards/keychron/v6/iso_encoder/config.h
index 6e8069f7ece..d638be34ccc 100644
--- a/keyboards/keychron/v6/iso_encoder/config.h
+++ b/keyboards/keychron/v6/iso_encoder/config.h
@@ -31,11 +31,6 @@
 /* Pin used index start of 74HC595 */
 #define PIN_START_74HC595 10
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 60
-#define DRIVER_2_LED_TOTAL 49
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v6/iso_encoder/iso_encoder.c b/keyboards/keychron/v6/iso_encoder/iso_encoder.c
index bd9189f8b5e..f1a8e18acf5 100644
--- a/keyboards/keychron/v6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v6/iso_encoder/iso_encoder.c
@@ -20,127 +20,127 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v6/v6.c b/keyboards/keychron/v6/v6.c
index 0f9305d2d05..8aeab5e952f 100644
--- a/keyboards/keychron/v6/v6.c
+++ b/keyboards/keychron/v6/v6.c
@@ -16,15 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111111111,
-    0b11111111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/v7/ansi/ansi.c b/keyboards/keychron/v7/ansi/ansi.c
index 07a98622a45..4d0bedff097 100644
--- a/keyboards/keychron/v7/ansi/ansi.c
+++ b/keyboards/keychron/v7/ansi/ansi.c
@@ -20,89 +20,89 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_15,   G_15,   H_15},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v7/ansi/config.h b/keyboards/keychron/v7/ansi/config.h
index 277e505e065..e36809251a5 100644
--- a/keyboards/keychron/v7/ansi/config.h
+++ b/keyboards/keychron/v7/ansi/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 37
-#define DRIVER_2_LED_TOTAL 35
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 32
diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/info.json
index 4088a20ced0..ea01b3ff393 100644
--- a/keyboards/keychron/v7/ansi/info.json
+++ b/keyboards/keychron/v7/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0370",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v7/config.h b/keyboards/keychron/v7/config.h
index cff96774e33..849535d67ff 100644
--- a/keyboards/keychron/v7/config.h
+++ b/keyboards/keychron/v7/config.h
@@ -30,69 +30,4 @@
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 #define SNLED27351_CURRENT_TUNE { 0xFC, 0xFC, 0x70, 0xFC, 0xFC, 0x70, 0xFC, 0xFC, 0x70, 0xFC, 0xFC, 0x70 }
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4,4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/v7/info.json b/keyboards/keychron/v7/info.json
new file mode 100644
index 00000000000..553146eb39e
--- /dev/null
+++ b/keyboards/keychron/v7/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/v7/iso/config.h b/keyboards/keychron/v7/iso/config.h
index e9da747ab15..824548a6945 100644
--- a/keyboards/keychron/v7/iso/config.h
+++ b/keyboards/keychron/v7/iso/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 37
-#define DRIVER_2_LED_TOTAL 36
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 31
diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/info.json
index 97588498ed2..e241232d065 100644
--- a/keyboards/keychron/v7/iso/info.json
+++ b/keyboards/keychron/v7/iso/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0372",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v7/iso/iso.c b/keyboards/keychron/v7/iso/iso.c
index a35dcb2092a..cdd2d97209a 100644
--- a/keyboards/keychron/v7/iso/iso.c
+++ b/keyboards/keychron/v7/iso/iso.c
@@ -20,90 +20,90 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_15,   G_15,   H_15},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v7/v7.c b/keyboards/keychron/v7/v7.c
index e6b8309cae7..215b4922dc1 100644
--- a/keyboards/keychron/v7/v7.c
+++ b/keyboards/keychron/v7/v7.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111111111,
-    0b1111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keychron/v8/ansi/ansi.c b/keyboards/keychron/v8/ansi/ansi.c
index bda7ba1d744..fcc232511fa 100644
--- a/keyboards/keychron/v8/ansi/ansi.c
+++ b/keyboards/keychron/v8/ansi/ansi.c
@@ -20,87 +20,87 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    // {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    // {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v8/ansi/config.h b/keyboards/keychron/v8/ansi/config.h
index b818d1d8d30..0ad1e7c132f 100644
--- a/keyboards/keychron/v8/ansi/config.h
+++ b/keyboards/keychron/v8/ansi/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 34
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 30
diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json
index 06a657a5a87..df6ef81b8da 100644
--- a/keyboards/keychron/v8/ansi/info.json
+++ b/keyboards/keychron/v8/ansi/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0380",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk
index 08a7658da3a..50b09aa58ac 100644
--- a/keyboards/keychron/v8/ansi/rules.mk
+++ b/keyboards/keychron/v8/ansi/rules.mk
@@ -7,10 +7,5 @@ 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no         # Enable Encoder
-ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c
index bda7ba1d744..fcc232511fa 100644
--- a/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c
@@ -20,87 +20,87 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    // {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    // {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v8/ansi_encoder/config.h b/keyboards/keychron/v8/ansi_encoder/config.h
index 57b9bd02707..e042cdd9781 100644
--- a/keyboards/keychron/v8/ansi_encoder/config.h
+++ b/keyboards/keychron/v8/ansi_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 34
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json
index 6202a306c5b..100d215ee8a 100644
--- a/keyboards/keychron/v8/ansi_encoder/info.json
+++ b/keyboards/keychron/v8/ansi_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0381",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk
index d53dc0f5d59..bc154c1788b 100644
--- a/keyboards/keychron/v8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v8/ansi_encoder/rules.mk
@@ -7,10 +7,6 @@ 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 USB 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        # Enable Encoder
-ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/keychron/v8/config.h b/keyboards/keychron/v8/config.h
index 3a860e8eb64..54933f656fc 100644
--- a/keyboards/keychron/v8/config.h
+++ b/keyboards/keychron/v8/config.h
@@ -33,69 +33,4 @@
 #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL
 #define SNLED27351_CURRENT_TUNE { 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60 }
 
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {4, 4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* Turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-// #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_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/v8/info.json b/keyboards/keychron/v8/info.json
new file mode 100644
index 00000000000..553146eb39e
--- /dev/null
+++ b/keyboards/keychron/v8/info.json
@@ -0,0 +1,37 @@
+{
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "dip_switch": {
+        "matrix_grid": [ [4, 4] ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "snled27351",
+        "sleep": true
+    }
+}
diff --git a/keyboards/keychron/v8/iso/config.h b/keyboards/keychron/v8/iso/config.h
index 3a62cba38eb..910798fd5a9 100644
--- a/keyboards/keychron/v8/iso/config.h
+++ b/keyboards/keychron/v8/iso/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 35
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 29
diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json
index 8b40b7d0658..d7897406448 100644
--- a/keyboards/keychron/v8/iso/info.json
+++ b/keyboards/keychron/v8/iso/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0382",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v8/iso/iso.c b/keyboards/keychron/v8/iso/iso.c
index 88040c3ab84..4658969a105 100644
--- a/keyboards/keychron/v8/iso/iso.c
+++ b/keyboards/keychron/v8/iso/iso.c
@@ -20,87 +20,87 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v8/iso_encoder/config.h b/keyboards/keychron/v8/iso_encoder/config.h
index 0bb4fbf8217..5ca12b8708a 100644
--- a/keyboards/keychron/v8/iso_encoder/config.h
+++ b/keyboards/keychron/v8/iso_encoder/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 35
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Encoder Configuration */
 #define ENCODER_DEFAULT_POS 0x3
 
diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json
index 3d04699651f..23efd329aae 100644
--- a/keyboards/keychron/v8/iso_encoder/info.json
+++ b/keyboards/keychron/v8/iso_encoder/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0383",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v8/iso_encoder/iso_encoder.c b/keyboards/keychron/v8/iso_encoder/iso_encoder.c
index 88040c3ab84..4658969a105 100644
--- a/keyboards/keychron/v8/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v8/iso_encoder/iso_encoder.c
@@ -20,87 +20,87 @@
 
 // clang-format off
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk
index d53dc0f5d59..bc154c1788b 100644
--- a/keyboards/keychron/v8/iso_encoder/rules.mk
+++ b/keyboards/keychron/v8/iso_encoder/rules.mk
@@ -7,10 +7,6 @@ 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 USB 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        # Enable Encoder
-ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/keychron/v8/v8.c b/keyboards/keychron/v8/v8.c
index 38d3cada17a..5cc6c0782c7 100644
--- a/keyboards/keychron/v8/v8.c
+++ b/keyboards/keychron/v8/v8.c
@@ -16,14 +16,6 @@
 
 #include "quantum.h"
 
-const matrix_row_t matrix_mask[] = {
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111111111,
-    0b111111111101111,
-};
-
 #ifdef DIP_SWITCH_ENABLE
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h
index 388a273f7c2..13c17d597d1 100644
--- a/keyboards/keygem/kg60ansi/config.h
+++ b/keyboards/keygem/kg60ansi/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json
index 9d8cbd485e0..73d31b8da1c 100644
--- a/keyboards/keygem/kg60ansi/info.json
+++ b/keyboards/keygem/kg60ansi/info.json
@@ -25,6 +25,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "matrix_pins": {
diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h
index 388a273f7c2..13c17d597d1 100644
--- a/keyboards/keygem/kg65rgbv2/config.h
+++ b/keyboards/keygem/kg65rgbv2/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json
index 674b6295775..e7b48dcbb08 100644
--- a/keyboards/keygem/kg65rgbv2/info.json
+++ b/keyboards/keygem/kg65rgbv2/info.json
@@ -25,6 +25,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "matrix_pins": {
diff --git a/keyboards/keyhive/lattice60/keymaps/emdarcher/config.h b/keyboards/keyhive/lattice60/keymaps/emdarcher/config.h
deleted file mode 100644
index 88d9334765e..00000000000
--- a/keyboards/keyhive/lattice60/keymaps/emdarcher/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * 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
-
-// place overrides here
-#define GRAVE_ESC_ALT_OVERRIDE
diff --git a/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
deleted file mode 100644
index 545de87646f..00000000000
--- a/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * 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,
-    _FN0,
-    _FN1
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT_60_hhkb(
-        QK_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_BSLS, 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_BSPC,
-        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_LSFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN0),
-                KC_LALT, KC_LGUI, /*        */ KC_SPC,                  MO(_FN1), KC_RALT
-    ),
-    [_FN0] = LAYOUT_60_hhkb(
-        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_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
-        KC_TRNS,  KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,    KC_PENT,
-        KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLD, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
-                KC_TRNS, KC_TRNS,           KC_TRNS,                    KC_TRNS, KC_TRNS
-    ),
-    [_FN1] = LAYOUT_60_hhkb(
-        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_INS, KC_DEL,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSPC,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD,    KC_TRNS,
-        KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS,
-                KC_TRNS, KC_TRNS,           KC_TRNS,                    KC_TRNS, KC_TRNS
-    )
-};
diff --git a/keyboards/keyhive/lattice60/keymaps/emdarcher/readme.md b/keyboards/keyhive/lattice60/keymaps/emdarcher/readme.md
deleted file mode 100644
index 812351af486..00000000000
--- a/keyboards/keyhive/lattice60/keymaps/emdarcher/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# emdarcher's keymap for lattice60
-
-![layout](https://i.imgur.com/9g3fDqL.png)
-
-Modified function layer from the default HHKB functions, and added an extra layer for media controls.
diff --git a/keyboards/keyhive/maypad/keymaps/eosti/config.h b/keyboards/keyhive/maypad/keymaps/eosti/config.h
deleted file mode 100644
index 8e6a83b791a..00000000000
--- a/keyboards/keyhive/maypad/keymaps/eosti/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Reid Sox-Harris
- *
- * 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_TERM 200
diff --git a/keyboards/keyhive/maypad/keymaps/eosti/keymap.c b/keyboards/keyhive/maypad/keymaps/eosti/keymap.c
deleted file mode 100644
index e4d4b87b7a0..00000000000
--- a/keyboards/keyhive/maypad/keymaps/eosti/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2020 Reid Sox-Harris
- *
- * 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 {
-    _QWERTY,
-    _MOD
-};
-
-// Keymaps Shortcut Defines
-
-#define ESC_MOD LT(_MOD, KC_ESC)
-#define MOD     TG(_MOD)
-#define SQRT    RALT(KC_V)      // (macOS) Prints √
-#define NEQL    RALT(KC_EQL)    // (macOS) Prints ≠
-#define PM      RALT(KC_PLUS)   // (macOS) Prints ±
-#define PI      RALT(KC_P)      // (macOS) Prints π
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_QWERTY] = LAYOUT_numpad_5x4_split_plus(
-    // ┌────────┬────────┬────────┬────────┐
-         ESC_MOD, KC_PSLS, KC_PAST, KC_PEQL,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P1,   KC_P2,   KC_P3,
-    // ├─────────────────┼────────┼        ┤
-              KC_P0,       KC_PDOT, KC_PENT
-    // ├─────────────────┴────────┴────────┘
-    ),
-    [_MOD] = LAYOUT_numpad_5x4_split_plus(
-    // ┌────────┬────────┬────────┬────────┐
-          MOD,     SQRT,  KC_CIRC,   NEQL,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P7,   KC_P8,   KC_P9,     PM,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P4,   KC_P5,   KC_P6,     PI,
-    // ├────────┼────────┼────────┼────────┤
-         KC_P1,   KC_P2,   KC_P3,
-    // ├─────────────────┼────────┼        ┤
-              KC_P0,       KC_BSPC, KC_TAB
-    // ├─────────────────┴────────┴────────┘
-    )
-
-};
diff --git a/keyboards/keyhive/maypad/keymaps/eosti/readme.md b/keyboards/keyhive/maypad/keymaps/eosti/readme.md
deleted file mode 100644
index 5b3ee3bc825..00000000000
--- a/keyboards/keyhive/maypad/keymaps/eosti/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# EosTi's Maypad Layout
-
-## Features
-* Split-plus layout (who needs a massive plus anyway)
-* Tapdance ESC/mod key, giving access to special characters and mod functions
-* Standard numpad base layer
diff --git a/keyboards/keyhive/maypad/keymaps/eosti/rules.mk b/keyboards/keyhive/maypad/keymaps/eosti/rules.mk
deleted file mode 100644
index 4c1902ee995..00000000000
--- a/keyboards/keyhive/maypad/keymaps/eosti/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-LTO_ENABLE = yes
diff --git a/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
deleted file mode 100644
index 4e15dc3c466..00000000000
--- a/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Copyright 2019 Ethan Durrant (emdarcher)
- *
- * 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
-
-typedef struct {
-    bool is_press_action;
-    int state;
-} tap;
-
-//tap dance states
-enum {
-    SINGLE_TAP = 1,
-    SINGLE_HOLD = 2,
-    DOUBLE_TAP = 3,
-    TRIPLE_TAP = 4
-};
-
-//tap dance keys
-enum {
-    TAPPY_KEY = 0
-};
-
-//function to handle all the tap dances
-int cur_dance(tap_dance_state_t *state);
-
-//functions for each tap dance
-void tk_finished(tap_dance_state_t *state, void *user_data);
-void tk_reset(tap_dance_state_t *state, void *user_data);
-
-#define INDICATOR_LED   B5
-#define TX_LED          D5
-#define RX_LED          B0
-
-#define _FN0    1
-#define _ML1    2
-#define _CL0    3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(/* Base */
-                 TD(TAPPY_KEY),KC_HOME, KC_PGUP,
-                 KC_DEL,    KC_END,     KC_PGDN,
-                 
-                            KC_UP,
-                 KC_LEFT,   KC_DOWN,    KC_RIGHT),
-    [_FN0] = LAYOUT(/* function layer */
-                 KC_TRNS,   KC_PAUS,    KC_VOLU,
-                 KC_ENTER,  KC_SCRL,    KC_VOLD,
-                 
-                            KC_TRNS,
-                 KC_TRNS,   KC_TRNS,    KC_TRNS),
-    [_ML1] = LAYOUT(/* media function layer on double tap */
-                 KC_TRNS,   KC_TRNS,    KC_VOLU, 
-                 KC_MUTE,   KC_TRNS,    KC_VOLD,
-                 
-                            KC_SPC,
-                 KC_MRWD,   KC_MPLY,    KC_MFFD),
-    [_CL0] = LAYOUT(/* control layer on single tap */
-                 KC_TRNS,   KC_TRNS,    KC_TRNS,
-                 KC_TRNS,   KC_TRNS,    KC_TRNS,
-
-                                LCTL(KC_UP),
-                 LCTL(KC_LEFT), LCTL(KC_DOWN), LCTL(KC_RIGHT) ),
-};
-
-void matrix_init_user(void) {
-    //init the Pro Micro on-board LEDs
-    setPinOutput(TX_LED);
-    setPinOutput(RX_LED);
-    //set to off
-    writePinHigh(TX_LED);
-    writePinHigh(RX_LED);
-}
-
-//determine the current tap dance state
-int cur_dance (tap_dance_state_t *state){
-    if(state->count == 1){
-        //if a tap was registered
-        if(!state->pressed){
-            //if not still pressed, then was a single tap
-            return SINGLE_TAP;
-        } else {
-            //if still pressed/held down, then it's a single hold
-            return SINGLE_HOLD;
-        }
-    } else if(state->count == 2){
-        //if tapped twice, set to double tap
-        return DOUBLE_TAP;
-    } else if(state->count == 3){
-        //if tapped thrice, set to triple tap
-        return TRIPLE_TAP;
-    } else {
-        return 8;
-    }
-}
-
-
-//initialize the tap structure for the tap key
-static tap tk_tap_state = {
-    .is_press_action = true,
-    .state = 0
-};
-
-//functions that control what our tap dance key does
-void tk_finished(tap_dance_state_t *state, void *user_data){
-    tk_tap_state.state = cur_dance(state);
-    switch(tk_tap_state.state){
-        case SINGLE_TAP:
-            //toggle desired layer when tapped:
-            if(layer_state_is(_CL0)){
-                //if already active, toggle it to off
-                layer_off(_CL0);
-                //turn off LEDs
-                writePinHigh(TX_LED);
-                writePinHigh(RX_LED);
-            } else {
-                //turn on the command layer
-                layer_on(_CL0);
-                //turn on the LEDs
-                writePinLow(TX_LED);
-                writePinLow(RX_LED);
-            }
-            break;
-        case SINGLE_HOLD:
-            //set to desired layer when held:
-            //setting to the function layer
-            layer_on(_FN0);
-            break;
-        case DOUBLE_TAP:
-            //set to desired layer when double tapped:
-            //setting to the media layer
-            if(layer_state_is(_ML1)){
-                //if already active, toggle it to off
-                layer_off(_ML1);
-                //turn off the indicator LED
-                //set LED HI to turn it off
-                writePinHigh(INDICATOR_LED);
-            } else {
-                //turn on the media layer
-                layer_on(_ML1);
-                //turn on the indicator LED
-                //set LED pin to LOW to turn it on
-                writePinLow(INDICATOR_LED);
-            }
-            break;
-        case TRIPLE_TAP:
-            //reset all layers
-            layer_clear();
-            //set all LEDs off
-            writePinHigh(TX_LED);
-            writePinHigh(RX_LED);
-            writePinHigh(INDICATOR_LED);
-            break;
-    }
-}
-
-void tk_reset(tap_dance_state_t *state, void *user_data){
-    //if held and released, leave the layer
-    if(tk_tap_state.state == SINGLE_HOLD){
-        layer_off(_FN0);
-    }
-    //reset the state
-    tk_tap_state.state = 0; 
-}
-
-
-//associate the tap dance key with its functionality
-tap_dance_action_t tap_dance_actions[] = {
-    [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tk_finished, tk_reset)
-};
diff --git a/keyboards/keyhive/navi10/keymaps/emdarcher/readme.md b/keyboards/keyhive/navi10/keymaps/emdarcher/readme.md
deleted file mode 100644
index b4ae6d75ffb..00000000000
--- a/keyboards/keyhive/navi10/keymaps/emdarcher/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# emdarcher's keymap for the Navi10
-
-This is my personal keymap for the Navi10, developed for the original Rev0 prototype. It uses Tap Dance extensively on the INSERT key to access different layers.
-
-- Base Layer: 
-  * Regular Navigation Cluster except for the INSERT key which is for tapping.
-- Hold Insert -> Function Layer: 
-  * Maps Volume Control on PgUp/PgDN, Pause/Scroll-Lock on Home/End (MacOS brightness), and Delete to Enter. 
-- 2 Taps -> Media Layer: 
-  * Has mappings for Audio control on MacOS using the arrow keys, PgUp/PgDn, and Delete.
-  * Lights up the Central 3mm indicator LED.
-- 1 Tap -> Control Layer: 
-  * Binds the arrow keys as LCTRL + Arrow Key for use in changing workspaces in MacOS.
-  * Lights the Pro Micro TX/RX LEDs. These are visible through the board if you use clear PCB mount switch bases.
-
-
diff --git a/keyboards/keyhive/navi10/keymaps/emdarcher/rules.mk b/keyboards/keyhive/navi10/keymaps/emdarcher/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/keyhive/navi10/keymaps/emdarcher/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h b/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
deleted file mode 100644
index 824ec5bd18e..00000000000
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 rtwayland
- *
- * 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
-
-// place overrides here
-#define USB_MAX_POWER_CONSUMPTION 100
-#define TAPPING_TERM 200
\ No newline at end of file
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
deleted file mode 100644
index 28eda8e6b6d..00000000000
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright 2020 rtwayland
- *
- * 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,
-  _SYMBOL,
-  _NUM,
-  _NAV,
-  _MEDIA,
-  _WORD,
-  _FKEYS,
-  _NUMPAD,
-  _MOUSE
-};
-
-enum {
-  TD_PLAY_DO_NOT_DISTURB
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-      LT(4, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(TD_PLAY_DO_NOT_DISTURB),
-      LCTL_T(KC_ESC), KC_A, KC_S, KC_D, LT(2, KC_F), KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(4, KC_QUOT),
-      MO(5), LGUI_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LGUI_T(KC_SLSH), MO(5),
-      MO(3), KC_LSFT, LALT_T(KC_TAB), LT(3, KC_ENT), LT(1, KC_SPC), KC_BSPC
-     ),
-  [_SYMBOL] = LAYOUT(
-      LCTL(KC_C), KC_TILD, KC_AT, KC_LCBR, KC_RCBR, KC_HASH, KC_ASTR, KC_CIRC, KC_AMPR, KC_PIPE, KC_BSLS, LCTL(KC_GRV),
-      KC_LCTL, KC_GRV, KC_MINS, KC_LPRN, KC_RPRN, KC_EXLM, KC_QUES, KC_DLR, KC_LT, KC_GT, KC_SLSH, KC_DQUO,
-      KC_LALT, KC_LGUI, KC_UNDS, KC_LBRC, KC_RBRC, KC_PLUS, KC_P0, KC_EQL, KC_PERC, KC_COLN, KC_NO, KC_NO,
-      KC_NO, KC_LSFT, LALT_T(KC_TAB), KC_NO, KC_TRNS, KC_NO
-     ),
-  [_NUM] = LAYOUT(
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ASTR, KC_7, KC_8, KC_9, KC_SLSH, KC_EQL,
-      KC_LCTL, KC_NO, MO(7), MO(6), KC_TRNS, KC_NO, KC_PLUS, KC_4, KC_5, KC_6, KC_MINS, KC_PERC,
-      KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, KC_NO,  KC_0, KC_1, KC_2, KC_3, KC_DOT, KC_PENT,
-      KC_NO, KC_LSFT, LALT_T(KC_TAB), KC_NO, KC_SPC, KC_BSPC
-     ),
-  [_NAV] = LAYOUT(
-      KC_NO, KC_NO, LALT(KC_RGHT), SGUI(KC_LBRC), SGUI(KC_RBRC), KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_LCTL, KC_LALT, KC_LSFT, KC_LGUI, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LALT(KC_LEFT), KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_TRNS, KC_NO, KC_NO, KC_NO, KC_SPC, KC_BSPC
-     ),
-  [_MEDIA] = LAYOUT(
-      KC_TRNS, SGUI(KC_5), SGUI(KC_3), SGUI(KC_4), MEH(KC_4), KC_VOLU, LCA(KC_U), LCAG(KC_LEFT), LCAG(KC_RGHT), LCA(KC_I), LCA(KC_EQL), LALT(LGUI(KC_PWR)),
-      KC_CAPS, KC_F11, KC_MPRV, KC_MNXT, KC_MPLY, KC_VOLD, LCA(KC_LEFT), LCA(KC_DOWN), LCA(KC_UP), LCA(KC_RIGHT), LCA(KC_MINS), KC_TRNS,
-      KC_BRID, KC_BRIU, LGUI(KC_MINS), LGUI(KC_PLUS), LGUI(KC_GRV), KC_MUTE, LCA(KC_J), LCA(KC_ENT), LCA(KC_C), LCA(KC_K), MEH(KC_UP), QK_BOOT,
-      LCTL(LSFT(KC_TAB)), LCTL(KC_TAB), KC_NO, KC_NO, MEH(KC_RGHT), MEH(KC_LEFT)
-     ),
-  [_WORD] = LAYOUT(
-      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, LALT(LSFT(KC_MINS)), KC_NO, LALT(LGUI(KC_F)), KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_TRNS, KC_NO, LALT(KC_MINS), KC_NO, SGUI(LALT(KC_V)),  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_DEL
-     ),
-  [_FKEYS] = LAYOUT(
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, KC_F7, KC_F8, KC_F9, KC_F17, KC_F20,
-      KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_F11, KC_F4, KC_F5, KC_F6, KC_F16, KC_F19,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F10, KC_F1, KC_F2, KC_F3, KC_F13, KC_F18,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-     ),
-  [_NUMPAD] = LAYOUT(
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,  KC_PAST, KC_P7, KC_P8, KC_P9, KC_PSLS, KC_PEQL,
-      KC_LCTL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PERC,
-      KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, KC_NO,  KC_P0, KC_P1, KC_P2, KC_P3, KC_PDOT, KC_PENT,
-      KC_NO, KC_TRNS, KC_NO, KC_NO, KC_LPRN, KC_RPRN
-     ),
-  [_MOUSE] = LAYOUT(
-      KC_NO, KC_NO, KC_NO, SGUI(KC_LBRC), SGUI(KC_RBRC), KC_NO,  KC_HOME, KC_WH_U, KC_WH_D, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_ACL2, KC_WWW_BACK, KC_ACL0, KC_WWW_FORWARD, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_WH_R, KC_WH_L, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_BTN2
-     ),
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_PLAY_DO_NOT_DISTURB] = ACTION_TAP_DANCE_DOUBLE(KC_MPLY, KC_F6)
-};
\ No newline at end of file
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md b/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
deleted file mode 100644
index c1d2a0b9ec1..00000000000
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# thefoxcodes keymap
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk b/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
deleted file mode 100644
index 1ba2fa8fbef..00000000000
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
deleted file mode 100644
index 3d8fda20a3e..00000000000
--- a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@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 LicensezZZ
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _QWERTY,
-  _RAISE
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	/* Layer 0, default layer
-	*  ,--------------------------------------------------------------------------------------------------------------------------------------------.
-	*  |NumLck|   /  |   *  |   -  | | Esc |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |    0 |   -  |   =  |   \  |Delete| Ins  |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |  7   |   8  |   9  |   +  | | Tab   |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |    P |   {  |   }  |   BkSpc   | Vol+ |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |  4   |   5  |   6  |   +  | | Caps   |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |    ; |   '  |      Return     | Vol- |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |  1   |   2  |   3  |  En  | | LShft     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |    RShft   |   Up   | Mute |
-	*  |------+------+------+------+-+----------------------------------------------------------------------------------------------+--------+------|
-	*  |      0      |   .  |  En  | | Ctrl  |  Win  |  Alt  |                  Space                            |  Fn  |    | Left |  Down  | Right|
-	*  `------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------'
-	*/
-    [_QWERTY] = LAYOUT( 
-		KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_BSLS, KC_DELETE, KC_INS,
-		KC_P7, KC_P8, KC_P9, KC_PPLS, 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_BSPC, KC_VOLU,
-		KC_P4, KC_P5, KC_P6, KC_PENT, 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_P1, KC_P2, KC_P3, 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_MUTE,
-		KC_P0, KC_PDOT,      KC_LCTL, KC_LGUI, KC_LALT,                              KC_SPC,              RAISE, KC_LEFT, KC_DOWN, KC_RGHT
-	),
-
-	/*layer 1, function layer
-	*  ,--------------------------------------------------------------------------------------------------------------------------------------------.
-	*  |Reset |      |      |      | |  `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |Calc  |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |      |      |      |      | |       |      |      |      |      |      |      |      |      |      |      |      |      |           |      |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |      |      |      |      | |        |      |      |      |      |      |      |      |      |      |      |      |                 |      |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |      |      |      |      | |           |      |      |      |      |      |      |      |      |      |      |            |        |      |
-	*  |------+------+------+------+-+----------------------------------------------------------------------------------------------+--------+------|
-	*  |             |      |      | |       |       |       |                                                   |      |    |      |        |      |
-	*  `------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------'
-	*/
-
-	[_RAISE] = LAYOUT( 
-		QK_BOOT, _______, _______, _______, 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_CALC,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-	)
-};
\ No newline at end of file
diff --git a/keyboards/keyhive/uno/keymaps/copypasta/keymap.c b/keyboards/keyhive/uno/keymaps/copypasta/keymap.c
deleted file mode 100644
index 74e5f62fc54..00000000000
--- a/keyboards/keyhive/uno/keymaps/copypasta/keymap.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2020 Snipeye
- *
- * 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 uno_keycode
-{
-  UNO = SAFE_RANGE
-};
-
-static uint16_t pressTimer = 0xFFFF;
-#define CUSTOM_LONGPRESS 1000
-#define PASTA_COUNT 4
-
-const char *pasta[PASTA_COUNT] =  {
-    "Hey - I'm Uno... V2.  This time, I have uno more features: I support a rotary encoder, too.  That's it.  That's the only difference.",
-    "Did you ever hear the tragedy of Darth Plagueis the Wise?  I thought not. It's not a story the Jedi would tell you. It's a Sith legend. Darth Plagueis was a Dark Lord of the Sith, so powerful and so wise he could use the Force to influence the midichlorians to create life... He had such a knowledge of the dark side that he could even keep the ones he cared about from dying. The dark side of the Force is a pathway to many abilities some consider to be unnatural. He became so powerful... the only thing he was afraid of was losing his power, which eventually, of course, he did. Unfortunately, he taught his apprentice everything he knew, then his apprentice killed him in his sleep. Ironic, he could save others from death, but not himself.",
-    "The intent is to provide players with a sense of pride and accomplishment for unlocking different heroes.  As for cost, we selected initial values based upon data from the Open Beta and other adjustments made to milestone rewards before launch. Among other things, we're looking at average per-player credit earn rates on a daily basis, and we'll be making constant adjustments to ensure that players have challenges that are compelling, rewarding, and of course attainable via gameplay.  We appreciate the candid feedback, and the passion the community has put forth around the current topics here on Reddit, our forums and across numerous social media outlets.  Our team will continue to make changes and monitor community feedback and update everyone as soon and as often as we can.",
-    "The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start.",
-};
-
-uint8_t pastaIndex = 0;
-
-enum encoder_names {
-	_ENCODER,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        UNO
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		case UNO:
-            if (record->event.pressed) {
-                pressTimer = timer_read();
-            } else {
-                uint16_t timeElapsed = timer_elapsed(pressTimer);
-                if (timeElapsed < CUSTOM_LONGPRESS) {
-                    send_string(pasta[pastaIndex]);
-                } else {
-                    reset_keyboard();
-                }
-            }
-        break;
-    }
-    return false;
-}
-
-void keyboard_post_init_user(void) {
-    rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom(0, 255, 255);
-    rgblight_mode_noeeprom(1);
-    //rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
-}
-
-void encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == _ENCODER) { /* First encoder */
-        if (clockwise) {
-            pastaIndex++;
-            pastaIndex %= PASTA_COUNT;
-        } else {
-            pastaIndex += PASTA_COUNT;
-            pastaIndex--;
-            pastaIndex %= PASTA_COUNT;
-        }
-        rgblight_sethsv_noeeprom((255/PASTA_COUNT)*pastaIndex, 255, 255);
-        rgblight_mode_noeeprom(1);
-    }
-}
diff --git a/keyboards/keyhive/uno/keymaps/copypasta/readme.md b/keyboards/keyhive/uno/keymaps/copypasta/readme.md
deleted file mode 100644
index 1ad009c16c5..00000000000
--- a/keyboards/keyhive/uno/keymaps/copypasta/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# A copypasta keymap for uno
-![Picture](https://i.imgur.com/OqPyWbbl.jpg)
-
-[A demo of this keymap can be found here.](https://www.reddit.com/r/MechanicalKeyboards/comments/k7w1j1/qmk_is_a_pathway_to_many_abilities_some_consider/)
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
deleted file mode 100755
index 8dea44e33c6..00000000000
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"ut472","keymap":"ut472_layout_switching","layout":"LAYOUT","layers":[["KC_ESC","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSPC","LT(3,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","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["KC_ESC","KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_SCLN","KC_BSPC","LT(3,KC_TAB)","KC_A","KC_S","KC_H","KC_T","KC_G","KC_Y","KC_N","KC_E","KC_O","KC_I","KC_QUOT","KC_LSFT","KC_Z","KC_X","KC_M","KC_C","KC_V","KC_K","KC_L","KC_COMM","KC_DOT","KC_SLSH","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["KC_ESC","KC_Q","KC_W","KC_F","KC_P","KC_G","KC_J","KC_L","KC_U","KC_Y","KC_SCLN","KC_BSPC","LT(3,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","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["KC_ESC","KC_Q","KC_W","KC_F","KC_P","KC_B","KC_J","KC_L","KC_U","KC_Y","KC_SCLN","KC_BSPC","LT(3,KC_TAB)","KC_A","KC_R","KC_S","KC_T","KC_G","KC_K","KC_N","KC_E","KC_I","KC_O","KC_QUOT","KC_LSFT","KC_X","KC_C","KC_D","KC_V","KC_Z","KC_M","KC_H","KC_COMM","KC_DOT","KC_SLSH","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["KC_ESC","KC_QUOT","KC_COMM","KC_DOT","KC_P","KC_Y","KC_F","KC_G","KC_C","KC_R","KC_L","KC_BSPC","LT(3,KC_TAB)","KC_A","KC_O","KC_E","KC_U","KC_I","KC_D","KC_H","KC_T","KC_N","KC_S","KC_SLSH","KC_LSFT","KC_SCLN","KC_Q","KC_J","KC_K","KC_X","KC_B","KC_M","KC_W","KC_V","KC_Z","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["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_NO","RGB_TOG","RGB_MOD","RGB_VAI","RGB_VAD","KC_NO","KC_NO","KC_MINS","KC_EQL","KC_LBRC","KC_RBRC","KC_BSLS","KC_NO","KC_F11","KC_F12","KC_F13","KC_F14","KC_F15","KC_F16","KC_F17","KC_F18","KC_F19","KC_F20","KC_NO","KC_NO","KC_NO","KC_NO","KC_CAPS","KC_NO","KC_NO","KC_TRNS","KC_HOME","KC_PGDN","KC_PGUP","KC_END"],["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_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_UNDS","KC_PLUS","KC_LCBR","KC_RCBR","KC_PIPE","KC_NO","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_NO","KC_NO","KC_NO","KC_NO","KC_CAPS","KC_TRNS","KC_NO","KC_NO","KC_HOME","KC_PGDN","KC_PGUP","KC_END"],["KC_ESC","KC_CALC","KC_WHOM","KC_MAIL","KC_MYCM","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PSCR","KC_NO","KC_TRNS","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","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_WH_L","KC_WH_D","KC_WH_U","KC_WH_R"],["QK_BOOT","KC_NO","KC_NO","RGB_TOG","RGB_MOD","RGB_HUI","RGB_HUD","RGB_SAI","RGB_SAD","RGB_VAI","RGB_VAD","KC_DEL","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","ANY(Qwerty)","ANY(Workman)","ANY(Colemak)","ANY(Colemak Mod-DH)","ANY(Dvorak)","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","DB_TOGG","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_NO","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Annihilator6000","notes":"Layer 0 = Qwerty\nLayer 1 = Workman\nLayer 2 = Colemak\nLayer 3 = Colemak Mod-DH\nLayer 4 = Dvorak\nLayer 5 = Function Layer 1 (MO 1)\nLayer 6 = Function Layer 2 (MO 2)\nLayer 7 = Function Layer 3 (LT 3: Hold Tab)\nLayer 8 = Planck-style Adjust Layer (Hold MO 1 and MO 2 at the same time)"}
\ No newline at end of file
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/config.h b/keyboards/keyhive/ut472/keymaps/annihilator6000/config.h
deleted file mode 100644
index 023c753c27a..00000000000
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 Carlos Filoteo
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
deleted file mode 100644
index 2235c07bb5b..00000000000
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* Copyright 2018 Carlos Filoteo
- *
- * 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 LT3_TAB LT(3, KC_TAB)
-
-enum ut472_layers {
-  _QWERTY,
-  _WORKMAN,
-  _COLEMAK,
-  _COLEMAK_MOD_DH,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _TAB,
-  _ADJUST
-};
-
-enum ut472_keycodes {
-  QWERTY = SAFE_RANGE,
-  WORKMAN,
-  COLEMAK,
-  COLEMAK_MOD_DH,
-  DVORAK
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base Layer - QWERTY
-   * ,-------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |Bspace |
-   * |-------------------------------------------------------------------------+
-   * |Tab/L3|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |   '  |
-   * |-------------------------------------------------------------------------+
-   * | Shift |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |Sh/En|
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt | Gui | App |  L2  |   Space   |  L1  | Left| Down|  Up |Right|
-   * `-------------------------------------------------------------------------'
-   */
-[_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_BSPC,
-  LT3_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, SC_SENT,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-  /* Workman
-   * ,-------------------------------------------------------------------------.
-   * | Esc |  Q  |  D  |  R  |  W  |  B  |  J  |  F  |  U  |  P  |  ;  |Bspace |
-   * |-------------------------------------------------------------------------+
-   * |Tab/L3|  A  |  S  |  H  |  T  |  G  |  Y  |  N  |  E  |  O  |  I  |   '  |
-   * |-------------------------------------------------------------------------+
-   * | Shift |  Z  |  X  |  M  |  C  |  V  |  K  |  L  |  ,  |  .  |  /  |Sh/En|
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt | Gui | App |  L2  |   Space   |  L1  | Left| Down|  Up |Right|
-   * `-------------------------------------------------------------------------'
-   */
-[_WORKMAN] = LAYOUT(
-  KC_ESC,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN,    KC_BSPC,
-  LT3_TAB, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-  /* Colemak
-   * ,---------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  F  |  P  |  G  |  J  |  L  |  U  |  Y  |  ;  |   Bksp  |
-   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+---------|
-   * |Tab/L3|  A  |  R  |  S  |  T  |  D  |  H  |  N  |  E  |  I  |  O  |    "   |
-   * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--------|
-   * | Shift |  Z  |  X  |  C  |  V  |  B  |  K  |  M  |  ,  |  .  |  /  | Sh/En |
-   * |-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------|
-   * | Ctrl| Alt | GUI | App |  L2  |   Space   | L1 | Left | Down |  Up  |Right |
-   * `---------------------------------------------------------------------------'
-   */
-[_COLEMAK] = LAYOUT(
-  KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  LT3_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_ENT ,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT,   KC_DOWN, KC_UP,   KC_RGHT
-),
-
-  /* Colemak Mod-DH
-   * https://colemakmods.github.io/mod-dh/keyboards.html
-   * ,---------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  F  |  P  |  B  |  J  |  L  |  U  |  Y  |  ;  |   Bksp  |
-   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+---------|
-   * |Tab/L3|  A  |  R  |  S  |  T  |  G  |  K  |  N  |  E  |  I  |  O  |    '   |
-   * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--------|
-   * | Shift |  X  |  C  |  D  |  V  |  Z  |  M  |  H  |  ,  |  .  |  /  | Sh/En |
-   * |-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------|
-   * | Ctrl| Alt | GUI | App |  L2  |   Space   | L1 | Left | Down |  Up  |Right |
-   * `---------------------------------------------------------------------------'
-   */
-[_COLEMAK_MOD_DH] = LAYOUT(
-  KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  LT3_TAB, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_K,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_X,    KC_C,    KC_D,    KC_V,    KC_Z,    KC_M,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT,   KC_DOWN, KC_UP,  KC_RGHT
-),
-
-  /* Dvorak
-   * ,--------------------------------------------------------------------------.
-   * | Esc |  "  |  ,  |  .  |  P  |  Y  |  F  |  G  |  C  |  R  |  L  |   Bksp |
-   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--------|
-   * |Tab/L3|  A  |  O  |  E  |  U  |  I  |  D  |  H  |  T  |  N  |  S  |   /   |
-   * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------|
-   * | Shift |  ;  |  Q  |  J  |  K  |  X  |  B  |  M  |  W  |  V  |  Z  |Sh/En |
-   * |-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
-   * | Ctrl| Alt | GUI | App |  L2  |   Space   | L1 | Left | Down |  Up |Right |
-   * `--------------------------------------------------------------------------'
-   */
-[_DVORAK] = LAYOUT(
-  KC_ESC,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  LT3_TAB, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT,  KC_DOWN, KC_UP,   KC_RGHT
-),
-
-  /* FN Layer 1 - LOWER
-   * ,-------------------------------------------------------------------------.
-   * | ` ~ |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Delete|
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |  -  |  =  |  [  |  ]  |  \   |
-   * |-------------------------------------------------------------------------+
-   * |       | F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |Capsl|      |          |       | Home| PgDn| PgUp| End |
-   * `-------------------------------------------------------------------------'
-   */
-[_LOWER] = LAYOUT(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DELETE,
-  _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  _______,
-  _______, _______, _______, KC_CAPS, _______,     _______,      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-  /* FN Layer 2 - RAISE
-   * ,-------------------------------------------------------------------------.
-   * |   ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |Delete|
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |  _  |  +  |  { |  }  |   |   |
-   * |-------------------------------------------------------------------------+
-   * |       | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |Capsl|      |          |       | Home| PgDn| PgUp| End |
-   * `-------------------------------------------------------------------------'
-   */
-[_RAISE] = LAYOUT(
-  KC_TILDE, KC_EXCLAIM, KC_AT, KC_HASH, KC_DOLLAR, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_DELETE,
-  _______, _______, _______, _______, _______, _______, _______, KC_UNDERSCORE, KC_PLUS, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_PIPE,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  _______, _______, _______, KC_CAPS, _______,     _______,      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-  /* FN Layer 3 - Hold Tab
-   * ,-------------------------------------------------------------------------.
-   * | Esc | Calc|Webhm| Mail| Comp|     |     |     |     |     |PrtSc|       |
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |     |     |     |     |      |
-   * |-------------------------------------------------------------------------+
-   * |       |    |     |     |     |     |     |     |     |     |      |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |     |      |          |       |MousL|MousD|MousU|MousR|
-   * `-------------------------------------------------------------------------'
-   */
-[_TAB] = LAYOUT(
-  KC_ESC,  KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R
-),
-
-  /* Adjust (L1 + L2)
-   *                   v-----------------------RGB CONTROL---------------------v
-   * ,--------------------------------------------------------------------------
-   * |Reset|     |     | RGB |RGBMO|HUE+ |HUE- |SAT+ |SAT- |BRT+ |BRT- |   Del |
-   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------|
-   * |      |     |     |     |     |     |Qwert|Wrkmn|ModDH|Colmk|Dvork|      |
-   * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
-   * |       |     |     |     |     |     |     |     |     |     |     |     |
-   * |-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
-   * | Dbg |     |     |     |      |           |      |     |     |     |     |
-   * `-------------------------------------------------------------------------'
-   */
-[_ADJUST] = LAYOUT(
-  QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL,
-  _______, _______, _______, _______, _______, _______, QWERTY,  WORKMAN, COLEMAK, COLEMAK_MOD_DH,   DVORAK,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  DB_TOGG, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-)
-/* QWERTY    = H
-   WORKMAN   = J
-   COLEMAK   = K
-     -MOD-DH = L
-   DVORAK    = ; */
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case WORKMAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WORKMAN);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case COLEMAK_MOD_DH:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK_MOD_DH);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md b/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
deleted file mode 100644
index 59469b7b553..00000000000
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# UT47.2 Planck-style layout switching
-
-Has layouts for Qwerty, Workman, Colemak, Colemak-Mod-DH, and Dvorak. Qwerty is the default layout. Layouts are switched Planck-style using momentary layer keys 1 and 2 (MO(1) and MO(2)) at the same time and pressing one of the H, J, K, L, or ; keys (this is while on the Qwerty layout - adjust if on another layout). See Layer 8 below for layout keys.
-
-You can load the UT472_Annihilator6000_Configurator_file.json file in the [QMK Configurator](https://config.qmk.fm/#/ut472/LAYOUT) if you want to check out the configuration there or easily modify it.
-
-Make example for this keyboard (after setting up your build environment):
-
-    make ut472:Annihilator6000
-
-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).
-
-![UT47.2 layout image](https://i.imgur.com/lICX4uz.png)
-
-[KLE](http://www.keyboard-layout-editor.com/##@@_y:0%3B&=Esc&=Q&=W&=E&=R&=T&=Y&=U&=I&=O&=P&_w:1.5%3B&=Back%20Space&_x:0.25&a:4&f:4&w:4&h:4&d:true%3B&=%3Cb%3EGNAP!%3C%2F%2Fb%3E%3Cp%3E%3Cp%3EMinimum%20stagger%3Cp%3E47%20key%20layout%3B&@_a:7&f:3&w:1.25%3B&=Tab&=A&=S&=D&=F&=G&=H&=J&=K&=L&=%2F%3B&_w:1.25%3B&=%27%3B&@_w:1.5%3B&=Shift&=Z&=X&=C&=V&=B&=N&=M&=,&=.&=%2F%2F&=Return%3B&@=Ctrl&=Alt&=Super&=Menu&_w:1.25%3B&=%2F&dArr%2F%3B&_w:2%3B&=&_w:1.25%3B&=%2F&uArr%2F%3B&=%2F&larr%2F%3B&=%2F&darr%2F%3B&=%2F&uarr%2F%3B&=%2F&rarr%2F%3B%3B&=undefined)
diff --git a/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c b/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
deleted file mode 100644
index f629766b280..00000000000
--- a/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2022 Garrett Davis (@Gardego5)
- *
- * 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
-
-/* This controls special press and hold keys.
- * Maps right arrow to F15 when held, to be used for push to talk.
- */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LT(0, KC_RIGHT):
-            if (!record->tap.count) {
-                if (record->event.pressed) {
-                    register_code16(KC_F15);
-                } else {
-                    unregister_code16(KC_F15);
-                }
-            return false;
-        }
-        return true;
-    }
-
-  return true;
-}
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base Layer
-   * ,-------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |Bspace |
-   * |-------------------------------------------------------------------------+
-   * | Tab  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |Sh/Ent|
-   * |-------------------------------------------------------------------------+
-   * | Shift |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  '  |
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt |  L3 | Gui |  L2  |   Space   |  L1  | Left| Down|  Up|Rt/F15|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT(
-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, SC_SENT,
-KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_QUOT,
-KC_LCTL, KC_LALT, MO(3)  , KC_LGUI, MO(2)  ,     KC_SPC      , MO(1)  , KC_LEFT, KC_DOWN, KC_UP  , LT(0, KC_RIGHT)
-),
-
-  /* FN Layer 1
-   * ,-------------------------------------------------------------------------.
-   * | ` ~ |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Delete|
-   * |-------------------------------------------------------------------------+
-   * | Tab  |  <  |  >  |  (  |  )  |     |     |  -  |  =  |  [  |  ]  |Sh/Ent|
-   * |-------------------------------------------------------------------------+
-   * | Shift |     |     |     |     |     |     |     |  ,  |  .  |  \  |Caps |
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt |  L3 | Gui |  L2  |   Space   |  L1  | Home| PgDn| PgUp| End |
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Right */
-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_TRNS, KC_LT  , KC_GT  , KC_LPRN, KC_RPRN, KC_NO  , KC_NO  , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_TRNS,
-KC_TRNS, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_TRNS, KC_TRNS, KC_BSLS, KC_CAPS,
-KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS     , KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-  /* FN Layer 2
-   * ,-------------------------------------------------------------------------.
-   * |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 |  F12  |
-   * |-------------------------------------------------------------------------+
-   * | Tab  |     | Mute| Vol-| Vol+|     |     | Left| Down|  Up |Right|Sh/Ent|
-   * |-------------------------------------------------------------------------+
-   * | Shift |     |Med<<|Pause|Med>>|     |     |     |LMous|RMous|     |     |
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt |  L3 | Gui |  L2  |   Space   |  L1  |<Mous|vMous|^Mous|>Mous|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Left */
-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_NO  , KC_MUTE, KC_VOLD, KC_VOLU, KC_NO  , KC_NO  , KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, KC_TRNS,
-KC_TRNS, KC_NO  , KC_MPRV, KC_MPLY, KC_MNXT, KC_NO  , KC_NO  , KC_NO  , KC_BTN1, KC_BTN2, KC_NO  , KC_NO  ,
-KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS     , KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
-),
-
-  /* FN Layer 3
-   * ,-------------------------------------------------------------------------.
-   * | Esc | RGB | RGB |     |     |     |#Lock|  7  |  8  |  9  |     |Bspace |
-   * |-------------------------------------------------------------------------+
-   * | Tab  |  /  |  *  |  -  |  +  |  =  |     |  4  |  5  |  6  |     |Sh/Ent|
-   * |-------------------------------------------------------------------------+
-   * | Shift |     |     |     |     |     |     |  1  |  2  |  3  |  Up |     |
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt |  L3 | Gui |  L2  |   Space   |   0  |  .  | Left| Down|Right|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* 3 */
-KC_ESC , RGB_TOG, RGB_MOD, KC_NO  , KC_NO  , KC_NO  , KC_NUM , KC_P7  , KC_P8  , KC_P9  , KC_NO  , KC_BSPC,
-KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_PEQL, KC_NO  , KC_P4  , KC_P5  , KC_P6  , KC_NO  , KC_TRNS,
-KC_TRNS, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_P1  , KC_P2  , KC_P3  , KC_UP  , KC_NO  ,
-KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS     , KC_P0  , KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT
-),
-};
diff --git a/keyboards/keyhive/ut472/keymaps/gardego5/readme.md b/keyboards/keyhive/ut472/keymaps/gardego5/readme.md
deleted file mode 100644
index 44655ba3465..00000000000
--- a/keyboards/keyhive/ut472/keymaps/gardego5/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Gardego5's modified layout
-
-![layout image](https://i.imgur.com/eM6YHcY.jpeg)
-
-This layout is designed to be familiar coming from a full-sized keyboard, if you like vim movement keys. Has (hopefully) friendly media keys, and F15 in the bottom right when held, so that you can bind F15 to push to talk.
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/config.h b/keyboards/keyhive/ut472/keymaps/stefanopace/config.h
deleted file mode 100644
index d16927d3c9c..00000000000
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Stefano Pace
- * 
- * 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 3
-#define TAPPING_TERM 175
-#define PERMISSIVE_HOLD
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
deleted file mode 100644
index 9d1780b1616..00000000000
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright 2021 Stefano Pace
- * 
- * 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 {
-    _QWE,
-    _SYM,
-    _NUM,
-    _NAV,
-    _NV2,
-    _FN,
-};
-
-enum tapdance {
-    TD_SINGLE_QUOTE_DOUBLE_QUOTES,
-    TD_APP_CAPS_LOCK,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_SINGLE_QUOTE_DOUBLE_QUOTES] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQUO),
-    [TD_APP_CAPS_LOCK]              = ACTION_TAP_DANCE_DOUBLE(KC_APP, KC_CAPS),
-};
-
-#define LTFN_ESC LT(_FN, KC_ESC)
-#define LTSYM_F LT(_SYM, KC_F)
-#define LTSYM_J LT(_SYM, KC_J)
-#define TD_QUOT TD(TD_SINGLE_QUOTE_DOUBLE_QUOTES)
-#define TD_APP_CAPS TD(TD_APP_CAPS_LOCK)
-#define SFT_SLSH RSFT_T(KC_SLSH)
-
-#define UNDO LCTL(KC_Z)
-#define REDO LCTL(KC_Y)
-#define CUT LCTL(KC_X)
-#define COPY LCTL(KC_C)
-#define PASTE LCTL(KC_V)
-
-#define CUSTOM1 LCA(KC_EQL)
-#define CUSTOM2 MEH(KC_PLUS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-       /* Base qwerty Layer
-        * 
-        * Holding Esc activates the Fn layer
-        * Holding F or J activates Symbols layer
-        * Holding / acts as Shift
-        * Double tap on ' acts as "
-        * Double tap on Menu activates CapsLock
-        * 
-        * Nav and Num layers are togglable with triple tapping on relative keys while holding them will activate layers momentarily.
-        * 
-        * I personally use Pause to mute/unmute microphone
-        * I personally use Menu to act as compose key to input accented letters
-        * 
-        * ,----------------------------------------------------------------------------.
-        * |Esc-Fn|  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bspace  |
-        * |----------------------------------------------------------------------------+
-        * | Tab   |  A  |  S  |  D  |F-Sym|  G  |  H  |J-Sym|  K  |  L  |  '*  | Enter |
-        * |----------------------------------------------------------------------------+
-        * | Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |/-Shift|Menu*|
-        * |----------------------------------------------------------------------------+
-        * | Ctrl | Gui | Alt |Pause|(Nav) |   Space   |(Num) |Left |Down | Up   |Right |
-        * `----------------------------------------------------------------------------'
-        */
-    [_QWE] = LAYOUT(
-        LTFN_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,     LTSYM_F,   KC_G,    KC_H,    LTSYM_J,   KC_K,     KC_L,     TD_QUOT,   KC_ENT,
-        KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,    KC_N,    KC_M,      KC_COMM,  KC_DOT,   SFT_SLSH,  TD_APP_CAPS,
-        KC_LCTL,   KC_LGUI,  KC_LALT,  KC_PAUS,  TT(_NAV),       KC_SPC,      TT(_NUM),  KC_LEFT,  KC_DOWN,  KC_UP,     KC_RGHT
-    ),
-
-       /* Symbols Layer (Sym)
-        * ,----------------------------------------------------------------------------.
-        * |      |  `  |  @  |  #  |  $  |  %  |     |  &  |  *  |  ^  |     |  Del    |
-        * |----------------------------------------------------------------------------+
-        * |       |  ~  |  {  |  -  |  (  |  +  |  =  |  )  |  |  |  }  |   ;  |       |
-        * |----------------------------------------------------------------------------+
-        * |        |  !  |  <  |  _  |  [  |     |  :  |  ]  |  \  |  >  |  ?   |      |
-        * |----------------------------------------------------------------------------+
-        * |      |     |     |     |     |            |      |     |     |      |      |
-        * `----------------------------------------------------------------------------'
-        */
-    [_SYM] = LAYOUT(
-        _______,  KC_GRV,   KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  XXXXXXX,  KC_AMPR,  KC_ASTR,  KC_CIRC,  XXXXXXX,  KC_DEL,
-        _______,  KC_TILD,  KC_LCBR,  KC_MINS,  KC_LPRN,  KC_PLUS,  KC_EQL,   KC_RPRN,  KC_PIPE,  KC_RCBR,  KC_SCLN,  _______,
-        _______,  KC_EXLM,  KC_LT,    KC_UNDS,  KC_LBRC,  XXXXXXX,  KC_COLN,  KC_RBRC,  KC_BSLS,  KC_GT,    KC_QUES,  _______,
-        _______,  _______,  _______,  _______,  XXXXXXX,       _______,       XXXXXXX,  _______,  _______,  _______,  _______
-    ),
-
-       /* Numbers Layer (Num)
-        *
-        * Custom2 will act as Ctrl+Shift+Alt+"+" that can be used for example to spawn new terminal instances
-        * ,----------------------------------------------------------------------------.
-        * |      |     |     |     |     |    |Ctrl-y|     |     |     |     |         |
-        * |----------------------------------------------------------------------------+
-        * |       |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0   |       |
-        * |----------------------------------------------------------------------------+
-        * |        |Ctr-z|Ctr-x|Ctr-c|Ctr-v|     |     |     |  ,  |  .  |      |      |
-        * |----------------------------------------------------------------------------+
-        * |      |     |     |    |Custom2|           |      |     |     |      |      |
-        * `----------------------------------------------------------------------------'
-        */
-    [_NUM] = LAYOUT(
-        _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,  REDO,     XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
-        _______,  KC_1,     KC_2,     KC_3,     KC_4,      KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
-        _______,  UNDO,     CUT,      COPY,     PASTE,     XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_COMM,  KC_DOT,   _______,  _______,
-        _______,  _______,  _______,  _______,  CUSTOM2,        _______,       _______,  _______,  _______,  _______,  _______
-    ),
-
-       /* Navigation Layer (Nav)
-        * 
-        * This layer is optimized for gui handling and code navigation
-        * It makes easier to reach common key combinations as: Ctrl+Shift, Gui+Shift, Ctrl+Alt, Alt+Tab, Ctrl+F, Ctrl+S
-        * 
-        * Holding (Nav2) replaces arrow keys with Home PgDown PgUp End
-        * 
-        * 
-        * Custom1 will act as Ctrl+Alt+"=" that can be used for example to focus last spawned terminal
-        * 
-        * ,----------------------------------------------------------------------------.
-        * |      |Shift|Shift|Shift|     |     |     |     |     |     |     |         |
-        * |----------------------------------------------------------------------------+
-        * |(Nav2) |Ctrl | Gui | Alt | Tab |     |Left |Down | Up  |Right|   F  |       |
-        * |----------------------------------------------------------------------------+
-        * |        |Ctr-z|Ctr-x|Ctr-c|Ctr-v|     |     |     |  L  |     |  A   |  S   |
-        * |----------------------------------------------------------------------------+
-        * |      |     |     |     |     |            |Custom1|    |     |      |      |
-        * `----------------------------------------------------------------------------'
-        */
-    [_NAV] = LAYOUT(
-        _______,   KC_LSFT,  KC_LSFT,  KC_LSFT,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,
-        MO(_NV2),  KC_LCTL,  KC_LGUI,  KC_LALT,  KC_TAB,   _______,  KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT,  KC_F,     _______,
-        _______,   UNDO,     CUT,      COPY,     PASTE,    _______,  _______,  _______,   KC_L,     KC_DOT,   KC_A,     KC_S,
-        _______,   _______,  _______,  _______,  _______,       _______,       CUSTOM1,   _______,  _______,  _______,  _______
-    ),
-
-       /* Speed Navigation Layer (Nav2)
-        * ,----------------------------------------------------------------------------.
-        * |      |     |     |     |     |     |     |     |     |     |     |         |
-        * |----------------------------------------------------------------------------+
-        * |       |     |     |     |     |     |Home |PgUp |PgDown|End |      |       |
-        * |----------------------------------------------------------------------------+
-        * |        |     |     |     |     |     |     |     |     |     |      |      |
-        * |----------------------------------------------------------------------------+
-        * |      |     |     |     |     |            |      |     |     |      |Reset |
-        * `----------------------------------------------------------------------------'
-        */
-    [_NV2] = LAYOUT(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,       _______,       _______,  _______,  _______,  _______,  QK_BOOT
-    ),
-
-       /* Fn Layer (Fn)
-        * ,----------------------------------------------------------------------------.
-        * |      |     |     |     |     |     |     | F1  | F2  | F3  | F10 |         |
-        * |----------------------------------------------------------------------------+
-        * | Print |     |     |     |     |     |     | F4  | F5  | F6  | F11  |       |
-        * |----------------------------------------------------------------------------+
-        * |ScrLock |     |     |     |     |     |     | F7  | F8  | F9  | F12  |      |
-        * |----------------------------------------------------------------------------+
-        * | Ins  |     |     |     |     |            |      |     |     |      |      |
-        * `----------------------------------------------------------------------------'
-        */
-    [_FN] = LAYOUT(
-        _______,  RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD,  RGB_HUI,  XXXXXXX,  KC_F1,    KC_F2,    KC_F3,    KC_F10,  XXXXXXX,
-        KC_PSCR,  RGB_SAD, RGB_SAI,  RGB_VAD, RGB_VAI,  RGB_SPD,  RGB_SPI,  KC_F4,    KC_F5,    KC_F6,    KC_F11,  XXXXXXX,
-        KC_SCRL,  RGB_M_P, RGB_M_B,  RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K,  KC_F7,    KC_F8,    KC_F9,    KC_F12,  XXXXXXX,
-        KC_INS,   XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX
-    ),
-};
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md b/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
deleted file mode 100644
index 63cef0934c2..00000000000
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Stefanopace's layout
-
-This layout is optimized for developers workflow.
-It includes layouts for symbols, numbers and text/gui navigation, all activables
-and usable without leaving the homerow position.
-More details are explained in the keymap.c file.
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk b/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
deleted file mode 100644
index d941780558b..00000000000
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-TAP_DANCE_ENABLE = yes
-
-MOUSEKEY_ENABLE = no 
-EXTRAKEY_ENABLE = no
-
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keyhive/ut472/keymaps/tucznak/config.h b/keyboards/keyhive/ut472/keymaps/tucznak/config.h
deleted file mode 100644
index bc3587f5424..00000000000
--- a/keyboards/keyhive/ut472/keymaps/tucznak/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#undef MANUFACTURER
-#undef PRODUCT
-
-#define MANUFACTURER    "Potato Inc."
-#define PRODUCT         "Qt3.14"
-
-/* turn off RGB when computer sleeps */
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SLEEP
-#endif
-
-/* send tap key if no layer key was used even after tap delay */
-#define TAPPING_TERM 50
-#define RETRO_TAPPING
diff --git a/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
deleted file mode 100644
index bb9e50e6b7d..00000000000
--- a/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _BASE,
-    _LEFT,
-    _RIGHT,
-    _NUM,
-    _FN
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Base Layer
-     * ,-------------------------------------------------------------------------.
-     * | Esc |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |Bspace |
-     * |-------------------------------------------------------------------------+
-     * | Tab  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |Enter |
-     * |-------------------------------------------------------------------------+
-     * | Shift |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  Up | FN  |
-     * |-------------------------------------------------------------------------+
-     * | Ctrl| Win | LAlt| NUM | LEFT |   Space   | RIGHT| RAlt| Left| Down|Right|
-     * `-------------------------------------------------------------------------'
-     */
-
-    [_BASE] = LAYOUT(
-        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_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   MO(_FN),
-        KC_LCTL, KC_LGUI, KC_LALT, MO(_NUM),MO(_LEFT),   KC_SPC,   MO(_RIGHT),  KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Left function layer (1)
-	 * F keys and navigation
-     * ,-------------------------------------------------------------------------.
-     * | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12   |
-     * |-------------------------------------------------------------------------+
-     * |      |     |     |     |     |     |     |     |     |     |     | Ins  |
-     * |-------------------------------------------------------------------------+
-     * |       | Caps|     |PrtSc|ScrLk|Pause|     |     |     |     | PgUp| Del |
-     * |-------------------------------------------------------------------------+
-     * |     |     |     |     |      |          |       | Menu| Home| PgDn| End |
-     * `-------------------------------------------------------------------------'
-     */
-
-    [_LEFT] = 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_INS,
-        _______, KC_CAPS, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, KC_PGUP, KC_DEL,
-        _______, _______, _______, _______, _______,     _______,      _______, KC_APP,  KC_HOME, KC_PGDN, KC_END
-    ),
-
-    /* Right function layer (2)
-	 * National and special characters
-     * ,-------------------------------------------------------------------------.
-     * | +1  | ě2  | š3  | č4  | ř5  | ž6  | ý7  | á8  | í9  | é0  | ´   |   ˇ   |
-     * |-------------------------------------------------------------------------+
-     * |  ;°  |  |  |     |     |     |     |  (  |  )  |  §  |  !  |  ú  |  /   |
-     * |-------------------------------------------------------------------------+
-     * |       |  \  |     |     |     |     |  %  |  =  |  ¨  |  '  |  -  |  _  |
-     * |-------------------------------------------------------------------------+
-     * |     |     |     |     |      |          |       |     |     |     |     |
-     * `-------------------------------------------------------------------------'
-     */
-
-    [_RIGHT] = LAYOUT(
-        KC_1,    KC_2,          KC_3,    KC_4,    KC_5,    KC_6,    KC_7,          KC_8,    KC_9,    KC_0,          KC_EQL,  LSFT(KC_EQL),
-        KC_GRV,  LSFT(KC_NUBS), _______, _______, _______, _______, LSFT(KC_RBRC), KC_RBRC, KC_QUOT, LSFT(KC_QUOT), KC_LBRC, LSFT(KC_LBRC),
-        _______, KC_NUBS,       _______, _______, _______, _______, LSFT(KC_MINS), KC_MINS, KC_BSLS, LSFT(KC_BSLS), KC_SLSH, LSFT(KC_SLSH),
-        _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-    ),
-
-    /* Numpad layer (3)
-     * ,-------------------------------------------------------------------------.
-     * |     |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |       |
-     * |-------------------------------------------------------------------------+
-     * |      |     |     |     |     |     |     |  4  |  5  |  6  |  /  |      |
-     * |-------------------------------------------------------------------------+
-     * |       |NumLk|     |     |     |     |     |  1  |  2  |  3  |  *  |     |
-     * |-------------------------------------------------------------------------+
-     * |     |     |     |     |      |          |   0   |  .  |  +  |  -  |     |
-     * `-------------------------------------------------------------------------'
-    */
-
-    [_NUM] = LAYOUT(
-        _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PSLS, _______,
-        _______, KC_NUM,  _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PAST, _______,
-        _______, _______, _______, _______, _______,     _______,      KC_KP_0, KC_DOT,  KC_PPLS, KC_PMNS, _______
-    ),
-	
-	/* Function layer (4)
-     * Backlighting, keyboard controls, music etc.
-     * ,-------------------------------------------------------------------------.
-     * |Reset|     |     |     |     |     |     |     |     |     |     |  Vol+ |
-     * |-------------------------------------------------------------------------+
-     * |      | VLK | Mod+| Hue+| Sat+| Val+|     |     |     |     |     | Vol- |
-     * |-------------------------------------------------------------------------+
-     * |       | TOG | Mod-| Hue-| Sat-| Val-|     |     |     |     | Stop| Mute|
-     * |-------------------------------------------------------------------------+
-     * |Sleep|     |     |     |      |   C+A+D  | C+A+I |     | Prev|Pause| Next|
-     * `-------------------------------------------------------------------------'
-    */
-
-    [_FN] = LAYOUT(
-        QK_BOOT, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
-        _______, VK_TOGG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_VOLD,
-        _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, KC_MSTP, KC_MUTE,
-        KC_SLEP, _______, _______,  _______, _______,  LCA(KC_DEL), LCA(KC_INS), _______, KC_MPRV, KC_MPLY, KC_MNXT
-    )
-};
diff --git a/keyboards/keyhive/ut472/keymaps/tucznak/readme.md b/keyboards/keyhive/ut472/keymaps/tucznak/readme.md
deleted file mode 100644
index 95180bc392a..00000000000
--- a/keyboards/keyhive/ut472/keymaps/tucznak/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# TuCZnak's modified layout
-
-This layout is optimized for Czech national QWERTZ keymap.
-It includes separated layers for numbers, national characters,
-special characters and configuration.
diff --git a/keyboards/keyhive/ut472/keymaps/tucznak/rules.mk b/keyboards/keyhive/ut472/keymaps/tucznak/rules.mk
deleted file mode 100644
index d394c719f8a..00000000000
--- a/keyboards/keyhive/ut472/keymaps/tucznak/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes           # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c b/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
deleted file mode 100644
index 6c21a3874cd..00000000000
--- a/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2022 Keyprez (https://github.com/keyprez)
-// 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,
-    _CMD
-};
-
-#define FN   MO(_FN)
-#define CMD   MO(_CMD)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        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_MUTE,
-        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_END, KC_DEL,
-        KC_ESC, 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_INSERT,
-        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_COPY,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  FN,                             KC_SPC,  KC_RALT, FN,      KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PASTE
-    ),
-
-    [_FN] = 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,  _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_BRIU, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC
-    ),
-};
-
diff --git a/keyboards/keyprez/unicorn/keymaps/jorge/readme.md b/keyboards/keyprez/unicorn/keymaps/jorge/readme.md
deleted file mode 100644
index f3e626cc76d..00000000000
--- a/keyboards/keyprez/unicorn/keymaps/jorge/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for unicorn
diff --git a/keyboards/keyten/diablo/info.json b/keyboards/keyten/diablo/info.json
new file mode 100644
index 00000000000..3b3e040b08a
--- /dev/null
+++ b/keyboards/keyten/diablo/info.json
@@ -0,0 +1,226 @@
+{
+    "manufacturer": "keyten",
+    "keyboard_name": "Diablo",
+    "maintainer": "key10iq",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B7", "F0", "F1", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2"],
+        "rows": ["D4", "D1", "F7", "F6", "F5"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6003",
+        "vid": "0xEB69"
+    },
+    "community_layouts": [
+        "60_ansi_wkl_split_bs_rshift",
+        "60_hhkb",
+        "60_tsangan_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [4, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [4, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [4, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyten/diablo/keymaps/default/keymap.c b/keyboards/keyten/diablo/keymaps/default/keymap.c
new file mode 100644
index 00000000000..658b09636a8
--- /dev/null
+++ b/keyboards/keyten/diablo/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [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_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, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_tsangan_hhkb(
+        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/keyten/diablo/keymaps/via/keymap.c b/keyboards/keyten/diablo/keymaps/via/keymap.c
new file mode 100644
index 00000000000..658b09636a8
--- /dev/null
+++ b/keyboards/keyten/diablo/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [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_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, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_tsangan_hhkb(
+        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/keyten/diablo/keymaps/via/rules.mk b/keyboards/keyten/diablo/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/keyten/diablo/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keyten/diablo/readme.md b/keyboards/keyten/diablo/readme.md
new file mode 100644
index 00000000000..f8189c45ce9
--- /dev/null
+++ b/keyboards/keyten/diablo/readme.md
@@ -0,0 +1,27 @@
+# keyten Diablo
+
+Diablo - 60% keyboard with Leaf-Spring PCB Sandwich mount
+
+![Diablo image](https://i.imgur.com/zxOPpNih.jpg)
+
+* Keyboard Maintainer: [keyten](https://github.com/key10iq)
+* Hardware Supported: keyten Diablo
+* Hardware Availability: private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keyten/diablo:default
+	
+Flashing example for this keyboard:
+
+    make keyten/diablo: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
+* Keycode in layout: Press the key mapped to `QK_BOOT` if it is available
+* Physical reset button: Press the button on the back of the PCB
diff --git a/keyboards/kudox/rev3/rules.mk b/keyboards/keyten/diablo/rules.mk
similarity index 100%
rename from keyboards/kudox/rev3/rules.mk
rename to keyboards/keyten/diablo/rules.mk
diff --git a/keyboards/enter67/info.json b/keyboards/kezewa/enter67/info.json
similarity index 100%
rename from keyboards/enter67/info.json
rename to keyboards/kezewa/enter67/info.json
diff --git a/keyboards/enter67/keymaps/default/keymap.c b/keyboards/kezewa/enter67/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/enter67/keymaps/default/keymap.c
rename to keyboards/kezewa/enter67/keymaps/default/keymap.c
diff --git a/keyboards/enter67/keymaps/via/keymap.c b/keyboards/kezewa/enter67/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/enter67/keymaps/via/keymap.c
rename to keyboards/kezewa/enter67/keymaps/via/keymap.c
diff --git a/keyboards/riot_pad/keymaps/via/rules.mk b/keyboards/kezewa/enter67/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/riot_pad/keymaps/via/rules.mk
rename to keyboards/kezewa/enter67/keymaps/via/rules.mk
diff --git a/keyboards/kezewa/enter67/readme.md b/keyboards/kezewa/enter67/readme.md
new file mode 100644
index 00000000000..beb5074f9d1
--- /dev/null
+++ b/keyboards/kezewa/enter67/readme.md
@@ -0,0 +1,27 @@
+# ENTER67 - PCB
+
+![enter67](https://imgur.com/igF8Lurh.jpg)
+
+67 layout PCB, with option for stepped Caps Lock
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: enter67 PCB
+* Hardware Availability: [Kezewa](https://kezewa.com/)
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make kezewa/enter67:default
+    
+Flashing example for this keyboard:
+
+    make kezewa/enter67: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 `QK_BOOT` if it is available
diff --git a/keyboards/kezewa/enter67/rules.mk b/keyboards/kezewa/enter67/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/kezewa/enter67/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/enter80/info.json b/keyboards/kezewa/enter80/info.json
similarity index 100%
rename from keyboards/enter80/info.json
rename to keyboards/kezewa/enter80/info.json
diff --git a/keyboards/enter80/keymaps/default/keymap.c b/keyboards/kezewa/enter80/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/enter80/keymaps/default/keymap.c
rename to keyboards/kezewa/enter80/keymaps/default/keymap.c
diff --git a/keyboards/enter80/keymaps/via/keymap.c b/keyboards/kezewa/enter80/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/enter80/keymaps/via/keymap.c
rename to keyboards/kezewa/enter80/keymaps/via/keymap.c
diff --git a/keyboards/kezewa/enter80/keymaps/via/rules.mk b/keyboards/kezewa/enter80/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/kezewa/enter80/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enter80/matrix_diagram.md b/keyboards/kezewa/enter80/matrix_diagram.md
similarity index 100%
rename from keyboards/enter80/matrix_diagram.md
rename to keyboards/kezewa/enter80/matrix_diagram.md
diff --git a/keyboards/kezewa/enter80/readme.md b/keyboards/kezewa/enter80/readme.md
new file mode 100644
index 00000000000..eaecf514cb8
--- /dev/null
+++ b/keyboards/kezewa/enter80/readme.md
@@ -0,0 +1,27 @@
+# ENTER80 - PCB
+
+![enter80](https://i.imgur.com/rH9m5Ysh.jpg)
+
+80 layout PCB, With caps lock light
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: enter80 PCB
+* Hardware Availability: [Kezewa](https://kezewa.com/)
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make enter80:default
+    
+Flashing example for this keyboard:
+
+    make enter80: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 `QK_BOOT` if it is available
diff --git a/keyboards/kezewa/enter80/rules.mk b/keyboards/kezewa/enter80/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/kezewa/enter80/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kikoslab/kl90/config.h b/keyboards/kikoslab/kl90/config.h
new file mode 100644
index 00000000000..c77c6e6276c
--- /dev/null
+++ b/keyboards/kikoslab/kl90/config.h
@@ -0,0 +1,19 @@
+/*
+Copyright 2021 IntusFacultas <pdelmorallopez@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 ENCODER_MAP_KEY_DELAY 2
diff --git a/keyboards/kikoslab/kl90/keymaps/via/keymap.c b/keyboards/kikoslab/kl90/keymaps/via/keymap.c
index 4dbffe8f772..7534fa27612 100644
--- a/keyboards/kikoslab/kl90/keymaps/via/keymap.c
+++ b/keyboards/kikoslab/kl90/keymaps/via/keymap.c
@@ -16,10 +16,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include QMK_KEYBOARD_H
 
+enum Layers {
+    _BASE,
+    _LOWER,
+    _RAISE,
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_all(
+[_BASE] = LAYOUT_all(
     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_PSCR,   KC_MPLY,
     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_INS ,
     KC_F14 ,   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 ,
@@ -27,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F16 ,   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_BSLS,   KC_UP  ,   KC_PGDN,
     KC_F17 ,   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(
+[_LOWER] = LAYOUT_all(
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
@@ -35,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
     _______,   _______,   _______,   _______,   _______,   _______,              _______,   _______,              _______,   _______,   _______,   _______,   _______,   _______),
 
-[2] = LAYOUT_all(
+[_RAISE] = LAYOUT_all(
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
@@ -44,22 +49,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,   _______,   _______,   _______,   _______,   _______,              _______,   _______,              _______,   _______,   _______,   _______,   _______,   _______),
 };
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_WH_D);
-        } else {
-            tap_code(KC_WH_U);
-        }
-    } else if (index == 1) { /* Second encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_BASE] =   { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [_LOWER] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),           ENCODER_CCW_CW(RGB_SAD, RGB_SAI)  },
+    [_RAISE] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),           ENCODER_CCW_CW(RGB_SPD, RGB_SPI)  },
+};
+#endif
 
 #ifdef OLED_ENABLE
 
diff --git a/keyboards/kikoslab/kl90/keymaps/via/rules.mk b/keyboards/kikoslab/kl90/keymaps/via/rules.mk
index d03b5f1ca75..16d6a247ec8 100644
--- a/keyboards/kikoslab/kl90/keymaps/via/rules.mk
+++ b/keyboards/kikoslab/kl90/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-WPM_ENABLE = yes
\ No newline at end of file
+WPM_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kin80/keymaps/andrew/keymap.c b/keyboards/kin80/keymaps/andrew/keymap.c
deleted file mode 100644
index 1031396880e..00000000000
--- a/keyboards/kin80/keymaps/andrew/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {
-    _BASE, // default layer
-    _L2   // macros
-};
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  EMAIL1				// Macro example (type email address)
-};
-
-/*
-*
-*
-* ,-------------------------------------------,                           ,-------------------------------------------,
-* |  Esc   |  F2  |  F3  |  F4  |  F5  |  F6  |                           |  F7  |  F8  |  F9  |  F10 |  F11 |   F12  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |   +=   |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |  Tab   |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |   \|   |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |  Caps  |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  | '"/L2  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  <,  |  >.  |  /?  | Shift  |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |`~/L2 |  <,  | Left | Right|                                         |  Up  | Down |  [   |   ]  |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | Cmd  | Opt  |         | Ctrl | Cmd  |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 |Backsp|Delete|------|         |------|Enter | Space|
-*                                 |      |      | End  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-    KC_ESC,     KC_F2,  KC_F3,   KC_F4,    KC_F5,   KC_F6,     KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_EQL,     KC_1,   KC_2,    KC_3,     KC_4,    KC_5,      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_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_CAPS,    KC_A,   KC_S,    KC_D,     KC_F,    KC_G,      KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, LT(_L2, 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,
-       LT(_L2, KC_GRV), KC_COMM, KC_LEFT,  KC_RIGHT,                   KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-			                           KC_LCMD,  KC_LOPT,                    KC_RCTL,  KC_RCMD,
-                                           KC_HOME,                    KC_PGUP,
-                        KC_BSPC, KC_DEL,   KC_END,                     KC_PGDN, KC_ENTER, KC_SPC
-    ),
-/*
-*
-*
-* ,-------------------------------------------,                           ,-------------------------------------------,
-* |   F1   |      |      |      |      |      |                           |EMAIL1|      |      |PrnSc | ScrLk| Pause  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           | VRSN |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  MbL |  MUp |  MbR |      |                           |QK_BOOT |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  ML  |  MDn |  MR  |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-*          |      |Insert|      |      |                                         |      |      |      |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         |      |      |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | MWh+ |         |      |      |      |
-*                                 |      |      |------|         |------|      |      |
-*                                 |      |      | MWh- |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_L2] = LAYOUT(
-    KC_F1,   _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
-    _______, _______, _______, _______, _______, _______,   VRSN,    _______, _______, _______, _______, _______,
-    _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, QK_BOOT, _______, _______, _______, _______, _______,
-    _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-             _______, KC_INS,  _______, _______,                     _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 KC_WH_U,   _______,
-                               _______, _______, KC_WH_D,   _______, _______, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	  case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-	  
-	  case EMAIL1:
-      if (record->event.pressed) {
-        SEND_STRING("MyEmail@gmail.com");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(LED4_PIN, layer_state_cmp(state, _L2));
-  return state;
-}
diff --git a/keyboards/kin80/keymaps/debug/keymap.c b/keyboards/kin80/keymaps/debug/keymap.c
deleted file mode 100644
index ef92ee4fee1..00000000000
--- a/keyboards/kin80/keymaps/debug/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * 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(
-        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, 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, 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, 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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-        
-    )
-};
-
-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("row: %u, col: %u, pressed: %u\n", record->event.key.row, record->event.key.col, record->event.pressed);
-#endif 
-  return true;
-}
\ No newline at end of file
diff --git a/keyboards/kin80/keymaps/debug/rules.mk b/keyboards/kin80/keymaps/debug/rules.mk
deleted file mode 100644
index 15b7f725b26..00000000000
--- a/keyboards/kin80/keymaps/debug/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONSOLE_ENABLE = yes
diff --git a/keyboards/kin80/keymaps/maxim/keymap.c b/keyboards/kin80/keymaps/maxim/keymap.c
deleted file mode 100644
index 1e1897f3998..00000000000
--- a/keyboards/kin80/keymaps/maxim/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {
-    _BASE, // default layer
-    _NM,  // numpad on right, mouse on left
-    _MC   // macros
-};
-
-#define MC1 COMP_FR_QUOTES
-#define MC2 COMP_NBSP_EM_DASH
-#define MC3 COMP_NBSP
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  COMP_FR_QUOTES,		// Compose: french quotes
-  COMP_NBSP_EM_DASH,	// Compose: nbsp followed by em dash
-  COMP_NBSP,			// Compose: nbsp
-  PWD1,					// Windows password
-  PWD2,					// Stand root password
-  PWD3,					// KP password
-  EMAIL1				// Gmail address
-};
-
-/*
-*
-*
-* ,--------------------------------------------                           --------------------------------------------.
-* |  Esc   |  F2  |  F3  |  F4  |  F5  |  F6  |                           |  F7  |  F8  |  F9  |  F10 | PrSc |  RAlt  |
-* |--------+------+------+------+------+------+                           +------+------+------+------+------+--------|
-* | +=/Alt |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |  Tab   |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  | \|     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |`~/NM   |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  | '"/NM  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  ,.  |  .>  |  /?  | Shift  |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |  MC  |C+Shft|   [  |   ]  |                                         | Left | Down |  Up  | Right|
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |  Ctl |Enter |         | Gui  | Ctrl |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 |Space |Backsp|------|         |------|  Del | Enter|
-*                                 |      |      | End  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-    KC_ESC,           KC_F2,  KC_F3,  KC_F4,         KC_F5,   KC_F6,   KC_F7,  KC_F8,  KC_F9,   KC_F10, KC_PSCR, KC_RALT,
-    LALT_T(KC_EQL),   KC_1,   KC_2,   KC_3,          KC_4,    KC_5,    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_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_BSLS,
-    LCTL_T(KC_GRV),   KC_A,   KC_S,   KC_D,          KC_F,    KC_G,    KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, LT(_NM, 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,
-                      MO(_MC), LCTL(KC_LSFT), KC_LBRC, KC_RBRC, KC_LEFT,KC_DOWN, KC_UP,  KC_RGHT,
-			                              MO(_NM),  KC_ENTER,                KC_RGUI,KC_RCTL,
-                                              KC_HOME,                 KC_PGUP,
-                             KC_SPC, KC_BSPC, KC_END,                  KC_PGDN,KC_DEL, KC_ENTER
-    ),
-/*
-*
-*
-* ,--------------------------------------------                           --------------------------------------------.
-* |   F1   |      |      |      |      |      |                           |      |      |      |      | F11  |  F12   |
-* |--------+------+------+------+------+------+                           +------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |ScrLk |Numlck|  =   |  /   |  *   |        |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |      |  MbL |  MUp |  MbR | Ins  |                           |CapsLk|  7   |  8   |  9   |  -   |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  ML  |  MDn |  MR  |      |                           |      |  4   |  5   |  6   |  +   |  L1    |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |  .   |  1   |  2   |  3   |Enter |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |      |      |      |                                         |      |      |      |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         |      |      |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |MWhUp |         |      |      |      |
-*                                 |      |      |------|         |------|      |  0   |
-*                                 |      |      |MWhDn |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_NM] = LAYOUT(
-    KC_F1,   _______, _______,  _______, _______, _______,  _______, _______, _______, _______,  KC_F11,  KC_F12,
-    _______, _______, _______, _______, _______, _______,   KC_SCRL, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST, _______,
-    _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_INS,    KC_CAPS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
-    _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,   _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
-    _______, _______, _______, _______, _______, _______,   KC_PDOT, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-             _______, _______, _______, _______,                     _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 KC_WH_U,   _______,
-                               _______, _______, KC_WH_D,   _______, _______, KC_P0
-    ),
-/*
-*
-*
-* ,--------------------------------------------                           --------------------------------------------.
-* | version|      |      |      |      |      |                           |email |      |      |      |      |        |
-* |--------+------+------+------+------+------+                           +------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |   MC2  |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |      |      |      |reset |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |  MC1 |      |      |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |      |      |      |                                         |      |      |      |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         |      |      |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |      |         |      |      |      |
-*                                 |  MC3 |      |------|         |------|      |      |
-*                                 |      |      |      |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_MC] = LAYOUT(
-    VRSN,    _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, PWD3,    PWD2,    PWD1,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, MC2,
-    _______, _______, _______, _______, QK_BOOT, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, MC1,     _______, _______, _______,
-             _______, _______, _______, _______,                     _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 _______,   _______,
-                               MC3,     _______, _______,   _______, _______, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	  case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-	  
-	  case COMP_FR_QUOTES:
-      if (record->event.pressed) {
-        SEND_STRING(SS_TAP(X_RALT)"<<"SS_TAP(X_RALT)">>"SS_TAP(X_LEFT));
-      }
-      return false;
-      break;
-	  
-	  case COMP_NBSP_EM_DASH:
-      if (record->event.pressed) {
-        SEND_STRING(SS_TAP(X_RALT)"  "SS_TAP(X_RALT)"--- ");
-      }
-      return false;
-      break;
-	  
-	  case COMP_NBSP:
-      if (record->event.pressed) {
-        SEND_STRING(SS_TAP(X_RALT)"  ");
-      }
-      return false;
-      break;
-	  
-    case PWD1:
-      if (record->event.pressed) {
-        SEND_STRING("password1"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;
-	  
-	  case PWD2:
-      if (record->event.pressed) {
-        SEND_STRING("password2"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;
-	  
-	  case PWD3:
-      if (record->event.pressed) {
-        SEND_STRING("password3"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;
-	  
-	  case EMAIL1:
-      if (record->event.pressed) {
-        SEND_STRING("email@example.com");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(LED4_PIN, layer_state_cmp(state, _MC));
-  return state;
-}
diff --git a/keyboards/kin80/keymaps/quartz64/config.h b/keyboards/kin80/keymaps/quartz64/config.h
deleted file mode 100644
index 0b5cc5399b3..00000000000
--- a/keyboards/kin80/keymaps/quartz64/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2022 DmNosachev
-
-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 LSPO_KEYS KC_LSFT, KC_TRNS, KC_LBRC
-#define RSPC_KEYS KC_RSFT, KC_TRNS, KC_RBRC
-
-#define ENCODERS_PAD_A { A10 }
-#define ENCODERS_PAD_B { A9 }
\ No newline at end of file
diff --git a/keyboards/kin80/keymaps/quartz64/keymap.c b/keyboards/kin80/keymaps/quartz64/keymap.c
deleted file mode 100644
index 4eab31caf23..00000000000
--- a/keyboards/kin80/keymaps/quartz64/keymap.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {
-    _BASE, // default layer
-    _NM,  // numpad onright, mouse on left
-    _MC   // macros
-};
-
-#define MC1 COMP_FR_QUOTES
-#define MC2 COMP_NBSP_EM_DASH
-#define MC3 COMP_NBSP
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  COMP_FR_QUOTES,		// Compose: french quotes
-  COMP_NBSP_EM_DASH,	// Compose: nbsp followed by em dash
-  COMP_NBSP,			// Compose: nbsp
-  PWD1,
-  PWD2,
-  PWD3,
-  PWD4,
-  EMAIL1				// Gmail address
-};
-
-/*
-*
-*
-* ,--------------------------------------------                           --------------------------------------------.
-* |  Esc   |  F2  |  F3  |  F4  |  F5  |  F6  |                           |  F7  |  F8  |  F9  |  F10 | PrSc |  RAlt  |
-* |--------+------+------+------+------+------+                           +------+------+------+------+------+--------|
-* | +=/Alt |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |  Tab   |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  | \|     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |`~/Ctrl |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  | '"/NM  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |Z/Ctrl|   X  |   C  |   V  |   B  |                           |   N  |   M  |  ,.  |  .>  |  /?  | Shift  |
-* `-+------+------+------+------+------+------|                           |------+------+------+------+------+------+-'
-*   | Play |  MC  |C+Shft|   [  |   ]  |      |                           |      | Left | Down |  Up  | Right|      |
-*   `-----------------------------------------'                           `-----------------------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |  NM  |Enter |         | Gui  | Ctrl |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 |Space |Backsp|------|         |------|  Del | Enter|
-*                                 |      |      | End  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT_all(
-    KC_ESC,           KC_F2,  KC_F3,         KC_F4,   KC_F5,   KC_F6,     KC_F7,  KC_F8,  KC_F9,   KC_F10, KC_PSCR, KC_RALT,
-    LALT_T(KC_EQL),   KC_1,   KC_2,          KC_3,    KC_4,    KC_5,      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_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_BSLS,
-    LCTL_T(KC_GRV),   KC_A,   KC_S,          KC_D,    KC_F,    KC_G,      KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, LT(_NM, KC_QUOT),
-    SC_LSPO,    LCTL_T(KC_Z), KC_X,          KC_C,    KC_V,    KC_B,      KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
-    KC_MPLY,         MO(_MC), LCTL(KC_LSFT), KC_LBRC, KC_RBRC, KC_NO,     KC_NO,  KC_LEFT,KC_DOWN, KC_UP,  KC_RGHT,KC_NO,
-			                                        MO(_NM),  KC_ENTER,            KC_RGUI,KC_RCTL,
-                                                        KC_HOME,             KC_PGUP,
-                                       KC_SPC, KC_BSPC, KC_END,              KC_PGDN,KC_DEL, KC_ENTER
-    ),
-/*
-*
-*
-* ,--------------------------------------------                           --------------------------------------------.
-* |   F1   |au on |au off|      |      |      |                           |ck tg |ck up |ck dn |ck rst| F11  |  F12   |
-* |--------+------+------+------+------+------+                           +------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |ScrLk |Numlck|  =   |  /   |  *   |        |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |      |  MbL |  MUp |  MbR | Ins  |                           |CapsLk|  7   |  8   |  9   |  -   |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  ML  |  MDn |  MR  |      |                           |      |  4   |  5   |  6   |  +   |  L1    |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |  .   |  1   |  2   |  3   |Enter |        |
-* `-+------+------+------+------+------+------|                           |------+------+------+------+------+------+-'
-*   |      |      |      |      |      |      |                           |      |      |      |      |      |      |
-*   `-----------------------------------------'                           `-----------------------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         |      |      |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |MWhUp |         |      |      |      |
-*                                 |      |      |------|         |------|      |  0   |
-*                                 |      |      |MWhDn |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_NM] = LAYOUT_all(
-    KC_F1,   AU_ON,   AU_OFF,  _______, _______, _______,   CK_TOGG, CK_UP,   CK_DOWN, CK_RST,  KC_F11,  KC_F12,
-    _______, _______, _______, _______, _______, _______,   KC_SCRL, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST, _______,
-    _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_INS,    KC_CAPS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
-    _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,   _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
-    _______, _______, _______, _______, _______, _______,   KC_PDOT, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 KC_WH_U,   _______,
-                               _______, _______, KC_WH_D,   _______, _______, KC_P0
-    ),
-/*
-*
-*
-* ,--------------------------------------------                           --------------------------------------------.
-* |        |      |      |      |      |      |                           |email |      | PWD4 | PWD3 | PWD2 |  PWD1  |
-* |--------+------+------+------+------+------+                           +------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |   MC2  |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |      |      |      |reset |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |  MC1 |      |      |        |
-* `-+------+------+------+------+------+------|                           |------+------+------+------+------+------+-'
-*   |      |      |      |      |      |      |                           |      |      |      |      |      |      |
-*   `-----------------------------------------'                           `-----------------------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         |      |      |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |      |         |      |      |      |
-*                                 |  MC3 |      |------|         |------|      |      |
-*                                 |      |      |      |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_MC] = LAYOUT_all(
-    VRSN,    _______, _______, _______, _______, _______,   EMAIL1,  _______, PWD4,    PWD3,    PWD2,    PWD1,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, MC2,
-    _______, _______, _______, _______, QK_BOOT, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, MC1,     _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 _______,   _______,
-                               MC3,     _______, _______,   _______, _______, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	  case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-	  
-	  case COMP_FR_QUOTES:
-      if (record->event.pressed) {
-        SEND_STRING(SS_TAP(X_RALT)"<<"SS_TAP(X_RALT)">>"SS_TAP(X_LEFT));
-      }
-      return false;
-      break;
-	  
-	  case COMP_NBSP_EM_DASH:
-      if (record->event.pressed) {
-        SEND_STRING(SS_TAP(X_RALT)"  "SS_TAP(X_RALT)"--- ");
-      }
-      return false;
-      break;
-	  
-	  case COMP_NBSP:
-      if (record->event.pressed) {
-        SEND_STRING(SS_TAP(X_RALT)"  ");
-      }
-      return false;
-      break;
-	  
-    case PWD1:
-      if (record->event.pressed) {
-        SEND_STRING("NakedLunch1991"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;
-	  
-	  case PWD2:
-      if (record->event.pressed) {
-        SEND_STRING("O94nx4sUWHc4akud"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;
-	  
-	  case PWD3:
-      if (record->event.pressed) {
-        SEND_STRING("Q123qQ123q"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;
-      
-    case PWD4:
-      if (record->event.pressed) {
-        SEND_STRING("EraserHead1976"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;  
-	  
-	  case EMAIL1:
-      if (record->event.pressed) {
-        SEND_STRING("quartz64@gmail.com");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return false;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(LED4_PIN, !layer_state_cmp(state, _MC));
-  return state;
-}
diff --git a/keyboards/kin80/keymaps/quartz64/rules.mk b/keyboards/kin80/keymaps/quartz64/rules.mk
deleted file mode 100644
index 5af1ba85367..00000000000
--- a/keyboards/kin80/keymaps/quartz64/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/kin80/keymaps/roman/keymap.c b/keyboards/kin80/keymaps/roman/keymap.c
deleted file mode 100644
index 34620da97a8..00000000000
--- a/keyboards/kin80/keymaps/roman/keymap.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {
-    _BASE, // default layer
-    _L2   // macros
-};
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  EMAIL1				// Macro example (type email address)
-};
-
-/*
-*
-*
-* ,-------------------------------------------,                           ,-------------------------------------------,
-* |  Esc   |  F2  |  F3  |  F4  |  F5  |  F6  |                           |  F7  |  F8  |  F9  |  F10 |  F11 |   F12  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |   +=   |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |  Tab   |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |   \|   |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |  Caps  |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  | '"/L2  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  <,  |  >.  |  /?  | Shift  |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |`~/L2 |  <,  | Left | Right|                                         |  Up  | Down |  [   |   ]  |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |LCtrl |  Alt |         | GUI  |Shift |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 |Backsp|Delete|------|         |------|Enter | Space|
-*                                 |      |      | End  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-    KC_ESC,     KC_F2,  KC_F3,   KC_F4,    KC_F5,   KC_F6,     KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_EQL,     KC_1,   KC_2,    KC_3,     KC_4,    KC_5,      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_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_CAPS,    KC_A,   KC_S,    KC_D,     KC_F,    KC_G,      KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, LT(_L2, 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,
-       LT(_L2, KC_GRV), KC_COMM, KC_LEFT,  KC_RIGHT,                   KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-			                           KC_LCTL,  KC_LALT,                    KC_RGUI, KC_RSFT,
-                                           KC_HOME,                    KC_PGUP,
-                        KC_BSPC, KC_DEL,   KC_END,                     KC_PGDN, KC_ENTER, KC_SPC
-    ),
-/*
-*
-*
-* ,-------------------------------------------,                           ,-------------------------------------------,
-* |   F1   |      |      |      |      |      |                           |EMAIL1|      |      |PrnSc | ScrLk| Pause  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           | VRSN |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  MbL |  MUp |  MbR |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  ML  |  MDn |  MR  |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-*          |      |Insert|      |      |                                         |      |      |      |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         | Ralt |RCtrl |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | MWh+ |         |      |      |      |
-*                                 |      |      |------|         |------|      |      |
-*                                 |      |      | MWh- |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_L2] = LAYOUT(
-    KC_F1,   _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
-    _______, _______, _______, _______, _______, _______,   VRSN,    _______, _______, _______, _______, _______,
-    _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-             _______, KC_INS,  _______, _______,                     _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 KC_WH_U,   _______,
-                               _______, _______, KC_WH_D,   _______, _______, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	  case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-	  
-	  case EMAIL1:
-      if (record->event.pressed) {
-        SEND_STRING("MyEmail@gmail.com");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _L2:
-        writePinHigh(LED4_PIN);
-        break;
-    default: //  for any other layers, or the default layer
-        writePinLow(LED4_PIN);
-        break;
-    }
-  return state;
-}
diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c
index 07df19e966b..e1e637725b2 100644
--- a/keyboards/kinesis/alvicstep/matrix.c
+++ b/keyboards/kinesis/alvicstep/matrix.c
@@ -116,7 +116,7 @@ uint8_t matrix_scan(void)
         if (matrix_debouncing[i] != row) {
             matrix_debouncing[i] = row;
             if (debouncing) {
-                debug("bounce!: "); debug_hex(debouncing); debug("\n");
+                dprintf("bounce!: %02X\n", debouncing);
             }
             debouncing = DEBOUNCE;
         }
diff --git a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
deleted file mode 100644
index 7dbb4b9159e..00000000000
--- a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2023 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#define DVORAK_MAC_MODE 0 // Base Dvorak in Kinesis's Mac Mode with (Cmd, Option, Ctrl, Cmd) thumbkeys
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[DVORAK_MAC_MODE] = LAYOUT(
-        // left hand
-        KC_CAPS,  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_SCRL, KC_PAUS, KC_NUM, KC_PWR,
-        KC_EQL,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,        KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS,
-        KC_TAB,   KC_QUOT, KC_COMM, KC_DOT,  KC_P,   KC_Y,        KC_F,   KC_G,     KC_C,     KC_R,     KC_L,    KC_SLSH,
-        KC_ESC,   KC_A,    KC_O,    KC_E,    KC_U,   KC_I,        KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_BSLS,
-        KC_LSFT,  KC_SCLN, KC_Q,    KC_J,    KC_K,   KC_X,        KC_B,   KC_M,     KC_W,     KC_V,     KC_Z,    KC_RSFT,
-                  KC_GRV,  KC_INS,  KC_LEFT, KC_RIGHT,                          KC_UP,  KC_DOWN, KC_LBRC,    KC_RBRC,
-
-                            KC_LGUI, KC_LALT,        KC_RCTL,    KC_RGUI,
-                                     KC_HOME,        KC_PGUP,
-                   KC_BSPC, KC_DEL,  KC_END,        KC_PGDN, KC_ENT, KC_SPC
-    )
-};
diff --git a/keyboards/kinesis/keymaps/farmergreg/keymap.c b/keyboards/kinesis/keymaps/farmergreg/keymap.c
deleted file mode 100644
index cae763d8ec7..00000000000
--- a/keyboards/kinesis/keymaps/farmergreg/keymap.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2022 Gregory L. Dietsche <gregory.dietsche@cuw.edu>
- *
- * 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/>.
- *
- * To build this layout run:
- * qmk compile -kb kinesis/kint41 -km farmergreg
- *
- * Layout Details:
- * PROGM + F9 to QK_BOOT and load new firmware.
- * Colemak (default / PROGM+C), Dvorak (PROGM + F4) and QWERTY (PROGM+F3) layouts are available for use
- * CAPS LOCK is ESC (for use in VIM). Double tap to activate CAPS Lock
- * UP and DOWN arrows are swapped to be more like VIM
- * [] and {} are swapped to make programming easier
- */
-
-#include QMK_KEYBOARD_H
-
-
-enum {
-	_COLEMAK,
-	_DVORAK,
-	_QWERTY,
-	_QWERTY_GAME,
-	_KEYPAD,
-	_PROGM,
-	_LAYER_COUNT,
-};
-
-/*
- * Tap Dances
- */
-enum tap_dances {
-	TD_CAPS,	// ESC on tap, CAPS on double tap
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
-};
-
-/*
- * Key Overrides
- */
-const key_override_t lcurlytobracket = ko_make_basic(MOD_MASK_SHIFT, KC_LEFT_BRACKET, KC_LEFT_BRACKET);
-const key_override_t rcurlytobracket = ko_make_basic(MOD_MASK_SHIFT, KC_RIGHT_BRACKET, KC_RIGHT_BRACKET);
-const key_override_t lbrackettocurly = ko_make_basic(0, KC_LEFT_BRACKET, KC_LEFT_CURLY_BRACE);
-const key_override_t rbrackettocurly = ko_make_basic(0, KC_RIGHT_BRACKET, KC_RIGHT_CURLY_BRACE);
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-	&lcurlytobracket,
-	&rcurlytobracket,
-	&lbrackettocurly,
-	&rbrackettocurly,
-	NULL
-};
-
-/*
- * Key Maps
- */
-const uint16_t PROGMEM keymaps[_LAYER_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
-[_COLEMAK] = LAYOUT(
-	KC_ESC     , KC_F1 ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8,	KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL  ,KC_PAUS, TG(_KEYPAD), MO(_PROGM),	// I would prefer OSL(_PROGM) but MO emulates what Kinesis does in their firmware.
-	KC_EQL     , KC_1  ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,	KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
-	KC_TAB     , KC_Q  ,KC_W   ,KC_F   ,KC_P   ,KC_G   ,	KC_J   ,KC_L   ,KC_U   ,KC_Y   ,KC_SCLN,KC_BSLS,
-	TD(TD_CAPS), 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_GRV ,KC_BSLS,KC_LEFT,KC_RGHT,		KC_DOWN,KC_UP  ,KC_LBRC,KC_RBRC,
-
-			KC_LCTL,KC_LALT,			KC_RGUI,KC_RCTL,
-				KC_HOME,				KC_PGUP,
-			KC_BSPC,KC_DEL ,KC_END,			KC_PGDN,KC_ENT ,KC_SPC
-	)
-,[_DVORAK] = LAYOUT(
-	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,_______,_______, _______,
-	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
-	_______,KC_QUOT,KC_COMM,KC_DOT ,KC_P   ,KC_Y   ,	KC_F   ,KC_G   ,KC_C   ,KC_R   ,KC_L   ,KC_SLSH,
-	_______,KC_A   ,KC_O   ,KC_E   ,KC_U   ,KC_I   ,	KC_D   ,KC_H   ,KC_T   ,KC_N   ,KC_S   ,KC_QUOT,
-	_______,KC_SCLN,KC_Q   ,KC_J   ,KC_K   ,KC_X   ,	KC_B   ,KC_M   ,KC_W   ,KC_V   ,KC_Z   ,_______,
-		_______,_______,_______,_______,		_______,_______,_______,_______,
-
-			_______,_______,			_______,_______,
-				_______,				_______,
-			_______,_______,_______,			_______,_______,_______
-	)
-,[_QWERTY] = LAYOUT(
-	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
-	_______,KC_Q  ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,	KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,_______,
-	_______,KC_A  ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,	KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,_______,
-	_______,KC_Z  ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,	KC_N   ,KC_M   ,_______,_______,_______,_______,
-		    _______,_______,_______,_______,		_______,_______,_______,_______,
-			_______,_______,			_______,_______,
-				_______,				_______,
-			_______,_______,_______,			_______,_______,_______
-	)
-,[_QWERTY_GAME] = LAYOUT( // Shift WASD over to ESDF (QWERTY). Also move T and G
-	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,_______, _______,_______,
-	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
-	_______,KC_T   ,KC_Q   , KC_W  ,KC_E   ,KC_R   ,	_______,_______,_______,_______,_______,_______,
-	_______,KC_G   ,KC_A   , KC_S  ,KC_D   ,KC_F   ,	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
-		_______,_______,_______,_______,		_______,_______,_______,_______,
-
-			_______,_______,			_______,_______,
-				_______,				_______,
-			KC_SPC ,_______,_______,			_______,_______,KC_BSPC // SPACE becomes BACKSPACE
-	)
-,[_KEYPAD] = LAYOUT(
-	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,_______,_______ ,_______,KC_MUTE,KC_VOLD,KC_VOLU,TG(_KEYPAD), _______,
-	_______,_______,_______,_______,_______,_______,	_______,KC_NUM  ,KC_PEQL,KC_PSLS,KC_PAST,_______,
-	_______,_______,_______,_______,_______,_______,	_______,KC_P7   ,KC_P8  ,KC_P9  ,KC_PMNS,_______,
-	_______,_______,_______,_______,_______,_______,	_______,KC_P4   ,KC_P5  ,KC_P6  ,KC_PPLS,_______,
-	_______,_______,_______,_______,_______,_______,	_______,KC_P1   ,KC_P2  ,KC_P3  ,KC_PENT,_______,
-		_______,KC_INS ,_______,_______,		_______,_______ ,KC_PDOT,KC_PENT,
-
-			_______,_______,			_______,_______,
-				_______,				_______,
-			_______,_______,_______,			_______,_______,KC_P0
-	)
-	,[_PROGM] = LAYOUT(
-	_______,_______,_______,DF(_QWERTY),DF(_DVORAK),_______         ,_______,_______,_______,	QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______     ,_______    ,_______         ,	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______     ,_______    ,DF(_QWERTY_GAME),	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______     ,_______    ,DF(_QWERTY_GAME),	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,DF(_COLEMAK),_______    ,_______,	_______,_______,_______,_______,_______,_______,
-		_______,_______,_______     ,_______,		_______,_______,_______,_______,
-
-			_______,_______,			_______,_______,
-				_______,				_______,
-			_______,_______,_______,			_______,_______,_______
-	)
-/*
-	,[_TEMPLATE] = LAYOUT(
-	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,_______,_______, _______,
-	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
-		_______,_______,_______,_______,		_______,_______,_______,_______,
-
-			_______,_______,			_______,_______,
-				_______,				_______,
-			_______,_______,_______,			_______,_______,_______
-	)
-*/
-};
diff --git a/keyboards/kinesis/keymaps/farmergreg/readme.md b/keyboards/kinesis/keymaps/farmergreg/readme.md
deleted file mode 100644
index f27ee190239..00000000000
--- a/keyboards/kinesis/keymaps/farmergreg/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-[farmergreg](https://github.com/farmergreg)'s kinesis advantage 2 kint41 layout
diff --git a/keyboards/kinesis/keymaps/farmergreg/rules.mk b/keyboards/kinesis/keymaps/farmergreg/rules.mk
deleted file mode 100644
index f6bd054e78b..00000000000
--- a/keyboards/kinesis/keymaps/farmergreg/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOTMAGIC_ENABLE = no
-COMMAND_ENABLE = yes
-NKRO_ENABLE = yes
-KEY_OVERRIDE_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/kinesis/keymaps/heatxsink/keymap.c b/keyboards/kinesis/keymaps/heatxsink/keymap.c
deleted file mode 100644
index e430df225a7..00000000000
--- a/keyboards/kinesis/keymaps/heatxsink/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Copyright 2022 Nicholas Granado <ngranado@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 {
-    _DEFAULT,
-    _QWERTY,
-    _COLEMAK_MOD_DH,
-    _WORKMAN,
-    _KEYPAD,
-    _LAYERS,
-};
-
-#define DEFAULT DF(_DEFAULT)
-#define QWERTY  TO(_QWERTY)
-#define CMMDH   TO(_COLEMAK_MOD_DH)
-#define WM      TO(_WORKMAN)
-#define KEYPAD  TO(_KEYPAD)
-#define LAYERS  OSL(_LAYERS)
-#define HCTLESC CTL_T(KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_DEFAULT] = LAYOUT(
-        KC_ESC ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KEYPAD ,QK_BOOT,
-        KC_EQL ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,        KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
-        KC_TAB ,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,KC_BSLS,
-        HCTLESC,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,KC_QUOT,
-        SC_LSPO,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,SC_RSPC,
-                KC_GRV ,LAYERS ,KC_LEFT,KC_RGHT,                KC_UP  ,KC_DOWN,KC_LBRC,KC_RBRC,
-                KC_LALT,KC_LCTL,        KC_RCTL,KC_LGUI,
-                        KC_HOME,        KC_PGUP,
-        KC_BSPC,KC_DEL ,KC_END ,        KC_PGDN,KC_ENT ,KC_SPC
-    ),
-
-    [_QWERTY] = LAYOUT(
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
-        _______,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,        KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,_______,
-        _______,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,        KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,_______,
-        _______,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,        KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,_______,
-                _______,_______,_______,_______,                _______,_______,_______,_______,
-                _______,_______,        _______,_______,
-                        _______,        _______,
-        _______,_______,_______,        _______,_______,_______
-    ),
-
-    [_COLEMAK_MOD_DH] = LAYOUT(
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
-        _______,KC_Q   ,KC_W   ,KC_F   ,KC_P   ,KC_B,        KC_J   ,KC_L   ,KC_U   ,KC_Y   ,KC_SCLN,_______,
-        _______,KC_A   ,KC_R   ,KC_S   ,KC_T   ,KC_G,        KC_M   ,KC_N   ,KC_E   ,KC_I   ,KC_O   ,_______,
-        _______,KC_Z   ,KC_X   ,KC_C   ,KC_D   ,KC_V,        KC_K   ,KC_H   ,KC_COMM,KC_DOT ,KC_SLSH,_______,
-                _______,_______,_______,_______,                _______,_______,_______,_______,
-                _______,_______,        _______,_______,
-                        _______,        _______,
-        _______,_______,_______,        _______,_______,_______
-    ),
-
-    [_WORKMAN] = LAYOUT(
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
-        _______,KC_Q   ,KC_D   ,KC_R   ,KC_W   ,KC_B,        KC_J   ,KC_F   ,KC_U   ,KC_P   ,KC_SCLN,_______,
-        _______,KC_A   ,KC_S   ,KC_H   ,KC_T   ,KC_G,        KC_Y   ,KC_N   ,KC_E   ,KC_O   ,KC_I   ,_______,
-        _______,KC_Z   ,KC_X   ,KC_M   ,KC_C   ,KC_V,        KC_K   ,KC_L   ,KC_COMM,KC_DOT ,KC_SLSH,_______,
-                _______,_______,_______,_______,                _______,_______,_______,_______,
-                _______,_______,        _______,_______,
-                        _______,        _______,
-        _______,_______,_______,        _______,_______,_______
-    ),
-
-    [_KEYPAD] = LAYOUT (
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,        _______,KC_NUM, KC_PEQL,KC_PSLS,KC_PAST,_______,
-        _______,_______,KC_MUTE,KC_VOLD,KC_VOLU,_______,        _______,KC_P7,  KC_P8,  KC_P9,  KC_PMNS,_______,
-        _______,KC_MSTP,KC_MPRV,KC_MPLY,KC_MNXT,KC_MSEL,        _______,KC_P4,  KC_P5,  KC_P6,  KC_PPLS,_______,
-        _______,_______,_______,_______,_______,_______,        _______,KC_P1,  KC_P2,  KC_P3,  KC_PENT,_______,
-                _______,_______,_______,_______,                KC_LPRN,KC_RPRN,KC_PDOT,KC_PENT,
-                _______,_______,        _______,_______,
-                        _______,        _______,
-        _______,_______,_______,        _______,KC_PENT,KC_P0
-    ),
-
-    [_LAYERS] = LAYOUT (
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,QWERTY ,CMMDH  ,WM     ,KEYPAD ,_______,        _______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
-                _______,_______,_______,_______,                _______,_______,_______,_______,
-                _______,_______,        _______,_______,
-                        _______,        _______,
-        _______,_______,_______,        _______,_______,_______
-    ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePinHigh(LED_NUM_LOCK_PIN);
-    writePinHigh(LED_SCROLL_LOCK_PIN);
-    writePinHigh(LED_COMPOSE_PIN);
-    writePinHigh(LED_CAPS_LOCK_PIN);
-    switch (get_highest_layer(state)) {
-        case _QWERTY:
-            // Caps Lock Lit
-            writePinLow(LED_CAPS_LOCK_PIN);
-            break;
-        case _COLEMAK_MOD_DH:
-            // Num Lock Lit
-            writePinLow(LED_NUM_LOCK_PIN);
-            break;
-        case _WORKMAN:
-            // Scroll Lock Lit
-            writePinLow(LED_SCROLL_LOCK_PIN);
-            break;
-        case _KEYPAD:
-            // Compose Lit
-            writePinLow(LED_COMPOSE_PIN);
-            break;
-        case _LAYERS:
-            // All LEDs Lit
-            writePinLow(LED_SCROLL_LOCK_PIN);
-            writePinLow(LED_NUM_LOCK_PIN);
-            writePinLow(LED_CAPS_LOCK_PIN);
-            writePinLow(LED_COMPOSE_PIN);
-            break;
-    }
-  return state;
-}
-
-bool led_update_user(led_t led_state) {
-    // disable led_update_kb() so that we do not override layer indicators
-    return false;
-}
-
diff --git a/keyboards/kinesis/keymaps/heatxsink/readme.md b/keyboards/kinesis/keymaps/heatxsink/readme.md
deleted file mode 100644
index 83a2b558549..00000000000
--- a/keyboards/kinesis/keymaps/heatxsink/readme.md
+++ /dev/null
@@ -1,165 +0,0 @@
-# heatxsink's keymap for kinesis advantage w/ kinx
-
-## my keymap has three objectives ...
-1. Make it easy to add keyboard layouts (layers).
-2. Easy to swap between keyboard layouts (layers).
-3. Use LED indicators on the kinX controller to provide feedback as to what layer is selected.
-
-## layer description
-0. DEFAULT (function key row, number row, left/right gutter keys, and thumb keys)
-1. QWERTY
-2. CMMDH [Colemak Mod-DH](https://colemakmods.github.io/mod-dh/)
-3. WM    [Workman](https://workmanlayout.org/)
-3. Keypad (number pad on the right, media keys on the left)
-
-## layers
-```
-Keymap: DEFAULT
-Description: keys separated by "/" tap for first, hold for second; uses Space Cadet Shifts
-
- ,-------------------------------------------------------------------------------------------------------------------.
- | Esc    |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F8  |  F9  |  F10 |  F12 | PSCR | SLCK | PAUS |KEYPAD|  BOOT  |
- |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
- | =+     |  1!  |  2@  |  3#  |  4$  |  5%  |                           |  6^  |  7&  |  8*  |  9(  |  0)  | -_     |
- |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
- | Tab    |      |      |      |      |      |                           |      |      |      |      |      | \|     |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |ESC/CTRL|      |      |      |      |      |                           |      |      |      |      |      | '"     |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |SC_Shift|      |      |      |      |      |                           |      |      |      |      |      |SC_Shift|
- `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-          | `~   |LAYERS| Left | Right|                                         | Up   | Down |  [{  |  ]}  |
-          `---------------------------'                                         `---------------------------'
-                                        ,-------------.         ,-------------.
-                                        | ALT  | CTRL |         | CTRL  | GUI |
-                                 ,------|------|------|         |------+------+------.
-                                 |      |      | Home |         | PgUp |      |      |
-                                 | BkSp | Del  |------|         |------|Return| Space|
-                                 |      |      | End  |         | PgDn |      |      |
-                                 `--------------------'         `--------------------'
-
-Keymap: LAYERS 
-Description: OSL that allows for easy switching between layers.
-
- ,-------------------------------------------------------------------------------------------------------------------.
- |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
- |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
- |        |QWERTY|CMMDH |WM    |KEYPAD|      |                           |      |      |      |      |      |        |
- |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
- |        |      |      |      |      |      |                           |      |      |      |      |      |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        |      |      |      |      |      |                           |      |      |      |      |      |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        |      |      |      |      |      |                           |      |      |      |      |      |        |
- `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-          |      |      |      |      |                                         |      |      |      |      |
-          `---------------------------'                                         `---------------------------'
-                                        ,-------------.         ,-------------.
-                                        |      |      |         |      |      |
-                                 ,------|------|------|         |------+------+------.
-                                 |      |      |      |         |      |      |      |
-                                 |      |      |------|         |------|      |      |
-                                 |      |      |      |         |      |      |      |
-                                 `--------------------'         `--------------------'
-
-Keymap: QWERTY
-
- ,-------------------------------------------------------------------------------------------------------------------.
- |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
- |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
- |        |      |      |      |      |      |                           |      |      |      |      |      |        |
- |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
- |        |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  ,.  |  .>  |  /?  |        |
- `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-          |      |      |      |      |                                         |      |      |      |      |
-          `---------------------------'                                         `---------------------------'
-                                        ,-------------.         ,-------------.
-                                        |      |      |         |      |      |
-                                 ,------|------|------|         |------+------+------.
-                                 |      |      |      |         |      |      |      |
-                                 |      |      |------|         |------|      |      |
-                                 |      |      |      |         |      |      |      |
-                                 `--------------------'         `--------------------'
-
-Keymap: CMMDH (Colemak Mod-DH)
-
- ,-------------------------------------------------------------------------------------------------------------------.
- |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
- |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
- |        |      |      |      |      |      |                           |      |      |      |      |      |        |
- |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
- |        |   Q  |   W  |   F  |   P  |   B  |                           |   J  |   L  |   U  |   Y  |  ;:  |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        |   A  |   R  |   S  |   T  |   G  |                           |   M  |   N  |   E  |   I  |  O   |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        |   Z  |   X  |   C  |   D  |   V  |                           |   K  |   H  |  ,.  |  .>  |  /?  |        |
- `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-          |      |      |      |      |                                         |      |      |      |      |
-          `---------------------------'                                         `---------------------------'
-                                        ,-------------.         ,-------------.
-                                        |      |      |         |      |      |
-                                 ,------|------|------|         |------+------+------.
-                                 |      |      |      |         |      |      |      |
-                                 |      |      |------|         |------|      |      |
-                                 |      |      |      |         |      |      |      |
-                                 `--------------------'         `--------------------'
-
-Keymap: WM (Workman)
-
- ,-------------------------------------------------------------------------------------------------------------------.
- |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
- |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
- |        |      |      |      |      |      |                           |      |      |      |      |      |        |
- |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
- |        |   Q  |   D  |   R  |   W  |   B  |                           |   J  |   F  |   U  |   P  |  ;:  |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        |   A  |   S  |   H  |   T  |   G  |                           |   Y  |   N  |   E  |   O  |  I   |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        |   Z  |   X  |   M  |   C  |   V  |                           |   K  |   L  |  ,.  |  .>  |  /?  |        |
- `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-          |      |      |      |      |                                         |      |      |      |      |
-          `---------------------------'                                         `---------------------------'
-                                        ,-------------.         ,-------------.
-                                        |      |      |         |      |      |
-                                 ,------|------|------|         |------+------+------.
-                                 |      |      |      |         |      |      |      |
-                                 |      |      |------|         |------|      |      |
-                                 |      |      |      |         |      |      |      |
-                                 `--------------------'         `--------------------'
-
-Keymap: KEYPAD
-
- ,-------------------------------------------------------------------------------------------------------------------.
- |        |      |      |      |      |      |      |      |      |      |      |      |      |      |      |        |
- |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
- |        |      |      |      |      |      |                           |      |NUMLCK|  =   |  /   |PASTE |        |
- |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
- |        |      | MUTE | VOL- | VOL+ |      |                           |      |   7  |   8  |   9  |  -   |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        | STOP | PREV | PLAY | NEXT |SELECT|                           |      |   4  |   5  |   6  |  +   |        |
- |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
- |        |      |      |      |      |      |                           |      |   1  |   2  |   3  | ENTER|        |
- `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-          |      |      |      |      |                                         |   (  |   )  |   .  | ENTER|
-          `---------------------------'                                         `---------------------------'
-                                        ,-------------.         ,-------------.
-                                        |      |      |         |      |      |
-                                 ,------|------|------|         |------+------+------.
-                                 |      |      |      |         |      |      |      |
-                                 |      |      |------|         |------|ENTER |  0   |
-                                 |      |      |      |         |      |      |      |
-                                 `--------------------'         `--------------------'
-```
-## requirements
-* K500 or K600 Kinesis Advantage MPC or Advantage 2.
-* [kinx project / stapelberg controller](https://github.com/kinx-project/kint)
-
-## shoutout(s)
-* `stapelberg` self explanitory
-* `jwon` for his LED indicator code
-* `tuesdayjohn` for how he did layers
-
diff --git a/keyboards/kinesis/keymaps/heatxsink/rules.mk b/keyboards/kinesis/keymaps/heatxsink/rules.mk
deleted file mode 100644
index f8c1a24ccac..00000000000
--- a/keyboards/kinesis/keymaps/heatxsink/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOTMAGIC_ENABLE = no
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-NKRO_ENABLE = yes
-SLEEP_LED_ENABLE = yes
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/config.h b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
deleted file mode 100644
index 7749c523f3c..00000000000
--- a/keyboards/kinesis/keymaps/insertsnideremarks/config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#include "../../config.h"
-
-// place overrides here
-#define TAPPING_TERM 150
-#define TAPPING_TOGGLE 2
-
-
-#endif
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
deleted file mode 100644
index 6275ed0a8d0..00000000000
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ /dev/null
@@ -1,480 +0,0 @@
-// Copyright 2023 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum kinesis_layers {
-  _COLEMAK,   // Colemak (default layer)
-  _QWERTY,    // Qwerty
-  _COLEMAKGM, // Colemak gaming/vanilla (limited dual-role keys with layer access)
-  _QWERTYGM,  // QWERTY gaming/vanilla (limited dual-role keys with layer access)
-  _NUMBERS,   // Numbers & Symbols
-  _NUMBERS2,  // Numbers & Symbols 2 (identical as _NUMBERS; basically used for tri-layer access to _ADJUST)
-  _FUNCTION,  // Function
-  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
-  _NUMPAD,    // Numpad
-  _ADJUST,    // Adjust layer (accessed via tri-layer feature)
-  _ADJUST2    // Second Adjust layer (accessed outside of tri-layer feature)
-};
-
-enum kinesis_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  COLEMAKGM,
-  QWERTYGM,
-  NUMPAD = TG(_NUMPAD),
-  ADJUST = MO(_ADJUST2),
-  SPCFN  = LT(_FUNCTION, KC_SPC),
-  BSPCFN = LT(_FUNCTION2, KC_BSPC),
-  ENTNS  = LT(_NUMBERS, KC_ENT),
-  DELNS  = LT(_NUMBERS2, KC_DEL),
-  CTLESC = CTL_T(KC_ESC),
-  ALTAPP = ALT_T(KC_APP),
-  NKROTG = MAGIC_TOGGLE_NKRO
-};
-
-//Tap Dance Declarations
-enum {
-  ADJ = 0,
-  LBCB,
-  RBCB,
-  EQPL,
-  PLEQ,
-  MNUN,
-  SLAS,
-  GVTL,
-  PPLEQ,
-  PMNUN,
-  PSLPAS
-};
-
-void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_on(_ADJUST2);
-     set_oneshot_layer(_ADJUST2, ONESHOT_START);
-  }
-}
-void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_off(_ADJUST2);
-     clear_oneshot_layer_state(ONESHOT_PRESSED);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-[ADJ]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
-[LBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
-[RBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
-[EQPL]   = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
-[PLEQ]   = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
-[MNUN]   = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
-[SLAS]   = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
-[GVTL]   = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
-[PPLEQ]  = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
-[PMNUN]  = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
-[PSLPAS] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Colemak
-   (Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-  ,-----------------------------------------------------------------------------------------------------------.
-  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-  `-----------------------------------------------------------------------------------------------------------'
-  ,-------------------------------------------.                   ,-------------------------------------------.
-  |    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |Esc/Ctrl|   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |SC Shift|   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |SC Shift|
-  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-           |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-	       `---------------------------'                                 `---------------------------'
-	                          ,---------------.                   ,---------------.
-	                          |Esc/Ctl| Hyper |                   |  RAlt |  RCtl |
-	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  | Space | Enter |App/Alt|                   |  RGUI | Delete|  Bspc |
-	                  |   /   |   /   |-------|                   |-------|   /   |   /   |
-	                  |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  |
-	                  `-----------------------'                   `-----------------------'
-*/
-[_COLEMAK] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                                        CTLESC,  ALL_T(KC_NO),              KC_RALT, KC_RCTL,
-                                                                 ALTAPP,                    KC_RGUI,
-                                               SPCFN,   ENTNS,   KC_BSPC,                   KC_ENT,  DELNS,   BSPCFN
-),
-
-/* QWERTY
-   (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-  ,-----------------------------------------------------------------------------------------------------------.
-  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-  `-----------------------------------------------------------------------------------------------------------'
-  ,-------------------------------------------.                   ,-------------------------------------------.
-  |    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |   Tab  |   Q  |   W  |   E  |   R  |   T  |                   |   Y  |   U  |   I  |   O  |   P  |   \    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |Esc/Ctrl|   A  |   S  |   D  |   F  |   G  |                   |   H  |   J  |   K  |   L  |   ;  |   '    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |SC Shift|   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |SC Shift|
-  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	       |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-	       `---------------------------'                                 `---------------------------'
-	                          ,---------------.                   ,---------------.
-	                          |Esc/Ctl| Hyper |                   |  RAlt |  RCtl |
-	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  | Space | Enter |App/Alt|                   |  RGUI | Delete|  Bspc |
-	                  |   /   |   /   |-------|                   |-------|   /   |   /   |
-	                  |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  |
-	                  `-----------------------'                   `-----------------------'
-*/
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          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_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                                        CTLESC,  ALL_T(KC_NO),              KC_RALT, KC_RCTL,
-                                                                 ALTAPP,                    KC_RGUI,
-                                               SPCFN,   ENTNS,   KC_BSPC,                   KC_ENT,  DELNS,   BSPCFN
-),
-
-/* Numbers/Symbols layer
-   (Multiple characters: single-tap for first, double-tap for second)
-  ,-----------------------------------------------------------------------------------------------------------.
-  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-  `-----------------------------------------------------------------------------------------------------------'
-  ,-------------------------------------------.                   ,-------------------------------------------.
-  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |   6  |   7  |   8  |   9  |   0  |                   |   ^  |   &  |   *  |   (  |   )  |        |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |   1  |   2  |   3  |   4  |   5  |                   |   !  |   @  |   #  |   $  |   %  |        |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |      |   .  |  / * |  - _ |  + = |                   |  ` ~ |  [ { |  ] } |      |      |        |
-  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	       |   (  |   )  |  [ { |  ] } |                                 |      |      |      |      |
-	       `---------------------------'                                 `---------------------------'
-	                          ,---------------.                   ,---------------.
-	                          |       |       |                   |       |       |
-	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  |       |       |       |                   |       |       |       |
-	                  |       |       |-------|                   |-------|       |       |
-	                  |       |       |       |                   |       |       |       |
-	                  `-----------------------'                   `-----------------------'
-*/
-[_NUMBERS] = LAYOUT(
-  _______, _______, _______, _______,  _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,    KC_F4,    KC_F5,                                                          KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,
-  _______, KC_6,    KC_7,    KC_8,     KC_9,     KC_0,                                                           KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                           KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,  TD(SLAS), TD(MNUN), TD(PLEQ),                                                       TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-           KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),                                                                           _______,  _______,  _______, _______,
-                                                           _______, _______,                   _______, _______,
-                                                                    _______,                   _______,
-                                                 _______,  _______, _______,                   _______, _______, _______
-),
-
-[_NUMBERS2] = LAYOUT(
-  _______, _______, _______, _______,  _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,    KC_F4,    KC_F5,                                                          KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,
-  _______, KC_6,    KC_7,    KC_8,     KC_9,     KC_0,                                                           KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                           KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,  TD(SLAS), TD(MNUN), TD(PLEQ),                                                       TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-           KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),                                                                           _______,  _______,  _______, _______,
-                                                           _______, _______,                   _______, _______,
-                                                                    _______,                   _______,
-                                                 _______,  _______, _______,                   _______, _______, _______
-),
-
-/* Function layer
-  ,-----------------------------------------------------------------------------------------------------------.
-  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-  `-----------------------------------------------------------------------------------------------------------'
-  ,-------------------------------------------.                   ,-------------------------------------------.
-  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |      |      |  Up  |      |      |                   |      |      |  Up  |Ctrl+Y|      |        |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |Ctrl+A| Left | Down | Right|C+A+Tb|                   | PgUp | Right| Down | Left | Home |        |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |Ctrl+Z|Ctrl+X|Ctrl+C|Ctrl+V| Bspc |                   | PgDn | Mute | Vol- | Vol+ |  End |        |
-  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	       |      |      |      |      |                                 | Prev | Play | Next | Stop |
-	       `---------------------------'                                 `---------------------------'
-	                          ,---------------.                   ,---------------.
-	                          |       |       |                   |       |       |
-	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  |       |       |       |                   |       |       |       |
-	                  |       |       |-------|                   |-------|       |       |
-	                  |       |       |       |                   |       |       |       |
-	                  `-----------------------'                   `-----------------------'
-*/
-[_FUNCTION] = LAYOUT(
-  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
-  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,                                                             KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,  KC_F11,
-  _______, _______,    _______,    KC_UP,      _______,    _______,                                                           _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                                                       KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                                                           KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-           _______,    _______,    _______,    _______,                                                                                KC_MPRV, KC_MPLY, KC_MNXT,    KC_MSTP,
-                                                                        _______, _______,                   _______, _______,
-                                                                                 _______,                   _______,
-                                                           _______,     _______, _______,                   _______, _______, _______
-),
-
-[_FUNCTION2] = LAYOUT(
-  _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
-  KC_F12,  KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,                                                             KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,  KC_F11,
-  _______, _______,    _______,    KC_UP,      _______,    _______,                                                           _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                                                       KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                                                           KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-           _______,    _______,    _______,    _______,                                                                                KC_MPRV, KC_MPLY, KC_MNXT,    KC_MSTP,
-                                                                        _______, _______,                   _______, _______,
-                                                                                 _______,                   _______,
-                                                           _______,     _______, _______,                   _______, _______, _______
-),
-
-/* Numpad layer
-   (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
-  ,-----------------------------------------------------------------------------------------------------------.
-  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-  `-----------------------------------------------------------------------------------------------------------'
-  ,-------------------------------------------.                   ,-------------------------------------------.
-  |        | NumLk|      |      |      |      |                   |  Tab | NumLk| KP / | KP * | KP - |        |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        | KP 6 | KP 7 | KP 8 | KP 9 | KP 0 |                   |      | KP 7 | KP 8 | KP 9 | KP + |        |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        | KP 1 | KP 2 | KP 3 | KP 4 | KP 5 |                   |      | KP 4 | KP 5 | KP 6 |  =   |        |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |      | KP . |KP/KP*| KP- _| KP+ =|                   |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	       |   (  |   )  |  [ { |  ] } |                                 |      | KP 0 | KP . |KP Ent|
-	       `---------------------------'                                 `---------------------------'
-	                          ,---------------.                   ,---------------.
-	                          |       |       |                   |       |       |
-	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  |       |       |       |                   |       |       |       |
-	                  |       |       |-------|                   |-------|       |       |
-	                  |       |       |       |                   |       |       |       |
-	                  `-----------------------'                   `-----------------------'
-*/
-[_NUMPAD] = LAYOUT(
-  _______, _______, _______, _______,    _______,   _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_NUM,  _______, _______,    _______,   _______,                                                         KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
-  _______, KC_P6,   KC_P7,   KC_P8,      KC_P9,     KC_P0,                                                           _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
-  _______, KC_P1,   KC_P2,   KC_P3,      KC_P4,     KC_P5,                                                           _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
-  _______, _______, KC_PDOT, TD(PSLPAS), TD(PMNUN), TD(PPLEQ),                                                       _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-           KC_LPRN, KC_RPRN, TD(LBCB),   TD(RBCB),                                                                            _______, KC_P0,   KC_PDOT, KC_PENT,
-                                                               _______, _______,                   _______, _______,
-                                                                        _______,                   _______,
-                                                    _______,   _______, _______,                   _______, _______, _______
-),
-
-/* Colemak gaming/vanilla
-   (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Delete/Numbers2 to access Adjust layer)
-  ,-----------------------------------------------------------------------------------------------------------.
-  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-  `-----------------------------------------------------------------------------------------------------------'
-  ,-------------------------------------------.                   ,-------------------------------------------.
-  |    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |  LCtrl |   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |  Shift |
-  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	       |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-	       `---------------------------'                                 `---------------------------'
-	                          ,---------------.                   ,---------------.
-	                          |  Esc  |       |                   |  RAlt |  RCtl |
-	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |
-	                  | Space | Enter |-------|                   |-------|   /   |   /   |
-	                  |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
-	                  `-----------------------'                   `-----------------------'
-*/
-[_COLEMAKGM] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  KC_LCTL, 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_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                                        KC_ESC,  XXXXXXX,                   KC_RALT, KC_RCTL,
-                                                                 KC_LALT,                   KC_RGUI,
-                                               KC_SPC,  KC_ENT,  KC_BSPC,                   ENTNS,   DELNS,   BSPCFN
-),
-
-/* QWERTY gaming/vanilla
-   (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Delete/Numbers2 to access Adjust layer)
-  ,-----------------------------------------------------------------------------------------------------------.
-  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-  `-----------------------------------------------------------------------------------------------------------'
-  ,-------------------------------------------.                   ,-------------------------------------------.
-  |    =   |   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  |   ;  |   '    |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |  Shift |
-  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	       |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-	       `---------------------------'                                 `---------------------------'
-	                          ,---------------.                   ,---------------.
-	                          |  Esc  |       |                   |  RAlt |  RCtl |
-	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |
-	                  | Space | Enter |-------|                   |-------|   /   |   /   |
-	                  |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
-	                  `-----------------------'                   `-----------------------'
-*/
-[_QWERTYGM] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          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_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  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, KC_RSFT,
-           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                                        KC_ESC,  XXXXXXX,                   KC_RALT, KC_RCTL,
-                                                                 KC_LALT,                   KC_RGUI,
-                                               KC_SPC,  KC_ENT,  KC_BSPC,                   ENTNS,   DELNS,   BSPCFN
-),
-
-/* Adjust layer
-   (Enter/Number + Delete/Number2 under non-gaming/vanilla layers or press & hold Adjust key on function row; Numpad is a toggle)
-  ,-----------------------------------------------------------------------------------------------------------.
-  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-  `-----------------------------------------------------------------------------------------------------------'
-  ,-------------------------------------------.                   ,-------------------------------------------.
-  |        |Colmak|Qwerty|      |ClmkGM| QWGM |                   |Numpad|      |      |      |      | QK_BOOT  |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |      |      |      |      |      |                   |      | NKRO |      |      |      |        |
-  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
-  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	       |      |      |      |      |                                 |      |      |      |      |
-	       `---------------------------'                                 `---------------------------'
-	                          ,---------------.                   ,---------------.
-	                          |       |       |                   |       |       |
-	                  ,-------|-------|-------|                   |-------+-------+-------.
-	                  |       |       |       |                   |       |       |       |
-	                  |       |       |-------|                   |-------|       |       |
-	                  |       |       |       |                   |       |       |       |
-	                  `-----------------------'                   `-----------------------'
-*/
-[_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,                                                        NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,                                                         _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______,                                                                             _______, _______, _______, _______,
-                                                           _______, _______,                    _______, _______,
-                                                                    _______,                    _______,
-                                                 _______,  _______, _______,                    _______, _______, _______
-),
-
-[_ADJUST2] = LAYOUT(
-  _______, _______, _______, _______, _______,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,                                                        NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,                                                         _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______,                                                                             _______, _______, _______, _______,
-                                                           _______, _______,                    _______, _______,
-                                                                    _______,                    _______,
-                                                 _______,  _______, _______,                    _______, _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	case COLEMAK:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAK);
-//        persistent_default_layer_set(1UL << _COLEMAK);
-        layer_off ( _QWERTY);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _COLEMAKGM);
-        layer_off ( _QWERTYGM);
-        layer_off ( _ADJUST);
-        layer_off ( _ADJUST2);
-	  }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTY);
-//        persistent_default_layer_set(1UL << _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _COLEMAKGM);
-        layer_off ( _QWERTYGM);
-        layer_off ( _ADJUST);
-        layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-    case COLEMAKGM:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAKGM);
-        layer_off ( _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _QWERTYGM);
-        layer_off ( _ADJUST);
-        layer_off ( _ADJUST2);
-	  }
-      return false;
-      break;
-    case QWERTYGM:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTYGM);
-        layer_off ( _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _COLEMAKGM);
-        layer_off ( _ADJUST);
-        layer_off ( _ADJUST2);
-	  }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/readme.md b/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
deleted file mode 100644
index 783c188185d..00000000000
--- a/keyboards/kinesis/keymaps/insertsnideremarks/readme.md
+++ /dev/null
@@ -1,226 +0,0 @@
-## I've changed my folder name to match my GitHub username.  Please see https://github.com/qmk/qmk_firmware/tree/master/keyboards/kinesis/keymaps/tuesdayjohn for my current keymap files.
-
-## insertsnideremarks' Kinesis Keymap
-
-These layouts are derived from what I was using on my Kinesis Contoured keyboards with Hasu's USB-USB TMK converters.  With the move to QMK via Stapelberg replacement controller, I've cleaned up the layouts a bit while adding more functions and layers.
-
-There are minor changes in the base keywell layout of non-alpha keys (e.g., CapsLock is ESC/Ctl, arrow clusters on one side), while the thumb clusters deviate more from the default layout.
-
-Changes to the thumb clusters include: 
-* The navigations keys moved to function layers.
-* The function of 2u keys have been reversed - I've always used space with my left thumb, and I find it more helpful to have access to Space and Enter while using my mouse/trackball.
-* Backspace have been duplicated on both clusters.
-* The 2u keys serve dual function as momentary layer switchers.
-
-I've largely left the function keys untouched, with the intension of not using them.  They are neither easy to use nor reach due to their locations and size, and the rubber domes used were terrible.  They have since replaced the keys with Cherry ML switches on Advantage2, but did not resolve the issues of size or location.  Additionally, leaving the function keys unused here makes it easier for me to adapt the keymaps to my other keyboards, most of which do not have physical function keys.
-
-I use Colemak as my default layout.  I've included QWERTY here as well.
-
-Additionally, I've added gaming/vanilla version of Colemak and QWERTY layouts.  These layouts have limited access to the Function or Numbers/Symbols layers, and are mainly used for gaming.
-
-Persistent default layer has been enabled for Colemak and QWERTY.  The gaming/vanilla Colemak and QWERTY can be set as default layer, but will not be persistent.
-
-## Future plans
-
-* Add status LEDs to the Stapelberg PCB (usually used for Caps Lock, Num Lock, and Scroll Lock) to use as layer indicators.
-* Add a speaker now that QMK supports additional pins for audio use.
-* Utilize the leftover spots on the key matrix, as well as unused pins on Teensy++ 2.0 to run macropad and/or foot pedals.
-
-
-### Colemak
-    (Default layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-    ,-----------------------------------------------------------------------------------------------------------.
-    | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-    `-----------------------------------------------------------------------------------------------------------'
-    ,-------------------------------------------.                   ,-------------------------------------------.
-    |    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
-    |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-    |   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-    |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-    |Esc/Ctrl|   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
-    |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-    |SC Shift|   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |SC Shift|
-    `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-             |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-	         `---------------------------'                                 `---------------------------'
-	                            ,---------------.                   ,---------------.
-	                            |Esc/Ctl| Hyper |                   |  RAlt |  RCtl |
-	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    | Space | Enter |App/Alt|                   |  RGUI | Delete|  Bspc |
-	                    |   /   |   /   |-------|                   |-------|   /   |   /   |
-	                    |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  |
-	                    `-----------------------'                   `-----------------------' 
-	
-	
-### QWERTY
-	(Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-	,-----------------------------------------------------------------------------------------------------------.
-	| ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-	`-----------------------------------------------------------------------------------------------------------'
-	,-------------------------------------------.                   ,-------------------------------------------.
-	|    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|   Tab  |   Q  |   W  |   E  |   R  |   T  |                   |   Y  |   U  |   I  |   O  |   P  |   \    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|Esc/Ctrl|   A  |   S  |   D  |   F  |   G  |                   |   H  |   J  |   K  |   L  |   ;  |   '    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|SC Shift|   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |SC Shift|
-	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	         |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-	       	 `---------------------------'                                 `---------------------------'
-	                            ,---------------.                   ,---------------.
-	                            |Esc/Ctl| Hyper |                   |  RAlt |  RCtl |
-	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    | Space | Enter |App/Alt|                   |  RGUI | Delete|  Bspc |
-	                    |   /   |   /   |-------|                   |-------|   /   |   /   |
-	                    |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  |
-	                    `-----------------------'                   `-----------------------' 
-	
-
-### Numbers & Symbols layer
-	(Multiple characters: single-tap for first, double-tap for second)
-	,-----------------------------------------------------------------------------------------------------------.
-	|     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-	`-----------------------------------------------------------------------------------------------------------'
-	,-------------------------------------------.                   ,-------------------------------------------.
-	|   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |   6  |   7  |   8  |   9  |   0  |                   |   ^  |   &  |   *  |   (  |   )  |        |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |   1  |   2  |   3  |   4  |   5  |                   |   !  |   @  |   #  |   $  |   %  |        |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |      |   .  |  / * |  - _ |  + = |                   |  ` ~ |  [ { |  ] } |      |      |        |
-	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	         |   (  |   )  |  [ { |  ] } |                                 |      |      |      |      |
-	         `---------------------------'                                 `---------------------------'
-	                            ,---------------.                   ,---------------.
-	                            |       |       |                   |       |       |
-	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    |       |       |       |                   |       |       |       |
-	                    |       |       |-------|                   |-------|       |       |
-	                    |       |       |       |                   |       |       |       |
-	                    `-----------------------'                   `-----------------------' 
-	
-
-### Function layer
-	,-----------------------------------------------------------------------------------------------------------.
-	|     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-	`-----------------------------------------------------------------------------------------------------------'
-	,-------------------------------------------.                   ,-------------------------------------------.
-	|   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |      |      |  Up  |      |      |                   |      |      |  Up  |Ctrl+Y|      |        |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |Ctrl+A| Left | Down | Right|C+A+Tb|                   | PgUp | Right| Down | Left | Home |        |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |Ctrl+Z|Ctrl+X|Ctrl+C|Ctrl+V| Bspc |                   | PgDn | Mute | Vol- | Vol+ |  End |        |
-	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	         |      |      |      |      |                                 | Prev | Play | Next | Stop |
-	         `---------------------------'                                 `---------------------------'
-	                            ,---------------.                   ,---------------.
-	                            |       |       |                   |       |       |
-	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    |       |       |       |                   |       |       |       |
-	                    |       |       |-------|                   |-------|       |       |
-	                    |       |       |       |                   |       |       |       |
-	                    `-----------------------'                   `-----------------------' 
-	
-
-### Numpad layer
-	(Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
-	,-----------------------------------------------------------------------------------------------------------.
-	|     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-	`-----------------------------------------------------------------------------------------------------------'
-	,-------------------------------------------.                   ,-------------------------------------------.
-	|        | NumLk|      |      |      |      |                   |  Tab | NumLk| KP / | KP * | KP - |        |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        | KP 6 | KP 7 | KP 8 | KP 9 | KP 0 |                   |      | KP 7 | KP 8 | KP 9 | KP + |        |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        | KP 1 | KP 2 | KP 3 | KP 4 | KP 5 |                   |      | KP 4 | KP 5 | KP 6 |  =   |        |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |      | KP . |KP/KP*| KP- _| KP+ =|                   |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	         |   (  |   )  |  [ { |  ] } |                                 | KP 0 |  ,   | KP . |KP Ent|
-	         `---------------------------'                                 `---------------------------'
-	                            ,---------------.                   ,---------------.
-	                            |       |       |                   |       |       |
-	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    |       |       |       |                   |       |       |       |
-	                    |       |       |-------|                   |-------|       |       |
-	                    |       |       |       |                   |       |       |       |
-	                    `-----------------------'                   `-----------------------' 
-	
-
-### Colemak gaming/vanilla
-    (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Delete/Numbers2 to access Adjust layer)
-	,-----------------------------------------------------------------------------------------------------------.
-	| ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-	`-----------------------------------------------------------------------------------------------------------'
-	,-------------------------------------------.                   ,-------------------------------------------.
-	|    =   |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|   Tab  |   Q  |   W  |   F  |   P  |   G  |                   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|  LCtrl |   A  |   R  |   S  |   T  |   D  |                   |   H  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |  Shift |
-	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	         |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-	         `---------------------------'                                 `---------------------------'
-	                            ,---------------.                   ,---------------.
-	                            |  Esc  |       |                   |  RAlt |  RCtl |
-	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |
-	                    | Space | Enter |-------|                   |-------|   /   |   /   |
-	                    |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
-	                    `-----------------------'                   `-----------------------' 
-	
-
-### QWERTY gaming/vanilla
-    (Limited access to Function or Numbers layers; mainly used for gaming; Ent/NS + Delete/Numbers2 to access Adjust layer)
-	,-----------------------------------------------------------------------------------------------------------.
-	| ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-	`-----------------------------------------------------------------------------------------------------------'
-	,-------------------------------------------.                   ,-------------------------------------------.
-	|    =   |   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  |   ;  |   '    |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |  Shift |
-	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	         |  Ins |   `  |   [  |   ]  |                                 | Left | Down |  Up  | Right|
-	         `---------------------------'                                 `---------------------------'
-	                            ,---------------.                   ,---------------.
-	                            |  Esc  |       |                   |  RAlt |  RCtl |
-	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |
-	                    | Space | Enter |-------|                   |-------|   /   |   /   |
-	                    |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
-	                    `-----------------------'                   `-----------------------' 
-	
-### Adjust layer
-	(Press Enter/Number + Delete/Number2 under non-gaming/vanilla layers or press & hold Adjust key on function row; Numpad is a toggle)
-	,-----------------------------------------------------------------------------------------------------------.
-	|     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-	`-----------------------------------------------------------------------------------------------------------'
-	,-------------------------------------------.                   ,-------------------------------------------.
-	|        |Colmak|Qwerty|      |ClmkGM| QWGM |                   |Numpad|      |      |      |      | RESET  |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |      |      |      |      |      |                   |      |      |      |      |      |        |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |      |      |      |      |      |                   |      | NKRO |      |      |      |        |
-	|--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
-	|        |      |      |      |      |      |                   |      |      |      |      |      |        |
-	`--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
-	         |      |      |      |      |                                 |      |      |      |      |
-	         `---------------------------'                                 `---------------------------'
-	                            ,---------------.                   ,---------------.
-	                            |       |       |                   |       |       |
-	                    ,-------|-------|-------|                   |-------+-------+-------.
-	                    |       |       |       |                   |       |       |       |
-	                    |       |       |-------|                   |-------|       |       |
-	                    |       |       |       |                   |       |       |       |
-	                    `-----------------------'                   `-----------------------' 
- 	
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk b/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
deleted file mode 100644
index 2cd0c1a9dc5..00000000000
--- a/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-DEFAULT_FOLDER = kinesis/stapelberg
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
-
diff --git a/keyboards/kinesis/keymaps/jwon/keymap.c b/keyboards/kinesis/keymaps/jwon/keymap.c
deleted file mode 100644
index c23663da922..00000000000
--- a/keyboards/kinesis/keymaps/jwon/keymap.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright 2021 James Won <me@jwon.me>
- *
- * 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_DVORAK,
-    _RAISE_DVORAK,
-    _KEYPAD,
-    _QWERTY,
-};
-
-// Mac-specific macros
-#define MACCOPY LGUI(KC_C)
-#define MACPAST LGUI(KC_V)
-#define MACUNDO LGUI(KC_Z)
-#define MACREDO LGUI(KC_Y)
-#define MACLOCK LGUI(LCTL(KC_Q))
-
-#define LSA_ LSA(KC_NO)
-#define SFT_ESC SFT_T(KC_ESC)
-#define KEYPAD TG(_KEYPAD)
-#define QWERTY TG(_QWERTY)
-#define RAISE MO(_RAISE_DVORAK)
-
-// clang-format off
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_BASE_DVORAK] = LAYOUT (
-           MACLOCK, 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_SCRL, KC_PAUS, QWERTY,  QK_BOOT,
-           KC_PIPE, KC_PLUS, KC_LBRC, KC_LCBR, KC_LPRN, KC_AMPR,           KC_EQL,  KC_RPRN, KC_RCBR, KC_RBRC, KC_ASTR, KC_EXLM,
-           KC_TAB,  KC_SCLN, KC_COMM, KC_DOT,  KC_P,    KC_Y,           KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSLS,
-           SFT_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,           KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-           KC_LCTL, KC_QUOT, KC_Q,    KC_J,    KC_K,    KC_X,           KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                    KC_DLR,  KC_BSLS, KC_LEFT, KC_RGHT,                    KC_DOWN, KC_UP,   KC_SLSH, KC_AT,
-
-                    KC_LGUI, KC_LALT,           KEYPAD,  LSA_,
-                             MACPAST,           MACUNDO,
-           KC_BSPC, KC_SPC,  MACCOPY,           MACREDO, RAISE, KC_ENT
-    ),
-
-[_RAISE_DVORAK] = LAYOUT (
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PERC,
-           _______, KC_COLN, KC_LABK, KC_RABK, S(KC_P), S(KC_Y),           S(KC_F), S(KC_G), S(KC_C), S(KC_R), S(KC_L), KC_HASH,
-           _______, S(KC_A), S(KC_O), S(KC_E), S(KC_U), S(KC_I),           S(KC_D), S(KC_H), S(KC_T), S(KC_N), S(KC_S), KC_UNDS,
-           _______, KC_DQUO, S(KC_Q), S(KC_J), S(KC_K), S(KC_X),           S(KC_B), S(KC_M), S(KC_W), S(KC_V), S(KC_Z), _______,
-                    KC_TILD, KC_PIPE, _______, _______,                    _______, _______, KC_QUES, KC_CIRC,
-
-                    _______, _______,           _______, _______,
-                             _______,           _______,
-           _______, _______, _______,           _______, _______, _______
-    ),
-
-[_KEYPAD] = LAYOUT (
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,           _______, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST, _______,
-           _______, _______, _______, _______, _______, _______,           _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
-           _______, _______, _______, _______, _______, _______,           _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
-           _______, _______, _______, _______, _______, _______,           _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-                    _______, _______, _______, _______,                    _______, _______, KC_PDOT, KC_PENT,
-
-                    _______, _______,           _______, _______,
-                             _______,           _______,
-           _______, _______, _______,           _______, _______, KC_P0
-    ),
-
-[_QWERTY] = LAYOUT(
-           KC_ESC,  _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,          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_Y,    KC_U,    KC_I,    KC_O,    KC_P,    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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                    KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,                 KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-
-                    KC_LGUI, KC_LALT,           KC_RGUI, KC_RCTL,
-                             KC_HOME,           KC_PGUP,
-           KC_BSPC, KC_DEL,  KC_END ,           KC_PGDN, KC_ENT,  KC_SPC
-    )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _KEYPAD:
-        writePinLow(LED_COMPOSE_PIN);
-        break;
-    case _RAISE_DVORAK:
-        writePinLow(LED_NUM_LOCK_PIN);
-        break;
-    case _QWERTY:
-        writePinLow(LED_SCROLL_LOCK_PIN);
-        break;
-    default: //  for any other layers, or the default layer
-        writePinHigh(LED_NUM_LOCK_PIN);
-        writePinHigh(LED_SCROLL_LOCK_PIN);
-        writePinHigh(LED_COMPOSE_PIN);
-        break;
-    }
-  return state;
-}
-
-bool led_update_user(led_t led_state) {
-    // Disable led_update_kb() so that layer indication code doesn't get overridden.
-    return false;
-}
-
-void matrix_scan_user(void) {
-    writePin(LED_CAPS_LOCK_PIN, !(get_mods() & MOD_MASK_SHIFT));
-}
diff --git a/keyboards/kinesis/keymaps/jwon/readme.md b/keyboards/kinesis/keymaps/jwon/readme.md
deleted file mode 100644
index 719e693384b..00000000000
--- a/keyboards/kinesis/keymaps/jwon/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-![jwon Programmer Dvorak Layout Image](https://i.imgur.com/3llBswG.png)
-
-# jwon's Programmer Dvorak
-
-Loosely based off [Programmer Dvorak](https://www.kaufmann.no/roland/dvorak/) and ThePrimeagen's [Real Programmers Dvorak](https://github.com/ThePrimeagen/keyboards)
-
-## Requirements
-* The Stapelberg mod
diff --git a/keyboards/kinesis/keymaps/jwon/rules.mk b/keyboards/kinesis/keymaps/jwon/rules.mk
deleted file mode 100644
index 1b8ed21105a..00000000000
--- a/keyboards/kinesis/keymaps/jwon/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = yes
diff --git a/keyboards/kinesis/keymaps/peott-fr/keymap.c b/keyboards/kinesis/keymaps/peott-fr/keymap.c
deleted file mode 100644
index 22453517a94..00000000000
--- a/keyboards/kinesis/keymaps/peott-fr/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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
-
-/* THIS FILE WAS GENERATED!
- *
- * This file was generated by qmk json2c. You may or may not want to
- * edit it directly.
- */
-
-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_PSCR, KC_SCRL, KC_PAUS, TG(3), KC_NO,
-        KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,        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_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,        KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
-        SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B,        KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
-        LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS,        KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
-
-        KC_LBRC, KC_RBRC,        KC_RALT, KC_APP,
-        KC_HOME,        KC_PGUP,
-        LT(1,KC_SPC), KC_DEL, KC_END,        KC_PGDN, KC_ENT, LT(2,KC_BSPC)
-    ),
-	[1] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL,
-        KC_TRNS, KC_PGUP, KC_LBRC, KC_UP, KC_RBRC, KC_LPRN,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
-        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(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
-        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(
-        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_TRNS, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,        KC_NO, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,        KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,        KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,        KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO,        KC_NO, KC_P0, KC_PDOT, 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/kinesis/keymaps/tuesdayjohn/config.h b/keyboards/kinesis/keymaps/tuesdayjohn/config.h
deleted file mode 100644
index b0816d6ae55..00000000000
--- a/keyboards/kinesis/keymaps/tuesdayjohn/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-// place overrides here
-#define TAPPING_TERM 175
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
deleted file mode 100644
index ffcb1c3a8d1..00000000000
--- a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
+++ /dev/null
@@ -1,430 +0,0 @@
-// Copyright 2023 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum kinesis_layers {
-  _COLEMAK,   // Colemak (default layer)
-  _QWERTY,    // QWERTY
-  _GAMING,    // Gaming/vanilla toggle layer (limited dual-role keys and layer access)
-  _NUMBERS,   // Numbers & Symbols
-  _NUMBERS2,  // Numbers & Symbols 2 (identical as _NUMBERS; basically used for tri-layer access to _ADJUST)
-  _FUNCTION,  // Function
-  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
-  _NUMPAD,    // Numpad
-  _ADJUST,    // Adjust layer (accessed via tri-layer feature)
-  _ADJUST2    // Second Adjust layer (accessed outside of tri-layer feature)
-};
-
-enum kinesis_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  GAMING
-};
-
-//Tap Dance Declarations
-enum {
-  ADJ = 0,
-  LBCB,
-  RBCB,
-  EQPL,
-  PLEQ,
-  MNUN,
-  SLAS,
-  GVTL,
-  PPEQ,
-  PMUN,
-  PSPA
-};
-
-void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_on(_ADJUST2);
-     set_oneshot_layer(_ADJUST2, ONESHOT_START);
-  }
-}
-void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_off(_ADJUST2);
-     clear_oneshot_layer_state(ONESHOT_PRESSED);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-[ADJ]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
-[LBCB] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
-[RBCB] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
-[EQPL] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
-[PLEQ] = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
-[MNUN] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
-[SLAS] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
-[GVTL] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
-[PPEQ] = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
-[PMUN] = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
-[PSPA] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
-};
-
-//Aliases for longer keycodes
-#define NUMPAD  TG(_NUMPAD)
-#define ADJUST  MO(_ADJUST2)
-#define SPCFN   LT(_FUNCTION, KC_SPC)
-#define BSPCFN  LT(_FUNCTION2, KC_BSPC)
-#define ENTNS   LT(_NUMBERS, KC_ENT)
-#define DELNS   LT(_NUMBERS2, KC_DEL)
-#define CTLESC  CTL_T(KC_ESC)
-#define ALTAPP  ALT_T(KC_APP)
-#define CTL_A   LCTL(KC_A)
-#define CTL_C   LCTL(KC_C)
-#define CTL_V   LCTL(KC_V)
-#define CTL_X   LCTL(KC_X)
-#define CTL_Z   LCTL(KC_Z)
-#define CTL_Y   LCTL(KC_Y)
-#define CA_TAB  LCA(KC_TAB)
-#define HYPER   ALL_T(KC_NO)
-#define TD_ADJ  TD(ADJ)
-#define TD_LBCB TD(LBCB)
-#define TD_RBCB TD(RBCB)
-#define TD_EQPL TD(EQPL)
-#define TD_PLEQ TD(PLEQ)
-#define TD_MNUN TD(MNUN)
-#define TD_SLAS TD(SLAS)
-#define TD_GVTL TD(GVTL)
-#define TD_PPEQ TD(PPEQ)
-#define TD_PMUN TD(PMUN)
-#define TD_PSPA TD(PSPA)
-#define NKROTG  MAGIC_TOGGLE_NKRO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
-Colemak
-(Default layer; keys separated by "/" tap for first, hold for second; uses Space Cadet Shifts)
-,--------------------------------------------------------------.                                     ,--------------------------------------------------------------.
-|  ESC |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |                                     |  F9  |  F10 |  F11 |  F12 |PrtScr|ScrLck| Pause|Numpad|Adjust|
-`--------------------------------------------------------------'                                     `--------------------------------------------------------------'
-,------------------------------------------------------.                                                     ,------------------------------------------------------.
-|    =    |    1   |    2   |    3   |    4   |    5   |                                                     |    6   |    7   |    8   |    9   |    0   |    -    |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|   Tab   |    Q   |    W   |    F   |    P   |    G   |                                                     |    J   |    L   |    U   |    Y   |    ;   |    \    |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-| ESC/Ctrl|    A   |    R   |    S   |    T   |    D   |                                                     |    H   |    N   |    E   |    I   |    O   |    '    |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-| SC Shift|    Z   |    X   |    C   |    V   |    B   |                                                     |    K   |    M   |    ,   |    .   |    /   | SC Shift|
-`---------+--------+--------+--------+--------+--------'                                                     `--------+--------+--------+--------+--------+---------'
-          |   Ins  |    `   |    [   |    ]   |                                                                       |  Left  |  Down  |   Up   |  Right |
-          `-----------------------------------'                                                                       `-----------------------------------'
-	                                                   ,-----------------.                 ,-----------------.
-	                                                   | ESC/Ctl|  Hyper |                 |  RAlt  |  RCtl  |
-	                                          ,--------+--------+--------|                 |--------+--------+--------.
-	                                          |  Space |  Enter | App/Alt|                 |  RGUI  | Delete |  Bspc  |
-	                                          |    /   |    /   |--------|                 |--------|    /   |    /   |
-	                                          |   Fn   | Number |  Bspc  |                 |  Enter | Number2|   Fn2  |
-	                                          `--------------------------'                 `--------------------------'
-*/
-[_COLEMAK] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                          KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                                                          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                                        CTLESC,  HYPER,                     KC_RALT, KC_RCTL,
-                                                                 ALTAPP,                    KC_RGUI,
-                                               SPCFN,   ENTNS,   KC_BSPC,                   KC_ENT,  DELNS,   BSPCFN
-),
-
-/*
-QWERTY
-(Keys separated by "/" tap for first, hold for second; uses Space Cadet Shifts)
-,--------------------------------------------------------------.                                     ,--------------------------------------------------------------.
-|  ESC |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |                                     |  F9  |  F10 |  F11 |  F12 |PrtScr|ScrLck| Pause|Numpad|Adjust|
-`--------------------------------------------------------------'                                     `--------------------------------------------------------------'
-,------------------------------------------------------.                                                     ,------------------------------------------------------.
-|    =    |    1   |    2   |    3   |    4   |    5   |                                                     |    6   |    7   |    8   |    9   |    0   |    -    |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|   Tab   |    Q   |    W   |    E   |    R   |    T   |                                                     |    Y   |    U   |    I   |    O   |    P   |    \    |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-| ESC/Ctrl|    A   |    S   |    D   |    F   |    G   |                                                     |    H   |    J   |    K   |    L   |    ;   |    '    |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-| SC Shift|    Z   |    X   |    C   |    V   |    B   |                                                     |    N   |    M   |    ,   |    .   |    /   | SC Shift|
-`---------+--------+--------+--------+--------+--------'                                                     `--------+--------+--------+--------+--------+---------'
-          |   Ins  |    `   |    [   |    ]   |                                                                       |  Left  |  Down  |   Up   |  Right |
-          `-----------------------------------'                                                                       `-----------------------------------'
-	                                                   ,-----------------.                 ,-----------------.
-	                                                   | ESC/Ctl|  Hyper |                 |  RAlt  |  RCtl  |
-	                                          ,--------+--------+--------|                 |--------+--------+--------.
-	                                          |  Space |  Enter | App/Alt|                 |  RGUI  | Delete |  Bspc  |
-	                                          |    /   |    /   |--------|                 |--------|    /   |    /   |
-	                                          |   Fn   | Number |  Bspc  |                 |  Enter | Number2|   Fn2  |
-	                                          `--------------------------'                 `--------------------------'
-*/
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, NUMPAD,  ADJUST,
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          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_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-           KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC,                                                                         KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                                        CTLESC,  HYPER,                     KC_RALT, KC_RCTL,
-                                                                 ALTAPP,                    KC_RGUI,
-                                               SPCFN,   ENTNS,   KC_BSPC,                   KC_ENT,  DELNS,   BSPCFN
-),
-
-/*
-Numbers/Symbols layer
-(Multiple characters: single-tap for first, double-tap for second)
-,--------------------------------------------------------------.                                     ,--------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |                                     |      |      |      |      |      |      |      |      |      |
-`--------------------------------------------------------------'                                     `--------------------------------------------------------------'
-,------------------------------------------------------.                                                     ,------------------------------------------------------.
-|   F12   |   F1   |   F2   |   F3   |   F4   |   F5   |                                                     |   F6   |   F7   |   F8   |   F9   |   F10  |   F11   |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |    6   |    7   |    8   |    9   |    0   |                                                     |    ^   |    &   |    *   |    (   |    )   |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |    1   |    2   |    3   |    4   |    5   |                                                     |    !   |    @   |    #   |    $   |    %   |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |        |    .   |   / *  |   - _  |   + =  |                                                     |   ` ~  |   [ {  |   ] }  |        |        |         |
-`---------+--------+--------+--------+--------+--------'                                                     `--------+--------+--------+--------+--------+---------'
-          |    (   |    )   |   [ {  |   ] }  |                                                                       |        |        |        |        |
-          `-----------------------------------'                                                                       `-----------------------------------'
-	                                                   ,-----------------.                 ,-----------------.
-	                                                   |        |        |                 |        |        |
-	                                          ,--------+--------+--------|                 |--------+--------+--------.
-	                                          |        |        |        |                 |        |        |        |
-	                                          |        |        |--------|                 |--------|        |        |
-	                                          |        |        |        |                 |        |        |        |
-	                                          `--------------------------'                 `--------------------------'
-*/
-[_NUMBERS] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                                         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                                                          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ,                                                       TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______,
-           KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB,                                                                         _______, _______, _______, _______,
-                                                        _______, _______,                   _______, _______,
-                                                                 _______,                   _______,
-                                               _______, _______, _______,                   _______, _______, _______
-),
-
-[_NUMBERS2] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                                         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                                                          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ,                                                       TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______,
-           KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB,                                                                         _______, _______, _______, _______,
-                                                        _______, _______,                   _______, _______,
-                                                                 _______,                   _______,
-                                               _______, _______, _______,                   _______, _______, _______
-),
-
-/*
-Function layer
-,--------------------------------------------------------------.                                     ,--------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |                                     |      |      |      |      |      |      |      |      |      |
-`--------------------------------------------------------------'                                     `--------------------------------------------------------------'
-,------------------------------------------------------.                                                     ,------------------------------------------------------.
-|   F12   |   F1   |   F2   |   F3   |   F4   |   F5   |                                                     |   F6   |   F7   |   F8   |   F9   |   F10  |   F11   |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |        |        |   Up   |        |        |                                                     |        |        |   Up   | Ctrl+Y |        |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         | Ctrl+A |  Left  |  Down  |  Right | C+A+Tab|                                                     |  PgUp  |  Left  |  Down  |  Right |  Home  |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         | Ctrl+Z | Ctrl+X | Ctrl+C | Ctrl+V |  Bspc  |                                                     |  PgDn  |  Mute  |  Vol-  |  Vol+  |   End  |         |
-`---------+--------+--------+--------+--------+--------'                                                     `--------+--------+--------+--------+--------+---------'
-          |        |        |        |        |                                                                       |  Prev  |  Play  |  Next  |  Stop  |
-          `-----------------------------------'                                                                       `-----------------------------------'
-	                                                   ,-----------------.                 ,-----------------.
-	                                                   |        |        |                 |        |        |
-	                                          ,--------+--------+--------|                 |--------+--------+--------.
-	                                          |        |        |        |                 |        |        |        |
-	                                          |        |        |--------|                 |--------|        |        |
-	                                          |        |        |        |                 |        |        |        |
-	                                          `--------------------------'                 `--------------------------'
-*/
-[_FUNCTION] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                                         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, _______, _______, KC_UP,   _______, _______,                                                       _______, _______, KC_UP,   CTL_Y,   _______, _______,
-  _______, CTL_A,   KC_LEFT, KC_DOWN, KC_RGHT, CA_TAB,                                                        KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
-  _______, CTL_Z,   CTL_X,   CTL_C,   CTL_V,   KC_BSPC,                                                       KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END,  _______,
-           _______, _______, _______, _______,                                                                         KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
-                                                        _______, _______,                   _______, _______,
-                                                                 _______,                   _______,
-                                               _______, _______, _______,                   _______, _______, _______
-),
-
-[_FUNCTION2] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                                         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, _______, _______, KC_UP,   _______, _______,                                                       _______, _______, KC_UP,   CTL_Y,   _______, _______,
-  _______, CTL_A,   KC_LEFT, KC_DOWN, KC_RGHT, CA_TAB,                                                        KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
-  _______, CTL_Z,   CTL_X,   CTL_C,   CTL_V,   KC_BSPC,                                                       KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END,  _______,
-           _______, _______, _______, _______,                                                                         KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
-                                                        _______, _______,                   _______, _______,
-                                                                 _______,                   _______,
-                                               _______, _______, _______,                   _______, _______, _______
-),
-
-/*
-Numpad layer
-(Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
-,--------------------------------------------------------------.                                     ,--------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |                                     |      |      |      |      |      |      |      |      |      |
-`--------------------------------------------------------------'                                     `--------------------------------------------------------------'
-,------------------------------------------------------.                                                     ,------------------------------------------------------.
-|         | NumLock|        |        |        |        |                                                     |   Tab  | NumLock|  KP /  |  KP *  |  KP -  |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |  KP 6  |  KP 7  |  KP 8  |  KP 9  |  KP 0  |                                                     |        |  KP 7  |  KP 8  |  KP 9  |  KP +  |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |  KP 1  |  KP 2  |  KP 3  |  KP 4  |  KP 5  |                                                     |        |  KP 4  |  KP 5  |  KP 6  |   =    |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |        |  KP .  | KP/KP* |  KP- _ |  KP+ = |                                                     |        |  KP 1  |  KP 2  |  KP 3  | KP Ent |         |
-`---------+--------+--------+--------+--------+--------'                                                     `--------+--------+--------+--------+--------+---------'
-          |    (   |    )   |   [ {  |   ] }  |                                                                       |        |  KP 0  |  KP .  | KP Ent |
-          `-----------------------------------'                                                                       `-----------------------------------'
-	                                                   ,-----------------.                 ,-----------------.
-	                                                   |        |        |                 |        |        |
-	                                          ,--------+--------+--------|                 |--------+--------+--------.
-	                                          |        |        |        |                 |        |        |        |
-	                                          |        |        |--------|                 |--------|        |        |
-	                                          |        |        |        |                 |        |        |        |
-	                                          `--------------------------'                 `--------------------------'
-*/
-[_NUMPAD] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_NUM,  _______, _______, _______, _______,                                                       KC_TAB,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,
-  _______, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                                                         _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
-  _______, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,                                                         _______, KC_P4,   KC_P5,   KC_P6,   KC_EQL,  _______,
-  _______, _______, KC_PDOT, TD_PSPA, TD_MNUN, TD_PPEQ,                                                       _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-           KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB,                                                                         _______, KC_P0,   KC_PDOT, KC_PENT,
-                                                        _______, _______,                   _______, _______,
-                                                                 _______,                   _______,
-                                               _______, _______, _______,                   _______, _______, _______
-),
-
-/*
-Gaming
-(Toggle gaming layer with limited dual-role keys and layer access; NKRO turned on by default; Ent/NS + Delete/Numbers2 to access Adjust layer)
-,--------------------------------------------------------------.                                     ,--------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |                                     |      |      |      |      |      |      |      |      |      |
-`--------------------------------------------------------------'                                     `--------------------------------------------------------------'
-,------------------------------------------------------.                                                     ,------------------------------------------------------.
-|         |        |        |        |        |        |                                                     |        |        |        |        |        |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |        |        |        |        |        |                                                     |        |        |        |        |        |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|  LCtrl  |        |        |        |        |        |                                                     |        |        |        |        |        |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|  Shift  |        |        |        |        |        |                                                     |        |        |        |        |        |  Shift  |
-`---------+--------+--------+--------+--------+--------'                                                     `--------+--------+--------+--------+--------+---------'
-          |        |        |        |        |                                                                       |        |        |        |        |
-          `-----------------------------------'                                                                       `-----------------------------------'
-	                                                   ,-----------------.                 ,-----------------.
-	                                                   |   ESC  |xxxxxxxx|                 |  RAlt  |  RCtl  |
-	                                          ,--------+--------+--------|                 |--------+--------+--------.
-	                                          |        |        |  LAlt  |                 |  RGUI  | Delete |  Bspc  |
-	                                          |  Space |  Enter |--------|                 |--------|    /   |    /   |
-	                                          |        |        |  Bspc  |                 |Enter/NS| Number2|   Fn2  |
-	                                          `--------------------------'                 `--------------------------'
-*/
-[_GAMING] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
-  KC_LCTL, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
-  KC_LSFT, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, KC_RSFT,
-           _______, _______, _______, _______,                                                                         _______, _______, _______, _______,
-                                                        KC_ESC,  XXXXXXX,                   _______, _______,
-                                                                 KC_LALT,                   _______,
-                                               KC_SPC,  KC_ENT,  _______,                   ENTNS,   _______, _______
-),
-
-/*
-Adjust layer
-(Press and hold Adjust key on the function row or Enter/Number + Delete/Number2 to access; Numpad and NKRO are on toggle)
-,--------------------------------------------------------------.                                     ,--------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |                                     |      |      |      |      |      |      |      |      |      |
-`--------------------------------------------------------------'                                     `--------------------------------------------------------------'
-,------------------------------------------------------.                                                     ,------------------------------------------------------.
-|         | Colemak| QWERTY |        | Gaming |        |                                                     | Numpad |        |        |        |        |  QK_BOOT  |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |        |        |        |        |        |                                                     |        |        |        |        |        |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |        |        |        |        |        |                                                     |        |  NKRO  |        |        |        |         |
-|---------+--------+--------+--------+--------+--------|                                                     |--------+--------+--------+--------+--------+---------|
-|         |        |        |        |        |        |                                                     |        |        |        |        |        |         |
-`---------+--------+--------+--------+--------+--------'                                                     `--------+--------+--------+--------+--------+---------'
-          |        |        |        |        |                                                                       |        |        |        |        |
-          `-----------------------------------'                                                                       `-----------------------------------'
-	                                                   ,-----------------.                 ,-----------------.
-	                                                   |        |        |                 |        |        |
-	                                          ,--------+--------+--------|                 |--------+--------+--------.
-	                                          |        |        |        |                 |        |        |        |
-	                                          |        |        |--------|                 |--------|        |        |
-	                                          |        |        |        |                 |        |        |        |
-	                                          `--------------------------'                 `--------------------------'
-*/
-[_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, GAMING,  _______,                                                       NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                                                       _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______,                                                                         _______, _______, _______, _______,
-                                                        _______, _______,                   _______, _______,
-                                                                 _______,                   _______,
-                                               _______, _______, _______,                   _______, _______, _______
-),
-
-[_ADJUST2] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, COLEMAK, QWERTY,  _______, GAMING,  _______,                                                       NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                                                       _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______,                                                                         _______, _______, _______, _______,
-                                                        _______, _______,                   _______, _______,
-                                                                 _______,                   _______,
-                                               _______, _______, _______,                   _______, _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	case COLEMAK:
-      if (record->event.pressed) {
-//        persistent_default_layer_set(1UL << _COLEMAK);
-        default_layer_set(1UL << _COLEMAK);
-        layer_move (_COLEMAK);
-        keymap_config.nkro = 0;
-	  }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-//        persistent_default_layer_set(1UL << _QWERTY);
-        default_layer_set(1UL << _QWERTY);
-        layer_move (_QWERTY);
-        keymap_config.nkro = 0;
-      }
-      return false;
-      break;
-    case GAMING:
-      if (record->event.pressed) {
-        layer_invert (_GAMING);
-        layer_off (_NUMPAD);
-        keymap_config.nkro = 1;
-	  }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/readme.md b/keyboards/kinesis/keymaps/tuesdayjohn/readme.md
deleted file mode 100644
index 88af87e88bd..00000000000
--- a/keyboards/kinesis/keymaps/tuesdayjohn/readme.md
+++ /dev/null
@@ -1,219 +0,0 @@
-# TuesdayJohn's Kinesis Keymap
-
-These layouts are derived from what I was using on my Kinesis Contoured keyboards with Hasu's USB-USB TMK converters.  With the move to QMK via Stapelberg replacement controller, I've cleaned up the layouts a bit while adding more functions and layers.
-
-There are minor changes in the base keywell layout of non-alpha keys (e.g., CapsLock is ESC/Ctl, arrow clusters on one side), while the thumb clusters deviate more from the default layout.
-
-Changes to the thumb clusters include: 
-* The navigations keys moved to function layers.
-* The function of 2u keys have been reversed - I've always used space with my left thumb, and I find it more helpful to have quick and easy access to Space and Enter while using my mouse/trackball.
-* Backspace have been duplicated on both clusters.  As with Space and Backspace, I find it helpful to have quick and easy access to Backspace while using my mouse/trackball.
-* The 2u keys serve dual function as momentary layer switchers.
-
-I've largely left the function keys untouched, with the intension of not using them often.  They are neither easy to use nor reach due to their locations and size, and Kinesis used not-so-great rubber dome switches for them (Advantage model and earlier).  Kinesis have since replaced the keys with Cherry ML switches on Advantage2, but did not resolve the issues of size or location.  Additionally, leaving the function keys unused here makes it easier for me to adapt the keymaps to my other keyboards, most of which do not have physical function keys.
-
-I use Colemak as my default layout.  I've included QWERTY here as well.
-
-Additionally, there is a gaming layer on toggle.  This layer is turned top of either Colemak or QWERTY and have limited access to the Function or Numbers/Symbols layers.  Additionally, NKRO is turned on when the layer is turned on.
-
-Persistent default layer has been enabled for Colemak and QWERTY.  The gaming/vanilla Colemak and QWERTY can be set as default layer, but will not be persistent.
-
-## Future plans
-
-* Add status LEDs to the Stapelberg PCB (usually used for Caps Lock, Num Lock, and Scroll Lock) to use as layer indicators.
-* Add a speaker now that QMK supports additional pins for audio use.
-* Utilize the leftover spots on the key matrix, as well as unused pins on Teensy++ 2.0 to run macropad and/or foot pedals.
-
-
-## Layers
-
-### Function Keys on all layers
-- 'Numpd' toggles the Numpad layer
-- 'Adjst' is a momentary layer key to access the Adjust layer
-
-```
-,-----------------------------------------------------. ,----------------------------------------------------.
-| ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 | | F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Adjst|
-`-----------------------------------------------------' `----------------------------------------------------'
-```
-
-### Colemak
-- Default layer
-- Keys separated by "/" tap for first, hold for second
-- Uses [Space Cadet Shifts](https://beta.docs.qmk.fm/features/feature_space_cadet)
-
-```
-,------------------------------------------------. ,------------------------------------------------.
-|    =   |   1   |   2   |   3   |   4   |   5   | |   6   |   7   |   8   |   9   |   0   |    -   |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|   Tab  |   Q   |   W   |   F   |   P   |   G   | |   J   |   L   |   U   |   Y   |   ;   |    \   |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|ESC/Ctrl|   A   |   R   |   S   |   T   |   D   | |   H   |   N   |   E   |   I   |   O   |    '   |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|SC Shift|   Z   |   X   |   C   |   V   |   B   | |   K   |   M   |   ,   |   .   |   /   |SC Shift|
-`--------+-------+-------+-------+-------+-------' `-------+-------+-------+-------+-------+--------'
-         |  Ins  |   `   |   [   |   ]   |                 |  Left |  Down |   Up  | Right |
-         `-------------------------------'                 `-------------------------------'
-                                 ,---------------. ,---------------.
-                                 |ESC/Ctl| Hyper | |  RAlt |  RCtl |
-                         ,-------+-------+-------| |-------+-------+-------.
-                         | Space | Enter |App/Alt| |  RGUI | Delete|  Bspc |
-                         |   /   |   /   |-------| |-------|   /   |   /   |
-                         |  Fn   | Number|  Bspc | | Enter |Number2|  Fn2  |
-                         `-----------------------' `-----------------------' 
-```	
-	
-### QWERTY
-- Keys separated by "/" tap for first, hold for second
-- Uses [Space Cadet Shifts](https://beta.docs.qmk.fm/features/feature_space_cadet)
-
-```
-,------------------------------------------------. ,------------------------------------------------.
-|    =   |   1   |   2   |   3   |   4   |   5   | |   6   |   7   |   8   |   9   |   0   |    -   |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|   Tab  |   Q   |   W   |   E   |   R   |   T   | |   Y   |   U   |   I   |   O   |   P   |    \   |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|ESC/Ctrl|   A   |   S   |   D   |   F   |   G   | |   H   |   J   |   K   |   L   |   ;   |    '   |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|SC Shift|   Z   |   X   |   C   |   V   |   B   | |   N   |   M   |   ,   |   .   |   /   |SC Shift|
-`--------+-------+-------+-------+-------+-------' `-------+-------+-------+-------+-------+--------'
-         |  Ins  |   `   |   [   |   ]   |                 |  Left |  Down |   Up  | Right |
-         `-------------------------------'                 `-------------------------------'
-                                 ,---------------. ,---------------.
-                                 |ESC/Ctl| Hyper | |  RAlt |  RCtl |
-                         ,-------+-------+-------| |-------+-------+-------.
-                         | Space | Enter |App/Alt| |  RGUI | Delete|  Bspc |
-                         |   /   |   /   |-------| |-------|   /   |   /   |
-                         |  Fn   | Number|  Bspc | | Enter |Number2|  Fn2  |
-                         `-----------------------' `-----------------------' 
-```	
-
-### Numbers & Symbols layer
-- Momentary layer
-- Multiple characters: Single-tap for first, double-tap for second
-
-```
-,------------------------------------------------. ,------------------------------------------------.
-|   F12  |   F1  |   F2  |   F3  |   F4  |   F5  | |   F6  |   F7  |   F8  |   F9  |  F10  |   F11  |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |   6   |   7   |   8   |   9   |   0   | |   ^   |   &   |   *   |   (   |   )   |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |   1   |   2   |   3   |   4   |   5   | |   !   |   @   |   #   |   $   |   %   |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |       |   .   |  / *  |  - _  |  + =  | |  ` ~  |  [ {  |  ] }  |       |       |        |
-`--------+-------+-------+-------+-------+-------' `-------+-------+-------+-------+-------+--------'
-         |   (   |   )   |  [ {  |  ] }  |                 |       |       |       |       |
-         `-------------------------------'                 `-------------------------------'
-                                 ,---------------. ,---------------.
-                                 |       |       | |       |       |
-                         ,-------+-------+-------| |-------+-------+-------.
-                         |       |       |       | |       |       |       |
-                         |       |       |-------| |-------|       |       |
-                         |       |       |       | |       |       |       |
-                         `-----------------------' `-----------------------' 
-```	
-
-### Function layer
-- Momentary layer
- 	
-```
-,------------------------------------------------. ,------------------------------------------------.
-|   F12  |   F1  |   F2  |   F3  |   F4  |   F5  | |   F6  |   F7  |   F8  |   F9  |  F10  |   F11  |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |       |       |   Up  |       |       | |       |       |   Up  | Ctrl+Y|       |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        | Ctrl+A|  Left |  Down | Right | C+A+Tb| |  PgUp |  Left |  Down | Right |  Home |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        | Ctrl+Z| Ctrl+X| Ctrl+C| Ctrl+V|  Bspc | |  PgDn |  Mute |  Vol- |  Vol+ |   End |        |
-`--------+-------+-------+-------+-------+-------' `-------+-------+-------+-------+-------+--------'
-         |       |       |       |       |                 |  Prev |  Play |  Next |  Stop |
-         `-------------------------------'                 `-------------------------------'
-                                 ,---------------. ,---------------.
-                                 |       |       | |       |       |
-                         ,-------+-------+-------| |-------+-------+-------.
-                         |       |       |       | |       |       |       |
-                         |       |       |-------| |-------|       |       |
-                         |       |       |       | |       |       |       |
-                         `-----------------------' `-----------------------' 
-```	
-
-### Numpad layer
-- Toggle layer
-- Left side duplicates layout from the Numbers layer, just with numpad output
-- Right side layout close to PC numpad layout
-- Multiple characters: Single-tap for first, double-tap for second
-
-```	
-,------------------------------------------------. ,------------------------------------------------.
-|        | NumLk |       |       |       |       | |  Tab  | NumLk |  KP / |  KP * |  KP - |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |  KP 6 |  KP 7 |  KP 8 |  KP 9 |  KP 0 | |       |  KP 7 |  KP 8 |  KP 9 |  KP + |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |  KP 1 |  KP 2 |  KP 3 |  KP 4 |  KP 5 | |       |  KP 4 |  KP 5 |  KP 6 |   =   |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |       |  KP . | KP/KP*| KP- _ | KP+ = | |       |  KP 1 |  KP 2 |  KP 3 | KP Ent|        |
-`--------+-------+-------+-------+-------+-------' `-------+-------+-------+-------+-------+--------'
-         |   (   |   )   |  [ {  |  ] }  |                 |  KP 0 |   ,   |  KP . | KP Ent|
-         `-------------------------------'                 `-------------------------------'
-                                 ,---------------. ,---------------.
-                                 |       |       | |       |       |
-                         ,-------+-------+-------| |-------+-------+-------.
-                         |       |       |       | |       |       |       |
-                         |       |       |-------| |-------|       |       |
-                         |       |       |       | |       |       |       |
-                         `-----------------------' `-----------------------' 
-```	
-
-### Gaming
-- Toggle layer with limited access to Function or Numbers layers
-- Mainly used for gaming
-- NKRO turned on by default
-- Press and hold Ent/NS + Delete/Numbers2 to access Adjust layer
-
-```
-,------------------------------------------------. ,------------------------------------------------.
-|        |       |       |       |       |       | |       |       |       |       |       |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |       |       |       |       |       | |       |       |       |       |       |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|  LCtrl |       |       |       |       |       | |       |       |       |       |       |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|  Shift |       |       |       |       |       | |       |       |       |       |       |  Shift |
-`--------+-------+-------+-------+-------+-------' `-------+-------+-------+-------+-------+--------'
-         |       |       |       |       |                 |       |       |       |       |
-         `-------------------------------'                 `-------------------------------'
-                                 ,---------------. ,---------------.
-                                 |  ESC  |xxxxxxx| |  RAlt |  RCtl |
-                         ,-------+-------+-------| |-------+-------+-------.
-                         |       |       |  LAlt | |  RGUI | Delete|  Bspc |
-                         | Space | Enter |-------| |-------|   /   |   /   |
-                         |       |       |  Bspc | | Ent/NS|Number2|  Fn2  |
-                         `-----------------------' `-----------------------' 
-```	
-	
-### Adjust layer
-- Momentary layer
-- Press and hold Adjust key on the function row or Enter/Number + Delete/Number2 to access
-- Gaming, Numpad, and NKRO are on toggle
-
-```
-,------------------------------------------------. ,------------------------------------------------.
-|        |Colemak| QWERTY|       | Gaming|       | | Numpad|       |       |       |       |  RESET |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |       |       |       |       |       | |       |       |       |       |       |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |       |       |       |       |       | |       |  NKRO |       |       |       |        |
-|--------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+--------|
-|        |       |       |       |       |       | |       |       |       |       |       |        |
-`--------+-------+-------+-------+-------+-------' `-------+-------+-------+-------+-------+--------'
-         |       |       |       |       |                 |       |       |       |       |
-         `-------------------------------'                 `-------------------------------'
-                                 ,---------------. ,---------------.
-                                 |       |       | |       |       |
-                         ,-------+-------+-------| |-------+-------+-------.
-                         |       |       |       | |       |       |       |
-                         |       |       |-------| |-------|       |       |
-                         |       |       |       | |       |       |       |
-                         `-----------------------' `-----------------------' 
- ```
- 
diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/rules.mk b/keyboards/kinesis/keymaps/tuesdayjohn/rules.mk
deleted file mode 100644
index 390cb3fd60a..00000000000
--- a/keyboards/kinesis/keymaps/tuesdayjohn/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
diff --git a/keyboards/kinesis/keymaps/tw1t611/config.h b/keyboards/kinesis/keymaps/tw1t611/config.h
deleted file mode 100644
index 271f48d0011..00000000000
--- a/keyboards/kinesis/keymaps/tw1t611/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-// place overrides here
diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c
deleted file mode 100644
index e5fb5519dc1..00000000000
--- a/keyboards/kinesis/keymaps/tw1t611/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2023 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-#define QWERTZ 0
-#define MOD 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[QWERTZ] = 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_PSCR,KC_SCRL,KC_PAUS,KC_NO ,QK_BOOT,
-           _______,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,           KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,DE_SS  ,
-           KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,           KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,DE_ADIA,
-           KC_TAB ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,           KC_H   ,KC_J   ,KC_K   ,KC_L   ,DE_SLSH,DE_ODIA,
-           DE_PIPE,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,           KC_N   ,KC_M   ,DE_COMM,DE_DOT ,DE_MINS,DE_UDIA,
-           _______,_______,_______,_______,           _______,_______,_______,_______,
-                   KC_RCTL,KC_LALT,                   KC_LGUI,KC_LCTL,
-                   KC_HOME,                   KC_END ,
-                   KC_SPC ,KC_LSFT,KC_BSPC ,                   KC_DEL,MO(MOD),KC_ENTER
-    ),
-[MOD] = LAYOUT(
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,           _______,_______,_______,_______,_______,_______,_______,_______,_______,
-           _______,_______,_______,_______,_______,_______,           _______,_______,_______,_______,_______,_______,
-           DE_CIRC,DE_QUOT,DE_DQUO,DE_LCBR,DE_RCBR,DE_GRV ,           KC_HOME,KC_PGDN,KC_PGUP,KC_END ,DE_EQL ,DE_PERC,
-           DE_TILD,DE_EXLM,DE_DLR ,DE_LPRN,DE_RPRN,DE_AMPR,           KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,DE_QUES,DE_ASTR,
-           DE_BSLS,DE_HASH,DE_LABK,DE_LBRC,DE_RBRC,DE_RABK,           DE_AT  ,DE_EURO,DE_SCLN,DE_COLN,DE_UNDS,DE_PLUS,
-           _______,_______,_______,_______,           _______,_______,_______,_______,
-                   _______,_______,                   _______,_______,
-                   _______,                   _______,
-                   _______,_______,_______,                   _______,_______ ,_______
-    )
-};
diff --git a/keyboards/kinesis/keymaps/tw1t611/readme.md b/keyboards/kinesis/keymaps/tw1t611/readme.md
deleted file mode 100644
index 41b0caa7e2e..00000000000
--- a/keyboards/kinesis/keymaps/tw1t611/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-This is a german keymap for the Kinesis Advantage.
diff --git a/keyboards/kinesis/keymaps/tw1t611/rules.mk b/keyboards/kinesis/keymaps/tw1t611/rules.mk
deleted file mode 100644
index 93e7cd8bb74..00000000000
--- a/keyboards/kinesis/keymaps/tw1t611/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/kinesis/keymaps/xyverz/config.h b/keyboards/kinesis/keymaps/xyverz/config.h
deleted file mode 100644
index 8893d122e04..00000000000
--- a/keyboards/kinesis/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c
deleted file mode 100644
index 1dff9053a8b..00000000000
--- a/keyboards/kinesis/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2023 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _DVORAK,
-    _QWERTY,
-    _COLEMAK,
-    _KEYPAD,
-};
-
-enum custom_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, KEYPAD };
-
-// Aliases to make the keymap more uniform
-#define GUI_END GUI_T(KC_END)
-#define KPD_ENT LT(_KEYPAD, KC_ENT)
-#define MACLOCK LGUI(LCTL(KC_Q))
-
-// clang-format off
-
-/*
-
-        Function Keys on All Layers (Keypad toggles):
-	,-----------------------------------------------------------------.
-	|  ESC |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   F7   |  F8   |
- 	`-----------------------------------------------------------------'
-        ,-----------------------------------------------------------------.
-        |  F9  |  F10 |  F11 |  F12 | PScr | SLck | Paus | Keypad | QK_BOOT |
-        `-----------------------------------------------------------------'
-
-        Dvorak layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   '  |   ,  |   .  |   P  |   Y  ||   F  |   G  |   C  |   R  |   L  |   /    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| CapsLk |   A  |   O  |   E  |   U  |   I  ||   D  |   H  |   T  |   N  |   S  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   X  ||   B  |   M  |   W  |   V  |   Z  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |  INS | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             | LCtl  | LAlt || RGUI | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      |       | Home || PgUp | Enter |       |
-	                      | BkSp |  Del  |------||------|   /   | Space |
-	                      |      |       | End  || PgDn | KeyPd |       |
-	                      `---------------------'`----------------------'
-
-        QWERTY layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| CapsLk |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |  INS | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             | LCtl  | LAlt || RGUI | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      |       | Home || PgUp | Enter |       |
-	                      | BkSp |  Del  |------||------|   /   | Space |
-	                      |      |       | End  || PgDn | KeyPd |       |
-	                      `---------------------'`----------------------'
-
-        Colemak layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   F  |   P  |   G  ||   J  |   L  |   U  |   Y  |   ;  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| BkSpc  |   A  |   R  |   S  |   T  |   D  ||   H  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  ||   K  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |  INS | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             | LCtl  | LAlt || RGUI | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      |       | Home || PgUp | Enter |       |
-	                      | BkSp |  Del  |------||------|   /   | Space |
-	                      |      |       | End  || PgDn | KeyPd |       |
-	                      `---------------------'`----------------------'
-
-        Keypad layer:
-	,-------------------------------------------.,-------------------------------------------.
-	| Power  |      |      |      |      |      ||      | NmLk | KP = | KP / | KP * |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Sleep  |      |      |      |      |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Wake   |      | Mute | Vol- | Vol+ |      ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        | Stop | Prev | Play | Next | Sel  ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      |QWERTY|Colemk|Dvorak|              |      |      | KP . |KP Ent|
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |MacLck|
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      | KP 0 |
-	                       |      |      |MacLck||      |      |      |
-	                       `--------------------'`--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DVORAK] = LAYOUT (
-           KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
-           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-           KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,           KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-           KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,           KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-           KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,           KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                    KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,                    KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-
-                    KC_LCTL, KC_LALT,           KC_RGUI, KC_RCTL,
-                             KC_HOME,           KC_PGUP,
-           KC_BSPC, KC_DEL,  GUI_END,           KC_PGDN, KPD_ENT, KC_SPC
-    ),
-
-[_QWERTY] = LAYOUT (
-           KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
-           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           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_Y,    KC_U,    KC_I,    KC_O,    KC_P,    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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,           KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                    KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,                    KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-
-                    KC_LCTL, KC_LALT,           KC_RGUI, KC_RCTL,
-                             KC_HOME,           KC_PGUP,
-           KC_BSPC, KC_DEL,  KC_END,           KC_PGDN, KPD_ENT, KC_SPC
-    ),
-
-[_COLEMAK] = LAYOUT (
-           KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
-           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,           KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-           KC_BSPC, 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_GRV,  KC_INS,  KC_LEFT, KC_RGHT,                    KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-
-                    KC_LCTL, KC_LALT,           KC_RGUI, KC_RCTL,
-                             KC_HOME,           KC_PGUP,
-           KC_BSPC, KC_DEL,  KC_END,           KC_PGDN, KPD_ENT, KC_SPC
-    ),
-
-[_KEYPAD] = LAYOUT (
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_PWR,  _______, _______, _______, _______, _______,           _______, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST, _______,
-           KC_SLEP, _______, _______, _______, _______, _______,           _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
-           KC_WAKE, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,           _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
-           _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL,           _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-                    _______, QWERTY,  COLEMAK, DVORAK,                    _______, _______, KC_PDOT, KC_PENT,
-
-                    _______, _______,           _______, MACLOCK,
-                             _______,           _______,
-           _______, _______, MACLOCK,           _______, _______, KC_P0
-    )
-};
-
-// clang-format on
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case DVORAK:
-                set_single_persistent_default_layer(_DVORAK);
-                return false;
-            case QWERTY:
-                set_single_persistent_default_layer(_QWERTY);
-                return false;
-            case COLEMAK:
-                set_single_persistent_default_layer(_COLEMAK);
-                return false;
-        }
-    }
-    return true;
-};
diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md
deleted file mode 100644
index f0f55a478b4..00000000000
--- a/keyboards/kinesis/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1,109 +0,0 @@
-# Xyverz's Kinesis Keymap
-
-## About this keymap:
-
-This is is pretty much a stock Advantage layout for Dvorak, with a bit of rearranging of certain keys. The QWERTY layout shown here is based entirely on the Kinesis Advantage layout. The Colemak layout is merely an adaptation of that.
-
-I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
-
-Depending on the OS, most of the LEDs are now working in this keymap, but I still have yet to get the Num Pad LED working when switching to the Numpad layer.
-
-Removed the Media layer 2018-12-07
-
-Updated Dvorak layer to move slash to a position relative to my other 5x12 ortholinear keyboards 2020-05-04
-
-## Still to do:
-
- * Figure out how to make the Numpad LED work properly.
-
-### Function Keys on All Layers (`keypad` toggles to the keypad layer):
-	,-----------------------------------------------------------------.
-	|  Esc |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   F7   |  F8   |
- 	`-----------------------------------------------------------------'
-	,-----------------------------------------------------------------.
-	|  F9  |  F10 |  F11 |  F12 | PScr | SLck | Paus | Keypad | Reset |
-	`-----------------------------------------------------------------'
-
-### Layer 0: Dvorak layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   '  |   ,  |   .  |   P  |   Y  ||   F  |   G  |   C  |   R  |   L  |   /    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| CapsLk |   A  |   O  |   E  |   U  |   I  ||   D  |   H  |   T  |   N  |   S  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   X  ||   B  |   M  |   W  |   V  |   Z  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |  INS | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             | LCtl  | LAlt || RGUI | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      |       | Home || PgUp | Enter |       |
-	                      | BkSp |  Del  |------||------|   /   | Space |
-	                      |      |       | End  || PgDn | KeyPd |       |
-	                      `---------------------'`----------------------'
-
-### Layer 1: QWERTY layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| CapsLk |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |  Ins | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             | LCtl  | LAlt || RGUI | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      |       | Home || PgUp | Enter |       |
-	                      | BkSp |  Del  |------||------|   /   | Space |
-	                      |      |       | End  || PgDn | KeyPd |       |
-	                      `---------------------'`----------------------'
-	 
-### Keymap 2: Colemak layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   F  |   P  |   G  ||   J  |   L  |   U  |   Y  |   ;  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| BkSpc  |   A  |   R  |   S  |   T  |   D  ||   H  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  ||   K  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |  Ins | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             | LCtl  | LAlt || RGUI | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      |       | Home || PgUp | Enter |       |
-	                      | BkSp |  Del  |------||------|   /   | Space |
-	                      |      |       | End  || PgDn | KeyPd |       |
-	                      `---------------------'`----------------------'
-
-### layer 3 : Keypad layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	| Power  |      |      |      |      |      ||      | NmLk | KP = | KP / | KP * |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Sleep  |      |      |      |      |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Wake   |      | Mute | Vol- | Vol+ |      ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        | Stop | Prev | Play | Next | Sel  ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      |QWERTY|Colemk|Dvorak|              |      |      | KP . |KP Ent|
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |MacLck|
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      | KP 0 |
-	                       |      |      |MacLck||      |      |      |
-	                       `--------------------'`--------------------'
diff --git a/keyboards/kinesis/keymaps/xyverz/rules.mk b/keyboards/kinesis/keymaps/xyverz/rules.mk
deleted file mode 100644
index d0e540272b3..00000000000
--- a/keyboards/kinesis/keymaps/xyverz/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/config.h b/keyboards/kinesis/kint36/keymaps/kzar/config.h
deleted file mode 100644
index 6b03aa6a70e..00000000000
--- a/keyboards/kinesis/kint36/keymaps/kzar/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Dave Vandyke <kzar@kzar.co.uk>
- *
- * 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
-
-#undef LED_COMPOSE_PIN
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
deleted file mode 100644
index 3685e0fe57a..00000000000
--- a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/* Copyright 2021 Dave Vandyke <kzar@kzar.co.uk>,
- *   Based upon Xyverz's Kinesis keymap Copyright 2017-2020.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {_QWERTY, _DVORAK, _MAC, _PC, _KEYPAD, _PROGRAM};
-enum my_keycodes {QWERTY = SAFE_RANGE, DVORAK, WIN, MAC, PC, STATUS, PROGRAM};
-
-#define LED_KEYPAD E26
-
-// clang-format off
-
-/*
-        QWERTY layer:
-        ,---------------------------------------------------------------------------.
-        |    ESC   |  F1  |  F2  |  F3  |  F4  |    F5    |   F6   |   F7   |  F8   |
-        `---------------------------------------------------------------------------'
-        ,---------------------------------------------------------------------------.
-        |    F9    |  F10 |  F11 |  F12 | PScr |   SLck   |  Pause | Keypad | Prgrm |
-        `---------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   \    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | CapsLk |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   \  | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
-                 `---------------------------'              `---------------------------'
-                                     ,--------------.,--------------.
-                                     | LCtl  | LAlt || LGUI | RCtl  |
-                              ,------|-------|------||------+-------+-------.
-                              |      |       | Home || PgUp | Enter |       |
-                              | BkSp |  Del  |------||------|   /   | Space |
-                              |      |       | End  || PgDn | KeyPd |       |
-                              `---------------------'`----------------------'
-
-        Dvorak layer:
-        ,---------------------------------------------------------------------------.
-        |          |      |      |      |      |          |        |        |       |
-        `---------------------------------------------------------------------------'
-        ,---------------------------------------------------------------------------.
-        |          |      |      |      |      |          |        |        |       |
-        `---------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |   '  |   ,  |   .  |   P  |   Y  ||   F  |   G  |   C  |   R  |   L  |   /    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |   A  |   O  |   E  |   U  |   I  ||   D  |   H  |   T  |   N  |   S  |   \    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |   ;  |   Q  |   J  |   K  |   X  ||   B  |   M  |   W  |   V  |   Z  |        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |      |      |      |      |
-                 `---------------------------'              `---------------------------'
-                                     ,--------------.,--------------.
-                                     |       |      ||      |       |
-                              ,------|-------|------||------+-------+-------.
-                              |      |       |      ||      |       |       |
-                              |      |       |------||------|       |       |
-                              |      |       |      ||      |       |       |
-                              `---------------------'`----------------------'
-
-        Mac layer:
-        ,-------------------------------------------------------------------------------.
-        |          |      |      |        |        |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------------------------------------------.
-        |          |      |      |        |        |   Power  |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |      |      |      |      |
-                 `---------------------------'              `---------------------------'
-                                      ,-------------.,-------------.
-                                      | LGUI | LAlt || RCtl | RGUI |
-                               ,------|------|------||------+------+------.
-                               |      |      |      ||      |      |      |
-                               |      |      |------||------|      |      |
-                               |      |      |      ||      |      |      |
-                               `--------------------'`--------------------'
-
-        PC layer:
-        ,-------------------------------------------------------------------------------.
-        |          |      |      |        |        |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------------------------------------------.
-        |          |      |      |        |        |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |      |      |      |      |
-                 `---------------------------'              `---------------------------'
-                                      ,-------------.,-------------.
-                                      |      |      || RAlt |      |
-                               ,------|------|------||------+------+------.
-                               |      |      |      ||      |      |      |
-                               |      |      |------||------|      |      |
-                               |      |      |      ||      |      |      |
-                               `--------------------'`--------------------'
-
-        Keypad layer:
-        ,---------------------------------------------------------------------------.
-        |          |      |      |      |      |          |        |        |       |
-        `---------------------------------------------------------------------------'
-        ,---------------------------------------------------------------------------.
-        |          |      |      |      | Mute | Vol Down | Vol Up | Keypad |       |
-        `---------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      | NmLk | KP = | KP / | KP * |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |  INS |      |      |              |      |      | KP . |KP Ent|
-                 `---------------------------'              `---------------------------'
-                                      ,-------------.,-------------.
-                                      |      |      ||      |      |
-                               ,------|------|------||------+------+------.
-                               |      |      |      ||      |      |      |
-                               |      |      |------||------|      | KP 0 |
-                               |      |      |      ||      |      |      |
-                               `--------------------'`--------------------'
-
-        Program layer:
-        ,-------------------------------------------------------------------------------.
-        |  STATUS  |      |      | QWERTY | DVORAK |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------------------------------------------.
-        |   QK_BOOT  |      |      |        |        |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |      |      |      |      |
-                 `---------------------------'              `---------------------------'
-                                      ,-------------.,-------------.
-                                      |      |      ||      |      |
-                               ,------|------|------||------+------+------.
-                               |      |      |      ||      |      |      |
-                               |      |      |------||------|      |      |
-                               |      |      |      ||      |      |      |
-                               `--------------------'`--------------------'
-
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT (
-           // Left Hand
-           KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,        KC_F8,
-           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-           KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
-           KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-           KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-                    KC_GRV,  KC_NUBS, KC_LEFT, KC_RGHT,
-           // Left Thumb
-                    KC_LCTL, KC_LALT,
-                             KC_HOME,
-           KC_BSPC, KC_DEL,  KC_END,
-
-           // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  MO(_PROGRAM),
-           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-           KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-           KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                    KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-           // Right Thumb
-           KC_LGUI, KC_RCTL,
-           KC_PGUP,
-           KC_PGDN, KC_ENT, KC_SPC
-    ),
-
-[_DVORAK] = LAYOUT (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,
-           _______,    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,
-           _______, KC_SCLN,    KC_Q,    KC_J,    KC_K,    KC_X,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           KC_F,       KC_G,    KC_C,    KC_R,    KC_L, KC_SLSH,
-           KC_D,       KC_H,    KC_T,    KC_N,    KC_S, KC_BSLS,
-           KC_B,       KC_M,    KC_W,    KC_V,    KC_Z, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_MAC] = LAYOUT (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    KC_LGUI, KC_LALT,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, KC_PWR, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           KC_RCTL, KC_RGUI,
-           _______,
-           _______, _______, _______
-    ),
-
-[_PC] = LAYOUT (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           KC_RALT, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_KEYPAD] = LAYOUT (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, KC_INS,  _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______,    _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-           _______, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST,  _______,
-           _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,  _______,
-           _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,  _______,
-           _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT,  _______,
-                    _______, _______, KC_PDOT, KC_PENT,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, KC_P0
-    ),
-
-[_PROGRAM] = LAYOUT (
-           // Left Hand
-           STATUS,  _______, _______, QWERTY,   DVORAK,  MAC,     PC,     WIN,     _______,
-           _______, _______, _______, _______ , _______, _______,
-           _______, _______, _______, _______ , _______, _______,
-           _______, _______, _______, _______ , _______, _______,
-           _______, _______, _______, _______ , _______, _______,
-                    _______, _______, _______ , _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    )
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(LED_KEYPAD, !layer_state_cmp(state, _KEYPAD));
-    return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case QWERTY:
-                set_single_persistent_default_layer(_QWERTY);
-                return false;
-            case DVORAK:
-                set_single_persistent_default_layer(_DVORAK);
-                return false;
-            case MAC:
-                layer_on(_MAC);
-                layer_off(_PC);
-                return false;
-            case PC:
-                layer_off(_MAC);
-                layer_on(_PC);
-                return false;
-            case WIN:
-                layer_off(_MAC);
-                layer_off(_PC);
-                return false;
-            case STATUS:
-                SEND_STRING("Firmware> QMK " QMK_VERSION ", " QMK_BUILDDATE "\n");
-                SEND_STRING("Keyboard> " QMK_KEYBOARD "\n");
-                SEND_STRING("Keymap> " QMK_KEYMAP "\n");
-
-                if (layer_state_cmp(default_layer_state, _QWERTY))
-                    SEND_STRING("Layout> QWERTY\n");
-                else
-                    SEND_STRING("Layout> DVORAK\n");
-
-                if (layer_state_is(_MAC))
-                    SEND_STRING("Thumb keys mode> MAC\n");
-                else if (layer_state_is(_PC))
-                    SEND_STRING("Thumb keys mode> PC\n");
-                else
-                    SEND_STRING("Thumb keys mode> WIN\n");
-
-                if (keymap_config.nkro)
-                    SEND_STRING("NKRO> Enabled\n");
-                else
-                    SEND_STRING("NKRO> Disabled\n");
-
-                if (debug_enable)
-                    SEND_STRING("Debug> Enabled\n");
-                else
-                    SEND_STRING("Debug> Disabled\n");
-
-                return false;
-        }
-    }
-
-    return true;
-}
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/readme.md b/keyboards/kinesis/kint36/keymaps/kzar/readme.md
deleted file mode 100644
index b45808892e0..00000000000
--- a/keyboards/kinesis/kint36/keymaps/kzar/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Dave's Kinesis Advantage keymap
-
-Kinesis Advantage keymap aiming to emulate the stock controller. QWERTY, DVORAK,
-WIN, MAC, PC, program and keypad layers are all supported, along with the
-keypad LED and RESET + STATUS keys.
-
-Tested with a Kinesis Advantage2, kinT (stapelberg) keyboard controller built
-with a Teensy 3.6 microcontroller and a UK system layout. Originally based upon
-the xyvers keymap.
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/rules.mk b/keyboards/kinesis/kint36/keymaps/kzar/rules.mk
deleted file mode 100644
index a8817651285..00000000000
--- a/keyboards/kinesis/kint36/keymaps/kzar/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMMAND_ENABLE = yes
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/config.h b/keyboards/kingly_keys/romac/keymaps/boss566y/config.h
deleted file mode 100755
index 8b098b6c0ca..00000000000
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2020 boss566y
-
-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 8
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c b/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c
deleted file mode 100755
index 6acb55dd53c..00000000000
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2018 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-char oled_layer[20];
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_KP_7, KC_KP_8, KC_KP_9,
-        KC_KP_4, KC_KP_5, KC_KP_6,
-        KC_KP_1, KC_KP_2, KC_KP_3,
-        MO(1),   KC_KP_0, KC_KP_DOT
-    ),
-    [1] = LAYOUT(
-        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(
-        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(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [4] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [5] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [6] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [7] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
-
-
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-    sprintf(oled_layer,"Layer\nL: %d\n",get_highest_layer(layer_state));
-    oled_write(oled_layer,false);
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NLCK ") : PSTR("     "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR("       "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLK") : PSTR("       "), false);
-    return false;
-}
-#endif
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk b/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
deleted file mode 100755
index 68d31978961..00000000000
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-BOOTLOADER = qmk-dfu
-OLED_ENABLE = yes
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/README.md b/keyboards/kingly_keys/ropro/keymaps/jdayton3/README.md
deleted file mode 100644
index b62ea79e10d..00000000000
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-```
-        ,-----------------------------------------------------------------------------------.
-        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-        |------+------+------+------+------+------+------+------+------+------+------+------|
-        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-        |------+------+------+------+------+------+------+------+------+------+------+------|
-  RotEn | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- ,------+------+------+------+------+------+------+------+------+------+------+------+------|
- | PgUp | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- |------+------+------+------+------+------+-------------+------+------+------+------+------|
- | Home | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------+------|
- | PgDn | Brite| Ctrl | ALT  | GUI  |Lower |SPACE |SPACE |Raise | Left | Down |  Up  |Right |
- `------------------------------------------------------------------------------------------'
-```
-
-# A Planck-based RoPro layout
-
-Basically all the layers from the default Planck layout, plus a number row, a function row, 3 extra keys, and a rotary encoder.
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
deleted file mode 100644
index 22e037b6f7a..00000000000
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* Copyright 2019 Jonathan Dayton (jdayton3)
- *
- * 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
-
-extern keymap_config_t keymap_config;
-
-enum layer_names {
-    _QWERTY,
-    _COLEMAK,
-    _DVORAK,
-    _LOWER,
-    _RAISE,
-    _PLOVER,
-    _ADJUST
-};
-
-enum keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* QWERTY
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *  RotEn | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * ,------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Home | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn | Brite| Ctrl | ALT  | GUI  |Lower |SPACE |SPACE |Raise | Left | Down |  Up  |Right |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_QWERTY] = 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_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,      KC_P,     KC_BSPC,
-    KC_PGUP,  KC_ESC,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,      KC_SCLN,  KC_QUOT,
-    KC_HOME,  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_PGDN,  RGB_TOG,   KC_RCTL,  KC_LALT,  KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
-  ),
-
-  /* Colemak
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |-----------------------------------------------------------------------------------|
-   *  RotEn | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * ,------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_COLEMAK] = 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_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    KC_TAB,    KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,     KC_J,     KC_L,     KC_U,     KC_Y,      KC_SCLN,   KC_ESC,
-    KC_PGUP,  KC_BSPC,   KC_A,     KC_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_I,      KC_O,     KC_QUOT,
-    KC_HOME,  KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,    KC_SLSH,   KC_ENT,
-    KC_PGDN,  RGB_TOG,   KC_RCTL,  KC_LALT,  KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
-  ),
-
-  /* Dvorak
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-   * ,------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_DVORAK] = 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_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    KC_TAB,    KC_QUOT,  KC_COMM,  KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,     KC_C,     KC_R,      KC_L,     KC_BSPC,
-    KC_PGUP,  KC_ESC,    KC_A,     KC_O,     KC_E,     KC_U,     KC_I,     KC_D,     KC_H,     KC_T,     KC_N,      KC_S,     KC_SLSH,
-    KC_HOME,  KC_LSFT,   KC_SCLN,  KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,     KC_M,     KC_W,     KC_V,      KC_Z,      KC_ENT,
-    KC_PGDN,  RGB_TOG,   KC_RCTL,  KC_LALT,  KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
-  ),
-
-  /* LOWER
-   *        ,-----------------------------------------------------------------------------------.
-   *        |TOGRGB|      |      |      |Sat(-)|Hue(-)|Hue(+)|Sat(+)|      |      |Brght-|Brght+|
-   *        |------+------+------+------+------+-------------+------+------+------+------+------|
-   *        |  `   |      |      |      |      |      |      |      |      |      |      |   =  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * ,------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | End  |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `------------------------------------------------------------------------------------------'
-   */
-    [_LOWER] = LAYOUT(
-              RGB_TOG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SAD,  RGB_HUD,  RGB_HUI,  RGB_SAI,    KC_TRNS,    KC_TRNS,  RGB_VAD,  RGB_VAI,
-              KC_GRAVE, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_EQUAL,
-    KC_NUM,   KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,    KC_ASTR,    KC_LPRN,  KC_RPRN,  KC_BSPC,
-    KC_HOME,  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_TRNS,  _______,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   S(KC_NUHS), S(KC_NUBS), KC_HOME,  KC_END,   _______,
-    KC_END,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_MNXT,    KC_VOLD,  KC_VOLU,  KC_MPLY
-  ),
-
-  /* RAISE
-   *        ,-----------------------------------------------------------------------------------.
-   *        |TOGRGB|      |      |      |Sat(-)|Hue(-)|Hue(+)|Sat(+)|      |      |Brght-|Brght+|
-   *        |------+------+------+------+------+-------------+------+------+------+------+------|
-   *        |  `   |      |      |      |      |      |      |      |      |      |      |   =  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * ,------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | End  |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `------------------------------------------------------------------------------------------'
-   */
-    [_RAISE] = LAYOUT(
-              RGB_TOG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SAD,  RGB_HUD,  RGB_HUI,  RGB_SAI,  KC_TRNS,  KC_TRNS,  RGB_VAD,  RGB_VAI,
-              KC_GRAVE, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_EQUAL,
-    KC_NUM,   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_HOME,  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_TRNS,  _______,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_NUHS,  KC_NUBS,  KC_PGUP,  KC_PGDN,  _______,
-    KC_END,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MPLY
-  ),
-
-  /* Plover layer (http://opensteno.org)
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-   * ,------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_PLOVER] = 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_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    KC_1,      KC_1,     KC_1,     KC_1,     KC_1,     KC_1,     KC_1,     KC_1,     KC_1,     KC_1,      KC_1,     KC_1   ,
-    KC_PGUP,  XXXXXXX,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,      KC_P,     KC_LBRC,
-    KC_HOME,  XXXXXXX,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,      KC_SCLN,  KC_QUOT,
-    KC_PGDN,  EXT_PLV,   XXXXXXX,  XXXXXXX,  KC_C,     KC_V,     XXXXXXX,  XXXXXXX,  KC_N,     KC_M,     XXXXXXX,   XXXXXXX,  XXXXXXX
-  ),
-
-  /* Adjust (Lower + Raise)
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
-   * ,------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn |      |      |      |      |      |             |      |      |      |      |      |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_ADJUST] = 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_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    _______,   QK_BOOT,  DB_TOGG,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,   RGB_VAD,  KC_DEL ,
-    KC_PGUP,  _______,   _______,  MU_NEXT,  AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  QWERTY,   COLEMAK,  DVORAK,    PLOVER,   _______,
-    KC_HOME,  _______,   AU_PREV,  AU_NEXT,  MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,   _______,  _______,
-    KC_PGDN,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______
-  )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_WH_L);
-        } else {
-            tap_code(KC_WH_R);
-        }
-    }
-    return true;
-}
-
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kingly_keys/ropro/rules.mk b/keyboards/kingly_keys/ropro/rules.mk
index 81181d52454..2fde11543ff 100644
--- a/keyboards/kingly_keys/ropro/rules.mk
+++ b/keyboards/kingly_keys/ropro/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-LAYOUTS_HAS_RGB = yes
diff --git a/keyboards/kingly_keys/soap/rules.mk b/keyboards/kingly_keys/soap/rules.mk
index 81181d52454..2fde11543ff 100644
--- a/keyboards/kingly_keys/soap/rules.mk
+++ b/keyboards/kingly_keys/soap/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-LAYOUTS_HAS_RGB = yes
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kira/kira75/config.h
similarity index 100%
rename from keyboards/kbdfans/kbd67/rev1/config.h
rename to keyboards/kira/kira75/config.h
diff --git a/keyboards/kira75/info.json b/keyboards/kira/kira75/info.json
similarity index 100%
rename from keyboards/kira75/info.json
rename to keyboards/kira/kira75/info.json
diff --git a/keyboards/kira75/keymaps/default/keymap.c b/keyboards/kira/kira75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kira75/keymaps/default/keymap.c
rename to keyboards/kira/kira75/keymaps/default/keymap.c
diff --git a/keyboards/kira75/keymaps/default/readme.md b/keyboards/kira/kira75/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kira75/keymaps/default/readme.md
rename to keyboards/kira/kira75/keymaps/default/readme.md
diff --git a/keyboards/kira75/kira75.h b/keyboards/kira/kira75/kira75.h
similarity index 100%
rename from keyboards/kira75/kira75.h
rename to keyboards/kira/kira75/kira75.h
diff --git a/keyboards/kira/kira75/readme.md b/keyboards/kira/kira75/readme.md
new file mode 100644
index 00000000000..a30b60d179d
--- /dev/null
+++ b/keyboards/kira/kira75/readme.md
@@ -0,0 +1,15 @@
+# Kira 75
+
+![kira75](imgur.com image replace me!)
+
+75% keyboard designed by thesiscamper
+
+Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)     
+Hardware Supported: Kira 75     
+Hardware Availability: Group Buy      
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kira/kira75: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/kira75/rules.mk b/keyboards/kira/kira75/rules.mk
similarity index 100%
rename from keyboards/kira75/rules.mk
rename to keyboards/kira/kira75/rules.mk
diff --git a/keyboards/kira80/info.json b/keyboards/kira/kira80/info.json
similarity index 100%
rename from keyboards/kira80/info.json
rename to keyboards/kira/kira80/info.json
diff --git a/keyboards/kira80/keymaps/ansi/keymap.c b/keyboards/kira/kira80/keymaps/ansi/keymap.c
similarity index 100%
rename from keyboards/kira80/keymaps/ansi/keymap.c
rename to keyboards/kira/kira80/keymaps/ansi/keymap.c
diff --git a/keyboards/kira80/keymaps/ansi/readme.md b/keyboards/kira/kira80/keymaps/ansi/readme.md
similarity index 100%
rename from keyboards/kira80/keymaps/ansi/readme.md
rename to keyboards/kira/kira80/keymaps/ansi/readme.md
diff --git a/keyboards/kira80/keymaps/ansi_wkl/keymap.c b/keyboards/kira/kira80/keymaps/ansi_wkl/keymap.c
similarity index 100%
rename from keyboards/kira80/keymaps/ansi_wkl/keymap.c
rename to keyboards/kira/kira80/keymaps/ansi_wkl/keymap.c
diff --git a/keyboards/kira80/keymaps/ansi_wkl/readme.md b/keyboards/kira/kira80/keymaps/ansi_wkl/readme.md
similarity index 100%
rename from keyboards/kira80/keymaps/ansi_wkl/readme.md
rename to keyboards/kira/kira80/keymaps/ansi_wkl/readme.md
diff --git a/keyboards/kira80/keymaps/default/keymap.c b/keyboards/kira/kira80/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kira80/keymaps/default/keymap.c
rename to keyboards/kira/kira80/keymaps/default/keymap.c
diff --git a/keyboards/kira80/keymaps/default/readme.md b/keyboards/kira/kira80/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kira80/keymaps/default/readme.md
rename to keyboards/kira/kira80/keymaps/default/readme.md
diff --git a/keyboards/kira80/keymaps/iso/keymap.c b/keyboards/kira/kira80/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/kira80/keymaps/iso/keymap.c
rename to keyboards/kira/kira80/keymaps/iso/keymap.c
diff --git a/keyboards/kira80/keymaps/iso/readme.md b/keyboards/kira/kira80/keymaps/iso/readme.md
similarity index 100%
rename from keyboards/kira80/keymaps/iso/readme.md
rename to keyboards/kira/kira80/keymaps/iso/readme.md
diff --git a/keyboards/kira80/keymaps/via/keymap.c b/keyboards/kira/kira80/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kira80/keymaps/via/keymap.c
rename to keyboards/kira/kira80/keymaps/via/keymap.c
diff --git a/keyboards/kira80/keymaps/via/readme.md b/keyboards/kira/kira80/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kira80/keymaps/via/readme.md
rename to keyboards/kira/kira80/keymaps/via/readme.md
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/rules.mk b/keyboards/kira/kira80/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/via/rules.mk
rename to keyboards/kira/kira80/keymaps/via/rules.mk
diff --git a/keyboards/kira/kira80/readme.md b/keyboards/kira/kira80/readme.md
new file mode 100644
index 00000000000..c9816a12462
--- /dev/null
+++ b/keyboards/kira/kira80/readme.md
@@ -0,0 +1,50 @@
+# Kira 80/TKL
+
+![kira80](https://i.imgur.com/QnGKnaml.jpg)
+![kira80pcb](https://i.imgur.com/wrEZhg5l.jpg)
+
+Custom TKL keyboard designed and made by Thesiscamper and EVE
+
+* Keyboard Maintainer: [elmo-space](https://github.com/elmo-space)
+* Hardware Supported: Kira 80 PCB made by EVE
+* Hardware Availability: limited [Group Buy](https://geekhack.org/index.php?topic=96381.0) finished
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kira/kira80:default
+
+Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+
+    make kira/kira80:default:flash
+
+**Reset Key:** Hold down the key located at `K102`, commonly programmed as 'Pause' while plugging in the keyboard.
+
+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).
+
+## Hardware Information
+
+Controller: ATmega32A
+
+### Pinout:
+
+|Pin |Use      | |Pin |Use            |
+|----|---------|-|----|---------------|
+|`A1`|Column 0 | |`B1`|Row 0          |
+|`A2`|Column 1 | |`B2`|Row 1          |
+|`A3`|Column 2 | |`B3`|Row 2          |
+|`A4`|Column 3 | |`B5`|Row 3          |
+|`A5`|Column 4 | |`B6`|Row 4          |
+|`A6`|Column 5 | |`B7`|Row 5          |
+|`A7`|Column 6 | |`B0`|Row 6          |
+|`C7`|Column 7 | |    |               |
+|`C6`|Column 8 | |`D1`|Caps Lock LED  |
+|`C5`|Column 9 | |`D6`|Scroll Lock LED|
+|`C4`|Column 10| |`D4`|Backlight      |
+|`C3`|Column 11| |    |               |
+|`A0`|Column 12| |`D2`|USB D+         |
+|`C2`|Column 13| |`D3`|USB D-         |
+|`D7`|Column 14| |    |               |
+
+### Layout matrix:
+
+![matrix](https://i.imgur.com/FqjTNQS.png)
diff --git a/keyboards/kira80/rules.mk b/keyboards/kira/kira80/rules.mk
similarity index 100%
rename from keyboards/kira80/rules.mk
rename to keyboards/kira/kira80/rules.mk
diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h
deleted file mode 100644
index d876570c808..00000000000
--- a/keyboards/kira75/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 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
-
-/* 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
-
-/*
- * 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
diff --git a/keyboards/kira75/readme.md b/keyboards/kira75/readme.md
deleted file mode 100644
index 5ab0b3f2cc9..00000000000
--- a/keyboards/kira75/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Kira 75
-
-![kira75](imgur.com image replace me!)
-
-75% keyboard designed by thesiscamper
-
-Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)     
-Hardware Supported: Kira 75     
-Hardware Availability: Group Buy      
-
-Make example for this keyboard (after setting up your build environment):
-
-    make kira75: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/kira80/config.h b/keyboards/kira80/config.h
deleted file mode 100644
index 4307eabbdd2..00000000000
--- a/keyboards/kira80/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2020 kb-elmo<mail@elmo.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 "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 15
-
-#define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, A0, C2, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-#define DEBOUNCE 5
-
-#define LED_CAPS_LOCK_PIN D1
-#define LED_SCROLL_LOCK_PIN D6
-
-#define BACKLIGHT_PIN D4
-#define BACKLIGHT_BREATHING
-#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/kira80/kira80.c b/keyboards/kira80/kira80.c
deleted file mode 100644
index 0f79316fbaa..00000000000
--- a/keyboards/kira80/kira80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.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 "kira80.h"
diff --git a/keyboards/kira80/kira80.h b/keyboards/kira80/kira80.h
deleted file mode 100644
index 07915363950..00000000000
--- a/keyboards/kira80/kira80.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.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"
-
-/* 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_all(\
-    K000,       K002, K003, K004, K005,    K007, K008, K009, K010,    K011, K012, K013, K001,    K091, K092, K102,  \
-    K015, K016, K017, K018, K019, K020, K021, K022, K023, K024, K025, K026, K027, K028, K029,    K096, K095, K094,  \
-    K030, K031, K032, K033, K034, K035, K036, K037, K038, K039, K040, K041, K042, K043,          K103, K098, K097,  \
-    K045, K046, K047, K048, K049, K050, K051, K052, K053, K054, K055, K056,       K057,                             \
-    K060, K058, K061, K062, K063, K064, K065, K066, K067, K068, K069, K070, K071, K072,                K073,        \
-    K075, K076, K077,                   K079,                   K083, K084, K085, K086,          K087, K088, K082   \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO }, \
-    { K015,  K016,  K017,  K018,  K019,  K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028,  K029  }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038,  K039,  K040,  K041,  K042,  K043,  KC_NO }, \
-    { K045,  K046,  K047,  K048,  K049,  K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058,  KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068,  K069,  K070,  K071,  K072,  K073,  KC_NO }, \
-    { K075,  K076,  K077,  KC_NO, K079,  KC_NO, KC_NO, K082,  K083,  K084,  K085,  K086,  K087,  K088,  KC_NO }, \
-    { KC_NO, K091,  K092,  KC_NO, K094,  K095,  K096,  K097,  K098,  KC_NO, KC_NO, KC_NO, K102,  K103,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_ansi(\
-    K000,       K002, K003, K004, K005,    K007, K008, K009, K010,    K011, K012, K013, K001,    K091, K092, K102,  \
-    K015, K016, K017, K018, K019, K020, K021, K022, K023, K024, K025, K026, K027, K028,          K096, K095, K094,  \
-    K030, K031, K032, K033, K034, K035, K036, K037, K038, K039, K040, K041, K042, K043,          K103, K098, K097,  \
-    K045, K046, K047, K048, K049, K050, K051, K052, K053, K054, K055, K056,       K057,                             \
-    K060,       K061, K062, K063, K064, K065, K066, K067, K068, K069, K070,       K071,                K073,        \
-    K075, K076, K077,                   K079,                   K083, K084, K085, K086,          K087, K088, K082   \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO }, \
-    { K015,  K016,  K017,  K018,  K019,  K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028,  KC_NO }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038,  K039,  K040,  K041,  K042,  K043,  KC_NO }, \
-    { K045,  K046,  K047,  K048,  K049,  K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  KC_NO, KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068,  K069,  K070,  K071,  KC_NO, K073,  KC_NO }, \
-    { K075,  K076,  K077,  KC_NO, K079,  KC_NO, KC_NO, K082,  K083,  K084,  K085,  K086,  K087,  K088,  KC_NO }, \
-    { KC_NO, K091,  K092,  KC_NO, K094,  K095,  K096,  K097,  K098,  KC_NO, KC_NO, KC_NO, K102,  K103,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl(\
-    K000,       K002, K003, K004, K005,    K007, K008, K009, K010,    K011, K012, K013, K001,    K091, K092, K102,  \
-    K015, K016, K017, K018, K019, K020, K021, K022, K023, K024, K025, K026, K027, K028,          K096, K095, K094,  \
-    K030, K031, K032, K033, K034, K035, K036, K037, K038, K039, K040, K041, K042, K043,          K103, K098, K097,  \
-    K045, K046, K047, K048, K049, K050, K051, K052, K053, K054, K055, K056,       K057,                             \
-    K060,       K061, K062, K063, K064, K065, K066, K067, K068, K069, K070,       K071,                K073,        \
-    K075,       K077,                   K079,                         K084,       K086,          K087, K088, K082   \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO }, \
-    { K015,  K016,  K017,  K018,  K019,  K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028,  KC_NO }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038,  K039,  K040,  K041,  K042,  K043,  KC_NO }, \
-    { K045,  K046,  K047,  K048,  K049,  K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  KC_NO, KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068,  K069,  K070,  K071,  KC_NO, K073,  KC_NO }, \
-    { K075,  KC_NO, K077,  KC_NO, K079,  KC_NO, KC_NO, K082,  KC_NO, K084,  KC_NO, K086,  K087,  K088,  KC_NO }, \
-    { KC_NO, K091,  K092,  KC_NO, K094,  K095,  K096,  K097,  K098,  KC_NO, KC_NO, KC_NO, K102,  K103,  KC_NO }  \
-}
-
-#define LAYOUT_tkl_iso(\
-    K000,       K002, K003, K004, K005,    K007, K008, K009, K010,    K011, K012, K013, K001,    K091, K092, K102,  \
-    K015, K016, K017, K018, K019, K020, K021, K022, K023, K024, K025, K026, K027, K028,          K096, K095, K094,  \
-    K030, K031, K032, K033, K034, K035, K036, K037, K038, K039, K040, K041, K042,                K103, K098, K097,  \
-    K045, K046, K047, K048, K049, K050, K051, K052, K053, K054, K055, K056, K043, K057,                             \
-    K060, K058, K061, K062, K063, K064, K065, K066, K067, K068, K069, K070,       K071,                K073,        \
-    K075, K076, K077,                   K079,                   K083, K084, K085, K086,          K087, K088, K082   \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO }, \
-    { K015,  K016,  K017,  K018,  K019,  K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028,  KC_NO }, \
-    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038,  K039,  K040,  K041,  K042,  K043,  KC_NO }, \
-    { K045,  K046,  K047,  K048,  K049,  K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058,  KC_NO }, \
-    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068,  K069,  K070,  K071,  KC_NO, K073,  KC_NO }, \
-    { K075,  K076,  K077,  KC_NO, K079,  KC_NO, KC_NO, K082,  K083,  K084,  K085,  K086,  K087,  K088,  KC_NO }, \
-    { KC_NO, K091,  K092,  KC_NO, K094,  K095,  K096,  K097,  K098,  KC_NO, KC_NO, KC_NO, K102,  K103,  KC_NO }  \
-}
diff --git a/keyboards/kira80/readme.md b/keyboards/kira80/readme.md
deleted file mode 100644
index 535e191bf42..00000000000
--- a/keyboards/kira80/readme.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Kira 80/TKL
-
-![kira80](https://i.imgur.com/QnGKnaml.jpg)
-![kira80pcb](https://i.imgur.com/wrEZhg5l.jpg)
-
-Custom TKL keyboard designed and made by Thesiscamper and EVE
-
-* Keyboard Maintainer: [elmo-space](https://github.com/elmo-space)
-* Hardware Supported: Kira 80 PCB made by EVE
-* Hardware Availability: limited [Group Buy](https://geekhack.org/index.php?topic=96381.0) finished
-
-Make example for this keyboard (after setting up your build environment):
-
-    make kira80:default
-
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
-
-    make kira80:default:flash
-
-**Reset Key:** Hold down the key located at `K102`, commonly programmed as 'Pause' while plugging in the keyboard.
-
-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).
-
-## Hardware Information
-
-Controller: ATmega32A
-
-### Pinout:
-
-|Pin |Use      | |Pin |Use            |
-|----|---------|-|----|---------------|
-|`A1`|Column 0 | |`B1`|Row 0          |
-|`A2`|Column 1 | |`B2`|Row 1          |
-|`A3`|Column 2 | |`B3`|Row 2          |
-|`A4`|Column 3 | |`B5`|Row 3          |
-|`A5`|Column 4 | |`B6`|Row 4          |
-|`A6`|Column 5 | |`B7`|Row 5          |
-|`A7`|Column 6 | |`B0`|Row 6          |
-|`C7`|Column 7 | |    |               |
-|`C6`|Column 8 | |`D1`|Caps Lock LED  |
-|`C5`|Column 9 | |`D6`|Scroll Lock LED|
-|`C4`|Column 10| |`D4`|Backlight      |
-|`C3`|Column 11| |    |               |
-|`A0`|Column 12| |`D2`|USB D+         |
-|`C2`|Column 13| |`D3`|USB D-         |
-|`D7`|Column 14| |    |               |
-
-### Layout matrix:
-
-![matrix](https://i.imgur.com/FqjTNQS.png)
diff --git a/keyboards/kiserdesigns/bigbae/info.json b/keyboards/kiserdesigns/bigbae/info.json
new file mode 100644
index 00000000000..94dac67105b
--- /dev/null
+++ b/keyboards/kiserdesigns/bigbae/info.json
@@ -0,0 +1,52 @@
+{
+    "manufacturer": "Kiser Designs",
+    "keyboard_name": "BigBAE",
+    "maintiner": "qmk",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "B10", "pin_b": "B2"}
+        ]
+    },
+    "matrix_pins": {
+        "direct": [
+            [ "A5",  "B0",  "B4" ],
+            [ "B11", "B3",  "B5" ],
+            [ "A4",  "B9",  "B8" ]
+        ]
+    },
+    "processor": "STM32F072",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xBBAE",
+        "vid": "0x4B44"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [1, 0], "x": 1.5, "y": 0 },
+                { "matrix": [1, 1], "x": 2.5, "y": 0 },
+                { "matrix": [1, 2], "x": 3.5, "y": 0 },
+
+                { "matrix": [0, 2], "w": 1.5, "x": 3, "y": 1 },
+
+
+                { "matrix": [0, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "h": 2, "matrix": [0, 1], "w": 1.25, "x": 1.75, "y": 1 },
+                { "matrix": [2, 1], "w": 1.5, "x": 3, "y": 2 },
+
+                { "matrix": [2, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [2, 2], "w": 2.25, "x": 2.25, "y": 3 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/bigbae/keymaps/default/keymap.c b/keyboards/kiserdesigns/bigbae/keymaps/default/keymap.c
new file mode 100644
index 00000000000..62526cb0f91
--- /dev/null
+++ b/keyboards/kiserdesigns/bigbae/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+ /* 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_MUTE, KC_ESC,  KC_BSPC,
+                    KC_LALT,
+  KC_CAPS, KC_TAB,  KC_LCTL,
+  KC_LSFT,          KC_ENT
+)
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+};
+#endif
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/rules.mk b/keyboards/kiserdesigns/bigbae/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/argo_works/ishi/80/mk0_avr_extra/keymaps/bongocat/rules.mk
rename to keyboards/kiserdesigns/bigbae/keymaps/default/rules.mk
diff --git a/keyboards/kiserdesigns/bigbae/keymaps/vial/config.h b/keyboards/kiserdesigns/bigbae/keymaps/vial/config.h
new file mode 100644
index 00000000000..a8fe4d9dd9c
--- /dev/null
+++ b/keyboards/kiserdesigns/bigbae/keymaps/vial/config.h
@@ -0,0 +1,28 @@
+ /* 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 VIAL_KEYBOARD_UID {0x79, 0x6D, 0x85, 0xA6, 0x17, 0xBF, 0x94, 0x9B}
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 16
+
+#define VIAL_TAP_DANCE_ENTRIES 16
+
+#define VIAL_COMBO_ENTRIES 16
+
+#define DYNAMIC_KEYMAP_MACRO_COUNT 64
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 1, 0 }
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/bigbae/keymaps/vial/keymap.c b/keyboards/kiserdesigns/bigbae/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..62526cb0f91
--- /dev/null
+++ b/keyboards/kiserdesigns/bigbae/keymaps/vial/keymap.c
@@ -0,0 +1,32 @@
+ /* 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_MUTE, KC_ESC,  KC_BSPC,
+                    KC_LALT,
+  KC_CAPS, KC_TAB,  KC_LCTL,
+  KC_LSFT,          KC_ENT
+)
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+};
+#endif
diff --git a/keyboards/kiserdesigns/bigbae/keymaps/vial/rules.mk b/keyboards/kiserdesigns/bigbae/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..c6bf6798de5
--- /dev/null
+++ b/keyboards/kiserdesigns/bigbae/keymaps/vial/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/bigbae/keymaps/vial/vial.json b/keyboards/kiserdesigns/bigbae/keymaps/vial/vial.json
new file mode 100644
index 00000000000..3d5d68a4e05
--- /dev/null
+++ b/keyboards/kiserdesigns/bigbae/keymaps/vial/vial.json
@@ -0,0 +1,136 @@
+{
+  "matrix": {
+    "rows": 3,
+    "cols": 3
+  },
+    "layouts": {
+      "labels": [
+        "Add Encoder",
+        ["Top Half", "2u Backspace", "Split Backspace", "Remove (BigANSI)"],
+        ["Bottom Half", "BAE", "ISO" ,"ANSI"]
+      ],
+      "keymap":   [
+        [
+          {
+            "x": 0.25,
+            "d": true
+          },
+          "0,0\n\n\n0,0\n\n\n\n\n\ne",
+          {
+            "x": 0.25
+          },
+          "1,0\n\n\n1,0",
+          {
+            "w": 2
+          },
+          "1,2\n\n\n1,0",
+          {
+            "x": 0.25
+          },
+          "1,0\n\n\n1,1",
+          "1,1\n\n\n1,1",
+          "1,2\n\n\n1,1",
+          {
+            "x": 0.25,
+            "d": true
+          },
+          "1,0\n\n\n1,2"
+        ],
+        [
+          {
+            "x": 0.25,
+            "d": true
+          },
+          "0,1\n\n\n0,0\n\n\n\n\n\ne",
+          {
+            "x": 0.5,
+            "w": 1.25,
+            "h": 2,
+            "w2": 1.5,
+            "h2": 1,
+            "x2": -0.25
+          },
+          "0,1\n\n\n1,0",
+          {
+            "w": 1.5
+          },
+          "0,2\n\n\n1,0",
+          {
+            "x": 0.5,
+            "w": 1.25,
+            "h": 2,
+            "w2": 1.5,
+            "h2": 1,
+            "x2": -0.25
+          },
+          "0,1\n\n\n1,1",
+          {
+            "w": 1.5
+          },
+          "0,2\n\n\n1,1"
+        ],
+        [
+          {
+            "w": 1.75
+          },
+          "0,0",
+          {
+            "x": 1.25,
+            "w": 1.5,
+            "h": 2,
+            "w2": 2.25,
+            "h2": 1,
+            "x2": -0.75,
+            "y2": 1
+          },
+          "2,2\n\n\n2,0",
+          {
+            "x": 3.75,
+            "w": 1.25
+          },
+          "0,1\n\n\n1,2"
+        ],
+        [
+          {
+            "w": 2.25
+          },
+          "2,0"
+        ],
+        [
+          {
+            "y": -0.75,
+            "x": 5
+          },
+          "0,0\n\n\n0,1\n\n\n\n\n\ne"
+        ],
+        [
+          {
+            "x": 1,
+            "w": 1.25,
+            "h": 2,
+            "w2": 1.5,
+            "h2": 1,
+            "x2": -0.25
+          },
+          "2,2\n\n\n2,1",
+          {
+            "x": 1,
+            "w": 1.5
+          },
+          "2,1\n\n\n2,2",
+          {
+            "x": 0.25
+          },
+          "0,1\n\n\n0,1\n\n\n\n\n\ne"
+        ],
+        [
+          "2,1\n\n\n2,1",
+          {
+            "x": 1.5,
+            "w": 2.25
+          },
+          "2,2\n\n\n2,2"
+        ]
+    ]
+    }
+  }
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/bigbae/readme.md b/keyboards/kiserdesigns/bigbae/readme.md
new file mode 100644
index 00000000000..59d1433c4d0
--- /dev/null
+++ b/keyboards/kiserdesigns/bigbae/readme.md
@@ -0,0 +1,23 @@
+# BigBAE
+
+![BigBAE](https://i.imgur.com/RhkLArW.jpeg)
+
+*A scaled-up Big Enter key macropad supporting ANSI, ISO, and BAE Enter*
+* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
+* Hardware Supported: BigBAE and BigANSI, stm32f072
+* Hardware Availability: kiserdesigns.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kiserdesigns/bigbae:default
+
+Flashing example for this keyboard:
+
+    make kiserdesigns/bigbae: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 (the Caps Lock key on the left side) and plug in the keyboard
+* **Physical reset button**: On the back of the PCB, Hold the BOOT1 button while plugging in, or tap RST1 while holding BOOT1
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kiserdesigns/bigbae/rules.mk b/keyboards/kiserdesigns/bigbae/rules.mk
new file mode 100644
index 00000000000..c36cb32280d
--- /dev/null
+++ b/keyboards/kiserdesigns/bigbae/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/gyrovan/info.json b/keyboards/kiserdesigns/gyrovan/info.json
new file mode 100644
index 00000000000..f68c9d265f1
--- /dev/null
+++ b/keyboards/kiserdesigns/gyrovan/info.json
@@ -0,0 +1,122 @@
+{
+    "manufacturer": "Kiser Designs",
+    "keyboard_name": "Gyrovan",
+    "maintainer": "NCKiser",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "B3"},
+            {"pin_a": "A15", "pin_b": "A14"},
+            {"pin_a": "A8", "pin_b": "B15"},
+            {"pin_a": "C15", "pin_b": "F0"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A1", "F1"],
+        "rows": ["C13", "B12", "A2", "A0", "C14"]
+    },
+    "processor": "STM32F072",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "led_count": 6,
+        "layout": [
+            {"flags": 4, "matrix": [0, 0], "x": 132, "y": 32},
+            {"flags": 4, "matrix": [0, 1], "x": 172, "y": 32},
+            {"flags": 4, "matrix": [0, 2], "x": 212, "y": 32},
+            {"flags": 4, "matrix": [4, 0], "x": 12, "y": 32},
+            {"flags": 4, "matrix": [4, 1], "x": 52, "y": 32},
+            {"flags": 4, "matrix": [4, 2], "x": 92, "y": 32}
+        ],
+        "animations": {
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true
+        }
+    },
+    "url": "https://qmk.fm/keyboards",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x4776",
+        "vid": "0x4B44"
+    },
+    "ws2812": {
+        "pin": "A9",
+        "driver": "bitbang"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [4, 0], "x": 0.5, "y": 0.25 },
+                { "matrix": [4, 1], "x": 1.5, "y": 0.25 },
+                { "matrix": [4, 2], "x": 2.5, "y": 0.25 },
+                { "matrix": [4, 3], "x": 3.5, "y": 0.25 },
+                { "matrix": [4, 4], "x": 4.5, "y": 0.25 },
+                { "matrix": [4, 5], "x": 5.5, "y": 0.25 },
+
+                { "matrix": [4, 9], "x": 11.75, "y": 0 },
+
+                { "matrix": [0, 0], "x": 0, "y": 1.25 },
+                { "matrix": [0, 1], "x": 1, "y": 1.25 },
+                { "matrix": [0, 2], "x": 2, "y": 1.25 },
+                { "matrix": [0, 3], "x": 3, "y": 1.25 },
+                { "matrix": [0, 4], "x": 4, "y": 1.25 },
+                { "matrix": [0, 5], "x": 5, "y": 1.25 },
+                { "matrix": [0, 6], "x": 6, "y": 1.25 },
+                { "matrix": [0, 7], "x": 7, "y": 1.25 },
+                { "matrix": [0, 8], "x": 8, "y": 1.25 },
+                { "matrix": [0, 9], "x": 9, "y": 1.25 },
+                { "matrix": [0, 10], "x": 10, "y": 1.25 },
+                { "matrix": [0, 11], "w": 1.75, "x": 11, "y": 1.25 },
+
+                { "matrix": [1, 0], "w": 1.25, "x": 0, "y": 2.25 },
+                { "matrix": [1, 1], "x": 1.25, "y": 2.25 },
+                { "matrix": [1, 2], "x": 2.25, "y": 2.25 },
+                { "matrix": [1, 3], "x": 3.25, "y": 2.25 },
+                { "matrix": [1, 4], "x": 4.25, "y": 2.25 },
+                { "matrix": [1, 5], "x": 5.25, "y": 2.25 },
+                { "matrix": [1, 6], "x": 6.25, "y": 2.25 },
+                { "matrix": [1, 7], "x": 7.25, "y": 2.25 },
+                { "matrix": [1, 8], "x": 8.25, "y": 2.25 },
+                { "matrix": [1, 9], "x": 9.25, "y": 2.25 },
+                { "matrix": [1, 10], "x": 10.25, "y": 2.25 },
+                { "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 2.25 },
+
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 3.25 },
+                { "matrix": [2, 1], "x": 1.75, "y": 3.25 },
+                { "matrix": [2, 2], "x": 2.75, "y": 3.25 },
+                { "matrix": [2, 3], "x": 3.75, "y": 3.25 },
+                { "matrix": [2, 4], "x": 4.75, "y": 3.25 },
+                { "matrix": [2, 5], "x": 5.75, "y": 3.25 },
+                { "matrix": [2, 6], "x": 6.75, "y": 3.25 },
+                { "matrix": [2, 7], "x": 7.75, "y": 3.25 },
+                { "matrix": [2, 8], "x": 8.75, "y": 3.25 },
+                { "matrix": [2, 9], "x": 9.75, "y": 3.25 },
+                { "matrix": [2, 10], "x": 10.75, "y": 3.25 },
+                { "matrix": [2, 11], "x": 11.75, "y": 3.25 },
+
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 4.25 },
+                { "matrix": [3, 1], "x": 1.25, "y": 4.25 },
+                { "matrix": [3, 2], "w": 1.25, "x": 2.25, "y": 4.25 },
+                { "matrix": [3, 4], "w": 2.75, "x": 3.5, "y": 4.25 },
+                { "matrix": [3, 5], "w": 6.25, "x": 3.5, "y": 5.25 },
+                { "matrix": [3, 6], "w": 2.25, "x": 6.25, "y": 4.25 },
+                { "matrix": [3, 8], "w": 1.25, "x": 8.5, "y": 4.25 },
+                { "matrix": [3, 9], "x": 9.75, "y": 4.25 },
+                { "matrix": [3, 10], "x": 10.75, "y": 4.25 },
+                { "matrix": [3, 11], "x": 11.75, "y": 4.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/kiserdesigns/gyrovan/keymaps/default/keymap.c b/keyboards/kiserdesigns/gyrovan/keymaps/default/keymap.c
new file mode 100644
index 00000000000..e085e2cb570
--- /dev/null
+++ b/keyboards/kiserdesigns/gyrovan/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2024 Noah Kiser (NCKiser)
+ *
+ * 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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                                                 KC_MUTE,
+        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_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_SPC,  KC_SPC,           KC_APP,  KC_RALT, KC_RGUI, KC_RCTL
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_HOME, KC_END) }
+    };
+#endif
diff --git a/keyboards/kiserdesigns/gyrovan/keymaps/default/rules.mk b/keyboards/kiserdesigns/gyrovan/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/kiserdesigns/gyrovan/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/kiserdesigns/gyrovan/keymaps/vial/config.h b/keyboards/kiserdesigns/gyrovan/keymaps/vial/config.h
new file mode 100644
index 00000000000..13147ec5953
--- /dev/null
+++ b/keyboards/kiserdesigns/gyrovan/keymaps/vial/config.h
@@ -0,0 +1,25 @@
+ /* 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 VIAL_KEYBOARD_UID {0x91, 0xC7, 0x88, 0x4B, 0xE5, 0x17, 0x8B, 0x62}
+
+#define VIAL_TAP_DANCE_ENTRIES  16
+
+#define VIAL_COMBO_ENTRIES 16
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+
+#define VIAL_UNLOCK_COMBO_ROWS { 1, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 11 }
diff --git a/keyboards/kiserdesigns/gyrovan/keymaps/vial/keymap.c b/keyboards/kiserdesigns/gyrovan/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..78e78157aa8
--- /dev/null
+++ b/keyboards/kiserdesigns/gyrovan/keymaps/vial/keymap.c
@@ -0,0 +1,84 @@
+/* Copyright 2024 Noah Kiser (NCKiser)
+ *
+ * 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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                                                 KC_MUTE,
+        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_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_SPC,  KC_SPC,           KC_APP,  KC_RALT, KC_RGUI, KC_RCTL
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+        [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_HOME, KC_END) }
+    };
+#endif
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    if (rgb_matrix_is_enabled()){
+        HSV layer_hsv = {rgb_matrix_get_hue(), ((int)rgb_matrix_get_sat()>>1)+128, rgb_matrix_get_val()}; //get the matrix hue, sat (minimum 50%), and value
+        HSV lock_hsv = {(rgb_matrix_get_hue()+(rgb_matrix_get_speed()>>1))%256, ((int)rgb_matrix_get_sat()>>1)+128, 0};
+        HSV mod_hsv = {(rgb_matrix_get_hue()+2*(rgb_matrix_get_speed()>>1))%256, ((int)rgb_matrix_get_sat()>>1)+128, 0};
+
+        layer_hsv.h += 32*get_highest_layer(layer_state|default_layer_state); //hue-shift the layer indicator based on highest layer (of 0-7 layers)
+        layer_hsv.h = layer_hsv.h % 256; //modulo 256
+
+        int mods = get_mods() | get_oneshot_mods(); //get all modifiers, either held or OSM
+        //0bGASC
+        mods = ((mods>>4)|mods) & 0x0F;  //combine left and right mods, and take just the bottom 4 bits (0-15)
+        if (mods == 0b0001){mod_hsv.h = ( mod_hsv.h + 0 )%256;   mod_hsv.s = mod_hsv.s;      mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b0011){mod_hsv.h = ( mod_hsv.h + 32 )%256;  mod_hsv.s = mod_hsv.s;      mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b0010){mod_hsv.h = ( mod_hsv.h + 64 )%256;  mod_hsv.s = mod_hsv.s;      mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b0110){mod_hsv.h = ( mod_hsv.h + 96 )%256;  mod_hsv.s = mod_hsv.s;      mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b0100){mod_hsv.h = ( mod_hsv.h + 128 )%256; mod_hsv.s = mod_hsv.s;      mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b1100){mod_hsv.h = ( mod_hsv.h + 160 )%256; mod_hsv.s = mod_hsv.s;      mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b1000){mod_hsv.h = ( mod_hsv.h + 192 )%256; mod_hsv.s = mod_hsv.s;      mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b1001){mod_hsv.h = ( mod_hsv.h + 224 )%256; mod_hsv.s = mod_hsv.s;      mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b1010){mod_hsv.h = ( mod_hsv.h + 85 )%256;  mod_hsv.s = mod_hsv.s >> 1; mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b0101){mod_hsv.h = ( mod_hsv.h + 213 )%256; mod_hsv.s = mod_hsv.s >> 1; mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b1110){mod_hsv.h = ( mod_hsv.h + 128 )%256; mod_hsv.s = mod_hsv.s >> 1; mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b0111){mod_hsv.h = ( mod_hsv.h + 43 )%256;  mod_hsv.s = mod_hsv.s >> 1; mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b1011){mod_hsv.h = ( mod_hsv.h + 0 )%256;   mod_hsv.s = mod_hsv.s >> 1; mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b1101){mod_hsv.h = ( mod_hsv.h + 171 )%256; mod_hsv.s = mod_hsv.s >> 1; mod_hsv.v = rgb_matrix_get_val();}
+        if (mods == 0b1111){mod_hsv.h = mod_hsv.h;               mod_hsv.s = 0;              mod_hsv.v = rgb_matrix_get_val();}
+
+        int locks = (host_keyboard_led_state().caps_lock << 0) | ( (1-host_keyboard_led_state().num_lock) << 1) | (host_keyboard_led_state().scroll_lock << 2);
+        //0bSNC
+        if (locks == 0b001){lock_hsv.h = ( lock_hsv.h + 0 )%256;   lock_hsv.s = lock_hsv.s;      lock_hsv.v = rgb_matrix_get_val();}
+        if (locks == 0b010){lock_hsv.h = ( lock_hsv.h + 85 )%256;  lock_hsv.s = lock_hsv.s;      lock_hsv.v = rgb_matrix_get_val();}
+        if (locks == 0b100){lock_hsv.h = ( lock_hsv.h + 171 )%256; lock_hsv.s = lock_hsv.s;      lock_hsv.v = rgb_matrix_get_val();}
+        if (locks == 0b011){lock_hsv.h = ( lock_hsv.h + 43 )%256;  lock_hsv.s = lock_hsv.s;      lock_hsv.v = rgb_matrix_get_val();}
+        if (locks == 0b110){lock_hsv.h = ( lock_hsv.h + 128 )%256; lock_hsv.s = lock_hsv.s;      lock_hsv.v = rgb_matrix_get_val();}
+        if (locks == 0b101){lock_hsv.h = ( lock_hsv.h + 213 )%256; lock_hsv.s = lock_hsv.s;      lock_hsv.v = rgb_matrix_get_val();}
+        if (locks == 0b111){lock_hsv.h = lock_hsv.h;               lock_hsv.s = lock_hsv.s >> 1; lock_hsv.v = rgb_matrix_get_val();}
+
+        RGB layer_rgb = hsv_to_rgb(layer_hsv);
+        RGB lock_rgb = hsv_to_rgb(lock_hsv);
+        RGB mod_rgb = hsv_to_rgb(mod_hsv);
+        int top_row = via_get_layout_options()&0x80 ? 0 : 1;
+        rgb_matrix_set_color(0 + 3*top_row, layer_rgb.r, layer_rgb.g, layer_rgb.b);
+        rgb_matrix_set_color(1 + 3*top_row, lock_rgb.r, lock_rgb.g, lock_rgb.b);
+        rgb_matrix_set_color(2 + 3*top_row, mod_rgb.r, mod_rgb.g, mod_rgb.b);
+        rgb_matrix_set_color(3 - 3*top_row, 0, 0, 0);
+        rgb_matrix_set_color(4 - 3*top_row, 0, 0, 0);
+        rgb_matrix_set_color(5 - 3*top_row, 0, 0, 0);
+    }
+	return true;
+}
diff --git a/keyboards/kiserdesigns/gyrovan/keymaps/vial/rules.mk b/keyboards/kiserdesigns/gyrovan/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..6dc6b266cb1
--- /dev/null
+++ b/keyboards/kiserdesigns/gyrovan/keymaps/vial/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIALRGB_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/kiserdesigns/gyrovan/keymaps/vial/vial.json b/keyboards/kiserdesigns/gyrovan/keymaps/vial/vial.json
new file mode 100644
index 00000000000..0f48762d341
--- /dev/null
+++ b/keyboards/kiserdesigns/gyrovan/keymaps/vial/vial.json
@@ -0,0 +1,350 @@
+{
+    "matrix": {
+      "rows": 5,
+      "cols": 12
+    },
+    "lighting": "vialrgb",
+    "layouts": {
+      "labels":[
+        "Remove Top Row",
+        "ESC Encoder",
+        "\"1\" Encoder",
+        "\"6\" Encoder",
+        "Embrace DB",
+        "ISO Enter",
+        [
+            "Bottom Row",
+            "275/225 Bars",
+            "6.00 or 6.25",
+            "300/300 Bars",
+            "7u Big Bar"
+        ]
+      ],
+      "keymap": [
+        [
+            {
+              "x": 0.5,
+              "d": true
+            },
+            "1,0\n\n\n2,0\n\n\n\n\n\ne",
+            {
+              "d": true
+            },
+            "1,1\n\n\n2,0\n\n\n\n\n\ne",
+            {
+              "x": 6.5,
+              "d": true
+            },
+            "2,0\n\n\n3,0\n\n\n\n\n\ne",
+            {
+              "d": true
+            },
+            "2,1\n\n\n3,0\n\n\n\n\n\ne",
+            {
+              "x": 0.75,
+              "d": true
+            },
+            "3,0\n\n\n4,0\n\n\n\n\n\ne",
+            {
+              "d": true
+            },
+            "3,1\n\n\n4,0\n\n\n\n\n\ne",
+            {
+              "x": 0.25,
+              "c": "#b69ac6",
+              "d": true
+            },
+            "4,9\n\n\n4,0",
+            {
+              "x": 0.25,
+              "c": "#cccccc"
+            },
+            "3,0\n\n\n4,1\n\n\n\n\n\ne",
+            "3,1\n\n\n4,1\n\n\n\n\n\ne",
+            {
+              "x": 0.25,
+              "c": "#b69ac6"
+            },
+            "4,9\n\n\n4,1"
+          ],
+          [
+            {
+              "y": -0.75,
+              "x": 2.75,
+              "c": "#b9aec1"
+            },
+            "4,0\n\n\n0,0",
+            {
+              "c": "#b8b8b8"
+            },
+            "4,1\n\n\n0,0",
+            "4,2\n\n\n0,0",
+            "4,3\n\n\n0,0",
+            "4,4\n\n\n0,0",
+            {
+              "c": "#b9aec1"
+            },
+            "4,5\n\n\n0,0"
+          ],
+          [
+            {
+              "c": "#cccccc",
+              "d": true
+            },
+            "0,0\n\n\n1,0\n\n\n\n\n\ne",
+            {
+              "d": true
+            },
+            "0,1\n\n\n1,0\n\n\n\n\n\ne",
+            {
+              "x": 0.25,
+              "c": "#b69ac6"
+            },
+            "0,0",
+            {
+              "c": "#cccccc"
+            },
+            "0,1",
+            "0,2",
+            "0,3",
+            "0,4",
+            "0,5",
+            "0,6",
+            "0,7",
+            "0,8",
+            "0,9",
+            "0,10",
+            {
+              "w": 1.75
+            },
+            "0,11"
+          ],
+          [
+            {
+              "x": 2.25,
+              "w": 1.25
+            },
+            "1,0",
+            "1,1",
+            "1,2",
+            "1,3",
+            "1,4",
+            "1,5",
+            "1,6",
+            "1,7",
+            "1,8",
+            "1,9",
+            "1,10",
+            {
+              "c": "#58b4c4",
+              "w": 1.5
+            },
+            "1,11\n\n\n5,0"
+          ],
+          [
+            {
+              "y": -0.75,
+              "c": "#cccccc"
+            },
+            "0,0\n\n\n1,1\n\n\n\n\n\ne",
+            "0,1\n\n\n1,1\n\n\n\n\n\ne"
+          ],
+          [
+            {
+              "y": -0.25,
+              "x": 2.25,
+              "c": "#58b4c4",
+              "w": 1.75
+            },
+            "2,0\n\n\n5,0",
+            {
+              "c": "#cccccc"
+            },
+            "2,1\n\n\n5,0",
+            "2,2\n\n\n5,0",
+            "2,3\n\n\n5,0",
+            "2,4\n\n\n5,0",
+            "2,5\n\n\n5,0",
+            "2,6\n\n\n5,0",
+            "2,7\n\n\n5,0",
+            "2,8\n\n\n5,0",
+            "2,9\n\n\n5,0",
+            "2,10\n\n\n5,0",
+            {
+              "c": "#58b4c4"
+            },
+            "2,11\n\n\n5,0"
+          ],
+          [
+            {
+              "y": -0.75,
+              "c": "#cccccc"
+            },
+            "1,0\n\n\n2,1\n\n\n\n\n\ne",
+            "1,1\n\n\n2,1\n\n\n\n\n\ne"
+          ],
+          [
+            {
+              "y": -0.25,
+              "x": 2.25,
+              "c": "#83c069",
+              "w": 1.25
+            },
+            "3,0\n\n\n6,0",
+            "3,1\n\n\n6,0",
+            {
+              "w": 1.25
+            },
+            "3,2\n\n\n6,0",
+            {
+              "w": 2.75
+            },
+            "3,4\n\n\n6,0",
+            {
+              "w": 2.25
+            },
+            "3,6\n\n\n6,0",
+            {
+              "w": 1.25
+            },
+            "3,8\n\n\n6,0",
+            "3,9\n\n\n6,0",
+            "3,10\n\n\n6,0",
+            "3,11\n\n\n6,0"
+          ],
+          [
+            {
+              "y": -0.75,
+              "c": "#cccccc"
+            },
+            "2,0\n\n\n3,1\n\n\n\n\n\ne",
+            "2,1\n\n\n3,1\n\n\n\n\n\ne"
+          ],
+          [
+            {
+              "x": 2.25,
+              "c": "#83c069",
+              "w": 1.25
+            },
+            "3,0\n\n\n6,1",
+            "3,1\n\n\n6,1",
+            {
+              "w": 1.25
+            },
+            "3,2\n\n\n6,1",
+            {
+              "w": 6.25
+            },
+            "3,5\n\n\n6,1",
+            "3,9\n\n\n6,1",
+            "3,10\n\n\n6,1",
+            "3,11\n\n\n6,1"
+          ],
+          [
+            {
+              "x": 2.25,
+              "c": "#a4c894",
+              "w": 1.25
+            },
+            "3,0\n\n\n6,2",
+            "3,1\n\n\n6,2",
+            "3,2\n\n\n6,2",
+            {
+              "w": 3
+            },
+            "3,4\n\n\n6,2",
+            {
+              "w": 3
+            },
+            "3,6\n\n\n6,2",
+            {
+              "w": 1.25
+            },
+            "3,9\n\n\n6,2",
+            "3,10\n\n\n6,2",
+            {
+              "w": 1.25
+            },
+            "3,11\n\n\n6,2"
+          ],
+          [
+            {
+              "x": 2.25,
+              "w": 1.25
+            },
+            "3,0\n\n\n6,3",
+            {
+              "w": 1.5
+            },
+            "3,1\n\n\n6,3",
+            {
+              "w": 7
+            },
+            "3,5\n\n\n6,3",
+            "3,9\n\n\n6,3",
+            "3,10\n\n\n6,3",
+            "3,11\n\n\n6,3"
+          ],
+          [
+            {
+              "x": 2.75,
+              "c": "#b9aec1",
+              "d": true
+            },
+            "4,0\n\n\n0,1",
+            {
+              "c": "#b8b8b8",
+              "d": true
+            },
+            "4,1\n\n\n0,1",
+            {
+              "d": true
+            },
+            "4,2\n\n\n0,1",
+            {
+              "d": true
+            },
+            "4,3\n\n\n0,1",
+            {
+              "d": true
+            },
+            "4,4\n\n\n0,1",
+            {
+              "c": "#b9aec1",
+              "d": true
+            },
+            "4,5\n\n\n0,1",
+            {
+              "x": 5,
+              "c": "#89bac1",
+              "w": 1.25,
+              "h": 2,
+              "w2": 1.5,
+              "h2": 1,
+              "x2": -0.25
+            },
+            "2,11\n\n\n5,1"
+          ],
+          [
+            {
+              "x": 2.25,
+              "w": 1.5
+            },
+            "2,0\n\n\n5,1",
+            {
+              "c": "#cccccc"
+            },
+            "2,1\n\n\n5,1",
+            "2,2\n\n\n5,1",
+            "2,3\n\n\n5,1",
+            "2,4\n\n\n5,1",
+            "2,5\n\n\n5,1",
+            "2,6\n\n\n5,1",
+            "2,7\n\n\n5,1",
+            "2,8\n\n\n5,1",
+            "2,9\n\n\n5,1",
+            "2,10\n\n\n5,1"
+          ]
+      ]
+    }
+  }
diff --git a/keyboards/kiserdesigns/gyrovan/readme.md b/keyboards/kiserdesigns/gyrovan/readme.md
new file mode 100644
index 00000000000..f19a801e0b9
--- /dev/null
+++ b/keyboards/kiserdesigns/gyrovan/readme.md
@@ -0,0 +1,22 @@
+# Gyrovan
+
+![Gyrovan](https://i.imgur.com/2meFupl.jpg)
+
+*A MiniVan/Vanagon/Embrace-compatible PCB powered by an STM32F072*
+* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
+* Hardware Supported: Gyrovan PCB, STM32F072
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kiserdesigns/gyrovan:default
+
+Flashing example for this keyboard:
+
+    make kiserdesigns/gyrovan: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 (ESC key) and plug in the keyboard
+* **Physical bootsel button**: Hold down the button on the back of the PCB while plugging into the computer
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kiserdesigns/gyrovan/rules.mk b/keyboards/kiserdesigns/gyrovan/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kiserdesigns/gyrovan/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kiserdesigns/la_somme/config.h b/keyboards/kiserdesigns/la_somme/config.h
new file mode 100644
index 00000000000..9f5a48eb4fa
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/config.h
@@ -0,0 +1,27 @@
+/* Copyright 2021 Noah Kiser (NCKiser)
+ *
+ * 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 RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
+#define RP2040_FLASH_GENERIC_03H
+
+#define I2C_DRIVER I2CD1
+#define I2C1_SDA_PIN GP18
+#define I2C1_SCL_PIN GP19
+
+#define OLED_BRIGHTNESS 255
diff --git a/keyboards/kiserdesigns/la_somme/halconf.h b/keyboards/kiserdesigns/la_somme/halconf.h
new file mode 100644
index 00000000000..c4a7101379f
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/halconf.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/kiserdesigns/la_somme/info.json b/keyboards/kiserdesigns/la_somme/info.json
new file mode 100644
index 00000000000..bad4ab62a3a
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/info.json
@@ -0,0 +1,98 @@
+{
+    "manufacturer": "rubybuilds",
+    "keyboard_name": "La Somme",
+    "maintainer": "NCKiser",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "GP29", "pin_b": "GP0"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["GP22", "GP23", "GP24", "GP26", "GP27", "GP3", "GP4", "GP5", "GP6", "GP7"],
+        "rows": ["GP1", "GP28", "GP2", "GP25"]
+    },
+    "processor": "RP2040",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "led_count": 2,
+        "layout": [
+            {"flags": 4, "matrix": [3, 3], "x": 92, "y": 32},
+            {"flags": 4, "matrix": [3, 6], "x": 132, "y": 32}
+        ]
+    },
+    "url": "https://qmk.fm/keyboards",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x1503",
+        "vid": "0x4B44"
+    },
+    "ws2812": {
+        "pin": "GP17",
+        "driver": "vendor"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.5 },
+                { "matrix": [0, 1], "x": 1, "y": 0.25 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0.25 },
+                { "matrix": [0, 4], "x": 4, "y": 0.25 },
+                { "matrix": [0, 5], "x": 6.5, "y": 0.25 },
+                { "matrix": [0, 6], "x": 7.5, "y": 0.25 },
+                { "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "matrix": [0, 8], "x": 9.5, "y": 0.25 },
+                { "matrix": [0, 9], "x": 10.5, "y": 0.5 },
+
+                { "matrix": [1, 0], "x": 0, "y": 1.5 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 6.5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 7.5, "y": 1.25 },
+                { "matrix": [1, 7], "x": 8.5, "y": 1 },
+                { "matrix": [1, 8], "x": 9.5, "y": 1.25 },
+                { "matrix": [1, 9], "x": 10.5, "y": 1.5 },
+
+                { "matrix": [2, 0], "x": 0, "y": 2.5 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2.25 },
+                { "matrix": [2, 4], "x": 4, "y": 2.25 },
+                { "matrix": [2, 5], "x": 6.5, "y": 2.25 },
+                { "matrix": [2, 6], "x": 7.5, "y": 2.25 },
+                { "matrix": [2, 7], "x": 8.5, "y": 2 },
+                { "matrix": [2, 8], "x": 9.5, "y": 2.25 },
+                { "matrix": [2, 9], "x": 10.5, "y": 2.5 },
+
+                { "matrix": [3, 0], "x": 1, "y": 3.25 },
+                { "matrix": [3, 1], "x": 2, "y": 3 },
+                { "matrix": [3, 2], "x": 3, "y": 3.25 },
+                { "matrix": [3, 3], "x": 4, "y": 3.25 },
+                { "matrix": [3, 6], "x": 6.5, "y": 3.25 },
+                { "matrix": [3, 7], "x": 7.5, "y": 3.25 },
+                { "matrix": [3, 8], "x": 8.5, "y": 3 },
+                { "matrix": [3, 9], "x": 9.5, "y": 3.25 },
+
+                { "matrix": [3, 4], "x": 5.25, "y": 0.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/kiserdesigns/la_somme/keymaps/default/keymap.c b/keyboards/kiserdesigns/la_somme/keymaps/default/keymap.c
new file mode 100644
index 00000000000..26f38a985fd
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+ /* 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 KC_NUM_SPC LT(1, KC_SPC)
+#define KC_GA LGUI_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_CD LCTL_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_CK RCTL_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+#define KC_GSCLN RGUI_T(KC_SCLN)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,     KC_P,
+    KC_GA,   KC_AS,   KC_CD,   KC_SF,   KC_G,    KC_H,    KC_SJ,    KC_CK,   KC_AL,    KC_ENT,
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,     KC_M,    KC_COMM,  KC_DOT,
+            KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, KC_NUM_SPC, KC_RALT, KC_RGUI, KC_RCTL,        KC_ESC
+  ),
+  [1] = LAYOUT(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
+    KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO,   KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
+    [1] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+};
+#endif
diff --git a/keyboards/kiserdesigns/la_somme/keymaps/default/rules.mk b/keyboards/kiserdesigns/la_somme/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/kiserdesigns/la_somme/keymaps/vial/config.h b/keyboards/kiserdesigns/la_somme/keymaps/vial/config.h
new file mode 100644
index 00000000000..498bcfc2c2d
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/keymaps/vial/config.h
@@ -0,0 +1,27 @@
+ /* 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 VIAL_KEYBOARD_UID {0xD6, 0xB9, 0x37, 0xBF, 0x7E, 0xEF, 0x49, 0x7D}
+
+#define VIAL_TAP_DANCE_ENTRIES 32
+
+#define VIAL_COMBO_ENTRIES 64
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 16
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 9 }
+
+
diff --git a/keyboards/kiserdesigns/la_somme/keymaps/vial/keymap.c b/keyboards/kiserdesigns/la_somme/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..6faa1be7678
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/keymaps/vial/keymap.c
@@ -0,0 +1,233 @@
+ /* 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 KC_NUM_SPC LT(1, KC_SPC)
+#define KC_GA LGUI_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_CD LCTL_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_CK RCTL_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+#define KC_GSCLN RGUI_T(KC_SCLN)
+
+void oled_logo_task(void);
+void oled_status_task(void);
+void oled_matrix_task(void);
+void oled_disabled_task(void);
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,     KC_P,
+    KC_GA,   KC_AS,   KC_CD,   KC_SF,   KC_G,    KC_H,    KC_SJ,    KC_CK,   KC_AL,    KC_ENT,
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,     KC_M,    KC_COMM,  KC_DOT,
+            KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, KC_NUM_SPC, KC_RALT, KC_RGUI, KC_RCTL,        KC_ESC
+  ),
+  [1] = LAYOUT(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
+    KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO,   KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
+    [1] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+};
+#endif
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    if (rgb_matrix_is_enabled()){
+        HSV layer_hsv = {rgb_matrix_get_hue(), ((int)rgb_matrix_get_sat()>>1)+128, rgb_matrix_get_val()}; //get the matrix hue, sat (minimum 50%), and value
+        HSV mod_hsv = {rgb_matrix_get_hue(), ((int)rgb_matrix_get_sat()>>1)+128, rgb_matrix_get_val()};
+
+        layer_hsv.h += 16*get_highest_layer(layer_state|default_layer_state); //hue-shift the layer indicator based on highest layer (of 0-15 layers)
+        layer_hsv.h = layer_hsv.h % 256; //modulo 256
+
+        int mods = get_mods() | get_oneshot_mods(); //get all modifiers, either held or OSM
+        mods = ((mods>>4)|mods) & 0x0F;  //combine left and right mods, and take just the bottom 4 bits (0-15)
+
+        mod_hsv.h += 16*mods; //hue-shift the modifier indicator based on the modifiers held (of 0-15 combinations)
+        mod_hsv.h = mod_hsv.h % 256; //modulo 256
+
+        if (host_keyboard_led_state().caps_lock) { //if capslock is active
+            layer_hsv.s = 0; //turn both indicators white
+            mod_hsv.s = 0;
+        };
+
+        RGB layer_rgb = hsv_to_rgb(layer_hsv);
+        RGB mod_rgb = hsv_to_rgb(mod_hsv);
+        rgb_matrix_set_color(0, layer_rgb.r, layer_rgb.g, layer_rgb.b);
+        rgb_matrix_set_color(1, mod_rgb.r, mod_rgb.g, mod_rgb.b);
+    }
+	return true;
+}
+
+#ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_90;
+}
+
+bool oled_task_user(void) {
+
+    oled_set_brightness(rgb_matrix_get_speed());
+
+    switch (via_get_layout_options()&0x03) {
+        case 1:
+            oled_logo_task();
+            break;
+        case 2:
+            oled_status_task();
+            break;
+        case 3:
+            oled_matrix_task();
+            break;
+        default:
+            oled_disabled_task();
+    }
+
+    return false;
+}
+
+void oled_logo_task(void) {
+    const unsigned char lasomme [] PROGMEM = {
+    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x07, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x07, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0f, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x1f, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x1f, 0x00, 0xf0, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, 0x80, 0x80, 0x00, 0x40, 0x40, 0x01, 0xc0,
+    0x1e, 0x03, 0xfc, 0x00, 0x01, 0xf8, 0x1f, 0x81, 0xc3, 0xe3, 0xe0, 0xe1, 0xf1, 0xf0, 0x07, 0xf0,
+    0x3e, 0x07, 0xfc, 0x00, 0x01, 0xf0, 0x7f, 0xc1, 0xe7, 0xe7, 0xe0, 0xf3, 0xf3, 0xf0, 0x0f, 0xf0,
+    0x3e, 0x0f, 0x8e, 0x00, 0x03, 0xf0, 0x7c, 0xe1, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xf8, 0x1f, 0x30,
+    0x3c, 0x1f, 0x06, 0x00, 0x03, 0xf0, 0xf9, 0xe1, 0xfd, 0xfd, 0xf0, 0xfe, 0xfe, 0xf8, 0x3e, 0x30,
+    0x3c, 0x1e, 0x06, 0x00, 0x07, 0xe1, 0xf1, 0xf1, 0xf9, 0xf9, 0xe0, 0xfc, 0xfc, 0xf0, 0x7c, 0x30,
+    0x7c, 0x3e, 0x0c, 0x00, 0x07, 0xe1, 0xe1, 0xb1, 0xf1, 0xf1, 0xe0, 0xf8, 0xf8, 0xf0, 0x7c, 0x70,
+    0x78, 0x3c, 0x0e, 0x00, 0x07, 0xe1, 0xe1, 0x33, 0xf1, 0xf3, 0xe1, 0xf8, 0xf9, 0xf0, 0xf8, 0x60,
+    0x78, 0x3c, 0x0f, 0x04, 0x0c, 0xf3, 0xe0, 0x33, 0xe3, 0xe3, 0xe1, 0xf1, 0xf1, 0xf0, 0xf8, 0xe3,
+    0x78, 0x7c, 0x0f, 0x0e, 0x0c, 0xf3, 0xc0, 0x33, 0xc3, 0xc3, 0xc1, 0xe1, 0xe1, 0xe0, 0xf1, 0xc3,
+    0x78, 0x78, 0x1f, 0x0c, 0x1e, 0xf3, 0xc0, 0x33, 0xc3, 0xc3, 0xc3, 0xe1, 0xe1, 0xe1, 0xf3, 0x86,
+    0xf8, 0x78, 0x1f, 0x0c, 0x1e, 0xf3, 0xc0, 0x33, 0xc3, 0xc3, 0xc3, 0xe1, 0xe1, 0xe1, 0xff, 0x06,
+    0xf0, 0xf8, 0x3f, 0x18, 0x3e, 0x73, 0xc0, 0x73, 0x83, 0x83, 0xc7, 0xe1, 0xe1, 0xe3, 0xfe, 0x0c,
+    0xf1, 0xf8, 0x3e, 0x18, 0x38, 0x7b, 0xe0, 0x73, 0x83, 0x83, 0xc7, 0xc1, 0xc1, 0xe3, 0xf8, 0x1c,
+    0xf1, 0xf8, 0x7e, 0x30, 0x38, 0x79, 0xe0, 0xe3, 0x83, 0x83, 0xcf, 0xc1, 0xc1, 0xe7, 0xf0, 0x18,
+    0xf3, 0xfc, 0xfe, 0x70, 0x38, 0x79, 0xf1, 0xe3, 0x83, 0x83, 0xdf, 0xc1, 0xc1, 0xee, 0xf8, 0x38,
+    0x7f, 0x3f, 0xdf, 0xe0, 0x1c, 0x78, 0xff, 0xc3, 0x83, 0x83, 0xf9, 0xc1, 0xc1, 0xfe, 0xfc, 0xf0,
+    0x7e, 0x1f, 0x8f, 0xc0, 0x1f, 0xf0, 0x7f, 0x83, 0x83, 0x83, 0xf9, 0xc1, 0xc1, 0xfc, 0x7f, 0xe0,
+    0x3c, 0x0f, 0x0f, 0x80, 0x07, 0xe0, 0x3f, 0x00, 0x80, 0x81, 0xf0, 0x40, 0x40, 0xf8, 0x3f, 0xc0,
+    0x00, 0x00, 0x00, 0x00, 0x01, 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
+    };
+    unsigned int x;
+    unsigned int y;
+    unsigned char bit;
+    uint index = 0;
+    for (y = 0; y < 32; y++){
+        for (x = 0; x < 16; x++){
+            for (bit = 0; bit < 8; bit++){
+                oled_write_pixel(31-y, (8*x)+bit, lasomme[index]&(0x80>>bit));
+            }
+            index++;
+        }
+    }
+}
+
+void oled_status_task(void) {
+    oled_write_pixel(31, 6, 0);
+    oled_write_pixel(30, 5, 0);
+    oled_write_pixel(30, 6, 0);
+    oled_write_pixel(30, 7, 0);
+    // Host Keyboard Layer Status
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR(" LYR \n"), false);
+            break;
+        case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8:
+        case 9: case 10: case 11: case 12: case 13: case 14: case 15:
+            oled_write_P(PSTR(" "), true);
+            oled_write_P(get_u8_str(get_highest_layer(layer_state), '0'), true);
+            oled_write_P(PSTR(" \n"), true);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_P(PSTR(" LRX \n"), true);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(PSTR(" CAP \n"), led_state.caps_lock);
+    oled_write_P(PSTR(" NUM \n"), led_state.num_lock);
+    oled_write_P(PSTR(" SCL \n"), led_state.scroll_lock);
+
+    //Host Keyboard Modifier Status
+    int mods = get_mods() | get_oneshot_mods(); //get all modifiers, either held or OSM
+    mods = ((mods>>4)|mods) & 0x0F;  //combine left and right mods, and take just the bottom 4 bits (0-15)
+    oled_write_P(PSTR(" CTL \n"), mods & 0x1);
+    oled_write_P(PSTR(" SFT \n"), mods & 0x2);
+    oled_write_P(PSTR(" ALT \n"), mods & 0x4);
+    oled_write_P(PSTR(" GUI \n"), mods & 0x8);
+}
+
+void oled_matrix_task(void) {
+    oled_write_pixel(31, 6, 0);
+    oled_write_pixel(30, 5, 0);
+    oled_write_pixel(30, 6, 0);
+    oled_write_pixel(30, 7, 0);
+
+    int row;
+    int col;
+    for (row = 0; row < MATRIX_ROWS; row++) {
+        oled_write_P(PSTR("-----"), false);
+
+        for (col = 0; col < MATRIX_COLS; col++){
+            if (matrix_get_row(row) & (1 << col)) {
+                oled_write_char(col+48, false);
+            } else {
+                oled_write_P(PSTR(" "), false);
+            }
+
+        }
+
+        oled_write_P(PSTR("-----"), false);
+    }
+
+}
+
+void oled_disabled_task(void) {
+    oled_write_pixel(31, 6, 0);
+    oled_write_pixel(30, 5, 0);
+    oled_write_pixel(30, 6, 0);
+    oled_write_pixel(30, 7, 0);
+
+    oled_write_P(PSTR("     \n"), false);
+    oled_write_P(PSTR("     \n"), false);
+    oled_write_P(PSTR("     \n"), false);
+    oled_write_P(PSTR("     \n"), false);
+    oled_write_P(PSTR("     \n"), false);
+    oled_write_P(PSTR("     \n"), false);
+    oled_write_P(PSTR("     \n"), false);
+    oled_write_P(PSTR("     \n"), false);
+}
+
+#endif
diff --git a/keyboards/kiserdesigns/la_somme/keymaps/vial/rules.mk b/keyboards/kiserdesigns/la_somme/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..a861132914f
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/keymaps/vial/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+VIALRGB_ENABLE = yes
diff --git a/keyboards/kiserdesigns/la_somme/keymaps/vial/vial.json b/keyboards/kiserdesigns/la_somme/keymaps/vial/vial.json
new file mode 100644
index 00000000000..ee41974c0dc
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/keymaps/vial/vial.json
@@ -0,0 +1,245 @@
+{
+    "matrix": {
+        "rows": 4,
+        "cols": 10
+    },
+    "lighting": "vialrgb",
+    "layouts": {
+        "labels": [
+            "2u Left Space",
+            "2u Right Space",
+            "Remove Encoder",
+            [
+                "OLED Mode",
+                "Disabled",
+                "Logo",
+                "Status",
+                "Matrix"
+            ]
+        ],
+        "keymap": [
+            [
+                {
+                  "y": 1.5,
+                  "x": 2
+                },
+                "0,2",
+                {
+                  "x": 5.5
+                },
+                "0,7"
+            ],
+            [
+                {
+                  "y": -0.75,
+                  "x": 1
+                },
+                "0,1",
+                {
+                  "x": 1
+                },
+                "0,3",
+                "0,4",
+                {
+                  "x": 1.5
+                },
+                "0,5",
+                "0,6",
+                {
+                  "x": 1
+                },
+                "0,8"
+            ],
+            [
+                {
+                  "y": -0.75
+                },
+                "0,0",
+                {
+                  "x": 4.25
+                },
+                "3,4",
+                {
+                  "x": 4.25
+                },
+                "0,9"
+            ],
+            [
+                {
+                  "y": -0.5,
+                  "x": 2
+                },
+                "1,2",
+                {
+                  "x": 5.5
+                },
+                "1,7"
+            ],
+            [
+                {
+                  "y": -0.75,
+                  "x": 1
+                },
+                "1,1",
+                {
+                  "x": 1
+                },
+                "1,3",
+                "1,4",
+                {
+                  "x": 0.25,
+                  "d": true
+                },
+                "3,5\n\n\n3,0",
+                {
+                  "x": 0.25
+                },
+                "1,5",
+                "1,6",
+                {
+                  "x": 1
+                },
+                "1,8"
+            ],
+            [
+                {
+                  "y": -0.75
+                },
+                "1,0",
+                {
+                  "x": 9.5
+                },
+                "1,9"
+            ],
+            [
+                {
+                  "y": -0.75,
+                  "x": 5.25
+                },
+                "0,0\n\n\n2,0\n\n\n\n\n\ne"
+            ],
+            [
+                {
+                  "y": -0.75,
+                  "x": 2
+                },
+                "2,2",
+                {
+                  "x": 5.5
+                },
+                "2,7"
+            ],
+            [
+                {
+                  "y": -0.75,
+                  "x": 1
+                },
+                "2,1",
+                {
+                  "x": 1
+                },
+                "2,3",
+                "2,4",
+                {
+                  "x": 1.5
+                },
+                "2,5",
+                "2,6",
+                {
+                  "x": 1
+                },
+                "2,8"
+            ],
+            [
+                {
+                  "y": -0.75
+                },
+                "2,0",
+                {
+                  "x": 9.5
+                },
+                "2,9"
+            ],
+            [
+                {
+                  "y": -0.75,
+                  "x": 5.25
+                },
+                "0,1\n\n\n2,0\n\n\n\n\n\ne"
+            ],
+            [
+                {
+                  "y": -0.75,
+                  "x": 2
+                },
+                "3,1",
+                {
+                  "x": 5.5
+                },
+                "3,8"
+            ],
+            [
+                {
+                  "y": -0.75,
+                  "x": 1
+                },
+                "3,0",
+                {
+                  "x": 1
+                },
+                "3,2\n\n\n0,0",
+                "3,3\n\n\n0,0",
+                {
+                  "x": 1.5
+                },
+                "3,6\n\n\n1,0",
+                "3,7\n\n\n1,0",
+                {
+                  "x": 1
+                },
+                "3,9"
+            ],
+            [
+                {
+                  "y": -0.25,
+                  "x": 5.25,
+                  "d": true
+                },
+                "0,0\n\n\n2,1\n\n\n\n\n\ne"
+            ],
+            [
+                {
+                  "y": -0.5,
+                  "x": 3,
+                  "w": 2
+                },
+                "3,3\n\n\n0,1",
+                {
+                  "x": 1.5,
+                  "w": 2
+                },
+                "3,6\n\n\n1,1",
+                {
+                  "d": true
+                },
+                "3,5\n\n\n3,1",
+                {
+                  "d": true
+                },
+                "3,5\n\n\n3,2",
+                {
+                  "d": true
+                },
+                "3,5\n\n\n3,3"
+            ],
+            [
+                {
+                  "y": -0.5,
+                  "x": 5.25,
+                  "d": true
+                },
+                "0,1\n\n\n2,1\n\n\n\n\n\ne"
+              ]
+        ]
+    }
+}
diff --git a/keyboards/kiserdesigns/la_somme/mcuconf.h b/keyboards/kiserdesigns/la_somme/mcuconf.h
new file mode 100644
index 00000000000..d5b4ef6c602
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/mcuconf.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_I2C_USE_I2C0
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C0 FALSE
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/kiserdesigns/la_somme/readme.md b/keyboards/kiserdesigns/la_somme/readme.md
new file mode 100644
index 00000000000..c098e618558
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/readme.md
@@ -0,0 +1,23 @@
+# La Somme
+
+![La Somme](https://i.imgur.com/E9JGFkX.jpg)
+
+*A unibody-split col-stag 10u board by [rubybuilds](https://github.com/onisage) with the PCB designed by [NoahK](https://github.com/NCKiser)*
+* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
+* Hardware Supported: La Somme PCB, rp2040
+* Hardware Availability: shop.rubybuilds.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kiserdesigns/la_somme:default
+
+Flashing example for this keyboard:
+
+    make kiserdesigns/la_somme: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 (the top left key or "Q") and plug in the keyboard
+* **Physical reset button(s)**: On the back of the PCB: tap the RESET button while holding the BOOT button, or double-tap the RESET button
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kiserdesigns/la_somme/rules.mk b/keyboards/kiserdesigns/la_somme/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kiserdesigns/la_somme/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kiserdesigns/simple75/info.json b/keyboards/kiserdesigns/simple75/info.json
new file mode 100644
index 00000000000..17eb3e77567
--- /dev/null
+++ b/keyboards/kiserdesigns/simple75/info.json
@@ -0,0 +1,123 @@
+{
+    "manufacturer": "Kiser Designs",
+    "keyboard_name": "Simple75",
+    "maintainer": "NCKiser",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "F6", "pin_b": "F7", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "B7", "D6", "D7", "B5", "B1", "B6", "C6", "C7", "E6", "F0", "F1", "F4", "F5",     "B2"],
+        "rows": ["D2", "D3", "D5", "D4", "B4", "B0"]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x5175",
+        "vid": "0x4B44"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "matrix": [0, 2], "x": 2.25, "y": 0 },
+                { "matrix": [0, 3], "x": 3.25, "y": 0 },
+                { "matrix": [0, 4], "x": 4.25, "y": 0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.75, "y": 0 },
+                { "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "matrix": [0, 11], "x": 11.75, "y": 0 },
+                { "matrix": [0, 12], "x": 12.75, "y": 0 },
+                { "matrix": [0, 15], "w": 2, "x": 14, "y": 0 },
+
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
+                { "matrix": [1, 14], "x": 15, "y": 1.25 },
+
+                { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+                { "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+                { "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+                { "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+                { "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+                { "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+                { "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+                { "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+                { "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+                { "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+                { "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+                { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
+                { "matrix": [2, 14], "x": 15, "y": 2.25 },
+
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
+                { "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+                { "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+                { "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+                { "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+                { "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+                { "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+                { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+                { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+                { "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+                { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+                { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+                { "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
+                { "matrix": [3, 14], "x": 15, "y": 3.25 },
+
+                { "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
+                { "matrix": [4, 2], "x": 2.25, "y": 4.25 },
+                { "matrix": [4, 3], "x": 3.25, "y": 4.25 },
+                { "matrix": [4, 4], "x": 4.25, "y": 4.25 },
+                { "matrix": [4, 5], "x": 5.25, "y": 4.25 },
+                { "matrix": [4, 6], "x": 6.25, "y": 4.25 },
+                { "matrix": [4, 7], "x": 7.25, "y": 4.25 },
+                { "matrix": [4, 8], "x": 8.25, "y": 4.25 },
+                { "matrix": [4, 9], "x": 9.25, "y": 4.25 },
+                { "matrix": [4, 10], "x": 10.25, "y": 4.25 },
+                { "matrix": [4, 11], "x": 11.25, "y": 4.25 },
+                { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
+                { "matrix": [4, 14], "x": 15, "y": 4.25 },
+
+                { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
+                { "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
+                { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
+                { "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
+                { "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
+                { "matrix": [5, 12], "x": 13, "y": 5.25 },
+                { "matrix": [5, 13], "x": 14, "y": 5.25 },
+                { "matrix": [5, 14], "x": 15, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/kiserdesigns/simple75/keymaps/default/keymap.c b/keyboards/kiserdesigns/simple75/keymaps/default/keymap.c
new file mode 100644
index 00000000000..0670f559269
--- /dev/null
+++ b/keyboards/kiserdesigns/simple75/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+ /* 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,      KC_MUTE,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,      KC_PGDN,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,     KC_RSFT,      KC_UP,   KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+};
+#endif
diff --git a/keyboards/kiserdesigns/simple75/keymaps/default/rules.mk b/keyboards/kiserdesigns/simple75/keymaps/default/rules.mk
new file mode 100644
index 00000000000..defc5696fcb
--- /dev/null
+++ b/keyboards/kiserdesigns/simple75/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/kiserdesigns/simple75/keymaps/vial/config.h b/keyboards/kiserdesigns/simple75/keymaps/vial/config.h
new file mode 100644
index 00000000000..3146903438e
--- /dev/null
+++ b/keyboards/kiserdesigns/simple75/keymaps/vial/config.h
@@ -0,0 +1,27 @@
+ /* 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 VIAL_KEYBOARD_UID {0xA3, 0xB8, 0x1B, 0x88, 0xA2, 0xD7, 0x0B, 0x41}
+
+#define VIAL_TAP_DANCE_ENTRIES 4
+
+#define VIAL_COMBO_ENTRIES 4
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
+
+
diff --git a/keyboards/kiserdesigns/simple75/keymaps/vial/keymap.c b/keyboards/kiserdesigns/simple75/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..0670f559269
--- /dev/null
+++ b/keyboards/kiserdesigns/simple75/keymaps/vial/keymap.c
@@ -0,0 +1,31 @@
+ /* 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,      KC_MUTE,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_ENT,      KC_PGDN,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,     KC_RSFT,      KC_UP,   KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+};
+#endif
diff --git a/keyboards/kiserdesigns/simple75/keymaps/vial/rules.mk b/keyboards/kiserdesigns/simple75/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..ead75294f78
--- /dev/null
+++ b/keyboards/kiserdesigns/simple75/keymaps/vial/rules.mk
@@ -0,0 +1,9 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+COMBO_ENABLE = no
+QMK_SETTINGS = no
+KEY_OVERRIDE_ENABLE = no
+
+LTO_ENABLE = yes
diff --git a/keyboards/kiserdesigns/simple75/keymaps/vial/vial.json b/keyboards/kiserdesigns/simple75/keymaps/vial/vial.json
new file mode 100644
index 00000000000..25587f7b820
--- /dev/null
+++ b/keyboards/kiserdesigns/simple75/keymaps/vial/vial.json
@@ -0,0 +1,174 @@
+{
+    "matrix": {
+      "rows": 6,
+      "cols": 16
+    },
+    "layouts": {
+      "keymap": [
+        [
+        {
+            "y": 0.25
+        },
+        "0,0",
+        {
+            "x": 0.25
+        },
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        {
+            "x": 0.25
+        },
+        "0,5",
+        "0,6",
+        "0,7",
+        "0,8",
+        {
+            "x": 0.25
+        },
+        "0,9",
+        "0,10",
+        "0,11",
+        "0,12",
+        {
+            "x": 0.25,
+            "w": 2
+        },
+        "0,15",
+        {
+            "x": 0.25
+        },
+        "0,1\n\n\n\n\n\n\n\n\ne"
+        ],
+        [
+        {
+            "x": 16.25
+        },
+        "0,0\n\n\n\n\n\n\n\n\ne"
+        ],
+        [
+        {
+            "y": -0.75
+        },
+        "1,0",
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        {
+            "w": 2
+        },
+        "1,13",
+        "1,14"
+        ],
+        [
+        {
+            "w": 1.5
+        },
+        "2,0",
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        "2,12",
+        {
+            "w": 1.5
+        },
+        "2,13",
+        "2,14"
+        ],
+        [
+        {
+            "w": 1.75
+        },
+        "3,0",
+        "3,1",
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        "3,11",
+        {
+            "w": 2.25
+        },
+        "3,13",
+        "3,14"
+        ],
+        [
+        {
+            "w": 2.25
+        },
+        "4,0",
+        "4,2",
+        "4,3",
+        "4,4",
+        "4,5",
+        "4,6",
+        "4,7",
+        "4,8",
+        "4,9",
+        "4,10",
+        "4,11",
+        {
+            "w": 1.75
+        },
+        "4,12",
+        "4,13",
+        "4,14"
+        ],
+        [
+        {
+            "w": 1.25
+        },
+        "5,0",
+        {
+            "w": 1.25
+        },
+        "5,1",
+        {
+            "w": 1.25
+        },
+        "5,2",
+        {
+            "w": 6.25
+        },
+        "5,6",
+        {
+            "w": 1.25
+        },
+        "5,10",
+        {
+            "w": 1.25
+        },
+        "5,11",
+        {
+            "x": 0.5
+        },
+        "5,12",
+        "5,13",
+        "5,14"
+        ]
+      ]
+    }
+  }
diff --git a/keyboards/kiserdesigns/simple75/rules.mk b/keyboards/kiserdesigns/simple75/rules.mk
new file mode 100644
index 00000000000..b102b2a0ca5
--- /dev/null
+++ b/keyboards/kiserdesigns/simple75/rules.mk
@@ -0,0 +1 @@
+# this file intentionally left blank
diff --git a/keyboards/kiserdesigns/splinter/config.h b/keyboards/kiserdesigns/splinter/config.h
new file mode 100644
index 00000000000..1fda20cec49
--- /dev/null
+++ b/keyboards/kiserdesigns/splinter/config.h
@@ -0,0 +1,15 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+//#define SPLIT_HAND_PIN GP4
+//#define USB_VBUS_PIN GP14
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP27
+#define SERIAL_USART_RX_PIN GP28
+#define SERIAL_USART_PIN_SWAP
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/splinter/info.json b/keyboards/kiserdesigns/splinter/info.json
new file mode 100644
index 00000000000..f242bd173ed
--- /dev/null
+++ b/keyboards/kiserdesigns/splinter/info.json
@@ -0,0 +1,137 @@
+{
+    "manufacturer": "Kiser Designs",
+    "url": "https://kiserdesigns.com/",
+    "maintainer": "NCKiser",
+    "keyboard_name": "Splinter",
+    "usb": {
+        "vid": "0x4B44",
+        "pid": "0x5971",
+        "device_version": "0.0.1"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "audio": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "split": {
+        "enabled": true,
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "GP8", "pin_b": "GP9"},
+                    {"pin_a": "GP7", "pin_b": "GP6"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["GP23", "GP24", "GP26", "GP2", "GP3", "GP4", "GP5"],
+                "rows": ["GP22", "GP25", "GP29", "GP18"]
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "GP10",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [0, 1],"animations": {
+            "breathing": true,
+            "cycle_left_right": true
+        },
+        "layout": [
+            {"flags": 4, "x": 64, "y": 112}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["GP1", "GP2", "GP3", "GP18", "GP4", "GP10", "GP25"],
+        "rows": ["GP29", "GP5", "GP0", "GP13"]
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "GP23", "pin_b": "GP24"},
+            {"pin_a": "GP22", "pin_b": "GP26"},
+            {"pin_a": "GP11", "pin_b": "GP12"},
+            {"pin_a": "GP19", "pin_b": "GP20"}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 6], "x": 0, "y": 0 },
+                { "matrix": [0, 5], "x": 1.25, "y": 0 },
+                { "matrix": [0, 4], "x": 2.25, "y": 0 },
+                { "matrix": [0, 3], "x": 3.25, "y": 0 },
+                { "matrix": [0, 2], "x": 4.25, "y": 0 },
+                { "matrix": [0, 1], "x": 5.25, "y": 0 },
+                { "matrix": [0, 0], "x": 6.25, "y": 0 },
+
+                { "matrix": [4, 0], "x": 9.25, "y": 0 },
+                { "matrix": [4, 1], "x": 10.25, "y": 0 },
+                { "matrix": [4, 2], "x": 11.25, "y": 0 },
+                { "matrix": [4, 3], "x": 12.25, "y": 0 },
+                { "matrix": [4, 4], "x": 13.25, "y": 0 },
+                { "matrix": [4, 5], "w": 1.75, "x": 14.25, "y": 0 },
+                { "matrix": [4, 6], "x": 16.25, "y": 0 },
+
+
+                { "matrix": [1, 6], "x": 0, "y": 1 },
+                { "matrix": [1, 5], "w": 1.25, "x": 1.25, "y": 1 },
+                { "matrix": [1, 4], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 2], "x": 4.5, "y": 1 },
+                { "matrix": [1, 1], "x": 5.5, "y": 1 },
+                { "matrix": [1, 0], "x": 6.5, "y": 1 },
+
+                { "matrix": [5, 0], "x": 9.5, "y": 1 },
+                { "matrix": [5, 1], "x": 10.5, "y": 1 },
+                { "matrix": [5, 2], "x": 11.5, "y": 1 },
+                { "matrix": [5, 3], "x": 12.5, "y": 1 },
+                { "matrix": [5, 4], "x": 13.5, "y": 1 },
+                { "matrix": [5, 5], "w": 1.5, "x": 14.5, "y": 1 },
+                { "matrix": [5, 6], "x": 16.25, "y": 1 },
+
+
+                { "matrix": [2, 6], "x": 0, "y": 2 },
+                { "matrix": [2, 5], "w": 1.75, "x": 1.25, "y": 2 },
+                { "matrix": [2, 4], "x": 3, "y": 2 },
+                { "matrix": [2, 3], "x": 4, "y": 2 },
+                { "matrix": [2, 2], "x": 5, "y": 2 },
+                { "matrix": [2, 1], "x": 6, "y": 2 },
+                { "matrix": [2, 0], "x": 7, "y": 2 },
+
+                { "matrix": [6, 0], "x": 10, "y": 2 },
+                { "matrix": [6, 1], "x": 11, "y": 2 },
+                { "matrix": [6, 2], "x": 12, "y": 2 },
+                { "matrix": [6, 3], "x": 13, "y": 2 },
+                { "matrix": [6, 4], "x": 14, "y": 2 },
+                { "matrix": [6, 5], "x": 15, "y": 2 },
+
+
+                { "matrix": [3, 6], "x": 0, "y": 3 },
+                { "matrix": [3, 5], "w": 1.25, "x": 1.25, "y": 3 },
+                { "matrix": [3, 4], "x": 2.5, "y": 3 },
+                { "matrix": [3, 3], "w": 1.25, "x": 3.5, "y": 3 },
+                { "matrix": [3, 2], "w": 1.25, "x": 5.25, "y": 3.25 },
+                { "matrix": [3, 0], "w": 1.75, "x": 6.5, "y": 3.25 },
+                
+                { "matrix": [7, 0], "w": 1.75, "x": 9, "y": 3.25 },
+                { "matrix": [7, 1], "w": 1.25, "x": 10.75, "y": 3.25 },
+                { "matrix": [7, 3], "w": 1.5, "x": 12.5, "y": 3 },
+                { "matrix": [7, 4], "x": 14, "y": 3 },
+                { "matrix": [7, 5], "x": 15, "y": 3 },
+                { "matrix": [7, 6], "x": 16, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/kiserdesigns/splinter/keymaps/default/keymap.c b/keyboards/kiserdesigns/splinter/keymaps/default/keymap.c
new file mode 100644
index 00000000000..e300feaf71e
--- /dev/null
+++ b/keyboards/kiserdesigns/splinter/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+ /* 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_HOME, 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_DEL,
+    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_ENT,  KC_INS,
+    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_UP,
+    KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT,          MO(2),   KC_SPC,           KC_SPC,  MO(3),            MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
+    [1] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [2] =   { ENCODER_CCW_CW(KC_UP, KC_DOWN) },
+    [3] =   { ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
+    [4] =   { ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [5] =   { ENCODER_CCW_CW(KC_HOME, KC_END) }
+};
+#endif
diff --git a/keyboards/kiserdesigns/splinter/keymaps/vial/config.h b/keyboards/kiserdesigns/splinter/keymaps/vial/config.h
new file mode 100644
index 00000000000..b779fce786d
--- /dev/null
+++ b/keyboards/kiserdesigns/splinter/keymaps/vial/config.h
@@ -0,0 +1,27 @@
+ /* 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 VIAL_KEYBOARD_UID {0xDE, 0x2A, 0x1B, 0x94, 0x07, 0x40, 0x6A, 0xD5}
+
+#define VIAL_TAP_DANCE_ENTRIES 32
+
+#define VIAL_COMBO_ENTRIES 32
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 1 }
+
+
diff --git a/keyboards/kiserdesigns/splinter/keymaps/vial/keymap.c b/keyboards/kiserdesigns/splinter/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..1f51bec68db
--- /dev/null
+++ b/keyboards/kiserdesigns/splinter/keymaps/vial/keymap.c
@@ -0,0 +1,34 @@
+ /* 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_HOME, 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_DEL,
+    KC_END,  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,  KC_INS,
+    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_UP,
+    KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT,          MO(2),   KC_SPC,           KC_SPC,  MO(3),            MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+  )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN),
+              ENCODER_CCW_CW(KC_VOLD, KC_VOLU),
+              ENCODER_CCW_CW(KC_UP, KC_DOWN),
+              ENCODER_CCW_CW(KC_LEFT, KC_RGHT),
+              ENCODER_CCW_CW(KC_PGUP, KC_PGDN),
+              ENCODER_CCW_CW(KC_HOME, KC_END) }
+};
+#endif
diff --git a/keyboards/kiserdesigns/splinter/keymaps/vial/rules.mk b/keyboards/kiserdesigns/splinter/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..d33628ebf91
--- /dev/null
+++ b/keyboards/kiserdesigns/splinter/keymaps/vial/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VIALRGB_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/splinter/keymaps/vial/vial.json b/keyboards/kiserdesigns/splinter/keymaps/vial/vial.json
new file mode 100644
index 00000000000..c80bf1ae9d5
--- /dev/null
+++ b/keyboards/kiserdesigns/splinter/keymaps/vial/vial.json
@@ -0,0 +1,249 @@
+{
+  "matrix": {
+    "rows": 8,
+    "cols": 7
+  },
+  "lighting": "vialrgb",
+  "layouts": {
+    "labels":[
+      "Left 3u bar",
+      "Left Encoder 1",
+      "Left Encoder 2",
+      "Left Encoder 3",
+      "Left Encoder 4",
+      "Right Encoder 1",
+      "Right Encoder 2",
+      "Right 3u Bar"
+    ],
+    "keymap": [
+      [
+        {
+          "d": true
+        },
+        "0,0\n\n\n1,0\n\n\n\n\n\ne",
+        {
+          "d": true
+        },
+        "0,1\n\n\n1,0\n\n\n\n\n\ne",
+        {
+          "x": 0.25
+        },
+        "0,6",
+        {
+          "x": 0.25
+        },
+        "0,5",
+        "0,4",
+        "0,3",
+        "0,2",
+        "0,1",
+        "0,0",
+        {
+          "x": 2
+        },
+        "4,0",
+        "4,1",
+        "4,2",
+        "4,3",
+        "4,4",
+        {
+          "w": 1.75
+        },
+        "4,5",
+        {
+          "x": 0.25
+        },
+        "4,6",
+        {
+          "x": 0.25,
+          "d": true
+        },
+        "4,0\n\n\n5,0\n\n\n\n\n\ne",
+        {
+          "d": true
+        },
+        "4,1\n\n\n5,0\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "d": true
+        },
+        "1,0\n\n\n2,0\n\n\n\n\n\ne",
+        {
+          "d": true
+        },
+        "1,1\n\n\n2,0\n\n\n\n\n\ne",
+        {
+          "x": 0.25
+        },
+        "1,6",
+        {
+          "x": 0.25,
+          "w": 1.25
+        },
+        "1,5",
+        "1,4",
+        "1,3",
+        "1,2",
+        "1,1",
+        "1,0",
+        {
+          "x": 2
+        },
+        "5,0",
+        "5,1",
+        "5,2",
+        "5,3",
+        "5,4",
+        {
+          "w": 1.5
+        },
+        "5,5",
+        {
+          "x": 0.25
+        },
+        "5,6",
+        {
+          "x": 0.25,
+          "d": true
+        },
+        "5,0\n\n\n6,0\n\n\n\n\n\ne",
+        {
+          "d": true
+        },
+        "5,1\n\n\n6,0\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "d": true
+        },
+        "2,0\n\n\n3,0\n\n\n\n\n\ne",
+        {
+          "d": true
+        },
+        "2,1\n\n\n3,0\n\n\n\n\n\ne",
+        {
+          "x": 0.25
+        },
+        "2,6",
+        {
+          "x": 0.25,
+          "w": 1.75
+        },
+        "2,5",
+        "2,4",
+        "2,3",
+        "2,2",
+        "2,1",
+        "2,0",
+        {
+          "x": 2
+        },
+        "6,0",
+        "6,1",
+        "6,2",
+        "6,3",
+        "6,4",
+        "6,5",
+        {
+          "x": 1.5
+        },
+        "4,0\n\n\n5,1\n\n\n\n\n\ne",
+        "4,1\n\n\n5,1\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "d": true
+        },
+        "3,0\n\n\n4,0\n\n\n\n\n\ne",
+        {
+          "d": true
+        },
+        "3,1\n\n\n4,0\n\n\n\n\n\ne",
+        {
+          "x": 0.25
+        },
+        "3,6",
+        {
+          "x": 0.25,
+          "w": 1.25
+        },
+        "3,5",
+        "3,4",
+        {
+          "w": 1.25
+        },
+        "3,3",
+        {
+          "x": 7.75,
+          "w": 1.5
+        },
+        "7,3",
+        "7,4",
+        "7,5",
+        "7,6",
+        {
+          "x": 0.5
+        },
+        "5,0\n\n\n6,1\n\n\n\n\n\ne",
+        "5,1\n\n\n6,1\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 7.5,
+          "w": 1.25
+        },
+        "3,2\n\n\n0,0",
+        {
+          "w": 1.75
+        },
+        "3,0\n\n\n0,0",
+        {
+          "x": 0.75,
+          "w": 1.75
+        },
+        "7,0\n\n\n7,0",
+        {
+          "w": 1.25
+        },
+        "7,1\n\n\n7,0"
+      ],
+      [
+        {
+          "y": -0.25
+        },
+        "0,0\n\n\n1,1\n\n\n\n\n\ne",
+        "0,1\n\n\n1,1\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 7.5,
+          "w": 3
+        },
+        "3,0\n\n\n0,1",
+        {
+          "x": 0.75,
+          "w": 3
+        },
+        "7,0\n\n\n7,1"
+      ],
+      [
+        {
+          "y": -0.25
+        },
+        "1,0\n\n\n2,1\n\n\n\n\n\ne",
+        "1,1\n\n\n2,1\n\n\n\n\n\ne"
+      ],
+      [
+        "2,0\n\n\n3,1\n\n\n\n\n\ne",
+        "2,1\n\n\n3,1\n\n\n\n\n\ne"
+      ],
+      [
+        "3,0\n\n\n4,1\n\n\n\n\n\ne",
+        "3,1\n\n\n4,1\n\n\n\n\n\ne"
+      ]
+    ]
+  }
+}
diff --git a/keyboards/kiserdesigns/splinter/readme.md b/keyboards/kiserdesigns/splinter/readme.md
new file mode 100644
index 00000000000..59fbb93482f
--- /dev/null
+++ b/keyboards/kiserdesigns/splinter/readme.md
@@ -0,0 +1,23 @@
+# Splinter
+
+![Splinter](https://i.imgur.com/PylZQ3S.png)
+
+*A split Minivan-esque board with encoder/macro columns and dropped spacebars envisioned by [Leviathan](https://leviathanmech.com) with a PCB by [Kiser Designs](https://kiserdesigns.com)*
+* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
+* Hardware Supported: Splinter PCB, rp2040
+* Hardware Availability: www.kiserdesigns.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kiserdesigns/splinter:default
+
+Flashing example for this keyboard:
+
+    make kiserdesigns/splinter: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 ('T' on the left, 'Y' on the right) and plug in the keyboard
+* **Physical reset button**: Briefly double-tap the RESET button on the back of the PCB, or hold BOOT then tap RESET
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kiserdesigns/splinter/rules.mk b/keyboards/kiserdesigns/splinter/rules.mk
new file mode 100644
index 00000000000..161ec22b16e
--- /dev/null
+++ b/keyboards/kiserdesigns/splinter/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/kiserdesigns/suffer/readme.md b/keyboards/kiserdesigns/suffer/readme.md
new file mode 100644
index 00000000000..3480cd9cac0
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/readme.md
@@ -0,0 +1,23 @@
+# Suffer (SVFFER)
+
+![Suffer Layouts](https://i.imgur.com/fPsC2Uj.jpeg)
+
+*Suffer is a 12-18 key macropad inspired by the [masochist16 by Zicodia](https://github.com/Z1codia/masochist16), with a case designed by seirin_blu*
+* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
+* Hardware Supported: Suffer PCB (V1: 32u4, V2: STM32)
+* Hardware Availability: kiserdesigns.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kiserdesigns/suffer/v2:default
+
+Flashing example for this keyboard:
+
+    make kiserdesigns/suffer/v2: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 (the top left key) and plug in the keyboard
+* **Physical reset button**: Briefly double-tap the reset button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kiserdesigns/suffer/v1/info.json b/keyboards/kiserdesigns/suffer/v1/info.json
new file mode 100644
index 00000000000..1757e9440e0
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/info.json
@@ -0,0 +1,49 @@
+{
+    "manufacturer": "Kiser Designs",
+    "keyboard_name": "Suffer",
+    "maintainer": "qmk",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "F4", "D1", "D0"],
+        "rows": ["E6", "B0", "B3"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x5376",
+        "vid": "0x4B44"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 5], "x": 4.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2, "w": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/default/keymap.c b/keyboards/kiserdesigns/suffer/v1/keymaps/default/keymap.c
new file mode 100644
index 00000000000..93c2c344ff2
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2024 Noah Kiser
+ *
+ * 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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_BSPC, KC_ESC,
+        KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_ENT,
+        KC_TAB,  KC_PGUP, LT(1,KC_SPC),     KC_PGDN, KC_RCTL
+    )
+
+};
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/vial/config.h b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/config.h
new file mode 100644
index 00000000000..455c289efb0
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/config.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0xBE, 0xA2, 0x9B, 0x4C, 0x6E, 0x78, 0xDA, 0x7D}
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+
+#define VIAL_TAP_DANCE_ENTRIES 12
+
+#define VIAL_COMBO_ENTRIES 48
+
+#define DYNAMIC_KEYMAP_MACRO_COUNT 16
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 5 }
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/vial/keymap.c b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..b707837269c
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2024 Noah Kiser
+ *
+ * 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_BSPC,
+        KC_ENT,  KC_F5,   KC_F6,   KC_F7,   KC_F8, 
+        KC_TAB, KC_LALT, LT(1,KC_SPC), KC_LCTL, KC_F9
+    )
+};
+
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/vial/rules.mk b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..5e8837567cc
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/rules.mk
@@ -0,0 +1,7 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+TAP_DANCE_ENABLE = no
+QMK_SETTINGS = yes
+COMBO_ENABLE = yes
+KEY_OVERRIDE_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v1/keymaps/vial/vial.json b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/vial.json
new file mode 100644
index 00000000000..6ba17c52ede
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/keymaps/vial/vial.json
@@ -0,0 +1,48 @@
+{
+    "name": "Suffer",
+    "vendorId": "0x4B44",
+    "productId": "0x5346",
+    "lighting": "none",
+    "matrix": {
+        "rows": 3,
+        "cols": 6
+    },
+    "layouts": {
+        "keymap":
+
+        [
+          [
+            "0,0",
+            "0,1",
+            "0,2",
+            "0,3",
+            "0,4",
+            "0,5"
+          ],
+          [
+            {
+              "w": 1.25
+            },
+            "1,0",
+            "1,1",
+            "1,2",
+            "1,3",
+            {
+              "w": 1.75
+            },
+            "1,5"
+          ],
+          [
+            "2,0",
+            "2,1",
+            {
+              "w": 2
+            },
+            "2,2",
+            "2,4",
+            "2,5"
+          ]
+        ]
+
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v1/rules.mk b/keyboards/kiserdesigns/suffer/v1/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/info.json b/keyboards/kiserdesigns/suffer/v2/info.json
new file mode 100644
index 00000000000..906ae10926e
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/info.json
@@ -0,0 +1,54 @@
+{
+    "manufacturer": "Kiser Designs",
+    "keyboard_name": "Suffer V2",
+    "maintainer": "qmk",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "caps_word": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            [ "B14", "B15", "A8",  "A14", "A0", "A2" ],
+            [ "B13", "B12", "B11", "B0",  "A4", "A3" ],
+            [ "B10", "B2",  "B1",  "A7",  "A6", "A5" ]
+        ]
+    },
+    "processor": "STM32F072",
+    "usb": {
+        "device_version": "0.2.0",
+        "pid": "0x5376",
+        "vid": "0x4B44"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kiserdesigns/suffer/v2/keymaps/default/keymap.c b/keyboards/kiserdesigns/suffer/v2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..0064b8120bb
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/default/keymap.c
@@ -0,0 +1,12 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT( \
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, \
+  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/kiserdesigns/suffer/v2/keymaps/vial/config.h b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/config.h
new file mode 100644
index 00000000000..cd9789b6ef2
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/config.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x0E, 0x2B, 0xCD, 0x9D, 0x2C, 0x60, 0xDC, 0xC5}
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 16
+
+#define VIAL_TAP_DANCE_ENTRIES 24
+
+#define VIAL_COMBO_ENTRIES 64
+
+#define DYNAMIC_KEYMAP_MACRO_COUNT 32
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 4 }
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/keymaps/vial/keymap.c b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..0064b8120bb
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/keymap.c
@@ -0,0 +1,12 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT( \
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, \
+  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/kiserdesigns/suffer/v2/keymaps/vial/rules.mk b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..6bc7063adc2
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/keymaps/vial/vial.json b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/vial.json
new file mode 100644
index 00000000000..d0e7060271d
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/keymaps/vial/vial.json
@@ -0,0 +1,111 @@
+{
+    "name": "Suffer V2",
+    "vendorId": "4B44",
+    "productId": "5376",
+    "lighting": "none",
+    "matrix": {
+      "rows": 3,
+      "cols": 6
+    },
+    "layouts": {
+      "labels": [
+        ["Middle Row", "Orthogonal", "Staggered"],
+        ["Bottom Left", "1-1-1", "1-2u" ,"3u", "6u", "Centered 2u"],
+        ["Bottom Right", "1-1-1", "2u-1" ,"3u", "6u", "Centered 2u"]
+      ],
+      "keymap":   [
+        [
+        "0,0",
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5"
+      ],
+      [
+        "1,0\n\n\n0,0",
+        "1,1\n\n\n0,0",
+        "1,2\n\n\n0,0",
+        "1,3\n\n\n0,0",
+        "1,4\n\n\n0,0",
+        "1,5\n\n\n0,0",
+        {
+          "x": 0.25,
+          "w": 1.25
+        },
+        "1,0\n\n\n0,1",
+        "1,1\n\n\n0,1",
+        "1,2\n\n\n0,1",
+        "1,3\n\n\n0,1",
+        {
+          "w": 1.75
+        },
+        "1,4\n\n\n0,1"
+      ],
+      [
+        "2,0\n\n\n1,0",
+        "2,1\n\n\n1,0",
+        "2,2\n\n\n1,0",
+        "2,3\n\n\n2,0",
+        "2,4\n\n\n2,0",
+        "2,5\n\n\n2,0"
+      ],
+      [
+        {
+          "y": 0.25
+        },
+        "2,0\n\n\n1,1",
+        {
+          "w": 2
+        },
+        "2,1\n\n\n1,1",
+        {
+          "w": 2
+        },
+        "2,4\n\n\n2,1",
+        "2,5\n\n\n2,1"
+      ],
+      [
+        {
+          "w": 3
+        },
+        "2,1\n\n\n1,2",
+        {
+          "w": 3
+        },
+        "2,4\n\n\n2,2"
+      ],
+      [
+        {
+          "w": 6
+        },
+        "2,2\n\n\n1,3"
+      ],
+      [
+        {
+          "x": 3,
+          "w": 3,
+          "d": true
+        },
+        "2,3\n\n\n2,3"
+      ],
+      [
+        "2,0\n\n\n1,4",
+        "2,1\n\n\n1,4",
+        {
+          "w": 2
+        },
+        "2,2\n\n\n1,4"
+      ],
+      [
+        {
+          "x": 3,
+          "d": true
+        },
+        "2,3\n\n\n2,4",
+        "2,4\n\n\n2,4",
+        "2,5\n\n\n2,4"
+      ]
+    ]
+    }
+  }
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/suffer/v2/rules.mk b/keyboards/kiserdesigns/suffer/v2/rules.mk
new file mode 100644
index 00000000000..c36cb32280d
--- /dev/null
+++ b/keyboards/kiserdesigns/suffer/v2/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
\ No newline at end of file
diff --git a/keyboards/kk/65/info.json b/keyboards/kk/65/info.json
new file mode 100644
index 00000000000..49c52eec804
--- /dev/null
+++ b/keyboards/kk/65/info.json
@@ -0,0 +1,111 @@
+{
+    "manufacturer": "Kory Hicks",
+    "keyboard_name": "KK65",
+    "maintainer": "apricity-spam",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0", "D3", "D6", "C6", "B0", "C7", "F7", "E6", "F0", "F1", "F4", "F5", "F6"],
+        "rows": ["D7", "B4", "B5", "B6", "B7"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x6B6B"
+    },
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kk/65/keymaps/default/config.h b/keyboards/kk/65/keymaps/default/config.h
new file mode 100644
index 00000000000..97fad80ee0d
--- /dev/null
+++ b/keyboards/kk/65/keymaps/default/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Kory Hicks (@apricity-spam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Adjust value for number of taps required to toggle layer change */
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/kk/65/keymaps/default/keymap.c b/keyboards/kk/65/keymaps/default/keymap.c
new file mode 100644
index 00000000000..19f0e5d914d
--- /dev/null
+++ b/keyboards/kk/65/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │Ins│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │Hme│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │End│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│TT1│ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [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_INS,
+        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_HOME,
+        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, TT(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_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_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_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_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/kk/65/keymaps/via/config.h b/keyboards/kk/65/keymaps/via/config.h
new file mode 100644
index 00000000000..97fad80ee0d
--- /dev/null
+++ b/keyboards/kk/65/keymaps/via/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Kory Hicks (@apricity-spam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Adjust value for number of taps required to toggle layer change */
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/kk/65/keymaps/via/keymap.c b/keyboards/kk/65/keymaps/via/keymap.c
new file mode 100644
index 00000000000..19f0e5d914d
--- /dev/null
+++ b/keyboards/kk/65/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │Ins│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │Hme│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │End│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│TT1│ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [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_INS,
+        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_HOME,
+        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, TT(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_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_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_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_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/kk/65/keymaps/via/rules.mk b/keyboards/kk/65/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/kk/65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kk/65/readme.md b/keyboards/kk/65/readme.md
new file mode 100644
index 00000000000..6c8f1ee396f
--- /dev/null
+++ b/keyboards/kk/65/readme.md
@@ -0,0 +1,27 @@
+# KK65
+
+![KK65](https://i.imgur.com/vGBCw5Qh.jpg)
+
+The KK65 is a hot-swappable 68-key keyboard designed and manufactured in the USA.
+
+* Keyboard Maintainer: [Kory Hicks](https://github.com/apricity-spam)
+* Hardware Supported: KK65 PCB, ATMega32u4
+* Hardware Availability: Coming soon!
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kk/65:default
+
+Flashing example for this keyboard:
+
+    make kk/65: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 `QK_BOOT` if it is available
diff --git a/keyboards/kk/65/rules.mk b/keyboards/kk/65/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kk/65/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kmac/kmac.h b/keyboards/kmac/kmac.h
deleted file mode 100644
index edeb6358363..00000000000
--- a/keyboards/kmac/kmac.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2017-2019 Mathias Andersson <wraul@dbox.se>
- *
- * 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"
-
-// clang-format off
-#define LAYOUT_tkl_ansi( \
-    k00,      k02, k03, k04, k05,      k06, k07, k08, k09,      k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1D,      k1E, k1F, k1G, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D,      k2E, k2F, k2G, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,           k3D,                     \
-    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,                k4D,           k4F,      \
-    k50, k51, k52,                     k55,                     k58, k5A, k5C, k5D,      k5E, k5F, k5G  \
-) \
-{ \
-    {k00, KC_NO, k02, k03,   k04,   k05, k06,   k07,   k08, k09,   k0A, k0B,   k0C,   k0D, k0E,   k0F,   k0G},   \
-    {k10, k11,   k12, k13,   k14,   k15, k16,   k17,   k18, k19,   k1A, k1B,   k1C,   k1D, k1E,   k1F,   k1G},   \
-    {k20, k21,   k22, k23,   k24,   k25, k26,   k27,   k28, k29,   k2A, k2B,   k2C,   k2D, k2E,   k2F,   k2G},   \
-    {k30, k31,   k32, k33,   k34,   k35, k36,   k37,   k38, k39,   k3A, k3B,   KC_NO, k3D, KC_NO, KC_NO, KC_NO}, \
-    {k40, k41,   k42, k43,   k44,   k45, k46,   k47,   k48, k49,   k4A, KC_NO, KC_NO, k4D, KC_NO, k4F,   KC_NO}, \
-    {k50, k51,   k52, KC_NO, KC_NO, k55, KC_NO, KC_NO, k58, KC_NO, k5A, KC_NO, k5C,   k5D, k5E,   k5F,   k5G }   \
-}
-// clang-format on
-
-// clang-format off
-#define LAYOUT_tkl_ansi_wkl( \
-    k00,      k02, k03, k04, k05,      k06, k07, k08, k09,      k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1D,      k1E, k1F, k1G, \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D,      k2E, k2F, k2G, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,           k3D,                     \
-    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,                k4D,           k4F,      \
-    k50,      k52,                     k55,                          k58,      k5D,      k5E, k5F, k5G  \
-) \
-{ \
-    {k00, KC_NO, k02, k03,   k04,   k05, k06,   k07,   k08, k09,   k0A,   k0B,   k0C,   k0D, k0E,   k0F,   k0G},   \
-    {k10, k11,   k12, k13,   k14,   k15, k16,   k17,   k18, k19,   k1A,   k1B,   k1C,   k1D, k1E,   k1F,   k1G},   \
-    {k20, k21,   k22, k23,   k24,   k25, k26,   k27,   k28, k29,   k2A,   k2B,   k2C,   k2D, k2E,   k2F,   k2G},   \
-    {k30, k31,   k32, k33,   k34,   k35, k36,   k37,   k38, k39,   k3A,   k3B,   KC_NO, k3D, KC_NO, KC_NO, KC_NO}, \
-    {k40, k41,   k42, k43,   k44,   k45, k46,   k47,   k48, k49,   k4A,   KC_NO, KC_NO, k4D, KC_NO, k4F,   KC_NO}, \
-    {k50, KC_NO, k52, KC_NO, KC_NO, k55, KC_NO, KC_NO, k58, KC_NO, KC_NO, KC_NO, KC_NO, k5D, k5E,   k5F,   k5G }   \
-}
-// clang-format on
diff --git a/keyboards/kmac/readme.md b/keyboards/kmac/readme.md
deleted file mode 100644
index 47dbaa847f6..00000000000
--- a/keyboards/kmac/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# KMAC
-
-A Korean custom keyboard designed by Byungho Kim and the KBDMania community.
-
-Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul)  
-Hardware Supported: KMAC & KMAC 2  
-Hardware Availability: http://www.kbdmania.net/xe/news/5232321
-
-Make example for this keyboard (after setting up your build environment):
-
-    make kmac: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
-
-The PCB is hardwired to run the bootloader if the key at the `Caps Lock` position is held down when connecting the keyboard.
-
-## PCB versions
-
-The KMAC are available with two different PCB layouts, a winkey version and a winkeyless version. A default keymap are provided for each versions of the PCB.
diff --git a/keyboards/kmac_happy/config.h b/keyboards/kmac_happy/config.h
new file mode 100644
index 00000000000..72ca895d334
--- /dev/null
+++ b/keyboards/kmac_happy/config.h
@@ -0,0 +1,33 @@
+/* Copyright 2024 nlnjnj
+ *
+ * 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
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ * The KMAC uses a demultiplexer for some of the cols.
+ * See matrix.c for more details.
+*/
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
+#define MATRIX_COL_PINS { }
+
+/* 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/kmac_happy/info.json b/keyboards/kmac_happy/info.json
new file mode 100644
index 00000000000..e471d42973c
--- /dev/null
+++ b/keyboards/kmac_happy/info.json
@@ -0,0 +1,93 @@
+{
+  "keyboard_name": "KMAC Happy",
+  "manufacturer": "KBDMOD",
+  "url": "https://kbdmodadmin.cafe24.com/product/detail.html?product_no=15&cate_no=4&display_group=1",
+  "maintainer": "nlnjnj",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0305",
+    "device_version": "1.1.0"
+  },
+  "backlight": {
+    "pin": "B5",
+    "levels": 3
+  },
+  "indicators": {
+    "caps_lock": "B1",
+    "on_state": 0
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 14.5, "y": 4},
+        {"matrix": [4, 13], "x": 15.5, "y": 4, "w": 1.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/kmac_happy/keymaps/default/keymap.c b/keyboards/kmac_happy/keymaps/default/keymap.c
new file mode 100644
index 00000000000..6eeb1e9bed1
--- /dev/null
+++ b/keyboards/kmac_happy/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2024 nlnjnj
+ *
+ * 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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,    KC_BSLS,    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_BSPC,
+    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,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI,    KC_RCTL
+  ),
+  [1] = LAYOUT(
+    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_INS,  KC_DEL,
+    KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_UP,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_LEFT, KC_DOWN, KC_RIGHT
+  )
+};
+
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
+        writePinLow(B1);
+    } else {
+        writePinHigh(B1);
+    }
+    return false;
+}
diff --git a/keyboards/kmac_happy/keymaps/vial/config.h b/keyboards/kmac_happy/keymaps/vial/config.h
new file mode 100644
index 00000000000..5ff0037cdab
--- /dev/null
+++ b/keyboards/kmac_happy/keymaps/vial/config.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x7B, 0x23, 0xF2, 0x86, 0xEF, 0xC8, 0x03, 0x05}
+
+// ESC + Enter
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
diff --git a/keyboards/kmac_happy/keymaps/vial/keymap.c b/keyboards/kmac_happy/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..6eeb1e9bed1
--- /dev/null
+++ b/keyboards/kmac_happy/keymaps/vial/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2024 nlnjnj
+ *
+ * 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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,    KC_BSLS,    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_BSPC,
+    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,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI,    KC_RCTL
+  ),
+  [1] = LAYOUT(
+    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_INS,  KC_DEL,
+    KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_UP,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_LEFT, KC_DOWN, KC_RIGHT
+  )
+};
+
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
+        writePinLow(B1);
+    } else {
+        writePinHigh(B1);
+    }
+    return false;
+}
diff --git a/keyboards/kmac_happy/keymaps/vial/rules.mk b/keyboards/kmac_happy/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..839cce340c2
--- /dev/null
+++ b/keyboards/kmac_happy/keymaps/vial/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE      = yes # Enable VIA
+VIAL_ENABLE     = yes # Enable VIAL
+LTO_ENABLE      = yes
diff --git a/keyboards/kmac_happy/keymaps/vial/vial.json b/keyboards/kmac_happy/keymaps/vial/vial.json
new file mode 100644
index 00000000000..16e5fe7c6b7
--- /dev/null
+++ b/keyboards/kmac_happy/keymaps/vial/vial.json
@@ -0,0 +1,132 @@
+{
+    "lighting": "none",
+    "matrix": {
+        "rows": 5,
+        "cols": 15
+    },
+    "layouts": {
+        "labels": [
+            "Split Backspace",
+            "Split Right Shift"
+        ],
+        "keymap": [
+            [
+                "0,0",
+                "0,1",
+                "0,2",
+                "0,3",
+                "0,4",
+                "0,5",
+                "0,6",
+                "0,7",
+                "0,8",
+                "0,9",
+                "0,10",
+                "0,11",
+                "0,12",
+                {
+                    "w": 2
+                },
+                "0,13\n\n\n0,0",
+                {
+                    "x": 1
+                },
+                "0,13\n\n\n0,1",
+                "0,14\n\n\n0,1"
+            ],
+            [
+                {
+                    "w": 1.5
+                },
+                "1,0",
+                "1,1",
+                "1,2",
+                "1,3",
+                "1,4",
+                "1,5",
+                "1,6",
+                "1,7",
+                "1,8",
+                "1,9",
+                "1,10",
+                "1,11",
+                " 1, 12",
+                {
+                    "w": 1.5
+                },
+                "1,13"
+            ],
+            [
+                {
+                    "w": 1.75
+                },
+                "2,0",
+                "2,1",
+                "2,2",
+                "2,3",
+                "2,4",
+                "2,5",
+                "2,6",
+                "2,7",
+                "2,8",
+                "2,9",
+                "2,10",
+                "2,11",
+                {
+                    "w": 2.25
+                },
+                "2,13"
+            ],
+            [
+                {
+                    "w": 2.25
+                },
+                "3,0",
+                "3,1",
+                "3,2",
+                "3,3",
+                "3,4",
+                "3,5",
+                "3,6",
+                "3,7",
+                "3,8",
+                "3,9",
+                "3,10",
+                {
+                    "w": 2.75
+                },
+                "3,12\n\n\n1,0",
+                {
+                    "x": 0.25,
+                    "w": 1.75
+                },
+                "3,12\n\n\n1,1",
+                "3,13\n\n\n1,1"
+            ],
+            [
+                {
+                    "w": 1.5
+                },
+                "4,0",
+                "4,1",
+                {
+                    "w": 1.5
+                },
+                "4,2",
+                {
+                    "w": 7
+                },
+                "4,5",
+                {
+                    "w": 1.5
+                },
+                "4,10",
+                "4,12",
+                {
+                    "w": 1.5
+                },
+                "4,13"
+            ]
+        ]
+    }
+}
diff --git a/keyboards/kmac_happy/kmac_happy.c b/keyboards/kmac_happy/kmac_happy.c
new file mode 100644
index 00000000000..7550d8f8b7d
--- /dev/null
+++ b/keyboards/kmac_happy/kmac_happy.c
@@ -0,0 +1,23 @@
+/* Copyright 2024 nlnjnj
+ *
+ * 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 "quantum.h"
+
+/* LED pin configuration
+ * Caps Lock: Low B1
+ */
+void led_init_ports(void) {
+    DDRB |= (1<<1); // OUT
+}
diff --git a/keyboards/kmac_happy/matrix.c b/keyboards/kmac_happy/matrix.c
new file mode 100644
index 00000000000..593ee38371b
--- /dev/null
+++ b/keyboards/kmac_happy/matrix.c
@@ -0,0 +1,303 @@
+/* Copyright 2024 nlnjnj
+ *
+ * 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>
+#if defined(__AVR__)
+#include <avr/io.h>
+#endif
+#include "wait.h"
+#include "print.h"
+#include "debug.h"
+#include "util.h"
+#include "matrix.h"
+#include "timer.h"
+
+
+/* Set 0 if debouncing isn't needed */
+#ifndef DEBOUNCE
+#   define DEBOUNCE 5
+#endif
+
+#define COL_SHIFTER ((uint32_t)1)
+
+static uint16_t debouncing_time;
+static bool debouncing = false;
+
+
+static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+
+/* matrix state(1:on, 0:off) */
+static matrix_row_t matrix[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
+
+static void init_rows(void);
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col);
+static void unselect_cols(void);
+static void select_col(uint8_t col);
+
+__attribute__ ((weak))
+void matrix_init_user(void) {}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {}
+
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+  matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+  matrix_scan_user();
+}
+
+inline
+uint8_t matrix_rows(void) {
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void) {
+    return MATRIX_COLS;
+}
+
+void matrix_init(void) {
+    unselect_cols();
+    init_rows();
+
+    // initialize matrix state: all keys off
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+        matrix_debouncing[i] = 0;
+    }
+
+    matrix_init_kb();
+}
+
+uint8_t matrix_scan(void)
+{
+    // Set col, read rows
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+        bool matrix_changed = read_rows_on_col(matrix_debouncing, current_col);
+        if (matrix_changed) {
+            debouncing = true;
+            debouncing_time = timer_read();
+        }
+    }
+
+    if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCE)) {
+        for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+            matrix[i] = matrix_debouncing[i];
+        }
+        debouncing = false;
+    }
+
+    matrix_scan_kb();
+    return 1;
+}
+
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & ((matrix_row_t)1<<col));
+}
+
+inline
+matrix_row_t matrix_get_row(uint8_t row)
+{
+    return matrix[row];
+}
+
+void matrix_print(void)
+{
+    print("\nr/c 0123456789ABCDEFGHIJKLMNOPQRSTUV  \n");
+
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        print_hex8(row); print(": ");
+        print_bin_reverse32(matrix_get_row(row));
+        print("\n");
+    }
+}
+
+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 selection to stabilize
+    select_col(current_col);
+    wait_us(30);
+
+    // For each row...
+    for(uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++)
+    {
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[row_index];
+
+        // Check row pin state
+        // Use the otherwise unused row: 3, col: 0 for caps lock
+        if (row_index == 2 && current_col == 0) {
+            // Pin E2 uses active low
+            if ((_SFR_IO8(E2 >> 4) & _BV(E2 & 0xF)) == 0)
+            {
+                // Pin LO, set col bit
+                current_matrix[row_index] |= (COL_SHIFTER << current_col);
+            }
+            else
+            {
+                // Pin HI, clear col bit
+                current_matrix[row_index] &= ~(COL_SHIFTER << current_col);
+            }
+        }
+        else {
+            if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)))
+            {
+                // Pin HI, set col bit
+                current_matrix[row_index] |= (COL_SHIFTER << current_col);
+            }
+            else
+            {
+                // Pin LO, clear col bit
+                current_matrix[row_index] &= ~(COL_SHIFTER << current_col);
+            }
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[row_index]) && !(matrix_changed))
+        {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect cols
+    unselect_cols();
+
+    return matrix_changed;
+}
+
+/* Row pin configuration
+ * row: 0   1   2   3   4
+ * pin: D0  D1  D2  D3  D5
+ *
+ * Caps lock uses its own pin E2
+ */
+static void init_rows(void) {
+    DDRD  &= ~((1<<0)| (1<<1) | (1<<2) | (1<<3) | (1<<5)); // IN
+    PORTD &= ~((1<<0)| (1<<1) | (1<<2) | (1<<3) | (1<<5)); // LO
+
+    DDRE &= ~(1<<2); // IN
+    PORTE |= (1<<2); // HI
+}
+
+/* Columns 0 - 14
+ * col 0 ~ col 6: B6
+ * These columns use a 74HC237D 3 to 8 bit demultiplexer.
+ *                A    B    C   GL1
+ * col / pin:    PF0  PF1  PC7  PC6
+ * 2:             0    0    0    1
+ * 3:             1    0    0    1
+ * 4:             0    1    0    1
+ * 5:             1    1    0    1
+ * 6:             0    0    1    1
+ * 7:             1    0    1    1
+ * 8:             0    1    1    1
+ * 9:             1    1    1    1
+ * col  7: E6
+ * col  8: B0
+ * col  9: B7
+ * col 10: D4
+ * col 12: D6
+ * col 13: D7
+ * col 14: B4
+ */
+static void unselect_cols(void) {
+    DDRB  |= (1<<0) | (1<<7) | (1<<4); // OUT
+    PORTB &= ~((1<<0) |  (1<<7) | (1<<4)); // LO
+
+    DDRD  |= (1<<4) | (1<<6) | (1<<7); // OUT
+    PORTD &= ~((1<<4) | (1<<6) | (1<<7)); // LO
+
+    DDRE  |= (1<<6); // OUT
+    PORTE &= ~((1<<6)); // LO
+
+    DDRF  |= (1<<0) | (1<<1); // OUT
+    PORTF &= ~((1<<0) | (1<<1)); // LO
+
+    DDRC  |= (1<<7) | (1<<6); // OUT
+    PORTC &= ~((1<<7) | (1<<6)); // LO
+}
+
+static void select_col(uint8_t col)
+{
+    switch (col) {
+        case 0:
+            PORTC |= (1<<6); // HI
+            break;
+        case 1:
+            PORTC |= (1<<6); // HI
+            PORTF |= (1<<0); // HI
+            break;
+        case 2:
+            PORTC |= (1<<6); // HI
+            PORTF |= (1<<1); // HI
+            break;
+        case 3:
+            PORTC |= (1<<6); // HI
+            PORTF |= (1<<0); // HI
+            PORTF |= (1<<1); // HI
+            break;
+        case 4:
+            PORTC |= (1<<6); // HI
+            PORTC |= (1<<7); // HI
+            break;
+        case 5:
+            PORTC |= (1<<6); // HI
+            PORTF |= (1<<0); // HI
+            PORTC |= (1<<7); // HI
+            break;
+        case 6:
+            PORTC |= (1<<6); // HI
+            PORTF |= (1<<1); // HI
+            PORTC |= (1<<7); // HI
+            break;
+        case 7:
+            PORTC |= (1<<6); // HI
+            PORTF |= (1<<0); // HI
+            PORTF |= (1<<1); // HI
+            PORTC |= (1<<7); // HI
+            break;
+        case 8:
+            PORTE |= (1<<6); // HI
+            break;
+        case 9:
+            PORTB |= (1<<0); // HI
+            break;
+        case 10:
+            PORTB |= (1<<7); // HI
+            break;
+        case 11:
+            PORTD |= (1<<4); // HI
+            break;
+        case 12:
+            PORTD |= (1<<6); // HI
+            break;
+        case 13:
+            PORTD |= (1<<7); // HI
+            break;
+        case 14:
+            PORTB |= (1<<4); // HI
+            break;
+    }
+}
diff --git a/keyboards/kmac_happy/readme.md b/keyboards/kmac_happy/readme.md
new file mode 100644
index 00000000000..3538fadc780
--- /dev/null
+++ b/keyboards/kmac_happy/readme.md
@@ -0,0 +1,36 @@
+KMAC Happy keyboard firmware
+======================
+
+The KMAC Happy is a HHKB layout 60% keyboard. It is programmed with the 'KMAC KEY MAP' original.
+
+## Hardware
+Columns 7-14 and rows 0-4 are wired directly to the ATmega32U4, and columns 0-7 are wired to the [74HC237D demultiplexer](https://www.mouser.de/datasheet/2/916/74HC237-1319445.pdf). Capslock is on E2 and also triggers a reset if held when plugging the cable in.
+
+There is only one individually controllable led, which is the Capslock key.
+
+The ATmega32U4 runs on an external crystal on 8mhz, so you'll have to change the bitclock on the ISP programmer if you're unable to read or write the chip.
+
+## How to build
+
+```
+make kmac_happy:default
+or
+make kmac_happy:vial
+```
+
+## How to flash
+Hold the capslock key while plugging in the USB and flash the .hex file using QMK Toolbox or Atmel FLIP.
+
+## **IMPORTANT**
+
+The backlight feature does not work in current version, I still does not figure out a way to add backlight function without breaking the firmware size limitation.
+
+May be fixed in future release.
+
+```bash
+ * The firmware is too large! 29052/28672 (380 bytes over)
+```
+
+## Thanks
+
+Thanks to Evy Dekkers for his great contribution, which makes the porting much easily.
diff --git a/keyboards/kmac_happy/rules.mk b/keyboards/kmac_happy/rules.mk
new file mode 100644
index 00000000000..8e343a71795
--- /dev/null
+++ b/keyboards/kmac_happy/rules.mk
@@ -0,0 +1,18 @@
+# Processor frequency
+F_CPU = 8000000
+
+# 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
+CUSTOM_MATRIX = yes         # Custom matrix file
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+
+# Project specific files
+SRC = matrix.c
diff --git a/keyboards/kmac_pad/readme.md b/keyboards/kmac_pad/readme.md
deleted file mode 100644
index 7605501f3a5..00000000000
--- a/keyboards/kmac_pad/readme.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# KMAC PAD
-
-![kmac_pad](https://i.imgur.com/4P1ybgNl.jpg)
-
-KMAC PAD is a num pad keyboard.
-It can be used independently, but can also be used by connecting with KMAC keyboard case.
-
-* Keyboard Maintainer: [talsu](https://github.com/talsu)
-* Hardware Supported: KMAC PAD
-* Hardware Availability: http://www.kbdmania.net/xe/news/5232321
-
-Make example for this keyboard (after setting up your build environment):
-
-    make kmac_pad:default
-    
-Flashing example for this keyboard:
-
-    make kmac_pad: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
-
-The PCB is hardwired to run the bootloader if the key at the `FN` position (the only key in first row) is held down when connecting the keyboard.
-
-## PCB
-
-![Imgur](https://i.imgur.com/ML66cvfl.jpg)
-![Imgur](https://i.imgur.com/Kr2Wdtkl.jpg)
-
-### Switch Pins
-
-The FN key in the `Row 0` is directly connected to the E2 pin.   
-The rest of the rows below that use MATRIX. (`Row 1 ~ Row 5`)
-| Row   | Pin                    |
-|:-----:| ---------------------- |
-| 0     | x (Not in Matrix)      |
-| 1     | D0                     |
-| 2     | D1                     |
-| 3     | D2                     |
-| 4     | D3                     |
-| 5     | D5                     |
-
-| Column | Pin                   |
-|:------:| --------------------- |
-| 0      | C7                    |
-| 1      | C6                    |
-| 2      | B6                    |
-| 3      | B5                    |
-
-### Backlight Pins
-
-There are 2 pins for backlight.
-
-The LED of the FN key uses pin `B3`.
-All other keys are connected to the `B1` pin.
diff --git a/keyboards/kopibeng/tgr_lena/info.json b/keyboards/kopibeng/tgr_lena/info.json
index 91a385be2f8..2460b04a5a1 100644
--- a/keyboards/kopibeng/tgr_lena/info.json
+++ b/keyboards/kopibeng/tgr_lena/info.json
@@ -13,6 +13,11 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "indicators": {
+        "caps_lock": "A2",
+        "num_lock": "A3",
+        "scroll_lock": "A1"
+    },
     "matrix_pins": {
         "cols": ["B10", "A8", "A7", "B15", "A6", "B14", "A4", "C15", "B9", "C14", "B8", "C13", "B7", "B6", "B5", "B3", "B4", "A15"],
         "rows": ["B12", "B13", "A5", "B0", "B1"]
diff --git a/keyboards/kprepublic/bm16a/v2/config.h b/keyboards/kprepublic/bm16a/v2/config.h
index 4f8f76b6b8a..3ef55f3d42e 100644
--- a/keyboards/kprepublic/bm16a/v2/config.h
+++ b/keyboards/kprepublic/bm16a/v2/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 16
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM7
diff --git a/keyboards/kprepublic/bm16s/keymaps/media/keymap.c b/keyboards/kprepublic/bm16s/keymaps/media/keymap.c
deleted file mode 100755
index 8c592a41512..00000000000
--- a/keyboards/kprepublic/bm16s/keymaps/media/keymap.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define RGB_BRU RGB_VAI
-#define RGB_BRD RGB_VAD
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT_ortho_4x4(
-		KC_BRIU, _______, _______, KC_VOLU,
-		KC_BRID, _______, _______, KC_VOLD,
-		_______, _______, _______, KC_MUTE,
-		KC_MPRV, KC_MPLY, KC_MNXT, MO(1)
-	),
-	[1] = LAYOUT_ortho_4x4(
-		QK_BOOT,  _______, _______, _______,
-		RGB_SPD,  RGB_BRU, RGB_SPI, _______,
-		RGB_RMOD, RGB_BRD, RGB_MOD, _______,
-		RGB_TOG,  _______, _______, _______
-	),
-};
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
deleted file mode 100644
index 72377c27017..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2021 Taeyoon Kim (@partrita)
-// SPDX-License-Identifier: GPL-2.0-or-later
-// /*
-//   Set any config.h overrides for your specific keymap here.
-//   See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
-// */
-#pragma once
-
-#define TAPPING_TERM 200 // time of holding key, milliseconds
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
-
-// Mouse key speed and acceleration.
-#undef MOUSEKEY_DELAY
-#define MOUSEKEY_DELAY          0
-#undef MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL       16
-#undef MOUSEKEY_WHEEL_DELAY
-#define MOUSEKEY_WHEEL_DELAY    0
-#undef MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_MAX_SPEED      6
-#undef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX    64
-
-//  The firmware is too large!
-#define COMBO_TERM 80 // timeout period for combos to 40ms.
-
-//disable broken animations
-#ifdef RGB_MATRIX_ENABLE
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    undef RGB_MATRIX_DEFAULT_MODE
-// #    define RGBLIGHT_HUE_STEP 20
-#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
deleted file mode 100644
index 09490aa940a..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2021 Taeyoon Kim (@partrita)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keymap_korean.h"
-
-enum layers {
-  _Base,
-  _Navi,
-  _Numb,
-  _Func,
-};
-
-// Left-hand home row mods - Base Layer
-#define HOME_A LGUI_T(KC_A)
-#define HOME_S LALT_T(KC_S)
-#define HOME_D LCTL_T(KC_D)
-#define HOME_F LSFT_T(KC_F)
-#define HOME_J RSFT_T(KC_J)
-#define HOME_K LCTL_T(KC_K)
-#define HOME_L LALT_T(KC_L)
-#define HOME_QU LGUI_T(KC_QUOT)
-
-// layer keys
-#define Lay_SPC LT(_Func,KC_SPC)
-#define NAVI MO(_Navi)
-#define NUMB MO(_Numb)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_Base] = LAYOUT_planck_mit(
-        KC_Q,        KC_W,      KC_E,           KC_R,          KC_T,    KC_NO, KC_NO,       KC_Y,       KC_U,      KC_I,      KC_O,         KC_P,
-      HOME_A,      HOME_S,    HOME_D,         HOME_F,          KC_G,    KC_NO, KC_NO,       KC_H,     HOME_J,    HOME_K,    HOME_L,      HOME_QU,
-        KC_Z,        KC_X,      KC_C,           KC_V,          KC_B,    KC_NO, KC_NO,       KC_N,       KC_M,   KC_COMM,    KC_DOT,      KC_SLSH,
-       KC_NO,       KC_NO,     KC_NO,           NAVI,       Lay_SPC,        KC_NO,       KC_BSPC,       NUMB,     KC_NO,     KC_NO,        KC_NO
-      ),
-  [_Navi] = LAYOUT_planck_mit(
-      KC_WH_L,    KC_WH_D,   KC_WH_U,        KC_WH_R,        KC_ESC,    KC_NO, KC_NO,       KC_DEL,   KC_HOME,  KC_PGDN,   KC_PGUP,      KC_END,
-      KC_LSFT,     HOME_S,    HOME_D,         HOME_F,        KC_TAB,    KC_NO, KC_NO,       KC_ENT,    KC_RSFT,   HOME_K,    HOME_L,     HOME_QU,
-      KC_MS_L,    KC_MS_D,   KC_MS_U,        KC_MS_R,       KC_BTN1,    KC_NO, KC_NO,      KC_BTN2,   KC_LEFT,  KC_DOWN,     KC_UP,     KC_RGHT,
-        KC_NO,      KC_NO,     KC_NO,          KC_NO,       Lay_SPC,        KC_NO,         KC_BSPC,     KC_NO,    KC_NO,     KC_NO,       KC_NO
-      ),
-  [_Numb] = LAYOUT_planck_mit(
-      KC_LBRC,        KC_7,     KC_8,          KC_9,        KC_RBRC,    KC_NO, KC_NO,      KC_DEL,      KC_NO,     KC_NO,     KC_NO,       KC_NO,
-      KC_SCLN,        KC_4,     KC_5,          KC_6,         KC_EQL,    KC_NO, KC_NO,      KC_ENT,     KC_RSFT,    HOME_K,    HOME_L,     HOME_QU,
-       KC_GRV,        KC_1,     KC_2,          KC_3,        KC_BSLS,    KC_NO, KC_NO,       KC_NO,      KC_NO,     KC_NO,   KR_HAEN,       KC_NO,
-        KC_NO,       KC_NO,     KC_NO,         KC_0,        KC_MINS,        KC_NO,        KC_BSPC,      KC_NO,     KC_NO,     KC_NO,       KC_NO
-      ),
-  [_Func] = LAYOUT_planck_mit(
-      KC_F12,     KC_F7,     KC_F8,           KC_F9,       KC_PSCR,    KC_NO, KC_NO,        QK_BOOT,    KC_NO,     KC_NO,     KC_NO,     KC_NO,
-      KC_F11,     KC_F4,     KC_F5,           KC_F6,       KC_SCRL,    KC_NO, KC_NO,      KC_CAPS,     KC_RSFT,    HOME_K,    HOME_L,   HOME_QU,
-      KC_F10,     KC_F1,     KC_F2,           KC_F3,       KC_PAUS,    KC_NO, KC_NO,       KC_INS,      KC_NO,     KC_NO,   KR_HAEN,     KC_NO,
-      KC_NO,       KC_NO,     KC_NO,          KC_NO,       Lay_SPC,         KC_NO,        KC_BSPC,      KC_NO,     KC_NO,     KC_NO,     KC_NO
-      ),
-};
-
-
-// color by layer
-layer_state_t layer_state_set_user(layer_state_t state) {
-    uint8_t layer = get_highest_layer(state);
-    switch (layer) {
-        case _Navi:
-            rgblight_mode_noeeprom(RGB_MATRIX_RAINBOW_BEACON);
-            break;
-        case _Numb:
-            rgblight_mode_noeeprom(RGB_MATRIX_HUE_PENDULUM);
-            break;
-        case _Func:
-            rgblight_mode_noeeprom(RGB_MATRIX_GRADIENT_LEFT_RIGHT);
-            break;
-        default:
-            rgblight_mode_noeeprom(RGB_MATRIX_SOLID_REACTIVE_WIDE);
-    }
-    return state;
-}
-
-// COMBO key for HOME ROW modifier
-// modify `rules.mk` file
-// by adding # COMBO_ENABLE = yes
-
-enum combos {
-  SFT_HAN,
-};
-
-const uint16_t PROGMEM sft_han_combo[] = {LSFT_T(KC_F), LT(_Func,KC_SPC), COMBO_END};
-
-combo_t key_combos[] = {
-  [SFT_HAN] = COMBO(sft_han_combo, KC_LNG1),
-};
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/readme.md
deleted file mode 100644
index 31ac2602b6e..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/readme.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# The 35 keymap for bm40hsrgb
-
-This layout is made almost entirely from [miryoku](https://github.com/manna-harbour/miryoku). However, I used fewer layers and reduced 36 keys to 34.
-
-> As little as possible, as simple as possible, as easy as possible to memorize
-
-Replaced the Ctrl, GUI, Alt, and Shift keys with home mod row. A combo function was added by removing some RGB animations of the bm40's keyboard to free up memory. If animation is not removed, it is because there is not enough memory to compile. Added code that uses RGB matrix animation so that you can see at a glance which layer is being used, and you can move faster by increasing the speed of the mouse key. 
-
-And because I'm Korean, a combo for Korean and English keyboard conversion has been added, but if you don't need it, you can delete it.
-
-
-- Flash:
-
-  `qmk flash -kb kprepublic/bm40hsrgb -km 34keys`
-
-# Layout
-
-Press and hold to activate the keys in parentheses.
-
-
-https://imgur.com/a/UkKfCYm
-
-
-## _BASE(QWERTY)
-
-![](https://i.imgur.com/PuHFVXT.png)
-
-
-| Q | W | E | R | T | | | Y | U | I | O | P | 
-|---|---|---|---|---|---|---|---|---|---|---|---|
-| A(GUI) | S(Alt) | D(Ctrl) | F(Shift) |  G | |  | H | J(Shift) | K(Ctrl)  | L(Alt) | '(GUI) |
-| Z | X| C| V| B| | | N | M | , | . | /|
-| | | | NaviLayer| Space(_Func) | | | Backspace | NumberLayer | | | |  
-
-## _Navi
-
-![](https://i.imgur.com/BwDHx64.png)
-
-| Mousewheel left | Mousewheel down | Mousewheel up | Mousewheel right | ESC | | | DEL | HOME | PageDown | PageUP | END | 
-|---|---|---|---|---|---|---|---|---|---|---|---|
-| A(GUI) | S(Alt) | D(Ctrl) | F(Shift) |  TAB | |  | ENTER | J(Shift) | K(Ctrl)  | L(Alt) | '(GUI) |
-| Mouse left | Mouse down | Mouse up| Mouse right | left click | | | left click | Left | Down | Up | Right |
-| | | |  | Space | | | Backspace | NumberLayer | | | |  
-
-## _Numb
-
-![](https://i.imgur.com/lPPyUsk.png)
-
-| [ | 7 | 8 | 9 | ] | | | DEL |  |  |  |  | 
-|---|---|---|---|---|---|---|---|---|---|---|---|
-| ; | 4 | 5 | 6 | = | |  | ENTER | J(Shift) | K(Ctrl)  | L(Alt) | '(GUI) |
-| ` |  1 | 2 | 3 | \ | | |  |  |  |  | |
-| | | | 0|  - | | | Backspace | | | | |  
-
-## _Func
-
-![](https://i.imgur.com/rz0jaoe.png)
-
-| F12 | F7 | F8 | F9 | PrintScreen | | | RESET |  |  |  |  | 
-|---|---|---|---|---|---|---|---|---|---|---|---|
-| F11 | F4 | F5 | F6 | ScrollLock | |  | CapsLock | J(Shift) | K(Ctrl)  | L(Alt) | '(GUI) |
-| F10 |  F1 | F2 | F3 | PauseBreak | | | Insert |  |  |  | |
-| | | | NaviLayer | Space | | | Backspace | NumberLayer | | | |  
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/rules.mk
deleted file mode 100644
index 96655e7b5a9..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOTMAGIC_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-COMBO_ENABLE = yes
-EXTRAKEY_ENABLE = yes
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h
deleted file mode 100644
index ca8a4c6ab4e..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2022 Fae Fankhauser (@CoffeeIsLife87)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define LAYER_STATE_8BIT
-
-#define TURBO_ENABLE
-#define HOLD_ON_OTHER_KEY_PRESS
-
-// RGB Matrix effects disable
-#ifdef RGB_MATRIX_ENABLE
-#    define UNDERGLOW_DISABLE
-
-#    define RGB_TRIGGER_ON_KEYDOWN
-
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 10
-
-#    undef ENABLE_RGB_MATRIX_SOLID_COLOR
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_HUE_BREATHING
-#    undef ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    undef ENABLE_RGB_MATRIX_HUE_WAVE
-#    undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
-
-// Feature disable
-#ifndef NO_PRINT
-#    define NO_PRINT
-#endif
-
-#ifndef NO_DEBUG
-#    define NO_DEBUG
-#endif
-
-#ifndef NO_ACTION_ONESHOT
-#    define NO_ACTION_ONESHOT
-#endif
-
-// Configure features
-#ifdef DYNAMIC_MACRO_ENABLE
-#    define DYNAMIC_MACRO_USER_CALL
-#    define DYNAMIC_MACRO_NO_NESTING
-#endif
-
-#ifdef MOUSEKEY_ENABLE
-#    define MOUSEKEY_INTERVAL 16 // 60 FPS
-
-// Speed up the slowest preset
-#    define MK_C_OFFSET_0 4
-#    define MK_C_INTERVAL_0 16
-
-// Speed up the medium preset
-#    define MK_C_OFFSET_1 16
-
-#    define MK_3_SPEED
-#endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
deleted file mode 100644
index 3d5bcade20f..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright 2022 Fae Fankhauser (@CoffeeIsLife87)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-    MCR_PLY = QK_USER, // Macro play
-    MCR_REC,           // Macro record
-    MCR_SWT,           // Swap active macro
-    MS_ACL_U,          // Mouse speed up
-    MS_ACL_D,          // Mouse speed down
-};
-
-enum layout_names {
-    _MAIN = 0,       // Keys Layout: The main keyboard layout that has all the characters
-    _SUB,            // Extension to Main
-    _CTR,            // Macros, RGB, Audio controls, layer access. More or less the control center of my keyboard
-    #ifdef MOUSEKEY_ENABLE
-    _MSE,
-    #endif // MOUSEKEY_ENABLE
-    _END,
-};
-
-#ifdef MOUSEKEY_ENABLE
-#include "action.h"
-#define TOG_MSE TG(_MSE)
-static int current_accel = 0;
-#else
-#define TOG_MSE XXXXXXX
-#endif // MOUSEKEY_ENABLE
-
-#ifdef DYNAMIC_MACRO_ENABLE
-// Macro 1 is = 1, Macro 2 = -1, No macro = 0
-static bool MACRO1 = true; // Determines whether or not we're using 1 or 2
-static bool RECORDING = false;
-static uint16_t REC = DM_REC1; // Record either macro 1 or 2. Or stop recording
-static uint16_t PLY = DM_PLY1; // Play either macro 1 or macro 2
-
-void dynamic_macro_record_start_user(int8_t direction) {
-    REC = DM_RSTP;
-    RECORDING = true;
-}
-
-void dynamic_macro_record_end_user(int8_t direction) {
-    RECORDING = false;
-}
-#else
-#define MCR_PLY KC_NO
-#define MCR_REC KC_NO
-#define MCR_SWT KC_NO
-#endif // DYNAMIC_MACRO_ENABLE
-
-#ifdef TURBO_ENABLE
-static bool turbo_active = false; // Only changed by TRBO_ST
-static uint16_t turbo_keycode = KC_NO; // turbo_active can't be true if this is KC_NO
-static bool turbo_key_pressed = false;
-static bool turbo_keycode_selecting = false; // Determine new keycode or delay mode switch
-static bool turbo_ms_delay_direction = true; // True is raise the delay, false is lower it
-static uint16_t turbo_ms_delay_direction_indicator = 0;
-static uint16_t turbo_ms_delay = 100; // Start at sending keycodes 10 times a second
-static uint16_t turbo_timer; // Changed semi automatically
-/*
- * Because the KC's are wrapped in `LT()` they won't be interpreted as KC_NO or KC_TRNS
- * Instead they'll just be like any other custom KC which will let me use them how I want 
-*/
-#define TRBO_ST LT(_CTR, KC_NO  )
-#define TRBO_TI LT(_CTR, KC_TRNS)
-#else
-#define TRBO_ST KC_NO
-#define TRBO_TI KC_NO
-#endif
-
-const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MAIN] = LAYOUT_planck_mit(
-        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_ENT ,
-        KC_LCTL, KC_LGUI, XXXXXXX,KC_LALT ,MO(_SUB),      KC_SPC     ,MO(_CTR), KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT
-    ),
-    [_SUB] = LAYOUT_planck_mit(
-        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_DEL,
-        XXXXXXX, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_PGUP,
-        _______, KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , XXXXXXX, KC_HOME, KC_END , KC_BSLS, KC_PGDN,
-        _______, _______, XXXXXXX, _______, _______,      _______    , _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    [_CTR] = LAYOUT_planck_mit(
-        XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, XXXXXXX, KC_VOLU, XXXXXXX, XXXXXXX, MCR_REC,
-        XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, MCR_PLY,
-        XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, XXXXXXX, XXXXXXX, MCR_SWT,
-        XXXXXXX, XXXXXXX, XXXXXXX, TRBO_TI, TRBO_ST,      TOG_MSE,     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-    #ifdef MOUSEKEY_ENABLE
-    ,[_MSE] = LAYOUT_planck_mit(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, XXXXXXX, KC_BTN1, KC_WH_D, KC_WH_U, KC_BTN2, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_ACL_D,      TOG_MSE,    MS_ACL_U,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-    #endif // MOUSEKEY_ENABLE
-};
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define LAYER (get_highest_layer(layer_state))
-#define LAYER_SIZE (MATRIX_ROWS * MATRIX_COLS)
-#define BRIGHTNESS rgb_matrix_get_val()
-
-#ifdef UNDERGLOW_DISABLE
-void keyboard_pre_init_user(void) {
-    for (int key_id = 0; key_id < RGB_MATRIX_LED_COUNT; key_id++ ) {
-        if (g_led_config.flags[key_id] == LED_FLAG_UNDERGLOW) {
-            g_led_config.flags[key_id] = LED_FLAG_NONE;
-        }
-    }
-}
-#endif // UNDERGLOW_DISABLE
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    if (LAYER == _MAIN) {return false;}
-
-    for (uint8_t i = led_min; i <= led_max; i++) {
-        uint8_t pos = ((uint8_t*)g_led_config.matrix_co)[i];
-        if (!HAS_ANY_FLAGS(g_led_config.flags[pos], (LED_FLAG_MODIFIER | LED_FLAG_KEYLIGHT))) {continue;}
-        uint16_t KC = pgm_read_word(&((uint16_t*)keymaps)[(LAYER_SIZE * LAYER) + i]);
-
-        switch (KC) {
-            case KC_NO:
-                RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, 0, 0 );
-                break;
-
-            #ifdef DYNAMIC_MACRO_ENABLE
-            case MCR_SWT:
-                if (!MACRO1) { RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, BRIGHTNESS, BRIGHTNESS); }
-                break;
-
-            case MCR_REC:
-                if (RECORDING) { RGB_MATRIX_INDICATOR_SET_COLOR(pos, BRIGHTNESS, 0, 0); }
-                break;
-            #endif // DYNAMIC_MACRO_ENABLE
-
-            #ifdef TURBO_ENABLE
-            case TRBO_ST:
-                if (turbo_keycode_selecting) {
-                    RGB_MATRIX_INDICATOR_SET_COLOR(pos, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS);
-                } else {
-                    if (turbo_active) {
-                        if (turbo_key_pressed) {
-                            RGB_MATRIX_INDICATOR_SET_COLOR(pos, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS);
-                        } else {
-                            RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, 0, 0);
-                        }
-                    }
-                }
-                break;
-
-            case TRBO_TI:
-                if (turbo_ms_delay_direction_indicator != 0) {
-                    uint8_t time = timer_elapsed(turbo_ms_delay_direction_indicator) / 200;
-                    if (time > 0) {
-                        if ((time % 2) == 1) {
-                            if (turbo_ms_delay_direction) {
-                                RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, BRIGHTNESS, 0);
-                            } else {
-                                RGB_MATRIX_INDICATOR_SET_COLOR(pos, BRIGHTNESS, 0, 0);
-                            }
-                        } else {
-                            RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, 0, 0);
-                        }
-                        if (time >= 6) {
-                            turbo_ms_delay_direction_indicator = 0;
-                        }
-                    }
-                }
-                break;
-            #endif
-
-        }
-    }
-    return false;
-}
-#endif
-
-#ifdef TURBO_ENABLE
-void housekeeping_task_user(void) {
-    if (turbo_active) {
-        if (turbo_key_pressed) {
-            if (timer_elapsed(turbo_timer) > turbo_ms_delay) {
-                unregister_code(turbo_keycode);
-                turbo_key_pressed = false;
-                turbo_timer = timer_read();
-            }
-        } else {
-            if (timer_elapsed(turbo_timer) > (turbo_ms_delay / 2)) {
-                register_code(turbo_keycode);
-                turbo_key_pressed = true;
-            }
-        }
-    }
-}
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    #ifdef DYNAMIC_MACRO_ENABLE
-    if (keycode == MCR_REC) {keycode = REC;}
-    if (keycode == MCR_PLY) {keycode = PLY;}
-    if (!process_dynamic_macro(keycode, record)) {
-        REC = (MACRO1 ? DM_REC1 : DM_REC2);
-        return false;
-    }
-    #endif // DYNAMIC_MACRO_ENABLE
-
-    #ifdef MOUSEKEY_ENABLE
-    if ((keycode == MS_ACL_U) || (keycode == MS_ACL_D)) {
-        if (record->event.pressed) {
-            if ( (keycode == MS_ACL_U) && (current_accel < 2) ) { current_accel += 1; }
-            if ( (keycode == MS_ACL_D) && (current_accel > 0) ) { current_accel -= 1; }
-        }
-        keycode = KC_ACL0 + current_accel;
-        action_t mousekey_action = action_for_keycode(keycode);
-        process_action(record, mousekey_action);
-    }
-    #endif // MOUSEKEY_ENABLE
-
-    #ifdef TURBO_ENABLE
-    if (record->event.pressed) {
-        if (turbo_keycode_selecting) {
-            if (IS_BASIC_KEYCODE(keycode)    || 
-                IS_MODIFIER_KEYCODE(keycode) ||
-                IS_JOYSTICK_KEYCODE(keycode) ||
-                IS_MOUSE_KEYCODE(keycode))
-            {
-                unregister_code(turbo_keycode);
-                turbo_key_pressed = false;
-                turbo_keycode = keycode;
-                turbo_keycode_selecting = false;
-            }
-        }
-    }
-    #endif
-
-    switch (keycode) {
-        #ifdef DYNAMIC_MACRO_ENABLE
-        case MCR_SWT:
-            if (!RECORDING && record->event.pressed) {
-                // if the button is pressed and we're not recording
-                MACRO1 = !MACRO1;
-                if (MACRO1) {
-                    REC = DM_REC1;
-                    PLY = DM_PLY1;
-                } else {
-                    REC = DM_REC2;
-                    PLY = DM_PLY2;
-                }
-            }
-            return false;
-        #endif // DYNAMIC_MACRO_ENABLE
-
-        #ifdef TURBO_ENABLE
-        case TRBO_ST:
-            if (record->event.pressed) {
-                if (!record->tap.count) {
-                    turbo_keycode_selecting = !turbo_keycode_selecting;
-                } else {
-                    if (turbo_keycode != KC_NO) {
-                        if (!turbo_active) {
-                            turbo_keycode_selecting = false;
-                            turbo_active = true;
-                        } else {
-                            unregister_code(turbo_keycode);
-                            turbo_key_pressed = false;
-                            turbo_active = false;
-                        }
-                    }
-                }
-            }
-            return false;
-
-        case TRBO_TI:
-            if (record->event.pressed) {
-                if (!record->tap.count) {
-                    turbo_ms_delay_direction = !turbo_ms_delay_direction;
-                    turbo_ms_delay_direction_indicator = timer_read();
-                } else {
-                    if (turbo_ms_delay_direction)
-                        turbo_ms_delay += 20;
-                    else
-                        turbo_ms_delay -= 20;
-
-                    if (turbo_ms_delay > 500) // half a second
-                        turbo_ms_delay = 500;
-                    if (turbo_ms_delay < 60) // Around 16 times a second
-                        turbo_ms_delay = 60;
-                }
-            }
-            return false;
-        #endif
-
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md
deleted file mode 100644
index 980f559d71f..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Kprepublic BM40HSRGB Coffee
-
-A layout that aims to be familiar to people that have used larger boards
-
-## The layout
-
-The primary layer ( `_MAIN` ) is as close to standard qwerty as I could get.
-| row | 1    | 2    | 3 | 4   | 5   | 6   | 7   | 8   | 9   | 10  | 11 | 12   |
-|-----|------|------|---|-----|-----|-----|-----|-----|-----|-----|----|------|
-| 1   | esc  |  q   | w |  e  |  r  |  t  | y   | u   | i   | o   | p  | bksp |
-| 2   | tab  |  a   | s |  d  |  f  |  g  | h   | j   | k   | l   | ;  | '    |
-| 3   | shft |  z   | x |  c  |  v  |  b  | n   | m   | ,   | .   | /  | rtrn |
-| 4   | ctrl | win  |   | alt | SUB | spc | <- | CTR | lft | dwn | up | rght |
-
-The secondary layer ( `_SUB` ) is for syntax, F keys, and number keys
-| row | 1   | 2  | 3  | 4  | 5   | 6   | 7   | 8  | 9    | 10  | 11 | 12   |
-|-----|-----|----|----|----|-----|-----|-----|----|------|-----|----|------|
-| 1   | grv | 1  | 2  | 3  | 4   | 5   | 6   | 7  | 8    | 9   | 0  | del  |
-| 2   |     | F1 | F2 | F3 | F4  | F5  | F6  | -  | =    | [   | ]  | pgup |
-| 3   | _   | F7 | F8 | F9 | F10 | F11 | F12 |    | home | end | \  | pgdn |
-| 4   | _   | _  |    | _  | _   | _   | <-  | _  |      |     |    |      |
-
-The control layer ( `_CTR` ) is for lighting, media, and macros
-| row | 1 | 2     | 3    |  4      |  5      | 6       | 7   | 8    | 9    | 10   | 11 | 12      |
-|-----|---|-------|------|---------|---------|---------|-----|------|------|------|----|---------|
-| 1   |   | SPD-  | BRI+ |  SPD+   |  HUE+   | SAT+    |     |      | VOL+ |      |    | MCR_REC |
-| 2   |   | EFCT- | BRI- |  EFCT+  |  HUE-   | SAT-    |     | PREV | PLAY | NEXT |    | MCR_PLY |
-| 3   |   |       | TOG  |         |         |         |     |      | VOL- |      |    | MCR_SWT |
-| 4   |   |       |      | TRBO_TI | TRBO_ST | MSE_TOG | <-  |      |      |      |    |         |
-
-The mouse layer ( `_MSE` ) is for making the keyboard function as a mouse as well
-| row | 1 | 2    | 3    | 4    | 5     | 6       | 7   | 8     | 9     | 10    | 11    | 12 |
-|-----|---|------|------|------|-------|---------|-----|-------|-------|-------|-------|----|
-| 1   |   |      |      |      |       |         |     |       |       |       |       |    |
-| 2   |   | MS_L | MS_D | MS_U | MS_R  |         |     | L_CLC | SCR_D | SCR_U | R_CLC |    |
-| 3   |   |      |      |      |       |         |     |       |       |       |       |    |
-| 4   |   |      |      |      | ACL_D | MSE_TOG | <-  | ACL_U |       |       |       |    |
-
-| Key name | Explanation                                  |
-|----------|----------------------------------------------|
-| \_       | Passthrough the key on the layer below       |
-| <-       | Same key as imediate left. Used for spacebar |
-| SUB      | Goes to _SUB layer while held down           |
-| CTR      | Goes to _CTR layer while held down           |
-| MSE_TOG  | Toggles the mouse layer on or off            |
-| SPD +/-  | Changes speed for the RGB effect             |
-| BRI +/-  | Changes the brightness of the lighting       |
-| EFCT +/- | Moves to the next/previous effect            |
-| TOG      | Toggles the lighting on or off               |
-| HUE +/-  | Changes the hue for RGB effects              |
-| SAT +/-  | Changes the saturation for RGB effects       |
-| MSE      | Toggles the Mouse layer                      |
-| VOL +/-  | Raises or lowers media volume                |
-| PREV     | Goes to previous media                       |
-| PLAY     | Play/Pause media                             |
-| NEXT     | Goes to next media                           |
-| MCR_REC  | Record macro ( Press again to stop )         |
-| MCR_PLY  | Play recorded macro                          |
-| MCR_SWT  | Switch active macro                          |
-| MS_L     | Move mouse cursor left                       |
-| MS_U     | Move mouse cursor up                         |
-| MS_D     | Move mouse cursor down                       |
-| MD_R     | Move mouse cursor right                      |
-| L_CLC    | Mouse left click                             |
-| R_CLC    | Mouse right click                            |
-| SCR_U    | Mouse scroll up                              |
-| SCR_D    | Mouse scroll down                            |
-| ACL_U    | Raise mouse/scroll speed                     |
-| ACL_D    | Lower mouse/scroll speed                     |
-| TRBO_ST  | Set turbo key (Hold), start/stop turbo (Tap) |
-| TRBO_TI  | Turbo speed +/- (Hold to switch direction)   |
-
-## Compiling
-
-Compiling: `make kprepublic/bm40hsrgb:coffee`
-
-Flashing: `make kprepublic/bm40hsrgb:coffee:flash`
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/rules.mk
deleted file mode 100644
index 1f143e60267..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE = yes
-NKRO_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h
deleted file mode 100644
index 67e81609ae0..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2021 Dan Kim (@syntax-magic)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define TAPPING_TERM 136
-#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.c
deleted file mode 100644
index 5576612f9ad..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// 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.
-
-/**
- * @file custom_shift_keys.c
- * @brief Custom Shift Keys implementation
- *
- * For full documentation, see
- * <https://getreuer.info/posts/keyboards/custom-shift-keys>
- */
-
-#include "custom_shift_keys.h"
-
-bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record) {
-    static uint16_t registered_keycode = KC_NO;
-
-    // If a custom shift key is registered, then this event is either releasing
-    // it or manipulating another key at the same time. Either way, we release
-    // the currently registered key.
-    if (registered_keycode != KC_NO)
-        {
-         unregister_code16(registered_keycode);
-         registered_keycode = KC_NO;
-        }
-
-    if (record->event.pressed)
-    {  // Press event.
-        const uint8_t mods = get_mods();
-
-#ifndef NO_ACTION_ONESHOT
-    if ((mods | get_weak_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT)
-    {
-#else
-    if ((mods | get_weak_mods()) & MOD_MASK_SHIFT)
-        {  // Shift is held.
-#endif  // NO_ACTION_ONESHOT
-            // Search for a custom key with keycode equal to `keycode`.
-            for (int i = 0; i < NUM_CUSTOM_SHIFT_KEYS; ++i)
-            {
-
-                if (keycode == custom_shift_keys[i].keycode)
-                {
-                    // Continue default handling if this is a tap-hold key being held.
-                    if (((QK_MOD_TAP <= keycode && keycode <= QK_MOD_TAP_MAX) || (QK_LAYER_TAP <= keycode && keycode <= QK_LAYER_TAP_MAX)) && record->tap.count == 0)
-                    {
-                        return true;
-                    }
-
-#ifndef NO_ACTION_ONESHOT
-                del_oneshot_mods(MOD_MASK_SHIFT);
-#endif  // NO_ACTION_ONESHOT
-                del_mods(MOD_MASK_SHIFT);
-                del_weak_mods(MOD_MASK_SHIFT);
-                send_keyboard_report();
-                registered_keycode = custom_shift_keys[i].shifted_keycode;
-                register_code16(registered_keycode);
-                set_mods(mods);  // Restore the mods.
-                return false;
-                }
-            }
-        }
-    }
-
-  return true;  // Continue with default handling.
-}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.h b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.h
deleted file mode 100644
index d6cb7a9fdd6..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// 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.
-
-/**
- * @file custom_shift_keys.h
- * @brief Custom shift keys: customize what keycode is produced when shifted.
- *
- * Overview
- * --------
- *
- * This library implements custom shift keys, keys where you can customize
- * what keycode is produced when shifted.
- *
- * Step 1: In your keymap.c, define a table of custom shift keys like
- *
- *     #include "features/custom_shift_keys.h"
- *
- *     const custom_shift_key_t custom_shift_keys[] = {
- *       {KC_DOT , KC_QUES}, // Shift . is ?
- *       {KC_COMM, KC_EXLM}, // Shift , is !
- *       {KC_MINS, KC_EQL }, // Shift - is =
- *       {KC_COLN, KC_SCLN}, // Shift : is ;
- *     };
- *
- * Each row defines one key. The first field is the keycode as it appears in
- * your layout and determines what is typed normally. The second entry is what
- * you want the key to type when shifted.
- *
- * Step 2: Handle custom shift keys from your `process_record_user` function as
- *
- *     bool process_record_user(uint16_t keycode, keyrecord_t* record) {
- *       if (!process_custom_shift_keys(keycode, record)) { return false; }
- *       // Your macros ...
- *
- *       return true;
- *     }
- *
- * Step 3: add `features/custom_shift_keys.c` to your rules.mk as
- *
- *     SRC += features/custom_shift_keys.c
- *
- *
- * For full documentation, see
- * <https://getreuer.info/posts/keyboards/custom-shift-keys>
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Custom shift key entry. The `keycode` field is the keycode as it appears in
- * your layout and determines what is typed normally. The `shifted_keycode` is
- * what you want the key to type when shifted.
- */
-typedef struct {
-  uint16_t keycode;
-  uint16_t shifted_keycode;
-} custom_shift_key_t;
-
-/** Table of custom shift keys. */
-extern const custom_shift_key_t custom_shift_keys[];
-/** Number of entries in the `custom_shift_keys` table. */
-extern uint8_t NUM_CUSTOM_SHIFT_KEYS;
-
-/**
- * Handler function for custom shift keys.
- *
- * In keymap.c, call this function from your `process_record_user` function as
- *
- *     #include "features/custom_shift_keys.h"
- *
- *     bool process_record_user(uint16_t keycode, keyrecord_t* record) {
- *       if (!process_custom_shift_keys(keycode, record)) { return false; }
- *       // Your macros ...
- *
- *       return true;
- *     }
- */
-bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
deleted file mode 100644
index 54b4652fdf9..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * 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 "features/custom_shift_keys.h"
-
-enum layers {
-    _ALPHA,
-    _LEFTFN,
-    _NUMPAD,
-    _RIGHTFN,
-    _MOBA,
-    _FPS1,
-    _FPS2,
-    _STRAT,
-    _ARROWS,
-    _CLEAN,
-    _RGB
-};
-
-#define ALPHA TO(_ALPHA)
-#define LEFTFN MO(_LEFTFN)
-#define NUMPAD MO(_NUMPAD)
-#define RIGHTFN MO(_RIGHTFN)
-#define MOBA TG(_MOBA)
-#define FPS1 TG(_FPS1)
-#define FPS2 TG(_FPS2)
-#define STRAT TG(_STRAT)
-#define ARROWS TG(_ARROWS)
-#define CLEAN TG(_CLEAN)
-#define RGB MO(_RGB)
-
-// Tap dance declarations
-enum {
-    TD_PAST_PSLS,
-    TD_PASTE_COPY
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_PAST_PSLS]  = ACTION_TAP_DANCE_DOUBLE(KC_PAST,    KC_PSLS),
-    [TD_PASTE_COPY] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_V), LCTL(KC_C))
-};
-
-// Custom shift implementation
-const custom_shift_key_t custom_shift_keys[] = {
-    {KC_LNG1, KC_LNG2},
-    {KC_LT, KC_COMM},
-    {KC_GT, KC_DOT},
-    {KC_LCBR, KC_LBRC},
-    {KC_RCBR, KC_RBRC}
-};
-
-uint8_t NUM_CUSTOM_SHIFT_KEYS = sizeof(custom_shift_keys) / sizeof(custom_shift_key_t);
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record)
-{
-    if ( !process_custom_shift_keys(keycode, record)) { return false; }
-
-    return true;
-}
-
-// Keymaps
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* ALPHA
- * ,-----------------------------------------------------------------------------------.
- * |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Esc |KOR/HN|  Win |  Alt |LEFTFN|    Space    |RFN/- |   =  |Delete|   \  | Enter|
- * `-----------------------------------------------------------------------------------'
- */
-[_ALPHA] = LAYOUT_planck_mit(
-    KC_TAB,              KC_Q,    KC_W,    KC_E,    KC_R,   KC_T, KC_Y, KC_U,                 KC_I,    KC_O,    KC_P,    KC_BSPC,
-    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, KC_ENT,
-    LT(NUMPAD, KC_ESC),  KC_LNG1, KC_LGUI, KC_LALT, LEFTFN,   KC_SPC,   LT(RIGHTFN, KC_MINS), KC_EQL,  KC_DEL,  KC_BSLS, KC_PENT
-),
-
-/* LEFTFN
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Left | Down | Up   |Right |Ctrl+/|PrntSc|   {  |   }  |   )  |   :  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   [  |  ]   | Home | End  | PGUP | PGDN |   (  |   <  |   >  |   /  |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  RGB | Caps | Ins  | Alt  | Trns |    Space    |   _  |   +  |Delete|   |  | Enter|
- * `-----------------------------------------------------------------------------------'
- */
-[_LEFTFN] = LAYOUT_planck_mit(
-    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_LCTL, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, LCTL(KC_SLSH), KC_PSCR, KC_LCBR, KC_RCBR, KC_RPRN, KC_COLN, KC_DQUO,
-    KC_LSFT, KC_LBRC, KC_RBRC, KC_HOME, KC_END,   KC_PGUP,       KC_PGDN, KC_LPRN, KC_LT,   KC_GT,   KC_SLSH, KC_ENT,
-    RGB,     KC_CAPS, KC_INS,  KC_LALT, KC_TRNS,        KC_SPC,           KC_UNDS, KC_PLUS, KC_DEL,  KC_PIPE, KC_PENT
-),
-
-/* NUMPAD
- * ,-----------------------------------------------------------------------------------.
- * | *or/ |   7  |   8  |   9  | NumLk|      |      |      |      |      |      | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Alt |   4  |   5  |   6  |Return|      |      |      |      |      | Shift|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   -  |   1  |   2  |   3  | Bksp |      |      |      |   ,  |   .  | Ctrl |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Trns |   ,  |   +  |   .  |   0  |    Space    | MOBA | FPS1 | FPS2 | STRAT|ARROWS|
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_planck_mit(
-    TD(TD_PAST_PSLS), KC_P7,   KC_P8,   KC_P9,   KC_NUM,  KC_NO,     KC_NO, KC_NO,  KC_NO,   KC_NO,     KC_NO,     KC_BSPC,
-    KC_LALT,          KC_P4,   KC_P5,   KC_P6,   KC_ENT,  KC_NO,     KC_NO, KC_NO,  KC_NO,   KC_NO,     KC_LSFT,   KC_NO,
-    KC_PMNS,          KC_P1,   KC_P2,   KC_P3,   KC_BSPC, KC_NO,     KC_NO, KC_NO,  KC_COMM, KC_DOT,    KC_LCTL,   KC_ENT,
-    KC_TRNS,          KC_COMM, KC_PPLS, KC_PDOT, KC_P0,       KC_SPC,       MOBA, FPS1,    FPS2, STRAT, ARROWS
-),
-
-/* RIGHTFN
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |  F12 |  F11 |  F10 |  F9  | Pause|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      |      |      |      |      |  F8  |  F7  |  F6  |  F5  |Scllck|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |  F4  |  F3  |  F2  |  F1  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |  Alt |      |    Space    | Trns |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RIGHTFN] = LAYOUT_planck_mit(
-    KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F12,  KC_F11, KC_F10, KC_F9, KC_PAUS,
-    KC_LCTL, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F8,   KC_F7,  KC_F6,  KC_F5, KC_SCRL,
-    KC_LSFT, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F4,   KC_F3,  KC_F2,  KC_F1, KC_NO,
-    KC_NO,   KC_NO, KC_NO, KC_LALT, KC_NO,    KC_SPC,    KC_TRNS, KC_NO,  KC_NO,  KC_NO, KC_NO
-),
-
-/* MOBA
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   5  |   Y  |      |      |   O  |   P  | ESC  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |      |      |      |      |   L  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   6  |   4  |   1  |   B  |      |      |      |      |      |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   3  |   X  |   C  |  Alt |   2  |    Space    |      |      |      |      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_MOBA] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q, KC_W, KC_E,    KC_R, KC_5,  KC_Y,  KC_NO, KC_NO, KC_O,  KC_P,  KC_ESC,
-    KC_LCTL, KC_A, KC_S, KC_D,    KC_F, KC_NO, KC_NO, KC_NO, KC_NO, KC_L,  KC_NO, KC_NO,
-    KC_LSFT, KC_Z, KC_6, KC_4,    KC_1, KC_B,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ENT,
-    KC_3,    KC_X, KC_C, KC_LALT, KC_2,    KC_SPC,    KC_NO, KC_NO, KC_NO, KC_NO, ALPHA
-),
-
-/* FPS1
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | ESC  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   1  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |      |  F7  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   3  |   X  |   C  |   V  |   B  |   M  |   ,  |   .  |      |  F9  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   5  |   4  |  Alt |   2  |    Space    |   6  |   8  |  7   |  9   | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_FPS1] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q, KC_W, KC_E,    KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,  KC_ESC,
-    KC_1,    KC_A, KC_S, KC_D,    KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_NO, KC_F7,
-    KC_LSFT, KC_Z, KC_3, KC_X,    KC_C, KC_V, KC_B, KC_M, KC_COMM, KC_DOT, KC_NO, KC_F9,
-    KC_LCTL, KC_5, KC_4, KC_LALT, KC_2,   KC_SPC,   KC_6, KC_8,    KC_7,   KC_9,  ALPHA
-),
-
-/* FPS2
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | ESC  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   1  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      | Alt  |   2  |    Space    | Bksp |      |      |      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_FPS2] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q,  KC_W,  KC_E,    KC_R, KC_T, KC_Y, KC_U,    KC_I,    KC_O,   KC_P,    KC_ESC,
-    KC_1,    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_NO, KC_NO, KC_LALT, KC_2,   KC_SPC,   KC_BSPC, KC_NO,   KC_NO,  KC_NO,   ALPHA
-),
-
-/* STRAT
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |      |      | Alt  |   F1 |    Space    |  F10 | Pause|Delete|      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_STRAT] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q,   KC_W,  KC_E,    KC_R,  KC_T, KC_Y, KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC,
-    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, KC_ENT,
-    KC_ESC,  KC_NO,  KC_NO, KC_LALT, KC_F1,   KC_SPC,   KC_F10, KC_PAUS, KC_DEL, KC_NO,   ALPHA
-),
-
-/* ARROWS
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |  Up  |   E  |   R  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   A  | Left | Down | Right|   F  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      |  Alt |   S  |    Space    |      |      |      |      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_ARROWS] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q,    KC_UP,   KC_E,     KC_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_A,    KC_LEFT, KC_DOWN, KC_RIGHT, KC_F, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_LCTL, KC_NO,   KC_NO,   KC_LALT,  KC_S,    KC_SPC,    KC_NO, KC_NO, KC_NO, KC_NO, ALPHA
-),
-
-/* CLEAN
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_CLEAN] = LAYOUT_planck_mit(
-    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, 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, KC_NO, KC_NO, KC_NO,     KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO, ALPHA
-),
-
-/* RGB (LEFTFN + RGB)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * | Mute | Reset| MS_U | BR B | BR F |      |      | MOD R| MOD B| FX+  |      |CLEAN |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | MS_L | MS_D | MS_R |Return|PST/CO|      | MOD P| MOD S| FX-  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| MCK  | RCK  | LCK  | Bksp |      |      | BRT+ | MOD+ | SAT+ | HUE+ | MS 0 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Trns | VOL- | VOL+ | WL U | WL D |    Space    | BRT- | MOD- | SAT- | HUE- |RGBTGL|
- * `-----------------------------------------------------------------------------------'
- */
-[_RGB] = LAYOUT_planck_mit(
-    KC_MUTE, QK_BOOT, KC_MS_U, KC_WBAK, KC_WFWD, KC_NO,             KC_NO, RGB_M_R, RGB_M_B,  RGB_SPI, KC_NO,   CLEAN,
-    KC_LCTL, KC_MS_L, KC_MS_D, KC_MS_R, KC_ENT,  TD(TD_PASTE_COPY), KC_NO, RGB_M_P, RGB_M_SW, RGB_SPD, KC_NO,   KC_NO,
-    KC_LSFT, KC_BTN3, KC_BTN2, KC_BTN1, KC_BSPC, KC_NO,             KC_NO, RGB_VAI, RGB_MOD,  RGB_SAI, RGB_HUI, KC_ACL0,
-    KC_TRNS, KC_VOLD, KC_VOLU, KC_WH_U, KC_WH_D,           KC_SPC,         RGB_VAD, RGB_RMOD, RGB_SAD, RGB_HUD, RGB_TOG
-)
-
-};
-
-/*
-// 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,   42, 43, 44, 45, 46}
-*/
-bool rgb_matrix_indicators_user(void) {
-    uint8_t red[3] = {22, 2, 0};
-    uint8_t yellow[3] = {20, 22, 0};
-    uint8_t blue[3] = {0, 6, 20};
-    uint8_t green[3] = {14, 22, 0};
-    uint8_t purple[3] = {6, 0, 22};
-    uint8_t white[3] = {255, 255, 255};
-
-    switch (get_highest_layer(layer_state)) {
-        case _ALPHA:
-            break;
-        case _LEFTFN:
-            break;
-        case _RIGHTFN:
-            break;
-        case _NUMPAD:
-            break;
-        case _MOBA:
-            rgb_matrix_set_color(16, red[0],    red[1],    red[2]);
-            rgb_matrix_set_color(15, yellow[0], yellow[1], yellow[2]);
-            rgb_matrix_set_color(29, blue[0],   blue[1],   blue[2]);
-            rgb_matrix_set_color(10, purple[0], purple[1], purple[2]);
-            break;
-        case _FPS1:
-            rgb_matrix_set_color(43, green[0],  green[1],  green[2]);
-            break;
-        case _FPS2:
-            rgb_matrix_set_color(44, green[0],  green[1],  green[2]);
-            break;
-        case _STRAT:
-            rgb_matrix_set_color(45, green[0],  green[1],  green[2]);
-            break;
-        case _ARROWS:
-            rgb_matrix_set_color(46, green[0],  green[1],  green[2]);
-            break;
-        case _CLEAN:
-            rgb_matrix_set_color_all(white[0],  white[1],  white[2]);
-            break;
-        case _RGB:
-            rgb_matrix_set_color(1, blue[0], blue[1], blue[2]);
-            break;
-    }
-
-    led_t led_state = host_keyboard_led_state();
-    //Capslock led
-    if (led_state.caps_lock) {
-        rgb_matrix_set_color(0,  green[0], green[1], green[2]);
-    }
-    //Numlock led
-    if (led_state.num_lock) {
-    } else {
-        rgb_matrix_set_color(11, green[0], green[1], green[2]);
-    }
-    //Scroll lock led
-    if (led_state.scroll_lock) {
-        rgb_matrix_set_color(23, green[0], green[1], green[2]);
-    }
-    return false;
-}
-
-// Turn of RGB Matrix Effect
-void keyboard_post_init_user(void) {
-    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-    rgb_matrix_sethsv_noeeprom(HSV_OFF);
-}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
deleted file mode 100644
index 72764d14086..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Dan's KPrepublic BM40 Keymap
-
->This is my personal keymap with an LED indicator support for num lock, caps lock and scroll lock.
-
-![](https://i.imgur.com/2yclc1B.jpg)
-> * Case: Poseidon PSD40 Case
-> * Plate: Brass
-> * Keycaps: WOB ABS Cherry Profile
-> * Switches: Gazzew Boba U4t (62g 2 stage long spring)
-
-<br />
-
-### BM40 LED INDEX
-**_Numlock ( 11 ) Capslock ( 0 or 12 ) Scroll lock ( 23 )_**
-
-|         |  _A_ |  _B_ |  _C_ |  _D_ |  _E_ |  _F_ |  _G_ |  _H_ |  _I_ |  _J_ |  _K_ |  _L_ |
-|---------|---:|---:|---:|---:|---:|---:|---:|---:|---:|---:|---:|---:|
-| **_1_** |  0 |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 | 10 | 11 |
-| **_2_** | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 |
-| **_3_** | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 |
-| **_4_** | &nbsp;&nbsp;&nbsp;36 | &nbsp;&nbsp;&nbsp;37 | &nbsp;&nbsp;&nbsp;38 | &nbsp;&nbsp;&nbsp;&nbsp;39 | &nbsp;&nbsp;&nbsp;&nbsp;40 | &nbsp;&nbsp;&nbsp;41 | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| &nbsp;&nbsp;&nbsp;42 | &nbsp;&nbsp;&nbsp;43 | &nbsp;&nbsp;&nbsp;44 | &nbsp;&nbsp;&nbsp;45 | &nbsp;&nbsp;&nbsp;46 |
-
-<br />
-
-## LED INDICATOR EXAMPLES
-![](https://i.imgur.com/qpkRNio.jpg)
-![](https://i.imgur.com/GfG252J.jpg)
-> * Case: SM Keyboards Planck/Niu Mini Acrylic Case
-> * Plate: Acrylic
-> * Keycaps: Drop + biip MT3 Extended 2048 Katakana
-> * Switches: Everglide Aqua King (62g 2 stage long spring)
-
-<br />
-
-## KEYMAP LAYOUT EXAMPLES
-### ALPHA
-
-|         | _A_ | _B_ | _C_ | _D_ | _E_ | _F_ | _G_ | _H_ | _I_ | _J_ | _K_ | _L_ |
-|---------|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|
-| **_1_** | TAB |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | BSP |
-| **_2_** | CTL |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |
-| **_3_** | SFT |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RET |
-| **_4_** | &nbsp;Esc | KOR | WIN | &nbsp;&nbsp;ALT | &nbsp;&nbsp;&nbsp;FN | &nbsp;SPC | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- | &nbsp;&nbsp;&nbsp;&nbsp;= | DEL | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\\ | ENT |
->This is a base layer for typing.
-
-<br />
-
-### LEFTFN MO(FN)
-
-|         | _A_ | _B_ | _C_ | _D_ | _E_ | _F_ | _G_ | _H_ | _I_ | _J_ | _K_ | _L_ |
-|---------|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|
-| **_1_** |  \` |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | BSP |
-| **_2_** | CTL | LFT | DN  | UP  | RHT | C+/ | PRN |  [  |  ]  |  )  |  :  |  "  |
-| **_3_** | SFT |  [  | ]&nbsp; | HOM | END | PGU | PGD |  (  |  ,  |  .  |  /  | RET |
-| **_4_** | RGB | CAP | INS | ALT | TRN | &nbsp;SPC || &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_ | &nbsp;&nbsp;&nbsp;&nbsp;+ | &nbsp;DEL | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\| | ENT |
->This is the layer dedicated to number, symbol and navigation keys. ie) arrow keys
-
-<br />
-
-### RIGHTFN MO(-)
-
-|         | _A_ | _B_ | _C_ | _D_ | _E_ | _F_ | _G_ | _H_ | _I_ | _J_ | _K_ | _L_ |
-|---------|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|
-| **_1_** |     |     |     |     |     |     |     | F12 | F11 | F10 |  F9 | PAU |
-| **_2_** | CTL |     |     |     |     |     |     | F8  | F7  | F6  |  F5 | SCL |
-| **_3_** | SFT |     |     |     |     |     |     | F4  | F3  | F2  |  F1 |     |
-| **_4_** | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;ALT&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;SPC | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;TRN | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|
->This layer contains function rows.
-
-<br />
-
-### NUMPAD MO(Esc)
-
-|         | _A_ | _B_ | _C_ | _D_ | _E_ | _F_ | _G_ | _H_ | _I_ | _J_ | _K_ | _L_ |
-|---------|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|
-| **_1_** | *or/|  7  |  8  |  9  | NUM |     |     |     |     |     |     | BSP |
-| **_2_** | ALT |  4  |  5  |  6  | RET |     |     |     |     |     |     |     |
-| **_3_** |  -  |  1  |  2  |  3  | BSP |     |     |     |     |     |     | RET |
-| **_4_** | TRN | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;, | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+ | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;. | &nbsp;&nbsp;&nbsp;0 | SPC | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;LY1 | &nbsp;LY2 | &nbsp;LY3 | &nbsp;LY4 | &nbsp;LY5 |
->This layer is the numpad.
-<br />
-
-There are other dedicated layers for gaming that are not included here.  
-If you are interested, check out keymap.c!  
-
-<br />
-
-## PHOTOS
-
-![](https://imgur.com/ABblRwp.jpg)
-> * Case: SM Keyboards Planck/Niu Mini Acrylic Case
-> * Plate: Acrylic
-> * Keycaps: Rama Works GRID Set A Keycaps ( Kuros )
-> * Switches: Thic Thock Marshmallow Linear Switch ( 55g )
-
-<br />
-
-![](https://i.imgur.com/imqhjZW.jpg)
-> * Case: JJ40 Aluminium Acclive Case with Acrylic Diffuser
-> * Keycaps: YMDK DSA Keycaps
-> * Artisan: Rodríguez Cap by Polykeys
-
-<br />
-
-<div style="text-align: right">- END -</div>
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk
deleted file mode 100644
index 4b8ec33fa00..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TAP_DANCE_ENABLE = yes
-SRC += features/custom_shift_keys.c
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/config.h
deleted file mode 100644
index 051ee8a8d14..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 Sinan Okman (@simchee)
- *
- *  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 <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define NO_MUSIC_MODE
-#define AUDIO_CLICKY
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/keymap.c
deleted file mode 100755
index 04f166cff6e..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2022 Sinan Okman (@simchee)
- *
- *  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 <https://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-	QWERTZ,
-	LOWER,
-	RAISE,
-	FN1,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[QWERTZ] = LAYOUT_planck_mit
-	(
-	 KC_TAB,		KC_Q,				KC_W,				KC_E,				KC_R,				KC_T,				KC_Z,				KC_U,				KC_I,				KC_O,				KC_P,				KC_BSPC,
-	 MO(FN1),		KC_A,				KC_S,				KC_D,				KC_F,				KC_G,				KC_H,				KC_J,				KC_K,				KC_L,				KC_SCLN,		KC_SLSH,
-	 KC_LSFT,		KC_Y,				KC_X,				KC_C,				KC_V,				KC_B,				KC_N,				KC_M,				KC_COMM,		KC_DOT,			KC_UP,			KC_ENT,
-	 KC_ESC,		KC_LGUI,		KC_LCTL,		KC_LALT,		MO(LOWER),				KC_SPC,						MO(RAISE),	KC_ALGR,		KC_LEFT,		KC_DOWN,		KC_RIGHT
-	 ),
-
-	[LOWER] = LAYOUT_planck_mit
-	(
-	 KC_TAB,		KC_PGUP,		KC_UP,			KC_PGDN,		KC_HOME,		_______,		_______,		KC_7,				KC_8,				KC_9,				KC_EQL,			KC_BSPC,
-	 MO(FN1),		KC_LEFT,		KC_DOWN,		KC_RIGHT,		KC_END,			_______,		KC_NUHS,		KC_4,				KC_5,				KC_6,				KC_ASTR,		KC_SLSH,
-	 KC_LSFT,		KC_MUTE,		KC_VOLD,		KC_VOLU,		KC_MPLY,		KC_MPRV,		KC_MNXT,		KC_1,				KC_2,				KC_3,				KC_PLUS,		KC_ENTER,
-	 KC_ESC,		RGB_TOG,		KC_LCTL,		KC_LALT,		MO(LOWER),				KC_SPC,						KC_COMM,		KC_0,				KC_DOT,			KC_MINS,		_______
-	 ),
-
-	[RAISE] = LAYOUT_planck_mit
-	(
-	 KC_CIRC,		KC_EXLM,		KC_AT,			_______,		KC_DLR,			KC_PERC,		KC_AMPR,		KC_ASTR,		KC_LPRN,		KC_RPRN,		KC_QUES,		KC_TILD,
-	 MO(FN1),		_______,		_______,		_______,		_______,		_______,		_______,		KC_GRV,			KC_LBRC,		KC_RBRC,		KC_QUOT,		KC_BSLS,
-	 KC_LSFT,		KC_MINS,		_______,		_______,		_______,		_______,		_______,		_______,		KC_LABK,		KC_RABK,		KC_EQL,			KC_HASH,
-	 _______,		_______,		_______,		_______,		MO(LOWER),				KC_SPC, 					MO(RAISE),	KC_ALGR,		_______,		_______,		_______
-	 ),
-	
-	[FN1] = LAYOUT_planck_mit
-	(
-	 KC_F12,		KC_F1,			KC_F2,			KC_F3,			KC_F4,			KC_F5,			KC_F6,			KC_F7,			KC_F8,			KC_F9,			KC_F10,			KC_DEL,
-	 MO(FN1),		KC_F11,			_______,		_______,		_______,		_______,		KC_HOME,		KC_PGDN,		KC_PGUP,		KC_END,			_______,		_______,
-	 KC_LSFT,		KC_CAPS,		_______,		_______,		_______,		_______,		KC_LEFT,		KC_DOWN,		KC_UP,			KC_RIGHT,		_______,		KC_APP,
-	 QK_BOOT,		_______,		_______,		_______,		MO(LOWER),				KC_SPC,							KC_BSPC,	_______,		_______,		KC_PSCR,		KC_INS
-	 )
-
-};
-
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/readme.md
deleted file mode 100644
index 1aaedbda524..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/readme.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Simchee's BM40HSRGB
-
-Simple Design for US ANSI international, German and Turkish letters are written using dead keys on Linux. Keyboard hasn't been tested on Windows. 
-
-# Flashing
-
-```bash
-qmk flash -kb kprepublic/bm40hsrgb -km simchee -bl dfu
-```
-
-# Layout
-## QWERTZ
-
-Changes from standard ANSI keyboard for better ergonomic: switch ctrl and GUI (Windows) keys, escape at left bottom, tab on left top. 
-
-```
-  .-----------------------------------------------------------------------------------------------.
-  |  Tab  |   Q   |   W   |   E   |   R   |   T   |   Z   |   U   |   I   |   O   |   P   | Bkspc |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Fn1  |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   ;   |   /   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  | LShift|   Y   |   X   |   C   |   V   |   B   |   N   |   M   |   ,   |   .   |  AUp  | Enter |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Esc  |  GUI  | LCtrl | LAlt  | Lower |     Space     | Raise | AltGr | ALeft | ADown | ARight|
-  °-----------------------------------------------------------------------------------------------°
-```
-
-## Lower
-
-Lower layout is mainly for numpad on the right side with navigation keys for lazy left handed navigation. Left side of Lower also provides media and RGB control.
-
-```
-  .-----------------------------------------------------------------------------------------------.
-  |  TAB  |  PUp  |  Up   | PDow  | Home  |  F5   |   ^   |  7(/) |  8(() |  9()) |  0(=) | Bkspc |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Fn1  |  Left |  Down | Right |  End  |       |   #   |  4($) |  5(%) |  6(&) |   *   |   /   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  | Shift |  Mute |  VUp  |  VDo  |  PP   |  Prev | Next  |  1(!) |  2(") |  3(§) |   +   | Enter |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  ESC  |  RGB  | LCtrl | LAlt  | Lower |     Space     |   ,   |  0(=) |   .   |  -(_) |       |
-  °-----------------------------------------------------------------------------------------------°
-```
-
-## Raise
-
-Raise is used for non-alphanumerical chars.
-
-```
-  .-----------------------------------------------------------------------------------------------.
-  |   ^   |   !   |   @   |       |   $   |   %   |   &   |   *   |   (   |    )  |   ?   |   ~   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Fn1  |       |       |       |       |       |       |   ´   |  [({) |  ](}) |   '   |  /(|) |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |       |   -   |       |       |       |       |       |       |   <   |   >   |  =(+) |   #   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |       |       |       |       | Lower |     Space     | Raise | AltGr |       |       |       |
-  °-----------------------------------------------------------------------------------------------°
-```
-
-## Fn1
-
-Fn1 provides function keys, as well as Vim-style navigation on the right side for when using the keyboard with both hands. 
-
-```
-  .-----------------------------------------------------------------------------------------------.
-  |  F12  |  F1   |  F2   |  F3   |  F4   |  F5   |  F6   |  F7   |  F8   |  F9   |  F10  |  Del  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Fn1  |  F11  |       |       |       |       | Home  | PDown |  PUp  |  End  |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  | LShift|  Caps |       |       |       |       | ALeft | ADown |  AUp  | ARight|       | MRight|
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |QC_MAKE|       |       |       | Lower |     Space     | Bkspc |       |       | PrScr |  Ins  |
-  °-----------------------------------------------------------------------------------------------°
-```
-
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/rules.mk
deleted file mode 100644
index 039f07c8e35..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-UNICODE_ENABLE = yes
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/skewwhiffy/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/skewwhiffy/keymap.c
deleted file mode 100644
index 68023a2d0ae..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/skewwhiffy/keymap.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Copyright 2023 skewwhiffy
- *
- * 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_uk.h"
-
-// Layer shorthand
-enum Layers {
-  cm, // colemak
-  nbl, // numbers left
-  nbr, // numbers right
-  syl, // symbols left
-  syr, // symbols right
-  nal, // navigation left
-  nar // navigation right
-};
-
-// Layer buttons
-#define _Z_SFT SFT_T(UK_Z)
-#define _SLSH SFT_T(UK_SLSH)
-
-#define _X_NB LT(nbl, UK_X)
-#define _DOT_NB LT(nbr, UK_DOT)
-#define __NBL LT(nbl, _______)
-#define __NBR LT(nbr, _______)
-
-#define _C_SY LT(syl, UK_C)
-#define _COM_SY LT(syr, UK_COMM)
-#define __SYL LT(syl, _______)
-#define __SYR LT(syr, _______)
-
-#define _V_NAL LT(nal, UK_V)
-#define _M_NAR LT(nar, UK_M)
-#define __NAL LT(nal, _______)
-#define __NAR LT(nar, _______)
-
-// Custom hotkeys
-#define _TERM LCTL(UK_QUOT) // Hotkey for terminal
-#define _S_TAB S(KC_TAB)
-#define _C_LEFT LCTL(KC_LEFT)
-#define _C_RGHT LCTL(KC_RGHT)
-#define _A_LEFT LALT(KC_LEFT)
-#define _A_RGHT LALT(KC_RGHT)
-#define _VIM_ESC LCTL(KC_LBRC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * .-----------------------------------------------------------------------------------------------------.
- * | Q      | W      | F      | P      | G      |     |     | J      | L      | U      | Y      | ;      |
- * |-----------------------------------------------------------------------------------------------------|
- * | A      | R      | S      | T      | D      |     |     | H      | N      | E      | I      | O      |
- * |-----------------------------------------------------------------------------------------------------|
- * | Z      | X      | C      | V      | B      | DEL | DEL | K      | M      | ,      | .      | /      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |     |     |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |-----------------------------------------------------------------------------------------------------|
- * | LSHIFT | LCTRL  | LALT   | LGUI   | SPACE  |   ENTER   | BKSPC  | RGUI   | RALT   | RCTRL  | RSHIFT |
- * .-----------------------------------------------------------------------------------------------------.
- */
-  [cm] = LAYOUT_planck_mit(
-    UK_Q,    UK_W,    UK_F,    UK_P,    UK_G, _______, _______, UK_J,    UK_L,    UK_U,    UK_Y,    UK_SCLN,
-    UK_A,    UK_R,    UK_S,    UK_T,    UK_D, _______, _______, UK_H,    UK_N,    UK_E,    UK_I,    UK_O,
-    _Z_SFT,  _X_NB,   _C_SY,   _V_NAL,  UK_B, KC_DEL,  KC_DEL,  UK_K,    _M_NAR,  _COM_SY, _DOT_NB, _SLSH,
-    KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,     KC_ENT,     KC_BSPC, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
-  ),
-
-/* Numbers _NB
- * .-----------------------------------------------------------------------------------------------------------.
- * |        | F7     | F8     | F9     | F10    |        |        |        | 7      | 8      | 9      |        |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | F4     | F5     | F6     | F11    |        |        |        | 4      | 5      | 6      |        |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        | F1     | F2     | F3     | F12    |        |        | 0      | 1      | 2      | 3      | .      |
- * |-----------------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
-  [nbl] = LAYOUT_planck_mit(
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, KC_7,    KC_8,    KC_9,    _______,
-    _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,  _______, _______, _______, KC_4,    KC_5,    KC_6,    _______,
-    _______, __NBL,   KC_F2,   KC_F3,   KC_F12,  _______, _______, KC_0,    KC_1,    KC_2,    KC_3,    KC_DOT,
-    _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______
-  ),
-  [nbr] = LAYOUT_planck_mit(
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, KC_7,    KC_8,    KC_9,    _______,
-    _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,  _______, _______, _______, KC_4,    KC_5,    KC_6,    _______,
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,  _______, _______, KC_0,    KC_1,    KC_2,    __NBR,   KC_DOT,
-    _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______
-  ),
-
-/* Symbols _SY
- * .-----------------------------------------------------------------------------------------------------------.
- * | !      | £      | _      | -      | ~      |        |        | \      | {      | }      | /      | #      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | $      | %      | +      | =      |        |        |        | "      | (      | )      | '      | @      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | ^      | &      | *      | |      |        |        |        | <      | [      | ]      | >      | `      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
-  [syl] = LAYOUT_planck_mit(
-    UK_EXLM, UK_PND,  UK_UNDS, UK_MINS, UK_TILD, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH,
-    UK_DLR,  UK_PERC, UK_PLUS, UK_EQL,  _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT,
-    UK_CIRC, UK_AMPR, __SYL,   UK_PIPE, _______, _______, _______, UK_LABK, UK_LBRC, UK_RBRC, UK_RABK, UK_GRV,
-    _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______
-  ),
-  [syr] = LAYOUT_planck_mit(
-    UK_EXLM, UK_PND,  UK_UNDS, UK_MINS, UK_TILD, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH,
-    UK_DLR,  UK_PERC, UK_PLUS, UK_EQL,  _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT,
-    UK_CIRC, UK_AMPR, UK_ASTR, UK_PIPE, _______, _______, _______, UK_LABK, UK_LBRC, __SYR,   UK_RABK, UK_GRV,
-    _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______
- ),
-
-/*
- * Navigation
- * .----------------------------------------------------------------------------------------------------------------.
- * | Ctrl [ | Ctrl L | Up     | Ctrl R |        | RGB HUE | RGB ON/OFF |        | PtSn   | ScLk   | Pause  | ESC    |
- * +--------+--------+--------+--------+--------+---------+------------+--------+--------+--------+--------+--------|
- * | Tab    | Left   | Down   | Right  |        | RGB SAT |            |        | Insert | Home   | PgUp   | Term   |
- * +--------+--------+--------+--------+--------+---------+------------+--------+--------+--------+--------+--------|
- * | ShTab  | Alt L  |        | Alt R  |        | RGB VAL | RESET      |        | Delete | End    | PgDn   |        |
- * +--------+--------+--------+--------+--------+---------+------------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |     RGB MODE         |        |        |        |        |        |
- * '----------------------------------------------------------------------------------------------------------------'
- */
-  [nal] = LAYOUT_planck_mit(
-    _VIM_ESC,  _C_LEFT, KC_UP,   _C_RGHT, _______, RGB_HUI, RGB_TOG, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_ESC,
-    KC_TAB,    KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_SAI, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _TERM,
-    _S_TAB,    _A_LEFT, _______, __NAL,   _______, RGB_VAI, QK_BOOT, _______, KC_DEL,  KC_END,  KC_PGDN, _______,
-    _______,   _______, _______, _______, _______,       RGB_MOD,    _______, _______, _______, _______, _______
-  ),
-  [nar] = LAYOUT_planck_mit(
-    _VIM_ESC,  _C_LEFT, KC_UP,   _C_RGHT, _______, RGB_HUI, RGB_TOG, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_ESC,
-    KC_TAB,    KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_SAI, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _TERM,
-    _S_TAB,    _A_LEFT, _______, _A_RGHT, _______, RGB_VAI, QK_BOOT, _______, __NAR,   KC_END,  KC_PGDN, _______,
-    _______,   _______, _______, _______, _______,      RGB_MOD,     _______, _______, _______, _______, _______
-  ),
-};
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/skewwhiffy/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/skewwhiffy/readme.md
deleted file mode 100644
index c0349bd79b6..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/skewwhiffy/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Skewwhiffy keymap
-
-## Overview
-
-A small-form ergonomic Colemak-based multi-layered layout, optimized for software engineering. Programmed to emulate a standard UK ISO keyboard.
-
-Keyboard layout can be viewed [here](http://www.keyboard-layout-editor.com/#/gists/470f01e934c27d41491dea9ef5c6fde6)
-
-[![keyboard-layout.png](https://i.postimg.cc/BbDCYnzh/keyboard-layout.png)](https://postimg.cc/Lg9fh22f)
-
-## Default layer
-
-Colemak, with fingers right up to the edge of the keyboard. Layers and capital letters are accessed by holding down keys on the bottom row of letters (so, holding down Z will give you the capitals, holding down the X will give you the number layer).
-
-## Number layer
-
-Used to access numbers (on the right hand side of the keyboard) and function keys (on the left hand side of the keyboard). Hold down X or > to access.
-
-## Symbol layer
-
-Used to access symbols. Hold down C or < to access.
-
-## Navigation layer
-
-Used to access navigation and RGB control keys. Hold down V or M to access.
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/config.h b/keyboards/kprepublic/bm40hsrgb/rev1/config.h
index ac0261a608c..0ddf7838246 100755
--- a/keyboards/kprepublic/bm40hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/rev1/config.h
@@ -20,58 +20,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGB_MATRIX_LED_COUNT 53
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    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 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
-#    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
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/info.json b/keyboards/kprepublic/bm40hsrgb/rev1/info.json
index c0ba89dbabd..c50ac648d04 100644
--- a/keyboards/kprepublic/bm40hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/rev1/info.json
@@ -12,7 +12,54 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "rgblight": {
         "max_brightness": 180
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/config.h b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/config.h
deleted file mode 100644
index a669c31c247..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#pragma once
-/* Copyright 2021 Gabriel Bustamante Toledo
-  *
-  * 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/>.
-*/
-
-// default but used in macros
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
-
-// Auto Shift
-#define NO_AUTO_SHIFT_ALPHA
-#define AUTO_SHIFT_TIMEOUT TAPPING_TERM
-#define AUTO_SHIFT_NO_SETUP
-
-// Mouse key speed and acceleration.
-#undef MOUSEKEY_DELAY
-#define MOUSEKEY_DELAY          0
-#undef MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL       16
-#undef MOUSEKEY_WHEEL_DELAY
-#define MOUSEKEY_WHEEL_DELAY    0
-#undef MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_MAX_SPEED      6
-#undef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX    64
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#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 RGBLIGHT_LIMIT_VAL 10
-
-#ifdef RGB_MATRIX_ENABLE
-
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-
-#    undef RGB_MATRIX_DEFAULT_MODE
-
-#    define RGBLIGHT_HUE_STEP 20
-
-#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/keymap.c b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/keymap.c
deleted file mode 100755
index a08fd535d34..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/keymap.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright 2021 Gabriel Bustamante Toledo
-  *
-  * 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 { BASE1, BASE2, MEDIA, NAV, MOUSE, SYM, NUM, FUN };
-
-enum {
-    TD_MEDIA, TD_SCREEN,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_MEDIA] = ACTION_TAP_DANCE_DOUBLE( KC_MPLY , KC_MNXT ),
-    [TD_SCREEN] = ACTION_TAP_DANCE_DOUBLE( (G(S(KC_S))) , S(C(KC_4)) ),
-};
-
-void set_color(int r, int g, int b){
-	rgb_matrix_set_color(5,  r, g, b);
-	rgb_matrix_set_color(6,  r, g, b);
-	rgb_matrix_set_color(17, r, g, b);
-	rgb_matrix_set_color(18, r, g, b);
-	rgb_matrix_set_color(29, r, g, b);
-	rgb_matrix_set_color(30, r, g, b);
-	rgb_matrix_set_color(41, r, g, b);
-}
-
-bool rgb_matrix_indicators_user(void) {
-
-	switch (get_highest_layer(layer_state)) {
-		case BASE2:
-			set_color(128, 64, 0);
-			break;
-		case MEDIA:
-			set_color(50, 10, 20);
-			break;
-		case NAV:
-			set_color(0, 40, 50);
-			break;
-		case MOUSE:
-			set_color(0, 0, 50);
-			break;
-		case SYM:
-			set_color(0, 50, 1.9);
-			break;
-		case NUM:
-			set_color(10, 0, 50);
-			break;
-		case FUN:
-			set_color(50, 0, 0);
-			break;
-	}
-    return false;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[BASE1] = LAYOUT_planck_mit(
-		KC_Q,           KC_W,          KC_E,               KC_R,             KC_T,               TG(BASE2),  KC_NO,  KC_Y,             KC_U,              KC_I,             KC_O,              KC_P,
-		KC_A,           KC_S,          KC_D,               KC_F,             KC_G,               KC_NO,      KC_NO,  KC_H,             KC_J,              KC_K,             KC_L,              KC_QUOT,
-		KC_Z,           KC_X,          KC_C,               KC_V,             KC_B,               KC_NO,      KC_NO,  KC_N,             KC_M,              KC_COMM,          KC_DOT,            KC_SLSH,
-		TD(TD_SCREEN),  TD(TD_MEDIA),  LT(MEDIA, KC_ESC),  LT(NAV, KC_SPC),  LT(MOUSE, KC_TAB),         KC_NO,       LT(SYM, KC_ENT),  LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),  C(G(KC_LEFT)),     C(G(KC_RIGHT))
-	),
-
-	[BASE2] = LAYOUT_planck_mit(
-		KC_Q,           KC_W,          KC_E,               KC_R,             KC_T,               TG(BASE2),  KC_NO,  KC_Y,             KC_U,              KC_I,             KC_O,            KC_P,
-		LGUI_T(KC_A),   LALT_T(KC_S),  LCTL_T(KC_D),       LSFT_T(KC_F),     KC_G,               KC_NO,      KC_NO,  KC_H,             LSFT_T(KC_J),      LCTL_T(KC_K),     LALT_T(KC_L),    LGUI_T(KC_QUOT),
-		KC_Z,           KC_X,          KC_C,               KC_V,             KC_B,               KC_NO,      KC_NO,  KC_N,             KC_M,              KC_COMM,          KC_DOT,          KC_SLSH,
-		TD(TD_SCREEN),  TD(TD_MEDIA),  LT(MEDIA, KC_ESC),  LT(NAV, KC_SPC),  LT(MOUSE, KC_TAB),        KC_NO,        LT(SYM, KC_ENT),  LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),  KC_NO,           KC_NO
-	),
-
-	[MEDIA] = LAYOUT_planck_mit(
-		KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,    KC_NO,    RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,
-		KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LSFT,  KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MNXT,
-		KC_NO,    KC_ALGR,  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_MSTP,  KC_MPLY,  KC_MUTE,  KC_NO,    KC_NO
-	),
-
-	[NAV] = LAYOUT_planck_mit(
-		KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,    KC_NO,    C(KC_S),  C(KC_V),  C(KC_C),  C(KC_X),  C(KC_Z),
-		KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LSFT,  KC_NO,   KC_NO,    KC_NO,    KC_CAPS,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,
-		KC_NO,    KC_ALGR,  KC_NO,    KC_NO,    KC_NO,   KC_NO,    KC_NO,    KC_INS,   KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,
-		KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,        KC_NO,         KC_ENT,   KC_BSPC,  KC_DEL,   KC_NO,    KC_NO
-	),
-
-	[MOUSE] = LAYOUT_planck_mit(
-		KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,    KC_NO,    C(KC_S),  C(KC_V),  C(KC_C),  C(KC_X),  C(KC_Z),
-		KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LSFT,  KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,
-		KC_NO,    KC_ALGR,  KC_NO,    KC_NO,    KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,
-		KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,        KC_NO,         KC_BTN1,  KC_BTN3,  KC_BTN2,  KC_NO,    KC_NO
-	),
-
-	[SYM] = LAYOUT_planck_mit(
-		KC_LCBR,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RCBR,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_BSPC,
-		KC_COLN,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_PLUS,   KC_NO,    KC_NO,    KC_NO,    KC_LSFT,  KC_LCTL,  KC_LALT,  KC_LGUI,
-		KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_PIPE,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_ALGR,  KC_NO,
-		KC_NO,    KC_NO,    KC_LPRN,  KC_RPRN,  KC_UNDS,        KC_NO,         KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO
-	),
-
-	[NUM] = LAYOUT_planck_mit(
-		KC_LBRC,  KC_7,   KC_8,    KC_9,  KC_RBRC,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_BSPC,
-		KC_SCLN,  KC_4,   KC_5,    KC_6,  KC_EQL,    KC_NO,    KC_NO,    KC_NO,    KC_LSFT,  KC_LCTL,  KC_LALT,  KC_LGUI,
-		KC_GRV,   KC_1,   KC_2,    KC_3,  KC_BSLS,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_ALGR,  KC_NO,
-		KC_NO,    KC_NO,  KC_DOT,  KC_0,  KC_MINS,        KC_NO,         KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO
-	),
-
-	[FUN] = LAYOUT_planck_mit(
-		KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    QK_BOOT,
-		KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_SCRL,   KC_NO,    KC_NO,    KC_NO,    KC_LSFT,  KC_LCTL,  KC_LALT,  KC_LGUI,
-		KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_PAUS,   KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_ALGR,  KC_NO,
-		KC_NO,   KC_NO,   KC_APP,  KC_SPC,  KC_TAB,         KC_NO,         KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO
-	)
-
-};
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/readme.md b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/readme.md
deleted file mode 100644
index 7540bc56bf9..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/readme.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Gabustoledo
-
-### Compile
-
-- Compile:
-
-  `qmk compile -kb kprepublic/bm40hsrgb -km gabustoledo`
-
-### Flash
-
-- Flash:
-
-  `qmk flash -kb kprepublic/bm40hsrgb -km gabustoledo`
-
-# Layout
-
-## BASE
-
-![img](https://i.imgur.com/2H9WkM8.png)
-
-## Base 2
-
-![img](https://i.imgur.com/16Y7cN2.png)
-
-## MEDIA
-
-![img](https://i.imgur.com/CQH2Zo8.png)
-
-## NAVIGATION
-
-![img](https://i.imgur.com/lcdBhfG.png)
-
-## MOUSE
-
-![img](https://i.imgur.com/kAaxSkb.png)
-
-## SYMBOL
-
-![img](https://i.imgur.com/i3rZYdq.png)
-
-## NUMBER
-
-![img](https://i.imgur.com/ijb2Dd8.png)
-
-## FUNCTION
-
-![img](https://i.imgur.com/QMoLXsP.png)
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/rules.mk
deleted file mode 100644
index 6e27e2f5237..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/gabustoledo/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-AUTO_SHIFT_ENABLE = yes # Auto Shift
-TAP_DANCE_ENABLE = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/config.h b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/config.h
deleted file mode 100644
index 40ba18a2939..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/config.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// qmk flash -kb bm40hsrgb -km signynt
-
-/* Copyright 2021 Vincenzo Mitchell Barroso
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#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 RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGBLIGHT_LIMIT_VAL 10
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define TAPPING_TERM 200
-
-//--------------------------------------------------------------------------------------------------------
-
-//disable broken animations
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-//#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-//#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-//#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-//#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//#undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS  // DO NOT ENABLE
-//#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-//#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-//#undef ENABLE_RGB_MATRIX_SPLASH
-//#undef ENABLE_RGB_MATRIX_MULTISPLASH
-//#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-//#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#    undef RGB_MATRIX_DEFAULT_MODE
-
-#    define RGBLIGHT_HUE_STEP 20
-
-#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/keymap.c b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/keymap.c
deleted file mode 100644
index eb20a1a25b9..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/keymap.c
+++ /dev/null
@@ -1,242 +0,0 @@
-// qmk flash -kb bm40hsrgb -km signynt
-
-/* Copyright 2021 Vincenzo Mitchell Barroso
- *
- * 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
-
-// non-KC_ keycodes
-#define KC_RST QK_BOOT
-#define KC_TOG RGB_TOG
-#define KC_MOD RGB_MOD
-#define KC_HUI RGB_HUI
-#define KC_SAI RGB_SAI
-#define KC_VAI RGB_VAI
-
-//define layers
-enum layers {BASE, MEDR, NAVR, NSSL, NSL, FUNL, GAME, SECGAME};
-
-enum custom_keycodes {
-  CMD_TAB = SAFE_RANGE,
-};
-
-//cmd tab
-
-bool is_cmd_tab_active = false;
-uint16_t cmd_tab_timer = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case CMD_TAB:
-      if (record->event.pressed) {
-        if (!is_cmd_tab_active) {
-          is_cmd_tab_active = true;
-          register_code(KC_LCTL);
-        }
-        cmd_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-  }
-  return true;
-}
-
-void matrix_scan_user(void) {
-  if (is_cmd_tab_active) {
-    if (timer_elapsed(cmd_tab_timer) > 500) {
-      unregister_code(KC_LCTL);
-      is_cmd_tab_active = false;
-    }
-  }
-}
-
-//layer led colors
-
-bool rgb_matrix_indicators_user(void) {
-
-//game indicators
-
-if(IS_LAYER_ON(GAME)) {
-  rgb_matrix_set_color(11, 0, 40, 50);
-}
-
-if(IS_LAYER_ON(SECGAME)) {
-  rgb_matrix_set_color(11, 50, 0, 0);
-}
-
-//layer indicators
-
-if(IS_LAYER_ON(NAVR)) {
-  rgb_matrix_set_color(40, 0, 40, 50);
-
-  rgb_matrix_set_color(19, 0, 40, 50);
-  rgb_matrix_set_color(20, 0, 40, 50);
-  rgb_matrix_set_color(21, 0, 40, 50);
-  rgb_matrix_set_color(22, 0, 40, 50);
-}
-
-if(IS_LAYER_ON(MEDR)) {
-  rgb_matrix_set_color(39, 50, 10, 20);
-
-  rgb_matrix_set_color(19, 50, 10, 20);
-
-  rgb_matrix_set_color(22, 50, 10, 20);
-
-  rgb_matrix_set_color(42, 50, 10, 20);
-}
-
-if(IS_LAYER_ON(FUNL)) {
-  rgb_matrix_set_color(43, 50, 0, 0);
-
-  rgb_matrix_set_color(1, 50, 0, 0);
-  rgb_matrix_set_color(2, 50, 0, 0);
-  rgb_matrix_set_color(3, 50, 0, 0);
-  rgb_matrix_set_color(4, 50, 0, 0);
-
-  rgb_matrix_set_color(13, 50, 0, 0);
-  rgb_matrix_set_color(14, 50, 0, 0);
-  rgb_matrix_set_color(15, 50, 0, 0);
-  rgb_matrix_set_color(16, 50, 0, 0);
-
-  rgb_matrix_set_color(25, 50, 0, 0);
-  rgb_matrix_set_color(26, 50, 0, 0);
-  rgb_matrix_set_color(27, 50, 0, 0);
-  rgb_matrix_set_color(28, 50, 0, 0);
-}
-
-if(IS_LAYER_ON(NSL)) {
-  rgb_matrix_set_color(42, 10, 0, 50);
-
-  rgb_matrix_set_color(2, 10, 0, 50);
-  rgb_matrix_set_color(3, 10, 0, 50);
-  rgb_matrix_set_color(4, 10, 0, 50);
-
-  rgb_matrix_set_color(14, 10, 0, 50);
-  rgb_matrix_set_color(15, 10, 0, 50);
-  rgb_matrix_set_color(16, 10, 0, 50);
-
-  rgb_matrix_set_color(26, 10, 0, 50);
-  rgb_matrix_set_color(27, 10, 0, 50);
-  rgb_matrix_set_color(28, 10, 0, 50);
-
-  rgb_matrix_set_color(38, 10, 0, 50);
-  rgb_matrix_set_color(39, 10, 0, 50);
-  rgb_matrix_set_color(40, 10, 0, 50);
-}
-
-if(IS_LAYER_ON(NSSL)) {
-  rgb_matrix_set_color(41, 0, 50, 1.9);
-
-  rgb_matrix_set_color(1, 0, 50, 1.9);
-  rgb_matrix_set_color(2, 0, 50, 1.9);
-  rgb_matrix_set_color(3, 0, 50, 1.9);
-  rgb_matrix_set_color(4, 0, 50, 1.9);
-  rgb_matrix_set_color(5, 0, 50, 1.9);
-
-  rgb_matrix_set_color(13, 0, 50, 1.9);
-  rgb_matrix_set_color(14, 0, 50, 1.9);
-  rgb_matrix_set_color(15, 0, 50, 1.9);
-  rgb_matrix_set_color(16, 0, 50, 1.9);
-  rgb_matrix_set_color(17, 0, 50, 1.9);
-
-  rgb_matrix_set_color(25, 0, 50, 1.9);
-  rgb_matrix_set_color(26, 0, 50, 1.9);
-  rgb_matrix_set_color(27, 0, 50, 1.9);
-  rgb_matrix_set_color(28, 0, 50, 1.9);
-  rgb_matrix_set_color(29, 0, 50, 1.9);
-
-    return false;
-}
-
-//capslock leds
-
-if (host_keyboard_led_state().caps_lock) {
-    rgb_matrix_set_color_all(50, 15.6, 0);
-  }
-
-}
-
-//tap dance declarations
-enum {
-    TD_MEDIA, TD_SCREEN,
-};
-
-//tap dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_MEDIA] = ACTION_TAP_DANCE_DOUBLE( KC_MPLY , KC_MNXT ),
-    [TD_SCREEN] = ACTION_TAP_DANCE_DOUBLE( (G(S(KC_S))) , S(C(KC_4)) ),
-};
-
-#define KC_TD(TD_VARIABLE) TD(TD_VARIABLE)
-
-//--------------------------------------------------------------------------------------------------------
-
-//base
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_planck_mit(
-    KC_LALT,              KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              KC_LALT,
-    KC_LSFT,              KC_A,              KC_S,              KC_D,              KC_F,              KC_G,              KC_H,              KC_J,              KC_K,              KC_L,              KC_QUOT,           KC_LSFT,
-    KC_LCTL,              KC_Z,              KC_X,              KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           KC_DOT,            KC_SLSH,           KC_LCTL,
-    G(KC_TAB),            KC_TD(TD_SCREEN),  KC_ESC,            LT(MEDR, KC_TAB),  LT(NAVR, KC_SPC),      LT(NSSL, KC_ENT),                 LT(NSL, KC_BSPC),  LT(FUNL, KC_DEL),  KC_LGUI,           KC_TD(TD_MEDIA),     CMD_TAB
-  ),
-
-//layers
-  [NAVR] = LAYOUT_planck_mit(
-    KC_LALT,              KC_RST,            KC_NO,             KC_NO,              KC_NO,            KC_NO,             C(S(KC_Z)),        C(A(KC_LEFT)),     C(KC_X),           C(KC_C),           C(A(KC_RGHT)),     KC_LALT,
-    KC_LSFT,              G(S(C(KC_F1))),    G(S(C(KC_F3))),    G(S(C(KC_F4))),     G(S(C(KC_F2))),   KC_NO,             KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_LSFT,
-    KC_LCTL,              KC_NO,             KC_ALGR,           KC_NO,              G(S(C(KC_F5))),   KC_NO,             KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_LCTL,
-    TG(GAME),             KC_NO,             KC_NO,             KC_NO,              KC_NO,                     KC_ENT,                      KC_BSPC,           KC_DEL,            KC_NO,             C(G(KC_LEFT)),     C(G(KC_RIGHT))
-  ),
-  [MEDR] = LAYOUT_planck_mit(
-    KC_LALT,              KC_RST,            KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_TOG,            KC_MOD,            KC_HUI,            KC_SAI,            KC_VAI,            KC_LALT,
-    KC_LSFT,              KC_NO,             KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_NO,             KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           KC_LSFT,
-    KC_LCTL,              KC_NO,             KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_NO,             KC_F13,            KC_F14,            KC_F15,            RGB_VAI,           KC_LCTL,
-    KC_NO,                KC_NO,             KC_NO,             KC_NO,              KC_NO,                     KC_MSTP,                     KC_MPLY,           KC_MUTE,           KC_NO,             KC_NO,             KC_NO
-  ),
-  [FUNL] = LAYOUT_planck_mit(
-    KC_LALT,              KC_F12,            KC_F7,             KC_F8,              KC_F9,            KC_PSCR,           KC_F15,            KC_NO,             KC_NO,             KC_NO,             KC_RST,            KC_LALT,
-    KC_LSFT,              KC_F11,            KC_F4,             KC_F5,              KC_F6,            KC_SCRL,           KC_F14,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LSFT,
-    KC_LCTL,              KC_F10,            KC_F1,             KC_F2,              KC_F3,            KC_PAUS,           KC_F13,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LCTL,
-    KC_NO,                KC_NO,             KC_TAB,            KC_APP,             KC_SPC,                    KC_UNDS,                     KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_NO
-  ),
-  [NSL] = LAYOUT_planck_mit(
-    KC_LALT,              KC_LPRN,           KC_7,              KC_8,               KC_9,             KC_RPRN,           KC_LBRC,           KC_AMPR,           KC_ASTR,           KC_LCBR,           KC_RBRC,           KC_BSPC,
-    KC_LSFT,              KC_COLN,           KC_4,              KC_5,               KC_6,             KC_EQL,            KC_LCBR,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_RCBR,           KC_LSFT,
-    KC_LCTL,              KC_GRV,            KC_1,              KC_2,               KC_3,             KC_PLUS,           KC_TILD,           KC_EXLM,           KC_COMM,           KC_DOT,            KC_SLSH,           KC_LCTL,
-    A(S(C(KC_N))),        S(C(KC_5)),        KC_NO,             KC_UNDS,            KC_0,                      KC_MINS,                     KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_NO
-  ),
-  [NSSL] = LAYOUT_planck_mit(
-    KC_LALT,              KC_LCBR,           KC_AMPR,           KC_ASTR,            KC_LPRN,          KC_RCBR,           KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_RST,            KC_BSPC,
-    KC_LSFT,              KC_SCLN,           KC_DLR,            KC_PERC,            KC_CIRC,          KC_PLUS,           KC_NO,             KC_MS_L,            KC_MS_D,          KC_MS_U,           KC_MS_R,           KC_LSFT,
-    KC_LCTL,              KC_TILD,           KC_EXLM,           KC_AT,              KC_HASH,          KC_PIPE,           KC_NO,             KC_WH_L,            KC_WH_D,          KC_WH_U,           KC_WH_R,           KC_LCTL,
-    KC_NO,                KC_NO,             KC_UNDS,           KC_GT,              KC_RPRN,                   KC_NO,                       KC_BTN1,            KC_BTN3,          KC_BTN2,           KC_NO,             KC_NO
-  ),
-  [GAME] = LAYOUT_planck_mit(
-    KC_ESC,               KC_Q,              KC_W,              KC_E,               KC_R,             KC_T,              KC_Y,              KC_U,               KC_I,             KC_O,              KC_P,              TG(GAME),
-    KC_LALT,              KC_A,              KC_S,              KC_D,               KC_F,             KC_G,              KC_H,              KC_J,               KC_K,             KC_L,              KC_QUOT,           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_LCTL,
-    KC_LCTL,              A(KC_TAB),         MO(SECGAME),       KC_TAB,             KC_SPC,             LT(SECGAME, KC_ENT),                KC_BSPC,            KC_DEL,           KC_MPRV,           KC_MPLY,           KC_MNXT
-  ),
-  [SECGAME] = LAYOUT_planck_mit(
-    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_F1,                KC_F2,             KC_F3,             KC_F4,              KC_F5,            KC_F6,             KC_F7,             KC_F8,              KC_F9,            KC_F10,            KC_F11,            KC_F12,
-    KC_LEFT,              KC_DOWN,           KC_UP,             KC_RGHT,            KC_NO,            KC_NO,             KC_NO,             KC_P1,              KC_P2,            KC_P3,             KC_P4,             KC_P5,
-    KC_LEFT,              KC_DOWN,           KC_UP,             KC_RGHT,            KC_NO,                     KC_NO,                       KC_P6,              KC_P7,            KC_P8,             KC_P9,             KC_P0
-  )
-};
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/readme.md b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/readme.md
deleted file mode 100644
index 97c09be2552..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/readme.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Signynt's Keymap: 'Sigma-Squared'
-
-Sigma Squared is an adaptation & modification of the Layout [Miryoku](https://github.com/manna-harbour/qmk_firmware/blob/miryoku/users/manna-harbour_miryoku/miryoku.org#miryoku-) by *manna-harbour*
-
-*manna-harbour* lays out the general principles of the layout as follows:
-
-- Use layers instead of reaching.
-- Use both hands instead of contortions.
-- Use the home positions as much as possible.
-- Make full use of the thumbs.
-- Avoid unnecessary complication.
-
-
-
-Sigma Squared modifies on **Miryoku** in the following ways:
-
-- Added the Mods to the outer most columns to be easily accessed while typing with the pinkies
-- Extended the **NUMBER** layer to include symbols on the right side to allow calcualtion to be typed more easily without haveing to move between layers
-- Added a **GAME** layer to be used for gaming that emulates a more standard keyboard that most games expect
-  - moves *left shift* and *left ctrl* down
-  - *esc* moved to top left
-  - gives access to a **SECOND GAME** layer that contains an Fn row as well as number and arrow keys right under your left fingers
-- Added Shortcuts to the bottom row to reduce the amount of keycombos needed to use commonly needed features
-  - Mission Control, Screenshot, Cycling Apps & Windows
-- Added LED indicators to display what layer is currently active (only active while RGB is turned on)
-
-
-
-### Flashing
-
-- to directly flash to board:
-
-  `qmk flash -kb kprepublic/bm40hsrgb -km signynt`
-
-- to only compile:
-
-  `qmk compile -kb kprepublic/bm40hsrgb -km signynt`
-
-
-
-# Layout
-
-## BASE
-
-Tap the layer keys to use the black legends, hold them to activate the corresponding layer.
-
-The Shortcut keys can be modified to suit your needs, or change them in your OS to match the keys.
-
-If you are using MacOS I recommend swapping your *Ctrl* and *Cmd* keys in system preferences
-
-The Music Control key can be pressed once to pause and be pressed twice in rapid succession to skip to the next song. 
-
-The Screenshot Key takes a screenshot to the clipboard if pressed once, if double tapped it will take a screenshot to be saved to the desktop.
-
-![img](https://i.imgur.com/vhb1L2f.png)
-
-## NAVIGATION
-
-Provides access to all essential navigation keys, comfortably under your home row. Modifiers remain identical to **BASE** layer to be used for navigating lines and words.
-
-*Game Layer* key takes you to the **GAME** layer. *(duh)*
-
-Bottom right keys are used to swap between Virtual Desktops. You might need to modify these to fit your OS.
-
-![img](https://i.imgur.com/daKxxFz.png)
-
-
-
-## MEDIA
-
-Provides access to all basic media keys, emulating the arrow keys on the home row.
-
-Also gives access to RGB controls.
-
-![img](https://i.imgur.com/1jWOvvH.png)
-
-## NUMBER
-
-Numbers are arranged in a numpad layout beneath home row, with 0 being positioned under the thumb resting position. Layer includes all most commonly needed symbols to reduce amount of layer switching needed to type longer calculations.
-
-Top right key changed to *Back Space* so corrections can be made without leaving layer.
-
-![img](https://i.imgur.com/LGJT3so.png)
-
-## SYMBOL
-
-Symbols are positioned over respective numbers from the **NUMBER** layer.
-
-Mouse keys are positioned similarly under the home row corresponding to the arrow keys.
-
-Also includes *Back Space* key for corrections.
-
-![img](https://i.imgur.com/ihOcdPj.png)
-
-## Fn
-
-Fn keys are arranged in the same layout as the numbers, with *F10* to *F12* added to the left
-
-![img](https://i.imgur.com/bPpI8KN.png)
-
-## GAME
-
-Somewhat emulates a regular layout needed for gaming. Top right key LED will indicate that you are on the **GAME** layer, and can be pressed to exit it. Holding one of the *Second Game* keys will give you access to **SECOND GAME**
-
-![img](https://i.imgur.com/r9KIWLX.png)
-
-## SECOND GAME
-
-Top right key will turn red to indicate you are in the layer
-
-![img](https://i.imgur.com/BLKHfVB.png)
-
-
-
-# Contact
-
-If you have any issues or questions you can reach me through Reddit at u/Signynt or on the QMK Discord
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/rules.mk
deleted file mode 100644
index 754f3f1f708..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#rules
-
-MOUSEKEY_ENABLE = yes # Mouse keys
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-EXTRAKEY_ENABLE = yes # Audio control and System control
-TAP_DANCE_ENABLE = yes
-#RGB_MATRIX_ENABLE = no
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/config.h b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/config.h
deleted file mode 100644
index 508f98c053f..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/config.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// qmk flash -kb bm40hsrgb -km signynt_2_loud
-
-/* Copyright 2021 Vincenzo Mitchell Barroso
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#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 RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGBLIGHT_LIMIT_VAL 10
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define TAPPING_TERM 200
-
-//--------------------------------------------------------------------------------------------------------
-
-//disable broken animations
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-//#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-//#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-//#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-//#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//#undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS  // DO NOT ENABLE
-//#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-//#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-//#undef ENABLE_RGB_MATRIX_SPLASH
-//#undef ENABLE_RGB_MATRIX_MULTISPLASH
-//#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-//#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#    undef RGB_MATRIX_DEFAULT_MODE
-
-#    define RGBLIGHT_HUE_STEP 20
-
-#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/keymap.c b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/keymap.c
deleted file mode 100644
index f53e0618438..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-// qmk flash -kb bm40hsrgb -km signynt_2_loud
-
-/* Copyright 2021 Vincenzo Mitchell Barroso
- *
- * 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
-
-// non-KC_ keycodes
-#define KC_RST QK_BOOT
-#define KC_TOG RGB_TOG
-#define KC_MOD RGB_MOD
-#define KC_HUI RGB_HUI
-#define KC_SAI RGB_SAI
-#define KC_VAI RGB_VAI
-
-//define layers
-enum layers {BASE, MEDR, NAVR, NSSL, NSL, FUNL, GAME, SECGAME};
-
-enum custom_keycodes {
-  CMD_TAB = SAFE_RANGE,
-};
-
-//cmd tab
-
-bool is_cmd_tab_active = false;
-uint16_t cmd_tab_timer = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case CMD_TAB:
-      if (record->event.pressed) {
-        if (!is_cmd_tab_active) {
-          is_cmd_tab_active = true;
-          register_code(KC_LCTL);
-        }
-        cmd_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-  }
-  return true;
-}
-
-void matrix_scan_user(void) {
-  if (is_cmd_tab_active) {
-    if (timer_elapsed(cmd_tab_timer) > 500) {
-      unregister_code(KC_LCTL);
-      is_cmd_tab_active = false;
-    }
-  }
-}
-
-//layer led colors
-
-bool rgb_matrix_indicators_user(void) {
-
-  for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-    if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-        rgb_matrix_set_color(i, 0, 0, 0);
-    }
-    if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_KEYLIGHT)) {
-        rgb_matrix_set_color(i, 0, 0, 0);
-    }
-  }
-
-  //capslock
-  if (host_keyboard_led_state().caps_lock) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 255, 255, 255);
-      }
-    }
-  }
-
-  //nav layer
-  if (IS_LAYER_ON(NAVR)) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 0, 204, 255);
-      }
-    }
-  }
-
-  //funl layer
-  if (IS_LAYER_ON(FUNL)) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 255, 0, 0);
-      }
-    }
-  }
-
-  //nsl layer
-  if (IS_LAYER_ON(NSL)) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 51, 0, 255);
-      }
-    }
-  }
-
-  //nssl layer
-  if (IS_LAYER_ON(NSSL)) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 0, 255, 0);
-      }
-    }
-  }
-
-  //game layer
-  if (IS_LAYER_ON(GAME)) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 0, 204, 255);
-      }
-    }
-  }
-
-  //secgame layer
-  if (IS_LAYER_ON(SECGAME)) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 255, 0, 0);
-      }
-    }
-  }
-
-    return false;
-}
-
-//tap dance declarations
-enum {
-    TD_MEDIA, TD_SCREEN,
-};
-
-//tap dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_MEDIA] = ACTION_TAP_DANCE_DOUBLE( KC_MPLY , KC_MNXT ),
-    [TD_SCREEN] = ACTION_TAP_DANCE_DOUBLE( (G(S(KC_S))) , S(C(KC_4)) ),
-};
-
-#define KC_TD(TD_VARIABLE) TD(TD_VARIABLE)
-
-//--------------------------------------------------------------------------------------------------------
-
-//base
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_planck_mit(
-    KC_LALT,              KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              KC_LALT,
-    KC_LSFT,              KC_A,              KC_S,              KC_D,              KC_F,              KC_G,              KC_H,              KC_J,              KC_K,              KC_L,              KC_QUOT,           KC_LSFT,
-    KC_LCTL,              KC_Z,              KC_X,              KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           KC_DOT,            KC_SLSH,           KC_LCTL,
-    G(KC_TAB),            KC_TD(TD_SCREEN),  KC_ESC,            LT(MEDR, KC_TAB),  LT(NAVR, KC_SPC),      LT(NSSL, KC_ENT),                 LT(NSL, KC_BSPC),  LT(FUNL, KC_DEL),  KC_LGUI,           KC_TD(TD_MEDIA),     CMD_TAB
-  ),
-
-//layers
-  [NAVR] = LAYOUT_planck_mit(
-    KC_LALT,              KC_RST,            KC_NO,             KC_NO,              KC_NO,            KC_NO,             C(S(KC_Z)),        C(A(KC_LEFT)),     C(KC_X),           C(KC_C),           C(A(KC_RGHT)),     KC_LALT,
-    KC_LSFT,              G(S(C(KC_F1))),    G(S(C(KC_F3))),    G(S(C(KC_F4))),     G(S(C(KC_F2))),   KC_NO,             KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_LSFT,
-    KC_LCTL,              KC_NO,             KC_ALGR,           KC_NO,              G(S(C(KC_F5))),   KC_NO,             KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_LCTL,
-    TG(GAME),             KC_NO,             KC_NO,             KC_NO,              KC_NO,                     KC_ENT,                      KC_BSPC,           KC_DEL,            KC_NO,             C(G(KC_LEFT)),     C(G(KC_RIGHT))
-  ),
-  [MEDR] = LAYOUT_planck_mit(
-    KC_LALT,              KC_RST,            KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_TOG,            KC_MOD,            KC_HUI,            KC_SAI,            KC_VAI,            KC_LALT,
-    KC_LSFT,              KC_NO,             KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_NO,             KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           KC_LSFT,
-    KC_LCTL,              KC_NO,             KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_NO,             KC_F13,            KC_F14,            KC_F15,            RGB_VAI,           KC_LCTL,
-    KC_NO,                KC_NO,             KC_NO,             KC_NO,              KC_NO,                     KC_MSTP,                     KC_MPLY,           KC_MUTE,           KC_NO,             KC_NO,             KC_NO
-  ),
-  [FUNL] = LAYOUT_planck_mit(
-    KC_LALT,              KC_F12,            KC_F7,             KC_F8,              KC_F9,            KC_PSCR,           KC_F15,            KC_NO,             KC_NO,             KC_NO,             KC_RST,            KC_LALT,
-    KC_LSFT,              KC_F11,            KC_F4,             KC_F5,              KC_F6,            KC_SCRL,           KC_F14,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LSFT,
-    KC_LCTL,              KC_F10,            KC_F1,             KC_F2,              KC_F3,            KC_PAUS,           KC_F13,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LCTL,
-    KC_NO,                KC_NO,             KC_TAB,            KC_APP,             KC_SPC,                    KC_UNDS,                     KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_NO
-  ),
-  [NSL] = LAYOUT_planck_mit(
-    KC_LALT,              KC_LPRN,           KC_7,              KC_8,               KC_9,             KC_RPRN,           KC_LBRC,           KC_AMPR,           KC_ASTR,           KC_LCBR,           KC_RBRC,           KC_BSPC,
-    KC_LSFT,              KC_COLN,           KC_4,              KC_5,               KC_6,             KC_EQL,            KC_LCBR,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_RCBR,           KC_LSFT,
-    KC_LCTL,              KC_GRV,            KC_1,              KC_2,               KC_3,             KC_PLUS,           KC_TILD,           KC_EXLM,           KC_COMM,           KC_DOT,            KC_SLSH,           KC_LCTL,
-    A(S(C(KC_N))),        S(C(KC_5)),        KC_NO,             KC_UNDS,            KC_0,                      KC_MINS,                     KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_NO
-  ),
-  [NSSL] = LAYOUT_planck_mit(
-    KC_LALT,              KC_LCBR,           KC_AMPR,           KC_ASTR,            KC_LPRN,          KC_RCBR,           KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_RST,            KC_BSPC,
-    KC_LSFT,              KC_SCLN,           KC_DLR,            KC_PERC,            KC_CIRC,          KC_PLUS,           KC_NO,             KC_MS_L,            KC_MS_D,          KC_MS_U,           KC_MS_R,           KC_LSFT,
-    KC_LCTL,              KC_TILD,           KC_EXLM,           KC_AT,              KC_HASH,          KC_PIPE,           KC_NO,             KC_WH_L,            KC_WH_D,          KC_WH_U,           KC_WH_R,           KC_LCTL,
-    KC_NO,                KC_NO,             KC_UNDS,           KC_GT,              KC_RPRN,                   KC_NO,                       KC_BTN1,            KC_BTN3,          KC_BTN2,           KC_NO,             KC_NO
-  ),
-  [GAME] = LAYOUT_planck_mit(
-    KC_ESC,               KC_Q,              KC_W,              KC_E,               KC_R,             KC_T,              KC_Y,              KC_U,               KC_I,             KC_O,              KC_P,              TG(GAME),
-    KC_LALT,              KC_A,              KC_S,              KC_D,               KC_F,             KC_G,              KC_H,              KC_J,               KC_K,             KC_L,              KC_QUOT,           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_LCTL,
-    KC_LCTL,              A(KC_TAB),         MO(SECGAME),       KC_TAB,             KC_SPC,             LT(SECGAME, KC_ENT),                KC_BSPC,            KC_DEL,           KC_MPRV,           KC_MPLY,           KC_MNXT
-  ),
-  [SECGAME] = LAYOUT_planck_mit(
-    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_F1,                KC_F2,             KC_F3,             KC_F4,              KC_F5,            KC_F6,             KC_F7,             KC_F8,              KC_F9,            KC_F10,            KC_F11,            KC_F12,
-    KC_LEFT,              KC_DOWN,           KC_UP,             KC_RGHT,            KC_NO,            KC_NO,             KC_NO,             KC_P1,              KC_P2,            KC_P3,             KC_P4,             KC_P5,
-    KC_LEFT,              KC_DOWN,           KC_UP,             KC_RGHT,            KC_NO,                     KC_NO,                       KC_P6,              KC_P7,            KC_P8,             KC_P9,             KC_P0
-  )
-};
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/readme.md b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/readme.md
deleted file mode 100644
index 97c09be2552..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/readme.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Signynt's Keymap: 'Sigma-Squared'
-
-Sigma Squared is an adaptation & modification of the Layout [Miryoku](https://github.com/manna-harbour/qmk_firmware/blob/miryoku/users/manna-harbour_miryoku/miryoku.org#miryoku-) by *manna-harbour*
-
-*manna-harbour* lays out the general principles of the layout as follows:
-
-- Use layers instead of reaching.
-- Use both hands instead of contortions.
-- Use the home positions as much as possible.
-- Make full use of the thumbs.
-- Avoid unnecessary complication.
-
-
-
-Sigma Squared modifies on **Miryoku** in the following ways:
-
-- Added the Mods to the outer most columns to be easily accessed while typing with the pinkies
-- Extended the **NUMBER** layer to include symbols on the right side to allow calcualtion to be typed more easily without haveing to move between layers
-- Added a **GAME** layer to be used for gaming that emulates a more standard keyboard that most games expect
-  - moves *left shift* and *left ctrl* down
-  - *esc* moved to top left
-  - gives access to a **SECOND GAME** layer that contains an Fn row as well as number and arrow keys right under your left fingers
-- Added Shortcuts to the bottom row to reduce the amount of keycombos needed to use commonly needed features
-  - Mission Control, Screenshot, Cycling Apps & Windows
-- Added LED indicators to display what layer is currently active (only active while RGB is turned on)
-
-
-
-### Flashing
-
-- to directly flash to board:
-
-  `qmk flash -kb kprepublic/bm40hsrgb -km signynt`
-
-- to only compile:
-
-  `qmk compile -kb kprepublic/bm40hsrgb -km signynt`
-
-
-
-# Layout
-
-## BASE
-
-Tap the layer keys to use the black legends, hold them to activate the corresponding layer.
-
-The Shortcut keys can be modified to suit your needs, or change them in your OS to match the keys.
-
-If you are using MacOS I recommend swapping your *Ctrl* and *Cmd* keys in system preferences
-
-The Music Control key can be pressed once to pause and be pressed twice in rapid succession to skip to the next song. 
-
-The Screenshot Key takes a screenshot to the clipboard if pressed once, if double tapped it will take a screenshot to be saved to the desktop.
-
-![img](https://i.imgur.com/vhb1L2f.png)
-
-## NAVIGATION
-
-Provides access to all essential navigation keys, comfortably under your home row. Modifiers remain identical to **BASE** layer to be used for navigating lines and words.
-
-*Game Layer* key takes you to the **GAME** layer. *(duh)*
-
-Bottom right keys are used to swap between Virtual Desktops. You might need to modify these to fit your OS.
-
-![img](https://i.imgur.com/daKxxFz.png)
-
-
-
-## MEDIA
-
-Provides access to all basic media keys, emulating the arrow keys on the home row.
-
-Also gives access to RGB controls.
-
-![img](https://i.imgur.com/1jWOvvH.png)
-
-## NUMBER
-
-Numbers are arranged in a numpad layout beneath home row, with 0 being positioned under the thumb resting position. Layer includes all most commonly needed symbols to reduce amount of layer switching needed to type longer calculations.
-
-Top right key changed to *Back Space* so corrections can be made without leaving layer.
-
-![img](https://i.imgur.com/LGJT3so.png)
-
-## SYMBOL
-
-Symbols are positioned over respective numbers from the **NUMBER** layer.
-
-Mouse keys are positioned similarly under the home row corresponding to the arrow keys.
-
-Also includes *Back Space* key for corrections.
-
-![img](https://i.imgur.com/ihOcdPj.png)
-
-## Fn
-
-Fn keys are arranged in the same layout as the numbers, with *F10* to *F12* added to the left
-
-![img](https://i.imgur.com/bPpI8KN.png)
-
-## GAME
-
-Somewhat emulates a regular layout needed for gaming. Top right key LED will indicate that you are on the **GAME** layer, and can be pressed to exit it. Holding one of the *Second Game* keys will give you access to **SECOND GAME**
-
-![img](https://i.imgur.com/r9KIWLX.png)
-
-## SECOND GAME
-
-Top right key will turn red to indicate you are in the layer
-
-![img](https://i.imgur.com/BLKHfVB.png)
-
-
-
-# Contact
-
-If you have any issues or questions you can reach me through Reddit at u/Signynt or on the QMK Discord
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/rules.mk
deleted file mode 100644
index 754f3f1f708..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_loud/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#rules
-
-MOUSEKEY_ENABLE = yes # Mouse keys
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-EXTRAKEY_ENABLE = yes # Audio control and System control
-TAP_DANCE_ENABLE = yes
-#RGB_MATRIX_ENABLE = no
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/config.h b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/config.h
deleted file mode 100644
index 70f92bafdee..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/config.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// qmk flash -kb bm40hsrgb -km signynt_2_quiet
-
-/* Copyright 2021 Vincenzo Mitchell Barroso
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#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 RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGBLIGHT_LIMIT_VAL 10
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define TAPPING_TERM 200
-
-//--------------------------------------------------------------------------------------------------------
-
-//disable broken animations
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-//#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-//#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-//#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-//#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//#undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS  // DO NOT ENABLE
-//#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-//#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-//#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-//#undef ENABLE_RGB_MATRIX_SPLASH
-//#undef ENABLE_RGB_MATRIX_MULTISPLASH
-//#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-//#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#    undef RGB_MATRIX_DEFAULT_MODE
-
-#    define RGBLIGHT_HUE_STEP 20
-
-#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/keymap.c b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/keymap.c
deleted file mode 100644
index e958071c207..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/keymap.c
+++ /dev/null
@@ -1,179 +0,0 @@
-// qmk flash -kb bm40hsrgb -km signynt_2_quiet
-
-/* Copyright 2021 Vincenzo Mitchell Barroso
- *
- * 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
-
-// non-KC_ keycodes
-#define KC_RST QK_BOOT
-#define KC_TOG RGB_TOG
-#define KC_MOD RGB_MOD
-#define KC_HUI RGB_HUI
-#define KC_SAI RGB_SAI
-#define KC_VAI RGB_VAI
-
-//define layers
-enum layers {BASE, MEDR, NAVR, NSSL, NSL, FUNL, GAME, SECGAME};
-
-enum custom_keycodes {
-  CMD_TAB = SAFE_RANGE,
-};
-
-//cmd tab
-
-bool is_cmd_tab_active = false;
-uint16_t cmd_tab_timer = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case CMD_TAB:
-      if (record->event.pressed) {
-        if (!is_cmd_tab_active) {
-          is_cmd_tab_active = true;
-          register_code(KC_LCTL);
-        }
-        cmd_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-  }
-  return true;
-}
-
-void matrix_scan_user(void) {
-  if (is_cmd_tab_active) {
-    if (timer_elapsed(cmd_tab_timer) > 500) {
-      unregister_code(KC_LCTL);
-      is_cmd_tab_active = false;
-    }
-  }
-}
-
-//layer led colors
-
-bool rgb_matrix_indicators_user(void) {
-
-  for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-    if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-        rgb_matrix_set_color(i, 0, 0, 0);
-    }
-    if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_KEYLIGHT)) {
-        rgb_matrix_set_color(i, 0, 0, 0);
-    }
-  }
-
-  //capslock
-  if (host_keyboard_led_state().caps_lock) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 255, 255, 255);
-      }
-    }
-  }
-
-  //game layer
-  if (IS_LAYER_ON(GAME)) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 0, 204, 255);
-      }
-    }
-  }
-
-  //secgame layer
-  if (IS_LAYER_ON(SECGAME)) {
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-      if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-            rgb_matrix_set_color(i, 255, 0, 0);
-      }
-    }
-  }
-
-    return false;
-}
-
-//tap dance declarations
-enum {
-    TD_MEDIA, TD_SCREEN,
-};
-
-//tap dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_MEDIA] = ACTION_TAP_DANCE_DOUBLE( KC_MPLY , KC_MNXT ),
-    [TD_SCREEN] = ACTION_TAP_DANCE_DOUBLE( (G(S(KC_S))) , S(C(KC_4)) ),
-};
-
-#define KC_TD(TD_VARIABLE) TD(TD_VARIABLE)
-
-//--------------------------------------------------------------------------------------------------------
-
-//base
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_planck_mit(
-    KC_LALT,              KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,              KC_LALT,
-    KC_LSFT,              KC_A,              KC_S,              KC_D,              KC_F,              KC_G,              KC_H,              KC_J,              KC_K,              KC_L,              KC_QUOT,           KC_LSFT,
-    KC_LCTL,              KC_Z,              KC_X,              KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           KC_DOT,            KC_SLSH,           KC_LCTL,
-    G(KC_TAB),            KC_TD(TD_SCREEN),  KC_ESC,            LT(MEDR, KC_TAB),  LT(NAVR, KC_SPC),      LT(NSSL, KC_ENT),                 LT(NSL, KC_BSPC),  LT(FUNL, KC_DEL),  KC_LGUI,           KC_TD(TD_MEDIA),    CMD_TAB
-  ),
-
-//layers
-  [NAVR] = LAYOUT_planck_mit(
-    KC_LALT,              KC_RST,            KC_NO,             KC_NO,              KC_NO,            KC_NO,             C(S(KC_Z)),        C(A(KC_LEFT)),     C(KC_X),           C(KC_C),           C(A(KC_RGHT)),     KC_LALT,
-    KC_LSFT,              G(S(C(KC_F1))),    G(S(C(KC_F3))),    G(S(C(KC_F4))),     G(S(C(KC_F2))),   KC_NO,             KC_CAPS,           KC_LEFT,           KC_DOWN,           KC_UP,             KC_RGHT,           KC_LSFT,
-    KC_LCTL,              KC_NO,             KC_ALGR,           KC_NO,              G(S(C(KC_F5))),   KC_NO,             KC_INS,            KC_HOME,           KC_PGDN,           KC_PGUP,           KC_END,            KC_LCTL,
-    TG(GAME),             KC_NO,             KC_NO,             KC_NO,              KC_NO,                     KC_ENT,                      KC_BSPC,           KC_DEL,            KC_NO,             C(G(KC_LEFT)),     C(G(KC_RIGHT))
-  ),
-  [MEDR] = LAYOUT_planck_mit(
-    KC_LALT,              KC_RST,            KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_TOG,            KC_MOD,            KC_HUI,            KC_SAI,            KC_VAI,            KC_LALT,
-    KC_LSFT,              KC_NO,             KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_NO,             KC_MPRV,           KC_VOLD,           KC_VOLU,           KC_MNXT,           KC_LSFT,
-    KC_LCTL,              KC_NO,             KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_NO,             KC_F13,            KC_F14,            KC_F15,            RGB_VAI,           KC_LCTL,
-    KC_NO,                KC_NO,             KC_NO,             KC_NO,              KC_NO,                     KC_MSTP,                     KC_MPLY,           KC_MUTE,           KC_NO,             KC_NO,             KC_NO
-  ),
-  [FUNL] = LAYOUT_planck_mit(
-    KC_LALT,              KC_F12,            KC_F7,             KC_F8,              KC_F9,            KC_PSCR,           KC_F15,            KC_NO,             KC_NO,             KC_NO,             KC_RST,            KC_LALT,
-    KC_LSFT,              KC_F11,            KC_F4,             KC_F5,              KC_F6,            KC_SCRL,           KC_F14,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LSFT,
-    KC_LCTL,              KC_F10,            KC_F1,             KC_F2,              KC_F3,            KC_PAUS,           KC_F13,            KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_LCTL,
-    KC_NO,                KC_NO,             KC_TAB,            KC_APP,             KC_SPC,                    KC_UNDS,                     KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_NO
-  ),
-  [NSL] = LAYOUT_planck_mit(
-    KC_LALT,              KC_LPRN,           KC_7,              KC_8,               KC_9,             KC_RPRN,           KC_LBRC,           KC_AMPR,           KC_ASTR,           KC_LCBR,           KC_RBRC,           KC_BSPC,
-    KC_LSFT,              KC_COLN,           KC_4,              KC_5,               KC_6,             KC_EQL,            KC_LCBR,           KC_DLR,            KC_PERC,           KC_CIRC,           KC_RCBR,           KC_LSFT,
-    KC_LCTL,              KC_GRV,            KC_1,              KC_2,               KC_3,             KC_PLUS,           KC_TILD,           KC_EXLM,           KC_COMM,           KC_DOT,            KC_SLSH,           KC_LCTL,
-    A(S(C(KC_N))),        S(C(KC_5)),        KC_NO,             KC_UNDS,            KC_0,                      KC_MINS,                     KC_NO,             KC_NO,             KC_NO,             KC_NO,             KC_NO
-  ),
-  [NSSL] = LAYOUT_planck_mit(
-    KC_LALT,              KC_LCBR,           KC_AMPR,           KC_ASTR,            KC_LPRN,          KC_RCBR,           KC_NO,             KC_NO,              KC_NO,            KC_NO,             KC_RST,            KC_BSPC,
-    KC_LSFT,              KC_SCLN,           KC_DLR,            KC_PERC,            KC_CIRC,          KC_PLUS,           KC_NO,             KC_MS_L,            KC_MS_D,          KC_MS_U,           KC_MS_R,           KC_LSFT,
-    KC_LCTL,              KC_TILD,           KC_EXLM,           KC_AT,              KC_HASH,          KC_PIPE,           KC_NO,             KC_WH_L,            KC_WH_D,          KC_WH_U,           KC_WH_R,           KC_LCTL,
-    KC_NO,                KC_NO,             KC_UNDS,           KC_GT,              KC_RPRN,                   KC_NO,                       KC_BTN1,            KC_BTN3,          KC_BTN2,           KC_NO,             KC_NO
-  ),
-  [GAME] = LAYOUT_planck_mit(
-    KC_ESC,               KC_Q,              KC_W,              KC_E,               KC_R,             KC_T,              KC_Y,              KC_U,               KC_I,             KC_O,              KC_P,              TG(GAME),
-    KC_LALT,              KC_A,              KC_S,              KC_D,               KC_F,             KC_G,              KC_H,              KC_J,               KC_K,             KC_L,              KC_QUOT,           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_LCTL,
-    KC_LCTL,              A(KC_TAB),         MO(SECGAME),       KC_TAB,             KC_SPC,             LT(SECGAME, KC_ENT),                KC_BSPC,            KC_DEL,           KC_MPRV,           KC_MPLY,           KC_MNXT
-  ),
-  [SECGAME] = LAYOUT_planck_mit(
-    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_F1,                KC_F2,             KC_F3,             KC_F4,              KC_F5,            KC_F6,             KC_F7,             KC_F8,              KC_F9,            KC_F10,            KC_F11,            KC_F12,
-    KC_LEFT,              KC_DOWN,           KC_UP,             KC_RGHT,            KC_NO,            KC_NO,             KC_NO,             KC_P1,              KC_P2,            KC_P3,             KC_P4,             KC_P5,
-    KC_LEFT,              KC_DOWN,           KC_UP,             KC_RGHT,            KC_NO,                     KC_NO,                       KC_P6,              KC_P7,            KC_P8,             KC_P9,             KC_P0
-  )
-};
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/readme.md b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/readme.md
deleted file mode 100644
index 97c09be2552..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/readme.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Signynt's Keymap: 'Sigma-Squared'
-
-Sigma Squared is an adaptation & modification of the Layout [Miryoku](https://github.com/manna-harbour/qmk_firmware/blob/miryoku/users/manna-harbour_miryoku/miryoku.org#miryoku-) by *manna-harbour*
-
-*manna-harbour* lays out the general principles of the layout as follows:
-
-- Use layers instead of reaching.
-- Use both hands instead of contortions.
-- Use the home positions as much as possible.
-- Make full use of the thumbs.
-- Avoid unnecessary complication.
-
-
-
-Sigma Squared modifies on **Miryoku** in the following ways:
-
-- Added the Mods to the outer most columns to be easily accessed while typing with the pinkies
-- Extended the **NUMBER** layer to include symbols on the right side to allow calcualtion to be typed more easily without haveing to move between layers
-- Added a **GAME** layer to be used for gaming that emulates a more standard keyboard that most games expect
-  - moves *left shift* and *left ctrl* down
-  - *esc* moved to top left
-  - gives access to a **SECOND GAME** layer that contains an Fn row as well as number and arrow keys right under your left fingers
-- Added Shortcuts to the bottom row to reduce the amount of keycombos needed to use commonly needed features
-  - Mission Control, Screenshot, Cycling Apps & Windows
-- Added LED indicators to display what layer is currently active (only active while RGB is turned on)
-
-
-
-### Flashing
-
-- to directly flash to board:
-
-  `qmk flash -kb kprepublic/bm40hsrgb -km signynt`
-
-- to only compile:
-
-  `qmk compile -kb kprepublic/bm40hsrgb -km signynt`
-
-
-
-# Layout
-
-## BASE
-
-Tap the layer keys to use the black legends, hold them to activate the corresponding layer.
-
-The Shortcut keys can be modified to suit your needs, or change them in your OS to match the keys.
-
-If you are using MacOS I recommend swapping your *Ctrl* and *Cmd* keys in system preferences
-
-The Music Control key can be pressed once to pause and be pressed twice in rapid succession to skip to the next song. 
-
-The Screenshot Key takes a screenshot to the clipboard if pressed once, if double tapped it will take a screenshot to be saved to the desktop.
-
-![img](https://i.imgur.com/vhb1L2f.png)
-
-## NAVIGATION
-
-Provides access to all essential navigation keys, comfortably under your home row. Modifiers remain identical to **BASE** layer to be used for navigating lines and words.
-
-*Game Layer* key takes you to the **GAME** layer. *(duh)*
-
-Bottom right keys are used to swap between Virtual Desktops. You might need to modify these to fit your OS.
-
-![img](https://i.imgur.com/daKxxFz.png)
-
-
-
-## MEDIA
-
-Provides access to all basic media keys, emulating the arrow keys on the home row.
-
-Also gives access to RGB controls.
-
-![img](https://i.imgur.com/1jWOvvH.png)
-
-## NUMBER
-
-Numbers are arranged in a numpad layout beneath home row, with 0 being positioned under the thumb resting position. Layer includes all most commonly needed symbols to reduce amount of layer switching needed to type longer calculations.
-
-Top right key changed to *Back Space* so corrections can be made without leaving layer.
-
-![img](https://i.imgur.com/LGJT3so.png)
-
-## SYMBOL
-
-Symbols are positioned over respective numbers from the **NUMBER** layer.
-
-Mouse keys are positioned similarly under the home row corresponding to the arrow keys.
-
-Also includes *Back Space* key for corrections.
-
-![img](https://i.imgur.com/ihOcdPj.png)
-
-## Fn
-
-Fn keys are arranged in the same layout as the numbers, with *F10* to *F12* added to the left
-
-![img](https://i.imgur.com/bPpI8KN.png)
-
-## GAME
-
-Somewhat emulates a regular layout needed for gaming. Top right key LED will indicate that you are on the **GAME** layer, and can be pressed to exit it. Holding one of the *Second Game* keys will give you access to **SECOND GAME**
-
-![img](https://i.imgur.com/r9KIWLX.png)
-
-## SECOND GAME
-
-Top right key will turn red to indicate you are in the layer
-
-![img](https://i.imgur.com/BLKHfVB.png)
-
-
-
-# Contact
-
-If you have any issues or questions you can reach me through Reddit at u/Signynt or on the QMK Discord
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/rules.mk
deleted file mode 100644
index 754f3f1f708..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/signynt_2_quiet/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#rules
-
-MOUSEKEY_ENABLE = yes # Mouse keys
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-EXTRAKEY_ENABLE = yes # Audio control and System control
-TAP_DANCE_ENABLE = yes
-#RGB_MATRIX_ENABLE = no
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/wolff_abnt2/keymap.c b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/wolff_abnt2/keymap.c
deleted file mode 100755
index 1583392a483..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/wolff_abnt2/keymap.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Copyright 2020 lmlask
- *
- * 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_brazilian_abnt2.h>
-
-enum layers {
-  _WORKMAN,
-  _QWERTY,
-  _DVORAK,
-  _COLEMAK,
-  _MIDI,
-  _GAME,
-  
-  _SYM,
-  _FUNCTION,
-  _NAV,
-  _NUM,
-  _ADJUST,
-  _MOUSE,
-  
-  _CPY,
-  _SWP
-};
-
-enum planck_keycodes {
-  WORKMAN = QK_USER,
-  QWERTY,
-  DVORAK,
-  COLEMAK,
-  MIDI,
-  GAME,
-  TOG_CPY,
-  TOG_SWP,
-};
-
-#define NAVTAB LT(_NAV, KC_TAB)
-#define SYM LT(_SYM, KC_BSPC)
-#define NUM LT(_NUM, KC_DEL)
-#define FUN MO(_FUNCTION)
-#define CTL_ENT RCTL_T(KC_ENT)
-
-//Hand swap config, similar to Planck
-const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
-  {{11, 0}, {10, 0}, {9, 0}, {8, 0}, {7, 0}, {6, 0}, {5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0} },
-  {{11, 1}, {10, 1}, {9, 1}, {8, 1}, {7, 1}, {6, 1}, {5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1} },
-  {{11, 2}, {10, 2}, {9, 2}, {8, 2}, {7, 2}, {6, 2}, {5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2} },
-  {{0, 3},  {1, 3},  {2, 3}, {3, 3}, {4, 3},     {5, 3},     {6, 3}, {7, 3}, {8, 3}, {9, 3}, {10, 3}},
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//BASE LAYERS
-[_QWERTY] = LAYOUT_planck_mit(
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    BR_ACUT,
-    NAVTAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    BR_CCED, BR_TILD,
-    SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  BR_SLSH, SC_RSPC,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_MEH,  NUM,         KC_SPC,       SYM,     FUN,     KC_RALT, KC_HYPR, CTL_ENT
-),
-[_WORKMAN] = LAYOUT_planck_mit(
-    KC_ESC,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    BR_CCED, BR_ACUT,
-    NAVTAB,  KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    BR_TILD,
-    SC_LSPO, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  BR_SLSH, SC_RSPC,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_MEH,  NUM,         KC_SPC,       SYM,     FUN,     KC_RALT, KC_HYPR, CTL_ENT
-),
-[_DVORAK] = LAYOUT_planck_mit(
-    KC_ESC,  KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    BR_SLSH, BR_ACUT,
-    NAVTAB,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    BR_TILD,
-    SC_LSPO, BR_CCED, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_RSPC,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_MEH,  NUM,         KC_SPC,       SYM,     FUN,     KC_RALT, KC_HYPR, CTL_ENT
-),
-[_COLEMAK] = LAYOUT_planck_mit(
-    KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    BR_CCED, BR_ACUT,
-    NAVTAB,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    BR_TILD,
-    SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  BR_SLSH, SC_RSPC,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_MEH,  NUM,         KC_SPC,       SYM,     FUN,     KC_RALT, KC_HYPR, CTL_ENT
-),
-
-//UTILITY LAYERS - SHORTCUT (CPY), SWAP HANDS (SWP)
-[_CPY] = LAYOUT_planck_mit(
-    _______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,
-    _______, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-),
-[_SWP] = LAYOUT_planck_mit(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, NUM,     SH_T(KC_BSPC),_______,     _______, _______, _______, _______, _______
-),
-//AUX LAYERS (NAV, SYM, NUM, FN)
-[_NAV] = LAYOUT_planck_mit(
-    KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, KC_PGUP,  KC_HOME, KC_UP,   KC_END,  C(KC_V), C(KC_Z),
-    _______, KC_LALT, KC_LGUI, KC_LSFT, KC_LCTL, _______, KC_PGDN,  KC_LEFT, KC_DOWN, KC_RGHT, C(KC_C), C(KC_X),
-    _______, _______, _______, _______, _______, _______, KC_ENT,   KC_BSPC, KC_DEL,  KC_VOLD, KC_VOLU, _______,
-    _______, _______, _______, _______, _______,      KC_ENT,       _______, _______, KC_MPRV, KC_MPLY, KC_MNXT
-),
-[_SYM] = LAYOUT_planck_mit(
-    BR_DQUO, BR_EXLM, BR_AT,   BR_HASH, BR_DLR,  BR_PERC, BR_DIAE, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-    BR_QUOT, BR_BSLS, BR_SCLN, KC_MINS, BR_QUOT, _______, _______, KC_PLUS, _______, BR_LBRC, BR_RBRC, _______,
-    _______, BR_PIPE, BR_COLN, KC_UNDS, BR_DQUO, _______, _______, KC_EQL,  _______, BR_LCBR, BR_RCBR, _______,
-    _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-),
-[_NUM] = LAYOUT_planck_mit(
-    _______, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,    BR_SLSH, BR_MINS,
-    _______, BR_SLSH, KC_ASTR, KC_MINS, KC_PLUS, _______, _______, KC_4,    KC_5,    KC_6,    BR_ASTR, BR_PLUS,
-    _______, BR_PERC, KC_EQL,  KC_DOT,  KC_COMM, _______, _______, KC_1,    KC_2,    KC_3,    BR_COLN, BR_DOT,
-    _______, _______, _______, _______, _______,     _______,      KC_0,    KC_BSPC, BR_COMM, BR_EQL,  KC_ENT
-),
-[_FUNCTION] = LAYOUT_planck_mit(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_SCRL, _______, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_INS,
-    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_NUM,  _______, KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_PAUS,
-    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, _______, KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_APP,
-    _______, _______, _______, _______, _______,     _______,      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT
-),
-//ADJUST LAYER FOR KEYBOARD CONTROL
-[_ADJUST] = LAYOUT_planck_mit(
-    QK_BOOT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, MIDI,    GAME,    _______, _______, _______,
-    KC_CAPS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, QWERTY,  DVORAK,  COLEMAK, WORKMAN, _______,
-    QK_RBT,  _______, _______, _______, _______, _______, _______, TOG_CPY, TOG_SWP, _______, _______, _______,
-    RGB_TOG, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-),
-//MOUSE LAYER
-[_MOUSE] = LAYOUT_planck_mit(
-    KC_ESC,   KC_BTN6, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN6, KC_NO,
-    _______,  KC_BTN4, KC_BTN2, KC_BTN3, KC_BTN1, KC_NO,  KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN4, KC_NO,
-    _______,  KC_BTN5, KC_ACL2, KC_ACL1, KC_ACL0, KC_NO,  KC_BTN7, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5, _______,
-    _______,  _______, _______, _______, _______,    _______,      _______, _______, _______, _______, _______
-),
-//MIDI
-[_MIDI] = LAYOUT_planck_mit(
-    MI_Cs,   MI_Ds,   MI_F,    MI_Fs,   MI_Gs,   MI_As,   MI_C,    MI_Cs1, MI_Ds1, MI_F1,  MI_Fs1,  MI_Gs1,
-    MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,    MI_C1,  MI_D1,  MI_E,   MI_F1,   MI_G1,
-    MI_BNDU, MI_OCTU, MI_TRSU, MI_VELU, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  MI_MODU,MI_CHNU, MI_TOGG,
-    MI_BNDD, MI_OCTD, MI_TRSD, MI_VELD, MI_SOFT,     MI_SUST,      SYM,    FUN,    MI_MODD,MI_CHND, MI_AOFF
-),
-//GAME
-[_GAME] = LAYOUT_planck_mit(
-    KC_ESC,   JS_0,     JS_1,     JS_2,     JS_3,   JS_4,  JS_5,   JS_6,   JS_7,   JS_8,     JS_9,    KC_P,
-    KC_TAB,   JS_10,    JS_11,    JS_12,    JS_13,  JS_14, JS_15,  JS_16,  JS_17,  JS_18,    JS_19,   KC_O,
-    KC_LSFT,  JS_20,    JS_21,    JS_22,    JS_23,  JS_24, JS_25,  JS_26,  JS_27,  JS_28,    JS_29,   KC_L,
-    KC_LCTL,  KC_LGUI,  KC_LALT,  KC_MEH,   NUM,       KC_SPC,     SYM,    FUN,    KC_RALT,  KC_HYPR, CTL_ENT    
-),
-};
-
-//Custom keycodes code for layer switching
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case WORKMAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WORKMAN);
-      }
-      return false;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-    case MIDI:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_MIDI);
-      }
-      return false;
-    case GAME:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_GAME);
-      }
-      return false;
-    case TOG_CPY:
-      if (record->event.pressed) {
-        layer_invert(_CPY);
-      }
-      return false;
-    case TOG_SWP:
-      if (record->event.pressed) {
-        layer_invert(_SWP);
-      }
-      return false;
-   }
-   return true;
-}
-
-//ADJUST and MOUSE layers activation code
-layer_state_t layer_state_set_user(layer_state_t state) {
-   state = update_tri_layer_state(state, _FUNCTION, _SYM, _ADJUST);
-   state = update_tri_layer_state(state, _NAV, _NUM, _MOUSE);
-   return state;
-}
-
-
-
-
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/wolff_abnt2/readme.md b/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/wolff_abnt2/readme.md
deleted file mode 100755
index 69130dbfec3..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/keymaps/wolff_abnt2/readme.md
+++ /dev/null
@@ -1,79 +0,0 @@
-# Brazilian keymap for the BM40RGB keyboard
-
-![photo](https://user-images.githubusercontent.com/62627597/228396721-b38ea064-6e80-4aff-90ec-01164d0515ae.jpg)
-
-This keymap deviates somewhat from the generally used conventions of Planck style keyboards. 
-It's built on the following principles:
-
-1. Availability of different base layouts. QWERTY, Dvorak, Colemak and Workman are available. They can be chosen with the four right hand home row keys on the ADJUST layer (NAV + NUM keys). The base layout you choose gets stored on the keyboard EEPROM, so it will still be set if you unplug or reset the keyboard.
-2. Frequent use of navigation keys such as the arrow keys, home, end, and hotkeys using those keycodes. For that reason, it keeps the navigation keys on a dedicated nav layer, on the home row, under the right hand. The nav layer is activated by the first button of the home row (the usual caps lock position). I find this much better than using dedicated arrow keys on the bottom right of the keyboard, as the very reason I swapped to a 40% is to move my hands less.
-3. Accessibility of the ´ ` ^ ~ ç symbols. There are several blank spaces left on the symbols layer, if you need access to other symbols or diacritics.
-4. Proper touch typing, and hotkey access, with the Shift key on both sides. I found my hands very much expect Ctrl to be on the edge of the keyboard, and as such I've kept both bottom corner keys as Ctrl. The right Ctrl will act as an Enter key if tapped.
-5. Numbers and navigation keys should be slightly more accessible than symbols and function keys. If you use symbols more often, consider swapping the NUM and SYM layer toggle keys.
-6. It's easier to remember layers when they make sense conceptually, so no "lower" and "raise" layers. Instead, there are dedicated layers for navigation/utility (NAV), numbers (NUM), symbols (SYM) and function keys (FN). There's also dedicated MIDI layers, a layer for one-hand typing, a mouse-emulating layer, and a layer for one-hand navigation and copy-pasting.
-7. Tap hold is a good tool and you should use it if you can. Backspace and Delete are set as tap functions on the two more accessible layer toggle keys. The bottom right Ctrl behaves as Enter when tapped. The Nav layer button is Tab when tapped.
-8. Easy-to-access shortcut modifiers. This layout includes a Master key (Shift+Ctrl+Alt) and a Hyper key (Shift+Ctrl+Alt+Super) for configuring system shortcuts.
-
-It will only work as intended if your system keyboard layout is set to Brazilian ABNT2. It may work with other international layouts, but some keys, including brackets and the ´ ` ~ ^ keys, will get broken. If your system layout is another one, it should be relatively easy to change keymap.c (search and replace each key with the equivalent one from the international keymaps file). 
-
-# Base Layers
-
-These are selected as the base by a button in the Adjust layer.
-
-## Normal
-
-![bm40rgb-wolff-base](https://user-images.githubusercontent.com/62627597/228848191-cb403c12-c090-4aeb-b207-506e5c80c547.png)
-
-QWERTY, Dvorak, Colemak and Workman are built-in.
-
-## MIDI
-
-![bm40rgb-wolff-midi](https://user-images.githubusercontent.com/62627597/228708182-5ba2b9f4-e1f4-4e10-be6e-58ff373f274a.png)
-
-One and a half octaves piano on the top rows, control signals in the bottom rows. SYM and FUN remain accessible so the ADJ layer can be accessed.
-
-## Joystick
-
-![bm40rgb-wolff-game](https://user-images.githubusercontent.com/62627597/228849208-9fb10cf3-0a11-4799-877a-48eafe811078.png)
-
-Emulates a 32-button joystick for using as a button-box or dedicated game controller.
-
-# Modifier layers
-
-These are activated by holding down modifier keys.
-
-## Navigation Layer (NAV)
-
-![bm40rgb-wolff-nav](https://user-images.githubusercontent.com/62627597/228853095-6c254027-adfb-4afb-9536-4f00e11ab3cb.png)
-
-The layer you'll access most often. Navigation keys right on the right-hand homerow, plus a few common utilities.
-
-## Functions Layer (FUN)
-
-![bm40rgb-wolff-fun](https://user-images.githubusercontent.com/62627597/228852255-3c12d3c8-733a-4680-888c-35a4162cd3a3.png)
-
-## Mouse Layer
-
-![bm40rgb-wolff-mouse](https://user-images.githubusercontent.com/62627597/228853517-08934862-ca70-444d-a6bc-9dec584c6bb5.png)
-
-Emulates mouse actions so you can perform simple tasks without reaching for the mouse.
-
-## Adjust Layer (SYM + FUN)
-
-![bm40rgb-wolff-adj](https://user-images.githubusercontent.com/62627597/228851675-ec61ad2b-95a9-402b-933a-009e9f52fbd3.png)
-
-# Additional/utility layers
-
-These are utility overlays toggled by a key in the Adjust layer.
-
-## Handswap Layer
-
-![bm40rgb-swap-hands](https://user-images.githubusercontent.com/62627597/228849174-e3bca496-9f5a-49d6-a41e-9b65adbc6c34.png)
-
-For one-hand typing. The three top rows are mirrorred when SWAP is held down.
-
-## CPY Layer (One-hand navigation layer)
-
-![bm40rgb-copy](https://user-images.githubusercontent.com/62627597/228847641-4caa777e-c368-4921-a0a4-10c47afa2537.png)
-
-For general navigation and quick copy-paste one-handed stuff. I don't like using it, but my job demands it sometimes.
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev1/rules.mk
index 7e0de4a3e8d..b0daa10a9ce 100755
--- a/keyboards/kprepublic/bm40hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm40hsrgb/rev1/rules.mk
@@ -10,5 +10,3 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-
-LAYOUTS_HAS_RGB = yes
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/config.h b/keyboards/kprepublic/bm40hsrgb/rev2/config.h
index 1cd3f7a6d36..14b45db6707 100755
--- a/keyboards/kprepublic/bm40hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/config.h
@@ -16,6 +16,3 @@
 #pragma once
 
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define RGB_MATRIX_LED_COUNT 47
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/info.json b/keyboards/kprepublic/bm40hsrgb/rev2/info.json
index dac848ed52a..64b35fc25c2 100644
--- a/keyboards/kprepublic/bm40hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/info.json
@@ -62,11 +62,6 @@
           "hue_breathing": true,
           "hue_pendulum": true,
           "hue_wave": true,
-          "pixel_rain": true,
-          "pixel_flow": true,
-          "pixel_fractal": true,
-          "typing_heatmap": true,
-          "digital_rain": true,
           "solid_reactive_simple": true,
           "solid_reactive": true,
           "solid_reactive_wide": true,
@@ -128,7 +123,8 @@
             {"matrix": [3, 9],  "x": 183,  "y": 64, "flags": 1},
             {"matrix": [3, 10], "x": 203,  "y": 64, "flags": 1},
             {"matrix": [3, 11], "x": 224,  "y": 64, "flags": 1}
-        ]
+        ],
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B2", "B3", "D5", "D3", "D2", "B7", "F0", "B4", "B5", "B6", "C6", "C7"],
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/config.h b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/config.h
new file mode 100644
index 00000000000..4a1955c97bb
--- /dev/null
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/config.h
@@ -0,0 +1,59 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x7F, 0x68, 0xF0, 0xAB, 0x45, 0xB5, 0xC7, 0xC2}
+
+// unlock combination
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 11 }
+
+// number of layers
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
+
+#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
+#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+//#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+//#undef ENABLE_RGB_MATRIX_BREATHING
+#undef ENABLE_RGB_MATRIX_BAND_SAT
+#undef ENABLE_RGB_MATRIX_BAND_VAL
+#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#undef ENABLE_RGB_MATRIX_CYCLE_ALL
+//#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+//#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#undef ENABLE_RGB_MATRIX_DUAL_BEACON
+//#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#undef ENABLE_RGB_MATRIX_FLOWER_BLOOMING
+//#undef ENABLE_RGB_MATRIX_RAINDROPS
+#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#undef ENABLE_RGB_MATRIX_HUE_BREATHING
+#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
+#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#undef ENABLE_RGB_MATRIX_SPLASH
+#undef ENABLE_RGB_MATRIX_MULTISPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/keymap.c b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..216d7cb8886
--- /dev/null
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/keymap.c
@@ -0,0 +1,100 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | BLTog| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_ortho_4x12_1x2uC(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  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 ,
+    RGB_TOG, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC,  TL_UPPR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_ortho_4x12_1x2uC(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    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_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_ortho_4x12_1x2uC(
+    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_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_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Adjust (Lower + Raise)
+ *                      v------------------------RGB CONTROL--------------------v
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_ortho_4x12_1x2uC(
+    _______, QK_BOOT,   DB_TOGG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+)
+
+};
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..7ca93e0d4b5
--- /dev/null
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/rules.mk
@@ -0,0 +1,6 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+RGBLIGHT_ENABLE = no
+TAP_DANCE_ENABLE = no
+KEY_OVERRIDE_ENABLE = no
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/vial.json b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/vial.json
new file mode 100755
index 00000000000..ec742db6f01
--- /dev/null
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/keymaps/vial/vial.json
@@ -0,0 +1,18 @@
+{
+    "name": "bm40v2",
+    "vendorId": "0x4B50",
+    "productId": "0x1141",
+    "lighting": ["qmk_lighting"],
+    "matrix": {
+        "rows": 4,
+        "cols": 12
+    },
+    "layouts": {
+        "keymap": [
+            [ "0,0", "0,1", "0,2", "0,3", "0,4", "0,5", "0,6", "0,7", "0,8", "0,9", "0,10", "0,11" ],
+            [ "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11" ],
+            [ "2,0", "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11" ],
+            [ "3,0", "3,1", "3,2", "3,3", "3,4", {"w": 2}, "3,5", "3,7", "3,8", "3,9", "3,10", "3,11" ]
+        ]
+    }
+}
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c
index 4bf91689352..a867cb0f20d 100755
--- a/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c
@@ -17,57 +17,57 @@
 
 #if defined(RGB_MATRIX_ENABLE)
 
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, B_1,  A_1,  C_1 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
 
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
 
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
 
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 }
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 }
 };
 
 #endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h
deleted file mode 100644
index aff98236a56..00000000000
--- a/keyboards/kprepublic/bm43a/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2019 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
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
-#endif
diff --git a/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
deleted file mode 100644
index d759210afdd..00000000000
--- a/keyboards/kprepublic/bm43a/keymaps/stevexyz/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 Stefano Maragò
- *
- * 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] = { // 12+11+11+9
-  [0] = LAYOUT(
-    MT(MOD_LGUI,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_ENT,
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_DOT,
-    KC_LCTL, TT(1), KC_LALT, KC_SPC, MT(MOD_RSFT,KC_SPC), TT(1), KC_LEFT, KC_DOWN, KC_RGHT ),
-  [1] = 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_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
-    KC_LSFT, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_PGUP, KC_SLSH,
-    KC_LCTL, LT(2,KC_APP), KC_LALT, KC_SPC, MT(MOD_RSFT,KC_SPC), LT(2,KC_INS), KC_HOME, KC_PGDN, KC_END ),
-  [2] = LAYOUT(
-    DF(0), KC_PSCR, KC_SCRL, KC_PAUS, KC_PSLS, KC_PAST, KC_7, KC_8, KC_9, KC_PMNS, KC_PEQL, KC_BSPC,
-    KC_CAPS, KC_MPLY, KC_STOP, KC_MPRV, KC_MNXT, XXXXXXX, KC_4, KC_5, KC_6, KC_PPLS, KC_PENT,
-    DF(2), KC_MUTE, KC_VOLD, KC_VOLU, KC_COMM, KC_1, KC_2, KC_3, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2,
-    DF(3), XXXXXXX, XXXXXXX, KC_SPC, KC_0, KC_DOT, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT ),
-  [3] = LAYOUT(
-    DF(0), KC_SLEP, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
-    XXXXXXX, BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ),
-};
-
diff --git a/keyboards/kprepublic/bm43a/keymaps/stevexyz/readme.md b/keyboards/kprepublic/bm43a/keymaps/stevexyz/readme.md
deleted file mode 100644
index 1cb87d6ec25..00000000000
--- a/keyboards/kprepublic/bm43a/keymaps/stevexyz/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-This is a full-featured bm43a layout inspired by the smaller "Super Micro gherkin" and "jj28" sisters.
-
-In addition to the default key layer, there is a function/numbers/symbols layer easily activated with either one of the two "meta" (red) keys and containing almost all keyset missing.
-
-On top of this, activated with both meta keys, there a system layer where are placed media keys, mouse emulation, and Numpad in addition to the PrintScreen/ScrLock/Pause keys. 
-
-The below picture show all layers on the actual keys (if someone would be able to print these labels let me know! :)).
-
-![layout](https://raw.githubusercontent.com/stevexyz/qmk_firmware/master/keyboards/bm43a/keymaps/stevexyz/layout.jpeg)
-
-Notes:
-- The Windows/OS key is overlayed with the Esc one
-- To activate permanently the function/number/symbols layer you can use the "layer tap toggle" functionality (now set to the default 5 presses). For the system layer to be activated permanently is enough to hit shift in this layer (so with the two meta keys pressed)
-- From the System Layer you can "jump" to an additional Lights layer pressing the control key
-- Meta-Esc (or simply Esc from the System and Lights layers) and the keyboard is coming back to default key layer in case they are activated permanently
-
-
-And a view on the actual build:
-
-![layout](https://raw.githubusercontent.com/stevexyz/qmk_firmware/master/keyboards/bm43a/keymaps/stevexyz/actualbuild.jpeg)
-
-In order to compile the module from qmk root directory use the command 'make kprepublic/bm43a:stevexyz'
-
-And in order to upload the new firmware use the command: 'qmk flash -kb kprepublic/bm43a -km stevexyz' (you can initiate programming with keyboard RESET key, that in this keymap has been moved on the backspace button in the "lights" layer)
-
diff --git a/keyboards/kprepublic/bm43a/keymaps/stevexyz/rules.mk b/keyboards/kprepublic/bm43a/keymaps/stevexyz/rules.mk
deleted file mode 100644
index 4b1dd152b5f..00000000000
--- a/keyboards/kprepublic/bm43a/keymaps/stevexyz/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMMAND_ENABLE = no         # Commands for debug and configuration
-CONSOLE_ENABLE = no         # Console for debug
-
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
deleted file mode 100755
index 6f98093e33a..00000000000
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2021 bitstarr
-
-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 UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
-#define UNICODE_CYCLE_PERSIST false
-
-#undef RGBLIGHT_EFFECT_BREATHING
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
deleted file mode 100755
index 6a4ca7550db..00000000000
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2021 bitstarr
- *
- * 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 WORD_BACK C(KC_LEFT)
-#define WORD_FORWARD C(KC_RIGHT)
-
-enum layers {
-	_BASE,
-    _EXT,
-	_ADV,
-	_FN,
-	_UNI,
-	_UNI2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        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_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(_EXT,KC_SPC), MO(_UNI), MO(_ADV), MO(_FN), KC_RCTL
-    ),
-    [_EXT] = LAYOUT(
-        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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
-        KC_TRNS, KC_F11, KC_F12, KC_NO, KC_NO, KC_GRV, KC_SCLN, KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
-    ),
-    [_ADV] = LAYOUT(
-        KC_GRV, WORD_BACK, KC_UP, WORD_FORWARD, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_NO, KC_PSCR, KC_DEL,
-        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END, KC_NO,
-        KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_INS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
-    ),
-    [_FN] = LAYOUT(
-        KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, 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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-    [_UNI] = LAYOUT(
-        KC_NO, KC_NO, KC_NO, UC(L'€'), UC(L'§'), UC(L'°'), KC_NO, UC(L'ü'), KC_NO, UC(L'ö'), UC(L'–'), KC_NO,
-        KC_NO, UC(L'ä'), UC(L'ß'), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        MO(_UNI2), UC(L'„'), UC(L'“'), UC(L'”'), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UC(L'…'), KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, UC_NEXT
-    ),
-    [_UNI2] = LAYOUT(
-        KC_NO, KC_NO, KC_NO, UC(L'é'), KC_NO, KC_NO, KC_NO, UC(L'Ü'), KC_NO, UC(L'Ö'), UC(L'—'), KC_NO,
-        KC_NO, UC(L'Ä'), 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, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-};
-
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
deleted file mode 100755
index 704be0e4167..00000000000
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# Personal Layout of [bitstarr](https://github.com/bitstarr)
-
-I use an US ANSI Layout and set the OS to the US Keyboard. Since I'm german, I need to use some special characters once in a while - that's what the UNI and UNI2 Layers are for. Under Windows we have to rely on [WinCompose](https://github.com/samhocevar/wincompose) to work as intended.
-
-    qmk compile -kb kprepublic/bm43hsrgb -km bitstarr
-
-## 0 Qwerty
-```
-,----------------------------------------------------------------------------.
-|  ESC  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  Bscp  |
-|----------------------------------------------------------------------------+
-|  Tab    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Enter     |
-|----------------------------------------------------------------------------+
-|  Shift         |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |
-|----------------------------------------------------------------------------+
-| Ctrl | Win | Alt |  Space         |  Space/EXT     | UNI | ADV | FN | Ctrl |
-`----------------------------------------------------------------------------'
-```
-
-## 1 EXT Layer
-```
-EXT Layer
-,----------------------------------------------------------------------------.
-|   1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  O  |   -   |   +   |
-|----------------------------------------------------------------------------+
-|  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 |  F10 |  Enter        |
-|----------------------------------------------------------------------------+
-|  Shift         |  F11 |  F12 |    |    |  `  |  ;  |  '  |  [  |  ]  |  \  |
-|----------------------------------------------------------------------------+
-| Ctrl | Win | Alt |  Space         |                |     |     |    | Ctrl |
-`----------------------------------------------------------------------------'
-```
-
-* Numbers
-* F-Keys
-* Brackets, Punctuation, Special Characters
-
-## 2 ADV Layer
-```
-ADV Layer
-,----------------------------------------------------------------------------.
-|  `  |  W→  |  ↑  |  W←  |     |     |     |     |  ⇞  |     |  PS  |  Del  |
-|----------------------------------------------------------------------------+
-|  Tab    |  ←  |  ↓  |   →  |     |     |     |  ↖  |  ⇟  |  ↘︎  |           |
-|----------------------------------------------------------------------------+
-|  Shift    |  ⏮  |  ⏯  |  ⏭  |  🔉  |  🔇  |  🔊  |   |   |   |  Ins  |
-|----------------------------------------------------------------------------+
-| Ctrl | Win | Alt |  Space         |                |     |     |    | Ctrl |
-`----------------------------------------------------------------------------'
-```
-
-* Arrows, Word skips
-* Print Screen, Page Up, Page Down
-* Home, End, Ins, Del
-* Media
-
-## 3 FN Layer
-```
-FN Layer
-,----------------------------------------------------------------------------.
-|      |     |     |     |  RESET  |     |     |     |     |     |     |     |
-|----------------------------------------------------------------------------+
-|        |     |     |     |     |     |     |     |     |     |             |
-|----------------------------------------------------------------------------+
-|          | RGB_T | RGB_M |  H+  |  H-  |  S+  |  S-  |  B+  |  B-  |   |   |
-|----------------------------------------------------------------------------+
-|      |     |     |                |                |     |     |     |     |
-`----------------------------------------------------------------------------'
-```
-
-* RGB, Toggle, Mode, Hue, Saturation, Brightness
-* Reset
-
-## 4 UNI Layer
-```
-UNI Layer
-,----------------------------------------------------------------------------.
-|       |     |     |  €  |  §  |  °  |     |  ü  |     |  ö  |   –   |      |
-|----------------------------------------------------------------------------+
-|         |  ä  |  ß  |     |     |     |     |     |     |     |            |
-|----------------------------------------------------------------------------+
-|  UNI2       |  „  |  “  |  ”  |     |     |     |     |     |   …   |      |
-|----------------------------------------------------------------------------+
-|      |     |     |  Space        |  Space        |     |     |     | Mode  |
-`----------------------------------------------------------------------------'
-```
-
-* Umlauts
-* Punctuation
-* Special Characters
-* Switching [Input Modes](https://beta.docs.qmk.fm/using-qmk/software-features/feature_unicode#2-input-modes-id-input-modes) (UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS)
-
-## 5 UNI2 Layer
-```
-UNI2 Layer
-,----------------------------------------------------------------------------.
-|       |     |     |  é  |     |     |     |  Ü  |     |  Ü  |   —   |      |
-|----------------------------------------------------------------------------+
-|         |  Ä  |     |     |     |     |     |     |     |     |            |
-|----------------------------------------------------------------------------+
-|  UNI2       |     |     |     |     |     |     |     |     |       |      |
-|----------------------------------------------------------------------------+
-|      |     |     |  Space        |  Space        |     |     |     |       |
-`----------------------------------------------------------------------------'
-```
-
-* Capital Umlauts
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/rules.mk b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/rules.mk
deleted file mode 100755
index e7b2d0a65eb..00000000000
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-UNICODE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
deleted file mode 100644
index 6a3bee5a52d..00000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Copyright 2020 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
-
-#define RGB_MATRIX_LED_COUNT 69
-#    define RGB_MATRIX_KEYPRESSES
-#ifdef RGB_MATRIX_ENABLE
-#    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 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
-#    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
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index 589f4310f71..31527a79fa6 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -12,7 +12,53 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180
     },
     "rgblight": {
         "max_brightness": 180
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c
deleted file mode 100644
index da5aa92901c..00000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 jbradforddillon
- *
- * 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_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_GRV,       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,  RSFT_T(KC_SLSH),        KC_UP,   LT(1,KC_DEL),
-        KC_LCTL,   KC_LALT,   KC_LGUI,                       KC_SPC,                              KC_RGUI, MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        QK_BOOT, 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, RGB_SPI, RGB_SPD, _______, _______, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
-        _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______
-    ),
-    [2] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
-        _______, _______, _______,                          _______,                       _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    )
-
-};
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md
deleted file mode 100644
index aa2009e1e87..00000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-I set this up the same way I set up my dz60 boards. 
-- Apple layout,  
-- Capslock replaced with grave/tilde,
-- RShift doubles as forward slash, and 
-- Delete doubles as a layer shift. 
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index e4089e9fd53..1d2b071fc16 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -15,66 +15,13 @@
  */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-
-#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_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#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_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
-#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 DRIVER_1_LED_TOTAL 63
-//#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
+#define IS31FL3733_LED_COUNT 63
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
     #define RGB_MATRIX_DISABLE_KEYCODES
 #endif
 
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-
-#define IS31FL3733_LED_COUNT DRIVER_1_LED_TOTAL
-
 // Underglow LEDs are WS2812, but someone might want to use RGBLIGHT for them;
 // don't use those LEDs in RGB Matrix in that case.
 #ifdef RGBLIGHT_ENABLE
@@ -84,8 +31,3 @@
 #endif
 
 #define RGB_MATRIX_LED_COUNT (IS31FL3733_LED_COUNT + WS2812_LED_TOTAL)
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 47c0b8081a1..9a77549e685 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -12,7 +12,48 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "custom"
+        "animations":{
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "custom",
+        "max_brightness": 120,
+        "sleep": true
     },
     "rgblight": {
         "saturation_steps": 8,
@@ -30,6 +71,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index 0e9b3d318d4..3ee74755fad 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -23,73 +23,73 @@
 #    include "ws2812.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1, A_1, C_1 },
-    { 0, B_2, A_2, C_2 },
-    { 0, B_3, A_3, C_3 },
-    { 0, B_4, A_4, C_4 },
-    { 0, B_5, A_5, C_5 },
-    { 0, B_6, A_6, C_6 },
-    { 0, B_7, A_7, C_7 },
-    { 0, B_8, A_8, C_8 },
-    { 0, B_9, A_9, C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_14, G_14, I_14 },
-
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
-
-    { 0, H_16, G_16, I_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_13, G_13, I_13 },
-    { 0, E_15, D_15, F_15 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_16, J_16, L_16 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 }
+    { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+    { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+    { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+    { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+    { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+    { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+    { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+    { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+    { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
 };
 
 led_config_t g_led_config = {
@@ -153,16 +153,16 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
 
 static void rgb_matrix_driver_init(void) {
     i2c_init();
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE);
+    is31fl3733_init(0);
     for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
         bool enabled = true;
         is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
     }
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
+    is31fl3733_update_led_control_registers(0);
 }
 
 static void rgb_matrix_driver_flush(void) {
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
+    is31fl3733_update_pwm_buffers(0);
 #    if WS2812_LED_TOTAL > 0
     ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
 #    endif
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
deleted file mode 100644
index 2f02594e156..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2020 bdtc123
- * Copyright 2021 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
-
-#define RGB_MATRIX_LED_COUNT 69
-    #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
-#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_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#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_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
-#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
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index a18aa9d4f5f..675d148604c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -12,7 +12,47 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 140
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index eb1b76382b5..5edcec6eb4a 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -15,60 +15,8 @@
  */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define DRIVER_1_LED_TOTAL 63
-#    define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
-#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_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#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_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
-#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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
     #define RGB_MATRIX_DISABLE_KEYCODES
 #endif
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index d78ae63740d..3b97f904ab7 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -12,7 +12,33 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "is31fl3733",
+        "max_brightness": 180,
+        "sleep": true
     },
     "rgblight": {
         "saturation_steps": 8,
@@ -30,7 +56,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
-        }
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        }   
     },
     "matrix_pins": {
         "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
index fc40e0fa9ae..eca53e98934 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
@@ -15,74 +15,74 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, B_1, A_1, C_1 },
-    { 0, B_2, A_2, C_2 },
-    { 0, B_3, A_3, C_3 },
-    { 0, B_4, A_4, C_4 },
-    { 0, B_5, A_5, C_5 },
-    { 0, B_6, A_6, C_6 },
-    { 0, B_7, A_7, C_7 },
-    { 0, B_8, A_8, C_8 },
-    { 0, B_9, A_9, C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+    { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+    { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+    { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+    { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+    { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+    { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+    { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+    { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
 
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
 
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_14, G_14, I_14 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
 
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
 
-    { 0, H_16, G_16, I_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_13, G_13, I_13 },
-    { 0, E_15, D_15, F_15 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_16, J_16, L_16 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 }
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
deleted file mode 100644
index 563ac242c86..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Copyright 2020 markva
-
-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_MATRIX_LED_COUNT 70
-#    define RGB_MATRIX_KEYPRESSES
-#ifdef RGB_MATRIX_ENABLE
-#    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 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
-#    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
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index ad67cc28c3e..297c2dc48f0 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -12,7 +12,53 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index 00d55f8ee01..ea594e53cf7 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -17,73 +17,8 @@
  */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    define DISABLE_RGB_MATRIX_RAINDROPS
-#    define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define DRIVER_1_LED_TOTAL 64
-
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
-
-// Note: The RGB LED driver configuration is not inside #ifdef blocks, so that
-// the driver code would still compile even without RGBLIGHT_ENABLE and
-// RGB_MATRIX_ENABLE (usually this is not required, but with the custom
-// IS31FL3733+WS2812 driver setup used by this board the LED controller drivers
-// are compiled unconditionally).
-
-#define IS31FL3733_LED_COUNT DRIVER_1_LED_TOTAL
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_LED_COUNT 64
 
 // Underglow LEDs are WS2812, but someone might want to use RGBLIGHT for them;
 // don't use those LEDs in RGB Matrix in that case.
@@ -94,8 +29,3 @@
 #endif
 
 #define RGB_MATRIX_LED_COUNT (IS31FL3733_LED_COUNT + WS2812_LED_TOTAL)
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
index 6c577a283ea..111534b0f81 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@@ -12,7 +12,56 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "custom"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "custom",
+        "max_brightness": 180,
+        "sleep": true
     },
     "rgblight": {
         "saturation_steps": 8,
@@ -30,6 +79,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
index 2cfe18e08ef..e7641bf4e5e 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
@@ -24,75 +24,75 @@
 #    include "ws2812.h"
 
 
-const PROGMEM is31fl3733_led_t g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1, A_1, C_1 },
-    { 0, B_2, A_2, C_2 },
-    { 0, B_3, A_3, C_3 },
-    { 0, B_4, A_4, C_4 },
-    { 0, B_5, A_5, C_5 },
-    { 0, B_6, A_6, C_6 },
-    { 0, B_7, A_7, C_7 },
-    { 0, B_8, A_8, C_8 },
-    { 0, B_9, A_9, C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
-
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
-
-    { 0, H_16, G_16, I_16 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_15, G_15, I_15 },
-    { 0, E_15, D_15, F_15 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
-    { 0, B_16, A_16, C_16 },
-    { 0, B_15, A_15, C_15 },
-    { 0, E_16, D_16, F_16 }
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+    { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+    { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+    { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+    { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+    { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+    { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+    { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+    { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
 };
 
 led_config_t g_led_config = { {
@@ -153,16 +153,16 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
 
 static void rgb_matrix_driver_init(void) {
     i2c_init();
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE);
+    is31fl3733_init(0);
     for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
         bool enabled = true;
         is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
     }
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
+    is31fl3733_update_led_control_registers(0);
 }
 
 static void rgb_matrix_driver_flush(void) {
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
+    is31fl3733_update_pwm_buffers(0);
 #    if WS2812_LED_TOTAL > 0
     ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
 #    endif
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
deleted file mode 100644
index 6e721bb7c06..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright 2020 ipetepete
-
-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_MATRIX_LED_COUNT 67
-    #define RGB_MATRIX_KEYPRESSES
-
-#ifdef RGB_MATRIX_ENABLE
-#    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 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
-#    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
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index d6368610ff5..5840054b8cf 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -12,7 +12,52 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180
     },
     "rgblight": {
         "saturation_steps": 8,
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
deleted file mode 100644
index 816e95d1c1a..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copiright 2021 Carlo Sala (@carlosala)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define FORCE_NKRO
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 150
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c
deleted file mode 100644
index c58517e8b60..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copiright 2021 Carlo Sala (@carlosala)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_60_ansi(
-        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,
-        LT(2, 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_ESC, 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, RSFT_T(KC_CAPS),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL),
-    [1] = LAYOUT_60_ansi(
-        _______, 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_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_HOME, KC_END, _______, KC_PSCR, _______, _______, _______,
-        _______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_TOG, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______),
-    [2] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-        _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, UC(0x00B7), _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, QK_BOOT)
-};
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
deleted file mode 100644
index f5c69561fcd..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = yes
-UNICODE_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
deleted file mode 100644
index 8da5f085727..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 David Martinz
-  *
-  * 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_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(1), KC_RCTL),
-	[1] = 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,
-	                     QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_UP, KC_INS, KC_HOME, KC_END,
-	                     KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, 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_PGUP, KC_PGDN, KC_TRNS, KC_TRNS,
-	                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-#ifdef RGB_MATRIX_ENABLE
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    // caps lock white
-    if (host_keyboard_led_state().caps_lock) {
-        RGB_MATRIX_INDICATOR_SET_COLOR(28, 200, 200, 200);
-    }
-
-    // layer state
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            // RGB_MATRIX_INDICATOR_SET_COLOR(59, 0, 0, 0);
-            break;
-        case 1:
-            RGB_MATRIX_INDICATOR_SET_COLOR(59, 128, 0, 0);
-            break;
-        case 2:
-            RGB_MATRIX_INDICATOR_SET_COLOR(59, 0, 128, 0);
-            break;
-        case 3:
-            RGB_MATRIX_INDICATOR_SET_COLOR(59, 0, 0, 128);
-            break;
-        default:
-            // white
-            RGB_MATRIX_INDICATOR_SET_COLOR(59, 128, 128, 128);
-            break;
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
deleted file mode 100644
index b9a297c10ea..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Copyright 2020 ipetepete
-  *
-  * 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,
-_gamer,
-_colemak,
-_fn,
-_rgb,
-_spcfn
-};
-
-
-enum keycodes {
-gamer = SAFE_RANGE,
-qwerty,
-colemak
-};
-
-#define KC_SPFN LT(_spcfn, KC_SPC) // press for space, hold for function layer (aka spacefn)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_qwerty] = LAYOUT_60_ansi(
-        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_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,
-        CTL_T(KC_ESC), 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_SPFN,                             KC_RALT, KC_RCTL, MO(_fn),   MO(_rgb)
-    ),
-    // Gamer standard qwerty layout but with normal space for jumping etc
-    [_gamer] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            KC_SPACE,                            _______, _______, _______, _______
-    ),
-    [_colemak] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-        _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,  _______, _______, _______,
-        _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,     KC_QUOT,          _______,
-        _______,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    _______, _______, _______,           _______,
-        _______, _______, _______,                            KC_SPFN,                            _______, _______, _______,  _______
-    ),
-    [_fn] = LAYOUT_60_ansi(
-        QK_GESC, 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_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
-        KC_MPLY,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
-        qwerty, colemak, gamer,                            _______,                            _______, _______, _______, _______
-    ),
-    [_rgb] = LAYOUT_60_ansi(
-        _______, 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_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-    [_spcfn] = LAYOUT_60_ansi(
-        _______, SGUI(1), SGUI(2), SGUI(3), SGUI(4), SGUI(5), SGUI(6), SGUI(7),  SGUI(8), SGUI(9), SGUI(0), _______,  _______, KC_DEL,
-        _______, _______, _______, KC_PGUP, _______, KC_LBRC, KC_RBRC,  _______, KC_UP,   _______, _______, _______,  _______, _______,
-        KC_CAPS, _______, _______, KC_PGDN, _______, KC_LCBR, KC_RCBR,  KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, KC_LPRN, KC_RPRN,  _______, _______, _______, _______,           _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-      case qwerty:
-        if (record->event.pressed) {
-            layer_clear();
-            layer_on(_qwerty);
-            set_single_persistent_default_layer(_qwerty);
-        }
-        return false;
-        break;
-      case colemak:
-        if (record->event.pressed) {
-            layer_clear();
-            layer_on(_colemak);
-        }
-        return false;
-        break;
-      case gamer:
-        if (record->event.pressed) {
-            layer_clear();
-            layer_on(_gamer);
-        }
-        return false;
-        break;
-
-  }
-  return true;
-}
-
-void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-  for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-    if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-        rgb_matrix_set_color( i, red, green, blue );
-    }
-  }
-}
-
-
-bool rgb_matrix_indicators_user(void)
-{
-	if (!g_suspend_state && rgb_matrix_config.enable) {
-        switch (get_highest_layer(layer_state)) {
-            //case _qwerty:
-            //    rgb_matrix_set_color(26, 0xFF, 0x00, 0x00);
-            //    break;
-            case _colemak:
-                rgb_matrix_set_color(55, 0xFF, 0xFF, 0xFF);
-                break;
-            case _spcfn:
-                rgb_matrix_set_color(22, 0xFF, 0x00, 0x00);
-                rgb_matrix_set_color(35, 0xFF, 0x00, 0x00);
-                rgb_matrix_set_color(36, 0xFF, 0x00, 0x00);
-                rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
-                break;
-            case _gamer:
-                rgb_matrix_set_color(16, 0xFF, 0x00, 0xFF);
-                rgb_matrix_set_color(29, 0xFF, 0x00, 0xFF);
-                rgb_matrix_set_color(30, 0xFF, 0x00, 0xFF);
-                rgb_matrix_set_color(31, 0xFF, 0x00, 0xFF);
-                break;
-        }
-    }
-    return false;
-}
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md
deleted file mode 100644
index 7d381ff125b..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Simple 60% for coding
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk
deleted file mode 100644
index 3a025ba3a39..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-NKRO_ENABLE = yes # USB Nkey Rollover
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index a877e182a65..b5ff897b188 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -15,72 +15,8 @@
  */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#    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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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 180
-
-
-
-
-
-// Note: The RGB LED driver configuration is not inside #ifdef blocks, so that
-// the driver code would still compile even without RGBLIGHT_ENABLE and
-// RGB_MATRIX_ENABLE (usually this is not required, but with the custom
-// IS31FL3733+WS2812 driver setup used by this board the LED controller drivers
-// are compiled unconditionally).
-
-// Configure the IS31FL3733 driver for per-key RGB LEDs
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define DRIVER_1_LED_TOTAL 61
-
-#define IS31FL3733_LED_COUNT DRIVER_1_LED_TOTAL
+#define IS31FL3733_LED_COUNT 61
 
 // Underglow LEDs are WS2812, but someone might want to use RGBLIGHT for them;
 // don't use those LEDs in RGB Matrix in that case.
@@ -91,8 +27,3 @@
 #endif
 
 #define RGB_MATRIX_LED_COUNT (IS31FL3733_LED_COUNT + WS2812_LED_TOTAL)
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index 82d1974f06e..9f16eb21210 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -12,7 +12,53 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "custom"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "custom",
+        "max_brightness": 120,
+        "sleep": true
     },
     "rgblight": {
         "saturation_steps": 8,
@@ -29,6 +75,9 @@
             "static_gradient": true,
             "rgb_test": true,
             "alternating": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
index 2e66a3096e5..5cb6d850c9f 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -22,71 +22,71 @@
 #    include "ws2812.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1, A_1, C_1 },
-    { 0, B_2, A_2, C_2 },
-    { 0, B_3, A_3, C_3 },
-    { 0, B_4, A_4, C_4 },
-    { 0, B_5, A_5, C_5 },
-    { 0, B_6, A_6, C_6 },
-    { 0, B_7, A_7, C_7 },
-    { 0, B_8, A_8, C_8 },
-    { 0, B_9, A_9, C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_14, G_14, I_14 },
-
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_13, J_13, L_13 },
-
-    { 0, H_16, G_16, I_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_13, G_13, I_13 },
-    { 0, E_15, D_15, F_15 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
-    { 0, K_12, J_12, L_12 },
-    { 0, E_16, D_16, F_16 }
+    { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+    { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+    { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+    { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+    { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+    { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+    { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+    { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+    { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
 };
 
 led_config_t g_led_config = {
@@ -149,16 +149,16 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
 
 static void rgb_matrix_driver_init(void) {
     i2c_init();
-    is31fl3733_init(IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE);
+    is31fl3733_init(0);
     for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
         bool enabled = true;
         is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
     }
-    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
+    is31fl3733_update_led_control_registers(0);
 }
 
 static void rgb_matrix_driver_flush(void) {
-    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
+    is31fl3733_update_pwm_buffers(0);
 #    if WS2812_LED_TOTAL > 0
     ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
 #    endif
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index ef410e94412..944a3a8423a 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 73
-    #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/config.h b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/config.h
deleted file mode 100644
index 0e066527156..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 deadolus 2022 p4yne
- *
- * 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/>.
- */
-
-// place overrides here
-
-#pragma once
-#define LSPO_KEYS KC_LSFT, KC_LSFT, KC_8
-#define RSPC_KEYS KC_RSFT, KC_LSFT, KC_9
-#define LAPO_KEYS KC_LALT, KC_RALT, KC_QUOT
-#define RAPC_KEYS KC_RALT, KC_RALT, KC_NUHS
-
-#define LEADER_TIMEOUT 1000
-#define LEADER_PER_KEY_TIMING 250
-
-// control underglow
-// i.e. switch it off
-//#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
-//#define RGBLIGHT_DEFAULT_HUE 0
-//#define RGBLIGHT_DEFAULT_SAT UINT8_MAX
-//#define RGBLIGHT_DEFAULT_SAT 0
-//#define RGBLIGHT_DEFAULT_VAL RGBLIGHT_LIMIT_VAL
-//#define RGBLIGHT_DEFAULT_VAL 0
-//#define RGBLIGHT_DEFAULT_SPD 0 
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/custom_keymap.h b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/custom_keymap.h
deleted file mode 100644
index 8f11e4072bf..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/custom_keymap.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2019 ash0x0 2021 peepeetee, deadolus 2022 p4yne
- *
- * 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 "print.h"
-#include <string.h>
-// HID has not yet been implemented for this keyboard
-// #include "raw_hid.h"
-
-#define MILLISECONDS_IN_SECOND 1000
-
-// Custom HSV values
-#define C_HSV_WINERED        0, 255,  85
-#define C_HSV_DARKGOLD      36, 255,  85
-#define C_HSV_DARKBLUE     170, 255,  85
-
-// Default color HSV Values (for inspiration)
-// #define HSV_AZURE       132, 102, 255
-// #define HSV_BLACK         0,   0,   0
-// #define HSV_BLUE        170, 255, 255
-// #define HSV_CHARTREUSE   64, 255, 255
-// #define HSV_CORAL        11, 176, 255
-// #define HSV_CYAN        128, 255, 255
-// #define HSV_GOLD         36, 255, 255
-// #define HSV_GOLDENROD    30, 218, 218
-// #define HSV_GREEN        85, 255, 255
-// #define HSV_MAGENTA     213, 255, 255
-// #define HSV_ORANGE       28, 255, 255
-// #define HSV_PINK        234, 128, 255
-// #define HSV_PURPLE      191, 255, 255
-// #define HSV_RED           0, 255, 255
-// #define HSV_SPRINGGREEN 106, 255, 255
-// #define HSV_TEAL        128, 255, 128
-// #define HSV_TURQUOISE   123,  90, 112
-// #define HSV_WHITE         0,   0, 255
-// #define HSV_YELLOW       43, 255, 255
-// #define HSV_OFF         HSV_BLACK
-
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-#define RGB_DEFAULT_TIME_OUT 30
-#define RGB_FAST_MODE_TIME_OUT 3
-#define RGB_TIME_OUT_MAX 600
-#define RGB_TIME_OUT_MIN 10
-#define RGB_TIME_OUT_STEP 10
-
-bool disable_layer_color;
-
-uint8_t dfa_state;  //state for my language switching DFA
-
-
-bool rgb_enabled_flag;                  // Current LED state flag. If false then LED is off.
-bool rgb_time_out_enable;               // Idle LED toggle enable. If false then LED will not turn off after idle timeout.
-bool rgb_time_out_fast_mode_enabled;    // Enable flag for RGB timeout fast mode
-bool rgb_time_out_user_value;           // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable.
-uint16_t rgb_time_out_seconds;          // Idle LED timeout value, in seconds not milliseconds
-uint16_t rgb_time_out_saved_seconds;    // The saved user config for RGB timeout period
-led_flags_t rgb_time_out_saved_flag;    // Store LED flag before timeout so it can be restored when LED is turned on again.
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
deleted file mode 100644
index 03d1ddabedf..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/* Copyright 2019 ashlar 2021 peepeetee, deadolus 2022 p4yne
- *
- * 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 "custom_keymap.h"
-#include "sendstring_german.h"
-
-#ifdef TAP_DANCE_ENABLE
-enum {
-  TD_HOME_END,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-  // tap once for home, twice for end
-  [TD_HOME_END] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
-};
-#endif
-
-// Custom layer types
-enum layertypes {
-  LYR_SOLID, // fullsize coloring
-  LYR_TRANS, // used keys in layer color, lower layer shines through on unused keys
-  LYR_BLACK  // only used key in layer color
-};
-
-// Defines names for use in layer keycodes and the keymap
-enum layers {
-  _LVL0_,
-  _LVL1_,
-  _LVL2_,
-  _LVL3_,
-  _LVL4_,
-  _LVL5_,
-  _LVL6_,
-  _LVL7_
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│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│Ctrl│ │ ← │ ↓ │ → │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-#ifdef TAP_DANCE_ENABLE
-/* 0: ISO qwertz, SPACECADET and TAPDANCE */
-/*  [_LVL0_] = LAYOUT_65_iso_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_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,          TD(TD_HOME_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_NUHS, KC_ENT,  KC_PGUP,
-      SC_LSPO, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, MO(_LVL1_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
- */
-/* 0: ISO DE qwertz, SPACECADET and TAPDANCE */
-  [_LVL0_] = LAYOUT_65_iso_blocker(
-      KC_ESC,     DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,      DE_SS,   DE_ACUT, KC_BSPC, KC_DEL,
-      KC_TAB,     DE_Q,    DE_W,    DE_E,    DE_R,    DE_T,    DE_Z,    DE_U,    DE_I,    DE_O,    DE_P,      DE_UDIA, DE_PLUS,          TD(TD_HOME_END),
-      KC_CAPS,    DE_A,    DE_S,    DE_D,    DE_F,    DE_G,    DE_H,    DE_J,    DE_K,    DE_L,    DE_ODIA,   DE_ADIA, DE_HASH, KC_ENT,  KC_PGUP,
-      SC_LSPO, DE_LABK,    DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,    DE_N,    DE_M,    DE_COMM, DE_DOT,    DE_MINS, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, MO(_LVL1_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-#else
-  /* 0: ISO qwertz, SPACECADET but no TAPDANCE */
-  [_LVL0_] = LAYOUT_65_iso_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_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_ENT,  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_PGUP,
-      SC_LSPO, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, MO(_LVL1_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-#endif
-  /* 1: Function key, multimedia control, layer switching board and LEADER */
-  [_LVL1_] = LAYOUT_65_iso_blocker(
-      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,     _______,    LGUI(KC_END),
-      S(KC_GRV), _______,    _______,    _______,    _______,    _______,    _______,    _______, _______, _______, _______, _______, _______,                LGUI(KC_PAUSE),
-      QK_BOOT,     TO(_LVL2_), TO(_LVL3_), TO(_LVL4_), TO(_LVL5_), TO(_LVL6_), TO(_LVL7_), _______, _______, _______, KC_BRIU, _______, KC_MUTE,    TO(_LVL0_), KC_VOLU,
-      _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______, _______, _______, KC_BRID, _______, S(KC_MUTE), KC_MPLY,    KC_VOLD,
-      _______,   _______,    _______,                            QK_LEAD,                                  _______, _______,          KC_MPRV,    KC_MSTP,    KC_MNXT
-      ),
-  /* 2: Mouse layer and virtual/multiple desktop navigation */
-  [_LVL2_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,      _______,
-      _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, KC_PGDN, KC_PGUP, KC_PSCR, KC_WH_U, _______, _______,                    _______,
-      _______, _______, KC_BTN1, KC_BTN2, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_WH_D, _______, _______,      TO(_LVL0_),   _______,
-      _______, _______, _______, _______, _______, _______, _______, KC_HOME,  KC_END, _______, _______, _______, _______,      LCA(KC_UP),   LCA(KC_E),
-      _______, _______, _______,                   _______,                            _______, _______,          LCA(KC_LEFT), LCA(KC_DOWN), LCA(KC_RGHT)
-      ),
-#ifdef DYNAMIC_MACRO_ENABLE
-  /* 3: Dynamic macro, NUMPAD and settings */
-  [_LVL3_] = LAYOUT_65_iso_blocker(
-      _______, DM_PLY1, DM_PLY2, _______, _______,  _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,    _______,
-      _______, DM_REC1, DM_REC2, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,             _______,
-      _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, TO(_LVL0_), _______,
-      _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,    _______,
-      _______, _______, _______,                    RGB_TOG,                            KC_0,    KC_PCMM,          _______, _______,    _______
-      ),
-#else
-  /* 3: NUMPAD and settings */
-  [_LVL3_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,    _______,
-      _______, _______, _______, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,             _______,
-      _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, TO(_LVL0_), _______,
-      _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,    _______,
-      _______, _______, _______,                    RGB_TOG,                            KC_0,    KC_PCMM,          _______, _______,    _______
-      ),
-#endif
-  /* Gaming layer no TAPDANCE no SPACECADET simple QWERTZ layout for custom coloring */
-  [_LVL4_] = LAYOUT_65_iso_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_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, TO(_LVL0_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-  /* 5: ISO qwerty DE 2 US Base Layer */
-  [_LVL5_] = LAYOUT_65_iso_blocker(
-      KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,       DE_MINS, DE_EQL,     KC_BSPC, KC_DEL,
-      KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    DE_Y,    KC_U,    KC_I,    KC_O,    KC_P,       DE_LBRC, DE_RBRC,             KC_HOME,
-      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_SCLN,    DE_QUOT, DE_BSLS,    KC_ENT,  KC_PGUP,
-      MO(_LVL6_), DE_GRV,  DE_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    DE_COMM, DE_DOT,     DE_SLSH, MO(_LVL6_), KC_UP,   KC_PGDN,
-      KC_LCTL,    KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, TO(_LVL0_),          KC_LEFT,    KC_DOWN, KC_RGHT
-      ),
-  /* 6: ISO qwerty DE 2 US Shifted Layer */
-  [_LVL6_] = LAYOUT_65_iso_blocker(
-      _______, DE_EXLM, DE_AT,   DE_HASH, DE_DLR,  DE_PERC, DE_CIRC, DE_AMPR, DE_ASTR, DE_LPRN, DE_RPRN,    DE_UNDS, DE_PLUS, _______, _______,
-      _______, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), S(DE_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P),    DE_LCBR, DE_RCBR,          KC_END,
-      KC_CAPS, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), S(KC_H), S(KC_J), S(KC_K), S(KC_L), DE_COLN,    DE_DQUO, DE_PIPE, _______, _______,
-      KC_LSFT, DE_TILD, S(DE_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), S(KC_N), S(KC_M), DE_LABK, DE_RABK,    DE_QUES, KC_RSFT, _______, _______,
-      _______, _______, _______,                   _______,                            _______, TO(_LVL0_),          _______, _______, _______
-      ),
-/* Led Type Lighting Layer functionally equivalent to _LVL0_ / layer 0 */
-#ifdef TAP_DANCE_ENABLE
-  /* 7: ISO DE qwertz, SPACECADET and TAPDANCE */
-  [_LVL7_] = LAYOUT_65_iso_blocker(
-      KC_ESC,     DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,      DE_SS,   DE_ACUT, KC_BSPC, KC_DEL,
-      KC_TAB,     DE_Q,    DE_W,    DE_E,    DE_R,    DE_T,    DE_Z,    DE_U,    DE_I,    DE_O,    DE_P,      DE_UDIA, DE_PLUS,          TD(TD_HOME_END),
-      KC_CAPS,    DE_A,    DE_S,    DE_D,    DE_F,    DE_G,    DE_H,    DE_J,    DE_K,    DE_L,    DE_ODIA,   DE_ADIA, DE_HASH, KC_ENT,  KC_PGUP,
-      SC_LSPO, DE_LABK,    DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,    DE_N,    DE_M,    DE_COMM, DE_DOT,    DE_MINS, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, TO(_LVL0_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-#else
-  /* 7: ISO qwertz, SPACECADET but no TAPDANCE */
-  [_LVL7_] = LAYOUT_65_iso_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_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,
-      SC_LSPO, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, TO(_LVL0_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-#endif
-
-
-  /*template
-    [_UL] = LAYOUT_65_iso_blocker(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-    )
-    */
-};
-
-
-// layer color and type
-const uint8_t PROGMEM ledmap[][4] = {
-  // LEDs off on Layer 0
-  //[_LVL0_] = {{0, 0, 0},       LYR_SOLID},
-  [_LVL0_] = {C_HSV_WINERED,   LYR_SOLID},
-  [_LVL1_] = {HSV_RED,         LYR_TRANS},
-  [_LVL2_] = {HSV_MAGENTA,     LYR_BLACK},
-  [_LVL3_] = {HSV_PURPLE,      LYR_BLACK},
-  [_LVL4_] = {C_HSV_DARKGOLD,  LYR_SOLID},
-  [_LVL5_] = {C_HSV_DARKBLUE,  LYR_SOLID},
-  [_LVL6_] = {HSV_BLUE,        LYR_TRANS},
-  [_LVL7_] = {C_HSV_WINERED,   LYR_SOLID}
-};
-
-
-void keyboard_post_init_user(void) {
-  // Call the post init code.
-#ifdef CONSOLE_ENABLE
-  debug_enable=true;
-  debug_matrix=true;
-#endif
-  //rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-  //rgb_matrix_set_flags(LED_FLAG_NONE);
-  rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-  //rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
-  //rgb_matrix_sethsv(HSV_OFF);
-  //rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-  //rgb_matrix_sethsv_noeeprom(HSV_OFF);
-  //rgb_matrix_set_color_all(RGB_BLACK);
-  rgb_matrix_enable();
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#ifdef CONSOLE_ENABLE
-    // useful for getting matrix right
-    uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %u, time: %u, interrupt: %u, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-#endif
-
-    switch (keycode) {
-      case RGB_TOG:
-        if (record->event.pressed) {
-          switch (rgb_matrix_get_flags()) {
-            case LED_FLAG_ALL: {
-               rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-               rgb_matrix_set_color_all(RGB_BLACK);
-            }
-            break;
-            case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-               rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-               rgb_matrix_set_color_all(RGB_BLACK);
-            }
-            break;
-            case LED_FLAG_UNDERGLOW: {
-               rgb_matrix_set_flags(LED_FLAG_NONE);
-               rgb_matrix_disable_noeeprom();
-            }
-            break;
-            default: {
-               rgb_matrix_set_flags(LED_FLAG_ALL);
-               rgb_matrix_enable_noeeprom();
-            }
-            break;
-          }
-        }
-        return false;
-      default:
-        return true; // Process all other keycodes normally
-  }
-}
-
-
-void set_led_color_by_hsv(int ledkey, uint8_t h_in, uint8_t s_in, uint8_t v_in){
-    HSV hsv = { .h = h_in, .s = s_in, .v = v_in};
-    RGB rgb = hsv_to_rgb(hsv);
-    float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-    rgb_matrix_set_color(ledkey, f * rgb.r, f * rgb.g, f * rgb.b);
-}
-
-void set_led_color_by_layer(int layer, int ledkey){
-    set_led_color_by_hsv(ledkey, pgm_read_byte(&ledmap[layer][0]),
-                              pgm_read_byte(&ledmap[layer][1]),
-                              pgm_read_byte(&ledmap[layer][2]));
-}
-
-void set_ledkey_by_layer_type(int layer, int ledkey, uint16_t key){
-    if (rgb_matrix_get_flags() != LED_FLAG_ALL){
-        if ( key == KC_TRNS ) {
-            if ((pgm_read_byte(&ledmap[layer][3]) == LYR_TRANS) && (layer > 0)){
-                // this key is transparent and the layer below does something
-                // - light it up in  (lower) layer-1 specific color
-                set_led_color_by_layer(layer-1, ledkey);
-            }
-            if (pgm_read_byte(&ledmap[layer][3]) == LYR_BLACK){
-                // this key is transparent but the lower layer is not intended
-                // to be used, it still works but not intended; type BLACK
-                set_led_color_by_hsv(ledkey, HSV_BLACK);
-            }
-        } else {
-            // this key does something - light it up in layer specific color
-            // regular key and SOLID or BLACK as layer type
-            set_led_color_by_layer(layer, ledkey);
-        }
-    }
-}
-
-void set_caps_lock(int layer) {
-    int caps_lock_led = 30;
-    led_t host_leds = host_keyboard_led_state();
-    if (host_leds.caps_lock) {
-        set_led_color_by_hsv(caps_lock_led, HSV_WHITE);
-    } else {
-        // if capslock is not pressed don't clear it,
-        // it might be used for displaying led pattern
-        if((rgb_matrix_get_flags() != LED_FLAG_ALL)) {
-            // or to keep the correct lighting on for the layer that use all keys
-            // on all other layers turn the led off, so only switch it of when
-            // layer is BLACK
-            if(pgm_read_byte(&ledmap[layer][3]) == LYR_BLACK){
-              set_led_color_by_hsv(caps_lock_led, HSV_BLACK);
-            }
-        }
-    }
-}
-
-void set_layer_color(int layer) {
-    // key specific lighting
-    int ledkey=0;
-    for (int keyindex=0; keyindex<MATRIX_COLS*MATRIX_ROWS;keyindex++) {
-        uint8_t row = keyindex/MATRIX_COLS;
-        uint8_t col = (keyindex-(keyindex/MATRIX_COLS)*MATRIX_COLS);
-        uint16_t key=pgm_read_word(&keymaps[layer][row][col]);
-
-        // continue if this is not a valid key
-        if (key==KC_NO) { continue; }
-
-        // handle layer specific coloring
-        set_ledkey_by_layer_type(layer, ledkey, key);
-        /* === below this function add custom overriding ledkey lighting === */
-
-        // gaming layer with highlighted keys
-        //if (IS_LAYER_ON(_LVL4_)) {
-        if (layer == _LVL4_) {
-            if((key==KC_W) || (key==KC_A) || (key==KC_S) || (key==KC_D)) {
-                set_led_color_by_hsv(ledkey, HSV_GOLD);
-            }
-            if((key==KC_R) || (key==KC_SPC) || (key==KC_LSFT) || (key==KC_LCTL)) {
-                set_led_color_by_hsv(ledkey, HSV_GOLDENROD);
-            }
-        }
-
-        // color testing layer
-        /*if (layer == _LVL7_) {
-        switch (ledkey) {
-          case 16: {
-                set_led_color_by_hsv(ledkey, HSV_AZURE);
-              }
-              break;
-          case 17: {
-                set_led_color_by_hsv(ledkey, HSV_BLUE);
-              }
-              break;
-          case 18: {
-                set_led_color_by_hsv(ledkey, HSV_CHARTREUSE);
-              }
-              break;
-          case 19: {
-                set_led_color_by_hsv(ledkey, HSV_CORAL);
-              }
-              break;
-          case 20: {
-                set_led_color_by_hsv(ledkey, HSV_CYAN);
-              }
-              break;
-          case 21: {
-                set_led_color_by_hsv(ledkey, HSV_GOLD);
-              }
-              break;
-          case 22: {
-                set_led_color_by_hsv(ledkey, HSV_GOLDENROD);
-              }
-              break;
-          case 23: {
-                set_led_color_by_hsv(ledkey, HSV_MAGENTA);
-              }
-              break;
-          case 24: {
-                set_led_color_by_hsv(ledkey, HSV_ORANGE);
-              }
-              break;
-          case 25: {
-                set_led_color_by_hsv(ledkey, HSV_PINK);
-              }
-              break;
-          case 26: {
-                set_led_color_by_hsv(ledkey, HSV_RED);
-              }
-              break;
-          case 27: {
-                set_led_color_by_hsv(ledkey, HSV_SPRINGGREEN);
-              }
-              break;
-          case 32: {
-                set_led_color_by_hsv(ledkey, HSV_MAGENTA);
-              }
-              break;
-          case 33: {
-                set_led_color_by_hsv(ledkey, HSV_TEAL);
-              }
-              break;
-          case 34: {
-                set_led_color_by_hsv(ledkey, HSV_TURQUOISE);
-              }
-              break;
-          case 35: {
-                set_led_color_by_hsv(ledkey, HSV_WHITE);
-              }
-              break;
-          case 36: {
-                set_led_color_by_hsv(ledkey, HSV_YELLOW);
-              }
-              break;
-          case 37: {
-                set_led_color_by_hsv(ledkey, HSV_PURPLE);
-              }
-              break;
-          case 38: {
-                set_led_color_by_hsv(ledkey, HSV_GREEN);
-              }
-              break;
-          default: {
-              }
-              break;
-            }
-        }*/
-        ledkey++;
-    }
-    // non key specific lighting instead led flag based
-    if (layer == _LVL7_){
-        for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-            if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-                set_led_color_by_hsv(i, C_HSV_DARKGOLD);
-            }
-            if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-                set_led_color_by_hsv(i, HSV_BLACK);
-            }
-            if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_KEYLIGHT)) {
-                set_led_color_by_layer(layer, i);
-            }
-        }
-    }
-
-    return;
-}
-
-bool rgb_matrix_indicators_user(void) {
-    int layer = get_highest_layer(layer_state);
-    set_layer_color(layer);
-    set_caps_lock(layer);
-    return false;
-}
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(KC_F)) {
-        // Anything you can do in a macro.
-        SEND_STRING("QMK is awesome.");
-    }
-    if (leader_sequence_two_keys(KC_D, KC_D)) {
-        SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
-    }
-    if (leader_sequence_two_keys(KC_S, KC_S)) {
-        SEND_STRING(SS_LCTL("v"));
-    }
-    if (leader_sequence_three_keys(KC_D, KC_D, KC_S)) {
-        SEND_STRING("https://start.duckduckgo.com\n");
-    }
-}
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/readme.md
deleted file mode 100644
index 924e63cef79..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# p4yne's keymap for the bm65iso
-
-* Eight layers (DE, LYR_SW_MEDIA, MOUSE_DSKTP_NAV, DYN_MACRO_NUMPAD_LEADER, GAMING, US, US_SHIFTED, DE_FLAG_LIGHTNING)
-* Different color for each layer (DRK_RED, RED, MAGENTA, PURPLE, DRK_GOLD, DRK_BLUE, BLUE, DRK_RED)
-* Keys with something else defined than KC_TRNS are lit up in the layer color, so you easily can see which keys have some function defined
-* Custom layer types for KC_TRNS keys to let lower layer shine through, or stay black/off
-* Custom lighting based on layer, key and led flag 
-* Caps-Lock lights up when active
-* Some leader shortcuts defined - nothing useful yet
-* Some space cadet keys defined for easier insertion of () and {}
-* Bootmagic lite enabled via default settings so you can plug in the keyboard while holding esc to land in bootloader mode
-* Manages all this and still fits in to the program memory
-
-Make example for this keyboard (after setting up your build environment):
-
-    make kprepublic/bm65hsrgb_iso:p4yne
-
-Flashing example for this keyboard:
-
-    make kprepublic/bm65hsrgb_iso:p4yne:flash
-
-Keyboard Maintainer: **[p4yne](https://github.com/p4yne)**
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/rules.mk
deleted file mode 100644
index a94bdba88b9..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#Features
-TAP_DANCE_ENABLE = yes
-SPACE_CADET_ENABLE = yes
-
-
-MAGIC_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-LEADER_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
-
-#Disabled Features
-#COMBO_ENABLE = no
-# Combo Key Grave and Escape
-#GRAVE_ESC_ENABLE = no
-# no unicode support
-#UNICODE_ENABLE = no
-
-#Debugging
-#COMMAND_ENABLE = no
-#CONSOLE_ENABLE = yes
-
-
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
deleted file mode 100644
index c916ffb2a98..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Copyright 2020 ipetepete, 2021 deadolus, 2022 p4yne
-
-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_MATRIX_LED_COUNT 74
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_BAND_SAT
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
index 6b8a5a8a3a1..8e20dcdbd56 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
@@ -30,7 +30,56 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "band_sat"
+        },
+        "driver": "ws2812",
+        "max_brightness": 140
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/config.h
deleted file mode 100644
index 1dc1414fa5f..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 deadolus
- *
- * 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/>.
- */
-
-// place overrides here
-
-#pragma once
-#define LSPO_KEYS KC_LSFT, KC_LSFT, KC_8
-#define RSPC_KEYS KC_RSFT, KC_LSFT, KC_9
-#define LAPO_KEYS KC_LALT, KC_RALT, KC_QUOT
-#define RAPC_KEYS KC_RALT, KC_RALT, KC_NUHS
-
-#define LEADER_TIMEOUT 1000
-#define LEADER_PER_KEY_TIMING 250
-
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
deleted file mode 100644
index 11f81032973..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Copyright 2019 ashlar 2021 peepeetee, deadolus
- *
- * 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.h"
-
-#ifdef TAP_DANCE_ENABLE
-enum {
-  TD_HOME_END,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //tap once for home, twice for end
-  [TD_HOME_END] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
-};
-#endif
-
-
-// // Defines names for use in layer keycodes and the keymap
-enum  layers {
-  _BL,
-  _RED_,
-  _GREEN_,
-  _BLUE_,
-  _CYAN_,
-  _MAGENTA_,
-  _YELLOW_
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
-   * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-   * │    │    │    │                        │   │   │   │   │   │   │
-   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-   */
-#ifdef TAP_DANCE_ENABLE
-  /* 0: ISO qwerty */
-  [_BL] = LAYOUT_65_iso_blocker(
-      KC_CAPS, 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,          TD(TD_HOME_END),
-      KC_ESC,  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,
-      SC_LSPO, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                   KC_SPC,                             SC_RAPC, MO(_RED_),          KC_LEFT, KC_DOWN, KC_RGHT
-
-      ),
-#else
-  [_BL] = LAYOUT_65_iso_blocker(
-      KC_CAPS, 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_ESC,  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,
-      SC_LSPO, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                   KC_SPC,                             SC_RAPC, MO(_RED_),          KC_LEFT, KC_DOWN, KC_RGHT
-
-      ),
-#endif
-
-  [_RED_] = LAYOUT_65_iso_blocker(
-      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,  _______, LGUI(KC_END),
-      _______, _______,     _______,    _______,    _______,       _______,      _______, _______, _______, _______, _______, _______, _______,          LGUI(KC_PAUSE),
-      _______, TO(_GREEN_), TO(_BLUE_), TO(_CYAN_), TO(_MAGENTA_), TO(_YELLOW_), _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-      _______, _______,     _______,    _______,    _______,       _______,      _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
-      QK_BOOT, _______,     _______,                               QK_LEAD,                                 _______, _______,          KC_MPLY, KC_VOLD, KC_MUTE
-      ),
-
-
-  [_GREEN_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_PGUP, KC_PSCR, _______, _______, _______,          _______,
-      _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1, KC_BTN2, _______, TO(0),   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  _______, _______, _______, _______,
-      _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-      ),
-
-
-  [_BLUE_] = LAYOUT_65_iso_blocker(
-      _______, DM_PLY1, DM_PLY2, _______, _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______,
-      _______, DM_REC1, DM_REC2, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, TO(0),   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______,
-      _______, _______, _______,                   _______,                            KC_0,    KC_PCMM,          _______, _______, _______
-      ),
-  [_CYAN_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-      ),
-  [_MAGENTA_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-      ),
-  [_YELLOW_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-      _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-      ),
-
-  /*template
-    [_UL] = LAYOUT_65_iso_blocker(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-    )
-    */
-};
-
-#ifdef _______
-#undef _______
-#define _______ {0, 0, 0}
-
-const uint8_t PROGMEM ledmap[][3] = {
-  [_BL] = _______,
-  [_RED_] = RED,
-  [_GREEN_] = GREEN,
-  [_BLUE_] = BLUE,
-  [_CYAN_] = CYAN,
-  [_MAGENTA_] = MAGENTA,
-  [_YELLOW_] = YELLOW
-};
-
-#undef _______
-#define _______ KC_TRNS
-#endif
-
-
-
-void keyboard_post_init_user(void) {
-  // Call the post init code.
-#ifdef CONSOLE_ENABLE
-  debug_enable=true;
-  debug_matrix=true;
-#endif
-  rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#ifdef CONSOLE_ENABLE
-  //useful for getting matrix right
-  uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-#endif
-
-  switch (keycode) {
-    case RGB_TOG:
-      if (record->event.pressed) {
-        switch (rgb_matrix_get_flags()) {
-          case LED_FLAG_ALL: {
-                               rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                               rgb_matrix_set_color_all(0, 0, 0);
-                             }
-                             break;
-          case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                                                                               rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                                                                               rgb_matrix_set_color_all(0, 0, 0);
-                                                                             }
-                                                                             break;
-          case LED_FLAG_UNDERGLOW: {
-                                     rgb_matrix_set_flags(LED_FLAG_NONE);
-                                     rgb_matrix_disable_noeeprom();
-                                   }
-                                   break;
-          default: {
-                     rgb_matrix_set_flags(LED_FLAG_ALL);
-                     rgb_matrix_enable_noeeprom();
-                   }
-                   break;
-        }
-      }
-      return false;
-    default:
-      return true; // Process all other keycodes normally
-  }
-}
-
-void setCapsLock(void) {
-  led_t host_leds = host_keyboard_led_state();
-  if (host_leds.caps_lock) {
-    rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
-
-  } else {
-    //if capslock is not pressed don't clear it, it might be used for displaying led pattern
-    if((rgb_matrix_get_flags() != LED_FLAG_ALL)) {
-      rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-    }
-  }
-}
-
-void set_layer_color(int layer) {
-  int ledkey=0;
-  for(int i=0; i<MATRIX_COLS*MATRIX_ROWS;i++) {
-    uint8_t row = i/MATRIX_COLS;
-    uint8_t col=(i-(i/MATRIX_COLS)*MATRIX_COLS);
-    uint16_t key=pgm_read_word(&keymaps[layer][row][col]);
-    //continue if this is not a valid key
-    if(key==KC_NO) { continue; }
-    //clear key if it is only a transition
-    if ((key == KC_TRNS)) {
-      if(rgb_matrix_get_flags() != LED_FLAG_ALL){
-        rgb_matrix_set_color(ledkey, 0, 0, 0);
-      }
-    }else {
-      //this key does something - light it up
-      HSV hsv = {
-        .h = pgm_read_byte(&ledmap[layer][0]),
-        .s = pgm_read_byte(&ledmap[layer][1]),
-        .v = pgm_read_byte(&ledmap[layer][2]),
-      };
-
-      RGB rgb = hsv_to_rgb(hsv);
-      float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-      if( (layer != 0) || (rgb_matrix_get_flags() != LED_FLAG_ALL))
-        rgb_matrix_set_color(ledkey, f * rgb.r, f * rgb.g, f * rgb.b);
-    }
-    //if we are on layer 0 set capslock to correct status
-    if(layer==0 && i==30) { setCapsLock(); }
-    ledkey++;
-  }
-  return;
-}
-
-bool rgb_matrix_indicators_user(void) {
-  set_layer_color(get_highest_layer(layer_state));
-
-    return false;
-}
-
-void leader_end_user(void) {
-  if (leader_sequence_one_key(KC_F)) {
-    // Anything you can do in a macro.
-    SEND_STRING("QMK is awesome.");
-  }
-  if (leader_sequence_two_keys(KC_D, KC_D)) {
-    SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
-  }
-  if (leader_sequence_three_keys(KC_D, KC_D, KC_S)) {
-    SEND_STRING("https");
-    register_code(KC_LSFT);
-    SEND_STRING(".77");
-    unregister_code(KC_LSFT);
-    SEND_STRING("start.duckduckgo.com\n");
-  }
-}
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.h
deleted file mode 100644
index 1459e2c5bba..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2019 ash0x0 2021 peepeetee, deadolus
- *
- * 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 "print.h"
-#include <string.h>
-// HID has not yet been implemented for this keyboard
-// #include "raw_hid.h"
-
-#define MILLISECONDS_IN_SECOND 1000
-
-// These are just to make it neater to use builtin HSV values in the keymap
-#define RED {HSV_RED}
-#define CORAL {HSV_CORAL}
-#define ORANGE {HSV_ORANGE}
-#define GOLDEN {HSV_GOLDENROD}
-#define GOLD {HSV_GOLD}
-#define YELLOW {HSV_YELLOW}
-#define CHART {HSV_CHARTREUSE}
-#define GREEN {HSV_GREEN}
-#define SPRING {HSV_SPRINGGREEN}
-#define TURQ {HSV_TURQUOISE}
-#define TEAL {HSV_TEAL}
-#define CYAN {HSV_CYAN}
-#define AZURE {HSV_AZURE}
-#define BLUE {HSV_BLUE}
-#define PURPLE {HSV_PURPLE}
-#define MAGENTA {HSV_MAGENTA}
-#define PINK {HSV_PINK}
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-#define RGB_DEFAULT_TIME_OUT 30
-#define RGB_FAST_MODE_TIME_OUT 3
-#define RGB_TIME_OUT_MAX 600
-#define RGB_TIME_OUT_MIN 10
-#define RGB_TIME_OUT_STEP 10
-
-extern bool g_suspend_state;
-bool disable_layer_color;
-
-uint8_t dfa_state;  //state for my language switching DFA
-
-
-bool rgb_enabled_flag;                  // Current LED state flag. If false then LED is off.
-bool rgb_time_out_enable;               // Idle LED toggle enable. If false then LED will not turn off after idle timeout.
-bool rgb_time_out_fast_mode_enabled;    // Enable flag for RGB timeout fast mode
-bool rgb_time_out_user_value;           // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable.
-uint16_t rgb_time_out_seconds;          // Idle LED timeout value, in seconds not milliseconds
-uint16_t rgb_time_out_saved_seconds;    // The saved user config for RGB timeout period
-led_flags_t rgb_time_out_saved_flag;    // Store LED flag before timeout so it can be restored when LED is turned on again.
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/readme.md
deleted file mode 100644
index 095550b01a8..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Deadolus' keymap for the bm65iso
-
-* Six layers (even though three are mostly empty)
-* Different color for each layer (r,g,b,c,m,y)
-* **Keys with something else defined than KC_TRNS are lit up in the layer color, so you easily can see which keys have some function defined**
-* Caps-Lock lights up when active and on layer 0
-* Some leader shortcuts defined - nothing useful yet
-* Some space cadet keys defined for easier insertion of () and {}
-* Bootmagic lite enabled via default settings so you can plug in the keyboard while holding esc to land in bootloader mode
-* Manages all this and still fits in to the program memory
-
-Make example for this keyboard (after setting up your build environment):
-
-    make kprepublic/bm65hsrgb_iso:deadolus
-
-Flashing example for this keyboard:
-
-    make kprepublic/bm65hsrgb_iso:deadolus:flash
-
-Keyboard Maintainer: **[deadolus](https://github.com/deadolus)**
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/rules.mk
deleted file mode 100644
index c8354ea2561..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-DYNAMIC_MACRO_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-LEADER_ENABLE = yes
-#CONSOLE_ENABLE=yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index a3ef1df3b35..458ef985698 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
@@ -17,61 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 74
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#ifdef RGB_MATRIX_ENABLE
-#    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 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
-#    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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
index ac3dcdf5088..838df92b9e3 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
@@ -12,7 +12,53 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
deleted file mode 100644
index 13eefdef650..00000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2021 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
-
-
-// #define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-// #define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
-// #define MODS_ALT    (get_mods() & MOD_MASK_ALT)
-
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
-
-// #define NO_DEBUG                    // Disable debugging
-// #define NO_PRINT                    // Disable printing/debugging using hid_listen
-// #define NO_ACTION_LAYER             // Disable layers
-// #define NO_ACTION_TAPPING           // Disable tap dance and other tapping features
-// #define NO_ACTION_ONESHOT           // Disable one-shot modifiers
-// #define NO_ACTION_MACRO             // Disable old style macro handling: MACRO() & action_get_macro
-// #define TERMINAL_HELP
-// #define MOUSEKEY_INTERVAL 20
-// #define MOUSEKEY_DELAY 0
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_MAX_SPEED 10
-// #define MOUSEKEY_WHEEL_DELAY 0
-#define FORCE_NKRO                  // NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-// #define STRICT_LAYER_RELEASE        // Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
-// #define LOCKING_SUPPORT_ENABLE      // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-// #define LOCKING_RESYNC_ENABLE       // Tries to keep switch state consistent with keyboard LED state
- #define TAPPING_TERM 200            // How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-// #define TAPPING_TERM_PER_KEY        // Enables handling for per key TAPPING_TERM settings
-// #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-// #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
-// #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-// #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-// #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
-// #define LEADER_KEY_STRICT_KEY_PROCESSING    // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-// #define ONESHOT_TIMEOUT 300         // How long before oneshot times out
-// #define ONESHOT_TAP_TOGGLE 2        // How many taps before oneshot toggle is triggered
-// #define COMBO_TERM 200              // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-// #define TAP_CODE_DELAY 100          // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES         // reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
-// #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
-// #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
-// #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
-// #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
-// #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 1000     // How long to wait between light changes for the "Christmas" animation, in milliseconds
-// #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 2            // The number of LEDs to group the red/green colors by for the "Christmas" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM RGBLED_NUM   // The number of LEDs to have the "Knight" animation travel
-// #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3             // The number of LEDs to light up for the "Knight" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 0             // The number of LEDs to start the "Knight" animation from the start of the strip by
-// #define RGBLIGHT_RAINBOW_SWIRL_RANGE 255            // Range adjustment for the rainbow swirl effect to get different swirls
-// #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4              // The number of LEDs to light up for the "Snake" animation
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
-#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN     // Static gradient top to bottom, speed controls how much gradient changes
-#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT  // Static gradient top to bottom, speed controls how much gradient changes
-#undef ENABLE_RGB_MATRIX_BREATHING            // Single hue brightness cycling animation
-#undef ENABLE_RGB_MATRIX_BAND_SAT             // Single hue band fading saturation scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_VAL             // Single hue band fading brightness scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT    // Single hue 3 blade spinning pinwheel fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL    // Single hue 3 blade spinning pinwheel fades brightness
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT      // Single hue spinning spiral fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL      // Single hue spinning spiral fades brightness
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL            // Full keyboard solid hue cycling through full gradient
-//#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT              // Full gradient scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN           // Full gradient scrolling top to bottom
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradent Chevron shapped scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN            // Full gradient scrolling out to in
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL       // Full dual gradients scrolling out to in
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL          // Full gradient spinning pinwheel around center of keyboard
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL            // Full gradient spinning spiral around center of keyboard
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON             // Full gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON          // Full tighter gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS       // Full dual gradients spinning two halfs of keyboard
-#undef ENABLE_RGB_MATRIX_RAINDROPS               // Randomly changes a single key's hue
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS     // Randomly changes a single key's hue and saturation
-// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN               // That famous computer simulation
-                                                    // =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE      // Pulses keys hit to hue & value then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE             // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE        // Hue & value pulse near a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE   // Hue & value pulse near multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS       // Hue & value pulse the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS  // Hue & value pulse the same column and row of multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS       // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS  // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SPLASH                     // Full gradient & value pulse away from a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_MULTISPLASH                // Full gradient & value pulse away from multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH               // Hue & value pulse away from a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH          // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
deleted file mode 100644
index fdfe7406889..00000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Copyright 2019 ash0x0 2021 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/>.
- */
-#include QMK_KEYBOARD_H
-#include "keymap.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] = {
-    [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,LT(1, KC_LALT),                     KC_SPC,                         KC_RALT,   MO(1),KC_RCTL, KC_LEFT, KC_DOWN,  KC_RGHT
-    ),
-    [1] = LAYOUT_65_ansi(
-        KC_GRAVE,  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_DELETE,
-        RGB_MOD,   RGB_HUI, RGB_VAI, RGB_SAI, RGB_SPI, _______, KC_KP_7, KC_KP_8, KC_KP_9, _______, _______, _______, _______,  _______, KC_PGUP,
-        RGB_TOG,    RGB_HUD, RGB_VAD, RGB_SAD, RGB_SPD, _______, KC_KP_4, KC_KP_5, KC_KP_6, _______, _______, _______,       _______,    KC_PGDN,
-        BL_TOGG,      _______, _______, _______, _______,   QK_BOOT, KC_KP_1, KC_KP_2, KC_KP_3, _______, _______,     _______,   KC_AUDIO_VOL_UP,  KC_END,
-        _______,   _______,   _______,                    _______,                         _______, _______, _______, KC_BRIGHTNESS_DOWN, KC_AUDIO_VOL_DOWN,  KC_BRIGHTNESS_UP
-    ),
-
-};
-
-/*
-Templete
-    [ ] = LAYOUT_65_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,    _______,
-        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,   _______,  _______,
-        _______,   _______,   _______,                    _______,                         _______, _______, _______, _______, _______,  _______
-    ),
-*/
-
-#ifdef _______
-#undef _______
-#define _______ {0, 0, 0}
-
-const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
-    [1] = {
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______,
-        GREEN,   BLUE, {0, 0, 255}, PURPLE, AZURE, _______, {0, 0, 255}, {0, 0, 255}, {0, 0, 255}, _______, _______, _______, _______,  _______, _______,
-        RED,    BLUE, {0, 0, 1}, PURPLE, AZURE, _______, {0, 0, 255}, {0, 0, 255}, {0, 0, 255}, _______, _______, _______,       _______,    _______,
-        _______,      _______, _______, _______, _______, RED, {0, 0, 255}, {0, 0, 255}, {0, 0, 255}, _______, _______,     _______,   _______,  _______,
-        _______,   _______,   _______,                    _______,                         _______, _______, _______, _______, _______,  _______
-    }
-
-};
-
-#undef _______
-#define _______ KC_TRNS
-#endif
-
-
-
-void keyboard_post_init_user(void) {
-  // Call the post init code.
-    dfa_state = 0; // ENGLISH
-}
-
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case KC_DELETE:
-      if (record->event.pressed) {
-                dfa_state = 0;
-    } else {
-        // Do something else when release
-      }
-      return false; // Skip all further processing of this key
-    case KC_SPC:
-      if (record->event.pressed) {
-          if ((get_mods() & MOD_BIT(KC_LGUI)) == MOD_BIT(KC_LGUI)){
-              if(dfa_state == 3){
-                  dfa_state = 0;
-              } else {
-                  dfa_state = dfa_state + 1;
-              }
-          }
-    } else {
-        // Do something else when release
-      }
-      return true; // Continue execution
-
-
-    case KC_HOME:
-      if (record->event.pressed) {
-          switch(dfa_state){
-            case 0 :{
-                return false;
-            }
-            case 1 :{
-                tap_code16(G(KC_SPC));
-                wait_ms(100);
-                tap_code16(G(KC_SPC));
-                wait_ms(100);
-                tap_code16(G(KC_SPC));
-                dfa_state = 0;
-                return false;
-            }
-            case 2 :{
-                tap_code16(G(KC_SPC));
-                wait_ms(100);
-                tap_code16(G(KC_SPC));
-                dfa_state = 0;
-                return false;
-            }
-            case 3 :{
-                tap_code16(G(KC_SPC));
-                dfa_state = 0;
-                return false;
-            }
-          }
-
-        // Do something when pressed
-      } else {
-        // Do something else when release
-      }
-      return false; // Skip all further processing of this key
-    // case KC_PGUP:
-    //   if (record->event.pressed) {
-    //       switch(dfa_state){
-    //         case 0 :{
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 1;
-    //             return false;
-    //         }
-    //         case 1 :{
-    //             return false;
-    //         }
-    //         case 2 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 1;
-    //             return false;
-    //         }
-    //         case 3 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 1;
-    //             return false;
-    //         }
-    //       }
-    //     // Do something when pressed
-    //   } else {
-    //     // Do something else when release
-    //   }
-    //   return false; // Skip all further processing of this key
-    // case KC_PGDN:
-    //   if (record->event.pressed) {
-    //       switch(dfa_state){
-    //         case 0 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 2;
-    //             return false;
-    //         }
-    //         case 1 :{
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 2;
-    //             return false;
-    //         }
-    //         case 2 :{
-    //             return false;
-    //         }
-    //         case 3 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 2;
-    //             return false;
-    //         }
-    //       }
-    //     // Do something when pressed
-    //   } else {
-    //     // Do something else when release
-    //   }
-    //   return false; // Skip all further processing of this key
-    // case KC_END:
-    //   if (record->event.pressed) {
-    //       switch(dfa_state){
-    //         case 0 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 3;
-    //             return false;
-    //         }
-    //         case 1 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 3;
-    //             return false;
-    //         }
-    //         case 2 :{
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 3;
-    //             return false;
-    //         }
-    //         case 3 :{
-    //             return false;
-    //         }
-    //       }
-    //     // Do something when pressed
-    //   } else {
-    //     // Do something else when release
-    //   }
-    //   return false; // Skip all further processing of this key
-            case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_UNDERGLOW: {
-                    rgb_matrix_set_flags(LED_FLAG_NONE);
-                    rgb_matrix_disable_noeeprom();
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_enable_noeeprom();
-                  }
-                  break;
-              }
-            }
-            return false;
-    default:
-      return true; // Process all other keycodes normally
-  }
-}
-
-void set_layer_color(int layer) {
-    if (layer == 0) { return; }
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        HSV hsv = {
-            .h = pgm_read_byte(&ledmap[layer][i][0]),
-            .s = pgm_read_byte(&ledmap[layer][i][1]),
-            .v = pgm_read_byte(&ledmap[layer][i][2]),
-        };
-        if (hsv.h || hsv.s || hsv.v) {
-            RGB rgb = hsv_to_rgb(hsv);
-            float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-            rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b);
-        } else if (layer != 1) {
-            // Only deactivate non-defined key LEDs at layers other than FN. Because at FN we have RGB adjustments and need to see them live.
-            // If the values are all false then it's a transparent key and deactivate LED at this layer
-            rgb_matrix_set_color(i, 0, 0, 0);
-        }
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-
-    led_t host_leds = host_keyboard_led_state();
-    if (host_leds.caps_lock) {
-        //rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
-        rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-
-    } else {
-        //rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-    }
-        set_layer_color(get_highest_layer(layer_state));
-
-    return false;
-}
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.h
deleted file mode 100644
index e8d0170d4d6..00000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2019 ash0x0 2021 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/>.
- */
-#include QMK_KEYBOARD_H
-
-#include "print.h"
-#include <string.h>
-// HID has not yet been implemented for this keyboard
-// #include "raw_hid.h"
-
-#define MILLISECONDS_IN_SECOND 1000
-
-// These are just to make it neater to use builtin HSV values in the keymap
-#define RED {HSV_RED}
-#define CORAL {HSV_CORAL}
-#define ORANGE {HSV_ORANGE}
-#define GOLDEN {HSV_GOLDENROD}
-#define GOLD {HSV_GOLD}
-#define YELLOW {HSV_YELLOW}
-#define CHART {HSV_CHARTREUSE}
-#define GREEN {HSV_GREEN}
-#define SPRING {HSV_SPRINGGREEN}
-#define TURQ {HSV_TURQUOISE}
-#define TEAL {HSV_TEAL}
-#define CYAN {HSV_CYAN}
-#define AZURE {HSV_AZURE}
-#define BLUE {HSV_BLUE}
-#define PURPLE {HSV_PURPLE}
-#define MAGENT {HSV_MAGENTA}
-#define PINK {HSV_PINK}
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-#define RGB_DEFAULT_TIME_OUT 30
-#define RGB_FAST_MODE_TIME_OUT 3
-#define RGB_TIME_OUT_MAX 600
-#define RGB_TIME_OUT_MIN 10
-#define RGB_TIME_OUT_STEP 10
-
-extern bool g_suspend_state;
-bool disable_layer_color;
-
-uint8_t dfa_state;  //state for my language switching DFA
-
-
-bool rgb_enabled_flag;                  // Current LED state flag. If false then LED is off.
-bool rgb_time_out_enable;               // Idle LED toggle enable. If false then LED will not turn off after idle timeout.
-bool rgb_time_out_fast_mode_enabled;    // Enable flag for RGB timeout fast mode
-bool rgb_time_out_user_value;           // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable.
-uint16_t rgb_time_out_seconds;          // Idle LED timeout value, in seconds not milliseconds
-uint16_t rgb_time_out_saved_seconds;    // The saved user config for RGB timeout period
-led_flags_t rgb_time_out_saved_flag;    // Store LED flag before timeout so it can be restored when LED is turned on again.
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/readme.md b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/readme.md
deleted file mode 100644
index 47899c27e18..00000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# peepeetee's keymap for the bm68rgb. Includes a DFA to set the windows system language back to English by pressing the top right button. Said DFA will only work with 4 languages(for now).
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index 078085779b8..df6f089922f 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -16,73 +16,8 @@
   */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 
-#define DRIVER_1_LED_TOTAL 68
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-#define DRIVER_INDICATOR_LED_TOTAL 0
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-
-#    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 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
-#    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
-
-
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
     #define RGB_MATRIX_DISABLE_KEYCODES
 #endif
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
index 7a0cefeace9..41cb0fc4ee2 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
@@ -12,7 +12,39 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "is31fl3741",
+        "max_brightness": 180,
+        "sleep": true
     },
     "rgblight": {
         "saturation_steps": 8,
@@ -30,6 +62,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
index 057b4669f5a..68068d7fb97 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
@@ -17,79 +17,79 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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, 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},
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW2_CS6, SW2_CS5, SW2_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
 
-    {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, 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},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
 
-    {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, 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_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {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, 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, CS27_SW7, CS26_SW7, CS25_SW7},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW7, CS2_SW7, CS1_SW7},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW7_CS3, SW7_CS2, SW7_CS1},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index e0a7f47a4d8..0ce66169349 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -17,66 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 87
-
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-//#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-//#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-// #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
-
-#define 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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// does not work for some reason, might revisit
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json
index 0feaa9a99a4..91fa89ec3bb 100644
--- a/keyboards/kprepublic/bm80hsrgb/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/info.json
@@ -12,6 +12,50 @@
         "pin": "E2"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812"
     },
     "matrix_pins": {
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
deleted file mode 100644
index 06a7409110a..00000000000
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 2021 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
-
-
-
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
-
-// #define TERMINAL_HELP
-
-#define FORCE_NKRO                  // NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-// #define STRICT_LAYER_RELEASE        // Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
-// #define TAPPING_TERM 200            // How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-// #define TAPPING_TERM_PER_KEY        // Enables handling for per key TAPPING_TERM settings
-// #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-// #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
-// #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-// #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-// #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
-// #define LEADER_KEY_STRICT_KEY_PROCESSING    // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-// #define ONESHOT_TIMEOUT 300         // How long before oneshot times out
-// #define ONESHOT_TAP_TOGGLE 2        // How many taps before oneshot toggle is triggered
-// #define COMBO_TERM 200              // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-// #define TAP_CODE_DELAY 100          // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-
-// #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_MATRIX_KEYPRESSES         // reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        // reacts to keyreleases (instead of keypresses)
-// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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)
-
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-// #define DISABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
-// #define DISABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
-#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN              // Static gradient top to bottom, speed controls how much gradient changes
-#define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT           // Static gradient top to bottom, speed controls how much gradient changes
-#define DISABLE_RGB_MATRIX_BREATHING                     // Single hue brightness cycling animation
-#define DISABLE_RGB_MATRIX_BAND_SAT                      // Single hue band fading saturation scrolling left to right
-#define DISABLE_RGB_MATRIX_BAND_VAL                      // Single hue band fading brightness scrolling left to right
-#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT             // Single hue 3 blade spinning pinwheel fades saturation
-#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL             // Single hue 3 blade spinning pinwheel fades brightness
-#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT               // Single hue spinning spiral fades saturation
-#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL               // Single hue spinning spiral fades brightness
-#define DISABLE_RGB_MATRIX_CYCLE_ALL                     // Full keyboard solid hue cycling through full gradient
-//#define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT              // Full gradient scrolling left to right
-#define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN                 // Full gradient scrolling top to bottom
-#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON        // Full gradent Chevron shapped scrolling left to right
-#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN                  // Full gradient scrolling out to in
-#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL             // Full dual gradients scrolling out to in
-#define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL                // Full gradient spinning pinwheel around center of keyboard
-#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL                  // Full gradient spinning spiral around center of keyboard
-#define DISABLE_RGB_MATRIX_DUAL_BEACON                   // Full gradient spinning around center of keyboard
-#define DISABLE_RGB_MATRIX_RAINBOW_BEACON                // Full tighter gradient spinning around center of keyboard
-#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS             // Full dual gradients spinning two halfs of keyboard
-#define DISABLE_RGB_MATRIX_RAINDROPS                     // Randomly changes a single key's hue
-#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS           // Randomly changes a single key's hue and saturation
-#define DISABLE_RGB_MATRIX_HUE_BREATHING                 // Hue shifts up a slight ammount at the same time, then shifts back
-#define DISABLE_RGB_MATRIX_HUE_PENDULUM                  // Hue shifts up a slight ammount in a wave to the right, then back to the left
-#define DISABLE_RGB_MATRIX_HUE_WAVE                      // Hue shifts up a slight ammount and then back down in a wave to the right
-// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
-// #define DISABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
-#define DISABLE_RGB_MATRIX_DIGITAL_RAIN                  // That famous computer simulation
-// =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE         // Pulses keys hit to hue & value then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE                // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE           // Hue & value pulse near a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE      // Hue & value pulse near multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS          // Hue & value pulse the same column and row of a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS     // Hue & value pulse the same column and row of multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS          // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS     // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SPLASH                        // Full gradient & value pulse away from a single key hit then fades value out
-//#define DISABLE_RGB_MATRIX_MULTISPLASH                   // Full gradient & value pulse away from multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_SPLASH                  // Hue & value pulse away from a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH             // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
deleted file mode 100644
index 70c8a5f3afd..00000000000
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2021 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/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_tkl_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_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        RGB_MOD, RGB_HUI, RGB_VAI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        RGB_TOG, RGB_HUD, RGB_VAD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,          _______,             KC_AUDIO_VOL_UP,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    KC_BRIGHTNESS_DOWN, KC_AUDIO_VOL_DOWN, KC_BRIGHTNESS_UP
-    )
-
-/*
-    [X] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
-    ),
-*/
-
-
-};
-
diff --git a/keyboards/kprepublic/bm80v2/bm80v2.c b/keyboards/kprepublic/bm80v2/bm80v2.c
index 13d67cdd568..9c1b71d0579 100644
--- a/keyboards/kprepublic/bm80v2/bm80v2.c
+++ b/keyboards/kprepublic/bm80v2/bm80v2.c
@@ -16,100 +16,100 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {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, 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},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},
+    {0, SW9_CS6, SW9_CS5, SW9_CS4},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
 
 
-    {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,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,CS24_SW7, CS23_SW7, CS22_SW7},
-    {0,CS24_SW8, CS23_SW8, CS22_SW8},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},
+    {0,SW1_CS24, SW1_CS23, SW1_CS22},
+    {0,SW2_CS24, SW2_CS23, SW2_CS22},
+    {0,SW3_CS24, SW3_CS23, SW3_CS22},
+    {0,SW4_CS24, SW4_CS23, SW4_CS22},
+    {0,SW5_CS24, SW5_CS23, SW5_CS22},
+    {0,SW6_CS24, SW6_CS23, SW6_CS22},
+    {0,SW7_CS24, SW7_CS23, SW7_CS22},
+    {0,SW8_CS24, SW8_CS23, SW8_CS22},
 
-    {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, CS27_SW7, CS26_SW7, CS25_SW7},
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},
 
-    {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, 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, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW9_CS15, SW9_CS14, SW9_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
 
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},
-    {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, 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, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {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, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {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, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm80v2/config.h b/keyboards/kprepublic/bm80v2/config.h
index 91ad6350e05..6c1d71f0cd1 100644
--- a/keyboards/kprepublic/bm80v2/config.h
+++ b/keyboards/kprepublic/bm80v2/config.h
@@ -14,47 +14,4 @@
  */
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#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_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#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_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// 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_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 IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define DRIVER_1_LED_TOTAL 87
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/info.json
index a30886a988c..a8b5f3fd8a2 100644
--- a/keyboards/kprepublic/bm80v2/info.json
+++ b/keyboards/kprepublic/bm80v2/info.json
@@ -9,7 +9,45 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/config.h b/keyboards/kprepublic/bm80v2/keymaps/saph1s/config.h
deleted file mode 100644
index 4726396806b..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/saph1s/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2023 Saph1s @Saph1s
-
-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 RGB_MATRIX_ENABLE
-    #undef RGB_MATRIX_DEFAULT_MODE
-    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#endif
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/keymap.c b/keyboards/kprepublic/bm80v2/keymaps/saph1s/keymap.c
deleted file mode 100644
index 295832774f0..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/saph1s/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2023 Saph1s @Saph1s
-
-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 "rgb_matrix_map.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_tkl_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_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),   KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT_tkl_ansi(
-        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                      _______,
-        _______, GUI_TOG, _______,                   _______,                                     _______, _______, _______, _______,    _______, _______, _______
-    )
-
-};
-
-#ifdef RGB_MATRIX_ENABLE
-    bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-        if (keymap_config.no_gui) {
-            rgb_matrix_set_color(LED_LGUI, RGB_RED);  //LGUI light
-        }
-        return false;
-    }
-#endif
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/readme.md b/keyboards/kprepublic/bm80v2/keymaps/saph1s/readme.md
deleted file mode 100644
index f97a0f9b276..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/saph1s/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# [Saph1s](https://github.com/Saph1s) | KPrepublic BM80v2 keymap
-
-## Features
-
-- RGUI has been replaced by Fn
-- Add Win Key lock function (Fn+Win) + RGB indication
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/rgb_matrix_map.h b/keyboards/kprepublic/bm80v2/keymaps/saph1s/rgb_matrix_map.h
deleted file mode 100644
index f68a4a68f11..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/saph1s/rgb_matrix_map.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2023 Saph1s @Saph1s
-
-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 RGB_MATRIX_ENABLE
-
-    enum led_location_map {
-        LED_ESC,
-        LED_F1,
-        LED_F2,
-        LED_F3,
-        LED_F4,
-        LED_F5,
-        LED_F6,
-        LED_F7,
-        LED_F8,
-        LED_F9,
-        LED_F10,
-        LED_F11,
-        LED_F12,
-        LED_PSCR,
-        LED_SCRL,
-        LED_PAUS,
-
-        LED_GRV,
-        LED_1,
-        LED_2,
-        LED_3,
-        LED_4,
-        LED_5,
-        LED_6,
-        LED_7,
-        LED_8,
-        LED_9,
-        LED_0,
-        LED_MINS,
-        LED_EQL,
-        LED_BSPC,
-        LED_INS,
-        LED_HOME,
-        LED_PGUP,
-
-        LED_TAB,
-        LED_Q,
-        LED_W,
-        LED_E,
-        LED_R,
-        LED_T,
-        LED_Y,
-        LED_U,
-        LED_I,
-        LED_O,
-        LED_P,
-        LED_LBRC,
-        LED_RBRC,
-        LED_BSLS,
-        LED_DEL,
-        LED_END,
-        LED_PGDN,
-
-        LED_CAPS,
-        LED_A,
-        LED_S,
-        LED_D,
-        LED_F,
-        LED_G,
-        LED_H,
-        LED_J,
-        LED_K,
-        LED_L,
-        LED_SCLN,
-        LED_QUOT,
-        LED_ENT,
-
-        LED_LSFT,
-        LED_Z,
-        LED_X,
-        LED_C,
-        LED_V,
-        LED_B,
-        LED_N,
-        LED_M,
-        LED_COMM,
-        LED_DOT,
-        LED_SLSH,
-        LED_RSFT,
-        LED_UP,
-
-        LED_LCTL,
-        LED_LGUI,
-        LED_LALT,
-        LED_SPC,
-        LED_RALT,
-        LED_FN,
-        LED_APP,
-        LED_RCTL,
-        LED_LEFT,
-        LED_DOWN,
-        LED_RGHT
-    };
-#endif
diff --git a/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h b/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h
deleted file mode 100644
index 88fa41d1109..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 bdtc123 *
- * 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 FORCE_NKRO
diff --git a/keyboards/kprepublic/bm80v2/keymaps/smooted/keymap.c b/keyboards/kprepublic/bm80v2/keymaps/smooted/keymap.c
deleted file mode 100644
index ba91157d927..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/smooted/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2021 Yizhen Liu (@edwardslau)
-// SPDX-License-Identifier: GPL-2.0
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_tkl_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_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,        
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT_tkl_ansi(
-        QK_BOOT,            _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______,                   _______,                                     _______, _______, _______, _______,    _______, _______, _______
-    )
-
-};
diff --git a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
index 3b8daf5fee8..3009359c65f 100644
--- a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
+++ b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
@@ -16,101 +16,101 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {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, 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},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},
+    {0, SW9_CS6, SW9_CS5, SW9_CS4},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
 
 
-    {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,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,CS24_SW7, CS23_SW7, CS22_SW7},
-    {0,CS24_SW8, CS23_SW8, CS22_SW8},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},
+    {0,SW1_CS24, SW1_CS23, SW1_CS22},
+    {0,SW2_CS24, SW2_CS23, SW2_CS22},
+    {0,SW3_CS24, SW3_CS23, SW3_CS22},
+    {0,SW4_CS24, SW4_CS23, SW4_CS22},
+    {0,SW5_CS24, SW5_CS23, SW5_CS22},
+    {0,SW6_CS24, SW6_CS23, SW6_CS22},
+    {0,SW7_CS24, SW7_CS23, SW7_CS22},
+    {0,SW8_CS24, SW8_CS23, SW8_CS22},
 
-    {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, CS27_SW7, CS26_SW7, CS25_SW7},
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},
 
-    {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, 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, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW9_CS15, SW9_CS14, SW9_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
 
-    {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, 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, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {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, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {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, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm80v2_iso/config.h b/keyboards/kprepublic/bm80v2_iso/config.h
index a086185993d..a0345beac58 100644
--- a/keyboards/kprepublic/bm80v2_iso/config.h
+++ b/keyboards/kprepublic/bm80v2_iso/config.h
@@ -14,48 +14,4 @@
  */
 #pragma once
 
-/* disable these deprecated features by default */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#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_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#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_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// 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_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 IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define DRIVER_1_LED_TOTAL 88
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
diff --git a/keyboards/kprepublic/bm80v2_iso/info.json b/keyboards/kprepublic/bm80v2_iso/info.json
index 6f8bdc5fd9b..3ff78b6c891 100644
--- a/keyboards/kprepublic/bm80v2_iso/info.json
+++ b/keyboards/kprepublic/bm80v2_iso/info.json
@@ -9,7 +9,45 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index 73c222c113f..458ef985698 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT  98
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-//#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
deleted file mode 100644
index f5705ac6ad9..00000000000
--- a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2021 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/>.
- */
-#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,                        KC_INS,  KC_DEL,   KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,
-	  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_NUM,   KC_HOME,  KC_END,  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_P7,    KC_P8,    KC_P9,    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_P4,   KC_P5,   KC_P6,
-        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_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTL,   KC_LALT, KC_LGUI,                       KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_PDOT
-  ),
-
-  [1] = LAYOUT(
-       QK_BOOT, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   _______,   _______,                                   _______,    _______,    _______,  _______,
-	  _______,   _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,  _______,   _______,            _______,    _______,    _______,  _______,
-	  RGB_MOD, 	     RGB_HUI,     RGB_VAI,     RGB_SAI,     RGB_SPI,     _______,     _______,     _______,     _______,     _______,     _______,     _______,  _______,  _______,         _______,    _______,    _______,  _______,
-	  RGB_TOG,          RGB_HUD,     RGB_VAD,     RGB_SAD,     RGB_SPD,     _______,     _______,     _______,     _______,     _______,     _______,  _______,  _______,                   _______,    _______,    _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
-        _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
-  )
-
-    // [X] = LAYOUT(
-    //     _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, _______,
-    //     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,
-    //     _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
-    //     _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 _______, _______, _______,
-    //     _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
-    //     _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
-    // ),
-};
-
-
-bool rgb_matrix_indicators_user(void) {
-
-    led_t host_leds = host_keyboard_led_state();
-    if (host_leds.num_lock) {
-        rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
-        //rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-
-    } else {
-        //rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-    }
-        //set_layer_color(get_highest_layer(layer_state));
-
-    return false;
-}
diff --git a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
deleted file mode 100644
index c3fc1a2925f..00000000000
--- a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
+++ /dev/null
@@ -1,367 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "led.h"
-#include <print.h>
-
-#ifdef RGBLIGHT_ENABLE
-#include "rgblight.h"
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-enum cospad_layers {
-	_QWERTY_LAYER,
-	_QWERTZ_LAYER,
-	_COLEMA_LAYER,
-	_DVORAK_LAYER,
-	_QWERTY_LOWER_LAYER,
-	_QWERTZ_LOWER_LAYER,
-	_COLEMA_LOWER_LAYER,
-	_DVORAK_LOWER_LAYER,
-	_RAISE_LAYER,
-	_ALTER_LAYER,
-};
-
-// To switch the default layer used for the layout, there are special keycodes.
-// Which onces detected below serve to switch it.
-enum cospad_keycodes {
-	QWERTY = SAFE_RANGE,
-	QWERTZ,
-	COLEMAK,
-	DVORAK
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	/* Keymap _QWERTY_LAYER: Default layer
-	 * ,-----------------------.
-	 * |  T  |  G  |  B  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  R  |  F  |  V  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  E  |  D  |  C  |     |
-	 * |-----|-----|-----| Spc |
-	 * |  W  |  S  |  X  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Q  |  A  |  Z  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 *
-	 *   And it's LOWER layer
-	 * ,-----------------------.
-	 * |  P  |  ;  |  /  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  O  |  L  |  .  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  I  |  K  |  ,  |     |
-	 * |-----|-----|-----| Ent |
-	 * |  U  |  J  |  M  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Y  |  H  |  N  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_QWERTY_LAYER] = LAYOUT_gamepad_6x4(
-			KC_T,    KC_G,    KC_B,    KC_LALT,
-			KC_R,    KC_F,    KC_V,    MO(_QWERTY_LOWER_LAYER),
-			KC_E,    KC_D,    KC_C,
-			KC_W,    KC_S,    KC_X,    KC_SPACE,
-			KC_Q,    KC_A,    KC_Z,    MO(_RAISE_LAYER),
-			QK_GESC, KC_TAB,  KC_LSFT, KC_LCTL),
-	[_QWERTY_LOWER_LAYER] = LAYOUT_gamepad_6x4(
-			KC_P,    KC_SCLN, KC_SLSH, KC_LALT,
-			KC_O,    KC_L,    KC_DOT,  _______,
-			KC_I,    KC_K,    KC_COMM,
-			KC_U,    KC_J,    KC_M,    KC_ENTER,
-			KC_Y,    KC_H,    KC_N,    _______,
-			_______, _______,  _______, _______),
-
-
-
-	/* Keymap _QWERTZ_LAYER: Alternate default layer
-	 * ,-----------------------.
-	 * |  T  |  G  |  B  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  R  |  F  |  V  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  E  |  D  |  C  |     |
-	 * |-----|-----|-----| Spc |
-	 * |  W  |  S  |  X  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Q  |  A  |  Y  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 *
-	 *   And it's LOWER layer
-	 * ,-----------------------.
-	 * |  P  |  ;  |  /  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  O  |  L  |  >  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  I  |  K  |  <  |     |
-	 * |-----|-----|-----| Ent |
-	 * |  U  |  J  |  M  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Z  |  H  |  N  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_QWERTZ_LAYER] = LAYOUT_gamepad_6x4(
-			KC_T,    KC_G,    KC_B,    KC_LALT,
-			KC_R,    KC_F,    KC_V,    MO(_QWERTZ_LOWER_LAYER),
-			KC_E,    KC_D,    KC_C,
-			KC_W,    KC_S,    KC_X,    KC_SPACE,
-			KC_Q,    KC_A,    KC_Y,    MO(_RAISE_LAYER),
-			QK_GESC, KC_TAB,  KC_LSFT, KC_LCTL),
-	[_QWERTZ_LOWER_LAYER] = LAYOUT_gamepad_6x4(
-			KC_P,    KC_SCLN, KC_SLSH, KC_LALT,
-			KC_O,    KC_L,    KC_DOT,  _______,
-			KC_I,    KC_K,    KC_COMM,
-			KC_U,    KC_J,    KC_M,    KC_ENTER,
-			KC_Z,    KC_H,    KC_N,    _______,
-			_______, _______, _______, _______),
-
-
-
-	/* Keymap _COLEMA_LAYER: Alternate default layer
-	 * ,-----------------------.
-	 * |  G  |  D  |  B  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  P  |  T  |  V  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  F  |  S  |  C  |     |
-	 * |-----|-----|-----| Spc |
-	 * |  W  |  R  |  X  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Q  |  A  |  Z  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 *
-	 *   And it's LOWER layer
-	 * ,-----------------------.
-	 * |  ;  |  O  |  /  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  Y  |  I  |  .  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  U  |  E  |  ,  |     |
-	 * |-----|-----|-----| Ent |
-	 * |  L  |  N  |  M  |     |
-	 * |-----|-----|-----|-----|
-	 * |  J  |  H  |  K  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_COLEMA_LAYER] = LAYOUT_gamepad_6x4(
-			KC_T,    KC_D,     KC_B,    KC_LALT,
-			KC_R,    KC_T,     KC_V,    MO(_COLEMA_LOWER_LAYER),
-			KC_E,    KC_S,     KC_C,
-			KC_W,    KC_R,     KC_X,    KC_SPACE,
-			KC_Q,    KC_A,     KC_Z,    MO(_RAISE_LAYER),
-			QK_GESC, KC_TAB,   KC_LSFT, KC_LCTL),
-	[_COLEMA_LOWER_LAYER] = LAYOUT_gamepad_6x4(
-			KC_SCLN, KC_O,     KC_SLSH, _______,
-			KC_Y,    KC_I,     KC_DOT,  _______,
-			KC_U,    KC_E,     KC_COMM,
-			KC_L,    KC_N,     KC_M,    KC_ENTER,
-			KC_J,    KC_H,     KC_K,    _______,
-			KC_F,    KC_G,     _______, _______),
-
-
-
-	/* Keymap _DVORAK_LAYER: Alternate default layer
-	 * ,-----------------------.
-	 * |  Y  |  I  |  X  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  P  |  U  |  K  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  .  |  E  |  J  |     |
-	 * |-----|-----|-----| Spc |
-	 * |  ,  |  O  |  Q  |     |
-	 * |-----|-----|-----|-----|
-	 * |  '  |  A  |  ;  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 *
-	 *   And it's LOWER layer
-	 * ,-----------------------.
-	 * |  L  |  S  |  Z  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  R  |  N  |  V  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  C  |  T  |  W  |     |
-	 * |-----|-----|-----| Ent |
-	 * |  G  |  H  |  M  |     |
-	 * |-----|-----|-----|-----|
-	 * |  F  |  D  |  B  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_DVORAK_LAYER] = LAYOUT_gamepad_6x4(
-			KC_Y,    KC_I,    KC_X,    KC_LALT,
-			KC_P,    KC_U,    KC_K,    MO(_DVORAK_LOWER_LAYER),
-			KC_DOT,  KC_E,    KC_J,
-			KC_COMM, KC_O,    KC_A,    KC_SPACE,
-			KC_QUOT, KC_A,    KC_SCLN, MO(_RAISE_LAYER),
-			QK_GESC, KC_TAB,  KC_LSFT, KC_LCTL),
-	[_DVORAK_LOWER_LAYER] = LAYOUT_gamepad_6x4(
-			KC_L,    KC_S,    KC_Z,    KC_LALT,
-			KC_R,    KC_N,    KC_V,    _______,
-			KC_C,    KC_T,    KC_W,
-			KC_G,    KC_H,    KC_M,    KC_ENTER,
-			KC_F,    KC_D,    KC_B,    _______,
-			_______, _______, _______, _______),
-
-
-
-	/* Keymap _RAISE_LAYER: Additional layer to access more
-	 * ,-----------------------.
-	 * |  5  |  0  | del | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  4  |  9  | ->  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  3  |  8  |  <- |     |
-	 * |-----|-----|-----| Spc |
-	 * |  2  |  7  | ->  |     |
-	 * |-----|-----|-----|-----|
-	 * |  1  |  6  |  <- | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_RAISE_LAYER] = LAYOUT_gamepad_6x4(
-			KC_5,    KC_0,   KC_BSPC,  _______,
-			KC_4,    KC_9,   KC_RIGHT, _______,
-			KC_3,    KC_8,   KC_UP,
-			KC_2,    KC_7,   KC_DOWN,  _______,
-			KC_1,    KC_6,   KC_LEFT,  _______,
-			_______, _______, _______, _______),
-
-
-
-	/* Keymap _ALTER_LAYER: Function layer used to control the Leds
-	 *                     and use media buttons
-	 * ,----------------------------------------.
-	 * | Val Dec | Bl Toggle  | Qwertz  | Super |
-	 * |---------|------------|---------|-------|
-	 * | Val Inc |   Bl Off   | Qwerty  |       |
-	 * |---------|------------|---------|-------|
-	 * | Sat Dec |   Bl On    | Colemak |       |
-	 * |---------|------------|---------|       |
-	 * | Sat Inc | RGB Toggle | Dvorak  |       |
-	 * |---------|------------|---------|-------|
-	 * | Hue Dec |  RGB Next  | Vol Dwn |       |
-	 * |---------|------------|---------|-------|
-	 * | Hue Inc |  RGB Prev  | Vol Up  | Reset |
-	 * `----------------------------------------'
-	 */
-	[_ALTER_LAYER] = LAYOUT_gamepad_6x4(
-			RGB_VAD, BL_TOGG,  QWERTZ,  KC_LGUI,
-			RGB_VAI, BL_OFF,   QWERTY,  _______,
-			RGB_SAD, BL_ON,    COLEMAK,
-			RGB_SAI, RGB_TOG,  DVORAK,  _______,
-			RGB_HUD, RGB_MOD,  KC_VOLD, _______,
-			RGB_HUI, RGB_RMOD, KC_VOLU, QK_BOOT),
-};
-
-// Makes sure to update the good tri-layer if a layer changes
-layer_state_t layer_state_set_user(layer_state_t state) {
-	switch (get_highest_layer(default_layer_state)) {
-		case _QWERTY_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTY_LOWER_LAYER, _ALTER_LAYER);
-			break;
-		case _QWERTZ_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTZ_LOWER_LAYER, _ALTER_LAYER);
-			break;
-		case _COLEMA_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _COLEMA_LOWER_LAYER, _ALTER_LAYER);
-			break;
-		case _DVORAK_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _DVORAK_LOWER_LAYER, _ALTER_LAYER);
-			break;
-	}
-	return state;
-}
-
-// Makes the tri-layer
-layer_state_t default_layer_state_set_kb(layer_state_t state) {
-	switch (get_highest_layer(state)) {
-		case _QWERTY_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTZ_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _COLEMA_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _DVORAK_LOWER_LAYER, _ALTER_LAYER);
-			layer_move(_QWERTY_LAYER);
-			break;
-		case _QWERTZ_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTY_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _COLEMA_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _DVORAK_LOWER_LAYER, _ALTER_LAYER);
-			layer_move(_QWERTZ_LAYER);
-			break;
-		case _COLEMA_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTY_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTZ_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _DVORAK_LOWER_LAYER, _ALTER_LAYER);
-			layer_move(_COLEMA_LAYER);
-			break;
-		case _DVORAK_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTY_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTZ_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _COLEMA_LOWER_LAYER, _ALTER_LAYER);
-			layer_move(_DVORAK_LAYER);
-			break;
-	}
-	return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		case BL_TOGG:
-			if (record->event.pressed) {
-				cospad_bl_led_togg();
-			}
-			return false;
-		case BL_ON:
-			if (record->event.pressed) {
-				cospad_bl_led_on();
-			}
-			return false;
-		case BL_OFF:
-			if (record->event.pressed) {
-				cospad_bl_led_off();
-			}
-			return false;
-		case QWERTY:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_QWERTY_LAYER);
-				print("switched to QWERTY layout\n");
-			}
-			return false;
-			break;
-		case QWERTZ:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_QWERTZ_LAYER);
-			}
-			return false;
-			break;
-		case COLEMAK:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_COLEMA_LAYER);
-			}
-			return false;
-			break;
-		case DVORAK:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_DVORAK_LAYER);
-			}
-			return false;
-			break;
-		default:
-			return true;
-	}
-}
diff --git a/keyboards/kprepublic/cstc40/config.h b/keyboards/kprepublic/cstc40/config.h
index 75ddd104aea..4f845a84af9 100644
--- a/keyboards/kprepublic/cstc40/config.h
+++ b/keyboards/kprepublic/cstc40/config.h
@@ -5,54 +5,5 @@
 
 #define I2C1_SDA_PIN B9
 #define I2C1_SCL_PIN B8
-#define DRIVER_ADDR_1 0b1010000
-#define RGB_MATRIX_LED_COUNT 47
 
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#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_DISABLE_WHEN_USB_SUSPENDED
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
index 39d3d7ff528..38fac99155a 100644
--- a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
+++ b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
@@ -16,56 +16,56 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, L_1,  K_1,  J_1 },
-    { 0, L_2,  K_2,  J_2 },
-    { 0, L_3,  K_3,  J_3 },
-    { 0, L_4,  K_4,  J_4 },
-    { 0, L_5,  K_5,  J_5 },
-    { 0, L_6,  K_6,  J_6 },
-    { 0, L_7,  K_7,  J_7 },
-    { 0, L_8,  K_8,  J_8 },
-    { 0, L_9,  K_9,  J_9 },
-    { 0, L_10, K_10, J_10 },
-    { 0, L_11, K_11, J_11 },
-    { 0, L_12, K_12, J_12 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW12_CS1,  SW11_CS1,  SW10_CS1 },
+    { 0, SW12_CS2,  SW11_CS2,  SW10_CS2 },
+    { 0, SW12_CS3,  SW11_CS3,  SW10_CS3 },
+    { 0, SW12_CS4,  SW11_CS4,  SW10_CS4 },
+    { 0, SW12_CS5,  SW11_CS5,  SW10_CS5 },
+    { 0, SW12_CS6,  SW11_CS6,  SW10_CS6 },
+    { 0, SW12_CS7,  SW11_CS7,  SW10_CS7 },
+    { 0, SW12_CS8,  SW11_CS8,  SW10_CS8 },
+    { 0, SW12_CS9,  SW11_CS9,  SW10_CS9 },
+    { 0, SW12_CS10, SW11_CS10, SW10_CS10 },
+    { 0, SW12_CS11, SW11_CS11, SW10_CS11 },
+    { 0, SW12_CS12, SW11_CS12, SW10_CS12 },
 
-    { 0, I_1,  H_1,  G_1 },
-    { 0, I_2,  H_2,  G_2 },
-    { 0, I_3,  H_3,  G_3 },
-    { 0, I_4,  H_4,  G_4 },
-    { 0, I_5,  H_5,  G_5 },
-    { 0, I_6,  H_6,  G_6 },
-    { 0, I_7,  H_7,  G_7 },
-    { 0, I_8,  H_8,  G_8 },
-    { 0, I_9,  H_9,  G_9 },
-    { 0, I_10, H_10, G_10 },
-    { 0, I_11, H_11, G_11 },
-    { 0, I_12, H_12, G_12 },
+    { 0, SW9_CS1,  SW8_CS1,  SW7_CS1 },
+    { 0, SW9_CS2,  SW8_CS2,  SW7_CS2 },
+    { 0, SW9_CS3,  SW8_CS3,  SW7_CS3 },
+    { 0, SW9_CS4,  SW8_CS4,  SW7_CS4 },
+    { 0, SW9_CS5,  SW8_CS5,  SW7_CS5 },
+    { 0, SW9_CS6,  SW8_CS6,  SW7_CS6 },
+    { 0, SW9_CS7,  SW8_CS7,  SW7_CS7 },
+    { 0, SW9_CS8,  SW8_CS8,  SW7_CS8 },
+    { 0, SW9_CS9,  SW8_CS9,  SW7_CS9 },
+    { 0, SW9_CS10, SW8_CS10, SW7_CS10 },
+    { 0, SW9_CS11, SW8_CS11, SW7_CS11 },
+    { 0, SW9_CS12, SW8_CS12, SW7_CS12 },
 
-    { 0, F_1,  E_1,  D_1 },
-    { 0, F_2,  E_2,  D_2 },
-    { 0, F_3,  E_3,  D_3 },
-    { 0, F_4,  E_4,  D_4 },
-    { 0, F_5,  E_5,  D_5 },
-    { 0, F_6,  E_6,  D_6 },
-    { 0, F_7,  E_7,  D_7 },
-    { 0, F_8,  E_8,  D_8 },
-    { 0, F_9,  E_9,  D_9 },
-    { 0, F_10, E_10, D_10 },
-    { 0, F_11, E_11, D_11 },
-    { 0, F_12, E_12, D_12 },
+    { 0, SW6_CS1,  SW5_CS1,  SW4_CS1 },
+    { 0, SW6_CS2,  SW5_CS2,  SW4_CS2 },
+    { 0, SW6_CS3,  SW5_CS3,  SW4_CS3 },
+    { 0, SW6_CS4,  SW5_CS4,  SW4_CS4 },
+    { 0, SW6_CS5,  SW5_CS5,  SW4_CS5 },
+    { 0, SW6_CS6,  SW5_CS6,  SW4_CS6 },
+    { 0, SW6_CS7,  SW5_CS7,  SW4_CS7 },
+    { 0, SW6_CS8,  SW5_CS8,  SW4_CS8 },
+    { 0, SW6_CS9,  SW5_CS9,  SW4_CS9 },
+    { 0, SW6_CS10, SW5_CS10, SW4_CS10 },
+    { 0, SW6_CS11, SW5_CS11, SW4_CS11 },
+    { 0, SW6_CS12, SW5_CS12, SW4_CS12 },
 
-    { 0, C_1, B_1, A_1 },
-    { 0, C_2, B_2, A_2 },
-    { 0, C_3, B_3, A_3 },
-    { 0, C_4, B_4, A_4 },
-    { 0, C_5, B_5, A_5 },
-    { 0, C_6, B_6, A_6 },
-    { 0, C_8, B_8, A_8 },
-    { 0, C_9, B_9, A_9 },
-    { 0, C_10, B_10, A_10 },
-    { 0, C_11, B_11, A_11 },
-    { 0, C_12, B_12, A_12 }
+    { 0, SW3_CS1, SW2_CS1, SW1_CS1 },
+    { 0, SW3_CS2, SW2_CS2, SW1_CS2 },
+    { 0, SW3_CS3, SW2_CS3, SW1_CS3 },
+    { 0, SW3_CS4, SW2_CS4, SW1_CS4 },
+    { 0, SW3_CS5, SW2_CS5, SW1_CS5 },
+    { 0, SW3_CS6, SW2_CS6, SW1_CS6 },
+    { 0, SW3_CS8, SW2_CS8, SW1_CS8 },
+    { 0, SW3_CS9, SW2_CS9, SW1_CS9 },
+    { 0, SW3_CS10, SW2_CS10, SW1_CS10 },
+    { 0, SW3_CS11, SW2_CS11, SW1_CS11 },
+    { 0, SW3_CS12, SW2_CS12, SW1_CS12 }
 };
 #endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/info.json b/keyboards/kprepublic/cstc40/info.json
index 4ccd8389e88..44d12fc22f6 100644
--- a/keyboards/kprepublic/cstc40/info.json
+++ b/keyboards/kprepublic/cstc40/info.json
@@ -75,6 +75,51 @@
         }
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "is31fl3733",
         "layout": [
             {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
@@ -125,6 +170,7 @@
             {"matrix": [3, 10], "x": 203, "y": 64, "flags": 1},
             {"matrix": [3, 11], "x": 224, "y": 64, "flags": 1}
         ],
-        "max_brightness": 200
+        "max_brightness": 200,
+        "sleep": true
     }
 }
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c b/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
index 39d3d7ff528..38fac99155a 100644
--- a/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
+++ b/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
@@ -16,56 +16,56 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, L_1,  K_1,  J_1 },
-    { 0, L_2,  K_2,  J_2 },
-    { 0, L_3,  K_3,  J_3 },
-    { 0, L_4,  K_4,  J_4 },
-    { 0, L_5,  K_5,  J_5 },
-    { 0, L_6,  K_6,  J_6 },
-    { 0, L_7,  K_7,  J_7 },
-    { 0, L_8,  K_8,  J_8 },
-    { 0, L_9,  K_9,  J_9 },
-    { 0, L_10, K_10, J_10 },
-    { 0, L_11, K_11, J_11 },
-    { 0, L_12, K_12, J_12 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW12_CS1,  SW11_CS1,  SW10_CS1 },
+    { 0, SW12_CS2,  SW11_CS2,  SW10_CS2 },
+    { 0, SW12_CS3,  SW11_CS3,  SW10_CS3 },
+    { 0, SW12_CS4,  SW11_CS4,  SW10_CS4 },
+    { 0, SW12_CS5,  SW11_CS5,  SW10_CS5 },
+    { 0, SW12_CS6,  SW11_CS6,  SW10_CS6 },
+    { 0, SW12_CS7,  SW11_CS7,  SW10_CS7 },
+    { 0, SW12_CS8,  SW11_CS8,  SW10_CS8 },
+    { 0, SW12_CS9,  SW11_CS9,  SW10_CS9 },
+    { 0, SW12_CS10, SW11_CS10, SW10_CS10 },
+    { 0, SW12_CS11, SW11_CS11, SW10_CS11 },
+    { 0, SW12_CS12, SW11_CS12, SW10_CS12 },
 
-    { 0, I_1,  H_1,  G_1 },
-    { 0, I_2,  H_2,  G_2 },
-    { 0, I_3,  H_3,  G_3 },
-    { 0, I_4,  H_4,  G_4 },
-    { 0, I_5,  H_5,  G_5 },
-    { 0, I_6,  H_6,  G_6 },
-    { 0, I_7,  H_7,  G_7 },
-    { 0, I_8,  H_8,  G_8 },
-    { 0, I_9,  H_9,  G_9 },
-    { 0, I_10, H_10, G_10 },
-    { 0, I_11, H_11, G_11 },
-    { 0, I_12, H_12, G_12 },
+    { 0, SW9_CS1,  SW8_CS1,  SW7_CS1 },
+    { 0, SW9_CS2,  SW8_CS2,  SW7_CS2 },
+    { 0, SW9_CS3,  SW8_CS3,  SW7_CS3 },
+    { 0, SW9_CS4,  SW8_CS4,  SW7_CS4 },
+    { 0, SW9_CS5,  SW8_CS5,  SW7_CS5 },
+    { 0, SW9_CS6,  SW8_CS6,  SW7_CS6 },
+    { 0, SW9_CS7,  SW8_CS7,  SW7_CS7 },
+    { 0, SW9_CS8,  SW8_CS8,  SW7_CS8 },
+    { 0, SW9_CS9,  SW8_CS9,  SW7_CS9 },
+    { 0, SW9_CS10, SW8_CS10, SW7_CS10 },
+    { 0, SW9_CS11, SW8_CS11, SW7_CS11 },
+    { 0, SW9_CS12, SW8_CS12, SW7_CS12 },
 
-    { 0, F_1,  E_1,  D_1 },
-    { 0, F_2,  E_2,  D_2 },
-    { 0, F_3,  E_3,  D_3 },
-    { 0, F_4,  E_4,  D_4 },
-    { 0, F_5,  E_5,  D_5 },
-    { 0, F_6,  E_6,  D_6 },
-    { 0, F_7,  E_7,  D_7 },
-    { 0, F_8,  E_8,  D_8 },
-    { 0, F_9,  E_9,  D_9 },
-    { 0, F_10, E_10, D_10 },
-    { 0, F_11, E_11, D_11 },
-    { 0, F_12, E_12, D_12 },
+    { 0, SW6_CS1,  SW5_CS1,  SW4_CS1 },
+    { 0, SW6_CS2,  SW5_CS2,  SW4_CS2 },
+    { 0, SW6_CS3,  SW5_CS3,  SW4_CS3 },
+    { 0, SW6_CS4,  SW5_CS4,  SW4_CS4 },
+    { 0, SW6_CS5,  SW5_CS5,  SW4_CS5 },
+    { 0, SW6_CS6,  SW5_CS6,  SW4_CS6 },
+    { 0, SW6_CS7,  SW5_CS7,  SW4_CS7 },
+    { 0, SW6_CS8,  SW5_CS8,  SW4_CS8 },
+    { 0, SW6_CS9,  SW5_CS9,  SW4_CS9 },
+    { 0, SW6_CS10, SW5_CS10, SW4_CS10 },
+    { 0, SW6_CS11, SW5_CS11, SW4_CS11 },
+    { 0, SW6_CS12, SW5_CS12, SW4_CS12 },
 
-    { 0, C_1, B_1, A_1 },
-    { 0, C_2, B_2, A_2 },
-    { 0, C_3, B_3, A_3 },
-    { 0, C_4, B_4, A_4 },
-    { 0, C_5, B_5, A_5 },
-    { 0, C_6, B_6, A_6 },
-    { 0, C_8, B_8, A_8 },
-    { 0, C_9, B_9, A_9 },
-    { 0, C_10, B_10, A_10 },
-    { 0, C_11, B_11, A_11 },
-    { 0, C_12, B_12, A_12 }
+    { 0, SW3_CS1, SW2_CS1, SW1_CS1 },
+    { 0, SW3_CS2, SW2_CS2, SW1_CS2 },
+    { 0, SW3_CS3, SW2_CS3, SW1_CS3 },
+    { 0, SW3_CS4, SW2_CS4, SW1_CS4 },
+    { 0, SW3_CS5, SW2_CS5, SW1_CS5 },
+    { 0, SW3_CS6, SW2_CS6, SW1_CS6 },
+    { 0, SW3_CS8, SW2_CS8, SW1_CS8 },
+    { 0, SW3_CS9, SW2_CS9, SW1_CS9 },
+    { 0, SW3_CS10, SW2_CS10, SW1_CS10 },
+    { 0, SW3_CS11, SW2_CS11, SW1_CS11 },
+    { 0, SW3_CS12, SW2_CS12, SW1_CS12 }
 };
 #endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c b/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
deleted file mode 100644
index a320a6ab2a2..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/brdlf/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Copyright 2022 Abigail Fassl
- *
- * 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 RAISE    MO(_RAISE)
-#define LOWER    MO(_LOWER)
-#define FUN      MO(_FUNC)
-#define MOUSE    MO(_MOUSE)
-
-enum layers {
-    _QWERTY = 0,
-    _FUNC,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-    _MOUSE,
-    _NUMPAD
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc* |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Ent  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Func |Lower |Space | Bksp |Raise | DEL  | Bksl | NUM  | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  LT(_NUMPAD, KC_ESC), KC_Q,    KC_W,    KC_E,  KC_R,   KC_T,   KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,        KC_ENT    ,
-  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_LCTL,             KC_LALT, KC_LGUI, FUN,   LOWER,  KC_SPC, KC_BSPC, RAISE, KC_DEL,  KC_BSLS, TG(_NUMPAD), KC_RCTL
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  1!  |  2"  |  3£  |  4$  |  5%  |  6^  |  7&  |  8*  |  9(  |  0)  |  ~   |INSERT|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|      |      |   _  |   -  |   +  |  =   |  \|  |  [{  |  ]}  |      |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  ___ |  ___ | ___  | ___  |  ___ |Space | Bksp |Mouse | DEL  |      |      |      | 
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_ortho_4x12(
-  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,    LSFT(KC_GRV), KC_INSERT ,
-  KC_LSFT,   KC_NO,        KC_NO,    LSFT(KC_MINS), KC_MINS, LSFT(KC_EQL), KC_EQL, KC_BSLS,  KC_LBRC, KC_RBRC, KC_NO,        KC_RSFT   ,
-  _______,   _______,      _______,  _______,       _______, _______,      _______, _______, _______, _______, _______,      _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  1!  |  2@  |  3#  |  4$  |  5%  |  6^  |  7&  |  8*  |  9(  |  0)  | DEL  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  !   |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |WrdDel|WrdBks|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| PSCRN|  |   |  \|  |   _  |   -  |   +  |  =   |      |BL ON | BLSP |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |      |      | ADJ  |      | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_1,    KC_2,    KC_3,       KC_4,    KC_5,          KC_6,       KC_7,         KC_8,    KC_9,    KC_0,    KC_DEL,       KC_BSPC       ,
-  KC_EXLM, KC_AT,   KC_HASH,    KC_DLR,  KC_PERC,       KC_CIRC,    KC_AMPR,      KC_ASTR, KC_LPRN, KC_RPRN, LCTL(KC_DEL), LCTL(KC_BSPC) ,
-  KC_LSFT, KC_PSCR, S(KC_NUHS), KC_BSLS, LSFT(KC_MINS), KC_MINS,    LSFT(KC_EQL), KC_EQL,  _______, BL_ON,   BL_STEP,      KC_RSFT       ,    
-  _______, _______, _______,    _______, _______,       _______,    _______,      _______, _______, KC_VOLD, KC_VOLU,      KC_MPLY
-),
-
-/* Raise 
- * ,-----------------------------------------------------------------------------------.
- * |   `  |  \|  |      |  [   |   ]  |      |      | PGUP | HOME |PGDOWN|      |PRNTSC|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   |  |  _   |  =   |  (   |   )  |      |      | HOME |  UP  | END  |      |ZOOM +|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ~  |  -   |  +   |  {   |   }  |      |  |<  | LEFT | DOWN |RIGHT |  >|  |ZOOM -|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | ADJ  |      |CtrlBk|Raise |CtrlDl|      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  KC_GRV,        KC_BSLS,       KC_NO,        KC_LBRC,       KC_RBRC,       KC_NO,   KC_NO,         KC_PGUP, KC_HOME,      KC_PGDN,   KC_NO,          KC_PSCR            ,
-  LSFT(KC_BSLS), LSFT(KC_MINS), KC_EQL,       LSFT(KC_9),    LSFT(KC_0),    KC_NO,   KC_NO,         KC_HOME, KC_UP,        KC_END,    KC_NO,          LCTL(LSFT(KC_EQL)) ,
-  LSFT(KC_GRV),  KC_MINS,       LSFT(KC_EQL), LSFT(KC_LBRC), LSFT(KC_RBRC), KC_NO,   LCTL(KC_LEFT), KC_LEFT, KC_DOWN,      KC_RIGHT,  LCTL(KC_RIGHT), LCTL(KC_MINS)      ,
-  _______,       _______,       _______,      _______,       _______,       KC_SPC,  LCTL(KC_BSPC), _______, LCTL(KC_DEL), _______,   _______,        _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | Reset|      |      |  BLON| BLOFF|      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | CAPS |  RGB | MODE |  VAD |  VAI |      |      | Vol- | Vol+ | Play |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  HUD |  HUI |  SAD |  SAI |      |      | Prev | Next | Mute |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(
-  QK_BOOT,   KC_NO,   KC_NO,   BL_ON,   BL_OFF,  KC_NO,   KC_NO,   _______,             _______,             _______,             _______, KC_DEL  ,
-  KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, KC_NO,   KC_NO,   KC_AUDIO_VOL_DOWN,   KC_AUDIO_VOL_UP,     KC_MEDIA_PLAY_PAUSE, _______, _______ ,
-  KC_NO,   RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_NO,   KC_NO,   KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE,       _______, _______ ,
-  _______, _______, _______, _______, _______, _______, _______, _______,             _______,             _______,             _______, _______
-),
-
-/* Mouse
- * ,-----------------------------------------------------------------------------------.
- * | ESC  |      |      |      |      |      | WH_L | WH_UP| BTN3 | WH_D | WH_R |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ACC0 | ACC1 | ACC2 |      |      |      |      | BTN1 |  UP  | BTN2 |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | ACC0 | ACC1 | ACC2 |      |      |      |      | LEFT | DOWN |RIGHT |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MOUSE] = LAYOUT_ortho_4x12(
-    KC_ESC ,      _______,      _______,      _______, _______, _______,   KC_MS_WH_LEFT, KC_MS_WH_UP, KC_MS_BTN3, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, _______,
-    KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______,   _______,       KC_MS_BTN1,  KC_MS_UP,   KC_MS_BTN2,    _______,        _______,
-    KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______,   _______,       KC_MS_LEFT,  KC_MS_DOWN, KC_MS_RIGHT,   _______,        _______,
-    _______,      _______,      _______,      _______, _______, _______,   _______,       _______,     _______,    _______,       _______,        _______
-),
-
-/* Num Pad
- * ,-----------------------------------------------------------------------------------.
- * | ESC  |      |      |      |      |      |NMLOCK|   7  |   8  |   9  |   /  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   4  |   5  |   6  |   *  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   1  |   2  |   3  |   +  |  -   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   0  |   .  |   ,  |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______, KC_NUM,  KC_7, KC_8,      KC_9,    KC_KP_SLASH,    _______        ,
-    _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5,      KC_6,    KC_KP_ASTERISK, _______        ,
-    _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2,      KC_3,    KC_KP_PLUS,     KC_KP_MINUS    ,
-    _______, _______, _______, _______, _______, _______, _______, KC_0, KC_KP_DOT, KC_COMM, _______,        _______
-)
-
-};
-
-layer_state_t layer_state_set_user (layer_state_t state) {
-    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-    state = update_tri_layer_state(state, _FUNC, _RAISE, _MOUSE);
-    return state;
-}
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj40/keymaps/brdlf/readme.md b/keyboards/kprepublic/jj40/keymaps/brdlf/readme.md
deleted file mode 100644
index a08c0422c2c..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/brdlf/readme.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# BRDLF custom layout
-
-> This is my personal configuration for 4x12 ortho keyboard JJ40.
-
-## Layers
-
-### Default QWERTY
-
-|            |         |          |          |           |        |          |          |        |        |        |           |
-| :--------: | :-----: | :------: | :------: | :-------: | :----: | :------: | :------: | :----: | :----: | :----: | :-------: |
-| Esc<br>NUM | Q<br>q  | W<br>w   | E<br>e   | R<br>r    | T<br>t | Y<br>y   | U<br>u   | I<br>i | O<br>o | P<br>p | <br>Enter |
-| <br>Tab    | A<br>a  | S<br>s   | D<br>d   | F<br>f    | G<br>g | H<br>h   | J<br>j   | K<br>k | L<br>l | :<br>; |  "<br>'   |
-| <br>Shift  | Z<br>z  | X<br>x   | C<br>c   | V<br>v    | B<br>b | N<br>n   | M<br>m   | <<br>, | ><br>. | ?<br>/ | <br>Shift |
-| <br>Ctrl   | <br>Alt |  <br>GUI | <br>Func | <br>Lower | <br>Sp | <br>Bksp | <br>Raise| <br>Del| <br>\  |<br>NUM | <br>Ctrl  |
-
-### Function
-
-|           |         |         |             |           |           |          |           |         |         |          |          |
-| :-------: | :-----: | :-----: | :---------: | :-------: | :-------: | :------: | :-------: | :-----: | :-----: | :------: | :------: |
-| <br>F1    | <br>F2  | <br>F3  | <br>F4      | <br>F5    | <br>F6    | <br>F7   | <br>F8    | <br>F9  | <br>F10 | <br>F11  | <br>F12  |
-| !<br>1    | @<br>2  | #<br>3  | \$<br>4     | %<br>5    | ^<br>6    | &<br>7   | \*<br>8   | (<br>9  | )<br>0  | <br>~    | <br>INS  |
-| <br>Shift |         | |<br>_  | <br>-       | <br>+     | <br>=     | |<br>\   | {<br>[    | }<br>]  |         | <br>Shft |          |
-| <br>Ctrl  | <br>Alt | <br>GUI | <br>**Fun** | <br>Lower | <br>Space | <br>Bksp | <br>Raise | <br>Del | \|<br>\  | <br>NUM  | <br>Ctrl |
-
-
-### Lower
-
-|           |              |        |         |           |        |        |         |        |           |            |            |
-| :-------: | :----------: | :----: | :-----: | :-------: | :----: | :----: | :-----: | :----: | :-------: | :--------: | :--------: |
-| !<br>1    | @<br>2       | #<br>3 | $<br>4  | %<br>5    | ^<br>6 | &<br>7 | \*<br>8 | (<br>9 | )<br>0    | <br>Del    | <br>Bksp   |
-| <br>!     | <br>@        | <br>#  | <br>\$  | <br>%     | <br>^  | <br>&  | <br>\*  | <br>(  | <br>)     | Wrd<br>Del | Wrd<br>Bks |
-| <br>Shift | Prnt<br>Scrn | <br>\| | \|<br>\ | <br>\_    | <br>-  | <br>+  | <br>=   |        | <br>BL_ON | <br>BLSP   | <br>Shift  |
-|           |              |        |         | **Lower** | Space  | Bksp   |         |        | Vol-      | Vol+       |  Play      |
-
-### Raise
-
-|        |         |       |       |            |     |              |               |             |           |              |              |
-| :----: | :-----: | :---: | :---: | :--------: | :-: | :----------: | :-----------: | :---------: | :-------: | :----------: | :----------: |
-| <br>\` | \|<br>\ |       | <br>[ | <br>]      |     |              | <br>PgUp      | <br>Home    | <br>PgDn  |              | Prnt<br>Scrn |
-| <br>\| | <br>\_  | <br>= | <br>( | <br>)      |     |              | <br>Home      | <br>Up      | <br>End   |              | <br>Zoom +   |
-| <br>~  | <br>-   | <br>+ | <br>{ | <br>}      |     | Prev<br>Word | <br>Left      | <br>Down    | <br>Right | Next<br>Word | <br>Zoom -   |
-|        |         |       |       | <br>Adjust |     | Word<br>Bksp | <br>**Raise** | Word<br>Del |           |              |              |
-
-### Adjust
-
-|           |             |             |             |             |        |         |            |      |      |     |     |
-| :-------: | :---------: | :---------: | :---------: | :---------: | :----: | :-----: | :--------: | :--: | :--: | :-: | :-: |
-|  Reset    |             |             | BL_ON       | BL_OFF      |        |         |            |      |      |     | DEL |
-| <br>Caps  | RGB<br>Togl | RGB<br>Mode | RGB<br>Brt- | RGB<br>Brt+ |        |         | Vol-       | Vol+ | Play |     |     |
-|           |  <br>Hue-   | RGB<br>Hue+ | RGB<br>Sat- | RGB<br>Sat+ |        |         | Prev       | Next | Mute |     |     |
-|           |             |             |             | **Lower**   |  Space |  Bksp   | **Raise**  |      |      |     |     |
-
-### Mouse
-
-|         |        |        |              |       |       |                |               |                 |                |                 |     |
-| :-----: | :----: | :----: | :----------: | :---: | :---: | :------------: | :-----------: | :-------------: | :------------: | :-------------: | :-: |
-| <br>ESC |        |        |              |       |       | Scroll<br>Left | Scroll<br>up  | Middle<br>Click | Scroll<br>Down | Scroll<br>Right |     |
-| Speed0  | Speed1 | Speed2 |              |       |       |                | Left<br>Click | Mouse<br>Up     | Right<br>Click |                 |     |
-| Speed0  | Speed1 | Speed2 |              |       |       |                | Mouse<br>Left | Mouse<br>Down   | Mouse<br>Right |                 |     |
-|         |        |        | **Function** | Lower | Space | Bksp           | **Raise**     |                 |                |                 |     |
-
-### Numpad
-
-|     |     |     |     |     |     |         |     |     |     |     |     |
-| :-: | :-: | :-: | :-: | :-: | :-: | :-----: | :-: | :-: | :-: | :-: | :-: |
-| ESC |     |     |     |     |     | Numlock |  7  |  8  |  9  |  /  |     |
-|     |     |     |     |     |     |         |  4  |  5  |  6  |  *  |     |
-|     |     |     |     |     |     |         |  1  |  2  |  3  |  +  |  -  |
-|     |     |     |     |     |     |         |  0  |  .  |  ,  |     |     |
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj40/keymaps/brdlf/rules.mk b/keyboards/kprepublic/jj40/keymaps/brdlf/rules.mk
deleted file mode 100644
index 6c605daecf5..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/brdlf/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c b/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
deleted file mode 100644
index 11a76f6d3e6..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/cockpit/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define LT_1 RALT(KC_1)
-#define LT_2 RALT(KC_2)
-#define LT_3 RALT(KC_3)
-#define LT_4 RALT(KC_4)
-#define LT_5 RALT(KC_5)
-#define LT_6 RALT(KC_6)
-#define LT_7 RALT(KC_7)
-#define LT_8 RALT(KC_8)
-#define LT_9 RALT(KC_9)
-#define LT_0 RALT(KC_0)
-#define LT_EXLM RALT(KC_EXLM)
-#define LT_AT RALT(KC_AT)
-#define LT_HASH RALT(KC_HASH)
-#define LT_DLR RALT(KC_DLR)
-#define LT_PERC RALT(KC_PERC)
-#define LT_CIRC RALT(KC_CIRC)
-#define LT_AMPR RALT(KC_AMPR)
-#define LT_ASTR RALT(KC_ASTR)
-
-// Naming according to Unicode specifications
-#define LT_A_OG KC_1
-#define LT_C_CA KC_2
-#define LT_E_OG KC_3
-#define LT_E_DO KC_4
-#define LT_I_OG KC_5
-#define LT_S_CA KC_6
-#define LT_U_OG KC_7
-#define LT_U_MA KC_8
-#define LT_Z_CA KC_EQL
-
-// Cockpit bindings
-#define CP_LOCK LGUI(KC_L)
-
-enum jj40_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _FUNC
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |      |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |      |
- * | Esc  |   q  |   w  |   e  |   r  |   t  |   y  |   u  |   i  |   o  |   p  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   :  |   "  |
- * | Tab  |   a  |   s  |   d  |   f  |   g  |   h  |   j  |   k  |   l  |   ;  |   '  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   <  |   >  |   ?  |      |
- * |Shift |   z  |   x  |   c  |   v  |   b  |   n  |   m  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * | Ctrl |  Fn  | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_mit(
-  QK_GESC, 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_ENT ,
-  KC_LCTL, MO(_FUNC), KC_LGUI, KC_LALT, MO(_LOWER),  KC_SPC,  MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
- /* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   Ą  |   Č  |   Ę  |   Ė  |   Į  |   Š  |   Ų  |   Ū  |   Ž  |   _  |      |
- * |   `  |   ą  |   č  |   ę  |   ė  |   į  |   š  |   ų  |   ū  |   ž  |   -  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * | Tab  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |   {  |   }  |      |      |      |      |      |
- * |Shift |   =  |   +  |   -  |   |  |   [  |   ]  |   <  |   >  |   {  |   }  | Ins  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      ||||||||             |      |      |      |      |      |
- * | Ctrl |      |      | Alt  |Lower||    Space    |      | Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_mit(
-  KC_GRV,  LT_A_OG, LT_C_CA, LT_E_OG, LT_E_DO, LT_I_OG, LT_S_CA, LT_U_OG, LT_U_MA, LT_Z_CA, KC_MINS, KC_BSPC,
-  KC_TAB,  LT_EXLM, LT_AT,   LT_HASH, LT_DLR,  LT_PERC, LT_CIRC, LT_AMPR, LT_ASTR, KC_LPRN, KC_RPRN, KC_DEL ,
-  KC_LSFT, KC_PEQL, KC_PPLS, KC_PMNS, KC_PIPE, KC_LBRC, KC_RBRC, KC_LABK, KC_RABK, KC_LCBR, KC_RCBR, KC_INS ,
-  KC_LCTL, _______, _______, KC_LALT, _______,      KC_SPC,      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
- /* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   $  |   %  |   ^  |      |      |      |      |      |      |      |   |  |
- * | Tab  |   4  |   5  |   6  |      |      |      |      |      |      |      |   \  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   &  |   *  |   (  |   )  |      |      |      |   <  |   >  |   ?  |      |
- * |Shift |   7  |   8  |   9  |   0  |      |      |      |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             ||||||||      |      |      |      |
- * | Ctrl |      |      | Alt  |      |    Space    |Raise|| Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_mit(
-  KC_GRV,  LT_1,    LT_2,    LT_3,    LT_4,    LT_5,    LT_6,    LT_7,    LT_8,    LT_9,    LT_0,    KC_BSPC,
-  KC_TAB,  LT_4,    LT_5,    LT_6,    _______, _______, _______, _______, _______, _______, _______, KC_BSLS,
-  KC_LSFT, LT_7,    LT_8,    LT_9,    LT_0,    _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LCTL, _______, _______, KC_LALT, _______,      KC_SPC,      _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
- /* Functions
- *  Note: Terminal uses Calculator shortcut, change your OS keyboard shortcut appropriately.
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | RGB  | RGB  | RGB  | RGB  |  BL  |  BL  |  BL  |      | Scr  |      |      |
- * | Caps | Togl | Hue+ | Sat+ | Brt+ | Togl |Breath| Brt+ |      | Brt+ |      | Vol+ |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      | RGB  | RGB  | RGB  | WWW  | WWW  |  BL  |      | Scr  |      |      |
- * |Shift | Term | Hue- | Sat- | Brt- |  <   |  >   | Brt- |      | Brt- |PrScr | Vol- |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |||||||| RGB  |      |      |             |      |      |      |      |      |
- * | Ctrl |||Fn||| Mode | Alt  |      |    Space    |MPrev |MStop |MNext |MPlay | Lock |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_planck_mit(
-  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_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_UP,   _______, KC_BRIU, _______, KC_VOLU,
-  KC_LSFT, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DOWN, _______, KC_BRID, KC_PSCR, KC_VOLD,
-  KC_LCTL, _______, RGB_MOD, KC_LALT, _______,      KC_SPC,      KC_MPRV, KC_MSTP, KC_MNXT, KC_MPLY, CP_LOCK
-)
-};
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/kprepublic/jj40/keymaps/cockpit/readme.md b/keyboards/kprepublic/jj40/keymaps/cockpit/readme.md
deleted file mode 100644
index 340c6924ee1..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/cockpit/readme.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Cockpit custom layout
-
-> This configuration is built around Lithuanian keyboard layout, but you can easily modify it to fit your needs
-
-## Layers
-
-### Default QWERTY
-
-|           |        |        |        |        |        |        |        |        |        |        |           |
-| :-------: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :-------: |
-|  <br>Esc  | Q<br>q | W<br>w | E<br>e | R<br>r | T<br>t | Y<br>y | U<br>u | I<br>i | O<br>o | P<br>p | <br>Bksp  |
-|  <br>Tab  | A<br>a | S<br>s | D<br>d | F<br>f | G<br>g | H<br>h | J<br>j | K<br>k | L<br>l | :<br>; |  "<br>'   |
-| <br>Shift | Z<br>z | X<br>x | C<br>c | V<br>v | B<br>b | N<br>n | M<br>m | <<br>, | ><br>. | ?<br>/ | <br>Enter |
-|   Ctrl    |   Fn   |  GUI   |  Alt   | Lower  |   Sp   |  ace   | Raise  |  Left  |  Down  |   Up   |   Right   |
-
-### Lower
-
-|           |        |        |        |           |        |        |        |        |        |         |          |
-| :-------: | :----: | :----: | :----: | :-------: | :----: | :----: | :----: | :----: | :----: | :-----: | :------: |
-|  ~<br>\`  | Ą<br>ą | Č<br>č | Ę<br>ę |  Ė<br>ė   | Į<br>į | Š<br>š | Ų<br>ų | Ū<br>ū | Ž<br>ž | \_<br>- | <br>Bksp |
-|  <br>Tab  | <br>!  | <br>@  | <br>#  |  <br>\$   | <br>%  | <br>^  | <br>&  | <br>\* | <br>(  |  <br>)  | <br>Del  |
-| <br>Shift | <br>=  | <br>+  | <br>-  |  <br>\|   | {<br>[ | }<br>] | <br><  | <br>>  | <br>{  |  <br>}  | <br>Ins  |
-|   Ctrl    |        |        |  Alt   | **Lower** |   Sp   |  ace   |        |  Home  |  PgDn  |  PgUp   |   End    |
-
-### Raise
-
-|           |         |         |        |         |        |        |           |         |        |        |           |
-| :-------: | :-----: | :-----: | :----: | :-----: | :----: | :----: | :-------: | :-----: | :----: | :----: | :-------: |
-|  ~<br>\`  | !<br>1  | @<br>2  | #<br>3 | \$<br>4 | %<br>5 | ^<br>6 |  &<br>7   | \*<br>8 | (<br>9 | )<br>0 | <br>Bksp  |
-|  <br>Tab  | \$<br>4 | %<br>5  | ^<br>6 |         |        |        |           |         |        |        | \|<br>\   |
-| <br>Shift | &<br>7  | \*<br>8 | (<br>9 | )<br>0  |        |        |           | <<br>,  | ><br>. | ?<br>/ | <br>Enter |
-|   Ctrl    |         |         |  Alt   |         |   Sp   |  ace   | **Raise** |  Left   |  Down  |   Up   |   Right   |
-
-### Function
-
--   Backlight breathing does not work.
--   **Term** button is bound to `Calculator`. I have set this button as a shortcut to open a terminal.
--   **Lock** is a shortcut for `Alt + L`
-
-|           |             |             |             |             |            |              |            |        |             |         |          |
-| :-------: | :---------: | :---------: | :---------: | :---------: | :--------: | :----------: | :--------: | :----: | :---------: | :-----: | :------: |
-|  <br>F1   |   <br>F2    |   <br>F3    |   <br>F4    |   <br>F5    |   <br>F6   |    <br>F7    |   <br>F8   | <br>F9 |   <br>F10   | <br>F11 | <br>F12  |
-| <br>Caps  | RGB<br>Togl | RGB<br>Hue+ | RGB<br>Sat+ | RGB<br>Brt+ | BL<br>Togl | BL<br>Breath | BL<br>Brt+ |        | Scr<br>Brt+ |         | <br>Vol+ |
-| <br>Shift |  <br>Term   | RGB<br>Hue- | RGB<br>Sat- | RGB<br>Brt- |  WWW<br><  |   WWW<br>>   | BL<br>Brt- |        | Scr<br>Brt- |  PrScr  | <br>Vol- |
-|   Ctrl    |   **Fn**    | RGB<br>Mode |     Alt     |             |     Sp     |     ace      |   MPrev    | MStop  |    MNext    |  MPlay  |   Lock   |
-
-## Usage
-
-```bash
-cd qmk_firmware
-make kprepublic/jj40:cockpit
-bootloadHID .build/kprepublic_jj40_cockpit.hex
-```
-
-_if you're getting permission errors use sudo_
diff --git a/keyboards/kprepublic/jj40/keymaps/fun40/config.h b/keyboards/kprepublic/jj40/keymaps/fun40/config.h
deleted file mode 100644
index f2b5d264e7a..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/fun40/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define FORCE_NKRO
-
-#endif
diff --git a/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c b/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
deleted file mode 100644
index eed6ae5e823..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-#define _BL 4 // Backlight
-// #define _ADJUST 3
-#define TG_NKRO MAGIC_TOGGLE_NKRO
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Del | Alt  | GUI  |Lower | Space|Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  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_ENT,
-  KC_LCTL, KC_DEL, KC_LALT, KC_LGUI, MO(_LOWER),KC_SPC,KC_SPC,  MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Shift|PrScr |ISO ~ |ISO | |      |      |      |      |      |bl_on |bl_stp| Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | nkro | Alt  | NKRO |Lower | PgDn | PgUp |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  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_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______,
-  KC_LSFT, KC_PSCR, S(KC_NUHS), S(KC_NUBS), _______, _______, _______, _______, _______, BL_ON, BL_STEP, KC_ENT,
-  KC_LCTL, MAGIC_TOGGLE_NKRO, KC_LALT, TG_NKRO, _______, KC_PGDN, KC_PGUP, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Caps |  +   |  -   |  =   |   (  |   )  |      |   7  |   8  |   9  | Bksp | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Lock |  ~   |  _   |      |   [  |   ]  |      |   4  |   5  |   6  |      |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ins  |  `   |   \  |   |  |   {  |   }  |      |   1  |   2  |   3  |   .  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      | Alt  |      |Lower |      |      |Raise |   0  |      | Home | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  KC_CAPS, KC_MINS, KC_PLUS, KC_EQL,  KC_LPRN, KC_RPRN, _______, KC_7,  KC_8,    KC_9, KC_BSPC, KC_DEL,
-  QK_LOCK,  KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4,  KC_5,    KC_6, _______, _______,
-  KC_INS, KC_GRV, KC_BSLS, KC_PIPE,  KC_LCBR, KC_RCBR, _______, KC_1,  KC_2,    KC_3, KC_DOT, _______,
-  KC_LCTL, _______, KC_LALT, _______, _______, _______, _______, _______, KC_0, _______, KC_HOME, KC_END
-)
-
-/* Adjust
- G = git
- M = mail
- * ,-----------------------------------------------------------------------------------.
- * | gAdd |gStash|      | const|      | Clog |      |      | Mstk | Mrad |Mgmail|      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | gPush|      |      | if() |      | Clog2|      |      |      |      |Mcity |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | gPull|      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |      |      |Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-
-/* Empty
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |      |      |Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-};
diff --git a/keyboards/kprepublic/jj40/keymaps/fun40/readme.md b/keyboards/kprepublic/jj40/keymaps/fun40/readme.md
deleted file mode 100644
index f4036fa0e0f..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/fun40/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fun 40%.
-
-* backlighting on flash  
-  * backlight fails on reboot
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj40/keymaps/fun40/rules.mk b/keyboards/kprepublic/jj40/keymaps/fun40/rules.mk
deleted file mode 100644
index 9018bddfe35..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/fun40/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-BOOTMAGIC_ENABLE = yes      # 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no          # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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
-
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/kprepublic/jj40/keymaps/krusli/config.h b/keyboards/kprepublic/jj40/keymaps/krusli/config.h
deleted file mode 100644
index e710dbbb60a..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/krusli/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// #define TAPPING_TERM 300
-
-#endif
diff --git a/keyboards/kprepublic/jj40/keymaps/krusli/keymap.c b/keyboards/kprepublic/jj40/keymaps/krusli/keymap.c
deleted file mode 100644
index 24350d87928..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-
-void matrix_scan_user(void) {
-  // runs at every matrix scan.
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | Ctrl | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-
-  [_QWERTY] = LAYOUT_planck_mit(
-    KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,     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 ,
-    TO(_NUMPAD),KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER),  KC_SPC,  MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | RGB  | RGB  | RGB  | RGB  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | RGB  | RGB  | RGB  |      |             | Next | Vol- | Vol+ | Play |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_planck_mit(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-    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,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, _______,
-    _______, RGB_SAD, RGB_SAI, RGB_HUI, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | Home | End  | PgUp | PgDn |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | Prev | Play | Next |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_planck_mit(
-    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_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_HOME, KC_END,  KC_PGUP, KC_PGDN, _______,
-    _______, KC_MRWD, KC_MPLY, KC_MNXT, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Numpad
-   * ,-----------------------------------------------------------------------------------.
-   * | Esc  |  7   |  8   |  9   |  *   |  /   |      |      |      |      |      |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | <--  |  4   |  5   |  6   |  +   |  -   |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  1   |  2   |  3   |Enter |Enter |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Qwerty|  0   |  .   |  .   |Enter |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_NUMPAD] = LAYOUT_planck_mit(
-    KC_ESC,     KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______,
-    KC_BSPC,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______,
-    _______,    KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______,
-    TO(_QWERTY),KC_P0,   KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______
-  )
-};
diff --git a/keyboards/kprepublic/jj40/keymaps/krusli/numpad.txt b/keyboards/kprepublic/jj40/keymaps/krusli/numpad.txt
deleted file mode 100644
index 2fb7aa4d7e5..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/krusli/numpad.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Numpad
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |  7   |  8   |  9   |  *   |  /   |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | <--  |  4   |  5   |  6   |  +   |  -   |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  1   |  2   |  3   |Enter |Enter |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Qwerty|  0   |  .   |  .   |Enter |Enter        |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_2U_space(
-  KC_ESC,     KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______,
-  KC_BSPC,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______,
-  _______,    KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______,
-  TO(_QWERTY),KC_P0,   KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______
-)
diff --git a/keyboards/kprepublic/jj40/keymaps/krusli/readme.md b/keyboards/kprepublic/jj40/keymaps/krusli/readme.md
deleted file mode 100644
index ed760e8a61c..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/krusli/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# krusli
-JJ40 keymap based off the default Planck layout with a numpad layer and with RGB underglow controls.
-
-GUI and LAlt is also swapped to their standard positions.
diff --git a/keyboards/kprepublic/jj40/keymaps/krusli/rules.mk b/keyboards/kprepublic/jj40/keymaps/krusli/rules.mk
deleted file mode 100644
index 5c6bb684e52..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/krusli/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# TAP_DANCE_ENABLE = yes
diff --git a/keyboards/kprepublic/jj40/keymaps/oscillope/config.h b/keyboards/kprepublic/jj40/keymaps/oscillope/config.h
deleted file mode 100644
index e812903de9b..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/oscillope/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 200
-
-#endif
diff --git a/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c b/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
deleted file mode 100644
index aa5a96af784..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@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
-
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2
-#define _NAV    3
-
-#define NAV_TAP LT(_NAV, KC_SPC)
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  CC_ARRW,
-  CC_PRN,
-  CC_BRC,
-  CC_CBR,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   `  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  OS  | Alt  |Lower |Shift |Raise |    Space    | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_1x2uR(
-  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_ENT,
-  KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_LCTL, KC_LGUI, KC_LALT, TT(_LOWER), KC_LSFT, TT(_RAISE), NAV_TAP,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ins  |      |      |  ()  |  []  |  {}  | Home | PgDn | PgUp | End  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |QK_BOOT | Back | Fwd  |      |      |      |      |      | Mute | Vol- | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | Lock |      |             | Prev | Stop | Play | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_1x2uR(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  KC_INS,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
-  QK_BOOT, KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-  _______, _______, _______, _______, QK_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Caps |   &  |   *  |   _  |   (  |   )  |   7  |   8  |   9  |   =  | Bksp | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   $  |   %  |   ^  |   [  |   ]  |   4  |   5  |   6  |   -  |   +  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |  ->  |   !  |   @  |   #  |   {  |   }  |   1  |   2  |   3  |   .  |   \  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  OS  | Alt  |      |Shift |      |      0      | Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_1x2uR(
-  KC_CAPS, KC_AMPR, KC_ASTR, KC_UNDS, KC_LPRN, KC_RPRN, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_BSPC, KC_DEL,
-  KC_TAB,  KC_DLR,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_MINS, KC_PLUS, _______,
-  CC_ARRW, KC_EXLM, KC_AT,   KC_HASH, KC_LCBR, KC_RCBR, KC_1,    KC_2,    KC_3,    _______, KC_BSLS, KC_PIPE,
-  _______, _______, _______, _______, _______, _______, KC_0,             KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-[_NAV] = LAYOUT_planck_1x2uR(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case CC_ARRW:
-        SEND_STRING("->");
-        return false;
-      case CC_PRN:
-        SEND_STRING("()"SS_TAP(X_LEFT));
-        return false;
-      case CC_BRC:
-        SEND_STRING("[]"SS_TAP(X_LEFT));
-        return false;
-      case CC_CBR:
-        SEND_STRING("{}"SS_TAP(X_LEFT));
-        return false;
-    }
-  }
-  return true;
-}
-
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/kprepublic/jj40/keymaps/oscillope/rules.mk b/keyboards/kprepublic/jj40/keymaps/oscillope/rules.mk
deleted file mode 100644
index 8cf85a5d64e..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/oscillope/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# build options
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c b/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
deleted file mode 100644
index bff4c111a7e..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/skewwhiffy/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Copyright 2017 Kenny Hung
- *
- * 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_uk.h"
-
-// Layer shorthand
-enum Layers {
-  cm, // colemak
-  dv, // dvorak
-  qw, // qwerty
-  nbl, // numbers left
-  nbr, // numbers right
-  syl, // symbols left
-  syr, // symbols right
-  nal, // navigation left
-  nar // navigation right
-};
-
-// Layer buttons
-#define _Z_SFT SFT_T(UK_Z)
-#define _SCLSH SFT_T(UK_SCLN)
-#define _SLSH SFT_T(UK_SLSH)
-
-#define _X_NB LT(nbl, UK_X)
-#define _Q_NB LT(nbl, UK_Q)
-#define _DOT_NB LT(nbr, UK_DOT)
-#define _V_NB LT(nbr, UK_V)
-#define __NBL LT(nbl, _______)
-#define __NBR LT(nbr, _______)
-
-#define _C_SY LT(syl, UK_C)
-#define _J_SY LT(syl, UK_J)
-#define _W_SY LT(syr, UK_W)
-#define _COM_SY LT(syr, UK_COMM)
-#define __SYL LT(syl, _______)
-#define __SYR LT(syr, _______)
-
-#define _V_NAL LT(nal, UK_V)
-#define _K_NAL LT(nal, UK_K)
-#define _M_NAR LT(nar, UK_M)
-#define __NAL LT(nal, _______)
-#define __NAR LT(nar, _______)
-
-// Custom hotkeys
-#define _TERM LCTL(UK_QUOT) // Hotkey for terminal
-#define _S_TAB S(KC_TAB)
-#define _C_LEFT LCTL(KC_LEFT)
-#define _C_RGHT LCTL(KC_RGHT)
-#define _A_LEFT LALT(KC_LEFT)
-#define _A_RGHT LALT(KC_RGHT)
-
-// Custom hotkeys
-#define _TERM LCTL(UK_QUOT) // Hotkey for terminal
-#define _S_TAB S(KC_TAB)
-#define _C_LEFT LCTL(KC_LEFT)
-#define _C_RGHT LCTL(KC_RGHT)
-#define _A_LEFT LALT(KC_LEFT)
-#define _A_RGHT LALT(KC_RGHT)
-
-enum custom_keycodes {
-  IJ_OMN = SAFE_RANGE // IntelliJ Omnibox
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * .-----------------------------------------------------------------------------------------------------------.
- * | Q      | W      | F      | P      | G      |        |        | J      | L      | U      | Y      | ;      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | A      | R      | S      | T      | D      |        |        | H      | N      | E      | I      | O      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | Z      | X      | C      | V      | B      |        |        | K      | M      | ,      | .      | /      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |        |        |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |-----------------------------------------------------------------------------------------------------------|
- * | LSHIFT | LCTRL  | LALT   | LGUI   | SPACE  | ENT    | DEL    | BKSPC  | RGUI   | RALT   | RCTRL  | RSHIFT |
- * .-----------------------------------------------------------------------------------------------------------.
- */
- [cm] = LAYOUT_ortho_4x12(
-   UK_Q,    UK_W,    UK_F,    UK_P,    UK_G,    _______, _______, UK_J,    UK_L,    UK_U,    UK_Y,    UK_SCLN,
-   UK_A,    UK_R,    UK_S,    UK_T,    UK_D,    _______, _______, UK_H,    UK_N,    UK_E,    UK_I,    UK_O,
-   _Z_SFT,  _X_NB,   _C_SY,   _V_NAL,  UK_B,    _______, _______, UK_K,    _M_NAR,  _COM_SY, _DOT_NB, _SLSH,
-   KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  KC_ENT,  KC_DEL,  KC_BSPC, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
- ),
-
-/* Dvorak
- * .-----------------------------------------------------------------------------------------------------------.
- * | '      | ,      | .      | P      | Y      |        |        | F      | G      | C      | R      | L      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | A      | O      | E      | U      | I      |        |        | D      | H      | T      | N      | S      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | ;      | Q      | J      | K      | X      |        |        | B      | M      | W      | V      | Z      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |        |        |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |-----------------------------------------------------------------------------------------------------------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |-----------------------------------------------------------------------------------------------------------|
- */
- [dv] = LAYOUT_ortho_4x12(
-   UK_QUOT, UK_COMM, UK_DOT,  UK_P,    UK_Y,    _______, _______, UK_F,    UK_G,    UK_C,    UK_R,    UK_L,
-   UK_A,    UK_O,    UK_E,    UK_U,    UK_I,    _______, _______, UK_D,    UK_H,    UK_T,    UK_N,    UK_S,
-   _SCLSH,  _Q_NB,   _J_SY,   _K_NAL,  UK_X,    _______, _______, UK_B,    _M_NAR,  _W_SY,   _V_NB,   _Z_SFT,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/* QWERTY
- * .-----------------------------------------------------------------------------------------------------------.
- * | Q      | W      | E      | R      | T      |        |        | Y      | U      | I      | O      | P      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | A      | S      | D      | F      | G      |        |        | H      | J      | K      | L      | ;      |
- * |-----------------------------------------------------------------------------------------------------------|
- * | Z      | X      | C      | V      | B      |        |        | N      | M      | ,      | .      | /      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |        |        |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |-----------------------------------------------------------------------------------------------------------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * .-----------------------------------------------------------------------------------------------------------.
- */
- [qw] = LAYOUT_ortho_4x12(
-   UK_Q,    UK_W,    UK_E,    UK_R,    UK_T,    _______, _______, UK_Y,    UK_U,    UK_I,    UK_O,    UK_P,
-   UK_A,    UK_S,    UK_D,    UK_F,    UK_G,    _______, _______, UK_H,    UK_J,    UK_K,    UK_L,    UK_SCLN,
-   _Z_SFT,  _X_NB,   _C_SY,   _V_NAL,  UK_B,    _______, _______, UK_N,    _M_NAR,  _COM_SY, _DOT_NB, _SLSH,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/* Numbers _NB
- * .-----------------------------------------------------------------------------------------------------------.
- * |        | F7     | F8     | F9     | F10    |        |        |        | 7      | 8      | 9      |        |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | F4     | F5     | F6     | F11    |        |        |        | 4      | 5      | 6      |        |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        | F1     | F2     | F3     | F12    |        |        | 0      | 1      | 2      | 3      | .      |
- * |-----------------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
- [nbl] = LAYOUT_ortho_4x12(
-   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, UK_7,    UK_8,    UK_9,    _______,
-   _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,  _______, _______, _______, UK_4,    UK_5,    UK_6,    _______,
-   _______, __NBL,   KC_F2,   KC_F3,   KC_F12,  _______, _______, UK_0,    UK_1,    UK_2,    UK_3,    UK_DOT,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [nbr] = LAYOUT_ortho_4x12(
-   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, UK_7,    UK_8,    UK_9,    _______,
-   _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,  _______, _______, _______, UK_4,    UK_5,    UK_6,    _______,
-   _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,  _______, _______, UK_0,    UK_1,    UK_2,    __NBR,   UK_DOT,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/* Symbols _SY
- * .-----------------------------------------------------------------------------------------------------------.
- * | !      | £      | _      | -      | ~      |        |        | \      | {      | }      | /      | #      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | $      | %      | +      | =      |        |        |        | "      | (      | )      | '      | @      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | ^      | &      | *      | |      |        |        |        | <      | [      | ]      | >      | `      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
- [syl] = LAYOUT_ortho_4x12(
-   UK_EXLM, UK_PND,  UK_UNDS, UK_MINS, UK_TILD, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH,
-   UK_DLR,  UK_PERC, UK_PLUS, UK_EQL,  _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT,
-   UK_CIRC, UK_AMPR, __SYL,   UK_PIPE, _______, _______, _______, UK_LABK, UK_LBRC, UK_RBRC, UK_RABK, UK_GRV,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [syr] = LAYOUT_ortho_4x12(
-   UK_EXLM, UK_PND,  UK_UNDS, UK_MINS, UK_TILD, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH,
-   UK_DLR,  UK_PERC, UK_PLUS, UK_EQL,  _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT,
-   UK_CIRC, UK_AMPR, UK_ASTR, UK_PIPE, _______, _______, _______, UK_LABK, UK_LBRC, __SYR,   UK_RABK, UK_GRV,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/*
- * Navigation
- * .-----------------------------------------------------------------------------------------------------------.
- * | Esc    | Ctrl L | Up     | Ctrl R | RGB RMD| RGB HD | RGB HI | RGB_TG | PtSn   | ScLk   | Pause  | DVORAK |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Tab    | Left   | Down   | Right  | RGB MD | RGB SD | RGB SI | COLEMAK| Insert | Home   | PgUp   | Term   |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | ShTab  | Alt L  | IJ Omni| Alt R  |        | RGB VD | RGB VI |        | ScLk   | End    | PgDn   | QWERTY |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * '-----------------------------------------------------------------------------------------------------------'
- */
- [nal] = LAYOUT_ortho_4x12(
-   KC_ESC,  _C_LEFT, KC_UP,   _C_RGHT, RGB_RMOD,RGB_HUD, RGB_HUI, RGB_TOG, KC_PSCR, KC_SCRL, KC_PAUS, DF(dv),
-   KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_SAD, RGB_SAI, DF(cm),  KC_INS,  KC_HOME, KC_PGUP, _TERM,
-   _S_TAB,  _A_LEFT, IJ_OMN,  __NAL,   _______, RGB_VAD, RGB_VAI, _______, KC_SCRL, KC_END,  KC_PGDN, DF(qw),
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [nar] = LAYOUT_ortho_4x12(
-   KC_ESC,  _C_LEFT, KC_UP,   _C_RGHT, RGB_RMOD,RGB_HUD, RGB_HUI, RGB_TOG, KC_PSCR, KC_SCRL, KC_PAUS, DF(dv),
-   KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_SAD, RGB_SAI, DF(cm),  KC_INS,  KC_HOME, KC_PGUP, _TERM,
-   _S_TAB,  _A_LEFT, IJ_OMN,  _A_RGHT, _______, RGB_VAD, RGB_VAI, _______, __NAR,   KC_END,  KC_PGDN, DF(qw),
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case IJ_OMN:
-        SEND_STRING(SS_TAP(X_LSFT)SS_TAP(X_LSFT));
-        return false;
-    }
-  }
-  return true;
-}
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
deleted file mode 100644
index 46fbfe21c3f..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-// Behaviors That Can Be Configured
-
-
-#define TAPPING_TERM 250
-        // how long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-
-#define PERMISSIVE_HOLD
-       // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM
-
-#define QUICK_TAP_TERM 0
-        // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap)
-        // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-
-
-/*
-    #define TAPPING_TERM_PER_KEY
-        // enables handling for per key TAPPING_TERM settings
-    #define RETRO_TAPPING
-        // tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-    #define TAPPING_TOGGLE 2
-        // how many taps before triggering the toggle
-    #define LEADER_TIMEOUT 300
-        // how long before the leader key times out
-        // If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-    #define LEADER_PER_KEY_TIMING
-        // sets the timer for leader key chords to run on each key press rather than overall
-    #define LEADER_KEY_STRICT_KEY_PROCESSING
-        // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-    #define ONESHOT_TIMEOUT 300
-        // how long before oneshot times out
-    #define ONESHOT_TAP_TOGGLE 2
-        // how many taps before oneshot toggle is triggered
-    #define COMBO_TERM 200
-        // how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-    #define TAP_CODE_DELAY 100
-        // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-    #define TAP_HOLD_CAPS_DELAY 80
-        // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-*/
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
deleted file mode 100644
index 6c8220a702a..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* Copyright 2019 Stefano Marago'
- *
- * 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 is the QMK keymap to configure an ortholinear 40% keyboard
- * (with 48 keys) into an ortholinear alpha-vderm 28 keys inspired layout
- * "rules.mk" and "config.h" complete the configuration
- */
-
-
-/*
- * Nice to have:
- * - tap dancing (p=backspace, q=escape, a=tab, vowel=accentedletter and same for consonant as the french c)
- */
-
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  LAYER_HOME, // home base layer
-  LAYER_FUNC, // function keys and cursors
-  LAYER_NUMSYM, // numbers and other characters
-  LAYER_SYST, // media and other system keys
-  LAYER_NUMONLY, // numeric keypad
-  LAYER_LIGHTS, // numeric keypad
-  LAYER_MOUSE, // mouse layer
-};
-
-enum custom_keycodes {
-  CK_TRIPLEZERO = SAFE_RANGE,
-};
-
-#define CK_CONFIGINIT EE_CLR
-
-enum {
-  TD_P_BSPC = 0,
-  TD_Q_ESC,
-  TD_A_TAB,
-  TD_A_GRAVE,
-  TD_E_GRAVE,
-  TD_E_ACUTE,
-  TD_I_GRAVE,
-  TD_O_GRAVE,
-  TD_U_GRAVE,
-};
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_P_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_P, KC_BSPC),
-  [TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC),
-  [TD_A_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB),
-  //[TD_E_GRAVE] = ACTION_TAP_DANCE_DOUBLE(KC_E, KC_EGRAVE),
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * LEGEND:
- *
- * ,--------------------------------.
- * |     Top row: shifted character |
- * | Central row: standard char     |
- * |  Bottom row: hold modifier     |
- * `--------------------------------'
- *
- *  "____" means free to be assigned
- *
- */
-
-
-/* Qwerty Home Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | Enter|      |
- * |      | Shift| FnNav|NumSym| AltGr| OSkey| OSkey| AltGr| FnNav|NumSym| Shift|      |
- * |------+------+------+------+------+------+------|------+------+------+------+------+
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  | Space|      |      |
- * |      |      | Ctrl |  Alt | FnNav|NumSym| Shift|  Alt | Ctrl | Shift|      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [LAYER_HOME] = LAYOUT_ortho_4x12(
-         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX,
-         XXXXXXX, MT(MOD_LSFT, KC_A), LT(LAYER_FUNC, KC_S), LT(LAYER_NUMSYM, KC_D), MT(MOD_RALT, KC_F), MT(MOD_LGUI, KC_G), MT(MOD_RGUI, KC_H), MT(MOD_RALT, KC_J), LT(LAYER_FUNC, KC_K), LT(LAYER_NUMSYM, KC_L), MT(MOD_RSFT, KC_ENT), XXXXXXX,
-         XXXXXXX, XXXXXXX, MT(MOD_LCTL, KC_Z), MT(MOD_LALT, KC_X), LT(LAYER_FUNC, KC_C), LT(LAYER_NUMSYM, KC_V), MT(MOD_LSFT, KC_B), MT(MOD_LALT, KC_N), MT(MOD_RCTL, KC_M), MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
-
-/* Function and Navigation Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |  ESC | Home | PgDn | PgUp |  End | Left | Down |  Up  | Right| Baksp|      |
- * |      | Shift| ____ |SysLay| AltGr| OSkey| OSkey| AltGr| ____ |SysLay| Shift|      |
- * |------+------+------+------+------+------+------|------+------+------+------+------+
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |      |
- * |      |      | Ctrl |  Alt | ____ |SysLay| Shift|  Alt | Ctrl | Shift|      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [LAYER_FUNC] = LAYOUT_ortho_4x12(
-         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,
-         XXXXXXX, MT(MOD_LSFT, KC_ESC), KC_HOME, LT(LAYER_SYST, KC_PGDN), MT(MOD_RALT, KC_PGUP), MT(MOD_LGUI, KC_END), MT(MOD_RGUI, KC_LEFT), MT(MOD_RALT, KC_DOWN), KC_UP, LT(LAYER_SYST, KC_RGHT), MT(MOD_RSFT, KC_BSPC), XXXXXXX,
-         XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, MO(LAYER_SYST), KC_LSFT, KC_LALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
-
-/* Number and Symbols Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |   ~  |   _  |   +  |   {  |   }  |  |   |   :  |   "  |      |      |
- * |      |  TAB |   `  |   -  |   =  |   [  |   ]  |  \   |   ;  |   '  |      |      |
- * |      | Shift|SysLay| ____ | AltGr| OSkey| OSkey| AltGr|SysLay| ____ | Shift|      |
- * |------+------+------+------+------+------+------|------+------+------+------+------+
- * |      |      |      |      |      |      |   <  |   >  |   ?  |      |      |      |
- * |      |      | ____ | ____ | ____ | ____ |   ,  |   .  |   /  | ____ |      |      |
- * |      |      | Ctrl |  Alt |SysLay| ____ | Shift|  Alt | Ctrl | Shift|      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [LAYER_NUMSYM] = LAYOUT_ortho_4x12(
-         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX,
-         XXXXXXX, MT(MOD_LSFT, KC_TAB), LT(LAYER_SYST, KC_GRV), KC_MINS, MT(MOD_RALT, KC_EQL), MT(MOD_LGUI, KC_LBRC), MT(MOD_RGUI, KC_RBRC), MT(MOD_RALT, KC_BSLS), LT(LAYER_SYST, KC_SCLN), KC_QUOT, MT(MOD_RSFT, KC_DEL), XXXXXXX,
-         XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, MO(LAYER_SYST), KC_NO, MT(MOD_LSFT, KC_COMM), MT(MOD_LALT, KC_DOT), MT(MOD_RCTL, KC_SLSH), MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
-
-/* System Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      | F11  | F12  |NumLay|LghLay| ____ |KbInit| Power|SysReq|MouLay|Backsp|      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      | Caps | Mute | Vol- | Vol+ | Play | Next | ____ | ____ |OSMenu| Ins  |      |
- * |      | Shift| ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Shift|      |
- * |------+------+------+------+------+------+------|------+------+------+------+------+
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      | ____ | ____ | ____ | ____ |PrnScr|ScrLck|Pause | ____ |      |      |
- * |      |      | Ctrl |  Alt | ____ | ____ | ____ | ____ | ____ | Shift|      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [LAYER_SYST] = LAYOUT_ortho_4x12(
-         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, CK_CONFIGINIT, KC_PWR, KC_SYRQ, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX,
-         XXXXXXX, MT(MOD_LSFT, KC_CAPS), KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_APP, MT(MOD_RSFT, KC_INS), XXXXXXX,
-         XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
-
-/* Numeric Keypad
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |NumLck| ____ |NumLay|  /   |  *   |  -   |  7   |  8   |  9   |Backsp|      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      | Tab  |  (   |  )   |  =   |  ,   |  +   |  4   |  5   |  6   | Enter|      |
- * |      | Shift| ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Shift|      |
- * |------+------+------+------+------+------+------|------+------+------+------+------+
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      | ____ | ____ | 000  |  .   |  0   |  1   |  2   |  3   |      |      |
- * |      |      | Ctrl |  Alt | ____ | ____ | ____ | ____ | ____ | Shift|      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [LAYER_NUMONLY] = LAYOUT_ortho_4x12(
-         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_NUM, KC_NO, TG(LAYER_NUMONLY), KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_P7, KC_P8, KC_P9, KC_BSPC, XXXXXXX,
-         XXXXXXX, MT(MOD_LSFT, KC_TAB), KC_LPRN, KC_RPRN, KC_EQUAL, KC_KP_COMMA, KC_KP_PLUS, KC_P4, KC_P5, KC_P6, MT(MOD_LSFT, KC_KP_ENTER), XXXXXXX,
-         XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, CK_TRIPLEZERO, KC_KP_DOT, KC_P0, KC_P1, KC_P2, MT(MOD_LSFT, KC_P3), XXXXXXX, XXXXXXX ),
-
-/* Backlight adjustment Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      | ____ | ____ | ____ |LghLay| ____ | Hue+ | Sat+ | Val+ | ____ | Plain|      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      | ____ | ____ |ModeFw|ModeBw| ____ | Hue- | Sat- | Val- | ____ |Toggle|      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+------+------|------+------+------+------+------+
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |Breath|Rainbw| Swirl| Snake|Knight| XMas |Gradnt| Test |      |      |
- * |      |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [LAYER_LIGHTS] = LAYOUT_ortho_4x12(
-         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_NO, KC_NO, KC_NO, TG(LAYER_LIGHTS), KC_NO, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, RGB_M_P, XXXXXXX,
-         XXXXXXX, KC_NO, KC_NO, RGB_MOD, RGB_RMOD, KC_NO, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, RGB_TOG, XXXXXXX,
-         XXXXXXX, XXXXXXX, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_SNAKE, RGB_MODE_KNIGHT, RGB_MODE_XMAS, RGB_MODE_GRADIENT, RGB_MODE_RGBTEST, XXXXXXX, XXXXXXX ),
-
-/* Mouse emulation Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      | Btn1 |  Up  | Btn2 | Whl+ | Accl0| Accl1| Accl2| ____ |MouLay| ____ |      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      | Left | Down | Right| Whl- | ____ | ____ | ____ | ____ | ____ | Enter|      |
- * |      | ____ | ____ | ____ | ____ | OSkey| OSkey| AltGr| ____ | ____ | ____ |      |
- * |------+------+------+------+------+------+------|------+------+------+------+------+
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Space|      |      |
- * |      |      | Ctrl |  Alt | ____ | ____ | Shift|  Alt | Ctrl | Shift|      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [LAYER_MOUSE] = LAYOUT_ortho_4x12(
-         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-         XXXXXXX, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_MS_WH_UP, KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, KC_NO, TG(LAYER_MOUSE), KC_NO, XXXXXXX,
-         XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN, KC_LGUI, KC_RGUI, KC_RALT, KC_NO, KC_NO, KC_ENT, XXXXXXX,
-         XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_LSFT, KC_LALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ),
-
-};
-
-
-void matrix_init_user(void) {
-  // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values
-  // set num lock on at start (for numonly layer to work)
-  if (!host_keyboard_led_state().num_lock) {
-      SEND_STRING(SS_TAP(X_NUM_LOCK)); //register_code(KC_NUM_LOCK); unregister_code(KC_NUM_LOCK);
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case CK_TRIPLEZERO:
-      if (record->event.pressed) {
-        SEND_STRING("000");
-      } // else { when released... }
-      break;
-  }
-  return true;
-};
-
-
-/* Empty keyboard template
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |
- * |------+------+------+------+------+------+------|------+------+------+------+------+
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |      |
- * |      |      | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |      |      |
- * `-----------------------------------------------------------------------------------'
- */
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/readme.md b/keyboards/kprepublic/jj40/keymaps/stevexyz/readme.md
deleted file mode 100644
index 4b09f0f1bfd..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# jj28 (aka jj40 super micro edition :))
-
-With this configuration a 4x12 jj40 (with 48 keys) is being removed 20 keys and transformed into an ortholinear Alpha28 PyroL-vderm 28 keys inspired layout one.
-This keyboard can be actually called jj28!
-
-![Bare layout](https://i.ibb.co/7GK1LY7/layout-0.jpg)
-
-![Fully described](https://i.ibb.co/kxTfTXH/layout-4.jpg)
-
-Why you should want to do something like this?
-There are many valid reasons.
-The main one to me might just be to be able to test such an "extreme" configuration for real if you have this easily available board on hand.
-But also because this setup might be even more confortable than the original 2u space one (for muscle memory having bnm letters nearer to zxcv).
-Or just more nice looking.
-Surely you have an additional option, and personally, after using it as a daily driver, I liked it, even if I was a bit slower in processing complicated sequences! :)
-
-Notes on layout:
-After few tests I found out that the space at the end is the best for people that are very used to “standard” keyboards (basically almost everybody), retaining years of muscle memory.
-And moreover, also shift, fn and numsym layer keys are good to be replicated on central line.
-
-[Keyboard layout editor](http://www.keyboard-layout-editor.com/#/) raw data in keyboard-layout-editor-raw-data.txt file.
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/rules.mk b/keyboards/kprepublic/jj40/keymaps/stevexyz/rules.mk
deleted file mode 100644
index b9152e31f3f..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options (yes/no)
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes        # Audio control and System control(+450)
-CONSOLE_ENABLE = no          # Console for debug(+400)
-COMMAND_ENABLE = no          # Commands for debug and configuration
-NKRO_ENABLE = no             # USB Nkey Rollover (see: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work)
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality on B7 by default
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-MIDI_ENABLE = no             # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE = no          # Unicode
-BLUETOOTH_ENABLE = no        # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no            # Audio output on port C6
-
-TAP_DANCE_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/kprepublic/jj40/keymaps/suzuken/config.h b/keyboards/kprepublic/jj40/keymaps/suzuken/config.h
deleted file mode 100644
index b1d74e1e693..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/suzuken/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 300
-
-#endif
diff --git a/keyboards/kprepublic/jj40/keymaps/suzuken/keymap.c b/keyboards/kprepublic/jj40/keymaps/suzuken/keymap.c
deleted file mode 100644
index 52dafc38b48..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/suzuken/keymap.c
+++ /dev/null
@@ -1,99 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum jj40_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _FUNC
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  |  '"  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Fn  | Ctrl | Alt  | GUI  |Space |Lower |Raise |Space | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  MO(_FUNC), KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  MO(_LOWER),  MO(_RAISE),  KC_SPC,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_ENT,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______, _______, _______, KC_PIPE,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_ENT,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Functions
- *  Note: Terminal uses Calculator shortcut, change your OS keyboard shortcut appropriately.
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | RGB  | RGB  | RGB  | RGB  |  BL  |  BL  |  BL  |      |      |      |      |
- * |      | Togl | Hue+ | Sat+ | Brt+ | Togl |Breath| Brt+ |      |      |      |VolUp |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      | RGB  | RGB  | RGB  | WWW  | WWW  |  BL  |      |      |      |      |
- * |      | Term | Hue- | Sat- | Brt- | Back | Fwd  | Brt- |      |      |PrScr |VolDn |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |||||||| RGB  |      |      |      |      |      |      |      |      |      |
- * |      |||Fn||| Mode |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_ortho_4x12(
-    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_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_UP,   _______, _______, _______, KC_VOLU,
-    _______, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DOWN, _______, _______, KC_PSCR, KC_VOLD,
-    _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-};
-
-// Loop
-void matrix_scan_user(void) {
-    // Empty
-};
diff --git a/keyboards/kprepublic/jj40/keymaps/waples/config.h b/keyboards/kprepublic/jj40/keymaps/waples/config.h
deleted file mode 100644
index b1d74e1e693..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/waples/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 300
-
-#endif
diff --git a/keyboards/kprepublic/jj40/keymaps/waples/keymap.c b/keyboards/kprepublic/jj40/keymaps/waples/keymap.c
deleted file mode 100644
index c09bb43d4f1..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/waples/keymap.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _DVORAK 1
-#define _LEFTY 2
-#define _RIGHTY 3
-#define _DUAL 4
-
-enum jj40_keycodes {
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  LEFTY,
-  RIGHTY,
-  DUAL,
-};
-
-#define TG_NKRO MAGIC_TOGGLE_NKRO     // Toggle NKRO
-#define CTLESC MT(MOD_LCTL, KC_ESC)    // Hold for left Ctrl, tap for Esc
-#define SHFTENT MT(MOD_RSFT, KC_ENT)    // Hold for right Shift, tap for Enter
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,  KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, SHFTENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,    KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_PSCR, KC_BSPC, KC_CAPS, KC_LALT, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_DVORAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,  KC_Y,    KC_F,   KC_G,   KC_C,    KC_R,    KC_L,  KC_BSPC,
-  CTLESC,  KC_A,    KC_O,    KC_E,    KC_U,  KC_I,    KC_D,   KC_H,   KC_T,    KC_N,    KC_S,  SHFTENT,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,  KC_X,    KC_B,   KC_M,   KC_W,    KC_V,    KC_Z,  KC_SLSH,
-  KC_PSCR, KC_BSPC, KC_CAPS, KC_LALT, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-),
-
-[_LEFTY] = LAYOUT_ortho_4x12(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_INS,  _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-[_RIGHTY] = LAYOUT_ortho_4x12(
-  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_DEL,  KC_F1, KC_F2,  KC_F3,  KC_F4,   _______, KC_EQL,  KC_MINS, KC_BSLS, KC_SLSH, _______, _______,
-  _______, KC_F5, KC_F6,  KC_F7,  KC_F8,   _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_DUAL] = LAYOUT_ortho_4x12(
-  QK_BOOT, _______, _______, _______, _______, QWERTY,  DVORAK,  _______, _______, RGB_HUD,  RGB_TOG,  QK_BOOT,
-  _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, RGB_HUI,  RGB_MOD,  _______,
-  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, RGB_SAD,  RGB_VAD,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI,  RGB_VAI,  _______
-)
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LEFTY:
-      if (record->event.pressed) {
-        layer_on(_LEFTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      } else {
-        layer_off(_LEFTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      }
-      return false;
-      break;
-    case RIGHTY:
-      if (record->event.pressed) {
-        layer_on(_RIGHTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      } else {
-        layer_off(_RIGHTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      }
-      return false;
-      break;
-    case DUAL:
-      if (record->event.pressed) {
-        layer_on(_DUAL);
-      } else {
-        layer_off(_DUAL);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/kprepublic/jj40/keymaps/waples/readme.md b/keyboards/kprepublic/jj40/keymaps/waples/readme.md
deleted file mode 100644
index e9382d89f82..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/waples/readme.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Waples jj40 keymap
-> based heavily on my lets split
-[Waples](https://www.github.com/Waples)
-
-### Layers
-I currently have the following layers in my keymap:
-* Qwerty 	(as default)
-* Dvorak	(still learning this type of layout, so not really used much)
-* Lefty		(lower)
-* Righty	(raise)
-* Dual		(adjust)
-
-### Note to self:
-YOU NEED TO USE [bootloadHID -r kprepublic_jj40_waples.hex](https://github.com/qmk/qmk_firmware/tree/master/keyboards/jj40)
-
-## the stuff below is out of date and I think about removing them from this readme
-
-#### QWERTY
-	| Tab |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bsp |
-	|C_Esc|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |S_Ent|
-	| Sft |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  "  |
-	|P_SCR| GUI | Alt | Cps | ^L^ | Bsp | Spc | ^R^ | Lft | Dwn | Up! | Rgt |
-
-
-#### DVORAK
-	| Tab |  "  |  ,  |  .  |  P  |  Y  |  F  |  G  |  C  |  R  |  L  | Bsp |
- 	|C_Esc|  A  |  O  |  E  |  U  |  I  |  D  |  H  |  T  |  N  |  S  |S_Ent|
-	| Sft |  ;  |  Q  |  J  |  K  |  X  |  B  |  M  |  W  |  V  |  Z  |  /  |
-	|P_SCR| GUI | Alt | Cps | ^L^ | Bsp | Spc | ^R^ | Lft | Dwn | Up! | Rgt |
-
-#### LEFTY	(lower)
-	|  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  | Bsp |
-	| Del |     |     |     |     |     |     |  (  |  )  |  [  |  ]  |     |
-	|     |     |     |     |     |     |     |     |     |     |     |     |
-	|     |     |     |     |     |     | Ins |     | Hme | PgD | PgU | End |
-
-
-#### RIGHTY	(raise)
-	|  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Bsp |
-	| Del | F1  | F2  | F3  | F4  |     |  =  |  -  |  \  |  /  |     |     |
-	|     | F5  | F6  | F7  | F8  |     |     |     |     |     |     |     |
- 	|     | F9  | F10 | F11 |     |     |     |     |     |     |     |     |
-
-
-#### DUAL
-	|Reset|     |     |     |     |QWERT| GAME|     |     |     |     |Reset|
-	|     | Prv | Stp | Tog | Nxt | Nrm | Swp |     |     |     |     |     |
-	|     |     | Mte | Vol-| Vol+|     | NKRO|     |     |     |     |     |
-	|     |     |     |     |     |     |DVORK|     |     |     |     |     |
diff --git a/keyboards/kprepublic/jj40/keymaps/waples/rules.mk b/keyboards/kprepublic/jj40/keymaps/waples/rules.mk
deleted file mode 100644
index 8f678e6b594..00000000000
--- a/keyboards/kprepublic/jj40/keymaps/waples/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# build options
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb/config.h b/keyboards/kprepublic/jj50/keymaps/abstractkb/config.h
deleted file mode 100644
index 9439a929e98..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLIGHT_SLEEP
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
deleted file mode 100644
index f02f27005be..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com>
-Modified 2019 AbstractKB
-
-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 LicensezZZ
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _DEFLT,
-  _RAISE,
-  _LOWER,
-  _FN
-};
-
-enum custom_keycodes {
-  MYRGB_TG = SAFE_RANGE
-};
-
-bool rgbinit = true;
-bool rgbon = true;
-
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {1,5,5}; //only using the first one
-
-void keyboard_post_init_user(void) {
-  rgblight_enable_noeeprom();
-  led_set_user(host_keyboard_leds());
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case _RAISE:
-      rgblight_sethsv_noeeprom(170,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-    case _LOWER:
-      rgblight_sethsv_noeeprom(0,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-    case _FN:
-      rgblight_sethsv_noeeprom(0,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
-      break;
-    default: //_DEFLT
-      rgblight_sethsv_noeeprom(0,0,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-  }
-
-  return state;
-}
-
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
-  } else {
-    layer_state_set_user(layer_state);
-  }
-  return false;
-}
-
-void myrgb_toggle(void) {
-  if (rgbon) {
-    rgblight_disable_noeeprom();
-    rgbon = false;
-  } else {
-    rgblight_enable_noeeprom();
-    layer_state_set_user(layer_state);
-    led_set_user(host_keyboard_leds());
-    rgbon = true;
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case MYRGB_TG:
-      if (record->event.pressed) {
-        myrgb_toggle();
-      }
-      return false;
-    default:
-      return true;
-  }
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_DEFLT] = LAYOUT(
-        KC_ESC,	 KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_ENT,
-        KC_BSPC, 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,
-        MO(_FN), KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE),KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-
-    [_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,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, LCTL(LGUI(KC_LEFT)), LGUI(KC_L), LCTL(LGUI(KC_RGHT)), _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_CAPS, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY
-    ),
-
-
-    [_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_MINS, KC_EQL,  KC_BSLS, _______,
-        _______, _______, _______, KC_LBRC, KC_RBRC, S(KC_9),S(KC_0),S(KC_LBRC),S(KC_RBRC),_______,_______,_______,
-        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-
-    [_FN] = LAYOUT(
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MYRGB_TG
-    )
-};
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb/readme.md b/keyboards/kprepublic/jj50/keymaps/abstractkb/readme.md
deleted file mode 100644
index 7ff7e0268a1..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# My personal layout for the JJ50
-
-It is an approximation of a 60% layout with the alternate layers set up for programming,
-with brackets and parenthesis on the homerow
-Other things I changed were swapping around delete, backspace, and capslock around
-It also uses layer based rgb underglow, and the underglow flashes when capslock is enabled
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/config.h b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/config.h
deleted file mode 100644
index 9439a929e98..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLIGHT_SLEEP
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
deleted file mode 100644
index 888e43e7dd6..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com>
-Modified 2019 AbstractKB
-
-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 LicensezZZ
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _DEFLT,
-  _FUNC,
-  _SYM,
-  _META
-};
-
-enum custom_keycodes {
-  MYRGB_TG = SAFE_RANGE
-};
-
-bool rgbinit = true;
-bool rgbon = true;
-
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {1,5,5}; //only using the first one
-
-void keyboard_post_init_user(void) {
-  rgblight_enable_noeeprom();
-  led_set_user(host_keyboard_leds());
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case _FUNC:
-      rgblight_sethsv_noeeprom(170,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-    case _SYM:
-      rgblight_sethsv_noeeprom(0,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-    case _META:
-      rgblight_sethsv_noeeprom(0,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
-      break;
-    default: //_DEFLT
-      rgblight_sethsv_noeeprom(0,0,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-  }
-
-  return state;
-}
-
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
-  } else {
-    layer_state_set_user(layer_state);
-  }
-  return false;
-}
-
-void myrgb_toggle(void) {
-  if (rgbon) {
-    rgblight_disable_noeeprom();
-    rgbon = false;
-  } else {
-    rgblight_enable_noeeprom();
-    layer_state_set_user(layer_state);
-    led_set_user(host_keyboard_leds());
-    rgbon = true;
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case MYRGB_TG:
-      if (record->event.pressed) {
-        myrgb_toggle();
-      }
-      return false;
-    default:
-      return true;
-  }
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_DEFLT] = LAYOUT(
-        KC_ESC,	 KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_ENT,
-        KC_BSPC, 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_LCTL, MO(_META), KC_LGUI, KC_LALT, MO(_SYM),KC_SPC,KC_SPC,MO(_FUNC),KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-
-    [_FUNC] = 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,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, LCTL(LGUI(KC_LEFT)), LGUI(KC_L), LCTL(LGUI(KC_RGHT)), _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_CAPS, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY
-    ),
-
-
-    [_SYM] = 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,
-        _______,S(KC_1),S(KC_2),S(KC_LBRC),S(KC_RBRC),S(KC_BSLS),_______, S(KC_MINS), _______, _______, _______, _______,
-        _______, S(KC_3), S(KC_4), S(KC_9), S(KC_0), KC_GRV, S(KC_EQL), KC_MINS, KC_BSLS, S(KC_8), _______, _______,
-        _______, S(KC_5), S(KC_6), KC_LBRC,KC_RBRC,S(KC_GRV), S(KC_7),KC_EQL, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-
-    [_META] = LAYOUT(
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MYRGB_TG
-    )
-};
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/readme.md b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/readme.md
deleted file mode 100644
index a45ece7ff78..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# My personal layout for the JJ50
-
-It is an approximation of a cross between a 60% the gergo function layout
-It also uses layer based rgb underglow, and the underglow flashes when capslock is enabled
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/README.md b/keyboards/kprepublic/jj50/keymaps/archetype/README.md
deleted file mode 100644
index a2ae4e9123f..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/archetype/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# archetype keymap for jj50 keyboards
-A keymap that can be used with the jj50 ortholinear keyboard.
-
-## Features
-
-- `QWERTY` layout (Default)
-- `COLEMAK` layout
-- `FN` layout (various keys that are rarely needed)
-- `FX` layout (Control lighting and audio)
-- Use `Left Ctrl` and `Left Alt` to output `()`, `[]` and `{}` by tapping once, twice or thrice respectively. Hold them down for the regular keycode (LCtrl or LAlt)
-- `Right Shift` when held or Enter when tapped
-- Auto-Shift enabled (long press on alphas and numeric keys outputs shifted character)
-- Full arrow keys available
-
-
-## Feedback
-
-I made this keymap based on the existing default one. If you happen to use this keymap [drop me a line](mailto://idimitrakopoulos@gmail.com) about what could be improved etc
-
-Enjoy!
-
-Iason Dimitrakopoulos
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/config.h b/keyboards/kprepublic/jj50/keymaps/archetype/config.h
deleted file mode 100644
index 17ce95a3632..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/archetype/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#undef AUTO_SHIFT_TIMEOUT
-#undef TAPPING_TERM
-
-#define AUTO_SHIFT_TIMEOUT 150
-#define NO_AUTO_SHIFT_ALPHA
-#define TAPPING_TERM 150
-#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c b/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c
deleted file mode 100644
index a4856144386..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com>
-Modified 2019 Iason Dimitrakopoulos (idimitrakopoulos) <idimitrakopoulos@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 LicensezZZ
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "rgblight.h"
-#include "quantum.h"
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _FN 2
-#define _FX 3
-
-enum {
-  TD_BSPC_DEL = 0,
-  TD_LCTL_LBRC = 1,
-  TD_LALT_RBRC = 2,
-  TD_ESC_LAYER = 3,
-};
-
-
-void left_brackets(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-      if (!state->pressed) {
-        register_code16(KC_LPRN);
-      } else {
-        register_code(KC_LCTL);
-      }
-    } else if (state->count == 2) {
-        register_code16(KC_LBRC);
-    } else if (state->count == 3) {
-        register_code16(KC_LCBR);
-    }
-}
-
-void left_brackets_reset(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code16(KC_LPRN);
-    } else if (state->count == 2) {
-        unregister_code16(KC_LBRC);
-    } else if (state->count == 3) {
-        unregister_code16(KC_LCBR);
-    }
-
-    unregister_code(KC_LCTL);
-}
-
-void right_brackets(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-      if (!state->pressed) {
-        register_code16(KC_RPRN);
-      } else {
-        register_code(KC_LALT);
-      }
-    } else if (state->count == 2) {
-        register_code16(KC_RBRC);
-    } else if (state->count == 3) {
-        register_code16(KC_RCBR);
-    }
-}
-
-void right_brackets_reset(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code16(KC_RPRN);
-    } else if (state->count == 2) {
-        unregister_code16(KC_RBRC);
-    } else if (state->count == 3) {
-        unregister_code16(KC_RCBR);
-    }
-
-    unregister_code(KC_LALT);
-}
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} tap;
-
-enum {
-  SINGLE_TAP = 1,
-  SINGLE_HOLD = 2,
-  DOUBLE_TAP = 3,
-  DOUBLE_HOLD = 4,
-  DOUBLE_SINGLE_TAP = 5, //send two single taps
-  TRIPLE_TAP = 6,
-  TRIPLE_HOLD = 7,
-  TRIPLE_SINGLE_TAP = 8, //send three single taps
-};
-
-int cur_dance (tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted || !state->pressed)  return SINGLE_TAP;
-    else return SINGLE_HOLD;
-  }
-  else if (state->count == 2) {
-    if (state->interrupted) return DOUBLE_SINGLE_TAP;
-    else if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  }
-
-  if (state->count == 3) {
-    if (state->interrupted) return TRIPLE_SINGLE_TAP;
-    else if (state->pressed) return TRIPLE_HOLD;
-    else return TRIPLE_TAP;
-  }
-  else return 9; //magic number. At some point this method will expand to work for more presses
-}
-
-static tap tap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void layer_switcher (tap_dance_state_t *state, void *user_data) {
-  tap_state.state = cur_dance(state);
-  switch (tap_state.state) {
-    case SINGLE_TAP: register_code(KC_ESC); break;
-    case SINGLE_HOLD: register_code(KC_ESC); break;
-    case DOUBLE_TAP: register_code(KC_ESC); break;
-    case DOUBLE_HOLD: layer_on(_COLEMAK); break;
-    case DOUBLE_SINGLE_TAP: register_code(KC_ESC); unregister_code(KC_ESC); register_code(KC_ESC); break;
-    case TRIPLE_TAP: register_code(KC_ESC); break;
-    case TRIPLE_HOLD: layer_on(_FX); break;
-    case TRIPLE_SINGLE_TAP: register_code(KC_ESC); unregister_code(KC_ESC); register_code(KC_ESC); unregister_code(KC_ESC); register_code(KC_ESC); break;
-    //Last case is for fast typing. Assuming your key is `f`:
-    //For example, when typing the word `buffer`, and you want to make sure that you send `ff` and not `Esc`.
-    //In order to type `ff` when typing fast, the next character will have to be hit within the `TAPPING_TERM`, which by default is 200ms.
-  }
-}
-
-void layer_switcher_reset (tap_dance_state_t *state, void *user_data) {
-  switch (tap_state.state) {
-    case SINGLE_TAP: unregister_code(KC_ESC); break;
-    case SINGLE_HOLD: unregister_code(KC_ESC); break;
-    case DOUBLE_TAP: unregister_code(KC_ESC); break;
-    case DOUBLE_HOLD: break;
-    case DOUBLE_SINGLE_TAP: unregister_code(KC_ESC); break;
-    case TRIPLE_TAP: unregister_code(KC_ESC); break;
-    case TRIPLE_HOLD: break;
-    case TRIPLE_SINGLE_TAP: unregister_code(KC_ESC); break;
-  }
-  tap_state.state = 0;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  // Single tap = Backspace | Double tap = Delete
-  [TD_BSPC_DEL] = ACTION_TAP_DANCE_DOUBLE(KC_BSPC, KC_DEL),
-  // Single tap = ( | Double tap = [ | Triple tap = { | Single hold = KC_LCTL
-  [TD_LCTL_LBRC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, left_brackets, left_brackets_reset),
-  // Single tap = ) | Double tap = ] | Triple tap = } | Single hold = KC_LALT
-  [TD_LALT_RBRC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, right_brackets, right_brackets_reset),
-  // Layer Switcher ESC
-  [TD_ESC_LAYER] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, layer_switcher, layer_switcher_reset),
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_ESC_LAYER):
-            return 100;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_QWERTY] = LAYOUT(
-
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+.
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-        TD(TD_ESC_LAYER),     KC_1,             KC_2,             KC_3,             KC_4,             KC_5,             KC_6,             KC_7,             KC_8,             KC_9,             KC_0,             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_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_LSFT,          KC_Z,             KC_X,             KC_C,             KC_V,             KC_B,             KC_N,             KC_M,             KC_DOT,           KC_SLSH,          KC_UP,          SFT_T(KC_ENT),
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-        TD(TD_LCTL_LBRC),     KC_LGUI,      TD(TD_LALT_RBRC),     _______,          _______,        LT(_FN, KC_SPC),    _______,        LT(_FX, KC_SPC),    KC_COMM,          KC_LEFT,          KC_DOWN,          KC_RGHT
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+'
-    ),
-
-    [_COLEMAK] = LAYOUT(
-
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+.
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          KC_F,             KC_P,             KC_G,             KC_J,             KC_L,             KC_U,             KC_Y,             KC_SCLN,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          KC_R,             KC_S,             KC_T,             KC_D,             _______,          KC_N,             KC_E,             KC_I,             KC_O,             _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          KC_K,             _______,          _______,          _______,          _______,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+'
-    ),
-
-    [_FN] = LAYOUT(
-
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+.
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            KC_GRV,           KC_F1,            KC_F2,            KC_F3,            KC_F4,            KC_F5,            KC_F6,            KC_F7,            KC_F8,            KC_F9,            KC_F10,           KC_DEL,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            KC_PSCR,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          KC_EQUAL,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            KC_CAPS,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          KC_MINUS,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          KC_PGUP,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          KC_HOME,          KC_PGDN,          KC_END
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+'
-    ),
-
-    [_FX] = LAYOUT(
-
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+.
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          RGB_VAI,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          RGB_VAD,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          RGB_MOD,          RGB_HUI,          RGB_TOG,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          RGB_SAI,          RGB_HUD,          RGB_SAD
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+'
-    ),
-
-
-};
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/rules.mk b/keyboards/kprepublic/jj50/keymaps/archetype/rules.mk
deleted file mode 100644
index c77317fdc3c..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/archetype/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMMAND_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/kprepublic/jj50/keymaps/yoonbae81/config.h b/keyboards/kprepublic/jj50/keymaps/yoonbae81/config.h
deleted file mode 100644
index f91326ca266..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/yoonbae81/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 25
-#define MOUSEKEY_MAX_SPEED 7
-#define MOUSEKEY_TIME_TO_MAX 30
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c b/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
deleted file mode 100644
index c939ea91a93..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/yoonbae81/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _MAIN,
-    _FN1,
-    _FN2,
-    _FN3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = 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_BSLS,
-     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, KC_BSPC,
-     MO(2),   MO(3), KC_LGUI, KC_LALT, LT(1,KC_ENT),KC_NO, KC_SPC,KC_NO, LT(1,KC_RALT), LT(2,KC_RCTL), KC_APP, TO(2)
-  ),
-
-  [_FN1] = LAYOUT(
-     _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-     _______, KC_LCBR, KC_PGUP, KC_UP,   KC_HOME, KC_RCBR, KC_NO,   KC_HOME, KC_PGUP, KC_NO,   KC_NO,   KC_F12, 
-     _______, KC_LPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_MINS, KC_EQL,
-     _______, KC_LBRC, KC_END,  KC_NO,   KC_PGDN, KC_RBRC, KC_NO,   KC_PGDN, KC_END,  KC_ENT,  KC_INS,  KC_DEL,
-     _______, _______, _______, _______, _______, _______, KC_BSPC, _______, _______, _______, _______, _______
-  ),
-
-  [_FN2] = LAYOUT(
-     TO(0),   KC_1,    KC_2,    KC_SCRL, KC_PAUS, KC_PSCR, KC_CALC, KC_ESC,  KC_PMNS, KC_PERC, KC_PSLS, MO(3), 
-     _______, KC_NO,   KC_WH_U, KC_MS_U, KC_NO,   KC_NO,   KC_F2,   KC_7,    KC_8,    KC_9,    KC_PAST, KC_NO, 
-     _______, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,   KC_ENT,  KC_4,    KC_5,    KC_6,    KC_MINS, KC_EQL,
-     _______, KC_NO,   KC_NO,   KC_NO,   KC_WH_D, KC_NO,   KC_NO,   KC_1,    KC_2,    KC_3,    KC_PPLS, KC_BSPC,
-     _______, _______, _______, KC_BTN2, KC_BTN1, _______, KC_0,    _______, KC_PDOT, _______, _______, TO(0)
-  ),
-
-  [_FN3] = LAYOUT(
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _______, KC_MPRV, KC_MRWD, KC_MFFD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______, _______, _______, _______
-  )
-};
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj50/keymaps/yoonbae81/rules.mk b/keyboards/kprepublic/jj50/keymaps/yoonbae81/rules.mk
deleted file mode 100644
index 8232d05fdbd..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/yoonbae81/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = yes
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/kradoindustries/promenade/keymaps/vial/config.h b/keyboards/kradoindustries/promenade/keymaps/vial/config.h
new file mode 100644
index 00000000000..062fae2d8db
--- /dev/null
+++ b/keyboards/kradoindustries/promenade/keymaps/vial/config.h
@@ -0,0 +1,26 @@
+/*
+ * 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 VIAL_KEYBOARD_UID {0x66, 0x4A, 0xDE, 0x0A, 0x6C, 0x68, 0xBE, 0x77}
+
+#define VIAL_UNLOCK_COMBO_ROWS {0, 0}
+#define VIAL_UNLOCK_COMBO_COLS {0, 1}
+
+#define TAPPING_TOGGLE 2
+#define VIAL_COMBO_ENTRIES 32
+#define TAPPING_TERM 150
+#define COMBO_TERM 30
diff --git a/keyboards/kradoindustries/promenade/keymaps/vial/keymap.c b/keyboards/kradoindustries/promenade/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..aef0f281613
--- /dev/null
+++ b/keyboards/kradoindustries/promenade/keymaps/vial/keymap.c
@@ -0,0 +1,66 @@
+/*
+Copyright 2023 Matt F
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// Layer shorthand
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Base Layer
+     * .-----------------------------------------------------------------------------------------------------------------------------.
+     * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
+     * | TAB    | Q      | W      | E      | R      | T      | [      | ]      | Y      | U      | I      | O      | P      | '      |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
+     * | CAP LK | A      | S      | D      | F      | G      |        |        | H      | J      | K      | L      | ;      | ENTER  |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
+     * | LSHIFT | Z      | X      | C      | V      | B      | END    | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
+     * | LCTRL  | LGUI   | FN     | LALT   | SPACE  | SPACE  | SPACE  | SPACE  | SPACE  | LEFT   | DOWN   | UP     | RIGHT  | RCTRL  |
+     * '-----------------------------------------------------------------------------------------------------------------------------'
+     */
+    [_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC,  KC_SPC,      KC_SPC,       KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_RCTL
+    ),
+
+    /* Function Layer
+     * .-----------------------------------------------------------------------------------------------------------------------------.
+     * | `      | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | DEL    |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
+     * |        | Home   | Up     | End    | PgUp   |        |        |        |        |        |        |        | PRT SC |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
+     * |        | Left   | Down   | Right  | PgDn   |        |        |        |        |        |        |        |        | Reset  |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |        |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
+     * |        |        |        |        |        |        |        |        |        |        |        |        |        | Reset  |
+     * '-----------------------------------------------------------------------------------------------------------------------------'
+     */
+    [_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_DEL,
+        _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,                   _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______,
+        _______, _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______, QK_BOOT
+    )
+};
diff --git a/keyboards/kradoindustries/promenade/keymaps/vial/rules.mk b/keyboards/kradoindustries/promenade/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..bba0062b790
--- /dev/null
+++ b/keyboards/kradoindustries/promenade/keymaps/vial/rules.mk
@@ -0,0 +1,7 @@
+COMMAND_ENABLE      = no
+VIA_ENABLE          = yes
+VIAL_ENABLE         = yes
+LTO_ENABLE          = yes
+QMK_SETTINGS        = no
+TAP_DANCE_ENABLE    = no
+KEY_OVERRIDE_ENABLE = no
diff --git a/keyboards/kradoindustries/promenade/keymaps/vial/vial.json b/keyboards/kradoindustries/promenade/keymaps/vial/vial.json
new file mode 100644
index 00000000000..f9c5dd44fe8
--- /dev/null
+++ b/keyboards/kradoindustries/promenade/keymaps/vial/vial.json
@@ -0,0 +1,27 @@
+{
+    "name": "Promenade",
+    "vendorId": "0xCDCD",
+    "productId": "0x5337",
+    "lighting": "qmk_rgblight",
+    "matrix": {
+      "rows": 5,
+      "cols": 14
+    },
+    "layouts": {
+      "labels": [
+        ["Center Columns", "1U", "1.5U"],
+        ["Spacebars", "3U", "6U", "2U", "7U"]
+      ],
+      "keymap": [
+        [{"w":1.5},"0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12",{"w":1.5},"0,13"],
+        [{"w":1.5},"1,0","1,1","1,2","1,3","1,4","1,5","1,6\n\n\n0,0","1,7\n\n\n0,0","1,8","1,9","1,10","1,11","1,12",{"w":1.5},"1,13",{"x":0.25,"h":1.5},"1,6\n\n\n0,1",{"h":1.5},"1,7\n\n\n0,1"],
+        [{"w":1.5},"2,0","2,1","2,2","2,3","2,4","2,5","2,6\n\n\n0,0","2,7\n\n\n0,0","2,8","2,9","2,10","2,11","2,12",{"w":1.5},"2,13"],
+        [{"y":-0.5,"x":15.25,"h":1.5},"3,6\n\n\n0,1",{"h":1.5},"3,7\n\n\n0,1"],
+        [{"y":-0.5,"w":1.5},"3,0","3,1","3,2","3,3","3,4","3,5","3,6\n\n\n0,0","3,7\n\n\n0,0","3,8","3,9","3,10","3,11","3,12",{"w":1.5},"3,13"],
+        [{"w":1.5},"4,0","4,1","4,2\n\n\n1,0","4,3\n\n\n1,0",{"w":3},"4,5\n\n\n1,0",{"w":3},"4,8\n\n\n1,0","4,10\n\n\n1,0","4,11\n\n\n1,0","4,12",{"w":1.5},"4,13"],
+        [{"x":2.5},"4,2\n\n\n1,1","4,3\n\n\n1,1",{"w":6},"4,6\n\n\n1,1","4,10\n\n\n1,1","4,11\n\n\n1,1"],
+        [{"x":2.5},"4,2\n\n\n1,2","4,3\n\n\n1,2","4,4\n\n\n1,2",{"w":2},"4,5\n\n\n1,2",{"w":2},"4,8\n\n\n1,2","4,9\n\n\n1,2","4,10\n\n\n1,2","4,11\n\n\n1,2"],
+        [{"x":2.5,"w":1.5},"4,2\n\n\n1,3",{"w":7},"4,6\n\n\n1,3",{"w":1.5},"4,11\n\n\n1,3"]
+      ]
+    }
+  }
diff --git a/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c b/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c
deleted file mode 100644
index 3910756f817..00000000000
--- a/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c
+++ /dev/null
@@ -1,201 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   1  |   2  |   3  |   4  |   5  |  ~   |           |  '   |   6  |   7  |   8  |   9  |   0  |   =    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  ~   |           |  "   |   Y  |   U  |   I  |   O  |   P  |   -    |
- * |--------+------+------+------+------+------|  `   |           |      |------+------+------+------+------+--------|
- * | Ctrl   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   |    \   |
- * |--------+------+------+------+------+------|  {   |           |  }   |------+------+------+------+------+--------|
- * | LAlt   |   Z  |   X  |   C  |   V  |   B  |  [   |           |  ]   |   N  |   M  |   ,  |   .  |  /   | LShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | LT-1 |  F4  |  F5  |  F6  |  F11 |                                       | Left | Down |  Up  | Right|  RAlt  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |  L1  | Prev |       | Vol+ |  L2  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Play |       | Vol- |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | Next |       | Mute |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LSFT(KC_GRV),
-        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_GRV,
-        KC_LCTL,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LALT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_LBRC,
-        LT(SYMB, KC_F2),       KC_F4,        KC_F5,  KC_F6,  KC_F11,
-                                                   TG(SYMB),  KC_MPRV,
-                                                              KC_MPLY,
-                                               KC_SPC,KC_BSPC,KC_MNXT,
-        // right hand
-             KC_QUOT,         KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_EQL,
-             LSFT(KC_QUOT),  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_MINS,
-                              KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),KC_BSLS,
-             KC_RBRC,         KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_LSFT,
-                              KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_RALT,
-             KC_VOLU,        TG(MDIA),
-             KC_VOLD,
-             KC_MUTE,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | EPRM  |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |Animat|      |       |Toggle|Solid |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |Bright|Bright|      |       |      |Hue-  |Hue+  |
- *                                 |ness- |ness+ |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-          EPRM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       RGB_MOD,KC_TRNS,
-                                               KC_TRNS,
-                               RGB_VAD,RGB_VAI,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       RGB_TOG, RGB_SLD,
-       KC_TRNS,
-       KC_TRNS, RGB_HUD, RGB_HUI
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_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_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
-                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/ktec/ergodone/keymaps/eozaki/readme.md b/keyboards/ktec/ergodone/keymaps/eozaki/readme.md
deleted file mode 100644
index bfde2b2c8e4..00000000000
--- a/keyboards/ktec/ergodone/keymaps/eozaki/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# ErgoDox EZ Based Configuration
-
-## Changelog
-
-* Aug 2018:
-  * New custom L0 layout.
-* Dec 2016:
-  * Added LED keys
-  * Refreshed layout graphic, comes from http://configure.ergodox-ez.com now.
-* Sep 22, 2016:
-  * Created a new key in layer 1 (bottom-corner key) that resets the EEPROM.
-* Feb 2, 2016 (V1.1): 
-  * Made the right-hand quote key double as Cmd/Win on hold. So you get ' when you tap it, " when you tap it with Shift, and Cmd or Win when you hold it. You can then use it as a modifier, or just press and hold it for a moment (and then let go) to send a single Cmd or Win keystroke (handy for opening the Start menu on Windows).
diff --git a/keyboards/ktec/ergodone/keymaps/erovia/config.h b/keyboards/ktec/ergodone/keymaps/erovia/config.h
deleted file mode 100644
index 60c6ad4a12c..00000000000
--- a/keyboards/ktec/ergodone/keymaps/erovia/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define DISABLE_SPACE_CADET_ROLLOVER
diff --git a/keyboards/ktec/ergodone/keymaps/erovia/keymap.c b/keyboards/ktec/ergodone/keymaps/erovia/keymap.c
deleted file mode 100644
index ee24fb36ed3..00000000000
--- a/keyboards/ktec/ergodone/keymaps/erovia/keymap.c
+++ /dev/null
@@ -1,229 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "bootmagic.h"
-
-#define QWERTY 0    // qwerty layer
-#define COLEMAK 1   // colemak layer
-#define FN 2        // function layer
-
-enum custom_keycodes {
-    QWRTY = SAFE_RANGE, // can always be here
-    CLMK,
-    VRSN,
-    FNCTN
-};
-
-/* false: Caps Lock LED is off
-   true: Caps Lock LED is on */
-bool CAPS_LED = false;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Qwerty layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   `    |   1  |   2  |   3  |   4  |   5  | Copy |           | Paste|   6  |   7  |   8  |   9  |   0  | Sleep  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  Tab   |   Q  |   W  |   E  |   R  |   T  | Mute |           |  {   |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |  [   |------+------+------+------+------+--------|
- * |  Esc   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
- * |--------+------+------+------+------+------| Fn1  |           |  }   |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |  ]   |   N  |   M  |   ,  |   .  |   /  | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |LCtrl | LGui | LAlt | Left | Right|                                       | Down |  Up  |   -  |   =  | RCtrl |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | Caps | LGui |       | Ins  |  Del |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[QWERTY] = LAYOUT_ergodox(  // layer 0 : qwerty
-        // left hand
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,  KC_COPY,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,  KC_MUTE,
-        KC_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
-        SC_LSPO,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,  TT(FN),
-        KC_LCTL,  KC_LGUI,  KC_LALT,  KC_LEFT,  KC_RGHT,
-                                                       KC_CAPS,  KC_LGUI,
-                                                                 KC_HOME,
-                                              KC_SPC,  KC_BSPC,  KC_END,
-        // right hand
-             KC_PASTE,  KC_6,  KC_7,     KC_8,     KC_9,     KC_0,      KC_SLEP,
-             KC_LBRC,   KC_Y,  KC_U,     KC_I,     KC_O,     KC_P,      KC_BSLS,
-                        KC_H,  KC_J,     KC_K,     KC_L,     KC_SCLN,   KC_QUOTE,
-             KC_RBRC,   KC_N,  KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   SC_RSPC,
-                               KC_DOWN,  KC_UP,    KC_MINS,  KC_EQL,    KC_RCTL,
-             KC_INS,    KC_DEL,
-             KC_PGUP,
-             KC_PGDN,  KC_TAB,  KC_ENT
-),
-/* Keymap 1: Colemak layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   `    |   1  |   2  |   3  |   4  |   5  | Copy |           | Paste|   6  |   7  |   8  |   9  |   0  | Sleep  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  Tab   |   Q  |   W  |   F  |   P  |   B  | Mute |           |  {   |   J  |   L  |   U  |   Y  |   ;  |   \    |
- * |--------+------+------+------+------+------|      |           |  [   |------+------+------+------+------+--------|
- * |  Esc   |   A  |   R  |   S  |   T  |   G  |------|           |------|   M  |   N  |   E  |   I  |   O  |   '    |
- * |--------+------+------+------+------+------| Fn1  |           |  }   |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   D  |   V  |      |           |  ]   |   K  |   H  |   ,  |   .  |   /  | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |LCtrl | LGui | LAlt | Left | Right|                                       | Down |  Up  |   -  |   =  | RCtrl |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | Caps | LGui |       | Ins  |  Del |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-[COLEMAK] = LAYOUT_ergodox(  // layer 1 : colemak
-        // left hand
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,  KC_COPY,
-        KC_TAB,   KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,  KC_MUTE,
-        KC_ESC,   KC_A,     KC_R,     KC_S,     KC_T,     KC_G,
-        SC_LSPO,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,  TT(FN),
-        KC_LCTL,  KC_LGUI,  KC_LALT,  KC_LEFT,  KC_RGHT,
-                                                       KC_CAPS,  KC_LGUI,
-                                                                 KC_HOME,
-                                              KC_SPC,  KC_BSPC,  KC_END,
-        // right hand
-             KC_PASTE,  KC_6,  KC_7,     KC_8,     KC_9,     KC_0,     KC_SLEP,
-             KC_LBRC,   KC_J,  KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_BSLS,
-                        KC_M,  KC_N,     KC_E,     KC_I,     KC_O,     KC_QUOTE,
-             KC_RBRC,   KC_K,  KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  SC_RSPC,
-                               KC_DOWN,  KC_UP,    KC_MINS,  KC_EQL,   KC_RCTL,
-             KC_INS,    KC_DEL,
-             KC_PGUP,
-             KC_PGDN,  KC_TAB,  KC_ENT
-),
-/* Keymap 2: Function Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  | F11  |           |  F12 |  F6  |  F7  |  F8  |  F9  |  F10 |        |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |      |      | Prev | Play | Next |      |           |      |      |      |      |      |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      |      |      |VolDn | VolUp|------|           |------|      |QWRTY | CLMK |     |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |      |      |      |      |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// Functions
-[FN] = LAYOUT_ergodox(
-       // left hand
-       VRSN,     KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_VOLU,
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                                                         KC_TRNS,  KC_TRNS,
-                                                                   KC_TRNS,
-                                               KC_TRNS,  KC_TRNS,  KC_TRNS,
-       // right hand
-       KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                 KC_TRNS,  QWRTY,    CLMK,     KC_TRNS,  KC_TRNS,  KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                           KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-       KC_TRNS,  KC_TRNS,
-       KC_TRNS,
-       KC_TRNS,  KC_TRNS,  KC_TRNS
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-      case VRSN:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        return false;
-        break;
-      case QWRTY:
-        if (record->event.pressed) {
-          set_single_persistent_default_layer(QWERTY);
-        }
-        return false;
-        break;
-      case CLMK:
-        if (record->event.pressed) {
-          set_single_persistent_default_layer(COLEMAK);
-        }
-        return false;
-        break;
-      case KC_CAPS:
-        if (record->event.pressed) {
-          // Turn LED1 On/Off for Caps Lock
-          if (CAPS_LED) {
-            ergodox_right_led_1_off();
-            CAPS_LED = false;
-          } else {
-            ergodox_right_led_1_on();
-            CAPS_LED = true;
-          }
-        }
-        return true;
-        break;
-    }
-    return true;
-};
-
-// Set LED according to the default layer
-void default_layer_led_set(void) {
-    switch (biton32(eeconfig_read_default_layer())) {
-      case COLEMAK:
-        // LED2 for COLEMAK
-        ergodox_right_led_2_on();
-        break;
-      case QWERTY:
-        // LED3 for QWERTY
-        ergodox_right_led_3_on();
-        break;
-    };
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-    default_layer_led_set();
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    ergodox_led_all_off();
-    switch (get_highest_layer(state)) {
-      case FN:
-          // Red led on Pro Micro for Fn layer
-          ergodox_board_led_on();
-          break;
-    };
-
-    if (CAPS_LED) {
-      ergodox_right_led_1_on();
-    }
-
-    default_layer_led_set();
-
-    return state;
-};
-
-void suspend_power_down_user(void) {
-    ergodox_led_all_off();
-};
-
-void suspend_wakeup_init_user(void) {
-    default_layer_led_set();
-};
diff --git a/keyboards/ktec/ergodone/keymaps/erovia/readme.md b/keyboards/ktec/ergodone/keymaps/erovia/readme.md
deleted file mode 100644
index 160c8759837..00000000000
--- a/keyboards/ktec/ergodone/keymaps/erovia/readme.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Erovia's ErdoDone Keymap
-
-My personal ErgoDone keymap based on the *default* keymap.  
-
-**Features**
-
-* Qwerty and Colemak Mod-DH support
-* Space Cadet Shift
-* LED indicator for: active layout, CapsLock, Function layer
-
-## QWERTY (Normal) Layer
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|   `    |   1  |   2  |   3  |   4  |   5  | Copy |           | Paste|   6  |   7  |   8  |   9  |   0  | Sleep  |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|  Tab   |   Q  |   W  |   E  |   R  |   T  | Mute |           |  {   |   Y  |   U  |   I  |   O  |   P  |   \    |
-|--------+------+------+------+------+------|      |           |  [   |------+------+------+------+------+--------|
-|  Esc   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
-|--------+------+------+------+------+------| Fn1  |           |  }   |------+------+------+------+------+--------|
-| LShift |   Z  |   X  |   C  |   V  |   B  |      |           |  ]   |   N  |   M  |   ,  |   .  |   /  | RShift |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |LCtrl | LGui | LAlt | Left | Right|                                       | Down |  Up  |   -  |   =  | RCtrl |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       | Caps | LGui |       | Ins  |  Del |
-                                ,------|------|------|       |------+--------+------.
-                                |      |      | Home |       | PgUp |        |      |
-                                | Space|Backsp|------|       |------|  Tab   |Enter |
-                                |      |ace   | End  |       | PgDn |        |      |
-                                `--------------------'       `----------------------'
-```
-
-## Colemak Layer
-Switch from `Fn1` layer.
-```
-,--------------------------------------------------.           ,--------------------------------------------------.
-|   `    |   1  |   2  |   3  |   4  |   5  | Copy |           | Paste|   6  |   7  |   8  |   9  |   0  | Sleep  |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|  Tab   |   Q  |   W  |   F  |   P  |   B  | Mute |           |  {   |   J  |   L  |   U  |   Y  |   ;  |   \    |
-|--------+------+------+------+------+------|      |           |  [   |------+------+------+------+------+--------|
-|  Esc   |   A  |   R  |   S  |   T  |   G  |------|           |------|   M  |   N  |   E  |   I  |   O  |   '    |
-|--------+------+------+------+------+------| Fn1  |           |  }   |------+------+------+------+------+--------|
-| LShift |   Z  |   X  |   C  |   D  |   V  |      |           |  ]   |   K  |   H  |   ,  |   .  |   /  | RShift |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |LCtrl | LGui | LAlt | Left | Right|                                       | Down |  Up  |   -  |   =  | RCtrl |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       | Caps | LGui |       | Ins  |  Del |
-                                ,------|------|------|       |------+--------+------.
-                                |      |      | Home |       | PgUp |        |      |
-                                | Space|Backsp|------|       |------|  Tab   |Enter |
-                                |      |ace   | End  |       | PgDn |        |      |
-                                `--------------------'       `----------------------'
-```
-
-## Function Layer
-```
-,---------------------------------------------------.           ,--------------------------------------------------.
-|Version  |  F1  |  F2  |  F3  |  F4  |  F5  | F11  |           |  F12 |  F6  |  F7  |  F8  |  F9  |  F10 |        |
-|---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
-|         |      |      | Prev | Play | Next |      |           |      |      |      |      |      |      |        |
-|---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|         |      |      |      |VolDn | VolUp|------|           |------|      |QWRTY | CLMK |     |      |        |
-|---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|         |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
-`---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |       |      |      |      |      |                                       |      |      |      |      |      |
-  `-----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       |      |      |       |      |      |
-                                ,------|------|------|       |------+------+------.
-                                |      |      |      |       |      |      |      |
-                                |      |      |------|       |------|      |      |
-                                |      |      |      |       |      |      |      |
-                                `--------------------'       `--------------------'
-```
diff --git a/keyboards/ktec/ergodone/keymaps/erovia/rules.mk b/keyboards/ktec/ergodone/keymaps/erovia/rules.mk
deleted file mode 100644
index f7b7da719e1..00000000000
--- a/keyboards/ktec/ergodone/keymaps/erovia/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMMAND_ENABLE   = no  # Commands for debug and configuration
diff --git a/keyboards/ktec/ergodone/keymaps/kloki/keymap.c b/keyboards/ktec/ergodone/keymaps/kloki/keymap.c
deleted file mode 100644
index 1347f8f5019..00000000000
--- a/keyboards/ktec/ergodone/keymaps/kloki/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define QW 1 // qwerty
-#define SYMB 2 // symbols
-#define NUM 3 // media keys
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   1  |   2  |   3  |   4  |   5  | SHIFT|           | SYM  |   6  |   7  |   8  |   9  |   0  |   Bck  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   D  |   R  |   W  |   B  | `~   |           |  "'  |   J  |   F  |   U  |   P  |   :  |   \ |  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Ctr/Es |   A  |   S  |   H  |   T  |   G  |------|           |------|   Y  |   N  |   E  |   O  |  I   | Enter  |
- * |--------+------+------+------+------+------| = +  |           |  -_  |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   M  |   C  |   V  |      |           |      |   K  |   L  |   ,  |   .  | /    | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |MEH   |  Gui |AltShf| Left | Right|                                       | DOWN | UP   |   [  |   ]  | ~SYM |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | ESC  |Home  |       | PgUp  | QW  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |  ENT | End  |       | PgDn |        |      |
- *                                 | Space| WIN  |------|       |------|  Tab   |Back  |
- *                                 |  SYM |      | SCTR |       | SALT |   SYM  |      |
- *                                 `--------------------'       `----------------------'
- */
-
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,         KC_1,        KC_2,     KC_3,   KC_4,   KC_5,   KC_LSFT,
-        KC_TAB,         KC_Q,        KC_D,     KC_R,   KC_W,   KC_B,   KC_GRV,
-        CTL_T(KC_ESC),  KC_A,        KC_S,     KC_H,   KC_T,   KC_G,
-        KC_LSFT,        KC_Z,        KC_X,     KC_M,   KC_C,   KC_V,   KC_EQL,
-        KC_MEH,         KC_LGUI,     KC_LALT,  KC_LEFT,KC_RGHT,
-                                                       KC_ESC,  KC_HOME,
-                                                                KC_END,
-                            LT(SYMB, KC_SPC),   LGUI_T(KC_ENT), S(KC_LGUI),
-        // right hand
-             TG(NUM),     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,     KC_BSPC,
-             KC_QUOT,     KC_J,   KC_F,   KC_U,   KC_P,   KC_SCLN,  KC_BSLS,
-                          KC_Y,   KC_N,   KC_E,   KC_O,   KC_I ,    KC_ENT,
-             KC_MINS,     KC_K,   KC_L,   KC_COMM,KC_DOT, KC_SLSH,  KC_RSFT,
-                                  KC_DOWN,KC_UP,  KC_LBRC,KC_RBRC,  MO(SYMB),
-                       KC_PGUP,  TG(QW),
-             KC_PGDN,
-             S(KC_LALT),LT(SYMB, KC_TAB), KC_BSPC
-    ),
-
-[QW] = LAYOUT_ergodox(
-       _______, _______, _______, _______, _______, _______, _______,
-       _______, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______,
-       _______, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-       _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______,
-       _______, _______, _______, _______, _______,
-                                           _______, _______,
-                                                    _______,
-                                  _______, _______, _______,
-    // right hand
-       _______,  _______, _______, _______, _______, _______, _______,
-       _______,  KC_Y,    KC_U,    KC_I   , KC_O,    KC_P,    _______,
-                 KC_H,    KC_J,    KC_K   , KC_L,    KC_SCLN, _______,
-       _______,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
-                          _______, _______, _______, _______, _______,
-       _______, _______,
-       _______,
-       _______, _______, _______
-),
-/* Keymap 1: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |         |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   DEL  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   !  |   @  |   {  |   }  |   *  |      |           |      |   <  |  H  |   U  |   PU  |   *  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   #  |   $  |   (  |   )  |   `  |------|           |------|   >  |   L  |   D  |   R  |   +  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   E  |   D  |  PD  |   \  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |      |      |      |      |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  _______,
-       _______,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_ASTR,_______,
-       _______,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       _______,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,_______,
-       _______,_______,_______,_______,_______,
-                                       _______,_______,
-                                               _______,
-                               _______,_______,_______,
-       // right hand
-       _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_DEL,
-       _______, KC_LABK, KC_HOME, KC_UP,   KC_PGUP,  KC_ASTR, _______,
-                KC_RABK, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PLUS, _______,
-       _______, KC_AMPR, KC_END,  KC_DOWN, KC_PGDN,  KC_BSLS, _______,
-                         _______, _______, _______,  _______, _______,
-       _______, _______,
-       _______,
-       _______, _______, _______
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |  L   | MsUp |   R  |      |      |           |      |      |  4   |   5  |  6   |      |  TAB   |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |  1   |   2  |   3  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |   0  |   0  |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[NUM] = LAYOUT_ergodox(
-       _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______,
-       _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
-       _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______,
-                                           _______, _______,
-                                                    _______,
-                                  _______, _______, _______,
-    // right hand
-       _______,  _______, _______, _______, _______, _______, _______,
-       _______,  _______, KC_4,    KC_5   , KC_6,    _______, KC_TAB,
-                 _______, KC_1,    KC_2   , KC_3,    _______, _______,
-       _______,  _______, _______, KC_0,    KC_0,    _______, _______,
-                          _______, _______, _______, _______, _______,
-       _______, _______,
-       _______,
-       _______, _______, _______
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case 1:
-            ergodox_board_led_on();
-            break;
-        case 3:
-            ergodox_board_led_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/ktec/ergodone/keymaps/kloki/readme.md b/keyboards/ktec/ergodone/keymaps/kloki/readme.md
deleted file mode 100644
index a9ebaba67e9..00000000000
--- a/keyboards/ktec/ergodone/keymaps/kloki/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Kloki's ergodone layout
-
--workman
--qwerty layer
--num layer
--overloaded modifier
--a lot of duplicated keys to make common shortcuts work
\ No newline at end of file
diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
deleted file mode 100644
index d668f9b41ea..00000000000
--- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c
+++ /dev/null
@@ -1,828 +0,0 @@
-// Copyright 2021 Vega Carlson (@VegaDeftwing)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layer_names { BASE, GREL, GREU, SYMB, MATH, QWER, FNLR, TINY, FULL, FULU };
-
-enum unicode_names {
-    // MATH
-    neq,     //≠
-    intgrl,  //∫
-    angl,    //∠
-    imply,   //⇒
-    equiv,   //⇔
-    porp,    //∝
-    exists,  //∃
-    nexists, //∄
-    forall,  //∀
-    and,     //∧
-    or
-    ,             //∨
-    xor,          //⊕
-    apeql,        //≅
-    root,         //√
-    not,          //¬
-    sum,          //∑
-    plsminus,     //±
-    infin,        //∞
-    emtyset,      //∅
-    Mn,           //ℕ
-    Mz,           //ℤ
-    Mq,           //ℚ
-    Mr,           //ℝ
-    Mc,           //ℂ
-    eleof,        //∈
-    member,       //∋
-    neleof,       //∉
-    nmember,      //∌
-    subsetof,     //⊂
-    suprsetof,    //⊃
-    intersection, //∩
-    Munion,       //∪
-
-    // SYMB
-    arwl,
-    arwu,
-    arwr,
-    arwd,
-
-    uxclm,
-    cent,
-    degree,
-    trade,
-    copy,
-    numero,
-    sect,
-    mdot,
-    rang,
-
-    lshade,
-    mshade,
-    dshade,
-
-    fire,
-    water,
-    cleft,
-    baster,
-    neteen,
-    floppy,
-
-    boxemp,
-    boxchk,
-    boxX,
-
-    bbstr,
-    bbstl,
-    bbml,
-    bbmr,
-    bbmb,
-    bbrtr,
-    bbrbr,
-    bbrtl,
-    bbrbl,
-    bbsbr,
-    bbsbl,
-    bbmbr,
-    bbmbl,
-
-    Agrave,
-    Aacute,
-    Acircm,
-    Atilde,
-    Abreve,
-    Adiaer,
-    Adacut,
-
-    // not all ogham letters, as I
-    // actually intend to use them for hex
-    OS,
-    Oa,
-    Ob,
-    Oc,
-    Od,
-    Oe,
-    Of,
-    Og,
-    Oh,
-    Oi,
-    OA,
-    OB,
-    OC,
-    OD,
-    OE,
-    OF,
-    Os,
-    OED,
-    Ox,
-    gnd,
-    sqr,
-    sine,
-    opt,
-
-    geq,
-    leq,
-    brkup,
-    brkdn,
-    perup,
-    perdn,
-
-    // GREEL
-    rone, // 1:: ⅰ
-    rtwo,
-    rthree,
-    rfour,  // 4:: ⅳ
-    rfive,  // 5:: ⅴ
-    rsix,   // 6:: ⅵ
-    rseven, // 7:: ⅶ
-    reight, // 8:: ⅷ
-    rnine,  // 9:: ⅸ
-    rten,   // 0:: ⅹ
-    gq,     // q:: θ
-    gw,     // w:: ω
-    ge,     // e:: ε
-    gr,     // r:: ρ
-    gt,     // t:: τ
-    gy,     // y:: ψ
-    gu,     // u:: υ
-    gi,     // i:: ι
-    go,     // o:: ο
-    gp,     // p:: π
-    ga,     // a:: α
-    gs,     // s:: σ
-    gd,     // d:: δ
-    gf,     // f:: φ
-    gg,     // g:: γ
-    gh,     // h:: η
-    gj,     // j:: ϑ
-    gk,     // k:: κ
-    gl,     // l:: λ
-    gz,     // z:: ζ
-    gx,     // x:: ξ
-    gc,     // c:: χ
-    gv,     // v:: ς
-    gb,     // b:: β
-    gn,     // n:: ν
-    gm,     // m:: μ
-
-    // GREEU
-    Rone,   // 1:: Ⅰ
-    Rtwo,   // 2:: Ⅱ
-    Rthree, // 3:: Ⅲ
-    Rfour,  // 4:: Ⅳ
-    Rfive,  // 5:: Ⅴ
-    Rsix,   // 6:: Ⅵ
-    Rseven, // 7:: Ⅶ
-    Reight, // 8:: Ⅷ
-    Rnine,  // 9:: Ⅸ
-    Rten,
-    Gq, // Q:: Θ
-    Gw, // W:: Ω
-    Ge, // E:: Ε
-    Gr, // R:: Ρ
-    Gt, // T:: Τ
-    Gy, // Y:: Ψ
-    Gu, // U:: Υ
-    Gi, // I:: Ι
-    Go, // O:: Ο
-    Gp, // P:: Π
-    Ga, // A:: Α
-    Gs, // S:: Σ
-    Gd, // D:: Δ
-    Gf, // F:: Φ
-    Gg, // G:: Γ
-    Gh, // H:: Η
-    Gj, // J:: J
-    Gk, // K:: Κ
-    Gl, // L:: Λ
-    Gz, // Z:: Ζ
-    Gx, // X:: Ξ
-    Gc, // C:: Χ
-    Gv, // V:: V
-    Gb, // B:: Β
-    Gn, // N:: Ν
-    Gm, // M:: Μ
-    // ᵃ ᵇ ᶜ ᵈ ᵉ ᶠ ᵍ ʰ ⁱ ʲ ᵏ ˡ ᵐ ⁿ ᵒ ᵖ ʳ ˢ ᵗ ᵘ ᵛ ʷ ˣ ʸ ᶻ ⁰ ¹ ² ³ ⁴ ⁵ ⁶ ⁷ ⁸ ⁹
-    tone,   // 1:: ¹
-    ttwo,   // 2:: ²
-    tthree, // 3:: ³
-    tfour,  // 4:: ⁴
-    tfive,  // 5:: ⁵
-    tsix,   // 6:: ⁶
-    tseven, // 7:: ⁷
-    teight, // 8:: ⁸
-    tnine,  // 9:: ⁹
-    tzero,  // 0 :: ⁰
-    tq,     // Q:: ۹
-    tw,     // W:: ʷ
-    te,     // E:: ᵉ
-    tr,     // R:: ʳ
-    tt,     // T:: ᵗ
-    ty,     // Y:: ʸ
-    tu,     // U:: ᵘ
-    ti,     // I:: ⁱ
-    to,     // O:: ᵒ
-    tp,     // P:: ᵖ
-    ta,     // A:: ᵃ
-    ts,     // S:: ˢ
-    td,     // D:: ᵈ
-    tf,     // F:: ᶠ
-    tg,     // G:: ᵍ
-    th,     // H:: ʰ
-    tj,     // J:: ʲ
-    tk,     // K:: ᵏ
-    tl,     // L:: ˡ
-    tz,     // Z:: ᶻ
-    tx,     // X:: ˣ
-    tc,     // C:: ᶜ
-    tv,     // V:: ᵛ
-    tb,     // B:: ᵇ
-    tn,     // N:: ⁿ
-    tm,     // M:: ᵐ
-    // Fullwitdth - note, these are *not* the monospace unicode code points.
-    // This is done to prevent something eating it and using a weird font, which,
-    // presumably, isn't desired if doing this.
-    fwone,   // 1:: １
-    fwtwo,   // 2:: ２
-    fwthree, // 3:: ３
-    fwfour,  // 4:: ４
-    fwfive,  // 5:: ５
-    fwsix,   // 6:: ６
-    fwseven, // 7:: ７
-    fweight, // 8:: ８
-    fwnine,  // 9:: ９
-    fwzero,  // 0 :: ０
-    fwq,     // Q:: ｑ
-    fww,     // W:: ｗ
-    fwe,     // E:: ｅ
-    fwr,     // R:: ｒ
-    fwt,     // T:: ｔ
-    fwy,     // Y:: ｙ
-    fwu,     // U:: ｕ
-    fwi,     // I:: ｉ
-    fwo,     // O:: ｏ
-    fwp,     // P:: ｐ
-    fwa,     // A:: ａ
-    fws,     // S:: ｓ
-    fwd,     // D:: ｄ
-    fwf,     // F:: ｆ
-    fwg,     // G:: ｇ
-    fwh,     // H:: ｈ
-    fwj,     // J:: ｊ
-    fwk,     // K:: ｋ
-    fwl,     // L:: ｌ
-    fwz,     // Z:: ｚ
-    fwx,     // X:: ｘ
-    fwc,     // C:: ｃ
-    fwv,     // V:: ｖ
-    fwb,     // B:: ｂ
-    fwn,     // N:: ｎ
-    fwm,     // M:: ｍ
-    // Full width caps + fractions, and a few extra symbols that lack a better place
-    Fwone,   // 1:: ¼
-    Fwtwo,   // 2:: ½
-    Fwthree, // 3:: ¾
-    Fwfour,  // 4:: ⅓
-    Fwfive,  // 5:: ⅔
-    Fwsix,   // 6:: ⅕
-    Fwseven, // 7:: ⅛
-    Fweight, // 8:: 𝒳
-    Fwnine,  // 9:: 𝒴
-    Fwzero,  // 0 :: 𝒵
-    Fwq,     // Q:: Ｑ
-    Fww,     // W:: Ｗ
-    Fwe,     // E:: Ｅ
-    Fwr,     // R:: Ｒ
-    Fwt,     // T:: Ｔ
-    Fwy,     // Y:: Ｙ
-    Fwu,     // U:: Ｕ
-    Fwi,     // I:: Ｉ
-    Fwo,     // O:: Ｏ
-    Fwp,     // P:: Ｐ
-    Fwa,     // A:: Ａ
-    Fws,     // S:: Ｓ
-    Fwd,     // D:: Ｄ
-    Fwf,     // F:: Ｆ
-    Fwg,     // G:: Ｇ
-    Fwh,     // H:: Ｈ
-    Fwj,     // J:: Ｊ
-    Fwk,     // K:: Ｋ
-    Fwl,     // L:: Ｌ
-    Fwz,     // Z:: Ｚ
-    Fwx,     // X:: Ｘ
-    Fwc,     // C:: Ｃ
-    Fwv,     // V:: Ｖ
-    Fwb,     // B:: Ｂ
-    Fwn,     // N:: Ｎ
-    Fwm,     // M:: Ｍ
-    nbsp,    // You know what this is &nbsp;
-    ibang,   //‽
-    nullpic, // Null picture - ␀
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    // MATH
-    [neq]          = 0x2260, //≠
-    [intgrl]       = 0x222B, //∫
-    [angl]         = 0x2220, //∠
-    [imply]        = 0x21D2, //⇒
-    [equiv]        = 0x21D4, //⇔
-    [porp]         = 0x221D, //∝
-    [exists]       = 0x2203, //∃
-    [nexists]      = 0x2204, //∄
-    [forall]       = 0x2200, //∀
-    [and]          = 0x2227, //∧
-    [or]           = 0x2228, //∨
-    [xor]          = 0x2295, //⊕
-    [apeql]        = 0x2245, //≅
-    [root]         = 0x221A, //√
-    [not ]         = 0x00AC, //¬
-    [sum]          = 0x2211, //∑
-    [plsminus]     = 0x00B1, //±
-    [infin]        = 0x221E, //∞
-    [emtyset]      = 0x2205, //∅
-    [Mn]           = 0x2115, //ℕ
-    [Mz]           = 0x2124, //ℤ
-    [Mq]           = 0x211A, //ℚ
-    [Mr]           = 0x211D, //ℝ
-    [Mc]           = 0x2102, //ℂ
-    [eleof]        = 0x2208, //∈
-    [member]       = 0x220B, //∋
-    [neleof]       = 0x2209, //∉
-    [nmember]      = 0x220C, //∌
-    [subsetof]     = 0x2282, //⊂
-    [suprsetof]    = 0x2283, //
-    [intersection] = 0x2229, //∩
-    [Munion]       = 0x222A, //∪
-                             // Symbol
-    [arwl] = 0x2190,         //←
-    [arwu] = 0x2191,         //↑
-    [arwr] = 0x2192,         //→
-    [arwd] = 0x2193,         //↓
-
-    [uxclm]  = 0x00A1, //¡
-    [cent]   = 0x00A2, //¢
-    [degree] = 0x00B0, //°
-    [trade]  = 0x2122, //™
-    [copy]   = 0x00A9, //©
-    [numero] = 0x2116, //№
-    [sect]   = 0x00A7, //§
-    [mdot]   = 0x00B7, //·
-    [rang]   = 0x299C, //⦜
-
-    [lshade] = 0x2591, //░
-    [mshade] = 0x2592, //▒
-    [dshade] = 0x2593, //▓
-
-    [fire]   = 0x1F525, //🔥
-    [water]  = 0x1F322, //🌢
-    [cleft]  = 0x1F12F, //🄯
-    [baster] = 0x1F7BC, //🞼
-    [neteen] = 0x1F51E, //🔞
-    [floppy] = 0x1F5AB, //🖫
-
-    [boxemp] = 0x2610, //☐
-    [boxchk] = 0x2611, //☑
-    [boxX]   = 0x2612, //☒
-
-    [bbstr] = 0x23A1, //⎡
-    [bbstl] = 0x23A4, //⎤
-    [bbml]  = 0x23A8, //⎨
-    [bbmr]  = 0x23AC, //⎬
-    [bbmb]  = 0x23AA, //⎪
-    [bbrtr] = 0x23A7, //⎧
-    [bbrbr] = 0x23A9, //⎩
-    [bbrtl] = 0x23AB, //⎫
-    [bbrbl] = 0x23AD, //⎭
-    [bbsbr] = 0x23A3, //⎣
-    [bbsbl] = 0x23A6, //⎦
-    [bbmbr] = 0x23A5, //⎥
-    [bbmbl] = 0x23A2, //⎢
-
-    [Agrave] = 0x0300, // è //above  [wtf] = 0x1242A, //𒐪
-    [Aacute] = 0x0301, // é //1st
-    [Acircm] = 0x0302, // ê //2nd
-    [Atilde] = 0x0303, // ẽ //5th
-    [Abreve] = 0x0306, // ĕ //4th
-    [Adiaer] = 0x0308, // ë //3rd
-    [Adacut] = 0x030B, // e̋
-
-    // not all ogham letters, as I
-    // actually intend to use them for hex
-    [OS]  = 0x1680, // space
-    [Oa]  = 0x1681, // 1
-    [Ob]  = 0x1682, // 2
-    [Oc]  = 0x1683, // 3
-    [Od]  = 0x1684, // 4
-    [Oe]  = 0x1685, // 5
-    [Of]  = 0x1686, // 6
-    [Og]  = 0x1687, // 7
-    [Oh]  = 0x1688, // 8
-    [Oi]  = 0x1689, // 9
-    [OA]  = 0x168A, // A
-    [OB]  = 0x168B, // B
-    [OC]  = 0x168C, // C
-    [OD]  = 0x168D, // D
-    [OE]  = 0x168E, // E
-    [OF]  = 0x168F, // F
-    [Os]  = 0x169B, // Start
-    [OED] = 0x169C, // End
-    [Ox]  = 0x1695, // X
-
-    [gnd]  = 0x23DA, //⏚
-    [sqr]  = 0x238D, //⎍, actually monostable
-    [sine] = 0x223F, //∿
-    [opt]  = 0x2325, //⌥, actually option used for switch
-
-    [geq]   = 0x2264, //≤
-    [leq]   = 0x2265, //≥
-    [brkup] = 0xFE38, //︸
-    [brkdn] = 0xFE37, //︷
-    [perup] = 0xFE35, //︵
-    [perdn] = 0xFE36, //︶
-    // GREEKL
-    [rone]   = 0x2170, // 1:: ⅰ
-    [rtwo]   = 0x2171, // 2:: ⅱ
-    [rthree] = 0x2172, // 3:: ⅲ
-    [rfour]  = 0x2173, // 4:: ⅳ
-    [rfive]  = 0x2174, // 5:: ⅴ
-    [rsix]   = 0x2175, // 6:: ⅵ
-    [rseven] = 0x2176, // 7:: ⅶ
-    [reight] = 0x2177, // 8:: ⅷ
-    [rnine]  = 0x2178, // 9:: ⅸ
-    [rten]   = 0x2179, // 0:: ⅹ
-    [gq]     = 0x03B8, // q:: θ
-    [gw]     = 0x03C9, // w:: ω
-    [ge]     = 0x03B5, // e:: ε
-    [gr]     = 0x03C1, // r:: ρ
-    [gt]     = 0x03C4, // t:: τ
-    [gy]     = 0x03C8, // y:: ψ
-    [gu]     = 0x03C5, // u:: υ
-    [gi]     = 0x03B9, // i:: ι
-    [go]     = 0x03BF, // o:: ο
-    [gp]     = 0x03C0, // p:: π
-    [ga]     = 0x03B1, // a:: α
-    [gs]     = 0x03C3, // s:: σ
-    [gd]     = 0x03B4, // d:: δ
-    [gf]     = 0x03C6, // f:: φ
-    [gg]     = 0x03B3, // g:: γ
-    [gh]     = 0x03B7, // h:: η
-    [gj]     = 0x03D1, // j:: ϑ
-    [gk]     = 0x03BA, // k:: κ
-    [gl]     = 0x03BB, // l:: λ
-    [gz]     = 0x03B6, // z:: ζ
-    [gx]     = 0x03BE, // x:: ξ
-    [gc]     = 0x03C7, // c:: χ
-    [gv]     = 0x03C2, // v:: ς
-    [gb]     = 0x03B2, // b:: β
-    [gn]     = 0x03BD, // n:: ν
-    [gm]     = 0x03BC, // m:: μ
-                       // GREEKU
-    [Rone]   = 0x2160, // 1:: Ⅰ
-    [Rtwo]   = 0x2161, // 2:: Ⅱ
-    [Rthree] = 0x2162, // 3:: Ⅲ
-    [Rfour]  = 0x2163, // 4:: Ⅳ
-    [Rfive]  = 0x2164, // 5:: Ⅴ
-    [Rsix]   = 0x2165, // 6:: Ⅵ
-    [Rseven] = 0x2166, // 7:: Ⅶ
-    [Reight] = 0x2167, // 8:: Ⅷ
-    [Rnine]  = 0x2168, // 9:: Ⅸ
-    [Rten]   = 0x2169, // 0:: Ⅹ
-    [Gq]     = 0x0398, // Q:: Θ
-    [Gw]     = 0x03A9, // W:: Ω
-    [Ge]     = 0x0395, // E:: Ε
-    [Gr]     = 0x03A1, // R:: Ρ
-    [Gt]     = 0x03A4, // T:: Τ
-    [Gy]     = 0x03A8, // Y:: Ψ
-    [Gu]     = 0x03A5, // U:: Υ
-    [Gi]     = 0x0399, // I:: Ι
-    [Go]     = 0x039F, // O:: Ο
-    [Gp]     = 0x03A0, // P:: Π
-    [Ga]     = 0x0391, // A:: Α
-    [Gs]     = 0x03A3, // S:: Σ
-    [Gd]     = 0x0394, // D:: Δ
-    [Gf]     = 0x03A6, // F:: Φ
-    [Gg]     = 0x0393, // G:: Γ
-    [Gh]     = 0x0397, // H:: Η
-    [Gj]     = 0x004A, // J:: J
-    [Gk]     = 0x039A, // K:: Κ
-    [Gl]     = 0x039B, // L:: Λ
-    [Gz]     = 0x0396, // Z:: Ζ
-    [Gx]     = 0x039E, // X:: Ξ
-    [Gc]     = 0x03A7, // C:: Χ
-    [Gv]     = 0x0056, // V:: V
-    [Gb]     = 0x0392, // B:: Β
-    [Gn]     = 0x039D, // N:: Ν
-    [Gm]     = 0x039C, // M:: Μ
-
-    [tone]   = 0x00B9, // 1:: ¹
-    [ttwo]   = 0x00B2, // 2:: ²
-    [tthree] = 0x00B3, // 3:: ³
-    [tfour]  = 0x2074, // 4:: ⁴
-    [tfive]  = 0x2075, // 5:: ⁵
-    [tsix]   = 0x2076, // 6:: ⁶
-    [tseven] = 0x2077, // 7:: ⁷
-    [teight] = 0x2078, // 8:: ⁸
-    [tnine]  = 0x2079, // 9:: ⁹
-    [tzero]  = 0x2070, // 0 :: ⁰
-    [tq]     = 0x06F9, // Q:: ۹ - superscript q doesn't exist.
-    [tw]     = 0x02B7, // W:: ʷ
-    [te]     = 0x1D49, // E:: ᵉ
-    [tr]     = 0x02B3, // R:: ʳ
-    [tt]     = 0x1D57, // T:: ᵗ
-    [ty]     = 0x02B8, // Y:: ʸ
-    [tu]     = 0x1D58, // U:: ᵘ
-    [ti]     = 0x2071, // I:: ⁱ
-    [to]     = 0x1D52, // O:: ᵒ
-    [tp]     = 0x1D56, // P:: ᵖ
-    [ta]     = 0x1D43, // A:: ᵃ
-    [ts]     = 0x02E2, // S:: ˢ
-    [td]     = 0x1D48, // D:: ᵈ
-    [tf]     = 0x1DA0, // F:: ᶠ
-    [tg]     = 0x1D4D, // G:: ᵍ
-    [th]     = 0x02B0, // H:: ʰ
-    [tj]     = 0x02B2, // J:: ʲ
-    [tk]     = 0x1D4F, // K:: ᵏ
-    [tl]     = 0x02E1, // L:: ˡ
-    [tz]     = 0x1DBB, // Z:: ᶻ
-    [tx]     = 0x02E3, // X:: ˣ
-    [tc]     = 0x1D9C, // C:: ᶜ
-    [tv]     = 0x1D5B, // V:: ᵛ
-    [tb]     = 0x1D47, // B:: ᵇ
-    [tn]     = 0x207F, // N:: ⁿ
-    [tm]     = 0x1D50, // M:: ᵐ
-
-    [fwone]   = 0xFF11, // 1:: １
-    [fwtwo]   = 0xFF12, // 2:: ２
-    [fwthree] = 0xFF13, // 3:: ３
-    [fwfour]  = 0xFF14, // 4:: ４
-    [fwfive]  = 0xFF15, // 5:: ５
-    [fwsix]   = 0xFF16, // 6:: ６
-    [fwseven] = 0xFF17, // 7:: ７
-    [fweight] = 0xFF18, // 8:: ８
-    [fwnine]  = 0xFF19, // 9:: ９
-    [fwzero]  = 0xFF10, // 0 :: ０
-    [fwq]     = 0xFF51, // Q:: ｑ
-    [fww]     = 0xFF57, // W:: ｗ
-    [fwe]     = 0xFF45, // E:: ｅ
-    [fwr]     = 0xFF52, // R:: ｒ
-    [fwt]     = 0xFF54, // T:: ｔ
-    [fwy]     = 0xFF59, // Y:: ｙ
-    [fwu]     = 0xFF55, // U:: ｕ
-    [fwi]     = 0xFF49, // I:: ｉ
-    [fwo]     = 0xFF4F, // O:: ｏ
-    [fwp]     = 0xFF50, // P:: ｐ
-    [fwa]     = 0xFF41, // A:: ａ
-    [fws]     = 0xFF53, // S:: ｓ
-    [fwd]     = 0xFF44, // D:: ｄ
-    [fwf]     = 0xFF46, // F:: ｆ
-    [fwg]     = 0xFF47, // G:: ｇ
-    [fwh]     = 0xFF48, // H:: ｈ
-    [fwj]     = 0xFF4A, // J:: ｊ
-    [fwk]     = 0xFF4B, // K:: ｋ
-    [fwl]     = 0xFF4C, // L:: ｌ
-    [fwz]     = 0xFF5A, // Z:: ｚ
-    [fwx]     = 0xFF58, // X:: ｘ
-    [fwc]     = 0xFF43, // C:: ｃ
-    [fwv]     = 0xFF56, // V:: ｖ
-    [fwb]     = 0xFF42, // B:: ｂ
-    [fwn]     = 0xFF4E, // N:: ｎ
-    [fwm]     = 0xFF4D, // M:: ｍ
-    // Full width caps + fractions, and a few extra symbols that lack a better place
-    [Fwone]   = 0x00BC, // 1:: ¼
-    [Fwtwo]   = 0x00BD, // 2:: ½
-    [Fwthree] = 0x00BE, // 3:: ¾
-    [Fwfour]  = 0x2153, // 4:: ⅓
-    [Fwfive]  = 0x2154, // 5:: ⅔
-    [Fwsix]   = 0x2155, // 6:: ⅕
-    [Fwseven] = 0x215B, // 7:: ⅛
-    [Fweight] = 0x00A0, // 8:: &nbsp
-    [Fwnine]  = 0x203D, // 9:: ibang ‽
-    [Fwzero]  = 0x2400, // 0 :: nullpic ␀
-    [Fwq]     = 0xFF31, // Q:: Ｑ
-    [Fww]     = 0xFF37, // W:: Ｗ
-    [Fwe]     = 0xFF25, // E:: Ｅ
-    [Fwr]     = 0xFF32, // R:: Ｒ
-    [Fwt]     = 0xFF34, // T:: Ｔ
-    [Fwy]     = 0xFF39, // Y:: Ｙ
-    [Fwu]     = 0xFF35, // U:: Ｕ
-    [Fwi]     = 0xFF29, // I:: Ｉ
-    [Fwo]     = 0xFF2F, // O:: Ｏ
-    [Fwp]     = 0xFF30, // P:: Ｐ
-    [Fwa]     = 0xFF21, // A:: Ａ
-    [Fws]     = 0xFF33, // S:: Ｓ
-    [Fwd]     = 0xFF24, // D:: Ｄ
-    [Fwf]     = 0xFF26, // F:: Ｆ
-    [Fwg]     = 0xFF27, // G:: Ｇ
-    [Fwh]     = 0xFF28, // H:: Ｈ
-    [Fwj]     = 0xFF2A, // J:: Ｊ
-    [Fwk]     = 0xFF2B, // K:: Ｋ
-    [Fwl]     = 0xFF2C, // L:: Ｌ
-    [Fwz]     = 0xFF3A, // Z:: Ｚ
-    [Fwx]     = 0xFF38, // X:: Ｘ
-    [Fwc]     = 0xFF23, // C:: Ｃ
-    [Fwv]     = 0xFF36, // V:: Ｖ
-    [Fwb]     = 0xFF22, // B:: Ｂ
-    [Fwn]     = 0xFF2E, // N:: Ｎ
-    [Fwm]     = 0xFF2D, // M:: Ｍ
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    // clang-format off
-
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
-        KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_BSLS,
-        KC_EQL, KC_A, KC_O, KC_E, KC_U, KC_I,
-        SC_LSPO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_AMPR,
-        OSL(FNLR), TT(GREL), TT(MATH), KC_UP, KC_DOWN,
-        KC_LBRC, KC_HOME, KC_INS, KC_SPC, KC_LGUI, KC_DEL,
-
-        OSL(FNLR), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-        KC_PGUP, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
-        KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
-        KC_PGDN, KC_B, KC_M, KC_W, KC_V, KC_Z, SC_RSPC,
-        KC_LEFT, KC_RIGHT, KC_RALT, TT(SYMB), TT(QWER),
-        KC_END, KC_RBRC, KC_PSCR, KC_RALT, KC_RCTL, KC_ENT
-),
-
-[FNLR] = LAYOUT_ergodox(
-       // left hand
-       UC_LINX,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_NO,
-       UC_WINC,KC_F11, KC_F12, KC_F13,KC_F14, KC_F15,  KC_NO,
-       TO(TINY),KC_F21, KC_F22, KC_F23,KC_F24, MAGIC_TOGGLE_NKRO,
-       TO(FULL),KC_PAUSE,KC_PSCR,KC_SCRL,KC_NO,KC_NO,KC_NO,
-          EE_CLR,TO(BASE),TO(BASE),TO(BASE),TO(BASE),
-                                       KC_NO,KC_NO,
-                                               KC_NO,
-                               KC_NO,KC_NO,KC_NO,
-       // right hand
-       TO(BASE), KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  UC_LINX,
-       KC_NO, KC_F16,  KC_F17,KC_F18,   KC_F19,  KC_F20,  UC_WIN,
-                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, KC_NO,
-       KC_NO,
-       KC_NO, KC_RCTL, KC_NO
-),
-
-[QWER] = LAYOUT_ergodox(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_BSLS,
-        KC_AMPR, KC_A, KC_S, KC_D, KC_F, KC_G,
-        SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_QUOT,
-        KC_BSLS, KC_LCTL, KC_LGUI, KC_RALT, KC_APP,
-        KC_LBRC, KC_HOME, KC_PGUP, KC_SPC, KC_LSFT, KC_PGDN,
-
-        OSL(FNLR), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-        KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH,
-        KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
-        KC_EQL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
-        KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, TO(BASE),
-        KC_END, KC_INS, KC_DEL, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[MATH] = LAYOUT_ergodox(
-	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
-	KC_TAB,	UM(Mc),	UM(Munion),	UM(arwl),	UM(or),	UM(exists),	KC_BSLS,
-	UM(arwr), UM(root), UM(and), UM(imply), UM(nexists), UM(forall),
-	SC_LSPO,	KC_SCLN,	UM(intgrl),	UM(Mn),	UM(Mz),	UM(member),	UM(arwl),
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TT(FNLR), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-	KC_PGUP, UM(plsminus),	UM(infin),	UM(neleof),	UM(equiv),	UM(Mq),	KC_EQL,
-	UM(sum),	UM(emtyset),	UM(porp),	UM(suprsetof),	UM(not),	UM(neq),
-	KC_PGDN,	UM(subsetof),	UM(intersection),	UM(angl),	UM(nmember),	UM(eleof),	SC_RSPC,
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[SYMB] = LAYOUT_ergodox(
-	UM(Os), UM(Oa), UM(Ob), UM(Oc), UM(Od), UM(Oe), UM(mdot),
-	UM(boxemp), UM(bbstr), UM(bbrtr), UM(bbrtl), UM(bbstl), UM(degree), UM(brkdn),
-	UM(boxchk), UM(bbmbl), UM(bbml), UM(bbmr), UM(bbmbr), UM(neteen),
-	UM(boxX), UM(bbsbr), UM(bbrbr), UM(bbrbl), UM(bbsbl), UM(uxclm), UM(brkup),
-	UM(floppy), TO(BASE), TO(BASE), UM(arwu), UM(arwd),
-	UM(fire), UM(lshade), UM(mshade), KC_SPC, UM(OS), UM(dshade),
-
-	UM(Ox), UM(Of), UM(Og), UM(Oh), UM(Oi), UM(OA), UM(OB),
-	UM(numero), UM(trade), UM(copy), UM(cleft), UM(cent), UM(OED), UM(OC),
-	UM(Agrave), UM(gnd), UM(sqr), UM(sine), UM(opt), UM(OD),
-	UM(sect), UM(Aacute), UM(Acircm), UM(Adiaer), UM(Abreve), UM(Atilde), UM(OE),
-	UM(arwl), UM(arwr), UM(geq), UM(leq), UM(OF),
-	UM(rang), UM(water), UM(perup), UM(perdn), UM(baster), KC_ENT
-),
-
-[GREL] = LAYOUT_ergodox(
-	KC_ESC, UM(Rone), UM(Rtwo), UM(Rthree), UM(Rfour), UM(Rfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(gp), UM(gy), KC_SLSH,
-	KC_SLSH, UM(ga), UM(go), UM(ge), UM(gu), UM(gi),
-	MO(GREU), KC_SCLN, UM(gq), UM(gj), UM(gk), UM(gx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(Rsix), UM(Rseven), UM(Reight), UM(Rnine), UM(Rten), KC_BSPC,
-	KC_PGUP, UM(gf), UM(gg), UM(gc), UM(gr), UM(gl), KC_EQL,
-	UM(gd), UM(gh), UM(gt), UM(gn), UM(gs), KC_MINS,
-	KC_PGDN, UM(gb), UM(gm), UM(gw), UM(gv), UM(gz), MO(GREU),
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[GREU] = LAYOUT_ergodox(
-	KC_ESC, UM(Rone), UM(Rtwo), UM(Rthree), UM(Rfour), UM(Rfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(Gp), UM(Gy), KC_SLSH,
-	KC_SLSH, UM(Ga), UM(Go), UM(Ge), UM(Gu), UM(Gi),
-	KC_TRNS, KC_SCLN, UM(Gq), UM(Gj), UM(Gk), UM(Gx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(Rsix), UM(Rseven), UM(Reight), UM(Rnine), UM(Rten), KC_BSPC,
-	KC_PGUP, UM(Gf), UM(Gg), UM(Gc), UM(Gr), UM(Gl), KC_EQL,
-	UM(Gd), UM(Gh), UM(Gt), UM(Gn), UM(Gs), KC_MINS,
-	KC_PGDN, UM(Gb), UM(Gm), UM(Gw), UM(Gv), UM(Gz), KC_TRNS,
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[TINY] = LAYOUT_ergodox(
-	KC_ESC, UM(tone), UM(ttwo), UM(tthree), UM(tfour), UM(tfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(tp), UM(ty), KC_SLSH,
-	KC_SLSH, UM(ta), UM(to), UM(te), UM(tu), UM(ti),
-	KC_TRNS, KC_SCLN, UM(tq), UM(tj), UM(tk), UM(tx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(tsix), UM(tseven), UM(teight), UM(tnine), UM(tzero), KC_BSPC,
-	KC_PGUP, UM(tf), UM(tg), UM(tc), UM(tr), UM(tl), KC_EQL,
-	UM(td), UM(th), UM(tt), UM(tn), UM(ts), KC_MINS,
-	KC_PGDN, UM(tb), UM(tm), UM(tw), UM(tv), UM(tz), KC_TRNS,
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[FULL] = LAYOUT_ergodox(
-	KC_ESC, UM(fwone), UM(fwtwo), UM(fwthree), UM(fwfour), UM(fwfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(fwp), UM(fwy), KC_SLSH,
-	KC_SLSH, UM(fwa), UM(fwo), UM(fwe), UM(fwu), UM(fwi),
-	MO(FULU), KC_SCLN, UM(fwq), UM(fwj), UM(fwk), UM(fwx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(fwsix), UM(fwseven), UM(fweight), UM(fwnine), UM(fwzero), KC_BSPC,
-	KC_PGUP, UM(fwf), UM(fwg), UM(fwc), UM(fwr), UM(fwl), KC_EQL,
-	UM(fwd), UM(fwh), UM(fwt), UM(fwn), UM(fws), KC_MINS,
-	KC_PGDN, UM(fwb), UM(fwm), UM(fww), UM(fwv), UM(fwz), MO(FULU),
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[FULU] = LAYOUT_ergodox(
-	KC_ESC, UM(Fwone), UM(Fwtwo), UM(Fwthree), UM(Fwfour), UM(Fwfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(Fwp), UM(Fwy), KC_SLSH,
-	KC_SLSH, UM(Fwa), UM(Fwo), UM(Fwe), UM(Fwu), UM(Fwi),
-	KC_TRNS, KC_SCLN, UM(Fwq), UM(Fwj), UM(Fwk), UM(Fwx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(Fwsix), UM(Fwseven), UM(Fweight), UM(Fwnine), UM(Fwzero), KC_BSPC,
-	KC_PGUP, UM(Fwf), UM(Fwg), UM(Fwc), UM(Fwr), UM(Fwl), KC_EQL,
-	UM(Fwd), UM(Fwh), UM(Fwt), UM(Fwn), UM(Fws), KC_MINS,
-	KC_PGDN, UM(Fwb), UM(Fwm), UM(Fww), UM(Fwv), UM(Fwz), KC_TRNS,
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-    // clang-format on
-
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void){
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-            // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-};
diff --git a/keyboards/ktec/ergodone/keymaps/vega/rules.mk b/keyboards/ktec/ergodone/keymaps/vega/rules.mk
deleted file mode 100644
index d4b85472257..00000000000
--- a/keyboards/ktec/ergodone/keymaps/vega/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-UNICODE_ENABLE          = no # Unicode
-UNICODEMAP_ENABLE = yes
diff --git a/keyboards/ktec/staryu/keymaps/krusli/README.md b/keyboards/ktec/staryu/keymaps/krusli/README.md
deleted file mode 100644
index 66a0979070f..00000000000
--- a/keyboards/ktec/staryu/keymaps/krusli/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# krusli's RAMA M6-A Layout
-
-Personal keymap for the RAMA M6-A.
-
-Top-right button acts as a "toggle between layers" button. Layer 0 -> Layer 1 -> Layer 2 -> Layer 0 -> ...
-
-- Layer 0: Osu! gamepad layer
-- Layer 1: Git commands
-- Layer 2 and 3: RGB controls
diff --git a/keyboards/ktec/staryu/keymaps/krusli/keymap.c b/keyboards/ktec/staryu/keymaps/krusli/keymap.c
deleted file mode 100644
index 3fe539106dc..00000000000
--- a/keyboards/ktec/staryu/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-Copyright 2018 Kenneth Aloysius
-
-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 "action_layer.h"
-
-#include "../../backlight_staryu.h"
-
-enum layers {
-  _LAYER0,
-  _LAYER1,
-  _LAYER2,
-  _LAYER3
-};
-
-enum custom_keycodes {
-  GIT_ADD = SAFE_RANGE,
-  GIT_COMMIT,
-  GIT_PUSH,
-  MUTE,
-  DEAFEN
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	if (record->event.pressed) {
-		switch(keycode) {
-			case GIT_ADD:
-				SEND_STRING("git add ."SS_TAP(X_ENTER));
-        break;
-      case GIT_COMMIT:
-        SEND_STRING("git commit -m "SS_DOWN(X_LSFT)SS_TAP(X_QUOTE)SS_UP(X_LSFT));
-        break;
-      case GIT_PUSH:
-        SEND_STRING("git push"SS_TAP(X_ENTER));
-        break;
-      case MUTE:
-        SEND_STRING(SS_LGUI(SS_LSFT("M")));
-        break;
-      case DEAFEN:
-        SEND_STRING(SS_LGUI(SS_LSFT("D")));
-        break;
-      return false;
-		}
-	}
-	return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_LAYER0] = LAYOUT(
-             KC_ESC,     TO(_LAYER1),
-    KC_Z,    KC_X,       KC_ENT
-  ),
-  [_LAYER1] = LAYOUT(
-             MUTE,       TO(_LAYER2),
-    GIT_ADD, GIT_COMMIT, GIT_PUSH
-  ),
-  [_LAYER2] = LAYOUT(
-             RGB_MOD,    TO(_LAYER3),
-    RGB_TOG, RGB_HUD,    RGB_HUI
-  ),
-  [_LAYER3] = LAYOUT(
-             RGB_VAI,    TO(_LAYER0),
-    RGB_SAD, RGB_VAD,    RGB_SAI
-  )
-};
-
-void matrix_init_user(void) {
-  for (int i=0; i<5; i++) {
-    backlight_led_on(i);
-  }
-}
diff --git a/keyboards/kudox/columner/columner.h b/keyboards/kudox/columner/columner.h
deleted file mode 100644
index dcc745ddb79..00000000000
--- a/keyboards/kudox/columner/columner.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06,            R06, R05, R04, R03, R02, R01, R00, \
-  L10, L11, L12, L13, L14, L15, L16,            R16, R15, R14, R13, R12, R11, R10, \
-  L20, L21, L22, L23, L24, L25,                      R25, R24, R23, R22, R21, R20, \
-  L30, L31, L32, L33, L34, L35,                      R35, R34, R33, R32, R31, R30, \
-  L40, L41, L42, L43, L44, L45, L46,            R46, R45, R44, R43, R42, R41, R40  \
-) \
-{ \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { R00, R01, R02, R03, R04, R05, R06 }, \
-    { R10, R11, R12, R13, R14, R15, R16 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, R43, R44, R45, R46 } \
-}
diff --git a/keyboards/kudox/columner/keymaps/default/config.h b/keyboards/kudox/columner/keymaps/default/config.h
deleted file mode 100644
index f5bf85cca0a..00000000000
--- a/keyboards/kudox/columner/keymaps/default/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@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
diff --git a/keyboards/kudox/columner/keymaps/default/keymap.c b/keyboards/kudox/columner/keymaps/default/keymap.c
deleted file mode 100644
index 7bbdd02c76d..00000000000
--- a/keyboards/kudox/columner/keymaps/default/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-#define _NUMB 2
-
-// Shortcut to make keymap more readable
-#define KC_ALES LALT_T(KC_ESC)
-
-#define KC_LGENT MT(KC_LGUI, KC_ENT)
-#define KC_RGENT MT(KC_RGUI, KC_ENT)
-
-#define KC_L1NUM LT(_NUMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_LBRC ,                 KC_RBRC ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_MINS ,                 KC_EQL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_QUOT ,KC_GRV  ,KC_DEL  ,KC_L2SYM,KC_LGENT,KC_SPC  ,                 KC_SPC  ,KC_RGENT,KC_L1NUM,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F11  ,                 KC_F12  ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_DQUO ,KC_QUOT ,KC_TILD ,KC_ASTR ,KC_PLUS ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_TILD ,KC_GRV  ,KC_INT3 ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   _______ ,_______ ,_______ ,KC_DQUO ,KC_QUOT ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_NUMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_7    ,KC_8    ,KC_9    ,KC_ASTR ,KC_PLUS ,_______ ,                 _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_4    ,KC_5    ,KC_6    ,KC_0    ,KC_MINS ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_1    ,KC_2    ,KC_3    ,KC_DOT  ,KC_SLSH ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,KC_INT3 ,KC_0    ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/kudox/columner/keymaps/via/keymap.c b/keyboards/kudox/columner/keymaps/via/keymap.c
deleted file mode 100644
index 1906df10841..00000000000
--- a/keyboards/kudox/columner/keymaps/via/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#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 {
-  _BASE,
-  _FN1,
-  _FN2,
-  _FN3,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_LBRC ,                 KC_RBRC ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_MINS ,                 KC_EQL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_LALT ,KC_QUOT ,KC_GRV  ,KC_DEL  ,MO(_FN1),KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO(_FN2),KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_FN1] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F11  ,                 KC_F12  ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_DEL  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_PIPE ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_AT   ,KC_COLN ,KC_GRV  ,KC_SLSH ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   KC_LCBR ,KC_RCBR ,KC_TRNS ,KC_TRNS ,KC_CIRC ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_FN2] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TRNS ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,                 RGB_M_P ,RGB_M_SW,RGB_M_X ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,RGB_M_B ,RGB_M_SN ,RGB_M_G,XXXXXXX ,XXXXXXX ,                                   RGB_M_B ,RGB_M_SN,RGB_M_G ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,                                   RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,RGB_MOD ,RGB_TOG ,                 RGB_TOG ,RGB_MOD ,TO(_BASE),XXXXXXX,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_FN3] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_7    ,KC_8    ,KC_9    ,KC_ASTR ,KC_PLUS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_4    ,KC_5    ,KC_6    ,KC_0    ,KC_MINS ,                                   KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_1    ,KC_2    ,KC_3    ,KC_DOT  ,KC_SLSH ,                                   KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_INT3 ,KC_0    ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
-
-#ifdef RGBLIGHT_ENABLE
-void eeconfig_init_user(void) {
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
-};
-#endif
diff --git a/keyboards/kudox/columner/readme.md b/keyboards/kudox/columner/readme.md
deleted file mode 100644
index 0c62174bcf6..00000000000
--- a/keyboards/kudox/columner/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# The Kudox Keyboard Columner
-
-<p align="center">
-<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox.png" alt="Kudox logo" width="600"/>
-</p>
-
-<p align="center">
-<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-columner.jpg" alt="Kudox Columner" width="600"/>
-</p>
-
-- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)  
-- Hardware Supported: Kudox Columner PCB rev1.0 w/ Pro Micro  
-
-Make example for this keyboard (after setting up your build environment):
-
-```sh
-make kudox/columner:default
-```
-
-
-Example of flashing this keyboard:
-
-```sh
-make kudox/columner: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).
-
-
-## Layout
-
-![layout](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-columner-layout-rev1.png)
diff --git a/keyboards/kudox/readme.md b/keyboards/kudox/readme.md
deleted file mode 100644
index 107b99b1005..00000000000
--- a/keyboards/kudox/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# The Kudox keyboard
-
-<p align="center">
-<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox.png" alt="Kudox logo" width="600"/>
-</p>
-
-<p align="center">
-<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-rev3-image1.jpg" alt="Kudox rev3.0" width="600"/>
-</p>
-
-- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)  
-- Hardware Supported: Kudox PCB rev1.0 rev2.0 rev3.0 w/ Pro Micro  
-
-Make example for this keyboard (after setting up your build environment):
-
-```sh
-make kudox/rev3:default
-```
-
-
-Example of flashing this keyboard:
-
-```sh
-make kudox/rev3: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/kudox/rev1/keymaps/default/config.h b/keyboards/kudox/rev1/keymaps/default/config.h
deleted file mode 100644
index f5bf85cca0a..00000000000
--- a/keyboards/kudox/rev1/keymaps/default/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@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
diff --git a/keyboards/kudox/rev1/keymaps/default/keymap.c b/keyboards/kudox/rev1/keymaps/default/keymap.c
deleted file mode 100644
index 1a3bfa4fff5..00000000000
--- a/keyboards/kudox/rev1/keymaps/default/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALES LALT_T(KC_ESC)
-
-#define KC_RGENT MT(KC_RGUI, KC_ENT)
-
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-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    ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_L1SYM,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_QUOT ,KC_MINS ,KC_EQL  ,KC_ENT  ,KC_LGUI ,KC_SPC  ,                 KC_RGENT,KC_DEL  ,SYM_L   ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                   KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_INT3 ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   _______ ,KC_LCBR ,KC_RCBR ,KC_DOT  ,KC_SLSH ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/kudox/rev1/keymaps/jis/config.h b/keyboards/kudox/rev1/keymaps/jis/config.h
deleted file mode 100644
index f5bf85cca0a..00000000000
--- a/keyboards/kudox/rev1/keymaps/jis/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@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
diff --git a/keyboards/kudox/rev1/keymaps/jis/keymap.c b/keyboards/kudox/rev1/keymaps/jis/keymap.c
deleted file mode 100644
index a58c5cbd659..00000000000
--- a/keyboards/kudox/rev1/keymaps/jis/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-#include"keymap_japanese.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.
-#define _QWERTY 0
-#define _SYMB 1
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALES LALT_T(KC_ESC)
-
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     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_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_COLN ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_SLSH ,KC_N    ,KC_M    ,KC_MINS ,KC_UP   ,SYM_L   ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_LGUI ,KC_LALT ,KC_ENT  ,KC_LNG2 ,KC_SPC  ,KC_SPC  ,                 KC_COMM ,KC_DOT  ,KC_L1SYM,KC_LEFT ,KC_DOWN ,KC_RGHT ,JP_BSLS
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                   XXXXXXX ,JP_CIRC ,JP_YEN  ,JP_TILD ,JP_PIPE ,KC_DEL  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,                 KC_LT   ,KC_GT   ,JP_LBRC ,JP_RBRC ,JP_LCBR ,JP_RCBR ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_F11  ,KC_F12  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   XXXXXXX ,JP_PLUS ,JP_ASTR ,KC_SCLN ,JP_COLN ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   _______ ,XXXXXXX ,XXXXXXX ,_______ ,KC_VOLU ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_MUTE ,KC_VOLD ,_______,_______
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/kudox/rev1/keymaps/x1/config.h b/keyboards/kudox/rev1/keymaps/x1/config.h
deleted file mode 100644
index f5bf85cca0a..00000000000
--- a/keyboards/kudox/rev1/keymaps/x1/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@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
diff --git a/keyboards/kudox/rev1/keymaps/x1/keymap.c b/keyboards/kudox/rev1/keymaps/x1/keymap.c
deleted file mode 100644
index 982f98b2956..00000000000
--- a/keyboards/kudox/rev1/keymaps/x1/keymap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-#define _NUMB 2
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-#define NUM_L   MO(_NUMB)
-
-#define KC_ALES LALT_T(KC_ESC)
-
-#define KC_RGENT MT(KC_RGUI, KC_ENT)
-#define KC_LGUI2 RALT_T(KC_LNG2)
-
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-#define KC_L1NUM LT(_NUMB, KC_LNG1)
-#define KC_ENNUM LT(_NUMB, KC_ENT)
-
-#define KC_FSYM LT(_SYMB, KC_F)
-#define KC_JNUM LT(_NUMB, KC_J)
-
-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    ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_FSYM ,KC_G    ,                                   KC_H    ,KC_JNUM ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_L1NUM,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_QUOT ,KC_MINS ,KC_EQL  ,KC_ENNUM,KC_LGUI ,KC_SPC  ,                 KC_RGENT,KC_DEL  ,SYM_L   ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                   KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_INT3 ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   _______ ,KC_LCBR ,KC_RCBR ,KC_DOT  ,KC_SLSH ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_NUMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_7    ,KC_8    ,KC_9    ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_4    ,KC_5    ,KC_6    ,KC_0    ,KC_MINS ,                                   XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_1    ,KC_2    ,KC_3    ,KC_DOT  ,KC_SLSH ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,KC_INT3 ,KC_0    ,_______ ,_______ ,_______ ,_______ ,                 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-
-};
diff --git a/keyboards/kudox/rev1/keymaps/x1/readme.md b/keyboards/kudox/rev1/keymaps/x1/readme.md
deleted file mode 100644
index 1085735afc5..00000000000
--- a/keyboards/kudox/rev1/keymaps/x1/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# [x1](https://github.com/x1-) 's keymap for Kudox Keyboard
diff --git a/keyboards/kudox/rev2/keymaps/default/config.h b/keyboards/kudox/rev2/keymaps/default/config.h
deleted file mode 100644
index f5bf85cca0a..00000000000
--- a/keyboards/kudox/rev2/keymaps/default/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@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
diff --git a/keyboards/kudox/rev2/keymaps/default/keymap.c b/keyboards/kudox/rev2/keymaps/default/keymap.c
deleted file mode 100644
index d078683d9c3..00000000000
--- a/keyboards/kudox/rev2/keymaps/default/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALES LALT_T(KC_ESC)
-
-#define KC_RGENT MT(KC_RGUI, KC_ENT)
-
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_GRV  ,                 KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_L1SYM,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_QUOT ,KC_MINS ,KC_EQL  ,KC_ENT  ,KC_LGUI ,KC_SPC  ,                 KC_RGENT,KC_DEL  ,SYM_L   ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = 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_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_INT3 ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   _______ ,KC_LCBR ,KC_RCBR ,KC_DOT  ,KC_SLSH ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/kudox/rev2/keymaps/jis/config.h b/keyboards/kudox/rev2/keymaps/jis/config.h
deleted file mode 100644
index f5bf85cca0a..00000000000
--- a/keyboards/kudox/rev2/keymaps/jis/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@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
diff --git a/keyboards/kudox/rev2/keymaps/jis/keymap.c b/keyboards/kudox/rev2/keymaps/jis/keymap.c
deleted file mode 100644
index b588fea6ad2..00000000000
--- a/keyboards/kudox/rev2/keymaps/jis/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-#include"keymap_japanese.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.
-#define _QWERTY 0
-#define _SYMB 1
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALES LALT_T(KC_ESC)
-
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_ESC  ,                 KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_LNG2,                  KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_COLN ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_UP   ,KC_N    ,KC_M    ,KC_SLSH ,JP_UNDS ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_LGUI ,KC_LALT ,KC_DEL  ,KC_L2SYM,KC_SPC  ,KC_ENT  ,                 KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_COMM ,KC_DOT  ,KC_L1SYM,JP_BSLS
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = 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  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,JP_LPRN ,JP_RPRN ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,                 JP_HASH ,JP_DLR  ,JP_PERC ,JP_PLUS ,KC_MINS ,JP_CIRC ,JP_YEN  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,JP_LBRC ,JP_RBRC ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   JP_AMPR ,KC_SLSH ,JP_ASTR ,KC_SCLN ,JP_COLN ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,JP_LCBR ,JP_RCBR ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   KC_VOLU ,XXXXXXX ,XXXXXXX ,KC_LT   ,KC_GT   ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,KC_LT   ,KC_GT   ,KC_LNG2 ,_______ ,_______ ,                 KC_MUTE ,KC_VOLD ,KC_LNG1 ,_______ ,_______ ,_______ ,KC_DEL
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/kudox/rev3/keymaps/default/keymap.c b/keyboards/kudox/rev3/keymaps/default/keymap.c
deleted file mode 100644
index 45e40630c66..00000000000
--- a/keyboards/kudox/rev3/keymaps/default/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-#define _LIGHT 2
-
-// Shortcut to make keymap more readable
-#define SYM_L2  LT(_SYMB, KC_LNG2)
-#define TO_LIGH TO(_LIGHT)
-#define TO_QWER TO(_QWERTY)
-
-#define KC_ALES LALT_T(KC_ESC)
-#define KC_ALEN LALT_T(KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     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_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_ESC  ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_UP   ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_LBRC ,KC_RBRC ,SYM_L2  ,KC_ALEN ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO_LIGH ,KC_LNG1 ,KC_LEFT, KC_DOWN ,KC_RIGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = 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_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_PIPE ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,KC_SLSH ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   KC_LCBR ,KC_RCBR ,_______ ,_______ ,KC_CIRC ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LABK ,KC_UNDS ,KC_RABK
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_LIGHT] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,                 RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,RGB_M_B ,RGB_M_SN ,RGB_M_G,XXXXXXX ,XXXXXXX ,                                   RGB_M_B ,RGB_M_SN,RGB_M_G ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,                                   RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,RGB_MOD ,RGB_TOG ,                 RGB_TOG ,RGB_MOD ,TO_QWER ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-
-};
-
-
-#ifdef RGBLIGHT_ENABLE
-void eeconfig_init_user(void) {
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
-};
-#endif
diff --git a/keyboards/kudox/rev3/keymaps/jis/keymap.c b/keyboards/kudox/rev3/keymaps/jis/keymap.c
deleted file mode 100644
index 72f4c04c300..00000000000
--- a/keyboards/kudox/rev3/keymaps/jis/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include QMK_KEYBOARD_H
-#include"keymap_japanese.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.
-#define _QWERTY 0
-#define _SYMB 1
-#define _LIGHT 2
-
-// Shortcut to make keymap more readable
-#define SYM_L2  LT(_SYMB, KC_LNG2)
-#define TO_LIGH TO(_LIGHT)
-#define TO_QWER TO(_QWERTY)
-
-#define KC_ALES LALT_T(KC_ESC)
-#define KC_ALEN LALT_T(KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     JP_ZKHK ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_6    ,                 KC_7    ,KC_8    ,KC_9    ,KC_0    ,JP_MINS ,JP_CIRC ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_ESC  ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_SLSH ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,JP_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,JP_COMM ,JP_DOT  ,KC_UP   ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,JP_YEN  ,JP_COLN ,SYM_L2  ,KC_ALEN ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO_LIGH ,KC_LNG1 ,KC_LEFT, KC_DOWN ,KC_RIGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = 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  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,JP_DQUO ,JP_QUOT ,KC_GRV  ,JP_ASTR ,JP_PLUS ,JP_EQL  ,                 JP_LPRN ,JP_RPRN ,JP_PIPE ,JP_ASTR ,JP_TILD ,JP_CIRC ,JP_PIPE ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,JP_AT   ,JP_COLN ,KC_GRV  ,JP_SLSH ,JP_MINS ,                                   JP_LBRC ,JP_RBRC ,JP_DOT  ,JP_SLSH ,JP_MINS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   JP_LCBR ,JP_RCBR ,_______ ,_______ ,JP_CIRC ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,JP_LABK ,JP_UNDS ,JP_RABK
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_LIGHT] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,                 RGB_M_P ,RGB_M_SW ,RGB_M_X ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,RGB_M_B ,RGB_M_SN ,RGB_M_G,XXXXXXX ,XXXXXXX ,                                   RGB_M_B ,RGB_M_SN ,RGB_M_G ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,                                   RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,RGB_MOD ,RGB_TOG ,                 RGB_TOG ,RGB_MOD ,TO_QWER ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-
-};
-
-#ifdef RGBLIGHT_ENABLE
-void eeconfig_init_user(void) {
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
-};
-#endif
diff --git a/keyboards/kudox/rev3/keymaps/via/keymap.c b/keyboards/kudox/rev3/keymaps/via/keymap.c
deleted file mode 100644
index 9dfbe81701d..00000000000
--- a/keyboards/kudox/rev3/keymaps/via/keymap.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#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 {
-  _BASE,
-  _FN1,
-  _FN2,
-  _FN3,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     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_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_ESC  ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_UP   ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_LALT ,KC_LBRC ,KC_RBRC ,MO(_FN1),KC_ENT  ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO(_FN2),KC_LNG1 ,KC_LEFT, KC_DOWN ,KC_RIGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_FN1] = 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_TRNS ,KC_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_PIPE ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_AT   ,KC_COLN ,KC_GRV  ,KC_SLSH ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   KC_LCBR ,KC_RCBR ,KC_TRNS ,KC_TRNS ,KC_CIRC ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_LABK ,KC_UNDS ,KC_RABK
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_FN2] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TRNS ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,                 RGB_M_P ,RGB_M_SW,RGB_M_X ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,RGB_M_B ,RGB_M_SN ,RGB_M_G,XXXXXXX ,XXXXXXX ,                                   RGB_M_B ,RGB_M_SN,RGB_M_G ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,                                   RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,RGB_MOD ,RGB_TOG ,                 RGB_TOG ,RGB_MOD ,TO(_BASE),XXXXXXX,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_FN3] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                                   KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                                   KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-};
-
-
-#ifdef RGBLIGHT_ENABLE
-void eeconfig_init_user(void) {
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
-};
-#endif
diff --git a/keyboards/kudox/rev3/rev3.h b/keyboards/kudox/rev3/rev3.h
deleted file mode 100644
index dcc745ddb79..00000000000
--- a/keyboards/kudox/rev3/rev3.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06,            R06, R05, R04, R03, R02, R01, R00, \
-  L10, L11, L12, L13, L14, L15, L16,            R16, R15, R14, R13, R12, R11, R10, \
-  L20, L21, L22, L23, L24, L25,                      R25, R24, R23, R22, R21, R20, \
-  L30, L31, L32, L33, L34, L35,                      R35, R34, R33, R32, R31, R30, \
-  L40, L41, L42, L43, L44, L45, L46,            R46, R45, R44, R43, R42, R41, R40  \
-) \
-{ \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { R00, R01, R02, R03, R04, R05, R06 }, \
-    { R10, R11, R12, R13, R14, R15, R16 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, R43, R44, R45, R46 } \
-}
diff --git a/keyboards/kudox/rules.mk b/keyboards/kudox/rules.mk
deleted file mode 100644
index 8654d9b5208..00000000000
--- a/keyboards/kudox/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
-DEFAULT_FOLDER = kudox/rev3
diff --git a/keyboards/kudox_full/readme.md b/keyboards/kudox_full/readme.md
deleted file mode 100644
index 494d7508c84..00000000000
--- a/keyboards/kudox_full/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# The Kudox Full keyboard
-
-![Kudox logo](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox.png)
-
-![Kudox Full image2](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-full-image2.jpg) | ![Kudox Full image1](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-full-image1.jpg)
-:----:|:-----:
- front | angle
-
-- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)
-- Hardware Supported: Kudox Full PCB rev1.0 w/ Pro Micro
-- Assembly guide: [Kudox Full/README](https://github.com/kumaokobo/kudox-keyboard/blob/master/kudox-full/README.md)
-
-## 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 `QK_BOOT` if it is available
-
-## Building Firmware
-
-Make example for this keyboard (after setting up your build environment):
-
-    make kudox_full/rev1:default
-
-
-Flashing example for this keyboard:
-
-    make kudox_full/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/kudox_full/rev1/rules.mk b/keyboards/kudox_full/rev1/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/kudox_full/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/kudox_full/rules.mk b/keyboards/kudox_full/rules.mk
deleted file mode 100644
index cbdafb7a5c6..00000000000
--- a/keyboards/kudox_full/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
-UNICODE_ENABLE = yes        # Unicode
-LTO_ENABLE = yes
-
-SPLIT_KEYBOARD = yes
-
-DEFAULT_FOLDER = kudox_full/rev1
diff --git a/keyboards/kudox_game/keymaps/default/config.h b/keyboards/kudox_game/keymaps/default/config.h
deleted file mode 100644
index 5cbe7609a3f..00000000000
--- a/keyboards/kudox_game/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2019 Kumao Kobo <kumaokobo@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
diff --git a/keyboards/kudox_game/keymaps/default/keymap.c b/keyboards/kudox_game/keymaps/default/keymap.c
deleted file mode 100644
index aecf8976c2e..00000000000
--- a/keyboards/kudox_game/keymaps/default/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-#define _LIGHT 2
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-#define KC_ALEN LALT_T(KC_ENT)
-#define ES_LIGH LT(_LIGHT, KC_ESC)
-
-#define CT_COPY   LCTL(KC_C)
-#define CT_PASTE  LCTL(KC_V)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐
-     ES_LIGH ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,
-  //└────────┼────────┼────────┼────────┼────────┼────────┤
-              KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,
-  //┌────────┼────────┼────────┼────────┼────────┼────────┼────────┐
-     CT_COPY ,CT_PASTE,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐
-     KC_LSFT ,KC_Z                      ,KC_X    ,KC_C    ,KC_V    ,
-  //├────────┼────────┘                 └────────┴────────┼────────┼────────┐
-     KC_LCTL                                              ,SYM_L   ,KC_SPC
-  //└────────┘                                            └────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,
-  //└────────┼────────┼────────┼────────┼────────┼────────┤
-              KC_GRV   ,KC_UP   ,KC_PIPE ,KC_LCBR ,KC_RCBR ,
-  //┌────────┼────────┼────────┼────────┼────────┼────────┼────────┐
-     _______ ,_______ ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_LBRC ,KC_RBRC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐
-     _______ ,KC_BSPC                   ,KC_DEL  ,KC_LPRN ,KC_RPRN ,
-  //├────────┼────────┘                 └────────┴────────┼────────┼────────┐
-     _______                                              ,_______ ,_______
-  //└────────┘                                            └────────┴────────┘
-  ),
-
-  [_LIGHT] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,
-  //└────────┼────────┼────────┼────────┼────────┼────────┤
-              RGB_M_P ,RGB_M_SW,RGB_M_X ,RGB_M_B ,RGB_VAD ,
-  //┌────────┼────────┼────────┼────────┼────────┼────────┼────────┐
-     _______ ,_______ ,RGB_M_SN,RGB_M_G ,RGB_M_R ,RGB_M_K ,RGB_M_T ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐
-     _______ ,RGB_M_T                   ,XXXXXXX ,RGB_VAI ,RGB_VAD ,
-  //├────────┼────────┘                 └────────┴────────┼────────┼────────┐
-     _______                                              ,RGB_MOD ,RGB_TOG
-  //└────────┘                                            └────────┴────────┘
-  )
-
-};
-
-// Runs just one time when the keyboard initializes.
-#ifdef RGBLIGHT_ENABLE
-void eeconfig_init_user(void) {
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
-};
-#endif
diff --git a/keyboards/kudox_game/keymaps/via/keymap.c b/keyboards/kudox_game/keymaps/via/keymap.c
deleted file mode 100644
index 0a18483d907..00000000000
--- a/keyboards/kudox_game/keymaps/via/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#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 {
-  _BASE,
-  _FN1,
-  _FN2,
-  _FN3,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT(
-  //┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-     KC_ESC    ,KC_1      ,KC_2      ,KC_3      ,KC_4      ,KC_5      ,
-  //└──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-                KC_Q      ,KC_W      ,KC_E      ,KC_R      ,KC_T      ,
-  //┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐
-     LCTL(KC_C),LCTL(KC_V),KC_A      ,KC_S      ,KC_D      ,KC_F      ,KC_G      ,
-  //├──────────┼──────────┼──────────┴──────────┼──────────┼──────────┼──────────┤
-     KC_LSFT   ,KC_Z                            ,KC_X      ,KC_C      ,KC_V      ,
-  //├──────────┼──────────┘                     └──────────┴──────────┼──────────┼──────────┐
-     KC_LCTL                                                          ,TO(_FN1)  ,KC_SPC
-  //└──────────┘                                                      └──────────┴──────────┘
-  ),
-
-  [_FN1] = LAYOUT(
-  //┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-     KC_TRNS   ,KC_6      ,KC_7      ,KC_8      ,KC_9      ,KC_0      ,
-  //└──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-                KC_GRV    ,KC_UP     ,KC_PIPE   ,KC_LCBR   ,KC_RCBR   ,
-  //┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐
-     KC_TRNS   ,KC_TRNS   ,KC_LEFT   ,KC_DOWN   ,KC_RIGHT  ,KC_LBRC   ,KC_RBRC   ,
-  //├──────────┼──────────┼──────────┴──────────┼──────────┼──────────┼──────────┤
-     KC_TRNS   ,KC_BSPC                         ,KC_DEL    ,KC_LPRN   ,KC_RPRN   ,
-  //├──────────┼──────────┘                     └──────────┴──────────┼──────────┼──────────┐
-     TO(_FN2)                                                         ,TO(_BASE) ,KC_TRNS
-  //└──────────┘                                                      └──────────┴──────────┘
-  ),
-
-  [_FN2] = LAYOUT(
-  //┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-     KC_TRNS   ,RGB_HUI   ,RGB_HUD   ,RGB_SAI   ,RGB_SAD   ,RGB_VAI   ,
-  //└──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-                RGB_M_P   ,RGB_M_SW  ,RGB_M_X   ,RGB_M_B   ,RGB_VAD   ,
-  //┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐
-     KC_TRNS   ,KC_TRNS   ,RGB_M_SN  ,RGB_M_G   ,RGB_M_R   ,RGB_M_K   ,RGB_M_T   ,
-  //├──────────┼──────────┼──────────┴──────────┼──────────┼──────────┼──────────┤
-     KC_TRNS   ,RGB_M_T                         ,KC_DEL    ,RGB_VAI   ,RGB_VAD   ,
-  //├──────────┼──────────┘                     └──────────┴──────────┼──────────┼──────────┐
-     TO(_FN1)                                                         ,RGB_MOD   ,RGB_TOG
-  //└──────────┘                                                      └──────────┴──────────┘
-  ),
-
-
-  [_FN3] = LAYOUT(
-  //┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
-     KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,
-  //└──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
-                KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,
-  //┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐
-     KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,
-  //├──────────┼──────────┼──────────┴──────────┼──────────┼──────────┼──────────┤
-     KC_TRNS   ,KC_TRNS                         ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,
-  //├──────────┼──────────┘                     └──────────┴──────────┼──────────┼──────────┐
-     KC_TRNS                                                          ,KC_TRNS   ,KC_TRNS
-  //└──────────┘                                                      └──────────┴──────────┘
-  )
-};
-
-
-#ifdef RGBLIGHT_ENABLE
-void eeconfig_init_user(void) {
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
-};
-#endif
diff --git a/keyboards/kudox_game/kudox_game.c b/keyboards/kudox_game/kudox_game.c
deleted file mode 100644
index cf053afd060..00000000000
--- a/keyboards/kudox_game/kudox_game.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@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 "kudox_game.h"
diff --git a/keyboards/kudox_game/kudox_game.h b/keyboards/kudox_game/kudox_game.h
deleted file mode 100644
index c76f086c879..00000000000
--- a/keyboards/kudox_game/kudox_game.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@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
-
-#ifdef KEYBOARD_kudox_game_rev1
-    #include "rev1.h"
-#endif
-#ifdef KEYBOARD_kudox_game_rev2
-    #include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kudox_game/readme.md b/keyboards/kudox_game/readme.md
deleted file mode 100644
index 31565a59968..00000000000
--- a/keyboards/kudox_game/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# The Kudox Game keyboard
-
-<p align="center">
-<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox.png" alt="Kudox logo" width="600"/>
-</p>
-
-<p align="center">
-<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-game-pcb.jpg" alt="Kudox Game PCB rev1.0" width="600"/>
-</p>
-
-- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)  
-- Hardware Supported: Kudox Game PCB rev1.0 rev2.0 w/ Pro Micro  
-
-Make example for this keyboard (after setting up your build environment):
-
-```sh
-make kudox_game/rev2:default
-```
-
-Example of flashing this keyboard:
-
-```sh
-make kudox_game/rev2:default:avrdude
-```
-
-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/kudox_game/rev1/rev1.c b/keyboards/kudox_game/rev1/rev1.c
deleted file mode 100644
index 32356f8a4ae..00000000000
--- a/keyboards/kudox_game/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/rev1/rev1.h b/keyboards/kudox_game/rev1/rev1.h
deleted file mode 100644
index e630a51658d..00000000000
--- a/keyboards/kudox_game/rev1/rev1.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "../kudox_game.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  k00, k01, k02, k03, k04, k05,      \
-       k11, k12, k13, k14, k15,      \
-  k20, k21, k22, k23, k24, k25, k26, \
-  k30, k31,           k34, k35, k36, \
-  k40,                     k45, k46  \
-) \
-{ \
-    { k00,   k01,   k02,   k03,   k04,   k05,   KC_NO }, \
-    { KC_NO, k11,   k12,   k13,   k14,   k15,   KC_NO }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26 }, \
-    { k30,   k31,   KC_NO, KC_NO, k34,   k35,   k36 }, \
-    { k40,   KC_NO, KC_NO, KC_NO, KC_NO, k45,   k46 } \
-}
diff --git a/keyboards/kudox_game/rev2/rev2.c b/keyboards/kudox_game/rev2/rev2.c
deleted file mode 100644
index 32356f8a4ae..00000000000
--- a/keyboards/kudox_game/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/rev2/rev2.h b/keyboards/kudox_game/rev2/rev2.h
deleted file mode 100644
index e630a51658d..00000000000
--- a/keyboards/kudox_game/rev2/rev2.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "../kudox_game.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  k00, k01, k02, k03, k04, k05,      \
-       k11, k12, k13, k14, k15,      \
-  k20, k21, k22, k23, k24, k25, k26, \
-  k30, k31,           k34, k35, k36, \
-  k40,                     k45, k46  \
-) \
-{ \
-    { k00,   k01,   k02,   k03,   k04,   k05,   KC_NO }, \
-    { KC_NO, k11,   k12,   k13,   k14,   k15,   KC_NO }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26 }, \
-    { k30,   k31,   KC_NO, KC_NO, k34,   k35,   k36 }, \
-    { k40,   KC_NO, KC_NO, KC_NO, KC_NO, k45,   k46 } \
-}
diff --git a/keyboards/kudox_game/rev2/rules.mk b/keyboards/kudox_game/rev2/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/kudox_game/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/kudox_game/rules.mk b/keyboards/kudox_game/rules.mk
deleted file mode 100644
index 762675efe1a..00000000000
--- a/keyboards/kudox_game/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-DEFAULT_FOLDER = kudox_game/rev2
diff --git a/keyboards/kudox/columner/config.h b/keyboards/kumaokobo/kudox/columner/config.h
similarity index 100%
rename from keyboards/kudox/columner/config.h
rename to keyboards/kumaokobo/kudox/columner/config.h
diff --git a/keyboards/kudox/columner/info.json b/keyboards/kumaokobo/kudox/columner/info.json
similarity index 100%
rename from keyboards/kudox/columner/info.json
rename to keyboards/kumaokobo/kudox/columner/info.json
diff --git a/keyboards/kumaokobo/kudox/columner/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox/columner/keymaps/default/keymap.c
new file mode 100644
index 00000000000..4798f862dfa
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/columner/keymaps/default/keymap.c
@@ -0,0 +1,66 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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.
+#define _QWERTY 0
+#define _SYMB 1
+#define _NUMB 2
+
+// Shortcut to make keymap more readable
+#define KC_ALES LALT_T(KC_ESC)
+
+#define KC_LGENT MT(KC_LGUI, KC_ENT)
+#define KC_RGENT MT(KC_RGUI, KC_ENT)
+
+#define KC_L1NUM LT(_NUMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_LBRC ,                 KC_RBRC ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_MINS ,                 KC_EQL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_QUOT ,KC_GRV  ,KC_DEL  ,KC_L2SYM,KC_LGENT,KC_SPC  ,                 KC_SPC  ,KC_RGENT,KC_L1NUM,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F11  ,                 KC_F12  ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_DQUO ,KC_QUOT ,KC_TILD ,KC_ASTR ,KC_PLUS ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_TILD ,KC_GRV  ,KC_INT3 ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   _______ ,_______ ,_______ ,KC_DQUO ,KC_QUOT ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_NUMB] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_7    ,KC_8    ,KC_9    ,KC_ASTR ,KC_PLUS ,_______ ,                 _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_4    ,KC_5    ,KC_6    ,KC_0    ,KC_MINS ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_1    ,KC_2    ,KC_3    ,KC_DOT  ,KC_SLSH ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,KC_INT3 ,KC_0    ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+};
diff --git a/keyboards/kudox/columner/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/columner/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox/columner/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox/columner/keymaps/default/readme.md
diff --git a/keyboards/kumaokobo/kudox/columner/keymaps/via/keymap.c b/keyboards/kumaokobo/kudox/columner/keymaps/via/keymap.c
new file mode 100644
index 00000000000..8450881cc41
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/columner/keymaps/via/keymap.c
@@ -0,0 +1,79 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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 {
+  _BASE,
+  _FN1,
+  _FN2,
+  _FN3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_LBRC ,                 KC_RBRC ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_MINS ,                 KC_EQL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_LALT ,KC_QUOT ,KC_GRV  ,KC_DEL  ,MO(_FN1),KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO(_FN2),KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_FN1] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F11  ,                 KC_F12  ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_DEL  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_PIPE ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_AT   ,KC_COLN ,KC_GRV  ,KC_SLSH ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   KC_LCBR ,KC_RCBR ,KC_TRNS ,KC_TRNS ,KC_CIRC ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_FN2] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TRNS ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,                 RGB_M_P ,RGB_M_SW,RGB_M_X ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,RGB_M_B ,RGB_M_SN ,RGB_M_G,XXXXXXX ,XXXXXXX ,                                   RGB_M_B ,RGB_M_SN,RGB_M_G ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,                                   RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,RGB_MOD ,RGB_TOG ,                 RGB_TOG ,RGB_MOD ,TO(_BASE),XXXXXXX,XXXXXXX ,XXXXXXX ,XXXXXXX
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_FN3] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_7    ,KC_8    ,KC_9    ,KC_ASTR ,KC_PLUS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_4    ,KC_5    ,KC_6    ,KC_0    ,KC_MINS ,                                   KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_1    ,KC_2    ,KC_3    ,KC_DOT  ,KC_SLSH ,                                   KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_TRNS ,KC_INT3 ,KC_0    ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+};
+
+#ifdef RGBLIGHT_ENABLE
+void eeconfig_init_user(void) {
+    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
+};
+#endif
diff --git a/keyboards/kudox/columner/keymaps/via/readme.md b/keyboards/kumaokobo/kudox/columner/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kudox/columner/keymaps/via/readme.md
rename to keyboards/kumaokobo/kudox/columner/keymaps/via/readme.md
diff --git a/keyboards/kumaokobo/kudox/columner/keymaps/via/rules.mk b/keyboards/kumaokobo/kudox/columner/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/columner/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kumaokobo/kudox/columner/readme.md b/keyboards/kumaokobo/kudox/columner/readme.md
new file mode 100644
index 00000000000..90a65670b49
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/columner/readme.md
@@ -0,0 +1,32 @@
+# The Kudox Keyboard Columner
+
+<p align="center">
+<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox.png" alt="Kudox logo" width="600"/>
+</p>
+
+<p align="center">
+<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-columner.jpg" alt="Kudox Columner" width="600"/>
+</p>
+
+- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)  
+- Hardware Supported: Kudox Columner PCB rev1.0 w/ Pro Micro  
+
+Make example for this keyboard (after setting up your build environment):
+
+```sh
+make kumaokobo/kudox/columner:default
+```
+
+
+Example of flashing this keyboard:
+
+```sh
+make kumaokobo/kudox/columner: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).
+
+
+## Layout
+
+![layout](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-columner-layout-rev1.png)
diff --git a/keyboards/kudox_game/rev1/rules.mk b/keyboards/kumaokobo/kudox/columner/rules.mk
similarity index 100%
rename from keyboards/kudox_game/rev1/rules.mk
rename to keyboards/kumaokobo/kudox/columner/rules.mk
diff --git a/keyboards/kudox/config.h b/keyboards/kumaokobo/kudox/config.h
similarity index 100%
rename from keyboards/kudox/config.h
rename to keyboards/kumaokobo/kudox/config.h
diff --git a/keyboards/kumaokobo/kudox/readme.md b/keyboards/kumaokobo/kudox/readme.md
new file mode 100644
index 00000000000..01b90d53bec
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/readme.md
@@ -0,0 +1,27 @@
+# The Kudox keyboard
+
+<p align="center">
+<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox.png" alt="Kudox logo" width="600"/>
+</p>
+
+<p align="center">
+<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-rev3-image1.jpg" alt="Kudox rev3.0" width="600"/>
+</p>
+
+- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)  
+- Hardware Supported: Kudox PCB rev1.0 rev2.0 rev3.0 w/ Pro Micro  
+
+Make example for this keyboard (after setting up your build environment):
+
+```sh
+make kumaokobo/kudox/rev3:default
+```
+
+
+Example of flashing this keyboard:
+
+```sh
+make kumaokobo/kudox/rev3: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/kudox/rev1/config.h b/keyboards/kumaokobo/kudox/rev1/config.h
similarity index 100%
rename from keyboards/kudox/rev1/config.h
rename to keyboards/kumaokobo/kudox/rev1/config.h
diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kumaokobo/kudox/rev1/info.json
similarity index 100%
rename from keyboards/kudox/rev1/info.json
rename to keyboards/kumaokobo/kudox/rev1/info.json
diff --git a/keyboards/kumaokobo/kudox/rev1/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox/rev1/keymaps/default/keymap.c
new file mode 100644
index 00000000000..b3d183e72bd
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/rev1/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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.
+#define _QWERTY 0
+#define _SYMB 1
+
+// Shortcut to make keymap more readable
+#define SYM_L   MO(_SYMB)
+
+#define KC_ALES LALT_T(KC_ESC)
+
+#define KC_RGENT MT(KC_RGUI, KC_ENT)
+
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
+
+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    ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_L1SYM,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_QUOT ,KC_MINS ,KC_EQL  ,KC_ENT  ,KC_LGUI ,KC_SPC  ,                 KC_RGENT,KC_DEL  ,SYM_L   ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                   KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_INT3 ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   _______ ,KC_LCBR ,KC_RCBR ,KC_DOT  ,KC_SLSH ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+};
diff --git a/keyboards/kudox/rev1/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox/rev1/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox/rev1/keymaps/default/readme.md
diff --git a/keyboards/kumaokobo/kudox/rev1/keymaps/jis/keymap.c b/keyboards/kumaokobo/kudox/rev1/keymaps/jis/keymap.c
new file mode 100644
index 00000000000..26bc89abbd2
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/rev1/keymaps/jis/keymap.c
@@ -0,0 +1,51 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+#include"keymap_japanese.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.
+#define _QWERTY 0
+#define _SYMB 1
+
+// Shortcut to make keymap more readable
+#define SYM_L   MO(_SYMB)
+
+#define KC_ALES LALT_T(KC_ESC)
+
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     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_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_COLN ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_SLSH ,KC_N    ,KC_M    ,KC_MINS ,KC_UP   ,SYM_L   ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_LGUI ,KC_LALT ,KC_ENT  ,KC_LNG2 ,KC_SPC  ,KC_SPC  ,                 KC_COMM ,KC_DOT  ,KC_L1SYM,KC_LEFT ,KC_DOWN ,KC_RGHT ,JP_BSLS
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                   XXXXXXX ,JP_CIRC ,JP_YEN  ,JP_TILD ,JP_PIPE ,KC_DEL  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,                 KC_LT   ,KC_GT   ,JP_LBRC ,JP_RBRC ,JP_LCBR ,JP_RCBR ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_F11  ,KC_F12  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   XXXXXXX ,JP_PLUS ,JP_ASTR ,KC_SCLN ,JP_COLN ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   _______ ,XXXXXXX ,XXXXXXX ,_______ ,KC_VOLU ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_MUTE ,KC_VOLD ,_______,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+};
diff --git a/keyboards/kudox/rev1/keymaps/jis/readme.md b/keyboards/kumaokobo/kudox/rev1/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/kudox/rev1/keymaps/jis/readme.md
rename to keyboards/kumaokobo/kudox/rev1/keymaps/jis/readme.md
diff --git a/keyboards/lefty/rev1/rules.mk b/keyboards/kumaokobo/kudox/rev1/rules.mk
similarity index 100%
rename from keyboards/lefty/rev1/rules.mk
rename to keyboards/kumaokobo/kudox/rev1/rules.mk
diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kumaokobo/kudox/rev2/config.h
similarity index 100%
rename from keyboards/kudox/rev2/config.h
rename to keyboards/kumaokobo/kudox/rev2/config.h
diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kumaokobo/kudox/rev2/info.json
similarity index 100%
rename from keyboards/kudox/rev2/info.json
rename to keyboards/kumaokobo/kudox/rev2/info.json
diff --git a/keyboards/kumaokobo/kudox/rev2/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox/rev2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..29ddd15fa18
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/rev2/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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.
+#define _QWERTY 0
+#define _SYMB 1
+
+// Shortcut to make keymap more readable
+#define SYM_L   MO(_SYMB)
+
+#define KC_ALES LALT_T(KC_ESC)
+
+#define KC_RGENT MT(KC_RGUI, KC_ENT)
+
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_GRV  ,                 KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_L1SYM,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_QUOT ,KC_MINS ,KC_EQL  ,KC_ENT  ,KC_LGUI ,KC_SPC  ,                 KC_RGENT,KC_DEL  ,SYM_L   ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = 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_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_INT3 ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   _______ ,KC_LCBR ,KC_RCBR ,KC_DOT  ,KC_SLSH ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+};
diff --git a/keyboards/kudox/rev2/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/rev2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox/rev2/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox/rev2/keymaps/default/readme.md
diff --git a/keyboards/kumaokobo/kudox/rev2/keymaps/jis/keymap.c b/keyboards/kumaokobo/kudox/rev2/keymaps/jis/keymap.c
new file mode 100644
index 00000000000..c581ddb8f1c
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/rev2/keymaps/jis/keymap.c
@@ -0,0 +1,51 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+#include"keymap_japanese.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.
+#define _QWERTY 0
+#define _SYMB 1
+
+// Shortcut to make keymap more readable
+#define SYM_L   MO(_SYMB)
+
+#define KC_ALES LALT_T(KC_ESC)
+
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_GRV  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_ESC  ,                 KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_LNG2,                  KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_COLN ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_UP   ,KC_N    ,KC_M    ,KC_SLSH ,JP_UNDS ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_LGUI ,KC_LALT ,KC_DEL  ,KC_L2SYM,KC_SPC  ,KC_ENT  ,                 KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_COMM ,KC_DOT  ,KC_L1SYM,JP_BSLS
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = 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  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,JP_LPRN ,JP_RPRN ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,                 JP_HASH ,JP_DLR  ,JP_PERC ,JP_PLUS ,KC_MINS ,JP_CIRC ,JP_YEN  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,JP_LBRC ,JP_RBRC ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   JP_AMPR ,KC_SLSH ,JP_ASTR ,KC_SCLN ,JP_COLN ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,JP_LCBR ,JP_RCBR ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   KC_VOLU ,XXXXXXX ,XXXXXXX ,KC_LT   ,KC_GT   ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,KC_LT   ,KC_GT   ,KC_LNG2 ,_______ ,_______ ,                 KC_MUTE ,KC_VOLD ,KC_LNG1 ,_______ ,_______ ,_______ ,KC_DEL
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+};
diff --git a/keyboards/kudox/rev2/keymaps/jis/readme.md b/keyboards/kumaokobo/kudox/rev2/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/kudox/rev2/keymaps/jis/readme.md
rename to keyboards/kumaokobo/kudox/rev2/keymaps/jis/readme.md
diff --git a/keyboards/lefty/rev2/rules.mk b/keyboards/kumaokobo/kudox/rev2/rules.mk
similarity index 100%
rename from keyboards/lefty/rev2/rules.mk
rename to keyboards/kumaokobo/kudox/rev2/rules.mk
diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kumaokobo/kudox/rev3/config.h
similarity index 100%
rename from keyboards/kudox/rev3/config.h
rename to keyboards/kumaokobo/kudox/rev3/config.h
diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kumaokobo/kudox/rev3/info.json
similarity index 100%
rename from keyboards/kudox/rev3/info.json
rename to keyboards/kumaokobo/kudox/rev3/info.json
diff --git a/keyboards/kumaokobo/kudox/rev3/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox/rev3/keymaps/default/keymap.c
new file mode 100644
index 00000000000..bf89d895f52
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/rev3/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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.
+#define _QWERTY 0
+#define _SYMB 1
+#define _LIGHT 2
+
+// Shortcut to make keymap more readable
+#define SYM_L2  LT(_SYMB, KC_LNG2)
+#define TO_LIGH TO(_LIGHT)
+#define TO_QWER TO(_QWERTY)
+
+#define KC_ALES LALT_T(KC_ESC)
+#define KC_ALEN LALT_T(KC_ENT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     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_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_ESC  ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_UP   ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_LBRC ,KC_RBRC ,SYM_L2  ,KC_ALEN ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO_LIGH ,KC_LNG1 ,KC_LEFT, KC_DOWN ,KC_RIGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = 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_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_PIPE ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,KC_SLSH ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   KC_LCBR ,KC_RCBR ,_______ ,_______ ,KC_CIRC ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LABK ,KC_UNDS ,KC_RABK
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_LIGHT] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,                 RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,RGB_M_B ,RGB_M_SN ,RGB_M_G,XXXXXXX ,XXXXXXX ,                                   RGB_M_B ,RGB_M_SN,RGB_M_G ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,                                   RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,RGB_MOD ,RGB_TOG ,                 RGB_TOG ,RGB_MOD ,TO_QWER ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+
+};
+
+
+#ifdef RGBLIGHT_ENABLE
+void eeconfig_init_user(void) {
+    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
+};
+#endif
diff --git a/keyboards/kudox/rev3/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/rev3/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox/rev3/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox/rev3/keymaps/default/readme.md
diff --git a/keyboards/kumaokobo/kudox/rev3/keymaps/jis/keymap.c b/keyboards/kumaokobo/kudox/rev3/keymaps/jis/keymap.c
new file mode 100644
index 00000000000..f53d40063b2
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/rev3/keymaps/jis/keymap.c
@@ -0,0 +1,73 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+#include"keymap_japanese.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.
+#define _QWERTY 0
+#define _SYMB 1
+#define _LIGHT 2
+
+// Shortcut to make keymap more readable
+#define SYM_L2  LT(_SYMB, KC_LNG2)
+#define TO_LIGH TO(_LIGHT)
+#define TO_QWER TO(_QWERTY)
+
+#define KC_ALES LALT_T(KC_ESC)
+#define KC_ALEN LALT_T(KC_ENT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     JP_ZKHK ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_6    ,                 KC_7    ,KC_8    ,KC_9    ,KC_0    ,JP_MINS ,JP_CIRC ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_ESC  ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_SLSH ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,JP_SCLN ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,JP_COMM ,JP_DOT  ,KC_UP   ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,JP_YEN  ,JP_COLN ,SYM_L2  ,KC_ALEN ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO_LIGH ,KC_LNG1 ,KC_LEFT, KC_DOWN ,KC_RIGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = 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  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,JP_DQUO ,JP_QUOT ,KC_GRV  ,JP_ASTR ,JP_PLUS ,JP_EQL  ,                 JP_LPRN ,JP_RPRN ,JP_PIPE ,JP_ASTR ,JP_TILD ,JP_CIRC ,JP_PIPE ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,JP_AT   ,JP_COLN ,KC_GRV  ,JP_SLSH ,JP_MINS ,                                   JP_LBRC ,JP_RBRC ,JP_DOT  ,JP_SLSH ,JP_MINS ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   JP_LCBR ,JP_RCBR ,_______ ,_______ ,JP_CIRC ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,JP_LABK ,JP_UNDS ,JP_RABK
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_LIGHT] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,                 RGB_M_P ,RGB_M_SW ,RGB_M_X ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,RGB_M_B ,RGB_M_SN ,RGB_M_G,XXXXXXX ,XXXXXXX ,                                   RGB_M_B ,RGB_M_SN ,RGB_M_G ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,                                   RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,RGB_MOD ,RGB_TOG ,                 RGB_TOG ,RGB_MOD ,TO_QWER ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+
+};
+
+#ifdef RGBLIGHT_ENABLE
+void eeconfig_init_user(void) {
+    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
+};
+#endif
diff --git a/keyboards/kudox/rev3/keymaps/jis/readme.md b/keyboards/kumaokobo/kudox/rev3/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/kudox/rev3/keymaps/jis/readme.md
rename to keyboards/kumaokobo/kudox/rev3/keymaps/jis/readme.md
diff --git a/keyboards/kumaokobo/kudox/rev3/keymaps/via/keymap.c b/keyboards/kumaokobo/kudox/rev3/keymaps/via/keymap.c
new file mode 100644
index 00000000000..2609e877237
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/rev3/keymaps/via/keymap.c
@@ -0,0 +1,80 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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 {
+  _BASE,
+  _FN1,
+  _FN2,
+  _FN3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     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_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_ESC  ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_UP   ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_LALT ,KC_LBRC ,KC_RBRC ,MO(_FN1),KC_ENT  ,KC_LGUI ,KC_SPC  ,                 KC_SPC  ,KC_RGUI ,TO(_FN2),KC_LNG1 ,KC_LEFT, KC_DOWN ,KC_RIGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_FN1] = 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_TRNS ,KC_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_PIPE ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_AT   ,KC_COLN ,KC_GRV  ,KC_SLSH ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   KC_LCBR ,KC_RCBR ,KC_TRNS ,KC_TRNS ,KC_CIRC ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_LABK ,KC_UNDS ,KC_RABK
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_FN2] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TRNS ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,RGB_M_P ,RGB_M_SW ,RGB_M_X,XXXXXXX ,XXXXXXX ,XXXXXXX ,                 RGB_M_P ,RGB_M_SW,RGB_M_X ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,RGB_M_B ,RGB_M_SN ,RGB_M_G,XXXXXXX ,XXXXXXX ,                                   RGB_M_B ,RGB_M_SN,RGB_M_G ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,                                   RGB_M_R ,RGB_M_K ,RGB_M_T ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,RGB_MOD ,RGB_TOG ,                 RGB_TOG ,RGB_MOD ,TO(_BASE),XXXXXXX,XXXXXXX ,XXXXXXX ,XXXXXXX
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_FN3] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                                   KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                                   KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,                 KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+};
+
+
+#ifdef RGBLIGHT_ENABLE
+void eeconfig_init_user(void) {
+    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
+};
+#endif
diff --git a/keyboards/kudox/rev3/keymaps/via/readme.md b/keyboards/kumaokobo/kudox/rev3/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kudox/rev3/keymaps/via/readme.md
rename to keyboards/kumaokobo/kudox/rev3/keymaps/via/readme.md
diff --git a/keyboards/kumaokobo/kudox/rev3/keymaps/via/rules.mk b/keyboards/kumaokobo/kudox/rev3/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/rev3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/pico/65keys/rules.mk b/keyboards/kumaokobo/kudox/rev3/rules.mk
similarity index 100%
rename from keyboards/pico/65keys/rules.mk
rename to keyboards/kumaokobo/kudox/rev3/rules.mk
diff --git a/keyboards/kumaokobo/kudox/rules.mk b/keyboards/kumaokobo/kudox/rules.mk
new file mode 100644
index 00000000000..261c8e2a2b7
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/rules.mk
@@ -0,0 +1,16 @@
+# 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 = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
+
+SPLIT_KEYBOARD = yes
+
+DEFAULT_FOLDER = kumaokobo/kudox/rev3
diff --git a/keyboards/kudox_full/config.h b/keyboards/kumaokobo/kudox_full/config.h
similarity index 100%
rename from keyboards/kudox_full/config.h
rename to keyboards/kumaokobo/kudox_full/config.h
diff --git a/keyboards/kudox_full/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox_full/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kudox_full/keymaps/default/keymap.c
rename to keyboards/kumaokobo/kudox_full/keymaps/default/keymap.c
diff --git a/keyboards/kudox_full/keymaps/jis/keymap.c b/keyboards/kumaokobo/kudox_full/keymaps/jis/keymap.c
similarity index 100%
rename from keyboards/kudox_full/keymaps/jis/keymap.c
rename to keyboards/kumaokobo/kudox_full/keymaps/jis/keymap.c
diff --git a/keyboards/kudox_full/keymaps/via/keymap.c b/keyboards/kumaokobo/kudox_full/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kudox_full/keymaps/via/keymap.c
rename to keyboards/kumaokobo/kudox_full/keymaps/via/keymap.c
diff --git a/keyboards/kudox_full/keymaps/via/rules.mk b/keyboards/kumaokobo/kudox_full/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kudox_full/keymaps/via/rules.mk
rename to keyboards/kumaokobo/kudox_full/keymaps/via/rules.mk
diff --git a/keyboards/kudox_full/kudox_full.c b/keyboards/kumaokobo/kudox_full/kudox_full.c
similarity index 100%
rename from keyboards/kudox_full/kudox_full.c
rename to keyboards/kumaokobo/kudox_full/kudox_full.c
diff --git a/keyboards/kudox_full/post_config.h b/keyboards/kumaokobo/kudox_full/post_config.h
similarity index 100%
rename from keyboards/kudox_full/post_config.h
rename to keyboards/kumaokobo/kudox_full/post_config.h
diff --git a/keyboards/kumaokobo/kudox_full/readme.md b/keyboards/kumaokobo/kudox_full/readme.md
new file mode 100644
index 00000000000..c5af5d652d6
--- /dev/null
+++ b/keyboards/kumaokobo/kudox_full/readme.md
@@ -0,0 +1,32 @@
+# The Kudox Full keyboard
+
+![Kudox logo](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox.png)
+
+![Kudox Full image2](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-full-image2.jpg) | ![Kudox Full image1](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-full-image1.jpg)
+:----:|:-----:
+ front | angle
+
+- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)
+- Hardware Supported: Kudox Full PCB rev1.0 w/ Pro Micro
+- Assembly guide: [Kudox Full/README](https://github.com/kumaokobo/kudox-keyboard/blob/master/kudox-full/README.md)
+
+## 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 `QK_BOOT` if it is available
+
+## Building Firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kumaokobo/kudox_full/rev1:default
+
+
+Flashing example for this keyboard:
+
+    make kumaokobo/kudox_full/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/kudox_full/rev1/config.h b/keyboards/kumaokobo/kudox_full/rev1/config.h
similarity index 100%
rename from keyboards/kudox_full/rev1/config.h
rename to keyboards/kumaokobo/kudox_full/rev1/config.h
diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kumaokobo/kudox_full/rev1/info.json
similarity index 100%
rename from keyboards/kudox_full/rev1/info.json
rename to keyboards/kumaokobo/kudox_full/rev1/info.json
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/rules.mk b/keyboards/kumaokobo/kudox_full/rev1/rules.mk
similarity index 100%
rename from keyboards/boardsource/holiday/spooky/keymaps/rip_mx/rules.mk
rename to keyboards/kumaokobo/kudox_full/rev1/rules.mk
diff --git a/keyboards/kumaokobo/kudox_full/rules.mk b/keyboards/kumaokobo/kudox_full/rules.mk
new file mode 100644
index 00000000000..06453b2337a
--- /dev/null
+++ b/keyboards/kumaokobo/kudox_full/rules.mk
@@ -0,0 +1,18 @@
+# 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
+UNICODE_ENABLE = yes        # Unicode
+LTO_ENABLE = yes
+
+SPLIT_KEYBOARD = yes
+
+DEFAULT_FOLDER = kumaokobo/kudox_full/rev1
diff --git a/keyboards/kudox_game/config.h b/keyboards/kumaokobo/kudox_game/config.h
similarity index 100%
rename from keyboards/kudox_game/config.h
rename to keyboards/kumaokobo/kudox_game/config.h
diff --git a/keyboards/kudox_game/info.json b/keyboards/kumaokobo/kudox_game/info.json
similarity index 100%
rename from keyboards/kudox_game/info.json
rename to keyboards/kumaokobo/kudox_game/info.json
diff --git a/keyboards/kumaokobo/kudox_game/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox_game/keymaps/default/keymap.c
new file mode 100644
index 00000000000..99e664138f6
--- /dev/null
+++ b/keyboards/kumaokobo/kudox_game/keymaps/default/keymap.c
@@ -0,0 +1,74 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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.
+#define _QWERTY 0
+#define _SYMB 1
+#define _LIGHT 2
+
+// Shortcut to make keymap more readable
+#define SYM_L   MO(_SYMB)
+#define KC_ALEN LALT_T(KC_ENT)
+#define ES_LIGH LT(_LIGHT, KC_ESC)
+
+#define CT_COPY   LCTL(KC_C)
+#define CT_PASTE  LCTL(KC_V)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐
+     ES_LIGH ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,
+  //└────────┼────────┼────────┼────────┼────────┼────────┤
+              KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,
+  //┌────────┼────────┼────────┼────────┼────────┼────────┼────────┐
+     CT_COPY ,CT_PASTE,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐
+     KC_LSFT ,KC_Z                      ,KC_X    ,KC_C    ,KC_V    ,
+  //├────────┼────────┘                 └────────┴────────┼────────┼────────┐
+     KC_LCTL                                              ,SYM_L   ,KC_SPC
+  //└────────┘                                            └────────┴────────┘
+  ),
+
+  [_SYMB] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,
+  //└────────┼────────┼────────┼────────┼────────┼────────┤
+              KC_GRV   ,KC_UP   ,KC_PIPE ,KC_LCBR ,KC_RCBR ,
+  //┌────────┼────────┼────────┼────────┼────────┼────────┼────────┐
+     _______ ,_______ ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_LBRC ,KC_RBRC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐
+     _______ ,KC_BSPC                   ,KC_DEL  ,KC_LPRN ,KC_RPRN ,
+  //├────────┼────────┘                 └────────┴────────┼────────┼────────┐
+     _______                                              ,_______ ,_______
+  //└────────┘                                            └────────┴────────┘
+  ),
+
+  [_LIGHT] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,
+  //└────────┼────────┼────────┼────────┼────────┼────────┤
+              RGB_M_P ,RGB_M_SW,RGB_M_X ,RGB_M_B ,RGB_VAD ,
+  //┌────────┼────────┼────────┼────────┼────────┼────────┼────────┐
+     _______ ,_______ ,RGB_M_SN,RGB_M_G ,RGB_M_R ,RGB_M_K ,RGB_M_T ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐
+     _______ ,RGB_M_T                   ,XXXXXXX ,RGB_VAI ,RGB_VAD ,
+  //├────────┼────────┘                 └────────┴────────┼────────┼────────┐
+     _______                                              ,RGB_MOD ,RGB_TOG
+  //└────────┘                                            └────────┴────────┘
+  )
+
+};
+
+// Runs just one time when the keyboard initializes.
+#ifdef RGBLIGHT_ENABLE
+void eeconfig_init_user(void) {
+    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
+};
+#endif
diff --git a/keyboards/kudox_game/keymaps/default/readme.md b/keyboards/kumaokobo/kudox_game/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox_game/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox_game/keymaps/default/readme.md
diff --git a/keyboards/kumaokobo/kudox_game/keymaps/via/keymap.c b/keyboards/kumaokobo/kudox_game/keymaps/via/keymap.c
new file mode 100644
index 00000000000..b0722bf470e
--- /dev/null
+++ b/keyboards/kumaokobo/kudox_game/keymaps/via/keymap.c
@@ -0,0 +1,81 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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 {
+  _BASE,
+  _FN1,
+  _FN2,
+  _FN3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT(
+  //┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
+     KC_ESC    ,KC_1      ,KC_2      ,KC_3      ,KC_4      ,KC_5      ,
+  //└──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
+                KC_Q      ,KC_W      ,KC_E      ,KC_R      ,KC_T      ,
+  //┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐
+     LCTL(KC_C),LCTL(KC_V),KC_A      ,KC_S      ,KC_D      ,KC_F      ,KC_G      ,
+  //├──────────┼──────────┼──────────┴──────────┼──────────┼──────────┼──────────┤
+     KC_LSFT   ,KC_Z                            ,KC_X      ,KC_C      ,KC_V      ,
+  //├──────────┼──────────┘                     └──────────┴──────────┼──────────┼──────────┐
+     KC_LCTL                                                          ,TO(_FN1)  ,KC_SPC
+  //└──────────┘                                                      └──────────┴──────────┘
+  ),
+
+  [_FN1] = LAYOUT(
+  //┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
+     KC_TRNS   ,KC_6      ,KC_7      ,KC_8      ,KC_9      ,KC_0      ,
+  //└──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
+                KC_GRV    ,KC_UP     ,KC_PIPE   ,KC_LCBR   ,KC_RCBR   ,
+  //┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐
+     KC_TRNS   ,KC_TRNS   ,KC_LEFT   ,KC_DOWN   ,KC_RIGHT  ,KC_LBRC   ,KC_RBRC   ,
+  //├──────────┼──────────┼──────────┴──────────┼──────────┼──────────┼──────────┤
+     KC_TRNS   ,KC_BSPC                         ,KC_DEL    ,KC_LPRN   ,KC_RPRN   ,
+  //├──────────┼──────────┘                     └──────────┴──────────┼──────────┼──────────┐
+     TO(_FN2)                                                         ,TO(_BASE) ,KC_TRNS
+  //└──────────┘                                                      └──────────┴──────────┘
+  ),
+
+  [_FN2] = LAYOUT(
+  //┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
+     KC_TRNS   ,RGB_HUI   ,RGB_HUD   ,RGB_SAI   ,RGB_SAD   ,RGB_VAI   ,
+  //└──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
+                RGB_M_P   ,RGB_M_SW  ,RGB_M_X   ,RGB_M_B   ,RGB_VAD   ,
+  //┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐
+     KC_TRNS   ,KC_TRNS   ,RGB_M_SN  ,RGB_M_G   ,RGB_M_R   ,RGB_M_K   ,RGB_M_T   ,
+  //├──────────┼──────────┼──────────┴──────────┼──────────┼──────────┼──────────┤
+     KC_TRNS   ,RGB_M_T                         ,KC_DEL    ,RGB_VAI   ,RGB_VAD   ,
+  //├──────────┼──────────┘                     └──────────┴──────────┼──────────┼──────────┐
+     TO(_FN1)                                                         ,RGB_MOD   ,RGB_TOG
+  //└──────────┘                                                      └──────────┴──────────┘
+  ),
+
+
+  [_FN3] = LAYOUT(
+  //┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
+     KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,
+  //└──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
+                KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,
+  //┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐
+     KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,
+  //├──────────┼──────────┼──────────┴──────────┼──────────┼──────────┼──────────┤
+     KC_TRNS   ,KC_TRNS                         ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,
+  //├──────────┼──────────┘                     └──────────┴──────────┼──────────┼──────────┐
+     KC_TRNS                                                          ,KC_TRNS   ,KC_TRNS
+  //└──────────┘                                                      └──────────┴──────────┘
+  )
+};
+
+
+#ifdef RGBLIGHT_ENABLE
+void eeconfig_init_user(void) {
+    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
+};
+#endif
diff --git a/keyboards/kudox_game/keymaps/via/readme.md b/keyboards/kumaokobo/kudox_game/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kudox_game/keymaps/via/readme.md
rename to keyboards/kumaokobo/kudox_game/keymaps/via/readme.md
diff --git a/keyboards/kumaokobo/kudox_game/keymaps/via/rules.mk b/keyboards/kumaokobo/kudox_game/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/kumaokobo/kudox_game/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kumaokobo/kudox_game/readme.md b/keyboards/kumaokobo/kudox_game/readme.md
new file mode 100644
index 00000000000..6e06be159c7
--- /dev/null
+++ b/keyboards/kumaokobo/kudox_game/readme.md
@@ -0,0 +1,26 @@
+# The Kudox Game keyboard
+
+<p align="center">
+<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox.png" alt="Kudox logo" width="600"/>
+</p>
+
+<p align="center">
+<img src="https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-game-pcb.jpg" alt="Kudox Game PCB rev1.0" width="600"/>
+</p>
+
+- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)  
+- Hardware Supported: Kudox Game PCB rev1.0 rev2.0 w/ Pro Micro  
+
+Make example for this keyboard (after setting up your build environment):
+
+```sh
+make kumaokobo/kudox_game/rev2:default
+```
+
+Example of flashing this keyboard:
+
+```sh
+make kumaokobo/kudox_game/rev2:default:avrdude
+```
+
+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/kudox_game/rev1/config.h b/keyboards/kumaokobo/kudox_game/rev1/config.h
similarity index 100%
rename from keyboards/kudox_game/rev1/config.h
rename to keyboards/kumaokobo/kudox_game/rev1/config.h
diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kumaokobo/kudox_game/rev1/info.json
similarity index 100%
rename from keyboards/kudox_game/rev1/info.json
rename to keyboards/kumaokobo/kudox_game/rev1/info.json
diff --git a/keyboards/pico/70keys/rules.mk b/keyboards/kumaokobo/kudox_game/rev1/rules.mk
similarity index 100%
rename from keyboards/pico/70keys/rules.mk
rename to keyboards/kumaokobo/kudox_game/rev1/rules.mk
diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kumaokobo/kudox_game/rev2/config.h
similarity index 100%
rename from keyboards/kudox_game/rev2/config.h
rename to keyboards/kumaokobo/kudox_game/rev2/config.h
diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kumaokobo/kudox_game/rev2/info.json
similarity index 100%
rename from keyboards/kudox_game/rev2/info.json
rename to keyboards/kumaokobo/kudox_game/rev2/info.json
diff --git a/keyboards/avalanche/v4/keymaps/winder/rules.mk b/keyboards/kumaokobo/kudox_game/rev2/rules.mk
similarity index 100%
rename from keyboards/avalanche/v4/keymaps/winder/rules.mk
rename to keyboards/kumaokobo/kudox_game/rev2/rules.mk
diff --git a/keyboards/kumaokobo/kudox_game/rules.mk b/keyboards/kumaokobo/kudox_game/rules.mk
new file mode 100644
index 00000000000..569f262b383
--- /dev/null
+++ b/keyboards/kumaokobo/kudox_game/rules.mk
@@ -0,0 +1,14 @@
+# 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 = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
+
+DEFAULT_FOLDER = kumaokobo/kudox_game/rev2
diff --git a/keyboards/pico/65keys/config.h b/keyboards/kumaokobo/pico/65keys/config.h
similarity index 100%
rename from keyboards/pico/65keys/config.h
rename to keyboards/kumaokobo/pico/65keys/config.h
diff --git a/keyboards/pico/65keys/info.json b/keyboards/kumaokobo/pico/65keys/info.json
similarity index 100%
rename from keyboards/pico/65keys/info.json
rename to keyboards/kumaokobo/pico/65keys/info.json
diff --git a/keyboards/kumaokobo/pico/65keys/keymaps/default/keymap.c b/keyboards/kumaokobo/pico/65keys/keymaps/default/keymap.c
new file mode 100644
index 00000000000..15e0ff31684
--- /dev/null
+++ b/keyboards/kumaokobo/pico/65keys/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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.
+#define _QWERTY 0
+#define _SYMB 1
+
+// Shortcut to make keymap more readable
+#define SYM_L    MO(_SYMB)
+#define KC_ALES  LALT_T(KC_ESC)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     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_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_LBRC ,KC_RBRC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                 KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_QUOT ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                 KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_UP   ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_ENT  ,KC_DEL  ,KC_LGUI ,KC_L2SYM,KC_SPC  ,                 KC_SPC  ,KC_L1SYM,KC_RGUI ,KC_DEL  ,KC_LEFT ,KC_DOWN ,KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = 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_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_INT3 ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_GRV ,KC_MINS  ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LCBR ,KC_RCBR ,_______ ,_______ ,_______ ,KC_CIRC ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_GT
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+
+};
diff --git a/keyboards/pico/65keys/keymaps/default/readme.md b/keyboards/kumaokobo/pico/65keys/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pico/65keys/keymaps/default/readme.md
rename to keyboards/kumaokobo/pico/65keys/keymaps/default/readme.md
diff --git a/keyboards/kumaokobo/pico/65keys/keymaps/jis/keymap.c b/keyboards/kumaokobo/pico/65keys/keymaps/jis/keymap.c
new file mode 100644
index 00000000000..94767aef903
--- /dev/null
+++ b/keyboards/kumaokobo/pico/65keys/keymaps/jis/keymap.c
@@ -0,0 +1,50 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+#include"keymap_japanese.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.
+#define _QWERTY 0
+#define _SYMB 1
+
+// Shortcut to make keymap more readable
+#define SYM_L    MO(_SYMB)
+#define KC_ALES  LALT_T(KC_ESC)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
+
+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    ,KC_MINS ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     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_CIRC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                 KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,JP_COLN ,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_UP   ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_ENT  ,KC_DEL  ,KC_LGUI ,KC_L2SYM,KC_SPC  ,                 KC_SPC  ,KC_L1SYM,KC_RGUI ,KC_DEL  ,KC_LEFT ,KC_DOWN ,KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = 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_LPRN ,KC_RPRN ,KC_PIPE ,JP_YEN  ,JP_TILD ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,JP_GRV  ,KC_MINS ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LCBR ,KC_RCBR ,_______ ,_______ ,_______ ,JP_UNDS ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LT   ,_______ ,KC_GT
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+
+};
diff --git a/keyboards/pico/65keys/keymaps/jis/readme.md b/keyboards/kumaokobo/pico/65keys/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/pico/65keys/keymaps/jis/readme.md
rename to keyboards/kumaokobo/pico/65keys/keymaps/jis/readme.md
diff --git a/keyboards/planck/keymaps/mitch/rules.mk b/keyboards/kumaokobo/pico/65keys/rules.mk
similarity index 100%
rename from keyboards/planck/keymaps/mitch/rules.mk
rename to keyboards/kumaokobo/pico/65keys/rules.mk
diff --git a/keyboards/pico/70keys/config.h b/keyboards/kumaokobo/pico/70keys/config.h
similarity index 100%
rename from keyboards/pico/70keys/config.h
rename to keyboards/kumaokobo/pico/70keys/config.h
diff --git a/keyboards/pico/70keys/info.json b/keyboards/kumaokobo/pico/70keys/info.json
similarity index 100%
rename from keyboards/pico/70keys/info.json
rename to keyboards/kumaokobo/pico/70keys/info.json
diff --git a/keyboards/kumaokobo/pico/70keys/keymaps/default/keymap.c b/keyboards/kumaokobo/pico/70keys/keymaps/default/keymap.c
new file mode 100644
index 00000000000..fa14063d4b3
--- /dev/null
+++ b/keyboards/kumaokobo/pico/70keys/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#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.
+#define _QWERTY 0
+#define _SYMB 1
+
+// Shortcut to make keymap more readable
+#define SYM_L    MO(_SYMB)
+#define KC_ALES  LALT_T(KC_ESC)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     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_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_LBRC ,KC_RBRC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_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_LSFT ,KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                 KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_UP   ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_ALES ,KC_ENT  ,KC_DEL  ,KC_LGUI ,KC_L2SYM,KC_SPC  ,                 KC_SPC  ,KC_L1SYM,KC_RGUI ,KC_DEL  ,KC_LEFT ,KC_DOWN ,KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = 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_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_INT3 ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_GRV ,KC_MINS  ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LCBR ,KC_RCBR ,_______ ,_______ ,_______ ,KC_CIRC ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_GT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+
+};
diff --git a/keyboards/pico/70keys/keymaps/default/readme.md b/keyboards/kumaokobo/pico/70keys/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pico/70keys/keymaps/default/readme.md
rename to keyboards/kumaokobo/pico/70keys/keymaps/default/readme.md
diff --git a/keyboards/kumaokobo/pico/70keys/keymaps/jis/keymap.c b/keyboards/kumaokobo/pico/70keys/keymaps/jis/keymap.c
new file mode 100644
index 00000000000..2d9414cced7
--- /dev/null
+++ b/keyboards/kumaokobo/pico/70keys/keymaps/jis/keymap.c
@@ -0,0 +1,50 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+#include"keymap_japanese.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.
+#define _QWERTY 0
+#define _SYMB 1
+
+// Shortcut to make keymap more readable
+#define SYM_L    MO(_SYMB)
+#define KC_ALES  LALT_T(KC_ESC)
+#define KC_L1SYM LT(_SYMB, KC_LNG1)
+#define KC_L2SYM LT(_SYMB, KC_LNG2)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_GRV  ,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_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,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_CIRC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                 KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,JP_COLN ,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_UP   ,KC_RSFT ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     KC_ALES ,KC_ALES ,KC_ENT  ,KC_DEL  ,KC_LGUI ,KC_L2SYM,KC_SPC  ,                 KC_SPC  ,KC_L1SYM,KC_RGUI ,KC_DEL  ,KC_LEFT ,KC_DOWN ,KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = 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_LPRN ,KC_RPRN ,KC_PIPE ,JP_YEN  ,JP_TILD ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,JP_GRV  ,KC_MINS ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LCBR ,KC_RCBR ,_______ ,_______ ,_______ ,JP_UNDS ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LT   ,_______ ,KC_GT
+  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  )
+
+};
diff --git a/keyboards/pico/70keys/keymaps/jis/readme.md b/keyboards/kumaokobo/pico/70keys/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/pico/70keys/keymaps/jis/readme.md
rename to keyboards/kumaokobo/pico/70keys/keymaps/jis/readme.md
diff --git a/keyboards/raindrop/rules.mk b/keyboards/kumaokobo/pico/70keys/rules.mk
similarity index 100%
rename from keyboards/raindrop/rules.mk
rename to keyboards/kumaokobo/pico/70keys/rules.mk
diff --git a/keyboards/pico/config.h b/keyboards/kumaokobo/pico/config.h
similarity index 100%
rename from keyboards/pico/config.h
rename to keyboards/kumaokobo/pico/config.h
diff --git a/keyboards/kumaokobo/pico/readme.md b/keyboards/kumaokobo/pico/readme.md
new file mode 100644
index 00000000000..b54c42941e9
--- /dev/null
+++ b/keyboards/kumaokobo/pico/readme.md
@@ -0,0 +1,24 @@
+# Pico keyboard
+
+A split keyboard kit designed for small hands.  
+Pico adopted the footprint for [Kailh Mid-Height](http://www.kailh.com/en/Products/Ks/KHS/) smaller than Cherry MX compatible switches.  
+
+* Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)
+* Hardware Supported: Pico PCB rev1.0 w/ Pro Micro
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kumaokobo/pico/65keys:default
+
+## 65 keys
+<p align="center">
+  <img src="https://raw.githubusercontent.com/kumaokobo/pico-keyboard/master/img/pico-keyboard.jpg" alt="Pico Keyboard 65 keys" width="600"/>
+</p>
+
+## 70 keys
+<p align="center">
+  <img src="https://raw.githubusercontent.com/kumaokobo/pico-keyboard/master/img/pico-keyboard2.jpg" alt="Pico Keyboard 70 keys" width="600"/>
+</p>
+
+
+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/kumaokobo/pico/rules.mk b/keyboards/kumaokobo/pico/rules.mk
new file mode 100644
index 00000000000..11fe77d618d
--- /dev/null
+++ b/keyboards/kumaokobo/pico/rules.mk
@@ -0,0 +1,16 @@
+# 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 = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
+
+SPLIT_KEYBOARD = yes
+
+DEFAULT_FOLDER = kumaokobo/pico/65keys
diff --git a/keyboards/kuro/kuro65/config.h b/keyboards/kuro/kuro65/config.h
index f782e9069b9..6e256f7b2e9 100644
--- a/keyboards/kuro/kuro65/config.h
+++ b/keyboards/kuro/kuro65/config.h
@@ -16,65 +16,4 @@
 
 #pragma once
 
-
-/* RGB Matrix defines*/
-#ifdef RGB_MATRIX_ENABLE
-// The number of LEDs connected
-#    define RGB_MATRIX_LED_COUNT 69
-
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define USB_SUSPEND_WAKEUP_DELAY 5000
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#endif
+#define USB_SUSPEND_WAKEUP_DELAY 5000
diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json
index c91a34f55c8..fc89b989d3e 100644
--- a/keyboards/kuro/kuro65/info.json
+++ b/keyboards/kuro/kuro65/info.json
@@ -115,6 +115,54 @@
         }
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64},
@@ -186,6 +234,9 @@
             {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0},
             {"flags": 4, "matrix": [0, 14], "x": 203, "y": 0},
             {"flags": 4, "matrix": [0, 15], "x": 224, "y": 0}
-        ]
+        ],
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     }
 }
diff --git a/keyboards/kuro/kuro65/keymaps/0x544d/keymap.c b/keyboards/kuro/kuro65/keymaps/0x544d/keymap.c
deleted file mode 100644
index bc7986f5578..00000000000
--- a/keyboards/kuro/kuro65/keymaps/0x544d/keymap.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright 2023 Tobias Minn (0x544D)
-  *
-  * 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 {
-    BL_WIN,
-    BL_MAC,
-    FN1,
-    FN2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-   /* ISO 65 layout by 0x544D (ISO German keyboard layout shown)
-   *
-   * ,-----------------------------------------------------------------------------------------------.
-   * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace | Del |
-   * |-----------------------------------------------------------------------------------------------|
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Z  |  U  |  I  |  O  |  P  |  Ü  | + * | Enter  | PgU |
-   * |----------------------------------------------------------------------------------       |-----|
-   * | MO(2)   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ä  | # ' |       | PgD |
-   * |-----------------------------------------------------------------------------------------------|
-   * | Shift | < > |  Y  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | . : | - _ |  Shift  |  Up | Del |
-   * |-----------------------------------------------------------------------------------------------|
-   * | LCtl  | LGUI  | LAlt  |            Space                  |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh |
-   * `-----------------------------------------------------------------------------------------------'
-   */
-    [BL_WIN] = 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_PGUP,
-        MO(3),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS, KC_ENT,  KC_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_DEL,  
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(2),   KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [BL_MAC] = 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_PGUP,
-        MO(3),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS, KC_ENT,  KC_PGDN,
-        KC_LSFT, KC_GRV,  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_DEL,  
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(2),   KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-   /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys,
-   *                   RGB matrix control
-   * ,-----------------------------------------------------------------------------------------------.
-   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |Home |
-   * |-----------------------------------------------------------------------------------------------|
-   * |        |RGB_T|RGB+ |RGB- |HUE+ |HUE- |SAT+ |SAT- |BGH+ |BGH- |     |     |     |        |Home |
-   * |----------------------------------------------------------------------------------       |-----|
-   * |         |     |     |     |     |     |     |     |     |     |     |     |     |       | End |
-   * |-----------------------------------------------------------------------------------------------|
-   * |       |     |     |     |     |     |     |     |     |     |     |     |  MPlay  |Vol_U| End |
-   * |-----------------------------------------------------------------------------------------------|
-   * |       |       |       |                                   |     |Trans|     | MPrv|Vol_D| MNxt|
-   * `-----------------------------------------------------------------------------------------------'
-   */
-    [FN1] = 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_NO,   RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO,   KC_NO,    KC_NO,            KC_HOME,
-        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_END,
-        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_MPLY, KC_VOLU, KC_END,
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_TRNS, KC_NO,    KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-
-
-   /* Funtion Layer 2: Media Controls left hand, F keys, Page up/down, Home/end, Program/RESET
-   * ,-----------------------------------------------------------------------------------------------.
-   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |Home |
-   * |-----------------------------------------------------------------------------------------------|
-   * |        |     |Vol_D|Vol_U|     |     |     |     |     |     |RESET|     |     |        |Home |
-   * |----------------------------------------------------------------------------------       |-----|
-   * |  Trans  |MPrv |MPlay| MNxt|     |     |     |     |     |     |     |     |     |       | End |
-   * |-----------------------------------------------------------------------------------------------|
-   * |       |     |     |     |     |     |     |     |TG(1)|     |     |     |         |PGUP | End |
-   * |-----------------------------------------------------------------------------------------------|
-   * |       |       |       |                                   |     |     |     | Home|PGDN | End |
-   * `-----------------------------------------------------------------------------------------------'
-   */
-    [FN2] = 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_NO,   KC_NO,   KC_VOLD, KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT, KC_NO,    KC_NO,            KC_HOME,
-        KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_END,
-        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   TG(1),   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_PGUP, KC_END,
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_NO,   KC_NO,    KC_HOME, KC_PGDN, KC_END
-    )
-
-};
\ No newline at end of file
diff --git a/keyboards/kuro/kuro65/keymaps/0x544d/rules.mk b/keyboards/kuro/kuro65/keymaps/0x544d/rules.mk
deleted file mode 100644
index 1821917788e..00000000000
--- a/keyboards/kuro/kuro65/keymaps/0x544d/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes            # enable VIA support
\ No newline at end of file
diff --git a/keyboards/kwstudio/scorpio/info.json b/keyboards/kwstudio/scorpio/info.json
new file mode 100644
index 00000000000..82262afb1be
--- /dev/null
+++ b/keyboards/kwstudio/scorpio/info.json
@@ -0,0 +1,199 @@
+{
+    "manufacturer": "kwstudio",
+    "keyboard_name": "Scorpio",
+    "maintainer": "kwstudio",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "GP24"
+    },
+    "matrix_pins": {
+        "cols": ["GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP7", "GP6", "GP5", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8"],
+        "rows": ["GP1", "GP0", "GP16", "GP15", "GP14"]
+    },
+    "processor": "RP2040",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 9,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0002",
+        "vid": "0x4B53"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP4"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_tsangan_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/kwstudio/scorpio/keymaps/default/keymap.c b/keyboards/kwstudio/scorpio/keymaps/default/keymap.c
new file mode 100644
index 00000000000..8061c493502
--- /dev/null
+++ b/keyboards/kwstudio/scorpio/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2023 kwstudio
+ *
+ * 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(
+    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_SPC, 
+    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,    MO(1), 
+    KC_LCTL,            KC_LALT,                      KC_SPC,                                          KC_RALT,                        KC_LEFT,   KC_DOWN,  KC_RGHT),
+	
+[1] = LAYOUT_all(
+    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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,             KC_TRNS, 
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,                       KC_TRNS, 
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   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/kwstudio/scorpio/keymaps/via/keymap.c b/keyboards/kwstudio/scorpio/keymaps/via/keymap.c
new file mode 100644
index 00000000000..8061c493502
--- /dev/null
+++ b/keyboards/kwstudio/scorpio/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2023 kwstudio
+ *
+ * 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(
+    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_SPC, 
+    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,    MO(1), 
+    KC_LCTL,            KC_LALT,                      KC_SPC,                                          KC_RALT,                        KC_LEFT,   KC_DOWN,  KC_RGHT),
+	
+[1] = LAYOUT_all(
+    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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,             KC_TRNS, 
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,                       KC_TRNS, 
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   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/kwstudio/scorpio/keymaps/via/rules.mk b/keyboards/kwstudio/scorpio/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/kwstudio/scorpio/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kwstudio/scorpio/readme.md b/keyboards/kwstudio/scorpio/readme.md
new file mode 100644
index 00000000000..fcaea8cf919
--- /dev/null
+++ b/keyboards/kwstudio/scorpio/readme.md
@@ -0,0 +1,25 @@
+# Scorpio
+
+![Scorpio](https://i.imgur.com/ikAlEQMh.jpeg)
+
+* Keyboard Maintainer: [khchen](https://github.com/khchen2004)
+* Hardware Supported: Scorpio PCB
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kwstudio/scorpio:default
+
+Flashing example for this keyboard:
+
+    make kwstudio/scorpio: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 `QK_BOOT` if it is available
diff --git a/keyboards/kwstudio/scorpio/rules.mk b/keyboards/kwstudio/scorpio/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kwstudio/scorpio/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kwstudio/scorpio_rev2/config.h b/keyboards/kwstudio/scorpio_rev2/config.h
new file mode 100644
index 00000000000..4b98552f429
--- /dev/null
+++ b/keyboards/kwstudio/scorpio_rev2/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2024 kwstudio
+ *
+ * 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 WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_DMA_CHANNEL 5
diff --git a/keyboards/kwstudio/scorpio_rev2/halconf.h b/keyboards/kwstudio/scorpio_rev2/halconf.h
new file mode 100644
index 00000000000..7212bdf2f69
--- /dev/null
+++ b/keyboards/kwstudio/scorpio_rev2/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2024 kwstudio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM    TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/kwstudio/scorpio_rev2/info.json b/keyboards/kwstudio/scorpio_rev2/info.json
new file mode 100644
index 00000000000..d1b41b1d4ff
--- /dev/null
+++ b/keyboards/kwstudio/scorpio_rev2/info.json
@@ -0,0 +1,201 @@
+{
+    "manufacturer": "kwstudio",
+    "keyboard_name": "Scorpio Rev2",
+    "maintainer": "kwstudio",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["A4", "A2", "A5", "A6", "A7", "A3", "B10", "B13", "B3", "B4", "B9", "B8", "B5", "B7", "B6"],
+        "rows": ["B11", "B0", "B14", "B12", "A1"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "brightness_steps": 10,
+        "default": {
+            "animation": "rainbow_swirl"
+        },
+        "layers": {
+            "enabled": true
+        },
+        "led_count": 9,
+        "saturation_steps": 8
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0003",
+        "vid": "0x4B53"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B15"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kwstudio/scorpio_rev2/keymaps/default/keymap.c b/keyboards/kwstudio/scorpio_rev2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..32da3bfa7bb
--- /dev/null
+++ b/keyboards/kwstudio/scorpio_rev2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2024 kwstudio
+ *
+ * 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_blocker_tsangan_wkl_split_bs(
+    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_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,     MO(1), 
+    KC_LCTL,  KC_LALT,                                KC_SPC,                                          KC_RALT,   KC_LEFT,             KC_DOWN,   KC_RGHT),
+	
+[1] = LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs(
+    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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS, 
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,             KC_TRNS, 
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   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/kwstudio/scorpio_rev2/keymaps/via/keymap.c b/keyboards/kwstudio/scorpio_rev2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..32da3bfa7bb
--- /dev/null
+++ b/keyboards/kwstudio/scorpio_rev2/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2024 kwstudio
+ *
+ * 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_blocker_tsangan_wkl_split_bs(
+    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_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,     MO(1), 
+    KC_LCTL,  KC_LALT,                                KC_SPC,                                          KC_RALT,   KC_LEFT,             KC_DOWN,   KC_RGHT),
+	
+[1] = LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs(
+    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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS, 
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,             KC_TRNS, 
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   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/kwstudio/scorpio_rev2/keymaps/via/rules.mk b/keyboards/kwstudio/scorpio_rev2/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/kwstudio/scorpio_rev2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kwstudio/scorpio_rev2/mcuconf.h b/keyboards/kwstudio/scorpio_rev2/mcuconf.h
new file mode 100644
index 00000000000..c3712e0ed47
--- /dev/null
+++ b/keyboards/kwstudio/scorpio_rev2/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2024 kwstudio
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/kwstudio/scorpio_rev2/readme.md b/keyboards/kwstudio/scorpio_rev2/readme.md
new file mode 100644
index 00000000000..aa404d671bb
--- /dev/null
+++ b/keyboards/kwstudio/scorpio_rev2/readme.md
@@ -0,0 +1,27 @@
+# Scorpio Rev2
+
+![Scorpio Rev2](https://i.imgur.com/pfSLX67h.jpeg)
+
+This keyboard use 8MHz HSE and STM32F103 as MCU.
+
+* Keyboard Maintainer: https://github.com/khchen2004
+* Hardware Supported: Scorpio Rev2 PCB
+* Hardware Availibility: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make kwstudio/scorpio_rev2:default
+    
+Flashing example for this keyboard:
+
+    make kwstudio/scorpio_rev2: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/kwstudio/scorpio_rev2/rules.mk b/keyboards/kwstudio/scorpio_rev2/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kwstudio/scorpio_rev2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kwub/bloop/keymaps/crispyy/keymap.c b/keyboards/kwub/bloop/keymaps/crispyy/keymap.c
deleted file mode 100644
index 1b4f2a3ab40..00000000000
--- a/keyboards/kwub/bloop/keymaps/crispyy/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Kwabena Aduse-Poku (Kwub)
- *
- * 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 keyboard_layers {
-    _BL = 0,  // Base layer
-    _FL,      // Function
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // clang-format off
-    [_BL]= LAYOUT_625_split_bs(
-        QK_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_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_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_VOLU,
-        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_VOLD,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(_FL), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [_FL]= LAYOUT_625_split_bs(
-        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_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_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_VOLU,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT)
-};
diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h
index 0a7038363d9..087f4d76758 100644
--- a/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h
+++ b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h
@@ -18,7 +18,7 @@
 // ws2812 options
 #define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
 
-#define RGBLED_NUM 4 // number of LEDs
+#define RGBLIGHT_LED_COUNT 4 // number of LEDs
 #define RGBLIGHT_DEFAULT_MODE 6 // set the rainbow mode
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
index a06078bce13..3aa0db7e381 100644
--- a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
+++ b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
@@ -17,8 +17,8 @@
 
 // ws2812 options
 #define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
-#define RGBLED_NUM 4 // number of LEDs
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGBLIGHT_LED_COUNT 4 // number of LEDs
+#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT
 
 #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/lpad/config.h b/keyboards/laneware/lpad/config.h
similarity index 100%
rename from keyboards/lpad/config.h
rename to keyboards/laneware/lpad/config.h
diff --git a/keyboards/lpad/info.json b/keyboards/laneware/lpad/info.json
similarity index 100%
rename from keyboards/lpad/info.json
rename to keyboards/laneware/lpad/info.json
diff --git a/keyboards/lpad/keymaps/default/keymap.c b/keyboards/laneware/lpad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lpad/keymaps/default/keymap.c
rename to keyboards/laneware/lpad/keymaps/default/keymap.c
diff --git a/keyboards/lpad/keymaps/via/keymap.c b/keyboards/laneware/lpad/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/lpad/keymaps/via/keymap.c
rename to keyboards/laneware/lpad/keymaps/via/keymap.c
diff --git a/keyboards/laneware/lpad/keymaps/via/rules.mk b/keyboards/laneware/lpad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/laneware/lpad/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/laneware/lpad/readme.md b/keyboards/laneware/lpad/readme.md
new file mode 100644
index 00000000000..2a2e8b56722
--- /dev/null
+++ b/keyboards/laneware/lpad/readme.md
@@ -0,0 +1,27 @@
+# LPAD
+
+![LPAD](https://i.imgur.com/bQgqZC6h.jpg)
+
+A Macro Keyboard with a RHS rotary encoder, made and sold by Laneware Peripherals.
+
+* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
+* Hardware Supported: LPAD
+* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make laneware/lpad:default
+
+Flashing example for this keyboard:
+
+    make laneware/lpad: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:
+
+* **Bootmagic reset**: Hold down the Top Left Switch and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/lpad/rules.mk b/keyboards/laneware/lpad/rules.mk
similarity index 100%
rename from keyboards/lpad/rules.mk
rename to keyboards/laneware/lpad/rules.mk
diff --git a/keyboards/lw67/config.h b/keyboards/laneware/lw67/config.h
similarity index 100%
rename from keyboards/lw67/config.h
rename to keyboards/laneware/lw67/config.h
diff --git a/keyboards/lw67/info.json b/keyboards/laneware/lw67/info.json
similarity index 100%
rename from keyboards/lw67/info.json
rename to keyboards/laneware/lw67/info.json
diff --git a/keyboards/lw67/keymaps/ansi_split_backspace/keymap.c b/keyboards/laneware/lw67/keymaps/ansi_split_backspace/keymap.c
similarity index 100%
rename from keyboards/lw67/keymaps/ansi_split_backspace/keymap.c
rename to keyboards/laneware/lw67/keymaps/ansi_split_backspace/keymap.c
diff --git a/keyboards/laneware/lw67/keymaps/default/keymap.c b/keyboards/laneware/lw67/keymaps/default/keymap.c
new file mode 100644
index 00000000000..97e947fb015
--- /dev/null
+++ b/keyboards/laneware/lw67/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = 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, KC_MPLY, 
+		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_DEL,   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, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_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_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_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_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/laneware/lw67/keymaps/iso/keymap.c b/keyboards/laneware/lw67/keymaps/iso/keymap.c
new file mode 100644
index 00000000000..8e268438682
--- /dev/null
+++ b/keyboards/laneware/lw67/keymaps/iso/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = 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, KC_MPLY, 
+		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_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_DEL,   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, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_iso(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_iso(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/lw67/keymaps/iso_split_backspace/keymap.c b/keyboards/laneware/lw67/keymaps/iso_split_backspace/keymap.c
similarity index 100%
rename from keyboards/lw67/keymaps/iso_split_backspace/keymap.c
rename to keyboards/laneware/lw67/keymaps/iso_split_backspace/keymap.c
diff --git a/keyboards/laneware/lw67/keymaps/via/keymap.c b/keyboards/laneware/lw67/keymaps/via/keymap.c
new file mode 100644
index 00000000000..73d2640f17c
--- /dev/null
+++ b/keyboards/laneware/lw67/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_iso_splitbs(
+		KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_GRAVE,  KC_BSPC, KC_MPLY, 
+		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_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_DEL,   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, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_iso_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_iso_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_iso_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/sawnsprojects/krush/krush65/solder/keymaps/sawns/rules.mk b/keyboards/laneware/lw67/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/sawnsprojects/krush/krush65/solder/keymaps/sawns/rules.mk
rename to keyboards/laneware/lw67/keymaps/via/rules.mk
diff --git a/keyboards/laneware/lw67/readme.md b/keyboards/laneware/lw67/readme.md
new file mode 100644
index 00000000000..de59992d432
--- /dev/null
+++ b/keyboards/laneware/lw67/readme.md
@@ -0,0 +1,22 @@
+# LW-67
+
+![LW67](https://i.imgur.com/mcM1TTi.jpg)
+
+A 65% Keyboard with a LHS rotary encoder, made and sold by Laneware Peripherals.
+
+* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
+* Hardware Supported: Macro-1
+* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make laneware/lw67: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 encoder and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/lw67/rules.mk b/keyboards/laneware/lw67/rules.mk
similarity index 100%
rename from keyboards/lw67/rules.mk
rename to keyboards/laneware/lw67/rules.mk
diff --git a/keyboards/lw75/config.h b/keyboards/laneware/lw75/config.h
similarity index 100%
rename from keyboards/lw75/config.h
rename to keyboards/laneware/lw75/config.h
diff --git a/keyboards/lw75/info.json b/keyboards/laneware/lw75/info.json
similarity index 100%
rename from keyboards/lw75/info.json
rename to keyboards/laneware/lw75/info.json
diff --git a/keyboards/lw75/keymaps/ansi_split_backspace/keymap.c b/keyboards/laneware/lw75/keymaps/ansi_split_backspace/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/ansi_split_backspace/keymap.c
rename to keyboards/laneware/lw75/keymaps/ansi_split_backspace/keymap.c
diff --git a/keyboards/lw75/keymaps/default/keymap.c b/keyboards/laneware/lw75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/default/keymap.c
rename to keyboards/laneware/lw75/keymaps/default/keymap.c
diff --git a/keyboards/lw75/keymaps/iso/keymap.c b/keyboards/laneware/lw75/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/iso/keymap.c
rename to keyboards/laneware/lw75/keymaps/iso/keymap.c
diff --git a/keyboards/lw75/keymaps/iso_split_backspace/keymap.c b/keyboards/laneware/lw75/keymaps/iso_split_backspace/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/iso_split_backspace/keymap.c
rename to keyboards/laneware/lw75/keymaps/iso_split_backspace/keymap.c
diff --git a/keyboards/lw75/keymaps/via/keymap.c b/keyboards/laneware/lw75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/via/keymap.c
rename to keyboards/laneware/lw75/keymaps/via/keymap.c
diff --git a/keyboards/laneware/lw75/keymaps/via/rules.mk b/keyboards/laneware/lw75/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/laneware/lw75/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/laneware/lw75/readme.md b/keyboards/laneware/lw75/readme.md
new file mode 100644
index 00000000000..5b28204ada8
--- /dev/null
+++ b/keyboards/laneware/lw75/readme.md
@@ -0,0 +1,25 @@
+# LW-75
+
+![LW75](https://i.imgur.com/JczcWsmh.jpg)
+
+A 75% Keyboard with a LHS rotary encoder, made and sold by Laneware Peripherals.
+
+* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
+* Hardware Supported: LW-75
+* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make laneware/lw75:default
+    
+Flashing example for this keyboard:
+    make laneware/lw75: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:
+
+* **Bootmagic reset**: Hold down the encoder and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/lw75/rules.mk b/keyboards/laneware/lw75/rules.mk
similarity index 100%
rename from keyboards/lw75/rules.mk
rename to keyboards/laneware/lw75/rules.mk
diff --git a/keyboards/macro1/config.h b/keyboards/laneware/macro1/config.h
similarity index 100%
rename from keyboards/macro1/config.h
rename to keyboards/laneware/macro1/config.h
diff --git a/keyboards/macro1/info.json b/keyboards/laneware/macro1/info.json
similarity index 100%
rename from keyboards/macro1/info.json
rename to keyboards/laneware/macro1/info.json
diff --git a/keyboards/laneware/macro1/keymaps/default/keymap.c b/keyboards/laneware/macro1/keymaps/default/keymap.c
new file mode 100644
index 00000000000..bee64a99e56
--- /dev/null
+++ b/keyboards/laneware/macro1/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+/* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K02│K03│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * ├───┼───┼───┤   │ 
+ * │K30│K31│K32│   │
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * ├───┴───┼───┤   │ 
+ * │K50    │K52│   │
+ * └───────┴───┴───┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_numpad(
+		KC_MUTE, KC_MPLY,     KC_BSPC, 
+		KC_CALC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, 
+		KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS, 
+		KC_KP_4, KC_KP_5,     KC_KP_6, 
+		KC_KP_1, KC_KP_2,     KC_KP_3,        KC_KP_ENTER, 
+		KC_KP_0, KC_KP_DOT)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}
+};
+#endif
+
+
diff --git a/keyboards/macro1/keymaps/macropad/keymap.c b/keyboards/laneware/macro1/keymaps/macropad/keymap.c
similarity index 100%
rename from keyboards/macro1/keymaps/macropad/keymap.c
rename to keyboards/laneware/macro1/keymaps/macropad/keymap.c
diff --git a/keyboards/macro1/keymaps/southpaw/keymap.c b/keyboards/laneware/macro1/keymaps/southpaw/keymap.c
similarity index 100%
rename from keyboards/macro1/keymaps/southpaw/keymap.c
rename to keyboards/laneware/macro1/keymaps/southpaw/keymap.c
diff --git a/keyboards/laneware/macro1/keymaps/via/keymap.c b/keyboards/laneware/macro1/keymaps/via/keymap.c
new file mode 100644
index 00000000000..3e183392086
--- /dev/null
+++ b/keyboards/laneware/macro1/keymaps/via/keymap.c
@@ -0,0 +1,90 @@
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+/* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K02│K03│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * ├───┼───┼───┤   │ 
+ * │K30│K31│K32│   │
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * ├───┴───┼───┤   │ 
+ * │K50    │K52│   │
+ * └───────┴───┴───┘
+ */
+
+ /* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K02│K03│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * │   ├───┼───┼───┤ 
+ * │   │K31│K32│K33│
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * │   ├───┼───┴───┤ 
+ * │   │K51│K52    │
+ * └───┴───┴───────┘
+ */
+
+/* 
+ * ┌───┐   ┌───┬───┐ 
+ * │K00│   │K01│K02│
+ * └───┘   └───┴───┘ 
+ * ┌───┬───┬───┬───┐
+ * │K10│K11│K12│K13│
+ * ├───┼───┼───┼───┤ 
+ * │K20│K21│K22│K23│
+ * ├───┼───┼───┼───┤ 
+ * │K30│K31│K32│K33│
+ * ├───┼───┼───┼───┤ 
+ * │K40│K41│K42│K43│
+ * ├───┼───┼───┼───┤ 
+ * │K50│K51│K52│K53│
+ * └───┴───┴───┴───┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_numpad(
+		KC_MUTE, KC_MPLY,     KC_BSPC, 
+		KC_CALC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, 
+		KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS, 
+		KC_KP_4, KC_KP_5,     KC_KP_6, 
+		KC_KP_1, KC_KP_2,     KC_KP_3,        KC_KP_ENTER, 
+		KC_KP_0, KC_KP_DOT),
+
+	[1] = LAYOUT_numpad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, 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_numpad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, 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_numpad(
+		KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, 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/sawnsprojects/vcl65/solder/keymaps/sawns/rules.mk b/keyboards/laneware/macro1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/sawnsprojects/vcl65/solder/keymaps/sawns/rules.mk
rename to keyboards/laneware/macro1/keymaps/via/rules.mk
diff --git a/keyboards/laneware/macro1/readme.md b/keyboards/laneware/macro1/readme.md
new file mode 100644
index 00000000000..c89ceb0d880
--- /dev/null
+++ b/keyboards/laneware/macro1/readme.md
@@ -0,0 +1,22 @@
+# Macro-1
+
+![Macro-1](https://i.imgur.com/pnTgKuTh.jpeg)
+
+A versitile numpad/macropad (14x6) with a rotary encoder, made and sold by Laneware Peripherals.
+
+* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
+* Hardware Supported: Macro-1
+* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make laneware/macro1: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 encoder and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/macro1/rules.mk b/keyboards/laneware/macro1/rules.mk
similarity index 100%
rename from keyboards/macro1/rules.mk
rename to keyboards/laneware/macro1/rules.mk
diff --git a/keyboards/raindrop/config.h b/keyboards/laneware/raindrop/config.h
similarity index 100%
rename from keyboards/raindrop/config.h
rename to keyboards/laneware/raindrop/config.h
diff --git a/keyboards/raindrop/info.json b/keyboards/laneware/raindrop/info.json
similarity index 100%
rename from keyboards/raindrop/info.json
rename to keyboards/laneware/raindrop/info.json
diff --git a/keyboards/raindrop/keymaps/arrows/keymap.c b/keyboards/laneware/raindrop/keymaps/arrows/keymap.c
similarity index 100%
rename from keyboards/raindrop/keymaps/arrows/keymap.c
rename to keyboards/laneware/raindrop/keymaps/arrows/keymap.c
diff --git a/keyboards/raindrop/keymaps/default/keymap.c b/keyboards/laneware/raindrop/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/raindrop/keymaps/default/keymap.c
rename to keyboards/laneware/raindrop/keymaps/default/keymap.c
diff --git a/keyboards/raindrop/keymaps/hhkb/keymap.c b/keyboards/laneware/raindrop/keymaps/hhkb/keymap.c
similarity index 100%
rename from keyboards/raindrop/keymaps/hhkb/keymap.c
rename to keyboards/laneware/raindrop/keymaps/hhkb/keymap.c
diff --git a/keyboards/raindrop/matrix_diagram.md b/keyboards/laneware/raindrop/matrix_diagram.md
similarity index 100%
rename from keyboards/raindrop/matrix_diagram.md
rename to keyboards/laneware/raindrop/matrix_diagram.md
diff --git a/keyboards/laneware/raindrop/readme.md b/keyboards/laneware/raindrop/readme.md
new file mode 100644
index 00000000000..f0354d38590
--- /dev/null
+++ b/keyboards/laneware/raindrop/readme.md
@@ -0,0 +1,38 @@
+# Raindrop
+
+![stacked](https://i.imgur.com/R2iPqjIh.png)  
+*Casing*  
+![PCB Front](https://i.imgur.com/00TpL3nh.png)  
+*PCB Front*  
+
+60% sized keyboard with a gasket mounted plate and aluminium case, made by Laneware Peripherals.
+
+* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
+* Hardware Supported: Raindrop PCB
+* Hardware Availability: Group Buy
+
+## Layouts
+The Raindrop PCB can be configured in the following key layouts: 
+| Key Layout | Keymap | Diagram |
+| :---: | :---: | :---: |
+| Standard 60% | default | ![diagram_ansi](https://i.imgur.com/oibG44o.png) |
+| 2u Left Shift with Arrow Keys | arrows | ![diagram_arrows](https://i.imgur.com/cQ4Kwb5h.png) |
+| HHKB with 6.25 Spacebar | hhkb | ![diagram_hhkb](https://i.imgur.com/WU6gb1Qh.png) |
+
+Make example for this keyboard (after setting up your build environment):
+
+    make laneware/raindrop:default
+
+Flashing example for this keyboard:
+
+    make laneware/raindrop: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 `QK_BOOT` if it is available
diff --git a/keyboards/kudox/columner/.noci b/keyboards/laneware/raindrop/rules.mk
similarity index 100%
rename from keyboards/kudox/columner/.noci
rename to keyboards/laneware/raindrop/rules.mk
diff --git a/keyboards/laser_ninja/pumpkin_pad/config.h b/keyboards/laser_ninja/pumpkin_pad/config.h
deleted file mode 100644
index f42e9c10258..00000000000
--- a/keyboards/laser_ninja/pumpkin_pad/config.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2022 Joah Nelson (Jels)
- *
- * 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 RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 28
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    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_FRACTAL
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#endif
-
-/* 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/laser_ninja/pumpkin_pad/info.json b/keyboards/laser_ninja/pumpkin_pad/info.json
deleted file mode 100644
index cb76145388e..00000000000
--- a/keyboards/laser_ninja/pumpkin_pad/info.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "keyboard_name": "Pumpkin Pad",
-    "manufacturer": "Laser Ninja",
-    "url": "",
-    "maintainer": "Jels",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": false,
-        "mousekey": false,
-        "nkro": false,
-        "rgb_matrix": true
-    },
-    "matrix_pins": {
-        "direct": [
-            ["A9", "B3", "B9", "NO_PIN"],
-            ["A8", "B12", "A2", "A1"],
-            ["B15", "B14", "B13", "NO_PIN"]
-        ]
-    },
-    "usb": {
-        "vid": "0x6C6E",
-        "pid": "0x7070",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "A10"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [2, 0], "x": 0.5, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2}
-            ]
-        }
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "layout": [
-            {"flags": 2, "x": 36, "y": 3},
-            {"flags": 2, "x": 86, "y": 2},
-            {"flags": 2, "x": 138, "y": 2},
-            {"flags": 2, "x": 188, "y": 2},
-            {"flags": 2, "x": 215, "y": 16},
-            {"flags": 2, "x": 215, "y": 16},
-            {"flags": 4, "matrix": [0, 2], "x": 167, "y": 17},
-            {"flags": 4, "matrix": [0, 1], "x": 112, "y": 17},
-            {"flags": 4, "matrix": [0, 0], "x": 57, "y": 17},
-            {"flags": 2, "x": 9, "y": 15},
-            {"flags": 2, "x": 9, "y": 15},
-            {"flags": 2, "x": 6, "y": 34},
-            {"flags": 2, "x": 9, "y": 48},
-            {"flags": 2, "x": 9, "y": 48},
-            {"flags": 4, "matrix": [1, 0], "x": 29, "y": 38},
-            {"flags": 4, "matrix": [1, 1], "x": 84, "y": 38},
-            {"flags": 4, "matrix": [1, 2], "x": 140, "y": 38},
-            {"flags": 2, "x": 218, "y": 34},
-            {"flags": 2, "x": 215, "y": 48},
-            {"flags": 2, "x": 215, "y": 48},
-            {"flags": 2, "x": 188, "y": 61},
-            {"flags": 4, "matrix": [2, 2], "x": 167, "y": 59},
-            {"flags": 2, "x": 138, "y": 61},
-            {"flags": 4, "matrix": [2, 1], "x": 112, "y": 59},
-            {"flags": 2, "x": 86, "y": 61},
-            {"flags": 4, "matrix": [2, 0], "x": 57, "y": 59},
-            {"flags": 2, "x": 36, "y": 61}
-        ]
-    }
-}
diff --git a/keyboards/laser_ninja/pumpkin_pad/readme.md b/keyboards/laser_ninja/pumpkin_pad/readme.md
deleted file mode 100644
index 452f4f67236..00000000000
--- a/keyboards/laser_ninja/pumpkin_pad/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Pumpkin Pad
-
-![pumpkin-pad](https://i.imgur.com/jFkl9rwh.jpg)
-
-A 60% PCB
-
--   Keyboard Maintainer: [Jels](https://github.com/Jels02)
--   Hardware Supported: Pumpkin Pad PCB
--   Hardware Availabililty: [Laser_Ninja](https://kennui.com/w/Laser_Ninja)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make laser_ninja/pumpkin_pad:default
-
-Flashing example for this keyboard:
-
-    make laser_ninja/pumpkin_pad: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).
-
--   **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 `QK_BOOT` if it is available
diff --git a/keyboards/laser_ninja/pumpkinpad/config.h b/keyboards/laser_ninja/pumpkinpad/config.h
new file mode 100644
index 00000000000..fbb4aaafcef
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkinpad/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 Joah Nelson (Jels)
+ *
+ * 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
+
+/* 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/laser_ninja/pumpkinpad/info.json b/keyboards/laser_ninja/pumpkinpad/info.json
new file mode 100644
index 00000000000..3908e99fc28
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkinpad/info.json
@@ -0,0 +1,112 @@
+{
+    "keyboard_name": "Pumpkinpad",
+    "manufacturer": "Laser Ninja",
+    "url": "",
+    "maintainer": "Jels",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["A9", "B3", "B9", "NO_PIN"],
+            ["A8", "B12", "A2", "A1"],
+            ["B15", "B14", "B13", "NO_PIN"]
+        ]
+    },
+    "usb": {
+        "vid": "0x6C6E",
+        "pid": "0x7070",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "A10"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"flags": 2, "x": 36, "y": 3},
+            {"flags": 2, "x": 86, "y": 2},
+            {"flags": 2, "x": 138, "y": 2},
+            {"flags": 2, "x": 188, "y": 2},
+            {"flags": 2, "x": 215, "y": 16},
+            {"flags": 2, "x": 215, "y": 16},
+            {"flags": 4, "matrix": [0, 2], "x": 167, "y": 17},
+            {"flags": 4, "matrix": [0, 1], "x": 112, "y": 17},
+            {"flags": 4, "matrix": [0, 0], "x": 57, "y": 17},
+            {"flags": 2, "x": 9, "y": 15},
+            {"flags": 2, "x": 9, "y": 15},
+            {"flags": 2, "x": 6, "y": 34},
+            {"flags": 2, "x": 9, "y": 48},
+            {"flags": 2, "x": 9, "y": 48},
+            {"flags": 4, "matrix": [1, 0], "x": 29, "y": 38},
+            {"flags": 4, "matrix": [1, 1], "x": 84, "y": 38},
+            {"flags": 4, "matrix": [1, 2], "x": 140, "y": 38},
+            {"flags": 2, "x": 218, "y": 34},
+            {"flags": 2, "x": 215, "y": 48},
+            {"flags": 2, "x": 215, "y": 48},
+            {"flags": 2, "x": 188, "y": 61},
+            {"flags": 4, "matrix": [2, 2], "x": 167, "y": 59},
+            {"flags": 2, "x": 138, "y": 61},
+            {"flags": 4, "matrix": [2, 1], "x": 112, "y": 59},
+            {"flags": 2, "x": 86, "y": 61},
+            {"flags": 4, "matrix": [2, 0], "x": 57, "y": 59},
+            {"flags": 2, "x": 36, "y": 61}
+        ],
+        "max_brightness": 200
+    }
+}
diff --git a/keyboards/laser_ninja/pumpkin_pad/keymaps/default/keymap.c b/keyboards/laser_ninja/pumpkinpad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/laser_ninja/pumpkin_pad/keymaps/default/keymap.c
rename to keyboards/laser_ninja/pumpkinpad/keymaps/default/keymap.c
diff --git a/keyboards/laser_ninja/pumpkin_pad/keymaps/via/keymap.c b/keyboards/laser_ninja/pumpkinpad/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/laser_ninja/pumpkin_pad/keymaps/via/keymap.c
rename to keyboards/laser_ninja/pumpkinpad/keymaps/via/keymap.c
diff --git a/keyboards/laser_ninja/pumpkinpad/keymaps/via/rules.mk b/keyboards/laser_ninja/pumpkinpad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkinpad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/laser_ninja/pumpkinpad/readme.md b/keyboards/laser_ninja/pumpkinpad/readme.md
new file mode 100644
index 00000000000..a5739029e7f
--- /dev/null
+++ b/keyboards/laser_ninja/pumpkinpad/readme.md
@@ -0,0 +1,23 @@
+# Pumpkinpad
+
+![pumpkinpad](https://i.imgur.com/jFkl9rwh.jpg)
+
+A 60% PCB
+
+-   Keyboard Maintainer: [Jels](https://github.com/Jels02)
+-   Hardware Supported: Pumpkinpad PCB
+-   Hardware Availabililty: [Laser_Ninja](https://kennui.com/w/Laser_Ninja)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make laser_ninja/pumpkinpad:default
+
+Flashing example for this keyboard:
+
+    make laser_ninja/pumpkinpad: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).
+
+-   **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 `QK_BOOT` if it is available
diff --git a/keyboards/laser_ninja/pumpkin_pad/rules.mk b/keyboards/laser_ninja/pumpkinpad/rules.mk
similarity index 100%
rename from keyboards/laser_ninja/pumpkin_pad/rules.mk
rename to keyboards/laser_ninja/pumpkinpad/rules.mk
diff --git a/keyboards/late9/readme.md b/keyboards/late9/readme.md
deleted file mode 100644
index 1d85e788fbe..00000000000
--- a/keyboards/late9/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# LATE-9
-
-
-The LATE-9 is a multi-tap input keyboard based on mobile phones from the late '90s. LATE-9 is intended as a dev board with 18 buttons and an OLED screen, made by through-hole components only. With this, you can experiment QMK OLED capabilities with very little expense.
-
-![LATE-9](https://i.imgur.com/QXycTC3h.jpg "LATE-9 first proto")
-
-See the project repository for gerbers.
-
-* Keyboard maintainer: [rookiebwoy](https://github.com/rookiebwoy)
-* Hardware supported: ProMicro, _Elite-C (not tested)_
-* Project repository: [LATE-9 on github](https://github.com/rookiebwoy/late-9)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make late9/rev1:default
-
-Flashing example for this keyboard:
-
-    make late9/rev1:default:flash
-
-
-When asked by the terminal, short with a metal wire the pins on the backside of the board highlighted as `RST` (one is the `RESET` and the other one is `GROUND`) to enter the bootloader and let the OS detects the device.
-After installing this firmware you can use Bootmagic to enter the bootloader while plugging in your LATE-9. By default it's the button on the upper-left of the keyboard.
-
-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 [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json
deleted file mode 100644
index 05d0934b964..00000000000
--- a/keyboards/late9/rev1/info.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "keyboard_name": "LATE-9",
-    "manufacturer": "rookiebwoy",
-    "url": "https://github.com/rookiebwoy/late-9)",
-    "maintainer": "rookiebwoy",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3777",
-        "device_version": "0.1.0"
-    },
-    "tapping": {
-        "term": 400
-    },
-    "build": {
-        "debounce_type": "sym_eager_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B5", "C6", "D4"],
-        "rows": ["B4", "E6", "D7", "B3", "B2", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5},
-                {"matrix": [5, 2], "x": 2, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/late9/rev1/keymaps/default/keymap.c b/keyboards/late9/rev1/keymaps/default/keymap.c
deleted file mode 100644
index bed15eb57e5..00000000000
--- a/keyboards/late9/rev1/keymaps/default/keymap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2021 rookiebwoy
- *
- * 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
-
-// Layers declarations
-enum layers {
-    _BL,
-    _OL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap _BL: Base Layer
- * ,-----------------------.
- * |MO(OP) | ↑     | BSPC  |
- * |       |       |       |
- * |-------|-------|-------|
- * | <-    | ↓     | ->    |
- * |       |       |       |
- * |-------|-------|-------|
- * | 1     | 2     | 3     |
- * |       |       |       |
- * |-------|-------|-------|
- * | 4     | 5     | 6     |
- * |       |       |       |
- * |-------|-------|-------|
- * | 7     | 8     | 9     |
- * |       |       |       |
- * |-------|-------|-------|
- * | 0     | .     | =     |
- * |       |       |       |
- * `-----------------------'
- */
-  [_BL] = LAYOUT(
-    MO(1),         KC_UP,         KC_BSPC,
-    KC_LEFT,       KC_DOWN,       KC_RIGHT,
-    KC_P1,         KC_P2,         KC_P3,
-    KC_P4,         KC_P5,         KC_P6,
-    KC_P7,         KC_P8,         KC_P9,
-    KC_P0,         KC_PDOT,       KC_PEQL
-  ),
-
-/* Keymap _OP: Operators Layer
- * ,-----------------------.
- * |MO(OP) | ↑     | BSPC  |
- * |       |       |       |
- * |-------|-------|-------|
- * | <-    | ↓     | ->    |
- * |       |       |       |
- * |-------|-------|-------|
- * | /     | *     | -     |
- * |       |       |       |
- * |-------|-------|-------|
- * | (     | )     | +     |
- * |       |       |       |
- * |-------|-------|-------|
- * | &     | %     | ^     |
- * |       |       |       |
- * |-------|-------|-------|
- * | |     | .     | =     |
- * |       |       |       |
- * `-----------------------'
- */
-  [_OL] = LAYOUT(
-    MO(1),         KC_UP,         KC_BSPC,
-    KC_LEFT,       KC_DOWN,       KC_RIGHT,
-    KC_PSLS,       KC_PAST,       KC_PMNS,
-    LSFT(KC_9),    LSFT(KC_0),    KC_PPLS,
-    LSFT(KC_7),    LSFT(KC_5),    LSFT(KC_6),
-    LSFT(KC_BSLS), KC_PDOT,       KC_PEQL
-  ),
-};
\ No newline at end of file
diff --git a/keyboards/late9/rev1/keymaps/multitap/keymap.c b/keyboards/late9/rev1/keymaps/multitap/keymap.c
deleted file mode 100644
index e378fb4921f..00000000000
--- a/keyboards/late9/rev1/keymaps/multitap/keymap.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* Copyright 2021 rookiebwoy
- *
- * 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
-
-// Layers declarations
-enum layers {
-    _BL
-};
-
-// Tap Dance declarations
-enum {
-    TD_PNCT,
-    TD_ABC,
-    TD_DEF,
-    TD_GHI,
-    TD_JKL,
-    TD_MNO,
-    TD_PQRS,
-    TD_TUV,
-    TD_WXYZ,
-    TD_SPACE,
-    TD_UPRCS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap _BL: Base Layer
- * ,-----------------------.
- * |ENTER  | ↑     | BSPC  |
- * |       |       |       |
- * |-------|-------|-------|
- * | <-    | ↓     | ->    |
- * |       |       |       |
- * |-------|-------|-------|
- * | 1 .,' | 2     | 3     |
- * |?!-:;/ | abc   | def   |
- * |-------|-------|-------|
- * | 4     | 5     | 6     |
- * | ghi   | jkl   | mno   |
- * |-------|-------|-------|
- * | 7     | 8     | 9     |
- * | pqrs  | tuv   | wxyz  |
- * |-------|-------|-------|
- * | *     | 0     | CAPS  |
- * |       | space |       |
- * `-----------------------'
- */
-  [_BL] = LAYOUT(
-    KC_ENT,       KC_UP,        KC_BSPC,
-    KC_LEFT,      KC_DOWN,      KC_RIGHT,
-    TD(TD_PNCT),  TD(TD_ABC),   TD(TD_DEF),
-    TD(TD_GHI),   TD(TD_JKL),   TD(TD_MNO),
-    TD(TD_PQRS),  TD(TD_TUV),   TD(TD_WXYZ),
-    KC_PAST,      TD(TD_SPACE), TD(TD_UPRCS)
-  ),
-};
-
-// Tap Dance cycles
-void dance_1 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_DOT);
-        else return tap_code(KC_1);
-    } else if (state->count == 2) {
-        tap_code (KC_COMM);
-    } else if (state->count == 3) {
-        tap_code(KC_QUOT);
-    } else if (state->count == 4) {
-        tap_code16(KC_QUES);
-    } else if (state->count == 5) {
-        tap_code16(KC_EXLM);
-    } else if (state->count == 6) {
-        tap_code(KC_MINS);
-    } else if (state->count == 7) {
-        tap_code16(KC_COLN);
-    } else if (state->count == 8) {
-        tap_code(KC_SCLN);
-    } else if (state->count == 9) {
-        tap_code(KC_SLSH);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_2 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_A);
-        else return tap_code(KC_2);
-    } else if (state->count == 2) {
-        tap_code (KC_B);
-    } else if (state->count == 3) {
-        tap_code(KC_C);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_3 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_D);
-        else return tap_code(KC_3);
-    } else if (state->count == 2) {
-        tap_code (KC_E);
-    } else if (state->count == 3) {
-        tap_code(KC_F);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_4 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_G);
-        else return tap_code(KC_4);
-    } else if (state->count == 2) {
-        tap_code (KC_H);
-    } else if (state->count == 3) {
-        tap_code(KC_I);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_5 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_J);
-        else return tap_code(KC_5);
-    } else if (state->count == 2) {
-        tap_code (KC_K);
-    } else if (state->count == 3) {
-        tap_code(KC_L);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_6 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_M);
-        else return tap_code(KC_6);
-    } else if (state->count == 2) {
-        tap_code (KC_N);
-    } else if (state->count == 3) {
-        tap_code(KC_O);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_7 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_P);
-        else return tap_code(KC_7);
-    } else if (state->count == 2) {
-        tap_code (KC_Q);
-    } else if (state->count == 3) {
-        tap_code(KC_R);
-    } else if (state->count == 4) {
-        tap_code(KC_S);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_8 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_T);
-        else return tap_code(KC_8);
-    } else if (state->count == 2) {
-        tap_code (KC_U);
-    } else if (state->count == 3) {
-        tap_code(KC_V);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_9 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_W);
-        else return tap_code(KC_9);
-    } else if (state->count == 2) {
-        tap_code (KC_X);
-    } else if (state->count == 3) {
-        tap_code(KC_Y);
-    } else if (state->count == 4) {
-        tap_code(KC_Z);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_0 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_SPACE);
-        else return tap_code(KC_0);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_maiusc (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return set_oneshot_mods(MOD_BIT(KC_LSFT)); 
-        else return tap_code(KC_CAPS);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-// Tap Dance actions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_PNCT] = ACTION_TAP_DANCE_FN (dance_1),
-    [TD_ABC] = ACTION_TAP_DANCE_FN (dance_2),
-    [TD_DEF] = ACTION_TAP_DANCE_FN (dance_3),
-    [TD_GHI] = ACTION_TAP_DANCE_FN (dance_4),
-    [TD_JKL] = ACTION_TAP_DANCE_FN (dance_5),
-    [TD_MNO] = ACTION_TAP_DANCE_FN (dance_6),
-    [TD_PQRS] = ACTION_TAP_DANCE_FN (dance_7),
-    [TD_TUV] = ACTION_TAP_DANCE_FN (dance_8),
-    [TD_WXYZ] = ACTION_TAP_DANCE_FN (dance_9),
-    [TD_SPACE] = ACTION_TAP_DANCE_FN (dance_0),
-    [TD_UPRCS] = ACTION_TAP_DANCE_FN (dance_maiusc),
-};
diff --git a/keyboards/late9/rev1/keymaps/multitap/readme.md b/keyboards/late9/rev1/keymaps/multitap/readme.md
deleted file mode 100644
index 2b5136c2b8e..00000000000
--- a/keyboards/late9/rev1/keymaps/multitap/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# LATE-9 multitap keymap
-
-This is the intended LATE-9 layout with multitap `ON` and old mobile phone look-a-like layout..
diff --git a/keyboards/late9/rev1/keymaps/multitap/rules.mk b/keyboards/late9/rev1/keymaps/multitap/rules.mk
deleted file mode 100644
index 4141c3e7a42..00000000000
--- a/keyboards/late9/rev1/keymaps/multitap/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enable Tap Dance feature
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/late9/rev1/rules.mk b/keyboards/late9/rev1/rules.mk
deleted file mode 100644
index 874033acc90..00000000000
--- a/keyboards/late9/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # 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
-
-OLED_ENABLE = yes
diff --git a/keyboards/late9/rules.mk b/keyboards/late9/rules.mk
deleted file mode 100755
index 51c1b0d2a6f..00000000000
--- a/keyboards/late9/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = late9/rev1
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index fbeb499c4e6..7ee0dba1f5c 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -16,64 +16,4 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
- // 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
-// #    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 IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
-
-#    define DRIVER_1_LED_TOTAL 25
-#    define DRIVER_2_LED_TOTAL 24
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
index 9b466c216a2..a211846f628 100644
--- a/keyboards/latincompass/latin17rgb/info.json
+++ b/keyboards/latincompass/latin17rgb/info.json
@@ -31,7 +31,38 @@
     "pin": "B7"
   },
   "rgb_matrix": {
-    "driver": "is31fl3731"
+    "animations": {
+      "alphas_mods": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_val": true,
+      "band_pinwheel_val": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true
+    },
+    "driver": "is31fl3731",
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5", "F4"],
diff --git a/keyboards/latincompass/latin17rgb/latin17rgb.c b/keyboards/latincompass/latin17rgb/latin17rgb.c
index b75a11d9650..54705bf4f7c 100644
--- a/keyboards/latincompass/latin17rgb/latin17rgb.c
+++ b/keyboards/latincompass/latin17rgb/latin17rgb.c
@@ -17,7 +17,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/latincompass/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
index a25d3b06963..94ea00468ca 100644
--- a/keyboards/latincompass/latin60rgb/config.h
+++ b/keyboards/latincompass/latin60rgb/config.h
@@ -15,58 +15,6 @@
   */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
- // 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
-// #    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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 60
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+
+#define RGB_MATRIX_LED_COUNT 60
diff --git a/keyboards/latincompass/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/info.json
index f11f6ac3d5d..5fef17fd09b 100644
--- a/keyboards/latincompass/latin60rgb/info.json
+++ b/keyboards/latincompass/latin60rgb/info.json
@@ -9,7 +9,38 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "is31fl3733"
+    "animations": {
+      "alphas_mods": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_val": true,
+      "band_pinwheel_val": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true
+    },
+    "driver": "is31fl3733",
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D6", "D4", "D3"],
diff --git a/keyboards/latincompass/latin60rgb/latin60rgb.c b/keyboards/latincompass/latin60rgb/latin60rgb.c
index a915bede80a..8a032d76b14 100644
--- a/keyboards/latincompass/latin60rgb/latin60rgb.c
+++ b/keyboards/latincompass/latin60rgb/latin60rgb.c
@@ -16,70 +16,70 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_16, G_16, I_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_16, D_16, F_16 },
-    { 0, E_15, D_15, F_15 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_16, A_16, C_16 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 }
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 }
 
 };
 
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index 584e39a327e..6b159751008 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -17,62 +17,6 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
- // 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
-// #    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 IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 
-#define RGB_MATRIX_LED_COUNT 6
-#endif
-
 #define B7_AUDIO
diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json
index 0c43da36e47..775b6d259e8 100644
--- a/keyboards/latincompass/latin6rgb/info.json
+++ b/keyboards/latincompass/latin6rgb/info.json
@@ -9,7 +9,38 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "is31fl3731"
+    "animations": {
+      "alphas_mods": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_val": true,
+      "band_pinwheel_val": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true
+    },
+    "driver": "is31fl3731",
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5"],
diff --git a/keyboards/latincompass/latin6rgb/latin6rgb.c b/keyboards/latincompass/latin6rgb/latin6rgb.c
index a1eb38b9af5..779373ae8f9 100644
--- a/keyboards/latincompass/latin6rgb/latin6rgb.c
+++ b/keyboards/latincompass/latin6rgb/latin6rgb.c
@@ -17,7 +17,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
index 35e52a8fc4e..1fb828eb76c 100644
--- a/keyboards/latincompass/latinpad/config.h
+++ b/keyboards/latincompass/latinpad/config.h
@@ -16,54 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 18
-// 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
-// #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 OLED_FONT_H "./lib/glcdfont.c"
diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json
index 6c54145723f..f007efbf882 100644
--- a/keyboards/latincompass/latinpad/info.json
+++ b/keyboards/latincompass/latinpad/info.json
@@ -9,6 +9,37 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
         "driver": "ws2812"
     },
     "matrix_pins": {
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h
deleted file mode 100644
index 214ff982c65..00000000000
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 LAZYDESIGNERS
- *
- * 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_TERM 170
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
deleted file mode 100644
index 1f8d3d59690..00000000000
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* Copyright 2019 Erovia
- *
- * 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 "erovia.h"
-
-// Left space on tap, LOWER on hold
-#define SPC_LOW LT(_LOWER, KC_TAB)
-// Left space on tap, UPPER on hold
-#define SPC_UPR LT(_RAISE, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * ,---------------------------------------------------------------.
- * | `  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
- * |---------------------------------------------------------------|
- * | Esc  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  .   |
- * |---------------------------------------------------------------|
- * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  Enter  |
- * |---------------------------------------------------------------|
- *      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_QWERTY] = LAYOUT(
-		KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-		VIM_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_DOT,
-		TD_SHFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   TD_ENTR,
-		KC_LCTL, KC_LGUI, KC_LALT, SPC_LOW,  SPC_UPR,  KC_NO, KC_NO, KC_NO
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * | `  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
- * |---------------------------------------------------------------|
- * | Esc  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  '   |
- * |---------------------------------------------------------------|
- * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  Enter  |
- * |---------------------------------------------------------------|
- *      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_COLEMAK] = LAYOUT(
-		KC_GRV,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,    KC_BSPC,
-		VIM_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_M,    KC_N,    KC_E,    KC_I,    KC_O,       KC_QUOT,
-		TD_SHFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM, KC_DOT,  TD_ENTR,
-		KC_LCTL, KC_LGUI, KC_LALT, SPC_LOW,  SPC_UPR,  KC_NO, KC_NO, KC_NO
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * | ~  | !  | @  | #  | $  | %  | ^  | &  | *  | (  | )  |        |
- * |---------------------------------------------------------------|
- * | Del  | F1 | F2 | F3 | F4 | F5 | F6 | _  | +  | {  | }  |  |   |
- * |---------------------------------------------------------------|
- * |        | F7 | F8 | F9 |F10 |F11 |F12 |    | ;  |PgUp|   /     |
- * |---------------------------------------------------------------|
- *      |    |    |    |         |             |Home|PgDn|End |
- *      `-----------------------------------------------------'
- */
-
-	[_LOWER] = LAYOUT(
-		KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
-		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_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_SCLN, KC_PGUP, KC_SLSH,
-		KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * | `  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  |        |
- * |---------------------------------------------------------------|
- * | Ins  | F1 | F2 | F3 | F4 | F5 | F6 | -  | =  | [  | ]  |  \   |
- * |---------------------------------------------------------------|
- * |        | F7 | F8 | F9 |F10 |F11 |F12  |    |    |   |         |
- * |---------------------------------------------------------------|
- *      |VolD|Mute|VolU|         |             |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_RAISE] = LAYOUT(
-		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
-		KC_INS,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_NO,   KC_NO,   KC_NO
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * |EEPR|RST |    |    |    |    |    |    |    |    |    |        |
- * |---------------------------------------------------------------|
- * |Leader|    |    |    |    |    |    |    |    |    |    |      |
- * |---------------------------------------------------------------|
- * |        |    |    |    |    |    |     |    |    |   |         |
- * |---------------------------------------------------------------|
- *      |RGB-|RGB |RGB+|         |             |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_ADJUST] = LAYOUT(
-		EE_CLR,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		QK_LEAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QWERTY,  COLEMAK, 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,
-		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * |    |    |    |    |    |    |    |    |    |    |    |        |
- * |---------------------------------------------------------------|
- * |      |    |    |    |    |    | H  | J  | K  | L  |    |      |
- * |---------------------------------------------------------------|
- * |        |    |    |    |    |    |     |    |    |Up |         |
- * |---------------------------------------------------------------|
- *      |    |    |    |         |             |Left|Down|Rght|
- *      `-----------------------------------------------------'
- */
-
-	[_VIM] = LAYOUT(
-		EE_CLR,  QK_BOOT, 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_H,    KC_J,    KC_K,    KC_L,    KC_NO,   KC_NO,
-		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_UP,   KC_NO,
-		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
-	),
-};
-
-layer_state_t layer_state_set_keymap(layer_state_t state) {
-	state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-	switch (biton32(state)) {
-		case _LOWER:
-			rgblight_sethsv_noeeprom(HSV_GREEN);
-			break;
-		case _RAISE:
-			rgblight_sethsv_noeeprom(HSV_GOLD);
-			break;
-		case _ADJUST:
-			rgblight_sethsv_noeeprom(HSV_RED);
-			break;
-		default:
-			rgblight_sethsv_noeeprom(HSV_WHITE);
-			break;
-	}
-	return state;
-}
-
-void keyboard_post_init_user(void) {
-	dimple_led_off();
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/readme.md b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/readme.md
deleted file mode 100644
index c334b6c3675..00000000000
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/readme.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# The default keymap for Dimple
-
-**Features**
-
-* Shift acts as CapsLock when tapped  
-* Left space: space on tap, Lower layer on hold  
-* Right space: space on tap, Raise layer on hold  
-* Both space: Adjust layer on hold  
-
-## QWERTY (Normal) Layer
-```
- ,---------------------------------------------------------------.
- |Esc | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
- |---------------------------------------------------------------|
- | Tab  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |Enter |
- |---------------------------------------------------------------|
- | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | Up |    .    |
- |---------------------------------------------------------------|
-      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |Left|Down|Rght|
-      `-----------------------------------------------------'
-```
-
-## Lower Layer
-```
- ,---------------------------------------------------------------.
- | ~  | !  | @  | #  | $  | %  | ^  | &  | *  | (  | )  |        |
- |---------------------------------------------------------------|
- | Del  | F1 | F2 | F3 | F4 | F5 | F6 | _  | +  | {  | }  |  |   |
- |---------------------------------------------------------------|
- |        | F7 | F8 | F9 |F10 |F11 |F12 |    | ;  |PgUp|   /     |
- |---------------------------------------------------------------|
-      |    |    |    |         |             |Home|PgDn|End |
-      `-----------------------------------------------------'
-```
-
-## Raise Layer
-```
- ,---------------------------------------------------------------.
- | `  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  |        |
- |---------------------------------------------------------------|
- | Ins  | F1 | F2 | F3 | F4 | F5 | F6 | -  | =  | [  | ]  |  \   |
- |---------------------------------------------------------------|
- |        | F7 | F8 | F9 |F10 |F11 |F12  |    |    |   |         |
- |---------------------------------------------------------------|
-      |VolD|Mute|VolU|         |             |    |    |    |
-      `-----------------------------------------------------'
-```
-
-## Adjust Layer
-```
-,---------------------------------------------------------------.
- |EEPR|RST |    |    |    |    |    |    |    |    |    |        |
- |---------------------------------------------------------------|
- |      |    |    |    |    |    |    |    |    |    |    |      |
- |---------------------------------------------------------------|
- |        |    |    |    |    |    |     |    |    |   |         |
- |---------------------------------------------------------------|
-      |RGB-|RGB |RGB+|         |             |    |    |    |
-      `-----------------------------------------------------'
-```
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
deleted file mode 100644
index e490d689007..00000000000
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 LAZYDESIGNERS
- *
- * 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT(KC_SLSH), KC_DEL, KC_ESC, KC_LALT, KC_SPC, LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_LCTL),
-	[1] = LAYOUT(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, QK_BOOT, RGB_SPI, RGB_SPD, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_SCLN, KC_NO, KC_LSFT, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, MO(2), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
-	[2] = 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_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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
-};
diff --git a/keyboards/lazydesigners/duo/info.json b/keyboards/lazydesigners/duo/info.json
new file mode 100644
index 00000000000..cb6245bb53d
--- /dev/null
+++ b/keyboards/lazydesigners/duo/info.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "duo",
+    "manufacturer": "lazydesigners",
+    "url": "http://lazydesigners.cn",
+    "maintainer": "lazydesigners",
+    "usb": {
+        "vid": "0x4C44",
+        "pid": "0x0044",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": [ "B11", "B3", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "F0", "F1" ],
+        "rows": [ "A14", "A15", "B4", "B10"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0],  "x": 0,  "y": 0},
+                {"matrix": [0, 1],  "x": 1,  "y": 0},
+                {"matrix": [0, 2],  "x": 2,  "y": 0},
+                {"matrix": [0, 3],  "x": 3,  "y": 0},
+                {"matrix": [0, 4],  "x": 4,  "y": 0},
+                {"matrix": [0, 5],  "x": 5,  "y": 0},
+                {"matrix": [0, 6],  "x": 6,  "y": 0},
+                {"matrix": [0, 7],  "x": 7,  "y": 0},
+                {"matrix": [0, 8],  "x": 8,  "y": 0},
+                {"matrix": [0, 9],  "x": 9,  "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0],  "x": 0,  "y": 1},
+                {"matrix": [1, 1],  "x": 1,  "y": 1},
+                {"matrix": [1, 2],  "x": 2,  "y": 1},
+                {"matrix": [1, 3],  "x": 3,  "y": 1},
+                {"matrix": [1, 4],  "x": 4,  "y": 1},
+                {"matrix": [1, 5],  "x": 5,  "y": 1},
+                {"matrix": [1, 6],  "x": 6,  "y": 1},
+                {"matrix": [1, 7],  "x": 7,  "y": 1},
+                {"matrix": [1, 8],  "x": 8,  "y": 1},
+                {"matrix": [1, 9],  "x": 9,  "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0],  "x": 0,  "y": 2},
+                {"matrix": [2, 1],  "x": 1,  "y": 2},
+                {"matrix": [2, 2],  "x": 2,  "y": 2},
+                {"matrix": [2, 3],  "x": 3,  "y": 2},
+                {"matrix": [2, 4],  "x": 4,  "y": 2},
+                {"matrix": [2, 5],  "x": 5,  "y": 2},
+                {"matrix": [2, 6],  "x": 6,  "y": 2},
+                {"matrix": [2, 7],  "x": 7,  "y": 2},
+                {"matrix": [2, 8],  "x": 8,  "y": 2},
+                {"matrix": [2, 9],  "x": 9,  "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0],  "x": 0,    "y": 3, "w": 1.25},
+                {"matrix": [3, 1],  "x": 1.25, "y": 3           },
+                {"matrix": [3, 2],  "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4],  "x": 3.5,  "y": 3, "w": 2   },
+                {"matrix": [3, 6],  "x": 5.5,  "y": 3           },
+                {"matrix": [3, 7],  "x": 6.5,  "y": 3, "w": 2   },
+                {"matrix": [3, 8],  "x": 8.5,  "y": 3, "w": 1.25},
+                {"matrix": [3, 9],  "x": 9.75, "y": 3           },
+                {"matrix": [3, 10], "x": 10.75,"y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/duo/keymaps/default/keymap.c b/keyboards/lazydesigners/duo/keymaps/default/keymap.c
new file mode 100644
index 00000000000..a40f26d80fc
--- /dev/null
+++ b/keyboards/lazydesigners/duo/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2024 LAZDESIGNERS
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define LT2_TAB LT(2, KC_TAB)
+#define LT1_SPC LT(1, KC_SPC)
+
+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_BSPC,
+        LT2_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_UP,   KC_COMM, MO(2),
+        KC_LCTL,   KC_LGUI, KC_RALT,          LT1_SPC,          KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+    [1] = LAYOUT(
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
+        QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_NO,
+        KC_NO,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_VOLD,   KC_MUTE, KC_VOLU,          KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+        ),
+    [2] = LAYOUT(
+        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,   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,   KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+        ),
+};
+
+
diff --git a/keyboards/lazydesigners/duo/keymaps/vial/config.h b/keyboards/lazydesigners/duo/keymaps/vial/config.h
new file mode 100644
index 00000000000..7cc754421b6
--- /dev/null
+++ b/keyboards/lazydesigners/duo/keymaps/vial/config.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0xBA, 0xD2, 0xF0, 0xFA, 0x20, 0x23, 0x91, 0x1C}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 0  }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 11 }
+
+#define VIAL_COMBO_ENTRIES 32
+#define VIAL_TAP_DANCE_ENTRIES 32
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/lazydesigners/duo/keymaps/vial/keymap.c b/keyboards/lazydesigners/duo/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..a40f26d80fc
--- /dev/null
+++ b/keyboards/lazydesigners/duo/keymaps/vial/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2024 LAZDESIGNERS
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define LT2_TAB LT(2, KC_TAB)
+#define LT1_SPC LT(1, KC_SPC)
+
+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_BSPC,
+        LT2_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_UP,   KC_COMM, MO(2),
+        KC_LCTL,   KC_LGUI, KC_RALT,          LT1_SPC,          KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+    [1] = LAYOUT(
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
+        QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_NO,
+        KC_NO,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_VOLD,   KC_MUTE, KC_VOLU,          KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+        ),
+    [2] = LAYOUT(
+        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,   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,   KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+        ),
+};
+
+
diff --git a/keyboards/lazydesigners/duo/keymaps/vial/rules.mk b/keyboards/lazydesigners/duo/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..4f7618e9b21
--- /dev/null
+++ b/keyboards/lazydesigners/duo/keymaps/vial/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
diff --git a/keyboards/lazydesigners/duo/keymaps/vial/vial.json b/keyboards/lazydesigners/duo/keymaps/vial/vial.json
new file mode 100644
index 00000000000..0c586f892bc
--- /dev/null
+++ b/keyboards/lazydesigners/duo/keymaps/vial/vial.json
@@ -0,0 +1,33 @@
+{
+  "matrix": {"rows": 4, "cols": 12},
+  "layouts": {
+    "labels": 
+    [
+      ["Style", "Staggered","Ortho"],
+      ["Bottom Row", "Classic", "HHKB Classic","2.25+2","HHKB2.25+2", "3U", "HHKB3U","2X2U","HHKB2X2U"]
+    ],
+    "keymap": [
+      [
+        {"y":0.25,"x":1},"0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11"
+      ],
+      [
+        {"x":1,"w":1.25},"1,0\n\n\n0,0","1,1\n\n\n0,0","1,2\n\n\n0,0","1,3\n\n\n0,0","1,4\n\n\n0,0","1,5\n\n\n0,0","1,6\n\n\n0,0","1,7\n\n\n0,0","1,8\n\n\n0,0","1,9\n\n\n0,0",{"w":1.75},"1,10\n\n\n0,0",
+        {"x":1},"1,0\n\n\n0,1","1,1\n\n\n0,1","1,2\n\n\n0,1","1,3\n\n\n0,1","1,4\n\n\n0,1","1,5\n\n\n0,1","1,6\n\n\n0,1","1,7\n\n\n0,1","1,8\n\n\n0,1","1,9\n\n\n0,1","1,10\n\n\n0,1","1,11\n\n\n0,1"
+      ],
+      [
+        {"x":1,"w":1.75},"2,0\n\n\n0,0","2,1\n\n\n0,0","2,2\n\n\n0,0","2,3\n\n\n0,0","2,4\n\n\n0,0","2,5\n\n\n0,0","2,6\n\n\n0,0","2,7\n\n\n0,0","2,8\n\n\n0,0","2,9\n\n\n0,0",{"w":1.25},"2,10\n\n\n0,0",
+        {"x":1},"2,0\n\n\n0,1","2,1\n\n\n0,1","2,2\n\n\n0,1","2,3\n\n\n0,1","2,4\n\n\n0,1","2,5\n\n\n0,1","2,6\n\n\n0,1","2,7\n\n\n0,1","2,8\n\n\n0,1","2,9\n\n\n0,1","2,10\n\n\n0,1","2,11\n\n\n0,1"
+      ],
+      [
+        {"x":1,"w":1.25},"3,0\n\n\n1,0","3,1\n\n\n1,0",{"w":1.25},"3,2\n\n\n1,0",{"w":2.25},"3,4\n\n\n1,0",{"w":2.75},"3,6\n\n\n1,0",{"w":1.25},"3,8\n\n\n1,0","3,9\n\n\n1,0",{"w":1.25},"3,10\n\n\n1,0",
+        {"x":2.25,"w":1.25,"d": true},"\n\n\n1,1","3,1\n\n\n1,1",{"w":1.25},"3,2\n\n\n1,1",{"w":2.25},"3,4\n\n\n1,1",{"w":2.75},"3,6\n\n\n1,1",{"w":1.25},"3,8\n\n\n1,1","3,9\n\n\n1,1",
+        {"x":1,"w":1.25},"3,0\n\n\n1,2","3,1\n\n\n1,2",{"w":1.25},"3,2\n\n\n1,2",{"w":2.25},"3,4\n\n\n1,2",{"w":2},"3,6\n\n\n1,2","3,7\n\n\n1,2","3,8\n\n\n1,2","3,9\n\n\n1,2",{"w":1.25},"3,10\n\n\n1,2",
+        {"x":2.25,"w":1.25,"d": true},"\n\n\n1,3","3,1\n\n\n1,3",{"w":1.25},"3,2\n\n\n1,3",{"w":2.25},"3,4\n\n\n1,3",{"w":2},"3,6\n\n\n1,3","3,7\n\n\n1,3","3,8\n\n\n1,3","3,9\n\n\n1,3",
+        {"x":1,"w":1.25},"3,0\n\n\n1,4","3,1\n\n\n1,4",{"w":1.25},"3,2\n\n\n1,4","3,4\n\n\n1,4",{"w":3},"3,6\n\n\n1,4","3,7\n\n\n1,4",{"w":1.25},"3,8\n\n\n1,4","3,9\n\n\n1,4",{"w":1.25},"3,10\n\n\n1,4",
+        {"x":2.25,"w":1.25,"d": true},"\n\n\n1,5","3,1\n\n\n1,5",{"w":1.25},"3,2\n\n\n1,5","3,4\n\n\n1,5",{"w":3},"3,6\n\n\n1,5","3,7\n\n\n1,5",{"w":1.25},"3,8\n\n\n1,5","3,9\n\n\n1,5",
+        {"x":1,"w":1.25},"3,0\n\n\n1,6","3,1\n\n\n1,6",{"w":1.25},"3,2\n\n\n1,6",{"w":2},"3,4\n\n\n1,6","3,6\n\n\n1,6",{"w":2},"3,7\n\n\n1,6",{"w":1.25},"3,8\n\n\n1,6","3,9\n\n\n1,6",{"w":1.25},"3,10\n\n\n1,6",
+        {"x":2.25,"w":1.25,"d": true},"\n\n\n1,7","3,1\n\n\n1,7",{"w":1.25},"3,2\n\n\n1,7",{"w":2},"3,4\n\n\n1,7","3,6\n\n\n1,7",{"w":2},"3,7\n\n\n1,7",{"w":1.25},"3,8\n\n\n1,7","3,9\n\n\n1,7"
+      ]
+    ]
+  }
+}
diff --git a/keyboards/lazydesigners/duo/readme.md b/keyboards/lazydesigners/duo/readme.md
new file mode 100644
index 00000000000..efa073c66c9
--- /dev/null
+++ b/keyboards/lazydesigners/duo/readme.md
@@ -0,0 +1,19 @@
+# duo
+
+A gasket mounted 40% keyboard designed and produced in 2024 by [LAZYDESIGNERS](http://lazydesigners.cn).
+An original version was designed by LAZYDESIGNERS in 2018, which is not compatible with the new duo design.
+
+* Keyboard Maintainer: [LAZYDESIGNERS](https://github.com/jackytrabbit)
+* Hardware Supported: duo
+* Hardware Availability: Check [LAZYDESIGNERS's homepage.](http://lazydesigners.cn)
+
+Make example for this keyboard (after setting up your vial build environment):
+
+    make lazydesigners/duo:vial
+
+Flashing example for this keyboard:
+
+    make lazydesigners/duo:vial:flash
+
+**Reset Key:** To enter the bootloader, press the boot button and short the reset pads together on the PCB.
+
diff --git a/keyboards/lazydesigners/duo/rules.mk b/keyboards/lazydesigners/duo/rules.mk
new file mode 100644
index 00000000000..2c43a6d05d7
--- /dev/null
+++ b/keyboards/lazydesigners/duo/rules.mk
@@ -0,0 +1,12 @@
+# 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
\ No newline at end of file
diff --git a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
deleted file mode 100644
index c384c3c5202..00000000000
--- a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-  _QWERTY,
-  _L1,
-  _L2
-};
-
-// Act as Shift on hold and as CapsLock on tap
-#define SFT_CPS LSFT_T(KC_CAPS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- *  ,-----------------------------------------------------------. ,--------------.
- *  |Esc | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |Bspc| | 7  | 8  | 9  |
- *  |-----------------------------------------------------------| |--------------|
- *  | Tab  | A  | S  | D  | F  | G  | H  | J  | K  | L  | Enter | | 4  | 5  | 6  |
- *  |-----------------------------------------------------------| |--------------|
- *  | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  L2 | | 1  | 2  | 3  |
- *  |-----------------------------------------------------------| |--------------|
- *  | Ctrl |Gui | Alt  |  Space  |    Space   | RAlt |RCtrl| L1 | | 0  | .  |Entr|
- *  `-----------------------------------------------------------' `--------------'
- */
-
-[_QWERTY] = LAYOUT(
-QK_GESC, KC_Q,    KC_W,    KC_E,     KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,     KC_P7, KC_P8,   KC_P9,
-KC_TAB,  KC_A,    KC_S,    KC_D,     KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,        KC_ENT,           KC_P4, KC_P5,   KC_P6,
-SFT_CPS, KC_Z,    KC_X,    KC_C,     KC_V,   KC_B,    KC_N,    KC_M,             KC_COMM, KC_DOT,  MO(_L2),     KC_P1, KC_P2,   KC_P3,
-KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,            KC_SPC,                      KC_RALT, KC_RCTL, MO(_L1),     KC_0, KC_PDOT, KC_PENT
-),
-
-/* L1
- *  ,-----------------------------------------------------------. ,--------------.
- *  |  ~ | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  |Del | |NMLK|    | /  |
- *  |-----------------------------------------------------------| |--------------|
- *  |      | F1 | F2 | F3 | F4 | F5 | F6 |    | [  | ]  |  \    | |  - |  = | *  |
- *  |-----------------------------------------------------------| |--------------|
- *  |        | F7 | F8 | F9 |F10 |F11 |F12 | ,  | .  | /  |     | |    |    | -  |
- *  |-----------------------------------------------------------| |--------------|
- *  |      |    |      |         |            |  ;   |  ' |     | |    |    | +  |
- *  `-----------------------------------------------------------' `--------------'
- */
-
-[_L1] = LAYOUT(
-KC_GRAVE,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL, KC_NUM,  _______, KC_PSLS,
-_______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, _______, KC_LBRC, KC_RBRC,          KC_BSLS, KC_MINS,  KC_EQL, KC_PAST,
-_______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_COMM,          KC_DOT , KC_SLSH, _______, _______, _______, KC_PMNS,
-_______, _______, _______,          _______,            _______,                 KC_SCLN, KC_QUOT, _______, _______, _______, KC_PPLS
-),
-
-/* L2
- *  ,-----------------------------------------------------------. ,--------------.
- *  |RST |    |    |    |    |    |    |    |    |    |Ins |Del | |Home|PgUp|    |
- *  |-----------------------------------------------------------| |--------------|
- *  |      |Prev|Play|Next|    |    |    |VolD|Mute|VolU|       | |End |PgDn|    |
- *  |-----------------------------------------------------------| |--------------|
- *  |        |    |    |    |    |    |    |    |    |    |     | |    | up |    |
- *  |-----------------------------------------------------------| |--------------|
- *  |EEPRST|    |      |         |            |      |    |     | |left|down| rt |
- *  `-----------------------------------------------------------' `--------------'
- */
-
-[_L2] = LAYOUT(
-QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,   KC_DEL,     KC_HOME, KC_PGUP, _______,
-_______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU,          _______,     KC_END,  KC_PGDN, _______,
-_______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,     _______,   KC_UP, _______,
-EE_CLR,  _______, _______,          _______,            _______,                 _______, _______, _______,     KC_LEFT, KC_DOWN, KC_RIGHT
-)
-};
-
-bool led_update_user(led_t led_state) {
-  // Turn LED On/Off for Caps Lock
-  if (led_state.caps_lock) {
-    the50_led_on();
-  } else {
-    the50_led_off();
-  }
-  return false;
-}
diff --git a/keyboards/leafcutterlabs/bigknob/keymaps/macos/keymap.c b/keyboards/leafcutterlabs/bigknob/keymaps/macos/keymap.c
deleted file mode 100644
index 7f75aa71212..00000000000
--- a/keyboards/leafcutterlabs/bigknob/keymaps/macos/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 Craig Gardner
-  *
-  * 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/>.
-  */
-
- /*
-    Modifications 1/2023 by Kassandra Karan for MacOS support
-    * Changed Volume up and down to mac scan codes
-    * MacOS doesnt support Stop, so changed default to spotlight search
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers { _MAIN };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-      tap_code(KC_KB_VOLUME_UP); // MacOS Volume Up
-    } else {
-      tap_code(KC_KB_VOLUME_DOWN); // MacOS Volume Down
-    }
-  }
-    return false;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //button closest to USB is first
-  [_MAIN] = LAYOUT(
-     KC_MUTE, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, G(KC_SPC), KC_MNXT
-  )
-};
diff --git a/keyboards/leafcutterlabs/bigknob/keymaps/macos/readme.md b/keyboards/leafcutterlabs/bigknob/keymaps/macos/readme.md
deleted file mode 100644
index 2f613042d38..00000000000
--- a/keyboards/leafcutterlabs/bigknob/keymaps/macos/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# MacOS BigKnob Layout
-
-This is a modification to the BigKnob to support MacOS. The QMK configurator does not 
-support rotary encoders, so this changes the key codes to the Apple volume control
-codes. This also changes the 3rd key from stop, which MacOS does not support, to 
-spotlight search.
diff --git a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c b/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
deleted file mode 100644
index 3f7f7d9c8b1..00000000000
--- a/keyboards/leeku/finger65/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _QWERTY,
-  _FNMS,
-};
-
-#define FNMS MO(_FNMS)
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ( │ ) │ \ │ \ │HOM│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┼───┼───┤
- * │ TAB │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │BKSPC│PGU│
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │   `  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ ENTER  │PGD│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │ SHIFT  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │SHIFT │UP │END│
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
- * │CTRL │GUI│ ALT │      SPACE (6.25u)    │ ALT │CTRL │LFT│DWN│RGT│
- * └─────┴───┴─────┴───────────────────────┴─────┴─────┴───┴───┴───┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_65_ansi_split_bs(
-    QK_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_BSLS, KC_BSLS, 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_BSPC, KC_PGUP,
-    KC_GRV,  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,                       FNMS,             KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [_FNMS] = LAYOUT_65_ansi_split_bs(
-    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_MPLY,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         QK_BOOT, KC_VOLU,
-    AG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,          KC_VOLD,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_BTN1, KC_MS_U,KC_MNXT,
-    _______, _______, _______,                            _______,                   _______,          _______,          KC_MS_L,KC_MS_D, KC_MS_R
-  ),
-};
-
-// layer_state_t layer_state_set_user(layer_state_t state) {
-//   switch(get_highest_layer(state)) {
-//   case _FNMS:
-//     led_off();
-//     rgb_on();
-//     break;
-//   default:
-//     led_off();
-//     rgb_off();
-//     break;
-//   }
-//   return state;
-// }
diff --git a/keyboards/leeku/finger65/keymaps/madhatter/rules.mk b/keyboards/leeku/finger65/keymaps/madhatter/rules.mk
deleted file mode 100644
index 6c605daecf5..00000000000
--- a/keyboards/leeku/finger65/keymaps/madhatter/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/lefty/lefty.h b/keyboards/lefty/lefty.h
deleted file mode 100644
index 2466552353f..00000000000
--- a/keyboards/lefty/lefty.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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"
-
-// keymap
-#define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, \
-	K10, K11, K12, K13, K14, K15, K16,      \
-	K20, K21, K22, K23, K24, K25, K26,      \
-	     K31, K32, K33, K34, K35, K36,      \
-	     K41,      K43, K44,      K46  \
-) \
-{ \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO }, \
-	{ KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   KC_NO }, \
-	{ KC_NO, K41,   KC_NO, K43,   K44,   KC_NO, K46,   KC_NO }  \
-}
-
-#define LAYOUT LAYOUT
diff --git a/keyboards/lefty/rev1/config.h b/keyboards/lefty/rev1/config.h
deleted file mode 100644
index fa70eeb3595..00000000000
--- a/keyboards/lefty/rev1/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
-#define MATRIX_COL_PINS { D4, B5, F5, F6, F7, B1, B3, F4 }
diff --git a/keyboards/lefty/rev1/rev1.c b/keyboards/lefty/rev1/rev1.c
deleted file mode 100644
index 81734fd7fc3..00000000000
--- a/keyboards/lefty/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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 "lefty.h"
diff --git a/keyboards/lefty/rev2/config.h b/keyboards/lefty/rev2/config.h
deleted file mode 100644
index 82894187287..00000000000
--- a/keyboards/lefty/rev2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B6, D7, E6, B4 }
-#define MATRIX_COL_PINS { D4, B5, F5, F6, F7, B1, B3, F4 }
diff --git a/keyboards/lefty/rev2/rev2.c b/keyboards/lefty/rev2/rev2.c
deleted file mode 100644
index 81734fd7fc3..00000000000
--- a/keyboards/lefty/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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 "lefty.h"
diff --git a/keyboards/lefty/rules.mk b/keyboards/lefty/rules.mk
deleted file mode 100644
index bbf738e03bb..00000000000
--- a/keyboards/lefty/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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 = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
-OLED_ENABLE = yes
-
-DEFAULT_FOLDER = lefty/rev2
diff --git a/keyboards/lets_split/keymaps/DE_programming/config.h b/keyboards/lets_split/keymaps/DE_programming/config.h
deleted file mode 100644
index 990d4ed8d5b..00000000000
--- a/keyboards/lets_split/keymaps/DE_programming/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2020 Mose Schmiedel <mose.schmiedel@web.de>
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/lets_split/keymaps/DE_programming/keymap.c b/keyboards/lets_split/keymaps/DE_programming/keymap.c
deleted file mode 100644
index a72ba4f8650..00000000000
--- a/keyboards/lets_split/keymaps/DE_programming/keymap.c
+++ /dev/null
@@ -1,97 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.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 layers {
-  _QWERTZ,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwertz
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   +  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   -  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | AltGr| Alt  |Lower |Space | Space| Raise| Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTZ] = LAYOUT( 
-   KC_TAB,    DE_Q,    DE_W,    DE_E,   DE_R,     DE_T,    DE_Z,    DE_U,    DE_I,    DE_O,    DE_P, KC_BSPC,
-   KC_ESC,    DE_A,    DE_S,    DE_D,    DE_F,    DE_G,    DE_H,    DE_J,    DE_K,    DE_L, DE_PLUS,  KC_ENT,
-  KC_LSFT,    DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,    DE_N,    DE_M, DE_COMM,  DE_DOT, DE_MINS, KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_ALGR, KC_LALT,   LOWER,  KC_SPC,  KC_SPC,   RAISE, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   °  |   !  |   ?  |   §  |   €  |   ~  |   $  |   (  |   )  |   <  |   >  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  | Vol+ | Prev | Next | Play |   &  |   @  |   {  |   }  |   [  |   ]  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| Vol- |      |      |      |   |  |   %  |   /  |   \  |   '  |   "  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      |      |Lower |             | Raise|   =  |   *  |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT( 
-  DE_CIRC, DE_EXLM, DE_QUES, DE_SECT, DE_EURO,  DE_TILD,  DE_DLR, DE_LPRN, DE_RPRN, DE_LABK, DE_RABK, KC_BSPC,
-   KC_DEL, KC_VOLU, KC_MPRV, KC_MNXT, KC_MPLY,  DE_AMPR,   DE_AT, DE_LCBR, DE_RCBR, DE_LBRC, DE_RBRC,  KC_ENT,
-  KC_LSFT, KC_VOLD, _______, _______, _______,  DE_PIPE, DE_PERC, DE_SLSH, DE_BSLS, DE_QUOT, DE_DQUO, KC_RSFT,
-  KC_LCTL, _______, _______, _______, _______,  _______, _______, _______,  DE_EQL, DE_ASTR, _______, _______ 
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   /  |   7  |   8  |   9  |   *  |      |      |      |   #  |  Alt |   `  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |   4  |   5  |   6  |   -  | Pos1 |  End |   ä  |   ö  |   ü  |   ß  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   1  |   2  |   3  |   +  |PageUp|PageDn|      |      |      |      |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   .  |  0   |   =  |Lower |             | Raise|      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT( 
-  DE_SLSH,    KC_7,    KC_8,    KC_9, DE_ASTR, _______, _______, _______, DE_HASH, KC_LALT, DE_ACUT, KC_BSPC,
-   KC_DEL,    KC_4,    KC_5,    KC_6, DE_MINS, KC_HOME,  KC_END,   DE_ADIA, DE_ODIA, DE_UDIA, DE_SS,  KC_ENT,
-  KC_LSFT,    KC_1,    KC_2,    KC_3, DE_PLUS, KC_PGUP, KC_PGDN, _______, _______, _______, _______, KC_LSFT,
-  _______,  DE_DOT,    KC_0,  DE_EQL, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  F13 |  F14 |  F15 |  F16 |  F17 |  F18 |  F19 |  F20 |  F21 |  F22 |  F23 |  F24 |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  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_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-  _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/lets_split/keymaps/DE_programming/readme.md b/keyboards/lets_split/keymaps/DE_programming/readme.md
deleted file mode 100644
index 38e54609b0e..00000000000
--- a/keyboards/lets_split/keymaps/DE_programming/readme.md
+++ /dev/null
@@ -1,57 +0,0 @@
-De_Programming Keymap
-======
-
-Features
---------
-
-Changed Keymap to resemble German Layout. Optimized for Programming
-
-Layout 
---------
-
-    Qwertz
-    ,-----------------------------------------------------------------------------------.
-    | Tab  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  | Bksp |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   +  |Enter |
-    |------+------+------+------+------+------|------+------+------+------+------+------|
-    | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   -  |Shift |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Ctrl | GUI  | AltGr| Alt  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-    `-----------------------------------------------------------------------------------'
-    
-    
-    Lower
-    ,-----------------------------------------------------------------------------------.
-    |   °  |   !  |   ?  |   §  |   €  |   ~  |   $  |   (  |   )  |   <  |   >  | Bksp |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    | Del  |  F1  |  F2  |  F3  |  F4  |   &  |   @  |   {  |   }  |   [  |   ]  |Enter |
-    |------+------+------+------+------+------|------+------+------+------+------+------|
-    | Shift|  F5  |  F6  |  F7  |  F8  |   |  |   %  |   /  |   \  |   '  |   "  |Shift |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Ctrl |  F9  | F10  |  F11 |  F12 |             | Prev | Next | Vol- | Vol+ | Play |
-    `-----------------------------------------------------------------------------------'
-    
-    
-    Raise
-    ,-----------------------------------------------------------------------------------.
-    |   /  |   7  |   8  |   9  |   *  |      |      |      |   #  |  Alt |   `  | Bksp |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    | Del  |   4  |   5  |   6  |   -  | Pos1 |  End |   ä  |   ö  |   ü  |   ß  |Enter |
-    |------+------+------+------+------+------|------+------+------+------+------+------|
-    | Shift|   1  |   2  |   3  |   +  |PageUp|PageDn|      |      |      |      |Shift |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |   .  |  0   |   =  | Enter|             | Prev | Next | Vol- | Vol+ | Play |
-    `-----------------------------------------------------------------------------------'
-    
-    
-    Adjust (Lower + Raise)
-    ,-----------------------------------------------------------------------------------.
-    |  F13 |  F14 |  F15 |  F16 |  F17 |  F18 |  F19 |  F20 |  F21 |  F22 |  F23 |  F24 |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwertz|      |      |      |      |
-    |------+------+------+------+------+------|------+------+------+------+------+------|
-    |      |      |      |      |      |      |      |      |      |      |      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |             |      |      |      |      |      |
-    `-----------------------------------------------------------------------------------'
diff --git a/keyboards/lets_split/keymaps/DE_simple/config.h b/keyboards/lets_split/keymaps/DE_simple/config.h
deleted file mode 100644
index 470fc078542..00000000000
--- a/keyboards/lets_split/keymaps/DE_simple/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#endif
diff --git a/keyboards/lets_split/keymaps/DE_simple/keymap.c b/keyboards/lets_split/keymaps/DE_simple/keymap.c
deleted file mode 100644
index 8396bb2c689..00000000000
--- a/keyboards/lets_split/keymaps/DE_simple/keymap.c
+++ /dev/null
@@ -1,151 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 _QWERTZ 0
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTZ = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwertz
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   +  |  #   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   -  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | AltGr| GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTZ] = LAYOUT(
-  KC_ESC,  DE_Q,    DE_W,    DE_E,    DE_R,    DE_T,    DE_Z,    DE_U,    DE_I,    DE_O,    DE_P,    KC_BSPC,
-  KC_TAB,  DE_A,    DE_S,    DE_D,    DE_F,    DE_G,    DE_H,    DE_J,    DE_K,    DE_L,    DE_PLUS, DE_HASH,
-  KC_LSFT, DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,    DE_N,    DE_M,    DE_COMM, DE_DOT,  DE_MINS, KC_ENT ,
-  KC_LCTL, KC_LALT, KC_ALGR, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   °  |   !  |   "  |   §  |   $  |   %  |   &  |   /  |   (  |   )  |   =  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   @  |   €  |   ü  |   ?  |  ´   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   |  |   ö  |   ä  |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  DE_CIRC, DE_EXLM, DE_DQUO, DE_SECT, DE_DLR,  DE_PERC, DE_AMPR, DE_SLSH, DE_LPRN, DE_RPRN, DE_EQL, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   DE_AT  , DE_EURO, KC_LBRC, DE_QUES, DE_QUOT,
-  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, DE_PIPE , KC_SCLN, KC_QUOT, _______, KC_ENT,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   °  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   {  |   [  |   ]  |   }  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   DE_LCBR, DE_LBRC, DE_RBRC, DE_RCBR , DE_BSLS,
-  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, KC_ENT,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwertz|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTZ,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwertz[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTZ:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwertz);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTZ);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/DE_simple/readme.md b/keyboards/lets_split/keymaps/DE_simple/readme.md
deleted file mode 100644
index c5576d6233d..00000000000
--- a/keyboards/lets_split/keymaps/DE_simple/readme.md
+++ /dev/null
@@ -1,59 +0,0 @@
-De_Simple Keymap
-======
-
-Features
---------
-
-Changed Keymap to reasamble German Layout.
-
-Layout 
---------
-
-    Qwertz
-    ,-----------------------------------------------------------------------------------.
-    | Esc  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  | Bksp |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   +  |  #   |
-    |------+------+------+------+------+------|------+------+------+------+------+------|
-    | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   -  |Enter |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Ctrl | Alt  | AltGr| GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-    `-----------------------------------------------------------------------------------'
-    
-    
-    Lower
-    ,-----------------------------------------------------------------------------------.
-    |   °  |   !  |   "  |   §  |   $  |   %  |   &  |   /  |   (  |   )  |   =  | Bksp |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   @  |   €  |   ü  |   ?  |  ´   |
-    |------+------+------+------+------+------|------+------+------+------+------+------|
-    | Shift|  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   |  |   ö  |   ä  |      |Enter |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-    `-----------------------------------------------------------------------------------'
-    
-    
-    Raise
-    ,-----------------------------------------------------------------------------------.
-    |   °  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   {  |   [  |   ]  |   }  |  \   |
-    |------+------+------+------+------+------|------+------+------+------+------+------|
-    | Shift|  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |Enter |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-    `-----------------------------------------------------------------------------------'
-    
-    
-    Adjust (Lower + Raise)
-    ,-----------------------------------------------------------------------------------.
-    |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwertz|      |      |      |      |
-    |------+------+------+------+------+------|------+------+------+------+------+------|
-    |      |      |      |      |      |      |      |      |      |      |      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |             |      |      |      |      |      |
-    `-----------------------------------------------------------------------------------'
-
-
diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h
deleted file mode 100644
index c2c45bebfd0..00000000000
--- a/keyboards/lets_split/keymaps/adam/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#ifdef KEYBOARD_lets_split_rev2
-    /* RGB Underglow */
-    #undef RGBLED_NUM
-#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 8
-#endif
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 200 //At 500 some bad logic takes hold
-#define PERMISSIVE_HOLD
-
-#endif
diff --git a/keyboards/lets_split/keymaps/adam/keymap.c b/keyboards/lets_split/keymaps/adam/keymap.c
deleted file mode 100644
index ea7006f6cb6..00000000000
--- a/keyboards/lets_split/keymaps/adam/keymap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-// 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 BASE 0 // default layer
-#define FLOCK 1 // symbols arrows and F keys on F held down
-#define JLOCK 2 // same as Flock but with fall thru J and mapped to J held down
-
-#define FLOCK_F LT(FLOCK, KC_F)
-#define FLOCK_J LT(JLOCK, KC_J)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[BASE] = LAYOUT (
-  TD(1),         KC_2,       KC_3,         KC_4,     KC_5,         KC_MINS, KC_EQL,    KC_6,        KC_7,        KC_8,         KC_9,           KC_0,
-  KC_Q,         KC_W,       KC_E,         KC_R,     KC_T,         KC_TAB,  KC_TAB,    KC_Y,        KC_U,        KC_I,         KC_O,           KC_P,
-  SFT_T(KC_A),  ALT_T(KC_S),CTL_T(KC_D),  FLOCK_F,  GUI_T(KC_G),  KC_BSPC, KC_DELETE, GUI_T(KC_H), FLOCK_J,     CTL_T(KC_K),  ALT_T(KC_L),    SFT_T(KC_SCLN),
-  KC_Z,         KC_X,       KC_C,         KC_V,     KC_B,         KC_SPC,  KC_ENT,    KC_N,        KC_M,        KC_COMM,      KC_DOT,         KC_QUOTE
-),
-[FLOCK] = LAYOUT (
-  KC_F1,      KC_F2,      KC_F3,       KC_F4,      KC_F5,      KC_F11,     KC_F12,     KC_F6,      KC_F7,      KC_F8,     KC_F9,    KC_F10,
-  KC_LBRC,    KC_GRV,     KC_TILDE,    S(KC_1),    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_HOME,    KC_PGUP,   XXXXXXX,  KC_RBRC,
-  S(KC_LBRC), _______,    _______,     _______,    _______,    XXXXXXX,    XXXXXXX,    KC_LEFT,    KC_DOWN,    KC_UP,     KC_RIGHT, S(KC_RBRC),
-  KC_BSLS,    KC_PIPE,    XXXXXXX,     XXXXXXX,    XXXXXXX,    KC_ESC,     KC_ESC,     XXXXXXX,    KC_END,     KC_PGDN,   KC_QUES,  KC_SLASH
-),
-[JLOCK] = LAYOUT (
-  KC_F1,      KC_F2,      KC_F3,       KC_F4,      KC_F5,      KC_F11,     KC_F12,     KC_F6,      KC_F7,      KC_F8,     KC_F9,    KC_F10,
-  KC_LBRC,    KC_GRV,     KC_TILDE,    S(KC_1),    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_HOME,    KC_PGUP,   XXXXXXX,  KC_RBRC,
-  S(KC_LBRC), _______,    _______,     _______,    _______,    XXXXXXX,    XXXXXXX,    KC_LEFT,    _______,    KC_UP,     KC_RIGHT, S(KC_RBRC),
-  KC_BSLS,    KC_PIPE,    XXXXXXX,     XXXXXXX,    XXXXXXX,    KC_ESC,     KC_ESC,     XXXXXXX,    KC_END,     KC_PGDN,   KC_QUES,  KC_SLASH
-)
-};
-
-#ifdef TAP_DANCE_ENABLE
-void tap_1(tap_dance_state_t *state, void *user_data) {
-  switch (state->count) {
-  case 1:
-    register_code (KC_1);
-    unregister_code (KC_1);
-    break;
-  case 2:
-    register_code (KC_ESC);
-    unregister_code (KC_ESC);
-    break;
-  case 3:
-    register_code (KC_LSFT);
-    register_code (KC_1);
-    unregister_code (KC_1);
-    unregister_code (KC_LSFT);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-	[0]  = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_ESC),
-  [1]  = ACTION_TAP_DANCE_FN(tap_1)
-};
-#endif
diff --git a/keyboards/lets_split/keymaps/aerialviews007/config.h b/keyboards/lets_split/keymaps/aerialviews007/config.h
deleted file mode 100644
index d9787a247f8..00000000000
--- a/keyboards/lets_split/keymaps/aerialviews007/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
- // place overrides here
-#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                              SONG(COLEMAK_SOUND), \
-                              SONG(DVORAK_SOUND) \
-                            }
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/lets_split/keymaps/aerialviews007/keymap.c b/keyboards/lets_split/keymaps/aerialviews007/keymap.c
deleted file mode 100644
index a86069bbf51..00000000000
--- a/keyboards/lets_split/keymaps/aerialviews007/keymap.c
+++ /dev/null
@@ -1,160 +0,0 @@
-#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 custom_layers {
-    _QWERTY,
-    _COLEMAK,
-    _DVORAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | GEsc |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   @  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-   QK_GESC, 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_AT,   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | GEsc |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   @  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  QK_GESC, 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_ENT ,
-  KC_AT,   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | GEsc |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   @  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  QK_GESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  KC_AT,   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |  F1  |  F2  |  F3  |  F4  |   _  |   %  |   7  |   8  |   9  |   ^  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F5  |  F6  |  F7  |  F8  |   !  |   $  |   4  |   5  |   6  |   0  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F8  |  F9  |  F10 |  F12 |   &  |   #  |   1  |   2  |   3  |   =  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   /  |   -  |   +  |  *   |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,S(KC_MINS), KC_PERC, KC_7,    KC_8,    KC_9,    KC_CIRC, KC_DEL,
-  KC_DEL,  KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_EXLM, KC_DLR,  KC_4,    KC_5,    KC_6,    KC_0,    KC_PIPE,
-  _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_AMPR, KC_HASH, KC_1,    KC_2,    KC_3,    KC_EQL, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_PSLS, KC_PMNS, KC_PPLS, KC_PAST
-),
-
-/* Raise  (Mouse & Media)
- * ,-----------------------------------------------------------------------------------.
- * |   `  |      |      | MsUp |      |  {   |  }   |      | MsWup|      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |      |MsLeft|MsDown|MsRght|  (   |  )   | Lclk |MsWdwn| Rclk |      |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |  [   |  ]   |      |      | Mute |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  KC_GRV,  _______, _______, KC_MS_U, _______, KC_LCBR, KC_RCBR, _______, KC_WH_U, _______, _______, KC_DEL,
-  KC_DEL,  _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_LPRN, KC_RPRN, KC_BTN1, KC_WH_D, KC_BTN2, _______, KC_BSLS,
-  _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, KC_MUTE, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      | Reset|  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/cpeters1982/config.h b/keyboards/lets_split/keymaps/cpeters1982/config.h
deleted file mode 100644
index da37310158a..00000000000
--- a/keyboards/lets_split/keymaps/cpeters1982/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-#define MASTER_RIGHT
-// #define EE_HANDS
-
-// Define Tap Dance interval
-//#define TAPPING_TERM 175
-
-// // Enable LED strip
-#undef RGBLED_NUM
-#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 10
-
-// Space Cadet
-#define LSPO_KEY KC_9
-#define RSPC_KEY KC_0
-#define DISABLE_SPACE_CADET_ROLLOVER
-
-// Auto Shift settings
-#define AUTO_SHIFT_TIMEOUT 165
-// #define NO_AUTO_SHIFT_SPECIAL
-
-#endif
diff --git a/keyboards/lets_split/keymaps/cpeters1982/keymap.c b/keyboards/lets_split/keymaps/cpeters1982/keymap.c
deleted file mode 100644
index 72e380c9684..00000000000
--- a/keyboards/lets_split/keymaps/cpeters1982/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-// #define _DVORAK 2
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  // COLEMAK,
-  // DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-/*
-// Tap dance declerations
-enum {
-  TD_GRV_TILD = 0,
-};
-
-// Tap dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_GRV_TILD] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),
-};
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | ` ~  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bspc |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Rshift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Lalt  | GUI | Esc  |Lower |KC_SPC |Enter |Raise | [cmd|] alt |= Hypr|   -  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-  KC_GRV,  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,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_ESC, TG(_LOWER),  LT(_ADJUST, KC_SPC),  KC_ENT,  TG(_RAISE),   MT(MOD_RGUI, KC_LBRC), MT(MOD_RALT, KC_RBRC), MT(MOD_HYPR, KC_EQL), KC_MINS
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | ESC  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bspc |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_ESC, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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,_______,_______,_______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bspc |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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_MFFD, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |  up  |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      | left | down |right |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |   %  |   `  |   ~  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |AShftD|AShftU|REPORT|      |      |             |  [   |  ]   |   -  |   =  |  \   |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, KC_LEFT,  KC_DOWN, KC_RGHT,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PERC, KC_GRV, KC_TILD,
-  AS_DOWN, AS_UP,   AS_RPT,  _______, _______, _______, _______, KC_RBRC, KC_LBRC, KC_MINS, KC_EQL, KC_BSLS
-)
-
-
-};
-
-/* #ifdef AUDIO_ENABLE
-* float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-* float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-* float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif */
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-};
-
-#define rgblight_set_blue        rgblight_sethsv (0xFF,  0xFF, 0xFF);
-#define rgblight_set_red         rgblight_sethsv (0x00,  0xFF, 0xFF);
-#define rgblight_set_green       rgblight_sethsv (0x78,  0xFF, 0xFF);
-#define rgblight_set_orange      rgblight_sethsv (0x1E,  0xFF, 0xFF);
-#define rgblight_set_teal        rgblight_sethsv (0xC3,  0xFF, 0xFF);
-#define rgblight_set_magenta     rgblight_sethsv (0x12C, 0xFF, 0xFF);
-#define rgblight_set_yellow      rgblight_sethsv (0x3C,  0xFF, 0xFF);
-#define rgblight_set_purple      rgblight_sethsv (0x10E, 0xFF, 0xFF);
-#define rgblight_set_white       rgblight_sethsv (0x00,  0x00, 0xFF);
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-#ifdef RGBLIGHT_ENABLE
-  uint8_t default_layer = eeconfig_read_default_layer();
-  if (rgb_layer_change) {
-    switch (get_highest_layer(state)) {
-    case _RAISE:
-      rgblight_set_orange;
-      rgblight_mode(5);
-      break;
-    case _LOWER:
-      rgblight_set_teal;
-      rgblight_mode(5);
-      break;
-    case _ADJUST:
-      rgblight_set_purple;
-      rgblight_mode(23);
-      break;
-    default:
-      if (default_layer & (1UL << _COLEMAK)) {
-        rgblight_set_magenta;
-      }
-      else if (default_layer & (1UL << _DVORAK)) {
-        rgblight_set_green;
-      }
-      else {
-        rgblight_set_blue;
-      }
-      rgblight_mode(1);
-      break;
-    }
-  }
-#endif
-  return state;
-}
diff --git a/keyboards/lets_split/keymaps/cpeters1982/rules.mk b/keyboards/lets_split/keymaps/cpeters1982/rules.mk
deleted file mode 100644
index 87136eef03e..00000000000
--- a/keyboards/lets_split/keymaps/cpeters1982/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTO_SHIFT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/lets_split/keymaps/fabian/config.h b/keyboards/lets_split/keymaps/fabian/config.h
deleted file mode 100644
index 3e79f43ed06..00000000000
--- a/keyboards/lets_split/keymaps/fabian/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/lets_split/keymaps/fabian/keymap.c b/keyboards/lets_split/keymaps/fabian/keymap.c
deleted file mode 100644
index 0bc95eb74e0..00000000000
--- a/keyboards/lets_split/keymaps/fabian/keymap.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-enum custom_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV,
-};
-
-#define CTL_ESC CTL_T(KC_ESC)  // Tap for Escape, hold for Control
-#define HPR_TAB ALL_T(KC_TAB)  // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define MEH_GRV MEH_T(KC_GRV)  // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
-#define SFT_BSP SFT_T(KC_BSPC) // Tap for Backspace, hold for Shift
-#define SFT_ENT SFT_T(KC_ENT)  // Tap for Enter, hold for Shift
-#define SFT_SPC SFT_T(KC_SPC)  // Tap for Space, hold for Shift
-#define UMLAUT  RALT(KC_U)     // Combine Alt and U
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  |Lower |Space | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-  HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT ,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  |Lower |Space | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT(
-  HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT ,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  |Lower |Space | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT(
-  HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  SFT_BSP, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT ,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MS L | MS D |MS U  | MS R |MS Btn|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | Left | Down |  Up  | Rght |MS_BN2|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_BTN2,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |      |      |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      | Reset|  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/fabian/rules.mk b/keyboards/lets_split/keymaps/fabian/rules.mk
deleted file mode 100644
index 316a4b9cbf4..00000000000
--- a/keyboards/lets_split/keymaps/fabian/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-# UNICODE_ENABLE = yes
-
diff --git a/keyboards/lets_split/keymaps/geripgeri/config.h b/keyboards/lets_split/keymaps/geripgeri/config.h
deleted file mode 100644
index 1091789bf12..00000000000
--- a/keyboards/lets_split/keymaps/geripgeri/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2019 Gergely Peidl
-
-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
-
-// RGB lighting
-#define RGBLIGHT_SLEEP
-#undef RGBLED_NUM
-#define RGBLED_NUM 32
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-
-#define TAPPING_TERM 200
diff --git a/keyboards/lets_split/keymaps/geripgeri/keymap.c b/keyboards/lets_split/keymaps/geripgeri/keymap.c
deleted file mode 100644
index 6bd524c6b95..00000000000
--- a/keyboards/lets_split/keymaps/geripgeri/keymap.c
+++ /dev/null
@@ -1,343 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _NUMPAD,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  NUMPAD = SAFE_RANGE,
-  SLIGHTLY,
-  SMILE,
-  JOY,
-  RELAXED,
-  HEART,
-  SAD,
-  CRY,
-  NETRURAL,
-  SCREAM,
-  THUMBSUP
-};
-
-enum td_extra_keys {
-  U,
-  O,
-  NEXTPREV,
-  SLASH
-};
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} tap;
-
-enum {
-  SINGLE_TAP = 1,
-  SINGLE_HOLD = 2,
-  DOUBLE_TAP = 3,
-  DOUBLE_HOLD = 4,
-  DOUBLE_SINGLE_TAP = 5, //send two single taps
-  TRIPLE_TAP = 6,
-  TRIPLE_HOLD = 7
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-int cur_dance (tap_dance_state_t *state);
-
-void u_finished (tap_dance_state_t *state, void *user_data);
-void o_finished (tap_dance_state_t *state, void *user_data);
-
-uint8_t rgb_mode = RGBLIGHT_MODE_BREATHING + 1;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------.                ,-----------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                |   Y  |   U  |   I  |   O  |   P  |  -   |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |                |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |                |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * | Ctrl | ALT  |Numpad| GUI  |Lower | Space|                | Bksp |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------'                `-----------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINUS,
-   KC_ESC,  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,  TD(SLASH), KC_ENT,
-   KC_LCTL, KC_LALT, MO(_NUMPAD),  KC_LGUI, LOWER, KC_SPC,    KC_BSPC, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------.                ,-----------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |                |   ^  |   &  |   *  |   (  |   )  |  =   |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * |  :)  |  :D  |  :'D |  :$  |  <3  |      |                | Home | Pgup |      |   {  |   }  |  |   |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * |  :(  |  :'( |  :|  |  :O  |  +1  |      |                | End  |Pgdown|      |   [  |   ]  |PrntSc|
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * |      |      |      |      |      |Insert|                |  Del |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------'                `-----------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL,
-  SLIGHTLY, SMILE, JOY, RELAXED, HEART, _______,              KC_HOME, KC_PGUP, _______, KC_LCBR, KC_RCBR, KC_PIPE,
-  SAD, CRY, NETRURAL, SCREAM, THUMBSUP, _______,              KC_END, KC_PGDN,  _______, KC_LBRC, KC_RBRC, KC_PSCR,
-  _______, _______, _______, _______, _______, KC_INSERT,     KC_DEL, _______,  TD(NEXTPREV), KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------.                ,-----------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |                |   6  |   7  |   8  |   9  |   0  |  Del |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                |      |      |      |      |      |      |
- * `-----------------------------------------'                `-----------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,         KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------.                ,-----------------------------------------.
- * | Reset|EEPRST|      |  EE  |      |      |                |      |  UE  |  IE  |  OE  |      |      |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * |      |  AE  |      |      |      |      |                |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                |      |      |      |      |      |      |
- * `-----------------------------------------'                `-----------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  QK_BOOT, EE_CLR,  _______, RALT(KC_SCLN), _______, _______,       _______, TD(U),  RALT(KC_Z),      TD(O),   _______, _______,
-  _______, RALT(KC_QUOT), _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______
-),
-
-/* Numpad
- * ,-----------------------------------------.               ,-----------------------------------------.
- * |      |      |      |      |      |      |               |   7  |   8  |   9  |      |      |      |
- * |------+------+------+------+------+------|               |------+------+------+------+------+------|
- * |      |      |      |      |      |      |               |   4  |   5  |   6  |      |      |      |
- * |------+------+------+------+------+------|               |------+------+------+------+------+------|
- * |  VAI |  SAI |  HUI |      |      |      |               |   3  |   2  |   1  |      |      |      |
- * |------+------+------+------+------+------|               |------+------+------+------+------+------|
- * |      |      |      |      |RGBMOD|RGBTGL|               | Calc |   0  |   +  |      |      |      |
- * `-----------------------------------------'               `-----------------------------------------'
- */
-[_NUMPAD] = LAYOUT_ortho_4x12(
-  _______, _______, _______, _______, _______, _______,       KC_7,    KC_8,   KC_9,    _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,       KC_4,    KC_5,   KC_6,    _______, _______, _______,
-  RGB_VAI, RGB_SAI, RGB_HUI, _______, _______, _______,       KC_1,    KC_2,   KC_3,    _______, _______, _______,
-  _______, _______, _______, _______, RGB_MOD, RGB_TOG,       KC_CALC, KC_0,   KC_PPLS, _______, _______, _______
-)};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case RGB_VAI:
-      if(record->event.pressed) {
-        rgblight_increase_val_noeeprom();
-      }
-      break;
-    case RGB_VAD:
-      if(record->event.pressed) {
-        rgblight_decrease_val_noeeprom();
-      }
-      break;
-    case RGB_SAI:
-      if(record->event.pressed) {
-        rgblight_increase_sat_noeeprom();
-      }
-      break;
-    case RGB_SAD:
-      if(record->event.pressed) {
-        rgblight_decrease_sat_noeeprom();
-      }
-      break;
-    case RGB_HUI:
-      if(record->event.pressed) {
-        rgblight_increase_hue_noeeprom();
-      }
-      break;
-    case RGB_HUD:
-      if(record->event.pressed) {
-        rgblight_decrease_hue_noeeprom();
-      }
-      break;
-    case RGB_TOG:
-      if(record->event.pressed) {
-	rgblight_toggle_noeeprom();
-      }
-      break;
-    case RGB_MOD:
-      if(record->event.pressed) {
-        rgblight_step_noeeprom();
-	rgb_mode = rgblight_get_mode();
-      }
-      break;
-    case RGB_RMOD:
-      if(record->event.pressed) {
-        rgblight_step_reverse_noeeprom();
-	rgb_mode = rgblight_get_mode();
-      }
-      break;
-
-    case SLIGHTLY:
-      if(record->event.pressed) {
-	SEND_STRING(":slightly_smiling_face:");
-      }
-      break;
-    case SMILE:
-      if(record->event.pressed) {
-	SEND_STRING(":smile:");
-      }
-      break;
-    case JOY:
-      if(record->event.pressed) {
-	SEND_STRING(":joy:");
-      }
-      break;
-    case RELAXED:
-      if(record->event.pressed) {
-	SEND_STRING(":relaxed:");
-      }
-      break;
-    case HEART:
-      if(record->event.pressed) {
-	SEND_STRING(":heart:");
-      }
-      break;
-    case SAD:
-      if(record->event.pressed) {
-	SEND_STRING(":white_frowning_face:");
-      }
-      break;
-    case CRY:
-      if(record->event.pressed) {
-	SEND_STRING(":cry:");
-      }
-      break;
-    case NETRURAL:
-      if(record->event.pressed) {
-	SEND_STRING(":neutral_face:");
-      }
-      break;
-    case SCREAM:
-      if(record->event.pressed) {
-	SEND_STRING(":scream:");
-      }
-      break;
-    case THUMBSUP:
-      if(record->event.pressed) {
-	SEND_STRING(":+1:");
-      }
-      break;
-    default:
-      return true;
-  }
-  return false;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-  writePin(B0, !(state & (1UL << (_NUMPAD))));
-
-  switch(get_highest_layer(state)) {
-    case _RAISE:
-      rgblight_setrgb_at(255, 255, 255, RGBLED_NUM / 2);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-    case _LOWER:
-      rgblight_setrgb_at(255, 255, 255, RGBLED_NUM / 2 - 1);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-    case _NUMPAD:
-      rgblight_setrgb_at(0,255,0, 0);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-   default:
-      rgb_mode = RGBLIGHT_MODE_BREATHING + 1;
-      rgblight_mode_noeeprom(rgb_mode);
-      break;
-  }
-  return state;
-}
-
-void led_set_user(uint8_t usb_led) {
-  rgblight_sethsv_noeeprom(0, 255, 255);
-  rgblight_mode_noeeprom(rgb_mode);
-}
-
-int cur_dance (tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted || !state->pressed)  return SINGLE_TAP;
-    //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'.
-    else return SINGLE_HOLD;
-  }
-  else if (state->count == 2) {
-    /*
-     * DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
-     * action when hitting 'pp'. Suggested use case for this return value is when you want to send two
-     * keystrokes of the key, and not the 'double tap' action/macro.
-    */
-    if (state->interrupted) return DOUBLE_SINGLE_TAP;
-    else if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  }
-  //Assumes no one is trying to type the same letter three times (at least not quickly).
-  //If your tap dance key is 'KC_W', and you want to type "www." quickly - then you will need to add
-  //an exception here to return a 'TRIPLE_SINGLE_TAP', and define that enum just like 'DOUBLE_SINGLE_TAP'
-  if (state->count == 3) {
-    if (state->interrupted || !state->pressed)  return TRIPLE_TAP;
-    else return TRIPLE_HOLD;
-  }
-  else return 8; //magic number. At some point this method will expand to work for more presses
-}
-
-static tap utap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-static tap otap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void u_finished (tap_dance_state_t *state, void *user_data) {
-  utap_state.state = cur_dance(state);
-  switch(utap_state.state) {
-    case SINGLE_TAP: SEND_STRING(SS_RALT("]")); break;
-    case DOUBLE_TAP: SEND_STRING(SS_RALT("-")); break;
-    case TRIPLE_TAP: SEND_STRING(SS_RALT("\\")); break;
-  }
-}
-
-void o_finished (tap_dance_state_t *state, void *user_data) {
-  otap_state.state = cur_dance(state);
-  switch(otap_state.state) {
-    case SINGLE_TAP: SEND_STRING(SS_RALT("=")); break;
-    case DOUBLE_TAP: SEND_STRING(SS_RALT("0")); break;
-    case TRIPLE_TAP: SEND_STRING(SS_RALT("[")); break;
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [U] = ACTION_TAP_DANCE_FN(u_finished),
-  [O] = ACTION_TAP_DANCE_FN(o_finished),
-  [NEXTPREV] = ACTION_TAP_DANCE_DOUBLE(KC_MNXT, KC_MPRV),
-  [SLASH] = ACTION_TAP_DANCE_DOUBLE(KC_SLASH, KC_BSLS)
- };
diff --git a/keyboards/lets_split/keymaps/geripgeri/readme.md b/keyboards/lets_split/keymaps/geripgeri/readme.md
deleted file mode 100644
index 09f1bedee79..00000000000
--- a/keyboards/lets_split/keymaps/geripgeri/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Personal Layout
-
-[Layout](http://www.keyboard-layout-editor.com/#/gists/8eae83bfb830d847c94c7ff423bbdc84)
diff --git a/keyboards/lets_split/keymaps/geripgeri/rules.mk b/keyboards/lets_split/keymaps/geripgeri/rules.mk
deleted file mode 100644
index d2259fe9d5b..00000000000
--- a/keyboards/lets_split/keymaps/geripgeri/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-
diff --git a/keyboards/lets_split/keymaps/halvves/config.h b/keyboards/lets_split/keymaps/halvves/config.h
deleted file mode 100644
index 4ba90f2cae9..00000000000
--- a/keyboards/lets_split/keymaps/halvves/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-// smooth mousekeys (copied from the ergo ez config)
-#define MOUSEKEY_INTERVAL 16
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 7
-#define MOUSEKEY_WHEEL_DELAY 0
diff --git a/keyboards/lets_split/keymaps/halvves/keymap.c b/keyboards/lets_split/keymaps/halvves/keymap.c
deleted file mode 100644
index c4702d8f2b8..00000000000
--- a/keyboards/lets_split/keymaps/halvves/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _UTIL,
-  _MOUSE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define UTIL   MO(_UTIL)
-#define MOUSE  MO(_MOUSE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Util | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Mouse| Mouse|      | Util |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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 ,
-  UTIL,    KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   MOUSE,   MOUSE,   XXXXXXX, UTIL
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Util | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Mouse| Mouse|      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  UTIL,    KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   MOUSE,   MOUSE,   XXXXXXX, XXXXXXX
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Util | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Mouse| Mouse|      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  UTIL,    KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   MOUSE,   MOUSE,   XXXXXXX, XXXXXXX
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  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
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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
-),
-
-/* Util
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      | Reset|Reset |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      | LEFT | DOWN |  UP  | RGHT |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_UTIL] = LAYOUT_ortho_4x12(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Mouse
- * ,-----------------------------------------------------------------------------------.
- * |      |      | M Up |      |      |      |      |      |      |L Clk |R Clk | W Up |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |M Left|M Down|M Rght|      |      |      |      |      |      |      |W Down|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MOUSE] = LAYOUT_ortho_4x12(
-  XXXXXXX, XXXXXXX, KC_MS_U, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, KC_WH_U,
-  XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_D,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/halvves/rules.mk b/keyboards/lets_split/keymaps/halvves/rules.mk
deleted file mode 100644
index 6c605daecf5..00000000000
--- a/keyboards/lets_split/keymaps/halvves/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/config.h b/keyboards/lets_split/keymaps/heartrobotninja/config.h
deleted file mode 100644
index bd68b24d083..00000000000
--- a/keyboards/lets_split/keymaps/heartrobotninja/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_TIMEOUT 1000
-
-#undef LEADER_TIMEOUT
-#define LEADER_TIMEOUT 1000
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-
-#undef TAPPING_TOGGLE
-#define TAPPING_TOGGLE 2
-
-#endif
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/keymap.c b/keyboards/lets_split/keymaps/heartrobotninja/keymap.c
deleted file mode 100644
index dc7bc6712e9..00000000000
--- a/keyboards/lets_split/keymaps/heartrobotninja/keymap.c
+++ /dev/null
@@ -1,180 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-// 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 _COLE 0
-#define _LOWER 1
-#define _RAISE 2
-#define _AUX 16
-
-/* Layers */
-enum
-{
-  COLE = 0,
-  LOWER, // right hand 10 key.
-  RAISE, // left hand Fn, right hand symbols.
-  AUX,
-};
-
-/* Tap Dancery */
-enum
-{
-  TD_BTK,
-  TD_TDE,
-  TD_LPRN,
-  TD_RPRN,
-  TD_MIN,
-  TD_USC,
-};
-
-bool time_travel = false;
-
-// Fillers to make layering more clear
-#define ____ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-        /* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | ' " `|   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |  = + | ~ ; :|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ( [ {|   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  | ) ] }|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | - , <|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ?  |   |  |   ^  | _ . >|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Lower |Raise | Ctrl | Alt  | Bksp | Spc  |Enter |LShft | ESC  |  <   |   v  |   >  |
- * `-----------------------------------------------------------------------------------'
- */
-        [_COLE] = LAYOUT(
-            TD(TD_BTK), KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_EQL, TD(TD_TDE),
-            TD(TD_LPRN), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, TD(TD_RPRN),
-            TD(TD_MIN), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_SLSH, KC_BSLS, KC_UP, TD(TD_USC),
-            LOWER, RAISE, OSM(MOD_LCTL), OSM(MOD_LALT), KC_SPC, KC_BSPC, KC_ENT, OSM(MOD_LSFT), KC_ESC, KC_LEFT, KC_DOWN, KC_RGHT),
-
-        /* Lower
- * ,-----------------------------------------------------------------------------------.
- * | ---- | ---- | ---- | ---- | ---- | ---- |   7  |   8  |   9  |   *  |   /  |   ^  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ---- | ---- | ---- | ---- | ---- | ---- |  4   |   5  |   6  |   +  |   -  | ---- |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | ---- | ---- | ---- | ---- | ---- | ---- |  1   |   2  |   3  |   =  | ---- | ---- |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ---- | ---- | ---- | ---- | ---- | ---- | ---- |   0  |   .  | ---- | ---- | ---- |
- * `-----------------------------------------------------------------------------------'
- */
-        [_LOWER] = LAYOUT(
-            ____, ____, ____, ____, ____, ____, KC_7, KC_8, KC_9, KC_PAST, KC_PSLS, KC_CIRC,
-            ____, ____, ____, ____, ____, ____, KC_4, KC_5, KC_6, KC_PPLS, KC_PMNS, ____,
-            ____, ____, ____, ____, ____, ____, KC_1, KC_2, KC_3, KC_PEQL, ____, ____,
-            ____, ____, ____, ____, ____, ____, ____, KC_0, KC_MNXT, ____, ____, ____),
-
-        /* Raise
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |   F4  |  F5  |  F6 |   !  |   @  |   #  |   $  |   %  |  ` ~ |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   ^  |   &  |   *  |   (  |   )  |  - _ |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | ____ | ____ | ____ | ____ | ____ | ____ |  [ { |  ] } |  \ | |  ; : | ' "  |  = + |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ |  , < | . >  |  / ? |
- * `-----------------------------------------------------------------------------------'
- */
-        [_RAISE] = LAYOUT(
-            KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_GRV,
-            KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_MINS,
-            KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_EQL,
-            ____, ____, ____, ____, ____, ____, ____, ____, ____, KC_COMM, KC_DOT, KC_SLSH),
-
-        /* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | Reset| ____ | ____ | ____ | ____ | ____ | ____ | LOCK | ____ | ____ | ____ | VUP  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ____ | ____ |  RUN | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | VDWN |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | PGUP | MUTE |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | HOME | PGDN | END  |
- * `-----------------------------------------------------------------------------------'
- */
-        [_AUX] = LAYOUT(
-            QK_BOOT, ____, ____, ____, ____, ____, ____, LGUI(KC_L), ____, ____, ____, KC_VOLU,
-            ____, ____, LGUI(KC_R), ____, ____, ____, ____, ____, ____, ____, ____, KC_VOLD,
-            ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, KC_PGUP, KC_MUTE,
-            ____, ____, ____, ____, KC_TAB, KC_DEL, ____, ____, ____, KC_HOME, KC_PGDN, KC_END)
-
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-        [TD_BTK] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_GRV),
-        [TD_TDE] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_TILD),
-        [TD_LPRN] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LPRN),
-        [TD_RPRN] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RPRN),
-        [TD_MIN] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_MINS),
-        [TD_USC] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_UNDS)};
-
-void persistent_default_layer_set(uint16_t default_layer)
-{
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-};
-
-void matrix_scan_user(void){};
-
-void matrix_init_user(void){};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  switch (keycode)
-  {
-  case COLE:
-    if (record->event.pressed)
-    {
-      persistent_default_layer_set(1UL << _COLE);
-    }
-    return false;
-    break;
-  case LOWER:
-    if (record->event.pressed)
-    {
-      layer_on(_LOWER);
-      update_tri_layer(_LOWER, _RAISE, _AUX);
-    }
-    else
-    {
-      layer_off(_LOWER);
-      update_tri_layer(_LOWER, _RAISE, _AUX);
-    }
-    return false;
-    break;
-  case RAISE:
-    if (record->event.pressed)
-    {
-      layer_on(_RAISE);
-      update_tri_layer(_LOWER, _RAISE, _AUX);
-    }
-    else
-    {
-      layer_off(_RAISE);
-      update_tri_layer(_LOWER, _RAISE, _AUX);
-    }
-    return false;
-    break;
-  case AUX:
-    if (record->event.pressed)
-    {
-      layer_on(_AUX);
-    }
-    else
-    {
-      layer_off(_AUX);
-    }
-    return false;
-    break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/rules.mk b/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
deleted file mode 100644
index 9c6a3661370..00000000000
--- a/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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
-TAP_DANCE_ENABLE = yes
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SWAP_HANDS_ENABLE = no        # Enable one-hand typing
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/lets_split/keymaps/henxing/Readme.md b/keyboards/lets_split/keymaps/henxing/Readme.md
deleted file mode 100644
index 231aa6adf39..00000000000
--- a/keyboards/lets_split/keymaps/henxing/Readme.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Let's Split the Atreus
-
-This keymap is a port of the Atreus keymap to the Let's Split keyboard, using a
-similar method of handling layer switches as the `default` keymap.
-
-
-# Layers
-
-The following tables are the layers as implemented.
-
-### Underscores in Layer
-
-Any underscore represents a key that is mapped to `KC_NO`, or no keypress. The
-2x3 block in the middle is like this because the Atreus does not have any keys
-there. It has been left blank for the user to add her own special keypresses or
-macros that she finds useful to have on that particular layer.
-
-
-## `_QWERTY`
-
-```c
-/*
- *  q   w   e    r    t    _    _    y   u   i  o   p
- *  a   s   d    f    g    _    _    h   j   k  l   ;
- *  z   x   c    v    b    _    _    n   m   ,  .   /
- * esc tab gui shift bksp ctrl alt space fn  -  ' enter
- */
- ```
-
-
-## `_LOWER`
-
-```c
-/*
- *  !       @     up     {    }    _     _  pgup    7     8     9    *
- *  #     left   down  right  $    _     _  pgdn    4     5     6    +
- *  [       ]      (     )    &    _     _    `     1     2     3    \
- * lower  insert  gui  shift bksp ctrl  alt space   fn    .     0    =
- */
- ```
-
-## `_RAISE`
-
-```c
-/*
- * insert home   up   end  pgup   _     _   up     F7    F8    F9   F10
- *  del   left  down right pgdn   _     _  down    F4    F5    F6   F11
- *   _   volup    _    _   reset  _     _          F1    F2    F3   F12
- *   _   voldn super shift bksp  ctrl  alt space   L0  prtsc scroll pause
- */
- ```
diff --git a/keyboards/lets_split/keymaps/henxing/config.h b/keyboards/lets_split/keymaps/henxing/config.h
deleted file mode 100644
index 470fc078542..00000000000
--- a/keyboards/lets_split/keymaps/henxing/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#endif
diff --git a/keyboards/lets_split/keymaps/henxing/keymap.c b/keyboards/lets_split/keymaps/henxing/keymap.c
deleted file mode 100644
index ea897a1fda5..00000000000
--- a/keyboards/lets_split/keymaps/henxing/keymap.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 1
-#define _RAISE 2
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /*
-     *  q   w   e    r    t    _    _    y   u   i  o   p
-     *  a   s   d    f    g    _    _    h   j   k  l   ;
-     *  z   x   c    v    b    _    _    n   m   ,  .   /
-     * esc tab gui shift bksp ctrl alt space fn  -  ' enter
-     */
-    [_QWERTY] = LAYOUT(
-            KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_NO,   KC_NO,   KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,
-            KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_NO,   KC_NO,   KC_H,    KC_J,     KC_K,    KC_L,    KC_SCLN,
-            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_NO,   KC_NO,   KC_N,    KC_M,     KC_COMM, KC_DOT,  KC_SLSH,
-            KC_ESC, KC_TAB, KC_LGUI,  KC_LSFT,  KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  LOWER,    KC_MINS, KC_QUOT, KC_ENT
-            ),
-
-    /*
-     *  !       @     up     {    }    _     _  pgup    7     8     9    *
-     *  #     left   down  right  $    _     _  pgdn    4     5     6    +
-     *  [       ]      (     )    &    _     _    `     1     2     3    \
-     * lower  insert  gui  shift bksp ctrl  alt space   fn    .     0    =
-     */
-    [_LOWER] = LAYOUT(
-            KC_EXLM,  KC_AT,   KC_UP,   KC_LCBR, KC_RCBR, KC_NO,   KC_NO,   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR,
-            KC_HASH,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  KC_NO,   KC_NO,   KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS,
-            KC_LBRC,  KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_NO,   KC_NO,   KC_GRV,  KC_1,    KC_2,   KC_3, KC_BSLS,
-            RAISE,    KC_INS,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  KC_TRNS, KC_DOT, KC_0, KC_EQL
-            ),
-
-    /*
-     * insert home   up   end  pgup   _     _   up     F7    F8    F9   F10
-     *  del   left  down right pgdn   _     _  down    F4    F5    F6   F11
-     *   _   volup    _    _   reset  _     _          F1    F2    F3   F12
-     *   _   voldn super shift bksp  ctrl  alt space   L0  prtsc scroll pause
-     */
-    [_RAISE] = LAYOUT(
-            KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_NO,   KC_NO,   KC_UP,   KC_F7,    KC_F8,   KC_F9,   KC_F10,
-            KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO,   KC_NO,   KC_DOWN, KC_F4,    KC_F5,   KC_F6,   KC_F11,
-            KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, QK_BOOT, KC_NO,   KC_NO,   KC_TRNS, KC_F1,    KC_F2,   KC_F3,   KC_F12,
-            KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  QWERTY,   KC_PSCR, KC_SCRL, KC_PAUS
-            )
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    // The value to return
-    bool return_value = false;
-
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-                PLAY_SONG(tone_qwerty);
-#endif
-                persistent_default_layer_set(1UL<<_QWERTY);
-            }
-            break;
-
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-            } else {
-                layer_off(_LOWER);
-            }
-            break;
-
-        case RAISE:
-            persistent_default_layer_set(1UL<<_RAISE);
-            break;
-        default:
-
-            // If the keycode is not handled by any of the other cases, we
-            // should return true
-            return_value = true;
-            break;
-    }
-
-    return return_value;
-}
diff --git a/keyboards/lets_split/keymaps/khord/config.h b/keyboards/lets_split/keymaps/khord/config.h
deleted file mode 100644
index 489e76612ae..00000000000
--- a/keyboards/lets_split/keymaps/khord/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 150
-
-/* Select hand configuration */
-
-//#define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#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
-
-
-#endif
diff --git a/keyboards/lets_split/keymaps/khord/keymap.c b/keyboards/lets_split/keymaps/khord/keymap.c
deleted file mode 100644
index fd259ac2a09..00000000000
--- a/keyboards/lets_split/keymaps/khord/keymap.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  ADMIN,
-  SMSPC1
-};
-
-// Tap Dance Declarations
-enum {
-  SFT_CAP = 0
-};
-
-// Dylan's additions
-#define C_A_DEL LALT(LCTL(KC_DEL))
-#define C_A_INS LALT(LCTL(KC_INS))
-#define MAC_LOK LCTL(LGUI(KC_Q))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_BSPC,
-  CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  TD(SFT_CAP),   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_T(KC_ENT),
-  ADJUST,        KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |  END | HOME |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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,  MAC_LOK, _______, KC_END,  KC_HOME, _______,
-  LCTL(KC_UP), KC_BTN3, KC_BTN2, KC_BTN1, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |PG DN |PG UP |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | MB1  | MB2  | MB3  | MB4  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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_PGDN, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |AGnorm|AGswap|      |      |      |string|string|  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |RGBMOD|HUE-UP|SAT-UP|BRI-UP|      |PLAIN |BREATH|RANBOW| SWIRL|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |RGBTOG|HUE-DN|SAT-DN|BRI-DN|      |GRDNT | XMAS |KNIGHT| SNAKE|      | CAIns|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | CADel|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT(
-  _______, QK_BOOT, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, ADMIN,    SMSPC1,  KC_DEL,
-  _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, _______, _______,
-  _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, RGB_M_G, RGB_M_X, RGB_M_K, RGB_M_SN, _______, C_A_INS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, C_A_DEL
-)
-
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [SFT_CAP] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-    case ADMIN:
-      if (record->event.pressed) {
-        SEND_STRING("Administrator");
-      }
-      return false;
-      break;
-    case SMSPC1:
-      if (record->event.pressed) {
-        SEND_STRING("Simspace1!");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/khord/rules.mk b/keyboards/lets_split/keymaps/khord/rules.mk
deleted file mode 100644
index 32b6edc121a..00000000000
--- a/keyboards/lets_split/keymaps/khord/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TAP_DANCE_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-USE_I2C = no
-
diff --git a/keyboards/lets_split/keymaps/kris/keymap.c b/keyboards/lets_split/keymaps/kris/keymap.c
deleted file mode 100644
index b7789b07273..00000000000
--- a/keyboards/lets_split/keymaps/kris/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift||
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Alt  |  Gui |Caps  |Lower |Space |Space |Raise | [    | ]    |  -   |Ctrl  |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_BSPC,
-  KC_LCTL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT ,
-  ADJUST, KC_LALT,  KC_LGUI, KC_CAPS,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LBRC, KC_RBRC, KC_MINS,   KC_RCTL
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  ADJUST, KC_LALT,  KC_LGUI, KC_CAPS,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LBRC, KC_RBRC, KC_MINS,   KC_RCTL
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  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
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   4  |   5  |   6  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_4, KC_5,  KC_6, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_1, KC_2, KC_3, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_0, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/krusli/keymap.c b/keyboards/lets_split/keymaps/krusli/keymap.c
deleted file mode 100644
index 6330ef6fb94..00000000000
--- a/keyboards/lets_split/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,234 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _NUMPAD 5
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-  NUMPAD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Numpad| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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 ,
-  NUMPAD,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  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
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | Home | End  | PgUp | PgDn |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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_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_HOME, KC_END,  KC_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Numpad
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |  7   |  8   |  9   |  *   |  /   |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | <--  |  4   |  5   |  6   |  +   |  -   |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  1   |  2   |  3   |Enter |Enter |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Qwerty|  0   |  .   |  .   |Enter |Enter        |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_ortho_4x12(
-  KC_ESC,  KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______,
-  KC_BSPC, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______,
-  _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______,
-  QWERTY,  KC_P0,   KC_PDOT, KC_PDOT, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case NUMPAD:
-      if (record->event.pressed)
-        persistent_default_layer_set(1UL<<_NUMPAD);
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/krusli/readme.md b/keyboards/lets_split/keymaps/krusli/readme.md
deleted file mode 100644
index 175ef3c11a5..00000000000
--- a/keyboards/lets_split/keymaps/krusli/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# krusli
-Let's Split keymap based off the default Planck layout with a numpad layer.
diff --git a/keyboards/lets_split/keymaps/mbsurfer/config.h b/keyboards/lets_split/keymaps/mbsurfer/config.h
deleted file mode 100644
index e9f43a72c6b..00000000000
--- a/keyboards/lets_split/keymaps/mbsurfer/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 100
-
-/* Select hand configuration */
-
-//#define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#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 8
-
-#endif
diff --git a/keyboards/lets_split/keymaps/mbsurfer/keymap.c b/keyboards/lets_split/keymaps/mbsurfer/keymap.c
deleted file mode 100644
index 9748db99d13..00000000000
--- a/keyboards/lets_split/keymaps/mbsurfer/keymap.c
+++ /dev/null
@@ -1,270 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern rgblight_config_t rgblight_config;
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// Tap Dance Declarations
-enum {
-  SFT_CAP = 0,
-  LFT_HOM,
-  DWN_PDN,
-  UPP_PUP,
-  RGT_END
-};
-
-// Task Manager
-#define C_S_ESC LSFT(LCTL(KC_ESC))
-#define C_A_DEL LALT(LCTL(KC_DEL))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,------------------------------------------     ------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |     |  Y   |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |     |  H   |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |     |  N   |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+     +------+------+------+------+------+------|
-*  |Adjust| Ctrl | Alt  | GUI  |Lower |Space |     |Space |Raise | Left | Down |  Up  |Right |
- * `------------------------------------------     ------------------------------------------'
- */
-[_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_BSPC,
-  CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,        KC_L,        KC_SCLN,     KC_QUOT,
-  TD(SFT_CAP),   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,     KC_DOT,      KC_SLSH,     SFT_T(KC_ENT),
-  ADJUST,        KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   TD(LFT_HOM), TD(DWN_PDN), TD(UPP_PUP), TD(RGT_END)
-),
-
-/* Colemak
- * ,------------------------------------------     ------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |     |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |     |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |     |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+     +------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |     |Space |Raise | Left | Down |  Up  |Right |
- * `------------------------------------------     ------------------------------------------'
- */
-[_COLEMAK] = LAYOUT(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,------------------------------------------     ------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |     |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |     |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |     |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+     +------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |     |Space |Raise | Left | Down |  Up  |Right |
- * `------------------------------------------     ------------------------------------------'
- */
-[_DVORAK] = LAYOUT(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,------------------------------------------     ------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |     |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |     |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |     |  F12 |ISO ~ |ISO | |  END | HOME |Enter |
- * |------+------+------+------+------+------+     +------+------+------+------+------+------|
- * |      |      |      |      |      |      |     |      |      | Next | Vol- | Vol+ | Play |
- * `------------------------------------------     ------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_END,  KC_HOME, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,------------------------------------------     ------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |     |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |     |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |     |  F12 |ISO # |ISO / |PG DN |PG UP |Enter |
- * |------+------+------+------+------+------+     +------+------+------+------+------+------|
- * |      |      |      |      |      |      |     |      |      | Next | Vol- | Vol+ | Play |
- * `------------------------------------------     ------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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_PGDN, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,------------------------------------------     ------------------------------------------.
- * | Reset|      | Plain|Breath|Rainbw| Swirl|     | Snake|Knight| Xmas |Grdent|      |  Del |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|     |AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+-------     -------+------+------+------+------+------|
- * |      |Toggle| Mode | Hue- | Hue+ | Sat- |     | Sat+ | Val- | Val+ |      |      |      | (RGB)
- * |------+------+------+------+------+------+     +------+------+------+------+------+------|
- * |      |      |      |      |      |      |     |      |      |      |      |TskMng|CAltDe|
- * `------------------------------------------     ------------------------------------------'
- */
-[_ADJUST] =  LAYOUT(
-  QK_BOOT, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,  AG_SWAP,  QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD,  RGB_SAI,  RGB_VAD, RGB_VAI, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, C_S_ESC, C_A_DEL
-)
-
-
-};
-
-int RGB_current_mode;
-int RGB_current_hue;
-
-tap_dance_action_t tap_dance_actions[] = {
-  [SFT_CAP] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-  [LFT_HOM] = ACTION_TAP_DANCE_DOUBLE(KC_LEFT, KC_HOME),
-  [DWN_PDN] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_PGDN),
-  [UPP_PUP] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_PGUP),
-  [RGT_END] = ACTION_TAP_DANCE_DOUBLE(KC_RGHT, KC_END)
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-
-        if (IS_LAYER_OFF(_RAISE) && IS_LAYER_OFF(_ADJUST)) {
-          // Save current RGB info
-          RGB_current_mode = rgblight_config.mode;
-          RGB_current_hue = rgblight_config.hue;
-
-          // Set RGB to Blue
-          rgblight_mode(1);
-          rgblight_setrgb(0, 0, 255);
-        }
-
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-
-        if (IS_LAYER_ON(_ADJUST)){
-          // Set RGB to cyan
-          rgblight_setrgb(0, 255, 255);
-        }
-      } else {
-
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-
-        if (IS_LAYER_OFF(_RAISE) && IS_LAYER_OFF(_ADJUST)) {
-          // Reset RGB
-          rgblight_mode(RGB_current_mode);
-          rgblight_sethsv(RGB_current_hue, rgblight_config.sat, rgblight_config.val);
-        } else if (IS_LAYER_ON(_RAISE)){
-          // Set RGB to Red
-          rgblight_setrgb(0, 255, 0);
-        }
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-
-        if (IS_LAYER_OFF(_LOWER) && IS_LAYER_OFF(_ADJUST)) {
-          // Save current RGB info
-          RGB_current_mode = rgblight_config.mode;
-          RGB_current_hue = rgblight_config.hue;
-
-          // Set RGB to Green
-          rgblight_mode(1);
-          rgblight_setrgb(0, 255, 0);
-        }
-
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-
-        if (IS_LAYER_ON(_ADJUST)){
-          // Set RGB to cyan
-          rgblight_setrgb(0, 255, 255);
-        }
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-
-        if (IS_LAYER_OFF(_LOWER) && IS_LAYER_OFF(_ADJUST)) {
-          // Reset RGB
-          rgblight_mode(RGB_current_mode);
-          rgblight_sethsv(RGB_current_hue, rgblight_config.sat, rgblight_config.val);
-        } else if (IS_LAYER_ON(_LOWER)){
-          // Set RGB to Blue
-          rgblight_setrgb(0, 0, 255);
-        }
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/mbsurfer/rules.mk b/keyboards/lets_split/keymaps/mbsurfer/rules.mk
deleted file mode 100644
index 32b6edc121a..00000000000
--- a/keyboards/lets_split/keymaps/mbsurfer/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TAP_DANCE_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-USE_I2C = no
-
diff --git a/keyboards/lets_split/keymaps/mekberg/README.md b/keyboards/lets_split/keymaps/mekberg/README.md
deleted file mode 100644
index a24a5735613..00000000000
--- a/keyboards/lets_split/keymaps/mekberg/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Let's Mekberg!
-
-This is my take on a Swedish 40% layout in a split format. The priority is to have the most highly used keys opposite the modifier to make chording simpler. In other words, if the layer modifier is on the left half, the most used keys should be bound on the right half.
-
-## Layers
-
-### Default
-
-The default layer has normal alpha layout with the addition of Swedish letters, causing Enter to move down one key and backspace to take the place of the right space. The enter key also doubles as Shift when held.
-
-2nd row left modifier has been bound to both Ctrl and Tab with modtap (hold for Ctrl, tap for Tab).
-
-Delete is available on all non-default layers, positioned on the upper right corner key.
-
-### Raise
-
-The raised layer has all the symbols and special characters predefined. As much as possible, there should be no need to use additional modifiers.
-
-Arrow keys have been disabled on this layer to avoid accidental misclicks when pressing the Raise key.
-
-#### macOS / Windows variants
-
-Because macOS and Windows expect quite different keycodes to produce the same special characters (for example '{' or  '|'), there are two different layers, one for each OS. To toggle either macOS (default) and Windows layouts within the RAISE layer, press SPECIAL + W for Windows or SPECIAL + M for macOS.
-
-### Lower
-
-The lower layer focuses on numbers, with a numpad-like layout on the right and F-keys in a homerow-centric layout on the left.
-
-### Special
-
-The special layer has Reset and EEP Reset keys on the left half, along with media and volume controls. On the right half it has movement keys starting in the IJKL cluster. Additionally, custom macOS Sleep and Lock Screen keys can be found on the right half on this layer.
-
-## Configuration
-
-### PERMISSIVE_HOLD
-
-This option is used because otherwise modtap functions would fail to trigger. This increases reliability for me.
-
-### EE_HANDS
-
-Prepared for EEPROM settings and different keymaps depending on USB port connected, but default master side remains left regardless.
-
-## Building
-
-Clean the build environment:
-
-```shell
-make clean
-```
-
-Build and flash left side:
-
-```shell
-make lets_split/rev2:mekberg:avrdude-split-left
-```
-
-Then do the same for the right side:
-
-```shell
-make lets_split/rev2:mekberg:avrdude-split-right
-```
diff --git a/keyboards/lets_split/keymaps/mekberg/config.h b/keyboards/lets_split/keymaps/mekberg/config.h
deleted file mode 100644
index 41ce1b15662..00000000000
--- a/keyboards/lets_split/keymaps/mekberg/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-// Define some configuration for modtap behavior
-// #define TAPPING_TERM 150
-#define PERMISSIVE_HOLD
-
-/* Select hand configuration */
-//#define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
diff --git a/keyboards/lets_split/keymaps/mekberg/keymap.c b/keyboards/lets_split/keymaps/mekberg/keymap.c
deleted file mode 100644
index e8cfa038888..00000000000
--- a/keyboards/lets_split/keymaps/mekberg/keymap.c
+++ /dev/null
@@ -1,228 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/*
-Let's Split physical layout
-1u == 8chars
-* == Homing keys
-                             LEFT                                                     RIGHT
-   ,-----------------------------------------------------.   ,-----------------------------------------------------.
-   |        |        |        |        |        |        |   |        |        |        |        |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |        |   *    |        |   |        |   *    |        |        |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |        |        |        |   |        |        |        |        |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |        |        |        |   |        |        |        |        |        |        |
-   `-----------------------------------------------------´   `-----------------------------------------------------'
-*/
-
-// Layers
-enum layer_names {
-    _DEFAULT,
-    _DEFAULT_MAC,
-    _DEFAULT_WIN,
-    _RAISE_MAC,
-    _RAISE_WIN,
-    _LOWER,
-    _SPECIAL,
-};
-
-#define TO_MAC TO(_DEFAULT)
-#define TO_WIN TO(_DEFAULT_WIN)
-
-#define RAISE_M MO(_RAISE_MAC)
-#define RAISE_W MO(_RAISE_WIN)
-#define LOWER MO(_LOWER)
-#define SPECIAL MO(_SPECIAL)
-
-// Modifiers
-#define SFTENT SC_SENT          // Enter => Shift when held
-#define CTLTAB LCTL_T(KC_TAB)   // Tab => Ctrl when held
-
-// ISO keycodes with Swedish layout names
-#define SE_PLUS KC_MINS         // +
-#define SE_QSTM S(SE_PLUS)      // Question mark
-#define SE_TCK KC_EQL           // Fronttick (´)
-#define SE_BTCK S(SE_TCK)       // Backtick (`)
-#define SE_UML KC_RBRC          // Umlaut (¨)
-#define SE_TAK S(SE_UML)        // Caret (^)
-#define SE_TILD RALT(SE_UML)    // Tilde (~)
-#define SE_QUT KC_NUHS          // Singlequote (')
-#define SE_DQUT S(KC_2)         // Doublequote (")
-#define SE_AST S(SE_QUT)        // Asterisk
-#define SE_AUML KC_QUOT         // Ä
-#define SE_ARNG KC_LBRC         // Å
-#define SE_OUML KC_SCLN         // Ö
-#define SE_LT KC_NUBS           // <
-#define SE_GT S(SE_LT)          // >
-#define SE_DASH KC_SLSH         // -
-#define SE_USCR S(SE_DASH)      // _
-#define SE_AT RALT(KC_2)        // @
-#define SE_EXCL S(KC_1)         // !
-#define SE_HASH S(KC_3)         // #
-#define SE_USD RALT(KC_4)       // $
-#define SE_PCNT S(KC_5)         // %
-#define SE_AMP S(KC_6)          // &
-#define SE_EQLS S(KC_0)         // =
-
-// Apple-specific layout keys
-#define AP_SLS S(KC_7)          // /
-#define AP_PIPE LALT(KC_7)      // |
-#define AP_BSLS A(AP_SLS)       // Backslash
-#define AP_LCBR A(AP_LPAR)      // {
-#define AP_RCBR A(AP_RPAR)      // }
-#define AP_LBR A(KC_8)          // [
-#define AP_RBR A(KC_9)          // ]
-#define AP_LPAR S(KC_8)         // (
-#define AP_RPAR S(KC_9)         // )
-
-// Windows-specific layout keys
-#define MS_SLS S(KC_7)          // /
-#define MS_PIPE RALT(SE_LT)     // |
-#define MS_BSLS RALT(SE_PLUS)   // Backslash
-#define MS_LCBR RALT(KC_7)      // {
-#define MS_RCBR RALT(KC_0)      // }
-#define MS_LBR RALT(KC_8)       // [
-#define MS_RBR RALT(KC_9)       // ]
-#define MS_LPAR S(KC_8)         // (
-#define MS_RPAR S(KC_9)         // )
-
-// My common shortcuts
-#define MY_PREV KC_MRWD         // Media: Previous
-#define MY_NEXT KC_MFFD         // Media: Next
-#define MY_PLAY KC_MPLY         // Media: Play/Pause
-#define MY_LOCK C(A(KC_L))      // Mac: Lock
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
-DEFAULT
-    Main layout for alphas and modifiers
-    Tab => Ctrl when held
-    Esc => MOVEMENT layer when held
-    Enter => Shift when held
-                             LEFT                                                     RIGHT
-   ,-----------------------------------------------------.   ,-----------------------------------------------------.
-   |   Esc  |   Q    |   W    |   E    |   R    |   T    |   |   Y    |   U    |   I    |   O    |   P    |   Å    |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |Ctrl/Tab|   A    |   S    |   D    |   F   *|   G    |   |   H    |*  J    |   K    |   L    |   Ö    |   Ä    |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |  Shift |   Z    |   X    |   C    |   V    |   B    |   |   N    |   M    |   ,    |   .    |   -    | Enter  |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   | SPECIAL|  Ctrl  |  Alt   |  Cmd   | LOWER  | Space  |   | Backspc| RAISE  |  Left  |  Down  |   Up   | Right  |
-   `-----------------------------------------------------´   `-----------------------------------------------------'
-*/
-[_DEFAULT] = LAYOUT_ortho_4x12(
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    SE_ARNG,
-    CTLTAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    SE_OUML, SE_AUML,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  SE_DASH, SFTENT,
-    SPECIAL, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,      KC_BSPC, RAISE_M, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/*
-DEFAULT - Windows
-                             LEFT                                                     RIGHT
-   ,-----------------------------------------------------.   ,-----------------------------------------------------.
-   |        |        |        |        |        |        |   |        |        |        |        |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |        |   *    |        |   |        |   *    |        |        |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |        |        |        |   |        |        |        |        |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |        |        |        |   |        | RAISE  |        |        |        |        |
-   `-----------------------------------------------------´   `-----------------------------------------------------'
-*/
-[_DEFAULT_WIN] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,     _______, RAISE_W, _______, _______, _______, _______
-),
-
-/*
-RAISE - Mac
-    This layer focuses on symbols and special characters.
-
-                             LEFT                                                     RIGHT
-   ,-----------------------------------------------------.   ,-----------------------------------------------------.
-   |        |   !    |   ?    |   {    |   }    |   &    |   |   ^    |   |    |   `    |   ´    |        |   Del  |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |   #    |   $    |   (    |   )   *|   "    |   |   ~    |*  /    |   \    |   ¨    |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |   @    |   %    |   [    |   ]    |   '    |   |        |   <    |   >    |        |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |        |        |        |   |        |XXXXXXXX|        |        |        |        |
-   `-----------------------------------------------------´   `-----------------------------------------------------'
-*/
-[_RAISE_MAC] = LAYOUT_ortho_4x12(
-    _______, SE_EXCL, SE_QSTM, AP_LCBR, AP_RCBR, SE_AMP,      SE_TAK,  AP_PIPE, SE_BTCK, SE_TCK,  _______, KC_DEL,
-    _______, SE_HASH, SE_USD,  AP_LPAR, AP_RPAR, SE_DQUT,     SE_TILD, AP_SLS,  AP_BSLS, SE_UML,  _______, _______,
-    _______, SE_AT,   SE_PCNT, AP_LBR,  AP_RBR,  SE_QUT,      _______, SE_LT,   SE_GT,   _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,     _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/*
-RAISE - Windows
-    This layer focuses on symbols and special characters.
-
-                             LEFT                                                     RIGHT
-   ,-----------------------------------------------------.   ,-----------------------------------------------------.
-   |        |   !    |   ?    |   {    |   }    |   &    |   |   ^    |   |    |   `    |   ´    |        |   Del  |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |   #    |   $    |   (    |   )   *|   "    |   |   ~    |*  /    |   \    |   ¨    |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |   @    |   %    |   [    |   ]    |   '    |   |        |   <    |   >    |        |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |        |        |        |   |        |XXXXXXXX|        |        |        |        |
-   `-----------------------------------------------------´   `-----------------------------------------------------'
-*/
-[_RAISE_WIN] = LAYOUT_ortho_4x12(
-    _______, SE_EXCL, SE_QSTM, MS_LCBR, MS_RCBR, SE_AMP,      SE_TAK,  MS_PIPE, SE_BTCK, SE_TCK,  _______, KC_DEL,
-    _______, SE_HASH, SE_USD,  MS_LPAR, MS_RPAR, SE_DQUT,     SE_TILD, MS_SLS,  MS_BSLS, SE_UML,  _______, _______,
-    _______, SE_AT,   SE_PCNT, MS_LBR,  MS_RBR,  SE_QUT,      _______, SE_LT,   SE_GT,   _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,     _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/*
-LOWER
-    This layer focuses on numbers and math.
-                             LEFT                                                     RIGHT
-   ,-----------------------------------------------------.   ,-----------------------------------------------------.
-   |        |  F1    |  F2    |  F3    |  F4    |        |   |   *    |   7    |   8    |   9    |   -    |   Del  |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |  F5    |  F6    |  F7    |  F8   *|        |   |   /    |*  4    |   5    |   6    |   +    |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |  F9    |  F10   |  F11   |  F12   |        |   |   /    |   1    |   2    |   3    |   =    |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |        |XXXXXXXX|        |   |        |        |   0    |   .    |        |        |
-   `-----------------------------------------------------´   `-----------------------------------------------------'
-*/
-[_LOWER] = LAYOUT_ortho_4x12(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______,     SE_AST,  KC_7,    KC_8,    KC_9,    SE_DASH,  KC_DEL,
-    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,     AP_SLS,  KC_4,    KC_5,    KC_6,    SE_PLUS, _______,
-    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,     MS_SLS,  KC_1,    KC_2,    KC_3,    SE_EQLS, _______,
-    _______, _______, _______, _______, _______, _______,     _______, _______, KC_0,    KC_DOT,  _______, _______
-),
-
-/*
-SPECIAL
-    This layer focuses on special functions, media controls and movement keys.
-                             LEFT                                                     RIGHT
-   ,-----------------------------------------------------.   ,-----------------------------------------------------.
-   | Reset  |        |  WIN   | VolUp  |        |        |   |  Ins   |  Home  |   Up   |  End   |  PgUp  |   Del  |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |EEPReset|        |  Prev  | VolDn  |  Next *|        |   |        |* Left  |  Down  | Right  |  PgDn  |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |        |        |        |  Mute  |        |        |   |  Lock  |  MAC   |        |        |        |        |
-   |--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-   |XXXXXXXX|        |        |        |        |  Play  |   |        |        |        |        |        | Sleep  |
-   `-----------------------------------------------------´   `-----------------------------------------------------'
-*/
-[_SPECIAL] = LAYOUT_ortho_4x12(
-    QK_BOOT, _______, TO_WIN,  KC_VOLU, _______, _______,     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_DEL,
-    EE_CLR,  _______, MY_PREV, KC_VOLD, MY_NEXT, _______,     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
-    _______, _______, _______, KC_MUTE, _______, _______,     MY_LOCK, TO_MAC,  _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, MY_PLAY,     _______, _______, _______, _______, _______, KC_SLEP
-)
-
-};
diff --git a/keyboards/lets_split/keymaps/mjt/config.h b/keyboards/lets_split/keymaps/mjt/config.h
deleted file mode 100644
index e51e065bb6c..00000000000
--- a/keyboards/lets_split/keymaps/mjt/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 10
diff --git a/keyboards/lets_split/keymaps/mjt/keymap.c b/keyboards/lets_split/keymaps/mjt/keymap.c
deleted file mode 100644
index 9dcf37d7db9..00000000000
--- a/keyboards/lets_split/keymaps/mjt/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_BSPC,
-  KC_ESC,  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 ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/mjt/rules.mk b/keyboards/lets_split/keymaps/mjt/rules.mk
deleted file mode 100644
index a609caa02cc..00000000000
--- a/keyboards/lets_split/keymaps/mjt/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SWAP_HANDS_ENABLE = no        # Enable one-hand typing
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/lets_split/keymaps/mypetyak/keymap.c b/keyboards/lets_split/keymaps/mypetyak/keymap.c
deleted file mode 100644
index 6214551b726..00000000000
--- a/keyboards/lets_split/keymaps/mypetyak/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2022 Christopher Bunn <mypetyak@users.noreply.github.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
-
-// 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 {
-    _COLEMAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |  :   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  | Tab  | GUI  | Opt  |Lower |Space | Bksp |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-  QK_GESC,         KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_COLN,
-  LCTL_T(KC_TAB),  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  ADJUST,          _______, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_BSPC, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_ENT,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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_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_ENT,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Reset | Flash|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |Colemk|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  QK_REBOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/lets_split/keymaps/normacos/config.h b/keyboards/lets_split/keymaps/normacos/config.h
deleted file mode 100644
index e7b95250f38..00000000000
--- a/keyboards/lets_split/keymaps/normacos/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define _MASTER_RIGHT
-#define EE_HANDS
-
-#endif
diff --git a/keyboards/lets_split/keymaps/normacos/keymap.c b/keyboards/lets_split/keymaps/normacos/keymap.c
deleted file mode 100644
index 97900db61a7..00000000000
--- a/keyboards/lets_split/keymaps/normacos/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _NORMAN 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-
-// To be used in process_record_user
-enum custom_keycodes {
-  NORMAN = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  SH_LOG,
-  SH_GOUP,
-  SH_TERM,
-  SPOT,
-  SLACK,
-  OUTLOOK,
-  CHROME
-};
-
-// Mod taps
-#define SFT_ENT    SFT_T(KC_ENT)	// Tap for Enter, hold for Shift
-#define CTL_ESC    CTL_T(KC_ESC)	// Tap for Escape, hold for Control
-
-// Custom macros
-#define SCN_SHT    LSFT(LGUI(KC_4))	// Take a screenshot (MacOS)
-#define SCN_LCK    LCTL(LGUI(KC_Q))	// Lock screen (MacOS)
-#define SH_HOME    LCTL(KC_A)		// Go to start of line
-#define SH_END     LCTL(KC_E)		// Go to end of line
-#define SH_RSCH    LCTL(KC_R)		// Search command history
-#define SH_CLRH    LCTL(KC_U)		// Erase to beginning of line
-#define SH_CLRE    LCTL(KC_K)		// Erase to end of line
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Norman
- * ,-----------------------------------------. ,-----------------------------------------.
- * |  Tab |   Q  |   W  |   D  |   F  |   K  | |   J  |   U  |   R  |   L  |   ;  | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |CtlEsc|   A  |   S  |   E  |   T  |   G  | |   Y  |   N  |   I  |   O  |   H  |  '   |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  | |   P  |   M  |   ,  |   .  |   /  |SftEnt|
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Lock | Home |  End | Alt  | Lower| GUI  | | Space| Raise| Left | Down |  Up  | Right|
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_NORMAN] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_Q,    KC_W,    KC_D,    KC_F,  KC_K,    KC_J,   KC_U,  KC_R,    KC_L,    KC_SCLN, KC_BSPC,
-  CTL_ESC, KC_A,    KC_S,    KC_E,    KC_T,  KC_G,    KC_Y,   KC_N,  KC_I,    KC_O,    KC_H,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,    KC_P,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  SCN_LCK, KC_HOME, KC_END,  KC_LALT, LOWER, KC_LGUI, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------. ,-----------------------------------------.
- * |  Tab |  F1  |  F2  |  F3  |  F4  |      | |NumLck|   7  |   8  |   9  |   =  | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |CtlEsc|  F5  |  F6  |  F7  |  F8  |      | |   *  |   4  |   5  |   6  |   +  |  Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift|  F9  |  F10 |  F11 |  F12 |      | |   /  |   1  |   2  |   3  |   -  |SftEnt|
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Lock | Home |  End |  Alt | Lower|  GUI | |   .  | Raise|   0  | Spot |Chrome|      |
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_NUM,  KC_P7,   KC_P8, KC_P9, KC_PEQL, _______,
-  _______, KC_F5,   KC_F6,   KC_F8,   KC_F9,   XXXXXXX, KC_PAST, KC_P4,   KC_P5, KC_P6, KC_PPLS, KC_DEL,
-  _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_PSLS, KC_P1,   KC_P2, KC_P3, KC_PMNS, _______,
-  _______, _______, _______, _______, _______, _______, KC_PDOT, _______, KC_P0, SPOT,  CHROME,  XXXXXXX
-),
-
-/* Raise
- * ,-----------------------------------------. ,-----------------------------------------.
- * |  Tab |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  |  Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |CtlEsc|  Log | UpDir| Slack| Term | OutLk| |   =  |   -  |   \  |   [  |   ]  |   `  |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift|ClrHom|ClrEnd|ShHome| ShEnd|Search| | Play | Mute | VolDn| VolUp|ScnSht|SftEnt|
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Lock | Home |  End |  Alt | Lower|  GUI | | Space| Raise| Left | Down |  Up  | Right|
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  _______, SH_LOG,  SH_GOUP, SLACK,   SH_TERM, OUTLOOK,  KC_EQL, KC_MINS, KC_BSLS, KC_LBRC, KC_RBRC, KC_GRV,
-  _______, SH_CLRH, SH_CLRE, SH_HOME, SH_END,  SH_RSCH, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, SCN_SHT, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------. ,-----------------------------------------.
- * |      |      |      |      |      |      | |      |      |      |      | Reset|      |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      | AudOn|AudOff| |      |Norman|      |      |      |      |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      |      |      | |      |      |      |      |      |      |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      | Lower|      | |      | Raise|      |      |      |      |
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  XXXXXXX, NORMAN,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_norman[][2] = SONG(QWERTY_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case NORMAN:
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_norman);
-        #endif
-        persistent_default_layer_set(1UL<<_NORMAN);
-        return false;
-      case LOWER:
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        return false;
-      case RAISE:
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        return false;
-      case ADJUST:
-        layer_on(_ADJUST);
-        return false;
-      case SH_LOG:  // Open Jira log work window
-        SEND_STRING(SS_TAP(X_DOT));
-        _delay_ms(100);
-        SEND_STRING("log work");
-        _delay_ms(100);
-        SEND_STRING(SS_TAP(X_ENTER));
-        return false;
-      case SH_GOUP:  // Go up a directory
-        SEND_STRING("cd .."SS_TAP(X_ENTER));
-        return false;
-      case SH_TERM:  // Open Terminal
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
-        _delay_ms(100);
-        SEND_STRING("terminal");
-        _delay_ms(100);
-        SEND_STRING(SS_TAP(X_ENTER));
-        return false;
-      case SPOT:  // Open Spotify
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
-        _delay_ms(100);
-        SEND_STRING("spotify app");
-        _delay_ms(100);
-        SEND_STRING(SS_TAP(X_ENTER));
-        return false;
-      case SLACK:  // Open Slack
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
-        _delay_ms(100);
-        SEND_STRING("slack");
-        _delay_ms(100);
-        SEND_STRING(SS_TAP(X_ENTER));
-        return false;
-      case OUTLOOK:  // Open MS Outlook
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
-        _delay_ms(100);
-        SEND_STRING("outlook");
-        _delay_ms(100);
-        SEND_STRING(SS_TAP(X_ENTER));
-        return false;
-      case CHROME:  // Open Chrome
-        SEND_STRING(SS_LGUI(SS_TAP(X_SPACE)));
-        _delay_ms(100);
-        SEND_STRING("chrome");
-        _delay_ms(100);
-        SEND_STRING(SS_TAP(X_ENTER));
-        return false;
-    }
-  } else {
-    switch(keycode) {
-      case LOWER:
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        return false;
-      case RAISE:
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        return false;
-      case ADJUST:
-        layer_off(_ADJUST);
-        return false;
-    }
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/normacos/readme.md b/keyboards/lets_split/keymaps/normacos/readme.md
deleted file mode 100644
index 3b7a20632b0..00000000000
--- a/keyboards/lets_split/keymaps/normacos/readme.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# normacos
-This keymap was designed specifically to be used on a MacOS High Sierra system with constant use of the Terminal, as it includes a multitude of macros for both the terminal as well as Spotlight Search.
-
-Norman keyboard layout [info page.](https://normanlayout.info/)
-
-Some Norman layout keys were placed on different layers and different positions based on available space and preference.
-
-
-Macros:
-- CtlEsc sends Escape when tapped, and Control when held.
-- SftEnt sends Enter when tapped, and Shift when held.
-- Lock locks the computer
-- Slack opens Slack through Spotlight Search
-- Term opens Terminal through Spotlight Search
-- Spot opens Spotify through Spotlight Search
-- Chrome opens Chrome through Spotlight Search
-- OutLk opens Microsoft Outlook through Spotlight Search
-- ScnSht allows the user to take a screenshot of a selected portion of the screen
-- ClrHom clears Terminal line from beginning of line up to cursor
-- ClrEnd clears Terminal line from cursor up to end of line
-- ShHome moves Terminal cursor to beginning of line
-- ShEnd moves Terminal cursor to end of line
-- Search activates Terminal Reverse Search Command History
-- Log opens the 'Log Work' modal on Atlassian's Jira web client
-- UpDir moves working directory to its parent
-
-All macros that make use of the SEND_STRING command have a 100 millisecond wait before and after "writing" to let the computer/OS/app catch up.
-Any and all empty keys shown below are will be set in the future, and do nothing as of the time of this writing.
-
-
-
-## Default (Norman)
-```
-,-----------------------------------------. ,-----------------------------------------.
-|  Tab |   Q  |   W  |   D  |   F  |   K  | |   J  |   U  |   R  |   L  |   ;  | Bksp |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|CtlEsc|   A  |   S  |   E  |   T  |   G  | |   Y  |   N  |   I  |   O  |   H  |  '   |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  | |   P  |   M  |   ,  |   .  |   /  |SftEnt|
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Lock | Home |  End | Alt  | Lower| GUI  | | Space| Raise| Left | Down |  Up  | Right|
-`-----------------------------------------' `-----------------------------------------'
-```
-
-
-## Lower
-```
-,-----------------------------------------. ,-----------------------------------------.
-|  Tab |  F1  |  F2  |  F3  |  F4  |      | |NumLck|   7  |   8  |   9  |   =  | Bksp |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|CtlEsc|  F5  |  F6  |  F7  |  F8  |      | |   *  |   4  |   5  |   6  |   +  |  Del |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Shift|  F9  |  F10 |  F11 |  F12 |      | |   /  |   1  |   2  |   3  |   -  |SftEnt|
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Lock | Home |  End |  Alt | Lower|  GUI | |   .  | Raise|   0  | Spot |Chrome|      |
-`-----------------------------------------' `-----------------------------------------'
-```
-
-
-## Raise
-
-```
-,-----------------------------------------. ,-----------------------------------------.
-|  Tab |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  |  Del |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|CtlEsc|  Log | UpDir| Slack| Term | OutLk| |   =  |   -  |   \  |   [  |   ]  |   `  |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Shift|ClrHom|ClrEnd|ShHome| ShEnd|Search| | Play | Mute | VolDn| VolUp|ScnSht|SftEnt|
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Lock | Home |  End |  Alt | Lower|  GUI | | Space| Raise| Left | Down |  Up  | Right|
-`-----------------------------------------' `-----------------------------------------'
-```
-
-## Adjust (Lower + Raise)
-
-```
-,-----------------------------------------. ,-----------------------------------------.
-|      |      |      |      |      |      | |      |      |      |      | Reset|      |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |      | AudOn|AudOff| |      |Norman|      |      |      |      |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |      |      |      | |      |      |      |      |      |      |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |      | Lower|      | |      | Raise|      |      |      |      |
-`-----------------------------------------' `-----------------------------------------'
-```
diff --git a/keyboards/lets_split/keymaps/piemod/README.md b/keyboards/lets_split/keymaps/piemod/README.md
deleted file mode 100644
index 6bae7e76d94..00000000000
--- a/keyboards/lets_split/keymaps/piemod/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-PieMod
-======
-
-A keymap for users that need:
-
-- *P*: Programming symbols.
-
-- *I*: i3wm.
-
-- *E*: Emacs.
-
-- *M*: Macros.
-
-- *O*: Ortholinear.
-
-- *D*: Dvorak.
-
-Still a work-in-progress. Suggestions welcome @ https://github.com/dwrz/piemod.
-
-
-### TODO
-
-- [ ] Add Emacs layer.
-- [ ] Add Macro layer.
-- [ ] Add system control keys (rotation, brightness).
-- [ ] Switch " and ' quotes (or function to toggle default).
-- [ ] Add capslock.
-.
diff --git a/keyboards/lets_split/keymaps/piemod/config.h b/keyboards/lets_split/keymaps/piemod/config.h
deleted file mode 100644
index b6932e9a734..00000000000
--- a/keyboards/lets_split/keymaps/piemod/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-// RGB Options
-#undef RGBLED_NUM
-#define RGBLED_NUM 10
-#define RGBLIGHT_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
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 1
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 1
-
-#endif
diff --git a/keyboards/lets_split/keymaps/piemod/keymap.c b/keyboards/lets_split/keymaps/piemod/keymap.c
deleted file mode 100644
index 4e73ebd2a77..00000000000
--- a/keyboards/lets_split/keymaps/piemod/keymap.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-#define _DVORAK 0
-#define _ARROW 1 //F(1)
-#define _SYMBOL 2 // F(2)
-#define _NUMBER 3 // F(3)
-#define _FUNCTION 4 // F(4)
-#define _EMACS 5 // F(5)
-#define _COMBOS 6 // F(6)
-#define _MOUSE 7 // F(7)
-
-enum custom_keycodes {
-  DVORAK = SAFE_RANGE,
-  ARROW,
-  SYMBOL,
-  NUMBER,
-  FUNCTION,
-  EMACS,
-  COMBOS,
-  MOUSE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DVORAK] = LAYOUT(
-  KC_ESC,  KC_QUOTE,  LT(7, KC_COMMA),  KC_DOT,  KC_P,  KC_Y,  KC_F,  KC_G,  KC_C,  KC_R,  KC_L,  KC_DELETE,
-  KC_TAB,  LT(1, KC_A),  LT(2, KC_O),  LT(3, KC_E),  LT(4, KC_U),  KC_I,  KC_D,  KC_H,  KC_T,  KC_N,  KC_S,  KC_ENTER,
-  KC_LSFT,  KC_SCLN,  LT(5, KC_Q),   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS,
-  C(KC_LALT), LT(6, KC_LCTL),  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPC,  KC_SPACE,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT
-),
-
-[_ARROW] = LAYOUT(
-  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_HOME,  KC_UP,  KC_END,  KC_PGUP,
-  KC_NO,  KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_PGDN,
-  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,  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
-),
-
-[_SYMBOL] = LAYOUT(
-  KC_TILD,  KC_GRAVE,  KC_NO,  KC_EQUAL,  KC_PLUS,  KC_NO,  KC_LBRC,  KC_RBRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,
-  KC_NO,  KC_NO,  KC_TRNS,  KC_SCLN,  KC_COLN,  KC_NO,  KC_LCBR,  KC_RCBR,  KC_DLR,  KC_PERC,  KC_CIRC,  S(KC_SLSH),
-  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BSLS,  KC_SLASH,  KC_EXLM,  KC_AT,  KC_HASH,  KC_PIPE,
-  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_ASTR,   KC_SLASH,  KC_MINUS,  KC_PLUS,  KC_EQUAL
-),
-
-[_NUMBER] = LAYOUT(
-  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_7,  KC_8,  KC_9,  KC_NO,
-  KC_NO,  KC_NO,  KC_NO,  KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_4,  KC_5,  KC_6,  KC_NO,
- KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_0,  KC_1,  KC_2,  KC_3,  KC_NO,
-  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_ASTR,  KC_SLASH,  KC_MINUS,  KC_PLUS,  KC_EQUAL
-),
-
-[_FUNCTION] = LAYOUT(
-  KC_PSCR,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
-  KC_NO,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_TRNS,  KC_NO,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,
-  KC_NO,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_NO,  KC_NO, KC_NO,  KC_AUDIO_MUTE,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  KC_MEDIA_PLAY_PAUSE,
-  QK_BOOT,  RGB_TOG,  RGB_MOD,  KC_NO,  KC_NO,  KC_NO,  KC_DELETE,  KC_INSERT,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
-),
-
-[_EMACS] = LAYOUT(
-  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,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-  KC_NO,  KC_TRNS,  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,  KC_NO,  KC_NO,  KC_NO
-),
-
-[_COMBOS] = LAYOUT(
-  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,  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_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-),
-
-[_MOUSE] = LAYOUT(
-  KC_NO,  KC_NO,  KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_MS_U,  KC_NO,  KC_NO,
-  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_MS_L,  KC_MS_D,  KC_MS_R,  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,  KC_MS_BTN1,  KC_MS_BTN2,  KC_MS_BTN3,  KC_NO,  KC_NO,  KC_NO
-)
-};
diff --git a/keyboards/lets_split/keymaps/piemod/rules.mk b/keyboards/lets_split/keymaps/piemod/rules.mk
deleted file mode 100644
index e4319facfb1..00000000000
--- a/keyboards/lets_split/keymaps/piemod/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
diff --git a/keyboards/lets_split/keymaps/pitty/README.md b/keyboards/lets_split/keymaps/pitty/README.md
deleted file mode 100644
index 1662fce7abe..00000000000
--- a/keyboards/lets_split/keymaps/pitty/README.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Pittyolo's Let's Split Layout
-
-This is my Let's Split layout, modified for my ISO Hungarian taste :)
-
-Added some layer feedback in the underglow, but it's still a WIP.
-
-I wrote the keys that will appear when using Hungarian layout in Windows and the respective English keys in brackets.
-
-
- ### Qwerty
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  |  Z(Y)|   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |LTVIMF|   G  |   H  |   J  |   K  |   L  |  É(;)| Á(") |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|Í/Shft| Y(Z) |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  -(/)| Shift|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl |  GUI |  Alt |ADJUST|  Spc | LOWER| Bksp | Ent  |  Alt | =(&) | GAME | Del  |
-`-----------------------------------------------------------------------------------'
-```
- 
- Tap left shift writes the missing ISO key, hold is Shift. 
-
-
- ### Gaming mode (Toggle layer)
-```
-,-----------------------------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |      |      |Lower |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |   F  |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Shift|      |      |      |      |      |      |      |      |      |      |QWERTY|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      | Left | Down |  Up  | Right|
-`-----------------------------------------------------------------------------------'
-```
- 
-Disabled some of the functions in the main layer to help with better gaming experience.
-
-
- ### Lower (Hold down right Space)
-```
-,-----------------------------------------------------------------------------------.
-| 0(') |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  | Ö(0) | Ü(-) |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|  F10 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F11 |  F12 |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |  Ins | Home | PgUp | Shift|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |  Del | End  | PgDn | AltGr|
-`-----------------------------------------------------------------------------------'
-```
- 
- Function layer with everything that is missing from the main layer. 
-
- 
-  ### NAV (double tap toggles the layer, and hold for momentary switch)
-```
-,-----------------------------------------------------------------------------------.
-|      |      |  Up  |      |  F2  |      |      |   7  |   8  |   9  |   /  |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      | Left | Down | Right|      |      |      |   4  |   5  |   6  |   *  |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|      |      |      |      |      |      |   1  |   2  |   3  |   -  |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |   0  |   .  |   =  |   +  |      |
-`-----------------------------------------------------------------------------------'
-```
- 
- Navigation layer with a numpad on the right side. 
-
- 
- 
- ### Vim Movement (Hold down F)
-```
-,-----------------------------------------------------------------------------------.
-|RGBMOD|RGBTOG|      |      |      |      |      |  Ú   |   Í  |   Ó  |   Ő  |  Ű   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|DM_stp|      |      | LCTRL|      |      | Left | Down |  Up  | Right|      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|DM_REC|      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      | LShft|      |      |      |      |      |      | RESET|
-`-----------------------------------------------------------------------------------'
-```
- 
- Turns hjkl into vim movement. I moved accented Hungarian letters here.
- 
-
- 
diff --git a/keyboards/lets_split/keymaps/pitty/config.h b/keyboards/lets_split/keymaps/pitty/config.h
deleted file mode 100644
index 029d2ead75b..00000000000
--- a/keyboards/lets_split/keymaps/pitty/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define TAPPING_TOGGLE 2
-
-#undef RGBLED_NUM
-#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 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#endif
diff --git a/keyboards/lets_split/keymaps/pitty/keymap.c b/keyboards/lets_split/keymaps/pitty/keymap.c
deleted file mode 100644
index c122214bceb..00000000000
--- a/keyboards/lets_split/keymaps/pitty/keymap.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _GAME 1
-#define _LOWER 2
-#define _NAV 3
-#define _VIM 4
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  GAME,
-  LOWER,
-  NAV,
-  VIM,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |  Z(Y)|   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |LTVIMF|   G  |   H  |   J  |   K  |   L  |  É(;)| Á(") |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Í/Shft| Y(Z) |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  -(/)| Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  Alt |ADJUST|  Spc | LOWER| Bksp | Ent  |  Alt | =(&) | GAME | Del  |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_BSPC,
-  KC_ESC,                KC_A,      KC_S,    KC_D,     LT(_VIM, KC_F), KC_G,               KC_H,     KC_J,    KC_K,    KC_L,         KC_SCLN,       KC_QUOT,
-  MT(MOD_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_LCTL,               KC_LGUI,   KC_LALT, TT(_NAV), KC_SPC,         LT(_LOWER, KC_SPC), KC_BSPC,  KC_ENT,  KC_RALT, KC_AMPERSAND, TG(_GAME),     KC_DEL
-),
-
-/* Gaming mode
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |Lower |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |   F  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |      |      |      |      |QWERTY|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Left | Down |  Up  | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] =  LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OSL(_LOWER),
-  _______, _______, _______, _______, KC_F,    _______, _______, _______, _______, _______, _______, _______,
-  KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY),
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | 0(') |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  | Ö(0) | Ü(-) |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  F10 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F11 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |  Ins | Home | PgUp | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |  Del | End  | PgDn | AltGr|
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINUS,
-  KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F11,  KC_F12,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, KC_RSFT,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_RALT
-),
-
-
-/* NAV
- * ,-----------------------------------------------------------------------------------.
- * |      |      |  Up  |      |  F2  |      |      |   7  |   8  |   9  |   /  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Left | Down | Right|      |      |      |   4  |   5  |   6  |   *  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |   1  |   2  |   3  |   -  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   0  |   .  |   =  |   +  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NAV] = LAYOUT(
-  _______,   _______, KC_UP,   _______, KC_F2,   _______, _______,  KC_7,    KC_8,      KC_9,         KC_KP_SLASH,    _______,
-  _______,   KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,  KC_4,    KC_5,      KC_6,         KC_KP_ASTERISK, _______,
-  KC_LSFT,   _______, _______, _______, _______, _______, _______,  KC_1,    KC_2,      KC_3,         KC_KP_MINUS,    _______,
-  _______,   _______, _______, _______, _______, _______, _______,  KC_GRV,  KC_KP_DOT, KC_KP_EQUAL,  KC_KP_PLUS,     _______
-),
-
-/* Vim Movement (Hold down F)
- * ,-----------------------------------------------------------------------------------.
- * |RGBMOD|RGBTOG|      |      |      |      |      |  Ú   |   Í  |   Ó  |   Ő  |  Ű   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |DM_stp|      |      | LCTRL|      |      | Left | Down |  Up  | Right|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |DM_REC|      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | LShft|      |      |      |      |      |      | QK_BOOT|
- * `-----------------------------------------------------------------------------------'
- */
-[_VIM] =  LAYOUT(
-  RGB_MOD, RGB_TOG,  _______, _______, _______, _______, _______, KC_RBRC, KC_NUBS, KC_EQL , KC_LBRC, KC_NUHS,
-  _______, _______,  _______, KC_LCTL, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______,  _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, QK_BOOT
-)
-
-
-};
-
-// define variables for reactive RGB
-bool RGB_INIT = false;
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-
-void matrix_scan_user(void) {
-   uint8_t layer = get_highest_layer(layer_state);
-   switch (layer) {
-     case _NAV:
-         if (RGB_INIT) {} else {
-           RGB_current_mode = rgblight_config.mode;
-           RGB_INIT = true;
-         }
-         if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-         } else {
-           TOG_STATUS = !TOG_STATUS;
-           rgblight_mode(29);
-         }
-         break;
-     case _LOWER:
-         if (RGB_INIT) {} else {
-           RGB_current_mode = rgblight_config.mode;
-           RGB_INIT = true;
-         }
-         if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-         } else {
-           TOG_STATUS = !TOG_STATUS;
-           rgblight_mode(29);
-         }
-         break;
-     case _QWERTY:
-         if (RGB_INIT) {} else {
-           RGB_current_mode = rgblight_config.mode;
-           RGB_INIT = true;
-         }
-         rgblight_mode(RGB_current_mode);   // revert RGB to initial mode prior to RGB mode change
-         TOG_STATUS = false;
-         break;
-   }
- };
diff --git a/keyboards/lets_split/keymaps/pitty/rules.mk b/keyboards/lets_split/keymaps/pitty/rules.mk
deleted file mode 100644
index 53a426157e8..00000000000
--- a/keyboards/lets_split/keymaps/pitty/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-NKRO_ENABLE = yes
-
diff --git a/keyboards/lets_split/keymaps/pyrol/config.h b/keyboards/lets_split/keymaps/pyrol/config.h
deleted file mode 100644
index a87e67fe565..00000000000
--- a/keyboards/lets_split/keymaps/pyrol/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-#define MASTER_LEFT
-#undef RGBLED_NUM
-#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 8
diff --git a/keyboards/lets_split/keymaps/pyrol/keymap.c b/keyboards/lets_split/keymaps/pyrol/keymap.c
deleted file mode 100644
index d61e848c421..00000000000
--- a/keyboards/lets_split/keymaps/pyrol/keymap.c
+++ /dev/null
@@ -1,214 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _GAME 5
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-  GAME,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl |  OS  |  Alt |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  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_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT ,
-  ADJUST,KC_LCTL,  KC_LGUI, KC_LALT,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |  Tab |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Bksp |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl |  OS  | Alt  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-  KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_TAB,
-  KC_BSPC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT ,
-  ADJUST,  KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_ortho_4x12(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_BSPC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  RGB | HUE  | SAT  |  VAL |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  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_MPRV, KC_MNXT,
-  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RGB  | HUE  | SAT  | VAL  |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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, _______, _______, _______,
-  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-/* Game
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Ctrl |  OS  |  Alt |Raise |Space |Space |LOWER |   '  | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT_ortho_4x12(
-  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_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP, KC_SLSH ,
-  KC_LCTL, KC_LCTL, KC_LGUI, KC_LALT,  RAISE,   KC_SPC,  KC_SPC,  LOWER,   KC_QUOT, KC_LEFT, KC_DOWN,   KC_RGHT
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      | Game |      |      |      |      |      |      |      |      |Reset |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, _______, GAME, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case GAME:
-	if (record->event.pressed) {
-	    set_single_persistent_default_layer(_GAME);
-	}
-	return false;
-	break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/pyrol/rules.mk b/keyboards/lets_split/keymaps/pyrol/rules.mk
deleted file mode 100644
index d4c4ffab6a2..00000000000
--- a/keyboards/lets_split/keymaps/pyrol/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
- BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h
deleted file mode 100644
index 3ae9165cfd8..00000000000
--- a/keyboards/lets_split/keymaps/shaymdev/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
-
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN D3
-#undef RGBLED_NUM
-#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_STATIC_GRADIENT
-#define RGBLED_NUM 10
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_SLEEP
-
-#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
-
-#define TAPPING_TERM 220
diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c
deleted file mode 100644
index fe919133a9d..00000000000
--- a/keyboards/lets_split/keymaps/shaymdev/keymap.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright 2021 Shay Merrill
- *
- * 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 lets_split_layers {
-  _DVORAK,
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  DVORAK = SAFE_RANGE,
-  QWERTY
-};
-
-#define TO_DV TO(_DVORAK)
-#define LOWER MO(_LOWER)
-#define LWR LOWER
-#define RAISE MO(_RAISE)
-#define RAS RAISE
-
-enum combos
-{
-	EU_ENT,
-};
-
-const uint16_t PROGMEM eu_combo[]     = {KC_E, KC_U, COMBO_END};
-
-combo_t key_combos[] = {
-	[EU_ENT]                = COMBO_ACTION(eu_combo),
-};
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-  switch(combo_index) {
-    case EU_ENT:
-      if (pressed) {
-        tap_code16(KC_ENT);
-      }
-      break;
-  }
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DVORAK] = LAYOUT(
-  KC_ESC,  KC_QUOT, KC_COMM, KC_DOT, KC_P,    KC_Y,        KC_F,    KC_G,   KC_C,  KC_R,   KC_L,    KC_SLSH,
-  KC_TAB,  KC_A,    KC_O,    KC_E,   KC_U,    KC_I,        KC_D,    KC_H,   KC_T,  KC_N,   KC_S,    KC_MINS,
-  KC_EQL,  KC_SCLN, KC_Q,    KC_J,   KC_K,    KC_X,        KC_B,    KC_M,   KC_W,  KC_V,   KC_Z,    KC_BSLS,
-  XXXXXXX, KC_ENT,  KC_LALT, TT(LWR), KC_LSFT, KC_LCTL,		 KC_BSPC, KC_SPC, TT(RAS), KC_DEL, KC_LGUI, XXXXXXX
-),
-
-[_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_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_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    	  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LGUI,
-  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
-),
-
-[_LOWER] = LAYOUT(
-  _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR,     _______, KC_P7,   KC_P8, KC_P9, KC_PMNS, _______,
-  _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_ASTR, 		_______, KC_P4,   KC_P5, KC_P6, KC_PPLS, _______,
-  _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV,			_______, KC_P1,   KC_P2, KC_P3, KC_PENT, _______,
-  _______, _______, _______, _______, _______, _______,     _______, KC_KP_0, _______, _______, _______, _______ //This kp_0 is blocking the space key.... may want to do something about that.
-),
-
-[_RAISE] = LAYOUT(
-  _______, KC_PSCR, KC_HOME, KC_UP,   KC_END,  KC_PGUP,  		KC_VOLU, KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX,
-  KC_CAPS, KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  	 	KC_VOLD, KC_F4,   KC_F5,   KC_F6,   KC_F11,  XXXXXXX,
-  _______, KC_NUM,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  	 	KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F12,  XXXXXXX,
-  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
-),
-
-[_ADJUST] =  LAYOUT(
-    TO_DV, QK_BOOT, _______, _______, _______, _______, 		_______, _______, _______, _______, _______, KC_DEL,
-  RGB_TOG, RGB_MOD, VK_TOGG, AU_ON,   AU_OFF,  AG_NORM, 		AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______,
-  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 		_______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
-  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
-)
-
-};
-
-const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DELETE);
-
-// This globally defines all key overrides to be used
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &delete_key_override,
-    NULL // Null terminate the array of overrides!
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case QWERTY:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_QWERTY);
-    }
-    return false;
-    break;
-  case DVORAK:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_DVORAK);
-    }
-    return false;
-    break;
-  }
-  return true;
-}
-
-
-#ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {4, 2, HSV_RED}       // Light 2 LEDs, starting with LED 4
-);
-
-const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 3, HSV_CHARTREUSE}       // Light 3 LEDs, starting with LED 0
-);
-
-const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {3, 2, HSV_BLUE}    // Light LEDs 3-4
-);
-
-const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {5, 2, HSV_ORANGE}    // Light LEDs 5-6
-);
-
-const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {3, 4, HSV_GREEN}       // Light 4 LEDs, starting with LED 3
-);
-
-
-//Later layers take precedence. This array corresponds to the magic numbers used in rgblight_set_layer_state(i, onOff)
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_capslock_layer,
-    my_qwerty_layer,   // Overrides other layers
-    my_lower_layer,    // Overrides other layers
-    my_raise_layer,    // Overrides other layers
-    my_adjust_layer    // Overrides other layers
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-    rgblight_disable_noeeprom(); // disables RGB, without saving settings
-    //rgblight_sethsv_noeeprom(HSV_CYAN);
-    //rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    // rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
-}
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    return true;
-}
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(1, layer_state_cmp(state, _QWERTY));
-    return state;
-}
-
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-
-#ifdef RGBLIGHT_ENABLE
-    rgblight_set_layer_state(2, layer_state_cmp(state, _LOWER));
-    rgblight_set_layer_state(3, layer_state_cmp(state, _RAISE));
-    rgblight_set_layer_state(4, layer_state_cmp(state, _ADJUST));
-#endif
-
-  return state;
-}
diff --git a/keyboards/lets_split/keymaps/shaymdev/rules.mk b/keyboards/lets_split/keymaps/shaymdev/rules.mk
deleted file mode 100644
index 3d737cbb488..00000000000
--- a/keyboards/lets_split/keymaps/shaymdev/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-RGBLIGHT_ENABLE = yes
-VELOCIKEY_ENABLE = yes
-KEY_OVERRIDE_ENABLE = yes
-COMBO_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/lets_split/keymaps/smt/config.h b/keyboards/lets_split/keymaps/smt/config.h
deleted file mode 100644
index 470fc078542..00000000000
--- a/keyboards/lets_split/keymaps/smt/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#endif
diff --git a/keyboards/lets_split/keymaps/smt/keymap.c b/keyboards/lets_split/keymaps/smt/keymap.c
deleted file mode 100644
index c8774e46afb..00000000000
--- a/keyboards/lets_split/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,214 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define MEH_GRV     MEH_T(KC_GRV)               // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  | |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  | |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  | |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |   `  | Ctrl | Alt  | GUI  |Lower |Space | |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-  HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  | |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  | |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  | |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |   `  | Ctrl | Alt  | GUI  |Lower |Space | |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_COLEMAK] = LAYOUT(
-  HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_ESC, 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, SFT_ENT,
-  MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  | |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  | |   D  |   H  |   T  |   N  |   S  |  -   |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  | |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |   `  | Ctrl | Alt  | GUI  |Lower |Space | |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_DVORAK] = LAYOUT(
-  HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT,
-  MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------. ,-----------------------------------------.
- * |   0  |   1  |   2  |   3  |   4  |   5  | |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |   $  |  F1  |  F2  |  F3  |  F4  |  F5  | |  F6  |   4  |   5  |   6  |      |      |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 | |  F12 |   1  |   2  |   3  |      |      |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      |      |      | |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  ALL_T(KC_0),   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  CTL_T(KC_DLR), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_4,    KC_5,    KC_6,    _______, _______,
-  _______,       KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_1,    KC_2,    KC_3,    _______, _______,
-  _______,       _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------. ,-----------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      |      |      | |   _  |   ?  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      |      |      | |   -  |   /  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      |      |      | |      |      | Home |PageDn|PageUp| End  |
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  ALL_T(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_UNDS, KC_QUES, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______,        _______, _______, _______, _______, _______, KC_MINS, KC_SLSH, KC_EQL,  KC_LBRC, KC_RBRC, SFT_T(KC_BSLS),
-  _______,        _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------. ,-----------------------------------------.
- * |      | Reset|      |      |      |      | |      |      |      |      |      | Reset|
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm| |AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      |      |      | |      |      |      |      |      |      |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |      |      |      |      |      |      | |      |      |      |      |      |      |
- * `-----------------------------------------' `-----------------------------------------'
- */
-[_ADJUST] = LAYOUT(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/smt/readme.md b/keyboards/lets_split/keymaps/smt/readme.md
deleted file mode 100644
index 20bc662f0a5..00000000000
--- a/keyboards/lets_split/keymaps/smt/readme.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# smt's Let's Split keymap
-
-This keymap is ported from my Planck keymap.
-
-
-## Qwerty
-
-```
-,-----------------------------------------. ,-----------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  | |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |   F  |   G  | |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  | |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|   `  | Ctrl | Alt  | GUI  |Lower |Space | |Space |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------' `-----------------------------------------'
-```
-
-## Colemak
-
-```
-,-----------------------------------------. ,-----------------------------------------.
-| Tab  |   Q  |   W  |   F  |   P  |   G  | |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Esc  |   A  |   R  |   S  |   T  |   D  | |   H  |   N  |   E  |   I  |   O  |  "   |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  | |   K  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|   `  | Ctrl | Alt  | GUI  |Lower |Space | |Space |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------' `-----------------------------------------'
-```
-
-## Dvorak
-
-```
-,-----------------------------------------. ,-----------------------------------------.
-| Tab  |   "  |   ,  |   .  |   P  |   Y  | |   F  |   G  |   C  |   R  |   L  | Bksp |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Esc  |   A  |   O  |   E  |   U  |   I  | |   D  |   H  |   T  |   N  |   S  |  -   |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-| Shift|   ;  |   Q  |   J  |   K  |   X  | |   B  |   M  |   W  |   V  |   Z  |Enter |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|   `  | Ctrl | Alt  | GUI  |Lower |Space | |Space |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------' `-----------------------------------------'
-```
-
-## Lower
-
-```
-,-----------------------------------------. ,-----------------------------------------.
-|   0  |   1  |   2  |   3  |   4  |   5  | |   6  |   7  |   8  |   9  |   0  | Del  |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|   $  |  F1  |  F2  |  F3  |  F4  |  F5  | |  F6  |   4  |   5  |   6  |      |      |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |  F7  |  F8  |  F9  |  F10 |  F11 | |  F12 |   1  |   2  |   3  |      |      |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |      |      |      | |      |      | Next | Vol- | Vol+ | Play |
-`-----------------------------------------' `-----------------------------------------'
-```
-
-## Raise
-
-```
-,-----------------------------------------. ,-----------------------------------------.
-|   ~  |   !  |   @  |   #  |   $  |   %  | |   ^  |   &  |   *  |   (  |   )  | Del  |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |      |      |      | |   _  |   ?  |   +  |   {  |   }  |  |   |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |      |      |      | |   -  |   /  |   =  |   [  |   ]  |  \   |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |      |      |      | |      |      | Home |PageDn|PageUp| End  |
-`-----------------------------------------' `-----------------------------------------'
-```
-
-## Adjust (Lower + Raise)
-
-```
-,-----------------------------------------. ,-----------------------------------------.
-|      | Reset|      |      |      |      | |      |      |      |      |      | Reset|
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |Aud on|Audoff|AGnorm| |AGswap|Qwerty|Colemk|Dvorak|      |      |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |      |      |      | |      |      |      |      |      |      |
-|------+------+------+------+------+------| |------+------+------+------+------+------|
-|      |      |      |      |      |      | |      |      |      |      |      |      |
-`-----------------------------------------' `-----------------------------------------'
-```
diff --git a/keyboards/lets_split/keymaps/that_canadian/config.h b/keyboards/lets_split/keymaps/that_canadian/config.h
deleted file mode 100644
index 586b6e8c875..00000000000
--- a/keyboards/lets_split/keymaps/that_canadian/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
-
-#endif
\ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/that_canadian/keymap.c b/keyboards/lets_split/keymaps/that_canadian/keymap.c
deleted file mode 100644
index cc92d2c35d9..00000000000
--- a/keyboards/lets_split/keymaps/that_canadian/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | QK_BOOT|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Backlt| Ctrl | GUI  | Alt  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-  QK_BOOT,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  RGB_TOG, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  BACKLIT,  KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  _______, _______,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-	case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/tylerwince/config.h b/keyboards/lets_split/keymaps/tylerwince/config.h
deleted file mode 100644
index eda4a1b8b2f..00000000000
--- a/keyboards/lets_split/keymaps/tylerwince/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLED_NUM 12
-#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 RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/lets_split/keymaps/tylerwince/keymap.c b/keyboards/lets_split/keymaps/tylerwince/keymap.c
deleted file mode 100644
index 3b67f80ae20..00000000000
--- a/keyboards/lets_split/keymaps/tylerwince/keymap.c
+++ /dev/null
@@ -1,239 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum layer_names {
-  _QWERTY = 0,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-  SH_GOUP,
-};
-
-//Tap Dance Declarations
-enum {
-  TD_SEMI_COLON,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_SEMI_COLON] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,------------------------------------------   ------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  | BSPC |
- * |------+------+------+------+------+-------   -------+------+------+------+------+------|
- * |CTL/Es|   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |Shift |   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |Things|1PASS | alt  | CMD  |Lower |Space |   |Space |Raise | Next | Vol- | Vol+ | Play |
- * `------------------------------------------   ------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-   KC_TAB,        KC_Q,          KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,              KC_BSPC,
-   CTL_T(KC_ESC), KC_A,          KC_S,    KC_D,    KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    TD(TD_SEMI_COLON), 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 ,
-   RALT(KC_SPC),  RGUI(KC_BSLS), KC_LALT, KC_LCMD, LOWER, KC_SPC, KC_SPC, RAISE, KC_MNXT, KC_VOLD, KC_VOLU,           KC_MPLY
-),
-
-/* Colemak
- * ,------------------------------------------   ------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------   -------+------+------+------+------+------|
- * |CTL/Es|   A  |   R  |   S  |   T  |   D  |   |   H  |   N  |   E  |   I  |   O  |  '   |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |Shift |   Z  |   X  |   C  |   V  |   B  |   |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |Things|1PASS | alt  | CMD  |Lower |Space |   |Space |Raise | Next | Vol- | Vol+ | Play |
- * `------------------------------------------   ------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-  KC_TAB,        KC_Q,          KC_W,    KC_F,    KC_P,  KC_G,   KC_J,   KC_L,  KC_U,    KC_Y,    TD(TD_SEMI_COLON), KC_BSPC,
-  CTL_T(KC_ESC), 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_ENT ,
-  RALT(KC_SPC),  RGUI(KC_BSLS), KC_LALT, KC_LCMD, LOWER, KC_SPC, KC_SPC, RAISE, KC_MNXT, KC_VOLD, KC_VOLU,           KC_MPLY
-),
-
-/* Dvorak
- * ,------------------------------------------   ------------------------------------------.
- * | Tab  |   '  |   ,  |   .  |   P  |   Y  |   |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------   -------+------+------+------+------+------|
- * |CTL/Es|   A  |   O  |   E  |   U  |   I  |   |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |Shift |   ;  |   Q  |   J  |   K  |   X  |   |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |Things|1PASS | alt  | CMD  |Lower |Space |   |Space |Raise | Next | Vol- | Vol+ | Play |
- * `------------------------------------------   ------------------------------------------'
- */
-[_DVORAK] = LAYOUT_ortho_4x12(
-  KC_TAB,        KC_QUOT,           KC_COMM, KC_DOT,  KC_P,  KC_Y,   KC_F,   KC_G,  KC_C,    KC_R,    KC_L,    KC_BSPC,
-  CTL_T(KC_ESC), KC_A,              KC_O,    KC_E,    KC_U,  KC_I,   KC_D,   KC_H,  KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT,       TD(TD_SEMI_COLON), KC_Q,    KC_J,    KC_K,  KC_X,   KC_B,   KC_M,  KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  RALT(KC_SPC),  RGUI(KC_BSLS),     KC_LALT, KC_LCMD, LOWER, KC_SPC, KC_SPC, RAISE, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Lower
- * ,------------------------------------------   ------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------   -------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   |      |   _  |   +  |   {  |   }  |  |   |
- * +------+------+------+------+------|------+   |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   |      |   -  |   =  |   [  |   ]  |      |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |Things|1PASS | alt  | CMD  |Lower |Space |   |Space |Raise | Next | Vol- | Vol+ | Play |
- * `------------------------------------------   ------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  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_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,  _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  RALT(KC_SPC), RGUI(KC_BSLS), KC_LALT, KC_LCMD, LOWER,  KC_SPC,  KC_SPC,  RAISE,   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,------------------------------------------   ------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------   -------+------+------+------+------+------|
- * | Del  |      |      |      |      |      |   | LEFT | DOWN |  UP  |RIGHT |      |  \   |
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |      |      |      |      |      |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |Things|1PASS | alt  | CMD  |Lower |Space |   |Space |Raise | Next | Vol- | Vol+ | Play |
- * `------------------------------------------   ------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, KC_BSLS,
-  _______,      _______,       _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-  RALT(KC_SPC), RGUI(KC_BSLS), KC_LALT, KC_LCMD, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_MNXT, KC_VOLD, KC_VOLU,  KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,------------------------------------------   ------------------------------------------.
- * |      | Reset|      |      |      |      |   |      |Qwerty|Colemk|Dvorak|WTLEFT|WTRGHT|
- * |------+------+------+------+------+-------   -------+------+------+------+------+------|
- * |      |      |Aud on|Audoff|AGnorm|AGswap|   |WLEFT |WDOWN | WUP  |WRGHT |WBLEFT|WBRGHT|
- * |------+------+------+------+------+------|   |------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |RGBsUP|RGBsDN|RGBvUP|RGBvDN|WFULL |
- * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |      |      |      |      |      |   |      |      |RGBwav|RGBfla|RGBtog|      |
- * `------------------------------------------   ------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, QK_BOOT, _______, _______, _______, _______, _______,   QWERTY,    COLEMAK,   DVORAK,    LCA(KC_7), LCA(KC_8),
-  _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, LCA(KC_H), LCA(KC_J), LCA(KC_K), LCA(KC_L), LCA(KC_U), LCA(KC_I),
-  _______, _______, _______, _______, _______, _______, _______,   RGB_SAI,   RGB_SAD,   RGB_VAI,   RGB_VAD,   LCA(KC_ENT),
-  _______, _______, _______, _______, _______, _______, _______,   _______,   RGB_M_K,   RGB_M_B,   RGB_TOG,   _______
-)
-
-
-};
-
-void keyboard_post_init_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-  rgblight_enable_noeeprom();
-  layer_state_set_user(layer_state);
-  #endif
-}
-void set_qwerty(void){
-  rgblight_sethsv_noeeprom(255, 0, 160);
-}
-void set_lower(void){
-  rgblight_sethsv_master(255, 255, 255);
-  rgblight_sethsv_slave(255, 0, 160);
-}
-void set_raise(void){
-  rgblight_sethsv_slave(35, 255, 255);
-  rgblight_sethsv_master(255, 0, 160);
-}
-void set_adjust(void){
-  rgblight_sethsv_slave(35, 255, 255);
-  rgblight_sethsv_master(255, 255, 255);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          set_qwerty();
-        #endif
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          set_lower();
-        #endif
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          set_qwerty();
-        #endif
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          set_raise();
-        #endif
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          set_qwerty();
-        #endif
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case ADJUST:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          set_adjust();
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          set_qwerty();
-        #endif
-        layer_off(_ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
-
diff --git a/keyboards/lets_split/keymaps/tylerwince/rules.mk b/keyboards/lets_split/keymaps/tylerwince/rules.mk
deleted file mode 100644
index 3cfa539f362..00000000000
--- a/keyboards/lets_split/keymaps/tylerwince/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE=yes
-TAP_DANCE_ENABLE=yes
diff --git a/keyboards/lets_split/keymaps/via/config.h b/keyboards/lets_split/keymaps/via/config.h
index a676d6826d0..03853dc3919 100644
--- a/keyboards/lets_split/keymaps/via/config.h
+++ b/keyboards/lets_split/keymaps/via/config.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,6 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 10
+#define RGBLIGHT_LED_COUNT 10
 
 #define NO_MUSIC_MODE
diff --git a/keyboards/lets_split/keymaps/vim-mode/config.h b/keyboards/lets_split/keymaps/vim-mode/config.h
deleted file mode 100644
index 1fe4384a253..00000000000
--- a/keyboards/lets_split/keymaps/vim-mode/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-// comment the following lines if sounds are not desired
-#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                              SONG(COLEMAK_SOUND), \
-                              SONG(DVORAK_SOUND) \
-                            }
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/lets_split/keymaps/vim-mode/keymap.c b/keyboards/lets_split/keymaps/vim-mode/keymap.c
deleted file mode 100644
index 430cc823f56..00000000000
--- a/keyboards/lets_split/keymaps/vim-mode/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-#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 {
-  _QWERTY = 0,
-  _COLEMAK = 1,
-  _DVORAK = 2,
-  _LOWER = 3,
-  _RAISE = 4,
-  _ADJUST = 16
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// Fillers to make layering more clear
-
-// keys in multiple locations:
-//  - parenteses in both raise and lower
-//  - asterix in raise and twice on lower (normal and numpad)
-//  - minus/plus twice on lower (normal and numpad)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| PrtSc| GUI  | Alt  |Lower | Tab  |Space |Raise | VolDn| VolUp| Pl/Ps| Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12 (
-  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_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, KC_ENT ,
-  ADJUST,  KC_PSCR, KC_LGUI, KC_LALT, LOWER,   KC_TAB,  KC_SPC,  RAISE,   KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| PrtSc| GUI  | Alt  |Lower | Tab  |Space |Raise | VolDn| VolUp| Pl/Ps| Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-  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_LCTL,  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_ENT ,
-  ADJUST,  KC_PSCR, KC_LGUI, KC_LALT, LOWER,   KC_TAB,  KC_SPC,  RAISE,   KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| PrtSc| GUI  | Alt  |Lower | Tab  |Space |Raise | VolDn| VolUp| Pl/Ps| Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_ortho_4x12(
-  KC_ESC,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_LCTL,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  ADJUST,  KC_PSCR, KC_LGUI, KC_LALT, LOWER,   KC_TAB,  KC_SPC,  RAISE,   KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |      |   *  |   (  |   )  |      |      |   7  |   8  |   9  |   *  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |   _  |   +  |   {  |   }  |      |      |   4  |   5  |   6  |   -  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   -  |   =  |   [  |   ]  |      |      |   1  |   2  |   3  |   +  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | Alt  |      |             |      |   0  |   .  | Enter|      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  KC_GRAVE,_______, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, KC_7,    KC_8,    KC_9,    KC_ASTR, _______,
-  KC_DEL,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______, KC_4,    KC_5,    KC_6,    KC_MINS, KC_BSLS,
-  KC_NUM,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, _______, KC_1,    KC_2,    KC_3,    KC_PLUS, _______,
-  _______, _______, _______, KC_LALT, _______, _______, _______, _______, KC_0,    KC_DOT,  KC_ENT,  _______
-),
-
-/* Raise: featuring vim-style hjkl arrow keys
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  | Left | Down |  Up  |Right |      |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F6  |  F7  |  F8  |  F9  |  F10 | Home | PgDn | PgUp | End  |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F11 |  F12 |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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_LEFT, KC_DOWN, KC_UP,  KC_RIGHT, _______, KC_PIPE,
-  _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
-  _______, KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |QWERTY|Colemk|Dvorak|      | Prev | Pl/Ps| Next |      | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | Mute | VolDn| VolUp|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, QK_BOOT, _______,  QWERTY,  COLEMAK, DVORAK,  _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_DEL,
-  _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/vim-mode/readme.md b/keyboards/lets_split/keymaps/vim-mode/readme.md
deleted file mode 100644
index 9bb6131b1c4..00000000000
--- a/keyboards/lets_split/keymaps/vim-mode/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Vim-mode Keymap
-
-This layout is designed with the vim philosophy in mind: You should be able to do your work without lifting your hands off the keyboard. Some movement keys (like the arrow keys) have been directly borrowed from vim, and other keys (like the numpad) have been placed in easy-to-reach areas, following the vim philosophy.
-
-Based on the default keymap.
-
-## Features:
-
-* Vim-like `hjkl` arrow keys in raise layer.
-* Right-hand numpad in lower layer.
-* All brackets and the most frequently used operators are intuitively handled in the lower layer for easy access.
-* Ctrl is just to the left of the left-hand pinky.
-* The raise layer provides the symbol bar on the first row that you're used to.
-* Media keys available in adjust layer (complete) and in the bottom-right corner of the default layer (frequently used).
-* The two keys that are traditionally the keys for `space` behave differently. The right-hand key inserts a space. The left-hand key inserts a tab. This is intuitive: Both keys that would normally make up the spacebar are increasing the space, but in different manners.
-
-
-## Some things to look out for:
-
-* Page up, page down, home, and end have been placed directly under the `hjkl` arrow keys, and each key moves the same direction as the key above it. (for instance, `h` moves left. Home has therefore been placed on `n`). You may ask why this was done instead of placing page down on `f` and page up on `b`. Here's why:
-  * In short, `f` and `b` are in prime locations for other types of keys, and using those keys for page down and page up would interrupt the space available for other keys. Using vim-style `f` and `b` would require either divide up the list of function keys with unrelated keys, which is unintuitive, or move all the function keys to another later, requiring restructuring that does not lend itself to an intuitive layout.
-* Audio is not tested. If it doesn't work, please open an issue.
diff --git a/keyboards/lets_split/keymaps/waples/README.md b/keyboards/lets_split/keymaps/waples/README.md
deleted file mode 100644
index 6e171d964f7..00000000000
--- a/keyboards/lets_split/keymaps/waples/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Waples Let's Split keymap
-[Waples](https://www.github.com/Waples)
-
-## My (forever) Work-In-Progress keymap for my Let's Split keyboard. 
-My keymap is much like the default, I just personally like to have my Enter and Escape key to be on my home row. The Escape key doubles as a Control key when held down, my Enter key functions as (right)Shift when held down.
-Everything you see below here is constantly *under construction*, so there may be some dumb things in this, which are already gotten taken out, or are still in there :P.
-
-### Layers
-I currently have the following layers in my keymap:
-* Qwerty 	(as default)
-* Dvorak	(still learning this type of layout, so not really used much)
-* Gaming	(WIP! I tried some I found, but didn't like them, so I'm in the progress of making my own)
-* Lefty		(lower)
-* Righty	(raise)
-* Dual		(adjust)
-
-#### QWERTY
-	| Tab |  Q  |  W  |  E  |  R  |  T  |      |  Y  |  U  |  I  |  O  |  P  | Bsp |
-	|C_Esc|  A  |  S  |  D  |  F  |  G  |      |  H  |  J  |  K  |  L  |  ;  |S_Ent|
-	| Sft |  Z  |  X  |  C  |  V  |  B  |      |  N  |  M  |  ,  |  .  |  /  |  "  |
-	|P_SCR| GUI | Alt | Cps | ^L^ | Bsp |      | Spc | ^R^ | Lft | Dwn | Up! | Rgt |
-
-
-#### DVORAK
-	| Tab |  "  |  ,  |  .  |  P  |  Y  |      |  F  |  G  |  C  |  R  |  L  | Bsp |
- 	|C_Esc|  A  |  O  |  E  |  U  |  I  |      |  D  |  H  |  T  |  N  |  S  |S_Ent|
-	| Sft |  ;  |  Q  |  J  |  K  |  X  |      |  B  |  M  |  W  |  V  |  Z  |  /  |
-	|P_SCR| GUI | Alt | Cps | ^L^ | Bsp |      | Spc | ^R^ | Lft | Dwn | Up! | Rgt |
-
-
-#### GAMING
-	| Tab |  Q  |  W  |  E  |  R  |  T  |      |     |     |     |     |     |QWERT|
-	| Esc |  A  |  S  |  D  |  F  |  G  |      |     |     |     |     |     |     |
-	| Sft |  Z  |  X  |  C  |  V  |  B  |      |     |     |     |     |     |     |
-	| Ctl |  1  |  2  |  3  | ^L^ | Spc |      | Bsp | ^R^ | Lft | Dwn | Up  | Rgt |
-
-
-#### LEFTY	(lower)
-	|  ~  |  !  |  @  |  #  |  $  |  %  |      |  ^  |  &  |  *  |  (  |  )  | Bsp |
-	| Del |     |     |     |     |     |      |     |  (  |  )  |  [  |  ]  |     |
-	|     |     |     |     |     |     |      |     |     |     |     |     |     |
-	|     |     |     |     |     |     |      | Ins |     | Hme | PgD | PgU | End |
-
-
-#### RIGHTY	(raise)
-	|  `  |  1  |  2  |  3  |  4  |  5  |      |  6  |  7  |  8  |  9  |  0  | Bsp |
-	| Del | F1  | F2  | F3  | F4  |     |      |  =  |  -  |  \  |  /  |     |     |
-	|     | F5  | F6  | F7  | F8  |     |      |     |     |     |     |     |     |
- 	|     | F9  | F10 | F11 |     |     |      |     |     |     |     |     |     |
-
-
-#### DUAL
-	|Reset|     |     |     |     |QWERT|      | GAME|     |     |     |     |Reset|
-	|     | Prv | Stp | Tog | Nxt | Nrm |      | Swp |     |     |     |     |     |
-	|     |     | Mte | Vol-| Vol+|     |      | NKRO|     |     |     |     |     |
-	|     |     |     |     |     |     |      |DVORK|     |     |     |     |     |
-
-
diff --git a/keyboards/lets_split/keymaps/waples/config.h b/keyboards/lets_split/keymaps/waples/config.h
deleted file mode 100644
index 17172f729c6..00000000000
--- a/keyboards/lets_split/keymaps/waples/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-//	#define MASTER_LEFT
-//  #define MASTER_RIGHT
-#define EE_HANDS              // We like to have choices I guess
-
-#endif
diff --git a/keyboards/lets_split/keymaps/waples/keymap.c b/keyboards/lets_split/keymaps/waples/keymap.c
deleted file mode 100644
index a8969504302..00000000000
--- a/keyboards/lets_split/keymaps/waples/keymap.c
+++ /dev/null
@@ -1,129 +0,0 @@
-// Waples layout for Let's Split (rev2)
-// Made changes from the default
-
-#include QMK_KEYBOARD_H
-
-
-extern keymap_config_t keymap_config;
-
-#define _QWERTY 0
-#define _DVORAK 1
-#define _GAME 2
-#define _LEFTY 3
-#define _RIGHTY 4
-#define _DUAL 5
-
-enum letssplit_keycodes {
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  GAME,
-  LEFTY,
-  RIGHTY,
-  DUAL,
-};
-
-#define TG_NKRO MAGIC_TOGGLE_NKRO     // Toggle NKRO
-#define CTLESC MT(MOD_LCTL, KC_ESC)    // Hold for left Ctrl, tap for Esc
-#define SHFTENT MT(MOD_RSFT, KC_ENT)    // Hold for right Shift, tap for Enter
-
-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_BSPC,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,  KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, SHFTENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,    KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_PSCR, KC_BSPC, KC_LALT, KC_CAPS, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_DVORAK] = LAYOUT(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,  KC_Y,    KC_F,   KC_G,   KC_C,    KC_R,    KC_L,  KC_BSPC,
-  CTLESC,  KC_A,    KC_O,    KC_E,    KC_U,  KC_I,    KC_D,   KC_H,   KC_T,    KC_N,    KC_S,  SHFTENT,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,  KC_X,    KC_B,   KC_M,   KC_W,    KC_V,    KC_Z,  KC_SLSH,
-  KC_PSCR, KC_LGUI, KC_LALT, KC_CAPS, LEFTY, KC_BSPC, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-),
-
-[_GAME] = LAYOUT(
-  KC_TAB,  KC_Q, KC_W, KC_E, KC_R,  KC_T,   _______, _______, _______, _______, _______, QWERTY,
-  CTLESC,  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_1, KC_2, KC_3, LEFTY, KC_SPC, KC_BSPC, RIGHTY,   KC_LEFT, KC_DOWN,   KC_UP, KC_RIGHT
-),
-
-[_LEFTY] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_INS,  _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-[_RIGHTY] = LAYOUT(
-  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_DEL,  KC_F1, KC_F2,  KC_F3,  KC_F4,   _______, KC_EQL,  KC_MINS, KC_BSLS, KC_SLSH, _______, _______,
-  _______, KC_F5, KC_F6,  KC_F7,  KC_F8,   _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_DUAL] =  LAYOUT(
-  QK_BOOT, _______, _______, _______, _______, QWERTY,  GAME,    _______, _______, _______, _______, QK_BOOT,
-  _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, DVORAK,  _______, _______, _______, _______, _______
-)
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case GAME:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_GAME);
-      }
-      return false;
-      break;
-    case LEFTY:
-      if (record->event.pressed) {
-        layer_on(_LEFTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      } else {
-        layer_off(_LEFTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      }
-      return false;
-      break;
-    case RIGHTY:
-      if (record->event.pressed) {
-        layer_on(_RIGHTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      } else {
-        layer_off(_RIGHTY);
-        update_tri_layer(_LEFTY, _RIGHTY, _DUAL);
-      }
-      return false;
-      break;
-    case DUAL:
-      if (record->event.pressed) {
-        layer_on(_DUAL);
-      } else {
-        layer_off(_DUAL);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/yshrsmz/config.h b/keyboards/lets_split/keymaps/yshrsmz/config.h
deleted file mode 100644
index 23426411d98..00000000000
--- a/keyboards/lets_split/keymaps/yshrsmz/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* auto shift config */
-#define AUTO_SHIFT_TIMEOUT 150
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/lets_split/keymaps/yshrsmz/keymap.c b/keyboards/lets_split/keymaps/yshrsmz/keymap.c
deleted file mode 100644
index f4e80f57988..00000000000
--- a/keyboards/lets_split/keymaps/yshrsmz/keymap.c
+++ /dev/null
@@ -1,176 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 1
-#define _RAISE 2
-#define _FUNC 3
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  FUNC,
-  ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  -   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Fn  | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | GUI  |Shift |Adjust|  Fn  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-  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_ESC,  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,
-  FUNC,    KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_RGUI, KC_RSFT, ADJUST,  FUNC
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |  {   |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-  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_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,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-  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_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,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* FUNC
- * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F11 |  F12 |      |      |      | LEFT | DOWN |  UP  |RIGHT | PGUP |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      | HOME | END  |Alt+← |Alt+→ | PGDN |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] =  LAYOUT_ortho_4x12(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  _______, KC_F11,  KC_F12,  _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  LALT(KC_LEFT), LALT(KC_RGHT), KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case FUNC:
-      if (record->event.pressed) {
-        layer_on(_FUNC);
-      } else {
-        layer_off(_FUNC);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/lets_split/keymaps/yshrsmz/rules.mk b/keyboards/lets_split/keymaps/yshrsmz/rules.mk
deleted file mode 100644
index c9383ab8db8..00000000000
--- a/keyboards/lets_split/keymaps/yshrsmz/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
deleted file mode 100644
index 80e267e4586..00000000000
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keymap_layout {
-    VANILLA = 0,  // matches MF68 layout
-    CS_GO,        // 0x08
-    FUNC,         // 0x10
-    SETTINGS,     // 0x20
-};
-
-enum {
-    TD_ESC_FUNC = 0,
-    TD_ESC_CTRL,
-    TD_SPC_SPAM
-};
-
-bool spam_space = false;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap BASE: (Base Layer) Default Layer
-     * ,---------.  ,------------------------------------------------------------.  ,---------.
-     * |Vol-|Vol+|  |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa|  | Ins|PgUp|
-     * |---------|  |------------------------------------------------------------|  |---------|
-     * | F3 | F4 |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \|  | Del|PgDn|
-     * |---------|  |------------------------------------------------------------|  `---------'
-     * | F5 | F6 |  |Control |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |---------|  |------------------------------------------------------------|  ,----.
-     * | F7 | F8 |  |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Shift    |  | Up |
-     * |---------|  |-------------------------------------------------------------------------.
-     * | F9 | F10|  |Func|Alt |Cmd |      Space            |Cmd |Alt |Func |    |Lft| Dn |Rig |
-     * `---------'  `------------------------------------------------------'    `-------------'
-     */
-    [VANILLA] = LAYOUT_split_rshift(
-        KC_VOLD, KC_VOLU, QK_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,            LALT(KC_F5), KC_PGUP,
-        KC_F3,   KC_F4,   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_PGDN,
-        KC_F5,   KC_F6,   TD(TD_ESC_FUNC), 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_F7,   KC_F8,   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(CS_GO),          KC_UP,
-        KC_F9,   KC_F10,  KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC),                KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [CS_GO] = LAYOUT_split_rshift(
-        _______, _______, QK_GESC,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            _______,     _______,
-        _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            _______,     _______,
-        _______, _______, KC_LCTL,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
-        _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                          _______,
-        _______, _______, _______,         _______, _______,                            _______,                            _______, _______, _______,                 _______, _______, _______
-    ),
-
-    /* Keymap FUNCTION: Function Layer
-     * ,---------.  ,-------------------------------------------------------------.  ,---------.
-     * | V- | V+ |  | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  | Ins|Home|
-     * |---------|  |-------------------------------------------------------------|  |---------|
-     * |    |    |  |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  | Del|End |
-     * |---------|  |-------------------------------------------------------------|  `---------'
-     * |    |    |  |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-     * |---------|  |-------------------------------------------------------------|  ,----.
-     * |    |    |  |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|  | Up |
-     * |---------|  |--------------------------------------------------------------------------.
-     * |    | F10|  |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |     |Lft| Dn |Rig |
-     * `---------'  `------------------------------------------------------'     `-------------'
-     */
-    [FUNC] = LAYOUT_split_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,             TO(CS_GO),   KC_HOME,
-        _______, _______, XXXXXXX,         KC_PGUP, KC_UP,   KC_PGDN, KC_HOME, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,            _______,     KC_END,
-        _______, _______, _______,         KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,               XXXXXXX,
-        _______, _______, _______,         XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,          TG(SETTINGS), XXXXXXX,            _______,
-        _______, _______, _______,         _______, _______,                            KC_PGDN,                            _______, _______, _______,                 _______, _______, _______
-    ),
-
-    /* Keymap SETTINGS: Settings Layer
-     * ,---------.  ,-----------------------------------------------------------.  ,-------------.
-     * |    |    |  |FN0 |BL0|BL1|BL2|BL3|   |   |   |   |  |   |BL-|BL+|BL Togl|  |RGB Tog |Val+|
-     * |---------|  |-----------------------------------------------------------|  |-------------|
-     * |    |    |  |Debug|   |   |   |   |   |   |   |   |   |   |   |  |RGBTst|  |RGB Mode|Val-|
-     * |---------|  |-----------------------------------------------------------|  `-------------'
-     * |    |    |  |LayrClr|Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-     * |---------|  |-----------------------------------------------------------|  ,----.
-     * |    |    |  |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
-     * |---------|  |------------------------------------------------------------------------.
-     * |    |    |  |    |    |    |      Print Debug      |    |    |     |  |Sat-|Hue-|Sat+|
-     * `---------'  `------------------------------------------------------'  `--------------'
-     */
-    [SETTINGS] = LAYOUT_split_rshift(
-        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,        BL_TOGG,            RGB_TOG,     RGB_VAI,
-        XXXXXXX, XXXXXXX, DB_TOGG,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,            RGB_MOD,     RGB_VAD,
-        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,      XXXXXXX,            RGB_HUI,
-        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,                 RGB_SAD, RGB_HUD, RGB_SAI
-    )
-};
-
-void tap_space_spam_finished(tap_dance_state_t *state, void *user_data) {
-    if (get_mods() & (MOD_BIT(KC_LGUI))) {
-      return;
-    }
-    if (state->pressed) {
-        spam_space = true;
-    }
-    tap_code(KC_SPC);
-}
-
-void tap_space_spam_reset(tap_dance_state_t *state, void *user_data) {
-    spam_space = false;
-    unregister_code(KC_SPC);
-}
-
-void tap_esc_func_finished(tap_dance_state_t *state, void *user_data) {
-    if (state->pressed) {
-        layer_on(FUNC);
-    } else {
-        tap_code(KC_ESC);
-    }
-}
-
-void tap_esc_func_reset(tap_dance_state_t *state, void *user_data) {
-    layer_off(FUNC);
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
-    [TD_SPC_SPAM] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_space_spam_finished, tap_space_spam_reset),
-};
-
-void matrix_scan_user(void) {
-    if (spam_space && !(get_mods() & (MOD_BIT(KC_LGUI)))) {
-        tap_code(KC_SPC);
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if ((layer_state & (1 << CS_GO)) && (keycode == 44)) {
-        if (get_mods() & (MOD_BIT(KC_LGUI))) {
-            return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/readme.md b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/readme.md
deleted file mode 100644
index 85b7b1a8d28..00000000000
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for bluepad
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk
deleted file mode 100644
index 732bfcfa8f5..00000000000
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_ENABLE = no
-TAP_DANCE_ENABLE = yes
-WATCHDOG_ENABLE = yes		# Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
deleted file mode 100644
index 3be46837c1d..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
+++ /dev/null
@@ -1,170 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keymap_layout {
-    VANILLA = 0,  // matches MF68 layout
-    DEFAULT_WKL,  // 0x02 Function in CapsLock location, gui key disabled
-    DEFAULT_OSX,  // 0x04 Function in CapsLock location, gui/alt swapped for OSX
-    CS_GO,        // 0x08 Function in CapsLock location, gui/alt swapped for OSX
-    FUNC,         // 0x10
-    SETTINGS,     // 0x20
-};
-
-enum {
-    TD_ESC_FUNC = 0,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap VANILLA: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|        ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |CTRL |Func|   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [VANILLA] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_0,    KC_1,     KC_2,              KC_3,    KC_4,    KC_5,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,           KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,           KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT,                    KC_UP,
-        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC), MO(SETTINGS),      KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Keymap DEFAULT_TKL: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|       ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |       | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl|    |Alt |      Space            |ALT |    |CTRL |Func|   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [DEFAULT_WKL] = LAYOUT_tkl_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_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,                KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, MO(FUNC),      KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Keymap DEFAULT_OSX: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|        ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl| Opt |Cmd |      Space           |Cmd |Opt |CTRL |Func|   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [DEFAULT_OSX] = LAYOUT_tkl_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_SCRL, KC_PAUS, LALT(KC_F5),
-        KC_GRV,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
-        TD(TD_ESC_FUNC), 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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC), MO(SETTINGS),       KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [CS_GO] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,               _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______
-    ),
-
-    /* Keymap FUNCTION: Function Layer
-     * ,-------------------------------------------------------------.  ,--------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-     * |-------------------------------------------------------------|  |--------------|
-     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-     * |-------------------------------------------------------------|  `--------------'
-     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-     * |-------------------------------------------------------------|       ,----.
-     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-     * |-------------------------------------------------------------'   ,-------------.
-     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-     * `------------------------------------------------------'          `-------------'
-     */
-    [FUNC] = LAYOUT_tkl_ansi(
-        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR,   KC_SCRL, KC_PAUS,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            TO(CS_GO), _______, _______,
-        XXXXXXX, KC_PGUP, KC_UP,   KC_PGDN, KC_HOME, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______,   _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
-        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),                 _______,
-        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,             _______, _______, _______
-    ),
-
-    /* Keymap SETTINGS: Settings Layer
-     * ,-----------------------------------------------------------.     ,-------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * |LayClr|   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-     * |-----------------------------------------------------------|    |-------------|
-     * |Debug|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-     * |-----------------------------------------------------------|    `-------------'
-     * |AU_TOGG|Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-     * |-----------------------------------------------------------|  ,----.
-     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
-     * |------------------------------------------------------------------------.
-     * |    |    |    |      Print Debug      |    |    |     |  |Sat-|Hue-|Sat+|
-     * `------------------------------------------------------'  `--------------'
-     */
-    [SETTINGS] = LAYOUT_tkl_ansi(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN,      XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
-        MU_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
-    )
-};
-
-void tap_esc_func_finished(tap_dance_state_t *state, void *user_data) {
-    if (state->pressed) {
-        layer_on(FUNC);
-    } else {
-        tap_code(KC_ESC);
-    }
-}
-
-void tap_esc_func_reset(tap_dance_state_t *state, void *user_data) {
-    layer_off(FUNC);
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if ((layer_state & (1 << CS_GO)) && (keycode == 44)) {
-        if (get_mods() & (MOD_BIT(KC_LGUI))) {
-            return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/readme.md b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/readme.md
deleted file mode 100644
index 56742f3b282..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for LFK87
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk
deleted file mode 100644
index eb12c33f4a3..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TAP_DANCE_ENABLE = yes
-WATCHDOG_ENABLE = yes		# Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
deleted file mode 100644
index 0191b3570fe..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keymap_layout {
-    VANILLA = 0,  // matches MF68 layout
-    FUNC,         // 0x08
-    SETTINGS,     // 0x10
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap VANILLA: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|        ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [VANILLA] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   LGUI(KC_D), KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,      KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,       KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,       KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,       KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,       KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT,               KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                KC_RALT, KC_RGUI, MO(FUNC), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Keymap FUNCTION: Function Layer
-     * ,-------------------------------------------------------------.  ,--------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-     * |-------------------------------------------------------------|  |--------------|
-     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-     * |-------------------------------------------------------------|  `--------------'
-     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-     * |-------------------------------------------------------------|       ,----.
-     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-     * |-------------------------------------------------------------'   ,-------------.
-     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-     * `------------------------------------------------------'          `-------------'
-     */
-    [FUNC] = LAYOUT_tkl_ansi(
-        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SCRL, KC_PAUS,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            _______, _______, _______,
-        XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______, _______, _______,
-        _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
-        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),               _______,
-        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,           _______, _______, _______
-    ),
-
-    /* Keymap SETTINGS: Settings Layer
-     * ,-----------------------------------------------------------.     ,-------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-     * |-----------------------------------------------------------|    |-------------|
-     * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-     * |-----------------------------------------------------------|    `-------------'
-     * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-     * |-----------------------------------------------------------|      ,----.
-     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
-     * |--------------------------------------------------------------------------.
-     * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
-     * `----------------------------------------------------------------------------'
-     */
-    [SETTINGS] = LAYOUT_tkl_ansi(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN,      XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
-        MU_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOGG, KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
-    )
-};
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk
deleted file mode 100644
index bcd6b23d237..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-WATCHDOG_ENABLE = no		# Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
deleted file mode 100644
index c70c7d88179..00000000000
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Pascal Pfeil
- *
- * 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
-
-/* 1000Hz USB polling */
-#define USB_POLLING_INTERVAL_MS 1
-
-/* Force NKRO on boot up */
-#define FORCE_NKRO
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_TIMEOUT 900000
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
deleted file mode 100644
index 466adfea476..00000000000
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2021 Pascal Pfeil
- *
- * 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_ESC,  KC_TAB,  KC_BSPC, MO(1),
-        KC_NUM,  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
-    ),
-
-    /* RGB */
-    [1] = LAYOUT_numpad_6x4(
-        RGB_SAI, RGB_VAI, RGB_HUI, _______,
-        RGB_SAD, RGB_VAD, RGB_HUD, QK_BOOT,
-        RGB_M_X, RGB_M_G, RGB_MOD,
-        RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_RMOD,
-        RGB_M_P, RGB_M_B, RGB_M_R,
-            XXXXXXX,      XXXXXXX, RGB_TOG
-    ),
-
-    /* VIA wants four keymaps */
-    [2] = LAYOUT_numpad_6x4(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______,
-            _______,      _______, _______
-    ),
-
-    /* VIA wants four keymaps */
-    [3] = LAYOUT_numpad_6x4(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______,
-            _______,      _______, _______
-    ),
-};
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
deleted file mode 100644
index 9e3927f5457..00000000000
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keymap_layout {
-    VANILLA = 0,  // matches MF68 layout
-    FUNC,         // 0x08
-    SETTINGS,     // 0x10
-};
-
-enum {
-    TD_ESC_FUNC = 0,
-    TD_ESC_CTRL,
-    TD_SPC_SPAM
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap VANILLA: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|        ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [VANILLA] = LAYOUT(
-        QK_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_NUM,  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_BSLS,                  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-        TD(TD_ESC_FUNC), 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_P4,   KC_P5,   KC_P6,   LALT(KC_F5),
-        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_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC),     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT
-    ),
-
-    /* Keymap FUNCTION: Function Layer
-     * ,-------------------------------------------------------------.  ,--------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-     * |-------------------------------------------------------------|  |--------------|
-     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-     * |-------------------------------------------------------------|  `--------------'
-     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-     * |-------------------------------------------------------------|       ,----.
-     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-     * |-------------------------------------------------------------'   ,-------------.
-     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-     * `------------------------------------------------------'          `-------------'
-     */
-    [FUNC] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,                        _______, _______, _______, _______,
-        XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       _______, _______, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,                       _______, _______, _______, _______,
-        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),     _______,     _______, _______, _______, _______,
-        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______,          _______, _______, _______,     _______, _______
-    ),
-
-    /* Keymap SETTINGS: Settings Layer
-     * ,-----------------------------------------------------------.     ,-------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-     * |-----------------------------------------------------------|    |-------------|
-     * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-     * |-----------------------------------------------------------|    `-------------'
-     * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-     * |-----------------------------------------------------------|      ,----.
-     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
-     * |--------------------------------------------------------------------------.
-     * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
-     * `----------------------------------------------------------------------------'
-     */
-    [SETTINGS] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   BL_TOGG,                  RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX,
-        MU_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
-        AU_TOGG, KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,     RGB_SAD, RGB_HUD, RGB_SAI,     XXXXXXX, XXXXXXX
-    )
-};
-
-void tap_esc_func_finished(tap_dance_state_t *state, void *user_data) {
-    if (state->pressed) {
-        layer_on(FUNC);
-    } else {
-        tap_code(KC_ESC);
-    }
-}
-
-void tap_esc_func_reset(tap_dance_state_t *state, void *user_data) {
-    layer_off(FUNC);
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
-};
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/barabas/config.h b/keyboards/lily58/keymaps/barabas/config.h
deleted file mode 100644
index 5c9d0a8ec77..00000000000
--- a/keyboards/lily58/keymaps/barabas/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2020 Barabas Raffai
-
-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 MASTER_LEFT
diff --git a/keyboards/lily58/keymaps/barabas/keymap.c b/keyboards/lily58/keymaps/barabas/keymap.c
deleted file mode 100644
index cd095f3a737..00000000000
--- a/keyboards/lily58/keymaps/barabas/keymap.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-Copyright 2020 Barabas Raffai
-
-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
-
-extern uint8_t is_master;
-
-enum layer_number {
-    _QWERTY = 0,
-    _GAME,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-/* clang-format off */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | ESC  |      |      |      |      |      |                    |      |      |      |      |      |  `   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | 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,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 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, MO(_LOWER), KC_SPC,   KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI
-),
-
- /* game layer adds the number row back */
-
-[_GAME] = LAYOUT(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                               _______, _______, _______, _______, _______, _______, _______, _______
-),
-/* 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
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      | GAME |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------| Left | Down |  Up  |Right |      |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_RAISE] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, TG(_GAME),
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-                               _______, _______, _______,  _______, _______,  _______, _______, _______
-),
-
-[_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,
-                               _______, _______, _______, _______, _______,  _______, _______, _______
-)
-};
-/* clang-format on */
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-    if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-        layer_on(layer3);
-    } else {
-        layer_off(layer3);
-    }
-}
-
-// SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_keyboard_master()) return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-    return rotation;
-}
-
-const char *read_logo(void);
-void        set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-#    define RAISE_MASK (1 << _RAISE)
-#    define LOWER_MASK (1 << _LOWER)
-#    define GAME_MASK (1 << _GAME)
-void write_layer_state(void) {
-    switch (layer_state & (~GAME_MASK)) {
-        case (RAISE_MASK | LOWER_MASK):
-            oled_write_P(PSTR("Adjust"), false);
-            break;
-        case RAISE_MASK:
-            oled_write_P(PSTR("Raise"), false);
-            break;
-        case LOWER_MASK:
-            oled_write_P(PSTR("Lower"), false);
-            break;
-        case 0:
-            oled_write_P(PSTR("Default"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undef-"), false);
-            {
-                char s[3];
-                itoa(layer_state, s, 16);
-                oled_write(s, false);
-            }
-            break;
-    }
-
-    if (layer_state & GAME_MASK) {
-        oled_write_P(PSTR(" + Game"), false);
-    }
-
-    oled_advance_page(true);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        write_layer_state();
-        oled_write_ln(read_keylog(), false);
-        oled_write_ln(read_keylogs(), false);
-    } else {
-        oled_write(read_logo(), false);
-    }
-    return false;
-}
-#endif  // OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-#ifdef OLED_ENABLE
-        set_keylog(keycode, record);
-#endif
-    }
-    return true;
-}
diff --git a/keyboards/lily58/keymaps/barabas/readme.md b/keyboards/lily58/keymaps/barabas/readme.md
deleted file mode 100644
index db87722c0e7..00000000000
--- a/keyboards/lily58/keymaps/barabas/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Barabas' Lily58 Layout
-
-Changes from the default layout:
-- Add a layer to toggle number row. I keep missing when stretching up here,
-  trying to get used to the Raise layer instead.
-- [Vim](https://www.vim.org/) style arrow keys.
diff --git a/keyboards/lily58/keymaps/barabas/rules.mk b/keyboards/lily58/keymaps/barabas/rules.mk
deleted file mode 100644
index 8b1d516b71d..00000000000
--- a/keyboards/lily58/keymaps/barabas/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-NKRO_ENABLE = yes
-COMMAND_ENABLE = yes
-
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h b/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h
deleted file mode 100644
index e5d0aa66991..00000000000
--- a/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- This is the c configuration file for the keymap
-
- Copyright 2012 Jun Wako <wakojun@gmail.com>
- Copyright 2015 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
-
- //#define USE_MATRIX_I2C
-
- /* Select hand configuration */
-
- // #define MASTER_LEFT
- #define MASTER_LEFT
- // #define EE_HANDS
-
- #define QUICK_TAP_TERM 0
- #define TAPPING_TERM 200
-
- #undef RGBLED_NUM
-#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 27
- #define RGBLIGHT_LIMIT_VAL 120
- #define RGBLIGHT_HUE_STEP 10
- #define RGBLIGHT_SAT_STEP 17
- #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c b/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
deleted file mode 100644
index e4b9ad269dc..00000000000
--- a/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* Copyright 2021 (@dbrglc) 
-*
-* 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 custom_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-
-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  |  -   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |CANC  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LCTRL| LAlt | LGUI | /Space  /       \Enter \  |BackSP| RAISE |LOWER |
- *                   |      |      |      |/       /         \      \ |      |       |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
- [_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_EQL,
-  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_DEL,   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_LCTL, KC_LALT, KC_LGUI, KC_SPC,   KC_ENT,  KC_BSPC, RAISE, LOWER
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   -  |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |   |  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LCTRL| LAlt | LGUI | /Space  /       \Enter \  |BackSP| RAISE |LOWER |
- *                   |      |      |      |/       /         \      \ |      |       |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_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
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LCTRL| LAlt | LGUI | /Space  /       \Enter \  |BackSP| RAISE |LOWER |
- *                   |      |      |      |/       /         \      \ |      |       |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_RAISE] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______,
-  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,   _______, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-                             _______, _______, _______,  _______, _______,  _______, _______, _______
-),
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LCTRL| LAlt | LGUI | /Space  /       \Enter \  |BackSP| RAISE |LOWER |
- *                   |      |      |      |/       /         \      \ |      |       |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-  [_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, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
-                             _______, _______, _______, _______, _______,  _______, _______, _______
-  )
-};
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-char wpm_str[16];
-
-// WPM-responsive animation stuff here
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 40 // below this wpm value your animation will idle
-
-// #define PREP_FRAMES 1 // uncomment if >1
-
-#define TAP_FRAMES 2
-#define TAP_SPEED 60 // above this wpm value typing animation to triggere
-
-#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
-#define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, may need fixing
-#define ANIM_SIZE 640 // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint16_t anim_timer = 0;
-uint16_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-//
-// Render right OLED display animation
-//
-static void render_anim(void) {
-
-  // Idle animation
-  static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-    {
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-      64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    },
-
-    {
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-      64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-      7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    },
-
-    {
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
-      32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    },
-
-    {
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-      64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-      7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    },
-
-    {
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
-      32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    }
-  };
-
-  // Prep animation
-  static const char PROGMEM prep[][ANIM_SIZE] = {
-
-    {
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
-      64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    }
-
-  };
-
-  // Typing animation
-  static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-
-    {
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
-      95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
-      1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    },
-
-    {
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
-      32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    }
-
-  };
-
-  //assumes 1 frame prep stage
-    void animation_phase(void) {
-        if(get_current_wpm() <=IDLE_SPEED){
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_clear();
-            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-        }
-        if(get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED){
-            oled_clear();
-            // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
-            oled_write_raw_P(prep[0], ANIM_SIZE); // remove if IDLE_FRAMES >1
-        }
-        if(get_current_wpm() >=TAP_SPEED){
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-            oled_clear();
-            oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-        }
-    }
-    if(get_current_wpm() != 0) {
-        if(timer_elapsed(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read();
-            animation_phase();
-        }
-        anim_sleep = timer_read();
-    } else {
-        if(timer_elapsed(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read();
-            animation_phase();
-        }
-        if(timer_elapsed(anim_sleep) > SLEEP_TIMER) {
-//            oled_off();
-        }
-    }
-}
-
-void oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_set_cursor(0,1);
-        uint8_t n = get_current_wpm();
-        char    wpm_counter[4];
-        wpm_counter[3] = '\0';
-        wpm_counter[2] = '0' + n % 10;
-        wpm_counter[1] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
-        wpm_counter[0] = n / 10 ? '0' + n / 10 : ' ';
-        oled_write_P(PSTR("WPM: "), false);
-        oled_write(wpm_counter, false);
-        oled_set_cursor(0,3); {
-            oled_write_ln(read_layer_state(), false);
-        }
-    } else {
-        render_anim();
-    }
-}
-#endif // OLED_DRIVER_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-  }
-  return true;
-}
diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/readme.md b/keyboards/lily58/keymaps/bongocat_wpm_responsive/readme.md
deleted file mode 100644
index 2bcd7e87f83..00000000000
--- a/keyboards/lily58/keymaps/bongocat_wpm_responsive/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Responsive Bongo Cat layout for Lily58 :drum: :smile_cat:
-
-This split ergo layout follows the layout of another ergo split keyboard with the following changes:
-
-* I put the space on the Left thumb and the Enter on the right thumb :thumbsup:
-
-* Near the thumbs there are all my most used keys as a Mac User :computer:
-
-* I edit the Bongo Cat to be responsive to the Word Per Minutes that you are writing :scream_cat:
-
-## Layers
-
-### Default layer
-
-![Default layer layout](https://i.imgur.com/padJXr2.png)
-
-### Raise layer
-
-![Raise layer layout](https://i.imgur.com/iqQDUXD.png)
-
-### Lower layer
-
-![Lower layer layout](https://i.imgur.com/EzNU2hq.png)
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk b/keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk
deleted file mode 100644
index 787d72e3f18..00000000000
--- a/keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-WPM_ENABLE = yes
-LTO_ENABLE = yes
-
- # If you want to change the display of OLED, you need to change here
- SRC +=  ./lib/rgb_state_reader.c \
-         ./lib/layer_state_reader.c \
-         ./lib/logo_reader.c \
-         ./lib/keylogger.c \
-         # ./lib/mode_icon_reader.c \
-         # ./lib/host_led_state_reader.c \
-         # ./lib/timelogger.c \
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/chuan/config.h b/keyboards/lily58/keymaps/chuan/config.h
deleted file mode 100644
index b3a47769bf6..00000000000
--- a/keyboards/lily58/keymaps/chuan/config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-// #define USE_MATRIX_I2C
-
-//  #define USE_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-
-/* define tapping term */
-#define TAPPING_TERM 200
-
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#define ENCODERS_PAD_A { F4 }
-#define ENCODERS_PAD_B { F5 }
-
-
- /* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-// Underglow
-/*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_SLEEP
-*/
diff --git a/keyboards/lily58/keymaps/chuan/keymap.c b/keyboards/lily58/keymaps/chuan/keymap.c
deleted file mode 100644
index 58a19ebd5f3..00000000000
--- a/keyboards/lily58/keymaps/chuan/keymap.c
+++ /dev/null
@@ -1,225 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-
-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  |  -   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |HYPER |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|   -   |    |    +  |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LCtl | LGUI |LALT  | /Space  /       \Space \  |RAISE |   [  |   ]  |
- *                   |      |      |      |/ LOWER /         \      \ |   '  |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
- [_QWERTY] = LAYOUT(
-  QK_GESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_BSLS,
-  ALL_T(KC_GRV), KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENTER,
-  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MINS,  MEH_T(KC_EQL),  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
-                             KC_LCTL, KC_LGUI, KC_LALT,LT(_LOWER, KC_SPC),        KC_SPC, LT(2,KC_QUOT),   KC_LBRC, KC_RBRC
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   -  |
- * |------+------+------+------+------+------| cmd spc|   |       |------+------+------+------+------+------|
- * |      |      |      |ctrl c|      |      |-------|    |-------|      |   -  |   _  |   [  |   ]  |   |  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |  {   |  }   |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-[_LOWER] = LAYOUT(
-   KC_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
-  _______, _______, _______, C(KC_C), _______, _______, LGUI(KC_SPC), _______, _______, KC_MINS, KC_UNDS , KC_LBRC, KC_RBRC, KC_PIPE,
-                             _______, _______, _______, _______, _______,  RAISE, KC_LCBR, KC_RCBR
-),
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_RAISE] = LAYOUT(
-  KC_F1,  KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,                       _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL, _______,
-  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                      KC_6,    LCTL(LSFT(KC_TAB)),KC_UP,LCTL(KC_TAB),    KC_0,    _______,
-  _______, _______, _______, _______, _______, _______,                     XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT,   KC_RGHT, XXXXXXX,
-  _______, _______, _______, _______, _______, _______, _______, TG(_ADJUST),KC_PLUS, KC_MUTE ,KC_VOLD  ,KC_VOLU, _______, _______,
-                             _______, _______, _______,  _______, _______,  _______, _______, _______
-),
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |  7   |   8  |   9  |RGB ON| HUE+ |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |  4   |   5  |   6  | MODE | HUE- |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |  1   |   2  |   3  | SAT+ | VAL+ |
- * |------+------+------+------+------+------|       |    |DEFAULT|------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |  0   |   0  |   .  | SAT- | VAL- |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-  [_ADJUST] = LAYOUT(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,  KC_7  ,  KC_8  ,  KC_9  , RGB_TOG, RGB_HUI,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,  KC_4  ,  KC_5  ,  KC_6  , RGB_MOD, RGB_HUD,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,  KC_1  ,  KC_2  ,  KC_3  , RGB_SAI, RGB_VAI,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(_ADJUST), XXXXXXX,  KC_0  ,  KC_0  , KC_DOT, RGB_SAD, RGB_VAD,
-                             _______, _______, _______, _______, _______,  _______,KC_BSPC, _______
-  )
-};
-
-int RGB_current_mode;
-
-int counter = 0;
-int lastIndex = 9;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
-
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-const char *read_mode_icon(bool swap);
-const char *read_host_led_state(void);
-void set_timelog(void);
-const char *read_timelog(void);
-
-char encoder_debug[24];
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  snprintf(encoder_debug, sizeof(encoder_debug), "%i   %i", counter, lastIndex );
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    // oled_write_ln(read_keylog(), false);
-    // oled_write_ln(read_keylogs(), false);
-    // oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
-    oled_write_ln(read_host_led_state(), false);
-    oled_write_ln(encoder_debug, false);
-    // oled_write_ln(read_timelog(), false);
-  } else {
-    oled_write(read_logo(), false);
-    // oled_write_ln(encoder_debug, false);
-  }
-    return false;
-}
-#endif //OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-  }
-  return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    lastIndex = index;
-    if (clockwise) {
-        counter++;
-        tap_code(KC_PGDN);
-    } else {
-        counter--;
-        tap_code(KC_PGUP);
-    }
-    return true;
-}
diff --git a/keyboards/lily58/keymaps/chuan/rules.mk b/keyboards/lily58/keymaps/chuan/rules.mk
deleted file mode 100644
index 3e05cb7d920..00000000000
--- a/keyboards/lily58/keymaps/chuan/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRAKEY_ENABLE = yes
-NKRO_ENABLE = yes
-ENCODER_ENABLE = yes
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/mode_icon_reader.c \
-        ./lib/host_led_state_reader.c \
-        ./lib/timelogger.c \
-        ./lib/keylogger.c \
diff --git a/keyboards/lily58/keymaps/cykedev/config.h b/keyboards/lily58/keymaps/cykedev/config.h
deleted file mode 100644
index d9e43606a40..00000000000
--- a/keyboards/lily58/keymaps/cykedev/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2020 Christian Eiden, cykedev
-//
-// 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 MASTER_LEFT
-#define TAPPING_TERM 200
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
diff --git a/keyboards/lily58/keymaps/cykedev/keymap.c b/keyboards/lily58/keymaps/cykedev/keymap.c
deleted file mode 100644
index 88d9728469e..00000000000
--- a/keyboards/lily58/keymaps/cykedev/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2020 Christian Eiden, cykedev
-//
-// 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 SY_PLS LT(_SYMBOL, KC_PPLS)
-#define SY_MIN LT(_SYMBOL, KC_MINS)
-#define SY_SPC LT(_SYMBOL, KC_SPC)
-#define G_COMM LGUI_T(KC_COMM)
-#define A_DOT  LALT_T(KC_DOT)
-#define ADJ    MO(_ADJUST)
-
-enum layer_names {
-    _QWERTY,
-    _SYMBOL,
-    _ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  | Back |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------| SYM + |    | SYM - |------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  | Shift|
- * `-----------------------------------------/ Shift /     \  SYM \-----------------------------------------'
- *                   |  ADJ |  Alt |  Cmd | / Enter /       \ Space\  |  Alt | Home | End  |
- *                   |      |      |   ,  |/       /         \      \ |   .  |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
- [_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_BSPC,
-  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  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,   SY_PLS,    SY_MIN,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                             ADJ,     KC_LALT, G_COMM, SC_SENT,   SY_SPC,  A_DOT,   KC_HOME, KC_END
-),
-/* SYMBOL
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | Del  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |   !  |   @  |   {  |   }  |   |  |                    |  &   |   +  |  up  |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |   #  |   $  |   (  |   )  |   `  |-------.    ,-------|  =   | left | down |right |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |   %  |   ^  |   [  |   ]  |   ~  |-------|    |-------|  *   |   -  |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |      | /       /       \      \  |      |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-[_SYMBOL] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,                   KC_AMPR, KC_PPLS, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX,
-  _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,                    KC_PEQL, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,
-  _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, KC_ASTR, KC_MINS, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-                             _______, _______, _______, _______, _______,  _______, XXXXXXX, XXXXXXX
-),
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  RST |      |      |      |      |      |                    |      |      |      |      |      | RST  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |  V+  |                    |  Br+ |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |  V-  |-------.    ,-------|  Br- |  <<  | play |  >>  |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      | Mute |-------|    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |      | /       /       \      \  |      |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-[_ADJUST] = LAYOUT(
-  EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,                   KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,                   KC_BRID, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                             _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-)
-};
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case SY_SPC:
-            return false;
-        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-            return true;
-        default:
-            return false;
-    }
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;
-  return rotation;
-}
-
-const char *read_logo(void);
-
-bool oled_task_user(void) {
-  oled_write_ln(read_logo(), false);
-    return false;
-}
-#endif // OLED_ENABLE
diff --git a/keyboards/lily58/keymaps/cykedev/rules.mk b/keyboards/lily58/keymaps/cykedev/rules.mk
deleted file mode 100644
index 30a34bd64b7..00000000000
--- a/keyboards/lily58/keymaps/cykedev/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTO_SHIFT_ENABLE = no
-OLED_ENABLE= yes
-
-EXTRAKEY_ENABLE = yes
-
-SRC +=  ./lib/logo_reader.c
-#         ./lib/keylogger.c \
-#         ./lib/mode_icon_reader.c \
-#         ./lib/timelogger.c \
-#         ./lib/host_led_state_reader.c \
-#         ./lib/rgb_state_reader.c \
-#         ./lib/layer_state_reader.c \
diff --git a/keyboards/lily58/keymaps/datadavd/config.h b/keyboards/lily58/keymaps/datadavd/config.h
deleted file mode 100644
index c851d7ad0ef..00000000000
--- a/keyboards/lily58/keymaps/datadavd/config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 50
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-// Mouse configs
-#define MOUSEKEY_DELAY 150
-
-// Underglow
-/*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_SLEEP
-*/
diff --git a/keyboards/lily58/keymaps/datadavd/keymap.c b/keyboards/lily58/keymaps/datadavd/keymap.c
deleted file mode 100644
index d0c34ef21ec..00000000000
--- a/keyboards/lily58/keymaps/datadavd/keymap.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* Copyright 2021 David Dansby
- *
- * 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_number {
-  _QWERTY = 0,
-  _SUPER,
-  _RAISE,
-  _MOUSE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |BackSP|
- * |------+------+------+------+------+------|                    |------+------+------+------+------+----- |
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | \|   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+----- |
- * |LShift|   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |  ;:  |  '"  |
- * |------+------+------+------+------+------|   `~  |    | Enter |------+------+------+------+------+------|
- * |LCTRL |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |  ,<  |  .>  |  ?/  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |  [   | LAlt | LGUI | /SUPER  /       \Space \  |RAISE | 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_BSPC,
-  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  KC_LSFT,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LCTL,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   KC_GRV, KC_ENT,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
-                        KC_LBRC, KC_LALT, KC_LGUI, MO(_SUPER), KC_SPC, MO(_RAISE), KC_RGUI, KC_RBRC
-),
-/* SUPER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | Pwr  |Pwr Dn| Sleep| Wake | XXXX | XXXX |                    |  \|  |  `~  |  }   |  -_  |  =+  |BackSP|
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  Tab | Tab  | ESC  |Enter |LCTRL |  {   |                    |   )  |  Tab |  Up  |  {[  |  ]}  |  \|  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |LShift|LShift| LGUI | LAlt |   _  |  (   |-------.    ,-------|BackSP| Left | Down |Right |   =  |Enter |
- * |------+------+------+------+------+------| CAPS  |    |  `~   |------+------+------+------+------+------|
- * |LCTRL |LCTRL | Home |Pg Up |Pg Dwn| End  |-------|    |-------|   B  |   V  |   C  |   X  |   Z  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |Trans | LAlt |LGUI  | /Trans  /       \Space \  |Del   | TGUI |Trans |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-[_SUPER] = LAYOUT(
-  KC_PWR,    KC_PWR,   KC_SLEP,  KC_WAKE,  KC_NO,     KC_NO,                         KC_BSLS,  KC_GRV,   KC_RCBR,  KC_MINS,  KC_EQL,  KC_BSPC,
-  KC_TAB,    KC_TAB,   KC_ESC,   KC_ENT,   KC_LCTL,   KC_LCBR,                       KC_RPRN,  KC_TAB,   KC_UP,    KC_LBRC,  KC_RBRC, KC_TRNS,
-  KC_LSFT,   KC_LSFT,  KC_LGUI,  KC_LALT,  KC_UNDS,   KC_LPRN,                       KC_BSPC,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_EQL,  KC_ENT,
-  KC_LCTL,   KC_LCTL,  KC_HOME,  KC_PGUP,  KC_PGDN,   KC_END,   KC_CAPS,  KC_GRV,    KC_B,     KC_V,     KC_C,     KC_X,     KC_Z,    KC_RSFT,
-                                   KC_TRNS, KC_LALT, KC_LGUI, KC_TRNS,      KC_SPC, KC_DEL, KC_RGUI, KC_TRNS
-),
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | TAB  | TAB  | XXXX |  (   |   )  | TAB  |                    | MUTE | VOLU |  Up  |_MOUSE|ENTER | CAPS |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |LShift|LShift| DEL  |  [   |   ]  |  `~  |-------.    ,-------| VOLD | Left | Down |Right |RShift|_MOUSE|
- * |------+------+------+------+------+------|  BRID |    | BRIU  |------+------+------+------+------+------|
- * |LCTRL |LCTRL | MRWD | MPLY | MFFD | MSTP |-------|    |-------| End  |Pg Dwn|Pg Up | Home |RShift|RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |MS_BT2| LAlt | LGUI | /BackSP /       \Trans \  |Trans |Trans | XXXX |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_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_TAB,  KC_TAB,  KC_NO,   KC_LPRN,  KC_RPRN,  KC_TAB,                        KC_MUTE,  KC_VOLU,  KC_UP,   MO(_MOUSE),  KC_ENT,      KC_CAPS,
-  KC_LSFT, KC_LSFT, KC_DEL,  KC_LBRC,  KC_RBRC,  KC_GRV,                        KC_VOLD,  KC_LEFT,  KC_DOWN, KC_RGHT,     KC_RSFT,     MO(_MOUSE),
-  KC_LCTL, KC_LCTL, KC_MRWD, KC_MPLY,  KC_MFFD,  KC_MSTP,   KC_BRID, KC_BRIU,   KC_END,   KC_PGDN,  KC_PGUP, KC_HOME,     KC_RSFT,     KC_RSFT,
-                               KC_NO, KC_LALT, KC_LGUI, KC_BSPC,      KC_TRNS, KC_TRNS, KC_TRNS, KC_NO
-),
-/* MOUSE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |                    | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | XXXX | XXXX |MS_W_D| MS_U |MS_W_U| XXXX |                    | XXXX | XXXX |LShift|Trans | LGUI | XXXX |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | XXXX |MS_BT2| MS_L | MS_D | MS_R | XXXX |-------.    ,-------| XXXX | XXXX | XXXX | XXXX | XXXX |Trans |
- * |------+------+------+------+------+------|  XXXX |    | XXXX  |------+------+------+------+------+------|
- * | XXXX | XXXX |MS_W_R|MS_BT3|MS_W_L| XXXX |-------|    |-------| XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | XXXX | XXXX | XXXX | / MS_BT1/       \ XXXX \  |Trans | XXXX | XXXX |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_MOUSE] = LAYOUT(
-  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_WH_D, KC_MS_U,  KC_WH_U,  KC_NO,                     KC_NO,  KC_NO,  KC_LSFT,  KC_TRNS,  KC_LGUI,  KC_NO,
-  KC_NO,   KC_BTN2, KC_MS_L, KC_MS_D,  KC_MS_R,  KC_NO,                     KC_NO,  KC_NO,  KC_NO,    KC_NO,    KC_NO,    KC_TRNS,
-  KC_NO,   KC_NO,   KC_WH_R, KC_BTN3,  KC_WH_L,  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_BTN1,    KC_NO, KC_TRNS, KC_NO, KC_NO
-)
-};
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-//const char *read_keylog(void);
-//const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-static void render_logo(void) {
-  static const char PROGMEM my_logo[] = {
-    // Paste the code from the previous step below this line!
-    // 'DataDavD Logo', 128x32px
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x01, 0x01, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0x19, 0xf9, 0xf9, 0xf9, 0xe1, 0xe7, 0x07, 0xff, 0xff,
-    0xff, 0x01, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0x01, 0xff, 0xff,
-    0xff, 0x01, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0x61, 0x61, 0x67, 0x67, 0x67, 0x67, 0x07, 0x07, 0xff,
-    0xff, 0x01, 0x01, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0xf9, 0xf9, 0xf9, 0xf9, 0x01, 0x01, 0xff,
-    0xff, 0x01, 0x01, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0x19, 0xf9, 0xf9, 0xf9, 0xe1, 0xe7, 0x07, 0xff,
-    0xff, 0xff, 0x01, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0x01, 0xff,
-    0xff, 0xff, 0x01, 0xf9, 0xf9, 0xf9, 0xf9, 0xf9, 0x01, 0x01, 0xf9, 0xf9, 0xf9, 0xf9, 0x01, 0x01,
-    0xff, 0xff, 0x01, 0x01, 0xf9, 0xf9, 0xf9, 0xf9, 0x19, 0x19, 0xf9, 0xf9, 0xe1, 0xe1, 0x07, 0x07,
-    0x80, 0x80, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x98, 0x9f, 0x9f, 0x9f, 0x87, 0xe7, 0xe0, 0xff, 0xff,
-    0xff, 0x80, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x99, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x80, 0xff, 0xff,
-    0xff, 0x80, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x98, 0x98, 0x9e, 0x9e, 0x9e, 0x9e, 0x80, 0x80, 0xff,
-    0xff, 0x80, 0x80, 0x9f, 0x9f, 0x9f, 0x9f, 0x99, 0x99, 0x9f, 0x9f, 0x9f, 0x9f, 0x80, 0x80, 0xff,
-    0xff, 0x80, 0x80, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x98, 0x9f, 0x9f, 0x9f, 0x87, 0xe7, 0xe0, 0xff,
-    0xff, 0xff, 0x80, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x99, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x80, 0xff,
-    0xff, 0xff, 0xe0, 0xe7, 0x87, 0x9f, 0x9f, 0x9f, 0x98, 0x98, 0x9f, 0x9f, 0x87, 0x87, 0xe0, 0xe0,
-    0xff, 0xff, 0x80, 0x80, 0x9f, 0x9f, 0x9f, 0x9f, 0x98, 0x98, 0x9f, 0x9f, 0x87, 0x87, 0xe0, 0xe0,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-  };
-
-  oled_write_raw_P(my_logo, sizeof(my_logo));
-}
-
-static void render_lfc_logo(void) {
-  static const char PROGMEM my_lfc_logo[] = {
-    // Paste the code from the previous step below this line!
-    // 'YNWA', 128x32px
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff,
-    0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0xc3, 0x87,
-    0x1f, 0x3f, 0x1f, 0x8f, 0xc3, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xf0, 0xe1,
-    0xc3, 0x87, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0xfc, 0xf0, 0x00, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x03, 0x81, 0x03, 0x1f, 0xff, 0xff,
-    0xff, 0xff, 0x1f, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x87, 0xe1, 0xf0, 0xc0,
-    0x07, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf1, 0xc3, 0x87, 0x1f, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xf8, 0x80, 0x03, 0x1f, 0x07, 0xc0, 0xf8, 0xff, 0xff, 0xfe, 0xf0, 0x81, 0x0f,
-    0x07, 0x80, 0xf0, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x87, 0xe1, 0xf8, 0xf8, 0xf9, 0xf9, 0xf9, 0xf9,
-    0xf9, 0xf8, 0xe0, 0x03, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
-    0xfc, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-  };
-
-  oled_write_raw_P(my_lfc_logo, sizeof(my_lfc_logo));
-}
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    render_logo();
-  } else {
-    render_lfc_logo();
-  }
-    return false;
-}
-#endif // OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-#endif
-  }
-  return true;
-}
-
-#include <stdio.h>
-#include "lily58.h"
-
-#define L_BASE 0
-#define L_SUPER (1 << 1)
-#define L_RAISE (1 << 2)
-
-char layer_state_str[24];
-
-const char *read_layer_state(void) {
-  switch (layer_state)
-  {
-  case L_BASE:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Default");
-    break;
-  case L_RAISE:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise");
-    break;
-  case L_SUPER:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Super");
-    break;
-  default:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state);
-  }
-
-  return layer_state_str;
-}
diff --git a/keyboards/lily58/keymaps/datadavd/rules.mk b/keyboards/lily58/keymaps/datadavd/rules.mk
deleted file mode 100644
index b53fed1a72a..00000000000
--- a/keyboards/lily58/keymaps/datadavd/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/logo_reader.c
diff --git a/keyboards/lily58/keymaps/default/config.h b/keyboards/lily58/keymaps/default/config.h
index b16e63b6d7a..5b45770f38f 100644
--- a/keyboards/lily58/keymaps/default/config.h
+++ b/keyboards/lily58/keymaps/default/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 100
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 27
+#define RGBLIGHT_LED_COUNT 27
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Underglow
 /*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
+#undef RGBLIGHT_LED_COUNT
+#define RGBLIGHT_LED_COUNT 14    // Number of LEDs
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/domnantas/config.h b/keyboards/lily58/keymaps/domnantas/config.h
deleted file mode 100644
index 830139cc033..00000000000
--- a/keyboards/lily58/keymaps/domnantas/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
diff --git a/keyboards/lily58/keymaps/domnantas/keymap.c b/keyboards/lily58/keymaps/domnantas/keymap.c
deleted file mode 100644
index 56812e69010..00000000000
--- a/keyboards/lily58/keymaps/domnantas/keymap.c
+++ /dev/null
@@ -1,285 +0,0 @@
- /* Copyright 2020 Domantas Petrauskas
-  *
-  * 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 <stdio.h>
-
-#define LT_1 RALT(KC_1)
-#define LT_2 RALT(KC_2)
-#define LT_3 RALT(KC_3)
-#define LT_4 RALT(KC_4)
-#define LT_5 RALT(KC_5)
-#define LT_6 RALT(KC_6)
-#define LT_7 RALT(KC_7)
-#define LT_8 RALT(KC_8)
-#define LT_9 RALT(KC_9)
-#define LT_0 RALT(KC_0)
-
-// Naming according to Unicode specifications
-#define LT_A_OG KC_1
-#define LT_C_CA KC_2
-#define LT_E_OG KC_3
-#define LT_E_DO KC_4
-#define LT_I_OG KC_5
-#define LT_S_CA KC_6
-#define LT_U_OG KC_7
-#define LT_U_MA KC_8
-#define LT_Z_CA KC_EQL
-
-#define LT_EQL RALT(KC_EQL)
-
-// OLED setup
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 30
-#define TAP_FRAMES 2
-#define TAP_SPEED 40
-#define ANIM_FRAME_DURATION 200
-#define ANIM_SIZE 512
-
-char     wpm_str[10];
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-uint8_t  current_tap_frame  = 0;
-
-static long int oled_timeout = OLED_TIMEOUT;  // 10 minutes
-
-enum layer_number {
-    _QWERTY = 0,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-const bool *is_keyboard_left(void);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* QWERTY
-     * ,-----------------------------------------.                    ,-----------------------------------------.
-     * | ESC  |   Ą  |   Č  |   Ę  |   Ė  |   Į  |                    |   Š  |   Ų  |   Ū  |   (  |   )  |   Ž  |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |   -  |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |LShift|   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |   '  |
-     * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
-     * |LCTRL |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  | RAlt |
-     * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | LGUI | LAlt |LOWER | / Space /       \Enter \  | Bksp |RAISE | Del  |
-     *                   |      |      |      |/       /         \      \ |      |      |      |
-     *                   `----------------------------'           '------''--------------------'
-     */
-    [_QWERTY] = LAYOUT(
-        KC_ESC,   LT_A_OG, LT_C_CA, LT_E_OG, LT_E_DO, LT_I_OG,                  LT_S_CA, LT_U_OG, LT_U_MA, KC_9,    KC_0,    LT_Z_CA,
-        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_LSFT,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LCTL,  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_RALT,
-                                KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC,  KC_ENT,  KC_BSPC, MO(_RAISE), KC_DEL
-    ),
-
-    /* LOWER
-     * ,-----------------------------------------.                    ,-----------------------------------------.
-     * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * | Tab  |   4  |   5  |   6  |      |      |                    |      |      |      |      |      |      |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |LShift|   7  |   8  |   9  |   0  |      |-------.    ,-------|      |      |      |      |      |      |
-     * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
-     * |LCTRL |   =  |   +  |   -  |   |  |      |-------|    |-------|      |      |      |      |   \  |      |
-     * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | LGUI | LAlt |LOWER | / Space /       \ Enter\  | Bksp |RAISE | Del  |
-     *                   |      |      ||||||||/       /         \      \ |      |      |      |
-     *                   `----------------------------'           '------''--------------------'
-     */
-    [_LOWER] = LAYOUT(
-        _______, LT_1,    LT_2,    LT_3,    LT_4,    LT_5,                      LT_6,    LT_7,    LT_8,    LT_9,    LT_0,    KC_GRV,
-        _______, LT_4,    LT_5,    LT_6,    _______, _______,                   _______, _______, _______, _______, _______, _______,
-        _______, LT_7,    LT_8,    LT_9,    LT_0,    _______,                   _______, _______, _______, _______, _______, _______,
-        _______, LT_EQL, KC_PPLS, KC_PMNS, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______,
-                                   _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* RAISE
-     * ,-----------------------------------------.                    ,-----------------------------------------.
-     * | ESC  |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  |PrScr |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * | Tab  | F11  | F12  |      |      |      |                    |      | PgUp | Home |  Up  | End  | Vol+ |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |LShift|      |      |      |      |      |-------.    ,-------|      | PgDn | Left | Down |Right | Vol- |
-     * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
-     * |LCTRL | Undo | Cut  | Copy |Paste |      |-------|    |-------|      |      |MPrev |MNext |MPlPa |      |
-     * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | LGUI | LAlt |LOWER | / Space /       \ Enter\  | Bksp |RAISE | Del  |
-     *                   |      |      |      |/       /         \      \ |      ||||||||      |
-     *                   `----------------------------'           '------''--------------------'
-     */
-    [_RAISE] = LAYOUT(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PSCR,
-        _______, KC_F11,  KC_F12,  _______, _______, _______,                   _______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU,
-        _______, _______, _______, _______, _______, _______,                   _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD,
-        _______, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______,
-                                   _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* ADJUST
-     * ,-----------------------------------------.                    ,-----------------------------------------.
-     * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * | CAPS |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
-     * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
-     * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
-     * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | LGUI | LAlt |LOWER | /Space  /       \Enter \  | Bksp |RAISE | Del  |
-     *                   |      |      ||||||||/       /         \      \ |      ||||||||      |
-     *                   `----------------------------'           '------''--------------------'
-     */
-    [_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,
-        KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                   _______, _______, _______, _______, _______,  _______, _______, _______
-    )
-};
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_left()) return OLED_ROTATION_270;
-    return OLED_ROTATION_180;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-static void render_bongo_cat(void) {
-
-    // Idle animation
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-
-        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0, 0, 0, 0, 0, 0, 0, 128, 64, 64, 32, 32, 32, 32, 16, 16,  16, 16, 16, 8,  8,  4,  4, 4, 8, 48, 64, 128, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 100, 130, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 48, 48, 0, 192, 193, 193, 194, 4, 8, 16, 32, 64, 128, 0, 0, 0, 128, 128, 128, 128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 56, 4, 3, 0, 0, 0, 0, 0, 0, 0,   12, 12, 12, 13, 1,  0,  64, 160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8,  8,  4,   4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 128, 64, 64, 64, 64, 64, 32, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2,  2,   1,   1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8,   8,   8, 8, 7, 0, 0, 0, 0, 0, 0, 0,   0, 0,  0,  0, 0,   0,   0,   0,   0, 0, 0,  0,  0,  0,   0, 0, 0, 0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0, 0, 0, 0, 0, 0, 0, 128, 64, 64, 32, 32, 32, 32, 16, 16,  16, 16, 16, 8,  8,  4,  4, 4, 8, 48, 64, 128, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 100, 130, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 48, 48, 0, 192, 193, 193, 194, 4, 8, 16, 32, 64, 128, 0, 0, 0, 128, 128, 128, 128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 56, 4, 3, 0, 0, 0, 0, 0, 0, 0,   12, 12, 12, 13, 1,  0,  64, 160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8,  8,  4,   4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 128, 64, 64, 64, 64, 64, 32, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2,  2,   1,   1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8,   8,   8, 8, 7, 0, 0, 0, 0, 0, 0, 0,   0, 0,  0,  0, 0,   0,   0,   0,   0, 0, 0,  0,  0,  0,   0, 0, 0, 0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,  0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 64, 64, 64, 64, 32, 32,  32, 32, 16, 8,  4,  2,  2,  4, 24, 96, 128, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 194, 1, 1, 2, 2, 4, 4, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, 96, 0, 129, 130, 130, 132, 8, 16, 32, 64, 128, 0, 0, 0, 0, 128, 128, 128, 128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 112, 25, 6, 0, 0, 0, 0, 0, 0, 0, 24,  24,  24, 27, 3,  0,  64, 160, 34, 36, 20, 18, 18, 18, 11, 8, 8,  8,  8,   5, 5, 9, 9, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 128, 64, 64, 64, 64, 64, 32, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2,  2,   1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8, 8, 8, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0,   0,   0,   0, 0,  0,  0,  0,   0, 0, 0, 0, 0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,  128, 128, 0, 0, 0, 0, 0, 128, 64, 64, 32, 32, 32, 32, 16, 16,  16, 16, 8,  4,  2,  1,  1, 2, 12, 48, 64, 128, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 225, 0, 0, 1, 1, 2, 2, 1, 0, 0, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 48, 48, 0, 192, 193, 193, 194, 4, 8, 16, 32, 64, 128, 0, 0, 0, 128, 128, 128, 128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 112, 12, 3,   0,   0, 0, 0, 0, 0, 0,   12, 12, 12, 13, 1,  0,  64, 160, 33, 34, 18, 17, 17, 17, 9, 8, 8,  8,  8,  4,   4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 128, 64, 64, 64, 64, 64, 32, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2,  2,   1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8,   8,   8, 8, 7, 0, 0, 0, 0, 0, 0, 0,   0, 0,  0,  0, 0,   0,   0,   0,   0, 0, 0,  0,  0,  0,   0, 0, 0, 0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,  0, 0, 0, 0, 0, 0, 0, 128, 64, 64, 32, 32, 32, 32, 16, 16,  16, 16, 8,  8,  4,  2,  2, 2, 4, 56, 64, 128, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 226, 1, 1, 2, 2, 2, 2, 1, 0, 0, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 48, 48, 0, 192, 193, 193, 194, 4, 8, 16, 32, 64, 128, 0, 0, 0, 128, 128, 128, 128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 112, 12, 3, 0, 0, 0, 0, 0, 0, 0,   12, 12, 12, 13, 1,  0,  64, 160, 33, 34, 18, 17, 17, 17, 9, 8, 8, 8,  8,  4,   4, 8, 8, 16, 16, 16, 16, 16, 17, 15, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 128, 64, 64, 64, 64, 64, 32, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2,  2,   1, 1, 1, 1, 1, 1, 2, 2, 4, 4, 8, 8,   8,   8, 8, 7, 0, 0, 0, 0, 0, 0, 0,   0, 0,  0,  0, 0,   0,   0,   0,   0, 0, 0,  0,  0,  0,   0, 0, 0, 0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
-    };
-
-    // Prep animation
-    static const char PROGMEM prep[][ANIM_SIZE] = {
-
-        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,  128, 128, 0, 0,  0, 0, 0,   128, 64,  64,  32,  32, 32, 32, 16, 16, 16, 16, 8,  4,  2,  1,  1, 2, 12, 48, 64, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 225, 0, 0, 1, 1, 2, 2, 129, 128, 128, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 48, 48, 0, 0, 1, 225, 26, 6, 9, 49, 53, 1, 138, 124, 0, 0, 128, 128, 128, 128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 112, 12, 3,   0,   0, 24, 6, 5, 152, 153, 132, 195, 124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17, 9, 8, 8,  8,  8,  4,   4, 4, 4, 4, 4, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 128, 64, 64, 64, 64, 64, 32, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2,  2,   1, 1, 1, 1, 1, 1, 0,   0,   0,   0, 0, 0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0,  0,  0, 0, 0, 0,   0,  0, 0, 0,  0,  0, 0,   0,   0, 0, 0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
-    };
-
-    // Typing animation
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-
-        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,  128, 128, 0, 0,  0, 0, 0,   128, 64,  64, 32,  32, 32, 32, 16, 16, 16, 16, 8,  4,  2,  1,  1, 2, 12, 48, 64, 128, 0, 0, 0, 0,  0,  0,  0,  248, 248, 248, 248, 0,  0,   0,   0,   0,   128, 128, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 225, 0, 0, 1, 1, 2, 2, 129, 128, 128, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 48, 48, 0, 0, 1, 1, 2, 4, 8, 16, 32, 67, 135, 7, 1, 0, 184, 188, 190, 159, 95, 95, 79, 76, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 112, 12, 3,   0,   0, 24, 6, 5, 152, 153, 132, 67, 124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17, 9, 8, 8,  8,  8,  4,   4, 8, 8, 16, 16, 16, 16, 16,  17,  15,  1,   61, 124, 252, 252, 252, 252, 252, 60, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 128, 64, 64, 64, 64, 64, 32, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 2,  2,   1, 1, 1, 1, 1, 1, 0,   0,   0,   0, 0, 0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0, 0, 0, 0,   0,   1,   3,   3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,  128, 128, 0, 0, 0, 0, 0, 128, 64, 64, 32, 32, 32, 32, 16, 16,  16, 16, 8,  4,  2,  1,  1, 2, 12, 48, 64, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,  225, 0,   0,   1,   1,   2,  2,  1, 0, 0, 0, 0, 128, 128, 0,   0,   0,   0,   0, 0, 0, 0, 0, 128, 0, 48, 48, 0, 0, 1, 225, 26, 6, 9, 49, 53, 1, 138, 124, 0, 0, 128, 128, 128, 128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 112, 12, 3,   0,   0, 0, 0, 0, 0, 0,   0,  0,  0,  1,  1,  0,  64, 160, 33, 34, 18, 17, 17, 17, 9, 8, 8,  8,  8,  4,   4, 4, 4, 4, 4, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 128, 64, 64, 64, 64, 64, 32, 32, 32, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 3, 122, 122, 121, 121, 121, 121, 57, 49, 2, 2, 4, 4, 8, 8,   8,   136, 136, 135, 128, 0, 0, 0, 0, 0, 0,   0, 0,  0,  0, 0, 0, 0,   0,  0, 0, 0,  0,  0, 0,   0,   0, 0, 0,   0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
-    };
-
-    void animation_phase(void) {
-        if (get_current_wpm() <= IDLE_SPEED) {
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-            oled_write_raw_P(prep[0], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() >= TAP_SPEED) {
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
-        }
-    }
-
-    if (get_current_wpm() != 000) {
-        oled_on();
-
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-
-        anim_sleep = timer_read32();
-    } else {
-        if (timer_elapsed32(anim_sleep) > oled_timeout) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-static void render_status(void) {
-    // WPM
-    oled_write_ln_P(PSTR("wpm"), false);
-    sprintf(wpm_str, "%03d", get_current_wpm());
-    oled_write_ln(wpm_str, false);
-    oled_write_ln_P(PSTR(""), false);
-
-    // Layer display
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("deflt"), false);
-            break;
-        case _RAISE:
-            oled_write_ln_P(PSTR("raise"), false);
-            break;
-        case _LOWER:
-            oled_write_ln_P(PSTR("lower"), false);
-            break;
-        case _ADJUST:
-            oled_write_ln_P(PSTR("adjst"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("error"), false);
-    }
-
-    led_t led_state = host_keyboard_led_state();
-    oled_write_ln_P(PSTR(""), false);
-    oled_write_ln_P(PSTR(""), false);
-    oled_write_ln_P(PSTR("caps"), led_state.caps_lock);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_left()) {
-        render_status();
-    } else {
-        render_bongo_cat();
-    }
-    return false;
-}
diff --git a/keyboards/lily58/keymaps/domnantas/readme.md b/keyboards/lily58/keymaps/domnantas/readme.md
deleted file mode 100644
index 262f7ffad6b..00000000000
--- a/keyboards/lily58/keymaps/domnantas/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Domnantas layout for Lily58 Pro
-
-## Features
-
-- Optimised for lithuanian layout, but works on English too
-- Backspace, Enter and Space are under thumbs, very little hand movement
-- LShift swapped with LCtrl
-- Numpad on Lower layer for left hand
-- Navigation, media keys on Raise layer for right hand
-- Status on the left OLED
-- BONGOCAT on the right
-
-## Instructions
-Since status is always on the left and Bongocat on the right, the keymap has to be flashed with different commands:
-
-```bash
-# Right hand
-qmk flash -kb lily58/rev1 -km domnantas -bl avrdude-split-left
-# Left hand
-qmk flash -kb lily58/rev1 -km domnantas -bl avrdude-split-right
-```
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/domnantas/rules.mk b/keyboards/lily58/keymaps/domnantas/rules.mk
deleted file mode 100644
index 2942e18ed31..00000000000
--- a/keyboards/lily58/keymaps/domnantas/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRAKEY_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/drasbeck/config.h b/keyboards/lily58/keymaps/drasbeck/config.h
deleted file mode 100644
index 01ba4faf737..00000000000
--- a/keyboards/lily58/keymaps/drasbeck/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck
- *
- * You are free to:
- *
- *  Share — copy and redistribute the material in any medium or format
- *  Adapt — remix, transform, and build upon the material
- *   for any purpose, even commercially.
- *
- * The licensor cannot revoke these freedoms as long as you follow the license terms.
-*/
-
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define ENCODERS_PAD_A { F4 }
-#define ENCODERS_PAD_B { F5 }
-#define ENCODER_RESOLUTION 4
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-// Underglow
-/*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_SLEEP
-*/
diff --git a/keyboards/lily58/keymaps/drasbeck/keymap.c b/keyboards/lily58/keymaps/drasbeck/keymap.c
deleted file mode 100644
index a6a51a1945e..00000000000
--- a/keyboards/lily58/keymaps/drasbeck/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck
- *
- * You are free to:
- *
- *  Share — copy and redistribute the material in any medium or format
- *  Adapt — remix, transform, and build upon the material
- *   for any purpose, even commercially.
- *
- * The licensor cannot revoke these freedoms as long as you follow the license terms.
- */
-
-#include QMK_KEYBOARD_H
-
-extern uint8_t is_master;
-
-enum layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  KC_ESC,  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_NO,   KC_MUTE, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
-                             KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_NUBS, KC_LCTL
-  ),
-
-  [_LOWER] = LAYOUT(
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-  KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_PGUP, KC_MINS, KC_EQL,  KC_RBRC,
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_NO,   KC_HOME, KC_PGDN, KC_END,  KC_NO,   KC_NUHS,
-  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INT1, KC_ENT,
-                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  [_RAISE] = LAYOUT(
-  KC_TRNS, RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5),                RALT(KC_6), RALT(KC_7),    RALT(KC_8), RALT(KC_9), RALT(KC_0), KC_DEL,
-  KC_TRNS, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                     KC_NO,      KC_NO,         KC_UP,      KC_MINS,    KC_EQL,     KC_RBRC,
-  KC_ESC,  KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                     KC_NO,      KC_LEFT,       KC_DOWN,    KC_RGHT,    KC_NO,      KC_NUHS,
-  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,      KC_VOLD,       KC_VOLU,    KC_MUTE,    KC_INT1,    SC_SENT,
-                                   KC_RALT,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RALT(KC_NUBS), KC_TRNS
-  ),
-
-  [_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, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
-                             _______, _______, _______, _______,  _______,  _______, _______, _______
-  )
-};
-
-int RGB_current_mode;
-
-void matrix_init_user(void) {
-#ifdef RGBLIGHT_ENABLE
-    RGB_current_mode = rgblight_config.mode;
-#endif
-}
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-//const char *read_keylog(void);
-//const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    //oled_write_ln(read_keylog(), false);
-    //oled_write_ln(read_keylogs(), false);
-    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
-    //oled_write_ln(read_host_led_state(), false);
-    //oled_write_ln(read_timelog(), false);
-  } else {
-    oled_write(read_logo(), false);
-  }
-    return false;
-}
-#endif // OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-      } else {
-        layer_off(_LOWER);
-      }
-      update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-      } else {
-        layer_off(_RAISE);
-      }
-      update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-  }
-  return true;
-}
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  // index 1 == minion side
-  if (index == 1) {
-    if (clockwise) {
-      tap_code(KC_VOLD);
-    } else {
-      tap_code(KC_VOLU);
-    }
-  }
-    return true;
-}
-#endif
diff --git a/keyboards/lily58/keymaps/drasbeck/readme.md b/keyboards/lily58/keymaps/drasbeck/readme.md
deleted file mode 100644
index 51d0991072b..00000000000
--- a/keyboards/lily58/keymaps/drasbeck/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Danish (Dansk) layout for the Lily58 Pro
-Keyboard: Lily58 Pro  
-Keys: Lily58 Pro is 6×4+5keys column-staggered split keyboard, optinal with a rotary encoder.  
-Flash instructions: Flash each side of the keyboard, minding whether the side uses a Pro Micro or Elite-C controller.  
-
-### Layout
-Danish special characters on main layer, moving other characters to mainly raised layer.
-
-Layer 0 = default  
-Layer 1 = lower  
-Layer 2 = raise  
-
-![keymap](https://drasbeck.dk/public/keymap_lily58pro_danskish.png)
-
diff --git a/keyboards/lily58/keymaps/drasbeck/rules.mk b/keyboards/lily58/keymaps/drasbeck/rules.mk
deleted file mode 100644
index f0442f1008c..00000000000
--- a/keyboards/lily58/keymaps/drasbeck/rules.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes        # Enable encoder
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/lily58/keymaps/druotoni/boot.c b/keyboards/lily58/keymaps/druotoni/boot.c
deleted file mode 100644
index ba46f8e3616..00000000000
--- a/keyboards/lily58/keymaps/druotoni/boot.c
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "boot.h"
-#include "fast_random.h"
-#include "draw_helper.h"
-#include "gui_state.h"
-
-// boot
-#define ANIM_BOOT_FRAME_DURATION 8
-uint16_t anim_boot_timer         = 0;
-uint8_t  anim_boot_current_frame = 0;
-
-#define NAVI_DURATION 55
-
-// terminal stuff
-#define TERMINAL_DURATION 25
-#define TERMINAL_LINE_NUMBER 19
-#define TERMINAL_LINE_MAX 14
-
-#define LILY_DURATION 50
-
-// halt
-#define ANIM_HALT_FRAME_DURATION 55
-uint16_t anim_halt_timer = 0;
-
-void reset_boot(void) {
-    // frame zero
-    anim_boot_current_frame = 0;
-}
-
-static void draw_lily_key(uint8_t x, uint8_t y, uint8_t *key_number, unsigned long key_state, uint8_t color) {
-    uint8_t       v    = *key_number;
-    unsigned long mask = 1;
-    mask               = mask << v;
-
-    // ligth the key according to the mask
-    if (((key_state & mask) == mask)) {
-        color = !color;
-    }
-
-    draw_rectangle_fill(x, y, 3, 3, color);
-    *key_number = v + 1;
-}
-
-static void draw_lily_key_row(uint8_t x, uint8_t y, int w, uint8_t *key_number, unsigned long key_state, uint8_t color) {
-    // row of rectangle
-    for (uint8_t i = 0; i < w; i++) {
-        draw_lily_key(x + (i * 4), y, key_number, key_state, color);
-    }
-}
-
-static void draw_lily_render(unsigned long key_state) {
-    // different orientation base on side
-#if IS_LEFT
-
-    uint8_t x            = 0;
-    uint8_t y            = 56;
-    uint8_t x_ref        = 10 + x;
-    uint8_t y_ref        = 2 + y;
-    uint8_t i_key_number = 0;
-
-    for (uint8_t i = 0; i < 4; i++) {
-        draw_lily_key_row(x_ref, y_ref + (i * 4), 4, &i_key_number, key_state, true);
-        draw_lily_key_row(x_ref - 8, y_ref + 2 + (i * 4), 2, &i_key_number, key_state, true);
-    }
-
-    draw_lily_key_row(x_ref + 2, y_ref + (4 * 4), 3, &i_key_number, key_state, true);
-
-    uint8_t x_side = x_ref + (4 * 4);
-
-    draw_lily_key(x_side, y_ref + (2 * 4) + 2, &i_key_number, key_state, true);
-    draw_lily_key(x_side, y_ref + (4 * 4), &i_key_number, key_state, true);
-
-    // screen
-    draw_rectangle(x_side, y_ref, 4, 8, true);
-
-    // frame
-    drawline_hr(x + 1, y + 2, 8, true);
-    oled_write_pixel(x + 8, y + 1, true);
-    drawline_hr(x + 8, y, 23, true);
-
-    drawline_hr(x + 1, y + 20, 10, true);
-    oled_write_pixel(x + 10, y + 21, true);
-    drawline_hr(x + 10, y + 22, 16, true);
-
-    drawline_vb(x, y + 3, 17, true);
-    drawline_vb(x + 31, y + 1, 20, true);
-    oled_write_pixel(x + 30, y + 21, true);
-    oled_write_pixel(x + 29, y + 22, true);
-    oled_write_pixel(x + 28, y + 23, true);
-    oled_write_pixel(x + 27, y + 24, true);
-    oled_write_pixel(x + 26, y + 23, true);
-#endif
-
-#if IS_RIGHT
-    uint8_t i_key_number = 0;
-
-    for (uint8_t i = 0; i < 4; i++) {
-        draw_lily_key_row(7, 58 + (i * 4), 4, &i_key_number, key_state, true);
-        draw_lily_key_row(23, 60 + (i * 4), 2, &i_key_number, key_state, true);
-    }
-
-    draw_lily_key_row(9, 74, 3, &i_key_number, key_state, true);
-
-    draw_lily_key(3, 68, &i_key_number, key_state, true);
-    draw_lily_key(3, 74, &i_key_number, key_state, true);
-
-    // screen
-    draw_rectangle(2, 58, 4, 8, true);
-
-    // frame
-    drawline_hr(23, 58, 8, true);
-    oled_write_pixel(23, 57, true);
-    drawline_hr(1, 56, 23, true);
-
-    drawline_hr(21, 76, 10, true);
-    oled_write_pixel(21, 77, true);
-    drawline_hr(6, 78, 16, true);
-
-    drawline_vb(31, 59, 17, true);
-    drawline_vb(0, 57, 20, true);
-    oled_write_pixel(1, 77, true);
-    oled_write_pixel(2, 78, true);
-    oled_write_pixel(3, 79, true);
-    oled_write_pixel(4, 80, true);
-    oled_write_pixel(5, 79, true);
-#endif
-}
-
-static void draw_lily(uint8_t f) {
-    // frame for the events
-    uint8_t tres_stroke = 10;
-    uint8_t tres_boom   = 30;
-    uint8_t y_start     = 56;
-
-    if (f == 0 || f == tres_stroke || f == tres_boom) {
-        // clean screen
-        oled_clear();
-    }
-
-    // simple lily58 with all the keys
-    if (f < tres_stroke) {
-        draw_lily_render(0);
-    }
-
-    // increase number of random keys pressed
-    if (f >= tres_stroke && f < tres_boom) {
-        int inter_f = interpo_pourcent(tres_stroke, tres_boom, f);
-
-        unsigned long key_state = fastrand_long();
-        for (int r = 100 - inter_f; r > 0; r = r - 10) {
-            key_state &= fastrand_long();
-        }
-        draw_lily_render(key_state);
-    }
-
-    // statir explosion
-    if (f >= tres_boom) {
-        oled_clear();
-        uint8_t density = (f - tres_boom);
-        if (density > 4) density = 4;
-        draw_static(0, y_start - 8, 32, 32, true, density);
-    }
-}
-
-static void draw_startup_navi(uint8_t f) {
-    // text
-    oled_write_cursor(0, 5, "HELL0", false);
-    oled_write_cursor(0, 7, "NAVI.", false);
-
-    // prompt
-    if ((f % 8) > 4) {
-        oled_write_cursor(0, 12, "> ", false);
-    } else {
-        oled_write_cursor(0, 12, ">_", false);
-    }
-
-    // frame threshold
-    uint8_t tres_shell = 15;
-    uint8_t tres_load  = 35;
-
-    // rand text to init display
-    if (f > tres_shell) {
-        int inter_f = interpo_pourcent(tres_shell, tres_load, f);
-
-        draw_random_char(1, 12, 'i', 60 + inter_f, 0);
-        draw_random_char(2, 12, 'n', 20 + inter_f, 0);
-        draw_random_char(3, 12, 'i', inter_f, 0);
-        draw_random_char(4, 12, 't', 20 + inter_f, 0);
-    }
-
-    // loading propress bar
-    if (f > tres_load) {
-        int inter_f = interpo_pourcent(tres_load, 50, f);
-
-        // ease
-        float fv = inter_f / 100.00;
-        fv       = fv * fv * fv * fv;
-        inter_f  = fv * 100;
-
-        draw_rectangle(0, (15 * 8), 32, 8, 1);
-        draw_progress(0 + 3, (15 * 8) + 3, 26, 2, inter_f, 0, 1);
-    }
-}
-
-// text dispayed on terminal
-static char *boot_ref[TERMINAL_LINE_NUMBER] = {"LT:", "RT:", "M :", "    ", "cnx:", "A0:", "B0:", "    ", "0x40", "0x60", "0x85", "0x0F", "    ", "> run", "x ", "y ", " 100%", "    ", "> key"};
-
-// prompt style for char in the font
-char scan_font[5] = {'>', 1, 1, 1, 1};
-
-static char *get_terminal_line(uint8_t i) {
-    // display text
-    if (i < TERMINAL_LINE_NUMBER) {
-        return boot_ref[i];
-    }
-
-    // blank line every 3 lines
-    if (i % 3 == 0) {
-        return "     ";
-    }
-
-    // display consecutive chars in the font
-    i = (i - TERMINAL_LINE_NUMBER) * 4;
-
-    scan_font[1] = i;
-    scan_font[2] = i + 1;
-    scan_font[3] = i + 2;
-    scan_font[4] = i + 3;
-
-    return scan_font;
-}
-
-static void draw_startup_terminal(uint8_t f) {
-    // ease for printing on screen
-    f = f * 2;
-    f += (f / 5);
-
-    // scroll text
-    uint8_t i_start   = 0;
-    uint8_t i_nb_char = f;
-
-    if (f > TERMINAL_LINE_MAX) {
-        i_start   = f - TERMINAL_LINE_MAX;
-        i_nb_char = TERMINAL_LINE_MAX;
-    }
-
-    // display lines
-    oled_clear();
-    for (uint8_t i = 0; i < i_nb_char; i++) {
-        char *s = get_terminal_line(i + i_start);
-        oled_write_cursor(0, i, s, false);
-    }
-}
-
-bool render_boot(void) {
-    // end of the boot sequence
-    if (anim_boot_current_frame >= NAVI_DURATION + TERMINAL_DURATION + LILY_DURATION) {
-        anim_boot_current_frame = 0;
-        oled_clear();
-        return true;
-    }
-
-    if (timer_elapsed(anim_boot_timer) > ANIM_BOOT_FRAME_DURATION) {
-        anim_boot_timer = timer_read();
-        if (anim_boot_current_frame < NAVI_DURATION) {
-            // 55 frames
-            draw_startup_navi(anim_boot_current_frame);
-        } else {
-            if (anim_boot_current_frame >= NAVI_DURATION && anim_boot_current_frame < NAVI_DURATION + TERMINAL_DURATION) {
-                // 25
-                draw_startup_terminal(anim_boot_current_frame - NAVI_DURATION);
-            } else {
-                if (anim_boot_current_frame >= NAVI_DURATION + TERMINAL_DURATION) {
-                    // 25
-                    draw_lily(anim_boot_current_frame - NAVI_DURATION - TERMINAL_DURATION);
-                }
-            }
-        }
-
-        anim_boot_current_frame++;
-    }
-    return false;
-}
-
-void render_halt(void) {
-    if (timer_elapsed(anim_halt_timer) > ANIM_HALT_FRAME_DURATION) {
-        anim_halt_timer = timer_read();
-
-        // comb glitch for all the screen
-        draw_glitch_comb(0, 0, 32, 128, 3, true);
-
-        // random moving blocks of pixels
-        for (uint8_t i = 0; i < 6; i++) {
-            int     r  = fastrand();
-            int     rr = fastrand();
-            uint8_t x  = 4 + r % 28;
-            uint8_t y  = rr % 128;
-
-            uint8_t w = 7 + r % 20;
-            uint8_t h = 3 + rr % 10;
-            int     s = (fastrand() % 20) - 10;
-            move_block(x, y, w, h, s);
-        }
-    }
-}
diff --git a/keyboards/lily58/keymaps/druotoni/boot.h b/keyboards/lily58/keymaps/druotoni/boot.h
deleted file mode 100644
index 7897e17923f..00000000000
--- a/keyboards/lily58/keymaps/druotoni/boot.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-bool render_boot(void);
-void render_halt(void);
-
-void reset_boot(void);
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/burst.c b/keyboards/lily58/keymaps/druotoni/burst.c
deleted file mode 100644
index 6dd6579e733..00000000000
--- a/keyboards/lily58/keymaps/druotoni/burst.c
+++ /dev/null
@@ -1,252 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// Copyright 2020 Richard Sutherland (rich@brickbots.com)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "gui_state.h"
-#include "fast_random.h"
-#include "burst.h"
-#include "draw_helper.h"
-
-// burst stuff
-static int      current_burst = 0;
-static uint16_t burst_timer   = 0;
-
-// WPM stuff
-static int      current_wpm = 0;
-static uint16_t wpm_timer   = 0;
-
-// This smoothing is 40 keystrokes
-static const float wpm_smoothing = WPM_SMOOTHING;
-
-// store values
-uint8_t burst_scope[SIZE_SCOPE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-uint8_t wpm_scope[SIZE_SCOPE]   = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-// current max wpm
-int max_wpm = MAX_WPM_INIT;
-
-// scope animation stuff
-#define ANIM_SCOPE_FRAME_DURATION 40
-#define ANIM_SLEEP_SCOPE_FRAME_NUMBER 10
-
-uint16_t anim_scope_timer       = 0;
-uint16_t anim_scope_idle_timer  = 0;
-uint16_t anim_sleep_scope_timer = 0;
-
-uint8_t anim_sleep_scope_duration[ANIM_SLEEP_SCOPE_FRAME_NUMBER] = {30, 30, 30, 30, 20, 20, 30, 30, 32, 35};
-uint8_t current_sleep_scope_frame                                = 0;
-uint8_t sleep_scope_frame_destination                            = ANIM_SLEEP_SCOPE_FRAME_NUMBER - 1;
-
-// glitch animation
-int      current_glitch_scope_time  = 150;
-uint32_t glitch_scope_timer         = 0;
-uint8_t  current_glitch_scope_index = 0;
-
-static void update_wpm(void) {
-    if (wpm_timer > 0) {
-        current_wpm += ((60000 / timer_elapsed(wpm_timer) / WPM_ESTIMATED_WORD_SIZE) - current_wpm) * wpm_smoothing;
-        if (current_wpm > LIMIT_MAX_WPM) {
-            current_wpm = LIMIT_MAX_WPM;
-        }
-    }
-    wpm_timer = timer_read();
-}
-
-void update_scope(void) {
-    update_wpm();
-
-    uint16_t temps_ecoule = timer_elapsed(burst_timer);
-
-    if (temps_ecoule > BURST_FENETRE) {
-        // 1er frappe après longtemps
-        current_burst = 40;
-    } else {
-        int time_pourcent = ((100 * (temps_ecoule)) / (BURST_FENETRE));
-        current_burst     = 100 - time_pourcent;
-    }
-    burst_timer = timer_read();
-}
-
-static void update_scope_array(void) {
-    // shift array
-    for (uint8_t i = 0; i < SIZE_SCOPE - 1; i++) {
-        burst_scope[i] = burst_scope[i + 1];
-        wpm_scope[i]   = wpm_scope[i + 1];
-    }
-
-    int burst = current_burst;
-    int wpm   = current_wpm;
-
-    // compute max wpm
-    max_wpm = (wpm == 0) ? MAX_WPM_INIT : ((wpm > max_wpm) ? wpm : max_wpm);
-
-    // current wpm ratio VS max
-    wpm = (100 * wpm) / max_wpm;
-    if (wpm > 100) wpm = 100;
-
-    // update last slot of the arrays
-    burst_scope[SIZE_SCOPE - 1] = burst;
-    wpm_scope[SIZE_SCOPE - 1]   = wpm;
-
-    // apply decay to burst chart
-    uint8_t pBaisse = 0;
-    for (uint8_t i = 0; i < SIZE_SCOPE - (SIZE_SCOPE / 4); i++) {
-        pBaisse = 2 + ((SIZE_SCOPE - 1 - i)) / 2;
-        burst_scope[i] -= ((burst_scope[i] * pBaisse) / 100);
-    }
-}
-
-static void RenderScopeBlack(void) {
-    // clean central zone
-    draw_rectangle_fill(3, 82, 28, 120, false);
-
-    // redraw some parts of the frame
-    drawline_hr(1, SCOPE_Y_BOTTOM, 32, 1);
-    drawline_vt(0, SCOPE_Y_BOTTOM - 1, 42, 1);
-    drawline_vt(31, SCOPE_Y_BOTTOM - 1, 47, 1);
-}
-
-static void render_scope_white(void) {
-    static const char PROGMEM raw_logo[] = {
-        240, 8, 4, 226, 241, 248, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255, 127, 128, 128, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 128, 128, 127,
-    };
-    oled_write_raw_P_cursor(0, 10, raw_logo, sizeof(raw_logo));
-}
-
-static void render_scope_chart(void) {
-    // clean the frame
-    render_scope_white();
-
-    uint8_t y_offset = SCOPE_Y_BOTTOM - 3;
-
-    for (uint8_t i = 0; i < SIZE_SCOPE; i++) {
-        // offset
-        uint8_t x = 3 + i;
-
-        // new black vertical line for burst
-        uint8_t iCurrentBurst = burst_scope[i];
-        drawline_vt(x, y_offset, (iCurrentBurst * 4) / 10, 0);
-
-        // new black point for wpm, white if it's on the burst line
-        uint8_t iCurrentWpm = wpm_scope[i];
-        uint8_t yWpm        = y_offset - ((iCurrentWpm * 4) / 10);
-        oled_write_pixel(x, yWpm, !(iCurrentWpm > iCurrentBurst));
-    }
-}
-
-void reset_scope(void) {
-    // scope need wakeup
-    anim_sleep_scope_timer    = timer_read();
-    current_sleep_scope_frame = ANIM_SLEEP_SCOPE_FRAME_NUMBER - 1;
-
-    sleep_scope_frame_destination = 0;
-}
-
-static void render_glitch_square(void) {
-    if (timer_elapsed(anim_scope_idle_timer) > 60) {
-        anim_scope_idle_timer = timer_read();
-        RenderScopeBlack();
-
-        uint8_t color = 0;
-        uint8_t size  = 0;
-        for (uint8_t i = 0; i < 4; i++) {
-            size = 4 + (fastrand() % 6);
-
-            draw_gradient(3 + (fastrand() % 19), 85 + (fastrand() % 20), size, size, 255, 255, 4);
-
-            size  = (fastrand() % 6);
-            color = 100 + (fastrand() % 100);
-            draw_gradient(3 + (fastrand() % 19), 100 + (fastrand() % 20), size, size, color, color, 4);
-        }
-    }
-}
-
-void render_scope_idle(void) {
-    uint8_t glitch_prob = get_glitch_probability();
-    get_glitch_index(&glitch_scope_timer, &current_glitch_scope_time, &current_glitch_scope_index, 150, 350, glitch_prob, 2);
-
-    switch (current_glitch_scope_index) {
-        case 0:
-            RenderScopeBlack();
-            return;
-        case 1:
-            render_glitch_square();
-            return;
-    }
-}
-
-static void RenderScopeSleep(void) {
-    if (current_sleep_scope_frame == sleep_scope_frame_destination) {
-        // animation finished
-        render_scope_idle();
-        return;
-    }
-
-    if (timer_elapsed(anim_sleep_scope_timer) > anim_sleep_scope_duration[current_sleep_scope_frame]) {
-        anim_sleep_scope_timer = timer_read();
-
-        // clean scope
-        RenderScopeBlack();
-
-        // render animation
-        render_tv_animation(current_sleep_scope_frame, 3, 80, 25, 48);
-
-        // update frame number
-        if (sleep_scope_frame_destination > current_sleep_scope_frame) {
-            current_sleep_scope_frame++;
-        } else {
-            current_sleep_scope_frame--;
-        }
-    }
-}
-
-void render_scope(gui_state_t t) {
-    if (timer_elapsed(anim_scope_timer) > ANIM_SCOPE_FRAME_DURATION) {
-        anim_scope_timer = timer_read();
-
-        // shift arrays
-        update_scope_array();
-
-        // oled_set_cursor(0, 10);
-
-        if (t == _WAKINGUP) {
-            RenderScopeSleep();
-            return;
-        }
-
-        if (t == _IDLE) {
-            sleep_scope_frame_destination = ANIM_SLEEP_SCOPE_FRAME_NUMBER - 1;
-            RenderScopeSleep();
-            return;
-        }
-
-        render_scope_chart();
-    }
-}
-
-static void decay_burst(void) {
-    uint16_t temps_ecoule = timer_elapsed(burst_timer);
-
-    int poucentageEcoule = 100;
-
-    if (temps_ecoule <= BURST_FENETRE * 4) {
-        poucentageEcoule = ((100 * (temps_ecoule)) / (BURST_FENETRE * 4));
-    }
-
-    current_burst = current_burst - poucentageEcoule;
-    if (current_burst <= 0) current_burst = 0;
-}
-
-static void decay_wpm(void) {
-    if (timer_elapsed(wpm_timer) > 1000) {
-        wpm_timer = timer_read();
-        current_wpm += (-current_wpm) * wpm_smoothing;
-    }
-}
-
-void decay_scope(void) {
-    decay_burst();
-    decay_wpm();
-}
diff --git a/keyboards/lily58/keymaps/druotoni/burst.h b/keyboards/lily58/keymaps/druotoni/burst.h
deleted file mode 100644
index 8bc81535088..00000000000
--- a/keyboards/lily58/keymaps/druotoni/burst.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// Copyright 2020 Richard Sutherland (rich@brickbots.com)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// burst
-#define MAX_WPM_INIT 40
-#define BURST_FENETRE 500
-
-// wpm
-#define LIMIT_MAX_WPM 150
-#define WPM_ESTIMATED_WORD_SIZE 5
-#define WPM_SMOOTHING 0.0487
-
-// scope
-#define SIZE_SCOPE 26
-#define SCOPE_Y_BOTTOM 127
-
-void update_scope(void);
-void render_scope(gui_state_t t);
-
-void reset_scope(void);
-void decay_scope(void);
diff --git a/keyboards/lily58/keymaps/druotoni/config.h b/keyboards/lily58/keymaps/druotoni/config.h
deleted file mode 100644
index 37124fcaafe..00000000000
--- a/keyboards/lily58/keymaps/druotoni/config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// Copyright 2012 Jun Wako <wakojun@gmail.com>
-// Copyright 2015 Jack Humbert
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define MASTER_LEFT
-#define OLED_DRIVER_ENABLE
-
-// tapping toggle for my layers
-#define TAPPING_TOGGLE 2
-
-// choose IS_LEFT or IS_RIGHT for compilation and flash firmware
-#define IS_LEFT 1
-//#define IS_RIGHT 1
-
-// logo glitch
-#define WITH_GLITCH
-// boot sequence
-#define WITH_BOOT
-
-// custom transport for displaying on both side
-#define SPLIT_TRANSACTION_IDS_USER USER_SYNC_A
-
-// custom font
-#ifdef OLED_FONT_H
-#    undef OLED_FONT_H
-#endif
-#define OLED_FONT_H "navi_font.c"
-#undef OLED_FONT_END
-#define OLED_FONT_END 125
-
-// more space
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_ONESHOT
-#define DISABLE_LEADER
-
-// ???
-#undef LOCKING_SUPPORT_ENABLE
-#undef LOCKING_RESYNC_ENABLE
-
-// small layer state
-#define LAYER_STATE_8BIT
-
-// no debug or trace
-#ifndef NO_DEBUG
-#    define NO_DEBUG
-#endif
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#    define NO_PRINT
-#endif 
-
-
diff --git a/keyboards/lily58/keymaps/druotoni/draw_helper.c b/keyboards/lily58/keymaps/druotoni/draw_helper.c
deleted file mode 100644
index c6761d725fc..00000000000
--- a/keyboards/lily58/keymaps/druotoni/draw_helper.c
+++ /dev/null
@@ -1,768 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// Copyright 2021 ugfx
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "draw_helper.h"
-#include "fast_random.h"
-
-void drawline(uint8_t x, uint8_t y, uint8_t width, bool bHorizontal, bool bPositiveDirection, bool color) {
-    if (width <= 0) return;
-    uint8_t yPlus  = 0;
-    uint8_t yMois  = 0;
-    uint8_t nbtour = 0;
-
-    if (!bPositiveDirection) {
-        if (bHorizontal) {
-            x -= width;
-        } else {
-            y -= width;
-        }
-    }
-
-    yMois = (width / 2) - 1 + (width % 2);
-
-    yPlus  = (width / 2);
-    nbtour = (width / 4) + 1;
-
-    bool bWhite = color;
-
-    if (bHorizontal) {
-        for (uint8_t i = 0; i < nbtour; i++) {
-            oled_write_pixel(x + yPlus + i, y, bWhite);
-            oled_write_pixel(x + yMois - i, y, bWhite);
-
-            oled_write_pixel(x + i, y, bWhite);
-            oled_write_pixel(x + width - 1 - i, y, bWhite);
-        }
-    } else {
-        for (uint8_t i = 0; i < nbtour; i++) {
-            oled_write_pixel(x, y + yPlus + i, bWhite);
-            oled_write_pixel(x, y + yMois - i, bWhite);
-
-            oled_write_pixel(x, y + i, bWhite);
-
-            oled_write_pixel(x, y + width - 1 - i, bWhite);
-        }
-    }
-}
-
-void drawline_vb(uint8_t x, uint8_t y, uint8_t width, bool color) { drawline(x, y, width, false, true, color); }
-
-void drawline_vt(uint8_t x, uint8_t y, uint8_t width, bool color) { drawline(x, y, width, false, false, color); }
-
-void drawline_hr(uint8_t x, uint8_t y, uint8_t width, bool color) { drawline(x, y, width, true, true, color); }
-
-void drawline_hl(uint8_t x, uint8_t y, uint8_t width, bool color) { drawline(x, y, width, true, false, color); }
-
-void draw_rectangle(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color) {
-    drawline_hr(x, y, width, color);
-    drawline_hr(x, y + heigth - 1, width, color);
-    drawline_vb(x, y, heigth, color);
-    drawline_vb(x + width - 1, y, heigth, color);
-}
-
-void draw_rectangle_fill(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color) {
-    for (uint8_t i = 0; i < heigth; i++) {
-        drawline_hr(x, y + i, width, color);
-    }
-}
-
-void drawline_hr_heigth(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color) {
-    for (int i = 0; i < heigth; i++) {
-        drawline_hr(x, y - i, width, color);
-        drawline_hr(x, y + i, width, color);
-    }
-}
-
-void drawline_point_hr(short x, short y, short x1, bool color) {
-    if (y < 0 || y > 127) return;
-
-    if (x1 < x) {
-        short iTemp = x;
-        x           = x1;
-        x1          = iTemp;
-    }
-
-    if (x1 > 31) x1 = 31;
-    if (x < 0) x = 0;
-    if (x > 31) x = 31;
-
-    drawline(x, y, x1 - x, true, true, color);
-}
-
-void flip_flap_x(short px, short py, uint8_t val, bool color) {
-    oled_write_pixel(px + val, py, color);
-    oled_write_pixel(px - val, py, color);
-}
-
-void draw_circle(uint8_t x, uint8_t y, uint8_t radius, bool color) {
-    short a, b, P;
-
-    // Calculate intermediates
-    a = 1;
-    b = radius;
-    P = 4 - radius;
-
-    short py, px;
-
-    // Away we go using Bresenham's circle algorithm
-    // Optimized to prevent double drawing
-    px = x;
-    py = y + b;
-    oled_write_pixel(px, py, color);
-    px = x;
-    py = y - b;
-    oled_write_pixel(px, py, color);
-
-    flip_flap_x(x, y, b, color);
-
-    do {
-        flip_flap_x(x, y + b, a, color);
-        flip_flap_x(x, y - b, a, color);
-        flip_flap_x(x, y + a, b, color);
-        flip_flap_x(x, y - a, b, color);
-
-        if (P < 0)
-            P += 3 + 2 * a++;
-        else
-            P += 5 + 2 * (a++ - b--);
-    } while (a < b);
-
-    flip_flap_x(x, y + b, a, color);
-    flip_flap_x(x, y - b, a, color);
-}
-
-void draw_ellipse(uint8_t x, uint8_t y, uint8_t a, uint8_t b, bool color) {
-    int dx, dy;
-    int a2, b2;
-    int err, e2;
-
-    //  short py, px;
-    // Calculate intermediates
-    dx  = 0;
-    dy  = b;
-    a2  = a * a;
-    b2  = b * b;
-    err = b2 - (2 * b - 1) * a2;
-
-    // Away we go using Bresenham's ellipse algorithm
-    do {
-        flip_flap_x(x, y + dy, dx, color);
-        flip_flap_x(x, y - dy, dx, color);
-
-        e2 = 2 * err;
-        if (e2 < (2 * dx + 1) * b2) {
-            dx++;
-            err += (2 * dx + 1) * b2;
-        }
-        if (e2 > -(2 * dy - 1) * a2) {
-            dy--;
-            err -= (2 * dy - 1) * a2;
-        }
-    } while (dy >= 0);
-}
-
-void draw_ellipse_fill(uint8_t x, uint8_t y, uint8_t a, uint8_t b, bool color) { return; }
-// void draw_ellipse_fill(uint8_t x, uint8_t y, uint8_t a, uint8_t b, uint8_t color) {
-//     int dx, dy;
-//     int a2, b2;
-//     int err, e2;
-
-//     // Calculate intermediates
-//     dx  = 0;
-//     dy  = b;
-//     a2  = a * a;
-//     b2  = b * b;
-//     err = b2 - (2 * b - 1) * a2;
-
-//     short py, px, px1;
-
-//     // Away we go using Bresenham's ellipse algorithm
-//     // This is optimized to prevent overdrawing by drawing a line only when a y is about to change value
-//     do {
-//         e2 = 2 * err;
-//         if (e2 < (2 * dx + 1) * b2) {
-//             dx++;
-//             err += (2 * dx + 1) * b2;
-//         }
-//         if (e2 > -(2 * dy - 1) * a2) {
-//             py  = y + dy;
-//             px  = x - dx;
-//             px1 = x + dx;
-//             drawline_point_hr(px, py, px1, color);
-//             if (y) {
-//                 py  = y - dy;
-//                 px  = x - dx;
-//                 px1 = x + dx;
-//                 drawline_point_hr(px, py, px1, color);
-//             }
-//             dy--;
-//             err -= (2 * dy - 1) * a2;
-//         }
-//     } while (dy >= 0);
-// }
-
-bool test_limit(short x, short y) { return !(y < 0 || y > 127 || x < 0 || x > 31); }
-
-void flip_flap_y_point(short px, short py, short px1, uint8_t val, bool color) {
-    // firmware size optimisation : one fonction for 2 lines of code
-    drawline_point_hr(px, py + val, px1, color);
-    drawline_point_hr(px, py - val, px1, color);
-}
-
-void draw_fill_circle(short x, short y, uint8_t radius, bool color) {
-    short a, b, P;
-
-    // Calculate intermediates
-    a = 1;
-    b = radius;
-    P = 4 - radius;
-
-    // Away we go using Bresenham's circle algorithm
-    // This is optimized to prevent overdrawing by drawing a line only when a variable is about to change value
-    short py, px, px1;
-
-    py  = y;
-    px  = x - b;
-    px1 = x + b;
-    drawline_point_hr(px, py, px1, color);
-
-    py = y + b;
-    px = x;
-    if (test_limit(px, py)) oled_write_pixel(px, py, color);
-    py = y - b;
-    px = x;
-    if (test_limit(px, py)) oled_write_pixel(px, py, color);
-    do {
-        flip_flap_y_point(x - b, y, x + b, a, color);
-
-        if (P < 0) {
-            P += 3 + 2 * a++;
-        } else {
-            flip_flap_y_point(x - a, y, x + a, b, color);
-
-            P += 5 + 2 * (a++ - b--);
-        }
-    } while (a < b);
-
-    flip_flap_y_point(x - b, y, x + b, a, color);
-}
-
-bool apres_moitie(int a, int b) { return (a > b / 2); }
-bool arrive_moitie(int a, int b) { return (a > b / 2); }
-bool avant_moitie(int a, int b) { return (a <= b / 2 && !apres_moitie(a, b)); }
-
-void draw_arc_sector(uint8_t x, uint8_t y, uint8_t radius, unsigned char sectors, unsigned char half, bool color) {
-    short a, b, P;
-    short py, px;
-    // Calculate intermediates
-    a = 1;       // x in many explanations
-    b = radius;  // y in many explanations
-    P = 4 - radius;
-
-    if (half != 2) {
-        // Away we go using Bresenham's circle algorithm
-        // Optimized to prevent double drawing
-        if (sectors & 0x06) {
-            px = x;
-            py = y - b;
-            oled_write_pixel(px, py, color);
-        }  // Upper upper
-        if (sectors & 0x60) {
-            px = x;
-            py = y + b;
-            oled_write_pixel(px, py, color);
-        }  // Lower lower
-        if (sectors & 0x81) {
-            px = x + b;
-            py = y;
-            oled_write_pixel(px, py, color);
-        }  // Right right
-        if (sectors & 0x18) {
-            px = x - b;
-            py = y;
-            oled_write_pixel(px, py, color);
-        }  // Left left
-    }
-
-    bool dessiner = false;
-
-    do {
-        if (half == 1 && arrive_moitie(a, b)) break;
-
-        if (half == 2 && avant_moitie(a, b)) {
-            dessiner = false;
-        } else {
-            dessiner = true;
-        }
-
-        if (dessiner) {
-            if (sectors & 0x01) {
-                px = x + b;
-                py = y - a;
-                oled_write_pixel(px, py, color);
-            }  // Upper right right
-            if (sectors & 0x02) {
-                px = x + a;
-                py = y - b;
-                oled_write_pixel(px, py, color);
-            }  // Upper upper right
-            if (sectors & 0x04) {
-                px = x - a;
-                py = y - b;
-                oled_write_pixel(px, py, color);
-            }  // Upper upper left
-            if (sectors & 0x08) {
-                px = x - b;
-                py = y - a;
-                oled_write_pixel(px, py, color);
-            }  // Upper left  left
-            if (sectors & 0x10) {
-                px = x - b;
-                py = y + a;
-                oled_write_pixel(px, py, color);
-            }  // Lower left  left
-            if (sectors & 0x20) {
-                px = x - a;
-                py = y + b;
-                oled_write_pixel(px, py, color);
-            }  // Lower lower left
-            if (sectors & 0x40) {
-                px = x + a;
-                py = y + b;
-                oled_write_pixel(px, py, color);
-            }  // Lower lower right
-            if (sectors & 0x80) {
-                px = x + b;
-                py = y + a;
-                oled_write_pixel(px, py, color);
-            }  // Lower right right
-        }
-
-        if (P < 0)
-            P += 3 + 2 * a++;
-        else
-            P += 5 + 2 * (a++ - b--);
-    } while (a < b);
-
-    if (half != 1) {
-        if (sectors & 0xC0) {
-            px = x + a;
-            py = y + b;
-            oled_write_pixel(px, py, color);
-        }  // Lower right
-        if (sectors & 0x03) {
-            px = x + a;
-            py = y - b;
-            oled_write_pixel(px, py, color);
-        }  // Upper right
-        if (sectors & 0x30) {
-            px = x - a;
-            py = y + b;
-            oled_write_pixel(px, py, color);
-        }  // Lower left
-        if (sectors & 0x0C) {
-            px = x - a;
-            py = y - b;
-            oled_write_pixel(px, py, color);
-        }  // Upper left
-    }
-}
-
-void draw_static(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int color, uint8_t density) {
-    unsigned long rx        = fastrand_long();
-    unsigned long ry        = fastrand_long();
-    unsigned long maskx     = 1;
-    unsigned long masky     = 1;
-    unsigned long mask_base = 1;
-
-    // more 1 in the octet
-    for (int r = 0; r < density; r++) {
-        rx &= fastrand_long();
-        ry &= fastrand_long();
-    }
-
-    color = ((rx >> 1) % 2) == 0;
-
-    for (uint8_t i = 0; i < width; i++) {
-        for (uint8_t j = 0; j < heigth; j++) {
-            // new mask based on ij loop
-            maskx = (mask_base << i);
-            masky = (mask_base << j);
-
-            // logic AND with the masks
-            if (((rx & maskx) == maskx) && ((ry & masky) == masky)) {
-                oled_write_pixel(x + i, y + j, color);
-            }
-        }
-    }
-}
-
-void copy_pixel(int from, int shift, unsigned char mask) {
-    if (shift == 0) return;
-
-    // pixel cluster from
-    char c_from  = get_oled_char(from);
-    char extract = c_from & mask;
-
-    // pixel cluster shift
-    char c_from_shift = get_oled_char(from + shift);
-    c_from_shift &= ~(mask);
-    c_from_shift |= extract;
-    oled_write_raw_byte(c_from_shift, from + shift);
-
-    // fill blank with black
-    c_from &= ~(mask);
-    oled_write_raw_byte(c_from, from);
-}
-
-void draw_glitch_comb(uint8_t x, uint8_t y, uint8_t width, uint16_t height, uint8_t iSize, bool odd) {
-    // work only on row
-    uint16_t y_start = (y / 8) * 32;
-    uint8_t  nb_h    = height / 8;
-
-    uint8_t  w_max = width;
-    uint16_t index = y_start + x;
-
-    // shift pair even pixel
-    int mask_1 = 85;
-    int mask_2 = 170;
-
-    if (!odd) {
-        // shift odd pixel
-        mask_1 = 170;
-        mask_2 = 85;
-    }
-
-    //  wobble
-    uint16_t pos = 0;
-    for (uint16_t j = 0; j < nb_h; j++) {
-        // next line
-        index = (y_start + x) + (j * 32);
-
-        for (uint16_t i = 0; i < w_max; i++) {
-            if (i + iSize < w_max) {
-                pos = index + i;
-                copy_pixel(pos + iSize, iSize * -1, mask_1);
-            }
-
-            if (w_max - 1 - i - iSize >= 0) {
-                pos = (index + w_max - 1) - i;
-                copy_pixel(pos - iSize, iSize, mask_2);
-            }
-        }
-    }
-}
-
-void draw_random_char(uint8_t column, uint8_t row, char final_char, int value, uint8_t style) {
-    if (value < 0) return;
-
-    char c = final_char;
-
-    if (value < 100) {
-        c = ((fastrand() % 15) + 1);
-    }
-
-    oled_set_cursor(column, row);
-    oled_write_char(c, false);
-}
-
-void get_glitch_index_new(uint16_t *glitch_timer, uint8_t *current_glitch_scope_time, uint8_t *glitch_index, uint8_t min_time, uint16_t max_time, uint8_t glitch_probobility, uint8_t glitch_frame_number) {
-    if (timer_elapsed(*glitch_timer) > *current_glitch_scope_time) {
-        // end of the last glitch period
-        *glitch_timer = timer_read();
-
-        // new random glich period
-        *current_glitch_scope_time = min_time + fastrand() % (max_time - min_time);
-
-        bool bGenerateGlitch = (fastrand() % 100) < glitch_probobility;
-        if (!bGenerateGlitch) {
-            // no glitch
-            *glitch_index = 0;
-            return;
-        }
-
-        // get a new glitch index
-        *glitch_index = fastrand() % glitch_frame_number;
-    }
-}
-
-uint8_t get_glitch_frame_index(uint8_t glitch_probobility, uint8_t glitch_frame_number) {
-    bool bGenerateGlitch = (fastrand() % 100) < glitch_probobility;
-    if (!bGenerateGlitch) {
-        // no glitch
-        return 0;
-    }
-
-    // get a new glitch index
-    return fastrand() % glitch_frame_number;
-}
-
-uint8_t get_glitch_duration(uint8_t min_time, uint16_t max_time) { return min_time + fastrand() % (max_time - min_time); }
-
-void get_glitch_index(uint32_t *glitch_timer, int *current_glitch_scope_time, uint8_t *glitch_index, uint8_t min_time, uint16_t max_time, uint8_t glitch_probobility, uint8_t glitch_frame_number) {
-    if (timer_elapsed32(*glitch_timer) > *current_glitch_scope_time) {
-        // end of the last glitch period
-        *glitch_timer = timer_read32();
-
-        // new random glich period
-        *current_glitch_scope_time = min_time + fastrand() % (max_time - min_time);
-
-        bool bGenerateGlitch = (fastrand() % 100) < glitch_probobility;
-        if (!bGenerateGlitch) {
-            // no glitch
-            *glitch_index = 0;
-            return;
-        }
-
-        // get a new glitch index
-        *glitch_index = fastrand() % glitch_frame_number;
-    }
-}
-
-void draw_progress(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int value, uint8_t style, bool color) {
-    if (value > 100) {
-        value = 100;
-    }
-    int lenght = (width * value) / 100;
-    for (uint8_t i = 0; i < lenght; i++) {
-        switch (style) {
-            case 0:
-                drawline_vb(x + i, y, heigth - 1, color);
-                break;
-
-                // case 1:
-                //     drawline_vb(x + i, y + 1, heigth - 3, ((i % 3) < 2));
-                //     break;
-                // case 2:
-                //     // . . . . .
-                //     drawline_vb(x + i, y + 3, 2, ((i % 2) == 0));
-                //     break;
-        }
-    }
-}
-
-void oled_write_raw_P_cursor(uint8_t col, uint8_t line, const char *data, uint16_t size) {
-    // raw_P at cursor position
-    oled_set_cursor(col, line);
-    oled_write_raw_P(data, size);
-}
-
-void oled_write_cursor(uint8_t col, uint8_t line, const char *data, bool invert) {
-    // write at cursor position
-    oled_set_cursor(col, line);
-    oled_write(data, invert);
-}
-
-void draw_label(const char *data, uint8_t len, uint8_t row, int value) {
-    if (value < 0) return;
-    if (row >= 16 || row < 0) return;
-    oled_write_cursor(0, row, data, false);
-}
-
-void draw_box(const char *data, uint8_t len, uint8_t row, long value, uint8_t style) {
-    if (value < 0) return;
-    if (row >= 16 || row < 0) return;
-
-    oled_write_cursor(0, row, data, false);
-
-    uint8_t y = row * 8;
-
-    uint8_t x = 6 * len;
-    uint8_t w = 32 - x;
-
-    if (value < 0) value = 0;
-    if (value > 100) value = 100;
-    draw_progress(x, y, w, 7, value, style, 1);
-}
-
-char get_oled_char(uint16_t start_index) {
-    oled_buffer_reader_t reader;
-    reader = oled_read_raw(start_index);
-    return *reader.current_element;
-}
-
-static int get_index_first_block(uint8_t y) { return ((y / 8) * 32); }
-
-void move_block(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int shift) {
-    // clip
-    if (x >= 31) return;
-    if (y >= 127) return;
-
-    int max_screen = 32 - 1;
-    if ((width + x) > max_screen + 1) width = max_screen + 1 - x;
-
-    if (width <= 1) return;
-
-    if ((heigth + y) > 127) heigth = 127 - y;
-    if (heigth <= 1) return;
-
-    // [-32 & +32]
-    if (shift > max_screen) shift = max_screen;
-    if (shift < -1 * max_screen) shift = -1 * max_screen;
-
-    if ((width + x + shift) > max_screen) width = width - shift;
-
-    int pixelTop    = 8 - (y % 8);
-    int pixelBottom = (y + heigth) % 8;
-
-    unsigned char cMastTop    = ~((unsigned)255 >> (pixelTop));
-    unsigned char cMastBottom = ~((unsigned)255 << (pixelBottom));
-
-    int indexFirstBloc     = get_index_first_block(y) + x;
-    int indexFirstBlocFull = get_index_first_block(y + pixelTop) + x;
-    int indexFirstBlocEnd  = get_index_first_block(y + heigth) + x;
-
-    int nbBlockHeigth = (heigth - pixelTop - pixelBottom) / 8;
-
-    if (nbBlockHeigth < 0) {
-        // just single row
-        nbBlockHeigth = 0;
-        cMastBottom   = 0;
-    }
-
-    if (shift < 0) {
-        for (uint16_t i = 0; i < width; i++) {
-            copy_pixel(indexFirstBloc + i, shift, cMastTop);
-            copy_pixel(indexFirstBlocEnd + i, shift, cMastBottom);
-
-            for (uint16_t j = 0; j < nbBlockHeigth; j++) {
-                copy_pixel(indexFirstBlocFull + i + (j * 32), shift, 255);
-            }
-        }
-
-    } else {
-        for (int i = width - 1; i >= 0; i--) {
-            copy_pixel(indexFirstBloc + i, shift, cMastTop);
-            copy_pixel(indexFirstBlocEnd + i, shift, cMastBottom);
-
-            for (uint16_t j = 0; j < nbBlockHeigth; j++) {
-                copy_pixel(indexFirstBlocFull + i + (j * 32), shift, 255);
-            }
-        }
-    }
-}
-
-int interpo_pourcent(int min, int max, int v) {
-    // interpolation
-    float x0 = min;
-    float x1 = max;
-    float y0 = 0;
-    float y1 = 100;
-    float xp = v;
-    float yp = y0 + ((y1 - y0) / (x1 - x0)) * (xp - x0);
-
-    return (int)yp;
-}
-
-uint8_t BAYER_PATTERN_4[4][4] = {{15, 135, 45, 165}, {195, 75, 225, 105}, {60, 180, 30, 150}, {240, 120, 210, 90}};
-
-void draw_gradient(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, uint8_t color_start, uint8_t color_end, uint8_t tres) {
-    bool invert = color_start > color_end;
-
-    if (invert) {
-        color_start = 255 - color_start;
-        color_end   = 255 - color_end;
-    }
-
-    int step       = (100 / tres);
-    int step_minus = (100 / (tres - 1));
-    int distance   = color_end - color_start;
-
-    for (uint8_t i = 0; i < width; i++) {
-        int position = interpo_pourcent(0, width, i);
-
-        float color = position;
-        color       = ((int)(color / step)) * step_minus;
-
-        color = color_start + ((distance * color) / 100);
-
-        for (uint8_t j = 0; j < heigth; j++) {
-            uint8_t       m       = BAYER_PATTERN_4[i % 4][j % 4];
-            unsigned char color_d = (color > m) ? !invert : invert;
-
-            oled_write_pixel(x + i, y + j, color_d);
-        }
-    }
-}
-
-void render_tv_animation(uint8_t frame_number, uint8_t x, uint8_t y, uint8_t width, uint8_t heigth) {
-    uint8_t xCenter = x + (width / 2);
-    uint8_t yCenter = y + (heigth / 2);
-
-    switch (frame_number) {
-        case 0:
-            // a fond : allume
-            drawline_hr_heigth(x, yCenter, width, 17, true);
-            break;
-
-        case 1:
-            drawline_hr_heigth(x, yCenter, width, 12, true);
-            draw_ellipse_fill(xCenter, yCenter, 7, 15, true);
-            break;
-
-        case 2:
-            drawline_hr_heigth(x, yCenter, width, 5, true);
-            draw_ellipse_fill(xCenter, yCenter, 5, 8, true);
-            break;
-
-        case 3:
-            drawline_hr_heigth(x, yCenter, width, 3, true);
-            draw_ellipse_fill(xCenter, yCenter, 3, 4, true);
-            break;
-
-        case 4:
-            drawline_hr_heigth(x, yCenter, width, 2, true);
-            draw_fill_circle(xCenter, yCenter, 3, true);
-            break;
-
-        case 5:
-            // central line
-            drawline_hr(x, yCenter, width, true);
-            draw_fill_circle(xCenter, yCenter, 2, true);
-            break;
-
-        case 6:
-            // cross
-            drawline_hr(xCenter, yCenter + 1, 2, true);
-            drawline_hr(xCenter, yCenter - 1, 2, true);
-
-            // central line
-            drawline_hr(x, yCenter, width, true);
-            break;
-
-        case 7:
-            // cross
-            drawline_hr(xCenter, yCenter + 1, 2, true);
-            drawline_hr(xCenter, yCenter - 1, 2, true);
-            // central line
-            drawline_hr(xCenter - 8, yCenter, 18, true);
-            // static
-            oled_write_pixel(xCenter - 11, yCenter, true);
-            oled_write_pixel(xCenter + 12, yCenter, true);
-            break;
-
-        case 8:
-            // cross
-            drawline_hr(xCenter, yCenter + 1, 2, true);
-            drawline_hr(xCenter, yCenter - 1, 2, true);
-            // central line
-            drawline_hr(xCenter - 2, yCenter, 4, true);
-            // static
-            drawline_hr(xCenter - 7, yCenter, 2, true);
-            drawline_hr(xCenter + 6, yCenter, 3, true);
-
-            //  oled_write_pixel(xCenter - 11, yCenter, true);
-            oled_write_pixel(xCenter - 9, yCenter, true);
-            oled_write_pixel(xCenter + 12, yCenter, true);
-            oled_write_pixel(xCenter + 14, yCenter, true);
-            break;
-
-        case 9:
-            // central line
-            drawline_hr(xCenter, yCenter, 2, true);
-            break;
-    }
-}
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/draw_helper.h b/keyboards/lily58/keymaps/druotoni/draw_helper.h
deleted file mode 100644
index 991ab0d0a6f..00000000000
--- a/keyboards/lily58/keymaps/druotoni/draw_helper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// Copyright 2021 ugfx
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// line
-void drawline_vb(uint8_t x, uint8_t y, uint8_t width, bool color);
-void drawline_vt(uint8_t x, uint8_t y, uint8_t width, bool color);
-void drawline_hr(uint8_t x, uint8_t y, uint8_t width, bool color);
-void drawline_hl(uint8_t x, uint8_t y, uint8_t width, bool color);
-void drawline_hr_heigth(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color);
-
-// rectangle
-void draw_rectangle(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color);
-void draw_rectangle_fill(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color);
-void draw_gradient(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, uint8_t color_start, uint8_t color_end, uint8_t tres);
-
-// circle
-void draw_fill_circle(short x, short y, uint8_t radius, bool color);
-void draw_circle(uint8_t x, uint8_t y, uint8_t radius, bool color);
-void draw_ellipse(uint8_t x, uint8_t y, uint8_t a, uint8_t b, bool color);
-void draw_ellipse_fill(uint8_t x, uint8_t y, uint8_t a, uint8_t b, bool color);
-void draw_arc_sector(uint8_t x, uint8_t y, uint8_t radius, unsigned char sectors, unsigned char half, bool color);
-void draw_static(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int color, uint8_t density);
-
-// text
-void draw_random_char(uint8_t column, uint8_t row, char final_char, int value, uint8_t style);
-void draw_label(const char *data, uint8_t len, uint8_t row, int value);
-void draw_box(const char *data, uint8_t len, uint8_t row, long value, uint8_t style);
-void draw_progress(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int value, uint8_t style, bool color);
-
-// oled drivers stuff
-char get_oled_char(uint16_t start_index);
-void oled_write_cursor(uint8_t col, uint8_t line, const char *data, bool invert);
-void oled_write_raw_P_cursor(uint8_t col, uint8_t line, const char *data, uint16_t size);
-
-// pixel manipulation
-void copy_pixel(int from, int shift, unsigned char mask);
-void move_block(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int shift);
-void draw_glitch_comb(uint8_t x, uint8_t y, uint8_t width, uint16_t height, uint8_t iSize, bool odd);
-
-// misc
-void render_tv_animation(uint8_t frame_number, uint8_t x, uint8_t y, uint8_t width, uint8_t heigth);
-int  interpo_pourcent(int min, int max, int v);
-void get_glitch_index(uint32_t *glitch_timer, int *current_glitch_scope_time, uint8_t *glitch_index, uint8_t min_time, uint16_t max_time, uint8_t glitch_probobility, uint8_t glitch_frame_number);
-void get_glitch_index_new(uint16_t *glitch_timer, uint8_t *current_glitch_scope_time, uint8_t *glitch_index, uint8_t min_time, uint16_t max_time, uint8_t glitch_probobility, uint8_t glitch_frame_number);
diff --git a/keyboards/lily58/keymaps/druotoni/fast_random.c b/keyboards/lily58/keymaps/druotoni/fast_random.c
deleted file mode 100644
index 3028b57ac6c..00000000000
--- a/keyboards/lily58/keymaps/druotoni/fast_random.c
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "fast_random.h"
-
-// seed for random
-static unsigned long g_seed = 0;
-
-int fastrand(void) {
-    // todo : try with random16();
-    g_seed = (214013 * g_seed + 2531011);
-    return (g_seed >> 16) & 0x7FFF;
-}
-
-unsigned long fastrand_long(void) {
-    g_seed = (214013 * g_seed + 2531011);
-    return g_seed;
-}
diff --git a/keyboards/lily58/keymaps/druotoni/fast_random.h b/keyboards/lily58/keymaps/druotoni/fast_random.h
deleted file mode 100644
index fe8c4a40a2d..00000000000
--- a/keyboards/lily58/keymaps/druotoni/fast_random.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-int           fastrand(void);
-unsigned long fastrand_long(void);
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/gui_state.c b/keyboards/lily58/keymaps/druotoni/gui_state.c
deleted file mode 100644
index d86e67ec7bf..00000000000
--- a/keyboards/lily58/keymaps/druotoni/gui_state.c
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "gui_state.h"
-#include "draw_helper.h"
-
-// timer for the gui state
-uint32_t global_sleep_timer     = 0;
-uint32_t global_waking_up_timer = 0;
-uint32_t global_booting_timer   = 0;
-
-// timers test for states
-#ifdef WITH_BOOT
-static bool IsBooting(void) { return (timer_elapsed32(global_booting_timer) < BOOTING_TIME_TRESHOLD); }
-#else
-static bool IsBooting(void) { return false; }
-#endif
-
-// state test
-static bool IsWakingUp(void) { return (timer_elapsed32(global_waking_up_timer) < WAKING_UP_TIME_TRESHOLD); }
-static bool IsIdle(void) { return (timer_elapsed32(global_sleep_timer) > IDLE_TIME_TRESHOLD && timer_elapsed32(global_sleep_timer) < HALTING_TIME_TRESHOLD); }
-static bool IsSleep(void) { return (timer_elapsed32(global_sleep_timer) >= SLEEP_TIME_TRESHOLD); }
-static bool IsHalting(void) { return (timer_elapsed32(global_sleep_timer) >= HALTING_TIME_TRESHOLD && timer_elapsed32(global_sleep_timer) < SLEEP_TIME_TRESHOLD); }
-
-gui_state_t get_gui_state(void) {
-    // get gui states by testing timers
-    if (IsBooting()) return _BOOTING;
-    if (IsWakingUp()) return _WAKINGUP;
-    if (IsIdle()) return _IDLE;
-    if (IsHalting()) return _HALTING;
-    if (IsSleep()) return _SLEEP;
-
-    return _UP;
-}
-
-void update_gui_state(void) {
-    // what to do when a key is pressed
-    gui_state_t t = get_gui_state();
-
-#ifdef WITH_BOOT
-    if (t == _SLEEP) {
-        // booting
-        global_booting_timer = timer_read32();
-    }
-
-    if (t == _BOOTING) {
-        // cancel booting
-        global_booting_timer = 1000000;
-    }
-#else
-    if (t == _SLEEP) {
-        // waking up
-        global_waking_up_timer = timer_read32();
-    }
-#endif
-
-    if (t == _IDLE || t == _HALTING || t == _BOOTING) {
-        // waking up
-        global_waking_up_timer = timer_read32();
-    }
-
-    // no sleep
-    global_sleep_timer = timer_read32();
-}
-
-uint8_t get_glitch_probability(void) {
-    // more gliches could occur when halting time is near
-    return interpo_pourcent(IDLE_TIME_TRESHOLD, HALTING_TIME_TRESHOLD, timer_elapsed32(global_sleep_timer));
-}
diff --git a/keyboards/lily58/keymaps/druotoni/gui_state.h b/keyboards/lily58/keymaps/druotoni/gui_state.h
deleted file mode 100644
index 190e02d303c..00000000000
--- a/keyboards/lily58/keymaps/druotoni/gui_state.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// states timing
-#define BOOTING_TIME_TRESHOLD 7000
-#define WAKING_UP_TIME_TRESHOLD 300
-#define IDLE_TIME_TRESHOLD 4000
-#define HALTING_TIME_TRESHOLD IDLE_TIME_TRESHOLD + 6000
-#define SLEEP_TIME_TRESHOLD HALTING_TIME_TRESHOLD + 8000
-
-typedef uint8_t gui_state_t;
-enum gui_state { _WAKINGUP = 0, _IDLE, _SLEEP, _UP, _BOOTING, _HALTING };
-
-gui_state_t get_gui_state(void);
-void        update_gui_state(void);
-uint8_t     get_glitch_probability(void);
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/keymap.c b/keyboards/lily58/keymaps/druotoni/keymap.c
deleted file mode 100644
index 69b36928abd..00000000000
--- a/keyboards/lily58/keymaps/druotoni/keymap.c
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keymap_french.h"
-#include "transactions.h"
-
-// global
-#include "gui_state.h"
-#include "boot.h"
-#include "navi_logo.h"
-
-#include "draw_helper.h"
-#include "fast_random.h"
-
-// left side
-#include "layer_frame.h"
-#include "burst.h"
-
-// right side
-#include "ring.h"
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* QWERTY
-* ,-----------------------------------------.                    ,-----------------------------------------.
-* | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  DEL |
-* |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-* | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  ^   |
-* |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-* |LShift|   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |RShift|
-* |------+------+------+------+------+------|  "    |    |  )    |------+------+------+------+------+------|
-* |LCTRL |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |  $   |
-* `-----------------------------------------/       /     \      \-----------------------------------------'
-*                   | LAlt |  SPE | Space| /  NAV  /       \Enter \  |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_DELETE, 
-    KC_TAB,   KC_Q,   KC_W,    KC_E,          KC_R,    KC_T,                              KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    FR_CIRC, 
-    KC_LSFT,  KC_A,   KC_S,    KC_D,          KC_F,    KC_G,                              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RSFT, 
-    KC_LCTL,  KC_Z,   KC_X,    KC_C,          KC_V,    KC_B,    S(KC_Z),   FR_RPRN,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_QUOT, 
-    KC_LALT, TT(_RAISE),    KC_SPC, TT(_LOWER),                                           KC_ENT,  KC_BSPC, KC_RBRC, KC_RGUI 
-    ),
-
- /* LOWER      
-* ,---------------------------------------------.                   ,------------------------------------------------.
-* |  ESC |  F1   |  F2   |  F3  |  F4   |  F5   |                   |   F6   |  F7    |  F8    |  F9   | F10  |  DEL | 
-* |------+-------+-------+------+-------+-------|                   |--------+--------+--------+-------+------+------|
-* |  RST |  F11  |  F12  | DEL  | paste | copy  |                   |  home  | pg up  |  print | redo  | w    |      |
-* |------+-------+-------+------+-------+-------|                   |--------+--------+--------+-------+------+------|
-* |      |  all  |       | SAV  | undo  | BackSP|-------.   ,-------|  left  | down   |  up    | right |      |      |
-* |------+-------+-------+------+-------+-------|  enter|   |       |--------+--------+--------+-------+------+------|
-* |  F9  |  F11  |  F10  | F5   | TAB   | cut   |-------|   |-------|  end   | pg dw  |        |       |      |      |
-* `---------------------------------------------/       /    \       \-----------------------------------------------'
-*                   |      | SPE  |          | /       /      \       \  |      | MENU |      |
-*                   |      |      |          |/       /        \       \ |      |      |      |
-*                   `--------------------------------'          '-------''--------------------'
-*/
-    [_LOWER] =  LAYOUT(
-    KC_ESC, KC_F1,      KC_F2,  KC_F3,      KC_F4,          KC_F5,                          KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,         KC_DELETE,
-    QK_BOOT,  KC_F11,     KC_F12, KC_DELETE,  RCTL(FR_V),     RCTL(FR_C),                     KC_HOME,    KC_PGUP,    KC_PSCR,    RCTL(FR_Y), RCTL(KC_RIGHT), _______,
-    _______,RCTL(FR_A), _______,RCTL(FR_S), RCTL(FR_Z),     KC_BSPC,                        KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,   _______,        _______,
-    KC_F9,  KC_F11,     KC_F10, KC_F5,      LALT(KC_TAB),   RCTL(FR_X), KC_ENT, _______,    KC_END,     KC_PGDN,    _______,    _______,    _______,        _______,
-    _______,TT(_RAISE), _______, _______,                                                   _______,    _______,    KC_APP,     _______),
-
-/* RAISE
-* ,-----------------------------------------.                    ,-------------------------------------------.
-* |      |      |      |      |      |      |                    |      |     |   /   |   *  |  -  | RGB TOG|
-* |------+------+------+------+------+------|                    |------+------+------+------+-----+--------|
-* |   `  |   [  |   ]  |      |      |      |                    |   ^  |   7  |   8  |   9  |  +  | RGB HUI|
-* |------+------+------+------+------+------|                    |------+------+------+------+-----+--------|
-* |      |  @   |  |   |  &   |  €   |  #   |-------.    ,-------|   $  |   4  |   5  |   6  |     |        |
-* |------+------+------+------+------+------|       |    |       |------+------+------+------+-----+--------|
-* |  F7  |  F8  |  F9  | F10  |  #   | F12  |-------|    |-------|      |   1  |   2  |   3  |     |        |
-* `-----------------------------------------/       /     \      \------------------------------------------'
-*                   |      |      |      | /       /       \      \  |       |   0  |  .   |
-*                   |      |      |      |/       /         \      \ |       |      |      |
-*                   `----------------------------'           '------''---------------------'
-*/
-    [_RAISE] = LAYOUT(
-    _______, _______,    _______,    _______,    _______, _______,                   _______,    _______, KC_PSLS, KC_PAST, KC_PMNS, RGB_TOG,
-    KC_GRV,  FR_LBRC,    FR_RBRC,    _______,    _______, _______,                   FR_EQL,     KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, RGB_HUI, 
-    _______, FR_AT,      FR_PIPE,    ALGR(KC_1), FR_EURO, FR_HASH,                   S(FR_EQL),  KC_KP_4, KC_KP_5, KC_KP_6, _______, _______,
-    KC_F7,   KC_F8,      KC_F9,      KC_F10,     FR_HASH, KC_F12, _______, _______,  _______,    KC_KP_1, KC_KP_2, KC_KP_3, _______, _______,
-    _______, _______,    _______,    _______,                                        _______,    _______, KC_KP_0, KC_KP_DOT)
-};
-// clang-format on
-
-// sync transport
-typedef struct _sync_keycode_t {
-    uint16_t keycode;
-} sync_keycode_t;
-
-// force rigth side to update
-bool b_sync_need_send = false;
-
-// last keycode typed
-sync_keycode_t last_keycode;
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    // vertical orientation
-    return OLED_ROTATION_270;
-}
-
-void render(gui_state_t t) {
-    // logo
-    render_logo(t);
-
-#if IS_LEFT
-    // left side
-    render_layer_frame(t);
-    render_gears();
-
-    decay_scope();
-    render_scope(t);
-#endif
-
-#if IS_RIGHT
-    // right side
-    render_circle(t);
-#endif
-}
-
-void update(uint16_t keycode) {
-#if IS_LEFT
-    update_scope();
-#endif
-
-#if IS_RIGHT
-    update_circle(keycode);
-#endif
-}
-
-void reset(void) {
-#if IS_LEFT
-    reset_scope();
-#endif
-
-#if IS_RIGHT
-    reset_ring();
-#endif
-}
-
-void set_wackingup_mode_clean(void) {
-    oled_clear();
-    reset();
-}
-
-bool oled_task_user(void) {
-    gui_state_t t = get_gui_state();
-
-    // in sleep mode => turn display off
-    if (t == _SLEEP) {
-        oled_off();
-        return false;
-    }
-
-    // not in sleep mode => screen is on
-    oled_on();
-
-#ifdef WITH_BOOT
-    // in booting mode => display booting animation
-    if (t == _BOOTING) {
-        bool boot_finished = render_boot();
-        if (boot_finished) {
-            // end of the boot : wacking up
-            set_wackingup_mode_clean();
-            update_gui_state();
-        }
-        return false;
-    }
-#endif
-
-    // in halting mode => display booting animation
-    if (t == _HALTING) {
-        render_halt();
-        return false;
-    }
-
-    render(t);
-    return false;
-}
-
-void process_key(uint16_t keycode) {
-    // update screen with the new key
-    update(keycode);
-
-    gui_state_t t = get_gui_state();
-
-    if (t == _IDLE) {
-        // wake up animation
-        reset();
-    }
-
-    if (t == _BOOTING || t == _HALTING) {
-        // cancel booting or halting : waking_up
-        set_wackingup_mode_clean();
-    }
-
-    if (t == _SLEEP) {
-        // boot sequence
-        set_wackingup_mode_clean();
-        reset_boot();
-    }
-
-    update_gui_state();
-}
-
-void user_sync_a_slave_handler(uint8_t in_buflen, const void* in_data, uint8_t out_buflen, void* out_data) {
-    const sync_keycode_t* m2s = (const sync_keycode_t*)in_data;
-    // get the last char typed on left side and update the right side
-    process_key(m2s->keycode);
-}
-
-void keyboard_post_init_user(void) {
-    // callback for tranport sync data
-    transaction_register_rpc(USER_SYNC_A, user_sync_a_slave_handler);
-}
-
-void housekeeping_task_user(void) {
-    // only for master side
-    if (!is_keyboard_master()) return;
-
-    // only if a new char was typed
-    if (!b_sync_need_send) return;
-
-    // send the char to the slave side : sync is done
-    if (transaction_rpc_send(USER_SYNC_A, sizeof(last_keycode), &last_keycode)) {
-        b_sync_need_send = false;
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    if (record->event.pressed) {
-        // master : store keycode to sent to the other side to be process_key
-        last_keycode.keycode = keycode;
-        b_sync_need_send     = true;
-
-        // gui process the input
-        process_key(keycode);
-    }
-    return true;
-}
-
-#if IS_LEFT
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // update the frame with the layer name
-    update_layer_frame(state);
-    return state;
-}
-#endif
diff --git a/keyboards/lily58/keymaps/druotoni/layer_frame.c b/keyboards/lily58/keymaps/druotoni/layer_frame.c
deleted file mode 100644
index 6f7ae1a253f..00000000000
--- a/keyboards/lily58/keymaps/druotoni/layer_frame.c
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "gui_state.h"
-#include "layer_frame.h"
-#include "draw_helper.h"
-
-#define ANIM_LAYER_FRAME_DURATION 2
-#define ANIM_LAYER_FRAME_MAX 7
-
-// current layer
-uint8_t current_layer = _QWERTY;
-
-// layer animation stuff
-uint16_t anim_layer_frame_timer  = 0;
-uint8_t  current_layer_frame     = ANIM_LAYER_FRAME_MAX;
-uint8_t  layer_frame_destination = ANIM_LAYER_FRAME_MAX;
-
-// layer name for display
-const char*        layer_name;
-static const char* layer_ref[3] = {LAYER_NAME_0, LAYER_NAME_1, LAYER_NAME_2};
-
-void update_layer_frame(layer_state_t state) {
-    // reset timer
-    anim_layer_frame_timer = timer_read();
-
-    // direction for animation base on layer selected
-    current_layer = get_highest_layer(state);
-    if (current_layer == _QWERTY) {
-        layer_frame_destination = 0;
-    } else {
-        layer_frame_destination = ANIM_LAYER_FRAME_MAX;
-    }
-}
-
-static void draw_black_screen(void) {
-    // clean frame center
-    draw_rectangle_fill(3, 42, 26, 20, false);
-    drawline_hr(17, 62, 12, false);
-}
-
-void render_gears(void) {
-    // 64 bytes, 8x8 font, 8 characters, 32x16 image, 4 columns, 2 rows
-    static const char PROGMEM raw_logo[] = {
-        0, 6, 6, 54, 118, 96, 230, 192, 192, 128, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 18, 226, 2, 18, 226, 2, 18, 226, 2, 1, 0, 0, 0, 0, 0, 128, 128, 128, 185, 187, 187, 131, 128, 184, 128, 128, 128, 128, 128, 128, 128, 128, 128, 191, 128, 128, 191, 128, 128, 191, 128, 0,
-    };
-
-    // extra line for complete the gui
-    oled_write_raw_P_cursor(0, 8, raw_logo, sizeof(raw_logo));
-}
-
-void render_layer_frame(gui_state_t t) {
-    // 96 bytes, 8x8 font, 12 characters, 32x24 image, 4 columns, 3 rows
-    static const char PROGMEM raw_logo[] = {
-        62, 1, 0, 56, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 124, 248, 241, 226, 4, 8, 240, 0, 28, 28, 28, 0, 0, 127, 4, 8, 16, 127, 0, 124, 18, 17, 18, 124, 0, 31, 32, 64, 32, 31, 0, 0, 0, 0, 255, 255, 0, 0, 255, 62, 64, 64, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 142, 30, 62, 126, 126, 70, 70, 126, 70, 70, 126, 70, 70, 127, 127, 0, 0, 255,
-    };
-    oled_write_raw_P_cursor(0, 5, raw_logo, sizeof(raw_logo));
-
-    // extra line for complete the gui
-    drawline_hr(2, 39, 25, 1);
-
-    if (current_layer_frame != layer_frame_destination) {
-        if (timer_elapsed(anim_layer_frame_timer) > ANIM_LAYER_FRAME_DURATION) {
-            anim_layer_frame_timer = timer_read();
-
-            if (layer_frame_destination > current_layer_frame) {
-                current_layer_frame++;
-            } else {
-                current_layer_frame--;
-            }
-        }
-
-        // black screen
-        draw_black_screen();
-
-        // gradient animation on layer selection
-        draw_gradient(3, 42, current_layer_frame * 4, 10, 0, 255, 7);
-        draw_gradient(3 + (27 - current_layer_frame * 4), 57, current_layer_frame * 4, 6, 255, 0, 7);
-
-        drawline_hr(3, 46, 22, false);
-        drawline_hr(3, 47, 23, false);
-
-        draw_rectangle_fill(3, 55, 24, 2, false);
-        draw_rectangle_fill(24, 48, 3, 7, false);
-
-        draw_rectangle_fill(3, 60, 12, 2, false);
-        oled_write_pixel(15, 61, false);
-        drawline_hr(14, 62, 3, false);
-        drawline_hr(14, 62, 3, false);
-        drawline_hr(3, 62, 11, true);
-    }
-
-    // get current layer name
-    layer_name = layer_ref[current_layer];
-
-    // gui on pause : no layer name on screen
-    if (t == _IDLE || t == _SLEEP || t == _WAKINGUP) {
-        layer_name = "   ";
-    }
-
-    // display layer name in the frame
-    oled_write_cursor(1, 6, layer_name, false);
-}
diff --git a/keyboards/lily58/keymaps/druotoni/layer_frame.h b/keyboards/lily58/keymaps/druotoni/layer_frame.h
deleted file mode 100644
index abbd9483957..00000000000
--- a/keyboards/lily58/keymaps/druotoni/layer_frame.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// layer name : must be 3 chars
-#define LAYER_NAME_0 "ABC"
-#define LAYER_NAME_1 "NAV"
-#define LAYER_NAME_2 "SPE"
-
-enum layer_number { _QWERTY = 0, _LOWER, _RAISE };
-
-void render_gears(void);
-void render_layer_frame(gui_state_t t);
-void update_layer_frame(layer_state_t state);
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/navi_font.c b/keyboards/lily58/keymaps/druotoni/navi_font.c
deleted file mode 100644
index 2412256e616..00000000000
--- a/keyboards/lily58/keymaps/druotoni/navi_font.c
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-const unsigned char font[] PROGMEM = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x42, 0x3A, 0x12, 0x12, 0x0E, 0x00,
-    0x0C, 0x44, 0x47, 0x24, 0x1C, 0x00,
-    0x24, 0x24, 0x14, 0x7F, 0x04, 0x00,
-    0x42, 0x3F, 0x02, 0x22, 0x1E, 0x00,
-    0x0A, 0x0A, 0x7F, 0x0A, 0x0A, 0x00,
-    0x02, 0x47, 0x42, 0x22, 0x1F, 0x00,
-    0x21, 0x15, 0x09, 0x15, 0x63, 0x00,
-    0x44, 0x44, 0x3F, 0x04, 0x04, 0x00,
-    0x22, 0x1A, 0x02, 0x7F, 0x12, 0x00,
-    0x22, 0x22, 0x12, 0x0A, 0x06, 0x00,
-    0x08, 0x47, 0x42, 0x22, 0x1E, 0x00,
-    0x10, 0x52, 0x54, 0x30, 0x16, 0x00,
-    0x40, 0x3A, 0x02, 0x3E, 0x42, 0x00,
-    0x5E, 0x52, 0x52, 0x52, 0x5E, 0x00,
-    0x04, 0x27, 0x44, 0x44, 0x3C, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x77, 0x00, 0x77, 0x00, 0x77, 0x00,
-    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x1C, 0x1C, 0x1C, 0x00, 0x00,
-    0x00, 0x08, 0x1C, 0x08, 0x00, 0x00,
-    0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-    0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-    0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-    0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00
-};
diff --git a/keyboards/lily58/keymaps/druotoni/navi_logo.c b/keyboards/lily58/keymaps/druotoni/navi_logo.c
deleted file mode 100644
index 6041aa5ebca..00000000000
--- a/keyboards/lily58/keymaps/druotoni/navi_logo.c
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "gui_state.h"
-#include "navi_logo.h"
-#include "fast_random.h"
-#include "draw_helper.h"
-
-#define LOGO_SIZE 128
-
-// glitch stuff
-#define GLITCH_FRAME_NUMBER 11
-
-uint8_t  current_glitch_index = 0;
-int      current_glitch_time  = 150;
-uint32_t glitch_timer         = 0;
-
-static void render_logo_clean(void) {
-    // your logo here
-    static const char PROGMEM raw_logo[] = {
-        0, 0, 0, 0, 0, 0, 128, 128, 0, 0, 128, 128, 192, 192, 204, 222, 222, 204, 192, 192, 128, 0, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 192, 240, 248, 28, 14, 7, 3, 249, 252, 255, 15, 7, 3, 225, 241, 241, 241, 241, 225, 3, 7, 15, 255, 252, 249, 3, 7, 14, 28, 248, 240, 192, 192, 227, 231, 206, 28, 56, 112, 99, 15, 31, 60, 120, 240, 225, 227, 3, 3, 227, 225, 240, 120, 60, 31, 15, 103, 112, 56, 28, 206, 231, 227, 192, 0, 1, 1, 0, 0, 0, 56, 120, 96, 192, 192, 192, 96, 127, 63, 0, 0, 63, 127, 96, 192, 192, 192, 96, 120, 56, 0, 0, 0, 1, 1, 0,
-    };
-    oled_write_raw_P(raw_logo, sizeof(raw_logo));
-}
-
-void render_glitch_bar(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t iProb) {
-    // random horizontal scanlines
-    for (uint8_t i = 0; i < height; i++) {
-        bool bGenerateGlitch = (fastrand() % 100) < iProb;
-
-        if (bGenerateGlitch) {
-            drawline_hr(x, y + i, width, true);
-        }
-    }
-}
-
-void render_misc_glitch(uint8_t algo) {
-    char c = 0;
-    switch (algo) {
-        case 7:
-            // invert
-            for (uint8_t i = 0; i < LOGO_SIZE; i++) {
-                c = get_oled_char(i);
-                oled_write_raw_byte(~(c), i);
-            }
-            break;
-
-        case 8:
-            //  wobble
-            for (uint8_t i = 0; i < LOGO_SIZE; i++) {
-                if (i < LOGO_SIZE - 1) {
-                    copy_pixel(i + 1, -1, 85);
-
-                    copy_pixel(LOGO_SIZE - 1 - 1 - i, 1, 170);
-                }
-            }
-            break;
-    }
-}
-
-static void render_logo_glitch(void) {
-#ifdef WITH_GLITCH
-    // get a random glitch index
-    uint8_t glitch_prob = get_glitch_probability();
-    get_glitch_index(&glitch_timer, &current_glitch_time, &current_glitch_index, 0, 150, glitch_prob, GLITCH_FRAME_NUMBER);
-
-    // no glitch
-    if (current_glitch_index <= 3) {
-        render_logo_clean();
-        return;
-    }
-
-    // glitch time !
-    switch (current_glitch_index) {
-        case 4:
-            move_block(1, 11, 24, 3, 5);
-            move_block(2, 19, 14, 3, 4);
-            move_block(9, 22, 7, 4, 4);
-            return;
-
-        case 5:
-            move_block(6, 25, 20, 7, 4);
-            move_block(0, 8, 32, 8, 7);
-            return;
-        case 6:
-            move_block(3, 7, 27, 4, -3);
-            move_block(13, 23, 19, 4, -4);
-            return;
-
-        case 7:
-        case 8:
-            render_misc_glitch(current_glitch_index);
-            return;
-
-        case 9:
-            render_glitch_bar(0, 0, 32, 32, 25);
-            return;
-
-        case 10:
-            draw_static(0, 0, 32, 32, true, 0);
-            return;
-    }
-#endif
-}
-
-void render_logo(gui_state_t t) {
-    if (t == _IDLE) {
-        // on idle : glitch time !
-        render_logo_glitch();
-        return;
-    }
-
-    // standart logo
-    render_logo_clean();
-}
diff --git a/keyboards/lily58/keymaps/druotoni/navi_logo.h b/keyboards/lily58/keymaps/druotoni/navi_logo.h
deleted file mode 100644
index 3504568e5d7..00000000000
--- a/keyboards/lily58/keymaps/druotoni/navi_logo.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-void render_logo(gui_state_t t);
-
diff --git a/keyboards/lily58/keymaps/druotoni/readme.md b/keyboards/lily58/keymaps/druotoni/readme.md
deleted file mode 100644
index c6d47da5d77..00000000000
--- a/keyboards/lily58/keymaps/druotoni/readme.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# HELL0 NAVI. Interface
-
-HELL0 NAVI. Interface is a GUI based en [Serial Experiments Lain](https://en.wikipedia.org/wiki/Serial_Experiments_Lain). Turn your [Lily58](https://github.com/kata0510/Lily58) keyboard into a Navi computer with its own Copland OS.
-
-
-Ready to dive into the Wired ?
-
-
-HELL0 NAVI provides interactive animations for both sides :
-- a scope on left side for burst, WPM and active layer
-- a ring on right side for the last key stroke
-
-
-
-
-
-
-
-## Typing animation
-
-The scope displays your burst time on a chart. The WPM is represented by an horizontal line.
-
-The ring display the last letter in the upper frame. Each time you enter a key, the Navi searches into the circular database and locks the position. A special animation is displayed when Enter, Backspce or Escape are struck.
-
-<img src="https://imgur.com/Yf7D6UN.gif" height="400" >
-
-## Startup animation
-
-Your Navi boots when it leaves the sleep mode. The animation can be canceled by typing.
-
-
-
-<img src="https://imgur.com/EXU92Ev.gif" height="400" >
-
-
-
-## Waking up animation
-
-After a period of inactivity, the scope and the ring turn off and the Navi runs in Idle mode. A new key stroke wakes them up.
-
-
-<img src="https://imgur.com/9GWa7rR.gif" height="400" >
-
-
-## Idle animation
-
-The Copland OS is still in beta test. After a while, some visual glitches will occur. 
-
-
-<img src="https://imgur.com/eKZ7qgC.gif" height="400" >
-
-
-
-## Shutdown animation
-The Navi runs in sleep mode after 10 seconds in Idle mode. A nice (and difficul to render in a gif) animation is run. The OLED display turns off. 
-
-# How to build & flash
-
-You need to flash each side with a specific version based on config.h configuration.
-
- ## Left side (master)
-
-IS_RIGHT needs to be commented in config.h
-```
-#define IS_LEFT 1
-//#define IS_RIGHT 1
-```
-Connect the left side and flash
-
- ## Right side (slave)
-
-Comment IS_LEFT and uncomment IS_RIGHT  in config.h
-```
-//#define IS_LEFT 1
-#define IS_RIGHT 1
-```
-Connect the right side and flash
-
-# Customization
-
-## Logo
-Logo can be change in navi_logo.c.
-The new logo must be 32x32 pixels.
-```
-static void render_logo_clean(void) {
-    // your logo here
-    static const char PROGMEM logo_raw[] = {
-        0, 0, 0, 0, 0, 0, 128, 128, 0, 0, 128, 128, 192, 192, 204, 222, 222, 204, 192, 192, 128, 0, 0, 0, 128, 128, 0, 0,
-        0, 0, 0, 0, 192, 240, 248, 28, 14, 7, 3, 249, 252, 255, 15, 7, 3, 225, 241, 241, 241, 241, 225, 3, 7, 15, 255, 252,
-        249, 3, 7, 14, 28, 248, 240, 192, 192, 227, 231, 206, 28, 56, 112, 99, 15, 31, 60, 120, 240, 225, 227, 3, 3, 227,
-        225, 240, 120, 60, 31, 15, 103, 112, 56, 28, 206, 231, 227, 192, 0, 1, 1, 0, 0, 0, 56, 120, 96, 192, 192, 192, 
-        96, 127, 63, 0, 0, 63, 127, 96, 192, 192, 192, 96, 120, 56, 0, 0, 0, 1, 1, 0,
-    };
-    oled_write_raw_P(logo_raw, sizeof(logo_raw));
-}
-```
-## Layer names
-
-The current version handle 3 differents layers. Names can be changed in layer_frame.h.
-```
-// layer name : must be 3 chars
-#define LAYER_NAME_0 "ABC"
-#define LAYER_NAME_1 "NAV"
-#define LAYER_NAME_2 "SPE"
-```
-
-## Timing
-
-You can tweak states timing in gui_state.h.
-```
-// states timing
-#define BOOTING_TIME_TRESHOLD 7000
-#define WAKING_UP_TIME_TRESHOLD 300
-#define IDLE_TIME_TRESHOLD 4000
-#define HALTING_TIME_TRESHOLD IDLE_TIME_TRESHOLD + 6000
-#define SLEEP_TIME_TRESHOLD HALTING_TIME_TRESHOLD + 8000
-```
-
-## Need space ?
-Boot and gliches can be commented in config.h
-```
-// states timing
-// logo glitch
-//#define WITH_GLITCH
-// boot sequence
-//#define WITH_BOOT
-```
-
-![My Navi](https://imgur.com/eYkgoZJ.png)
-> Keyboard : https://github.com/kata0510/Lily58
-> 
-> Case : https://github.com/BoardSodie/Lily58-Acrylic-Case
-
diff --git a/keyboards/lily58/keymaps/druotoni/ring.c b/keyboards/lily58/keymaps/druotoni/ring.c
deleted file mode 100644
index e3b7472872e..00000000000
--- a/keyboards/lily58/keymaps/druotoni/ring.c
+++ /dev/null
@@ -1,494 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "gui_state.h"
-#include "ring.h"
-
-#include "fast_random.h"
-#include "draw_helper.h"
-
-char tListeTotal[SIZE_ARRAY_1]  = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P'};
-char tListeTotal2[SIZE_ARRAY_1] = {'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', ',', '.', '/', '1', '2', '3'};
-
-static char tRefArc[SIZE_ARRAY_1]  = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P'};
-static char tRefArc2[SIZE_ARRAY_1] = {'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', ',', '.', '/', '1', '2', '3'};
-
-// ring target and previous char
-char c_target   = 'A';
-char c_target2  = 'Q';
-char c_last     = ' ';
-char c_previous = ' ';
-
-static const char PROGMEM code_to_name[60] = {' ', ' ', ' ', ' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'R', 'E', 'B', 'T', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ';', '\'', ' ', ',', '.', '/', ' ', ' ', ' '};
-
-// main circle
-#define CIRCLE_ANIM_FRAME_DURATION 40
-uint16_t circle_timer = 0;
-
-// special animation for special keys
-#define ANIM_CENTER_FRAME_NUMBER 5
-#define ANIM_CENTER_FRAME_DURATION 40
-uint16_t anim_center_timer         = 0;
-uint8_t  anim_center_current_frame = 0;
-
-// sleep animation
-#define ANIM_SLEEP_RING_FRAME_NUMBER 9
-#define ANIM_SLEEP_RING_FRAME_DURATION 20
-uint16_t anim_sleep_ring_timer        = 0;
-uint8_t  current_sleep_ring_frame     = 0;
-uint8_t  sleep_ring_frame_destination = ANIM_SLEEP_RING_FRAME_NUMBER - 1;
-
-// glitch animation
-uint16_t anim_ring_idle_timer      = 0;
-int      current_glitch_ring_time  = 150;
-uint32_t glitch_ring_timer         = 0;
-uint8_t  current_glitch_ring_index = 0;
-
-// central frame keylog animation
-#define ANIM_KEYLOG_FRAME_NUMBER 8
-#define ANIM_KEYLOG_FRAME_DURATION 20
-uint8_t  anim_keylog_current_frame = 0;
-uint16_t anim_keylog_timer         = 0;
-
-static const char PROGMEM raw_ring_sleep[4][64] = {{
-                                                       192, 32, 16, 8, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 8, 16, 32, 192, 3, 4, 8, 16, 32, 32, 32, 64, 64, 64, 64, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 64, 64, 64, 64, 32, 32, 32, 16, 8, 4, 3,
-                                                   },
-
-                                                   {
-                                                       128, 64, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 16, 16, 16, 16, 16, 32, 32, 64, 128, 0, 1, 2, 2, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 1, 0,
-                                                   },
-
-                                                   {
-                                                       248, 192, 128, 128, 128, 128, 128, 128, 128, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 128, 128, 128, 128, 128, 128, 128, 192, 248, 15, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 15,
-                                                   },
-
-                                                   {
-                                                       255, 240, 128, 128, 0, 128, 128, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 0, 0, 128, 128, 0, 128, 128, 248, 255, 255, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 255,
-                                                   }};
-
-static const char PROGMEM raw_circle[4][128] = {{
-                                                    0, 0, 0, 192, 32, 16, 8, 8, 4, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 4, 8, 8, 16, 32, 192, 0, 0, 0, 240, 14, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 129, 238, 240, 15, 112, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 192, 240, 255, 127, 15, 0, 0, 0, 3, 4, 8, 16, 16, 32, 64, 64, 64, 128, 128, 192, 192, 224, 224, 224, 240, 112, 120, 124, 60, 30, 30, 15, 7, 3, 0, 0, 0,
-                                                },
-                                                {
-                                                    0, 0, 0, 192, 32, 16, 8, 8, 4, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 4, 8, 8, 48, 224, 192, 0, 0, 0, 240, 14, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 255, 255, 254, 240, 15, 112, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 192, 224, 240, 248, 248, 254, 255, 255, 127, 15, 0, 0, 0, 3, 7, 15, 31, 30, 62, 126, 126, 126, 254, 254, 254, 254, 254, 255, 255, 255, 127, 127, 127, 63, 31, 31, 15, 7, 3, 0, 0, 0,
-                                                },
-                                                {
-                                                    0, 0, 0, 192, 32, 16, 8, 8, 4, 2, 2, 2, 1, 1, 1, 1, 3, 15, 255, 255, 254, 254, 254, 252, 248, 248, 240, 224, 192, 0, 0, 0, 240, 14, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 192, 240, 248, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 240, 15, 126, 252, 248, 248, 248, 248, 248, 252, 252, 254, 254, 255, 255, 255, 255, 255, 255, 255, 127, 63, 31, 15, 7, 7, 3, 3, 3, 7, 143, 127, 15, 0, 0, 0, 3, 7, 15, 31, 31, 63, 127, 127, 127, 255, 255, 255, 255, 255, 255, 195, 128, 64, 64, 64, 32, 16, 16, 8, 4, 3, 0, 0, 0,
-                                                },
-                                                {
-                                                    0, 0, 0, 192, 224, 240, 248, 248, 124, 62, 30, 14, 15, 7, 7, 3, 3, 3, 1, 1, 2, 2, 2, 4, 8, 8, 16, 32, 192, 0, 0, 0, 240, 254, 255, 31, 15, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 14, 240, 15, 115, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 112, 15, 0, 0, 0, 3, 4, 8, 16, 16, 32, 64, 64, 64, 128, 128, 128, 128, 128, 128, 128, 128, 64, 64, 64, 32, 16, 16, 8, 4, 3, 0, 0, 0,
-                                                }};
-
-static const char PROGMEM raw_bottom[] = {
-    127, 192, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 192, 127,
-};
-
-static const char PROGMEM raw_middle[] = {
-    240, 8, 4, 226, 241, 248, 124, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 56, 0, 1, 62, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 28, 28, 0, 255, 0, 0, 127, 127, 70, 70, 126, 70, 70, 126, 70, 70, 126, 126, 62, 30, 142, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 64, 64, 62, 1, 2, 114, 114, 2, 2, 114, 114, 2, 2, 114, 114, 2, 2, 2, 2, 1, 0, 0, 0, 128, 64, 64, 64, 64, 64, 64, 64, 64, 64, 128, 0, 0, 128, 131, 131, 132, 136, 179, 131, 132, 184, 131, 131, 188, 128, 128, 128, 128, 128, 128, 128, 143, 144, 149, 144, 149, 144, 149, 144, 149, 144, 143, 0,
-};
-
-static void rotate_right(char str[]) {
-    uint8_t iSize = SIZE_ARRAY_1;
-    char    cFist = str[0];
-
-    // rotate array to the right
-    for (uint8_t i = 0; i < iSize - 1; i++) {
-        str[i] = str[i + 1];
-    }
-    str[iSize - 1] = cFist;
-}
-
-static void rotate_left(char str[]) {
-    uint8_t iSize = SIZE_ARRAY_1;
-    char    cLast = str[iSize - 1];
-
-    // rotate array to the left
-    for (uint8_t i = iSize - 1; i > 0; i--) {
-        str[i] = str[i - 1];
-    }
-    str[0] = cLast;
-}
-
-static signed char GetPosition(char c, char tListe[]) {
-    uint8_t iSize = SIZE_ARRAY_1;
-
-    // find position of c in the array
-    for (uint8_t i = 0; i < iSize; i++) {
-        if (tListe[i] == c) return i;
-    }
-
-    // not found
-    return -1;
-}
-
-static signed char GetDistance(char cNew, char tListe[]) {
-    signed char iPositionNew = GetPosition(cNew, tListe);
-    if (iPositionNew == -1) {
-        // not found
-        return 0;
-    }
-
-    return iPositionNew - CURSOR_1;
-}
-
-static bool TesterEstDansListe(char c, char tListe[]) {
-    // char in the list ?
-    return GetPosition(c, tListe) != -1;
-}
-
-static void SmartRotation(char c, char tListe[]) {
-    signed char i = GetDistance(c, tListe);
-    if (i == 0) return;
-
-    // rotate in the shorter way
-    if (i < 0) {
-        rotate_left(tListe);
-        return;
-    }
-
-    if (i > 0) {
-        rotate_right(tListe);
-        return;
-    }
-}
-
-static void update_list(char cNouveau, char tListe[]) {
-    signed char iDistance = GetDistance(cNouveau, tListe);
-    if (iDistance != 0) {
-        // the new char is in the list : rotation
-        SmartRotation(cNouveau, tListe);
-    }
-}
-
-static void draw_arc_sector_16(uint8_t x, uint8_t y, uint8_t radius, int position, bool color) {
-    unsigned int s = 1;
-    s              = s << (position / 2);
-
-    if (position % 4 == 0 || position % 4 == 3) {
-        draw_arc_sector(x, y, radius, s, 1, color);
-    } else {
-        draw_arc_sector(x, y, radius, s, 2, color);
-    }
-}
-
-static void render_set(uint8_t x, uint8_t y, uint8_t r, int p, bool color) {
-    // 2 pixels arc sector
-    draw_arc_sector_16(x, y, r, p, color);
-    draw_arc_sector_16(x, y, r - 1, p, color);
-}
-
-static void draw_letter_circle(char t[], char tRef[], char ct, uint8_t x, uint8_t y, uint8_t r, bool invert) {
-    char c = t[CURSOR_1];
-
-    signed char p  = GetPosition(c, tRef);
-    signed char pt = GetPosition(ct, tRef);
-
-    if (!invert) {
-        draw_fill_circle(x, y, r, false);
-        draw_circle(x, y, r, false);
-        draw_circle(x, y, r - 1, false);
-        draw_circle(x, y, r - 2, false);
-        draw_circle(x, y, r - 4, true);
-        draw_circle(x, y, r - 5, true);
-    }
-
-    int pafter  = (pt + 1) % SIZE_ARRAY_1;
-    int pbefore = (pt + SIZE_ARRAY_1 - 1) % SIZE_ARRAY_1;
-    render_set(x, y, r, pt, true);
-    render_set(x, y, r, pafter, true);
-    render_set(x, y, r, pbefore, true);
-
-    pafter  = (pt + 2) % SIZE_ARRAY_1;
-    pbefore = (pt + SIZE_ARRAY_1 - 2) % SIZE_ARRAY_1;
-    render_set(x, y, r, pafter, true);
-    render_set(x, y, r, pbefore, true);
-
-    r -= 4;
-
-    pafter  = (p + 1) % SIZE_ARRAY_1;
-    pbefore = (p + SIZE_ARRAY_1 - 1) % SIZE_ARRAY_1;
-
-    render_set(x, y, r, p, false);
-    render_set(x, y, r, pafter, false);
-    render_set(x, y, r, pbefore, false);
-
-    draw_circle(x, y, r - 6, true);
-}
-
-static void draw_center_circle_frame(uint8_t x, uint8_t y, uint8_t r, uint8_t f) {
-    draw_fill_circle(x, y, r, 0);
-    draw_circle(x, y, r, 0);
-
-    if (f == 0) {
-        draw_circle(x, y, r, 1);
-    } else {
-        // animation
-        oled_write_raw_P_cursor(0, 11, raw_circle[f - 1], sizeof(raw_circle[f - 1]));
-    }
-}
-
-static void render_anim_center_circle(uint8_t x, uint8_t y, uint8_t r) {
-    if (anim_center_current_frame == ANIM_CENTER_FRAME_NUMBER) {
-        // last frame : no animation
-        return;
-    }
-
-    if (timer_elapsed(anim_center_timer) > ANIM_CENTER_FRAME_DURATION) {
-        anim_center_timer = timer_read();
-
-        draw_center_circle_frame(x, y, r, anim_center_current_frame);
-
-        anim_center_current_frame++;
-    }
-}
-
-static void write_char(char c) {
-    // write keylog char in the frame then offset to center
-    oled_set_cursor(2, 6);
-    oled_write_char(c, false);
-    move_block(12, 48, 6, 8, 2);
-}
-
-static void render_keylog(gui_state_t t) {
-    if (anim_keylog_current_frame != ANIM_KEYLOG_FRAME_NUMBER) {
-        if (timer_elapsed(anim_keylog_timer) > ANIM_KEYLOG_FRAME_DURATION) {
-            // update frame number
-            anim_keylog_timer = timer_read();
-            anim_keylog_current_frame++;
-        }
-
-        // clean frame
-        draw_rectangle_fill(7, 46, 21, 11, false);
-
-        // comb motion to merge current and previous
-        if (anim_keylog_current_frame < ANIM_KEYLOG_FRAME_NUMBER / 2) {
-            // expand the previous char
-            write_char(c_previous);
-            draw_glitch_comb(9, 6 * 8, 18, 8, anim_keylog_current_frame + 1, true);
-        } else {
-            // shrink the current char
-            write_char(c_last);
-            draw_glitch_comb(9, 6 * 8, 18, 8, ANIM_KEYLOG_FRAME_NUMBER - anim_keylog_current_frame, false);
-        }
-
-        return;
-    }
-
-    write_char(c_last);
-}
-
-void reset_ring(void) {
-    // need to open
-    anim_sleep_ring_timer        = timer_read();
-    current_sleep_ring_frame     = ANIM_SLEEP_RING_FRAME_NUMBER - 1;
-    sleep_ring_frame_destination = 0;
-}
-
-static void render_tv_circle(uint8_t x, uint8_t y, uint8_t r, uint8_t f) {
-    // raw image
-    if (f == 2 || f == 3) {
-        oled_write_raw_P_cursor(0, 12, raw_ring_sleep[f - 2], sizeof(raw_ring_sleep[f - 2]));
-        return;
-    }
-
-    // raw image
-    if (f == 5 || f == 6) {
-        oled_write_raw_P_cursor(0, 12, raw_ring_sleep[f - 3], sizeof(raw_ring_sleep[f - 3]));
-        return;
-    }
-
-    // other frames : lighter to draw than using raw image
-    switch (f) {
-        case 1:
-            draw_circle(x, y, r, 1);
-            break;
-
-        case 4:
-            drawline_hr(1, y, 12, 1);
-            drawline_hr(19, y, 12, 1);
-            drawline_vb(0, y - 1, 3, true);
-            drawline_vb(31, y - 1, 3, true);
-            break;
-
-        case 7:
-
-            oled_write_pixel(1, y, true);
-            oled_write_pixel(3, y, true);
-            oled_write_pixel(28, y, true);
-            oled_write_pixel(30, y, true);
-
-            drawline_vb(0, y - 12, 26, true);
-            drawline_vb(31, y - 12, 26, true);
-            break;
-
-        case 8:
-            drawline_vb(0, 88, 32, true);
-            drawline_vb(31, 88, 32, true);
-            break;
-    }
-}
-
-static void render_circle_white(void) {
-    // top
-    oled_write_raw_P_cursor(0, 5, raw_middle, sizeof(raw_middle));
-    drawline_hr(5, 39, 25, 1);
-
-    // clean center
-    draw_rectangle_fill(0, 80, 32, 40, false);
-
-    // bottom
-    drawline_vb(0, 80, 8, 1);
-    drawline_vb(31, 80, 8, 1);
-    oled_write_pixel(1, 80, true);
-    oled_write_pixel(30, 80, true);
-
-    oled_write_raw_P_cursor(0, 15, raw_bottom, sizeof(raw_bottom));
-}
-
-static void render_ring_clean_close(void) {
-    render_circle_white();
-    drawline_vb(0, 88, 32, true);
-    drawline_vb(31, 88, 32, true);
-}
-
-static void render_glitch_square(void) {
-    if (timer_elapsed(anim_ring_idle_timer) > 60) {
-        anim_ring_idle_timer = timer_read();
-
-        render_ring_clean_close();
-
-        uint8_t size = 0;
-        for (uint8_t i = 0; i < 4; i++) {
-            size = 4 + (fastrand() % 6);
-            draw_rectangle_fill(3 + (fastrand() % 19), 85 + (fastrand() % 20), size, size, true);
-
-            size = (fastrand() % 6);
-            draw_rectangle_fill(3 + (fastrand() % 19), 100 + (fastrand() % 20), size, size, true);
-        }
-    }
-}
-
-static void render_ring_idle(void) {
-    uint8_t glitch_prob = get_glitch_probability();
-    get_glitch_index(&glitch_ring_timer, &current_glitch_ring_time, &current_glitch_ring_index, 150, 350, glitch_prob, 2);
-
-    switch (current_glitch_ring_index) {
-        case 0:
-            // no glitch
-            render_ring_clean_close();
-            return;
-        case 1:
-            // square gliches
-            render_glitch_square();
-            return;
-    }
-}
-
-static void render_ring_sleep(void) {
-    if (current_sleep_ring_frame == sleep_ring_frame_destination) {
-        // no more animation needes : render the idle animation
-        render_ring_idle();
-        return;
-    }
-
-    // display wacking up / sleep animation
-    if (timer_elapsed(anim_sleep_ring_timer) > ANIM_SLEEP_RING_FRAME_DURATION) {
-        anim_sleep_ring_timer = timer_read();
-
-        // clean + new frame
-        render_circle_white();
-        render_tv_circle(15, 103, 11, current_sleep_ring_frame);
-
-        // update frame number
-        if (sleep_ring_frame_destination > current_sleep_ring_frame) {
-            current_sleep_ring_frame++;
-        } else {
-            current_sleep_ring_frame--;
-        }
-    }
-}
-
-static void render_circle_middle(void) {
-    // clean
-    render_circle_white();
-
-    // center special animation
-    if (anim_center_current_frame < ANIM_CENTER_FRAME_NUMBER) {
-        render_anim_center_circle(15, 103, 15 - 4);
-        return;
-    }
-
-    // ring render
-    if (anim_center_current_frame == ANIM_CENTER_FRAME_NUMBER) {
-        draw_letter_circle(tListeTotal, tRefArc, c_target, 15, 103, 15, false);
-        draw_letter_circle(tListeTotal2, tRefArc2, c_target2, 15, 103, 15, true);
-    }
-}
-
-void render_circle(gui_state_t t) {
-    if (timer_elapsed(circle_timer) > CIRCLE_ANIM_FRAME_DURATION) {
-        // new frame
-        circle_timer = timer_read();
-
-        // shift rings
-        update_list(c_target, tListeTotal);
-        update_list(c_target2, tListeTotal2);
-
-        // waking up animation
-        if (t == _WAKINGUP) {
-            render_ring_sleep();
-            return;
-        }
-
-        // idle animation
-        if (t == _IDLE) {
-            sleep_ring_frame_destination = ANIM_SLEEP_RING_FRAME_NUMBER - 1;
-            render_ring_sleep();
-            return;
-        }
-
-        // render on display
-        render_circle_middle();
-        render_keylog(t);
-    }
-}
-
-void update_circle(uint16_t keycode) {
-    // special animation for special keys
-    if (keycode == KC_ESC || keycode == KC_SPACE || keycode == KC_ENTER) {
-        anim_center_timer         = timer_read();
-        anim_center_current_frame = 0;
-        return;
-    }
-
-    // cancel special animation on a new key
-    anim_center_current_frame = ANIM_CENTER_FRAME_NUMBER;
-
-    // out of scope key
-    if (keycode >= 60) {
-        return;
-    }
-
-    // keycode to char
-    char c = pgm_read_byte(&code_to_name[keycode]);
-
-    // stock previous char
-    c_previous = c_last;
-    c_last     = c;
-
-    // start keylog animation
-    anim_keylog_current_frame = 0;
-
-    // update target in ring #1 position
-    if (TesterEstDansListe(c, tListeTotal)) {
-        c_target = c;
-        return;
-    }
-
-    // update target in #2 position
-    if (TesterEstDansListe(c, tListeTotal2)) {
-        c_target2 = c;
-        return;
-    }
-}
diff --git a/keyboards/lily58/keymaps/druotoni/ring.h b/keyboards/lily58/keymaps/druotoni/ring.h
deleted file mode 100644
index 9ce4520e647..00000000000
--- a/keyboards/lily58/keymaps/druotoni/ring.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2021 Nicolas Druoton (druotoni)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define SIZE_ARRAY_1 16
-#define CURSOR_1 9
-
-void update_circle(uint16_t);
-void render_circle(gui_state_t t);
-void reset_ring(void);
diff --git a/keyboards/lily58/keymaps/druotoni/rules.mk b/keyboards/lily58/keymaps/druotoni/rules.mk
deleted file mode 100644
index b3182cb46af..00000000000
--- a/keyboards/lily58/keymaps/druotoni/rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-
-# Bootloader selection
-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
-LTO_ENABLE = yes
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE  = no
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./burst.c \
-        ./navi_logo.c \
-        ./gui_state.c \
-        ./fast_random.c \
-        ./layer_frame.c \
-        ./ring.c \
-        ./boot.c \
-        ./draw_helper.c \
-
diff --git a/keyboards/lily58/keymaps/gaston/config.h b/keyboards/lily58/keymaps/gaston/config.h
deleted file mode 100644
index f4f3140d513..00000000000
--- a/keyboards/lily58/keymaps/gaston/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2012 Jun Wako <wakojun@gmail.com>
- * Copyright 2015 Jack Humbert
- * Copyright 2021 Gaston Jorquera
- *
- * 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 is the c configuration file for the keymap. */
-
-#pragma once
-
-#define MASTER_LEFT
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 150 /* ms */
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
diff --git a/keyboards/lily58/keymaps/gaston/keymap.c b/keyboards/lily58/keymaps/gaston/keymap.c
deleted file mode 100644
index c98ec4254bd..00000000000
--- a/keyboards/lily58/keymaps/gaston/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2021 Gaston Jorquera
- *
- * 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 is the keymap configuration. */
-
-#include QMK_KEYBOARD_H
-
-enum layer_number {
-    _QWERTY = 0,
-    _LOWER,
-    _MOUSE,
-};
-
-#define EN_LOWER LT(_LOWER, KC_SPC)
-#define EN_MOUSE MO(_MOUSE)
-#define MT_CESC LCTL_T(KC_ESC)
-
-/* See the readme.md file for an ASCII representation of this keymap. */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT(
-    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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-    MT_CESC, 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,    EN_MOUSE,KC_EQL,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-                               KC_RALT, KC_LALT, KC_LGUI, EN_LOWER,EN_LOWER, KC_LBRC, KC_RBRC, KC_BSLS
-),
-
-[_LOWER] = LAYOUT(
-    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_TRNS, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  XXXXXXX, KC_F12,
-    KC_TRNS, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,
-    KC_TRNS, XXXXXXX, XXXXXXX, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX,
-                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-[_MOUSE] = LAYOUT(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, KC_ACL0, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, XXXXXXX,
-                               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-)
-
-};
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case MT_CESC:
-            // Immediately select the hold action when another key is pressed.
-            return true;
-        default:
-            // Do not select the hold action when another key is pressed.
-            return false;
-    }
-}
diff --git a/keyboards/lily58/keymaps/gaston/readme.md b/keyboards/lily58/keymaps/gaston/readme.md
deleted file mode 100644
index cf8b13786e3..00000000000
--- a/keyboards/lily58/keymaps/gaston/readme.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Gaston's Lily58 Keymap
-
-A simple three layers keymap to improve typing performance by reducing
-cognitive load.
-
-The main characteristics of this keymap are:
-
-* The QWERTY layer tries to be as normal as possible, without having to use
-  modifiers.
-  * The main thumb buttons are spaces when tapped and enable the LOWER layer
-    when held.
-  * Vim style arrow keys.
-  * Left Control is ESC when tapped.
-  * Left and right ALT in case you need different behaviors. (For example, the
-    default Option and readline's Alt behavior in macOS.)
-* The LOWER layer has mostly meta keys.
-* The MOUSE layer controls the mouse.
-
-## QWERTY Layer
-
-```plain
-,-----------------------------------------.                    ,-----------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  | BSPC |
-|------+------+------+------+------+------|                    |------+------+------+------+------+------|
-| TAB  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  -   |
-|------+------+------+------+------+------|                    |------+------+------+------+------+------|
-|C_ESC |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
-|------+------+------+------+------+------| MOUSE |    |    =  |------+------+------+------+------+------|
-| LSFT |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  | ENT  |
-`-----------------------------------------/  LT   /     \  LT   \----------------------------------------'
-                  | RALT | LALT | LGUI | / LOWER /       \ LOWER \  |   [  |   ]  |   \  |
-                  |      |      |      |/  SPC  /         \  SPC  \ |      |      |      |
-                  `----------------------------'           '-----------------------------'
-```
-
-## LOWER Layer
-
-```plain
-,-----------------------------------------.                    ,-----------------------------------------.
-| TRNS |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
-|------+------+------+------+------+------|                    |------+------+------+------+------+------|
-| TRNS |      | MUTE | VOLD | VOLU |      |                    | HOME | PGDN | PGUP | END  |      | F12  |
-|------+------+------+------+------+------|                    |------+------+------+------+------+------|
-| TRNS |      | MPRV | MPLY | MNXT |      |-------.    ,-------| LEFT | DOWN | UP   | RGHT |      |      |
-|------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
-| TRNS |      |      | BRID | BRIU |      |-------|    |-------|      | INS  | DEL  |      |      |      |
-`-----------------------------------------/       /     \       \----------------------------------------'
-                  | TRNS | TRNS | TRNS | / TRNS  /       \ TRNS  \  |      |      |      |
-                  |      |      |      |/       /         \       \ |      |      |      |
-                  `----------------------------'           '-----------------------------'
-```
-
-## MOUSE Layer
-
-```plain
-,-----------------------------------------.                    ,-----------------------------------------.
-|      |      |      |      |      |      |                    |      |      |      |      |      |      |
-|------+------+------+------+------+------|                    |------+------+------+------+------+------|
-|      |      |      |      |      |      |                    | BTN1 | BTN2 |      |      | ACL0 |      |
-|------+------+------+------+------+------|                    |------+------+------+------+------+------|
-|      |      |      |      |      |      |-------.    ,-------| MS_L | MS_D | MS_U | MS_R | ACL1 |      |
-|------+------+------+------+------+------| TRNS  |    |       |------+------+------+------+------+------|
-|      |      |      |      |      |      |-------|    |-------| WH_L | WH_D | WH_U | WH_R | ACL2 |      |
-`-----------------------------------------/       /     \       \----------------------------------------'
-                  |      |      |      | /       /       \       \  |      |      |      |
-                  |      |      |      |/       /         \       \ |      |      |      |
-                  `----------------------------'           '-----------------------------'
-```
diff --git a/keyboards/lily58/keymaps/gaston/rules.mk b/keyboards/lily58/keymaps/gaston/rules.mk
deleted file mode 100644
index 4d566ddb79f..00000000000
--- a/keyboards/lily58/keymaps/gaston/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-RGBLIGHT_ENABLE = no
-OLED_ENABLE = no
-
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
diff --git a/keyboards/lily58/keymaps/gshmu/config.h b/keyboards/lily58/keymaps/gshmu/config.h
deleted file mode 100644
index 84a79412dac..00000000000
--- a/keyboards/lily58/keymaps/gshmu/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 gshmu
-*
-* 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_TERM 200
-#define QUICK_TAP_TERM 0
-#define PERMISSIVE_HOLD
-
-#define DYNAMIC_TAPPING_TERM_INCREMENT 10
diff --git a/keyboards/lily58/keymaps/gshmu/keymap.c b/keyboards/lily58/keymaps/gshmu/keymap.c
deleted file mode 100644
index ce4b539c078..00000000000
--- a/keyboards/lily58/keymaps/gshmu/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Copyright 2022 gshmu
-*
-* 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_number {
-  _QWERTY = 0,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  ~   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | ⌥(⇥) |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  =   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | ⌥(⎋) |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * | ⇧(←) |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  | ⇧(→) |
- * `-----------------------------------------/      /     \      \-----------------------------------------'
- *                  | ⌃(⌦) | ⇧(↑) | L2(␣)|  / ⌘(↵) /       \ ⌘(⌫) \  |L1(␣))| ⇧(↓) | ⌥(⌦) |
- *                  |      |      |      |/       /         \      \ |      |      |      |
- *                  `-------------------''-------'           '------''--------------------'
- */
-
- [_QWERTY] = LAYOUT(
-  KC_GRV,          KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  LALT_T(KC_TAB),  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
-  LALT_T(KC_ESC),  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  LSFT_T(KC_LEFT), KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_RGHT),
-  LCTL_T(KC_DEL),  LSFT_T(KC_UP),  LT(_RAISE, KC_SPC),  LGUI_T(KC_ENTER),  RGUI_T(KC_BSPC),  LT(_LOWER, KC_SPC),  RSFT_T(KC_DOWN), RALT_T(KC_DEL)
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
- * |------+------+------+------+------+------|   \   |    |   |   |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      | L3(␣)| /       /       \      \  |      |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `-------------------''-------'           '------''--------------------'
- */
-[_LOWER] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_BSLS, KC_PIPE, _______, _______, _______, _______, _______, _______,
-                          _______, _______, LT(_ADJUST, KC_SPC), _______, _______,  _______, _______, _______
-),
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F1  |  F2  |  F3  |  F4  |  F5  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |  F6  |  F7  |  F8  |  F9  |  F10 |                    |  F6  |  F7  |  F8  |  F9  |  F10 |  \   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |  F11 |  F12 |  F13 |  F14 |  F15 |-------.    ,-------|  F11 |  F12 |  F13 |  F14 |  F15 |      |
- * |------+------+------+------+------+------|   \   |    |   |   |------+------+------+------+------+------|
- * |      | AG(Z)| CA(A)|Cmd(C)| SG(V)| SG(B)|-------|    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |      | /       /       \      \  |L3(␣))|      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `-------------------''-------'           '------''--------------------'
- */
-
-[_RAISE] = LAYOUT(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,
-  _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,                      KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  _______,
-  _______, LAG(KC_Z), C(G(KC_A)), LGUI(KC_C), LSG(KC_V), LSG(KC_B),  KC_BSLS, KC_PIPE,  _______, _______, _______, _______, _______, _______,
-                             _______, _______, _______,  _______, _______,  LT(_ADJUST, KC_SPC), _______, _______
-),
-
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * | Home |      |      |      |      |      |-------|    |-------|      |      |      |      |      |  End |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      | PGUP |      | /       /       \      \  |      | PGDN |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-  [_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______,
-  DT_PRNT, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______,
-  KC_HOME, _______, _______, _______, _______, _______,  DT_UP,   DT_DOWN,  _______, _______, _______, _______, _______, KC_END,
-                             _______, KC_PGUP, _______,  _______, _______,  _______, KC_PGDN, _______
-  )
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-  }
-  return true;
-}
diff --git a/keyboards/lily58/keymaps/gshmu/rules.mk b/keyboards/lily58/keymaps/gshmu/rules.mk
deleted file mode 100644
index 401abfb4cf6..00000000000
--- a/keyboards/lily58/keymaps/gshmu/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-VIA_ENABLE = yes
-OLED_ENABLE = no
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-DYNAMIC_TAPPING_TERM_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/jhelvy/README.md b/keyboards/lily58/keymaps/jhelvy/README.md
deleted file mode 100644
index e0b68f919e1..00000000000
--- a/keyboards/lily58/keymaps/jhelvy/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# jhelvy Keymap for [Lily58 Pro](https://github.com/kata0510/Lily58)
-
-## Keymap
-
-This is a custom keymap with the following layout:
-
-<img src="https://github.com/jhelvy/qmkJsonConverter/raw/master/keymaps/lily58_rev1_jhelvy.png" width="800">
diff --git a/keyboards/lily58/keymaps/jhelvy/config.h b/keyboards/lily58/keymaps/jhelvy/config.h
deleted file mode 100644
index 08ddcd4e32b..00000000000
--- a/keyboards/lily58/keymaps/jhelvy/config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#define AUTO_SHIFT_TIMEOUT 150
-
-// Underglow
-/*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_SLEEP
-*/
diff --git a/keyboards/lily58/keymaps/jhelvy/keymap.c b/keyboards/lily58/keymaps/jhelvy/keymap.c
deleted file mode 100644
index ae44d372c6a..00000000000
--- a/keyboards/lily58/keymaps/jhelvy/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-
-extern uint8_t is_master;
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _UPPER 2
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  UPPER,
-};
-
-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,    KC_EQL,
-     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_BSPC, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,  KC_ENT,
-     SC_LSPO,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  SC_RSPC,
-                             LALT(KC_A), KC_LCTL,KC_LGUI,  MO(1),   KC_SPC,   MO(2),   KC_PGDN,     KC_NO),
-
-[_LOWER] = LAYOUT(
-               KC_ESC,LGUI(KC_1),LGUI(KC_2),LGUI(KC_3),LGUI(KC_4),LGUI(KC_5),                  KC_SCLN,LSFT(KC_BSLS),   KC_NO,LCTL(KC_9),LCTL(KC_0),    KC_F12,
-LCTL(KC_TAB),LGUI(KC_Q),LGUI(KC_W),  KC_ESC,LGUI(KC_R),LGUI(KC_T),               LCTL(KC_Y),LGUI(KC_LEFT),   KC_UP,LGUI(KC_RGHT),LSFT(KC_GRV),     KC_F11,
-LGUI(KC_BSPC),MO(2),LGUI(KC_S),LGUI(KC_C),LGUI(KC_V),LGUI(KC_X),                   KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT,     KC_GRV,LSFT(KC_SCLN),
-      KC_F15,LGUI(KC_A),LGUI(KC_D),  KC_F13,LGUI(KC_Z),LGUI(KC_Y),LSFT(KC_LBRC),LSFT(KC_RBRC),KC_BSPC,LGUI(KC_F), SGUI(KC_G),LGUI(KC_G),  KC_BSLS,   KC_F23,
-                                  KC_NO,   KC_NO,KC_NO,KC_TRNS,    KC_NO, KC_RGUI,   KC_PGUP,     KC_NO),
-
-[_UPPER] = LAYOUT(
-            KC_VOLU,LGUI(LALT(KC_1)),LGUI(LALT(KC_2)),   KC_F3,   KC_F4,   KC_F5,                    KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,LSFT(KC_EQL),
-    KC_VOLD,  KC_NO,  KC_NO,   KC_NO,SGUI(KC_R),  KC_F14,               SGUI(KC_K),SGUI(KC_LEFT),LSFT(KC_UP),SGUI(KC_RGHT),  KC_F18,LSFT(KC_MINS),
-      KC_MUTE,KC_TRNS,  KC_NO, KC_LGUI,  KC_TAB,  KC_F21,                    KC_NO,LSFT(KC_LEFT),LSFT(KC_DOWN),LSFT(KC_RGHT),     KC_F20,  KC_F16,
-     AS_TOGG, KC_NO,  KC_NO,   KC_NO,  KC_F22,LCTL(KC_U),LGUI(KC_LBRC),LGUI(KC_RBRC),LGUI(KC_N),   KC_NO,LALT(LSFT(KC_LEFT)),LALT(LSFT(KC_RIGHT)),   KC_F17,   KC_F19,
-                                  KC_NO,   KC_NO,KC_NO,  KC_NO,    KC_NO, KC_TRNS,     KC_NO,     KC_NO)
-
-};
diff --git a/keyboards/lily58/keymaps/jhelvy/rules.mk b/keyboards/lily58/keymaps/jhelvy/rules.mk
deleted file mode 100644
index 817d445f455..00000000000
--- a/keyboards/lily58/keymaps/jhelvy/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-AUTO_SHIFT_ENABLE = yes     # Autoshift by holding down a key
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/lily58/keymaps/mikefightsbears/config.h b/keyboards/lily58/keymaps/mikefightsbears/config.h
deleted file mode 100644
index 084b95d52f8..00000000000
--- a/keyboards/lily58/keymaps/mikefightsbears/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-// Underglow
-/*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_SLEEP
-*/
diff --git a/keyboards/lily58/keymaps/mikefightsbears/keymap.c b/keyboards/lily58/keymaps/mikefightsbears/keymap.c
deleted file mode 100644
index ce9aa64e35a..00000000000
--- a/keyboards/lily58/keymaps/mikefightsbears/keymap.c
+++ /dev/null
@@ -1,211 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-enum layer_names {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  ADJUST,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | ESC/`|   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  | ESC  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | 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|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LGui | LAlt |LOWER | /Space  /       \Enter \  |RAISE |   -  |  =   |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
- [_QWERTY] = LAYOUT(
-  QK_GESC,  KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_BSLS,
-  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_LGUI, KC_LALT, LOWER, KC_SPC,   KC_ENT,  RAISE,   KC_MINS, KC_EQL
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | DEL  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |      |      |  up  |      |      |                    |      |      | pgup |      | PSCR | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      | left |  dn  | rght |      |-------.    ,-------|      | home | pgdn | end  |      | INS  |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      | mute | prev | next | play |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |      | /       /       \      \  |      | vol- | vol+ |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_GRV,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_DEL,
-  KC_F1,   _______, _______, KC_UP,   _______, _______,                   _______, _______, KC_PGUP, _______, KC_PSCR, KC_F12,
-  _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______,                   _______, KC_HOME, KC_PGDN, KC_END,  _______, KC_INS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, _______,
-                             _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU
-),
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | DEL  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |      |      |  up  |      |      |                    |      |      | pgup |      | PSCR | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      | left |  dn  | rght |      |-------.    ,-------|      | home | pgdn | end  |      | INS  |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      | mute | prev | next | play |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |      | /       /       \      \  |      | vol- | vol+ |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_RAISE] = LAYOUT(
-  KC_GRV,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_DEL,
-  KC_F1,   _______, _______, KC_UP,   _______, _______,                   _______, _______, KC_PGUP, _______, KC_PSCR, KC_F12,
-  _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______,                   _______, KC_HOME, KC_PGDN, KC_END,  _______, KC_INS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, _______,
-                             _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU
-),
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |      | /       /       \      \  |      |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-  [_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
-                             _______, _______, _______, _______, _______,  _______, _______, _______
-  )
-};
-
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    oled_write_ln(read_keylog(), false);
-    oled_write_ln(read_keylogs(), false);
-    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
-    //oled_write_ln(read_host_led_state(), false);
-    //oled_write_ln(read_timelog(), false);
-  } else {
-    oled_write(read_logo(), false);
-  }
-    return false;
-}
-#endif // OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-  }
-  return true;
-}
diff --git a/keyboards/lily58/keymaps/mikefightsbears/rules.mk b/keyboards/lily58/keymaps/mikefightsbears/rules.mk
deleted file mode 100644
index f43c8e20015..00000000000
--- a/keyboards/lily58/keymaps/mikefightsbears/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-OLED_ENABLE= yes     # OLED display
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/lily58/keymaps/muuko/config.h b/keyboards/lily58/keymaps/muuko/config.h
deleted file mode 100644
index 29a0801d2e8..00000000000
--- a/keyboards/lily58/keymaps/muuko/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-#define EE_HANDS
-
-#define OLED_TIMEOUT 300000
-
-#define NO_MUSIC_MODE
-
-#define PERMISSIVE_HOLD
-
-#ifdef TAPPING_TERM
-#undef TAPPING_TERM
-#endif
-#define TAPPING_TERM 120
-
-#define COMBO_TERM 20
diff --git a/keyboards/lily58/keymaps/muuko/keymap.c b/keyboards/lily58/keymaps/muuko/keymap.c
deleted file mode 100644
index b5cc97ee389..00000000000
--- a/keyboards/lily58/keymaps/muuko/keymap.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright 2020 @muuko
- *
- * 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 <stdio.h>
-#include <string.h>
-
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 20
-#define TAP_FRAMES 2
-#define TAP_SPEED 40
-#define ANIM_FRAME_DURATION 200
-#define ANIM_SIZE 512
-
-char wpm[16];
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-static long int oled_timeout = 300000;
-
-enum combos { ESCAPE_COMBO, DELETE_COMBO };
-const uint16_t PROGMEM escape_combo[] = { KC_GRV, KC_1, COMBO_END };
-const uint16_t PROGMEM delete_combo[] = { KC_DOT, KC_SLSH, COMBO_END };
-combo_t key_combos[] = {
-    [ESCAPE_COMBO] = COMBO(escape_combo, KC_ESC),
-    [DELETE_COMBO] = COMBO(delete_combo, KC_DEL)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_GRV,  KC_1,    KC_2,          KC_3,   KC_4,   KC_5,                   KC_6,   KC_7,    KC_8,    KC_9,   KC_0,    LCA_T(KC_MINS),
-        KC_TAB,  KC_Q,    KC_W,          KC_E,   KC_R,   KC_T,                   KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    RGUI_T(KC_EQL),
-        KC_LCTL, KC_A,    KC_S,          KC_D,   KC_F,   KC_G,                   KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN, RCTL_T(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, RSFT_T(KC_BSLS),
-        KC_LGUI, KC_LALT, LT(1, KC_DEL), KC_SPC,                                 KC_ENT, KC_BSPC, MO(1),   TG(1)
-    ),
-    [1] = 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_TAB,  KC_MNXT, KC_HOME, KC_UP,   KC_PGUP, KC_VOLU,                   KC_PMNS, KC_P7,   KC_P8,   KC_P9,  KC_PSLS,        LCTL(KC_RGUI),
-        KC_LCTL, KC_MPLY, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD,                   KC_PPLS, KC_P4,   KC_P5,   KC_P6,  KC_PAST,        RCTL_T(KC_PEQL),
-        KC_LSFT, KC_MPRV, KC_END,  KC_DEL,  KC_PGDN, KC_MUTE, KC_LPRN, KC_RPRN, KC_P0,   KC_P1,   KC_P2,   KC_P3,  C_S_T(KC_PDOT), KC_RSFT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	if (!is_keyboard_master()) return OLED_ROTATION_180;
-    else return rotation;
-}
-
-static void render_status(void) {
-    oled_write_P(PSTR("    layer "), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_P(PSTR("     0"), false);
-            break;
-        case 1:
-            oled_write_P(PSTR("     1"), false);
-            break;
-        default:
-            oled_write_P(PSTR("     ?"), false);
-            break;
-    }
-
-    oled_write_P(PSTR("\n\n    "), false);
-    sprintf(wpm, "%03d", get_current_wpm());
-    oled_write(wpm, false);
-    oled_write_P(PSTR("      wpm"), false);
-}
-
-static void render_anim(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
-            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
-            32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-    };
-    static const char PROGMEM prep[][ANIM_SIZE] = {
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-    };
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
-            95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
-            1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
-            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-    };
-
-    void animation_phase(void) {
-        if (get_current_wpm() <= IDLE_SPEED) {
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-
-            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-            oled_write_raw_P(prep[0], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() >= TAP_SPEED) {
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-
-            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
-        }
-    }
-
-    sprintf(wpm, "%03d", get_current_wpm());
-
-    if (strcmp(wpm, "000") != 0) {
-        anim_sleep = timer_read32();
-    } else {
-        if (timer_elapsed32(anim_sleep) > oled_timeout) {
-            anim_sleep = 0;
-        }
-    }
-
-    if (timer_elapsed32(anim_sleep) > oled_timeout) {
-        oled_off();
-    } else {
-        oled_on();
-
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-
-            animation_phase();
-        }
-    }
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status();
-    } else {
-        render_anim();
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/lily58/keymaps/muuko/rules.mk b/keyboards/lily58/keymaps/muuko/rules.mk
deleted file mode 100644
index 004fc910f65..00000000000
--- a/keyboards/lily58/keymaps/muuko/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-COMBO_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/niolang/config.h b/keyboards/lily58/keymaps/niolang/config.h
deleted file mode 100644
index dedefc2fcf1..00000000000
--- a/keyboards/lily58/keymaps/niolang/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-/* RGB light */
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 5 // number of steps to cycle through the hue by
-#    define RGBLIGHT_SAT_STEP 10 // number of steps to increment the saturation by
-#    define RGBLIGHT_VAL_STEP 10 // number of steps to increment the brightness by
-#    define RGBLIGHT_SLEEP // the RGB lighting will be switched off when the host goes to sleep
-#	 define RGBLIGHT_LAYERS //
-#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#endif
diff --git a/keyboards/lily58/keymaps/niolang/keymap.c b/keyboards/lily58/keymaps/niolang/keymap.c
deleted file mode 100644
index 9a4b03668a1..00000000000
--- a/keyboards/lily58/keymaps/niolang/keymap.c
+++ /dev/null
@@ -1,359 +0,0 @@
- /* Copyright 2017 F_YUUCHI
-  * Copyright 2020 Drashna Jaelre <@drashna>
-  * Copyright 2020 Ben Roesner (keycapsss.com)
-  * Copyright 2022 Niolang
-  *
-  * 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_bepo.h"
-
-
-enum layers {
-    _BEPO,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-//Modification of cut/copy/paste by their combination, works in more cases
-#define KC_COPY LCTL(KC_H)
-#define KC_CUT LCTL(KC_C)
-#define KC_PSTE2 LCTL(KC_U)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* BÉPO
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |ESC/VM|  " 1 | « 2  | » 3  | ( 4  | ) 5  |                    | @ 6  | + 7  | - 8  | / 9  | * 0  |  W   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |  B | |   É  | P &  | O œ  |   È  |                    |  !^  |   V  |   D  |   L  |   J  |  Z   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |LCTRL |   A  |   Uù |  I¨  |  E€  | ,;'  |-------.    ,-------|  C/ç |  Tᵉ  |   S  |   R  |   N  |  M   |
- * |------+------+------+------+------+------|CtPtScn|    |SUPPR  |------+------+------+------+------+------|
- * |LShift|  À \ | Y {  | X }  | .:…  | K ~  |-------|    |-------|  ’?  |   Q  |   G  |   H  |   F  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| AltGr|
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
- [_BEPO] = LAYOUT(
-  MT(KC_CAPS, KC_ESC), BP_DQUO, BP_LDAQ, BP_RDAQ, BP_LPRN, BP_RPRN,                                 BP_AT,    BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_W,
-  KC_TAB,              BP_B,    BP_EACU, BP_P,    BP_O,    BP_EGRV,                                 BP_DCIR,  BP_V,    BP_D,    BP_L,    BP_J,    BP_Z,
-  KC_LCTL,             BP_A,    BP_U,    BP_I,    BP_E,    BP_COMM,                        MT(BP_CCED, BP_C), BP_T,    BP_S,    BP_R,    BP_N,    BP_M,
-  KC_LSFT,             BP_AGRV, BP_Y,    BP_X,  BP_DOT,    BP_K, LSFT(KC_PSCR),     KC_DEL,  BP_QUOT,  BP_Q,    BP_G,    BP_H,    BP_F,    KC_RSFT,
-                                        KC_LALT, KC_LGUI, LOWER, KC_SPC,                    KC_ENT,  RAISE, KC_BSPC, KC_RALT
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |   +  |   7  |   8  |   9  |   =  |  #   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |                    |   -  |   4  |   5  |   6  |   %  |  ^   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |LCTRL |  c+c |  c+v |  Up  | home | end  |-------.    ,-------|   /  |   1  |   2  |   3  |   <  |  >   |
- * |------+------+------+------+------+------|TGHi/Lo|    |SUPPR  |------+------+------+------+------+------|
- * |LShift|  c+x | Left | Down | Right| pscr |-------|    |-------|   *  |   0  |   .  |   ,  |   (  |   )  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| AltGr|
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,                       KC_PPLS, KC_P7, KC_P8,   KC_P9,   BP_EQL,  BP_HASH,
-  KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,                      KC_PMNS, KC_P4, KC_P5,   KC_P6,   BP_PERC, BP_RABK, 
-  _______, KC_COPY, KC_PSTE2, KC_UP,   KC_HOME, KC_END,                      KC_PSLS, KC_P1, KC_P2,   KC_P3,   BP_LABK, BP_RABK,
-  _______, KC_CUT,  KC_LEFT,  KC_DOWN, KC_RGHT, KC_PSCR,TG(_RAISE), _______, KC_PAST, KC_P0, KC_PDOT, KC_PCMM, BP_LPRN, BP_RPRN,
-                                _______, _______, _______, _______, _______,  _______, _______, _______
-),
-[_RAISE] = LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,                       KC_PPLS, KC_P7, KC_P8,   KC_P9,   BP_EQL,  BP_HASH,
-  KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,                      KC_PMNS, KC_P4, KC_P5,   KC_P6,   BP_PERC, BP_CIRC, 
-  _______, KC_COPY, KC_PSTE2, KC_UP,   KC_HOME, KC_END,                      KC_PSLS, KC_P1, KC_P2,   KC_P3,   BP_LABK, BP_RABK,
-  _______, KC_CUT,  KC_LEFT,  KC_DOWN, KC_RGHT, KC_PSCR,TG(_LOWER), _______, KC_PAST, KC_P0, KC_PDOT, KC_PCMM, BP_LPRN, BP_RPRN,
-                                _______, _______, _______, _______, _______,  _______, _______, _______
-),
-
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    | ScLck| Ins  | Pause|      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    | NUML |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |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,                   KC_SCRL, KC_INS,  KC_PAUSE, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_NUM,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
-                             _______, _______, _______, _______, _______,  _______, _______, _______
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-    return state;
-}
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    } else {
-        return OLED_ROTATION_0;
-    }
-}
-
-void render_lily58_logo(void) {
-    static const char PROGMEM lily58_logo[] = {
-    // 'logo', 128x32px
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x40, 0x40, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00,
-    0x80, 0xe0, 0x70, 0x3c, 0x0e, 0x06, 0x0e, 0x3c, 0x70, 0xe0, 0x80, 0x00, 0x00, 0xc0, 0xc0, 0x00,
-    0xc0, 0xc0, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x80,
-    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 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, 0x3f, 0xfc, 0xc0, 0x80, 0x80, 0x80, 0x81, 0x83, 0x83,
-    0x07, 0x07, 0x0c, 0x18, 0x70, 0xe0, 0x80, 0x00, 0x00, 0x01, 0xff, 0xfc, 0x80, 0xb6, 0xb6, 0x80,
-    0xb0, 0xb0, 0x00, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf1, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0xff, 0x00, 0x00, 0x00, 0x30, 0xf0, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf0,
-    0x30, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xe1, 0x71, 0x71, 0xf1, 0xf1, 0xe1, 0xc1, 0x81, 0x00, 0x00,
-    0x00, 0x00, 0x0c, 0x3f, 0xff, 0xf3, 0xe1, 0xc1, 0xc1, 0x81, 0x81, 0xc3, 0xff, 0x7f, 0x1c, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x20, 0x70, 0x78, 0xdc, 0xcc, 0x86, 0x06, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x03, 0x02, 0x06, 0x84, 0xe1, 0xfb, 0x38, 0x1c, 0x0c, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x03, 0x03, 0x06, 0x86, 0xcc, 0xdc, 0x78, 0x70, 0x20, 0x00, 0xff, 0xff, 0x80, 0x80,
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x7e, 0xf8, 0xe0, 0xf0, 0x7e, 0x1f, 0x03, 0x00,
-    0x00, 0x00, 0x00, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0xe1, 0xff, 0x7f, 0x3f, 0x00,
-    0x00, 0x00, 0x3e, 0xff, 0xff, 0xc1, 0xc0, 0x80, 0x81, 0x81, 0xc3, 0xc3, 0xff, 0xfe, 0x3c, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x06,
-    0x06, 0x02, 0x03, 0x01, 0x01, 0x00, 0x01, 0x01, 0x03, 0x02, 0x06, 0x06, 0x04, 0x04, 0x04, 0x04,
-    0x06, 0x06, 0x06, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x01, 0x01, 0x01, 0x00, 0x00, 0x60, 0x60, 0x70, 0x38, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00
-};
-    oled_write_raw_P(lily58_logo, sizeof(lily58_logo));
-}
-
-
-#    define KEYLOG_LEN 6
-char     keylog_str[KEYLOG_LEN] = {};
-uint8_t  keylogs_str_idx        = 0;
-uint16_t log_timer              = 0;
-
-const char code_to_name[60] = {
-    ' ', ' ', ' ', ' ', 'a', 'k', 'x', 'i', 'p', 'e',
-    ',', 'c', 'd', 't', 's', 'r', 'q', ' ', 'l', 'j',
-    'b', 'o', 'u', 'e', 'v', '.', 'e', 'y', '^', 'a',
-    ' ', ' ', ' ', '(', ')', '@', '+', '-', '/', '*',
-    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
-    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
-
-void add_keylog(uint16_t keycode) {
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-        keycode = keycode & 0xFF;
-    }
-
-    for (uint8_t i = KEYLOG_LEN - 1; i > 0; i--) {
-        keylog_str[i] = keylog_str[i - 1];
-    }
-    if (keycode < 60) {
-        keylog_str[0] = code_to_name[keycode];
-    }
-    keylog_str[KEYLOG_LEN - 1] = 0;
-
-    log_timer = timer_read();
-}
-
-void update_log(void) {
-    if (timer_elapsed(log_timer) > 750) {
-        add_keylog(0);
-    }
-}
-
-void render_keylogger_status(void) {
-    oled_write_P(PSTR("KLogr"), false);
-    oled_write(keylog_str, false);
-}
-
-void render_default_layer_state(void) {
-    oled_write_P(PSTR("Layer"), false);
-    oled_write_P(PSTR(" "), false);
-    switch (get_highest_layer(layer_state)) {
-        case _BEPO:
-            oled_write_P(PSTR("BEPO"), false);
-            break;
-        case _LOWER:
-            oled_write_ln_P(PSTR("LOW"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("HIGH"), false);
-            break;
-        case _ADJUST:
-            oled_write_ln_P(PSTR("ADJ"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undefined"), false);
-    }
-}
-
-void render_keylock_status(led_t led_state) {
-    oled_write_ln_P(PSTR("Lock"), false);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(PSTR("N"), led_state.num_lock);
-    oled_write_P(PSTR("C"), led_state.caps_lock);
-    oled_write_ln_P(PSTR("S"), led_state.scroll_lock);
-}
-
-void render_mod_status(uint8_t modifiers) {
-    oled_write_ln_P(PSTR("Mods"), false);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
-    oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL));
-    oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT));
-    oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI));
-}
-
-void render_status_main(void) {
-    // Show keyboard layout
-    render_default_layer_state();
-    // Add a empty line
-    oled_write_P(PSTR("-----"), false);
-    // Show host keyboard led status
-    render_keylock_status(host_keyboard_led_state());
-    // Add a empty line
-    oled_write_P(PSTR("-----"), false);
-    // Show modifier status
-    render_mod_status(get_mods());
-    // Add a empty line
-    oled_write_P(PSTR("-----"), false);
-    render_keylogger_status();
-}
-
-bool oled_task_user(void) {
-  update_log();
-  if (is_keyboard_master()) {
-    render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-  } else {
-    render_lily58_logo();
-  }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        add_keylog(keycode);
-    }
-    //return true;
-    
-//intercepting hold/tap to change hold function
-	switch (keycode) {
-        case MT(KC_CAPS, KC_ESC):
-            if (!record->tap.count && record->event.pressed) {
-                tap_code(KC_CAPS); // Intercept hold function to send Caps Lock
-                return false;
-            }
-            return true;             // Return true for normal processing of tap keycode
-        case MT(BP_CCED, BP_C):
-            if (!record->tap.count && record->event.pressed) {
-                tap_code(BP_CCED); // Intercept hold function to send ç
-                return false;
-            }
-            return true;             // Return true for normal processing of tap keycode			
-    }
-    return true;
-}
-#endif // OLED_ENABLE
-
-
-// Rotary encoder related code
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { // Encoder on master side
-    if(IS_LAYER_ON(_RAISE)) { // on Raise layer
-      // Cursor control
-      if (clockwise) {
-          tap_code(KC_MNXT);
-      } else {
-          tap_code(KC_MPRV);
-      }
-    }
-    else {
-      if (clockwise) {
-          tap_code(KC_VOLD);
-      } else {
-          tap_code(KC_VOLU);
-      }
-    }
-  }
-  else if (index == 1) { // Encoder on slave side
-    if(IS_LAYER_ON(_LOWER)) { // on Lower layer
-      //
-      if (clockwise) {
-          tap_code(KC_RIGHT);
-      } else {
-          tap_code(KC_LEFT);
-      }
-    }
-    else {
-      if (clockwise) {
-          tap_code(KC_DOWN);
-      } else {
-          tap_code(KC_UP);
-      }
-    }
-  }
-    return false;
-}
-#endif
-
-//layer led modification
-// Light LEDs 6 to 9 and 12 to 15 red when caps lock is active. Hard to ignore!
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 6, HSV_RED},       // Light 6 LEDs, starting with LED 0
-    {35, 6, HSV_RED}       // Light 6 LEDs, starting with LED 35
-);
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_capslock_layer
-);
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    return true;
-}
diff --git a/keyboards/lily58/keymaps/niolang/rules.mk b/keyboards/lily58/keymaps/niolang/rules.mk
deleted file mode 100644
index 83c24c8705d..00000000000
--- a/keyboards/lily58/keymaps/niolang/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRAKEY_ENABLE = yes
-OLED_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/oldfieldtc/config.h b/keyboards/lily58/keymaps/oldfieldtc/config.h
deleted file mode 100644
index edfc9530b24..00000000000
--- a/keyboards/lily58/keymaps/oldfieldtc/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2022 Tommy Oldfield <@oldfieldtc>
-
-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_FORCE_HOLD
-#define TAPPING_TERM 100
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/oldfieldtc/keymap.c b/keyboards/lily58/keymaps/oldfieldtc/keymap.c
deleted file mode 100644
index 11750e82e85..00000000000
--- a/keyboards/lily58/keymaps/oldfieldtc/keymap.c
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2022 Tommy Oldfield (@oldfieldtc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layer_number {
-  _QWERTY = 0,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-void render_logo(void);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |BackSP|
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | 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 | Play |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_BSPC, 
-      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, MO(1), KC_SPC,                              KC_ENT, MO(2), KC_MPLY, KC_RGUI
-),
-
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | Mute |Vol - |Vol + | Play |  Rwd |  Fwd |                    |      |      |      |      |      |  DEL |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   ~  |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * | Caps |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |  |\  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |LOWER | /       /       \      \  |RAISE |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MRWD, KC_MFFD,           KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL,
-  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_NONUS_HASH,
-  KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO, KC_NO,   KC_NO, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_NONUS_BACKSLASH,
-  KC_NO, KC_NO, KC_TRNS, KC_NO,                                   KC_NO, KC_TRNS, KC_NO, KC_NO
-),
-
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |  #   |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |LOWER | /       /       \      \  |RAISE |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_RAISE] = LAYOUT(
-  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_GRV, KC_1, KC_2, KC_3, KC_4, KC_5,                           KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO,
-  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,                       KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO,
-  KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,    KC_NO, KC_NO,   KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_NO, KC_NO, KC_TRNS, KC_NO,                                   KC_NO, KC_TRNS, KC_NO, KC_NO
-  ),
-
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |      |      |LOWER | /       /       \      \  |RAISE |      |      |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-  [_ADJUST] = LAYOUT(
-    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, 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, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO, KC_NO,   KC_NO, KC_NO, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
-    KC_NO, KC_NO, KC_TRNS, KC_NO,                                 KC_NO, KC_TRNS, KC_NO, KC_NO)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    oled_write_ln(read_keylog(), false);
-    oled_write_ln(read_keylogs(), false);
-
-    oled_write_P(PSTR("WPM: "), false);
-    oled_write_ln(get_u8_str(get_current_wpm(), '0'), false);
-  } else {
-    render_logo();
-  }
-  return false;
-}
-#endif // OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-
-  }
-  return true;
-}
-
-void render_logo(void) {
-	static const char PROGMEM my_logo[] = {
-		// 'punpun 2', 128x32px
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xe0, 0x70, 0x38, 0x1c, 0x0c, 0x06, 0x06, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-0x02, 0x02, 0x02, 0x06, 0x06, 0x06, 0x04, 0x04, 0x0c, 0x0c, 0x08, 0x08, 0x18, 0x18, 0x18, 0x10, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x10, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x80, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x70, 0x38, 0x1c, 0x06, 0x03, 
-0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x02, 0x06, 0x04, 0x04, 0x0c, 0x08, 0x18, 0x18
-	};
-	oled_write_raw_P(my_logo, sizeof(my_logo));
-}
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/oldfieldtc/readme.md b/keyboards/lily58/keymaps/oldfieldtc/readme.md
deleted file mode 100644
index 8aa978d52e2..00000000000
--- a/keyboards/lily58/keymaps/oldfieldtc/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Lily58 keyboard keymap
-
-## Default layer
-![Default keymap layer](https://i.imgur.com/c5kbMww.jpg)
-
-[Default layer - Keyboard layout editor](http://www.keyboard-layout-editor.com/#/gists/8ff6160c16e9b9ee7e104538bfad4a59)
-
-## Lower layer
-![Lower keymap layer](https://i.imgur.com/GcLR3Uw.jpg)
-
-[Lower layer - Keyboard layout editor](http://www.keyboard-layout-editor.com/#/gists/7d77cd87c53d5eded50530242b852c20)
-
-## Raise layer
-![Raise keymap layer](https://i.imgur.com/aNVwlKJ.jpg)
-
-[Raise layer - Keyboard layout editor](http://www.keyboard-layout-editor.com/#/gists/c7a63881a13e339f1b5b847637677e5f)
-
-## Adjust layer
-![Adjust keymap layer](https://i.imgur.com/0l4c1Df.jpg)
-
-[Adjust layer - Keyboard layout editor](http://www.keyboard-layout-editor.com/#/gists/15a25bc84fa69a1b9f228574674728d3)
-
diff --git a/keyboards/lily58/keymaps/oldfieldtc/rules.mk b/keyboards/lily58/keymaps/oldfieldtc/rules.mk
deleted file mode 100644
index 004b46d6410..00000000000
--- a/keyboards/lily58/keymaps/oldfieldtc/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRAKEY_ENABLE = yes
-WPM_ENABLE = yes
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        ./lib/timelogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/paulomp90/config.h b/keyboards/lily58/keymaps/paulomp90/config.h
deleted file mode 100644
index b2cfbdd69c9..00000000000
--- a/keyboards/lily58/keymaps/paulomp90/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2023 Paulo Pereira
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 150
-#define TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.c b/keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.c
deleted file mode 100644
index f2e091c0b9d..00000000000
--- a/keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2023 Paulo Pereira
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "custom_shift_keys.h"
-
-bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record) {
-  static uint16_t registered_keycode = KC_NO;
-
-  // If a custom shift key is registered, then this event is either
-  // releasing it or manipulating another key at the same time. Either way,
-  // we release the currently registered key.
-  if (registered_keycode != KC_NO) {
-    unregister_code16(registered_keycode);
-    registered_keycode = KC_NO;
-  }
-
-  if (record->event.pressed) {  // Press event.
-    const uint8_t mods = get_mods();
-#ifndef NO_ACTION_ONESHOT
-    if ((mods | get_weak_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-#else
-    if ((mods | get_weak_mods()) & MOD_MASK_SHIFT) {  // Shift is held.
-#endif  // NO_ACTION_ONESHOT
-      // Continue default handling if this is a tap-hold key being held.
-      if ((IS_QK_MOD_TAP(keycode) || IS_QK_LAYER_TAP(keycode)) &&
-          record->tap.count == 0) {
-        return true;
-      }
-
-      // Search for a custom shift key whose keycode is `keycode`.
-      for (int i = 0; i < NUM_CUSTOM_SHIFT_KEYS; ++i) {
-        if (keycode == custom_shift_keys[i].keycode) {
-          registered_keycode = custom_shift_keys[i].shifted_keycode;
-          if (IS_QK_MODS(registered_keycode) &&  // Should key be shifted?
-              (QK_MODS_GET_MODS(registered_keycode) & MOD_LSFT) != 0) {
-            register_code16(registered_keycode);  // If so, press directly.
-          } else {
-            // If not, cancel shift mods, press the key, and restore mods.
-            del_weak_mods(MOD_MASK_SHIFT);
-#ifndef NO_ACTION_ONESHOT
-            del_oneshot_mods(MOD_MASK_SHIFT);
-#endif  // NO_ACTION_ONESHOT
-            unregister_mods(MOD_MASK_SHIFT);
-            register_code16(registered_keycode);
-            set_mods(mods);
-          }
-          return false;
-        }
-      }
-    }
-  }
-
-  return true;  // Continue with default handling.
-}
diff --git a/keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.h b/keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.h
deleted file mode 100644
index 2097f2bb7ea..00000000000
--- a/keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2023 Paulo Pereira
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#pragma once
-#include QMK_KEYBOARD_H
-
-typedef struct {
-  uint16_t keycode;
-  uint16_t shifted_keycode;
-} custom_shift_key_t;
-
-extern const custom_shift_key_t custom_shift_keys[];
-extern uint8_t NUM_CUSTOM_SHIFT_KEYS;
-
-bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record);
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/paulomp90/keymap.c b/keyboards/lily58/keymaps/paulomp90/keymap.c
deleted file mode 100644
index af0fafb3373..00000000000
--- a/keyboards/lily58/keymaps/paulomp90/keymap.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* Copyright 2023 Paulo Pereira
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_portuguese.h"
-#include "features/custom_shift_keys.h"
-
-enum layer_number {
-    _QWERTY = 0,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-/* tap dance shifts */
-typedef struct {
-    bool is_press_action;
-    int  state;
-} tap;
-
-typedef enum {
-    TD_NONE,
-    TD_UNKNOWN,
-    TD_SINGLE_TAP,
-    TD_SINGLE_HOLD,
-    TD_DOUBLE_TAP
-} td_state_t;
-
-enum { LEFT_SHIFT = 0, RIGHT_SHIFT = 1 };
-
-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  |  +*  |
-    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-    * |LShift|   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   Ç  | BACK |
-    * |------+------+------+------+------+------|  <>   |    |  ´`   |------+------+------+------+------+------|
-    * |LCTRL |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |  ,;  |   .: |  _-  |Shift|
-    * `-----------------------------------------/       /     \      \-----------------------------------------'
-    *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE | RGUI | RAlt |
-    *                   |      |      |      |/       /         \      \ |      |      |      |
-    *                   `-------------------''-------'           '------''--------------------'
-    */
-    [_QWERTY] = LAYOUT(
-        KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-        KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
-        TD(LEFT_SHIFT),  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_BSPC,
-        KC_LCTL,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_GRV,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  TD(RIGHT_SHIFT),
-                            KC_LALT, KC_LGUI, TL_LOWR, KC_SPC,   KC_ENT,   TL_UPPR,  KC_RGUI, KC_RALT
-    ),
-
-    /* LOWER
-    * ,-----------------------------------------.                    ,-----------------------------------------.
-    * |      |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  |  F11 |      |
-    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-    * |  F1  |      |      |      |      |      |                    | PgUp | HOME |  Up  | END  |  ºª  | F12  |
-    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-    * |      |      |      |      |      |      |-------.    ,-------| PgDn | Left | Down |Right |  ~^  | DEL  |
-    * |------+------+------+------+------+------|  <>   |    |  ´`   |------+------+------+------+------+------|
-    * |      |      |      |  <<  |  >|| |  >>  |-------|    |-------|      | Vol+ | Vol- | Mute |  \|  |      |
-    * `-----------------------------------------/       /     \      \-----------------------------------------'
-    *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE | RGUI | RAlt |
-    *                   |      |      |      |/       /         \      \ |      |      |      |
-    *                   `-------------------''-------'           '------''--------------------'
-    */
-    [_LOWER] = LAYOUT(
-        _______,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                 KC_F7,     KC_F8, KC_F9,  KC_F10,  KC_F11, _______,  
-          KC_F1, _______, _______, _______, _______, _______,                 KC_PGUP, KC_HOME, KC_UP,  KC_END, KC_LBRC,  KC_F12,
-        _______, _______, _______, _______, _______, _______,                 KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUOT, KC_DEL,
-        _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT,   _______, _______, _______, KC_VOLU,  KC_VOLD, KC_MUTE, KC_BSLS, _______,
-                                    _______, _______, _______,  _______, _______,  _______, _______, _______
-    ),
-
-    /* RAISE
-    * ,-----------------------------------------.                    ,-----------------------------------------.
-    * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
-    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-    * |      |   1  |   2  |  3   |  4   |  5   |                    | PgUp | HOME |  Up  | END  |  ºª  |      |
-    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-    * |      |   6  |   7  |  8   |  9   |  0   |-------.    ,-------| PgDn | Left | Down |Right |  ~^  |      |
-    * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
-    * |      |      |      |  <<  |  >|| |  >>  |-------|    |-------|      | Vol+ | Vol- | Mute |  \|  |      |
-    * `-----------------------------------------/       /     \      \-----------------------------------------'
-    *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE | RGUI | RAlt |
-    *                   |      |      |      |/       /         \      \ |      |      |      |
-    *                   `-------------------''-------'           '------''--------------------'
-    */
-    [_RAISE] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
-        _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                   KC_PGUP, KC_HOME, KC_UP,  KC_END, KC_LBRC, _______,
-        _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUOT, _______,
-        _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_VOLU,  KC_VOLD, KC_MUTE, KC_BSLS, _______,
-                                    _______, _______, _______, _______, _______,  _______, _______, _______
-    ),   
-
-    /* ADJUST
-    * ,-----------------------------------------.                    ,-----------------------------------------.
-    * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
-    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-    * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
-    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-    * |RGB ON| HUE+ | SAT+ | VAL+ |      | BRG+ |-------.    ,-------|      |      |      |      |      |      |
-    * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
-    * | MODE | HUE- | SAT- | VAL- |      | BRG- |-------|    |-------|      |      |      |      |      |      |
-    * `-----------------------------------------/       /     \      \-----------------------------------------'
-    *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE | RGUI | RAlt | 
-    *                   |      |      |      |/       /         \      \ |      |      |      |
-    *                   `----------------------------'           '------''--------------------'
-    */
-
-    [_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,
-        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_BRIU,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_BRID, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                    _______, _______, _______, _______, _______,  _______, _______, _______
-    )
-};
-
-// SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_keyboard_master()) return OLED_ROTATION_180; // flips the display 180 degrees if offhand
-    return rotation;
-}
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void        set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_write_ln(read_layer_state(), false);
-        oled_write_ln(read_keylog(), false);
-        oled_write_ln(read_keylogs(), false);
-    } else {
-        oled_write(read_logo(), false);
-    }
-    return false;
-}
-#endif // OLED_ENABLE
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-    #ifdef OLED_ENABLE
-        set_keylog(keycode, record);
-    #endif
-    }
-
-    return true;
-}
-
-/* Tap dance shifts */
-td_state_t cur_dance(tap_dance_state_t *state) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) {
-            return TD_SINGLE_TAP;
-        } else {
-            return TD_SINGLE_HOLD;
-        }
-    } else if (state->count == 2) {
-        return TD_DOUBLE_TAP;
-    }
-
-    return TD_UNKNOWN;
-}
-
-static tap lshifttap_state = {.is_press_action = true, .state = TD_NONE};
-
-static tap rshifttap_state = {.is_press_action = true, .state = TD_NONE};
-
-void lshift_finished(tap_dance_state_t *state, void *user_data) {
-    lshifttap_state.state = cur_dance(state);
-
-    switch (lshifttap_state.state) {
-        case TD_SINGLE_TAP:
-            register_code16(LALT(KC_LEFT));
-            break;
-        case TD_SINGLE_HOLD:
-            register_code(KC_LSFT);
-            break;
-        case TD_DOUBLE_TAP:
-            tap_code16(LALT(KC_LEFT));
-            register_code16(LALT(KC_LEFT));
-            break;
-        default:
-            break;
-    }
-}
-
-void lshift_reset(tap_dance_state_t *state, void *user_data) {
-    switch (lshifttap_state.state) {
-        case TD_SINGLE_TAP:
-            unregister_code16(LALT(KC_LEFT));
-            break;
-        case TD_SINGLE_HOLD:
-            unregister_code(KC_LSFT);
-            break;
-        case TD_DOUBLE_TAP:
-            unregister_code16(LALT(KC_LEFT));
-            break;
-    }
-    lshifttap_state.state = TD_NONE;
-}
-
-void rshift_finished(tap_dance_state_t *state, void *user_data) {
-    rshifttap_state.state = cur_dance(state);
-
-    switch (rshifttap_state.state) {
-        case TD_SINGLE_TAP:
-            register_code16(LALT(KC_RGHT));
-            break;
-        case TD_SINGLE_HOLD:
-            register_code(KC_RSFT);
-            break;
-        case TD_DOUBLE_TAP:
-            tap_code16(LALT(KC_RGHT));
-            register_code16(LALT(KC_RGHT));
-            break;
-        default:
-            break;
-    }
-}
-
-void rshift_reset(tap_dance_state_t *state, void *user_data) {
-    switch (rshifttap_state.state) {
-        case TD_SINGLE_TAP:
-            unregister_code16(LALT(KC_RGHT));
-            break;
-        case TD_SINGLE_HOLD:
-            unregister_code(KC_RSFT);
-            break;
-        case TD_DOUBLE_TAP:
-            unregister_code16(LALT(KC_RGHT));
-            break;
-    }
-    rshifttap_state.state = TD_NONE;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [LEFT_SHIFT]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lshift_finished, lshift_reset),
-    [RIGHT_SHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rshift_finished, rshift_reset),
-};
diff --git a/keyboards/lily58/keymaps/paulomp90/readme.md b/keyboards/lily58/keymaps/paulomp90/readme.md
deleted file mode 100644
index 9ab72cd0b2c..00000000000
--- a/keyboards/lily58/keymaps/paulomp90/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Paulo Lily58
-
-Lily58 is 6×4 column-staggered split keyboard.
-
-![Keymap first layer](https://i.postimg.cc/HWcgcxb8/lily58.png "Keymap first layer")
-
-- Add portuguese include
-- Add custom shift behaviour, when tap move by 1 word left <> right, when held act as shift.
-idea taken from [here](https://getreuer.info/posts/keyboards/custom-shift-keys/index.html).
-
diff --git a/keyboards/lily58/keymaps/paulomp90/rules.mk b/keyboards/lily58/keymaps/paulomp90/rules.mk
deleted file mode 100644
index d7bfc973942..00000000000
--- a/keyboards/lily58/keymaps/paulomp90/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-EXTRAKEY_ENABLE = yes        # Audio control and System control
-OLED_ENABLE= yes     # OLED display
-TAP_DANCE_ENABLE = yes
-TRI_LAYER_ENABLE = yes
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        features/custom_shift_keys.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/lily58/keymaps/pomodoro/config.h b/keyboards/lily58/keymaps/pomodoro/config.h
deleted file mode 100644
index ce2b0e4bcde..00000000000
--- a/keyboards/lily58/keymaps/pomodoro/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#define SPLIT_TRANSACTION_IDS_USER SYNC_POMODORO_RUNNING
-
-// Underglow
-/*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_SLEEP
-*/
diff --git a/keyboards/lily58/keymaps/pomodoro/keymap.c b/keyboards/lily58/keymaps/pomodoro/keymap.c
deleted file mode 100644
index 7689a391f2d..00000000000
--- a/keyboards/lily58/keymaps/pomodoro/keymap.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-Copyright 2023 Casey Borders
-
-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_number {
-    _QWERTY = 0,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* QWERTY
-     * ,-----------------------------------------.                    ,-----------------------------------------.
-     * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |Backsp|
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * | 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|
-     * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | Play |LOWER | LGUI | / Enter /       \Space \  | RGUI |RAISE | Mute |
-     *                   |      |      |      |/       /         \      \ |      |      |      |
-     *                   `----------------------------'           '------''--------------------'
-     */
-    [_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_BSPC,
-      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_MPLY, MO(_LOWER), KC_LGUI,  KC_ENT,        KC_SPC, KC_RGUI, MO(_RAISE), KC_MUTE
-    ),
-    /* LOWER
-     * ,-----------------------------------------.                    ,-----------------------------------------.
-     * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |      |      |      |      |      |      |                    |      |      |  Up  |      |   \  |      |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |      |      |      |      |      |      |-------.    ,-------|      | Left | Down |Right |   =  |      |
-     * |------+------+------+------+------+------|   <   |    |   >   |------+------+------+------+------+------|
-     * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
-     * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | Play |LOWER | LGUI | / Enter /       \Space \  | RGUI |RAISE | Mute |
-     *                   |      |      |      |/       /         \      \ |      |      |      |
-     *                   `----------------------------'           '------''--------------------'
-     */
-    [_LOWER] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______,                          _______, _______,   KC_UP, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______,                          _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
-      _______, _______, _______, _______, _______, _______,   KC_LT,        KC_GT,   _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______,        _______, _______, _______, _______
-
-    ),
-    /* RAISE
-     * ,-----------------------------------------.                    ,-----------------------------------------.
-     * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |      |      | Vol+ |      |      |      |                    |      |      |      |      |      |      |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |      | Prev | Vol- | Next |      |      |-------.    ,-------|      |      |      |      |      |      |
-     * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
-     * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
-     * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | Play |LOWER | LGUI | / Enter /       \Space \  | RGUI |RAISE | Mute |
-     *                   |      |      |      |/       /         \      \ |      |      |      |
-     *                   `----------------------------'           '------''--------------------'
-     */
-    [_RAISE] = LAYOUT(
-       KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                            KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F12,
-      _______, _______, KC_VOLU, _______, _______, _______,                          _______, _______,   KC_UP, _______, _______, _______,
-      _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______,                          _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______,   KC_LT,        KC_GT,   _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______,        _______, _______, _______, _______
-
-    ),
-    /* ADJUST
-     * ,-----------------------------------------.                    ,-----------------------------------------.
-     * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |      |      |      |      |      |      |                    |      |      |      |      | Oper | Out  |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
-     * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
-     * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
-     * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *                   | Play |LOWER | LGUI | / Enter /       \Space \  | RGUI |RAISE | Mute |
-     *                   |      |      |      |/       /         \      \ |      |      |      |
-     *                   `----------------------------'           '------''--------------------'
-     */
-    [_ADJUST] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, KC_OPER,  KC_OUT,
-      _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______,        _______, _______, _______, _______
-    )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-// SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-const char *read_timelog(void);
-
-void toggle_pomodoro(void);
-const char* read_pomodoro_running(void);
-void update_pomodoro_display(void);
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_keyboard_master())
-        return OLED_ROTATION_90;
-    return rotation;
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        oled_write_ln(read_layer_state(), false);
-        oled_write_ln(read_pomodoro_running(), false);
-    } else {
-        update_pomodoro_display();
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed && keycode == KC_OPER) {
-        toggle_pomodoro();
-    }
-    return true;
-}
-
-#endif // OLED_ENABLE
diff --git a/keyboards/lily58/keymaps/pomodoro/pomodoro.c b/keyboards/lily58/keymaps/pomodoro/pomodoro.c
deleted file mode 100644
index 1c0641978dc..00000000000
--- a/keyboards/lily58/keymaps/pomodoro/pomodoro.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
-Copyright 2023 Casey Borders
-
-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 <string.h>
-
-#include "transactions.h"
-
-#ifdef OLED_ENABLE
-
-#define HEADER_SIZE 32
-const char headerBase[] PROGMEM = {
-    0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
-    0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
-    0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF,
-    0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF
-};
-char header[HEADER_SIZE];
-
-#define STATUS_WIDTH 15
-#define STATUS_HEIGHT 32
-#define STATUS_PIXELS (STATUS_WIDTH * 8)
-#define STATUS_SIZE (STATUS_WIDTH * STATUS_HEIGHT)
-const char logoBase[] PROGMEM = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x80, 0x80, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x7F, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7F, 0x7F, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x61, 0x61, 0x81, 0x81, 0x01, 0x01, 0xC1, 0xC1, 0x30, 0x30, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC0, 0xC0, 0xFF, 0xFF, 0xC3, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xF0, 0xF0, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0xF0, 0xF0, 0x00, 0x00, 0xF0, 0xF0, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0xF0, 0xF0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x0F, 0x0F, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x0F, 0x0F, 0x00, 0x00, 0x0F, 0x0F, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x0F, 0x0F, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x06, 0x06, 0x9E, 0x9E, 0x66, 0x66, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0xF8, 0xF8, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xF8, 0xF8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x86, 0x86, 0x67, 0x67, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x86, 0x86, 0x00, 0x00, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x7F, 0x7F, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7F, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xC0, 0xC0, 0x31, 0x31, 0xC1, 0xC1, 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, 0x3F, 0x3F, 0x30, 0x30, 0x3F, 0x3F, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 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, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0xF3, 0x7F, 0x3F, 0x7F, 0xFF, 0xFF, 0x3B, 0xF1, 0xF7, 0xFF, 0x3F, 0x39, 0x30, 0x00, 0x01, 0x01, 0x01, 0x83, 0x86, 0x0C, 0xF8, 0xF0, 0x80, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xCF, 0x07, 0x1F, 0x3F, 0x3F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xDF, 0xFC, 0x7F, 0x07, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0E, 0x1C, 0x18, 0x30, 0x30, 0x30, 0x60, 0x60, 0x60, 0x60, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00
-};
-
-const char workBase[] PROGMEM = {
-    0x00, 0x00, 0x00, 0x00, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x3E, 0x3E, 0x3E, 0x3E, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x3E, 0x3E, 0x3E, 0x3E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 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, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xF0, 0xF0, 0xF0, 0xF0, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0xF0, 0xF0, 0xF0, 0xF0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7C, 0x7C, 0x7C, 0x7C, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x0F, 0x0F, 0x0F, 0x0F, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x83, 0x83, 0x83, 0x83, 0x83, 0x7F, 0x7F, 0x7F, 0x7F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0xF8, 0xF8, 0xF8, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00
-};
-
-const char restBase[] PROGMEM = {
-    0x00, 0x00, 0x80, 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, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xF8, 0xF8, 0xF8, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xF0, 0xF0, 0xF0, 0xF0, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0xF0, 0xF0, 0xF0, 0xF0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7C, 0x7C, 0x7C, 0x7C, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 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, 0x00, 0x00, 0x00
-};
-char displayBuffer[STATUS_SIZE];
-
-#define WORK_TIME ((uint32_t)25 * 60 * 1000)
-#define REST_TIME ((uint32_t)5 * 60 * 1000)
-
-typedef enum pomo_state {
-    _STOPPED,
-    _WORK,
-    _REST,
-} pomo_state;
-
-/* The master only needs to know if the timer is running or not */
-bool isRunning = false;
-
-/* The slave needs more info about the state and what's going on */
-pomo_state state = _STOPPED;
-uint8_t pomoCount = 0;
-uint32_t pomoTimer;
-uint32_t totalTime = 0;
-uint32_t currTime = 0;
-uint32_t lastTime = 0;
-uint16_t lastProgress = 0;
-
-const char* read_pomodoro_state(void) {
-    switch (state) {
-        case _STOPPED: return "STOPPED";
-        case _REST: return "REST";
-        case _WORK: return "WORK";
-        default: return "UNKNOWN";
-    }
-}
-
-const char* read_pomodoro_running(void) {
-    if (isRunning) { return "RUNNING"; }
-    else { return "STOPPED"; }
-}
-
-void update_display_base(void) {
-    switch (state) {
-        case _STOPPED: {
-            memcpy_P(displayBuffer, logoBase, STATUS_SIZE);
-            memset(header, 0, HEADER_SIZE);
-        } break;
-        case _WORK: {
-            memcpy_P(displayBuffer, workBase, STATUS_SIZE);
-            memcpy_P(header, headerBase, HEADER_SIZE);
-        } break;
-        case _REST: {
-            memcpy_P(displayBuffer, restBase, STATUS_SIZE);
-            memcpy_P(header, headerBase, HEADER_SIZE);
-        } break;
-    }
-}
-
-void update_cycle_display(void) {
-    if (state == _STOPPED) { return; }
-    uint8_t start = (HEADER_SIZE / 4) * (4 - pomoCount);
-    for (uint8_t i = start; i < HEADER_SIZE; i++) {
-        header[i] = ~header[i];
-    }
-}
-
-bool syncRunning = false;
-void toggle_pomodoro(void) {
-    isRunning = !isRunning;
-    syncRunning = true;
-}
-
-void set_slave_pomodoro_running(uint8_t in_buflen, const void *in_data, uint8_t out_buflen, void *out_data) {
-    isRunning = *(bool*)in_data;
-    if (isRunning) {
-        /* Reset stuff and start the timer */
-        pomoTimer = timer_read32();
-        state = _WORK;
-        totalTime = WORK_TIME;
-        lastTime = 0;
-        lastProgress = 0;
-        currTime = 0;
-        pomoCount = 1;
-        update_display_base();
-        update_cycle_display();
-    } else {
-        state = _STOPPED;
-        update_display_base();
-    }
-}
-
-void keyboard_post_init_user(void) {
-    memcpy_P(displayBuffer, logoBase, STATUS_SIZE);
-    memset(header, 0, HEADER_SIZE);
-    transaction_register_rpc(SYNC_POMODORO_RUNNING, set_slave_pomodoro_running);
-}
-
-void update_pomodoro_display(void) {
-    oled_set_cursor(0, 0);
-    oled_write_raw(displayBuffer, STATUS_SIZE);
-    oled_set_cursor(0, STATUS_WIDTH);
-    oled_write_raw(header, HEADER_SIZE);
-}
-
-void update_time_display(void) {
-    if (currTime > lastTime) {
-        float ratio = (float)currTime / totalTime;
-        uint16_t progress = (uint16_t)(ratio * STATUS_PIXELS);
-
-        for (int i = lastProgress + 1; i <= progress; i++) {
-            uint16_t row = i / 8;
-            uint16_t bit = i % 8;
-            char mask = 1 << bit;
-            for (int j = 0; j < STATUS_HEIGHT; j++) {
-                uint16_t index = row * STATUS_HEIGHT + j;
-                if (index > STATUS_SIZE) break;
-                displayBuffer[index] = displayBuffer[index] ^ mask;
-            }
-        }
-
-        lastTime = currTime;
-        lastProgress = progress;
-    }
-}
-
-void housekeeping_task_user(void) {
-    if (is_keyboard_master()) {
-        if (syncRunning && transaction_rpc_send(SYNC_POMODORO_RUNNING, sizeof(bool), &isRunning)) {
-            syncRunning = false;
-        }
-    } else {
-        /* This is where the time will be updated */
-        if (isRunning) {
-            currTime = timer_elapsed32(pomoTimer);
-            if (currTime >= totalTime) {
-                if (state == _WORK) {
-                    state = _REST;
-                    totalTime = REST_TIME;
-                } else if (state == _REST) {
-                    state = _WORK;
-                    totalTime = WORK_TIME;
-                    pomoCount++;
-                }
-
-                if (pomoCount > 4) {
-                    isRunning = false;
-                    state = _STOPPED;
-                }
-
-                pomoTimer = timer_read32();
-                currTime = 0;
-                lastTime = 0;
-                lastProgress = 0;
-                update_display_base();
-                update_cycle_display();
-            } else {
-                update_time_display();
-            }
-        }
-    }
-}
-
-#endif // OLED_ENABLE
diff --git a/keyboards/lily58/keymaps/pomodoro/rules.mk b/keyboards/lily58/keymaps/pomodoro/rules.mk
deleted file mode 100644
index a6666f7fc14..00000000000
--- a/keyboards/lily58/keymaps/pomodoro/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-BOOTMAGIC_ENABLE  = no   # Enable Bootmagic Lite
-MOUSEKEY_ENABLE   = no   # Mouse keys
-CONSOLE_ENABLE    = no   # Console for debug
-COMMAND_ENABLE    = no   # Commands for debug and configuration
-NKRO_ENABLE       = no
-BACKLIGHT_ENABLE  = no   # Enable keyboard backlight functionality
-AUDIO_ENABLE      = no   # Audio output
-RGBLIGHT_ENABLE   = no   # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no   # Enable one-hand typing
-OLED_ENABLE       = yes  # OLED display
-LTO_ENABLE        = yes  # Link time optimisations
-EXTRAKEY_ENABLE   = yes  # Audio control and System control
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        ./lib/mode_icon_reader.c \
-        ./lib/host_led_state_reader.c \
-        ./lib/timelogger.c \
-        ./lib/keylogger.c \
-        pomodoro.c \
diff --git a/keyboards/lily58/keymaps/pttbx/config.h b/keyboards/lily58/keymaps/pttbx/config.h
deleted file mode 100644
index b16e63b6d7a..00000000000
--- a/keyboards/lily58/keymaps/pttbx/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-// Underglow
-/*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_SLEEP
-*/
diff --git a/keyboards/lily58/keymaps/pttbx/keymap.c b/keyboards/lily58/keymaps/pttbx/keymap.c
deleted file mode 100644
index a4977663b39..00000000000
--- a/keyboards/lily58/keymaps/pttbx/keymap.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* Copyright 2021 Paul Tan
- *
- * 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_number {
-  _QWERTY = 0,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-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|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LOWER| LGUI |LAlt  | /Space  /       \Enter \  |BackSP| RGUI |RAISE |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
- [_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,
-                        MO(_LOWER), KC_LGUI, KC_LALT, KC_SPC, KC_ENT, KC_BSPC, KC_RGUI, MO(_RAISE)
-),
-/* 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
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_RAISE] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______,
-  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,   _______, _______,  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);
-}
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-void oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    oled_write_ln(read_keylog(), false);
-    oled_write_ln(read_keylogs(), false);
-    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
-    //oled_write_ln(read_host_led_state(), false);
-    //oled_write_ln(read_timelog(), false);
-  } else {
-    oled_write(read_logo(), false);
-  }
-}
-#endif // OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-  return true;
-}
diff --git a/keyboards/lily58/keymaps/pttbx/rules.mk b/keyboards/lily58/keymaps/pttbx/rules.mk
deleted file mode 100644
index e2c8a6f7467..00000000000
--- a/keyboards/lily58/keymaps/pttbx/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# If you want to change the display of OLED, you need to change here
-SRC += ./lib/rgb_state_reader.c \
-       ./lib/layer_state_reader.c \
-       ./lib/logo_reader.c \
-       ./lib/keylogger.c
diff --git a/keyboards/lily58/keymaps/via/config.h b/keyboards/lily58/keymaps/via/config.h
index 331521bcbfa..284d3944b96 100644
--- a/keyboards/lily58/keymaps/via/config.h
+++ b/keyboards/lily58/keymaps/via/config.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Underglow
 /*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
+#undef RGBLIGHT_LED_COUNT
+#define RGBLIGHT_LED_COUNT 14    // Number of LEDs
 #define RGBLIGHT_SLEEP
 */
diff --git a/keyboards/lily58/keymaps/mb_via/config.h b/keyboards/lily58/keymaps/via_mechboards/config.h
similarity index 100%
rename from keyboards/lily58/keymaps/mb_via/config.h
rename to keyboards/lily58/keymaps/via_mechboards/config.h
diff --git a/keyboards/lily58/keymaps/mb_via/keymap.c b/keyboards/lily58/keymaps/via_mechboards/keymap.c
similarity index 100%
rename from keyboards/lily58/keymaps/mb_via/keymap.c
rename to keyboards/lily58/keymaps/via_mechboards/keymap.c
diff --git a/keyboards/lily58/keymaps/via_mechboards/readme.md b/keyboards/lily58/keymaps/via_mechboards/readme.md
new file mode 100644
index 00000000000..36aaab31b58
--- /dev/null
+++ b/keyboards/lily58/keymaps/via_mechboards/readme.md
@@ -0,0 +1,10 @@
+# Default Via keymap for the Lily58 R2G by Mechboards UK
+
+Lily58 R2G is the classic Lily58 remade to feature full SMD assembly
+
+In this folder can be found the default via enabled keymap that can be in conjunction with the mechboards R2G PCB.
+
+Flash example for this Keymap:  
+```sh
+qmk flash -kb lily58/r2g -km via_mechboards
+```
diff --git a/keyboards/lily58/keymaps/mb_via/rules.mk b/keyboards/lily58/keymaps/via_mechboards/rules.mk
similarity index 100%
rename from keyboards/lily58/keymaps/mb_via/rules.mk
rename to keyboards/lily58/keymaps/via_mechboards/rules.mk
diff --git a/keyboards/lily58/keymaps/yshrsmz/config.h b/keyboards/lily58/keymaps/yshrsmz/config.h
deleted file mode 100644
index 084b95d52f8..00000000000
--- a/keyboards/lily58/keymaps/yshrsmz/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#undef RGBLED_NUM
-#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 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-// Underglow
-/*
-#undef RGBLED_NUM
-#define RGBLED_NUM 14    // Number of LEDs
-#define RGBLIGHT_SLEEP
-*/
diff --git a/keyboards/lily58/keymaps/yshrsmz/keymap.c b/keyboards/lily58/keymaps/yshrsmz/keymap.c
deleted file mode 100644
index 3ab9222b9d3..00000000000
--- a/keyboards/lily58/keymaps/yshrsmz/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-enum layer_names {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-
-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  |   ,  |   .  |   /  |  \   |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /BackSP /       \Enter \  |Space |RAISE | 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_EQL,
-  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_BSLS,
-                             KC_LALT, KC_LGUI,LOWER, KC_BSPC,   KC_ENT,  KC_SPC,  RAISE,  KC_RGUI
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  ~   |  !   |  @   |  #   |  $   |  %   |                    |  ^   |  &   |  *   |  (   |  )   |  +   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------| Left | Down |  Up  |Right | PGUP |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------| Home | End  |Alt+← |Alt+→ | PGDN |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /BackSP /       \Enter \  |Space |RAISE | RGUI |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR,KC_LPRN, KC_RPRN, KC_PLUS,
-  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_LEFT, KC_DOWN, KC_UP,  KC_RGHT, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_HOME, KC_END,  LALT(KC_LEFT), LALT(KC_RGHT), KC_PGDN, _______,
-                             _______, _______, _______, _______, _______, _______, _______, _______
-),
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |  !   |  @   |  #   |  $   |  %   |                    |  ^   |  &   |  *   |  (   |  )   |  +   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------.    ,-------| Left | Down |  Up  |Right | PGUP |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------| Home | End  |Alt+← |Alt+→ | PGDN |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /  Del  /       \Enter \  |Space |RAISE | RGUI |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-
-[_RAISE] = LAYOUT(
-  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR,KC_LPRN, KC_RPRN, KC_PLUS,
-  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_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_HOME, KC_END,  LALT(KC_LEFT), LALT(KC_RGHT), KC_PGDN, _______,
-                             _______, _______, _______, KC_DEL,  _______, _______, _______, _______
-),
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   | LAlt | LGUI |LOWER | /BackSP /       \Enter \  |Space |RAISE | 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, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
-                             _______, _______, _______, _______, _______,  _______, _______, _______
-  )
-};
-
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    oled_write_ln(read_keylog(), false);
-    oled_write_ln(read_keylogs(), false);
-    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
-    //oled_write_ln(read_host_led_state(), false);
-    //oled_write_ln(read_timelog(), false);
-  } else {
-    oled_write(read_logo(), false);
-  }
-    return false;
-}
-#endif // OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-  }
-  return true;
-}
diff --git a/keyboards/lily58/keymaps/yshrsmz/rules.mk b/keyboards/lily58/keymaps/yshrsmz/rules.mk
deleted file mode 100644
index 2541d64e1d1..00000000000
--- a/keyboards/lily58/keymaps/yshrsmz/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-AUTO_SHIFT_ENABLE = yes
-OLED_ENABLE= yes     # OLED display
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/lily58/keymaps/yuchi/config.h b/keyboards/lily58/keymaps/yuchi/config.h
deleted file mode 100644
index 55d05464bc0..00000000000
--- a/keyboards/lily58/keymaps/yuchi/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
diff --git a/keyboards/lily58/keymaps/yuchi/keymap.c b/keyboards/lily58/keymaps/yuchi/keymap.c
deleted file mode 100644
index c8c9eea5e9b..00000000000
--- a/keyboards/lily58/keymaps/yuchi/keymap.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-
-extern uint8_t is_master;
-
-enum layer_number {
-  _QWERTY = 0,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-
-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|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |LOWER | LGUI | Alt  | /Space  /       \Enter \  |BackSP| RGUI |RAISE |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `-------------------''-------'           '------''--------------------'
- */
-
- [_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,
-              MO(_LOWER),KC_LGUI, KC_LALT, LT(_LOWER,KC_SPC),  LT(_RAISE,KC_ENT),  KC_BSPC, KC_RGUI, MO(_RAISE)
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |   !  |   @  |   #  |   $  |   %  |                    |   ^  |   &  |   *  |   (  |   )  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |   1  |   2  |   3  |   4  |   5  |-------.    ,-------|   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|   |  |   `  |   +  |   {  |   }  |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |LOWER | LGUI | Alt  | /Space  /       \Enter \  |BackSP| RGUI |RAISE |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `-------------------''-------'           '------''--------------------'
- */
-[_LOWER] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_GRAVE, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-                             _______, _______, _______, _______, _______,  _______, _______, _______
-),
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|   +  |   =  |   [  |   ]  |   \  |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |LOWER | LGUI | Alt  | /Space  /       \Enter \  |BackSP| RGUI |RAISE |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `-------------------''-------'           '------''--------------------'
- */
-
-[_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,
-  _______, _______, _______, _______, _______, _______,                     XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
-  _______, _______, _______, _______, _______, _______,   _______, _______, KC_PLUS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______,
-                             _______, _______, _______,  _______, _______,  _______, _______, _______
-),
-
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                   |LOWER | LGUI | Alt  | /Space  /       \Enter \  |BackSP| RGUI |RAISE |
- *                   |      |      |      |/       /         \      \ |      |      |      |
- *                   `----------------------------'           '------''--------------------'
- */
-  [_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,
-                             _______, _______, _______, _______, _______,  _______, _______, _______
-  )
-};
-
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
-}
-
-// When you add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    // If you want to change the display of OLED, you need to change here
-    oled_write_ln(read_layer_state(), false);
-    oled_write_ln(read_keylog(), false);
-    oled_write_ln(read_keylogs(), false);
-    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
-    //oled_write_ln(read_host_led_state(), false);
-    //oled_write_ln(read_timelog(), false);
-  } else {
-    oled_write(read_logo(), false);
-  }
-    return false;
-}
-#endif // OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-  return true;
-}
diff --git a/keyboards/lily58/keymaps/yuchi/rules.mk b/keyboards/lily58/keymaps/yuchi/rules.mk
deleted file mode 100644
index f714be7c6ad..00000000000
--- a/keyboards/lily58/keymaps/yuchi/rules.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-OLED_ENABLE= yes     # OLED display
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/lily58/r2g/config.h b/keyboards/lily58/r2g/config.h
deleted file mode 100644
index 955cf70161e..00000000000
--- a/keyboards/lily58/r2g/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 F_YUUCHI
-Copyright 2023 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
-
-#ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_LED_COUNT 74
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED
-#   define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#   define RGB_MATRIX_KEYPRESSES
-#   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-#   define RGB_MATRIX_KEYPRESSES
-#   define RGB_MATRIX_KEYRELEASES
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-
-#   define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#   define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#   define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#   define ENABLE_RGB_MATRIX_BREATHING
-#   define ENABLE_RGB_MATRIX_HUE_WAVE
-#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#   define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-
-#if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#endif
-
-#   define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/info.json
index c7fe3e011e7..3cad3dc8e8e 100644
--- a/keyboards/lily58/r2g/info.json
+++ b/keyboards/lily58/r2g/info.json
@@ -22,7 +22,12 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
     },
     "ws2812": {
         "pin": "D3"
@@ -104,6 +109,17 @@
         }
     },
     "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "alphas_mods": true,
+            "breathing": true,
+            "hue_wave": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
         "driver": "ws2812",
         "split_count": [37, 37],
         "layout": [
@@ -181,6 +197,9 @@
             {"flags": 2, "x": 150, "y": 0},                    // R RGB6
             {"flags": 2, "x": 140, "y": 0},                    // R RGB7
             {"flags": 2, "x": 128, "y": 32}                    // R RGB8
-        ]
+        ],
+        "max_brightness": 120,
+        "react_on_keyup": true,
+        "sleep": true
     }
 }
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index ec2c0613722..a87c01b9387 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* joystick support */
-#ifdef JOYSTICK_ENABLE
-#   define JOYSTICK_AXIS_COUNT 2
-#   define JOYSTICK_BUTTON_COUNT 1
-#   define JOYSTICK_AXIS_RESOLUTION 8
-#endif
+#define JOYSTICK_BUTTON_COUNT 1
 
 #define SPLIT_USB_DETECT
diff --git a/keyboards/lime/rev1/rev1.c b/keyboards/lime/rev1/rev1.c
index 91d00e0d2f5..d08cf398107 100644
--- a/keyboards/lime/rev1/rev1.c
+++ b/keyboards/lime/rev1/rev1.c
@@ -1,38 +1,40 @@
- /* Copyright 2021 HellSingCoder
-  *
-  * 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 2021 HellSingCoder
+ *
+ * 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 "quantum.h"
 
 /* Encoders */
 #ifdef ENCODER_ENABLE
-    bool encoder_update_user(uint8_t index, bool clockwise) {
-
-        if (index == 0) {
-            if (clockwise) {
-                tap_code(KC_MNXT);
-            } else {
-                tap_code(KC_MPRV);
-            }
-        } else if (index == 1) {
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        }
+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_MNXT);
+        } else {
+            tap_code(KC_MPRV);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return true;
+}
 #endif
diff --git a/keyboards/linworks/fave60a/config.h b/keyboards/linworks/fave60a/config.h
deleted file mode 100644
index fd70ee7c38f..00000000000
--- a/keyboards/linworks/fave60a/config.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2023 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Define RGB */
-#define RGB_MATRIX_LED_COUNT 91
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES 
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-
-#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
-// The PIXEL_FRACTAL effect does not work properly when the matrix layout is
-// different from the physical layout; it also has problems when underglow
-// LEDs are present, or when multiple LEDs are associated with the same key.
-#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-// Framebuffer effects; can be enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// is defined.  Both of these effects currently don't work properly when the
-// key matrix does not match the physical layout, so they are disabled.
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-// Reactive effects; can be enabled only if at least one 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
diff --git a/keyboards/linworks/fave60a/info.json b/keyboards/linworks/fave60a/info.json
index 97b50f7e82e..6d59949b230 100644
--- a/keyboards/linworks/fave60a/info.json
+++ b/keyboards/linworks/fave60a/info.json
@@ -20,6 +20,50 @@
         "pin": "A10"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
         "layout": [
             { "flags": 4, "matrix": [4, 13], "x": 208, "y": 64 },
@@ -113,7 +157,9 @@
             { "flags": 2, "x": 0, "y": 51 },
             { "flags": 2, "x": 0, "y": 35 },
             { "flags": 2, "x": 0, "y": 19 }
-        ]
+        ],
+        "max_brightness": 120,
+        "sleep": true
     },
     "url": "",
     "usb": {
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
deleted file mode 100644
index 3f549797d89..00000000000
--- a/keyboards/linworks/fave65h/config.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-
-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 */
-#define RGB_MATRIX_LED_COUNT 67
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES 
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-
-#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
-// The PIXEL_FRACTAL effect does not work properly when the matrix layout is
-// different from the physical layout; it also has problems when underglow
-// LEDs are present, or when multiple LEDs are associated with the same key.
-#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-// Framebuffer effects; can be enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// is defined.  Both of these effects currently don't work properly when the
-// key matrix does not match the physical layout, so they are disabled.
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-// Reactive effects; can be enabled only if at least one 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
-
-#endif
diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json
index 3bcfcb01164..32a3f5252c6 100644
--- a/keyboards/linworks/fave65h/info.json
+++ b/keyboards/linworks/fave65h/info.json
@@ -9,7 +9,53 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h
index 5ce329db0a1..550b05415c5 100644
--- a/keyboards/linworks/fave84h/config.h
+++ b/keyboards/linworks/fave84h/config.h
@@ -16,71 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* Define RGB */
 #ifdef RGB_MATRIX_ENABLE
 
-#define RGB_MATRIX_LED_COUNT 126
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES 
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-#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
-// The PIXEL_FRACTAL effect does not work properly when the matrix layout is
-// different from the physical layout; it also has problems when underglow
-// LEDs are present, or when multiple LEDs are associated with the same key.
-#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-// Framebuffer effects; can be enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// is defined.  Both of these effects currently don't work properly when the
-// key matrix does not match the physical layout, so they are disabled.
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-// Reactive effects; can be enabled only if at least one 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 EECONFIG_KB_DATA_SIZE 4
 
 #define CAPS_INDICATOR_INDEX 12
diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json
index 01619e7bc67..11ef16f2a34 100644
--- a/keyboards/linworks/fave84h/info.json
+++ b/keyboards/linworks/fave84h/info.json
@@ -23,6 +23,50 @@
         "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [3, 13], "x": 190, "y": 40},
@@ -151,7 +195,9 @@
             {"flags": 2, "x": 242, "y": 18},
             {"flags": 2, "x": 242, "y": 31},
             {"flags": 2, "x": 242, "y": 43}
-        ]
+        ],
+        "max_brightness": 120,
+        "sleep": true
     },
     "url": "",
     "usb": {
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
deleted file mode 100644
index e84a0ec9296..00000000000
--- a/keyboards/linworks/fave87h/config.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-
-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 */
-#define RGB_MATRIX_LED_COUNT 87
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES 
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-
-#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
-// The PIXEL_FRACTAL effect does not work properly when the matrix layout is
-// different from the physical layout; it also has problems when underglow
-// LEDs are present, or when multiple LEDs are associated with the same key.
-#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-// Framebuffer effects; can be enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// is defined.  Both of these effects currently don't work properly when the
-// key matrix does not match the physical layout, so they are disabled.
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-// Reactive effects; can be enabled only if at least one 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
-
-#endif
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
index c2008c4bb21..2951b56a434 100644
--- a/keyboards/linworks/fave87h/info.json
+++ b/keyboards/linworks/fave87h/info.json
@@ -12,7 +12,53 @@
         "pin": "D2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
diff --git a/keyboards/linworks/favepada/config.h b/keyboards/linworks/favepada/config.h
deleted file mode 100644
index bee089bb436..00000000000
--- a/keyboards/linworks/favepada/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2023 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Define RGB */
-#define RGB_MATRIX_LED_COUNT 37
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES 
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/linworks/favepada/info.json b/keyboards/linworks/favepada/info.json
index 005d7d06d0c..2b5adcf0a6f 100644
--- a/keyboards/linworks/favepada/info.json
+++ b/keyboards/linworks/favepada/info.json
@@ -9,7 +9,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
+        "rgb_matrix": true
     },
     "matrix_pins": {
         "cols": ["A14", "A15", "B3", "B4"],
@@ -58,6 +58,9 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
         "layout": [
             { "flags": 1, "matrix": [5, 2], "x": 149, "y": 59 },
@@ -98,7 +101,8 @@
             { "flags": 4, "x": 224, "y": 31 },
             { "flags": 4, "x": 224, "y": 18 }
         ],
-        "max_brightness": 120
+        "max_brightness": 120,
+        "sleep": true
     },
     "ws2812": {
         "pin": "B1"
diff --git a/keyboards/littlealby/mute/keymaps/zoom/keymap.c b/keyboards/littlealby/mute/keymaps/zoom/keymap.c
deleted file mode 100644
index c6cf9836e38..00000000000
--- a/keyboards/littlealby/mute/keymaps/zoom/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2019 albybarber
- *
- * 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(
-            SGUI(KC_A)
-          )
-};
diff --git a/keyboards/littlealby/mute/keymaps/zoom/readme.md b/keyboards/littlealby/mute/keymaps/zoom/readme.md
deleted file mode 100644
index 9ff489505f3..00000000000
--- a/keyboards/littlealby/mute/keymaps/zoom/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default keymap for arduino micro for Zoom
-
-Default for Mute is to use ```PB5 / digital pin 9 / analog pin 9```
-
-Key commands that are emulated for Zoom is `CTL + SHIFT + W`
-
-## Example pinout
-![Pinout](https://assets.codepen.io/18215/littleAlby_bb.png)
diff --git a/keyboards/lizard_trick/tenkey_plusplus/keymaps/macro/keymap.c b/keyboards/lizard_trick/tenkey_plusplus/keymaps/macro/keymap.c
deleted file mode 100644
index de64a688bad..00000000000
--- a/keyboards/lizard_trick/tenkey_plusplus/keymaps/macro/keymap.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright 2020 Jonathon Carstens jonathon@lizardtrick.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
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _TG1,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     *
-     *  Left    Middle  Right
-     *  VolDn   PgDn    Alt+Tab    (Rotary Counterclockwise)
-     *  VolUp   PgUp    Tab        (Rotary Clockwise)
-     *  Mute    Play    Next       (Rotary Click)
-     *
-     *
-     *
-     *   ┌───┬───┬───┬───┐
-     *   │TG1│ / │ * │ - │
-     *   ├───┼───┼───┼───┤
-     *   │ 7 │ 8 │ 9 │   │
-     *   ├───┼───┼───┤ + │
-     *   │ 4 │ 5 │ 6 │   │
-     *   ├───┼───┼───┼───┤
-     *   │ 1 │ 2 │ 3 │   │
-     *   ├───┴───┼───┤Ent│
-     *   │   0   │ . │   │
-     *   └───────┴───┴───┘
-     */
-
-    [_BASE] = LAYOUT(
-        KC_MUTE,  KC_MPLY,  KC_MNXT,
-        TG(1),    KC_SLSH,  KC_ASTR,  KC_MINS,
-        KC_7,     KC_8,     KC_9,     KC_PLUS,
-        KC_4,     KC_5,     KC_6,
-        KC_1,     KC_2,     KC_3,     KC_ENT,
-        KC_0,               KC_DOT
-    ),
-
-    /*
-     *
-     * ┌─────────┬─────────┬─────────┬─────────┐
-     * │   TG1   │    /    │    *    │    -    │
-     * ├─────────┼─────────┼─────────┼─────────┤
-     * │  Alt 7  │  Alt 8  │  Alt 9  │         │
-     * ├─────────┼─────────┼─────────┤    +    │
-     * │  Alt 4  │  Alt 5  │  Alt 6  │         │
-     * ├─────────┼─────────┼─────────┼─────────┤
-     * │  Alt 1  │  Alt 2  │  Alt 3  │         │
-     * ├─────────┴─────────┼─────────┤   Ent   │
-     * │      Escape       │   Del   │         │
-     * └───────────────────┴─────────┴─────────┘
-     */
-
-    [_TG1] = LAYOUT(
-        _______,        _______,        _______,
-        _______,     _______,   _______,   _______,
-        A(KC_7),     A(KC_8),   A(KC_9),   _______,
-        A(KC_4),     A(KC_5),   A(KC_6),
-        A(KC_1),     A(KC_2),   A(KC_3),   _______,
-        KC_ESC,                 KC_DEL
-    )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {           /* Left Encoder */
-        if (clockwise) {
-            tap_code16(KC_VOLU);
-        } else {
-            tap_code16(KC_VOLD);
-        }
-    } else if (index == 1) {    /* Middle Encoder */
-        if (clockwise) {
-            tap_code16(KC_PGDN);
-        } else {
-            tap_code16(KC_PGUP);
-        }
-    } else if (index == 2) {    /* Right Encoder */
-        if (clockwise) {
-            tap_code16(KC_TAB);
-        } else {
-            tap_code16(S(KC_TAB));
-        }
-    }
-    return true;
-}
diff --git a/keyboards/lpad/readme.md b/keyboards/lpad/readme.md
deleted file mode 100644
index 864f9569fa4..00000000000
--- a/keyboards/lpad/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# LPAD
-
-![LPAD](https://i.imgur.com/bQgqZC6h.jpg)
-
-A Macro Keyboard with a RHS rotary encoder, made and sold by Laneware Peripherals.
-
-* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
-* Hardware Supported: LPAD
-* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
-
-Make example for this keyboard (after setting up your build environment):
-
-    make lpad:default
-
-Flashing example for this keyboard:
-
-    make lpad: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:
-
-* **Bootmagic reset**: Hold down the Top Left Switch and plug in the keyboard
-* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/lw67/keymaps/default/keymap.c b/keyboards/lw67/keymaps/default/keymap.c
deleted file mode 100644
index 2ab17a35905..00000000000
--- a/keyboards/lw67/keymaps/default/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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_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_MPLY, 
-		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_DEL,   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, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	[1] = LAYOUT_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_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_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_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/lw67/keymaps/iso/keymap.c b/keyboards/lw67/keymaps/iso/keymap.c
deleted file mode 100644
index 6e05f9b8bdb..00000000000
--- a/keyboards/lw67/keymaps/iso/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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(
-		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_MPLY, 
-		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_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_DEL,   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, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	[1] = LAYOUT_iso(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_iso(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/lw67/keymaps/via/keymap.c b/keyboards/lw67/keymaps/via/keymap.c
deleted file mode 100644
index a8f4b420849..00000000000
--- a/keyboards/lw67/keymaps/via/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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_splitbs(
-		KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_GRAVE,  KC_BSPC, KC_MPLY, 
-		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_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_DEL,   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, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-	[1] = LAYOUT_iso_splitbs(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_iso_splitbs(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_iso_splitbs(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/lw67/lw67.c b/keyboards/lw67/lw67.c
deleted file mode 100644
index 87eaa1671e9..00000000000
--- a/keyboards/lw67/lw67.c
+++ /dev/null
@@ -1,30 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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 "lw67.h"
-
-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_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } 
-        return false; 
-}
-
diff --git a/keyboards/lw67/lw67.h b/keyboards/lw67/lw67.h
deleted file mode 100644
index fba187d0780..00000000000
--- a/keyboards/lw67/lw67.h
+++ /dev/null
@@ -1,131 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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"
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│  013  │   ┌───┐
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤   │015│
- * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ 113 │   └───┘
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌───┬───┐
- * │ 200  │201│202│203│204│205│206│207│208│209│210│211│  213   │ │214│215│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┼───┤
- * │   300  │302│303│304│305│306│307│308│309│310│311│    312   │┌───┐│314│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
- * │ 400│ 401│ 402│          403           │ 404│ 405│ 406│ ┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
- *                                                          └───┴───┴───┘
- */
-
-#define LAYOUT_ansi( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,             \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, KC_NO }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214,  K215 }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  KC_NO }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│013│014│   ┌───┐
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   │015│
- * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ 113 │   └───┘
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌───┬───┐
- * │ 200  │201│202│203│204│205│206│207│208│209│210│211│  213   │ │214│215│
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┼───┤
- * │   300  │302│303│304│305│306│307│308│309│310│311│    312   │┌───┐│314│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
- * │ 400│ 401│ 402│          403           │ 404│ 405│ 406│ ┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
- *                                                          └───┴───┴───┘
- */
-
-#define LAYOUT_ansi_splitbs( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,             \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015  }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, KC_NO }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214,  K215  }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  KC_NO }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│  013  │   ┌───┐
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤   │015│
- * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│     │   └───┘
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ 213│ ┌───┬───┐
- * │ 200  │201│202│203│204│205│206│207│208│209│210│211│212│    │ │214│215│
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ └───┼───┤
- * │ 300│301│302│303│304│305│306│307│308│309│310│311│    312   │┌───┐│314│
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
- * │ 400│ 401│ 402│          403           │ 404│ 405│ 406│ ┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
- *                                                          └───┴───┴───┘
- */
-
-#define LAYOUT_iso( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,                   \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, KC_NO, KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  KC_NO }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │000│001│002│003│004│005│006│007│008│009│010│011│012│013│014│   ┌───┐
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   │015│
- * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│     │   └───┘
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ 213│ ┌───┬───┐
- * │ 200  │201│202│203│204│205│206│207│208│209│210│211│212│    │ │214│215│
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ └───┼───┤
- * │ 300│301│302│303│304│305│306│307│308│309│310│311│    312   │┌───┐│314│
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
- * │ 400│ 401│ 402│          403           │ 404│ 405│ 406│ ┌───┼───┼───┐
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
- *                                                          └───┴───┴───┘
- */
-
-#define LAYOUT_iso_splitbs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,                   \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015  }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, KC_NO, KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  KC_NO }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/lw67/readme.md b/keyboards/lw67/readme.md
deleted file mode 100644
index dacd09b5e05..00000000000
--- a/keyboards/lw67/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# LW-67
-
-![LW67](https://i.imgur.com/mcM1TTi.jpg)
-
-A 65% Keyboard with a LHS rotary encoder, made and sold by Laneware Peripherals.
-
-* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
-* Hardware Supported: Macro-1
-* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
-
-Make example for this keyboard (after setting up your build environment):
-
-    make lw67: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 encoder and plug in the keyboard
-* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/lw75/readme.md b/keyboards/lw75/readme.md
deleted file mode 100644
index 9f64108fa51..00000000000
--- a/keyboards/lw75/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# LW-75
-
-![LW75](https://i.imgur.com/JczcWsmh.jpg)
-
-A 75% Keyboard with a LHS rotary encoder, made and sold by Laneware Peripherals.
-
-* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
-* Hardware Supported: LW-75
-* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
-
-Make example for this keyboard (after setting up your build environment):
-
-    make lw75:default
-    
-Flashing example for this keyboard:
-    make lw75: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:
-
-* **Bootmagic reset**: Hold down the encoder and plug in the keyboard
-* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/lxxt/config.h b/keyboards/lxxt/config.h
deleted file mode 100644
index 03ef56622c0..00000000000
--- a/keyboards/lxxt/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2023 DeskDaily
- *
- * 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 WS2812_PIO_USE_PIO1
\ No newline at end of file
diff --git a/keyboards/m10a/keymaps/gam3cat/keymap.c b/keyboards/m10a/keymaps/gam3cat/keymap.c
deleted file mode 100644
index 8860bbd0108..00000000000
--- a/keyboards/m10a/keymaps/gam3cat/keymap.c
+++ /dev/null
@@ -1,150 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-extern keymap_config_t keymap_config;
-
-enum layers {
-    _L0 = 0,
-    _L1,
-    _L2,
-    _L3,
-    _L4,
-    _L5,
-    _L6,
-    _L7,
-    _L8,
-    _L9
-};
-
-enum custom_keycodes {
-    QMK_REV = SAFE_RANGE,
-    KC_WEB,
-    KC_WCLS,
-    DYNAMIC_MACRO_RANGE
-};
-
-extern backlight_config_t backlight_config;
-
-#include "dynamic_macro.h"
-#define FN_ZERO LT(_L9, KC_KP_0)
-#define KC_DMR1 DM_REC1
-#define KC_DMR2 DM_REC2
-#define KC_DMP1 DM_PLY1
-#define KC_DMP2 DM_PLY2
-#define KC_DMRS DM_RSTP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*## Layout Config:
-    *     .-----------.  .-----------.  .-----------.  .-----------.  .-----------.
-    *     |7  |8  |9  |  |+  |-  |*  |  |^  |&  |!  |  |VLU|Ver|WFD|  |VLU|NXT|FFD|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |4  |5  |6  |  |/  |%  |,  |  |D  |E  |F  |  |MUT|C-W|CHR|  |MUT|STP|PLY|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |1  |2  |3  |  |.  |=  |Ent|  |A  |B  |C  |  |VLD|CMP|WBK|  |VLD|PRV|RWD|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |#L0|_L9/0  |  |#L1|_L9    |  |#L2|_L9    |  |#L3|_L9    |  |#L4|_L9    |
-    *     *-----------*  *-----------*  *-----------*  *-----------*  *-----------*
-    *     .-----------.  .-----------.  .-----------.  .-----------.  .-----------.
-    *     |   |   |   |  |   |   |   |  |MP1|   |MP2|  |   |   |RST|  |_L6|_L7|_L8|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |   |   |   |  |   |   |   |  |   |MRS|   |  |   |   |   |  |_L3|_L4|_L5|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |   |   |   |  |   |   |   |  |MR1|   |MR2|  |   |   |   |  |_L0|_L1|_L2|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |#L5|_L9    |  |#L6|_L9    |  |#L7|_L9    |  |#L8|_L9    |  |#L9|       |
-    *     *-----------*  *-----------*  *-----------*  *-----------*  *-----------*
-    */
-    [_L0] = {{KC_KP_7, KC_KP_8, KC_KP_9}, {KC_KP_4, KC_KP_5, KC_KP_6}, {KC_KP_1, KC_KP_2, KC_KP_3}, {XXXXXXX, XXXXXXX, FN_ZERO}},
-    [_L1] = {{KC_PPLS, KC_PMNS, KC_PAST}, {KC_PSLS, KC_PERC, KC_COMM}, {KC_PDOT, KC_EQL,  KC_PENT}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L2] = {{KC_CIRC, KC_AMPR, KC_EXLM}, {S(KC_D), S(KC_E), S(KC_F)}, {S(KC_A), S(KC_B), S(KC_C)}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L3] = {{KC_VOLU, QMK_REV, KC_WFWD}, {KC_MUTE, KC_WCLS, KC_WEB }, {KC_VOLD, KC_MYCM, KC_WBAK}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L4] = {{KC_VOLU, KC_MNXT, KC_MFFD}, {KC_MUTE, KC_MSTP, KC_MPLY}, {KC_VOLD, KC_MPRV, KC_MRWD}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L5] = {{_______, _______, _______}, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L6] = {{_______, _______, _______}, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L7] = {{KC_DMP1, _______, KC_DMP2}, {_______, KC_DMRS, _______}, {KC_DMR1, _______, KC_DMR2}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L8] = {{_______, _______, QK_BOOT  }, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L9] = {{DF(_L6), DF(_L7), DF(_L8)}, {DF(_L3), DF(_L4), DF(_L5)}, {DF(_L0), DF(_L1), DF(_L2)}, {XXXXXXX, XXXXXXX, _______}},
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QMK_REV:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION ":" QMK_BUILDDATE);
-            }
-            return false;
-            break;
-        case KC_WEB:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LGUI("r"));
-                wait_ms(100);
-                SEND_STRING("chrome.exe\n");
-            }
-            return false;
-            break;
-        case KC_WCLS:
-            if (record->event.pressed) {
-                SEND_STRING (SS_LCTL("w"));
-            }
-            return false;
-            break;
-    }
-    // Dynamic Macros.
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    return true;
-}
-
-void custom_backlight_level(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS)
-        level = BACKLIGHT_LEVELS;
-    backlight_config.level = level;
-    backlight_config.enable = !!backlight_config.level;
-    backlight_set(backlight_config.level);
-}
-
-void matrix_init_user(void) {
-  #ifdef BACKLIGHT_ENABLE
-    custom_backlight_level(0);
-  #endif
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _L0:
-            custom_backlight_level(0);
-            break;
-        case _L1:
-            custom_backlight_level(1);
-            break;
-        case _L2:
-            custom_backlight_level(2);
-            break;
-        case _L3:
-            custom_backlight_level(3);
-            break;
-        case _L4:
-            custom_backlight_level(4);
-            break;
-        case _L5:
-            custom_backlight_level(5);
-            break;
-        case _L6:
-            custom_backlight_level(6);
-            break;
-        case _L7:
-            custom_backlight_level(6);
-            break;
-        case _L8:
-            custom_backlight_level(6);
-            break;
-        case _L9:
-            custom_backlight_level(0);
-            break;
-        default:
-            custom_backlight_level(0);
-            break;
-    }
-    return state;
-}
diff --git a/keyboards/m10a/keymaps/gam3cat/readme.md b/keyboards/m10a/keymaps/gam3cat/readme.md
deleted file mode 100644
index 5c68e8c8936..00000000000
--- a/keyboards/m10a/keymaps/gam3cat/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Keymap Maintainer: Gam3cat
-make m10a:gam3cat
-## Layout Config:
-    .-----------.  .-----------.  .-----------.  .-----------.  .-----------.
-    |7  |8  |9  |  |+  |-  |*  |  |^  |&  |!  |  |VLU|Ver|WFD|  |VLU|NXT|FFD|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |4  |5  |6  |  |/  |%  |,  |  |D  |E  |F  |  |MUT|C-W|CHR|  |MUT|STP|PLY|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |1  |2  |3  |  |.  |=  |Ent|  |A  |B  |C  |  |VLD|CMP|WBK|  |VLD|PRV|RWD|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |#L0|_L9/0  |  |#L1|_L9    |  |#L2|_L9    |  |#L3|_L9    |  |#L4|_L9    |
-    *-----------*  *-----------*  *-----------*  *-----------*  *-----------*
-    .-----------.  .-----------.  .-----------.  .-----------.  .-----------.
-    |   |   |   |  |   |   |   |  |MP1|   |MP2|  |   |   |RST|  |_L6|_L7|_L8|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |   |   |   |  |   |   |   |  |   |MRS|   |  |   |   |   |  |_L3|_L4|_L5|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |   |   |   |  |   |   |   |  |MR1|   |MR2|  |   |   |   |  |_L0|_L1|_L2|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |#L5|_L9    |  |#L6|_L9    |  |#L7|_L9    |  |#L8|_L9    |  |#L9|       |
-    *-----------*  *-----------*  *-----------*  *-----------*  *-----------*
diff --git a/keyboards/m10a/keymaps/gam3cat/rules.mk b/keyboards/m10a/keymaps/gam3cat/rules.mk
deleted file mode 100644
index ce170ae85fe..00000000000
--- a/keyboards/m10a/keymaps/gam3cat/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-TAP_DANCE_ENABLE = no       # Enable TapDance functionality
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+1500)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes           # Nkey Rollover - If this doesn't work, add this to config.h: #define FORCE_NKRO
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = no      # Enable extended unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-#VARIABLE_TRACE = no         # Use this to debug changes to variable values
-KEY_LOCK_ENABLE = no        # This enables key lock(+260)
-SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
diff --git a/keyboards/macro1/keymaps/default/keymap.c b/keyboards/macro1/keymaps/default/keymap.c
deleted file mode 100644
index 047ea698085..00000000000
--- a/keyboards/macro1/keymaps/default/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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
-
-/* 
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K02│K03│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * ├───┼───┼───┤   │ 
- * │K30│K31│K32│   │
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * ├───┴───┼───┤   │ 
- * │K50    │K52│   │
- * └───────┴───┴───┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT_numpad(
-		KC_MUTE, KC_MPLY,     KC_BSPC, 
-		KC_CALC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, 
-		KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS, 
-		KC_KP_4, KC_KP_5,     KC_KP_6, 
-		KC_KP_1, KC_KP_2,     KC_KP_3,        KC_KP_ENTER, 
-		KC_KP_0, KC_KP_DOT)
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}
-};
-#endif
-
-
diff --git a/keyboards/macro1/keymaps/via/keymap.c b/keyboards/macro1/keymaps/via/keymap.c
deleted file mode 100644
index f3e53a78e9d..00000000000
--- a/keyboards/macro1/keymaps/via/keymap.c
+++ /dev/null
@@ -1,103 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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
-
-/* 
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K02│K03│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * ├───┼───┼───┤   │ 
- * │K30│K31│K32│   │
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * ├───┴───┼───┤   │ 
- * │K50    │K52│   │
- * └───────┴───┴───┘
- */
-
- /* 
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K02│K03│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * │   ├───┼───┼───┤ 
- * │   │K31│K32│K33│
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * │   ├───┼───┴───┤ 
- * │   │K51│K52    │
- * └───┴───┴───────┘
- */
-
-/* 
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K01│K02│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * ├───┼───┼───┼───┤ 
- * │K30│K31│K32│K33│
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * ├───┼───┼───┼───┤ 
- * │K50│K51│K52│K53│
- * └───┴───┴───┴───┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT_numpad(
-		KC_MUTE, KC_MPLY,     KC_BSPC, 
-		KC_CALC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, 
-		KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS, 
-		KC_KP_4, KC_KP_5,     KC_KP_6, 
-		KC_KP_1, KC_KP_2,     KC_KP_3,        KC_KP_ENTER, 
-		KC_KP_0, KC_KP_DOT),
-
-	[1] = LAYOUT_numpad(
-		KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, 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_numpad(
-		KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, 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_numpad(
-		KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, 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/macro1/macro1.c b/keyboards/macro1/macro1.c
deleted file mode 100644
index f1fbed1d150..00000000000
--- a/keyboards/macro1/macro1.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2021 Laneware Peripherals
- *
- * 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 "macro1.h"
-
-
-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_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/macro1/macro1.h b/keyboards/macro1/macro1.h
deleted file mode 100644
index 1066258050b..00000000000
--- a/keyboards/macro1/macro1.h
+++ /dev/null
@@ -1,115 +0,0 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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"
-
-/* KEYMAP_numpad
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K02│K03│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * ├───┼───┼───┤   │ 
- * │K30│K31│K32│   │
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * ├───┴───┼───┤   │ 
- * │K50    │K52│   │
- * └───────┴───┴───┘
- */
-#define LAYOUT_numpad( \
-	K00,      K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32,      \
-	K40, K41, K42, K43, \
-	K50,      K52  \
-) { \
-	{ K00,   KC_NO, K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   KC_NO }, \
-	{ K40,   K41,   K42,   K43 }, \
-	{ K50,   KC_NO, K52,   KC_NO }  \
-}
-
-/* KEYMAP_southpaw
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K02│K03│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * │   ├───┼───┼───┤ 
- * │   │K31│K32│K33│
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * │   ├───┼───┴───┤ 
- * │   │K51│K52    │
- * └───┴───┴───────┘
- */
-#define LAYOUT_southpaw( \
-	K00,      K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	     K31, K32, K33, \
-	K40, K41, K42, K43, \
-	     K51, K52  \
-) { \
-	{ K00,   KC_NO, K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ KC_NO, K31,   K32,   K33 }, \
-	{ K40,   K41,   K42,   K43 }, \
-	{ KC_NO, K51,   K52,   KC_NO }  \
-}
-
-/* KEYMAP_macropad
- * ┌───┐   ┌───┬───┐ 
- * │K00│   │K01│K02│
- * └───┘   └───┴───┘ 
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤ 
- * │K20│K21│K22│K23│
- * ├───┼───┼───┼───┤ 
- * │K30│K31│K32│K33│
- * ├───┼───┼───┼───┤ 
- * │K40│K41│K42│K43│
- * ├───┼───┼───┼───┤ 
- * │K50│K51│K52│K53│
- * └───┴───┴───┴───┘
- */
-#define LAYOUT_macropad( \
-	K00,      K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33, \
-	K40, K41, K42, K43, \
-	K50, K51, K52, K53  \
-) { \
-	{ K00,   KC_NO,  K02,  K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ K20,   K21,   K22,   K23 }, \
-	{ K30,   K31,   K32,   K33 }, \
-	{ K40,   K41,   K42,   K43 }, \
-	{ K50,   K51,   K52,   K53 }  \
-}
diff --git a/keyboards/macro1/readme.md b/keyboards/macro1/readme.md
deleted file mode 100644
index 578a34e1c70..00000000000
--- a/keyboards/macro1/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Macro-1
-
-![Macro-1](https://i.imgur.com/pnTgKuTh.jpeg)
-
-A versitile numpad/macropad (14x6) with a rotary encoder, made and sold by Laneware Peripherals.
-
-* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
-* Hardware Supported: Macro-1
-* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
-
-Make example for this keyboard (after setting up your build environment):
-
-    make macro1: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 encoder and plug in the keyboard
-* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/macro3/readme.md b/keyboards/macro3/readme.md
deleted file mode 100644
index 40cf9273924..00000000000
--- a/keyboards/macro3/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Macro3
-
-![Macro3](https://github.com/filterpaper/filterpaper.github.io/raw/main/images/macro3.png)
-
-Macro3 is a low-profile macro pad with dual encoder support designed by [@davidphilipbarr](https://github.com/davidphilipbarr).
-
-## Keyboard Info
-
-* Keyboard Maintainer: [filterpaper](https://github.com/filterpaper), [davidphilipbarr](https://github.com/davidphilipbarr)
-* Hardware Supported: [Macro3](https://github.com/davidphilipbarr/Macropads/tree/main/macro3)
-* Hardware Availability: order PCBs with gerber file from the repository
-
-Make example for this keyboard (after setting up your build environment):
-
-    make macro3: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 right key and plug in the controller.
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured.
-* **Physical reset pins**: Briefly short the RST and GND pins on the microcontroller using tweezers, a paperclip, or any other conductive material.
-
diff --git a/keyboards/magic_force/mf17/config.h b/keyboards/magic_force/mf17/config.h
deleted file mode 100644
index 6e9f18cd5d2..00000000000
--- a/keyboards/magic_force/mf17/config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2023 devzhaoyou (@gevzhaoyou)
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 17
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED //
-
diff --git a/keyboards/magic_force/mf17/info.json b/keyboards/magic_force/mf17/info.json
index 397a5c879a7..705318e71e0 100644
--- a/keyboards/magic_force/mf17/info.json
+++ b/keyboards/magic_force/mf17/info.json
@@ -74,24 +74,26 @@
         },
         "driver": "ws2812",
         "layout": [
-            {"flags": 1, "matrix": [0, 0], "x": 0,   "y": 0},
-            {"flags": 1, "matrix": [0, 1], "x": 75,  "y": 0},
-            {"flags": 1, "matrix": [0, 2], "x": 150, "y": 0},
-            {"flags": 1, "matrix": [0, 3], "x": 224, "y": 0},
-            {"flags": 1, "matrix": [1, 0], "x": 0,   "y": 16},
-            {"flags": 1, "matrix": [1, 1], "x": 75,  "y": 16},
-            {"flags": 1, "matrix": [1, 2], "x": 150, "y": 16},
+            {"flags": 1, "matrix": [4,  1], "x": 37,  "y": 64},
+            {"flags": 1, "matrix": [4,  2], "x": 150, "y": 64},
+            {"flags": 1, "matrix": [4,  3], "x": 224, "y": 56},
+            {"flags": 1, "matrix": [3,  0], "x": 0,   "y": 48},
+            {"flags": 1, "matrix": [3,  1], "x": 75,  "y": 48},
+            {"flags": 1, "matrix": [3,  2], "x": 150, "y": 48},
             {"flags": 1, "matrix": [2, 0], "x": 0,   "y": 32},
             {"flags": 1, "matrix": [2,  1], "x": 75,  "y": 32},
             {"flags": 1, "matrix": [2,  2], "x": 150, "y": 32},
             {"flags": 1, "matrix": [2,  3], "x": 224, "y": 24},
-            {"flags": 1, "matrix": [3,  0], "x": 0,   "y": 48},
-            {"flags": 1, "matrix": [3,  1], "x": 75,  "y": 48},
-            {"flags": 1, "matrix": [3,  2], "x": 150, "y": 48},
-            {"flags": 1, "matrix": [4,  0], "x": 32,  "y": 64},
-            {"flags": 1, "matrix": [4,  1], "x": 150, "y": 64},
-            {"flags": 1, "matrix": [4,  2], "x": 224, "y": 64}
-        ]
+            {"flags": 1, "matrix": [1, 0], "x": 0,   "y": 16},
+            {"flags": 1, "matrix": [1, 1], "x": 75,  "y": 16},
+            {"flags": 1, "matrix": [1, 2], "x": 150, "y": 16},
+            {"flags": 1, "matrix": [0, 0], "x": 0,   "y": 0},
+            {"flags": 1, "matrix": [0, 1], "x": 75,  "y": 0},
+            {"flags": 1, "matrix": [0, 2], "x": 150, "y": 0},
+            {"flags": 1, "matrix": [0, 3], "x": 224, "y": 0}
+        ],
+        "max_brightness": 180,
+        "sleep": true
     },
     "indicators": {
         "caps_lock": "B15",
diff --git a/keyboards/magic_force/mf34/config.h b/keyboards/magic_force/mf34/config.h
index ce02ad5d68d..1cb16c5f86d 100644
--- a/keyboards/magic_force/mf34/config.h
+++ b/keyboards/magic_force/mf34/config.h
@@ -19,59 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 34
-
-#ifdef RGB_MATRIX_ENABLE
-#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#        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 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
-#endif
-
-// rgb EFFCET --end
diff --git a/keyboards/magic_force/mf34/info.json b/keyboards/magic_force/mf34/info.json
index 86b08087cbc..027904e7296 100644
--- a/keyboards/magic_force/mf34/info.json
+++ b/keyboards/magic_force/mf34/info.json
@@ -16,7 +16,53 @@
         "pin": "C15"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"],
diff --git a/keyboards/majistic/keymaps/default/config.h b/keyboards/majistic/keymaps/default/config.h
deleted file mode 100644
index 4db5715cbac..00000000000
--- a/keyboards/majistic/keymaps/default/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 yossiyossy
- *
- * 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
diff --git a/keyboards/maple_computing/c39/keymaps/drashna/config.h b/keyboards/maple_computing/c39/keymaps/drashna/config.h
deleted file mode 100644
index e48bc46ca82..00000000000
--- a/keyboards/maple_computing/c39/keymaps/drashna/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.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
-
-// place overrides here
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS \
-    { A3, A2, A1, A0, B13, B14, B15, B9, B3, B2, B4, A10, A9 }
-#undef MATRIX_ROW_PINS
-#define MATRIX_ROW_PINS \
-    { B7, B1, B0 }
-
-#define RGB_DI_PIN B10
-#define RGBLED_NUM 15
-
-#define SOLENOID_PIN B11
-
-#define AUDIO_PIN A5
-#define AUDIO_PIN_ALT A4
-#define AUDIO_PIN_ALT_AS_NEGATIVE
diff --git a/keyboards/maple_computing/jnao/rules.mk b/keyboards/maple_computing/jnao/rules.mk
index 4c9e4991bf0..a18e35e796a 100644
--- a/keyboards/maple_computing/jnao/rules.mk
+++ b/keyboards/maple_computing/jnao/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS_HAS_RGB = no
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
index 3d47ae41e76..c50e0103757 100644
--- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
@@ -12,7 +12,7 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 2  // Number of LEDs
+#define RGBLIGHT_LED_COUNT 2  // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/config.h
deleted file mode 100644
index 526c0837c72..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/config.h
deleted file mode 100644
index c535299e74a..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
- // place overrides here
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c
deleted file mode 100644
index 622e539c7b9..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c
+++ /dev/null
@@ -1,120 +0,0 @@
-#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 layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _FUNCTION,
-  _ADJUST,
-};
-
-#define LOWER     MO(_LOWER)
-#define RAISE     MO(_RAISE)
-#define FUNCTION  MO(_FUNCTION)
-#define ADJUST    MO(_ADJUST)
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_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_ENT ,
-  _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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,  _______, _______, KC_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | QK_BOOT|      |      |      |      |      |      |RGBMOD|RGBVAI|RGBSAI|RGBHUI|caltde|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |RGBRMO|RGBVAD|RGBSAD|RGBHUD|RGBTOG|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |BLSTEP|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT(
-  QK_BOOT,  _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL,
-  _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |  Up  |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Caps |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/msiu/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/config.h
deleted file mode 100644
index 526c0837c72..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/msiu/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c
deleted file mode 100644
index e1d4828278d..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c
+++ /dev/null
@@ -1,195 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _DVORAK 1
-
-#define _LOWER 3
-#define _RAISE 4
-
-#define _NUMB 14
-#define _FUNC 15
-#define _ADJUST 16
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Hyper | Alt  | GUI  |Lower | Func |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-  LT(_NUMB, KC_TAB),   KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,      KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-  LCTL_T(KC_ESC),      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_HYPR, KC_LALT, KC_LGUI, LOWER, MO(_FUNC), KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-// Dvorak
-[_DVORAK] = LAYOUT(
-  _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,     KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______,
-  _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,     KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,     KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______ ,
-  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      | Mute |      |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower | Bksp | Bksp |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  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_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,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-  _______, _______,  _______, _______, _______, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   4  |   5  |   6  |   +  |  F5  |  F6  |   -  |   =  |   [  |   ]  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Enter |   7  |   8  |   9  |   -  |  F11 |  F12 |ISO # |ISO / | Mute |      |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ,  |   0  |  .   |Lower | Bksp | Bksp |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  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_4,    KC_5,    KC_6,   KC_PLUS, KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_7,    KC_8,    KC_9,   KC_MINS, KC_F11,  KC_F12,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-  _______, _______, _______, _______, _______, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Taskmg|      |      |      |      |      |      |      |RGBVAI|RGBSAI|RGBHUI|caltde|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Qwerty|RGBVAD|RGBSAD|RGBHUD|RGBTOG|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |BLSTEP|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | QK_BOOT|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT(
-  RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
-  RGB_MOD, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, QWERTY,  DVORAK,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
-),
-
-/* FUNC
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |  Up  |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Caps |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, KC_PSCR, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-// Numpad
-[_NUMB] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,    _______, KC_BSPC,
-  _______, _______, _______, _______, _______, _______, _______, KC_4,    KC_5,    KC_6,    _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_1,    KC_2,    KC_3,    _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_0,    KC_0,    _______, _______, _______
-)
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // case QWERTY:
-    //   if (record->event.pressed) {
-    //     persistent_default_layer_set(1UL<<_QWERTY);
-    //   }
-    //   return false;
-    //   break;
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h
deleted file mode 100644
index 0055bbf459d..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-#define EE_HANDS
\ No newline at end of file
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
deleted file mode 100644
index d4b06c6ef35..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-#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 resfury_layers {
-  _COLEMAK,
-  _DVORAK,
-  _QWERTY
-};
-
-enum resfury_keycodes {
-  COLEMAK = SAFE_RANGE,
-  DVORAK,
-  QWERTY,
-};
-
-#define _LOWER 3
-#define _RAISE 4
-#define _FUNCTION 15
-#define _ADJUST 16
-
-#define LOWER     MO(_LOWER)
-#define RAISE     MO(_RAISE)
-#define FUNCTION  MO(_FUNCTION)
-#define ADJUST    MO(_ADJUST)
-
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |   \  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |F/TAB |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |   '  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI | Alt  | Ent  |Lower | Bksp | Spc  | Raise| Left |  Up  | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT(
-  KC_ESC,               KC_Q,     KC_W,    KC_F,    KC_P,  KC_G,    KC_J,   KC_L,  KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  LT(_FUNCTION,KC_TAB), KC_A,     KC_R,    KC_S,    KC_T,  KC_D,    KC_H,   KC_N,  KC_E,    KC_I,    KC_O,    KC_QUOT,
-  OSM(MOD_LSFT),        KC_Z,     KC_X,    KC_C,    KC_V,  KC_B,    KC_K,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT),
-  KC_LCTL,              KC_LGUI,  KC_LALT, KC_ENT,  LOWER, KC_BSPC, KC_SPC, RAISE, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
-),
-
-  /* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |   /  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |F/TAB |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   R  |   L  |   -  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI | Alt  | Ent  |Lower | Bksp | Spc  | Raise| Left |  Up  | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT(
-  KC_ESC,               KC_QUOT,  KC_COMM, KC_DOT,  KC_P,  KC_Y,    KC_F,   KC_G,  KC_C,    KC_R,    KC_L,    KC_SLSH,
-  LT(_FUNCTION,KC_TAB), KC_A,     KC_O,    KC_E,    KC_U,  KC_I,    KC_D,   KC_H,  KC_T,    KC_N,    KC_S,    KC_MINS,
-  OSM(MOD_LSFT),        KC_SCLN,  KC_Q,    KC_J,    KC_K,  KC_X,    KC_B,   KC_M,  KC_W,    KC_V,    KC_Z,    OSM(MOD_RSFT),
-  KC_LCTL,              KC_LGUI,  KC_LALT, KC_ENT,  LOWER, KC_BSPC, KC_SPC, RAISE, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
-),
-
-
- /* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   \  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |F/TAB |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI | Alt  | Ent  |Lower | Bksp | Spc  | Raise| Left |  Up  | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_BSLS,
-  LT(_FUNCTION,KC_TAB), KC_A,     KC_S,    KC_D,    KC_F,  KC_G,    KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  OSM(MOD_LSFT),        KC_Z,     KC_X,    KC_C,    KC_V,  KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT),
-  KC_LCTL,              KC_LGUI,  KC_LALT, KC_ENT,  LOWER, KC_BSPC, KC_SPC, RAISE, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  ~   |  `   | Mute | Ctl/ |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower | Bksp | Spc  |Adjust| Play | Vol+ | Vol- | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_ESC,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,   KC_ASTR, KC_LPRN, KC_RPRN,       KC_DEL,
-  _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,   KC_PLUS, KC_LCBR, KC_RCBR,       _______,
-  _______, KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_GRV), KC_GRV,  KC_MUTE, RCTL(KC_BSLS), KC_PIPE,
-  _______, _______,  _______, _______, _______, KC_BSPC, KC_SPC,  ADJUST,    KC_MPLY, KC_VOLU, KC_VOLD,       KC_MNXT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   4  |   5  |   6  |   +  |   -  |  +   |   -  |   =  |   [  |   ]  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   7  |   8  |   9  |   *  |   /  |  *   |   /  |   .  | Mute | Ctl/ |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ,  |   0  |  .   |Adjust| Bksp | Spc  |Raise | Play | Vol+ | Vol- | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,  KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_DEL,
-  _______, KC_4,    KC_5,  KC_6,   KC_PLUS, KC_MINS, KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,       _______,
-  _______, KC_7,    KC_8,  KC_9,   KC_ASTR, KC_SLSH, KC_ASTR, KC_SLSH, KC_DOT,  KC_MUTE, RCTL(KC_BSLS), KC_BSLS,
-  _______, KC_COMM, KC_0,  KC_DOT, ADJUST,  KC_BSPC, KC_SPC,  _______, KC_MPLY, KC_VOLU, KC_VOLD,       KC_MNXT
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Taskmg|      |      |      |      |      |      |      |RGBVAI|RGBSAI|RGBHUI|caltde|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |_COLEMAK|    |      |      |      |      |      |      |RGBVAD|RGBSAD|RGBHUD|RGBTOG|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |_DVORAK|     |      |      |      |      |      |      |      |      |RGBMOD|BLSTEP|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |_QWERTY|     |      |      |      |      |      |      |      |      |      | QK_BOOT|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT(
-  TSKMGR,       _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL,
-  DF(_COLEMAK), _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
-  DF(_DVORAK),  _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, BL_STEP,
-  DF(_QWERTY),  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * | Caps |      |      |      |      |      | S(Hm)| Home |  Up  | End  |S(End)|      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Ctrl | Shift| Alt  |      |      |      | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT(
-  KC_CAPS, _______, _______, _______, _______, _______, S(KC_HOME), KC_HOME, KC_UP,   KC_END,  S(KC_END), _______,
-  _______, KC_LCTL, KC_LSFT, KC_LALT, _______, _______, _______,    KC_LEFT, KC_DOWN, KC_RGHT, _______,   _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,   _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,   _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md
deleted file mode 100644
index 6a882307b7e..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-![Let's Split Eh?](https://imgur.com/a/riUxwpl)
-
-# ResFury Let's Split, Eh Layout
-
-This layout specializes the Let's Split, Eh for Colevrak users that occasionally let others play with their toys. Adjust layer allows swapping to Colemak/Dvorak/Qwerty alphas. Heavily influenced by the default planck layout, but with up/down switched, a left hand 10-key, remapped backspace, and a few convenience keys.
-
-Master set by EE_HANDS method.
\ No newline at end of file
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk
deleted file mode 100644
index 7ad666d1a38..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/config.h
deleted file mode 100644
index a1df337bd92..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#endif
\ No newline at end of file
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c
deleted file mode 100644
index 8362715a025..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c
+++ /dev/null
@@ -1,166 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 3
-#define _RAISE 4
-#define _FUNCTION 15
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Func |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  `   | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_BSPC,
-  MO(_FUNCTION), KC_A,   KC_S,    KC_D,    KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  OSM(MOD_LSFT), KC_Z,   KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_LCTL,       KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      | Mute |      |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower | Bksp | Bksp |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_ESC,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-  _______, KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_MUTE, _______, KC_PIPE,
-  _______, _______,  _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   4  |   5  |   6  |   +  |  F5  |  F6  |   -  |   =  |   [  |   ]  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Enter |   7  |   8  |   9  |   -  |  F11 |  F12 |ISO # |ISO / | Mute |      |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ,  |   0  |  .   |Lower | Bksp | Bksp |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,  KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  _______, KC_4,    KC_5,  KC_6,   KC_PLUS, KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  KC_ENT,  KC_7,    KC_8,  KC_9,   KC_MINS, KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS,
-  _______, KC_COMM, KC_0,  KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Taskmg|      |      |      |      |      |      |      |RGBVAI|RGBSAI|RGBHUI|caltde|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Qwerty|RGBVAD|RGBSAD|RGBHUD|RGBTOG|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |BLSTEP|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | QK_BOOT|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT(
-  TSKMGR,  _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL,
-  _______, _______, _______, _______, _______, _______, _______, QWERTY,  RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |  Up  |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Caps |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/vial/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/vial/keymap.c
index 4a959e32cec..dbeee07dc0a 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/vial/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/vial/keymap.c
@@ -93,16 +93,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef RGBLIGHT_LAYERS
 const rgblight_segment_t PROGMEM my_layerQW_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, RGBLED_NUM, HSV_OFF}
+    {0, RGBLIGHT_LED_COUNT, HSV_OFF}
 );
 const rgblight_segment_t PROGMEM my_layerLW_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, RGBLED_NUM, HSV_CYAN}
+    {0, RGBLIGHT_LED_COUNT, HSV_CYAN}
 );
 const rgblight_segment_t PROGMEM my_layerRS_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, RGBLED_NUM, HSV_RED}
+    {0, RGBLIGHT_LED_COUNT, HSV_RED}
 );
 const rgblight_segment_t PROGMEM my_layerAD_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, RGBLED_NUM, HSV_GREEN}
+    {0, RGBLIGHT_LED_COUNT, HSV_GREEN}
 );
 
 // Now define the array of layers. Later layers take precedence
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/vial/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/vial/rules.mk
index 46e3d41ae69..679629b1e17 100644
--- a/keyboards/maple_computing/lets_split_eh/keymaps/vial/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/vial/rules.mk
@@ -1,7 +1,7 @@
 # Build options
 BACKLIGHT_ENABLE = no
 BOOTMAGIC_ENABLE = yes
-COMBO_ENABLE = yes
+COMBO_ENABLE = no
 KEY_OVERRIDE_ENABLE = no
 LTO_ENABLE = yes
 MOUSEKEY_ENABLE = no
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/config.h b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
deleted file mode 100644
index 6780e524abd..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/alairock/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Skyler Lewis
-
-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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define EE_HANDS
-
-/* ws2812 RGB LED */
-#define WS2812_DI_PIN D7
-
-#define RGBLED_NUM 8   // Number of LEDs
-#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 RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#endif
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
deleted file mode 100644
index fd20a6cdc1d..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
+++ /dev/null
@@ -1,157 +0,0 @@
-// Note: this is a modification of that_canadian's config, albeit heavily modified.
-// this layout turns your left thumb cluster into something more familiar.
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |           |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  |           |   H  |   J  |   K  |   L  |   ;  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  |           |   N  |   M  |   ,  |   .  |   /  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  | Shift/Esc | GUI/Tab|    |      | RAISE| LOWER |
- *                  `-------------|BSpace|    |Space |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_QWERTY] = LAYOUT(
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-                    SFT_T(KC_ESC), GUI_T(KC_TAB), KC_BSPC,         KC_SPC, RAISE, LOWER
-),
-/* Raise
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |           |   6  |   7  |   8  |   9  |   0  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Tab | VOLU | VOLD | PLAY | MFFD |           | MUTE |   -  |   =  |   [  |   ]  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Ctrl|   `  |  GUI |  Alt | MRWD |           |      |      |      |   \  |   '  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  | CTRL | BSPC |      |    |      |      |      |
- *                  `-------------| Enter|    |      |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_RAISE] = LAYOUT(
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-  KC_TAB,  KC_VOLD, KC_VOLU, KC_MPLY, KC_MFFD,      KC_MUTE, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
-  _______, KC_GRV,  KC_LGUI, KC_LALT, KC_MRWD,          _______, _______, _______, KC_BSLS,  KC_QUOT,
-                    KC_LCTL, KC_BSPC, KC_ENT,      _______, _______, _______
-),
-
-/* Lower
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   !  |   @  |   #  |   $  |   %  |           |   ^  |   &  |   *  |   (  |   )  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Esc | VOLU | VOLD | PLAY | MFFD |           | MUTE |   _  |   +  |   {  |   }  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Caps|   ~  |      |      | MRWD |           |      |      |      |   |  |   "  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  | RAISE | DEL |      |    |      |      |      |
- *                  `-------------|      |    | Enter|------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_LOWER] = LAYOUT(
-  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-  KC_ESC,  KC_VOLD, KC_VOLU, KC_MPLY, KC_MFFD,      KC_MUTE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
-  KC_CAPS, KC_TILD, _______, _______,  KC_MRWD,      _______, _______, _______, KC_PIPE,  KC_DQT,
-                    RAISE, KC_DEL, _______,      KC_ENT,  _______, _______
-),
-
-/* Adjust (Lower + Raise)
- *
- * ,----------------------------------.           ,----------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |           |   F6 |  F7  |  Up  |  F9  |  F10 |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  F11 |  F12 |      |RGBSAI|RGBSAD|           |      | Left | Down |Right |caltde|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | Reset|RGBTOG|RGBMOD|RGBHUI|RGBHUD|           |RGBVAI|RGBVAD|  F8  |Taskmg|      |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | LOWER|      |    |      | RAISE|      |
- *                  `-------------|      |    |      |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_ADJUST] =  LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,   KC_UP,   KC_F9,   KC_F10,
-  KC_F11,  KC_F12, RGB_RMOD, RGB_SAI, RGB_SAD,      _______, KC_LEFT, KC_DOWN, KC_RGHT, CALTDEL,
-  QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,      RGB_VAI, RGB_VAD, KC_F8, TSKMGR,  _______,
-                    _______, _______, _______,      _______,  _______, _______
-)
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/rules.mk b/keyboards/maple_computing/minidox/keymaps/alairock/rules.mk
deleted file mode 100644
index ebada165ae7..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/alairock/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-EXTRAKEY_ENABLE = yes
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/README.md b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/README.md
deleted file mode 100644
index b2ec771257e..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## dustypomerleau, Minidox layout
-
-The rationale behind my layout can be summarized as follows:
-
-- Symmetry is important because use-cases are hard to predict. Whenever possible, modifiers and layer keys should be available from either hand.
-- Inward rolls should be leveraged not just for alphas (Colemak DHm), but also for coding/symbols.
-- Number order—like alpha order—should be designed to favor use of the strongest fingers.
-- One-shot keys can greatly reduce the strain of typing, and should be leveraged.
-
-Some aspects of my layout are optimized for macOS (order of modifiers, manner of producing en and em dashes, coding of micro-volume adjustments, etc.), but can be easily tweaked for the OS of your choice.
-
-Shift can be a tricky modifier when used in `MT()` combinations, particularly for fast typists on split boards using serial. This can be partially mitigated with options in `config.h`, but still requires a relatively strict typing style/accuracy from the fast typist. The tendency is for faster typists to combat mod/tap mistakes by using very short intervals for `TAPPING_TERM`, but this can introduce its own set of complications. Shift is also one of the highest-yield opportunities to use `OSM()`. For these reasons, I pulled Shift onto dedicated keys in the thumbs for use during regular typing (the home row Shifts have been left in place for use during selection and keycuts). 
-
-The tapdance code that I used to create mod/tap keys inside my symbol layer allows up to 2 consecutive symbols within `TAPPING_TERM`. If you think you will need to quickly nest more than that, feel free to add more `case`s.
-
-### Special thanks
-
-- Everyone on the QMK Discord, for helping me work out the code for mod/tap keys using shifted symbols.
-- Everyone on the Colemak Discord, for their initial feedback on the layout.
-- @stevep and @DreymaR, for their work on Colemak DH(m), a truly awesome typing experience (and of course Shai Coleman, for starting it all off!).
-- @ckofy, for offering a dramatic improvement on Dvorak's original number order.
-- u/That-Canadian, for designing this awesome keyboard.
-
-### Questions or comments?
-
-- GitHub @dustypomerleau
-- Twitter @duspom
-- Discord @dusty#8897
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
deleted file mode 100644
index af4401a4a09..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// dustypomerleau, Minidox config
-
-#pragma once
-
-#define EE_HANDS
-#define ONESHOT_TIMEOUT 1000
-#define TAPPING_TERM 200
-
-// optional configuration:
-
-// #define CONVERT_TO_PROTON_C
-// #define ONESHOT_TAP_TOGGLE 2 // not compatible with QUICK_TAP_TERM 0
-// #define PERMISSIVE_HOLD
-// #define QUICK_TAP_TERM 0 // allows rapid mod use after tap event, but sacrifices double-tap to repeat
-
-// #define MOUSEKEY_DELAY 0 //  delay before cursor movement (high feels sluggish, low makes fine movement difficult)
-// #define MOUSEKEY_INTERVAL 20 // time between movement reports - low settings feel like high mouse speed
-// #define MOUSEKEY_MAX_SPEED 10
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_WHEEL_DELAY 0
-// #define MOUSEKEY_WHEEL_MAX_SPEED 8
-// #define MOUSEKEY_WHEEL_TIME_TO_MAX 4
-
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
deleted file mode 100644
index 672728fe25f..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
+++ /dev/null
@@ -1,434 +0,0 @@
-// Minidox keymap by dustypomerleau
-// Thanks for checking out my keymap. The rationale behind the layout is described in the README.
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum my_layers {
-  _CMK_DHM,
-  _QWERTY,
-  _SYS,
-  _NAV,
-  _NUM_E,
-  _NUM_N,
-  _SYM
-};
-
-enum my_keycodes {
-  CMK_DHM = SAFE_RANGE,
-  QWERTY,
-  SYS,
-  NAV,
-  NUM_E,
-  NUM_N,
-  SYM
-};
-
-enum td_keycodes {
-  ALT_LP,
-  CTL_RCB,
-  GUI_RP,
-  SFT_LCB,
-  SFT_PLS
-};
-
-typedef enum {
-  SINGLE_TAP,
-  SINGLE_HOLD,
-  DOUBLE_SINGLE_TAP
-} td_state_t;
-
-static td_state_t td_state;
-int cur_dance (tap_dance_state_t *state);
-void altlp_finished (tap_dance_state_t *state, void *user_data);
-void altlp_reset (tap_dance_state_t *state, void *user_data);
-void ctlrcb_finished (tap_dance_state_t *state, void *user_data);
-void ctlrcb_reset (tap_dance_state_t *state, void *user_data);
-void guirp_finished (tap_dance_state_t *state, void *user_data);
-void guirp_reset (tap_dance_state_t *state, void *user_data);
-void sftlcb_finished (tap_dance_state_t *state, void *user_data);
-void sftlcb_reset (tap_dance_state_t *state, void *user_data);
-void sftpls_finished (tap_dance_state_t *state, void *user_data);
-void sftpls_reset (tap_dance_state_t *state, void *user_data);
-
-#define ALT_2 LALT_T(KC_2)
-#define ALT_3 LALT_T(KC_3)
-#define ALT_8 LALT_T(KC_8)
-#define ALT_D LALT_T(KC_D)
-#define ALT_E LALT_T(KC_E)
-#define ALT_K LALT_T(KC_K)
-#define ALT_LB LALT_T(KC_LBRC)
-#define ALT_S LALT_T(KC_S)
-#define CTRL_2 LCTL_T(KC_2)
-#define CTRL_4 LCTL_T(KC_4)
-#define CTRL_5 LCTL_T(KC_5)
-#define CTRL_9 LCTL_T(KC_9)
-#define CTRL_EQ LCTL_T(KC_EQL)
-#define CTRL_I LCTL_T(KC_I)
-#define CTRL_L LCTL_T(KC_L)
-#define CTRL_R LCTL_T(KC_R)
-#define CTRL_S LCTL_T(KC_S)
-#define GUI_0 LGUI_T(KC_0)
-#define GUI_1 LGUI_T(KC_1)
-#define GUI_4 LGUI_T(KC_4)
-#define GUI_7 LGUI_T(KC_7)
-#define GUI_RB LGUI_T(KC_RBRC)
-#define GUI_F LGUI_T(KC_F)
-#define GUI_J LGUI_T(KC_J)
-#define GUI_N LGUI_T(KC_N)
-#define GUI_TEA LGUI_T(KC_T)
-#define MAC_EM S(LALT(KC_MINS))
-#define MAC_EN LALT(KC_MINS)
-#define NAV_BK LT(_NAV, KC_BSPC)
-#define NAV_LK TG(_NAV)
-#define NUME_SPC LT(_NUM_E, KC_SPC)
-#define NUMLK_E TG(_NUM_E)
-#define NUMLK_N TG(_NUM_N)
-#define NUMN_SPC LT(_NUM_N, KC_SPC)
-#define SFT_0 LSFT_T(KC_0)
-#define SFT_1 LSFT_T(KC_1)
-#define SFT_6 LSFT_T(KC_6)
-#define SFT_7 LSFT_T(KC_7)
-#define SFT_A LSFT_T(KC_A)
-#define SFT_O LSFT_T(KC_O)
-#define SFT_OS OSM(MOD_LSFT)
-#define SFT_QOT LSFT_T(KC_QUOT)
-#define SYM_OS OSL(_SYM)
-#define SYS_Z LT(_SYS, KC_Z)
-#define VOL_DN S(LALT(KC_VOLD))
-#define VOL_UP S(LALT(KC_VOLU))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak DHm
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   Q  |   W  |   F  |   P  |   B  |           |   J  |   L  |   U  |   Y  |   '  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | SFT/A| CTL/R| ALT/S| GUI/T|   G  |           |   M  | GUI/N| ALT/E| CTL/I| SFT/O|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | SYS/Z|   X  |   C  |   D  |   V  |           |   K  |   H  |   ,  |   .  |   ;  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,--------------------.
- *                  |SFT/OS|NAV/BK|      |    |      |NUM/SP|SFT/OS|
- *                  `------+------|SYM/OS|    |SYM/OS|------+------'
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_CMK_DHM] = LAYOUT(
-  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,         KC_J,    KC_L,     KC_U,    KC_Y,    KC_QUOT,
-  SFT_A,   CTRL_R,  ALT_S,   GUI_TEA, KC_G,         KC_M,    GUI_N,    ALT_E,   CTRL_I,  SFT_O,
-  SYS_Z,   KC_X,    KC_C,    KC_D,    KC_V,         KC_K,    KC_H,     KC_COMM, KC_DOT,  KC_SCLN,
-                    SFT_OS,  NAV_BK,  SYM_OS,       SYM_OS,  NUME_SPC, SFT_OS
-),
-
-/* QWERTY
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |           |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | SFT/A| CTL/S| ALT/D| GUI/F|   G  |           |   H  | GUI/J| ALT/K| CTL/L| SFT/'|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | SYS/Z|   X  |   C  |   V  |   B  |           |   N  |   M  |   ,  |   .  |   ;  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,--------------------.
- *                  |SFT/OS|NAV/BK|      |    |      |NUM/SP|SFT/OS|
- *                  `------+------|SYM/OS|    |SYM/OS|------+------'
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_QWERTY] = LAYOUT(
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,
-  SFT_A,   CTRL_S,  ALT_D,   GUI_F,   KC_G,         KC_H,    GUI_J,    ALT_K,   CTRL_L,  SFT_QOT,
-  SYS_Z,   KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,     KC_COMM, KC_DOT,  KC_SCLN,
-                    SFT_OS,  NAV_BK,  SYM_OS,       SYM_OS,  NUMN_SPC, SFT_OS
-),
-
-/* System, media, and layer lock keys
- * If you use QWERTY + the Vanilla numbers primarily, change NUMLK_E to NUMLK_N here.
- *
- * ,----------------------------------.           ,----------------------------------.
- * | Boot |Debug |QWERTY|CMKDHM|      |           |      | VOL--| VOL++|BRITE-|BRITE+|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | SHIFT| CTRL |  ALT |  GUI |NAV LK|           | POWER| VOL- | VOL+ | MUTE | MPLY |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |      |      |AU OFF| AU ON|      |           |      |NUM LK| MRWD | MFFD |      |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      |      |      |    |      |      |      |
- *                  `-------------|      |    |      |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_SYS] = LAYOUT(
-  QK_BOOT, DB_TOGG, QWERTY,  CMK_DHM, _______,       _______,  KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,
-  KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK,        KC_PWR,   VOL_DN,  VOL_UP,  KC_MUTE, KC_MPLY,
-  _______, _______, AU_OFF,  AU_ON,   _______,       _______,  NUMLK_E, KC_MRWD, KC_MFFD, _______,
-                    _______, _______, _______,       _______,  _______, _______
-),
-
-/* Navigation + mouse keys
- *
- * ,----------------------------------.           ,----------------------------------.
- * | PSCR |      | WH U | WH D |      |           | BSPC | PGDN | PGUP | HOME |  END |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | SHIFT| CTRL |  ALT |  GUI |NAV LK|           | CAPS | LEFT | DOWN |  UP  | RIGHT|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |      | ACL0 | ACL1 | ACL2 | BTN2 |           | BTN1 | MS L | MS D | MS U | MS R |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,--------------------.
- *                  |      |      |      |    |      | ENTER|      |
- *                  `------+------|  ESC |    | DEL  |------+------'
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_NAV] = LAYOUT(
-  KC_PSCR, _______, KC_WH_U, KC_WH_D, _______,       KC_BSPC, KC_PGDN, KC_PGUP, KC_HOME, KC_END,
-  KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK,        KC_CAPS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-  _______, KC_ACL0, KC_ACL1, KC_ACL2, KC_BTN2,       KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R,
-                    _______, _______, KC_ESC,        KC_DEL,  KC_ENT,  _______
-),
-
-/* Number + function keys (ergonomic number order - default pairing with Colemak)
- *
- * ,----------------------------------.           ,----------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |           |  F6  |  F7  |  F8  |  F9  |  F10 |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | SFT/7| CTL/5| ALT/3| GUI/1|   9  |           |   8  | GUI/0| ALT/2| CTL/4| SFT/6|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  F11 |  F12 |   -  | SPACE| BSPC |           |  DEL |NUM LK|      |      |   /  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,--------------------.
- *                  |      | TAB  |      |    |      |      |      |
- *                  `------+------|  ESC |    |      |------+------'
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_NUM_E] = LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-  SFT_7,   CTRL_5,  ALT_3,   GUI_1,   KC_9,          KC_8,    GUI_0,   ALT_2,   CTRL_4,  SFT_6,
-  KC_F11,  KC_F12,  KC_MINS, KC_SPC,  KC_BSPC,       KC_DEL,  NUMLK_E, _______, _______, KC_SLSH,
-                    _______, KC_TAB,  KC_ESC,        _______, _______, _______
-),
-
-/* Number + function keys (numeric number order - default pairing with QWERTY)
- *
- * ,----------------------------------.           ,----------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |           |  F6  |  F7  |  F8  |  F9  |  F10 |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | SFT/1| CTL/2| ALT/3| GUI/4|   5  |           |   6  | GUI/7| ALT/8| CTL/9| SFT/0|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  F11 |  F12 |   -  | SPACE| BSPC |           |  DEL |NUM LK|      |      |   /  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,--------------------.
- *                  |      | TAB  |      |    |      |      |      |
- *                  `------+------|  ESC |    |      |------+------'
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_NUM_N] = LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-  SFT_1,   CTRL_2,  ALT_3,   GUI_4,   KC_5,          KC_6,    GUI_7,   ALT_8,   CTRL_9,  SFT_0,
-  KC_F11,  KC_F12,  KC_MINS, KC_SPC,  KC_BSPC,       KC_DEL,  NUMLK_N, _______, _______, KC_SLSH,
-                    _______, KC_TAB,  KC_ESC,        _______, _______, _______
-),
-
-
-/* Symbols
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   !  |   @  |   #  |   $  |   %  |           |   ^  |   &  |   *  |   ?  |   '  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | SFT/+| CTL/=| ALT/(| GUI/)|   "  |           |   :  | GUI/]| ALT/[| CTL/}| SFT/{|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   <  |   |  |   -  |   >  |   \  |           |   `  |   _  |   /  |   ~  |   ;  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,--------------------.
- *                  |      |ENDASH|      |    |      |EMDASH|      |
- *                  `------+------|      |    |      |------+------'
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_SYM] = LAYOUT(
-  KC_EXLM,     KC_AT,   KC_HASH,    KC_DLR,     KC_PERC,       KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES,     KC_QUOT,
-  TD(SFT_PLS), CTRL_EQ, TD(ALT_LP), TD(GUI_RP), KC_DQT,        KC_COLN, GUI_RB,  ALT_LB,  TD(CTL_RCB), TD(SFT_LCB),
-  KC_LT,       KC_PIPE, KC_MINS,    KC_GT,      KC_BSLS,       KC_GRV,  KC_UNDS, KC_SLSH, KC_TILD,     KC_SCLN,
-                        _______,    MAC_EN,     _______,       _______, MAC_EM,  _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case CMK_DHM:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_CMK_DHM);
-      }
-      return false;
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    default:
-      return true;
-  }
-};
-
-int cur_dance (tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted || !state->pressed) return SINGLE_TAP;
-    else return SINGLE_HOLD;
-  }
-  if (state->count == 2) return DOUBLE_SINGLE_TAP;
-  else return 3;
-}
-
-void altlp_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      register_code16(KC_LPRN);
-      break;
-    case SINGLE_HOLD:
-      register_mods(MOD_BIT(KC_LALT));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      tap_code16(KC_LPRN);
-      register_code16(KC_LPRN);
-  }
-}
-
-void altlp_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      unregister_code16(KC_LPRN);
-      break;
-    case SINGLE_HOLD:
-      unregister_mods(MOD_BIT(KC_LALT));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      unregister_code16(KC_LPRN);
-  }
-}
-
-void ctlrcb_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      register_code16(KC_RCBR);
-      break;
-    case SINGLE_HOLD:
-      register_mods(MOD_BIT(KC_LCTL));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      tap_code16(KC_RCBR);
-      register_code16(KC_RCBR);
-  }
-}
-
-void ctlrcb_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      unregister_code16(KC_RCBR);
-      break;
-    case SINGLE_HOLD:
-      unregister_mods(MOD_BIT(KC_LCTL));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      unregister_code16(KC_RCBR);
-  }
-}
-
-void guirp_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      register_code16(KC_RPRN);
-      break;
-    case SINGLE_HOLD:
-      register_mods(MOD_BIT(KC_LGUI));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      tap_code16(KC_RPRN);
-      register_code16(KC_RPRN);
-  }
-}
-
-void guirp_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      unregister_code16(KC_RPRN);
-      break;
-    case SINGLE_HOLD:
-      unregister_mods(MOD_BIT(KC_LGUI));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      unregister_code16(KC_RPRN);
-  }
-}
-
-void sftlcb_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      register_code16(KC_LCBR);
-      break;
-    case SINGLE_HOLD:
-      register_mods(MOD_BIT(KC_LSFT));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      tap_code16(KC_LCBR);
-      register_code16(KC_LCBR);
-  }
-}
-
-void sftlcb_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      unregister_code16(KC_LCBR);
-      break;
-    case SINGLE_HOLD:
-      unregister_mods(MOD_BIT(KC_LSFT));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      unregister_code16(KC_LCBR);
-  }
-}
-
-void sftpls_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      register_code16(KC_PLUS);
-      break;
-    case SINGLE_HOLD:
-      register_mods(MOD_BIT(KC_LSFT));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      tap_code16(KC_PLUS);
-      register_code16(KC_PLUS);
-  }
-}
-
-void sftpls_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      unregister_code16(KC_PLUS);
-      break;
-    case SINGLE_HOLD:
-      unregister_mods(MOD_BIT(KC_LSFT));
-      break;
-    case DOUBLE_SINGLE_TAP:
-      unregister_code16(KC_PLUS);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [ALT_LP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altlp_finished, altlp_reset),
-  [CTL_RCB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctlrcb_finished, ctlrcb_reset),
-  [GUI_RP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, guirp_finished, guirp_reset),
-  [SFT_LCB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, sftlcb_finished, sftlcb_reset),
-  [SFT_PLS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, sftpls_finished, sftpls_reset)
-};
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/rules.mk b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/rules.mk
deleted file mode 100644
index 2a74d95536b..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# dustypomerleau, Minidox rules
-
-EXTRAKEY_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/maple_computing/minidox/keymaps/haegin/keymap.c b/keyboards/maple_computing/minidox/keymaps/haegin/keymap.c
deleted file mode 100644
index 324f76da94a..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/haegin/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 LETTERS 0
-#define SYMBOLS 1
-#define MEDIA 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |           |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  |           |   H  |   J  |   K  |   L  |   ;  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  |           |   N  |   M  |   ,  |   .  |   /  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  | Ctrl | LOWER|      |    |      | RAISE| Shift|
- *                  `-------------| Space|    |BckSpc|------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[LETTERS] = LAYOUT(
-  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,         KC_F,    KC_G,    KC_C,    KC_R,    KC_L,
-  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,         KC_D,    KC_H,    KC_T,    KC_N,    KC_S,
-  KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,         KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,
-  CTL_T(KC_ESC), SFT_T(KC_BSPC), GUI_T(KC_SPC),     LT(SYMBOLS, KC_ENT), LT(MEDIA, KC_TAB), ALT_T(LCTL(KC_B))
-),
-
-/* Raise
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |           |   6  |   7  |   8  |   9  |   0  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Tab | Left | Down |  Up  | Right|           |      |   -  |   =  |   [  |   ]  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Ctrl|   `  |  GUI |  Alt |      |           |      |      |      |   \  |   '  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | LOWER|      |    |      | RAISE|      |
- *                  `-------------|      |    |      |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[SYMBOLS] = LAYOUT(
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-  KC_TAB,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,      _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
-  KC_LCTL, KC_GRV,  KC_LGUI, KC_LALT, _______,      _______, _______, _______, KC_BSLS,  KC_QUOT,
-                    _______, _______, _______,      _______, _______, _______
-),
-
-/* Lower
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   !  |   @  |   #  |   $  |   %  |           |   ^  |   &  |   *  |   (  |   )  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Esc |      |      |      |      |           |      |   _  |   +  |   {  |   }  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Caps|   ~  |      |      |      |           |      |      |      |   |  |   "  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | LOWER|      |    |      | RAISE|  Del |
- *                  `-------------|      |    | Enter|------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[MEDIA] = LAYOUT(
-  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-  KC_ESC,  _______, _______, _______, _______,      _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
-  KC_CAPS, KC_TILD, _______, _______, _______,      _______, _______, _______, KC_PIPE,  KC_DQT,
-                    _______, _______, _______,      KC_ENT,  _______, KC_DEL
-)
-};
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
diff --git a/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c b/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c
deleted file mode 100644
index 8ebd6e8d0ca..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define DSK_LFT LGUI(LCTL(KC_LEFT))
-#define DSK_RT  LGUI(LCTL(KC_RIGHT))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[_QWERTY] = LAYOUT(
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-          ALT_T(KC_ENT), LT(_LOWER, KC_TAB), CTL_T(KC_SPC),    SFT_T(KC_BSPC), LT(_RAISE, KC_DEL), KC_LGUI
-),
-
-[_RAISE] = LAYOUT(
-  KC_EXLM,    KC_AT,    KC_HASH, KC_DLR,  KC_PERC,      KC_PLUS, KC_7,     KC_8,   KC_9, KC_0,
-  KC_CIRC,    KC_AMPR,  KC_TILD, KC_PIPE, KC_BSLS,      KC_MINUS,  KC_4,     KC_5,   KC_6, KC_EQL,
-  KC_DQT,     KC_QUOT,  KC_UNDS, KC_GRV,  _______,      KC_ASTR,  KC_1,     KC_2,   KC_3, _______,
-                        _______, MO(_ADJUST), _______,      _______,  _______,  _______
-),
-
-
-[_LOWER] = LAYOUT(
-  KC_ESC,   KC_HOME, KC_UP,   KC_END,   _______,     KC_LPRN, KC_RPRN, _______, _______, _______,
-  KC_VOLU,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGUP,     KC_LBRC, KC_RBRC, _______, _______, _______,
-  KC_VOLD,  KC_MPRV, KC_MPLY, KC_MNXT,  KC_PGDN,     KC_LCBR, KC_RCBR, _______, _______,  _______,
-                    _______, _______, _______,      _______,  MO(_ADJUST), _______
-),
-
-
-[_ADJUST] =  LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,    KC_F8,   KC_F9,    KC_F10,
-  _______, DSK_LFT, _______, DSK_RT,  _______,      TSKMGR,  CALTDEL,  _______, KC_F11,   KC_F12,
-  QK_BOOT, _______, _______, _______, _______,      _______, _______,  _______, _______,  _______,
-                    _______, _______, _______,      _______, _______,  _______
-)
-};
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
diff --git a/keyboards/maple_computing/minidox/keymaps/khitsule/readme.md b/keyboards/maple_computing/minidox/keymaps/khitsule/readme.md
deleted file mode 100644
index 92e25279426..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/khitsule/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Minidox Layout by Khitsule
-![Khitsule](https://i.imgur.com/bEdqotb.png)
-
-[KLE link](http://www.keyboard-layout-editor.com/#/gists/203ed1a6db1997863394e87af8c43bbc)
-
-## Layers
-| Layer | Legend |
-| ----- | ------ |
-| Base  |  Top left (black) |
-| Lower | Top right (red) |
-| Raise | Bottom right (orange) |
-| Adjust | Front print |
-
-## Features
-* Raise/lower layers focus first on one-handed use
-* Numpad on right hand with raise layer
-* Navigation on left hand with lower layer (ESDF)
-    * D refers to desktop left/right on Win 10 (win+ctrl+left/right)
-* Heavy use of hold/tap dual function keys
-    * Ctrl/Space
-    * Shift/Backspace
-    * Alt/Enter
-    * Lower/Tab
-    * Raise/Delete
\ No newline at end of file
diff --git a/keyboards/maple_computing/minidox/keymaps/norman/config.h b/keyboards/maple_computing/minidox/keymaps/norman/config.h
deleted file mode 100644
index ecdf080c2c1..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/norman/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 160
diff --git a/keyboards/maple_computing/minidox/keymaps/norman/keymap.c b/keyboards/maple_computing/minidox/keymaps/norman/keymap.c
deleted file mode 100644
index 12741089ba7..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/norman/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#include <sendstring_norman.h>
-
-
-extern keymap_config_t keymap_config;
-
-// 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 layers {
-    _NORMAN,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define DSK_LFT LGUI(LCTL(KC_LEFT))
-#define DSK_RT  LGUI(LCTL(KC_RIGHT))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[_NORMAN] = LAYOUT(
-  NM_Q,    NM_W,    NM_D,    NM_F,    NM_K,                       NM_J,    NM_U,    NM_R,    NM_L,    NM_SCLN,
-  NM_A,    NM_S,    NM_E,    NM_T,    NM_G,                       NM_Y,    NM_N,    NM_I,    NM_O,    NM_H,
-  NM_Z,    NM_X,    NM_C,    NM_V,    NM_B,                       NM_P,    NM_M,    NM_COMM, NM_DOT,  NM_SLSH,
-    LGUI_T(KC_ENT), LT(_RAISE, KC_ESC), SFT_T(KC_BSPC),    CTL_T(KC_SPC), LT(_LOWER, KC_TAB), ALT_T(KC_ENT)
-),
-
-[_RAISE] = LAYOUT(
-  KC_EXLM,    KC_AT,    KC_HASH, KC_DLR,  KC_PERC,      KC_PLUS, KC_7,     KC_8,   KC_9, KC_0,
-  KC_CIRC,    KC_AMPR,  KC_TILD, KC_PIPE, KC_BSLS,      KC_MINUS,  KC_4,     KC_5,   KC_6, KC_EQL,
-  KC_DQT,     KC_QUOT,  KC_UNDS, KC_GRV,  _______,      KC_ASTR,  KC_1,     KC_2,   KC_3, _______,
-                        _______, _______, _______,      _______,  MO(_ADJUST), _______
-),
-
-
-[_LOWER] = LAYOUT(
-  KC_ESC,   KC_HOME, KC_UP,   KC_END,   _______,     _______, KC_LPRN, KC_RPRN,  _______, _______,
-  KC_VOLU,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGUP,     _______, KC_LBRC, KC_RBRC,  _______, _______,
-  KC_VOLD,  KC_MPRV, KC_MPLY, KC_MNXT,  KC_PGDN,     _______, KC_LCBR, KC_RCBR,  _______,  _______,
-                  _______, MO(_ADJUST), _______,      _______,  _______,  _______
-),
-
-[_ADJUST] =  LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,    KC_F8,   KC_F9,    KC_F10,
-  _______, DSK_LFT, _______, DSK_RT,  _______,      TSKMGR,  CALTDEL,  _______, KC_F11,   KC_F12,
-  QK_BOOT, _______, _______, _______, _______,      _______, _______,  _______, _______,  _______,
-                    _______, _______, _______,      _______, _______,  _______
-)
-
-};
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
diff --git a/keyboards/maple_computing/minidox/keymaps/norman/readme.md b/keyboards/maple_computing/minidox/keymaps/norman/readme.md
deleted file mode 100644
index 018e4363227..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/norman/readme.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Minidox Norman Layout by LeHoff
-Based on the QWERTY layout created by Khitsule.
-![lehoff](https://i.imgur.com/rKTdymp.png)
-
-[KLE link](http://www.keyboard-layout-editor.com/#/gists/86ec49f9f820a8b9b36f6e0d2ef8fff7)
-
-## Layers
-| Layer | Legend |
-| ----- | ------ |
-| Base  |  Top left (black) |
-| Lower | Bottom right (red) |
-| Raise | Top right (orange) |
-| Adjust | Front print |
-
-## Features
-* Raise/lower layers focus first on one-handed use
-* Numpad on right hand with raise layer
-* Navigation on left hand with lower layer (ESDF)
-    * D refers to desktop left/right on Win 10 (win+ctrl+left/right)
-* Heavy use of hold/tap dual function keys - from left to right:
-    * Cmd/Enter
-    * Raise/Esc
-    * Shift/Backspace
-    * Ctrl/Space
-    * Lower/Tab
-    * Alt/Enter
-
-
-## Modifier Placement Rationale
-
-There are several major driving forces at play:
-
-* I use MacOS.
-* I'm Danish so the Alt and Shift-Alt layers in MacOS simply have to work.
-* I use Vim for coding.
-* I use org-mode in Emacs to keep track of my time.
-
-* Space is on the right hand side because I almost exclusively use my right hand thumb for
-  space.
-* Cmd is on the left since I often use Cmd+click to open a link in a new tab in Safari.
-* Due to my usage of Vim Esc got a spot on the modifier row.
-* Tab is on the right to enable easy navigation between winows with Cmd+Tab.
-* Shift is on the left since org-mode uses Ctrl+arrows to manipulate task state quickly,
- and since the arrow keys are activated using Lower (which has been moved to the right) and S, E, T,
- and D, it works well that way. 
-* Ctrl is on the right since Ctrl+<0-9> is used in MacOS to switch between spaces.
-* Enter is on both sides since Enter is often used together with all of the modifiers. E.g.,
-  Cmd+Enter to send mails in most situations, but Ctrl+Enter is used in Emacs to create a
-  new task in org-mode.
- 
-This means that arrows and digits are being modified from the other hand, which could be
-bad for gaming, so if you're into that you might want to re-think a few things, but in
-that case you are probably using a Windows machine and then there are other constraints
-you have to deal with.
-
-
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
deleted file mode 100644
index a7d11feca52..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define EE_HANDS
-
-#define COMBO_TERM 100
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
deleted file mode 100644
index 33bfc7340ed..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _RSTHD,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-enum combo_events {
-  TOP_L,
-  TOP_R,
-  MID_L,
-  MID_R,
-  BOT_L,
-  BOT_R,
-  HN_QUOT,
-  TOP_CTR,
-  MID_CTR,
-  BOT_CTR,
-};
-
-const uint16_t PROGMEM fk_combo[] = {KC_F, KC_K, COMBO_END};
-const uint16_t PROGMEM zl_combo[] = {KC_Z, KC_L, COMBO_END};
-const uint16_t PROGMEM hd_combo[] = {KC_H, KC_D, COMBO_END};
-const uint16_t PROGMEM mn_combo[] = {KC_M, KC_N, COMBO_END};
-const uint16_t PROGMEM pb_combo[] = {KC_P, KC_B, COMBO_END};
-const uint16_t PROGMEM xw_combo[] = {KC_X, KC_W, COMBO_END};
-const uint16_t PROGMEM hn_combo[] = {KC_H, KC_N, COMBO_END};
-const uint16_t PROGMEM kz_combo[] = {KC_K, KC_Z, COMBO_END};
-const uint16_t PROGMEM dm_combo[] = {KC_D, KC_M, COMBO_END};
-const uint16_t PROGMEM bx_combo[] = {KC_B, KC_X, COMBO_END};
-
-combo_t key_combos[] = {
-  [TOP_L] = COMBO(fk_combo, KC_ESC),
-  [TOP_R] = COMBO(zl_combo, KC_AT),
-  [MID_L] = COMBO(hd_combo, KC_TAB),
-  [MID_R] = COMBO_ACTION(mn_combo),
-  [BOT_L] = COMBO(pb_combo, KC_HASH),
-  [BOT_R] = COMBO(xw_combo, KC_AMPR),
-  [HN_QUOT] = COMBO(hn_combo, KC_QUOT),
-  [TOP_CTR] = COMBO_ACTION(kz_combo),
-  [MID_CTR] = COMBO_ACTION(dm_combo),
-  [BOT_CTR] = COMBO_ACTION(bx_combo),
-};
-
-  void process_combo_event(uint16_t combo_index, bool pressed) {
-    switch(combo_index) {
-      case MID_R:
-      if (pressed) {
-        tap_code16(LALT(KC_3));
-      }
-      break;
-      case TOP_CTR:
-        if (pressed) {
-          set_oneshot_mods(MOD_LGUI);
-        }
-        break;
-      case MID_CTR:
-        if (pressed) {
-          set_oneshot_mods(MOD_LALT);
-        }
-        break;
-      case BOT_CTR:
-        if (pressed) {
-          set_oneshot_mods(MOD_LCTL);
-        }
-        break;
-    }
-  }
-
-// Defines for task manager and such
-// For insertion in keymap
-#define KILL LGUI(LALT(KC_ESC)) //Force quit controls
-#define SCRCAP LCTL(LSFT(LGUI(KC_5))) //Screen capture controls
-#define DSK_LFT LGUI(LCTL(KC_LEFT))
-#define DSK_RT  LGUI(LCTL(KC_RIGHT))
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[_RSTHD] = LAYOUT(
-    KC_J,    KC_C,    KC_Y,     KC_F, KC_K,              KC_Z,  KC_L,   KC_COMM,  KC_U,   KC_Q,
-    KC_R,    KC_S,    KC_T,     KC_H, KC_D,              KC_M,  KC_N,   KC_A,     KC_I ,  KC_O,
-    LCTL_T(KC_SLSH), LALT_T(KC_V), LGUI_T(KC_G), KC_P, KC_B,      KC_X,  KC_W, RGUI_T(KC_DOT), RALT_T(KC_SCLN),RCTL_T(KC_MINS),
-          OSM(MOD_LSFT), LT(_LOWER, KC_BSPC), KC_E,      KC_SPC, LT(_RAISE, KC_ENT),  OSM(MOD_LSFT)
-),
-[_RAISE] = LAYOUT(
-  KC_PAST, KC_7,    KC_8,   KC_9,  KC_PLUS,       KC_NUBS, LALT(KC_2), _______, LALT(KC_4), KC_DLR,
-  KC_CIRC, KC_4,    KC_5,   KC_6,    KC_EQL,      LSFT(KC_NUBS), KC_GRV,   KC_TILD,  KC_PIPE, KC_BSLS,
-  _______, RALT_T(KC_1), KC_2, KC_3,KC_PERC,      _______, _______,    _______, _______, _______,
-                  _______, MO(_ADJUST), KC_0,     _______, _______, _______
-),
-[_LOWER] = LAYOUT(
-   _______, KC_LBRC, KC_QUES, KC_RBRC, KC_BRMU,         KC_PGUP,  KC_HOME, KC_UP,   KC_END,  KC_VOLU,
-   KC_ESC, KC_LPRN,  KC_EXLM, KC_RPRN, KC_BRMD,         KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_VOLD,
-   _______, _______, _______, _______, _______,         _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,
-                      _______, _______, _______,        KC_DEL,  MO(_ADJUST),  _______
-),
-[_ADJUST] =  LAYOUT(
-  _______,     KC_F7, KC_F8, KC_F9,  SCRCAP,        _______, KC_F10,  KC_F11, KC_F12, _______,
-  _______,     KC_F1, KC_F2, KC_F3, _______,        _______, KC_F4, KC_F5,  KC_F6, _______,
-  OSM(MOD_LCTL),_______, _______, _______, QK_BOOT,  KILL, _______, _______,  _______, OSM(MOD_RCTL),
-                    _______, _______, _______,       _______, _______,  _______
-)
-
-};
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/readme.md b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/readme.md
deleted file mode 100644
index 877d7059e78..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# The RSTHD Layout for minidox - Empowered with Combos
-An attempt at porting Xuming Zeng’s [RSTHD](https://xsznix.wordpress.com/2016/05/16/introducing-the-rsthd-layout/) from the Ergodox to the Minidox.
-[KLE Link](http://www.keyboard-layout-editor.com/#/gists/3161700bf3573325804716b2bdafa50f)
-![RSTHD empowered with chords](https://live.staticflickr.com/65535/49926249372_77ab8eba95_z.jpg)
-
-**Symbols and media/system keys work as shown with keyboard identified by MacOS as "International/ISO" hardware (not ANSI) and "Input Source" within Preferences set to "British" (Apple).**
-
-The key feature on this keymap, aside from the layout, is to telescope seven columns into five using combos. The top row and the bottom row form the basis of the number and nav layers respectively. Combos are shown in the above drawing using paired blue legends.
-## Writing specific
-As a hobby writer I have intended to make a layout that favours prose rather than code, with symbols used in everyday writing such as various (Western) currencies in easy reach. Hardcore coders will no doubt move their favourite symbols to where they feel most comfortable!
-The thumb mounted 'E' made it difficult to adapt other keymaps to this letter layout and eventually drove this fundamental redesign. I have strove to minimise the risk of ‘negligent discharge’ of functions whilst typing - whose interruption which can be fatal to creative flow - and which my previous layouts adapted from various ones in the repository seemed prone. To this end hold-tap keys are not placed on the home row nor thumb operated 'space' and 'E' keys, shift gets its own keys, and I use combos to create a useful number of virtual keys.
-## Combos!
-I employ combos to simulate the missing inner and outer columns that the minidox lacks relative to the Ergodox. All combos operate on keys within the inner pair of columns of each side because during normal typing the index finger has to cover both these columns, making press events of adjacent keys unlikely to overlap. They are assigned names within the keymap that relate to their position on the keyboard (not to my assigned functions) so their functions can be changed at will to suit user preference without confusing the keymap.
-- The six chords spanning the neighbouring two columns of each half correspond to keys in the outer columns of the Ergodox.
-- A further four chords span the central divide, using pairs of letters that infrequently occur consecutively.
-	- The three combos spanning adjacent keys over the central divide simulate the mirrored inboard columns of the RSTHD map for Ergodox, and are set to chamber one shot of their respective modifiers.
-	- The quotation mark is a combo of both resting keys of the index fingers. This is inspired by ‘air quotes’ used in conversation.
-I am confident these combos will rarely be accidentally triggered. If this occurs, try reducing the tapping term.
-## Other features
-- Number pad on left. This confers many benefits for the RSTHD layout, such as leaving key symbols on the primary layer uncovered that are useful for numbers (,.:-). On this layer ‘E’ becomes ‘0’.
--  The nav cluster is now on the right hand and, upon activation ’space’ becomes ‘del’, which allows rapid navigation and editing of text.
-- Pair of one shot shift keys, since mod-tap shift assigned to letters is a bad idea IMO. Some users might choose to move the shift onto the bottom left and right combos which corresponds to where shift lives in the outer columns of the ergodox layout.
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/rules.mk b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
deleted file mode 100644
index d0f15e7d193..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define EE_HANDS
-
-/* ws2812 RGB LED */
-#define WS2812_DI_PIN D7
-
-#define RGBLED_NUM 8   // Number of LEDs
-#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 RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#endif
diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c b/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c
deleted file mode 100644
index 1fe21ba0369..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 1
-#define _RAISE 2
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |           |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  |           |   H  |   J  |   K  |   L  |   ;  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  |           |   N  |   M  |   ,  |   .  |   /  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  | Shift| LOWER|      |    |      | RAISE| Ctrl |
- *                  `-------------| Space|    |BckSpc|------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_QWERTY] = LAYOUT(
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-                    OSM(MOD_LSFT), LOWER, KC_SPC,         KC_BSPC, RAISE, KC_LCTL
-),
-
-/* Raise
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |           |   6  |   7  |   8  |   9  |   0  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Tab | Left | Down |  Up  | Right|           |      |   -  |   =  |   [  |   ]  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Ctrl|   `  |  GUI |  Alt |      |           |      |      |      |   \  |   '  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | LOWER|      |    |      | RAISE|      |
- *                  `-------------|      |    |      |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_RAISE] = LAYOUT(
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-  KC_TAB,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,      _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
-  KC_LCTL, KC_GRV,  KC_LGUI, KC_LALT, _______,      _______, _______, _______, KC_BSLS,  KC_QUOT,
-                    _______, _______, _______,      _______, _______, _______
-),
-
-/* Lower
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   !  |   @  |   #  |   $  |   %  |           |   ^  |   &  |   *  |   (  |   )  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Esc |      |      |      |      |           |      |   _  |   +  |   {  |   }  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  Caps|   ~  |      |      |      |           |      |      |      |   |  |   "  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | LOWER|      |    |      | RAISE|  Del |
- *                  `-------------|      |    | Enter|------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_LOWER] = LAYOUT(
-  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-  KC_ESC,  _______, _______, _______, _______,      _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
-  KC_CAPS, KC_TILD, _______, _______, _______,      _______, _______, _______, KC_PIPE,  KC_DQT,
-                    _______, _______, _______,      KC_ENT,  _______, KC_DEL
-),
-
-/* Adjust (Lower + Raise)
- *
- * ,----------------------------------.           ,----------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |           |   F6 |  F7  |  Up  |  F9  |  F10 |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  F11 |  F12 |      |RGBSAI|RGBSAD|           |      | Left | Down |Right |caltde|
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | Reset|RGBTOG|RGBMOD|RGBHUI|RGBHUD|           |RGBVAI|RGBVAD|  F8  |Taskmg|      |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | LOWER|      |    |      | RAISE|      |
- *                  `-------------|      |    |      |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_ADJUST] =  LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,   KC_UP,   KC_F9,   KC_F10,
-  KC_F11,  KC_F12,  _______, RGB_SAI, RGB_SAD,      _______, KC_LEFT, KC_DOWN, KC_RGHT, CALTDEL,
-  QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD,      RGB_VAI, RGB_VAD, KC_F8, TSKMGR,  _______,
-                    _______, _______, _______,      _______,  _______, _______
-)
-};
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/rules.mk b/keyboards/maple_computing/minidox/keymaps/that_canadian/rules.mk
deleted file mode 100644
index f1ef68387f4..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/that_canadian/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-
diff --git a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
deleted file mode 100644
index 265affc1c97..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 _QWERTZ 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// macro keys
-#define CALTDEL LCTL(LALT(KC_DEL)) // ctrl-alt-del
-#define CALTESC LCTL(LSFT(KC_ESC)) // ctrl-alt-esc
-#define CALT LCTL(KC_LALT) // ctrl-alt
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTZ] = LAYOUT(
-  DE_Q,    DE_W,    DE_E,    DE_R,    DE_T,                       DE_Z,    DE_U,    DE_I,    DE_O,    DE_P,
-  DE_A,    DE_S,    DE_D,    DE_F,    DE_G,                       DE_H,    DE_J,    DE_K,    DE_L,    KC_SPC,
-  DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,                       DE_N,    DE_M,    DE_COMM, DE_DOT,  DE_MINS,
-                     KC_LCTL, MO(_LOWER), MO(_RAISE),		      KC_LGUI, KC_LSFT, KC_LALT
-),
-
-[_RAISE] = LAYOUT(
-  DE_EXLM,  DE_QUES,  DE_SECT, DE_DLR,  DE_HASH,                  DE_PLUS,  DE_7,  DE_8,   DE_9, DE_0,
-  DE_CIRC,  DE_QUOT, DE_DQUO, DE_GRV, DE_AMPR,              	    DE_ASTR,  DE_4,  DE_5,   DE_6, DE_EQL,
-  DE_SLSH,  DE_PIPE,  DE_BSLS, DE_AT,   DE_EURO,                  DE_PERC,  DE_1,  DE_2,   DE_3, KC_TAB,
-                    _______, _______, _______,        _______,  _______,  _______
-),
-
-[_LOWER] = LAYOUT(
-  KC_AUDIO_MUTE,  KC_AUDIO_VOL_DOWN,  DE_LBRC,  DE_RBRC,  KC_AUDIO_VOL_UP,  KC_HOME,      KC_PGDN,    KC_PGUP,  KC_END,   DE_TILD,
-  KC_ESC,   DE_LABK,  DE_LPRN,  DE_RPRN,  DE_RABK,                          KC_LEFT,      KC_DOWN,    KC_UP,    KC_RIGHT, KC_ENT,
-  KC_BSPC,  KC_DEL,   DE_LCBR,  DE_RCBR,  KC_PSCR,                        	_______,  DE_ADIA,  DE_ODIA,  DE_UDIA,  DE_SS,
-                        _______, _______, _______,                    _______,  MO(_ADJUST), _______
-),
-
-[_ADJUST] = LAYOUT(
-  _______,  _______,  _______,  _______,  _______,             _______,   KC_F7,    KC_F8,    KC_F9,   KC_F10,
-  CALTESC,  CALTDEL,  _______,  CALT,     _______,             _______,   KC_F4,    KC_F5,    KC_F6,   KC_F11,
-  QK_BOOT,  _______,  _______,  _______,  _______,             _______,   KC_F1,     KC_F2,    KC_F3,   KC_F12,
-                          _______,  _______,  _______,      _______,  _______,  _______
-)};
-
-void matrix_init_user(void) {
-  set_single_persistent_default_layer(_QWERTZ);
-};
diff --git a/keyboards/maple_computing/minidox/keymaps/tw1t611/readme.md b/keyboards/maple_computing/minidox/keymaps/tw1t611/readme.md
deleted file mode 100644
index 7ab4526fbc4..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/tw1t611/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Minidox Layout by tw1t611
-![](https://imgur.com/M95KSke.png)
-
-This is a german layout with support for umlauts and the euro sign.
-You need to set your system layout to german.
-
-[keyboard-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/d58a82d8017d0c0cca044ef385def165)
-
-## Layers
-| Layer | Legend |
-| ----- | ------ |
-| Base  | Top left (white) |
-| Lower | Top right (organge) |
-| Raise | Bottom right (blue) |
-| Adjust | Front print (orange + shift) |
-
-## Features
-* German layout with support for umlauts and the euro sign
-* Raise/lower layers focus first on one-handed use
-* Numpad on right hand with raise layer
-* Vim optimized
-    * Easy reachable Esc
-    * arrow keys on h, j, k, l
diff --git a/keyboards/maple_computing/minidox/keymaps/tw1t611/rules.mk b/keyboards/maple_computing/minidox/keymaps/tw1t611/rules.mk
deleted file mode 100644
index fcfd2225bcf..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/tw1t611/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-EXTRAKEY_ENABLE = yes
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
deleted file mode 100644
index fe4212d6c43..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define EE_HANDS
-
-/* ws2812 RGB LED */
-#define WS2812_DI_PIN D7
-
-#define RGBLED_NUM 8   // Number of LEDs
-#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 RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#undef PERMISSIVE_HOLD
-
-#endif
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
deleted file mode 100644
index 701c934cd02..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,193 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names { _QWERTY, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, LOWER, RAISE, ADJUST };
-
-// Adding macros to make the keymaps below much easier to read.
-/*
- Visit https://github.com/qmk/qmk_firmware/blob/master/docs/feature_advanced_keycodes.md#mod-tap
- to read why these macros below are side-aware (LALT, RCTL, etc).
-*/
-#define CTLSCLN RCTL_T(KC_SCLN)
-#define CTLSLSH LCTL_T(KC_SLSH)
-#define RCTLZED RCTL_T(KC_Z)
-#define LCTLZED LCTL_T(KC_Z)
-#define ALTDOT RALT_T(KC_DOT)
-#define ALTX LALT_T(KC_X)
-#define ALTQ LALT_T(KC_Q)
-#define ALTV RALT_T(KC_V)
-#define GUICOMM RGUI_T(KC_COMM)
-#define GUIJ LGUI_T(KC_J)
-#define GUIC LGUI_T(KC_C)
-#define GUIW RGUI_T(KC_W)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Dvorak
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   '  |   ,  |   .  |   P  |   Y  |           |   F  |   G  |   C  |   R  |   L  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   A  |   O  |   E  |   U  |   I  |           |   D  |   H  |   T  |   N  |   S  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |CTL/ ;|ALT/ Q|GUI/ J|   K  |   X  |           |   B  |   M  |GUI/ W|ALT/ V|CTL/ Z|
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  | LOWER| BSPC |      |    |      | Spc  |RAISE |
- *                  `-------------| SHFT |    | Ent  |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_DVORAK] = LAYOUT (
-  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,       KC_F,    KC_G,    KC_C,    KC_R,    KC_L,
-  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,       KC_D,    KC_H,    KC_T,    KC_N,    KC_S,
-  CTLSCLN, ALTQ,    GUIJ,    KC_K,    KC_X,       KC_B,    KC_M,    GUIW,    ALTV,    RCTLZED,
-                    LOWER,   KC_BSPC, KC_LSFT,    KC_ENT,  KC_SPC,  RAISE
-),
-
-/* Qwerty
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |           |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  |           |   H  |   J  |   K  |   L  |   ;  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |CTL/ Z|ALT/ X|GUI/ C|   V  |   B  |           |   N  |   M  |GUI/ ,|ALT/ .|CTL/ /|
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  | LOWER| BSPC |      |    |      | Spc  |RAISE |
- *                  `-------------| SHFT |    | Ent  |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_QWERTY] = LAYOUT (
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-  LCTLZED, ALTX,    GUIC,    KC_V,    KC_B,       KC_N,    KC_M,    GUICOMM, ALTDOT,  CTLSLSH,
-                    LOWER,   KC_BSPC, KC_LSFT,    KC_ENT,  KC_SPC,  RAISE
-),
-
-/* Colemak
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   Q  |   W  |   F  |   P  |   G  |           |   J  |   L  |   U  |   Y  |   L  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   A  |   R  |   S  |   T  |   D  |           |   H  |   N  |   E  |   I  |   S  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |CTL/ Z|ALT/ X|GUI/ C|   V  |   B  |           |   K  |   M  |GUI/ ,|ALT/ .|CTL/ /|
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  | LOWER| BSPC |      |    |      | Spc  |RAISE |
- *                  `-------------| SHFT |    | Ent  |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_COLEMAK] = LAYOUT (
-  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,       KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,       KC_H,    KC_N,    KC_E,    KC_I,    KC_O,
-  LCTLZED, ALTX,    GUIC,    KC_V,    KC_B,       KC_K,    KC_M,    GUICOMM, ALTDOT,  CTLSLSH,
-                    LOWER,   KC_BSPC, KC_LSFT,    KC_ENT,  KC_SPC,  RAISE
-),
-
-/* Lower
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   !  |   @  |   #  |   $  |   %  |           |   ^  |   &  |   *  |   (  |   )  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | CAPS |      |  UP  |      | Home |           | PgDn |   +  |   {  |   }  |   _  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   ~  | Left | Down | Right| End  |           | PgUp | Mute | Vol- | Vol+ |   /  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | Del  |      |    |      |   |  |      |
- *                  `-------------| Esc  |    | Tab  |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_LOWER] = LAYOUT (
-  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-  KC_CAPS, _______, KC_UP,   _______, KC_HOME,    KC_PGUP, KC_PLUS, KC_LCBR, KC_RCBR, KC_UNDS,
-  KC_TILD, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,     KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_SLSH,
-                    _______, KC_DEL,  KC_ESC,     KC_TAB,  KC_PIPE, _______
-),
-
-/* Raise
- *
- * ,----------------------------------.           ,----------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |           |   6  |   7  |   8  |   9  |   0  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * | CAPS |      |  UP  |      | Home |           | PgDn |   =  |   [  |   ]  |   -  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |   `  | Left | Down | Right| End  |           | PgUp | Prev | Play | Next |   ?  |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      | Del  |      |    |      |   \  |      |
- *                  `-------------| Esc  |    | Tab  |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_RAISE] = LAYOUT (
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-  KC_CAPS, _______, KC_UP,   _______, KC_HOME,    KC_PGUP, KC_EQL,  KC_LBRC, KC_RBRC, KC_MINS,
-  KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT, KC_END,     KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_QUES,
-                    _______, KC_DEL,  KC_ESC,     KC_TAB,  KC_BSLS, _______
-),
-
-/* Adjust (Lower + Raise)
- *
- * ,----------------------------------.           ,----------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |           |  F6  |  F7  |  F8  |  F9  | F10  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |  F11 |      |      |      |      |           |      | PrSc | ScLk | Paus | F12  |
- * |------+------+------+------+------|           |------+------+------+------+------|
- * |      |QWERTY|COLEMK|DVORAK|      |           |QK_BOOT |      |      |      |      |
- * `----------------------------------'           `----------------------------------'
- *                  ,--------------------.    ,------,-------------.
- *                  |      |      |      |    |      |      |      |
- *                  `-------------|      |    |      |------+------.
- *                                |      |    |      |
- *                                `------'    `------'
- */
-[_ADJUST] =  LAYOUT (
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_UP,   KC_F9,   KC_F10,
-  KC_F11,  QK_BOOT, _______, _______, _______,    _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12,
-  _______, QWERTY,  COLEMAK, DVORAK,  _______,    QK_BOOT, _______, _______, _______, _______,
-                    _______, _______, _______,    _______, _______, _______
-  )
-};
-// clang-format on
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void matrix_init_user(void) {
-#ifdef BOOTLOADER_CATERINA
-    // This will disable the red LEDs on the ProMicros
-    setPinInput(D5);
-    setPinInput(B0);
-#endif
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case QWERTY:
-                set_single_persistent_default_layer(_QWERTY);
-                return false;
-            case COLEMAK:
-                set_single_persistent_default_layer(_COLEMAK);
-                return false;
-            case DVORAK:
-                set_single_persistent_default_layer(_DVORAK);
-                return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/rules.mk b/keyboards/maple_computing/minidox/keymaps/xyverz/rules.mk
deleted file mode 100644
index c777cb1b9ff..00000000000
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
diff --git a/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h b/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h
index 8bffbbb3b51..5093fd1ee29 100644
--- a/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h
+++ b/keyboards/marksard/leftover30/keymaps/default_isoenter/config.h
@@ -18,7 +18,5 @@
 
 // place overrides here
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
-
 #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
 #define TAPPING_TERM_PER_KEY
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
deleted file mode 100644
index bd9aeeecdbe..00000000000
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright 2020 marksard
-
-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 RGB_MATRIX_ENABLE
-  #define RGB_MATRIX_LED_COUNT 40
-  #define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-  // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-  #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-  // #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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
-
-//   #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-//   #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-//   #undef ENABLE_RGB_MATRIX_BREATHING
-//   #undef ENABLE_RGB_MATRIX_BAND_SAT
-//   #undef ENABLE_RGB_MATRIX_BAND_VAL
-//   #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-//   #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-//   #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-//   #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-//   #undef ENABLE_RGB_MATRIX_CYCLE_ALL
-//   #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-//   #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-//   #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-//   #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-//   #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-//   #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-//   #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-//   #undef ENABLE_RGB_MATRIX_DUAL_BEACON
-//   #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-//   #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-//   #undef ENABLE_RGB_MATRIX_RAINDROPS
-//   #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-//   #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-//   #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-//   #define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-
-//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-//   #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-
-//   #undef ENABLE_RGB_MATRIX_SPLASH
-//   #undef ENABLE_RGB_MATRIX_MULTISPLASH
-//   #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-//   #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
-#endif
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index be8a846cfc2..bc474f08817 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -12,7 +12,9 @@
         "driver": "ws2812",
         "sat_steps": 8,
         "val_steps": 8,
-        "speed_steps": 10
+        "speed_steps": 10,
+        "max_brightness": 150,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4"],
diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index 3f43b16d2be..66007ee2ef4 100644
--- a/keyboards/marksard/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/rev1/config.h
@@ -18,10 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
   #ifndef RS_EXTRA_LED
-    #define RGBLED_NUM 12
+    #define RGBLIGHT_LED_COUNT 12
     #define RGBLED_SPLIT {12, 0}
   #else
-    #define RGBLED_NUM 32
+    #define RGBLIGHT_LED_COUNT 32
     #define RGBLED_SPLIT {12, 20}
   #endif
 
diff --git a/keyboards/marshkeys/flowerpad/info.json b/keyboards/marshkeys/flowerpad/info.json
new file mode 100644
index 00000000000..79e69c7a031
--- /dev/null
+++ b/keyboards/marshkeys/flowerpad/info.json
@@ -0,0 +1,37 @@
+{
+    "manufacturer": "marshkeys.com",
+    "keyboard_name": "Flowerpad",
+    "maintainer": "Ethirallan",
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5"],
+        "rows": ["C6", "D4", "D0"]
+    },
+    "url": "marshkeys.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x466C",
+        "vid": "0x4D61"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 1},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 1, "y": 2},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [2, 2], "x": 2, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/marshkeys/flowerpad/keymaps/default/keymap.c b/keyboards/marshkeys/flowerpad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..73817ffc95b
--- /dev/null
+++ b/keyboards/marshkeys/flowerpad/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Benjamin Božič
+
+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] = {
+  /*
+   *        --------
+   *        | MUTE |
+   * |------+------+------|
+   * | PREV | PLAY | NEXT |
+   * |------+------+------|
+   *   | VOL- |  | VOL+ |
+   *   --------  --------
+   */
+  LAYOUT(
+               KC_MUTE,
+      KC_MPRV, KC_MPLY, KC_MNXT,
+          KC_VOLD,  KC_VOLU
+  ),
+};
diff --git a/keyboards/marshkeys/flowerpad/keymaps/via/keymap.c b/keyboards/marshkeys/flowerpad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..73817ffc95b
--- /dev/null
+++ b/keyboards/marshkeys/flowerpad/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Benjamin Božič
+
+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] = {
+  /*
+   *        --------
+   *        | MUTE |
+   * |------+------+------|
+   * | PREV | PLAY | NEXT |
+   * |------+------+------|
+   *   | VOL- |  | VOL+ |
+   *   --------  --------
+   */
+  LAYOUT(
+               KC_MUTE,
+      KC_MPRV, KC_MPLY, KC_MNXT,
+          KC_VOLD,  KC_VOLU
+  ),
+};
diff --git a/keyboards/marshkeys/flowerpad/keymaps/via/rules.mk b/keyboards/marshkeys/flowerpad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/marshkeys/flowerpad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/marshkeys/flowerpad/readme.md b/keyboards/marshkeys/flowerpad/readme.md
new file mode 100644
index 00000000000..859db5fc664
--- /dev/null
+++ b/keyboards/marshkeys/flowerpad/readme.md
@@ -0,0 +1,23 @@
+# Flowerpad
+
+![flowerpad](https://i.imgur.com/SRo0iWLh.jpeg)
+
+A flourishing 6-key macropad that will catch your eye.
+
+* Keyboard Maintainer: [Benjamin Božič](https://github.com/Ethirallan)
+* Hardware Supported: Onboard ATmega32u4, Flowerpad PCB v1, hotswap v1
+* Hardware Availability: marshkeys.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make marshkeys/flowerpad:default
+
+Flashing example for this keyboard:
+
+    make marshkeys/flowerpad: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 by holding down the top key (where the usb connects) and plug in the keyboard
diff --git a/keyboards/marshkeys/flowerpad/rules.mk b/keyboards/marshkeys/flowerpad/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/marshkeys/flowerpad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c b/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
deleted file mode 100644
index 1b6ddde6fef..00000000000
--- a/keyboards/massdrop/alt/keymaps/abishalom/keymap.c
+++ /dev/null
@@ -1,125 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum alt_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
-    DBG_TOG,               //DEBUG Toggle On / Off
-    DBG_MTRX,              //DEBUG Toggle Matrix Prints
-    DBG_KBD,               //DEBUG Toggle Keyboard Prints
-    DBG_MOU,               //DEBUG Toggle Mouse Prints
-    MD_BOOT,               //Restart into bootloader after hold timeout
-};
-
-#define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode
-
-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,    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_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, TG_NKRO, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
-        _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-    ),
-    */
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_KEYLIGHT: {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_UNDERGLOW: {
-                    rgb_matrix_set_flags(LED_FLAG_NONE);
-                    rgb_matrix_disable_noeeprom();
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_enable_noeeprom();
-                  }
-                  break;
-              }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h
deleted file mode 100644
index 8607cd81868..00000000000
--- a/keyboards/massdrop/alt/keymaps/b_/config.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2021 br (@b-)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-#define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
-#define MODS_ALT    (get_mods() & MOD_MASK_ALT)
-
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
-
-// #define NO_DEBUG                    			// Disable debugging
-// #define NO_PRINT                    			// Disable printing/debugging using hid_listen
-// #define NO_ACTION_LAYER             			// Disable layers
-// #define NO_ACTION_TAPPING           			// Disable tap dance and other tapping features
-// #define NO_ACTION_ONESHOT           			// Disable one-shot modifiers
-// #define NO_ACTION_MACRO             			// Disable old style macro handling: MACRO() & action_get_macro
-// #define TERMINAL_HELP
-// #define MOUSEKEY_INTERVAL 20
-// #define MOUSEKEY_DELAY 0
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_MAX_SPEED 10
-// #define MOUSEKEY_WHEEL_DELAY 0
-//#define FORCE_NKRO                  			// NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-// #define STRICT_LAYER_RELEASE        			// Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
-// #define LOCKING_SUPPORT_ENABLE      			// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-// #define LOCKING_RESYNC_ENABLE       			// Tries to keep switch state consistent with keyboard LED state
-// #define TAPPING_TERM 200            			// How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-// #define TAPPING_TERM_PER_KEY        			// Enabling to allow to tweak individual keys
-// #define RETRO_TAPPING               			// Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-// #define TAPPING_TOGGLE 2            			// How many taps before triggering the toggle
-// #define PERMISSIVE_HOLD             			// Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define QUICK_TAP_TERM 0          			// Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-// #define LEADER_TIMEOUT 300          			// How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-// #define LEADER_PER_KEY_TIMING       			// Sets the timer for leader key chords to run on each key press rather than overall
-// #define LEADER_KEY_STRICT_KEY_PROCESSING    	// Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-// #define ONESHOT_TIMEOUT 3000         		// How long before oneshot times out
-// #define ONESHOT_TAP_TOGGLE 2        			// How many taps before oneshot toggle is triggered
-// #define COMBO_TERM 200              			// How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-// #define TAP_CODE_DELAY 100          			// Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-#define TAP_CODE_DELAY 25          			// Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      			// Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES         			// reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        		// reacts to keyreleases (instead of keypresses)
-
-
-
-//Teal and Blue
-//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
-//#define RGB_MATRIX_DEFAULT_SPD 47 			// Used to determine the color for the modifiers
-
-//Teal and Blue
-//#define RGB_MATRIX_DEFAULT_HUE 120 			// Default boot color
-//#define RGB_MATRIX_DEFAULT_SPD 50 			//Used to determine the color for the modifiers
-
-
-//QMK HSV is based on 255 value wheel rather than 360
-
-//Cyan and Yellow
-//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
-//#define RGB_MATRIX_DEFAULT_SPD 177
-
-//Cyan and Green
-//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
-//#define RGB_MATRIX_DEFAULT_SPD 215
-
-// #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE  	// Sets the default mode, if none has been set
-#define RGB_MATRIX_DEFAULT_HUE 180  //purple  alphas with green background when pressed.
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/massdrop/alt/keymaps/b_/keymap.c b/keyboards/massdrop/alt/keymaps/b_/keymap.c
deleted file mode 100644
index 9f860cbd1a0..00000000000
--- a/keyboards/massdrop/alt/keymaps/b_/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2021 br (@b-)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-/* physical layout
- * [ ` ]  [ 1 ]  [ 2 ]  [ 3 ]  [ 4 ]  [ 5 ]  [ 6 ]  [ 7 ]  [ 8 ]  [ 9 ]  [ 0 ]  [ - ]  [ = ]  [ bksp ] [ del ]
- * [ tab* ]  [ q ]  [ w ]  [ e ]  [ r ]  [ t ]  [ y ]  [ u ]  [ i ]  [ o ]  [ p ]  [ [ ]  [ ] ]  [ home ]
- * [ ctrl* ]  [ a ]  [ s ]  [ d ]  [ f ]  [ g ]  [ h ]  [ j ]  [ k ]  [ l ]  [ ; ]  [ ' ]  [ enter ]  [ PgUp ]
- * [ lshift* ]  [ z ]  [ x ]  [ c ]  [ v ]  [ b ]  [ n ]  [ m ]  [ , ]  [ . ]  [ / ]  [ rshift* ] ]  [ ↑ ]  [ PgDn ]
- * [ ctrl ]  [ alt ]  [ meta ]  [              spaaaaaaaace             ]  [ meta ]  [ alt ]  [ ← ]  [ ↓ ]  [ → ]
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_65_ansi_blocker( /* normal */
-      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,  /* 15 */
-      LT(1,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, /* 15 */
-      LCTL_T(KC_ESC), 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, /* 14 */
-      LM(2, MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, LM(2, MOD_LSFT), KC_UP, KC_PGDN, /* 14 */
-      KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT /* 9 */
-      ),
-	[1] = LAYOUT_65_ansi_blocker( /* hold tab */
-      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_TRNS, KC_MUTE, 
-      KC_TRNS, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, BL_UP,  BL_DOWN,BL_BRTG, BL_STEP, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_END, 
-      MO(3), RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, 
-      KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, MO(4), NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_VOLD, 
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END // fn layer. f keys, media keys, backlight control, nkro-toggle, etc.
-      ),
-	[2] = LAYOUT_65_ansi_blocker( /* lshift + rshift = caps lock */
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-      KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, 
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS // this feels like a kludge...but it works
-      ),
-	[3] = LAYOUT_65_ansi_blocker( /* tab+ctrl */
-      KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP, KC_AGIN, KC_UNDO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_EJCT,
-      KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_FIND, BL_DOWN,BL_UP,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRIU,
-      KC_NO, KC_NO, KC_CUT, KC_COPY, KC_PSTE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MSTP, KC_BRID,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MRWD, KC_MPLY, KC_MFFD // miscellaneous silly keys, subject to change
-      ),
-	[4] = LAYOUT_65_ansi_blocker( /* tab+b */
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, /* backspace */
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS // tab + b + backspace goes to bootloader
-      )
-};
-
diff --git a/keyboards/massdrop/alt/keymaps/bonta/keymap.c b/keyboards/massdrop/alt/keymaps/bonta/keymap.c
deleted file mode 100644
index 5509ba6010e..00000000000
--- a/keyboards/massdrop/alt/keymaps/bonta/keymap.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum alt_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
-    DBG_TOG,               //DEBUG Toggle On / Off
-    DBG_MTRX,              //DEBUG Toggle Matrix Prints
-    DBG_KBD,               //DEBUG Toggle Keyboard Prints
-    DBG_MOU,               //DEBUG Toggle Mouse Prints
-    MD_BOOT,               //Restart into bootloader after hold timeout
-};
-
-#define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode
-#define RGB_BRU RGB_VAI
-#define RGB_BRD RGB_VAD
-
-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,    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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_MUTE,
-        _______, RGB_SPD, RGB_BRU, RGB_SPI, _______, _______, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
-        _______, RGB_RMOD,RGB_BRD, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, TG_NKRO, _______, _______, _______, _______, _______,          KC_VOLU, KC_VOLD,
-        _______, _______, _______,                            KC_MPLY,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    )
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL   (get_mods() & MOD_BIT(KC_LCTL)   || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT    (get_mods() & MOD_BIT(KC_LALT)   || get_mods() & MOD_BIT(KC_RALT))
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_KEYLIGHT: {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                  }
-                  break;
-              }
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/alt/keymaps/emptyflask/README.md b/keyboards/massdrop/alt/keymaps/emptyflask/README.md
deleted file mode 100644
index b07693ebac6..00000000000
--- a/keyboards/massdrop/alt/keymaps/emptyflask/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-### Drop (Massdrop) ALT Layout
-
-This layout is for the [Drop ALT Keyboard](https://drop.com/buy/massdrop-alt-high-profile-mechanical-keyboard).
-
-Features:
-
-* Tap caps lock for ESC, hold for CTRL
-* Prefer grave/tilde to dedicated ESC key
-* Swap home and delete. It's more compatible with my keycaps, and closer to a traditional layout.
-* Numpad layer (FN-\ to enable)
-* Method for clearing all stuck-down mods (taken from favorable-mutation, for tapped modifiers)
-
-To do:
-* Customize RGB: solid colors by default, highlight numpad keys when using that layer.
diff --git a/keyboards/massdrop/alt/keymaps/emptyflask/config.h b/keyboards/massdrop/alt/keymaps/emptyflask/config.h
deleted file mode 100644
index b3152c42095..00000000000
--- a/keyboards/massdrop/alt/keymaps/emptyflask/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define ONESHOT_TIMEOUT 3000
diff --git a/keyboards/massdrop/alt/keymaps/emptyflask/keymap.c b/keyboards/massdrop/alt/keymaps/emptyflask/keymap.c
deleted file mode 100644
index 508eac744c3..00000000000
--- a/keyboards/massdrop/alt/keymaps/emptyflask/keymap.c
+++ /dev/null
@@ -1,292 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum my_keycodes {
-    U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              // USB Toggle Automatic GCR control
-    DBG_TOG,               // DEBUG Toggle On / Off
-    DBG_MTRX,              // DEBUG Toggle Matrix Prints
-    DBG_KBD,               // DEBUG Toggle Keyboard Prints
-    DBG_MOU,               // DEBUG Toggle Mouse Prints
-    MD_BOOT,               // Restart into bootloader after hold timeout
-    HK_COSL,               // Clear held-down keys
-    QWERTY,                // Switch to QWERTY layout
-    COLEMAK,               // Switch to Colemak layout
-    DVORAK,                // Switch to Dvorak layout
-    WORKMAN,               // Switch to Workman layout
-};
-
-enum my_layers {
-    _QWERTY = 0,
-    _COLEMAK,
-    _DVORAK,
-    _WORKMAN,
-    _FUNCTION,
-    _NUMPAD,
-    _LAYOUTS,
-};
-
-#define CTL_ESC  LCTL_T(KC_ESC)    // Tap for ESC, hold for CTRL
-#define MD_LOCK  LCTL(LGUI(KC_Q))  // MacOS lock screen shortcut
-#define MO_FUNC  MO(_FUNCTION)     // Hold for function layer
-#define TG_NUMP  TG(_NUMPAD)       // Toggle numpad layer
-#define OSL_LAY  OSL(_LAYOUTS)     // One-shot layer to change layout
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* QWERTY
-     * ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬────────────┬───────┐
-     * │       │       │       │       │       │       │       │       │       │       │       │       │       │            │       │
-     * │   `   │   1   │   2   │   3   │   4   │   5   │   6   │   7   │   8   │   9   │   0   │   -   │   =   │ BackSpace  │ Home  │
-     * │       │       │       │       │       │       │       │       │       │       │       │       │       │            │       │
-     * ├───────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬─────────┼───────┤
-     * │          │       │       │       │       │       │       │       │       │       │       │       │       │         │       │
-     * │    Tab   │   Q   │   W   │   E   │   R   │   T   │   Y   │   U   │   I   │   O   │   P   │   [   │   ]   │    \    │  Del  │
-     * │          │       │       │       │       │       │       │       │       │       │       │       │       │         │       │
-     * ├──────────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─────────┼───────┤
-     * │            │       │       │       │       │       │       │       │       │       │       │       │               │       │
-     * │  Ctrl/Esc  │   A   │   S   │   D   │   F   │   G   │   H   │   J   │   K   │   L   │   ;   │   '   │    Return     │ PgUp  │
-     * │            │       │       │       │       │       │       │       │       │       │       │       │               │       │
-     * ├────────────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴───────┬───────┼───────┤
-     * │               │       │       │       │       │       │       │       │       │       │       │            │       │       │
-     * │     Shift     │   Z   │   X   │   C   │   V   │   B   │   N   │   M   │   ,   │   .   │   /   │   Shift    │  Up   │ PgDn  │
-     * │               │       │       │       │       │       │       │       │       │       │       │            │       │       │
-     * ├─────────┬─────┴───┬───┴─────┬─┴───────┴───────┴───────┴───────┴───────┴─────┬─┴───────┼───────┴─┬──┬───────┼───────┼───────┤
-     * │         │         │         │                                               │         │         │▒▒│       │       │       │
-     * │  Ctrl   │   GUI   │   Alt   │                     Space                     │   Alt   │  Func   │▒▒│ Left  │ Down  │ Right │
-     * │         │         │         │                                               │         │         │▒▒│       │       │       │
-     * └─────────┴─────────┴─────────┴───────────────────────────────────────────────┴─────────┴─────────┴──┴───────┴───────┴───────┘
-     */
-    [_QWERTY] = LAYOUT_65_ansi_blocker(
-        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,
-        CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_FUNC, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_COLEMAK] = LAYOUT_65_ansi_blocker(
-        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_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,          KC_ENT,  KC_PGUP,
-        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_UP,   KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_DVORAK] = LAYOUT_65_ansi_blocker(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC, KC_HOME,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS, KC_DEL,
-        CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          KC_ENT,  KC_PGUP,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,          KC_UP,   KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_WORKMAN] = LAYOUT_65_ansi_blocker(
-        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_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        CTL_ESC, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT,          KC_ENT,  KC_PGUP,
-        KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Function layer
-     * ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬────────────┬───────┐
-     * │       │       │       │       │       │       │       │       │       │       │       │       │       │            │       │
-     * │  Esc  │  F1   │  F2   │  F3   │  F4   │  F5   │  F6   │  F7   │  F8   │  F9   │  F10  │  F11  │  F12  │    Del     │  End  │
-     * │       │       │       │       │       │       │       │       │       │       │       │       │       │            │       │
-     * ├───────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬─────────┼───────┤
-     * │          │  RGB  │  RGB  │  RGB  │  RGB  │  RGB  │       │  USB  │  USB  │       │       │       │       │         │       │
-     * │          │ Speed │  Val  │ Speed │  Hue  │  Sat  │       │  Port │  GCR  │       │ PrtSc │ ScrLk │ Pause │ NumPad  │ Mute  │
-     * │          │   -   │   +   │   +   │   +   │   +   │       │       │       │       │       │       │       │         │       │
-     * ├──────────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─────────┼───────┤
-     * │            │  RGB  │  RGB  │  RGB  │  RGB  │  RGB  │       │       │       │ (Mac) │       │       │               │       │
-     * │  CapsLock  │  Mode │  Val  │  Mode │  Hue  │  Sat  │       │       │       │ Lock  │       │       │               │ Vol+  │
-     * │            │   -   │   -   │   +   │   -   │   -   │       │       │       │       │       │       │               │       │
-     * ├────────────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴───────┬───────┼───────┤
-     * │               │  RGB  │       │       │       │       │ 6KRO/ │       │       │       │       │            │       │       │
-     * │               │ On/Off│       │       │       │Restart│ NKRO  │ Debug │       │       │ Layout│            │ PgUp  │ Vol-  │
-     * │               │       │       │       │       │       │       │       │       │       │       │            │       │       │
-     * ├─────────┬─────┴───┬───┴─────┬─┴───────┴───────┴───────┴───────┴───────┴─────┬─┴───────┼───────┴─┬──┬───────┼───────┼───────┤
-     * │         │         │         │                                               │         │         │▒▒│       │       │       │
-     * │         │         │         │               Clear modifiers                 │         │         │▒▒│ Home  │ PgDn  │  End  │
-     * │         │         │         │                                               │         │         │▒▒│       │       │       │
-     * └─────────┴─────────┴─────────┴───────────────────────────────────────────────┴─────────┴─────────┴──┴───────┴───────┴───────┘
-     */
-    [_FUNCTION] = LAYOUT_65_ansi_blocker(
-        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_END,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, TG_NUMP, KC_MUTE,
-        KC_CAPS, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, MD_LOCK, _______, _______,          _______, KC_VOLU,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, OSL_LAY, _______,          KC_PGUP, KC_VOLD,
-        _______, _______, _______,                            HK_COSL,                            _______, _______, KC_HOME, KC_PGDN, KC_END
-    ),
-
-    /* Number pad (FN-\ to toggle)
-     * ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬────────────┬───────┐
-     * │       │       │       │       │       │       │       │       │       │       │       │       │       │            │       │
-     * │       │       │       │       │       │       │       │       │   /   │   *   │   -   │       │       │            │       │
-     * │       │       │       │       │       │       │       │       │       │       │       │       │       │            │       │
-     * ├───────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬─────────┼───────┤
-     * │          │       │       │       │       │       │       │       │       │       │       │       │       │         │       │
-     * │          │       │       │       │       │       │       │   7   │   8   │   9   │   +   │       │       │         │       │
-     * │          │       │       │       │       │       │       │       │       │       │       │       │       │         │       │
-     * ├──────────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─────────┼───────┤
-     * │            │       │       │       │       │       │       │       │       │       │       │       │               │       │
-     * │            │       │       │       │       │       │       │   4   │   5   │   6   │   +   │       │               │       │
-     * │            │       │       │       │       │       │       │       │       │       │       │       │               │       │
-     * ├────────────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴───────┬───────┼───────┤
-     * │               │       │       │       │       │       │       │       │       │       │       │            │       │       │
-     * │               │       │       │       │       │       │       │   1   │   2   │   3   │   =   │            │       │       │
-     * │               │       │       │       │       │       │       │       │       │       │       │            │       │       │
-     * ├─────────┬─────┴───┬───┴─────┬─┴───────┴───────┴───────┴───────┴───────┴─────┬─┴───────┼───────┴─┬──┬───────┼───────┼───────┤
-     * │         │         │         │                                               │         │         │▒▒│       │       │       │
-     * │         │         │         │                                     0         │    .    │         │▒▒│       │       │       │
-     * │         │         │         │                                               │         │         │▒▒│       │       │       │
-     * └─────────┴─────────┴─────────┴───────────────────────────────────────────────┴─────────┴─────────┴──┴───────┴───────┴───────┘
-     */
-    [_NUMPAD] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, 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_PEQL, _______,          _______, _______,
-        _______, _______, _______,                                     KC_P0,                     KC_PDOT, _______, _______, _______, _______
-    ),
-
-    /* Alternate layouts (FN-/ then one of [Q,C,D,W]) */
-    [_LAYOUTS] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, QWERTY,  WORKMAN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, DVORAK,  _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, COLEMAK, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-    ),
-
-    /* Template
-     * ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬────────────┬───────┐
-     * │       │       │       │       │       │       │       │       │       │       │       │       │       │            │       │
-     * │       │       │       │       │       │       │       │       │       │       │       │       │       │            │       │
-     * │       │       │       │       │       │       │       │       │       │       │       │       │       │            │       │
-     * ├───────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬─────────┼───────┤
-     * │          │       │       │       │       │       │       │       │       │       │       │       │       │         │       │
-     * │          │       │       │       │       │       │       │       │       │       │       │       │       │         │       │
-     * │          │       │       │       │       │       │       │       │       │       │       │       │       │         │       │
-     * ├──────────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─┬─────┴─────────┼───────┤
-     * │            │       │       │       │       │       │       │       │       │       │       │       │               │       │
-     * │            │       │       │       │       │       │       │       │       │       │       │       │               │       │
-     * │            │       │       │       │       │       │       │       │       │       │       │       │               │       │
-     * ├────────────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴──┬────┴───────┬───────┼───────┤
-     * │               │       │       │       │       │       │       │       │       │       │       │            │       │       │
-     * │               │       │       │       │       │       │       │       │       │       │       │            │       │       │
-     * │               │       │       │       │       │       │       │       │       │       │       │            │       │       │
-     * ├─────────┬─────┴───┬───┴─────┬─┴───────┴───────┴───────┴───────┴───────┴─────┬─┴───────┼───────┴─┬──┬───────┼───────┼───────┤
-     * │         │         │         │                                               │         │         │▒▒│       │       │       │
-     * │         │         │         │                                               │         │         │▒▒│       │       │       │
-     * │         │         │         │                                               │         │         │▒▒│       │       │       │
-     * └─────────┴─────────┴─────────┴───────────────────────────────────────────────┴─────────┴─────────┴──┴───────┴───────┴───────┘
-    [X] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-    ),
-    */
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL  (get_mods() & MOD_MASK_CTRL)
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return true;
-        case COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            return true;
-        case DVORAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_DVORAK);
-            }
-            return true;
-        case WORKMAN:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_WORKMAN);
-            }
-            return true;
-        case HK_COSL:
-            clear_keyboard();
-            reset_oneshot_layer();
-            return true;
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_KEYLIGHT: {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_UNDERGLOW: {
-                    rgb_matrix_set_flags(LED_FLAG_NONE);
-                    rgb_matrix_disable_noeeprom();
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_enable_noeeprom();
-                  }
-                  break;
-              }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/alt/keymaps/ewersp/README.md b/keyboards/massdrop/alt/keymaps/ewersp/README.md
deleted file mode 100644
index 8a19bb6c19a..00000000000
--- a/keyboards/massdrop/alt/keymaps/ewersp/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-## Greetings, Traveler!
-
-This layout is for the [Massdrop ALT Keyboard](https://drop.com/buy/massdrop-alt-mechanical-keyboard) and targets Windows machines.
-
-This keymap is very similar to the default keymap for the Drop ALT, but it overloads the left alt key to behave like an additional 'Fn' key while keeping the functionality of the alt key intact.
-
-### For example:
-```
-LeftAlt + 1...N         -> F1...FN
-LeftAlt + L/R Arrows    -> Home/End
-LeftAlt + Home          -> End
-LeftAlt + Backspace     -> Delete
-LeftAlt + Esc           -> Backtick (`)
-LeftAlt + Shift + Esc   -> Tilde (~)
-LeftAlt + LeftShift + 4 -> Alt+F4
-```
-
-The novel part of this keymap is that it **preserves the default functionality** of the left alt key, so ```'alt + tab', 'ctrl + alt + del', 'alt + f4'```, etc. all work as expected without using any janky timers.
-
-Everything also works with other modifier keys, so ```'alt + L/R' and 'alt + shift + L/R'``` work great for text manipulation to select lines.
-
-This **'super alt'** keymap will feel very familiar for anyone **coming from macOS** since the Windows alt key is in the same position as CMD on macOS keyboards.
-
-And finally, the original alt key functionality can be toggled at any time by pressing **```'Fn + period'```** so even if you don't like it, you can turn it off.
-
-This keymap was based on the 'default' Drop ALT keymap (and _not_ 'default_md') which means it supports all the fancy QMK RGB patterns, and isn't limited to the stock options that come with the board.
-
-If you have any questions, feel free to reach out to me at: ewersp [at] gmail [dot] com.
-
-Enjoy! **<3**
diff --git a/keyboards/massdrop/alt/keymaps/ewersp/config.h b/keyboards/massdrop/alt/keymaps/ewersp/config.h
deleted file mode 100644
index 1c801d7e3c1..00000000000
--- a/keyboards/massdrop/alt/keymaps/ewersp/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
diff --git a/keyboards/massdrop/alt/keymaps/ewersp/keymap.c b/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
deleted file mode 100644
index dd9177d8a91..00000000000
--- a/keyboards/massdrop/alt/keymaps/ewersp/keymap.c
+++ /dev/null
@@ -1,242 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum alt_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
-    DBG_TOG,               //DEBUG Toggle On / Off
-    DBG_MTRX,              //DEBUG Toggle Matrix Prints
-    DBG_KBD,               //DEBUG Toggle Keyboard Prints
-    DBG_MOU,               //DEBUG Toggle Mouse Prints
-    MD_BOOT,               //Restart into bootloader after hold timeout
-    ALT_DEL,               //Added to map left alt + backspace to delete
-};
-
-// Friendly layer names
-enum alt_layers {
-    DEF = 0,
-    ALT,
-    FUNC,
-    SUPR
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [DEF] = 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_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, MO(SUPR),                           KC_SPC,                             KC_RALT, MO(FUNC),KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [ALT] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, KC_LALT,                            _______,                            _______, _______, _______, _______, _______
-    ),
-    [FUNC] = LAYOUT_65_ansi_blocker(
-        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_MUTE,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
-        _______, RGB_TOG, _______, _______, EE_CLR,  MD_BOOT, NK_TOGG, DBG_TOG, _______, TG(ALT), _______, _______,          KC_PGUP, KC_VOLD,
-        _______, _______, KC_LALT,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
-    ),
-    [SUPR] = LAYOUT_65_ansi_blocker(
-        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,  ALT_DEL, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, KC_HOME, _______, KC_END
-    )
-};
-
-// EEPROM storage mode
-enum alt_rgb_mode {
-    RGB_MODE_ALL,
-    RGB_MODE_KEYLIGHT,
-    RGB_MODE_UNDERGLOW,
-    RGB_MODE_NONE,
-};
-
-// EEPROM storage type
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t rgb_mode :8;
-    };
-} alt_config_t;
-
-alt_config_t alt_config;
-
-// Read from EEPROM on init to load the last saved mode
-void keyboard_post_init_kb(void) {
-    alt_config.raw = eeconfig_read_user();
-    switch (alt_config.rgb_mode) {
-        case RGB_MODE_ALL:
-            rgb_matrix_set_flags(LED_FLAG_ALL);
-            rgb_matrix_enable_noeeprom();
-            break;
-        case RGB_MODE_KEYLIGHT:
-            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
-            rgb_matrix_set_color_all(0, 0, 0);
-            break;
-        case RGB_MODE_UNDERGLOW:
-            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-            rgb_matrix_set_color_all(0, 0, 0);
-            break;
-        case RGB_MODE_NONE:
-            rgb_matrix_set_flags(LED_FLAG_NONE);
-            rgb_matrix_disable_noeeprom();
-            break;
-    }
-}
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-
-// If the super alt layer is the active layer
-bool super_alt_layer_active = false;
-
-// If we need to unregister alt when leaving the super alt layer
-bool need_to_unregister_alt = false;
-
-// This runs code every time that the layers get changed
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case DEF:
-            // When returning to the default layer, check if we need to unregister the left alt key
-            if (super_alt_layer_active && need_to_unregister_alt) {
-                unregister_code(KC_LALT);
-            }
-
-            super_alt_layer_active = false;
-            need_to_unregister_alt = false;
-            break;
-        case SUPR:
-            super_alt_layer_active = true;
-            break;
-    }
-    return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        // These are the keys we want to 'fall though' and behave as usual when pressed with the alt modifier
-        case KC_A ... KC_Z:
-        case KC_TAB:
-        case KC_DEL:
-        case KC_UP:
-        case KC_DOWN:
-        case MO(FUNC):
-            if (super_alt_layer_active && record->event.pressed) {
-                // Only activate the alt modifier for the first key press
-                if ((get_mods() & MOD_BIT(KC_LALT)) == false) {
-                    register_code(KC_LALT);
-                    need_to_unregister_alt = true;
-                }
-            }
-            // We still want to process the keycode normally
-            return true;
-        case KC_F4:
-            // Map alt+shift+4 to alt+f4
-            if (super_alt_layer_active && (get_mods() & MOD_BIT(KC_LSFT))) {
-                if (record->event.pressed) {
-                    register_code(KC_LALT);
-                } else {
-                    unregister_code(KC_LALT);
-                }
-            }
-            return true;
-        case ALT_DEL:
-            if (record->event.pressed) {
-                register_code(KC_DEL);
-            } else {
-                unregister_code(KC_DEL);
-            }
-            return false;
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case QK_CLEAR_EEPROM:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    eeconfig_init();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                        alt_config.rgb_mode = RGB_MODE_KEYLIGHT;
-                        break;
-                    }
-                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                        alt_config.rgb_mode = RGB_MODE_UNDERGLOW;
-                        break;
-                    }
-                    case LED_FLAG_UNDERGLOW: {
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_disable_noeeprom();
-                        alt_config.rgb_mode = RGB_MODE_NONE;
-                        break;
-                    }
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();
-                        alt_config.rgb_mode = RGB_MODE_ALL;
-                        break;
-                    }
-                }
-                eeconfig_update_user(alt_config.raw);
-            }
-            return false;
-        default:
-            return true; // Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/alt/keymaps/favorable-mutation/README.md b/keyboards/massdrop/alt/keymaps/favorable-mutation/README.md
deleted file mode 100644
index 9b0ad513b45..00000000000
--- a/keyboards/massdrop/alt/keymaps/favorable-mutation/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-### Massdrop Alt Layout
-
-This layout is for the [Massdrop Alt
-Keyboard](https://drop.com/buy/massdrop-alt-mechanical-keyboard)
-and targets MacOS machines.
-
-Some features:
-
-* Tap space for space, hold for cmd
-* Tap caps lock for esc, hold for ctrl
-* Dedicated key for entering default mode of [yabai window
-manager](https://github.com/koekeishiya/yabai)
-* Who needs arrow keys, anyways???
-* Method for clearing all stuck-down mods
diff --git a/keyboards/massdrop/alt/keymaps/favorable-mutation/config.h b/keyboards/massdrop/alt/keymaps/favorable-mutation/config.h
deleted file mode 100644
index 1893f2ba6e0..00000000000
--- a/keyboards/massdrop/alt/keymaps/favorable-mutation/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2019 Griffin Rademacher <contact@griffin-rademacher.info>
-
-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
-
-// toggle one-shot layer keys after this many presses
-#define ONESHOT_TAP_TOGGLE 3
-
-// set time held before Mod-Tap key sends mod code
-#define TAPPING_TERM 1000
-
-// permissive hold: if holding down a Mod-Tap key while pressing another, it
-// acts as a mod, even within the tapping term
-#define PERMISSIVE_HOLD
diff --git a/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c b/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c
deleted file mode 100644
index 370734d06d2..00000000000
--- a/keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum alt_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
-    DBG_TOG,               //DEBUG Toggle On / Off
-    DBG_MTRX,              //DEBUG Toggle Matrix Prints
-    DBG_KBD,               //DEBUG Toggle Keyboard Prints
-    DBG_MOU,               //DEBUG Toggle Mouse Prints
-    MD_BOOT,               //Restart into bootloader after hold timeout
-    HK_COSL,               //Clear held-down keys
-};
-
-#define TG_NKRO  MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode
-#define CTL_ESC  LCTL_T(KC_ESC)
-#define TP_LSFT  OSM(MOD_LSFT)
-#define TP_RSFT  OSM(MOD_RSFT)
-#define TP_LALT  OSM(MOD_LALT)
-#define TP_RALT  OSM(MOD_RALT)
-#define KC_YBAI  LCTL(KC_SPC)
-#define GUI_SPC  LGUI_T(KC_SPC)
-#define KC_SPOT  LGUI(KC_SPC)
-
-//TODO default layer vim-like binds that work with WM, i to type??? this leads
-//to layers of vim modes - what's the best way to deal with that?
-//also need to deal with shift not working for other mods, add to shift layer
-//most likely
-//
-//TODO tap/toggle for layers
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        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_SPOT,
-        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,
-        CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_MUTE,
-        TP_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_VOLU, KC_MPLY,
-        TP_LALT, TG(2),   KC_YBAI,                            GUI_SPC,                            TP_RALT, TG(1),   KC_MRWD, KC_VOLD, KC_MFFD
-    ),
-    [1] = 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,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_HOME,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, KC_MRWD, KC_MFFD, _______, _______, _______,          _______, KC_PGUP,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, TG_NKRO, DBG_TOG, _______, _______, _______, _______,          KC_UP,   KC_PGDN,
-        _______, _______, _______,                            HK_COSL,                            _______, TG(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-    ),
-    */
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL  (get_mods() & MOD_MASK_CTRL)
-#define MODS_ALT  (get_mods() & MOD_MASK_ALT)
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case HK_COSL:
-            clear_keyboard();
-            reset_oneshot_layer();
-            return true;
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_KEYLIGHT: {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_UNDERGLOW: {
-                    rgb_matrix_set_flags(LED_FLAG_NONE);
-                    rgb_matrix_disable_noeeprom();
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_enable_noeeprom();
-                  }
-                  break;
-              }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c b/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c
deleted file mode 100644
index a0ea46f3230..00000000000
--- a/keyboards/massdrop/alt/keymaps/hlmtre/keymap.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Copyright 2021 hlmtre
- *
- * 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 alt_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
-    DBG_TOG,               //DEBUG Toggle On / Off
-    DBG_MTRX,              //DEBUG Toggle Matrix Prints
-    DBG_KBD,               //DEBUG Toggle Keyboard Prints
-    DBG_MOU,               //DEBUG Toggle Mouse Prints
-    MD_BOOT,               //Restart into bootloader after hold timeout
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = 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_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,
-        MO(1),   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_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_65_ansi_blocker(
-        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_MUTE,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO, KC_INS, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_VOLU, KC_VOLD,
-        _______, _______, _______,                            KC_MPLY,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-    ),
-    */
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_UNDERGLOW: {
-                    rgb_matrix_set_flags(LED_FLAG_NONE);
-                    rgb_matrix_disable_noeeprom();
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_enable_noeeprom();
-                  }
-                  break;
-              }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/alt/keymaps/mac/keymap.c b/keyboards/massdrop/alt/keymaps/mac/keymap.c
deleted file mode 100644
index 8a5fd9543ab..00000000000
--- a/keyboards/massdrop/alt/keymaps/mac/keymap.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum alt_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
-    DBG_TOG,               //DEBUG Toggle On / Off
-    DBG_MTRX,              //DEBUG Toggle Matrix Prints
-    DBG_KBD,               //DEBUG Toggle Keyboard Prints
-    DBG_MOU,               //DEBUG Toggle Mouse Prints
-    MD_BOOT,               //Restart into bootloader after hold timeout
-};
-
-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,    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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
-        _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-    ),
-    */
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_KEYLIGHT: {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_UNDERGLOW: {
-                    rgb_matrix_set_flags(LED_FLAG_NONE);
-                    rgb_matrix_disable_noeeprom();
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_enable_noeeprom();
-                  }
-                  break;
-              }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/alt/keymaps/mac_md/keymap.c b/keyboards/massdrop/alt/keymaps/mac_md/keymap.c
deleted file mode 100644
index 2b557475a5d..00000000000
--- a/keyboards/massdrop/alt/keymaps/mac_md/keymap.c
+++ /dev/null
@@ -1,258 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum alt_keycodes {
-    L_BRI = SAFE_RANGE, //LED Brightness Increase                                   //Working
-    L_BRD,              //LED Brightness Decrease                                   //Working
-    L_EDG_I,            //LED Edge Brightness Increase
-    L_EDG_D,            //LED Edge Brightness Decrease
-    L_EDG_M,            //LED Edge lighting mode
-    L_PTN,              //LED Pattern Select Next                                   //Working
-    L_PTP,              //LED Pattern Select Previous                               //Working
-    L_PSI,              //LED Pattern Speed Increase                                //Working
-    L_PSD,              //LED Pattern Speed Decrease                                //Working
-    L_RATIOD,
-    L_RATIOI,
-    L_T_MD,             //LED Toggle Mode                                           //Working
-    L_T_ONF,            //LED Toggle On / Off                                       //Broken
-    L_ON,               //LED On                                                    //Broken
-    L_OFF,              //LED Off                                                   //Broken
-    L_T_BR,             //LED Toggle Breath Effect                                  //Working
-    L_T_PTD,            //LED Toggle Scrolling Pattern Direction                    //Working
-    U_T_AGCR,           //USB Toggle Automatic GCR control                          //Working
-    DBG_TOG,            //DEBUG Toggle On / Off                                     //
-    DBG_MTRX,           //DEBUG Toggle Matrix Prints                                //
-    DBG_KBD,            //DEBUG Toggle Keyboard Prints                              //
-    DBG_MOU,            //DEBUG Toggle Mouse Prints                                 //
-    DBG_FAC,            //DEBUG Factory light testing (All on white)
-    MD_BOOT             //Restart into bootloader after hold timeout                //Working
-};
-
-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,    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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
-        L_T_BR,  L_PSD,   L_BRI,   L_PSI,   L_EDG_I, _______, _______, _______, U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
-        L_T_PTD, L_PTP,   L_BRD,   L_PTN,   L_EDG_D, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
-        _______, L_T_MD,  L_T_ONF, _______, L_EDG_M, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
-        _______, _______, _______,                            DBG_FAC,                            _______, _______, KC_HOME, KC_PGDN, KC_END
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-    ),
-    */
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-    static uint8_t scroll_effect = 0;
-
-    switch (keycode) {
-        case L_BRI:
-            if (record->event.pressed) {
-                if (LED_GCR_STEP > LED_GCR_MAX - gcr_desired) gcr_desired = LED_GCR_MAX;
-                else gcr_desired += LED_GCR_STEP;
-                if (led_animation_breathing) gcr_breathe = gcr_desired;
-            }
-            return false;
-        case L_BRD:
-            if (record->event.pressed) {
-                if (LED_GCR_STEP > gcr_desired) gcr_desired = 0;
-                else gcr_desired -= LED_GCR_STEP;
-                if (led_animation_breathing) gcr_breathe = gcr_desired;
-            }
-            return false;
-        case L_EDG_M:
-            if (record->event.pressed) {
-                led_edge_mode++;
-                if (led_edge_mode > LED_EDGE_MODE_MAX) {
-                    led_edge_mode = LED_EDGE_MODE_ALL;
-                }
-            }
-            return false;
-        case L_EDG_I:
-            if (record->event.pressed) {
-                led_edge_brightness += 0.1;
-                if (led_edge_brightness > 1) { led_edge_brightness = 1; }
-            }
-            return false;
-        case L_EDG_D:
-            if (record->event.pressed) {
-                led_edge_brightness -= 0.1;
-                if (led_edge_brightness < 0) { led_edge_brightness = 0; }
-            }
-            return false;
-        case L_RATIOI:
-            if (record->event.pressed) {
-                led_ratio_brightness += 0.2;
-                if (led_ratio_brightness > 2.0) { led_ratio_brightness = 2.0; }
-            }
-            return false;
-        case L_RATIOD:
-            if (record->event.pressed) {
-                led_ratio_brightness -= 0.2;
-                if (led_ratio_brightness < 0.0) { led_ratio_brightness = 0.0; }
-            }
-            return false;
-        case L_PTN:
-            if (record->event.pressed) {
-                if (led_animation_id == led_setups_count - 1) led_animation_id = 0;
-                else led_animation_id++;
-            }
-            return false;
-        case L_PTP:
-            if (record->event.pressed) {
-                if (led_animation_id == 0) led_animation_id = led_setups_count - 1;
-                else led_animation_id--;
-            }
-            return false;
-        case L_PSI:
-            if (record->event.pressed) {
-                led_animation_speed += ANIMATION_SPEED_STEP;
-            }
-            return false;
-        case L_PSD:
-            if (record->event.pressed) {
-                led_animation_speed -= ANIMATION_SPEED_STEP;
-                if (led_animation_speed < 0) led_animation_speed = 0;
-            }
-            return false;
-        case L_T_MD:
-            if (record->event.pressed) {
-                led_lighting_mode++;
-                if (led_lighting_mode > LED_MODE_MAX_INDEX) led_lighting_mode = LED_MODE_NORMAL;
-            }
-            return false;
-        case L_T_ONF:
-            if (record->event.pressed) {
-                led_enabled = !led_enabled;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case L_ON:
-            if (record->event.pressed) {
-                led_enabled = 1;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case L_OFF:
-            if (record->event.pressed) {
-                led_enabled = 0;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case L_T_BR:
-            if (record->event.pressed) {
-                led_animation_breathing = !led_animation_breathing;
-                if (led_animation_breathing) {
-                    gcr_breathe = gcr_desired;
-                    led_animation_breathe_cur = BREATHE_MIN_STEP;
-                    breathe_dir = 1;
-                }
-            }
-            return false;
-        case L_T_PTD:
-            if (record->event.pressed) {
-                scroll_effect++;
-                if (scroll_effect == 1) {               //Patterns with scroll move horizontal (Right to left)
-                    led_animation_direction = 1;
-                    led_animation_orientation = 0;
-                    led_animation_circular = 0;
-                } else if (scroll_effect == 2) {        //Patterns with scroll move vertical (Top to bottom)
-                    led_animation_direction = 1;
-                    led_animation_orientation = 1;
-                    led_animation_circular = 0;
-                } else if (scroll_effect == 3) {        //Patterns with scroll move vertical (Bottom to top)
-                    led_animation_direction = 0;
-                    led_animation_orientation = 1;
-                    led_animation_circular = 0;
-                } else if (scroll_effect == 4) {        //Patterns with scroll explode from center
-                    led_animation_direction = 0;
-                    led_animation_orientation = 0;
-                    led_animation_circular = 1;
-                } else if (scroll_effect == 5) {        //Patterns with scroll implode on center
-                    led_animation_direction = 1;
-                    led_animation_orientation = 0;
-                    led_animation_circular = 1;
-                } else {                                //Patterns with scroll move horizontal (Left to right)
-                    scroll_effect = 0;
-                    led_animation_direction = 0;
-                    led_animation_orientation = 0;
-                    led_animation_circular = 0;
-                }
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_FAC:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                led_lighting_mode = LED_MODE_NORMAL;
-                led_edge_brightness = 1;
-                led_edge_mode = LED_EDGE_MODE_ALL;
-                led_animation_breathing = 0;
-                led_animation_id = 7; //led_programs.c led_setups leds_white index
-                gcr_desired = LED_GCR_MAX;
-                led_enabled = 1;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
-
-led_instruction_t led_instructions[] = {
-    //Please see ../default_md/keymap.c for examples
-
-    //All LEDs use the user's selected pattern (this is the factory default)
-     { .flags = LED_FLAG_USE_ROTATE_PATTERN },
-
-    //end must be set to 1 to indicate end of instruction set
-     { .end = 1 }
-};
diff --git a/keyboards/massdrop/alt/keymaps/mac_md/rules.mk b/keyboards/massdrop/alt/keymaps/mac_md/rules.mk
deleted file mode 100644
index 064a6f54c1f..00000000000
--- a/keyboards/massdrop/alt/keymaps/mac_md/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This keymap requires Massdrop Configurator support
-OPT_DEFS += -DUSE_MASSDROP_CONFIGURATOR
diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h
deleted file mode 100644
index 27bf1a8332c..00000000000
--- a/keyboards/massdrop/alt/keymaps/pregame/config.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Copyright 2020 elijahblake81
- *
- * 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 MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
-#define MODS_ALT    (get_mods() & MOD_MASK_ALT)
-
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
-
-// #define NO_DEBUG                    			// Disable debugging
-// #define NO_PRINT                    			// Disable printing/debugging using hid_listen
-// #define NO_ACTION_LAYER             			// Disable layers
-// #define NO_ACTION_TAPPING           			// Disable tap dance and other tapping features
-// #define NO_ACTION_ONESHOT           			// Disable one-shot modifiers
-// #define NO_ACTION_MACRO             			// Disable old style macro handling: MACRO() & action_get_macro
-// #define TERMINAL_HELP
-// #define MOUSEKEY_INTERVAL 20
-// #define MOUSEKEY_DELAY 0
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_MAX_SPEED 10
-// #define MOUSEKEY_WHEEL_DELAY 0
-#define FORCE_NKRO                  			// NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-// #define STRICT_LAYER_RELEASE        			// Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
-// #define LOCKING_SUPPORT_ENABLE      			// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-// #define LOCKING_RESYNC_ENABLE       			// Tries to keep switch state consistent with keyboard LED state
-// #define TAPPING_TERM 200            			// How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-// #define TAPPING_TERM_PER_KEY        			// Enabling to allow to tweak individual keys
-// #define RETRO_TAPPING               			// Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-// #define TAPPING_TOGGLE 2            			// How many taps before triggering the toggle
-// #define PERMISSIVE_HOLD             			// Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define QUICK_TAP_TERM 0          			// Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-// #define LEADER_TIMEOUT 300          			// How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-// #define LEADER_PER_KEY_TIMING       			// Sets the timer for leader key chords to run on each key press rather than overall
-// #define LEADER_KEY_STRICT_KEY_PROCESSING    	// Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-// #define ONESHOT_TIMEOUT 3000         		// How long before oneshot times out
-// #define ONESHOT_TAP_TOGGLE 2        			// How many taps before oneshot toggle is triggered
-// #define COMBO_TERM 200              			// How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-// #define TAP_CODE_DELAY 100          			// Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      			// Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES         			// reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        		// reacts to keyreleases (instead of keypresses)
-
-
-
-//Teal and Blue
-//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
-//#define RGB_MATRIX_DEFAULT_SPD 47 			// Used to determine the color for the modifiers
-
-//Teal and Blue
-//#define RGB_MATRIX_DEFAULT_HUE 120 			// Default boot color
-//#define RGB_MATRIX_DEFAULT_SPD 50 			//Used to determine the color for the modifiers
-
-
-//QMK HSV is based on 255 value wheel rather than 360
-
-//Cyan and Yellow
-//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
-//#define RGB_MATRIX_DEFAULT_SPD 177
-
-//Cyan and Green
-//#define RGB_MATRIX_DEFAULT_HUE 127 			// Default boot color
-//#define RGB_MATRIX_DEFAULT_SPD 215
-
-// #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE  	// Sets the default mode, if none has been set
-#define RGB_MATRIX_DEFAULT_HUE 180  //purple  alphas with green background when pressed.
-// #define RGBLIGHT_HUE_STEP 12        						// Units to step when in/decreasing hue
-// #define RGBLIGHT_SAT_STEP 25        						// Units to step when in/decreasing saturation
-// #define RGBLIGHT_VAL_STEP 12        						// Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED 			// turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 RGBLIGHT_EFFECT_ALTERNATING     					// Enable alternating animation mode.
-#define RGBLIGHT_EFFECT_BREATHING       					// Enable breathing animation mode.
-// #define RGBLIGHT_EFFECT_CHRISTMAS       					// Enable christmas animation mode.
-// #define RGBLIGHT_EFFECT_KNIGHT          					// Enable knight animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD    					// Enable rainbow mood animation mode.
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL   					// Enable rainbow swirl animation mode.
-// #define RGBLIGHT_EFFECT_RGB_TEST        					// Enable RGB test animation mode.
-// #define RGBLIGHT_EFFECT_SNAKE           					// Enable snake animation mode.
-// #define RGBLIGHT_EFFECT_STATIC_GRADIENT 					// Enable static gradient mode.
-
-// #define RGBLIGHT_EFFECT_BREATHE_CENTER              		// If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
-// #define RGBLIGHT_EFFECT_BREATHE_MAX 255             		// The maximum brightness for the breathing mode. Valid values are 1 to 255
-// #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 1000     		// How long to wait between light changes for the "Christmas" animation, in milliseconds
-// #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 2            		// The number of LEDs to group the red/green colors by for the "Christmas" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM RGBLED_NUM   		// The number of LEDs to have the "Knight" animation travel
-// #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3             		// The number of LEDs to light up for the "Knight" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 0             		// The number of LEDs to start the "Knight" animation from the start of the strip by
-// #define RGBLIGHT_RAINBOW_SWIRL_RANGE 255            		// Range adjustment for the rainbow swirl effect to get different swirls
-// #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4              		// The number of LEDs to light up for the "Snake" animation
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
-// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN              // Static gradient top to bottom, speed controls how much gradient changes
-// #undef ENABLE_RGB_MATRIX_BREATHING                     // Single hue brightness cycling animation
-// #undef ENABLE_RGB_MATRIX_BAND_SAT                      // Single hue band fading saturation scrolling left to right
-// #undef ENABLE_RGB_MATRIX_BAND_VAL                      // Single hue band fading brightness scrolling left to right
-// #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT             // Single hue 3 blade spinning pinwheel fades saturation
-// #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL             // Single hue 3 blade spinning pinwheel fades brightness
-// #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT               // Single hue spinning spiral fades saturation
-// #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL               // Single hue spinning spiral fades brightness
-// #undef ENABLE_RGB_MATRIX_CYCLE_ALL                     // Full keyboard solid hue cycling through full gradient
-// #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT              // Full gradient scrolling left to right
-// #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN                 // Full gradient scrolling top to bottom
-// #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN                  // Full gradient scrolling out to in
-// #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL             // Full dual gradients scrolling out to in
-// #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON        // Full gradent Chevron shapped scrolling left to right
-// #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL                // Full gradient spinning pinwheel around center of keyboard
-// #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL                  // Full gradient spinning spiral around center of keyboard
-// #undef ENABLE_RGB_MATRIX_DUAL_BEACON                   // Full gradient spinning around center of keyboard
-// #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON                // Full tighter gradient spinning around center of keyboard
-// #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS             // Full dual gradients spinning two halfs of keyboard
-// #undef ENABLE_RGB_MATRIX_RAINDROPS                     // Randomly changes a single key's hue
-// #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS           // Randomly changes a single key's hue and saturation
-// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN  // That famous computer simulation
-// =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE                // Static single hue, pulses keys hit to shifted hue then fades to current hue
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE         // Pulses keys hit to hue & value then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE           // Hue & value pulse near a single key hit then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE      // Hue & value pulse near multiple key hits then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS          // Hue & value pulse the same column and row of a single key hit then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS     // Hue & value pulse the same column and row of multiple key hits then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS          // Hue & value pulse away on the same column and row of a single key hit then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS     // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-// #undef ENABLE_RGB_MATRIX_SPLASH                        // Full gradient & value pulse away from a single key hit then fades value out
-// #undef ENABLE_RGB_MATRIX_MULTISPLASH                   // Full gradient & value pulse away from multiple key hits then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_SPLASH                  // Hue & value pulse away from a single key hit then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH             // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/massdrop/alt/keymaps/pregame/keymap.c b/keyboards/massdrop/alt/keymaps/pregame/keymap.c
deleted file mode 100644
index d111b6a5547..00000000000
--- a/keyboards/massdrop/alt/keymaps/pregame/keymap.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* Copyright 2020 elijahblake81
- *
- * 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 MILLISECONDS_IN_SECOND 1000
-
-// These are just to make it neater to use builtin HSV values in the keymap
-#define RED {HSV_RED}
-#define CORAL {HSV_CORAL}
-#define ORANGE {HSV_ORANGE}
-#define GOLDEN {HSV_GOLDENROD}
-#define GOLD {HSV_GOLD}
-#define YELLOW {HSV_YELLOW}
-#define CHART {HSV_CHARTREUSE}
-#define GREEN {HSV_GREEN}
-#define SPRING {HSV_SPRINGGREEN}
-#define TURQ {HSV_TURQUOISE}
-#define TEAL {HSV_TEAL}
-#define CYAN {HSV_CYAN}
-#define AZURE {HSV_AZURE}
-#define BLUE {HSV_BLUE}
-#define PURPLE {HSV_PURPLE}
-#define MAGENT {HSV_MAGENTA}
-#define PINK {HSV_PINK}
-
-
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-extern bool g_suspend_state;
-extern rgb_config_t rgb_matrix_config;
-bool disable_layer_color;
-
-enum alt_keycodes {
-    U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              // USB Toggle Automatic GCR control
-    DBG_TOG,               // DEBUG Toggle On / Off
-    DBG_MTRX,              // DEBUG Toggle Matrix Prints
-    DBG_KBD,               // DEBUG Toggle Keyboard Prints
-    DBG_MOU,               // DEBUG Toggle Mouse Prints
-    MD_BOOT,               // Restart into bootloader after hold timeout
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /*
-    [DEFAULT] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_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_LEFT, KC_DOWN, KC_RGHT
-    ),
-    */
-   [0] = 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_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_LEFT,  KC_DOWN, KC_RGHT
-        ),
-    [1] = LAYOUT_65_ansi_blocker(
-        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_F13,   KC_CALC,
-        RGB_M_P, RGB_SPD,  RGB_HUI, RGB_SPI, RGB_SAI, RGB_VAI, _______, U_T_AUTO, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_MYCM,
-        RGB_TOG, RGB_RMOD, RGB_HUD, RGB_MOD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______,          KC_MUTE,  KC_VOLU,
-        _______, _______,  _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_VOLU,  KC_VOLD,
-        _______, _______,  _______,                            KC_MPLY,                            _______, _______, KC_HOME, KC_VOLD,  KC_END
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, TG_NKRO, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-    ),
-    [RGB] = LAYOUT(
-        ESC: 0,    1: 1,      2: 2,      3: 3,    4: 4,    5: 5,    6: 6,    7: 7,    8: 8,      9: 9,      0: 10,      MINS: 11,   EQL: 12,   BSPC: 13,  DEL: 14,
-        TAB: 15,   Q: 16,     W: 17,     E: 18,   R: 19,   T: 20,   Y: 21,   U: 22,   I: 23,     O: 24,     P: 25,      LBRC: 26,   RBRC: 27,  BSLS: 28,  HOME: 29,
-        CAPS: 30,  A: 31,     S: 32,     D: 33,   F: 34,   G: 35,   H: 36,   J: 37,   K: 38,     L: 39,     SCLN: 40,   QUOT: 41,              ENT: 42,   PGUP: 43,
-        LSFT: 44,  Z: 45,     X: 46,     C: 47,   V: 48,   B: 49,   N: 50,   M: 51,   COMM: 52,  DOT: 53,   SLSH: 54,   RSFT: 55,              UP: 56,    PGDN: 57,
-        LCTL: 58,  LGUI: 59,  LALT: 60,                    SPC: 61,                              RALT: 62,  FN: 63,                  LEFT: 64, DOWN: 65,  RGHT: 66
-        //UnderGlow
-        :67, :68, :69, :70, :71, :72, :73, :74, :75, :76, :77, :78, :79, :80, :81,
-        :82, :83, :84, :85,
-        :86, :87, :88, :89,
-        :90, :91, :92, :93, :94, :95, :96, :97, :98, :99, :100, :101, :102, :103, :104, :105,
-    ),
-    [MATRIX] = LAYOUT(
-        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,
-        58,     59,     60,                             61,                         62,     63,         64,     65,     66,
-        //UnderGlow
-        90,     91,     92,     93,     94,     95,     96,     97,     98,     99,     100,    101,    102,    103,        104,        105,
-        88,                                                                                                                             89,
-        86,                                                                                                                             87,
-        84,                                                                                                                             85,
-        67,     68,     69,     70,     71,     72,     73,     74,     75,     76,     77,     78,     79,     80,     81,     82,     83
-    ),
-    */
-};
-
-#ifdef _______
-#undef _______
-#define _______ {0, 0, 0}
-
-const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
-    [0] = {
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, CHART,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, CHART,   CHART,   CHART,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          CHART,   _______,
-        _______, _______, _______,                            _______,                            _______, _______, CHART,   CHART,   CHART,
-        //UnderGlow
-        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,
-        CHART,                                                                                                                        CHART,
-        CHART,                                                                                                                        CHART,
-        CHART,                                                                                                                        CHART,
-        CHART,                                                                                                                        CHART,
-        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART
-        },
-    [1] = {
-        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,    CHART,   CHART,   CHART,   CHART,     CHART,    BLUE,
-        GOLD,    PINK,    AZURE,   PINK,    TURQ,    TEAL,    _______, RED,     _______,  _______, GREEN,   BLUE,    GOLD,      _______,  BLUE,
-        TEAL,    MAGENT,  AZURE,   MAGENT,  TURQ,    TEAL,    _______, _______, _______,  _______, _______, _______,                GOLD, BLUE,
-        _______, _______, _______, _______, _______, RED,     RED,     RED,     _______,  _______, _______, _______,                GOLD, BLUE,
-        _______, _______, _______,                            GOLD,                                _______, _______,       PURPLE,  GOLD, PURPLE,
-        //UnderGlow
-        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,
-        CHART,                                                                                                                        CHART,
-        CHART,                                                                                                                        CHART,
-        CHART,                                                                                                                        CHART,
-        CHART,                                                                                                                        CHART,
-        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART
-    },
-};
-
-#undef _______
-#define _______ KC_TRNS
-#endif
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-    // Enable or disable debugging
-    debug_enable=false;
-    debug_matrix=false;
-    debug_keyboard=false;
-    //rgb_enabled_flag = true;          // Initially, keyboard RGB is enabled. Change to false config.h initializes RGB disabled.
-};
-
-void keyboard_post_init_user(void) {
-    rgb_matrix_enable();
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case LED_FLAG_UNDERGLOW: {
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_disable_noeeprom();
-                    }
-                    break;
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();
-                    }
-                    break;
-                }
-                return false;
-        }
-    }
-    return true;
-}
-void set_layer_color(int layer) {
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        HSV hsv = {
-            .h = pgm_read_byte(&ledmap[layer][i][0]),
-            .s = pgm_read_byte(&ledmap[layer][i][1]),
-            .v = pgm_read_byte(&ledmap[layer][i][2]),
-        };
-        if (hsv.h || hsv.s || hsv.v) {
-            RGB rgb = hsv_to_rgb(hsv);
-            float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-            rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b);
-        } else if (layer == 1) {
-            // Only deactivate non-defined key LEDs at layers other than FN. Because at FN we have RGB adjustments and need to see them live.
-            // If the values are all false then it's a transparent key and deactivate LED at this layer
-            rgb_matrix_set_color(i, 0, 0, 0);
-        }
-    }
-}
-bool rgb_matrix_indicators_user(void) {
-    if (g_suspend_state || disable_layer_color ||
-        rgb_matrix_get_flags() == LED_FLAG_NONE ||
-        rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
-            return;
-        }
-    set_layer_color(get_highest_layer(layer_state));
-    return false;
-}
diff --git a/keyboards/massdrop/alt/keymaps/pregame/readme.md b/keyboards/massdrop/alt/keymaps/pregame/readme.md
deleted file mode 100644
index e1872705607..00000000000
--- a/keyboards/massdrop/alt/keymaps/pregame/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Massdrop Alt Pregame
-
-This keymap is here to show some love to the MD Alt. This is a stripped down version of the Drop Ctrl Endgame; hence the name Pregame.
-
-## IRL
-![In Real Life](https://i.imgur.com/Xp6Mb6P.jpg)
-
-
-
-## Layers
-
-### Typing Layer
-
-![Typing Layer](https://i.imgur.com/F7iU53K.png)
-
-### Function Layer
-
-![SHORTCUT_LAYER](https://i.imgur.com/Gub1xyC.png)
-
-## Features
-
-These are the features currently supported by this keymap:
-
-### RGB Can be customized by "NAME OF COLOR" in the Keymap.c file. 
-	1. Look at keymap for example.  My base layer the W,A,S,D and Arrow Keys are CHART short for CHARTREUSE (Close to NVIDIA GREEN). The values to pick from are located on keymap.h file.
-	2. I have applied static colors to the Function layer that let you know which keys are available to that layer only.  The not lit up keys are still accessible if set to Transparent Keycap!!! 
-
-## Credits
-
-This was all converted originally from the Drop Ctrl Endgame.  I took nblyumberg's version of code and converted it to fit into the alt.
-RGB timeout functionality was originally inspired by the code in this [gist](https://gist.github.com/algernon/9182469e21894192017f2bb5d478c7df).
-LED config code was mostly transferred from [matthewrobo keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/ctrl/keymaps/matthewrobo).
-
-
-**Rest of the information about RGB matrix, scan matrix, and whatever information I have used was made publicly available by many other awesome members of the community.**
diff --git a/keyboards/massdrop/alt/keymaps/pregame/rules.mk b/keyboards/massdrop/alt/keymaps/pregame/rules.mk
deleted file mode 100644
index 5981633f7c2..00000000000
--- a/keyboards/massdrop/alt/keymaps/pregame/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# RGBLIGHT_ENABLE = no			# Not for MD boards. This is here in case you forget.
-COMMAND_ENABLE = no			# Commands for debug and configuration
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-# AUTO_SHIFT_ENABLE = yes      	# Auto Shift
-NKRO_ENABLE = yes           	# USB Nkey Rollover
-DYNAMIC_MACRO_ENABLE = no		# Dynamic macro recording and play
-MOUSEKEY_ENABLE = no			# Enable mouse control keycodes. Increases firmware size.
-TAP_DANCE_ENABLE = no			# Enable tap dance keys
-CONSOLE_ENABLE = no			# Enable debugging console. Increases firmware size.
-EXTRAKEY_ENABLE = yes			# Audio control and System control
-# RAW_ENABLE = yes				# Raw HID has not yet been implemented for this keyboard
-# COMBO_ENABLE					# Key combo feature
-# LEADER_ENABLE					# Enable leader key chording
diff --git a/keyboards/massdrop/alt/keymaps/reywood/README.md b/keyboards/massdrop/alt/keymaps/reywood/README.md
deleted file mode 100644
index 5ee630dfb80..00000000000
--- a/keyboards/massdrop/alt/keymaps/reywood/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS KEYMAP IS BROKEN
-
-The CTRL and ALT have both been switched to using the QMK RGB Matrix system,
-rendering any custom effects that used the old, custom Massdrop lighting system,
-BROKEN.
diff --git a/keyboards/massdrop/alt/keymaps/reywood/keymap.c b/keyboards/massdrop/alt/keymaps/reywood/keymap.c
deleted file mode 100644
index 69d09e086c4..00000000000
--- a/keyboards/massdrop/alt/keymaps/reywood/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "rgb_matrix_user.h"
-
-enum alt_keycodes {
-  L_BRI = SAFE_RANGE, //LED Brightness Increase
-  L_BRD,              //LED Brightness Decrease
-  L_PTN,              //LED Pattern Select Next
-  L_PTP,              //LED Pattern Select Previous
-  L_PSI,              //LED Pattern Speed Increase
-  L_PSD,              //LED Pattern Speed Decrease
-  L_T_MD,             //LED Toggle Mode
-  L_T_ONF,            //LED Toggle On / Off
-  L_ON,               //LED On
-  L_OFF,              //LED Off
-  L_T_BR,             //LED Toggle Breath Effect
-  L_T_PTD,            //LED Toggle Scrolling Pattern Direction
-  U_T_AUTO,           //USB Extra Port Toggle Auto Detect / Always Active
-  U_T_AGCR,           //USB Toggle Automatic GCR control
-  DBG_TOG,            //DEBUG Toggle On / Off
-  DBG_MTRX,           //DEBUG Toggle Matrix Prints
-  DBG_KBD,            //DEBUG Toggle Keyboard Prints
-  DBG_MOU,            //DEBUG Toggle Mouse Prints
-  MD_BOOT,            //Restart into bootloader after hold timeout
-};
-
-#define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode
-#define ______ KC_TRNS
-
-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,    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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_MUTE,
-    _______, _______, _______,  KC_UP,  _______, _______, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
-    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, _______, _______, _______, _______, MD_BOOT, TG_NKRO, _______, _______, _______, _______, _______,          KC_VOLU, _______,
-    _______, _______, _______,                            KC_MPLY,                              MO(2), _______, KC_MRWD, KC_VOLD, KC_MFFD
-  ),
-  [2] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    L_T_BR,  L_PSD,   L_BRI,   L_PSI,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    L_T_PTD, L_PTP,   L_BRD,   L_PTN,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, L_T_MD,  L_T_ONF, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-  ),
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  static uint32_t key_timer;
-
-  rgb_matrix_record_key_press(record);
-
-  switch (keycode) {
-    case L_BRI:
-      if (record->event.pressed) {
-        if (LED_GCR_STEP > LED_GCR_MAX - gcr_desired) gcr_desired = LED_GCR_MAX;
-        else gcr_desired += LED_GCR_STEP;
-        if (led_animation_breathing) gcr_breathe = gcr_desired;
-      }
-      return false;
-    case L_BRD:
-      if (record->event.pressed) {
-        if (LED_GCR_STEP > gcr_desired) gcr_desired = 0;
-        else gcr_desired -= LED_GCR_STEP;
-        if (led_animation_breathing) gcr_breathe = gcr_desired;
-      }
-      return false;
-    case L_PTN:
-      if (record->event.pressed) {
-        if (led_animation_id == led_setups_count - 1) led_animation_id = 0;
-        else led_animation_id++;
-      }
-      return false;
-    case L_PTP:
-      if (record->event.pressed) {
-        if (led_animation_id == 0) led_animation_id = led_setups_count - 1;
-        else led_animation_id--;
-      }
-      return false;
-    case L_PSI:
-      if (record->event.pressed) {
-        led_animation_speed += ANIMATION_SPEED_STEP;
-      }
-      return false;
-    case L_PSD:
-      if (record->event.pressed) {
-        led_animation_speed -= ANIMATION_SPEED_STEP;
-        if (led_animation_speed < 0) led_animation_speed = 0;
-      }
-      return false;
-    case L_T_MD:
-      if (record->event.pressed) {
-        led_lighting_mode++;
-        if (led_lighting_mode > LED_MODE_MAX_INDEX) led_lighting_mode = LED_MODE_NORMAL;
-      }
-      return false;
-    case L_T_ONF:
-      if (record->event.pressed) {
-        led_enabled = !led_enabled;
-        I2C3733_Control_Set(led_enabled);
-      }
-      return false;
-    case L_ON:
-      if (record->event.pressed) {
-        led_enabled = 1;
-        I2C3733_Control_Set(led_enabled);
-      }
-      return false;
-    case L_OFF:
-      if (record->event.pressed) {
-        led_enabled = 0;
-        I2C3733_Control_Set(led_enabled);
-      }
-      return false;
-    case L_T_BR:
-      if (record->event.pressed) {
-        led_animation_breathing = !led_animation_breathing;
-        if (led_animation_breathing) {
-          gcr_breathe = gcr_desired;
-          led_animation_breathe_cur = BREATHE_MIN_STEP;
-          breathe_dir = 1;
-        }
-      }
-      return false;
-    case L_T_PTD:
-      if (record->event.pressed) {
-        led_animation_direction = !led_animation_direction;
-      }
-      return false;
-    case U_T_AUTO:
-      if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-        TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-      }
-      return false;
-    case U_T_AGCR:
-      if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-        TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-      }
-      return false;
-    case DBG_TOG:
-      if (record->event.pressed) {
-        TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-      }
-      return false;
-    case DBG_MTRX:
-      if (record->event.pressed) {
-        TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-      }
-      return false;
-    case DBG_KBD:
-      if (record->event.pressed) {
-        TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-      }
-      return false;
-    case DBG_MOU:
-      if (record->event.pressed) {
-        TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-      }
-      return false;
-    case MD_BOOT:
-      if (record->event.pressed) {
-        key_timer = timer_read32();
-      } else {
-        if (timer_elapsed32(key_timer) >= 500) {
-          reset_keyboard();
-        }
-      }
-      return false;
-    default:
-      return true; //Process all other keycodes normally
-  }
-}
diff --git a/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.c b/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.c
deleted file mode 100644
index 9ea8fbede49..00000000000
--- a/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.c
+++ /dev/null
@@ -1,193 +0,0 @@
-#include "quantum.h"
-#include "md_rgb_matrix.h"
-
-extern issi3733_led_t *led_cur;
-extern uint8_t led_per_run;
-extern issi3733_led_t *lede;
-extern issi3733_led_t led_map[];
-
-static uint16_t last_boost_update;
-static uint8_t led_boosts[ISSI3733_LED_COUNT];
-static uint8_t led_boost_index;
-static uint8_t led_cur_index;
-
-#define LED_BOOST_REFRESH_INTERVAL_IN_MS 40
-#define LED_BOOST_DECAY 0.7
-#define LED_BOOST_PROPAGATE 0.5
-#define LED_BOOST_PEAK 100
-
-#define MIN_RGB 0x050008
-#define MIN_R (MIN_RGB >> 16 & 0xff)
-#define MIN_G (MIN_RGB >> 8 & 0xff)
-#define MIN_B (MIN_RGB & 0xff)
-
-#define MAX_RGB 0xc26eff
-#define MAX_R (MAX_RGB >> 16 & 0xff)
-#define MAX_G (MAX_RGB >> 8 & 0xff)
-#define MAX_B (MAX_RGB & 0xff)
-
-#define UNDERGLOW_RGB 0x4f002e
-#define UNDERGLOW_R (UNDERGLOW_RGB >> 16 & 0xff)
-#define UNDERGLOW_G (UNDERGLOW_RGB >> 8 & 0xff)
-#define UNDERGLOW_B (UNDERGLOW_RGB & 0xff)
-
-#define UNDERGLOW_SCAN_CODE 255
-
-#define max(a, b) (((a) > (b)) ? (a) : (b))
-
-#define __ -1
-static const uint8_t KEY_TO_LED_MAP[MATRIX_ROWS][MATRIX_COLS] = {
-  { 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},
-  {58, 59, 60, __, __, __, 61, __, __, __, 62, 63, 64, 65, 66},
-};
-
-#define KEY_LED_COUNT 67
-#define KP(c, r) { .col = c, .row = r } // shorthand for keypos_t
-static const keypos_t LED_TO_KEY_MAP[KEY_LED_COUNT] = {
-  KP(0, 0), KP(1, 0), KP(2, 0), KP(3, 0), KP(4, 0), KP(5, 0), KP(6, 0), KP(7, 0), KP(8, 0), KP(9, 0), KP(10, 0), KP(11, 0), KP(12, 0), KP(13, 0), KP(14, 0),
-  KP(0, 1), KP(1, 1), KP(2, 1), KP(3, 1), KP(4, 1), KP(5, 1), KP(6, 1), KP(7, 1), KP(8, 1), KP(9, 1), KP(10, 1), KP(11, 1), KP(12, 1), KP(13, 1), KP(14, 1),
-  KP(0, 2), KP(1, 2), KP(2, 2), KP(3, 2), KP(4, 2), KP(5, 2), KP(6, 2), KP(7, 2), KP(8, 2), KP(9, 2), KP(10, 2), KP(11, 2),            KP(13, 2), KP(14, 2),
-  KP(0, 3),           KP(2, 3), KP(3, 3), KP(4, 3), KP(5, 3), KP(6, 3), KP(7, 3), KP(8, 3), KP(9, 3), KP(10, 3), KP(11, 3), KP(12, 3), KP(13, 3), KP(14, 3),
-  KP(0, 4), KP(1, 4), KP(2, 4),                               KP(6, 4),                               KP(10, 4), KP(11, 4), KP(12, 4), KP(13, 4), KP(14, 4),
-};
-
-
-static void update_led_boosts(void);
-static void update_led_cur_rgb_values(void);
-static void set_nearest_led_to_max(uint8_t col, uint8_t row);
-static uint8_t calculate_new_color_component_value(uint8_t max, uint8_t min);
-static void calculate_new_led_boosts(uint8_t new_led_boosts[]);
-static uint8_t calculate_new_led_boost_at(int index);
-static uint8_t get_propagated_boost_from_neighbors(int led_position);
-static uint8_t get_led_boost_at_keypos(uint8_t row, uint8_t col);
-static void set_new_led_boosts(uint8_t* new_led_boosts);
-static uint8_t map_key_position_to_led_index(uint8_t col, uint8_t row);
-
-
-void rgb_matrix_init_user(void) {
-  for (int i = 0; i < ISSI3733_LED_COUNT; i++) {
-    led_boosts[i] = 0;
-  }
-  last_boost_update = timer_read();
-  led_boost_index = 0;
-  led_cur_index = 0;
-}
-
-void md_rgb_matrix_run(void) {
-  uint8_t led_this_run = 0;
-
-  if (led_cur == 0) { //Denotes start of new processing cycle in the case of chunked processing
-    led_cur = led_map;
-    led_cur_index = 0;
-  }
-  update_led_boosts();
-
-  while (led_cur < lede && led_this_run < led_per_run) {
-    update_led_cur_rgb_values();
-
-    led_cur++;
-    led_cur_index++;
-    led_this_run++;
-  }
-}
-
-void rgb_matrix_record_key_press(keyrecord_t *record) {
-  if (record->event.pressed) {
-    keypos_t key = record->event.key;
-    set_nearest_led_to_max(key.col, key.row);
-  }
-}
-
-
-static void update_led_boosts(void) {
-  if (timer_elapsed(last_boost_update) > LED_BOOST_REFRESH_INTERVAL_IN_MS) {
-    last_boost_update = timer_read();
-
-    uint8_t new_led_boosts[ISSI3733_LED_COUNT];
-    calculate_new_led_boosts(new_led_boosts);
-    set_new_led_boosts(new_led_boosts);
-  }
-}
-
-static void update_led_cur_rgb_values(void) {
-  if (led_cur->scan == UNDERGLOW_SCAN_CODE) {
-    *led_cur->rgb.r = UNDERGLOW_R;
-    *led_cur->rgb.g = UNDERGLOW_G;
-    *led_cur->rgb.b = UNDERGLOW_B;
-  } else {
-    *led_cur->rgb.r = calculate_new_color_component_value(MAX_R, MIN_R);
-    *led_cur->rgb.g = calculate_new_color_component_value(MAX_G, MIN_G);
-    *led_cur->rgb.b = calculate_new_color_component_value(MAX_B, MIN_B);
-  }
-}
-
-static void set_nearest_led_to_max(uint8_t col, uint8_t row) {
-  uint8_t led_index = map_key_position_to_led_index(col, row);
-  if (led_index >= 0 && led_index < ISSI3733_LED_COUNT) {
-    led_boosts[led_index] = LED_BOOST_PEAK;
-  }
-}
-
-static uint8_t calculate_new_color_component_value(uint8_t max, uint8_t min) {
-  uint8_t current_boost = led_boosts[led_cur_index];
-  return (float)(max - min) * current_boost / LED_BOOST_PEAK + min;
-}
-
-static void calculate_new_led_boosts(uint8_t new_led_boosts[]) {
-  for (int i = 0; i < ISSI3733_LED_COUNT; i++) {
-    new_led_boosts[i] = calculate_new_led_boost_at(i);
-  }
-}
-
-static uint8_t calculate_new_led_boost_at(int index) {
-  uint8_t decayed_boost = led_boosts[index] * LED_BOOST_DECAY;
-  uint8_t propagated_boost = get_propagated_boost_from_neighbors(index);
-  uint8_t new_boost = (propagated_boost > decayed_boost) ? propagated_boost : decayed_boost;
-  if (new_boost > LED_BOOST_PEAK) {
-    new_boost = LED_BOOST_PEAK;
-  }
-  return new_boost;
-}
-
-static uint8_t get_propagated_boost_from_neighbors(int led_position) {
-  if (led_position < 0 || led_position >= KEY_LED_COUNT) {
-    return 0;
-  }
-  keypos_t led_keypos = LED_TO_KEY_MAP[led_position];
-  uint8_t top_boost    = get_led_boost_at_keypos(led_keypos.row - 1, led_keypos.col);
-  uint8_t bottom_boost = get_led_boost_at_keypos(led_keypos.row + 1, led_keypos.col);
-  uint8_t left_boost   = get_led_boost_at_keypos(led_keypos.row, led_keypos.col - 1);
-  uint8_t right_boost  = get_led_boost_at_keypos(led_keypos.row, led_keypos.col + 1);
-  uint8_t max_boost = max(max(top_boost, bottom_boost), max(left_boost, right_boost));
-  if (max_boost > LED_BOOST_PEAK) {
-    max_boost = LED_BOOST_PEAK;
-  }
-  return max_boost * LED_BOOST_PROPAGATE;
-}
-
-static uint8_t get_led_boost_at_keypos(uint8_t row, uint8_t col) {
-  if (row < 0 || row >= MATRIX_ROWS || col < 0 || col >= MATRIX_COLS) {
-    return 0;
-  }
-  uint8_t led_index = KEY_TO_LED_MAP[row][col];
-  if (led_index < 0) {
-    return 0;
-  }
-  return led_boosts[led_index];
-}
-
-static void set_new_led_boosts(uint8_t* new_led_boosts) {
-  for (int i = 0; i < ISSI3733_LED_COUNT; i++) {
-    led_boosts[i] = new_led_boosts[i];
-  }
-}
-
-static uint8_t map_key_position_to_led_index(uint8_t col, uint8_t row) {
-  if (row >= 0 && row < MATRIX_ROWS && col >= 0 && col < MATRIX_COLS) {
-    return KEY_TO_LED_MAP[row][col];
-  }
-  return -1;
-}
diff --git a/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.h b/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.h
deleted file mode 100644
index 4ffd202e9b8..00000000000
--- a/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-void rgb_matrix_record_key_press(keyrecord_t *record);
diff --git a/keyboards/massdrop/alt/keymaps/reywood/rules.mk b/keyboards/massdrop/alt/keymaps/reywood/rules.mk
deleted file mode 100644
index 57a697a7e72..00000000000
--- a/keyboards/massdrop/alt/keymaps/reywood/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# project specific files
-SRC += rgb_matrix_user.c
-
-# This keymap requires Massdrop Configurator support
-OPT_DEFS += -DUSE_MASSDROP_CONFIGURATOR
diff --git a/keyboards/massdrop/alt/keymaps/urbanvanilla/config.h b/keyboards/massdrop/alt/keymaps/urbanvanilla/config.h
deleted file mode 100644
index f2a7e50386d..00000000000
--- a/keyboards/massdrop/alt/keymaps/urbanvanilla/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MATRIX_IO_DELAY 40
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_LED_PROCESS_LIMIT 15
-#define RGB_MATRIX_LED_FLUSH_LIMIT 10
-
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c b/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
deleted file mode 100644
index c5905d502fb..00000000000
--- a/keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum alt_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
-    DBG_TOG,               //DEBUG Toggle On / Off
-    DBG_MTRX,              //DEBUG Toggle Matrix Prints
-    DBG_KBD,               //DEBUG Toggle Keyboard Prints
-    DBG_MOU,               //DEBUG Toggle Mouse Prints
-    MD_BOOT,               //Restart into bootloader after hold timeout
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi_blocker(
-        QK_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_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_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_65_ansi_blocker(
-        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,  VK_TOGG, KC_MUTE,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
-        _______, _______, RGB_TOG, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
-        _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
-    ),
-    */
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-#define IDLE_TIMER_DURATION 20000 //how many milliseconds before RGB turns off
-
-static uint32_t idle_timer; //custom timer to check if keyboard is idled.
-bool rgbkeyIdle = false; //flag for keyboard idling, nil keys for set
-bool Jelocikey_toggle = false;
-uint8_t currentWPM;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-static uint32_t key_timer;
-idle_timer = timer_read32();
-
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_UNDERGLOW: {
-                    rgb_matrix_set_flags(LED_FLAG_NONE);
-                    rgb_matrix_disable_noeeprom();
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_enable_noeeprom();
-                  }
-                  break;
-              }
-            }
-            return false;
-/*         case QK_VELOCIKEY_TOGGLE:
-            if (record->event.pressed) {
-                Jelocikey_toggle =! Jelocikey_toggle;
-            }
-            else {
-                rgb_matrix_set_speed_noeeprom(127);
-            }
-            return false; */
-        default:
-
-            if (rgbkeyIdle) {       //check if the keyboards already idle and if it is, turn it back on as key is pressed.
-                rgbkeyIdle = false;
-                rgb_matrix_set_suspend_state(false);
-                rgb_matrix_enable_noeeprom();
-            }
-
-            if (Jelocikey_toggle) {
-                rgb_matrix_set_speed_noeeprom(3);
-                currentWPM = get_current_wpm();
-                rgb_matrix_set_speed_noeeprom(currentWPM);
-                rgb_matrix_set_color(13, 100, 255, 255);
-            }
-            return true; //Process all other keycodes normally
-    }
-}
-
-void matrix_scan_user(void) {
-//custom idle rbg switch off function
-    if (timer_elapsed32(idle_timer) > IDLE_TIMER_DURATION) {
-        idle_timer = 0;
-        timer_clear();
-        rgbkeyIdle = true;
-        rgb_matrix_set_suspend_state(true);
-        rgb_matrix_disable_noeeprom();
-    }
-}
-
-void suspend_power_down_user(void) {
-    rgb_matrix_set_suspend_state(true);
-}
-
-void suspend_wakeup_init_user(void) {
-    rgb_matrix_set_suspend_state(false);
-}
diff --git a/keyboards/massdrop/alt/keymaps/urbanvanilla/readme.md b/keyboards/massdrop/alt/keymaps/urbanvanilla/readme.md
deleted file mode 100644
index 116ccc4efff..00000000000
--- a/keyboards/massdrop/alt/keymaps/urbanvanilla/readme.md
+++ /dev/null
@@ -1,48 +0,0 @@
-
-# Custom mapping for the Drop Alt Keyboard.
-
-A really simple set of changes/fixes
-
-# Features and changes:
-
-## *ESC is now Grave Escape.*
-Changes KC_ESC for grave escape - Escape key is also `/~ when used with the modifier key.
-
-## *RGB timer switch off*
-
-There is a timer that turns off RGB lighting after a set time. This is defined by 
-
-    #define  IDLE_TIMER_DURATION  20000  //how many milliseconds before RGB turns off
-
-## *Keyboard chatter fix*
-
-I have left the debounce settings and instead changed
-
-    wait_us(1); //Delay for output
-to 40 instead of 1 which works for other keyboards as I was getting lots of keyboard chatter on all keys previously. 20 seemed to still let key chatter go through. Seems to be working well since.
-
-
-
-
-
-
-# ALT
-
-![ALT](https://massdrop-s3.imgix.net/product-images/alt-keyboard/FP/WNxwR19gTua3nxiiQWP3_AI7B3311%20copy%20page.jpg?auto=format&fm=jpg&fit=max&w=700&h=467&dpr=1&q=80)
-
-The Massdrop ALT is a 65% mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting and underlighting.
-
-Keyboard Maintainer: [Massdrop](https://github.com/massdrop)  
-Hardware Supported: Massdrop, Inc. ALT PCBs utilizing Microchip's ATSAMD51J18A MCU and USB2422 2-Port USB 2.0 Hi-Speed Hub Controller, and ISSI's IS31FL3733 LED Drivers.  
-Hardware Availability: [Massdrop ALT Mechanical Keyboard](https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make massdrop/alt:default
-
-For information on flashing this keyboard, visit the following links:
-
-[Massdrop Loader Releases](https://github.com/Massdrop/mdloader/releases)  
-[Massdrop Loader Repository and Instructions](https://github.com/Massdrop/mdloader)
-
-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/massdrop/alt/keymaps/urbanvanilla/rules.mk b/keyboards/massdrop/alt/keymaps/urbanvanilla/rules.mk
deleted file mode 100644
index a51c4a4ff0c..00000000000
--- a/keyboards/massdrop/alt/keymaps/urbanvanilla/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-WPM_ENABLE = yes
-VELOCIKEY_ENABLE = yes # doesn't work with RGB MATRIX only RGB LIGHT :(
diff --git a/keyboards/massdrop/ctrl/keymaps/R167/keymap.c b/keyboards/massdrop/ctrl/keymaps/R167/keymap.c
deleted file mode 100644
index e9379edde12..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/R167/keymap.c
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2021 Winston Durand (@R167)
-// SPDX-License-Identifier: MIT
-
-#include QMK_KEYBOARD_H
-
-enum ctrl_keycodes {
-    U_T_AUTO = SAFE_RANGE,  // USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,               // USB Toggle Automatic GCR control
-    DBG_TOG,                // DEBUG Toggle On / Off
-    DBG_MTRX,               // DEBUG Toggle Matrix Prints
-    DBG_KBD,                // DEBUG Toggle Keyboard Prints
-    DBG_MOU,                // DEBUG Toggle Mouse Prints
-    MD_BOOT,                // Restart into bootloader after hold timeout
-    SLEEP,                  // Macro to send CMD+ALT+Ejct & turn off lights
-};
-
-enum r167_layers {
-    _QWERTY = 0,    // Standard querty layout
-    _FN,            // Simple function keys
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_EJCT, KC_HOME, KC_VOLU,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_VOLD,
-        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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, MO(_FN), KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FN] = LAYOUT(
-        SLEEP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, KC_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, SLEEP,     KC_MPLY, _______, _______,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, _______,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    */
-};
-// clang-format on
-
-#define MODS_SHIFT (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL (get_mods() & MOD_MASK_CTRL)
-#define MODS_ALT (get_mods() & MOD_MASK_ALT)
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-    static bool     asleep = false;
-    if (asleep && record->event.pressed) {
-        asleep = false;
-        rgb_matrix_set_flags(LED_FLAG_ALL);
-        rgb_matrix_enable_noeeprom();
-    }
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    } break;
-                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    } break;
-                    case LED_FLAG_UNDERGLOW: {
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_disable_noeeprom();
-                    } break;
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();
-                    } break;
-                }
-            }
-            return false;
-        case SLEEP:
-            if (record->event.pressed) {
-                // CMD+ALT+EJECT doesn't always reliably trigger. fall back mode
-                // tap_code16(G(A(KC_EJCT)));
-                tap_code16(LCTL(LGUI(KC_Q)));
-                asleep = true;
-                rgb_matrix_set_flags(LED_FLAG_NONE);
-                rgb_matrix_disable_noeeprom();
-            } else if (IS_RELEASED(record->event)) {
-                tap_code(KC_ESCAPE);
-            }
-            return false;
-        default:
-            return true;  // Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/ctrl/keymaps/R167/readme.md b/keyboards/massdrop/ctrl/keymaps/R167/readme.md
deleted file mode 100644
index 1b805ea6a94..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/R167/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-![Layer 0](https://i.imgur.com/iRwr7si.png)
-
-![Layer 1](https://i.imgur.com/b2qwYdR.png)
-
-# R167 massdrop ctrl
-
-The main layer is a ~standard QWERTY layout with the ALT/GUI swap for macOS
-in addition to shifting the `Fn` key one to the right so cmd/alt line up nicely.
-Addionally, I rarely use PgUp/Dn, so I've remapped those to volume control.
-
-The most interesting bit is the shortcut `Fn + Esc` which triggers the macOS sleep
-shortcut (`CMD + ALT + Eject`) and then disables LEDs since the computer will wake up
-peripherals even while the display is asleep. Keyboard is returned to all LEDs on after
-pressing any key.
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/README.md b/keyboards/massdrop/ctrl/keymaps/endgame/README.md
deleted file mode 100644
index f65b70475f5..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/endgame/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Massdrop Ctrl Endgame
-
-This keymap is here to show some love to the MD Ctrl.
-
-## Layers
-
-### Typing Layer
-
-![Typing Layer](https://imgur.com/QUIU2SL.png)
-
-### Function Layer
-
-![Function Layer](https://imgur.com/4q4ld4X.png)
-
-### Mouse Layer
-
-![Mouse Layer](https://imgur.com/xXVFyEE.png)
-
-### Git Layer
-
-![Git Layer](https://imgur.com/WMMM0zz.png)
-
-## Features
-
-These are the features currently supported by this keymap:
-
-### RGB Time Out
-
-This allows setting a dynamic timeout for RGB to turn off. The following is supported:
-
-1. Restores on the first click of any key.
-2. Restores to its previous state before timeout. i.e. if it was edge only before timeout it will restore to edge only, same for all modes.
-3. Doesn't interfere with RGB modes. You can set keyboard to All, Edge Only or Off and timeout will not interfere with these modes.
-4. The time before RGB is turned off is dynamically adjustable using keycodes ROUT_VI to increase, ROUT_VD to decrease. They have a 10 second steps by default. Minimum value 10 seconds by default and maximum is 10 minutes.
-5. Can be toggled on or off dyncamically with the ROUT_TG keycode.
-6. Can be put in fast mode using ROUT_FM, for movie watching purposes. Default value is 3 seconds. Note that fast mode disabled ROUT_VD and ROUT_VI so to use them again you have to toggle fast mode off with ROUT_FM. It doesn't impact ROUT_TG and ROUT_TG will remember if fast mode was enabled when toggled back on, so it doesn't disable fast mode on its own, only ROUT_FM can disable or enable fast mode.
-
-### Tapdance Keys
-
-Not really a feature. I just want to document what tapdance keys this keymap has because there will be many of them.
-
-1. LGUI is used for both LGUI and toggle mouse layer for double tap.
-2. LCTRL sends LCTRL for single tap and LCTRL+LALT+T for double tap, which opens terminal in most environments.
-
-## Future Work
-
-By the time this is project has accomplished its original primary objectives, the following features will be available for the ctrl:
-
-1. Automatic RGB timeout with all the options you would need. **DONE**
-2. Macro and Shortcut layers for at least the following: Git **DONE**, IntelliJ, VIM **WIP**, Yakuake, KDE, Firefox, Slack, Discord. All using default program configuration. [This list may and probably will get longer]
-3. Custom LED configs that offer all the RGB layouts I deem useful or having a unique feature, look or feel. **DONE**
-4. Increased Dynamic Macro slots, because two simply isn't enough. This particular one falls outside Ctrl config and into QMK core modification. However, it is on the list of features I would like this keyboard to have and is a **TOP PRIORITY** for me. It won't be easy, but I will figure it out.
-5. Porting from the Drop, Inc. way of doing things to the QMK way of doing things, wherever possible. Full QMK support of this keyboard is the goal, not that it's possible, but I'd like to get as close as it gets. **WIP**
-6. An easier way to configure LED than both the QMK way and the Drop way. I'm thinking of a graphical LED config like Drop configurator that offers the advanced LED config features QMK offers. This may or may not get done depending on whether or not I get sick of QMK LED config at any point. If it does get done, it may or may not be added to QMK Configurator.
-7. Better documentation of the MD Ctrl specifications, features, etc. This will be included here in the form of C and doxygen comments. The bigger portion will be included in QMK docs if and where possible. **WIP**
-
-Additions:
-
-8. Implement Raw HID. **WIP**
-
-This list will most probably either expand or have some items removed if they're deemed not worthy, probably both. Nothing will be removed because it can't be done though, I am a firm believer in You Can Do It. Anything modified in this list will be clearly marked, for posterity.
-
-## Motivation
-
-I bought this keyboard because I believed and still believe that it offers the greatest possible value for money for any TKL fan. It was very disappointing to me after receiving it to see that this keyboard didn't get the love it should have in QMK, from either Drop, Inc. or users.
-Granted, this is a TKL RGB board which means it is hated by every single enthusiast in the community. That doesn't mean it shouldn't be getting love form its users, or most importantly its maker.
-
-Drop, Inc. have for some reason decided that they want to work on their own QMK stack. A stupid decision to say the least. Although having made this decision, they did very little actual work on this keyboard and have offered very little support and almost no time working on the firmware. To my knowledge, no one is currently working on it in a truly active fashion. A small handful of people work on the software and even then, they seem to think that their own way of doing things is better than the way chosen by the thousands in the community who have worked on QMK. Their QMK fork for the keyboard is abandoned for months. Updates are few and far between and it seems this keyboard has been forgotten in the annals of 2018 by both its maker and its users.
-
-To their credit, at least they decided to abandon their idiotic RGB setup and have opted after taking their sweet time to use QMK RGB and they did make some much needed changes to mdloader. That being said, Drop, Inc. still don't show love to this keyboard and whether or not they are actually able is questionable.
-
-So the aim of this work, starting with this Keymap, is to make the Massdrop Ctrl a true QMK keyboard instead of the marketing spiel "QMK Supported". As much as it can be made so of course within the bounds of what can be done with information openly available about the keyboard.
-
-I am not of the opinion that a mechanical keyboard is inherently superior. I am of the opinion that a mechanical keyboard is a tool that boosts productivity, enjoyment and efficiency, if it fails at that then it is no longer superior. Programmability is a huge part of that and I can no longer use any keyboard that doesn't have a level of programmability less than  QMK offers.
-
-I will personally do my best for this keyboard for no reason other than it will likely be my main keyboard for years to come.
-
-## Credits
-
-RGB timeout functionality was originally inspired by the code in this [gist](https://gist.github.com/algernon/9182469e21894192017f2bb5d478c7df).
-LED config code was mostly transferred from [matthewrobo keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/ctrl/keymaps/matthewrobo).
-
-Rest of the information about RGB matrix, scan matrix, and whatever information I have used was made publicly available by many other awesome members of the community.
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
deleted file mode 100644
index 34aa3cd666f..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#pragma once
-
-
-#define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
-#define MODS_ALT    (get_mods() & MOD_MASK_ALT)
-
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
-
-// #define NO_DEBUG                    // Disable debugging
-// #define NO_PRINT                    // Disable printing/debugging using hid_listen
-// #define NO_ACTION_LAYER             // Disable layers
-// #define NO_ACTION_TAPPING           // Disable tap dance and other tapping features
-// #define NO_ACTION_ONESHOT           // Disable one-shot modifiers
-// #define NO_ACTION_MACRO             // Disable old style macro handling: MACRO() & action_get_macro
-#define TERMINAL_HELP
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 10
-#define MOUSEKEY_WHEEL_DELAY 0
-#define FORCE_NKRO                  // NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-// #define STRICT_LAYER_RELEASE        // Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
-// #define LOCKING_SUPPORT_ENABLE      // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-// #define LOCKING_RESYNC_ENABLE       // Tries to keep switch state consistent with keyboard LED state
-#define TAPPING_TERM 200            // How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-// #define TAPPING_TERM_PER_KEY        // Enables handling for per key TAPPING_TERM settings
-// #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-#define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
-// #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-// #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-// #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
-// #define LEADER_KEY_STRICT_KEY_PROCESSING    // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-// #define ONESHOT_TIMEOUT 300         // How long before oneshot times out
-// #define ONESHOT_TAP_TOGGLE 2        // How many taps before oneshot toggle is triggered
-// #define COMBO_TERM 200              // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-// #define TAP_CODE_DELAY 100          // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES         // reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
-// #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
-// #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
-// #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
-// #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
-// #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 1000     // How long to wait between light changes for the "Christmas" animation, in milliseconds
-// #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 2            // The number of LEDs to group the red/green colors by for the "Christmas" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM RGBLED_NUM   // The number of LEDs to have the "Knight" animation travel
-// #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3             // The number of LEDs to light up for the "Knight" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 0             // The number of LEDs to start the "Knight" animation from the start of the strip by
-// #define RGBLIGHT_RAINBOW_SWIRL_RANGE 255            // Range adjustment for the rainbow swirl effect to get different swirls
-// #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4              // The number of LEDs to light up for the "Snake" animation
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
-// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN              // Static gradient top to bottom, speed controls how much gradient changes
-#undef ENABLE_RGB_MATRIX_BREATHING               // Single hue brightness cycling animation
-#undef ENABLE_RGB_MATRIX_BAND_SAT                // Single hue band fading saturation scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_VAL                // Single hue band fading brightness scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT       // Single hue 3 blade spinning pinwheel fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL       // Single hue 3 blade spinning pinwheel fades brightness
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT         // Single hue spinning spiral fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL         // Single hue spinning spiral fades brightness
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL               // Full keyboard solid hue cycling through full gradient
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT        // Full gradient scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN           // Full gradient scrolling top to bottom
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN            // Full gradient scrolling out to in
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL       // Full dual gradients scrolling out to in
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradent Chevron shapped scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL          // Full gradient spinning pinwheel around center of keyboard
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL            // Full gradient spinning spiral around center of keyboard
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON             // Full gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON          // Full tighter gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS       // Full dual gradients spinning two halfs of keyboard
-// #undef ENABLE_RGB_MATRIX_RAINDROPS                     // Randomly changes a single key's hue
-// #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS           // Randomly changes a single key's hue and saturation
-// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN  // That famous computer simulation
-// =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE                // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE      // Pulses keys hit to hue & value then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE        // Hue & value pulse near a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE   // Hue & value pulse near multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS       // Hue & value pulse the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS  // Hue & value pulse the same column and row of multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS       // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS  // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SPLASH                     // Full gradient & value pulse away from a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_MULTISPLASH                // Full gradient & value pulse away from multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH               // Hue & value pulse away from a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH          // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c b/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
deleted file mode 100644
index b58227a1fdd..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifdef RGB_MATRIX_ENABLE
-#include "ctrl.h"
-
-#include "md_rgb_matrix.h"
-#include "rgb_matrix.h"
-#include "config_led.h"
-
-led_config_t g_led_config = { {
-    {   0,   1,   2,   3,   4,   5,   6,   7 },
-    {  16,  17,  18,  19,  20,  21,  22,  23 },
-    {  33,  34,  35,  36,  37,  38,  39,  40 },
-    {  50,  51,  52,  53,  54,  55,  56,  57 },
-    {  63,  64,  65,  66,  67,  68,  69,  70 },
-    {  76,  77,  78,  79,  80,  81,  82,  83 },
-    {   8,   9,  10,  11,  12,  13,  14,  15 },
-    {  24,  25,  26,  27,  28,  29,  30,  31 },
-    {  41,  42,  43,  44,  45,  46,  47,  48 },
-    {  58,  59,  60,  61,  62,  75,  49,  32 },
-    {  71,  72,  73,  74,  84,  85,  86, NO_LED }
-}, {
-  // 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_SCRL, KC_PAUS
-    {   7,   5 }, {  31,   5 }, {  43,   5 }, {  55,   5 }, {  67,   5 }, {  85,   5 }, {  97,   5 }, { 109,   5 },
-    { 121,   5 }, { 139,   5 }, { 151,   5 }, { 163,   5 }, { 175,   5 }, { 193,   5 }, { 205,   5 }, { 217,   5 },
-  // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
-    {   7,  20 }, {  19,  20 }, {  31,  20 }, {  43,  20 }, {  55,  20 }, {  67,  20 }, {  79,  20 }, {  91,  20 },
-    { 103,  20 }, { 115,  20 }, { 127,  20 }, { 139,  20 }, { 151,  20 }, { 169,  20 }, { 193,  20 }, { 205,  20 },
-    { 217,  20 },
-  // KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN
-    {  10,  30 }, {  25,  30 }, {  37,  30 }, {  49,  30 }, {  61,  30 }, {  73,  30 }, {  85,  30 }, {  97,  30 },
-    { 109,  30 }, { 121,  30 }, { 133,  30 }, { 145,  30 }, { 157,  30 }, { 172,  30 }, { 193,  30 }, { 205,  30 },
-    { 217,  30 },
-  // 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
-    {  11,  39 }, {  28,  39 }, {  40,  39 }, {  52,  39 }, {  64,  39 }, {  76,  39 }, {  88,  39 }, { 100,  39 },
-    { 112,  39 }, { 124,  39 }, { 136,  39 }, { 148,  39 }, { 168,  39 },
-  // 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
-    {  14,  49 }, {  34,  49 }, {  46,  49 }, {  58,  49 }, {  70,  49 }, {  82,  49 }, {  94,  49 }, { 106,  49 },
-    { 118,  49 }, { 130,  49 }, { 142,  49 }, { 165,  49 }, { 205,  49 },
-  // KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    {   8,  59 }, {  23,  59 }, {  38,  59 }, {  83,  59 }, { 129,  59 }, { 144,  59 }, { 159,  59 }, { 174,  59 },
-    { 193,  59 }, { 205,  59 }, { 217,  59 },
-  // Underglow / Border
-    { 224,  64 }, { 204,  64 }, { 186,  64 }, { 167,  64 }, { 149,  64 }, { 130,  64 }, { 112,  64 }, {  94,  64 },
-    {  75,  64 }, {  57,  64 }, {  38,  64 }, {  20,  64 }, {   0,  64 }, {   0,  47 }, {   0,  32 }, {   0,  17 },
-    {   0,   0 }, {  20,   0 }, {  38,   0 }, {  57,   0 }, {  75,   0 }, {  94,   0 }, { 112,   0 }, { 130,   0 },
-    { 149,   0 }, { 167,   0 }, { 186,   0 }, { 204,   0 }, { 224,   0 }, { 224,  17 }, { 224,  32 }, { 224,  47 }
-}, {
-  // 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_SCRL, KC_PAUS
-    1, 4, 4, 4, 4, 1, 1, 1,
-    1, 4, 4, 4, 4, 1, 1, 1,
-  // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
-    4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 1, 1, 1,
-    1,
-  // KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN
-    1, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 1, 1,
-    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
-    1, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 1,
-  // 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
-    1, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 1, 1,
-  // KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    1, 1, 1, 4, 1, 1, 1, 1,
-    1, 1, 1,
-  // Underglow / Border
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2
-} };
-
-
-#ifdef USB_LED_INDICATOR_ENABLE
-bool rgb_matrix_indicators_kb(void)
-{
-  md_rgb_matrix_indicators();
-    return rgb_matrix_indicators_user();
-}
-#endif // USB_LED_INDICATOR_ENABLE
-
-#endif
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
deleted file mode 100644
index 463ccb42ba0..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c
+++ /dev/null
@@ -1,489 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <string.h>
-
-#define MILLISECONDS_IN_SECOND 1000
-
-// These are just to make it neater to use builtin HSV values in the keymap
-#define RED {HSV_RED}
-#define CORAL {HSV_CORAL}
-#define ORANGE {HSV_ORANGE}
-#define GOLDEN {HSV_GOLDENROD}
-#define GOLD {HSV_GOLD}
-#define YELLOW {HSV_YELLOW}
-#define CHART {HSV_CHARTREUSE}
-#define GREEN {HSV_GREEN}
-#define SPRING {HSV_SPRINGGREEN}
-#define TURQ {HSV_TURQUOISE}
-#define TEAL {HSV_TEAL}
-#define CYAN {HSV_CYAN}
-#define AZURE {HSV_AZURE}
-#define BLUE {HSV_BLUE}
-#define PURPLE {HSV_PURPLE}
-#define MAGENT {HSV_MAGENTA}
-#define PINK {HSV_PINK}
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-#define RGB_DEFAULT_TIME_OUT 30
-#define RGB_FAST_MODE_TIME_OUT 3
-#define RGB_TIME_OUT_MAX 600
-#define RGB_TIME_OUT_MIN 10
-#define RGB_TIME_OUT_STEP 10
-
-extern rgb_config_t rgb_matrix_config;
-bool disable_layer_color;
-
-bool rgb_enabled_flag;                  // Current LED state flag. If false then LED is off.
-bool rgb_time_out_enable;               // Idle LED toggle enable. If false then LED will not turn off after idle timeout.
-bool rgb_time_out_fast_mode_enabled;    // Enable flag for RGB timeout fast mode
-bool rgb_time_out_user_value;           // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable.
-uint16_t rgb_time_out_seconds;          // Idle LED timeout value, in seconds not milliseconds
-uint16_t rgb_time_out_saved_seconds;    // The saved user config for RGB timeout period
-led_flags_t rgb_time_out_saved_flag;    // Store LED flag before timeout so it can be restored when LED is turned on again.
-
-enum layout_names {
-    _KL=0,       // Keys Layout: The main keyboard layout that has all the characters
-    _FL,         // Function Layout: The function key activated layout with default functions and some added ones
-    _ML,         // Mouse Layout: Mouse Keys and mouse movement
-    _GL,         // GIT Layout: GIT shortcuts and macros
-    _VL,         // VIM Layout: VIM shorcuts and macros
-    _YL,         // Yakuake Layout: Yakuake drop-down terminal shortcuts and macros
-    _EL,         // KDE Layout: Shortcuts for KDE desktop using default KDE shortcuts settings
-};
-
-enum tapdance_keycodes {
-    TD_LGUI_ML = 0,     // Tap dance key to switch to mouse layer _ML
-    TD_APP_YL,
-    TD_CTRL_TERM,       // Tap dance key to open terminal on LCTRL double press
-};
-
-enum ctrl_keycodes {
-    U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              // USB Toggle Automatic GCR control
-    DBG_TOG,               // DEBUG Toggle On / Off
-    DBG_MTRX,              // DEBUG Toggle Matrix Prints
-    DBG_KBD,               // DEBUG Toggle Keyboard Prints
-    DBG_MOU,               // DEBUG Toggle Mouse Prints
-    MD_BOOT,               // Restart into bootloader after hold timeout
-    SEL_CPY,               // Select Copy. Select the word cursor is pointed at and copy, using double mouse click and ctrl+c
-    ROUT_TG,               // Timeout Toggle. Toggle idle LED time out on or off
-    ROUT_VI,               // Timeout Value Increase. Increase idle time out before LED disabled
-    ROUT_VD,               // Timeout Value Decrease. Decrease idle time out before LED disabled
-    ROUT_FM,               // RGB timeout fast mode toggle
-    COPY_ALL,              // Copy all text using ctrl(a+c)
-    TERMINAL,              // CTRL+ALT+T
-};
-
-enum string_macro_keycodes {
-    // The start of this enum should always be equal to end of ctrl_keycodes + 1
-    G_INIT = TERMINAL + 1, // git init
-    G_CLONE,               // git clone
-    G_CONF,                // git config --global
-    G_ADD,                 // git add
-    G_DIFF,                // git diff
-    G_RESET,               // git reset
-    G_REBAS,               // git rebase
-    G_BRANH,               // git branch
-    G_CHECK,               // git checkout
-    G_MERGE,               // git merge
-    G_REMTE,               // git remote add
-    G_FETCH,               // git fetch
-    G_PULL,                // git pull
-    G_PUSH,                // git push
-    G_COMM,                // git commit
-    G_STAT,                // git status
-    G_LOG,                 // git log
-};
-
-static uint16_t idle_timer;             // Idle LED timeout timer
-static uint8_t idle_second_counter;     // Idle LED seconds counter, counts seconds not milliseconds
-static uint8_t key_event_counter;       // This counter is used to check if any keys are being held
-
-static const char * sendstring_commands[] = {
-    "git init ",
-    "git clone ",
-    "git config --global ",
-    "git add ",
-    "git diff ",
-    "git reset ",
-    "git rebase ",
-    "git branch -b \"",
-    "git checkout ",
-    "git merge ",
-    "git remote add ",
-    "git fetch ",
-    "git pull ",
-    "git push ",
-    "git commit ",
-    "git status ",
-    "git log ",
-};
-
-//Associate our tap dance key with its functionality
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_LGUI_ML] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_LGUI, _ML),
-    [TD_APP_YL] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_APP, _YL),
-    [TD_CTRL_TERM] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, LCA(KC_T)),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-    [DEFAULT] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    */
-    [_KL] = LAYOUT(
-        KC_ESC,            KC_F1,          KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,        KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,            KC_1,           KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,       KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,            KC_Q,           KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,       KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS,           KC_A,           KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,
-        KC_LSFT,           KC_Z,           KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,                                  KC_UP,
-        TD(TD_CTRL_TERM),  TD(TD_LGUI_ML), KC_LALT,                   KC_SPC,                             KC_RALT, TT(_FL), TD(TD_APP_YL), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FL] = LAYOUT(
-        _______, DM_PLY1, DM_PLY2, _______,  _______, DM_REC1, DM_REC2, _______,  _______,  DM_RSTP, _______, KC_WAKE, KC_SLEP,          KC_MUTE, _______, _______,
-        _______, _______, TG(_ML), TG(_GL),  TG(_VL), TG(_YL), _______, _______,  _______,  ROUT_FM, ROUT_TG, ROUT_VD, ROUT_VI, _______, KC_MSTP, KC_MPLY, KC_VOLU,
-        RGB_M_P, RGB_SPD, RGB_VAI, RGB_SPI,  RGB_HUI, RGB_SAI, _______, U_T_AUTO, U_T_AGCR, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD,  RGB_HUD, RGB_SAD, _______, _______,  _______,  _______, _______, _______, _______,
-        _______, RGB_TOG, _______, COPY_ALL, _______, MD_BOOT, NK_TOGG, _______,  _______,  _______, _______, _______,                            KC_BRIU,
-        _______, _______, _______,                    _______,                              _______, TG(_FL), _______, _______,          _______, KC_BRID, _______
-    ),
-    [_ML] = LAYOUT(
-        _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, KC_BTN4, KC_BTN3, KC_BTN5, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, SEL_CPY, _______, _______, _______, _______, _______, _______, _______, _______,                            KC_MS_U,
-        _______, TG(_ML), _______,                   _______,                            _______, TG(_ML), _______, _______,          KC_MS_L, KC_MS_D, KC_MS_R
-    ),
-    [_GL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, G_REMTE, G_RESET, G_REBAS, _______, G_INIT,  _______, G_PULL,  G_PUSH,  _______, _______, _______, _______, _______,
-        _______, G_ADD,   G_STAT,  G_DIFF,  G_FETCH, _______, _______, _______, _______, G_LOG,   _______, _______, _______,
-        _______, G_CONF,  G_CHECK, G_CLONE, G_COMM,  G_BRANH, _______, G_MERGE, _______, _______, _______, _______,                            _______,
-        _______, _______, _______,                   _______,                            _______, TG(_GL), _______, _______,          _______, _______, _______
-    ),
-    // This layout doesn't have custom keycodes for now, just custom LED config
-    [_VL] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,    KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,   KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,   KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,                              KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                            KC_RALT, TG(_VL), KC_APP,    KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    // Works with https://github.com/ash0x0/config/blob/master/yakuake.shortcuts
-    [_YL] = LAYOUT(
-        KC_ESC, 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_GRV, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,    KC_9,   KC_0,    KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_PGUP,
-        KC_NO,  KC_Q,  KC_NO, KC_E,  KC_NO, KC_T,  KC_NO, KC_NO, KC_I,    KC_NO,  KC_P,    KC_NO, KC_RBRC, KC_BSLS, KC_NO,   KC_END,  KC_PGDN,
-        KC_NO,  KC_A,  KC_NO, KC_D,  KC_NO, KC_G,  KC_NO, KC_J,  KC_K,    KC_L,   KC_SCLN, KC_NO, KC_NO,
-        KC_NO,  KC_Z,  KC_X,  KC_NO, KC_NO, KC_NO, KC_NO, KC_M,  KC_COMM, KC_DOT, KC_NO,   KC_NO,                            KC_UP,
-        KC_NO,  KC_NO, KC_NO,               KC_NO,                        KC_NO,  TG(_YL), KC_NO, KC_NO,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, TG_NKRO, _______, _______, _______, _______, _______,                            _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    [RGB] = LAYOUT(
-        ESC: 0,   F1: 1,    F2: 2,    F3: 3,    F4: 4,    F5: 5,    F6: 6,    F7: 7,    F8: 8,    F9: 9,    F10: 10,  F11: 11,  F12: 12,            PSCR: 13, SLCK: 14, PAUS: 15,
-        GRV: 16,  1: 17,    2: 18,    3: 19,    4: 20,    5: 21,    6: 22,    7: 23,    8: 24,    9: 25,    0: 26,    MINS: 27, EQL: 28,  BSPC: 29, INS: 30,  HOME: 31, PGUP: 32,
-        TAB: 33,  Q: 34,    W: 35,    E: 36,    R: 37,    T: 38,    Y: 39,    U: 40,    I: 41,    O: 42,    P: 43,    LBRC: 44, RBRC: 45, BSLS: 46, DEL: 47,  END: 48,  PGDN: 49,
-        CAPS: 50, A: 51,    S: 52,    D: 53,    F: 54,    G: 55,    H: 56,    J: 57,    K: 58,    L: 59,    SCLN: 60, QUOT: 61, ENT: 62,
-        LSFT: 63, Z: 64,    X: 65,    C: 66,    V: 67,    B: 68,    N: 69,    M: 70,    COMM: 71, DOT: 72,  SLSH: 73, RSFT: 74,                               UP: 75,
-        LCTL: 76, LGUI: 77, LALT: 78,                   SPC: 79,                                  RALT: 80, Fn: 81,   APP: 82,  RCTL: 83,           LEFT: 84, DOWN: 85, RGHT: 86
-    ),
-	[MATRIX] = LAYOUT(
-	    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,      58,      59,      60,      61,      62,
-	    63,      64,      65,      66,      67,      68,      69,      70,      71,      72,      73,      74,                                   75,
-	    76,      77,      78,                        79,                                 80,      81,      82,      83,                 84,      85,      86
-	),
-    */
-};
-
-#ifdef _______
-#undef _______
-#define _______ {0, 0, 0}
-
-const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
-    [_FL] = {
-        _______, CORAL,   CORAL,   _______, _______, CORAL,   CORAL,   _______, _______, CORAL,   _______, YELLOW,  YELLOW,           TEAL,    GOLD,   GOLD,
-        _______, _______, PINK,    PINK,    PINK,    PINK,    _______, _______, _______, GREEN,   GREEN,   GREEN,   GREEN,   _______, TEAL,    TEAL,   TEAL,
-        ORANGE,  ORANGE,  ORANGE,  ORANGE,  ORANGE,  ORANGE,  _______, AZURE,   AZURE,   _______, _______, _______, _______, _______, TEAL,    TEAL,   TEAL,
-        _______, ORANGE,  ORANGE,  ORANGE,  ORANGE,  ORANGE,  _______, _______, _______, _______, _______, _______, _______,
-        _______, ORANGE,  _______, CORAL,   _______, AZURE,   AZURE,   _______, _______, _______, _______, AZURE,                              SPRING,
-        _______, _______, _______,                   _______,                            _______, PINK,    _______, AZURE,            _______, SPRING, _______
-    },
-    [_ML] = {
-        _______, GOLD,    GOLD,    GOLD,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, MAGENT,  MAGENT,  MAGENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, MAGENT,  GOLD,    MAGENT, GOLD,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, GOLD,    GOLD,    GOLD,   GOLD,    _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, CORAL,  _______, _______, _______, _______, _______, _______, _______, _______,                            GOLD,
-        _______, PINK,    _______,                  _______,                                     _______, PINK,    _______, _______, GOLD,    GOLD,    GOLD
-    },
-    [_GL] = {
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, BLUE,    AZURE,   AZURE,   _______, CYAN,    _______, TURQ,    PURPLE,  _______, _______, _______, _______, _______,
-        _______, CORAL,   GREEN,   GREEN,   TURQ,    _______, _______, _______, _______, GREEN,   _______, _______, _______,
-        _______, CYAN,    CHART,   TURQ,    ORANGE,  CHART,   _______, CHART,   _______, _______, _______, _______,                            _______,
-        _______, _______, _______,                   _______,                            _______, PINK,    _______, _______,          _______, _______, _______
-    },
-    [_VL] = {
-        PURPLE,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, TURQ,    _______, _______, _______, _______, TURQ,    _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, AZURE,   AZURE,   AZURE,   PURPLE,  _______, BLUE,    PURPLE,  PURPLE,  PURPLE,  BLUE,    _______, _______, _______, _______, _______, _______,
-        _______, PURPLE,  _______, BLUE,    _______, GOLD,    GOLDEN,  GOLDEN,  GOLDEN,  GOLDEN,  _______, _______, _______,
-        _______, _______, BLUE,    BLUE,    _______, _______, TURQ,    _______, _______, _______, TURQ,    _______,                            _______,
-        _______, _______, _______,                   _______,                            _______, PINK,    _______, _______,          _______, _______, _______
-    },
-    [_YL] = {
-        RED,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        CHART,   BLUE,    BLUE,    BLUE,    BLUE,    BLUE,    BLUE,    BLUE,    BLUE,    BLUE,    BLUE,    _______, _______, _______, _______, PURPLE,  PURPLE,
-        _______, RED,     _______, BLUE,    _______, GOLD,    _______, _______, GREEN,   _______, MAGENT,  _______, GOLD,    GOLD,    _______, PURPLE,  PURPLE,
-        _______, BLUE,    _______, BLUE,    _______, MAGENT,  _______, GREEN,   GREEN,   GREEN,   MAGENT,  _______, _______,
-        _______, ORANGE,  ORANGE,  _______, _______, _______, _______, RED,     MAGENT,  MAGENT,  _______, _______,                            GREEN,
-        _______, _______, _______,                   _______,                   _______, PINK,    _______, _______,                   BLUE,    GREEN,   BLUE
-    },
-};
-
-#undef _______
-#define _______ KC_TRNS
-#endif
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-    // Enable or disable debugging
-    debug_enable=true;
-    debug_matrix=true;
-    debug_keyboard=true;
-    debug_mouse=true;
-
-    idle_second_counter = 0;                            // Counter for number of seconds keyboard has been idle.
-    key_event_counter = 0;                              // Counter to determine if keys are being held, neutral at 0.
-    rgb_time_out_seconds = RGB_DEFAULT_TIME_OUT;        // RGB timeout initialized to its default configure in keymap.h
-    rgb_time_out_enable = false;                        // Disable RGB timeout by default. Enable using toggle key.
-    rgb_time_out_user_value = false;                    // Has to have the same initial value as rgb_time_out_enable.
-    rgb_enabled_flag = true;                            // Initially, keyboard RGB is enabled. Change to false config.h initializes RGB disabled.
-    rgb_time_out_fast_mode_enabled = false;             // RGB timeout fast mode disabled initially.
-    rgb_time_out_saved_flag = rgb_matrix_get_flags();   // Save RGB matrix state for when keyboard comes back from ide.
-};
-
-void keyboard_post_init_user(void) {
-    rgb_matrix_enable();
-}
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    if(rgb_time_out_enable && rgb_enabled_flag) {
-        // If the key event counter is not zero then some key was pressed down but not released, thus reset the timeout counter.
-        if (key_event_counter) {
-            idle_second_counter = 0;
-        } else if (timer_elapsed(idle_timer) > MILLISECONDS_IN_SECOND) {
-            idle_second_counter++;
-            idle_timer = timer_read();
-        }
-
-        if (idle_second_counter >= rgb_time_out_seconds) {
-            rgb_time_out_saved_flag = rgb_matrix_get_flags();
-            rgb_matrix_set_flags(LED_FLAG_NONE);
-            rgb_matrix_disable_noeeprom();
-            rgb_enabled_flag = false;
-            idle_second_counter = 0;
-        }
-    }
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    // Increment key event counter for every press and decrement for every release.
-    if (record->event.pressed) {
-        key_event_counter++;
-    } else {
-        key_event_counter--;
-    }
-
-    if (rgb_time_out_enable) {
-        idle_timer = timer_read();
-        // Reset the seconds counter. Without this, something like press> leave x seconds> press, would be x seconds on the effective counter not 0 as it should.
-        idle_second_counter = 0;
-        if (!rgb_enabled_flag) {
-            rgb_matrix_enable_noeeprom();
-            rgb_matrix_set_flags(rgb_time_out_saved_flag);
-            rgb_enabled_flag = true;
-        }
-    }
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-    }
-
-    if (record->event.pressed) {
-        // The Yakuake config uses LGUI+Ctrl+Shift+<keycode>. KC_NO used for undesired key, all mapped ones get mods.
-        if (get_highest_layer(layer_state) == _YL && keycode != TG(_YL)) {
-            tap_code16(C(G(S(keycode))));
-            return false;
-        }
-        switch (keycode) {
-            case DBG_TOG:
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-                return false;
-            case DBG_MTRX:
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-                return false;
-            case DBG_KBD:
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-                return false;
-            case DBG_MOU:
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-                return false;
-            case RGB_TOG:
-                rgb_time_out_enable = rgb_time_out_user_value;
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case LED_FLAG_UNDERGLOW: {
-                        // This line is for LED idle timer. It disables the toggle so you can turn off LED completely if you like
-                        rgb_time_out_enable = false;
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_disable_noeeprom();
-                    }
-                    break;
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();
-                    }
-                    break;
-                }
-                return false;
-            // ======================================================== CUSTOM KEYCOADS BELOW ========================================================
-            case COPY_ALL:
-                // Selects all and text and copy
-                SEND_STRING(SS_LCTL("ac"));
-                return false;
-            case SEL_CPY:
-                // Select word under cursor and copy. Double mouse click then ctrl+c
-                tap_code16(KC_BTN1);
-                tap_code16(KC_BTN1);
-                tap_code16(C(KC_C));
-                return false;
-            case ROUT_TG:
-                // Toggle idle LED timeout on or off
-                rgb_time_out_enable = !rgb_time_out_enable;
-                rgb_time_out_user_value = rgb_time_out_enable;
-                return false;
-            case ROUT_VI:
-                // Increase idle LED timeout value in seconds
-                // Only increase if current value is lower than RGB_TIME_OUT_MAX. Don't care what value the result will be
-                // Modity RGB_TIME_OUT_STEP for bigger or smaller increments
-                if (!rgb_time_out_fast_mode_enabled && rgb_time_out_seconds <= RGB_TIME_OUT_MAX) {
-                    rgb_time_out_seconds += RGB_TIME_OUT_STEP;
-                }
-                return false;
-            case ROUT_VD:
-                // Decrease idle LED timeout value in seconds
-                // Only decrease if current value is higher than minimum value and the result is larger than zero
-                // Modity RGB_TIME_OUT_STEP for bigger or smaller decrements
-                if (!rgb_time_out_fast_mode_enabled && rgb_time_out_seconds > RGB_TIME_OUT_MIN) {
-                    rgb_time_out_seconds -= RGB_TIME_OUT_STEP;
-                }
-                return false;
-            case ROUT_FM:
-                if (rgb_time_out_fast_mode_enabled) {
-                    rgb_time_out_seconds = rgb_time_out_saved_seconds;
-                } else {
-                    rgb_time_out_saved_seconds = rgb_time_out_seconds;
-                    rgb_time_out_seconds = RGB_FAST_MODE_TIME_OUT;
-                }
-                rgb_time_out_fast_mode_enabled = !rgb_time_out_fast_mode_enabled;
-                return false;
-            case G_INIT ... G_LOG:
-                send_string_with_delay(sendstring_commands[keycode - G_INIT], 5);
-                return false;
-        }
-    }
-    return true;
-}
-
-void set_layer_color(int layer) {
-    if (layer == 0) { return; }
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        HSV hsv = {
-            .h = pgm_read_byte(&ledmap[layer][i][0]),
-            .s = pgm_read_byte(&ledmap[layer][i][1]),
-            .v = pgm_read_byte(&ledmap[layer][i][2]),
-        };
-        if (hsv.h || hsv.s || hsv.v) {
-            RGB rgb = hsv_to_rgb(hsv);
-            float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-            rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b);
-        } else if (layer != 1) {
-            // Only deactivate non-defined key LEDs at layers other than FN. Because at FN we have RGB adjustments and need to see them live.
-            // If the values are all false then it's a transparent key and deactivate LED at this layer
-            rgb_matrix_set_color(i, 0, 0, 0);
-        }
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-    if (disable_layer_color ||
-        rgb_matrix_get_flags() == LED_FLAG_NONE ||
-        rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
-            return;
-        }
-    set_layer_color(get_highest_layer(layer_state));
-    return false;
-}
-
-/* This is a test function for Raw HID, which is currently not implemented for this keyboard */
-/**
-void raw_hid_receive(uint8_t *data, uint8_t length) {
-    uint8_t response[RAW_EPSIZE];
-    memset(response+1, 'C', 1);
-    memset(response+2, 'T', 1);
-    memset(response+3, 'R', 1);
-    memset(response+4, 'L', 1);
-    raw_hid_send(data, length);
-}
-*/
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/rules.mk b/keyboards/massdrop/ctrl/keymaps/endgame/rules.mk
deleted file mode 100644
index c4fab8ad53c..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/endgame/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# RGBLIGHT_ENABLE = no				# Not for MD boards. This is here in case you forget.
-COMMAND_ENABLE = yes				# Commands for debug and configuration
-# AUTO_SHIFT_ENABLE = yes      	# Auto Shift
-NKRO_ENABLE = yes           	# USB Nkey Rollover
-DYNAMIC_MACRO_ENABLE = yes		# Dynamic macro recording and play
-MOUSEKEY_ENABLE = yes			# Enable mouse control keycodes. Increases firmware size.
-TAP_DANCE_ENABLE = yes			# Enable tap dance keys
-CONSOLE_ENABLE = yes			# Enable debugging console. Increases firmware size.
-SRC += config_led.c				# Used to add files to the compilation/linking list.
-EXTRAKEY_ENABLE = yes			# Audio control and System control
-# RAW_ENABLE = yes				# Raw HID has not yet been implemented for this keyboard
-# COMBO_ENABLE					# Key combo feature
-# LEADER_ENABLE					# Enable leader key chording
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/README.md b/keyboards/massdrop/ctrl/keymaps/foxx1337/README.md
deleted file mode 100644
index 4827d2bdbf8..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Massdrop CTRL default layout with raw HID protocol
-
-This represents my current layout, with filtered out effects, personal defaults,
-added inactivity timeout (for rgbmatrix) and a HID protocol example.
-
-To test that this is working, there's a user application I'm using to help with
-development on [my GitHub](https://github.com/foxx1337/rawhid_io).
-
-Currently all the HID operations defined in the protocol are callable from the
-user application:
-
-- hello: gets the string "CTRLHID 1.0.0"
-- lights: toggles the rgbmatrix on/off
-- led n #RRGGBB: colors the specified led. Valid n from 0 to 117 (87-117 are on
-    the edge)
-- leds start #RRGGBB #RRGGBB #RRGGBB ...: colors the range of leds from start
-- mode n: switches to the specific rgbmatrix mode. Use the last one, 11, to test
-    the led operations listed above
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h b/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
deleted file mode 100644
index 9b9d199f08d..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/config.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2021 foxx1337 at yahoo dot 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 FORCE_NKRO                  // NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES         // reacts to keypresses
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES         // reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default mode, if none has been set
-#define RGB_MATRIX_DEFAULT_HUE 12
-#define RGB_MATRIX_DEFAULT_SPD (UINT8_MAX / 2 + 32)
-#define RGB_MATRIX_DEFAULT_VAL 96
-// #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
-// #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
-// #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
-// #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
-// #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 1000     // How long to wait between light changes for the "Christmas" animation, in milliseconds
-// #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 2            // The number of LEDs to group the red/green colors by for the "Christmas" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM RGBLED_NUM   // The number of LEDs to have the "Knight" animation travel
-// #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3             // The number of LEDs to light up for the "Knight" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 0             // The number of LEDs to start the "Knight" animation from the start of the strip by
-// #define RGBLIGHT_RAINBOW_SWIRL_RANGE 255            // Range adjustment for the rainbow swirl effect to get different swirls
-// #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4              // The number of LEDs to light up for the "Snake" animation
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-// #define DISABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
-// #define DISABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
-#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN              // Static gradient top to bottom, speed controls how much gradient changes
-#define DISABLE_RGB_MATRIX_BREATHING                     // Single hue brightness cycling animation
-#define DISABLE_RGB_MATRIX_BAND_SAT                      // Single hue band fading saturation scrolling left to right
-#define DISABLE_RGB_MATRIX_BAND_VAL                      // Single hue band fading brightness scrolling left to right
-#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT             // Single hue 3 blade spinning pinwheel fades saturation
-#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL             // Single hue 3 blade spinning pinwheel fades brightness
-#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT               // Single hue spinning spiral fades saturation
-#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL               // Single hue spinning spiral fades brightness
-#define DISABLE_RGB_MATRIX_CYCLE_ALL                     // Full keyboard solid hue cycling through full gradient
-#define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT              // Full gradient scrolling left to right
-#define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN                 // Full gradient scrolling top to bottom
-#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN                  // Full gradient scrolling out to in
-#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL             // Full dual gradients scrolling out to in
-#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON        // Full gradent Chevron shapped scrolling left to right
-#define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL                // Full gradient spinning pinwheel around center of keyboard
-#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL                  // Full gradient spinning spiral around center of keyboard
-#define DISABLE_RGB_MATRIX_DUAL_BEACON                   // Full gradient spinning around center of keyboard
-#define DISABLE_RGB_MATRIX_RAINBOW_BEACON                // Full tighter gradient spinning around center of keyboard
-#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS             // Full dual gradients spinning two halfs of keyboard
-// #define DISABLE_RGB_MATRIX_RAINDROPS                     // Randomly changes a single key's hue
-// #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS           // Randomly changes a single key's hue and saturation
-// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
-#define DISABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
-#define DISABLE_RGB_MATRIX_DIGITAL_RAIN                  // That famous computer simulation
-// =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
-// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE                // Static single hue, pulses keys hit to shifted hue then fades to current hue
-//#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE         // Pulses keys hit to hue & value then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE           // Hue & value pulse near a single key hit then fades value out
-//#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE      // Hue & value pulse near multiple key hits then fades value out
-//#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS          // Hue & value pulse the same column and row of a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS     // Hue & value pulse the same column and row of multiple key hits then fades value out
-//#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS          // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS     // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SPLASH                        // Full gradient & value pulse away from a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_MULTISPLASH                   // Full gradient & value pulse away from multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_SPLASH                  // Hue & value pulse away from a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH             // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.c b/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.c
deleted file mode 100644
index fd7dd6b6921..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2021 foxx1337 at yahoo dot 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
-#include "hid_protocol.h"
-
-uint8_t raw_hid_buffer[RAW_EPSIZE];
-
-void raw_hid_perform_send(void) {
-    raw_hid_send(raw_hid_buffer, RAW_EPSIZE);
-}
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h b/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h
deleted file mode 100644
index 96f90f5e054..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/hid_protocol.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2021 foxx1337 at yahoo dot 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 <color.h>
-#include <raw_hid.h>
-
-#define CTRL_HID_GREETING_VERSION "CTRLHID 1.0.0"
-
-enum ctrl_hid_codes {
-    // Signals end of message. Not really that useful.
-    CTRL_HID_EOM = 0x00,
-    CTRL_HID_OK,
-    CTRL_HID_NOK,
-
-    /**
-     * to hid: CTRL_HID_HELLO
-     * from hid: CTRL_HID_HELLO, "CTRLHID 1.0.0", CTRL_HID_EOM
-     **/
-    CTRL_HID_HELLO,
-
-    /**
-     * to hid: CTRL_HID_LIGHTS_TOGGLE
-     * from hid: CTRL_HID_LIGHTS_TOGGLE, CTRL_HID_OK, is_led_timeout, CTRL_HID_EOM
-     *
-     * Toggles all the leds on the keyboard. is_led_timeout will be 1 if the new
-     * state is off, 0 if leds are on.
-     **/
-    CTRL_HID_LIGHTS_TOGGLE,
-
-    /**
-     * to hid: CTRL_HID_LED, led_id, r, g, b
-     * from hid: CTRL_HID_LED, CTRL_HID_OK, CTRL_HID_EOM
-     * on error: CTRL_HID_LED, CTRL_HID_NOK, num_leds, CTRL_HID_EOM
-     *
-     * Sets the specific led to r, g, b. It's only visible when the hid_effect mode is active.
-     **/
-    CTRL_HID_LED,
-
-    /**
-     * to hid: CTRL_HID_LEDS, start, count, r0, g0, b0, ..., r[count-1], g[count-1], b[count-1]
-     * from hid: CTRL_HID_LEDS, CTRL_HID_OK, affected_leds, CTRL_HID_EOM
-     *
-     * Sets affected_leds leds following start to the corresponding r, g, b value.
-     * It's only visible when the hid_effect mode is active.
-     **/
-    CTRL_HID_LEDS,
-
-    /**
-     * to hid: CTRL_HID_RGBMATRIX_MODE, mode
-     * from hid: CTRL_HID_RGBMATRIX_MODE, CTRL_HID_OK, CTRL_HID_EOM
-     * on error: CTRL_HID_RGBMATRIX_MODE, CTRL_HID_NOK, mode_max, CTRL_HID_EOM
-     *
-     * Changes light mode. mode_max is hid_effect for CTRL_HID_LED and CTRL_HID_LEDS.
-     */
-    CTRL_HID_RGBMATRIX_MODE
-};
-
-extern uint8_t raw_hid_buffer[RAW_EPSIZE];
-
-// Defined in rgb_matrix_user.inc
-// It's 119 for Massdrop CTRL, 0 - 118.
-extern RGB rgb_matrix_led_state[RGB_MATRIX_LED_COUNT];
-
-void raw_hid_perform_send(void);
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c b/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c
deleted file mode 100644
index ffeb89c60ee..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/keymap.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright 2021 foxx1337 at yahoo dot 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
-#include "hid_protocol.h"
-
-enum ctrl_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
-    DBG_TOG,               //DEBUG Toggle On / Off
-    DBG_MTRX,              //DEBUG Toggle Matrix Prints
-    DBG_KBD,               //DEBUG Toggle Keyboard Prints
-    DBG_MOU,               //DEBUG Toggle Mouse Prints
-    MD_BOOT,               //Restart into bootloader after hold timeout
-};
-
-#define TIMEOUT_ACTIVITY 300000 // 300 seconds before lights go off
-
-uint32_t time_last_activity;
-bool is_led_timeout;
-led_flags_t led_state;
-
-keymap_config_t keymap_config;
-
-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_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                              KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPLY, KC_MSTP, KC_VOLU,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    */
-};
-
-void change_led_state(bool is_off) {
-    is_led_timeout = is_off;
-
-    if (is_led_timeout) {
-        led_state = rgb_matrix_get_flags();
-        if (led_state != LED_FLAG_NONE) {
-            rgb_matrix_set_flags(LED_FLAG_NONE);
-            rgb_matrix_disable_noeeprom();
-        }
-    } else {
-        if (led_state != LED_FLAG_NONE) {
-            rgb_matrix_set_flags(led_state);
-            rgb_matrix_enable_noeeprom();
-        }
-    }
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-    time_last_activity = timer_read32();
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    if (!is_led_timeout && timer_elapsed32(time_last_activity) > TIMEOUT_ACTIVITY) {
-        change_led_state(true);
-    }
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
-#define MODS_ALT    (get_mods() & MOD_MASK_ALT)
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    time_last_activity = timer_read32();
-    if (is_led_timeout) {
-        change_led_state(false);
-    }
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case LED_FLAG_UNDERGLOW: {
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_disable_noeeprom();
-                    }
-                    break;
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();
-                    }
-                    break;
-                }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
-
-void raw_hid_say_hello(void) {
-    const char *ctrl = CTRL_HID_GREETING_VERSION;
-    uint8_t i = 0;
-    while (ctrl[i] != 0 && i + 2 < RAW_EPSIZE) {
-        raw_hid_buffer[1 + i] = ctrl[i];
-        i++;
-    }
-    raw_hid_buffer[i] = CTRL_HID_EOM;
-}
-
-void raw_hid_lights_toggle(void) {
-    change_led_state(!is_led_timeout);
-
-    raw_hid_buffer[1] = CTRL_HID_OK;
-    raw_hid_buffer[2] = (uint8_t) is_led_timeout;
-    raw_hid_buffer[3] = CTRL_HID_EOM;
-}
-
-void raw_hid_led(uint8_t *data) {
-    //rgb_matrix_set_color(data[1], data[2], data[3], data[4]);
-    const uint8_t led = data[1];
-
-    if (led >= RGB_MATRIX_LED_COUNT) {
-        raw_hid_buffer[1] = CTRL_HID_NOK;
-        raw_hid_buffer[2] = RGB_MATRIX_LED_COUNT;
-        raw_hid_buffer[3] = CTRL_HID_EOM;
-        return;
-    }
-
-    rgb_matrix_led_state[led].r = data[2];
-    rgb_matrix_led_state[led].g = data[3];
-    rgb_matrix_led_state[led].b = data[4];
-
-    raw_hid_buffer[1] = CTRL_HID_OK;
-    raw_hid_buffer[2] = CTRL_HID_EOM;
-}
-
-void raw_hid_leds(uint8_t *data) {
-    const uint8_t first_led = data[1];
-    const uint8_t number_leds = data[2];
-
-    uint8_t i = 0;
-    while (i < number_leds && first_led + i < RGB_MATRIX_LED_COUNT && i * 3 + 5 < RAW_EPSIZE) {
-        rgb_matrix_led_state[first_led + i].r = data[3 + i * 3 + 0];
-        rgb_matrix_led_state[first_led + i].g = data[3 + i * 3 + 1];
-        rgb_matrix_led_state[first_led + i].b = data[3 + i * 3 + 2];
-        i++;
-    }
-
-    raw_hid_buffer[1] = CTRL_HID_OK;
-    raw_hid_buffer[2] = i;
-    raw_hid_buffer[3] = CTRL_HID_EOM;
-}
-
-void raw_hid_rgbmatrix_mode(uint8_t *data) {
-    const uint8_t mode = data[1];
-    if (mode >= RGB_MATRIX_EFFECT_MAX) {
-        raw_hid_buffer[1] = CTRL_HID_NOK;
-        raw_hid_buffer[2] = RGB_MATRIX_EFFECT_MAX - 1;
-        raw_hid_buffer[3] = CTRL_HID_EOM;
-        return;
-    }
-    rgb_matrix_mode_noeeprom(mode);
-
-    raw_hid_buffer[1] = CTRL_HID_OK;
-    raw_hid_buffer[2] = CTRL_HID_EOM;
-}
-
-void raw_hid_receive(uint8_t *data, uint8_t length) {
-    switch (*data) {
-        case CTRL_HID_HELLO:
-            raw_hid_say_hello();
-            break;
-        case CTRL_HID_LIGHTS_TOGGLE:
-            raw_hid_lights_toggle();
-            break;
-        case CTRL_HID_LED:
-            raw_hid_led(data);
-            break;
-        case CTRL_HID_LEDS:
-            raw_hid_leds(data);
-            break;
-        case CTRL_HID_RGBMATRIX_MODE:
-            raw_hid_rgbmatrix_mode(data);
-            break;
-    }
-
-    raw_hid_perform_send();
-}
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc b/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc
deleted file mode 100644
index 36d09c42e24..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/rgb_matrix_user.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2021 foxx1337 at yahoo dot 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/>.
- */
-
-// !!! DO NOT ADD #pragma once !!! //
-
-// Step 1.
-// Declare custom effects using the RGB_MATRIX_EFFECT macro
-// (note the lack of semicolon after the macro!)
-RGB_MATRIX_EFFECT(hid_effect)
-
-// Step 2.
-// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-RGB rgb_matrix_led_state[RGB_MATRIX_LED_COUNT];
-
-// e.g: A simple effect, self-contained within a single method
-static bool hid_effect(effect_params_t* params) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
-    for (uint8_t i = led_min; i < led_max; i++) {
-        rgb_matrix_set_color(i,
-            rgb_matrix_led_state[i].r,
-            rgb_matrix_led_state[i].g,
-            rgb_matrix_led_state[i].b);
-    }
-    return led_max < RGB_MATRIX_LED_COUNT;
-}
-
-#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/massdrop/ctrl/keymaps/foxx1337/rules.mk b/keyboards/massdrop/ctrl/keymaps/foxx1337/rules.mk
deleted file mode 100644
index ba6cb8f4b5a..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/foxx1337/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-CONSOLE_ENABLE = no          	# Console for debug
-RAW_ENABLE = yes             	# Raw device
-RGB_MATRIX_CUSTOM_USER = yes	# Custom rgb matrix effect
-
-SRC += hid_protocol.c
diff --git a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
deleted file mode 100644
index 75df0ad9745..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c
+++ /dev/null
@@ -1,126 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum ctrl_keycodes {
-    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,              //USB Toggle Automatic GCR control
-    DBG_TOG,               //DEBUG Toggle On / Off
-    DBG_MTRX,              //DEBUG Toggle Matrix Prints
-    DBG_KBD,               //DEBUG Toggle Keyboard Prints
-    DBG_MOU,               //DEBUG Toggle Mouse Prints
-    MD_BOOT,               //Restart into bootloader after hold timeout
-};
-
-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_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                              KC_UP,
-        KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, MO(1),   KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPLY, KC_MSTP, KC_VOLU,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    */
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_UNDERGLOW: {
-                    rgb_matrix_set_flags(LED_FLAG_NONE);
-                    rgb_matrix_disable_noeeprom();
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_enable_noeeprom();
-                  }
-                  break;
-              }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c
deleted file mode 100644
index 79407113471..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c
+++ /dev/null
@@ -1,269 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum ctrl_keycodes {
-    L_BRI = SAFE_RANGE, //LED Brightness Increase                                   //Working
-    L_BRD,              //LED Brightness Decrease                                   //Working
-    L_EDG_I,            //LED Edge Brightness Increase
-    L_EDG_D,            //LED Edge Brightness Decrease
-    L_EDG_M,            //LED Edge lighting mode
-    L_PTN,              //LED Pattern Select Next                                   //Working
-    L_PTP,              //LED Pattern Select Previous                               //Working
-    L_PSI,              //LED Pattern Speed Increase                                //Working
-    L_PSD,              //LED Pattern Speed Decrease                                //Working
-    L_RATIOD,
-    L_RATIOI,
-    L_T_MD,             //LED Toggle Mode                                           //Working
-    L_T_ONF,            //LED Toggle On / Off                                       //Broken
-    L_ON,               //LED On                                                    //Broken
-    L_OFF,              //LED Off                                                   //Broken
-    L_T_BR,             //LED Toggle Breath Effect                                  //Working
-    L_T_PTD,            //LED Toggle Scrolling Pattern Direction                    //Working
-    U_T_AGCR,           //USB Toggle Automatic GCR control                          //Working
-    DBG_TOG,            //DEBUG Toggle On / Off                                     //
-    DBG_MTRX,           //DEBUG Toggle Matrix Prints                                //
-    DBG_KBD,            //DEBUG Toggle Keyboard Prints                              //
-    DBG_MOU,            //DEBUG Toggle Mouse Prints                                 //
-    DBG_FAC,            //DEBUG Factory light testing (All on white)
-    MD_BOOT             //Restart into bootloader after hold timeout                //Working
-};
-
-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_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                              KC_UP,
-        KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, MO(1),   KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPLY, KC_MSTP, KC_VOLU,
-        L_T_BR,  L_PSD,   L_BRI,   L_PSI,   L_EDG_I, _______, _______, _______, U_T_AGCR,_______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD,
-        L_T_PTD, L_PTP,   L_BRD,   L_PTN,   L_EDG_D, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, L_T_MD,  L_T_ONF, _______, L_EDG_M, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   DBG_FAC,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    */
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-    static uint8_t scroll_effect = 0;
-
-    switch (keycode) {
-        case L_BRI:
-            if (record->event.pressed) {
-                if (LED_GCR_STEP > LED_GCR_MAX - gcr_desired) gcr_desired = LED_GCR_MAX;
-                else gcr_desired += LED_GCR_STEP;
-                if (led_animation_breathing) gcr_breathe = gcr_desired;
-            }
-            return false;
-        case L_BRD:
-            if (record->event.pressed) {
-                if (LED_GCR_STEP > gcr_desired) gcr_desired = 0;
-                else gcr_desired -= LED_GCR_STEP;
-                if (led_animation_breathing) gcr_breathe = gcr_desired;
-            }
-            return false;
-        case L_EDG_M:
-            if (record->event.pressed) {
-                led_edge_mode++;
-                if (led_edge_mode > LED_EDGE_MODE_MAX) {
-                    led_edge_mode = LED_EDGE_MODE_ALL;
-                }
-            }
-            return false;
-        case L_EDG_I:
-            if (record->event.pressed) {
-                led_edge_brightness += 0.1;
-                if (led_edge_brightness > 1) { led_edge_brightness = 1; }
-            }
-            return false;
-        case L_EDG_D:
-            if (record->event.pressed) {
-                led_edge_brightness -= 0.1;
-                if (led_edge_brightness < 0) { led_edge_brightness = 0; }
-            }
-            return false;
-        case L_RATIOI:
-            if (record->event.pressed) {
-                led_ratio_brightness += 0.2;
-                if (led_ratio_brightness > 2.0) { led_ratio_brightness = 2.0; }
-            }
-            return false;
-        case L_RATIOD:
-            if (record->event.pressed) {
-                led_ratio_brightness -= 0.2;
-                if (led_ratio_brightness < 0.0) { led_ratio_brightness = 0.0; }
-            }
-            return false;
-        case L_PTN:
-            if (record->event.pressed) {
-                if (led_animation_id == led_setups_count - 1) led_animation_id = 0;
-                else led_animation_id++;
-            }
-            return false;
-        case L_PTP:
-            if (record->event.pressed) {
-                if (led_animation_id == 0) led_animation_id = led_setups_count - 1;
-                else led_animation_id--;
-            }
-            return false;
-        case L_PSI:
-            if (record->event.pressed) {
-                led_animation_speed += ANIMATION_SPEED_STEP;
-            }
-            return false;
-        case L_PSD:
-            if (record->event.pressed) {
-                led_animation_speed -= ANIMATION_SPEED_STEP;
-                if (led_animation_speed < 0) led_animation_speed = 0;
-            }
-            return false;
-        case L_T_MD:
-            if (record->event.pressed) {
-                led_lighting_mode++;
-                if (led_lighting_mode > LED_MODE_MAX_INDEX) led_lighting_mode = LED_MODE_NORMAL;
-            }
-            return false;
-        case L_T_ONF:
-            if (record->event.pressed) {
-                led_enabled = !led_enabled;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case L_ON:
-            if (record->event.pressed) {
-                led_enabled = 1;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case L_OFF:
-            if (record->event.pressed) {
-                led_enabled = 0;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case L_T_BR:
-            if (record->event.pressed) {
-                led_animation_breathing = !led_animation_breathing;
-                if (led_animation_breathing) {
-                    gcr_breathe = gcr_desired;
-                    led_animation_breathe_cur = BREATHE_MIN_STEP;
-                    breathe_dir = 1;
-                }
-            }
-            return false;
-        case L_T_PTD:
-            if (record->event.pressed) {
-                scroll_effect++;
-                if (scroll_effect == 1) {               //Patterns with scroll move horizontal (Right to left)
-                    led_animation_direction = 1;
-                    led_animation_orientation = 0;
-                    led_animation_circular = 0;
-                } else if (scroll_effect == 2) {        //Patterns with scroll move vertical (Top to bottom)
-                    led_animation_direction = 1;
-                    led_animation_orientation = 1;
-                    led_animation_circular = 0;
-                } else if (scroll_effect == 3) {        //Patterns with scroll move vertical (Bottom to top)
-                    led_animation_direction = 0;
-                    led_animation_orientation = 1;
-                    led_animation_circular = 0;
-                } else if (scroll_effect == 4) {        //Patterns with scroll explode from center
-                    led_animation_direction = 0;
-                    led_animation_orientation = 0;
-                    led_animation_circular = 1;
-                } else if (scroll_effect == 5) {        //Patterns with scroll implode on center
-                    led_animation_direction = 1;
-                    led_animation_orientation = 0;
-                    led_animation_circular = 1;
-                } else {                                //Patterns with scroll move horizontal (Left to right)
-                    scroll_effect = 0;
-                    led_animation_direction = 0;
-                    led_animation_orientation = 0;
-                    led_animation_circular = 0;
-                }
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_FAC:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                led_lighting_mode = LED_MODE_NORMAL;
-                led_edge_brightness = 1;
-                led_edge_mode = LED_EDGE_MODE_ALL;
-                led_animation_breathing = 0;
-                led_animation_id = 7; //led_programs.c led_setups leds_white index
-                gcr_desired = LED_GCR_MAX;
-                led_enabled = 1;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
-
-led_instruction_t led_instructions[] = {
-    //Please see ../default_md/keymap.c for examples
-
-    //All LEDs use the user's selected pattern (this is the factory default)
-     { .flags = LED_FLAG_USE_ROTATE_PATTERN },
-
-    //end must be set to 1 to indicate end of instruction set
-     { .end = 1 }
-};
diff --git a/keyboards/massdrop/ctrl/keymaps/mac_md/rules.mk b/keyboards/massdrop/ctrl/keymaps/mac_md/rules.mk
deleted file mode 100644
index 064a6f54c1f..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/mac_md/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This keymap requires Massdrop Configurator support
-OPT_DEFS += -DUSE_MASSDROP_CONFIGURATOR
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
deleted file mode 100644
index a17e3e76bf1..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-QMK Firmware Massdrop CTRL M-AS Keymap
-Copyright (C) 2020 matthewrobo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define MODS_SHIFT (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL (get_mods() & MOD_MASK_CTRL)
-#define MODS_ALT (get_mods() & MOD_MASK_ALT)
-
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
-
-// #define NO_DEBUG                    // Disable debugging
-// #define NO_PRINT                    // Disable printing/debugging using hid_listen
-// #define NO_ACTION_LAYER             // Disable layers
-// #define NO_ACTION_TAPPING           // Disable tap dance and other tapping features
-// #define NO_ACTION_ONESHOT           // Disable one-shot modifiers
-// #define NO_ACTION_MACRO             // Disable old style macro handling: MACRO() & action_get_macro
-// #define TERMINAL_HELP
-// #define MOUSEKEY_INTERVAL 20
-// #define MOUSEKEY_DELAY 0
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_MAX_SPEED 10
-// #define MOUSEKEY_WHEEL_DELAY 0
-#define FORCE_NKRO  // NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-// #define STRICT_LAYER_RELEASE        // Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
-// #define LOCKING_SUPPORT_ENABLE      // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-// #define LOCKING_RESYNC_ENABLE       // Tries to keep switch state consistent with keyboard LED state
-#define TAPPING_TERM 200  // How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-#define PERMISSIVE_HOLD
-// #define TAPPING_TERM_PER_KEY        // Enables handling for per key TAPPING_TERM settings
-// #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-// #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
-// #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-// #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-// #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
-// #define LEADER_KEY_STRICT_KEY_PROCESSING    // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-// #define ONESHOT_TIMEOUT 300         // How long before oneshot times out
-// #define ONESHOT_TAP_TOGGLE 2        // How many taps before oneshot toggle is triggered
-// #define COMBO_TERM 200              // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-// #define TAP_CODE_DELAY 100          // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS  // Sets the default mode, if none has been set
-// #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
-// #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
-// #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
-// #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
-// #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 1000     // How long to wait between light changes for the "Christmas" animation, in milliseconds
-// #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 2            // The number of LEDs to group the red/green colors by for the "Christmas" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM RGBLED_NUM   // The number of LEDs to have the "Knight" animation travel
-// #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3             // The number of LEDs to light up for the "Knight" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 0             // The number of LEDs to start the "Knight" animation from the start of the strip by
-// #define RGBLIGHT_RAINBOW_SWIRL_RANGE 255            // Range adjustment for the rainbow swirl effect to get different swirls
-// #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4              // The number of LEDs to light up for the "Snake" animation
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
-// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN              // Static gradient top to bottom, speed controls how much gradient changes
-#undef ENABLE_RGB_MATRIX_BREATHING               // Single hue brightness cycling animation
-#undef ENABLE_RGB_MATRIX_BAND_SAT                // Single hue band fading saturation scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_VAL                // Single hue band fading brightness scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT       // Single hue 3 blade spinning pinwheel fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL       // Single hue 3 blade spinning pinwheel fades brightness
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT         // Single hue spinning spiral fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL         // Single hue spinning spiral fades brightness
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL               // Full keyboard solid hue cycling through full gradient
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT        // Full gradient scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN           // Full gradient scrolling top to bottom
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN            // Full gradient scrolling out to in
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL       // Full dual gradients scrolling out to in
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradent Chevron shapped scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL          // Full gradient spinning pinwheel around center of keyboard
-// #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL                  // Full gradient spinning spiral around center of keyboard
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON          // Full gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON       // Full tighter gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS    // Full dual gradients spinning two halfs of keyboard
-#undef ENABLE_RGB_MATRIX_RAINDROPS            // Randomly changes a single key's hue
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS  // Randomly changes a single key's hue and saturation
-// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN  // That famous computer simulation
-// =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE  // Static single hue, pulses keys hit to shifted hue then fades to current hue
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE         // Pulses keys hit to hue & value then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE        // Hue & value pulse near a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE   // Hue & value pulse near multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS       // Hue & value pulse the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS  // Hue & value pulse the same column and row of multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS       // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS  // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-// #undef ENABLE_RGB_MATRIX_SPLASH                        // Full gradient & value pulse away from a single key hit then fades value out
-// #undef ENABLE_RGB_MATRIX_MULTISPLASH                   // Full gradient & value pulse away from multiple key hits then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_SPLASH                  // Hue & value pulse away from a single key hit then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH             // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
deleted file mode 100644
index 80018356c7a..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-QMK Firmware Massdrop CTRL M-AS Keymap
-Copyright (C) 2020 matthewrobo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef RGB_MATRIX_ENABLE
-#    include "ctrl.h"
-
-#    include "md_rgb_matrix.h"
-#    include "rgb_matrix.h"
-#    include "config_led.h"
-// clang-format off
-led_config_t g_led_config = { {
-    {   0,   1,   2,   3,   4,   5,   6,   7 },
-    {  16,  17,  18,  19,  20,  21,  22,  23 },
-    {  33,  34,  35,  36,  37,  38,  39,  40 },
-    {  50,  51,  52,  53,  54,  55,  56,  57 },
-    {  63,  64,  65,  66,  67,  68,  69,  70 },
-    {  76,  77,  78,  79,  80,  81,  82,  83 },
-    {   8,   9,  10,  11,  12,  13,  14,  15 },
-    {  24,  25,  26,  27,  28,  29,  30,  31 },
-    {  41,  42,  43,  44,  45,  46,  47,  48 },
-    {  58,  59,  60,  61,  62,  75,  49,  32 },
-    {  71,  72,  73,  74,  84,  85,  86, NO_LED }
-}, {
-  // 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_SCRL, KC_PAUS
-    {   7,   5 }, {  31,   5 }, {  43,   5 }, {  55,   5 }, {  67,   5 }, {  85,   5 }, {  97,   5 }, { 109,   5 },
-    { 121,   5 }, { 139,   5 }, { 151,   5 }, { 163,   5 }, { 175,   5 }, { 193,   5 }, { 205,   5 }, { 217,   5 },
-  // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
-    {   7,  20 }, {  19,  20 }, {  31,  20 }, {  43,  20 }, {  55,  20 }, {  67,  20 }, {  79,  20 }, {  91,  20 },
-    { 103,  20 }, { 115,  20 }, { 127,  20 }, { 139,  20 }, { 151,  20 }, { 169,  20 }, { 193,  20 }, { 205,  20 },
-    { 217,  20 },
-  // KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN
-    {  10,  30 }, {  25,  30 }, {  37,  30 }, {  49,  30 }, {  61,  30 }, {  73,  30 }, {  85,  30 }, {  97,  30 },
-    { 109,  30 }, { 121,  30 }, { 133,  30 }, { 145,  30 }, { 157,  30 }, { 172,  30 }, { 193,  30 }, { 205,  30 },
-    { 217,  30 },
-  // 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
-    {  11,  39 }, {  28,  39 }, {  40,  39 }, {  52,  39 }, {  64,  39 }, {  76,  39 }, {  88,  39 }, { 100,  39 },
-    { 112,  39 }, { 124,  39 }, { 136,  39 }, { 148,  39 }, { 168,  39 },
-  // 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
-    {  14,  49 }, {  34,  49 }, {  46,  49 }, {  58,  49 }, {  70,  49 }, {  82,  49 }, {  94,  49 }, { 106,  49 },
-    { 118,  49 }, { 130,  49 }, { 142,  49 }, { 165,  49 }, { 205,  49 },
-  // KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    {   8,  59 }, {  23,  59 }, {  38,  59 }, {  83,  59 }, { 129,  59 }, { 144,  59 }, { 159,  59 }, { 174,  59 },
-    { 193,  59 }, { 205,  59 }, { 217,  59 },
-  // Underglow / Border
-    { 224,  64 }, { 204,  64 }, { 186,  64 }, { 167,  64 }, { 149,  64 }, { 130,  64 }, { 112,  64 }, {  94,  64 },
-    {  75,  64 }, {  57,  64 }, {  38,  64 }, {  20,  64 }, {   0,  64 }, {   0,  47 }, {   0,  32 }, {   0,  17 },
-    {   0,   0 }, {  20,   0 }, {  38,   0 }, {  57,   0 }, {  75,   0 }, {  94,   0 }, { 112,   0 }, { 130,   0 },
-    { 149,   0 }, { 167,   0 }, { 186,   0 }, { 204,   0 }, { 224,   0 }, { 224,  17 }, { 224,  32 }, { 224,  47 }
-}, {
-  // 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_SCRL, KC_PAUS
-    1, 4, 4, 4, 4, 1, 1, 1,
-    1, 4, 4, 4, 4, 1, 1, 1,
-  // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
-    4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 1, 1, 1,
-    1,
-  // KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN
-    1, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 1, 1,
-    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
-    1, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 1,
-  // 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
-    1, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 1, 1,
-  // KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    1, 1, 1, 4, 1, 1, 1, 1,
-    1, 1, 1,
-  // Underglow / Border
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2
-} };
-// clang-format on
-
-#    ifdef USB_LED_INDICATOR_ENABLE
-bool rgb_matrix_indicators_kb(void) {
-    md_rgb_matrix_indicators();
-    return rgb_matrix_indicators_user();
-}
-#    endif  // USB_LED_INDICATOR_ENABLE
-
-#endif
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
deleted file mode 100644
index 574587b2bf1..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
-QMK Firmware Massdrop CTRL M-AS Keymap
-Copyright (C) 2020 matthewrobo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define MILLISECONDS_IN_SECOND 1000
-
-// These are just to make it neater to use builtin HSV values in the keymap
-// clang-format off
-#define WHITE {HSV_WHITE}
-#define RED {HSV_RED}
-#define CORAL {HSV_CORAL}
-#define ORANGE {HSV_ORANGE}
-#define GOLDEN {HSV_GOLDENROD}
-#define GOLD {HSV_GOLD}
-#define YELLOW {HSV_YELLOW}
-#define CHART {HSV_CHARTREUSE}
-#define GREEN {HSV_GREEN}
-#define SPRING {HSV_SPRINGGREEN}
-#define TURQ {HSV_TURQUOISE}
-#define TEAL {HSV_TEAL}
-#define CYAN {HSV_CYAN}
-#define AZURE {HSV_AZURE}
-#define BLUE {HSV_BLUE}
-#define PURPLE {HSV_PURPLE}
-#define MAGENT {HSV_MAGENTA}
-#define PINK {HSV_PINK}
-#define HSV_CREAM 24, 240, 255
-#define CREAM {HSV_CREAM}
-#define HSV_9B59B5 208, 192, 255
-#define M9B59B5 {HSV_9B59B5}
-// clang-format on
-
-#define LT_CAPS LT(_NL, KC_CAPS)
-#define _LAYER_ KC_TRNS
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-extern bool         g_suspend_state;
-extern rgb_config_t rgb_matrix_config;
-bool                disable_layer_color;
-
-bool rgb_enabled_flag;  // Current LED state flag. If false then LED is off.
-
-enum layout_names {
-    _KL = 0,  // Keys Layout: The main keyboard layout that has all the characters
-    _NL,      // Navigation Layout: Cursor keys and numpad inputs
-    _FL,      // Function Layout: The function key activated layout with default functions and some added ones
-};
-
-enum ctrl_keycodes {
-    U_T_AUTO = SAFE_RANGE,  // USB Extra Port Toggle Auto Detect / Always Active
-    U_T_AGCR,               // USB Toggle Automatic GCR control
-    DBG_TOG,                // DEBUG Toggle On / Off
-    DBG_MTRX,               // DEBUG Toggle Matrix Prints
-    DBG_KBD,                // DEBUG Toggle Keyboard Prints
-    DBG_MOU,                // DEBUG Toggle Mouse Prints
-    MD_BOOT,                // Restart into bootloader after hold timeout
-    MAS_CRM,
-    MAS_PRP,
-    MAS_RED,
-    MAS_GRN,
-    MAS_BLU,
-    MAS_CYN,
-    MAS_MGT,
-    MAS_YEL,
-    MAS_KEY,
-    MAS_WHT,
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_KL] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
-        LT_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,
-        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,                              KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(_FL), KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_NL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_PMNS, KC_PPLS, _______,   _______, _______, _______,
-        _______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PSLS, _______, _______, KC_EQL,    _______, _______, _______,
-        _LAYER_, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, KC_PPLS, _______,
-        _______, _______, _______, _______, _______, _______, KC_P0,   KC_P0,   KC_P0,   KC_PDOT, KC_PSLS, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    [_FL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, KC_MSEL, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MSTP, KC_MPLY, KC_VOLU,
-        _______, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, MAS_MGT, MAS_BLU, MAS_WHT, RGB_RMOD,RGB_MOD, _______,   KC_MPRV, KC_MNXT, KC_VOLD,
-        _______, RGB_RMOD,RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, MAS_RED, MAS_KEY, MAS_CYN, MAS_PRP, _______, _______,
-        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, MAS_YEL, MAS_GRN, MAS_CRM, _______, _______,                              RGB_VAI,
-        _______, _______, _______,                   _______,                            _______, _LAYER_, _______, _______,            RGB_SPD, RGB_VAD, RGB_SPI
-    ),
-    /*
-    [DEFAULT] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, TG_NKRO, _______, _______, _______, _______, _______,                            _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    [RGB] = LAYOUT(
-        ESC: 0,   F1: 1,    F2: 2,    F3: 3,    F4: 4,    F5: 5,    F6: 6,    F7: 7,    F8: 8,    F9: 9,    F10: 10,  F11: 11,  F12: 12,            PSCR: 13, SLCK: 14, PAUS: 15,
-        GRV: 16,  1: 17,    2: 18,    3: 19,    4: 20,    5: 21,    6: 22,    7: 23,    8: 24,    9: 25,    0: 26,    MINS: 27, EQL: 28,  BSPC: 29, INS: 30,  HOME: 31, PGUP: 32,
-        TAB: 33,  Q: 34,    W: 35,    E: 36,    R: 37,    T: 38,    Y: 39,    U: 40,    I: 41,    O: 42,    P: 43,    LBRC: 44, RBRC: 45, BSLS: 46, DEL: 47,  END: 48,  PGDN: 49,
-        CAPS: 50, A: 51,    S: 52,    D: 53,    F: 54,    G: 55,    H: 56,    J: 57,    K: 58,    L: 59,    SCLN: 60, QUOT: 61, ENT: 62,
-        LSFT: 63, Z: 64,    X: 65,    C: 66,    V: 67,    B: 68,    N: 69,    M: 70,    COMM: 71, DOT: 72,  SLSH: 73, RSFT: 74,                               UP: 75,
-        LCTL: 76, LGUI: 77, LALT: 78,                   SPC: 79,                                  RALT: 80, Fn: 81,   APP: 82,  RCTL: 83,           LEFT: 84, DOWN: 85, RGHT: 86
-    ),
-    [MATRIX] = LAYOUT(
-        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,      58,      59,      60,      61,      62,
-        63,      64,      65,      66,      67,      68,      69,      70,      71,      72,      73,      74,                                   75,
-        76,      77,      78,                        79,                                 80,      81,      82,      83,                 84,      85,      86
-    ),
-    */
-};
-
-#ifdef _______
-#    undef _______
-#    define _______ {0,0,0}
-
-const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
-    [_NL] = {
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, GOLD,    GOLD,    GOLD,    GREEN,   GREEN,   GREEN,   _______,   _______, _______, _______,
-        _______, TEAL,    CYAN,    AZURE,   CYAN,    _______, _______, GOLD,    RED,     GOLD,    GREEN,   _______, _______, GREEN,     _______, _______, _______,
-        WHITE,   TEAL,    AZURE,   AZURE,   AZURE,   _______, _______, GOLD,    GOLD,    GOLD,    GREEN,   GREEN,   _______,
-        _______, _______, _______, _______, _______, _______, RED,     RED,     RED,     GREEN,   GREEN,   _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    },
-    [_FL] = {
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            RED,     GREEN,   _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   RED,     GREEN,   AZURE,
-        _______, GOLD,    CORAL,   _______, _______, _______, _______, _______, MAGENT,  BLUE,    WHITE,   GOLD,    GOLD,    _______,   ORANGE,  ORANGE,  AZURE,
-        _______, GOLD,    CORAL,   _______, _______, _______, _______, RED,     {1,0,0}, CYAN,    M9B59B5, _______, _______,
-        _______, RED,     _______, _______, _______, RED,     PINK,    YELLOW,  GREEN,   CREAM,   _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, WHITE,   _______, _______,            CORAL,   _______, CORAL
-    },
-};
-#    undef _______
-#    define _______ KC_TRNS
-#endif
-// clang-format on
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-    rgb_enabled_flag = true;  // Initially, keyboard RGB is enabled. Change to false config.h initializes RGB disabled.
-};
-
-void keyboard_post_init_user(void) { rgb_matrix_enable(); }
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void){};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-    }
-
-    if (record->event.pressed) {
-        switch (keycode) {
-            case DBG_TOG:
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-                return false;
-            case DBG_MTRX:
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-                return false;
-            case DBG_KBD:
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-                return false;
-            case DBG_MOU:
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-                return false;
-            case RGB_TOG:
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    } break;
-                    case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    } break;
-                    case LED_FLAG_UNDERGLOW: {
-                        // This line is for LED idle timer. It disables the toggle so you can turn off LED completely if you like
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_disable_noeeprom();
-                    } break;
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();
-                    } break;
-                }
-                return false;
-            // ======================================================== CUSTOM KEYCOADS BELOW ========================================================
-            case MAS_CRM:
-                rgb_matrix_sethsv(HSV_CREAM);
-                return false;
-            case MAS_PRP:
-                rgb_matrix_sethsv(HSV_9B59B5);
-                return false;
-            case MAS_RED:
-                rgb_matrix_sethsv(HSV_RED);
-                return false;
-            case MAS_GRN:
-                rgb_matrix_sethsv(HSV_GREEN);
-                return false;
-            case MAS_BLU:
-                rgb_matrix_sethsv(HSV_BLUE);
-                return false;
-            case MAS_CYN:
-                rgb_matrix_sethsv(HSV_CYAN);
-                return false;
-            case MAS_MGT:
-                rgb_matrix_sethsv(HSV_MAGENTA);
-                return false;
-            case MAS_YEL:
-                rgb_matrix_sethsv(HSV_YELLOW);
-                return false;
-            case MAS_KEY:
-                rgb_matrix_sethsv(0, 0, 0);
-                return false;
-            case MAS_WHT:
-                rgb_matrix_sethsv(128, 0, 255);
-                return false;
-            default:
-                return true;  // Process all other keycodes normally
-        }
-    }
-    return true;
-}
-
-void set_layer_color(int layer) {
-    if (layer == 0) {
-        return;
-    }
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        HSV hsv = {
-            .h = pgm_read_byte(&ledmap[layer][i][0]),
-            .s = pgm_read_byte(&ledmap[layer][i][1]),
-            .v = pgm_read_byte(&ledmap[layer][i][2]),
-        };
-        if (hsv.h || hsv.s || hsv.v) {
-            RGB   rgb = hsv_to_rgb(hsv);
-            float f   = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-            rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b);
-        } else if (layer == _FL) {
-            HSV hsv2   = {rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v};
-            HSV hui    = hsv2;
-            HSV hud    = hsv2;
-            HSV sai    = hsv2;
-            HSV sad    = hsv2;
-            HSV vai    = hsv2;
-            HSV vad    = hsv2;
-            hui.h      = hsv2.h + 8;
-            hud.h      = hsv2.h - 8;
-            sai.s      = hsv2.s + 16 > 255 ? 255 : hsv2.s + 16;
-            sad.s      = hsv2.s - 16 < 0 ? 0 : hsv2.s - 16;
-            vai.v      = hsv2.v + 16 > 255 ? 255 : hsv2.v + 16;
-            vad.v      = hsv2.v - 16 < 0 ? 0 : hsv2.v - 16;
-            RGB rgbHUI = hsv_to_rgb(hui);
-            RGB rgbHUD = hsv_to_rgb(hud);
-            RGB rgbSAI = hsv_to_rgb(sai);
-            RGB rgbSAD = hsv_to_rgb(sad);
-            RGB rgbVAI = hsv_to_rgb(vai);
-            RGB rgbVAD = hsv_to_rgb(vad);
-
-            switch (i) {
-                case 36:
-                    rgb_matrix_set_color(i, rgbHUI.r, rgbHUI.g, rgbHUI.b);
-                    break;
-                case 53:
-                    rgb_matrix_set_color(i, rgbHUD.r, rgbHUD.g, rgbHUD.b);
-                    break;
-                case 54:
-                    rgb_matrix_set_color(i, rgbSAI.r, rgbSAI.g, rgbSAI.b);
-                    break;
-                case 37:
-                    rgb_matrix_set_color(i, rgbSAD.r, rgbSAD.g, rgbSAD.b);
-                    break;
-                case 38:
-                    rgb_matrix_set_color(i, rgbVAI.r, rgbVAI.g, rgbVAI.b);
-                    break;
-                case 55:
-                    rgb_matrix_set_color(i, rgbVAD.r, rgbVAD.g, rgbVAD.b);
-                    break;
-                case 75:
-                    rgb_matrix_set_color(i, rgbVAI.r, rgbVAI.g, rgbVAI.b);
-                    break;
-                case 85:
-                    rgb_matrix_set_color(i, rgbVAD.r, rgbVAD.g, rgbVAD.b);
-                    break;
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-    if (g_suspend_state || disable_layer_color || rgb_matrix_get_flags() == LED_FLAG_NONE || rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
-        return;
-    }
-    set_layer_color(get_highest_layer(layer_state));
-    return false;
-}
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/readme.md b/keyboards/massdrop/ctrl/keymaps/matthewrobo/readme.md
deleted file mode 100644
index 380d078e2cd..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Massdrop CTRL - M-AS
-
-Based on the ["endgame" keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/ctrl/keymaps/endgame).
-
-## Layers
-
-### Base Layer
-![Base Layer](https://i.imgur.com/qMXpYUb.png)
-
-### Navigation Layer
-![Navigation Layer](https://i.imgur.com/RSp12Sh.png)
-
-### Function Layer
-![Function Layer](https://i.imgur.com/dp7zs0I.png)
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/rgb_matrix_user.inc b/keyboards/massdrop/ctrl/keymaps/matthewrobo/rgb_matrix_user.inc
deleted file mode 100644
index d837502ca53..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/rgb_matrix_user.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-QMK Firmware Massdrop CTRL M-AS Keymap
-Copyright (C) 2020 matthewrobo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// !!! DO NOT ADD #pragma once !!! //
-
-// Step 1.
-// Declare custom effects using the RGB_MATRIX_EFFECT macro
-// (note the lack of semicolon after the macro!)
-RGB_MATRIX_EFFECT(SOLID_REACTIVE_WIDE2)
-RGB_MATRIX_EFFECT(SOLID_REACTIVE_MULTIWIDE2)
-RGB_MATRIX_EFFECT(SOLID_REACTIVE_NEXUS2)
-RGB_MATRIX_EFFECT(SOLID_REACTIVE_MULTINEXUS2)
-
-// Step 2.
-// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-static HSV SOLID_REACTIVE_WIDE_math2(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick) {
-    uint16_t effect = tick - dist > 255 || dist > 32 ? 255 : tick - dist;
-    hsv.v           = qadd8(hsv.v, 255 - effect);
-    return hsv;
-}
-
-static HSV SOLID_REACTIVE_NEXUS_math2(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick) {
-    uint16_t effect = tick - dist > 255 || ((dx > 8 || dx < -8) && (dy > 8 || dy < -8)) ? 255 : tick - dist;
-    hsv.v           = qadd8(hsv.v, 255 - effect);
-    hsv.h           = rgb_matrix_config.hsv.h + dy / 4;
-    return hsv;
-}
-
-bool SOLID_REACTIVE_WIDE2(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math2); }
-bool SOLID_REACTIVE_MULTIWIDE2(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math2); }
-bool SOLID_REACTIVE_NEXUS2(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math2); }
-bool SOLID_REACTIVE_MULTINEXUS2(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math2); }
-
-#endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/rules.mk b/keyboards/massdrop/ctrl/keymaps/matthewrobo/rules.mk
deleted file mode 100644
index 4bb43f525bd..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-#RGBLIGHT_ENABLE   = no #Not for MD boards.This is here in case you forget.
-COMMAND_ENABLE = no				# Commands for debug and configuration
-#AUTO_SHIFT_ENABLE = yes #Auto Shift
-NKRO_ENABLE = yes           	# USB Nkey Rollover
-DYNAMIC_MACRO_ENABLE = no		# Dynamic macro recording and play
-MOUSEKEY_ENABLE = no			# Enable mouse control keycodes. Increases firmware size.
-TAP_DANCE_ENABLE = no			# Enable tap dance keys
-CONSOLE_ENABLE = no			# Enable debugging console. Increases firmware size.
-SRC += config_led.c				# Used to add files to the compilation/linking list.
-EXTRAKEY_ENABLE = yes			# Audio control and System control
-#RAW_ENABLE = yes #Raw HID has not yet been implemented for this keyboard
-#COMBO_ENABLE #Key combo                    feature
-#LEADER_ENABLE #Enable leader key           chording
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h b/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h
deleted file mode 100644
index 07e69df3b98..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define FORCE_NKRO
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_VAL 100
-#define HSV_BACKLIGHT_COLOR HSV_BLUE
-#define HSV_GAME_COLOR      170, 255, 192 // darker blue
-#define HSV_CONTROL_COLOR   0,   255, 192 // darker red
diff --git a/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c b/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c
deleted file mode 100644
index 232b3e8dd4f..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Copyright 2020 Robert Pufky <rpufky@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
-
-#define BASE 0
-#define GAME 1
-#define CTRL 2
-#define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
-#define MODS_ALT    (get_mods() & MOD_MASK_ALT)
-
-enum ctrl_keycodes {
-    U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect/Always Active
-    U_T_AGCR,              // USB Toggle Automatic GCR control
-    L_BRI = SAFE_RANGE,    // LED Brightness Increase
-    L_BRD,                 // LED Brightness Decrease
-    L_PTN,                 // LED Pattern Select Next
-    L_PTP,                 // LED Pattern Select Previous
-    L_PSI,                 // LED Pattern Speed Increase
-    L_PSD,                 // LED Pattern Speed Decrease
-    L_T_MD,                // LED Toggle Mode
-    L_T_ONF,               // LED Toggle On / Off //Broken
-    L_ON,                  // LED On              //Broken
-    L_OFF,                 // LED Off             //Broken
-    L_T_BR,                // LED Toggle Breath Effect
-    L_T_PTD,               // LED Toggle Scrolling Pattern Direction
-    DBG_TOG,               // DEBUG Toggle On / Off
-    DBG_MTRX,              // DEBUG Toggle Matrix Print
-    DBG_KBD,               // DEBUG Toggle Keyboard Prints
-    DBG_MOU,               // DEBUG Toggle Mouse Prints
-    MD_BOOT,               // Restart into bootloader after hold timeout
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BASE] = LAYOUT(
-        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,            KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-        KC_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_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_NUM,  KC_LGUI,  KC_LALT,                   KC_SPC,                             KC_RALT, MO(CTRL), KC_F24,   KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [GAME] = LAYOUT(
-        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,            KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-        KC_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_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_HOME, KC_END,   KC_LALT,                   KC_SPC,                             KC_RALT, MO(CTRL), KC_F24,   KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [CTRL] = LAYOUT(
-        KC_EJCT, KC_F13,   KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,   KC_F23,   KC_F24,            KC_MUTE, _______, _______,
-        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______, KC_MPLY, KC_MSTP, KC_VOLU,
-        _______, RGB_SPD,  RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______,  TO(BASE), TO(GAME), _______, KC_MPRV, KC_MNXT, KC_VOLD,
-        KC_CAPS, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______,  _______,  _______,
-        _______, RGB_TOG,  _______, _______, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______,  _______,                              KC_BRIU,
-        _______, _______,  _______,                   _______,                            _______, _______,  _______,  _______,           KC_MRWD, KC_BRID, KC_MFFD
-    ),
-};
-
-// Init keyboard static color with underglow off.
-void matrix_init_user(void) {
-    rgblight_sethsv(HSV_BACKLIGHT_COLOR);
-    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
-
-// Set backlight color based on active layer
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case GAME: {
-           rgblight_sethsv_noeeprom(HSV_GAME_COLOR);
-           break;
-        }
-        case CTRL: {
-            rgblight_sethsv_noeeprom(HSV_CONTROL_COLOR);
-            break;
-        }
-        default:
-            rgblight_sethsv_noeeprom(HSV_BACKLIGHT_COLOR);
-            break;
-    }
-    return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case U_T_AUTO:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case RGB_TOG:
-            if (record->event.pressed) {
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                        rgb_matrix_set_color_all(RGB_OFF);
-                    }
-                    break;
-                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(RGB_OFF);
-                    }
-                    break;
-                    case LED_FLAG_UNDERGLOW: {
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_disable_noeeprom();
-                    }
-                    break;
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();
-                    }
-                    break;
-                }
-            }
-            return false;
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/massdrop/ctrl/keymaps/r-pufky/readme.md b/keyboards/massdrop/ctrl/keymaps/r-pufky/readme.md
deleted file mode 100644
index 38075b3a0ff..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/r-pufky/readme.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Massdrop Ctrl r-pufky
-
-Gaming QOL improvments; enabling useful keys for left hand & in-game overlay
-usage.
-
-## Layers
-
-### Typing Layer
-
-![Typing Layer](https://i.imgur.com/qEBaupV.png)
-
-Layer optimized to enable useful keys for typing and casual gaming without
-changing typing state, as well as specific in-game overlay keys.
-
-* Left Ctrl: Easier control key usage without always setting capslock.
-* Num Lock: Unique non visible character key for additional left-hand input
-    options in game.
-* Fn: Enable Control layer, temporal.
-* F24: Non-visible F24 key; no windows function. Map to in-game overlays.
-
-### Gaming Layer
-
-![Gaming Layer](https://i.imgur.com/q4wGbFQ.png)
-
-Replaces super key with additional non-printing inputs.
-
-* Home: Non visible character key for additional input options in game.
-* End: Non visible character key for additional input options in game.
-* Left Ctrl: Easier control key usage without always setting capslock.
-* Fn: Enable Control layer, temporal.
-* F24: Non-visible F24 key; no windows function. Map to in-game overlays.
- 
-### Control Layer
-
-![Function Layer](https://i.imgur.com/7Nalcyp.png)
-
-* Purple: Media keys. Note CD Eject on Escape, and OSX Prev/Next on Arrows.
-* Blue: Keyboard adminstration. Toggle NKRO (N Key Rollover) and enable
-    bootloader.
-* Orange: RGB Controls.
-* Green: Toggle gaming layer.
-* Capslock: Now requires the use of the function key.
-* F13-F24: Extended function keys.
-* Bright+/-: Monitor Brightness.
diff --git a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/README.md b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/README.md
deleted file mode 100644
index 60c2d1f91f3..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-Fn + P + Esc, Fn + P + `: reset effect to default
-
-Fn + P + Tab, Fn + P + Y: select previous color pattern
-Fn + P + Caps, Fn + P + H: select next color pattern
-
-Fn + P + A, Fn + P + J: (no effect for now)
-Fn + P + D, Fn + P + L: (no effect for now)
-
-
-Fn + P + Q, Fn + P + U: wave travel faster
-Fn + P + E, Fn + P + O: wave travel slower
-
-
-Fn + P + W, Fn + P + I: increase wave width
-Fn + P + S, Fn + P + K: decrease wave width
diff --git a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
deleted file mode 100644
index b314cfea0aa..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
+++ /dev/null
@@ -1,764 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#include <math.h> // sqrtf, powf
-
-#ifdef CONSOLE_ENABLE
-
-#include <print.h>
-
-#endif
-
-enum ctrl_keycodes {
-    L_BRI = SAFE_RANGE, //LED Brightness Increase                                   //Working
-    L_BRD,              //LED Brightness Decrease                                   //Working
-    L_PTN,              //LED Pattern Select Next                                   //Working
-    L_PTP,              //LED Pattern Select Previous                               //Working
-    L_PSI,              //LED Pattern Speed Increase                                //Working
-    L_PSD,              //LED Pattern Speed Decrease                                //Working
-    L_T_MD,             //LED Toggle Mode                                           //Working
-    L_T_ONF,            //LED Toggle On / Off                                       //Broken
-    L_ON,               //LED On                                                    //Broken
-    L_OFF,              //LED Off                                                   //Broken
-    L_T_BR,             //LED Toggle Breath Effect                                  //Working
-    L_T_PTD,            //LED Toggle Scrolling Pattern Direction                    //Working
-    U_T_AGCR,           //USB Toggle Automatic GCR control                          //Working
-    DBG_TOG,            //DEBUG Toggle On / Off                                     //
-    DBG_MTRX,           //DEBUG Toggle Matrix Prints                                //
-    DBG_KBD,            //DEBUG Toggle Keyboard Prints                              //
-    DBG_MOU,            //DEBUG Toggle Mouse Prints                                 //
-    MD_BOOT,            //Restart into bootloader after hold timeout                //Working
-
-
-    L_SP_PR,            //LED Splash Pattern Select Previous
-    L_SP_NE,            //LED Splash Pattern Select Next
-
-    L_SP_WD,            //LED Splash Widen Wavefront width
-    L_SP_NW,            //LED Splash Narrow Wavefront width
-
-    L_SP_FA,            //LED Splash wave travel speed faster (shorter period)
-    L_SP_SL,            //LED Splash wave travel speed slower (longer period)
-
-    L_CP_PR,            //LED Color Pattern Select Previous
-    L_CP_NX,            //LEB Color Pattern Select Next
-
-    S_RESET            // reset all parameters
-};
-
-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_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                              KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPLY, KC_MSTP, KC_VOLU,
-        L_T_BR,  L_PSD,   L_BRI,   L_PSI,   _______, _______, _______, _______, U_T_AGCR,_______, MO(2),   _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD,
-        L_T_PTD, L_PTP,   L_BRD,   L_PTN,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, L_T_MD,  L_T_ONF, _______, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    [2] = LAYOUT(
-        S_RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        S_RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        L_CP_NX, L_SP_SL, L_SP_WD, L_SP_FA, _______, _______, L_CP_NX, L_SP_SL, L_SP_WD, L_SP_FA, _______, _______, _______, _______,   _______, _______, _______,
-        L_CP_PR, L_SP_PR, L_SP_NW, L_SP_NE, _______, _______, L_CP_PR, L_SP_PR, L_SP_NW, L_SP_NE, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    )
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    */
-};
-
-#define DISTANCE_NORAMLIZING_PARAMETER 3
-struct {
-    uint8_t PATTERN_INDEX;
-    float WAVE_WIDTH;
-    float WAVE_SPEED;
-    int COLOR_PATTERN_INDEX;
-    float TRAVEL_DISTANCE;
-} USER_CONFIG = {
-    .PATTERN_INDEX = 1,
-    .WAVE_WIDTH = 10, // width of the wave in keycaps
-    .WAVE_SPEED = 15, // travel how many keycaps per second
-    .COLOR_PATTERN_INDEX = 0,
-    .TRAVEL_DISTANCE = 25,
-};
-
-
-#define COLOR_PATTERN_RGB_COUNT 18
-static uint8_t COLOR_PATTERNS[][COLOR_PATTERN_RGB_COUNT][3] = {
-    { // default rainbow color
-        {255,   0,   0}, {255,   0,   0}, {255, 127,   0},
-        {255, 127,   0}, {255, 255,   0}, {255, 255,   0},
-        {120, 255,   0}, {120, 255,   0}, {  0, 255,   0},
-        {  0, 255,   0}, {  0, 255, 120}, {  0, 255, 120},
-        {  0,   0, 255}, {  0,   0, 255}, { 75,   0, 130},
-        { 75,   0, 130}, { 43,   0, 130}, { 43,   0, 130},
-    }, { // light rainbow color
-        {248,  12,  18}, {238,  17,   0}, {255,  51,  17},
-        {255,  68,  32}, {255, 102,  68}, {255, 153,  51},
-        {254, 174,  45}, {204, 187,  51}, {208, 195,  16},
-        {170, 204,  34}, {105, 208,  37}, { 34, 204, 170},
-        { 18, 189, 185}, { 17, 170, 187}, { 68,  68, 221},
-        { 51,  17, 187}, { 59,  12, 189}, { 68,  34, 153},
-    }, { // white flat
-        {255, 255, 255}, {255, 255, 255}, {255, 255, 255},
-        {255, 255, 255}, {255, 255, 255}, {255, 255, 255},
-        {255, 255, 255}, {255, 255, 255}, {255, 255, 255},
-        {255, 255, 255}, {255, 255, 255}, {255, 255, 255},
-        {255, 255, 255}, {255, 255, 255}, {255, 255, 255},
-        {255, 255, 255}, {255, 255, 255}, {255, 255, 255},
-    }, { // white fade, cos curve
-        {255, 255, 255}, {255, 255, 255}, {252, 252, 252},
-        {247, 247, 247}, {240, 240, 240}, {232, 232, 232},
-        {221, 221, 221}, {209, 209, 209}, {196, 196, 196},
-        {181, 181, 181}, {164, 164, 164}, {147, 147, 147},
-        {128, 128, 128}, {108, 108, 108}, { 88,  88,  88},
-        { 66,  66,  66}, { 45,  45,  45}, { 23,  23,  23},
-    },
-};
-static const uint8_t COLOR_PATTERNS_COUNT = ARRAY_SIZE(COLOR_PATTERNS);
-
-/**
- * trimed down version of `ISSI3733_LED_MAP`:
- *
- * `ISSI3733_LED_MAP` is defined in keyboards/massdrop/ctrl/config_led.h is not directly usable,
- * the numbers inside this map could probably be related to the PCB layout instead of
- * the actual physical layout,
- *
- * this `ISSI3733_LED_MAP` is used somewhere in protocol/ but is not globally accessible
- * so one is created here
- *
- * x and y are coordinates of the physical layout
- * KC_ESC is (0, 0), gap between function keys and number rows is 1.5
- * +y is downwards
- * 1 unit is width/height of 1 standard keycap
- */
-#define MAX_LED_ID ISSI3733_LED_COUNT
-typedef struct led_info_s {
-    uint16_t id;
-    uint16_t scan;
-    float x;
-    float y;
-    uint8_t distance_to[MAX_LED_ID + 1];
-} led_info_t;
-led_info_t led_info[MAX_LED_ID + 1] = {
- { .id = 0 },
- { .id = 1,     .x = 0.0,       .y = 0.0,   .scan = 41  }, // ESC
- { .id = 2,     .x = 2.0,       .y = 0.0,   .scan = 58  }, // F1
- { .id = 3,     .x = 3.0,       .y = 0.0,   .scan = 59  }, // F2
- { .id = 4,     .x = 3.5,       .y = 0.0,   .scan = 60  }, // F3
- { .id = 5,     .x = 5.0,       .y = 0.0,   .scan = 61  }, // F4
- { .id = 6,     .x = 6.5,       .y = 0.0,   .scan = 62  }, // F5
- { .id = 7,     .x = 7.5,       .y = 0.0,   .scan = 63  }, // F6
- { .id = 8,     .x = 8.5,       .y = 0.0,   .scan = 64  }, // F7
- { .id = 9,     .x = 9.5,       .y = 0.0,   .scan = 65  }, // F8
- { .id = 10,    .x = 11,        .y = 0.0,   .scan = 66  }, // F9
- { .id = 11,    .x = 12,        .y = 0.0,   .scan = 67  }, // F10
- { .id = 12,    .x = 13,        .y = 0.0,   .scan = 68  }, // F11
- { .id = 13,    .x = 14,        .y = 0.0,   .scan = 69  }, // F12
- { .id = 14,    .x = 15.5,      .y = 0.0,   .scan = 70  }, // Print
- { .id = 15,    .x = 16.5,      .y = 0.0,   .scan = 71  }, // Scoll Lock
- { .id = 16,    .x = 17.5,      .y = 0.0,   .scan = 72  }, // Pause
- { .id = 17,    .x = 0.0,       .y = 1.5,   .scan = 53  }, // `
- { .id = 18,    .x = 1.0,       .y = 1.5,   .scan = 30  }, // 1
- { .id = 19,    .x = 2.0,       .y = 1.5,   .scan = 31  }, // 2
- { .id = 20,    .x = 3.0,       .y = 1.5,   .scan = 32  }, // 3
- { .id = 21,    .x = 3.5,       .y = 1.5,   .scan = 33  }, // 4
- { .id = 22,    .x = 5.0,       .y = 1.5,   .scan = 34  }, // 5
- { .id = 23,    .x = 6.0,       .y = 1.5,   .scan = 35  }, // 6
- { .id = 24,    .x = 7.0,       .y = 1.5,   .scan = 36  }, // 7
- { .id = 25,    .x = 8.0,       .y = 1.5,   .scan = 37  }, // 8
- { .id = 26,    .x = 9.0,       .y = 1.5,   .scan = 38  }, // 9
- { .id = 27,    .x = 10.0,      .y = 1.5,   .scan = 39  }, // 0
- { .id = 28,    .x = 11.0,      .y = 1.5,   .scan = 45  }, // -
- { .id = 29,    .x = 12.0,      .y = 1.5,   .scan = 46  }, // =
- { .id = 30,    .x = 13.5,      .y = 1.5,   .scan = 42  }, // Backspace
- { .id = 31,    .x = 15.5,      .y = 1.5,   .scan = 73  }, // Insert
- { .id = 32,    .x = 16.6,      .y = 1.5,   .scan = 74  }, // Home
- { .id = 33,    .x = 17.5,      .y = 1.5,   .scan = 75  }, // Page Up
- { .id = 34,    .x = 0.2,       .y = 2.5,   .scan = 43  }, // Tab
- { .id = 35,    .x = 1.5,       .y = 2.5,   .scan = 20  }, // Q
- { .id = 36,    .x = 2.5,       .y = 2.5,   .scan = 26  }, // W
- { .id = 37,    .x = 3.5,       .y = 2.5,   .scan = 8   }, // E
- { .id = 38,    .x = 4.5,       .y = 2.5,   .scan = 21  }, // R
- { .id = 39,    .x = 5.5,       .y = 2.5,   .scan = 23  }, // T
- { .id = 40,    .x = 6.5,       .y = 2.5,   .scan = 28  }, // Y
- { .id = 41,    .x = 7.5,       .y = 2.5,   .scan = 24  }, // U
- { .id = 42,    .x = 8.5,       .y = 2.5,   .scan = 12  }, // I
- { .id = 43,    .x = 9.5,       .y = 2.5,   .scan = 18  }, // O
- { .id = 44,    .x = 10.5,      .y = 2.5,   .scan = 19  }, // P
- { .id = 45,    .x = 11.5,      .y = 2.5,   .scan = 47  }, // [
- { .id = 46,    .x = 12.5,      .y = 2.5,   .scan = 48  }, // ]
- { .id = 47,    .x = 13.75,     .y = 2.5,   .scan = 49  }, /* \ */
- { .id = 48,    .x = 15.5,      .y = 2.5,   .scan = 76  }, // Delete
- { .id = 49,    .x = 16.5,      .y = 2.5,   .scan = 77  }, // End
- { .id = 50,    .x = 17.5,      .y = 2.5,   .scan = 78  }, // Page Down
- { .id = 51,    .x = 0.4,       .y = 3.5,   .scan = 57  }, // Caps Lock
- { .id = 52,    .x = 2.5,       .y = 3.5,   .scan = 4   }, // A
- { .id = 53,    .x = 3.5,       .y = 3.5,   .scan = 22  }, // S
- { .id = 54,    .x = 4.5,       .y = 3.5,   .scan = 7   }, // D
- { .id = 55,    .x = 5.5,       .y = 3.5,   .scan = 9   }, // F
- { .id = 56,    .x = 6.5,       .y = 3.5,   .scan = 10  }, // G
- { .id = 57,    .x = 7.5,       .y = 3.5,   .scan = 11  }, // H
- { .id = 58,    .x = 8.5,       .y = 3.5,   .scan = 13  }, // J
- { .id = 59,    .x = 9.5,       .y = 3.5,   .scan = 14  }, // K
- { .id = 60,    .x = 10.5,      .y = 3.5,   .scan = 15  }, // L
- { .id = 61,    .x = 11.5,      .y = 3.5,   .scan = 51  }, // ;
- { .id = 62,    .x = 12.5,      .y = 3.5,   .scan = 52  }, // '
- { .id = 63,    .x = 13.5,      .y = 3.5,   .scan = 40  }, // Enter
- { .id = 64,    .x = 0.5,       .y = 4.5,   .scan = 225 }, // LSHIFT
- { .id = 65,    .x = 2.25,      .y = 4.5,   .scan = 29  }, // Z
- { .id = 66,    .x = 3.25,      .y = 4.5,   .scan = 27  }, // X
- { .id = 67,    .x = 4.25,      .y = 4.5,   .scan = 6   }, // C
- { .id = 68,    .x = 5.25,      .y = 4.5,   .scan = 25  }, // V
- { .id = 69,    .x = 6.25,      .y = 4.5,   .scan = 5   }, // B
- { .id = 70,    .x = 7.25,      .y = 4.5,   .scan = 17  }, // N
- { .id = 71,    .x = 8.25,      .y = 4.5,   .scan = 16  }, // M
- { .id = 72,    .x = 9.25,      .y = 4.5,   .scan = 54  }, // COMMA
- { .id = 73,    .x = 10.25,     .y = 4.5,   .scan = 55  }, // DOT
- { .id = 74,    .x = 11.25,     .y = 4.5,   .scan = 56  }, // SLASH
- { .id = 75,    .x = 13.2,      .y = 4.5,   .scan = 229 }, // RSHIFT
- { .id = 76,    .x = 16.5,      .y = 4.5,   .scan = 82  }, // UP
- { .id = 77,    .x = 0.1,       .y = 5.5,   .scan = 224 }, // LCTRL
- { .id = 78,    .x = 1.25,      .y = 5.5,   .scan = 227 }, // WIN
- { .id = 79,    .x = 2.5,       .y = 5.5,   .scan = 226 }, // LALT
- { .id = 80,    .x = 6.25,      .y = 5.5,   .scan = 44  }, // SPACE
-
-#define MAX_CACHED_SCAN_CODE 231
- { .id = 81,    .x = 10.25,     .y = 5.5,   .scan = 230 }, // RALT
-
-#define FN_KEY_LED_ID 82
-#define FN_KEY_SCAN_CODE 20737
- { .id = 82,    .x = 11.5,      .y = 5.5,   .scan = 20737 }, // FN
- { .id = 83,    .x = 12.7,      .y = 5.5,   .scan = 101 }, // APP
- { .id = 84,    .x = 13.75,     .y = 5.5,   .scan = 228 }, // RCTRL
- { .id = 85,    .x = 15.5,      .y = 5.5,   .scan = 80  }, // LEFT
- { .id = 86,    .x = 16.5,      .y = 5.5,   .scan = 81  }, // DOWN
- { .id = 87,    .x = 17.5,      .y = 5.5,   .scan = 79  }, // RIGHT
-
-#define MAX_LED_ID_WITH_SCANCODE 87
-
- { .id = 88,    .x = 18.5,      .y = 6.5,   .scan = 255 },
- { .id = 89,    .x = 16.917,    .y = 6.5,   .scan = 255 },
- { .id = 90,    .x = 15.333,    .y = 6.5,   .scan = 255 },
- { .id = 91,    .x = 13.75,     .y = 6.5,   .scan = 255 },
- { .id = 92,    .x = 12.167,    .y = 6.5,   .scan = 255 },
- { .id = 93,    .x = 10.583,    .y = 6.5,   .scan = 255 },
- { .id = 94,    .x = 9,         .y = 6.5,   .scan = 255 },
- { .id = 95,    .x = 7.417,     .y = 6.5,   .scan = 255 },
- { .id = 96,    .x = 5.833,     .y = 6.5,   .scan = 255 },
- { .id = 97,    .x = 4.25,      .y = 6.5,   .scan = 255 },
- { .id = 98,    .x = 2.667,     .y = 6.5,   .scan = 255 },
- { .id = 99,    .x = 1.083,     .y = 6.5,   .scan = 255 },
- { .id = 100,   .x = -0.5,      .y = 6.5,   .scan = 255 },
- { .id = 101,   .x = -0.5,      .y = 4.75,  .scan = 255 },
- { .id = 102,   .x = -0.5,      .y = 3,     .scan = 255 },
- { .id = 103,   .x = -0.5,      .y = 1.25,  .scan = 255 },
- { .id = 104,   .x = -0.5,      .y = -0.5,  .scan = 255 },
- { .id = 105,   .x = 1.083,     .y = -0.5,  .scan = 255 },
- { .id = 106,   .x = 2.667,     .y = -0.5,  .scan = 255 },
- { .id = 107,   .x = 4.25,      .y = -0.5,  .scan = 255 },
- { .id = 108,   .x = 5.833,     .y = -0.5,  .scan = 255 },
- { .id = 109,   .x = 7.417,     .y = -0.5,  .scan = 255 },
- { .id = 110,   .x = 9,         .y = -0.5,  .scan = 255 },
- { .id = 111,   .x = 10.583,    .y = -0.5,  .scan = 255 },
- { .id = 112,   .x = 12.167,    .y = -0.5,  .scan = 255 },
- { .id = 113,   .x = 13.75,     .y = -0.5,  .scan = 255 },
- { .id = 114,   .x = 15.333,    .y = -0.5,  .scan = 255 },
- { .id = 115,   .x = 16.917,    .y = -0.5,  .scan = 255 },
- { .id = 116,   .x = 18.5,      .y = 1.25,  .scan = 255 },
- { .id = 117,   .x = 18.5,      .y = 3,     .scan = 255 },
- { .id = 118,   .x = 18.5,      .y = 4.75,  .scan = 255 },
- { .id = 119,   .x = 18.5,      .y = 6.5,   .scan = 255 },
-};
-
-/**
- * there are a few variables are used here
- * keycode, scancode, led id
- *
- * scancode relates to actual physical key press
- *
- * keycode is software key press, or scancode with modifiers (shift, ctrl, alt, etc.),
- * keycode with the value less than 255 are usually the same with scan code (I hope so)
- *
- * the led pattern are running based on led id, because led on the keyboard
- * are not limited to keys only
- */
-led_info_t* get_led_info_by_scancode(uint16_t scancode){
-    static bool init = false;
-    static led_info_t* scancode_to_led_info[MAX_CACHED_SCAN_CODE + 1];
-    if(!init){
-        for(int i = 1; i <= MAX_LED_ID_WITH_SCANCODE; ++i){
-            uint16_t scan = led_info[i].scan;
-            if(scan <= MAX_CACHED_SCAN_CODE){
-                scancode_to_led_info[scan] = (led_info + i);
-            }
-        }
-        init = true;
-    }
-
-    if(scancode <= MAX_CACHED_SCAN_CODE){
-        return scancode_to_led_info[scancode];
-    } else if(scancode == FN_KEY_SCAN_CODE){ // FN
-        return (led_info + FN_KEY_LED_ID);
-    }
-    return led_info;
-}
-
-
-
-void init_led_info(void){
-    for(int i = 1; i <= MAX_LED_ID; ++i){
-        led_info_t *entry1 = led_info + i;
-        for(int j = i; j <= MAX_LED_ID; ++j){
-            led_info_t *entry2 = led_info + j;
-            /**
-             * distance is tripled because
-             * convertion from float to int reduces accuracy
-             *
-             */
-            uint8_t distance = (uint8_t)sqrtf(
-                    powf(entry1->x - entry2->x, 2.0) +
-                    powf(entry1->y - entry2->y, 2.0)) *
-                    DISTANCE_NORAMLIZING_PARAMETER;
-            entry1->distance_to[j] = distance;
-            entry2->distance_to[i] = distance;
-        }
-    }
-};
-
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-    init_led_info();
-};
-
-typedef struct keystroke_s {
-    uint16_t scancode;
-    uint32_t timer;
-    bool active;
-} keystroke_t;
-
-#define MAX_ACTIVE_KEYSTORKES 10
-keystroke_t ACTIVE_KEYSTROKES[MAX_ACTIVE_KEYSTORKES];
-
-void reset_led_for_instruction(int led_instruction_index){
-    led_instructions[led_instruction_index].id0 = 0;
-    led_instructions[led_instruction_index].id1 = 0;
-    led_instructions[led_instruction_index].id2 = 0;
-    led_instructions[led_instruction_index].id3 = 0;
-};
-void add_led_to_instruction(int led_instruction_index, int led_id){
-    if(32 >= led_id && led_id >= 1){
-        led_instructions[led_instruction_index].id0 += ( 1 << (led_id - 1) );
-    } else if(64 >= led_id){
-        led_instructions[led_instruction_index].id1 += ( 1 << (led_id - 33) );
-    } else if(96 >= led_id){
-        led_instructions[led_instruction_index].id2 += ( 1 << (led_id - 65) );
-    } else if(128 >= led_id){
-        led_instructions[led_instruction_index].id3 += ( 1 << (led_id - 97) );
-    }
-};
-
-
-void wave_effect(void);
-void set_wave_color(int);
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    wave_effect();
-    set_wave_color(USER_CONFIG.PATTERN_INDEX);
-};
-
-
-#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSFT) || get_mods() & MOD_BIT(KC_RSFT))
-#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTL))
-#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
-
-void register_keystroke(uint16_t keycode){
-    if(get_led_info_by_scancode(keycode)->id){
-        uint32_t oldest_keystroke_lifespan = 0;
-        int8_t oldest_keystroke_index = -1;
-        bool registered = false;
-
-        keystroke_t *keystroke = ACTIVE_KEYSTROKES;
-        for(int i = 0; i < MAX_ACTIVE_KEYSTORKES; ++i){
-            if(!keystroke->active){
-                keystroke->scancode = keycode;
-                keystroke->timer = timer_read32();
-                keystroke->active = true;
-                registered = true;
-                break;
-            }
-
-            uint32_t lifespan = timer_elapsed32(keystroke->timer);
-            if(lifespan > oldest_keystroke_lifespan){
-                oldest_keystroke_index = i;
-                oldest_keystroke_lifespan = lifespan;
-            }
-
-            ++keystroke;
-        }
-
-        // override the oldest keystroke
-        if(!registered){
-            keystroke = ACTIVE_KEYSTROKES + oldest_keystroke_index;
-            keystroke->scancode = keycode;
-            keystroke->timer = timer_read32();
-            keystroke->active = true; // presumably active already
-        }
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        case L_BRI:
-            if (record->event.pressed) {
-                if (LED_GCR_STEP > LED_GCR_MAX - gcr_desired) gcr_desired = LED_GCR_MAX;
-                else gcr_desired += LED_GCR_STEP;
-                if (led_animation_breathing) gcr_breathe = gcr_desired;
-            }
-            return false;
-        case L_BRD:
-            if (record->event.pressed) {
-                if (LED_GCR_STEP > gcr_desired) gcr_desired = 0;
-                else gcr_desired -= LED_GCR_STEP;
-                if (led_animation_breathing) gcr_breathe = gcr_desired;
-            }
-            return false;
-        case L_PTN:
-            if (record->event.pressed) {
-                if (led_animation_id == led_setups_count - 1) led_animation_id = 0;
-                else led_animation_id++;
-            }
-            return false;
-        case L_PTP:
-            if (record->event.pressed) {
-                if (led_animation_id == 0) led_animation_id = led_setups_count - 1;
-                else led_animation_id--;
-            }
-            return false;
-        case L_PSI:
-            if (record->event.pressed) {
-                led_animation_speed += ANIMATION_SPEED_STEP;
-            }
-            return false;
-        case L_PSD:
-            if (record->event.pressed) {
-                led_animation_speed -= ANIMATION_SPEED_STEP;
-                if (led_animation_speed < 0) led_animation_speed = 0;
-            }
-            return false;
-        case L_T_MD:
-            if (record->event.pressed) {
-                led_lighting_mode++;
-                if (led_lighting_mode > LED_MODE_MAX_INDEX) led_lighting_mode = LED_MODE_NORMAL;
-            }
-            return false;
-        case L_T_ONF:
-            if (record->event.pressed) {
-                led_enabled = !led_enabled;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case L_ON:
-            if (record->event.pressed) {
-                led_enabled = 1;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case L_OFF:
-            if (record->event.pressed) {
-                led_enabled = 0;
-                I2C3733_Control_Set(led_enabled);
-            }
-            return false;
-        case L_T_BR:
-            if (record->event.pressed) {
-                led_animation_breathing = !led_animation_breathing;
-                if (led_animation_breathing) {
-                    gcr_breathe = gcr_desired;
-                    led_animation_breathe_cur = BREATHE_MIN_STEP;
-                    breathe_dir = 1;
-                }
-            }
-            return false;
-        case L_T_PTD:
-            if (record->event.pressed) {
-                led_animation_direction = !led_animation_direction;
-            }
-            return false;
-        case U_T_AGCR:
-            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
-                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
-            }
-            return false;
-        case DBG_TOG:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
-            }
-            return false;
-        case DBG_MTRX:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
-            }
-            return false;
-        case DBG_KBD:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
-            }
-            return false;
-        case DBG_MOU:
-            if (record->event.pressed) {
-                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
-            }
-            return false;
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-
-
-
-        case S_RESET:
-            // reset all parameters
-
-            USER_CONFIG.PATTERN_INDEX = 1;
-            USER_CONFIG.WAVE_WIDTH = 10;
-            USER_CONFIG.WAVE_SPEED = 15;
-            USER_CONFIG.COLOR_PATTERN_INDEX = 0;
-            USER_CONFIG.TRAVEL_DISTANCE = 25;
-
-            return false;
-        case L_SP_PR: // previous dripple pattern
-        case L_SP_NE: // next dripple pattern
-            if (record->event.pressed) {
-#define PATTERN_COUNT 7
-                uint8_t incre = keycode == L_SP_PR ? PATTERN_COUNT-1 : 1;
-                USER_CONFIG.PATTERN_INDEX += incre;
-                USER_CONFIG.PATTERN_INDEX %= PATTERN_COUNT;
-
-                if(USER_CONFIG.PATTERN_INDEX <= 4){
-                    USER_CONFIG.TRAVEL_DISTANCE = 25;
-                    USER_CONFIG.COLOR_PATTERN_INDEX = 0;
-                    USER_CONFIG.WAVE_SPEED = 10;
-                }
-
-                switch(USER_CONFIG.PATTERN_INDEX){
-                case 0: // None
-                    break;
-                case 1: // background off, wave on
-                    USER_CONFIG.WAVE_WIDTH = 2;
-                    break;
-                case 2: // background on, wave off
-                    USER_CONFIG.WAVE_WIDTH = 5;
-                    break;
-                case 3: // background off, rainbow wave
-                    USER_CONFIG.WAVE_WIDTH = 10;
-                    break;
-                case 4: // background on, rainbow wave
-                    USER_CONFIG.WAVE_WIDTH = 10;
-                    break;
-                case 5:
-                    USER_CONFIG.WAVE_WIDTH = 10;
-
-                    USER_CONFIG.COLOR_PATTERN_INDEX = 2;
-                    USER_CONFIG.TRAVEL_DISTANCE = 0;
-                    USER_CONFIG.WAVE_SPEED = 10;
-                    break;
-                case 6:
-                    USER_CONFIG.WAVE_WIDTH = 10;
-
-                    USER_CONFIG.COLOR_PATTERN_INDEX = 3;
-                    USER_CONFIG.TRAVEL_DISTANCE = 2;
-                    USER_CONFIG.WAVE_SPEED = 10;
-                    break;
-                }
-
-                // remove effect after changing pattern
-                for(int i = 0; i < MAX_ACTIVE_KEYSTORKES; ++i){
-                    ACTIVE_KEYSTROKES[i].active = 0;
-                }
-            }
-            return false;
-        case L_SP_WD:
-        case L_SP_NW:
-            if(record->event.pressed){
-                short incre = keycode == L_SP_WD ? 1 : -1;
-                USER_CONFIG.WAVE_WIDTH += incre;
-                if(USER_CONFIG.WAVE_WIDTH < 1){
-                    USER_CONFIG.WAVE_WIDTH = 1;
-                }
-            }
-            return false;
-        case L_SP_FA:
-        case L_SP_SL:
-            if(record->event.pressed){
-                short incre = keycode == L_SP_FA ? -1 : 1;
-
-                USER_CONFIG.WAVE_SPEED += incre;
-                if(USER_CONFIG.WAVE_SPEED > 50){
-                    USER_CONFIG.WAVE_SPEED = 50;
-                } else if(USER_CONFIG.WAVE_SPEED < 1){
-                    USER_CONFIG.WAVE_SPEED = 1;
-                }
-            }
-            return false;
-        // these are the keys not in range 0x04 - 0x52
-        case L_CP_PR:
-        case L_CP_NX:
-            if(record->event.pressed){
-                uint8_t incre = keycode == L_CP_PR ? COLOR_PATTERNS_COUNT - 1 : 1;
-                USER_CONFIG.COLOR_PATTERN_INDEX += incre;
-                USER_CONFIG.COLOR_PATTERN_INDEX %= COLOR_PATTERNS_COUNT;
-                set_wave_color(USER_CONFIG.COLOR_PATTERN_INDEX);
-            }
-            return false;
-
-        default:
-
-
-            if(record->event.pressed){
-                register_keystroke(keycode);
-
-#ifdef CONSOLE_ENABLE
-                led_info_t *entry = get_led_info_by_scancode(keycode);
-                uprintf(("KL: kc: %u, led id: %u, x: %f, y: %f, "
-                        "col: %u, row: %u, pressed: %u, time: %u\n"),
-                        keycode, entry->id, entry->x, entry->y,
-                        record->event.key.col, record->event.key.row,
-                        record->event.pressed, record->event.time);
-#endif
-            }
-            return true; //Process all other keycodes normally
-    }
-}
-
-led_instruction_t led_instructions[] = {
-    //LEDs are normally inactive, no processing is performed on them
-    //Flags are used in matching criteria for an LED to be active and indicate how to color it
-    //Flags can be found in tmk_core/protocol/arm_atsam/md_rgb_matrix.h (prefixed with LED_FLAG_)
-    //LED IDs can be found in config_led.h in the keyboard's directory
-    //Examples are below
-
-    //All LEDs use the user's selected pattern (this is the factory default)
-    { .flags = LED_FLAG_USE_ROTATE_PATTERN },
-
-    //Specific LEDs use the user's selected pattern while all others are off
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_ROTATE_PATTERN, .id0 = 0xFFFFFFFF, .id1 = 0xAAAAAAAA, .id2 = 0x55555555, .id3 = 0x11111111 },
-
-    //Specific LEDs use specified RGB values while all others are off
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0xFF, .id1 = 0x00FF, .id2 = 0x0000FF00, .id3 = 0xFF000000, .r = 75, .g = 150, .b = 225 },
-
-    //All LEDs use the user's selected pattern
-    //On layer 1, all key LEDs (except the top row which keeps active pattern) are red while all edge LEDs are green
-    //When layer 1 is active, key LEDs use red    (id0  32 -  17: 1111 1111 1111 1111 0000 0000 0000 0000 = 0xFFFF0000) (except top row 16 - 1)
-    //When layer 1 is active, key LEDs use red    (id1  64 -  33: 1111 1111 1111 1111 1111 1111 1111 1111 = 0xFFFFFFFF)
-    //When layer 1 is active, key LEDs use red    (id2  87 -  65: 0000 0000 0111 1111 1111 1111 1111 1111 = 0x007FFFFF)
-    //When layer 1 is active, edge LEDs use green (id2  95 -  88: 1111 1111 1000 0000 0000 0000 0000 0000 = 0xFF800000)
-    //When layer 1 is active, edge LEDs use green (id3 119 -  96: 0000 0000 1111 1111 1111 1111 1111 1111 = 0x00FFFFFF)
-    // { .flags = LED_FLAG_USE_ROTATE_PATTERN },
-
-    #define WAVE_LED_INSTRUCTION_START 1
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0, .id1 = 0, .id2 = 0, .g = 255 },
-    #define WAVE_LED_INSTRUCTION_END 18
-
-    //All key LEDs use red while edge LEDs use the active pattern
-    //All key LEDs use red     (id0  32 -   1: 1111 1111 1111 1111 1111 1111 1111 1111 = 0xFFFFFFFF)
-    //All key LEDs use red     (id1  64 -  33: 1111 1111 1111 1111 1111 1111 1111 1111 = 0xFFFFFFFF)
-    //All key LEDs use red     (id2  87 -  65: 0000 0000 0111 1111 1111 1111 1111 1111 = 0x007FFFFF)
-    //Edge uses active pattern (id2  95 -  88: 1111 1111 1000 0000 0000 0000 0000 0000 = 0xFF800000)
-    //Edge uses active pattern (id3 119 -  96: 0000 0000 1111 1111 1111 1111 1111 1111 = 0x00FFFFFF)
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0x007FFFFF, .r = 255 },
-    // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_ROTATE_PATTERN , .id2 = 0xFF800000, .id3 = 0x00FFFFFF },
-
-     { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB | LED_FLAG_MATCH_LAYER,
-     .id1 = 0b00001111001111000000011110011110,
-     .r = 0, .g = 255, .b = 60, .layer = 2 },
-
-    //end must be set to 1 to indicate end of instruction set
-     { .end = 1 }
-};
-
-
-void set_wave_color(int color_pattern_index){
-    for(int i = WAVE_LED_INSTRUCTION_START; i < WAVE_LED_INSTRUCTION_END; ++i){
-        for(int j = 0; j < COLOR_PATTERN_RGB_COUNT; ++j){
-            led_instructions[i].r = COLOR_PATTERNS[color_pattern_index][i][0];
-            led_instructions[i].g = COLOR_PATTERNS[color_pattern_index][i][1];
-            led_instructions[i].b = COLOR_PATTERNS[color_pattern_index][i][2];
-        }
-    }
-};
-
-void wave_effect(void){
-    for(int i = WAVE_LED_INSTRUCTION_START; i < WAVE_LED_INSTRUCTION_END; ++i){
-        reset_led_for_instruction(i);
-    }
-    int wave_led_instruction_span = WAVE_LED_INSTRUCTION_END - WAVE_LED_INSTRUCTION_START;
-
-
-    keystroke_t *keystroke = ACTIVE_KEYSTROKES;
-    for(int i = 0; i < MAX_ACTIVE_KEYSTORKES; ++i, ++keystroke){
-        if(!keystroke->active) continue;
-        bool active = false;
-
-        uint16_t keystroke_led_id = get_led_info_by_scancode(keystroke->scancode)->id;
-
-        float elapsed_s = timer_elapsed32(keystroke->timer) / 1000.0f;
-        float travel = elapsed_s * USER_CONFIG.WAVE_SPEED;
-
-        for(uint16_t id = 1; id <= MAX_LED_ID; ++id){
-            float normalized_distance =
-                    led_info[id].distance_to[keystroke_led_id] /
-                    (float)DISTANCE_NORAMLIZING_PARAMETER;
-
-            if(travel >= normalized_distance && travel - normalized_distance >= 0 &&
-                    normalized_distance >= travel - USER_CONFIG.WAVE_WIDTH){
-                int portion = (travel - normalized_distance) *
-                        wave_led_instruction_span / USER_CONFIG.WAVE_WIDTH;
-                add_led_to_instruction(portion, id);
-
-                active = true;
-            }
-        }
-
-        keystroke->active = active;
-    }
-};
diff --git a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/rules.mk b/keyboards/massdrop/ctrl/keymaps/responsive_pattern/rules.mk
deleted file mode 100644
index 064a6f54c1f..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/responsive_pattern/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This keymap requires Massdrop Configurator support
-OPT_DEFS += -DUSE_MASSDROP_CONFIGURATOR
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
deleted file mode 100644
index 0c08219181e..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2022 Daniel Weeks (@xanimos)
-  *
-  * 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 MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-#define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
-#define MODS_ALT    (get_mods() & MOD_MASK_ALT)
-
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
-
-// #define NO_DEBUG                    // Disable debugging
-// #define NO_PRINT                    // Disable printing/debugging using hid_listen
-// #define NO_ACTION_LAYER             // Disable layers
-// #define NO_ACTION_TAPPING           // Disable tap dance and other tapping features
-// #define NO_ACTION_ONESHOT           // Disable one-shot modifiers
-// #define NO_ACTION_MACRO             // Disable old style macro handling: MACRO() & action_get_macro
-#define TERMINAL_HELP
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 10
-#define MOUSEKEY_WHEEL_DELAY 0
-#define FORCE_NKRO                  // NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-// #define STRICT_LAYER_RELEASE        // Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
-// #define LOCKING_SUPPORT_ENABLE      // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-// #define LOCKING_RESYNC_ENABLE       // Tries to keep switch state consistent with keyboard LED state
-#define TAPPING_TERM 200            // How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-// #define TAPPING_TERM_PER_KEY        // Enables handling for per key TAPPING_TERM settings
-// #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-#define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
-// #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-// #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-// #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
-// #define LEADER_KEY_STRICT_KEY_PROCESSING    // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-// #define ONESHOT_TIMEOUT 300         // How long before oneshot times out
-// #define ONESHOT_TAP_TOGGLE 2        // How many taps before oneshot toggle is triggered
-// #define COMBO_TERM 200              // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-// #define TAP_CODE_DELAY 100          // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES         // reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
-// #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
-// #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
-// #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
-// #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
-// #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 1000     // How long to wait between light changes for the "Christmas" animation, in milliseconds
-// #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 2            // The number of LEDs to group the red/green colors by for the "Christmas" animation
-#define RGBLIGHT_EFFECT_KNIGHT_LED_NUM RGBLED_NUM   // The number of LEDs to have the "Knight" animation travel
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3             // The number of LEDs to light up for the "Knight" animation
-#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 0             // The number of LEDs to start the "Knight" animation from the start of the strip by
-// #define RGBLIGHT_RAINBOW_SWIRL_RANGE 255            // Range adjustment for the rainbow swirl effect to get different swirls
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 4              // The number of LEDs to light up for the "Snake" animation
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
-// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN              // Static gradient top to bottom, speed controls how much gradient changes
-#undef ENABLE_RGB_MATRIX_BREATHING               // Single hue brightness cycling animation
-#undef ENABLE_RGB_MATRIX_BAND_SAT                // Single hue band fading saturation scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_VAL                // Single hue band fading brightness scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT       // Single hue 3 blade spinning pinwheel fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL       // Single hue 3 blade spinning pinwheel fades brightness
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT         // Single hue spinning spiral fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL         // Single hue spinning spiral fades brightness
-// #undef ENABLE_RGB_MATRIX_CYCLE_ALL               // Full keyboard solid hue cycling through full gradient
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT        // Full gradient scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN           // Full gradient scrolling top to bottom
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN            // Full gradient scrolling out to in
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL       // Full dual gradients scrolling out to in
-// #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradent Chevron shapped scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL          // Full gradient spinning pinwheel around center of keyboard
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL            // Full gradient spinning spiral around center of keyboard
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON             // Full gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON          // Full tighter gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS       // Full dual gradients spinning two halfs of keyboard
-// #undef ENABLE_RGB_MATRIX_RAINDROPS                     // Randomly changes a single key's hue
-// #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS           // Randomly changes a single key's hue and saturation
-// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
-// #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN  // That famous computer simulation
-// =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE                // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE      // Pulses keys hit to hue & value then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE        // Hue & value pulse near a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE   // Hue & value pulse near multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS       // Hue & value pulse the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS  // Hue & value pulse the same column and row of multiple key hits then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS       // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS  // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-// #undef ENABLE_RGB_MATRIX_SPLASH                     // Full gradient & value pulse away from a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_MULTISPLASH                // Full gradient & value pulse away from multiple key hits then fades value out
-// #undef ENABLE_RGB_MATRIX_SOLID_SPLASH               // Hue & value pulse away from a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH          // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c b/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c
deleted file mode 100644
index 6d6338073d2..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config_led.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright 2022 Daniel Weeks (@xanimos)
-  *
-  * 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/>.
-  */
-
-#ifdef RGB_MATRIX_ENABLE
-#include "ctrl.h"
-
-#include "md_rgb_matrix.h"
-#include "rgb_matrix.h"
-#include "config_led.h"
-
-led_config_t g_led_config = { {
-    {   0,   1,   2,   3,   4,   5,   6,   7 },
-    {  16,  17,  18,  19,  20,  21,  22,  23 },
-    {  33,  34,  35,  36,  37,  38,  39,  40 },
-    {  50,  51,  52,  53,  54,  55,  56,  57 },
-    {  63,  64,  65,  66,  67,  68,  69,  70 },
-    {  76,  77,  78,  79,  80,  81,  82,  83 },
-    {   8,   9,  10,  11,  12,  13,  14,  15 },
-    {  24,  25,  26,  27,  28,  29,  30,  31 },
-    {  41,  42,  43,  44,  45,  46,  47,  48 },
-    {  58,  59,  60,  61,  62,  75,  49,  32 },
-    {  71,  72,  73,  74,  84,  85,  86, NO_LED }
-}, {
-  // 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_SCRL, KC_PAUS
-    {   7,   5 }, {  31,   5 }, {  43,   5 }, {  55,   5 }, {  67,   5 }, {  85,   5 }, {  97,   5 }, { 109,   5 },
-    { 121,   5 }, { 139,   5 }, { 151,   5 }, { 163,   5 }, { 175,   5 }, { 193,   5 }, { 205,   5 }, { 217,   5 },
-  // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
-    {   7,  20 }, {  19,  20 }, {  31,  20 }, {  43,  20 }, {  55,  20 }, {  67,  20 }, {  79,  20 }, {  91,  20 },
-    { 103,  20 }, { 115,  20 }, { 127,  20 }, { 139,  20 }, { 151,  20 }, { 169,  20 }, { 193,  20 }, { 205,  20 },
-    { 217,  20 },
-  // KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN
-    {  10,  30 }, {  25,  30 }, {  37,  30 }, {  49,  30 }, {  61,  30 }, {  73,  30 }, {  85,  30 }, {  97,  30 },
-    { 109,  30 }, { 121,  30 }, { 133,  30 }, { 145,  30 }, { 157,  30 }, { 172,  30 }, { 193,  30 }, { 205,  30 },
-    { 217,  30 },
-  // 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
-    {  11,  39 }, {  28,  39 }, {  40,  39 }, {  52,  39 }, {  64,  39 }, {  76,  39 }, {  88,  39 }, { 100,  39 },
-    { 112,  39 }, { 124,  39 }, { 136,  39 }, { 148,  39 }, { 168,  39 },
-  // 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
-    {  14,  49 }, {  34,  49 }, {  46,  49 }, {  58,  49 }, {  70,  49 }, {  82,  49 }, {  94,  49 }, { 106,  49 },
-    { 118,  49 }, { 130,  49 }, { 142,  49 }, { 165,  49 }, { 205,  49 },
-  // KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    {   8,  59 }, {  23,  59 }, {  38,  59 }, {  83,  59 }, { 129,  59 }, { 144,  59 }, { 159,  59 }, { 174,  59 },
-    { 193,  59 }, { 205,  59 }, { 217,  59 },
-  // Underglow / Border
-    { 224,  64 }, { 204,  64 }, { 186,  64 }, { 167,  64 }, { 149,  64 }, { 130,  64 }, { 112,  64 }, {  94,  64 },
-    {  75,  64 }, {  57,  64 }, {  38,  64 }, {  20,  64 }, {   0,  64 }, {   0,  47 }, {   0,  32 }, {   0,  17 },
-    {   0,   0 }, {  20,   0 }, {  38,   0 }, {  57,   0 }, {  75,   0 }, {  94,   0 }, { 112,   0 }, { 130,   0 },
-    { 149,   0 }, { 167,   0 }, { 186,   0 }, { 204,   0 }, { 224,   0 }, { 224,  17 }, { 224,  32 }, { 224,  47 }
-}, {
-  // 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_SCRL, KC_PAUS
-    1, 4, 4, 4, 4, 1, 1, 1,
-    1, 4, 4, 4, 4, 1, 1, 1,
-  // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
-    4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 1, 1, 1,
-    1,
-  // KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN
-    1, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 1, 1,
-    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
-    1, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 1,
-  // 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
-    1, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 1, 1,
-  // KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    1, 1, 1, 4, 1, 1, 1, 1,
-    1, 1, 1,
-  // Underglow / Border
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2
-} };
-
-
-#ifdef USB_LED_INDICATOR_ENABLE
-bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
-    md_rgb_matrix_indicators_advanced(led_min, led_max);
-    return rgb_matrix_indicators_advanced_user(led_min, led_max);
-}
-#endif // USB_LED_INDICATOR_ENABLE
-
-#endif
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
deleted file mode 100644
index 5d95018dbc4..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c
+++ /dev/null
@@ -1,517 +0,0 @@
-/* Copyright 2022 Daniel Weeks (@xanimos)
-  *
-  * 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 <string.h>
-
-#define MILLISECONDS_IN_SECOND 1000
-
-// These are just to make it neater to use builtin HSV values in the keymap
-#define RED {HSV_RED}
-#define CORAL {HSV_CORAL}
-#define ORANGE {HSV_ORANGE}
-#define GOLDEN {HSV_GOLDENROD}
-#define GOLD {HSV_GOLD}
-#define YELLOW {HSV_YELLOW}
-#define CHART {HSV_CHARTREUSE}
-#define GREEN {HSV_GREEN}
-#define SPRING {HSV_SPRINGGREEN}
-#define TURQ {HSV_TURQUOISE}
-#define TEAL {HSV_TEAL}
-#define CYAN {HSV_CYAN}
-#define AZURE {HSV_AZURE}
-#define BLUE {HSV_BLUE}
-#define PURPLE {HSV_PURPLE}
-#define MAGENT {HSV_MAGENTA}
-#define PINK {HSV_PINK}
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-#define RGB_DEFAULT_TIME_OUT 30
-#define RGB_FAST_MODE_TIME_OUT 3
-#define RGB_TIME_OUT_MAX 600
-#define RGB_TIME_OUT_MIN 10
-#define RGB_TIME_OUT_STEP 10
-
-extern rgb_config_t rgb_matrix_config;
-bool disable_layer_color;
-
-bool rgb_enabled_flag;                  // Current LED state flag. If false then LED is off.
-bool rgb_time_out_enable;               // Idle LED toggle enable. If false then LED will not turn off after idle timeout.
-bool rgb_time_out_fast_mode_enabled;    // Enable flag for RGB timeout fast mode
-bool rgb_time_out_user_value;           // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable.
-uint16_t rgb_time_out_seconds;          // Idle LED timeout value, in seconds not milliseconds
-uint16_t rgb_time_out_saved_seconds;    // The saved user config for RGB timeout period
-led_flags_t rgb_time_out_saved_flag;    // Store LED flag before timeout so it can be restored when LED is turned on again.
-
-enum layout_names {
-    _KL=0,       // Keys Layout: The main keyboard layout that has all the characters
-    _FL,         // Function Layout: The function key activated layout with default functions and some added ones
-    _GL,         // GIT Layout: GIT shortcuts and macros
-    _NUMPAD,     // Numpad Layout: Adds a numpad to the keys
-};
-
-// Tap Dance keycodes
-enum td_keycodes {
-    TD_FN_SWITCH = 0
-};
-
-// Define a type containing as many tapdance states as you need
-typedef enum {
-    TD_NONE,
-    TD_UNKNOWN,
-    TD_SINGLE_HOLD,
-    TD_DOUBLE_HOLD
-} td_state_t;
-
-typedef struct {
-    bool is_press_action;
-    td_state_t state;
-} td_tap_t;
-
-// Declare your tapdance functions:
-
-// Function to determine the current tapdance state
-td_state_t cur_dance(tap_dance_state_t *state);
-
-// `finished` and `reset` functions for each tapdance keycode
-void fn_tap_finished(tap_dance_state_t *state, void *user_data);
-void fn_tap_reset(tap_dance_state_t *state, void *user_data);
-
-enum ctrl_keycodes {
-    MD_BOOT = SAFE_RANGE,  // Restart into bootloader after hold timeout
-    ROUT_TG,               // Timeout Toggle. Toggle idle LED time out on or off
-    ROUT_VI,               // Timeout Value Increase. Increase idle time out before LED disabled
-    ROUT_VD,               // Timeout Value Decrease. Decrease idle time out before LED disabled
-    ROUT_FM,               // RGB timeout fast mode toggle
-    TOG_NPD,               // Toggle Numpad On/Off
-    COPY_ALL,              // Copy all text using ctrl(a+c)
-};
-
-enum string_macro_keycodes {
-    // The start of this enum should always be equal to end of ctrl_keycodes + 1
-    G_INIT = COPY_ALL + 1, // git init
-    G_CLONE,               // git clone
-    G_ADD,                 // git add
-    G_DIFF,                // git diff
-    G_RESET,               // git reset --soft
-    G_BRANH,               // git branch list
-    G_CHECK,               // git checkout
-    G_REMTE,               // git remote add
-    G_FETCH,               // git fetch
-    G_PULL,                // git pull
-    G_PUPST,               // git pull upstream
-    G_PUSH,                // git push
-    G_PSORG,               // git push -u origin
-    G_PSFWL,               // git push --force-with-lease
-    G_COMM,                // git commit
-    G_COMSG,               // git commit -m ": [TFS-]"
-    G_STAT,                // git status
-    G_LOG,                 // git log
-};
-
-static uint16_t idle_timer;             // Idle LED timeout timer
-static uint8_t idle_second_counter;     // Idle LED seconds counter, counts seconds not milliseconds
-static uint8_t key_event_counter;       // This counter is used to check if any keys are being held
-
-static const char * sendstring_commands[] = {
-    "git init",
-    "git clone ",
-    "git add ",
-    "git diff ",
-    "git reset --soft ",
-    "git branch --list",
-    "git checkout ",
-    "git remote add ",
-    "git fetch ",
-    "git pull",
-    "git pull upstream ",
-    "git push",
-    "git push -u origin ",
-    "git push --force-with-lease",
-    "git commit ",
-    "git commit -m \": [TFS-]\"",
-    "git status",
-    "git log",
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_KL] = LAYOUT(
-    //    ESC       F1       F2       F3       F4       F5       F6       F7       F8       F9       F10     F11      F12              PRINT    SCLCK    PAUSE
-        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_SCRL,RCS(KC_M),
-    //     ~        1        2        3        4        5        6        7        8        9        0        -        =      BCKSP     INS      HOME     PGUP
-        KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  , KC_MINS,  KC_EQL, KC_BSPC, KC_INS , KC_HOME, KC_PGUP,
-    //    TAB       Q        W        E        R        T        Y        U        I        O        P        [        ]        \       DEL      END      PGDN
-        KC_TAB ,  KC_Q  ,  KC_W  ,  KC_E  ,  KC_R  ,  KC_T  ,  KC_Y  ,  KC_U  ,  KC_I  ,  KC_O  ,  KC_P  , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END , KC_PGDN,
-    //   CAPS       A        S        D        F        G        H        J        K        L        ;        '      ENTER
-        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 ,
-    //   SHIFT      Z        X        C        V        B        N        M        ,        .        /      RSHIFT                               UP
-        SC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,  KC_N  ,  KC_M  , KC_COMM, KC_DOT , KC_SLSH, SC_RSPC,                             KC_UP ,
-    //   CTRL      GUI      ALT                       SPACE                               RALT     MENU     RGUI     RCTRL             LEFT     DOWN     RIGHT
-       KC_LCTL,  KC_LGUI, KC_LALT,                    KC_SPC,                   TD(TD_FN_SWITCH), KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FL] = LAYOUT(
-    //    ESC       F1       F2       F3       F4       F5       F6       F7       F8       F9       F10     F11      F12              PRINT    SCLCK    PAUSE
-        _______, ROUT_TG, ROUT_FM, ROUT_VD, ROUT_VI, _______, _______, _______, _______, _______, _______, KC_WAKE, KC_SLEP,          KC_PAUS, _______, KC_MUTE,
-    //     ~        1        2        3        4        5        6        7        8        9        0        -        =      BCKSP     INS      HOME     PGUP
-        RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPLY, KC_VOLU,
-    //    TAB       Q        W        E        R        T        Y        U        I        O        P        [        ]        \       DEL      END      PGDN
-        _______, RGB_MOD, RGB_SPI, RGB_VAI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD,
-    //   CAPS       A        S        D        F        G        H        J        K        L        ;        '      ENTER
-        _______,RGB_RMOD, RGB_SPD, RGB_VAD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
-    //   SHIFT      Z        X        C        V        B        N        M        ,        .        /      RSHIFT                               UP
-        _______, _______, _______,COPY_ALL, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______, TOG_NPD,                            KC_BRIU,
-    //   CTRL      GUI      ALT                       SPACE                               RALT     MENU     RGUI     RCTRL             LEFT     DOWN     RIGHT
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, KC_BRID, _______
-    ),
-    [_GL] = LAYOUT(
-    //    ESC       F1       F2       F3       F4       F5       F6       F7       F8       F9       F10     F11      F12              PRINT    SCLCK    PAUSE
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-    //     ~        1        2        3        4        5        6        7        8        9        0        -        =      BCKSP     INS      HOME     PGUP
-         G_INIT, G_CLONE, G_REMTE, G_RESET, G_PSFWL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    //    TAB       Q        W        E        R        T        Y        U        I        O        P        [        ]        \       DEL      END      PGDN
-        _______, G_PUPST,  G_PULL, G_PSORG,  G_PUSH, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    //   CAPS       A        S        D        F        G        H        J        K        L        ;        '      ENTER
-        _______,   G_ADD,  G_STAT,  G_DIFF, G_FETCH, _______, _______, _______, _______, _______, _______, _______, _______,
-    //   SHIFT      Z        X        C        V        B        N        M        ,        .        /      RSHIFT                               UP
-        _______,   G_LOG, G_CHECK,  G_COMM, G_COMSG, G_BRANH, _______, _______, _______, _______, _______, _______,                            _______,
-    //   CTRL      GUI      ALT                       SPACE                               RALT     MENU     RGUI     RCTRL             LEFT     DOWN     RIGHT
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    [_NUMPAD] = LAYOUT(
-    //    ESC       F1       F2       F3       F4       F5       F6       F7       F8       F9       F10     F11      F12              PRINT    SCLCK    PAUSE
-        TOG_NPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-    //     ~        1        2        3        4        5        6        7        8        9        0        -        =      BCKSP     INS      HOME     PGUP
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    //    TAB       Q        W        E        R        T        Y        U        I        O        P        [        ]        \       DEL      END      PGDN
-        _______, _______, _______, _______, _______, _______,   KC_P7,   KC_P8,   KC_P9, _______, _______, _______, _______, _______, _______, _______, _______,
-    //   CAPS       A        S        D        F        G        H        J        K        L        ;        '      ENTER
-        _______, _______, _______, _______, _______, _______,   KC_P4,   KC_P5,   KC_P6, _______, _______, _______, _______,
-    //   SHIFT      Z        X        C        V        B        N        M        ,        .        /      RSHIFT                               UP
-        _______, _______, _______, _______, _______,   KC_P1,   KC_P2,   KC_P3, KC_PDOT, _______, _______, _______,                            _______,
-    //   CTRL      GUI      ALT                       SPACE                               RALT     MENU     RGUI     RCTRL             LEFT     DOWN     RIGHT
-        _______, _______, _______,                     KC_P0,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    /*
-    [X] = LAYOUT(
-    //    ESC       F1       F2       F3       F4       F5       F6       F7       F8       F9       F10     F11      F12              PRINT    SCLCK    PAUSE
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-    //     ~        1        2        3        4        5        6        7        8        9        0        -        =      BCKSP     INS      HOME     PGUP
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    //    TAB       Q        W        E        R        T        Y        U        I        O        P        [        ]        \       DEL      END      PGDN
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    //   CAPS       A        S        D        F        G        H        J        K        L        ;        '      ENTER
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    //   SHIFT      Z        X        C        V        B        N        M        ,        .        /      RSHIFT                               UP
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
-    //   CTRL      GUI      ALT                       SPACE                               RALT     MENU     RGUI     RCTRL             LEFT     DOWN     RIGHT
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    */
-};
-
-#define __OFF__ {0, 0, 0}
-
-const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
-    [_FL] = {
-        //  These remain on base layer rgb to see adjustments ;)
-        //       |----------------------------------|
-    //  _______, ROUT_TG, ROUT_FM, ROUT_VD, ROUT_VI, _______, _______, _______, _______, _______, _______, KC_WAKE, KC_SLEP,          KC_PAUS, _______, KC_MUTE,
-        __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,  YELLOW,  YELLOW,           ORANGE, __OFF__,    GOLD,
-    //  RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPLY, KC_VOLU,
-           GOLD, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,     RED,  SPRING,  ORANGE,
-    //  _______, RGB_MOD, RGB_SPI, RGB_VAI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD,
-        __OFF__,  ORANGE,   GREEN,   AZURE,  GOLDEN,  MAGENT, __OFF__,   AZURE,   AZURE, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,    TEAL,    TEAL,  ORANGE,
-    //  _______,RGB_RMOD, RGB_SPD, RGB_VAD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
-        __OFF__,  ORANGE,   GREEN,   AZURE,  GOLDEN,  MAGENT, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,
-    //  _______, _______, _______,COPY_ALL, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______, TO(_NUMPAD),                        KC_BRIU,
-        __OFF__, __OFF__, __OFF__,   CORAL, __OFF__,     RED,    TURQ, __OFF__, __OFF__, __OFF__, __OFF__,    CYAN,                             SPRING,
-    //  _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, KC_BRID, _______
-        __OFF__, __OFF__, __OFF__,                   __OFF__,                            __OFF__, __OFF__, __OFF__, __OFF__,          __OFF__,  SPRING, __OFF__
-    },
-    [_GL] = {
-    //  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,          __OFF__, __OFF__, __OFF__,
-    //   G_INIT, G_CLONE, G_REMTE, G_RESET, G_PSFWL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-          AZURE,   CHART,   CHART,     RED,   CORAL, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,
-    //  _______, G_PUPST,  G_PULL, G_PSORG,  G_PUSH, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        __OFF__,    BLUE,  PURPLE,  MAGENT,    PINK, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,
-    //  _______,   G_ADD,  G_STAT,  G_DIFF, G_FETCH, _______, _______, _______, _______, _______, _______, _______, _______,
-        __OFF__,  SPRING,   GREEN,    TURQ,    TEAL, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,
-    //  _______,   G_LOG, G_CHECK,  G_COMM, G_COMSG, G_BRANH, _______, _______, _______, _______, _______, _______,                            _______,
-        __OFF__,    CYAN,  GOLDEN,  YELLOW,    GOLD,   CHART, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,                            __OFF__,
-    //  _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, _______, _______
-        __OFF__, __OFF__, __OFF__,                   __OFF__,                            __OFF__, __OFF__, __OFF__, __OFF__,          __OFF__, __OFF__, __OFF__
-    },
-    [_NUMPAD] = {
-    //  TO(_KL), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-            RED, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,          __OFF__, __OFF__, __OFF__,
-    //  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,
-    //  _______, _______, _______, _______, _______, _______,   KC_P7,   KC_P8,   KC_P9, _______, _______, _______, _______, _______, _______, _______, _______,
-        __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,   GREEN,   GREEN,   GREEN, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,
-    //  _______, _______, _______, _______, _______, _______,   KC_P4,   KC_P5,   KC_P6, _______, _______, _______, _______,
-        __OFF__, __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,    TURQ,    TURQ,    TURQ, __OFF__, __OFF__, __OFF__, __OFF__,
-    //  _______, _______, _______, _______, _______, _______,   KC_P1,   KC_P2,   KC_P3, KC_PDOT, _______, _______,                            _______,
-        __OFF__, __OFF__, __OFF__, __OFF__, __OFF__,    CYAN,    CYAN,    CYAN,   AZURE, __OFF__, __OFF__, __OFF__,                            __OFF__,
-    //  _______, _______, _______,                     KC_P0,                            _______, _______, _______, _______,          _______, _______, _______
-        __OFF__, __OFF__, __OFF__,                      CYAN,                            __OFF__, __OFF__, __OFF__, __OFF__,          __OFF__, __OFF__, __OFF__
-    },
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-    // Enable or disable debugging
-    debug_enable = false;
-    debug_matrix = false;
-    debug_keyboard = false;
-    debug_mouse = false;
-
-    idle_second_counter = 0;                            // Counter for number of seconds keyboard has been idle.
-    key_event_counter = 0;                              // Counter to determine if keys are being held, neutral at 0.
-    rgb_time_out_seconds = RGB_DEFAULT_TIME_OUT;        // RGB timeout initialized to its default configure in keymap.h
-    rgb_time_out_enable = false;                        // Disable RGB timeout by default. Enable using toggle key.
-    rgb_time_out_user_value = false;                    // Has to have the same initial value as rgb_time_out_enable.
-    rgb_enabled_flag = true;                            // Initially, keyboard RGB is enabled. Change to false config.h initializes RGB disabled.
-    rgb_time_out_fast_mode_enabled = false;             // RGB timeout fast mode disabled initially.
-    rgb_time_out_saved_flag = rgb_matrix_get_flags();   // Save RGB matrix state for when keyboard comes back from ide.
-};
-
-void keyboard_post_init_user(void) {
-    rgb_matrix_enable();
-}
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    if(rgb_time_out_enable && rgb_enabled_flag) {
-        // If the key event counter is not zero then some key was pressed down but not released, thus reset the timeout counter.
-        if (key_event_counter) {
-            idle_second_counter = 0;
-        } else if (timer_elapsed(idle_timer) > MILLISECONDS_IN_SECOND) {
-            idle_second_counter++;
-            idle_timer = timer_read();
-        }
-
-        if (idle_second_counter >= rgb_time_out_seconds) {
-            rgb_time_out_saved_flag = rgb_matrix_get_flags();
-            rgb_matrix_set_flags(LED_FLAG_NONE);
-            rgb_matrix_disable_noeeprom();
-            rgb_enabled_flag = false;
-            idle_second_counter = 0;
-        }
-    }
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    // Increment key event counter for every press and decrement for every release.
-    if (record->event.pressed) {
-        key_event_counter++;
-
-    } else {
-        key_event_counter--;
-    }
-
-    if (rgb_time_out_enable) {
-        idle_timer = timer_read();
-        // Reset the seconds counter. Without this, something like press> leave x seconds> press, would be x seconds on the effective counter not 0 as it should.
-        idle_second_counter = 0;
-        if (!rgb_enabled_flag) {
-            rgb_matrix_enable_noeeprom();
-            rgb_matrix_set_flags(rgb_time_out_saved_flag);
-            rgb_enabled_flag = true;
-        }
-    }
-
-    switch (keycode) {
-        case MD_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-    }
-
-    if (record->event.pressed) {
-        switch (keycode) {
-            case RGB_TOG:
-                rgb_time_out_enable = rgb_time_out_user_value;
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL: {
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                    }
-                    break;
-                    case LED_FLAG_UNDERGLOW: {
-                        // This line is for LED idle timer. It disables the toggle so you can turn off LED completely if you like
-                        rgb_time_out_enable = false;
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        rgb_matrix_disable_noeeprom();
-                    }
-                    break;
-                    default: {
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();
-                    }
-                    break;
-                }
-                return false;
-            // ======================================================== CUSTOM KEYCOADS BELOW ========================================================
-            case COPY_ALL:
-                // Selects all and text and copy
-                SEND_STRING(SS_LCTL("ac"));
-                return false;
-            case ROUT_TG:
-                // Toggle idle LED timeout on or off
-                rgb_time_out_enable = !rgb_time_out_enable;
-                rgb_time_out_user_value = rgb_time_out_enable;
-                return false;
-            case ROUT_VI:
-                // Increase idle LED timeout value in seconds
-                // Only increase if current value is lower than RGB_TIME_OUT_MAX. Don't care what value the result will be
-                // Modity RGB_TIME_OUT_STEP for bigger or smaller increments
-                if (!rgb_time_out_fast_mode_enabled && rgb_time_out_seconds <= RGB_TIME_OUT_MAX) {
-                    rgb_time_out_seconds += RGB_TIME_OUT_STEP;
-                }
-                return false;
-            case ROUT_VD:
-                // Decrease idle LED timeout value in seconds
-                // Only decrease if current value is higher than minimum value and the result is larger than zero
-                // Modity RGB_TIME_OUT_STEP for bigger or smaller decrements
-                if (!rgb_time_out_fast_mode_enabled && rgb_time_out_seconds > RGB_TIME_OUT_MIN) {
-                    rgb_time_out_seconds -= RGB_TIME_OUT_STEP;
-                }
-                return false;
-            case ROUT_FM:
-                if (rgb_time_out_fast_mode_enabled) {
-                    rgb_time_out_seconds = rgb_time_out_saved_seconds;
-                } else {
-                    rgb_time_out_saved_seconds = rgb_time_out_seconds;
-                    rgb_time_out_seconds = RGB_FAST_MODE_TIME_OUT;
-                }
-                rgb_time_out_fast_mode_enabled = !rgb_time_out_fast_mode_enabled;
-                return false;
-            case G_INIT ... G_LOG:
-                send_string_with_delay(sendstring_commands[keycode - G_INIT], 5);
-                return false;
-            case TOG_NPD:
-                if (get_highest_layer(layer_state) != _NUMPAD) {
-                    layer_move(_NUMPAD);
-                } else {
-                    layer_move(_KL);
-                }
-                return false;
-        }
-    }
-    return true;
-}
-
-void set_layer_color(int layer) {
-    if (layer == 0) { return; }
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        HSV hsv = {
-            .h = pgm_read_byte(&ledmap[layer][i][0]),
-            .s = pgm_read_byte(&ledmap[layer][i][1]),
-            .v = pgm_read_byte(&ledmap[layer][i][2]),
-        };
-        if (hsv.h || hsv.s || hsv.v) {
-            RGB rgb = hsv_to_rgb(hsv);
-            float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-            rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b);
-            continue;
-        }
-        if(layer == _FL && i <= 4 && i >= 1) {
-            continue; // Leave RGB for F1-F4 of function layer to adjust RGB settings
-        }
-
-        rgb_matrix_set_color(i, 0, 0, 0);
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-    if (disable_layer_color ||
-        rgb_matrix_get_flags() == LED_FLAG_NONE ||
-        rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
-            return;
-        }
-    set_layer_color(get_highest_layer(layer_state));
-    return false;
-}
-
-
-
-td_state_t cur_dance(tap_dance_state_t *state) {
-    if (state->pressed && !state->interrupted) {
-        if (state->count == 1) { return TD_SINGLE_HOLD; }
-        return TD_DOUBLE_HOLD;
-    }
-    return TD_UNKNOWN;
-}
-
-static td_tap_t fn_tap_state = {
-    .is_press_action = true,
-    .state = TD_NONE
-};
-
-void fn_tap_finished(tap_dance_state_t *state, void *user_data) {
-    fn_tap_state.state = cur_dance(state);
-    switch (fn_tap_state.state) {
-        case TD_SINGLE_HOLD:
-            // set function layer
-            layer_move(_FL);
-            break;
-        case TD_DOUBLE_HOLD:
-            // set git layer
-            layer_move(_GL);
-            break;
-        case TD_UNKNOWN:
-            register_code(KC_APP);
-            break;
-        default:
-            break;
-    }
-}
-
-void fn_tap_reset(tap_dance_state_t *state, void *user_data) {
-    switch (fn_tap_state.state) {
-        case TD_UNKNOWN:
-            unregister_code(KC_APP);
-            break;
-        case TD_DOUBLE_HOLD:
-        case TD_SINGLE_HOLD:
-            // Set default layer if we didn't activate numpad layer in function
-            if (get_highest_layer(layer_state) != _NUMPAD) {
-                layer_move(_KL);
-            }
-            break;
-        break;
-        default:
-        break;
-    }
-    fn_tap_state.state = TD_NONE;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_FN_SWITCH] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, fn_tap_finished, fn_tap_reset)
-};
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md b/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
deleted file mode 100644
index 5be66aadf87..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/readme.md
+++ /dev/null
@@ -1,200 +0,0 @@
-# Massdrop Ctrl Xanimos
-
-This keymap is the one I use on my MD CTRL, as a professional software engineer I like to make things my own. I'm also up for spreading the love.
-Massdrop has had a pretty bad rap with qmk the past but recently it's not too bad once you put a little pizzazz into it. 
-
-I started with the Endgame keymap and have re-written most of and expanded upon it.
-
-## Layers
-
-### Typing Layer
-
-_I physically switched around my RALT and Menu keys as my personal preference. The label is still in default location but you can see they are mapped to my liking._
-  
-  ```
-   __________            ___________________________________________      ___________________________________________       ___________________________________________      ________________________________ 
-  |    ESC   |          |    F1    |    F2    |    F3    |    F4    |    |    F5    |    F6    |    F7    |    F8    |     |    F9    |    F10   |   F11    |   F12    |    |  PRINT   |  SCLCK   |  PAUSE   |
-  |  ------  |          |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |  ------  |     |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |
-  |  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_SCRL |  RCS(M)  |
-  |__________|          |__________|__________|__________|__________|    |__________|__________|__________|__________|     |__________|__________|__________|__________|    |__________|__________|__________|
-   ____________________________________________________________________________________________________________________________________________________________________      ________________________________
-  |    ~     |    1     |     2    |     3    |     4    |     5    |     6    |     7    |     8    |     9    |     0    |     -    |     =    |        BCKSP        |    |   INS    |   HOME   |   PGUP   |
-  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |       ------        |    |  ------  |  ------  |  ------  |
-  |  KC_GRV  |   KC_1   |   KC_2   |   KC_3   |   KC_4   |   KC_5   |   KC_6   |   KC_7   |   KC_8   |   KC_9   |   KC_0   |  KC_MINS |  KC_EQL  |       KC_BSPC       |    |  KC_INS  |  KC_HOME |  KC_PGUP |
-  |__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_____________________|    |__________|__________|__________|
-  |      TAB      |    Q     |    W     |    E     |    R     |    T     |    Y     |    U     |    I     |    O     |    P     |    [     |    ]     |       \        |    |   DEL    |   END    |   PGDN   |
-  |     ------    |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |     ------     |    |  ------  |  ------  |  ------  |
-  |     KC_TAB    |   KC_Q   |   KC_W   |   KC_E   |   KC_R   |   KC_T   |   KC_Y   |   KC_U   |   KC_I   |   KC_O   |   KC_P   |  KC_LBRC |  KC_RBRC |     KC_BSLS    |    |  KC_DEL  |  KC_END  |  KC_PGDN |
-  |_______________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|________________|    |__________|__________|__________|
-  |      CAPS       |    A     |    S     |    D     |    F     |    G     |    H     |    J     |    K     |    L     |    ;     |    '     |        ENTER            |
-  |     ------      |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |        ------           |
-  |     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           |
-  |_________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________|                __________
-  |      SHIFT         |    Z     |    X     |    C     |    V     |    B     |    N     |    M     |    ,     |    .     |    /     |               RSHIFT            |               |    UP    |
-  |     ------         |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |               ------            |               |  ------  |
-  |     SC_LSPO        |   KC_Z   |   KC_X   |   KC_C   |   KC_V   |   KC_B   |   KC_N   |   KC_M   |  KC_COMM |  KC_DOT  |  KC_SLSH |               SC_RSPC           |               |   KC_UP  |
-  |____________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________________|     __________|__________|__________
-  |    CTRL     |    GUI      |    ALT      |                       SPACE                                     |    RALT      |   MENU      |   RGUI      |    RCTRL    |    |   LEFT   |   DOWN   |  RIGHT   |
-  |   ------    |   ------    |   ------    |                       ------                                    |    ------    |   ------    |   ------    |    ------   |    |  ------  |  ------  |  ------  |
-  |  KC_LCTL    |   KC_LGUI   |   KC_LALT   |                       KC_SPC                                    |   FN_SWTCH   |   KC_RALT   |   KC_RGUI   |    KC_RCTL  |    |  KC_LEFT |  KC_DOWN |  KC_RGHT |
-  |_____________|_____________|_____________|_________________________________________________________________|______________|_____________|_____________|_____________|    |__________|__________|__________|
-
-  ```
-
-### Function Layer
-
-  ```
-   __________            ___________________________________________      ___________________________________________       ___________________________________________      ________________________________ 
-  |    ESC   |          |    F1    |    F2    |    F3    |    F4    |    |    F5    |    F6    |    F7    |    F8    |     |    F9    |    F10   |   F11    |   F12    |    |  PRINT   |  SCLCK   |  PAUSE   |
-  |  ------  |          |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |  ------  |     |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |
-  |          |          |  ROUT_TG |  ROUT_RM |  ROUT_VD |  ROUT_VI |    |          |          |          |          |     |          |  KC_WAKE |  KC_SLEP |          |    |  KC_PAUS |          |  KC_MUTE |
-  |__________|          |__________|__________|__________|__________|    |__________|__________|__________|__________|     |__________|__________|__________|__________|    |__________|__________|__________|
-   ____________________________________________________________________________________________________________________________________________________________________      ________________________________
-  |    ~     |    1     |     2    |     3    |     4    |     5    |     6    |     7    |     8    |     9    |     0    |     -    |     =    |        BCKSP        |    |   INS    |   HOME   |   PGUP   |
-  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |       ------        |    |  ------  |  ------  |  ------  |
-  |          |          |          |          |          |          |          |          |          |          |          |          |          |                     |    |  KC_MSTP |  KC_MPLY |  KC_VOLU |
-  |__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_____________________|    |__________|__________|__________|
-  |      TAB      |    Q     |    W     |    E     |    R     |    T     |    Y     |    U     |    I     |    O     |    P     |    [     |    ]     |       \        |    |   DEL    |   END    |   PGDN   |
-  |     ------    |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |     ------     |    |  ------  |  ------  |  ------  |
-  |               |  RGB_MOD |  RGB_SPI |  RBG_VAI |  RGB_HUI |          |          |          |          |          |          |          |          |                |    |  KC_MPRV |  KC_MNXT |  KC_VOLD |
-  |_______________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|________________|    |__________|__________|__________|
-  |      CAPS       |    A     |    S     |    D     |    F     |    G     |    H     |    J     |    K     |    L     |    ;     |    '     |        ENTER            |
-  |     ------      |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |        ------           |
-  |                 | RGB_RMOD |  RGB_SPD |  RGB_VAD |  RGB_HUD |          |          |          |          |          |          |          |                         |
-  |_________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________|                __________
-  |      SHIFT         |    Z     |    X     |    C     |    V     |    B     |    N     |    M     |    ,     |    .     |    /     |               RSHIFT            |               |    UP    |
-  |     ------         |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |               ------            |               |  ------  |
-  |                    |          |          | COPY_ALL |          |  MD_BOOT |  NK_TOGG |          |          |          |          |            TOGGLE_NUMPAD        |               |  KC_BRIU |
-  |____________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________________|     __________|__________|__________
-  |    CTRL     |    GUI      |    ALT      |                       SPACE                                     |    RALT      |   MENU      |   RGUI      |    RCTRL    |    |   LEFT   |   DOWN   |  RIGHT   |
-  |   ------    |   ------    |   ------    |                       ------                                    |    ------    |   ------    |   ------    |    ------   |    |  ------  |  ------  |  ------  |
-  |             |             |             |                                                                 |              |             |             |             |    |          |  KC_BRID |          |
-  |_____________|_____________|_____________|_________________________________________________________________|______________|_____________|_____________|_____________|    |__________|__________|__________|
-
-  ```
-
-### Git Layer
-
-  ```
-   __________            ___________________________________________      ___________________________________________       ___________________________________________      ________________________________ 
-  |    ESC   |          |    F1    |    F2    |    F3    |    F4    |    |    F5    |    F6    |    F7    |    F8    |     |    F9    |    F10   |   F11    |   F12    |    |  PRINT   |  SCLCK   |  PAUSE   |
-  |  ------  |          |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |  ------  |     |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |
-  |          |          |          |          |          |          |    |          |          |          |          |     |          |          |          |          |    |          |          |          |
-  |__________|          |__________|__________|__________|__________|    |__________|__________|__________|__________|     |__________|__________|__________|__________|    |__________|__________|__________|
-   ____________________________________________________________________________________________________________________________________________________________________      ________________________________
-  |    ~     |    1     |     2    |     3    |     4    |     5    |     6    |     7    |     8    |     9    |     0    |     -    |     =    |        BCKSP        |    |   INS    |   HOME   |   PGUP   |
-  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |       ------        |    |  ------  |  ------  |  ------  |
-  |  G_INIT  |  G_CLONE |  G_REMTE |  G_RESET |  G_PSFWL |          |          |          |          |          |          |          |          |                     |    |          |          |          |
-  |__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_____________________|    |__________|__________|__________|
-  |      TAB      |    Q     |    W     |    E     |    R     |    T     |    Y     |    U     |    I     |    O     |    P     |    [     |    ]     |       \        |    |   DEL    |   END    |   PGDN   |
-  |     ------    |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |     ------     |    |  ------  |  ------  |  ------  |
-  |               |  G_PUPST |  G_PULL  |  G_PSORG |  G_PUSH  |          |          |          |          |          |          |          |          |                |    |          |          |          |
-  |_______________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|________________|    |__________|__________|__________|
-  |      CAPS       |    A     |    S     |    D     |    F     |    G     |    H     |    J     |    K     |    L     |    ;     |    '     |        ENTER            |
-  |     ------      |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |        ------           |
-  |                 |  G_ADD   |  G_STAT  |  G_DIFF  |  G_FETCH |          |          |          |          |          |          |          |                         |
-  |_________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________|                __________
-  |      SHIFT         |    Z     |    X     |    C     |    V     |    B     |    N     |    M     |    ,     |    .     |    /     |               RSHIFT            |               |    UP    |
-  |     ------         |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |               ------            |               |  ------  |
-  |                    |  G_LOG   |  G_CHECK |  G_COMM  |  G_COMSG |  G_BRANH |          |          |          |          |          |                                 |               |          |
-  |____________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________________|     __________|__________|__________
-  |    CTRL     |    GUI      |    ALT      |                       SPACE                                     |    RALT      |   MENU      |   RGUI      |    RCTRL    |    |   LEFT   |   DOWN   |  RIGHT   |
-  |   ------    |   ------    |   ------    |                       ------                                    |    ------    |   ------    |   ------    |    ------   |    |  ------  |  ------  |  ------  |
-  |             |             |             |                                                                 |              |             |             |             |    |          |          |          |
-  |_____________|_____________|_____________|_________________________________________________________________|______________|_____________|_____________|_____________|    |__________|__________|__________|
-
-  ```
-
-  - These are the strings that are dumped/keyed in for each associated keycode  
-  ```
-  G_INIT     "git init"
-  G_CLONE    "git clone "
-  G_ADD      "git add "
-  G_DIFF     "git diff "
-  G_RESET    "git reset --soft "
-  G_BRANH    "git branch --list"
-  G_CHECK    "git checkout "
-  G_REMTE    "git remote add "
-  G_FETCH    "git fetch "
-  G_PULL     "git pull"
-  G_PUPST    "git pull upstream "
-  G_PUSH     "git push"
-  G_PSORG    "git push -u origin "
-  G_PSFWL    "git push --force-with-lease"
-  G_COMM     "git commit "
-  G_COMSG    "git commit -m \": [TFS-]\""
-  G_STAT     "git status"
-  G_LOG      "git log"
-  ```
-
-### Numpad Layer
-  
-*activated via the __Function Layer__ and stays active until you escape*
-  ```
-   __________            ___________________________________________      ___________________________________________       ___________________________________________      ________________________________ 
-  |    ESC   |          |    F1    |    F2    |    F3    |    F4    |    |    F5    |    F6    |    F7    |    F8    |     |    F9    |    F10   |   F11    |   F12    |    |  PRINT   |  SCLCK   |  PAUSE   |
-  |  ------  |          |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |  ------  |     |  ------  |  ------  |  ------  |  ------  |    |  ------  |  ------  |  ------  |
-  |  TOG_NPD |          |          |          |          |          |    |          |          |          |          |     |          |          |          |          |    |          |          |          |
-  |__________|          |__________|__________|__________|__________|    |__________|__________|__________|__________|     |__________|__________|__________|__________|    |__________|__________|__________|
-   ____________________________________________________________________________________________________________________________________________________________________      ________________________________
-  |    ~     |    1     |     2    |     3    |     4    |     5    |     6    |     7    |     8    |     9    |     0    |     -    |     =    |        BCKSP        |    |   INS    |   HOME   |   PGUP   |
-  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |       ------        |    |  ------  |  ------  |  ------  |
-  |          |          |          |          |          |          |          |          |          |          |          |          |          |                     |    |          |          |          |
-  |__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_____________________|    |__________|__________|__________|
-  |      TAB      |    Q     |    W     |    E     |    R     |    T     |    Y     |    U     |    I     |    O     |    P     |    [     |    ]     |       \        |    |   DEL    |   END    |   PGDN   |
-  |     ------    |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |     ------     |    |  ------  |  ------  |  ------  |
-  |               |          |          |          |          |          |  KC_P7   |  KC_P8   |  KC_P9   |          |          |          |          |                |    |          |          |          |
-  |_______________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|________________|    |__________|__________|__________|
-  |      CAPS       |    A     |    S     |    D     |    F     |    G     |    H     |    J     |    K     |    L     |    ;     |    '     |        ENTER            |
-  |     ------      |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |        ------           |
-  |                 |          |          |          |          |          |  KC_P4   |  KC_P5   |  KC_P6   |          |          |          |                         |
-  |_________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________|                __________
-  |      SHIFT         |    Z     |    X     |    C     |    V     |    B     |    N     |    M     |    ,     |    .     |    /     |               RSHIFT            |               |    UP    |
-  |     ------         |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |  ------  |               ------            |               |  ------  |
-  |                    |          |          |          |          |  KC_P1   |  KC_P2   |  KC_P3   |  KC_PDOT |          |          |                                 |               |          |
-  |____________________|__________|__________|__________|__________|__________|__________|__________|__________|__________|__________|_________________________________|     __________|__________|__________
-  |    CTRL     |    GUI      |    ALT      |                       SPACE                                     |    RALT      |   MENU      |   RGUI      |    RCTRL    |    |   LEFT   |   DOWN   |  RIGHT   |
-  |   ------    |   ------    |   ------    |                       ------                                    |    ------    |   ------    |   ------    |    ------   |    |  ------  |  ------  |  ------  |
-  |             |             |             |                       KC_P0                                     |              |             |             |             |    |          |          |          |
-  |_____________|_____________|_____________|_________________________________________________________________|______________|_____________|_____________|_____________|    |__________|__________|__________|
-
-  ```
-
-## Features
-
-These are the features currently used by this keymap:
-
-### RGB Time Out
-
-This allows setting a dynamic timeout for RGB to turn off. The following is supported:
-
-1. Restores on the first click of any key.
-2. Restores to its previous state before timeout. i.e. if it was edge only before timeout it will restore to edge only, same for all modes.
-3. Doesn't interfere with RGB modes. You can set keyboard to All, Edge Only or Off and timeout will not interfere with these modes.
-4. The time before RGB is turned off is dynamically adjustable using keycodes ROUT_VI to increase, ROUT_VD to decrease. They have a 10 second steps by default. Minimum value 10 seconds by default and maximum is 10 minutes.
-5. Can be toggled on or off dyncamically with the ROUT_TG keycode.
-6. Can be put in fast mode using ROUT_FM, for movie watching purposes. Default value is 3 seconds. Note that fast mode disabled ROUT_VD and ROUT_VI so to use them again you have to toggle fast mode off with ROUT_FM. It doesn't impact ROUT_TG and ROUT_TG will remember if fast mode was enabled when toggled back on, so it doesn't disable fast mode on its own, only ROUT_FM can disable or enable fast mode.
-
-### Tapdance Keys
-
-Created a tapdance setup to use the same key to switch between the layers, aka a function key. ;)
-
-Layers are temporary while holding the function key down.
-	- Single tap and hold: Activates the Function Layer.
-	- Double tap and hold: Activates the Git Layer.
-
-### Numpad
-
-Activated in the *Function Layer* by holding down the fn key and pressing the toggle key (RSHIFT). The keeps the layer activated without needing to hold the fn key anymore.
-To leave the numpad layer press the ESC key or hold and let go of the fn key.
-
-### Space Cadet Shift
-
-The typing layer is setup to use the [Space Cadet Shift](https://docs.qmk.fm/#/feature_space_cadet). As a software engineer this is massively useful :) 
-
-_Sorry ISO users, you'll need to configure it for your own setup or disable it._
-
-## Credits
-
- - [endgame](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/ctrl/keymaps/endgame) by [ash0x0](https://github.com/ash0x0)
-   For the base keymap I started with.
\ No newline at end of file
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/rules.mk b/keyboards/massdrop/ctrl/keymaps/xanimos/rules.mk
deleted file mode 100644
index 2913eff83bd..00000000000
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# RGBLIGHT_ENABLE = no				# Not for MD boards. This is here in case you forget.
-COMMAND_ENABLE = no				# Commands for debug and configuration
-# AUTO_SHIFT_ENABLE = yes      	# Auto Shift
-NKRO_ENABLE = yes           	# USB Nkey Rollover
-DYNAMIC_MACRO_ENABLE = no		# Dynamic macro recording and play
-MOUSEKEY_ENABLE = no			# Enable mouse control keycodes. Increases firmware size.
-TAP_DANCE_ENABLE = yes			# Enable tap dance keys
-CONSOLE_ENABLE = no				# Enable debugging console. Increases firmware size.
-SRC += config_led.c				# Used to add files to the compilation/linking list.
-EXTRAKEY_ENABLE = yes			# Audio control and System control
-# RAW_ENABLE = yes				# Raw HID has not yet been implemented for this keyboard
-# COMBO_ENABLE					# Key combo feature
-# LEADER_ENABLE					# Enable leader key chording
diff --git a/keyboards/matrix/abelx/abelx.c b/keyboards/matrix/abelx/abelx.c
index a05934238a7..0a3071a4025 100644
--- a/keyboards/matrix/abelx/abelx.c
+++ b/keyboards/matrix/abelx/abelx.c
@@ -57,6 +57,7 @@ void housekeeping_task_kb(void) {
 
 #ifdef RGBLIGHT_ENABLE
 #include "rgblight.h"
+#include "ws2812.h"
 #include "i2c_master.h"
 
 const aw9523b_led g_aw9523b_leds[AW9523B_RGB_NUM] = {
@@ -66,7 +67,7 @@ const aw9523b_led g_aw9523b_leds[AW9523B_RGB_NUM] = {
     {AW9523B_P07_PWM, AW9523B_P06_PWM, AW9523B_P05_PWM},
 };
 
-void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
+void setleds_custom(rgb_led_t *start_led, uint16_t num_leds)
 {
     uint8_t num = num_leds < AW9523B_RGB_NUM ? num_leds : AW9523B_RGB_NUM;
 
@@ -77,6 +78,10 @@ void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
     }
 }
 
+const rgblight_driver_t rgblight_driver = {
+    .setleds = setleds_custom,
+};
+
 #endif
 
 static uint16_t caps_lock_pin = DEF_PIN(TCA6424_PORT2, 3);
diff --git a/keyboards/matrix/abelx/aw9523b.c b/keyboards/matrix/abelx/aw9523b.c
index 8c6e8eaccf5..860a71740d7 100644
--- a/keyboards/matrix/abelx/aw9523b.c
+++ b/keyboards/matrix/abelx/aw9523b.c
@@ -51,15 +51,15 @@ void aw9523b_init(uint8_t addr)
     i2c_init();
     // reset chip
     uint8_t data = 0;
-    i2c_writeReg(addr, AW9523B_RESET, &data, 1, TIMEOUT);
+    i2c_write_register(addr, AW9523B_RESET, &data, 1, TIMEOUT);
     wait_ms(1);
     // set max led current
     data = 0x03; // 37mA/4
-    i2c_writeReg(addr, AW9523B_CTL, &data, 1, TIMEOUT);
+    i2c_write_register(addr, AW9523B_CTL, &data, 1, TIMEOUT);
     // set port to led mode
     data = 0;
-    i2c_writeReg(addr, AW9523B_P0_LED, &data, 1, TIMEOUT);
-    i2c_writeReg(addr, AW9523B_P1_LED, &data, 1, TIMEOUT);
+    i2c_write_register(addr, AW9523B_P0_LED, &data, 1, TIMEOUT);
+    i2c_write_register(addr, AW9523B_P1_LED, &data, 1, TIMEOUT);
     // clear pwm buff
     for (uint8_t i = 0; i < 16; i++) {
         aw9523b_pwm_buf[i] = 0;
@@ -91,9 +91,9 @@ void aw9523b_update_pwm_buffers(uint8_t addr)
     if (aw9523b_pwm_dirty) {
         for (uint8_t i = 0; i < AW9523B_RGB_NUM; i++){
             aw9523b_led led = g_aw9523b_leds[i];
-            i2c_writeReg(addr, led.r, &aw9523b_pwm_buf[PWM2BUF(led.r)], 1, TIMEOUT);
-            i2c_writeReg(addr, led.g, &aw9523b_pwm_buf[PWM2BUF(led.g)], 1, TIMEOUT);
-            i2c_writeReg(addr, led.b, &aw9523b_pwm_buf[PWM2BUF(led.b)], 1, TIMEOUT);
+            i2c_write_register(addr, led.r, &aw9523b_pwm_buf[PWM2BUF(led.r)], 1, TIMEOUT);
+            i2c_write_register(addr, led.g, &aw9523b_pwm_buf[PWM2BUF(led.g)], 1, TIMEOUT);
+            i2c_write_register(addr, led.b, &aw9523b_pwm_buf[PWM2BUF(led.b)], 1, TIMEOUT);
         }
         aw9523b_pwm_dirty = false;
     }
diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json
index 35bc0598109..b9aa23b7566 100644
--- a/keyboards/matrix/abelx/info.json
+++ b/keyboards/matrix/abelx/info.json
@@ -10,6 +10,7 @@
   },
   "rgblight": {
     "led_count": 9,
+    "driver": "custom",
     "animations": {
       "breathing": true,
       "rainbow_mood": true,
diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk
index 1c2fc05ffee..83142dd71c6 100644
--- a/keyboards/matrix/abelx/rules.mk
+++ b/keyboards/matrix/abelx/rules.mk
@@ -46,3 +46,4 @@ CUSTOM_MATRIX = lite
 # project specific files
 SRC += matrix.c tca6424.c aw9523b.c
 I2C_DRIVER_REQUIRED = yes
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/matrix/abelx/tca6424.c b/keyboards/matrix/abelx/tca6424.c
index 44dc7909d82..c6321572569 100644
--- a/keyboards/matrix/abelx/tca6424.c
+++ b/keyboards/matrix/abelx/tca6424.c
@@ -47,13 +47,13 @@ void tca6424_init(void)
 
 static void write_port(uint8_t p, uint8_t d)
 {
-    i2c_writeReg(TCA6424_ADDR, p, &d, 1, TIMEOUT);
+    i2c_write_register(TCA6424_ADDR, p, &d, 1, TIMEOUT);
 }
 
 static uint8_t read_port(uint8_t port)
 {
     uint8_t data = 0;
-    i2c_readReg(TCA6424_ADDR, port, &data, 1, TIMEOUT);
+    i2c_read_register(TCA6424_ADDR, port, &data, 1, TIMEOUT);
     return data;
 }
 
diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json
index 972aab9d0d2..6e1a1c493f3 100644
--- a/keyboards/matrix/m20add/info.json
+++ b/keyboards/matrix/m20add/info.json
@@ -10,6 +10,7 @@
   },
   "rgblight": {
     "led_count": 20,
+    "driver": "custom",
     "animations": {
       "breathing": true,
       "rainbow_mood": true,
diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c
index f3fbe83d72c..f32875cf4f7 100644
--- a/keyboards/matrix/m20add/rgb_ring.c
+++ b/keyboards/matrix/m20add/rgb_ring.c
@@ -357,7 +357,7 @@ static void custom_effects(void)
     effect_funcs[rgb_ring.effect]();
 }
 
-void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
+void setleds_custom(rgb_led_t *start_led, uint16_t num_leds)
 {
     if (rgb_ring.state != RING_STATE_QMK) {
         return;
@@ -368,6 +368,10 @@ void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
     }
 }
 
+const rgblight_driver_t rgblight_driver = {
+    .setleds = setleds_custom,
+};
+
 
 void rgb_ring_init(void)
 {
diff --git a/keyboards/matrix/m20add/tca6424.c b/keyboards/matrix/m20add/tca6424.c
index 38cea9f15f5..c6ffa4c2fe4 100644
--- a/keyboards/matrix/m20add/tca6424.c
+++ b/keyboards/matrix/m20add/tca6424.c
@@ -45,13 +45,13 @@ void tca6424_init(void)
 
 static void write_port(uint8_t p, uint8_t d)
 {
-    i2c_writeReg(TCA6424_ADDR, p, &d, 1, TIMEOUT);
+    i2c_write_register(TCA6424_ADDR, p, &d, 1, TIMEOUT);
 }
 
 static uint8_t read_port(uint8_t port)
 {
     uint8_t data = 0;
-    i2c_readReg(TCA6424_ADDR, port, &data, 1, TIMEOUT);
+    i2c_read_register(TCA6424_ADDR, port, &data, 1, TIMEOUT);
     return data;
 }
 
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index a4d4c5a36a1..74beabaa7ad 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -21,54 +21,4 @@
 // rgb matrix setting
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
-#define DRIVER_1_LED_TOTAL 36
-#define DRIVER_2_LED_TOTAL 36
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-// 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
-#    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_LED_COUNT 72
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 507c36120e6..bc546cffc91 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -28,6 +28,51 @@
     "pin": "B1"
   },
   "rgb_matrix": {
+    "animations": {
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_val": true,
+      "band_pinwheel_sat": true,
+      "band_pinwheel_val": true,
+      "band_spiral_sat": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true,
+      "solid_multisplash": true
+    },
     "driver": "is31fl3731"
   },
   "community_layouts": ["65_iso_blocker"],
diff --git a/keyboards/matrix/noah/keymaps/rys/keymap.c b/keyboards/matrix/noah/keymaps/rys/keymap.c
deleted file mode 100644
index 6c63ad829fe..00000000000
--- a/keyboards/matrix/noah/keymaps/rys/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2020 Rys Sommefeldt
- *
- * 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 i  s 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_iso_blocker(
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ ` │
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
-     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PUp│
-     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │PDn│
-     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │LCtl│LGUI│LAlt│      Spaaaaaaace       │RAlt│ L1 │ │ ← │ ↓ │ → │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-        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_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_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_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_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_65_iso_blocker(
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │RST│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│       │   │
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ TOG │PLN│MOD│HU+│HU-│SA+│SA-│VA+│VA-│   │   │   │   │     │   │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
-     * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
-     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-     * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
-     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │    │    │                        │    │    │ │   │   │   │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-        QK_BOOT, 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_M_P, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-    ),
-};
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 8246da809c3..b5c52f9952b 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -17,53 +17,50 @@ extern rgblight_config_t rgblight_config;
 
 // led 0 for caps lock, led 1 for scroll lock, led 3 for num lock
 // led 4 for layer 1, led 5 for layer 2, led 6 for layer 3, led 7 for layer 4
-#if RGBLED_NUM < 7
-#error "MUST set the RGBLED_NUM bigger than 7"
+#if RGBLIGHT_LED_COUNT < 7
+#error "MUST set the RGBLIGHT_LED_COUNT bigger than 7"
 #endif
-rgb_led_t noah_leds[RGBLED_NUM];
+rgb_led_t noah_leds[RGBLIGHT_LED_COUNT];
 static bool noah_led_mode = false;
-void rgblight_set(void) {
+void setleds_custom(rgb_led_t *ledarray, uint16_t num_leds) {
     memset(&noah_leds[0], 0, sizeof(noah_leds));
     if (!rgblight_config.enable) {
-        for (uint8_t i = 0; i < RGBLED_NUM; i++) {
-            led[i].r = 0;
-            led[i].g = 0;
-            led[i].b = 0;
+        for (uint8_t i = 0; i < RGBLIGHT_LED_COUNT; i++) {
+            ledarray[i].r = 0;
+            ledarray[i].g = 0;
+            ledarray[i].b = 0;
         }
     }
     if (noah_led_mode) {
       led_t led_state = host_keyboard_led_state();
       if (led_state.caps_lock) {
-        noah_leds[0] = led[0];
+        noah_leds[0] = ledarray[0];
       }
       if (led_state.scroll_lock) {
-        noah_leds[1] = led[1];
+        noah_leds[1] = ledarray[1];
       }
       if (led_state.num_lock) {
-        noah_leds[2] = led[2];
+        noah_leds[2] = ledarray[2];
       }
       for (int32_t i = 0; i < 4; i++) {
         if(layer_state_is(i+1)) {
-          noah_leds[i + 3] = led[i + 3];
+          noah_leds[i + 3] = ledarray[i + 3];
         }
       }
     } else {
-      memcpy(&noah_leds[0], &led[0], sizeof(noah_leds));
+      memcpy(&noah_leds[0], &ledarray[0], sizeof(noah_leds));
     }
 
-  ws2812_setleds(noah_leds, RGBLED_NUM);
+  ws2812_setleds(noah_leds, RGBLIGHT_LED_COUNT);
 }
-#endif
 
-void matrix_scan_kb(void) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_task();
+const rgblight_driver_t rgblight_driver = {
+    .setleds = setleds_custom,
+};
 #endif
-    matrix_scan_user();
-}
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c
deleted file mode 100644
index 3f1dfbee3f0..00000000000
--- a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2020  Maxr1998 <max.rumpf1998@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 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] = {
-    [DEFAULT] = LAYOUT(
-        KC_F20,  KC_F21,  KC_MUTE,
-        KC_F22,  KC_F23,  KC_F24
-    )
-};
-
-combo_t key_combos[] = {
-    [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/maxr1998/pulse4k/keymaps/maxr1998/rules.mk b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
deleted file mode 100644
index 16d940eef25..00000000000
--- a/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
+++ /dev/null
@@ -1,169 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _DFT 0
-#define _NGUI 1
-#define _FN 2
-#define _SFX 3
-
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-#define bbbbbb KC_NO
-#define GUIOFF MAGIC_NO_GUI
-#define GUION MAGIC_UNNO_GUI
-
-/* TODO: create handy quick-ref list here for easy grokking of the actual shortcuts in place */
-
-/*
- * This is Mitch's default ACR60 layout (also DZ60, on which the ACR60 is based). This is a
- * Mac-oriented layout, as noted by the GUI keys immediately next to the space bar area of the
- * lower modifier row. This uses the LAYOUT_mitchsplit keymap as defined in arc60.h, which
- * uses a 3-split space bar and a split right shift. Otherwise it's a standard 60% layout (for
- * now).
- *
- * For me, this is a great place to start getting used to a split key setup and still mostly
- * sticking to a standard staggered 60% layout so my entire game isn't thrown off.
- *
- * Layers (0-based index because we're devs!):
- *
- *    0: Default QWERTY layer
- *      Note Fn and Alt keys on the right side of the spacebar, not sure if those are
- *      normal position but that's what I'm used to at this point. YMMV
- *
- *    1: Function Layer
- *      Function keys, Grave Key, Delete, Caps lock on the tab, media keys, and directional
- *      keys. Also you can hit the Alt key position to switch (and lock) into the 3rd layer
- *      if you really want to mess with your SFX for a bit.
- *
- *    2: Special Effects Layer
- *      RGB and backlight settings access. RGB cycle on "S" key position and if locked into
- *      the third layer you can hold shift to cycle backwards (see notes below). Bootloader
- *      access is on this layer. If layer locked, hit right Alt key to get back to layer 0.
- *
- * The keymap layer definitions below look pretty bad when soft-wrapped by your IDE / text editor.
- * Be sure to disable wrapping to make things more readable with lines preserved.
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Layer 0
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
- * |-----------------------------------------------------------------------------------------+
- * | Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \     |
- * |-----------------------------------------------------------------------------------------+
- * |   Fn   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter     |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  / | RShift     | FN  |
- * |-----------------------------------------------------------------------------------------+
- * | LCtrl | LAlt | LGUI  |      Space      | Space|   Space    | RGUI |  Fn  | RAlt | RCtrl |
- * `-----------------------------------------------------------------------------------------'
- */
-/* Qwerty gui/alt/space/alt/gui /
- *
- * Hit MO(_FN) and Alt in that order to lock into the _FN layer.
- */
-  [_DFT] = LAYOUT_mitchsplit( /* Basic QWERTY */
-      QK_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_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,
-      MO(_FN), KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-      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(_FN),
-      KC_LCTL, KC_LALT, KC_LGUI,        KC_SPC, KC_SPC, KC_SPC,                  KC_RGUI, MO(_FN), LT(_SFX, KC_RALT),KC_RCTL
-      ),
-
-/* Gaming
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        |     |     |     |     |    |     |     |     |     |     |     |     |         |
- * |-----------------------------------------------------------------------------------------+
- * |         |     |     |     |     |     |     |     |     |     |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |           |     |     |     |     |     |     |     |      |    |     |           |     |
- * |-----------------------------------------------------------------------------------------+
- * |      |      |BLOCKED|               |       |             |BLOCKED|      |       |      |
- * `-----------------------------------------------------------------------------------------'
- */
-/* I disable the GUI / System key for gaming, as usually that's windows and I hit that at the most
- * inopportune moments. And games don't use the windows key. I'd use the Bootmagic MAGIC_NO_GUI and
- * MAGIC_UNNO_GUI keycodes, but that actually disables it and has it persist beyond disconnection
- * of the board. That's less convenient (and more confusing) for me than this approach, which is
- * basically just blocking the GUI keys when this layer is active and not letting them flow through
- * to the default layer.
- */
- /* Layer 2: "special effects": RGB lighting, backlighting, bootloader */
-  [_NGUI] = LAYOUT_mitchsplit(
-      ______,  ______, ______,  ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,  ______, ______,  ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,  ______, ______,  ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,  ______, ______,  ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,  ______, bbbbbb,          ______, ______, ______,                 bbbbbb, ______, ______, ______
-      ),
-
-/* Fn Layer / Layer 1
- * ,-----------------------------------------------------------------------------------------.
- * |KC_GRV| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Del    |
- * |-----------------------------------------------------------------------------------------+
- * | CAPS  |     |     |     |     |     |Home | Pgup| Up  | PgDn| End |     |     |         |
- * |-----------------------------------------------------------------------------------------+
- * |        | Vol-| Vol+| Mute|     |     |     | Left| Down|Right|     |     |              |
- * |-----------------------------------------------------------------------------------------+
- * |           |Prev |Play |Next |     |     |     |     |     |     |     |          |      |
- * |-----------------------------------------------------------------------------------------+
- * |      |      |       |               |       |               |      |      | LrSfx |     |
- * `-----------------------------------------------------------------------------------------'
- */
-/*
- * Pok3r-style layer switching on M and "," keys (_DFT and _NGUI layers, respectively). Note that
- * these don't enable/disable those layers (i.e. latching keys), they actually switch to that layer.
- * To go to the _NGUI layer, Fn+comma, to go to _DFT from _NGUI, hit Fn+M.
- */
- /* Layer 1: Functions, primary layer switching, media controls, directional */
-  [_FN] = LAYOUT_mitchsplit(
-      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10, KC_F11, KC_F12, KC_DEL,
-      KC_CAPS, bbbbbb,  bbbbbb,  bbbbbb,  bbbbbb, bbbbbb, KC_HOME, KC_PGUP, KC_UP ,  KC_PGDN,  KC_END, bbbbbb, bbbbbb, bbbbbb,
-      ______,  KC_VOLD, KC_VOLU, KC_MUTE, bbbbbb, bbbbbb, bbbbbb,  KC_LEFT, KC_DOWN, KC_RIGHT, bbbbbb, bbbbbb, ______,
-      ______,  KC_MPRV, KC_MPLY, KC_MNXT, bbbbbb, bbbbbb, bbbbbb,TO(_DFT),TO(_NGUI), bbbbbb,   bbbbbb, ______, ______,
-      ______,  ______,  ______,           ______, ______, ______,                    ______,   ______,TG(_SFX),______
-      ),
-
-/* Special Effects Layer / Layer 2
- * ,-----------------------------------------------------------------------------------------.
- * |     |Plain|Brth |Rnbw |Swirl|Snake|Knght|Xmas |Grdnt|     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        | BL  |BLSTEP| BL- | BL+ |    |     |     |     |     |     |     |     |Bootldr |
- * |-----------------------------------------------------------------------------------------+
- * |         | RGBT| RGBM|     |     |     |     |     |     |     |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |      |    |     |           |     |
- * |-----------------------------------------------------------------------------------------+
- * |      |      |       |               |       |              |      |      |LrDflt |      |
- * `-----------------------------------------------------------------------------------------'
- */
-/* Tap RAlt to get back to default layer (0).
- *
- * See https://docs.qmk.fm/feature_rgblight.html#rgblight-keycodes for details about
- * RGB codes. Quick summary, though:
- *
- *    RGB_MODE_PLAIN         RGB_M_P	    Switch to the static no animation mode
- *    RGB_MODE_BREATHE       RGB_M_B	    Switch to the breathing mode
- *    RGB_MODE_RAINBOW       RGB_M_R	    Switch to the rainbow mode (cycles through colors)
- *    RGB_MODE_SWIRL         RGB_M_SW	  Switch to the swirl mode (like an animated gradient)
- *    RGB_MODE_SNAKE         RGB_M_SN	  Switch to the snake mode
- *    RGB_MODE_KNIGHT        RGB_M_K	    Switch to the knight animation
- *    RGB_MODE_XMAS          RGB_M_X	    Switch to the Christmas animation
- *    RGB_MODE_GRADIENT      RGB_M_G	    Switch to the static gradient mode
- *
- *    Note that there are more animation variations, usually timer-based variations, by using the
- *    "S" key to cycle through modes. Use one of the deciated keys to get to
- *    the general mode where you want it, then cycle through variations of that mode to get
- *    something specific more quickly.
- */
- /* Layer 2: "special effects": RGB lighting, backlighting, bootloader */
-  [_SFX] = LAYOUT_mitchsplit(
-      ______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G,______, ______, ______,  ______, ______,
-      ______,  BL_TOGG, BL_STEP, BL_DOWN, BL_UP,   ______,  ______,  ______,  ______, ______, ______, ______,  ______,  QK_BOOT,
-      ______,  RGB_TOG, RGB_MOD,______,  ______,  ______,  ______,  ______,  ______, ______, ______, ______,  ______,
-      ______,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ______,  ______, ______, ______, ______,  ______,
-      ______,  ______,  ______,             ______, ______, ______,                   ______, ______,TO(_DFT),______
-      )
-
-};
diff --git a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
deleted file mode 100644
index 8d88014170f..00000000000
--- a/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2018 @TurboMech /u/TurboMech <discord> @A9entOran9e#6134
- *
- * 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 _BL 0 //Base layer
-#define _FN1 1 //Function layer
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* BL
-____________________________________________________________________________________________________________________________________________________________________________
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-| ESC    |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   | DEL    | PRT SC | SCR LK | PAUSE  |  P UP  | P DOWN |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|        |        |        |        |        |        |        |        |        |        |        |        |        |      BACK       |  NUM   |        |        |        |
-|  ~`    |   1    |   2    |   3    |   4    |   5    |   6    |   7    |   8    |   9    |   0    |  _ -   | =  +   |      SPACE      |  LOCK  |   /    |  *     |   -    |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|_________________|________|________|________|________|
-|            |        |        |        |        |        |        |        |        |        |        |  [     |   ]    |             |        |        |        |        |
-|    TAB     |   Q    |   W    |   E    |   R    |   T    |   Y    |   U    |   I    |   O    |   P    |  {     |   }    |  |   \      |   7    |   8    |   9    |        |
-|____________|________|________|________|________|________|________|________|________|________|________|________|________|_____________|________|________|________|   +    |
-|              |        |        |        |        |        |        |        |        |        |   ;    |   '    |                    |        |        |        |        |
-|   CAPS LOCK  |   A    |   S    |   D    |   F    |   G    |   H    |   J    |   K    |   L    |   :    |   "    |       ENTER        |   4    |   5    |   6    |        |
-|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________|
-|                  |        |        |        |        |        |        |        |   ,    |    .   |   /    |                |        |        |        |        |        |
-|  SHIFT           |   Z    |   X    |   C    |   V    |   B    |   N    |   M    |   <    |    >   |   ?    |       SHIFT    |   UP   |   1    |   2    |   3    |        |
-|__________________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________| ENTER  |
-|          |          |          |                                                        |        |        |   MO   |        |        |        |        |        |        |
-| CTRL     |   LGUI   | L ALT    |                      SPACE                             | VOL Dn | VOL Up |  _FN   |  LEFT  |  DOWN  | RIGHT  |   0    |   .    |        |
-|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
- */
-
-  [_BL] = LAYOUT_default(
-    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_PSCR,    KC_SCRL, KC_PAUS, KC_PGUP, 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_NUM,  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_BSLS,    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_ENT,     KC_P4,   KC_P5,   KC_P6,
-    SC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC, KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_VOLD, KC_VOLU, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT
-  ),
-
-/* FN_1
-____________________________________________________________________________________________________________________________________________________________________________
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |  VOL   |  VOL   | NEXT   |        |        |
-| QK_BOOT  |        |        |        |        |        |        |        |        |        |        |        |        |  MUTE  |  DOWN  |   UP   | TRACK  |  HOME  |  END   |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|        |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |  RGB   |        |        |        |        |                 |        |        |        |        |
-|        | TOGGLE |  MODE  |INCREASE|DECREASE|  HUE   |  HUE   |  SAT   |  SAT   |        |        |        |        |      DELETE     |        |        |        |        |
-|________|________|________|________|________|INCREASE|DECREASE|INCREASE|DECREASE|________|________|________|________|_________________|________|________|________|________|
-|            | BACK   | BACK   |        |        |        |        |        |        |        |        |        |        |             |        |        |        |        |
-|            | LIGHT  | LIGHT  |        |        |        |        |        |        |        |        |        |        |             |        |        |        |        |
-|____________| TOGGLE |INCREASE|DECREASE|________|________|________|________|________|________|________|________|________|_____________|________|________|________|        |
-|              |        |        |        |        |        |        |        |        |        |        |        |                    |        |        |        |        |
-|              |        |        |        |        |        |        |        |        |        |        |        |                    |        |        |        |        |
-|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________|
-|                  |        |        |        |        |        |        |        |        |        |        |                |        |        |        |        |        |
-|                  |        |        |        |        |        |        |        |        |        |        |                |        |        |        |        |        |
-|__________________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________|        |
-|          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
-|          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
-|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
- */
-
-	[_FN1] = LAYOUT_default(
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD,    KC_VOLU, KC_MNXT, KC_HOME, KC_END,
-    _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______,          KC_DEL,     _______, _______, _______, _______,
-    _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,    _______, _______, _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,    _______, _______, _______, _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______,    _______, _______
-  ),
-
-};
-
diff --git a/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c b/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
deleted file mode 100644
index 6b5c108e281..00000000000
--- a/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-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 _QWERTY 0
-#define _NMBR 1
-#define _NAV 2
-#define _MOUSE 3
-#define _FUNCT 4
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [_QWERTY] = LAYOUT_split_space(
-     KC_TAB,     KC_Q,       KC_W,       KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,      KC_P,     KC_BSPC,
-     KC_ESC,     KC_A,       KC_S,       KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,      LT(_FUNCT, 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_LCTL,    KC_LGUI,    KC_LALT,         LT(_NAV, KC_SPC),         KC_BSPC,    KC_RALT,             TT(_MOUSE),   TT(_NMBR)
-   ),
-   [_NAV] = LAYOUT_split_space(
-     _______,      _______,    KC_UP,      _______,  KC_LPRN,    KC_RPRN,    _______,   KC_7,     KC_8,     KC_9,         KC_KP_SLASH,    KC_DEL,
-     _______,      KC_LEFT,    KC_DOWN,    KC_RIGHT, KC_LCBR,    KC_RCBR,    _______,   KC_4,     KC_5,     KC_6,         KC_KP_ASTERISK,
-     _______,      _______,    _______,    _______,  KC_LABK,    KC_RABK,    KC_GRV,    KC_1,     KC_2,     KC_3,         KC_KP_MINUS,
-     _______,      _______,    _______,          _______,      _______,       _______,                   KC_KP_DOT,  KC_KP_PLUS
-   ),
-   [_NMBR] = LAYOUT_split_space(
-     KC_GRAVE,   KC_1,       KC_2,       KC_3,    KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINUS,
-     _______,    KC_4,       KC_5,       KC_6,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-     _______,    KC_7,       KC_8,       KC_9,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-     _______,    _______,    _______,          _______,        TO(_QWERTY),       _______,                 _______,    _______
-   ),
-    [_MOUSE] = LAYOUT_split_space(
-     _______,   KC_BTN1,      KC_MS_U,     KC_BTN2,  _______,    _______,    _______,    _______,   KC_WH_U,   _______,   _______,     _______,
-     _______,   KC_MS_L,      KC_MS_D,     KC_MS_R,  _______,    _______,    _______,    KC_WH_L,   KC_WH_D,   KC_WH_R,   _______,
-     _______,   _______,      _______,     _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,
-     _______,   _______,      _______,            _______,        TO(_QWERTY),         _______,                   _______,    _______
-   ),
-   [_FUNCT] = LAYOUT_split_space(
-     KC_F1,        KC_F2,      KC_F3,      KC_F4,    KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,   KC_F12,
-     _______,      KC_INS,     KC_HOME,    KC_PGUP,  _______,    _______,    _______,    _______,    _______,    _______,    _______,
-     _______,      KC_DEL,     KC_END,     KC_PGDN,  _______,    _______,    _______,    _______,    _______,    _______,    _______,
-     _______,      _______,      _______,            RGB_TOG,        RGB_MOD,         _______,                   _______,    QK_BOOT
-   )
-};
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h
deleted file mode 100755
index 7adb68d347b..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define ONESHOT_TAP_TOGGLE  3
-#define TAPPING_TERM 200
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
deleted file mode 100755
index 566a2f9bee7..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FN1 2
-#define _FN2 3
-#define _WIN 1
-#define _FN3 4
-//Tap Dance Declarations
-enum
-{
-  TD_DOTCOM = 0
-};
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-    //Tap once for Esc, twice for Caps Lock
-    [TD_DOTCOM] = ACTION_TAP_DANCE_DOUBLE(KC_COMMA, KC_DOT)
-    // Other declarations would go here, separated by commas, if you have them
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_BL] = LAYOUT_625_space(
-        LT(OSL(2), KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        GUI_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3, KC_ENT),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, TD(TD_DOTCOM), OSL(2), OSM(MOD_RSFT),
-        KC_ESC, KC_LALT, KC_LCTL, KC_SPC, KC_RGUI, MO(4)),
-    [_WIN] = LAYOUT_625_space(
-        LT(OSL(2), KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(4, KC_ENT),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, TD(TD_DOTCOM), OSL(2), OSM(MOD_RSFT),
-        KC_ESC, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, RGB_TOG),
-    [_FN1] = LAYOUT_625_space(
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-        GUI_T(KC_ESC), KC_PGUP, KC_VOLU, KC_DEL, KC_TRNS, KC_BSLS, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_TRNS,
-        KC_LSFT, KC_PGDN, KC_VOLD, BL_STEP, BL_TOGG, KC_SCLN, KC_QUOT, KC_SLSH, KC_DOT, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    [_FN2] = LAYOUT_625_space(
-        KC_PWR, KC_BRID, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, QK_BOOT,
-        MT(KC_LGUI, KC_ESC), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TG(1), KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    [_FN3] = LAYOUT_625_space(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT,
-        MT(KC_LGUI, KC_ESC), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TG(1), KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-
-};
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md
deleted file mode 100644
index e09e520131a..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# /u/Lbibass's 6.25u spacebar Mechmini 2.0 Layout. 
-
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk
deleted file mode 100755
index cf808a2b414..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE = yes	# Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h
deleted file mode 100755
index 2f35530627b..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define ONESHOT_TAP_TOGGLE 3
-#define TAPPING_TERM 200
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
deleted file mode 100755
index c9d9de82c05..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FN1 2
-#define _FN2 3
-#define _WIN 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_BL] = LAYOUT_split_space(
-        LT(2, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        GUI_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3, KC_ENT),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, MO(2), KC_RSFT,
-        KC_ESC, KC_LALT, KC_LCTL, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, RGB_TOG),
-    [_WIN] = LAYOUT_split_space(
-        LT(2, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3, KC_ENT),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, MO(2), KC_RSFT,
-        KC_ESC, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_LCTL, RGB_TOG),
-    [_FN1] = LAYOUT_split_space(
-        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_TRNS, KC_PGUP, KC_VOLU, KC_TRNS, KC_TRNS, KC_BSLS, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_TRNS,
-        KC_LSFT, KC_PGDN, KC_VOLD, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_DOT, KC_RSFT, KC_HOME,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    [_FN2] = LAYOUT_split_space(
-        KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT,
-        MT(KC_LGUI, KC_ESC), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TG(1), KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_END,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-};
-
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md
deleted file mode 100644
index 34888fbb194..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# /u/Lbibass's Split Space Mechmini 2.0 Layout
-
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk
deleted file mode 100755
index 7d50540f149..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE = yes	# Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = no
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h
deleted file mode 100755
index 262c423cc41..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* tapdance */
-#define TAPPING_TERM 180 
-
-/* space cadet stuff */
-#define LSPO_KEY KC_9
-#define RSPC_KEY KC_0
-#define DISABLE_SPACE_CADET_ROLLOVER
-
-/* leader stuff */
-#define LEADER_TIMEOUT 400
-#define LEADER_PER_KEY_TIMING 300
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
deleted file mode 100644
index 85725c8c5cf..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define base 0
-#define raise 1
-#define lower 2
-
-//Tap Dance Declarations
-enum {
-  TD_SEMI_QUOT = 0,
-  TD_COMM_MINUS = 1,
-  TD_DOT_EQUAL = 2,
-  TD_SLASH_BACKSLASH = 3
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for ;, twice for ' -not using this currently
-  [TD_SEMI_QUOT]  = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_QUOT),
-  //Tap once for , twice for -
-  [TD_COMM_MINUS]  = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_MINUS),
-  //Tap once for . twice for =
-  [TD_DOT_EQUAL]  = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_EQUAL),
-  //Tap once for / twice for '\'
-  [TD_SLASH_BACKSLASH]  = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS)
-};
-
-#define CTRL_ESC CTL_T(KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[base] = LAYOUT_2u_space_ortho(
-		KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
-		CTRL_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
-		SC_LSPO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     TD(1),    TD(2),    TD(3),    SC_RSPC,
-		KC_LCTL,    QK_LEAD,  KC_LALT,  KC_LGUI,  MO(1),        KC_SPC,         MO(2),    KC_VOLD,  KC_MPLY,  KC_VOLU,  KC_GRV),
-
-	[raise] = LAYOUT_2u_space_ortho(
-		_______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_DEL,
-		_______,    _______,  _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_QUOT,  _______,
-		_______,    KC_HOME,  KC_END,   _______,  _______,  _______,  _______,  _______,  KC_LBRC,  KC_RBRC,  _______,  _______,
-		_______,    _______,  _______,  _______,  _______,      _______,        _______,  KC_MPRV,  _______,  KC_MNXT,  EE_CLR),
-
-	[lower] = LAYOUT_2u_space_ortho(
-		_______,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
-		_______,    RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  KC_4,     KC_5,     KC_6,   KC_KP_PLUS, _______,
-		_______,    RGB_SAI,  RGB_SAD,  RGB_HUI,  RGB_HUD,  _______,  _______,  KC_1,     KC_2,     KC_3,  KC_KP_MINUS, _______,
-		_______,    _______,  _______,  _______,  _______,      _______,        _______,  KC_0,     _______,  _______,  _______)
-
-
-};
-
-//Leader maps
-void leader_end_user(void) {
-    if (leader_sequence_one_key(KC_F)) {
-        // Anything you can do in a macro.
-        SEND_STRING("QMK is awesome.");
-    }
-    //tableflip (LEADER - TF)
-    if (leader_sequence_two_keys(KC_T, KC_F)) {
-        set_unicode_input_mode(UNICODE_MODE_MACOS);
-        send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
-    }
-    //screencap (LEADER - SC)
-    if (leader_sequence_two_keys(KC_S, KC_C)) {
-        SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_4))));
-    }
-    //screencap (LEADER - TM)
-    if (leader_sequence_two_keys(KC_T, KC_M)) {
-        set_unicode_input_mode(UNICODE_MODE_MACOS);
-        register_unicode(0x2122); // ™
-    }
-    /*
-    if (leader_sequence_three_keys(KC_D, KC_D, KC_S)) {
-        SEND_STRING("https://start.duckduckgo.com"SS_TAP(X_ENTER));
-    }
-    */
-}
-
-//change colors and rgb modes on layer change
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case raise:
-        rgblight_mode_noeeprom(1);
-        rgblight_setrgb(0xc7, 0x00, 0xf4);
-        break;
-    case lower:
-        rgblight_mode_noeeprom(1);
-        rgblight_setrgb(0x00, 0xa3, 0x0d);
-        break;
-    default: // for any other layers, or the default layer
-        rgblight_mode_noeeprom(5);
-        rgblight_setrgb(0xFF, 0xB6, 0x00);
-        break;
-    }
-  return state;
-};
diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk
deleted file mode 100755
index c429a6486ff..00000000000
--- a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-CONSOLE_ENABLE = no	# Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-UNICODE_ENABLE = yes
-LEADER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
deleted file mode 100644
index 909bc7f83a5..00000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 91
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#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 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
-
-// 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
-#    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
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index bdf9e7fdf5a..af68bb84574 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -4,7 +4,58 @@
         "pid": "0xAEC1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "ws2812",
+        "max_brightness": 220,
+        "react_on_keyup": true,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"],
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index 6bdd06aba84..d63b339468f 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -1,65 +1,6 @@
 #pragma once
 
-//rgb matrix setting
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
-#define DRIVER_1_LED_TOTAL 32
-#define DRIVER_2_LED_TOTAL 36
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#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 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
-// 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
-#    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_DISABLE_KEYCODES
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 60fff3c7a78..fb88cb359db 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -4,7 +4,57 @@
         "pid": "0xAEC2"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"],
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index 9e5fe118954..d49d16e85a1 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 
     {0, C2_1,   C3_1,   C4_1}, //D102-A0-0
     {0, C5_1,   C6_1,   C7_1}, //D108-A1-1
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index ba93133857d..84075534e76 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -20,67 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_DRIVER SPID1 // default: SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 5 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
 
-#ifdef RGB_MATRIX_ENABLE
-//rgb matrix setting
-#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_SDA
-#define RGB_MATRIX_LED_COUNT 66
-
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#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 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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_DISABLE_KEYCODES
-
 #define I2C1_CLOCK_SPEED 400000
 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
 
-#endif
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_SDA
+
+#define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index 6064967f7f1..62acf349c05 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -4,7 +4,56 @@
         "pid": "0xAEC3"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "is31fl3741",
+        "react_on_keyup": true,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"],
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
index b13f223a1c1..33dd2157e40 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -17,75 +17,75 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* D9-K31-00 */
-    {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* D46-K00-01 */
-    {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* D59-K01-02 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* D73-K02-03 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* D75-K03-04 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* D77-K04-05 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* D79-K05-06 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* D81-K06-07 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* D83-K07-08 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* D85-K08-09 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* D87-K09-10 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* D90-K0A-11 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* D93-K0B-12 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* D95-K0C-13 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* D98-K0D-14 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* D100-K0E-15 */
-    {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* D94-K41-16 */
-    {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* D92-K10-17 */
-    {0, CS6_SW6, CS5_SW6, CS4_SW6}, /* D89-K11-18 */
-    {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* D86-K12-19 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* D84-K13-20 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* D82-K14-21 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* D80-K15-22 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* D78-K16-23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* D76-K17-24 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* D74-K18-25 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* D72-K19-26 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* D51-K1A-27 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* D10-K1B-28 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* D101-K1C-29 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* D104-K1D-30 */
-    {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* D108-K43-31 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* D111-K20-32 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* D114-K21-33 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* D117-K22-34 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* D120-K23-35 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* D123-K24-36 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* D126-K25-37 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* D129-K26-38 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* D133-K27-39 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* D142-K28-40 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* D146-K29-41 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* D160-K2A-42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* D167-K2B-43 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* D168-K2D-44 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW5_CS3, SW5_CS2, SW5_CS1}, /* D9-K31-00 */
+    {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* D46-K00-01 */
+    {0, SW9_CS6, SW9_CS5, SW9_CS4}, /* D59-K01-02 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* D73-K02-03 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* D75-K03-04 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* D77-K04-05 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* D79-K05-06 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* D81-K06-07 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* D83-K07-08 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* D85-K08-09 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* D87-K09-10 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* D90-K0A-11 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* D93-K0B-12 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* D95-K0C-13 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* D98-K0D-14 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* D100-K0E-15 */
+    {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* D94-K41-16 */
+    {0, SW4_CS6, SW4_CS5, SW4_CS4}, /* D92-K10-17 */
+    {0, SW6_CS6, SW6_CS5, SW6_CS4}, /* D89-K11-18 */
+    {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* D86-K12-19 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* D84-K13-20 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* D82-K14-21 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* D80-K15-22 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* D78-K16-23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* D76-K17-24 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* D74-K18-25 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* D72-K19-26 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* D51-K1A-27 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* D10-K1B-28 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* D101-K1C-29 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* D104-K1D-30 */
+    {0, SW3_CS3, SW3_CS2, SW3_CS1}, /* D108-K43-31 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* D111-K20-32 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* D114-K21-33 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* D117-K22-34 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* D120-K23-35 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* D123-K24-36 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* D126-K25-37 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* D129-K26-38 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* D133-K27-39 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* D142-K28-40 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* D146-K29-41 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* D160-K2A-42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* D167-K2B-43 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* D168-K2D-44 */
 
-    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* D163-K30-45 */
-    {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* D147-K31-46 */
-    {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* D144-K32-47 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* D137-K33-48 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* D130-K34-49 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* D127-K35-50 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* D124-K36-51 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* D121-K37-52 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* D118-K38-53 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* D115-K39-54 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* D112-K3A-55 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* D109-K3B-56 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* D105-K3D-57 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* D103-K3E-58 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* D163-K30-45 */
+    {0, SW8_CS6, SW8_CS5, SW8_CS4}, /* D147-K31-46 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* D144-K32-47 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* D137-K33-48 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* D130-K34-49 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* D127-K35-50 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* D124-K36-51 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* D121-K37-52 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* D118-K38-53 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* D115-K39-54 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* D112-K3A-55 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* D109-K3B-56 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* D105-K3D-57 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* D103-K3E-58 */
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* D163-K40-59 */
-    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* D147-K42-60 */
-    {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* D137-K44-61 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* D127-K46-62 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* D121-K48-63 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* D115-K4A-64 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* D103-K4E-65 */
+    {0, SW1_CS3, SW1_CS2, SW1_CS1}, /* D163-K40-59 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* D147-K42-60 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* D137-K44-61 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* D127-K46-62 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* D121-K48-63 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* D115-K4A-64 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* D103-K4E-65 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index 60dc290bfb2..3fd2a2a4902 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -1,59 +1,3 @@
 #pragma once
 
-//rgb matrix setting
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA
-#define RGB_MATRIX_LED_COUNT 25
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#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 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
-// 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
-#    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
diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json
index 59127ea64fb..6a0b8df2cf0 100644
--- a/keyboards/mechlovin/delphine/rgb_led/info.json
+++ b/keyboards/mechlovin/delphine/rgb_led/info.json
@@ -25,6 +25,55 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true
     }
 }
diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
index a55143f2e1c..feda05a0715 100644
--- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
+++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c
@@ -18,7 +18,7 @@
 
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 // left CA
     {0, C5_2,   C6_2,   C7_2}, //D2-0
     {0, C1_1,   C3_2,   C4_2}, //D20-1
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h
deleted file mode 100644
index 08006aa9966..00000000000
--- a/keyboards/mechlovin/hannah60rgb/rev1/config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 72
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#    define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    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 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
-// 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
-#    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
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json
index 3eeba2ab7e7..6a3510c7dfc 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json
@@ -12,7 +12,56 @@
         "pin": "A15"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "ws2812",
+        "react_on_keyup": true
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h
index 4a4f4c75563..ddcde6b2905 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -1,66 +1,7 @@
 #pragma once
 
-//rgb matrix setting
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
-#define DRIVER_1_LED_TOTAL 44
-#define DRIVER_2_LED_TOTAL 34
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#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 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
-// 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
-#    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
 
 #if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
 #    define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
index 84524c2331f..e6be250311c 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json
@@ -29,7 +29,56 @@
         "pin": "A15"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel"
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
index 2e3c8d00901..c6943cc3578 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
+++ b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c b/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
deleted file mode 100644
index e0634d85dca..00000000000
--- a/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- * Copyright 2021 Nazerim
- *
- * 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_split_bs(
-        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_SPC,  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_LSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-};
-
-bool led_update_user(led_t led_state) {
-
-	// Toggle CAPS_LOCK LED normally
-
-#    if LED_PIN_ON_STATE == 0
-        // invert the whole thing to avoid having to conditionally !led_state.x later
-        led_state.raw = ~led_state.raw;
-#    endif
-#    ifdef LED_CAPS_LOCK_PIN
-        writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
-#    endif
-
-	// Don't call led_update_kb
-    return false;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-	uint8_t layer = get_highest_layer(state);
-
-#if defined(LED_NUM_LOCK_PIN) && defined(LED_SCROLL_LOCK_PIN)
-    switch (layer) {
-        case 0:
-			writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
-			writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
-            break;
-        case 1:
-			writePin(LED_SCROLL_LOCK_PIN, LED_PIN_ON_STATE);
-			writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
-            break;
-        case 2:
-			writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
-			writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE);
-            break;
-        case 3:
-			writePin(LED_SCROLL_LOCK_PIN, LED_PIN_ON_STATE);
-			writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE);
-            break;
-    }
-#endif
-
-	return state;
-
-}
diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md b/keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md
deleted file mode 100644
index a8a686d8bc4..00000000000
--- a/keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Nazzer's Hex 4b - Layers on Scroll Lock and Num Lock LED
-
-Repurposed the Scroll Lock and Num Lock LED's as Hex 4b does not have a NUM pad and default layout does not map Scroll Lock
-- Top LED shows CAPS lock status
-- Layer indicators:
-- Layer 0: bottom LED off, middle LED off
-- Layer 1: bottom LED on , middle LED off
-- Layer 2: bottom LED off, middle LED on
-- Layer 3: bottom LED on , middle LED on
-
-## Changelog
-
-### 15/11/2021 - 0.0.1
-
-- Initial release
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
index 6e73aba5d9f..29520b6a8f2 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
@@ -16,63 +16,4 @@
 
 #pragma once
 
-//rgb matrix setting
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_MULTISPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_SDA
-#define RGB_MATRIX_LED_COUNT 91
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index 347ea1b3112..27a7b441e32 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -9,7 +9,56 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"],
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
index 5649f807124..8df305bb1a1 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
@@ -17,98 +17,98 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS34_SW1,   CS35_SW1,   CS36_SW1}, //D92-K00-0
-    {0, CS37_SW1,   CS38_SW1,   CS39_SW1}, //D94-K01-1
-    {0, CS31_SW1,   CS32_SW1,   CS33_SW1}, //D96-K02-2
-    {0, CS28_SW1,   CS29_SW1,   CS30_SW1}, //D98-K03-3
-    {0, CS25_SW1,   CS26_SW1,   CS27_SW1}, //D100-K04-4
-    {0, CS22_SW1,   CS23_SW1,   CS24_SW1}, //D102-K05-5
-    {0, CS19_SW1,   CS20_SW1,   CS21_SW1}, //D104-K06-6
-    {0, CS18_SW1,   CS17_SW1,   CS16_SW1}, //D106-K07-7
-    {0, CS15_SW1,   CS14_SW1,   CS13_SW1}, //D108-K08-8
-    {0, CS12_SW1,   CS11_SW1,   CS10_SW1}, //D110-K09-9
-    {0, CS9_SW1,    CS8_SW1,    CS7_SW1},  //D112-K0A-10
-    {0, CS6_SW1,    CS5_SW1,    CS4_SW1},  //D114-K0B-11
-    {0, CS3_SW1,    CS2_SW1,    CS1_SW1},  //D116-K0C-12
-    {0, CS15_SW7,   CS14_SW7,   CS13_SW7}, //D157-K0D-13
-    {0, CS18_SW7,   CS17_SW7,   CS16_SW7}, //D118-K0E-14
-    {0, CS19_SW7,   CS20_SW7,   CS21_SW7}, //D120-K0F-15
-    {0, CS12_SW7,   CS11_SW7,   CS10_SW7}, //D122-K0G-16
-    {0, CS34_SW2,   CS35_SW2,   CS36_SW2}, //D93-K10-17
-    {0, CS37_SW2,   CS38_SW2,   CS39_SW2}, //D95-K11-18
-    {0, CS31_SW2,   CS32_SW2,   CS33_SW2}, //D97-K12-19
-    {0, CS28_SW2,   CS29_SW2,   CS30_SW2}, //D99-K13-20
-    {0, CS25_SW2,   CS26_SW2,   CS27_SW2}, //D101-K14-21
-    {0, CS22_SW2,   CS23_SW2,   CS24_SW2}, //D103-K15-22
-    {0, CS19_SW2,   CS20_SW2,   CS21_SW2}, //D105-K16-23
-    {0, CS18_SW2,   CS17_SW2,   CS16_SW2}, //D107-K17-24
-    {0, CS15_SW2,   CS14_SW2,   CS13_SW2}, //D109-K18-25
-    {0, CS12_SW2,   CS11_SW2,   CS10_SW2}, //D111-K19-26
-    {0, CS9_SW2,    CS8_SW2,    CS7_SW2},  //D113-K1A-27
-    {0, CS6_SW2,    CS5_SW2,    CS4_SW2},  //D115-K1B-28
-    {0, CS3_SW2,    CS2_SW2,    CS1_SW2},  //D117-K1C-29
-    {0, CS3_SW8,    CS2_SW8,    CS1_SW8},  //D158-K1D-30
-    {0, CS3_SW7,    CS2_SW7,    CS1_SW7},  //D119-K1E-31
-    {0, CS18_SW8,   CS17_SW8,   CS16_SW8}, //D121-K1F-32
-    {0, CS9_SW9,    CS8_SW9,    CS7_SW9}, //D123-K1G-33
-    {0, CS34_SW3,   CS35_SW3,   CS36_SW3}, //D124-K20-34
-    {0, CS37_SW3,   CS38_SW3,   CS39_SW3}, //D127-K21-35
-    {0, CS31_SW3,   CS32_SW3,   CS33_SW3}, //D130-K22-36
-    {0, CS28_SW3,   CS29_SW3,   CS30_SW3}, //D133-K23-37
-    {0, CS25_SW3,   CS26_SW3,   CS27_SW3}, //D135-K24-38
-    {0, CS22_SW3,   CS23_SW3,   CS24_SW3}, //D137-K25-39
-    {0, CS19_SW3,   CS20_SW3,   CS21_SW3}, //D139-K26-40
-    {0, CS18_SW3,   CS17_SW3,   CS16_SW3}, //D142-K27-41
-    {0, CS15_SW3,   CS14_SW3,   CS13_SW3}, //D144-K28-42
-    {0, CS12_SW3,   CS11_SW3,   CS10_SW3}, //D146-K29-43
-    {0, CS9_SW3,    CS8_SW3,    CS7_SW3},  //D148-K2A-44
-    {0, CS6_SW3,    CS5_SW3,    CS4_SW3},  //D151-K2B-45
-    {0, CS3_SW3,    CS2_SW3,    CS1_SW3},  //D154-K2C-46
-    {0, CS6_SW8,    CS5_SW8,    CS4_SW8},  //D159-K2D-47
-    {0, CS6_SW7,    CS5_SW7,    CS4_SW7},  //D180-K2E-48
-    {0, CS19_SW8,   CS20_SW8,   CS21_SW8}, //D181-K2F-49
-    {0, CS9_SW7,    CS8_SW7,    CS7_SW7},  //D182-K2G-50
-    {0, CS34_SW4,   CS35_SW4,   CS36_SW4}, //D166-K30-51
-    {0, CS37_SW4,   CS38_SW4,   CS39_SW4}, //D167-K31-52
-    {0, CS31_SW4,   CS32_SW4,   CS33_SW4}, //D168-K32-53
-    {0, CS28_SW4,   CS29_SW4,   CS30_SW4}, //D169-K33-54
-    {0, CS25_SW4,   CS26_SW4,   CS27_SW4}, //D170-K34-55
-    {0, CS22_SW4,   CS23_SW4,   CS24_SW4}, //D171-K35-56
-    {0, CS19_SW4,   CS20_SW4,   CS21_SW4}, //D172-K36-57
-    {0, CS18_SW4,   CS17_SW4,   CS16_SW4}, //D173-K37-58
-    {0, CS15_SW4,   CS14_SW4,   CS13_SW4}, //D174-K38-59
-    {0, CS12_SW4,   CS11_SW4,   CS10_SW4}, //D175-K39-60
-    {0, CS9_SW4,    CS8_SW4,    CS7_SW4},  //D176-K3A-61
-    {0, CS6_SW4,    CS5_SW4,    CS4_SW4},  //D177-K3B-62
-    {0, CS3_SW4,    CS2_SW4,    CS1_SW4},  //D178-K3C-63
-    {0, CS9_SW8,    CS8_SW8,    CS7_SW8},  //D179-K3D-64
-    {0, CS34_SW5,   CS35_SW5,   CS36_SW5}, //D125-K40-65
-    {0, CS37_SW5,   CS38_SW5,   CS39_SW5}, //D128-K41-66
-    {0, CS31_SW5,   CS32_SW5,   CS33_SW5}, //D131-K42-67
-    {0, CS28_SW5,   CS29_SW5,   CS30_SW5}, //D134-K43-68
-    {0, CS25_SW5,   CS26_SW5,   CS27_SW5}, //D136-K44-69
-    {0, CS22_SW5,   CS23_SW5,   CS24_SW5}, //D138-K45-70
-    {0, CS19_SW5,   CS20_SW5,   CS21_SW5}, //D140-K46-71
-    {0, CS18_SW5,   CS17_SW5,   CS16_SW5}, //D143-K47-72
-    {0, CS15_SW5,   CS14_SW5,   CS13_SW5}, //D145-K48-73
-    {0, CS12_SW5,   CS11_SW5,   CS10_SW5}, //D147-K49-74
-    {0, CS9_SW5,    CS8_SW5,    CS7_SW5},  //D149-K4A-75
-    {0, CS6_SW5,    CS5_SW5,    CS4_SW5},  //D152-K4B-76
-    {0, CS3_SW5,    CS2_SW5,    CS1_SW5},  //D155-K4C-77
-    {0, CS12_SW8,   CS11_SW8,   CS10_SW8}, //D160-K4D-78
-    {0, CS12_SW9,   CS11_SW9,   CS10_SW9}, //D163-K4E-79
-    {0, CS34_SW6,   CS35_SW6,   CS36_SW6}, //D126-K20-80
-    {0, CS37_SW6,   CS38_SW6,   CS39_SW6}, //D129-K21-81
-    {0, CS31_SW6,   CS32_SW6,   CS33_SW6}, //D132-K22-82
-    {0, CS19_SW6,   CS20_SW6,   CS21_SW6}, //D141-K26-83
-    {0, CS9_SW6,    CS8_SW6,    CS7_SW6},  //D150-K2A-84
-    {0, CS6_SW6,    CS5_SW6,    CS4_SW6},  //D153-K2B-85
-    {0, CS3_SW6,    CS2_SW6,    CS1_SW6},  //D156-K2C-86
-    {0, CS15_SW8,   CS14_SW8,   CS13_SW8}, //D161-K2D-87
-    {0, CS15_SW9,   CS14_SW9,   CS13_SW9}, //D162-K2E-88
-    {0, CS18_SW9,   CS17_SW9,   CS16_SW9}, //D164-K2F-89
-    {0, CS19_SW9,   CS20_SW9,   CS21_SW9}, //D165-K2G-90
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS34,   SW1_CS35,   SW1_CS36}, //D92-K00-0
+    {0, SW1_CS37,   SW1_CS38,   SW1_CS39}, //D94-K01-1
+    {0, SW1_CS31,   SW1_CS32,   SW1_CS33}, //D96-K02-2
+    {0, SW1_CS28,   SW1_CS29,   SW1_CS30}, //D98-K03-3
+    {0, SW1_CS25,   SW1_CS26,   SW1_CS27}, //D100-K04-4
+    {0, SW1_CS22,   SW1_CS23,   SW1_CS24}, //D102-K05-5
+    {0, SW1_CS19,   SW1_CS20,   SW1_CS21}, //D104-K06-6
+    {0, SW1_CS18,   SW1_CS17,   SW1_CS16}, //D106-K07-7
+    {0, SW1_CS15,   SW1_CS14,   SW1_CS13}, //D108-K08-8
+    {0, SW1_CS12,   SW1_CS11,   SW1_CS10}, //D110-K09-9
+    {0, SW1_CS9,    SW1_CS8,    SW1_CS7},  //D112-K0A-10
+    {0, SW1_CS6,    SW1_CS5,    SW1_CS4},  //D114-K0B-11
+    {0, SW1_CS3,    SW1_CS2,    SW1_CS1},  //D116-K0C-12
+    {0, SW7_CS15,   SW7_CS14,   SW7_CS13}, //D157-K0D-13
+    {0, SW7_CS18,   SW7_CS17,   SW7_CS16}, //D118-K0E-14
+    {0, SW7_CS19,   SW7_CS20,   SW7_CS21}, //D120-K0F-15
+    {0, SW7_CS12,   SW7_CS11,   SW7_CS10}, //D122-K0G-16
+    {0, SW2_CS34,   SW2_CS35,   SW2_CS36}, //D93-K10-17
+    {0, SW2_CS37,   SW2_CS38,   SW2_CS39}, //D95-K11-18
+    {0, SW2_CS31,   SW2_CS32,   SW2_CS33}, //D97-K12-19
+    {0, SW2_CS28,   SW2_CS29,   SW2_CS30}, //D99-K13-20
+    {0, SW2_CS25,   SW2_CS26,   SW2_CS27}, //D101-K14-21
+    {0, SW2_CS22,   SW2_CS23,   SW2_CS24}, //D103-K15-22
+    {0, SW2_CS19,   SW2_CS20,   SW2_CS21}, //D105-K16-23
+    {0, SW2_CS18,   SW2_CS17,   SW2_CS16}, //D107-K17-24
+    {0, SW2_CS15,   SW2_CS14,   SW2_CS13}, //D109-K18-25
+    {0, SW2_CS12,   SW2_CS11,   SW2_CS10}, //D111-K19-26
+    {0, SW2_CS9,    SW2_CS8,    SW2_CS7},  //D113-K1A-27
+    {0, SW2_CS6,    SW2_CS5,    SW2_CS4},  //D115-K1B-28
+    {0, SW2_CS3,    SW2_CS2,    SW2_CS1},  //D117-K1C-29
+    {0, SW8_CS3,    SW8_CS2,    SW8_CS1},  //D158-K1D-30
+    {0, SW7_CS3,    SW7_CS2,    SW7_CS1},  //D119-K1E-31
+    {0, SW8_CS18,   SW8_CS17,   SW8_CS16}, //D121-K1F-32
+    {0, SW9_CS9,    SW9_CS8,    SW9_CS7}, //D123-K1G-33
+    {0, SW3_CS34,   SW3_CS35,   SW3_CS36}, //D124-K20-34
+    {0, SW3_CS37,   SW3_CS38,   SW3_CS39}, //D127-K21-35
+    {0, SW3_CS31,   SW3_CS32,   SW3_CS33}, //D130-K22-36
+    {0, SW3_CS28,   SW3_CS29,   SW3_CS30}, //D133-K23-37
+    {0, SW3_CS25,   SW3_CS26,   SW3_CS27}, //D135-K24-38
+    {0, SW3_CS22,   SW3_CS23,   SW3_CS24}, //D137-K25-39
+    {0, SW3_CS19,   SW3_CS20,   SW3_CS21}, //D139-K26-40
+    {0, SW3_CS18,   SW3_CS17,   SW3_CS16}, //D142-K27-41
+    {0, SW3_CS15,   SW3_CS14,   SW3_CS13}, //D144-K28-42
+    {0, SW3_CS12,   SW3_CS11,   SW3_CS10}, //D146-K29-43
+    {0, SW3_CS9,    SW3_CS8,    SW3_CS7},  //D148-K2A-44
+    {0, SW3_CS6,    SW3_CS5,    SW3_CS4},  //D151-K2B-45
+    {0, SW3_CS3,    SW3_CS2,    SW3_CS1},  //D154-K2C-46
+    {0, SW8_CS6,    SW8_CS5,    SW8_CS4},  //D159-K2D-47
+    {0, SW7_CS6,    SW7_CS5,    SW7_CS4},  //D180-K2E-48
+    {0, SW8_CS19,   SW8_CS20,   SW8_CS21}, //D181-K2F-49
+    {0, SW7_CS9,    SW7_CS8,    SW7_CS7},  //D182-K2G-50
+    {0, SW4_CS34,   SW4_CS35,   SW4_CS36}, //D166-K30-51
+    {0, SW4_CS37,   SW4_CS38,   SW4_CS39}, //D167-K31-52
+    {0, SW4_CS31,   SW4_CS32,   SW4_CS33}, //D168-K32-53
+    {0, SW4_CS28,   SW4_CS29,   SW4_CS30}, //D169-K33-54
+    {0, SW4_CS25,   SW4_CS26,   SW4_CS27}, //D170-K34-55
+    {0, SW4_CS22,   SW4_CS23,   SW4_CS24}, //D171-K35-56
+    {0, SW4_CS19,   SW4_CS20,   SW4_CS21}, //D172-K36-57
+    {0, SW4_CS18,   SW4_CS17,   SW4_CS16}, //D173-K37-58
+    {0, SW4_CS15,   SW4_CS14,   SW4_CS13}, //D174-K38-59
+    {0, SW4_CS12,   SW4_CS11,   SW4_CS10}, //D175-K39-60
+    {0, SW4_CS9,    SW4_CS8,    SW4_CS7},  //D176-K3A-61
+    {0, SW4_CS6,    SW4_CS5,    SW4_CS4},  //D177-K3B-62
+    {0, SW4_CS3,    SW4_CS2,    SW4_CS1},  //D178-K3C-63
+    {0, SW8_CS9,    SW8_CS8,    SW8_CS7},  //D179-K3D-64
+    {0, SW5_CS34,   SW5_CS35,   SW5_CS36}, //D125-K40-65
+    {0, SW5_CS37,   SW5_CS38,   SW5_CS39}, //D128-K41-66
+    {0, SW5_CS31,   SW5_CS32,   SW5_CS33}, //D131-K42-67
+    {0, SW5_CS28,   SW5_CS29,   SW5_CS30}, //D134-K43-68
+    {0, SW5_CS25,   SW5_CS26,   SW5_CS27}, //D136-K44-69
+    {0, SW5_CS22,   SW5_CS23,   SW5_CS24}, //D138-K45-70
+    {0, SW5_CS19,   SW5_CS20,   SW5_CS21}, //D140-K46-71
+    {0, SW5_CS18,   SW5_CS17,   SW5_CS16}, //D143-K47-72
+    {0, SW5_CS15,   SW5_CS14,   SW5_CS13}, //D145-K48-73
+    {0, SW5_CS12,   SW5_CS11,   SW5_CS10}, //D147-K49-74
+    {0, SW5_CS9,    SW5_CS8,    SW5_CS7},  //D149-K4A-75
+    {0, SW5_CS6,    SW5_CS5,    SW5_CS4},  //D152-K4B-76
+    {0, SW5_CS3,    SW5_CS2,    SW5_CS1},  //D155-K4C-77
+    {0, SW8_CS12,   SW8_CS11,   SW8_CS10}, //D160-K4D-78
+    {0, SW9_CS12,   SW9_CS11,   SW9_CS10}, //D163-K4E-79
+    {0, SW6_CS34,   SW6_CS35,   SW6_CS36}, //D126-K20-80
+    {0, SW6_CS37,   SW6_CS38,   SW6_CS39}, //D129-K21-81
+    {0, SW6_CS31,   SW6_CS32,   SW6_CS33}, //D132-K22-82
+    {0, SW6_CS19,   SW6_CS20,   SW6_CS21}, //D141-K26-83
+    {0, SW6_CS9,    SW6_CS8,    SW6_CS7},  //D150-K2A-84
+    {0, SW6_CS6,    SW6_CS5,    SW6_CS4},  //D153-K2B-85
+    {0, SW6_CS3,    SW6_CS2,    SW6_CS1},  //D156-K2C-86
+    {0, SW8_CS15,   SW8_CS14,   SW8_CS13}, //D161-K2D-87
+    {0, SW9_CS15,   SW9_CS14,   SW9_CS13}, //D162-K2E-88
+    {0, SW9_CS18,   SW9_CS17,   SW9_CS16}, //D164-K2F-89
+    {0, SW9_CS19,   SW9_CS20,   SW9_CS21}, //D165-K2G-90
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h
index eee31e69ef2..8e7f7780042 100644
--- a/keyboards/mechlovin/infinity875/config.h
+++ b/keyboards/mechlovin/infinity875/config.h
@@ -37,10 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 42
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#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 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#endif
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
index bb249cf39be..cb8154a713e 100644
--- a/keyboards/mechlovin/infinity875/info.json
+++ b/keyboards/mechlovin/infinity875/info.json
@@ -9,7 +9,9 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "sleep": true
     },
     "indicators": {
         "caps_lock": "D6",
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
deleted file mode 100644
index 35480dc83c7..00000000000
--- a/keyboards/mechlovin/olly/jf/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 mechlovin
-
-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
-
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 19
-
-/*
- * 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 { D5, D6, A5, A4, A3, A6}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index cb0ab92fb47..b67551a111b 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -1,686 +1,37 @@
 {
-    "keyboard_name": "Olly JF",
     "manufacturer": "Mechlovin.Studio",
     "url": "",
     "maintainer": "Mechlovin' Studio",
     "usb": {
-        "vid": "0x4D4C",
-        "pid": "0xD180",
-        "device_version": "0.0.1"
+        "vid": "0x4D4C"
     },
-    "backlight": {
-        "pin": "D4",
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "B0",
-        "num_lock": "B1",
-        "scroll_lock": "B2"
+    "features": {
+        "nkro": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true
     },
+    "diode_direction": "ROW2COL",
     "rgblight": {
         "led_count": 27,
         "sleep": true,
         "animations": {
+            "alternating": true,
             "breathing": true,
+            "christmas": true,
+            "knight": true,
             "rainbow_mood": true,
             "rainbow_swirl": true,
+            "rgb_test": true,
             "snake": true,
-            "knight": true,
-            "christmas": true,
             "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
             "twinkle": true
         }
     },
-    "ws2812": {
-        "pin": "B3"
-    },
     "bootmagic": {
         "matrix": [1, 14]
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
-                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
-                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
-                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
-                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
-                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
-                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
-                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
-                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
-                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        }
     }
 }
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/readme.md b/keyboards/mechlovin/olly/jf/keymaps/via/readme.md
deleted file mode 100644
index 0453b5aef0d..00000000000
--- a/keyboards/mechlovin/olly/jf/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The VIA keymap for Olly JF
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/matrix_diagram.md b/keyboards/mechlovin/olly/jf/matrix_diagram.md
deleted file mode 100644
index 6cc49f8b93b..00000000000
--- a/keyboards/mechlovin/olly/jf/matrix_diagram.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Matrix Diagram for Mechlovin.Studio Olly JF
-
-```
-┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐
-│00 │   │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C ││0E ││0F │0G │0H │0I │
-└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┘└───┴───┴───┴───┘
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐    ┌───────┐
-│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │0D ││1E ││1F │1G │1H │1I │    │1D     │ 2u Backspace
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤    └─┬─────┤   ┌───┐
-│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E ││2F │2G │2H │2I │      │     │   │   │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┼───┤   ┌──┴┐3D  │   │3I │ 2u Numpad Plus
-│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │     │3F │3G │3H │3I │   │3C │    │   │   │
-├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ├───┼───┼───┼───┤   └───┴────┘   ├───┤
-│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │┌───┐│4F │4G │4H │4I │    ISO Enter   │   │
-├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬────┼───┘│4E │└───┼───┼───┼───┤                │5I │ 2u Numpad Enter
-│50   │51 │53   │56                      │5A  │5B  │5C  │┌───┼───┼───┐│5G │5H │5I │                │   │
-└─────┴───┴─────┴────────────────────────┴────┴────┴────┘│5D │5E │5F │└───┴───┴───┘                └───┘
-                                                         └───┴───┴───┘
-┌────────┐                                       ┌──────────┐         ┌───────┐
-│40      │ 2.25u LShift             2.75u RShift │4C        │         │5G     │ 2u Numpad Zero
-└────────┘                                       └──────────┘         └───────┘
-┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐
-│50  │51  │53  │56                      │5A   │5B   │5C │
-└────┴────┴────┴────────────────────────┴─────┴─────┴───┘
-┌────┬────┬────┬────────────────────────┬─────┬───┬─────┐
-│50  │51  │53  │56                      │5A   │5B │5C   │
-└────┴────┴────┴────────────────────────┴─────┴───┴─────┘
-┌────┬────┬────┬────────────────────────┬─────┬────┬────┐
-│50  │51  │53  │56                      │5A   │5B  │5C  │
-└────┴────┴────┴────────────────────────┴─────┴────┴────┘
-┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐
-│50  │51  │53  │56                      │5A   │5B   │5C │
-└────┴────┴────┴────────────────────────┴─────┴─────┴───┘
-┌─────┬───┬─────┬──────────────────────────┬─────┬──────┐
-│50   │51 │53   │56                        │5B   │5C    │ RWKL
-└─────┴───┴─────┴──────────────────────────┴─────┴──────┘
-```
diff --git a/keyboards/mechlovin/olly/jf/readme.md b/keyboards/mechlovin/olly/jf/readme.md
index fe9cf38cadd..c40a8dfd5e4 100644
--- a/keyboards/mechlovin/olly/jf/readme.md
+++ b/keyboards/mechlovin/olly/jf/readme.md
@@ -18,7 +18,11 @@ Flashing example for this keyboard:
 
 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 Key:** 3 ways to put the Olly JF into bootloader:
-By keycode: Press the key mapped to `QK_BOOT` if it is available.
-By Bootloader: hold ESC key while plugging in (jump to bootloader)
-By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file
+## Bootloader
+
+Enter the bootloader in 4 ways:
+
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
+* **Bootloader reset**: hold ESC (0,0) key while plugging in (jump to bootloader)
+* **Bootmagic reset**: hold Insert (1,14) key while pluging in (jump to bootloader and reset EEPROM)
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/info.json
new file mode 100644
index 00000000000..0b6aec094f8
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev1/info.json
@@ -0,0 +1,675 @@
+{
+    "keyboard_name": "Olly JF Rev1",
+    "usb": {
+        "pid": "0xD180",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true
+    },
+    "matrix_pins": {
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "rows": ["D5", "D6", "A5", "A4", "A3", "A6"],
+        "custom_lite": true
+    },
+    "matrix_size": {
+        "cols": 19,
+        "rows": 6
+    },
+    "backlight": {
+        "pin": "D4",
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "B0",
+        "num_lock": "B1",
+        "scroll_lock": "B2"
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+                {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+                {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+                {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+                {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default/readme.md b/keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default/readme.md
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_ansi/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default_ansi/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_ansi_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi_split_bs_rshift/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default_ansi_split_bs_rshift/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi_split_bs_rshift/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_iso/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default_iso/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_iso_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso_split_bs_rshift/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default_iso_split_bs_rshift/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso_split_bs_rshift/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/config.h b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/config.h
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/via/config.h
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/via/config.h
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/via/keymap.c
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/rules.mk b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechwild/mokulua/standard/keymaps/silly/rules.mk
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/via/rules.mk
diff --git a/keyboards/mechlovin/olly/jf/matrix.c b/keyboards/mechlovin/olly/jf/rev1/matrix.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/matrix.c
rename to keyboards/mechlovin/olly/jf/rev1/matrix.c
diff --git a/keyboards/mechlovin/olly/jf/rev1/matrix_diagram.md b/keyboards/mechlovin/olly/jf/rev1/matrix_diagram.md
new file mode 100644
index 00000000000..63e54765013
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev1/matrix_diagram.md
@@ -0,0 +1,37 @@
+# Matrix Diagram for Mechlovin.Studio Olly JF Rev. 1
+
+```
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐
+│00 │   │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C ││0E ││0F │0G │0H │0I │
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┘└───┴───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │0D ││1E ││1F │1G │1H │1I │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤    └─┬─────┤   ┌───┐
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E ││2F │2G │2H │2I │      │     │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┼───┤   ┌──┴┐3D  │   │3I │ 2u Numpad Plus
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │     │3F │3G │3H │3I │   │3C │    │   │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ├───┼───┼───┼───┤   └───┴────┘   ├───┤
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │┌───┐│4F │4G │4H │4I │    ISO Enter   │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬────┼───┘│4E │└───┼───┼───┼───┤                │5I │ 2u Numpad Enter
+│50   │51 │53   │56                      │5A  │5B  │5C  │┌───┼───┼───┐│5G │5H │5I │                │   │
+└─────┴───┴─────┴────────────────────────┴────┴────┴────┘│5D │5E │5F │└───┴───┴───┘                └───┘
+                                                         └───┴───┴───┘
+┌────────┐                                       ┌──────────┐         ┌───────┐
+│40      │ 2.25u LShift             2.75u RShift │4C        │         │5G     │ 2u Numpad Zero
+└────────┘                                       └──────────┘         └───────┘
+┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐
+│50  │51  │53  │56                      │5A   │5B   │5C │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┘
+┌────┬────┬────┬────────────────────────┬─────┬───┬─────┐
+│50  │51  │53  │56                      │5A   │5B │5C   │
+└────┴────┴────┴────────────────────────┴─────┴───┴─────┘
+┌────┬────┬────┬────────────────────────┬─────┬────┬────┐
+│50  │51  │53  │56                      │5A   │5B  │5C  │
+└────┴────┴────┴────────────────────────┴─────┴────┴────┘
+┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐
+│50  │51  │53  │56                      │5A   │5B   │5C │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┘
+┌─────┬───┬─────┬──────────────────────────┬─────┬──────┐
+│50   │51 │53   │56                        │5B   │5C    │ RWKL
+└─────┴───┴─────┴──────────────────────────┴─────┴──────┘
+```
diff --git a/keyboards/mechlovin/olly/jf/rev1/readme.md b/keyboards/mechlovin/olly/jf/rev1/readme.md
new file mode 100644
index 00000000000..f6c114fee62
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev1/readme.md
@@ -0,0 +1,27 @@
+# Mechlovin Olly JF Rev. 1
+
+![jf](https://i.imgur.com/IrfTGE7h.png)
+
+Olly JF PCB, compatible Duck Jetfire keyboard.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://mechlovin.studio/)
+* Hardware Supported: Jetfire Korean Kustom
+* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/olly/jf/rev1:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/olly/jf/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 3 ways:
+
+By keycode: Press the key mapped to `QK_BOOT` if it is available.
+By Bootloader: hold ESC key while plugging in (jump to bootloader)
+By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/jf.c b/keyboards/mechlovin/olly/jf/rev1/rev1.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/jf.c
rename to keyboards/mechlovin/olly/jf/rev1/rev1.c
diff --git a/keyboards/mechlovin/olly/jf/rev1/rules.mk b/keyboards/mechlovin/olly/jf/rev1/rules.mk
new file mode 100644
index 00000000000..4442aba67de
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev1/rules.mk
@@ -0,0 +1,4 @@
+# Processor frequency
+F_CPU = 16000000
+
+SRC += matrix.c
diff --git a/keyboards/mechlovin/olly/jf/rev2/config.h b/keyboards/mechlovin/olly/jf/rev2/config.h
new file mode 100644
index 00000000000..9f70d27fba7
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/config.h
@@ -0,0 +1,28 @@
+/*
+Copyright 2023 Mechlovin'
+
+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 IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA
+
+#define I2C_DRIVER I2CD2
+#define I2C1_SCL_PIN B10
+#define I2C1_SDA_PIN B11
+#define LED_MATRIX_LED_COUNT 114
+
+#define I2C1_CLOCK_SPEED 400000
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
diff --git a/keyboards/mechlovin/olly/jf/rev2/halconf.h b/keyboards/mechlovin/olly/jf/rev2/halconf.h
new file mode 100644
index 00000000000..090c0b3d3bd
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/halconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_SPI TRUE
+
+
+#include_next <halconf.h>
+
diff --git a/keyboards/mechlovin/olly/jf/rev2/info.json b/keyboards/mechlovin/olly/jf/rev2/info.json
new file mode 100644
index 00000000000..600bf8a3af3
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/info.json
@@ -0,0 +1,707 @@
+{
+    "keyboard_name": "Olly JF Rev2",
+    "bootloader": "stm32duino",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "command": true,
+        "console": true,
+        "led_matrix": true,
+        "nkro": true
+    },
+    "led_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "breathing": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_up_down": true,
+            "dual_beacon": true,
+            "solid_multisplash": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true
+        },
+        "driver": "is31fl3731",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 37, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 49, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 62, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 74, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 87, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 99, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 122, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 137, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 140, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 162, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 174, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 186, "y": 0, "flags": 4},
+            {"matrix": [0, 16], "x": 199, "y": 0, "flags": 4},
+            {"matrix": [0, 17], "x": 211, "y": 0, "flags": 4},
+            {"matrix": [0, 18], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
+            {"matrix": [1, 1], "x": 12, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 13, "flags": 4},
+            {"matrix": [1, 3], "x": 37, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 49, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 62, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 74, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 87, "y": 13, "flags": 4},
+            {"matrix": [1, 8], "x": 99, "y": 13, "flags": 4},
+            {"matrix": [1, 9], "x": 122, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 124, "y": 13, "flags": 4},
+            {"matrix": [1, 11], "x": 137, "y": 13, "flags": 4},
+            {"matrix": [1, 12], "x": 140, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 162, "y": 13, "flags": 4},
+            {"matrix": [1, 14], "x": 174, "y": 13, "flags": 4},
+            {"matrix": [1, 15], "x": 186, "y": 13, "flags": 4},
+            {"matrix": [1, 16], "x": 199, "y": 13, "flags": 4},
+            {"matrix": [1, 17], "x": 211, "y": 13, "flags": 4},
+            {"matrix": [1, 18], "x": 224, "y": 13, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 25, "flags": 4},
+            {"matrix": [2, 1], "x": 12, "y": 25, "flags": 4},
+            {"matrix": [2, 2], "x": 24, "y": 25, "flags": 4},
+            {"matrix": [2, 3], "x": 37, "y": 25, "flags": 4},
+            {"matrix": [2, 4], "x": 49, "y": 25, "flags": 4},
+            {"matrix": [2, 5], "x": 62, "y": 25, "flags": 4},
+            {"matrix": [2, 6], "x": 74, "y": 25, "flags": 4},
+            {"matrix": [2, 7], "x": 87, "y": 25, "flags": 4},
+            {"matrix": [2, 8], "x": 99, "y": 25, "flags": 4},
+            {"matrix": [2, 9], "x": 122, "y": 25, "flags": 4},
+            {"matrix": [2, 10], "x": 124, "y": 25, "flags": 4},
+            {"matrix": [2, 11], "x": 137, "y": 25, "flags": 4},
+            {"matrix": [2, 12], "x": 140, "y": 25, "flags": 4},
+            {"matrix": [2, 13], "x": 162, "y": 25, "flags": 4},
+            {"matrix": [2, 14], "x": 174, "y": 25, "flags": 4},
+            {"matrix": [2, 15], "x": 186, "y": 25, "flags": 4},
+            {"matrix": [2, 16], "x": 199, "y": 25, "flags": 4},
+            {"matrix": [2, 17], "x": 211, "y": 25, "flags": 4},
+            {"matrix": [2, 18], "x": 224, "y": 25, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4},
+            {"matrix": [3, 1], "x": 12, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 24, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 37, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 49, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 62, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 74, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 87, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 99, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 122, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 124, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 137, "y": 38, "flags": 4},
+            {"matrix": [3, 12], "x": 140, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 162, "y": 38, "flags": 4},
+            {"matrix": [3, 15], "x": 186, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 199, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 211, "y": 38, "flags": 4},
+            {"matrix": [3, 18], "x": 224, "y": 38, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4},
+            {"matrix": [4, 1], "x": 12, "y": 51, "flags": 4},
+            {"matrix": [4, 2], "x": 24, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 37, "y": 51, "flags": 4},
+            {"matrix": [4, 4], "x": 49, "y": 51, "flags": 4},
+            {"matrix": [4, 5], "x": 62, "y": 51, "flags": 4},
+            {"matrix": [4, 6], "x": 74, "y": 51, "flags": 4},
+            {"matrix": [4, 7], "x": 87, "y": 51, "flags": 4},
+            {"matrix": [4, 8], "x": 99, "y": 51, "flags": 4},
+            {"matrix": [4, 9], "x": 122, "y": 51, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 51, "flags": 4},
+            {"matrix": [4, 11], "x": 137, "y": 51, "flags": 4},
+            {"matrix": [4, 12], "x": 140, "y": 51, "flags": 4},
+            {"matrix": [4, 13], "x": 162, "y": 51, "flags": 4},
+            {"matrix": [4, 14], "x": 174, "y": 51, "flags": 4},
+            {"matrix": [4, 15], "x": 186, "y": 51, "flags": 4},
+            {"matrix": [4, 16], "x": 199, "y": 51, "flags": 4},
+            {"matrix": [4, 17], "x": 211, "y": 51, "flags": 4},
+            {"matrix": [4, 18], "x": 224, "y": 51, "flags": 4},
+            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [5, 1], "x": 12, "y": 64, "flags": 4},
+            {"matrix": [5, 3], "x": 37, "y": 64, "flags": 4},
+            {"matrix": [5, 6], "x": 74, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 124, "y": 64, "flags": 4},
+            {"matrix": [5, 11], "x": 137, "y": 64, "flags": 4},
+            {"matrix": [5, 12], "x": 140, "y": 64, "flags": 4},
+            {"matrix": [5, 13], "x": 162, "y": 64, "flags": 4},
+            {"matrix": [5, 14], "x": 174, "y": 64, "flags": 4},
+            {"matrix": [5, 15], "x": 186, "y": 64, "flags": 4},
+            {"matrix": [5, 16], "x": 199, "y": 64, "flags": 4},
+            {"matrix": [5, 17], "x": 211, "y": 64, "flags": 4},
+            {"matrix": [5, 18], "x": 224, "y": 64, "flags": 4}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A8", "A15", "B3", "B4", "C15", "C14", "C13", "B9", "B8", "B7", "B6"],
+        "rows": ["B0", "B1", "B2", "B15", "B14", "B13"]
+    },
+    "processor": "STM32F103",
+    "usb": {
+        "device_version": "0.0.2",
+        "pid": "0xD182"
+    },
+    "ws2812": {
+        "driver": "spi",
+        "pin": "B5"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [2, 13], "x": 14, "y": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [2, 13], "x": 14, "y": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [2, 13], "x": 14, "y": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..e2a5ef0d0d6
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * 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(
+        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_HOME, KC_END,  KC_PGUP, 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_DEL,  KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
+        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_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_RSFT,          KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT, KC_PENT
+    )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c
new file mode 100644
index 00000000000..2cc1518feee
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * 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_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_F13,     KC_HOME, KC_END,  KC_PGUP, 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_INS,     KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
+        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_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT, KC_PENT
+    )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..b28913c49bf
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * 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_ansi_split_bs_rshift(
+        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_HOME, KC_END,  KC_PGUP, 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_DEL,     KC_INS,     KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
+        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_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT, KC_PENT
+    )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c
new file mode 100644
index 00000000000..9a59431a64a
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * 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(
+        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_HOME, KC_END,  KC_PGUP, 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_INS,     KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
+        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_DEL,     KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_PPLS,
+        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, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT, KC_PENT
+    )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..196b855ceb4
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * 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_split_bs_rshift(
+        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_HOME, KC_END,  KC_PGUP, 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_DEL,     KC_INS,     KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
+        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_DEL,     KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_PPLS,
+        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_RSFT,             KC_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT, KC_PENT
+    )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..477d7bac2ad
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * 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(
+        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_HOME, KC_END,  KC_PGUP, 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_DEL,  KC_INS,           KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
+        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_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT, KC_SPC,  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_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT, KC_PENT
+    )
+};
diff --git a/keyboards/torn/keymaps/kinesish/rules.mk b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/torn/keymaps/kinesish/rules.mk
rename to keyboards/mechlovin/olly/jf/rev2/keymaps/via/rules.mk
diff --git a/keyboards/mechlovin/olly/jf/rev2/matrix_diagram.md b/keyboards/mechlovin/olly/jf/rev2/matrix_diagram.md
new file mode 100644
index 00000000000..776bba84f8a
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/matrix_diagram.md
@@ -0,0 +1,37 @@
+# Matrix Diagram for Mechlovin.Studio Olly JF Rev. 2
+
+```
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐
+│00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E ││0F │0G │0H │0I │
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┘└───┴───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D ││1E ││1F │1G │1H │1I │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤    └─┬─────┤   ┌───┐
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │3C   ││2E ││2F │2G │2H │2I │      │     │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┼───┤   ┌──┴┐3D  │   │3I │ 2u Numpad Plus
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │     │3F │3G │3H │3I │   │3C │    │   │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ├───┼───┼───┼───┤   └───┴────┘   ├───┤
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │┌───┐│4F │4G │4H │4I │    ISO Enter   │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬────┼───┘│4E │└───┼───┼───┼───┤                │5I │ 2u Numpad Enter
+│50   │51 │53   │56                      │5A  │5B  │5C  │┌───┼───┼───┐│5G │5H │5I │                │   │
+└─────┴───┴─────┴────────────────────────┴────┴────┴────┘│5D │5E │5F │└───┴───┴───┘                └───┘
+                                                         └───┴───┴───┘
+┌────────┐                                       ┌──────────┐         ┌───────┐
+│40      │ 2.25u LShift             2.75u RShift │4C        │         │5G     │ 2u Numpad Zero
+└────────┘                                       └──────────┘         └───────┘
+┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐
+│50  │51  │53  │56                      │5A   │5B   │5C │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┘
+┌────┬────┬────┬────────────────────────┬─────┬───┬─────┐
+│50  │51  │53  │56                      │5A   │5B │5C   │
+└────┴────┴────┴────────────────────────┴─────┴───┴─────┘
+┌────┬────┬────┬────────────────────────┬─────┬────┬────┐
+│50  │51  │53  │56                      │5A   │5B  │5C  │
+└────┴────┴────┴────────────────────────┴─────┴────┴────┘
+┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐
+│50  │51  │53  │56                      │5A   │5B   │5C │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┘
+┌─────┬───┬─────┬──────────────────────────┬─────┬──────┐
+│50   │51 │53   │56                        │5B   │5C    │ RWKL
+└─────┴───┴─────┴──────────────────────────┴─────┴──────┘
+```
diff --git a/keyboards/mechlovin/olly/jf/rev2/mcuconf.h b/keyboards/mechlovin/olly/jf/rev2/mcuconf.h
new file mode 100644
index 00000000000..b987f486b93
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2023 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_I2C_USE_I2C2
+#define STM32_I2C_USE_I2C2 TRUE
diff --git a/keyboards/mechlovin/olly/jf/rev2/readme.md b/keyboards/mechlovin/olly/jf/rev2/readme.md
new file mode 100644
index 00000000000..b165c35778f
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/readme.md
@@ -0,0 +1,27 @@
+# Mechlovin Olly jf/rev2
+
+![jf/rev2](https://i.imgur.com/IrfTGE7h.png)
+
+Olly jf/rev2 PCB, compatible Duck Jetfire keyboard.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://mechlovin.studio/)
+* Hardware Supported: Jetfire Korean Kustom
+* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/olly/jf/rev2:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/olly/jf/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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+By keycode: Press the key mapped to `QK_BOOT` if it is available.
+By Bootloader: hold ESC key while plugging in (jump to bootloader)
+By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/rev2/rev2.c b/keyboards/mechlovin/olly/jf/rev2/rev2.c
new file mode 100644
index 00000000000..04cf3b836d3
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/rev2.c
@@ -0,0 +1,92 @@
+/* Copyright 2023 Mechlovin'
+ * 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 "quantum.h"
+
+void board_init(void) {
+    AFIO->MAPR |= AFIO_MAPR_SPI1_REMAP;
+}
+
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *    driver
+ *    |  LED address
+ *    |  | */
+    { 0, C1_8  },                { 0, C3_8 },  { 0, C4_8  },  { 0, C5_8 },  { 0, C6_8  },  { 0, C7_8 },  { 0, C8_8  },  { 0, C9_8 },  { 0, C1_9  },  { 0, C2_9  },  { 0, C3_9   },  { 0, C4_9  },  { 0, C5_9   },  { 0, C6_9  },  { 0, C7_9   },  { 0, C8_9  },  { 0, C9_9  },  { 0, C1_16 },
+    { 0, C1_7  },  { 0, C2_7 },  { 0, C3_7 },  { 0, C4_7  },  { 0, C5_7 },  { 0, C6_7  },  { 0, C7_7 },  { 0, C8_7  },  { 0, C9_7 },  { 0, C1_10 },  { 0, C2_10 },  { 0, C3_10  },  { 0, C4_10 },  { 0, C5_10  },  { 0, C6_10 },  { 0, C7_10  },  { 0, C8_10 },  { 0, C9_10 },  { 0, C2_16 },
+    { 0, C1_6  },  { 0, C2_6 },  { 0, C3_6 },  { 0, C4_6  },  { 0, C5_6 },  { 0, C6_6  },  { 0, C7_6 },  { 0, C8_6  },  { 0, C9_6 },  { 0, C1_11 },  { 0, C2_11 },  { 0, C3_11  },  { 0, C4_11 },  { 0, C5_11  },  { 0, C6_11 },  { 0, C7_11  },  { 0, C8_11 },  { 0, C9_11 },  { 0, C3_16 },
+    { 0, C1_5  },  { 0, C2_5 },  { 0, C3_5 },  { 0, C4_5  },  { 0, C5_5 },  { 0, C6_5  },  { 0, C7_5 },  { 0, C8_5  },  { 0, C9_5 },  { 0, C1_12 },  { 0, C2_12 },  { 0, C3_12  },  { 0, C4_12 },  { 0, C5_12  },                 { 0, C7_12  },  { 0, C8_12 },  { 0, C9_12 },  { 0, C4_16 },
+    { 0, C1_4  },  { 0, C2_4 },  { 0, C3_4 },  { 0, C4_4  },  { 0, C5_4 },  { 0, C6_4  },  { 0, C7_4 },  { 0, C8_4  },  { 0, C9_4 },  { 0, C1_13 },  { 0, C2_13 },  { 0, C3_13  },  { 0, C4_13 },  { 0, C5_13  },  { 0, C6_13 },  { 0, C7_13  },  { 0, C8_13 },  { 0, C9_13 },  { 0, C5_16 },
+    { 0, C1_3  },  { 0, C2_3 },                { 0, C4_3  },                               { 0, C7_3 },                                              { 0, C2_14 },  { 0, C3_14  },  { 0, C4_14 },  { 0, C5_14  },  { 0, C6_14 },  { 0, C7_14  },  { 0, C8_15 },  { 0, C9_15 },  { 0, C7_16 },
+    { 0, C2_1  },  { 0, C1_1 },  { 0, C9_1 },  // Lock LED Indicator
+    { 0, C7_15 },  { 0, C6_15 }, { 0, C9_16 }, { 0, C8_16 }, { 0, C1_15 }, // Layer LED Indicator
+};
+
+
+
+bool led_matrix_indicators_kb(void) {
+    if (!led_matrix_indicators_user()) { return false; }
+    if (host_keyboard_led_state().caps_lock) {
+        led_matrix_set_value(106, 0xFF);
+        led_matrix_set_value(56, 0xFF);
+    } else {
+        led_matrix_set_value(106, 0x00);
+    }
+    if (host_keyboard_led_state().num_lock) {
+        led_matrix_set_value(107, 0xFF);
+        led_matrix_set_value(33, 0xFF);
+    } else {
+        led_matrix_set_value(107, 0x00);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        led_matrix_set_value(108, 0xFF);
+    } else {
+        led_matrix_set_value(108, 0x00);
+    }
+  // if on layer 0, turn on L1 LED, otherwise off.
+    if (layer_state_is(0)) {
+        led_matrix_set_value(109, 0xFF);
+    } else {
+        led_matrix_set_value(109, 0x00);
+    }
+  // if on layer 1, turn on L2 LED, otherwise off.
+    if (layer_state_is(1)) {
+        led_matrix_set_value(110, 0xFF);
+    } else {
+        led_matrix_set_value(110, 0x00);
+    }
+
+  // if on layer 2, turn on L3 LED, otherwise off.
+    if (layer_state_is(2)) {
+        led_matrix_set_value(111, 0xFF);
+    } else {
+        led_matrix_set_value(111, 0x00);
+    }
+
+  // if on layer 3, turn on L4 LED, otherwise off.
+    if (layer_state_is(3)) {
+        led_matrix_set_value(112, 0xFF);
+    } else {
+        led_matrix_set_value(112, 0x00);
+    }
+  // if on layer 4, turn on L5 LED, otherwise off.
+    if (layer_state_is(4)) {
+        led_matrix_set_value(113, 0xFF);
+    } else {
+        led_matrix_set_value(114, 0x00);
+    }
+
+    return true;
+}
diff --git a/keyboards/mechlovin/olly/jf/rev2/rules.mk b/keyboards/mechlovin/olly/jf/rev2/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mechlovin/olly/jf/rules.mk b/keyboards/mechlovin/olly/jf/rules.mk
index 1d15495eef5..fa0eceeb8a7 100644
--- a/keyboards/mechlovin/olly/jf/rules.mk
+++ b/keyboards/mechlovin/olly/jf/rules.mk
@@ -1,18 +1 @@
-# Processor frequency
-F_CPU = 16000000
-
-# 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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-CUSTOM_MATRIX = lite
-
-SRC += matrix.c
+DEFAULT_FOLDER = mechlovin/olly/jf/rev1
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index 88918506eb4..6f9d5f9a027 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -17,37 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef LED_MATRIX_ENABLE
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA
+
+#define LED_MATRIX_LED_COUNT 94
+
 #define I2C_DRIVER I2CD2
 #define I2C1_SCL_PIN B10
 #define I2C1_SDA_PIN B11
-#define LED_MATRIX_LED_COUNT 94
-#define LED_MATRIX_KEYPRESSES // reacts to keypresses
-#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define LED_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
-#define ENABLE_LED_MATRIX_ALPHAS_MODS	
-#define ENABLE_LED_MATRIX_BREATHING	
-#define ENABLE_LED_MATRIX_BAND	
-#define ENABLE_LED_MATRIX_BAND_PINWHEEL	
-#define ENABLE_LED_MATRIX_BAND_SPIRAL	
-#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT	
-#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN	
-#define ENABLE_LED_MATRIX_CYCLE_OUT_IN	
-#define ENABLE_LED_MATRIX_DUAL_BEACON	
-#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT	
-#define ENABLE_LED_MATRIX_WAVE_UP_DOWN	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS	
-#define ENABLE_LED_MATRIX_SOLID_SPLASH	
-#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH	
-
 #define I2C1_CLOCK_SPEED 400000
 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
-
-#endif
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 3621f491d82..3ef290d3519 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -29,7 +29,30 @@
         "pin": "A7"
     },
     "led_matrix": {
-        "driver": "is31fl3731"
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "band": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "wave_left_right": true,
+            "wave_up_down": true
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c
index b5eb828bc88..185ee32a3ee 100644
--- a/keyboards/mechlovin/olly/octagon/octagon.c
+++ b/keyboards/mechlovin/olly/octagon/octagon.c
@@ -16,7 +16,7 @@
 
 #include "quantum.h"
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *    driver
  *    |  LED address
diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json
new file mode 100644
index 00000000000..41179a6ef14
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/info.json
@@ -0,0 +1,44 @@
+{
+    "manufacturer": "Mechlovin Studio",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "device_version": "0.0.1"
+    },
+    "indicators": {
+        "caps_lock": "C14",
+        "num_lock": "C15"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "audio": false
+    },
+    "rgblight": {
+        "sleep": true,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    }
+}
diff --git a/keyboards/mechlovin/zed1800/oreum/config.h b/keyboards/mechlovin/zed1800/oreum/config.h
new file mode 100644
index 00000000000..e9e3ce09ca1
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 Mechlovin'
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/info.json
new file mode 100644
index 00000000000..4a15f61ce49
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/info.json
@@ -0,0 +1,368 @@
+{
+    "keyboard_name": "ZED1800-Oreum",
+    "usb": {
+        "pid": "0x1802"
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
+        "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 6
+    },
+    "ws2812": {
+        "pin": "A15"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5},
+                {"matrix": [5, 10], "x": 11, "y": 5.5},
+                {"matrix": [5, 11], "x": 12, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 5.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5},
+                {"matrix": [5, 10], "x": 11, "y": 5.5},
+                {"matrix": [5, 11], "x": 12, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5},
+                {"matrix": [5, 10], "x": 11, "y": 5.5},
+                {"matrix": [5, 11], "x": 12, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c
new file mode 100644
index 00000000000..63cb1b7a27c
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 LT1_CAP     LT(1, KC_CAPS)
+
+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_F13,  KC_PSCR, KC_F9,   KC_F10,  KC_F11,  KC_F12,  
+        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_INS,  KC_NUM, KC_SLSH, KC_ASTR, KC_MINS, 
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS, 
+        LT1_CAP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_SPC,  KC_ENT,  KC_END,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
+        KC_SPC,  KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_P1,   KC_P2,   KC_P3,   KC_PEQL, KC_UP,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, KC_RGUI, KC_RCTL, KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_LEFT, KC_DOWN, KC_RGHT  
+    ),
+
+};
diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c
new file mode 100644
index 00000000000..5a0492241dd
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2022 Mechlovin'
+ *
+ * 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 LT1_CAP     LT(1, KC_CAPS)
+
+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_F13,    KC_PSCR,            KC_F9,   KC_F10,  KC_F11,  KC_F12,  //19
+        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_INS,  KC_NUM, KC_SLSH, KC_ASTR, KC_MINS, //20
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS, //19
+        LT1_CAP, 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_END,             KC_P4,   KC_P5,   KC_P6,   KC_PPLS, //19
+        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_PEQL, //18
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_P0,   KC_PDOT, KC_PENT //14
+    ),
+};
diff --git a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/rules.mk b/keyboards/mechlovin/zed1800/oreum/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/takashicompany/heavy_left/keymaps/takashicompany/rules.mk
rename to keyboards/mechlovin/zed1800/oreum/keymaps/via/rules.mk
diff --git a/keyboards/mechlovin/zed1800/oreum/readme.md b/keyboards/mechlovin/zed1800/oreum/readme.md
new file mode 100644
index 00000000000..3858b9b564a
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/readme.md
@@ -0,0 +1,27 @@
+# Oreum
+
+![Oreum](https://i.imgur.com/Dxc1y0Ol.png)
+
+A PCB for Oreum Keyboard, base on ZED1800 PCB
+
+* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin)
+* Hardware Supported: The Oreum Keyboard, APM32F103
+* Hardware Availability: [Reddit GB](https://www.reddit.com/r/MechanicalKeyboards/comments/xjqddx/gb_oreum_cp_gb_has_started/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/zed1800/oreum:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/zed1800/oreum: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/kudox/columner/columner.c b/keyboards/mechlovin/zed1800/oreum/rules.mk
similarity index 100%
rename from keyboards/kudox/columner/columner.c
rename to keyboards/mechlovin/zed1800/oreum/rules.mk
diff --git a/keyboards/mechlovin/zed1800/readme.md b/keyboards/mechlovin/zed1800/readme.md
new file mode 100644
index 00000000000..e11c81d6076
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/readme.md
@@ -0,0 +1,26 @@
+# ZED1800
+
+
+A platform design for Mechlovin' 1800-layout PCBs. 
+
+* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin)
+* Hardware Supported: APM32F103
+* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/zed1800:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/zed1800: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/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk
new file mode 100644
index 00000000000..d007da3fa20
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechlovin/zed1800/saber
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed1800/saber/config.h b/keyboards/mechlovin/zed1800/saber/config.h
new file mode 100644
index 00000000000..e9e3ce09ca1
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 Mechlovin'
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/info.json
new file mode 100644
index 00000000000..d921d95a950
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/info.json
@@ -0,0 +1,358 @@
+{
+    "keyboard_name": "ZED1800-Saber1800",
+    "usb": {
+        "pid": "0x1803"
+    },
+    "matrix_pins": {
+        "cols": ["A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
+        "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
+    },
+    "rgblight": {
+        "led_count": 6
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}
+
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 5.5},
+
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5c151e7933b
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 LT1_CAP     LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_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_HOME, KC_END,  KC_PGUP, KC_PGDN,  //18
+        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_PGUP,    KC_NUM,  KC_SLSH, KC_ASTR, KC_MINS,  //19
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,  //19
+        LT1_CAP, 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_P4,   KC_P5,   KC_P6,   KC_PPLS,  //17
+        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_P1,   KC_P2,   KC_P3,             //16
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT, KC_PENT   //12 
+    ),
+
+};
diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c
new file mode 100644
index 00000000000..86b00e31de8
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c
@@ -0,0 +1,30 @@
+/* Copyright 2022 Mechlovin'
+ *
+ * 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 LT1_CAP     LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_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_HOME, KC_END,  KC_PGUP, KC_PGDN,  //18
+        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_PGUP,    KC_NUM,  KC_SLSH, KC_ASTR, KC_MINS,  //19
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,  //19
+        LT1_CAP, 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_P4,   KC_P5,   KC_P6,   KC_PPLS,  //17
+        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_P1,   KC_P2,   KC_P3,             //16
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT, KC_PENT   //12 
+    ),
+
+};
diff --git a/keyboards/w1_at/keymaps/zq/rules.mk b/keyboards/mechlovin/zed1800/saber/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/w1_at/keymaps/zq/rules.mk
rename to keyboards/mechlovin/zed1800/saber/keymaps/via/rules.mk
diff --git a/keyboards/mechlovin/zed1800/saber/readme.md b/keyboards/mechlovin/zed1800/saber/readme.md
new file mode 100644
index 00000000000..739df1a319e
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/readme.md
@@ -0,0 +1,27 @@
+# Saber1800
+
+![Saber1800](https://i.imgur.com/JO5btEDBl.png)
+
+A PCB for Saber1800 Keyboard, base on ZED1800 PCB
+
+* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin)
+* Hardware Supported: The Saber1800 Keyboard, APM32F103
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/zed1800/saber:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/zed1800/saber: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/kudox/rev3/rev3.c b/keyboards/mechlovin/zed1800/saber/rules.mk
similarity index 100%
rename from keyboards/kudox/rev3/rev3.c
rename to keyboards/mechlovin/zed1800/saber/rules.mk
diff --git a/keyboards/mechlovin/zed1800/zed1800.c b/keyboards/mechlovin/zed1800/zed1800.c
new file mode 100644
index 00000000000..e86b4d5a5a8
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zed1800.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 Mechlovin' Studio
+ *
+ * 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 "quantum.h"
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN});
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN});
+const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN});
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] =
+RGBLIGHT_LAYERS_LIST( 
+            my_capslock_layer,
+            my_numlock_layer,
+            my_scroll_layer
+        );
+void keyboard_post_init_kb(void) {
+    rgblight_layers = my_rgb_layers;
+}
+// Activate rgb layer for caps when capslock is enabled
+bool led_update_kb(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    rgblight_set_layer_state(1, led_state.num_lock);
+    rgblight_set_layer_state(2, led_state.scroll_lock);
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed1800/zepsody/config.h b/keyboards/mechlovin/zed1800/zepsody/config.h
new file mode 100644
index 00000000000..e9e3ce09ca1
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 Mechlovin'
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/info.json
new file mode 100644
index 00000000000..dab92b26d7e
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/info.json
@@ -0,0 +1,388 @@
+{
+    "keyboard_name": "ZED1800-Zepsody",
+    "usb": {
+        "pid": "0x1801"
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 6
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "indicators": {
+        "scroll_lock": "C13"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 18, "y": 0},
+                {"matrix": [0, 17], "x": 19, "y": 0},
+                {"matrix": [0, 18], "x": 20, "y": 0},
+                {"matrix": [0, 19], "x": 21, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.5},
+                {"matrix": [1, 14], "x": 14.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.5},
+                {"matrix": [0, 15], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 16], "x": 18, "y": 1.5},
+                {"matrix": [1, 17], "x": 19, "y": 1.5},
+                {"matrix": [1, 18], "x": 20, "y": 1.5},
+                {"matrix": [1, 19], "x": 21, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 3], "x": 4, "y": 2.5},
+                {"matrix": [2, 4], "x": 5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6, "y": 2.5},
+                {"matrix": [2, 6], "x": 7, "y": 2.5},
+                {"matrix": [2, 7], "x": 8, "y": 2.5},
+                {"matrix": [2, 8], "x": 9, "y": 2.5},
+                {"matrix": [2, 9], "x": 10, "y": 2.5},
+                {"matrix": [2, 10], "x": 11, "y": 2.5},
+                {"matrix": [2, 11], "x": 12, "y": 2.5},
+                {"matrix": [2, 12], "x": 13, "y": 2.5},
+                {"matrix": [2, 13], "x": 14, "y": 2.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.5},
+                {"matrix": [2, 15], "x": 16, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 16], "x": 18, "y": 2.5},
+                {"matrix": [2, 17], "x": 19, "y": 2.5},
+                {"matrix": [2, 18], "x": 20, "y": 2.5},
+                {"matrix": [2, 19], "x": 21, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.5},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.5},
+                {"matrix": [3, 12], "x": 13.25, "y": 3.5},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.5},
+                {"matrix": [3, 15], "x": 16.25, "y": 3.5, "w": 1.25 },
+                {"matrix": [3, 16], "x": 18, "y": 3.5},
+                {"matrix": [3, 17], "x": 19, "y": 3.5},
+                {"matrix": [3, 18], "x": 20, "y": 3.5},
+                {"matrix": [3, 19], "x": 21, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.75, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.75, "y": 4.5},
+                {"matrix": [4, 13], "x": 13.75, "y": 4.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.75, "y": 4.75},
+                {"matrix": [4, 16], "x": 18, "y": 4.5},
+                {"matrix": [4, 17], "x": 19, "y": 4.5},
+                {"matrix": [4, 18], "x": 20, "y": 4.5},
+                {"matrix": [4, 19], "x": 21, "y": 4.5},
+
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.75, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.75, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.75, "y": 5.75},
+                {"matrix": [5, 17], "x": 19, "y": 5.5},
+                {"matrix": [5, 18], "x": 20, "y": 5.5},
+                {"matrix": [5, 19], "x": 21, "y": 5.5}
+
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 18, "y": 0},
+                {"matrix": [0, 17], "x": 19, "y": 0},
+                {"matrix": [0, 18], "x": 20, "y": 0},
+                {"matrix": [0, 19], "x": 21, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.5},
+                {"matrix": [1, 14], "x": 14.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.5, "w": 2},
+                {"matrix": [1, 16], "x": 18, "y": 1.5},
+                {"matrix": [1, 17], "x": 19, "y": 1.5},
+                {"matrix": [1, 18], "x": 20, "y": 1.5},
+                {"matrix": [1, 19], "x": 21, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 3], "x": 4, "y": 2.5},
+                {"matrix": [2, 4], "x": 5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6, "y": 2.5},
+                {"matrix": [2, 6], "x": 7, "y": 2.5},
+                {"matrix": [2, 7], "x": 8, "y": 2.5},
+                {"matrix": [2, 8], "x": 9, "y": 2.5},
+                {"matrix": [2, 9], "x": 10, "y": 2.5},
+                {"matrix": [2, 10], "x": 11, "y": 2.5},
+                {"matrix": [2, 11], "x": 12, "y": 2.5},
+                {"matrix": [2, 12], "x": 13, "y": 2.5},
+                {"matrix": [2, 13], "x": 14, "y": 2.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.5},
+                {"matrix": [2, 15], "x": 16, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 16], "x": 18, "y": 2.5},
+                {"matrix": [2, 17], "x": 19, "y": 2.5},
+                {"matrix": [2, 18], "x": 20, "y": 2.5},
+                {"matrix": [3, 19], "x": 21, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.5},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.5},
+                {"matrix": [3, 12], "x": 13.25, "y": 3.5},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.5},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 16], "x": 18, "y": 3.5},
+                {"matrix": [3, 17], "x": 19, "y": 3.5},
+                {"matrix": [3, 18], "x": 20, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.75, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.75, "y": 4.5},
+                {"matrix": [4, 13], "x": 13.75, "y": 4.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.75, "y": 4.75},
+                {"matrix": [4, 16], "x": 18, "y": 4.5},
+                {"matrix": [4, 17], "x": 19, "y": 4.5},
+                {"matrix": [4, 18], "x": 20, "y": 4.5},
+                {"matrix": [5, 19], "x": 21, "y": 4.5, "h": 2},
+
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.75, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.75, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.75, "y": 5.75},
+                {"matrix": [5, 17], "x": 19, "y": 5.5},
+                {"matrix": [5, 18], "x": 20, "y": 5.5}
+
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 18, "y": 0},
+                {"matrix": [0, 17], "x": 19, "y": 0},
+                {"matrix": [0, 18], "x": 20, "y": 0},
+                {"matrix": [0, 19], "x": 21, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.5},
+                {"matrix": [1, 14], "x": 14.5, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.5, "w": 2},
+                {"matrix": [1, 16], "x": 18, "y": 1.5},
+                {"matrix": [1, 17], "x": 19, "y": 1.5},
+                {"matrix": [1, 18], "x": 20, "y": 1.5},
+                {"matrix": [1, 19], "x": 21, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 3], "x": 4, "y": 2.5},
+                {"matrix": [2, 4], "x": 5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6, "y": 2.5},
+                {"matrix": [2, 6], "x": 7, "y": 2.5},
+                {"matrix": [2, 7], "x": 8, "y": 2.5},
+                {"matrix": [2, 8], "x": 9, "y": 2.5},
+                {"matrix": [2, 9], "x": 10, "y": 2.5},
+                {"matrix": [2, 10], "x": 11, "y": 2.5},
+                {"matrix": [2, 11], "x": 12, "y": 2.5},
+                {"matrix": [2, 12], "x": 13, "y": 2.5},
+                {"matrix": [2, 13], "x": 14, "y": 2.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.5},
+                {"matrix": [3, 15], "x": 16.25, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [2, 16], "x": 18, "y": 2.5},
+                {"matrix": [2, 17], "x": 19, "y": 2.5},
+                {"matrix": [2, 18], "x": 20, "y": 2.5},
+                {"matrix": [3, 19], "x": 21, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.5},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.5},
+                {"matrix": [3, 12], "x": 13.25, "y": 3.5},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.5},
+                {"matrix": [3, 16], "x": 18, "y": 3.5},
+                {"matrix": [3, 17], "x": 19, "y": 3.5},
+                {"matrix": [3, 18], "x": 20, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.75, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.75, "y": 4.5},
+                {"matrix": [4, 13], "x": 13.75, "y": 4.5},
+                {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.75, "y": 4.75},
+                {"matrix": [4, 16], "x": 18, "y": 4.5},
+                {"matrix": [4, 17], "x": 19, "y": 4.5},
+                {"matrix": [4, 18], "x": 20, "y": 4.5},
+                {"matrix": [5, 19], "x": 21, "y": 4.5, "h": 2},
+
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.75, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.75, "y": 5.75},
+                {"matrix": [5, 16], "x": 17.75, "y": 5.75},
+                {"matrix": [5, 17], "x": 19, "y": 5.5},
+                {"matrix": [5, 18], "x": 20, "y": 5.5}
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c
new file mode 100644
index 00000000000..8d1be55c138
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 LT1_CAP     LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, 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_HOME, KC_END, KC_PGUP,  KC_PGDN,  
+        KC_TRNS, KC_TRNS, 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_NUM, KC_PSLS, KC_ASTR, KC_PMNS,  
+        KC_TRNS, KC_TRNS, 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_P7,   KC_P8,   KC_P9,   KC_PPLS,  
+        KC_TRNS, KC_TRNS, LT1_CAP, 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_PPLS, 
+        KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PEQL  
+    ),
+
+};
diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c
new file mode 100644
index 00000000000..bb579ec5da6
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2022 Mechlovin'
+ *
+ * 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 LT1_CAP     LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, 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_HOME, KC_END, KC_PGUP,  KC_PGDN,  
+        KC_TRNS, KC_TRNS, 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_NUM, KC_PSLS, KC_ASTR, KC_PMNS,  
+        KC_TRNS, KC_TRNS, 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_P7,   KC_P8,   KC_P9,   KC_PPLS,  
+        KC_TRNS, KC_TRNS, LT1_CAP, 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_PPLS, 
+        KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PEQL  
+    ),
+};
diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed1800/zepsody/readme.md b/keyboards/mechlovin/zed1800/zepsody/readme.md
new file mode 100644
index 00000000000..261b74abfde
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/readme.md
@@ -0,0 +1,27 @@
+# Zepsody
+
+![Zepsody](https://i.imgur.com/KKq1UVxl.png)
+
+A PCB for Saber1800 Keyboard, base on ZED1800 PCB
+
+* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin)
+* Hardware Supported: The Zepsody Keyboard, APM32F103
+* Hardware Availability: [GH IC](https://geekhack.org/index.php?topic=118275.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/zed1800/zepsody:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/zed1800/zepsody: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/kudox_game/.noci b/keyboards/mechlovin/zed1800/zepsody/rules.mk
similarity index 100%
rename from keyboards/kudox_game/.noci
rename to keyboards/mechlovin/zed1800/zepsody/rules.mk
diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h
index 811841d7fe8..e31259438aa 100644
--- a/keyboards/mechlovin/zed65/mono_led/config.h
+++ b/keyboards/mechlovin/zed65/mono_led/config.h
@@ -17,38 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef LED_MATRIX_ENABLE
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA
+
 #define I2C_DRIVER I2CD2
 #define I2C1_SCL_PIN B10
 #define I2C1_SDA_PIN B11
-#define LED_MATRIX_LED_COUNT 70
-#define LED_MATRIX_KEYPRESSES // reacts to keypresses
-#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define LED_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
-#define ENABLE_LED_MATRIX_ALPHAS_MODS	
-#define ENABLE_LED_MATRIX_BREATHING	
-#define ENABLE_LED_MATRIX_BAND	
-#define ENABLE_LED_MATRIX_BAND_PINWHEEL	
-#define ENABLE_LED_MATRIX_BAND_SPIRAL	
-#define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT	
-#define ENABLE_LED_MATRIX_CYCLE_UP_DOWN	
-#define ENABLE_LED_MATRIX_CYCLE_OUT_IN	
-#define ENABLE_LED_MATRIX_DUAL_BEACON	
-#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT	
-#define ENABLE_LED_MATRIX_WAVE_UP_DOWN	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS	
-#define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS	
-#define ENABLE_LED_MATRIX_SOLID_SPLASH	
-#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH	
-
 #define I2C1_CLOCK_SPEED 400000
 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
-
-#define VIA_QMK_LED_MATRIX_ENABLE
-#endif
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json
index 228d2c50d54..aa46b1bd8bc 100644
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ b/keyboards/mechlovin/zed65/mono_led/info.json
@@ -30,7 +30,30 @@
         "pin": "A7"
     },
     "led_matrix": {
-        "driver": "is31fl3731"
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "band": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "wave_left_right": true,
+            "wave_up_down": true
+        },
+        "driver": "is31fl3731",
+        "react_on_keyup": true
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
diff --git a/keyboards/mechlovin/zed65/mono_led/mono_led.c b/keyboards/mechlovin/zed65/mono_led/mono_led.c
index f66c4b1359e..d8570fa0a63 100644
--- a/keyboards/mechlovin/zed65/mono_led/mono_led.c
+++ b/keyboards/mechlovin/zed65/mono_led/mono_led.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *    driver
  *    |  LED address
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
index b7d873dcb08..4b3ed831c51 100644
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
@@ -1,24 +1,24 @@
 {
-    "keyboard_name": "Cor65",
     "manufacturer": "Mechlovin Studio",
-    "url": "",
+    "keyboard_name": "Cor65",
     "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x6504",
-        "device_version": "0.0.1"
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B9",
+        "on_state": 0
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "A2", "C13", "B7", "B6", "B5", "B4", "B3"],
         "rows": ["B12", "B13", "B14", "B15", "A1"]
     },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B9",
-        "on_state": 0
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6504",
+        "vid": "0x4D4C"
     },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_65_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1.25, "y": 0},
@@ -34,10 +34,8 @@
                 {"matrix": [0, 11], "x": 11.25, "y": 0},
                 {"matrix": [0, 12], "x": 12.25, "y": 0},
                 {"matrix": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [2, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
                 {"matrix": [0, 15], "x": 16.75, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
                 {"matrix": [1, 2], "x": 2.75, "y": 1},
@@ -54,7 +52,6 @@
                 {"matrix": [1, 13], "x": 13.75, "y": 1},
                 {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
                 {"matrix": [1, 15], "x": 16.75, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2},
                 {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
                 {"matrix": [2, 2], "x": 3, "y": 2},
@@ -70,7 +67,6 @@
                 {"matrix": [2, 12], "x": 13, "y": 2},
                 {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
                 {"matrix": [2, 15], "x": 16.75, "y": 2},
-
                 {"matrix": [3, 0], "x": 0, "y": 3},
                 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
                 {"matrix": [3, 3], "x": 3.5, "y": 3},
@@ -84,10 +80,8 @@
                 {"matrix": [3, 11], "x": 11.5, "y": 3},
                 {"matrix": [3, 12], "x": 12.5, "y": 3},
                 {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 16.75, "y": 3},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
+                {"matrix": [3, 15], "x": 16.75, "y": 3},
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
                 {"matrix": [4, 0], "x": 0, "y": 4},
                 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
                 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@@ -95,13 +89,12 @@
                 {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
                 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
                 {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
                 {"matrix": [4, 13], "x": 14.5, "y": 4.25},
                 {"matrix": [4, 14], "x": 15.5, "y": 4.25},
                 {"matrix": [4, 15], "x": 16.5, "y": 4.25}
             ]
         },
-        "LAYOUT_65_ansi": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1.25, "y": 0},
@@ -117,9 +110,9 @@
                 {"matrix": [0, 11], "x": 11.25, "y": 0},
                 {"matrix": [0, 12], "x": 12.25, "y": 0},
                 {"matrix": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [2, 13], "x": 15.25, "y": 0},
                 {"matrix": [0, 15], "x": 16.75, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
                 {"matrix": [1, 2], "x": 2.75, "y": 1},
@@ -136,7 +129,6 @@
                 {"matrix": [1, 13], "x": 13.75, "y": 1},
                 {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
                 {"matrix": [1, 15], "x": 16.75, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2},
                 {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
                 {"matrix": [2, 2], "x": 3, "y": 2},
@@ -152,7 +144,6 @@
                 {"matrix": [2, 12], "x": 13, "y": 2},
                 {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
                 {"matrix": [2, 15], "x": 16.75, "y": 2},
-
                 {"matrix": [3, 0], "x": 0, "y": 3},
                 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
                 {"matrix": [3, 3], "x": 3.5, "y": 3},
@@ -166,10 +157,8 @@
                 {"matrix": [3, 11], "x": 11.5, "y": 3},
                 {"matrix": [3, 12], "x": 12.5, "y": 3},
                 {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 16.75, "y": 3},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
+                {"matrix": [3, 15], "x": 16.75, "y": 3},
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
                 {"matrix": [4, 0], "x": 0, "y": 4},
                 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
                 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@@ -177,7 +166,6 @@
                 {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
                 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
                 {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
                 {"matrix": [4, 13], "x": 14.5, "y": 4.25},
                 {"matrix": [4, 14], "x": 15.5, "y": 4.25},
                 {"matrix": [4, 15], "x": 16.5, "y": 4.25}
@@ -201,7 +189,6 @@
                 {"matrix": [0, 13], "x": 13.25, "y": 0},
                 {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
                 {"matrix": [0, 15], "x": 16.75, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
                 {"matrix": [1, 2], "x": 2.75, "y": 1},
@@ -218,7 +205,6 @@
                 {"matrix": [1, 13], "x": 13.75, "y": 1},
                 {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
                 {"matrix": [1, 15], "x": 16.75, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2},
                 {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
                 {"matrix": [2, 2], "x": 3, "y": 2},
@@ -234,7 +220,6 @@
                 {"matrix": [2, 12], "x": 13, "y": 2},
                 {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
                 {"matrix": [2, 15], "x": 16.75, "y": 2},
-
                 {"matrix": [3, 0], "x": 0, "y": 3},
                 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
                 {"matrix": [3, 3], "x": 3.5, "y": 3},
@@ -248,20 +233,17 @@
                 {"matrix": [3, 11], "x": 11.5, "y": 3},
                 {"matrix": [3, 12], "x": 12.5, "y": 3},
                 {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 16.75, "y": 3},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
+                {"matrix": [3, 15], "x": 16.75, "y": 3},
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
                 {"matrix": [4, 0], "x": 0, "y": 4},
                 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
                 {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
                 {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
                 {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
-
                 {"matrix": [4, 13], "x": 14.5, "y": 4.25},
                 {"matrix": [4, 14], "x": 15.5, "y": 4.25},
                 {"matrix": [4, 15], "x": 16.5, "y": 4.25}
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h
index ad964a72f5c..1953964f88d 100644
--- a/keyboards/mechstudio/ud_40_ortho/config.h
+++ b/keyboards/mechstudio/ud_40_ortho/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 David Dejaeghere
+/* Copyright 2017 Balz Guenat
  *
  * 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
@@ -16,37 +16,25 @@
 
 #pragma once
 
-#include "config_common.h"
+// place overrides here
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {C2,B4,B5,B6}
-#define MATRIX_COL_PINS {C5,D0,B3,B2,B1,B0,D6,D5,D4,D3,D2,D1}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B7
- #ifdef RGB_DI_PIN
-   #define RGBLED_NUM 10
+/*RGB*/
+/*Repurpose Insert LED */
+#define WS2812_DI_PIN B5
+   #define RGBLIGHT_LED_COUNT 16
+   #define RGBLIGHT_DEFAULT_HUE 127
    #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
- #endif
-
-/* set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-#define QMK_ESC_OUTPUT F0 // usually COL
-#define QMK_ESC_INPUT B7 // usually ROW
+   #define RGBLIGHT_EFFECT_PLAIN
+   #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
diff --git a/keyboards/mechwild/bb40/f401/info.json b/keyboards/mechwild/bb40/f401/info.json
new file mode 100644
index 00000000000..797e9900595
--- /dev/null
+++ b/keyboards/mechwild/bb40/f401/info.json
@@ -0,0 +1,3 @@
+{
+    "development_board": "blackpill_f401"
+}
diff --git a/keyboards/mechwild/bb40/f401/rules.mk b/keyboards/mechwild/bb40/f401/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/mechwild/bb40/f401/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mechwild/bb40/f411/info.json b/keyboards/mechwild/bb40/f411/info.json
new file mode 100644
index 00000000000..a41c5f4dd14
--- /dev/null
+++ b/keyboards/mechwild/bb40/f411/info.json
@@ -0,0 +1,3 @@
+{
+    "development_board": "blackpill_f411"
+}
diff --git a/keyboards/mechwild/bb40/f411/rules.mk b/keyboards/mechwild/bb40/f411/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/mechwild/bb40/f411/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mechwild/bb40/info.json b/keyboards/mechwild/bb40/info.json
new file mode 100644
index 00000000000..15a16fbfede
--- /dev/null
+++ b/keyboards/mechwild/bb40/info.json
@@ -0,0 +1,133 @@
+{
+    "manufacturer": "MechWild",
+    "keyboard_name": "BB40",
+    "maintainer": "kylemccreery",
+    "bootloader_instructions": "Hold down the BOOT button, then tap the NRST button on the BlackPill. Avoid touching the A11 and A12 pins.",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B3"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B8",
+        "num_lock": "B7",
+        "scroll_lock": "B9"
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15"],
+        "rows": ["B12", "B13", "B14", "B15"]
+    },
+    "url": "https://mechwild.com/product/bb40/",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1714",
+        "vid": "0x6D77"
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "layouts": {
+        "LAYOUT_6u": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 6], "x": 3, "y": 3, "w": 6},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3, "encoder": 0}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 4], "x": 3, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3, "encoder": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechwild/bb40/keymaps/default/keymap.json b/keyboards/mechwild/bb40/keymaps/default/keymap.json
new file mode 100644
index 00000000000..7ab58982586
--- /dev/null
+++ b/keyboards/mechwild/bb40/keymaps/default/keymap.json
@@ -0,0 +1,42 @@
+{
+   "keyboard": "mechwild/bb40/f401",
+   "keymap": "default",
+   "version": 1,
+   "layout": "LAYOUT_all",
+   "layers": [
+      [
+         "KC_ESC",             "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",            "KC_P",    "KC_BSPC",
+         "MO(1)",              "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",                       "KC_ENT",
+         "KC_LSFT",            "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",               "RSFT_T(KC_COMM)", "KC_UP",   "LT(2,KC_DOT)",
+         "KC_LCTL", "KC_LGUI", "KC_LALT",            "KC_SPC",             "LT(1,KC_SPC)",       "KC_SPC",             "KC_LEFT",         "KC_DOWN", "KC_RIGHT", "KC_MUTE"
+      ],
+      [
+         "KC_TRNS",            "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_TRNS",
+         "KC_TRNS",            "KC_GRV",  "KC_LBRC", "KC_RBRC", "KC_MINS", "KC_TRNS", "KC_TRNS", "KC_EQL",  "KC_BSLS", "KC_SCLN",            "KC_QUOT",
+         "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_TRNS",            "KC_TRNS",            "KC_TRNS",            "KC_TRNS",            "KC_TRNS", "KC_TRNS", "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_CAPS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",
+         "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS",
+         "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",            "KC_TRNS",            "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
+      ]
+   ],
+   "config": {
+      "features": {
+         "encoder_map": true
+      }
+   },
+   "encoders": [
+      [
+         {"ccw": "KC_VOLD", "cw": "KC_VOLU"}
+      ],
+      [
+         {"ccw": "KC_TRNS", "cw": "KC_TRNS"}
+      ],
+      [
+         {"ccw": "KC_TRNS", "cw": "KC_TRNS"}
+      ]
+   ]
+}
diff --git a/keyboards/mechwild/bb40/readme.md b/keyboards/mechwild/bb40/readme.md
new file mode 100644
index 00000000000..aac52b072bf
--- /dev/null
+++ b/keyboards/mechwild/bb40/readme.md
@@ -0,0 +1,23 @@
+# BB40
+
+![BB40](https://i.imgur.com/iikCpBuh.png)
+
+A completely normal BlackPill-powered 40% DIY kit.
+
+The `f401` version is the standard for this kit, using an STM32F401 BlackPill. The `f411` version will not run on an STM32F401 BlackPill; if in doubt, use `f401`.
+
+* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
+* Hardware Supported: BB40 v1.0
+* Hardware Availability: [BB40 on MechWild](https://mechwild.com/product/bb40/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechwild/bb40/f401:default
+    make mechwild/bb40/f411:default
+
+Flashing example for this keyboard:
+
+    make mechwild/bb40/f401:default:flash
+    make mechwild/bb40/f411: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/mechwild/mercutio/keymaps/bongocat/keymap.c b/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c
deleted file mode 100644
index ee53f128a12..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * 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 <stdio.h>
-
-// OLED setup for bongocat
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 30
-#define TAP_FRAMES 2
-#define TAP_SPEED 40
-#define ANIM_FRAME_DURATION 200
-#define ANIM_SIZE 512
-
-static long int oled_timeout = 600000; // 10 minutes
-bool gui_on = true;
-char wpm_str[10];
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
-                                                                                                                  KC_MUTE,
-      KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-      MO(1),            KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
-      KC_LSFT, KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_RSFT,
-      KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,           KC_SPC,           KC_RALT, MO(2),            KC_RCTL ),
-
-  [1] = LAYOUT_all(
-                                                                                                                  KC_TRNS,
-  	  KC_ESC,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  	  KC_TRNS,          KC_TRNS, KC_GRV,  KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_TRNS, KC_QUOT,
-  	  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_SLSH,          KC_UP,
-  	  KC_TRNS, KC_TRNS, KC_TRNS,          KC_HOME, KC_TRNS,          KC_END,           KC_LEFT, KC_DOWN,          KC_RIGHT ),
-
-  [2] = LAYOUT_all(
-                                                                                                                  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_TRNS,
-  	  KC_CAPS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  	  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 )
-};
-
-#ifdef ENCODER_MAP_ENABLE
-    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-        [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-        [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-        [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-        [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    };
-#endif
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;  // flips the display 180 degrees
-}
-
-static void render_anim(void) {
-
-    // Idle animation
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
-            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
-            32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-
-    };
-
-    // Prep animation
-    static const char PROGMEM prep[][ANIM_SIZE] = {
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-
-    };
-
-    // Typing animation
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
-            95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
-            1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
-            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-
-    };
-
-    void animation_phase(void) {
-        if (get_current_wpm() <=IDLE_SPEED) {
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED) {
-            oled_write_raw_P(prep[0], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() >=TAP_SPEED) {
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-            oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-        }
-    }
-
-    if (get_current_wpm() != 000) {
-        oled_on();
-
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-
-        anim_sleep = timer_read32();
-    } else {
-        if (timer_elapsed32(anim_sleep) > oled_timeout) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-bool oled_task_user(void) {
-        render_anim();
-        oled_set_cursor(0,4);
-        sprintf(wpm_str, "WPM: %03d", get_current_wpm());
-        oled_write(wpm_str, false);
-
-    return false;
-}
-
-#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/bongocat/rules.mk b/keyboards/mechwild/mercutio/keymaps/bongocat/rules.mk
deleted file mode 100644
index 74290f3abed..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/bongocat/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-WPM_ENABLE = yes
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechwild/mercutio/keymaps/default/config.h b/keyboards/mechwild/mercutio/keymaps/default/config.h
deleted file mode 100644
index b428d6e2606..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/default/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Kyle McCreery 
- * 
- * 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
diff --git a/keyboards/mechwild/mercutio/keymaps/fancy/config.h b/keyboards/mechwild/mercutio/keymaps/fancy/config.h
deleted file mode 100644
index b428d6e2606..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fancy/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Kyle McCreery 
- * 
- * 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
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
deleted file mode 100644
index f29c91f9e00..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2022 Fearless Spiff
- *
- * 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_TERM 180
-
-#define MK_KINETIC_SPEED
-#define MOUSEKEY_DELAY 8
-#define MOUSEKEY_INTERVAL 5
-#define MOUSEKEY_MOVE_DELTA 1
-#define MOUSEKEY_INITIAL_SPEED 3
-#define MOUSEKEY_BASE_SPEED 120
-#define MOUSEKEY_DECELERATED_SPEED 100
-#define MOUSEKEY_ACCELERATED_SPEED 1000
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
deleted file mode 100644
index 76438f9dc3b..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- * Copyright 2021 Jonavin Eng
- * Copyright 2022 Fearless Spiff
- *
- * 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_german.h"
-
-// OLED setup for bongocat
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 30
-#define TAP_FRAMES 2
-#define TAP_SPEED 40
-#define ANIM_FRAME_DURATION 200
-#define ANIM_SIZE 512
-
-#define LABEL_LENGTH 8
-
-#define KC_CAD	        LALT(LCTL(KC_DEL))
-#define KC_TEAMS_CAM	C(S(KC_O))
-#define KC_TEAMS_MUTE	C(S(KC_M))
-
-enum layers {
-  QWERT,
-  FN_1,
-  FN_2,
-  FN_MOUSE
-};
-
-enum custom_user_keycodes {
-  KC_ENC = SAFE_RANGE
-};
-
-static long int oled_timeout = 1800000; //  30 minutes
-bool gui_on = true;
-char wpm_str[10];
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-// Tap Dance declarations
-enum {
-    TD_TAB_ESC,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Tab, twice for Esc
-    [TD_TAB_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC),
-};
-
-typedef struct {
-    char label_top[LABEL_LENGTH];
-    char label_mid[LABEL_LENGTH];
-    char label_bottom[LABEL_LENGTH];
-    uint16_t keycode;
-} encoder_key;
-
-static const encoder_key PROGMEM encoder_keys[] = {
-    // list of key codes that will be scrolled through by encoder and description
-    // Be aware that it only works when using one char less than defined. In this case 7 max. No idea why?
-    {"Teams", "Toggle", "Mic", KC_TEAMS_MUTE},
-    {"Teams", "Toggle", "Cam", KC_TEAMS_CAM},
-    {"Ctrl", "Alt", "Del", KC_CAD},
-    {"Caps", "Lock", "", KC_CAPS_LOCK},
-    {"Pause", "", "", KC_PAUSE},
-    {"PrtScr", "", "", KC_PSCR},
-    {"Insert", "", "", KC_INS},
-    {"Play", "", "", KC_MEDIA_PLAY_PAUSE}
-};
-
-#define NUMBER_OF_ENCODER_KEYS ARRAY_SIZE(encoder_keys)
-
-static uint8_t selected_encoder_key_id = 0;
-static encoder_key selected_encoder_key;
-
-static void set_selected_encoder_key(uint8_t idx) {
-    // make a copy from PROGMEM
-    memcpy_P (&selected_encoder_key, &encoder_keys[idx], sizeof selected_encoder_key);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_ENC:
-            if (record->event.pressed) {
-                tap_code16(selected_encoder_key.keycode);
-            }
-        break;
-    }
-    return true;
-}
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [QWERT] = LAYOUT_all(
-                                                                                                                      KC_ENC,
-          TD(TD_TAB_ESC),   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    DE_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-          MO(FN_1), KC_A,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS,          KC_ENT,
-          KC_LSFT, DE_LABK, DE_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_RSFT,
-          KC_LCTL, KC_LGUI, KC_LALT,   LT(FN_2,KC_SPC),   LT(FN_2,KC_SPC),     LT(FN_2,KC_SPC),      KC_RALT, DE_MINS,          KC_RCTL ),
-
-    [FN_1] = LAYOUT_all(
-                                                                                                                       KC_MUTE,
-    	  QK_GESC,          _______, _______, _______, DE_LCBR, DE_RCBR, _______, DE_UDIA, KC_UP,    DE_ODIA, DE_QUES, KC_DEL,
-    	  _______,          DE_ADIA, DE_SS,   _______, DE_LPRN, DE_RPRN, _______, KC_LEFT, KC_DOWN, KC_RIGHT, DE_HASH, _______,
-    	  _______, _______, DE_CIRC, DE_ACUT, _______, DE_LBRC, DE_RBRC, KC_HOME, KC_END,  DE_QUOT,  DE_DQUO,          DE_EQL,
-    	  _______,   _______, _______,    MO(FN_MOUSE),   MO(FN_MOUSE),       MO(FN_MOUSE),          DE_BSLS, DE_SLSH,         DE_TILD ),
-
-    [FN_2] = LAYOUT_all(
-                                                                                                                      _______,
-    	  KC_F1,            KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_BSPC,
-    	  KC_1,             KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______,
-    	  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,           _______,
-    	  _______, _______, _______,          _______, _______,          _______,          _______, _______,          _______ ),
-
-    [FN_MOUSE] = LAYOUT_all(
-                                                                                                                      _______,
-          _______,          _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______,
-          _______,          _______, _______, _______, KC_ACL0, _______, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______,
-          _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______,
-          _______,   _______, _______,        _______,   _______,        _______,          _______, _______,         _______ )
-};
-
-#ifdef ENCODER_ENABLE
-    bool encoder_update_user(uint8_t index, bool clockwise) {
-        if (clockwise) {
-            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  < NUMBER_OF_ENCODER_KEYS-1) {
-               selected_encoder_key_id ++;
-               set_selected_encoder_key(selected_encoder_key_id);
-            }
-            if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGDN);
-            }
-            if (IS_LAYER_ON(FN_2)) {
-                tap_code(KC_VOLU);
-            }
-        } else {
-            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  > 0) {
-                selected_encoder_key_id --;
-                set_selected_encoder_key(selected_encoder_key_id);
-            }
-            if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGUP);
-            }
-            if (IS_LAYER_ON(FN_2)) {
-                tap_code(KC_VOLD);
-            }
-        }
-        return false;
-    }
-#endif
-
-#ifdef OLED_ENABLE
-    oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-        set_selected_encoder_key(selected_encoder_key_id);
-
-        return OLED_ROTATION_180;  // flips the display 180 degrees
-    }
-
-    static void render_anim(void) {
-
-        // Idle animation
-        static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
-                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
-                32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        // Prep animation
-        static const char PROGMEM prep[][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        // Typing animation
-        static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
-                95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
-                1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
-                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        void animation_phase(void) {
-            if (get_current_wpm() <= IDLE_SPEED) {
-                current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-                oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-            }
-
-            if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-                oled_write_raw_P(prep[0], ANIM_SIZE);
-            }
-
-            if (get_current_wpm() >= TAP_SPEED) {
-                current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-                oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-            }
-        }
-
-        if (get_current_wpm() != 000) {
-            oled_on();
-
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-
-            anim_sleep = timer_read32();
-        } else {
-            if (timer_elapsed32(anim_sleep) > oled_timeout) {
-                oled_off();
-            } else {
-                if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                    anim_timer = timer_read32();
-                    animation_phase();
-                }
-            }
-        }
-    }
-
-    bool oled_task_user(void) {
-
-            render_anim();
-
-            oled_set_cursor(0,0);
-            oled_write(selected_encoder_key.label_top, false);
-
-            oled_set_cursor(0,1);
-            oled_write(selected_encoder_key.label_mid, false);
-
-            oled_set_cursor(0,2);
-            oled_write(selected_encoder_key.label_bottom, false);
-
-    /* hide wpm display for now
-            oled_set_cursor(13,3);
-            oled_write_P(PSTR("WPM: "), false);
-            oled_write(get_u8_str(get_current_wpm(), ' '), false);
-    */
-
-      return false;
-    }
-
-    void suspend_power_down_user(void) {
-          oled_off();
-    }
-#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
deleted file mode 100644
index 85b3490608a..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Fearless Spiff's Custom Mercutio Keymap
-  - "Programmer"-centric and German layout based keymap
-  - Based on Bongocat and Jonavin keymap
-
-Features
-  - Fancy Bongocat! Yay! (borrowed from bongocat obviously)
-  - Encoder selectable key codes and displayed on OLED (borrowed and multi-line-enhanced from Jonavin)
-    - Change encoder_keys in keymap.c to assign your desired key selection
-  - Additional encoder functionality 
-    - While holding FN_1, page up and down
-    - While holding FN_2, volume up and down
-  - Mouse controls by holding Caps-Space
-  - Use my templates for your own layout overview at [Keyboard Layout Editor](http://www.keyboard-layout-editor.com) using my gist [here](https://gist.github.com/FearlessSpiff)
-  - Shout out to [KMonad](https://github.com/kmonad/kmonad) which enabled my laptop keyboard to behave like my Mercutio!
-
-QWERT Layer
-![image](https://user-images.githubusercontent.com/1927259/148683284-04932e15-a34d-451e-b657-335780033f36.png)
-
-FN_1 Layer
-![image](https://user-images.githubusercontent.com/1927259/157032746-8aa68e1c-27b9-4cf5-88ed-a071d8238f56.png)
-
-FN_2 layer
-![image](https://user-images.githubusercontent.com/1927259/148683306-364bc59c-b41b-4092-b93b-d7b4fc58567b.png)
-
-FN_MOUSE layer
-![image](https://user-images.githubusercontent.com/1927259/157032817-83922578-8932-42bf-a2d2-f785136b4d4e.png)
-
-
-
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk
deleted file mode 100644
index fc0ec281538..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-WPM_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-VIA_ENABLE = no
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes # Audio control and System control
-KEY_LOCK_ENABLE = no
-CONSOLE_ENABLE = no
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/config.h b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/config.h
deleted file mode 100644
index 9d588ed8c08..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Fearless Spiff
- *
- * 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_TERM 180
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
deleted file mode 100644
index c79c00a707f..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- * Copyright 2021 Jonavin Eng
- * Copyright 2022 Fearless Spiff
- *
- * 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_german.h"
-
-// OLED setup for bongocat
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 30
-#define TAP_FRAMES 2
-#define TAP_SPEED 40
-#define ANIM_FRAME_DURATION 200
-#define ANIM_SIZE 512
-
-#define LABEL_LENGTH 8
-
-#define KC_CAD	        LALT(LCTL(KC_DEL))
-#define KC_TEAMS_CAM	C(S(KC_O))
-#define KC_TEAMS_MUTE	C(S(KC_M))
-
-enum layers {
-  QWERT,
-  FN_1,
-  FN_2
-};
-
-enum custom_user_keycodes {
-  KC_ENC = SAFE_RANGE
-};
-
-static long int oled_timeout = 1800000; //  30 minutes
-bool gui_on = true;
-char wpm_str[10];
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-// Tap Dance declarations
-enum {
-    TD_TAB_ESC,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Tab, twice for Esc
-    [TD_TAB_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC),
-};
-
-typedef struct {
-    char label_top[LABEL_LENGTH];
-    char label_mid[LABEL_LENGTH];
-    char label_bottom[LABEL_LENGTH];
-    uint16_t keycode;
-} encoder_key;
-
-static const encoder_key PROGMEM encoder_keys[] = {
-    // list of key codes that will be scrolled through by encoder and description
-    // Be aware that it only works when using one char less than defined. In this case 7 max. No idea why?
-    {"Teams", "Toggle", "Mic", KC_TEAMS_MUTE},
-    {"Teams", "Toggle", "Cam", KC_TEAMS_CAM},
-    {"Ctrl", "Alt", "Del", KC_CAD},
-    {"Caps", "Lock", "", KC_CAPS_LOCK},
-    {"Pause", "", "", KC_PAUSE},
-    {"PrtScr", "", "", KC_PSCR},
-    {"Insert", "", "", KC_INS},
-    {"Play", "", "", KC_MEDIA_PLAY_PAUSE}
-};
-
-#define NUMBER_OF_ENCODER_KEYS ARRAY_SIZE(encoder_keys)
-
-static uint8_t selected_encoder_key_id = 0;
-static encoder_key selected_encoder_key;
-
-static void set_selected_encoder_key(uint8_t idx) {
-    // make a copy from PROGMEM
-    memcpy_P (&selected_encoder_key, &encoder_keys[idx], sizeof selected_encoder_key);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_ENC:
-            if (record->event.pressed) {
-                tap_code16(selected_encoder_key.keycode);
-            }
-        break;
-    }
-    return true;
-}
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [QWERT] = LAYOUT_all(
-                                                                                                                      KC_ENC,
-          TD(TD_TAB_ESC),   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    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_PLUS,          KC_ENT,
-          KC_LSFT, KC_LABK, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_RSFT,
-          KC_LCTL, KC_LGUI, LT(2,KC_LALT),   KC_SPC,  KC_SPC,   KC_SPC,        KC_RALT, MO(2),          KC_RCTL ),
-
-    [FN_1] = LAYOUT_all(
-                                                                                                                       KC_MUTE,
-    	  QK_GESC,          _______, KC_UP, _______, KC_LCBR, KC_RCBR, _______, _______, KC_UP,    _______, KC_QUES, KC_DEL,
-    	  _______,          KC_LEFT, KC_DOWN,   KC_RIGHT, KC_LPRN, KC_RPRN, KC_QUES, KC_LEFT, KC_DOWN, KC_LABK, KC_RABK, _______,
-    	  _______, KC_BSLS, KC_SLSH, KC_PIPE, _______, KC_LBRC, KC_RBRC, KC_HOME, KC_END,  KC_QUOT,  KC_DQUO,          KC_EQL,
-    	  _______,   _______, _______,          _______, _______,          _______,          KC_BSLS, KC_SLSH,         KC_TILD ),
-
-    [FN_2] = 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_BSPC,
-    	  _______,             KC_EXLM,    KC_AT,    KC_HASH,    KC_DLR,    KC_AMPR,    KC_PERC,    KC_ASTR,    KC_LPRN,    KC_RPRN,  _______, _______,
-    	  _______, _______, KC_MINS, KC_PLUS, KC_BSLS, KC_SLSH, KC_SCLN, KC_COLN, KC_QUES, KC_LBRC, KC_RBRC, KC_DOT,
-    	  KC_DQUO, KC_QUOT, KC_DQUO,          _______, _______,          _______,          _______, _______,          KC_PIPE )
-};
-
-#ifdef ENCODER_ENABLE
-    bool encoder_update_user(uint8_t index, bool clockwise) {
-        if (clockwise) {
-            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  < NUMBER_OF_ENCODER_KEYS-1) {
-               selected_encoder_key_id ++;
-               set_selected_encoder_key(selected_encoder_key_id);
-            }
-            if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGDN);
-            }
-            if (IS_LAYER_ON(FN_2)) {
-                tap_code(KC_VOLU);
-            }
-        } else {
-            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  > 0) {
-                selected_encoder_key_id --;
-                set_selected_encoder_key(selected_encoder_key_id);
-            }
-            if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGUP);
-            }
-            if (IS_LAYER_ON(FN_2)) {
-                tap_code(KC_VOLD);
-            }
-        }
-        return false;
-    }
-#endif
-
-#ifdef OLED_ENABLE
-    oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-        set_selected_encoder_key(selected_encoder_key_id);
-
-        return OLED_ROTATION_180;  // flips the display 180 degrees
-    }
-
-    static void render_anim(void) {
-
-        // Idle animation
-        static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
-                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
-                32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        // Prep animation
-        static const char PROGMEM prep[][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        // Typing animation
-        static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
-                95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
-                1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
-                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        void animation_phase(void) {
-            if (get_current_wpm() <= IDLE_SPEED) {
-                current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-                oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-            }
-
-            if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-                oled_write_raw_P(prep[0], ANIM_SIZE);
-            }
-
-            if (get_current_wpm() >= TAP_SPEED) {
-                current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-                oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-            }
-        }
-
-        if (get_current_wpm() != 000) {
-            oled_on();
-
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-
-            anim_sleep = timer_read32();
-        } else {
-            if (timer_elapsed32(anim_sleep) > oled_timeout) {
-                oled_off();
-            } else {
-                if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                    anim_timer = timer_read32();
-                    animation_phase();
-                }
-            }
-        }
-    }
-
-    bool oled_task_user(void) {
-
-            render_anim();
-
-            oled_set_cursor(0,0);
-            oled_write(selected_encoder_key.label_top, false);
-
-            oled_set_cursor(0,1);
-            oled_write(selected_encoder_key.label_mid, false);
-
-            oled_set_cursor(0,2);
-            oled_write(selected_encoder_key.label_bottom, false);
-
-    /* hide wpm display for now
-            oled_set_cursor(13,3);
-            oled_write_P(PSTR("WPM: "), false);
-            oled_write(get_u8_str(get_current_wpm(), ' '), false);
-    */
-
-      return false;
-    }
-
-    void suspend_power_down_user(void) {
-          oled_off();
-    }
-#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/readme.md b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/readme.md
deleted file mode 100644
index dea71bf358c..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Fearless Spiff's Custom Mercutio Keymap
-  - "Programmer"-centric and German layout based keymap
-  - Based on Bongocat and Jonavin keymap
-
-Features
-  - Fancy Bongocat! Yay! (borrowed from bongocat obviously)
-  - Encoder selectable key codes and displayed on OLED (borrowed and multi-line-enhanced from Jonavin)
-    - Change encoder_keys in keymap.c to assign your desired key selection
-  - Additional encoder functionality 
-    - While holding FN_1, page up and down
-    - While holding FN_2, volume up and down
-  - Use my templates for your own layout overview at [Keyboard Layout Editor](http://www.keyboard-layout-editor.com) using my gist [here](https://gist.github.com/FearlessSpiff)
-
-QWERT Layer
-![image](https://user-images.githubusercontent.com/1927259/148683284-04932e15-a34d-451e-b657-335780033f36.png)
-
-FN_1 Layer
-![image](https://user-images.githubusercontent.com/1927259/148683299-f2c80403-3f29-4ba8-9fc4-957729f30b05.png)
-
-FN_2 layer
-![image](https://user-images.githubusercontent.com/1927259/148683306-364bc59c-b41b-4092-b93b-d7b4fc58567b.png)
-
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/rules.mk b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/rules.mk
deleted file mode 100644
index 4775e0e11d0..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-WPM_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/mechwild/mercutio/keymaps/via/config.h b/keyboards/mechwild/mercutio/keymaps/via/config.h
deleted file mode 100644
index b428d6e2606..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/via/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Kyle McCreery 
- * 
- * 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
diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk
index 875d4311681..c35a5b5b273 100644
--- a/keyboards/mechwild/mokulua/mirrored/rules.mk
+++ b/keyboards/mechwild/mokulua/mirrored/rules.mk
@@ -3,7 +3,7 @@
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
+EXTRAKEY_ENABLE = no       # 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
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/config.h b/keyboards/mechwild/mokulua/standard/keymaps/silly/config.h
deleted file mode 100644
index 271ab552924..00000000000
--- a/keyboards/mechwild/mokulua/standard/keymaps/silly/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 Kyle McCreery (@kylemccreery)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
\ No newline at end of file
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c b/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
deleted file mode 100644
index d7fcf0f221b..00000000000
--- a/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2022 Kyle McCreery (@kylemccreery)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#define FN1_SPC     LT(1, KC_SPC)
-#define FN2_SPC     LT(2, KC_SPC)
-#define HSV_SILLY_PURPLE 180, 255, 255
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN1,
-    _FN2,
-    _RS3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    
-    [_BASE] = LAYOUT(
-        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                         KC_MINS,  KC_7,    KC_8,    KC_9,    KC_0,   _______, KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,                             KC_Y,    KC_U,    KC_I,    KC_O,       KC_P,      KC_BSLS,
-        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,                         KC_SCLN, KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
-        KC_LSFT, _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    TG(_RS3),   KC_MUTE, KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT, MO(2),      FN1_SPC, FN2_SPC,       RGB_RMOD,   RGB_MOD,       FN2_SPC, FN1_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FN1] = LAYOUT(
-        KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                        _______,   KC_F7,   KC_F8,   KC_F9, KC_F10,  _______, KC_DEL, 
-        _______, _______, _______, _______, _______, _______, _______,                         _______, _______, _______,  KC_LBRC,    KC_RBRC,   _______,
-        _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, KC_SCLN, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, KC_SLSH, KC_PGUP, _______,
-        _______, _______, _______, _______,     _______, _______,      _______,    _______,    _______, _______,     _______, KC_HOME, KC_PGDN, KC_END
-    ),
-    [_FN2] = LAYOUT(                                                                                   
-        _______, KC_F11,  KC_F12,  _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, QK_BOOT, _______, _______,                         _______, _______, _______,  _______,    _______,   _______,
-        _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______,     _______, _______,      _______,    _______,      _______, _______,     _______, _______, _______, _______
-    ),
-    [_RS3] = LAYOUT(                                                                                   
-        KC_PAST, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-        KC_PSLS, _______, _______, _______, _______, _______, _______,                         _______, _______, _______,  _______,    _______,   _______,
-        KC_PPLS, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-        KC_PMNS, _______, _______, _______, _______, _______, _______, TG(_RS3),   _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_HOME, KC_END,  KC_PGUP, KC_K,        KC_L,    KC_M,         KC_PGDN,    _______,      KC_F1,   KC_F2,       KC_F3,   _______, _______, _______
-    )
-};
-
-#ifdef OLED_ENABLE
-     static void render_logo(void) {     // Render MechWild "MW" Logo
-          static const char PROGMEM logo_1[] = {0x8A, 0x8B, 0x8C, 0x8D, 0x00};
-          static const char PROGMEM logo_2[] = {0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0x00};
-          static const char PROGMEM logo_3[] = {0xCA, 0xCB, 0xCC, 0xCD, 0x00};
-          static const char PROGMEM logo_4[] = {0x20, 0x8E, 0x8F, 0x90, 0x00};
-          oled_set_cursor(0,0);
-          oled_write_P(logo_1, false);
-          oled_set_cursor(0,1);
-          oled_write_P(logo_2, false);
-          oled_set_cursor(0,2);
-          oled_write_P(logo_3, false);
-          oled_set_cursor(0,3);
-          oled_write_P(logo_4, false);
-     }
-    bool oled_task_user(void) {
-        render_logo();
-        oled_set_cursor(0,6);
-
-        oled_write_ln_P(PSTR("Layer"), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_ln_P(PSTR("Base"), false);
-            break;
-        case 1:
-            oled_write_ln_P(PSTR("FN 1"), false);
-            break;
-        case 2:
-            oled_write_ln_P(PSTR("FN 2"), false);
-            break;
-        case 3:
-            oled_write_ln_P(PSTR("RS3"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-    }
-    oled_write_ln_P(PSTR(""), false);
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
-    oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-    return false;
-    }
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-    // Optional RGB Light Mapping Zones {LED Posiiton, Number of LEDs, Colour}
-    const rgblight_segment_t PROGMEM _rgb_fn1[] = RGBLIGHT_LAYER_SEGMENTS(
-        {4, 3, HSV_GREEN},
-        {12, 3, HSV_GREEN}
-    );
-    // Light LEDs 9 & 10 in cyan when keyboard layer 1 is active
-    const rgblight_segment_t PROGMEM _rgb_fn2[] = RGBLIGHT_LAYER_SEGMENTS(
-        {4, 3, HSV_GREEN},
-        {12, 3, HSV_GREEN}
-    );
-    const rgblight_segment_t PROGMEM _rgb_rs3[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, 16, HSV_SILLY_PURPLE}
-    );
-    const rgblight_segment_t* const PROGMEM _rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-        _rgb_fn1,
-        _rgb_fn2,
-        _rgb_rs3
-    );
-    layer_state_t layer_state_set_user(layer_state_t state) {
-        rgblight_set_layer_state(0, layer_state_cmp(state, _FN1));
-        rgblight_set_layer_state(1, layer_state_cmp(state, _FN2));
-        rgblight_set_layer_state(2, layer_state_cmp(state, _RS3));
-        return state;
-    }
-#endif // RGBLIGHT_ENABLE
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    #ifdef RGBLIGHT_ENABLE
-        rgblight_layers = _rgb_layers;
-    #endif // RGBLIGHT_ENABLE
-    }
\ No newline at end of file
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/readme.md b/keyboards/mechwild/mokulua/standard/keymaps/silly/readme.md
deleted file mode 100644
index 4659a3aaeb8..00000000000
--- a/keyboards/mechwild/mokulua/standard/keymaps/silly/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# A keymap customized for use by Silly. Makes use of RGB Layer indication and a remapped layer for use in specific video games.
diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk
index 875d4311681..c35a5b5b273 100644
--- a/keyboards/mechwild/mokulua/standard/rules.mk
+++ b/keyboards/mechwild/mokulua/standard/rules.mk
@@ -3,7 +3,7 @@
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
+EXTRAKEY_ENABLE = no       # 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
diff --git a/keyboards/mechwild/sugarglider/matrix.c b/keyboards/mechwild/sugarglider/matrix.c
index 96a16df542a..c76a8345d3b 100644
--- a/keyboards/mechwild/sugarglider/matrix.c
+++ b/keyboards/mechwild/sugarglider/matrix.c
@@ -50,7 +50,7 @@ static void select_row(uint8_t row) {
         //wait_us(100);
         return;
     }
-    
+
     if (row > 1) {
         mcp23018_errors += !mcp23018_set_config(I2C_ADDR, mcp23018_PORTB, ALL_INPUT);
         mcp23018_errors += !mcp23018_set_config(I2C_ADDR, mcp23018_PORTA, ~(row_pos[row]));
@@ -87,8 +87,10 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     bool changed = false;
     for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
         changed |= read_cols_on_row(current_matrix, current_row);
+
 #ifdef ENCODER_ENABLE
-        encoder_read();
+        // Need to frequently read the encoder pins while scanning because the I/O expander takes a long time in comparison.
+        encoder_driver_task();
 #endif
     }
     return changed;
diff --git a/keyboards/mechwild/waka60/keymaps/audio/config.h b/keyboards/mechwild/waka60/keymaps/audio/config.h
deleted file mode 100644
index 095242a1615..00000000000
--- a/keyboards/mechwild/waka60/keymaps/audio/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Kyle McCreery
-
-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 AUDIO_PIN B5
-#define AUDIO_PWM_DRIVER PWMD1
-#define AUDIO_PWM_CHANNEL 1
-#define AUDIO_STATE_TIMER GPTD4
diff --git a/keyboards/mechwild/waka60/keymaps/audio/keymap.c b/keyboards/mechwild/waka60/keymaps/audio/keymap.c
deleted file mode 100644
index da74af6bcd2..00000000000
--- a/keyboards/mechwild/waka60/keymaps/audio/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * 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
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_BSLS,
-    MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_MUTE,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-    KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_SPC,  KC_SPC, KC_SPC,   KC_SPC,  KC_SPC,  MO(1),   KC_RALT, KC_RGUI, KC_RCTL
-    ),
-    [_FN1] = LAYOUT(
-    KC_TRNS, KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,            KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-    KC_TRNS, AU_TOGG, RGB_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MU_TOGG, RGB_MOD,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MU_NEXT, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_FN2] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_FN3] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
-
-#ifdef ENCODER_MAP_ENABLE
-    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-        [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-        [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-        [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-        [_FN3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    };
-#endif
diff --git a/keyboards/mechwild/waka60/keymaps/audio/rules.mk b/keyboards/mechwild/waka60/keymaps/audio/rules.mk
deleted file mode 100644
index a7b3207f916..00000000000
--- a/keyboards/mechwild/waka60/keymaps/audio/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = yes
-AUDIO_ENABLE = yes
-AUDIO_DRIVER = pwm_software
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/meetlab/kafka60/info.json b/keyboards/meetlab/kafka60/info.json
new file mode 100644
index 00000000000..5dbf3f56424
--- /dev/null
+++ b/keyboards/meetlab/kafka60/info.json
@@ -0,0 +1,89 @@
+{
+    "manufacturer": "lucky_studio",
+    "keyboard_name": "kafka60",
+    "maintainer": "yuezp",
+    "development_board": "bluepill",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A15", "B3", "B4", "B5", "B6", "B7", "B8", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B11"],
+        "rows": ["B15", "A8", "B13", "B12", "A9"]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xBF06",
+        "vid": "0xAA06"
+    },
+    "community_layouts": ["60_hhkb"],
+    "layouts": {
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 1.5, "y": 4},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/meetlab/kafka60/keymaps/default/keymap.c b/keyboards/meetlab/kafka60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..18dcb30edea
--- /dev/null
+++ b/keyboards/meetlab/kafka60/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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_60_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_BSLS,  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_BSPC, 
+    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,            MO(1), 
+                       KC_LGUI, KC_LALT,                         KC_SPC,                            KC_RALT,  KC_RGUI),
+
+[1]=LAYOUT_60_hhkb(
+    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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_PGUP, KC_LEFT, 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)
+
+};
diff --git a/keyboards/meetlab/kafka60/keymaps/via/keymap.c b/keyboards/meetlab/kafka60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..18dcb30edea
--- /dev/null
+++ b/keyboards/meetlab/kafka60/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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_60_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_BSLS,  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_BSPC, 
+    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,            MO(1), 
+                       KC_LGUI, KC_LALT,                         KC_SPC,                            KC_RALT,  KC_RGUI),
+
+[1]=LAYOUT_60_hhkb(
+    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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_PGUP, KC_LEFT, 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)
+
+};
diff --git a/keyboards/meetlab/kafka60/keymaps/via/rules.mk b/keyboards/meetlab/kafka60/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/meetlab/kafka60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/meetlab/kafka60/matrix_diagram.md b/keyboards/meetlab/kafka60/matrix_diagram.md
new file mode 100644
index 00000000000..79defebd9af
--- /dev/null
+++ b/keyboards/meetlab/kafka60/matrix_diagram.md
@@ -0,0 +1,16 @@
+# Matrix Diagram for kafka60
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐   
+│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 │1E   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+│30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C    │3E │
+└─────┬──┴┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┼───┴┬───┬─┴───┘
+      │40 │41  │45                           │4A  │4C │
+      └───┴────┴─────────────────────────────┴────┴───┘
+
+```
diff --git a/keyboards/meetlab/kafka60/readme.md b/keyboards/meetlab/kafka60/readme.md
new file mode 100644
index 00000000000..ffc2bf93f8c
--- /dev/null
+++ b/keyboards/meetlab/kafka60/readme.md
@@ -0,0 +1,26 @@
+# kafka60 - PCB
+
+![kafka60](https://imgur.com/bYIqqcEh.jpg)
+
+A 60 key keyboard made by Lucky, based on hhkb layout.
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: Lucky PCB
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make meetlab/kafka60:default
+    
+Flashing example for this keyboard:
+
+    make meetlab/kafka60: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/meetlab/kafka60/rules.mk b/keyboards/meetlab/kafka60/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/meetlab/kafka60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/meetlab/kafka68/info.json b/keyboards/meetlab/kafka68/info.json
new file mode 100644
index 00000000000..3836edc3c9a
--- /dev/null
+++ b/keyboards/meetlab/kafka68/info.json
@@ -0,0 +1,102 @@
+{
+    "manufacturer": "lucky_studio",
+    "keyboard_name": "kafka68",
+    "maintainer": "yuezp",
+    "development_board": "bluepill",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A10", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A7", "A6", "A5", "A4", "A3", "B1", "B10", "B11"],
+        "rows": ["B13", "B14", "B15", "A8", "A9"]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xAA07",
+        "vid": "0xBB07"
+    },
+    "community_layouts": ["68_ansi"],
+    "layouts": {
+        "LAYOUT_68_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/meetlab/kafka68/keymaps/default/keymap.c b/keyboards/meetlab/kafka68/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f4968692728
--- /dev/null
+++ b/keyboards/meetlab/kafka68/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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_68_ansi(
+    KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,  KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS, KC_EQL,  KC_BSPC, KC_INS, KC_HOME, 
+    KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,    KC_Y,  KC_U,    KC_I,    KC_O,     KC_P,     KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, 
+    KC_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_RGUI,  MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1]=LAYOUT_68_ansi(
+    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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          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/meetlab/kafka68/keymaps/via/keymap.c b/keyboards/meetlab/kafka68/keymaps/via/keymap.c
new file mode 100644
index 00000000000..f4968692728
--- /dev/null
+++ b/keyboards/meetlab/kafka68/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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_68_ansi(
+    KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,  KC_7,    KC_8,    KC_9,     KC_0,     KC_MINS, KC_EQL,  KC_BSPC, KC_INS, KC_HOME, 
+    KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,    KC_Y,  KC_U,    KC_I,    KC_O,     KC_P,     KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, 
+    KC_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_RGUI,  MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1]=LAYOUT_68_ansi(
+    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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          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/meetlab/kafka68/keymaps/via/rules.mk b/keyboards/meetlab/kafka68/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/meetlab/kafka68/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/meetlab/kafka68/matrix_diagram.md b/keyboards/meetlab/kafka68/matrix_diagram.md
new file mode 100644
index 00000000000..df7d6369186
--- /dev/null
+++ b/keyboards/meetlab/kafka68/matrix_diagram.md
@@ -0,0 +1,16 @@
+# Matrix Diagram for kafka68
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┐    
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D     ││0E │0F │    
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┤   
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   ││1E │1F │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┘   
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │             
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤┌───┐       
+│30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C        ││3E │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬───┬──┬──┴┼───┼───┐
+│40  │41  │42  │45                      │49  │4A  │4B │  │4D │4E │4F │
+└────┴────┴────┴────────────────────────┴────┴────┴───┘  └───┴───┴───┘
+
+```
diff --git a/keyboards/meetlab/kafka68/readme.md b/keyboards/meetlab/kafka68/readme.md
new file mode 100644
index 00000000000..ac8742a1016
--- /dev/null
+++ b/keyboards/meetlab/kafka68/readme.md
@@ -0,0 +1,26 @@
+# kafka68 - PCB
+
+![kafka68](https://i.imgur.com/5w8fESLh.jpg)
+
+A 68 key keyboard made by Lucky, based on hhkb layout.
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: Lucky PCB
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make meetlab/kafka68:default
+    
+Flashing example for this keyboard:
+
+    make meetlab/kafka68: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/meetlab/kafka68/rules.mk b/keyboards/meetlab/kafka68/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/meetlab/kafka68/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/meetlab/kafkasplit/config.h b/keyboards/meetlab/kafkasplit/config.h
new file mode 100644
index 00000000000..714b709fe17
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/config.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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
+
+/* Double tap reset button to enter bootloader */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+
+#define I2C1_SCL_PIN  GP27
+#define I2C1_SDA_PIN  GP26
+#define I2C_DRIVER I2CD1
+#define I2C1_CLOCK_SPEED 400000
+#define OLED_BRIGHTNESS 128
+#define OLED_TIMEOUT 600000
+#define OLED_SCROLL_TIMEOUT 300000
diff --git a/keyboards/meetlab/kafkasplit/halconf.h b/keyboards/meetlab/kafkasplit/halconf.h
new file mode 100644
index 00000000000..4e2f667f1ec
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/meetlab/kafkasplit/info.json b/keyboards/meetlab/kafkasplit/info.json
new file mode 100644
index 00000000000..d71d405f336
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/info.json
@@ -0,0 +1,203 @@
+{
+    "manufacturer": "lucky_studio",
+    "keyboard_name": "kafkaSplit",
+    "maintainer": "yuezp",
+    "bootloader": "rp2040",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgb_matrix": true,
+        "wpm": true
+    },
+    "indicators": {
+        "caps_lock": "GP25",
+        "on_state": 1
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP6", "GP7", "GP10", "GP11"],
+        "rows": ["GP5", "GP8", "GP12", "GP13"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "breathing",
+            "hue": 200
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [3, 5], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [3, 4], "x": 18, "y": 5, "flags": 4},
+            {"matrix": [3, 3], "x": 36, "y": 10, "flags": 4},
+            {"matrix": [3, 2], "x": 54, "y": 15, "flags": 4},
+            {"matrix": [2, 5], "x": 2, "y": 21, "flags": 4},
+            {"matrix": [2, 4], "x": 20, "y": 23, "flags": 4},
+            {"matrix": [2, 3], "x": 38, "y": 25, "flags": 4},
+            {"matrix": [2, 2], "x": 56, "y": 23, "flags": 4},
+            {"matrix": [2, 1], "x": 72, "y": 21, "flags": 4},
+            {"matrix": [2, 0], "x": 90, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 2, "y": 39, "flags": 4},
+            {"matrix": [1, 4], "x": 20, "y": 41, "flags": 4},
+            {"matrix": [1, 3], "x": 38, "y": 43, "flags": 4},
+            {"matrix": [1, 2], "x": 56, "y": 41, "flags": 4},
+            {"matrix": [1, 1], "x": 72, "y": 39, "flags": 4},
+            {"matrix": [1, 0], "x": 90, "y": 39, "flags": 4},
+            {"matrix": [0, 5], "x": 2, "y": 57, "flags": 4},
+            {"matrix": [0, 4], "x": 20, "y": 59, "flags": 4},
+            {"matrix": [0, 3], "x": 38, "y": 61, "flags": 4},
+            {"matrix": [0, 2], "x": 56, "y": 59, "flags": 4},
+            {"matrix": [0, 1], "x": 72, "y": 57, "flags": 4},
+            {"matrix": [0, 0], "x": 90, "y": 57, "flags": 4},
+            {"matrix": [7, 3], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [7, 2], "x": 18, "y": 5, "flags": 4},
+            {"matrix": [7, 1], "x": 36, "y": 10, "flags": 4},
+            {"matrix": [7, 0], "x": 54, "y": 15, "flags": 4},
+            {"matrix": [6, 5], "x": 2, "y": 21, "flags": 4},
+            {"matrix": [6, 4], "x": 20, "y": 23, "flags": 4},
+            {"matrix": [6, 3], "x": 38, "y": 25, "flags": 4},
+            {"matrix": [6, 2], "x": 56, "y": 23, "flags": 4},
+            {"matrix": [6, 1], "x": 72, "y": 21, "flags": 4},
+            {"matrix": [6, 0], "x": 90, "y": 21, "flags": 4},
+            {"matrix": [5, 5], "x": 2, "y": 39, "flags": 4},
+            {"matrix": [5, 4], "x": 20, "y": 41, "flags": 4},
+            {"matrix": [5, 3], "x": 38, "y": 43, "flags": 4},
+            {"matrix": [5, 2], "x": 56, "y": 41, "flags": 4},
+            {"matrix": [5, 1], "x": 72, "y": 39, "flags": 4},
+            {"matrix": [5, 0], "x": 90, "y": 39, "flags": 4},
+            {"matrix": [4, 5], "x": 159, "y": 57, "flags": 4},
+            {"matrix": [4, 4], "x": 159, "y": 59, "flags": 4},
+            {"matrix": [4, 3], "x": 224, "y": 61, "flags": 4},
+            {"matrix": [4, 2], "x": 224, "y": 59, "flags": 4},
+            {"matrix": [4, 1], "x": 224, "y": 57, "flags": 4},
+            {"matrix": [4, 0], "x": 224, "y": 57, "flags": 4}
+        ],
+        "sleep": true,
+        "split_count": [22, 22]
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["GP9", "GP10", "GP8", "GP7", "GP6", "GP5"],
+                "rows": ["GP11", "GP13", "GP12", "GP14"]
+            }
+        },
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true,
+                "modifiers": true,
+                "wpm": true
+            }
+        }
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xBFC2",
+        "vid": "0xAFC2"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.13},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.13},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [4, 0], "x": 8.75, "y": 0.25},
+                {"matrix": [4, 1], "x": 9.75, "y": 0.25},
+                {"matrix": [4, 2], "x": 10.75, "y": 0.13},
+                {"matrix": [4, 3], "x": 11.75, "y": 0},
+                {"matrix": [4, 4], "x": 12.75, "y": 0.13},
+                {"matrix": [4, 5], "x": 13.75, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.13},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.13},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [5, 0], "x": 8.75, "y": 1.25},
+                {"matrix": [5, 1], "x": 9.75, "y": 1.25},
+                {"matrix": [5, 2], "x": 10.75, "y": 1.13},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 4], "x": 12.75, "y": 1.13},
+                {"matrix": [5, 5], "x": 13.75, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.13},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.13},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [6, 0], "x": 8.75, "y": 2.25},
+                {"matrix": [6, 1], "x": 9.75, "y": 2.25},
+                {"matrix": [6, 2], "x": 10.75, "y": 2.13},
+                {"matrix": [6, 3], "x": 11.75, "y": 2},
+                {"matrix": [6, 4], "x": 12.75, "y": 2.13},
+                {"matrix": [6, 5], "x": 13.75, "y": 2.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.13},
+                {"matrix": [3, 3], "x": 4, "y": 2.05, "h": 1.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 1.7, "h": 1.25},
+                {"matrix": [3, 5], "x": 5.35, "y": 3.65, "h": 1.5},
+                {"matrix": [7, 0], "x": 8.25, "y": 4.25, "h": 1.5},
+                {"matrix": [7, 1], "x": 7.75, "y": 6.25, "h": 1.25},
+                {"matrix": [7, 2], "x": 9.23, "y": 5.85, "h": 1.25},
+                {"matrix": [7, 3], "x": 11.75, "y": 3.13}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/meetlab/kafkasplit/kafkasplit.c b/keyboards/meetlab/kafkasplit/kafkasplit.c
new file mode 100644
index 00000000000..ee352bc8dc0
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/kafkasplit.c
@@ -0,0 +1,207 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    // if (is_keyboard_master()) {
+    if (host_keyboard_led_state().caps_lock) { // 处于 CPAS LOCK 状态
+        rgb_matrix_set_color(5, 100, 0, 0);    // 灯变为红色（R:255, G:0, B:0）
+    }
+    return true;
+}
+#endif
+
+#ifdef OLED_ENABLE
+// WPM-responsive animation stuff here
+#    define IDLE_FRAMES 5
+#    define IDLE_SPEED 20 // below this wpm value your animation will idle
+
+// #define PREP_FRAMES 1 // uncomment if >1
+
+#    define TAP_FRAMES 2
+#    define TAP_SPEED 40 // above this wpm value typing animation to trigger
+
+#    define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
+// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
+#    define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
+
+uint32_t anim_timer         = 0;
+uint32_t anim_sleep         = 0;
+uint8_t  current_idle_frame = 0;
+// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
+uint8_t current_tap_frame = 0;
+
+static void render_anim(void) {
+    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+    static const char PROGMEM prep[][ANIM_SIZE]            = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00}};
+    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE]   = {
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    };
+
+    // assumes 1 frame prep stage
+    void animation_phase(void) {
+        if (get_current_wpm() <= IDLE_SPEED) {
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+        }
+        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
+            // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
+            oled_write_raw_P(prep[0], ANIM_SIZE); // remove if IDLE_FRAMES >1
+        }
+        if (get_current_wpm() >= TAP_SPEED) {
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+        }
+    }
+    if (get_current_wpm() != 000) {
+        oled_on(); // not essential but turns on animation OLED with any alpha keypress
+        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+        anim_sleep = timer_read32();
+    } else {
+        
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        
+    }
+}
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    if (!is_keyboard_master()) {
+        return OLED_ROTATION_180;
+    } else {
+        return rotation;
+    }
+}
+
+static void render_keylock_status(led_t led_state) {
+    oled_write_P(PSTR("Lock: "), false);
+    oled_write_P(PSTR("CAPS"), led_state.caps_lock);
+    oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR("NUML"), led_state.num_lock);
+    oled_write_P(PSTR(" "), false);
+    oled_write_ln_P(PSTR("SCLK"), led_state.scroll_lock);
+}
+
+static void render_mod_status(uint8_t modifiers) {
+    oled_write_P(PSTR("Mods: "), false);
+    oled_write_P(PSTR("Sft"), (modifiers & MOD_MASK_SHIFT));
+    oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR("Ctl"), (modifiers & MOD_MASK_CTRL));
+    oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR("Alt"), (modifiers & MOD_MASK_ALT));
+    oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI));
+}
+
+
+static void render_status(void) {
+    // Host Keyboard Layer Status
+    switch (get_highest_layer(default_layer_state)) {
+        case 0:
+            oled_write_P(PSTR("QWERTY | "), false);
+            break;
+    }
+
+    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;
+
+        case 3:
+            oled_write_P(PSTR("Adjust  \n"), false);
+            break;
+
+        default:
+            oled_write_P(PSTR("Unknown \n"), false);
+    }
+
+    oled_write_P(PSTR("\n"), false);
+    render_keylock_status(host_keyboard_led_state());
+    render_mod_status(get_mods() | get_oneshot_mods());
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    if (is_keyboard_master()) {
+        // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+        render_status();
+    } else {
+        render_anim(); // renders pixelart
+
+        oled_set_cursor(0, 0); // sets cursor to (row, column) using charactar spacing (5 rows on 128x32 screen, anything more will overflow back to the top)
+        oled_write_P(PSTR("WPM: "), false);
+        oled_write(get_u8_str(get_current_wpm(), '0'), false);
+
+        led_t led_state = host_keyboard_led_state(); // caps lock stuff, prints CAPS on new line if caps led is on
+        oled_set_cursor(0, 1);
+        oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("       "), false);
+
+        return false;
+    }
+
+    return false;
+}
+#endif 
diff --git a/keyboards/meetlab/kafkasplit/keymaps/default/keymap.c b/keyboards/meetlab/kafkasplit/keymaps/default/keymap.c
new file mode 100644
index 00000000000..db6ccd89125
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 FITNKCS 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/licensKC/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layer_namKC {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] =	LAYOUT(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        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, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                 KC_LCTL,   KC_LGUI,   MO(1),  KC_SPC,    KC_ENT,   MO(2),  KC_BSPC,  KC_LALT
+                                //`----------------------------------'  `------------------------------------'
+	),
+
+    [_LOWER] =	LAYOUT(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_MINS,                       KC_INS, KC_HOME,   KC_UP,  KC_END, KC_PGUP, KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL,   KC_F5,   KC_F6,   KC_F7,   KC_F8, KC_EQL,                        KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PAUS,                      XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                  _______,  KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, _______, KC_LALT
+                                //`-----------------------------------'  `----------------------------------'
+	),
+	[_RAISE] =	LAYOUT(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        KC_CAPS, KC_EXLM, KC_DQUO, KC_HASH, KC_CIRC, XXXXXXX,                      KC_ASTR,    KC_7,    KC_8,    KC_9, KC_MINS, KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, XXXXXXX,                      KC_SLSH,    KC_4,    KC_5,    KC_6, KC_PLUS, KC_QUOT,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT, KC_LBRC, KC_RBRC, KC_LABK, KC_RABK,  KC_EQL,                         KC_0,    KC_1,    KC_2,    KC_3,  KC_DOT, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                  _______,  KC_LGUI, _______,  KC_SPC,     KC_ENT, _______,  _______, _______ 
+                                //`----------------------------------'  `------------------------------------'
+	),
+   [_ADJUST] =	LAYOUT(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        XXXXXXX, XXXXXXX,   KC_AT, XXXXXXX,  KC_DLR, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL, XXXXXXX, KC_AMPR, KC_PIPE, KC_BSLS, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TILD,  KC_GRV,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, KC_PERC, XXXXXXX,                      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                   _______, KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, _______, KC_LALT
+                                 //`---------------------------------'  `-----------------------------------'
+	)
+
+};
diff --git a/keyboards/meetlab/kafkasplit/keymaps/via/keymap.c b/keyboards/meetlab/kafkasplit/keymaps/via/keymap.c
new file mode 100644
index 00000000000..db6ccd89125
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 FITNKCS 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/licensKC/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layer_namKC {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] =	LAYOUT(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        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, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                 KC_LCTL,   KC_LGUI,   MO(1),  KC_SPC,    KC_ENT,   MO(2),  KC_BSPC,  KC_LALT
+                                //`----------------------------------'  `------------------------------------'
+	),
+
+    [_LOWER] =	LAYOUT(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_MINS,                       KC_INS, KC_HOME,   KC_UP,  KC_END, KC_PGUP, KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL,   KC_F5,   KC_F6,   KC_F7,   KC_F8, KC_EQL,                        KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PAUS,                      XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                  _______,  KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, _______, KC_LALT
+                                //`-----------------------------------'  `----------------------------------'
+	),
+	[_RAISE] =	LAYOUT(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        KC_CAPS, KC_EXLM, KC_DQUO, KC_HASH, KC_CIRC, XXXXXXX,                      KC_ASTR,    KC_7,    KC_8,    KC_9, KC_MINS, KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, XXXXXXX,                      KC_SLSH,    KC_4,    KC_5,    KC_6, KC_PLUS, KC_QUOT,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT, KC_LBRC, KC_RBRC, KC_LABK, KC_RABK,  KC_EQL,                         KC_0,    KC_1,    KC_2,    KC_3,  KC_DOT, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                  _______,  KC_LGUI, _______,  KC_SPC,     KC_ENT, _______,  _______, _______ 
+                                //`----------------------------------'  `------------------------------------'
+	),
+   [_ADJUST] =	LAYOUT(
+    //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        XXXXXXX, XXXXXXX,   KC_AT, XXXXXXX,  KC_DLR, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LCTL, XXXXXXX, KC_AMPR, KC_PIPE, KC_BSLS, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TILD,  KC_GRV,
+    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, KC_PERC, XXXXXXX,                      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_RSFT,
+    //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                   _______, KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, _______, KC_LALT
+                                 //`---------------------------------'  `-----------------------------------'
+	)
+
+};
diff --git a/keyboards/meetlab/kafkasplit/keymaps/via/rules.mk b/keyboards/meetlab/kafkasplit/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/meetlab/kafkasplit/matrix_diagram.md b/keyboards/meetlab/kafkasplit/matrix_diagram.md
new file mode 100644
index 00000000000..4fa57f74a2a
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/matrix_diagram.md
@@ -0,0 +1,14 @@
+# Matrix Diagram for kafkaSplit
+
+```
+┌───┬───┬───┬───┬───┬───┐            ┌───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │            │40 │41 │42 │43 │44 │45 │
+├───┼───┼───┼───┼───┼───┤            ├───┼───┼───┼───┼───┼───┤
+│10 │11 │12 │13 │14 │15 │            │50 │51 │52 │53 │54 │55 │
+├───┼───┼───┼───┼───┼───┤            ├───┼───┼───┼───┼───┼───┤
+│20 │21 │22 │23 │24 │25 │            │60 │61 │62 │63 │64 │65 │
+└───┴───┴───┼───┼───┼───┼───┐    ┌───┼───┼───┼───┼───┴───┴───┘
+            │32 │33 │34 │35 │    │70 │71 │72 │73 │
+            └───┴───┴───┴───┘    └───┴───┴───┴───┘
+
+```
diff --git a/keyboards/meetlab/kafkasplit/mcuconf.h b/keyboards/meetlab/kafkasplit/mcuconf.h
new file mode 100644
index 00000000000..56bd747d62c
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * 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_next <mcuconf.h>
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/meetlab/kafkasplit/readme.md b/keyboards/meetlab/kafkasplit/readme.md
new file mode 100644
index 00000000000..7b332d784a5
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/readme.md
@@ -0,0 +1,26 @@
+# kafkasplit - PCB
+
+![kafkasplit](https://i.imgur.com/fqxZGeHh.jpg)
+
+A 44-key split keyboard with rgb
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: https://github.com/LXF-YZP/KafkaSplit
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make meetlab/kafkasplit:default
+    
+Flashing example for this keyboard:
+
+    make meetlab/kafkasplit: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/meetlab/kafkasplit/rules.mk b/keyboards/meetlab/kafkasplit/rules.mk
new file mode 100644
index 00000000000..161ec22b16e
--- /dev/null
+++ b/keyboards/meetlab/kafkasplit/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/meetlab/rena/config.h b/keyboards/meetlab/rena/config.h
new file mode 100644
index 00000000000..ef8715e3842
--- /dev/null
+++ b/keyboards/meetlab/rena/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 WS2812_PWM_DRIVER PWMD2
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_DMA_CHANNEL 2
diff --git a/keyboards/meetlab/rena/halconf.h b/keyboards/meetlab/rena/halconf.h
new file mode 100644
index 00000000000..76f44ff900a
--- /dev/null
+++ b/keyboards/meetlab/rena/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM    TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/meetlab/rena/info.json b/keyboards/meetlab/rena/info.json
new file mode 100644
index 00000000000..cf28f6d5f03
--- /dev/null
+++ b/keyboards/meetlab/rena/info.json
@@ -0,0 +1,117 @@
+{
+  "manufacturer": "meet_lab",
+  "keyboard_name": "Rena",
+  "maintainer": "yuezp",
+  "processor": "STM32F103",
+  "bootloader": "stm32duino",
+  "diode_direction": "COL2ROW",
+  "features": {
+      "bootmagic": true,
+      "extrakey": true,
+      "nkro": true,
+      "rgblight": true
+  },
+  "matrix_pins": {
+      "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B7", "B13", "B6", "A15"],
+      "rows": ["B5", "B4", "B3", "B14", "A1"]
+  },
+  "rgblight": {
+      "animations": {
+          "alternating": true,
+          "breathing": true,
+          "christmas": true,
+          "knight": true,
+          "rainbow_mood": true,
+          "rainbow_swirl": true,
+          "rgb_test": true,
+          "snake": true,
+          "static_gradient": true,
+          "twinkle": true
+      },
+      "brightness_steps": 10,
+      "default": {
+          "animation": "rainbow_swirl"
+      },
+      "layers": {
+          "enabled": true,
+          "override_rgb": false
+      },
+      "led_count": 1,
+      "saturation_steps": 8
+  },
+  "url": "",
+  "usb": {
+      "device_version": "1.0.0",
+      "pid": "0xAB06",
+      "vid": "0xBA60"
+  },
+  "ws2812": {
+      "driver": "pwm",
+      "pin": "A2"
+  },
+  "layouts": {
+      "LAYOUT": {
+          "layout": [
+              {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0},
+              {"label": "!", "matrix": [0, 1], "x": 1.25, "y": 0},
+              {"label": "@", "matrix": [0, 2], "x": 2.25, "y": 0},
+              {"label": "#", "matrix": [0, 3], "x": 3.25, "y": 0},
+              {"label": "$", "matrix": [0, 4], "x": 4.25, "y": 0},
+              {"label": "%", "matrix": [0, 5], "x": 5.5, "y": 0},
+              {"label": "^", "matrix": [0, 6], "x": 6.5, "y": 0},
+              {"label": "&", "matrix": [0, 7], "x": 7.5, "y": 0},
+              {"label": "*", "matrix": [0, 8], "x": 8.5, "y": 0},
+              {"label": "(", "matrix": [0, 9], "x": 9.75, "y": 0},
+              {"label": ")", "matrix": [0, 10], "x": 10.75, "y": 0},
+              {"label": "_", "matrix": [0, 11], "x": 11.75, "y": 0},
+              {"label": "+", "matrix": [0, 12], "x": 12.75, "y": 0},
+              {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 0},
+              {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+              {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.25},
+              {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.25},
+              {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.25},
+              {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.25},
+              {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.25},
+              {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.25},
+              {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.25},
+              {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.25},
+              {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.25},
+              {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.25},
+              {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.25},
+              {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.25},
+              {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+              {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+              {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.25},
+              {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.25},
+              {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+              {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+              {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+              {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+              {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+              {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+              {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+              {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+              {"label": "k90", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+              {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
+              {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+              {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3.25},
+              {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3.25},
+              {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3.25},
+              {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3.25},
+              {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3.25},
+              {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3.25},
+              {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3.25},
+              {"label": "<", "matrix": [3, 8], "x": 9.25, "y": 3.25},
+              {"label": ">", "matrix": [3, 9], "x": 10.25, "y": 3.25},
+              {"label": "?", "matrix": [3, 10], "x": 11.25, "y": 3.25},
+              {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3.25, "w": 1.75},
+              {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3.25},
+              {"label": "Win", "matrix": [4, 1], "x": 1.625, "y": 4.25},
+              {"label": "Alt", "matrix": [4, 2], "x": 2.625, "y": 4.25, "w": 1.5},
+              {"label": "Space", "matrix": [4, 6], "x": 4.375, "y": 4.5, "w": 6.25},
+              {"label": "Alt", "matrix": [4, 10], "x": 10.875, "y": 4.25, "w": 1.5},
+              {"label": "Ctrl", "matrix": [4, 12], "x": 12.375, "y": 4.25}
+          ]
+      }
+  }
+}
\ No newline at end of file
diff --git a/keyboards/meetlab/rena/keymaps/default/keymap.c b/keyboards/meetlab/rena/keymaps/default/keymap.c
new file mode 100644
index 00000000000..72339aa130b
--- /dev/null
+++ b/keyboards/meetlab/rena/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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_1,    KC_2,    KC_3,     KC_4,       KC_5,     KC_6,     KC_7,     KC_8,       KC_9,      KC_0,     KC_MINS,   KC_EQL,    KC_BSLS,
+    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_BSPC,
+    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_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_LGUI, KC_LALT,                                 KC_SPC,                                              KC_RALT,   KC_RGUI),
+
+
+[1] = LAYOUT(
+    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_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,  
+    KC_CAPS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS, 
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,  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/meetlab/rena/keymaps/via/keymap.c b/keyboards/meetlab/rena/keymaps/via/keymap.c
new file mode 100644
index 00000000000..72339aa130b
--- /dev/null
+++ b/keyboards/meetlab/rena/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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_1,    KC_2,    KC_3,     KC_4,       KC_5,     KC_6,     KC_7,     KC_8,       KC_9,      KC_0,     KC_MINS,   KC_EQL,    KC_BSLS,
+    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_BSPC,
+    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_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_LGUI, KC_LALT,                                 KC_SPC,                                              KC_RALT,   KC_RGUI),
+
+
+[1] = LAYOUT(
+    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_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,  
+    KC_CAPS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS, 
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,  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/meetlab/rena/keymaps/via/rules.mk b/keyboards/meetlab/rena/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/meetlab/rena/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/meetlab/rena/matrix_diagram.md b/keyboards/meetlab/rena/matrix_diagram.md
new file mode 100644
index 00000000000..c671421bff0
--- /dev/null
+++ b/keyboards/meetlab/rena/matrix_diagram.md
@@ -0,0 +1,17 @@
+# Matrix Diagram for Rena
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘
+┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+│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      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C    │3D │
+└─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┴─┬─┴───┼────┬─┴───┘
+      │41  │42   │┌───────────────────────┐│4A   │4C  │
+      └────┴─────┘│46                     │└─────┴────┘
+                  └───────────────────────┘
+```
\ No newline at end of file
diff --git a/keyboards/meetlab/rena/mcuconf.h b/keyboards/meetlab/rena/mcuconf.h
new file mode 100644
index 00000000000..206afe376eb
--- /dev/null
+++ b/keyboards/meetlab/rena/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
diff --git a/keyboards/meetlab/rena/readme.md b/keyboards/meetlab/rena/readme.md
new file mode 100644
index 00000000000..3941525d74c
--- /dev/null
+++ b/keyboards/meetlab/rena/readme.md
@@ -0,0 +1,27 @@
+# Rena - PCB
+
+![Rena](https://i.imgur.com/95rqwegh.jpg)
+
+A 59 keys keyboard with rgb.
+This keyboard use 8mhz HSE and STM32F103 as MCU.
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: Rena PCB
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make meetlab/rena:default
+    
+Flashing example for this keyboard:
+
+    make meetlab/rena: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/meetlab/rena/rena.c b/keyboards/meetlab/rena/rena.c
new file mode 100644
index 00000000000..b84903d56ff
--- /dev/null
+++ b/keyboards/meetlab/rena/rena.c
@@ -0,0 +1,40 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 "quantum.h"
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_GREEN}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+bool led_update_kb(led_t led_state) {
+    if (!led_update_user(led_state)) { return false; }
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    return true;
+}
+
+void keyboard_post_init_kb(void) {
+    rgblight_layers = my_rgb_layers;
+    keyboard_post_init_user();
+}
+
+#endif
diff --git a/keyboards/meetlab/rena/rules.mk b/keyboards/meetlab/rena/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/meetlab/rena/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mehkee96/keymaps/johann/keymap.c b/keyboards/mehkee96/keymaps/johann/keymap.c
deleted file mode 100644
index 30fdb742c41..00000000000
--- a/keyboards/mehkee96/keymaps/johann/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Layer 0, default layer
-____________________________________________________________________________________________________________________________________________________________________________
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-| ESC*   |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   | P SCN  |  HOME  |   DEL  | INSERT |  P Up  | P Down |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        | BACK   |  NUM   |        |        | Play   |
-|  ~`    |   1    |   2    |   3    |   4    |   5    |   6    |   7    |   8    |   9    |   0    |  _ -   | =  +   |   \    | SPACE  |  LOCK  |   /    |  *     | Pause  |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|            |        |        |        |        |        |        |        |        |        |        |  [     |   ]    |             |        |        |        |        |
-|    TAB     |   Q    |   W    |   E    |   R    |   T    |   Y    |   U    |   I    |   O    |   P    |  {     |   }    |  |   \      |   7    |   8    |   9    |  Next  |
-|____________|________|________|________|________|________|________|________|________|________|________|________|________|_____________|________|________|________|________|
-|              |        |        |        |        |        |        |        |        |        |   ;    |   '    |                    |        |        |        |        |
-|   CAPS LOCK  |   A    |   S    |   D    |   F    |   G    |   H    |   J    |   K    |   L    |   :    |   "    |       ENTER        |   4    |   5    |   6    |   -    |
-|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________|
-|                  |        |        |        |        |        |        |        |   ,    |    .   |   /    |                |        |        |        |        |        |
-|  SHIFT           |   Z    |   X    |   C    |   V    |   B    |   N    |   M    |   <    |    >   |   ?    |       SHIFT    |   UP   |   1    |   2    |   3    |   +    |
-|__________________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________|________|
-|          |          |          |                                                        |        |        |   MO   |        |        |        |        |        |        |
-| CTRL     |   LGUI   | L ALT    |                      SPACE                             | R ALT  |  RGUI  |  _FN   |  LEFT  |  DOWN  | RIGHT  |   0    |   .    | ENTER  |
-|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
-*/
-
-
-
-	LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_DEL,  KC_INS,  KC_PGUP, 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_NUM,  KC_PSLS, KC_PAST, KC_MPLY,
-    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_P7,   KC_P8,   KC_P9,   KC_MNXT,
-    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_P4,   KC_P5,   KC_P6,   KC_PMNS,
-    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_P1,   KC_P2,   KC_P3,   KC_PPLS,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
-
-
-
-  /* Layer 1, function layer
-____________________________________________________________________________________________________________________________________________________________________________
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |  VOL   |  VOL   |        |        |        |
-| QK_BOOT  |        |        |        |        |        |        |        |        |        |        |        |        | MUTE   |  DOWN  |   UP   |        |        |        |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|            |  RGB   |        |  RGB   |  HUE   |  HUE   | SATUR. | SATUR. | VALUE  | VALUE  |        |        |        |             |        |        |        |        |
-|            | TOGGLE |        |  MODE  |INCREASE| DCRSE  |INCREASE| DCRSE  |INCREASE| DCRSE  |        |        |        |             |        |        |        |        |
-|____________|________|________|________|________|________|________|________|________|________|________|________|________|_____________|________|________|________|________|
-| BACKLIGHT    |        |        |        |        |        |        |        |        |        |        |        |                    |        |        |        |        |
-| TOGGLE       |        |        |        |        |        |        |        |        |        |        |        |                    |        |        |        |        |
-|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________|
-|         |        |        |        |BACKLHT |BACKLHT |BACKLHT |        |        |        |        |        |                |        |        |        |        |        |
-|         |        |        |        | DCRSE  |TOGGLE  |INCREASE|        |        |        |        |        |                |        |        |        |        |        |
-|_________|________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________|________|
-|          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
-|          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
-|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
-BL_TOGG, BL_DOWN,BL_UP changes the in-switch LEDs
-*/
-
-
-	LAYOUT(
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
-    BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-    _______         , _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
-};
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
diff --git a/keyboards/melgeek/mach80/config.h b/keyboards/melgeek/mach80/config.h
index cc4d7bc6bf9..68088ba7453 100755
--- a/keyboards/melgeek/mach80/config.h
+++ b/keyboards/melgeek/mach80/config.h
@@ -16,58 +16,5 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define DISABLE_RGB_MATRIX_SPLASH
-#define DISABLE_RGB_MATRIX_MULTISPLASH
-#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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 IS31FL3741_SDB_PIN B7
diff --git a/keyboards/melgeek/mach80/info.json b/keyboards/melgeek/mach80/info.json
index e084dda4130..ade831fc369 100755
--- a/keyboards/melgeek/mach80/info.json
+++ b/keyboards/melgeek/mach80/info.json
@@ -11,6 +11,60 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [108, 30],
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
diff --git a/keyboards/melgeek/mach80/rev1/config.h b/keyboards/melgeek/mach80/rev1/config.h
index 072419e163b..960bf58c52f 100755
--- a/keyboards/melgeek/mach80/rev1/config.h
+++ b/keyboards/melgeek/mach80/rev1/config.h
@@ -16,9 +16,4 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 97
 #define DRIVER_INDICATOR_LED_TOTAL 3
-
-
-#define RGB_MATRIX_CENTER { 108, 30 }
-
diff --git a/keyboards/melgeek/mach80/rev1/info.json b/keyboards/melgeek/mach80/rev1/info.json
index 1d7d87b76f1..af9f7c2669b 100644
--- a/keyboards/melgeek/mach80/rev1/info.json
+++ b/keyboards/melgeek/mach80/rev1/info.json
@@ -1,7 +1,4 @@
 {
-    "rgb_matrix": {
-        "driver": "is31fl3741"
-    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
         "rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c
index 9e5c2d8b81d..a4b49610cc2 100755
--- a/keyboards/melgeek/mach80/rev1/rev1.c
+++ b/keyboards/melgeek/mach80/rev1/rev1.c
@@ -19,104 +19,104 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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 */
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB110 */
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB111 */
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB112 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB67 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB68 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+	{0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+	{0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+	{0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB69 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB70 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB71 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB72 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB73 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB74 */
+	{0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB75 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB76 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB77 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB78 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB79 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB80 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB83 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+	{0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB81 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB82 */
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB89 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB90 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB91 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB92 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB84 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB88 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB86 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB87 */
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB98 */
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB99 */
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB100 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB110 */
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB111 */
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB112 */
 };
 led_config_t g_led_config = {
 	{
@@ -145,9 +145,9 @@ led_config_t g_led_config = {
 };
 
 const is31fl3741_led_t 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 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB108 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB109 */
 };
 
 bool led_update_kb(led_t led_state) {
@@ -179,15 +179,8 @@ void matrix_init_kb(void) {
         is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
     }
 
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+    is31fl3741_update_led_control_registers(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/config.h b/keyboards/melgeek/mach80/rev2/config.h
index 10d3bde47a4..960bf58c52f 100755
--- a/keyboards/melgeek/mach80/rev2/config.h
+++ b/keyboards/melgeek/mach80/rev2/config.h
@@ -16,9 +16,4 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 94
 #define DRIVER_INDICATOR_LED_TOTAL 3
-
-
-#define RGB_MATRIX_CENTER { 108, 30 }
-
diff --git a/keyboards/melgeek/mach80/rev2/info.json b/keyboards/melgeek/mach80/rev2/info.json
index 1d7d87b76f1..af9f7c2669b 100644
--- a/keyboards/melgeek/mach80/rev2/info.json
+++ b/keyboards/melgeek/mach80/rev2/info.json
@@ -1,7 +1,4 @@
 {
-    "rgb_matrix": {
-        "driver": "is31fl3741"
-    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
         "rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
index e9fdc2517f7..1a759f38c60 100755
--- a/keyboards/melgeek/mach80/rev2/rev2.c
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -19,101 +19,101 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB67 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB68 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+	{0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+	{0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+	{0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB69 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB70 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB71 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB72 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB73 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB74 */
+	{0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB75 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB76 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB77 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB78 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB79 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB80 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB83 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+	{0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB81 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB82 */
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB89 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB90 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB91 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB92 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB84 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB88 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB86 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB87 */
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB98 */
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB99 */
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB100 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */
 };
 led_config_t g_led_config = {
 	{
@@ -143,9 +143,9 @@ led_config_t g_led_config = {
 };
 
 const is31fl3741_led_t 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 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB108 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB109 */
 };
 
 bool led_update_kb(led_t led_state) {
@@ -177,15 +177,8 @@ void matrix_init_kb(void) {
         is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
     }
 
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+    is31fl3741_update_led_control_registers(0);
 
     matrix_init_user();
 }
-
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(B7);
-    writePinHigh(B7);
-    keyboard_pre_init_user();
-}
 #endif
diff --git a/keyboards/melgeek/mj61/config.h b/keyboards/melgeek/mj61/config.h
index 704699ece99..010e035e2e3 100644
--- a/keyboards/melgeek/mj61/config.h
+++ b/keyboards/melgeek/mj61/config.h
@@ -16,58 +16,5 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN A2
diff --git a/keyboards/melgeek/mj61/info.json b/keyboards/melgeek/mj61/info.json
index 3e62cbf28a2..d34dc593644 100644
--- a/keyboards/melgeek/mj61/info.json
+++ b/keyboards/melgeek/mj61/info.json
@@ -12,6 +12,57 @@
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
     "debounce": 3,
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
     "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/melgeek/mj61/rev1/config.h b/keyboards/melgeek/mj61/rev1/config.h
deleted file mode 100644
index ea29d94b9b1..00000000000
--- a/keyboards/melgeek/mj61/rev1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 63
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/info.json
index 705023fb8e4..67a4a004d62 100644
--- a/keyboards/melgeek/mj61/rev1/info.json
+++ b/keyboards/melgeek/mj61/rev1/info.json
@@ -1,7 +1,4 @@
 {
-    "rgb_matrix": {
-        "driver": "is31fl3741"
-    },
     "matrix_pins": {
         "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
         "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj61/rev1/rev1.c b/keyboards/melgeek/mj61/rev1/rev1.c
index 76fcb64c37f..3ee0da5183b 100644
--- a/keyboards/melgeek/mj61/rev1/rev1.c
+++ b/keyboards/melgeek/mj61/rev1/rev1.c
@@ -17,70 +17,70 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB4 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB5 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB6 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB7 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB8 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB9 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB10 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB11 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB12 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB13 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB14 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB15 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB16 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB17 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB18 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB19 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB20 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB21 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB22 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB23 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB24 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB25 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB26 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB27 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB28 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB29 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB30 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB31 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB32 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB33 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB34 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB35 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB36 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB37 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB38 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB39 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB40 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB41 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB42 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB43 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB44 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB45 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB46 */
-	{0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB47 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB48 */
-	{0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB49 */
-	{0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB50 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB51 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB52 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB53 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB54 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB55 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB56 */
-	{0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB57 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB58 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB59 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB1 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB2 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB3 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB4 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB5 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB6 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB7 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB8 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB9 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB10 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB11 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB12 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB13 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB14 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB15 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB16 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB17 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB18 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB19 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB20 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB21 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB22 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB23 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB24 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB25 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB26 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB27 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB28 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB29 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB30 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB31 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB32 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB33 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB34 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB35 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB36 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB37 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB38 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB39 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB40 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB41 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB42 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB43 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB44 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB45 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB46 */
+	{0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB47 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB48 */
+	{0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB49 */
+	{0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB50 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB51 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB52 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB53 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB54 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB55 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB56 */
+	{0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB57 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB58 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB59 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
 };
 
 led_config_t g_led_config = {
@@ -116,9 +116,3 @@ void suspend_wakeup_init_kb(void) {
     suspend_wakeup_init_user();
 }
 #endif
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
diff --git a/keyboards/melgeek/mj61/rev2/config.h b/keyboards/melgeek/mj61/rev2/config.h
deleted file mode 100644
index 0cd072eb4ba..00000000000
--- a/keyboards/melgeek/mj61/rev2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 71
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj61/rev2/info.json
index 62b2c58f157..62c58271177 100644
--- a/keyboards/melgeek/mj61/rev2/info.json
+++ b/keyboards/melgeek/mj61/rev2/info.json
@@ -1,7 +1,4 @@
 {
-    "rgb_matrix": {
-        "driver": "is31fl3741"
-    },
     "matrix_pins": {
         "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
         "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj61/rev2/rev2.c b/keyboards/melgeek/mj61/rev2/rev2.c
index 9d13d52ebcb..71d41c16b3f 100644
--- a/keyboards/melgeek/mj61/rev2/rev2.c
+++ b/keyboards/melgeek/mj61/rev2/rev2.c
@@ -19,78 +19,78 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB3 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB4 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB5 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB6 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB7 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB2 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
-    {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}, /* RGB35 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB3 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB4 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB5 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB6 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB7 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB2 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
 };
 
 led_config_t g_led_config = {
@@ -126,9 +126,3 @@ void suspend_wakeup_init_kb(void) {
     suspend_wakeup_init_user();
 }
 #endif
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
diff --git a/keyboards/melgeek/mj63/config.h b/keyboards/melgeek/mj63/config.h
index 704699ece99..010e035e2e3 100644
--- a/keyboards/melgeek/mj63/config.h
+++ b/keyboards/melgeek/mj63/config.h
@@ -16,58 +16,5 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN A2
diff --git a/keyboards/melgeek/mj63/info.json b/keyboards/melgeek/mj63/info.json
index ecd3b0fff68..c81bf9f8677 100644
--- a/keyboards/melgeek/mj63/info.json
+++ b/keyboards/melgeek/mj63/info.json
@@ -12,6 +12,57 @@
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
     "debounce": 3,
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
     "community_layouts": ["60_ansi_arrow"],
     "layouts": {
         "LAYOUT_60_ansi_arrow": {
diff --git a/keyboards/melgeek/mj63/rev1/config.h b/keyboards/melgeek/mj63/rev1/config.h
deleted file mode 100644
index 8abf7f5595e..00000000000
--- a/keyboards/melgeek/mj63/rev1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 65
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj63/rev1/info.json
index 705023fb8e4..67a4a004d62 100644
--- a/keyboards/melgeek/mj63/rev1/info.json
+++ b/keyboards/melgeek/mj63/rev1/info.json
@@ -1,7 +1,4 @@
 {
-    "rgb_matrix": {
-        "driver": "is31fl3741"
-    },
     "matrix_pins": {
         "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
         "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj63/rev1/rev1.c b/keyboards/melgeek/mj63/rev1/rev1.c
index 69e7ab5da6e..e3baf32de7c 100644
--- a/keyboards/melgeek/mj63/rev1/rev1.c
+++ b/keyboards/melgeek/mj63/rev1/rev1.c
@@ -19,72 +19,72 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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, 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, 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, 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, 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, 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, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
-    {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}, /* RGB60 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0,  SW1_CS9, SW1_CS8, SW1_CS7},   /* RGB1 */
+    {0,  SW2_CS9, SW2_CS8, SW2_CS7},   /* RGB2 */
+    {0,  SW3_CS9, SW3_CS8, SW3_CS7},   /* RGB3 */
+    {0,  SW4_CS9, SW4_CS8, SW4_CS7},   /* RGB4 */
+    {0,  SW5_CS9, SW5_CS8, SW5_CS7},   /* RGB5 */
+    {0,  SW6_CS9, SW6_CS8, SW6_CS7},   /* RGB6 */
+    {0,  SW7_CS9, SW7_CS8, SW7_CS7},   /* RGB7 */
+    {0,  SW8_CS9, SW8_CS8, SW8_CS7},   /* RGB8 */
+    {0,  SW9_CS9, SW9_CS8, SW9_CS7},   /* RGB9 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
 };
 
 led_config_t g_led_config = {
@@ -119,12 +119,4 @@ void suspend_wakeup_init_kb(void) {
     rgb_matrix_set_suspend_state(false);
     suspend_wakeup_init_user();
 }
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
-
 #endif
-
diff --git a/keyboards/melgeek/mj63/rev2/config.h b/keyboards/melgeek/mj63/rev2/config.h
deleted file mode 100644
index 0cd072eb4ba..00000000000
--- a/keyboards/melgeek/mj63/rev2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 71
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj63/rev2/info.json
index 62b2c58f157..62c58271177 100644
--- a/keyboards/melgeek/mj63/rev2/info.json
+++ b/keyboards/melgeek/mj63/rev2/info.json
@@ -1,7 +1,4 @@
 {
-    "rgb_matrix": {
-        "driver": "is31fl3741"
-    },
     "matrix_pins": {
         "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
         "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj63/rev2/rev2.c b/keyboards/melgeek/mj63/rev2/rev2.c
index 5ab9cdb65af..418092ec9f6 100644
--- a/keyboards/melgeek/mj63/rev2/rev2.c
+++ b/keyboards/melgeek/mj63/rev2/rev2.c
@@ -19,78 +19,78 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0,  CS9_SW1, CS8_SW1, CS7_SW1},   /* RGB1 */
-    {0,  CS9_SW2, CS8_SW2, CS7_SW2},   /* RGB3 */
-    {0,  CS9_SW3, CS8_SW3, CS7_SW3},   /* RGB4 */
-    {0,  CS9_SW4, CS8_SW4, CS7_SW4},   /* RGB5 */
-    {0,  CS9_SW5, CS8_SW5, CS7_SW5},   /* RGB6 */
-    {0,  CS9_SW6, CS8_SW6, CS7_SW6},   /* RGB7 */
-    {0,  CS9_SW7, CS8_SW7, CS7_SW7},   /* RGB2 */
-    {0,  CS9_SW8, CS8_SW8, CS7_SW8},   /* RGB8 */
-    {0,  CS9_SW9, CS8_SW9, CS7_SW9},   /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
-    {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}, /* RGB35 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0,  SW1_CS9, SW1_CS8, SW1_CS7},   /* RGB1 */
+    {0,  SW2_CS9, SW2_CS8, SW2_CS7},   /* RGB3 */
+    {0,  SW3_CS9, SW3_CS8, SW3_CS7},   /* RGB4 */
+    {0,  SW4_CS9, SW4_CS8, SW4_CS7},   /* RGB5 */
+    {0,  SW5_CS9, SW5_CS8, SW5_CS7},   /* RGB6 */
+    {0,  SW6_CS9, SW6_CS8, SW6_CS7},   /* RGB7 */
+    {0,  SW7_CS9, SW7_CS8, SW7_CS7},   /* RGB2 */
+    {0,  SW8_CS9, SW8_CS8, SW8_CS7},   /* RGB8 */
+    {0,  SW9_CS9, SW9_CS8, SW9_CS7},   /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
 };
 
 led_config_t g_led_config = {
@@ -126,9 +126,3 @@ void suspend_wakeup_init_kb(void) {
     suspend_wakeup_init_user();
 }
 #endif
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
diff --git a/keyboards/melgeek/mj64/config.h b/keyboards/melgeek/mj64/config.h
index 704699ece99..010e035e2e3 100644
--- a/keyboards/melgeek/mj64/config.h
+++ b/keyboards/melgeek/mj64/config.h
@@ -16,58 +16,5 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN A2
diff --git a/keyboards/melgeek/mj64/info.json b/keyboards/melgeek/mj64/info.json
index cbc73a262a1..731996ef849 100644
--- a/keyboards/melgeek/mj64/info.json
+++ b/keyboards/melgeek/mj64/info.json
@@ -12,6 +12,57 @@
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
     "debounce": 3,
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
     "community_layouts": ["64_ansi"],
     "layouts": {
         "LAYOUT_64_ansi": {
diff --git a/keyboards/melgeek/mj64/rev1/config.h b/keyboards/melgeek/mj64/rev1/config.h
deleted file mode 100644
index ab8fcd6e09e..00000000000
--- a/keyboards/melgeek/mj64/rev1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 66
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json
index 705023fb8e4..67a4a004d62 100644
--- a/keyboards/melgeek/mj64/rev1/info.json
+++ b/keyboards/melgeek/mj64/rev1/info.json
@@ -1,7 +1,4 @@
 {
-    "rgb_matrix": {
-        "driver": "is31fl3741"
-    },
     "matrix_pins": {
         "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
         "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj64/rev1/rev1.c b/keyboards/melgeek/mj64/rev1/rev1.c
index fff946b20ac..b9609cad1e8 100644
--- a/keyboards/melgeek/mj64/rev1/rev1.c
+++ b/keyboards/melgeek/mj64/rev1/rev1.c
@@ -18,71 +18,71 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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, 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, 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, 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, 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, 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, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {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}, /* RGB60 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7}, /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7}, /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7}, /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7}, /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7}, /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7}, /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7}, /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7}, /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7}, /* RGB9 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
 };
 
 led_config_t g_led_config = {
@@ -116,11 +116,4 @@ void suspend_wakeup_init_kb(void) {
     rgb_matrix_set_suspend_state(false);
     suspend_wakeup_init_user();
 }
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
-
 #endif
diff --git a/keyboards/melgeek/mj64/rev2/config.h b/keyboards/melgeek/mj64/rev2/config.h
deleted file mode 100644
index ab8fcd6e09e..00000000000
--- a/keyboards/melgeek/mj64/rev2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 66
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json
index 705023fb8e4..67a4a004d62 100644
--- a/keyboards/melgeek/mj64/rev2/info.json
+++ b/keyboards/melgeek/mj64/rev2/info.json
@@ -1,7 +1,4 @@
 {
-    "rgb_matrix": {
-        "driver": "is31fl3741"
-    },
     "matrix_pins": {
         "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
         "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj64/rev2/rev2.c b/keyboards/melgeek/mj64/rev2/rev2.c
index 35da35b2e4c..16c8e1f6125 100644
--- a/keyboards/melgeek/mj64/rev2/rev2.c
+++ b/keyboards/melgeek/mj64/rev2/rev2.c
@@ -18,73 +18,73 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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, 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, 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, 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, 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, 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, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
-    {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}, /* RGB60 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
 };
 
 led_config_t g_led_config = {
@@ -119,12 +119,4 @@ void suspend_wakeup_init_kb(void) {
     rgb_matrix_set_suspend_state(false);
     suspend_wakeup_init_user();
 }
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
-
 #endif
-
diff --git a/keyboards/melgeek/mj64/rev3/config.h b/keyboards/melgeek/mj64/rev3/config.h
deleted file mode 100644
index a5a1fbf3e01..00000000000
--- a/keyboards/melgeek/mj64/rev3/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 72
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json
index 62b2c58f157..62c58271177 100644
--- a/keyboards/melgeek/mj64/rev3/info.json
+++ b/keyboards/melgeek/mj64/rev3/info.json
@@ -1,7 +1,4 @@
 {
-    "rgb_matrix": {
-        "driver": "is31fl3741"
-    },
     "matrix_pins": {
         "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
         "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj64/rev3/rev3.c b/keyboards/melgeek/mj64/rev3/rev3.c
index 942bda1487f..7af80c7388f 100644
--- a/keyboards/melgeek/mj64/rev3/rev3.c
+++ b/keyboards/melgeek/mj64/rev3/rev3.c
@@ -18,79 +18,79 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB3 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB4 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB5 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB6 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB7 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB2 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
-    {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}, /* RGB35 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB3 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB4 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB5 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB6 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB7 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB2 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
 };
 
 led_config_t g_led_config = {
@@ -126,9 +126,3 @@ void suspend_wakeup_init_kb(void) {
     suspend_wakeup_init_user();
 }
 #endif
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/config.h
index 704699ece99..010e035e2e3 100644
--- a/keyboards/melgeek/mj65/config.h
+++ b/keyboards/melgeek/mj65/config.h
@@ -16,58 +16,5 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN A2
diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json
index 061b4bc83e0..773c9a31984 100644
--- a/keyboards/melgeek/mj65/info.json
+++ b/keyboards/melgeek/mj65/info.json
@@ -9,7 +9,55 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"],
diff --git a/keyboards/melgeek/mj65/rev3/config.h b/keyboards/melgeek/mj65/rev3/config.h
deleted file mode 100644
index 7fc5f0afd11..00000000000
--- a/keyboards/melgeek/mj65/rev3/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 76
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj65/rev3/rev3.c b/keyboards/melgeek/mj65/rev3/rev3.c
index 6d851aa847e..1392d5af4e5 100644
--- a/keyboards/melgeek/mj65/rev3/rev3.c
+++ b/keyboards/melgeek/mj65/rev3/rev3.c
@@ -18,83 +18,83 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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, 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, 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, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {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, 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, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {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, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
-    {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB73 */
-    {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, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB74 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB75 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB76 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
+    {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB73 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB74 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB75 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB76 */
 };
 
 led_config_t g_led_config = {
@@ -131,9 +131,3 @@ void suspend_wakeup_init_kb(void) {
 }
 
 #endif 
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index 288c8e3a3e7..b3932491c1b 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -16,5 +16,4 @@
 
 #pragma once
 
-#    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
-#    define RGBLIGHT_DEFAULT_SPD 10
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json
index dba086e493b..e6900656398 100644
--- a/keyboards/melgeek/mj6xy/rev3/info.json
+++ b/keyboards/melgeek/mj6xy/rev3/info.json
@@ -24,6 +24,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 10
         }
     },
     "ws2812": {
diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/mojo68/config.h
index e661efb2a9d..68088ba7453 100755
--- a/keyboards/melgeek/mojo68/config.h
+++ b/keyboards/melgeek/mojo68/config.h
@@ -16,57 +16,5 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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_FRACTAL
-// #    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// 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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN B7
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json
index 7e160d0c59f..8938bd8a133 100755
--- a/keyboards/melgeek/mojo68/info.json
+++ b/keyboards/melgeek/mojo68/info.json
@@ -9,7 +9,52 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h
index 2a93a475cf8..960bf58c52f 100755
--- a/keyboards/melgeek/mojo68/rev1/config.h
+++ b/keyboards/melgeek/mojo68/rev1/config.h
@@ -16,5 +16,4 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 68
 #define DRIVER_INDICATOR_LED_TOTAL 3
diff --git a/keyboards/melgeek/mojo68/rev1/rev1.c b/keyboards/melgeek/mojo68/rev1/rev1.c
index cd6d4ec4136..af17d96c6d9 100755
--- a/keyboards/melgeek/mojo68/rev1/rev1.c
+++ b/keyboards/melgeek/mojo68/rev1/rev1.c
@@ -18,75 +18,75 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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, 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, 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, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {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, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
-    {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, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {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, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},    /* RGB1 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},    /* RGB2 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},    /* RGB3 */
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},    /* RGB4 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},    /* RGB5 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},    /* RGB6 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},    /* RGB7 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},    /* RGB8 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},    /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
 };
 
 led_config_t g_led_config = {
@@ -113,9 +113,9 @@ led_config_t g_led_config = {
 };
 
 const is31fl3741_led_t g_is31_indicator_leds[3] = {
-    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB124 */
-    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB125 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB126 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB124 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB125 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB126 */
 };
 
 bool led_update_kb(led_t led_state) {
@@ -147,15 +147,8 @@ void matrix_init_kb(void) {
         is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
     }
 
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+    is31fl3741_update_led_control_registers(0);
 
     matrix_init_user();
 }
-
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(B7);
-    writePinHigh(B7);
-    keyboard_pre_init_user();
-}
 #endif
diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/config.h
index a4e89e5a90d..010e035e2e3 100644
--- a/keyboards/melgeek/mojo75/config.h
+++ b/keyboards/melgeek/mojo75/config.h
@@ -16,59 +16,5 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN A2
diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json
index c22c5710a5e..e934cb9f4b6 100644
--- a/keyboards/melgeek/mojo75/info.json
+++ b/keyboards/melgeek/mojo75/info.json
@@ -9,7 +9,55 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B12", "B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mojo75/rev1/config.h b/keyboards/melgeek/mojo75/rev1/config.h
deleted file mode 100644
index 44435f22205..00000000000
--- a/keyboards/melgeek/mojo75/rev1/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 92
-#define DRIVER_INDICATOR_LED_TOTAL 0
-
diff --git a/keyboards/melgeek/mojo75/rev1/rev1.c b/keyboards/melgeek/mojo75/rev1/rev1.c
index e64c163c782..18daafebf8d 100644
--- a/keyboards/melgeek/mojo75/rev1/rev1.c
+++ b/keyboards/melgeek/mojo75/rev1/rev1.c
@@ -18,99 +18,99 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0,  CS6_SW1,  CS5_SW1,  CS4_SW1}, /* RGB1 */
-    {0,  CS6_SW2,  CS5_SW2,  CS4_SW2}, /* RGB2 */
-    {0,  CS6_SW3,  CS5_SW3,  CS4_SW3}, /* RGB3 */
-    {0,  CS6_SW4,  CS5_SW4,  CS4_SW4}, /* RGB4 */
-    {0,  CS6_SW5,  CS5_SW5,  CS4_SW5}, /* RGB5 */
-    {0,  CS6_SW6,  CS5_SW6,  CS4_SW6}, /* RGB6 */
-    {0,  CS6_SW7,  CS5_SW7,  CS4_SW7}, /* RGB7 */
-    {0,  CS6_SW8,  CS5_SW8,  CS4_SW8}, /* RGB8 */
-    {0,  CS6_SW9,  CS5_SW9,  CS4_SW9}, /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */
-	{0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */
-    {0,  CS9_SW1,  CS8_SW1,  CS7_SW1}, /* RGB10 */
-    {0,  CS9_SW2,  CS8_SW2,  CS7_SW2}, /* RGB11 */
-    {0,  CS9_SW3,  CS8_SW3,  CS7_SW3}, /* RGB12 */
-    {0,  CS9_SW4,  CS8_SW4,  CS7_SW4}, /* RGB13 */
-    {0,  CS9_SW5,  CS8_SW5,  CS7_SW5}, /* RGB14 */
-    {0,  CS9_SW6,  CS8_SW6,  CS7_SW6}, /* RGB15 */
-    {0,  CS9_SW7,  CS8_SW7,  CS7_SW7}, /* RGB16 */
-    {0,  CS9_SW8,  CS8_SW8,  CS7_SW8}, /* RGB17 */
-    {0,  CS9_SW9,  CS8_SW9,  CS7_SW9}, /* RGB18 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB19 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB20 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB21 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB22 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB23 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB24 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB25 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB26 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB27 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB28 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB29 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB30 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB31 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB32 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB33 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB34 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB35 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB37 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB38 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB39 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB40 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB41 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB42 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB43 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB44 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB45 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */
-    {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */
-    {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB46 */
-	{0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB47 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB48 */
-	{0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB49 */
-	{0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB50 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB51 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB52 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB53 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB54 */
-    {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB88 */
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB92 */
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB90 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0,  SW1_CS6,  SW1_CS5,  SW1_CS4}, /* RGB1 */
+    {0,  SW2_CS6,  SW2_CS5,  SW2_CS4}, /* RGB2 */
+    {0,  SW3_CS6,  SW3_CS5,  SW3_CS4}, /* RGB3 */
+    {0,  SW4_CS6,  SW4_CS5,  SW4_CS4}, /* RGB4 */
+    {0,  SW5_CS6,  SW5_CS5,  SW5_CS4}, /* RGB5 */
+    {0,  SW6_CS6,  SW6_CS5,  SW6_CS4}, /* RGB6 */
+    {0,  SW7_CS6,  SW7_CS5,  SW7_CS4}, /* RGB7 */
+    {0,  SW8_CS6,  SW8_CS5,  SW8_CS4}, /* RGB8 */
+    {0,  SW9_CS6,  SW9_CS5,  SW9_CS4}, /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB55 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB56 */
+	{0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB57 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB58 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB59 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB60 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB61 */
+    {0,  SW1_CS9,  SW1_CS8,  SW1_CS7}, /* RGB10 */
+    {0,  SW2_CS9,  SW2_CS8,  SW2_CS7}, /* RGB11 */
+    {0,  SW3_CS9,  SW3_CS8,  SW3_CS7}, /* RGB12 */
+    {0,  SW4_CS9,  SW4_CS8,  SW4_CS7}, /* RGB13 */
+    {0,  SW5_CS9,  SW5_CS8,  SW5_CS7}, /* RGB14 */
+    {0,  SW6_CS9,  SW6_CS8,  SW6_CS7}, /* RGB15 */
+    {0,  SW7_CS9,  SW7_CS8,  SW7_CS7}, /* RGB16 */
+    {0,  SW8_CS9,  SW8_CS8,  SW8_CS7}, /* RGB17 */
+    {0,  SW9_CS9,  SW9_CS8,  SW9_CS7}, /* RGB18 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB62 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB63 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB64 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB65 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB66 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB67 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB68 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB69 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB19 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB20 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB21 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB22 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB23 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB24 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB25 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB26 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB27 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB70 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB71 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB72 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB86 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB73 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB74 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB28 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB29 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB30 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB31 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB32 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB33 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB34 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB35 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB75 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB76 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB77 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB78 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB79 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB80 */
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB91 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB37 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB38 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB39 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB40 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB41 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB42 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB43 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB44 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB45 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB84 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB83 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB82 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB81 */
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB87 */
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB89 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB46 */
+	{0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB47 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB48 */
+	{0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB49 */
+	{0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB50 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB51 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB52 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB53 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB54 */
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB88 */
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB92 */
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB90 */
 };
 
 led_config_t g_led_config = {
@@ -149,12 +149,4 @@ void suspend_wakeup_init_kb(void) {
     rgb_matrix_set_suspend_state(false);
     suspend_wakeup_init_user();
 }
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
-
 #endif
-
diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h
index 723706d6102..68088ba7453 100755
--- a/keyboards/melgeek/tegic/config.h
+++ b/keyboards/melgeek/tegic/config.h
@@ -16,55 +16,5 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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 IS31FL3741_SDB_PIN B7
diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json
index c54f53ca61c..755ae3db3eb 100644
--- a/keyboards/melgeek/tegic/info.json
+++ b/keyboards/melgeek/tegic/info.json
@@ -9,7 +9,58 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [84, 24],
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/melgeek/tegic/rev1/config.h b/keyboards/melgeek/tegic/rev1/config.h
deleted file mode 100755
index bba7c01f5f5..00000000000
--- a/keyboards/melgeek/tegic/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 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
-
-#define RGB_MATRIX_LED_COUNT 91
-//#define DRIVER_INDICATOR_LED_TOTAL 3
-
-
-#define RGB_MATRIX_CENTER { 84, 24 }
-
diff --git a/keyboards/melgeek/tegic/rev1/rev1.c b/keyboards/melgeek/tegic/rev1/rev1.c
index 6dc2e8d180b..b087264919c 100755
--- a/keyboards/melgeek/tegic/rev1/rev1.c
+++ b/keyboards/melgeek/tegic/rev1/rev1.c
@@ -19,103 +19,103 @@
 #ifdef RGB_MATRIX_ENABLE
 
 
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {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}, /* RGB55 */
-    {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}, /* RGB60 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
 
-    {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_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+	{0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+	{0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+	{0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
 
-    {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_SW6, CS29_SW6, CS28_SW6}, /* RGB127 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB128 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB129 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB130 */
-	{0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB136 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB135 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB127 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB128 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB129 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB130 */
+	{0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB136 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB135 */
 
-    {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_SW3, CS32_SW3, CS31_SW3}, /* RGB138 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB139 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB137 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB131 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB132 */
-    {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB133*/
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+	{0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB138 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB139 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB137 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB131 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB132 */
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB133*/
 
-    {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, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB134 */
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB145 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB144*/
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB148 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB147 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB146 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB140 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB141 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB134 */
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB145 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB144*/
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB148 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB147 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB146 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB140 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB141 */
 
-    {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, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB142 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB143 */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB149 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB142 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB143 */
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB149 */
 };
 led_config_t g_led_config = {
 	{
@@ -142,14 +142,4 @@ led_config_t g_led_config = {
 		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,      
 	}
 };
-
-
-
-
 #endif
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(B7);
-    writePinHigh(B7);
-    keyboard_pre_init_user();
-}
diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h
index d78cbab6721..5d5ce046684 100644
--- a/keyboards/melgeek/z70ultra/config.h
+++ b/keyboards/melgeek/z70ultra/config.h
@@ -16,60 +16,6 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#    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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define RGB_MATRIX_LED_COUNT 69
+
 #define DRIVER_INDICATOR_LED_TOTAL 6
diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json
index ae555e046bd..471929f9dbf 100644
--- a/keyboards/melgeek/z70ultra/info.json
+++ b/keyboards/melgeek/z70ultra/info.json
@@ -9,7 +9,55 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B1", "A10", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "C15", "C14", "C13"],
diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c
index f978edea921..1cb46df643a 100644
--- a/keyboards/melgeek/z70ultra/z70ultra.c
+++ b/keyboards/melgeek/z70ultra/z70ultra.c
@@ -18,78 +18,78 @@
 
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS28_SW1, CS30_SW1, CS29_SW1}, /* RGB10 */
-    {0, CS28_SW2, CS30_SW2, CS29_SW2}, /* RGB11 */
-    {0, CS28_SW3, CS30_SW3, CS29_SW3}, /* RGB12 */
-    {0, CS28_SW4, CS30_SW4, CS29_SW4}, /* RGB13 */
-    {0, CS28_SW5, CS30_SW5, CS29_SW5}, /* RGB14 */
-    {0, CS28_SW6, CS30_SW6, CS29_SW6}, /* RGB15 */
-    {0, CS28_SW7, CS30_SW7, CS29_SW7}, /* RGB16 */
-    {0, CS28_SW8, CS30_SW8, CS29_SW8}, /* RGB17 */
-    {0, CS28_SW9, CS30_SW9, CS29_SW9}, /* RGB18 */
-    {0, CS31_SW1, CS33_SW1, CS32_SW1}, /* RGB28 */
-    {0, CS31_SW2, CS33_SW2, CS32_SW2}, /* RGB29 */
-    {0, CS31_SW3, CS33_SW3, CS32_SW3}, /* RGB30 */
-    {0, CS31_SW4, CS33_SW4, CS32_SW4}, /* RGB31 */
-    {0, CS31_SW5, CS33_SW5, CS32_SW5}, /* RGB32 */
-    {0, CS31_SW6, CS33_SW6, CS32_SW6}, /* RGB33 */
-    {0, CS25_SW1, CS27_SW1, CS26_SW1}, /* RGB1 */
-    {0, CS25_SW2, CS27_SW2, CS26_SW2}, /* RGB2 */
-    {0, CS25_SW3, CS27_SW3, CS26_SW3}, /* RGB3 */
-    {0, CS25_SW4, CS27_SW4, CS26_SW4}, /* RGB4 */
-    {0, CS25_SW5, CS27_SW5, CS26_SW5}, /* RGB5 */
-    {0, CS25_SW6, CS27_SW6, CS26_SW6}, /* RGB6 */
-    {0, CS25_SW7, CS27_SW7, CS26_SW7}, /* RGB7 */
-    {0, CS25_SW8, CS27_SW8, CS26_SW8}, /* RGB8 */
-    {0, CS25_SW9, CS27_SW9, CS26_SW9}, /* RGB9 */
-    {0, CS34_SW1, CS36_SW1, CS35_SW1}, /* RGB46 */
-    {0, CS34_SW2, CS36_SW2, CS35_SW2}, /* RGB47 */
-    {0, CS34_SW3, CS36_SW3, CS35_SW3}, /* RGB48 */
-    {0, CS34_SW4, CS36_SW4, CS35_SW4}, /* RGB49 */
-    {0, CS34_SW5, CS36_SW5, CS35_SW5}, /* RGB50 */
-    {0, CS31_SW7, CS33_SW7, CS32_SW7}, /* RGB34 */
-    {0, CS22_SW1, CS24_SW1, CS23_SW1}, /* RGB37 */
-    {0, CS22_SW2, CS24_SW2, CS23_SW2}, /* RGB38 */
-    {0, CS22_SW3, CS24_SW3, CS23_SW3}, /* RGB39 */
-    {0, CS22_SW4, CS24_SW4, CS23_SW4}, /* RGB40 */
-    {0, CS22_SW5, CS24_SW5, CS23_SW5}, /* RGB41 */
-    {0, CS22_SW6, CS24_SW6, CS23_SW6}, /* RGB42 */
-    {0, CS22_SW7, CS24_SW7, CS23_SW7}, /* RGB43 */
-    {0, CS22_SW8, CS24_SW8, CS23_SW8}, /* RGB44 */
-    {0, CS22_SW9, CS24_SW9, CS23_SW9}, /* RGB45 */
-    {0, CS34_SW9, CS36_SW9, CS35_SW9}, /* RGB54 */
-    {0, CS34_SW8, CS36_SW8, CS35_SW8}, /* RGB53 */
-    {0, CS34_SW7, CS36_SW7, CS35_SW7}, /* RGB52 */
-    {0, CS34_SW6, CS36_SW6, CS35_SW6}, /* RGB51 */
-    {0, CS31_SW8, CS33_SW8, CS32_SW8}, /* RGB35 */
-    {0, CS19_SW2, CS21_SW2, CS20_SW2}, /* RGB56 */
-    {0, CS19_SW4, CS21_SW4, CS20_SW4}, /* RGB60 */
-    {0, CS19_SW5, CS21_SW5, CS20_SW5}, /* RGB59 */
-    {0, CS19_SW6, CS21_SW6, CS20_SW6}, /* RGB60 */
-    {0, CS19_SW7, CS21_SW7, CS20_SW7}, /* RGB61 */
-    {0, CS19_SW8, CS21_SW8, CS20_SW8}, /* RGB62 */
-    {0, CS19_SW9, CS21_SW9, CS20_SW9}, /* RGB63 */
-    {0, CS19_SW3, CS21_SW3, CS20_SW3}, /* RGB57 */
-    {0, CS19_SW1, CS21_SW1, CS20_SW1}, /* RGB55 */
-    {0, CS37_SW5, CS39_SW5, CS38_SW5}, /* RGB23 */
-    {0, CS37_SW6, CS39_SW6, CS38_SW6}, /* RGB24 */
-    {0, CS37_SW7, CS39_SW7, CS38_SW7}, /* RGB25 */
-    {0, CS37_SW8, CS39_SW8, CS38_SW8}, /* RGB26 */
-    {0, CS31_SW9, CS33_SW9, CS32_SW9}, /* RGB36 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS28, SW1_CS30, SW1_CS29}, /* RGB10 */
+    {0, SW2_CS28, SW2_CS30, SW2_CS29}, /* RGB11 */
+    {0, SW3_CS28, SW3_CS30, SW3_CS29}, /* RGB12 */
+    {0, SW4_CS28, SW4_CS30, SW4_CS29}, /* RGB13 */
+    {0, SW5_CS28, SW5_CS30, SW5_CS29}, /* RGB14 */
+    {0, SW6_CS28, SW6_CS30, SW6_CS29}, /* RGB15 */
+    {0, SW7_CS28, SW7_CS30, SW7_CS29}, /* RGB16 */
+    {0, SW8_CS28, SW8_CS30, SW8_CS29}, /* RGB17 */
+    {0, SW9_CS28, SW9_CS30, SW9_CS29}, /* RGB18 */
+    {0, SW1_CS31, SW1_CS33, SW1_CS32}, /* RGB28 */
+    {0, SW2_CS31, SW2_CS33, SW2_CS32}, /* RGB29 */
+    {0, SW3_CS31, SW3_CS33, SW3_CS32}, /* RGB30 */
+    {0, SW4_CS31, SW4_CS33, SW4_CS32}, /* RGB31 */
+    {0, SW5_CS31, SW5_CS33, SW5_CS32}, /* RGB32 */
+    {0, SW6_CS31, SW6_CS33, SW6_CS32}, /* RGB33 */
+    {0, SW1_CS25, SW1_CS27, SW1_CS26}, /* RGB1 */
+    {0, SW2_CS25, SW2_CS27, SW2_CS26}, /* RGB2 */
+    {0, SW3_CS25, SW3_CS27, SW3_CS26}, /* RGB3 */
+    {0, SW4_CS25, SW4_CS27, SW4_CS26}, /* RGB4 */
+    {0, SW5_CS25, SW5_CS27, SW5_CS26}, /* RGB5 */
+    {0, SW6_CS25, SW6_CS27, SW6_CS26}, /* RGB6 */
+    {0, SW7_CS25, SW7_CS27, SW7_CS26}, /* RGB7 */
+    {0, SW8_CS25, SW8_CS27, SW8_CS26}, /* RGB8 */
+    {0, SW9_CS25, SW9_CS27, SW9_CS26}, /* RGB9 */
+    {0, SW1_CS34, SW1_CS36, SW1_CS35}, /* RGB46 */
+    {0, SW2_CS34, SW2_CS36, SW2_CS35}, /* RGB47 */
+    {0, SW3_CS34, SW3_CS36, SW3_CS35}, /* RGB48 */
+    {0, SW4_CS34, SW4_CS36, SW4_CS35}, /* RGB49 */
+    {0, SW5_CS34, SW5_CS36, SW5_CS35}, /* RGB50 */
+    {0, SW7_CS31, SW7_CS33, SW7_CS32}, /* RGB34 */
+    {0, SW1_CS22, SW1_CS24, SW1_CS23}, /* RGB37 */
+    {0, SW2_CS22, SW2_CS24, SW2_CS23}, /* RGB38 */
+    {0, SW3_CS22, SW3_CS24, SW3_CS23}, /* RGB39 */
+    {0, SW4_CS22, SW4_CS24, SW4_CS23}, /* RGB40 */
+    {0, SW5_CS22, SW5_CS24, SW5_CS23}, /* RGB41 */
+    {0, SW6_CS22, SW6_CS24, SW6_CS23}, /* RGB42 */
+    {0, SW7_CS22, SW7_CS24, SW7_CS23}, /* RGB43 */
+    {0, SW8_CS22, SW8_CS24, SW8_CS23}, /* RGB44 */
+    {0, SW9_CS22, SW9_CS24, SW9_CS23}, /* RGB45 */
+    {0, SW9_CS34, SW9_CS36, SW9_CS35}, /* RGB54 */
+    {0, SW8_CS34, SW8_CS36, SW8_CS35}, /* RGB53 */
+    {0, SW7_CS34, SW7_CS36, SW7_CS35}, /* RGB52 */
+    {0, SW6_CS34, SW6_CS36, SW6_CS35}, /* RGB51 */
+    {0, SW8_CS31, SW8_CS33, SW8_CS32}, /* RGB35 */
+    {0, SW2_CS19, SW2_CS21, SW2_CS20}, /* RGB56 */
+    {0, SW4_CS19, SW4_CS21, SW4_CS20}, /* RGB60 */
+    {0, SW5_CS19, SW5_CS21, SW5_CS20}, /* RGB59 */
+    {0, SW6_CS19, SW6_CS21, SW6_CS20}, /* RGB60 */
+    {0, SW7_CS19, SW7_CS21, SW7_CS20}, /* RGB61 */
+    {0, SW8_CS19, SW8_CS21, SW8_CS20}, /* RGB62 */
+    {0, SW9_CS19, SW9_CS21, SW9_CS20}, /* RGB63 */
+    {0, SW3_CS19, SW3_CS21, SW3_CS20}, /* RGB57 */
+    {0, SW1_CS19, SW1_CS21, SW1_CS20}, /* RGB55 */
+    {0, SW5_CS37, SW5_CS39, SW5_CS38}, /* RGB23 */
+    {0, SW6_CS37, SW6_CS39, SW6_CS38}, /* RGB24 */
+    {0, SW7_CS37, SW7_CS39, SW7_CS38}, /* RGB25 */
+    {0, SW8_CS37, SW8_CS39, SW8_CS38}, /* RGB26 */
+    {0, SW9_CS31, SW9_CS33, SW9_CS32}, /* RGB36 */
 
-    {0, CS6_SW1, CS8_SW1, CS7_SW1},    /* RGB64 */
-    {0, CS6_SW3, CS8_SW3, CS7_SW3},    /* RGB66 */
-    {0, CS6_SW4, CS8_SW4, CS7_SW4},    /* RGB67 */
-    {0, CS6_SW5, CS8_SW5, CS7_SW5},    /* RGB69 */
-    {0, CS6_SW6, CS8_SW6, CS7_SW6},    /* RGB70 */
-    {0, CS6_SW2, CS8_SW2, CS7_SW2},    /* RGB65 */
+    {0, SW1_CS6, SW1_CS8, SW1_CS7},    /* RGB64 */
+    {0, SW3_CS6, SW3_CS8, SW3_CS7},    /* RGB66 */
+    {0, SW4_CS6, SW4_CS8, SW4_CS7},    /* RGB67 */
+    {0, SW5_CS6, SW5_CS8, SW5_CS7},    /* RGB69 */
+    {0, SW6_CS6, SW6_CS8, SW6_CS7},    /* RGB70 */
+    {0, SW2_CS6, SW2_CS8, SW2_CS7},    /* RGB65 */
 
-    {0, CS37_SW1, CS39_SW1, CS38_SW1}, /* RGB19 */
-    {0, CS37_SW2, CS39_SW2, CS38_SW2}, /* RGB20 */
-    {0, CS37_SW3, CS39_SW3, CS38_SW3}, /* RGB21 */
-    {0, CS37_SW4, CS39_SW4, CS38_SW4}, /* RGB22 */
-    {0, CS37_SW9, CS39_SW9, CS38_SW9}, /* RGB27 */
+    {0, SW1_CS37, SW1_CS39, SW1_CS38}, /* RGB19 */
+    {0, SW2_CS37, SW2_CS39, SW2_CS38}, /* RGB20 */
+    {0, SW3_CS37, SW3_CS39, SW3_CS38}, /* RGB21 */
+    {0, SW4_CS37, SW4_CS39, SW4_CS38}, /* RGB22 */
+    {0, SW9_CS37, SW9_CS39, SW9_CS38}, /* RGB27 */
 };
 led_config_t g_led_config = {
 	{
@@ -118,12 +118,12 @@ led_config_t g_led_config = {
 };
 
 const is31fl3741_led_t g_is31_indicator_leds[6] = {
-    {0, CS5_SW1, CS3_SW1, CS4_SW1}, /* RGB71 */
-    {0, CS5_SW2, CS3_SW2, CS4_SW2}, /* RGB72 */
-    {0, CS5_SW3, CS3_SW3, CS4_SW3}, /* RGB73 */
-    {0, CS5_SW4, CS3_SW4, CS4_SW4}, /* RGB74 */
-    {0, CS5_SW5, CS3_SW5, CS4_SW5}, /* RGB75 */
-    {0, CS5_SW6, CS3_SW6, CS4_SW6}, /* RGB76 */
+    {0, SW1_CS5, SW1_CS3, SW1_CS4}, /* RGB71 */
+    {0, SW2_CS5, SW2_CS3, SW2_CS4}, /* RGB72 */
+    {0, SW3_CS5, SW3_CS3, SW3_CS4}, /* RGB73 */
+    {0, SW4_CS5, SW4_CS3, SW4_CS4}, /* RGB74 */
+    {0, SW5_CS5, SW5_CS3, SW5_CS4}, /* RGB75 */
+    {0, SW6_CS5, SW6_CS3, SW6_CS4}, /* RGB76 */
 };
 
 bool led_update_kb(led_t led_state) {
@@ -161,7 +161,7 @@ void matrix_init_kb(void) {
         is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
     }
 
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+    is31fl3741_update_led_control_registers(0);
 
     matrix_init_user();
 }
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index 04569dc9894..2d9f73d61ab 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -20,11 +20,6 @@
 #define MASTER_LEFT
 #define SPLIT_MODS_ENABLE
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 83
-#    define RGB_MATRIX_SPLIT { 39, 44 }
-#endif
-
 #define B6_AUDIO
 
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index 95f3bb1cea2..9c120b92247 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -24,6 +24,10 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [39, 44]
+    },
     "rgblight": {
         "led_count": 83,
         "max_brightness": 150,
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 70a5d7ba590..d23f9163a72 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -20,11 +20,6 @@
 #define MASTER_LEFT
 #define SPLIT_MODS_ENABLE
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 100
-#    define RGB_MATRIX_SPLIT { 48, 52 }
-#endif
-
 #define AUDIO_PIN B6
 
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/merge/um80/keymaps/default/keymap.c b/keyboards/merge/um80/keymaps/default/keymap.c
index 04dea2c1be2..cfd628e300d 100644
--- a/keyboards/merge/um80/keymaps/default/keymap.c
+++ b/keyboards/merge/um80/keymaps/default/keymap.c
@@ -41,31 +41,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_1,   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_2,   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_3,   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_4,   KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC,                   KC_SPC, KC_RALT, KC_RCTL,                               KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-[1] = LAYOUT_rspace_split_bksp(
-               KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS,
-               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-    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_rspace_split_bksp(
-               KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS,
-               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-    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_rspace_split_bksp(
-               KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS,
-               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS
+    KC_4,   KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC,                   KC_SPC, KC_RALT, KC_RCTL,                               KC_LEFT, KC_DOWN, KC_RGHT
 ),
 };
diff --git a/keyboards/miiiw/blackio83/config.h b/keyboards/miiiw/blackio83/config.h
index 73c98722e9d..055e8e35794 100644
--- a/keyboards/miiiw/blackio83/config.h
+++ b/keyboards/miiiw/blackio83/config.h
@@ -18,39 +18,3 @@
 
 // EEPROM i2c chip
 #define EEPROM_I2C_24LC256
-
-/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
- * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-// 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
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/info.json
index 107e288099c..ef0e15efb95 100644
--- a/keyboards/miiiw/blackio83/info.json
+++ b/keyboards/miiiw/blackio83/info.json
@@ -31,6 +31,40 @@
     },
     "processor": "STM32F072",
     "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "center_point": [62, 42],
+        "default": {
+            "animation": "solid_color"
+        },
         "driver": "ws2812",
         "layout": [
             {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
diff --git a/keyboards/miiiw/blackio83/rev_0100/config.h b/keyboards/miiiw/blackio83/rev_0100/config.h
index e68a9d0b163..b1eec364edf 100644
--- a/keyboards/miiiw/blackio83/rev_0100/config.h
+++ b/keyboards/miiiw/blackio83/rev_0100/config.h
@@ -36,9 +36,6 @@
 
 /* RGB Matrix config */
 #define RGB_EN_PIN A8
-#define RGBLED_NUM 83
-#define RGB_MATRIX_LED_COUNT 83
-#define RGB_MATRIX_CENTER { 62, 42 }
 
 // PWM RGB Underglow Defines
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_GRB
diff --git a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c
deleted file mode 100644
index b28ac84acb4..00000000000
--- a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
- *
- * 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 "blackio83.h"
diff --git a/keyboards/miller/gm862/config.h b/keyboards/miller/gm862/config.h
index 2bda7f75bb0..130f99d7b7e 100644
--- a/keyboards/miller/gm862/config.h
+++ b/keyboards/miller/gm862/config.h
@@ -1,58 +1,3 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-// #    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 IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define RGB_MATRIX_LED_COUNT 62
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/miller/gm862/gm862.c b/keyboards/miller/gm862/gm862.c
index b677ae3be4c..534ef6cdc65 100644
--- a/keyboards/miller/gm862/gm862.c
+++ b/keyboards/miller/gm862/gm862.c
@@ -1,68 +1,68 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, B_1,    A_1,    C_1},
-    {0, B_2,    A_2,    C_2},
-    {0, B_3,    A_3,    C_3},
-    {0, B_4,    A_4,    C_4},
-    {0, B_5,    A_5,    C_5},
-    {0, B_6,    A_6,    C_6},
-    {0, B_7,    A_7,    C_7},
-    {0, B_8,    A_8,    C_8},
-    {0, B_9,    A_9,    C_9},
-    {0, B_10,   A_10,   C_10},
-    {0, B_11,   A_11,   C_11},
-    {0, B_12,   A_12,   C_12},
-    {0, B_13,   A_13,   C_13},
-    {0, B_14,   A_14,   C_14},
-    {0, E_1,    D_1,    F_1},
-    {0, E_2,    D_2,    F_2},
-    {0, E_3,    D_3,    F_3},
-    {0, E_4,    D_4,    F_4},
-    {0, E_5,    D_5,    F_5},
-    {0, E_6,    D_6,    F_6},
-    {0, E_7,    D_7,    F_7},
-    {0, E_8,    D_8,    F_8},
-    {0, E_9,    D_9,    F_9},
-    {0, E_10,   D_10,   F_10},
-    {0, E_11,   D_11,   F_11},
-    {0, E_12,   D_12,   F_12},
-    {0, E_13,   D_13,   F_13},
-    {0, E_14,   D_14,   F_14},
-    {0, H_1,    G_1,    I_1},
-    {0, H_2,    G_2,    I_2},
-    {0, H_3,    G_3,    I_3},
-    {0, H_4,    G_4,    I_4},
-    {0, H_5,    G_5,    I_5},
-    {0, H_6,    G_6,    I_6},
-    {0, H_7,    G_7,    I_7},
-    {0, H_8,    G_8,    I_8},
-    {0, H_9,    G_9,    I_9},
-    {0, H_10,   G_10,   I_10},
-    {0, H_11,   G_11,   I_11},
-    {0, H_12,   G_12,   I_12},
-    {0, H_13,   G_13,   I_13},
-    {0, K_1,    J_1,    L_1},
-    {0, K_2,    J_2,    L_2},
-    {0, K_3,    J_3,    L_3},
-    {0, K_4,    J_4,    L_4},
-    {0, K_5,    J_5,    L_5},
-    {0, K_6,    J_6,    L_6},
-    {0, K_7,    J_7,    L_7},
-    {0, K_8,    J_8,    L_8},
-    {0, K_9,    J_9,    L_9},
-    {0, K_10,   J_10,   L_10},
-    {0, K_11,   J_11,   L_11},
-    {0, K_14,   J_14,   L_14},
-    {0, B_16,   A_16,   C_16},
-    {0, E_16,   D_16,   F_16},
-    {0, H_16,   G_16,   I_16},
-    {0, K_16,   J_16,   L_16},
-    {0, K_15,   J_15,   L_15},
-    {0, K_12,   J_12,   L_12},
-    {0, K_13,   J_13,   L_13},
-    {0, H_14,   G_14,   I_14},
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    {0, SW2_CS1,    SW1_CS1,    SW3_CS1},
+    {0, SW2_CS2,    SW1_CS2,    SW3_CS2},
+    {0, SW2_CS3,    SW1_CS3,    SW3_CS3},
+    {0, SW2_CS4,    SW1_CS4,    SW3_CS4},
+    {0, SW2_CS5,    SW1_CS5,    SW3_CS5},
+    {0, SW2_CS6,    SW1_CS6,    SW3_CS6},
+    {0, SW2_CS7,    SW1_CS7,    SW3_CS7},
+    {0, SW2_CS8,    SW1_CS8,    SW3_CS8},
+    {0, SW2_CS9,    SW1_CS9,    SW3_CS9},
+    {0, SW2_CS10,   SW1_CS10,   SW3_CS10},
+    {0, SW2_CS11,   SW1_CS11,   SW3_CS11},
+    {0, SW2_CS12,   SW1_CS12,   SW3_CS12},
+    {0, SW2_CS13,   SW1_CS13,   SW3_CS13},
+    {0, SW2_CS14,   SW1_CS14,   SW3_CS14},
+    {0, SW5_CS1,    SW4_CS1,    SW6_CS1},
+    {0, SW5_CS2,    SW4_CS2,    SW6_CS2},
+    {0, SW5_CS3,    SW4_CS3,    SW6_CS3},
+    {0, SW5_CS4,    SW4_CS4,    SW6_CS4},
+    {0, SW5_CS5,    SW4_CS5,    SW6_CS5},
+    {0, SW5_CS6,    SW4_CS6,    SW6_CS6},
+    {0, SW5_CS7,    SW4_CS7,    SW6_CS7},
+    {0, SW5_CS8,    SW4_CS8,    SW6_CS8},
+    {0, SW5_CS9,    SW4_CS9,    SW6_CS9},
+    {0, SW5_CS10,   SW4_CS10,   SW6_CS10},
+    {0, SW5_CS11,   SW4_CS11,   SW6_CS11},
+    {0, SW5_CS12,   SW4_CS12,   SW6_CS12},
+    {0, SW5_CS13,   SW4_CS13,   SW6_CS13},
+    {0, SW5_CS14,   SW4_CS14,   SW6_CS14},
+    {0, SW8_CS1,    SW7_CS1,    SW9_CS1},
+    {0, SW8_CS2,    SW7_CS2,    SW9_CS2},
+    {0, SW8_CS3,    SW7_CS3,    SW9_CS3},
+    {0, SW8_CS4,    SW7_CS4,    SW9_CS4},
+    {0, SW8_CS5,    SW7_CS5,    SW9_CS5},
+    {0, SW8_CS6,    SW7_CS6,    SW9_CS6},
+    {0, SW8_CS7,    SW7_CS7,    SW9_CS7},
+    {0, SW8_CS8,    SW7_CS8,    SW9_CS8},
+    {0, SW8_CS9,    SW7_CS9,    SW9_CS9},
+    {0, SW8_CS10,   SW7_CS10,   SW9_CS10},
+    {0, SW8_CS11,   SW7_CS11,   SW9_CS11},
+    {0, SW8_CS12,   SW7_CS12,   SW9_CS12},
+    {0, SW8_CS13,   SW7_CS13,   SW9_CS13},
+    {0, SW11_CS1,    SW10_CS1,    SW12_CS1},
+    {0, SW11_CS2,    SW10_CS2,    SW12_CS2},
+    {0, SW11_CS3,    SW10_CS3,    SW12_CS3},
+    {0, SW11_CS4,    SW10_CS4,    SW12_CS4},
+    {0, SW11_CS5,    SW10_CS5,    SW12_CS5},
+    {0, SW11_CS6,    SW10_CS6,    SW12_CS6},
+    {0, SW11_CS7,    SW10_CS7,    SW12_CS7},
+    {0, SW11_CS8,    SW10_CS8,    SW12_CS8},
+    {0, SW11_CS9,    SW10_CS9,    SW12_CS9},
+    {0, SW11_CS10,   SW10_CS10,   SW12_CS10},
+    {0, SW11_CS11,   SW10_CS11,   SW12_CS11},
+    {0, SW11_CS14,   SW10_CS14,   SW12_CS14},
+    {0, SW2_CS16,   SW1_CS16,   SW3_CS16},
+    {0, SW5_CS16,   SW4_CS16,   SW6_CS16},
+    {0, SW8_CS16,   SW7_CS16,   SW9_CS16},
+    {0, SW11_CS16,   SW10_CS16,   SW12_CS16},
+    {0, SW11_CS15,   SW10_CS15,   SW12_CS15},
+    {0, SW11_CS12,   SW10_CS12,   SW12_CS12},
+    {0, SW11_CS13,   SW10_CS13,   SW12_CS13},
+    {0, SW8_CS14,   SW7_CS14,   SW9_CS14},
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/info.json
index 952bb34397b..1249b0a5aba 100644
--- a/keyboards/miller/gm862/info.json
+++ b/keyboards/miller/gm862/info.json
@@ -9,7 +9,38 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
diff --git a/keyboards/miniaxe/keymaps/underglow/rules.mk b/keyboards/miniaxe/keymaps/underglow/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/miniaxe/keymaps/underglow/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/miniaxe/readme.md b/keyboards/miniaxe/readme.md
deleted file mode 100644
index 57ed01a9177..00000000000
--- a/keyboards/miniaxe/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-MiniAxe
-===
-
-![MiniAxe](https://i.imgur.com/1ApzrCz.jpg)
-
-Yet another split ortholinear keyboard with 3x5+3 keys.
-
-Keyboard Maintainer: [ka2hiro](https://github.com/ka2hiro) [@ka2hiro](https://twitter.com/ka2hiro)  
-Hardware Supported: MiniAxe PCB, ATMEGA32U4  
-Hardware Availability: [@ka2hiro](https://twitter.com/ka2hiro)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make miniaxe:default:dfu
-
-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/minimacro5/keymaps/kabraxcis/keymap.c b/keyboards/minimacro5/keymaps/kabraxcis/keymap.c
deleted file mode 100644
index 6b7026ce205..00000000000
--- a/keyboards/minimacro5/keymaps/kabraxcis/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 dezlidezlidezli
-  *
-  * 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 {
-     _MAIN,
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder*/
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  } else if (index == 1) { /* Second encoder*/
-    if (clockwise) {
-      tap_code(KC_3);
-    } else {
-      tap_code(KC_4);
-    }
-  } else if (index == 2) { /* Third encoder*/
-    if (clockwise) {
-      tap_code(KC_5);
-    } else {
-      tap_code(KC_6);
-    }
-  } else if (index == 3) { /* Fourth encoder*/
-    if (clockwise) {
-      tap_code(KC_7);
-    } else {
-      tap_code(KC_8);
-    }
-  } else if (index == 4) { /* Fifth encoder*/
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
-    return true;
-}
-
-//
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = LAYOUT_ortho_1x5(
-     KC_CAPS, KC_MNXT, KC_MPLY, KC_MPRV, KC_CAPS
-  )
-};
diff --git a/keyboards/minimacro5/keymaps/media/keymap.c b/keyboards/minimacro5/keymaps/media/keymap.c
deleted file mode 100644
index 9f218388765..00000000000
--- a/keyboards/minimacro5/keymaps/media/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _MAIN 0
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder*/
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  } else if (index == 1) { /* Second encoder*/
-    if (clockwise) {
-      tap_code(KC_3);
-    } else {
-      tap_code(KC_4);
-    }
-  } else if (index == 2) { /* Third encoder*/
-    if (clockwise) {
-      tap_code(KC_5);
-    } else {
-      tap_code(KC_6);
-    }
-  } else if (index == 3) { /* Fourth encoder*/
-    if (clockwise) {
-      tap_code(KC_7);
-    } else {
-      tap_code(KC_8);
-    }
-  } else if (index == 4) { /* Fifth encoder*/
-    if (clockwise) {
-      tap_code(KC_9);
-    } else {
-      tap_code(KC_0);
-    }
-  }
-    return true;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //buttion closest to usb is first
-  [_MAIN] = LAYOUT_ortho_1x5(
-     KC_MUTE, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_STOP
-  )
-};
diff --git a/keyboards/minimacro5/keymaps/voaraq/keymap.c b/keyboards/minimacro5/keymaps/voaraq/keymap.c
deleted file mode 100644
index 9af37167dc1..00000000000
--- a/keyboards/minimacro5/keymaps/voaraq/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 dezlidezlidezli
-  *
-  * 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 {
-     _MAIN,
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder*/
-    if (clockwise) {
-      tap_code(KC_1);
-    } else {
-      tap_code(KC_2);
-    }
-  } else if (index == 1) { /* Second encoder*/
-    if (clockwise) {
-      tap_code(KC_3);
-    } else {
-      tap_code(KC_4);
-    }
-  } else if (index == 2) { /* Third encoder*/
-    if (clockwise) {
-      tap_code(KC_5);
-    } else {
-      tap_code(KC_6);
-    }
-  } else if (index == 3) { /* Fourth encoder*/
-    if (clockwise) {
-      tap_code(KC_7);
-    } else {
-      tap_code(KC_8);
-    }
-  } else if (index == 4) { /* Fifth encoder*/
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
-    return true;
-}
-
-//
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //buttion closest to usb is first
-  [_MAIN] = LAYOUT_ortho_1x5(
-     KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MUTE
-  )
-};
diff --git a/keyboards/minimon/bartlesplit/config.h b/keyboards/minimon/bartlesplit/config.h
new file mode 100644
index 00000000000..e4ca83f5e98
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2019-2023 e3w2q Kyrremann
+
+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 DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
diff --git a/keyboards/minimon/bartlesplit/info.json b/keyboards/minimon/bartlesplit/info.json
new file mode 100644
index 00000000000..83f93560b6e
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/info.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "Bartlesplit",
+    "development_board": "promicro",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "caps_word": true
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B3", "B1", "B1", "F7", "F7", "E6", "E6", "D7", "D7", "C6", "C6"],
+        "rows": ["B5", "B4", "B2", "B6"]
+    },
+    "pin_compatible": "promicro",
+    "url": "https://github.com/Kyrremann/bartlesplit",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1306",
+        "vid": "0x4B49"
+    },
+    "community_layouts": ["split_3x6_3", "split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 4], "x": 0, "y": 0.5},
+                {"matrix": [0, 3], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0.25},
+                {"matrix": [0, 0], "x": 4, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+                {"matrix": [0, 7], "x": 7.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 10.5, "y": 0.5},
+                {"matrix": [1, 4], "x": 0, "y": 1.5},
+                {"matrix": [1, 3], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 3, "y": 1.25},
+                {"matrix": [1, 0], "x": 4, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+                {"matrix": [2, 4], "x": 0, "y": 2.5},
+                {"matrix": [2, 3], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 1], "x": 3, "y": 2.25},
+                {"matrix": [2, 0], "x": 4, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 2.5, "y": 3.25},
+                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 6], "x": 6, "y": 3.5},
+                {"matrix": [3, 7], "x": 7, "y": 3.25},
+                {"matrix": [3, 8], "x": 8, "y": 3.25}
+            ]
+        },
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0.25},
+                {"matrix": [0, 4], "x": 1, "y": 0.125},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0.125},
+                {"matrix": [0, 1], "x": 4, "y": 0.25},
+                {"matrix": [0, 0], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 7, "y": 0.25},
+                {"matrix": [0, 7], "x": 8, "y": 0.125},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0.125},
+                {"matrix": [0, 10], "x": 11, "y": 0.25},
+                {"matrix": [0, 11], "x": 12, "y": 0.25},
+                {"matrix": [1, 5], "x": 0, "y": 1.25},
+                {"matrix": [1, 4], "x": 1, "y": 1.125},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1.125},
+                {"matrix": [1, 1], "x": 4, "y": 1.25},
+                {"matrix": [1, 0], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 7, "y": 1.25},
+                {"matrix": [1, 7], "x": 8, "y": 1.125},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1.125},
+                {"matrix": [1, 10], "x": 11, "y": 1.25},
+                {"matrix": [1, 11], "x": 12, "y": 1.25},
+                {"matrix": [2, 5], "x": 0, "y": 2.25},
+                {"matrix": [2, 4], "x": 1, "y": 2.125},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2.125},
+                {"matrix": [2, 1], "x": 4, "y": 2.25},
+                {"matrix": [2, 0], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7, "y": 2.25},
+                {"matrix": [2, 7], "x": 8, "y": 2.125},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2.125},
+                {"matrix": [2, 10], "x": 11, "y": 2.25},
+                {"matrix": [2, 11], "x": 12, "y": 2.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 0], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.75},
+                {"matrix": [3, 6], "x": 6.5, "y": 3.75},
+                {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.5, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/minimon/bartlesplit/keymaps/default/keymap.json b/keyboards/minimon/bartlesplit/keymaps/default/keymap.json
new file mode 100644
index 00000000000..03a5762839c
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/keymaps/default/keymap.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "notes": "Bartlesplit default keymap",
+  "keyboard": "minimon/bartlesplit",
+  "keymap": "default",
+  "layout": "LAYOUT_split_3x6_3",
+  "layers": [
+    [
+      "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",
+      "LSFT_T(KC_ESC)", "KC_Z",         "KC_X",      "KC_C",      "KC_V",      "KC_B",      "KC_N",      "KC_M",      "KC_COMM",      "KC_DOT",      "KC_SLSH",      "RSFT_T(KC_ESC)",
+      "KC_LALT",      "KC_LGUI",      "LT(2,KC_SPC)",      "KC_ENT",      "MO(1)",      "KC_BSPC"
+    ],
+    [
+        "KC_NUBS", "KC_1",    "KC_2",    "KC_3",      "KC_4",       "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS",
+        "KC_TRNS", "LSFT(KC_1)", "LSFT(KC_2)", "LSFT(KC_3)",   "LSFT(KC_4)",    "LSFT(KC_5)", "LSFT(KC_6)", "LSFT(KC_7)", "LSFT(KC_8)", "LSFT(KC_9)", "LSFT(KC_0)", "LSFT(KC_MINS)",
+        "KC_TRNS", "KC_GRV",  "KC_TRNS", "LSFT(KC_EQL)", "LSFT(KC_RBRC)", "LSFT(KC_BSLS)", "KC_BSLS", "KC_RBRC", "KC_EQL", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+                                         "KC_RALT",   "KC_TRNS",    "KC_ESC", "KC_TRNS", "KC_TRNS", "KC_DEL"
+    ],
+    [
+        "KC_ESC", "KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_KB_VOLUME_UP", "KC_MEDIA_PLAY_PAUSE",
+        "KC_TRNS", "KC_NO", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_NO", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_KB_VOLUME_DOWN", "KC_NO",
+        "KC_TRNS", "KC_NO", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_LCBR", "RALT(KC_8)", "RALT(KC_9)", "KC_RCBR", "KC_NO", "KC_TRNS",
+                                            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS"
+    ],
+    [
+      "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",        "LGUI_T(KC_A)", "LALT_T(KC_S)",      "LCTL_T(KC_D)",      "LSFT_T(KC_F)",      "KC_G",      "KC_H",      "RSFT_T(KC_J)",      "LCTL_T(KC_K)",      "LALT_T(KC_L)",      "LGUI_T(KC_SCLN)",      "KC_QUOT",
+      "LSFT_T(KC_ESC)", "KC_Z",         "KC_X",      "KC_C",      "KC_V",      "KC_B",      "KC_N",      "KC_M",      "KC_COMM",      "KC_DOT",      "KC_SLSH",      "RSFT_T(KC_ESC)",
+      "KC_LALT",      "KC_LGUI",      "LT(2,KC_SPC)",      "KC_ENT",      "MO(1)",      "KC_BSPC"
+    ]
+  ]
+}
diff --git a/keyboards/minimon/bartlesplit/matrix.c b/keyboards/minimon/bartlesplit/matrix.c
new file mode 100644
index 00000000000..351781f5207
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/matrix.c
@@ -0,0 +1,148 @@
+/*
+Copyright 2012-2023 Jun Wako <wakojun@gmail.com> Kyrremann <kyrremann@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/>.
+
+ Copied from here: https://github.com/e3w2q/qmk_firmware/blob/762fe3e0a7cbea768245a75520f06ff5a2f00b9f/keyboards/2x3test/matrix.c
+*/
+
+/*
+ * scan matrix
+ */
+#include <stdint.h>
+#include <stdbool.h>
+#include "wait.h"
+#include "util.h"
+#include "matrix.h"
+#include "quantum.h"
+
+#define ROW_SHIFTER ((uint16_t)1)
+
+static const pin_t row_pins[] = MATRIX_ROW_PINS;
+static const pin_t col_pins[] = 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/2; x++) {
+        setPinInputHigh(col_pins[x*2]);
+    }
+}
+
+static void init_pins(void) {
+    unselect_cols();
+    unselect_rows();
+}
+
+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];
+
+    // Select row and wait for row selection to stabilize
+    select_row(current_row);
+    wait_us(30);
+
+    // For each col...
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS / 2; col_index++) {
+        uint16_t column_index_bitmask = ROW_SHIFTER << ((col_index * 2) + 1);
+        // Check row pin state
+        if (readPin(col_pins[col_index*2])) {
+            // Pin HI, clear col bit
+            current_matrix[current_row] &= ~column_index_bitmask;
+        } else {
+            // Pin LO, set col bit
+            current_matrix[current_row] |= column_index_bitmask;
+        }
+    }
+
+    // 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 selection to stabilize
+    select_col(current_col*2);
+    wait_us(30);
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[row_index];
+
+        uint16_t column_index_bitmask = ROW_SHIFTER << (current_col * 2);
+        // Check row pin state
+        if (readPin(row_pins[row_index])) {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~column_index_bitmask;
+        } else {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= column_index_bitmask;
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
+                   matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col*2);
+
+    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; current_row++) {
+        changed |= read_cols_on_row(current_matrix, current_row);
+    }
+    // Set col, read rows
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS/2; current_col++) {
+        changed |= read_rows_on_col(current_matrix, current_col);
+    }
+
+    return changed;
+}
diff --git a/keyboards/minimon/bartlesplit/readme.md b/keyboards/minimon/bartlesplit/readme.md
new file mode 100644
index 00000000000..c7109ddf47b
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/readme.md
@@ -0,0 +1,31 @@
+# Bartlesplitt
+
+![Bartlesplit with the hub in the 3x6 setup](https://i.imgur.com/IoMpwylh.png)
+
+Bartlesplit is based on [Cheapino](https://github.com/tompi/cheapino) by Tompi.
+The original idea was to build a Cheapino with hot swaps, but it evolved into something more!
+
+At the same time I was working on Bartlesplit, a friend of mine suggested that we try to make a splithub, letting us avoid having the Pro Micro directly on the board.
+This is mostly a design choice, making each split less clutered.
+We have called the hub [The Japanese Connection](https://github.com/Kyrremann/the-japanese-connection) since it's relying on the Japanese duplex matrix.
+
+One of the main feature of the board is the built-in tenting, so you don't need to make a case to get simple tenting.
+
+
+* Keyboard Maintainer: [Kyrre Havik](https://github.com/Kyrremann)
+* Hardware Supported: Rev 1, Pro Micro
+* Hardware Availability: https://github.com/Kyrremann/bartlesplit
+
+Make example for this keyboard (after setting up your build environment):
+
+    make minimon/bartlesplit:default
+
+Flashing example for this keyboard:
+
+    make minimon/bartlesplit: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 shorting the reset pin on Pro Micro on the hub.
diff --git a/keyboards/minimon/bartlesplit/rules.mk b/keyboards/minimon/bartlesplit/rules.mk
new file mode 100644
index 00000000000..30ce5d293b7
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/rules.mk
@@ -0,0 +1,2 @@
+CUSTOM_MATRIX = lite
+SRC += matrix.c
diff --git a/keyboards/minimon/readme.md b/keyboards/minimon/readme.md
index cd020a11108..807e4a7c52c 100644
--- a/keyboards/minimon/readme.md
+++ b/keyboards/minimon/readme.md
@@ -7,3 +7,4 @@ Maintained by [Kyrremann](https://github.com/Kyrremann).
 ## Keyboards
 
 * [Index Tab](index_tab/) - 13x6 ortho keyboard
+* [Bartlesplit](bartlesplit/) - 42 (36) split board with Pro Micro hub
diff --git a/keyboards/mino/readme.md b/keyboards/mino/readme.md
deleted file mode 100644
index e13718b86c4..00000000000
--- a/keyboards/mino/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# mino
-
-![Mino](https://i.imgur.com/f5kHu8Qh.jpg)
-
-A 47 key board with a retro twist.
-
-* Keyboard Maintainer: [ShandonCodes](https://github.com/ShandonCodes)
-* Hardware Supported: Mino PCB
-* Hardware Availability: Groupbuy
-
-## 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 `QK_BOOT` if it is available. For the default keymap it is the middle spacebar on the second layer.
-
-Make example for this keyboard (after setting up your build environment):
-
-    make mino/hotswap:default
-
-Flashing example for this keyboard:
-
-    make mino/hotswap: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/mino_plus/readme.md b/keyboards/mino_plus/readme.md
deleted file mode 100644
index 0a85b6dc580..00000000000
--- a/keyboards/mino_plus/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# mino_plus
-
-![mino_plus](https://i.imgur.com/vZJ6kaNh.jpg)
-
-A 65% keyboard, inspried by tetrominos.
-
-* Keyboard Maintainer: [ShandonCodes](https://github.com/ShandonCodes)
-* Hardware Supported: Mino Plus PCB
-* Hardware Availability: https://store.shandon.codes/mino-plus/
-
-Make example for this keyboard (after setting up your build environment):
-
-    make mino_plus/soldered:default
-    make mino_plus/hotswap:default
-
-Flashing example for this keyboard:
-
-    make mino_plus/soldered:default:flash
-    make mino_plus/hotswap: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 `FN` + `R` if it is available.
diff --git a/keyboards/mint60/keymaps/eucalyn/config.h b/keyboards/mint60/keymaps/eucalyn/config.h
deleted file mode 100644
index a0441631080..00000000000
--- a/keyboards/mint60/keymaps/eucalyn/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 Eucalyn
- *
- * 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 MASTER_RIGHT
diff --git a/keyboards/mint60/keymaps/eucalyn/keymap.c b/keyboards/mint60/keymaps/eucalyn/keymap.c
deleted file mode 100644
index 04318248e43..00000000000
--- a/keyboards/mint60/keymaps/eucalyn/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2018 Eucalyn
- *
- * 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 PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-enum custom_keycodes {
-  RGBRST = SAFE_RANGE
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-    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_TAB,    KC_Q,    KC_W,    KC_COMM, KC_DOT,  KC_SCLN,   KC_M,    KC_R,    KC_D,    KC_Y,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_CAPS,     KC_A,    KC_O,    KC_E,    KC_I,    KC_U,      KC_G,    KC_T,    KC_K,    KC_S,    KC_N,    KC_QUOT,        KC_ENT,
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_F,      KC_B,    KC_H,    KC_J,    KC_L,    KC_SLSH, KC_RSFT,   KC_UP,  MO(1),
-    KC_ESC,    KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,        KC_BSPC, KC_ENT,  LALT(KC_GRV),               KC_LEFT,KC_DOWN,KC_RGHT
-  ),
-  [1] = 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,
-    RGB_TOG,   RGBRST,  RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX,     RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,        XXXXXXX,
-    _______,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_PGUP, _______,
-    XXXXXXX,   _______,    _______,    _______,    XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX,                   KC_HOME, KC_PGDN, KC_END
-  )
-};
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/mint60/keymaps/eucalyn/readme.md b/keyboards/mint60/keymaps/eucalyn/readme.md
deleted file mode 100644
index 1478b951fe4..00000000000
--- a/keyboards/mint60/keymaps/eucalyn/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The Eucalyn keymap for Mint60
-
-It use "Eucalyn" Kemboard Layout.
diff --git a/keyboards/misonoworks/karina/keymaps/voltex/keymap.c b/keyboards/misonoworks/karina/keymaps/voltex/keymap.c
deleted file mode 100644
index f06522f92a0..00000000000
--- a/keyboards/misonoworks/karina/keymaps/voltex/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-Copyright 2020 MisonoWorks
-
-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 {
-    DEFAULT,
-    SUPER,
-    META,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [DEFAULT] = LAYOUT(
-        KC_TRNS,                                                                                     KC_TRNS,
-                 KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,
-        KC_TAB,  KC_A,      KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_ENT,
-        KC_LSFT, KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,
-        KC_LALT, MO(SUPER),                   KC_SPC,  KC_BSPC,                            MO(META), KC_LCTL
-    ),
-
-    [SUPER] = LAYOUT(
-        KC_ESC,                                                                                   KC_TRNS,
-                 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN,
-        KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS,
-        KC_TRNS, KC_TRNS,                   KC_TRNS, KC_DEL,                             KC_TRNS, KC_TRNS
-    ),
-
-    [META] = LAYOUT(
-        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_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,
-        KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS, KC_P2,   KC_P0,   KC_P1,   KC_TRNS, KC_TRNS,
-        RGB_TOG, RGB_SAI,                   RGB_HUI, RGB_VAI,                            KC_TRNS, RGB_MOD
-    )
-
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_MS_LEFT);
-        } else {
-            tap_code(KC_MS_RIGHT);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_MS_U);
-        } else {
-            tap_code(KC_MS_D);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/mitosis/keymaps/carvac_dv/keymap.c b/keyboards/mitosis/keymaps/carvac_dv/keymap.c
deleted file mode 100644
index 842556324f8..00000000000
--- a/keyboards/mitosis/keymaps/carvac_dv/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-// This is the Dvorak-friendly layout for the Mitosis by CarVac (/u/CarVac)
-// It features space on the left thumb, shift on the right thumb, a
-//  number layer with all the numbers on the home row, and a function layer
-//  that provides mouse keys among other things.
-
-#include QMK_KEYBOARD_H
-
-enum mitosis_layers
-{
-	_STD,
-	_NUM,
-	_FN
-};
-
-
-//Mousekeys
-#define MOUSEKEY_DELAY 300
-#define MOUSEKEY_INTERNAL 50
-#define MOUSEKEY_MAX_SPEED 20
-#define MOUSEKEY_TIME_TO_MAX 30
-#define MOUSEKEY_WHEEL_MAX_SPEED 8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* QWERTY
-   * .--------------------------------------------..--------------------------------------------.
-   * | Q      | W      | E      | R      | T      || Y      | U      | I      | O      | P      |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | A      | S      | D      | F      | G      || J      | H      | K      | L      | ;      |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | Z      | X      | C      | V      | B      || N      | M      | ,      | .      | /      |
-   * '--------+--------+--------+--------+--------||--------+--------+--------+--------+--------'
-   *          | PGUP   | TAB    | LCTRL  | SPACE  || LSHIFT | ENTER  | UP     | PSCR   |
-   *          |--------+--------+--------+--------||--------+--------+--------+--------|
-   *          | PGDN   | LGUI   | LALT   | FN     || NUM    | LEFT   | DOWN   | RIGHT  |
-   *          '-----------------------------------''-----------------------------------'
-   */
-  [_STD] = LAYOUT( /* Standard; as compatible with dvorak and qwerty as possible */
-    KC_Q, KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,      KC_U,    KC_I,    KC_O,    KC_P,
-    KC_A, KC_S,    KC_D,    KC_F,    KC_G,      KC_H,      KC_J,    KC_K,    KC_L,    KC_SCLN,
-    KC_Z, KC_X,    KC_C,    KC_V,    KC_B,      KC_N,      KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-          KC_PGUP, KC_TAB,  KC_LCTL, KC_SPC,    KC_LSFT,  KC_ENT,  KC_UP,   KC_PSCR,
-          KC_PGDN, KC_LGUI, KC_LALT, MO(_FN),   MO(_NUM), KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /* Number layout, for data entry and programming purposes (Dvorak result in parens)
-   * .--------------------------------------------..--------------------------------------------.
-   * | TAB    |   (,<) |   (.>) | - ([{) | = (]}) || ] (=+) | pad *  | pad +  | pad -  | [ (/?) |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | 1      | 2      | 3      | 4      | 5      || 6      | 7      | 8      | 9      | 0      |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | F1     | F2     | F3     | F4     | F5     || F6     | F7     | F8     | F9     | F10    |
-   * '--------+--------+--------+--------+--------||--------+--------+--------+--------+--------'
-   *          | F11    | F12    |        |        ||        |        |        |        |
-   *          |--------+--------+--------+--------||--------+--------+--------+--------|
-   *          |        |        |        |        ||        |        |        |        |
-   *          '-----------------------------------''-----------------------------------'
-   */
-  [_NUM] = LAYOUT( /* Number layout along the home row for maximum speed*/
-    KC_TAB,  _______, _______, KC_MINS, KC_EQL,        KC_RBRC, KC_PAST, KC_PPLS, KC_PMNS, KC_LBRC,
-    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,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-             KC_F11,  KC_F12,  _______, _______,       _______, _______, _______, _______,
-             _______, _______, _______, _______,       _______, _______, _______, _______
-  ),
-
-
-  /* Fn layout, for typing purposes (Dvorak result in parens)
-   * .--------------------------------------------..--------------------------------------------.
-   * | `      |        | MS_U   |        |        || WH_U   | WH_L   | BTN3   | WH_R   | [ (/?) |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | ESC    | MS_L   | MS_D   | MS_R   |        || WH_D   | BTN1   | BTN2   |        | ' (-_) |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | APP    | MPRV   | MPLY   | MSTP   | MNXT   ||        | BSPC   | DEL    | INS    | \      |
-   * '--------+--------+--------+--------+--------||--------+--------+--------+--------+--------'
-   *          | VOLU   |        |        |        ||        |        | PGUP   |        |
-   *          |--------+--------+--------+--------||--------+--------+--------+--------|
-   *          | VOLD   |        |        |        ||        | HOME   | PGDN   | END    |
-   *          '-----------------------------------''-----------------------------------'
-   */
-  [_FN] = LAYOUT( /* Function Layer, primary alternative layer featuring numpad on right hand,
-                                     cursor keys on left hand, and all symbols*/
-    KC_GRV,  _______, KC_MS_U, _______, _______,       KC_WH_U, KC_WH_L, KC_BTN3, KC_WH_R, KC_LBRC,
-    KC_ESC,  KC_MS_L, KC_MS_D, KC_MS_R, _______,       KC_WH_D, KC_BTN1, KC_BTN2, _______, KC_QUOT,
-    KC_APP,  KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,       _______, KC_BSPC, KC_DEL,  KC_INS,  KC_BSLS,
-             KC_VOLU, _______, _______, _______,       _______, _______, KC_PGUP, _______,
-             KC_VOLD, _______, _______, _______,       _______, KC_HOME, KC_PGDN, KC_END
-  ),
-
-  /* blank key layout template
-   * .--------------------------------------------..--------------------------------------------.
-   * |        |        |        |        |        ||        |        |        |        |        |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * |        |        |        |        |        ||        |        |        |        |        |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * |        |        |        |        |        ||        |        |        |        |        |
-   * '--------+--------+--------+--------+--------||--------+--------+--------+--------+--------'
-   *          |        |        |        |        ||        |        |        |        |
-   *          |--------+--------+--------+--------||--------+--------+--------+--------|
-   *          |        |        |        |        ||        |        |        |        |
-   *          '-----------------------------------''-----------------------------------'
-   */
-
-};
-
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    switch (layer) {
-    	case _STD:
-    		set_led_off;
-    		break;
-        case _FN:
-            set_led_blue;
-            break;
-        case _NUM:
-            set_led_red;
-            break;
-        default:
-            break;
-    }
-};
diff --git a/keyboards/mitosis/keymaps/carvac_dv/rules.mk b/keyboards/mitosis/keymaps/carvac_dv/rules.mk
deleted file mode 100644
index 6c605daecf5..00000000000
--- a/keyboards/mitosis/keymaps/carvac_dv/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/mitosis/keymaps/nzen/keymap.c b/keyboards/mitosis/keymaps/nzen/keymap.c
deleted file mode 100644
index 07816067b42..00000000000
--- a/keyboards/mitosis/keymaps/nzen/keymap.c
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-#include QMK_KEYBOARD_H
-
-enum mitosis_layers
-{
-	_QWERTY,
-	_WORKMAN,
-	_NUMBERS,
-	_PUNCT,
-	_MOUSE,
-	_LAYERS,
-	_GAMING,
-	_UNICODE,
-	_NUMPAD
-};
-
-
-//Mousekeys
-#define MOUSEKEY_DELAY 300
-#define MOUSEKEY_INTERNAL 50
-#define MOUSEKEY_MAX_SPEED 20
-#define MOUSEKEY_TIME_TO_MAX 30
-#define MOUSEKEY_WHEEL_MAX_SPEED 8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-
-// Fillers to make layering more clear
-#define XXX KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // https://github.com/nhou7/qmk_firmware_amj40/blob/master/doc/keycode.txt
-  /* QWERTY
-  ['Q', 'W', 'E', 'R', 'T',// 'Y', 'U', 'I', 'O', 'P' ],
-  ['A', 'S', 'D', 'F', 'G',// 'H', 'J', 'K', 'L', '; :' ],
-  ['Z', 'X', 'C', 'V', 'B',// 'N', 'M', ', <', '. >', '\' "' ],
-  [  'back', 'del', 'ctrl', 'L_n',// 'L_p', 'ctrl', 'ent', 'back',  ],
-  [  'alt', '0', 'shif', 'spac',// 'spac', 'shif', 'cap', 'alt',  ]
-   */
-  [_QWERTY] = LAYOUT(
-    KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,     KC_Y,      KC_U,        KC_I,        KC_O,   KC_P,
-    KC_A,      KC_S,      KC_D,      KC_F,      KC_G,     KC_H,      KC_J,        KC_K,        KC_L,   KC_SCLN,
-    KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,     KC_N,      KC_M,        KC_COMM,     KC_DOT, KC_QUOTE,
-               KC_BSPC,   KC_DELETE, KC_LCTL,   TG( 2 ),  TG( 3 ),   KC_RCTL,     KC_ENTER,    KC_BSPC,
-               KC_LALT,   KC_0,      KC_LSFT,   KC_SPACE, KC_SPACE,  KC_RSFT,     KC_CAPS,     KC_RALT
-  ),
-  /*
-  ['Q', 'D', 'R', 'W', 'B',/ ** / 'J', 'F', 'U', 'P', '; :' ],
-  ['A', 'S', 'H', 'T', 'G',/ ** / 'Y', 'N', 'E', 'O', 'I' ],
-  ['Z', 'X', 'M', 'C', 'V',/ ** / 'K', 'L', ', <', '. >', '\' "' ],
-  [ '', '', '', '',/ ** / '', '', '', '',  ],
-  [ '', '4', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_WORKMAN] = LAYOUT(
-    KC_Q, KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,     KC_P,    KC_SCLN,
-    KC_A, KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,     KC_O,    KC_I,
-    KC_Z, KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMMA, KC_DOT,  KC_QUOTE,
-          _______, _______, _______, _______, _______, _______, _______,  _______,
-          _______, KC_1,    _______, _______, _______, _______, _______,  _______
-  ),
-  /*
-  ['9', '8', '7', '6', '5',/ ** / 'F2', 'pDn', *up* /, '*tab* /, 'pUp' ],
-  [' 4', ' 3', ' 2', ' 1', ' 0',/ ** / 'home', *lf* /, '*dn* /, *rt* /, 'end' ],
-  ['undo', 'cut', 'copy', 'paste', 'os',/ ** / 'D', '_', ',', '-', '.' ],
-  // --
-  [ '', '', '', 'L_=6',/ ** / 'L_7', '', '', '',  ],
-  [ '', '6', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_NUMBERS] = LAYOUT(
-    KC_9,       KC_8,       KC_7,       KC_6,       KC_5,    KC_F2,   KC_PGDN,       KC_UP,    KC_TAB,   KC_PGUP,
-    KC_4,       KC_3,       KC_2,       KC_1,       KC_0,    KC_HOME, KC_LEFT,       KC_DOWN,  KC_RIGHT, KC_END,
-    LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_LGUI, KC_D,    KC_UNDERSCORE, KC_COMMA, KC_MINUS, KC_DOT,
-                _______,    _______,    _______,    TG( 2 ), TG( 3 ), _______,       _______,  _______,
-                _______,    KC_2,       _______,    _______, _______, _______,       _______,  _______
-  ),
-  /*
-  [ '#', '@', '&', '.', ';',/ ** / '_', ',', '|', '^', '%' ],
-  [ '*', '+', '{', '(', ':',/ ** / '"', ')', '}', '-', '=' ],
-  [ '\\', '?', '<', '[', '$',/ ** / '~', ']', '>', '!', '/' ],
-  // --
-  ['', '', '', 'L_8',/ ** / 'L_=7', '', '', '',  ],
-  ['', '7', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_PUNCT] = LAYOUT(
-    KC_HASH,     KC_AT,       KC_AMPERSAND, KC_DOT,      KC_SCLN,   KC_UNDERSCORE, KC_COMMA,    KC_PIPE, KC_CIRCUMFLEX, KC_PERCENT,
-    KC_ASTERISK, KC_PLUS,     KC_LCBR,      KC_LPRN,     KC_COLON,  KC_DQUO,       KC_RPRN,     KC_RCBR, KC_MINUS,      KC_EQUAL,
-    KC_BSLS,     KC_QUESTION, KC_LT,        KC_LBRC,     KC_DOLLAR, KC_TILDE,      KC_RBRC,     KC_GT,   KC_EXCLAIM,    KC_SLASH,
-                 _______,     _______,      _______,     TG( 4 ),   TG( 3 ),       _______,     _______, _______,
-                 _______,     KC_3,         _______,     _______,   _______,       _______,     _______, _______
-  ),
-  /*
-  ['F6', 'F7', 'F8', 'F9', 'F10',/ ** / 'app', 'mb1', 'mmU', 'mb2', 'mwU' ],
-  ['F1', 'F2', 'F3', 'F4', 'F5',/ ** / 'mnu', 'mmL', 'mmD', 'mmR', 'mwD' ],
-  ['F11', 'F12', '`', 'mute', 'ESC',/ ** / 'prtSc', 'scrLk', 'mwL', 'mwR', 'mb3' ],
-  // --
-  [ '', '', '', 'L_=8',/ ** / 'L_9', '', '', '',  ],
-  [ '', '8', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_MOUSE] = LAYOUT(
-    KC_F6,  KC_F7,   KC_F8,    KC_F9,    KC_F10,    KC_MENU,    KC_MS_BTN1, KC_MS_UP,      KC_MS_BTN2,     KC_MS_WH_UP,
-    KC_F1,  KC_F2,   KC_F3,    KC_F4,    KC_F5,     KC_MENU,    KC_MS_LEFT, KC_MS_DOWN,    KC_MS_RIGHT,    KC_MS_WH_DOWN,
-    KC_F11, KC_F12,  KC_GRAVE, KC_MUTE,  KC_ESCAPE, KC_PSCR,    KC_SCRL,    KC_MS_WH_LEFT, KC_MS_WH_RIGHT, KC_MS_BTN3,
-            _______, _______,  _______,  TG( 4 ),   TG( 5 ),    _______,    _______,       _______,
-            _______, KC_4,     _______,  _______,   _______,    _______,    _______,       _______
-  ),
-  /*
-  ['L_ma1', '!', 'L_dv2', '!', 'L_cl3',/ ** / 'L_wk4', '!', 'L_ar5', '!', '!' ],
-  ['!', '!', '!', '!', '!',/ ** / '!', '!', '!', '!', '!' ],
-  ['L_gmA', '!', 'L_ucB', '!', 'L_npC',/ ** / '!', '!', '!', '!', '!' ],
-  // --
-  [ '', '', '', 'L_=9',/ ** / 'L_=9', '', '', '',  ],
-  [ '', '9', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_LAYERS] = LAYOUT(
-    KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, TG( 1 ),    KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM,
-    KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM,
-    TG( 6 ),    KC_EXCLAIM, TG( 7 ),    KC_EXCLAIM, TG( 8 ),    KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM,
-                _______,    _______,    _______,    TG( 5 ),    TG( 5 ),    _______,    _______,    _______,
-                _______,    KC_5,       _______,    _______,    _______,    _______,    _______,    _______
-  ),
-  /*
-  ['Q', 'W', 'E', 'R', 'T',/ ** / 'P', 'Y', '\u2191'*up* /, 'K', '1' ],
-  ['A', 'S', 'D', 'F', 'G',/ ** / 'H', '\u2190'*lf* /, '\u2193'*dn* /, '\u2192'*rt* /, '2' ],
-  ['Z', 'X', 'C', 'V', 'B',/ ** / 'M', '*', '*', '*', '3' ],
-  // --
-  [ '', '', '', 'L_=A',/ ** / 'A', '', '', '',  ],
-  [ '', 'A', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_GAMING] = LAYOUT(
-    KC_Q, KC_W,    KC_E,    KC_R,    KC_T,    KC_P,    KC_Y,        KC_UP,       KC_K,        KC_1,
-    KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_LEFT,     KC_DOWN,     KC_RIGHT,    KC_2,
-    KC_Z, KC_X,    KC_C,    KC_V,    KC_B,    KC_M,    KC_ASTERISK, KC_ASTERISK, KC_ASTERISK, KC_3,
-          _______, _______, _______, TG( 6 ), KC_6,    _______,     _______,     _______,
-          _______, KC_6,    _______, _______, _______, _______,     _______,     _______
-  ),
-  /*
-  ['\u00a2'cent* /, '\u00bc'1/4* /, '\u00bd'1/2* /, '\u03a3'sum* /, '\u00d8'Oslash* /,/ ** / '\u250f'box ul* /, '\u2533'box um* /, '\u2513'box ur* /, '\u03bb'lambda* /, '\u2018'sm'dn* / ],
-  ['\u00F1'n~* /, '\u00a9'&copy* /, '\u00b0'degrees* /, '\u00b1'+-* /, '\u2b0f'arrow up* /,/ ** / '\u2523'box ml* /, '\u254B'box mm* /, '\u252B'box mr* /, '\u0394'delta* /, '\u2019'sm'up* / ],
-  ['\u00a1'down !* /, '\u00bf'down ?* /, '\u00d7'mult x* /, '\u00f7'div/ * /, '\u03c0'pi* /,/ ** / '\u2517'box ll* /, '\u253b'bos lm* /, '\u251b'box lr* /, '\u201c'sm"dn* /, '\u201d'sm"up* / ],
-  // --
-  [ '', '', '', 'L_=B',/ ** / 'B', '', '', '',  ],
-  [ '', 'B', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_UNICODE] = LAYOUT(
-    UC(0x00A2), UC(0x00BC), UC(0x00BD), UC(0x03A3), UC(0x00D8), UC(0x250F), UC(0x2533), UC(0x2513), UC(0x03BB), UC(0x2018),
-    UC(0x00F1), UC(0x00A9), UC(0x00B0), UC(0x00B1), UC(0x2B0F), UC(0x2523), UC(0x254B), UC(0x252B), UC(0x0394), UC(0x2019),
-    UC(0x00A1), UC(0x00BF), UC(0x00D7), UC(0x00F7), UC(0x03C0), UC(0x2517), UC(0x253B), UC(0x251B), UC(0x201C), UC(0x201D),
-                _______,    _______,    _______,    TG( 7 ),    KC_7,       _______,    _______,    _______,
-                _______,    KC_7,       _______,    _______,    _______,    _______,    _______,    _______
-  ),
-  /*
-  ['n-.', 'n-7', 'n-8', 'n-9', 'n--',/ ** / 'n-=', 'volU', 'volD', 'volU', 'volD' ],
-  ['n-0', 'n-4', 'n-5', 'n-6', 'n-+',/ ** / 'N-lck', 'BACK', 'MUTE', 'RGUI', 'paus' ],
-  ['n -*', 'n-1', 'n-2', 'n-3', 'n-/',/ ** / 'n-ent', 'PLAY', 'PREV', 'NEXT', 'insr' ],
-  // --
-  [ '', '', '', 'L_=C',/ ** / 'C', '', '', '',  ],
-  [ '', 'C', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_NUMPAD] = LAYOUT(
-    KC_KP_DOT,      KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, KC_KP_EQUAL, KC_AUDIO_VOL_UP,     KC_AUDIO_VOL_DOWN,   KC_VOLU,             KC_VOLD,
-    KC_KP_0,        KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS,  KC_NUM,      KC_WWW_BACK,         KC_AUDIO_MUTE,       KC_RGUI,             KC_PAUSE,
-    KC_KP_ASTERISK, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_SLASH, KC_KP_ENTER, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_INSERT,
-                    _______, _______, _______, TG( 8 ),     KC_8,        _______,             _______,             _______,
-                    _______, KC_8,    _______, _______,     _______,     _______,             _______,             _______
-  )// ,
-  /*
-   * /
-  [_] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-             _______, _______, _______, _______, _______, _______, _______, _______,
-             _______, _______, _______, _______, _______, _______, _______, _______
-  )
-   */
-};
-
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    switch (layer) {
-    	case _QWERTY:
-    	case _WORKMAN:
-    		set_led_off;
-    		break;
-        case _NUMBERS:
-            set_led_blue;
-            break;
-        case _PUNCT:
-            set_led_red;
-            break;
-        case _MOUSE:
-            set_led_green;
-            break;
-        case _LAYERS:
-            set_led_yellow;
-            break;
-        case _UNICODE:
-            set_led_cyan;
-            break;
-        default:
-            break;
-   }
-};
-
-void matrix_init_user(void) {
-	set_unicode_input_mode(UNICODE_MODE_LINUX); // or UNICODE_MODE_WINCOMPOSE
-};
diff --git a/keyboards/mitosis/keymaps/nzen/readme.md b/keyboards/mitosis/keymaps/nzen/readme.md
deleted file mode 100644
index c11981bd4d5..00000000000
--- a/keyboards/mitosis/keymaps/nzen/readme.md
+++ /dev/null
@@ -1,75 +0,0 @@
-
-### personal layout: Nzen
-
-Levels
-
-* Qwerty, with quotes in place of slash question. 
-* Workman
-* Numbers and navigation, left and right hands respectively
-* Punctuation, mostly symmetric
-* Function and mouse, l/r respectively
-* Layer hub, to reach workman or upper layers
-* Gaming, qwert and arrows
-* Unicode, some numerics and one of the box styles
-* Numpad and media, l/r respectively
-
-Bottom cluster is the same on all levels and mostly symmetric. The 'ring fingers' differ between the two sides. N is a number corresponding to the current layer. Toggle layer will be one down and one up.
-
-* back del/enter ctrl toggle-layer
-* alt N/caps shift space
-
-You can preview the layout by cloning [this webpage](https://gitlab.com/Nzen/impatient-broth-nenem). The page imitates qmk's fallthrough.
-
-['Q', 'W', 'E', 'R', 'T',// 'Y', 'U', 'I', 'O', 'P'  
-['A', 'S', 'D', 'F', 'G',// 'H', 'J', 'K', 'L', '; :'  
-['Z', 'X', 'C', 'V', 'B',// 'N', 'M', ', <', '. >', '\' "'  
-[  'back', 'del', 'ctrl', 'L_n',// 'L_p', 'ctrl', 'ent', 'back',  
-[  'alt', '0', 'shif', 'spac',// 'spac', 'shif', 'cap', 'alt',  
-
-['Q', 'D', 'R', 'W', 'B',/ ** / 'J', 'F', 'U', 'P', '; :'  
-['A', 'S', 'H', 'T', 'G',/ ** / 'Y', 'N', 'E', 'O', 'I'  
-['Z', 'X', 'M', 'C', 'V',/ ** / 'K', 'L', ', <', '. >', '\' "'  
-[ '', '', '', '',/ ** / '', '', '', '',  
-[ '', '4', '', '',/ ** / '', '', '', '',  
-
-['9', '8', '7', '6', '5',/ ** / 'F2', 'pDn', *up* /, '*tab* /, 'pUp'  
-[' 4', ' 3', ' 2', ' 1', ' 0',/ ** / 'home', *lf* /, '*dn* /, *rt* /, 'end'  
-['undo', 'cut', 'copy', 'paste', 'os',/ ** / 'D', '_', ',', '-', '.'  
-[ '', '', '', 'L_=6',/ ** / 'L_7', '', '', '',  
-[ '', '6', '', '',/ ** / '', '', '', '',  
-
-[ '#', '@', '&', '.', ';',/ ** / '_', ',', '|', '^', '%'  
-[ '*', '+', '{', '(', ':',/ ** / '"', ')', '}', '-', '='  
-[ '\\', '?', '<', '[', '$',/ ** / '~', ']', '>', '!', '/'  
-['', '', '', 'L_8',/ ** / 'L_=7', '', '', '',  
-['', '7', '', '',/ ** / '', '', '', '',  
-
-['F6', 'F7', 'F8', 'F9', 'F10',/ ** / 'app', 'mb1', 'mmU', 'mb2', 'mwU'  
-['F1', 'F2', 'F3', 'F4', 'F5',/ ** / 'mnu', 'mmL', 'mmD', 'mmR', 'mwD'  
-['F11', 'F12', '`', 'mute', 'ESC',/ ** / 'prtSc', 'scrLk', 'mwL', 'mwR', 'mb3'  
-[ '', '', '', 'L_=8',/ ** / 'L_9', '', '', '',  
-[ '', '8', '', '',/ ** / '', '', '', '',  
-
-['L_ma1', '!', 'L_dv2', '!', 'L_cl3',/ ** / 'L_wk4', '!', 'L_ar5', '!', '!'  
-['!', '!', '!', '!', '!',/ ** / '!', '!', '!', '!', '!'  
-['L_gmA', '!', 'L_ucB', '!', 'L_npC',/ ** / '!', '!', '!', '!', '!'  
-[ '', '', '', 'L_=9',/ ** / 'L_=9', '', '', '',  
-[ '', '9', '', '',/ ** / '', '', '', '',  
-
-['Q', 'W', 'E', 'R', 'T',/ ** / 'P', 'Y', '\u2191'*up* /, 'K', '1'  
-['A', 'S', 'D', 'F', 'G',/ ** / 'H', '\u2190'*lf* /, '\u2193'*dn* /, '\u2192'*rt* /, '2'  
-['Z', 'X', 'C', 'V', 'B',/ ** / 'M', '*', '*', '*', '3'  
-[ '', '', '', 'L_=A',/ ** / 'A', '', '', '',  
-[ '', 'A', '', '',/ ** / '', '', '', '',  
-
-['\u00a2'cent* /, '\u00bc'1/4* /, '\u00bd'1/2* /, '\u03a3'sum* /, '\u00d8'Oslash* /,/ ** / '\u250f'box ul* /, '\u2533'box um* /, '\u2513'box ur* /, '\u03bb'lambda* /, '\u2018'sm'dn* / ],  
-['\u00F1'n~* /, '\u00a9'&copy* /, '\u00b0'degrees* /, '\u00b1'+-* /, '\u2b0f'arrow up* /,/ ** / '\u2523'box ml* /, '\u254B'box mm* /, '\u252B'box mr* /, '\u0394'delta* /, '\u2019'sm'up* / ],  
-['\u00a1'down !* /, '\u00bf'down ?* /, '\u00d7'mult x* /, '\u00f7'div/ * /, '\u03c0'pi* /,/ ** / '\u2517'box ll* /, '\u253b'bos lm* /, '\u251b'box lr* /, '\u201c'sm"dn* /, '\u201d'sm"up* /  
-[ '', '', '', 'L_=B',/ ** / 'B', '', '', '',  
-[ '', 'B', '', '',/ ** / '', '', '', '',  
-
-['n-.', 'n-7', 'n-8', 'n-9', 'n--',/ ** / 'n-=', 'volU', 'volD', 'volU', 'volD'  
-['n-0', 'n-4', 'n-5', 'n-6', 'n-+',/ ** / 'N-lck', 'BACK', 'MUTE', 'RGUI', 'paus'  
-['n -*', 'n-1', 'n-2', 'n-3', 'n-/',/ ** / 'n-ent', 'PLAY', 'PREV', 'NEXT', 'insr'  
-[ '', '', '', 'L_=C',/ ** / 'C', '', '', '',  
-[ '', 'C', '', '',/ ** / '', '', '', '',
diff --git a/keyboards/mitosis/keymaps/nzen/rules.mk b/keyboards/mitosis/keymaps/nzen/rules.mk
deleted file mode 100644
index eaba18db969..00000000000
--- a/keyboards/mitosis/keymaps/nzen/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-CONSOLE_ENABLE = no	# Console for debug(+400)
-COMMAND_ENABLE = no   # Commands for debug and configuration
diff --git a/keyboards/miuni32/keymaps/adam-lee/config.h b/keyboards/miuni32/keymaps/adam-lee/config.h
deleted file mode 100644
index df06a262062..00000000000
--- a/keyboards/miuni32/keymaps/adam-lee/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
\ No newline at end of file
diff --git a/keyboards/miuni32/keymaps/adam-lee/keymap.c b/keyboards/miuni32/keymaps/adam-lee/keymap.c
deleted file mode 100644
index d6f5f40fddf..00000000000
--- a/keyboards/miuni32/keymaps/adam-lee/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Level 0: Default Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   |  BSP  |
-     * |---------------------------------------------------------------------------------------|
-     * |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |  ENT  |LT(1|,)|
-     * |---------------------------------------------------------------------------------------|
-     * |LT(3|Z)|   X   |   C   |   V   |      SPC      |   B   |   N   |   M   |  RSFT |LT(2|.)|
-     * |---------------------------------------------------------------------------------------|
-     */
-  [0] = LAYOUT(
-    KC_Q,        KC_W, KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O, KC_P,    KC_BSPC,
-    KC_A,        KC_S, KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K, KC_L, KC_ENT,  LT(1, KC_COMMA),
-    LT(3, KC_Z), KC_X, KC_C, KC_V,       KC_SPC, KC_B, KC_N, KC_M, KC_RSFT, LT(2, KC_DOT)
-  ),
-  /* Level 1: Numbers Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |  ESC  |   7   |   8   |   9   |   /   |   *   |   .   |   ,   |   (   |   )   |  DEL  |
-     * |---------------------------------------------------------------------------------------|
-     * |  TAB  |   4   |   5   |   6   |   -   |   +   |  HOME |   UP  |  END  |  PGUP |  TRNS |
-     * |---------------------------------------------------------------------------------------|
-     * |  LATL |   1   |   2   |   3   |   0           |  LEFT |  DOWN |  RGHT |  PGDN | RSHFT |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [1] = LAYOUT(
-    KC_ESC,  KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT,  KC_COMM, KC_LPRN, KC_RPRN, KC_DEL,
-    KC_TAB,  KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______,
-    KC_LALT, KC_1, KC_2, KC_3, KC_0,             KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_RSFT
-  ),
-  /* Level 2: Symbols Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   !   |   @   |   #   |   $   |   %   |   ^   |   &   |   *   |   -   |   +   |   =   |
-     * |---------------------------------------------------------------------------------------|
-     * |   {   |   }   |   [   |   ]   |  TRNS |  TRNS |   \   |   ;   |   :   |   `   |   ?   |
-     * |---------------------------------------------------------------------------------------|
-     * |  LSFT |  LCTL |   L   |   T   |      TAB      |   N   |  TRNS |  TRNS |  RCTL |  TRNS |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [2] = LAYOUT(
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_PLUS, KC_EQL,
-    KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, _______, _______, KC_BSLS, KC_SCLN, KC_COLN, KC_GRV,  KC_QUES,
-    KC_LSFT, KC_LCTL, KC_L,    KC_T,             KC_TAB,  KC_N,    _______, _______, KC_RCTL, _______
-  ),
-  /* Level 3: RGB Layer
-     * ,---------------------------------------------------------------------------------------.
-     * | QK_BOOT |  TRNS |  TRNS |  TRNS |  TRNS |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
-     * |---------------------------------------------------------------------------------------|
-     * |RGB_TOG|RGB_MOD|RGB_HUI|RGB_HUD|   NO  |RGB_SAI|RGB_SAD|RGB_VAI|RGB_VAD|  TRNS |  TRNS |
-     * |---------------------------------------------------------------------------------------|
-     * |  TRNS |  TRNS |  TRNS |  TRNS |       F7      |   F8  |   F9  |  F10  |  F11  |  F12  |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [3] = LAYOUT(
-    QK_BOOT, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
-    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_NO,   RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,
-    _______, _______, _______, _______,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12
-  )
-};
diff --git a/keyboards/miuni32/keymaps/adam-lee/readme.md b/keyboards/miuni32/keymaps/adam-lee/readme.md
deleted file mode 100644
index 4cff8ef5a3a..00000000000
--- a/keyboards/miuni32/keymaps/adam-lee/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for miuni32
\ No newline at end of file
diff --git a/keyboards/miuni32/keymaps/adam-lee/rules.mk b/keyboards/miuni32/keymaps/adam-lee/rules.mk
deleted file mode 100644
index 1022078ba6c..00000000000
--- a/keyboards/miuni32/keymaps/adam-lee/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h b/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h
deleted file mode 100644
index d057ce4f34b..00000000000
--- a/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Cassandra de la Cruz-Munoz cassandra.delacruzmunoz@gmaill.com @cassdelacruzmunoz
-*
-* 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
-
-// place overrides here
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_SLEEP
-#define MIDI_ADVANCED
diff --git a/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c b/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
deleted file mode 100644
index 7d347edb662..00000000000
--- a/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2020 Cassandra de la Cruz-Munoz cassandra.delacruzmunoz@gmaill.com @cassdelacruzmunoz
-*
-* 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] = {
-    /* Level 0: Default Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   |  BSP  |
-     * |---------------------------------------------------------------------------------------|
-     * |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |  ENT  |LT(1|,)|
-     * |---------------------------------------------------------------------------------------|
-     * |   Z   |   X   |   C   |   V   |      SPC      |   B   |   N   |   M   |  RSFT |   .   |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [0] = LAYOUT(
-    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O, KC_P,    KC_BSPC,
-    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K, KC_L, KC_ENT,  LT(1, KC_COMMA),
-    KC_Z, KC_X, KC_C, KC_V,       KC_SPC, KC_B, KC_N, KC_M, KC_RSFT, KC_DOT
-    ),
-    /* Level 1: Layers Layer
-     * ,---------------------------------------------------------------------------------------.
-     * | TO(2) | TO(3) | TO(4) | TO(5) | TO(6) | TO(7) | TO(8) | TO(9) | TO(10)| TO(11)| TO(12)|
-     * |---------------------------------------------------------------------------------------|
-     * | TO(13)| TO(14)| TO(15)| TO(16)| TO(17)| TO(18)| TO(19)| TO(20)| TO(21)| TO(22)|  TRNS |
-     * |---------------------------------------------------------------------------------------|
-     * | TO(23)| TO(24)| TO(25)| TO(26)|               | TO(27)| TO(28)| TO(29)| TO(30)| TO(31)|
-     * |---------------------------------------------------------------------------------------|
-     */
-  [1] = LAYOUT(
-    TO(2),  TO(3),  TO(4),  TO(5),  TO(6),//TO(7),  TO(8),  TO(9),  TO(10), TO(11), TO(12),
-                                            KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-  //TO(13), TO(14), TO(15), TO(16), TO(17), TO(18), TO(19), TO(20), TO(21), TO(22), _______,
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  _______,
-  //TO(23), TO(24), TO(25), TO(26),         KC_NO,  TO(27), TO(28), TO(29), TO(30), TO(31)
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-  ),
-  /* Level 2: Numbers Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |  ESC  |   7   |   8   |   9   |   /   |   *   |   .   |   ,   |   (   |   )   |  DEL  |
-     * |---------------------------------------------------------------------------------------|
-     * |  TAB  |   4   |   5   |   6   |   -   |   +   |  HOME |   UP  |  END  |  PGUP | TG(2) |
-     * |---------------------------------------------------------------------------------------|
-     * |  LALT |   1   |   2   |   3   |   0           |  LEFT |  DOWN |  RGHT |  PGDN | RSHFT |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [2] = LAYOUT(
-    KC_ESC,  KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT,  KC_COMM, KC_LPRN, KC_RPRN, KC_DEL,
-    KC_TAB,  KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, TG(2),
-    KC_LALT, KC_1, KC_2, KC_3, KC_0,             KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_RSFT
-  ),
-  /* Level 3: Symbols Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   !   |   @   |   #   |   $   |   %   |   ^   |   &   |   *   |   -   |   +   |   =   |
-     * |---------------------------------------------------------------------------------------|
-     * |   {   |   }   |   [   |   ]   |   '   |       |   \   |   ;   |   :   |   `   | TG(3) |
-     * |---------------------------------------------------------------------------------------|
-     * |  LSFT |  LCTL |       |       |      TAB      |       |       |       |  RCTL |   ?   |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [3] = LAYOUT(
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_PLUS, KC_EQL,
-    KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_QUOT, KC_NO,   KC_BSLS, KC_SCLN, KC_COLN, KC_GRV,  TG(3),
-    KC_LSFT, KC_LCTL, KC_NO,   KC_NO,            KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_RCTL, KC_QUES
-  ),
-  /* Level 4: F-keys and Media Layer
-     * ,---------------------------------------------------------------------------------------.
-     * | QK_BOOT |  MUTE |  VOLU |  MPLY |  TRNS |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
-     * |---------------------------------------------------------------------------------------|
-     * |  LGUI |  MPRV |  VOLD |  MNXT |  TRNS |  TRNS |  TRNS |  TRNS |  TRNS |  TRNS | TG(4) |
-     * |---------------------------------------------------------------------------------------|
-     * |  TRNS |  TRNS |  TRNS |  TRNS |       F7      |   F8  |   F9  |  F10  |  F11  |  F12  |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [4] = LAYOUT(
-    QK_BOOT, KC_MUTE, KC_VOLU, KC_MPLY, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5,  KC_F6,
-    KC_LGUI, KC_MPRV, KC_VOLD, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO,  TG(4),
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12
-  ),
-  /* Level 5: Commands Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |  CUT  |  PSCR |  BRIU |  PWR  |       |       |       |       |       |       |       |
-     * |---------------------------------------------------------------------------------------|
-     * |  COPY |  FIND |  BRID |  SLEP |       |       |       |       |       |       | TG(5) |
-     * |---------------------------------------------------------------------------------------|
-     * |  PSTE |       |       |  WAKE |               |       |       |       |       |       |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [5] = LAYOUT(
-    KC_CUT,  KC_PSCR, KC_BRIU, KC_PWR,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_COPY, KC_FIND, KC_BRID, KC_SLEP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(5),
-    KC_PSTE, KC_NO,   KC_NO,   KC_WAKE,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-  ),
-  /* Level 6: MIDI Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   C1  |   E1  |   G1  |   B1  |   D2  |   F2  |   A2  |   C3  |   E3  |   G3  |       |
-     * |---------------------------------------------------------------------------------------|
-     * |   D1  |   F1  |   A1  |   C2  |   E2  |   G2  |   B2  |   D3  |   F3  |   A3  | TG(6) |
-     * |---------------------------------------------------------------------------------------|
-     * |  OCTD |  OCTU | TRNSD | TRNSU |               |       |       |       |       |       |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [6] = LAYOUT(
-    MI_C1,   MI_E1,   MI_G1,    MI_B1,    MI_D2,   MI_F2,  MI_A2,  MI_C3,  MI_E3,  MI_G3,  KC_NO,
-    MI_D1,   MI_F1,   MI_A1,    MI_C2,    MI_E2,   MI_G2,  MI_B2,  MI_D3,  MI_F3,  MI_A3,  TG(6),
-    MI_OCTD, MI_OCTU, MI_TRSD,  MI_TRSU,           KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-  )
-};
-
-// Light LEDs 0 through 16 in white when keyboard layer 0 is active
-const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_WHITE}
-);
-// Light LEDs 0 through 16 in blue when keyboard layer 1 is active
-const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_BLUE}
-);
-// Light LEDs 0 through 16 in green when keyboard layer 2 is active
-const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_GREEN}
-);
-// Light LEDs 0 through 16 in yellow when keyboard layer 3 is active
-const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_YELLOW}
-);
-// Light LEDs 0 through 16 in red when keyboard layer 4 is active
-const rgblight_segment_t PROGMEM my_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_RED}
-);
-// Light LEDs 0 through 16 in cyan when keyboard layer 5 is active
-const rgblight_segment_t PROGMEM my_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_CYAN}
-);
-// Light LEDs 0 through 16 in orange when keyboard layer 6 is active
-const rgblight_segment_t PROGMEM my_layer6_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_ORANGE}
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_layer0_layer,
-    my_layer1_layer,
-    my_layer2_layer,
-    my_layer3_layer,
-    my_layer4_layer,
-    my_layer5_layer,
-    my_layer6_layer
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    for (int i = 0; i < 7; i++) {
-        rgblight_set_layer_state(i, layer_state_cmp(state, i));
-    }
-    return state;
-}
diff --git a/keyboards/miuni32/keymaps/cassdelacruzmunoz/readme.md b/keyboards/miuni32/keymaps/cassdelacruzmunoz/readme.md
deleted file mode 100644
index b9e42964cfd..00000000000
--- a/keyboards/miuni32/keymaps/cassdelacruzmunoz/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Cass de la Cruz-Munoz's keymap for Miuni32
-
-7 layers:
-
-* QUERTY
-* Layer access
-* Numberpad, navigation keys
-* Symbols
-* Function and media keys
-* Assorted command keys
-* MIDI keys
-
-![QUERTY](https://imgur.com/0B3Xl2D.png)
-![Layers](https://imgur.com/Rb9KRgL.png)
-![Numberpad & Navigation](https://imgur.com/psq5U5o.png)
-![Symbols](https://imgur.com/nbxOjCG.png)
-![Function & Media](https://imgur.com/AZe6Vib.png)
-![Commands](https://imgur.com/Pl0NYbw.png)
-![MIDI](https://imgur.com/c6BcDe2.png)
diff --git a/keyboards/miuni32/keymaps/kifinnsson/config.h b/keyboards/miuni32/keymaps/kifinnsson/config.h
deleted file mode 100644
index df06a262062..00000000000
--- a/keyboards/miuni32/keymaps/kifinnsson/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
\ No newline at end of file
diff --git a/keyboards/miuni32/keymaps/kifinnsson/keymap.c b/keyboards/miuni32/keymaps/kifinnsson/keymap.c
deleted file mode 100644
index 51a0b6fefa1..00000000000
--- a/keyboards/miuni32/keymaps/kifinnsson/keymap.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum miuni32_layers {
-  _BEAKL,
-  _LOWER,
-  _RAISE,
-  _UNION
-};
-
-enum miuni32_keycodes {
-  BEAKL = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-
-#define SPC_SHF SFT_T(KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Level 0: BEAKL
-   * ,---------------------------------------------------------------------------------------.
-   * |   J   |   H   |   O   |   U   |   K   | LOWER |   G   |   C   |   R   |   F   |   Z   |
-   * |---------------------------------------------------------------------------------------|
-   * |   Q   |   I   |   E   |   A   |   Y   | RAISE |   D   |   S   |   T   |   N   |   B   |
-   * |---------------------------------------------------------------------------------------|
-   * |   /   |   ,   |   '   |   .   |   X   |SPC\SHF|   W   |   M   |   L   |   P   |   V   |
-   * |---------------------------------------------------------------------------------------|
-   */
-  [_BEAKL] = LAYOUT_ortho_3x11(
-    KC_J,    KC_H,    KC_O,    KC_U,   KC_K, LOWER,   KC_G, KC_C, KC_R, KC_F, KC_Z,
-    KC_Q,    KC_I,    KC_E,    KC_A,   KC_Y, RAISE,   KC_D, KC_S, KC_T, KC_N, KC_B,
-    KC_SLSH, KC_COMM, KC_QUOT, KC_DOT, KC_X, SPC_SHF, KC_W, KC_M, KC_L, KC_P, KC_V
-  ),
-  /* Lower
-     * ,---------------------------------------------------------------------------------------.
-     * |  Tab  |   {   |   _   |   }   |   &   |       |  Gui  |   [   |   %   |   ]   | Bkspc |
-     * |---------------------------------------------------------------------------------------|
-     * |   \   |   (   |   1   |   )   |   #   |       |   $   |   <   |   0   |   >   |   |   |
-     * |---------------------------------------------------------------------------------------|
-     * |   5   |   4   |   3   |   2   |  Ctl  |       |  Alt  |   9   |   8   |   7   |   6   |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [_LOWER] = LAYOUT_ortho_3x11(
-    KC_TAB,  KC_LCBR, KC_UNDS, KC_RBRC, KC_AMPR, _______, KC_RGUI, KC_LBRC, KC_PERC, KC_RBRC, KC_BSPC,
-    KC_BSLS, KC_LPRN, KC_1,    KC_RPRN, KC_HASH, _______, KC_DLR,  KC_LT,   KC_0,    KC_GT,   KC_PIPE,
-    KC_5,    KC_4,    KC_3,    KC_2,    KC_LCTL, _______, KC_RALT, KC_9,    KC_8,    KC_7,    KC_6
-  ),
-  /* Raise
-     * ,---------------------------------------------------------------------------------------.
-     * |   F1  |   F2  |   F3  |   F4  |   F5  |       |   F6  |   F7  |   F8  |   F9  |  F10  |
-     * |---------------------------------------------------------------------------------------|
-     * |  F11  |  F12  |   !   |   -   |   +   |       |   =   |   ;   |   )   |   `   |   ?   |
-     * |------------------------------- -------------------------------------------------------|
-     * |   %   |   $   |   #   |   @   |       |       |       |   (   |   *   |   &   |   ^   |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [_RAISE] = LAYOUT_ortho_3x11(
-    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_EXLM, KC_MINS, KC_PLUS, _______, KC_EQL,  KC_SCLN, KC_RPRN, KC_GRV,  KC_QUES,
-    KC_PERC, KC_DLR,  KC_HASH, KC_AT,   _______, _______, _______, KC_LPRN, KC_ASTR, KC_AMPR, KC_CIRC
-  ),
-  /* Union
-     * ,---------------------------------------------------------------------------------------.
-     * | QK_BOOT |       |       |       |       |       |       |       |       |       |  Del  |
-     * |---------------------------------------------------------------------------------------|
-     * |       |       |       |       |       |       |       |       |       |       |       |
-     * |---------------------------------------------------------------------------------------|
-     * |       |       |       |       |       |       |       |       |       |       |       |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [_UNION] = LAYOUT_ortho_3x11(
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-};
-
-//planck like tri layer
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case BEAKL:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_BEAKL);
-    }
-    return false;
-    break;
-  case LOWER:
-    if (record->event.pressed) {
-      layer_on(_LOWER);
-      update_tri_layer(_LOWER, _RAISE, _UNION);
-    } else {
-      layer_off(_LOWER);
-      update_tri_layer(_LOWER, _RAISE, _UNION);
-    }
-    return false;
-    break;
-  case RAISE:
-    if (record->event.pressed) {
-      layer_on(_RAISE);
-      update_tri_layer(_LOWER, _RAISE, _UNION);
-    } else {
-      layer_off(_RAISE);
-      update_tri_layer(_LOWER, _RAISE, _UNION);
-    }
-    return false;
-    break;
-  }
-  return true;
-}
diff --git a/keyboards/miuni32/keymaps/kifinnsson/readme.md b/keyboards/miuni32/keymaps/kifinnsson/readme.md
deleted file mode 100644
index 7615d1c6ad2..00000000000
--- a/keyboards/miuni32/keymaps/kifinnsson/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# A BEAKL9-ish keymap for miuni32
-A major WIP
-Using planck like tri layer switching with a single center control column
-No mousekey support
diff --git a/keyboards/miuni32/keymaps/kifinnsson/rules.mk b/keyboards/miuni32/keymaps/kifinnsson/rules.mk
deleted file mode 100644
index 5bd824e1fa6..00000000000
--- a/keyboards/miuni32/keymaps/kifinnsson/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/mixi/keymaps/default/keymap.c b/keyboards/mixi/keymaps/default/keymap.c
index d14a692a898..29f19349cc0 100644
--- a/keyboards/mixi/keymaps/default/keymap.c
+++ b/keyboards/mixi/keymaps/default/keymap.c
@@ -59,13 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_BLUE}
+        {0, RGBLIGHT_LED_COUNT, HSV_BLUE}
         );
 const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_GREEN}
+        {0, RGBLIGHT_LED_COUNT, HSV_GREEN}
         );
 const rgblight_segment_t PROGMEM _top_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_RED}
+        {0, RGBLIGHT_LED_COUNT, HSV_RED}
         );
 
 const rgblight_segment_t* const PROGMEM _rgb_layers[] =
diff --git a/keyboards/mixi/keymaps/via/keymap.c b/keyboards/mixi/keymaps/via/keymap.c
index ef5aace8889..adcf4485038 100644
--- a/keyboards/mixi/keymaps/via/keymap.c
+++ b/keyboards/mixi/keymaps/via/keymap.c
@@ -76,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_BLUE}
+        {0, RGBLIGHT_LED_COUNT, HSV_BLUE}
         );
 const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_GREEN}
+        {0, RGBLIGHT_LED_COUNT, HSV_GREEN}
         );
 const rgblight_segment_t PROGMEM _top_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_RED}
+        {0, RGBLIGHT_LED_COUNT, HSV_RED}
         );
 
 const rgblight_segment_t* const PROGMEM _rgb_layers[] =
diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h
deleted file mode 100644
index f4a2ec49cda..00000000000
--- a/keyboards/ml/gas75/config.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2022 ML
- *
- * 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 RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_LED_COUNT 3
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_KEYPRESSES
-
-    /* RGB Matrix effect */
-    #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 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
-#endif
diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json
index 9831c7beb60..492573c9be5 100644
--- a/keyboards/ml/gas75/info.json
+++ b/keyboards/ml/gas75/info.json
@@ -10,7 +10,51 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["D1", "D2", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "E6", "B0", "B1", "B2", "B3"],
diff --git a/keyboards/mlego/m48/keymaps/default/keymap.c b/keyboards/mlego/m48/keymaps/default/keymap.c
index d07f1935266..71409bf939e 100644
--- a/keyboards/mlego/m48/keymaps/default/keymap.c
+++ b/keyboards/mlego/m48/keymaps/default/keymap.c
@@ -26,10 +26,10 @@ enum layer_names {
 
 #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 PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, 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
diff --git a/keyboards/mlego/m48/keymaps/via/keymap.c b/keyboards/mlego/m48/keymaps/via/keymap.c
index 91649631dc3..d180c3e8ac1 100644
--- a/keyboards/mlego/m48/keymaps/via/keymap.c
+++ b/keyboards/mlego/m48/keymaps/via/keymap.c
@@ -26,10 +26,10 @@ enum layer_names {
 
 #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 PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, 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
diff --git a/keyboards/mlego/m60/keymaps/default/keymap.c b/keyboards/mlego/m60/keymaps/default/keymap.c
index dbfcad31525..d997bd2dc06 100644
--- a/keyboards/mlego/m60/keymaps/default/keymap.c
+++ b/keyboards/mlego/m60/keymaps/default/keymap.c
@@ -26,10 +26,10 @@ enum layer_names {
 
 #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 PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, 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
diff --git a/keyboards/mlego/m60/keymaps/via/keymap.c b/keyboards/mlego/m60/keymaps/via/keymap.c
index 8d0cddae80f..fc3ab612d09 100644
--- a/keyboards/mlego/m60/keymaps/via/keymap.c
+++ b/keyboards/mlego/m60/keymaps/via/keymap.c
@@ -26,10 +26,10 @@ enum layer_names {
 
 #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 PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, 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
diff --git a/keyboards/mlego/m60_split/keymaps/default/keymap.c b/keyboards/mlego/m60_split/keymaps/default/keymap.c
index 2f51794c1c7..506aa45f300 100644
--- a/keyboards/mlego/m60_split/keymaps/default/keymap.c
+++ b/keyboards/mlego/m60_split/keymaps/default/keymap.c
@@ -29,10 +29,10 @@ enum layer_names {
 
 #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 PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, 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
diff --git a/keyboards/mlego/m60_split/keymaps/via/keymap.c b/keyboards/mlego/m60_split/keymaps/via/keymap.c
index 756639bfd9c..29270b0425b 100644
--- a/keyboards/mlego/m60_split/keymaps/via/keymap.c
+++ b/keyboards/mlego/m60_split/keymaps/via/keymap.c
@@ -29,10 +29,10 @@ enum layer_names {
 
 #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 PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, 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
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index 90ea0bd56c3..564add296d3 100644
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -18,6 +18,3 @@
 #define SPLIT_HAND_PIN B9
 #define SERIAL_USART_TX_PIN B6
 #define SERIAL_USART_SPEED 921600
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_DEFAULT_HUE 213
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index 89744c8b861..8280ffa022b 100644
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -36,6 +36,12 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "hue": 213
+        },
+        "layers": {
+            "enabled": true
         }
     },
     "split": {
diff --git a/keyboards/mlego/m65/m65.c b/keyboards/mlego/m65/m65.c
index 12ea866f1e5..506ac2e30d9 100644
--- a/keyboards/mlego/m65/m65.c
+++ b/keyboards/mlego/m65/m65.c
@@ -9,10 +9,10 @@ static bool toggle_rse = false;
 
 #if defined(RGBLIGHT_ENABLE)
 
-const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_OFF});
-const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_AZURE});
-const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CORAL});
-const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_OFF});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_AZURE});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_CORAL});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLIGHT_LED_COUNT, HSV_RED});
 
 const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
 
diff --git a/keyboards/mnk1800s/mnk1800s.c b/keyboards/mnk1800s/mnk1800s.c
deleted file mode 100755
index f7fcd20c2b8..00000000000
--- a/keyboards/mnk1800s/mnk1800s.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* 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 "mnk1800s.h"
diff --git a/keyboards/mnk1800s/mnk1800s.h b/keyboards/mnk1800s/mnk1800s.h
deleted file mode 100644
index 71716767b8c..00000000000
--- a/keyboards/mnk1800s/mnk1800s.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 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, K0E, K0F, KOG, K0H, K2H, \
-    K10, K11, K12, K13,      K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H,      \
-    K20, K21, K22, K23,      K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,           \
-    K30, K31, K32, K48, K33,      K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G,      \
-    K40, K41, K42, K43, K44, K45,      K46, K47,           K4A,                     K4F, K4G            \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, KOG, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, XXX, K4A, XXX, XXX, XXX, XXX, K4F, K4G, XXX }  \
-}
diff --git a/keyboards/mnk1800s/readme.md b/keyboards/mnk1800s/readme.md
deleted file mode 100755
index eb4e1b0ef59..00000000000
--- a/keyboards/mnk1800s/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# MNK1800s
-
-This is a southpaw 65% keyboard. It supports VIA.
-
-* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
-* Hardware Supported: A TKL keyboard with STM32F072CB
-* Hardware Availability: https://www.monokei.co
-
-## Instructions
-
-### Build
-
-Make example for this keyboard (after setting up your build environment):
-
-    make mnk1800s: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 mnk1800s:<keymap>:flash`)
diff --git a/keyboards/mnk50/mnk50.c b/keyboards/mnk50/mnk50.c
deleted file mode 100755
index 0e833dc7b3d..00000000000
--- a/keyboards/mnk50/mnk50.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* 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 "mnk50.h"
diff --git a/keyboards/mnk50/mnk50.h b/keyboards/mnk50/mnk50.h
deleted file mode 100644
index 59444503874..00000000000
--- a/keyboards/mnk50/mnk50.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* 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"
-
-/*
- *   ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- *   │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │
- *   ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
- *   │10  │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1D    │
- *   ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤   ┌────────┐
- *   │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B  │2D │   │2B      │ 2.25u RShift
- *   └────┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┴───┘   └────────┘
- *        │31 │32  │33 │   35   │    37    │39 │3A  │3B │
- *        └───┴────┴───┴────────┴──────────┴───┴────┴───┘
- *                 ┌───────────────────────────┐
- *                 │            36             │ 7u Spacebar
- *                 └───────────────────────────┘
- */
-
-#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,      K1D, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
-         K31, K32, K33,      K35, K36, K37,      K39, K3A, K3B            \
-) { \
-    { 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, XXX, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { XXX, K31, K32, K33, XXX, K35, K36, K37, XXX, K39, K3A, K3B, XXX, XXX }  \
-}
-
-#define LAYOUT_split_space( \
-    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,      K1D, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
-         K31, K32, K33,      K35,      K37,      K39, K3A, K3B            \
-) { \
-    { 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, XXX, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { XXX, K31, K32, K33, XXX, K35, XXX, K37, XXX, K39, K3A, K3B, XXX, XXX }  \
-}
-
-#define LAYOUT_7u_space( \
-    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,      K1D, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
-         K31, K32,                K36,                K3A, K3B            \
-) { \
-    { 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, XXX, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { XXX, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, XXX, XXX }  \
-}
diff --git a/keyboards/mnk50/readme.md b/keyboards/mnk50/readme.md
deleted file mode 100755
index f8484e9d36d..00000000000
--- a/keyboards/mnk50/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# MNK40
-
-This is a 40% keyboard. It supports VIA.
-
-* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
-* Hardware Supported: A 40% keyboard with STM32F072CB
-* Hardware Availability: https://www.monokei.co
-
-## Instructions
-
-### Build
-
-Make example for this keyboard (after setting up your build environment):
-
-    make mnk50: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 mnk50:<keymap>:flash`)
diff --git a/keyboards/mnk75/readme.md b/keyboards/mnk75/readme.md
deleted file mode 100755
index 631ca246e7a..00000000000
--- a/keyboards/mnk75/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/mntre_v3/info.json b/keyboards/mntre_v3/info.json
new file mode 100644
index 00000000000..d9cee6aede8
--- /dev/null
+++ b/keyboards/mntre_v3/info.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "MNT Reform Keyboard 3.0",
+    "manufacturer": "MNT Research GmbH",
+    "url": "https://shop.mntre.com/products/mnt-reform-keyboard-30",
+    "maintainer": "Habibmuhd",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1302",
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["D5", "F7", "E6", "C7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "C6"],
+        "rows": ["B6", "B5", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "max_brightness": 84
+    },
+	"features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "backlight": true,
+        "oled": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.75, "y": 5, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.25, "y": 5, "w": 1.5},
+                {"matrix": [5, 4], "x": 5.75, "y": 5,"w": 2},
+                {"matrix": [5, 5], "x": 7.75, "y": 5,"w": 1.5},
+                {"matrix": [5, 6], "x": 9.25, "y": 5},
+                {"matrix": [5, 7], "x": 10.25, "y": 5},
+                {"matrix": [5, 8], "x": 11.25, "y": 5},
+                {"matrix": [5, 9], "x": 12.25, "y": 5},
+                {"matrix": [5, 10], "x": 13.25, "y": 5,"w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mntre_v3/keymaps/default/keymap.c b/keyboards/mntre_v3/keymaps/default/keymap.c
new file mode 100644
index 00000000000..1f62bae851a
--- /dev/null
+++ b/keyboards/mntre_v3/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2021 Cedric Vincent (@cdc-mkb)
+// 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_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(_FN),
+        KC_GRAVE,  KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,    KC_8,      KC_9,     KC_0,    KC_MINUS,    KC_EQUAL,    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_LCTL,   KC_A,    KC_S,     KC_D,     KC_F,    KC_G,    KC_H,     KC_J,    KC_K,      KC_L,     KC_SCLN, KC_QUOTE,    KC_ENTER,
+        KC_LSFT,   KC_DEL,  KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,     KC_N,    KC_M,      KC_COMMA, KC_DOT,  KC_SLASH,    KC_UP,       KC_RSFT,
+        KC_RGUI,   KC_LGUI, KC_LALT,  KC_SPACE, KC_SPACE, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT,  KC_DOWN, KC_RIGHT
+    ),
+
+    [_FN] = LAYOUT(
+        _______, BL_DOWN,  BL_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______
+	),
+};
diff --git a/keyboards/mntre_v3/keymaps/default/readme.md b/keyboards/mntre_v3/keymaps/default/readme.md
new file mode 100644
index 00000000000..417feacb38c
--- /dev/null
+++ b/keyboards/mntre_v3/keymaps/default/readme.md
@@ -0,0 +1,21 @@
+# Default layout of MNT Reform USB Keyboard 3.0 (Standalone)
+
+This is exactly the same layout as in the original firmware.
+Backlight level can be decreased and increased using Fn+F1 and Fn+F2
+respectively.
+
+  ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+  ┃  Esc │  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │    Fn    ┃
+  ┠──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────────┨
+  ┃  `~  │  1!  │  2@  │  3#  │  4$  │  5%  │  6^  │  7&  │  8*  │  9(  │  0)  │  -_  │  =+  │ Backspace┃
+  ┠──────┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──────┨
+  ┃    Tab   │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │  [{  │  ]}  │  \|  ┃
+  ┠──────────┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──────┨
+  ┃    LCtrl    │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │  ;:  │  '"  │   Enter  ┃
+  ┠─────────┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───────┨
+  ┃  LShift │  Del │   Z  │   X  │   C  │   V  │   B  │   N  │   M  │  ,<  │  .>  │  /?  │  Up  │ RShift┃
+  ┠─────────┼──────┴──┬───┴──────┼──────┴──┬───┴──────┴──┬───┴──────┼──────┼──────┼──────┼──────┼───────┨
+  ┃   RGUI  │   LGUI  │   ALT    │   Space │     Space   │  Space   │ ALT │ RCtrl │ Left │ Down │  Right┃
+  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+
diff --git a/keyboards/mntre_v3/mntre.c b/keyboards/mntre_v3/mntre.c
new file mode 100644
index 00000000000..80ed074c2f0
--- /dev/null
+++ b/keyboards/mntre_v3/mntre.c
@@ -0,0 +1,19 @@
+// Copyright 2021 Cedric Vincent (@cdc-mkb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+
+    static const char PROGMEM qmk_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+    };
+
+    oled_write_P(qmk_logo, false);
+    return true;
+}
+#endif
diff --git a/keyboards/mntre_v3/readme.md b/keyboards/mntre_v3/readme.md
new file mode 100644
index 00000000000..cd07479991e
--- /dev/null
+++ b/keyboards/mntre_v3/readme.md
@@ -0,0 +1,27 @@
+# MNT Reform USB Keyboard (Standalone)
+
+![MNT Reform USB Keyboard (Standalone)](https://i.imgur.com/pXDDan6h.jpeg)
+
+A compact and slim mechanical keyboard designed for comfort and portability.
+
+* Keyboard QMK port Maintainer: [cdc-mkb](https://github.com/cdc-mkb)
+* Hardware Supported: MNT Reform USB Keyboard (Standalone)
+* Hardware Availability: https://shop.mntre.com/products/mnt-reform-keyboard-30
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mntre_v3:default
+
+Flashing example for this keyboard:
+
+    make mntre_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 "Esc" key and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (default: "Circle" + "R")
+* **Physical reset button**: Remove the keyboard’s frame and toggle the programming DIP switch SW84 on the keyboard to “ON”.  Then press the reset button SW83.
diff --git a/keyboards/mntre_v3/rules.mk b/keyboards/mntre_v3/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/mntre_v3/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mode/m256wh/info.json b/keyboards/mode/m256wh/info.json
index 6caaa754ed3..bbd3c17e97b 100644
--- a/keyboards/mode/m256wh/info.json
+++ b/keyboards/mode/m256wh/info.json
@@ -4,9 +4,11 @@
     "maintainer": "Gondolindrim",
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
+    "build": {
+        "lto": true
+    },
     "features": {
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
diff --git a/keyboards/mode/m256ws/info.json b/keyboards/mode/m256ws/info.json
index 6a36d4af8e4..820ed536c21 100644
--- a/keyboards/mode/m256ws/info.json
+++ b/keyboards/mode/m256ws/info.json
@@ -4,12 +4,14 @@
     "maintainer": "Gondolindrim",
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
+    "build": {
+        "lto": true
+    },
     "features": {
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
diff --git a/keyboards/mode/m60h/config.h b/keyboards/mode/m60h/config.h
index 04fda276e63..f984cf28de9 100644
--- a/keyboards/mode/m60h/config.h
+++ b/keyboards/mode/m60h/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM6
diff --git a/keyboards/mode/m60h/info.json b/keyboards/mode/m60h/info.json
index 5fee9791497..b33ea3a9c3b 100644
--- a/keyboards/mode/m60h/info.json
+++ b/keyboards/mode/m60h/info.json
@@ -31,6 +31,9 @@
             "static_gradient": true,
             "twinkle": true
         },
+        "default": {
+            "animation": "rainbow_swirl"
+        },
         "driver": "ws2812",
         "led_count": 20,
         "max_brightness": 120,
diff --git a/keyboards/mode/m60h_f/config.h b/keyboards/mode/m60h_f/config.h
index 04fda276e63..f984cf28de9 100644
--- a/keyboards/mode/m60h_f/config.h
+++ b/keyboards/mode/m60h_f/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM6
diff --git a/keyboards/mode/m60h_f/info.json b/keyboards/mode/m60h_f/info.json
index f4bcddfe751..014472bc68c 100644
--- a/keyboards/mode/m60h_f/info.json
+++ b/keyboards/mode/m60h_f/info.json
@@ -31,6 +31,9 @@
             "static_gradient": true,
             "twinkle": true
         },
+        "default": {
+            "animation": "rainbow_swirl"
+        },
         "driver": "ws2812",
         "led_count": 20,
         "max_brightness": 120,
diff --git a/keyboards/mode/m60s/config.h b/keyboards/mode/m60s/config.h
index 04fda276e63..f984cf28de9 100644
--- a/keyboards/mode/m60s/config.h
+++ b/keyboards/mode/m60s/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM6
diff --git a/keyboards/mode/m60s/info.json b/keyboards/mode/m60s/info.json
index 368f2fff824..6a03219427f 100644
--- a/keyboards/mode/m60s/info.json
+++ b/keyboards/mode/m60s/info.json
@@ -31,6 +31,9 @@
             "static_gradient": true,
             "twinkle": true
         },
+        "default": {
+            "animation": "rainbow_swirl"
+        },
         "driver": "ws2812",
         "led_count": 20,
         "max_brightness": 120,
diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h
index 4d3a7d5ca4c..5672c10fc59 100644
--- a/keyboards/mode/m75s/config.h
+++ b/keyboards/mode/m75s/config.h
@@ -17,6 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define BACKLIGHT_DEFAULT_LEVEL 20
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json
index be7338c6f87..f132f25fe58 100644
--- a/keyboards/mode/m80v1/m80h/info.json
+++ b/keyboards/mode/m80v1/m80h/info.json
@@ -15,7 +15,6 @@
     "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
-    "community_layouts": ["tkl_ansi"],
     "layout_aliases": {
         "LAYOUT_eighty_m80h": "LAYOUT_tkl_ansi"
     },
diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json
index 03a2d912bcd..b332a6853b8 100644
--- a/keyboards/mode/m80v2/m80v2h/info.json
+++ b/keyboards/mode/m80v2/m80v2h/info.json
@@ -19,7 +19,6 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
-    "community_layouts": ["tkl_ansi"],
     "layout_aliases": {
         "LAYOUT_m80v2h": "LAYOUT_tkl_ansi"
     },
diff --git a/keyboards/moky/moky88/config.h b/keyboards/moky/moky88/config.h
new file mode 100644
index 00000000000..a673a38069c
--- /dev/null
+++ b/keyboards/moky/moky88/config.h
@@ -0,0 +1,19 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+/* Flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+
+/* RGB Driver */
+#define AW20216S_CS_PIN_1 D2
+#define AW20216S_CS_PIN_2 B8
+#define AW20216S_EN_PIN_1 B9
+#define AW20216S_EN_PIN_2 B9
diff --git a/keyboards/moky/moky88/halconf.h b/keyboards/moky/moky88/halconf.h
new file mode 100644
index 00000000000..0a59a1fcb8e
--- /dev/null
+++ b/keyboards/moky/moky88/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/info.json
new file mode 100644
index 00000000000..38ed4dbd289
--- /dev/null
+++ b/keyboards/moky/moky88/info.json
@@ -0,0 +1,272 @@
+{
+  "manufacturer": "moky",
+  "keyboard_name": "moky88",
+  "url": "",
+  "processor": "WB32FQ95",
+  "bootloader": "wb32-dfu",
+  "usb": {
+      "device_version": "1.0.0",
+      "vid": "0xBB4F",
+      "pid": "0x0001",
+      "suspend_wakeup_delay": 1000
+  },
+  "diode_direction": "ROW2COL",
+  "features": {
+      "bootmagic": true,
+      "extrakey": true,
+      "mousekey": true,
+      "nkro": true,
+      "rgb_matrix": true,
+      "encoder": true
+  },
+  "matrix_pins": {
+      "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "A8", "C4"],
+      "rows": ["A0", "A1", "A2", "A3", "A4", "C13"]
+  },
+  "eeprom": {
+      "wear_leveling": {
+          "backing_size": 4096,
+          "driver": "spi_flash"
+      }
+  },
+  "encoder": {
+      "rotary": [
+          {"pin_a": "B6", "pin_b": "B7"}
+      ]
+  },
+  "rgb_matrix": {
+      "driver": "aw20216s",
+      "max_brightness": 108,
+      "animations": {
+          "alphas_mods": true,
+          "gradient_up_down": true,
+          "gradient_left_right": true,
+          "breathing": true,
+          "band_sat": true,
+          "band_val": true,
+          "band_pinwheel_sat": true,
+          "band_pinwheel_val": true,
+          "band_spiral_sat": true,
+          "band_spiral_val": true,
+          "cycle_all": true,
+          "cycle_left_right": true,
+          "cycle_up_down": true,
+          "cycle_out_in": true,
+          "cycle_out_in_dual": true,
+          "rainbow_moving_chevron": true,
+          "cycle_pinwheel": true,
+          "cycle_spiral": true,
+          "dual_beacon": true,
+          "rainbow_beacon": true,
+          "rainbow_pinwheels": true,
+          "raindrops": true,
+          "jellybean_raindrops": true,
+          "hue_breathing": true,
+          "hue_pendulum": true,
+          "hue_wave": true,
+          "pixel_fractal": true,
+          "pixel_flow": true,
+          "pixel_rain": true,
+          "typing_heatmap": true,
+          "digital_rain": true,
+          "solid_reactive_simple": true,
+          "solid_reactive": true,
+          "solid_reactive_wide": true,
+          "solid_reactive_multiwide": true,
+          "solid_reactive_cross": true,
+          "solid_reactive_multicross": true,
+          "solid_reactive_nexus": true,
+          "solid_reactive_multinexus": true,
+          "splash": true,
+          "multisplash": true,
+          "solid_splash": true,
+          "solid_multisplash": true
+      },
+      "layout": [
+            {"flags": 4, "matrix": [0, 0], "x": 0  , "y":  0},
+            {"flags": 4, "matrix": [0, 1], "x": 14 , "y":  0},
+            {"flags": 4, "matrix": [0, 2], "x": 28 , "y":  0},
+            {"flags": 4, "matrix": [0, 3], "x": 42 , "y":  0},
+            {"flags": 4, "matrix": [0, 4], "x": 56 , "y":  0},
+            {"flags": 4, "matrix": [0, 5], "x": 70 , "y":  0},
+            {"flags": 4, "matrix": [0, 6], "x": 84 , "y":  0},
+            {"flags": 4, "matrix": [0, 7], "x": 98 , "y":  0},
+            {"flags": 4, "matrix": [0, 8], "x": 112, "y":  0},
+            {"flags": 4, "matrix": [0, 9], "x": 126, "y":  0},
+            {"flags": 4, "matrix": [0,10], "x": 140, "y":  0},
+            {"flags": 4, "matrix": [0,11], "x": 154, "y":  0},
+            {"flags": 4, "matrix": [0,12], "x": 168, "y":  0},
+            {"flags": 4, "matrix": [0,13], "x": 182, "y":  0},
+            {"flags": 4, "matrix": [0,14], "x": 196, "y":  0},
+            {"flags": 4, "matrix": [0,15], "x": 210, "y":  0},
+            {"flags": 4, "matrix": [0,16], "x": 224, "y":  0},
+            {"flags": 4, "matrix": [1, 0], "x": 0  , "y": 13},
+            {"flags": 4, "matrix": [1, 1], "x": 14 , "y": 13},
+            {"flags": 4, "matrix": [1, 2], "x": 28 , "y": 13},
+            {"flags": 4, "matrix": [1, 3], "x": 42 , "y": 13},
+            {"flags": 4, "matrix": [1, 4], "x": 56 , "y": 13},
+            {"flags": 4, "matrix": [1, 5], "x": 70 , "y": 13},
+            {"flags": 4, "matrix": [1, 6], "x": 84 , "y": 13},
+            {"flags": 4, "matrix": [1, 7], "x": 98 , "y": 13},
+            {"flags": 4, "matrix": [1, 8], "x": 112, "y": 13},
+            {"flags": 4, "matrix": [1, 9], "x": 126, "y": 13},
+            {"flags": 4, "matrix": [1,10], "x": 140, "y": 13},
+            {"flags": 4, "matrix": [1,11], "x": 154, "y": 13},
+            {"flags": 4, "matrix": [1,12], "x": 168, "y": 13},
+            {"flags": 4, "matrix": [1,13], "x": 182, "y": 13},
+            {"flags": 4, "matrix": [1,14], "x": 196, "y": 13},
+            {"flags": 4, "matrix": [1,15], "x": 210, "y": 13},
+            {"flags": 4, "matrix": [1,16], "x": 224, "y": 13},
+            {"flags": 4, "matrix": [2, 0], "x": 0  , "y": 26},
+            {"flags": 4, "matrix": [2, 1], "x": 14 , "y": 26},
+            {"flags": 4, "matrix": [2, 2], "x": 28 , "y": 26},
+            {"flags": 4, "matrix": [2, 3], "x": 42 , "y": 26},
+            {"flags": 4, "matrix": [2, 4], "x": 56 , "y": 26},
+            {"flags": 4, "matrix": [2, 5], "x": 70 , "y": 26},
+            {"flags": 4, "matrix": [2, 6], "x": 84 , "y": 26},
+            {"flags": 4, "matrix": [2, 7], "x": 98 , "y": 26},
+            {"flags": 4, "matrix": [2, 8], "x": 112, "y": 26},
+            {"flags": 4, "matrix": [2, 9], "x": 126, "y": 26},
+            {"flags": 4, "matrix": [2,10], "x": 140, "y": 26},
+            {"flags": 4, "matrix": [2,11], "x": 154, "y": 26},
+            {"flags": 4, "matrix": [2,12], "x": 168, "y": 26},
+            {"flags": 4, "matrix": [2,13], "x": 182, "y": 26},
+            {"flags": 4, "matrix": [2,14], "x": 196, "y": 26},
+            {"flags": 4, "matrix": [2,15], "x": 210, "y": 26},
+            {"flags": 4, "matrix": [2,16], "x": 224, "y": 26},
+            {"flags": 4, "matrix": [3, 0], "x": 0  , "y": 39},
+            {"flags": 4, "matrix": [3, 1], "x": 14 , "y": 39},
+            {"flags": 4, "matrix": [3, 2], "x": 28 , "y": 39},
+            {"flags": 4, "matrix": [3, 3], "x": 42 , "y": 39},
+            {"flags": 4, "matrix": [3, 4], "x": 56 , "y": 39},
+            {"flags": 4, "matrix": [3, 5], "x": 70 , "y": 39},
+            {"flags": 4, "matrix": [3, 6], "x": 84 , "y": 39},
+            {"flags": 4, "matrix": [3, 7], "x": 98 , "y": 39},
+            {"flags": 4, "matrix": [3, 8], "x": 112, "y": 39},
+            {"flags": 4, "matrix": [3, 9], "x": 126, "y": 39},
+            {"flags": 4, "matrix": [3,10], "x": 140, "y": 39},
+            {"flags": 4, "matrix": [3,11], "x": 154, "y": 39},
+            {"flags": 4, "matrix": [3,13], "x": 182, "y": 39},
+            {"flags": 4, "matrix": [4, 0], "x": 0  , "y": 52},
+            {"flags": 4, "matrix": [4, 2], "x": 28 , "y": 52},
+            {"flags": 4, "matrix": [4, 3], "x": 42 , "y": 52},
+            {"flags": 4, "matrix": [4, 4], "x": 56 , "y": 52},
+            {"flags": 4, "matrix": [4, 5], "x": 70 , "y": 52},
+            {"flags": 4, "matrix": [4, 6], "x": 84 , "y": 52},
+            {"flags": 4, "matrix": [4, 7], "x": 98 , "y": 52},
+            {"flags": 4, "matrix": [4, 8], "x": 112, "y": 52},
+            {"flags": 4, "matrix": [4, 9], "x": 126, "y": 52},
+            {"flags": 4, "matrix": [4,10], "x": 140, "y": 52},
+            {"flags": 4, "matrix": [4,11], "x": 154, "y": 52},
+            {"flags": 4, "matrix": [4,13], "x": 182, "y": 52},
+            {"flags": 4, "matrix": [4,15], "x": 210, "y": 52},
+            {"flags": 4, "matrix": [5, 0], "x": 0  , "y": 64},
+            {"flags": 4, "matrix": [5, 1], "x": 14 , "y": 64},
+            {"flags": 4, "matrix": [5, 2], "x": 28 , "y": 64},
+            {"flags": 4, "matrix": [5, 6], "x": 84 , "y": 64},
+            {"flags": 4, "matrix": [5,10], "x": 140, "y": 64},
+            {"flags": 4, "matrix": [5,11], "x": 154, "y": 64},
+            {"flags": 4, "matrix": [5,12], "x": 168, "y": 64},
+            {"flags": 4, "matrix": [5,13], "x": 182, "y": 64},
+            {"flags": 4, "matrix": [5,14], "x": 196, "y": 64},
+            {"flags": 4, "matrix": [5,15], "x": 210, "y": 64},
+            {"flags": 4, "matrix": [5,16], "x": 224, "y": 64}
+        ],
+        "sleep": true
+  },
+  "community_layouts": ["tkl_f13_ansi"],
+  "layouts": {
+      "LAYOUT_tkl_f13_ansi": {
+          "layout": [
+            {"matrix": [0,0], "x": 0, "y": 0 },
+            {"matrix": [0,1], "x": 1.5, "y": 0 },
+            {"matrix": [0,2], "x": 2.5, "y": 0 },
+            {"matrix": [0,3], "x": 3.5, "y": 0 },
+            {"matrix": [0,4], "x": 4.5, "y": 0 },
+            {"matrix": [0,5], "x": 5.75, "y": 0 },
+            {"matrix": [0,6], "x": 6.75, "y": 0 },
+            {"matrix": [0,7], "x": 7.75, "y": 0 },
+            {"matrix": [0,8], "x": 8.75, "y": 0 },
+            {"matrix": [0,9], "x": 10, "y": 0 },
+            {"matrix": [0,10], "x": 11, "y": 0 },
+            {"matrix": [0,11], "x": 12, "y": 0 },
+            {"matrix": [0,12], "x": 13, "y": 0 },
+            {"matrix": [0,13], "x": 14.25, "y": 0 },
+            {"matrix": [0,14], "x": 15.75, "y": 0 },
+            {"matrix": [0,15], "x": 16.75, "y": 0 },
+            {"matrix": [0,16], "x": 17.75, "y": 0 },
+            {"matrix": [1,0], "x": 0, "y": 1.25 },
+            {"matrix": [1,1], "x": 1, "y": 1.25 },
+            {"matrix": [1,2], "x": 2, "y": 1.25 },
+            {"matrix": [1,3], "x": 3, "y": 1.25 },
+            {"matrix": [1,4], "x": 4, "y": 1.25 },
+            {"matrix": [1,5], "x": 5, "y": 1.25 },
+            {"matrix": [1,6], "x": 6, "y": 1.25 },
+            {"matrix": [1,7], "x": 7, "y": 1.25 },
+            {"matrix": [1,8], "x": 8, "y": 1.25 },
+            {"matrix": [1,9], "x": 9, "y": 1.25 },
+            {"matrix": [1,10], "x": 10, "y": 1.25 },
+            {"matrix": [1,11], "x": 11, "y": 1.25 },
+            {"matrix": [1,12], "x": 12, "y": 1.25 },
+            {"matrix": [1,13], "x": 13, "y": 1.25, "w": 2.25 },
+            {"matrix": [1,14], "x": 15.75, "y": 1.25 },
+            {"matrix": [1,15], "x": 16.75, "y": 1.25 },
+            {"matrix": [1,16], "x": 17.75, "y": 1.25 },
+            {"matrix": [2,0], "x": 0, "y": 2.25, "w": 1.5 },
+            {"matrix": [2,1], "x": 1.5, "y": 2.25 },
+            {"matrix": [2,2], "x": 2.5, "y": 2.25 },
+            {"matrix": [2,3], "x": 3.5, "y": 2.25 },
+            {"matrix": [2,4], "x": 4.5, "y": 2.25 },
+            {"matrix": [2,5], "x": 5.5, "y": 2.25 },
+            {"matrix": [2,6], "x": 6.5, "y": 2.25 },
+            {"matrix": [2,7], "x": 7.5, "y": 2.25 },
+            {"matrix": [2,8], "x": 8.5, "y": 2.25 },
+            {"matrix": [2,9], "x": 9.5, "y": 2.25 },
+            {"matrix": [2,10], "x": 10.5, "y": 2.25 },
+            {"matrix": [2,11], "x": 11.5, "y": 2.25 },
+            {"matrix": [2,12], "x": 12.5, "y": 2.25 },
+            {"matrix": [2,13], "x": 13.5, "y": 2.25, "w": 1.75 },
+            {"matrix": [2,14], "x": 15.75, "y": 2.25 },
+            {"matrix": [2,15], "x": 16.75, "y": 2.25 },
+            {"matrix": [2,16], "x": 17.75, "y": 2.25 },
+            {"matrix": [3,0], "x": 0, "y": 3.25, "w": 1.75 },
+            {"matrix": [3,1], "x": 1.75, "y": 3.25 },
+            {"matrix": [3,2], "x": 2.75, "y": 3.25 },
+            {"matrix": [3,3], "x": 3.75, "y": 3.25 },
+            {"matrix": [3,4], "x": 4.75, "y": 3.25 },
+            {"matrix": [3,5], "x": 5.75, "y": 3.25 },
+            {"matrix": [3,6], "x": 6.75, "y": 3.25 },
+            {"matrix": [3,7], "x": 7.75, "y": 3.25 },
+            {"matrix": [3,8], "x": 8.75, "y": 3.25 },
+            {"matrix": [3,9], "x": 9.75, "y": 3.25 },
+            {"matrix": [3,10], "x": 10.75, "y": 3.25 },
+            {"matrix": [3,11], "x": 11.75, "y": 3.25 },
+            {"matrix": [3,13], "x": 12.75, "y": 3.25, "w": 2.5 },
+            {"matrix": [4,0], "x": 0, "y": 4.25, "w": 2.25 },
+            {"matrix": [4,2], "x": 2.25, "y": 4.25 },
+            {"matrix": [4,3], "x": 3.25, "y": 4.25 },
+            {"matrix": [4,4], "x": 4.25, "y": 4.25 },
+            {"matrix": [4,5], "x": 5.25, "y": 4.25 },
+            {"matrix": [4,6], "x": 6.25, "y": 4.25 },
+            {"matrix": [4,7], "x": 7.25, "y": 4.25 },
+            {"matrix": [4,8], "x": 8.25, "y": 4.25 },
+            {"matrix": [4,9], "x": 9.25, "y": 4.25 },
+            {"matrix": [4,10], "x": 10.25, "y": 4.25 },
+            {"matrix": [4,11], "x": 11.25, "y": 4.25 },
+            {"matrix": [4,13], "x": 12.25, "y": 4.25, "w": 3 },
+            {"matrix": [4,15], "x": 16.75, "y": 4.25 },
+            {"matrix": [5,0], "x": 0, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,1], "x": 1.25, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,2], "x": 2.5, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,6], "x": 3.75, "y": 5.25, "w": 6.5 },
+            {"matrix": [5,10], "x": 10.25, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,11], "x": 11.5, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,12], "x": 12.75, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,13], "x": 14, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,14], "x": 15.75, "y": 5.25 },
+            {"matrix": [5,15], "x": 16.75, "y": 5.25 },
+            {"matrix": [5,16], "x": 17.75, "y": 5.25 }
+          ]
+      }
+  }
+}
diff --git a/keyboards/moky/moky88/keymaps/default/keymap.c b/keyboards/moky/moky88/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5b86c306cfd
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_tkl_f13_ansi( /* 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [1] = LAYOUT_tkl_f13_ansi( /* Base */
+        _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+
+    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
+        KC_ESC,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(3),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [3] = LAYOUT_tkl_f13_ansi(  /* 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+    if (get_highest_layer(default_layer_state | layer_state) == 1) {
+        rgb_matrix_set_color(52, RGB_WHITE);
+    } else if (get_highest_layer(default_layer_state | layer_state) == 3) {
+        rgb_matrix_set_color(53, RGB_WHITE);
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(51, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(15, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (keymap_config.no_gui) {
+        if (get_highest_layer(default_layer_state) == 0) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(80, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        } else if (get_highest_layer(default_layer_state) == 2) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(81, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/moky/moky88/keymaps/default/rules.mk b/keyboards/moky/moky88/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/moky/moky88/keymaps/via/keymap.c b/keyboards/moky/moky88/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c67ded7b65b
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_tkl_f13_ansi( /* 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [1] = LAYOUT_tkl_f13_ansi( /* Base */
+        QK_BOOT, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+
+    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
+        KC_ESC,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(3),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [3] = LAYOUT_tkl_f13_ansi(  /* FN */
+        QK_BOOT, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+    if (get_highest_layer(default_layer_state | layer_state) == 1) {
+        rgb_matrix_set_color(52, RGB_WHITE);
+    } else if (get_highest_layer(default_layer_state | layer_state) == 3) {
+        rgb_matrix_set_color(53, RGB_WHITE);
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(51, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(15, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (keymap_config.no_gui) {
+        if (get_highest_layer(default_layer_state) == 0) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(80, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        } else if (get_highest_layer(default_layer_state) == 2) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(81, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/moky/moky88/keymaps/via/rules.mk b/keyboards/moky/moky88/keymaps/via/rules.mk
new file mode 100644
index 00000000000..715838ecc5d
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/moky/moky88/mcuconf.h b/keyboards/moky/moky88/mcuconf.h
new file mode 100644
index 00000000000..848f55377e5
--- /dev/null
+++ b/keyboards/moky/moky88/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright (C) 2023 Westberry Technology 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
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
diff --git a/keyboards/moky/moky88/moky88.c b/keyboards/moky/moky88/moky88.c
new file mode 100644
index 00000000000..3cbd6e14681
--- /dev/null
+++ b/keyboards/moky/moky88/moky88.c
@@ -0,0 +1,119 @@
+/* Copyright (C) 2023 Westberry Technology 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 QMK_KEYBOARD_H
+
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |          G location
+ *   |  |          |          B location
+ *   |  |          |          | */
+    {0, CS18_SW2,  CS17_SW2,  CS16_SW2   },  // 0  Esc
+    {0, CS18_SW3,  CS17_SW3,  CS16_SW3   },  // 1  F1
+    {0, CS18_SW4,  CS17_SW4,  CS16_SW4   },  // 2  F2
+    {0, CS18_SW5,  CS17_SW5,  CS16_SW5   },  // 3  F3
+    {0, CS18_SW6,  CS17_SW6,  CS16_SW6   },  // 4  F4
+    {0, CS18_SW7,  CS17_SW7,  CS16_SW7   },  // 5  F5
+    {0, CS18_SW8,  CS17_SW8,  CS16_SW8   },  // 6  F6
+    {0, CS18_SW9,  CS17_SW9,  CS16_SW9   },  // 7  F7
+    {0, CS18_SW10, CS17_SW10, CS16_SW10  },  // 8  F8
+    {0, CS18_SW11, CS17_SW11, CS16_SW11  },  // 9  F9
+    {0, CS18_SW12, CS17_SW12, CS16_SW12  },  // 10 F10
+    {1, CS18_SW1,  CS17_SW1,  CS16_SW1   },  // 11 F11
+    {1, CS18_SW2,  CS17_SW2,  CS16_SW2   },  // 12 F12
+    {1, CS18_SW3,  CS17_SW3,  CS16_SW3   },  // 13 MUTE
+    {1, CS18_SW4,  CS17_SW4,  CS16_SW4   },  // 14 PSCR
+    {1, CS18_SW5,  CS17_SW5,  CS16_SW5   },  // 15 SCRL
+    {1, CS18_SW6,  CS17_SW6,  CS16_SW6   },  // 16 PAUSE
+
+    {0, CS15_SW2,  CS14_SW2,  CS13_SW2   },  // 17 `~
+    {0, CS15_SW3,  CS14_SW3,  CS13_SW3   },  // 18 1
+    {0, CS15_SW4,  CS14_SW4,  CS13_SW4   },  // 19 2
+    {0, CS15_SW5,  CS14_SW5,  CS13_SW5   },  // 20 3
+    {0, CS15_SW6,  CS14_SW6,  CS13_SW6   },  // 21 4
+    {0, CS15_SW7,  CS14_SW7,  CS13_SW7   },  // 22 5
+    {0, CS15_SW8,  CS14_SW8,  CS13_SW8   },  // 23 6
+    {0, CS15_SW9,  CS14_SW9,  CS13_SW9   },  // 24 7
+    {0, CS15_SW10, CS14_SW10, CS13_SW10  },  // 25 8
+    {0, CS15_SW11, CS14_SW11, CS13_SW11  },  // 26 9
+    {0, CS15_SW12, CS14_SW12, CS13_SW12  },  // 27 0
+    {1, CS15_SW1,  CS14_SW1,  CS13_SW1   },  // 28 -_
+    {1, CS15_SW2,  CS14_SW2,  CS13_SW2   },  // 29 =+
+    {1, CS15_SW3,  CS14_SW3,  CS13_SW3   },  // 30 BSPC
+    {1, CS15_SW4,  CS14_SW4,  CS13_SW4   },  // 31 INS
+    {1, CS15_SW5,  CS14_SW5,  CS13_SW5   },  // 32 HOME
+    {1, CS15_SW6,  CS14_SW6,  CS13_SW6   },  // 33 PGUP
+
+    {0, CS12_SW2,  CS11_SW2,  CS10_SW2   },  // 34 Tab
+    {0, CS12_SW3,  CS11_SW3,  CS10_SW3   },  // 35 Q
+    {0, CS12_SW4,  CS11_SW4,  CS10_SW4   },  // 36 W
+    {0, CS12_SW5,  CS11_SW5,  CS10_SW5   },  // 37 E
+    {0, CS12_SW6,  CS11_SW6,  CS10_SW6   },  // 38 R
+    {0, CS12_SW7,  CS11_SW7,  CS10_SW7   },  // 39 T
+    {0, CS12_SW8,  CS11_SW8,  CS10_SW8   },  // 40 Y
+    {0, CS12_SW9,  CS11_SW9,  CS10_SW9   },  // 41 U
+    {0, CS12_SW10, CS11_SW10, CS10_SW10  },  // 42 I
+    {0, CS12_SW11, CS11_SW11, CS10_SW11  },  // 43 O
+    {0, CS12_SW12, CS11_SW12, CS10_SW12  },  // 44 P
+    {1, CS12_SW1,  CS11_SW1,  CS10_SW1   },  // 45 [{
+    {1, CS12_SW2,  CS11_SW2,  CS10_SW2   },  // 48 ]}
+    {1, CS12_SW3,  CS11_SW3,  CS10_SW3   },  // 47 \|
+    {1, CS12_SW4,  CS11_SW4,  CS10_SW4   },  // 48 Del
+    {1, CS12_SW5,  CS11_SW5,  CS10_SW5   },  // 49 End
+    {1, CS12_SW6,  CS11_SW6,  CS10_SW6   },  // 50 PGDN
+
+    {0, CS1_SW2,   CS2_SW2,   CS3_SW2    },  // 51 Caps
+    {0, CS1_SW3,   CS2_SW3,   CS3_SW3    },  // 52 A
+    {0, CS1_SW4,   CS2_SW4,   CS3_SW4    },  // 33 S
+    {0, CS1_SW5,   CS2_SW5,   CS3_SW5    },  // 54 D
+    {0, CS1_SW6,   CS2_SW6,   CS3_SW6    },  // 55 F
+    {0, CS1_SW7,   CS2_SW7,   CS3_SW7    },  // 56 G
+    {0, CS1_SW8,   CS2_SW8,   CS3_SW8    },  // 57 H
+    {0, CS1_SW9,   CS2_SW9,   CS3_SW9    },  // 58 J
+    {0, CS1_SW10,  CS2_SW10,  CS3_SW10   },  // 59 K
+    {0, CS1_SW11,  CS2_SW11,  CS3_SW11   },  // 60 L
+    {0, CS1_SW12,  CS2_SW12,  CS3_SW12   },  // 61 ;:
+    {1, CS1_SW1,   CS2_SW1,   CS3_SW1    },  // 62 '
+    {1, CS1_SW3,   CS2_SW3,   CS3_SW3    },  // 63 Enter
+
+    {0, CS4_SW2,   CS5_SW2,   CS6_SW2    },  // 64 Shift
+    {0, CS4_SW4,   CS5_SW4,   CS6_SW4    },  // 65 Z
+    {0, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 66 X
+    {0, CS4_SW6,   CS5_SW6,   CS6_SW6    },  // 67 C
+    {0, CS4_SW7,   CS5_SW7,   CS6_SW7    },  // 68 V
+    {0, CS4_SW8,   CS5_SW8,   CS6_SW8    },  // 69 B
+    {0, CS4_SW9,   CS5_SW9,   CS6_SW9    },  // 70 N
+    {0, CS4_SW10,  CS5_SW10,  CS6_SW10   },  // 71 M
+    {0, CS4_SW11,  CS5_SW11,  CS6_SW11   },  // 72 ,<
+    {0, CS4_SW12,  CS5_SW12,  CS6_SW12   },  // 73 .>
+    {1, CS4_SW1,   CS5_SW1,   CS6_SW1    },  // 74 ?
+    {1, CS4_SW3,   CS5_SW3,   CS6_SW3    },  // 75 Shift
+    {1, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 76 Up
+
+    {0, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 77 Ctrl_L
+    {0, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 78 Win_L
+    {0, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 79 ALT_L
+    {0, CS7_SW8,   CS8_SW8,   CS9_SW8    },  // 80 SPACE
+    {0, CS7_SW12,  CS8_SW12,  CS9_SW12   },  // 81 ALT_L
+    {1, CS7_SW1,   CS8_SW1,   CS9_SW1    },  // 82 Win_L
+    {1, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 83 Fn
+    {1, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 84 Ctrl_L
+    {1, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 85 Left
+    {1, CS7_SW5,   CS8_SW5,   CS9_SW5    },  // 86 Down
+    {1, CS7_SW6,   CS8_SW6,   CS9_SW6    },  // 87 Right
+};
diff --git a/keyboards/moky/moky88/readme.md b/keyboards/moky/moky88/readme.md
new file mode 100644
index 00000000000..62dc876eb2c
--- /dev/null
+++ b/keyboards/moky/moky88/readme.md
@@ -0,0 +1,26 @@
+# moky88
+![moky/moky88](https://i.imgur.com/lssV4bq.png)
+
+An in-switch RGB LED keyboard with RGB underglow.
+
+* Keyboard Maintainer: [Vertor](https://github.com/VertorWang)
+* Hardware Supported: moky88
+* Hardware Availability: Private GB 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make moky/moky88:default
+
+Flashing example for this keyboard:
+
+    make moky/moky88: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 `QK_BOOT` if it is available
diff --git a/keyboards/moky/moky88/rules.mk b/keyboards/moky/moky88/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/moky/moky88/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/momokai/aurora/config.h b/keyboards/momokai/aurora/config.h
deleted file mode 100644
index 8fd619bdbf2..00000000000
--- a/keyboards/momokai/aurora/config.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2023 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/*
- * 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 RGB_MATRIX_LED_COUNT 6
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    // 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_SOLID_COLOR
-    // #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
-    // #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
diff --git a/keyboards/momokai/aurora/info.json b/keyboards/momokai/aurora/info.json
index 1a04cadff2b..888398aa363 100644
--- a/keyboards/momokai/aurora/info.json
+++ b/keyboards/momokai/aurora/info.json
@@ -43,6 +43,34 @@
         "pin": "C7"
     },
     "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_spiral": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_nexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
         "driver": "ws2812",
         "layout": [
             { "flags": 4, "matrix": [2, 0], "x": 51, "y": 51 },
@@ -51,7 +79,9 @@
             { "flags": 4, "matrix": [2, 1], "x": 102, "y": 51 },
             { "flags": 4, "matrix": [2, 2], "x": 154, "y": 51 },
             { "flags": 4, "matrix": [1, 2], "x": 154, "y": 38 }
-        ]
+        ],
+        "max_brightness": 200,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/momokai/aurora/readme.md b/keyboards/momokai/aurora/readme.md
index e8ab8f141b6..0368b21f867 100644
--- a/keyboards/momokai/aurora/readme.md
+++ b/keyboards/momokai/aurora/readme.md
@@ -1,12 +1,14 @@
 # Momokai Aurora
 
+![Momokai Aurora](https://i.imgur.com/A7iHqzAh.jpg)
+
 https://www.momokai.com/pages/aurora
 
 A 6 key keypad with a rotary encoder
 
 * Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
 * Hardware Supported: Aurora
-* Hardware Availability: [Momokai](https://www.momokai.com/)
+* Hardware Availability: [Momokai](https://www.momokai.com/pages/aurora)
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/momokai/tap_duo/config.h b/keyboards/momokai/tap_duo/config.h
index 153f6116908..1e3d24282d6 100644
--- a/keyboards/momokai/tap_duo/config.h
+++ b/keyboards/momokai/tap_duo/config.h
@@ -27,64 +27,3 @@
 #define MOUSEKEY_WHEEL_INTERVAL 80
 #define MOUSEKEY_WHEEL_MAX_SPEED  8
 #define MOUSEKEY_WHEEL_TIME_TO_MAX  40
-
-
-//TODO: implement RGB Matrix
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 4
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    // 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_SOLID_COLOR
-    // #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
-    // #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
diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json
index 262576b31a3..9a0a9a2e1d1 100644
--- a/keyboards/momokai/tap_duo/info.json
+++ b/keyboards/momokai/tap_duo/info.json
@@ -12,7 +12,34 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["E6", "B2", "D1", "D2", "D3"],
@@ -36,5 +63,4 @@
             ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/momokai/tap_trio/config.h b/keyboards/momokai/tap_trio/config.h
deleted file mode 100644
index a4a21d3f24e..00000000000
--- a/keyboards/momokai/tap_trio/config.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2022 Momokai
- *
- * 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
-
-//TODO: implement RGB Matrix
-// #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 5
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    // 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_SOLID_COLOR
-    // #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
-    // #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
diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json
index afc5aa20158..f995501969c 100644
--- a/keyboards/momokai/tap_trio/info.json
+++ b/keyboards/momokai/tap_trio/info.json
@@ -12,7 +12,34 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["E6", "B2", "B7", "D1", "D2", "D3"],
@@ -34,5 +61,4 @@
             ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/mnk1800s/config.h b/keyboards/monokei/mnk1800s/config.h
similarity index 100%
rename from keyboards/mnk1800s/config.h
rename to keyboards/monokei/mnk1800s/config.h
diff --git a/keyboards/mnk1800s/info.json b/keyboards/monokei/mnk1800s/info.json
similarity index 100%
rename from keyboards/mnk1800s/info.json
rename to keyboards/monokei/mnk1800s/info.json
diff --git a/keyboards/mnk1800s/keymaps/default/keymap.c b/keyboards/monokei/mnk1800s/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mnk1800s/keymaps/default/keymap.c
rename to keyboards/monokei/mnk1800s/keymaps/default/keymap.c
diff --git a/keyboards/mnk1800s/keymaps/default/readme.md b/keyboards/monokei/mnk1800s/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mnk1800s/keymaps/default/readme.md
rename to keyboards/monokei/mnk1800s/keymaps/default/readme.md
diff --git a/keyboards/mnk1800s/keymaps/default_2u_bs/keymap.c b/keyboards/monokei/mnk1800s/keymaps/default_2u_bs/keymap.c
similarity index 100%
rename from keyboards/mnk1800s/keymaps/default_2u_bs/keymap.c
rename to keyboards/monokei/mnk1800s/keymaps/default_2u_bs/keymap.c
diff --git a/keyboards/mnk1800s/keymaps/via/keymap.c b/keyboards/monokei/mnk1800s/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mnk1800s/keymaps/via/keymap.c
rename to keyboards/monokei/mnk1800s/keymaps/via/keymap.c
diff --git a/keyboards/mnk1800s/keymaps/via/readme.md b/keyboards/monokei/mnk1800s/keymaps/via/readme.md
similarity index 100%
rename from keyboards/mnk1800s/keymaps/via/readme.md
rename to keyboards/monokei/mnk1800s/keymaps/via/readme.md
diff --git a/keyboards/monokei/mnk1800s/keymaps/via/rules.mk b/keyboards/monokei/mnk1800s/keymaps/via/rules.mk
new file mode 100755
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/monokei/mnk1800s/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mnk1800s/matrix_diagram.md b/keyboards/monokei/mnk1800s/matrix_diagram.md
similarity index 100%
rename from keyboards/mnk1800s/matrix_diagram.md
rename to keyboards/monokei/mnk1800s/matrix_diagram.md
diff --git a/keyboards/monokei/mnk1800s/readme.md b/keyboards/monokei/mnk1800s/readme.md
new file mode 100755
index 00000000000..610baba72bc
--- /dev/null
+++ b/keyboards/monokei/mnk1800s/readme.md
@@ -0,0 +1,32 @@
+# MNK1800s
+
+This is a southpaw 65% keyboard. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A TKL keyboard with STM32F072CB
+* Hardware Availability: https://www.monokei.co
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make monokei/mnk1800s: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 monokei/mnk1800s:<keymap>:flash`)
diff --git a/keyboards/mnk1800s/rules.mk b/keyboards/monokei/mnk1800s/rules.mk
similarity index 100%
rename from keyboards/mnk1800s/rules.mk
rename to keyboards/monokei/mnk1800s/rules.mk
diff --git a/keyboards/mnk50/config.h b/keyboards/monokei/mnk50/config.h
similarity index 100%
rename from keyboards/mnk50/config.h
rename to keyboards/monokei/mnk50/config.h
diff --git a/keyboards/mnk50/info.json b/keyboards/monokei/mnk50/info.json
similarity index 100%
rename from keyboards/mnk50/info.json
rename to keyboards/monokei/mnk50/info.json
diff --git a/keyboards/mnk50/keymaps/default/keymap.c b/keyboards/monokei/mnk50/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mnk50/keymaps/default/keymap.c
rename to keyboards/monokei/mnk50/keymaps/default/keymap.c
diff --git a/keyboards/mnk50/keymaps/default/readme.md b/keyboards/monokei/mnk50/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mnk50/keymaps/default/readme.md
rename to keyboards/monokei/mnk50/keymaps/default/readme.md
diff --git a/keyboards/mnk50/keymaps/via/keymap.c b/keyboards/monokei/mnk50/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mnk50/keymaps/via/keymap.c
rename to keyboards/monokei/mnk50/keymaps/via/keymap.c
diff --git a/keyboards/mnk50/keymaps/via/readme.md b/keyboards/monokei/mnk50/keymaps/via/readme.md
similarity index 100%
rename from keyboards/mnk50/keymaps/via/readme.md
rename to keyboards/monokei/mnk50/keymaps/via/readme.md
diff --git a/keyboards/monokei/mnk50/keymaps/via/rules.mk b/keyboards/monokei/mnk50/keymaps/via/rules.mk
new file mode 100755
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/monokei/mnk50/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/monokei/mnk50/readme.md b/keyboards/monokei/mnk50/readme.md
new file mode 100755
index 00000000000..ebbe44378b7
--- /dev/null
+++ b/keyboards/monokei/mnk50/readme.md
@@ -0,0 +1,32 @@
+# MNK40
+
+This is a 40% keyboard. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 40% keyboard with STM32F072CB
+* Hardware Availability: https://www.monokei.co
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make monokei/mnk50: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 monokei/mnk50:<keymap>:flash`)
diff --git a/keyboards/mnk50/rules.mk b/keyboards/monokei/mnk50/rules.mk
similarity index 100%
rename from keyboards/mnk50/rules.mk
rename to keyboards/monokei/mnk50/rules.mk
diff --git a/keyboards/mnk75/config.h b/keyboards/monokei/mnk75/config.h
similarity index 100%
rename from keyboards/mnk75/config.h
rename to keyboards/monokei/mnk75/config.h
diff --git a/keyboards/mnk75/info.json b/keyboards/monokei/mnk75/info.json
similarity index 100%
rename from keyboards/mnk75/info.json
rename to keyboards/monokei/mnk75/info.json
diff --git a/keyboards/mnk75/keymaps/default/keymap.c b/keyboards/monokei/mnk75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mnk75/keymaps/default/keymap.c
rename to keyboards/monokei/mnk75/keymaps/default/keymap.c
diff --git a/keyboards/mnk75/keymaps/default/readme.md b/keyboards/monokei/mnk75/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mnk75/keymaps/default/readme.md
rename to keyboards/monokei/mnk75/keymaps/default/readme.md
diff --git a/keyboards/mnk75/keymaps/via/keymap.c b/keyboards/monokei/mnk75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mnk75/keymaps/via/keymap.c
rename to keyboards/monokei/mnk75/keymaps/via/keymap.c
diff --git a/keyboards/mnk75/keymaps/via/readme.md b/keyboards/monokei/mnk75/keymaps/via/readme.md
similarity index 100%
rename from keyboards/mnk75/keymaps/via/readme.md
rename to keyboards/monokei/mnk75/keymaps/via/readme.md
diff --git a/keyboards/monokei/mnk75/keymaps/via/rules.mk b/keyboards/monokei/mnk75/keymaps/via/rules.mk
new file mode 100755
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/monokei/mnk75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mnk75/matrix_diagram.md b/keyboards/monokei/mnk75/matrix_diagram.md
similarity index 100%
rename from keyboards/mnk75/matrix_diagram.md
rename to keyboards/monokei/mnk75/matrix_diagram.md
diff --git a/keyboards/monokei/mnk75/readme.md b/keyboards/monokei/mnk75/readme.md
new file mode 100755
index 00000000000..4e34f5257f7
--- /dev/null
+++ b/keyboards/monokei/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 monokei/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 monokei/mnk75:<keymap>:flash`)
diff --git a/keyboards/mnk75/rules.mk b/keyboards/monokei/mnk75/rules.mk
similarity index 100%
rename from keyboards/mnk75/rules.mk
rename to keyboards/monokei/mnk75/rules.mk
diff --git a/keyboards/monsgeek/m1/config.h b/keyboards/monsgeek/m1/config.h
index 3963f1fbaec..4aa60123309 100644
--- a/keyboards/monsgeek/m1/config.h
+++ b/keyboards/monsgeek/m1/config.h
@@ -35,15 +35,8 @@
 /* I2C Config for LED Driver */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
+
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define DRIVER_1_LED_TOTAL 63
-#define DRIVER_2_LED_TOTAL 21
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + 22)
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/monsgeek/m1/info.json b/keyboards/monsgeek/m1/info.json
index 23d3d714c68..5d5d030214c 100644
--- a/keyboards/monsgeek/m1/info.json
+++ b/keyboards/monsgeek/m1/info.json
@@ -178,7 +178,9 @@
             { "flags": 2, "x":224, "y":51},
             { "flags": 2, "x":224, "y":57},
             { "flags": 2, "x":224, "y":64}
-        ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/monsgeek/m1/m1.c b/keyboards/monsgeek/m1/m1.c
index b85adbc0bf9..006eb66d7f9 100644
--- a/keyboards/monsgeek/m1/m1.c
+++ b/keyboards/monsgeek/m1/m1.c
@@ -17,128 +17,128 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
 
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, A_15,  B_15,  C_15},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, A_16,  B_16,  C_16},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
 
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
-    {1, G_7,   H_7,   I_7},
-    {1, G_8,   H_8,   I_8},
-    {1, G_9,   H_9,   I_9},
-    {1, G_10,  H_10,  I_10},
-    {1, G_11,  H_11,  I_11},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {1, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {1, CB7_CA11,  CB8_CA11,  CB9_CA11},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
-    {1, J_6,   K_6,   L_6},
-    {1, J_7,   K_7,   L_7},
-    {1, J_8,   K_8,   L_8},
-    {1, J_9,   K_9,   L_9},
-    {1, J_10,  K_10,  L_10},
-    {1, J_11,  K_11,  L_11},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {1, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {1, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {1, CB10_CA11,  CB11_CA11,  CB12_CA11},
 };
 
 // clang-format on
diff --git a/keyboards/monsgeek/m3/config.h b/keyboards/monsgeek/m3/config.h
index 02c0fc6abc6..ba77115d40f 100644
--- a/keyboards/monsgeek/m3/config.h
+++ b/keyboards/monsgeek/m3/config.h
@@ -37,12 +37,8 @@
 /* I2C Config for LED Driver */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
+
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define RGB_MATRIX_LED_COUNT   87
-
 #define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/monsgeek/m3/info.json b/keyboards/monsgeek/m3/info.json
index df99a6a22c4..09ce11c4476 100644
--- a/keyboards/monsgeek/m3/info.json
+++ b/keyboards/monsgeek/m3/info.json
@@ -152,7 +152,8 @@
             { "flags": 4, "matrix": [5, 14], "x":196, "y": 64},
             { "flags": 4, "matrix": [5, 15], "x":210, "y": 64},
             { "flags": 4, "matrix": [5, 16], "x":224, "y": 64}
-        ]
+        ],
+        "sleep": true
     },
     "community_layouts": ["tkl_ansi"],
     "layouts": {
diff --git a/keyboards/monsgeek/m3/m3.c b/keyboards/monsgeek/m3/m3.c
index b7e197e6ace..9a93a7d7d4e 100644
--- a/keyboards/monsgeek/m3/m3.c
+++ b/keyboards/monsgeek/m3/m3.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,    E_1,   F_1},
-    {1, D_2,    E_2,   F_2},
-    {1, D_3,    E_3,   F_3},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,    CB5_CA1,   CB6_CA1},
+    {1, CB4_CA2,    CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,    CB5_CA3,   CB6_CA3},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
 };
 #endif // RGB_MATRIX_ENABLE
 
diff --git a/keyboards/monsgeek/m5/config.h b/keyboards/monsgeek/m5/config.h
index 20c69b34f14..d18d1fdacdc 100644
--- a/keyboards/monsgeek/m5/config.h
+++ b/keyboards/monsgeek/m5/config.h
@@ -36,14 +36,9 @@
 /* I2C Config for LED Driver */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
+
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 #define I2C1_SCL_PAL_MODE 4
 
-#define RGB_MATRIX_LED_COUNT 108
-
 #define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/monsgeek/m5/info.json b/keyboards/monsgeek/m5/info.json
index e4ecba91ce2..77d474d5db2 100644
--- a/keyboards/monsgeek/m5/info.json
+++ b/keyboards/monsgeek/m5/info.json
@@ -176,7 +176,9 @@
             { "flags": 4, "matrix": [5, 16], "x": 176, "y": 64 },
             { "flags": 4, "matrix": [5, 18], "x": 199, "y": 64 },
             { "flags": 4, "matrix": [5, 19], "x": 214, "y": 64 }
-    ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/monsgeek/m5/m5.c b/keyboards/monsgeek/m5/m5.c
index 83dd4b6b79e..822214a05ca 100644
--- a/keyboards/monsgeek/m5/m5.c
+++ b/keyboards/monsgeek/m5/m5.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
@@ -25,125 +25,125 @@ const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
-    {1, D_11,  E_11,  F_11},
-    {1, D_12,  E_12,  F_12},
-    {1, D_13,  E_13,  F_13},
-    {1, D_14,  E_14,  F_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {1, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {1, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {1, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {1, CB4_CA14,  CB5_CA14,  CB6_CA14},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1 },
-    {1, D_2,   E_2,   F_2},
-    {1, D_3,   E_3,   F_3},
-    {1, D_4,   E_4,   F_4},
-    {1, D_5,   E_5,   F_5},
-    {1, D_6,   E_6,   F_6},
-    {1, D_7,   E_7,   F_7},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1 },
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, D_8,   E_8,   F_8},
-    {1, D_9,   E_9,   F_9},
-    {1, D_10,  E_10,  F_10},
-    {1, G_7,   H_7,   I_7},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {1, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {1, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
 
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
-    {1,  J_7,   K_7,  L_7},
-    {1,  J_8,   K_8,  L_8},
-    {1,  J_9,   K_9,  L_9},
-    {1,  J_10,  K_10, L_10},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
+    {1,  CB10_CA7,   CB11_CA7,  CB12_CA7},
+    {1,  CB10_CA8,   CB11_CA8,  CB12_CA8},
+    {1,  CB10_CA9,   CB11_CA9,  CB12_CA9},
+    {1,  CB10_CA10,  CB11_CA10, CB12_CA10},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
-    {1,  J_5,   K_5,  L_5},
-    {1,  J_6,   K_6,  L_6},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
+    {1,  CB10_CA5,   CB11_CA5,  CB12_CA5},
+    {1,  CB10_CA6,   CB11_CA6,  CB12_CA6},
 
 };
 #endif
diff --git a/keyboards/monsgeek/m6/config.h b/keyboards/monsgeek/m6/config.h
index f01b8abb681..3586c2cb466 100644
--- a/keyboards/monsgeek/m6/config.h
+++ b/keyboards/monsgeek/m6/config.h
@@ -33,14 +33,9 @@
 /* I2C Config for LED Driver */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
+
 #define I2C1_SCL_PAL_MODE 4
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 
-#define RGB_MATRIX_LED_COUNT 92
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_TRIGGER_ON_KEYDOWN
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/monsgeek/m6/info.json b/keyboards/monsgeek/m6/info.json
index 3ec89cc497d..7931d0d1224 100644
--- a/keyboards/monsgeek/m6/info.json
+++ b/keyboards/monsgeek/m6/info.json
@@ -157,7 +157,9 @@
             { "flags": 2, "x":224, "y":51},
             { "flags": 2, "x":224, "y":57},
             { "flags": 2, "x":224, "y":64}
-        ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true,
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/monsgeek/m6/m6.c b/keyboards/monsgeek/m6/m6.c
index dc20a9916f2..ef7fc92015f 100644
--- a/keyboards/monsgeek/m6/m6.c
+++ b/keyboards/monsgeek/m6/m6.c
@@ -17,112 +17,112 @@
 #include "quantum.h"
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, A_15,  B_15,  C_15},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, A_16,  B_16,  C_16},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
-    {1, G_7,   H_7,   I_7},
-    {1, G_8,   H_8,   I_8},
-    {1, G_9,   H_9,   I_9},
-    {1, G_10,  H_10,  I_10},
-    {1, G_11,  H_11,  I_11},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {1, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {1, CB7_CA11,  CB8_CA11,  CB9_CA11},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
-    {1, J_6,   K_6,   L_6},
-    {1, J_7,   K_7,   L_7},
-    {1, J_8,   K_8,   L_8},
-    {1, J_9,   K_9,   L_9},
-    {1, J_10,  K_10,  L_10},
-    {1, J_11,  K_11,  L_11},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {1, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {1, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {1, CB10_CA11,  CB11_CA11,  CB12_CA11},
 };
 
 // clang-format on
diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h
index 770c20f0194..e32abb6630c 100644
--- a/keyboards/monstargear/xo87/rgb/config.h
+++ b/keyboards/monstargear/xo87/rgb/config.h
@@ -16,60 +16,5 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 110
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100 // limits maximum brightness of LEDs to 100 out of 255.
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// 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
-#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 LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/info.json
index 96b0319945c..c96111b0f29 100644
--- a/keyboards/monstargear/xo87/rgb/info.json
+++ b/keyboards/monstargear/xo87/rgb/info.json
@@ -12,7 +12,54 @@
     "pin": "D7"
   },
   "rgb_matrix": {
-    "driver": "ws2812"
+    "animations": {
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_val": true,
+      "band_pinwheel_sat": true,
+      "band_pinwheel_val": true,
+      "band_spiral_sat": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true,
+      "solid_multisplash": true
+    },
+    "driver": "ws2812",
+    "max_brightness": 100,
+    "sleep": true
   },
   "rgblight": {
     "max_brightness": 100
diff --git a/keyboards/monstargear/xo87/rgb/keymaps/default/config.h b/keyboards/monstargear/xo87/rgb/keymaps/default/config.h
deleted file mode 100644
index 910a014d797..00000000000
--- a/keyboards/monstargear/xo87/rgb/keymaps/default/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 datafx
- *
- * 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
\ No newline at end of file
diff --git a/keyboards/monstargear/xo87/solderable/solderable.h b/keyboards/monstargear/xo87/solderable/solderable.h
index 2758a3a3ffc..70e8a6c8d5e 100644
--- a/keyboards/monstargear/xo87/solderable/solderable.h
+++ b/keyboards/monstargear/xo87/solderable/solderable.h
@@ -43,11 +43,11 @@ typedef struct{
 
 rgb_;
 #define colorAGSize 10
-#define colorBGSize RGBLED_NUM-10
+#define colorBGSize RGBLIGHT_LED_COUNT-10
 
 typedef struct{
 	rgb_ colorAG[colorAGSize];
-    rgb_ colorBG[RGBLED_NUM-10];
+    rgb_ colorBG[RGBLIGHT_LED_COUNT-10];
 }
 
 backLedRgbG_;
diff --git a/keyboards/montsinger/rebound/rev1/rules.mk b/keyboards/montsinger/rebound/rev1/rules.mk
index fc1633fe637..309e55c9f4c 100644
--- a/keyboards/montsinger/rebound/rev1/rules.mk
+++ b/keyboards/montsinger/rebound/rev1/rules.mk
@@ -10,5 +10,3 @@ 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_HAS_RGB = no
diff --git a/keyboards/montsinger/rebound/rev2/rules.mk b/keyboards/montsinger/rebound/rev2/rules.mk
index 02bef78ce31..f957b56f253 100644
--- a/keyboards/montsinger/rebound/rev2/rules.mk
+++ b/keyboards/montsinger/rebound/rev2/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/montsinger/rebound/rev3/rules.mk b/keyboards/montsinger/rebound/rev3/rules.mk
index 02bef78ce31..f957b56f253 100644
--- a/keyboards/montsinger/rebound/rev3/rules.mk
+++ b/keyboards/montsinger/rebound/rev3/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk
index f52c1697f78..0fc2e835d76 100644
--- a/keyboards/montsinger/rebound/rev4/rules.mk
+++ b/keyboards/montsinger/rebound/rev4/rules.mk
@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
-LAYOUTS_HAS_RGB = no
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = yes
 AUDIO_SUPPORTED = no
diff --git a/keyboards/moondrop/dash75/info.json b/keyboards/moondrop/dash75/info.json
index 13e28fb3254..59f956815ea 100644
--- a/keyboards/moondrop/dash75/info.json
+++ b/keyboards/moondrop/dash75/info.json
@@ -3,14 +3,16 @@
     "keyboard_name": "Dash 75",
     "maintainer": "vinorodrigues",
     "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
     "features": {
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false,
-        "lto": true
+        "nkro": false
     },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
diff --git a/keyboards/moondrop/dash75/keymaps/via/keymap.json b/keyboards/moondrop/dash75/keymaps/via/keymap.json
index d811aaa7803..91faa45808c 100644
--- a/keyboards/moondrop/dash75/keymaps/via/keymap.json
+++ b/keyboards/moondrop/dash75/keymaps/via/keymap.json
@@ -7,8 +7,7 @@
     "author": "vinorodrigues",
     "config": {
         "features": {
-            "via": true,
-            "lto": true
+            "via": true
         }
     },
     "layers": [
diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h
deleted file mode 100644
index 3ceb45f54dc..00000000000
--- a/keyboards/moonlander/config.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright 2020 ZSA Technology Labs, Inc <@zsa>
- * Copyright 2020 Jack Humbert <jack.humb@gmail.com>
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.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 WEBUSB_LANDING_PAGE_URL u8"configure.ergodox-ez.com"
-
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 7
-
-/*  PCB default pin-out */
-// #define MATRIX_ROW_PINS { B10, B11, B12, B13, B14, B15 }
-// #define MATRIX_COL_PINS { A0, A1, A2, A3, A6, A7, B0 }
-
-// #define MCP23_ROW_PINS { GPB5, GBP4, GBP3, GBP2, GBP1, GBP0 }
-// #define MCP23_COL_PINS { GPA0, GBA1, GBA2, GBA3, GBA4, GBA5, GBA6 }
-
-// #define MCP23_LED_R GPB7
-// #define MCP23_LED_G GPB6
-// #define MCP23_LED_B GPA7
-
-#define EEPROM_I2C_24LC128
-
-// Not needed, is default address:
-// #define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10100000
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* 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
-
-/*
- * 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 IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-
-#define DRIVER_1_LED_TOTAL 36
-#define DRIVER_2_LED_TOTAL 36
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#define RGB_MATRIX_CENTER { 120, 36 }
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-#    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_LED_PROCESS_LIMIT 5
-// #define RGB_MATRIX_LED_FLUSH_LIMIT 26
-
-#define MOUSEKEY_INTERVAL           20
-#define MOUSEKEY_DELAY              0
-#define MOUSEKEY_TIME_TO_MAX        60
-#define MOUSEKEY_MAX_SPEED          7
-#define MOUSEKEY_WHEEL_DELAY        400
-#define MOUSEKEY_WHEEL_INTERVAL     MOUSEKEY_INTERVAL
-#define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
-
-#define MUSIC_MAP
-
-#define FIRMWARE_VERSION_SIZE 17
-#define DYNAMIC_KEYMAP_EEPROM_ADDR (EECONFIG_SIZE + FIRMWARE_VERSION_SIZE)
-
-#define AUDIO_PIN A5
-#define AUDIO_PIN_ALT A4
-#define AUDIO_PIN_ALT_AS_NEGATIVE
diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json
deleted file mode 100644
index 1a7982ed571..00000000000
--- a/keyboards/moonlander/info.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-    "keyboard_name": "Moonlander Mark I",
-    "manufacturer": "ZSA Technology Labs",
-    "url": "zsa.io/moonlander",
-    "maintainer": "ZSA via Drashna",
-    "usb": {
-        "vid": "0x3297",
-        "pid": "0x1969",
-        "device_version": "0.0.1"
-    },
-    "dynamic_keymap": {
-        "layer_count": 8
-    },
-    "eeprom": {
-        "driver": "i2c"
-    },
-    "rgb_matrix": {
-        "driver": "is31fl3731"
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_moonlander": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.25},
-
-                {"matrix": [6, 0], "x": 10, "y": 0.25},
-                {"matrix": [6, 1], "x": 11, "y": 0.25},
-                {"matrix": [6, 2], "x": 12, "y": 0.125},
-                {"matrix": [6, 3], "x": 13, "y": 0},
-                {"matrix": [6, 4], "x": 14, "y": 0.125},
-                {"matrix": [6, 5], "x": 15, "y": 0.375},
-                {"matrix": [6, 6], "x": 16, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-
-                {"matrix": [7, 0], "x": 10, "y": 1.25},
-                {"matrix": [7, 1], "x": 11, "y": 1.25},
-                {"matrix": [7, 2], "x": 12, "y": 1.125},
-                {"matrix": [7, 3], "x": 13, "y": 1},
-                {"matrix": [7, 4], "x": 14, "y": 1.125},
-                {"matrix": [7, 5], "x": 15, "y": 1.375},
-                {"matrix": [7, 6], "x": 16, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.25},
-
-                {"matrix": [8, 0], "x": 10, "y": 2.25},
-                {"matrix": [8, 1], "x": 11, "y": 2.25},
-                {"matrix": [8, 2], "x": 12, "y": 2.125},
-                {"matrix": [8, 3], "x": 13, "y": 2},
-                {"matrix": [8, 4], "x": 14, "y": 2.125},
-                {"matrix": [8, 5], "x": 15, "y": 2.375},
-                {"matrix": [8, 6], "x": 16, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-
-                {"matrix": [9, 1], "x": 11, "y": 3.25},
-                {"matrix": [9, 2], "x": 12, "y": 3.125},
-                {"matrix": [9, 3], "x": 13, "y": 3},
-                {"matrix": [9, 4], "x": 14, "y": 3.125},
-                {"matrix": [9, 5], "x": 15, "y": 3.375},
-                {"matrix": [9, 6], "x": 16, "y": 3.375},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.375},
-                {"matrix": [4, 1], "x": 1, "y": 4.375},
-                {"matrix": [4, 2], "x": 2, "y": 4.125},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4.125},
-                {"matrix": [5, 3], "x": 5, "y": 4.5, "w": 2},
-
-                {"matrix": [11, 3], "x": 10, "y": 4.5, "w": 2},
-                {"matrix": [10, 2], "x": 12, "y": 4.125},
-                {"matrix": [10, 3], "x": 13, "y": 4},
-                {"matrix": [10, 4], "x": 14, "y": 4.125},
-                {"matrix": [10, 5], "x": 15, "y": 4.375},
-                {"matrix": [10, 6], "x": 16, "y": 4.375},
-
-                {"matrix": [5, 0], "x": 5, "y": 5.5, "h": 1.5},
-                {"matrix": [5, 1], "x": 6, "y": 5.5, "h": 1.5},
-                {"matrix": [5, 2], "x": 7, "y": 5.5, "h": 1.5},
-
-                {"matrix": [11, 4], "x": 9, "y": 5.5, "h": 1.5},
-                {"matrix": [11, 5], "x": 10, "y": 5.5, "h": 1.5},
-                {"matrix": [11, 6], "x": 11, "y": 5.5, "h": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/moonlander/keymaps/shahn-neo/config.h b/keyboards/moonlander/keymaps/shahn-neo/config.h
deleted file mode 100644
index 1fbac325174..00000000000
--- a/keyboards/moonlander/keymaps/shahn-neo/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Sönke Hahn <SoenkeHahn@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 ORYX_CONFIGURATOR
diff --git a/keyboards/moonlander/keymaps/shahn-neo/keymap.c b/keyboards/moonlander/keymaps/shahn-neo/keymap.c
deleted file mode 100644
index fc174a62fee..00000000000
--- a/keyboards/moonlander/keymaps/shahn-neo/keymap.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2020 Sönke Hahn <SoenkeHahn@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
-#include "version.h"
-
-enum layers {
-    BASE,  // default layer
-    L_3,
-    L_4,
-};
-
-enum custom_keycodes {
-    a_umlaut = SAFE_RANGE,
-    o_umlaut,
-    u_umlaut,
-    eszett,
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BASE] = LAYOUT_moonlander(
-        XXXXXXX, KC_1    , KC_2    , KC_3    , KC_4   , KC_5   , XXXXXXX,    XXXXXXX, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , XXXXXXX,
-        KC_TAB , KC_X    , KC_V    , KC_L    , KC_C   , KC_W   , XXXXXXX,    XXXXXXX, KC_K   , KC_H   , KC_G   , KC_F   , KC_Q   , eszett ,
-        XXXXXXX, KC_U    , KC_I    , KC_A    , KC_E   , KC_O   , XXXXXXX,    XXXXXXX, KC_S   , KC_N   , KC_R   , KC_T   , KC_D   , KC_Y   ,
-        XXXXXXX, u_umlaut, o_umlaut, a_umlaut, KC_P   , KC_Z   ,                      KC_B   , KC_M   , KC_COMM, KC_DOT , KC_J   , XXXXXXX,
-        XXXXXXX, XXXXXXX , XXXXXXX , KC_LGUI , MO(L_4),          XXXXXXX,    XXXXXXX,          MO(L_4), KC_RGUI, XXXXXXX, XXXXXXX, XXXXXXX,
-                                               KC_LCTL, KC_LSFT, MO(L_3),    MO(L_3), KC_RSFT, KC_SPC
-    ),
-
-    [L_3] = LAYOUT_moonlander(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_UNDS, KC_LBRC, KC_RBRC, KC_CIRC, XXXXXXX,    XXXXXXX, KC_EXLM, KC_LABK, KC_RABK, KC_EQL , KC_AMPR, XXXXXXX,
-        XXXXXXX, KC_BSLS, KC_SLSH, KC_LCBR, KC_RCBR, KC_ASTR, XXXXXXX,    XXXXXXX, KC_QUES, KC_LPRN, KC_RPRN, KC_MINS, KC_COLN, KC_AT  ,
-        XXXXXXX, KC_HASH, KC_DLR , KC_PIPE, KC_TILD, KC_GRV ,                      KC_PLUS, KC_PERC, KC_DQUO, KC_QUOT, KC_SCLN, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,    XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                            XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    [L_4] = LAYOUT_moonlander(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_PGUP, KC_BSPC, KC_UP  , KC_DEL , KC_PGDN, XXXXXXX,    XXXXXXX, XXXXXXX, KC_7   , KC_8   , KC_9   , XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , XXXXXXX,    XXXXXXX, XXXXXXX, KC_4   , KC_5   , KC_6   , XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_ESC , KC_TAB , XXXXXXX, KC_ENT , XXXXXXX,                      XXXXXXX, KC_1   , KC_2   , KC_3   , XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,    XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                            XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, KC_0
-    ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    ML_LED_1(false);
-    ML_LED_2(false);
-    ML_LED_3(false);
-    ML_LED_4(false);
-    ML_LED_5(false);
-    ML_LED_6(false);
-
-    switch (get_highest_layer(state)) {
-        case 1:
-            ML_LED_1(1);
-            ML_LED_4(1);
-            break;
-        case 2:
-            ML_LED_2(1);
-            ML_LED_5(1);
-            break;
-        case 3:
-            ML_LED_3(1);
-            break;
-        case 4:
-            ML_LED_4(1);
-            break;
-        case 5:
-            ML_LED_5(1);
-            break;
-        case 6:
-            ML_LED_6(1);
-            break;
-        default:
-            break;
-    }
-
-    return state;
-}
-
-// only works after executing
-// $ xmodmap -e "keycode 138 = Multi_key"
-#define compose_key SS_TAP(X_MENU)
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-        case a_umlaut:
-            SEND_STRING(compose_key "\"a");
-            return false;
-        case o_umlaut:
-            SEND_STRING(compose_key "\"o");
-            return false;
-        case u_umlaut:
-            SEND_STRING(compose_key "\"u");
-            return false;
-        case eszett:
-            SEND_STRING(compose_key "ss");
-            return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/moonlander/keymaps/shahn-neo/readme.md b/keyboards/moonlander/keymaps/shahn-neo/readme.md
deleted file mode 100644
index d2c9c887469..00000000000
--- a/keyboards/moonlander/keymaps/shahn-neo/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Sönke Hahn's Neo layout for the Moonlander keyboard
-
-This is my personal keyboard layout based on the Neo keyboard layout:
-https://en.wikipedia.org/wiki/Neo_(keyboard_layout)
-This layout is not meant as a general layout for other people using the
-Neo keyboard layout. It's very specific to my personal needs.
-It still might be useful as inspiration to other people who want to
-create a Neo layout.
-
-Some notes:
-
-- I've put the ctrl key, the shift keys and the modifiers to switch to
-  layer 4 in the middle to be operated by the thumbs. I wanted to avoid
-  having to use my pinkies on the outer rows of the keyboard.
-- The umlauts (äöü) and the ß only work on linux when configuring the
-  compose key properly. See `compose_key` in `./keymap.c`.
diff --git a/keyboards/moonlander/matrix.c b/keyboards/moonlander/matrix.c
deleted file mode 100644
index 36017fcd122..00000000000
--- a/keyboards/moonlander/matrix.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Copyright 2020 ZSA Technology Labs, Inc <@zsa>
- * Copyright 2020 Jack Humbert <jack.humb@gmail.com>
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.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 "moonlander.h"
-#include "i2c_master.h"
-
-/*
-#define MATRIX_ROW_PINS { B10, B11, B12, B13, B14, B15 } outputs
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A6, A7, B0 }   inputs
- */
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
-extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
-static matrix_row_t raw_matrix_right[MATRIX_COLS];
-
-#define ROWS_PER_HAND (MATRIX_ROWS / 2)
-#ifndef MOONLANDER_I2C_TIMEOUT
-#    define MOONLANDER_I2C_TIMEOUT 100
-#endif
-
-extern bool mcp23018_leds[3];
-extern bool is_launching;
-
-bool           mcp23018_initd = false;
-static uint8_t mcp23018_reset_loop;
-
-uint8_t mcp23018_tx[3];
-uint8_t mcp23018_rx[1];
-
-void mcp23018_init(void) {
-    i2c_init();
-
-    // #define MCP23_ROW_PINS { GPB5, GBP4, GBP3, GBP2, GBP1, GBP0 }       outputs
-    // #define MCP23_COL_PINS { GPA0, GBA1, GBA2, GBA3, GBA4, GBA5, GBA6 } inputs
-
-    mcp23018_tx[0] = 0x00;        // IODIRA
-    mcp23018_tx[1] = 0b00000000;  // A is output
-    mcp23018_tx[2] = 0b00111111;  // B is inputs
-
-    if (MSG_OK != i2c_transmit(MCP23018_DEFAULT_ADDRESS << 1, mcp23018_tx, 3, MOONLANDER_I2C_TIMEOUT)) {
-        dprintf("error hori\n");
-    } else {
-        mcp23018_tx[0] = 0x0C;        // GPPUA
-        mcp23018_tx[1] = 0b10000000;  // A is not pulled-up
-        mcp23018_tx[2] = 0b11111111;  // B is pulled-up
-
-        if (MSG_OK != i2c_transmit(MCP23018_DEFAULT_ADDRESS << 1, mcp23018_tx, 3, MOONLANDER_I2C_TIMEOUT)) {
-            dprintf("error hori\n");
-        } else {
-            mcp23018_initd = is_launching = true;
-        }
-    }
-}
-
-void matrix_init_custom(void) {
-    dprintf("matrix init\n");
-    // debug_matrix = true;
-    // outputs
-    setPinOutput(B10);
-    setPinOutput(B11);
-    setPinOutput(B12);
-    setPinOutput(B13);
-    setPinOutput(B14);
-    setPinOutput(B15);
-
-    // inputs
-    setPinInputLow(A0);
-    setPinInputLow(A1);
-    setPinInputLow(A2);
-    setPinInputLow(A3);
-    setPinInputLow(A6);
-    setPinInputLow(A7);
-    setPinInputLow(B0);
-
-    mcp23018_init();
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool changed = false;
-
-    // Try to re-init right side
-    if (!mcp23018_initd) {
-        if (++mcp23018_reset_loop == 0) {
-            // if (++mcp23018_reset_loop >= 1300) {
-            // since mcp23018_reset_loop is 8 bit - we'll try to reset once in 255 matrix scans
-            // this will be approx bit more frequent than once per second
-            print("trying to reset mcp23018\n");
-            mcp23018_init();
-            if (!mcp23018_initd) {
-                print("right side not responding\n");
-            } else {
-                print("right side attached\n");
-#ifdef RGB_MATRIX_ENABLE
-                rgb_matrix_init();
-#endif
-            }
-        }
-    }
-
-    matrix_row_t data = 0;
-    // actual matrix
-    for (uint8_t row = 0; row <= ROWS_PER_HAND; row++) {
-        // strobe row
-        switch (row) {
-            case 0: writePinHigh(B10); break;
-            case 1: writePinHigh(B11); break;
-            case 2: writePinHigh(B12); break;
-            case 3: writePinHigh(B13); break;
-            case 4: writePinHigh(B14); break;
-            case 5: writePinHigh(B15); break;
-            case 6: break; // Left hand has 6 rows
-        }
-
-        // right side
-        if (mcp23018_initd) {
-            // #define MCP23_ROW_PINS { GPB5, GBP4, GBP3, GBP2, GBP1, GBP0 }       outputs
-            // #define MCP23_COL_PINS { GPA0, GBA1, GBA2, GBA3, GBA4, GBA5, GBA6 } inputs
-
-            // select row
-            mcp23018_tx[0] = 0x12;                                                                   // GPIOA
-            mcp23018_tx[1] = (0b01111111 & ~(1 << (row))) | ((uint8_t)!mcp23018_leds[2] << 7);       // activate row
-            mcp23018_tx[2] = ((uint8_t)!mcp23018_leds[1] << 6) | ((uint8_t)!mcp23018_leds[0] << 7);  // activate row
-
-            if (MSG_OK != i2c_transmit(MCP23018_DEFAULT_ADDRESS << 1, mcp23018_tx, 3, MOONLANDER_I2C_TIMEOUT)) {
-                dprintf("error hori\n");
-                mcp23018_initd = false;
-            }
-
-            // read col
-
-            mcp23018_tx[0] = 0x13;  // GPIOB
-            if (MSG_OK != i2c_readReg(MCP23018_DEFAULT_ADDRESS << 1, mcp23018_tx[0], &mcp23018_rx[0], 1, MOONLANDER_I2C_TIMEOUT)) {
-                dprintf("error vert\n");
-                mcp23018_initd = false;
-            }
-
-            data = ~(mcp23018_rx[0] & 0b00111111);
-            // data = 0x01;
-        } else {
-            data = 0;
-        }
-
-        if (raw_matrix_right[row] != data) {
-            raw_matrix_right[row] = data;
-            changed         = true;
-        }
-
-
-        // left side
-        if (row < ROWS_PER_HAND) {
-            // i2c comm incur enough wait time
-            if (!mcp23018_initd) {
-                // need wait to settle pin state
-                matrix_io_delay();
-            }
-            // read col data
-            data = (
-                (readPin(A0) << 0 ) |
-                (readPin(A1) << 1 ) |
-                (readPin(A2) << 2 ) |
-                (readPin(A3) << 3 ) |
-                (readPin(A6) << 4 ) |
-                (readPin(A7) << 5 ) |
-                (readPin(B0) << 6 )
-            );
-            // unstrobe  row
-            switch (row) {
-                case 0: writePinLow(B10); break;
-                case 1: writePinLow(B11); break;
-                case 2: writePinLow(B12); break;
-                case 3: writePinLow(B13); break;
-                case 4: writePinLow(B14); break;
-                case 5: writePinLow(B15); break;
-                case 6: break;
-            }
-
-            if (current_matrix[row] != data) {
-                current_matrix[row]    = data;
-                changed                = true;
-            }
-        }
-    }
-    for (uint8_t row = 0; row < ROWS_PER_HAND; row++) {
-        current_matrix[11 - row] = 0;
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            current_matrix[11 - row] |= ((raw_matrix_right[6 - col] & (1 << row) ? 1 : 0) << col);
-        }
-    }
-    return changed;
-}
-
-// DO NOT REMOVE
-// Needed for proper wake/sleep
-void matrix_power_up(void) {
-    bool temp_launching = is_launching;
-
-    matrix_init_custom();
-
-    is_launching = temp_launching;
-    if (!is_launching) {
-        ML_LED_1(false);
-        ML_LED_2(false);
-        ML_LED_3(false);
-        ML_LED_4(false);
-        ML_LED_5(false);
-        ML_LED_6(false);
-    }
-
-    // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        matrix[i] = 0;
-    }
-
-}
-
-bool is_transport_connected(void) {
-    return mcp23018_initd;
-}
\ No newline at end of file
diff --git a/keyboards/moonlander/readme.md b/keyboards/moonlander/readme.md
deleted file mode 100644
index 733780abde2..00000000000
--- a/keyboards/moonlander/readme.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Moonlander
-
-![Moonlander](https://zsa.io/static/gallery-white-case-7a2ef555f8f7f4ce1b9030477b16e517.png)
-
-A next-gen split, ergonomic keyboard with an active left side, USB type C, integrated wrist rest, and a thumb cluster that can move.
-
-
-* Keyboard Maintainer: [drashna](https://github.com/drashna), [ZSA](https://github.com/zsa/)
-* Hardware Supported: Moonlander MK 1 (STM32F303xC)
-* Hardware Availability: [ZSA Store](https://zsa.io/moonlander/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make moonlander:default
-
-Flashing example for this keyboard:
-
-    make moonlander: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).
-
-
-## Moonlander Customization
-
-### Indicator LEDs
-
-There are 6 functions for enabling and disabling the LEDs on the top of the boards. The functions are `ML_LED_1(bool)` through `ML_LED_6(bool)`, with the first LED being the left most LED on the left hand, and the sixth LED being the right most LED on the right side. 
-
-By default, the Indicator LEDs are used to indicate the layer state for the keyboard.  If you wish to change this (and indicate caps/num/scroll lock status instead), then define `MOONLANDER_USER_LEDS` in your `config.h` file. 
-
-
-### Oryx Configuration
-
-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. 
-
-### RGB Matrix Features
-
-If you're using the Smart LED (layer indication) feature from the Oryx Configurator, you want to make sure that you enable these options by adding `#define ORYX_CONFIGURATOR` to your keymap's `config.h`. 
-
-This changes the `RGB_TOG` keycode so that it will toggle the lights on and off, in a way that will allow the Smart LEDs to continue to work, even with the rest of the LEDs turned off. 
-
-Additionally, a new keycode has been added to toggle the Smart LEDs.  Use `TOGGLE_LAYER_COLOR`, if you aren't already.
-
-### Detecting split / Gaming mode
-
-To make it extra gaming friendly, you can configure what happens when you disconnect the right half. This is especially useful when using gaming unfriendly layers or layouts (e.g. home row mods, dvorak, colemak).
-
-Example for enabling a specific layer while right side is disconnected:
-
-```
-void housekeeping_task_user(void) {
-    if (!is_transport_connected()) {
-        // set layer
-    }
-}
-```
\ No newline at end of file
diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h
deleted file mode 100644
index 357f61e77c1..00000000000
--- a/keyboards/mss_studio/m63_rgb/config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2021 Mss Studio
- * 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
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_LED_COUNT 75
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-    /* RGB Matrix effect */
-    #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_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
-    #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
diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json
index 197a78a9245..3ac3725f1b0 100644
--- a/keyboards/mss_studio/m63_rgb/info.json
+++ b/keyboards/mss_studio/m63_rgb/info.json
@@ -13,7 +13,52 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"],
diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h
deleted file mode 100644
index dc228f8c626..00000000000
--- a/keyboards/mss_studio/m64_rgb/config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2021 Mss Studio
- * 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
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_LED_COUNT 76
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-    /* RGB Matrix effect */
-    #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_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
-    #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
diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/info.json
index c1850d1191b..f956ac50b5e 100644
--- a/keyboards/mss_studio/m64_rgb/info.json
+++ b/keyboards/mss_studio/m64_rgb/info.json
@@ -13,7 +13,52 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"],
diff --git a/keyboards/mt/mt40/rules.mk b/keyboards/mt/mt40/rules.mk
index b50ebe58880..5aa98ed4d81 100644
--- a/keyboards/mt/mt40/rules.mk
+++ b/keyboards/mt/mt40/rules.mk
@@ -10,5 +10,3 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
 AUDIO_ENABLE = no      # Audio output
 RGBLIGHT_ENABLE = yes  # Enable WS2812 RGB underlight. 
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index 2f69547df96..cc215ee9a16 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -15,69 +15,10 @@
   */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
-#define RGB_MATRIX_LED_PROCESS_LIMIT 20
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 
 #define RGB_MATRIX_LED_COUNT 64
 
-
-// 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
-#    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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json
index f2723823ee9..b311502eefe 100644
--- a/keyboards/mt/mt64rgb/info.json
+++ b/keyboards/mt/mt64rgb/info.json
@@ -29,7 +29,40 @@
         "pin": "B0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "is31fl3733",
+        "led_flush_limit": 26,
+        "led_process_limit": 20,
+        "max_brightness": 160
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"],
diff --git a/keyboards/mt/mt64rgb/mt64rgb.c b/keyboards/mt/mt64rgb/mt64rgb.c
index 7a6831f6d0b..bcf26de2313 100644
--- a/keyboards/mt/mt64rgb/mt64rgb.c
+++ b/keyboards/mt/mt64rgb/mt64rgb.c
@@ -16,7 +16,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -24,74 +24,74 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |      |      B location
  *   |  |      |      | */
 
-   {0, A_1,   B_1,   C_1},
-   {0, D_1,   E_1,   F_1},
-   {0, G_1,   H_1,   I_1},
-   {0, J_1,   K_1,   L_1},
-   {0, A_6,   B_6,   C_6},
-   {0, D_6,   E_6,   F_6},
-   {0, G_6,   H_6,   I_6},
-   {0, J_6,   K_6,   L_6},
-   {0, A_11,   B_11,   C_11},
-   {0, D_11,   E_11,   F_11},
-   {0, G_11,   H_11,   I_11},
-   {0, J_11,   K_11,   L_11},
-   {0, A_16,   B_16,   C_16},
-   {0, D_16,   E_16,   F_16},
+   {0, SW1_CS1,   SW2_CS1,   SW3_CS1},
+   {0, SW4_CS1,   SW5_CS1,   SW6_CS1},
+   {0, SW7_CS1,   SW8_CS1,   SW9_CS1},
+   {0, SW10_CS1,   SW11_CS1,   SW12_CS1},
+   {0, SW1_CS6,   SW2_CS6,   SW3_CS6},
+   {0, SW4_CS6,   SW5_CS6,   SW6_CS6},
+   {0, SW7_CS6,   SW8_CS6,   SW9_CS6},
+   {0, SW10_CS6,   SW11_CS6,   SW12_CS6},
+   {0, SW1_CS11,   SW2_CS11,   SW3_CS11},
+   {0, SW4_CS11,   SW5_CS11,   SW6_CS11},
+   {0, SW7_CS11,   SW8_CS11,   SW9_CS11},
+   {0, SW10_CS11,   SW11_CS11,   SW12_CS11},
+   {0, SW1_CS16,   SW2_CS16,   SW3_CS16},
+   {0, SW4_CS16,   SW5_CS16,   SW6_CS16},
     	
-   {0, A_2,   B_2,   C_2},
-   {0, D_2,   E_2,   F_2},
-   {0, G_2,   H_2,   I_2},
-   {0, J_2,   K_2,   L_2},
-   {0, A_7,   B_7,   C_7},
-   {0, D_7,   E_7,   F_7},
-   {0, G_7,   H_7,   I_7},
-   {0, J_7,   K_7,   L_7},
-   {0, A_12,   B_12,   C_12},
-   {0, D_12,   E_12,   F_12},
-   {0, G_12,   H_12,   I_12},
-   {0, J_12,   K_12,   L_12},
-   {0, G_16,   H_16,   I_16},
-    {0, J_16,   K_16,   L_16},
+   {0, SW1_CS2,   SW2_CS2,   SW3_CS2},
+   {0, SW4_CS2,   SW5_CS2,   SW6_CS2},
+   {0, SW7_CS2,   SW8_CS2,   SW9_CS2},
+   {0, SW10_CS2,   SW11_CS2,   SW12_CS2},
+   {0, SW1_CS7,   SW2_CS7,   SW3_CS7},
+   {0, SW4_CS7,   SW5_CS7,   SW6_CS7},
+   {0, SW7_CS7,   SW8_CS7,   SW9_CS7},
+   {0, SW10_CS7,   SW11_CS7,   SW12_CS7},
+   {0, SW1_CS12,   SW2_CS12,   SW3_CS12},
+   {0, SW4_CS12,   SW5_CS12,   SW6_CS12},
+   {0, SW7_CS12,   SW8_CS12,   SW9_CS12},
+   {0, SW10_CS12,   SW11_CS12,   SW12_CS12},
+   {0, SW7_CS16,   SW8_CS16,   SW9_CS16},
+    {0, SW10_CS16,   SW11_CS16,   SW12_CS16},
 
-   {0, A_3,   B_3,   C_3},
-   {0, D_3,   E_3,   F_3},
-   {0, G_3,   H_3,   I_3},
-   {0, J_3,   K_3,   L_3},
-   {0, A_8,   B_8,   C_8},
-   {0, D_8,   E_8,   F_8},
-   {0, G_8,   H_8,   I_8},
-   {0, J_8,   K_8,   L_8},
-   {0, A_13,   B_13,   C_13},
-   {0, D_13,   E_13,   F_13},
-   {0, G_13,   H_13,   I_13},
-   {0, J_13,   K_13,   L_13},
-   {0, A_15,   B_15,   C_15},
+   {0, SW1_CS3,   SW2_CS3,   SW3_CS3},
+   {0, SW4_CS3,   SW5_CS3,   SW6_CS3},
+   {0, SW7_CS3,   SW8_CS3,   SW9_CS3},
+   {0, SW10_CS3,   SW11_CS3,   SW12_CS3},
+   {0, SW1_CS8,   SW2_CS8,   SW3_CS8},
+   {0, SW4_CS8,   SW5_CS8,   SW6_CS8},
+   {0, SW7_CS8,   SW8_CS8,   SW9_CS8},
+   {0, SW10_CS8,   SW11_CS8,   SW12_CS8},
+   {0, SW1_CS13,   SW2_CS13,   SW3_CS13},
+   {0, SW4_CS13,   SW5_CS13,   SW6_CS13},
+   {0, SW7_CS13,   SW8_CS13,   SW9_CS13},
+   {0, SW10_CS13,   SW11_CS13,   SW12_CS13},
+   {0, SW1_CS15,   SW2_CS15,   SW3_CS15},
 
-   {0, A_4,   B_4,   C_4},
-   {0, D_4,   E_4,   F_4},
-   {0, G_4,   H_4,   I_4},
-   {0, J_4,   K_4,   L_4},
-   {0, A_9,   B_9,   C_9},
-   {0, D_9,   E_9,   F_9},
-   {0, G_9,   H_9,   I_9},
-   {0, J_9,   K_9,   L_9},
-   {0, A_14,   B_14,   C_14},
-   {0, D_14,   E_14,   F_14},
-   {0, G_14,   H_14,   I_14},
-   {0, J_14,   K_14,   L_14},
-   {0, D_15,   E_15,   F_15},
-   {0, G_15,   H_15,   I_15},
+   {0, SW1_CS4,   SW2_CS4,   SW3_CS4},
+   {0, SW4_CS4,   SW5_CS4,   SW6_CS4},
+   {0, SW7_CS4,   SW8_CS4,   SW9_CS4},
+   {0, SW10_CS4,   SW11_CS4,   SW12_CS4},
+   {0, SW1_CS9,   SW2_CS9,   SW3_CS9},
+   {0, SW4_CS9,   SW5_CS9,   SW6_CS9},
+   {0, SW7_CS9,   SW8_CS9,   SW9_CS9},
+   {0, SW10_CS9,   SW11_CS9,   SW12_CS9},
+   {0, SW1_CS14,   SW2_CS14,   SW3_CS14},
+   {0, SW4_CS14,   SW5_CS14,   SW6_CS14},
+   {0, SW7_CS14,   SW8_CS14,   SW9_CS14},
+   {0, SW10_CS14,   SW11_CS14,   SW12_CS14},
+   {0, SW4_CS15,   SW5_CS15,   SW6_CS15},
+   {0, SW7_CS15,   SW8_CS15,   SW9_CS15},
 
-   {0, A_5,   B_5,   C_5},
-   {0, D_5,   E_5,   F_5},
-   {0, G_5,   H_5,   I_5},
-   {0, J_5,   K_5,   L_5},
-   {0, A_10,   B_10,   C_10},
-   {0, D_10,  E_10,  F_10},
-   {0, G_10,  H_10,  I_10},
-   {0, J_10,  K_10,  L_10},
-   {0, J_15,  K_15,  L_15}
+   {0, SW1_CS5,   SW2_CS5,   SW3_CS5},
+   {0, SW4_CS5,   SW5_CS5,   SW6_CS5},
+   {0, SW7_CS5,   SW8_CS5,   SW9_CS5},
+   {0, SW10_CS5,   SW11_CS5,   SW12_CS5},
+   {0, SW1_CS10,   SW2_CS10,   SW3_CS10},
+   {0, SW4_CS10,  SW5_CS10,  SW6_CS10},
+   {0, SW7_CS10,  SW8_CS10,  SW9_CS10},
+   {0, SW10_CS10,  SW11_CS10,  SW12_CS10},
+   {0, SW10_CS15,  SW11_CS15,  SW12_CS15}
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index 34ec1be86a4..9b115d527d5 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -15,70 +15,10 @@
   */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-	#define RGB_MATRIX_KEYPRESSES
-	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-	#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-	#define RGB_MATRIX_LED_PROCESS_LIMIT 20
-	#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-	#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
-	#define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
+#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
+#define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
 
-	#define DRIVER_1_LED_TOTAL 44
-	#define DRIVER_2_LED_TOTAL 40
-	#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
- // 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
-#    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
+#define RGB_MATRIX_LED_COUNT 84
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json
index 74343e35839..7b41b09b57a 100644
--- a/keyboards/mt/mt84/info.json
+++ b/keyboards/mt/mt84/info.json
@@ -23,7 +23,43 @@
         "pin": "B0"
     },
     "rgb_matrix": {
-        "driver": "is31fl3737"
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3737",
+        "led_flush_limit": 26,
+        "led_process_limit": 20,
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "E6"],
diff --git a/keyboards/mt/mt84/mt84.c b/keyboards/mt/mt84/mt84.c
index fd4811e63a3..276c92fc065 100644
--- a/keyboards/mt/mt84/mt84.c
+++ b/keyboards/mt/mt84/mt84.c
@@ -16,7 +16,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
  /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -24,95 +24,95 @@ const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |      |      B location
  *   |  |      |      | */
 
-   {0, A_11,   B_11,   C_11},
-   {0, D_11,   E_11,   F_11},
-   {0, G_11,   H_11,   I_11},
-   {0, J_11,   K_11,   L_11},
-   {0, A_12,   B_12,   C_12},
-   {0, D_12,   E_12,   F_12},
-   {0, G_12,   H_12,   I_12},
-   {0, J_12,   K_12,   L_12},
-   {1, A_11,   B_11,   C_11},
-   {1, D_11,   E_11,   F_11},
-   {1, G_11,   H_11,   I_11},
-   {1, J_11,   K_11,   L_11},
-   {1, A_12,   B_12,   C_12},
-   {1, D_12,   E_12,   F_12},
-   {1, G_12,   H_12,   I_12},
-   {1, J_12,   K_12,   L_12},
+   {0, SW1_CS11,   SW2_CS11,   SW3_CS11},
+   {0, SW4_CS11,   SW5_CS11,   SW6_CS11},
+   {0, SW7_CS11,   SW8_CS11,   SW9_CS11},
+   {0, SW10_CS11,   SW11_CS11,   SW12_CS11},
+   {0, SW1_CS12,   SW2_CS12,   SW3_CS12},
+   {0, SW4_CS12,   SW5_CS12,   SW6_CS12},
+   {0, SW7_CS12,   SW8_CS12,   SW9_CS12},
+   {0, SW10_CS12,   SW11_CS12,   SW12_CS12},
+   {1, SW1_CS11,   SW2_CS11,   SW3_CS11},
+   {1, SW4_CS11,   SW5_CS11,   SW6_CS11},
+   {1, SW7_CS11,   SW8_CS11,   SW9_CS11},
+   {1, SW10_CS11,   SW11_CS11,   SW12_CS11},
+   {1, SW1_CS12,   SW2_CS12,   SW3_CS12},
+   {1, SW4_CS12,   SW5_CS12,   SW6_CS12},
+   {1, SW7_CS12,   SW8_CS12,   SW9_CS12},
+   {1, SW10_CS12,   SW11_CS12,   SW12_CS12},
 
-   {0, A_1,   B_1,   C_1},
-   {0, D_1,   E_1,   F_1},
-   {0, G_1,   H_1,   I_1},
-   {0, J_1,   K_1,   L_1},
-   {0, A_6,   B_6,   C_6},
-   {0, D_6,   E_6,   F_6},
-   {0, G_6,   H_6,   I_6},
-   {0, J_6,   K_6,   L_6},
-   {1, A_1,   B_1,   C_1},
-   {1, D_1,   E_1,   F_1},
-   {1, G_1,   H_1,   I_1},
-   {1, J_1,   K_1,   L_1},
-   {1, A_6,   B_6,   C_6},
-   {1, D_6,   E_6,   F_6},
-   {1, G_6,   H_6,   I_6},
+   {0, SW1_CS1,   SW2_CS1,   SW3_CS1},
+   {0, SW4_CS1,   SW5_CS1,   SW6_CS1},
+   {0, SW7_CS1,   SW8_CS1,   SW9_CS1},
+   {0, SW10_CS1,   SW11_CS1,   SW12_CS1},
+   {0, SW1_CS6,   SW2_CS6,   SW3_CS6},
+   {0, SW4_CS6,   SW5_CS6,   SW6_CS6},
+   {0, SW7_CS6,   SW8_CS6,   SW9_CS6},
+   {0, SW10_CS6,   SW11_CS6,   SW12_CS6},
+   {1, SW1_CS1,   SW2_CS1,   SW3_CS1},
+   {1, SW4_CS1,   SW5_CS1,   SW6_CS1},
+   {1, SW7_CS1,   SW8_CS1,   SW9_CS1},
+   {1, SW10_CS1,   SW11_CS1,   SW12_CS1},
+   {1, SW1_CS6,   SW2_CS6,   SW3_CS6},
+   {1, SW4_CS6,   SW5_CS6,   SW6_CS6},
+   {1, SW7_CS6,   SW8_CS6,   SW9_CS6},
 
-   {0, A_2,   B_2,   C_2},
-   {0, D_2,   E_2,   F_2},
-   {0, G_2,   H_2,   I_2},
-   {0, J_2,   K_2,   L_2},
-   {0, A_7,   B_7,   C_7},
-   {0, D_7,   E_7,   F_7},
-   {0, G_7,   H_7,   I_7},
-   {0, J_7,   K_7,   L_7},
-   {1, A_2,   B_2,   C_2},
-   {1, D_2,   E_2,   F_2},
-   {1, G_2,   H_2,   I_2},
-   {1, J_2,   K_2,   L_2},
-   {1, A_7,   B_7,   C_7},
-   {1, D_7,   E_7,   F_7},
-   {1, G_7,   H_7,   I_7},
+   {0, SW1_CS2,   SW2_CS2,   SW3_CS2},
+   {0, SW4_CS2,   SW5_CS2,   SW6_CS2},
+   {0, SW7_CS2,   SW8_CS2,   SW9_CS2},
+   {0, SW10_CS2,   SW11_CS2,   SW12_CS2},
+   {0, SW1_CS7,   SW2_CS7,   SW3_CS7},
+   {0, SW4_CS7,   SW5_CS7,   SW6_CS7},
+   {0, SW7_CS7,   SW8_CS7,   SW9_CS7},
+   {0, SW10_CS7,   SW11_CS7,   SW12_CS7},
+   {1, SW1_CS2,   SW2_CS2,   SW3_CS2},
+   {1, SW4_CS2,   SW5_CS2,   SW6_CS2},
+   {1, SW7_CS2,   SW8_CS2,   SW9_CS2},
+   {1, SW10_CS2,   SW11_CS2,   SW12_CS2},
+   {1, SW1_CS7,   SW2_CS7,   SW3_CS7},
+   {1, SW4_CS7,   SW5_CS7,   SW6_CS7},
+   {1, SW7_CS7,   SW8_CS7,   SW9_CS7},
 
-   {0, A_3,   B_3,   C_3},
-   {0, D_3,   E_3,   F_3},
-   {0, G_3,   H_3,   I_3},
-   {0, J_3,   K_3,   L_3},
-   {0, A_8,   B_8,   C_8},
-   {0, D_8,   E_8,   F_8},
-   {0, G_8,   H_8,   I_8},
-   {0, J_8,   K_8,   L_8},
-   {1, A_3,   B_3,   C_3},
-   {1, D_3,   E_3,   F_3},
-   {1, G_3,   H_3,   I_3},
-   {1, J_3,   K_3,   L_3},
-   {1, A_8,   B_8,   C_8},
-   {1, G_8,   H_8,   I_8},
+   {0, SW1_CS3,   SW2_CS3,   SW3_CS3},
+   {0, SW4_CS3,   SW5_CS3,   SW6_CS3},
+   {0, SW7_CS3,   SW8_CS3,   SW9_CS3},
+   {0, SW10_CS3,   SW11_CS3,   SW12_CS3},
+   {0, SW1_CS8,   SW2_CS8,   SW3_CS8},
+   {0, SW4_CS8,   SW5_CS8,   SW6_CS8},
+   {0, SW7_CS8,   SW8_CS8,   SW9_CS8},
+   {0, SW10_CS8,   SW11_CS8,   SW12_CS8},
+   {1, SW1_CS3,   SW2_CS3,   SW3_CS3},
+   {1, SW4_CS3,   SW5_CS3,   SW6_CS3},
+   {1, SW7_CS3,   SW8_CS3,   SW9_CS3},
+   {1, SW10_CS3,   SW11_CS3,   SW12_CS3},
+   {1, SW1_CS8,   SW2_CS8,   SW3_CS8},
+   {1, SW7_CS8,   SW8_CS8,   SW9_CS8},
 
-   {0, A_4,   B_4,   C_4},
-   {0, D_4,   E_4,   F_4},
-   {0, G_4,   H_4,   I_4},
-   {0, J_4,   K_4,   L_4},
-   {0, A_9,   B_9,   C_9},
-   {0, D_9,   E_9,   F_9},
-   {0, G_9,   H_9,   I_9},
-   {0, J_9,   K_9,   L_9},
-   {1, A_4,   B_4,   C_4},
-   {1, D_4,   E_4,   F_4},
-   {1, G_4,   H_4,   I_4},
-   {1, J_4,   K_4,   L_4},
-   {1, A_9,   B_9,   C_9},
-   {1, G_9,   H_9,   I_9},
+   {0, SW1_CS4,   SW2_CS4,   SW3_CS4},
+   {0, SW4_CS4,   SW5_CS4,   SW6_CS4},
+   {0, SW7_CS4,   SW8_CS4,   SW9_CS4},
+   {0, SW10_CS4,   SW11_CS4,   SW12_CS4},
+   {0, SW1_CS9,   SW2_CS9,   SW3_CS9},
+   {0, SW4_CS9,   SW5_CS9,   SW6_CS9},
+   {0, SW7_CS9,   SW8_CS9,   SW9_CS9},
+   {0, SW10_CS9,   SW11_CS9,   SW12_CS9},
+   {1, SW1_CS4,   SW2_CS4,   SW3_CS4},
+   {1, SW4_CS4,   SW5_CS4,   SW6_CS4},
+   {1, SW7_CS4,   SW8_CS4,   SW9_CS4},
+   {1, SW10_CS4,   SW11_CS4,   SW12_CS4},
+   {1, SW1_CS9,   SW2_CS9,   SW3_CS9},
+   {1, SW7_CS9,   SW8_CS9,   SW9_CS9},
 
-   {0, A_5,   B_5,   C_5},
-   {0, D_5,   E_5,   F_5},
-   {0, G_5,   H_5,   I_5},
-   {0, D_10,  E_10,  F_10},
-   {1, D_5,   E_5,   F_5},
-   {1, G_5,   H_5,   I_5},
-   {1, J_5,   K_5,   L_5},
-   {1, A_10,  B_10,  C_10},
-   {1, D_10,  E_10,  F_10},
-   {1, G_10,   H_10,   I_10}
+   {0, SW1_CS5,   SW2_CS5,   SW3_CS5},
+   {0, SW4_CS5,   SW5_CS5,   SW6_CS5},
+   {0, SW7_CS5,   SW8_CS5,   SW9_CS5},
+   {0, SW4_CS10,  SW5_CS10,  SW6_CS10},
+   {1, SW4_CS5,   SW5_CS5,   SW6_CS5},
+   {1, SW7_CS5,   SW8_CS5,   SW9_CS5},
+   {1, SW10_CS5,   SW11_CS5,   SW12_CS5},
+   {1, SW1_CS10,  SW2_CS10,  SW3_CS10},
+   {1, SW4_CS10,  SW5_CS10,  SW6_CS10},
+   {1, SW7_CS10,   SW8_CS10,   SW9_CS10}
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/mt/mt980/keymaps/walker/config.h b/keyboards/mt/mt980/keymaps/walker/config.h
deleted file mode 100644
index 0bd39599381..00000000000
--- a/keyboards/mt/mt980/keymaps/walker/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 200
-#define ONESHOT_TAP_TOGGLE 5
-#define ONESHOT_TIMEOUT 5000
diff --git a/keyboards/mt/mt980/keymaps/walker/keymap.c b/keyboards/mt/mt980/keymaps/walker/keymap.c
deleted file mode 100644
index f0817dd33d5..00000000000
--- a/keyboards/mt/mt980/keymaps/walker/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#include QMK_KEYBOARD_H
-
-bool numlock_on = true;
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} tap;
-
-enum {
-  SINGLE_TAP = 1,
-  SINGLE_HOLD = 2,
-  DOUBLE_TAP = 3,
-  DOUBLE_HOLD = 4,
-  TRIPLE_TAP = 5,
-  TRIPLE_HOLD = 6
-};
-
-enum {
-  ALT_L1 = 0
-};
-
-int cur_dance (tap_dance_state_t *state);
-void alt_finished (tap_dance_state_t *state, void *user_data);
-void alt_reset (tap_dance_state_t *state, void *user_data);
-
-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_NO,              KC_INS,   KC_PSCR,  KC_PGUP,  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_BSPC,  KC_NUM,   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_BSLS,            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_ENT,                       KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-    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_UP,              KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-    KC_LCTL,  KC_LGUI,  TD(ALT_L1),                   KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,            KC_P0,    KC_PDOT,  KC_PENT),
-
-  [1] = LAYOUT(
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_PAUSE, KC_SCRL,  KC_HOME,  KC_END,   
-    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,   RGB_TOG,  QK_BOOT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_VAI,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   
-    KC_TRNS,  KC_TRNS,  KC_TRNS,                      QK_BOOT,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_MOD,            KC_TRNS,  KC_TRNS,  KC_TRNS)  
-
-};
-
-int cur_dance (tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->pressed) return SINGLE_HOLD;
-    else return SINGLE_TAP;
-  }
-  else if (state->count == 2) {
-    if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  }
-  else if (state->count == 3) {
-    if (state->interrupted || !state->pressed)  return TRIPLE_TAP;
-    else return TRIPLE_HOLD;
-  }
-  else return 8;
-}
-
-static tap alttap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void alt_finished (tap_dance_state_t *state, void *user_data) {
-  alttap_state.state = cur_dance(state);
-  switch (alttap_state.state) {
-    case SINGLE_TAP: set_oneshot_layer(1, ONESHOT_START); clear_oneshot_layer_state(ONESHOT_PRESSED); break;
-    case SINGLE_HOLD: register_code(KC_LALT); break;
-    case DOUBLE_TAP: set_oneshot_layer(1, ONESHOT_START); set_oneshot_layer(1, ONESHOT_PRESSED); break;
-    case DOUBLE_HOLD: register_code(KC_LALT); layer_on(1); break;
-  }
-}
-
-void alt_reset (tap_dance_state_t *state, void *user_data) {
-  switch (alttap_state.state) {
-    case SINGLE_TAP: break;
-    case SINGLE_HOLD: unregister_code(KC_LALT); break;
-    case DOUBLE_TAP: break;
-    case DOUBLE_HOLD: layer_off(1); unregister_code(KC_LALT); break;
-  }
-  alttap_state.state = 0;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [ALT_L1] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,alt_finished, alt_reset)
-};
-
-bool led_update_keymap(led_t led_state) {
-  if (led_state.num_lock) {
-    numlock_on = true;
-  }
-  else {
-    numlock_on = false;
-  }
-}
-
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-
-  switch (keycode) {
-    case KC_TRNS:
-    case KC_NO:
-      /* Always cancel one-shot layer when another key gets pressed */
-      if (record->event.pressed && is_oneshot_layer_active())
-      clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-      return true;
-    case QK_BOOT:
-      /* Don't allow reset from oneshot layer state */
-      if (record->event.pressed && is_oneshot_layer_active()) {
-        clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-        return false;
-      }
-      return true;
-    case KC_PPLS:
-      if (!numlock_on) {
-        if (is_oneshot_layer_active() || layer_state & 0x2) {
-          if (record->event.pressed)
-            register_code(KC_HOME);
-          else
-            unregister_code(KC_HOME);
-          clear_oneshot_layer_state(ONESHOT_START);
-        }
-        else {
-          if (record->event.pressed)
-            register_code(KC_PGUP);
-          else
-            unregister_code(KC_PGUP);
-        }
-        return false;
-      }
-      return true;
-    case KC_PENT:
-      if (!numlock_on) {
-        if (is_oneshot_layer_active() || layer_state & 0x2) {
-          if (record->event.pressed)
-            register_code(KC_END);
-          else
-            unregister_code(KC_END);
-          clear_oneshot_layer_state(ONESHOT_START);
-        }
-        else {
-          if (record->event.pressed)
-            register_code(KC_PGDN);
-          else
-            unregister_code(KC_PGDN);
-        }
-        return false;
-      }
-      return true;
-    case KC_NUM:
-      /* Shift + NumLock will be treated as shift-Insert */
-      if ((keyboard_report->mods & MOD_BIT (KC_LSFT)) || (keyboard_report->mods & MOD_BIT (KC_RSFT))) {
-        if (record->event.pressed) {
-          register_code(KC_INS);
-          unregister_code(KC_INS);
-        }
-        return false;
-      }
-      else
-        return true;
-    default:
-      return true;
-  }
-  return true;
-}
diff --git a/keyboards/mt/mt980/keymaps/walker/rules.mk b/keyboards/mt/mt980/keymaps/walker/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/mt/mt980/keymaps/walker/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/mt/split75/keymaps/vial/config.h b/keyboards/mt/split75/keymaps/vial/config.h
index 0edac283984..a70bf91d17c 100644
--- a/keyboards/mt/split75/keymaps/vial/config.h
+++ b/keyboards/mt/split75/keymaps/vial/config.h
@@ -17,4 +17,4 @@
 #define VIAL_UNLOCK_COMBO_ROWS { 5, 6 }
 #define VIAL_UNLOCK_COMBO_COLS { 0, 11 }
 
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT
diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h
index 56a9edf0aab..19881718ef2 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/config.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#   define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index deb6f6a0fe8..554587e8163 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -24,6 +24,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "ws2812": {
diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h
index 56a9edf0aab..19881718ef2 100644
--- a/keyboards/mtbkeys/mtb60/solder/config.h
+++ b/keyboards/mtbkeys/mtb60/solder/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#   define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index 9fdca32a3e4..dae43e69697 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -24,6 +24,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "ws2812": {
diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h
deleted file mode 100644
index 26ff90fa59d..00000000000
--- a/keyboards/mwstudio/alicekk/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 TW59420 <https://github.com/TW59420>
- *
- * 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_MATRIX_MAXIMUM_BRIGHTNESS 200
diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h
deleted file mode 100644
index 0459b58d364..00000000000
--- a/keyboards/mwstudio/mw65_rgb/config.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2021 TW59420 <https://github.com/TW59420>
- *
- * 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 RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_LED_COUNT 83
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_KEYPRESSES
-
-    /* RGB Matrix effect */
-    #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_FRACTAL
-
-    #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
diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json
index 73e3c0ea247..502a112c43b 100644
--- a/keyboards/mwstudio/mw65_rgb/info.json
+++ b/keyboards/mwstudio/mw65_rgb/info.json
@@ -12,7 +12,50 @@
         "pin": "B3"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_fractal": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h
deleted file mode 100644
index b28f3547a77..00000000000
--- a/keyboards/mwstudio/mw75/config.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2021 TW59420 <https://github.com/TW59420>
- *
- * 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_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_LED_COUNT 97
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json
index 197a58d7ab9..61533f6266f 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/info.json
@@ -9,7 +9,52 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "matrix_pins": {
         "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
deleted file mode 100644
index c2019d6cd36..00000000000
--- a/keyboards/mwstudio/mw75r2/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 TW59420 <https://github.com/TW59420>
- *
- * 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_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_MATRIX_LED_COUNT 21
-
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_BREATHING
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json
index 8f9d19e016d..950ded1e80d 100644
--- a/keyboards/mwstudio/mw75r2/info.json
+++ b/keyboards/mwstudio/mw75r2/info.json
@@ -18,6 +18,28 @@
         "pin": "B3"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true
+        },
         "driver": "ws2812"
     },
     "matrix_pins": {
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index 8ac70be2dc0..8a0b30f8adc 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -17,62 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-    #define WS2812_SPI_DRIVER SPID1
-    #define WS2812_SPI_MOSI_PAL_MODE 5
-    #define RGB_MATRIX_LED_COUNT 52
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs
-    #define RGB_MATRIX_DEFAULT_VAL 64
-// 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
-#    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
+#define WS2812_SPI_DRIVER SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 5
 
 #ifdef AUDIO_ENABLE
     #define AUDIO_PIN A5
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 4fd99811452..4af3f641261 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -13,10 +13,58 @@
         "driver": "spi"
     },
     "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "val": 64
+        },
         "driver": "ws2812",
         "hue_steps": 10,
         "sat_steps": 10,
-        "val_steps": 10
+        "val_steps": 10,
+        "max_brightness": 128
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B6", "B7", "C13", "C14", "C15"],
diff --git a/keyboards/nack/keymaps/farfalleflickan/keymap.c b/keyboards/nack/keymaps/farfalleflickan/keymap.c
deleted file mode 100644
index ec0b2434fa4..00000000000
--- a/keyboards/nack/keymaps/farfalleflickan/keymap.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Copyright 2020 farfalleflickan <farfalleflickan@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
-#include "keymap.h"
-
-#define ____ _______
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    BASE,
-    NOGUI,
-    NUM,
-    FN
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    CK_LSFT = SAFE_RANGE,   // Shift
-    CK_RALT,                // AltGr
-    CK_BSPC_DEL,            // Backspace or Del (if pressed with CK_LSFT or CK_RALT)
-    KK_RESET
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BASE] = LAYOUT(
-/*   __________________________________________________________________________________________________________________________________________________________________________
-    | \            \            \            \            \            \            \            \            \            \            \            \            \            \ */
-//  | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
-       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,
-//  | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
-       KC_ESC,      KC_A,        KC_S,        KC_D,        KC_F,        KC_G,        KC_H,        KC_J,        KC_K,        KC_L,        KC_SCLN,     KC_QUOT,     KC_NUHS,
-//  | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
-       CK_LSFT,     KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,        KC_N,        KC_M,        KC_COMM,     KC_DOT,      KC_SLSH,     KC_UP,       CK_BSPC_DEL,
-//  | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENTER----|-LEFT-------|---DOWN-----|--RIGHT-----|
-       KC_LCTL,     KC_LALT,     KC_LGUI,     MO(NUM),     KC_SPC,      KC_NO,       MO(FN),      CK_RALT,     KC_NUBS,     KC_ENT,      KC_LEFT,     KC_DOWN,     KC_RIGHT
-//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
-    ),
-    [NOGUI] = LAYOUT(
-/*   __________________________________________________________________________________________________________________________________________________________________________
-    | \            \            \            \            \            \            \            \            \            \            \            \            \            \ */
-//  | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
-       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,
-//  | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
-       KC_ESC,      KC_A,        KC_S,        KC_D,        KC_F,        KC_G,        KC_H,        KC_J,        KC_K,        KC_L,        KC_SCLN,     KC_QUOT,     KC_NUHS,
-//  | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
-       CK_LSFT,     KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,        KC_N,        KC_M,        KC_COMM,     KC_DOT,      KC_SLSH,     KC_UP,       CK_BSPC_DEL,
-//  | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENTER----|-LEFT-------|---DOWN-----|--RIGHT-----|
-       KC_LCTL,     KC_LALT,     KC_NO,       MO(NUM),     KC_SPC,      KC_NO,       TO(BASE),    CK_RALT,     KC_NUBS,     KC_ENT,      KC_LEFT,     KC_DOWN,     KC_RIGHT
-//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
-    ),
-    [NUM] = LAYOUT(
-/*   __________________________________________________________________________________________________________________________________________________________________________
-    | \            \            \            \            \            \            \            \            \            \            \            \            \            \ */
-//  | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---|
-       ____,        KC_1,        KC_2,        KC_3,        KC_4,        KC_5,        KC_6,        KC_7,        KC_8,        KC_9,        KC_0,        KC_MINS,     KC_EQL,
-//  | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----|
-       ____,        KC_F1,       KC_F2,       KC_F3,       KC_F4,       KC_F5,       KC_F6,       KC_F7,       KC_F8,       KC_F9,       KC_F10,      KC_F11,      KC_F12,
-//  | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
-       ____,        KC_P0,       KC_P1,       KC_P2,       KC_P3,       KC_P4,       KC_P5,       KC_P6,       KC_P7,       KC_P8,       KC_P9,       KC_PGUP,     KC_NO,
-//  | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------|
-       ____,        ____,        ____,        TO(BASE),    KC_NO,      KC_NO,        MO(FN),      ____,        KC_GRV,      KC_PDOT,     KC_HOME,     KC_PGDN,   KC_END
-//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
-    ),
-    [FN] = LAYOUT(
-/*   __________________________________________________________________________________________________________________________________________________________________________
-    | \            \            \            \            \            \            \            \            \            \            \            \            \            \ */
-//  | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-QK_BOOT KBD--|
-       RGB_TOG,     RGB_MOD,     RGB_HUI,     RGB_SAI,     KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KK_RESET,
-//  | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
-       MU_TOGG,     KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
-//  | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------|
-       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       RGB_VAI,     KC_NO,
-//  | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------|
-       KC_NO,       KC_NO,       KC_NO,       TO(BASE),    KC_NO,       KC_NO,       TO(BASE),    TO(NOGUI),   KC_NO,       KC_NO,       KC_NO,       RGB_VAD,     KC_NO
-//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
-    )
-};
-
-// Interrupt bools
-bool lshift = false, ralt = false;
-
-// Number of items that are saved in prev_kcs
-uint8_t prev_indx = 0;
-// Used to save the last 6 actual keycodes
-uint16_t prev_kcs[6] = {0, 0, 0, 0, 0, 0};
-
-/*
-Used to add a keycode to a prev_kcs to remember it.
-When full the last code gets discarded and replaced by
-the new one.
-*/
-void add_to_prev(uint16_t kc){
-  for (int i=0; i<prev_indx; i++){
-    if (kc == prev_kcs[i])
-      return;
-  }
-  if (prev_indx == 6){
-    for (int i=5; i>0; i--){
-      prev_kcs[i] = prev_kcs[i-1];
-    }
-    prev_kcs[0] = kc;
-  } else {
-    prev_kcs[prev_indx] = kc;
-    prev_indx++;
-  }
-}
-
-/*
-Unregisters all codes saved in prev_kcs and resets prev_indx.
-gets called on multiple occasions mainly when shift is released
-and when frankenkeycodes are pressed. Prevents output of
-wrong characters when really specific key combinations
-that would never occur during normal usage are pressed.
-*/
-void unreg_prev(void){
-  if (prev_indx == 0)
-    return;
-  for (int i=0; i<prev_indx; i++){
-    unregister_code(prev_kcs[i]);
-  }
-  prev_indx = 0;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-    switch (keycode) {
-        case CK_LSFT:
-          if(record->event.pressed) {
-            unregister_code(KC_LSFT);
-            register_code(KC_LSFT);
-            lshift = true;
-          } else {
-            unreg_prev();
-            unregister_code(KC_LSFT);
-            lshift = false;
-          }
-          return false;
-          break;
-        case CK_RALT:
-          if(record->event.pressed) {
-            unregister_code(KC_RALT);
-            register_code(KC_RALT);
-            ralt = true;
-          } else {
-            unreg_prev();
-            unregister_code(KC_RALT);
-            ralt = false;
-          }
-          return false;
-          break;
-        case CK_BSPC_DEL:
-            if (ralt==true) {
-                RALT_NO(KC_BSPC,KC_DEL);
-            } else {
-                SHIFT_NO(KC_BSPC,KC_DEL);
-            }
-            break;
-        case KK_RESET: // Basically, turn off RGB before resetting
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-                #ifdef RGB_MATRIX_ENABLE
-                rgb_matrix_disable_noeeprom();
-                #endif
-            } else {
-                if (timer_elapsed32(key_timer) >= 20) {
-                    reset_keyboard();
-                }
-            }
-            break;
-        default:
-          if(record->event.pressed) {
-            timer_timeout_keymap();
-            if (lshift)
-              register_code(KC_LSFT);
-            else
-              unregister_code(KC_LSFT);
-            
-            if (ralt)
-              register_code(KC_ALGR);
-            else
-              unregister_code(KC_ALGR);
-          }
-        break;
-    }
-    return true;
-}
-
-__attribute__((weak))
-void timer_timeout_keymap(void){
-}
diff --git a/keyboards/nack/keymaps/farfalleflickan/keymap.h b/keyboards/nack/keymaps/farfalleflickan/keymap.h
deleted file mode 100644
index 212f45ffdb4..00000000000
--- a/keyboards/nack/keymaps/farfalleflickan/keymap.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2020 farfalleflickan <farfalleflickan@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"
-
-void add_to_prev(uint16_t kc);
-void unreg_prev(void);
-void timer_timeout_keymap(void);
-bool process_record_user(uint16_t keycode, keyrecord_t *record);
-
-// Normal shift status
-#define SHIFT_NORM(kc1, kc2) \
-if (record->event.pressed) { \
-  timer_timeout_keymap(); \
-  if (lshift) { \
-    register_code(KC_LSFT); \
-    unregister_code(kc2); \
-    register_code(kc2); \
-    add_to_prev(kc2); \
-  } else { \
-    unregister_code(KC_LSFT); \
-    unregister_code(kc1); \
-    register_code(kc1); \
-  } \
-} else { \
-  unregister_code(kc1); \
-  unregister_code(kc2); \
-} \
-return false;
-
-// Always shifted
-#define SHIFT_ALL(kc1, kc2) \
-if (record->event.pressed) { \
-  timer_timeout_keymap(); \
-  register_code(KC_LSFT); \
-  if (lshift) { \
-    unregister_code(kc2); \
-    register_code(kc2); \
-    add_to_prev(kc2); \
-  } else { \
-    unregister_code(kc1); \
-    register_code(kc1); \
-    add_to_prev(kc1); \
-  } \
-} else { \
-  unregister_code(kc1); \
-  unregister_code(kc2); \
-  unreg_prev(); \
-  if (lshift) \
-    register_code(KC_LSFT); \
-  else \
-    unregister_code(KC_LSFT); \
-} \
-return false;
-
-// Never shifted
-#define SHIFT_NO(kc1, kc2) \
-if (record->event.pressed) { \
-  timer_timeout_keymap(); \
-  unregister_code(KC_LSFT); \
-  if (lshift) { \
-    unregister_code(kc2); \
-    register_code(kc2); \
-    add_to_prev(kc2); \
-  } else { \
-    unregister_code(kc1); \
-    register_code(kc1); \
-  } \
-} else { \
-  unregister_code(kc1); \
-  unregister_code(kc2); \
-  unreg_prev(); \
-  if (lshift) \
-    register_code(KC_LSFT); \
-  else \
-    unregister_code(KC_LSFT); \
-} \
-return false;
-
-//Never RALT
-#define RALT_NO(kc1, kc2) \
-if (record->event.pressed) { \
-  timer_timeout_keymap(); \
-  unregister_code(KC_RALT); \
-  if (ralt) { \
-    unregister_code(kc2); \
-    register_code(kc2); \
-    add_to_prev(kc2); \
-  } else { \
-    unregister_code(kc1); \
-    register_code(kc1); \
-  } \
-} else { \
-  unregister_code(kc1); \
-  unregister_code(kc2); \
-  unreg_prev(); \
-  if (ralt) \
-    register_code(KC_RALT); \
-  else \
-    unregister_code(KC_RALT); \
-} \
-return false;
diff --git a/keyboards/nack/keymaps/farfalleflickan/readme.md b/keyboards/nack/keymaps/farfalleflickan/readme.md
deleted file mode 100644
index fbe5c6f5e3c..00000000000
--- a/keyboards/nack/keymaps/farfalleflickan/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# farfalleflickan's keymap for nack
diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json
index 94c812dd950..de4f22d6074 100644
--- a/keyboards/nacly/sodium62/info.json
+++ b/keyboards/nacly/sodium62/info.json
@@ -4,8 +4,8 @@
     "url": "https://nacly.net",
     "maintainer": "nacly",
     "usb": {
-        "vid": "0xBEEF",
-        "pid": "0xFED0",
+        "vid": "0x6E61",
+        "pid": "0x636C",
         "device_version": "0.0.1"
     },
     "matrix_pins": {
diff --git a/keyboards/nacly/sodium62/keymaps/via/keymap.c b/keyboards/nacly/sodium62/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c07d91a392a
--- /dev/null
+++ b/keyboards/nacly/sodium62/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 NaCly
+ *
+ * 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_1,    KC_2,    KC_3,    KC_4,       KC_5,                      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_Y,    KC_U,       KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_LGUI, KC_A,    KC_S,    KC_D,    LT(1,KC_F), KC_G,                      KC_H,    LT(2,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_LCTL, KC_LGUI, KC_LALT, KC_GRV,  KC_EQL,     KC_BSPC, KC_DEL,  KC_ENT,  KC_SPC,  KC_LBRC,    KC_RBRC, KC_HOME, KC_END,  KC_ESC
+    ),
+    //Holding F
+    [1] = 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_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_LGUI, KC_NO,   KC_NO,   KC_NO,   _______, KC_NO,                     KC_NO,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_NO,
+        KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_END,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+    ),
+    //Holding J
+    [2] = LAYOUT(
+        KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, 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,
+        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_LCTL, KC_LGUI, KC_LALT, KC_NO,   KC_NO,   KC_F14,   KC_F15,   KC_ENT,  KC_SPC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   TG(3)
+    ),
+    //game layer
+    [3] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,       KC_8,    KC_9,    KC_0,    KC_MINS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,       KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    LT(2,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_LCTL, KC_NO,   KC_M, KC_GRV,  KC_SPC,  KC_BSPC, KC_DEL,  KC_ENT,  KC_SPC,  KC_LBRC,    KC_RBRC, KC_HOME, KC_END,  TO(0)
+    )
+};
diff --git a/keyboards/nacly/sodium62/keymaps/via/rules.mk b/keyboards/nacly/sodium62/keymaps/via/rules.mk
new file mode 100644
index 00000000000..16d33cd89fe
--- /dev/null
+++ b/keyboards/nacly/sodium62/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+
diff --git a/keyboards/nasu/keymaps/mariocs/config.h b/keyboards/nasu/keymaps/mariocs/config.h
deleted file mode 100644
index 18b30b7859d..00000000000
--- a/keyboards/nasu/keymaps/mariocs/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2021 Mario Cadenas (@MarioCadenas)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/nasu/keymaps/mariocs/keymap.c b/keyboards/nasu/keymaps/mariocs/keymap.c
deleted file mode 100644
index d8cae4295d8..00000000000
--- a/keyboards/nasu/keymaps/mariocs/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2021 MarioCadenas (@MarioCadenas)
- *
- * 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 {
-    TD_LGUI,
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    layer_state_cmp(state, 1) ? setPinInputHigh(B0) : setPinInputLow(B0);
-
-    return state;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_LGUI] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_LGUI, 1),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_alice_split_bs( /* Base */
-    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_TRNS, 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_END,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
-             KC_LCTL,          KC_LALT,          KC_SPC,  TD(TD_LGUI),                KC_SPC,           KC_RALT,                            KC_RCTL),
-
-[1] = LAYOUT_alice_split_bs( /* FN */
-    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_TRNS, 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, 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_TRNS,                            KC_TRNS),
-
-[2] = LAYOUT_alice_split_bs( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                 KC_TRNS,          KC_TRNS,                            KC_TRNS),
-
-[3] = LAYOUT_alice_split_bs( /* 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)
-};
diff --git a/keyboards/nasu/keymaps/mariocs/readme.md b/keyboards/nasu/keymaps/mariocs/readme.md
deleted file mode 100644
index b5b0e66aa80..00000000000
--- a/keyboards/nasu/keymaps/mariocs/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Mariocs's keymap for Nasu.
-
-![Layer 0](https://i.imgur.com/kxC7RL5.png)
-
-![Layer 1](https://i.imgur.com/v0cYmXb.png)
-
-![Layer 2](https://i.imgur.com/FJ4y9hP.png)
-
-
-# Functionality
-
-* Via enabled.
-* When layer 1 is activated (Toggled os just temporarily), the numlock led will be switched on.
-* Double tapping `LGUI` key will toggle layer 1.
diff --git a/keyboards/nasu/keymaps/mariocs/rules.mk b/keyboards/nasu/keymaps/mariocs/rules.mk
deleted file mode 100644
index 791d5ab5021..00000000000
--- a/keyboards/nasu/keymaps/mariocs/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/nek_type_a/nek_type_a.h b/keyboards/nek_type_a/nek_type_a.h
index dda9e2bddee..fe6fb27a459 100644
--- a/keyboards/nek_type_a/nek_type_a.h
+++ b/keyboards/nek_type_a/nek_type_a.h
@@ -21,9 +21,7 @@
 #include <stdbool.h>
 #include <util/delay.h>
 
-#define I2C_ADDR        0b0100000
-#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
-#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define I2C_ADDR        (0b0100000<<1)
 #define IODIRA          0x00            // i/o direction register
 #define IODIRB          0x01
 #define GPPUA           0x0C            // GPIO pull-up resistor register
diff --git a/keyboards/neopad/readme.md b/keyboards/neopad/readme.md
deleted file mode 100644
index 9e83e9bb6d1..00000000000
--- a/keyboards/neopad/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Neopad
-
-Neopad is a little macropad with four switches and two rotary encoders, made by through hole components only.
-_Actually the number of switches is six, because even the encoder are allowed to click._
-
-![Neopad](https://i.imgur.com/TgOkj2Fh.jpg "Neopad first proto")
-
-The Neopad in the photo above is the first prototype. See the project repository for revision 1 update and KiCad files.
-
-* Keyboard maintainer: [rookiebwoy](https://github.com/rookiebwoy)
-* Hardware supported: ProMicro, _Elite-C (not tested)_
-* Project repository: [Neopad on github](https://github.com/rookiebwoy/neopad)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make neopad/rev1:default
-
-Flashing example for this keyboard:
-
-    make neopad/rev1:default:flash
-
-When asked by the terminal, press the dedicated `RESET` button (the one above the 2 LEDs) to enter the bootloader and let the OS detects the device.
-
-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 [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
diff --git a/keyboards/neopad/rules.mk b/keyboards/neopad/rules.mk
deleted file mode 100755
index 8fc1afe955a..00000000000
--- a/keyboards/neopad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = neopad/rev1
diff --git a/keyboards/neson_design/700e/700e.c b/keyboards/neson_design/700e/700e.c
index 9def73d6a44..31f88a71f9b 100644
--- a/keyboards/neson_design/700e/700e.c
+++ b/keyboards/neson_design/700e/700e.c
@@ -20,6 +20,7 @@
 #include "quantum.h"
 #include "i2c_master.h"
 #include "drivers/led/issi/is31fl3731.h"
+#include "ws2812.h"
 
 enum {
     SELF_TESTING,
@@ -336,7 +337,7 @@ void housekeeping_task_kb(void)
     housekeeping_task_user();
 }
 
-void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
+void setleds_custom(rgb_led_t *start_led, uint16_t num_leds)
 {
     if (rgb_state.state != NORMAL) return;
 
@@ -353,6 +354,10 @@ void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
     ws2812_setleds(leds, 4);
 }
 
+const rgblight_driver_t rgblight_driver = {
+    .setleds = setleds_custom,
+};
+
 bool led_update_kb(led_t led_state)
 {
     bool res = led_update_user(led_state);
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index 2fdcead121a..d92c9deb5d7 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -18,22 +18,8 @@
  */
 #pragma once
 
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-
-#define DRIVER_1_LED_TOTAL 32
-#define DRIVER_2_LED_TOTAL 32
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
+#define IS31FL3731_LED_COUNT 64
 
 #define USB_SUSPEND_WAKEUP_DELAY 1000
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
index 12a979ab117..3b74e9609a9 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -20,6 +20,7 @@
         "saturation_steps": 8,
         "brightness_steps": 8,
         "led_count": 68,
+        "driver": "custom",
         "animations": {
             "breathing": true,
             "rainbow_mood": true,
diff --git a/keyboards/neson_design/700e/rules.mk b/keyboards/neson_design/700e/rules.mk
index 5650ed1fee7..dd1db38babf 100644
--- a/keyboards/neson_design/700e/rules.mk
+++ b/keyboards/neson_design/700e/rules.mk
@@ -12,4 +12,5 @@ RGBLIGHT_ENABLE = yes		# Enable keyboard RGB underglow
 NO_USB_STARTUP_CHECK = yes
 
 QUANTUM_LIB_SRC += drivers/led/issi/is31fl3731.c
+WS2812_DRIVER_REQUIRED = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/neson_design/810e/config.h b/keyboards/neson_design/810e/config.h
new file mode 100644
index 00000000000..c6409b1ecea
--- /dev/null
+++ b/keyboards/neson_design/810e/config.h
@@ -0,0 +1,21 @@
+/**
+ * Copyright 2024 astro
+ *
+ * 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 BOARD_OTG_NOVBUSSENS 1
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/neson_design/810e/info.json b/keyboards/neson_design/810e/info.json
new file mode 100644
index 00000000000..ee80a34afbd
--- /dev/null
+++ b/keyboards/neson_design/810e/info.json
@@ -0,0 +1,119 @@
+{
+    "manufacturer": "Neson Design",
+    "keyboard_name": "810e",
+    "maintainer": "yulei",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": false 
+    },
+    "indicators": {
+        "caps_lock": "A10",
+        "num_lock": "A0"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "B5", "B4", "B3", "A15", "A8", "B15", "B14", "B13", "B12", "B10", "B2", "B1", "B0", "A4", "A3", "A2", "A1"],
+        "rows": ["C13", "C14", "A6", "A7", "A5"]
+    },
+    "processor": "STM32F411",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x810E",
+        "vid": "0x4E65",
+        "no_startup_check": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [1, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [1, 17], "x": 19.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [2, 16], "x": 17.5, "y": 1},
+                {"matrix": [2, 17], "x": 18.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 16.5, "y": 2},
+                {"matrix": [2, 15], "x": 17.5, "y": 2},
+                {"matrix": [3, 16], "x": 18.5, "y": 2},
+                {"matrix": [3, 17], "x": 19.5, "y": 1, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [4, 16], "x": 17.5, "y": 3},
+                {"matrix": [4, 17], "x": 18.5, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 7], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 11.75, "y": 4},
+                {"matrix": [4, 9], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 17.5, "y": 4},
+                {"matrix": [4, 14], "x": 18.5, "y": 4},
+                {"matrix": [4, 15], "x": 19.5, "y": 3, "h": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/neson_design/810e/keymaps/default/keymap.c b/keyboards/neson_design/810e/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f4893faa357
--- /dev/null
+++ b/keyboards/neson_design/810e/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/**
+ * keymap.c
+ *
+  Copyright 2024 astro
+    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(
+        QK_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_INS, KC_NUM, 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_BSLS,   KC_DEL,  KC_P7,   KC_P8,   KC_P9,
+        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_P4,   KC_P5,   KC_P6, KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                 KC_SPC,                    KC_RALT,MO(1),KC_RCTL,  KC_LEFT,   KC_DOWN, KC_RGHT,   KC_P0, KC_PDOT, KC_PENT),
+
+[1]=LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD,  KC_F13, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   _______, _______, _______, _______, 
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,           KC_VOLU,_______, _______, _______,
+        _______, _______, _______,                            KC_MPLY,                                     _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______)
+};
diff --git a/keyboards/neson_design/810e/keymaps/via/keymap.c b/keyboards/neson_design/810e/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c5fff9823dd
--- /dev/null
+++ b/keyboards/neson_design/810e/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/**
+ * keymap.c
+ *
+  Copyright 2024 astro
+    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(
+        QK_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_INS, KC_NUM, 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_BSLS,   KC_DEL,  KC_P7,   KC_P8,   KC_P9,
+        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_P4,   KC_P5,   KC_P6, KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                 KC_SPC,                    KC_RALT,MO(1),KC_RCTL,  KC_LEFT,   KC_DOWN, KC_RGHT,   KC_P0, KC_PDOT, KC_PENT),
+
+[1]=LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD,  KC_F13, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   _______, _______, _______, _______, 
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,           KC_VOLU,_______, _______, _______,
+        _______, _______, _______,                            KC_MPLY,                                     _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______)
+};
diff --git a/keyboards/spacey/keymaps/via/rules.mk b/keyboards/neson_design/810e/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/spacey/keymaps/via/rules.mk
rename to keyboards/neson_design/810e/keymaps/via/rules.mk
diff --git a/keyboards/neson_design/810e/mcuconf.h b/keyboards/neson_design/810e/mcuconf.h
new file mode 100644
index 00000000000..d558655d9cf
--- /dev/null
+++ b/keyboards/neson_design/810e/mcuconf.h
@@ -0,0 +1,31 @@
+/* Copyright 2023 astro
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE    16
+
+#undef STM32_PLLN_VALUE
+#define STM32_PLLN_VALUE    192
+
+#undef STM32_PLLP_VALUE
+#define STM32_PLLP_VALUE    2
+
+#undef STM32_PLLQ_VALUE
+#define STM32_PLLQ_VALUE    4
diff --git a/keyboards/neson_design/810e/readme.md b/keyboards/neson_design/810e/readme.md
new file mode 100644
index 00000000000..100f9eca80f
--- /dev/null
+++ b/keyboards/neson_design/810e/readme.md
@@ -0,0 +1,23 @@
+# Neson Design 810E keyboard
+
+* Keyboard Maintainer: [astro](https://github.com/yulei)
+* Hardware Supported: Neson Design 810E keyboard
+* Hardware Availability: [Public GB](https://geekhack.org/index.php?topic=120539.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make neson_design/810e:default
+
+Flashing example for this board:
+
+    make neson_design/810e: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**: Shortcut *BOOT0* pin and than plug in the keyboard.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/neson_design/810e/rules.mk b/keyboards/neson_design/810e/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/neson_design/810e/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index 22c12dfb972..92aa189fae0 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -18,20 +18,6 @@
  */
 #pragma once
 
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-
-#define DRIVER_1_LED_TOTAL 32
-#define DRIVER_2_LED_TOTAL 32
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
+#define IS31FL3731_LED_COUNT 64
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
index 3f383b4f8fe..c48824d80f3 100644
--- a/keyboards/neson_design/n6/info.json
+++ b/keyboards/neson_design/n6/info.json
@@ -23,6 +23,7 @@
         "saturation_steps": 8,
         "brightness_steps": 8,
         "led_count": 65,
+        "driver": "custom",
         "max_brightness": 192,
         "animations": {
             "breathing": true,
diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
index 38b634eeb73..b878b9368dd 100644
--- a/keyboards/neson_design/n6/n6.c
+++ b/keyboards/neson_design/n6/n6.c
@@ -20,6 +20,7 @@
 #include "quantum.h"
 #include "i2c_master.h"
 #include "drivers/led/issi/is31fl3731.h"
+#include "ws2812.h"
 
 enum {
     SELF_TESTING,
@@ -338,7 +339,7 @@ void housekeeping_task_kb(void)
     housekeeping_task_user();
 }
 
-void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
+void setleds_custom(rgb_led_t *start_led, uint16_t num_leds)
 {
     if (rgb_state.state != NORMAL) return;
 
@@ -348,6 +349,10 @@ void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
     ws2812_setleds(start_led+IS31FL3731_LED_COUNT, 1);
 }
 
+const rgblight_driver_t rgblight_driver = {
+    .setleds = setleds_custom,
+};
+
 bool led_update_kb(led_t led_state)
 {
     bool res = led_update_user(led_state);
diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk
index a3e4abe6cd9..4c9ce453526 100644
--- a/keyboards/neson_design/n6/rules.mk
+++ b/keyboards/neson_design/n6/rules.mk
@@ -11,4 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes		# Enable keyboard RGB underglow
 
 QUANTUM_LIB_SRC += drivers/led/issi/is31fl3731.c
+WS2812_DRIVER_REQUIRED = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/neson_design/nico/info.json b/keyboards/neson_design/nico/info.json
index 477ac3ba7cb..1c86d9a1ae8 100644
--- a/keyboards/neson_design/nico/info.json
+++ b/keyboards/neson_design/nico/info.json
@@ -25,7 +25,8 @@
         "pin": "B0"
     },
     "rgblight": {
-        "led_count": 5
+        "led_count": 5,
+        "driver": "custom"
     },
     "url": "",
     "usb": {
diff --git a/keyboards/neson_design/nico/nico.c b/keyboards/neson_design/nico/nico.c
index b4d15777b7f..bf8eeb87dd3 100644
--- a/keyboards/neson_design/nico/nico.c
+++ b/keyboards/neson_design/nico/nico.c
@@ -18,6 +18,7 @@
  */
 
 #include "quantum.h"
+#include "ws2812.h"
 #ifdef RGBLIGHT_ENABLE
 
 static bool alert = false;
@@ -53,20 +54,20 @@ void housekeeping_task_kb(void)
             alert = !alert;
             last_ticks = timer_read();
         }
-        ws2812_setleds(led, RGBLED_NUM);
+        ws2812_setleds(led, RGBLIGHT_LED_COUNT);
     } else {
         if (backup) {
             led[4].r = caps_led.r;
             led[4].g = caps_led.g;
             led[4].b = caps_led.b;
             backup = false;
-            ws2812_setleds(led, RGBLED_NUM);
+            ws2812_setleds(led, RGBLIGHT_LED_COUNT);
         }
     }
     housekeeping_task_user();
 }
 
-void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
+void setleds_custom(rgb_led_t *start_led, uint16_t num_leds)
 {
     start_led[2].r = start_led[0].r;
     start_led[2].g = start_led[0].g;
@@ -79,7 +80,10 @@ void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
     uint8_t tmp = start_led[4].g;
     start_led[4].g = start_led[4].r;
     start_led[4].r = tmp;
-    ws2812_setleds(start_led, RGBLED_NUM);
+    ws2812_setleds(start_led, RGBLIGHT_LED_COUNT);
 }
 
+const rgblight_driver_t rgblight_driver = {
+    .setleds = setleds_custom,
+};
 #endif
\ No newline at end of file
diff --git a/keyboards/neson_design/nico/rules.mk b/keyboards/neson_design/nico/rules.mk
index 6e7633bfe01..9a696492896 100644
--- a/keyboards/neson_design/nico/rules.mk
+++ b/keyboards/neson_design/nico/rules.mk
@@ -1 +1 @@
-# This file intentionally left blank
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/newgame40/post_config.h b/keyboards/newgame40/post_config.h
index 247178beec9..7ac270c9321 100644
--- a/keyboards/newgame40/post_config.h
+++ b/keyboards/newgame40/post_config.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #ifndef IOS_DEVICE_ENABLE
-#    if RGBLED_NUM <= 6
+#    if RGBLIGHT_LED_COUNT <= 6
 #        define RGBLIGHT_LIMIT_VAL 255
 #    else
 #        define RGBLIGHT_LIMIT_VAL 130
 #    endif
 #    define RGBLIGHT_VAL_STEP 17
 #else
-#    if RGBLED_NUM <= 6
+#    if RGBLIGHT_LED_COUNT <= 6
 #        define RGBLIGHT_LIMIT_VAL 90
 #    else
 #        define RGBLIGHT_LIMIT_VAL 45
diff --git a/keyboards/ning/tiny_board/tb16_rgb/config.h b/keyboards/ning/tiny_board/tb16_rgb/config.h
deleted file mode 100644
index 849035d1c37..00000000000
--- a/keyboards/ning/tiny_board/tb16_rgb/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2023 Ning (@ningjx)
- *
- * 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_MATRIX_LED_COUNT 16
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/ning/tiny_board/tb16_rgb/info.json b/keyboards/ning/tiny_board/tb16_rgb/info.json
index 337c61fabe9..57a2438c3d6 100644
--- a/keyboards/ning/tiny_board/tb16_rgb/info.json
+++ b/keyboards/ning/tiny_board/tb16_rgb/info.json
@@ -13,6 +13,12 @@
         "rgb_matrix": true
     },
     "rgb_matrix": {
+        "animations": {
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "typing_heatmap"
+        },
         "driver": "ws2812"
     },
     "matrix_pins": {
diff --git a/keyboards/ning/tiny_board/tb16_rgb/keymaps/ningjx/keymap.c b/keyboards/ning/tiny_board/tb16_rgb/keymaps/ningjx/keymap.c
deleted file mode 100644
index e9529fe91e1..00000000000
--- a/keyboards/ning/tiny_board/tb16_rgb/keymaps/ningjx/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2023 Ning (@ningjx)
- *
- * 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] = {
-    /*
-     * ┌───┬───┬───┬───┐
-     * │ 7 │ 8 │ 9 │RGB│
-     * ├───┼───┼───┼───┤
-     * │ 4 │ 5 │ 6 │MOD│
-     * ├───┼───┼───┼───┤
-     * │ 1 │ 2 │ 3 │ - │
-     * ├───┼───┼───┼───┤
-     * │ 0 │ . │Ent│ + │
-     * └───┴───┴───┴───┘
-     */
-    [0] = LAYOUT_ortho_4x4(
-        KC_P7,   KC_P8,   KC_P9,   RGB_TOG,
-        KC_P4,   KC_P5,   KC_P6,   RGB_MODE_FORWARD,
-        KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
-        KC_P0,   KC_PDOT, KC_PENT, KC_PPLS
-    )
-};
diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h
index 1eb25da282a..ae6256b351b 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v1/config.h
@@ -21,6 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Reducing layer count to 3 for via support */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json
index 983b48ab1a9..59ecc815b0f 100644
--- a/keyboards/nopunin10did/jabberwocky/v1/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v1/info.json
@@ -17,6 +17,9 @@
         "caps_lock": "B0",
         "num_lock": "D1"
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nopunin10did/jabberwocky/v1/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/jabberwocky/v1/keymaps/nopunin10did/keymap.c
deleted file mode 100644
index 6e2998e59fd..00000000000
--- a/keyboards/nopunin10did/jabberwocky/v1/keymaps/nopunin10did/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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
-
-#define LSA_DEL LSA_T(KC_DEL)
-#define RALTHOM RALT_T(KC_HOME)
-#define RWINEND RGUI_T(KC_END)
-#define RCTLEND RCTL_T(KC_END)
-#define LSHNUBS LSFT_T(KC_NUBS)
-#define RSHF_RO RSFT_T(KC_INT1)
-#define FN_CALC LT(1,KC_CALC)
-#define FN_MENU LT(1,KC_MENU)
-#define FN_PENT LT(1,KC_PENT)
-#define CTALDEL LCA(KC_DEL)
-#define JPYEN   KC_INT3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[0] = LAYOUT_rh(
-
-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_HOME,KC_END ,KC_PGUP,KC_PGDN,KC_DEL ,KC_INS ,KC_PSCR,KC_BSPC,
-        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_EQL ,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_BSLS,                KC_P7  ,KC_P8  ,KC_P9  ,KC_PPLS,
-        KC_LCTL,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT ,KC_ENT ,                KC_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,
-KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,LSA_DEL,FN_CALC,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,KC_RSFT,KC_UP  ,                KC_P1  ,KC_P2  ,KC_P3  ,FN_PENT,
-        KC_LCTL,KC_LGUI,        KC_LALT,FN_MENU,KC_SPC ,                RALTHOM,        RALTHOM,        RWINEND,RCTLEND,KC_LEFT,KC_DOWN,KC_RGHT,        KC_P0  ,KC_P0  ,KC_PDOT,FN_PENT),
-
-
-[1] = LAYOUT_rh(
-QK_BOOT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_F13 ,KC_F14 ,KC_F15 ,KC_F16 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        KC_NUM ,XXXXXXX,XXXXXXX,XXXXXXX,
-        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,JPYEN  ,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-        KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,KC_SCRL,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-LSHNUBS,LSHNUBS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_BRK ,CTALDEL,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RSHF_RO,RSHF_RO,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,_______,
-        _______,_______,        _______,_______,XXXXXXX,                _______,        _______,        _______,_______,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,KC_PCMM,_______)
-};
diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h
index 7be9070afe1..b00b2242dc2 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v2/config.h
@@ -21,6 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Reducing layer count to 3 for via support */
-#define DYNAMIC_KEYMAP_LAYER_COUNT  3
diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
index 64848c05520..263ae7df8ff 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@@ -18,6 +18,9 @@
         "pin": "D6",
         "levels": 6
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "indicators": {
         "caps_lock": "B7",
         "num_lock": "C6"
diff --git a/keyboards/nopunin10did/jabberwocky/v2/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/jabberwocky/v2/keymaps/nopunin10did/keymap.c
deleted file mode 100644
index d7f4c95d488..00000000000
--- a/keyboards/nopunin10did/jabberwocky/v2/keymaps/nopunin10did/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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
-
-#define LSA_DEL LSA_T(KC_DEL)
-#define RALTHOM RALT_T(KC_HOME)
-#define SHAGHOM SAGR_T(KC_HOME)
-#define RWINEND RGUI_T(KC_END)
-#define RCTLEND RCTL_T(KC_END)
-#define LSHNUBS LSFT_T(KC_NUBS)
-#define RSHF_RO RSFT_T(KC_INT1)
-#define FN_CALC LT(1,KC_CALC)
-#define FN_MUTE LT(1,KC_F16)
-#define FN_PENT LT(1,KC_PENT)
-#define CTALDEL LCA(KC_DEL)
-#define JPYEN   KC_INT3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[0] = LAYOUT_rh(
-
-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_HOME,KC_END ,KC_PGUP,KC_PGDN,KC_DEL ,KC_INS ,KC_PSCR,KC_BSPC,    
-        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_EQL ,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_BSLS,                KC_P7  ,KC_P8  ,KC_P9  ,KC_PPLS,     
-        KC_LCTL,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT ,KC_ENT ,                KC_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,     
-KC_LSFT,KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,LSA_DEL,FN_CALC,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,KC_RSFT,KC_UP  ,                KC_P1  ,KC_P2  ,KC_P3  ,FN_PENT,     
-        KC_LCTL,KC_LGUI,        KC_LALT,FN_MUTE,KC_SPC ,                SHAGHOM,        RALTHOM,        RWINEND,RCTLEND,KC_LEFT,KC_DOWN,KC_RGHT,        KC_P0  ,KC_P0  ,KC_PDOT,FN_PENT),   
-    
-    
-[1] = LAYOUT_rh(
-QK_BOOT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_F13 ,KC_F14 ,KC_F15 ,KC_F16 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,    
-        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,        KC_NLCK,XXXXXXX,XXXXXXX,XXXXXXX,    
-        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,QK_BOOT,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,JPYEN  ,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
-        KC_CAPS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,KC_SLCK,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,     
-LSHNUBS,LSHNUBS,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_BRK ,CTALDEL,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RSHF_RO,RSHF_RO,XXXXXXX,                XXXXXXX,XXXXXXX,XXXXXXX,_______,     
-        _______,_______,        _______,_______,XXXXXXX,                _______,        _______,        _______,_______,XXXXXXX,XXXXXXX,XXXXXXX,        XXXXXXX,XXXXXXX,KC_PCMM,_______)
-};
diff --git a/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c
deleted file mode 100644
index 41253ed1b39..00000000000
--- a/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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
-
-#define LSHFDEL LSFT_T(KC_DEL)
-#define LSACALC LSA_T(KC_CALC)
-#define RALTHOM RALT_T(KC_HOME)
-#define RCTLEND RCTL_T(KC_END)
-#define CUT     LCTL(KC_X)
-#define COPY    LCTL(KC_C)
-#define PASTE   LCTL(KC_V)
-#define CTLCAPS RCTL_T(KC_CAPS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[0] = LAYOUT(
-/* Left Block */
-   KC_ESC ,KC_PAUS,KC_ESC, KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,  
-   KC_SCRL,KC_BSPC,    KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_6,
-   CTLCAPS,      KC_LCTL,          KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_PGUP,
-   CUT,      KC_LSFT,              KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_PGDN,
-   COPY,   PASTE,    KC_LCTL,    KC_LGUI,  KC_LALT,    KC_GRV,   KC_SPC,     LSHFDEL,
-/* Center Block */
-   KC_F1,  KC_F5,  KC_F9,  
-   KC_F2,  KC_F6,  KC_F10,  
-   KC_F3,  KC_F7,  KC_F11,  
-   KC_F4,  KC_F8,  KC_F12,  
-/* Right Block */
-   KC_EQL, KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_BSPC,         KC_INS, KC_PSCR,  
-   KC_EQL ,KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_ENT ,     KC_DEL, /*   ISO */   
-   KC_LBRC,KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,  KC_ENT,      KC_ENT,    
-   KC_RBRC,KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,          KC_UP,  
- LSACALC,  KC_NUBS,    KC_NUHS,  RALTHOM,    RCTLEND,       KC_LEFT,KC_DOWN,KC_RGHT 
-  )
-
-};
diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h
index 55d8b53e83b..317cc2c3e83 100644
--- a/keyboards/novelkeys/nk20/config.h
+++ b/keyboards/novelkeys/nk20/config.h
@@ -17,65 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB options */
-
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
-
-#define RGB_MATRIX_LED_COUNT 20
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 210
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// 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
-#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
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json
index 3ad31f8a33e..6d25ca4c21e 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/info.json
@@ -13,7 +13,54 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 210,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B13", "B14", "B15", "A4"],
diff --git a/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c b/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
deleted file mode 100755
index c5045c4551d..00000000000
--- a/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 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 QMK_KEYBOARD_H
-
-enum my_layers {
-    _QWERTY,
-    _FNMS
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_65_ansi( /* Base */
-    QK_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_BSLS, 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_BSPC, 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_LALT, KC_LGUI,                KC_SPC,                 KC_RALT, MO(_FNMS),        KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-[_FNMS] = LAYOUT_65_ansi( /* FN */
-    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_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,
-    AG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/novelkeys/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
index c4a14e7087b..dd0a94a8e6f 100755
--- a/keyboards/novelkeys/nk65/nk65.c
+++ b/keyboards/novelkeys/nk65/nk65.c
@@ -28,135 +28,135 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 
-    {1, B_1,   A_1,   C_1}, //LB1
-    {1, E_1,   D_1,   F_1}, //LB2
-    {1, H_1,   G_1,   I_1}, //LB3
-    {1, K_1,   J_1,   L_1}, //LB4
-    {1, B_2,   A_2,   C_2}, //LB5
-    {1, E_2,   D_2,   F_2}, //LB6
-    {1, H_2,   G_2,   I_2}, //LB7
-    {1, K_2,   J_2,   L_2}, //LB8
-    {1, B_3,   A_3,   C_3}, //LB9
-    {1, E_3,   D_3,   F_3}, //LB10
-    {1, H_3,   G_3,   I_3}, //LB11
-    {1, K_3,   J_3,   L_3}, //LB12
-    {1, B_4,   A_4,   C_4}, //LB13
-    {1, E_4,   D_4,   F_4}, //LB14
-    {1, H_4,   G_4,   I_4}, //LB15
-    {1, K_4,   J_4,   L_4}, //LB16
-    {1, B_5,   A_5,   C_5}, //LB17
-    {1, E_5,   D_5,   F_5}, //LB18
-    {1, H_5,   G_5,   I_5}, //LB19
-    {1, K_5,   J_5,   L_5}, //LB20
-    {1, B_6,   A_6,   C_6}, //LB21
-    {1, E_6,   D_6,   F_6}, //LB22
-    {1, H_6,   G_6,   I_6}, //LB23
-    {1, K_6,   J_6,   L_6}, //LB24
-    {1, B_7,   A_7,   C_7}, //LB25
-    {1, E_7,   D_7,   F_7}, //LB26
-    {1, H_7,   G_7,   I_7}, //LB27
-    {1, K_7,   J_7,   L_7}, //LB28
-    {1, B_8,   A_8,   C_8}, //LB29
-    {1, E_8,   D_8,   F_8}, //LB30
-    {1, H_8,   G_8,   I_8}, //LB31
-    {1, K_8,   J_8,   L_8}, //LB32
-    {1, B_9,   A_9,   C_9}, //LB33
-    {1, E_9,   D_9,   F_9}, //LB34
-    {1, H_9,   G_9,   I_9}, //LB35
-    {1, K_9,   J_9,   L_9}, //LB36
-    {1, B_10,  A_10,  C_10}, //LB37
-    {1, E_10,  D_10,  F_10}, //LB38
-    {1, H_10,  G_10,  I_10}, //LB39
-    {1, K_10,  J_10,  L_10}, //LB40
-    {1, B_11,  A_11,  C_11}, //LB41
-    {1, E_11,  D_11,  F_11}, //LB42
-    {1, H_11,  G_11,  I_11}, //LB43
-    {1, K_11,  J_11,  L_11}, //LB44
-    {1, B_12,  A_12,  C_12}, //LB45
-    {1, E_12,  D_12,  F_12}, //LB46
-    {1, H_12,  G_12,  I_12}, //LB47
-    {1, K_12,  J_12,  L_12}, //LB48
-    {1, B_13,  A_13,  C_13}, //LB49
-    {1, E_13,  D_13,  F_13}, //LB50
-    {1, H_13,  G_13,  I_13}, //LB51
-    {1, K_13,  J_13,  L_13}, //LB52
-    {1, B_14,  A_14,  C_14}, //LB53
-    {1, E_14,  D_14,  F_14}, //LB54
-    {1, H_14,  G_14,  I_14}, //LB55
-    {1, K_14,  J_14,  L_14}, //LB56
-    {1, B_15,  A_15,  C_15}, //LB57
-    {1, E_15,  D_15,  F_15}, //LB58
-    {1, H_15,  G_15,  I_15}, //LB59
-    {1, K_15,  J_15,  L_15}, //LB60
-    {1, B_16,  A_16,  C_16}, //LB61
-    {1, E_16,  D_16,  F_16}, //LB62
-    {1, H_16,  G_16,  I_16}, //LB63
-    {1, K_16,  J_16,  L_16}, //LB64
+    {1, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LB1
+    {1, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LB2
+    {1, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LB3
+    {1, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LB4
+    {1, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LB5
+    {1, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LB6
+    {1, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LB7
+    {1, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LB8
+    {1, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LB9
+    {1, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LB10
+    {1, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LB11
+    {1, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LB12
+    {1, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LB13
+    {1, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LB14
+    {1, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LB15
+    {1, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LB16
+    {1, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LB17
+    {1, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LB18
+    {1, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LB19
+    {1, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LB20
+    {1, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LB21
+    {1, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LB22
+    {1, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LB23
+    {1, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LB24
+    {1, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LB25
+    {1, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LB26
+    {1, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LB27
+    {1, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LB28
+    {1, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LB29
+    {1, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LB30
+    {1, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LB31
+    {1, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LB32
+    {1, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LB33
+    {1, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LB34
+    {1, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LB35
+    {1, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LB36
+    {1, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LB37
+    {1, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LB38
+    {1, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LB39
+    {1, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LB40
+    {1, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LB41
+    {1, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LB42
+    {1, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LB43
+    {1, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LB44
+    {1, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LB45
+    {1, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LB46
+    {1, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LB47
+    {1, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LB48
+    {1, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LB49
+    {1, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LB50
+    {1, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LB51
+    {1, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LB52
+    {1, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LB53
+    {1, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LB54
+    {1, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LB55
+    {1, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LB56
+    {1, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LB57
+    {1, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LB58
+    {1, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LB59
+    {1, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LB60
+    {1, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LB61
+    {1, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LB62
+    {1, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LB63
+    {1, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LB64
 };
 #endif
 
diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
index e236351344f..40e3b54053e 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -17,65 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB options */
-
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
-
-#define RGB_MATRIX_LED_COUNT 68
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// 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
-#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
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
index eb6565aea6d..8e6e01fe46e 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/info.json
@@ -13,7 +13,54 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 130,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "A8", "A9"],
diff --git a/keyboards/novelkeys/nk87/nk87.c b/keyboards/novelkeys/nk87/nk87.c
index e701bfaccf9..420141c7283 100755
--- a/keyboards/novelkeys/nk87/nk87.c
+++ b/keyboards/novelkeys/nk87/nk87.c
@@ -28,135 +28,135 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 
-    {1, B_1,   A_1,   C_1}, //LB1
-    {1, E_1,   D_1,   F_1}, //LB2
-    {1, H_1,   G_1,   I_1}, //LB3
-    {1, K_1,   J_1,   L_1}, //LB4
-    {1, B_2,   A_2,   C_2}, //LB5
-    {1, E_2,   D_2,   F_2}, //LB6
-    {1, H_2,   G_2,   I_2}, //LB7
-    {1, K_2,   J_2,   L_2}, //LB8
-    {1, B_3,   A_3,   C_3}, //LB9
-    {1, E_3,   D_3,   F_3}, //LB10
-    {1, H_3,   G_3,   I_3}, //LB11
-    {1, K_3,   J_3,   L_3}, //LB12
-    {1, B_4,   A_4,   C_4}, //LB13
-    {1, E_4,   D_4,   F_4}, //LB14
-    {1, H_4,   G_4,   I_4}, //LB15
-    {1, K_4,   J_4,   L_4}, //LB16
-    {1, B_5,   A_5,   C_5}, //LB17
-    {1, E_5,   D_5,   F_5}, //LB18
-    {1, H_5,   G_5,   I_5}, //LB19
-    {1, K_5,   J_5,   L_5}, //LB20
-    {1, B_6,   A_6,   C_6}, //LB21
-    {1, E_6,   D_6,   F_6}, //LB22
-    {1, H_6,   G_6,   I_6}, //LB23
-    {1, K_6,   J_6,   L_6}, //LB24
-    {1, B_7,   A_7,   C_7}, //LB25
-    {1, E_7,   D_7,   F_7}, //LB26
-    {1, H_7,   G_7,   I_7}, //LB27
-    {1, K_7,   J_7,   L_7}, //LB28
-    {1, B_8,   A_8,   C_8}, //LB29
-    {1, E_8,   D_8,   F_8}, //LB30
-    {1, H_8,   G_8,   I_8}, //LB31
-    {1, K_8,   J_8,   L_8}, //LB32
-    {1, B_9,   A_9,   C_9}, //LB33
-    {1, E_9,   D_9,   F_9}, //LB34
-    {1, H_9,   G_9,   I_9}, //LB35
-    {1, K_9,   J_9,   L_9}, //LB36
-    {1, B_10,  A_10,  C_10}, //LB37
-    {1, E_10,  D_10,  F_10}, //LB38
-    {1, H_10,  G_10,  I_10}, //LB39
-    {1, K_10,  J_10,  L_10}, //LB40
-    {1, B_11,  A_11,  C_11}, //LB41
-    {1, E_11,  D_11,  F_11}, //LB42
-    {1, H_11,  G_11,  I_11}, //LB43
-    {1, K_11,  J_11,  L_11}, //LB44
-    {1, B_12,  A_12,  C_12}, //LB45
-    {1, E_12,  D_12,  F_12}, //LB46
-    {1, H_12,  G_12,  I_12}, //LB47
-    {1, K_12,  J_12,  L_12}, //LB48
-    {1, B_13,  A_13,  C_13}, //LB49
-    {1, E_13,  D_13,  F_13}, //LB50
-    {1, H_13,  G_13,  I_13}, //LB51
-    {1, K_13,  J_13,  L_13}, //LB52
-    {1, B_14,  A_14,  C_14}, //LB53
-    {1, E_14,  D_14,  F_14}, //LB54
-    {1, H_14,  G_14,  I_14}, //LB55
-    {1, K_14,  J_14,  L_14}, //LB56
-    {1, B_15,  A_15,  C_15}, //LB57
-    {1, E_15,  D_15,  F_15}, //LB58
-    {1, H_15,  G_15,  I_15}, //LB59
-    {1, K_15,  J_15,  L_15}, //LB60
-    {1, B_16,  A_16,  C_16}, //LB61
-    {1, E_16,  D_16,  F_16}, //LB62
-    {1, H_16,  G_16,  I_16}, //LB63
-    {1, K_16,  J_16,  L_16}, //LB64
+    {1, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LB1
+    {1, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LB2
+    {1, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LB3
+    {1, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LB4
+    {1, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LB5
+    {1, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LB6
+    {1, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LB7
+    {1, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LB8
+    {1, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LB9
+    {1, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LB10
+    {1, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LB11
+    {1, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LB12
+    {1, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LB13
+    {1, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LB14
+    {1, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LB15
+    {1, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LB16
+    {1, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LB17
+    {1, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LB18
+    {1, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LB19
+    {1, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LB20
+    {1, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LB21
+    {1, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LB22
+    {1, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LB23
+    {1, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LB24
+    {1, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LB25
+    {1, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LB26
+    {1, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LB27
+    {1, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LB28
+    {1, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LB29
+    {1, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LB30
+    {1, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LB31
+    {1, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LB32
+    {1, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LB33
+    {1, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LB34
+    {1, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LB35
+    {1, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LB36
+    {1, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LB37
+    {1, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LB38
+    {1, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LB39
+    {1, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LB40
+    {1, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LB41
+    {1, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LB42
+    {1, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LB43
+    {1, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LB44
+    {1, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LB45
+    {1, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LB46
+    {1, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LB47
+    {1, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LB48
+    {1, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LB49
+    {1, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LB50
+    {1, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LB51
+    {1, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LB52
+    {1, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LB53
+    {1, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LB54
+    {1, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LB55
+    {1, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LB56
+    {1, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LB57
+    {1, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LB58
+    {1, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LB59
+    {1, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LB60
+    {1, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LB61
+    {1, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LB62
+    {1, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LB63
+    {1, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LB64
 };
 #endif
 
diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
index a0bbb315d40..a79137e7d9f 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -17,65 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB options */
-
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
-
-#define RGB_MATRIX_LED_COUNT 87
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 114
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// 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
-#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
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json
index 269db89ed3b..cbcc8e2e18f 100755
--- a/keyboards/novelkeys/nk87b/info.json
+++ b/keyboards/novelkeys/nk87b/info.json
@@ -13,7 +13,54 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 114,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1"],
diff --git a/keyboards/novelkeys/nk_plus/config.h b/keyboards/novelkeys/nk_plus/config.h
index 2d3322bab2a..40e3b54053e 100644
--- a/keyboards/novelkeys/nk_plus/config.h
+++ b/keyboards/novelkeys/nk_plus/config.h
@@ -17,64 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB options */
-
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
-
-#define RGB_MATRIX_LED_COUNT 76
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// 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
-#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
diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/info.json
index 51a23057c4c..41beca36824 100755
--- a/keyboards/novelkeys/nk_plus/info.json
+++ b/keyboards/novelkeys/nk_plus/info.json
@@ -27,6 +27,51 @@
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
@@ -106,7 +151,8 @@
             {"flags": 1, "matrix": [4, 15], "x": 211, "y": 64},
             {"flags": 1, "matrix": [4, 16], "x": 224, "y": 64}
         ],
-        "max_brightness": 120
+        "max_brightness": 120,
+        "sleep": true
     },
     "ws2812": {
         "driver": "pwm",
diff --git a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
deleted file mode 100755
index 79a3e2fdbfb..00000000000
--- a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2018 Jordi Pakey-Rodriguez
-
-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(
-    LT(1, KC_NUM),  KC_PSLS,  KC_PAST,  KC_PMNS,
-    KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
-    KC_P4,          KC_P5,    KC_P6,    KC_PEQL,
-    KC_P1,          KC_P2,    KC_P3,    KC_TAB,
-    KC_PCMM,        KC_P0,    KC_PDOT,  KC_PENT
-  ),
-
-  [1] = LAYOUT(
-    _______,  QK_BOOT,  BL_STEP,  RGB_TOG,
-    RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_MOD,
-    RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_RMOD,
-    RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW,
-    RGB_M_SN, RGB_M_K,  RGB_M_X,  RGB_M_G
-  ),
-
-};
-
-bool led_update_user(led_t led_state) {
-  if (led_state.num_lock) {
-    // Illuminate the LED under the Num Lock key
-    rgblight_sethsv_at(0, 0, 127, 1);
-  } else {
-    rgblight_sethsv_at(0, 0, 0, 1);
-  }
-  return false;
-}
diff --git a/keyboards/novelkeys/skelett60/info.json b/keyboards/novelkeys/skelett60/info.json
new file mode 100755
index 00000000000..1a8f988b018
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/info.json
@@ -0,0 +1,946 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "Skelett 60",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x7336",
+        "vid": "0x8968"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift", "60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/novelkeys/skelett60/keymaps/default/keymap.c b/keyboards/novelkeys/skelett60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..6ce0d78bc7c
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2024 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 */
+    QK_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_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_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_NUBS,  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,  MO(1),    KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_all( /* FN */
+    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_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,
+    _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,  _______,
+    KC_VOLU,  KC_VOLD,  KC_MUTE,                                _______,                                _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/novelkeys/skelett60/keymaps/via/keymap.c b/keyboards/novelkeys/skelett60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6ce0d78bc7c
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2024 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 */
+    QK_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_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_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_NUBS,  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,  MO(1),    KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_all( /* FN */
+    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_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,
+    _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,  _______,
+    KC_VOLU,  KC_VOLD,  KC_MUTE,                                _______,                                _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/novelkeys/skelett60/keymaps/via/rules.mk b/keyboards/novelkeys/skelett60/keymaps/via/rules.mk
new file mode 100755
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/novelkeys/skelett60/readme.md b/keyboards/novelkeys/skelett60/readme.md
new file mode 100755
index 00000000000..05c920502b3
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/readme.md
@@ -0,0 +1,36 @@
+# Skelett 60
+
+This is a standard 60% layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 60% keyboard with STM32F072CB
+* Hardware Availability: https://novelkeys.com/ 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make novelkeys/skelett60:default
+
+Flashing example for this keyboard:
+
+    make novelkeys/skelett60: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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or CLI (`make novelkeys/skelett60:<keymap>:flash`)
diff --git a/keyboards/novelkeys/skelett60/rules.mk b/keyboards/novelkeys/skelett60/rules.mk
new file mode 100644
index 00000000000..6dd24d8e068
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/rules.mk
@@ -0,0 +1,3 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
diff --git a/keyboards/novelkeys/skelett60/skelett60.c b/keyboards/novelkeys/skelett60/skelett60.c
new file mode 100755
index 00000000000..fdbfa8f2727
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/skelett60.c
@@ -0,0 +1,21 @@
+/* Copyright 2024 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 "quantum.h"
+
+void led_init_ports(void) {
+    // Set our LED pins as open drain outputs
+    gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN);
+}
diff --git a/keyboards/noxary/valhalla_v2/config.h b/keyboards/noxary/valhalla_v2/config.h
new file mode 100644
index 00000000000..627429a6f25
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/config.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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 BACKLIGHT_PWM_DRIVER PWMD3
+#define BACKLIGHT_PWM_CHANNEL 2
+#define BACKLIGHT_PAL_MODE 2
diff --git a/keyboards/noxary/valhalla_v2/halconf.h b/keyboards/noxary/valhalla_v2/halconf.h
new file mode 100644
index 00000000000..1251bb13acb
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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 HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/info.json
new file mode 100644
index 00000000000..671bd0b775a
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/info.json
@@ -0,0 +1,223 @@
+{
+    "keyboard_name": "Valhalla V2",
+    "manufacturer": "Noxary",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4E58",
+        "pid": "0x5649",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C5" , "C4" , "A6" , "A5" , "A4" , "A3" , "B8" , "C2" , "C1" , "C0" , "B4" , "B3" , "D2" , "C12", "C11"],
+        "rows": ["B1" , "B10", "A2" , "A1" , "B0" , "A15", "C10", "B9" , "C3" , "A0"]
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey":  true,
+        "extrakey":  true,
+        "console":   false,
+        "backlight": true,
+        "nkro":      true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "build": {
+        "lto": true
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "embedded_flash",
+            "backing_size": 4096
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "backlight": {
+        "as_caps_lock": true,
+        "driver": "pwm",
+        "levels": 20,
+        "pin": "A7"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "6", "matrix": [4, 5], "x": 6, "y": 0},
+                {"label": "7", "matrix": [5, 6], "x": 9, "y": 0},
+                {"label": "8", "matrix": [5, 7], "x": 10, "y": 0},
+                {"label": "9", "matrix": [5, 8], "x": 11, "y": 0},
+                {"label": "0", "matrix": [5, 9], "x": 12, "y": 0},
+                {"label": "-", "matrix": [5, 10], "x": 13, "y": 0},
+                {"label": "=", "matrix": [5, 11], "x": 14, "y": 0},
+                {"label": "Backspace", "matrix": [5, 12], "x": 15, "y": 0},
+                {"label": "Backspace", "matrix": [5, 13], "x": 16, "y": 0},
+                {"label": "Delete", "matrix": [8, 14], "x": 17, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"label": "Y", "matrix": [6, 6], "x": 8.5, "y": 1},
+                {"label": "U", "matrix": [6, 7], "x": 9.5, "y": 1},
+                {"label": "I", "matrix": [6, 8], "x": 10.5, "y": 1},
+                {"label": "O", "matrix": [6, 9], "x": 11.5, "y": 1},
+                {"label": "P", "matrix": [6, 10], "x": 12.5, "y": 1},
+                {"label": "[", "matrix": [6, 11], "x": 13.5, "y": 1},
+                {"label": "]", "matrix": [6, 12], "x": 14.5, "y": 1},
+                {"label": "\\", "matrix": [6, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [6, 14], "x": 17, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"label": "H", "matrix": [7, 6], "x": 8.75, "y": 2},
+                {"label": "J", "matrix": [7, 7], "x": 9.75, "y": 2},
+                {"label": "K", "matrix": [7, 8], "x": 10.75, "y": 2},
+                {"label": "L", "matrix": [7, 9], "x": 11.75, "y": 2},
+                {"label": ";", "matrix": [7, 10], "x": 12.75, "y": 2},
+                {"label": "'", "matrix": [7, 11], "x": 13.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 12], "x": 14.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [7, 14], "x": 17, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"label": "B", "matrix": [8, 6], "x": 8.25, "y": 3},
+                {"label": "N", "matrix": [8, 7], "x": 9.25, "y": 3},
+                {"label": "M", "matrix": [8, 8], "x": 10.25, "y": 3},
+                {"label": ",", "matrix": [8, 9], "x": 11.25, "y": 3},
+                {"label": ".", "matrix": [8, 10], "x": 12.25, "y": 3},
+                {"label": "/", "matrix": [8, 11], "x": 13.25, "y": 3},
+                {"label": "Shift", "matrix": [8, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [8, 13], "x": 16, "y": 3},
+                {"label": "Fn", "matrix": [9, 14], "x": 17, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75},
+                {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4},
+
+                {"label": "Space", "matrix": [9, 6], "x": 8, "y": 4},
+                {"label": "Space", "matrix": [9, 7], "x": 9, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 8], "x": 10.25, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 9], "x": 11.75, "y": 4},
+                {"label": "Ctrl", "matrix": [9, 10], "x": 12.75, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [9, 11], "x": 15, "y": 4},
+                {"label": "\u2193", "matrix": [9, 12], "x": 16, "y": 4},
+                {"label": "\u2192", "matrix": [9, 13], "x": 17, "y": 4}
+            ]
+        },
+        "LAYOUT_full_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+
+                {"label": "6", "matrix": [4, 5], "x": 6, "y": 0},
+                {"label": "7", "matrix": [5, 6], "x": 9, "y": 0},
+                {"label": "8", "matrix": [5, 7], "x": 10, "y": 0},
+                {"label": "9", "matrix": [5, 8], "x": 11, "y": 0},
+                {"label": "0", "matrix": [5, 9], "x": 12, "y": 0},
+                {"label": "-", "matrix": [5, 10], "x": 13, "y": 0},
+                {"label": "=", "matrix": [5, 11], "x": 14, "y": 0},
+                {"label": "Backspace", "matrix": [5, 12], "x": 15, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [8, 14], "x": 17, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"label": "Y", "matrix": [6, 6], "x": 8.5, "y": 1},
+                {"label": "U", "matrix": [6, 7], "x": 9.5, "y": 1},
+                {"label": "I", "matrix": [6, 8], "x": 10.5, "y": 1},
+                {"label": "O", "matrix": [6, 9], "x": 11.5, "y": 1},
+                {"label": "P", "matrix": [6, 10], "x": 12.5, "y": 1},
+                {"label": "[", "matrix": [6, 11], "x": 13.5, "y": 1},
+                {"label": "]", "matrix": [6, 12], "x": 14.5, "y": 1},
+                {"label": "\\", "matrix": [6, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [6, 14], "x": 17, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"label": "H", "matrix": [7, 6], "x": 8.75, "y": 2},
+                {"label": "J", "matrix": [7, 7], "x": 9.75, "y": 2},
+                {"label": "K", "matrix": [7, 8], "x": 10.75, "y": 2},
+                {"label": "L", "matrix": [7, 9], "x": 11.75, "y": 2},
+                {"label": ";", "matrix": [7, 10], "x": 12.75, "y": 2},
+                {"label": "'", "matrix": [7, 11], "x": 13.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 12], "x": 14.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [7, 14], "x": 17, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"label": "B", "matrix": [8, 6], "x": 8.25, "y": 3},
+                {"label": "N", "matrix": [8, 7], "x": 9.25, "y": 3},
+                {"label": "M", "matrix": [8, 8], "x": 10.25, "y": 3},
+                {"label": ",", "matrix": [8, 9], "x": 11.25, "y": 3},
+                {"label": ".", "matrix": [8, 10], "x": 12.25, "y": 3},
+                {"label": "/", "matrix": [8, 11], "x": 13.25, "y": 3},
+                {"label": "Shift", "matrix": [8, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [8, 13], "x": 16, "y": 3},
+                {"label": "Fn", "matrix": [9, 14], "x": 17, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75},
+                {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4},
+
+                {"label": "Space", "matrix": [9, 6], "x": 8, "y": 4},
+                {"label": "Space", "matrix": [9, 7], "x": 9, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 8], "x": 10.25, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 9], "x": 11.75, "y": 4},
+                {"label": "Ctrl", "matrix": [9, 10], "x": 12.75, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [9, 11], "x": 15, "y": 4},
+                {"label": "\u2193", "matrix": [9, 12], "x": 16, "y": 4},
+                {"label": "\u2192", "matrix": [9, 13], "x": 17, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c b/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c
new file mode 100755
index 00000000000..02272b9290e
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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_all(
+        QK_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_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(
+        QK_BOOT  , 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
+    )
+};
diff --git a/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c
new file mode 100755
index 00000000000..02272b9290e
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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_all(
+        QK_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_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(
+        QK_BOOT  , 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
+    )
+};
diff --git a/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk b/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/noxary/valhalla_v2/matrix_diagram.md b/keyboards/noxary/valhalla_v2/matrix_diagram.md
new file mode 100644
index 00000000000..895960ed969
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Noxary Valhalla V2
+
+```
+                                                            ┌───────┐
+                                               2u Backspace │5C     │
+                                                            └───────┘
+┌───┬───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │45 │       │56 │57 │58 │59 │5A │5B │5C │5D │8E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│10   │11 │12 │13 │14 │15 │       │66 │67 │68 │69 │6A │6B │6C │6D   │6E │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20    │21 │22 │23 │24 │25 │       │76 │77 │78 │79 │7A │7B │7C      │7E │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30      │31 │32 │33 │34 │35 │   │86 │87 │88 │89 │8A │8B │8C    │8D │8E │
+├─────┬──┴┬──┴──┬┴───┴─┬─┴─┬─┘  ┌┴──┬┴───┼───┴─┬─┴─┬─┴───┼──┬───┼───┼───┤
+│40   │41 │42   │43    │44 │    │96 │97  │98   │99 │9A   │  │9B │9C │9D │
+└─────┴───┴─────┴──────┴───┘    └───┴────┴─────┴───┴─────┘  └───┴───┴───┘
+          2.75u ┌──────────┐    ┌────────┐ 2.25u
+     Left Space │44        │    │97      │ Right Space
+                └──────────┘    └────────┘
+```
diff --git a/keyboards/noxary/valhalla_v2/mcuconf.h b/keyboards/noxary/valhalla_v2/mcuconf.h
new file mode 100644
index 00000000000..caa959ced79
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/arctic/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keyboards/noxary/valhalla_v2/readme.md b/keyboards/noxary/valhalla_v2/readme.md
new file mode 100644
index 00000000000..afd2dffd60f
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/readme.md
@@ -0,0 +1,32 @@
+# Noxary Valhalla V2
+
+![valhalla](https://imgur.com/281HMjnh.jpg)
+
+An ergonomic 65% by Noxary
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+* Hardware Supported: proprietary PCB
+* Hardware Availability: group buy ran by Gondolindrim. Closed in february 22, 2024.
+
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed 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**: press the button on the front of the PCB, next to caps lock, for at least five seconds
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+## Compile firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make noxary/valhalla_v2:default
+
+To directly flash the PCB after it is put into a DFU state, use
+
+    make noxary/valhalla_v2: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/noxary/valhalla_v2/rules.mk b/keyboards/noxary/valhalla_v2/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/null/st110r2/info.json b/keyboards/null/st110r2/info.json
new file mode 100644
index 00000000000..b83e9746e13
--- /dev/null
+++ b/keyboards/null/st110r2/info.json
@@ -0,0 +1,596 @@
+{
+    "manufacturer": "[null]",
+    "keyboard_name": "ST110 r2",
+    "maintainer": "user176176",
+    "bootloader": "halfkay",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "D0",
+        "compose": "B5",
+        "kana": "B4",
+        "num_lock": "B7",
+        "scroll_lock": "D1"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "C0", "C1", "C2", "C3", "C4", "C5", "C6"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"]
+    },
+    "processor": "at90usb1286",
+    "url": "https://null-src.com/posts/nkbm-st110r2/post.php",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "community_layouts": ["fullsize_ansi", "fullsize_iso", "fullsize_jis"],
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00/0A/KC_ESC", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K02/0C/KC_F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03/0D/KC_F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04/0E/KC_F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05/0F/KC_F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06/0G/KC_F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "K07/0H/KC_F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "K08/0I/KC_F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "K09/0J/KC_F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "K0B/0L/KC_F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C/0M/KC_F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D/0N/KC_F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E/0O/KC_F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K60/6A/KC_PSCR", "matrix": [6, 0], "x": 15.25, "y": 0},
+                {"label": "K61/6B/KC_SCRL", "matrix": [6, 1], "x": 16.25, "y": 0},
+                {"label": "K62/6C/KC_PAUS", "matrix": [6, 2], "x": 17.25, "y": 0},
+                {"label": "K10/1A/KC_GRV", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "K11/1B/KC_1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "K12/1C/KC_2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "K13/1D/KC_3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "K14/1E/KC_4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "K15/1F/KC_5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "K16/1G/KC_6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "K17/1H/KC_7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "K18/1I/KC_8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "K19/1J/KC_9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "K1A/1K/KC_0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "K1B/1L/KC_MINS", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "K1C/1M/KC_EQL", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "K1D/1N/KC_JYEN", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "K1E/1O/KC_BSPC", "matrix": [1, 14], "x": 14, "y": 1.25},
+                {"label": "K63/6D/KC_INS", "matrix": [6, 3], "x": 15.25, "y": 1.25},
+                {"label": "K64/6E/KC_HOME", "matrix": [6, 4], "x": 16.25, "y": 1.25},
+                {"label": "K65/6F/KC_PGUP", "matrix": [6, 5], "x": 17.25, "y": 1.25},
+                {"label": "K6D/6N/KC_NUM", "matrix": [6, 13], "x": 18.5, "y": 1.25},
+                {"label": "K6E/6O/KC_PSLS", "matrix": [6, 14], "x": 19.5, "y": 1.25},
+                {"label": "K70/7A/KC_PAST", "matrix": [7, 0], "x": 20.5, "y": 1.25},
+                {"label": "K71/7B/KC_PMNS", "matrix": [7, 1], "x": 21.5, "y": 1.25},
+                {"label": "K20/2A/KC_TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "K21/2B/KC_Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "K22/2C/KC_W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "K23/2D/KC_E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "K24/2E/KC_R", "matrix": [2, 4], "x": 4.5, "y": 2.15},
+                {"label": "K25/2F/KC_T", "matrix": [2, 5], "x": 5.5, "y": 2.15},
+                {"label": "K26/2G/KC_Y", "matrix": [2, 6], "x": 6.5, "y": 2.15},
+                {"label": "K27/2H/KC_U", "matrix": [2, 7], "x": 7.5, "y": 2.15},
+                {"label": "K28/2I/KC_I", "matrix": [2, 8], "x": 8.5, "y": 2.15},
+                {"label": "K29/2J/KC_O", "matrix": [2, 9], "x": 9.5, "y": 2.15},
+                {"label": "K2A/2K/KC_P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "K2B/2L/KC_LBRC", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "K2C/2M/KC_RBRC", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "K3C/3M/KC_NUHS", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "K66/6G/KC_DEL", "matrix": [6, 6], "x": 15.25, "y": 2.25},
+                {"label": "K67/6H/KC_END", "matrix": [6, 7], "x": 16.25, "y": 2.25},
+                {"label": "K68/6I/KC_PGDN", "matrix": [6, 8], "x": 17.25, "y": 2.25},
+                {"label": "K72/7G/KC_P7", "matrix": [7, 2], "x": 18.5, "y": 2.25},
+                {"label": "K73/7D/KC_P8", "matrix": [7, 3], "x": 19.5, "y": 2.25},
+                {"label": "K74/7E/KC_P9", "matrix": [7, 4], "x": 20.5, "y": 2.25},
+                {"label": "K75/7F/KC_PPLS", "matrix": [7, 5], "x": 21.5, "y": 2.25, "h": 2},
+                {"label": "K30/3A/KC_CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "K31/3B/KC_A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "K32/3C/KC_S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "K33/3D/KC_D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "K34/3E/KC_F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "K35/3F/KC_G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "K36/3G/KC_H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "K37/3H/KC_J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K38/3I/KC_K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "K39/3J/KC_L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "K3A/3K/KC_SCLN", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "K3B/3L/KC_QUOT", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "K3E/3O/KC_ENT", "matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "K76/7G/KC_P4", "matrix": [7, 6], "x": 18.5, "y": 3.25},
+                {"label": "K77/7H/KC_P5", "matrix": [7, 7], "x": 19.5, "y": 3.25},
+                {"label": "K78/7I/KC_P6", "matrix": [7, 8], "x": 20.5, "y": 3.25},
+                {"label": "K40/4A/KC_LSFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "K41/4B/KC_NUBS", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "K42/4C/KC_Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "K43/4D/KC_X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "K44/4E/KC_C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "K45/4F/KC_V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "K46/4G/KC_B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "K47/4H/KC_N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "K48/4I/KC_M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "K49/4J/KC_COMM", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "K4A/4K/KC_DOT", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "K4B/4L/KC_SLSH", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "K4C/4M/KC_ROPT", "matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"label": "K4D/4N/KC_RSFT", "matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"label": "K69/6J/KC_UP", "matrix": [6, 9], "x": 16.25, "y": 4.25},
+                {"label": "K79/7J/KC_P1", "matrix": [7, 9], "x": 18.5, "y": 4.25},
+                {"label": "K7A/7K/KC_P2", "matrix": [7, 10], "x": 19.5, "y": 4.25},
+                {"label": "K7B/7L/KC_P3", "matrix": [7, 11], "x": 20.5, "y": 4.25},
+                {"label": "K7C/7M/KC_PENT", "matrix": [7, 12], "x": 21.5, "y": 4.25, "h": 2},
+                {"label": "K50/5A/KC_LCTL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "K51/5B/KC_LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"label": "K52/5C/KC_LALT", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"label": "K53/5D/KC_MHEN", "matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"label": "K54/5E/KC_NO", "matrix": [5, 4], "x": 4.5, "y": 5.25, "w": 1.75},
+                {"label": "K55/5F/KC_SPC", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 1.25},
+                {"label": "K57/5H/KC_NO", "matrix": [5, 7], "x": 7.5, "y": 5.25, "w": 1.75},
+                {"label": "K58/5I/KC_NO", "matrix": [5, 8], "x": 9.25, "y": 5.25},
+                {"label": "K59/5J/KC_RALT", "matrix": [5, 9], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "K5A/5K/KC_RGUI", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "K5D/5L/KC_APP", "matrix": [5, 13], "x": 12.75, "y": 5.25},
+                {"label": "K5E/5M/KC_RCTL", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"label": "K6A//KC_LEFT", "matrix": [6, 10], "x": 15.25, "y": 5.25},
+                {"label": "K6B//KC_DOWN", "matrix": [6, 11], "x": 16.25, "y": 5.25},
+                {"label": "K6C//KC_RGHT", "matrix": [6, 12], "x": 17.25, "y": 5.25},
+                {"label": "K7D//KC_P0", "matrix": [7, 13], "x": 18.5, "y": 5.25, "w": 2},
+                {"label": "K7E//KC_PDOT", "matrix": [7, 14], "x": 20.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_fullsize_ansi": {
+            "layout": [
+                {"label": "K00/0A/KC_ESC", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K02/0C/KC_F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03/0D/KC_F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04/0E/KC_F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05/0F/KC_F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06/0G/KC_F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "K07/0H/KC_F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "K08/0I/KC_F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "K09/0J/KC_F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "K0B/0L/KC_F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C/0M/KC_F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D/0N/KC_F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E/0O/KC_F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K60/6A/KC_PSCR", "matrix": [6, 0], "x": 15.25, "y": 0},
+                {"label": "K61/6B/KC_SCRL", "matrix": [6, 1], "x": 16.25, "y": 0},
+                {"label": "K62/6C/KC_PAUS", "matrix": [6, 2], "x": 17.25, "y": 0},
+                {"label": "K10/1A/KC_GRV", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "K11/1B/KC_1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "K12/1C/KC_2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "K13/1D/KC_3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "K14/1E/KC_4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "K15/1F/KC_5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "K16/1G/KC_6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "K17/1H/KC_7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "K18/1I/KC_8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "K19/1J/KC_9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "K1A/1K/KC_0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "K1B/1L/KC_MINS", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "K1C/1M/KC_EQL", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "K1E/1O/KC_BSPC", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+                {"label": "K63/6D/KC_INS", "matrix": [6, 3], "x": 15.25, "y": 1.25},
+                {"label": "K64/6E/KC_HOME", "matrix": [6, 4], "x": 16.25, "y": 1.25},
+                {"label": "K65/6F/KC_PGUP", "matrix": [6, 5], "x": 17.25, "y": 1.25},
+                {"label": "K6D/6N/KC_NUM", "matrix": [6, 13], "x": 18.5, "y": 1.25},
+                {"label": "K6E/6O/KC_PSLS", "matrix": [6, 14], "x": 19.5, "y": 1.25},
+                {"label": "K70/7A/KC_PAST", "matrix": [7, 0], "x": 20.5, "y": 1.25},
+                {"label": "K71/7B/KC_PMNS", "matrix": [7, 1], "x": 21.5, "y": 1.25},
+                {"label": "K20/2A/KC_TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "K21/2B/KC_Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "K22/2C/KC_W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "K23/2D/KC_E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "K24/2E/KC_R", "matrix": [2, 4], "x": 4.5, "y": 2.15},
+                {"label": "K25/2F/KC_T", "matrix": [2, 5], "x": 5.5, "y": 2.15},
+                {"label": "K26/2G/KC_Y", "matrix": [2, 6], "x": 6.5, "y": 2.15},
+                {"label": "K27/2H/KC_U", "matrix": [2, 7], "x": 7.5, "y": 2.15},
+                {"label": "K28/2I/KC_I", "matrix": [2, 8], "x": 8.5, "y": 2.15},
+                {"label": "K29/2J/KC_O", "matrix": [2, 9], "x": 9.5, "y": 2.15},
+                {"label": "K2A/2K/KC_P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "K2B/2L/KC_LBRC", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "K2C/2M/KC_RBRC", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "K3C/3M/KC_NUBS", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "K66/6G/KC_DEL", "matrix": [6, 6], "x": 15.25, "y": 2.25},
+                {"label": "K67/6H/KC_END", "matrix": [6, 7], "x": 16.25, "y": 2.25},
+                {"label": "K68/6I/KC_PGDN", "matrix": [6, 8], "x": 17.25, "y": 2.25},
+                {"label": "K72/7G/KC_P7", "matrix": [7, 2], "x": 18.5, "y": 2.25},
+                {"label": "K73/7D/KC_P8", "matrix": [7, 3], "x": 19.5, "y": 2.25},
+                {"label": "K74/7E/KC_P9", "matrix": [7, 4], "x": 20.5, "y": 2.25},
+                {"label": "K75/7F/KC_PPLS", "matrix": [7, 5], "x": 21.5, "y": 2.25, "h": 2},
+                {"label": "K30/3A/KC_CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "K31/3B/KC_A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "K32/3C/KC_S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "K33/3D/KC_D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "K34/3E/KC_F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "K35/3F/KC_G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "K36/3G/KC_H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "K37/3H/KC_J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K38/3I/KC_K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "K39/3J/KC_L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "K3A/3K/KC_SCLN", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "K3B/3L/KC_QUOT", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "K3E/3O/KC_ENT", "matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "K76/7G/KC_P4", "matrix": [7, 6], "x": 18.5, "y": 3.25},
+                {"label": "K77/7H/KC_P5", "matrix": [7, 7], "x": 19.5, "y": 3.25},
+                {"label": "K78/7I/KC_P6", "matrix": [7, 8], "x": 20.5, "y": 3.25},
+                {"label": "K40/4A/KC_LSFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "K42/4C/KC_Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "K43/4D/KC_X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "K44/4E/KC_C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "K45/4F/KC_V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "K46/4G/KC_B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "K47/4H/KC_N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "K48/4I/KC_M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "K49/4J/KC_COMM", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "K4A/4K/KC_DOT", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "K4B/4L/KC_SLSH", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "K4D/4N/KC_RSFT", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"label": "K69/6J/KC_UP", "matrix": [6, 9], "x": 16.25, "y": 4.25},
+                {"label": "K79/7J/KC_P1", "matrix": [7, 9], "x": 18.5, "y": 4.25},
+                {"label": "K7A/7K/KC_P2", "matrix": [7, 10], "x": 19.5, "y": 4.25},
+                {"label": "K7B/7L/KC_P3", "matrix": [7, 11], "x": 20.5, "y": 4.25},
+                {"label": "K7C/7M/KC_PENT", "matrix": [7, 12], "x": 21.5, "y": 4.25, "h": 2},
+                {"label": "K50/5A/KC_LCTL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "K51/5B/KC_LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "K52/5C/KC_LALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "K55/5F/KC_SPC", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "K59/5J/KC_RALT", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "K5A/5K/KC_RGUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "K5D/5N/KC_APP", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "K5E/5O/KC_RCTL", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"label": "K6A/6K/KC_LEFT", "matrix": [6, 10], "x": 15.25, "y": 5.25},
+                {"label": "K6B/6L/KC_DOWN", "matrix": [6, 11], "x": 16.25, "y": 5.25},
+                {"label": "K6C/6M/KC_RGHT", "matrix": [6, 12], "x": 17.25, "y": 5.25},
+                {"label": "K7D/7N/KC_P0", "matrix": [7, 13], "x": 18.5, "y": 5.25, "w": 2},
+                {"label": "K7E/7O/KC_PDOT", "matrix": [7, 14], "x": 20.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_fullsize_iso": {
+            "layout": [
+                {"label": "K00/0A/KC_ESC", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K02/0C/KC_F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03/0D/KC_F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04/0E/KC_F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05/0F/KC_F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06/0G/KC_F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "K07/0H/KC_F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "K08/0I/KC_F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "K09/0J/KC_F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "K0B/0L/KC_F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C/0M/KC_F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D/0N/KC_F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E/0O/KC_F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K60/6A/KC_PSCR", "matrix": [6, 0], "x": 15.25, "y": 0},
+                {"label": "K61/6B/KC_SCRL", "matrix": [6, 1], "x": 16.25, "y": 0},
+                {"label": "K62/6C/KC_PAUS", "matrix": [6, 2], "x": 17.25, "y": 0},
+                {"label": "K10/1A/KC_GRV", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "K11/1B/KC_1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "K12/1C/KC_2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "K13/1D/KC_3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "K14/1E/KC_4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "K15/1F/KC_5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "K16/1G/KC_6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "K17/1H/KC_7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "K18/1I/KC_8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "K19/1J/KC_9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "K1A/1K/KC_0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "K1B/1L/KC_MINS", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "K1C/1M/KC_EQL", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "K1E/1O/KC_BSPC", "matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+                {"label": "K63/6D/KC_INS", "matrix": [6, 3], "x": 15.25, "y": 1.25},
+                {"label": "K64/6E/KC_HOME", "matrix": [6, 4], "x": 16.25, "y": 1.25},
+                {"label": "K65/6F/KC_PGUP", "matrix": [6, 5], "x": 17.25, "y": 1.25},
+                {"label": "K6D/6N/KC_NUM", "matrix": [6, 13], "x": 18.5, "y": 1.25},
+                {"label": "K6E/6O/KC_PSLS", "matrix": [6, 14], "x": 19.5, "y": 1.25},
+                {"label": "K70/7A/KC_PAST", "matrix": [7, 0], "x": 20.5, "y": 1.25},
+                {"label": "K71/7B/KC_PMNS", "matrix": [7, 1], "x": 21.5, "y": 1.25},
+                {"label": "K20/2A/KC_TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "K21/2B/KC_Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "K22/2C/KC_W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "K23/2D/KC_E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "K24/2E/KC_R", "matrix": [2, 4], "x": 4.5, "y": 2.15},
+                {"label": "K25/2F/KC_T", "matrix": [2, 5], "x": 5.5, "y": 2.15},
+                {"label": "K26/2G/KC_Y", "matrix": [2, 6], "x": 6.5, "y": 2.15},
+                {"label": "K27/2H/KC_U", "matrix": [2, 7], "x": 7.5, "y": 2.15},
+                {"label": "K28/2I/KC_I", "matrix": [2, 8], "x": 8.5, "y": 2.15},
+                {"label": "K29/2J/KC_O", "matrix": [2, 9], "x": 9.5, "y": 2.15},
+                {"label": "K2A/2K/KC_P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "K2B/2L/KC_LBRC", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "K2C/2M/KC_RBRC", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "K66/6G/KC_DEL", "matrix": [6, 6], "x": 15.25, "y": 2.25},
+                {"label": "K67/6H/KC_END", "matrix": [6, 7], "x": 16.25, "y": 2.25},
+                {"label": "K68/6I/KC_PGDN", "matrix": [6, 8], "x": 17.25, "y": 2.25},
+                {"label": "K72/7G/KC_P7", "matrix": [7, 2], "x": 18.5, "y": 2.25},
+                {"label": "K73/7D/KC_P8", "matrix": [7, 3], "x": 19.5, "y": 2.25},
+                {"label": "K74/7E/KC_P9", "matrix": [7, 4], "x": 20.5, "y": 2.25},
+                {"label": "K75/7F/KC_PPLS", "matrix": [7, 5], "x": 21.5, "y": 2.25, "h": 2},
+                {"label": "K30/3A/KC_CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "K31/3B/KC_A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "K32/3C/KC_S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "K33/3D/KC_D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "K34/3E/KC_F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "K35/3F/KC_G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "K36/3G/KC_H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "K37/3H/KC_J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K38/3I/KC_K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "K39/3J/KC_L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "K3A/3K/KC_SCLN", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "K3B/3L/KC_QUOT", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "K3C/3M/KC_NUHS", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "K3E/3O/KC_ENT", "matrix": [3, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"label": "K76/7G/KC_P4", "matrix": [7, 6], "x": 18.5, "y": 3.25},
+                {"label": "K77/7H/KC_P5", "matrix": [7, 7], "x": 19.5, "y": 3.25},
+                {"label": "K78/7I/KC_P6", "matrix": [7, 8], "x": 20.5, "y": 3.25},
+                {"label": "K40/4A/KC_LSFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "K41/4B/KC_NUBS", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "K42/4C/KC_Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "K43/4D/KC_X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "K44/4E/KC_C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "K45/4F/KC_V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "K46/4G/KC_B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "K47/4H/KC_N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "K48/4I/KC_M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "K49/4J/KC_COMM", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "K4A/4K/KC_DOT", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "K4B/4L/KC_SLSH", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "K4D/4N/KC_RSFT", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"label": "K69/6J/KC_UP", "matrix": [6, 9], "x": 16.25, "y": 4.25},
+                {"label": "K79/7J/KC_P1", "matrix": [7, 9], "x": 18.5, "y": 4.25},
+                {"label": "K7A/7K/KC_P2", "matrix": [7, 10], "x": 19.5, "y": 4.25},
+                {"label": "K7B/7L/KC_P3", "matrix": [7, 11], "x": 20.5, "y": 4.25},
+                {"label": "K7C/7M/KC_PENT", "matrix": [7, 12], "x": 21.5, "y": 4.25, "h": 2},
+                {"label": "K50/5A/KC_LCTL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "K51/5B/KC_LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "K52/5C/KC_LALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "K55/5F/KC_SPC", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "K59/5J/KC_RALT", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "K5A/5K/KC_RGUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "K5D/5N/KC_APP", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "K5E/5O/KC_RCTL", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"label": "K6A/6K/KC_LEFT", "matrix": [6, 10], "x": 15.25, "y": 5.25},
+                {"label": "K6B/6L/KC_DOWN", "matrix": [6, 11], "x": 16.25, "y": 5.25},
+                {"label": "K6C/6M/KC_RGHT", "matrix": [6, 12], "x": 17.25, "y": 5.25},
+                {"label": "K7D/7N/KC_P0", "matrix": [7, 13], "x": 18.5, "y": 5.25, "w": 2},
+                {"label": "K7E/7O/KC_PDOT", "matrix": [7, 14], "x": 20.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_fullsize_jis": {
+            "layout": [
+                {"label": "K00/0A/KC_ESC", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K02/0C/KC_F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03/0D/KC_F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04/0E/KC_F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05/0F/KC_F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06/0G/KC_F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "K07/0H/KC_F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "K08/0I/KC_F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "K09/0J/KC_F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "K0B/0L/KC_F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C/0M/KC_F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D/0N/KC_F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E/0O/KC_F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K60/6A/KC_PSCR", "matrix": [6, 0], "x": 15.25, "y": 0},
+                {"label": "K61/6B/KC_SCRL", "matrix": [6, 1], "x": 16.25, "y": 0},
+                {"label": "K62/6C/KC_PAUS", "matrix": [6, 2], "x": 17.25, "y": 0},
+                {"label": "K10/1A/KC_GRV", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "K11/1B/KC_1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "K12/1C/KC_2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "K13/1D/KC_3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "K14/1E/KC_4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "K15/1F/KC_5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "K16/1G/KC_6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "K17/1H/KC_7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "K18/1I/KC_8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "K19/1J/KC_9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "K1A/1K/KC_0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "K1B/1L/KC_MINS", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "K1C/1M/KC_EQL", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "K1D/1N/KC_JYEN", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "K1E/1O/KC_BSPC", "matrix": [1, 14], "x": 14, "y": 1.25},
+                {"label": "K63/6D/KC_INS", "matrix": [6, 3], "x": 15.25, "y": 1.25},
+                {"label": "K64/6E/KC_HOME", "matrix": [6, 4], "x": 16.25, "y": 1.25},
+                {"label": "K65/6F/KC_PGUP", "matrix": [6, 5], "x": 17.25, "y": 1.25},
+                {"label": "K6D/6N/KC_NUM", "matrix": [6, 13], "x": 18.5, "y": 1.25},
+                {"label": "K6E/6O/KC_PSLS", "matrix": [6, 14], "x": 19.5, "y": 1.25},
+                {"label": "K70/7A/KC_PAST", "matrix": [7, 0], "x": 20.5, "y": 1.25},
+                {"label": "K71/7B/KC_PMNS", "matrix": [7, 1], "x": 21.5, "y": 1.25},
+                {"label": "K20/2A/KC_TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "K21/2B/KC_Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "K22/2C/KC_W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "K23/2D/KC_E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "K24/2E/KC_R", "matrix": [2, 4], "x": 4.5, "y": 2.15},
+                {"label": "K25/2F/KC_T", "matrix": [2, 5], "x": 5.5, "y": 2.15},
+                {"label": "K26/2G/KC_Y", "matrix": [2, 6], "x": 6.5, "y": 2.15},
+                {"label": "K27/2H/KC_U", "matrix": [2, 7], "x": 7.5, "y": 2.15},
+                {"label": "K28/2I/KC_I", "matrix": [2, 8], "x": 8.5, "y": 2.15},
+                {"label": "K29/2J/KC_O", "matrix": [2, 9], "x": 9.5, "y": 2.15},
+                {"label": "K2A/2K/KC_P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "K2B/2L/KC_LBRC", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "K2C/2M/KC_RBRC", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "K66/6G/KC_DEL", "matrix": [6, 6], "x": 15.25, "y": 2.25},
+                {"label": "K67/6H/KC_END", "matrix": [6, 7], "x": 16.25, "y": 2.25},
+                {"label": "K68/6I/KC_PGDN", "matrix": [6, 8], "x": 17.25, "y": 2.25},
+                {"label": "K72/7G/KC_P7", "matrix": [7, 2], "x": 18.5, "y": 2.25},
+                {"label": "K73/7D/KC_P8", "matrix": [7, 3], "x": 19.5, "y": 2.25},
+                {"label": "K74/7E/KC_P9", "matrix": [7, 4], "x": 20.5, "y": 2.25},
+                {"label": "K75/7F/KC_PPLS", "matrix": [7, 5], "x": 21.5, "y": 2.25, "h": 2},
+                {"label": "K30/3A/KC_CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "K31/3B/KC_A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "K32/3C/KC_S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "K33/3D/KC_D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "K34/3E/KC_F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "K35/3F/KC_G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "K36/3G/KC_H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "K37/3H/KC_J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K38/3I/KC_K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "K39/3J/KC_L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "K3A/3K/KC_SCLN", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "K3B/3L/KC_QUOT", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "K3C/3M/KC_NUHS", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "K3E/3O/KC_ENT", "matrix": [3, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"label": "K76/7G/KC_P4", "matrix": [7, 6], "x": 18.5, "y": 3.25},
+                {"label": "K77/7H/KC_P5", "matrix": [7, 7], "x": 19.5, "y": 3.25},
+                {"label": "K78/7I/KC_P6", "matrix": [7, 8], "x": 20.5, "y": 3.25},
+                {"label": "K40/4A/KC_LSFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "K42/4C/KC_Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "K43/4D/KC_X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "K44/4E/KC_C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "K45/4F/KC_V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "K46/4G/KC_B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "K47/4H/KC_N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "K48/4I/KC_M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "K49/4J/KC_COMM", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "K4A/4K/KC_DOT", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "K4B/4L/KC_SLSH", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "K4C/4M/KC_ROPT", "matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"label": "K4D/4N/KC_RSFT", "matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"label": "K69/6J/KC_UP", "matrix": [6, 9], "x": 16.25, "y": 4.25},
+                {"label": "K79/7J/KC_P1", "matrix": [7, 9], "x": 18.5, "y": 4.25},
+                {"label": "K7A/7K/KC_P2", "matrix": [7, 10], "x": 19.5, "y": 4.25},
+                {"label": "K7B/7L/KC_P3", "matrix": [7, 11], "x": 20.5, "y": 4.25},
+                {"label": "K7C/7M/KC_PENT", "matrix": [7, 12], "x": 21.5, "y": 4.25, "h": 2},
+                {"label": "K50/5A/KC_LCTL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "K51/5B/KC_LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "K52/5C/KC_LALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "K53/5D/KC_MHEN", "matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"label": "K55/5F/KC_SPC", "matrix": [5, 5], "x": 5, "y": 5.25, "w": 3.25},
+                {"label": "K57/5H/KC_INT4", "matrix": [5, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"label": "K58/5I/KC_INT2", "matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 1.25},
+                {"label": "K59/5J/KC_RALT", "matrix": [5, 9], "x": 10.75, "y": 5.25},
+                {"label": "K5A/5K/KC_RGUI", "matrix": [5, 10], "x": 11.75, "y": 5.25},
+                {"label": "K5D/5L/KC_APP", "matrix": [5, 13], "x": 12.75, "y": 5.25},
+                {"label": "K5E/5M/KC_RCTL", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"label": "K6A//KC_LEFT", "matrix": [6, 10], "x": 15.25, "y": 5.25},
+                {"label": "K6B//KC_DOWN", "matrix": [6, 11], "x": 16.25, "y": 5.25},
+                {"label": "K6C//KC_RGHT", "matrix": [6, 12], "x": 17.25, "y": 5.25},
+                {"label": "K7D//KC_P0", "matrix": [7, 13], "x": 18.5, "y": 5.25, "w": 2},
+                {"label": "K7E//KC_PDOT", "matrix": [7, 14], "x": 20.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "K00/0A/KC_ESC", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K02/0C/KC_F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03/0D/KC_F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04/0E/KC_F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05/0F/KC_F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06/0G/KC_F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "K07/0H/KC_F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "K08/0I/KC_F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "K09/0J/KC_F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "K0B/0L/KC_F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C/0M/KC_F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D/0N/KC_F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E/0O/KC_F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K60/6A/KC_PSCR", "matrix": [6, 0], "x": 15.25, "y": 0},
+                {"label": "K61/6B/KC_SCRL", "matrix": [6, 1], "x": 16.25, "y": 0},
+                {"label": "K62/6C/KC_PAUS", "matrix": [6, 2], "x": 17.25, "y": 0},
+                {"label": "K10/1A/KC_GRV", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "K11/1B/KC_1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "K12/1C/KC_2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "K13/1D/KC_3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "K14/1E/KC_4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "K15/1F/KC_5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "K16/1G/KC_6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "K17/1H/KC_7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "K18/1I/KC_8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "K19/1J/KC_9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "K1A/1K/KC_0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "K1B/1L/KC_MINS", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "K1C/1M/KC_EQL", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "K1D/1N/KC_JYEN", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "K1E/1O/KC_BSPC", "matrix": [1, 14], "x": 14, "y": 1.25},
+                {"label": "K63/6D/KC_INS", "matrix": [6, 3], "x": 15.25, "y": 1.25},
+                {"label": "K64/6E/KC_HOME", "matrix": [6, 4], "x": 16.25, "y": 1.25},
+                {"label": "K65/6F/KC_PGUP", "matrix": [6, 5], "x": 17.25, "y": 1.25},
+                {"label": "K6D/6N/KC_NUM", "matrix": [6, 13], "x": 18.5, "y": 1.25},
+                {"label": "K6E/6O/KC_PSLS", "matrix": [6, 14], "x": 19.5, "y": 1.25},
+                {"label": "K70/7A/KC_PAST", "matrix": [7, 0], "x": 20.5, "y": 1.25},
+                {"label": "K71/7B/KC_PMNS", "matrix": [7, 1], "x": 21.5, "y": 1.25},
+                {"label": "K20/2A/KC_TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "K21/2B/KC_Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "K22/2C/KC_W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "K23/2D/KC_E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "K24/2E/KC_R", "matrix": [2, 4], "x": 4.5, "y": 2.15},
+                {"label": "K25/2F/KC_T", "matrix": [2, 5], "x": 5.5, "y": 2.15},
+                {"label": "K26/2G/KC_Y", "matrix": [2, 6], "x": 6.5, "y": 2.15},
+                {"label": "K27/2H/KC_U", "matrix": [2, 7], "x": 7.5, "y": 2.15},
+                {"label": "K28/2I/KC_I", "matrix": [2, 8], "x": 8.5, "y": 2.15},
+                {"label": "K29/2J/KC_O", "matrix": [2, 9], "x": 9.5, "y": 2.15},
+                {"label": "K2A/2K/KC_P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "K2B/2L/KC_LBRC", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "K2C/2M/KC_RBRC", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "K66/6G/KC_DEL", "matrix": [6, 6], "x": 15.25, "y": 2.25},
+                {"label": "K67/6H/KC_END", "matrix": [6, 7], "x": 16.25, "y": 2.25},
+                {"label": "K68/6I/KC_PGDN", "matrix": [6, 8], "x": 17.25, "y": 2.25},
+                {"label": "K72/7G/KC_P7", "matrix": [7, 2], "x": 18.5, "y": 2.25},
+                {"label": "K73/7D/KC_P8", "matrix": [7, 3], "x": 19.5, "y": 2.25},
+                {"label": "K74/7E/KC_P9", "matrix": [7, 4], "x": 20.5, "y": 2.25},
+                {"label": "K75/7F/KC_PPLS", "matrix": [7, 5], "x": 21.5, "y": 2.25, "h": 2},
+                {"label": "K30/3A/KC_CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "K31/3B/KC_A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "K32/3C/KC_S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "K33/3D/KC_D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "K34/3E/KC_F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "K35/3F/KC_G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "K36/3G/KC_H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "K37/3H/KC_J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K38/3I/KC_K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "K39/3J/KC_L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "K3A/3K/KC_SCLN", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "K3B/3L/KC_QUOT", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "K3C/3M/KC_NUHS", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "K3E/3O/KC_ENT", "matrix": [3, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"label": "K76/7G/KC_P4", "matrix": [7, 6], "x": 18.5, "y": 3.25},
+                {"label": "K77/7H/KC_P5", "matrix": [7, 7], "x": 19.5, "y": 3.25},
+                {"label": "K78/7I/KC_P6", "matrix": [7, 8], "x": 20.5, "y": 3.25},
+                {"label": "K40/4A/KC_LSFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "K41/4B/KC_NUBS", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "K42/4C/KC_Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "K43/4D/KC_X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "K44/4E/KC_C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "K45/4F/KC_V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "K46/4G/KC_B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "K47/4H/KC_N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "K48/4I/KC_M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "K49/4J/KC_COMM", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "K4A/4K/KC_DOT", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "K4B/4L/KC_SLSH", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "K4C/4M/KC_ROPT", "matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"label": "K4D/4N/KC_RSFT", "matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"label": "K69/6J/KC_UP", "matrix": [6, 9], "x": 16.25, "y": 4.25},
+                {"label": "K79/7J/KC_P1", "matrix": [7, 9], "x": 18.5, "y": 4.25},
+                {"label": "K7A/7K/KC_P2", "matrix": [7, 10], "x": 19.5, "y": 4.25},
+                {"label": "K7B/7L/KC_P3", "matrix": [7, 11], "x": 20.5, "y": 4.25},
+                {"label": "K7C/7M/KC_PENT", "matrix": [7, 12], "x": 21.5, "y": 4.25, "h": 2},
+                {"label": "K50/5A/KC_LCTL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "K51/5B/KC_LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"label": "K52/5C/KC_LALT", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"label": "K53/5D/KC_MHEN", "matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"label": "K54/5E/KC_NO", "matrix": [5, 4], "x": 4.5, "y": 5.25, "w": 1.75},
+                {"label": "K55/5F/KC_SPC", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 1.25},
+                {"label": "K57/5H/KC_NO", "matrix": [5, 7], "x": 7.5, "y": 5.25, "w": 1.75},
+                {"label": "K58/5I/KC_NO", "matrix": [5, 8], "x": 9.25, "y": 5.25},
+                {"label": "K59/5J/KC_RALT", "matrix": [5, 9], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"label": "K5A/5K/KC_RGUI", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"label": "K5D/5L/KC_APP", "matrix": [5, 13], "x": 12.75, "y": 5.25},
+                {"label": "K5E/5M/KC_RCTL", "matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"label": "K6A//KC_LEFT", "matrix": [6, 10], "x": 15.25, "y": 5.25},
+                {"label": "K6B//KC_DOWN", "matrix": [6, 11], "x": 16.25, "y": 5.25},
+                {"label": "K6C//KC_RGHT", "matrix": [6, 12], "x": 17.25, "y": 5.25},
+                {"label": "K7D//KC_P0", "matrix": [7, 13], "x": 18.5, "y": 5.25, "w": 2},
+                {"label": "K7E//KC_PDOT", "matrix": [7, 14], "x": 20.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/null/st110r2/keymaps/ansi_std/keymap.c b/keyboards/null/st110r2/keymaps/ansi_std/keymap.c
new file mode 100644
index 00000000000..b350c1c28ab
--- /dev/null
+++ b/keyboards/null/st110r2/keymaps/ansi_std/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │               │ 4 │ 5 │ 6 │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    [0] = LAYOUT_fullsize_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_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  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_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    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_ENT,                                   KC_P4,   KC_P5,   KC_P6,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
+    )
+};
diff --git a/keyboards/null/st110r2/keymaps/default/keymap.c b/keyboards/null/st110r2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..e1630128078
--- /dev/null
+++ b/keyboards/null/st110r2/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │               │ 4 │ 5 │ 6 │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │Shft│<|>│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ \_│ Shft │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┼───┼───┴┬──┴┬──┴───┼───┼───┴──┬┴──┬┴───┼───┴┬──┴─┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI│Alt │MHN│Space │SPC│Space │HNK│KNA │Alt │App │Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴───┴────┴───┴──────┴───┴──────┴───┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    [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_PSCR, KC_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS, KC_HOME,KC_PGUP,   KC_NUM, 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_NUHS,            KC_DEL, KC_END, KC_PGDN,   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_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_INT1, KC_RSFT,                    KC_UP,             KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,         KC_SPC,   KC_SPC,  KC_SPC,  KC_INT4,          KC_INT2, KC_RALT, KC_APP,  KC_RCTL,            KC_LEFT,KC_DOWN,KC_RGHT,   KC_P0,           KC_PDOT
+   )
+};
diff --git a/keyboards/null/st110r2/keymaps/iso_default/keymap.c b/keyboards/null/st110r2/keymaps/iso_default/keymap.c
new file mode 100644
index 00000000000..13f31bbf1d1
--- /dev/null
+++ b/keyboards/null/st110r2/keymaps/iso_default/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │    │               │ 4 │ 5 │ 6 │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │Shft│<|>│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ \_│ Shft │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┼───┼───┴┬──┴┬──┴───┼───┼───┴──┬┴──┬┴───┼───┴┬──┴─┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI│Alt │MHN│Space │SPC│Space │HNK│KNA │Alt │App │Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴───┴────┴───┴──────┴───┴──────┴───┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    [0] = LAYOUT_iso(
+        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_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS, KC_HOME,KC_PGUP,   KC_NUM, 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_DEL, KC_END, KC_PGDN,   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_INT1, KC_RSFT,                    KC_UP,             KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,         KC_SPC,   KC_SPC,  KC_SPC,  KC_INT4,          KC_INT2, KC_RALT, KC_APP,  KC_RCTL,            KC_LEFT,KC_DOWN,KC_RGHT,   KC_P0,           KC_PDOT
+   )
+};
diff --git a/keyboards/null/st110r2/keymaps/iso_std/keymap.c b/keyboards/null/st110r2/keymaps/iso_std/keymap.c
new file mode 100644
index 00000000000..a1873be5c80
--- /dev/null
+++ b/keyboards/null/st110r2/keymaps/iso_std/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │               │ 4 │ 5 │ 6 │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    [0] = LAYOUT_fullsize_iso(
+        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_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  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_DEL,  KC_END,  KC_PGDN,    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, KC_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
+    )
+};
diff --git a/keyboards/null/st110r2/keymaps/jis_std/keymap.c b/keyboards/null/st110r2/keymaps/jis_std/keymap.c
new file mode 100644
index 00000000000..95c76bfb559
--- /dev/null
+++ b/keyboards/null/st110r2/keymaps/jis_std/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ZHK│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ^ │ ¥ │Bsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ @ │ [ │     │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Eisu │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ : │ ] │    │               │ 4 │ 5 │ 6 │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ \ │ Shft │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┬───┴┬──┴─┬─┴──┬┴───┴───┴───┼───┴┬──┴─┬─┴─┬─┴─┬─┴─┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI │Alt │Mhen│   Space    │Henk│Kana│Alt│GUI│App│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴────┴────┴────┴────────────┴────┴────┴───┴───┴───┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    [0] = LAYOUT_fullsize_jis(
+        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_SCRL, KC_PAUS,
+
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_INT3, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  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_DEL,  KC_END,  KC_PGDN,    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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT,                     KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_INT5,               KC_SPC,               KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT
+    )
+};
diff --git a/keyboards/null/st110r2/readme.md b/keyboards/null/st110r2/readme.md
new file mode 100644
index 00000000000..c4959b4003b
--- /dev/null
+++ b/keyboards/null/st110r2/readme.md
@@ -0,0 +1,31 @@
+# null/st110r2
+
+null ST110r2 is a custom PCB/keyboard project that supports multiple layouts and is built on top of the Filco and the clones alike.
+
+![st110r2_zoom](https://s3.amazonaws.com/null-src/images/posts/nkbm-st110r2/NKBM-ST110r21-both1.png)
+![st110r2_full](https://s3.amazonaws.com/null-src/images/posts/nkbm-st110r2/NKBM-ST110r21-both3.png)
+
+* Keyboard Maintainer: [user176176](https://github.com/user176176)
+* Hardware Supported: [null] 最高タイプ (SaikouType) NKBM-ST110r2.x keyboard PCBs with Teensy 2.0++.
+* Hardware Availability: [NKBM-ST110r2 - null-src.com](https://null-src.com/posts/nkbm-st110r2/post.php)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make null/st110r2:default
+
+Flashing example for this keyboard:
+
+    make null/st110r2: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 reset button on Teensy
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+![st110r2_pcb](https://s3.amazonaws.com/null-src/images/posts/nkbm-st110r2/NKBM-ST110r2_PCB.jpg)
+![st110r2_build](https://s3.amazonaws.com/null-src/images/posts/nkbm-st110r2/NKBM-ST110r2.1_rosewill_top.jpg)
diff --git a/keyboards/null/st110r2/rules.mk b/keyboards/null/st110r2/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/null/st110r2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/animation_frames.h b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/animation_frames.h
deleted file mode 100644
index ac1e8dee325..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/animation_frames.h
+++ /dev/null
@@ -1,404 +0,0 @@
-/* Copyright 2021 Jay Greco
- *
- * 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 OLED_ENABLE
-
-// Enable OLED bitmpa compression selectively.
-#define USE_OLED_BITMAP_COMPRESSION
-
-#define NUM_IDLE_FRAMES 5
-#define NUM_TAP_FRAMES 2
-#define NUM_OLED_BYTES 512
-
-#ifdef USE_OLED_BITMAP_COMPRESSION
-
-static const char PROGMEM idle_1_block_map[] = { //IDLE_1 and IDLE_2
-    0x80, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
-    0x00, 0xc0, 0x0f, 0x00, 0x00, 0xff, 0x19, 0x00, 0xfc, 0xf1, 0x1d, 0x00, 0x38, 0x00, 0xf3, 0x0f,
-    0xe0, 0x83, 0x0d, 0x0f, 0x00, 0xfe, 0xff, 0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18,
-    0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static const char PROGMEM idle_2_block_map[] = { //IDLE_3
-    0x80, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
-    0x00, 0xc0, 0x0f, 0x00, 0x00, 0xfe, 0x19, 0x00, 0xfe, 0xe3, 0x1f, 0x00, 0x7c, 0x00, 0xf6, 0x0f,
-    0xc0, 0x07, 0x1b, 0x0f, 0x00, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18,
-    0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static const char PROGMEM idle_3_block_map[] = { //IDLE_4
-    0x80, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
-    0x00, 0xc0, 0x0f, 0x00, 0x00, 0xff, 0x19, 0x00, 0xff, 0xf1, 0x1d, 0x00, 0x3e, 0x00, 0xf3, 0x0f,
-    0xe0, 0x83, 0x0d, 0x0f, 0x80, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18,
-    0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static const char PROGMEM idle_4_block_map[] = { //IDLE_5
-    0x80, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
-    0x00, 0xc0, 0x0f, 0x00, 0x00, 0xff, 0x19, 0x00, 0xfe, 0xf1, 0x1d, 0x00, 0x3c, 0x00, 0xf3, 0x0f,
-    0xe0, 0x83, 0x0d, 0x0f, 0x00, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18,
-    0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static const char PROGMEM tap_1_block_map[] = { //TAP_1
-    0x80, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x80, 0x7f, 0xfc, 0x00,
-    0xf8, 0xff, 0xff, 0x03, 0xf8, 0xff, 0x19, 0x00, 0xff, 0xb1, 0x1d, 0x00, 0x3e, 0x00, 0x73, 0x00,
-    0xe0, 0x83, 0xff, 0x01, 0x80, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18,
-    0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static const char PROGMEM tap_2_block_map[] = { //TAP_2
-    0x80, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
-    0x00, 0xfc, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0xff, 0xb1, 0x1d, 0x00, 0x3e, 0x00, 0xf3, 0x8f,
-    0xe0, 0x83, 0x01, 0x3f, 0x80, 0xff, 0xff, 0x7b, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x18,
-    0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static const char PROGMEM idle_1_block_list[] = { //IDLE_1 and IDLE_2
-    0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0, 0x01, 0x1e, 0xe0, 0x80, 0x80, 0x80,
-    0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0xc2, 0xc1, 0x01, 0xc0, 0x3f, 0xe0, 0x10, 0x08, 0x08, 0x04,
-    0x02, 0x01, 0x18, 0x18, 0x03, 0x43, 0xc0, 0x03, 0x7c, 0x80, 0x03, 0x7c, 0x80, 0x13, 0x0c, 0x07,
-    0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x07, 0x18, 0x20, 0x40, 0x80, 0x03, 0x03, 0x1e, 0x1e,
-    0x80, 0x60, 0x18, 0x07, 0x1f, 0x20, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x10, 0x20, 0x40, 0x40,
-    0x40, 0x80, 0x80, 0x9f, 0xe0, 0x01, 0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c
-};
-
-static const char PROGMEM idle_2_block_list[] = { //IDLE_3
-    0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0, 0x01, 0x1e, 0xe0, 0x80, 0x80, 0x80,
-    0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0xc2, 0xc1, 0xc0, 0x3f, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x08,
-    0x04, 0x02, 0x01, 0x18, 0x18, 0x03, 0x43, 0xc0, 0x03, 0x7c, 0x80, 0x01, 0x02, 0x04, 0x78, 0x80,
-    0x13, 0x0c, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x07, 0x18, 0x20, 0x40, 0x80, 0x03,
-    0x03, 0x1e, 0x1e, 0x80, 0x60, 0x18, 0x07, 0x18, 0x26, 0x41, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-    0x10, 0x10, 0x20, 0x60, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x01, 0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0,
-    0x03, 0x7c
-};
-
-static const char PROGMEM idle_3_block_list[] = { //IDLE_4
-    0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0, 0x01, 0x1e, 0xe0, 0x80, 0x80, 0x80,
-    0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0xc2, 0xc1, 0x01, 0xc0, 0x3f, 0xc0, 0x20, 0x10, 0x10, 0x08,
-    0x08, 0x04, 0x02, 0x01, 0x18, 0x18, 0x03, 0x43, 0xc0, 0x03, 0x7c, 0x80, 0x01, 0x02, 0x04, 0x78,
-    0x80, 0x13, 0x0c, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x07, 0x18, 0x20, 0x40, 0x80,
-    0x03, 0x03, 0x1e, 0x1e, 0x80, 0x60, 0x18, 0x07, 0x18, 0x26, 0x41, 0x40, 0x40, 0x40, 0x20, 0x20,
-    0x20, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x01, 0x3e, 0xc0, 0x07, 0xf8,
-    0x1f, 0xe0, 0x03, 0x7c
-};
-
-static const char PROGMEM idle_4_block_list[] = { //IDLE_5
-    0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0, 0x01, 0x1e, 0xe0, 0x80, 0x80, 0x80,
-    0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0xc2, 0xc1, 0x01, 0xc0, 0x3f, 0xe0, 0x10, 0x08, 0x08, 0x08,
-    0x04, 0x02, 0x01, 0x18, 0x18, 0x03, 0x43, 0xc0, 0x03, 0x7c, 0x80, 0x01, 0x06, 0x78, 0x80, 0x13,
-    0x0c, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x07, 0x18, 0x20, 0x40, 0x80, 0x03, 0x03,
-    0x1e, 0x1e, 0x80, 0x60, 0x18, 0x07, 0x18, 0x27, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x10, 0x10,
-    0x20, 0x20, 0x40, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x01, 0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03,
-    0x7c
-};
-
-static const char PROGMEM tap_1_block_list[] = { //TAP_1
-    0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0x81, 0x1e, 0xe0, 0xe0,
-    0xe0, 0xc0, 0xc0, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc1, 0xc3, 0x87, 0x8f, 0x1f, 0x1f, 0x1c,
-    0x01, 0x1e, 0xe0, 0x80, 0xbf, 0xbf, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03,
-    0x03, 0x83, 0x43, 0x21, 0x10, 0x08, 0x04, 0x02, 0x01, 0x01, 0xc0, 0x3f, 0xc0, 0x20, 0x10, 0x10,
-    0x08, 0x08, 0x04, 0x02, 0x01, 0x18, 0x18, 0x40, 0xc0, 0x03, 0x7c, 0x80, 0x01, 0x02, 0x04, 0x78,
-    0x80, 0x13, 0x0c, 0x07, 0x38, 0xc0, 0x07, 0x18, 0x20, 0x40, 0x80, 0x73, 0xab, 0x08, 0x94, 0x64,
-    0x64, 0x04, 0x0f, 0x70, 0x80, 0x18, 0x26, 0x41, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x10, 0x11,
-    0x21, 0x22, 0x42, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x01, 0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03,
-    0x7c
-};
-
-static const char PROGMEM tap_2_block_list[] = { //TAP_2
-    0x07, 0x78, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x01, 0x1e, 0xe0, 0x80, 0x80, 0x80, 0x80, 0x81, 0x1e,
-    0xe0, 0x9e, 0x61, 0x24, 0x51, 0x4c, 0x8c, 0x80, 0x81, 0x01, 0x0e, 0xf0, 0xc0, 0x20, 0x10, 0x10,
-    0x08, 0x08, 0x04, 0x02, 0x01, 0x18, 0x18, 0x40, 0xc0, 0x03, 0x7c, 0x80, 0x01, 0x02, 0x04, 0x78,
-    0x80, 0x13, 0x0c, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0xf0, 0x07, 0x18, 0x20, 0x40,
-    0x80, 0x03, 0x03, 0x80, 0x60, 0x18, 0x07, 0x80, 0x80, 0x18, 0x26, 0x41, 0x40, 0x40, 0x40, 0x20,
-    0x20, 0x20, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x7f, 0x7f, 0x7f, 0x7e,
-    0x01, 0x3e, 0xc0, 0x07, 0xf8, 0x1f, 0xe0, 0x03, 0x7c
-};
-
-// idle_1 and idle_2 are identical, so share them and save some space
-const char* idle_frames[NUM_IDLE_FRAMES] = {
-    idle_1_block_list,
-    idle_1_block_list,
-    idle_2_block_list,
-    idle_3_block_list,
-    idle_4_block_list
-};
-
-const char* tap_frames[NUM_TAP_FRAMES] = {
-    tap_1_block_list,
-    tap_2_block_list
-};
-
-// idle_1 and idle_2 are identical, so save some space
-const char* idle_block_map[NUM_IDLE_FRAMES] = {
-    idle_1_block_map,
-    idle_1_block_map,
-    idle_2_block_map,
-    idle_3_block_map,
-    idle_4_block_map
-};
-
-const char* tap_block_map[NUM_TAP_FRAMES] = {
-    tap_1_block_map,
-    tap_2_block_map
-};
-
-#else
-
-static const char PROGMEM idle_frames[NUM_IDLE_FRAMES][NUM_OLED_BYTES] = {
-  {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e,
-    0xe0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0xc2, 0xc1,
-    0x01, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x18, 0x18, 0x03, 0x43,
-    0xc0, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x13, 0x0c, 0x00, 0x00, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-    0x03, 0x00, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0x40, 0x40, 0x20, 0x20, 0x10,
-    0x10, 0x10, 0x20, 0x40, 0x40, 0x40, 0x80, 0x80, 0x9f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 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, 0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e,
-    0xe0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0xc2, 0xc1,
-    0x01, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x18, 0x18, 0x03, 0x43,
-    0xc0, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x13, 0x0c, 0x00, 0x00, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-    0x03, 0x00, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0x40, 0x40, 0x20, 0x20, 0x10,
-    0x10, 0x10, 0x20, 0x40, 0x40, 0x40, 0x80, 0x80, 0x9f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 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, 0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e,
-    0xe0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0xc2,
-    0xc1, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x18, 0x18, 0x03,
-    0x43, 0xc0, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x02, 0x04, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x13, 0x0c, 0x00, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x03, 0x03, 0x00, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x80, 0x60, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x26, 0x41, 0x40, 0x40, 0x40, 0x20, 0x20,
-    0x20, 0x10, 0x10, 0x20, 0x60, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 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, 0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e,
-    0xe0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0xc2, 0xc1,
-    0x01, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x18, 0x18, 0x03, 0x43,
-    0xc0, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x02, 0x04, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x13, 0x0c, 0x00, 0x00, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-    0x03, 0x00, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x26, 0x41, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-    0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 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, 0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1e,
-    0xe0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0xc2, 0xc1,
-    0x01, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xe0, 0x10, 0x08, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x18, 0x18, 0x03, 0x43,
-    0xc0, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x06, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x13, 0x0c, 0x00, 0x00, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-    0x03, 0x00, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x27, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-    0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 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, 0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    }
-  };
-static const char PROGMEM tap_frames[NUM_TAP_FRAMES][NUM_OLED_BYTES] = {
-  {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 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, 0xe0, 0xe0, 0x81, 0x1e, 0xe0, 0x00,
-    0x00, 0x00, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc1, 0xc3, 0x87, 0x8f, 0x1f, 0x1f, 0x1c, 0x01, 0x1e,
-    0xe0, 0x80, 0xbf, 0xbf, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x83, 0x43, 0x21, 0x10, 0x08, 0x04, 0x02, 0x01,
-    0x01, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x40,
-    0xc0, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x02, 0x04, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x13, 0x0c, 0x00, 0x00, 0x07, 0x38, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73,
-    0xab, 0x08, 0x94, 0x64, 0x64, 0x04, 0x0f, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x26, 0x41, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-    0x10, 0x11, 0x21, 0x22, 0x42, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 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, 0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x78, 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, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 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, 0x1e, 0xe0, 0x00,
-    0x00, 0x00, 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, 0x80, 0x81, 0x1e,
-    0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9e, 0x61, 0x24, 0x51, 0x4c, 0x8c, 0x80, 0x81,
-    0x01, 0x0e, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x40,
-    0xc0, 0x00, 0x03, 0x7c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x02, 0x04, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x13, 0x0c, 0x00, 0x00, 0x07, 0x38, 0x40, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x00, 0x00, 0x00, 0xf0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-    0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x18, 0x07, 0x80, 0x80, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x26, 0x41, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-    0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x40, 0x80, 0x9f, 0xe0, 0x00, 0x7f, 0x7f, 0x7f, 0x7e, 0x00,
-    0x00, 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, 0x3e, 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, 0x07, 0xf8, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x7c,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    },
-  };
-#endif //USE_BITMAP_COMPRESSION
-#endif //OLED_ENABLE
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
deleted file mode 100644
index 33652005cb5..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* Copyright 2021 Jonathan Law, Jay Greco
- *
- * 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/>.
- *
- * Original: j-inc's kyria keymap
- */
-#include QMK_KEYBOARD_H
-#include "animation_frames.h"
-
-enum layer_names {
-  _BASE,
-  _VIA1,
-  _VIA2,
-  _VIA3
-};
-
-#define KC_DISC_MUTE KC_F23
-#define KC_DISC_DEAF KC_F24
-
-enum custom_keycodes {
-  PROG = QK_KB_0,
-  DISC_MUTE,
-  DISC_DEAF,
-  SUPER_ALT_TAB,
-  _NUM_CUST_KCS,
-};
-
-// Macro variables
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-bool muted = false;
-bool deafened = false;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_all(
-              QK_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_HOME,
-    KC_F13,   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_F14,   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_F15,   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_F16,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                  MO(_VIA1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [_VIA1] = LAYOUT_all(
-              QK_BOOT, 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_END,
-    RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT
-  ),
-
-  [_VIA2] = LAYOUT_all(
-              _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
-  ),
-
-  [_VIA3] = LAYOUT_all(
-              _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
-  ),
-
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
-
-#ifdef OLED_ENABLE
-#define IDLE_FRAME_DURATION 200 // Idle animation iteration rate in ms
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-
-bool tap_anim        = false;
-bool tap_anim_toggle = false;
-
-
-// Decompress and write a precompressed bitmap frame to the OLED.
-// Documentation and python compression script available at:
-// https://github.com/nullbitsco/squeez-o
-#ifdef USE_OLED_BITMAP_COMPRESSION
-static void oled_write_compressed_P(const char* input_block_map, const char* input_block_list) {
-    uint16_t block_index = 0;
-    for (uint16_t i=0; i<NUM_OLED_BYTES; i++) {
-        uint8_t bit = i%8;
-        uint8_t map_index = i/8;
-        uint8_t _block_map = (uint8_t)pgm_read_byte_near(input_block_map + map_index);
-        uint8_t nonzero_byte = (_block_map & (1 << bit));
-        if (nonzero_byte) {
-            const char data = (const char)pgm_read_byte_near(input_block_list + block_index++);
-            oled_write_raw_byte(data, i);
-        } else {
-            const char data = (const char)0x00;
-            oled_write_raw_byte(data, i);
-        }
-    }
-}
-#endif
-
-static void render_anim(void) {
-    // Idle animation
-    void animation_phase(void) {
-        if (!tap_anim) {
-            current_idle_frame = (current_idle_frame + 1) % NUM_IDLE_FRAMES;
-            uint8_t idx = abs((NUM_IDLE_FRAMES - 1) - current_idle_frame);
-            #ifdef USE_OLED_BITMAP_COMPRESSION
-            oled_write_compressed_P(idle_block_map[idx], idle_frames[idx]);
-            #else
-            oled_write_raw_P(idle_frames[idx], NUM_OLED_BYTES);
-            #endif
-        }
-    }
-
-    // Idle behaviour
-    if (get_current_wpm() != 000) {  // prevent sleep
-        oled_on();
-        if (timer_elapsed32(anim_timer) > IDLE_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {  // Turn off screen when timer threshold elapsed or reset time since last input
-        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > IDLE_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-bool oled_task_user(void) {
-    render_anim();
-    oled_set_cursor(0, 14);
-
-    uint8_t n = get_current_wpm();
-    char wpm_counter[6];
-    wpm_counter[5] = '\0';
-    wpm_counter[4] = '0' + n % 10;
-    wpm_counter[3] = '0' + (n /= 10) % 10;
-    wpm_counter[2] = '0' + n / 10 ;
-    wpm_counter[1] = '0';
-    wpm_counter[0] = '>';
-    oled_write_ln(wpm_counter, false);
-
-    return false;
-}
-#endif
-
-// Animate tap
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    #ifdef OLED_ENABLE
-    // Check if non-mod
-    if ((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) {
-        if (record->event.pressed) {
-            // Display tap frames
-            tap_anim_toggle = !tap_anim_toggle;
-            #ifdef USE_OLED_BITMAP_COMPRESSION
-            oled_write_compressed_P(tap_block_map[tap_anim_toggle], tap_frames[tap_anim_toggle]);
-            #else
-            oled_write_raw_P(tap_frames[tap_anim_toggle], NUM_OLED_BYTES);
-            #endif
-        }
-    }
-    #endif
-
-    switch(keycode) {
-        case PROG:
-          if (record->event.pressed) {
-            rgblight_disable_noeeprom();
-            #ifdef OLED_ENABLE
-            oled_off();
-            #endif
-            bootloader_jump();
-          }
-        break;
-
-        case DISC_MUTE:
-          if (record->event.pressed) {
-            tap_code(KC_DISC_MUTE);
-            if (!rgblight_is_enabled()) break;
-
-            if (muted) {
-              rgblight_enable_noeeprom();
-            } else {
-              rgblight_timer_disable();
-              uint8_t val = rgblight_get_val();
-              rgblight_sethsv_range(255, 255, val, 0, 1);
-            }
-            muted = !muted;
-          }
-        break;
-
-        case DISC_DEAF:
-          if (record->event.pressed) {
-            tap_code(KC_DISC_DEAF);
-            if (!rgblight_is_enabled()) break;
-
-            if (deafened) {
-              rgblight_enable_noeeprom();
-            } else {
-              rgblight_timer_disable();
-              uint8_t val = rgblight_get_val();
-              rgblight_sethsv_range(255, 255, val, 0, RGBLED_NUM-1);
-            }
-            deafened = !deafened;
-          }
-        break;
-
-        case SUPER_ALT_TAB:
-          if (record->event.pressed) {
-            if (!is_alt_tab_active) {
-              is_alt_tab_active = true;
-              register_code(KC_LALT);
-            }
-            alt_tab_timer = timer_read();
-            register_code(KC_TAB);
-          } else {
-            unregister_code(KC_TAB);
-          }
-          break;
-
-        default:
-        break;
-    }
-
-    return true;
-}
-
-void matrix_scan_user(void) {
-  if (is_alt_tab_active) {
-    if (timer_elapsed(alt_tab_timer) > 1000) {
-      unregister_code(KC_LALT);
-      is_alt_tab_active = false;
-    }
-  }
-}
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/readme.md b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/readme.md
deleted file mode 100644
index 81286d1afeb..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# The Bongo Cat WPM Layout!
-
-![Oled Preview](http://i.imgur.com/e2QHJnn.png)
-
-If you're looking for the Bongo Cat/WPM Counter firmware for your Nibble, this is it! The OLED occupies the bottom two left macro key spots, so there isn't anything assigned. However, if you've manually wired the oled to a different position, you can assign keys to those locations. This uses the default keymap layout so everything is where you expect it to be.
-
-Now optimized to fit VIA support! This uses the [squeez-o](https://github.com/nullbitsco/squeez-o) tool to compress the animation frames, which reduces their program memory usage by a large amount.
-
-![Layout Image](http://i.imgur.com/5Q6BzAe.png)
\ No newline at end of file
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk
deleted file mode 100644
index 1909c7ef9a3..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-VIA_ENABLE = yes
diff --git a/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c b/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c
deleted file mode 100644
index a53335003f6..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c
+++ /dev/null
@@ -1,543 +0,0 @@
-/* Copyright 2021 dogspace <https://github.com/dogspace>
- *
- * 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 custom_keycodes {
-    KC_CUST = SAFE_RANGE,
-};
-
-enum layer_names {
-    _MA,
-    _L1,
-    _L2,
-    _L3
-};
-
-// NOTE: Default keymap layers were designed for ANSI split-space layout  http://www.keyboard-layout-editor.com/#/gists/f28bd5ff4e62f69e89896df3a59671c6
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MA] = 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, KC_DEL,
-        KC_MUTE,   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, LCTL(KC_F),
-        KC_CAPS,   MO(_L2),    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_CALC,
-        TG(_L2),   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_WHOM,
-        MO(_L3),   KC_LCTL,    KC_LGUI, KC_LALT,                   KC_SPC,                    MO(_L1), LCTL(KC_C), LCTL(KC_V),    KC_LEFT,          KC_DOWN, KC_RGHT
-    ),
-    [_L1] = LAYOUT_ansi(
-                   KC_GRAVE,   _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______, _______, _______, _______,
-        RGB_TOG,   _______,    _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   _______,    _______,       _______, _______, _______, _______,
-        _______,   LCTL(KC_Z), KC_LCTL, KC_LSFT, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT,   KC_END,        _______,          _______, _______,
-        _______,   _______,    _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______,    LCTL(KC_SLSH), _______,          _______, _______,
-        _______,   _______,    _______, _______,                   _______,                   _______, LCTL(KC_X), _______,       _______,          _______, _______
-    ),
-    [_L2] = LAYOUT_ansi(
-                   KC_GRAVE,   _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______, _______, _______, _______,
-        RGB_TOG,   _______,    _______, _______, _______, _______, _______, KC_PAST, KC_7,    KC_8,    KC_9,       _______,       _______, _______, _______, _______,
-        _______,   _______,    _______, _______, _______, _______, _______, KC_PPLS, KC_4,    KC_5,    KC_6,       _______,       _______,          _______, _______,
-        _______,   _______,    _______, _______, _______, _______, _______, KC_PMNS, KC_1,    KC_2,    KC_3,       _______,       _______,          _______, _______,
-        _______,   _______,    _______, _______,                   KC_0,                      KC_PSLS, _______,    _______,       _______,          _______, _______
-    ),
-    [_L3] = LAYOUT_ansi(
-                 _______,    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, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______, _______, _______, _______,
-        _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______,          _______, _______,
-        KC_SYRQ, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______,          _______, _______,
-        _______, _______,    _______, _______,                   _______,                   _______, _______,    _______,       _______,          _______, _______
-    )
-};
-
-#ifdef OLED_ENABLE
-/*===========================================    OLED CONFIGURATION    ===========================================*/
-bool  oled_horizontal   = true;         // OLED rotation  (true = horizontal,  false = vertical)
-bool  ansi_layout       = true;         // ANSI or ISO layout  (true = ANSI,  false = ISO)
-bool  split_space       = true;         // Split spacebar  (true = split spacebar,  false = 6.25u or 7u spacebar)
-bool  three_mods_left   = true;         // Left mods layout  (true = 3x 1.25u keys,  false = 2x 1.5u keys)
-bool  three_mods_right  = false;        // Right mods layout  (true = 3x 1u keys,  false = 2x 1.5u keys)
-bool  graph_direction   = true;         // Graph movement  (true = right to left,  false = left to right)
-float graph_top_wpm     = 100.0;        // Minimum WPM required to reach the top of the graph
-int   graph_refresh     = 1000;         // In milliseconds, determines the graph-line frequency
-int   icon_med_wpm      = 50;           // WPM required to display the medium snail
-int   icon_fast_wpm     = 72;           // WPM required to display the fast snail
-// Layer names:  Should be exactly 5 characters in length if vertical display, or 6 characters if horizontal
-#define MA_LAYER_NAME     "QWERTY"      // Layer _MA name
-#define L1_LAYER_NAME     "ARROWS"      // Layer _L1 name
-#define L2_LAYER_NAME     "NUMPAD"      // Layer _L2 name
-#define L3_LAYER_NAME     "FUNCTN"      // Layer _L3 name
-/*================================================================================================================*/
-bool  first_loop  = true;
-int   timer       = 0;
-int   wpm_limit   = 20;
-int   max_wpm     = -1;
-int   wpm_icon    = -1;
-int   graph_lines[64];
-
-// Set OLED rotation
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (oled_horizontal) {
-        return OLED_ROTATION_180;
-    } else {
-        return OLED_ROTATION_90;
-    }
-}
-
-// Toggles pixel on/off, converts horizontal coordinates to vertical equivalent if necessary
-static void write_pixel(int x, int y, bool onoff) {
-    if (oled_horizontal) {
-        oled_write_pixel(x, y, onoff);
-    } else {
-        oled_write_pixel(y, 127 - x, onoff);
-    }
-}
-
-// Draw static background image to OLED (keyboard with no bottom row)
-static void render_background(void) {
-    if (oled_horizontal) {
-        static const char PROGMEM oled_keymap_horizontal[] = {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 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,
-            0x84, 0x80, 0x80, 0x80, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04,
-            0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00,
-            0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
-            0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00,
-            0x80, 0x04, 0x04, 0x04, 0x04, 0x84, 0x84, 0x84, 0x84, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
-            0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10,
-            0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
-            0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-            0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
-            0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
-            0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-            0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
-            0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02,
-            0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02,
-            0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-        oled_write_raw_P(oled_keymap_horizontal, sizeof(oled_keymap_horizontal));
-    } else {
-        static const char PROGMEM oled_keymap_vertical[] = {
-            0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00,
-            0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00,
-            0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
-            0x00, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
-            0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00,
-            0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
-            0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00,
-            0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
-            0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
-            0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
-            0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-        oled_write_raw_P(oled_keymap_vertical, sizeof(oled_keymap_vertical));
-    }
-}
-
-// Location of OLED keyboard's top left pixel, relative to the display
-static const int keymap_template[2] = {41, 0};
-// Location of key highlights top left pixels, relative to keymap_template  {X, Y, Key length in px}
-static int keymap_coords[MATRIX_ROWS][MATRIX_COLS][3] = {
-    { {12, 15, 1}, {5, 0, 1},  {10, 0, 1},  {15, 0, 1},  {20, 0, 1},  {25, 0, 1},  {30, 0, 1},   {35, 0, 1},  {40, 0, 1},  {45, 0, 1},  {50, 0, 1},  {55, 0, 1},  {60, 0, 1},  {65, 0, 1}, {70, 0, 8},  {82, 0, 1}  },
-    { {0, 5, 1},   {5, 5, 5},  {14, 5, 1},  {19, 5, 1},  {24, 5, 1},  {29, 5, 1},  {34, 5, 1},   {39, 5, 1},  {44, 5, 1},  {49, 5, 1},  {54, 5, 1},  {59, 5, 1},  {64, 5, 1},  {69, 5, 1}, {74, 5, 4},  {82, 5, 1}  },
-    { {0, 10, 1},  {5, 10, 6}, {15, 10, 1}, {20, 10, 1}, {25, 10, 1}, {30, 10, 1}, {35, 10, 1},  {40, 10, 1}, {45, 10, 1}, {50, 10, 1}, {55, 10, 1}, {60, 10, 1}, {65, 10, 1}, {0, 0, 0},  {70, 10, 8}, {82, 10, 1} },
-    { {0, 15, 1},  {5, 15, 8}, {17, 15, 1}, {22, 15, 1}, {27, 15, 1}, {32, 15, 1}, {37, 15, 1},  {42, 15, 1}, {47, 15, 1}, {52, 15, 1}, {57, 15, 1}, {62, 15, 1}, {67, 15, 6}, {0, 0, 0},  {77, 15, 1}, {82, 15, 1} },
-    { {0, 20, 1},  {5, 20, 2}, {11, 20, 2}, {17, 20, 2}, {0, 0, 0},   {0, 0, 0},   {23, 20, 12}, {0, 0, 0},   {0, 0, 0},   {39, 20, 3}, {56, 20, 4}, {64, 20, 4}, {72, 20, 1}, {0, 0, 0},  {77, 20, 1}, {82, 20, 1} }
-};
-
-// Draw the bottom row of the keyboard (based on OLED config variables), update coordinates
-static void render_fn_row(void) {
-    // Update locations of spacebar and modifier key highlights
-    if ((split_space == false) && (three_mods_left == false)) {
-        keymap_coords[4][1][2] = 3;
-        keymap_coords[4][2][0] = 12;
-        keymap_coords[4][2][2] = 3;
-        keymap_coords[4][3][0] = 0;
-        keymap_coords[4][3][1] = 0;
-        keymap_coords[4][3][2] = 0;
-        keymap_coords[4][6][0] = 19;
-        keymap_coords[4][6][2] = 34;
-    } else if ((split_space == false) && (three_mods_left == true)) {
-        keymap_coords[4][6][2] = 30;
-    }
-    if ((split_space == false) && (three_mods_right == true)) {
-        keymap_coords[4][9][0]  = 57;
-        keymap_coords[4][9][2]  = 1;
-        keymap_coords[4][10][0] = 62;
-        keymap_coords[4][10][2] = 1;
-        keymap_coords[4][11][0] = 67;
-        keymap_coords[4][11][2] = 1;
-    }
-    // Draw modifiers
-    for (int i = 0; i < 16; i++) {
-        if (keymap_coords[4][i][2] != 0) {
-            for (int p = 0; p < keymap_coords[4][i][2]; p++) {
-                int x = keymap_template[0] + keymap_coords[4][i][0] + 2 + p;
-                write_pixel(x, 22, true);
-            }
-        }
-    }
-    // Draw second line for split spacebar
-    if (split_space == true) {
-        for (int i = 0; i < 6; i++) {
-            int x = keymap_template[0] + 46 + 2 + i;
-            write_pixel(x, 22, true);
-        }
-    }
-}
-
-// Update OLED keyboard with ISO layout, update coordinates
-static void render_iso(void) {
-    for (int i = 0; i < 6; i++) {
-        // Turn off ANSI enter
-        write_pixel(keymap_template[0] + 73 + i, keymap_template[1] + 12, false);
-        if (i < 4) {
-            // Turn off part of ANSI left shift
-            write_pixel(keymap_template[0] + 10 + i, keymap_template[1] + 17, false);
-            // Draw vertical line for ISO enter
-            write_pixel(keymap_template[0] + 79, keymap_template[1] + 8 + i, true);
-        }
-    }
-    // Update locations of shift and grave key highlights
-    keymap_coords[3][1][2]  = 3;
-    keymap_coords[1][14][0] = 70;
-    keymap_coords[1][14][1] = 10;
-    keymap_coords[1][14][2] = 1;
-}
-
-// Toggles pixels surrounding key
-static void render_keymap(uint8_t key_row, uint8_t key_col, bool onoff) {
-    int length = keymap_coords[key_row][key_col][2] + 4;
-    int left   = keymap_coords[key_row][key_col][0] + keymap_template[0];
-    int top    = keymap_coords[key_row][key_col][1] + keymap_template[1];
-    int right  = left + length - 1;
-    int bottom = top + 4;
-
-    // Special case 1 - Draw enter key on ISO layout, return
-    if ((ansi_layout == false) && (key_row == 2) && (key_col == 14)) {
-        for (int i = 0; i < 10; i++) {
-            write_pixel(keymap_template[0] + 81, keymap_template[1] + 5 + i, onoff);
-            if (i < 5) {
-                write_pixel(keymap_template[0] + 74, keymap_template[1] + 5 + i, onoff);
-            }
-            if (i < 6) {
-                write_pixel(keymap_template[0] + 75, keymap_template[1] + 9 + i, onoff);
-            }
-            if (i < 7) {
-                write_pixel(keymap_template[0] + 75 + i, keymap_template[1] + 5, onoff);
-                write_pixel(keymap_template[0] + 75 + i, keymap_template[1] + 14, onoff);
-            }
-        }
-        return;
-    }
-    // Draw top and bottom walls (horizontal for <length>px)
-    for (int x = 0; x < length; x++) {
-        write_pixel(left + x, top, onoff);
-        write_pixel(left + x, bottom, onoff);
-    }
-    // Draw left and right walls (vertical for 5px)
-    for (int y = 0; y < 5; y++) {
-        write_pixel(left,  top + y, onoff);
-        write_pixel(right, top + y, onoff);
-    }
-    // Special case 2 - Draw right spacebar on split-space layout
-    if ((split_space == true) && (key_row == 4) && (key_col == 6)) {
-        int start = keymap_template[0] + 46;
-        int stop  = keymap_template[0] + 55;
-        for (int x = start; x < stop; x++) {
-            write_pixel(x, top, onoff);
-            write_pixel(x, bottom, onoff);
-        }
-        for (int y = 0; y < 5; y++) {
-            write_pixel(start, top + y, onoff);
-            write_pixel(stop,  top + y, onoff);
-        }
-    }
-}
-
-// Write active layer name
-static void render_layer_state(void) {
-  if (oled_horizontal) {
-    oled_set_cursor(0, 0);
-  } else {
-    oled_set_cursor(0, 15);
-  }
-  switch (get_highest_layer(layer_state)) {
-  case _MA:
-      oled_write_P(PSTR(MA_LAYER_NAME), false);
-      break;
-  case _L1:
-      oled_write_P(PSTR(L1_LAYER_NAME), false);
-      break;
-  case _L2:
-      oled_write_P(PSTR(L2_LAYER_NAME), false);
-      break;
-  case _L3:
-      oled_write_P(PSTR(L3_LAYER_NAME), false);
-      break;
-  default:
-      oled_write("ERROR", false);
-      break;
-  }
-}
-
-// Update WPM counters
-static void render_wpm_counters(int current_wpm) {
-    int cursorposition_cur = 2;
-    int cursorposition_max = 1;
-    if (oled_horizontal == false) {
-        cursorposition_cur = 13;
-        cursorposition_max = 14;
-    }
-
-    char wpm_counter[4];
-    wpm_counter[3] = '\0';
-    wpm_counter[2] = '0' + current_wpm % 10;
-    wpm_counter[1] = '0' + (current_wpm / 10) % 10;
-    wpm_counter[0] = '0' + (current_wpm / 100) % 10;
-    oled_set_cursor(0, cursorposition_cur);
-    oled_write(wpm_counter, false);
-
-    if (current_wpm > max_wpm) {
-        max_wpm = current_wpm;
-        wpm_limit = max_wpm + 20;
-        oled_set_cursor(0, cursorposition_max);
-        oled_write(wpm_counter, false);
-    }
-}
-
-// Update WPM snail icon
-static void render_wpm_icon(int current_wpm) {
-    // wpm_icon is used to prevent unnecessary redraw
-    if ((current_wpm < icon_med_wpm) && (wpm_icon != 0)) {
-        wpm_icon = 0;
-    } else if ((current_wpm >= icon_med_wpm) && (current_wpm < icon_fast_wpm) && (wpm_icon != 1)) {
-        wpm_icon = 1;
-    } else if ((current_wpm >= icon_fast_wpm) && (wpm_icon != 2)) {
-        wpm_icon = 2;
-    } else {
-        return;
-    }
-    static const char PROGMEM snails[][2][24] = {
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0xA0, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x50, 0x88, 0x04, 0x00, 0x00},
-         {0x40, 0x60, 0x50, 0x4E, 0x51, 0x64, 0x4A, 0x51, 0x54, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x40, 0x30, 0x09, 0x04, 0x02, 0x01, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x04, 0x98, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00},
-         {0x60, 0x50, 0x54, 0x4A, 0x51, 0x64, 0x4A, 0x51, 0x55, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x21, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x10, 0x10, 0x10, 0x20, 0x40, 0x40, 0xC0, 0x80, 0x80, 0x00, 0x00, 0x00},
-         {0x60, 0x58, 0x54, 0x62, 0x49, 0x54, 0x52, 0x51, 0x55, 0x49, 0x62, 0x52, 0x4D, 0x45, 0x46, 0x22, 0x21, 0x11, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00}}
-    };
-    if (oled_horizontal) {
-        oled_set_cursor(3, 1);
-        oled_write_raw_P(snails[wpm_icon][0], sizeof(snails[wpm_icon][0]));
-        oled_set_cursor(3, 2);
-        oled_write_raw_P(snails[wpm_icon][1], sizeof(snails[wpm_icon][1]));
-    } else {
-        oled_set_cursor(0, 11);
-        oled_write_raw_P(snails[wpm_icon][0], sizeof(snails[wpm_icon][0]));
-        oled_set_cursor(0, 12);
-        oled_write_raw_P(snails[wpm_icon][1], sizeof(snails[wpm_icon][1]));
-    }
-}
-
-// Update WPM graph
-static void render_wpm_graph(int current_wpm) {
-    int line_height = ((current_wpm / graph_top_wpm) * 7);
-    if (line_height > 7) {
-        line_height = 7;
-    }
-    // Count graph line pixels, return if nothing to draw
-    int pixel_count = line_height;
-    for (int i = 0; i < 63; i++) {
-        pixel_count += graph_lines[i];
-    }
-    if (pixel_count == 0) {
-        return;
-    }
-    // Shift array elements left or right depending on graph_direction, append new graph line
-    if (graph_direction) {
-        for (int i = 0; i < 63; i++) {
-            graph_lines[i] = graph_lines[i + 1];
-        }
-        graph_lines[63] = line_height;
-    } else {
-        for (int i = 63; i > 0; i--) {
-            graph_lines[i] = graph_lines[i - 1];
-        }
-        graph_lines[0] = line_height;
-    }
-    // Draw all graph lines (left to right, bottom to top)
-    int draw_count, arrpos;
-    for (int x = 1; x <= 127; x += 2) {
-        arrpos = x / 2;
-        draw_count = graph_lines[arrpos];
-        for (int y = 31; y >= 25; y--) {
-            if (draw_count > 0) {
-                write_pixel(x, y, true);
-                draw_count--;
-            } else {
-                write_pixel(x, y, false);
-            }
-        }
-    }
-}
-
-// Call OLED functions
-bool oled_task_user(void) {
-    // Draw OLED keyboard, prevent redraw
-    if (first_loop) {
-        render_background();
-        render_fn_row();
-        if (ansi_layout == false) {
-            render_iso();
-        }
-        first_loop = false;
-    }
-    // Get current WPM, subtract 25% for accuracy and prevent large jumps caused by simultaneous keypresses
-    int current_wpm = get_current_wpm();
-    // Note: This will most likely be removed once QMK's WPM calculation is updated
-    current_wpm -= current_wpm >> 2;
-    if (current_wpm > wpm_limit) {
-        current_wpm = max_wpm;
-        set_current_wpm(max_wpm);
-    }
-    // Write active layer name to display
-    render_layer_state();
-    // Update WPM counters
-    render_wpm_counters(current_wpm);
-    // Update WPM snail icon
-    render_wpm_icon(current_wpm);
-    // Update WPM graph every graph_refresh milliseconds
-    if (timer_elapsed(timer) > graph_refresh) {
-        render_wpm_graph(current_wpm);
-        timer = timer_read();
-    }
-    return false;
-}
-#endif
-
-// Called by QMK during key processing
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Forwards keystrokes from an external input device over UART/TRRS
-    process_record_remote_kb(keycode, record);
-
-    #ifdef OLED_ENABLE
-    // Toggle pixels surrounding key
-    render_keymap(record->event.key.row, record->event.key.col, record->event.pressed);
-    #endif
-
-    return true;
-}
-
-// Rotary encoder - RGB and OLED settings
-void change_RGB(bool clockwise) {
-    // While on any layer except default:       // Rotary         = RGB Mode
-    bool shift = get_mods() & MOD_MASK_SHIFT;   // Rotary + Shift = OLED Brightness
-    bool ctrl = get_mods() & MOD_MASK_CTRL;     // Rotary + Ctrl  = RGB Brightness
-    bool gui = get_mods() & MOD_MASK_GUI;       // Rotary + Gui   = RGB Saturation
-    bool alt = get_mods() & MOD_MASK_ALT;       // Rotary + Alt   = RGB Hue
-
-    if (clockwise) {
-        if (shift) {
-            int new_brightness = oled_get_brightness() + 10;
-            if (new_brightness < 255) {
-                oled_set_brightness(new_brightness);
-            } else {
-                oled_set_brightness(255);
-            }
-        } else if (ctrl) {
-            rgblight_increase_val();
-        } else if (gui) {
-            rgblight_increase_sat();
-        } else if (alt) {
-            rgblight_increase_hue();
-        } else {
-            rgblight_step();
-        }
-    } else {
-        if (shift) {
-            int new_brightness = oled_get_brightness() - 10;
-            if (new_brightness > 0) {
-                oled_set_brightness(new_brightness);
-            } else {
-                oled_set_brightness(0);
-            }
-        } else if (ctrl) {
-            rgblight_decrease_val();
-        } else if (gui) {
-            rgblight_decrease_sat();
-        } else if (alt) {
-            rgblight_decrease_hue();
-        } else {
-            rgblight_step_reverse();
-        }
-    }
-}
-
-// Rotary encoder behavior - Change volume on default layer, RGB/OLED on other layers
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (layer_state_is(0)) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else {
-        change_RGB(clockwise);
-    }
-    return true;
-}
-
-// Initialize remote keyboard, if connected
-void matrix_init_user(void) {
-    matrix_init_remote_kb();
-}
-
-// Scan and parse keystrokes from remote keyboard, if connected
-void matrix_scan_user(void) {
-    matrix_scan_remote_kb();
-}
diff --git a/keyboards/nullbitsco/nibble/keymaps/snailmap/readme.md b/keyboards/nullbitsco/nibble/keymaps/snailmap/readme.md
deleted file mode 100644
index 5ea93b01afb..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/snailmap/readme.md
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# SnailMap
-
-![KeySnail](https://i.imgur.com/yEQJyI2h.png)
-
-## :snail: Display
-
-- Mini keyboard that highlights the currently pressed keys
-- Snail icon that changes based on the current WPM
-- Current and max WPM counters
-- Active layer name
-- WPM graph
-
-## :gear: Customization
-
-The `OLED configuration variables` can be used to easily customize the display
-
-```
-oled_horizontal     - Horizontal or vertical orientation
-ansi_layout         - ANSI or ISO layout
-split_space         - Bottom row spacebar
-three_mods_left     - Left modifier keys
-three_mods_right    - Right modifier keys
-graph_direction     - Graph movement direction
-graph_refresh       - Frequency of graph lines
-graph_top_wpm       - WPM required to reach the top of the graph
-icon_med_wpm        - WPM required to display the medium snail
-icon_fast_wpm       - WPM required to display the fast snail
-MA_LAYER_NAME       - Layer 0 display name
-L1_LAYER_NAME       - Layer 1 display name
-L2_LAYER_NAME       - Layer 2 display name
-L3_LAYER_NAME       - Layer 3 display name
-```
-___
-
-###### *Keymap created by* [dogspace](https://github.com/dogspace)
diff --git a/keyboards/nullbitsco/nibble/keymaps/snailmap/rules.mk b/keyboards/nullbitsco/nibble/keymaps/snailmap/rules.mk
deleted file mode 100644
index 4e0f1b619a2..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/snailmap/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
index b71f9119ef4..4e2f7dd4d6e 100644
--- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
@@ -112,7 +112,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         } else {
           rgblight_timer_disable();
           uint8_t val = rgblight_get_val();
-          rgblight_sethsv_range(255, 255, val, 0, RGBLED_NUM-1);
+          rgblight_sethsv_range(255, 255, val, 0, RGBLIGHT_LED_COUNT-1);
         }
         deafened = !deafened;
       }
diff --git a/keyboards/nullbitsco/scramble/keymaps/oled/config.h b/keyboards/nullbitsco/scramble/keymaps/oled/config.h
index cd980b09366..67a896c8af0 100644
--- a/keyboards/nullbitsco/scramble/keymaps/oled/config.h
+++ b/keyboards/nullbitsco/scramble/keymaps/oled/config.h
@@ -18,5 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 // Alternate boot pins for accessing the bootloader,
 // since the boot switch is blocked by the OLED.
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 2
+#define BOOTMAGIC_ROW 1
+#define BOOTMAGIC_COLUMN 2
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/config.h b/keyboards/nullbitsco/snap/keymaps/typehud/config.h
deleted file mode 100644
index 62c11709a23..00000000000
--- a/keyboards/nullbitsco/snap/keymaps/typehud/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2022 Chris Tanaka <https://github.com/christanaka>
- *
- * 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
-
-/* space savers */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-#define NO_ACTION_TAPPING
-#define NO_ACTION_ONESHOT
-#define TAPPING_FORCE_HOLD
-
-// Old configuration
-#define OLED_BRIGHTNESS 128
-#define OLED_TIMEOUT 30000
-#define OLED_UPDATE_INTERVAL 200
-
-// Selectively undefine to save space
-// VIA support won't fit otherwise
-#ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_EFFECT_TWINKLE
-#endif //RGB LIGHT_ENABLE
-
-// Split configuration
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_WPM_ENABLE
-
-// Typehud configuration
-#define TYPEHUD_FILLGRAPH
-#define TYPEHUD_MATRIX_COLS 16
-// #define TYPEHUD_MASTER
-// #define TYPEHUD_MATRIX_ROTATE_90
-// #define TYPEHUD_MATRIX_ROTATE_180
-// #define TYPEHUD_MATRIX_ROTATE_270
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/keymap.c b/keyboards/nullbitsco/snap/keymaps/typehud/keymap.c
deleted file mode 100644
index 231c9d85452..00000000000
--- a/keyboards/nullbitsco/snap/keymaps/typehud/keymap.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Copyright 2022 Chris Tanaka <https://github.com/christanaka>
- *
- * 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 "typehud.h"
-
-// clang-format off
-enum layers {
-    _BASE,
-    _VIA1,
-    _VIA2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = 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_PSCR,  KC_PAUS,
-    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_F14,  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_F15,  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_F16,  KC_LSFT,  KC_NUHS, 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_F17,  KC_LCTL,  KC_LGUI, KC_LALT,     MO(_VIA1),         KC_SPC,   KC_SPC,                  MO(_VIA1), KC_RALT,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-    [_VIA1] = LAYOUT_all(
-            QK_BOOT,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,  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,    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,  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,          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
-  ),
-    [_VIA2] = LAYOUT_all(
-            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,  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,          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,  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,  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
-  )
-};
-// clang-format on
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
-    [_VIA1] = { ENCODER_CCW_CW(KC_NO, KC_NO),     ENCODER_CCW_CW(KC_NO, KC_NO) },
-    [_VIA2] = { ENCODER_CCW_CW(KC_NO, KC_NO),     ENCODER_CCW_CW(KC_NO, KC_NO) }
-};
-#endif
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    oled_clear();
-
-#ifdef TYPEHUD_MASTER
-    if (is_keyboard_master()) {
-#else
-    if (!is_keyboard_master()) {
-#endif
-        typehud_init();
-    }
-
-    if (is_keyboard_left())
-        return OLED_ROTATION_0;
-    else
-        return OLED_ROTATION_180;
-}
-
-static void render_status(void) {
-    oled_set_cursor(0, 0);
-    oled_write_P(PSTR("SNAP75 "), false);
-    oled_write_P(PSTR("Layer "), false);
-    switch (get_highest_layer(layer_state)) {
-        case _VIA1:
-            oled_write_P(PSTR("FN1 "), false);
-            break;
-        case _VIA2:
-            oled_write_P(PSTR("FN2 "), false);
-            break;
-        default: // use BASE case as default
-            oled_write_P(PSTR("Base"), false);
-    }
-
-    // Host Keyboard LED Status
-    oled_set_cursor(0, 1);
-    static led_t persistent_led_state = {0};
-    led_t led_state = host_keyboard_led_state();
-
-    // Only update if the LED state has changed
-    // Otherwise, the OLED will not turn off if an LED is on.
-    if (persistent_led_state.raw != led_state.raw) {
-        persistent_led_state = led_state;
-
-        oled_write_ln_P(PSTR("            "), false);
-
-        if (led_state.caps_lock) {
-            oled_set_cursor(0, 1);
-            oled_write_P(PSTR("CAPS"), false);
-        }
-
-        if (led_state.num_lock) {
-            oled_set_cursor(5, 1);
-            oled_write_P(PSTR("NUM"), true);
-        }
-
-        if (led_state.scroll_lock) {
-            oled_set_cursor(9, 1);
-            oled_write_P(PSTR("SCR"), false);
-        }
-    }
-
-    // WPM and max WPM
-    oled_set_cursor(0, 2);
-    oled_write_P(PSTR("WPM "), false);
-    uint8_t current_wpm = get_current_wpm();
-    oled_write(get_u8_str(current_wpm, '0'), true);
-
-    oled_set_cursor(8, 2);
-    oled_write_P(PSTR("MAX "), false);
-    static uint8_t max_wpm;
-    max_wpm = MAX(max_wpm, current_wpm);
-    oled_write(get_u8_str(max_wpm, '0'), true);
-}
-
-bool oled_task_user(void) {
-#ifdef TYPEHUD_MASTER
-    if (is_keyboard_master()) {
-#else
-    if (!is_keyboard_master()) {
-#endif
-        typehud_render();
-    } else {
-        render_status();
-    }
-
-    return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    typehud_process_record(record);
-    return true;
-}
-
-bool should_process_keypress(void) {
-    return true;
-}
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/readme.md b/keyboards/nullbitsco/snap/keymaps/typehud/readme.md
deleted file mode 100644
index d5f50f310c8..00000000000
--- a/keyboards/nullbitsco/snap/keymaps/typehud/readme.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Typehud Keymap
-
-VIA compatible keymap that displays a live wpm HUD on your OLED.
-
-<https://nullbits.co/static/file/snap-typehud.webp>
-
-## Configuration
-
-Configuration options (other than the keymap itself) can be found in `typehud/config.h`.
-
-### Graph Type
-
-By default the graph is filled. For a non-filled graph remove or comment out the following line:
-
-```c
-#define TYPEHUD_FILLGRAPH
-```
-
-### Keyboard Matrix Orientation
-
-To change the keyboard matrix orientation add one of the following:
-
-- `TYPEHUD_MATRIX_ROTATE_90`
-- `TYPEHUD_MATRIX_ROTATE_180`
-- `TYPEHUD_MATRIX_ROTATE_270`
-
-### Keyboard Matrix Key Overrides
-
-If the number of physical keys doesn't match the keyboard matrix rows/columns you can override it:
-
-```c
-#define TYPEHUD_MATRIX_ROWS 6
-#define TYPEHUD_MATRIX_COLS 16
-```
-
-In addition if the position of the physical keys doesn't match the matrix you can override it. Negative numbers will shift the keys left/up and positive numbers will shift the keys right/down:
-
-```c
-#define TYPEHUD_MATRIX_ROW_SHIFT -1
-#define TYPEHUD_MATRIX_COL_SHIFT -2
-```
-
-### Split Keyboard Side
-
-For split keyboards, the keymap assumes it will be rendered to the slave side.
-
-To render to master instead, add the following configuration line:
-
-```c
-#define TYPEHUD_MASTER
-```
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk b/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk
deleted file mode 100644
index 16bd6085c05..00000000000
--- a/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-VIA_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
-
-SRC += typehud.c
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/typehud.c b/keyboards/nullbitsco/snap/keymaps/typehud/typehud.c
deleted file mode 100644
index ad884f843b8..00000000000
--- a/keyboards/nullbitsco/snap/keymaps/typehud/typehud.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/* Copyright 2023 Jay Greco
- *
- * 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 "typehud.h"
-
-static bool     is_initialized;
-static uint16_t timer;
-static int8_t   bar_height;
-static uint8_t  wpm_arr[_GRAPH_WIDTH];
-static uint8_t  point_arr[_GRAPH_WIDTH];
-
-
-static void 
-    render_graph(uint8_t wpm),
-    render_caret(void),
-    render_axis(void),
-    render_bar(void),
-    render_init(void);
-
-/*
- * Renders the wpm counter.
- */
-static void render_wpm(uint8_t wpm) {
-    oled_set_cursor(0, 0);
-    oled_write("WPM", false);
-    oled_set_cursor(0, 1);
-    oled_write(get_u8_str(wpm, '0'), false);
-}
-
-/*
- * Renders the keyboard matrix.
- */
-static void render_matrix(keyrecord_t *record) {
-    uint8_t x      = _MATRIX_X;
-    uint8_t y      = _MATRIX_Y;
-    uint8_t width  = _MATRIX_WIDTH;
-    uint8_t height = _MATRIX_HEIGHT;
-#ifdef SPLIT_KEYBOARD
-    uint8_t rows = _NML_MATRIX_ROWS;
-    uint8_t cols = _NML_MATRIX_COLS;
-#endif
-
-    // On initial render draw the matrix outline
-    if (!is_initialized) {
-        for (uint8_t i = 1; i <= width - 2; i++) {
-            oled_write_pixel(x + i, y, true);
-            oled_write_pixel(x + i, y + height - 1, true);
-        }
-        for (uint8_t j = 1; j <= height - 2; j++) {
-            oled_write_pixel(x, y + j, true);
-            oled_write_pixel(x + width - 1, y + j, true);
-        }
-        return;
-    }
-
-    // Determine position based on matrix rotation
-    // For split keyboards the keys on the right half get appended as additional rows and
-    // have their columns reset at 0
-#ifdef SPLIT_KEYBOARD
-    uint8_t row = (record->event.key.row % rows);
-    uint8_t col = record->event.key.col;
-    if (record->event.key.row >= rows) {
-        col += (cols / 2);
-    }
-#else
-    uint8_t row = record->event.key.row;
-    uint8_t col = record->event.key.col;
-#endif
-
-#ifdef TYPEHUD_MATRIX_ROW_SHIFT
-    row += TYPEHUD_MATRIX_ROW_SHIFT;
-#endif
-#ifdef TYPEHUD_MATRIX_COL_SHIFT
-    col += TYPEHUD_MATRIX_COL_SHIFT;
-#endif
-
-    // Scale position to key size
-    uint8_t size = _MATRIX_SIZE;
-    row *= size;
-    col *= size;
-
-    // Render key in matrix
-    for (int i = 0; i < size; i++) {
-        for (int j = 0; j < size; j++) {
-#if defined(TYPEHUD_MATRIX_ROTATE_90)
-            uint8_t key_x = x + width - 1 - size - row;
-            uint8_t key_y = y + 1 + col;
-#elif defined(TYPEHUD_MATRIX_ROTATE_180)
-            uint8_t key_x = x + width - 1 - size - col;
-            uint8_t key_y = y + height - 1 - size - row;
-#elif defined(TYPEHUD_MATRIX_ROTATE_270)
-            uint8_t key_x = x + 1 + row;
-            uint8_t key_y = y + height - 1 - size - col;
-#else
-            uint8_t key_x = x + 1 + col;
-            uint8_t key_y = y + 1 + row;
-#endif
-            oled_write_pixel(key_x + i, key_y + j, record->event.pressed);
-        }
-    }
-}
-
-/*
- * Renders the graph.
- */
-static void render_graph(uint8_t wpm) {
-    uint8_t x      = _GRAPH_X;
-    uint8_t y      = _GRAPH_Y + _GRAPH_HEIGHT;
-    uint8_t width  = _GRAPH_WIDTH;
-    uint8_t height = _GRAPH_HEIGHT;
-
-    // Handle intial graph render
-    if (!is_initialized) {
-        for (uint8_t i = 0; i < width; i++) {
-            oled_write_pixel(x + i, y, true);
-        }
-        return;
-    }
-
-    uint8_t i = 0;
-
-    // Shift all graph points except last to the left and re-render
-    for (; i < width - 1; i++) {
-        int8_t point_delta = point_arr[i + 1] - point_arr[i];
-
-#ifdef TYPEHUD_FILLGRAPH
-        if (point_delta < 0) {
-#else
-        if (point_delta != 0) {
-#endif
-            oled_write_pixel(x + i, y - point_arr[i], false);
-        }
-
-        wpm_arr[i]   = wpm_arr[i + 1];
-        point_arr[i] = point_arr[i + 1];
-
-        if (point_delta != 0) {
-            oled_write_pixel(x + i, y - point_arr[i], true);
-        }
-    }
-
-    // Clear last graph point
-    if (wpm > wpm_arr[i] && point_arr[i] + 1 <= height) {
-#ifndef TYPEHUD_FILLGRAPH
-        oled_write_pixel(x + i, y - point_arr[i], false);
-#endif
-        point_arr[i] = point_arr[i] + 1;
-    } else if ((wpm < wpm_arr[i] && point_arr[i] - 1 >= 0) || (wpm <= 0 && point_arr[i] > 0)) {
-        oled_write_pixel(x + i, y - point_arr[i], false);
-        point_arr[i] = point_arr[i] - 1;
-    }
-
-    // Render last graph point
-    wpm_arr[i] = wpm;
-
-    if (point_arr[i] != point_arr[i - 1]) {
-        oled_write_pixel(x + i, y - point_arr[i], true);
-    }
-}
-
-/*
- * Renders the caret.
- */
-static void render_caret(void) {
-    uint8_t x        = _GRAPH_X + _GRAPH_WIDTH + _GRAPH_RPAD + _CARET_WIDTH;
-    uint8_t y        = 0;
-    uint8_t width    = _CARET_WIDTH;
-    uint8_t height   = _CARET_HEIGHT;
-    uint8_t g_width  = _GRAPH_WIDTH;
-    uint8_t g_height = _GRAPH_HEIGHT;
-
-    // Handle initial caret render
-    if (!is_initialized) {
-        y = g_height - point_arr[g_width - 1];
-
-        for (uint8_t i = 0; i < width; i++) {
-            for (uint8_t j = i; j < height - i; j++) {
-                oled_write_pixel(x - i, y - j, true);
-            }
-        }
-        return;
-    }
-
-    // Handle caret updates and re-render
-    int8_t point_delta = point_arr[g_width - 1] - point_arr[g_width - 2];
-    if (point_delta > 0) {
-        y = g_height - point_arr[g_width - 2];
-        if (y - height + 1 > 0) {
-            for (uint8_t i = 0; i < width; i++) {
-                oled_write_pixel(x - i, y - i, false);
-                oled_write_pixel(x - i, y - height + i, true);
-            }
-        }
-    } else if (point_delta < 0) {
-        y = g_height - point_arr[g_width - 1];
-        if (y - height + 1 > 0) {
-            for (uint8_t i = 0; i < width; i++) {
-                oled_write_pixel(x - i, y - height + i, false);
-                oled_write_pixel(x - i, y - i, true);
-            }
-        }
-    }
-}
-
-/*
- * Renders the axis.
- */
-static void render_axis(void) {
-    uint8_t x             = _AXIS_X;
-    uint8_t y             = _AXIS_HEIGHT;
-    uint8_t width         = _AXIS_WIDTH;
-    uint8_t height        = _AXIS_HEIGHT;
-    uint8_t tick_width    = _AXIS_TICK_WIDTH;
-    uint8_t subtick_width = _AXIS_SUBTICK_WIDTH;
-    uint8_t interval      = _AXIS_INTERVAL;
-    uint8_t tick_interval = _AXIS_TICK_INTERVAL;
-
-    for (uint8_t j = 0; j <= height; j += interval) {
-        uint8_t curr_tick_width = 0;
-
-        // Determine tick width and draw extra point if at interval
-        if (j % tick_interval == 0) {
-            curr_tick_width = tick_width;
-            oled_write_pixel(x, y - j, true);
-        } else {
-            curr_tick_width = subtick_width;
-        }
-
-        // Draw tick
-        for (uint8_t i = 0; i < curr_tick_width; i++) {
-            oled_write_pixel(x + width - i, y - j, true);
-        }
-    }
-}
-
-/*
- * Renders the input bar.
- */
-static void render_bar(void) {
-    uint8_t x      = _BAR_X;
-    uint8_t width  = _BAR_WIDTH;
-    uint8_t height = _BAR_HEIGHT;
-
-    // Increment bar height
-    bar_height = (bar_height + 1) % height;
-
-    // When bar resets back to 0, clear bar pixels
-    if (bar_height % height == 0) {
-        for (uint8_t i = 0; i < width; i++) {
-            for (uint8_t j = 0; j < height; j++) {
-                oled_write_pixel(x + i, j, false);
-            }
-        }
-    }
-
-    // Draw new bar pixels
-    for (uint8_t i = 0; i < width; i++) {
-        oled_write_pixel(x + i, height - bar_height, true);
-    }
-}
-
-/*
- * Renders the initial frame for all components.
- */
-static void render_init(void) {
-    render_graph(0);
-    render_caret();
-    render_matrix(NULL);
-    render_axis();
-}
-
-/*
- * Initializes and resets the typehud.
- */
-void typehud_init(void) {
-    // Reset variables
-    is_initialized = false;
-    timer          = 0;
-    bar_height     = -1;
-
-    for (uint8_t i = 0; i < _GRAPH_WIDTH; i++) {
-        wpm_arr[i]   = 0;
-        point_arr[i] = 0;
-    }
-
-    // Draw the initial graph
-    for (uint8_t i = 0; i < _GRAPH_WIDTH; i++) {
-        oled_write_pixel(_GRAPH_X + i, _GRAPH_HEIGHT, true);
-    }
-}
-
-/*
- * Renders the typehud.
- */
-void typehud_render(void) {
-    uint8_t wpm = get_current_wpm();
-
-    // Run initial rendering once
-    if (!is_initialized) {
-        render_init();
-        is_initialized = true;
-    }
-
-    // Render wpm
-    render_wpm(wpm);
-
-    // Render next graph and caret frame when timer reaches refresh rate
-    if (timer_elapsed(timer) > _GRAPH_REFRESH) {
-        render_graph(wpm);
-        render_caret();
-        timer = timer_read();
-    }
-}
-
-/*
- * Handles keypresses for the typehud.
- */
-void typehud_process_record(keyrecord_t *record) {
-    // For split keyboards, only draw on correct side
-#ifdef SPLIT_KEYBOARD
-#    ifdef TYPEHUD_MASTER
-    if (!is_keyboard_master()) {
-#    else
-    if (is_keyboard_master()) {
-#    endif
-        return;
-    }
-#endif
-    // Render/update matrix
-    render_matrix(record);
-
-    // Render/update input bar on keypress
-    if (record->event.pressed) {
-        render_bar();
-    }
-}
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/typehud.h b/keyboards/nullbitsco/snap/keymaps/typehud/typehud.h
deleted file mode 100644
index c3ed876c422..00000000000
--- a/keyboards/nullbitsco/snap/keymaps/typehud/typehud.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2022 Chris Tanaka <https://github.com/christanaka>
- *
- * 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
-
-// clang-format off
-#define _OLED_WIDTH         (OLED_DISPLAY_WIDTH - 1)
-#define _OLED_HEIGHT        (OLED_DISPLAY_HEIGHT - 1)
-
-#ifdef SPLIT_KEYBOARD
-#define _PHYSICAL_PARTS 2
-#else
-#define _PHYSICAL_PARTS 1
-#endif
-
-#ifdef TYPEHUD_MATRIX_ROWS
-#define _NML_MATRIX_ROWS TYPEHUD_MATRIX_ROWS
-#else
-#    ifdef SPLIT_KEYBOARD
-#define _NML_MATRIX_ROWS (MATRIX_ROWS / 2)
-#    else
-#define _NML_MATRIX_ROWS MATRIX_ROWS
-#    endif
-#endif
-
-#ifdef TYPEHUD_MATRIX_COLS
-#define _NML_MATRIX_COLS TYPEHUD_MATRIX_COLS
-#else
-#define _NML_MATRIX_COLS (MATRIX_COLS * _PHYSICAL_PARTS)
-#endif
-
-#define _MATRIX_SIZE        2
-#if defined(TYPEHUD_MATRIX_ROTATE_90) || defined(TYPEHUD_MATRIX_ROTATE_270)
-#define _MATRIX_WIDTH       (_NML_MATRIX_ROWS * _MATRIX_SIZE + 2)
-#define _MATRIX_HEIGHT      (_NML_MATRIX_COLS * _MATRIX_SIZE + 2)
-#else
-#define _MATRIX_WIDTH       (_NML_MATRIX_COLS * _MATRIX_SIZE + 2)
-#define _MATRIX_HEIGHT      (_NML_MATRIX_ROWS * _MATRIX_SIZE + 2)
-#endif
-#define _MATRIX_X           0
-#define _MATRIX_Y           (_OLED_HEIGHT - _MATRIX_HEIGHT + 1)
-#define _MATRIX_RPAD        2
-#define _MATRIX_PAD_WIDTH   (_MATRIX_WIDTH + _MATRIX_RPAD)
-
-#define _BAR_WIDTH          3
-#define _BAR_HEIGHT         _OLED_HEIGHT
-#define _BAR_X              (_OLED_WIDTH - _BAR_WIDTH)
-
-#define _AXIS_WIDTH         5
-#define _AXIS_HEIGHT        _OLED_HEIGHT
-#define _AXIS_TICK_WIDTH    3
-#define _AXIS_SUBTICK_WIDTH 2
-#define _AXIS_INTERVAL      3
-#define _AXIS_TICK_INTERVAL 15
-#define _AXIS_RPAD          2
-#define _AXIS_PAD_WIDTH     (_AXIS_WIDTH + _AXIS_RPAD)
-#define _AXIS_X             (_OLED_WIDTH - _BAR_WIDTH - _AXIS_PAD_WIDTH)
-
-#define _CARET_WIDTH        3
-#define _CARET_HEIGHT       5
-
-#define _GRAPH_RPAD         2
-#define _GRAPH_MAX_WIDTH    (_OLED_WIDTH - _BAR_WIDTH - _AXIS_PAD_WIDTH - _CARET_WIDTH - _GRAPH_RPAD - _MATRIX_PAD_WIDTH)
-#define _GRAPH_WIDTH        (_GRAPH_MAX_WIDTH - 4)
-#define _GRAPH_HEIGHT       31
-#define _GRAPH_REFRESH      300
-#define _GRAPH_X            (_MATRIX_WIDTH + _MATRIX_RPAD)
-#define _GRAPH_Y            0
-// clang-format on
-
-void 
-    typehud_init(void),
-    typehud_render(void),
-    typehud_process_record(keyrecord_t *record);
diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
deleted file mode 100644
index d14723df034..00000000000
--- a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* Copyright 2021 dogspace <https://github.com/dogspace>
- *
- * 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 {
-    _LAY0,
-    _LAY1,
-    _LAY2,
-    _LAY3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_LAY0] = LAYOUT(
-        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
-    ),
-    [_LAY1] = LAYOUT(
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______
-    ),
-    [_LAY2] = LAYOUT(
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______
-    ),
-    [_LAY3] = LAYOUT(
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______
-    )
-};
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
-    [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
-    [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
-    [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
-};
-#endif
-
-#ifdef OLED_ENABLE
-/*===========================================    OLED CONFIGURATION    ===========================================*/
-#define OLED_ROTATE      true         // OLED rotation (flip 180* from default orientation)
-#define GRAPH_DIRECTION  true         // Graph movement  (true = right to left,  false = left to right)
-#define GRAPH_TOP_WPM    100.0        // Minimum WPM required to reach the top of the graph
-#define GRAPH_REFRESH    1000         // In milliseconds, determines the graph-line frequency
-#define ICON_MED_WPM     10           // WPM required to display the medium snail
-#define ICON_FAST_WPM    25           // WPM required to display the fast snail
-
-// Layer names:  Should be exactly 5 characters in length if vertical display, or 6 characters if horizontal
-#define MA_LAYER_NAME     "LAY 0"      // Layer _MA name
-#define L1_LAYER_NAME     "LAY 1"      // Layer _L1 name
-#define L2_LAYER_NAME     "LAY 2"      // Layer _L2 name
-#define L3_LAYER_NAME     "LAY 3"      // Layer _L3 name
-
-#define CAPLCK_STR        "CAPLK"       // Caps Lock string
-#define NUMLCK_STR        "NUMLK"       // Num Lock string
-#define SCRLK_STR         "SCRLK"       // Scroll Lock string
-#define EMPTY_STR         "     "       // Empty string
-
-/*================================================================================================================*/
-
-typedef struct oled_params {
-    bool first_loop : 1;
-    uint8_t wpm_icon : 7;
-    uint16_t timer;
-    uint8_t wpm_limit;
-    uint8_t max_wpm;
-    uint8_t graph_lines[32];
-} oled_params;
-
-oled_params oled_data;
-
-void oled_init_data(void) {
-    // Initialize oled params
-    oled_data.first_loop = true;
-    oled_data.wpm_icon = 5;
-    oled_data.timer = 0;
-    oled_data.wpm_limit = 20;
-    oled_data.max_wpm = 0;
-
-    for (int i=0; i<32; i++) {
-        oled_data.graph_lines[i] = 0;
-    }
-}
-
-// Set OLED rotation
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    oled_init_data();
-    return OLED_ROTATE ? OLED_ROTATION_270 : OLED_ROTATION_90;
-}
-
-// Draw static background image to OLED (keyboard with no bottom row)
-static void render_background(void) {
-    static const char PROGMEM nullbits_n_oled[] = {
-        0x00, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0x80, 0x20, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-        0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
-        0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-        0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x00,
-    };
-    oled_write_raw_P(nullbits_n_oled, sizeof(nullbits_n_oled));
-}
-
-// Toggles pixel on/off, converts horizontal coordinates to vertical equivalent if necessary
-static void write_pixel(uint8_t x, uint8_t y, bool onoff) {
-    oled_write_pixel(y, 127 - x, onoff);
-}
-
-// Write active layer name
-static void render_layer_state(void) {
-  oled_set_cursor(0, 15);
-  switch (get_highest_layer(layer_state)) {
-  case _LAY0:
-      oled_write_P(PSTR(MA_LAYER_NAME), false);
-      break;
-  case _LAY1:
-      oled_write_P(PSTR(L1_LAYER_NAME), false);
-      break;
-  case _LAY2:
-      oled_write_P(PSTR(L2_LAYER_NAME), false);
-      break;
-  case _LAY3:
-      oled_write_P(PSTR(L3_LAYER_NAME), false);
-      break;
-  default:
-      oled_write("ERROR", false);
-      break;
-  }
-}
-
-// Update WPM counters
-static void render_wpm_counters(uint8_t current_wpm) {
-    uint8_t cursorposition_cur = 13;
-    uint8_t cursorposition_max = 14;
-
-    oled_set_cursor(0, cursorposition_cur);
-    oled_write(get_u8_str(current_wpm, '0'), false);
-
-    if (current_wpm > oled_data.max_wpm) {
-        oled_data.max_wpm = current_wpm;
-        oled_data.wpm_limit = oled_data.max_wpm + 20;
-        oled_set_cursor(0, cursorposition_max);
-        oled_write(get_u8_str(current_wpm, '0'), false);
-    }
-}
-
-static void render_led_status(void) {
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_set_cursor(0, 8);
-    oled_write_P(led_state.caps_lock ? PSTR(CAPLCK_STR) : PSTR(EMPTY_STR), false);
-    oled_set_cursor(0, 9);
-    oled_write_P(led_state.num_lock ? PSTR(NUMLCK_STR) : PSTR(EMPTY_STR), false);
-    oled_set_cursor(0, 10);
-    oled_write_P(led_state.scroll_lock ? PSTR(SCRLK_STR) : PSTR(EMPTY_STR), false);
-}
-
-// Update WPM snail icon
-static void render_wpm_icon(uint8_t current_wpm) {
-    // wpm_icon is used to prevent unnecessary redraw
-    if ((current_wpm < ICON_MED_WPM) && (oled_data.wpm_icon != 0)) {
-        oled_data.wpm_icon = 0;
-    } else if ((current_wpm >= ICON_MED_WPM) && (current_wpm < ICON_FAST_WPM) && (oled_data.wpm_icon != 1)) {
-        oled_data.wpm_icon = 1;
-    } else if ((current_wpm >= ICON_FAST_WPM) && (oled_data.wpm_icon != 2)) {
-        oled_data.wpm_icon = 2;
-    } else {
-        return;
-    }
-    static const char PROGMEM snails[][2][24] = {
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0xA0, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x50, 0x88, 0x04, 0x00, 0x00},
-         {0x40, 0x60, 0x50, 0x4E, 0x51, 0x64, 0x4A, 0x51, 0x54, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x40, 0x30, 0x09, 0x04, 0x02, 0x01, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x04, 0x98, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00},
-         {0x60, 0x50, 0x54, 0x4A, 0x51, 0x64, 0x4A, 0x51, 0x55, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x21, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x10, 0x10, 0x10, 0x20, 0x40, 0x40, 0xC0, 0x80, 0x80, 0x00, 0x00, 0x00},
-         {0x60, 0x58, 0x54, 0x62, 0x49, 0x54, 0x52, 0x51, 0x55, 0x49, 0x62, 0x52, 0x4D, 0x45, 0x46, 0x22, 0x21, 0x11, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00}}
-    };
-    oled_set_cursor(0, 11);
-    oled_write_raw_P(snails[oled_data.wpm_icon][0], sizeof(snails[oled_data.wpm_icon][0]));
-    oled_set_cursor(0, 12);
-    oled_write_raw_P(snails[oled_data.wpm_icon][1], sizeof(snails[oled_data.wpm_icon][1]));
-}
-
-// Update WPM graph
-static void render_wpm_graph(uint8_t current_wpm) {
-    uint8_t line_height = ((current_wpm / GRAPH_TOP_WPM) * 7);
-    if (line_height > 7) {
-        line_height = 7;
-    }
-    // Count graph line pixels, return if nothing to draw
-    uint8_t pixel_count = line_height;
-    for (int i = 0; i < 31; i++) {
-        pixel_count += oled_data.graph_lines[i];
-    }
-    if (pixel_count == 0) {
-        return;
-    }
-    // Shift array elements left or right depending on GRAPH_DIRECTION pend new graph line
-    if (GRAPH_DIRECTION) {
-        for (int i = 0; i < 31; i++) {
-            oled_data.graph_lines[i] = oled_data.graph_lines[i + 1];
-        }
-        oled_data.graph_lines[31] = line_height;
-    } else {
-        for (int i = 31; i > 0; i--) {
-            oled_data.graph_lines[i] = oled_data.graph_lines[i - 1];
-        }
-        oled_data.graph_lines[0] = line_height;
-    }
-    // Draw all graph lines (left to right, bottom to top)
-    uint16_t draw_count, arrpos;
-    for (int x = 1; x <= 63; x += 2) {
-        arrpos = x / 2;
-        draw_count = oled_data.graph_lines[arrpos];
-        for (int y = 31; y >= 25; y--) {
-            if (draw_count > 0) {
-                write_pixel(x, y, true);
-                draw_count--;
-            } else {
-                write_pixel(x, y, false);
-            }
-        }
-    }
-}
-
-// Call OLED functions
-bool oled_task_user(void) {
-    // Draw OLED keyboard, prevent redraw
-    if (oled_data.first_loop) {
-        render_background();
-        oled_data.first_loop = false;
-    }
-    // Get current WPM, subtract 25% for accuracy and prevent large jumps caused by simultaneous keypresses
-    uint8_t current_wpm = get_current_wpm();
-    // Write active layer name to display
-    render_layer_state();
-    // Update WPM counters
-    render_wpm_counters(current_wpm);
-    // Update WPM snail icon
-    render_wpm_icon(current_wpm);
-    // Update LED status
-    render_led_status();
-    // Update WPM graph every graph_refresh milliseconds
-    if (timer_elapsed(oled_data.timer) > GRAPH_REFRESH) {
-        render_wpm_graph(current_wpm);
-        oled_data.timer = timer_read();
-    }
-    return false;
-}
-#endif
-
-bool wpm_keycode_user(uint16_t keycode) {
-    // Count all keycodes on the macropad
-    return true;
-}
-
diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
deleted file mode 100644
index 605f034e1df..00000000000
--- a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-VIA_ENABLE = yes
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/numatreus/keymaps/hdbx/keymap.c b/keyboards/numatreus/keymaps/hdbx/keymap.c
deleted file mode 100644
index dc684539619..00000000000
--- a/keyboards/numatreus/keymaps/hdbx/keymap.c
+++ /dev/null
@@ -1,230 +0,0 @@
-// WindowsでJIS配列として認識しているときに、オシャレなUS配列用キーキャップを使うためのキーマップです。
-// Google日本語入力の場合、以下のキー設定を行うとLower,Raiseのタップでそれぞれ半角入力と全角入力を切り替えできるようになります。
-//  ・Henkan（入力文字なし/直接入力）に「IMEを有効化」を割り当て
-//  ・Muhenkan（入力文字なし/直接入力）に「IMEを無効化」を割り当て
-
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"     // qmk_firmware-master/quantum/keymap_extras/keymap_japanese.h 日本語キーボード設定用
-#include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避
-
-// 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,
-    _HDBX,
-    _LOWER,
-    _RAISE,
-    _GAME,
-    _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  HDBX,
-  MCR1,                // マクロ1
-  MCR2,                // マクロ2
-  MCR3,                // マクロ3
-  MCR4,                // マクロ4
-  MCR5,                // マクロ5
-  WN_SCLN,              // タップでJISの「:」  シフトでJISの「;」 (Windows)
-  DM_PLY1,
-  DM_PLY2,
-  DM_REC1,
-  DM_REC2,
-  DM_RSTP,
-};
-
-// Use Dynamic macro
-
-// Fillers to make layering more clear
-#define LOWER   LT(_LOWER, JP_MHEN)    // タップで無変換     ホールドでLower
-#define RAISE   LT(_RAISE, JP_HENK)    // タップで変換       ホールドでRaise
-#define GUI_ESC GUI_T(KC_ESC)          // タップでESC        ホールドでGUI
-#define SFT_BS  SFT_T(KC_BSPC)         // タップでBackSpace  ホールドでSHIFT
-#define CTL_ENT CTL_T(KC_ENT)          // タップでEnter      ホールドでCTRL
-#define CTL_TAB CTL_T(KC_TAB)          // タップでTAB        ホールドでCTRL
-#define SFT_DEL SFT_T(KC_DEL)          // タップでDELETE     ホールドでSHIFT
-#define ALT_LBR ALT_T(JP_LBRC)         // タップで[          ホールドでALT
-#define SFT_RBR SFT_T(JP_RBRC)         // タップで]          ホールドでSHIFT
-#define SFT_SPC S(KC_SPC)              // Shift + Space
-#define WN_CAPS S(KC_CAPS)             // Caps Lock           (Windows)
-#define GAME    TO(_GAME)              // _GAMEレイヤーへ移動
-#define ADJUST  TO(_ADJUST)            // _ADJUSTレイヤーへ移動
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty配列
-   * ,----------------------------------.             ,----------------------------------.
-   * |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |Alt/[ |WINESC|   ~  |Sft/Bs|Lower |CtlEnt|Space |Raise |CtrlTb|   -  |   '  |Sft/] |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-      KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    WN_SCLN,
-      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-      ALT_LBR, GUI_ESC, JP_TILD, SFT_BS,  LOWER,   CTL_ENT,  KC_SPC,   RAISE,   CTL_TAB, KC_MINS, JP_QUOT, SFT_RBR
-      ),
-
-  /* HDBX配列 デフォルトレイヤーをこの配列にしたい場合は、AdjustレイヤーでK (Lower + Raise + K)
-   * ,----------------------------------.             ,----------------------------------.
-   * |   Q  |   W  |   E  |   ,  |   .  |             |   Y  |   D  |   P  |   F  |   :  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   A  |   I  |   O  |   U  |   G  |             |   M  |   N  |   T  |   R  |   S  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   Z  |   X  |   C  |   V  |   B  |             |   H  |   J  |   K  |   L  |   /  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |Alt/[ |WINESC|   ~  |Sft/Bs|Lower |CtlEnt|Space |Raise |CtrlTb|   -  |   '  |Sft/] |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_HDBX] = LAYOUT(
-      KC_Q,    KC_W,    KC_E,    KC_COMM, KC_DOT,                      KC_Y,    KC_D,    KC_P,    KC_F,    WN_SCLN,
-      KC_A,    KC_I,    KC_O,    KC_U,    KC_G,                        KC_M,    KC_N,    KC_T,    KC_R,    KC_S,
-      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SLSH,
-      ALT_LBR, GUI_ESC, JP_TILD, SFT_BS,  LOWER,   CTL_ENT,  KC_SPC,   RAISE,   CTL_TAB, KC_MINS, JP_QUOT, SFT_RBR
-      ),
-
-  /* Lower
-   * ,----------------------------------.             ,----------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |             |   7  |   8  |   9  |   .  | Bspc |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |  F6  |  F7  |  F8  |  F9  |  F10 |             |   4  |   5  |   6  |   +  |   *  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |Zen/Ha|ScLock|Pause |  F11 |  F12 |             |   1  |   2  |   3  |   -  |   /  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Alt  | WIN  |   `  |SftDel|Lower | Ctrl |SftSpc|Raise |   0  |   ,  |   =  |Enter |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT( 
-      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                       KC_7,    KC_8,    KC_9,    KC_DOT,  KC_BSPC,
-      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,                      KC_4,    KC_5,    KC_6,    KC_PPLS, KC_PAST,
-      JP_ZKHK, KC_SCRL, KC_PAUS, KC_F11,  KC_F12,                      KC_1,    KC_2,    KC_3,    KC_PMNS, KC_PSLS,
-      KC_LALT, KC_LGUI, JP_GRV,  SFT_DEL, _______, KC_LCTL,  SFT_SPC,  _______, KC_0,    KC_COMM, JP_EQL,  KC_ENT
-      ),
-
-  /* Raise
-   * ,----------------------------------.             ,----------------------------------.
-   * |   !  |   @  |   #  |   $  |   %  |             | Home | App  | Ins  | Calc |PrtScr|
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   ^  |   &  |   *  |   \  |   |  |             | Left | Down |  Up  |Right |   ;  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   `  |   {  |   }  |   <  |   >  |             | End  | Mute |  (   |   )  |   ?  |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Alt  | WIN  |   `  | Del  |Lower | Ctrl | Caps |Raise | Ctrl |   _  |   "  |Shift |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-      KC_EXLM, JP_AT,   KC_HASH, KC_DLR,  KC_PERC,                     KC_HOME, KC_APP,  KC_INS,  KC_CALC, KC_PSCR,
-      JP_CIRC, JP_AMPR, JP_ASTR, JP_YEN,  JP_PIPE,                     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN,
-      JP_GRV,  JP_LCBR, JP_RCBR, KC_LT,   KC_GT,                       KC_END,  KC_MUTE, JP_LPRN, JP_RPRN, KC_QUES,
-      KC_LALT, KC_LGUI, JP_GRV,  KC_DEL,  _______, KC_LCTL,  WN_CAPS,  _______, KC_RCTL, JP_UNDS, JP_DQUO, KC_RSFT
-      ),
-
-  /* GAME ゲームやテンキー固定で使用するレイヤーです。AdjustレイヤーでGを押下して遷移。戻るときはtoBaseから。
-   * ,----------------------------------.             ,----------------------------------.
-   * |   Q  |  Up  |   E  |   R  |   T  |             |   7  |   8  |   9  |   .  | Bspc |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * | Left | Down |Right |   F  |   G  |             |   4  |   5  |   6  |   +  |   *  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   Z  |   X  |   C  |   V  |   B  |             |   1  |   2  |   3  |   -  |   /  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Alt  | Esc  |  Tab |Shift |Space | Ctrl |toBase|   \  |   0  |   ,  |   =  |Enter |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_GAME] = LAYOUT(
-      KC_Q,    KC_UP,   KC_E,    KC_R,    KC_T,                        KC_7,    KC_8,    KC_9,    KC_DOT,  KC_BSPC,
-      KC_LEFT, KC_DOWN, KC_RGHT, KC_F,    KC_G,                        KC_4,    KC_5,    KC_6,    KC_PPLS, KC_PAST,
-      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_1,    KC_2,    KC_3,    KC_PMNS, KC_PSLS,
-      KC_LALT, KC_ESC,  KC_TAB,  KC_LSFT, KC_SPC,  KC_LCTL,  ADJUST,   JP_YEN,  KC_0,    KC_COMM, JP_EQL,  KC_ENT
-      ),
-
-  /* Adjust (Lower + Raise)
-   * ,----------------------------------.             ,----------------------------------.
-   * | MCR1 | MCR2 | MCR3 | MCR4 | MCR5 |             |DyMcr1|DyMcr2|RcMcr1|RcMcr2|StpRec|
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |      |      |      |      |ToGAME|             |      |Qwerty| HDBX |      |      |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |QK_BOOT |      |      |      |      |      |      |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] =  LAYOUT(
-      MCR1,    MCR2,    MCR3,    MCR4,    MCR5,                DM_PLY1, DM_PLY2, DM_REC1, DM_REC2, DM_RSTP,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, GAME,                      XXXXXXX, QWERTY,  HDBX,    XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-      )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case HDBX:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_HDBX);
-      }
-      return false;
-      break;
-    static bool     lshift = false;
-    case WN_SCLN: // コロン「;:」
-      if (record->event.pressed) {
-        lshift = get_mods() & MOD_BIT(KC_LSFT);
-        if (lshift) {
-          unregister_code(KC_LSFT);
-          tap_code(JP_SCLN);
-        } else {
-          tap_code(JP_SCLN);
-        }
-      }
-      return false;
-      break;
-    case MCR1:
-      if (record->event.pressed) {
-        SEND_STRING("0123456789"); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR2:
-      if (record->event.pressed) {
-        SEND_STRING("hogehoge\n"); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR3:
-      if (record->event.pressed) {
-        SEND_STRING("hoge@hoge.hoge"); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR4:
-      if (record->event.pressed) {
-        SEND_STRING("\"\""SS_TAP(X_LEFT)); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR5:
-      if (record->event.pressed) {
-        SEND_STRING("<>"SS_TAP(X_LEFT)); // 送信文字列
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/numatreus/keymaps/hdbx/rules.mk b/keyboards/numatreus/keymaps/hdbx/rules.mk
deleted file mode 100644
index d4e78b385c2..00000000000
--- a/keyboards/numatreus/keymaps/hdbx/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/numatreus/keymaps/yohewi/keymap.c b/keyboards/numatreus/keymaps/yohewi/keymap.c
deleted file mode 100644
index 5b53389f986..00000000000
--- a/keyboards/numatreus/keymaps/yohewi/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#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,
-  _LOWER,
-  _RAISE,
-};
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /*
-   *  q      w      e     r     t       ||     y      u     i     o     p
-   *  a      s      d     f     g       ||     h      j     k     l     ;
-   *  z      x      c     v     b       ||     n      m     ,     .     \
-   * esc    tab    ctl   lw   spc   bspc|| GRV   ent  RS    /     alt    -
-   */
-
-  [_QWERTY] = LAYOUT( /* Qwerty */
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
-    SFT_T(KC_Z),    KC_X,    KC_C,    KC_V,    KC_B,               KC_N,    KC_M,    KC_COMM, KC_DOT,  SFT_T(KC_BSLS) ,
-    KC_ESC, KC_TAB, KC_LCTL,  MO(_LOWER), KC_SPC, KC_BSPC, LALT(KC_GRV), KC_ENT,  MO(_RAISE),  KC_DOT, KC_RALT, KC_MINS ),
-
-
-  /*
-   *  1       2     3     4     5        ||      6     7      8     9    0
-   *  #      <      >    =       -       ||      _     +                ENT
-   *  [       ]      (     )    &        ||     `         .        UP    \
-   * TRANS  TRANS TRANS TRANS TRANS TRANS|| TRANS TRANS  RS  LEFT DPWM RGHT
-   */
-  [_RAISE] = LAYOUT( /* [> RAISE <] */
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,   KC_9, KC_0 ,
-    KC_HASH, KC_LABK, KC_RABK, KC_EQL,   KC_MINS,                   KC_UNDS, KC_PLUS,   KC_TRNS,  KC_TRNS, KC_ENT ,
-    KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_TRNS,    KC_DOT,   KC_UP, KC_BSLS ,
-    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT  ),
-
-  /*
-   * !        @     #    $     %        ||     ^    &    *     (    )
-   *  F1    F2    F3   F4    F5        ||     F6    F7   F8    F9    F10
-   *  F11    F12              reset      ||               ,    UP   \
-   *  TRNS  TRNS  TRNS TRNS TRNS TRNS||TRNS TRNS  TRNS  LEFT DPWM RGHT
-   */
-
-  [_LOWER] = LAYOUT( /* [> LOWER <] */
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN  ,
-    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_NO,   KC_NO,   QK_BOOT,                   KC_TRNS,   KC_TRNS,   KC_QUOT,   KC_UP,   KC_BSLS  ,
-    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT,  TO(_QWERTY), KC_LEFT, KC_DOWN, KC_RGHT )
-};
diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h
index 963f3ea3134..316f8392c0d 100644
--- a/keyboards/oddforge/vea/config.h
+++ b/keyboards/oddforge/vea/config.h
@@ -24,6 +24,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9
diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json
index b5299b1f3e0..9b55d0f2b56 100644
--- a/keyboards/oddforge/vea/info.json
+++ b/keyboards/oddforge/vea/info.json
@@ -11,6 +11,9 @@
     "backlight": {
         "pin": "D4"
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "rgblight": {
         "led_count": 18,
         "sleep": true,
diff --git a/keyboards/ok60/keymaps/ebrowncross/keymap.c b/keyboards/ok60/keymaps/ebrowncross/keymap.c
deleted file mode 100644
index 4ef2f9964c0..00000000000
--- a/keyboards/ok60/keymaps/ebrowncross/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// An ISO UK keymap
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_60_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_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_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                       MO(1),   KC_LGUI, KC_MENU,  KC_LCTL
-    ),
-
-    [1] = LAYOUT_60_iso(
-        KC_GRAVE, 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_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,
-        _______,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_PSCR,
-        _______,  _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
-        _______,  _______, _______,                            _______,                            _______, MO(2),   _______, _______
-    ),
-
-    [2] = LAYOUT_60_iso(
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-};
diff --git a/keyboards/ok60/keymaps/ptillemans/keymap.c b/keyboards/ok60/keymaps/ptillemans/keymap.c
deleted file mode 100644
index 0034e822d1b..00000000000
--- a/keyboards/ok60/keymaps/ptillemans/keymap.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_60_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_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_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_GRAVE, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT,KC_UP),
-        KC_LCTL, KC_LGUI, KC_LALT,               KC_SPC,                        MO(1),   MT(MOD_RALT,KC_LEFT), MT(MOD_RGUI,KC_DOWN), MT(MOD_RCTL,KC_RGHT)
-    ),
-
-    [1] = LAYOUT_60_iso(
-        QK_BOOT, 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, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, AG_NORM, AG_SWAP, _______, _______, _______, _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______
-    ),
-};
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
deleted file mode 100644
index 8bc5d09d802..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Copyright 2020 Toyoshima Hidenori <t@toyo.dev>
-*
-* 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,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    ADJUST,
-};
-
-#define EISU LALT(KC_GRV)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |  TAB |   Q  |   W  |   E  |   R  |   T  |   -  |                    |   =  |   Y  |   U  |   I  |   O  |   P  |  \   |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |   [  |                    |   ]  |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |  GUI |                    |  GUI |   N  |   M  |   ,  |   .  |   /  | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * | Ctrl |  ESC |  ALt | ESC  |||||||| Shift| Raise| Space|||||||| enter| Lower| Bcspc|||||||| Left | Down |  Up  | Right|
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-    [_QWERTY] = LAYOUT(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_MINS,                        KC_EQL , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_LCTL, 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_LGUI,                        KC_RGUI, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_ESC,  KC_LALT, KC_ESC,           KC_LSFT, RAISE,   KC_SPC,        KC_ENT, LOWER,   KC_BSPC,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |   ~  |   1  |   2  |   3  |   4  |   5  |   _  |                    |   +  | 6    | 7    |  8   | 9    |   0  |   |  |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Ctrl |   ^  |   &  |   *  |   (  |   )  |   {  |                    |   }  | Left | Down |  Up  | Right|   :  |  "   |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|   !  |   @  |   #  |   $  |   %  |  GUI |                    |  GUI |   -  |   =  |   <  |   >  |   ?  | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * | Ctrl |  ESC |  ALt | EISU |||||||| kana | Raise| Space|||||||| Enter| Lower|Delete|||||||| Home |PageDn|PageUp|  End |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_LOWER] = LAYOUT(
-    KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_UNDS,                       KC_PLUS, KC_6,    KC_7,    KC_8,   KC_9,    KC_0,    KC_PIPE,
-    KC_LCTL, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_LCBR,                       KC_RCBR, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, KC_COLN, KC_DQT ,
-    KC_LSFT, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LGUI,                       KC_RGUI, KC_MINS, KC_EQL,  KC_LT,  KC_GT,   KC_QUES, KC_RSFT,
-    KC_LCTL, KC_ESC, KC_LALT,  KC_LNG2,          KC_LNG1, RAISE,   KC_SPC,       KC_ENT, LOWER,   KC_DEL,           KC_HOME,KC_PGDN, KC_PGUP, KC_END
-  ),
-
-  /* Raise
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   _  |                    |   +  | 6    | 7    |  8   | 9    |   0  |   |  |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Ctrl |   ^  |   &  |   *  |   (  |   )  |   {  |                    |   }  | Left | Down |  Up  | Right|   :  |  "   |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|   !  |   @  |   #  |   $  |   %  |  GUI |                    |  GUI |   _  |   +  |   <  |   >  |   ?  | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * | Ctrl |  ESC |  ALt | EISU |||||||| kana | Raise| Space|||||||| Enter| Lower|Delete|||||||| Home |PageDn|PageUp|  End |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-  */
-  [_RAISE] = LAYOUT(
-    KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_UNDS,                       KC_PLUS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PIPE,
-    KC_LCTL, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_LCBR,                       KC_RCBR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_COLN, KC_DQT ,
-    KC_LSFT, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LGUI,                       KC_RGUI, KC_UNDS, KC_PLUS, KC_LT,   KC_GT,   KC_QUES, KC_RSFT,
-    KC_LCTL, KC_ESC,  KC_LALT, KC_LNG2,          KC_LNG1, RAISE,   KC_SPC,       KC_ENT, LOWER,   KC_DEL,           KC_HOME, KC_PGDN, KC_PGUP, KC_END
-  ),
-
-  /* Adjust
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |      | Reset|RGB ON|  MODE|  HUE-|  HUE+|      |                    |      |  SAT-|  SAT+|  VAL-|  VAL+|      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * |      |                                  |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |                    |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |      |      |      |      ||||||||      |      |      ||||||||      |      |      ||||||||      |      |      |      |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_ADJUST] = LAYOUT(
-    _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______,                       _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______,
-    _______, _______, BL_TOGG, BL_BRTG, BL_UP  , BL_DOWN,_______,                       _______, _______, _______, _______, _______, _______, _______,
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6 ,_______,                       _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    _______, _______, _______, _______,          _______,_______,_______,       _______,_______, _______,          _______, _______, _______, _______
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/readme.md b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/readme.md
deleted file mode 100644
index ebc13043a7e..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/readme.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# ToyoshimaHidenori's keymap for Ergodash mini
-
-This is the ToyoshimaHidenori's keymap configuration for Ergodash mini.
-There are four layers, QWERTY(default), LOWER, RAISE and ADJSUT.
-
-## Layers
-
-### Qwerty
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|  TAB |   Q  |   W  |   E  |   R  |   T  |   -  |                    |   =  |   Y  |   U  |   I  |   O  |   P  |  \   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| Ctrl |   A  |   S  |   D  |   F  |   G  |   [  |                    |   ]  |   H  |   J  |   K  |   L  |   ;  |  '   |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |  GUI |                    |  GUI |   N  |   M  |   ,  |   .  |   /  | Shift|
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-| Ctrl |  ESC |  ALt | ESC  |||||||| Shift| Raise| Space|||||||| enter| Lower| Bcspc|||||||| Left | Down |  Up  | Right|
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Lower
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|   ~  |   1  |   2  |   3  |   4  |   5  |   _  |                    |   +  | 6    | 7    |  8   | 9    |   0  |   |  |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| Ctrl |   ^  |   &  |   *  |   (  |   )  |   {  |                    |   }  | Left | Down |  Up  | Right|   :  |  "   |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-| Shift|   !  |   @  |   #  |   $  |   %  |  GUI |                    |  GUI |   -  |   =  |   <  |   >  |   ?  | Shift|
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-| Ctrl |  ESC |  ALt | EISU |||||||| kana | Raise| Space|||||||| Enter| Lower|Delete|||||||| Home |PageDn|PageUp|  End |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Raise
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   _  |                    |   +  | 6    | 7    |  8   | 9    |   0  |   |  |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| Ctrl |   ^  |   &  |   *  |   (  |   )  |   {  |                    |   }  | Left | Down |  Up  | Right|   :  |  "   |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-| Shift|   !  |   @  |   #  |   $  |   %  |  GUI |                    |  GUI |   _  |   +  |   <  |   >  |   ?  | Shift|
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-| Ctrl |  ESC |  ALt | EISU |||||||| kana | Raise| Space|||||||| Enter| Lower|Delete|||||||| Home |PageDn|PageUp|  End |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Adjust
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|      | Reset|RGB ON|  MODE|  HUE-|  HUE+|      |                    |      |  SAT-|  SAT+|  VAL-|  VAL+|      |      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|      |                                  |      |                    |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |                    |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-|      |      |      |      ||||||||      |      |      ||||||||      |      |      ||||||||      |      |      |      |
-,----------------------------------------------------------------------------------------------------------------------.
-```
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/rules.mk b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/rules.mk
deleted file mode 100644
index 11b62b9bffe..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
deleted file mode 100644
index 9636b761bcf..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright 2021 Yoshihiro Saito
- *
- * 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,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    ADJUST,
-};
-
-// Shift + ( = <
-const key_override_t left_paren_angle_bracket_override = ko_make_basic(MOD_MASK_SHIFT, KC_LEFT_PAREN, KC_LEFT_ANGLE_BRACKET);
-
-// Shift + ) = >
-const key_override_t right_paren_angle_bracket_override = ko_make_basic(MOD_MASK_SHIFT, KC_RIGHT_PAREN, KC_RIGHT_ANGLE_BRACKET);
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-	&left_paren_angle_bracket_override,
-	&right_paren_angle_bracket_override,
-	NULL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty */
-    [_QWERTY] = LAYOUT(
-    QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LPRN,                           KC_RPRN, 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_LBRC,                           KC_RBRC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_DEL,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    XXXXXXX,                           XXXXXXX, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_LGUI, LOWER,   CTL_T(KC_SPC), SC_SENT,   RAISE,   KC_RGUI,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* Lower */
-  [_LOWER] = LAYOUT(
-    XXXXXXX, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_F11,                            KC_GRV,  KC_CIRC, KC_AMPR, KC_ASTR, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F12,                            KC_BSLS, KC_TILD, KC_MINS, KC_EQL,  XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX,                           XXXXXXX, KC_PIPE, KC_UNDS, KC_PLUS, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          _______, XXXXXXX, _______,       _______,   XXXXXXX, _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* Raise */
-  [_RAISE] = LAYOUT(
-    XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   XXXXXXX,                           XXXXXXX, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                           XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                           XXXXXXX, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          _______, XXXXXXX, _______,       _______,   XXXXXXX, _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* Adjust */
-  [_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, XXXXXXX
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-            break;
-        case ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/readme.md b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/readme.md
deleted file mode 100644
index 67a6ed9b90f..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# yoshimaru46's keymap for Ergodash mini
-
-This is the yoshimaru46's keymap configuration for Ergodash mini.
-There are three layers, QWERTY(default), LOWER, and RAISE.
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/rules.mk b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/rules.mk
deleted file mode 100644
index f85c6a4151a..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
-KEY_OVERRIDE_ENABLE = yes
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json
deleted file mode 100644
index 8f8d3085538..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json
+++ /dev/null
@@ -1,460 +0,0 @@
-[
-  {
-    "name": "gsm-ErgoDash",
-    "notes": "Front Legend = \"Adust\" layer (both lower and Raise)\n\n\nLayout Positions are an aproximation and not exact"
-  },
-  [
-    {
-      "x": 3,
-      "t": "#0000ff\n#ff0000"
-    },
-    "\nF3\n\n\n\n\n\n\n\n3 #",
-    {
-      "x": 11
-    },
-    "\nF8\n\n\n\n\n\n\n\n8 *"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2
-    },
-    "\nF2\n\n\n\n\n\n\n\n2 @",
-    {
-      "x": 1
-    },
-    "\nF4\n\n\n\n\n\n\n\n4 $",
-    {
-      "x": 9
-    },
-    "\nF7\n\n\n\n\n\n\n\n7 &",
-    {
-      "x": 1
-    },
-    "\nF9\n\n\n\n\n\n\n\n9 ("
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5
-    },
-    "\nF5\n\n\n\n\n\n\n\n5 %",
-    {
-      "x": 7
-    },
-    "\nF6\n\n\n\n\n\n\n\n6 &"
-  ],
-  [
-    {
-      "y": -0.875,
-      "t": "#000000",
-      "a": 3
-    },
-    "Esc\n\n\n\nreset",
-    {
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "\nF1\n\n\n\n\n\n\n\n1 !",
-    {
-      "x": 15
-    },
-    "\nF10\n\n\n\n\n\n\n\n0 )",
-    {
-      "t": "#000000",
-      "a": 7,
-      "fa": [
-        2
-      ]
-    },
-    "Bksp"
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6,
-      "f": 3
-    },
-    "= +",
-    {
-      "x": 5,
-      "f": 3
-    },
-    "- _"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3,
-      "f": 3
-    },
-    "E",
-    {
-      "x": 11,
-      "f": 3
-    },
-    "I"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2,
-      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
-      "a": 4,
-      "f": 3
-    },
-    "PgUP\nUP\n\n\n\n\n\n\n\nW",
-    {
-      "x": 1,
-      "t": "#000000",
-      "a": 3,
-      "f": 3
-    },
-    "R\n\n\n\nrgb_tog",
-    {
-      "x": 9,
-      "a": 7,
-      "f": 3
-    },
-    "U",
-    {
-      "x": 1,
-      "f": 3
-    },
-    "O"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5,
-      "a": 3,
-      "f": 3
-    },
-    "T\n\n\n\nbl_tog",
-    {
-      "x": 7,
-      "a": 7,
-      "f": 3
-    },
-    "Y"
-  ],
-  [
-    {
-      "y": -0.875,
-      "f": 3
-    },
-    "Tab",
-    {
-      "f": 3
-    },
-    "Q",
-    {
-      "x": 15,
-      "f": 3
-    },
-    "P",
-    {
-      "f": 3
-    },
-    "] }"
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6
-    },
-    "",
-    {
-      "x": 5,
-      "f": 3
-    },
-    "[ {"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3,
-      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
-      "a": 0,
-      "f": 3
-    },
-    "End\nRIGHT\n\n\nrgb_sai\n\n\n\n\nD",
-    {
-      "x": 11,
-      "t": "#000000",
-      "a": 7,
-      "f": 3
-    },
-    "K"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2,
-      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
-      "a": 0,
-      "f": 3
-    },
-    "PgDwn\nDOWN\n\n\nrgb_hai\n\n\n\n\nS",
-    {
-      "x": 1,
-      "t": "#000000",
-      "a": 3,
-      "f": 3
-    },
-    "F\n\n\n\nrgb_val",
-    {
-      "x": 9,
-      "a": 7,
-      "f": 3
-    },
-    "J",
-    {
-      "x": 1,
-      "f": 3
-    },
-    "L"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5,
-      "a": 3,
-      "f": 3
-    },
-    "G\n\n\n\nbl_inc",
-    {
-      "x": 7,
-      "a": 7,
-      "f": 3
-    },
-    "H"
-  ],
-  [
-    {
-      "y": -0.875,
-      "c": "#0000ff",
-      "t": "#ffffffff",
-      "f": 3
-    },
-    "Raise",
-    {
-      "c": "#cccccc",
-      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
-      "a": 4,
-      "f": 3
-    },
-    "Home\nLEFT\n\n\n\n\n\n\n\nA",
-    {
-      "x": 15,
-      "t": "#000000",
-      "a": 7,
-      "f": 3
-    },
-    ": ;",
-    {
-      "f": 3
-    },
-    "' \""
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6
-    },
-    "",
-    {
-      "x": 5
-    },
-    ""
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3,
-      "a": 3,
-      "f": 3
-    },
-    "C\n\n\n\nrgb_sad",
-    {
-      "x": 11,
-      "a": 7,
-      "f": 3
-    },
-    ", <"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2,
-      "a": 3,
-      "f": 3
-    },
-    "X\n\n\n\nrgb_sad",
-    {
-      "x": 1,
-      "f": 3
-    },
-    "V\n\n\n\nrgb_vad",
-    {
-      "x": 9,
-      "a": 7,
-      "f": 3
-    },
-    "M",
-    {
-      "x": 1,
-      "f": 3
-    },
-    ". >"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5,
-      "a": 3,
-      "f": 3
-    },
-    "B\n\n\n\nbl_dec",
-    {
-      "x": 7,
-      "a": 7,
-      "f": 3
-    },
-    "N"
-  ],
-  [
-    {
-      "y": -0.875,
-      "a": 3,
-      "f": 3
-    },
-    "Shift\n\n\n\neep_rst",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "Z",
-    {
-      "x": 15,
-      "f": 3
-    },
-    "/ ?",
-    {
-      "f": 3
-    },
-    "Shift"
-  ],
-  [
-    {
-      "y": -0.25,
-      "x": 2,
-      "f": 3
-    },
-    "Alt",
-    {
-      "x": 13,
-      "f": 3
-    },
-    "DOWN"
-  ],
-  [
-    {
-      "y": -0.9749999999999996,
-      "x": 3.5,
-      "f": 3
-    },
-    "Ctrl",
-    {
-      "x": 10.15,
-      "f": 3
-    },
-    "LEFT"
-  ],
-  [
-    {
-      "y": -0.7750000000000004,
-      "f": 3
-    },
-    "`~",
-    {
-      "f": 3
-    },
-    "\\|",
-    {
-      "x": 15,
-      "f": 3
-    },
-    "UP",
-    {
-      "f": 3
-    },
-    "RIGHT"
-  ],
-  [
-    {
-      "r": 30,
-      "rx": 6.5,
-      "ry": 4.25,
-      "y": -0.25,
-      "x": -0.2999999999999998,
-      "c": "#eb7c15",
-      "f": 3,
-      "h": 2
-    },
-    "Space",
-    {
-      "c": "#cccccc",
-      "f": 3
-    },
-    "Del"
-  ],
-  [
-    {
-      "x": -1.2999999999999998,
-      "c": "#ff0000",
-      "f": 3
-    },
-    "Lower",
-    {
-      "x": 1,
-      "c": "#cccccc",
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "\nApp\n\n\n\n\n\n\n\nOS"
-  ],
-  [
-    {
-      "r": -30,
-      "rx": 13,
-      "y": -0.5,
-      "x": -2,
-      "t": "#000000",
-      "a": 7,
-      "f": 3
-    },
-    "PrtScr",
-    {
-      "c": "#eb7c15",
-      "f": 3,
-      "h": 2
-    },
-    "Space"
-  ],
-  [
-    {
-      "x": -2,
-      "c": "#cccccc",
-      "f": 3
-    },
-    "Enter",
-    {
-      "x": 1,
-      "c": "#0000ff",
-      "t": "#ffffff",
-      "f": 3
-    },
-    "Raise"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
deleted file mode 100644
index 7ed548b765a..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
+++ /dev/null
@@ -1,124 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-};
-
-enum layer_names {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * | ESC  |   1  |   2  |   3  |   4  |   5  |   =  |                    |   -  |   6  |   7  |   8  |   9  |   0  |Backsp|
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * |  Tab |   Q  |   W  |   E  |   R  |   T  |      |                    |   [  |   Y  |   U  |   I  |   O  |   P  |  ]   |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Raise|   A  |   S  |   D  |   F  |   G  |      |                    |      |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  ||||||||  Del |      |      ||||||||   N  |   M  |   ,  |   .  |   /  | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |  `   |  \   |  ALt | Ctrl |||||||| Lower| Space|  LGui|||||||| Enter| Space| Raise|||||||| Left | Down |  Up  | Right|
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_QWERTY] = LAYOUT( 
-     KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL,                        KC_MINS, KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_BSPC,
-     KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   XXXXXXX,                        KC_LBRC, KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,    KC_RBRC,
-      RAISE,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   XXXXXXX,                        XXXXXXX, 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_DEL,        KC_PSCR,         KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-     KC_GRV,KC_BSLS, KC_LALT, KC_LCTL,            LOWER,    KC_SPC,KC_LGUI,        KC_ENT ,KC_SPC , RAISE,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * |      |      |  Up  |      |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Raise| Left | Down | Rght |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|      |      |      |      |      ||||||||      |      |      ||||||||      |      |      |      |      | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |      |      |      |      |||||||| Lower| Space|      ||||||||      | Space| Raise||||||||      |      |      |      |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_LOWER] = LAYOUT(
-    XXXXXXX,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5, XXXXXXX,                        XXXXXXX, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, 
-    XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      RAISE, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
-    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,             LOWER,   KC_SPC ,XXXXXXX,     XXXXXXX, KC_SPC ,   RAISE,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 
-  ),
-
-  /* Raise
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |      |      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * |      |      | PgUp |      |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Raise| Home | PgDwn| End  |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|      |      |      |      |      ||||||||      |      |      ||||||||      |      |      |      |      | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |      |      |      |      |||||||| Lower| Space|      ||||||||      |Space | Raise||||||||      |      |      |      |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_RAISE] = LAYOUT(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      RAISE, KC_HOME, KC_PGDN, KC_END, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
-    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,             LOWER,   KC_SPC ,XXXXXXX,     XXXXXXX, KC_SPC ,   RAISE,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 
-  ),
-
-  /* Adjust  (Both Raise and Lower Together)
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * | Reset|      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * |      |      |      |      |rgbtog|bl_tog|      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Raise|      |rgbhui|rgbsai|rgbvai|bl_inc|      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * |EE_CLR|      |rgbhud|rgbdec|rgbvad|bl_dec||||||||      |      |      ||||||||      |      |      |      |      | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |      |      |      |      |||||||| Lower| Space|      ||||||||      | Space| Raise||||||||      |      |      |      |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_ADJUST] = LAYOUT(
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, BL_TOGG, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      RAISE, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI,  BL_UP,  XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    EE_CLR,  XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DOWN,          XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
-    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,             LOWER,   KC_SPC ,XXXXXXX,     XXXXXXX,  KC_SPC,   RAISE,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  )
-}; 
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/rules.mk
deleted file mode 100644
index 11b62b9bffe..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/config.h
deleted file mode 100644
index 9a0d0e54f71..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 IFo Hancroft
- *
- * 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
-
-// place overrides here
-#define USB_POLLING_INTERVAL_MS 1
-#define FORCE_NKRO
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/keymap.c
deleted file mode 100644
index a489c3f4dc9..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/keymap.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2021 IFo Hancroft
-  *
-  * 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] = {
-
-    /* Default Layer
-    * ---------------------------------------------------------------------------------------------------------------------------------------------------------
-    * | `     || 1     || 2     || 3     ||   4   || 5     || -     ||                         || =     || 6     || 7     || 8     || 9     || 0     || Del   |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * | Tab   || Q     || W     || E     ||   R   || T     || [     ||                         || ]     || Y     || U     || I     || O     || P     || \     |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * | ESC   || A     || S     || D     ||   F   || G     || "     ||                         || "     || H     || J     || K     || L     || ;     || Enter |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * | Shift || Z     || X     || C     ||   V   || B     ||       ||                         ||       || N     || M     || ,     || .     || /     || Shift |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * | Ctrl  || Super || Alt   || MO(2) ||       || MO(1) || Bkspc || Space ||       || Space || Bkspc || MO(1) ||       || Left  || Down  || Up    || Right |
-    * ---------------------------------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_3key_2us(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                            KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                            KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_QUOT,                            KC_QUOT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                                 KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT, MO(2),            MO(1),   KC_BSPC, KC_SPC,           KC_SPC,  KC_BSPC, MO(1),            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-    /* Function Layer
-    * ---------------------------------------------------------------------------------------------------------------------------------------------------------
-    * |       || F1    || F2    || F3    || F4    || F5    || F6    ||                         || F7    || F8    || F9    || F10   || F11   || F12   ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ---------------------------------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_3key_2us(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                              KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-        _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                                              _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______,          _______, _______, _______,          _______, _______, _______,          _______, _______, _______, _______
-    ),
-
-    /* Left Right Hand Layer
-    * ---------------------------------------------------------------------------------------------------------------------------------------------------------
-    * | Del   || 0     || 9     || 8     || 7     || 6     || =     ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * | \     || P     || O     || I     || U     || Y     || ]     ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * | Enter || ;     || L     || K     || J     || H     ||       ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       || /     || .     || ,     || M     || N     ||       ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ---------------------------------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_3key_2us(
-        KC_DEL,  KC_0,    KC_9,    KC_8,    KC_7,    KC_6,    KC_EQL,                             _______, _______, _______, _______, _______, _______, _______,
-        KC_BSLS, KC_P,    KC_O,    KC_I,    KC_U,    KC_Y,    KC_RBRC,                            _______, _______, _______, _______, _______, _______, _______,
-        KC_ENT,  KC_SCLN, KC_L,    KC_K,    KC_J,    KC_H,    _______,                            _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_SLSH, KC_DOT,  KC_COMM, KC_M,    KC_N,                                                 _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______,          _______, _______, _______,          _______, _______, _______,          _______, _______, _______, _______
-    ),
-
-    /* Empty Layer
-    * ---------------------------------------------------------------------------------------------------------------------------------------------------------
-    * |       ||       ||       ||       ||       ||       ||       ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||                         ||       ||       ||       ||       ||       ||       ||       |
-    * |-------------------------------------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ---------------------------------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_3key_2us(
-        _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                                              _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______,          _______, _______, _______,          _______, _______, _______,          _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/readme.md
deleted file mode 100644
index aab6984af7f..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-![IFo Hancroft ErgoDash Layout Image](https://i.imgur.com/vANNhro.png)
-
-# IFo Hancroft's ErgoDash Layout
-
- - Layer 1: A standard ANSI QWERTY layer.
- - Layer 2: A function layer. It contains just the F1-F12 keys.
- - Layer 3: A mirror of the right hand part of Layer 1, on the left hand, so I don't have to get my hand off the mouse when in CAD.
- - Layer 4: An empty layer in-case I need something on-the-fly so I can remap with VIA.
-
-This keymap also sets the polling rate of the keyboard to 1ms, disables the EXTRAKEY feature, and enables the following features:
-
- - COMMAND
- - NKRO (forced on)
- - VIA
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/rules.mk
deleted file mode 100644
index 298b2a89cfe..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRAKEY_ENABLE = no
-COMMAND_ENABLE = yes
-NKRO_ENABLE = yes
-VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
deleted file mode 100644
index 3b52ba975eb..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-// clang-format off
-enum layers { _QWERTY, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { JP = SAFE_RANGE, US, SHIFT, LOWER, RAISE, ADJUST,
-    CSTM_0, CSTM_1, CSTM_2, CSTM_3, CSTM_4, CSTM_5, CSTM_6, CSTM_7, CSTM_8, CSTM_9,
-    CIRC, AT, LBRC, RBRC, BSLS, AMPR, QUOT, LPRN, RPRN, EQL, TILD, PIPE, GRV, LCBR,
-    PLUS, ASTR, RCBR, UNDS, MINS, SCLN, COMM, DOT, SLSH, EXLM, HASH, DLR, PERC, DEL };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Qwerty
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     * | ESC  |   1  |   2  |   3  |   4  |   5  | ZKHK |                    | ZKHK |   6  |   7  |   8  |   9  |   0  |  `   |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * | TAB  |   Q  |   W  |   E  |   R  |   T  | MHEN |                    |HENKAN|   Y  |   U  |   I  |   O  |   P  |  \   |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * | CTRL |   A  |   S  |   D  |   F  |   G  | EISU | <- ONLY FOR MAC -> | KANA |   H  |   J  |   K  |   L  |   ;  |  '   |
-     * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-     * | SHIFT|   Z  |   X  |   C  |   V  |   B  | SHIFT|                    | SHIFT|   N  |   M  |   ,  |   .  |   /  | SHIFT|
-     * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-     * | SHIFT|ADJUST|  ALT |  GUI |||||||| LOWER| SPACE|      ||||||||      | ENTER| RAISE||||||||  GUI |  ALT |ADJUST| SHIFT|
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     */
-    [_QWERTY] = LAYOUT(
-      KC_ESC,  CSTM_1,  CSTM_2,  CSTM_3,  CSTM_4,  CSTM_5,  JP_KANA,                        JP_KANA, CSTM_6,  CSTM_7,  CSTM_8,  CSTM_9,  CSTM_0,  GRV    ,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    JP_MHEN,                        JP_HENK, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    BSLS   ,
-      KC_LGUI, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LNG2,                        JP_LANG1,KC_H,    KC_J,    KC_K,    KC_L,    SCLN,    QUOT   ,
-      SHIFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    SHIFT  ,                        SHIFT,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SHIFT  ,
-      SHIFT,   ADJUST,  KC_LALT, KC_LCTL,          LOWER,   KC_SPC ,XXXXXXX,        XXXXXXX,KC_ENT , RAISE,            KC_LCTL, KC_LALT, ADJUST,  SHIFT
-    ),
-
-    /* Lower
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |  ~   |   !  |   @  |   #  |   $  |   %  |      |                    |      |   ^  |   &  |   *  |   (  |   )  |  |   |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |      |   1  |   2  |   3  |   4  |   5  |      |                    |      |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-     * |      ||||||||||||||||||||||   -  |   _  |      |                    |      |   +  |   =  |   [  |   ]  ||||||||      |
-     * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-     * |      |      |      |      ||||||||      |  ESC |      ||||||||      | BKSP |      ||||||||      |      |      |      |
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     */
-    [_LOWER] = LAYOUT(
-      KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,                        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-      TILD,    EXLM,    AT,      HASH,    DLR,     PERC,    _______,                        _______, CIRC,    AMPR,    ASTR,    LPRN,    RPRN,    PIPE   ,
-      _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,                        _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0   , _______,
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, MINS,    UNDS,    _______,                        _______, PLUS,    EQL,     LBRC,    RBRC,    XXXXXXX, _______,
-      _______, _______, _______, _______,          _______, KC_ESC ,_______,        _______,KC_BSPC, _______,          _______, _______, _______, _______
-    ),
-
-    /* Raise
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |  ~   |   !  |   @  |   #  |   $  |   %  |      |                    |      |   ^  |   &  |   *  |   (  |   )  |  |   |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |      |   1  |   2  |   3  |   4  |   5  |      |                    |      |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-     * |      ||||||||   [  |   ]  |   -  |   _  |      |                    |      |   +  |   =  ||||||||||||||||||||||      |
-     * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-     * |      |      |      |      ||||||||      |  ESC |      ||||||||      | BKSP |      ||||||||      |      |      |      |
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     */
-    [_RAISE] = LAYOUT(
-      KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,                        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-      TILD,    EXLM,    AT,      HASH,    DLR,     PERC,    _______,                        _______, CIRC,    AMPR,    ASTR,    LPRN,    RPRN,    PIPE   ,
-      _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,                        _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0   , _______,
-      _______, XXXXXXX, LBRC,    RBRC,    MINS,    UNDS,    _______,                        _______, PLUS,    EQL,     XXXXXXX, XXXXXXX, XXXXXXX, _______,
-      _______, _______, _______, _______,          _______, KC_ESC ,_______,        _______,KC_BSPC, _______,          _______, _______, _______, _______
-    ),
-
-    /* Adjust
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     * |      |      |      |      |      |      |  US  |                    |  JP  |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |      | HOME |PAGEDN|PAGEUP|  END ||||||||      |                    |      | LEFT | DOWN |  UP  | RIGHT||||||||      |
-     * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-     * |      |      |   {  |   }  |      |      |      |                    |      |      |      |   {  |   }  |      |      |
-     * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-     * |      |      |      |      ||||||||      |      |      ||||||||      |      |      ||||||||      |      |      |      |
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     */
-    [_ADJUST] = LAYOUT(
-      _______, _______, _______, _______, _______, _______, US     ,                        JP,      _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______,
-      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  XXXXXXX, _______,                        _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, _______,
-      _______, _______, LCBR,    RCBR,    _______, _______, _______,                        _______, _______, _______, LCBR,    RCBR,    _______, _______,
-      _______, _______, _______, _______,          _______, _______,_______,        _______,_______, _______,          _______, _______, _______, _______
-    )};
-// clang-format on
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-#endif
-
-#define JP_LAYOUT true
-#define US_LAYOUT false
-
-#ifdef MASTER_LEFT
-bool LAYOUT_STATUS = US_LAYOUT;
-#else
-bool LAYOUT_STATUS = JP_LAYOUT;
-#endif
-
-bool SHIFT_PRESSED = false;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-#define SEND_STRING_RESTORE(STR) (SHIFT_PRESSED ? SEND_STRING(STR SS_DOWN(X_LSFT)) : SEND_STRING(STR SS_UP(X_LSFT)))
-
-#define KEY(CODE) (record->event.pressed ? SEND_STRING(SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE)))
-
-#define KEY_SHIFT(CODE) (record->event.pressed ? SEND_STRING(SS_DOWN(X_LSFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE)))
-
-#define KEY_UPSHIFT(CODE) (record->event.pressed ? SEND_STRING(SS_UP(X_LSFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE)))
-
-#define SHIFT_DU(CODE_DOWN, CODE_UP) (SHIFT_PRESSED ? CODE_DOWN : CODE_UP)
-#define CASE_US(CODE, US, JP)                   \
-    case CODE:                                  \
-        (LAYOUT_STATUS == JP_LAYOUT ? JP : US); \
-        return false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        CASE_US(CSTM_0, KEY(0), SHIFT_DU(KEY_SHIFT(9), KEY(0)));
-        CASE_US(CSTM_1, KEY(1), KEY(1));
-        CASE_US(CSTM_2, KEY(2), SHIFT_DU(KEY_UPSHIFT(LBRACKET), KEY(2)));
-        CASE_US(CSTM_3, KEY(3), KEY(3));
-        CASE_US(CSTM_4, KEY(4), KEY(4));
-        CASE_US(CSTM_5, KEY(5), KEY(5));
-        CASE_US(CSTM_6, KEY(6), SHIFT_DU(KEY_UPSHIFT(EQUAL), KEY(6)));
-        CASE_US(CSTM_7, KEY(7), SHIFT_DU(KEY_SHIFT(6), KEY(7)));
-        CASE_US(CSTM_8, KEY(8), SHIFT_DU(KEY_SHIFT(QUOTE), KEY(8)));
-        CASE_US(CSTM_9, KEY(9), SHIFT_DU(KEY_SHIFT(8), KEY(9)));
-        CASE_US(DEL, KEY(DELETE), KEY_UPSHIFT(BSPACE));
-        CASE_US(TILD, KEY_SHIFT(GRAVE), KEY_SHIFT(EQUAL));
-        CASE_US(EXLM, KEY_SHIFT(1), KEY_SHIFT(1));
-        CASE_US(AT, KEY_SHIFT(2), KEY(LBRACKET));
-        CASE_US(HASH, KEY_SHIFT(3), KEY_SHIFT(3));
-        CASE_US(DLR, KEY_SHIFT(4), KEY_SHIFT(4));
-        CASE_US(PERC, KEY_SHIFT(5), KEY_SHIFT(5));
-        CASE_US(CIRC, KEY_SHIFT(6), KEY(EQUAL));
-        CASE_US(AMPR, KEY_SHIFT(7), KEY_SHIFT(6));
-        CASE_US(ASTR, KEY_SHIFT(8), KEY_SHIFT(QUOTE));
-        CASE_US(LPRN, KEY_SHIFT(9), KEY_SHIFT(8));
-        CASE_US(RPRN, KEY_SHIFT(0), KEY_SHIFT(9));
-        CASE_US(LBRC, KEY(LBRACKET), SHIFT_DU(KEY_SHIFT(RBRACKET), KEY(RBRACKET)));
-        CASE_US(RBRC, KEY(RBRACKET), SHIFT_DU(KEY_SHIFT(NONUS_HASH), KEY(NONUS_HASH)));
-        CASE_US(LCBR, KEY_SHIFT(LBRACKET), KEY_SHIFT(RBRACKET));
-        CASE_US(RCBR, KEY_SHIFT(RBRACKET), KEY_SHIFT(NONUS_HASH));
-        CASE_US(GRV, KEY(GRAVE), SHIFT_DU(KEY_SHIFT(EQUAL), KEY_SHIFT(LBRACKET)));
-        CASE_US(BSLS, KEY(BSLASH), SHIFT_DU(KEY_SHIFT(INT3), KEY(INT3)));
-        CASE_US(PIPE, KEY_SHIFT(BSLASH), KEY_SHIFT(INT3));
-        CASE_US(MINS, KEY(MINUS), SHIFT_DU(KEY_SHIFT(INT1), KEY(MINUS)));
-        CASE_US(UNDS, KEY_SHIFT(MINUS), KEY_SHIFT(INT1));
-        CASE_US(EQL, KEY(EQUAL), SHIFT_DU(KEY_SHIFT(SCOLON), KEY_SHIFT(MINUS)));
-        CASE_US(PLUS, KEY_SHIFT(EQUAL), KEY_SHIFT(SCOLON));
-        CASE_US(SCLN, KEY(SCOLON), SHIFT_DU(KEY_UPSHIFT(QUOTE), KEY(SCOLON)));
-        CASE_US(QUOT, KEY(QUOTE), SHIFT_DU(KEY_SHIFT(2), KEY_SHIFT(7)));
-        case JP:
-            if (record->event.pressed) {
-                LAYOUT_STATUS = JP_LAYOUT;
-            }
-            return false;
-            break;
-        case US:
-            if (record->event.pressed) {
-                LAYOUT_STATUS = US_LAYOUT;
-            }
-            return false;
-            break;
-        case SHIFT:
-            if (record->event.pressed) {
-                SEND_STRING(SS_DOWN(X_LSFT));
-                SHIFT_PRESSED = true;
-            } else {
-                SEND_STRING(SS_UP(X_LSFT));
-                SHIFT_PRESSED = false;
-            }
-            return false;
-            break;
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-            } else {
-                layer_off(_LOWER);
-            }
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-            } else {
-                layer_off(_RAISE);
-            }
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            return false;
-            break;
-        case ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json
deleted file mode 100644
index 1f5eee60146..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"ergodash/rev1","keymap":"m47ch4ns_keymap","layout":"LAYOUT_3key_1us","layers":[["KC_ESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_NO","KC_NO","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_NO","KC_NO","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSLS","KC_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_NO","KC_NO","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_LSFT","KC_RSFT","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_LSFT","ANY(ADJUST)","KC_LALT","KC_LGUI","ANY(LOWER)","KC_SPC","KC_ENT","ANY(RAISE)","KC_RGUI","KC_RALT","ANY(ADJUST)","KC_RSFT"],["KC_F11","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_TRNS","KC_TRNS","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F12","KC_TRNS","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_TRNS","KC_TRNS","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_PIPE","KC_TRNS","KC_1","KC_2","KC_3","KC_4","KC_5","KC_TRNS","KC_TRNS","KC_6","KC_7","KC_8","KC_9","KC_0","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_MINS","KC_UNDS","KC_TRNS","KC_TRNS","KC_PLUS","KC_EQL","KC_LBRC","KC_RBRC","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_ESC","KC_BSPC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_F11","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_TRNS","KC_TRNS","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F12","KC_TRNS","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_TRNS","KC_TRNS","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_PIPE","KC_TRNS","KC_1","KC_2","KC_3","KC_4","KC_5","KC_TRNS","KC_TRNS","KC_6","KC_7","KC_8","KC_9","KC_0","KC_TRNS","KC_TRNS","KC_NO","KC_LBRC","KC_RBRC","KC_MINS","KC_UNDS","KC_TRNS","KC_TRNS","KC_PLUS","KC_EQL","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_ESC","KC_BSPC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_HOME","KC_PGDN","KC_PGUP","KC_END","KC_TRNS","KC_TRNS","KC_TRNS","KC_LEFT","KC_DOWN","KC_UP","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_LCBR","KC_RCBR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"]],"author":"","notes":""}
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/readme.md
deleted file mode 100644
index 598f258e1c0..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/readme.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# m47ch4n's keymap for Ergodash rev1
-
-This is the m47ch4n's keymap configuration for Ergodash rev1.
-There are four layers, QWERTY(default), LOWER, RAISE and ADJSUT.
-
-## Layers
-
-### Qwerty
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-| ESC  |   1  |   2  |   3  |   4  |   5  | ZKHK |                    | ZKHK |   6  |   7  |   8  |   9  |   0  |  `   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| TAB  |   Q  |   W  |   E  |   R  |   T  | MHEN |                    |HENKAN|   Y  |   U  |   I  |   O  |   P  |  \   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| CTRL |   A  |   S  |   D  |   F  |   G  | EISU |<-- ONLY FOR MAC -->| KANA |   H  |   J  |   K  |   L  |   ;  |  '   |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-| SHIFT|   Z  |   X  |   C  |   V  |   B  | SHIFT|                    | SHIFT|   N  |   M  |   ,  |   .  |   /  | SHIFT|
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-| SHIFT|ADJUST|  ALT |  GUI |||||||| LOWER| SPACE|      ||||||||      | ENTER| RAISE||||||||  GUI |  ALT |ADJUST| SHIFT|
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Lower
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|  ~   |   !  |   @  |   #  |   $  |   %  |      |                    |      |   ^  |   &  |   *  |   (  |   )  |  |   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|      |   1  |   2  |   3  |   4  |   5  |      |                    |      |   6  |   7  |   8  |   9  |   0  |      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|      ||||||||||||||||||||||   -  |   _  |      |                    |      |   +  |   =  |   [  |   ]  ||||||||      |
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-|      |      |      |      ||||||||      |  ESC |      ||||||||      | BKSP |      ||||||||      |      |      |      |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Raise
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|  ~   |   !  |   @  |   #  |   $  |   %  |      |                    |      |   ^  |   &  |   *  |   (  |   )  |  |   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|      |   1  |   2  |   3  |   4  |   5  |      |                    |      |   6  |   7  |   8  |   9  |   0  |      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|      ||||||||   [  |   ]  |   -  |   _  |      |                    |      |   +  |   =  ||||||||||||||||||||||      |
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-|      |      |      |      ||||||||      |  ESC |      ||||||||      | BKSP |      ||||||||      |      |      |      |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Adjust
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|      |      |      |      |      |      |  US  |                    |  JP  |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|      | HOME |PAGEDN|PAGEUP|  END ||||||||      |                    |      | LEFT | DOWN |  UP  | RIGHT||||||||      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|      |      |   {  |   }  |      |      |      |                    |      |      |      |   {  |   }  |      |      |
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-|      |      |      |      ||||||||      |      |      ||||||||      |      |      ||||||||      |      |      |      |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-If your pc connect this keyboard with JIS(JP) layout, you should press JP MODE key.
-
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/rules.mk
deleted file mode 100644
index bb9e33b0829..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/config.h
deleted file mode 100644
index 9f734138b48..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 300
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/keymap.c
deleted file mode 100644
index 61cac97b0d7..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_3key_2us(
-        KC_ESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                                    KC_EQL,  KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_BSPC, 
-        KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_PGUP,                                 KC_LBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT,  
-        LCA_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_PGDN,                                 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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, 
-        KC_LCTL,        KC_LGUI, KC_LALT, MO(1),            KC_GRV,  KC_SPC,  LT(1,KC_DEL),          KC_HOME, KC_END,  KC_BSLS,          KC_LEFT, KC_RGHT, KC_DOWN, KC_UP    
-    ),
-    [1] = LAYOUT_3key_2us(
-        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                                    KC_F12,       KC_F7,   KC_F8,   KC_F9,               KC_F10,               KC_F11,              KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                  KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,              KC_PSCR,             KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                  KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,              KC_TRNS,             KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                         KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,              KC_TRNS,             KC_TRNS,                         
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          LSFT(KC_HOME), LSFT(KC_END), KC_TRNS,          LALT(LSFT(KC_LEFT)), LALT(LSFT(KC_RIGHT)), LALT(LSFT(KC_DOWN)), LALT(LSFT(KC_UP))     
-    )
-};
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/layers.json b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/layers.json
deleted file mode 100644
index d6f647622b9..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/layers.json
+++ /dev/null
@@ -1 +0,0 @@
-[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_EQL", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_BSPC", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_PGUP", "KC_LBRC", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_ENT", "LCA_T(KC_CAPS)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_PGDN", "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_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_LCTL", "KC_LGUI", "KC_LALT", "MO(1)", "KC_GRV", "KC_SPC", "LT(1,KC_DEL)", "KC_HOME", "KC_END", "KC_BSLS", "KC_LEFT", "KC_RGHT", "KC_DOWN", "KC_UP"], ["KC_TRNS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F12", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "LSFT(KC_HOME)", "LSFT(KC_END)", "KC_TRNS", "LALT(LSFT(KC_LEFT))", "LALT(LSFT(KC_RIGHT))", "LALT(LSFT(KC_DOWN))", "LALT(LSFT(KC_UP))"]]
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/readme.md
deleted file mode 100644
index f3ba6752ad1..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated Keymap Layout
-
-This layout was generated by the QMK API. You can find the JSON data used to
-generate this keymap in the file layers.json.
-
-To make use of this file you will need follow the following steps:
-
-* Download or Clone QMK Firmware: <https://github.com/qmk/qmk_firmware/>
-* Extract QMK Firmware to a location on your hard drive
-* Copy this folder into `keyboards/ergodash/rev1/keymaps/`
-* You are now ready to compile or use your keymap with the source
-
-More information can be found in the QMK docs: <https://docs.qmk.fm>
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/rules.mk
deleted file mode 100644
index bb9e33b0829..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h
deleted file mode 100644
index 2493fe09e22..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 250
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
deleted file mode 100644
index e197874ab57..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
+++ /dev/null
@@ -1,199 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-enum layers {
-    _WINDOWS,
-    _LINUX, 
-    _NUMPAD,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  WINDOWS = SAFE_RANGE,
-  LINUX,
-  NUMPAD,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-#define CTL_ENT MT(MOD_RCTL, KC_PENT)
-#define NUMPAD MO(_NUMPAD)
-#define SHELL LCA(KC_T)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Windows Qwerty
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * | `     |   1   |   2   |   3   |   4   |   5   |   -   |                       |   =   |   6   |   7   |   8   |   9   |   0   |BSpace |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Tab   |   Q   |   W   |   E   |   R   |   T   |   [   |                       |   ]   |   Y   |   U   |   I   |   O   |   P   |   \   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Esc   |   A   |   S   |   D   |   F   |   G   | Home  |                       | Del   |   H   |   J   |   K   |   L   |   :   |   '   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Shift |   Z   |   X   |   C   |   V   |   B   |   -   |                       |   =   |   N   |   M   |   ,   |   .   |   /   | Shift |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | LCtrl | LGUI  | LAlt  |Numpad ||||||||| Space | Lower | Enter ||||||||| Enter | Raise |BSpace ||||||||| F5    | RAlt  | RGui  |Ctl/Ent|
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_WINDOWS] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                            KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                            KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,                            KC_DEL,  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_MINS,                            KC_EQL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_LALT, NUMPAD,           KC_SPC,  LOWER,   KC_ENT,           KC_ENT,  RAISE,   KC_BSPC,          KC_F5,   KC_RALT, KC_RGUI, CTL_ENT
-  ),
-
-  /* Linux Qwerty
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * | `     |   1   |   2   |   3   |   4   |   5   |   -   |                       |   =   |   6   |   7   |   8   |   9   |   0   |BSpace |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Tab   |   Q   |   W   |   E   |   R   |   T   |   [   |                       |   ]   |   Y   |   U   |   I   |   O   |   P   |   \   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Esc   |   A   |   S   |   D   |   F   |   G   | Home  |                       | Del   |   H   |   J   |   K   |   L   |   :   |   '   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Shift |   Z   |   X   |   C   |   V   |   B   |   -   |                       |   =   |   N   |   M   |   ,   |   .   |   /   | Shift |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | LCtrl | LGUI  | LAlt  |Numpad ||||||||| Space | Lower | Enter ||||||||| Enter | Raise |BSpace ||||||||| Shell | RAlt  | RGui  |Ctl/Ent|
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_LINUX] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                            KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                            KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,                            KC_DEL,  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_MINS,                            KC_EQL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_LALT, NUMPAD,           KC_SPC,  LOWER,   KC_ENT,           KC_ENT,  RAISE,   KC_BSPC,          SHELL,   KC_RALT, KC_RGUI, CTL_ENT
-  ),
-
-  /* Numpad
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|NumLock|   /   |   *   |   -   |XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   7   |   8   |   9   |       |XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+   +   +-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   4   |   5   |   6   |       |XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   1   |   2   |   3   |       |XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+ Enter +-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|Numpad |||||||||XXXXXXX|XXXXXXX|XXXXXXX|||||||||XXXXXXX|XXXXXXX|XXXXXXX|||||||||   0   |   .   |       | Enter |
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_NUMPAD] = LAYOUT(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_BSPC,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, NUMPAD,           XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,          KC_KP_0, KC_PDOT, KC_PENT, KC_PENT
-  ),
-
-  /* Lower
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * | F11   | F1    | F2    | F3    | F4    | F5    |       |                       |       | F6    | F7    | F8    | F9    | F10   | F12   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |   (   |   {   |   [   |       |                       |       |   ]   |   }   |   )   |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |       |PageUp |       |                       |       |       |       |       |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |VolDown| VolUp |       |       |PageDwn|       |                       |       |       |       |       |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |||||||||       | Lower |       |||||||||       | Raise |       |||||||||       |       |       |       |
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_LOWER] = LAYOUT(
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,                            _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-    _______, _______, _______, KC_LPRN, KC_LCBR, KC_LBRC, _______,                            _______, KC_RBRC, KC_RCBR, KC_RPRN, _______, _______, _______,
-    _______, _______, _______, _______, _______, KC_PGUP, _______,                            _______, _______, _______, _______, _______, _______, _______,
-    KC_CAPS, KC_VOLD, KC_VOLU, _______, _______, KC_PGDN, _______,                            _______, _______, _______, _______, _______, _______, KC_CAPS,
-    _______, _______, _______, _______,          _______, LOWER,   _______,          _______, RAISE,   _______,          _______, _______, _______, _______
-  ),
-
-  /* Raise
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * | F11   | F1    | F2    | F3    | F4    | F5    |       |                       |       | F6    | F7    | F8    | F9    | F10   | F12   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |   (   |   {   |   [   |       |                       |       |   ]   |   }   |   )   |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |       |       | End   |                       |       | Left  | Down  | Up    | Right |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |       |       |       |                       |       |       |       |       |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |||||||||       | Lower |       |||||||||       | Raise |       |||||||||       |       |       |       |
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_RAISE] = LAYOUT(
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,                            _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-    _______, _______, _______, KC_LPRN, KC_LCBR, KC_LBRC, _______,                            _______, KC_RBRC, KC_RCBR, KC_RPRN, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, KC_END,                             _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-    KC_CAPS, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, KC_CAPS,
-    _______, _______, _______, _______,          _______, LOWER,   _______,          _______, RAISE,            _______, _______, _______, _______, _______
-  ),
-
-  /* Adjust
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * |XXXXXXX|Windows| Linux |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX| Cycle |On/Off |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|On/Off | Cycle |XXXXXXX|XXXXXXX|XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Reset |XXXXXXX|XXXXXXX|Breathe| Inc   |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|Hue inc|Sat inc| Inc   |XXXXXXX|XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| Dec   |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|Hue dec|Sat dec| Dec   |XXXXXXX|XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|||||||||XXXXXXX| Lower |XXXXXXX|||||||||XXXXXXX| Raise |XXXXXXX|||||||||XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_ADJUST] = LAYOUT(
-    XXXXXXX, WINDOWS, LINUX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, BL_STEP, BL_TOGG, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX,
-    QK_BOOT, XXXXXXX, XXXXXXX, BL_BRTG, BL_UP,   XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, LOWER,   XXXXXXX,          XXXXXXX, RAISE,   XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case WINDOWS:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WINDOWS);
-      }
-      return false;
-      break;
-    case LINUX:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_LINUX);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/readme.md
deleted file mode 100644
index 7ab665a8d41..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/readme.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# ShadowProgr's layout for ErgoDash
-
-There are 2 different QWERTY base layers for use with Windows and Linux OSes. Beside those 2 there are also a numpad layer and 3 modifier layers (lower, raise and adjust).
-
-## Layouts
-### Windows
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-| `     |   1   |   2   |   3   |   4   |   5   |   -   |                       |   =   |   6   |   7   |   8   |   9   |   0   |BSpace |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Tab   |   Q   |   W   |   E   |   R   |   T   |   [   |                       |   ]   |   Y   |   U   |   I   |   O   |   P   |   \   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Esc   |   A   |   S   |   D   |   F   |   G   | Home  |                       | Del   |   H   |   J   |   K   |   L   |   :   |   '   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Shift |   Z   |   X   |   C   |   V   |   B   |   -   |                       |   =   |   N   |   M   |   ,   |   .   |   /   | Shift |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| LCtrl | LGUI  | LAlt  |Numpad ||||||||| Space | Lower | Enter ||||||||| Enter | Raise |BSpace ||||||||| F5    | RAlt  | RGui  |Ctl/Ent|
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Linux
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-| `     |   1   |   2   |   3   |   4   |   5   |   -   |                       |   =   |   6   |   7   |   8   |   9   |   0   |BSpace |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Tab   |   Q   |   W   |   E   |   R   |   T   |   [   |                       |   ]   |   Y   |   U   |   I   |   O   |   P   |   \   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Esc   |   A   |   S   |   D   |   F   |   G   | Home  |                       | Del   |   H   |   J   |   K   |   L   |   :   |   '   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Shift |   Z   |   X   |   C   |   V   |   B   |   -   |                       |   =   |   N   |   M   |   ,   |   .   |   /   | Shift |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| LCtrl | LGUI  | LAlt  |Numpad ||||||||| Space | Lower | Enter ||||||||| Enter | Raise |BSpace ||||||||| Shell | RAlt  | RGui  |Ctl/Ent|
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Numpad
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|NumLock|   /   |   *   |   -   |XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   7   |   8   |   9   |       |XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+   +   +-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   4   |   5   |   6   |       |XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   1   |   2   |   3   |       |XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+ Enter +-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|Numpad |||||||||XXXXXXX|XXXXXXX|XXXXXXX|||||||||XXXXXXX|XXXXXXX|XXXXXXX|||||||||   0   |   .   |       | Enter |
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Lower
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-| F11   | F1    | F2    | F3    | F4    | F5    |       |                       |       | F6    | F7    | F8    | F9    | F10   | F12   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |   (   |   {   |   [   |       |                       |       |   ]   |   }   |   )   |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |PageUp |       |                       |       |       |       |       |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |VolDown| VolUp |       |       |PageDwn|       |                       |       |       |       |       |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |||||||||       | Lower |       |||||||||       | Raise |       |||||||||       |       |       |       |
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Raise
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-| F11   | F1    | F2    | F3    | F4    | F5    |       |                       |       | F6    | F7    | F8    | F9    | F10   | F12   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |   (   |   {   |   [   |       |                       |       |   ]   |   }   |   )   |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |       | End   |                       |       | Left  | Down  | Up    | Right |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |       |       |                       |       |       |       |       |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |||||||||       | Lower |       |||||||||       | Raise |       |||||||||       |       |       |       |
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Adjust
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-|XXXXXXX|Windows| Linux |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX| Cycle |On/Off |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|On/Off | Cycle |XXXXXXX|XXXXXXX|XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Reset |XXXXXXX|XXXXXXX|Breathe| Inc   |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|Hue inc|Sat inc| Inc   |XXXXXXX|XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| Dec   |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|Hue dec|Sat dec| Dec   |XXXXXXX|XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|||||||||XXXXXXX| Lower |XXXXXXX|||||||||XXXXXXX| Raise |XXXXXXX|||||||||XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/rules.mk
deleted file mode 100644
index 30d8419904e..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c
deleted file mode 100644
index 938f3950fda..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-enum layers {
-  _QWERTZ,
-  _MOD,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTZ] = LAYOUT(
-    _______ ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,_______ ,                        KC_RSFT ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,_______ ,
-    KC_ESC  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_BSPC ,                        KC_DEL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,DE_ADIA   ,
-    KC_TAB  ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,DE_UNDS ,                        KC_LALT ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,DE_EQL  ,DE_ODIA ,
-    _______ ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_SPC  ,                        KC_ENT  ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,DE_SS   ,DE_UDIA ,
-    _______ ,_______ ,_______ ,_______ ,         KC_LCTL ,KC_SPC  ,KC_LSFT ,      MO(_MOD),KC_ENT  ,KC_LGUI ,         _______ ,_______ ,_______ ,_______
-  ),
-  [_MOD] = LAYOUT(
-    KC_F11  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,RGB_MOD ,                        QK_BOOT,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F12  ,
-    DE_CIRC ,DE_QUOT ,DE_DQUO ,DE_LCBR ,DE_RCBR ,DE_GRV  ,RGB_TOG ,                        _______ ,DE_PERC ,DE_PLUS ,DE_MINS ,DE_ASTR ,DE_SLSH ,DE_BSLS ,
-    DE_TILD ,DE_EXLM ,DE_DLR  ,DE_LPRN ,DE_RPRN ,DE_AMPR ,RGB_M_P ,                        _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,DE_QUES ,DE_PIPE ,
-    _______ ,DE_AT   ,DE_EURO ,DE_LBRC ,DE_RBRC ,_______ ,_______ ,                        _______ ,DE_HASH ,DE_LABK ,DE_SCLN ,DE_COLN ,DE_RABK ,DE_SECT ,
-    _______ ,_______ ,_______ ,_______ ,         _______ ,_______ ,_______ ,      _______ ,_______ ,_______ ,         _______ ,_______ ,_______ ,_______ 
-  ),
-};
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/readme.md
deleted file mode 100644
index 54ee4d4f1fa..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Tw1t611 Ergodash Layout
-
-This is a german layout for the ergodash keyboard. The Umlauts are placed on the right side.
-It uses two layers and has vim like aligned arrow keys.
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/rules.mk
deleted file mode 100644
index bb9e33b0829..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
index 99e7de0d87d..8cf1e8238d3 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h
@@ -21,11 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 70
-#define RGB_MATRIX_SPLIT { 30, 40 }    // Number of LEDs
-#endif
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json
index ed687ddb3d7..8a7b34597e1 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json
@@ -9,7 +9,8 @@
         "device_version": "0.0.5"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "split_count": [30, 40]
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/config.h b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/config.h
deleted file mode 100644
index 818ea7d4af4..00000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 omkbd
- *
- * 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_MATRIX_FRAMEBUFFER_EFFECTS
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
deleted file mode 100644
index e23ba19d7a1..00000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2021 omkbd
- *
- * 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_number {
-    _QWERTY = 0,
-    _NAV,
-    _SYMBOL,
-    _MEDIA
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [_QWERTY] = LAYOUT(
-    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_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_ESC,  KC_A,    KC_S,    KC_D,  KC_F,  KC_G,          KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,          KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
-    KC_LCTL, KC_LALT, KC_LGUI, MO(2), MO(1), KC_SPC,        KC_SPC, MO(1), MO(2),   KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-[_NAV] = 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_TRNS, KC_NO,   KC_UP,   KC_NO,   KC_NO,   KC_NO,         KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-    KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,         KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_PGUP, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, MO(3),   KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, MO(3),   KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
-),
-
-[_SYMBOL] = LAYOUT(
-    KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_BSPC,
-    KC_TRNS, KC_NO,   KC_P7, KC_P8,   KC_P9,  KC_NO,            KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_NO,   KC_LCBR, KC_RCBR, KC_PIPE,
-    KC_ESC,  KC_NO,   KC_P4, KC_P5,   KC_P6,  KC_NO,            KC_LCBR, KC_RCBR, KC_MINS, KC_EQL,  KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_NO,   KC_P1, KC_P2,   KC_P3,  KC_NO,            KC_LBRC, KC_RBRC, KC_LT,   KC_GT,   KC_QUES, KC_TRNS, KC_UP,   KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, MO(3),  KC_TRNS,          KC_TRNS, MO(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-[_MEDIA] = LAYOUT(
-    KC_NO,   KC_SCRL,  KC_PAUS, KC_NO,    KC_NO,   RGB_VAD,         RGB_VAI, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,
-    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI,  RGB_VAI, RGB_SPI,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MPLY, KC_NO,   KC_NO,   KC_NO,
-    KC_NO,   RGB_RMOD, RGB_HUD, RGB_SAD,  RGB_VAD, RGB_SPD,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-    KC_NO,   RGB_M_P,  RGB_M_B, RGB_M_SW, RGB_M_G, KC_NO,           KC_NO,   KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_VOLU, KC_NO,
-    KC_NO,   KC_NO,    KC_NO,   KC_TRNS,  KC_TRNS, KC_NO,           KC_NO,   KC_TRNS, KC_TRNS, KC_NO,   KC_NO,   KC_MRWD, KC_VOLD, KC_MFFD
-)
-
-};
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
deleted file mode 100644
index 8110dbaa1f9..00000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-VIA_ENABLE = yes
diff --git a/keyboards/opendeck/32/rev1/config.h b/keyboards/opendeck/32/rev1/config.h
index d5e824fdfb7..446cb047faa 100644
--- a/keyboards/opendeck/32/rev1/config.h
+++ b/keyboards/opendeck/32/rev1/config.h
@@ -15,60 +15,11 @@
  */
 #pragma once
 
-// RGB matrix
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#define RGB_MATRIX_LED_COUNT (4 * 8 * 3)
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_SPIRAL
+#define IS31FL3731_SDB_PIN D2
+#define IS31FL3731_IRQ_PIN D3
+
 #define RGB_MATRIX_DISABLE_KEYCODES
-// 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
-#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
 
 // Slim down the ROM
 #define NO_ACTION_LAYER
diff --git a/keyboards/opendeck/32/rev1/info.json b/keyboards/opendeck/32/rev1/info.json
index 2d72d9d0b40..9ff22ec125e 100644
--- a/keyboards/opendeck/32/rev1/info.json
+++ b/keyboards/opendeck/32/rev1/info.json
@@ -4,7 +4,56 @@
         "rows": ["C7", "C6", "B6", "B5"]
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_spiral"
+        },
+        "driver": "is31fl3731",
+        "sleep": true
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
diff --git a/keyboards/opendeck/32/rev1/rev1.c b/keyboards/opendeck/32/rev1/rev1.c
index 0b062ecd380..8b3f9c02222 100644
--- a/keyboards/opendeck/32/rev1/rev1.c
+++ b/keyboards/opendeck/32/rev1/rev1.c
@@ -17,7 +17,7 @@
 #include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
      *   driver
      *   |  R location
@@ -93,18 +93,18 @@ void keyboard_pre_init_kb(void) {
     setPinOutput(POWER_LED_PIN);
     writePinLow(POWER_LED_PIN);
 
-    // Enable RGB driver IC
-    setPinOutput(RGB_DISABLE_N_PIN);
-    writePinHigh(RGB_DISABLE_N_PIN);
-
     // We don't use this feature of the IS31FL3731 but it is electrically connected
     // Make sure not to drive it
-    setPinInput(RGB_IRQ_N_PIN);
+    setPinInput(IS31FL3731_IRQ_PIN);
+
+    keyboard_pre_init_user();
 }
 
-void keyboard_post_init_user(void) {
+void keyboard_post_init_kb(void) {
     // RGB enabled by default, no way to turn off. No need to expend EEPROM write cycles here.
     rgb_matrix_enable_noeeprom();
+
+    keyboard_post_init_user();
 }
 #endif
 
diff --git a/keyboards/opendeck/32/rev1/rev1.h b/keyboards/opendeck/32/rev1/rev1.h
index 69777d95abe..455b2ac7531 100644
--- a/keyboards/opendeck/32/rev1/rev1.h
+++ b/keyboards/opendeck/32/rev1/rev1.h
@@ -19,8 +19,6 @@
 #include "quantum.h"
 
 #define POWER_LED_PIN F1
-#define RGB_DISABLE_N_PIN D2
-#define RGB_IRQ_N_PIN D3
 
 // If you want something similar to what Taran from LMG does in https://github.com/TaranVH/2nd-keyboard
 // you can create a "wrapper key" by uncommenting the row below and chosing your wrapper keycode.
diff --git a/keyboards/org60/keymaps/boardy/keymap.c b/keyboards/org60/keymaps/boardy/keymap.c
deleted file mode 100644
index 48373de3758..00000000000
--- a/keyboards/org60/keymaps/boardy/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-// Keyboard Layers
-enum keyboard_layers {
-  _BASE,        // Base Layer
-  _FUNCTION,    // Function Layer
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT(
-  /*
-    0: Base Layer
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    | ~      | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      | _      | +      |                 |
-    |        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-    | Esc    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | Backspace       |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |            |        |        |        |        |        |        |        |        |        |        | {      | ]      | |           |
-    |            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-    | Tab        | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | \           |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |               |        |        |        |        |        |        |        |        |        | :      | "      |                   |
-    |               |        |        |        |        |        |        |        |        |        |        |        |                   |
-    | PrntScr       | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | Enter             |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |                   |        |        |        |        |        |        |        | <      | >      | ?      |░░░░░░|        |░░░░░░░░|
-    |                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-    | Shift             | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      |░░░░░░| Up     |░░░░░░░░|
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |          |          |          |                                                        |          |░░░░░░|        |        |        |
-    |          |          |          |                                                        |          |░░░░░░|        |        |        |
-    | Ctrl     | Win      | Alt      | Space                                                  | FnO      |░░░░░░| Left   | Down   | Right  |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-
-   //--------------------------------------------------------------------------------------------------------------------------------------.
-   //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-   //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-     QK_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_NO,   
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-   //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-     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_PSCR,        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NO, KC_ENT,      
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-   //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-     KC_LSFT, KC_NO,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, KC_UP,   KC_NO,   
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //          |          |          |                                                        |          |░░░░░░|        |        |        |
-   //          |          |          |                                                        |          |░░░░░░|        |        |        |
-     KC_LCTL,   KC_LGUI,   KC_LALT,   KC_SPC,                                               MO(_FUNCTION),KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT),
-   //--------------------------------------------------------------------------------------------------------------------------------------'
-
-
-  [_FUNCTION] = LAYOUT(
-  /*
-    1: Function Layer
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    |        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-    |        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-    | Esc    | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | Delete          |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-    |            |        |        |        | RGB    | RGB    | RGB    | RGB    |        |        |        |        |        |             |
-    | Reset      | 7      | 8      | 9      | Toggle | Mode   | Pwr+   | Pwr-   |        | Insert | Pause  | Home   | End    | Sleep       |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |               |        |        |        |        |        |        |        |        |        |        |        |                   |
-    |               |        |        |        | RGB    | RGB    | RGB    | RGB    |        |        | Page   | Page   |                   |
-    | Caps Lock     | 4      | 5      | 6      | Hue+   | Hue-   | Sat+   | Sat-   |        |        | Up     | Down   | Enter             |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-    |                   |        |        |        |        | Back   | Back   |        | Prev   | Next   |        |░░░░░░|        |░░░░░░░░|
-    | Shift             | 1      | 2      | 3      |        | Light+ | Light- |        | Track  | Track  |        |░░░░░░| Up     |░░░░░░░░|
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |          |          |          |                                                        |          |░░░░░░|        |        |        |
-    |          |          |          |                                                        |          |░░░░░░|        |        |        |
-    | Ctrl     | Win      | Alt      | 0                                                      | Fn0      |░░░░░░| Mute   | Down   | Right  |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-
-   //--------------------------------------------------------------------------------------------------------------------------------------.
-   //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-   //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-     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_NO,   
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-   //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-     QK_BOOT,     KC_7,    KC_8,    KC_9,    RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, KC_NO,   KC_INS,  KC_PAUS, KC_HOME, KC_END,  KC_SLEP,      
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //               |        |        |        |        |        |        |        |        |        |        |        |                   |
-   //               |        |        |        |        |        |        |        |        |        |        |        |                   |
-     KC_CAPS,        KC_4,    KC_5,    KC_6,    RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_NO,   KC_NO,   KC_PGUP, KC_PGDN, KC_NO, KC_ENT,      
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-   //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-     KC_LSFT, KC_NO,     KC_1,    KC_2,    KC_3,    KC_NO,   BL_UP,   BL_DOWN, KC_NO,   KC_MPRV, KC_MNXT, KC_NO,   KC_NO, KC_VOLU, KC_NO,   
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //          |          |          |                                                        |          |░░░░░░|        |        |        |
-   //          |          |          |                                                        |          |░░░░░░|        |        |        |
-     KC_LCTL,   KC_LGUI,   KC_LALT,   KC_0,                                                 MO(_FUNCTION),KC_NO, KC_MUTE, KC_VOLD, KC_MPLY),
-   //--------------------------------------------------------------------------------------------------------------------------------------'
-
-};
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/org60/keymaps/boardy/readme.md b/keyboards/org60/keymaps/boardy/readme.md
deleted file mode 100644
index 3643fbce30e..00000000000
--- a/keyboards/org60/keymaps/boardy/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Boardy layout
-
-![Uses this layout](http://i.imgur.com/k3g488o.jpg)
-
-This is my custom layout for my board Boardy designed to be used with an [Org60] and custom plate.
-
-[Org60]: https://world.taobao.com/item/544441405112.htm
diff --git a/keyboards/org60/keymaps/boardy/rules.mk b/keyboards/org60/keymaps/boardy/rules.mk
deleted file mode 100644
index 88ac79ecad5..00000000000
--- a/keyboards/org60/keymaps/boardy/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-CONSOLE_ENABLE = no         # Enable debugging console
-COMMAND_ENABLE = no         # Commands for debug and configuration
-TAP_DANCE_ENABLE = no 		# Tap Dance skills
-UNICODE_ENABLE = no         # Unicode
-
diff --git a/keyboards/ortho5by12/rules.mk b/keyboards/ortho5by12/rules.mk
index bf02b031194..6fe874e748b 100644
--- a/keyboards/ortho5by12/rules.mk
+++ b/keyboards/ortho5by12/rules.mk
@@ -10,4 +10,3 @@ 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_HAS_RGB = no
diff --git a/keyboards/orthodox/keymaps/rfvizarra/config.h b/keyboards/orthodox/keymaps/rfvizarra/config.h
deleted file mode 100644
index 92b3713350c..00000000000
--- a/keyboards/orthodox/keymaps/rfvizarra/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#ifdef AUDIO_ENABLE
-#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-}
-#endif
-
-#define USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#endif
diff --git a/keyboards/orthodox/keymaps/rfvizarra/keymap.c b/keyboards/orthodox/keymaps/rfvizarra/keymap.c
deleted file mode 100644
index af9f8d5e20c..00000000000
--- a/keyboards/orthodox/keymaps/rfvizarra/keymap.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-This is the keymap for the keyboard
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-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
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK  2
-#define _LOWER   3
-#define _RAISE   4
-#define _NAV     5
-#define _NAV2    6
-#define _MEDIA   7
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK
-};
-
-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_BSPC,
-    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_LGUI,      KC_LALT,            MO(_MEDIA)  , KC_DEL,               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    MO(_NAV),KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(_LOWER),   KC_LSFT, CTL_T(KC_ENT),           KC_RALT,      KC_SPC, MO(_RAISE),   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LGUI
-  ),
-
-  [_COLEMAK] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                                             KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,  KC_BSPC,
-    KC_ESC,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,      KC_UP,    KC_DOWN,                    KC_LEFT, KC_RIGHT,               KC_H,    KC_N,    KC_E,    KC_I,    KC_O,     KC_QUOT,
-    KC_LCTL,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      MO(_LOWER), KC_SPACE, KC_BSPC,        KC_DEL,  KC_ENT,  MO(_RAISE),    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLASH, KC_LGUI
-  ),
-
-  [_DVORAK] = LAYOUT(
-    KC_TAB,   KC_QUOT, KC_COMM, KC_DOT, KC_P,     KC_Y,                                                                             KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,   KC_A,    KC_O,    KC_E,   KC_U,     KC_I,                  KC_UP,    KC_DOWN,        KC_LEFT, KC_RIGHT,               KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-    KC_LCTL,  KC_SCLN, KC_Q,    KC_J,   KC_K,     KC_X,      MO(_LOWER), KC_SPACE, KC_BSPC,        KC_DEL,  KC_ENT,  MO(_RAISE),    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_LGUI
-  ),
-
-  [_LOWER] = LAYOUT(
-    KC_TILD,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                                              KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    KC_DEL,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,          KC_LCTL, _______,          _______, KC_RCTL,          KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______,          _______, _______, _______, KC_F12,  KC_HOME,    KC_COMM,    KC_DOT,  KC_END,  _______
-  ),
-
-  [_RAISE] = LAYOUT(
-    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_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_PGUP, KC_COMM, KC_DOT,  KC_PGDN, _______
-  ),
-
-  [_NAV] =  LAYOUT(
-    _______, _______, _______, _______, _______, _______,                                                                _______, _______, KC_UP,   _______,  _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,  _______, _______
-  ),
-
-  [_NAV2] =  LAYOUT(
-    _______, _______, _______, _______, _______, _______,                                                                _______, _______, KC_PGUP, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, KC_HOME, KC_PGDN, KC_END,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_MEDIA] =  LAYOUT(
-    _______, _______, _______, _______, _______, _______,                                                                _______, _______, KC_VOLU, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, KC_MNXT, KC_VOLD, KC_MPLY, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_ADJUST] =  LAYOUT(
-    _______, QK_BOOT, _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,          _______, _______,          _______, _______,          AG_SWAP, QWERTY , COLEMAK, DVORAK,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  )
-
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-  state = update_tri_layer_state(state, _LOWER, _NAV, _NAV2);
-  return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case QWERTY:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_QWERTY);
-    }
-    return false;
-    break;
-  case COLEMAK:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_COLEMAK);
-    }
-    return false;
-    break;
-  case DVORAK:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_DVORAK);
-    }
-    return false;
-    break;
-  }
-  return true;
-}
-
diff --git a/keyboards/orthodox/keymaps/rfvizarra/readme.md b/keyboards/orthodox/keymaps/rfvizarra/readme.md
deleted file mode 100644
index 10a60ebfd34..00000000000
--- a/keyboards/orthodox/keymaps/rfvizarra/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# A personal Orthodox Layout
-
-![Orthodox](https://i.imgur.com/RQ5SKj4.jpg)
-
-This is the layout for my daily driver orthodox. It's based on a custom handwire keyboard that I've been using for quite some time. It's based on Plank's/Let's split layouts for the lower/raise layers. I added the shift, control/enter, alt/altgr and del to the thumb cluster.
-
-To build the firmware run from qmk's project folder
-
-    make orthodox/rev3:rfvizarra
-
-And to flash it, run
-
-    make orthodox/rev3:rfvizarra:avrdude
-
-reset your keyboard pro micro while connected to the PC with a micro usb cable.
-
-Repeat on both halves.
-
-See [install build tools](https://docs.qmk.fm/install-build-tools) then the [build/compile instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h
deleted file mode 100644
index 79d7cddec03..00000000000
--- a/keyboards/orthodox/keymaps/shaymdev/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-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 EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLED_NUM 14
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_KNIGHT
-
-// #define RGBLED_SPLIT { 5, 5 }
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN D3
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_SLEEP
-
-#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
-
-#define TAPPING_TERM 220
diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c
deleted file mode 100644
index 24fca7661e5..00000000000
--- a/keyboards/orthodox/keymaps/shaymdev/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-This is the keymap for the keyboard
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-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 orthodox_layers
-{
-	_DVORAK,
-	_QWERTY,
-	_LOWER,
-	_RAISE,
-	_ADJUST,
-};
-
-enum combos
-{
-	EU_ENT,
-};
-
-const uint16_t PROGMEM eu_combo[]     = {KC_E, KC_U, COMBO_END};
-
-combo_t key_combos[] = {
-	[EU_ENT]                = COMBO_ACTION(eu_combo),
-};
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-  switch(combo_index) {
-    case EU_ENT:
-      if (pressed) {
-        tap_code16(KC_ENT);
-      }
-      break;
-  }
-}
-
-
-enum custom_keycodes {
-  DVORAK = SAFE_RANGE,
-  QWERTY,
-  VELOCI
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-#define TO_DV TO(_DVORAK)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[_DVORAK] = LAYOUT(
-  KC_ESC,  KC_QUOT, KC_COMM, KC_DOT, KC_P,    KC_Y,                                                                            KC_F,    KC_G,   KC_C,  KC_R,   KC_L,    KC_SLSH,
-  KC_TAB, GUI_T(KC_A), ALT_T(KC_O), KC_E, KC_U,  KC_I, KC_ENT,             KC_LALT,         KC_DEL,                 KC_LGUI,   KC_D,    KC_H,   KC_T,  KC_N,   KC_S,    KC_MINS,
-  KC_EQL,  KC_SCLN, KC_Q,    KC_J,   KC_K,    KC_X,    TT(LOWER), KC_LSFT, KC_LCTL,         KC_BSPC, ALT_T(KC_SPC), TT(RAISE), KC_B,    KC_M,   KC_W,  KC_V,   KC_Z,    KC_BSLS
-),
-
-[_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_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_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, _______,          _______, _______,  _______, KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT
-),
-
-[_LOWER] = LAYOUT(
-  _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR,                                                                _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
-  _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_ASTR, _______,          _______,          _______,          _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
-  _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV,	_______, _______, _______,          _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______
-),
-
-[_RAISE] = LAYOUT(
-  _______, KC_PSCR, KC_HOME, KC_UP,   KC_END,  KC_PGUP,                                                                KC_VOLU, KC_F7, KC_F8,  KC_F9,  KC_F10,  XXXXXXX,
-  KC_CAPS, KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  _______,          _______,         _______,          _______, KC_VOLD, KC_F4, KC_F5,  KC_F6,  KC_F11,  XXXXXXX,
-  _______, KC_NUM,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______, _______, _______,         _______, _______, _______, KC_MUTE, KC_F1, KC_F2,  KC_F3,  KC_F12,  XXXXXXX
-),
-
-[_ADJUST] =  LAYOUT(
-    TO_DV, QK_BOOT, _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, KC_SLEP,
-  RGB_TOG, RGB_MOD, VK_TOGG,  AU_ON,   AU_OFF,  AG_NORM, _______,          _______,          _______,          _______, AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______,
-  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-)
-
-
-};
-
-const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DELETE);
-
-// This globally defines all key overrides to be used
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &delete_key_override,
-    NULL // Null terminate the array of overrides!
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case QWERTY:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_QWERTY);
-    }
-    return false;
-    break;
-  case DVORAK:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_DVORAK);
-    }
-    return false;
-    break;
-//   case VELOCI:
-// #ifdef VELOCIKEY_ENABLE
-//     velocikey_toggle();
-//     return false;
-// #endif
-//     break;
-  }
-  return true;
-}
-
-#ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {4, 6, HSV_RED}       // Light 6 LEDs, starting with LED 4
-);
-
-const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 3, HSV_CHARTREUSE}       // Light 3 LEDs, starting with LED 0
-);
-
-const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {4, 3, HSV_BLUE}    // Light LEDs 5-6
-);
-
-const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {7, 3, HSV_ORANGE}    // Light LEDs 7-8
-);
-
-const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {4, 6, HSV_GREEN}       // Light 10 LEDs, starting with LED 0
-);
-
-
-// Later layers take precedence.  This array corresponds to the magic numbers used in rgblight_set_layer_state(i, onOff)
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_capslock_layer,
-    my_qwerty_layer,   // Overrides other layers
-    my_lower_layer,    // Overrides other layers
-    my_raise_layer,    // Overrides other layers
-    my_adjust_layer    // Overrides other layers
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-    rgblight_enable_noeeprom(); // Enables RGB, without saving settings
-    //rgblight_sethsv_noeeprom(HSV_CYAN);
-    //rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
-}
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    return true;
-}
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(1, layer_state_cmp(state, _QWERTY));
-    return state;
-}
-
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-
-#ifdef RGBLIGHT_ENABLE
-    rgblight_set_layer_state(2, layer_state_cmp(state, _LOWER));
-    rgblight_set_layer_state(3, layer_state_cmp(state, _RAISE));
-    rgblight_set_layer_state(4, layer_state_cmp(state, _ADJUST));
-#endif
-
-  return state;
-}
diff --git a/keyboards/orthodox/keymaps/shaymdev/rules.mk b/keyboards/orthodox/keymaps/shaymdev/rules.mk
deleted file mode 100644
index c6ecb2372fb..00000000000
--- a/keyboards/orthodox/keymaps/shaymdev/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-MOUSEKEY_ENABLE = no
-RGBLIGHT_ENABLE = yes
-VELOCIKEY_ENABLE = yes
-KEY_OVERRIDE_ENABLE = yes
-COMBO_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/orthodox/keymaps/xyverz/config.h b/keyboards/orthodox/keymaps/xyverz/config.h
deleted file mode 100644
index d8e91fa6d80..00000000000
--- a/keyboards/orthodox/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-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 MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/orthodox/keymaps/xyverz/keymap.c b/keyboards/orthodox/keymaps/xyverz/keymap.c
deleted file mode 100644
index 280f7e054d0..00000000000
--- a/keyboards/orthodox/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names { _QWERTY, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, LOWER, RAISE, ADJUST };
-
-// Aliases to keep the keymap tidy
-#define ADJUST MO(_ADJUST)
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DVORAK] = LAYOUT (
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                                                                   KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,             KC_LCTL, KC_LALT,          KC_RGUI, KC_RCTL,          KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    LOWER,   KC_BSPC, KC_LGUI,          KC_ENT,  KC_SPC,  RAISE,   KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT
-),
-
-[_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_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_LCTL, KC_LALT,          KC_RGUI, KC_RCTL,          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    LOWER,   KC_BSPC, KC_LGUI,          KC_ENT,  KC_SPC,  RAISE,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT
-),
-
-[_COLEMAK] = LAYOUT (
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                                   KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,             KC_LCTL, KC_LALT,          KC_RGUI, KC_RCTL,          KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    LOWER,   KC_BSPC, KC_LGUI,          KC_ENT,  KC_SPC,  RAISE,   KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT
-),
-
-[_LOWER] = LAYOUT (
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                                                KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, KC_HOME,          KC_PGUP, _______,          _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, _______, KC_LEFT, KC_RGHT, _______, _______, _______, KC_DEL,  KC_END,           KC_PGDN, KC_INS,  _______, _______, _______, KC_UP,   KC_DOWN, _______, _______
-),
-
-[_RAISE] = LAYOUT (
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                                   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  KC_CAPS, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,          _______, KC_HOME,          KC_PGUP, _______,          _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, _______, KC_LEFT, KC_RGHT, _______, _______, _______, KC_DEL,  KC_END,           KC_PGDN, KC_INS,  _______, _______, _______, KC_UP,   KC_DOWN, _______, _______
-),
-
-[_ADJUST] = LAYOUT (
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                                                  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-  _______, QK_BOOT, _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, QWERTY , COLEMAK, DVORAK,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-// clang-format on
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void matrix_init_user(void) {
-#ifdef BOOTLOADER_CATERINA
-    // This will disable the red LEDs on the ProMicros
-    setPinInput(D5);
-    setPinInput(B0);
-#endif
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case QWERTY:
-                set_single_persistent_default_layer(_QWERTY);
-                return false;
-            case COLEMAK:
-                set_single_persistent_default_layer(_COLEMAK);
-                return false;
-            case DVORAK:
-                set_single_persistent_default_layer(_DVORAK);
-                return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/orthodox/keymaps/xyverz/readme.md b/keyboards/orthodox/keymaps/xyverz/readme.md
deleted file mode 100644
index 43229cd0aa4..00000000000
--- a/keyboards/orthodox/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Xyverz's Orthodox Keymap
-
-## About this keymap:
-
-This is my OrthoDox keymap, and the first iteration of my readme. I've based this keymap on both my Planck and ErgoDox/Kinesis Advantage keymaps.
-
-## Still to do:
-
- * Re-evaluate the placement of the arrow keys after some time using this keyboard.
-
-### Layer 0: Dvorak layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	| Tab    |   '  |   ,  |   .  |   P  |   Y  ||   F  |   G  |   C  |   R  |   L  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Escape |   A  |   O  |   E  |   U  |   I  ||   D  |   H  |   T  |   N  |   S  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   X  ||   B  |   M  |   W  |   V  |   Z  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	                              ,-------------.,-------------.
-	                              | LCtr | LAlt || RGui | RCtr |
-	                       ,------|------|------||------+------+------.
-	                       |Lower | Bspc | LGui || Enter| Space| Raise|
-	                       `--------------------'`--------------------'
-
-### Layer 1: Qwerty layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	| Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |  BSPC  |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Escape |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	                              ,-------------.,-------------.
-	                              | LCtr | LAlt || RGui | RCtr |
-	                       ,------|------|------||------+------+------.
-	                       |Lower | Bspc | LGui || Enter| Space| Raise|
-	                       `--------------------'`--------------------'
-
-### Keymap 2: Colemak layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	| Tab    |   Q  |   W  |   F  |   P  |   G  ||   J  |   L  |   U  |   Y  |   ;  |  BSPC  |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Escape |   A  |   R  |   S  |   T  |   D  ||   H  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  ||   K  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	                              ,-------------.,-------------.
-	                              | LCtr | LAlt || RGui | RCtr |
-	                       ,------|------|------||------+------+------.
-	                       |Lower | Bspc | LGui || Enter| Space| Raise|
-	                       `--------------------'`--------------------'
-
-### layer 3 : Lower layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	|   ~    |   !  |   @  |   #  |   $  |   %  ||   ^  |   &  |   *  |   (  |   )  |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| CapsLk |      | Mute | Vol- | Vol+ |      ||      |   _  |   +  |   {  |   }  |   |    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Left | Rght |      |      ||      |      |  Up  | Down |      |        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	                              ,-------------.,-------------.
-	                              |      | Home || PgUp |      |
-	                       ,------|------|------||------+------+------.
-	                       |      | Del  | End  || PgDn | Ins  |      |
-	                       `--------------------'`--------------------'
-
-### Keymap 4: Raise layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	|   ~    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| CapsLk |      | Prev | Play | Next |      ||      |   -  |   =  |   [  |   ]  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Left | Rght |      |      ||      |      |  Up  | Down |      |        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	                              ,-------------.,-------------.
-	                              |      | Home || PgUp |      |
-	                       ,------|------|------||------+------+------.
-	                       |      | Del  | End  || PgDn | Ins  |      |
-	                       `--------------------'`--------------------'
-
-### Keymap 5: Adjust Layer
-
-	,-------------------------------------------.,-------------------------------------------.
-	|   F11  |  F1  |  F2  |  F3  |  F4  |  F5  ||  F6  |  F7  |  F8  |  F9  |  F10 |  F12   |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |Reset |      |      |      |      ||      |Qwerty|Colemk|Dvorak|      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |      |
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       `--------------------'`--------------------'
-
-
diff --git a/keyboards/orthograph/config.h b/keyboards/orthograph/config.h
new file mode 100644
index 00000000000..137c5601c99
--- /dev/null
+++ b/keyboards/orthograph/config.h
@@ -0,0 +1,20 @@
+/*
+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 EE_HANDS // need to flash eeprom with eeprom-lefthand.eep for left, etc
+
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/orthograph/info.json b/keyboards/orthograph/info.json
new file mode 100644
index 00000000000..ad37b0c723c
--- /dev/null
+++ b/keyboards/orthograph/info.json
@@ -0,0 +1,239 @@
+{
+    "keyboard_name": "Orthograph",
+    "url": "https://github.com/vladkvit",
+    "maintainer": "vladkvit",
+    "manufacturer": "vladkvit",
+    "build": {
+        "debounce_type": "asym_eager_defer_pk",
+        "lto": true
+    },
+    "debounce": 4,
+    "usb": {
+        "vid": "0x564B",
+        "pid": "0x0602",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "rgb_matrix": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "development_board": "elite_c",
+    "matrix_pins": {
+        "cols": ["B5", "B4", "D7", "C6", "D4", "D2", "D3", "F4"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "E6",
+        "transport": {
+            "sync_matrix_state": true
+        },
+        "usb_detect":{
+            "enabled": true
+        }
+    },
+    "rgb_matrix": {
+        "default": {
+            "animation": "band_val"
+        },
+        "driver": "is31fl3733",
+        "split_count": [36,  46],
+        "layout": [
+            {"matrix":[0, 0], "flags":4, "x":0,  "y":0},
+            {"matrix":[0, 1], "flags":4, "x":16,  "y":0},
+            {"matrix":[0, 2], "flags":4, "x":32,  "y":0},
+            {"matrix":[0, 3], "flags":4, "x":48,  "y":0},
+            {"matrix":[0, 4], "flags":4, "x":64,  "y":0},
+            {"matrix":[0, 5], "flags":4, "x":80,  "y":0},
+            {"matrix":[1, 0], "flags":4, "x":0,  "y":12},
+            {"matrix":[1, 1], "flags":4, "x":16,  "y":12},
+            {"matrix":[1, 2], "flags":4, "x":32,  "y":12},
+            {"matrix":[1, 3], "flags":4, "x":48,  "y":12},
+            {"matrix":[1, 4], "flags":4, "x":64,  "y":12},
+            {"matrix":[1, 5], "flags":4, "x":80,  "y":12},
+            {"matrix":[2, 0], "flags":4, "x":0,  "y":24},
+            {"matrix":[2, 1], "flags":4, "x":16,  "y":24},
+            {"matrix":[2, 2], "flags":4, "x":32,  "y":24},
+            {"matrix":[2, 3], "flags":4, "x":48,  "y":24},
+            {"matrix":[2, 4], "flags":4, "x":64,  "y":24},
+            {"matrix":[2, 5], "flags":4, "x":80,  "y":24},
+            {"matrix":[3, 0], "flags":1, "x":0,  "y":36},
+            {"matrix":[3, 1], "flags":4, "x":16,  "y":36},
+            {"matrix":[3, 2], "flags":4, "x":32,  "y":36},
+            {"matrix":[3, 3], "flags":4, "x":48,  "y":36},
+            {"matrix":[3, 4], "flags":4, "x":64,  "y":36},
+            {"matrix":[3, 5], "flags":4, "x":80,  "y":36},
+            {"matrix":[4, 0], "flags":4, "x":0,  "y":48},
+            {"matrix":[4, 1], "flags":4, "x":16,  "y":48},
+            {"matrix":[4, 2], "flags":4, "x":32,  "y":48},
+            {"matrix":[4, 3], "flags":4, "x":48,  "y":48},
+            {"matrix":[4, 4], "flags":4, "x":64,  "y":48},
+            {"matrix":[4, 5], "flags":4, "x":80,  "y":48},
+            {"matrix":[5, 0], "flags":4, "x":0,  "y":60},
+            {"matrix":[5, 1], "flags":4, "x":16,  "y":60},
+            {"matrix":[5, 2], "flags":4, "x":32,  "y":60},
+            {"matrix":[5, 3], "flags":4, "x":48,  "y":60},
+            {"matrix":[5, 4], "flags":4, "x":64,  "y":60},
+            {"matrix":[5, 5], "flags":4, "x":80,  "y":60},
+            {"matrix":[6, 0], "flags":4, "x":96,  "y":0},
+            {"matrix":[6, 1], "flags":4, "x":112,  "y":0},
+            {"matrix":[6, 2], "flags":4, "x":128,  "y":0},
+            {"matrix":[6, 3], "flags":4, "x":144,  "y":0},
+            {"matrix":[6, 4], "flags":4, "x":160,  "y":0},
+            {"matrix":[6, 5], "flags":4, "x":176,  "y":0},
+            {"matrix":[6, 6], "flags":4, "x":192,  "y":0},
+
+
+            {"matrix":[7, 0], "flags":4, "x":96,  "y":12},
+            {"matrix":[7, 1], "flags":4, "x":112,  "y":12},
+            {"matrix":[7, 2], "flags":4, "x":128,  "y":12},
+            {"matrix":[7, 3], "flags":4, "x":144,  "y":12},
+            {"matrix":[7, 4], "flags":4, "x":160,  "y":12},
+            {"matrix":[7, 5], "flags":4, "x":176,  "y":12},
+            {"matrix":[7, 6], "flags":4, "x":192,  "y":12},
+            {"matrix":[7, 7], "flags":4, "x":208,  "y":12},
+            {"matrix":[8, 0], "flags":4, "x":96,  "y":24},
+            {"matrix":[8, 1], "flags":4, "x":112,  "y":24},
+            {"matrix":[8, 2], "flags":4, "x":128,  "y":24},
+            {"matrix":[8, 3], "flags":4, "x":144,  "y":24},
+            {"matrix":[8, 4], "flags":4, "x":160,  "y":24},
+            {"matrix":[8, 5], "flags":4, "x":176,  "y":24},
+            {"matrix":[8, 6], "flags":4, "x":192,  "y":24},
+            {"matrix":[8, 7], "flags":4, "x":208,  "y":24},
+            {"matrix":[9, 0], "flags":4, "x":96,  "y":36},
+            {"matrix":[9, 1], "flags":4, "x":112,  "y":36},
+            {"matrix":[9, 2], "flags":4, "x":128,  "y":36},
+            {"matrix":[9, 3], "flags":4, "x":144,  "y":36},
+            {"matrix":[9, 4], "flags":4, "x":160,  "y":36},
+            {"matrix":[9, 5], "flags":4, "x":176,  "y":36},
+            {"matrix":[9, 6], "flags":4, "x":192,  "y":36},
+            {"matrix":[10, 0], "flags":4, "x":96,  "y":48},
+            {"matrix":[10, 1], "flags":4, "x":112,  "y":48},
+            {"matrix":[10, 2], "flags":4, "x":128,  "y":48},
+            {"matrix":[10, 3], "flags":4, "x":144,  "y":48},
+            {"matrix":[10, 4], "flags":4, "x":160,  "y":48},
+            {"matrix":[10, 5], "flags":4, "x":176,  "y":48},
+            {"matrix":[10, 6], "flags":4, "x":192,  "y":48},
+            {"matrix":[10, 7], "flags":4, "x":208,  "y":48},
+            {"matrix":[11, 0], "flags":4, "x":96,  "y":60},
+            {"matrix":[11, 1], "flags":4, "x":112,  "y":60},
+            {"matrix":[11, 2], "flags":4, "x":128,  "y":60},
+            {"matrix":[11, 3], "flags":4, "x":144,  "y":60},
+            {"matrix":[11, 4], "flags":4, "x":160,  "y":60},
+            {"matrix":[11, 5], "flags":4, "x":176,  "y":60},
+            {"matrix":[11, 6], "flags":4, "x":192,  "y":60},
+            {"matrix":[11, 7], "flags":4, "x":208,  "y":60}
+
+        ],
+        "animations": {
+            "alphas_mods": true,
+            "band_val": true,
+            "cycle_spiral": true
+        }
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "label": "F1", "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+
+                {"matrix": [6, 0], "label": "F6", "x": 11.75, "y": 0},
+                {"matrix": [6, 1], "label": "F7", "x": 12.75, "y": 0},
+                {"matrix": [6, 2], "label": "F8", "x": 13.75, "y": 0},
+                {"matrix": [6, 3], "label": "F9", "x": 14.75, "y": 0},
+                {"matrix": [6, 4], "label": "F10", "x": 15.75, "y": 0},
+                {"matrix": [6, 5], "label": "F11", "x": 16.75, "y": 0},
+                {"matrix": [6, 6], "label": "F12", "x": 17.75, "y": 0},
+
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "label": "1", "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "label": "2", "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "label": "3", "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "label": "4", "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "label": "5", "x": 5.5, "y": 1},
+
+                {"matrix": [7, 0], "label": "^", "x": 11.75, "y": 1},
+                {"matrix": [7, 1], "label": "&", "x": 12.75, "y": 1},
+                {"matrix": [7, 2], "label": "*", "x": 13.75, "y": 1},
+                {"matrix": [7, 3], "label": "(", "x": 14.75, "y": 1},
+                {"matrix": [7, 4], "label": ")", "x": 15.75, "y": 1},
+                {"matrix": [7, 5], "label": "_", "x": 16.75, "y": 1},
+                {"matrix": [7, 6], "label": "+", "x": 17.75, "y": 1},
+                {"matrix": [7, 7], "label": "Backspace", "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2},
+
+                {"matrix": [8, 0], "label": "Y", "x": 11.75, "y": 2},
+                {"matrix": [8, 1], "label": "U", "x": 12.75, "y": 2},
+                {"matrix": [8, 2], "label": "I", "x": 13.75, "y": 2},
+                {"matrix": [8, 3], "label": "O", "x": 14.75, "y": 2},
+                {"matrix": [8, 4], "label": "P", "x": 15.75, "y": 2},
+                {"matrix": [8, 5], "label": "{", "x": 16.75, "y": 2},
+                {"matrix": [8, 6], "label": "}", "x": 17.75, "y": 2},
+                {"matrix": [8, 7], "label": "|", "x": 18.75, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "label": "Caps", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "label": "A", "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "label": "S", "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "label": "D", "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "label": "F", "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "label": "G", "x": 5.5, "y": 3},
+
+                {"matrix": [9, 0], "label": "H", "x": 11.75, "y": 3},
+                {"matrix": [9, 1], "label": "J", "x": 12.75, "y": 3},
+                {"matrix": [9, 2], "label": "K", "x": 13.75, "y": 3},
+                {"matrix": [9, 3], "label": "L", "x": 14.75, "y": 3},
+                {"matrix": [9, 4], "label": ":", "x": 15.75, "y": 3},
+                {"matrix": [9, 5], "label": "\"", "x": 16.75, "y": 3},
+                {"matrix": [9, 6], "label": "Enter", "x": 17.75, "y": 3, "w": 2.25},
+
+                {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "label": "Z", "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "label": "X", "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "label": "C", "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "label": "V", "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "label": "B", "x": 5.5, "y": 4},
+
+                {"matrix": [10, 0], "label": "N", "x": 11.75, "y": 4},
+                {"matrix": [10, 1], "label": "M", "x": 12.75, "y": 4},
+                {"matrix": [10, 2], "label": "<", "x": 13.75, "y": 4},
+                {"matrix": [10, 3], "label": ">", "x": 14.75, "y": 4},
+                {"matrix": [10, 4], "label": "?", "x": 15.75, "y": 4},
+                {"matrix": [10, 5], "label": "Shift", "x": 16.75, "y": 4, "w": 1.5},
+                {"matrix": [10, 6], "label": "\u2191", "x": 18.25, "y": 4},
+                {"matrix": [10, 7], "label": "mx", "x": 19.25, "y": 4},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "label": "Menu", "x": 4, "y": 5, "w": 1.25},
+                {"matrix": [5, 4], "label": "space", "x": 5.5, "y": 5.25, "h": 2},
+                {"matrix": [5, 5], "label": "fn", "x": 6.5, "y": 5.25, "h": 2},
+
+                {"matrix": [11, 0], "label": "space2", "x": 11.25, "y": 5.25, "h": 2},
+                {"matrix": [11, 1], "label": "fn", "x": 12.25, "y": 5.25, "h": 2},
+                {"matrix": [11, 2], "label": "Alt", "x": 13.5, "y": 5, "w": 1.25},
+                {"matrix": [11, 3], "label": "Win", "x": 14.75, "y": 5, "w": 1.25},
+                {"matrix": [11, 4], "label": "Ctrl", "x": 16, "y": 5, "w": 1.25},
+                {"matrix": [11, 5], "label": "\u2190", "x": 17.25, "y": 5},
+                {"matrix": [11, 6], "label": "\u2193", "x": 18.25, "y": 5},
+                {"matrix": [11, 7], "label": "\u2192", "x": 19.25, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/orthograph/keymaps/default/keymap.json b/keyboards/orthograph/keymaps/default/keymap.json
new file mode 100644
index 00000000000..fcd2e26edcd
--- /dev/null
+++ b/keyboards/orthograph/keymaps/default/keymap.json
@@ -0,0 +1,24 @@
+{
+    "keyboard": "orthograph",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers":
+    [
+        [
+            "KC_ESC",  "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",             "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",   "KC_F11",   "KC_F12",
+            "KC_GRAVE","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_UP",    "KC_PSCR",
+            "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_APP",  "KC_SPC",  "MO(1)",             "KC_SPC",  "MO(1)",   "KC_RALT", "KC_RGUI", "KC_RCTL",  "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_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",
+            "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",            "KC_TRNS",  "KC_INS",   "KC_HOME",  "KC_PGUP",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",
+            "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",            "KC_TRNS",  "KC_DEL",   "KC_END",   "KC_PGDN",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",
+            "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",            "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",
+            "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "RGB_MODE_FORWARD","KC_TRNS",     "RGB_TOG",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS",  "KC_TRNS"
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/keyboards/orthograph/orthograph.c b/keyboards/orthograph/orthograph.c
new file mode 100644
index 00000000000..9d824574d10
--- /dev/null
+++ b/keyboards/orthograph/orthograph.c
@@ -0,0 +1,128 @@
+/* Copyright 2023 vladkvit
+ *
+ * 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+{0, SW1_CS6, SW2_CS6, SW3_CS6},
+{0, SW1_CS5, SW2_CS5, SW3_CS5},
+{0, SW1_CS4, SW2_CS4, SW3_CS4},
+{0, SW1_CS3, SW2_CS3, SW3_CS3},
+{0, SW1_CS2, SW2_CS2, SW3_CS2},
+{0, SW1_CS1, SW2_CS1, SW3_CS1},
+
+{0, SW4_CS6, SW5_CS6, SW6_CS6},
+{0, SW4_CS5, SW5_CS5, SW6_CS5},
+{0, SW4_CS4, SW5_CS4, SW6_CS4},
+{0, SW4_CS3, SW5_CS3, SW6_CS3},
+{0, SW4_CS2, SW5_CS2, SW6_CS2},
+{0, SW4_CS1, SW5_CS1, SW6_CS1},
+
+{0, SW7_CS6, SW8_CS6, SW9_CS6},
+{0, SW7_CS5, SW8_CS5, SW9_CS5},
+{0, SW7_CS4, SW8_CS4, SW9_CS4},
+{0, SW7_CS3, SW8_CS3, SW9_CS3},
+{0, SW7_CS2, SW8_CS2, SW9_CS2},
+{0, SW7_CS1, SW8_CS1, SW9_CS1},
+
+{0, SW1_CS14, SW2_CS14, SW3_CS14},
+{0, SW1_CS13, SW2_CS13, SW3_CS13},
+{0, SW1_CS12, SW2_CS12, SW3_CS12},
+{0, SW1_CS11, SW2_CS11, SW3_CS11},
+{0, SW1_CS10, SW2_CS10, SW3_CS10},
+{0, SW1_CS9, SW2_CS9, SW3_CS9},
+
+{0, SW4_CS14, SW5_CS14, SW6_CS14},
+{0, SW4_CS13, SW5_CS13, SW6_CS13},
+{0, SW4_CS12, SW5_CS12, SW6_CS12},
+{0, SW4_CS11, SW5_CS11, SW6_CS11},
+{0, SW4_CS10, SW5_CS10, SW6_CS10},
+{0, SW4_CS9, SW5_CS9, SW6_CS9},
+
+{0, SW7_CS14, SW8_CS14, SW9_CS14},
+{0, SW7_CS13, SW8_CS13, SW9_CS13},
+{0, SW7_CS12, SW8_CS12, SW9_CS12},
+{0, SW7_CS11, SW8_CS11, SW9_CS11},
+{0, SW7_CS10, SW8_CS10, SW9_CS10},
+{0, SW7_CS9, SW8_CS9, SW9_CS9},
+
+//----------------
+
+
+{0, SW1_CS6, SW2_CS6, SW3_CS6},
+{0, SW1_CS5, SW2_CS5, SW3_CS5},
+{0, SW1_CS4, SW2_CS4, SW3_CS4},
+{0, SW1_CS3, SW2_CS3, SW3_CS3},
+{0, SW1_CS2, SW2_CS2, SW3_CS2},
+{0, SW1_CS1, SW2_CS1, SW3_CS1},
+{0, SW1_CS16, SW2_CS16, SW3_CS16},
+// {0, SW1_CS15, SW2_CS15, SW3_CS15},
+
+
+{0, SW4_CS6, SW5_CS6, SW6_CS6},
+{0, SW4_CS5, SW5_CS5, SW6_CS5},
+{0, SW4_CS4, SW5_CS4, SW6_CS4},
+{0, SW4_CS3, SW5_CS3, SW6_CS3},
+{0, SW4_CS2, SW5_CS2, SW6_CS2},
+{0, SW4_CS1, SW5_CS1, SW6_CS1},
+{0, SW4_CS16, SW5_CS16, SW6_CS16},
+{0, SW4_CS15, SW5_CS15, SW6_CS15},
+
+{0, SW7_CS6, SW8_CS6, SW9_CS6},
+{0, SW7_CS5, SW8_CS5, SW9_CS5},
+{0, SW7_CS4, SW8_CS4, SW9_CS4},
+{0, SW7_CS3, SW8_CS3, SW9_CS3},
+{0, SW7_CS2, SW8_CS2, SW9_CS2},
+{0, SW7_CS1, SW8_CS1, SW9_CS1},
+{0, SW7_CS16, SW8_CS16, SW9_CS16},
+{0, SW7_CS15, SW8_CS15, SW9_CS15},
+
+{0, SW1_CS14, SW2_CS14, SW3_CS14},
+{0, SW1_CS13, SW2_CS13, SW3_CS13},
+{0, SW1_CS12, SW2_CS12, SW3_CS12},
+{0, SW1_CS11, SW2_CS11, SW3_CS11},
+{0, SW1_CS10, SW2_CS10, SW3_CS10},
+{0, SW1_CS9,  SW2_CS9,  SW3_CS9},
+{0, SW1_CS8,  SW2_CS8, SW3_CS8},
+// {0, SW1_CS7,  SW2_CS7, SW3_CS7},
+
+{0, SW4_CS14, SW5_CS14, SW6_CS14},
+{0, SW4_CS13, SW5_CS13, SW6_CS13},
+{0, SW4_CS12, SW5_CS12, SW6_CS12},
+{0, SW4_CS11, SW5_CS11, SW6_CS11},
+{0, SW4_CS10, SW5_CS10, SW6_CS10},
+{0, SW4_CS9,  SW5_CS9,  SW6_CS9},
+{0, SW4_CS8, SW5_CS8, SW6_CS8},
+{0, SW4_CS7, SW5_CS7, SW6_CS7},
+
+{0, SW7_CS14, SW8_CS14, SW9_CS14},
+{0, SW7_CS13, SW8_CS13, SW9_CS13},
+{0, SW7_CS12, SW8_CS12, SW9_CS12},
+{0, SW7_CS11, SW8_CS11, SW9_CS11},
+{0, SW7_CS10, SW8_CS10, SW9_CS10},
+{0, SW7_CS9, SW8_CS9, SW9_CS9},
+{0, SW7_CS8, SW8_CS8, SW9_CS8},
+{0, SW7_CS7, SW8_CS7, SW9_CS7}
+};
+
+#endif
diff --git a/keyboards/orthograph/readme.md b/keyboards/orthograph/readme.md
new file mode 100644
index 00000000000..126ab6d1d99
--- /dev/null
+++ b/keyboards/orthograph/readme.md
@@ -0,0 +1,25 @@
+# Orthograph
+
+Split ortho keyboard with RGB backlighting
+
+* Keyboard Maintainer: [vladkvit](https://github.com/vladkvit)
+* Hardware Supported: Two PCBs + thin Pro Micro compatible boards (Elite C has been extensively tested). Boards with castellated holes (Elite C style) are much easier to install. Maximum thickness is around 3-3.5mm, so a stock Pro Micro (4mm) will not work.
+* Hardware Availability: https://github.com/vladkvit/orthograph_keyboard for PCB, https://cad.onshape.com/documents/4f736d64448134c948af475a/w/ccab05fd44a7db98ce27216a/e/49ebfb6b27080b9b45bea74a?renderMode=0&uiState=64dd45dbc62cae486db10048 and https://cad.onshape.com/documents/5ff52821d2cb196f3db3d1e8/w/04b7cb21b748da89c8df31e6/e/486b72e32db97b2dfdf00af8 for the hardware 
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb orthograph -km default
+
+Flashing example for this keyboard:
+    qmk flash -kb orthograph -km default
+    Then, flash EEPROM with handedness (left / right) on both sides.
+
+The reset button is on the underside of each half of the keyboard.
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (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 `QK_BOOT` if it is available
diff --git a/keyboards/orthograph/rules.mk b/keyboards/orthograph/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/orthograph/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h
deleted file mode 100644
index 461903ea2ee..00000000000
--- a/keyboards/owlab/spring/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* 
-Copyright 2021 OwLab
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-#    define RGBLIGHT_DEFAULT_VAL 127
diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json
index d5813e78c88..f55f08addc5 100644
--- a/keyboards/owlab/spring/info.json
+++ b/keyboards/owlab/spring/info.json
@@ -29,6 +29,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "val": 127
         }
     },
     "ws2812": {
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index 8599c084d26..96c0c784c09 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -17,66 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define OWL_VOLUME_RANGE 50
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 
-/* RGB matrix */
 #ifdef RGB_MATRIX_ENABLE
-#    define USE_I2CV2
 #    define RGB_MATRIX_DISABLE_KEYCODES
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT  4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT    26
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_DEFAULT_VAL        128
-#    define IS31FL3741_I2C_ADDRESS_1                 IS31FL3741_I2C_ADDRESS_GND
-#    define RGB_MATRIX_LED_COUNT              67
-// 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
-#    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
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.c b/keyboards/owlab/voice65/hotswap/hotswap.c
index b4c0c02c323..79179d16616 100644
--- a/keyboards/owlab/voice65/hotswap/hotswap.c
+++ b/keyboards/owlab/voice65/hotswap/hotswap.c
@@ -17,74 +17,74 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS3_SW1,  CS2_SW1,  CS1_SW1},  /* RGB0-ESC ROW0*/
-    {0, CS6_SW1,  CS5_SW1,  CS4_SW1},  /* RGB1-1 */
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB2-2 */
-    {0, CS12_SW1,  CS11_SW1,  CS10_SW1},  /* RGB3-3 */
-    {0, CS15_SW1,  CS14_SW1,  CS13_SW1},  /* RGB4-4 */
-    {0, CS18_SW1,  CS17_SW1,  CS16_SW1},  /* RGB5-5 */
-    {0, CS21_SW1,  CS20_SW1,  CS19_SW1},  /* RGB6-6 */
-    {0, CS24_SW1,  CS23_SW1,  CS22_SW1},  /* RGB7-7 */
-    {0, CS27_SW1,  CS26_SW1,  CS25_SW1},  /* RGB8-8 */
-    {0, CS30_SW1,  CS29_SW1,  CS28_SW1},  /* RGB9-9 */
-    {0, CS33_SW1,  CS32_SW1,  CS31_SW1},  /* RGB10-0 */
-    {0, CS36_SW1,  CS35_SW1,  CS34_SW1},  /* RGB11--- */
-    {0, CS39_SW1,  CS38_SW1,  CS37_SW1},  /* RGB12-+= */
-    {0, CS36_SW6,  CS35_SW6,  CS34_SW6},  /* RGB13-BS */
-    {0, CS27_SW7,  CS26_SW7,  CS25_SW7},  /* RGB14-DEL */
-    {0, CS3_SW2,  CS2_SW2,  CS1_SW2},  /* RGB15-TAB ----ROW1*/
-    {0, CS6_SW2,  CS5_SW2,  CS4_SW2}, /* RGB16-Q */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2}, /* RGB17-W */
-    {0, CS12_SW2,  CS11_SW2,  CS10_SW2}, /* RGB18-E */
-    {0, CS15_SW2,  CS14_SW2,  CS13_SW2}, /* RGB19-R */
-    {0, CS18_SW2,  CS17_SW2,  CS16_SW2}, /* RGB20-T */
-    {0, CS21_SW2,  CS20_SW2,  CS19_SW2}, /* RGB21-Y */
-    {0, CS24_SW2,  CS23_SW2,  CS22_SW2}, /* RGB22-U */
-    {0, CS27_SW2,  CS26_SW2,  CS25_SW2}, /* RGB23-I */
-    {0, CS30_SW2,  CS29_SW2,  CS28_SW2}, /* RGB24-O */
-    {0, CS33_SW2,  CS32_SW2,  CS31_SW2}, /* RGB25-P */
-    {0, CS36_SW2,  CS35_SW2,  CS34_SW2}, /* RGB26-[ */
-    {0, CS39_SW2,  CS38_SW2,  CS37_SW2}, /* RGB27-] */
-    {0, CS39_SW6,  CS38_SW6,  CS37_SW6}, /* RGB28-\ */
-    {0, CS30_SW7,  CS29_SW7,  CS28_SW7},  /* RGB29-PGUP */
-    {0, CS3_SW3,  CS2_SW3,  CS1_SW3},  /* RGB30-CAPS---ROW2*/
-    {0, CS6_SW3,  CS5_SW3,  CS4_SW3},  /* RGB31-A-- */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB32-S-- */
-    {0, CS12_SW3,  CS11_SW3,  CS10_SW3},  /* RGB33-D-- */
-    {0, CS15_SW3,  CS14_SW3,  CS13_SW3},  /* RGB34-F-- */
-    {0, CS18_SW3,  CS17_SW3,  CS16_SW3},  /* RGB35-G-- */
-    {0, CS21_SW3,  CS20_SW3,  CS19_SW3},  /* RGB36-H-- */
-    {0, CS24_SW3,  CS23_SW3,  CS22_SW3},  /* RGB37-J-- */
-    {0, CS27_SW3,  CS26_SW3,  CS25_SW3},  /* RGB38-K-- */
-    {0, CS30_SW3,  CS29_SW3,  CS28_SW3},  /* RGB39-L-- */
-    {0, CS33_SW3,  CS32_SW3,  CS31_SW3},  /* RGB40-;:- */
-    {0, CS36_SW3,  CS35_SW3,  CS34_SW3},  /* RGB41-''- */
-    {0, CS39_SW3,  CS38_SW3,  CS37_SW3},  /* RGB42-ENTER- */
-    {0, CS33_SW7,  CS32_SW7,  CS31_SW7},  /* RGB43-PGDN */
-    {0, CS3_SW4,  CS2_SW4,  CS1_SW4},  /* RGB44-LSF --ROW3*/
-    {0, CS6_SW4,  CS5_SW4,  CS4_SW4},  /* RGB45-Z -*/
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB46-X -*/
-    {0, CS12_SW4,  CS11_SW4,  CS10_SW4},  /* RGB47-C -*/
-    {0, CS15_SW4,  CS14_SW4,  CS13_SW4},  /* RGB48-V -*/
-    {0, CS18_SW4,  CS17_SW4,  CS16_SW4},  /* RGB49-B -*/
-    {0, CS21_SW4,  CS20_SW4,  CS19_SW4},  /* RGB50-N -*/
-    {0, CS24_SW4,  CS23_SW4,  CS22_SW4},  /* RGB51-M -*/
-    {0, CS27_SW4,  CS26_SW4,  CS25_SW4},  /* RGB52-,< -*/
-    {0, CS30_SW4,  CS29_SW4,  CS28_SW4},  /* RGB53->. -*/
-    {0, CS33_SW4,  CS32_SW4,  CS31_SW4},  /* RGB54-? -*/
-    {0, CS36_SW4,  CS35_SW4,  CS34_SW4},  /* RGB55-RSF -*/
-    {0, CS39_SW4,  CS38_SW4,  CS37_SW4},  /* RGB56-UP -*/
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB57--MO-- */
-    {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* RGB58-lct-- row4*/
-    {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB59-lwin- */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB60-lalt- */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB61-sp- */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB62-ralt- */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB63-rct- */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB64-left- */
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB65-dn- */
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB66-right- */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS3,  SW1_CS2,  SW1_CS1},  /* RGB0-ESC ROW0*/
+    {0, SW1_CS6,  SW1_CS5,  SW1_CS4},  /* RGB1-1 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB2-2 */
+    {0, SW1_CS12,  SW1_CS11,  SW1_CS10},  /* RGB3-3 */
+    {0, SW1_CS15,  SW1_CS14,  SW1_CS13},  /* RGB4-4 */
+    {0, SW1_CS18,  SW1_CS17,  SW1_CS16},  /* RGB5-5 */
+    {0, SW1_CS21,  SW1_CS20,  SW1_CS19},  /* RGB6-6 */
+    {0, SW1_CS24,  SW1_CS23,  SW1_CS22},  /* RGB7-7 */
+    {0, SW1_CS27,  SW1_CS26,  SW1_CS25},  /* RGB8-8 */
+    {0, SW1_CS30,  SW1_CS29,  SW1_CS28},  /* RGB9-9 */
+    {0, SW1_CS33,  SW1_CS32,  SW1_CS31},  /* RGB10-0 */
+    {0, SW1_CS36,  SW1_CS35,  SW1_CS34},  /* RGB11--- */
+    {0, SW1_CS39,  SW1_CS38,  SW1_CS37},  /* RGB12-+= */
+    {0, SW6_CS36,  SW6_CS35,  SW6_CS34},  /* RGB13-BS */
+    {0, SW7_CS27,  SW7_CS26,  SW7_CS25},  /* RGB14-DEL */
+    {0, SW2_CS3,  SW2_CS2,  SW2_CS1},  /* RGB15-TAB ----ROW1*/
+    {0, SW2_CS6,  SW2_CS5,  SW2_CS4}, /* RGB16-Q */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7}, /* RGB17-W */
+    {0, SW2_CS12,  SW2_CS11,  SW2_CS10}, /* RGB18-E */
+    {0, SW2_CS15,  SW2_CS14,  SW2_CS13}, /* RGB19-R */
+    {0, SW2_CS18,  SW2_CS17,  SW2_CS16}, /* RGB20-T */
+    {0, SW2_CS21,  SW2_CS20,  SW2_CS19}, /* RGB21-Y */
+    {0, SW2_CS24,  SW2_CS23,  SW2_CS22}, /* RGB22-U */
+    {0, SW2_CS27,  SW2_CS26,  SW2_CS25}, /* RGB23-I */
+    {0, SW2_CS30,  SW2_CS29,  SW2_CS28}, /* RGB24-O */
+    {0, SW2_CS33,  SW2_CS32,  SW2_CS31}, /* RGB25-P */
+    {0, SW2_CS36,  SW2_CS35,  SW2_CS34}, /* RGB26-[ */
+    {0, SW2_CS39,  SW2_CS38,  SW2_CS37}, /* RGB27-] */
+    {0, SW6_CS39,  SW6_CS38,  SW6_CS37}, /* RGB28-\ */
+    {0, SW7_CS30,  SW7_CS29,  SW7_CS28},  /* RGB29-PGUP */
+    {0, SW3_CS3,  SW3_CS2,  SW3_CS1},  /* RGB30-CAPS---ROW2*/
+    {0, SW3_CS6,  SW3_CS5,  SW3_CS4},  /* RGB31-A-- */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB32-S-- */
+    {0, SW3_CS12,  SW3_CS11,  SW3_CS10},  /* RGB33-D-- */
+    {0, SW3_CS15,  SW3_CS14,  SW3_CS13},  /* RGB34-F-- */
+    {0, SW3_CS18,  SW3_CS17,  SW3_CS16},  /* RGB35-G-- */
+    {0, SW3_CS21,  SW3_CS20,  SW3_CS19},  /* RGB36-H-- */
+    {0, SW3_CS24,  SW3_CS23,  SW3_CS22},  /* RGB37-J-- */
+    {0, SW3_CS27,  SW3_CS26,  SW3_CS25},  /* RGB38-K-- */
+    {0, SW3_CS30,  SW3_CS29,  SW3_CS28},  /* RGB39-L-- */
+    {0, SW3_CS33,  SW3_CS32,  SW3_CS31},  /* RGB40-;:- */
+    {0, SW3_CS36,  SW3_CS35,  SW3_CS34},  /* RGB41-''- */
+    {0, SW3_CS39,  SW3_CS38,  SW3_CS37},  /* RGB42-ENTER- */
+    {0, SW7_CS33,  SW7_CS32,  SW7_CS31},  /* RGB43-PGDN */
+    {0, SW4_CS3,  SW4_CS2,  SW4_CS1},  /* RGB44-LSF --ROW3*/
+    {0, SW4_CS6,  SW4_CS5,  SW4_CS4},  /* RGB45-Z -*/
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB46-X -*/
+    {0, SW4_CS12,  SW4_CS11,  SW4_CS10},  /* RGB47-C -*/
+    {0, SW4_CS15,  SW4_CS14,  SW4_CS13},  /* RGB48-V -*/
+    {0, SW4_CS18,  SW4_CS17,  SW4_CS16},  /* RGB49-B -*/
+    {0, SW4_CS21,  SW4_CS20,  SW4_CS19},  /* RGB50-N -*/
+    {0, SW4_CS24,  SW4_CS23,  SW4_CS22},  /* RGB51-M -*/
+    {0, SW4_CS27,  SW4_CS26,  SW4_CS25},  /* RGB52-,< -*/
+    {0, SW4_CS30,  SW4_CS29,  SW4_CS28},  /* RGB53->. -*/
+    {0, SW4_CS33,  SW4_CS32,  SW4_CS31},  /* RGB54-? -*/
+    {0, SW4_CS36,  SW4_CS35,  SW4_CS34},  /* RGB55-RSF -*/
+    {0, SW4_CS39,  SW4_CS38,  SW4_CS37},  /* RGB56-UP -*/
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB57--MO-- */
+    {0, SW5_CS3, SW5_CS2, SW5_CS1}, /* RGB58-lct-- row4*/
+    {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB59-lwin- */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB60-lalt- */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB61-sp- */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB62-ralt- */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB63-rct- */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB64-left- */
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB65-dn- */
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB66-right- */
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json
index 7b1ff47794a..d32b74cfcbf 100644
--- a/keyboards/owlab/voice65/hotswap/info.json
+++ b/keyboards/owlab/voice65/hotswap/info.json
@@ -10,7 +10,59 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "val": 128
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index 9533e00a026..96c0c784c09 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -17,67 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define OWL_VOLUME_RANGE 50
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 
-/* RGB matrix*/
 #ifdef RGB_MATRIX_ENABLE
-#    define USE_I2CV2
 #    define RGB_MATRIX_DISABLE_KEYCODES
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_LED_PROCESS_LIMIT  4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT    26
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_DEFAULT_VAL        128
-#    define IS31FL3741_I2C_ADDRESS_1                 IS31FL3741_I2C_ADDRESS_GND
-#    define RGB_MATRIX_LED_COUNT              71
-
-// 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
-#    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
diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json
index 8e96d689283..4cae769a947 100644
--- a/keyboards/owlab/voice65/soldered/info.json
+++ b/keyboards/owlab/voice65/soldered/info.json
@@ -10,7 +10,59 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "val": 128
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
diff --git a/keyboards/owlab/voice65/soldered/soldered.c b/keyboards/owlab/voice65/soldered/soldered.c
index 301a5adc593..23144914fef 100644
--- a/keyboards/owlab/voice65/soldered/soldered.c
+++ b/keyboards/owlab/voice65/soldered/soldered.c
@@ -17,78 +17,78 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS3_SW1,  CS2_SW1,  CS1_SW1},  /* RGB0-ESC ROW0*/
-    {0, CS6_SW1,  CS5_SW1,  CS4_SW1},  /* RGB1-1 */
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB2-2 */
-    {0, CS12_SW1,  CS11_SW1,  CS10_SW1},  /* RGB3-3 */
-    {0, CS15_SW1,  CS14_SW1,  CS13_SW1},  /* RGB4-4 */
-    {0, CS18_SW1,  CS17_SW1,  CS16_SW1},  /* RGB5-5 */
-    {0, CS21_SW1,  CS20_SW1,  CS19_SW1},  /* RGB6-6 */
-    {0, CS24_SW1,  CS23_SW1,  CS22_SW1},  /* RGB7-7 */
-    {0, CS27_SW1,  CS26_SW1,  CS25_SW1},  /* RGB8-8 */
-    {0, CS30_SW1,  CS29_SW1,  CS28_SW1},  /* RGB9-9 */
-    {0, CS33_SW1,  CS32_SW1,  CS31_SW1},  /* RGB10-0 */
-    {0, CS36_SW1,  CS35_SW1,  CS34_SW1},  /* RGB11--- */
-    {0, CS39_SW6,  CS38_SW6,  CS37_SW6},  /* RGB12-+= */
-    {0, CS36_SW6,  CS35_SW6,  CS34_SW6},  /* RGB13-BS */
-    {0, CS27_SW6,  CS26_SW6,  CS25_SW6},  /* RGB14-BACKSPACE SPLIT */
-    {0, CS36_SW8,  CS35_SW8,  CS34_SW8},  /* RGB15-DEL */
-    {0, CS3_SW2,  CS2_SW2,  CS1_SW2},  /* RGB16-TAB ----ROW1*/
-    {0, CS6_SW2,  CS5_SW2,  CS4_SW2}, /* RGB17-Q */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2}, /* RGB18-W */
-    {0, CS12_SW2,  CS11_SW2,  CS10_SW2}, /* RGB19-E */
-    {0, CS15_SW2,  CS14_SW2,  CS13_SW2}, /* RGB20-R */
-    {0, CS18_SW2,  CS17_SW2,  CS16_SW2}, /* RGB21-T */
-    {0, CS21_SW2,  CS20_SW2,  CS19_SW2}, /* RGB22-Y */
-    {0, CS24_SW2,  CS23_SW2,  CS22_SW2}, /* RGB23-U */
-    {0, CS27_SW2,  CS26_SW2,  CS25_SW2}, /* RGB24-I */
-    {0, CS30_SW2,  CS29_SW2,  CS28_SW2}, /* RGB25-O */
-    {0, CS33_SW2,  CS32_SW2,  CS31_SW2}, /* RGB26-P */
-    {0, CS36_SW2,  CS35_SW2,  CS34_SW2}, /* RGB27-[ */
-    {0, CS39_SW7,  CS38_SW7,  CS37_SW7}, /* RGB28-] */
-    {0, CS36_SW7,  CS35_SW7,  CS34_SW7}, /* RGB29-\ */
-    {0, CS27_SW7,  CS26_SW7,  CS25_SW7},  /* RGB30-PGUP */
-    {0, CS3_SW3,  CS2_SW3,  CS1_SW3},  /* RGB31-CAPS---ROW2*/
-    {0, CS6_SW3,  CS5_SW3,  CS4_SW3},  /* RGB32-A-- */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB33-S-- */
-    {0, CS12_SW3,  CS11_SW3,  CS10_SW3},  /* RGB34-D-- */
-    {0, CS15_SW3,  CS14_SW3,  CS13_SW3},  /* RGB35-F-- */
-    {0, CS18_SW3,  CS17_SW3,  CS16_SW3},  /* RGB36-G-- */
-    {0, CS21_SW3,  CS20_SW3,  CS19_SW3},  /* RGB37-H-- */
-    {0, CS24_SW3,  CS23_SW3,  CS22_SW3},  /* RGB38-J-- */
-    {0, CS27_SW3,  CS26_SW3,  CS25_SW3},  /* RGB39-K-- */
-    {0, CS30_SW3,  CS29_SW3,  CS28_SW3},  /* RGB40-L-- */
-    {0, CS33_SW3,  CS32_SW3,  CS31_SW3},  /* RGB41-;:- */
-    {0, CS36_SW3,  CS35_SW3,  CS34_SW3},  /* RGB42-''- */
-    {0, CS39_SW8,  CS38_SW8,  CS37_SW8},  /* RGB43-ENTER- */
-    {0, CS27_SW8,  CS26_SW8,  CS25_SW8},  /* RGB44-PGDN */
-    {0, CS3_SW4,  CS2_SW4,  CS1_SW4},  /* RGB45-LSF --ROW3*/
-    {0, CS6_SW4,  CS5_SW4,  CS4_SW4},  /* RGB46-LSF split -*/
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB47-Z -*/
-    {0, CS12_SW4,  CS11_SW4,  CS10_SW4},  /* RGB48-X -*/
-    {0, CS15_SW4,  CS14_SW4,  CS13_SW4},  /* RGB49-C -*/
-    {0, CS18_SW4,  CS17_SW4,  CS16_SW4},  /* RGB50-V -*/
-    {0, CS21_SW4,  CS20_SW4,  CS19_SW4},  /* RGB51-B -*/
-    {0, CS24_SW4,  CS23_SW4,  CS22_SW4},  /* RGB52-N -*/
-    {0, CS27_SW4,  CS26_SW4,  CS25_SW4},  /* RGB53-M -*/
-    {0, CS30_SW4,  CS29_SW4,  CS28_SW4},  /* RGB54-<, -*/
-    {0, CS33_SW4,  CS32_SW4,  CS31_SW4},  /* RGB55->. -*/
-    {0, CS36_SW4,  CS35_SW4,  CS34_SW4},  /* RGB56-?/ -*/
-    {0, CS39_SW9,  CS38_SW9,  CS37_SW9},  /* RGB57-RSF -*/
-    {0, CS36_SW9,  CS35_SW9,  CS34_SW9},  /* RGB58-UP -*/
-    {0, CS27_SW9,  CS26_SW9,  CS25_SW9}, /* RGB59--MO-- */
-    {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* RGB60-lct-- row4*/
-    {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB61-lwin- */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB62-lalt- */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB63-sp2.25- */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB64-sp7U6.25U1.25U- */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB65-sp2.75U- */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66-ralt- */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB67-rctrl- */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB68-left- */
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB69-dn- */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB70-right- */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS3,  SW1_CS2,  SW1_CS1},  /* RGB0-ESC ROW0*/
+    {0, SW1_CS6,  SW1_CS5,  SW1_CS4},  /* RGB1-1 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB2-2 */
+    {0, SW1_CS12,  SW1_CS11,  SW1_CS10},  /* RGB3-3 */
+    {0, SW1_CS15,  SW1_CS14,  SW1_CS13},  /* RGB4-4 */
+    {0, SW1_CS18,  SW1_CS17,  SW1_CS16},  /* RGB5-5 */
+    {0, SW1_CS21,  SW1_CS20,  SW1_CS19},  /* RGB6-6 */
+    {0, SW1_CS24,  SW1_CS23,  SW1_CS22},  /* RGB7-7 */
+    {0, SW1_CS27,  SW1_CS26,  SW1_CS25},  /* RGB8-8 */
+    {0, SW1_CS30,  SW1_CS29,  SW1_CS28},  /* RGB9-9 */
+    {0, SW1_CS33,  SW1_CS32,  SW1_CS31},  /* RGB10-0 */
+    {0, SW1_CS36,  SW1_CS35,  SW1_CS34},  /* RGB11--- */
+    {0, SW6_CS39,  SW6_CS38,  SW6_CS37},  /* RGB12-+= */
+    {0, SW6_CS36,  SW6_CS35,  SW6_CS34},  /* RGB13-BS */
+    {0, SW6_CS27,  SW6_CS26,  SW6_CS25},  /* RGB14-BACKSPACE SPLIT */
+    {0, SW8_CS36,  SW8_CS35,  SW8_CS34},  /* RGB15-DEL */
+    {0, SW2_CS3,  SW2_CS2,  SW2_CS1},  /* RGB16-TAB ----ROW1*/
+    {0, SW2_CS6,  SW2_CS5,  SW2_CS4}, /* RGB17-Q */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7}, /* RGB18-W */
+    {0, SW2_CS12,  SW2_CS11,  SW2_CS10}, /* RGB19-E */
+    {0, SW2_CS15,  SW2_CS14,  SW2_CS13}, /* RGB20-R */
+    {0, SW2_CS18,  SW2_CS17,  SW2_CS16}, /* RGB21-T */
+    {0, SW2_CS21,  SW2_CS20,  SW2_CS19}, /* RGB22-Y */
+    {0, SW2_CS24,  SW2_CS23,  SW2_CS22}, /* RGB23-U */
+    {0, SW2_CS27,  SW2_CS26,  SW2_CS25}, /* RGB24-I */
+    {0, SW2_CS30,  SW2_CS29,  SW2_CS28}, /* RGB25-O */
+    {0, SW2_CS33,  SW2_CS32,  SW2_CS31}, /* RGB26-P */
+    {0, SW2_CS36,  SW2_CS35,  SW2_CS34}, /* RGB27-[ */
+    {0, SW7_CS39,  SW7_CS38,  SW7_CS37}, /* RGB28-] */
+    {0, SW7_CS36,  SW7_CS35,  SW7_CS34}, /* RGB29-\ */
+    {0, SW7_CS27,  SW7_CS26,  SW7_CS25},  /* RGB30-PGUP */
+    {0, SW3_CS3,  SW3_CS2,  SW3_CS1},  /* RGB31-CAPS---ROW2*/
+    {0, SW3_CS6,  SW3_CS5,  SW3_CS4},  /* RGB32-A-- */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB33-S-- */
+    {0, SW3_CS12,  SW3_CS11,  SW3_CS10},  /* RGB34-D-- */
+    {0, SW3_CS15,  SW3_CS14,  SW3_CS13},  /* RGB35-F-- */
+    {0, SW3_CS18,  SW3_CS17,  SW3_CS16},  /* RGB36-G-- */
+    {0, SW3_CS21,  SW3_CS20,  SW3_CS19},  /* RGB37-H-- */
+    {0, SW3_CS24,  SW3_CS23,  SW3_CS22},  /* RGB38-J-- */
+    {0, SW3_CS27,  SW3_CS26,  SW3_CS25},  /* RGB39-K-- */
+    {0, SW3_CS30,  SW3_CS29,  SW3_CS28},  /* RGB40-L-- */
+    {0, SW3_CS33,  SW3_CS32,  SW3_CS31},  /* RGB41-;:- */
+    {0, SW3_CS36,  SW3_CS35,  SW3_CS34},  /* RGB42-''- */
+    {0, SW8_CS39,  SW8_CS38,  SW8_CS37},  /* RGB43-ENTER- */
+    {0, SW8_CS27,  SW8_CS26,  SW8_CS25},  /* RGB44-PGDN */
+    {0, SW4_CS3,  SW4_CS2,  SW4_CS1},  /* RGB45-LSF --ROW3*/
+    {0, SW4_CS6,  SW4_CS5,  SW4_CS4},  /* RGB46-LSF split -*/
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB47-Z -*/
+    {0, SW4_CS12,  SW4_CS11,  SW4_CS10},  /* RGB48-X -*/
+    {0, SW4_CS15,  SW4_CS14,  SW4_CS13},  /* RGB49-C -*/
+    {0, SW4_CS18,  SW4_CS17,  SW4_CS16},  /* RGB50-V -*/
+    {0, SW4_CS21,  SW4_CS20,  SW4_CS19},  /* RGB51-B -*/
+    {0, SW4_CS24,  SW4_CS23,  SW4_CS22},  /* RGB52-N -*/
+    {0, SW4_CS27,  SW4_CS26,  SW4_CS25},  /* RGB53-M -*/
+    {0, SW4_CS30,  SW4_CS29,  SW4_CS28},  /* RGB54-<, -*/
+    {0, SW4_CS33,  SW4_CS32,  SW4_CS31},  /* RGB55->. -*/
+    {0, SW4_CS36,  SW4_CS35,  SW4_CS34},  /* RGB56-?/ -*/
+    {0, SW9_CS39,  SW9_CS38,  SW9_CS37},  /* RGB57-RSF -*/
+    {0, SW9_CS36,  SW9_CS35,  SW9_CS34},  /* RGB58-UP -*/
+    {0, SW9_CS27,  SW9_CS26,  SW9_CS25}, /* RGB59--MO-- */
+    {0, SW5_CS3, SW5_CS2, SW5_CS1}, /* RGB60-lct-- row4*/
+    {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB61-lwin- */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB62-lalt- */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB63-sp2.25- */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB64-sp7U6.25U1.25U- */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB65-sp2.75U- */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66-ralt- */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB67-rctrl- */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB68-left- */
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB69-dn- */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB70-right- */
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/eu_isolation/config.h b/keyboards/p3d/eu_isolation/config.h
similarity index 100%
rename from keyboards/eu_isolation/config.h
rename to keyboards/p3d/eu_isolation/config.h
diff --git a/keyboards/eu_isolation/info.json b/keyboards/p3d/eu_isolation/info.json
similarity index 100%
rename from keyboards/eu_isolation/info.json
rename to keyboards/p3d/eu_isolation/info.json
diff --git a/keyboards/eu_isolation/keymaps/bigspace/config.h b/keyboards/p3d/eu_isolation/keymaps/default/config.h
similarity index 100%
rename from keyboards/eu_isolation/keymaps/bigspace/config.h
rename to keyboards/p3d/eu_isolation/keymaps/default/config.h
diff --git a/keyboards/eu_isolation/keymaps/default/keymap.c b/keyboards/p3d/eu_isolation/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/eu_isolation/keymaps/default/keymap.c
rename to keyboards/p3d/eu_isolation/keymaps/default/keymap.c
diff --git a/keyboards/eu_isolation/keymaps/default/readme.md b/keyboards/p3d/eu_isolation/keymaps/default/readme.md
similarity index 100%
rename from keyboards/eu_isolation/keymaps/default/readme.md
rename to keyboards/p3d/eu_isolation/keymaps/default/readme.md
diff --git a/keyboards/centromere/keymaps/mini_bom/rules.mk b/keyboards/p3d/eu_isolation/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/centromere/keymaps/mini_bom/rules.mk
rename to keyboards/p3d/eu_isolation/keymaps/default/rules.mk
diff --git a/keyboards/p3d/eu_isolation/readme.md b/keyboards/p3d/eu_isolation/readme.md
new file mode 100644
index 00000000000..44cb4277e4b
--- /dev/null
+++ b/keyboards/p3d/eu_isolation/readme.md
@@ -0,0 +1,31 @@
+# EU ISOlation
+
+![euisolation](https://i.imgur.com/5LGsiJZh.jpg)
+
+EU ISOlation is an ortholinear 40% keyboard designed to use up your spare iso
+enters from you collection of keyboard kits.
+
+* Keyboard Maintainer: Originally by [TuckTuckFloof](https://github.com/TuckTuckFloof)
+ cleaned up and merged to QMK by [aadriance](https://github.com/aadriance)
+* Hardware Supported: EU ISOlation
+* Hardware Availability: Originally a [P3DStore](https://p3dstore.com/) group buy. 
+ Open source pcb info available on [TuckTuckFloofs github](https://github.com/TuckTuckFloof/EUISO-pcb)
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **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 `QK_BOOT` if it is available
+
+## Information
+
+Make example for this keyboard (after setting up your build environment):
+
+    make p3d/eu_isolation:default
+
+Flashing example for this keyboard:
+
+    make p3d/eu_isolation: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/eu_isolation/rules.mk b/keyboards/p3d/eu_isolation/rules.mk
similarity index 100%
rename from keyboards/eu_isolation/rules.mk
rename to keyboards/p3d/eu_isolation/rules.mk
diff --git a/keyboards/q4z/config.h b/keyboards/p3d/q4z/config.h
similarity index 100%
rename from keyboards/q4z/config.h
rename to keyboards/p3d/q4z/config.h
diff --git a/keyboards/q4z/info.json b/keyboards/p3d/q4z/info.json
similarity index 100%
rename from keyboards/q4z/info.json
rename to keyboards/p3d/q4z/info.json
diff --git a/keyboards/q4z/keymaps/default/config.h b/keyboards/p3d/q4z/keymaps/default/config.h
similarity index 100%
rename from keyboards/q4z/keymaps/default/config.h
rename to keyboards/p3d/q4z/keymaps/default/config.h
diff --git a/keyboards/q4z/keymaps/default/keymap.c b/keyboards/p3d/q4z/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/q4z/keymaps/default/keymap.c
rename to keyboards/p3d/q4z/keymaps/default/keymap.c
diff --git a/keyboards/q4z/keymaps/default/readme.md b/keyboards/p3d/q4z/keymaps/default/readme.md
similarity index 100%
rename from keyboards/q4z/keymaps/default/readme.md
rename to keyboards/p3d/q4z/keymaps/default/readme.md
diff --git a/keyboards/drhigsby/packrat/keymaps/3uc/rules.mk b/keyboards/p3d/q4z/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/drhigsby/packrat/keymaps/3uc/rules.mk
rename to keyboards/p3d/q4z/keymaps/default/rules.mk
diff --git a/keyboards/p3d/q4z/readme.md b/keyboards/p3d/q4z/readme.md
new file mode 100644
index 00000000000..f6f4afecc86
--- /dev/null
+++ b/keyboards/p3d/q4z/readme.md
@@ -0,0 +1,20 @@
+# Q4Z
+
+![Q4Z](https://cdn.shopify.com/s/files/1/0501/7537/7592/products/q4n-6_470x.jpg?v=1623373518)
+
+Q4Z is a play on everybody's favorite 10.25u layout. With the addition of 5 number keys and a handle,
+this little board is ready for whatever a raging gamer can throw it at.
+
+* Keyboard Maintainer: [Ryan Boone](https://github.com/rjboone) (Drmmr#0004)
+* Hardware Supported: Pro Micro or equivalent
+* Hardware Availability: This board is available to purchase from [P3D Store](https://p3dstore.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make p3d/q4z:default
+
+Flashing example for this keyboard:
+
+    make p3d/q4z: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/q4z/rules.mk b/keyboards/p3d/q4z/rules.mk
similarity index 100%
rename from keyboards/q4z/rules.mk
rename to keyboards/p3d/q4z/rules.mk
diff --git a/keyboards/spacey/info.json b/keyboards/p3d/spacey/info.json
similarity index 100%
rename from keyboards/spacey/info.json
rename to keyboards/p3d/spacey/info.json
diff --git a/keyboards/spacey/keymaps/default/keymap.c b/keyboards/p3d/spacey/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/spacey/keymaps/default/keymap.c
rename to keyboards/p3d/spacey/keymaps/default/keymap.c
diff --git a/keyboards/spacey/keymaps/default/readme.md b/keyboards/p3d/spacey/keymaps/default/readme.md
similarity index 100%
rename from keyboards/spacey/keymaps/default/readme.md
rename to keyboards/p3d/spacey/keymaps/default/readme.md
diff --git a/keyboards/spacey/keymaps/via/keymap.c b/keyboards/p3d/spacey/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/spacey/keymaps/via/keymap.c
rename to keyboards/p3d/spacey/keymaps/via/keymap.c
diff --git a/keyboards/p3d/spacey/keymaps/via/rules.mk b/keyboards/p3d/spacey/keymaps/via/rules.mk
new file mode 100644
index 00000000000..43061db1dd4
--- /dev/null
+++ b/keyboards/p3d/spacey/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/p3d/spacey/readme.md b/keyboards/p3d/spacey/readme.md
new file mode 100644
index 00000000000..252cc39f86b
--- /dev/null
+++ b/keyboards/p3d/spacey/readme.md
@@ -0,0 +1,19 @@
+# spacey
+
+![spacey](https://i.imgur.com/Dzon2hbh.jpeg)
+
+Spacey, designed by Vanilla Keyboards is a 45/65% keyboard with a little personality. Hosting ortholinear alphas with traditional modifiers, diamond shaped arrows, rotary encoder, and a couple optional spacebars at the top of the board, it's a balance between functional and unique.
+
+* Keyboard Maintainer: [vanilla](https://github.com/vanillakeyboards)
+* Hardware Supported: Elite C, Spacey PCB plates and acrylic drop_in case
+* Hardware Availability: [P3D Store](https://p3dstore.com/collections/ended-group-buys/products/spacey?variant=37742593147064)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make p3d/spacey:default
+
+Flashing example for this keyboard:
+
+    make p3d/spacey: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/spacey/rules.mk b/keyboards/p3d/spacey/rules.mk
similarity index 100%
rename from keyboards/spacey/rules.mk
rename to keyboards/p3d/spacey/rules.mk
diff --git a/keyboards/synapse/config.h b/keyboards/p3d/synapse/config.h
similarity index 100%
rename from keyboards/synapse/config.h
rename to keyboards/p3d/synapse/config.h
diff --git a/keyboards/synapse/info.json b/keyboards/p3d/synapse/info.json
similarity index 100%
rename from keyboards/synapse/info.json
rename to keyboards/p3d/synapse/info.json
diff --git a/keyboards/synapse/keymaps/7u_space/config.h b/keyboards/p3d/synapse/keymaps/7u_space/config.h
similarity index 100%
rename from keyboards/synapse/keymaps/7u_space/config.h
rename to keyboards/p3d/synapse/keymaps/7u_space/config.h
diff --git a/keyboards/synapse/keymaps/7u_space/keymap.c b/keyboards/p3d/synapse/keymaps/7u_space/keymap.c
similarity index 100%
rename from keyboards/synapse/keymaps/7u_space/keymap.c
rename to keyboards/p3d/synapse/keymaps/7u_space/keymap.c
diff --git a/keyboards/eu_isolation/keymaps/bigspace/rules.mk b/keyboards/p3d/synapse/keymaps/7u_space/rules.mk
similarity index 100%
rename from keyboards/eu_isolation/keymaps/bigspace/rules.mk
rename to keyboards/p3d/synapse/keymaps/7u_space/rules.mk
diff --git a/keyboards/synapse/keymaps/default/config.h b/keyboards/p3d/synapse/keymaps/default/config.h
similarity index 100%
rename from keyboards/synapse/keymaps/default/config.h
rename to keyboards/p3d/synapse/keymaps/default/config.h
diff --git a/keyboards/synapse/keymaps/default/keymap.c b/keyboards/p3d/synapse/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/synapse/keymaps/default/keymap.c
rename to keyboards/p3d/synapse/keymaps/default/keymap.c
diff --git a/keyboards/eu_isolation/keymaps/default/rules.mk b/keyboards/p3d/synapse/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/eu_isolation/keymaps/default/rules.mk
rename to keyboards/p3d/synapse/keymaps/default/rules.mk
diff --git a/keyboards/p3d/synapse/readme.md b/keyboards/p3d/synapse/readme.md
new file mode 100644
index 00000000000..8de1e779d59
--- /dev/null
+++ b/keyboards/p3d/synapse/readme.md
@@ -0,0 +1,27 @@
+# synapse
+
+![synapse](https://i.imgur.com/OQNNPBhh.jpg)
+
+Stagger PCB for Cervello!
+
+* Keyboard Maintainer: https://github.com/qpockets
+* Hardware Availability: [P3D Store](https://p3dstore.com/products/cervello-acrylic-keyboard-case-and-pcb-group-buy?_pos=4&_sid=fd078da46&_ss=r&variant=40398412677304) Group Buy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make p3d/synapse:default
+
+Flashing example for this keyboard:
+
+    make p3d/synapse: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 `QK_BOOT` if it is available
+* 
diff --git a/keyboards/synapse/rules.mk b/keyboards/p3d/synapse/rules.mk
similarity index 100%
rename from keyboards/synapse/rules.mk
rename to keyboards/p3d/synapse/rules.mk
diff --git a/keyboards/synapse/synapse.c b/keyboards/p3d/synapse/synapse.c
similarity index 100%
rename from keyboards/synapse/synapse.c
rename to keyboards/p3d/synapse/synapse.c
diff --git a/keyboards/tw40/config.h b/keyboards/p3d/tw40/config.h
similarity index 100%
rename from keyboards/tw40/config.h
rename to keyboards/p3d/tw40/config.h
diff --git a/keyboards/tw40/info.json b/keyboards/p3d/tw40/info.json
similarity index 100%
rename from keyboards/tw40/info.json
rename to keyboards/p3d/tw40/info.json
diff --git a/keyboards/tw40/keymaps/default/keymap.c b/keyboards/p3d/tw40/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/tw40/keymaps/default/keymap.c
rename to keyboards/p3d/tw40/keymaps/default/keymap.c
diff --git a/keyboards/tw40/keymaps/default/readme.md b/keyboards/p3d/tw40/keymaps/default/readme.md
similarity index 100%
rename from keyboards/tw40/keymaps/default/readme.md
rename to keyboards/p3d/tw40/keymaps/default/readme.md
diff --git a/keyboards/tw40/keymaps/via/keymap.c b/keyboards/p3d/tw40/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/tw40/keymaps/via/keymap.c
rename to keyboards/p3d/tw40/keymaps/via/keymap.c
diff --git a/keyboards/tw40/keymaps/via/rules.mk b/keyboards/p3d/tw40/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/tw40/keymaps/via/rules.mk
rename to keyboards/p3d/tw40/keymaps/via/rules.mk
diff --git a/keyboards/p3d/tw40/readme.md b/keyboards/p3d/tw40/readme.md
new file mode 100644
index 00000000000..1019ca4914f
--- /dev/null
+++ b/keyboards/p3d/tw40/readme.md
@@ -0,0 +1,19 @@
+# Training Wheel 40
+
+![tw40](https://cdn.shopify.com/s/files/1/0501/7537/7592/products/tw40_600x.jpg?v=1607835284)
+
+* Keyboard Maintainer: [KnoblesseOblige](https://github.com/KnoblesseOblige)
+* Hardware Supported: Training Wheel 40 PCB
+* Hardware Availability: https://p3dstore.com/products/tw40-gb
+
+Make example for this keyboard (after setting up your build environment):
+
+    make p3d/tw40:default
+
+To flash a new firmware plug in the keyboard while holding Esc (top left key) and then run the commands below.
+
+Flashing example for this keyboard:
+
+    make p3d/tw40: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/tw40/rules.mk b/keyboards/p3d/tw40/rules.mk
similarity index 100%
rename from keyboards/tw40/rules.mk
rename to keyboards/p3d/tw40/rules.mk
diff --git a/keyboards/pangorin/tan67/config.h b/keyboards/pangorin/tan67/config.h
deleted file mode 100644
index 9583631647c..00000000000
--- a/keyboards/pangorin/tan67/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2023 Pangorin <https://github.com/pangorin>
- *
- * 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 RGB_MATRIX_ENABLE
-    /* RGB Matrix config */
-    #define RGB_MATRIX_LED_COUNT 84
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#endif
diff --git a/keyboards/paprikman/albacore/config.h b/keyboards/paprikman/albacore/config.h
deleted file mode 100644
index ede3d42de5f..00000000000
--- a/keyboards/paprikman/albacore/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 paprikman
-
-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 RGB_MATRIX_ENABLE
-  #define RGB_MATRIX_LED_COUNT 8
-  #define RGB_DISABLE_WHEN_USB_SUSPENDED
-  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220
-  #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-  #define DISABLE_RGB_MATRIX_BAND_SAT
-  #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-  #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-  #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
-  #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
-  #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-  #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-  #define DISABLE_RGB_MATRIX_SPLASH
-  #define DISABLE_RGB_MATRIX_MULTISPLASH
-  #define DISABLE_RGB_MATRIX_SOLID_SPLASH
-  #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-  #define DISABLE_RGB_MATRIX_DIGITAL_RAIN
-#endif
diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json
index 5fad6237fac..bee94e84b1e 100644
--- a/keyboards/paprikman/albacore/info.json
+++ b/keyboards/paprikman/albacore/info.json
@@ -9,7 +9,9 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "max_brightness": 220,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C6", "B6", "B5", "B4"],
diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json
index 112a84ff1ae..8ebe32ded41 100644
--- a/keyboards/pauperboards/brick/info.json
+++ b/keyboards/pauperboards/brick/info.json
@@ -23,8 +23,7 @@
         "mousekey": true,
         "nkro": true,
         "encoder": true,
-        "rgblight": true,
-        "lto": true
+        "rgblight": true
     },
     "build": {
         "lto": true
diff --git a/keyboards/pearl/keymaps/cijanzen/README.md b/keyboards/pearl/keymaps/cijanzen/README.md
deleted file mode 100644
index 745442955fa..00000000000
--- a/keyboards/pearl/keymaps/cijanzen/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# cijanzen's Pearl 40%
-
-## Layout
-
-The firmware offers five layers:
-
-1. Base layer
-2. Numbers and arrows (Fn1)
-3. F-row and navigation (Fn2)
-4. Media and RGB controls (Fn3)
-5. Utils (Fn2+Fn3)
-
-A few specifics worth mentioning:
-- Autoshift has been enabled to allow for easier access of shifted keys
-- Tab will operate as tab key on tap and fn layer on hold
-- Indicator LEDs indicate the current layer
-
-
-![cijanzen's Pearl 40% layout](https://raw.githubusercontent.com/christopherjanzen/qmk_firmware/bab090ee24866e6c38892ffc5ffa53813aec3832/keyboards/pearl/keymaps/cijanzen/pearl-cijanzen-keymap.jpg)
-
-Base for this firmware copied from jetpacktuxedo's and rask's QMK firmware
-
----
-
-## Compiling and flashing
-
-To compile and flash the HEX follow the [Pearl 40% instructions](https://gist.github.com/clee/a43f198a70de0e6dae22d7638b41440a).
-
-You might need to check the comments at the bottom of the gist as well.
diff --git a/keyboards/pearl/keymaps/cijanzen/config.h b/keyboards/pearl/keymaps/cijanzen/config.h
deleted file mode 100644
index 46e9b9f0af5..00000000000
--- a/keyboards/pearl/keymaps/cijanzen/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@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
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/pearl/keymaps/cijanzen/keymap.c b/keyboards/pearl/keymaps/cijanzen/keymap.c
deleted file mode 100644
index 1b23cab9928..00000000000
--- a/keyboards/pearl/keymaps/cijanzen/keymap.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define ____ KC_TRNS
-// Tab on tap or Function layer 1 on hold
-#define FN_TAB LT(1, KC_TAB)
-#define KC_SLP KC_SYSTEM_SLEEP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // BASE LAYER
-    [0] = LAYOUT_all(
-        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,
-        FN_TAB,    KC_A,      KC_S,      KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,              KC_ENT,
-        KC_LSFT,   KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,      KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,              MO(2),
-                   KC_LCTL,   KC_LALT,   KC_LGUI,   KC_BSPC,   KC_BSPC,              KC_SPC,               MO(3),     MO(1)
-    ),
-    // BASE LAYER TWO (Fn1)
-    [1] = LAYOUT_all(
-        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_UP,     KC_QUOT,               KC_BSLS,
-        ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      KC_LEFT,   KC_DOWN,   KC_RGHT,               KC_RSFT,
-                   ____,      ____,      ____,      KC_DEL,    KC_DEL,               ____,                 KC_RGUI,   ____
-    ),
-    // FROW LAYER AND ARROWS (Fn2)
-    [2] = 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_PGUP,   ____,                  ____,
-        ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      KC_HOME,   KC_PGDN,   KC_END,                ____,
-                   MO(4),     ____,      ____,      ____,      ____,                 ____,                 ____,      ____
-    ),
-    // MEDIA AND RGB (Fn3)
-    [3] = LAYOUT_all(
-        ____,      RGB_M_P,   RGB_M_B,   RGB_M_R,   RGB_M_SW,  RGB_M_SN,  RGB_M_K,   RGB_M_X,   RGB_M_G,   KC_MPRV,   KC_MPLY,   KC_MNXT,    KC_DEL,
-        ____,      ____,      ____,      RGB_HUI,   RGB_SAI,   RGB_VAI,   ____,      ____,      ____,      ____,      ____,                  ____,
-        ____,      RGB_MOD,   RGB_TOG,   RGB_HUD,   RGB_SAD,   RGB_VAD,   BL_TOGG,   BL_STEP,   ____,      ____,      ____,                  ____,
-                   ____,      ____,      ____,      ____,      ____,                 ____,                 ____,      ____
-    ),
-    // UTIL (Fn1+Fn3)
-    [4] = LAYOUT_all(
-        KC_SLP,    ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      KC_PSCR,    QK_BOOT,
-        ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,                  ____,
-        ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,      ____,                  ____,
-                   ____,      ____,      ____,      ____,      ____,                 ____,                 ____,      ____
-    ),
-};
-
-/**
- * Status LED layer indicators courtesy of jetpacktuxedo's firmware
- */
-layer_state_t layer_state_set_kb(layer_state_t state)
-{
-  if (state & (1<<1)) { // if we are on layer 1
-    PORTD |= (1 << PD0); // light num lock led
-  } else if (state & (1<<2)) { // if we are on layer 2
-
-    if (state & (1<<4)) {
-      PORTD |= (1 << PD0); // light all indicator leds
-      PORTD |= (1 << PD1);
-      PORTD |= (1 << PD6);
-    } else {
-      PORTD &= ~(1 << PD0);
-      PORTD |= (1 << PD1); // light caps lock led
-      PORTD &= ~(1 << PD6);
-    }
-  } else if (state & (1<<3)) { // if we are on layer 3
-    PORTD |= (1 << PD6); // light scroll lock led
-  } else if (state & (1<<4)) { // if we are stuck on layer 4
-    PORTD |= (1 << PD0); // light all indicator leds
-    PORTD |= (1 << PD1);
-    PORTD |= (1 << PD6);
-  } else {
-    PORTD &= ~(1 << PD0);
-    PORTD &= ~(1 << PD1);
-    PORTD &= ~(1 << PD6);
-  }
-
-  return state;
-}
diff --git a/keyboards/pearl/keymaps/cijanzen/rules.mk b/keyboards/pearl/keymaps/cijanzen/rules.mk
deleted file mode 100644
index 900468e149c..00000000000
--- a/keyboards/pearl/keymaps/cijanzen/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# build options
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-# TAP_DANCE_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c b/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
deleted file mode 100644
index bf098d4d010..00000000000
--- a/keyboards/pearl/keymaps/jetpacktuxedo/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
-    QK_GESC,       KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-    LT(2, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, LT(2,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_BSPC,    KC_NO,      LT(1, KC_SPC),    MO(3), KC_RALT
-  ),
-  [1] = LAYOUT_all(
-    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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT, KC_TRNS,
-    KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-  [2] = LAYOUT_all(
-    KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS,
-    KC_TRNS, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_DQUO, KC_TRNS,
-    KC_TRNS, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS
-  ),
-  [3] = LAYOUT_all(
-    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS, QK_BOOT,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, BL_TOGG, KC_TRNS, BL_UP,   BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-};
-
-layer_state_t layer_state_set_kb(layer_state_t state) {
-  // if we are on layer 1
-  if (state & (1<<1)){
-    // light num lock led
-    PORTD |= (1 << PD0);
-  }
-  else{
-    PORTD &= ~(1 << PD0);
-  }
-  // if we are on layer 2
-  if (state & (1<<2)){
-    // light caps lock led
-    PORTD |= (1 << PD1);
-  }
-  else{
-    PORTD &= ~(1 << PD1);
-  }
-  // if we are on layer 3
-  if (state & (1<<3)){
-    // light scroll lock led
-    PORTD |= (1 << PD6);
-  }
-  else{
-    PORTD &= ~(1 << PD6);
-  }
-    return state;
-}
diff --git a/keyboards/pearl/keymaps/phil/keymap.c b/keyboards/pearl/keymaps/phil/keymap.c
deleted file mode 100755
index 79dfd4ce379..00000000000
--- a/keyboards/pearl/keymaps/phil/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@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/>.
-*/
-
-// Layer shorthand
-#define COLEMAK 0
-#define QWERTY 1
-#define WIN 2
-#define _FN1 3
-#define _FN2 4
-#define LIGHT 5
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [COLEMAK] = LAYOUT_all(
-      KC_TAB,           KC_Q,    KC_W,    KC_F,    KC_P,   KC_G,   KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN,  KC_NO, KC_BSPC,
-      LGUI_T(KC_ESC),   KC_A,    KC_R,    KC_S,    KC_T,   KC_D,   KC_H,   KC_N,   KC_E,    KC_I,    KC_O,     KC_QUOT,
-      LSFT_T(KC_DEL),   KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  RSFT_T(KC_ENT),
-      KC_LCTL,          KC_LGUI, KC_LALT,    LT(_FN1, KC_SPC),    KC_NO,        LT(_FN2, KC_SPC), TG(QWERTY),  TG(WIN)
-      ),
-  [QWERTY] = LAYOUT_all(
-      KC_TRNS,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_NO, KC_TRNS,
-      KC_TRNS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_TRNS,
-      KC_TRNS,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
-      KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS,    KC_NO,        KC_TRNS, KC_TRNS,  KC_TRNS
-      ),
-  [WIN] = 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_NO,  KC_TRNS,
-      LCTL_T(KC_ESC), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_LGUI, KC_LALT, KC_LCTL, KC_TRNS, KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS
-      ),
-  [_FN1] = LAYOUT_all(
-      KC_GRV,  KC_MNXT, KC_NO, KC_PIPE, KC_PLUS,  KC_LBRC, KC_RBRC, KC_HOME, KC_UP,   KC_END,  KC_PGUP,   KC_NO,  KC_TRNS,
-      KC_TRNS, KC_MPLY, KC_SPC, KC_UNDS, KC_EQUAL, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  KC_TRNS,
-      KC_TRNS, KC_MPRV, KC_NO, KC_BSLS, KC_MINUS, KC_LCBR, KC_RCBR, KC_NO,   KC_MUTE, KC_VOLU, KC_VOLD,   KC_CAPS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS
-      ),
-  [_FN2] = LAYOUT_all(
-      KC_TILD,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC, KC_NO,  KC_TRNS,
-      KC_TRNS,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
-      KC_TRNS,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_CAPS,
-      TG(LIGHT), KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS
-      ),
-  [LIGHT] = LAYOUT_all(
-      QK_BOOT, KC_NO,  BL_ON,   BL_UP,   BL_BRTG, RGB_M_P,  RGB_M_B, RGB_MOD,  RGB_HUI,  RGB_SAI, RGB_VAI, KC_NO,  KC_NO,
-      KC_NO, KC_NO,  BL_TOGG, BL_STEP, KC_NO,   RGB_M_SN, RGB_M_K, RGB_TOG,  RGB_HUD,  RGB_SAD, RGB_VAD, KC_NO,
-      KC_NO, KC_NO,  BL_OFF,  BL_DOWN, KC_NO,   KC_NO,    KC_NO,   RGB_RMOD, RGB_M_SW, RGB_M_R, RGB_M_G, KC_NO,
-      TG(LIGHT), KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO
-      ),
-};
-
-layer_state_t layer_state_set_kb(layer_state_t state) {
-  if (state & (1<<QWERTY)){
-    PORTD &= ~(1 << PD0);
-  } else {
-    PORTD |= (1 << PD0);
-  }
-
-  if (state & (1<<WIN)){
-    PORTD &= ~(1 << PD1);
-  }
-  else{
-    PORTD |= (1 << PD1);
-  }
-
-  if (state & (1<<LIGHT)){
-    PORTD &= ~(1 << PD6);
-  }
-  else{
-    PORTD |= (1 << PD6);
-  }
-    return state;
-}
diff --git a/keyboards/pearl/keymaps/rask/.editorconfig b/keyboards/pearl/keymaps/rask/.editorconfig
deleted file mode 100644
index 866353dcd6e..00000000000
--- a/keyboards/pearl/keymaps/rask/.editorconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-root = true
-
-[*.c]
-indent_size = 4
-indent_style = space
diff --git a/keyboards/pearl/keymaps/rask/README.md b/keyboards/pearl/keymaps/rask/README.md
deleted file mode 100644
index 79465ffd9de..00000000000
--- a/keyboards/pearl/keymaps/rask/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# rask's Pearl 40%
-
-## Layout
-
-The firmware offers five layers:
-
-1. Base layer
-2. Base with numbers and symbols (Fn1)
-3. Base with F-row and arrows (Fn2)
-4. Base with media and RGB controls (Fn3)
-5. More nav and utils (Fn2+Fn3, aka NavFn)
-
-![rask's Pearl 40% layout](https://i.imgur.com/gKVQapZ.png)
-
-Base for this firmware copied from jetpacktuxedo's QMK firmware.
-
----
-
-## Compiling and flashing
-
-To compile a HEX follow the Pearl 40% instructions.
-
-Flashing instructions also available at Pearl 40% instructions.
diff --git a/keyboards/pearl/keymaps/rask/keymap.c b/keyboards/pearl/keymaps/rask/keymap.c
deleted file mode 100644
index 1ab4badb511..00000000000
--- a/keyboards/pearl/keymaps/rask/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define ____ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // BASE LAYER
-    [0] = LAYOUT_all(
-        KC_TAB,     KC_Q,       KC_W,       KC_E,       KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,       KC_O,   KC_P,       KC_LBRC,    KC_RBRC,
-        MO(2),      KC_A,       KC_S,       KC_D,       KC_F,   KC_G,   KC_H,   KC_J,   KC_K,       KC_L,   KC_SCLN,                KC_ENT,
-        KC_LSFT,    KC_Z,       KC_X,       KC_C,       KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,    KC_DOT, KC_SLSH,                MO(3),
-                    KC_LCTL,    KC_LALT,    KC_BSPC,    MO(1),          MO(1),          KC_SPC,     KC_RALT,            KC_LGUI
-    ),
-    // BASE LAYER TWO (Fn1)
-    [1] = LAYOUT_all(
-        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_QUOT,                KC_BSLS,
-        ____,       ____,       ____,       ____,       ____,   ____,   ____,   ____,   ____,       ____,   ____,                   KC_RSFT,
-                    ____,       ____,       ____,       ____,           ____,           ____,       ____,               ____
-    ),
-    // FROW LAYER AND ARROWS (Fn2)
-    [2] = 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_UP,  ____,                   ____,
-        ____,       ____,       ____,       ____,       ____,   ____,   ____,   ____,   KC_LEFT,    KC_DOWN,KC_RGHT,                MO(4),
-                    ____,       ____,       ____,       ____,           ____,           ____,       ____,               ____
-    ),
-    // MEDIA AND RGB (Fn3)
-    [3] = LAYOUT_all(
-        ____,       ____,       ____,       ____,       ____,   ____,   ____,   ____,   ____,       KC_MPRV,KC_MPLY,    KC_MNXT,    KC_DEL,
-        ____,       ____,       ____,       RGB_HUI,    RGB_SAI,RGB_VAI,____,   ____,   ____,       ____,   ____,                   ____,
-        ____,       RGB_MOD,    RGB_TOG,    RGB_HUD,    RGB_SAD,RGB_VAD,____,   ____,   ____,       ____,   ____,                   ____,
-                    ____,       ____,       ____,       ____,           ____,           ____,       ____,               ____
-    ),
-    // UTIL (Fn1+Fn3)
-    [4] = LAYOUT_all(
-        ____,       ____,       ____,       ____,       ____,   ____,   ____,   ____,   ____,       ____,   ____,       KC_PSCR,    ____,
-        ____,       ____,       ____,       ____,       ____,   ____,   ____,   ____,   ____,       KC_PGUP,____,                   ____,
-        ____,       ____,       ____,       ____,       ____,   ____,   ____,   ____,   KC_HOME,    KC_PGDN,KC_END,                 ____,
-                    QK_BOOT,    ____,       ____,       ____,           ____,           ____,       ____,               ____
-    ),
-};
-
-/**
- * Status LED layer indicators courtesy of jetpacktuxedo's firmware
- */
-layer_state_t layer_state_set_kb(layer_state_t state)
-{
-    // if we are on layer 1
-    if (state & (1<<1)){
-        // light num lock led
-        PORTD |= (1 << PD0);
-    } else{
-        PORTD &= ~(1 << PD0);
-    }
-
-    // if we are on layer 2
-    if (state & (1<<2)){
-        // light caps lock led
-        PORTD |= (1 << PD1);
-    } else{
-        PORTD &= ~(1 << PD1);
-    }
-
-    // if we are on layer 3
-    if (state & (1<<3)){
-        // light scroll lock led
-        PORTD |= (1 << PD6);
-    } else{
-        PORTD &= ~(1 << PD6);
-    }
-
-    /*
-    // if we are on layer 4
-    if (state & (1<<4)){
-        // light all leds
-        PORTD |= (1 << PD0);
-        PORTD |= (1 << PD1);
-        PORTD |= (1 << PD6);
-    } else{
-        PORTD &= ~(1 << PD0);
-        PORTD &= ~(1 << PD1);
-        PORTD &= ~(1 << PD6);
-    }
-    */
-
-    return state;
-}
diff --git a/keyboards/percent/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
deleted file mode 100644
index cccfd448a0c..00000000000
--- a/keyboards/percent/canoe/keymaps/boy_314/keymap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2019 Boy_314
-
-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 _BL 0
-#define _F1 1
-#define _F2 2
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BL] = LAYOUT(
-      QK_GESC,        KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_LBRC,  KC_RBRC, KC_BSPC,  KC_DEL,
-      KC_TAB,         KC_QUOT, KC_COMM, KC_DOT,  KC_P,   KC_Y,   KC_F,   KC_G,   KC_C,   KC_R,    KC_L,    KC_SLSH,  KC_EQL,  KC_BSLS,  KC_PGUP,
-      CTL_T(KC_CAPS), KC_A,    KC_O,    KC_E,    KC_U,   KC_I,   KC_D,   KC_H,   KC_T,   KC_N,    KC_S,    KC_MINS,  KC_ENT,            KC_PGDN,
-      SC_LSPO,                 KC_SCLN, KC_Q,    KC_J,   KC_K,   KC_X,   KC_B,   KC_M,   KC_W,    KC_V,    KC_Z,     SC_RSPC, KC_UP,    MO(_F2),
-      KC_LCTL,        KC_LGUI, KC_LALT,                          KC_SPC,                 KC_RALT, MO(_F1),           KC_LEFT, KC_DOWN,  KC_RIGHT),
-
-  [_F1] = LAYOUT(
-	  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_TRNS,
-      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_TRNS,  KC_PAUS, KC_BSLS,  KC_TRNS,
-      KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,
-      SC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    SC_RSPC, KC_VOLU,  KC_TRNS,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_MPLY, KC_VOLD,  KC_MNXT),
-	  
-  [_F2] = LAYOUT(
-      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,   KC_PAUS,
-      KC_TRNS, KC_NO,   KC_UP,   KC_NO,   RGB_TOG,RGB_VAI,RGB_HUI,RGB_SAI,KC_INS, QK_BOOT, KC_PSCR, KC_SCRL,  KC_PAUS, KC_BSLS,  KC_SCRL,
-      KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,RGB_MOD,RGB_VAD,RGB_HUD,RGB_SAD,KC_NO,  KC_NO,   KC_F14,  KC_F15,   KC_INS,            KC_HOME,
-      SC_LSPO,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_NO,  KC_NO,  KC_MUTE,KC_VOLD, KC_VOLU, KC_NO,    SC_RSPC, KC_PGUP,  KC_TRNS,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_TRNS,                KC_RALT, KC_TRNS,           KC_HOME, KC_PGDN,  KC_END)
-
-};
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        rgblight_sethsv(HSV_RED);
-    } else {
-        rgblight_sethsv(HSV_TURQUOISE);
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/keyboards/percent/canoe/keymaps/boy_314/readme.md b/keyboards/percent/canoe/keymaps/boy_314/readme.md
deleted file mode 100644
index 3db01a66d0c..00000000000
--- a/keyboards/percent/canoe/keymaps/boy_314/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Boy_314's Canoe Layout
-
-Currently only supports Dvorak. Top right LED turns red when caps lock is on.
-
-Fn+O (Fn+R in Dvorak) puts the board into bootloader mode.
\ No newline at end of file
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
index 062ba8102e0..1f54b79bd00 100644
--- a/keyboards/percent/canoe_gen2/config.h
+++ b/keyboards/percent/canoe_gen2/config.h
@@ -21,59 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Backlight configuration
- */
-#define RGB_MATRIX_LED_COUNT 77
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-// #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
diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json
index 0cdb8f98193..0fe5d0e894d 100644
--- a/keyboards/percent/canoe_gen2/info.json
+++ b/keyboards/percent/canoe_gen2/info.json
@@ -12,7 +12,40 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"],
diff --git a/keyboards/percent/skog_lite/keymaps/binman/keymap.c b/keyboards/percent/skog_lite/keymaps/binman/keymap.c
deleted file mode 100755
index 67f74eeb90a..00000000000
--- a/keyboards/percent/skog_lite/keymaps/binman/keymap.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_tkl_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_DEL,  RGB_TOG, MO(1),   
-        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_MUTE, KC_VOLU, KC_MPLY, 
-        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_MRWD, KC_VOLD, KC_MFFD, 
-        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_NO,   KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_NO,   KC_RALT, KC_RALT,    KC_LEFT, KC_DOWN, KC_RGHT  
-    ),
-    [1] = LAYOUT_tkl_ansi(
-        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,      RGB_MOD, RGB_RMOD, KC_TRNS, 
-        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,      RGB_VAI, RGB_HUI,  RGB_SAI, 
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,      RGB_VAD, RGB_HUD,  RGB_SAD, 
-        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,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,               RGB_SPI, 
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                              KC_NO,   KC_NO,   KC_NO,   KC_NO,      KC_NO,   RGB_SPD, KC_NO     
-    )
-};
diff --git a/keyboards/percent/skog_lite/keymaps/binman/readme.md b/keyboards/percent/skog_lite/keymaps/binman/readme.md
deleted file mode 100755
index d4bf1929d67..00000000000
--- a/keyboards/percent/skog_lite/keymaps/binman/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# binman Skog Lite layout
-
-This mostly just changes the "TKL" section of the board to be media and lighting controls. Bottom row has also been modified a bit.
\ No newline at end of file
diff --git a/keyboards/phage_studio/pila87/config.h b/keyboards/phage_studio/pila87/config.h
deleted file mode 100644
index 2f4f0fac76c..00000000000
--- a/keyboards/phage_studio/pila87/config.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2022 Phage Studio
- * 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
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_LED_COUNT 91
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-    /* RGB Matrix effect */
-    #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
-
-    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-    #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
diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json
index c7157bc5738..4d12cf2573d 100644
--- a/keyboards/phage_studio/pila87/info.json
+++ b/keyboards/phage_studio/pila87/info.json
@@ -9,7 +9,53 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
diff --git a/keyboards/phase_studio/titan65/hotswap/config.h b/keyboards/phase_studio/titan65/hotswap/config.h
deleted file mode 100644
index 8724fc556d6..00000000000
--- a/keyboards/phase_studio/titan65/hotswap/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.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 RGB_MATRIX_LED_COUNT 67
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#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
diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json
index a4552351684..2c1f3e2854c 100644
--- a/keyboards/phase_studio/titan65/hotswap/info.json
+++ b/keyboards/phase_studio/titan65/hotswap/info.json
@@ -12,7 +12,8 @@
         "pin": "E6"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "max_brightness": 150
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"],
diff --git a/keyboards/phentech/rpk_001/config.h b/keyboards/phentech/rpk_001/config.h
index baa207f065e..1e3198dacb0 100644
--- a/keyboards/phentech/rpk_001/config.h
+++ b/keyboards/phentech/rpk_001/config.h
@@ -4,9 +4,8 @@
 #pragma once
 
 /* RGB Config */
-#define DRIVER_1_CS B6
-#define DRIVER_1_EN B7
-#define RGB_MATRIX_LED_COUNT 67
+#define AW20216S_CS_PIN_1 B6
+#define AW20216S_EN_PIN B7
 
 /* SPI Config */
 #define SPI_DRIVER SPIDQ
@@ -16,9 +15,3 @@
 
 /* SPI Flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-
-/* RGB Matrix */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json
index d047c36456a..d61c83607a1 100644
--- a/keyboards/phentech/rpk_001/info.json
+++ b/keyboards/phentech/rpk_001/info.json
@@ -42,9 +42,8 @@
         "on_state": 0
     },
     "rgb_matrix": {
-        "driver": "aw20216",
+        "driver": "aw20216s",
         "animations": {
-            "solid_color": true,
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
@@ -161,7 +160,9 @@
             { "flags": 1, "matrix": [4, 11], "x": 192, "y": 64},
             { "flags": 1, "matrix": [4, 13], "x": 208, "y": 64},
             { "flags": 1, "matrix": [4, 14], "x": 224, "y": 64}
-        ]
+        ],
+        "react_on_keyup": true,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/phentech/rpk_001/rpk_001.c b/keyboards/phentech/rpk_001/rpk_001.c
index 9f1a1187596..5ccd8d73930 100644
--- a/keyboards/phentech/rpk_001/rpk_001.c
+++ b/keyboards/phentech/rpk_001/rpk_001.c
@@ -7,84 +7,84 @@
 
 // clang-format off
 
-const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1   },  //  0  Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2   },  //  1  1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3   },  //  2  2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4   },  //  3  3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5   },  //  4  4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6   },  //  5  5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7   },  //  6  6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8   },  //  7  7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9   },  //  8  8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10  },  //  9  9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11  },  //  10 0
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12  },  //  11 -
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1  },  //  12 =
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2  },  //  13 Backspace
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3   },  //  0  Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3   },  //  1  1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3   },  //  2  2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3   },  //  3  3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3   },  //  4  4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3   },  //  5  5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3   },  //  6  6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3   },  //  7  7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3   },  //  8  8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3  },  //  9  9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3  },  //  10 0
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3  },  //  11 -
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18  },  //  12 =
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18  },  //  13 Backspace
 
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1   },  //  14 Tab
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2   },  //  15 Q
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3   },  //  16 W
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4   },  //  17 E
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5   },  //  18 R
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6   },  //  19 T
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7   },  //  20 Y
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8   },  //  21 U
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9   },  //  22 I
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10  },  //  23 O
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11  },  //  24 P
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12  },  //  25 [
-    {0, CS16_SW4,  CS17_SW4,  CS18_SW4  },  //  26 ]
-    {0, CS16_SW5,  CS17_SW5,  CS18_SW5  },  //  27 \|
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3  },  //  28 Del
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6   },  //  14 Tab
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6   },  //  15 Q
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6   },  //  16 W
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6   },  //  17 E
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6   },  //  18 R
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6   },  //  19 T
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6   },  //  20 Y
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6   },  //  21 U
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6   },  //  22 I
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6  },  //  23 O
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6  },  //  24 P
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6  },  //  25 [
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18  },  //  26 ]
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18  },  //  27 \|
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18  },  //  28 Del
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1   },  //  29 Caps Lock
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2   },  //  30 A
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3   },  //  31 S
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4   },  //  32 D
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5   },  //  33 F
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6   },  //  34 G
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7   },  //  35 H
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8   },  //  36 J
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9   },  //  37 K
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10  },  //  38 L
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11  },  //  39 ;
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12  },  //  40 '
-    {0, CS16_SW7,  CS17_SW7,  CS18_SW7  },  //  41 Enter
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6  },  //  42 Home
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9   },  //  29 Caps Lock
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9   },  //  30 A
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9   },  //  31 S
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9   },  //  32 D
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9   },  //  33 F
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9   },  //  34 G
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9   },  //  35 H
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9   },  //  36 J
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9   },  //  37 K
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9  },  //  38 L
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9  },  //  39 ;
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9  },  //  40 '
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18  },  //  41 Enter
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18  },  //  42 Home
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1  },  //  43 Shift_L
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3  },  //  44 Z
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4  },  //  45 X
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5  },  //  46 C
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6  },  //  47 V
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7  },  //  48 B
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8  },  //  49 N
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9  },  //  50 M
-    {0, CS10_SW10, CS11_SW10, CS12_SW10 },  //  51 ,
-    {0, CS10_SW11, CS11_SW11, CS12_SW11 },  //  52 .
-    {0, CS10_SW12, CS11_SW12, CS12_SW12 },  //  53 /
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9  },  //  54 Shift_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10 },  //  55 Up
-    {0, CS16_SW8,  CS17_SW8,  CS18_SW8  },  //  56 END
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12  },  //  43 Shift_L
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12  },  //  44 Z
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12  },  //  45 X
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12  },  //  46 C
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12  },  //  47 V
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12  },  //  48 B
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12  },  //  49 N
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12  },  //  50 M
+    {0, SW10_CS10, SW10_CS11, SW10_CS12 },  //  51 ,
+    {0, SW11_CS10, SW11_CS11, SW11_CS12 },  //  52 .
+    {0, SW12_CS10, SW12_CS11, SW12_CS12 },  //  53 /
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18  },  //  54 Shift_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18 },  //  55 Up
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18  },  //  56 END
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1  },  //  57 Ctrl_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2  },  //  58 Win_L
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3  },  //  59 Alt_L
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6  },  //  60 Space
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9  },  //  61 Alt_R
-    {0, CS13_SW10, CS14_SW10, CS15_SW10 },  //  62 Ctrl_R
-    {0, CS13_SW11, CS14_SW11, CS15_SW11 },  //  63 FN
-    {0, CS13_SW12, CS14_SW12, CS15_SW12 },  //  64 Left
-    {0, CS16_SW12, CS17_SW12, CS18_SW12 },  //  65 Down
-    {0, CS16_SW11, CS17_SW11, CS18_SW11 },  //  66 Right
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15  },  //  57 Ctrl_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15  },  //  58 Win_L
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15  },  //  59 Alt_L
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15  },  //  60 Space
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15  },  //  61 Alt_R
+    {0, SW10_CS13, SW10_CS14, SW10_CS15 },  //  62 Ctrl_R
+    {0, SW11_CS13, SW11_CS14, SW11_CS15 },  //  63 FN
+    {0, SW12_CS13, SW12_CS14, SW12_CS15 },  //  64 Left
+    {0, SW12_CS16, SW12_CS17, SW12_CS18 },  //  65 Down
+    {0, SW11_CS16, SW11_CS17, SW11_CS18 },  //  66 Right
 };
 
 // clang-format on
diff --git a/keyboards/phoenix/phoenix.c b/keyboards/phoenix/phoenix.c
index 706a65b4dee..e870f987f4c 100644
--- a/keyboards/phoenix/phoenix.c
+++ b/keyboards/phoenix/phoenix.c
@@ -2,7 +2,7 @@
 #include "usb_main.h"
 #include "phoenix.h"
 
-void bootmagic_lite(void) {
+void bootmagic_scan(void) {
     matrix_scan();
     wait_ms(5);
     matrix_scan();
diff --git a/keyboards/pica40/keymaps/zzeneg/config.h b/keyboards/pica40/keymaps/zzeneg/config.h
deleted file mode 100644
index f29f5ba1a78..00000000000
--- a/keyboards/pica40/keymaps/zzeneg/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_FORCE_HOLD_PER_KEY
-#define TAPPING_TERM 150
-#define TAPPING_TERM_PER_KEY
-
-#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
diff --git a/keyboards/pica40/keymaps/zzeneg/keymap.c b/keyboards/pica40/keymaps/zzeneg/keymap.c
deleted file mode 100644
index ea73ef0e217..00000000000
--- a/keyboards/pica40/keymaps/zzeneg/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layer_number {
-    _QWERTY = 0,
-    _GAME,
-    _NAV,
-    _NUMBER,
-    _SYMBOL,
-    _FUNC
-};
-
-// Left-hand home row mods
-#define HOME_A LGUI_T(KC_A)
-#define HOME_S LALT_T(KC_S)
-#define HOME_D LCTL_T(KC_D)
-#define HOME_F LSFT_T(KC_F)
-
-// Right-hand home row mods
-#define HOME_J RSFT_T(KC_J)
-#define HOME_K RCTL_T(KC_K)
-#define HOME_L LALT_T(KC_L)
-#define HOME_SCLN RGUI_T(KC_SCLN)
-
-// bottom mods
-#define SYM_SPC LT(_SYMBOL, KC_SPC)
-#define NUM_TAB LT(_NUMBER, KC_TAB)
-#define FUNC_ESC LT(_FUNC, KC_ESC)
-#define FUNC_ENT LT(_FUNC, KC_ENT)
-#define NAV_BSPC LT(_NAV, KC_BSPC)
-#define RALT_DEL RALT_T(KC_DEL)
-
-// game layer mods
-#define LALT_EQL LALT_T(KC_EQL)
-#define LSFT_MINS LSFT_T(KC_MINS)
-#define LCTL_ESC LCTL_T(KC_ESC)
-#define LGUI_QUOT LGUI_T(KC_QUOT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* QWERTY
-    *        .----------------------------------.                    ,----------------------------------.
-    *        |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |
-    * .------+------+------+------+------+------|                    |------+------+------+------+------+------.
-    * |  =   |   A  |   S  |   D  |   F  |   G  |                    |   H  |   J  |   K  |   L  |   ;  |  '   |
-    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-    * |  -   |   Z  |   X  |   C  |   V  |   B  |-------.    .-------|   N  |   M  |   ,  |   .  |   /  |  `   |
-    * `-----------------------------------------/       /    \       \-----------------------------------------'
-    *                         | Esc  | Tab  |  / Space /      \ Enter \  | Bsps | Del  |
-    *                         |_FUNC | _NUM | /_SYMBOL/        \ _FUNC \ | _NAV | RAlt |
-    *                         `-------------''-------'          '-------''-------------'
-    */
-    [_QWERTY] = LAYOUT(
-                 KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-        KC_EQL,  HOME_A,  HOME_S,  HOME_D,  HOME_F,  KC_G,                KC_H,    HOME_J,  HOME_K,  HOME_L,  HOME_SCLN, KC_QUOT,
-        KC_MINS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_GRV,
-                                      FUNC_ESC, NUM_TAB, SYM_SPC,     FUNC_ENT, NAV_BSPC, RALT_DEL
-    ),
-
-    [_GAME] = LAYOUT(
-                   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-        LALT_EQL,  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, LGUI_QUOT,
-        LSFT_MINS, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, TG(_GAME),
-                                       LCTL_ESC, NUM_TAB, SYM_SPC,    FUNC_ENT, NAV_BSPC, RALT_DEL
-    ),
-
-    [_NAV] = LAYOUT(
-                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,             XXXXXXX,       XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,
-        XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,             LALT(KC_UP),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_INS,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,             LALT(KC_DOWN), KC_HOME, KC_END,  KC_APP,  XXXXXXX, XXXXXXX,
-                                       XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, _______, XXXXXXX
-    ),
-
-    [_NUMBER] = LAYOUT(
-                 KC_BSLS, KC_7,    KC_8,    KC_9,    KC_0,                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_LCTL, KC_COMM, KC_4,    KC_5,    KC_6,    KC_LBRC,             XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, XXXXXXX,
-        KC_ENT,  KC_DOT,  KC_1,    KC_2,    KC_3,    KC_RBRC,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                     KC_BSPC, _______, TG(_GAME),       XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    [_SYMBOL] = LAYOUT(
-                 LSFT(KC_BSLS), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0),               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_LCTL, LSFT(KC_COMM), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_LBRC),            XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, XXXXXXX,
-        KC_ENT,  LSFT(KC_DOT),  LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_RBRC),            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                                           XXXXXXX, KC_BSPC, _______,     XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    [_FUNC] = LAYOUT(
-                 KC_F12, KC_F7,   KC_F8,   KC_F9,   KC_PSCR,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_LCTL, KC_F11, KC_F4,   KC_F5,   KC_F6,   KC_PAUS,            XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, XXXXXXX,
-        KC_DEL,  KC_F10, KC_F1,   KC_F2,   KC_F3,   KC_CAPS,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                     _______, KC_MNXT, KC_MPLY,     _______, XXXXXXX, XXXXXXX
-    )
-};
-
-bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // allow multiple space, backspace, delete
-        case SYM_SPC:
-        case NAV_BSPC:
-        case RALT_DEL:
-            return false;
-        default:
-            return true;
-    }
-}
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    // different tapping term for different fingers
-    switch (keycode) {
-        // pinkies
-        case HOME_A:
-        case HOME_SCLN:
-            return TAPPING_TERM + 70;
-        // ring
-        case HOME_S:
-        case HOME_L:
-            return TAPPING_TERM + 40;
-        // middle
-        case HOME_D:
-        case HOME_K:
-            return TAPPING_TERM + 20;
-        // index and thumb
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_QWERTY] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_GAME] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
-    [_NAV] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT)  },
-    [_NUMBER] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT)  },
-    [_SYMBOL] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT)  },
-    [_FUNC] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT)  }
-};
-#endif // ENCODER_MAP_ENABLE
-
-#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-
-const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_ORANGE});
-const rgblight_segment_t PROGMEM capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_PURPLE});
-const rgblight_segment_t PROGMEM capslockword_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_MAGENTA});
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(game_layer, capslock_layer, capslockword_layer);
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(1, led_state.caps_lock);
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, _GAME));
-    return state;
-}
-
-void caps_word_set_user(bool active) {
-    rgblight_set_layer_state(2, active);
-}
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = rgb_layers;
-}
-
-#endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-
-#ifdef OLED_ENABLE
-
-void render_layer(void) {
-    switch (get_highest_layer(layer_state)) {
-        case _NUMBER:
-            oled_write_ln_P(PSTR("NMBR"), false);
-            break;
-        case _SYMBOL:
-            oled_write_ln_P(PSTR("SMBL"), false);
-            break;
-        case _NAV:
-            oled_write_ln_P(PSTR("NAV"), false);
-            break;
-        case _FUNC:
-            oled_write_ln_P(PSTR("FUNC"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR(" "), false);
-            break;
-    }
-}
-
-bool oled_task_user(void) {
-    render_layer();
-    return true;
-}
-
-#endif // OLED_ENABLE
-
diff --git a/keyboards/pica40/keymaps/zzeneg/rules.mk b/keyboards/pica40/keymaps/zzeneg/rules.mk
deleted file mode 100644
index afd8d2c6bf7..00000000000
--- a/keyboards/pica40/keymaps/zzeneg/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CAPS_WORD_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/pica40/rev2/post_rules.mk b/keyboards/pica40/rev2/post_rules.mk
deleted file mode 100644
index e4dda1925ba..00000000000
--- a/keyboards/pica40/rev2/post_rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# if ENCODER_ENABLE is set, add defines but avoid adding encoder.c as it's replaced by custom code in rev2.c
-ifeq ($(strip $(ENCODER_ENABLE)), yes)
-	ENCODER_ENABLE := no
-    OPT_DEFS += -DENCODER_ENABLE
-    ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
-        OPT_DEFS += -DENCODER_MAP_ENABLE
-    endif
-endif
diff --git a/keyboards/pica40/rev2/rev2.c b/keyboards/pica40/rev2/rev2.c
index c585ec56d66..2ee73dcc6b8 100644
--- a/keyboards/pica40/rev2/rev2.c
+++ b/keyboards/pica40/rev2/rev2.c
@@ -2,99 +2,29 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "rev2.h"
+#include "gpio.h"
 
 #ifdef ENCODER_ENABLE // code based on encoder.c
 
-static const pin_t encoders_pad_a[] = ENCODERS_PAD_A;
-static const pin_t encoders_pad_b[] = ENCODERS_PAD_B;
-
-static int8_t  encoder_LUT[]  = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
-static uint8_t encoder_state  = 3;
-static int8_t  encoder_pulses = 0;
-static uint8_t encoder_value  = 0;
-
-typedef struct encoder_sync_data {
-    int value;
-} encoder_sync_data;
+#define ENCODER_PIN_A (((pin_t[])ENCODERS_PAD_A)[0])
+#define ENCODER_PIN_B (((pin_t[])ENCODERS_PAD_B)[0])
 
 // custom handler that returns encoder B pin status from slave side
 void encoder_sync_slave_handler(uint8_t in_buflen, const void *in_data, uint8_t out_buflen, void *out_data) {
-    encoder_sync_data *data = (encoder_sync_data *)out_data;
-    data->value = readPin(encoders_pad_b[0]);
-}
-
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) {
-    return true;
+    *(uint8_t *)out_data = readPin(ENCODER_PIN_B) ? 1 : 0;
 }
 
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-
-    tap_code(clockwise ? KC_VOLU : KC_VOLD);
+void encoder_quadrature_init_pin(uint8_t index, bool pad_b) {}
 
-    return false;
-}
-
-#ifdef ENCODER_MAP_ENABLE
-static void encoder_exec_mapping(uint8_t index, bool clockwise) {
-    action_exec(clockwise ? ENCODER_CW_EVENT(index, true) : ENCODER_CCW_EVENT(index, true));
-    wait_ms(ENCODER_MAP_KEY_DELAY);
-    action_exec(clockwise ? ENCODER_CW_EVENT(index, false) : ENCODER_CCW_EVENT(index, false));
-    wait_ms(ENCODER_MAP_KEY_DELAY);
-}
-#endif // ENCODER_MAP_ENABLE
-
-void encoder_init(void) {
-    setPinInputHigh(encoders_pad_a[0]);
-    setPinInputHigh(encoders_pad_b[0]);
-    wait_us(100);
-    transaction_register_rpc(ENCODER_SYNC, encoder_sync_slave_handler);
-}
-
-bool encoder_read(void) {
-    // ignore if running on slave side
-    if (!is_keyboard_master()) return false;
-
-    bool changed = false;
-    encoder_sync_data data = {0};
-    // request pin B status from slave side
-    if (transaction_rpc_recv(ENCODER_SYNC, sizeof(data), &data)) {
-        uint8_t new_status = (readPin(encoders_pad_a[0]) << 0) | (data.value << 1);
-        if ((encoder_state & 0x3) != new_status) {
-            encoder_state <<= 2;
-            encoder_state |= new_status;
-            encoder_pulses += encoder_LUT[encoder_state & 0xF];
-
-            if (encoder_pulses >= ENCODER_RESOLUTION) {
-                encoder_value++;
-                changed = true;
-#ifdef ENCODER_MAP_ENABLE
-                encoder_exec_mapping(0, false);
-#else  // ENCODER_MAP_ENABLE
-                encoder_update_kb(0, false);
-#endif // ENCODER_MAP_ENABLE
-            }
-
-            if (encoder_pulses <= -ENCODER_RESOLUTION) {
-                encoder_value--;
-                changed = true;
-#ifdef ENCODER_MAP_ENABLE
-                encoder_exec_mapping(0, true);
-#else  // ENCODER_MAP_ENABLE
-                encoder_update_kb(0, true);
-#endif // ENCODER_MAP_ENABLE
-            }
-
-            encoder_pulses %= ENCODER_RESOLUTION;
-        }
+uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b) {
+    if(pad_b) {
+        uint8_t data = 0;
+        transaction_rpc_recv(ENCODER_SYNC, sizeof(data), &data);
+        return data;
     }
-    return changed;
+    return readPin(ENCODER_PIN_A) ? 1 : 0;
 }
 
-// do not use standard split encoder transactions
-void encoder_state_raw(uint8_t *slave_state) {}
-void encoder_update_raw(uint8_t *slave_state) {}
-
 #endif // ENCODER_ENABLE
 
 #ifdef PICA40_RGBLIGHT_TIMEOUT
@@ -125,6 +55,12 @@ bool should_set_rgblight = false;
 void keyboard_post_init_kb(void) {
     setPinOutput(PICA40_RGB_POWER_PIN);
 
+#ifdef ENCODER_ENABLE
+    setPinInputHigh(ENCODER_PIN_A);
+    setPinInputHigh(ENCODER_PIN_B);
+    transaction_register_rpc(ENCODER_SYNC, encoder_sync_slave_handler);
+#endif // ENCODER_ENABLE
+
 #ifdef PICA40_RGBLIGHT_TIMEOUT
     idle_timer = timer_read();
     check_rgblight_timer = timer_read();
diff --git a/keyboards/pico/65keys/keymaps/default/config.h b/keyboards/pico/65keys/keymaps/default/config.h
deleted file mode 100644
index 5cbe7609a3f..00000000000
--- a/keyboards/pico/65keys/keymaps/default/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2019 Kumao Kobo <kumaokobo@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
diff --git a/keyboards/pico/65keys/keymaps/default/keymap.c b/keyboards/pico/65keys/keymaps/default/keymap.c
deleted file mode 100644
index eb0ea05fc2c..00000000000
--- a/keyboards/pico/65keys/keymaps/default/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-
-// Shortcut to make keymap more readable
-#define SYM_L    MO(_SYMB)
-#define KC_ALES  LALT_T(KC_ESC)
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     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_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_LBRC ,KC_RBRC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                 KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_QUOT ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                 KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_UP   ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_ENT  ,KC_DEL  ,KC_LGUI ,KC_L2SYM,KC_SPC  ,                 KC_SPC  ,KC_L1SYM,KC_RGUI ,KC_DEL  ,KC_LEFT ,KC_DOWN ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = 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_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_INT3 ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_GRV ,KC_MINS  ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LCBR ,KC_RCBR ,_______ ,_______ ,_______ ,KC_CIRC ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-
-};
diff --git a/keyboards/pico/65keys/keymaps/jis/config.h b/keyboards/pico/65keys/keymaps/jis/config.h
deleted file mode 100644
index 5cbe7609a3f..00000000000
--- a/keyboards/pico/65keys/keymaps/jis/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2019 Kumao Kobo <kumaokobo@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
diff --git a/keyboards/pico/65keys/keymaps/jis/keymap.c b/keyboards/pico/65keys/keymaps/jis/keymap.c
deleted file mode 100644
index 9f3f640f013..00000000000
--- a/keyboards/pico/65keys/keymaps/jis/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include QMK_KEYBOARD_H
-#include"keymap_japanese.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.
-#define _QWERTY 0
-#define _SYMB 1
-
-// Shortcut to make keymap more readable
-#define SYM_L    MO(_SYMB)
-#define KC_ALES  LALT_T(KC_ESC)
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-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    ,KC_MINS ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     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_CIRC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                 KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,JP_COLN ,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_UP   ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_ENT  ,KC_DEL  ,KC_LGUI ,KC_L2SYM,KC_SPC  ,                 KC_SPC  ,KC_L1SYM,KC_RGUI ,KC_DEL  ,KC_LEFT ,KC_DOWN ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = 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_LPRN ,KC_RPRN ,KC_PIPE ,JP_YEN  ,JP_TILD ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,JP_GRV  ,KC_MINS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LCBR ,KC_RCBR ,_______ ,_______ ,_______ ,JP_UNDS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LT   ,_______ ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-
-};
diff --git a/keyboards/pico/70keys/keymaps/default/keymap.c b/keyboards/pico/70keys/keymaps/default/keymap.c
deleted file mode 100644
index 3c3ab50c178..00000000000
--- a/keyboards/pico/70keys/keymaps/default/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-
-// Shortcut to make keymap more readable
-#define SYM_L    MO(_SYMB)
-#define KC_ALES  LALT_T(KC_ESC)
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     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_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_LBRC ,KC_RBRC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_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_LSFT ,KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                 KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_UP   ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_ALES ,KC_ENT  ,KC_DEL  ,KC_LGUI ,KC_L2SYM,KC_SPC  ,                 KC_SPC  ,KC_L1SYM,KC_RGUI ,KC_DEL  ,KC_LEFT ,KC_DOWN ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = 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_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_INT3 ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_GRV ,KC_MINS  ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LCBR ,KC_RCBR ,_______ ,_______ ,_______ ,KC_CIRC ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-
-};
diff --git a/keyboards/pico/70keys/keymaps/jis/keymap.c b/keyboards/pico/70keys/keymaps/jis/keymap.c
deleted file mode 100644
index 5727cb7841f..00000000000
--- a/keyboards/pico/70keys/keymaps/jis/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include QMK_KEYBOARD_H
-#include"keymap_japanese.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.
-#define _QWERTY 0
-#define _SYMB 1
-
-// Shortcut to make keymap more readable
-#define SYM_L    MO(_SYMB)
-#define KC_ALES  LALT_T(KC_ESC)
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV  ,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_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,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_CIRC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                 KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,JP_COLN ,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_UP   ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_ALES ,KC_ENT  ,KC_DEL  ,KC_LGUI ,KC_L2SYM,KC_SPC  ,                 KC_SPC  ,KC_L1SYM,KC_RGUI ,KC_DEL  ,KC_LEFT ,KC_DOWN ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = 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_LPRN ,KC_RPRN ,KC_PIPE ,JP_YEN  ,JP_TILD ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,JP_GRV  ,KC_MINS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┼────────┼────────┼────────┬────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 KC_LCBR ,KC_RCBR ,_______ ,_______ ,_______ ,JP_UNDS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                ├────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,_______ ,KC_LT   ,_______ ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-
-};
diff --git a/keyboards/pico/readme.md b/keyboards/pico/readme.md
deleted file mode 100644
index 891bb174fe6..00000000000
--- a/keyboards/pico/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Pico keyboard
-
-A split keyboard kit designed for small hands.  
-Pico adopted the footprint for [Kailh Mid-Height](http://www.kailh.com/en/Products/Ks/KHS/) smaller than Cherry MX compatible switches.  
-
-* Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)
-* Hardware Supported: Pico PCB rev1.0 w/ Pro Micro
-
-Make example for this keyboard (after setting up your build environment):
-
-    make pico/65keys:default
-
-## 65 keys
-<p align="center">
-  <img src="https://raw.githubusercontent.com/kumaokobo/pico-keyboard/master/img/pico-keyboard.jpg" alt="Pico Keyboard 65 keys" width="600"/>
-</p>
-
-## 70 keys
-<p align="center">
-  <img src="https://raw.githubusercontent.com/kumaokobo/pico-keyboard/master/img/pico-keyboard2.jpg" alt="Pico Keyboard 70 keys" width="600"/>
-</p>
-
-
-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/pico/rules.mk b/keyboards/pico/rules.mk
deleted file mode 100644
index fac3912a251..00000000000
--- a/keyboards/pico/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
-DEFAULT_FOLDER = pico/65keys
diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h
deleted file mode 100644
index ecc59f31bd3..00000000000
--- a/keyboards/pierce/keymaps/durken1/config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2022 durken (https://github.com/durken1/)
- *
- * 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
-
-// default but important
-#define TAPPING_TERM 220
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
-
-#define PERMISSIVE_HOLD
-
-// Combo settings
-#define COMBO_TERM 35
-
-#ifdef PS2_DRIVER_USART
-#define PS2_CLOCK_PIN   D5
-#define PS2_DATA_PIN    D2
-
-/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */
-/* set DDR of CLOCK as input to be slave */
-#define PS2_MOUSE_ROTATE 270 // compensate for east-facing device orientation
-#define PS2_USART_INIT() do {   \
-    PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT);   \
-    PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT);     \
-    UCSR1C = ((1 << UMSEL10) |  \
-            (3 << UPM10)   |  \
-            (0 << USBS1)   |  \
-            (3 << UCSZ10)  |  \
-            (0 << UCPOL1));   \
-    UCSR1A = 0;                 \
-    UBRR1H = 0;                 \
-    UBRR1L = 0;                 \
-} while (0)
-#define PS2_USART_RX_INT_ON() do {  \
-    UCSR1B = ((1 << RXCIE1) |       \
-            (1 << RXEN1));        \
-} while (0)
-#define PS2_USART_RX_POLL_ON() do { \
-    UCSR1B = (1 << RXEN1);          \
-} while (0)
-#define PS2_USART_OFF() do {    \
-    UCSR1C = 0;                 \
-    UCSR1B &= ~((1 << RXEN1) |  \
-            (1 << TXEN1));  \
-} while (0)
-#define PS2_USART_RX_READY      (UCSR1A & (1<<RXC1))
-#define PS2_USART_RX_DATA       UDR1
-#define PS2_USART_ERROR         (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1)))
-#define PS2_USART_RX_VECT       USART1_RX_vect
-#endif
-
-#ifdef AUTO_BUTTONS
-  #define AUTO_BUTTONS_TIMEOUT 750
-#endif
diff --git a/keyboards/pierce/keymaps/durken1/keymap.c b/keyboards/pierce/keymaps/durken1/keymap.c
deleted file mode 100644
index 5bc2f4d3077..00000000000
--- a/keyboards/pierce/keymaps/durken1/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Copyright 2022 durken (https://github.com/durken1/)
- *
- * 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_swedish.h"
-
-enum layers {
-    BASE,
-    MBO,
-    SYM,
-    NUM,
-    FN
-};
-
-enum combos {
-    WF_ARNG,
-    EI_ADIA,
-    UK_ODIA
-};
-
-#if defined PS2_MOUSE_ENABLE
-#include "ps2_mouse.h"
-#endif
-
-#if defined AUTO_BUTTONS && defined PS2_MOUSE_ENABLE
-
-static uint16_t auto_buttons_timer;
-extern int tp_buttons; // mousekey button state set in action.c and used in ps2_mouse.c
-
-void ps2_mouse_moved_user(report_mouse_t *mouse_report) {
-    if (auto_buttons_timer) {
-        auto_buttons_timer = timer_read();
-    } else {
-        if (!tp_buttons) {
-            layer_on(MBO);
-            auto_buttons_timer = timer_read();
-        }
-    }
-}
-
-void matrix_scan_user(void) {
-    if (auto_buttons_timer && (timer_elapsed(auto_buttons_timer) > AUTO_BUTTONS_TIMEOUT)) {
-        if (!tp_buttons) {
-            layer_off(MBO);
-            auto_buttons_timer = 0;
-        }
-    }
-}
-
-#endif // defined AUTO_BUTTONS && defined PS2_MOUSE_ENABLE
-
-// Left-hand home row mods
-#define GUI_A LGUI_T(KC_A)
-#define ALT_R LALT_T(KC_R)
-#define SFT_S LSFT_T(KC_S)
-#define CTRL_T LCTL_T(KC_T)
-
-// Right-hand home row mods
-#define CTL_N RCTL_T(KC_N)
-#define SFT_E RSFT_T(KC_E)
-#define ALT_I LALT_T(KC_I)
-#define GUI_O LGUI_T(KC_O)
-
-#define NUM_SPC LT(NUM, KC_SPC)
-#define FN_ENT LT(FN, KC_ENT)
-#define SYM_BSP LT(SYM, KC_BSPC)
-
-const uint16_t PROGMEM arng_combo[] = {ALT_R, SFT_S, COMBO_END};
-const uint16_t PROGMEM adia_combo[] = {SFT_E, ALT_I, COMBO_END};
-const uint16_t PROGMEM odia_combo[] = {SE_U, SE_K, COMBO_END};
-
-combo_t key_combos[] = {
-	[WF_ARNG] = COMBO(arng_combo, SE_ARNG),
-	[EI_ADIA] = COMBO(adia_combo, SE_ADIA),
-	[UK_ODIA] = COMBO(odia_combo, SE_ODIA)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_split_3x5_3(
- // BASE
-  //,--------------------------------------------,                    ,--------------------------------------------.
-         SE_Q,    SE_W,    SE_F,    SE_P,    SE_B,                         SE_Y,    SE_L,    SE_U,    SE_K, SE_QUOT,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-        GUI_A,   ALT_R,   SFT_S,  CTRL_T,    SE_G,                         SE_M,   CTL_N,   SFT_E,   ALT_I,   GUI_O,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-         SE_Z,    SE_X,    SE_C,    SE_D,    SE_V,                         SE_J,    SE_H, SE_COMM,  SE_DOT, SE_MINS,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                  KC_ESC, NUM_SPC,  KC_TAB,     FN_ENT, SYM_BSP,  KC_DEL
-                             //`--------------------------'  '--------------------------'
-
-  ),
-
-
-  [MBO] = LAYOUT_split_3x5_3(
-  // Mouse
-  //,--------------------------------------------,                    ,--------------------------------------------.
-      _______, _______, _______, _______, _______,                      KC_BTN1, KC_BTN2, _______, _______, _______,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,                      KC_BTN3, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                 _______, _______, _______,    _______, KC_BSPC, _______
-                             //`--------------------------'  '--------------------------'
-
-  ),
-
-  [SYM] = LAYOUT_split_3x5_3(
-  // Symbols
-  //,--------------------------------------------,                    ,--------------------------------------------.
-      SE_SECT, SE_ACUT, SE_SLSH, SE_TILD, _______,                      _______, SE_PIPE, SE_BSLS, SE_DIAE, SE_CIRC,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      SE_EXLM,  SE_DLR, SE_LPRN, SE_LBRC, _______,                      _______, SE_RBRC, SE_RPRN, SE_HASH, SE_QUES,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, SE_PERC, SE_LCBR, SE_LABK, _______,                      _______, SE_RABK, SE_RCBR, SE_AMPR, _______,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                   SE_AT,  SE_EQL, SE_DQUO,    _______, _______, _______
-                             //`--------------------------'  '--------------------------'
-  ),
-
-  [NUM] = LAYOUT_split_3x5_3(
-  // Numbers
-  //,--------------------------------------------,                    ,--------------------------------------------.
-      _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                      _______,    SE_7,    SE_8,    SE_9, SE_QUOT,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      SE_PLUS, SE_MINS, SE_ASTR, SE_SLSH, SE_CIRC,                      _______,    SE_4,    SE_5,    SE_6, _______,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, _______, KC_VOLD, KC_VOLU, _______,                       KC_SPC,    SE_1,    SE_2,    SE_3, _______,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                 _______, _______, _______,    SE_COMM,   SE_0,  SE_DOT
-                             //`--------------------------'  '--------------------------'
-  ),
-
-  [FN] = LAYOUT_split_3x5_3(
-  // FN
-  //,--------------------------------------------,                    ,--------------------------------------------.
-      _______, _______, _______, _______, _______,                      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______,                      _______,   KC_F4,   KC_F5,   KC_F6,  KC_F11,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,                      _______,   KC_F1,   KC_F2,   KC_F3,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                 KC_PSCR, KC_CAPS, _______,    _______, _______, _______
-                             //`--------------------------'  '--------------------------'
-  )
-};
diff --git a/keyboards/pierce/keymaps/durken1/rules.mk b/keyboards/pierce/keymaps/durken1/rules.mk
deleted file mode 100644
index bea18c02d1f..00000000000
--- a/keyboards/pierce/keymaps/durken1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRAKEY_ENABLE = yes
-TRACKPOINT = yes
-AUTO_BUTTONS = yes
-COMBO_ENABLE = yes
diff --git a/keyboards/pisces/config.h b/keyboards/pisces/config.h
index 4cb5aaf54e3..cbdce6f83e5 100644
--- a/keyboards/pisces/config.h
+++ b/keyboards/pisces/config.h
@@ -18,6 +18,8 @@
 
 /* Select hand configuration */
 #define SPLIT_HAND_MATRIX_GRID B0,B7
+#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
+
 #define MATRIX_MASKED
 #define SPLIT_USB_DETECT
 
diff --git a/keyboards/pizzakeyboards/slice65/board.h b/keyboards/pizzakeyboards/slice65/board.h
new file mode 100644
index 00000000000..ba17e3b15ec
--- /dev/null
+++ b/keyboards/pizzakeyboards/slice65/board.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 Christoph Baumann
+
+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 STM32_HSECLK 16000000
+#include_next <board.h>
diff --git a/keyboards/pizzakeyboards/slice65/info.json b/keyboards/pizzakeyboards/slice65/info.json
new file mode 100644
index 00000000000..a6ae5a169f8
--- /dev/null
+++ b/keyboards/pizzakeyboards/slice65/info.json
@@ -0,0 +1,105 @@
+{
+    "manufacturer": "Pizzakeyboards",
+    "keyboard_name": "Slice65",
+    "maintainer": "mm0nte",
+    "bootloader": "stm32-dfu",
+    "debounce": 10,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C13", "C15", "B6", "B5", "B4", "C4", "A7"],
+        "rows": ["C11", "C12", "B3", "D2", "A1", "A2", "A5", "A4", "B1", "B0"]
+    },
+    "processor": "STM32F303",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "url": "www.keyboards.pizza",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x707C",
+        "vid": "0x504B"
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 7], "x": 15, "y": 0},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [2, 7], "x": 15, "y": 1},
+                {"label": "Capslock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [4, 7], "x": 15, "y": 2},
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [6, 7], "x": 15, "y": 3},
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [8, 7], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pizzakeyboards/slice65/keymaps/default/keymap.c b/keyboards/pizzakeyboards/slice65/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ed1ea2f0c68
--- /dev/null
+++ b/keyboards/pizzakeyboards/slice65/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2021 Christoph Baumann
+ *
+ * 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_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_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_LWIN, KC_LALT,                   KC_SPC,                      KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+};
diff --git a/keyboards/pizzakeyboards/slice65/keymaps/via/keymap.c b/keyboards/pizzakeyboards/slice65/keymaps/via/keymap.c
new file mode 100644
index 00000000000..904340ceec2
--- /dev/null
+++ b/keyboards/pizzakeyboards/slice65/keymaps/via/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2022 Christoph Baumann
+ *
+ * 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_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_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_LWIN, KC_LALT,                   KC_SPC,                      KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    )
+};
diff --git a/keyboards/pizzakeyboards/slice65/keymaps/via/rules.mk b/keyboards/pizzakeyboards/slice65/keymaps/via/rules.mk
new file mode 100644
index 00000000000..36b7ba9cbc9
--- /dev/null
+++ b/keyboards/pizzakeyboards/slice65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/pizzakeyboards/slice65/ld/STM32F303xB.ld b/keyboards/pizzakeyboards/slice65/ld/STM32F303xB.ld
new file mode 100644
index 00000000000..8ad8b0911cc
--- /dev/null
+++ b/keyboards/pizzakeyboards/slice65/ld/STM32F303xB.ld
@@ -0,0 +1,86 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+              Copyright (C) 2022       Christoph Baumann
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * STM32F303xC memory setup.
+ */
+MEMORY
+{
+    flash0 (rx) : org = 0x08000000, len = 128k
+    flash1 (rx) : org = 0x00000000, len = 0
+    flash2 (rx) : org = 0x00000000, len = 0
+    flash3 (rx) : org = 0x00000000, len = 0
+    flash4 (rx) : org = 0x00000000, len = 0
+    flash5 (rx) : org = 0x00000000, len = 0
+    flash6 (rx) : org = 0x00000000, len = 0
+    flash7 (rx) : org = 0x00000000, len = 0
+    ram0   (wx) : org = 0x20000000, len = 32k
+    ram1   (wx) : org = 0x00000000, len = 0
+    ram2   (wx) : org = 0x00000000, len = 0
+    ram3   (wx) : org = 0x00000000, len = 0
+    ram4   (wx) : org = 0x10000000, len = 8k
+    ram5   (wx) : org = 0x00000000, len = 0
+    ram6   (wx) : org = 0x00000000, len = 0
+    ram7   (wx) : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
diff --git a/keyboards/pizzakeyboards/slice65/mcuconf.h b/keyboards/pizzakeyboards/slice65/mcuconf.h
new file mode 100644
index 00000000000..aa059c91708
--- /dev/null
+++ b/keyboards/pizzakeyboards/slice65/mcuconf.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2022 Christoph Baumann
+
+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_next <mcuconf.h>
+
+#undef STM32_PREDIV_VALUE
+#define STM32_PREDIV_VALUE 2
diff --git a/keyboards/pizzakeyboards/slice65/readme.md b/keyboards/pizzakeyboards/slice65/readme.md
new file mode 100644
index 00000000000..591f51b49e8
--- /dev/null
+++ b/keyboards/pizzakeyboards/slice65/readme.md
@@ -0,0 +1,27 @@
+# Pizza Keyboards (V2) Slice65
+
+![Pizza V2](https://i.imgur.com/RfqnpVlh.jpeg)
+
+A 65% keyboard kit made and sold by [pizza keyboards](https://keyboards.pizza).
+
+* Keyboard Maintainer: [mm0nte](https://github.com/mm0nte)
+* Hardware Supported: Pizza V2 Slice65 (Hotswap) PCB
+* Hardware Availability: [Pizza Keyboards Store](https://keyboards.pizza/collections/store)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pizzakeyboards/slice65:default
+
+Flashing example for this keyboard:
+
+    make pizzakeyboards/slice65: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 `QK_BOOT` if it is available
diff --git a/keyboards/pizzakeyboards/slice65/rules.mk b/keyboards/pizzakeyboards/slice65/rules.mk
new file mode 100644
index 00000000000..a36398ce434
--- /dev/null
+++ b/keyboards/pizzakeyboards/slice65/rules.mk
@@ -0,0 +1 @@
+MCU_LDSCRIPT = STM32F303xB
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 93d0823714c..74d8d21155d 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -52,63 +52,6 @@
 
 #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
 
-#define RGB_MATRIX_LED_COUNT 47
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_LED_PROCESS_LIMIT 5
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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
-#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 MOUSEKEY_INTERVAL           20
 #define MOUSEKEY_DELAY              0
 #define MOUSEKEY_TIME_TO_MAX        60
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index dfadb820ae4..522fd700338 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -21,67 +21,67 @@
 
 keyboard_config_t keyboard_config;
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_12,  A_12,  C_12},
-    {0, B_11,  A_11,  C_11},
-    {0, B_10,  A_10,  C_10},
-    {0, B_9,   A_9,   C_9},
-    {0, B_8,   A_8,   C_8},
-    {0, B_7,   A_7,   C_7},
-
-    {0, H_12,  G_12,  I_12},
-    {0, H_11,  G_11,  I_11},
-    {0, H_10,  G_10,  I_10},
-    {0, H_9,   G_9,   I_9},
-    {0, H_8,   G_8,   I_8},
-    {0, H_7,   G_7,   I_7},
-
-    {0, B_6,   A_6,   C_6},
-    {0, B_5,   A_5,   C_5},
-    {0, B_4,   A_4,   C_4},
-    {0, B_3,   A_3,   C_3},
-    {0, B_2,   A_2,   C_2},
-    {0, B_1,   A_1,   C_1},
-
-    {0, H_6,   G_6,   I_6},
-    {0, H_5,   G_5,   I_5},
-    {0, H_4,   G_4,   I_4},
-    {0, H_3,   G_3,   I_3},
-    {0, H_2,   G_2,   I_2},
-    {0, H_1,   G_1,   I_1},
-
-    {0, E_12,  D_12,  F_12},
-    {0, E_11,  D_11,  F_11},
-    {0, E_10,  D_10,  F_10},
-    {0, E_9,   D_9,   F_9},
-    {0, E_8,   D_8,   F_8},
-    {0, E_7,   D_7,   F_7},
-
-    {0, K_12,  J_12,  L_12},
-    {0, K_11,  J_11,  L_11},
-    {0, K_10,  J_10,  L_10},
-    {0, K_9,   J_9,   L_9},
-    {0, K_8,   J_8,   L_8},
-    {0, K_7,   J_7,   L_7},
-
-    {0, E_6,   D_6,   F_6},
-    {0, E_5,   D_5,   F_5},
-    {0, E_4,   D_4,   F_4},
-    {0, E_3,   D_3,   F_3},
-    {0, E_2,   D_2,   F_2},
-    {0, E_1,   D_1,   F_1},
-
-    {0, K_6,   J_6,   L_6},
-    {0, K_5,   J_5,   L_5},
-    {0, K_4,   J_4,   L_4},
-    {0, K_3,   J_3,   L_3},
-    {0, K_2,   J_2,   L_2},
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12},
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11},
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10},
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9},
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8},
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7},
+
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12},
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11},
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10},
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9},
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8},
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7},
+
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6},
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5},
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4},
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3},
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2},
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1},
+
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6},
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5},
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4},
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3},
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2},
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1},
+
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12},
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11},
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10},
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9},
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8},
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7},
+
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12},
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11},
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10},
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9},
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8},
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7},
+
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6},
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5},
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4},
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3},
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2},
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1},
+
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6},
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5},
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4},
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3},
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2},
 
 };
 
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index 6848239279f..044e187c4bc 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -7,7 +7,55 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "is31fl3737"
+    "animations": {
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_val": true,
+      "band_pinwheel_sat": true,
+      "band_pinwheel_val": true,
+      "band_spiral_sat": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true,
+      "solid_multisplash": true
+    },
+    "driver": "is31fl3737",
+    "led_process_limit": 5,
+    "led_flush_limit": 26,
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
index a19a4fceaa8..9d3db5cdb72 100644
--- a/keyboards/planck/ez/rules.mk
+++ b/keyboards/planck/ez/rules.mk
@@ -14,8 +14,6 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
 ENCODER_ENABLE = yes
 
-LAYOUTS_HAS_RGB = no
-
 RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED = no
 BAKCLIGHT_SUPPORTED = no
diff --git a/keyboards/planck/keymaps/abhixec/config.h b/keyboards/planck/keymaps/abhixec/config.h
deleted file mode 100644
index b3d107bcfa8..00000000000
--- a/keyboards/planck/keymaps/abhixec/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2015-2017 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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/abhixec/keymap.c b/keyboards/planck/keymaps/abhixec/keymap.c
deleted file mode 100644
index f8f5731ce21..00000000000
--- a/keyboards/planck/keymaps/abhixec/keymap.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define SHENT MT(MOD_RSFT, KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |shent |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    QK_GESC,  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, SHENT ,
-    _______,KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    QK_GESC,  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, SHENT ,
-     _______,KC_LCTL, KC_LALT,KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update(bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/abhixec/readme.md b/keyboards/planck/keymaps/abhixec/readme.md
deleted file mode 100644
index b7bccc52bb6..00000000000
--- a/keyboards/planck/keymaps/abhixec/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Abhixec's Layout
-
diff --git a/keyboards/planck/keymaps/abhixec/rules.mk b/keyboards/planck/keymaps/abhixec/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/abhixec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/abishalom/config.h b/keyboards/planck/keymaps/abishalom/config.h
deleted file mode 100644
index fbdc426d04a..00000000000
--- a/keyboards/planck/keymaps/abishalom/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/planck/keymaps/abishalom/keymap.c b/keyboards/planck/keymaps/abishalom/keymap.c
deleted file mode 100644
index 87af1d75e33..00000000000
--- a/keyboards/planck/keymaps/abishalom/keymap.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _NAV,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl| CAPS | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    LT(_NAV, KC_ESC),  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_CAPS, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |Pl/Ps |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Prev | Vol- | Vol+ | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  KC_MPLY,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPRV,    KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |Pl/Ps |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Prev | Vol- | Vol+ | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, KC_MPLY,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV,    KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-/* Nav
- * ,----------------------------------l-------------------------------------------------.
- * |      |      |      |      |      |      |      | Pg Dn|  Up  | Pg Up|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Mute |  Vol-| Vol+ | Pl/Ps|      |      | Left | Down | Right|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NAV] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_UP,  KC_PGUP, _______ ,  _______,
-    _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN,  KC_RIGHT, _______, _______,
-    _______, _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, _______, _______, KC_MPLY,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV,    KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/abishalom/readme.md b/keyboards/planck/keymaps/abishalom/readme.md
deleted file mode 100644
index 9978df19bec..00000000000
--- a/keyboards/planck/keymaps/abishalom/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Abishalom Planck Layout
-
-Mostly the same as default. Changes:
-- Get rid of COLEMAK and DVORAK layers
-- Add new layer (NAV) which is accessed by holding the ESC key. This brings up arrow keys in ijkl spots, along with handy media funcions in wasd.
-- Move left control to the corner, put caps lock between LCTRL and LGUI
-- Adjustments to media keys in bottom right corner
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/abishalom/rules.mk b/keyboards/planck/keymaps/abishalom/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/abishalom/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/adamtabrams/config.h b/keyboards/planck/keymaps/adamtabrams/config.h
deleted file mode 100644
index d47e552434a..00000000000
--- a/keyboards/planck/keymaps/adamtabrams/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2021 Adam Abrams
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// General Configs
-#define NO_ACTION_ONESHOT
-#define FORCE_NKRO
-#define TAPPING_TOGGLE 3
-
-// Mouse Configs
-#define MK_3_SPEED
-#define MK_MOMENTARY_ACCEL
-#define MK_C_OFFSET_1 6
-#define MK_C_OFFSET_UNMOD 16
-#define MK_C_OFFSET_2 26
-// for MK_W lower is faster
-#define MK_W_INTERVAL_UNMOD 80
-
-// Tap-Hold Configs
-#define TAPPING_TERM 180
-#define PERMISSIVE_HOLD
-#define HOLD_ON_OTHER_KEY_PRESS
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-#define QUICK_TAP_TERM 0
-#define QUICK_TAP_TERM_PER_KEY
diff --git a/keyboards/planck/keymaps/adamtabrams/keymap.c b/keyboards/planck/keymaps/adamtabrams/keymap.c
deleted file mode 100644
index ce1acd437b5..00000000000
--- a/keyboards/planck/keymaps/adamtabrams/keymap.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _SIMPLE,
-  _NUMBER,
-  _ARROWS,
-  _CURSOR,
-  _SYSTEM,
-  _KBOARD,
-  _FMWARE
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  SIMPLE,
-  NORMAL
-};
-
-#define ARROWS TT(_ARROWS)
-#define CURSOR TT(_CURSOR)
-#define SYSTEM TT(_SYSTEM)
-#define KBOARD MO(_KBOARD)
-#define FMWARE MO(_FMWARE)
-
-#define NUMSPAC LT(_NUMBER, KC_SPC)
-#define SHFTESC LSFT_T(KC_ESC)
-#define SFTENTR SFT_T(KC_ENT)
-
-#define ALT__A  ALT_T(KC_A)
-#define ALTSCLN ALT_T(KC_SCLN)
-#define ALT__O  ALT_T(KC_O)
-#define GUI__S  GUI_T(KC_S)
-#define GUI__L  GUI_T(KC_L)
-#define GUI__R  GUI_T(KC_R)
-#define GUI__I  GUI_T(KC_I)
-#define SFT__D  SFT_T(KC_D)
-#define SFT__K  SFT_T(KC_K)
-#define SFT__S  SFT_T(KC_S)
-#define SFT__E  SFT_T(KC_E)
-#define CTL__F  CTL_T(KC_F)
-#define CTL__J  CTL_T(KC_J)
-#define CTL__T  CTL_T(KC_T)
-#define CTL__N  CTL_T(KC_N)
-
-#define ALTRGHT A(KC_RGHT)
-#define ALTLEFT A(KC_LEFT)
-#define CTLRGHT C(KC_RGHT)
-#define CTLLEFT C(KC_LEFT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* ## Qwerty
-
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  -_  |
-| Bsp  | A(A) | G(S) | S(D) | C(F) |   G  |   H  | C(J) | S(K) | G(L) | A(;) |  '"  |
-|   !  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Enter|
-| CTRL |  GUI |  ALT |System|Cursor|S(Esc)|N(Spc)|Arrows| Left | Down |  Up  | Right|
- */
-
-[_QWERTY] = LAYOUT_planck_grid(
-    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_BSPC, ALT__A,  GUI__S,  SFT__D, CTL__F, KC_G,    KC_H,    CTL__J, SFT__K,  GUI__L,  ALTSCLN, KC_QUOT,
-    KC_EXLM, 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, SYSTEM, CURSOR, SHFTESC, NUMSPAC, ARROWS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* ## Colemak
-
-| Tab  |   Q  |   W  |   F  |   P  |   B  |   J  |   L  |   U  |   Y  |   ;  |  -_  |
-| Bsp  | A(A) | G(R) | S(S) | C(T) |   G  |   M  | C(N) | S(E) | G(I) | A(O) |  '"  |
-|   !  |   Z  |   X  |   C  |   D  |   V  |   K  |   H  |   ,  |   .  |   /  | Enter|
-| CTRL |  GUI |  ALT |System|Cursor|S(Esc)|N(Spc)|Arrows| Left | Down |  Up  | Right|
- */
-
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,   KC_P,   KC_B,    KC_J,    KC_L,   KC_U,    KC_Y,    KC_SCLN, KC_MINS,
-    KC_BSPC, ALT__A,  GUI__R,  SFT__S, CTL__T, KC_G,    KC_M,    CTL__N, SFT__E,  GUI__I,  ALT__O,  KC_QUOT,
-    KC_EXLM, KC_Z,    KC_X,    KC_C,   KC_D,   KC_V,    KC_K,    KC_H,   KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT, SYSTEM, CURSOR, SHFTESC, NUMSPAC, ARROWS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* ## Simple
-
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bsp  |
-| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '"  |
-| SHFT |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |S(Ent)|
-| CTRL |  GUI |  ALT |System|Cursor|  Spc |N(Spc)|Arrows| Left | Down |  Up  | Right|
- */
-
-[_SIMPLE] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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, SFTENTR,
-    KC_LCTL, KC_LGUI, KC_LALT, SYSTEM, CURSOR, KC_SPC,  NUMSPAC, ARROWS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* ## Number
-
-|      |  \|  |  &   |  =   |  +   |  @   |  %   |  #   |  *   |  $   |  ^   |      |
-|      |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |  \`  |
-|      |      |  [   |  {   |  (   |  ~   |  !   |  )   |  }   |  ]   |  \   |      |
-|      |      |      |      |      |      | \\/  |      |      |      |      |Normal|
- */
-
-[_NUMBER] = LAYOUT_planck_grid(
-    _______, KC_PIPE, KC_AMPR, KC_EQL,  KC_PLUS, KC_AT,   KC_PERC, KC_HASH, KC_ASTR, KC_DLR,  KC_CIRC, _______,
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
-    _______, XXXXXXX, KC_LBRC, KC_LCBR, KC_LPRN, KC_TILD, KC_EXLM, KC_RPRN, KC_RCBR, KC_RBRC, KC_BSLS, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NORMAL
-),
-
-
-/* ## Arrows
-
-|      |      |A(->) |      |      |A(<-) |      | P_Up | P_Up |C(->) |      |      |
-|      |      |      |P_Down|      |      | Left | Down |  Up  |Right |C(<-) |      |
-|      |      |      |      |P_Down|A(<-) |      |      |      |      |      |      |
-|      |      |      |      |      |      |      | \\/  |      |      |      |Normal|
- */
-
-[_ARROWS] = LAYOUT_planck_grid(
-    _______, _______, ALTRGHT, _______, _______, ALTLEFT, _______, KC_PGUP, KC_PGUP, CTLRGHT, _______, _______,
-    _______, _______, _______, KC_PGDN, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, CTLLEFT, _______,
-    _______, _______, _______, _______, KC_PGDN, ALTLEFT, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NORMAL
-),
-
-/* ## Cursor
-
-|      |      |      |Wh_Dn |M_Btn2|      |      |Wh_Dn |Wh_Dn |      |      |      |
-|      |M_Acc2|M_Acc1|Wh_Up |M_Btn1|      | M_L  |M_Down| M_Up | M_R  |      |      |
-|      |      |      |      |Wh_Up |      |      |      |      |      |      |      |
-|      |      |      |      | \\/  |      |      |      |      |      |      |Normal|
- */
-
-[_CURSOR] = LAYOUT_planck_grid(
-    _______, _______, _______, KC_WH_D, KC_BTN2, _______, _______, KC_WH_D, KC_WH_D, _______, _______, _______,
-    _______, KC_ACL2, KC_ACL1, KC_WH_U, KC_BTN1, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
-    _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NORMAL
-),
-
-/* ## System
-
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
-|      |      |Pr_Scn|Pr_Scn|      |      |Brght-| Vol- | Vol+ |Brght+| Mute |      |
-|      |      |      |      |      |      |      | Mute |P_Trac|N_Trac|      | Play |
-|KBoard|      |      | \\/  |      |      |      |      |Simple|Qwerty|Colemk|Normal|
- */
-
-[_SYSTEM] = LAYOUT_planck_grid(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    _______, XXXXXXX, KC_PSCR, KC_PSCR, XXXXXXX, XXXXXXX, KC_BRID, KC_VOLD, KC_VOLU, KC_BRIU, KC_MUTE, _______,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_MPRV, KC_MNXT, XXXXXXX, KC_MPLY,
-    KBOARD,  _______, _______, _______, _______, _______, _______, _______, SIMPLE,  QWERTY,  COLEMAK, NORMAL
-),
-
-/* ## KBoard
-
-|------|      |      |      |      |      |      |      |      |      |      |      |
-|      |      |      |      |      |      | Hue- | Sat- | Sat+ | Hue+ |Mode+ |      |
-|      |      |      |      |      |      |      |Mode- |Brght-|Brght+|      |RGB_Tg|
-| \\/  |      |      | \\/  |      |      |      |      |      |      |      |FMWare|
- */
-
-[_KBOARD] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD,  RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_VAD, RGB_VAI, XXXXXXX, RGB_TOG,
-    _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, FMWARE
-),
-
-/* ## FMWare
-
-|      |      |      |EEPROM|Reset |      |      |      |      |      |      |      |
-|      |      |Reset |Debug |      |      |      |      |      |      |      |      |
-|------|      |      |      |      |      |      |      |      |      |      |      |
-| \\/  |      |      | \\/  |      |      |      |      |      |      |      | \\/  |
- */
-
-[_FMWARE] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            set_single_persistent_default_layer(_QWERTY);
-            return true;
-
-        case COLEMAK:
-            set_single_persistent_default_layer(_COLEMAK);
-            return true;
-
-        case SIMPLE:
-            set_single_persistent_default_layer(_SIMPLE);
-            return true;
-
-        case NORMAL:
-            layer_clear();
-            return false;
-    }
-    return true;
-}
-
-uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case SHFTESC:
-        case NUMSPAC:
-        case SFTENTR:
-        case ALT__A:
-        case ALTSCLN:
-        case ALT__O:
-        case GUI__S:
-        case GUI__L:
-        case GUI__R:
-        case GUI__I:
-        case SFT__D:
-        case SFT__K:
-        case SFT__S:
-        case SFT__E:
-        case CTL__F:
-        case CTL__J:
-        case CTL__T:
-        case CTL__N:
-            return 0;
-        default:
-            return QUICK_TAP_TERM;
-    }
-}
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case ALT__A:
-        case ALTSCLN:
-        case ALT__O:
-        case GUI__S:
-        case GUI__L:
-        case GUI__R:
-        case GUI__I:
-        case SFT__D:
-        case SFT__K:
-        case SFT__S:
-        case SFT__E:
-        case CTL__F:
-        case CTL__J:
-        case CTL__T:
-        case CTL__N:
-            return false;
-        default:
-            return false;
-    }
-}
diff --git a/keyboards/planck/keymaps/adamtabrams/readme.md b/keyboards/planck/keymaps/adamtabrams/readme.md
deleted file mode 100644
index 6512cb7d7ab..00000000000
--- a/keyboards/planck/keymaps/adamtabrams/readme.md
+++ /dev/null
@@ -1,89 +0,0 @@
-## Normal - Qwerty
-
-|------|------|------|------|------|------|------|------|------|------|------|------|
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  -_  |
-| Bsp  | A(A) | G(S) | S(D) | C(F) |   G  |   H  | C(J) | S(K) | G(L) | A(;) |  '"  |
-|   !  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Enter|
-| CTRL |  GUI |  ALT |System|Cursor|S(Esc)|N(Spc)|Arrows| Left | Down |  Up  | Right|
-
-- The `N` in `N(Spc)` stands for Number layer
-- Hold down a layer key to temporarily activate or tap twice to toggle on or off
-
-## Normal - Colemak
-
-|------|------|------|------|------|------|------|------|------|------|------|------|
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| Tab  |   Q  |   W  |   F  |   P  |   B  |   J  |   L  |   U  |   Y  |   ;  |  -_  |
-| Bsp  | A(A) | G(R) | S(S) | C(T) |   G  |   M  | C(N) | S(E) | G(I) | A(O) |  '"  |
-|   !  |   Z  |   X  |   C  |   D  |   V  |   K  |   H  |   ,  |   .  |   /  | Enter|
-| CTRL |  GUI |  ALT |System|Cursor|S(Esc)|N(Spc)|Arrows| Left | Down |  Up  | Right|
-
-- The `N` in `N(Spc)` stands for Number layer
-- Hold down a layer key to temporarily activate or tap twice to toggle on or off
-
-## Normal - Simple
-
-|------|------|------|------|------|------|------|------|------|------|------|------|
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bsp  |
-| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '"  |
-| SHFT |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |S(Ent)|
-| CTRL |  GUI |  ALT |System|Cursor|  Spc |N(Spc)|Arrows| Left | Down |  Up  | Right|
-
-- The `N` in `N(Spc)` stands for Number layer
-- Hold down a layer key to temporarily activate or tap twice to toggle on or off
-
-## Number
-
-|------|------|------|------|------|------|------|------|------|------|------|------|
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|      |  \|  |  &   |  =   |  +   |  @   |  %   |  #   |  *   |  $   |  ^   |      |
-|      |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |  \`  |
-|      |      |  [   |  {   |  (   |  ~   |  !   |  )   |  }   |  ]   |  \   |      |
-|      |      |      |      |      |      | \\/  |      |      |      |      |Normal|
-
-## Arrows
-
-|------|------|------|------|------|------|------|------|------|------|------|------|
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|      |      |A(->) |      |      |A(<-) |      | P_Up | P_Up |C(->) |      |      |
-|      |      |      |P_Down|      |      | Left | Down |  Up  |Right |C(<-) |      |
-|      |      |      |      |P_Down|A(<-) |      |      |      |      |      |      |
-|      |      |      |      |      |      |      | \\/  |      |      |      |Normal|
-
-## Cursor
-
-|------|------|------|------|------|------|------|------|------|------|------|------|
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|      |      |      |Wh_Dn |M_Btn2|      |      |Wh_Dn |Wh_Dn |      |      |      |
-|      |M_Acc2|M_Acc1|Wh_Up |M_Btn1|      | M_L  |M_Down| M_Up | M_R  |      |      |
-|      |      |      |      |Wh_Up |      |      |      |      |      |      |      |
-|      |      |      |      | \\/  |      |      |      |      |      |      |Normal|
-
-## System
-
-|------|------|------|------|------|------|------|------|------|------|------|------|
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
-|      |      |Pr_Scn|Pr_Scn|      |      |Brght-| Vol- | Vol+ |Brght+| Mute |      |
-|      |      |      |      |      |      |      | Mute |P_Trac|N_Trac|      | Play |
-|KBoard|      |      | \\/  |      |      |      |      |Simple|Qwerty|Colemk|Normal|
-
-## KBoard
-
-|------|------|------|------|------|------|------|------|------|------|------|------|
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|------|      |      |      |      |      |      |      |      |      |      |      |
-|      |      |      |      |      |      | Hue- | Sat- | Sat+ | Hue+ |Mode+ |      |
-|      |      |      |      |      |      |      |Mode- |Brght-|Brght+|      |RGB_Tg|
-| \\/  |      |      | \\/  |      |      |      |      |      |      |      |FMWare|
-
-## FMWare
-
-|------|------|------|------|------|------|------|------|------|------|------|------|
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|      |      |      |EEPROM|Reset |      |      |      |      |      |      |      |
-|      |      |Reset |Debug |      |      |      |      |      |      |      |      |
-|------|      |      |      |      |      |      |      |      |      |      |      |
-| \\/  |      |      | \\/  |      |      |      |      |      |      |      | \\/  |
diff --git a/keyboards/planck/keymaps/adamtabrams/rules.mk b/keyboards/planck/keymaps/adamtabrams/rules.mk
deleted file mode 100644
index bbf6cc119e3..00000000000
--- a/keyboards/planck/keymaps/adamtabrams/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC += muse.c
-LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-NKRO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMMAND_ENABLE = no
-AUDIO_ENABLE = no
-ENCODER_ENABLE = no
-DIP_SWITCH_ENABLE = no
diff --git a/keyboards/planck/keymaps/altgr/beakl.h b/keyboards/planck/keymaps/altgr/beakl.h
deleted file mode 100644
index 650613a9d9c..00000000000
--- a/keyboards/planck/keymaps/altgr/beakl.h
+++ /dev/null
@@ -1,612 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .................................................................... BEAKL EZ
-#ifdef BEAKLEZ
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   K  | ^Alt | ^GUI |   F  |   G  |   R  |   C  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   "  | ↑Alt | ↑GUI |   L  |   S  |   T  |   N  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   ;  |   ,  |   J  |   .  |   X  | Caps |^Shift|   B  |   D  |   M  |   P  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_K,    CNTR_TL, CNTR_TR, KC_F,    KC_G,    KC_R,    KC_C,    KC_V   ,
-    KC_H,    KC_I,    KC_E,    HOME_A,  TD_QUOT, CNTR_HL, CNTR_HR, KC_L,    KC_S,    KC_T,    KC_N,    KC_W   ,
-    KC_SCLN, KC_COMM, KC_J,    KC_DOT,  KC_X,    CNTR_BL, CNTR_BR, KC_B,    KC_D,    KC_M,    KC_P,    KC_Z   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_K), CNTR_TL, CNTR_TR, S(KC_F), S(KC_G), S(KC_R), S(KC_C), S(KC_V),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), TD_QUOT, CNTR_HL, CNTR_HR, S(KC_L), S(KC_S), S(KC_T), S(KC_N), S(KC_W),
-    KC_SCLN, KC_COMM, S(KC_J), KC_DOT,  S(KC_X), CNTR_BL, CNTR_BR, S(KC_B), S(KC_D), S(KC_M), S(KC_P), S(KC_Z),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   K  | ^Alt | ^GUI |   F  |   G  |   R  |   C  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   "  | ↑Alt | ↑GUI |   L  |   S  |   T  |   N  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   :  |   ~  |   J  |   `  |   X  | Caps |^Shift|   B  |   D  |   M  |   P  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_K), CNTR_TL, CNTR_TR, S(KC_F), S(KC_G), S(KC_R), S(KC_C), S(KC_V),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), TD_DQOT, CNTR_HL, CNTR_HR, S(KC_L), S(KC_S), S(KC_T), S(KC_N), S(KC_W),
-    TD_COLN, TD_TILD, S(KC_J), TD_GRV,  S(KC_X), CNTR_BL, CNTR_BR, S(KC_B), S(KC_D), S(KC_M), S(KC_P), S(KC_Z),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   K  | ^Alt | ^GUI |   F  |   G  |   R  |   C  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   "  | ↑Alt | ↑GUI |   L  |   S  |   T  |   N  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   :  |   /  |   J  |   ?  |   X  | Caps |^Shift|   B  |   D  |   M  |   P  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_K), CNTR_TL, CNTR_TR, S(KC_F), S(KC_G), S(KC_R), S(KC_C), S(KC_V),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), TD_DQOT, CNTR_HL, CNTR_HR, S(KC_L), S(KC_S), S(KC_T), S(KC_N), S(KC_W),
-    TD_COLN, KC_SLSH, S(KC_J), KC_QUES, S(KC_X), CNTR_BL, CNTR_BR, S(KC_B), S(KC_D), S(KC_M), S(KC_P), S(KC_Z),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ..................................................................... BEAKL 8
-#ifdef BEAKL8
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   C  |   R  |   F  |   Z  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  | ↑Alt | ↑GUI |   D  |   S  |   T  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_X,    CNTR_TL, CNTR_TR, KC_G,    KC_C,    KC_R,    KC_F,    KC_Z   ,
-    KC_K,    KC_H,    KC_E,    HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_D,    KC_S,    KC_T,    KC_N,    KC_B   ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_W,    KC_M,    KC_L,    KC_P,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_C), S(KC_R), S(KC_F), S(KC_Z),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_D), S(KC_S), S(KC_T), S(KC_N), S(KC_B),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   C  |   R  |   F  |   Z  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ~  | ↑Alt | ↑GUI |   D  |   S  |   T  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   `  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_C), S(KC_R), S(KC_F), S(KC_Z),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), TD_TILD, CNTR_HL, CNTR_HR, S(KC_D), S(KC_S), S(KC_T), S(KC_N), S(KC_B),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), TD_GRV,  CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   C  |   R  |   F  |   Z  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   D  |   S  |   T  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_C), S(KC_R), S(KC_F), S(KC_Z),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_D), S(KC_S), S(KC_T), S(KC_N), S(KC_B),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// .................................................................... BEAKL 8P
-#ifdef BEAKL8P
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | ^Alt | ^GUI |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  | ↑Alt | ↑GUI |   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_R,    KC_F,    KC_X   ,
-    KC_K,    KC_H,    KC_E,    HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    KC_T,    KC_S,    KC_N,    KC_B   ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_W,    KC_M,    KC_L,    KC_P,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   {  |   }  |   $  | ^Alt | ^GUI |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   <  |   >  |   ~  | ↑Alt | ↑GUI |   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), KC_LCBR, KC_RCBR, KC_DLR,  CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_J), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | ^Alt | ^GUI |   ^  |   [  |   ]  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   |  |   (  |   )  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  | Caps |^Shift|   \  |   $  |   *  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, KC_CIRC, KC_LBRC, KC_RBRC, S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, S(KC_N), S(KC_B),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_DLR,  KC_ASTR, S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ................................................................... BEAKL 8TX
-#ifdef BEAKL8TX
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   J  | ^Alt | ^GUI |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  | ↑Alt | ↑GUI |   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   ;  |   "  |   I  |   ,  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_J,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_R,    KC_F,    KC_X   ,
-    HOME_K,  HOME_H,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_S,  HOME_N,  HOME_B ,
-    KC_Z,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_W,    KC_M,    KC_L,    KC_P,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_Z), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   $  |   {  |   }  |   J  | ^Alt | ^GUI |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   /  |   <  |   >  |   ~  | ↑Alt | ↑GUI |   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   :  |   !  |   =  |   `  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), KC_DLR,  KC_LCBR, KC_RCBR, S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), KC_SLSH, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   J  | ^Alt | ^GUI |   G  |   [  |   ]  |   ^  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   |  |   (  |   )  |   $  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   :  |   "  |   I  |   /  | Caps |^Shift|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), KC_LBRC, KC_RBRC, KC_CIRC, S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  S(KC_B),
-    S(KC_Z), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ................................................................... BEAKL 8TT
-#ifdef BEAKL8TT
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   J  |   Fn | Caps |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  |Cursor| Mouse|   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   ;  |   "  |   I  |   ,  |  Num | Regex|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_J,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_R,    KC_F,    KC_X   ,
-    HOME_K,  HOME_H,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_S,  HOME_N,  HOME_B ,
-    KC_Z,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_W,    KC_M,    KC_L,    KC_P,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_Z), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   $  |   {  |   }  |   J  |   Fn | Caps |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   /  |   <  |   >  |   ~  |Cursor| Mouse|   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   :  |   !  |   =  |   `  |  Num | Regex|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), KC_DLR,  KC_LCBR, KC_RCBR, S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), KC_SLSH, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   J  |   Fn | Caps |   G  |   [  |   ]  |   ^  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  |Cursor| Mouse|   |  |   (  |   )  |   $  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   :  |   "  |   I  |   /  |  Num | Regex|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), KC_LBRC, KC_RBRC, KC_CIRC, S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  S(KC_B),
-    S(KC_Z), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// .................................................................... BEAKL 10
-#ifdef BEAKL10
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   H  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   D  |   N  |   M  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   Y  |   I  |   E  |   A  |   .  | ↑Alt | ↑GUI |   C  |   S  |   R  |   T  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   ,  |   Z  | Caps |^Shift|   B  |   P  |   L  |   F  |   K  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_H,    KC_O,    KC_U,    KC_X,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_V   ,
-    KC_Y,    KC_I,    KC_E,    HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    KC_S,    KC_R,    KC_T,    KC_W   ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_COMM, KC_Z,    CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_K   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_H), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_V),
-    S(KC_Y), S(KC_I), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_S), S(KC_R), S(KC_T), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, KC_COMM, S(KC_Z), CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_K),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   [  |   !  |   ]  |   X  | ^Alt | ^GUI |   G  |   D  |   N  |   M  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   Y  |   <  |   =  |   >  |   ~  | ↑Alt | ↑GUI |   C  |   S  |   R  |   T  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   `  |   Z  | Caps |^Shift|   B  |   P  |   L  |   F  |   K  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), TD_LBRC, KC_EXLM, TD_RBRC, S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_V),
-    S(KC_Y), TD_LT,   KC_EQL,  TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_S), S(KC_R), S(KC_T), S(KC_W),
-    S(KC_J), KC_COLN, TD_DQOT, TD_GRV,  S(KC_Z), CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_K),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   H  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   {  |   +  |   }  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   Y  |   I  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   C  |   (  |   *  |   )  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   /  |   Z  | Caps |^Shift|   B  |   P  |   L  |   F  |   K  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_H), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), TD_LCBR, KC_PLUS, TD_RCBR, S(KC_V),
-    S(KC_Y), S(KC_I), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), TD_LPRN, KC_ASTR, TD_RPRN, S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, KC_SLSH, S(KC_Z), CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_K),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ............................................................... BEAKL Mash Up
-#ifdef BEAKL810
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | ^Alt | ^GUI |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  | ↑Alt | ↑GUI |   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  | Caps |^Shift|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_X   ,
-    KC_K,    KC_H,    KC_E,    HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    KC_T,    KC_R,    KC_S,    KC_W   ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   {  |   }  |   $  | ^Alt | ^GUI |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   <  |   >  |   ~  | ↑Alt | ↑GUI |   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  | Caps |^Shift|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), KC_LCBR, KC_RCBR, KC_DLR,  CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | ^Alt | ^GUI |   ^  |   [  |   ]  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   |  |   (  |   )  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  | Caps |^Shift|   \  |   $  |   *  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, KC_CIRC, KC_LBRC, KC_RBRC, S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, S(KC_S), S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_DLR,  KC_ASTR, S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// .................................................................... BEAKL MU
-#ifdef BEAKLMU
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  |  Fn  | Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_X   ,
-    HOME_K,  HOME_H,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_R,  HOME_S,  HOME_W ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   $  |   {  |   }  |   Z  |  Fn  | Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   /  |   <  |   >  |   ~  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), KC_DLR,  KC_LCBR, KC_RCBR, S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), KC_SLSH, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  |  Fn  | Caps |   G  |   [  |   ]  |   ^  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  |Cursor| Mouse|   |  |   (  |   )  |   $  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  |  Num | Regex|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), KC_LBRC, KC_RBRC, KC_CIRC, S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// .................................................................... BEAKL SP
-#ifdef BEAKLSP
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Ins | Left |  Ent | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_X   ,
-    HOME_K,  HOME_H,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_R,  HOME_S,  HOME_W ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   [  |   ]  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   ^  |   <  |   >  |   ~  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | ↑Tab |  f() |  Ins | Left |   _  |  Del | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), KC_LBRC, KC_RBRC, S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), KC_CIRC, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  S_TAB,   ___fn__, LT_INS,  S_LEFT,  KC_UNDS, SP_DEL,  S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   {  |   }  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  |Cursor| Mouse|   |  |   (  |   )  |   $  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  |  Num | Regex|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Tab |   -  |  Ins | Left |  f() | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), KC_LCBR, KC_RCBR, S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_TAB,  KC_MINS, LT_INS,  S_LEFT,  ___fn__, SP_BSPC, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// .................................................................... BEAKL GR
-#ifdef BEAKLGR
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Ins | Left |  Ent | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_X   ,
-    HOME_K,  HOME_H,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_R,  HOME_S,  HOME_W ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   [  |   ]  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   ^  |   <  |   >  |   ~  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | ↑Tab |  f() |  Ins | Left |   _  |  Del | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), KC_LBRC, KC_RBRC, S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    SM_K,    KC_CIRC, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  S_TAB,   ___fn__, LT_INS,  S_LEFT,  KC_UNDS, SP_DEL,  S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   {  |   }  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  |Cursor| Mouse|   |  |   (  |   )  |   $  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  |  Num | Regex|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Tab |   -  |  Ins | Left |  f() | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), KC_LCBR, KC_RCBR, S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  SM_W   ,
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_TAB,  KC_MINS, LT_INS,  S_LEFT,  ___fn__, SP_BSPC, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
diff --git a/keyboards/planck/keymaps/altgr/colemak.h b/keyboards/planck/keymaps/altgr/colemak.h
deleted file mode 100644
index 694f1632895..00000000000
--- a/keyboards/planck/keymaps/altgr/colemak.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .............................................................. Colemak Mod-DH
-#ifdef COLEMAK
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   F  |   P  |   B  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   ;  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   G  | ↑Alt | ↑GUI |   M  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   D  |   V  | Caps |^Shift|   K  |   H  |   ,  |   .  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    CNTR_TL, CNTR_TR, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    CNTR_HL, CNTR_HR, KC_M,    KC_N,    KC_E,    KC_I,    KC_O   ,
-    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    CNTR_BL, CNTR_BR, KC_K,    KC_H,    KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_B), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_SCLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_G), CNTR_HL, CNTR_HR, S(KC_M), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_D), S(KC_V), CNTR_BL, CNTR_BR, S(KC_K), S(KC_H), KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   F  |   P  |   B  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   :  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   G  | ↑Alt | ↑GUI |   M  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   D  |   V  | Caps |^Shift|   K  |   H  |   /  |   ?  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   -  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_B), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), TD_COLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_G), CNTR_HL, CNTR_HR, S(KC_M), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_D), S(KC_V), CNTR_BL, CNTR_BR, S(KC_K), S(KC_H), KC_SLSH, KC_QUES, TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_MINS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   F  |   P  |   B  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   :  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   G  | ↑Alt | ↑GUI |   M  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   D  |   V  | Caps |^Shift|   K  |   H  |   ~  |   `  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   _  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_B), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), TD_COLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_G), CNTR_HL, CNTR_HR, S(KC_M), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_D), S(KC_V), CNTR_BL, CNTR_BR, S(KC_K), S(KC_H), TD_TILD, TD_GRV,  TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_UNDS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ..................................................................... ColemaX
-#ifdef COLEMAX
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   C  |   G  |   Z  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   ;  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   B  | ↑Alt | ↑GUI |   K  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   X  |   V  |   F  |   D  |   P  | Caps |^Shift|   M  |   H  |   ,  |   .  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_W,    KC_C,    KC_G,    KC_Z,    CNTR_TL, CNTR_TR, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-    KC_A,    KC_R,    KC_S,    KC_T,    KC_B,    CNTR_HL, CNTR_HR, KC_K,    KC_N,    KC_E,    KC_I,    KC_O   ,
-    KC_X,    KC_V,    KC_F,    KC_D,    KC_P,    CNTR_BL, CNTR_BR, KC_M,    KC_H,    KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_C), S(KC_G), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_SCLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_B), CNTR_HL, CNTR_HR, S(KC_K), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_X), S(KC_V), S(KC_F), S(KC_D), S(KC_P), CNTR_BL, CNTR_BR, S(KC_M), S(KC_H), KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   C  |   G  |   Z  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   :  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   B  | ↑Alt | ↑GUI |   K  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   X  |   V  |   F  |   D  |   P  | Caps |^Shift|   M  |   H  |   /  |   ?  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   -  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_C), S(KC_G), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), TD_COLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_B), CNTR_HL, CNTR_HR, S(KC_K), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_X), S(KC_V), S(KC_F), S(KC_D), S(KC_P), CNTR_BL, CNTR_BR, S(KC_M), S(KC_H), KC_SLSH, KC_QUES, TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_MINS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   C  |   G  |   Z  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   :  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   B  | ↑Alt | ↑GUI |   K  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   X  |   V  |   F  |   D  |   P  | Caps |^Shift|   M  |   H  |   ~  |   `  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   _  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_C), S(KC_G), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), TD_COLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_B), CNTR_HL, CNTR_HR, S(KC_K), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_X), S(KC_V), S(KC_F), S(KC_D), S(KC_P), CNTR_BL, CNTR_BR, S(KC_M), S(KC_H), TD_TILD, TD_GRV,  TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_UNDS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
diff --git a/keyboards/planck/keymaps/altgr/common/chord_layout.h b/keyboards/planck/keymaps/altgr/common/chord_layout.h
deleted file mode 100644
index cb1b7f67855..00000000000
--- a/keyboards/planck/keymaps/altgr/common/chord_layout.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .................................................................. Short Cuts
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      | Copy | Paste|      |      |      |      |      |      |      |      |
-  // |--------------------------------------------------------------+------+------+------|
-  // | Undo |  Cut | Copy | Paste|      |      |      |      | PRIV |  PUB |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |  Nak |  Eot |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |  f() |      |      |      |      |      |
-  // |      |      |      |      |      |      |      |  f() |      |      |      |      | see _PLOVER
-  // '-----------------------------------------------------------------------------------'
-
-  [_EDIT] = LAYOUT_planck_grid(
-    _______, _______, TMCOPY,  TMPASTE, _______, _______, _______, _______, _______, _______, _______, _______,
-    UNDO,    CUT,     COPY,    PASTE,   _______, _______, _______, _______, TD_PRIV, TD_SEND, _______, _______,
-    _______, _______, NAK,     EOT,     _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, ___fn__, ___fn__, _______, _______, _______, _______
-  ),
-
-// ................................................................ Adjust Layer
-
-  // ,-----------------------------------------------------------------------------------.
-  // |Plover|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |Aud on|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Reset|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |      |      |      |  f() |      |      |      |      |  f() |      |      |      |
-  // `-----------------------------------------------------------------------------------'
-
-  [_ADJUST] = LAYOUT_planck_grid(
-    PLOVER,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    AU_ON,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/altgr/common/init.h b/keyboards/planck/keymaps/altgr/common/init.h
deleted file mode 100644
index e6bb7101e92..00000000000
--- a/keyboards/planck/keymaps/altgr/common/init.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// ....................................................................... Audio
-
-void matrix_init_user(void)
-{
-#ifdef STENO_ENABLE
-  steno_set_mode(STENO_MODE_BOLT);          // or STENO_MODE_GEMINI
-#endif
-}
-
-#ifdef AUDIO_ENABLE
-#ifdef BACKLIGHT_ENABLE
-bool led_update_user(led_t led_state)
-{
-  static led_t old_led_state = {0};
-  _delay_ms(10);                            // gets rid of tick
-  if (!is_playing_notes()) {
-    if (led_state.caps_lock && !old_led_state.caps_lock) {
-      // if capslock LED is turning on
-      PLAY_SONG(song_caps_on);
-    }
-    else if (!led_state.caps_lock && old_led_state.caps_lock) {
-      // if capslock LED is turning off
-      PLAY_SONG(song_caps_off);
-    }
-  }
-  old_led_state = led_state;
-  return false;
-}
-#endif
-#endif
diff --git a/keyboards/planck/keymaps/altgr/common/keycode_functions.h b/keyboards/planck/keymaps/altgr/common/keycode_functions.h
deleted file mode 100644
index 1aed08b37ae..00000000000
--- a/keyboards/planck/keymaps/altgr/common/keycode_functions.h
+++ /dev/null
@@ -1,657 +0,0 @@
-
-// .......................................................... Keycode Primitives
-
-// register simple key press
-void tap_key(uint16_t keycode)
-{
-  register_code  (keycode);
-  unregister_code(keycode);
-}
-
-void shift_key(uint16_t keycode)
-{
-  register_code  (KC_LSFT);
-  tap_key        (keycode);
-  unregister_code(KC_LSFT);
-}
-
-#define SHIFT   1
-#define NOSHIFT 0
-
-static uint16_t key_timer = 0;
-
-// key press for thumb_layer() and lt_shift() macros
-bool key_press(uint8_t shift, uint16_t keycode)
-{
-  if (keycode) {
-    if (timer_elapsed(key_timer) < TAPPING_TERM) {
-      if (shift) {
-        shift_key(keycode);
-      }
-      else {
-        tap_key(keycode);
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-// ALT_T, CTL_T, GUI_T, SFT_T for shifted keycodes
-void mt_shift(keyrecord_t *record, uint16_t modifier, uint16_t modifier2, uint16_t keycode)
-{
-  if (record->event.pressed) {
-    key_timer = timer_read();
-    register_code(modifier);
-    if (modifier2) {
-      register_code(modifier2);
-    }
-  }
-  else {
-    unregister_code(modifier);
-    if (modifier2) {
-      unregister_code(modifier2);
-    }
-    if (timer_elapsed(key_timer) < TAPPING_TERM) {
-      shift_key(keycode);
-    }
-    key_timer = 0;
-  }
-}
-
-// ................................................................... Mod Masks
-
-// tap dance persistant mods, see process_record_user()
-// keyboard_report->mods (?) appears to be cleared by tap dance
-static uint8_t mods = 0;
-
-void tap_mods(keyrecord_t *record, uint16_t keycode)
-{
-  if (record->event.pressed) {
-    mods |= MOD_BIT(keycode);
-  }
-  else {
-    mods &= ~(MOD_BIT(keycode));
-  }
-}
-
-// (un)register modifiers
-void modifier(void (*f)(uint8_t))
-{
-  if (mods & MOD_BIT(KC_LCTL)) {
-    (*f)(KC_LCTL);
-  }
-  if (mods & MOD_BIT(KC_LGUI)) {
-    (*f)(KC_LGUI);
-  }
-  if (mods & MOD_BIT(KC_LALT)) {
-    (*f)(KC_LALT);
-  }
-}
-
-// .................................................... Triple Dance Shift/Layer
-
-static uint8_t dt_shift = 0;
-
-void double_shift(uint16_t keycode, uint8_t layer)
-{
-  tap_key (keycode);
-  if (DT_SHIFT) {
-    // set_oneshot_mods(MOD_LSFT);
-    // layer_on(layer);
-    layer_on         (_SHIFT);
-    set_oneshot_layer(_SHIFT, ONESHOT_START);
-    dt_shift = 1;
-  }
-  else {
-    layer_on(layer);
-  }
-}
-
-// tap dance LT (LAYER, KEY) emulation with <KEY><DOWN> -> <KEY><SHIFT> and auto-repeat extensions!
-void tap_shift(tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
-{
-  // double tap plus down
-  if (state->count > 2) {
-    // double enter shift
-    if (keycode == KC_ENT) {
-      tap_key     (keycode);
-      double_shift(keycode, layer);
-    }
-    // repeating keycode
-    else {
-      register_code(keycode);
-    }
-  }
-  // tap plus down (or double tap): keycode (one shot) shift
-  else if (state->count > 1) {
-    double_shift(keycode, layer);
-  }
-  // down: shift
-  else if (state->pressed) {
-    layer_on(layer);
-  }
-  // tap: keycode
-  else {
-    modifier(register_code);
-    tap_key (keycode);
-    modifier(unregister_code);
-  }
-}
-
-void tap_reset(uint16_t keycode, uint8_t layer)
-{
-  unregister_code(keycode);
-  if (DT_SHIFT && dt_shift) {
-    clear_oneshot_layer_state(ONESHOT_PRESSED);
-    dt_shift = 0;
-  }
-  else {
-    layer_off(layer);
-  }
-}
-
-// augment pseudo LT (_RSHIFT, KC_ENT) handling below for rapid <ENTER><SHIFT> sequences
-void enter(tap_dance_state_t *state, void *user_data)
-{
-  tap_shift(state, KC_ENT, _RSHIFT);
-}
-
-void enter_reset(tap_dance_state_t *state, void *user_data)
-{
-  tap_reset(KC_ENT, _RSHIFT);
-}
-
-// augment pseudo LT (_LSHIFT, KC_SPC) handling below for rapid <SPACE><SHIFT> sequences
-void space(tap_dance_state_t *state, void *user_data)
-{
-  tap_shift(state, KC_SPC, _LSHIFT);
-}
-
-void space_reset(tap_dance_state_t *state, void *user_data)
-{
-  tap_reset(KC_SPC, _LSHIFT);
-}
-
-// ......................................................... Triple Dance Insert
-
-void double_max(uint8_t count, uint8_t shift, uint16_t keycode)
-{
-  if (shift) {
-    shift_key(keycode);
-    if (count > 1) {
-      shift_key(keycode);
-    }
-  }
-  else {
-    tap_key(keycode);
-    if (count > 1) {
-      tap_key(keycode);
-    }
-  }
-}
-
-void colon(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    shift_key(KC_SCLN);
-    shift_key(KC_SCLN);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_SCLN);
-  }
-  reset_tap_dance(state);
-}
-
-void eql(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key(KC_SPC);
-    tap_key(KC_SLSH);
-    tap_key(KC_EQL);
-    tap_key(KC_SPC);
-  }
-  else {
-    double_max(state->count, NOSHIFT, KC_EQL);
-  }
-  reset_tap_dance(state);
-}
-
-void greater(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    tap_key  (KC_MINS);
-    shift_key(KC_DOT);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_DOT);
-  }
-  reset_tap_dance(state);
-}
-
-void lesser(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    shift_key(KC_COMM);
-    tap_key  (KC_MINS);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_COMM);
-  }
-  reset_tap_dance(state);
-}
-
-void tilde(tap_dance_state_t *state, void *user_data)
-{
-  // double tap plus down: repeating keycode
-  if (state->count > 2) {
-    register_code(KC_LSFT);
-    register_code(KC_GRV);
-  }
-  // tap: keycode
-  else {
-    shift_key(KC_GRV);
-    // double tap: unix home directory
-    if (state->count > 1) {
-      tap_key(KC_SLSH);
-    }
-  }
-}
-
-void tilde_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_GRV);
-  unregister_code(KC_LSFT);
-}
-
-// ............................................................. Tap Dance Pairs
-
-// tap dance shift rules
-#define S_NEVER  0
-#define S_SINGLE 1
-#define S_DOUBLE 2
-#define S_ALWAYS S_SINGLE | S_DOUBLE
-
-void symbol_pair(uint8_t shift, uint16_t left, uint16_t right)
-{
-  if (shift & S_DOUBLE) {
-    shift_key(left);
-    shift_key(right);
-  }
-  else {
-    tap_key(left);
-    tap_key(right);
-  }
-}
-
-#define CLOSE 1
-
-// tap dance symbol pairs
-void tap_pair(tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
-{
-  // triple tap: left right with cursor between symbol pair a la vim :-)
-  if (state->count > 2) {
-    symbol_pair(shift, left, right);
-    tap_key    (KC_LEFT);
-  }
-  // double tap: left right
-  else if (state->count > 1) {
-    symbol_pair(shift, left, right);
-  }
-  // down: modifier
-  else if (state->pressed) {
-    if (modifier) {
-      register_code(modifier);
-    }
-  }
-  // tap: left (close: right)
-  else {
-    if (shift & S_SINGLE) {
-      shift_key(close ? right : left);
-    }
-    else {
-      tap_key(close ? right : left);
-    }
-  }
-  if (!modifier) {
-    reset_tap_dance(state);
-  }
-}
-
-void doublequote(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_QUOT, KC_QUOT, 0, 0);
-}
-
-void grave(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_GRV, KC_GRV, 0, 0);
-}
-
-void lbrace(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, 0);
-}
-
-void lcurly(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, 0);
-}
-
-void lparen(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_9, KC_0, KC_LCTL, 0);
-}
-
-void lparen_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LCTL);
-}
-
-void quote(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_QUOT, KC_QUOT, 0, 0);
-}
-
-void rangle(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_COMM, KC_DOT, 0, CLOSE);
-}
-
-void rbrace(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, CLOSE);
-}
-
-void rcurly(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, CLOSE);
-}
-
-void rparen(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_9, KC_0, 0, CLOSE);
-}
-
-void rparen_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LCTL);
-}
-
-// ............................................................ Tap Dance Insert
-
-void comma(tap_dance_state_t *state, void *user_data)
-{
-  tap_key(KC_COMM);
-  if (state->count > 1) {
-    tap_key(KC_SPC);
-  }
-  reset_tap_dance(state);
-}
-
-void dot(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    shift_key(KC_COLN);
-  }
-  else {
-    tap_key(KC_DOT);
-  }
-  reset_tap_dance(state);
-}
-
-// compile time macro string, see functions/hardware planck script
-void private(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-#ifdef PRIVATE_STRING
-#include "private_string.h"
-#endif
-  }
-  reset_tap_dance(state);
-}
-
-// config.h defined string
-void send(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    SEND_STRING(PUBLIC_STRING);
-  }
-  reset_tap_dance(state);
-}
-
-// .......................................................... Tap Dance One Shot
-
-void caps(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    tap_key(KC_CAPS);
-  }
-  else {
-    set_oneshot_mods(MOD_LSFT);
-    register_code   (KC_LSFT);              // on hold down
-  }
-}
-
-void caps_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LSFT);
-}
-
-// ................................................................... Tap Dance
-
-tap_dance_action_t tap_dance_actions[] = {
-  [_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps, caps_reset)
- ,[_COLN] = ACTION_TAP_DANCE_FN         (colon)
- ,[_COMM] = ACTION_TAP_DANCE_FN         (comma)
- ,[_DOT]  = ACTION_TAP_DANCE_FN         (dot)
- ,[_DQOT] = ACTION_TAP_DANCE_FN         (doublequote)
- ,[_ENT]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, enter, enter_reset)
- ,[_EQL]  = ACTION_TAP_DANCE_FN         (eql)
- ,[_GRV]  = ACTION_TAP_DANCE_FN         (grave)
- ,[_GT]   = ACTION_TAP_DANCE_FN         (greater)
- ,[_LBRC] = ACTION_TAP_DANCE_FN         (lbrace)
- ,[_LCBR] = ACTION_TAP_DANCE_FN         (lcurly)
- ,[_LPRN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lparen, lparen_reset)
- ,[_LT]   = ACTION_TAP_DANCE_FN         (lesser)
- ,[_PRIV] = ACTION_TAP_DANCE_FN         (private)
- ,[_QUOT] = ACTION_TAP_DANCE_FN         (quote)
- ,[_RBRC] = ACTION_TAP_DANCE_FN         (rbrace)
- ,[_RCBR] = ACTION_TAP_DANCE_FN         (rcurly)
- ,[_RNGL] = ACTION_TAP_DANCE_FN         (rangle)
- ,[_RPRN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rparen, rparen_reset)
- ,[_SEND] = ACTION_TAP_DANCE_FN         (send)
- ,[_SPC]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, space, space_reset)
- ,[_TILD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tilde, tilde_reset)
-};
-
-// .............................................................. Dynamic Layers
-
-#define        LEFT    1
-#define        RIGHT   2
-static uint8_t thumb = 0;
-
-// LEFT (KC_SPC, S(KC_BSLS)), RIGHT (KC_LEFT, S(KC_LEFT)) opposite thumb combinations, see process_record_user()
-// up,   up   -> _BASE
-// up,   down -> _SYMBOL
-// down, up   -> _NUMBER
-// down, down -> _MOUSE                     // see layer keycodes that raise mouse layer
-#define THUMBS_DOWN _MOUSE                  // layer
-
-static uint8_t overlayer = 0;
-
-// left right thumb layer combinations
-void thumb_layer(keyrecord_t *record, uint8_t side, uint8_t shift, uint16_t keycode, uint8_t thumb_dn_layer, uint8_t thumb_up_layer)
-{
-  if (record->event.pressed) {
-    // layer_on via tap_layer(), see process_record_user()
-    key_timer = timer_read();
-    thumb     = thumb | side;
-  }
-  else {
-    layer_off(thumb_dn_layer);
-    // opposite thumb_layer() thumb may have switched effective layer!
-    if (overlayer) {
-      layer_off(overlayer);
-      overlayer = 0;
-    }
-    if (!key_press(shift, keycode)) {
-      layer_off(THUMBS_DOWN);               // both thumbs needed
-      // opposite thumb down? see left right combination layer table above
-      if (thumb & (side == LEFT ? RIGHT : LEFT)) {
-        layer_on(thumb_up_layer);
-        overlayer = thumb_up_layer;
-      }
-    }
-    clear_mods();
-    thumb     = thumb & ~side;
-    key_timer = 0;
-  }
-}
-
-// #ifdef STENO_ENABLE
-// // LT for steno keycode
-// void stn_layer(keyrecord_t *record, uint16_t keycode, uint8_t layer)
-// {
-//   if (record->event.pressed) {
-//     key_timer = timer_read();
-//     if (keycode) {
-//       process_steno(keycode, record);
-//     }
-//     layer_on(layer);
-//   }
-//   else {
-//     layer_off(layer);
-//     if (keycode) {
-//       if (timer_elapsed(key_timer) < TAPPING_TERM) {
-//         process_steno(keycode, record);
-//       }
-//       else {
-//         // clear pressed state (request push of updated) process_steno.c and .h
-//         // steno_clear_state();
-//       }
-//     }
-//     key_timer = 0;
-//   }
-// }
-// #endif
-
-// LT for S(keycode)
-void lt_shift(keyrecord_t *record, uint16_t keycode, uint8_t layer)
-{
-  if (record->event.pressed) {
-    key_timer = timer_read();
-    layer_on(layer);
-  }
-  else {
-    layer_off(layer);
-    // for shifted keycodes, hence, LT_SHIFT
-    key_press(SHIFT, keycode);
-    clear_mods();
-    key_timer = 0;
-  }
-}
-
-// set layer asap to overcome macro latency errors, notably tap dance and LT usage
-// this routine inexplicably (?) sets layer_on() faster than can be done in thumb_layer()
-void tap_layer(keyrecord_t *record, uint8_t layer)
-{
-  if (record->event.pressed) {
-    layer_on(layer);
-  }
-  else {
-    layer_off(layer);
-  }
-}
-
-// ..................................................................... Keymaps
-
-// void persistant_default_layer_set(uint16_t default_layer)
-// {
-//   eeconfig_update_default_layer(default_layer);
-//   default_layer_set            (default_layer);
-// }
-
-void clear_layers(void)
-{
-  uint8_t layer;
-  for (layer = 0; layer < _END_LAYERS; layer++) {
-    layer_off(layer);
-  }
-}
-
-#ifdef CENTER_TT
-static uint16_t tt_keycode = 0;             // current TT keycode
-
-void clear_tt(void)
-{
-  if (tt_keycode == KC_CAPS) {
-    tap_key(KC_CAPS);                       // clear capslock
-  }
-  tt_keycode = 0;
-  clear_layers();
-  set_single_persistent_default_layer(_BASE);
-}
-#endif
-
-// txbolt plover run state
-static uint8_t plover = 0;
-
-void toggle_plover(uint8_t state)
-{
-  if (plover != state) {
-#ifdef PLOVER_KEYBIND
-#include "plover_keybind.h"
-#endif
-    plover = state;
-  }
-}
-
-void base_layer(void)
-{
-#ifdef AUDIO_ENABLE
-  if (plover) {
-    PLAY_SONG(song_plover_gb);
-  }
-  else {
-    PLAY_SONG(song_qwerty);
-  }
-#endif
-  clear_layers();
-  set_single_persistent_default_layer(_BASE);
-  toggle_plover(0);
-}
-
-void steno(keyrecord_t *record)
-{
-  if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-    PLAY_SONG(song_plover);
-#endif
-    clear_layers();
-    layer_on(_PLOVER);
-    if (!eeconfig_is_enabled()) {
-      eeconfig_init();
-    }
-    keymap_config.raw  = eeconfig_read_keymap();
-    keymap_config.nkro = 1;
-    eeconfig_update_keymap(keymap_config.raw);
-    if (!plover) {
-      toggle_plover(1);
-    }
-  }
-}
-
-void steno_exit(keyrecord_t *record)
-{
-  if (record->event.pressed) {
-    base_layer();
-    toggle_plover(0);
-  }
-}
diff --git a/keyboards/planck/keymaps/altgr/common/number_fkey_layout.h b/keyboards/planck/keymaps/altgr/common/number_fkey_layout.h
deleted file mode 100644
index 102d736acb7..00000000000
--- a/keyboards/planck/keymaps/altgr/common/number_fkey_layout.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ......................................................... Number Keypad Layer
-#ifdef SHIFT_SYMBOLS
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   G  |   \  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() |      |      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_GUI,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0,    LT_EQL,  ___x___, ___x___, ___x___
-#else
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL,  LT_0,    ___x___, ___x___, ___x___
-#endif
-  ),
-#else
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   X  |   G  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |  f() |      |   0  |   =  |                           |
-  // |                           |  f() |      |   =  |   0  |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, _______, _______, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_GUI,  GT_C,    AT_B,    LT_A,    _______, _______, _______, KC_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, MT_X,    S(KC_G), _______, _______, _______, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0,    LT_EQL,  ___x___, ___x___, ___x___
-#else
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL,  LT_0,    ___x___, ___x___, ___x___
-#endif
-  ),
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |   {  |   &  |   ?  |   :  |   }  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   (  |   $  |   %  |   ^  |   )  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |   [  |   <  |   ~  |   >  |   ]  |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |  f() |      |   \  |   |  |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMSYM] = LAYOUT_planck_grid(
-    _______, _______, _______, ___x___, _______, _______, _______, TD_LCBR, KC_AMPR, KC_QUES, KC_COLN, KC_RCBR,
-    ___x___, ___x___, ___x___, ___fn__, _______, _______, _______, TD_LPRN, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN,
-    _______, _______, _______, ___x___, _______, _______, _______, TD_LBRC, KC_LT,   KC_TILD, KC_GT,   KC_RBRC,
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_BSLS, KC_PIPE, ___x___, ___x___, ___x___
-  ),
-#endif
-
-// ............ .................................................. Function Keys
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      |  F7  |  F8  |  F9  |  F12 |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |  GUI |  Alt | Shift|      |      |      |      |  F4  |  F5  |  F6  |  F11 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F10 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |  f() |      |   +  |      |      |      |      |
-  // |      |      |      |      |  f() |      |      |   +  |      |      |      |      | see _PLOVER
-  // '-----------------------------------------------------------------------------------'
-
-  [_FNCKEY] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 ,
-    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 ,
-    _______, _______, _______, _______, ___fn__, ___fn__, _______, KC_PLUS, _______, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/altgr/common/number_fkey_layout.save.h b/keyboards/planck/keymaps/altgr/common/number_fkey_layout.save.h
deleted file mode 100644
index 7022863724e..00000000000
--- a/keyboards/planck/keymaps/altgr/common/number_fkey_layout.save.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ......................................................... Number Keypad Layer
-#ifdef SHIFT_SYMBOLS
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   G  |   \  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() |      |      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMBER] = {
-    {_______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR},
-    {OS_CTL,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS},
-    {_______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS},
-#ifdef THUMB_0
-    {___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0,    LT_EQL,  ___x___, ___x___, ___x___},
-#else
-    {___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL,  LT_0,    ___x___, ___x___, ___x___},
-#endif
-  },
-#else
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   X  |   G  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() |      |      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMBER] = {
-    {_______, KC_F,    MT_E,    KC_D,    _______, _______, _______, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR},
-    {OS_CTL,  GT_C,    AT_B,    LT_A,    _______, _______, _______, KC_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS},
-    {_______, KC_HASH, MT_X,    S(KC_G), _______, _______, _______, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS},
-#ifdef THUMB_0
-    {___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0,    LT_EQL,  ___x___, ___x___, ___x___},
-#else
-    {___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL,  LT_0,    ___x___, ___x___, ___x___},
-#endif
-  },
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |   {  |   &  |   ?  |   :  |   }  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   (  |   $  |   %  |   ^  |   )  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |   [  |   <  |   ~  |   >  |   ]  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   \  |   |  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMSYM] = {
-    {_______, _______, _______, ___x___, _______, _______, _______, TD_LCBR, KC_AMPR, KC_QUES, KC_COLN, KC_RCBR},
-    {___x___, ___x___, ___x___, ___fn__, _______, _______, _______, TD_LPRN, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN},
-    {_______, _______, _______, ___x___, _______, _______, _______, TD_LBRC, KC_LT,   KC_TILD, KC_GT,   KC_RBRC},
-    {___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_BSLS, KC_PIPE, ___x___, ___x___, ___x___},
-  },
-#endif
-
-// ............ .................................................. Function Keys
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      |  F7  |  F8  |  F9  |  F12 |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |  GUI |  Alt | Shift|      |      |      |      |  F4  |  F5  |  F6  |  F11 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F10 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |  f() |      |   +  |      |      |      |      |
-  // |      |      |      |      |  f() |      |      |   +  |      |      |      |      | see _PLOVER
-  // '-----------------------------------------------------------------------------------'
-
-  [_FNCKEY] = {
-    {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 },
-    {OS_CTL,  OS_GUI,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 },
-    {_______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 },
-    {_______, _______, _______, _______, ___fn__, ___fn__, _______, KC_PLUS, _______, _______, _______, _______},
-  },
diff --git a/keyboards/planck/keymaps/altgr/common/plover_keybind.h b/keyboards/planck/keymaps/altgr/common/plover_keybind.h
deleted file mode 100644
index cb4ef92ef84..00000000000
--- a/keyboards/planck/keymaps/altgr/common/plover_keybind.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-// simple window manager specific plover keybind hook
-
-// toggle plover application, see herbstluftwm/config/appbinds
-register_code  (KC_LGUI);
-register_code  (KC_LCTL);
-tap_key        (KC_EQL);
-unregister_code(KC_LCTL);
-unregister_code(KC_LGUI);
diff --git a/keyboards/planck/keymaps/altgr/common/sounds.h b/keyboards/planck/keymaps/altgr/common/sounds.h
deleted file mode 100644
index 1bfc7a6da0c..00000000000
--- a/keyboards/planck/keymaps/altgr/common/sounds.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// ................................................................ Audio Sounds
-
-#ifdef AUDIO_ENABLE
-float song_startup  [][2] = SONG(STARTUP_SOUND);
-float song_colemak  [][2] = SONG(COLEMAK_SOUND);
-float song_qwerty   [][2] = SONG(QWERTY_SOUND);
-float song_plover   [][2] = SONG(PLOVER_SOUND);
-float song_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
-float song_caps_on  [][2] = SONG(CAPS_LOCK_ON_SOUND);
-float song_caps_off [][2] = SONG(CAPS_LOCK_OFF_SOUND);
-float music_scale   [][2] = SONG(MUSIC_SCALE_SOUND);
-float song_goodbye  [][2] = SONG(GOODBYE_SOUND);
-#endif
diff --git a/keyboards/planck/keymaps/altgr/common/steno_layout.h b/keyboards/planck/keymaps/altgr/common/steno_layout.h
deleted file mode 100644
index c1f2b5b24ab..00000000000
--- a/keyboards/planck/keymaps/altgr/common/steno_layout.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ...................................................................... Plover
-#ifdef STENO_ENABLE
-  // ,-----------------------------------------------------------------------------------.
-  // |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // | Base |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Base |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |                           |   A  |   O  |   E  |   U  |                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_PLOVER] = LAYOUT_planck_grid(
-    STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-    BASE1,   STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-    BASE2,   STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-    _______, _______, _______, PS_STNA, PS_STNO, _______, _______, PS_STNE, PS_STNU, _______, _______, _______
-  ),
-#else
-  // ,-----------------------------------------------------------------------------------.
-  // |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // | Base |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Base |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |                           |   A  |   O  |   E  |   U  |                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    BASE1,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    BASE2,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    _______, _______, _______, LT_C,    LT_V,    _______, _______, LT_N,    LT_M,    _______, _______, _______
-  ),
-#endif
diff --git a/keyboards/planck/keymaps/altgr/common/symbol_guifn_layout.h b/keyboards/planck/keymaps/altgr/common/symbol_guifn_layout.h
deleted file mode 100644
index e5c902f2dfa..00000000000
--- a/keyboards/planck/keymaps/altgr/common/symbol_guifn_layout.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ..................................................... Symbol Navigation Layer
-#ifdef SHIFT_SYMBOLS
-  // .-----------------------------------------------------------------------------------.
-  // |      |   ~  |   *  |   &  |      |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   ^  |   %  |   $  |      |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   @  |   !  |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |Adjust|   \  |      |  f() |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_SYMBOL] = LAYOUT_planck_grid(
-    _______, KC_TILD, KC_ASTR, KC_AMPR, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    OS_GUI,  SM_CIRC, SM_PERC, SM_DLR,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-    _______, KC_HASH, KC_AT,   KC_EXLM, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    ___x___, ___x___, ___x___, ADJUST,  LT_BSLS, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___
-  ),
-#else
-  // .-----------------------------------------------------------------------------------.
-  // |   {  |   .  |   *  |   &  |   }  |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // |   (  |   ^  |   %  |   $  |   )  |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |   [  |   #  |   @  |   !  |   ]  |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |   |  |   \  |      |  f() |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_SYMBOL] = LAYOUT_planck_grid(
-    KC_LCBR, KC_DOT,  KC_ASTR, KC_AMPR, TD_RCBR, _______, _______, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    SM_LPRN, SM_CIRC, SM_PERC, SM_DLR,  TD_RPRN, _______, _______, _______, LT_LFTX, KC_DOWN, KC_RGHT, KC_PGDN,
-    KC_LBRC, KC_HASH, KC_AT,   KC_EXLM, TD_RBRC, _______, _______, _______, _______, _______, _______, _______,
-    ___x___, ___x___, ___x___, SL_PIPE, LT_BSLS, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___
-  ),
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   ?  |   +  |   ~  |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   <  |   =  |   >  |      |      |      |      |  f() |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   3  |   2  |   1  |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |      |      |      |  f() |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_SYMREG] = LAYOUT_planck_grid(
-    ___x___, KC_QUES, KC_PLUS, KC_TILD, ___x___, _______, _______, _______, ___x___, ___x___, ___x___, ___x___,
-    ___x___, KC_LT,   KC_EQL,  TD_RNGL, ___x___, _______, _______, _______, ___fn__, ___x___, ___x___, ___x___,
-    ___x___, KC_3,    KC_2,    KC_1,    ___x___, _______, _______, _______, _______, _______, _______, _______,
-    ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___
-  ),
-#endif
-
-// ............................................................... Mouse Actions
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Left |  Up  | Right|  Up  |
-  // |-----------------------------------------------------------------------------------|
-  // |      | Btn3 | Btn2 | Btn1 |      |      |      |      | Left | Down | Right| Down |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |      |  f() |      |  f() |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_MOUSE] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,
-    _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, ___fn__, _______, _______, _______, ___fn__, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/altgr/common/tapdance.h b/keyboards/planck/keymaps/altgr/common/tapdance.h
deleted file mode 100644
index d778286bf1e..00000000000
--- a/keyboards/planck/keymaps/altgr/common/tapdance.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// tap dance keys
-enum tap_dance {
-  _CAPS = 0
- ,_COLN
- ,_COMM
- ,_DOT
- ,_DQOT
- ,_ENT
- ,_EQL
- ,_GRV
- ,_GT
- ,_LBRC
- ,_LCBR
- ,_LPRN
- ,_LT
- ,_PRIV
- ,_QUOT
- ,_RBRC
- ,_RCBR
- ,_RNGL
- ,_RPRN
- ,_SEND
- ,_SPC
- ,_TILD
-};
-
-#define TD_CAPS TD(_CAPS)
-#define TD_COLN TD(_COLN)
-#define TD_COMM TD(_COMM)
-#define TD_DOT  TD(_DOT)
-#define TD_DQOT TD(_DQOT)
-#define TD_ENT  TD(_ENT)
-#define TD_EQL  TD(_EQL)
-#define TD_GRV  TD(_GRV)
-#define TD_GT   TD(_GT)
-#define TD_LBRC TD(_LBRC)
-#define TD_LCBR TD(_LCBR)
-#define TD_LPRN TD(_LPRN)
-#define TD_LT   TD(_LT)
-#define TD_PRIV TD(_PRIV)                   // compile time macro string, provided in private_string.h
-#define TD_QUOT TD(_QUOT)
-#define TD_RBRC TD(_RBRC)
-#define TD_RCBR TD(_RCBR)
-#define TD_RNGL TD(_RNGL)
-#define TD_RPRN TD(_RPRN)
-#define TD_SEND TD(_SEND)                   // config.h defined macro string
-#define TD_SPC  TD(_SPC)                    // see process_record_user() for extended handling of Spc
-#define TD_TILD TD(_TILD)
diff --git a/keyboards/planck/keymaps/altgr/common/toggle_layout.h b/keyboards/planck/keymaps/altgr/common/toggle_layout.h
deleted file mode 100644
index ed74f42522d..00000000000
--- a/keyboards/planck/keymaps/altgr/common/toggle_layout.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ......................................................... Number Keypad Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   G  |   \  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() | Space|      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() | Space|      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTNUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_GUI,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    _______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_0,    LT_EQL,  _______, _______, _______
-#else
-    _______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_EQL,  LT_0,    _______, _______, _______
-#endif
-  ),
-
-// ............ .................................................. Function Keys
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      |  F7  |  F8  |  F9  |  F12 |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI | Ctrl |  Alt | Shift|      |      |      |      |  F4  |  F5  |  F6  |  F11 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F10 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   +  |      |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTFNCKEY] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 ,
-    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 ,
-    _______, _______, _______, TT_ESC,  _______, _______, _______, KC_PLUS, _______, _______, _______, _______
-  ),
-
-// ....................................................................... Regex
-
-  // ,-----------------------------------------------------------------------------------.
-  // |      |   ~  |   {  |   }  |   &  |      |      |   %  |   [  |   ]  |   @  |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |      |   ^  |   <  |   >  |   ?  |      |      |   |  |   (  |   )  |   $  |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |      |   :  |   !  |   =  |   /  |      |      |   \  |   *  |   .  |   #  |      |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |      |      |      |  f() |   -  |      |      |   +  | Space|      |      |      |
-  // `-----------------------------------------------------------------------------------'
-
-  [_TTREGEX] = LAYOUT_planck_grid(
-    ___x___, KC_TILD, KC_LCBR, KC_RCBR, KC_AMPR, ___x___, ___x___, KC_PERC, KC_LBRC, KC_RBRC, KC_AT,   ___x___,
-    ___x___, KC_CIRC, KC_LT,   KC_GT,   KC_QUES, ___x___, ___x___, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  ___x___,
-    ___x___, KC_COLN, KC_EXLM, KC_EQL,  KC_SLSH, ___x___, ___x___, KC_BSLS, KC_ASTR, KC_DOT,  KC_HASH, ___x___,
-    _______, _______, _______, TT_ESC,  KC_MINS, _______, _______, KC_PLUS, KC_SPC,  _______, _______, _______
-  ),
-
-// ............................................................ Navigation Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI | Ctrl |  Alt | Shift|      |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |      |      |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTCURSOR] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-// ............................................................... Mouse Actions
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Left |  Up  | Right|  Up  |
-  // |-----------------------------------------------------------------------------------|
-  // |      | Btn3 | Btn2 | Btn1 |      |      |      |      | Left | Down | Right| Down |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |      |      |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTMOUSE] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,
-    _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/altgr/config.h b/keyboards/planck/keymaps/altgr/config.h
deleted file mode 100644
index b6c010a8255..00000000000
--- a/keyboards/planck/keymaps/altgr/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// tap dance key press termination interval
-#define TAPPING_TERM 250
-
-// smooth mouse motion
-// #define MOUSEKEY_INTERVAL    20
-// #define MOUSEKEY_DELAY       0
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_MAX_SPEED   7
-// #define MOUSEKEY_WHEEL_DELAY 0
-
-// compile time macro string, see functions/hardware planck script (undefine otherwise)
-#define PRIVATE_STRING
-
-// compile time macro string, must be in quotes
-#define PUBLIC_STRING ":%s/arch=(.*)/arch=('any')\n"
-
-// thumb key tap-shift() double tap: one shot shift (0) off (1) on
-#define DT_SHIFT 1
-
-// number layer 0 position KEYPAD_0, THUMB_0
-#define THUMB_0
-
-// home block shift symbol clustes defined (no overlays required for extended symbols, undefine otherwise)
-#define SHIFT_SYMBOLS
-
-// center column TT assignments (undefine for OSM chords)
-#define CENTER_TT
-#define TAPPING_TOGGLE 1
-
-// home row modifiers
-#define HOME_MODS
-// fix dual function timing
-#define PERMISSIVE_HOLD
-
-// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
-#define BEAKLGR
-
-// sync app with window manager keybind hook defined in plover_keybind.h
-#define PLOVER_KEYBIND
-
-#endif
diff --git a/keyboards/planck/keymaps/altgr/keymap.c b/keyboards/planck/keymaps/altgr/keymap.c
deleted file mode 100644
index f67682d794e..00000000000
--- a/keyboards/planck/keymaps/altgr/keymap.c
+++ /dev/null
@@ -1,479 +0,0 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-//
-// To flash planck firmware
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   Reset keyboard or press hw reset button on base (hole)
-//
-//   cd qmk_firmware/keyboards/planck
-//   sudo make KEYMAP=sdothum dfu
-//
-//   sudo make clean          (good practice before flashing)
-//   sudo make KEYMAP=sdothum (to compile check)
-//
-// Package requirements (for arch linux)
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   avr-gcc-atmel
-//   avr-libc-atmel
-//   dfu-programmer
-//
-// Notes
-// ▔▔▔▔▔
-//   ** E R G O   W I D E   S P L I T ** Layout
-//
-//   Autocompletion tap dance key pairs (),[],{} are available from the
-//   number/symbol layer, as well as, numerous (un)shift key values
-//
-//   The navigation pad provides a single hand right thumb activated cluster
-//   with left hand modifiers
-//
-//   #define PRIVATE_STRING includes private_string.h, a user defined code
-//   block for the PRIV tap dance e.g. SEND_STRING("secret messape"),
-//   see function private()
-//
-// Modifier clusters
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   The num and sym keys together access the navigation pad layer
-//
-//   ,-----------------------------------------------------------------------------------.
-//   | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-//   `-----------------------------------------------------------------------------------'
-//
-// Hint
-// ▔▔▔▔
-//   For sculpted keycaps such as Cherry or OEM profile, reverse the Alt, Num,
-//   Shift, Shift, Nav, Sym keycaps for more ergonomic thumb orientation and
-//   actuation
-//
-// Code
-// ▔▔▔▔
-//   This source is shamelessly based on the "default" planck layout
-//
-//   #ifdef/#endif block structures are not indented, as syntax highlighting
-//   in vim is sufficient for identification
-//
-//   c++ commenting style is used throughout
-//
-// Change history
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   See http://thedarnedestthing.com/planck%20constant
-//   See http://thedarnedestthing.com/planck%20done
-
-
-
-//                === N O T E ===
-//
-// sudo CPATH=<keymap.c directory>/common make ...
-
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _BASE = 0
- ,_SHIFT
- ,_LSHIFT
- ,_RSHIFT
- ,_PLOVER
- ,_NUMBER
- ,_SYMBOL
- ,_FNCKEY
- ,_MOUSE
-#ifdef CENTER_TT
- ,_TTNUMBER
- ,_TTREGEX
- ,_TTFNCKEY
- ,_TTCURSOR
- ,_TTMOUSE
-#endif
-#ifndef SHIFT_SYMBOLS
- ,_NUMSYM
- ,_SYMREG
-#endif
- ,_EDIT
- ,_QWERTY
- ,_ADJUST
- ,_END_LAYERS
-};
-
-enum planck_keycodes {
-  BASE = SAFE_RANGE
- ,BASE1
- ,BASE2
- ,PLOVER
- ,PLOEXIT
- ,SM_CIRC   // pseudo GUI_T(S(KC_6))                      for shifted key-codes, see process_record_user()
- ,SM_DLR    // pseudo SFT_T(S(KC_4))                      for shifted key-codes, see process_record_user()
- ,SM_G      // pseudo MT   (MOD_LALT | MOD_LSFT, S(KC_G)) for shifted key-codes, see process_record_user()
- ,SM_K      // pseudo MT   (MOD_LGUI | MOD_LSFT, S(KC_K)) for shifted key-codes, see process_record_user()
- ,SM_PERC   // pseudo ALT_T(S(KC_5))                      for shifted key-codes, see process_record_user()
- ,SM_LPRN   // pseudo CTL_T(S(KC_9))                      for shifted key-codes, see process_record_user()
- ,SM_W      // pseudo MT   (MOD_LGUI | MOD_LSFT, S(KC_W)) for shifted key-codes, see process_record_user()
- ,SL_LEFT   // pseudo LT   (_MOUSE, S(KC_LEFT))           for shifted key-codes, see process_record_user()
- ,SP_DEL    // pseudo LT   (_MOUSE, KC_DEL)               for shifted key-codes, see process_record_user()
- ,SL_PIPE   // pseudo LT   (_ADJUST, S(KC_BSLS))          for shifted key-codes, see process_record_user()
- ,SL_TAB    // pseudo LT   (_FNCKEY, S(KC_TAB))           for shifted key-codes, see process_record_user()
-#ifdef CENTER_TT
- ,TT_ESC
-#endif
-#ifdef STENO_ENABLE
- ,PS_STNA = STN_A
- ,PS_STNO = STN_O
- ,PS_STNE = STN_E
- ,PS_STNU = STN_U
-#else
- ,LT_C    = LT (_NUMBER, KC_C)
- ,LT_V    = LT (_FNCKEY, KC_V)
- ,LT_N    = LT (_EDIT,   KC_N)
- ,LT_M    = LT (_SYMBOL, KC_M)
-#endif
- ,PS_BASE
-};
-
-// modifier keys
-#define AT_B    ALT_T(KC_B)
-#define AT_DOWN ALT_T(KC_DOWN)
-#define CT_RGHT CTL_T(KC_RGHT)
-#define GT_C    GUI_T(KC_C)
-#define GT_UP   GUI_T(KC_UP)
-#define MT_E    MT   (MOD_LCTL | MOD_LALT, KC_E)
-#define MT_X    MT   (MOD_LALT | MOD_LSFT, KC_X)
-#define ST_A    SFT_T(KC_A)
-#ifdef HOME_MODS
-#define HOME_K  GUI_T(KC_K)
-#define HOME_H  CTL_T(KC_H)
-#define HOME_E  ALT_T(KC_E)
-#define HOME_A  SFT_T(KC_A)
-#if defined(BEAKLMU) || defined(BEAKLSP) || defined(BEAKLGR)
-#define HOME_T  SFT_T(KC_T)
-#define HOME_R  ALT_T(KC_R)
-#define HOME_S  CTL_T(KC_S)
-#define HOME_W  GUI_T(KC_W)
-#else
-#define HOME_T  SFT_T(KC_T)
-#define HOME_S  ALT_T(KC_S)
-#define HOME_N  GUI_T(KC_N)
-#define HOME_B  CTL_T(KC_B)
-#endif
-#else
-#define HOME_K  KC_K
-#define HOME_H  KC_H
-#define HOME_E  KC_E
-#define HOME_A  KC_A
-#define HOME_T  KC_T
-#define HOME_S  KC_S
-#define HOME_N  KC_N
-#define HOME_B  KC_B
-#endif
-
-#define S_DOWN  S    (KC_DOWN)
-#define S_LEFT  S    (KC_LEFT)
-#define S_RGHT  S    (KC_RGHT)
-#define S_TAB   S    (KC_TAB)
-#define S_UP    S    (KC_UP)
-
-#include "common/tapdance.h"
-
-// keycodes
-#define ___x___ KC_TRNS
-#define ___fn__ KC_TRNS
-#undef  _______
-#define _______ KC_NO
-
-#define COPY    LCTL(KC_C)
-#define CUT     LCTL(KC_X)
-#define EOT     LCTL(KC_D)
-#define NAK     LCTL(KC_U)
-#define PASTE   LCTL(KC_V)
-#define UNDO    LCTL(KC_Z)
-#define TMCOPY  LALT(LCTL(KC_C))
-#define TMPASTE LALT(LCTL(KC_V))
-#define LT_BSLS LT  (_MOUSE,  KC_BSLS)      // see process_record_user() for extended handling
-#define LT_BSPC LT  (_EDIT,   KC_BSPC)
-#define SP_LEFT LT  (_EDIT,   KC_LEFT)
-#define LT_ESC  LT  (_NUMBER, KC_ESC)
-#define LT_LEFT LT  (_SYMBOL, KC_LEFT)      // see process_record_user() for extended handling
-#define SP_BSPC LT  (_SYMBOL, KC_BSPC)      // see process_record_user() for extended handling
-#define LT_TAB  LT  (_FNCKEY, KC_TAB)
-#define LT_INS  LT  (_FNCKEY, KC_INS)
-#define LT_ALTG LT  (_FNCKEY, KC_RALT)
-#define ADJUST  MO  (_ADJUST)
-#define OS_ALT  OSM (MOD_LALT)
-#define OS_CTL  OSM (MOD_LCTL)
-#define OS_GUI  OSM (MOD_LGUI)
-#define OS_SFT  OSM (MOD_LSFT)
-#define OS_CALT OSM (MOD_LALT | MOD_LCTL)
-#define OS_CGUI OSM (MOD_LGUI | MOD_LCTL)
-#define OS_CSFT OSM (MOD_LSFT | MOD_LCTL)
-#define OS_SALT OSM (MOD_LALT | MOD_LSFT)
-#define OS_SGUI OSM (MOD_LGUI | MOD_LSFT)
-
-#ifdef CENTER_TT
-#ifdef BEAKLSP
-#define CNTR_TL OSM (MOD_LSFT)
-#else
-#define CNTR_TL TT  (_TTFNCKEY)
-#endif
-#define CNTR_TR KC_CAPS
-#define CNTR_HL TT  (_TTCURSOR)
-#define CNTR_HR TT  (_TTMOUSE)
-#define CNTR_BL TT  (_TTNUMBER)
-#define CNTR_BR TT  (_TTREGEX)
-#else
-#define CNTR_TL OSM (MOD_LALT | MOD_LCTL)
-#define CNTR_TR OSM (MOD_LGUI | MOD_LCTL)
-#define CNTR_HL OSM (MOD_LALT | MOD_LSFT)
-#define CNTR_HR OSM (MOD_LGUI | MOD_LSFT)
-#define CNTR_BL TD  (_CAPS)
-#define CNTR_BR OSM (MOD_LSFT | MOD_LCTL)
-#endif
-
-#ifdef THUMB_0
-#define LT_EQL  LT  (_ADJUST, KC_EQL)
-#else
-#define LT_0    LT  (_ADJUST, KC_0)
-#endif
-#ifndef SHIFT_SYMBOLS
-#define LT_A    LT  (_NUMSYM, KC_A)
-#define LT_LFTX LT  (_SYMREG, KC_LEFT)
-#endif
-
-// ........................................................ Default Alpha Layout
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-#include "beakl.h"
-#include "colemak.h"
-#include "qwerty.h"
-#include "common/steno_layout.h"
-
-// ...................................................... Number / Function Keys
-
-#include "common/number_fkey_layout.h"
-
-// ......................................................... Symbol / Navigation
-
-#include "common/symbol_guifn_layout.h"
-
-// ............................................................... Toggle Layers
-
-#ifdef CENTER_TT
-#include "common/toggle_layout.h"
-#endif
-
-// ......................................................... Short Cuts / Adjust
-
-#include "common/chord_layout.h"
-
-};
-
-// ...................................................................... Sounds
-
-#include "common/sounds.h"
-
-// ........................................................... User Keycode Trap
-
-#include "common/keycode_functions.h"
-
-#define BASE_1  1
-#define BASE_2  2
-#define BASE_12 3
-static uint8_t base_n = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  switch (keycode) {
-    case BASE1:
-      if (record->event.pressed) {
-        base_n = base_n | BASE_1;
-        if (base_n == BASE_12) {
-          base_layer();
-        }
-      }
-      else {
-        base_n = base_n & ~BASE_1;
-      }
-      return false;
-    case BASE2:
-      if (record->event.pressed) {
-        base_n = base_n | BASE_2;
-        if (base_n == BASE_12) {
-          base_layer();
-        }
-      }
-      else {
-        base_n = base_n & ~BASE_2;
-      }
-      return false;
-    case AT_DOWN:
-#ifdef HOME_MODS
-    case HOME_E:
-#if defined(BEAKLMU) || defined(BEAKLSP) || defined(BEAKLGR)
-    case HOME_R:
-#else
-    case HOME_S:
-#endif
-#endif
-      tap_mods(record, KC_LALT);
-      break;
-    case CT_RGHT:
-#ifdef HOME_MODS
-    case HOME_K:
-#if defined(BEAKLMU) || defined(BEAKLSP) || defined(BEAKLGR)
-    case HOME_W:
-#else
-    case HOME_B:
-#endif
-#endif
-      tap_mods(record, KC_LGUI);
-      break;
-    case GT_UP:
-#ifdef HOME_MODS
-    case HOME_H:
-#if defined(BEAKLMU) || defined(BEAKLSP) || defined(BEAKLGR)
-    case HOME_S:
-#else
-    case HOME_N:
-#endif
-#endif
-      tap_mods(record, KC_LCTL);
-      break;
-#ifdef HOME_MODS
-    case HOME_A:
-    case HOME_T:
-      tap_mods(record, KC_LSFT);
-      break;
-#endif
-#ifdef CENTER_TT
-    case TT_ESC:
-      clear_tt();                           // exit TT layer
-      return false;
-#endif
-    case LT_ESC:
-#ifdef CENTER_TT
-      if (tt_keycode != 0) {
-        clear_tt();                         // exit TT layer
-        return false;
-      }
-#endif
-      tap_layer(record, _NUMBER);
-      break;
-    case LT_LEFT:
-    case SP_BSPC:
-      tap_layer(record, _SYMBOL);
-      // LT (_SYMBOL, KC_LEFT) left right combination layer
-      thumb_layer(record, RIGHT, 0, 0, _SYMBOL, _LSHIFT);
-      break;
-    case OS_ALT:
-      tap_mods(record, KC_LALT);
-      break;
-    case OS_CTL:
-      tap_mods(record, KC_LCTL);
-      break;
-    case OS_GUI:
-      tap_mods(record, KC_LGUI);
-      break;
-    case SM_CIRC:
-      // GUI_T(S(KC_6))
-      mt_shift(record, KC_LGUI, 0, KC_6);
-      break;
-    case SM_DLR:
-      // SFT_T(S(KC_4))
-      mt_shift(record, KC_LSFT, 0, KC_4);
-      break;
-    case SM_G:
-      // MT(MOD_LALT | MOD_LSFT, S(KC_G))
-      mt_shift(record, KC_LALT, KC_LSFT, KC_G);
-      break;
-    case SM_K:
-      // MT(MOD_LGUI | MOD_LSFT, S(KC_K))
-      mt_shift(record, KC_LGUI, KC_LSFT, KC_K);
-      break;
-    case SM_W:
-      // MT(MOD_LGUI | MOD_LSFT, S(KC_W))
-      mt_shift(record, KC_LGUI, KC_LSFT, KC_W);
-      break;
-    case SM_LPRN:
-      // CTL_T(S(KC_9))
-      mt_shift(record, KC_LCTL, 0, KC_9);
-      break;
-    case SM_PERC:
-      // ALT_T(S(KC_5))
-      mt_shift(record, KC_LALT, 0, KC_5);
-      break;
-    case LT_BSLS:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, KC_BSLS) left right combination layer, see #define LT_BSLS
-      thumb_layer(record, LEFT, 0, 0, _MOUSE, _SYMBOL);
-      break;
-    case SL_LEFT:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, S(KC_LEFT)) left right combination layer
-      thumb_layer(record, RIGHT, SHIFT, KC_LEFT, _MOUSE, _LSHIFT);
-      break;
-    case SP_DEL:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, S(KC_LEFT)) left right combination layer
-      thumb_layer(record, RIGHT, NOSHIFT, KC_DEL, _MOUSE, _LSHIFT);
-      break;
-    case SL_PIPE:
-      // LT (_ADJUST, S(KC_BSLS)) emulation
-      lt_shift(record, KC_BSLS, _ADJUST);
-      break;
-    case SL_TAB:
-      // LT (_FNCKEY, S(KC_TAB)) emulation
-      lt_shift(record, KC_TAB, _FNCKEY);
-      break;
-    case TD_ENT:
-      tap_layer(record, _RSHIFT);
-      // LT (_RSHIFT, KC_ENT) emulation, see tap dance enter
-      break;
-    case TD_SPC:
-      tap_layer(record, _LSHIFT);
-      // LT (_LSHIFT, KC_SPC) left right combination layer, see tap dance TD_SPC
-      thumb_layer(record, LEFT, 0, 0, _LSHIFT, _SYMBOL);
-      break;
-#ifdef CENTER_TT
-    case CNTR_TL:
-    case CNTR_TR:
-    case CNTR_HL:
-    case CNTR_HR:
-    case CNTR_BL:
-    case CNTR_BR:
-      if (tt_keycode != keycode && tt_keycode != 0) {
-        clear_tt();                         // return to base layer first if different TT layer selected
-      }
-      tt_keycode = keycode;
-      break;
-#endif
-// #ifdef STENO_ENABLE
-//     case PS_STNA:
-//       stn_layer(record, STN_A, _NUMBER);
-//       break;
-//     case PS_STNO:
-//       stn_layer(record, STN_O, _FNCKEY);
-//       break;
-//     case PS_STNE:
-//       stn_layer(record, STN_E, _EDIT);
-//       break;
-//     case PS_STNU:
-//       stn_layer(record, STN_U, _SYMBOL);
-//       break;
-// #endif
-    case PS_BASE:
-      if (record->event.pressed) {
-        base_layer();
-      }
-      return false;
-    case PLOVER:
-      steno(record);
-      return false;
-    case PLOEXIT:
-      steno_exit(record);
-      return false;
-  }
-  return true;
-}
-
-#include "common/init.h"
diff --git a/keyboards/planck/keymaps/altgr/private_string.h b/keyboards/planck/keymaps/altgr/private_string.h
deleted file mode 100644
index 6ea34cc8e87..00000000000
--- a/keyboards/planck/keymaps/altgr/private_string.h
+++ /dev/null
@@ -1 +0,0 @@
-SEND_STRING("the keys of enoch");
diff --git a/keyboards/planck/keymaps/altgr/qwerty.h b/keyboards/planck/keymaps/altgr/qwerty.h
deleted file mode 100644
index eed52f0af8e..00000000000
--- a/keyboards/planck/keymaps/altgr/qwerty.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ...................................................................... Qwerty
-#ifdef QWERTY
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   E  |   R  |   T  | ^Alt | ^GUI |   Y  |   U  |   I  |   O  |   P  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   S  |   D  |   F  |   G  | ↑Alt | ↑GUI |   H  |   J  |   K  |   L  |   ;  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   V  |   B  | Caps |^Shift|   N  |   M  |   ,  |   .  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    CNTR_TL, CNTR_TR, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   ,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    CNTR_HL, CNTR_HR, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CNTR_BL, CNTR_BR, KC_N,    KC_M,    KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), CNTR_TL, CNTR_TR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P),
-    S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), CNTR_HL, CNTR_HR, S(KC_H), S(KC_J), S(KC_K), S(KC_L), KC_SCLN,
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), CNTR_BL, CNTR_BR, S(KC_N), S(KC_M), KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   E  |   R  |   T  | ^Alt | ^GUI |   Y  |   U  |   I  |   O  |   P  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   S  |   D  |   F  |   G  | ↑Alt | ↑GUI |   H  |   J  |   K  |   L  |   :  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   V  |   B  | Caps |^Shift|   N  |   M  |   /  |   ?  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   -  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), CNTR_TL, CNTR_TR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P),
-    S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), CNTR_HL, CNTR_HR, S(KC_H), S(KC_J), S(KC_K), S(KC_L), TD_COLN,
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), CNTR_BL, CNTR_BR, S(KC_N), S(KC_M), KC_SLSH, KC_QUES, TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_MINS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT 
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   E  |   R  |   T  | ^Alt | ^GUI |   Y  |   U  |   I  |   O  |   P  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   S  |   D  |   F  |   G  | ↑Alt | ↑GUI |   H  |   J  |   K  |   L  |   :  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   V  |   B  | Caps |^Shift|   N  |   M  |   ~  |   `  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   _  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), CNTR_TL, CNTR_TR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P),
-    S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), CNTR_HL, CNTR_HR, S(KC_H), S(KC_J), S(KC_K), S(KC_L), TD_COLN,
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), CNTR_BL, CNTR_BR, S(KC_N), S(KC_M), TD_TILD, TD_GRV,  TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_UNDS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT 
-  ),
-#endif
-
diff --git a/keyboards/planck/keymaps/altgr/readme.md b/keyboards/planck/keymaps/altgr/readme.md
deleted file mode 100644
index 58f73e3b445..00000000000
--- a/keyboards/planck/keymaps/altgr/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# The sdothum extended Default Planck Layout
-
-- Colemak-DH layout layer with shift/tab key overlays
-- Number and symbol/function key layer
-- Hexadecimal keypad layer
-- Navigation keypad layer
-- Dynamic macro layer
-- Autocompletion tap key pairs (),[],{}
-- Normalized enter and esc key position across keyboard layers
-- Extensive use of tap keys
diff --git a/keyboards/planck/keymaps/altgr/rules.mk b/keyboards/planck/keymaps/altgr/rules.mk
deleted file mode 100644
index ea9abc2a80d..00000000000
--- a/keyboards/planck/keymaps/altgr/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Build Options:
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes  # mouse keys(+4700)
-EXTRAKEY_ENABLE  = no   # audio control and System control(+450)
-CONSOLE_ENABLE   = no   # console for debug(+400)
-COMMAND_ENABLE   = no   # commands for debug and configuration
-NKRO_ENABLE      = yes  # nkey rollover
-BACKLIGHT_ENABLE = no   # enable keyboard backlight functionality
-MIDI_ENABLE      = no   # MIDI controls
-AUDIO_ENABLE     = no   # audio output on port C6
-UNICODE_ENABLE   = no   # unicode
-BLUETOOTH_ENABLE = no   # enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no   # enable WS2812 RGB underlight, do not enable this with audio at the same time.
-STENO_ENABLE     = yes	# enable TX Bolt protocol, requires VIRTSER and may not work with mouse keys
-
-# do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no   # breathing sleep LED during USB suspend
-
-TAP_DANCE_ENABLE = yes  # enable double tap completion of (),[],{}
-
diff --git a/keyboards/planck/keymaps/am/config.h b/keyboards/planck/keymaps/am/config.h
deleted file mode 100644
index fa27834f983..00000000000
--- a/keyboards/planck/keymaps/am/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND),   \
-                                  SONG(COLEMAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/am/keymap.c b/keyboards/planck/keymaps/am/keymap.c
deleted file mode 100644
index 000aeed1d62..00000000000
--- a/keyboards/planck/keymaps/am/keymap.c
+++ /dev/null
@@ -1,204 +0,0 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _LOWER,
-  _RAISE,
-  _TOUCHCURSOR,
-  _MOUSE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  LOWER,
-  RAISE,
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-// Taps
-#define CTL_ESC CTL_T(KC_ESC)            // Tap for Esc, hold for Ctr
-#define SFT_ENT SFT_T(KC_ENT)            // Tap for Enter, hold for Shift
-#define LT_TC   LT(_TOUCHCURSOR, KC_SPC) // L-ayer T-ap T-ouch C-ursor
-#define LT_ML   LT(_MOUSE, KC_A)         // L-ayer T-ap M-ouse C-ursor (on A)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,--------------------------------------------------------------------------------------.
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp  |
- * |--------+------+------+------+------+-------------+------+------+------+------+-------|
- * |Ctrl/Esc| ML/A |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   "   |
- * |--------+------+------+------+------+------|------+------+------+------+------+-------|
- * | Shift  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Sft/Ent|
- * |--------+------+------+------+------+------+------+------+------+------+------+-------|
- * | Power  |   ~  | Alt  | GUI  |Lower |   TC/Space  |Raise | Next | Vol- | Vol+ |  Play |
- * `--------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_ESC, LT_ML,   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, SFT_ENT,
-  KC_CAPS, KC_TILD, KC_LALT, KC_LGUI, LOWER,   LT_TC,   LT_TC,   RAISE,   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Colemak
- * ,-------------------------------------------------------------------------------------.
- * | Tab    |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |--------+------+------+------+------+-------------+------+------+------+------+------|
- * |Ctrl/Esc| ML/A |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |--------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift  |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |--------+------+------+------+------+------+------+------+------+------+------+------|
- * | Power  |   ~  | Alt  | GUI  |Lower |   TC/Space  |Raise | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_ESC, LT_ML,   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_ENT,
-  KC_CAPS, KC_TILD, KC_LALT, KC_LGUI, LOWER,   LT_TC,   LT_TC,   RAISE,   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   |  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   +  |   {  |   }  |  `   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   \  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   _  |   =  |   [  |   ]  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Sleep |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_PIPE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, KC_GRV,
-  KC_BSLS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_UNDS, KC_EQL,  KC_LBRC, KC_RBRC, KC_SLSH,
-  KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   0  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ^  |   4  |   5  |   6  |   .  |   +  |   *  |   4  |   5  |   6  |   -  |  $   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   =  |   7  |   8  |   9  |   0  |   -  |   /  |   1  |   2  |   3  |   .  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Sleep |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_0,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_CIRC, KC_4,    KC_5,    KC_6,    KC_DOT, KC_PLUS,  KC_ASTR, KC_4,    KC_5,    KC_6,    KC_MINS, KC_DLR,
-  KC_EQL,  KC_7,    KC_8,    KC_9,    KC_0,   KC_MINS,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_DOT,  KC_ENT,
-  KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* TouchCursor layer (http://martin-stone.github.io/touchcursor/) plus personal customizations
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |Shift | GUI  |  ~   |Insert| Home |  Up  | End  | Bksp |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Alt  |Space |      | Find |Again | PgUp | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- *
- * The KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND, and KC_AGAIN keycodes don't
- * seem to work on Mac. Presumably they'll work under Windows.
- */
-
-[_TOUCHCURSOR] = LAYOUT_planck_grid(
-  _______, _______, _______, KC_LSFT, KC_LGUI, KC_TILD, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_BSPC, _______,
-  _______, KC_LALT, KC_SPC,  _______, KC_FIND,KC_AGAIN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  _______, KC_UNDO, KC_CUT,  KC_COPY, KC_PASTE,KC_GRV,  KC_PGDN, KC_DEL,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Mouse Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |ACCL0 |ACCL1 |ACCL2 |ACCL2 |      |WHL_L |  Up  |WHL_R | BTN2 |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      | BTN3 | BTN1 | BTN4 |WHL_Up| Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      | BTN2 | BTN5 |WHL_Dn| BTN1 |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_MOUSE] = LAYOUT_planck_grid(
-  _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, KC_ACL2, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______,
-  _______, _______, _______, KC_BTN3, KC_BTN1, KC_BTN4, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
-  _______, _______, _______, _______, KC_BTN2, KC_BTN5, KC_WH_D, KC_BTN1, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-  case RAISE:
-  case LOWER:
-    return false;
-  default:
-    return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/am/readme.md b/keyboards/planck/keymaps/am/readme.md
deleted file mode 100644
index 6e0601bf22e..00000000000
--- a/keyboards/planck/keymaps/am/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# The Am Planck Layout
-
-Heavily inspired by other layouts out there, and fine tuned to work well on emacs (most recently spacemacs with vim bindings).
-
-It features:
-
-- Media keys (bottom right)
-- Focused on Qwerty and Colemak
-- Number pads (normal and reversed)
-- TouchCursor layer
-- Mouse layer
-
-## Build
-
-Making planck/rev4 with keymap am and target dfu
-
-    make planck/rev4:am:dfu
diff --git a/keyboards/planck/keymaps/am/rules.mk b/keyboards/planck/keymaps/am/rules.mk
deleted file mode 100644
index 696abda39d0..00000000000
--- a/keyboards/planck/keymaps/am/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-MOUSEKEY_ENABLE = yes       # 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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-AUDIO_ENABLE = yes          # Audio output on port C6
diff --git a/keyboards/planck/keymaps/andylikescandy/config.h b/keyboards/planck/keymaps/andylikescandy/config.h
deleted file mode 100644
index ad5c99081fa..00000000000
--- a/keyboards/planck/keymaps/andylikescandy/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-#define PERMISSIVE_HOLD
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/planck/keymaps/andylikescandy/keymap.c b/keyboards/planck/keymaps/andylikescandy/keymap.c
deleted file mode 100644
index 367287423c7..00000000000
--- a/keyboards/planck/keymaps/andylikescandy/keymap.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _NAVIGATION
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define _NAVIGATION 8
-#define NAVL MO(_NAVIGATION)
-#define NAVSPC LT( 8, KC_SPC)
-//#define SHFTENT SHFT_T(KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl | CS   |  Alt | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,           KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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, SFT_T(KC_ENT) ,
-    KC_LCTL, LCTL(KC_LSFT),  KC_LGUI, KC_LALT, LOWER,   NAVSPC,  NAVSPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Colemak
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |SftEnt|
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl | CS   |  Alt | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,           KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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, SFT_T(KC_ENT)  ,
-    KC_LCTL, LCTL(KC_LSFT),  KC_LGUI, KC_LALT, LOWER,   NAVSPC,  NAVSPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Dvorak REUSED AS COLEMAK
-  * ,-----------------------------------------------------------------------------------.
-  * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Ctrl | CS   |  Alt | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT,          KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,             KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_QUOT,
-    KC_LSFT, KC_SCLN,          KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_T(KC_ENT) ,
-    KC_LCTL, LCTL(KC_LSFT),    KC_LGUI, KC_LALT, LOWER,   NAVSPC,  NAVSPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-  // /* Dvorak
-  //  * ,-----------------------------------------------------------------------------------.
-  //  * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-  //  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  //  * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-  //  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  //  * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-  //  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  //  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-  //  * `-----------------------------------------------------------------------------------'
-  //  */
-  // [_DVORAK] = LAYOUT_planck_grid(
-  //   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  //   KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  //   KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  //   BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   NAVSPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  // ),
-//
-// /* Lower
-// * ,-----------------------------------------------------------------------------------.
-// * |   ~  |  F7  |  F8  |  F9  | F10  | F11  | F12  |   _  |   +  |   {  |   }  | Bksp |
-// * |------+------+------+------+------+-------------+------+------+------+------+------|
-// * |  Del |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  |   |
-// * |------+------+------+------+------+------|------+------+------+------+------+------|
-// * |      |Ctl+z |Ctl+x |Ctl+c |Ctl+v |      |      |      |      |      |      |Enter |
-// * |------+------+------+------+------+------+------+------+------+------+------+------|
-// * |      |      |      |      |      |             |      | HOME | PGDN | PGUP | END  |
-// * `-----------------------------------------------------------------------------------'
-// */
-[_LOWER] = LAYOUT_planck_grid(
-   KC_TILD, KC_F7,  KC_F8, KC_F9, KC_F10, KC_F11,  KC_F12, KC_UNDS, KC_PLUS, KC_LCBR,  KC_RCBR,   KC_BSPC ,
-   KC_DEL , KC_F1,  KC_F2, KC_F3, KC_F4, KC_F5,  KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC,   KC_PIPE ,
-   _______, LCTL(KC_Z),  LCTL(KC_X), LCTL(KC_C),  LCTL(KC_V), _______, _______, _______, _______, _______, _______,   KC_ENT ,
-   _______, _______, _______, _______, _______, KC_SPC, KC_SPC, _______, KC_HOME, KC_PGDN, KC_PGUP,    KC_END
-),
-
-/* Raise
-* ,-----------------------------------------------------------------------------------.
-* |   `  |  !   |  @   |  #   |  $   |  %   |  ^   |   &  |   *  |  (   |   )  | Bksp |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* | Del  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  \   |
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* |      |      |      |      |      |      |      |      |      |      |      |Enter |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |      |      |      |      |      |             |      | HOME | PGDN | PGUP | END  |
-* `-----------------------------------------------------------------------------------'
-*/
-[_RAISE] = LAYOUT_planck_grid(
-   KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,    KC_BSPC ,
-   KC_DEL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,       KC_BSLS ,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_ENT ,
-   _______, _______, _______, _______, _______, KC_SPC, KC_SPC, _______, KC_HOME, KC_PGDN, KC_PGUP,    KC_END
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | Reset|      |      |      |      |      |      |      |      |      |      | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |C.A.D.|      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | CAPS |      |      |      |      |      |      |Insert|PntScn|Scroll|Pause |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |Qwerty|Colemk|Dvorak|Plover|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  QK_BOOT,             XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,
-  LALT(LCTL(KC_DEL)),  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,
-  KC_CAPS,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX,
-  _______,             _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK, XXXXXXX  //PLOVER
-),
-/* Navigation
-* ,-----------------------------------------------------------------------------------.
-* |      |      |      |      |      |      |      | Home | PgDn | PgUp | End  |ctlBsp|
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  Del |Ctl+A |      |Shift | Ctrl |      |      | Left | Down |  Up  |Right |  Del |
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | C+S  |Ctl+z |Ctl+x |Ctl+c |Ctl+v |      |      |      |Shift |Shift |Shift |Enter |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |C+A+S |      |      |      |      |             |      |C+Left|C+Down| C+Up |C+Right|
-* `-----------------------------------------------------------------------------------'
-*/
-[_NAVIGATION] = LAYOUT_planck_grid(
-  XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,       KC_HOME, KC_PGDN, KC_PGUP, KC_END,      LCTL(KC_BSPC) ,
-  KC_DEL,              LCTL(KC_A), XXXXXXX, KC_LSFT, KC_LCTL,    XXXXXXX, XXXXXXX,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,     KC_DEL,
-  LCTL(KC_LSFT),       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,       XXXXXXX, KC_RSFT, KC_RSFT, KC_RSFT,         KC_ENT,
-  _______,             _______, _______,  _______, _______,      _______, _______,       LCTL(KC_LEFT), LCTL(KC_DOWN), LCTL(KC_UP), LCTL(KC_RGHT), _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        PORTE &= ~(1<<6);
-      } else {
-        unregister_code(KC_RSFT);
-        PORTE |= (1<<6);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/andylikescandy/readme.md b/keyboards/planck/keymaps/andylikescandy/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/andylikescandy/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/angerthosenear/keymap.c b/keyboards/planck/keymaps/angerthosenear/keymap.c
deleted file mode 100644
index 6e9c69333e2..00000000000
--- a/keyboards/planck/keymaps/angerthosenear/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid( /* Qwerty */
-  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_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_LCTL, KC_LGUI, KC_LALT, BL_STEP, MO(3),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-                                                // Space is repeated to accommodate for both spacebar wiring positions
-),
-[1] = LAYOUT_planck_grid( /* WASD + NumPad */
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_PSLS, KC_PMNS, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PAST, KC_PPLS, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P1,   KC_P2,   KC_P3,   KC_PDOT, KC_PENT, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),   KC_SPC,  KC_P0,   MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-[2] = LAYOUT_planck_grid( /* RAISE */
-  KC_GRV,	KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
-  KC_TRNS, DF(0), DF(1), LSFT(RSFT(KC_PAUSE)), KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_TRNS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_MPRV,  MO(2),     KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[3] = LAYOUT_planck_grid( /* LOWER */
-  S(KC_GRV),  S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    S(KC_9),    S(KC_0), KC_DEL,
-  KC_TRNS, DF(0), DF(1), LSFT(RSFT(KC_PAUSE)), KC_TRNS, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), S(KC_BSLS),
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-)
-};
diff --git a/keyboards/planck/keymaps/angerthosenear/rules.mk b/keyboards/planck/keymaps/angerthosenear/rules.mk
deleted file mode 100644
index d86b02fd1ce..00000000000
--- a/keyboards/planck/keymaps/angerthosenear/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/antosha417/config.h b/keyboards/planck/keymaps/antosha417/config.h
deleted file mode 100644
index 3ad322687ae..00000000000
--- a/keyboards/planck/keymaps/antosha417/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2021 Anton Kavalkou (@antosha417)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-    // #define STARTUP_SONG SONG(NO_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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-#define TAPPING_TERM 200
-#define COMBO_TERM 30
-
diff --git a/keyboards/planck/keymaps/antosha417/keymap.c b/keyboards/planck/keymaps/antosha417/keymap.c
deleted file mode 100644
index 06bc0b86570..00000000000
--- a/keyboards/planck/keymaps/antosha417/keymap.c
+++ /dev/null
@@ -1,447 +0,0 @@
-// Copyright 2021 Anton Kavalkou (@antosha417)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-#include "sendstring_dvorak.h"
-#include "muse.h"
-
-enum layers {
-  _QWERTY,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _TOP,
-  _BOTTOM,
-  _ADJUST
-};
-
-float USSR_SONG[][2] = SONG(B__NOTE(_G6),
-  B__NOTE(_C7), W__NOTE(_G6), H__NOTE(_A6),
-  B__NOTE(_B6), W__NOTE(_E6), W__NOTE(_E6),
-  B__NOTE(_A6), W__NOTE(_G6), H__NOTE(_F6),
-  B__NOTE(_G6), W__NOTE(_C6), W__NOTE(_C6),
-  B__NOTE(_D6), W__NOTE(_D6), W__NOTE(_E6),
-  B__NOTE(_D6), W__NOTE(_D6), W__NOTE(_G6),
-  B__NOTE(_F6), W__NOTE(_G6), W__NOTE(_A6),
-  B__NOTE(_B6),
-  );
-
-enum keycodes {
-  QWERTY = SAFE_RANGE,
-
-  RUS_LANG,
-  EN_LANG,
-  HEB_LANG,
-
-  BRUDERSCHAFT,
-  VIM_SAVE,
-
-#define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action)   \
-  keycode,
-#include "mod_tap_keys.h"
-#undef MOD_TAP_KEY
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define TOP MO(_TOP)
-#define BOTTOM MO(_BOTTOM)
-#define LANG  TG(_DVORAK)
-#define KC_CAD LALT(LCTL(KC_DEL))
-#define KC_CAH LALT(LCTL(KC_HOME))
-
-#define E_SFT LSFT_T(KC_E)
-#define D_SFT LSFT_T(KC_D)
-#define A_ALT LALT_T(KC_A)
-#define O_GUI LGUI_T(KC_O)
-#define U_CTRL LCTL_T(KC_U)
-
-#define T_SFT RSFT_T(KC_T)
-#define K_SFT RSFT_T(KC_K)
-#define S_ALT RALT_T(KC_S)
-#define N_GUI RGUI_T(KC_N)
-#define H_CTRL RCTL_T(KC_H)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |      |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Bottom| SPC  |Lower |Raise | SPC  | TOP  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    _______,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    _______,
-    _______,  A_ALTQ,  S_GUIQ,  D_SFT,   F_CTLQ,  KC_G,    KC_H,    J_CTLQ,  K_SFT,   L_GUIQ,  SCLN_Q,  _______,
-    _______,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
-    _______, _______, _______, BOTTOM,  KC_SPC,  LOWER,   RAISE,   KC_SPC,   TOP,     _______, _______, _______
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * |      |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,     KC_C,    KC_R,    KC_L,    _______,
-    _______, A_ALT,   O_GUI,   E_SFT,   U_CTRL,  KC_I,    KC_D,    H_CTRL,   T_SFT,   N_GUI,   S_ALT,   _______,
-    _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,     KC_W,    KC_V,    KC_Z,    _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | F11  | _    |  -   |  ~   |  %   | '    |      |  ^   |  `   |  \   |  |   |  -   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  [   |  {   |  +   |  (   |  =   |  *   |   )  |   !  |  }   |  ]   | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | CAD  | CAH  |      | LANG |      |      | EN   | HEB  | RUS  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | RCTL |      |      |      | [{}] |      |      | PSCR | PGDN | PGUP |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_F11,  KC_UNDS, KC_MINS,  KC_TILD, KC_PERC, KC_QUOT, _______, KC_CIRC,  KC_GRV,  KC_BSLS,  KC_PIPE, KC_MINS,
-    KC_DEL,  KC_LBRC, KC_LCBR,  KC_PLUS, KC_LPRN, KC_EQL,  KC_ASTR, KC_RPRN,  KC_EXLM, KC_RCBR,  KC_RBRC, KC_BSPC,
-    _______, KC_CAD,  KC_CAH,   _______, LANG,    _______, _______, HEB_LANG, EN_LANG, RUS_LANG, _______, _______,
-    _______, KC_RCTL, _______,  _______, _______, _______, _______, _______,  KC_PSCR, KC_PGDN,  KC_PGUP, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | F11  |      |      |  $   |  &   |      | :    |   ?  |   @  |   #  |   /  | F12  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  7   |  5   |  3   |  1   |  9   |  0   |  2   |  4   |  6   |  8   | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F5  |  F3  |  F1  |  F9  |  F10 |  F2  |  F4  |  F6  |  F8  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      | [{}] |      | Vol- | End  | Home | Vol+ |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_F11,  _______, _______, KC_DLR,  KC_AMPR, _______, KC_COLON, KC_QUES, KC_AT,   KC_HASH, KC_SLSH, KC_F12,
-    _______, KC_7,    KC_5,    KC_3,    KC_1,    KC_9,    KC_0,    KC_2,    KC_4,    KC_6,    KC_8,    KC_BSPC,
-    _______, KC_F7,   KC_F5,   KC_F3,   KC_F1,   KC_F9,   KC_F10,  KC_F2,   KC_F4,   KC_F6,   KC_F8,   _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_END,  KC_HOME, KC_VOLU
-),
-
-/* TOP
- * ,-----------------------------------------------------------------------------------
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | Down | Up   |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | [{}] |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_TOP] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, KC_DOWN, KC_UP,   _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* BOTTOM
- * ,-----------------------------------------------------------------------------------
- * |      |      |      |      |      |      |      |      |      |      | ->   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | <-   |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | vold | volu |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | [{}] |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_BOTTOM] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RGHT, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Aud on|Audoff|      |      |      |      |      |      |Dvorak|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Mus on|Musoff|      |      |      |      |      |      |      |      | USSR |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      | [{}] | [{}] |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______, _______, BRUDERSCHAFT,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-void keyboard_post_init_user(void) {
-  layer_on(_DVORAK);
-}
-
-void set_english_language(void) {
-    layer_on(_DVORAK);
-    SEND_STRING(SS_LSFT(SS_LCTL(SS_LGUI(SS_TAP(X_1)))));
-}
-
-void set_russian_language(void) {
-    layer_off(_DVORAK);
-    SEND_STRING(SS_LSFT(SS_LCTL(SS_LGUI(SS_TAP(X_2)))));
-}
-
-void set_hebrew_language(void) {
-    layer_off(_DVORAK);
-    SEND_STRING(SS_LSFT(SS_LCTL(SS_LGUI(SS_TAP(X_3)))));
-}
-
-
-#define CASE(keycode, key_pressed_action, key_released_action)   \
-  case (keycode):                                               \
-    if (record->event.pressed) {                                \
-      key_pressed_action;                                       \
-    } else {                                                    \
-      key_released_action;                                      \
-    }                                                           \
-    return false;                                               \
-    break;
-
-#define CASE_PRESSED(keycode, key_pressed_action) CASE(keycode, key_pressed_action, {});
-
-#define CASE_MOD_TAP_KEY(keycode, tap_action, mod_off_action) \
-  CASE(keycode, {                                  \
-    keycode ## _TIMER = timer_read();                         \
-    IS_ ## keycode ## _ACTIVE = true;                         \
-  }, {                                                        \
-    if(IS_ ## keycode ## _MOD_ACTIVE) {                       \
-      mod_off_action;                          		      \
-    } else if (IS_ ## keycode ## _ACTIVE) {                   \
-      tap_action;                                             \
-    }                                                         \
-    IS_ ## keycode ## _MOD_ACTIVE = false; 		      \
-    IS_ ## keycode ## _ACTIVE = false;                        \
-  });
-
-#define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action) \
-uint16_t keycode ## _TIMER = 0;                                 	\
-bool IS_ ## keycode ## _ACTIVE = false; 		                \
-bool IS_ ## keycode ## _MOD_ACTIVE = false;
-#include "mod_tap_keys.h"
-#undef MOD_TAP_KEY
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    CASE_PRESSED(BRUDERSCHAFT, PLAY_SONG(USSR_SONG));
-
-    CASE_PRESSED(EN_LANG, set_english_language());
-    CASE_PRESSED(RUS_LANG, set_russian_language());
-    CASE_PRESSED(HEB_LANG, set_hebrew_language());
-
-    CASE_PRESSED(VIM_SAVE, {set_english_language(); SEND_STRING(SS_TAP(X_ESC)SS_LSFT(SS_TAP(X_SCLN))SS_TAP(X_W)SS_TAP(X_ENT));});
-
-    #define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action) \
-    CASE_MOD_TAP_KEY(keycode, tap_action, mod_off_action);
-    #include "mod_tap_keys.h"
-    #undef MOD_TAP_KEY
-  }
-
-  #define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action) \
-  if (IS_ ## keycode ## _ACTIVE && !IS_ ## keycode ## _MOD_ACTIVE) {      \
-    if (timer_elapsed(keycode ## _TIMER) <= TAPPING_TERM) {               \
-      tap_action;                                                         \
-      IS_ ## keycode ## _ACTIVE = false;                                  \
-    }                                                    		  \
-  }
-  #include "mod_tap_keys.h"
-  #undef MOD_TAP_KEY
-
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-  return false;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-  return true;
-}
-
-void matrix_scan_user(void) {
-  #define MOD_TAP_KEY(keycode, tap_action, mod_on_action, mod_off_action) \
-  if (IS_ ## keycode ## _ACTIVE) {                                        \
-    if (timer_elapsed(keycode ## _TIMER) > TAPPING_TERM) {                \
-      mod_on_action;                                                      \
-      IS_ ## keycode ## _MOD_ACTIVE = true;                               \
-    }                                                    		  \
-  }
-  #include "mod_tap_keys.h"
-  #undef MOD_TAP_KEY
-
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-enum combo_events {
-  // combos for dvorak layer
-  RU_COMBO,
-  EN_COMBO,
-  HEB_COMBO,
-  ESC_COMBO,
-  TAB_COMBO,
-  ENT_COMBO,
-  DEL_COMBO,
-  SAVE_COMBO,
-  BSPC_COMBO,
-  BSPCW_COMBO,
-
-  // combos for qwerty layer
-  RUQ_COMBO,
-  ENQ_COMBO,
-  HEBQ_COMBO,
-  ESCQ_COMBO,
-  TABQ_COMBO,
-  ENTQ_COMBO,
-  DELQ_COMBO,
-  SAVEQ_COMBO,
-  BSPCQ_COMBO,
-  BSPCWQ_COMBO
-};
-
-const uint16_t PROGMEM ru_combo[] = {KC_R, U_CTRL, COMBO_END};
-const uint16_t PROGMEM en_combo[] = {U_CTRL, S_ALT, COMBO_END};
-const uint16_t PROGMEM heb_combo[] = {KC_I, KC_V, COMBO_END};
-const uint16_t PROGMEM esc_combo[] = {H_CTRL, U_CTRL, COMBO_END};
-const uint16_t PROGMEM tab_combo[] = {T_SFT, A_ALT, COMBO_END};
-const uint16_t PROGMEM ent_combo[] = {E_SFT, N_GUI, COMBO_END};
-const uint16_t PROGMEM del_combo[] = {KC_D, E_SFT, COMBO_END};
-const uint16_t PROGMEM bspc_combo[] = {KC_C, H_CTRL, COMBO_END};
-const uint16_t PROGMEM bspcw_combo[] = {N_GUI, U_CTRL, COMBO_END};
-const uint16_t PROGMEM save_combo[] = {O_GUI, H_CTRL, COMBO_END};
-
-const uint16_t PROGMEM ruq_combo[] = {KC_O, F_CTLQ, COMBO_END};
-const uint16_t PROGMEM enq_combo[] = {F_CTLQ, SCLN_Q, COMBO_END};
-const uint16_t PROGMEM hebq_combo[] = {KC_G, KC_DOT, COMBO_END};
-const uint16_t PROGMEM escq_combo[] = {F_CTLQ, J_CTLQ, COMBO_END};
-const uint16_t PROGMEM tabq_combo[] = {K_SFT, A_ALTQ, COMBO_END};
-const uint16_t PROGMEM entq_combo[] = {D_SFT, L_GUIQ, COMBO_END};
-const uint16_t PROGMEM delq_combo[] = {KC_H, D_SFT, COMBO_END};
-const uint16_t PROGMEM bspcq_combo[] = {KC_I, J_CTLQ, COMBO_END};
-const uint16_t PROGMEM bspcwq_combo[] = {L_GUIQ, F_CTLQ, COMBO_END};
-const uint16_t PROGMEM saveq_combo[] = {S_GUIQ, J_CTLQ, COMBO_END};
-
-combo_t key_combos[] = {
-    [RU_COMBO] = COMBO(ru_combo, RUS_LANG),
-    [EN_COMBO] = COMBO(en_combo, EN_LANG),
-    [HEB_COMBO] = COMBO(heb_combo, HEB_LANG),
-    [ESC_COMBO] = COMBO(esc_combo, KC_ESC),
-    [TAB_COMBO] = COMBO(tab_combo, KC_TAB),
-    [ENT_COMBO] = COMBO(ent_combo, KC_ENT),
-    [DEL_COMBO] = COMBO(del_combo, KC_DEL),
-    [BSPC_COMBO] = COMBO(bspc_combo, KC_BSPC),
-    [SAVE_COMBO] = COMBO(save_combo, VIM_SAVE),
-    [BSPCW_COMBO] = COMBO(bspcw_combo, A(KC_BSPC)),
-
-    [RUQ_COMBO] = COMBO(ruq_combo, RUS_LANG),
-    [ENQ_COMBO] = COMBO(enq_combo, EN_LANG),
-    [HEBQ_COMBO] = COMBO(hebq_combo, HEB_LANG),
-    [ESCQ_COMBO] = COMBO(escq_combo, KC_ESC),
-    [TABQ_COMBO] = COMBO(tabq_combo, KC_TAB),
-    [ENTQ_COMBO] = COMBO(entq_combo, KC_ENT),
-    [DELQ_COMBO] = COMBO(delq_combo, KC_DEL),
-    [BSPCQ_COMBO] = COMBO(bspcq_combo, KC_BSPC),
-    [SAVEQ_COMBO] = COMBO(saveq_combo, VIM_SAVE),
-    [BSPCWQ_COMBO] = COMBO(bspcwq_combo, A(KC_BSPC)),
-};
diff --git a/keyboards/planck/keymaps/antosha417/mod_tap_keys.h b/keyboards/planck/keymaps/antosha417/mod_tap_keys.h
deleted file mode 100644
index aa82f9692cc..00000000000
--- a/keyboards/planck/keymaps/antosha417/mod_tap_keys.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2021 Anton Kavalkou (@antosha417)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-// MOD_TAP_KEY(key, tap_action, mod_on_action, mod_off_action)
-
-MOD_TAP_KEY(S_GUIQ, tap_code(KC_S), {layer_on(_DVORAK); register_code(KC_LGUI);}, {layer_off(_DVORAK); unregister_code(KC_LGUI);})
-MOD_TAP_KEY(L_GUIQ, tap_code(KC_L), {layer_on(_DVORAK); register_code(KC_RGUI);}, {layer_off(_DVORAK); unregister_code(KC_RGUI);})
-
-MOD_TAP_KEY(F_CTLQ, tap_code(KC_F), {layer_on(_DVORAK); register_code(KC_LCTL);}, {layer_off(_DVORAK); unregister_code(KC_LCTL);})
-MOD_TAP_KEY(J_CTLQ, tap_code(KC_J), {layer_on(_DVORAK); register_code(KC_RCTL);}, {layer_off(_DVORAK); unregister_code(KC_RCTL);})
-
-MOD_TAP_KEY(A_ALTQ, tap_code(KC_A), {layer_on(_DVORAK); register_code(KC_LALT);}, {layer_off(_DVORAK); unregister_code(KC_LALT);})
-MOD_TAP_KEY(SCLN_Q, tap_code(KC_SCLN), {layer_on(_DVORAK); register_code(KC_RALT);}, {layer_off(_DVORAK); unregister_code(KC_RALT);})
-
diff --git a/keyboards/planck/keymaps/antosha417/readme.md b/keyboards/planck/keymaps/antosha417/readme.md
deleted file mode 100644
index a7adbf74bbf..00000000000
--- a/keyboards/planck/keymaps/antosha417/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# How to install:
-
-    make planck/rev6:antosha417:flash
-
-# Useful:
-  * [keycodes](https://docs.qmk.fm/#/keycodes)
-  * [string keycodes](https://github.com/qmk/qmk_firmware/blob/master/quantum/send_string_keycodes.h)
-
-# Todo:
-  [ ] sync with corne
-
diff --git a/keyboards/planck/keymaps/antosha417/rules.mk b/keyboards/planck/keymaps/antosha417/rules.mk
deleted file mode 100644
index 46976952521..00000000000
--- a/keyboards/planck/keymaps/antosha417/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SRC += muse.c
-AUDIO_ENABLE = yes
-COMBO_ENABLE = yes
-
diff --git a/keyboards/planck/keymaps/ariccb/.vscode/settings.json b/keyboards/planck/keymaps/ariccb/.vscode/settings.json
deleted file mode 100644
index 31e9436a777..00000000000
--- a/keyboards/planck/keymaps/ariccb/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "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
deleted file mode 100644
index e9fcc865fac..00000000000
--- a/keyboards/planck/keymaps/ariccb/config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* 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 TAPPING_TERM_PER_KEY
-// #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
deleted file mode 100644
index c37e65d28a0..00000000000
--- a/keyboards/planck/keymaps/ariccb/features/caps_word.c
+++ /dev/null
@@ -1,122 +0,0 @@
-// 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
deleted file mode 100644
index 523c8151574..00000000000
--- a/keyboards/planck/keymaps/ariccb/features/caps_word.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// 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
deleted file mode 100644
index c0ffe0a90d0..00000000000
--- a/keyboards/planck/keymaps/ariccb/features/select_word.c
+++ /dev/null
@@ -1,110 +0,0 @@
-// 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
deleted file mode 100644
index f762ba11793..00000000000
--- a/keyboards/planck/keymaps/ariccb/features/select_word.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// 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
deleted file mode 100644
index 5caaf1922ed..00000000000
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ /dev/null
@@ -1,671 +0,0 @@
- /* 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(tap_dance_state_t *state);
-
-// Functions associated with individual tap dances
-void usl_finished(tap_dance_state_t *state, void *user_data);
-void usl_reset(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 */
-  QK_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_SCRL,   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- | Boot |
- * |-----------------------------------------------------------------------------|
- * |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, QK_BOOT,
-  RGB_MOD, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, GAMING,  KC_NO,       AU_ON,   AU_OFF,  MU_ON,   MU_OFF,  DB_TOGG,
-  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_NEXT,
-  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 (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);
-//     }
-// }
-
-// 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(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(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(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
-tap_dance_action_t tap_dance_actions[] = {
-    [UNDS_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, usl_finished, usl_reset)
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(UNDS_LOWER):
-            return 175;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-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
-};
-
-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;
-  }
-}
diff --git a/keyboards/planck/keymaps/ariccb/readme.md b/keyboards/planck/keymaps/ariccb/readme.md
deleted file mode 100644
index 3472ce09ec9..00000000000
--- a/keyboards/planck/keymaps/ariccb/readme.md
+++ /dev/null
@@ -1,78 +0,0 @@
-```
-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
deleted file mode 100644
index cc92ab40f32..00000000000
--- a/keyboards/planck/keymaps/ariccb/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-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/atreus/config.h b/keyboards/planck/keymaps/atreus/config.h
deleted file mode 100644
index 39daa2ec30c..00000000000
--- a/keyboards/planck/keymaps/atreus/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2015-2017 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/atreus/keymap.c b/keyboards/planck/keymaps/atreus/keymap.c
deleted file mode 100644
index 6fd8c398047..00000000000
--- a/keyboards/planck/keymaps/atreus/keymap.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Default layer
- * ,-----------------------------------------------------------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |      |      |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  |      |      |   H  |   J  |   K  |   L  |   ;  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  |   `  |   \  |   N  |   M  |   ,  |   .  |   /  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Tab  | GUI  | Shift| Bksp | Ctrl | Alt  |Space | Fun  |   -  |   '  |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[0] = LAYOUT_ortho_4x12(
-	KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_BSLS, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_MINS, KC_QUOT, KC_ENT),
-/* Function layer
- * ,-----------------------------------------------------------------------------------.
- * |   !  |   @  |  Up  |   $  |   %  |      |      | PgUp |   7  |   8  |   9  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   (  | Left | Down |Right |   )  |      |      | PgDn |   4  |   5  |   6  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   [  |   ]  |   #  |   {  |   }  |   ^  |   &  |   *  |   1  |   2  |   3  |   +  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Upper| Ins  |      |      |      |      |      |      |      |   .  |   0  |   =  |
- * `-----------------------------------------------------------------------------------'
- */
-[1] = LAYOUT_ortho_4x12(
-    KC_EXLM, KC_AT, KC_UP, KC_DLR, KC_PERC, KC_NO, KC_NO, KC_PGUP, KC_7, KC_8, KC_9, KC_BSPC, KC_LPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN, KC_NO, KC_NO, KC_PGDN, KC_4, KC_5, KC_6, KC_NO, KC_LBRC, KC_RBRC, KC_HASH, KC_LCBR, KC_RCBR, KC_CIRC, KC_AMPR, KC_ASTR, KC_1, KC_2, KC_3, KC_PLUS, TG(2), KC_INS, KC_LGUI, KC_LSFT, KC_DEL, KC_LCTL, KC_LALT, KC_SPC, KC_TRNS, KC_DOT, KC_0, KC_EQL),
-/* Upper layer
- * ,-----------------------------------------------------------------------------------.
- * | Ins  | Home |      | End  | PgUp |      |      |  Up  |  F7  |  F8  |  F9  | F10  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |      |      |      | PgDn |      |      | Down |  F4  |  F5  |  F6  | F11  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Vol+ |      |      |      |      |      |      |  F1  |  F2  |  F3  | F12  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Vol- |      |      |      |      |      |      |      |PrtSc |ScrLk | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[2] = LAYOUT_ortho_4x12(
-    KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, KC_NO, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_NO, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11, KC_NO, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12, KC_NO, KC_VOLD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0), KC_PSCR, KC_SCRL, KC_MPLY)
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/atreus/readme.md b/keyboards/planck/keymaps/atreus/readme.md
deleted file mode 100644
index 81940642c57..00000000000
--- a/keyboards/planck/keymaps/atreus/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-![Layout Image](https://imgur.com/G9TNUzy.png)
-
-# Keyboardio Atreus layout for Planck
-
-This is the same layout as the new Atreus from Keyboardio (the one with 44 keys, so not the atreus v1).
-There are 4 unused keys in the center as the Planck has 48 keys.
-It is mostly for people with a Planck to try this new layout before buying.
-
-More details here: https://shop.keyboard.io/products/keyboardio-atreus
diff --git a/keyboards/planck/keymaps/atreus/rules.mk b/keyboards/planck/keymaps/atreus/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/atreus/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/austin/keymap.c b/keyboards/planck/keymaps/austin/keymap.c
deleted file mode 100644
index 3461ca95519..00000000000
--- a/keyboards/planck/keymaps/austin/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid( /* Qwerty */
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   KC_BSPC,
-  KC_ESC,  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,
-  BL_STEP, KC_LGUI, KC_LALT, KC_LCTL, MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-                                                // Space is repeated to accommadate for both spacebar wiring positions
-),
-[1] = LAYOUT_planck_grid( /* Colemak */
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT,
-  DF(0), KC_LGUI, KC_LALT, KC_LCTL,  MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-),
-[2] = LAYOUT_planck_grid( /* RAISE */
-  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_TRNS, DF(0), DF(1), LSFT(RSFT(KC_PAUSE)), KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_TRNS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(2),     KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[3] = LAYOUT_planck_grid( /* LOWER */
-  S(KC_GRV),  S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    S(KC_9),    S(KC_0), KC_BSPC,
-  KC_TRNS, DF(0), DF(1), LSFT(RSFT(KC_PAUSE)), KC_TRNS, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), S(KC_BSLS),
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-)
-};
diff --git a/keyboards/planck/keymaps/austin/rules.mk b/keyboards/planck/keymaps/austin/rules.mk
deleted file mode 100644
index d86b02fd1ce..00000000000
--- a/keyboards/planck/keymaps/austin/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/aviator/config.h b/keyboards/planck/keymaps/aviator/config.h
deleted file mode 100644
index 159e6cd3bbc..00000000000
--- a/keyboards/planck/keymaps/aviator/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-
-#ifndef KEYBOARD_planck_light
-#define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 3
-#endif
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/planck/keymaps/aviator/keyboard-layout.json b/keyboards/planck/keymaps/aviator/keyboard-layout.json
deleted file mode 100644
index 84af5185930..00000000000
--- a/keyboards/planck/keymaps/aviator/keyboard-layout.json
+++ /dev/null
@@ -1,138 +0,0 @@
-[
-  {
-    "name": "The Aviator",
-    "author": "John Ramsay",
-    "notes": "Designed for aeronautical data entry on the OLKB Planck.",
-    "switchMount": "cherry",
-    "switchBrand": "gateron",
-    "switchType": "KS-3-Green",
-    "plate": true
-  },
-  [
-    {
-      "c": "#ADADAD",
-      "t": "#000000\n#3f76d4\n#d67509"
-    },
-    "\nDel\nDel\n\n\n\n\n\n\nEsc",
-    {
-      "c": "#CDC1B0"
-    },
-    "\n!\nF1\n\n\n\n\n\n\nQ",
-    "\n@\nF2\n\n\n\n\n\n\nW",
-    "\n#\nF3\n\n\n\n\n\n\nE",
-    "\n$\nF4\n\n\n\n\n\n\nR",
-    "\n%\n\n\n\n\n\n\n\nT",
-    "\n^\nN\n\n\n\n\n\n\nY",
-    "\n&\nS\n\n\n\n\n\n\nU",
-    "\n*\n7\n\n\n\n\n\n\nI",
-    "\n(\n8\n\n\n\n\n\n\nO",
-    "\n)\n9\n\n\n\n\n\n\nP",
-    {
-      "c": "#ADADAD",
-      "t": "#000000",
-      "a": 7
-    },
-    "Back Space"
-  ],
-  [
-    "Tab",
-    {
-      "c": "#CDC1B0",
-      "t": "#000000\n#3f76d4\n#d67509",
-      "a": 4
-    },
-    "\n~\nF5\n\n\n\n\n\n\nA",
-    "\n`\nF6\n\n\n\n\n\n\nS",
-    {
-      "t": "#000000\n\n#d67509"
-    },
-    "\n\nF7\n\n\n\n\n\n\nD",
-    "\n\nF8\n\n\n\n\n\n\nF",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "G",
-    {
-      "t": "#000000\n\n#d67509",
-      "a": 4
-    },
-    "\n\nE\n\n\n\n\n\n\nH",
-    {
-      "t": "#000000\n#3f76d4\n#d67509"
-    },
-    "\n_\nW\n\n\n\n\n\n\nJ",
-    "\n+\n4\n\n\n\n\n\n\nK",
-    "\n{\n5\n\n\n\n\n\n\nL",
-    "\n}\n6\n\n\n\n\n\n\n:\n;",
-    "\n\\\nTab\n\n\n\n\n\n\n\"\n'"
-  ],
-  [
-    {
-      "c": "#ADADAD",
-      "t": "#000000",
-      "a": 7
-    },
-    "Shift",
-    {
-      "c": "#CDC1B0",
-      "t": "#000000\n\n#d67509",
-      "a": 4
-    },
-    "\n\nF9\n\n\n\n\n\n\nZ",
-    "\n\nF10\n\n\n\n\n\n\nX",
-    "\n\nF11\n\n\n\n\n\n\nC",
-    "\n\nF12\n\n\n\n\n\n\nV",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "B",
-    {
-      "t": "#000000\n\n#d67509",
-      "a": 4
-    },
-    "\n\n+\n\n\n\n\n\n\nN",
-    {
-      "t": "#000000\n#3f76d4\n#d67509"
-    },
-    "\n-\n-\n\n\n\n\n\n\nM",
-    "\n=\n1\n\n\n\n\n\n\n<\n,",
-    "\n[\n2\n\n\n\n\n\n\n>\n.",
-    "\n]\n3\n\n\n\n\n\n\n?\n/",
-    {
-      "c": "#ADADAD",
-      "t": "#000000",
-      "a": 7
-    },
-    "Return"
-  ],
-  [
-    "Fn",
-    "Ctrl",
-    "Alt",
-    "Meta",
-    {
-      "c": "#9FACBF"
-    },
-    "&dArr;",
-    {
-      "c": "#CDC1B0"
-    },
-    "",
-    "",
-    {
-      "c": "#E5A65B"
-    },
-    "&uArr;",
-    {
-      "c": "#ADADAD",
-      "t": "#000000\n#3f76d4\n#d67509",
-      "a": 4
-    },
-    "\nHome\n0\n\n\n\n\n\n\n&larr;",
-    "\nPDwn\n.\n\n\n\n\n\n\n&darr;",
-    "\nPUp\nShift\n\n\n\n\n\n\n&uarr;",
-    "\nEnd\nReturn\n\n\n\n\n\n\n&rarr;"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/aviator/keymap.c b/keyboards/planck/keymaps/aviator/keymap.c
deleted file mode 100644
index 6b0308c6c68..00000000000
--- a/keyboards/planck/keymaps/aviator/keymap.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Copyright 2017 John Ramsay
- * Aviator Keymap v1.0
- *
- * Designed for aeronautical data entry on the OLKB Planck.
- */
-
-#include QMK_KEYBOARD_H
-
- extern keymap_config_t keymap_config;
-
- enum planck_layers {
-   _QWERTY,
-   _DATA,
-   _LOWER,
-   _RAISE,
-   _ADJUST
- };
-
- enum planck_keycodes {
-   QWERTY = SAFE_RANGE,
-   DATA,
-   LOWER,
-   RAISE,
-   BACKLIT
- };
-
-#define ___x___ KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Data
- * ,-----------------------------------------------------------------------------------.
- * | Esc  | Home |  Up  | End  |      |      |   N  |   S  |   7  |   8  |   9  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  | Left | Down | Right|      |      |   E  |   W  |   4  |   5  |   6  | Tab  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |      |   +  |   -  |   1  |   2  |   3  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |   0  |   .  |Shift |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_DATA] = LAYOUT_planck_grid(
-  KC_ESC,  KC_HOME, KC_UP,   KC_END,   ___x___, ___x___, KC_N,    KC_S,    KC_7, KC_8,   KC_9,    KC_BSPC,
-  KC_TAB,  KC_LEFT, KC_DOWN, KC_RIGHT, ___x___, ___x___, KC_E,    KC_W,    KC_4, KC_5,   KC_6,    KC_TAB,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V,    ___x___, KC_PLUS, KC_MINS, KC_1, KC_2,   KC_3,    KC_ENT,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_0, KC_DOT, KC_RSFT, KC_ENT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Del  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   ~  |   `  |      |      |      |      |   _  |   +  |   {  |   }  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   -  |   =  |   [  |   ]  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |Pg Dn |Pg Up | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_DEL,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  _______, KC_TILD, KC_GRV,  ___x___, ___x___, ___x___, ___x___, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS,
-  _______, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Del  |  F1  |  F2  |  F3  |  F4  |      |   N  |   S  |   7  |   8  |   9  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F5  |  F6  |  F7  |  F8  |      |   E  |   W  |   4  |   5  |   6  | Tab  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |      |   +  |   -  |   1  |   2  |   3  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   0  |   .  |Shift |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   ___x___, KC_N,    KC_S,    KC_7, KC_8,   KC_9,    KC_BSPC,
-  _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   ___x___, KC_E,    KC_W,    KC_4, KC_5,   KC_6,    KC_TAB,
-  _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___x___, KC_PLUS, KC_MINS, KC_1, KC_2,   KC_3,    _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_RSFT, KC_ENT
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | Esc  | Reset| Debug|      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty| Data |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  KC_ESC,  QK_BOOT, DB_TOGG, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, KC_DEL,
-  _______, ___x___, ___x___, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DATA,    ___x___, ___x___, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  ___x___, ___x___, ___x___, ___x___, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-        #ifdef BACKLIGHT_BREATHING
-          breathing_self_disable();
-        #endif
-      }
-      return false;
-      break;
-    case DATA:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DATA);
-        #ifdef BACKLIGHT_BREATHING
-          breathing_enable();
-        #endif
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        uint8_t default_layer = get_highest_layer(default_layer_state);
-        if (default_layer == _QWERTY) {
-          #ifdef BACKLIGHT_BREATHING
-            breathing_enable();
-          #endif
-        }
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        uint8_t default_layer = get_highest_layer(default_layer_state);
-        if (default_layer == _QWERTY) {
-          #ifdef BACKLIGHT_BREATHING
-            breathing_self_disable();
-          #endif
-        }
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        uint8_t default_layer = get_highest_layer(default_layer_state);
-        if (default_layer == _QWERTY) {
-          #ifdef BACKLIGHT_BREATHING
-            breathing_enable();
-          #endif
-        }
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        uint8_t default_layer = get_highest_layer(default_layer_state);
-        if (default_layer == _QWERTY) {
-          #ifdef BACKLIGHT_BREATHING
-            breathing_self_disable();
-          #endif
-        }
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_BREATHING
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/aviator/readme.md b/keyboards/planck/keymaps/aviator/readme.md
deleted file mode 100644
index 3319c7fe13e..00000000000
--- a/keyboards/planck/keymaps/aviator/readme.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# The Aviator
-
-Designed for aeronautical data entry on the OLKB Planck.
-
-![Imgur](https://i.imgur.com/lj6uMYI.png)
-
-## Layers
-
-````
-Qwerty
-,-----------------------------------------------------------------------------------.
-| Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-
-Data
-,-----------------------------------------------------------------------------------.
-| Esc  | Home |  Up  | End  |      |      |   N  |   S  |   7  |   8  |   9  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Tab  | Left | Down | Right|      |      |   E  |   W  |   4  |   5  |   6  | Tab  |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |      |   +  |   -  |   1  |   2  |   3  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |   0  |   .  |Shift |Enter |
-`-----------------------------------------------------------------------------------'
-
-Lower
-,-----------------------------------------------------------------------------------.
-| Del  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |   ~  |   `  |      |      |      |      |   _  |   +  |   {  |   }  |  \   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |   -  |   =  |   [  |   ]  |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      | Home |Pg Dn |Pg Up | End  |
-`-----------------------------------------------------------------------------------'
-
-Raise
-,-----------------------------------------------------------------------------------.
-| Del  |  F1  |  F2  |  F3  |  F4  |      |   N  |   S  |   7  |   8  |   9  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |  F5  |  F6  |  F7  |  F8  |      |   E  |   W  |   4  |   5  |   6  | Tab  |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |  F9  |  F10 |  F11 |  F12 |      |   +  |   -  |   1  |   2  |   3  |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |   0  |   .  |Shift |Enter |
-`-----------------------------------------------------------------------------------'
-
-Adjust (Lower + Raise)
-,-----------------------------------------------------------------------------------.
-| Esc  | Reset| Debug|      |      |      |      |      |      |      |      |  Del |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty| Data |      |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-````
-
-## Notes
-
-Supports LED backlighting.
diff --git a/keyboards/planck/keymaps/aviator/rules.mk b/keyboards/planck/keymaps/aviator/rules.mk
deleted file mode 100644
index bd518d8f273..00000000000
--- a/keyboards/planck/keymaps/aviator/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/planck/keymaps/basic/keymap.c b/keyboards/planck/keymaps/basic/keymap.c
deleted file mode 100644
index 7ce327302f3..00000000000
--- a/keyboards/planck/keymaps/basic/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-#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.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[0] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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_RSFT, KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Reset |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[1] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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),_______, _______, _______,
-  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Reset |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[2] = LAYOUT_planck_grid(
-  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_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, _______, _______, _______,
-  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-
-};
diff --git a/keyboards/planck/keymaps/basic/readme.md b/keyboards/planck/keymaps/basic/readme.md
deleted file mode 100644
index 3a4824b5b4d..00000000000
--- a/keyboards/planck/keymaps/basic/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# A more basic Planck Layout for copying
-
diff --git a/keyboards/planck/keymaps/basic/rules.mk b/keyboards/planck/keymaps/basic/rules.mk
deleted file mode 100644
index e3a405f494e..00000000000
--- a/keyboards/planck/keymaps/basic/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/bghull/combos.def b/keyboards/planck/keymaps/bghull/combos.def
deleted file mode 100644
index a525113a093..00000000000
--- a/keyboards/planck/keymaps/bghull/combos.def
+++ /dev/null
@@ -1,14 +0,0 @@
-//   name     result    chord keys
-COMB(QW_ESC,	KC_ESC,   	KC_Q, KC_W)
-COMB(CV_DEL,	KC_DEL,   	KC_C, KC_V)
-COMB(XC_BSPC,	KC_BSPC,   	KC_X, KC_C)
-COMB(WE_LBRC,	KC_LBRC, 	KC_W, KC_E)
-COMB(ER_RBRC, 	KC_RBRC,	KC_E, KC_R)
-COMB(SD_LPRN, 	KC_LPRN,	KC_S, KC_D)
-COMB(DF_RPRN, 	KC_RPRN,	KC_D, KC_F)
-COMB(FG_BSLS, 	KC_BSLS,	KC_F, KC_G)
-COMB(HJ_SLSH, 	KC_SLSH,	KC_H, KC_J)
-COMB(DQ_LGUI, 	KC_LGUI,	KC_DOT, KC_QUOT)
-COMB(CD_LALT, 	KC_LALT,	KC_COMM, KC_DOT)
-COMB(MC_LSFT, 	KC_LSFT,	KC_M, KC_COMM)
-COMB(NM_LCTL, 	KC_LCTL,	KC_N, KC_M)
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/bghull/config.h b/keyboards/planck/keymaps/bghull/config.h
deleted file mode 100644
index 96a6aefb0e5..00000000000
--- a/keyboards/planck/keymaps/bghull/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2021 Your Name (@bghull)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#define AUTO_SHIFT_TIMEOUT 135
-#define ONESHOT_TIMEOUT 1000
-#define COMBO_TERM 20
diff --git a/keyboards/planck/keymaps/bghull/keymap.c b/keyboards/planck/keymaps/bghull/keymap.c
deleted file mode 100644
index 55f5c54b679..00000000000
--- a/keyboards/planck/keymaps/bghull/keymap.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "g/keymap_combo.h"
-#include "muse.h"
-
-#define COMBO_ONLY_FROM_LAYER QWERTY
-
-enum planck_layers {
-  QWERTY,
-  COLMAK,
-  NAVNUM,
-  FUNC
-  
-};
-
-#define BspNAV LT(NAVNUM, KC_BSPC)
-#define SpcFUN LT(FUNC, KC_SPC)
-#define OneSFT OSM(MOD_LSFT)
-#define OneALT OSM(MOD_LALT)
-#define OneCTL OSM(MOD_LCTL)
-#define OneWIN OSM(MOD_LGUI)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* QWERTY
- * ,-----------------------------------------------------------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |  ; : |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  | ,  < | .  > |  ' " |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |                    | Ctrl |NAVNUM|             |Space |BspNAV|                    |
- * `-----------------------------------------------------------------------------------'
- */
-[QWERTY] = LAYOUT_planck_grid(
-    KC_Q,   KC_W,    KC_E,     KC_R,    KC_T,	   _______, _______, KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,
-    KC_A,   KC_S,    KC_D,     KC_F,    KC_G,	   _______, _______, KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN,
-    KC_Z,   KC_X,    KC_C,     KC_V,    KC_B,	   _______, _______, KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_QUOT,
-    _______, _______, _______, KC_LCTL, MO(NAVNUM),_______, _______, KC_SPC, BspNAV, _______, _______, _______
-),
-
-[COLMAK] = LAYOUT_planck_grid(
-    KC_Q,   KC_W,    KC_F,     KC_P,    KC_B,	   _______, _______, KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN,
-    KC_A,   KC_R,    KC_S,     KC_T,    KC_G,	   _______, _______, KC_M,   KC_N,   KC_E,    KC_I,    KC_O,
-    KC_Z,   KC_X,    KC_C,     KC_D,    KC_V,	   _______, _______, KC_K,   KC_H,   KC_COMM, KC_DOT,  KC_QUOT,
-    _______, _______, _______, KC_LCTL, MO(NAVNUM),_______, _______, KC_SPC, BspNAV, _______, _______, _______
-
-),
-/* NAVNUM
- * ,-----------------------------------------------------------------------------------.
- * |Enter | Home |  Up  | End  |      |         RST |  -   |   7  |   8  |   9  |   0  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |OneSFT| Left | Down |Right | ` ~  |        CLMK |  +   |   4  |   5  |   6  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |OneCTL|OneALT| Tab  |   _  |OneWIN|        QWER |  =   |   1  |   2  |   3  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |                    |      |      |             |SpcFUN| Ctrl |                    |
- * `-----------------------------------------------------------------------------------'
- */
-[NAVNUM] = LAYOUT_planck_grid(
-  KC_ENT,  KC_HOME, KC_UP,   KC_END, _______,  _______, QK_BOOT,    KC_PMNS, KC_7,    KC_8,   KC_9,     KC_0,
-  OneSFT,  KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV,  _______, DF(COLMAK), KC_PPLS, KC_4,    KC_5,   KC_6,     KC_ENT,
-  OneCTL,   OneALT, KC_TAB,  KC_UNDS, OneWIN,  _______, DF(QWERTY), KC_EQL,  KC_1,    KC_2,   KC_3,     _______,
-  _______, _______, _______, _______, _______, _______, _______,    SpcFUN,  KC_LCTL, _______, _______, _______
-),
-/* FUNC: Mousekeys + F keys
- * ,-----------------------------------------------------------------------------------.
- * |      |Rclick| MsUp |Lclick| WhUp |             |      |  F7  |  F8  |  F9  |  F10 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | MsLt | MsDn | MsRt | WhDn |             |OneALT|  F4  |  F5  |  F6  |  F11 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |Mclick|      |      |             |      |  F1  |  F2  |  F3  |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |                    |      |      |             |      |      |                    |
- * `-----------------------------------------------------------------------------------'
- */
-[FUNC] = LAYOUT_planck_grid(
-  _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,
-  _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, OneALT , KC_F4,   KC_F5,   KC_F6,   KC_F11,
-  _______, _______, KC_BTN3, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-};
-
diff --git a/keyboards/planck/keymaps/bghull/rules.mk b/keyboards/planck/keymaps/bghull/rules.mk
deleted file mode 100644
index 664ed740781..00000000000
--- a/keyboards/planck/keymaps/bghull/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC += muse.c
-AUTO_SHIFT_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-AUDIO_ENABLE = no
-COMBO_ENABLE = yes
-VPATH += keyboards/gboards
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/bone2planck/keymap.c b/keyboards/planck/keymaps/bone2planck/keymap.c
deleted file mode 100644
index 6e84ca796a3..00000000000
--- a/keyboards/planck/keymaps/bone2planck/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-// for intellisense, has to be commented for building
-/*
-#include "..\..\..\..\quantum\keymap_extras\keymap_german.h"
-#include "..\..\..\..\tmk_core\common\keycode.h"
-*/
-
-/* This Layout tries to emulate the Bone2 Variant of Neo2, and is intended to be used with a German QWERTZ Softwarelayout.
-It has "üäöß" as it is optimized for a mix of German & English.
-My favourite features are the placement of the special characters often used for programming right on the home row
-and the number & navigation block combo, so you never have to move your hands from their home position.
-
-Bone2 wiki page: http://wiki.neo-layout.org/wiki/Bone
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Bone2 (adapted)
-* ,-----------------------------------------------------------------------------------.
-* | ß    |   J  |   D  |   U  |   A  |   X  |   P  |   H  |   L  |   M  |   W  |  Q   |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  M1  |   C  |   T  |   I  |   E  |   O  |   B  |   N  |   R  |   S  |   G  |M1/Ent|  //hold for M1, tap for Enter
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|   F  |   V  |   Ü  |   Ä  |   Ö  |   Y  |   Z  |   ,  |   .  |   K  |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M4  |  M2  |    Space    |  M2  |  M4  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[0] = LAYOUT_planck_grid(
-     DE_SS,        DE_J,    DE_D,    DE_U,  DE_A,  DE_X,   DE_P,   DE_H,  DE_L,    DE_M,    DE_W,    DE_Q         ,
-    // LT(1,KC_TAB), DE_C,    DE_T,    DE_I,  DE_E,  DE_O,   DE_B,   DE_N,  DE_R,    DE_S,    DE_G,    LT(1,KC_ENT) ,
-     MO(1),        DE_C,    DE_T,    DE_I,  DE_E,  DE_O,   DE_B,   DE_N,  DE_R,    DE_S,    DE_G,    LT(1,KC_ENT) ,
-     KC_LSFT,      DE_F,    DE_V,    DE_UDIA, DE_ADIA, DE_ODIA,  DE_Y,   DE_Z,  DE_COMM, DE_DOT,  DE_K,    KC_LSFT      ,
-     KC_LCTL,      KC_LGUI, KC_LALT, MO(4), MO(2), KC_SPC, KC_SPC, MO(2), MO(4),   KC_RALT, KC_ESC,  KC_RCTL
-),
-
-/* M1 Special Characters
-*  very ergonomic placement for coding
-* ,-----------------------------------------------------------------------------------.
-* | °    |   @  |   _  |   [  |   ]  |   ^  |   !  |   <  |   >  |   =  |   &  |  ´   |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  M1  |   \  |   /  |   {  |   }  |   *  |   ?  |   (  |   )  |   -  |   :  |M1/Ent|  //hold for M1, tap for Enter
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|   #  |   ~  |   |  |   $  |   €  |   +  |   %  |   "  |   '  |   ;  |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M4  |  M2  |    Space    |  M2  |  M4  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[1] = LAYOUT_planck_grid(
-     DE_DEG,  DE_AT,   DE_UNDS, DE_LBRC, DE_RBRC, DE_CIRC, DE_EXLM, DE_LABK, DE_RABK, DE_EQL,  DE_AMPR, DE_ACUT ,
-     _______, DE_BSLS, DE_SLSH, DE_LCBR, DE_RCBR, DE_ASTR, DE_QUES, DE_LPRN, DE_RPRN, DE_MINS, DE_COLN, _______ ,
-     _______, DE_HASH, DE_TILD, DE_PIPE, DE_DLR,  DE_EURO, DE_PLUS, DE_PERC, DE_DQUO, DE_QUOT, DE_SCLN, _______ ,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* M2 Navigation & Number Blocks
-*  very easy to get used to & intuituve placement
-* ,-----------------------------------------------------------------------------------.
-* |      | PgUp | Bksp |  Up  |  DEL | PgDn |      |   7  |   8  |   9  |      | Ins  |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  Tab | Home |  Lft | Down | Right| End  |      |   4  |   5  |   6  |   .  | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|      |  Tab |      | Enter|      |   0  |   1  |   2  |   3  |   ,  |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M3  |  M2  |    Space    |  M2  |  M3  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[2] = LAYOUT_planck_grid(
-     XXXXXXX, KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,  KC_PGDN, XXXXXXX, DE_7,    DE_8,  DE_9,    XXXXXXX, KC_INS  ,
-     KC_TAB,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, DE_4,    DE_5,  DE_6,    DE_DOT,  KC_ENT  ,
-     _______, XXXXXXX, KC_TAB,  XXXXXXX, KC_ENT,  XXXXXXX, DE_0,    DE_1,    DE_2,  DE_3,    DE_COMM, _______ ,
-     _______, _______, _______, MO(3),   _______, _______, _______, _______, MO(3), _______, _______, _______
-),
-
-/* M3 Switched Navigation & Number Blocks for one handed use
-*  accessed by sliding from M2 to M3 with thumb
-* ,-----------------------------------------------------------------------------------.
-* |  Ins |      |  7   |  8   |  9   |      | PgUp | Bksp |  Up  |  DEL | PgDn |      |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  Tab |      |  4   |  5   |  6   |   .  | Home | Left | Down | Right| End  | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|  0   |  1   |  2   |  3   |   ,  |      | Tab  |      | Enter|      |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M3  |      |    Space    |      |  M3  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-
-[3] = LAYOUT_planck_grid(
-     KC_INS,  XXXXXXX, DE_7,    DE_8,    DE_9,    XXXXXXX, KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,  KC_PGDN, XXXXXXX ,
-     _______, XXXXXXX, DE_4,    DE_5,    DE_6,    DE_DOT,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______ ,
-     _______, DE_0,    DE_1,    DE_2,    DE_3,    DE_COMM, XXXXXXX, KC_TAB,  XXXXXXX, KC_ENT,  XXXXXXX, _______ ,
-     _______, _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, _______, _______
-),
-
-
-/* M4 Function & Media Keys
-* ,-----------------------------------------------------------------------------------.
-* |      |      | Print|Scroll|Pause |      |      |  F7  |  F8  |  F9  |  F12 |      |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* | Tab  |      | Mute | Vol- | Vol+ |      |   ³  |  F4  |  F5  |  F6  |  F11 | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|      | Prev | Play | Next |      |   ²  |  F1  |  F2  |  F3  |  F10 |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M4  |  M5  |    Space    |  M5  |  M4  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[4] = LAYOUT_planck_grid(
-     XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX, KC_F7, KC_F8,   KC_F9,   KC_F12,  XXXXXXX ,
-     KC_TAB,  XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, DE_SUP3, KC_F4, KC_F5,   KC_F6,   KC_F11,  KC_ENT  ,
-     _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, DE_SUP2, KC_F1, KC_F2,   KC_F3,   KC_F10,  _______ ,
-     _______, _______, _______, _______, MO(5),   _______, _______, MO(5), _______, _______, _______, _______
-),
-
-
-/* M5 Switched Function & Media Keys|
-*  accessed by sliding from M4 to M5 with thumb
-* ,-----------------------------------------------------------------------------------.
-* |      |      |  F7  |  F8  |  F9  |  F12 |      | Print|Scroll| Pause|      |      |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* | Tab  |  ³   |  F4  |  F5  |  F6  |  F11 |      | Mute | Vol- | Vol+ |      | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|  ²   |  F1  |  F2  |  F3  |  F10 |      | Prev | Play | Next |      |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |      |  M5  |    Space    |  M5  |      | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[5] = LAYOUT_planck_grid(
-     XXXXXXX, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F12,  XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX ,
-     _______, DE_SUP3, KC_F4,   KC_F5,   KC_F6,   KC_F11,  XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______ ,
-     _______, DE_SUP2, KC_F1,   KC_F2,   KC_F3,   KC_F10,  XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, _______ ,
-     _______, _______, _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, _______, _______
-)
-};
diff --git a/keyboards/planck/keymaps/bone2planck/readme.md b/keyboards/planck/keymaps/bone2planck/readme.md
deleted file mode 100644
index be22eabdb99..00000000000
--- a/keyboards/planck/keymaps/bone2planck/readme.md
+++ /dev/null
@@ -1,96 +0,0 @@
-Bone2Planck
-=====================================
-
-This layout tries to emulate the Bone2 variant of Neo2, and is intended to be used with a German QWERTZ softwarelayout.
-It has "üäöß" as it is optimized for a mix of German & English.
-The special character layer and the navigation & number block layer are inspired by the Neo2 layers,
-designed to keep the fingers near the home row.
-
-Bone2 wiki page: http://wiki.neo-layout.org/wiki/Bone
-
-To build, run "make" from within the \bone2planck folder.
-
-## Bone2 (adapted) Base Layer
-```
- ,-----------------------------------------------------------------------------------.
- |  ß   |   J  |   D  |   U  |   A  |   X  |   P  |   H  |   L  |   M  |   W  |  Q   |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  M1  |   C  |   T  |   I  |   E  |   O  |   B  |   N  |   R  |   S  |   G  |M1/Ent| hold: M1, tap: Enter
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   F  |   V  |   Ü  |   Ä  |   Ö  |   Y  |   Z  |   ,  |   .  |   K  |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M4  |  M2  |    Space    |  M2  |  M4  | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-```
-
-## M1 Special Characters
-  very ergonomic placement for coding
-```
- ,-----------------------------------------------------------------------------------.
- |  °   |   @  |   _  |   [  |   ]  |   ^  |   !  |   <  |   >  |   =  |   &  |  ´   |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  M1  |   \  |   /  |   {  |   }  |   *  |   ?  |   (  |   )  |   -  |   :  |M1/Ent| hold: M1, tap: Enter
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   #  |   ~  |   |  |   $  |   €  |   +  |   %  |   "  |   '  |   ;  |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M4  |  M2  |    Space    |  M2  |  M4  | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-```
-
-## M2 Navigation & Number Blocks
-  very easy to get used to & intuituve placement
-```
- ,-----------------------------------------------------------------------------------.
- |      | PgUp | Bksp |  Up  |  DEL | PgDn |      |   7  |   8  |   9  |      | Ins  |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  Tab | Home |  Lft | Down | Right| End  |      |   4  |   5  |   6  |   .  | Enter|
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|      |  Tab |      | Enter|      |   0  |   1  |   2  |   3  |   ,  |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M3  |  M2  |    Space    |  M2  |  M3  | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-```
-
-## M4 Function & Media Keys
-```
- ,-----------------------------------------------------------------------------------.
- |      |      | Print|Scroll|Pause |      |      |  F7  |  F8  |  F9  |  F12 |      |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  Tab |      | Mute | Vol- | Vol+ |      |   ³  |  F4  |  F5  |  F6  |  F11 | Enter|
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|      | Prev | Play | Next |      |   ²  |  F1  |  F2  |  F3  |  F10 |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M4  |  M5  |    Space    |  M5  |  M4  | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-```
-
-
-##Switched layers for one handed access:
-
-### M3 Switched Navigation & Number Blocks
-  accessed by sliding from M2 to M3 with thumb
-```
- ,-----------------------------------------------------------------------------------.
- | Ins  |      |  7   |  8   |  9   |      | PgUp | Bksp |  Up  |  DEL | PgDn |      |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  Tab |      |  4   |  5   |  6   |   .  | Home | Left | Down | Right| End  | Enter|
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|  0   |  1   |  2   |  3   |   ,  |      | Tab  |      | Enter|      |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M3  |      |    Space    |      |  M3  | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-```
-
-### M5 Switched Function & Media Keys
-  accessed by sliding from M4 to M5 with thumb
-```
- ,-----------------------------------------------------------------------------------.
- |      |      |  F7  |  F8  |  F9  |  F12 |      | Print|Scroll| Pause|      |      |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  Tab |  ³   |  F4  |  F5  |  F6  |  F11 |      | Mute | Vol- | Vol+ |      | Enter|
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|  ²   |  F1  |  F2  |  F3  |  F10 |      | Prev | Play | Next |      |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |      |  M5  |    Space    |  M5  |      | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-```
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/bone2planck/rules.mk b/keyboards/planck/keymaps/bone2planck/rules.mk
deleted file mode 100644
index 628f1fb0a10..00000000000
--- a/keyboards/planck/keymaps/bone2planck/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/buffet/config.h b/keyboards/planck/keymaps/buffet/config.h
deleted file mode 100644
index a6567d8e565..00000000000
--- a/keyboards/planck/keymaps/buffet/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 150
-#define PERMISSIVE_HOLD
-
-// Disable all RGB effects
-#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_BAND_SAT
-#undef ENABLE_RGB_MATRIX_BAND_VAL
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_MULTISPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/buffet/keymap.c b/keyboards/planck/keymaps/buffet/keymap.c
deleted file mode 100644
index abcb5f75689..00000000000
--- a/keyboards/planck/keymaps/buffet/keymap.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- *           2020 Niclas Meyer
- *
- * 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 K(kc) (1ull<<((kc) - ALPHA))
-
-#define KALPHA   K(ALPHA)
-#define KBETA    K(BETA)
-#define KGAMMA   K(GAMMA)
-#define KDELTA   K(DELTA)
-#define KEPSILON K(EPSILON)
-#define KZETA    K(ZETA)
-#define KTHETA   K(THETA)
-#define KIOTA    K(IOTA)
-#define KKAPPA   K(KAPPA)
-
-enum keys {
-    ALPHA = SAFE_RANGE,
-    BETA,
-    GAMMA,
-    DELTA,
-    EPSILON,
-    ZETA,
-    THETA,
-    IOTA,
-    KAPPA,
-    LOCK,
-    NONE,
-};
-
-enum layers {
-    NORMAL,
-    QWERTY,
-    GAME,
-    LOWER,
-    RAISE,
-    PHI,
-    FN,
-};
-
-#define XXXX KC_NO
-#define ____ KC_TRNS
-
-#define CQWER LM(QWERTY, MOD_LCTL)
-#define AQWER LM(QWERTY, MOD_LALT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [NORMAL] = LAYOUT_planck_grid(
-        ALPHA,   BETA,  GAMMA, DELTA,  ____,  ____, ____, ____,  DELTA,  GAMMA, BETA, ALPHA,
-        EPSILON, ZETA,  THETA, IOTA,   ____,  ____, ____, ____,  IOTA,   THETA, ZETA, EPSILON,
-        ____,    ____,  ____,  ____,   ____,  ____, ____, ____,  ____,   ____, ____,  ____,
-        MO(PHI), CQWER, AQWER, MO(FN), KAPPA, ____, XXXX, KAPPA, MO(FN), ____, ____,  MO(PHI)
-    ),
-    [QWERTY] = LAYOUT_planck_grid(
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,      KC_T,   KC_Y, KC_U,      KC_I,    KC_O,    KC_P,    KC_BSPC,
-        KC_ESC,  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, SC_SENT,
-        MO(PHI), KC_LCTL, KC_LALT, KC_LGUI, MO(LOWER), KC_SPC, XXXX, MO(RAISE), KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-    ),
-    [GAME] = LAYOUT_planck_grid(
-        KC_ESC,  KC_1, KC_2, KC_3, KC_4,   KC_5, KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_BSPC,
-        KC_TAB,  KC_Q, KC_W, KC_E, KC_R,   KC_T, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-        KC_LSFT, KC_A, KC_S, KC_D, KC_F,   KC_G, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
-        KC_LCTL, KC_Z, KC_X, KC_C, KC_SPC, ____, XXXX, ____, KC_V,    KC_B,   ____,    MO(PHI)
-    ),
-    [LOWER] = LAYOUT_planck_grid(
-        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_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-        ____,    ____,    ____,   ____,    ____,  ____,    ____,    KC_PGUP, KC_PGDN, KC_HOME, KC_END,  ____,
-        ____,    ____,    ____,   ____,    ____,  ____,    XXXX,    ____,    KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-    ),
-    [RAISE] = LAYOUT_planck_grid(
-        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_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-        ____,   ____, ____, ____, ____, ____, ____, KC_PGUP,  KC_PGDN, KC_HOME, KC_END, ____,
-        ____,   ____, ____, ____, ____, ____, XXXX, ____,    KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-    ),
-    [PHI] = LAYOUT_planck_grid(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,  KC_F4,  ____, ____, ____,       ____,       ____,     ____,    KC_DEL,
-        ____,  KC_F5,   KC_F6,   KC_F7,  KC_F8,  ____, ____, DF(QWERTY), DF(NORMAL), DF(GAME), ____,    KC_F13,
-        ____,  KC_F9,   KC_F10,  KC_F11, KC_F12, ____, ____, ____,       ____,       ____,     ____,    ____,
-        ____,  RGB_TOG, RGB_MOD, ____,   ____,   ____, XXXX, ____,       KC_MNXT,    KC_VOLD,  KC_VOLU, KC_MPLY
-    ),
-    [FN] = LAYOUT_planck_grid(
-        ____,    ____,    KC_UP,   ____,     ____, ____, ____, ____, ____,    KC_UP,   ____,     ____,
-        KC_DEL,  KC_LEFT, KC_DOWN, KC_RIGHT, ____, ____, ____, ____, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL,
-        KC_HOME, KC_END,  KC_PGUP, KC_PGDN,  ____, ____, ____, ____, KC_PGDN, KC_PGUP, KC_HOME,  KC_END,
-        ____,    ____,    ____,    ____,     ____, ____, XXXX, ____, ____,    ____,    ____,     ____
-    ),
-};
-
-static uint16_t left_chord = 0;
-static uint16_t right_chord = 0;
-
-static bool locking = false;
-static bool locked = false;
-static uint16_t mods = 0;
-
-#define PROCESS_MOD(mod)                                 \
-    do {                                                 \
-        if ((mods & MOD_##mod) && !(keys & MOD_##mod)) { \
-            unregister_code16(KC_##mod);                 \
-        }                                                \
-        if (!(mods & MOD_##mod) && (keys & MOD_##mod)) { \
-            register_code16(KC_##mod);                   \
-        }                                                \
-    } while (0)
-
-static void process_keys(uint16_t keys) {
-    if (keys == NONE) {
-        return;
-    }
-
-    if (keys == LOCK) {
-        locking = !locking;
-        return;
-    }
-
-    if ((keys & QK_ONE_SHOT_MOD) == QK_ONE_SHOT_MOD) {
-        PROCESS_MOD(LCTL);
-        PROCESS_MOD(LSFT);
-        PROCESS_MOD(LALT);
-        PROCESS_MOD(LGUI);
-
-        mods = keys & ~QK_ONE_SHOT_MOD;
-        locked = false;
-
-        if (locking) {
-            locking = false;
-            locked  = true;
-        }
-
-        return;
-    }
-
-    // Normal key
-    tap_code16(keys);
-    locking = false;
-
-    if (mods && !locked) {
-        if (mods & MOD_LCTL) {
-            unregister_code16(KC_LCTL);
-        }
-
-        if (mods & MOD_LSFT) {
-            unregister_code16(KC_LSFT);
-        }
-
-        if (mods & MOD_LALT) {
-            unregister_code16(KC_LALT);
-        }
-
-        if (mods & MOD_LGUI) {
-            unregister_code16(KC_LGUI);
-        }
-
-        mods = 0;
-    }
-}
-
-static uint16_t chord_to_keys(uint16_t chord) {
-    switch (chord) {
-        // Unshifted Extra
-        case KKAPPA:                            return KC_SPC;
-        case KEPSILON | KZETA | KTHETA | KIOTA: return KC_ENT;
-        case KEPSILON | KZETA | KGAMMA | KIOTA: return KC_TAB;
-        case KEPSILON | KIOTA:                  return KC_BSPC;
-        case KKAPPA | KEPSILON:                 return KC_ESC;
-
-        // Shifted Extra
-        case KKAPPA | KEPSILON | KZETA | KTHETA | KIOTA: return S(KC_ENT);
-        case KKAPPA | KEPSILON | KZETA | KGAMMA | KIOTA: return S(KC_TAB);
-        case KKAPPA | KEPSILON | KIOTA:                  return S(KC_BSPC);
-
-        // Lowercase Letters
-        case KBETA:                   return KC_A;
-        case KZETA | KDELTA:          return KC_B;
-        case KBETA | KGAMMA | KDELTA: return KC_C;
-        case KZETA | KTHETA | KIOTA:  return KC_D;
-        case KDELTA:                  return KC_E;
-        case KGAMMA | KIOTA:          return KC_F;
-        case KBETA | KTHETA:          return KC_G;
-        case KZETA | KTHETA:          return KC_H;
-        case KGAMMA:                  return KC_I;
-        case KBETA | KGAMMA | KIOTA:  return KC_J;
-        case KBETA | KTHETA | KIOTA:  return KC_K;
-        case KBETA | KGAMMA:          return KC_L;
-        case KBETA | KDELTA:          return KC_M;
-        case KZETA:                   return KC_N;
-        case KTHETA:                  return KC_O;
-        case KZETA | KGAMMA:          return KC_P;
-        case KBETA | KTHETA | KDELTA: return KC_Q;
-        case KGAMMA | KDELTA:         return KC_R;
-        case KTHETA | KIOTA:          return KC_S;
-        case KIOTA:                   return KC_T;
-        case KZETA | KIOTA:           return KC_U;
-        case KTHETA | KDELTA:         return KC_V;
-        case KZETA | KGAMMA | KIOTA:  return KC_W;
-        case KZETA | KTHETA | KDELTA: return KC_X;
-        case KBETA | KIOTA:           return KC_Y;
-        case KZETA | KGAMMA | KDELTA: return KC_Z;
-
-        // Uppercase Letters
-        case KKAPPA | KBETA:                   return S(KC_A);
-        case KKAPPA | KZETA | KDELTA:          return S(KC_B);
-        case KKAPPA | KBETA | KGAMMA | KDELTA: return S(KC_C);
-        case KKAPPA | KZETA | KTHETA | KIOTA:  return S(KC_D);
-        case KKAPPA | KDELTA:                  return S(KC_E);
-        case KKAPPA | KGAMMA | KIOTA:          return S(KC_F);
-        case KKAPPA | KBETA | KTHETA:          return S(KC_G);
-        case KKAPPA | KZETA | KTHETA:          return S(KC_H);
-        case KKAPPA | KGAMMA:                  return S(KC_I);
-        case KKAPPA | KBETA | KGAMMA | KIOTA:  return S(KC_J);
-        case KKAPPA | KBETA | KTHETA | KIOTA:  return S(KC_K);
-        case KKAPPA | KBETA | KGAMMA:          return S(KC_L);
-        case KKAPPA | KBETA | KDELTA:          return S(KC_M);
-        case KKAPPA | KZETA:                   return S(KC_N);
-        case KKAPPA | KTHETA:                  return S(KC_O);
-        case KKAPPA | KZETA | KGAMMA:          return S(KC_P);
-        case KKAPPA | KBETA | KTHETA | KDELTA: return S(KC_Q);
-        case KKAPPA | KGAMMA | KDELTA:         return S(KC_R);
-        case KKAPPA | KTHETA | KIOTA:          return S(KC_S);
-        case KKAPPA | KIOTA:                   return S(KC_T);
-        case KKAPPA | KZETA | KIOTA:           return S(KC_U);
-        case KKAPPA | KTHETA | KDELTA:         return S(KC_V);
-        case KKAPPA | KZETA | KGAMMA | KIOTA:  return S(KC_W);
-        case KKAPPA | KZETA | KTHETA | KDELTA: return S(KC_X);
-        case KKAPPA | KBETA | KIOTA:           return S(KC_Y);
-        case KKAPPA | KZETA | KGAMMA | KDELTA: return S(KC_Z);
-
-        // Unshifted Numbers
-        case KEPSILON | KZETA:                  return KC_0;
-        case KEPSILON | KZETA | KIOTA:          return KC_1;
-        case KEPSILON | KZETA | KTHETA:         return KC_2;
-        case KEPSILON | KBETA:                  return KC_3;
-        case KEPSILON | KBETA | KDELTA:         return KC_4;
-        case KEPSILON | KBETA | KGAMMA:         return KC_5;
-        case KEPSILON | KBETA | KIOTA:          return KC_6;
-        case KEPSILON | KTHETA:                 return KC_7;
-        case KEPSILON | KBETA | KGAMMA | KIOTA: return KC_8;
-        case KEPSILON | KGAMMA | KDELTA:        return KC_9;
-
-        // Shifted Numbers
-        case KKAPPA | KEPSILON | KZETA | KIOTA:          return KC_EXLM;
-        case KKAPPA | KEPSILON | KZETA | KTHETA:         return KC_AT;
-        case KKAPPA | KEPSILON | KBETA:                  return KC_HASH;
-        case KKAPPA | KEPSILON | KBETA | KDELTA:         return KC_DLR;
-        case KKAPPA | KEPSILON | KBETA | KGAMMA:         return KC_PERC;
-        case KKAPPA | KEPSILON | KBETA | KIOTA:          return KC_CIRC;
-        case KKAPPA | KEPSILON | KTHETA:                 return KC_AMPR;
-        case KKAPPA | KEPSILON | KBETA | KGAMMA | KIOTA: return KC_ASTR;
-        case KKAPPA | KEPSILON | KGAMMA | KDELTA:        return KC_LPRN;
-        case KKAPPA | KEPSILON | KZETA:                  return KC_RPRN;
-
-        // Unshifted Symbols
-        case KEPSILON | KBETA | KTHETA | KIOTA:  return KC_MINS;
-        case KEPSILON | KZETA | KTHETA | KDELTA: return KC_EQL;
-        case KEPSILON | KZETA | KGAMMA:          return KC_LBRC;
-        case KEPSILON | KGAMMA | KIOTA:          return KC_RBRC;
-        case KEPSILON | KBETA | KTHETA:          return KC_BSLS;
-        case KEPSILON | KBETA | KGAMMA | KDELTA: return KC_SCLN;
-        case KEPSILON | KZETA | KDELTA:          return KC_QUOT;
-        case KEPSILON | KTHETA | KIOTA:          return KC_COMM;
-        case KEPSILON | KZETA | KGAMMA | KDELTA: return KC_DOT;
-        case KEPSILON | KGAMMA:                  return KC_SLSH;
-        case KEPSILON | KDELTA:                  return KC_GRV;
-
-        // Shifted Symbols
-        case KKAPPA | KEPSILON | KBETA | KTHETA | KIOTA:  return KC_UNDS;
-        case KKAPPA | KEPSILON | KZETA | KTHETA | KDELTA: return KC_PLUS;
-        case KKAPPA | KEPSILON | KZETA | KGAMMA:          return KC_LCBR;
-        case KKAPPA | KEPSILON | KGAMMA | KIOTA:          return KC_RCBR;
-        case KKAPPA | KEPSILON | KBETA | KTHETA:          return KC_PIPE;
-        case KKAPPA | KEPSILON | KBETA | KGAMMA | KDELTA: return KC_COLN;
-        case KKAPPA | KEPSILON | KZETA | KDELTA:          return KC_DQT;
-        case KKAPPA | KEPSILON | KTHETA | KIOTA:          return KC_LT;
-        case KKAPPA | KEPSILON | KZETA | KGAMMA | KDELTA: return KC_GT;
-        case KKAPPA | KEPSILON | KGAMMA:                  return KC_QUES;
-        case KKAPPA | KEPSILON | KDELTA:                  return KC_TILD;
-
-        // Modifiers
-        case KALPHA | KIOTA: return LOCK;
-
-        case KALPHA: return QK_ONE_SHOT_MOD; // Release all
-
-        case KALPHA | KBETA:  return OSM(MOD_LCTL);
-        case KALPHA | KGAMMA: return OSM(MOD_LSFT);
-        case KALPHA | KDELTA: return OSM(MOD_LALT);
-        case KALPHA | KKAPPA: return OSM(MOD_LGUI);
-
-        case KALPHA | KBETA | KGAMMA:  return OSM(MOD_LCTL | MOD_LSFT);
-        case KALPHA | KBETA | KDELTA:  return OSM(MOD_LCTL | MOD_LALT);
-        case KALPHA | KBETA | KKAPPA:  return OSM(MOD_LCTL | MOD_LGUI);
-        case KALPHA | KGAMMA | KDELTA: return OSM(MOD_LSFT | MOD_LALT);
-        case KALPHA | KGAMMA | KKAPPA: return OSM(MOD_LSFT | MOD_LGUI);
-        case KALPHA | KDELTA | KKAPPA: return OSM(MOD_LALT | MOD_LGUI);
-
-        case KALPHA | KBETA | KGAMMA | KDELTA:  return OSM(MOD_LCTL | MOD_LSFT | MOD_LALT);
-        case KALPHA | KBETA | KGAMMA | KKAPPA:  return OSM(MOD_LCTL | MOD_LSFT | MOD_LGUI);
-        case KALPHA | KBETA | KDELTA | KKAPPA:  return OSM(MOD_LCTL | MOD_LALT | MOD_LGUI);
-        case KALPHA | KGAMMA | KDELTA | KKAPPA: return OSM(MOD_LSFT | MOD_LALT | MOD_LGUI);
-
-        case KALPHA | KBETA | KGAMMA | KDELTA | KKAPPA: return OSM(MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI);
-    }
-
-    return NONE;
-}
-
-static uint16_t *get_hand(keypos_t *key) {
-    if (key->row <= 3) {
-        return &left_chord;
-    }
-
-    if (key->row <= 6) {
-        return &right_chord;
-    }
-
-    // row 7
-    if (key->col <= 2) {
-        return &right_chord;
-    } else {
-        return &left_chord;
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (keycode < ALPHA) {
-        return true;
-    }
-
-    uint16_t *chord = get_hand(&record->event.key);
-
-    if (record->event.pressed) {
-        *chord |= K(keycode);
-        return false;
-    }
-
-    if (*chord != 0) {
-        process_keys(chord_to_keys(*chord));
-        *chord = 0;
-    }
-
-    return false;
-}
-
-#ifdef KEYBOARD_planck_ez
-
-#define LED_BRIGHTNESS 50
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    switch (state) {
-        case 1U << NORMAL:
-            planck_ez_left_led_off();
-            planck_ez_right_led_off();
-            break;
-        case 1U << QWERTY:
-            planck_ez_left_led_level(LED_BRIGHTNESS);
-            planck_ez_right_led_off();
-            break;
-        case 1U << GAME:
-            planck_ez_left_led_off();
-            planck_ez_right_led_level(LED_BRIGHTNESS);
-            break;
-    }
-
-    return state;
-}
-
-#endif /* KEYBOARD_planck_ez */
diff --git a/keyboards/planck/keymaps/buffet/readme.md b/keyboards/planck/keymaps/buffet/readme.md
deleted file mode 100644
index 223595b92c0..00000000000
--- a/keyboards/planck/keymaps/buffet/readme.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# buffet's planck layout
-
-## Layout
-
-The Layout is based on keychords.
-The general idea is that you're able to type everything with either hand, so that you can alternate between hands as you type.
-
-The keys are in a 2x4 block in the top left and top right respectively (mirrored).
-They have greek letter names (see `keymap.c` for more info).
-
-Thumb added to any key means shift is pressed as well.
-
-`-` means the finger presses nothing.
-`^` means the finger presses the upper row.
-`v` means the finger presses the lower row.
-
-```
-Space:   thumb
-Return:  vvvv  vvvv
-Tab:     vv^v  v^vv
-Bspace:  v--v  v--v
-Esc:     lower pinky and thumb
-```
-
-### Letters
-
-```
-a:  -^--  --^-
-b:  -v-^  ^-v-
-c:  -^^^  ^^^-
-d:  -vvv  vvv-
-e:  ---^  ^---
-f:  --^v  v^--
-g:  -^v-  -v^-
-h:  -vv-  -vv-
-i:  --^-  -^--
-j:  -^^v  v^^-
-k:  -^vv  vv^-
-l:  -^^-  -^^-
-m:  -^-^  ^-^-
-n:  -v--  --v-
-o:  --v-  -v--
-p:  -v^-  -^v-
-q:  -^v^  ^v^-
-r:  --^^  ^^--
-s:  --vv  vv--
-t:  ---v  v---
-u:  -v-v  v-v-
-v:  --v^  ^v--
-w:  -v^v  v^v-
-x:  -vv^  ^vv-
-y:  -^-v  v-^-
-z:  -v^^  ^^v-
-```
-
-### Numbers and Symbols
-
-```
-0:  vv--  --vv
-1:  vv-v  v-vv
-2:  vvv-  -vvv
-3:  v^--  --^v
-4:  v^-^  ^-^v
-5:  v^^-  -^^v
-6:  v^-v  v-^v
-7:  v-v-  -v-v
-8:  v^^v  v^^v
-9:  v-^^  ^^-v
--:  v^vv  vv^v
-=:  vvv^  ^vvv
-[:  vv^-  -^vv
-]:  v-^v  v^-v
-\:  v^v-  -v^v
-;:  v^^^  ^^^v
-':  vv-^  ^-vv
-,:  v-vv  vv-v
-.:  vv^^  ^^vv
-/:  v-^-  -^-v
-`:  v--^  ^--v
-```
-
-### Modifiers
-
-Modifiers all use the top pinky key, and a combinations of modifiers you want to activate for the next keypress (very similar to how OMS work).
-For the modifiers the top row of keys is used.
-
-```
-Control: Ringfinger
-Shift:   Middlefinger
-Alt:     Indexfinger
-Super:   Thumb
-```
-
-`^--v  v--^` can be used to lock the next modifier input.
-
-### Remaining
-
-These combinations are unused.
-
-```
-v^v^
-v-v^
-v---
-```
diff --git a/keyboards/planck/keymaps/buffet/rgb_matrix_user.inc b/keyboards/planck/keymaps/buffet/rgb_matrix_user.inc
deleted file mode 100644
index e217d1010a3..00000000000
--- a/keyboards/planck/keymaps/buffet/rgb_matrix_user.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-RGB_MATRIX_EFFECT(rainbow_stripe)
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-static HSV rainbow_stripe_math(HSV hsv, uint8_t i, uint8_t time) {
-    if (i >= 14 && i <= 21) {
-        hsv.h = g_led_config.point[i].x - time;
-    } else {
-        hsv.v = 0;
-    }
-    return hsv;
-}
-
-bool rainbow_stripe(effect_params_t* params) {
-    return effect_runner_i(params, &rainbow_stripe_math);
-}
-
-#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/planck/keymaps/buffet/rules.mk b/keyboards/planck/keymaps/buffet/rules.mk
deleted file mode 100644
index cda82158a2b..00000000000
--- a/keyboards/planck/keymaps/buffet/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-AUDIO_ENABLE      = no
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-COMMAND_ENABLE    = no
-MOUSEKEY_ENABLE   = no
-
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/planck/keymaps/buhearns/config.h b/keyboards/planck/keymaps/buhearns/config.h
deleted file mode 100644
index 142fa1df214..00000000000
--- a/keyboards/planck/keymaps/buhearns/config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-  #define STARTUP_SONG      SONG(MARIO_MUSHROOM)
-  #define UNICODE_SONG_MAC  SONG(COIN_SOUND)
-  #define UNICODE_SONG_LNX  SONG(UNICODE_LINUX)
-  #define UNICODE_SONG_WIN  SONG(UNICODE_WINDOWS)
-  #define UNICODE_SONG_WINC SONG(UNICODE_WINDOWS)
-#endif
-
-#define ENCODER_RESOLUTION    4
-#define MOUSEKEY_DELAY        300
-#define MOUSEKEY_INTERVAL     50
-#define MOUSEKEY_MAX_SPEED    8
-#define MOUSEKEY_TIME_TO_MAX  20
diff --git a/keyboards/planck/keymaps/buhearns/keymap.c b/keyboards/planck/keymaps/buhearns/keymap.c
deleted file mode 100644
index ea7e516e340..00000000000
--- a/keyboards/planck/keymaps/buhearns/keymap.c
+++ /dev/null
@@ -1,99 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum custom_keycodes {
-  B_UPD = SAFE_RANGE,
-  B_SSH,
-  B_SSHK,
-  B_USR,
-  B_X11,
-  B_X12,
-  B_X13
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[0] = 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,
-  LT(5,KC_TAB),KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, LT(4,KC_BSLS),
-  KC_LSFT,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT,KC_ENT),
-  KC_LCTL,     KC_LGUI, KC_LALT, MO(3),   MO(2),   KC_SPC,  KC_SPC,  MO(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[1] = LAYOUT_planck_grid(
-  KC_TRNS, B_UPD,   B_USR,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_7,    KC_8,    KC_9,    KC_DEL,
-  KC_TRNS, B_SSH,   B_SSHK,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_4,    KC_5,    KC_6,    KC_TRNS,
-  KC_TRNS, B_X11,   B_X12,   B_X13,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_1,    KC_2,    KC_3,    KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0,    KC_PDOT, KC_PPLS, KC_PMNS
-),
-
-[2] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_BSPC,
-  KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_SLSH, KC_QUOT, KC_MINS, KC_LCBR, KC_RCBR,  KC_TRNS,
-  KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_DQUO, KC_EQL,  KC_LBRC, KC_RBRC,  KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_LT,   KC_GT,    KC_NO
-),
-
-[3] = LAYOUT_planck_grid(
-  KC_TRNS, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS,  KC_DEL,
-  KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_PGUP, KC_MS_U, KC_PGDN,  KC_TRNS,
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R,  KC_HOME,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_BTN3,  KC_END
-),
-
-[4] = LAYOUT_planck_grid(
-  KC_TRNS, QK_BOOT, DB_TOGG, KC_NO,   KC_NO,   KC_NO,   KC_NO,   MU_NEXT, AU_NEXT, MU_ON,   AU_ON,    KC_EJCT,
-  KC_TRNS, EE_CLR,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   AU_PREV, MU_OFF,  AU_OFF,   KC_TRNS,
-  KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MUTE, KC_MPRV, KC_MNXT,  KC_NO,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_VOLU,  KC_MPLY
-),
-
-[5] = LAYOUT_planck_grid(
-  UC(0xB0), UC(0xB9), UC(0xB2), UC(0xB3), UC(0xDF),   UC(0x20AC), KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-  KC_TRNS,  UC(0xC4), UC(0xD6), UC(0xDC), UC(0xBB),   UC(0xAB),   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-  KC_TRNS,  UC(0xE4), UC(0xF6), UC(0xFC), UC(0x2022), KC_NO,      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, UC_MAC,  UC_LINX, UC_WIN,  UC_WINC
-)};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case B_UPD:
-      if (record->event.pressed) {
-        SEND_STRING("sudo apt update && sudo apt full-upgrade -yyy" SS_TAP(X_ENTER));
-      }
-      break;
-    case B_SSH:
-      if (record->event.pressed) {
-        SEND_STRING("cd /etc/ssh" SS_TAP(X_ENTER) "sudo shasum ssh_host_*" SS_TAP(X_ENTER) "sudo rm ssh_host_*" SS_TAP(X_ENTER) "sudo dpkg-reconfigure openssh-server" SS_TAP(X_ENTER));
-      }
-      break;
-    case B_SSHK:
-      if (record->event.pressed) {
-        SEND_STRING("ssh-keygen -t ed25519" SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_ENTER) SS_TAP(X_ENTER));
-      }
-      break;
-    case B_USR:
-      if (record->event.pressed) {
-        SEND_STRING("useradd -m user" SS_TAP(X_ENTER) "usermod -a -G sudo user" SS_TAP(X_ENTER) "chsh -s /bin/bash user" SS_TAP(X_ENTER) "passwd user" SS_TAP(X_ENTER));
-      }
-      break;
-    case B_X11:
-      if (record->event.pressed) {
-        SEND_STRING("sudo x11vnc -storepasswd /etc/x11vnc.pass" SS_TAP(X_ENTER));
-      }
-      break;
-    case B_X12:
-      if (record->event.pressed) {
-        SEND_STRING("sudo nano /lib/systemd/system/x11vnc.service" SS_TAP(X_ENTER) "[Unit]" SS_TAP(X_ENTER) "Description=Start X11VNC" SS_TAP(X_ENTER) "After=multi-user.target" SS_TAP(X_ENTER) SS_TAP(X_ENTER) "[Service]" SS_TAP(X_ENTER) "Type=simple" SS_TAP(X_ENTER) "ExecStart=/usr/bin/x11vnc -display :0 -auth guess -forever -loop -noxdamage -repeat -rfbauth /etc/x11vnc.pass -rfbport 5900 -shared -localhost -o /var/log/x11vnc.log" SS_TAP(X_ENTER) SS_TAP(X_ENTER) "[Install]" SS_TAP(X_ENTER) "WantedBy=multi-user.target");
-      }
-      break;
-    case B_X13:
-      if (record->event.pressed) {
-        SEND_STRING("sudo systemctl enable x11vnc.service" SS_TAP(X_ENTER));
-      }
-      break;
-    }
-  return true;
-};
diff --git a/keyboards/planck/keymaps/buhearns/readme.md b/keyboards/planck/keymaps/buhearns/readme.md
deleted file mode 100644
index 4dcf4f05dbb..00000000000
--- a/keyboards/planck/keymaps/buhearns/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Buhearns Keymap (February 12th, 2019)
-=====================================
-
-Simple QWERTY keymap with german Unicode umlauts, special characters and several Linux commands. Intended to be working with ENGLISH layout.
-
-
-## Buhearns base layer
-```
- ,-----------------------------------------------------------------------------------.
- | GESC |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | BKSP |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |M5/TAB|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |M4/BSL| hold: M5, tap: TAB // hold: M4, tap: Backslash 
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |LSHIFT|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |ST/ENT| hold: RSHIFT, tap: Enter
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | CTRL | LGUI | LALT |  M3  |  M2  |    SPACE    |  M1  | LEFT | DOWN |  UP  | RIGHT|
- `-----------------------------------------------------------------------------------'
-```
-
-## Other layers are a WIP and being tested (DON'T WAIT FOR UPDATES!)
diff --git a/keyboards/planck/keymaps/buhearns/rules.mk b/keyboards/planck/keymaps/buhearns/rules.mk
deleted file mode 100644
index 13e6567c984..00000000000
--- a/keyboards/planck/keymaps/buhearns/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes          # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/planck/keymaps/charlie/keymap.c b/keyboards/planck/keymaps/charlie/keymap.c
deleted file mode 100644
index 4a3adba5133..00000000000
--- a/keyboards/planck/keymaps/charlie/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_planck_grid( /* Native */
-      KC_ESC,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    DF(1), 
-      KC_BSPC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-     KC_TAB,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-      KC_DEL,     KC_LCTL, KC_NO,   KC_LSFT, KC_LALT, KC_SPC,        KC_NO,   KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-),	  
-    [1] = LAYOUT_planck_grid( /* QWERTY->PHOTOSHOP */
-      KC_DELETE,  KC_0,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    DF(0),
-      KC_O,       KC_G,    KC_S,    KC_U,    KC_T,    C(KC_R),  KC_F21,  KC_F10,  KC_F11,  KC_F7,   KC_F8,   KC_F9,
-      KC_TAB,     C(S(A(KC_F9))), C(S(KC_I)),  S(KC_M),  KC_F1,   A(KC_BSPC),  KC_F18,  KC_F19,  KC_F23,  KC_F20,  KC_F22,  C(S(A(KC_F12))),
-      KC_COMM,    KC_DOT,  KC_R, C(KC_H), MO(2),    KC_SPC,        C(KC_S), KC_F2,   C(S(A(KC_X))),  KC_F3,   KC_F14
-	  ),
-    [2] = LAYOUT_planck_grid( /* PHOTOSHOP */
-      KC_ESC,    C(KC_Z), C(KC_Y),   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,   C(S(A(KC_F7))), C(S(A(KC_F8))), C(S(KC_X)), 
-      KC_C,       KC_NO,  S(KC_MINS),  C(S(KC_I)),   KC_NO,   C(S(KC_BSPC)), KC_NO,   KC_NO,   KC_NO,   KC_NO,   C(S(KC_F5)), KC_NO,
-      C(KC_F2),    C(S(KC_F2)), C(KC_0), C(S(KC_H)), MO(2),     KC_SPC,        C(S(KC_S)), KC_NO,   KC_NO,   KC_F24,  KC_NO
-	  )
-};
diff --git a/keyboards/planck/keymaps/charlie/rules.mk b/keyboards/planck/keymaps/charlie/rules.mk
deleted file mode 100644
index d86b02fd1ce..00000000000
--- a/keyboards/planck/keymaps/charlie/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/circuit/Readme.md b/keyboards/planck/keymaps/circuit/Readme.md
deleted file mode 100644
index 58ea0140fdb..00000000000
--- a/keyboards/planck/keymaps/circuit/Readme.md
+++ /dev/null
@@ -1,46 +0,0 @@
-##Design goals:
-1. Arrow keys always available.
-2. As close to a to my US layout 107-key QWERTY keyboard as I could manage, (i.e. as few arbitrary decisions as possible).
-3. Togglable DVORAK keyboard.
-4. most frequently used things in the easiest to reach places.
-5. Ability to game on it, just for fun.
-
-My layout differs from most in the placement the ARROW keys, `ESC`, VOL keys, use of double-tap `CAPS`, and the GAME LOCK function.
-
-I put the layer buttons in the usual spots. I originally wanted only function/symbols layer, but that proved detrimental. I use some timed press actions to save some space, but this has been accounted for, (see GAME LOCK below). I'm not fully satisfied with the current product (see NOTES below), so it may change in the future.
-
-##Effective layers:
-* Default later is obviously your letters and modifiers.
-* Lower layer [NUMBER] is your numbers and punctuation.
-* Upper layer [ACTION] is your symbols and actions.
-* Function layer is the infrequently used function keys, layout toggle, game lock, and reset.
-
-There is also a toggle for the DVORAK/QWERTY layers, but in normal typing this is not of concern.
-
-###Special keys:
-* `RSHFT` and `ENTER` are combined. Tap once for `ENTER` and hold for `RSHFT`. `ENTER` will be registered on release if released within 200 ms, else `RSHFT` is registered starting at 201 ms until release.
-* If for some reason, this interferes with the normal usage of the `ENTER` key in any way, (some problem that may never happen), I have added a regular non-modified `ENTER` key on the same key in the [ACTION] layer.
-* `LSHFT` and `CAPS` are also combined. The key works like a normal `LSHFT` unless double-tapped, in which case it counts as `CAPS`. This functionality unfortunately delays all key presses by at most 200 ms, but I have added ways to disable this both temporarily or permanently, described below.
-* A failsafe `CAPS` key is on the same key in the [ACTION] layer.
-* There are `UNDO`, `CUT`, `COPY`, and `PASTE` keys. This was intended to be a universal way to use these commands since in macOS cut is `⌘ + C` but in Windows it is `⌃ + C`. Unfortunately these special keys only work in Windows. ¯\\\_(ツ)\_/¯
-
-##Game lock:
-**TL;DR** the game lock toggle disables the double-tap `CAPS`, and disables `GUI` keys (WINDOWS key).
-
-I wished for this keyboard to be fully usable in the most demanding of games. The most demanding game I know of is ARMA 3 which has a binding to practically every individual key of a 107-key keyboard. This means I need to have pretty much every key possible somewhere. I also wanted the keyboard to be responsive in games for every critical keypress. This means having a way to disable features that introduce an inherent delay to registering keys, such as double-tap.
-
-I do not expect to see this used by the pros, but I enjoyed making it. As for use in ARMA 3, I got a little ways into the APEX campaign, but I found a few flaws. For Example, I cannot enable my HUD GPS since that requires `RCTRL`+`M` but `RCTRL` is not bound. The obvious fix is to rebind the action to a new key, but I still take this as a shortcoming of my layout.
-
-###If you wish to disable double-tap
-####Disable it temporarily
-Turn on the game lock. While on, it registers as normal `LSHFT` and has no delay. Whether in game mode or not, `CAPS` is on the same key in the [ACTION] layer.
-
-####Disable it permanently
-Open the `Makefile` and set `TAP_DANCE_ENABLE = no`. I wrote the layout to compensate for this change, and no further changes to the code should be necessary. Whether or not it's disabled, `CAPS` is on the same key in the [ACTION] layer.
-
-##Notes:
-* `ALT` and `GUI` are reversed compared to the normal US layout. I will also be using my Planck on my mac, and that's the standard in the Apple ecosystem. I may add a special compiler flag in the future to swap the two.
-* The DVORAK `Z` key is to the right of the `S` key instead of under it as part of a compromise I made to keep the ARROW keys available on the default layer. I prioritize the ARROW keys, so the DVORAK layout is the one to suffer.
-* I also support the little tones that the default Planck layout features, identical to them too, (minus those for layouts I don't support). To enable it, open the `Makefile` and set `AUDIO_ENABLE = yes`.
-
-![keyboard-layout](https://i.imgur.com/HHSZSQq.png)
diff --git a/keyboards/planck/keymaps/circuit/config.h b/keyboards/planck/keymaps/circuit/config.h
deleted file mode 100644
index 2bebf48a1ca..00000000000
--- a/keyboards/planck/keymaps/circuit/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/circuit/keymap.c b/keyboards/planck/keymaps/circuit/keymap.c
deleted file mode 100644
index b7d2b121b95..00000000000
--- a/keyboards/planck/keymaps/circuit/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-// Layout picture at http://www.keyboard-layout-editor.com/#/gists/125febfad6960add078e6f14256539b6
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _DVORAK 1
-#define _LOCKED 2
-#define _NUMBER 3
-#define _ACTION 4
-#define _FUNCTN 5
-
-enum planck_keycodes {
-    QWERTY = SAFE_RANGE,
-    DVORAK,
-    NUMBER,
-    ACTION
-};
-
-// Key code names
-#define SFT_ENT MT(MOD_RSFT, KC_ENT) // Tap for enter, hold for right shift
-#define LOCK    TG(_LOCKED)
-#define KC_PSTE KC_PASTE
-
-#ifdef TAP_DANCE_ENABLE
-#define SFT_CAP TD(0)   // Left shift, double tap for caps
-#endif
-#ifndef TAP_DANCE_ENABLE
-#define SFT_CAP KC_LSFT // Regular left shift
-#endif
-
-// Tap Dance Definitions
-#ifdef TAP_DANCE_ENABLE
-tap_dance_action_t tap_dance_actions[] = {
-    [0]  = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
-};
-#endif
-
-// Layout definitions
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | BKSP |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |*Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |SftEnt|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl | Alt  | Cmd  | Vol- | ACTN |    Space    | NUMS | Vol+ | Left | Down | Left |
- * `-----------------------------------------------------------------------------------'
- */
-[_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,
-    SFT_CAP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   SFT_ENT,
-    KC_LCTL, KC_LALT, KC_LGUI, KC_VOLD, ACTION,  KC_SPC,  KC_SPC,  NUMBER,  KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* DVORAK
- * ,-----------------------------------------------------------------------------------.
- * |      |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______,
-    _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_Z   ,
-    _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* LOCK
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | NULL |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOCKED] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* NUMBERS
- * ,-----------------------------------------------------------------------------------.
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ~  | NULL | NULL | NULL |   |  |   _  |   +  |   {  |   }  |   ?  |   /  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   `  | NULL | NULL | NULL |   \  |   -  |   =  |   [  |   ]  |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |     NULL    |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMBER] = LAYOUT_planck_grid(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    _______, KC_TILD, XXXXXXX, XXXXXXX, XXXXXXX, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_QUES, KC_SLSH,
-    _______, KC_GRV,  XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, _______,
-    _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______
-),
-
-/* ACTIONS
- * ,-----------------------------------------------------------------------------------.
- * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | CAPS | Undo |  Cut | Copy | Paste| NULL | NULL | NULL | NULL | NULL | PgUp | Enter|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      | Mute |      |     NULL    |      | NULL | Home | PgDn |  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_ACTION] = LAYOUT_planck_grid(
-    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL ,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_CAPS, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_ENT ,
-    _______, _______, _______, KC_MUTE, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_HOME, KC_PGDN, KC_END
-),
-
-/* FUNCTIONS
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  F13 |  F14 |  F15 |  F16 |  F17 |  F18 |  F19 |  F20 |  F21 |  F22 |  F23 |  F24 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | NULL | NULL | NULL | NULL | NULL |QWERTY|DVORAK| NULL | NULL | NULL | NULL | NULL |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Reset| NULL | Lock | NULL |      |     NULL    |      | NULL | NULL | NULL | NULL |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTN] = LAYOUT_planck_grid(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12 ,
-    KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24 ,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERTY,  DVORAK,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    QK_BOOT, XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-float tone_dvorak[][2] = SONG(DVORAK_SOUND);
-#endif
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                if (IS_LAYER_ON(_DVORAK)) {
-#ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_qwerty);
-#endif
-                    layer_off(_DVORAK);
-                }
-            }
-            return false;
-            break;
-        case DVORAK:
-            if (record->event.pressed) {
-                if (!IS_LAYER_ON(_DVORAK)) {
-#ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_dvorak);
-#endif
-                    layer_on(_DVORAK);
-                }
-            }
-            return false;
-            break;
-        case NUMBER:
-            if (record->event.pressed) {
-                layer_on(_NUMBER);
-                update_tri_layer(_NUMBER, _ACTION, _FUNCTN);
-            } else {
-                layer_off(_NUMBER);
-                update_tri_layer(_NUMBER, _ACTION, _FUNCTN);
-            }
-            return false;
-            break;
-        case ACTION:
-            if (record->event.pressed) {
-                layer_on(_ACTION);
-                update_tri_layer(_NUMBER, _ACTION, _FUNCTN);
-            } else {
-                layer_off(_ACTION);
-                update_tri_layer(_NUMBER, _ACTION, _FUNCTN);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/planck/keymaps/circuit/rules.mk b/keyboards/planck/keymaps/circuit/rules.mk
deleted file mode 100644
index 14247d1a5c4..00000000000
--- a/keyboards/planck/keymaps/circuit/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the makefile.mk in 
-#   the appropriate keymap folder that will get included automatically
-#
-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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-TAP_DANCE_ENABLE = yes      # Enables the double-tap functionality of keys
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/coloneljesus/config.h b/keyboards/planck/keymaps/coloneljesus/config.h
deleted file mode 100644
index 928ddb1617e..00000000000
--- a/keyboards/planck/keymaps/coloneljesus/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/coloneljesus/keymap.c b/keyboards/planck/keymaps/coloneljesus/keymap.c
deleted file mode 100644
index 0ccc932cb01..00000000000
--- a/keyboards/planck/keymaps/coloneljesus/keymap.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | App  |Lower |    Space    |Raise |   -  |   =  |   \  | Alt  |
- * `-----------------------------------------------------------------------------------'
- */
-[_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, RSFT_T(KC_ENT) ,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_APP,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_MINS, KC_EQL,  KC_BSLS, KC_RALT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |   {  |   }  | Del  | Home | PgDn | PgUp | End  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Mute | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR, KC_LPRN, KC_RPRN,    KC_BSPC,
-  _______, _______, _______, KC_LCBR, KC_RCBR, KC_DEL,  KC_HOME, KC_PGDN,    KC_PGUP, KC_END,  _______,    _______,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   S(KC_NUHS), KC_MPRV, KC_MNXT, S(KC_NUBS), _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_VOLD, KC_VOLU, KC_MPLY,    KC_MUTE
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |   [  |   ]  | Del  | Left | Down |  Up  | Right|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Mute | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_LBRC, KC_RBRC, KC_DEL,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_MPRV, KC_MNXT, KC_NUBS, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, KC_MUTE
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/coloneljesus/readme.md b/keyboards/planck/keymaps/coloneljesus/readme.md
deleted file mode 100644
index 31107f59ce0..00000000000
--- a/keyboards/planck/keymaps/coloneljesus/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# /u/Coloneljesus's Planck Layout
-
diff --git a/keyboards/planck/keymaps/copface/config.h b/keyboards/planck/keymaps/copface/config.h
deleted file mode 100644
index da5d3858c83..00000000000
--- a/keyboards/planck/keymaps/copface/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#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
-
-#define MIDI_BASIC
-#define ENCODER_RESOLUTION 4
-
-#define LEADER_TIMEOUT 300
-#define TAPPING_TERM 180
diff --git a/keyboards/planck/keymaps/copface/keymap.c b/keyboards/planck/keymaps/copface/keymap.c
deleted file mode 100644
index 376ceeb288e..00000000000
--- a/keyboards/planck/keymaps/copface/keymap.c
+++ /dev/null
@@ -1,197 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-// Custom Keycode Definitions
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define META MO(_META)
-
-#define KC_PRS LGUI(LALT(LCTL(KC_4)))
-#define KC_EUR LALT(KC_4)
-#define KC_MGRV LALT(KC_GRV)
-
-#define KC_FORMAT LGUI(LALT(KC_L))
-#define KC_FBSP LALT(KC_BSPC)
-#define KC_FDEL LALT(KC_DEL)
-#define KC_PS3 LSFT(LCTL(LGUI(KC_3)))
-#define KC_PS4 LSFT(LCTL(LGUI(KC_4)))
-
-#define HK_TM LALT(KC_2)
-#define HK_AF9 LALT(KC_F9)
-
-#define KC_SRC LGUI(KC_F12)
-#define KC_RNME LSFT(KC_F6)
-
-#define M_LGSPC LGUI_T(KC_SPC)
-#define M_LCENT LCTL_T(KC_ENT)
-#define M_LGENT LGUI_T(KC_ENT)
-
-enum planck_layers {
-  _DEFAULT = 0,
-  _LOWER,
-  _RAISE,
-  _META,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  KC_ARR = SAFE_RANGE,  // ->
-  KC_FARR,              // =>
-  HK_CLOS,              // />
-  XD1,                  // :D
-  XD3,                  // :DDD
-  XD5,                  // :DDDDD
-  XD15,                 // :DDDDDDDDDDDDDDD
-};
-
-enum tapdancers {
-    T_BR = 0, // [, ]
-    T_PA, // (, )
-    T_CU, // {, }
-    T_DL, // $, €
-    T_SL, // slash, backslash
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  [T_BR] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
-  [T_PA] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN),
-  [T_CU] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
-  [T_DL] = ACTION_TAP_DANCE_DOUBLE(KC_DLR, KC_EUR),
-  [T_SL] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_DEFAULT] = 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,    XXXXXXX, KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,  KC_M,    KC_COMM, KC_DOT,  XXXXXXX, QK_LEAD,
-    KC_LGUI, KC_LCTL, KC_LALT, KC_LALT, LOWER,   KC_SPC,  META,  RAISE,   KC_RALT, KC_MPRV, KC_MPLY, KC_MNXT
-),
-
-[_LOWER] = LAYOUT_planck_grid(
-    KC_F1,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    XXXXXXX, XXXXXXX,  XXXXXXX,
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,       KC_8,       KC_9,    KC_0,     XXXXXXX,
-    _______, HK_TM,   XD1,     XD3,     XD5,     XD15,    XXXXXXX, XXXXXXX,    KC_ARR,     KC_FARR, HK_CLOS,  XXXXXXX,
-    _______, _______, _______, _______, _______, KC_DEL,  KC_FBSP, RAISE,      KC_RALT,    KC_VOLD, KC_MUTE,  KC_VOLU
-),
-
-[_RAISE] = LAYOUT_planck_grid(
-    KC_MGRV, KC_MINUS,   KC_EQL,  KC_EXLM,  KC_QUES, KC_PLUS, KC_PGUP, KC_HOME, KC_UP,   KC_END,  XXXXXXX, KC_FBSP,
-    KC_TILD, TD(T_BR), TD(T_CU), TD(T_PA), TD(T_DL), KC_SLSH, KC_RNME, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, KC_FORMAT,
-    _______, KC_UNDS,   KC_DQUO,  KC_QUOT,  KC_PIPE, KC_BSLS, XXXXXXX, KC_SCLN, KC_COLN, XXXXXXX, XXXXXXX, XXXXXXX,
-    _______, _______,   _______,  _______,  _______, KC_DEL,  KC_FDEL, _______, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU
-),
-
-[_META] = LAYOUT_planck_grid(
-    XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_SRC, XXXXXXX,
-    KC_CAPS,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX,  KC_F10,  KC_F11,  KC_F12,  HK_AF9, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-[_ADJUST] = LAYOUT_planck_grid(
-    XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, CG_TOGG, XXXXXXX,
-    XXXXXXX, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT
-)
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case KC_ARR:
-      if (record->event.pressed) {
-        SEND_STRING("->");
-      }
-
-      return false;
-
-    case KC_FARR:
-      if (record->event.pressed) {
-        SEND_STRING("=>");
-      }
-
-      return false;
-
-    case XD1:
-      if (record->event.pressed) {
-        SEND_STRING(":D");
-      }
-
-      return false;
-
-    case XD3:
-      if (record->event.pressed) {
-        SEND_STRING(":DDD");
-      }
-
-      return false;
-
-    case XD5:
-      if (record->event.pressed) {
-        SEND_STRING(":DDDDD");
-      }
-
-      return false;
-
-    case XD15:
-      if (record->event.pressed) {
-        SEND_STRING(":DDDDDDDDDDDDDDD");
-      }
-
-      return false;
-
-    case HK_CLOS:
-      if (record->event.pressed) {
-        SEND_STRING("/>");
-      }
-
-      return false;
-  }
-
-  return true;
-}
-
-void leader_end_user(void) {
-    // Screenshot
-    if (leader_sequence_one_key(KC_S)) {
-        tap_code16(G(C(S(KC_4))));
-    }
-    // Record Screen
-    if (leader_sequence_two_keys(KC_S, KC_S)) {
-        tap_code16(S(G(KC_5)));
-    }
-    // 1Pass browser
-    if (leader_sequence_one_key(KC_A)) {
-        tap_code16(G(A(KC_BSLS)));
-    }
-    // 1Pass mini
-    if (leader_sequence_two_keys(KC_A, KC_A)) {
-        tap_code16(G(KC_BSLS));
-    }
-    // Comment out
-    if (leader_sequence_one_key(KC_F)) {
-        tap_code16(G(KC_SLSH));
-    }
-    // Spotlight
-    if (leader_sequence_one_key(KC_SPC)) {
-        tap_code16(G(KC_SPC));
-    }
-    // Auto format
-    if (leader_sequence_one_key(KC_ENT)) {
-        tap_code16(S(G(A(KC_F))));
-    }
-    // Focus file tree
-    if (leader_sequence_one_key(KC_TAB)) {
-        tap_code16(G(KC_1));
-    }
-    // Caps-lock
-    if (leader_sequence_two_keys(KC_TAB, KC_TAB)) {
-        tap_code16(KC_CAPS);
-    }
-}
diff --git a/keyboards/planck/keymaps/copface/readme.md b/keyboards/planck/keymaps/copface/readme.md
deleted file mode 100644
index 56a048c4a9e..00000000000
--- a/keyboards/planck/keymaps/copface/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copface's planck keyboard layout
-
-This layout utilizes tapdancing and leader keys as well as 3 extra layers for maximizing the efficiancy when programming.
-
-Please see the keymap.c for how the keymap looks and works.
-The home row is filled with everything one could need when working on web development,
-It's all a layer away.
-
-To build and flash this keymap, use this command:
-
-    qmk compile -kb planck/rev6 -km copface
diff --git a/keyboards/planck/keymaps/copface/rules.mk b/keyboards/planck/keymaps/copface/rules.mk
deleted file mode 100644
index e259574a4e4..00000000000
--- a/keyboards/planck/keymaps/copface/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-SRC += muse.c
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-MIDI_ENABLE = no
-AUDIO_ENABLE = yes
-RGBLIGHT_ENABLE = no
-TAP_DANCE_ENABLE = yes
-LEADER_ENABLE = yes
diff --git a/keyboards/planck/keymaps/corvec/config.h b/keyboards/planck/keymaps/corvec/config.h
deleted file mode 100644
index ec955ebc528..00000000000
--- a/keyboards/planck/keymaps/corvec/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#define PERMISSIVE_HOLD
-
-// AutoShift config
-#define AUTO_SHIFT_TIMEOUT 135
-#define NO_AUTO_SHIFT_SPECIAL
-// #define NO_AUTO_SHIFT_NUMERIC
-// #define NO_AUTO_SHIFT_ALPHA
-
-// TapDance config
-#define TAPPING_TERM 150
-
-#endif
diff --git a/keyboards/planck/keymaps/corvec/keymap.c b/keyboards/planck/keymaps/corvec/keymap.c
deleted file mode 100644
index dda349b2a62..00000000000
--- a/keyboards/planck/keymaps/corvec/keymap.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Copyright 2015-2018 Jack Humbert, Corey Kump
- *
- * 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
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _COLEMAK,
-  _QWERTY,
-  _LOWER,
-  _LEANDOWN,
-  _RAISE,
-  _WOBBLE,
-  _PLOVER,
-  _ADJUST
-};
-
-/* This include relies on the layer constants above and so must be declared after them */
-#include "tapdance.c"
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-/**
- * Custom Corvec Bindings
- *
- * Previously used but currently unused bindings are commented out.
- **/
-
-// Activate the Wobble layer
-#define KC_WOBL MO(_WOBBLE)
-// Dual function with Raise
-#define KC_RESC LT(_RAISE, KC_ESC)
-// Dual functions with Lower
-#define KC_LENT LT(_LOWER, KC_ENT)
-#define KC_LQUT LT(_LEANDOWN, KC_QUOT)
-// Dual functions with Shift
-#define KC_SDEL MT(MOD_LSFT, KC_DEL)
-#define KC_SAPP MT(MOD_LSFT, KC_APP)
-
-/**
- * Functions taking advantage of tap dance:
- **/
-// Tap once: quote. Hold: LEANDOWN layer. Tap twice: minus.
-#define KC_TQTD TD(TD_QUOT_LEAN_MINS)
-// Tap once: [. Hold: RALT. Tap twice: {
-#define KC_TALT TD(TD_LBRC_RALT_LCBR)
-// Tap once: ]. Hold: RGUI. Tap twice: }
-#define KC_TGUI TD(TD_RBRC_RGUI_RCBR)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_COLEMAK] = LAYOUT_planck_grid(
-  //-----+----+----+----+----+----+----+----+----+----+----+----
-     KC_TAB , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  , KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_BSPC,
-  //-----+----+----+----+----+----+----+----+----+----+----+----
-     KC_RESC, KC_A  , KC_R  , KC_S  , KC_T  , KC_D  , KC_H  , KC_N  , KC_E  , KC_I  , KC_O  ,KC_TQTD,
-  //-----+----+----+----+----+----+----+----+----+----+----+----
-     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_LCTL,KC_LGUI,KC_WOBL,KC_LALT,KC_LENT, KC_SPC, KC_SPC,RAISE,KC_SDEL,KC_TALT,KC_TGUI,KC_RCTL
-  ),
-
-  [_QWERTY] = LAYOUT_planck_grid(
-  //-----+----+----+----+----+----+----+----+----+----+----+----
-     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSPC,
-  //-----+----+----+----+----+----+----+----+----+----+----+----
-     KC_RESC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_TQTD,
-  //-----+----+----+----+----+----+----+----+----+----+----+----
-     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_WOBL,KC_LALT,KC_LENT, KC_SPC, KC_SPC,RAISE,KC_RALT,KC_SAPP,KC_RGUI,KC_RCTL
-  ),
-
-  [_LOWER] = LAYOUT_planck_grid(
-     KC_GRV ,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
-     _______,KC_LPRN,KC_RPRN,KC_LBRC,KC_RBRC,XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,XXXXXXX,KC_MINS,
-     _______,KC_BSLS,KC_TILD,KC_PIPE,KC_EQL ,KC_UNDS,KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_BSLS,_______,
-     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
-  ),
-
-  [_LEANDOWN] = LAYOUT_planck_grid(
-     KC_GRV ,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
-     _______,KC_LPRN,KC_RPRN,KC_LBRC,KC_RBRC,KC_LCBR,KC_LCBR,KC_DLR ,KC_PERC,KC_CIRC,_______,_______,
-     _______,KC_BSLS,KC_TILD,KC_PIPE,KC_EQL ,KC_UNDS,KC_HOME,KC_EXLM, KC_AT ,KC_HASH,KC_BSLS,_______,
-     _______,_______,_______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT
-  ),
-
-  [_RAISE] = LAYOUT_planck_grid(
-     KC_GRV ,  KC_1 ,  KC_2 ,  KC_3 ,  KC_4 ,  KC_5 ,  KC_6 ,  KC_7 ,  KC_8 ,  KC_9 ,  KC_0 ,_______,
-     _______,KC_LPRN,KC_RPRN,KC_LCBR,KC_RCBR,XXXXXXX,XXXXXXX,  KC_4 ,  KC_5 ,  KC_6 ,KC_PPLS,KC_MINS,
-     _______,KC_BSLS,KC_TILD,KC_PIPE,KC_EQL ,KC_UNDS,XXXXXXX,  KC_1 ,  KC_2 ,  KC_3 ,KC_PAST,_______,
-     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
-  ),
-
-  [_WOBBLE] = LAYOUT_planck_grid(
-     KC_GRV , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NO ,KC_MUTE,KC_VOLD,KC_VOLU, KC_NO , KC_NO , KC_DEL,
-     _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_NO ,KC_MPRV,KC_MPLY,KC_MSTP,KC_MNXT, KC_NO ,KC_BSLS,
-     _______, KC_F9 , KC_F10, KC_F11, KC_F12, KC_NO , KC_NO , KC_NO , KC_NO , KC_INS,KC_PSCR,_______,
-     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
-  ),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Colemk|      | Debug|RGB Tg|RGB Md|RGB H+|RGB H-|RGB S+|RGB S-|RGB V+|RGB V-|Qwerty|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|      |AS On | AS + |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |AS Rep|AS Off| AS - |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | Reset|
- * `-----------------------------------------------------------------------------------'
- */
-
-[_ADJUST] = LAYOUT_planck_grid(
-  COLEMAK, _______, DB_TOGG,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QWERTY ,
-  _______, _______, MU_NEXT,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, _______, AS_ON,   AS_UP,
-  _______, AU_PREV, AU_NEXT,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, AS_RPT,  AS_OFF,  AS_DOWN,
-  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT  
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        PORTE &= ~(1<<6);
-      } else {
-        unregister_code(KC_RSFT);
-        PORTE |= (1<<6);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/corvec/readme.md b/keyboards/planck/keymaps/corvec/readme.md
deleted file mode 100644
index 05591455560..00000000000
--- a/keyboards/planck/keymaps/corvec/readme.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Corvec's Planck Layout
-
-This layout is a development-focused layout with an emphasis on ergonomics. It is intended to be used in Colemak mode,
-but has a full-QWERTY mode for gaming compatibility.
-
-It utilizes redundancy for common keys so that they are more easily accessible in every task. For example, the common
-layers, Raise and Lower, both can be activated with two different keys, each pressed with either hand. Certain symbols
-( \~|+_ ) are on both layers, since the keys they take up are a bit out of the way. The minus symbol is available on the
-quote key in a variety of ways - both layers, as well as via tap dance.
-
-The right-hand Lower activation key activates a slightly different layer. The keys accessed by the opposite hand are the
-same as the Lower layer, but the keys on the right hand differ. For this reason, we refer to this instead as the
-Leandown layer.
-
-Auto-shift is enabled, but there are also three shift keys, since typing with auto-shift is by necessity slow.
-
-Movement is done Vim-style, on the hjkl / hnei keys, on the Lower layer so that it is easiest to activate it.
-The arrow keys are mimicked by Home/PgDn/PgUp/End on the next row.
-
-The arrow keys and broad navigation keys are replaced by a symbol-pad on the Leandown layer. However, in order to allow
-single-hand navigation, the bottom right corner cluster becomes arrow keys.
-
-Media keys are in the same location as the arrow keys, but are on the Wobble layer instead.
-
-Toggle layers are minimized so that the state of the keyboard is more predictable. Shift Toggle is in the works, but
-will not be included until it can be set to deactivate automatically.
-
-Delete is accessible from the third Shift key.
diff --git a/keyboards/planck/keymaps/corvec/rules.mk b/keyboards/planck/keymaps/corvec/rules.mk
deleted file mode 100644
index 4398ea54527..00000000000
--- a/keyboards/planck/keymaps/corvec/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTO_SHIFT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-CONSOLE_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/planck/keymaps/corvec/tapdance.c b/keyboards/planck/keymaps/corvec/tapdance.c
deleted file mode 100644
index 35eef2d838f..00000000000
--- a/keyboards/planck/keymaps/corvec/tapdance.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Tap Dance config and functions
- **/
-/* Copyright 2018 Corey Kump
- *
- * 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/>.
- */
-
-enum {
-    SINGLE_TAP = 1,
-    SINGLE_HOLD = 2,
-    DOUBLE_TAP = 3,
-    DOUBLE_SINGLE_TAP = 4,
-    UNKNOWN_TAPS = 5
-};
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} tap;
-
-int cur_dance (tap_dance_state_t *state) {
-    if (state->count == 1) {
-      if (state->interrupted || !state->pressed) {
-        return SINGLE_TAP;
-      } else {
-        return SINGLE_HOLD;
-      }
-    }
-    if (state->count == 2) {
-      if (state->interrupted) {
-        return DOUBLE_SINGLE_TAP;
-      } else if (!state->pressed) {
-        return DOUBLE_TAP;
-      }
-    }
-    return UNKNOWN_TAPS;
-}
-
-/**
- * quote
- **/
-
-static tap quote_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void quote_finished(tap_dance_state_t *state, void *user_data) {
-    quote_state.state = cur_dance(state);
-    switch(quote_state.state) {
-      case SINGLE_TAP: register_code(KC_QUOT); break;
-      case SINGLE_HOLD: layer_on(_LEANDOWN); break;
-      case DOUBLE_TAP: register_code(KC_MINS); break;
-      case DOUBLE_SINGLE_TAP: register_code(KC_QUOT); unregister_code(KC_QUOT); register_code(KC_QUOT); break;
-    }
-}
-void quote_reset(tap_dance_state_t *state, void *user_data) {
-    switch(quote_state.state) {
-      case SINGLE_TAP: unregister_code(KC_QUOT); break;
-      case SINGLE_HOLD: layer_off(_LEANDOWN); break;
-      case DOUBLE_TAP: unregister_code(KC_MINS); break;
-      case DOUBLE_SINGLE_TAP: unregister_code(KC_QUOT); break;
-    }
-    quote_state.state = 0;
-}
-
-/**
- * ralt / left bracket / left curly brace
- **/
-
-static tap ralt_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void ralt_finished(tap_dance_state_t *state, void *user_data) {
-    ralt_state.state = cur_dance(state);
-    switch(ralt_state.state) {
-      case SINGLE_TAP: register_code(KC_LBRC); break;
-      case SINGLE_HOLD: register_code(KC_RALT); break;
-      case DOUBLE_TAP: register_code(KC_LSFT); register_code(KC_LBRC); break;
-      // fallback to alt because it's the primary purpose of this key
-      case DOUBLE_SINGLE_TAP: register_code(KC_RALT); break;
-    }
-}
-void ralt_reset(tap_dance_state_t *state, void *user_data) {
-    switch(ralt_state.state) {
-      case SINGLE_TAP: unregister_code(KC_LBRC); break;
-      case SINGLE_HOLD: unregister_code(KC_RALT); break;
-      case DOUBLE_TAP: unregister_code(KC_LBRC); unregister_code(KC_LSFT); break;
-      case DOUBLE_SINGLE_TAP: unregister_code(KC_RALT); break;
-    }
-    ralt_state.state = 0;
-}
-
-/**
- * rgui / right bracket / right curly brace
- **/
-
-static tap rgui_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void rgui_finished(tap_dance_state_t *state, void *user_data) {
-    rgui_state.state = cur_dance(state);
-    switch(rgui_state.state) {
-      case SINGLE_TAP: register_code(KC_RBRC); break;
-      case SINGLE_HOLD: register_code(KC_RGUI); break;
-      case DOUBLE_TAP: register_code(KC_LSFT); register_code(KC_RBRC); break;
-      // fallback to alt because it's the primary purpose of this key
-      case DOUBLE_SINGLE_TAP: register_code(KC_RGUI); break;
-    }
-}
-void rgui_reset(tap_dance_state_t *state, void *user_data) {
-    switch(rgui_state.state) {
-      case SINGLE_TAP: unregister_code(KC_RBRC); break;
-      case SINGLE_HOLD: unregister_code(KC_RGUI); break;
-      case DOUBLE_TAP: unregister_code(KC_RBRC); unregister_code(KC_LSFT); break;
-      case DOUBLE_SINGLE_TAP: unregister_code(KC_RGUI); break;
-    }
-    rgui_state.state = 0;
-}
-
-/**
- * Define the available tap dance keys
- **/
-
-enum {
-  TD_ALT_SHIFT = 0,
-  TD_LQUT_MINS,
-  TD_QUOT_LEAN_MINS,
-  TD_LBRC_RALT_LCBR,
-  TD_RBRC_RGUI_RCBR
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  // Tap once for Alt, twice for Shift
-  [TD_ALT_SHIFT] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, KC_RSFT),
-  [TD_QUOT_LEAN_MINS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, quote_finished, quote_reset),
-  [TD_LBRC_RALT_LCBR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ralt_finished, ralt_reset),
-  [TD_RBRC_RGUI_RCBR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rgui_finished, rgui_reset)
-};
-
diff --git a/keyboards/planck/keymaps/daniel/keymap.c b/keyboards/planck/keymaps/daniel/keymap.c
deleted file mode 100644
index e5b52022368..00000000000
--- a/keyboards/planck/keymaps/daniel/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid( /* Qwerty */
-  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,
-  MO(3),   KC_LCTL, KC_LALT, KC_LGUI, MO(2),      KC_SPC,   KC_SPC,    MO(1),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-                                                // Space is repeated to accommadate for both spacebar wiring positions
-),
-[1] = LAYOUT_planck_grid( /* RAISE */
-  KC_GRV, S(KC_1),  S(KC_2),  S(KC_3),  S(KC_4),  S(KC_5),  S(KC_6),  S(KC_7),  S(KC_8),  S(KC_9),  S(KC_0), KC_EQL,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,
-  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MINS,  S(KC_MINS),  KC_BSLS, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(1),     KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[2] = LAYOUT_planck_grid( /* LOWER */
-  S(KC_GRV), KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  S(KC_EQL),
-  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_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_ENT,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[3] = LAYOUT_planck_grid( /* Qwerty */
-  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_RSFT,
-  KC_TRNS, KC_LCTL, KC_LALT, KC_LGUI, MO(2),      KC_SPC,   KC_SPC,    MO(1),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-                                                // Space is repeated to accommadate for both spacebar wiring positions
-)
-};
diff --git a/keyboards/planck/keymaps/daniel/rules.mk b/keyboards/planck/keymaps/daniel/rules.mk
deleted file mode 100644
index d86b02fd1ce..00000000000
--- a/keyboards/planck/keymaps/daniel/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/danielhklein/keymap.c b/keyboards/planck/keymaps/danielhklein/keymap.c
deleted file mode 100644
index a62138e3319..00000000000
--- a/keyboards/planck/keymaps/danielhklein/keymap.c
+++ /dev/null
@@ -1,137 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 custom_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ARROW
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ARROW
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .----------------------------------------------------------------------------------.
- * | Esc |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |Enter |
- * |-----+------+------+------+------+------|------+------+------+------+------+------|
- * | Tab |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |-----+------+------+------+------+------|------+------+------+------+------+------|
- * |Lshft|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  /   |Rshft |
- * |-----+------+------+------+------+------|------+------+------+------+------+------|
- * |Arrow| LCtrl| LAlt | LGui | Lower| Bspc | Space| Raise| RGui | RAlt |RCtrl |  -   |
- * `----------------------------------------------------------------------------------'
- */
-
-[_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_ENT,
-  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,
-  ARROW,   KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_RGUI,   KC_RALT, KC_RCTL, KC_MINS
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |   7  |   8  |   9  |   /  |   \  |   `  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |   4  |   5  |   6  |   *  |   (  |   )  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Lshft|      |      |      |      |      |   1  |   2  |   3  |   -  |   [  |   ]  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      | LGui |      |      |   0  |   .  |   =  |   +  |   {  |   }  |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_LOWER] = LAYOUT_planck_grid(
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_7,    KC_8,    KC_9,    KC_PSLS,  KC_BSLS, KC_GRV,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_4,    KC_5,    KC_6,    KC_PAST,  KC_LPRN, KC_RPRN,
-  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_1,    KC_2,    KC_3,    KC_MINS,  KC_LBRC, KC_RBRC,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,  _______,  XXXXXXX,  KC_0,    KC_DOT,  KC_PEQL, KC_PPLS,  KC_LCBR, KC_RCBR
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | >/|| | Mute | Vol- | Vol+ | |<<  | >>|  |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
-*/
-
-[_RAISE] = LAYOUT_planck_grid(
-  KC_F1,    KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_F7,    KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_MPLY,  KC_MUTE, KC_VOLD,  KC_VOLU, KC_MPRV, KC_MNXT, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Arrow
- * ,----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |     |      |  Up  |      |      |      |
- * |------+------+------+------+------+------|-----+------+------+------+------+------|
- * |      |      |      |      |      |      |     | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|-----+------+------+------+------+------|
- * |      |      |      |      |      |      |     |      |      |      |      |      |
- * |------+------+------+------+------+------|-----+------+------+------+------+------|
- * |      |      |      | Gui  |      |      |     |      |      |      |      |      |
- * `----------------------------------------------------------------------------------'
- */
-
-[_ARROW] = LAYOUT_planck_grid(
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX,  XXXXXXX, XXXXXXX,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT,  XXXXXXX, XXXXXXX,
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
-  _______,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX
-),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-      } else {
-        layer_off(_LOWER);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-      } else {
-        layer_off(_RAISE);
-      }
-      return false;
-      break;
-    case ARROW:
-        if (record->event.pressed) {
-          layer_on(_ARROW);
-        } else {
-          layer_off(_ARROW);
-        }
-        return false;
-        break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/danielhklein/rules.mk b/keyboards/planck/keymaps/danielhklein/rules.mk
deleted file mode 100644
index e31e20009a0..00000000000
--- a/keyboards/planck/keymaps/danielhklein/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-BOOTMAGIC_ENABLE = yes      # 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no       # Enable Tap Dance
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/david/keymap.c b/keyboards/planck/keymaps/david/keymap.c
deleted file mode 100644
index 59a23d9223d..00000000000
--- a/keyboards/planck/keymaps/david/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid( /* Qwerty */
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_BSPC,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   KC_BSPC,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_ENT,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,
-  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  M(10), KC_LCTL, KC_LALT, KC_LGUI, MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-                                                // Space is repeated to accommadate for both spacebar wiring positions
-),
-[1] = LAYOUT_planck_grid( /* Colemak */
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT,
-  DF(0), KC_LCTL, KC_LALT, KC_LGUI, MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-),
-[2] = LAYOUT_planck_grid( /* RAISE */
-  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_TRNS, DF(0), DF(1), QK_BOOT, M(0), M(1), M(2), KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_TRNS, KC_F11,  KC_F12,  M(0),   M(1),   M(2),   M(3),   M(4),   M(5),   M(6),   M(7), KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(2),     KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[3] = LAYOUT_planck_grid( /* LOWER */
-  S(KC_GRV),  S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    S(KC_9),    S(KC_0), KC_BSPC,
-  KC_TRNS, DF(0), DF(1), QK_BOOT, M(0), M(1), M(2), S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), S(KC_BSLS),
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-)
-};
diff --git a/keyboards/planck/keymaps/david/rules.mk b/keyboards/planck/keymaps/david/rules.mk
deleted file mode 100644
index d86b02fd1ce..00000000000
--- a/keyboards/planck/keymaps/david/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/davidrambo/config.h b/keyboards/planck/keymaps/davidrambo/config.h
deleted file mode 100644
index ccb18de3dd8..00000000000
--- a/keyboards/planck/keymaps/davidrambo/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-
-
diff --git a/keyboards/planck/keymaps/davidrambo/keymap.c b/keyboards/planck/keymaps/davidrambo/keymap.c
deleted file mode 100644
index 2770bb60e36..00000000000
--- a/keyboards/planck/keymaps/davidrambo/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright 2021 David Rambo
- *
- * 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 A_BSPC  LALT(KC_BSPC)
-#define A_LEFT  LALT(KC_LEFT)
-#define A_RGHT  LALT(KC_RGHT)
-#define C_TAB   LCTL(KC_TAB)
-#define CTLPGUP LCTL(KC_PGUP) // back one tab in Brave
-#define CTLPGDN LCTL(KC_PGDN) // forward one tab in Brave
-#define G_TAB   LGUI(KC_TAB)
-#define G_GRV   LGUI(KC_GRV)
-#define SftEnt  SFT_T(KC_ENT)
-#define NAV     LT(2, KC_TAB)
-#define RECT    LCA_T(KC_DEL) // Ctrl+Alt is the basis for Rectangle WM shortcuts
-
-enum custom_layers {
-    _COLEMAK,
-    _SYMBOL,
-    _NAVIGATION,
-}
-
-//tapdance declarations
-enum {
-  SFT_LCK
-};
-
-#define SftLck TD(SFT_LCK) /* alias for tapdance */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | ESC` |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |SftLck|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |  /?  |SftEnt|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  | GUI  | Ctrl | Alt  | GUI  |    Space    |Symbol| Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
-*/
-
-[_COLEMAK] = LAYOUT_planck_grid(
-  QK_GESC, KC_Q   , KC_W   , KC_F   , KC_P   , KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  NAV    , KC_A   , KC_R   , KC_S   , KC_T   , KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SftLck , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SftEnt ,
-  RECT   , KC_LGUI, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  MO(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-/* Symbol
- * ,-----------------------------------------------------------------------------------.
- * |   [  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   ]  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  \|  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  =+  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Home | End  |      |      | BRMD | BRMU |  -_  |Pg Up |      |   /  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  `~  |      |      |      |Alt(Bk)|            |      |Pg Dn | Vol- | Vol+ |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_SYMBOL] = LAYOUT_planck_grid(
-  KC_LBRC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_RBRC,
-  KC_BSLS, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL ,
-  _______, KC_HOME, KC_END , _______, _______, KC_BRMD, KC_BRMU, KC_MINS, KC_PGUP, _______, _______, _______,
-  _______, KC_GRV , _______, _______, _______ , _______, _______, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_MUTE
-  ),
-
-/* Navigation*/
-
-[_NAVIGATION] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, C_TAB  , A_LEFT,  KC_UP,   A_RGHT , KC_DEL , _______,
-    _______, _______, _______, _______, _______, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
-    _______, _______, _______, _______, _______, _______, G_TAB  , A_BSPC , KC_HOME, KC_END,  G_GRV  , _______,
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-};
-
-// Shift vs capslock function. From bbaserdem's Planck keymap.
-void caps_tap (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_code (KC_LSFT);
-    } else if (state->count == 2) {
-        unregister_code (KC_LSFT);
-        register_code (KC_CAPS);
-    }
-}
-void caps_tap_end (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code (KC_LSFT);
-    } else {
-        unregister_code (KC_CAPS);
-    }
-}
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Shift, twice for Caps Lock
-  [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end )
-};
diff --git a/keyboards/planck/keymaps/davidrambo/rules.mk b/keyboards/planck/keymaps/davidrambo/rules.mk
deleted file mode 100644
index 4272493950e..00000000000
--- a/keyboards/planck/keymaps/davidrambo/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TAP_DANCE_ENABLE = yes
-
-
diff --git a/keyboards/planck/keymaps/dbroqua/config.h b/keyboards/planck/keymaps/dbroqua/config.h
deleted file mode 100644
index 2bebf48a1ca..00000000000
--- a/keyboards/planck/keymaps/dbroqua/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c
deleted file mode 100644
index f7d1575dad6..00000000000
--- a/keyboards/planck/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,180 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 1
-#define _RAISE 2
-#define _MULTIMEDIA 3
-#define _ADJUST 4
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-// Func macro definitions.
-#define SFT_TAB  LT(_MULTIMEDIA, KC_TAB) // Tap for Enter, hold for Shift
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | AltGr| Alt  | Lower|    Space    | Raise| Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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,
-  SFT_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_RALT,    KC_LALT,    LOWER,  KC_SPC, KC_SPC, RAISE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |   (  |   )  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      |      |      |      |      |      |      |      |      |   {  |   }  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |   [  |   ]  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home | PgDwn| PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_LPRN,  KC_RPRN,
-  BACKLIT, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_LCBR,  KC_RCBR,
-  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_LBRC,  KC_RBRC,
-  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGDN,    KC_PGUP,  KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |  10  |   -  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |  `   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |   \  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_BSLS, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* _MULTIMEDIA
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |  Psc |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      | Mute | Vol+ | Vol- |      |      |      |Insert|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Prev | Play | Next |  Del |
- * `-----------------------------------------------------------------------------------'
- */
-[_MULTIMEDIA] = LAYOUT_planck_grid(
-  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_VOLU,    KC_VOLD,    _______,    _______,    _______,    KC_INS,
-  _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_DEL
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/dbroqua/readme.md b/keyboards/planck/keymaps/dbroqua/readme.md
deleted file mode 100644
index 090af649e1c..00000000000
--- a/keyboards/planck/keymaps/dbroqua/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dbroqua Layout
-
-![Layout](https://i.imgur.com/XxBtDBy.png "Dbroqua Keymap")
-
-* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/e77306f9d14cc93fa26123b93b106474
-* Online keyboard layout editor (lower layer): http://www.keyboard-layout-editor.com/#/gists/786e03f6fbd274cb4f4e77a3d67f85fa
-* Online keyboard layout editor (raise layer): http://www.keyboard-layout-editor.com/#/gists/2e22c71f6910103c20d595d1caa713d6
-* Online keyboard layout editor (multimedia layer): http://www.keyboard-layout-editor.com/#/gists/132ebf8053508a7a81dfa8e0756edb40
-
-# Programming Instructions:
-Enter into programming mode and run the following command.
-```
-$ sudo KEYMAP=dbroqua make dfu
-```
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/dc/config.h b/keyboards/planck/keymaps/dc/config.h
deleted file mode 100644
index 07d8533b830..00000000000
--- a/keyboards/planck/keymaps/dc/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 200
-#define TAPPING_TOGGLE 3
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/dc/keymap.c b/keyboards/planck/keymaps/dc/keymap.c
deleted file mode 100644
index 6a4da9546fa..00000000000
--- a/keyboards/planck/keymaps/dc/keymap.c
+++ /dev/null
@@ -1,161 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum planck_layers {
-    _DVORAK,
-    _NUMBERS,
-    _SYMBOLS,
-    _ACTIONS,
-    _SPECIAL
-  };
-
-enum planck_keycodes {
-    DVORAK,
-    NUMBERS,
-    SYMBOLS,
-    ACTIONS,
-    SPECIAL
-};
-
-enum tap_dance_codes {
-    CT_SC_LP = 0,
-    CT_Q_LBRC,
-    CT_J_LBRK,
-    CT_W_RBRK,
-    CT_V_RBRC,
-    CT_Z_RP,
-    CT_DEL_ESC
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [0] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_LPRN),
-    [1] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_LCBR),
-    [2] = ACTION_TAP_DANCE_DOUBLE(KC_J, KC_LBRC),
-    [3] = ACTION_TAP_DANCE_DOUBLE(KC_W, KC_RBRC),
-    [4] = ACTION_TAP_DANCE_DOUBLE(KC_V, KC_RCBR),
-    [5] = ACTION_TAP_DANCE_DOUBLE(KC_Z, KC_RPRN)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Dvorak
-    * ,-----------------------------------------------------------------------------------.
-    * | Tab  |  '"  |  ,<  |  .>  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |  BS  |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /?  |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * |LShift| ;:/( |  Q/{ |  J/[ |   K  |   X  |   B  |   M  |  W/] |  V/} |  Z/) |RS/Ent|
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |Action| Ctrl |  GUI | Alt  |Number| Space/Enter |Symbol| Left | Down |  Up  | Right|
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_DVORAK] = LAYOUT_planck_grid(
-        KC_TAB,        KC_QUOT,    KC_COMM,    KC_DOT,     KC_P,   KC_Y,      KC_F,        KC_G,   KC_C,    KC_R,    KC_L,  KC_BSPC,
-        KC_ESC,        KC_A,       KC_O,       KC_E,       KC_U,   KC_I,      KC_D,        KC_H,   KC_T,    KC_N,    KC_S,  KC_SLASH,
-        KC_LSFT,       TD(0),      TD(1),      TD(2),      KC_K,   KC_X,      KC_B,        KC_M,   TD(3),   TD(4),   TD(5), MT(MOD_RSFT, KC_ENT),
-        MO(ACTIONS),   KC_LCTL,    KC_LGUI,    KC_LALT,    NUMBERS,    KC_SPACE, KC_SPACE,         SYMBOLS,KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
-    ),
-
-    /* Numbers
-    * ,-----------------------------------------------------------------------------------.
-    * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   7  |   8  |   9  |   *  |      |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   4  |   5  |   6  |   -  |      |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * |      |      |      |      |      |      |   0  |   1  |   2  |   3  |   +  |      |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |      |      |      |      |      |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_NUMBERS] = LAYOUT_planck_grid(
-        _______,   KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_7,       KC_8,       KC_9,       KC_KP_ASTERISK, _______,
-        _______,   KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_4,       KC_5,       KC_6,       KC_KP_MINUS,    _______,
-        _______,   _______,    _______,    _______,    _______,    _______,    KC_0,       KC_1,       KC_2,       KC_3,       KC_KP_PLUS,     _______,
-        _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,        _______
-    ),
-
-    /* Symbols
-    * ,-----------------------------------------------------------------------------------.
-    * | `~   |  !   |  @   |  #   |   $  |   %  |   ^  |   &  |   *  |      |      | Del  |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * | Caps |      |  Ins | Pgup |      |      |      |   _  |   +  |      |      |  \|  |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * |      | Home |  End | Pgdn |      |      |      |   -  |   =  |      |      |        |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |      |      |      |      |      |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_SYMBOLS] = LAYOUT_planck_grid(
-        KC_GRV,    KC_EXCLAIM, KC_AT,      KC_HASH,    KC_DOLLAR,  KC_PERC,    KC_CIRC,    KC_AMPR,    KC_ASTR,    _______,    _______,    KC_DEL,
-        KC_CAPS,   _______,    KC_INS,     KC_PGUP,    _______,    _______,    _______,    KC_UNDS,    KC_PLUS,    _______,    _______,    KC_BSLS,
-        _______,   KC_HOME,    KC_END,     KC_PGDN,    _______,    _______,    _______,    KC_MINUS,   KC_EQL,     _______,    _______,    _______,
-        _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______
-    ),
-
-    /* Actions
-    * ,-----------------------------------------------------------------------------------.
-    * |  LED |      |      |      |      | Sleep|Reset |      |      |      |      | Del  |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      | Redo |      |      |      |      |      | Play |  <<  |  >>  |      |      |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * |      | Undo | Cut  | Copy | Paste|      |      | Mute | Vol- | Vol+ |      |      |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |      |      |      |      |      |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_ACTIONS] = LAYOUT_planck_grid(
-        BL_STEP,   _______,    _______,    _______,    _______,    KC_SLEP,    QK_BOOT,    _______,    _______,    _______,    _______,    KC_DEL,
-        _______,   LCTL(KC_Y),     _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_MPRV,    KC_MNXT,    _______,    _______,
-        _______,   LCTL(KC_Z),     LCTL(KC_X),     LCTL(KC_C),     LCTL(KC_V),     _______,    _______,    KC_MUTE,    KC_VOLD,    KC_VOLU,    _______,    _______,
-        _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______
-    ),
-
-    /* Special
-    * ,-----------------------------------------------------------------------------------.
-    * |      |      |      |      |      |      |      |      |      |      |      |      |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |      |      |      |      |      |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |      |      |      |      |      |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |      |      |      |      |      |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_SPECIAL] = LAYOUT_planck_grid(
-        _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-        _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-        _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-        _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-      case DVORAK:
-        if (record->event.pressed) {
-          set_single_persistent_default_layer(_DVORAK);
-        }
-        return false;
-        break;
-      case SYMBOLS:
-        if (record->event.pressed) {
-          layer_on(_SYMBOLS);
-          update_tri_layer(_NUMBERS, _SYMBOLS, _SPECIAL);
-        } else {
-          layer_off(_SYMBOLS);
-          update_tri_layer(_NUMBERS, _SYMBOLS, _SPECIAL);
-        }
-        return false;
-        break;
-      case NUMBERS:
-        if (record->event.pressed) {
-          layer_on(_NUMBERS);
-          update_tri_layer(_NUMBERS, _SYMBOLS, _SPECIAL);
-        } else {
-          layer_off(_NUMBERS);
-          update_tri_layer(_NUMBERS, _SYMBOLS, _SPECIAL);
-        }
-        return false;
-        break;
-    }
-    return true;
-}
diff --git a/keyboards/planck/keymaps/dc/readme.md b/keyboards/planck/keymaps/dc/readme.md
deleted file mode 100644
index 58dd1eb6e69..00000000000
--- a/keyboards/planck/keymaps/dc/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Practical keymap for Planck Ortholinear 40% Mechanical Keyboard
-A custom Dvorak keymap with layers for numbers, symbols, and media keys.
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/dc/rules.mk b/keyboards/planck/keymaps/dc/rules.mk
deleted file mode 100644
index 384f8e088a3..00000000000
--- a/keyboards/planck/keymaps/dc/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-TAP_DANCE_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/dcompact/config.h b/keyboards/planck/keymaps/dcompact/config.h
deleted file mode 100644
index 2c207edc7c9..00000000000
--- a/keyboards/planck/keymaps/dcompact/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/planck/keymaps/dcompact/keymap.c b/keyboards/planck/keymaps/dcompact/keymap.c
deleted file mode 100644
index f781d1e5c0a..00000000000
--- a/keyboards/planck/keymaps/dcompact/keymap.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// Custom Keycodes and Combinations Used
-#define DEL_SHF SFT_T(KC_DEL)
-#define QUAKE LCTL(KC_GRV)
-
-#define WKSP_L LALT(LCTL(KC_LEFT))
-#define WKSP_D LALT(LCTL(KC_DOWN))
-#define WKSP_U LALT(LCTL(KC_UP))
-#define WKSP_R LALT(LCTL(KC_RGHT))
-
-#define AM_CYC A(S(KC_SPC))
-#define AM_SHR A(S(KC_COMM))
-#define AM_GRW A(S(KC_DOT))
-#define AM_REL A(S(KC_Z))
-#define AM_LFT A(S(KC_H))
-#define AM_RGH A(S(KC_L))
-#define AM_CW A(S(KC_K))
-#define AM_CCW A(S(KC_J))
-#define AM_TLL A(S(KC_1))
-#define AM_TLW A(S(KC_2))
-#define AM_BSP A(S(KC_3))
-#define AM_FUL A(S(KC_4))
-
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _BASE,
-  _LOWER,
-  _RAISE,
-  _FUNC,
-  _PLOVER,
-  _GAME,
-  _LNUM,
-  _LFUN,
-  _ADJUST,
-  _MOUSE
-};
-
-enum planck_keycodes {
-  BASE = SAFE_RANGE,
-  PLOVER,
-  GAME,
-  LNUM,
-  LFUN,
-  LOWER,
-  RAISE,
-  FUNC,
-  MOUSE,
-  ADJUST,
-  EXT_PLV,
-  EXT_GM
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Base
- * ,-----------------------------------------------------------------------------------.
- * | Tab  | " '  | < ,  | > .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | ? /  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  | _ -  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Del/Sf|  : ; |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  | Bspc |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Game | GUI  | Alt  |Lower |Shift |Space |Raise | Alt  | GUI  |  Fn  |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_BASE] = LAYOUT_planck_grid(
-    KC_TAB, KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L, KC_SLSH,
-    KC_ESC,    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S, KC_MINS,
-   DEL_SHF, KC_SCLN,    KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z, KC_BSPC,
-   KC_LCTL,    GAME, KC_LGUI, KC_LALT,   LOWER,  KC_LSFT,  KC_SPC,  RAISE, KC_RALT, KC_RGUI,    FUNC,  KC_ENT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |AmCycl|AmShrk|AmGrow|AmReld|      |      | Home |PgDwn | PgUp | End  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |AmLeft|AmCcw |AmCw  |AmRght|      |      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |AmTall|AmTllW|AmBsp |AmFull|      |      |WkLeft|WkDown| WkUp |WkRigh|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-   XXXXXXX,  AM_CYC,  AM_SHR,  AM_GRW,  AM_REL, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, XXXXXXX,
-   XXXXXXX,  AM_LFT,  AM_CCW,   AM_CW,  AM_RGH, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, XXXXXXX,
-   XXXXXXX,  AM_TLL,  AM_TLW,  AM_BSP,  AM_FUL, XXXXXXX, XXXXXXX,  WKSP_L,  WKSP_D,  WKSP_U,  WKSP_R, XXXXXXX,
-   _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |Quake |   `  |   ~  |   \  |   |  |   (  |   )  |   7  |   8  |   9  |   /  |  =   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   !  |   @  |   #  |   $  |   {  |   }  |   4  |   5  |   6  |   *  |  +   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   %  |   ^  |   &  |   *  |   [  |   ]  |   1  |   2  |   3  |   -  |Bkspc |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |   <  |   >  |      |   0  |   .  |   ,  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-     QUAKE,  KC_GRV, KC_TILD, KC_BSLS, KC_PIPE, KC_LPRN, KC_RPRN,    KC_7,    KC_8,    KC_9, KC_SLSH,  KC_EQL,
-   XXXXXXX, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_LCBR, KC_RCBR,    KC_4,    KC_5,    KC_6, KC_ASTR, KC_PLUS,
-   XXXXXXX, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC,    KC_1,    KC_2,    KC_3, KC_MINS, KC_BSPC,
-   _______, XXXXXXX, _______, _______, _______, KC_LABK, KC_RABK, _______,    KC_0,  KC_DOT, KC_COMM, XXXXXXX
-),
-
-/* Func
- * ,-----------------------------------------------------------------------------------.
- * |      |Sleep |Prev-W|Ply/Ps|Next-W|      |      |  F9  | F10  | F11  | F12  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Wake | Mute | Vol- | Vol+ |      |      |  F5  |  F6  |  F7  |  F8  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Power |Prev-M|Ply/Ps|Next-M|      |      |  F1  |  F2  |  F3  |  F4  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNC] = LAYOUT_planck_grid(
-   XXXXXXX, KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX,
-   XXXXXXX, KC_WAKE, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX,   KC_F5,   KC_F6,   KC_F7,   KC_F8, XXXXXXX,
-   XXXXXXX,  KC_PWR, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX,
-   _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX
-),
-
-/* Game
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |  Q   |  W   |  E   |  H   |  Z   |  I   |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Shift |  A   |  S   |  D   |  U   |  X   |  P   |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ctrl |  F   |  G   |  R   |  M   |  C   |  O   |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |  ~   | Alt  |Space |Shift | LNUM | LFUN |      |      |      |      | Exit |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT_planck_grid(
-    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_H,    KC_Z,    KC_I, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_U,    KC_X,    KC_P, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   KC_LCTL,    KC_F,    KC_G,    KC_R,    KC_M,    KC_C,    KC_O, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_ESC, KC_TILD, KC_LALT,  KC_SPC, KC_LSFT,    LNUM,    LFUN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  EXT_GM
-),
-
-/* LNum
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |  1   |  2   |  3   |  4   |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Shift |  5   |  6   |  7   |  8   |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ctrl |  9   |  10  |  ,   |  .   |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |      | Alt  |Space |Shift |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LNUM] = LAYOUT_planck_grid(
-   _______,    KC_1,    KC_2,    KC_3,    KC_4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   _______,    KC_5,    KC_6,    KC_7,    KC_8, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   _______,    KC_9,    KC_0, KC_COMM,  KC_DOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* LFun
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |  F1  |  F2  |  F3  |  F4  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Shift |  F5  |  F6  |  F7  |  F8  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ctrl |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |      | Alt  |Space |Shift |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LFUN] = LAYOUT_planck_grid(
-   _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   _______,   KC_F5,   KC_F6,   KC_F7,   KC_F8, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   _______,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   _______, XXXXXXX, _______, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-
-/* Mouse (Not Reachable on Planck)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |Click1|Click3|Click2|      |      |MouseL|MouseD|MouseU|MouseR|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |Accel0|Accel1|Accel2|      |      |ScrllL|ScrllD|ScrllU|ScrllR|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MOUSE] = LAYOUT_planck_grid(
-   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-   XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX,
-   XXXXXXX, XXXXXXX, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, XXXXXXX,
-   _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  FN  |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |      |      |   E  |   U  |  PWR | RES1 | RES2 |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-  STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-  XXXXXXX, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-  EXT_PLV, XXXXXXX, XXXXXXX, STN_A,   STN_O,   XXXXXXX, XXXXXXX, STN_E,   STN_U,   STN_PWR, STN_RE1, STN_RE2
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|RGBTog|RGBMod|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|Light-|Light+|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-   _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-   _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP, RGB_TOG, RGB_MOD, _______, _______, _______,
-   _______, AU_PREV, AU_NEXT,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, RGB_VAD, RGB_VAI, _______, _______, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case FUNC:
-      if (record->event.pressed) {
-        layer_on(_FUNC);
-      } else {
-        layer_off(_FUNC);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (!record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_PLOVER);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case GAME:
-      if (!record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_GAME);
-      }
-      return false;
-      break;
-    case EXT_GM:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_GAME);
-      }
-      return false;
-      break;
-    case LNUM:
-      if (record->event.pressed) {
-        layer_on(_LNUM);
-      } else {
-        layer_off(_LNUM);
-      }
-      return false;
-      break;
-    case LFUN:
-      if (record->event.pressed) {
-        layer_on(_LFUN);
-      } else {
-        layer_off(_LFUN);
-      }
-      return false;
-      break;
-    case MOUSE:
-      if (record->event.pressed) {
-        layer_on(_MOUSE);
-      } else {
-        layer_off(_MOUSE);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-  steno_set_mode(STENO_MODE_GEMINI);
-}
diff --git a/keyboards/planck/keymaps/dcompact/readme.md b/keyboards/planck/keymaps/dcompact/readme.md
deleted file mode 100644
index f3f3d8ca6ea..00000000000
--- a/keyboards/planck/keymaps/dcompact/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# DCompact Layout
-
-**Dvorak, Layered, Mouse-Enabled, Compact -- now with Game Mode~**
-
-_See [the layout source](keymap.c) for the actual layout_
-
-## Goals
-
-The following are the goals kept in mind when designing the DCompact
-layout:
-
-- Provide minimal travel distance when typing English or coding
-- Consistent muscle memory translation from standard QWERTY
-- Stateless typing experience
-- OS-agnostic features, macros, and key placement
-- Minimize dependence on mouse usage
-
-These are generally all met or balanced within reason. This layout is
-not intended at all to be a familiar layout for much of anyone (except
-maybe those who already type in Dvorak) -- this is meant to amplify the
-best parts of having limited, ortholinear keys with layering.
-
-## As Reference Material
-
-If you're reading this hoping to find reference material to implement
-your own layout, then please feel free to copy over this layout and
-make edits where you see fit. I removed a lot of the features I felt
-extraneous to my usage and simplified style where I felt needed. This
-would hopefully mean that my code should feel like a good base to
-develop from for those new to QMK.
-
-_Remember that settings defined in the layout directory override and
-merge with those in the keyboard folder_
-
-## Relevant Links
-
-- [Online Dvorak Layout Trainer](https://learn.dvorak.nl/)
-- [Dvorak Wikipedia Page](https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard)
-- [QMK Docs](https://docs.qmk.fm/#/)
-- [QMK KeyCode Reference](https://docs.qmk.fm/#/keycodes)
-
-## Contact
-
-Maintainer: [Dan](https://github.com/loksonarius)
-
diff --git a/keyboards/planck/keymaps/dcompact/rules.mk b/keyboards/planck/keymaps/dcompact/rules.mk
deleted file mode 100644
index 12b4e44c2b7..00000000000
--- a/keyboards/planck/keymaps/dcompact/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# https://beta.docs.qmk.fm/reference/config-options#feature-options
-# Features Specifically Wanted
-EXTRAKEY_ENABLE = yes
-STENO_ENABLE = yes
-NKRO_ENABLE = yes
-AUDIO_ENABLE = yes
-
-# Features taking up space
-MOUSEKEY_ENABLE = no
-MIDI_ENABLE = no
-CONSOLE_ENABLE = no
-
diff --git a/keyboards/planck/keymaps/dear_vehicle_owner/config.h b/keyboards/planck/keymaps/dear_vehicle_owner/config.h
deleted file mode 100644
index cff232c9745..00000000000
--- a/keyboards/planck/keymaps/dear_vehicle_owner/config.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2021 Timothy Beck
-  *
-  * 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
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-//switch polling rate to 1000 per second
-#define USB_POLLING_INTERVAL_MS 1
diff --git a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
deleted file mode 100644
index 41388890251..00000000000
--- a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/* Copyright 2021 Timothy Beck
- *
- * 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"
-
-
-enum planck_layers {
-    _QWERTY,
-    _COLEMAK,
-    _DVORAK,
-    _LOWER,
-    _RAISE,
-    _PLOVER,
-    _ADJUST
-};
-
-enum planck_keycodes {
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-    DVORAK,
-    PLOVER,
-    BACKLIT,
-    EXT_PLV,
-    DR_VO
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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 ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO|      |             |      | DR_VO| DR_VO| DR_VO| DR_VO|
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO, _______, _______, _______, _______, DR_VO, DR_VO, DR_VO, DR_VO
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO|      |             |      | DR_VO| DR_VO| DR_VO| DR_VO|
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO, _______, _______, _______, _______, DR_VO, DR_VO, DR_VO, DR_VO
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case DR_VO:
-            if (record->event.pressed) {
-                SEND_STRING("We've been trying to reach you concerning your vehicle's extended warranty. You should've received a notice in the mail about your car's extended warranty eligibility. Since we've not gotten a response, we're giving you a final courtesy call before we close out your file. Press 2 to be removed and placed on our do-not-call list. To speak to someone about possibly extending or reinstating your vehicle's warranty, press 1 to speak with a warranty specialist.\n");
-            }
-            return false;
-            break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/dear_vehicle_owner/readme.md b/keyboards/planck/keymaps/dear_vehicle_owner/readme.md
deleted file mode 100644
index c8173cd9a23..00000000000
--- a/keyboards/planck/keymaps/dear_vehicle_owner/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# dear vehicle owner
-
-We've been trying to reach you concerning your vehicle's extended warranty. You should've received a notice in the mail about your car's extended warranty eligibility. Since we've not gotten a response, we're giving you a final courtesy call before we close out your file. Press 2 to be removed and placed on our do-not-call list. To speak to someone about possibly extending or reinstating your vehicle's warranty, press 1 to speak with a warranty specialist.
-
diff --git a/keyboards/planck/keymaps/dear_vehicle_owner/rules.mk b/keyboards/planck/keymaps/dear_vehicle_owner/rules.mk
deleted file mode 100644
index d03e978b827..00000000000
--- a/keyboards/planck/keymaps/dear_vehicle_owner/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC += muse.c
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/planck/keymaps/deft/config.h b/keyboards/planck/keymaps/deft/config.h
deleted file mode 100644
index 9020d2b9f88..00000000000
--- a/keyboards/planck/keymaps/deft/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/deft/deft-plank.json b/keyboards/planck/keymaps/deft/deft-plank.json
deleted file mode 100644
index 49dc57c3e55..00000000000
--- a/keyboards/planck/keymaps/deft/deft-plank.json
+++ /dev/null
@@ -1,141 +0,0 @@
-[
-  {
-    "backcolor": "#ffffff",
-    "name": "Deft Plank",
-    "author": "Michael Speiserß",
-    "switchMount": "cherry",
-    "switchBrand": "gateron",
-    "switchType": "KS-3-Tea",
-    "plate": true,
-    "pcb": true
-  },
-  [
-    {
-      "c": "#ba0000",
-      "sb": "gateron",
-      "st": "KS-3-Tea",
-      "a": 5
-    },
-    "\nDel\n\n\n\n\nEsc",
-    {
-      "c": "#cccccc",
-      "a": 4
-    },
-    "\n\n!\n\n\n\n\n\n1\nQ\nAlt 1",
-    "\n\n@\n\n\n\n\n\n2\nW\nAlt 2",
-    "\n\n#\n\n\n\n\n\n3\nE\nAlt 3",
-    "\n\n$\n\n\n\n\n\n4\nR\nAlt 4",
-    "\n\n%\n\n\n\n\n\n5\nT\n(",
-    "\n\n^\n\n\n\n\n\n6\nY\n)",
-    "\n\n&\n\n\n\n\n\n7\nU\nNum 7",
-    "\n\n*\n\n\n\n\n\n8\nI\nNum 8",
-    "\n\n(\n\n\n\n\n\n9\nO\nNum 9",
-    "\n\n)\n\n\n\n\n\n0\nP\nNum 0",
-    {
-      "c": "#ba0000",
-      "a": 7
-    },
-    "Bksp"
-  ],
-  [
-    {
-      "c": "#365eff"
-    },
-    "Tab",
-    {
-      "c": "#cccccc",
-      "a": 4
-    },
-    "\n\n\n~\n\n\n\n\nF1\nA\n`",
-    "\n\n\n|\n\n\n\n\nF2\nS\n\\",
-    "\n\n\n+\n\n\n\n\nF3\nD\n=",
-    {
-      "n": true
-    },
-    "\n\n\n_\n\n\n\n\nF4\nF\n-",
-    {
-      "a": 5
-    },
-    "F5\n<\n\n\n\n\nG",
-    "F6\n>\n\n\n\n\nH",
-    {
-      "n": true
-    },
-    "F7\nNum 4\n\n\n\n\nJ",
-    "F8\nNum 5\n\n\n\n\nK",
-    "F9\nNum 6\n\n\n\n\nL",
-    {
-      "a": 4
-    },
-    "\n\n\n\n\n\n\n:\nF10\n;\nNum .",
-    "\n\n\n\n\n\n\n\"\n\n'\nNumLk"
-  ],
-  [
-    {
-      "c": "#365eff",
-      "a": 7
-    },
-    "Shift",
-    {
-      "c": "#cccccc",
-      "a": 5
-    },
-    "F11\nNum /\n\n\n\n\nZ",
-    "F12\nNum *\n\n\n\n\nX",
-    "F13\nNum -\n\n\n\n\nC",
-    "F14\nNum +\n\n\n\n\nV",
-    "F15\n[\n\n\n\n\nB",
-    "F16\n]\n\n\n\n\nN",
-    "F17\nNum 1\n\n\n\n\nM",
-    {
-      "a": 4
-    },
-    "\n\n\n\n\n\n\n<\nF18\n,\nNum 2",
-    "\n\n\n\n\n\n\n>\nF19\n.\nNum 3",
-    {
-      "c": "#365eff",
-      "a": 5
-    },
-    "Vol+\nPgup\n\n\n\n\n&uarr;",
-    {
-      "c": "#cccccc",
-      "a": 4
-    },
-    "\n\n\n\n\n\n\n?\n\n/\nNum ="
-  ],
-  [
-    {
-      "c": "#365eff",
-      "a": 7
-    },
-    "Ctrl",
-    {
-      "a": 5
-    },
-    "\nOption\n\n\n\n\nAlt",
-    "\n⌘\n\n\n\n\nWin",
-    "Cut\nPaste\n\n\n\n\nCopy",
-    {
-      "c": "#3f8f00",
-      "a": 7
-    },
-    "Lower",
-    {
-      "c": "#cccccc",
-      "w": 2
-    },
-    "",
-    {
-      "c": "#3f8f00"
-    },
-    "Raise",
-    {
-      "c": "#365eff",
-      "a": 5
-    },
-    "\nNumE\n\n\n\n\nReturn",
-    "Play\nHome\n\n\n\n\n&larr;",
-    "Vol -\nPgdn\n\n\n\n\n&darr;",
-    "Next\nEnd\n\n\n\n\n&rarr;"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/deft/keymap.c b/keyboards/planck/keymaps/deft/keymap.c
deleted file mode 100644
index b3f670a3360..00000000000
--- a/keyboards/planck/keymaps/deft/keymap.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * The Deft layout for the Planck Keyboard
- * Version 1.0
- *
- * A keyboard layout designed for efficiency in programming and transferability between ortholinear boards.
- * Deft is currently supported on the following boards:
- * Planck (12x4)
- *
- * The Deft keyboard layout was designed by Michael Speiser. You can find other Deft layouts at my Github:
- * https://github.com/Speiserm
- *
- * For questions, issues, or feedback, feel free to email me at Speiserm@pm.me.
- *
- *
- * Flashing:
- *
- * Rev 5 or earlier:
- * make planck/revX:deft:dfu
- *
- * Rev 6:
- * make planck/rev6:deft:dfu-util
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- * Follow my cat:
- * https://twitter.com/CatBucha
- * https://www.instagram.com/buchathecat/
- *
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |  Q   |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |  A   |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Shift |  Z   |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Copy |Lower |    Space    |Raise |Enter | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_UP,   KC_SLSH,
-    KC_LCTL, KC_LALT, KC_LGUI, C(KC_C),   LOWER,  KC_SPC,  KC_SPC,   RAISE,   KC_ENT, KC_LEFT, KC_DOWN,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Del  | Alt1 | Alt2 | Alt3 | Alt4 |  (   |  )   | Num7 | Num8 | Num9 | Num0 |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  `   |  \   |  =   |  -   |  <   |  >   | Num4 | Num5 | Num6 | Num. | NumL |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Num/ | Num* | Num- | Num+ |  [   |  ]   | Num1 | Num2 | Num3 | Pgup | Num= |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Paste |      |             |      | NumE | Home | Pgdn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-     KC_DEL, A(KC_1), A(KC_2), A(KC_3), A(KC_4), S(KC_9), S(KC_0),   KC_P7,   KC_P8,   KC_P9,   KC_P0, _______,
-    _______,  KC_GRV,KC_BSLS,KC_EQL, KC_MINS,S(KC_COMM),S(KC_DOT),   KC_P4,   KC_P5,   KC_P6, KC_PDOT, KC_NUM,
-    _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_LBRC, KC_RBRC,   KC_P1,   KC_P2,   KC_P3, KC_PGUP, KC_PEQL,
-    _______, _______, _______, C(KC_V), _______, _______, _______, _______, KC_PENT, KC_HOME,KC_PGDN,  KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | F11  | F12  | F13  | F14  | F15  | F16  | F17  | F18  | F19  | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | Cut  |      |             |      |      | Play | Vol- | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    _______,    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,   KC_F7,   KC_F8,   KC_F9,  KC_F10, _______,
-    _______,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19, KC_VOLU, _______,
-    _______, _______, _______, C(KC_X), _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_MNXT
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Reset |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-      QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/planck/keymaps/deft/readme.md b/keyboards/planck/keymaps/deft/readme.md
deleted file mode 100644
index 715ab37965b..00000000000
--- a/keyboards/planck/keymaps/deft/readme.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# The Deft Planck Layout
-
-![Deft layout for the Planck keyboard](https://i.imgur.com/VtUkAyh.png)
-
-The Deft Planck layout is designed for efficiency in programming and transferability between ortholinear boards. It features a fairly standard default layer with properly placed arrow keys, a lower layer with a usable numpad and symbols, and a raise layer for numbers, f-keys, and music controls. The code is also cut down to only what you need. The result is a very usable Planck that can easily replace fullsize layouts.
-
-The strangely placed Enter key is meant to be closer to your thumb and moving it allows for proper arrow key placement without disturbing our layout too much. I wanted to separate the enter key from the forward slash key anyway, as I was commonly pressing enter when I meant to type a question mark. You get used to it pretty fast.
-
-Follow my cat:
-
-https://twitter.com/CatBucha
-
-https://www.instagram.com/buchathecat/
-
-
-## Flashing:
-| Rev 5 or earlier: | Rev 6: |
-|-|-|
-| `make planck/revX:deft:dfu` | `make planck/rev6:deft:dfu-util` |
-
-## Layout:
-
-### QWERTY layer
-```
-,-----------------------------------------------------------------------------------.
-| Esc  |  Q   |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Tab  |  A   |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|Shift |  Z   |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |  /   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl | Alt  | GUI  | Copy |Lower |    Space    |Raise |Enter | Left | Down |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-### Lower layer
-```
-,-----------------------------------------------------------------------------------.
-| Del  | Alt1 | Alt2 | Alt3 | Alt4 |  (   |  )   | Num7 | Num8 | Num9 | Num0 |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |  `   |  \   |  =   |  -   |  <   |  >   | Num4 | Num5 | Num6 | Num. | NumL |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      | Num/ | Num* | Num- | Num+ |  [   |  ]   | Num1 | Num2 | Num3 | Pgup | Num= |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |Paste |      |             |      | NumE | Home | Pgdn | End  |
-`-----------------------------------------------------------------------------------'
-```
-
-### Raise layer
-```
-,-----------------------------------------------------------------------------------.
-|      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      | F11  | F12  | F13  | F14  | F15  | F16  | F17  | F18  | F19  | Vol+ |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      | Cut  |      |             |      |      | Play | Vol- | Next |
-`-----------------------------------------------------------------------------------'
-```
-
-### Adjust layer
-```
-,-----------------------------------------------------------------------------------.
-|Reset |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/deft/rules.mk b/keyboards/planck/keymaps/deft/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/deft/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/dodger/config.h b/keyboards/planck/keymaps/dodger/config.h
deleted file mode 100644
index 1fa9b4265e7..00000000000
--- a/keyboards/planck/keymaps/dodger/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 15
-
-#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 RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
diff --git a/keyboards/planck/keymaps/dodger/keymap.c b/keyboards/planck/keymaps/dodger/keymap.c
deleted file mode 100644
index 76493e714db..00000000000
--- a/keyboards/planck/keymaps/dodger/keymap.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-bool isGame = false;
-bool qwertGame = false;
-
-
-enum planck_layers {
-  _COLEMAK,
-  _GAME,
-  _QWERTGAME,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  COLEMAK = SAFE_RANGE,
-  GCTOGG,
-  QGCTOGG,
-  LOWER,
-  RAISE,
-  PAREN
-};
-
-enum {
-  TD_SPC_ENT = 0,
-  TD_ESC_CAPS
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_SPC_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT),
-  [TD_ESC_CAPS]  = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |  =   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |  -   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  |PAREN |Lower | shift|space |Raise | Left | Down |  Up  | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_EQL,
-  KC_ESC,  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_MINS,
-  KC_LCTL, KC_LGUI, KC_LALT, PAREN, LOWER,   RSFT_T(KC_BSPC),  TD(TD_SPC_ENT),  RAISE,   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |   [  |   ]  |      |  (   |   )  |   {  |   }  |      |  +   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  | left | down |  up  | right|  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |  _   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_LPRN, KC_RPRN,  KC_LCBR,    KC_RCBR, _______, S(KC_EQL),
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_LEFT,    KC_DOWN,    KC_UP, KC_RGHT,   KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,    KC_MPRV,    KC_MNXT, _______, KC_UNDS,
-  _______, _______, _______, _______, _______, _______, _______, _______,    _______,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | DEL  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  ~   |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | GCTG |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  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_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  GCTOGG
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |EEPRst| Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  EE_CLR,  QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_GAME] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_EQL,
-  KC_ESC,  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_MINS,
-  KC_LCTL, QGCTOGG, KC_LALT, LOWER, KC_SPC, RSFT_T(KC_BSPC), TD(TD_SPC_ENT), RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
-),
-
-[_QWERTGAME] = LAYOUT_planck_grid(
-  KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL,
-  KC_ESC, 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_MINS,
-  KC_LCTL, QGCTOGG, KC_LALT, LOWER, KC_SPC, RSFT_T(KC_BSPC), TD(TD_SPC_ENT), RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-        #ifdef BACKLIGHT_ENABLE
-		      backlight_set(0);
-        #endif
-      }
-      return false;
-      break;
-	case GCTOGG:
-      if (record->event.pressed) {
-        if (!isGame) {
-          set_single_persistent_default_layer(_GAME);
-          isGame = true;
-        }
-        else {
-          set_single_persistent_default_layer(_COLEMAK);
-          isGame = false;
-          qwertGame = false;
-        }
-      }
-      return false;
-      break;
-    case QGCTOGG:
-      if (record->event.pressed) {
-        if (!qwertGame) {
-          set_single_persistent_default_layer(_QWERTGAME);
-          qwertGame = true;
-        } else {
-          set_single_persistent_default_layer(_GAME);
-          qwertGame = false;
-        }
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case PAREN:
-    	if (record->event.pressed) {
-    		SEND_STRING("()");
-    	}
-    	return false; break;
-  }
-  return true;
-}
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case _GAME:
-      rgblight_sethsv_noeeprom(0, UINT8_MAX, RGBLIGHT_LIMIT_VAL);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL+5);
-      break;
-    case _QWERTGAME:
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD+2);
-      break;
-    case _COLEMAK:
-      rgblight_sethsv_noeeprom(0, 0, 0);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-    default:
-      break;
-  }
-  return state;
-}
-
-void matrix_init_user(void) {
-	set_single_persistent_default_layer(_COLEMAK);
-	isGame = false;
-  qwertGame = false;
-  #ifdef BACKLIGHT_ENABLE
-        backlight_level(0);
-  #endif
-}
-
-void keyboard_post_init_user(void) {
-  rgblight_sethsv_noeeprom(0, 0, 0);
-  rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-}
diff --git a/keyboards/planck/keymaps/dodger/readme.md b/keyboards/planck/keymaps/dodger/readme.md
deleted file mode 100644
index 01021081de7..00000000000
--- a/keyboards/planck/keymaps/dodger/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# dodger
-
diff --git a/keyboards/planck/keymaps/dodger/rules.mk b/keyboards/planck/keymaps/dodger/rules.mk
deleted file mode 100644
index f5d20511e22..00000000000
--- a/keyboards/planck/keymaps/dodger/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/planck/keymaps/dr0ck/config.h b/keyboards/planck/keymaps/dr0ck/config.h
deleted file mode 100644
index 59bf4aa2a3e..00000000000
--- a/keyboards/planck/keymaps/dr0ck/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/dr0ck/keymap.c b/keyboards/planck/keymaps/dr0ck/keymap.c
deleted file mode 100644
index 78adb7533f9..00000000000
--- a/keyboards/planck/keymaps/dr0ck/keymap.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _FUNCTION
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV,
-  FUNCTION
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Func |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  ‘   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Esc  |Lower |Enter |Space |Raise | Func | Alt  |Prt Sc| Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  FUNCTION,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_LCTL, KC_LALT, KC_LGUI, KC_ESC, LOWER,   KC_ENT,  KC_SPC,  RAISE,   FUNCTION, KC_RALT,KC_PSCR, KC_RCTL
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Func |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Esc  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  FUNCTION,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_ENT ,
-  KC_LCTL, KC_LGUI, KC_ESC,  KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Func |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Esc  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  FUNCTION,KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  KC_LCTL, KC_LGUI, KC_ESC,  KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |Pg Up |Pg Dn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  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_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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_HOME,    KC_PGUP, KC_PGDN, KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |Pg Up |Pg Dn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Caps |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  KC_CAPS, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |      | Prev | Play | Next |  F5  |      |Pg Up |  Up  |Pg Dn |Prt Sc| Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Mute | Vol- | Vol+ |      |      | Home | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |  End |      |      |      |      | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      |      |      |Enter |Space |      |      |      |      | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT_planck_grid(
-  KC_ESC , _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_F5, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_DEL,
-  _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  KC_LSFT, _______, _______, _______, _______, _______, KC_END , _______, _______, _______, _______, KC_RSFT,
-  KC_LCTL, _______, _______, _______, KC_ENT,  KC_SPC, _______, _______, _______, _______, _______, KC_RCTL
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case FUNCTION:
-      if (record->event.pressed) {
-        layer_on(_FUNCTION);
-      } else {
-        layer_off(_FUNCTION);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/dr0ck/readme.md b/keyboards/planck/keymaps/dr0ck/readme.md
deleted file mode 100644
index e19eb9ed449..00000000000
--- a/keyboards/planck/keymaps/dr0ck/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-This layout adds a new function layer similar to the default one from the pok3r:
-
-    /* Function
-     * ,-----------------------------------------------------------------------------------.
-     * | Esc  |      | Prev | Play | Next |      |      |Pg Up |  Up  |Pg Dn |Prt Sc| Del  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      | Vol- | Mute | Vol+ |      | Home | Left | Down |Right | End  |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      | Home |Pg Up |Pg Dn | End  |
-     * `-----------------------------------------------------------------------------------'
-     */
-
-You can acces this layer by holding the first key on the second line from the top.
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/dr_notsokind/Readme.md b/keyboards/planck/keymaps/dr_notsokind/Readme.md
deleted file mode 100644
index a336de2f356..00000000000
--- a/keyboards/planck/keymaps/dr_notsokind/Readme.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Dr NotSoKind's layout
-
-*Feel free to ask questions or send suggestions to [me on Twitter](https://twitter.com/pnikosis)*
-
-I love some features from the default layout, although there are things that definitively I can't get used to. Other layouts such as *circuit* gave me some good ideas, so I combined them all plus some own stuff to fit better my needs.
-
-BTW, I don't use Dvorak or other layouts than QWERTY and I'm too old and grumpy for learning something new (I'm lying a bit here, I learn new stuff every day), so I removed the ther typing layouts
-
-## Things I love about the default layout
-1. I love the consistency between the raise and lower layers, like one is the shifted version of the other.
-2. I like the F keys distributed in two rows, from F1 to F6 and F7 to F12, which makes them easier to find and access.
-
-## Things I don't like from the default layout
-1. Arrow keys distributed VIM like. I use VIM frequently, but there I navigate using HJKL. Moving to the arrows intituively I tend to expect three arrows on the bottom (left, down, right) and one up in the middle (up).
-2. Tab and Esc. I switched them.
-3. Alt and Super. Switched them too.
-
-## Needs, changes and goals
-1. Arrow keys distributed "traditionally".
-2. Media keys easily accessible.
-3. A button for Sleep/Power.
-4. As close as possible to a US QWERTY layout.
-5. A Numpad, for when I want to feel like an accountant.
-6. Be able to record Dynamic Macros.
-7. Zoom in and Zoom out (basically Ctrl - and Ctrl +)
-
-I've been experimenting a lot and I think I'm getting closer to my customization end game.
-
-## Layers:
-
-## Main Layer / QWERTY
-
-Apart from the default, lower and raise, I added an extra Media/Action layer, for volume and playback control, plus some keyboard actions such as Print Screen, Insert, Calculator or Power/Sleep/Wake. Also in the [MEDIA] layer, you can record two different macros and reproduce them.
-
-### About the volume up and down
-
-That was a hard decision. I wanted the vol up, down and mute easily accessible, and in an obvious palce. I finally decided to use the `Raise` and `Lower` modifier keys to manage the volume, in combination with the [MEDIA] modifier key. This could look a little weird, since the modifier keys are having a different function than modify the layer, but ended up working fairly well, so while pressing [MEDIA] you have the `Lower` key to put the volume down, `Raise` to raise the volume, and `Space` for mute.
-
-### Zoom in and Zoom out
-
-Using the [MEDIA] modifier you can zoom in and zoom out in browsers and other applications using `,` (for zooming out) and `.` (for zooming in). These keys are mapped to `LCTRL -` and `LCTRL =`. I initially thought about mapping zoom in to `LCTRL +` but most apps also map the zoom in using the `=` key, and some they don't event support zooming in with `+` (I'm looking at you Sublime Text).
-
-### Right Shift and Enter
-
-`RSHFT` and `ENTER` are combined. Tap once for `ENTER` and hold for `RSHFT`. `ENTER` will be registered on release if released within 200 ms, else `RSHFT` is registered starting at 201 ms until release.
-
-If for some reason, this interferes with the normal usage of the `ENTER` key in any way, (some problem that may never happen), there is a regular non-modified `ENTER` key on the same key in the [LOWER] and [RAISE] layers, as well in the [LOCK] mode (see below).
-
-### Caps Lock
-
-`LSHFT` and `CAPS` are also combined. The key works like a normal `LSHFT` unless double-tapped, in which case it counts as `CAPS`. This functionality unfortunately delays all key presses by at most 200 ms, but I have added ways to disable this both temporarily or permanently, described below.
-
-A normal behavior for `LSHFT` key is on the same key in the [LOWER], [RAISE] and [MEDIA] layers (so you can double tap it, as in IntelliJ IDEA), you can also use the [LOCK] mode.
-
-### Copy/Paste
-
-There are `UNDO`, `CUT`, `COPY`, and `PASTE` keys with the [MEDIA] modifier. This was intended to be a universal way to use these commands since in macOS cut is `⌘ + C` but in Windows it is `⌃ + C`. Unfortunately these special keys only work in Windows.
-
-### How to record and play dynamic Macros
-
-I wanted the macros a little "harder" to start recording than usual, since I didn't want to accidentally delete a macro. Also I wanted to share the same key for storing and reproducing the macros, made more sense for me than using one key for storing the Macro1, and use another one for reproducing that Macro.
-
-**Record a Macro**
-
-Press `Media` and `LCtrl` (that's left control), you will hear a beep if you have the audio on. Then choose where you want to store the Macro, in `;` or `'`, so press that key, you will now hear a tone for the macro start being recorded.
-
-When you are done, press `Media` and `Enter`. You will finally hear a tune confirming that the macro has been stored.
-
-**Play a Macro**
-
-Press `Media` and the key where you stored your Macro, either `;` or `'`. The Macro will play.
-
-![Imgur](https://i.imgur.com/TcVyNag.png)
-
-http://www.keyboard-layout-editor.com/#/gists/4cfb26f84bbb4fabe5e6c7cc22c85e24
-
-## Lock Mode
-
-The Lock mode toggle disables the double-tap `CAPS` and disables `GUI` keys (WINDOWS key), also makes `ENTER` behave normally (not `RSHIFT` when hold).
-
-## Lower + Raise (adjust) Layer
-
-Lower + Raise gives access to the layer switching, plus keyboard modes (such as enabling music mode for annoying your coworkers), reset, SysReq and Lock Mode, which disables the double shift tap for CapsLock (taken from the *circuit* layout, see the comments below). Also provides another distribution for the F keys.
-
-![Adjust](https://i.imgur.com/6m6baos.png)
-
-http://www.keyboard-layout-editor.com/#/gists/12462bfba17d16bb40b54ed914209d92
-
-## Numpad Layer
-
-![Numpad](https://i.imgur.com/od1plfz.png)
-
-http://www.keyboard-layout-editor.com/#/gists/5ab730ab278d2050c5250498806e8edc
-
-This layer is mostly for quick typing numbers using the numpad. You have NumLock available to switch before the keypad numbers or the actions (movement, del, insert, etc). Esc serves as a quick way to go abck to the QWERTY layer (also you can go to the QWERTY layer through the adjust layer).
-
diff --git a/keyboards/planck/keymaps/dr_notsokind/config.h b/keyboards/planck/keymaps/dr_notsokind/config.h
deleted file mode 100644
index 2bebf48a1ca..00000000000
--- a/keyboards/planck/keymaps/dr_notsokind/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c
deleted file mode 100644
index f4fb3e0074c..00000000000
--- a/keyboards/planck/keymaps/dr_notsokind/keymap.c
+++ /dev/null
@@ -1,302 +0,0 @@
-// Layout picture at http://www.keyboard-layout-editor.com/#/gists/125febfad6960add078e6f14256539b6
-
-#include QMK_KEYBOARD_H
-#ifdef AUDIO_ENABLE
-#include "audio.h"
-#endif
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 _NUMPAD  1
-#define _LOCKED  2
-#define _RAISE   3
-#define _LOWER   4
-#define _FUNCTN  5
-#define _MEDIA   6
-#define _ONESHOT 7
-
-enum planck_keycodes {
-    QWERTY = SAFE_RANGE,
-    NUMPAD,
-    RAISE,
-    LOWER,
-    MEDIA,
-    ONESHOT,
-    DYNAMIC_MACRO_RANGE
-};
-
-#include "dynamic_macro.h"
-
-// Key code names
-#define SFT_ENT  MT(MOD_RSFT, KC_ENT)    // Tap for enter, hold for right shift
-#define LOCK     TG(_LOCKED)
-#define KC_PSTE  KC_PASTE
-#define ZOOM_IN  LCTL(KC_EQL)
-#define ZOOM_OUT LCTL(KC_MINS)
-#define ZOOM_NML LCTL(KC_0)
-
-#ifdef TAP_DANCE_ENABLE
-#define SFT_CAP  TD(0)  // Left shift, double tap for caps
-#endif
-#ifndef TAP_DANCE_ENABLE
-#define SFT_CAP  KC_LSFT // Regular left shift
-#endif
-
-// Tap Dance Definitions
-#ifdef TAP_DANCE_ENABLE
-tap_dance_action_t tap_dance_actions[] = {
-    [0]  = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
-};
-#endif
-
-// Layout definitions
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | BKSP |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |*Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |SftEnt|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | Mute | Lower|    Space    | Raise|   /  | Left | Down | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_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,
-    SFT_CAP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   SFT_ENT,
-    KC_LCTL, KC_LGUI, KC_LALT, MEDIA,   LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* NUMPAD
- * ,-----------------------------------------------------------------------------------.
- * |QWERTY| NULL |  Up  | NULL | NULL | NULL | NULL |   /  |   7  |   8  |   9  |   -  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Left | Down | Right| NULL | NULL | NULL |   *  |   4  |   5  |   6  |   +  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |NumLck| NULL | NULL | NULL | NULL | NULL |BckSp |   1  |   2  |   3  |  Ent |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   0  |   .  |   ,  |   =  |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_planck_grid(
-    QWERTY,  XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS,  KC_P7,  KC_P8,   KC_P9,   KC_PMNS,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST,  KC_P4,  KC_P5,   KC_P6,   KC_PPLS,
-    _______, KC_NUM,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC,  KC_P1,  KC_P2,   KC_P3,   KC_PENT,
-    _______, _______, _______, _______, _______, _______, _______, _______,  KC_P0,  KC_PDOT, KC_PCMM, KC_PEQL
-),
-
-/* LOCK
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |      |      |      |      | Enter|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | NULL |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOCKED] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_ENT,
-    _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* RAISE
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F11 |  F12 |  F13 |  F14 |  F15 |      |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LShift|  F16 |  F17 |  F18 |  F19 |  F20 |      |ISO # |ISO / | NULL | PgUp | Enter|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      | Home | PgDn |  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_F11,  KC_F12,   KC_F13,  KC_F14, KC_F15, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_LSFT, KC_F16,  KC_F17,   KC_F18,  KC_F19, KC_F20, _______, KC_NUHS, KC_NUBS, XXXXXXX, KC_PGUP, KC_ENT,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
-),
-
-/* LOWER
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |      |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LShift|  F6  |  F7  |  F8  |  F9  |  F10 |      |ISO ~ |ISO | | NULL | PgUp | Enter|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      | Home | PgDn |  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    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_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-    KC_LSFT, KC_F6,   KC_F7,   KC_F8,    KC_F9, KC_F10,  _______, S(KC_NUHS), S(KC_NUBS), XXXXXXX, KC_PGUP, KC_ENT ,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
-),
-
-/* MEDIA AND COMMANDS
- * ,-----------------------------------------------------------------------------------.
- * | NULL | NULL |WbHome| NULL | NULL | NULL |Again | NULL |Insert| NULL |PrntSc| NULL |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | NULL | NULL |WbSrch| NULL | Find | NULL | NULL | NULL | NULL | NULL |PlyMc1|PlyMc2|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LShift| NULL | NULL | Calc | NULL | NULL | NULL | NULL |ZoomOu|ZoomIn| Prev |RecStp|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |ONESHT| NULL | NULL |      | Vol- |     Mute    | Vol+ |Zoom 0| Stop | Next | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_MEDIA] = LAYOUT_planck_grid(
-	XXXXXXX, XXXXXXX, KC_WHOM, XXXXXXX, XXXXXXX, XXXXXXX, KC_AGAIN, XXXXXXX, KC_INS,   XXXXXXX, KC_PSCR, XXXXXXX,
-	XXXXXXX, XXXXXXX, KC_WSCH, XXXXXXX, KC_FIND, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, DM_PLY1, DM_PLY2,
-	KC_LSFT, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, ZOOM_OUT, ZOOM_IN, KC_MPRV, DM_RSTP,
-	ONESHOT, XXXXXXX, XXXXXXX, _______, KC_VOLD, KC_MUTE, KC_MUTE,  KC_VOLU, ZOOM_NML, KC_MSTP, KC_MNXT, KC_MPLY
-),
-
-/* ONESHOT
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |RecMc1|RecMc2|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ONESHOT] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DM_REC1, DM_REC2,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* FUNCTIONS
- * ,-----------------------------------------------------------------------------------.
- * | SLEEP| NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | POWER|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | WAKE | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL | NULL |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | NULL | NULL | NULL |AudOff|MusOff|QWERTY|NUMPAD|Mus On|Aud On| NULL |Voice+|SysReq|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Reset| NULL | LOCK | NULL |      |     NULL    |      | NULL |AGNorm|Voice-|AGSwap|
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTN] = LAYOUT_planck_grid(
-	KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR,
-	KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-	XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF,  MU_OFF,  QWERTY,  NUMPAD,  MU_ON,   AU_ON,   XXXXXXX, AU_NEXT, KC_SYRQ,
-	QK_BOOT, XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, AU_PREV, AG_SWAP
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-float tone_numpad[][2] = SONG(NUM_LOCK_ON_SOUND);
-float tone_oneshot[][2] = SONG(TERMINAL_SOUND);
-float tone_dyn_macro_rec[][2] = SONG(SONIC_RING);
-float tone_dyn_macro_stop[][2] = SONG(COIN_SOUND);
-#endif
-
-void press_key(uint16_t key) {
-    register_code(key);
-    unregister_code(key);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // uint16_t macro_kc = (keycode == ONESHOT ? DM_RSTP : keycode);
-    if (!process_record_dynamic_macro(keycode, record)) {
-        switch(keycode) {
-          case QK_DYNAMIC_MACRO_RECORD_START_1:
-          case QK_DYNAMIC_MACRO_RECORD_START_2:
-#ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_dyn_macro_rec);
-#endif
-              break;
-          case QK_DYNAMIC_MACRO_RECORD_STOP:
-#ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_dyn_macro_stop);
-#endif
-              break;
-        }
-        return false;
-    }
-    switch (keycode) {
-        case ONESHOT:
-            if (record->event.pressed) {
-                layer_on(_ONESHOT);
-                set_oneshot_layer(_ONESHOT, ONESHOT_START);
-                clear_oneshot_layer_state(ONESHOT_PRESSED);
-#ifdef AUDIO_ENABLE
-                PLAY_SONG(tone_oneshot);
-#endif
-            }
-            return false;
-            break;
-        case QWERTY:
-            if (record->event.pressed) {
-                if (IS_LAYER_ON(_NUMPAD)) {
-#ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_qwerty);
-#endif
-                    layer_off(_NUMPAD);
-                }
-            }
-            return false;
-            break;
-        case NUMPAD:
-            if (record->event.pressed) {
-                if (!IS_LAYER_ON(_NUMPAD)) {
-#ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_numpad);
-#endif
-                    layer_on(_NUMPAD);
-                }
-            }
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_RAISE, _LOWER, _FUNCTN);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_RAISE, _LOWER, _FUNCTN);
-            }
-            return false;
-            break;
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_RAISE, _LOWER, _FUNCTN);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_RAISE, _LOWER, _FUNCTN);
-            }
-            return false;
-            break;
-        case MEDIA:
-            if (record->event.pressed) {
-                layer_on(_MEDIA);
-            } else {
-                layer_off(_MEDIA);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/planck/keymaps/dr_notsokind/rules.mk b/keyboards/planck/keymaps/dr_notsokind/rules.mk
deleted file mode 100644
index 311ee8ec111..00000000000
--- a/keyboards/planck/keymaps/dr_notsokind/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the makefile.mk in 
-#   the appropriate keymap folder that will get included automatically
-#
-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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # 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 = no        # Enable WS2812 RGB underlight. 
-TAP_DANCE_ENABLE = yes      # Enables the double-tap functionality of keys
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/dsanchezseco/config.h b/keyboards/planck/keymaps/dsanchezseco/config.h
deleted file mode 100644
index 501d118632e..00000000000
--- a/keyboards/planck/keymaps/dsanchezseco/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(DVORAK_SOUND)
-#endif
-
-#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 5
diff --git a/keyboards/planck/keymaps/dsanchezseco/keymap.c b/keyboards/planck/keymaps/dsanchezseco/keymap.c
deleted file mode 100644
index 57c22bb9531..00000000000
--- a/keyboards/planck/keymaps/dsanchezseco/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define ESC_CTL LCTL_T(KC_ESC)
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-    ESC_CTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINUS,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_SENT,
-    KC_LCTL, _______, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_BSPC, RAISE,   KC_RGUI, KC_RALT, _______, KC_RCTL
-),
-
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RIGHT,KC_RPRN,
-    _______, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LEFT, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, _______, _______, KC_DOWN, KC_UP,   _______, _______, _______, _______, KC_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, KC_DEL,  _______, _______, _______, _______, _______
-),
-
-[_RAISE] = LAYOUT_planck_grid(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_RIGHT, KC_0,
-    _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_EQL,  KC_LBRC, KC_RBRC,  KC_BSLS,
-    _______, _______, _______, KC_DOWN, KC_UP,   _______, _______, _______, _______, KC_PGUP, KC_PGDN,  _______,
-    _______, _______, _______, _______, _______, _______, KC_DEL,  _______, _______, _______, _______,  _______
-),
-
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, _______, _______,  _______,
-    _______, KC_PSCR, _______, KC_DOWN, KC_UP,   _______, _______, _______, _______, _______, _______,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______
-)
-
-};
-
-//void matrix_init_user(void) {
-//        eeconfig_init();
-//}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/planck/keymaps/dsanchezseco/readme.md b/keyboards/planck/keymaps/dsanchezseco/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/dsanchezseco/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/dsanchezseco/rules.mk b/keyboards/planck/keymaps/dsanchezseco/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/planck/keymaps/dsanchezseco/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/planck/keymaps/dvorak2space/config.h b/keyboards/planck/keymaps/dvorak2space/config.h
deleted file mode 100644
index 0927fa016e1..00000000000
--- a/keyboards/planck/keymaps/dvorak2space/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-#define TAPPING_TOGGLE 1
-#define PERMISSIVE_HOLD
diff --git a/keyboards/planck/keymaps/dvorak2space/keymap.c b/keyboards/planck/keymaps/dvorak2space/keymap.c
deleted file mode 100644
index 928f71ab1cf..00000000000
--- a/keyboards/planck/keymaps/dvorak2space/keymap.c
+++ /dev/null
@@ -1,242 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "passwords.c" //Instead of extern just to cut down on compile time. Holds a single array.
-#define MOUSEL KC_BTN1
-#define MOUSER KC_BTN2
-#define CTRLL LCTL(KC_LEFT)
-#define CTRLR LCTL(KC_RGHT)
-#define CAD LCTL(LALT(KC_DEL))
-
-#define BASE_L  0
-#define SHFT_L  1
-#define MOD_L   2
-#define NAV_L   3
-#define AHK_L   4
-#define LOCK_L  5
-#define PASS_L  6
-
-static host_driver_t *host_driver = 0;
-
-enum {
-  HK_SLP = SAFE_RANGE,
-  HK_IF,
-  HK_ELSE,
-  HK_COSL
-};
-
-enum {
-  FB = 0,
-  LPN,
-  RPN,
-  BCK,
-  DSH
-};
-
-enum {
-  SINGLE_TAP = 1,
-  SINGLE_HOLD = 2,
-  DOUBLE_TAP = 3,
-  DOUBLE_HOLD = 4,
-  DOUBLE_SINGLE_TAP = 5, //Distinguishes between double tapping and typing, "tapping", for example. Not sure how accurate it is, and I have no need, so avoiding it at the moment.
-  TRIPLE_TAP = 6,
-  TRIPLE_HOLD = 7
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Base
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   '  |   ,  |   .  |   p  |   y  |   f  |   g  |   c  |   r  |   l  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Nav  |   a  |   o  |   e  |   u  |   i  |   d  |   h  |   t  |   n  |   s  | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shft |   ;  |   q  |   j  |   k  |   x  |   b  |   m  |   w  |   v  |   z  | Shft |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | RClk | LClk | Ctrl |    Space    |   Modifier  |  GUI | VolD | VolU |Macros|
- * `-----------------------------------------------------------------------------------'
- */
-  [0] = LAYOUT_planck_2x2u(
-    KC_TAB,  KC_QUOT,KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    TD(BCK),
-    MO(NAV_L),KC_A,  KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT,
-    KC_LSFT, KC_SCLN,KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    KC_ESC,  MOUSER, MOUSEL,  KC_LCTL,          KC_SPC,  MO(MOD_L),        KC_LGUI, KC_VOLD, KC_VOLU, OSL(AHK_L)
-  ),
-/* Custom Shifts
- * ,-----------------------------------------------------------------------------------.
- * |      |      |   ?  |   !  |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |             |             |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [1] = LAYOUT_planck_2x2u(
-    KC_TRNS,KC_TRNS,KC_SLSH,KC_1,   KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-    KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_NO,          KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
-  ),
-/* Modifier
- * ,-----------------------------------------------------------------------------------.
- * |  Tab |   +  |   -  |   *  |  / \ |  if  | else |  ( [ |  ) ] |   {  |   }  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   =  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   `  |   <  |   >  |   &  |   |  |   _  |   $  |   @  |   #  |   %  |   ^  |   ~  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |    Space    |             |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [2] = LAYOUT_planck_2x2u(
-    KC_TRNS,KC_PLUS,TD(DSH),KC_ASTR,TD(FB), HK_IF,  HK_ELSE,TD(LPN),TD(RPN),KC_LCBR,KC_RCBR,KC_TRNS,
-    KC_EQL, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_TRNS,
-    KC_GRV, KC_LT,  KC_GT,  KC_AMPR,KC_PIPE,KC_UNDS,KC_DLR, KC_AT,  KC_HASH,KC_PERC,KC_CIRC,LSFT(KC_GRV),
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_SPC, KC_TRNS,        KC_NO,  KC_NO,  KC_NO,  KC_NO
-  ),
-//Nav
-  [3] = LAYOUT_planck_2x2u(
-    KC_TRNS,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_HOME,KC_UP,  KC_END,  KC_NO,  KC_TRNS,
-    KC_TRNS,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  CTRLL,  KC_LEFT,KC_DOWN,KC_RGHT, CTRLR,  KC_TRNS,
-    KC_LSFT,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_SPC, KC_NO,          KC_NO,  KC_NO,   KC_NO,  KC_NO
-  ),
-//AHK-Bindable Macros
-  [4] = LAYOUT_planck_2x2u(
-    KC_F13,      KC_F14,      KC_F15,      KC_F16,      KC_F17,      KC_F18,      KC_F19,      KC_F20,      KC_F21,      KC_F22,      KC_F23,      KC_F24,
-    LCTL(KC_F13),LCTL(KC_F14),LCTL(KC_F15),LCTL(KC_F16),LCTL(KC_F17),LCTL(KC_F18),LCTL(KC_F19),LCTL(KC_F20),LCTL(KC_F21),LCTL(KC_F22),LCTL(KC_F23),LCTL(KC_F24),
-    LSFT(KC_F13),LSFT(KC_F14),LSFT(KC_F15),LSFT(KC_F16),LSFT(KC_F17),LSFT(KC_F18),LSFT(KC_F19),LSFT(KC_F20),LSFT(KC_F21),LSFT(KC_F22),LSFT(KC_F23),LSFT(KC_F24),
-    QK_BOOT,     LALT(KC_F14),LALT(KC_F15),OSL(PASS_L),              CAD,         LALT(KC_F19),             LALT(KC_F21),LALT(KC_F22),HK_SLP,      HK_COSL
-  ),
-//Locked Screen
-  [5] = LAYOUT_planck_2x2u(
-    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,  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,  KC_NO,  KC_NO,          KC_NO,  KC_NO,          KC_NO,  KC_NO,  HK_SLP, KC_NO
-  ),
-//Passwords (by first letter of service name, at least better than just one)
-  [6] = LAYOUT_planck_2x2u(
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_NO,
-    KC_NO,  KC_A,   KC_O,   KC_E,   KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_NO,
-    KC_NO,  KC_NO,  KC_Q,   KC_J,   KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_NO,
-    KC_NO,  KC_NO,  KC_NO,  HK_COSL,         KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) { //X_KEY doesn't support aliases
-  switch(keycode) {
-    //if shift pressed and not shift layer or released and other shift not pressed
-    //in separate things because MOD_BIT (probably?) isn't toggled until after this returns true and shift is actually toggled
-    case KC_LSFT: //if pressed and not shift layer or released and other shift not pressed
-      if((record->event.pressed && IS_LAYER_OFF(SHFT_L)) || (!record->event.pressed && !(get_mods() & MOD_BIT(KC_RSFT)))) { layer_invert(SHFT_L); }
-      break;
-    case KC_RSFT:
-      if((record->event.pressed && IS_LAYER_OFF(SHFT_L)) || (!record->event.pressed && !(get_mods() & MOD_BIT(KC_LSFT)))) { layer_invert(SHFT_L); }
-      break;
-    case KC_ENT: //won't repeat on hold and I can't find a solution other than hardcoding timers but I kinda prefer it anyway. Swaps enter and shift enter
-      if(record->event.pressed) {
-        (IS_LAYER_ON(SHFT_L)) //if shifted release correct shift, send, and press same shift, else send shift enter
-          ? (get_mods() & MOD_BIT(KC_LSFT))
-            ? SEND_STRING(SS_UP(X_LSFT) SS_TAP(X_ENTER) SS_DOWN(X_LSFT))
-            : SEND_STRING(SS_UP(X_RSFT) SS_TAP(X_ENTER) SS_DOWN(X_RSFT))
-          : SEND_STRING(SS_LSFT(SS_TAP(X_ENTER)));
-      }
-      return false;
-    case HK_IF:
-      if(record->event.pressed) { SEND_STRING("if"); }
-      break;
-    case HK_ELSE:
-      if(record->event.pressed) { SEND_STRING("else"); }
-      break;
-    case HK_COSL:
-      clear_keyboard();
-      break;
-    case HK_SLP:
-      if(record->event.pressed) {
-        if(IS_LAYER_OFF(LOCK_L)) {
-          host_driver = host_get_driver();
-          SEND_STRING(SS_LALT(SS_TAP(X_F23)));
-          host_set_driver(0);
-        }
-        else {
-          host_set_driver(host_driver);
-          SEND_STRING(SS_LALT(SS_TAP(X_F24)));
-        }
-        return false;
-      }
-      layer_invert(LOCK_L);
-      if(IS_LAYER_ON(AHK_L))
-        layer_invert(AHK_L);
-      break;
-    default:
-      if(IS_LAYER_ON(PASS_L) && keycode <= KC_Z) {
-        SEND_STRING(passwords[keycode - KC_A]);
-        layer_invert(PASS_L);
-        return false;
-      }
-  }
-  return true;
-};
-
-//tapdance state evaluation
-int cur_dance(tap_dance_state_t *state) {
-  int press = 0;
-  switch(state->count) {
-    case 1:
-      press = (state->interrupted || !state->pressed)
-        ? SINGLE_TAP
-        : SINGLE_HOLD;
-      break;
-     case 2:
-      press = DOUBLE_TAP;
-      break;
-    case 3:
-      press = TRIPLE_TAP;
-  }
-  return press;
-}
-
-void back_tap(tap_dance_state_t *state, void *user_data) { tap_code(KC_BACKSPACE); }
-
-void back_finished(tap_dance_state_t *state, void *user_data) { if(!(state->interrupted || !state->pressed)) tap_code16(LCTL(KC_BACKSPACE)); }
-
-void slash_finished(tap_dance_state_t *state, void *user_data) {
-  int td_state = cur_dance(state);
-  switch(td_state) {
-    case SINGLE_TAP:
-      clear_mods();
-      clear_weak_mods();
-      tap_code(KC_SLSH);
-      break;
-    case DOUBLE_TAP:
-      tap_code(KC_NUBS);
-  }
-}
-
-void dash_finished(tap_dance_state_t *state, void *user_data) {
-  int td_state = cur_dance(state);
-  switch(td_state) {
-    case SINGLE_TAP:
-      tap_code(KC_PMNS);
-      break;
-    case SINGLE_HOLD:
-      register_mods(MOD_BIT(KC_LALT));
-      tap_code(KC_KP_0);
-      tap_code(KC_KP_1);
-      tap_code(KC_KP_5);
-      tap_code(KC_KP_1);
-      unregister_mods(MOD_BIT(KC_LALT));
-      break;
-    case DOUBLE_TAP:
-      tap_code(KC_PMNS);
-      tap_code(KC_PMNS);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [LPN] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_LBRC),
-  [RPN] = ACTION_TAP_DANCE_DOUBLE(KC_RPRN, KC_RBRC),
-  [FB]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, slash_finished, NULL),
-  [BCK] = ACTION_TAP_DANCE_FN_ADVANCED(back_tap, back_finished, NULL), //each tap, on finished, and reset. Normally register_code on press unregister on reset so keys can be held down.
-  [DSH] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dash_finished, NULL)
-};
diff --git a/keyboards/planck/keymaps/dvorak2space/passwords.c b/keyboards/planck/keymaps/dvorak2space/passwords.c
deleted file mode 100644
index 161c564dd5c..00000000000
--- a/keyboards/planck/keymaps/dvorak2space/passwords.c
+++ /dev/null
@@ -1,28 +0,0 @@
-char *passwords[26] = {
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  ""
-};
diff --git a/keyboards/planck/keymaps/dvorak2space/readme.md b/keyboards/planck/keymaps/dvorak2space/readme.md
deleted file mode 100644
index 1844a57f373..00000000000
--- a/keyboards/planck/keymaps/dvorak2space/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![Keyboard Layout](https://i.imgur.com/9jYjllM.png)
-
-# IsaacElenbaas's Planck Layout
-
-Split spacebar, Dvorak. Bottom right button leads to layer with lots of things to be mapped in AutoHotkey. The ones I use (of which the best are sleep, which turns off the monitors and locks all inputs, rebinding keyboard-only mouse inputs, and redirecting media keys to a specific player) can be found [here.](https://github.com/IsaacElenbaas/personal_scripts/blob/master/Keyboard.ahk) Capslock goes to a right-hand navigation layer, there is a custom layer when holding shift, holding dash gives an em dash, holding backspace deletes a word, and I have a obfuscation-based password system you probably shouldn't use, but the rest is pretty standard.
diff --git a/keyboards/planck/keymaps/dvorak2space/rules.mk b/keyboards/planck/keymaps/dvorak2space/rules.mk
deleted file mode 100644
index df48d1a71e6..00000000000
--- a/keyboards/planck/keymaps/dvorak2space/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work. Can make windows not recognize device.
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-TAP_DANCE_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/keymaps/dvz/config.h b/keyboards/planck/keymaps/dvz/config.h
deleted file mode 100644
index ab925009ed8..00000000000
--- a/keyboards/planck/keymaps/dvz/config.h
+++ /dev/null
@@ -1,76 +0,0 @@
- /* Copyright 2021 Milan Düwel
-  *
-  * 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) \
-    }*/
-
-    #define PING_SOUND Q__NOTE(_A6), WD_NOTE(_E7)
-#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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-#ifdef AUDIO_ENABLE
-    #define DAC_SAMPLE_MAX 65535/2
-#endif
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_SAT_STEP 5
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#define RGBLED_NUM 9
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-
-#define RGBLIGHT_RAINBOW_SWIRL_RANGE 127
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
deleted file mode 100644
index ff57d28cf82..00000000000
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-#include "keymap_german.h"
-
-enum combos {
-    AE,
-    OE,
-    UE,
-    SZ
-};
-
-const uint16_t PROGMEM ae_combo[] = {KC_A, KC_E, COMBO_END};
-const uint16_t PROGMEM oe_combo[] = {KC_O, KC_E, COMBO_END};
-const uint16_t PROGMEM ue_combo[] = {KC_U, KC_E, COMBO_END};
-const uint16_t PROGMEM sz_combo[] = {KC_S, DE_Z, COMBO_END};
-
-combo_t key_combos[] = {
-  [AE] = COMBO(ae_combo, DE_AE),
-  [OE] = COMBO(oe_combo, DE_OE),
-  [UE] = COMBO(ue_combo, DE_UE),
-  [SZ] = COMBO(sz_combo, DE_SS)
-};
-
-enum planck_layers {
-  _QWERTZ,
-  _NUMPD,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTZ = SAFE_RANGE,
-  NUMPD,
-  SCROLL
-};
-
-bool scroll = false;
-
-#ifdef AUDIO_ENABLE
-    float ping_song[][2] = SONG(PING_SOUND);
-#endif
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTZ
- * ,-----------------------------------------------------------------------------------.
- * | RtEnc|   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   +  |  -   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | SfTab|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |SfEnt |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI | NumPd|  Alt |  Num |    Space    |  Sym |  Del | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTZ] = LAYOUT_planck_grid(
-    SCROLL,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    DE_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L, DE_PLUS,    DE_MINS,
-LSFT_T(KC_TAB),DE_Y,  KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT,   KC_UP,    SC_SENT,
-    KC_LCTL, KC_LGUI, NUMPD,   KC_LALT, LOWER,  KC_SPC,  KC_SPC,   RAISE,  KC_DEL, KC_LEFT, KC_DOWN,  KC_RGHT
-),
-
-/* Numpad
- * ,-----------------------------------------------------------------------------------.
- * |      |   7  |   8  |   9  |   /  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | NLCK |   4  |   5  |   6  |   -  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   1  |   2  |   3  |   +  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   .  |   0  |   ,  |NumOFF|    Enter    |Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPD] = LAYOUT_planck_grid(
- SFT_T(KC_PASTE),KC_P7,   KC_P8, KC_P9,  DE_SLSH, _______, _______, _______, _______, _______, _______,  _______,
-    KC_NUM,     KC_P4,   KC_P5, KC_P6,  DE_MINS, _______, _______, _______, _______, _______, _______,  _______,
-    _______,    KC_P1,   KC_P2, KC_P3,  DE_PLUS, _______, _______, _______, _______, _______, _______,  _______,
- CTL_T(KC_COPY),KC_DOT,  KC_P0, KC_COMM, NUMPD,  KC_ENT,  KC_ENT,  _______, _______, _______, _______,  _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ^  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F10 |  F11 |  F12 |  F13 |  F14 |  F15 |      |      |      |Pg Up |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      | Home |Pg Dn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    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_F13,  KC_F14,  KC_F15,  _______, _______, _______, KC_PGUP, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN,  KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |   !  |   "  |   §  |   $  |   %  |   &  |   /  |   (  |   )  |   =  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   °  |      |      |      |      |      |   |  |   ?  |   [  |   ]  |   '  |   |  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |   \  |   <  |   >  |   {  |   }  | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      | Brt- | Vol- | Brt+ |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, DE_SLSH, DE_LPRN, DE_RPRN, DE_EQL,  KC_BSPC,
-    KC_TILD, _______, _______, _______, _______, _______, DE_PIPE, DE_QUES, DE_LBRC, DE_RBRC, DE_QUOT, DE_HASH,
-    _______, _______, _______, _______, _______, DE_BSLS, DE_LABK, DE_RABK, DE_LCBR, DE_RCBR, KC_VOLU, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_VOLD, KC_BRIU
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |PowOff|      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    KC_PWR,  _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    /*case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;*/
-    case NUMPD:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(ping_song);
-        #endif
-        if (layer_state_is(_NUMPD)) {
-          layer_off(_NUMPD);
-        } else {
-          layer_on(_NUMPD);
-        }
-      }
-      return false;
-      break;
-    case SCROLL:
-      if (record->event.pressed) {
-          scroll = true;
-      } else {
-          scroll = false;
-      }
-    default:
-      return true;
-  }
-}
-
-void encoder_update(bool clockwise) {
-  if (layer_state_is(_NUMPD)){
-    if (clockwise) {
-        tap_code(KC_RIGHT);
-    } else {
-        tap_code(KC_LEFT);
-    }
-  } else if (scroll) { //scroll fast mode
-    if (clockwise) {
-      tap_code(KC_PGDN);
-    } else {
-      tap_code(KC_PGUP);
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-}
-
-void matrix_scan_user(void) {
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
-const rgblight_segment_t PROGMEM numbers_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {3, 4, HSV_GREEN}
-);
-const rgblight_segment_t PROGMEM symbols_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {2, 5, HSV_PURPLE}
-);
-const rgblight_segment_t PROGMEM numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {5, 4, HSV_RED}       // Light 4 LEDs, starting with LED 6
-);
-const rgblight_segment_t PROGMEM config_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {2, 6, HSV_YELLOW}
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    numbers_layer,
-    symbols_layer,
-    numpad_layer,   // Overrides other layers
-    config_layer
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (!(layer_state_is(_NUMPD))) {
-        state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-    }
-    rgblight_set_layer_state(2, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(0, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(1, layer_state_cmp(state, 3));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 4));
-    return state;
-}
diff --git a/keyboards/planck/keymaps/dvz/readme.md b/keyboards/planck/keymaps/dvz/readme.md
deleted file mode 100644
index f4c1eb6ad81..00000000000
--- a/keyboards/planck/keymaps/dvz/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# devilzmods's german Planck Layout
-
-- QWERTZ
-- Lefthand Numpad layer (toggle)
-- Standard Numbers (left)
-- Symbols (right)
-- Settings
-
-This layout feature "rolling umlauts". Typing ae, oe, ue, sz respectively gets recognized and spits out ä, ö, ü, ß. For this, your systems keyboard layout/language has to be set to DE/German
-
-The layout is also designed around a rotary encoder in the top left corner that switches between slow and fast scrolling in the default layer by pressing it down while turning. In the numpad layer it scrolls left/right and pressing it down holds shift to select while scrolling.
diff --git a/keyboards/planck/keymaps/dvz/rules.mk b/keyboards/planck/keymaps/dvz/rules.mk
deleted file mode 100644
index 7216951bf96..00000000000
--- a/keyboards/planck/keymaps/dvz/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-SRC += muse.c
-
-COMBO_ENABLE = yes
-#VIA_ENABLE = yes
-AUDIO_ENABLE = yes
diff --git a/keyboards/planck/keymaps/dzobert/keymap.c b/keyboards/planck/keymaps/dzobert/keymap.c
deleted file mode 100644
index 2ae760244a0..00000000000
--- a/keyboards/planck/keymaps/dzobert/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid( /* Qwerty */
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   KC_TAB,
-  KC_LCTL,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_BSPC,
-  KC_LALT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  DF(1), KC_RSFT, KC_LGUI, KC_LSFT, MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-                                                // Space is repeated to accommadate for both spacebar wiring positions
-),
-[1] = LAYOUT_planck_grid( /* Colemak */
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_TAB,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,     KC_BSPC,
-  KC_LALT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  DF(0), KC_RSFT, KC_LGUI, KC_LSFT, MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-),
-[2] = LAYOUT_planck_grid( /* RAISE */
-  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_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,     KC_7,    KC_8,          KC_9,  KC_DEL,
-  KC_TRNS, KC_GRV,  KC_MINS,  KC_EQL,  KC_QUOT,  S(KC_QUOT),  S(KC_LBRC),  S(KC_RBRC),  KC_LBRC,  KC_RBRC,  KC_BSLS, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(2),     KC_HOME, KC_PGUP, KC_PGDN, KC_END
-),
-[3] = LAYOUT_planck_grid( /* LOWER */
-  KC_PWR,  KC_PSCR, KC_SCRL, KC_PAUSE, KC_NUM, KC_EXECUTE, KC_MENU,   KC_APP,  KC_7,  KC_8, KC_9, KC_KP_SLASH,
-  KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_CAPS, KC_CANCEL, KC_UNDO, KC_AGAIN, KC_4,  KC_5, KC_6, KC_KP_ASTERISK,
-  KC_TRNS, KC_INSERT,KC_CUT,   KC_COPY,   KC_PASTE,   KC_BSLS,   KC_9,   KC_0,   KC_1,   KC_2,   KC_3,  KC_KP_MINUS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_0, KC_KP_DOT, KC_KP_ENTER, KC_KP_PLUS
-)
-};
diff --git a/keyboards/planck/keymaps/dzobert/rules.mk b/keyboards/planck/keymaps/dzobert/rules.mk
deleted file mode 100644
index d86b02fd1ce..00000000000
--- a/keyboards/planck/keymaps/dzobert/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/emiller/config.h b/keyboards/planck/keymaps/emiller/config.h
deleted file mode 100644
index 18fb275105a..00000000000
--- a/keyboards/planck/keymaps/emiller/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
diff --git a/keyboards/planck/keymaps/emiller/keymap.c b/keyboards/planck/keymaps/emiller/keymap.c
deleted file mode 100644
index 3b0e2c285bc..00000000000
--- a/keyboards/planck/keymaps/emiller/keymap.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _VIM,
-  _NUM
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV,
-  VIM,
-  NUM
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | VIM  | Lower|    Space    |Raise | NUM  | Vol- | Vol+ | Del  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid (
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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, MO(_VIM), LOWER,   KC_SPC,  KC_SPC,  RAISE,  TT(NUM), KC_VOLD, KC_VOLU,  KC_RSFT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | Prev |      |             |      | Next | BL-  | BL+  |Print |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  _______,  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_HOME, KC_END,  _______,
-  _______, _______, _______, KC_MPRV, _______, _______, _______, _______, KC_MNXT, BL_DOWN,BL_UP,  KC_PSCR
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, KC_MPRV, _______, _______, _______, _______, KC_MNXT, BL_DOWN,BL_UP,  KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-/* VIM
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      | Copy | Undo |      | Paste|      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      | Cut  |      |      |      | Left | Down |  Up  | Right |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      | Del  |      |Select|      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_VIM] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, KC_COPY, KC_UNDO, _______, KC_PASTE, _______,
-  _______, _______, _______, KC_CUT, _______, _______,  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
-  _______, _______,  KC_DEL, _______, KC_SELECT, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-/* NUM
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |   7  |   8  |   9  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |   4  |   5  |   6  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |   1  |   2  |   3  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |   0  |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUM] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_0, _______, _______
-),
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case NUM:
-      if (record->event.pressed) {
-        layer_on(_NUM);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_NUM);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-      }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/emiller/readme.md b/keyboards/planck/keymaps/emiller/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/emiller/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/emiller/rules.mk b/keyboards/planck/keymaps/emiller/rules.mk
deleted file mode 100644
index 509cf9fd565..00000000000
--- a/keyboards/planck/keymaps/emiller/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
diff --git a/keyboards/planck/keymaps/emilyh/config.h b/keyboards/planck/keymaps/emilyh/config.h
deleted file mode 100644
index 59bf4aa2a3e..00000000000
--- a/keyboards/planck/keymaps/emilyh/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/emilyh/keymap.c b/keyboards/planck/keymaps/emilyh/keymap.c
deleted file mode 100644
index b226c1f6e71..00000000000
--- a/keyboards/planck/keymaps/emilyh/keymap.c
+++ /dev/null
@@ -1,270 +0,0 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Brite| GUI  | Alt  |Lower |    Space    |Raise |   /  | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_UP,   KC_ENT ,
-  KC_LCTL, BACKLIT, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ | Home | Next | Vol+ | Mute |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |  End | Prev | Vol- | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,  KC_LPRN, KC_RPRN, KC_DEL,
-  KC_TILD, 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), KC_HOME,  KC_MNXT, KC_VOLU, KC_MUTE,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_END,   KC_MPRV, KC_VOLD, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |Plover|Pg Up | Next | Vol+ | Mute |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |Pg Dn | Prev | Vol- | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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,  TO(_PLOVER), KC_PGUP, KC_MNXT, KC_VOLU, KC_MUTE,
-  _______, _______, _______, _______, _______, _______, _______, _______,     KC_PGDN, KC_MPRV, KC_VOLD, KC_MPLY
-),
-
-/* Numpad Layer
- * ,-----------------------------------------------------------------------------------.
- * | ESC  |      |      |  (   |   )  |      |      |   7  |   8  |   9  |   +  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  Tab |   +  |   -  |   *  |   /  |      |      |   4  |   5  |   6  |   -  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |  Up  |      |      |      |      |   1  |   2  |   3  |  Up  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |ToQrty| Left | Down |Right |      |    Space    |   0  |   .  | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_ESC , XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN,XXXXXXX, XXXXXXX,   KC_P7,  KC_P8,    KC_P9,   KC_PPLS, KC_BSPC,
-  KC_TAB , KC_PPLS, KC_PMNS, KC_PAST, KC_PSLS,XXXXXXX, XXXXXXX,   KC_P4,  KC_P5,    KC_P6,   KC_PMNS, XXXXXXX,
-  XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,   KC_P1,  KC_P2,    KC_P3,   KC_UP,   _______,
-  TO(_QWERTY),KC_LEFT,KC_DOWN,KC_RGHT,XXXXXXX, KC_SPC,  KC_SPC,   KC_P0,  KC_PDOT,  KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistant_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistant_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(tone_plover);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover_gb);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/emilyh/readme.md b/keyboards/planck/keymaps/emilyh/readme.md
deleted file mode 100644
index 5805480ebfe..00000000000
--- a/keyboards/planck/keymaps/emilyh/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# A modified planck layout with arrow cluster
-
diff --git a/keyboards/planck/keymaps/eosti/config.h b/keyboards/planck/keymaps/eosti/config.h
deleted file mode 100644
index d5915a78ad9..00000000000
--- a/keyboards/planck/keymaps/eosti/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2020 Reid Sox-Harris
- *
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
- #define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/eosti/keymap.c b/keyboards/planck/keymaps/eosti/keymap.c
deleted file mode 100644
index f1d66d2a913..00000000000
--- a/keyboards/planck/keymaps/eosti/keymap.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright 2020 Reid Sox-Harris
- *
- * 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"
-
-enum planck_layers {
-    _QWERTY,
-    _GAME,
-    _UPPER,
-    _LOWER,
-    _UTILS
-};
-
-enum planck_keycodes {
-    TMUX_WN = SAFE_RANGE,
-    TMUX_WL
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TMUX_WN:                   // Moves to the next tmux window
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCTL("a") "n");
-            }
-            break;
-
-        case TMUX_WL:                   // Moves to the last tmux window
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCTL("a") "n");
-            }
-            break;
-    }
-    return true;
-};
-
-#define UPPER           MO(_UPPER)
-#define LOWER           MO(_LOWER)
-#define UTILS           MO(_UTILS)
-#define GAME            TG(_GAME)
-
-#define WM_R            LCTL(KC_RGHT)   // Moves the MacOS WM window to the right
-#define WM_L            LCTL(KC_LEFT)   // ...and to the left
-#define WM_MC           LCTL(KC_UP)     // Opens MacOS Mission Control
-#define WEB_R           LGUI(KC_RCBR)   // Move one tab to the right, works on Firefox, Chrome
-#define WEB_L           LGUI(KC_LCBR)   // ...and to the left
-#define TMUX_U          RALT(KC_UP)     // Changes focus in tmux, requires a keybinding in tmux.conf
-#define TMUX_D          RALT(KC_DOWN)
-#define TMUX_R          RALT(KC_RGHT)
-#define TMUX_L          RALT(KC_LEFT)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_planck_grid(
-        // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-             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_ESC,   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_BSPC,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-             KC_NO,   KC_NO,  KC_LCTL, KC_LGUI,  UPPER,   KC_ENT,  KC_SPC,  LOWER,  KC_RALT, KC_VOLU, KC_VOLD, KC_MUTE
-        // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-            ),
-    [_GAME] = LAYOUT_planck_grid(
-        // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______, _______, _______, _______, _______,  KC_SPC,  KC_ENT, _______, _______, _______, _______, _______
-        // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-            ),
-    [_UPPER] = LAYOUT_planck_grid(
-        // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-             KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,   KC_EQL,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______,  WEB_L,   WEB_R,   WM_MC,    WM_L,    WM_R,  KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT, KC_PGUP, KC_BSLS,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______,  KC_NO,  KC_LABK, KC_LBRC, KC_LPRN, KC_LCBR, KC_RCBR, KC_RPRN, KC_RBRC, KC_RABK, KC_PGDN, _______,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______, _______, _______, _______,  UPPER,  _______, _______,  UTILS,  _______, KC_MPRV, KC_MPLY, KC_MNXT
-        // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-            ),
-    [_LOWER] = LAYOUT_planck_grid(
-        // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-            KC_TILD, KC_EXLM,  KC_AT,  KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______, TMUX_WL, TMUX_WN,  KC_NO,   KC_NO,   KC_NO,   TMUX_L,  TMUX_D,  TMUX_U,  TMUX_R,  KC_NO,  KC_PIPE,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______,  KC_NO,  _______, _______, _______, _______, _______, _______, _______, _______,  KC_NO,   KC_DEL,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______, _______, _______, _______,  UTILS,  _______, _______,  LOWER,  _______, _______, _______, _______
-        // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-            ),
-    [_UTILS] = LAYOUT_planck_grid(
-        // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-            KC_CAPS,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,  KC_NO,   KC_INS,  KC_HOME,  AU_ON,   KC_NO,   GAME,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-             KC_NO,  RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_SLEP,  KC_DEL,  KC_END,  AU_OFF,  KC_NO,   QK_BOOT,
-        // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-            _______, _______, _______, _______,  UTILS,  _______, _______,  UTILS,  _______, _______, _______, _______
-        // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-            )
-};
diff --git a/keyboards/planck/keymaps/eosti/readme.md b/keyboards/planck/keymaps/eosti/readme.md
deleted file mode 100644
index eb775c52ce1..00000000000
--- a/keyboards/planck/keymaps/eosti/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# eosti's Planck (rev6) Keymap
-## Features
-* QWERTY main layout
-* Gaming sublayer that switches space and enter for ease of WASDing
-* Common programming enclosers {([<>])} easily accessable
-* Vim-style HJKL arrow navigation
-* tmux keybindings for easy navigation
-* Plays well with my Iris Rev.3 keymap for ease of switching
-* I like it
diff --git a/keyboards/planck/keymaps/eosti/rules.mk b/keyboards/planck/keymaps/eosti/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/eosti/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/eshesh2/config.h b/keyboards/planck/keymaps/eshesh2/config.h
deleted file mode 100644
index 60c979b8a15..00000000000
--- a/keyboards/planck/keymaps/eshesh2/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2021 Eshan Dalal
-  *
-  * 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), \
-                                }
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-#define TAP_CODE_DELAY 10
-
-#define ENCODERS_PAD_A { B12 }
-#define ENCODERS_PAD_B { B13 }
diff --git a/keyboards/planck/keymaps/eshesh2/keymap.c b/keyboards/planck/keymaps/eshesh2/keymap.c
deleted file mode 100644
index ccb1db659a8..00000000000
--- a/keyboards/planck/keymaps/eshesh2/keymap.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* Copyright 2020 Eshan Dalal
- *
- * 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"
-
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _NUMPAD,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  ADJUST,
-  NUMPAD,
-  EXT_NUM
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Mute |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Ctrl | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_MUTE, 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_ENT ,
-    KC_ESC,  KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Mute |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_MPLY, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Numpad layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |NumLck|  7   |  8   |  9   |Bksp  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Left | Down | Up   |Right |      |      |      |  4   |  5   |  6   |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |  1   |  2   |  3   |Tab   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |      |      |             |      |  .   |  0   |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,    XXXXXXX, XXXXXXX,    KC_NUM,  KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_BSPC,
-    XXXXXXX, KC_LEFT, KC_DOWN,  KC_UP,     KC_RIGHT,   XXXXXXX, XXXXXXX,    XXXXXXX, KC_KP_4,    KC_KP_5,    KC_KP_6,    KC_ENTER,
-    XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_TAB,
-    EXT_NUM, XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, KC_KP_DOT,  KC_KP_0,    XXXXXXX,    XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |Numpad|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  XXXXXXX, XXXXXXX, NUMPAD,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case NUMPAD:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_NUMPAD);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_NUM:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_NUMPAD);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-      switch (get_highest_layer(layer_state)) {
-        case _LOWER:	// Seek Track
-            if (clockwise) {
-               tap_code16(KC_MPRV);
-                 } else {
-			   tap_code16(KC_MNXT);
-            break;
-        case _RAISE:	// Page Scroll
-            if (clockwise) {
-               tap_code16(KC_BRID);
-                 } else {
-			   tap_code16(KC_BRIU);
-            break;
-        default:		// Volume
-			if (clockwise) {
-               tap_code16(KC_VOLD);
-                 } else {
-               tap_code16(KC_VOLU);
-		   		 }
-        	}
-		}
-	}
-  }
-    return true;
-}
-
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/eshesh2/readme.md b/keyboards/planck/keymaps/eshesh2/readme.md
deleted file mode 100644
index f5ee73f1e61..00000000000
--- a/keyboards/planck/keymaps/eshesh2/readme.md
+++ /dev/null
@@ -1,64 +0,0 @@
-![eshesh2's Planck Layout](https://i.imgur.com/eVgHH6k.png)
-
-eshesh2's Planck layout with a rotary encoder on the top left of the Planck. It is designed for everyday use along with a numpad layer for quickly typing in Excel and other workbook programs.
-
-## Qwerty
-
-    ,-----------------------------------------------------------------------------------.
-    | Mute |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Esc  | Ctrl | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-    `-----------------------------------------------------------------------------------'
-
-## Lower
-
-    ,-----------------------------------------------------------------------------------.
-    | Play |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-    `-----------------------------------------------------------------------------------'
-
-## Raise
-
-    ,-----------------------------------------------------------------------------------.
-    |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-    `-----------------------------------------------------------------------------------'
-
-# Numpad layer
-
-    ,-----------------------------------------------------------------------------------.
-    |      |      |  Up  |      |      |      |      |      |NumLck|   7  |  8   |  9   |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      | Left | Down | Right|      |      |      |      |      |   4  |  5   |   6  |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |Enter |  Tab |      |      |      |      |      |      |   1  |  2   |   3  |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Exit |      |      |      |      |             |      |      |   .  |  0   |Bksp |
-    `-----------------------------------------------------------------------------------'
-
-# Adjust (Lower + Raise)
-
-                         v------------------------RGB CONTROL--------------------v
-    ,-----------------------------------------------------------------------------------.
-    |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |Numpad|      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |             |      |      |      |      |      |
-    `-----------------------------------------------------------------------------------'
diff --git a/keyboards/planck/keymaps/eshesh2/rules.mk b/keyboards/planck/keymaps/eshesh2/rules.mk
deleted file mode 100644
index 07a64e2fb60..00000000000
--- a/keyboards/planck/keymaps/eshesh2/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SRC += muse.c
-ENCODER_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/planck/keymaps/experimental/config.h b/keyboards/planck/keymaps/experimental/config.h
deleted file mode 100644
index 9ee7d9fac4d..00000000000
--- a/keyboards/planck/keymaps/experimental/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define LEADER_TIMEOUT 300
-#define BACKLIGHT_BREATHING
-
-/* ws2812 RGB LED */
-#define WS2812_DI_PIN B1
-#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 8     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/planck/keymaps/experimental/keymap.c b/keyboards/planck/keymaps/experimental/keymap.c
deleted file mode 100644
index deaf5afb4dd..00000000000
--- a/keyboards/planck/keymaps/experimental/keymap.c
+++ /dev/null
@@ -1,365 +0,0 @@
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 10
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _ADJUST 16
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV,
-  RGBLED_TOGGLE,
-  RGBLED_STEP_MODE,
-  RGBLED_INCREASE_HUE,
-  RGBLED_DECREASE_HUE,
-  RGBLED_INCREASE_SAT,
-  RGBLED_DECREASE_SAT,
-  RGBLED_INCREASE_VAL,
-  RGBLED_DECREASE_VAL,
-};
-
-#define SW_SPC  SH_T(KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid(
-  QWERTY, KC_NO, KC_NO, KC_NO, RGBLED_TOGGLE, RGBLED_STEP_MODE, RGBLED_INCREASE_HUE, RGBLED_DECREASE_HUE, RGBLED_INCREASE_SAT, RGBLED_DECREASE_SAT, RGBLED_INCREASE_VAL, RGBLED_DECREASE_VAL,
-  KC_NO, KC_NO, KC_NO, KC_NO, RGBLED_TOGGLE, RGBLED_STEP_MODE, RGBLED_INCREASE_HUE, RGBLED_DECREASE_HUE, RGBLED_INCREASE_SAT, RGBLED_DECREASE_SAT, RGBLED_INCREASE_VAL, RGBLED_DECREASE_VAL,
-  KC_NO, KC_NO, KC_NO, KC_NO, RGBLED_TOGGLE, RGBLED_STEP_MODE, RGBLED_INCREASE_HUE, RGBLED_DECREASE_HUE, RGBLED_INCREASE_SAT, RGBLED_DECREASE_SAT, RGBLED_INCREASE_VAL, RGBLED_DECREASE_VAL,
-  KC_NO, KC_NO, KC_NO, KC_NO, RGBLED_TOGGLE, RGBLED_STEP_MODE, RGBLED_INCREASE_HUE, RGBLED_DECREASE_HUE, RGBLED_INCREASE_SAT, RGBLED_DECREASE_SAT, RGBLED_INCREASE_VAL, RGBLED_DECREASE_VAL
-),
-
-/* Qwerty
- ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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 ,
-  QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SW_SPC,  SW_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SW_SPC,  SW_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   SW_SPC,  SW_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_NUHS, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-  STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-  XXXXXXX, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-  EXT_PLV, XXXXXXX, XXXXXXX, STN_A,   STN_O,   XXXXXXX, XXXXXXX, STN_E,   STN_U,   STN_PWR, STN_RE1, STN_RE2
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_qwerty);
-            #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          break;
-      return false;
-        case COLEMAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_colemak);
-            #endif
-            persistent_default_layer_set(1UL<<_COLEMAK);
-          }
-          break;
-      return false;
-        case DVORAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_dvorak);
-            #endif
-            persistent_default_layer_set(1UL<<_DVORAK);
-          }
-          break;
-      return false;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            #ifdef BACKLIGHT_ENABLE
-                breathing_period_set(2);
-                breathing_pulse();
-            #endif
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          break;
-      return false;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            #ifdef BACKLIGHT_ENABLE
-                breathing_period_set(2);
-                breathing_pulse();
-            #endif
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          break;
-      return false;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      return false;
-        case PLOVER:
-          if (!record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              stop_all_notes();
-              PLAY_SONG(tone_plover);
-            #endif
-            layer_on(_PLOVER);
-          }
-        break;
-      return false;
-        case EXT_PLV:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_plover_gb);
-            #endif
-            layer_off(_PLOVER);
-          }
-        break;
-      return false;
-
-    case RGBLED_TOGGLE:
-      //led operations
-      if (record->event.pressed) {
-        rgblight_toggle();
-      }
-      return false;
-      break;
-    case RGBLED_INCREASE_HUE:
-      if (record->event.pressed) {
-        rgblight_increase_hue();
-      }
-      return false;
-      break;
-    case RGBLED_DECREASE_HUE:
-      if (record->event.pressed) {
-        rgblight_decrease_hue();
-      }
-      return false;
-      break;
-    case RGBLED_INCREASE_SAT:
-      if (record->event.pressed) {
-        rgblight_increase_sat();
-      }
-      return false;
-      break;
-    case RGBLED_DECREASE_SAT:
-      if (record->event.pressed) {
-        rgblight_decrease_sat();
-      }
-      return false;
-      break;
-    case RGBLED_INCREASE_VAL:
-      if (record->event.pressed) {
-        rgblight_increase_val();
-      }
-      return false;
-      break;
-    case RGBLED_DECREASE_VAL:
-      if (record->event.pressed) {
-        rgblight_decrease_val();
-      }
-      return false;
-      break;
-    case RGBLED_STEP_MODE:
-      if (record->event.pressed) {
-        rgblight_step();
-      }
-      return false;
-      break;
-
-
-      }
-  return true;
-};
-
-void leader_end_user(void) {
-  if (leader_sequence_one_key(KC_R)) {
-    tap_random_base64();
-    tap_random_base64();
-    tap_random_base64();
-    tap_random_base64();
-    tap_random_base64();
-    tap_random_base64();
-    tap_random_base64();
-    tap_random_base64();
-    tap_random_base64();
-  }
-  if (leader_sequence_one_key(KC_V)) {
-    SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-  }
-  if (leader_sequence_one_key(KC_F)) {
-    SEND_STRING("if yes\n\tpeanut butter\nelse\n\trice snacks");
-  }
-  if (leader_sequence_two_keys(KC_A, KC_S)) {
-    register_code(KC_H);
-    unregister_code(KC_H);
-  }
-  if (leader_sequence_three_keys(KC_A, KC_S, KC_D)) {
-    register_code(KC_LGUI);
-    register_code(KC_S);
-    unregister_code(KC_S);
-    unregister_code(KC_LGUI);
-  }
-}
diff --git a/keyboards/planck/keymaps/experimental/readme.md b/keyboards/planck/keymaps/experimental/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/experimental/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/experimental/rules.mk b/keyboards/planck/keymaps/experimental/rules.mk
deleted file mode 100644
index 0ede1a0c2d6..00000000000
--- a/keyboards/planck/keymaps/experimental/rules.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SWAP_HANDS_ENABLE = yes        # Enable one-hand typing
-STENO_ENABLE = yes					# Enable TX Bolt protocol for Stenography, requires VIRTSER and may not work with mouse keys
-LEADER_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/fabian/config.h b/keyboards/planck/keymaps/fabian/config.h
deleted file mode 100644
index d21e85693a4..00000000000
--- a/keyboards/planck/keymaps/fabian/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/fabian/keymap.c b/keyboards/planck/keymaps/fabian/keymap.c
deleted file mode 100644
index 1569ed5e985..00000000000
--- a/keyboards/planck/keymaps/fabian/keymap.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define CTL_ESC CTL_T(KC_ESC)  // Tap for Escape, hold for Control
-#define HPR_TAB ALL_T(KC_TAB)  // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define MEH_GRV MEH_T(KC_GRV)  // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
-#define SFT_BSP SFT_T(KC_BSPC) // Tap for Backspace, hold for Shift
-#define SFT_ENT SFT_T(KC_ENT)  // Tap for Enter, hold for Shift
-#define SFT_SPC SFT_T(KC_SPC)  // Tap for Space, hold for Shift
-#define UMLAUT  RALT(KC_U)     // Combine Alt and U
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  |Lower |Space | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  |Lower |Space | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  |Lower |Space | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  SFT_BSP, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | RGBM |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MS L | MS D |MS U  | MS R |MS Btn|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | RGBM |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | Left | Down |  Up  | Rght |MS_BN2|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_BTN2,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |      |      |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifndef KEYBOARD_planck_rev6
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifndef KEYBOARD_planck_rev6
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-  PLAY_SONG(plover_song);
-#endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-    return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/fabian/rules.mk b/keyboards/planck/keymaps/fabian/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/fabian/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/foreveranapple/config.h b/keyboards/planck/keymaps/foreveranapple/config.h
deleted file mode 100644
index 6e6d0f3ac73..00000000000
--- a/keyboards/planck/keymaps/foreveranapple/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* 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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/foreveranapple/keymap.c b/keyboards/planck/keymaps/foreveranapple/keymap.c
deleted file mode 100644
index c9d9c9f6ad3..00000000000
--- a/keyboards/planck/keymaps/foreveranapple/keymap.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/* 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _QWERTY,
-  _OSX,
-  _NIXQWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  OSX,
-  NIXQWERTY,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Brite | Alt  | GUI  |Raise |    Space    |Lower | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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, BACKLIT, KC_LALT, KC_LGUI, RAISE,   KC_SPC,  KC_SPC,  LOWER,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* OSX - Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | CMD  |Brite | Alt  | CTRL |Raise |    Space    |Lower | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_OSX] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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_LGUI, BACKLIT, KC_LALT, KC_LCTL, RAISE,   KC_SPC,  KC_SPC,  LOWER,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* NixQwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Brite | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_NIXQWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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, BACKLIT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|NixQty| OSX  |Plover|Colemk|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,   RGB_VAI, RGB_VAD, KC_DEL,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NIXQWERTY, OSX,     PLOVER,  COLEMAK,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,   DVORAK,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case OSX:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_OSX);
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-      }
-      return false;
-      break;
-    case NIXQWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_NIXQWERTY);
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/foreveranapple/readme.md b/keyboards/planck/keymaps/foreveranapple/readme.md
deleted file mode 100644
index ddaa58ea369..00000000000
--- a/keyboards/planck/keymaps/foreveranapple/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The Almost Default Planck Layout
-
-Simple changes right now, just some key shifts. Nothing major.
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/foreveranapple/rules.mk b/keyboards/planck/keymaps/foreveranapple/rules.mk
deleted file mode 100644
index 87df38d49e7..00000000000
--- a/keyboards/planck/keymaps/foreveranapple/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC += muse.c
-AUDIO_ENABLED = yes
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/fsck/config.h b/keyboards/planck/keymaps/fsck/config.h
deleted file mode 100644
index d68bc86cad3..00000000000
--- a/keyboards/planck/keymaps/fsck/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#define USB_MAX_POWER_CONSUMPTION 100
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-                                
-#define MIDI_BASIC
diff --git a/keyboards/planck/keymaps/fsck/keymap.c b/keyboards/planck/keymaps/fsck/keymap.c
deleted file mode 100644
index b05d0e9859a..00000000000
--- a/keyboards/planck/keymaps/fsck/keymap.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Brite | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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, BACKLIT, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Vol- | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | ALTGr|      |             |      | Home |Pg Dn |Pg Up | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  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_VOLD, KC_VOLU, _______,
-  _______, _______, _______, KC_RALT, _______, _______, _______, _______,    KC_HOME,    KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / | Vol- | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | ALTGr|      |             |      | Home |Pg Dn |Pg Up | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_VOLD, KC_VOLU, _______,
-  _______, _______, _______, KC_RALT, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/fsck/readme.md b/keyboards/planck/keymaps/fsck/readme.md
deleted file mode 100644
index 755da3e219c..00000000000
--- a/keyboards/planck/keymaps/fsck/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![preonic:fsck Layout Image](https://i.imgur.com/GOLyPGP.png)
-
-# fsck's Planck Layout
-
-This is largely based on the default planck layout.
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/fsck/rules.mk b/keyboards/planck/keymaps/fsck/rules.mk
deleted file mode 100644
index bd0181d620e..00000000000
--- a/keyboards/planck/keymaps/fsck/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/gabriel/keymap.c b/keyboards/planck/keymaps/gabriel/keymap.c
deleted file mode 100644
index 9e56724c1bd..00000000000
--- a/keyboards/planck/keymaps/gabriel/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#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.
-#define _QW 0
-#define _LW 1
-#define _RS 2
-#define _FN 3
-
-// This a slightly modified 'default' keymap that's closer to the Mac keyboard layout. I like the position
-// of 'esc' and 'tab' better this way. I also got rid of the backlighting control key and the dvorak and
-// colemak layers. I added an 'fn' layer that makes the 'bspc' a forward delete (like on OSX).
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* MIT Layout (QWERTY layer)
- *
- * ,-----------------------------------------------------------------------.
- * | esc |  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  | bspc|
- * |-----------------------------------------------------------------------|
- * | tab |  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |  '  |
- * |-----------------------------------------------------------------------|
- * |shift|  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |enter|
- * |-----------------------------------------------------------------------|
- * | fn  | ctl | alt | cmd |lower|    spc    |raise|left |down | up  |right|
- * `-----------------------------------------------------------------------'
- */
-[_QW] = LAYOUT_planck_grid( /* QWERTY */
-  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_ENT ,
-  MO(_FN), KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-),
-/* MIT Layout (Raised layer)
- *
- * ,-----------------------------------------------------------------------.
- * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |     |
- * |-----------------------------------------------------------------------|
- * |     | F1  | F2  | F3  | F4  | F5  | F6  |  -  |  +  |  [  |  ]  |  |  |
- * |-----------------------------------------------------------------------|
- * |     | F7  | F8  | F9  | F10 | F11 | F12 |     |     |     |     |     |
- * |-----------------------------------------------------------------------|
- * |     |     |     |     |     |           |     |     |     |     |     |
- * `-----------------------------------------------------------------------'
- */
-[_RS] = LAYOUT_planck_grid( /* RAISE */
-  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_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_PLUS, KC_LBRC, KC_RBRC, KC_PIPE,
-  KC_TRNS, 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
-),
-/* MIT Layout (Lowered layer)
- *
- * ,-----------------------------------------------------------------------.
- * |  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |     |
- * |-----------------------------------------------------------------------|
- * |     | F1  | F2  | F3  | F4  | F5  | F6  |  _  |  =  |  {  |  }  |  \  |
- * |-----------------------------------------------------------------------|
- * |     | F7  | F8  | F9  | F10 | F11 | F12 |     |     |     |     |     |
- * |-----------------------------------------------------------------------|
- * |     |     |     |     |     |           |     |     |     |     |     |
- * `-----------------------------------------------------------------------'
- */
-[_LW] = LAYOUT_planck_grid( /* LOWER */
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_EQL,  KC_LCBR, KC_RCBR, KC_BSLS,
-  KC_TRNS, 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
-),
-/* MIT Layout (FN layer)
- *
- * ,-----------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     | del |
- * |-----------------------------------------------------------------------|
- * |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------|
- * |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------|
- * |     |     |     |     |     |           |     |home |pgdn |pgup | end |
- * `-----------------------------------------------------------------------'
- */
-[_FN] = LAYOUT_planck_grid( /* FUNCTION */
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-)
-};
diff --git a/keyboards/planck/keymaps/gabriel/rules.mk b/keyboards/planck/keymaps/gabriel/rules.mk
deleted file mode 100644
index d86b02fd1ce..00000000000
--- a/keyboards/planck/keymaps/gabriel/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/gitdrik/config.h b/keyboards/planck/keymaps/gitdrik/config.h
deleted file mode 100644
index 455e33d6d28..00000000000
--- a/keyboards/planck/keymaps/gitdrik/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* 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/>.
- */
-
-/* Passed along from planck default to Finnish SFS 5966 by gitdrik, 2020-2023. */
-
-#pragma once
-
-#ifdef AUDIO_ENABLE
-#    define STARTUP_SONG SONG(NO_SOUND)
-//#    define STARTUP_SONG SONG(PLANCK_SOUND)
-//#    define AUDIO_INIT_DELAY // Get startup_song to actually play
-
-#    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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/gitdrik/keymap.c b/keyboards/planck/keymaps/gitdrik/keymap.c
deleted file mode 100644
index c62e93671a9..00000000000
--- a/keyboards/planck/keymaps/gitdrik/keymap.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* 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/>.
- */
-
-/* Modified from planck default to Finnish SFS 5966 by gitdrik, 2020-2023. */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum planck_layers {
-  _BASE,
-  _LEFT,
-  _RIGHT,
-  _LEFTER,
-  _RIGHTER
-};
-
-#define LEFT TT(_LEFT)
-#define RIGHT MO(_RIGHT)
-#define LEFTER MO(_LEFTER)
-#define RIGHTER MO(_RIGHTER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Base
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   Å  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   Ö  |   Ä  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Shift|   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  | Shift| Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   Z  | GUI  | Alt  |Left2 | Left |BkSpc | Spc  |Right |Rghter|   \  |   -  |   /  |
- * `-----------------------------------------------------------------------------------'
- */
-[_BASE] = LAYOUT_planck_grid(
-    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_ESC,  KC_LSFT, KC_X,    KC_C,   KC_V,   KC_B,    KC_N,   KC_M,   KC_COMM, KC_DOT,        KC_RSFT, KC_ENT ,
-    KC_Z,    KC_LGUI, KC_LALT, LEFTER, LEFT,   KC_BSPC, KC_SPC, RIGHT,  RIGHTER, RALT(KC_MINS), KC_SLSH, KC_PSLS
-),
-
-/* Left
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |  F10 |  F9  |  F8  |  F7  |   {  |   }  |   7  |   8  |   9  |   ^  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RCtrl|  F11 |  F6  |  F5  |  F4  |   (  |   )  |   4  |   5  |   6  |   +  |   *  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Shift|  F3  |  F2  |  F1  |   [  |   ]  |   1  |   2  |   3  | Shift| Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | F12  | GUI  | Alt  |Lefter| Left |BkSpc | Spc  |Right |   0  |   ,  |   -  |   /  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LEFT] = LAYOUT_planck_grid(
-    KC_TRNS, KC_F10,  KC_F9,   KC_F8,   KC_F7,   RALT(KC_7), RALT(KC_0), KC_7,    KC_8,   KC_9,    LSFT(KC_RBRC), LSFT(KC_0),
-    KC_RCTL, KC_F11,  KC_F6,   KC_F5,   KC_F4,   LSFT(KC_8), LSFT(KC_9), KC_4,    KC_5,   KC_6,    KC_PPLS,       KC_PAST,
-    KC_TRNS, KC_TRNS, KC_F3,   KC_F2,   KC_F1,   RALT(KC_8), RALT(KC_9), KC_1,    KC_2,   KC_3,    KC_TRNS,       KC_TRNS,
-    KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS, KC_0,   KC_COMM, KC_PMNS,       KC_PSLS
-),
-
-/* Right
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |  ◌̄   |  ◌̈	  |  ◌́	  |  ◌̀	  |  ◌̃	  |  ◌̆   | Home |  Up  | End  | Ins  | PgUp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RCtrl|  @   |   $  |   °  |   &  |   #  |   %  | Left | Down | Right| Del  | PgDn |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Shift|   ”  |   «  |   »  |  ‚ „ |   ‰  |PlayPs|  <<  |  >>  | Shift| Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   “  | GUI  | Alt  |Lefter|      |BkSpc | Spc  |Right |Rghter| Vol- | Vol+ | Mute |
- * `-----------------------------------------------------------------------------------'
- */
- [_RIGHT] = LAYOUT_planck_grid(
-    KC_TRNS,          RALT(LSFT(KC_RBRC)), KC_RBRC,          KC_EQL ,          LSFT(KC_EQL),     RALT(KC_RBRC), RALT(KC_NUHS), KC_HOME, KC_UP,   KC_END , KC_INS , KC_PGUP,
-    KC_RCTL,          RALT(KC_2),          RALT(KC_4),       RALT(LSFT(KC_0)), LSFT(KC_6),       LSFT(KC_3),    LSFT(KC_5),    KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  KC_PGDN,
-    KC_TRNS,          KC_TRNS,             RALT(LSFT(KC_2)), RALT(LSFT(KC_4)), RALT(LSFT(KC_3)), RALT(KC_6),    RALT(KC_5),    KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
-    RALT(LSFT(KC_5)), KC_TRNS,             KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,       KC_TRNS,       KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE
-),
-
-/* Lefter
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |  § ½ |   "  |   €  |      |  þ Þ |   ¡  |   !  |   ı  |  œ Œ |  ◌̛ ◌̉ | ◌̋  ◌̊ |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  ə Ə |  ß ẞ |  ð Ð |   '  |   <  |   >  |      |   ĸ  |   ◌̵  |  ø Ø |  æ Æ |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Shift|  × · | ◌̧  ◌̨ |      |      |  ŋ Ŋ |  µ — |  ’ ‘ | ◌̣  ◌̇ | Shift| Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  ʒ Ʒ | GUI  | Alt  |Lefter|      | BkSpc| NbSp |      |Rghter|   |  | – ◌̦  |   ?  |
- * `-----------------------------------------------------------------------------------'
- */
- [_LEFTER] = LAYOUT_planck_grid(
-    KC_TRNS,   KC_GRV,    LSFT(KC_2), RALT(KC_E),   RALT(KC_R), RALT(KC_T),    RALT(LSFT(KC_1)), LSFT(KC_1), RALT(KC_I),    RALT(KC_O),    RALT(KC_P),    RALT(KC_LBRC),
-    KC_TRNS,   RALT(KC_A),RALT(KC_S), RALT(KC_D),   KC_NUHS,    KC_NUBS,       LSFT(KC_NUBS),    RALT(KC_J), RALT(KC_K),    RALT(KC_L),    RALT(KC_SCLN), RALT(KC_QUOT),
-    KC_TRNS,   KC_TRNS,   RALT(KC_X), RALT(KC_EQL), RALT(KC_V), RALT(KC_B),    RALT(KC_N),       RALT(KC_M), RALT(KC_COMM), RALT(KC_DOT),  KC_TRNS,       KC_TRNS,
-    RALT(KC_Z),KC_TRNS,   KC_TRNS,    KC_TRNS,      KC_TRNS,    RALT(KC_BSPC), RALT(KC_SPC),     KC_TRNS,    KC_TRNS,       RALT(KC_NUBS), RALT(KC_SLSH), LSFT(KC_MINS)
-),
-
-/* Righter
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset| Debug|      |      |      |      |WheLft|  MUp |WheRgt| MBt2 | WheUp|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | MBt4 | MBt3 | MBt2 | MBt1 |      |      | MLeft| MDown|MRight| MBt1 | WheDn|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Mus on|Musoff|      |      | MBt1 | MBt2 | MBt3 |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |Rghter|Light-|Light+|      |
- * `-----------------------------------------------------------------------------------'
- */
- [_RIGHTER] = LAYOUT_planck_grid(
-    KC_TRNS, QK_BOOT, DB_TOGG, KC_NO,   KC_NO,   KC_NO, KC_NO, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, KC_WH_U,
-    KC_TRNS, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, KC_WH_D,
-    KC_TRNS, KC_TRNS, MU_NEXT, MU_ON,   MU_OFF,  KC_NO, KC_NO, KC_BTN1, KC_BTN2, KC_BTN3, KC_TRNS, KC_TRNS,
-    KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_BRID, KC_BRIU, KC_NO
-),
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RIGHT)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_LEFTER);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_LEFTER);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case _LEFTER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/gitdrik/readme.md b/keyboards/planck/keymaps/gitdrik/readme.md
deleted file mode 100644
index 44fba1db9a7..00000000000
--- a/keyboards/planck/keymaps/gitdrik/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Finnish SFS 5966 layout by gitdrik 2020-2023.
diff --git a/keyboards/planck/keymaps/gitdrik/rules.mk b/keyboards/planck/keymaps/gitdrik/rules.mk
deleted file mode 100644
index 67528de9c83..00000000000
--- a/keyboards/planck/keymaps/gitdrik/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-MOUSEKEY_ENABLE = yes
-AUDIO_ENABLE = yes
diff --git a/keyboards/planck/keymaps/grahampheath/config.h b/keyboards/planck/keymaps/grahampheath/config.h
deleted file mode 100644
index 11e395dd936..00000000000
--- a/keyboards/planck/keymaps/grahampheath/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#define TAPPING_TERM 200
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 4
-
-#undef MOUSEKEY_WHEEL_MAX_SPEED
-#define MOUSEKEY_WHEEL_MAX_SPEED   5
-
diff --git a/keyboards/planck/keymaps/grahampheath/keymap.c b/keyboards/planck/keymaps/grahampheath/keymap.c
deleted file mode 100644
index 5704f869ae7..00000000000
--- a/keyboards/planck/keymaps/grahampheath/keymap.c
+++ /dev/null
@@ -1,448 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _EMOJI,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV,
-  TOUNGE,
-  JOY,
-  FROWN,
-  HEART,
-  THMBUP,
-  THMBDN,
-  SHRUG,
-  WINK,
-  GRIN,
-  LLAP,
-  CRY,
-  SHIT,
-  FLIP,
-  FNGLEFT,
-  ABOVE,
-  FNGRIGHT,
-  CONFUSED
-};
-
-
-#define KC_X0 MT(MOD_LCTL, KC_ESC)  // Hold for Left Ctrl, Tap for ESC
-#define KC_X1 MT(MOD_RSFT, KC_ENT)  // Hold for Right Shift, Tap for Enter
-#define KC_X2 MT(MOD_RSFT, LGUI(KC_ENT))  // Send Command Enter
-#define KC_MOUS TT(_EMOJI)  // Hold for Mouse Layer, or tap 5 times.
-#define KC_QS LGUI(KC_SPC)  // Send Command + Space (for QuickSilver).
-#define KC_TABR LGUI(KC_RCBR)  // Send Command + } (for tab changing).
-#define KC_TABL LGUI(KC_LCBR)  // Send Command + { (for tab changing).
-#define HYPR_0 HYPR(KC_TILD)  // Send Hyper + ~.
-#define HYPR_1 HYPR(KC_EXLM)  // Send Hyper + !.
-#define HYPR_2 HYPR(KC_AT)  // Send Hyper + @.
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc* |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift*|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | GUI  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- * - Right Shift: Tap for Enter, hold for shift.
- * - Escape: Tap for Esc, hold for Ctrl.
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_X0,   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_X1  ,
-  KC_MOUS, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-
-/* Emoji Layer
- *
- *                ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
- *                │HYPR0│     │ ;-) │     │     │ :-P │     │     │:'-( │FLIP │     │     │
- *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
- *                │HYPR1│  👆 │SHRUG│     │ :-( │     │ <3  │ :-) │     │LLAP │     │     │
- *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
- *                │HYPR2│     │     │     | :-\ │     │     │ :-D │ SHIT│     │     │     │
- *                ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
- *                │     │     │     │     │Brig-│   Sleep   │Brig+│ 👈  │ 👎  |  👍 │ 👉 │
- *                └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
- */
-[_EMOJI] = LAYOUT_planck_grid(
-  HYPR_0,  _______, WINK,    _______, _______,  TOUNGE,  _______, _______, CRY,     FLIP,    _______, _______,
-  HYPR_1,  ABOVE,   SHRUG,   _______, FROWN,    _______, HEART,   JOY,     _______, LLAP,    _______, _______,
-  HYPR_2,  _______, _______, _______, CONFUSED, _______, _______, GRIN,    SHIT,    _______, _______, _______,
-  _______, _______, _______, _______, KC_SCRL,  KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN,  THMBUP,  FNGRIGHT
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shft |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |Tab-L |  👎  |  👍  |Tab-R |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), _______, _______, _______,
-  _______, _______, _______, _______, _______, KC_QS,   KC_QS,   _______,    KC_TABL,    THMBDN,  THMBUP, KC_TABR
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shft |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |  Up  |CTLENT|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      | Left | Down | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,   KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS,  _______,  KC_UP,   KC_X2,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Brite |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-#ifdef BACKLIGHT_ENABLE
-  bool has_layer_changed = true;
-
-  void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-    static uint8_t old_layer = 0;
-
-    if (old_layer != layer) {
-      has_layer_changed = true;
-      old_layer = layer;
-    }
-
-    if (has_layer_changed) {
-      has_layer_changed = false;
-
-      switch (layer) {
-        case _LOWER:
-          backlight_set(1);
-        break;
-        case _QWERTY:
-          backlight_set(2);
-        break;
-        case _RAISE:
-          backlight_set(3);
-        break;
-        case _ADJUST:
-          backlight_set(4);
-        break;
-      }
-    }
-  };
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_off(_EMOJI);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case FLIP:
-      if (record->event.pressed) {
-        SEND_STRING("&fliptable;");
-      }
-      return false;
-      break;
-    case CONFUSED:
-      if (record->event.pressed) {
-        SEND_STRING(":-\\");
-      }
-      return false;
-      break;
-    case SHIT:
-      if (record->event.pressed) {
-        SEND_STRING("&shit; ");
-      }
-      return false;
-      break;
-    case CRY:
-      if (record->event.pressed) {
-        SEND_STRING(":'-( ");
-      }
-      return false;
-      break;
-    case LLAP:
-      if (record->event.pressed) {
-        SEND_STRING("&llap; ");
-      }
-      return false;
-      break;
-    case GRIN:
-      if (record->event.pressed) {
-        SEND_STRING(":-D ");
-      }
-      return false;
-      break;
-    case TOUNGE:
-      if (record->event.pressed) {
-        SEND_STRING(":-P ");
-      }
-      return false;
-      break;
-    case JOY:
-      if (record->event.pressed) {
-        SEND_STRING(":-) ");
-      }
-      return false;
-      break;
-    case FROWN:
-      if (record->event.pressed) {
-        SEND_STRING(":-( ");
-      }
-      return false;
-      break;
-    case HEART:
-      if (record->event.pressed) {
-        SEND_STRING("<3 ");
-      }
-      return false;
-      break;
-    case SHRUG:
-      if (record->event.pressed) {
-        SEND_STRING("&shrug; ");
-      }
-      return false;
-      break;
-    case THMBUP:
-      if (record->event.pressed) {
-        SEND_STRING("&thumbup; ");
-      }
-      return false;
-      break;
-    case THMBDN:
-      if (record->event.pressed) {
-        SEND_STRING("&thumbdown; ");
-      }
-      return false;
-      break;
-    case FNGLEFT:
-      if (record->event.pressed) {
-        SEND_STRING("&fingerleft; ");
-      }
-      return false;
-      break;
-    case FNGRIGHT:
-      if (record->event.pressed) {
-        SEND_STRING("&fingerright; ");
-      }
-      return false;
-      break;
-    case WINK:
-      if (record->event.pressed) {
-        SEND_STRING(";-) ");
-      }
-      return false;
-      break;
-    case ABOVE:
-      if (record->event.pressed) {
-        SEND_STRING("&above; ");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/grahampheath/readme.md b/keyboards/planck/keymaps/grahampheath/readme.md
deleted file mode 100644
index ec8020f18c4..00000000000
--- a/keyboards/planck/keymaps/grahampheath/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Graham's Planck
-
-## Sounds
-I've added a [8ohm 0.5W speaker](http://a.co/6MIKZSy), its a bit large, but it fits in approximately the same space as the ProMicro. I soldered to the pcb hole labeled PC6 on my Rev 3 Planck PCB, and GND on the near by chip. [Pic of an identical mod][https://i1.sndcdn.com/artworks-000128070066-myh0ls-t500x500.jpg] (not mine).
diff --git a/keyboards/planck/keymaps/grahampheath/rules.mk b/keyboards/planck/keymaps/grahampheath/rules.mk
deleted file mode 100644
index e84f6d5e6da..00000000000
--- a/keyboards/planck/keymaps/grahampheath/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-NKRO_ENABLE      = yes          # N-Key rollover.
-# MOUSEKEY_ENABLE  = yes          # Mouse mode.
-TAP_DANCE_ENABLE = no           # Tap dance enabled.
-UNICODEMAP_ENABLE = no          # Unicode keymap (sucks on osx).
-AUDIO_ENABLE = yes           # Audio output on port C6
-
diff --git a/keyboards/planck/keymaps/grant24/config.h b/keyboards/planck/keymaps/grant24/config.h
deleted file mode 100644
index 8b5d93ef852..00000000000
--- a/keyboards/planck/keymaps/grant24/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
- /* Copyright Greg Anto
-  * 
-  * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/grant24/keymap.c b/keyboards/planck/keymaps/grant24/keymap.c
deleted file mode 100644
index 3af4642af56..00000000000
--- a/keyboards/planck/keymaps/grant24/keymap.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/* An 8-layer, 4x12, grid keymap for the  Planck Rev 6.
- *
- *
- * Copyright 2015-2017 Greg Anto
- *
- * 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"
-
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _FN
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define FN MO(_FN)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Fn  | GUI  | Alt  |Lower | Spce | Bksp |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,             KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-    KC_ESC,  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, MT(MOD_RSFT, KC_ENT),
-    KC_LCTL, OSL(FN), KC_LGUI, KC_LALT, LT(LOWER, KC_1),  KC_SPC,  KC_BSPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Fn  | Gui  | Alt  |Lower | Bksp | Spce |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,   KC_G,     KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
-    KC_ESC,  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, RSFT_T(KC_ENT),
-    KC_LCTL, OSL(FN), KC_LGUI, KC_LALT, LOWER,  KC_BSPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Fn  | Gui  | Alt  |Lower | Bksp | Spce |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    MT(MOD_RSFT, KC_ENT),
-    KC_LCTL, OSL(FN), KC_LGUI, KC_LALT, LOWER,  KC_BSPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |M Lft |M Dwn | M Up |M Rght| M UP |   *  |   4  |   5  |   6  |   +  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  M5  |  M4  |  M3  |  M2  |  M1  | M DN |   /  |   1  |   2  |   3  |   -  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   0  |   ,  |   .  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_TRNS, KC_1,     KC_2,     KC_3,     KC_4,     KC_5,          KC_6,     KC_7,     KC_8,  KC_9,     KC_0,    KC_TRNS,
-    KC_TRNS, KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_MS_WH_UP,   KC_ASTR,  KC_4,     KC_5,  KC_6,     KC_PLUS, KC_EQL,
-    KC_BTN5, KC_BTN4,  KC_BTN3,  KC_BTN2,  KC_BTN1,  KC_MS_WH_DOWN, KC_SLSH,  KC_1,     KC_2,  KC_3,     KC_MINS, KC_TRNS,
-    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,       KC_TRNS,  KC_TRNS,  KC_0,  KC_COMM,  KC_DOT,  KC_NO
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  `   |  ~   |  \   |  [   |  ]   |  -   |  _   |   {  |   }  |   |  |   +  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      | CTLA | CTLY | CTLZ | CTLX | CTLC | CTLV |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |DelWrd|      |      | Home | PgDn | PgUp |  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TRNS,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,        KC_CIRC,    KC_AMPR,    KC_ASTR,    KC_LPRN,    KC_RPRN,    KC_TRNS,
-    KC_GRAVE, KC_TILD,  KC_BSLS,  KC_LBRC,  KC_RBRC,  KC_MINS,        KC_UNDS,    KC_LCBR,    KC_RCBR,    KC_PIPE,    KC_PLUS,    KC_EQL,
-    KC_TRNS,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    LCTL(KC_A),     LCTL(KC_Y), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  LCTL(KC_BSPC),  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END
-),
-
-/* Fn
- * ,-----------------------------------------------------------------------------------.
- * |DelWrd|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F11 |  F12 |  F13 |  F14 |  F15 |  F16 |  F17 |  F18 |  F19 |  F20 |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Caps |  F21 |  F22 |  F23 |  F24 | Vol- | Mute | Vol+ | Prev | Play | Next |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FN] = LAYOUT_planck_grid(
-    LCTL(KC_BSPC),  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,  XXXXXXX,
-    XXXXXXX,        KC_F11,  KC_F12,  KC_F13,  KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18,   KC_F19,   KC_F20,  XXXXXXX,
-    KC_CAPS,        KC_F21,  KC_F22,  KC_F23,  KC_F24,   KC_VOLD,  KC_MUTE,  KC_VOLU,  KC_MRWD,  KC_MPLY,  KC_MFFD, XXXXXXX,
-    XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|      |      |Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Mus on|Musoff|      |      | CAPS |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, _______,
-    _______, _______, _______, AU_ON,   AU_OFF,  _______, _______, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, _______, _______, MU_ON,   MU_OFF,  _______, _______, KC_CAPS, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/grant24/readme.md b/keyboards/planck/keymaps/grant24/readme.md
deleted file mode 100644
index d0c25bbccf5..00000000000
--- a/keyboards/planck/keymaps/grant24/readme.md
+++ /dev/null
@@ -1,108 +0,0 @@
-# grant24's Planck Rev 6 Layout
-
-
-## A layout centered around typing on Colemak, and gaming on Qwerty. Dvorak and Plover are also there just because.
-
-#### Lower for symbols, easy coding symbols access on home row, standard num row symbols on top, right-hand use of common Ctrl shortcut keys.
-#### Raise for numbers, includes num row and num pad, as well as mouse keys.
-#### Adjust layer is a stripped down version of the default mapping.
-#### Code layer for Fn keys and media/volume control.
-
-
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Fn  | GUI  | Alt  |Lower | Spce | Bksp |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
- 
- /* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Fn  | Gui  | Alt  |Lower | Bksp | Spce |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
- 
- /* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Fn  | Gui  | Alt  |Lower | Bksp | Spce |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
- 
- /* Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |M Lft |M Dwn | M Up |M Rght| M UP |   *  |   4  |   5  |   6  |   +  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  M5  |  M4  |  M3  |  M2  |  M1  | M DN |   /  |   1  |   2  |   3  |   -  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   0  |   ,  |   .  |      |
- * `-----------------------------------------------------------------------------------'
- */
- 
- /* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  `   |  ~   |  \   |  [   |  ]   |  -   |  _   |   {  |   }  |   |  |   +  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      | CTLA | CTLY | CTLZ | CTLX | CTLC | CTLV |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |DelWrd|      |      | Home | PgDn | PgUp |  End |
- * `-----------------------------------------------------------------------------------'
- */
- 
- /* Fn
- * ,-----------------------------------------------------------------------------------.
- * |DelWrd|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F11 |  F12 |  F13 |  F14 |  F15 |  F16 |  F17 |  F18 |  F19 |  F20 |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Caps |  F21 |  F22 |  F23 |  F24 | Vol- | Mute | Vol+ | Prev | Play | Next |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
- 
- /* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
- 
- /* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|      |      |Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Mus on|Musoff|      |      | CAPS |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
diff --git a/keyboards/planck/keymaps/grant24/rules.mk b/keyboards/planck/keymaps/grant24/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/grant24/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/gunp/config.h b/keyboards/planck/keymaps/gunp/config.h
deleted file mode 100644
index a48cd453419..00000000000
--- a/keyboards/planck/keymaps/gunp/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Gun Pinyo
- *
- * 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
-
-/* Tapping this number of times holds the key until tapped once again. */
-#define ONESHOT_TAP_TOGGLE 7
-/* Time (in ms) before the one shot key is released */
-#define ONESHOT_TIMEOUT 5000
-
-/* Audio */
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-#endif
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
deleted file mode 100644
index 9fa05d593af..00000000000
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/* Copyright 2021 Gun Pinyo
- *
- * 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
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  LY_0000, LY_0001, LY_0010, LY_0011,
-  LY_0100, LY_0101, LY_0110, LY_0111,
-  LY_1000, LY_1001, LY_1010, LY_1011,
-  LY_1100, LY_1101, LY_1110, LY_1111,
-  LY_THAI_A, LY_THAI_B, LY_THAI_C,
-  LY_SANDBOX, LY_STICK,
-};
-
-enum planck_keycodes {
-  MIN_KC = SAFE_RANGE,
-  FUNC_A, FUNC_B, FUNC_C, FUNC_D,
-  SANDBOX, STICK,
-  LTHAI_A, LTHAI_B, LTHAI_C,
-  LSW0110, LSW1111, LSW0100,
-  USER_NAME, USER_EMAIL,
-  MAX_KC,
-  DYNAMIC_MACRO_RANGE,
-};
-
-#define KC_L2_0 KC_LSFT
-#define KC_L3_0 KC_LCTL
-#define KC_L3_1 KC_LALT
-#define KC_L3_2 KC_LGUI
-
-#define KC_R2_1 FUNC_A
-#define KC_R2_2 FUNC_B
-#define KC_R2_3 FUNC_C
-#define KC_R2_4 FUNC_D
-
-#define KC_R2_5 KC_RSFT
-#define KC_R3_0 KC_R2_4
-#define KC_R3_1 KC_SPC
-
-#define LAYOUT_gunp( k00, k01, k02, k03, k04, k05, \
-                     k10, k11, k12, k13, k14, k15, \
-                     k20, k21, k22, k23, k24, k25, \
-                     k30, k31, k32, k33, k34, k35) \
-LAYOUT_ortho_4x12( \
-k00,k01,k02,k03,k04,k05, LSW0110, KC_LEFT, KC_BSPC, KC_RIGHT,XXXXXXX, XXXXXXX,\
-k10,k11,k12,k13,k14,k15, LSW1111, LTHAI_A, LTHAI_B, LTHAI_C, XXXXXXX, XXXXXXX,\
-k20,k21,k22,k23,k24,k25, LSW0100, KC_R2_1, KC_R2_2, KC_R2_3, KC_R2_4, KC_R2_5,\
-k30,k31,k32,k33,k34,k35, KC_R3_0, KC_R3_1, KC_ENT,  KC_RGUI, KC_RALT, KC_RCTL)
-
-#define UNUSED_LAYER LAYOUT_gunp(\
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
-
-#define F1_F12_LAYER(M) LAYOUT_gunp(\
-  S(M(KC_F7 )), S(M(KC_F8 )), M(KC_F7 ), M(KC_F8 ), M(KC_F9 ), S(M(KC_F9 )),\
-  S(M(KC_F4 )), S(M(KC_F5 )), M(KC_F4 ), M(KC_F5 ), M(KC_F6 ), S(M(KC_F6 )),\
-  S(M(KC_F1 )), S(M(KC_F2 )), M(KC_F1 ), M(KC_F2 ), M(KC_F3 ), S(M(KC_F3 )),\
-  S(M(KC_F10)), S(M(KC_F11)), M(KC_F10), M(KC_F11), M(KC_F12), S(M(KC_F12))),
-
-#define MC(kc)  LCTL(kc)
-#define MA(kc)  LALT(kc)
-#define MG(kc)  LGUI(kc)
-#define MSC(kc) LSFT(LCTL(kc))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[LY_0000] = LAYOUT_ortho_4x12(
-  KC_PGUP, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_K, KC_TAB,
-  KC_PGDN, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, STICK,
-  KC_L2_0, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_M,
-                                KC_R2_1, KC_R2_2,    KC_R2_3, KC_UP,   KC_R2_5,
-  KC_L3_0, KC_L3_1, KC_L3_2, KC_ESCAPE,  KC_BSPC,    KC_ENTER,
-                       KC_R3_0, KC_R3_1, KC_PSCR,    KC_LEFT, KC_DOWN, KC_RIGHT
-),
-[LY_1000] = LAYOUT_gunp(
-  XXXXXXX,   KC_PERC,   KC_QUES,   KC_EXLM,   KC_GRV,    XXXXXXX,
-  XXXXXXX,   KC_AT,     KC_COMM,   KC_DOT,    KC_QUOT,   KC_EQL,
-  KC_L2_0,   KC_DLR,    KC_SCLN,   KC_COLN,   KC_DQUO,   KC_UNDS,
-  KC_L3_0,   KC_L3_1,   KC_L3_2,   XXXXXXX,   XXXXXXX,   XXXXXXX
-),
-[LY_0010] = LAYOUT_gunp(
-  XXXXXXX,   KC_AMPR,   KC_PIPE,   KC_TILD,   KC_CIRC,   XXXXXXX,
-  XXXXXXX,   KC_LCBR,   KC_LBRC,   KC_LPRN,   KC_LT,     KC_SLSH,
-  KC_L2_0,   KC_RCBR,   KC_RBRC,   KC_RPRN,   KC_GT,     KC_BSLS,
-  KC_L3_0,   KC_L3_1,   KC_L3_2,   XXXXXXX,   XXXXXXX,   XXXXXXX
-),
-[LY_1010] = LAYOUT_gunp(
-  XXXXXXX,   KC_HASH,   KC_7,      KC_8,      KC_9,      XXXXXXX,
-  XXXXXXX,   KC_ASTR,   KC_4,      KC_5,      KC_6,      KC_PLUS,
-  KC_L2_0,   KC_0,      KC_1,      KC_2,      KC_3,      KC_MINS,
-  KC_L3_0,   KC_L3_1,   KC_L3_2,   XXXXXXX,   XXXXXXX,   XXXXXXX
-),
-[LY_0100] = LAYOUT_gunp(
-  XXXXXXX,   MC(KC_G),   KC_HOME,      KC_UP,      KC_END,        MC(KC_UP),
-  XXXXXXX,   KC_PGUP,    KC_LEFT,      KC_DOWN,    KC_RIGHT,      MC(KC_DOWN),
-  XXXXXXX,   KC_PGDN,    MC(KC_S),     MC(KC_A),   MC(KC_Z),      MSC(KC_Z),
-  XXXXXXX,   XXXXXXX,    MC(KC_LEFT),  MC(KC_F),   MC(KC_RIGHT),  XXXXXXX
-),
-[LY_1100] = LAYOUT_gunp(
-  XXXXXXX,   MSC(KC_G),  S(KC_HOME),   S(KC_UP),   S(KC_END),     MSC(KC_UP),
-  XXXXXXX,   S(KC_PGUP), S(KC_LEFT),   S(KC_DOWN), S(KC_RIGHT),   MSC(KC_DOWN),
-  XXXXXXX,   S(KC_PGDN), MC(KC_X),     MC(KC_C),   MC(KC_V),      MC(KC_L),
-  XXXXXXX,   XXXXXXX,    MSC(KC_LEFT), MC(KC_R),   MSC(KC_RIGHT), XXXXXXX
-),
-[LY_0110] = F1_F12_LAYER()
-[LY_1110] = F1_F12_LAYER(MG)
-
-[LY_0001] = LAYOUT_gunp(
-  MC(KC_H),      MC(KC_0),      MSC(KC_PGUP),  KC_BRIU,  MSC(KC_PGDN), KC_VOLU,
-  MSC(KC_T),     MC(KC_PLUS),   MC(KC_PGUP),   KC_BRID,  MC(KC_PGDN),  KC_VOLD,
-  OSM(MOD_LSFT), MC(KC_MINS),   MA(KC_LEFT),   MC(KC_T), MA(KC_RIGHT), KC_MUTE,
-  OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), MC(KC_W), KC_DELETE,    KC_APP
-),
-[LY_1101] = LAYOUT_gunp(
-  SANDBOX,   XXXXXXX,    AU_TOGG,      QK_LOCK,    RGB_TOG,       QK_BOOT,
-  KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DB_TOGG,
-  KC_SLEP,   KC_NUM,     DM_REC1,      DM_PLY1,    XXXXXXX,       EE_CLR,
-  KC_PWR,    KC_SCRL,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
-),
-[LY_1111] = LAYOUT_gunp(
-  KC_ACL1,   KC_ACL0,    KC_WH_L,      KC_MS_U,    KC_WH_R,       KC_WH_U,
-  KC_ACL2,   XXXXXXX,    KC_MS_L,      KC_MS_D,    KC_MS_R,       KC_WH_D,
-  KC_MPRV,   KC_BTN5,    KC_MRWD,      KC_MPLY,    KC_MFFD,       KC_BTN3,
-  KC_MNXT,   KC_BTN4,    KC_PAUSE,     KC_MSTP,    KC_BTN1,       KC_BTN2
-),
-[LY_0111] = UNUSED_LAYER
-[LY_1011] = UNUSED_LAYER
-
-[LY_1001] = UNUSED_LAYER
-[LY_0101] = UNUSED_LAYER
-[LY_0011] = UNUSED_LAYER
-
-/* mapping from US QWERTY to TH Kedmanee */
-[LY_THAI_A] = LAYOUT_gunp(
-  S(KC_G),  KC_PIPE,  KC_8,     KC_COMM,  S(KC_A),  KC_QUES,
-  S(KC_I),  KC_SCLN,  KC_QUOT,  KC_O,     KC_I,     KC_RBRC,
-  S(KC_P),  S(KC_T),  KC_M,     KC_P,     KC_EQL,   KC_COLN,
-  KC_LT,    S(KC_S),  S(KC_R),  KC_GT,    KC_R,     KC_A
-),
-[LY_THAI_B] = LAYOUT_gunp(
-  S(KC_N),  S(KC_H),  KC_J,     KC_H,     S(KC_U),  S(KC_J),
-  S(KC_F),  KC_C,     KC_G,     KC_K,     KC_Y,     KC_T,
-  KC_DOT,   KC_W,     KC_B,     KC_U,     KC_7,     KC_N,
-  KC_1,     S(KC_B),  S(KC_Y),  KC_E,     KC_6,     KC_CIRC
-),
-[LY_THAI_C] = LAYOUT_gunp(
-  KC_4,     KC_BSLS,  KC_MINS,  S(KC_V),  S(KC_E),  S(KC_D),
-  KC_5,     KC_0,     KC_D,     KC_V,     KC_F,     KC_9,
-  S(KC_L),  S(KC_K),  KC_L,     KC_S,     KC_LBRC,  KC_X,
-  S(KC_O),  KC_Q,     KC_LCBR,  S(KC_C),  KC_Z,     KC_SLSH
-),
-[LY_SANDBOX] = LAYOUT_ortho_4x12(
-  KC_LCBR, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_K, KC_RCBR,
-  KC_LBRC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_RBRC,
-  KC_LPRN,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_M,KC_COMM,KC_DOT,KC_SCLN,KC_COLN,KC_RPRN,
-  KC_LT  , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GT
-),
-[LY_STICK] = UNUSED_LAYER // as a gateway to other persistant layers
-};
-
-#define NUM_LANGS 2
-#define LANG_ENG  0
-#define LANG_THAI 1
-
-uint16_t cur_layer = LY_0000;
-uint16_t cur_lang = LANG_ENG;
-bool is_layer_persistant = false;
-
-void change_layer(uint16_t new_layer) {
-  if(cur_layer != new_layer) {
-    layer_off(cur_layer);
-    layer_on(new_layer);
-    cur_layer = new_layer;
-  }
-}
-
-void change_lang(uint16_t lang) {
-  while(lang != cur_lang) {
-    SEND_STRING(SS_LGUI(" "));
-    cur_lang = (cur_lang + 1) % NUM_LANGS;
-  }
-}
-
-void user_panic(void) {
-  SEND_STRING("Planck Keyboard: User Panic!");
-}
-
-void update_env_thai(void) {
-  if(LY_THAI_A <= cur_layer && cur_layer <= LY_THAI_C) {
-    change_lang(LANG_THAI);
-  } else {
-    change_lang(LANG_ENG);
-  }
-}
-
-uint16_t get_persistant_layer_from_keycode(uint16_t keycode) {
-  switch(keycode) {
-    case FUNC_A:   return LY_1000;
-    case FUNC_B:   return LY_1010;
-    case FUNC_C:   return LY_0010;
-    case FUNC_D:   return LY_0000;
-    case LTHAI_A:  return LY_THAI_A;
-    case LTHAI_B:  return LY_THAI_B;
-    case LTHAI_C:  return LY_THAI_C;
-    case LSW0110:  return LY_0110;
-    case LSW1111:  return LY_1111;
-    case LSW0100:  return LY_0100;
-  }
-  return 0; // this line is unreachable but be here to make the complier happy
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  if(!is_layer_persistant && FUNC_A <= keycode && keycode <= FUNC_D) {
-    uint16_t mask = 1 << (3 - (keycode - FUNC_A));
-    uint16_t cur_layer_code = cur_layer - LY_0000;
-    if(!(LY_0000 <= cur_layer && cur_layer <= LY_1111))
-      user_panic();
-    if(!(cur_layer_code & mask) == record->event.pressed)
-      change_layer((mask ^ cur_layer_code) + LY_0000);
-    return false;
-  }
-
-  if(!(record->event.pressed))
-    return !(MIN_KC <= keycode && keycode <= MAX_KC);
-
-  switch(keycode) {
-    case USER_NAME:
-      SEND_STRING("Gun Pinyo");
-      return false;
-
-    case USER_EMAIL:
-      SEND_STRING("gunpinyo@gmail.com");
-      return false;
-
-    case SANDBOX:
-    case STICK:
-      change_layer(keycode == STICK ? LY_STICK : LY_SANDBOX);
-      change_lang(LANG_ENG);
-      is_layer_persistant = true;
-      return false;
-
-    case FUNC_A:  case FUNC_B:  case FUNC_C:   case FUNC_D:
-    case LTHAI_A: case LTHAI_B: case LTHAI_C:
-    case LSW0110: case LSW1111: case LSW0100:
-      if(is_layer_persistant) {
-        change_layer(get_persistant_layer_from_keycode(keycode));
-        update_env_thai();
-        // `FUNC_D` resets the layer configuration when `is_layer_persistant`
-        is_layer_persistant = keycode != FUNC_D;
-        if(!is_layer_persistant) {
-          clear_keyboard();
-          layer_clear();
-        }
-      }
-      return false;
-  }
-  return true;
-}
-
-#ifdef RGB_MATRIX_ENABLE
-  bool rgb_matrix_indicators_user(void) {
-    // `42` is the index of the middle light at the bottom row (in planck light)
-    // it is disabled because it does not have a cover, hence irritates my eyes
-    rgb_matrix_set_color(42, 0, 0, 0);
-    return false;
-  }
-#endif
diff --git a/keyboards/planck/keymaps/gunp/readme.md b/keyboards/planck/keymaps/gunp/readme.md
deleted file mode 100644
index ea20f6ac225..00000000000
--- a/keyboards/planck/keymaps/gunp/readme.md
+++ /dev/null
@@ -1,78 +0,0 @@
-![Cheat sheet of gunp layout for Planck keyboards](https://drive.google.com/uc?export=view&id=1INtnZhzoHpPkZ2kueP1K0Dpr6T1spr4m)
-
-# gunp layout for Planck keyboards
-
-* Layout Maintainer: [Gun Pinyo](https://github.com/gunpinyo)
-
-This is my personal layout for Planck keyboards. Almost all of important
-information is already in the picture of the cheat sheet above. There is also a
-text-version of this cheat sheet at the end of this readme file. If both of them
-are not the same, then please trust the text-version more because the picture is
-just a screenshot of the text.
-
-The base layer is `LY-0000`. Next, we custom keycodes called `FuncA`, `FuncB`,
-`FuncC`, and `FuncD` (`FuncX` for short) which will switch to layout `LY-ABCD`
-depending on the binary state of each `FuncX` where the corresponded binary
-digit is a boolean "keycode `FuncX` is currently being pressed". This mechanism
-allows us to access up to 16 different layers, however, only some of them have
-been used. A layer matches regex `LY-....` is currently used if and only if the
-cheat sheet mentions it.
-
-Once each of these non-based layers activates (by a combination of `FuncX`
-keycodes):
-  - the left-half (rows 0-3, columns 0-5) will switch according to its
-    individual keymap on cheat sheet,
-  - the right-half (rows 0-3, columns 6-11) will switch to the `RIGHT-HALF`
-    keymap such that keycodes that matches the regex `(L....|Thai[ABC])` are
-    disabled and (partially) being replaced by `FuncX` keycodes on the same
-    position of the base layer and keycodes in binary numbers there are
-    disabled.
-
-Another keycode in the base layer is `Stick`. When it is press, the rules of
-keyboard change into persistent mode. Here, the right-half is exactly the
-`RIGHT-HALF` keymap in the cheat sheet. Keycodes in left-half are all no-op
-initially and can be changed to other layers by tapping on the corresponded
-keycodes `(L....|Thai[ABC])`. To switch back to the normal rules governed by
-`FuncX` press a `Relax` keycode.
-
-Remark:
-  - Layers `LY-Thai[ABC]` are only accessible via persistent mode.
-  - This layout doesn't employ any transparent keycode, therefore, empty
-    keycodes (including dummy keycodes `XXX`) are all no-op.
-  - Prefixes `S-`, `C-`, `A-`, and `G-` are combinators for `sft-🠜`, `ctl-🠜`,
-    `alt-🠜`, and `gui-🠜`, respectively.
-  - All keycodes that starts with a capital letter are custom keycodes. Except
-    single letters which stand for their alphabet.
-  - There is a conflict with dynamic macro (QMK's feature) with my layer
-    switching mechanisms, so I disable it but keep its keycodes there for later
-    implementation.
-
-```
-  {H| "LY-0000": base-layer -- "`[🠝]` here becomes `FuncD` in other layers" |H}   {H| "RIGHT-HALF":  "when `Stick` is on" |H}
-  {8| pgup|  Q  |  W  |  F  |  P  |  G  |  J  |  L  |  U  |  Y  |  K  | tab |8}   {8| L0110| [🠜] |bkspc| [🠞] | XXX | XXX  |8}
-  {8| pgdn|  A  |  R  |  S  |  T  |  D  |  H  |  N  |  E  |  I  |  O  |Stick|8}   {8| L1111|ThaiA|ThaiB|ThaiC| XXX | XXX  |8}
-  {8|sft-🠜|  Z  |  X  |  C  |  V  |  B  |  M  |FuncA|FuncB|FuncC| [🠝] |sft-🠞|8}   {8| L0100|L1000|L1010|L0010|Relax|sft-🠞 |8}
-  {8|ctl-🠜|alt-🠜|gui-🠜| esc |bkspc|enter|FuncD|space|print| [🠜] | [🠟] | [🠞] |8}   {8| Relax|space|enter|gui-🠞|alt-🠞|ctl-🠞 |8}
-
-  {H| "LY-0100": "col0 as no-op" |H}   {H|  "LY-1101" -- "Email: gunpinyo@gmail.com"  |H}   {x|  "LY-0110" -- "gunpinyo"  |x}
-  {8| C-G  home  [🠝]  end  C-[🠝] |8}   {8| Sandbox XXX AudTog KeyLock RgbTog QmkReset |8}   {✜| S-f7 S-f8  f7 f8 f9  S-f9 |✜}
-  {8| pgup  [🠜]  [🠟]  [🠞]  C-[🠟] |8}   {8| wake  caplock MyName Email RgbMod QmkDebug |8}   {✜| S-f4 S-f5  f4 f5 f6  S-f6 |✜}
-  {8| pgdn  C-S  C-A  C-Z  SC-Z  |8}   {8| sleep numlock DmRec1 DmPlay1 XXX QmkEepRst |8}   {✜| S-f1 S-f2  f1 f2 f3  S-f3 |✜}
-  {8|     C-[🠜]  C-F  C-[🠞]      |8}   {8| power scrlock DmRec2 DmPlay2 DmStop insert |8}   {✜|S-f10 S-f11 f10f11f12 S-f12|✜}
-
-  {8|    "LY-1000"    |8}   {8|    "LY-1010"    |8}   {8|    "LY-0010"    |8}   {H| "LY-1111" - "powered by QMK firmware" |H}
-  {H|  %  ?  !  `     |H}   {H|  #  7  8  9     |H}   {H|  &  |  ~  ^     |H}   {8| msAC1 msAC0  scr-🠜 mov-🠝 scr-🠞  scr-🠝 |8}
-  {H|  @  ,  .  '  =  |H}   {H|  *  4  5  6  +  |H}   {H|  {  [  (  <  /  |H}   {8| msAC2  XXX   mov-🠜 mov-🠟 mov-🠞  scr-🠟 |8}
-  {H|  $  ;  : \"  _  |H}   {H|  0  1  2  3  -  |H}   {H|  }  ]  )  >  \  |H}   {8| mPrev btn-🠝  mRWD  mPlay mFFD   btn-✜ |8}
-                                                                                {8| mNext btn-🠟  pause mStop btn-🠜  btn-🠞 |8}
-  1. evdev pc105 (US: qwerty, TH: kedmanee)    5. "LY-1110" is `G-`+"LY-0110"
-  2. `G-space` is used to switch XKB layout    6. "LY-1100" is `S-`+"LY-0100" except [C-S, C-A, C-Z, SC-Z, C-F] which become
-  3. when `Stick` is off, layer switchers other than `FuncX` are disabled       [C-X, C-C, C-V,  C-L, C-R] respectively
-  4. ["LY-1000", "LY-1010", "LY-0010"] omit col0 and row3, but they have all `mod-🠜` from the base-layer, the rest are no-op
-
-  {H| "LY-0001" -- "`mod#🠜` is oneshot-mod" |H}   {8|    "LY-ThaiA"   |8}   {8|    "LY-ThaiB"   |8}   {8|    "LY-ThaiC"   |8}
-  {8|  C-H C-0  SC-pgup bri-🠝 SC-pgdn vol-🠝 |8}   {H|  ฌ ‍‍‍ฅ ‍ค  ม ฤ ฦ  |H}   {H|  ์ ‍‍‍‍‍็  ่  ้  ๊  ๋  |H}   {H|  ภ ‍‍ฃ ‍ข  ฮ ‍‍‍ฎ ‍‍ฏ  |H}
-  {8| SC-T C-[+] C-pgup bri-🠟  C-pgdn vol-🠟 |8}   {H|  ณ ‍ว ‍‍‍‍‍ง  ‍น ‍‍ร ‍ล  |H}   {H|  โ ‍แ ‍‍‍‍‍‍‍‍‍‍‍เ ‍‍‍‍‍‍‍‍‍‍‍‍‍า ‍‍‍‍‍‍‍‍‍‍‍‍‍ั ‍‍‍‍‍‍‍‍ะ  |H}   {H|  ถ ‍‍‍‍จ ‍‍‍ก  อ ‍‍‍ด ‍‍ต  |H}
-  {8| sft#🠜 C-[-]  A-[🠜]  C-T  A-[🠞]  vol-✜ |8}   {H|  ญ ‍‍ธ ‍‍‍ท  ย ช‍‍‍‍‍‍‍‍‍‍‍‍‍ซ  |H}   {H|  ใ ‍‍‍ไ ‍‍‍‍‍‍‍‍‍‍‍‍ิ ‍‍‍‍‍‍ี ‍‍‍‍‍‍‍‍‍‍‍ึ ‍‍‍‍‍ื  |H}   {H|  ศ ‍ษ ‍‍ส  ห ‍บ ป  |H}
-  {8| ctl#🠜 alt#🠜  gui#🠜  C-W  delete  menu |8}   {H|  ฒ ฆ ฑ ‍‍‍‍‍‍‍‍‍‍ฬ พ‍‍‍‍‍‍‍‍‍‍‍ฟ  |H}   {H|  ‍‍‍‍ๅ ‍‍‍‍‍‍‍ฺ  ํ  ำ  ุ ‍‍‍‍‍‍‍‍‍‍ู  |H}   {H|  ฯ ‍‍ๆ ‍‍‍‍ฐ  ฉ ‍‍‍ผ ‍ฝ  |H}
-```
diff --git a/keyboards/planck/keymaps/gunp/rules.mk b/keyboards/planck/keymaps/gunp/rules.mk
deleted file mode 100644
index 40d3ef32548..00000000000
--- a/keyboards/planck/keymaps/gunp/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if NKRO_ENABLE doesn't work, see here:
-# https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = yes          # Audio output
-
-KEY_LOCK_ENABLE = yes
-DEBOUNCE_TYPE = sym_defer_pk
diff --git a/keyboards/planck/keymaps/handwired_binaryplease/config.h b/keyboards/planck/keymaps/handwired_binaryplease/config.h
deleted file mode 100644
index 065bc2d6881..00000000000
--- a/keyboards/planck/keymaps/handwired_binaryplease/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#undef MANUFACTURER
-#define MANUFACTURER "binaryplease"
-#undef PRODUCT
-#define PRODUCT      "Teensy_Planck"
-
-#undef MATRIX_ROW_PINS
-#define MATRIX_ROW_PINS { D3, D2, D1, D0 }
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4 }
diff --git a/keyboards/planck/keymaps/handwired_binaryplease/keymap.c b/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
deleted file mode 100644
index 93e6f9b78e6..00000000000
--- a/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
+++ /dev/null
@@ -1,269 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  /*_DVORAK,*/
-  _LOWER,
-  _RAISE,
-  /*_PLOVER,*/
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  /*DVORAK,*/
-  /*PLOVER,*/
-  LOWER,
-  RAISE,
-  BACKLIT
-  /*EXT_PLV*/
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  KC_LCTL, KC_LGUI, XXXXXXX, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-/*[_DVORAK] = LAYOUT_planck_grid(*/
-  /*KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,*/
-  /*KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,*/
-  /*KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,*/
-  /*KC_LCTL, BACKLIT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT*/
-/*),*/
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-/*[_PLOVER] = LAYOUT_planck_grid(*/
-  /*KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,*/
-  /*XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,*/
-  /*XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,*/
-  /*EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX*/
-/*),*/
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, _______, AU_ON,   AU_OFF,  _______, _______, _______, _______, _______, QWERTY,  COLEMAK,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistant_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    /*case DVORAK:*/
-      /*if (record->event.pressed) {*/
-        /*#ifdef AUDIO_ENABLE*/
-          /*PLAY_SONG(tone_dvorak);*/
-        /*#endif*/
-        /*persistant_default_layer_set(1UL<<_DVORAK);*/
-      /*}*/
-      /*return false;*/
-      /*break;*/
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    /*case PLOVER:*/
-      /*if (record->event.pressed) {*/
-        /*#ifdef AUDIO_ENABLE*/
-          /*stop_all_notes();*/
-          /*PLAY_SONG(tone_plover);*/
-        /*#endif*/
-        /*layer_off(_RAISE);*/
-        /*layer_off(_LOWER);*/
-        /*layer_off(_ADJUST);*/
-        /*layer_on(_PLOVER);*/
-        /*if (!eeconfig_is_enabled()) {*/
-            /*eeconfig_init();*/
-        /*}*/
-        /*keymap_config.raw = eeconfig_read_keymap();*/
-        /*keymap_config.nkro = 1;*/
-        /*eeconfig_update_keymap(keymap_config.raw);*/
-      /*}*/
-      /*return false;*/
-      /*break;*/
-    /*case EXT_PLV:*/
-      /*if (record->event.pressed) {*/
-        /*#ifdef AUDIO_ENABLE*/
-          /*PLAY_SONG(tone_plover_gb);*/
-        /*#endif*/
-        /*layer_off(_PLOVER);*/
-      /*}*/
-      /*return false;*/
-      /*break;*/
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/handwired_binaryplease/readme.md b/keyboards/planck/keymaps/handwired_binaryplease/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/handwired_binaryplease/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/handwired_binaryplease/rules.mk b/keyboards/planck/keymaps/handwired_binaryplease/rules.mk
deleted file mode 100644
index 459c7bce6c5..00000000000
--- a/keyboards/planck/keymaps/handwired_binaryplease/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-CONSOLE_ENABLE = no
-NKRO_ENABLE = no
-MIDI_ENABLE = yes
-AUDIO_ENABLE = no
diff --git a/keyboards/planck/keymaps/hiea/common/chord_layout.h b/keyboards/planck/keymaps/hiea/common/chord_layout.h
deleted file mode 100644
index cb1b7f67855..00000000000
--- a/keyboards/planck/keymaps/hiea/common/chord_layout.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .................................................................. Short Cuts
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      | Copy | Paste|      |      |      |      |      |      |      |      |
-  // |--------------------------------------------------------------+------+------+------|
-  // | Undo |  Cut | Copy | Paste|      |      |      |      | PRIV |  PUB |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |  Nak |  Eot |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |  f() |      |      |      |      |      |
-  // |      |      |      |      |      |      |      |  f() |      |      |      |      | see _PLOVER
-  // '-----------------------------------------------------------------------------------'
-
-  [_EDIT] = LAYOUT_planck_grid(
-    _______, _______, TMCOPY,  TMPASTE, _______, _______, _______, _______, _______, _______, _______, _______,
-    UNDO,    CUT,     COPY,    PASTE,   _______, _______, _______, _______, TD_PRIV, TD_SEND, _______, _______,
-    _______, _______, NAK,     EOT,     _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, ___fn__, ___fn__, _______, _______, _______, _______
-  ),
-
-// ................................................................ Adjust Layer
-
-  // ,-----------------------------------------------------------------------------------.
-  // |Plover|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |Aud on|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Reset|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |      |      |      |  f() |      |      |      |      |  f() |      |      |      |
-  // `-----------------------------------------------------------------------------------'
-
-  [_ADJUST] = LAYOUT_planck_grid(
-    PLOVER,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    AU_ON,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/hiea/common/init.h b/keyboards/planck/keymaps/hiea/common/init.h
deleted file mode 100644
index e6bb7101e92..00000000000
--- a/keyboards/planck/keymaps/hiea/common/init.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// ....................................................................... Audio
-
-void matrix_init_user(void)
-{
-#ifdef STENO_ENABLE
-  steno_set_mode(STENO_MODE_BOLT);          // or STENO_MODE_GEMINI
-#endif
-}
-
-#ifdef AUDIO_ENABLE
-#ifdef BACKLIGHT_ENABLE
-bool led_update_user(led_t led_state)
-{
-  static led_t old_led_state = {0};
-  _delay_ms(10);                            // gets rid of tick
-  if (!is_playing_notes()) {
-    if (led_state.caps_lock && !old_led_state.caps_lock) {
-      // if capslock LED is turning on
-      PLAY_SONG(song_caps_on);
-    }
-    else if (!led_state.caps_lock && old_led_state.caps_lock) {
-      // if capslock LED is turning off
-      PLAY_SONG(song_caps_off);
-    }
-  }
-  old_led_state = led_state;
-  return false;
-}
-#endif
-#endif
diff --git a/keyboards/planck/keymaps/hiea/common/keycode_functions.h b/keyboards/planck/keymaps/hiea/common/keycode_functions.h
deleted file mode 100644
index 1aed08b37ae..00000000000
--- a/keyboards/planck/keymaps/hiea/common/keycode_functions.h
+++ /dev/null
@@ -1,657 +0,0 @@
-
-// .......................................................... Keycode Primitives
-
-// register simple key press
-void tap_key(uint16_t keycode)
-{
-  register_code  (keycode);
-  unregister_code(keycode);
-}
-
-void shift_key(uint16_t keycode)
-{
-  register_code  (KC_LSFT);
-  tap_key        (keycode);
-  unregister_code(KC_LSFT);
-}
-
-#define SHIFT   1
-#define NOSHIFT 0
-
-static uint16_t key_timer = 0;
-
-// key press for thumb_layer() and lt_shift() macros
-bool key_press(uint8_t shift, uint16_t keycode)
-{
-  if (keycode) {
-    if (timer_elapsed(key_timer) < TAPPING_TERM) {
-      if (shift) {
-        shift_key(keycode);
-      }
-      else {
-        tap_key(keycode);
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-// ALT_T, CTL_T, GUI_T, SFT_T for shifted keycodes
-void mt_shift(keyrecord_t *record, uint16_t modifier, uint16_t modifier2, uint16_t keycode)
-{
-  if (record->event.pressed) {
-    key_timer = timer_read();
-    register_code(modifier);
-    if (modifier2) {
-      register_code(modifier2);
-    }
-  }
-  else {
-    unregister_code(modifier);
-    if (modifier2) {
-      unregister_code(modifier2);
-    }
-    if (timer_elapsed(key_timer) < TAPPING_TERM) {
-      shift_key(keycode);
-    }
-    key_timer = 0;
-  }
-}
-
-// ................................................................... Mod Masks
-
-// tap dance persistant mods, see process_record_user()
-// keyboard_report->mods (?) appears to be cleared by tap dance
-static uint8_t mods = 0;
-
-void tap_mods(keyrecord_t *record, uint16_t keycode)
-{
-  if (record->event.pressed) {
-    mods |= MOD_BIT(keycode);
-  }
-  else {
-    mods &= ~(MOD_BIT(keycode));
-  }
-}
-
-// (un)register modifiers
-void modifier(void (*f)(uint8_t))
-{
-  if (mods & MOD_BIT(KC_LCTL)) {
-    (*f)(KC_LCTL);
-  }
-  if (mods & MOD_BIT(KC_LGUI)) {
-    (*f)(KC_LGUI);
-  }
-  if (mods & MOD_BIT(KC_LALT)) {
-    (*f)(KC_LALT);
-  }
-}
-
-// .................................................... Triple Dance Shift/Layer
-
-static uint8_t dt_shift = 0;
-
-void double_shift(uint16_t keycode, uint8_t layer)
-{
-  tap_key (keycode);
-  if (DT_SHIFT) {
-    // set_oneshot_mods(MOD_LSFT);
-    // layer_on(layer);
-    layer_on         (_SHIFT);
-    set_oneshot_layer(_SHIFT, ONESHOT_START);
-    dt_shift = 1;
-  }
-  else {
-    layer_on(layer);
-  }
-}
-
-// tap dance LT (LAYER, KEY) emulation with <KEY><DOWN> -> <KEY><SHIFT> and auto-repeat extensions!
-void tap_shift(tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
-{
-  // double tap plus down
-  if (state->count > 2) {
-    // double enter shift
-    if (keycode == KC_ENT) {
-      tap_key     (keycode);
-      double_shift(keycode, layer);
-    }
-    // repeating keycode
-    else {
-      register_code(keycode);
-    }
-  }
-  // tap plus down (or double tap): keycode (one shot) shift
-  else if (state->count > 1) {
-    double_shift(keycode, layer);
-  }
-  // down: shift
-  else if (state->pressed) {
-    layer_on(layer);
-  }
-  // tap: keycode
-  else {
-    modifier(register_code);
-    tap_key (keycode);
-    modifier(unregister_code);
-  }
-}
-
-void tap_reset(uint16_t keycode, uint8_t layer)
-{
-  unregister_code(keycode);
-  if (DT_SHIFT && dt_shift) {
-    clear_oneshot_layer_state(ONESHOT_PRESSED);
-    dt_shift = 0;
-  }
-  else {
-    layer_off(layer);
-  }
-}
-
-// augment pseudo LT (_RSHIFT, KC_ENT) handling below for rapid <ENTER><SHIFT> sequences
-void enter(tap_dance_state_t *state, void *user_data)
-{
-  tap_shift(state, KC_ENT, _RSHIFT);
-}
-
-void enter_reset(tap_dance_state_t *state, void *user_data)
-{
-  tap_reset(KC_ENT, _RSHIFT);
-}
-
-// augment pseudo LT (_LSHIFT, KC_SPC) handling below for rapid <SPACE><SHIFT> sequences
-void space(tap_dance_state_t *state, void *user_data)
-{
-  tap_shift(state, KC_SPC, _LSHIFT);
-}
-
-void space_reset(tap_dance_state_t *state, void *user_data)
-{
-  tap_reset(KC_SPC, _LSHIFT);
-}
-
-// ......................................................... Triple Dance Insert
-
-void double_max(uint8_t count, uint8_t shift, uint16_t keycode)
-{
-  if (shift) {
-    shift_key(keycode);
-    if (count > 1) {
-      shift_key(keycode);
-    }
-  }
-  else {
-    tap_key(keycode);
-    if (count > 1) {
-      tap_key(keycode);
-    }
-  }
-}
-
-void colon(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    shift_key(KC_SCLN);
-    shift_key(KC_SCLN);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_SCLN);
-  }
-  reset_tap_dance(state);
-}
-
-void eql(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key(KC_SPC);
-    tap_key(KC_SLSH);
-    tap_key(KC_EQL);
-    tap_key(KC_SPC);
-  }
-  else {
-    double_max(state->count, NOSHIFT, KC_EQL);
-  }
-  reset_tap_dance(state);
-}
-
-void greater(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    tap_key  (KC_MINS);
-    shift_key(KC_DOT);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_DOT);
-  }
-  reset_tap_dance(state);
-}
-
-void lesser(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    shift_key(KC_COMM);
-    tap_key  (KC_MINS);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_COMM);
-  }
-  reset_tap_dance(state);
-}
-
-void tilde(tap_dance_state_t *state, void *user_data)
-{
-  // double tap plus down: repeating keycode
-  if (state->count > 2) {
-    register_code(KC_LSFT);
-    register_code(KC_GRV);
-  }
-  // tap: keycode
-  else {
-    shift_key(KC_GRV);
-    // double tap: unix home directory
-    if (state->count > 1) {
-      tap_key(KC_SLSH);
-    }
-  }
-}
-
-void tilde_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_GRV);
-  unregister_code(KC_LSFT);
-}
-
-// ............................................................. Tap Dance Pairs
-
-// tap dance shift rules
-#define S_NEVER  0
-#define S_SINGLE 1
-#define S_DOUBLE 2
-#define S_ALWAYS S_SINGLE | S_DOUBLE
-
-void symbol_pair(uint8_t shift, uint16_t left, uint16_t right)
-{
-  if (shift & S_DOUBLE) {
-    shift_key(left);
-    shift_key(right);
-  }
-  else {
-    tap_key(left);
-    tap_key(right);
-  }
-}
-
-#define CLOSE 1
-
-// tap dance symbol pairs
-void tap_pair(tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
-{
-  // triple tap: left right with cursor between symbol pair a la vim :-)
-  if (state->count > 2) {
-    symbol_pair(shift, left, right);
-    tap_key    (KC_LEFT);
-  }
-  // double tap: left right
-  else if (state->count > 1) {
-    symbol_pair(shift, left, right);
-  }
-  // down: modifier
-  else if (state->pressed) {
-    if (modifier) {
-      register_code(modifier);
-    }
-  }
-  // tap: left (close: right)
-  else {
-    if (shift & S_SINGLE) {
-      shift_key(close ? right : left);
-    }
-    else {
-      tap_key(close ? right : left);
-    }
-  }
-  if (!modifier) {
-    reset_tap_dance(state);
-  }
-}
-
-void doublequote(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_QUOT, KC_QUOT, 0, 0);
-}
-
-void grave(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_GRV, KC_GRV, 0, 0);
-}
-
-void lbrace(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, 0);
-}
-
-void lcurly(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, 0);
-}
-
-void lparen(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_9, KC_0, KC_LCTL, 0);
-}
-
-void lparen_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LCTL);
-}
-
-void quote(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_QUOT, KC_QUOT, 0, 0);
-}
-
-void rangle(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_COMM, KC_DOT, 0, CLOSE);
-}
-
-void rbrace(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, CLOSE);
-}
-
-void rcurly(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, CLOSE);
-}
-
-void rparen(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_9, KC_0, 0, CLOSE);
-}
-
-void rparen_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LCTL);
-}
-
-// ............................................................ Tap Dance Insert
-
-void comma(tap_dance_state_t *state, void *user_data)
-{
-  tap_key(KC_COMM);
-  if (state->count > 1) {
-    tap_key(KC_SPC);
-  }
-  reset_tap_dance(state);
-}
-
-void dot(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    shift_key(KC_COLN);
-  }
-  else {
-    tap_key(KC_DOT);
-  }
-  reset_tap_dance(state);
-}
-
-// compile time macro string, see functions/hardware planck script
-void private(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-#ifdef PRIVATE_STRING
-#include "private_string.h"
-#endif
-  }
-  reset_tap_dance(state);
-}
-
-// config.h defined string
-void send(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    SEND_STRING(PUBLIC_STRING);
-  }
-  reset_tap_dance(state);
-}
-
-// .......................................................... Tap Dance One Shot
-
-void caps(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    tap_key(KC_CAPS);
-  }
-  else {
-    set_oneshot_mods(MOD_LSFT);
-    register_code   (KC_LSFT);              // on hold down
-  }
-}
-
-void caps_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LSFT);
-}
-
-// ................................................................... Tap Dance
-
-tap_dance_action_t tap_dance_actions[] = {
-  [_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps, caps_reset)
- ,[_COLN] = ACTION_TAP_DANCE_FN         (colon)
- ,[_COMM] = ACTION_TAP_DANCE_FN         (comma)
- ,[_DOT]  = ACTION_TAP_DANCE_FN         (dot)
- ,[_DQOT] = ACTION_TAP_DANCE_FN         (doublequote)
- ,[_ENT]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, enter, enter_reset)
- ,[_EQL]  = ACTION_TAP_DANCE_FN         (eql)
- ,[_GRV]  = ACTION_TAP_DANCE_FN         (grave)
- ,[_GT]   = ACTION_TAP_DANCE_FN         (greater)
- ,[_LBRC] = ACTION_TAP_DANCE_FN         (lbrace)
- ,[_LCBR] = ACTION_TAP_DANCE_FN         (lcurly)
- ,[_LPRN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lparen, lparen_reset)
- ,[_LT]   = ACTION_TAP_DANCE_FN         (lesser)
- ,[_PRIV] = ACTION_TAP_DANCE_FN         (private)
- ,[_QUOT] = ACTION_TAP_DANCE_FN         (quote)
- ,[_RBRC] = ACTION_TAP_DANCE_FN         (rbrace)
- ,[_RCBR] = ACTION_TAP_DANCE_FN         (rcurly)
- ,[_RNGL] = ACTION_TAP_DANCE_FN         (rangle)
- ,[_RPRN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rparen, rparen_reset)
- ,[_SEND] = ACTION_TAP_DANCE_FN         (send)
- ,[_SPC]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, space, space_reset)
- ,[_TILD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tilde, tilde_reset)
-};
-
-// .............................................................. Dynamic Layers
-
-#define        LEFT    1
-#define        RIGHT   2
-static uint8_t thumb = 0;
-
-// LEFT (KC_SPC, S(KC_BSLS)), RIGHT (KC_LEFT, S(KC_LEFT)) opposite thumb combinations, see process_record_user()
-// up,   up   -> _BASE
-// up,   down -> _SYMBOL
-// down, up   -> _NUMBER
-// down, down -> _MOUSE                     // see layer keycodes that raise mouse layer
-#define THUMBS_DOWN _MOUSE                  // layer
-
-static uint8_t overlayer = 0;
-
-// left right thumb layer combinations
-void thumb_layer(keyrecord_t *record, uint8_t side, uint8_t shift, uint16_t keycode, uint8_t thumb_dn_layer, uint8_t thumb_up_layer)
-{
-  if (record->event.pressed) {
-    // layer_on via tap_layer(), see process_record_user()
-    key_timer = timer_read();
-    thumb     = thumb | side;
-  }
-  else {
-    layer_off(thumb_dn_layer);
-    // opposite thumb_layer() thumb may have switched effective layer!
-    if (overlayer) {
-      layer_off(overlayer);
-      overlayer = 0;
-    }
-    if (!key_press(shift, keycode)) {
-      layer_off(THUMBS_DOWN);               // both thumbs needed
-      // opposite thumb down? see left right combination layer table above
-      if (thumb & (side == LEFT ? RIGHT : LEFT)) {
-        layer_on(thumb_up_layer);
-        overlayer = thumb_up_layer;
-      }
-    }
-    clear_mods();
-    thumb     = thumb & ~side;
-    key_timer = 0;
-  }
-}
-
-// #ifdef STENO_ENABLE
-// // LT for steno keycode
-// void stn_layer(keyrecord_t *record, uint16_t keycode, uint8_t layer)
-// {
-//   if (record->event.pressed) {
-//     key_timer = timer_read();
-//     if (keycode) {
-//       process_steno(keycode, record);
-//     }
-//     layer_on(layer);
-//   }
-//   else {
-//     layer_off(layer);
-//     if (keycode) {
-//       if (timer_elapsed(key_timer) < TAPPING_TERM) {
-//         process_steno(keycode, record);
-//       }
-//       else {
-//         // clear pressed state (request push of updated) process_steno.c and .h
-//         // steno_clear_state();
-//       }
-//     }
-//     key_timer = 0;
-//   }
-// }
-// #endif
-
-// LT for S(keycode)
-void lt_shift(keyrecord_t *record, uint16_t keycode, uint8_t layer)
-{
-  if (record->event.pressed) {
-    key_timer = timer_read();
-    layer_on(layer);
-  }
-  else {
-    layer_off(layer);
-    // for shifted keycodes, hence, LT_SHIFT
-    key_press(SHIFT, keycode);
-    clear_mods();
-    key_timer = 0;
-  }
-}
-
-// set layer asap to overcome macro latency errors, notably tap dance and LT usage
-// this routine inexplicably (?) sets layer_on() faster than can be done in thumb_layer()
-void tap_layer(keyrecord_t *record, uint8_t layer)
-{
-  if (record->event.pressed) {
-    layer_on(layer);
-  }
-  else {
-    layer_off(layer);
-  }
-}
-
-// ..................................................................... Keymaps
-
-// void persistant_default_layer_set(uint16_t default_layer)
-// {
-//   eeconfig_update_default_layer(default_layer);
-//   default_layer_set            (default_layer);
-// }
-
-void clear_layers(void)
-{
-  uint8_t layer;
-  for (layer = 0; layer < _END_LAYERS; layer++) {
-    layer_off(layer);
-  }
-}
-
-#ifdef CENTER_TT
-static uint16_t tt_keycode = 0;             // current TT keycode
-
-void clear_tt(void)
-{
-  if (tt_keycode == KC_CAPS) {
-    tap_key(KC_CAPS);                       // clear capslock
-  }
-  tt_keycode = 0;
-  clear_layers();
-  set_single_persistent_default_layer(_BASE);
-}
-#endif
-
-// txbolt plover run state
-static uint8_t plover = 0;
-
-void toggle_plover(uint8_t state)
-{
-  if (plover != state) {
-#ifdef PLOVER_KEYBIND
-#include "plover_keybind.h"
-#endif
-    plover = state;
-  }
-}
-
-void base_layer(void)
-{
-#ifdef AUDIO_ENABLE
-  if (plover) {
-    PLAY_SONG(song_plover_gb);
-  }
-  else {
-    PLAY_SONG(song_qwerty);
-  }
-#endif
-  clear_layers();
-  set_single_persistent_default_layer(_BASE);
-  toggle_plover(0);
-}
-
-void steno(keyrecord_t *record)
-{
-  if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-    PLAY_SONG(song_plover);
-#endif
-    clear_layers();
-    layer_on(_PLOVER);
-    if (!eeconfig_is_enabled()) {
-      eeconfig_init();
-    }
-    keymap_config.raw  = eeconfig_read_keymap();
-    keymap_config.nkro = 1;
-    eeconfig_update_keymap(keymap_config.raw);
-    if (!plover) {
-      toggle_plover(1);
-    }
-  }
-}
-
-void steno_exit(keyrecord_t *record)
-{
-  if (record->event.pressed) {
-    base_layer();
-    toggle_plover(0);
-  }
-}
diff --git a/keyboards/planck/keymaps/hiea/common/number_fkey_layout.h b/keyboards/planck/keymaps/hiea/common/number_fkey_layout.h
deleted file mode 100644
index c3d5c2d874e..00000000000
--- a/keyboards/planck/keymaps/hiea/common/number_fkey_layout.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ......................................................... Number Keypad Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   G  |   \  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() |      |      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_GUI,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0,    LT_EQL,  ___x___, ___x___, ___x___
-#else
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL,  LT_0,    ___x___, ___x___, ___x___
-#endif
-  ),
-
-// ............ .................................................. Function Keys
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      |  F7  |  F8  |  F9  |  F12 |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |  GUI |  Alt | Shift|      |      |      |      |  F4  |  F5  |  F6  |  F11 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F10 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |  f() |      |   +  |      |      |      |      |
-  // |      |      |      |      |  f() |      |      |   +  |      |      |      |      | see _PLOVER
-  // '-----------------------------------------------------------------------------------'
-
-  [_FNCKEY] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 ,
-    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 ,
-    _______, _______, _______, _______, ___fn__, ___fn__, _______, KC_PLUS, _______, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/hiea/common/plover_keybind.h b/keyboards/planck/keymaps/hiea/common/plover_keybind.h
deleted file mode 100644
index cb4ef92ef84..00000000000
--- a/keyboards/planck/keymaps/hiea/common/plover_keybind.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-// simple window manager specific plover keybind hook
-
-// toggle plover application, see herbstluftwm/config/appbinds
-register_code  (KC_LGUI);
-register_code  (KC_LCTL);
-tap_key        (KC_EQL);
-unregister_code(KC_LCTL);
-unregister_code(KC_LGUI);
diff --git a/keyboards/planck/keymaps/hiea/common/sounds.h b/keyboards/planck/keymaps/hiea/common/sounds.h
deleted file mode 100644
index 1bfc7a6da0c..00000000000
--- a/keyboards/planck/keymaps/hiea/common/sounds.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// ................................................................ Audio Sounds
-
-#ifdef AUDIO_ENABLE
-float song_startup  [][2] = SONG(STARTUP_SOUND);
-float song_colemak  [][2] = SONG(COLEMAK_SOUND);
-float song_qwerty   [][2] = SONG(QWERTY_SOUND);
-float song_plover   [][2] = SONG(PLOVER_SOUND);
-float song_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
-float song_caps_on  [][2] = SONG(CAPS_LOCK_ON_SOUND);
-float song_caps_off [][2] = SONG(CAPS_LOCK_OFF_SOUND);
-float music_scale   [][2] = SONG(MUSIC_SCALE_SOUND);
-float song_goodbye  [][2] = SONG(GOODBYE_SOUND);
-#endif
diff --git a/keyboards/planck/keymaps/hiea/common/steno_layout.h b/keyboards/planck/keymaps/hiea/common/steno_layout.h
deleted file mode 100644
index c1f2b5b24ab..00000000000
--- a/keyboards/planck/keymaps/hiea/common/steno_layout.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ...................................................................... Plover
-#ifdef STENO_ENABLE
-  // ,-----------------------------------------------------------------------------------.
-  // |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // | Base |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Base |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |                           |   A  |   O  |   E  |   U  |                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_PLOVER] = LAYOUT_planck_grid(
-    STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-    BASE1,   STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-    BASE2,   STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-    _______, _______, _______, PS_STNA, PS_STNO, _______, _______, PS_STNE, PS_STNU, _______, _______, _______
-  ),
-#else
-  // ,-----------------------------------------------------------------------------------.
-  // |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // | Base |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Base |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |                           |   A  |   O  |   E  |   U  |                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    BASE1,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    BASE2,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    _______, _______, _______, LT_C,    LT_V,    _______, _______, LT_N,    LT_M,    _______, _______, _______
-  ),
-#endif
diff --git a/keyboards/planck/keymaps/hiea/common/symbol_guifn_layout.h b/keyboards/planck/keymaps/hiea/common/symbol_guifn_layout.h
deleted file mode 100644
index 4a32f71bd9c..00000000000
--- a/keyboards/planck/keymaps/hiea/common/symbol_guifn_layout.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ..................................................... Symbol Navigation Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   ~  |   *  |   &  |      |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   ^  |   %  |   $  |      |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   @  |   !  |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |Adjust|   \  |      |  f() |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_SYMBOL] = LAYOUT_planck_grid(
-    _______, KC_TILD, KC_ASTR, KC_AMPR, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    OS_GUI,  SM_CIRC, SM_PERC, SM_DLR,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-    _______, KC_HASH, KC_AT,   KC_EXLM, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    ___x___, ___x___, ___x___, ADJUST,  LT_BSLS, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___
-  ),
-
-// ............................................................... Mouse Actions
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Left |  Up  | Right|  Up  |
-  // |-----------------------------------------------------------------------------------|
-  // |      | Btn3 | Btn2 | Btn1 |      |      |      |      | Left | Down | Right| Down |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |      |  f() |      |  f() |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_MOUSE] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,
-    _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, ___fn__, _______, _______, _______, ___fn__, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/hiea/common/tapdance.h b/keyboards/planck/keymaps/hiea/common/tapdance.h
deleted file mode 100644
index d778286bf1e..00000000000
--- a/keyboards/planck/keymaps/hiea/common/tapdance.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// tap dance keys
-enum tap_dance {
-  _CAPS = 0
- ,_COLN
- ,_COMM
- ,_DOT
- ,_DQOT
- ,_ENT
- ,_EQL
- ,_GRV
- ,_GT
- ,_LBRC
- ,_LCBR
- ,_LPRN
- ,_LT
- ,_PRIV
- ,_QUOT
- ,_RBRC
- ,_RCBR
- ,_RNGL
- ,_RPRN
- ,_SEND
- ,_SPC
- ,_TILD
-};
-
-#define TD_CAPS TD(_CAPS)
-#define TD_COLN TD(_COLN)
-#define TD_COMM TD(_COMM)
-#define TD_DOT  TD(_DOT)
-#define TD_DQOT TD(_DQOT)
-#define TD_ENT  TD(_ENT)
-#define TD_EQL  TD(_EQL)
-#define TD_GRV  TD(_GRV)
-#define TD_GT   TD(_GT)
-#define TD_LBRC TD(_LBRC)
-#define TD_LCBR TD(_LCBR)
-#define TD_LPRN TD(_LPRN)
-#define TD_LT   TD(_LT)
-#define TD_PRIV TD(_PRIV)                   // compile time macro string, provided in private_string.h
-#define TD_QUOT TD(_QUOT)
-#define TD_RBRC TD(_RBRC)
-#define TD_RCBR TD(_RCBR)
-#define TD_RNGL TD(_RNGL)
-#define TD_RPRN TD(_RPRN)
-#define TD_SEND TD(_SEND)                   // config.h defined macro string
-#define TD_SPC  TD(_SPC)                    // see process_record_user() for extended handling of Spc
-#define TD_TILD TD(_TILD)
diff --git a/keyboards/planck/keymaps/hiea/common/toggle_layout.h b/keyboards/planck/keymaps/hiea/common/toggle_layout.h
deleted file mode 100644
index ed74f42522d..00000000000
--- a/keyboards/planck/keymaps/hiea/common/toggle_layout.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ......................................................... Number Keypad Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   G  |   \  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() | Space|      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() | Space|      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTNUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_GUI,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    _______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_0,    LT_EQL,  _______, _______, _______
-#else
-    _______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_EQL,  LT_0,    _______, _______, _______
-#endif
-  ),
-
-// ............ .................................................. Function Keys
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      |  F7  |  F8  |  F9  |  F12 |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI | Ctrl |  Alt | Shift|      |      |      |      |  F4  |  F5  |  F6  |  F11 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F10 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   +  |      |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTFNCKEY] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 ,
-    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 ,
-    _______, _______, _______, TT_ESC,  _______, _______, _______, KC_PLUS, _______, _______, _______, _______
-  ),
-
-// ....................................................................... Regex
-
-  // ,-----------------------------------------------------------------------------------.
-  // |      |   ~  |   {  |   }  |   &  |      |      |   %  |   [  |   ]  |   @  |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |      |   ^  |   <  |   >  |   ?  |      |      |   |  |   (  |   )  |   $  |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |      |   :  |   !  |   =  |   /  |      |      |   \  |   *  |   .  |   #  |      |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |      |      |      |  f() |   -  |      |      |   +  | Space|      |      |      |
-  // `-----------------------------------------------------------------------------------'
-
-  [_TTREGEX] = LAYOUT_planck_grid(
-    ___x___, KC_TILD, KC_LCBR, KC_RCBR, KC_AMPR, ___x___, ___x___, KC_PERC, KC_LBRC, KC_RBRC, KC_AT,   ___x___,
-    ___x___, KC_CIRC, KC_LT,   KC_GT,   KC_QUES, ___x___, ___x___, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  ___x___,
-    ___x___, KC_COLN, KC_EXLM, KC_EQL,  KC_SLSH, ___x___, ___x___, KC_BSLS, KC_ASTR, KC_DOT,  KC_HASH, ___x___,
-    _______, _______, _______, TT_ESC,  KC_MINS, _______, _______, KC_PLUS, KC_SPC,  _______, _______, _______
-  ),
-
-// ............................................................ Navigation Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI | Ctrl |  Alt | Shift|      |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |      |      |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTCURSOR] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-// ............................................................... Mouse Actions
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Left |  Up  | Right|  Up  |
-  // |-----------------------------------------------------------------------------------|
-  // |      | Btn3 | Btn2 | Btn1 |      |      |      |      | Left | Down | Right| Down |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |      |      |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTMOUSE] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,
-    _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/hiea/config.h b/keyboards/planck/keymaps/hiea/config.h
deleted file mode 100644
index 65845fe3e7d..00000000000
--- a/keyboards/planck/keymaps/hiea/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// tap dance key press termination interval
-#define TAPPING_TERM 250
-
-// smooth mouse motion
-// #define MOUSEKEY_INTERVAL    20
-// #define MOUSEKEY_DELAY       0
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_MAX_SPEED   7
-// #define MOUSEKEY_WHEEL_DELAY 0
-
-// compile time macro string, see functions/hardware planck script (undefine otherwise)
-//#define PRIVATE_STRING
-
-// compile time macro string, must be in quotes
-#define PUBLIC_STRING ":%s/arch=(.*)/arch=('any')\n"
-
-// thumb key tap-shift() double tap: one shot shift (0) off (1) on
-#define DT_SHIFT 1
-
-// number layer 0 position KEYPAD_0, THUMB_0
-#define THUMB_0
-
-// home block shift symbol clustes defined (no overlays required for extended symbols, undefine otherwise)
-#define SHIFT_SYMBOLS
-
-// center column TT assignments (undefine for OSM chords)
-#define CENTER_TT
-#define TAPPING_TOGGLE 1
-
-// home row modifiers
-#define HOME_MODS
-// fix dual function timing
-#define PERMISSIVE_HOLD
-
-// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
-#define DEFAULT
-
-// sync app with window manager keybind hook defined in plover_keybind.h
-#define PLOVER_KEYBIND
-
-#endif
diff --git a/keyboards/planck/keymaps/hiea/hiea.h b/keyboards/planck/keymaps/hiea/hiea.h
deleted file mode 100644
index d396ff79fdd..00000000000
--- a/keyboards/planck/keymaps/hiea/hiea.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .................................................................. BEAKL HIEA
-#ifdef DEFAULT
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   .  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   K  |   ,  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Ins | Left |  Ent | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_X   ,
-    HOME_H,  HOME_I,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_R,  HOME_S,  HOME_W ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_K,    KC_COMM, CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_K), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   [  |   ]  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   ^  |   <  |   >  |   ~  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | ↑Tab |  f() |  Ins | Left |   _  |  Del | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), KC_LBRC, KC_RBRC, S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    SM_H,    KC_CIRC, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  S_TAB,   ___fn__, LT_INS,  S_LEFT,  KC_UNDS, SP_DEL,  S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   {  |   }  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   ?  |Cursor| Mouse|   |  |   (  |   )  |   $  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   K  |   /  |  Num | Regex|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Tab |   -  |  Ins | Left |  f() | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), KC_LCBR, KC_RCBR, S(KC_M), S(KC_X),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  SM_W   ,
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_TAB,  KC_MINS, LT_INS,  S_LEFT,  ___fn__, SP_BSPC, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
diff --git a/keyboards/planck/keymaps/hiea/keymap.c b/keyboards/planck/keymaps/hiea/keymap.c
deleted file mode 100644
index be138a3eb4b..00000000000
--- a/keyboards/planck/keymaps/hiea/keymap.c
+++ /dev/null
@@ -1,418 +0,0 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-//
-// To flash planck firmware
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   Reset keyboard or press hw reset button on base (hole)
-//
-//   cd qmk_firmware/keyboards/planck
-//   sudo make KEYMAP=sdothum dfu
-//
-//   sudo make clean          (good practice before flashing)
-//   sudo make KEYMAP=sdothum (to compile check)
-//
-// Package requirements (for arch linux)
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   avr-gcc-atmel
-//   avr-libc-atmel
-//   dfu-programmer
-//
-// Notes
-// ▔▔▔▔▔
-//   ** E R G O   W I D E   S P L I T ** Layout
-//
-//   Autocompletion tap dance key pairs (),[],{} are available from the
-//   number/symbol layer, as well as, numerous (un)shift key values
-//
-//   The navigation pad provides a single hand right thumb activated cluster
-//   with left hand modifiers
-//
-//   #define PRIVATE_STRING includes private_string.h, a user defined code
-//   block for the PRIV tap dance e.g. SEND_STRING("secret messape"),
-//   see function private()
-//
-// Modifier clusters
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   The num and sym keys together access the navigation pad layer
-//
-//   ,-----------------------------------------------------------------------------------.
-//   | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-//   `-----------------------------------------------------------------------------------'
-//
-// Hint
-// ▔▔▔▔
-//   For sculpted keycaps such as Cherry or OEM profile, reverse the Alt, Num,
-//   Shift, Shift, Nav, Sym keycaps for more ergonomic thumb orientation and
-//   actuation
-//
-// Code
-// ▔▔▔▔
-//   This source is shamelessly based on the "default" planck layout
-//
-//   #ifdef/#endif block structures are not indented, as syntax highlighting
-//   in vim is sufficient for identification
-//
-//   c++ commenting style is used throughout
-//
-// Change history
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   See http://thedarnedestthing.com/planck%20constant
-//   See http://thedarnedestthing.com/planck%20done
-
-
-
-//                === N O T E ===
-//
-// sudo CPATH=<keymap.c directory>/common make ...
-
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _BASE = 0
- ,_SHIFT
- ,_LSHIFT
- ,_RSHIFT
- ,_PLOVER
- ,_NUMBER
- ,_SYMBOL
- ,_FNCKEY
- ,_MOUSE
-#ifdef CENTER_TT
- ,_TTNUMBER
- ,_TTREGEX
- ,_TTFNCKEY
- ,_TTCURSOR
- ,_TTMOUSE
-#endif
- ,_EDIT
- ,_ADJUST
- ,_END_LAYERS
-};
-
-enum planck_keycodes {
-  BASE = SAFE_RANGE
- ,BASE1
- ,BASE2
- ,PLOVER
- ,SM_CIRC   // pseudo GUI_T(S(KC_6))                      for shifted key-codes, see process_record_user()
- ,SM_DLR    // pseudo SFT_T(S(KC_4))                      for shifted key-codes, see process_record_user()
- ,SM_G      // pseudo MT   (MOD_LALT | MOD_LSFT, S(KC_G)) for shifted key-codes, see process_record_user()
- ,SM_H      // pseudo MT   (MOD_LCTL | MOD_LSFT, S(KC_H)) for shifted key-codes, see process_record_user()
- ,SM_PERC   // pseudo ALT_T(S(KC_5))                      for shifted key-codes, see process_record_user()
- ,SM_W      // pseudo MT   (MOD_LGUI | MOD_LSFT, S(KC_W)) for shifted key-codes, see process_record_user()
- ,SL_LEFT   // pseudo LT   (_MOUSE, S(KC_LEFT))           for shifted key-codes, see process_record_user()
- ,SP_DEL    // pseudo LT   (_MOUSE, KC_DEL)               for shifted key-codes, see process_record_user()
- ,SL_TAB    // pseudo LT   (_FNCKEY, S(KC_TAB))           for shifted key-codes, see process_record_user()
-#ifdef CENTER_TT
- ,TT_ESC
-#endif
-#ifdef STENO_ENABLE
- ,PS_STNA = STN_A
- ,PS_STNO = STN_O
- ,PS_STNE = STN_E
- ,PS_STNU = STN_U
-#else
- ,LT_C    = LT (_NUMBER, KC_C)
- ,LT_V    = LT (_FNCKEY, KC_V)
- ,LT_N    = LT (_EDIT,   KC_N)
- ,LT_M    = LT (_SYMBOL, KC_M)
-#endif
-};
-
-// modifier keys
-#define AT_B    ALT_T(KC_B)
-#define AT_DOWN ALT_T(KC_DOWN)
-#define CT_RGHT CTL_T(KC_RGHT)
-#define GT_C    GUI_T(KC_C)
-#define GT_UP   GUI_T(KC_UP)
-#define MT_E    MT   (MOD_LCTL | MOD_LALT, KC_E)
-#define ST_A    SFT_T(KC_A)
-#ifdef HOME_MODS
-#define HOME_H  GUI_T(KC_H)
-#define HOME_I  CTL_T(KC_I)
-#define HOME_E  ALT_T(KC_E)
-#define HOME_A  SFT_T(KC_A)
-#define HOME_T  SFT_T(KC_T)
-#define HOME_R  ALT_T(KC_R)
-#define HOME_S  CTL_T(KC_S)
-#define HOME_W  GUI_T(KC_W)
-#else
-#define HOME_H  KC_H
-#define HOME_I  KC_I
-#define HOME_E  KC_E
-#define HOME_A  KC_A
-#define HOME_T  KC_T
-#define HOME_R  KC_R
-#define HOME_S  KC_S
-#define HOME_W  KC_W
-#endif
-
-#define S_DOWN  S    (KC_DOWN)
-#define S_LEFT  S    (KC_LEFT)
-#define S_RGHT  S    (KC_RGHT)
-#define S_TAB   S    (KC_TAB)
-#define S_UP    S    (KC_UP)
-
-#include "common/tapdance.h"
-
-// keycodes
-#define ___x___ KC_TRNS
-#define ___fn__ KC_TRNS
-#undef  _______
-#define _______ KC_NO
-
-#define COPY    LCTL(KC_C)
-#define CUT     LCTL(KC_X)
-#define EOT     LCTL(KC_D)
-#define NAK     LCTL(KC_U)
-#define PASTE   LCTL(KC_V)
-#define UNDO    LCTL(KC_Z)
-#define TMCOPY  LALT(LCTL(KC_C))
-#define TMPASTE LALT(LCTL(KC_V))
-#define LT_BSLS LT  (_MOUSE,  KC_BSLS)      // see process_record_user() for extended handling
-#define LT_BSPC LT  (_EDIT,   KC_BSPC)
-#define SP_LEFT LT  (_EDIT,   KC_LEFT)
-#define LT_ESC  LT  (_NUMBER, KC_ESC)
-#define LT_LEFT LT  (_SYMBOL, KC_LEFT)      // see process_record_user() for extended handling
-#define SP_BSPC LT  (_SYMBOL, KC_BSPC)      // see process_record_user() for extended handling
-#define LT_TAB  LT  (_FNCKEY, KC_TAB)
-#define LT_INS  LT  (_FNCKEY, KC_INS)
-#define ADJUST  MO  (_ADJUST)
-#define OS_ALT  OSM (MOD_LALT)
-#define OS_CTL  OSM (MOD_LCTL)
-#define OS_GUI  OSM (MOD_LGUI)
-#define OS_SFT  OSM (MOD_LSFT)
-
-#ifdef CENTER_TT
-#define CNTR_TL TT  (_TTFNCKEY)
-#define CNTR_TR     KC_CAPS
-#define CNTR_HL TT  (_TTCURSOR)
-#define CNTR_HR TT  (_TTMOUSE)
-#define CNTR_BL TT  (_TTNUMBER)
-#define CNTR_BR TT  (_TTREGEX)
-#else
-#define CNTR_TL OSM (MOD_LALT | MOD_LCTL)
-#define CNTR_TR OSM (MOD_LGUI | MOD_LCTL)
-#define CNTR_HL OSM (MOD_LALT | MOD_LSFT)
-#define CNTR_HR OSM (MOD_LGUI | MOD_LSFT)
-#define CNTR_BL TD  (_CAPS)
-#define CNTR_BR OSM (MOD_LSFT | MOD_LCTL)
-#endif
-
-#ifdef THUMB_0
-#define LT_EQL  LT  (_ADJUST, KC_EQL)
-#else
-#define LT_0    LT  (_ADJUST, KC_0)
-#endif
-
-// ........................................................ Default Alpha Layout
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-#include "hiea.h"
-#include "common/steno_layout.h"
-
-// ...................................................... Number / Function Keys
-
-#include "common/number_fkey_layout.h"
-
-// ......................................................... Symbol / Navigation
-
-#include "common/symbol_guifn_layout.h"
-
-// ............................................................... Toggle Layers
-
-#ifdef CENTER_TT
-#include "common/toggle_layout.h"
-#endif
-
-// ......................................................... Short Cuts / Adjust
-
-#include "common/chord_layout.h"
-
-};
-
-// ...................................................................... Sounds
-
-#include "common/sounds.h"
-
-// ........................................................... User Keycode Trap
-
-#include "common/keycode_functions.h"
-
-#define BASE_1  1
-#define BASE_2  2
-#define BASE_12 3
-static uint8_t base_n = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  switch (keycode) {
-    case BASE1:
-      if (record->event.pressed) {
-        base_n = base_n | BASE_1;
-        if (base_n == BASE_12) {
-          base_layer();
-        }
-      }
-      else {
-        base_n = base_n & ~BASE_1;
-      }
-      return false;
-    case BASE2:
-      if (record->event.pressed) {
-        base_n = base_n | BASE_2;
-        if (base_n == BASE_12) {
-          base_layer();
-        }
-      }
-      else {
-        base_n = base_n & ~BASE_2;
-      }
-      return false;
-    case AT_DOWN:
-#ifdef HOME_MODS
-    case HOME_E:
-    case HOME_R:
-#endif
-      tap_mods(record, KC_LALT);
-      break;
-    case CT_RGHT:
-#ifdef HOME_MODS
-    case HOME_H:
-    case HOME_W:
-#endif
-      tap_mods(record, KC_LGUI);
-      break;
-    case GT_UP:
-#ifdef HOME_MODS
-    case HOME_I:
-    case HOME_S:
-#endif
-      tap_mods(record, KC_LCTL);
-      break;
-#ifdef HOME_MODS
-    case HOME_A:
-    case HOME_T:
-      tap_mods(record, KC_LSFT);
-      break;
-#endif
-#ifdef CENTER_TT
-    case TT_ESC:
-      clear_tt();                           // exit TT layer
-      return false;
-#endif
-    case LT_ESC:
-#ifdef CENTER_TT
-      if (tt_keycode != 0) {
-        clear_tt();                         // exit TT layer
-        return false;
-      }
-#endif
-      tap_layer(record, _NUMBER);
-      break;
-    case LT_LEFT:
-    case SP_BSPC:
-      tap_layer(record, _SYMBOL);
-      // LT (_SYMBOL, KC_LEFT) left right combination layer
-      thumb_layer(record, RIGHT, 0, 0, _SYMBOL, _LSHIFT);
-      break;
-    case OS_ALT:
-      tap_mods(record, KC_LALT);
-      break;
-    case OS_CTL:
-      tap_mods(record, KC_LCTL);
-      break;
-    case OS_GUI:
-      tap_mods(record, KC_LGUI);
-      break;
-    case SM_CIRC:
-      // GUI_T(S(KC_6))
-      mt_shift(record, KC_LGUI, 0, KC_6);
-      break;
-    case SM_DLR:
-      // SFT_T(S(KC_4))
-      mt_shift(record, KC_LSFT, 0, KC_4);
-      break;
-    case SM_G:
-      // MT(MOD_LALT | MOD_LSFT, S(KC_G))
-      mt_shift(record, KC_LALT, KC_LSFT, KC_G);
-      break;
-    case SM_H:
-      // MT(MOD_LCTL | MOD_LSFT, S(KC_K))
-      mt_shift(record, KC_LCTL, KC_LSFT, KC_H);
-      break;
-    case SM_W:
-      // MT(MOD_LGUI | MOD_LSFT, S(KC_W))
-      mt_shift(record, KC_LGUI, KC_LSFT, KC_W);
-      break;
-    case SM_PERC:
-      // ALT_T(S(KC_5))
-      mt_shift(record, KC_LALT, 0, KC_5);
-      break;
-    case LT_BSLS:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, KC_BSLS) left right combination layer, see #define LT_BSLS
-      thumb_layer(record, LEFT, 0, 0, _MOUSE, _SYMBOL);
-      break;
-    case SL_LEFT:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, S(KC_LEFT)) left right combination layer
-      thumb_layer(record, RIGHT, SHIFT, KC_LEFT, _MOUSE, _LSHIFT);
-      break;
-    case SP_DEL:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, S(KC_LEFT)) left right combination layer
-      thumb_layer(record, RIGHT, NOSHIFT, KC_DEL, _MOUSE, _LSHIFT);
-      break;
-    case SL_TAB:
-      // LT (_FNCKEY, S(KC_TAB)) emulation
-      lt_shift(record, KC_TAB, _FNCKEY);
-      break;
-    case TD_ENT:
-      tap_layer(record, _RSHIFT);
-      // LT (_RSHIFT, KC_ENT) emulation, see tap dance enter
-      break;
-    case TD_SPC:
-      tap_layer(record, _LSHIFT);
-      // LT (_LSHIFT, KC_SPC) left right combination layer, see tap dance TD_SPC
-      thumb_layer(record, LEFT, 0, 0, _LSHIFT, _SYMBOL);
-      break;
-#ifdef CENTER_TT
-    case CNTR_TL:
-    case CNTR_TR:
-    case CNTR_HL:
-    case CNTR_HR:
-    case CNTR_BL:
-    case CNTR_BR:
-      if (tt_keycode != keycode && tt_keycode != 0) {
-        clear_tt();                         // return to base layer first if different TT layer selected
-      }
-      tt_keycode = keycode;
-      break;
-#endif
-// #ifdef STENO_ENABLE
-//     case PS_STNA:
-//       stn_layer(record, STN_A, _NUMBER);
-//       break;
-//     case PS_STNO:
-//       stn_layer(record, STN_O, _FNCKEY);
-//       break;
-//     case PS_STNE:
-//       stn_layer(record, STN_E, _EDIT);
-//       break;
-//     case PS_STNU:
-//       stn_layer(record, STN_U, _SYMBOL);
-//       break;
-// #endif
-    case PLOVER:
-      steno(record);
-      return false;
-  }
-  return true;
-}
-
-#include "common/init.h"
diff --git a/keyboards/planck/keymaps/hiea/qwerty.h b/keyboards/planck/keymaps/hiea/qwerty.h
deleted file mode 100644
index d11d0478b3f..00000000000
--- a/keyboards/planck/keymaps/hiea/qwerty.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ...................................................................... Qwerty
-#ifdef QWERTY
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   E  |   R  |   T  | ^Alt | ^GUI |   Y  |   U  |   I  |   O  |   P  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   S  |   D  |   F  |   G  | ↑Alt | ↑GUI |   H  |   J  |   K  |   L  |   ;  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   V  |   B  | Caps |^Shift|   N  |   M  |   ,  |   .  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = {
-    {KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    CNTR_TL, CNTR_TR, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   },
-    {KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    CNTR_HL, CNTR_HR, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN},
-    {KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CNTR_BL, CNTR_BR, KC_N,    KC_M,    KC_COMM, KC_DOT,  TD_QUOT},
-    {OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT},
-  },
-
-  [_SHIFT] = {
-    {S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), CNTR_TL, CNTR_TR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P)},
-    {S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), CNTR_HL, CNTR_HR, S(KC_H), S(KC_J), S(KC_K), S(KC_L), KC_SCLN},
-    {S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), CNTR_BL, CNTR_BR, S(KC_N), S(KC_M), KC_COMM, KC_DOT,  TD_QUOT},
-    {OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT},
-  },
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   E  |   R  |   T  | ^Alt | ^GUI |   Y  |   U  |   I  |   O  |   P  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   S  |   D  |   F  |   G  | ↑Alt | ↑GUI |   H  |   J  |   K  |   L  |   :  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   V  |   B  | Caps |^Shift|   N  |   M  |   /  |   ?  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   -  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = {
-    {S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), CNTR_TL, CNTR_TR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P)},
-    {S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), CNTR_HL, CNTR_HR, S(KC_H), S(KC_J), S(KC_K), S(KC_L), TD_COLN},
-    {S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), CNTR_BL, CNTR_BR, S(KC_N), S(KC_M), KC_SLSH, KC_QUES, TD_DQOT},
-    {OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_MINS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT },
-  },
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   E  |   R  |   T  | ^Alt | ^GUI |   Y  |   U  |   I  |   O  |   P  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   S  |   D  |   F  |   G  | ↑Alt | ↑GUI |   H  |   J  |   K  |   L  |   :  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   V  |   B  | Caps |^Shift|   N  |   M  |   ~  |   `  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   _  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = {
-    {S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), CNTR_TL, CNTR_TR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P)},
-    {S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), CNTR_HL, CNTR_HR, S(KC_H), S(KC_J), S(KC_K), S(KC_L), TD_COLN},
-    {S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), CNTR_BL, CNTR_BR, S(KC_N), S(KC_M), TD_TILD, TD_GRV,  TD_DQOT},
-    {OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_UNDS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT },
-  },
-#endif
-
diff --git a/keyboards/planck/keymaps/hiea/readme.md b/keyboards/planck/keymaps/hiea/readme.md
deleted file mode 100644
index 58f73e3b445..00000000000
--- a/keyboards/planck/keymaps/hiea/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# The sdothum extended Default Planck Layout
-
-- Colemak-DH layout layer with shift/tab key overlays
-- Number and symbol/function key layer
-- Hexadecimal keypad layer
-- Navigation keypad layer
-- Dynamic macro layer
-- Autocompletion tap key pairs (),[],{}
-- Normalized enter and esc key position across keyboard layers
-- Extensive use of tap keys
diff --git a/keyboards/planck/keymaps/hiea/rules.mk b/keyboards/planck/keymaps/hiea/rules.mk
deleted file mode 100644
index ea9abc2a80d..00000000000
--- a/keyboards/planck/keymaps/hiea/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Build Options:
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes  # mouse keys(+4700)
-EXTRAKEY_ENABLE  = no   # audio control and System control(+450)
-CONSOLE_ENABLE   = no   # console for debug(+400)
-COMMAND_ENABLE   = no   # commands for debug and configuration
-NKRO_ENABLE      = yes  # nkey rollover
-BACKLIGHT_ENABLE = no   # enable keyboard backlight functionality
-MIDI_ENABLE      = no   # MIDI controls
-AUDIO_ENABLE     = no   # audio output on port C6
-UNICODE_ENABLE   = no   # unicode
-BLUETOOTH_ENABLE = no   # enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no   # enable WS2812 RGB underlight, do not enable this with audio at the same time.
-STENO_ENABLE     = yes	# enable TX Bolt protocol, requires VIRTSER and may not work with mouse keys
-
-# do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no   # breathing sleep LED during USB suspend
-
-TAP_DANCE_ENABLE = yes  # enable double tap completion of (),[],{}
-
diff --git a/keyboards/planck/keymaps/hieax/common/chord_layout.h b/keyboards/planck/keymaps/hieax/common/chord_layout.h
deleted file mode 100644
index cb1b7f67855..00000000000
--- a/keyboards/planck/keymaps/hieax/common/chord_layout.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .................................................................. Short Cuts
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      | Copy | Paste|      |      |      |      |      |      |      |      |
-  // |--------------------------------------------------------------+------+------+------|
-  // | Undo |  Cut | Copy | Paste|      |      |      |      | PRIV |  PUB |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |  Nak |  Eot |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |  f() |      |      |      |      |      |
-  // |      |      |      |      |      |      |      |  f() |      |      |      |      | see _PLOVER
-  // '-----------------------------------------------------------------------------------'
-
-  [_EDIT] = LAYOUT_planck_grid(
-    _______, _______, TMCOPY,  TMPASTE, _______, _______, _______, _______, _______, _______, _______, _______,
-    UNDO,    CUT,     COPY,    PASTE,   _______, _______, _______, _______, TD_PRIV, TD_SEND, _______, _______,
-    _______, _______, NAK,     EOT,     _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, ___fn__, ___fn__, _______, _______, _______, _______
-  ),
-
-// ................................................................ Adjust Layer
-
-  // ,-----------------------------------------------------------------------------------.
-  // |Plover|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |Aud on|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Reset|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |      |      |      |  f() |      |      |      |      |  f() |      |      |      |
-  // `-----------------------------------------------------------------------------------'
-
-  [_ADJUST] = LAYOUT_planck_grid(
-    PLOVER,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    AU_ON,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/hieax/common/init.h b/keyboards/planck/keymaps/hieax/common/init.h
deleted file mode 100644
index d009bd69a12..00000000000
--- a/keyboards/planck/keymaps/hieax/common/init.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// ....................................................................... Audio
-
-void matrix_init_user(void)
-{
-#ifdef STENO_ENABLE
-  steno_set_mode(STENO_MODE_BOLT);          // or STENO_MODE_GEMINI
-#endif
-}
-
-#ifdef AUDIO_ENABLE
-#ifdef BACKLIGHT_ENABLE
-bool led_update_user(led_t led_state)
-{
-  static led_t old_led_state = {0};
-  _delay_ms(10);                            // gets rid of tick
-  if (!is_playing_notes()) {
-    if (led_state.caps_lock && !old_led_state.caps_lock) {
-      // if capslock LED is turning on
-      PLAY_SONG(song_caps_on);
-    }
-    else if (!led_state.caps_lock && old_led_state.caps_lock) {
-      // if capslock LED is turning off
-      PLAY_SONG(song_caps_off);
-    }
-  }
-  old_led_state = led_state;
-  return false;
-}
-#endif
-
-#endif
diff --git a/keyboards/planck/keymaps/hieax/common/keycode_functions.h b/keyboards/planck/keymaps/hieax/common/keycode_functions.h
deleted file mode 100644
index ecf3636ae8b..00000000000
--- a/keyboards/planck/keymaps/hieax/common/keycode_functions.h
+++ /dev/null
@@ -1,732 +0,0 @@
-
-// .......................................................... Keycode Primitives
-
-// register simple key press
-void tap_key(uint16_t keycode)
-{
-  register_code  (keycode);
-  unregister_code(keycode);
-}
-
-void shift_key(uint16_t keycode)
-{
-  register_code  (KC_LSFT);
-  tap_key        (keycode);
-  unregister_code(KC_LSFT);
-}
-
-#define SHIFT   1
-#define NOSHIFT 0
-
-static uint16_t key_timer = 0;
-
-// key press for thumb_layer() and lt_shift() macros
-bool key_press(uint8_t shift, uint16_t keycode)
-{
-  if (keycode) {
-    if (timer_elapsed(key_timer) < TAPPING_TERM) {
-      if (shift) {
-        shift_key(keycode);
-      }
-      else {
-        tap_key(keycode);
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-// ALT_T, CTL_T, GUI_T, SFT_T for shifted keycodes
-void mt_shift(keyrecord_t *record, uint16_t modifier, uint16_t modifier2, uint16_t keycode)
-{
-  if (record->event.pressed) {
-    key_timer = timer_read();
-    register_code(modifier);
-    if (modifier2) {
-      register_code(modifier2);
-    }
-  }
-  else {
-    unregister_code(modifier);
-    if (modifier2) {
-      unregister_code(modifier2);
-    }
-    if (timer_elapsed(key_timer) < TAPPING_TERM) {
-      shift_key(keycode);
-    }
-    key_timer = 0;
-  }
-}
-
-// ................................................................... Mod Masks
-
-// tap dance persistant mods, see process_record_user()
-// keyboard_report->mods (?) appears to be cleared by tap dance
-static uint8_t mods = 0;
-
-void tap_mods(keyrecord_t *record, uint16_t keycode)
-{
-  if (record->event.pressed) {
-    mods |= MOD_BIT(keycode);
-  }
-  else {
-    mods &= ~(MOD_BIT(keycode));
-  }
-}
-
-// (un)register modifiers
-void modifier(void (*f)(uint8_t))
-{
-  if (mods & MOD_BIT(KC_LCTL)) {
-    (*f)(KC_LCTL);
-  }
-  if (mods & MOD_BIT(KC_LGUI)) {
-    (*f)(KC_LGUI);
-  }
-  if (mods & MOD_BIT(KC_LALT)) {
-    (*f)(KC_LALT);
-  }
-  if (mods & MOD_BIT(KC_LSFT)) {
-    (*f)(KC_LSFT);
-  }
-  if (mods & MOD_BIT(KC_RSFT)) {
-    (*f)(KC_RSFT);
-  }
-}
-
-// .................................................... Triple Dance Shift/Layer
-
-static uint8_t dt_shift = 0;
-
-void double_shift(uint16_t keycode, uint8_t layer)
-{
-  tap_key (keycode);
-  if (DT_SHIFT) {
-    // set_oneshot_mods(MOD_LSFT);
-    // layer_on(layer);
-    layer_on         (_SHIFT);
-    set_oneshot_layer(_SHIFT, ONESHOT_START);
-    dt_shift = 1;
-  }
-  else {
-    layer_on(layer);
-  }
-}
-
-// tap dance LT (LAYER, KEY) emulation with <KEY><DOWN> -> <KEY><SHIFT> and auto-repeat extensions!
-void tap_shift(tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
-{
-  // double tap plus down
-  if (state->count > 2) {
-    // double enter shift
-    if (keycode == KC_ENT) {
-      tap_key     (keycode);
-      double_shift(keycode, layer);
-    }
-    // repeating keycode
-    else {
-      register_code(keycode);
-    }
-  }
-  // tap plus down (or double tap): keycode (one shot) shift
-  else if (state->count > 1) {
-    double_shift(keycode, layer);
-  }
-  // down: shift
-  else if (state->pressed) {
-    layer_on(layer);
-  }
-  // tap: keycode
-  else {
-    modifier(register_code);
-    tap_key (keycode);
-    modifier(unregister_code);
-  }
-}
-
-void tap_reset(uint16_t keycode, uint8_t layer)
-{
-  unregister_code(keycode);
-  if (DT_SHIFT && dt_shift) {
-    clear_oneshot_layer_state(ONESHOT_PRESSED);
-    dt_shift = 0;
-  }
-  else {
-    layer_off(layer);
-  }
-}
-
-// augment pseudo LT (_RSHIFT, KC_ENT) handling below for rapid <ENTER><SHIFT> sequences
-void enter(tap_dance_state_t *state, void *user_data)
-{
-  tap_shift(state, KC_ENT, _RSHIFT);
-}
-
-void enter_reset(tap_dance_state_t *state, void *user_data)
-{
-  tap_reset(KC_ENT, _RSHIFT);
-}
-
-// augment pseudo LT (_LSHIFT, KC_SPC) handling below for rapid <SPACE><SHIFT> sequences
-void space(tap_dance_state_t *state, void *user_data)
-{
-  tap_shift(state, KC_SPC, _LSHIFT);
-}
-
-void space_reset(tap_dance_state_t *state, void *user_data)
-{
-  tap_reset(KC_SPC, _LSHIFT);
-}
-
-// ......................................................... Triple Dance Insert
-
-void double_max(uint8_t count, uint8_t shift, uint16_t keycode)
-{
-  if (shift) {
-    shift_key(keycode);
-    if (count > 1) {
-      shift_key(keycode);
-    }
-  }
-  else {
-    tap_key(keycode);
-    if (count > 1) {
-      tap_key(keycode);
-    }
-  }
-}
-
-void colon(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    shift_key(KC_SCLN);
-    shift_key(KC_SCLN);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_SCLN);
-  }
-  reset_tap_dance(state);
-}
-
-void eql(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key(KC_SPC);
-    tap_key(KC_SLSH);
-    tap_key(KC_EQL);
-    tap_key(KC_SPC);
-  }
-  else {
-    double_max(state->count, NOSHIFT, KC_EQL);
-  }
-  reset_tap_dance(state);
-}
-
-void greater(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    tap_key  (KC_MINS);
-    shift_key(KC_DOT);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_DOT);
-  }
-  reset_tap_dance(state);
-}
-
-void lesser(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    shift_key(KC_COMM);
-    tap_key  (KC_MINS);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_COMM);
-  }
-  reset_tap_dance(state);
-}
-
-void tilde(tap_dance_state_t *state, void *user_data)
-{
-  // double tap plus down: repeating keycode
-  if (state->count > 2) {
-    register_code(KC_LSFT);
-    register_code(KC_GRV);
-  }
-  // tap: keycode
-  else {
-    shift_key(KC_GRV);
-    // double tap: unix home directory
-    if (state->count > 1) {
-      tap_key(KC_SLSH);
-    }
-  }
-}
-
-void tilde_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_GRV);
-  unregister_code(KC_LSFT);
-}
-
-// ............................................................. Tap Dance Pairs
-
-// tap dance shift rules
-#define S_NEVER  0
-#define S_SINGLE 1
-#define S_DOUBLE 2
-#define S_ALWAYS S_SINGLE | S_DOUBLE
-
-void symbol_pair(uint8_t shift, uint16_t left, uint16_t right)
-{
-  if (shift & S_DOUBLE) {
-    shift_key(left);
-    shift_key(right);
-  }
-  else {
-    tap_key(left);
-    tap_key(right);
-  }
-}
-
-#define CLOSE 1
-
-// tap dance symbol pairs
-void tap_pair(tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
-{
-  // triple tap: left right with cursor between symbol pair a la vim :-)
-  if (state->count > 2) {
-    symbol_pair(shift, left, right);
-    tap_key    (KC_LEFT);
-  }
-  // double tap: left right
-  else if (state->count > 1) {
-    symbol_pair(shift, left, right);
-  }
-  // down: modifier
-  else if (state->pressed) {
-    if (modifier) {
-      register_code(modifier);
-    }
-  }
-  // tap: left (close: right)
-  else {
-    if (shift & S_SINGLE) {
-      shift_key(close ? right : left);
-    }
-    else {
-      tap_key(close ? right : left);
-    }
-  }
-  if (!modifier) {
-    reset_tap_dance(state);
-  }
-}
-
-void doublequote(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_QUOT, KC_QUOT, 0, 0);
-}
-
-void grave(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_GRV, KC_GRV, 0, 0);
-}
-
-void lbrace(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, 0);
-}
-
-void lcurly(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, 0);
-}
-
-void lparen(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_9, KC_0, KC_LCTL, 0);
-}
-
-void lparen_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LCTL);
-}
-
-void quote(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_QUOT, KC_QUOT, 0, 0);
-}
-
-void rangle(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_COMM, KC_DOT, 0, CLOSE);
-}
-
-void rbrace(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, CLOSE);
-}
-
-void rcurly(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, CLOSE);
-}
-
-void rparen(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_9, KC_0, 0, CLOSE);
-}
-
-void rparen_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LCTL);
-}
-
-// ............................................................ Tap Dance Insert
-
-void comma(tap_dance_state_t *state, void *user_data)
-{
-  tap_key(KC_COMM);
-  if (state->count > 1) {
-    tap_key(KC_SPC);
-  }
-  reset_tap_dance(state);
-}
-
-void dot(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    shift_key(KC_COLN);
-  }
-  else {
-    tap_key(KC_DOT);
-  }
-  reset_tap_dance(state);
-}
-
-// compile time macro string, see functions/hardware planck script
-void private(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-#ifdef PRIVATE_STRING
-#include "private_string.h"
-#endif
-  }
-  reset_tap_dance(state);
-}
-
-// config.h defined string
-void send(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    SEND_STRING(PUBLIC_STRING);
-  }
-  reset_tap_dance(state);
-}
-
-// .......................................................... Tap Dance One Shot
-
-void caps(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    tap_key(KC_CAPS);
-  }
-  else {
-    set_oneshot_mods(MOD_LSFT);
-    register_code   (KC_LSFT);              // on hold down
-  }
-}
-
-void caps_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LSFT);
-}
-
-// ................................................................... Tap Dance
-
-tap_dance_action_t tap_dance_actions[] = {
-  [_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps, caps_reset)
- ,[_COLN] = ACTION_TAP_DANCE_FN         (colon)
- ,[_COMM] = ACTION_TAP_DANCE_FN         (comma)
- ,[_DOT]  = ACTION_TAP_DANCE_FN         (dot)
- ,[_DQOT] = ACTION_TAP_DANCE_FN         (doublequote)
- ,[_ENT]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, enter, enter_reset)
- ,[_EQL]  = ACTION_TAP_DANCE_FN         (eql)
- ,[_GRV]  = ACTION_TAP_DANCE_FN         (grave)
- ,[_GT]   = ACTION_TAP_DANCE_FN         (greater)
- ,[_LBRC] = ACTION_TAP_DANCE_FN         (lbrace)
- ,[_LCBR] = ACTION_TAP_DANCE_FN         (lcurly)
- ,[_LPRN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lparen, lparen_reset)
- ,[_LT]   = ACTION_TAP_DANCE_FN         (lesser)
- ,[_PRIV] = ACTION_TAP_DANCE_FN         (private)
- ,[_QUOT] = ACTION_TAP_DANCE_FN         (quote)
- ,[_RBRC] = ACTION_TAP_DANCE_FN         (rbrace)
- ,[_RCBR] = ACTION_TAP_DANCE_FN         (rcurly)
- ,[_RNGL] = ACTION_TAP_DANCE_FN         (rangle)
- ,[_RPRN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rparen, rparen_reset)
- ,[_SEND] = ACTION_TAP_DANCE_FN         (send)
- ,[_SPC]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, space, space_reset)
- ,[_TILD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tilde, tilde_reset)
-};
-
-// .............................................................. Dynamic Layers
-
-#define        LEFT    1
-#define        RIGHT   2
-static uint8_t thumb = 0;
-
-// LEFT (KC_SPC, S(KC_BSLS)), RIGHT (KC_LEFT, S(KC_LEFT)) opposite thumb combinations, see process_record_user()
-// up,   up   -> _BASE
-// up,   down -> _SYMBOL
-// down, up   -> _NUMBER
-// down, down -> _MOUSE                     // see layer keycodes that raise mouse layer
-#define THUMBS_DOWN _MOUSE                  // layer
-
-static uint8_t overlayer = 0;
-
-// left right thumb layer combinations
-void thumb_layer(keyrecord_t *record, uint8_t side, uint8_t shift, uint16_t keycode, uint8_t thumb_dn_layer, uint8_t thumb_up_layer)
-{
-  if (record->event.pressed) {
-    // layer_on via tap_layer(), see process_record_user()
-    key_timer = timer_read();
-    thumb     = thumb | side;
-  }
-  else {
-    layer_off(thumb_dn_layer);
-    // opposite thumb_layer() thumb may have switched effective layer!
-    if (overlayer) {
-      layer_off(overlayer);
-      overlayer = 0;
-    }
-    if (!key_press(shift, keycode)) {
-      layer_off(THUMBS_DOWN);               // both thumbs needed
-      // opposite thumb down? see left right combination layer table above
-      if (thumb & (side == LEFT ? RIGHT : LEFT)) {
-        layer_on(thumb_up_layer);
-        overlayer = thumb_up_layer;
-      }
-    }
-    clear_mods();
-    thumb     = thumb & ~side;
-    key_timer = 0;
-  }
-}
-
-// #ifdef STENO_ENABLE
-// // LT for steno keycode
-// void stn_layer(keyrecord_t *record, uint16_t keycode, uint8_t layer)
-// {
-//   if (record->event.pressed) {
-//     key_timer = timer_read();
-//     if (keycode) {
-//       process_steno(keycode, record);
-//     }
-//     layer_on(layer);
-//   }
-//   else {
-//     layer_off(layer);
-//     if (keycode) {
-//       if (timer_elapsed(key_timer) < TAPPING_TERM) {
-//         process_steno(keycode, record);
-//       }
-//       else {
-//         // clear pressed state (request push of updated) process_steno.c and .h
-//         // steno_clear_state();
-//       }
-//     }
-//     key_timer = 0;
-//   }
-// }
-// #endif
-
-// LT macro for nested LT layers
-void lt(keyrecord_t *record, uint8_t shift, uint16_t keycode, uint16_t modifier, uint8_t layer)
-{
-  if (record->event.pressed) {
-    key_timer = timer_read();
-    if (modifier) {
-      register_code(modifier);
-    }
-    layer_on(layer);
-  }
-  else {
-    if (modifier) {
-      unregister_code(modifier);
-    }
-    layer_off(layer);
-    // for shifted keycodes, hence, LT_SHIFT
-    key_press(shift, keycode);
-    clear_mods();
-    key_timer = 0;
-  }
-}
-
-// LT for S(keycode)
-void lt_shift(keyrecord_t *record, uint16_t keycode, uint8_t layer)
-{
-  lt(record, SHIFT, keycode, 0, layer);
-}
-
-// set layer asap to overcome macro latency errors, notably tap dance and LT usage
-// this routine inexplicably (?) sets layer_on() faster than can be done in thumb_layer()
-void tap_layer(keyrecord_t *record, uint8_t layer)
-{
-  if (record->event.pressed) {
-    layer_on(layer);
-  }
-  else {
-    layer_off(layer);
-  }
-}
-
-// ..................................................................... Keymaps
-
-// void persistant_default_layer_set(uint16_t default_layer)
-// {
-//   eeconfig_update_default_layer(default_layer);
-//   default_layer_set            (default_layer);
-// }
-
-void clear_layers(void)
-{
-  uint8_t layer;
-  for (layer = 0; layer < _END_LAYERS; layer++) {
-    layer_off(layer);
-  }
-}
-
-#ifdef HOME_MODS
-// home row layer/shift key state, see tap_mods() and keymap.c
-#define LSYMBOL MOD_BIT(KC_LSFT)
-#define RSYMBOL MOD_BIT(KC_RSFT)
-
-void home_state(void) {
-  // if only the shift key, raise the opposite hand symbol layer
-  if (mods == LSYMBOL) {
-    layer_on(_LSYMBOL);
-  }
-  else if (mods == RSYMBOL) {
-    layer_on(_RSYMBOL);
-  }
-  // or combine modifiers
-  else if (mods & LSYMBOL) {
-    register_code(KC_LSFT);
-  }
-  else if (mods & RSYMBOL) {
-    register_code(KC_RSFT);
-  }
-}
-
-// home row layer/shift
-void symbol_shift(keyrecord_t *record, uint16_t keycode)
-{
-  if (keycode) {
-    if (record->event.pressed) {
-      key_timer = timer_read();
-      home_state();
-    }
-    else {
-      // clear layer/shift state
-      if (keycode == KC_A) {
-        layer_off(_LSYMBOL);
-        unregister_code(KC_LSFT);
-      }
-      else if (keycode == KC_T) {
-        layer_off(_RSYMBOL);
-        unregister_code(KC_RSFT);
-      }
-      // no other modifier enabled, issue keycode
-      if (~mods) {
-        key_press(NOSHIFT, keycode);
-      }
-      key_timer = 0;
-    }
-  }
-  else {
-    // a non-shift modifier disables symbol layer
-    layer_off(_LSYMBOL);
-    layer_off(_RSYMBOL);
-    // update home layer/shift state
-    home_state();
-  }
-}
-#endif
-
-#ifdef CENTER_TT
-static uint16_t tt_keycode = 0;             // current TT keycode
-
-void clear_tt(void)
-{
-  if (tt_keycode == KC_CAPS) {
-    tap_key(KC_CAPS);                       // clear capslock
-  }
-  tt_keycode = 0;
-  clear_layers();
-  set_single_persistent_default_layer(_BASE);
-}
-#endif
-
-// txbolt plover run state
-static uint8_t plover = 0;
-
-void toggle_plover(uint8_t state)
-{
-  if (plover != state) {
-#ifdef PLOVER_KEYBIND
-#include "plover_keybind.h"
-#endif
-    plover = state;
-  }
-}
-
-void base_layer(void)
-{
-#ifdef AUDIO_ENABLE
-  if (plover) {
-    PLAY_SONG(song_plover_gb);
-  }
-  else {
-    PLAY_SONG(song_qwerty);
-  }
-#endif
-  clear_layers();
-  set_single_persistent_default_layer(_BASE);
-  toggle_plover(0);
-}
-
-void steno(keyrecord_t *record)
-{
-  if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-    PLAY_SONG(song_plover);
-#endif
-    clear_layers();
-    layer_on(_PLOVER);
-    if (!eeconfig_is_enabled()) {
-      eeconfig_init();
-    }
-    keymap_config.raw  = eeconfig_read_keymap();
-    keymap_config.nkro = 1;
-    eeconfig_update_keymap(keymap_config.raw);
-    if (!plover) {
-      toggle_plover(1);
-    }
-  }
-}
-
-void steno_exit(keyrecord_t *record)
-{
-  if (record->event.pressed) {
-    base_layer();
-    toggle_plover(0);
-  }
-}
diff --git a/keyboards/planck/keymaps/hieax/common/number_fkey_layout.h b/keyboards/planck/keymaps/hieax/common/number_fkey_layout.h
deleted file mode 100644
index c3d5c2d874e..00000000000
--- a/keyboards/planck/keymaps/hieax/common/number_fkey_layout.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ......................................................... Number Keypad Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   G  |   \  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() |      |      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_GUI,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0,    LT_EQL,  ___x___, ___x___, ___x___
-#else
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL,  LT_0,    ___x___, ___x___, ___x___
-#endif
-  ),
-
-// ............ .................................................. Function Keys
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      |  F7  |  F8  |  F9  |  F12 |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |  GUI |  Alt | Shift|      |      |      |      |  F4  |  F5  |  F6  |  F11 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F10 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |  f() |      |   +  |      |      |      |      |
-  // |      |      |      |      |  f() |      |      |   +  |      |      |      |      | see _PLOVER
-  // '-----------------------------------------------------------------------------------'
-
-  [_FNCKEY] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 ,
-    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 ,
-    _______, _______, _______, _______, ___fn__, ___fn__, _______, KC_PLUS, _______, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/hieax/common/plover_keybind.h b/keyboards/planck/keymaps/hieax/common/plover_keybind.h
deleted file mode 100644
index cb4ef92ef84..00000000000
--- a/keyboards/planck/keymaps/hieax/common/plover_keybind.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-// simple window manager specific plover keybind hook
-
-// toggle plover application, see herbstluftwm/config/appbinds
-register_code  (KC_LGUI);
-register_code  (KC_LCTL);
-tap_key        (KC_EQL);
-unregister_code(KC_LCTL);
-unregister_code(KC_LGUI);
diff --git a/keyboards/planck/keymaps/hieax/common/sounds.h b/keyboards/planck/keymaps/hieax/common/sounds.h
deleted file mode 100644
index 1bfc7a6da0c..00000000000
--- a/keyboards/planck/keymaps/hieax/common/sounds.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// ................................................................ Audio Sounds
-
-#ifdef AUDIO_ENABLE
-float song_startup  [][2] = SONG(STARTUP_SOUND);
-float song_colemak  [][2] = SONG(COLEMAK_SOUND);
-float song_qwerty   [][2] = SONG(QWERTY_SOUND);
-float song_plover   [][2] = SONG(PLOVER_SOUND);
-float song_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
-float song_caps_on  [][2] = SONG(CAPS_LOCK_ON_SOUND);
-float song_caps_off [][2] = SONG(CAPS_LOCK_OFF_SOUND);
-float music_scale   [][2] = SONG(MUSIC_SCALE_SOUND);
-float song_goodbye  [][2] = SONG(GOODBYE_SOUND);
-#endif
diff --git a/keyboards/planck/keymaps/hieax/common/steno_layout.h b/keyboards/planck/keymaps/hieax/common/steno_layout.h
deleted file mode 100644
index c1f2b5b24ab..00000000000
--- a/keyboards/planck/keymaps/hieax/common/steno_layout.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ...................................................................... Plover
-#ifdef STENO_ENABLE
-  // ,-----------------------------------------------------------------------------------.
-  // |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // | Base |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Base |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |                           |   A  |   O  |   E  |   U  |                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_PLOVER] = LAYOUT_planck_grid(
-    STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-    BASE1,   STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-    BASE2,   STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-    _______, _______, _______, PS_STNA, PS_STNO, _______, _______, PS_STNE, PS_STNU, _______, _______, _______
-  ),
-#else
-  // ,-----------------------------------------------------------------------------------.
-  // |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // | Base |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Base |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |                           |   A  |   O  |   E  |   U  |                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    BASE1,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    BASE2,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    _______, _______, _______, LT_C,    LT_V,    _______, _______, LT_N,    LT_M,    _______, _______, _______
-  ),
-#endif
diff --git a/keyboards/planck/keymaps/hieax/common/symbol_guifn_layout.h b/keyboards/planck/keymaps/hieax/common/symbol_guifn_layout.h
deleted file mode 100644
index 4a32f71bd9c..00000000000
--- a/keyboards/planck/keymaps/hieax/common/symbol_guifn_layout.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ..................................................... Symbol Navigation Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   ~  |   *  |   &  |      |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   ^  |   %  |   $  |      |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   @  |   !  |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |Adjust|   \  |      |  f() |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_SYMBOL] = LAYOUT_planck_grid(
-    _______, KC_TILD, KC_ASTR, KC_AMPR, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    OS_GUI,  SM_CIRC, SM_PERC, SM_DLR,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-    _______, KC_HASH, KC_AT,   KC_EXLM, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    ___x___, ___x___, ___x___, ADJUST,  LT_BSLS, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___
-  ),
-
-// ............................................................... Mouse Actions
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Left |  Up  | Right|  Up  |
-  // |-----------------------------------------------------------------------------------|
-  // |      | Btn3 | Btn2 | Btn1 |      |      |      |      | Left | Down | Right| Down |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |      |  f() |      |  f() |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_MOUSE] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,
-    _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, ___fn__, _______, _______, _______, ___fn__, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/hieax/common/tapdance.h b/keyboards/planck/keymaps/hieax/common/tapdance.h
deleted file mode 100644
index d778286bf1e..00000000000
--- a/keyboards/planck/keymaps/hieax/common/tapdance.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// tap dance keys
-enum tap_dance {
-  _CAPS = 0
- ,_COLN
- ,_COMM
- ,_DOT
- ,_DQOT
- ,_ENT
- ,_EQL
- ,_GRV
- ,_GT
- ,_LBRC
- ,_LCBR
- ,_LPRN
- ,_LT
- ,_PRIV
- ,_QUOT
- ,_RBRC
- ,_RCBR
- ,_RNGL
- ,_RPRN
- ,_SEND
- ,_SPC
- ,_TILD
-};
-
-#define TD_CAPS TD(_CAPS)
-#define TD_COLN TD(_COLN)
-#define TD_COMM TD(_COMM)
-#define TD_DOT  TD(_DOT)
-#define TD_DQOT TD(_DQOT)
-#define TD_ENT  TD(_ENT)
-#define TD_EQL  TD(_EQL)
-#define TD_GRV  TD(_GRV)
-#define TD_GT   TD(_GT)
-#define TD_LBRC TD(_LBRC)
-#define TD_LCBR TD(_LCBR)
-#define TD_LPRN TD(_LPRN)
-#define TD_LT   TD(_LT)
-#define TD_PRIV TD(_PRIV)                   // compile time macro string, provided in private_string.h
-#define TD_QUOT TD(_QUOT)
-#define TD_RBRC TD(_RBRC)
-#define TD_RCBR TD(_RCBR)
-#define TD_RNGL TD(_RNGL)
-#define TD_RPRN TD(_RPRN)
-#define TD_SEND TD(_SEND)                   // config.h defined macro string
-#define TD_SPC  TD(_SPC)                    // see process_record_user() for extended handling of Spc
-#define TD_TILD TD(_TILD)
diff --git a/keyboards/planck/keymaps/hieax/common/toggle_layout.h b/keyboards/planck/keymaps/hieax/common/toggle_layout.h
deleted file mode 100644
index cf3138d6e33..00000000000
--- a/keyboards/planck/keymaps/hieax/common/toggle_layout.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ......................................................... Number Keypad Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   G  |   \  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() | Space|      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() | Space|      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTNUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_GUI,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    _______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_0,    LT_EQL,  _______, _______, _______
-#else
-    _______, _______, _______, TT_ESC,  KC_SPC,  _______, _______, KC_EQL,  LT_0,    _______, _______, _______
-#endif
-  ),
-
-// ............ .................................................. Function Keys
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      |  F7  |  F8  |  F9  |  F12 |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI | Ctrl |  Alt | Shift|      |      |      |      |  F4  |  F5  |  F6  |  F11 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F10 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   +  |      |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTFNCKEY] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 ,
-    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 ,
-    _______, _______, _______, TT_ESC,  _______, _______, _______, KC_PLUS, _______, _______, _______, _______
-  ),
-
-// ....................................................................... Regex
-
-  // ,-----------------------------------------------------------------------------------.
-  // |      |   .  |   *  |   &  |   ~  |      |      |   `  |   [  |   ]  |   ^  |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |      |   <  |   %  |   >  |   ?  |      |      |   |  |   (  |   )  |   $  |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |      |   :  |   @  |   !  |   /  |      |      |   \  |   {  |   }  |   #  |      |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |      |      |      |  f() |   =  |      |      |   +  | Space|      |      |      |
-  // `-----------------------------------------------------------------------------------'
-
-  [_TTREGEX] = LAYOUT_planck_grid(
-    ___x___, KC_DOT,  KC_ASTR, KC_AMPR, KC_TILD, ___x___, ___x___, KC_GRV,  KC_LBRC, KC_RBRC, KC_CIRC, ___x___,
-    ___x___, KC_LT,   KC_PERC, KC_GT,   KC_QUES, ___x___, ___x___, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  ___x___,
-    ___x___, KC_COLN, KC_AT,   KC_EXLM, KC_SLSH, ___x___, ___x___, KC_BSLS, KC_LCBR, KC_RCBR, KC_HASH, ___x___,
-    _______, _______, _______, TT_ESC,  KC_EQL,  _______, _______, KC_PLUS, KC_SPC,  _______, _______, _______
-  ),
-
-// ............................................................ Navigation Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // |  GUI | Ctrl |  Alt | Shift|      |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |      |      |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTCURSOR] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    OS_GUI,  OS_CTL,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-// ............................................................... Mouse Actions
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Left |  Up  | Right|  Up  |
-  // |-----------------------------------------------------------------------------------|
-  // |      | Btn3 | Btn2 | Btn1 |      |      |      |      | Left | Down | Right| Down |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |      |      |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTMOUSE] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,
-    _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/hieax/config.h b/keyboards/planck/keymaps/hieax/config.h
deleted file mode 100644
index 65845fe3e7d..00000000000
--- a/keyboards/planck/keymaps/hieax/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// tap dance key press termination interval
-#define TAPPING_TERM 250
-
-// smooth mouse motion
-// #define MOUSEKEY_INTERVAL    20
-// #define MOUSEKEY_DELAY       0
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_MAX_SPEED   7
-// #define MOUSEKEY_WHEEL_DELAY 0
-
-// compile time macro string, see functions/hardware planck script (undefine otherwise)
-//#define PRIVATE_STRING
-
-// compile time macro string, must be in quotes
-#define PUBLIC_STRING ":%s/arch=(.*)/arch=('any')\n"
-
-// thumb key tap-shift() double tap: one shot shift (0) off (1) on
-#define DT_SHIFT 1
-
-// number layer 0 position KEYPAD_0, THUMB_0
-#define THUMB_0
-
-// home block shift symbol clustes defined (no overlays required for extended symbols, undefine otherwise)
-#define SHIFT_SYMBOLS
-
-// center column TT assignments (undefine for OSM chords)
-#define CENTER_TT
-#define TAPPING_TOGGLE 1
-
-// home row modifiers
-#define HOME_MODS
-// fix dual function timing
-#define PERMISSIVE_HOLD
-
-// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
-#define DEFAULT
-
-// sync app with window manager keybind hook defined in plover_keybind.h
-#define PLOVER_KEYBIND
-
-#endif
diff --git a/keyboards/planck/keymaps/hieax/hiea.h b/keyboards/planck/keymaps/hieax/hiea.h
deleted file mode 100644
index 38077e8eebe..00000000000
--- a/keyboards/planck/keymaps/hieax/hiea.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .................................................................. BEAKL HIEA
-#ifdef DEFAULT
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   .  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   K  |   ,  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Ins | Left |  Ent | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_X   ,
-    HOME_H,  HOME_I,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_R,  HOME_S,  HOME_W ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_K,    KC_COMM, CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_K), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   ?  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   K  |   /  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | ↑Tab |  f() |  Ins | Left |   _  |  Del | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  S_TAB,   ___fn__, LT_INS,  S_LEFT,  KC_UNDS, SP_DEL,  S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   ?  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   K  |   /  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Tab |   -  |  Ins | Left |  f() | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_TAB,  KC_MINS, LT_INS,  S_LEFT,  ___fn__, SP_BSPC, S_DOWN,  S_UP,    S_RGHT
-  ),
-#ifdef HOME_MODS
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  |  Fn  | Caps |   `  |   [  |   ]  |   ^  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |  f() |   ?  |Cursor| Mouse|   |  |   (  |   )  |   $  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   K  |   /  |  Num | Regex|   \  |   {  |   }  |   #  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Ins | Left |   +  | Space| Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSYMBOL] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, TD_GRV,  KC_LBRC, KC_RBRC, KC_CIRC, S(KC_X),
-    HOME_H,  HOME_I,  HOME_E,  ___fn__, KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_K), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_LCBR, KC_RCBR, KC_HASH, S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, KC_PLUS, SL_SPC,  AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   .  |   *  |   &  |   ~  |  Fn  | Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   <  |   %  |   >  |   ?  |Cursor| Mouse|   C  |  f() |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   @  |   !  |   /  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | ↑Tab |   =  |  Ins | Left |  Ent | Bksp | Down |  Up  | Right|
-  // |                           | ↑Tab |   =  |  Ent | Bksp |                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSYMBOL] = LAYOUT_planck_grid(
-    S(KC_Q), KC_DOT,  KC_ASTR, KC_AMPR, TD_TILD, CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_H), TD_LT,   KC_PERC, TD_GT,   KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), ___fn__, HOME_R,  HOME_S,  HOME_W ,
-    S(KC_J), TD_COLN, KC_AT,   KC_EXLM, KC_SLSH, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  S_TAB,   TD_EQL,  LT_INS,  SP_LEFT, TD_ENT,  LT_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-#endif
-#endif
diff --git a/keyboards/planck/keymaps/hieax/keymap.c b/keyboards/planck/keymaps/hieax/keymap.c
deleted file mode 100644
index 4acd5269162..00000000000
--- a/keyboards/planck/keymaps/hieax/keymap.c
+++ /dev/null
@@ -1,435 +0,0 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-//
-// To flash planck firmware
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   Reset keyboard or press hw reset button on base (hole)
-//
-//   cd qmk_firmware/keyboards/planck
-//   sudo make KEYMAP=sdothum dfu
-//
-//   sudo make clean          (good practice before flashing)
-//   sudo make KEYMAP=sdothum (to compile check)
-//
-// Package requirements (for arch linux)
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   avr-gcc-atmel
-//   avr-libc-atmel
-//   dfu-programmer
-//
-// Notes
-// ▔▔▔▔▔
-//   ** E R G O   W I D E   S P L I T ** Layout
-//
-//   Autocompletion tap dance key pairs (),[],{} are available from the
-//   number/symbol layer, as well as, numerous (un)shift key values
-//
-//   The navigation pad provides a single hand right thumb activated cluster
-//   with left hand modifiers
-//
-//   #define PRIVATE_STRING includes private_string.h, a user defined code
-//   block for the PRIV tap dance e.g. SEND_STRING("secret messape"),
-//   see function private()
-//
-// Modifier clusters
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   The num and sym keys together access the navigation pad layer
-//
-//   ,-----------------------------------------------------------------------------------.
-//   | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-//   `-----------------------------------------------------------------------------------'
-//
-// Hint
-// ▔▔▔▔
-//   For sculpted keycaps such as Cherry or OEM profile, reverse the Alt, Num,
-//   Shift, Shift, Nav, Sym keycaps for more ergonomic thumb orientation and
-//   actuation
-//
-// Code
-// ▔▔▔▔
-//   This source is shamelessly based on the "default" planck layout
-//
-//   #ifdef/#endif block structures are not indented, as syntax highlighting
-//   in vim is sufficient for identification
-//
-//   c++ commenting style is used throughout
-//
-// Change history
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   See http://thedarnedestthing.com/planck%20constant
-//   See http://thedarnedestthing.com/planck%20done
-
-
-
-//                === N O T E ===
-//
-// sudo CPATH=<keymap.c directory>/common make ...
-
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _BASE = 0
- ,_SHIFT
- ,_LSHIFT
- ,_RSHIFT
- ,_LSYMBOL
- ,_RSYMBOL
- ,_PLOVER
- ,_NUMBER
- ,_SYMBOL
- ,_FNCKEY
- ,_MOUSE
- ,_EDIT
- ,_ADJUST
-#ifdef CENTER_TT
- ,_TTNUMBER
- ,_TTREGEX
- ,_TTFNCKEY
- ,_TTCURSOR
- ,_TTMOUSE
-#endif
- ,_END_LAYERS
-};
-
-enum planck_keycodes {
-  BASE = SAFE_RANGE
- ,BASE1
- ,BASE2
- ,PLOVER
- ,SM_CIRC   // pseudo GUI_T(S(KC_6))                      for shifted key-codes, see process_record_user()
- ,SM_DLR    // pseudo SFT_T(S(KC_4))                      for shifted key-codes, see process_record_user()
- ,SM_G      // pseudo MT   (MOD_LALT | MOD_LSFT, S(KC_G)) for shifted key-codes, see process_record_user()
- ,SM_H      // pseudo MT   (MOD_LCTL | MOD_LSFT, S(KC_H)) for shifted key-codes, see process_record_user()
- ,SM_PERC   // pseudo ALT_T(S(KC_5))                      for shifted key-codes, see process_record_user()
- ,SM_W      // pseudo MT   (MOD_LGUI | MOD_LSFT, S(KC_W)) for shifted key-codes, see process_record_user()
- ,SL_LEFT   // pseudo LT   (_MOUSE, S(KC_LEFT))           for shifted key-codes, see process_record_user()
- ,SP_DEL    // pseudo LT   (_MOUSE, KC_DEL)               for shifted key-codes, see process_record_user()
- ,SL_TAB    // pseudo LT   (_FNCKEY, S(KC_TAB))           for shifted key-codes, see process_record_user()
- ,SL_SPC    // pseudo LT   (S(_SYMBOL), KC_SPC)           for home row shifted GUIFN
-#ifdef HOME_MODS
- ,HOME_A    // pseudo SFT_T(KC_A)
- ,HOME_T    // pseudo SFT_T(KC_T)
-#endif
-#ifdef CENTER_TT
- ,TT_ESC
-#endif
-#ifdef STENO_ENABLE
- ,PS_STNA = STN_A
- ,PS_STNO = STN_O
- ,PS_STNE = STN_E
- ,PS_STNU = STN_U
-#else
- ,LT_C    = LT (_NUMBER, KC_C)
- ,LT_V    = LT (_FNCKEY, KC_V)
- ,LT_N    = LT (_EDIT,   KC_N)
- ,LT_M    = LT (_SYMBOL, KC_M)
-#endif
-};
-
-// modifier keys
-#define AT_B    ALT_T(KC_B)
-#define AT_DOWN ALT_T(KC_DOWN)
-#define CT_RGHT CTL_T(KC_RGHT)
-#define GT_C    GUI_T(KC_C)
-#define GT_UP   GUI_T(KC_UP)
-#define MT_E    MT   (MOD_LCTL | MOD_LALT, KC_E)
-#define ST_A    SFT_T(KC_A)
-#ifdef HOME_MODS
-#define HOME_H  GUI_T(KC_H)
-#define HOME_I  CTL_T(KC_I)
-#define HOME_E  ALT_T(KC_E)
-#define HOME_R  ALT_T(KC_R)
-#define HOME_S  CTL_T(KC_S)
-#define HOME_W  GUI_T(KC_W)
-#else
-#define HOME_H  KC_H
-#define HOME_I  KC_I
-#define HOME_E  KC_E
-#define HOME_A  KC_A
-#define HOME_T  KC_T
-#define HOME_R  KC_R
-#define HOME_S  KC_S
-#define HOME_W  KC_W
-#endif
-
-#define S_DOWN  S    (KC_DOWN)
-#define S_LEFT  S    (KC_LEFT)
-#define S_RGHT  S    (KC_RGHT)
-#define S_TAB   S    (KC_TAB)
-#define S_UP    S    (KC_UP)
-
-#include "common/tapdance.h"
-
-// keycodes
-#define ___x___ KC_TRNS
-#define ___fn__ KC_TRNS
-#undef  _______
-#define _______ KC_NO
-
-#define COPY    LCTL(KC_C)
-#define CUT     LCTL(KC_X)
-#define EOT     LCTL(KC_D)
-#define NAK     LCTL(KC_U)
-#define PASTE   LCTL(KC_V)
-#define UNDO    LCTL(KC_Z)
-#define TMCOPY  LALT(LCTL(KC_C))
-#define TMPASTE LALT(LCTL(KC_V))
-#define LT_BSLS LT  (_MOUSE,  KC_BSLS)      // see process_record_user() for extended handling
-#define LT_BSPC LT  (_EDIT,   KC_BSPC)
-#define SP_LEFT LT  (_EDIT,   KC_LEFT)
-#define LT_ESC  LT  (_NUMBER, KC_ESC)
-#define LT_LEFT LT  (_SYMBOL, KC_LEFT)      // see process_record_user() for extended handling
-#define SP_BSPC LT  (_SYMBOL, KC_BSPC)      // see process_record_user() for extended handling
-#define LT_TAB  LT  (_FNCKEY, KC_TAB)
-#define LT_INS  LT  (_FNCKEY, KC_INS)
-#define ADJUST  MO  (_ADJUST)
-#define OS_ALT  OSM (MOD_LALT)
-#define OS_CTL  OSM (MOD_LCTL)
-#define OS_GUI  OSM (MOD_LGUI)
-#define OS_SFT  OSM (MOD_LSFT)
-
-#ifdef CENTER_TT
-#define CNTR_TL TT  (_TTFNCKEY)
-#define CNTR_TR     KC_CAPS
-#define CNTR_HL TT  (_TTCURSOR)
-#define CNTR_HR TT  (_TTMOUSE)
-#define CNTR_BL TT  (_TTNUMBER)
-#define CNTR_BR TT  (_TTREGEX)
-#else
-#define CNTR_TL OSM (MOD_LALT | MOD_LCTL)
-#define CNTR_TR OSM (MOD_LGUI | MOD_LCTL)
-#define CNTR_HL OSM (MOD_LALT | MOD_LSFT)
-#define CNTR_HR OSM (MOD_LGUI | MOD_LSFT)
-#define CNTR_BL TD  (_CAPS)
-#define CNTR_BR OSM (MOD_LSFT | MOD_LCTL)
-#endif
-
-// LT can only reference layers 0-15
-#ifdef THUMB_0
-#define LT_EQL  LT  (_ADJUST, KC_EQL)
-#else
-#define LT_0    LT  (_ADJUST, KC_0)
-#endif
-
-// ........................................................ Default Alpha Layout
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-#include "hiea.h"
-#include "common/steno_layout.h"
-
-// ...................................................... Number / Function Keys
-
-#include "common/number_fkey_layout.h"
-
-// ......................................................... Symbol / Navigation
-
-#include "common/symbol_guifn_layout.h"
-
-// ............................................................... Toggle Layers
-
-#ifdef CENTER_TT
-#include "common/toggle_layout.h"
-#endif
-
-// ......................................................... Short Cuts / Adjust
-
-#include "common/chord_layout.h"
-
-};
-
-// ...................................................................... Sounds
-
-#include "common/sounds.h"
-
-// ........................................................... User Keycode Trap
-
-#include "common/keycode_functions.h"
-
-#define BASE_1  1
-#define BASE_2  2
-#define BASE_12 3
-static uint8_t base_n = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  switch (keycode) {
-    case BASE1:
-      if (record->event.pressed) {
-        base_n = base_n | BASE_1;
-        if (base_n == BASE_12) {
-          base_layer();
-        }
-      }
-      else {
-        base_n = base_n & ~BASE_1;
-      }
-      return false;
-    case BASE2:
-      if (record->event.pressed) {
-        base_n = base_n | BASE_2;
-        if (base_n == BASE_12) {
-          base_layer();
-        }
-      }
-      else {
-        base_n = base_n & ~BASE_2;
-      }
-      return false;
-#ifdef HOME_MODS
-    case HOME_E:
-    case HOME_R:
-      tap_mods(record, KC_LALT);
-      symbol_shift(record, 0);
-      break;
-    case HOME_H:
-    case HOME_W:
-      tap_mods(record, KC_LGUI);
-      symbol_shift(record, 0);
-      break;
-    case HOME_I:
-    case HOME_S:
-      tap_mods(record, KC_LCTL);
-      symbol_shift(record, 0);
-      break;
-    case HOME_A:
-      tap_mods(record, KC_LSFT);
-      symbol_shift(record, KC_A);
-      break;
-    case HOME_T:
-      tap_mods(record, KC_RSFT);
-      symbol_shift(record, KC_T);
-      break;
-#else
-    case AT_DOWN:
-      tap_mods(record, KC_LALT);
-      break;
-    case CT_RGHT:
-      tap_mods(record, KC_LGUI);
-      break;
-    case GT_UP:
-      tap_mods(record, KC_LCTL);
-      break;
-#endif
-    case SL_SPC:
-      lt(record, NOSHIFT, KC_SPC, KC_LSFT, _SYMBOL);
-      break;
-#ifdef CENTER_TT
-    case TT_ESC:
-      clear_tt();                           // exit TT layer
-      return false;
-#endif
-    case LT_ESC:
-#ifdef CENTER_TT
-      if (tt_keycode != 0) {
-        clear_tt();                         // exit TT layer
-        return false;
-      }
-#endif
-      tap_layer(record, _NUMBER);
-      break;
-    case LT_LEFT:
-    case SP_BSPC:
-      tap_layer(record, _SYMBOL);
-      // LT (_SYMBOL, KC_LEFT) left right combination layer
-      thumb_layer(record, RIGHT, 0, 0, _SYMBOL, _LSHIFT);
-      break;
-    case OS_ALT:
-      tap_mods(record, KC_LALT);
-      break;
-    case OS_CTL:
-      tap_mods(record, KC_LCTL);
-      break;
-    case OS_GUI:
-      tap_mods(record, KC_LGUI);
-      break;
-    case SM_CIRC:
-      // GUI_T(S(KC_6))
-      mt_shift(record, KC_LGUI, 0, KC_6);
-      break;
-    case SM_DLR:
-      // SFT_T(S(KC_4))
-      mt_shift(record, KC_LSFT, 0, KC_4);
-      break;
-    case SM_G:
-      // MT(MOD_LALT | MOD_LSFT, S(KC_G))
-      mt_shift(record, KC_LALT, KC_LSFT, KC_G);
-      break;
-    case SM_H:
-      // MT(MOD_LCTL | MOD_LSFT, S(KC_K))
-      mt_shift(record, KC_LCTL, KC_LSFT, KC_H);
-      break;
-    case SM_W:
-      // MT(MOD_LGUI | MOD_LSFT, S(KC_W))
-      mt_shift(record, KC_LGUI, KC_LSFT, KC_W);
-      break;
-    case SM_PERC:
-      // ALT_T(S(KC_5))
-      mt_shift(record, KC_LALT, 0, KC_5);
-      break;
-    case LT_BSLS:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, KC_BSLS) left right combination layer, see #define LT_BSLS
-      thumb_layer(record, LEFT, 0, 0, _MOUSE, _SYMBOL);
-      break;
-    case SL_LEFT:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, S(KC_LEFT)) left right combination layer
-      thumb_layer(record, RIGHT, SHIFT, KC_LEFT, _MOUSE, _LSHIFT);
-      break;
-    case SP_DEL:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, S(KC_LEFT)) left right combination layer
-      thumb_layer(record, RIGHT, NOSHIFT, KC_DEL, _MOUSE, _LSHIFT);
-      break;
-    case SL_TAB:
-      // LT (_FNCKEY, S(KC_TAB)) emulation
-      lt_shift(record, KC_TAB, _FNCKEY);
-      break;
-    case TD_ENT:
-      tap_layer(record, _RSHIFT);
-      // LT (_RSHIFT, KC_ENT) emulation, see tap dance enter
-      break;
-    case TD_SPC:
-      tap_layer(record, _LSHIFT);
-      // LT (_LSHIFT, KC_SPC) left right combination layer, see tap dance TD_SPC
-      thumb_layer(record, LEFT, 0, 0, _LSHIFT, _SYMBOL);
-      break;
-#ifdef CENTER_TT
-    case CNTR_TL:
-    case CNTR_TR:
-    case CNTR_HL:
-    case CNTR_HR:
-    case CNTR_BL:
-    case CNTR_BR:
-      if (tt_keycode != keycode && tt_keycode != 0) {
-        clear_tt();                         // return to base layer first if different TT layer selected
-      }
-      tt_keycode = keycode;
-      break;
-#endif
-// #ifdef STENO_ENABLE
-//     case PS_STNA:
-//       stn_layer(record, STN_A, _NUMBER);
-//       break;
-//     case PS_STNO:
-//       stn_layer(record, STN_O, _FNCKEY);
-//       break;
-//     case PS_STNE:
-//       stn_layer(record, STN_E, _EDIT);
-//       break;
-//     case PS_STNU:
-//       stn_layer(record, STN_U, _SYMBOL);
-//       break;
-// #endif
-    case PLOVER:
-      steno(record);
-      return false;
-  }
-  return true;
-}
-
-#include "common/init.h"
diff --git a/keyboards/planck/keymaps/hieax/readme.md b/keyboards/planck/keymaps/hieax/readme.md
deleted file mode 100644
index 58f73e3b445..00000000000
--- a/keyboards/planck/keymaps/hieax/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# The sdothum extended Default Planck Layout
-
-- Colemak-DH layout layer with shift/tab key overlays
-- Number and symbol/function key layer
-- Hexadecimal keypad layer
-- Navigation keypad layer
-- Dynamic macro layer
-- Autocompletion tap key pairs (),[],{}
-- Normalized enter and esc key position across keyboard layers
-- Extensive use of tap keys
diff --git a/keyboards/planck/keymaps/hieax/rules.mk b/keyboards/planck/keymaps/hieax/rules.mk
deleted file mode 100644
index ea9abc2a80d..00000000000
--- a/keyboards/planck/keymaps/hieax/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Build Options:
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes  # mouse keys(+4700)
-EXTRAKEY_ENABLE  = no   # audio control and System control(+450)
-CONSOLE_ENABLE   = no   # console for debug(+400)
-COMMAND_ENABLE   = no   # commands for debug and configuration
-NKRO_ENABLE      = yes  # nkey rollover
-BACKLIGHT_ENABLE = no   # enable keyboard backlight functionality
-MIDI_ENABLE      = no   # MIDI controls
-AUDIO_ENABLE     = no   # audio output on port C6
-UNICODE_ENABLE   = no   # unicode
-BLUETOOTH_ENABLE = no   # enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no   # enable WS2812 RGB underlight, do not enable this with audio at the same time.
-STENO_ENABLE     = yes	# enable TX Bolt protocol, requires VIRTSER and may not work with mouse keys
-
-# do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no   # breathing sleep LED during USB suspend
-
-TAP_DANCE_ENABLE = yes  # enable double tap completion of (),[],{}
-
diff --git a/keyboards/planck/keymaps/impossible/config.h b/keyboards/planck/keymaps/impossible/config.h
deleted file mode 100644
index 2bebf48a1ca..00000000000
--- a/keyboards/planck/keymaps/impossible/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/impossible/keymap.c b/keyboards/planck/keymaps/impossible/keymap.c
deleted file mode 100644
index 8aa3eb149f0..00000000000
--- a/keyboards/planck/keymaps/impossible/keymap.c
+++ /dev/null
@@ -1,191 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _WORKMAN 0
-#define _FN 1
-#define _QWERTY 2
-#define _QW_FN 3
-#define _PLOVER 4
-#define _ADJ 5
-
-enum planck_keycodes {
-  WORKMAN = SAFE_RANGE,
-  QWERTY,
-  PLOVER
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Workman Alpha-numeric
- * ,-----------------------------------------------------------------------------------------------.
- * |   Q   |   D   |   R   |   W   |   B   |   F   |   U   |   P   |   J   |   7   |   8   |   9   |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |   A   |   S   |   H   |   T   |   G   |   N   |   E   |   O   |   I   |   4   |   5   |   6   |
- * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
- * |   Z   |   X   |   M   |   C   |   V   |   L   |   Y   |   K   |   Up  |   1   |   2   |   3   |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |Alt/Tab|Gui/Esc|   ,   |CTL/Bsp| Fn/Ent|SFT/SPC|   .   |  Left |  Down | Right |   0   |Adj/Ent|
- * `-----------------------------------------------------------------------------------------------'
- */
-
-[_WORKMAN] = LAYOUT_planck_grid(
-  KC_Q,          KC_D,          KC_R,    KC_W,           KC_B,            KC_F,          KC_U,   KC_P,    KC_J,    KC_KP_7, KC_KP_8, KC_KP_9,
-  KC_A,          KC_S,          KC_H,    KC_T,           KC_G,            KC_N,          KC_E,   KC_O,    KC_I,    KC_KP_4, KC_KP_5, KC_KP_6,
-  KC_Z,          KC_X,          KC_M,    KC_C,           KC_V,            KC_L,          KC_Y,   KC_K,    KC_UP,   KC_KP_1, KC_KP_2, KC_KP_3,
-  ALT_T(KC_TAB), GUI_T(KC_ESC), KC_COMM, CTL_T(KC_BSPC), LT(_FN, KC_ENT), SFT_T(KC_SPC), KC_DOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, LT(_ADJ, KC_ENT)
-),
-
-/* FN-key held (Workman)
- * ,-----------------------------------------------------------------------------------------------.
- * |   !   |   @   |   #   |   $   |   %   |   ^   |   &   |   *   |  F12  |   F7  |   F8  |   F9  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |  Tab  |   [   |   ]   |   -   |  Del  |   '   |   (   |   )   |  F11  |   F4  |   F5  |   F6  |
- * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
- * |  Menu |       |       |   =   |   \   |   /   |       |       |  PgUp |   F1  |   F2  |   F3  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |Alt/Tab|  Gui  |   ~   |CTL/Bsp| Fn/Ent|SFT/Spc|   ;   |  Home |  PgDn |  End  |  F10  |Adj/Ent|
- * `-----------------------------------------------------------------------------------------------'
- */
-
-[_FN] = LAYOUT_planck_grid(
-  KC_EXLM, KC_AT,   KC_HASH,  KC_DLR,   KC_PERC,   KC_CIRC, KC_AMPR,   KC_ASTR, KC_F12,  KC_F7,  KC_F8,  KC_F9,
-  KC_TAB,  KC_LBRC, KC_RBRC,  KC_MINUS, KC_DELETE, KC_QUOT, KC_LPRN,   KC_RPRN, KC_F11,  KC_F4,  KC_F5,  KC_F6,
-  KC_MENU, _______, _______,  KC_EQUAL, KC_BSLS,   KC_SLSH, XXXXXXX,   XXXXXXX, KC_PGUP, KC_F1,  KC_F2,  KC_F3,
-  _______, KC_LGUI, KC_GRAVE, _______,  _______,   _______, KC_SCLN,   KC_HOME, KC_PGDN, KC_END, KC_F10, _______
-),
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------------------.
- * |Gui/Esc|   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |   9   |   0   | Bksp  |
- * |-------+-------+-------+-------+-------+---------------+-------+-------+-------+-------+-------|
- * | Ctrl  |   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   |   /   |
- * |-------+-------+-------+-------+-------+---------------+-------+-------+-------+-------+-------|
- * | Shift |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   ;   |   "   |
- * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
- * |Alt/Tab|   Z   |   X   |   C   |   V   | Fn/SPC|   B   |   N   |   M   |   ,   |   .   |Adj/Ent|
- * `-----------------------------------------------------------------------------------------------'
- */
-
-[_QWERTY] = LAYOUT_planck_grid(
-  GUI_T(KC_ESC), KC_1, KC_2, KC_3, KC_4, KC_5,               KC_6, KC_7, KC_8, KC_9,    KC_0,    KC_BSPC,
-  KC_LCTL,       KC_Q, KC_W, KC_E, KC_R, KC_T,               KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_ENT,
-  KC_LSFT,       KC_A, KC_S, KC_D, KC_F, KC_G,               KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,
-  ALT_T(KC_TAB), KC_Z, KC_X, KC_C, KC_V, LT(_QW_FN, KC_SPC), KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  LT(_ADJ, KC_ENT)
-),
-
-/* FN-key held (Qwerty)
- * ,-----------------------------------------------------------------------------------------------.
- * |  Gui  |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |  Ctrl |   ~   |   [   |  PgUp |   ]   |       |       |   -   |   Up  |   =   |       |  F12  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | Shift |  Tab  |  Home |  PgDn |  End  |  Del  |       |  Left |  Down | Right |       |       |
- * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
- * |Alt/Tab|       |       |       |       | Fn/Spc|       |       |       |       |  Menu |Adj/Ent|
- * `-----------------------------------------------------------------------------------------------'
- */
-
-[_QW_FN] = LAYOUT_planck_grid(
-  KC_LGUI, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,
-  _______, KC_GRAVE, KC_LBRC, KC_PGUP, KC_RBRC, XXXXXXX,   XXXXXXX, KC_MINS, KC_UP,   KC_EQUAL, XXXXXXX, KC_F12,
-  _______, KC_TAB,   KC_HOME, KC_PGDN, KC_END,  KC_DELETE, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX,
-  _______, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, _______,   XXXXXXX, _______, _______, _______,  KC_MENU, _______
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------------------.
- * |   S   |   T   |   P   |   H   |   *   |   F   |   P   |   L   |   T   |   D   |       |       |
- * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
- * |   S   |   K   |   W   |   R   |   *   |   R   |   B   |   G   |   S   |   Z   |       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |   #   |   #   |   #   |   #   |       |   #   |   #   |   #   |   #   |   #   |       |       |
- * |-------+-------+-------+-------+-------+---------------+-------+-------+-------+-------+-------|
- * |       |       |   A   |   O   |       |   E   |   U   |       |       |       |       |Adj/Ent|
- * `-----------------------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_Q,    KC_W,    KC_E, KC_R, KC_T,    KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, XXXXXXX, XXXXXXX,
-  KC_A,    KC_S,    KC_D, KC_F, KC_G,    KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, XXXXXXX,
-  KC_1,    KC_1,    KC_1, KC_1, XXXXXXX, KC_1, KC_1, KC_1,    KC_1,    KC_1,    XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LT(_ADJ, KC_ENT)
-),
-
-/* Adjust
- * ,-----------------------------------------------------------------------------------------------.
- * |       |       |       |       |       |       |       |       | Insert| PrtSc | Pause | QK_BOOT |
- * |-------+-------+-------+-------+-------+---------------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       | CapLk |Voice +| Audio |MIDIoff|       |
- * |-------+-------+-------+-------+-------+-------|-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       | ScrLk |Voice -| Music |MIDI on|       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       | Numlk |Workman| Qwerty| Plover|Adj/Ent|
- * `-----------------------------------------------------------------------------------------------'
- */
-
-[_ADJ] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_PSCR, KC_PAUSE, QK_BOOT,
-  _______, _______, _______, _______, _______, _______, _______, KC_CAPS, AU_NEXT, AU_TOGG, MI_OFF,   _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_SCRL, AU_PREV, MU_TOGG, MI_ON,    _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_NUM,  WORKMAN, QWERTY,  PLOVER,   _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_workman[][2]    = SONG(QWERTY_SOUND);
-float tone_qwerty[][2]     = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case WORKMAN:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_workman);
-        #endif
-        persistent_default_layer_set(1UL<<_WORKMAN);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover);
-        #endif
-        if (!eeconfig_is_enabled()) {
-          eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-        persistent_default_layer_set(1UL<<_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/impossible/readme.md b/keyboards/planck/keymaps/impossible/readme.md
deleted file mode 100644
index 02c719197e9..00000000000
--- a/keyboards/planck/keymaps/impossible/readme.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# The Impossible Layout
-
-The Impossible Layout is named such because it manages to fit in both a numpad and an inverted-T arrow cluster into the same layer as the alpha keys.
-
-## Main layout
-
-The Impossible Layout places the middle column of the alphas onto where the punctuation keys were, moving he most used punctuation to be accessed by the thumbs. Because removing the middle columns fits with the Workman layout's philosopy, Workman is used as the basis for the layout. This means the layout should be very easy to learn for Workman users, and reasonable for Colemak users. Other space gains are made by combining keys that are only ever chorded with other non symbol keys (with function-layer alternatives where needed).
-
-### Alpha-numeric layer
-
-|       |       |       |       |       |       |       |       |       |       |       |       |
-|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
-|   Q   |   D   |   R   |   W   |   B   |   F   |   U   |   P   |   J   |   7   |   8   |   9   |
-|   A   |   S   |   H   |   T   |   G   |   N   |   E   |   O   |   I   |   4   |   5   |   6   |
-|   Z   |   X   |   M   |   C   |   V   |   L   |   Y   |   K   |   Up  |   1   |   2   |   3   |
-|Alt/Tab|Gui/Esc|   ,   |CTL/Bsp| Fn/Ent|SFT/SPC|   .   |  Left |  Down | Right |   0   |Adj/Ent|
-
-### Function layer
-
-|       |       |       |       |       |       |       |       |       |       |       |       |
-|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
-|   !   |   @   |   #   |   $   |   %   |   ^   |   &   |   *   |  F12  |   F7  |   F8  |   F9  |
-|  Tab  |   [   |   ]   |   -   |  Del  |   '   |   (   |   )   |  F11  |   F4  |   F5  |   F6  |
-|  Menu |       |       |   =   |   \   |   /   |       |       |  PgUp |   F1  |   F2  |   F3  |
-|Alt/Tab|  Gui  |   ~   |CTL/Bsp| Fn/Ent|SFT/Spc|   ;   |  Home |  PgDn |  End  |  F10  |Adj/Ent|
-
-## Qwerty
-
-The Qwerty layer, mostly intended for gaming use, makes use of the doubled chorded/non-symbolic keys to obtain use of the entire alpha-numeric typing area.
-
-### Qwerty layer
-
-|       |       |       |       |       |       |       |       |       |       |       |       |
-|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
-|Gui/Esc|   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |   9   |   0   | Bksp  |
-| Ctrl  |   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   |   /   |
-| Shift |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   ;   |   "   |
-|Alt/Tab|   Z   |   X   |   C   |   V   | Fn/SPC|   B   |   N   |   M   |   ,   |   .   |Adj/Ent|
-
-### Qwerty Fn Layer
-
-|       |       |       |       |       |       |       |       |       |       |       |       |
-|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
-|  Gui  |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
-|  Ctrl |   ~   |   [   |  PgUp |   ]   |       |       |   -   |   Up  |   =   |       |  F12  |
-| Shift |  Tab  |  Home |  PgDn |  End  |  Del  |       |  Left |  Down | Right |       |       |
-|Alt/Tab|       |       |       |       | Fn/Spc|       |       |       |       |  Menu |Adj/Ent|
-
-## Stenography
-
-The Steno/Plover layer moves the number row below the regular keys, providing a much more comfortable placement for the thumb keys. Using this layout will require a slightly different dictionary to account for different keys being adjacent to the number row.
-
-### Steno Layer
-
-|       |       |       |       |       |       |       |       |       |       |       |       |
-|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
-|   S   |   T   |   P   |   H   |   *   |   F   |   P   |   L   |   T   |   D   |       |       |
-|   S   |   K   |   W   |   R   |   *   |   R   |   B   |   G   |   S   |   Z   |       |       |
-|   #   |   #   |   #   |   #   |       |   #   |   #   |   #   |   #   |   #   |       |       |
-|       |       |   A   |   O   |       |   E   |   U   |       |       |       |       |Adj/Ent|
-
-## Adjustments and Options
-
-In order to switch between layouts and change other keyboard settings, an adjustment layer is accessible from the same position over any layout.
-
-### Adjustment Layer
-
-|       |       |       |       |       |       |       |       |       |       |       |       |
-|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
-|       |       |       |       |       |       |       |       | Insert| PrtSc | Pause | RESET |
-|       |       |       |       |       |       |       | CapLk |Voice +| Audio |MIDIoff|       |
-|       |       |       |       |       |       |       | ScrLk |Voice -| Music |MIDI on|       |
-|       |       |       |       |       |       |       | Numlk |Workman| Qwerty| Plover|Adj/Ent|
diff --git a/keyboards/planck/keymaps/impossible/rules.mk b/keyboards/planck/keymaps/impossible/rules.mk
deleted file mode 100644
index 10de3bfc035..00000000000
--- a/keyboards/planck/keymaps/impossible/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/inkwell/config.h b/keyboards/planck/keymaps/inkwell/config.h
deleted file mode 100644
index 0396720dff5..00000000000
--- a/keyboards/planck/keymaps/inkwell/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2021 Kevin Hartley
-  *
-  * 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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 10
-#define MOUSEKEY_MAX_SPEED 12
diff --git a/keyboards/planck/keymaps/inkwell/keymap.c b/keyboards/planck/keymaps/inkwell/keymap.c
deleted file mode 100644
index 9ff91f84c19..00000000000
--- a/keyboards/planck/keymaps/inkwell/keymap.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ECDR | Ctrl | Alt  | GUI  |Space |Lower |Raise |Space | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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,
-    RSFT_T(KC_MPLY),  KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-),
-
-/* Lower
- *                                           v-------NUM PAD------v
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   !  |   @  |   #  |   *  |   /  |   7  |   8  |   9  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |   $  |   %  |   ^  |   +  |   -  |   4  |   5  |   6  |   [  |   ]  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Shift |   &  |   ?  |   :  |   ~  |   .  |   1  |   2  |   3  |   <  |   >  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ECDR | Ctrl | Alt  | GUI  |Space |Lower |Raise |   0  | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_GRV,  KC_EXLM, KC_AT,    KC_HASH,  KC_ASTR,  KC_PSLS, KC_7,   KC_8,  KC_9,  KC_LPRN,  KC_RPRN,  KC_BSPC,
-    KC_ESC,  KC_DLR,  KC_PERC,  KC_CIRC,  KC_PLUS,  KC_MINS, KC_4,   KC_5,  KC_6,  KC_LBRC,  KC_RBRC,  KC_PEQL,
-    KC_LSFT, KC_AMPR, KC_QUES,  KC_COLN,  KC_TILD,  KC_DOT,  KC_1,   KC_2,  KC_3,  KC_LABK,  KC_RABK,  KC_ENT,
-    RSFT_T(KC_MPLY),  KC_LCTL,  KC_LALT,  KC_LGUI,  KC_SPC,  LOWER,  RAISE, KC_0,  KC_LEFT,  KC_DOWN,  KC_UP,  KC_RGHT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |SLEEP |  BR- |  BR+ |  <<  | PLAY |  >>  | MUTE | VOL- | VOL+ |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   "  |   \  |   [  |   ]  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Shift |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   ?  |   :  |   <  |   >  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ECDR | Ctrl | Alt  | GUI  |Space |Lower |Raise |Space | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_SLEP, KC_BRID, KC_BRIU, KC_MPRV,  KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_LPRN, KC_RPRN,  KC_BSPC,
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_DQT,  KC_BSLS,   KC_LBRC, KC_RBRC,  KC_PEQL,
-    KC_LSFT, KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_QUES, KC_COLN,   KC_LABK, KC_RABK,  KC_ENT,
-    RSFT_T(KC_MPLY),  KC_LCTL, KC_LALT,  KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_SPC,    KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT
-),
-
-/* Adjust (Lower + Raise)
- *                                                  v--------MOUSE CONTROL------v
- * ,-----------------------------------------------------------------------------------.
- * |Reset |      |      |      |      |      |      |MSE-1 |MSE-2 |MSE-S0|MSE-S1| Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | CALC | MAIL | MDIA |Debug |      |      |MSE-L |MSE-D |MSE-U |MSE-R |RGB-TG|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Shift |      |      |      |      |      |      |      |      |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ECDR | Ctrl | Alt  | GUI  |Space |Lower |Raise |Space | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    QK_BOOT, _______,  _______,  _______,  _______, _______, _______, KC_BTN1, KC_MS_BTN2, KC_ACL1, KC_ACL2,  KC_BSPC ,
-    _______, KC_CALC,  KC_MAIL,  KC_MSEL,  DB_TOGG, _______, _______, KC_MS_L, KC_MS_D,    KC_MS_U, KC_MS_R,  RGB_TOG,
-    KC_LSFT, _______,  _______,  _______,  _______, _______, _______, _______, _______,    _______, _______,  KC_ENT,
-    RSFT_T(KC_MPLY),   KC_LCTL,  KC_LALT,  KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_SPC,     KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (IS_LAYER_ON(_RAISE)) {
-        if (get_mods() & MOD_BIT(KC_RSFT)) {
-            // ZOOM
-            // Store which mods are held
-            uint8_t mod_state = get_mods();
-            // Ignore all shift keys
-            del_mods(MOD_MASK_SHIFT);
-            if (clockwise) {
-                tap_code16(LGUI(KC_PPLS));
-            } else {
-                tap_code16(LGUI(KC_PMNS));
-            }
-            // Add back shift keys
-            set_mods(mod_state);
-        } else if (get_mods() & MOD_BIT(KC_LSFT)) {
-            // SCROLL X
-            uint8_t mod_state = get_mods();
-            del_mods(MOD_MASK_SHIFT);
-            if (clockwise) {
-                tap_code16(KC_WH_L);
-            } else {
-                tap_code16(KC_WH_R);
-            }
-            set_mods(mod_state);
-        } else {
-            // SCROLL Y
-            if (clockwise) {
-                tap_code(KC_WH_U);
-            } else {
-                tap_code(KC_WH_D);
-            }
-        }
-    } else {
-        if (get_mods() & MOD_BIT(KC_RSFT)) {
-            // ZOOM
-            uint8_t mod_state = get_mods();
-            del_mods(MOD_MASK_SHIFT);
-            if (clockwise) {
-                tap_code16(LGUI(KC_PPLS));
-            } else {
-                tap_code16(LGUI(KC_PMNS));
-            }
-            set_mods(mod_state);
-        } else if (get_mods() & MOD_BIT(KC_LSFT)) {
-          // BRIGHTNESS
-          uint8_t mod_state = get_mods();
-          del_mods(MOD_MASK_SHIFT);
-          if (clockwise) {
-            tap_code16(KC_PAUSE);
-          } else {
-            tap_code16(KC_SCROLL_LOCK);
-          }
-          set_mods(mod_state);
-      } else {
-          // VOLUME
-          if (clockwise) {
-            tap_code(KC_VOLU);
-          } else {
-            tap_code(KC_VOLD);
-          }
-      }
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/inkwell/readme.md b/keyboards/planck/keymaps/inkwell/readme.md
deleted file mode 100644
index 8a158783c6e..00000000000
--- a/keyboards/planck/keymaps/inkwell/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# The Inkwell Planck Layout
-
-*/
-Plank keymap with Base, Lower, Raise, and Adjust layers, and 1 encoder.
-
-Features:
-- Number Pad
-- Symbol Pad
-- Function Pad
-- Programming utilities: ()[]{}<>
-- Mouse Control
-- Encoder:
-  - Volume (default turn)
-  - Brightness (shift+turn)
-  - Scroll Y(RSE+turn)
-  - Scroll X (RSE+shift+turn)
-  - Zoom (push+turn)
-  - Play/Pause (double click)
-/*
diff --git a/keyboards/planck/keymaps/inkwell/rules.mk b/keyboards/planck/keymaps/inkwell/rules.mk
deleted file mode 100644
index afd8d7a8c6c..00000000000
--- a/keyboards/planck/keymaps/inkwell/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-ENCODER_ENABLE = yes
-EXTRAKEY_ENABLE = yes
diff --git a/keyboards/planck/keymaps/janat-t/config.h b/keyboards/planck/keymaps/janat-t/config.h
deleted file mode 100644
index 5d7616f7ca3..00000000000
--- a/keyboards/planck/keymaps/janat-t/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2023 Taerakul Janat
- *
- * 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 DEFAULT_LAYER_SONGS \
-        { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(QWERTY_SOUND) }
-#endif
-
-#define MIDI_BASIC
-
-// Configure the global tapping term (default: 200ms)
-#define TAPPING_TERM 180
-
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define PERMISSIVE_HOLD
-
-#ifndef MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL 10
-#endif
-#ifndef MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_MAX_SPEED 3
-#endif
-#ifndef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX 100
-#endif
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
-
-#define TRI_LAYER_LOWER_LAYER 3
-#define TRI_LAYER_UPPER_LAYER 4
-#define TRI_LAYER_ADJUST_LAYER 7
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/janat-t/keymap.c b/keyboards/planck/keymaps/janat-t/keymap.c
deleted file mode 100644
index 27166091d26..00000000000
--- a/keyboards/planck/keymaps/janat-t/keymap.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* Copyright 2023 Taerakul Janat
- *
- * 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 AUDIO_ENABLE
-#    include "muse.h"
-#endif
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _NOMOD,
-  _LOWER,
-  _RAISE,
-  _NAV,
-  _MOUSE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  NOMOD
-};
-
-#define MOU_Z LT(_MOUSE, KC_Z)
-#define MOU_SCLN LT(_MOUSE, KC_SCLN)
-#define NAV_SLSH LT(_NAV, KC_SLSH)
-#define NAV_Z LT(_NAV, KC_Z)
-
-// Left-hand home row mods QWERTY
-#define CTL_A LCTL_T(KC_A)
-#define ALT_S LALT_T(KC_S)
-#define GUI_D LGUI_T(KC_D)
-#define SFT_F LSFT_T(KC_F)
-
-// Right-hand home row mods QWERTY
-#define SFT_J RSFT_T(KC_J)
-#define GUI_K RGUI_T(KC_K)
-#define ALT_L LALT_T(KC_L)
-#define CTL_SCLN RCTL_T(KC_SCLN)
-
-// Left-hand home row mods COLEMAK
-#define CTL_A LCTL_T(KC_A)
-#define ALT_R LALT_T(KC_R)
-#define GUI_S LGUI_T(KC_S)
-#define SHFT_T LSFT_T(KC_T)
-
-// Right-hand home row mods COLEMAK
-#define SFT_N RSFT_T(KC_N)
-#define GUI_E RGUI_T(KC_E)
-#define ALT_I LALT_T(KC_I)
-#define CTL_O RCTL_T(KC_O)
-
-#define HYPER MEH(KC_LGUI)
-
-#define CT_ESC CTL_T(KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  BS  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ESC  |Ctl-A |Alt-S |GUI-D |Shft-F|   G  |   H  |Shft-J|GUI-K |Alt-L |Ctl-; |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  CW  |MOU-Z |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |NAV-/ |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | HYPER| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    CT_ESC,  CTL_A,   ALT_S,   GUI_D,   SFT_F,   KC_G,    KC_H,    SFT_J,   GUI_K,   ALT_L,   CTL_SCLN,KC_QUOT,
-    CW_TOGG, MOU_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  NAV_SLSH,KC_ENT,
-    HYPER,   KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR,   KC_SPC,  KC_SPC,  TL_UPPR,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   B  |   J  |   L  |   U  |   Y  |   ;  |  BS  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ESC  |Ctl-A |Alt-R |GUI-S |Shft-T|   G  |   M  |Shft-N|GUI-E |Alt-I |Ctl-O |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  CW  |MOU-Z |   X  |   C  |   D  |   V  |   K  |   H  |   ,  |   .  |NAV-/ |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | HYPER| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    CT_ESC,  CTL_A,   ALT_R,   GUI_S,   SHFT_T,   KC_G,    KC_M,    SFT_N,   GUI_E,   ALT_I,   CTL_O,   KC_QUOT,
-    CW_TOGG, MOU_Z,   KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM, KC_DOT,  NAV_SLSH,KC_ENT,
-    HYPER,   KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR,   KC_SPC,  KC_SPC,  TL_UPPR,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-/* Qwerty without home row mod
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  BS  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | HYPER| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_NOMOD] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    CT_ESC,  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,
-    HYPER,   KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR,   KC_SPC,  KC_SPC,  TL_UPPR,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  BS  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  | F13  | F14  | F15  | F16  | F17  | F18  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | F19  | F20  | F21  | F22  | F23  | F24  |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |Adjust| Prev | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    KC_DEL,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPRV,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  BS  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  | F10  | F11  | F12  |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Adjust|             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Nav
- * /-----------------------------------------------------------------------------------\
- * |      | Home | PgUp | PgDn | End  |      |  T1  |  T←  |  T→  |  T9  |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Ctrl | Alt  | GUI  |Shift |      |  ←   |  ↓   |  ↑   |  →   | Del  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |[Nav] |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |    Shift    |      |      |      |      |      |
- * \-----------------------------------------------------------------------------------/
- */
-[_NAV] = LAYOUT_planck_grid(
-    _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  _______, G(KC_1), SCMD(KC_LBRC), SCMD(KC_RBRC), G(KC_9), _______, _______,
-    _______, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DEL,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, KC_LSFT, KC_LSFT, _______, _______, _______, _______, _______
-),
-
-/* Mouse
- * /-----------------------------------------------------------------------------------\
- * |      |      |  S↓  |  M↑  |  S↑  |      |  S←  |  S↓  |  S↑  |  S→  |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |  M←  |  M↓  |  M→  |      |  M←  |  M↓  |  M↑  |  M→  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |[Mou] |      |      |      |  M3  |  M3  |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |  M2  |  LeftClick  |  M2  |      |      |      |      |
- * \-----------------------------------------------------------------------------------/
- */
-[_MOUSE] = LAYOUT_planck_grid(
-    _______, _______, KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, _______, _______,
-    _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
-    _______, _______, _______, _______, _______, KC_BTN3, KC_BTN3, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * | PWR  | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|NoMod |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    KC_PWR,  QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, NOMOD,   _______,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case NOMOD:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_NOMOD);
-      }
-      return false;
-      break;
-  
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
diff --git a/keyboards/planck/keymaps/janat-t/readme.md b/keyboards/planck/keymaps/janat-t/readme.md
deleted file mode 100644
index 159558d2351..00000000000
--- a/keyboards/planck/keymaps/janat-t/readme.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# Janat's Planck Layout
-- MIT Layout
-- QWERTY and Colemak-DH with [Home Row Mods](https://precondition.github.io/home-row-mods)
-- QWERTY w/o mods for muggles
-- Lower + Uper + J/K/L: QWERTY/COLEMAK/NOMOD
-- Left Shift: [Caps Word](https://docs.qmk.fm/#/feature_caps_word)
-- Hold /: [Navigation Layer](#6-navigation-layer)
-- Hold Z: [Mouse Layer](#7-mouse-layer)
-
-## 1. QWERTY Layer - Qwerty with Home Row Mods
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  BS  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| ESC  |Ctl-A |Alt-S |GUI-D |Shft-F|   G  |   H  |Shft-J|GUI-K |Alt-L |Ctl-; |  "   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|  CW  |MOU-Z |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |NAV-/ |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| HYPER| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## 2. COLEMAK Layer - Colemak-DH with Home Row Mods
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   F  |   P  |   B  |   J  |   L  |   U  |   Y  |   ;  |  BS  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| ESC  |Ctl-A |Alt-R |GUI-S |Shft-T|   G  |   M  |Shft-N|GUI-E |Alt-I |Ctl-O |  "   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|  CW  |MOU-Z |   X  |   C  |   D  |   V  |   K  |   H  |   ,  |   .  |NAV-/ |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| HYPER| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## 3. NOMOD Layer - QWERTY without Home Row Mods
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  BS  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| HYPER| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## 4. Lower Layer
-```
-,-----------------------------------------------------------------------------------.
-|   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  BS  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Del  | F13  | F14  | F15  | F16  | F17  | F18  |   _  |   +  |   {  |   }  |  |   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | F19  | F20  | F21  | F22  | F23  | F24  |ISO ~ |ISO | | Home | End  |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |Adjust| Prev | Vol- | Vol+ | Play |
-`-----------------------------------------------------------------------------------'
-```
-
-## 5. Raise Layer
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  BS  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |  F7  |  F8  |  F9  | F10  | F11  | F12  |ISO # |ISO / |Pg Up |Pg Dn |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |Adjust|             |      | Next | Vol- | Vol+ | Play |
-`-----------------------------------------------------------------------------------'
-```
-## 6. Navigation Layer
-```
-/-----------------------------------------------------------------------------------\
-|      | Home | PgUp | PgDn | End  |      |  T1  |  T←  |  T→  |  T9  |      |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      | Ctrl | Alt  | GUI  |Shift |      |  ←   |  ↓   |  ↑   |  →   | Del  |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |[Nav] |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |      |    Shift    |      |      |      |      |      |
-\-----------------------------------------------------------------------------------/
-```
-
-## 7. Mouse Layer
-```
-/-----------------------------------------------------------------------------------\
-|      |      |  S↓  |  M↑  |  S↑  |      |  S←  |  S↓  |  S↑  |  S→  |      |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |  M←  |  M↓  |  M→  |      |  M←  |  M↓  |  M↑  |  M→  |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |[Mou] |      |      |      |  M3  |  M3  |      |      |      |      |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |  M2  |  LeftClick  |  M2  |      |      |      |      |
-\-----------------------------------------------------------------------------------/
-```
-
-## 8. Adjust Layer (Lower + Raise)
-```
-                     v------------------------RGB CONTROL--------------------v
-,-----------------------------------------------------------------------------------.
-| PWR  | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|NoMod |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/janat-t/rules.mk b/keyboards/planck/keymaps/janat-t/rules.mk
deleted file mode 100644
index b0ed6ad9227..00000000000
--- a/keyboards/planck/keymaps/janat-t/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-ifeq ($(strip $(AUDIO_ENABLE)), yes)
-    SRC += muse.c
-endif
-
-MIDI_ENABLE = yes
-CAPS_WORD_ENABLE = yes
-TRI_LAYER_ENABLE = yes
diff --git a/keyboards/planck/keymaps/jasperla/config.h b/keyboards/planck/keymaps/jasperla/config.h
deleted file mode 100644
index dc2a7369b4d..00000000000
--- a/keyboards/planck/keymaps/jasperla/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-#endif
-
-/*
- * MIDI options
- */
-#define MIDI_BASIC
diff --git a/keyboards/planck/keymaps/jasperla/keymap.c b/keyboards/planck/keymaps/jasperla/keymap.c
deleted file mode 100644
index 06f43b74108..00000000000
--- a/keyboards/planck/keymaps/jasperla/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _POINTER,
-  _ADJUST
-};
-
-#define QWERTY 0
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define PT    MO(_POINTER)
-
-/* ALT+F12 is mapped (in software) to lock the user's display */
-#define LOCK LALT(KC_F12)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      | LGUI | Alt  |Lower | SPC  | Enter|Raise |Point.|      | LOCK | Ctrl |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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_LCTL, _______, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   PT,      _______, LOCK,    KC_RCTL
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | INS  |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_INS,  KC_NUBS, KC_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Pointers
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      | Up   |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | Left | Down | Right|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_POINTER] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, PT,      _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, _______, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/planck/keymaps/jasperla/readme.md b/keyboards/planck/keymaps/jasperla/readme.md
deleted file mode 100644
index 381667c73a3..00000000000
--- a/keyboards/planck/keymaps/jasperla/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# jasperla's keymap for Planck
-
-Slightly adjusted from the default keymap:
-- map the arrow keys to IJKL on a separate "pointers" layer
-- return key is next to the space key, and an RSHIFT is mapped
-  to where return used to be
-- removed the dvorak, colemak and plover layers
diff --git a/keyboards/planck/keymaps/jasperla/rules.mk b/keyboards/planck/keymaps/jasperla/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/jasperla/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/jcorrado/keymap.c b/keyboards/planck/keymaps/jcorrado/keymap.c
deleted file mode 100644
index 35ca76d5176..00000000000
--- a/keyboards/planck/keymaps/jcorrado/keymap.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- * Copyright 2018 Jereme Corrado
- *
- * 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 {
-  _QWERTY = 0,
-  _NUM,
-  _SYM_L,
-  _SYM_R
-};
-
-#define LMOD_0 LT(_SYM_L, KC_TAB)  /* Tab, hold: Sym layer */
-#define LMOD_1 LT(_NUM, KC_ESC)    /* Esc, hold: Num layer */
-#define LMOD_2 LSFT_T(KC_CAPS)     /* Caps Lock, hold: Left Shift */
-
-#define RMOD_0 LT(_SYM_R, KC_BSPC) /* Backspace, hold: Sym layer */
-#define RMOD_1 LT(_NUM, KC_QUOT)   /* Quote, hold: Nu layer */
-#define RMOD_2 RSFT_T(KC_ENT)      /* Enter, hold: Right Shift */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Tab/   | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | BacSp/ |
- * | Sym    |        |        |        |        |        |        |        |        |        |        | Sym    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Esc/   | A      | S      | D      | F      | G      | H      | J      | K      | L      | :      | "      |
- * | Num    |        |        |        |        |        |        |        |        |        | ;      | '/Num  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | CapLk/ | Z      | X      | C      | V      | B      | N      | M      | <      | >      | ?      | Shift/ |
- * | Shift  |        |        |        |        |        |        |        | ,      | .      | /      | Enter  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Toggle | ~      | {pipe} | Alt    | Ctrl   | Space  | Space  | Ctrl   | Alt    | {      | }      |        |
- * | Num    | `      | \      |        |        |        |        |        |        | [      | ]      |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- */
-
-[_QWERTY] = LAYOUT_planck_grid(
-  LMOD_0,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    RMOD_0,
-  LMOD_1,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, RMOD_1,
-  LMOD_2,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RMOD_2,
-  _______, KC_GRV,  KC_BSLS, KC_LALT, KC_LCTL, KC_SPC,  KC_SPC,  KC_RCTL, KC_RALT, KC_LBRC, KC_RBRC, _______
-),
-
-
-/*
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | =      |      1 |      2 |      3 |      4 |      5 | 6      | 7      | 8      | 9      |      0 | -      |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | Left   | Down   | Up     | Right  |        |        |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | Home   | PgDown | PgUp   | End    |        |        |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- */
-
-[_NUM] = LAYOUT_planck_grid(
-  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-
-/*
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | +      | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      | _      |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     | F6     |        |        |        |        |        |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |        |        |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- */
-
-[_SYM_L] = LAYOUT_planck_grid(
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, _______, _______, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_SYM_R] = LAYOUT_planck_grid(
-  KC_PLUS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, 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/planck/keymaps/jcorrado/readme.md b/keyboards/planck/keymaps/jcorrado/readme.md
deleted file mode 100644
index 3a600dea168..00000000000
--- a/keyboards/planck/keymaps/jcorrado/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# jcorrado Planck keymap
-
-A keymap for the Planck modeled after the way I remap my Kinesis
-Advantage keyboards.
-
-The layout is designed to minimize awkward contortions: all modifier and
-layer-activation combinations can be performed with either hand's thumb
-and pinky.  This leaves the other hand free to complete commands
-comfortably.
diff --git a/keyboards/planck/keymaps/jeremy-dev/keymap.c b/keyboards/planck/keymaps/jeremy-dev/keymap.c
deleted file mode 100644
index 787bdd23c1b..00000000000
--- a/keyboards/planck/keymaps/jeremy-dev/keymap.c
+++ /dev/null
@@ -1,177 +0,0 @@
-// This is the personal keymap of Jeremy Cowgar (@jcowgar). It is written for the programmer.
-
-// Configuration options
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-enum my_layers {
-  ALPH = 0,
-  NUMS,
-  CURS,
-  SYMB,
-  FKEY
-};
-
-// Each macro gets a name for readability.
-enum my_keycodes {
-  MY_ABVE = SAFE_RANGE,
-  MY_BELW,
-  MY_TERM,
-  MY_DEQL, // /=
-  MY_MEQL, // *=
-  MY_SEQL, // -=
-  MY_PEQL, // +=
-  MY_NEQL, // !=
-  MY_LTGT, // <>
-  MY_DPIP, // ||
-  MY_DAMP, // &&
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [ALPH] = LAYOUT_planck_grid(
-    KC_Q,          KC_W,      KC_E,      KC_R,      KC_T,    KC_LBRC,        KC_RBRC,        KC_Y,    KC_U,      KC_I,      KC_O,      KC_P,
-    KC_A,          KC_S,      KC_D,      KC_F,      KC_G,    KC_LPRN,        KC_RPRN,        KC_H,    KC_J,      KC_K,      KC_L,      KC_SCLN,
-    SFT_T(KC_Z),   KC_X,      KC_C,      KC_V,      KC_B,    KC_LCBR,        KC_RCBR,        KC_N,    KC_M,      KC_COMM,   KC_DOT,    SFT_T(KC_SLSH),
-    CTL_T(KC_TAB), OSL(FKEY), OSL(NUMS), OSL(SYMB), KC_SPC,  ALT_T(KC_BSPC), GUI_T(KC_DEL),  KC_ENT,  OSL(SYMB), OSL(CURS), TG(CURS),  CTL_T(KC_ESC)
-  ),
-  [NUMS] = LAYOUT_planck_grid(
-    KC_NO,         KC_NO,     KC_NO,     KC_NO,     KC_NO,   KC_TRNS,        KC_TRNS,        KC_COMM, KC_7,      KC_8,      KC_9,      KC_SLSH,
-    KC_LSFT,       KC_LGUI,   KC_LALT,   KC_LCTL,   KC_NO,   KC_TRNS,        KC_TRNS,        KC_LPRN, KC_4,      KC_5,      KC_6,      KC_ASTR,
-    KC_NO,         KC_NO,     KC_NO,     KC_NO,     KC_NO,   KC_TRNS,        KC_TRNS,        KC_RPRN, KC_1,      KC_2,      KC_3,      KC_MINS,
-    KC_NO,         KC_NO,     KC_TRNS,   TG(NUMS),  KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS, KC_0,      KC_DOT,    KC_EQL,    KC_PLUS
-  ),
-  [CURS] = LAYOUT_planck_grid(
-    KC_MPLY,       KC_BSPC,   KC_UP,     KC_DEL,    KC_PGUP, KC_TRNS,        KC_TRNS,        KC_NO,   KC_NO,     KC_NO,     KC_NO,     KC_NO,
-    KC_VOLU,       KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_PGDN, KC_TRNS,        KC_TRNS,        KC_NO,   KC_LCTL,   KC_LALT,   KC_LGUI,   KC_LSFT,
-    KC_VOLD,       KC_NO,     MY_ABVE,   MY_TERM,   KC_NO,   KC_TRNS,        KC_TRNS,        KC_NO,   KC_NO,     KC_NO,     KC_NO,     KC_LSFT,
-    KC_MUTE,       KC_NO,     MY_BELW,   KC_NO,     KC_TRNS, KC_TRNS,        KC_TRNS,        KC_TRNS, KC_NO,     KC_TRNS,   KC_TRNS,   KC_NO
-  ),
-  [SYMB] = LAYOUT_planck_grid(
-    MY_DEQL,       MY_MEQL,   MY_SEQL,   MY_PEQL,   MY_NEQL, KC_NO,          KC_NO,          MY_LTGT, KC_LABK,   KC_RABK,   KC_COLN,   KC_DLR,
-    KC_SLSH,       KC_ASTR,   KC_MINS,   KC_PLUS,   KC_EQL,  KC_NO,          KC_PIPE,        MY_DPIP, KC_GRV,    KC_QUOT,   KC_DQUO,   KC_HASH,
-    KC_BSLS,       KC_CIRC,   KC_PERC,   KC_UNDS,   KC_NO,   KC_NO,          KC_AMPR,        MY_DAMP, KC_TILD,   KC_AT,     KC_EXLM,   KC_QUES,
-    KC_NO,         KC_NO,     KC_NO,     KC_TRNS,   KC_NO,   KC_TRNS,        KC_TRNS,        KC_TRNS, KC_TRNS,   KC_NO,     KC_NO,     KC_NO
-  ),
-  [FKEY] = LAYOUT_planck_grid(
-    KC_NO,         KC_NO,     KC_NO,     KC_NO,     KC_NO,   KC_NO,          KC_NO,          KC_NO,   KC_F9,     KC_F10,    KC_F11,    KC_F12,
-    KC_LSFT,       KC_LGUI,   KC_LALT,   KC_LCTL,   KC_NO,   KC_NO,          KC_NO,          KC_NO,   KC_F5,     KC_F6,     KC_F7,     KC_F8,
-    KC_NO,         KC_NO,     KC_NO,     KC_NO,     KC_NO,   KC_NO,          KC_NO,          KC_NO,   KC_F1,     KC_F2,     KC_F3,     KC_F4,
-    KC_NO,         KC_TRNS,   KC_NO,     KC_NO,     KC_NO,   KC_NO,          KC_NO,          KC_NO,   KC_NO,     KC_NO,     KC_NO,     KC_NO
-  )
-};
-
-void press_key(uint16_t key) {
-  register_code(key);
-  unregister_code(key);
-}
-
-void press_two_keys(uint16_t key1, uint16_t key2) {
-  register_code(key1);
-  register_code(key2);
-  unregister_code(key2);
-  unregister_code(key1);
-}
-
-void press_three_keys(uint16_t key1, uint16_t key2, uint16_t key3) {
-  register_code(key1);
-  register_code(key2);
-  register_code(key3);
-  unregister_code(key3);
-  unregister_code(key2);
-  unregister_code(key1);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case MY_BELW:
-      if (record->event.pressed) {
-        press_two_keys(KC_LGUI, KC_RGHT);
-        press_key(KC_ENT);
-      }
-
-      return false;
-
-    case MY_ABVE:
-      if (record->event.pressed) {
-        press_two_keys(KC_LGUI, KC_LEFT);
-        press_key(KC_ENT);
-        press_key(KC_UP);
-      }
-
-      return false;
-
-    case MY_TERM:
-      if (record->event.pressed) {
-        press_three_keys(KC_LGUI, KC_LSFT, KC_ENT);
-      }
-
-      return false;
-
-    case MY_DEQL: // /=
-      if (record->event.pressed) {
-        press_key(KC_SLSH);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_MEQL: // *=
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_ASTR);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_SEQL: // -=
-      if (record->event.pressed) {
-        press_key(KC_MINS);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_PEQL: // +=
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_PLUS);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_NEQL: // !=
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_EXLM);
-        press_key(KC_EQL);
-      }
-
-      return false;
-
-    case MY_LTGT: // <>
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_LABK);
-        press_two_keys(KC_LSFT, KC_RABK);
-      }
-
-      return false;
-
-    case MY_DPIP: // ||
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_PIPE);
-        press_two_keys(KC_LSFT, KC_PIPE);
-      }
-
-      return false;
-
-    case MY_DAMP: // &&
-      if (record->event.pressed) {
-        press_two_keys(KC_LSFT, KC_AMPR);
-        press_two_keys(KC_LSFT, KC_AMPR);
-      }
-
-      return false;
-  }
-
-  return true;
-}
diff --git a/keyboards/planck/keymaps/jeremy-dev/readme.md b/keyboards/planck/keymaps/jeremy-dev/readme.md
deleted file mode 100644
index b6a402d698c..00000000000
--- a/keyboards/planck/keymaps/jeremy-dev/readme.md
+++ /dev/null
@@ -1,85 +0,0 @@
-Jeremy Cowgar's Planck Keymap
-=============================
-
-I am a programmer by trade and suffer from the beginning stages of RSI. As a programmer, I use letters, symbols and cursor navigation most often. To prevent strange finger gymnastics, I wrote a script to rank which non-letter characters occurred in my primary source projects most often and then placed these characters in the easiest to reach locations, within reason and for me. I made heavy use of momentary layer toggling.
-
-Layers
-------
-
-The key mapping is made up of 5 layers: Letters, Symbols, Navigation, Numbers, and Function Keys.
-
-The layout can be viewed visually at:
-
-http://www.keyboard-layout-editor.com/#/gists/319474e5e2d199e583371ed1d2aec316
-
-* Purple buttons are dual function keys.
-* Green buttons are layer momentary toggle keys.
-* Red buttons are layer persistent toggle keys.
-
-The keys have multiple symbols:
-
-* Upper left: standard layer, the letter layer
-* Upper right: function layer
-* Lower left: navigation layer
-* Lower right: symbol layer
-
-The symbols in the layout editor are not entirely clear.
-
-The Z and ? keys double as shift keys. Hold for a shift, tap for a Z or ?
-
-The bottom row from left to right:
-
-* Tab when pressed, Control when held. It also is the volume mute key when in the "Navigation" layer
-* Function layer momentary toggle
-* Number layer momentary toggle
-* Symbol layer momentary toggle. When in the "Number" layer, this key also makes the "Number" layer sticky for using the 10 key for quite a bit of entry
-* Space
-* Backspace when tapped, Option when held
-* Delete when tapped, Command when held
-* Return
-* Symbol layer momentary toggle. When in the "Number" layer, key also is the zero key.
-* Navigation layer momentary toggle
-* Navigation layer toggle. This was included for when you are browsing a website, document or otherwise wish to stay in navigation mode. When in the "Number" layer, the key is the = symbol
-* Escape when pressed, Control when held. When in the "Number" layer, the key is the + symbol
-
-General Notes
--------------
-
-The letter layer is separated by 2 center rows of keys. This spreads the hands out a little further which helps not twist the wrists as much. The 2 center rows are [], (), [], and Ctrl and Alt keys.
-
-The symbol layer keys are accessed by the thumbs. They are the closest to the thumbs, instead of the number toggle, because in my code I found I used symbols much more often than numbers. There are two symbol layer keys because the symbols spread across the right and left half of the keyboard. Thus, some symbols are easier hit with the left hand modifier or right hand modifier.
-
-The number layer key is only accessible by the left thumb because all of the number keys are on the right side of the keyboard. When in the number layer, you can press the key to the right to make that layer sticky when you are going to do a lot of number entry.
-
-The function layer key is only accessible by the left thumb because all of the function keys are on the right side of the keyboard.
-
-The navigation layer key is only accessible by the right thumb because all of the navigation keys are on the left side of the keyboard. You can press the key to the right of the navigation layer to make the navigation layer sticky when you are doing a lot of navigation, reading a web page for example.
-
-When using the number or navigation layers, the same hand that accesses the momentary layer toggle key also has the 4 primary modifiers under their home row.
-
-* Pointer finger is control
-* Middle finger is option
-* Ring finger is command
-* Pinky finger is shift
-
-This is so you can easily press Cmd+Shift+F4 or when navigating, select text or words of text by pressing Shift+Control, for example.
-
-Some keys are duplicated. For example, () are available in easy to reach locations while in the Number layer because they are often used in math.
-
-The symbol layer has additional helpers for programming including a single keys that enter /=, \*=, -=, +=, !=, <>, ||, and &&. It also includes three special Return keys on the left:
-
-* Up CR which moves the cursor up, to the end of the line and then presses CR
-* Down CR which moves the cursor to the end of the line and then presses CR
-* Right ; which moves the cursor to the end of the line and presses ; for C styled languages, such as JavaScript which is a primary language I use
-
-Word of Warning
----------------
-
-I have been using the keymap for some time now and believe it to be a good keymap. There are a few things through the week that I wonder if it would have been better if this key were moved to that location.
-
-This keymap may change for further optimization.
-
-Please Give Feedback!
----------------------
-
-I am very interested in your feedback. Send me a message here on GitHub, r/jcowgar or @jcowgar.
diff --git a/keyboards/planck/keymaps/jetpacktuxedo/config.h b/keyboards/planck/keymaps/jetpacktuxedo/config.h
deleted file mode 100644
index c3c4a682cf8..00000000000
--- a/keyboards/planck/keymaps/jetpacktuxedo/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-    #define AUDIO_CLICKY
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
deleted file mode 100644
index 443164aba44..00000000000
--- a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  PLOVER,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Brite | Ctrl | Alt  | GUI  |Lower |    Space    |Raise |   /  | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    QK_GESC, 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_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
-    RGB_TOG, KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |   _  |  +   |  "   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |   {  |   }  | PgUp |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   |  | Home | PgDn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    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_UNDS, KC_PLUS, KC_DQUO, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_PGUP, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_HOME, KC_PGDN, KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   -  |   =  |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |   [  |   ]  | PgUp |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   \  | Home | PgDn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_MINS, KC_EQL,  KC_QUOT, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_PGUP, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_HOME, KC_PGDN, KC_END
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * | Exit |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-    EXT_PLV, KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    XXXXXXX, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  QK_BOOT,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 20;
-
-extern float clicky_rand;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (is_clicky_on()) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        clicky_rand += 0.5f;
-      } else {
-        clicky_rand -= 0.5f;
-      }
-    } else {
-      if (clockwise) {
-        clicky_freq_up();
-      } else {
-        clicky_freq_down();
-      }
-    }
-  } else if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        register_code(KC_RGHT);
-        unregister_code(KC_RGHT);
-      } else {
-        register_code(KC_LEFT);
-        unregister_code(KC_LEFT);
-      }
-    } else {
-      if (clockwise) {
-        register_code(KC_DOWN);
-        unregister_code(KC_DOWN);
-      } else {
-        register_code(KC_UP);
-        unregister_code(KC_UP);
-      }
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-      break;
-    case 3:
-      if (active) {
-        clicky_on();
-      } else {
-        clicky_off();
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/jetpacktuxedo/rules.mk b/keyboards/planck/keymaps/jetpacktuxedo/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/jetpacktuxedo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/jhenahan/config.h b/keyboards/planck/keymaps/jhenahan/config.h
deleted file mode 100644
index 67c09548fcf..00000000000
--- a/keyboards/planck/keymaps/jhenahan/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define FORCE_NKRO
-#undef WORKMAN_SOUND
-#define WORKMAN_SOUND COLEMAK_SOUND
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/planck/keymaps/jhenahan/keymap.c b/keyboards/planck/keymaps/jhenahan/keymap.c
deleted file mode 100644
index c884e864ac7..00000000000
--- a/keyboards/planck/keymaps/jhenahan/keymap.c
+++ /dev/null
@@ -1,265 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _WORKMAN 0
-#define _DEAD 1
-#define _QWERTY 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _ADJUST 16
-
-enum planck_keycodes {
-  WORKMAN = SAFE_RANGE,
-  DEAD,
-  QWERTY,
-  LOWER,
-  RAISE,
-  PLOVER,
-  EXT_PLV,
-  TOG_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-/* Workman
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   D  |   R  |   W  |   B  |   J  |   F  |   U  |   P  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   H  |   T  |   G  |   Y  |   N  |   E  |   O  |   I  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   M  |   C  |   V  |   K  |   L  | Dead |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | RAlt | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_WORKMAN] = LAYOUT_planck_grid(
-  KC_TAB,              KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_BSPC,
-  MT(MOD_LCTL,KC_ESC), KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT,
-  KC_LSFT,             KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    DEAD,    KC_DOT,  KC_SLSH, KC_ENT,
-  KC_LCTL,             KC_RALT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Workman Dead Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |   %  |   &  |   ?  |   +  |   @  |   $  |   _  |   [  |   ]  |   !  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   /  |   (  |   =  |   0  |   {  |   }  |   1  |   *  |   )  |   -  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   6  |   7  |   8  |   9  |   |  |   \  |   2  |   3  |   4  |   5  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |   <  |   ~  |   `  |      ,      |   #  |   ^  |   >  |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_DEAD] = LAYOUT_planck_grid(
-  XXXXXXX,  KC_PERC, KC_AMPR, KC_QUES, KC_PLUS, KC_AT,   KC_DLR,  KC_UNDS, KC_LBRC, KC_RBRC,  KC_EXLM, XXXXXXX,
-  XXXXXXX,  KC_SLSH, KC_LPRN, KC_EQL,  KC_0,    KC_LCBR, KC_RCBR, KC_1,    KC_ASTR, KC_RPRN,  KC_MINS, XXXXXXX,
-  XXXXXXX,  KC_6,    KC_7,    KC_8,    KC_9,    KC_PIPE, KC_BSLS, KC_2,    KC_3,    KC_4,     KC_5,    XXXXXXX,
-  XXXXXXX,  XXXXXXX, KC_LT,   KC_TILD, KC_GRV,  KC_COMM, KC_COMM, KC_HASH, KC_CIRC, KC_GT,    XXXXXXX, XXXXXXX
-),
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | RAlt | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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_RALT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      | Vol+ |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Prev | Next | Vol- | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_VOLU, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV,    KC_MNXT, KC_VOLD, KC_MPLY
-),
-
-/* Raise - KWM Interaction
- * ,-----------------------------------------------------------------------------------.
- * |Restrt|      |TgSplt|Flotng|Parent|FlScrn|InsMrk| InsW | InsS | InsN | InsE |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Mark |Rotate|Prefix| Term | BSP  |SwpMrk|SwapW |SwapS |SwapN |SwapE |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |MarkW |MarkS |MarkN |MarkE |Monocl|Float |FocusW|FocusS|FocusN|FocusE|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  LCAG(KC_Q), XXXXXXX,    LCAG(KC_S),       LCAG(KC_W),   LCAG(KC_D), LCAG(KC_F),        LCTL(S(KC_X)),    LCTL(S(KC_H)),    LCTL(S(KC_J)),     LCTL(S(KC_K)),    LCTL(S(KC_L)),    XXXXXXX,
-  XXXXXXX,    LCAG(KC_M), LGUI(LCTL(KC_R)), LCAG(KC_DOT), LCAG(KC_T), LGUI(LCTL(KC_A)),  LCTL(LALT(KC_M)), LCTL(LALT(KC_H)), LCTL(LALT(KC_J)),  LCTL(LALT(KC_K)), LCTL(LALT(KC_L)), XXXXXXX,
-  _______,    LCAG(KC_H), LCAG(KC_J),       LCAG(KC_K),   LCAG(KC_L), LGUI(LCTL(KC_S)),  LGUI(LCTL(KC_D)), LGUI(LALT(KC_H)), LGUI(LALT(KC_J)),  LGUI(LALT(KC_K)), LGUI(LALT(KC_L)), _______,
-  _______,    _______,    _______,          _______,      _______,    _______,           _______,          _______,          _______,           _______,          _______,          _______
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |TogOut|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_BSPC,
-  TOG_PLV, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_M,    KC_C,    XXXXXXX, XXXXXXX, KC_L,    KC_COMM, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Workmn|Plover|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  WORKMAN, PLOVER,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_workman[][2]    = SONG(WORKMAN_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case WORKMAN:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_workman);
-        #endif
-        persistent_default_layer_set(1UL<<_WORKMAN);
-      }
-      return false;
-      break;
-    case DEAD:
-      if (record->event.pressed) {
-        layer_on(_DEAD);
-        set_oneshot_layer(_DEAD, ONESHOT_START);
-        clear_oneshot_layer_state(ONESHOT_PRESSED);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(tone_plover);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover_gb);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  case TOG_PLV:
-    if (record->event.pressed) {
-      register_code(KC_R);
-      register_code(KC_W);
-      register_code(KC_T);
-      register_code(KC_C);
-      register_code(KC_P);
-      register_code(KC_O);
-      clear_keyboard();
-    }
-    return false;
-    break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/jhenahan/readme.md b/keyboards/planck/keymaps/jhenahan/readme.md
deleted file mode 100644
index a80506fc9df..00000000000
--- a/keyboards/planck/keymaps/jhenahan/readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# jhenahan's layout
-
-## Layout
-
-The base layer is based on the
-[Workman Dead](https://github.com/ojbucao/Workman/tree/master/mac) layout. The
-primary interaction layer is a slightly modified Workman layout with a 'dead'
-key on the third row under the middle finger. The dead key activates a layer of
-special characters.
-
-## [Layers](http://www.keyboard-layout-editor.com/#/gists/2b875f7d5d76fe4408c0a5b3bd76ddae)
-### Function Layer
-
-This is very slightly modified from the default, mainly just to rearrange the media keys.
-
-### [KWM](https://github.com/koekeishiya/kwm) Interaction Layer
-
-`kwm` is a tiling window manager for OS X. The keys defined in my keymap
-correspond to the settings I use in
-[my `kwmrc` file](https://github.com/jhenahan/dotfiles/blob/master/kwm/kwmrc).
-
-### QWERTY
-
-Just in case.
-
-### [Plover](http://www.openstenoproject.org/plover/)
-
-This layout functions exactly as a Workman layout unless you're running the Plover
-application. Includes a key for toggling Plover while it's running.
-
-Add this in the appropriate section of your `plover.cfg` to allow this altered layout:
-
-``` ini
-[System: English Stenotype]
-keymap[keyboard] = [["#", ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "="]], ["S-", ["q", "a"]], ["T-", ["d"]], ["K-", ["s"]], ["P-", ["r"]], ["W-", ["h"]], ["H-", ["w"]], ["R-", ["t"]], ["A-", ["m"]], ["O-", ["c"]], ["*", ["y", "g", "j", "b"]], ["-E", ["l"]], ["-U", [","]], ["-F", ["f"]], ["-R", ["n"]], ["-P", ["u"]], ["-B", ["e"]], ["-L", ["p"]], ["-G", ["o"]], ["-T", [";"]], ["-S", ["i"]], ["-D", ["BackSpace"]], ["-Z", ["'"]], ["no-op", ["\\", "]", "x", ".", "/"]], ["arpeggiate", ["space"]]]
-```
-
-### Adjust Layer
-
-This layer is only slightly modified from the default to remove Dvorak and
-Colemak and replace them with Workman.
diff --git a/keyboards/planck/keymaps/jhenahan/rules.mk b/keyboards/planck/keymaps/jhenahan/rules.mk
deleted file mode 100644
index 23ce0b2fb43..00000000000
--- a/keyboards/planck/keymaps/jhenahan/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # 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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/jimmysjolund/config.h b/keyboards/planck/keymaps/jimmysjolund/config.h
deleted file mode 100644
index 5606510d498..00000000000
--- a/keyboards/planck/keymaps/jimmysjolund/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 Jimmy Sjölund
- *
- * 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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/jimmysjolund/keymap.c b/keyboards/planck/keymaps/jimmysjolund/keymap.c
deleted file mode 100644
index 02766bb125e..00000000000
--- a/keyboards/planck/keymaps/jimmysjolund/keymap.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty - Original
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-/* Qwerty - jimmysjolund 2022-09-17
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Lower |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Raise |Ctrl+ | GUI  |Shift |Bksp/ |Lower |Enter |Space |AltGr | Alt  | Left |Right |
- * |      | Alt  |      |      | Ctrl |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_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,
-    LOWER,   KC_Z,    KC_X,     KC_C,     KC_V,     KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
-    RAISE,  LCTL(KC_LALT),  KC_LGUI,  KC_LSFT, LCTL_T(KC_BSPC), LOWER,  KC_ENT,  KC_SPC,  KC_ALGR,  KC_LALT,  KC_LEFT,  KC_RGHT
-),
-
-/* Colemak Original
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-/* Colemak jimmysjolund
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Lower |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Raise |Ctrl+ | GUI  |Shift |Bksp/ |Lower |Enter |Space |AltGr | Alt  | Left |Right |
- * |      | Alt  |      |      | Ctrl |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_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,
-    LOWER,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    RAISE, LCTL(KC_LALT), KC_LGUI, KC_LSFT, LCTL_T(KC_BSPC), LOWER, KC_ENT,  KC_SPC,  KC_ALGR, KC_LALT, KC_LEFT, KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower - Jimmy Sjölund 2022-09-19
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   +  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   |  |   \  |  :   |   ;  |   -  |   [  |   ]  |   _  |   ,  |   .  |   /  |   ?  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    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_DEL,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
-    KC_PIPE, KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_RBRC, KC_UNDS, KC_COMM, KC_DOT,  KC_SLSH, KC_QUES,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return false;
-}
-
-bool dip_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-    return false;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/jimmysjolund/readme.md b/keyboards/planck/keymaps/jimmysjolund/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/jimmysjolund/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/jimmysjolund/rules.mk b/keyboards/planck/keymaps/jimmysjolund/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/jimmysjolund/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/jirgn/assets/layout.json b/keyboards/planck/keymaps/jirgn/assets/layout.json
deleted file mode 100644
index d5fc6f26a95..00000000000
--- a/keyboards/planck/keymaps/jirgn/assets/layout.json
+++ /dev/null
@@ -1,168 +0,0 @@
-[
-  {
-    "switchMount": "cherry",
-    "switchBrand": "cherry",
-    "switchType": "MX1A-C1xx",
-    "pcb": true,
-    "css": ".keylabel2 {\n    color: #61ba5d !important;\n}\n.keylabel6 {\n    color: #fa7a5f !important;\n}\n.keylabel8 {\n    color: #7ab7f7 !important;\n}\n.keylabel7 {\n    color: #999 !important;\n}"
-  },
-  [
-    {
-      "fa": [
-        0,
-        2,
-        0,
-        2
-      ]
-    },
-    "\n~\n\n`\n\n\n\n\n\nTab",
-    {
-      "sm": "cherry",
-      "sb": "cherry",
-      "st": "MX1A-C1xx"
-    },
-    "\n!\n\n1\n\n\n\n\n\nQ",
-    {
-      "sm": "",
-      "sb": "",
-      "st": ""
-    },
-    "\n@\n\n2\n\n\n\n\n\nW",
-    "\n#\n\n3\n\n\n\n\n\nE",
-    "\n$\n\n4\n\n\n\n\n\nR",
-    "\n%\n\n5\n\n\n\n\n\nT",
-    "\n^\n\n6\n\n\n\n\n\nY",
-    "\n&\n\n7\n\n\n\n\n\nU",
-    "\n*\n\n8\n\n\n\n\n\nI",
-    "\n(\n\n9\n\n\n\n\n\nO",
-    "\n)\n\n0\n\n\n\n\n\nP",
-    {
-      "a": 7
-    },
-    "<i class='mss mss-Unicode-BackSpace-DeleteLeft-Big-2'></i>"
-  ],
-  [
-    {
-      "c": "#b8b8b8",
-      "a": 5
-    },
-    "\n<i class='mss mss-Unicode-DeleteRight-Big-2'></i>\n\n\nCtrl\n\n<i class='mss mss-Unicode-Escape-3'></i>",
-    {
-      "c": "#61ba5d",
-      "a": 4
-    },
-    "\n¡\n\nF1\nNav\n\n\n\n\nA",
-    {
-      "c": "#cccccc",
-      "fa": [
-        0,
-        2,
-        1,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0
-      ]
-    },
-    "\n™\nHome\nF2\n\n\n\n\n\nS",
-    "\n€\nPg Up\nF3\n\n\n\n\n\nD",
-    "\n¢\nPg Dn\nF4\n\n\n\n\n\nF",
-    "\n∞\nEnd\nF5\n\n\n\n\n\nG",
-    {
-      "fa": [
-        0,
-        2,
-        2,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0
-      ]
-    },
-    "\n§\n←\nF6\n\n\n\n\n\nH",
-    "\n_\n↓\n-\n\n\n\n\n\nJ",
-    "\n+\n↑\n=\n\n\n\n\n\nK",
-    "\n{\n→\n[\n\n\n\n\n\nL",
-    {
-      "c": "#61ba5d",
-      "fa": [
-        0,
-        2,
-        2,
-        2,
-        0,
-        0,
-        0,
-        2
-      ]
-    },
-    "\n}\n\n]\nNav\n\n\n:\n\n;",
-    {
-      "c": "#cccccc"
-    },
-    "\n|\n\n\\\n\n\n\n\"\n\n'"
-  ],
-  [
-    {
-      "c": "#b8b8b8",
-      "a": 7
-    },
-    "Shift",
-    {
-      "c": "#cccccc",
-      "a": 4
-    },
-    "\n\n\nF7\n\n\n\n\n\nZ",
-    "\n\n\nF8\n\n\n\n\n\nX",
-    "\n\n\nF9\n\n\n\n\n\nC",
-    "\n\n\nF10\n\n\n\n\n\nV",
-    "\n\n\nF11\n\n\n\n\n\nB",
-    "\n\n\nF12\n\n\n\n\n\nN",
-    "\n~\n\n#\n\n\n\n\n\nM",
-    "\n|\n\n/\n\n\n\n<\n\n,",
-    {
-      "a": 6
-    },
-    "\n\n>\n\n\n\n\n\n.",
-    "\n\n?\n\n\n\n\n\n/",
-    {
-      "c": "#b8b8b8",
-      "a": 7
-    },
-    "<i class='kb kb-Return-2'></i>\n\n\n\nShift"
-  ],
-  [
-    "",
-    "Hyper",
-    "<i class='mss mss-Unicode-Option-3'></i>",
-    "<i class='mss mss-Unicode-Command-3'></i>",
-    {
-      "c": "#fa7a5f"
-    },
-    "&dArr;",
-    {
-      "c": "#cccccc",
-      "w": 2
-    },
-    "",
-    {
-      "c": "#7ab7f7"
-    },
-    "&uArr;",
-    {
-      "c": "#b8b8b8"
-    },
-    "<i class='mss mss-Unicode-Command-3'></i>",
-    "<i class='mss mss-Unicode-Option-3'></i>",
-    "Hyper",
-    ""
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/jirgn/config.h b/keyboards/planck/keymaps/jirgn/config.h
deleted file mode 100644
index 59bf4aa2a3e..00000000000
--- a/keyboards/planck/keymaps/jirgn/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/jirgn/keymap.c b/keyboards/planck/keymaps/jirgn/keymap.c
deleted file mode 100644
index 1bfb1e5e9df..00000000000
--- a/keyboards/planck/keymaps/jirgn/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _NAVIGATION
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  PLOVER,
-  LOWER,
-  RAISE,
-  EXT_PLV
-};
-
-// keycode aliases
-#define ___x___ KC_NO
-#define KC_EUR LALT(S(KC_2))
-#define KC_SEC LALT(KC_6)
-#define CTL_DEL CTL_T(KC_DEL)
-#define NAV_SCLN LT(_NAVIGATION, KC_SCLN)
-#define NAV_A LT(_NAVIGATION, KC_A)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*              Qwerty
- *              ,-----------------------------------------------------------------------------------.
- *              | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- *              |------+------+------+------+------+-------------+------+------+------+------+------|
- * Tab for Esc--| Ctrl | A Nav|   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | ; Nav| Ctrl |--Tab for "
- *              |------+------+------+------+------+------|------+------+------+------+------+------|
- *              | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Shift|--Tab for Enter
- *              |------+------+------+------+------+------+------+------+------+------+------+------|
- *              |      | Hyper| Alt  | Super| Lower|    Space    | Raise| Super| ALt  | Hyper|      |
- *              `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_BSPC,
-  CTL_T(KC_ESC), NAV_A,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    NAV_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,  SFT_T(KC_ENT),
-  ___x___,       KC_HYPR, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LGUI, KC_LALT, KC_HYPR,  ___x___
-),
-
-/*              Lower
- *              ,-----------------------------------------------------------------------------------.
- *              |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- *              |------+------+------+------+------+-------------+------+------+------+------+------|
- * Tab to Del---| Ctrl |  ¡   |  ™   |  €   |  ¢   |  ∞   |  §   |   _  |   +  |   {  |   }  |  |   |
- *              |------+------+------+------+------+------|------+------+------+------+------+------|
- *              |      |      |      |      |      |      |      |ISO ~ |ISO | |      |      |      |
- *              |------+------+------+------+------+------+------+------+------+------+------+------|
- *              |      |      |      |      |      |             |      |      |      |      |      |
- *              `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, S(KC_1),    S(KC_2),    S(KC_3), S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    S(KC_9), S(KC_0), KC_BSPC,
-  CTL_DEL, LALT(KC_1), LALT(KC_2), KC_EUR,  LALT(KC_4), LALT(KC_5), LALT(KC_6), KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, ___x___,    ___x___,    ___x___, ___x___,    ___x___,    ___x___,    S(KC_NUHS), S(KC_NUBS), _______, _______, _______,
-  _______, _______,    _______,    _______, _______,    _______,    _______,    _______,    _______,    _______, _______, _______
-),
-
-/*              Raise
- *              ,-----------------------------------------------------------------------------------.
- *              |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- *              |------+------+------+------+------+-------------+------+------+------+------+------|
- * Tab to Del---| Ctrl |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- *              |------+------+------+------+------+------|------+------+------+------+------+------|
- *              |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
- *              |------+------+------+------+------+------+------+------+------+------+------+------|
- *              |      |      |      |      |      |             |      |      |      |      |      |
- *              `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  CTL_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, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/*              Navigation
- *              ,-----------------------------------------------------------------------------------.
- *              |      |      |      |      |      |      |      |      |      |      |      |      |
- *              |------+------+------+------+------+-------------+------+------+------+------+------|
- *              |      |      | HOME | PGUP | PGDN | END  | LEFT | DOWN | UP   | RIGHT|      |      |
- *              |------+------+------+------+------+------|------+------+------+------+------+------|
- *              |      |      |      |      |      |      |      |      |      |      |      |      |
- *              |------+------+------+------+------+------+------+------+------+------+------+------|
- *              |      |      |      |      |      |             |      |      |      |      |      |
- *              `-----------------------------------------------------------------------------------'
- */
-[_NAVIGATION] = LAYOUT_planck_grid(
-  ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,  ___x___, ___x___,
-  _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LEFT, KC_DOWN, KC_UP  , KC_RIGHT, _______, ___x___,
-  _______, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,  ___x___, _______,
-  ___x___, _______, _______, _______, ___x___, ___x___, ___x___, ___x___, _______, _______,  _______, ___x___
-),
-
-/*              Plover layer (http://opensteno.org)
- *              ,-----------------------------------------------------------------------------------.
- *              |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- *              |------+------+------+------+------+-------------+------+------+------+------+------|
- *              |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- *              |------+------+------+------+------+------|------+------+------+------+------+------|
- *              |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- *              |------+------+------+------+------+------+------+------+------+------+------+------|
- *              | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- *              `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1, KC_1, KC_1,    KC_1,    KC_1, KC_1, KC_1,    KC_1,    KC_1   ,
-  ___x___, KC_Q,    KC_W,    KC_E, KC_R, KC_T,    KC_Y,    KC_U, KC_I, KC_O,    KC_P,    KC_LBRC,
-  ___x___, KC_A,    KC_S,    KC_D, KC_F, KC_G,    KC_H,    KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, ___x___, ___x___, KC_C, KC_V, ___x___, ___x___, KC_N, KC_M, ___x___, ___x___, ___x___
-),
-
-/*              Adjust (Lower + Raise)
- *              ,-----------------------------------------------------------------------------------.
- *              |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- *              |------+------+------+------+------+-------------+------+------+------+------+------|
- *              |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Plover|      |      |      |
- *              |------+------+------+------+------+------|------+------+------+------+------+------|
- *              |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- *              |------+------+------+------+------+------+------+------+------+------+------+------|
- *              |      |      |      |      |      |             |      |      |      |      |      |
- *              `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  PLOVER,  _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false; break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false; break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false; break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false; break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false; break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/jirgn/readme.md b/keyboards/planck/keymaps/jirgn/readme.md
deleted file mode 100644
index afc93d4572f..00000000000
--- a/keyboards/planck/keymaps/jirgn/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Jirgns Planck Layout
-
-This layout was designed with [Layout Designer](http://www.keyboard-layout-editor.com/#/)
-
-[Permalink to Layout](http://www.keyboard-layout-editor.com/##@_switchMount=cherry&switchBrand=cherry&switchType=MX1A-C1xx&pcb:true&css=.keylabel2%20%7B%0A%20%20%20%20color%2F:%20%2361ba5d%20!important%2F%3B%0A%7D%0A.keylabel6%20%7B%0A%20%20%20%20color%2F:%20%23fa7a5f%20!important%2F%3B%0A%7D%0A.keylabel8%20%7B%0A%20%20%20%20color%2F:%20%237ab7f7%20!important%2F%3B%0A%7D%0A.keylabel7%20%7B%0A%20%20%20%20color%2F:%20%23999%20!important%2F%3B%0A%7D%3B&@_fa@:0&:2&:0&:2%3B%3B&=%0A~%0A%0A%60%0A%0A%0A%0A%0A%0ATab&_sm=cherry&sb=cherry&st=MX1A-C1xx%3B&=%0A!%0A%0A1%0A%0A%0A%0A%0A%0AQ&=%0A%2F@%0A%0A2%0A%0A%0A%0A%0A%0AW&=%0A%23%0A%0A3%0A%0A%0A%0A%0A%0AE&=%0A$%0A%0A4%0A%0A%0A%0A%0A%0AR&=%0A%25%0A%0A5%0A%0A%0A%0A%0A%0AT&=%0A%5E%0A%0A6%0A%0A%0A%0A%0A%0AY&=%0A%2F&%0A%0A7%0A%0A%0A%0A%0A%0AU&=%0A*%0A%0A8%0A%0A%0A%0A%0A%0AI&=%0A(%0A%0A9%0A%0A%0A%0A%0A%0AO&=%0A)%0A%0A0%0A%0A%0A%0A%0A%0AP&_a:7%3B&=%3Ci%20class%2F='mss%20mss-Unicode-BackSpace-DeleteLeft-Big-2'%3E%3C%2F%2Fi%3E%3B&@_c=%23b8b8b8&a:5%3B&=%0A%3Ci%20class%2F='mss%20mss-Unicode-DeleteRight-Big-2'%3E%3C%2F%2Fi%3E%0A%0A%0ACtrl%0A%0A%3Ci%20class%2F='mss%20mss-Unicode-Escape-3'%3E%3C%2F%2Fi%3E&_c=%2361ba5d&a:4%3B&=%0A¡%0A%0AF1%0ANav%0A%0A%0A%0A%0AA&_c=%23cccccc&fa@:0&:2&:1&:2%3B%3B&=%0A™%0AHome%0AF2%0A%0A%0A%0A%0A%0AS&=%0A€%0APg%20Up%0AF3%0A%0A%0A%0A%0A%0AD&=%0A¢%0APg%20Dn%0AF4%0A%0A%0A%0A%0A%0AF&=%0A∞%0AEnd%0AF5%0A%0A%0A%0A%0A%0AG&_f2:2%3B&=%0A§%0A←%0AF6%0A%0A%0A%0A%0A%0AH&_f2:2%3B&=%0A%2F_%0A↓%0A-%0A%0A%0A%0A%0A%0AJ&_f2:2%3B&=%0A+%0A↑%0A%2F=%0A%0A%0A%0A%0A%0AK&_f2:2%3B&=%0A%7B%0A→%0A%5B%0A%0A%0A%0A%0A%0AL&_c=%2361ba5d&fa@:0&:2&:2&:2&:0&:2&:2&:2%3B%3B&=%0A%7D%0A%0A%5D%0ANav%0A%0A%0A%2F:%0A%0A%2F%3B&_c=%23cccccc%3B&=%0A%7C%0A%0A%5C%0A%0A%0A%0A%22%0A%0A'%3B&@_c=%23b8b8b8&a:7%3B&=Shift&_c=%23cccccc&a:4%3B&=%0A%0A%0AF7%0A%0A%0A%0A%0A%0AZ&=%0A%0A%0AF8%0A%0A%0A%0A%0A%0AX&=%0A%0A%0AF9%0A%0A%0A%0A%0A%0AC&=%0A%0A%0AF10%0A%0A%0A%0A%0A%0AV&=%0A%0A%0AF11%0A%0A%0A%0A%0A%0AB&=%0A%0A%0AF12%0A%0A%0A%0A%0A%0AN&=%0A~%0A%0A%23%0A%0A%0A%0A%0A%0AM&=%0A%7C%0A%0A%2F%2F%0A%0A%0A%0A%3C%0A%0A,&_a:6%3B&=%0A%0A%3E%0A%0A%0A%0A%0A%0A.&=%0A%0A%3F%0A%0A%0A%0A%0A%0A%2F%2F&_c=%23b8b8b8&a:7%3B&=%3Ci%20class%2F='kb%20kb-Return-2'%3E%3C%2F%2Fi%3E%0A%0A%0A%0AShift%3B&@=&=Hyper&=%3Ci%20class%2F='mss%20mss-Unicode-Option-3'%3E%3C%2F%2Fi%3E&=%3Ci%20class%2F='mss%20mss-Unicode-Command-3'%3E%3C%2F%2Fi%3E&_c=%23fa7a5f%3B&=%2F&dArr%2F%3B&_c=%23cccccc&w:2%3B&=&_c=%237ab7f7%3B&=%2F&uArr%2F%3B&_c=%23b8b8b8%3B&=%3Ci%20class%2F='mss%20mss-Unicode-Command-3'%3E%3C%2F%2Fi%3E&=%3Ci%20class%2F='mss%20mss-Unicode-Option-3'%3E%3C%2F%2Fi%3E&=Hyper&=)
diff --git a/keyboards/planck/keymaps/johannes/keymap.c b/keyboards/planck/keymaps/johannes/keymap.c
deleted file mode 100644
index c1fdd11244c..00000000000
--- a/keyboards/planck/keymaps/johannes/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#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.
-
-#define QWERTY 0
-#define LOWER 1
-#define RAISE 2
-#define FUNCTION 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ctrl |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | alt  |play/p| super|shift | Space|Raise | lower|  alt | altgr|      |fn    |
- * `-----------------------------------------------------------------------------------'
- */
-[QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  _______, KC_LALT, LT(FUNCTION, KC_MPLY), KC_LGUI, KC_LSFT,      KC_SPC,  MO(RAISE),   MO(LOWER),   KC_LALT, KC_RALT, XXXXXXX,   MO(FUNCTION)
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |  {   |  }   |  +   |      |      | Å    |  Ä   |  Ö   |   _  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |   \  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  _______, _______,   KC_LCBR,   KC_RCBR,   KC_PLUS,   _______,   _______,   RALT(KC_W), RALT(KC_Q), RALT(KC_P), KC_UNDS, _______,
-  _______, _______,   _______,   _______,   _______,  _______,  _______,_______, _______,_______, KC_BSLS, _______,
-  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |  [   |  ]   |  =   |      |  left|  down|  up  | right|   -  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |   |  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[RAISE] = LAYOUT_planck_grid(
-  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_LBRC,   KC_RBRC,   KC_EQL,   _______,   KC_LEFT,   KC_DOWN, KC_UP,  KC_RIGHT, KC_MINS, _______,
-  _______, _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, _______, KC_PIPE, _______,
-  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Fn
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  |  F11 |  F12 '
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      | prev | vol.d| vo.up| next |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      | mute |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | CAPS |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[FUNCTION] = LAYOUT_planck_grid(
-  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_MEDIA_PREV_TRACK,  KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_MEDIA_NEXT_TRACK, _______, _______,
-  _______,   _______, _______, _______, _______, _______, _______, KC_AUDIO_MUTE, _______, _______, _______, _______,
-  _______,  _______,   _______,   _______,   KC_CAPS,   _______,   _______,   _______, _______,  _______, _______, _______
-),
-
-};
diff --git a/keyboards/planck/keymaps/johannes/readme.md b/keyboards/planck/keymaps/johannes/readme.md
deleted file mode 100644
index c9c7e308088..00000000000
--- a/keyboards/planck/keymaps/johannes/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Planck layout for Swedish programmer
-I.e. easy access to special keys and åäö.
-
-![layout](https://i.imgur.com/74wHmDh.png)
-
-[KBLE link](http://www.keyboard-layout-editor.com/#/gists/dc01cc2225899308a05ba3ef0031548b)
diff --git a/keyboards/planck/keymaps/johannes/rules.mk b/keyboards/planck/keymaps/johannes/rules.mk
deleted file mode 100644
index e3a405f494e..00000000000
--- a/keyboards/planck/keymaps/johannes/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/jweickm/config.h b/keyboards/planck/keymaps/jweickm/config.h
deleted file mode 100644
index 2b7a3b02d67..00000000000
--- a/keyboards/planck/keymaps/jweickm/config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2018 Jack Humbert <jack.humb@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
-
-#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), \
-                                  SONG(WORKMAN_SOUND), \
-                                  SONG(PLOVER_SOUND), \
-                                  SONG(STARTUP_SOUND), \
-                                  SONG(PREONIC_SOUND), \
-                                  SONG(GOODBYE_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
-
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-// settings for HOME ROW MODS
-#define TAPPING_TERM 160 // 200 ms is the default value
-#define TAPPING_TERM_PER_KEY
-//#define PERMISSIVE_HOLD
-#define QUICK_TAP_TERM_PER_KEY
-
-// settings for LEADER key
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 250
-#define LEADER_NO_TIMEOUT
-
-#define RGBLIGHT_SLEEP // RGB lighting will switch off when the host goes to sleep
-#define RGBLIGHT_LAYERS
diff --git a/keyboards/planck/keymaps/jweickm/keymap.c b/keyboards/planck/keymaps/jweickm/keymap.c
deleted file mode 100644
index b206b8511e1..00000000000
--- a/keyboards/planck/keymaps/jweickm/keymap.c
+++ /dev/null
@@ -1,1126 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- * Copyright 2021 Jakob Weickmann
- *
- 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"
-
-enum planck_layers {
-    _HRWIDECOLEMAK,
-    _HRWIDECOLEMAK_DE,
-    _GAMING,
-    _WIDECOLEMAK,
-    _LOWER,
-    _RAISE,
-    _LOWER_DE,
-    _RAISE_DE,
-    _ADJUST,
-    _NAV,
-    _VIM,
-    _NUM,
-    _MOUSE,
-};
-
-enum planck_keycodes { HRWIDECOLEMAK = SAFE_RANGE, GAMING, WIDECOLEMAK, TG_COLEMAK, VIM_O, VIM_V, KC_SVD_BD, KC_SVU_BU, KC_TAB_MPLY, ALT_TAB, CTL_TAB, DE_ae, DE_oe, DE_ue, DE_AE, DE_OE, DE_SZ, DE_EGRAVE, DE_EAIGU, KC_CURRENCY, KC_DE_SWITCH, LANG_SWITCH, DE_SLSH_QUST, DE_QUOT, DE_SCLN, DE_BSLS, M_ESCM, M_RGUI_SCLN, DE_DOT_RAB, DE_COMM_LAB };
-
-// Tap Dance declarations
-enum tap_dance_codes {
-    TD_PRN,     // round brackets (parentheses)
-    TD_PRN_DE,  // round brackets (parentheses)
-    TD_BRC,     // square brackets
-    TD_BRC_DE,  // square brackets
-    TD_CBR,     // curly brackets
-    TD_CBR_DE,  // curly brackets
-    TD_VIM_GG   // single tap to scroll down, double tap to scroll up
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* _HRWIDECOLEMAK
-     * ,-----------------------------------------------------------------------------------.
-     * |  G-Q |  A-W |  S-F |  C-P |_Num-B|Vol/B+|_Num-J|  C-L |  S-U |  A-Y |  G-/ |   ü  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   A  |   R  |   S  |   T  |   G  | TAB  |   M  |   N  |   E  |   I  |   O  |   '  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |_Mo-Z |   X  |   C  |   D  |   V  |Vol/B-|   K  |   H  |   ,  |   .  |_Mo-/ |   \  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |C-CAPS| LEAD | BSPC |_L-ESC| LSFT |  _Nav-SPC   |_R-ENT|S-DEL | RALT |_Mo <-|_Mo ->|
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_HRWIDECOLEMAK] = LAYOUT_planck_grid(
-        LGUI_T(KC_Q), LALT_T(KC_W), LSFT_T(KC_F), LCTL_T(KC_P), LT(_NUM, KC_B), KC_SVU_BU, LT(_NUM, KC_J), RCTL_T(KC_L), RSFT_T(KC_U), LALT_T(KC_Y), RGUI_T(KC_SCLN), DE_ue, 
-        KC_A, KC_R, KC_S, KC_T, KC_G, KC_TAB, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, 
-        LT(_MOUSE, KC_Z), KC_X, KC_C, KC_D, KC_V, KC_SVD_BD, KC_K, KC_H, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), KC_BSLS, 
-        LCTL_T(KC_CAPS), QK_LEAD, KC_BSPC, LT(_LOWER, KC_ESC), OSM(MOD_LSFT), LT(_NAV, KC_SPC), LT(_NAV, KC_SPC), LT(_RAISE, KC_ENT), RSFT_T(KC_DEL), KC_RALT, LT(_MOUSE, KC_LEFT), LT(_MOUSE, KC_RIGHT)
-    ),
-
-    /* _HRWIDECOLEMAK_DE
-     * same as above, when the PC is set to German layout
-     * ,-----------------------------------------------------------------------------------.
-     * |  G-Q |  A-W |  S-F |  C-P |_Num-B|Vol/B+|_Num-J|  C-L |  S-U |  A-Y |  G-/ |   ü  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   A  |   R  |   S  |   T  |   G  | TAB  |   M  |   N  |   E  |   I  |   O  |   '  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |_Mo-Z |   X  |   C  |   D  |   V  |Vol/B-|   K  |   H  |   ,  |   .  |_Mo-/ |   \  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |C-CAPS| LEAD | BSPC |_L-ESC| LSFT |  _Nav-SPC   |_R-ENT|S-DEL | RALT |_Mo <-|_Mo ->|
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_HRWIDECOLEMAK_DE] = LAYOUT_planck_grid(
-        LGUI_T(KC_Q), LALT_T(KC_W), LSFT_T(KC_F), LCTL_T(KC_P), LT(_NUM, KC_B), KC_SVU_BU, LT(_NUM, KC_J), RCTL_T(KC_L), RSFT_T(KC_U), LALT_T(KC_Z), M_RGUI_SCLN, KC_LBRC, 
-        KC_A, KC_R, KC_S, KC_T, KC_G, KC_TAB, KC_M, KC_N, KC_E, KC_I, KC_O, DE_QUOT, 
-        LT(_MOUSE, KC_Y), KC_X, KC_C, KC_D, KC_V, KC_SVD_BD, KC_K, KC_H, DE_COMM_LAB, DE_DOT_RAB, DE_SLSH_QUST, DE_BSLS, 
-        LCTL_T(KC_CAPS), QK_LEAD, KC_BSPC, LT(_LOWER_DE, KC_ESC), OSM(MOD_LSFT), LT(_NAV, KC_SPC), LT(_NAV, KC_SPC), LT(_RAISE_DE, KC_ENT), RSFT_T(KC_DEL), KC_RALT, LT(_MOUSE, KC_LEFT), LT(_MOUSE, KC_RIGHT)
-    ),
-
-    /* _GAMING
-     * ,-----------------------------------------------------------------------------------.
-     * | ESC  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |  F5  |  F8  |  F9  |Vol/B+|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | TAB  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |Vol/B-|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LSFT |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   Z  |   M  |   ;  |_CM-EN|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LCTL |   C  |   B  |   X  | LALT |    SPACE    | ENT  | RALT | ____ | ____ | !GAME|
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_GAMING] = LAYOUT_planck_grid(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_F5, KC_F8, KC_F9, KC_VOLU, 
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_VOLD, 
-        KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_Z, KC_M, KC_SCLN, TG_COLEMAK, 
-        KC_LCTL, KC_C, KC_B, KC_X, KC_LALT, KC_SPC, KC_SPC, KC_ENT, KC_RALT, KC_TRNS, KC_TRNS, GAMING
-    ),
-
-    /* WIDECOLEMAK
-     * no mod taps
-     * ,-----------------------------------------------------------------------------------.
-     * |   Q  |   W  |   F  |   P  |   B  |Vol/B+|   J  |   L  |   U  |   Y  |   /  |   Ü  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   A  |   R  |   S  |   T  |   G  | TAB  |   M  |   N  |   E  |   I  |   O  |   '  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   Z  |   X  |   C  |   D  |   V  |Vol/B-|   K  |   H  |   ,  |   .  |   /  |!CM-EN|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |C-CAPS|G-TAB |MN-ESC|_L-BSP| LSFT |  _NAV-SPC   |_R-ENT|S-DEL |C-TAB |_Mo <-|_Mo ->|
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_WIDECOLEMAK] = LAYOUT_planck_grid(
-        KC_Q, KC_W, KC_F, KC_P, KC_B, KC_SVU_BU, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, DE_ue,
-        KC_A, KC_R, KC_S, KC_T, KC_G, KC_TAB_MPLY, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, 
-        KC_Z, KC_X, KC_C, KC_D, KC_V, KC_SVD_BD, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, TG_COLEMAK, 
-        LCTL_T(KC_CAPS), LGUI_T(KC_TAB), M_ESCM, LT(_LOWER_DE, KC_BSPC), OSM(MOD_LSFT), LT(_NAV, KC_SPC), LT(_NAV, KC_SPC), LT(_RAISE, KC_ENT), RSFT_T(KC_DEL), KC_LALT, LT(_MOUSE, KC_LEFT), LT(_MOUSE, KC_RIGHT)
-    ),
-
-    /* _LOWER
-     * ,-----------------------------------------------------------------------------------.
-     * |   !  |   @  |   #  |   $  |   %  |   ~  |   ^  |   &  |   *  |   (  |   )  |   Ö  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   _  |   +  |   {  |   }  |   Ä  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   /  |   \  |   |  |   €  |   è  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |!MOUSE| ____ | ____ | ____ | ____ |     ____    | ____ | Vol- | Vol+ |   ↓  |   ↑  |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_planck_grid(
-        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TILD, KC_CIRC, KC_AMPR, KC_ASTR, TD(TD_PRN), KC_RPRN, DE_OE, 
-        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, DE_SZ, KC_UNDS, KC_PLUS, TD(TD_CBR), KC_RCBR, DE_AE, 
-        KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPLY, KC_SLSH, KC_NUBS, LSFT(KC_NUBS), KC_CURRENCY, DE_EGRAVE, 
-        TG(_MOUSE), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_DOWN, KC_UP
-    ),
-
-    /* _LOWER_DE
-     * ,-----------------------------------------------------------------------------------.
-     * |   !  |   @  |   #  |   $  |   %  |   ~  |   ^  |   &  |   *  |   (  |   )  |   Ö  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   _  |   +  |   {  |   }  |   Ä  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   /  |   \  |   |  |   €  |   `  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |!MOUSE| ____ | ____ | ____ | ____ |     ____    | ____ | Vol- | Vol+ |   ↓  |   ↑  |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER_DE] = LAYOUT_planck_grid(
-        KC_EXLM, RALT(KC_Q), KC_BSLS, KC_DLR, KC_PERC, RALT(KC_RBRC), KC_GRV, KC_CIRC, KC_RCBR, TD(TD_PRN_DE), KC_LPRN, LSFT(KC_SCLN), 
-        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, LSFT(KC_SLSH), KC_RBRC, TD(TD_CBR_DE), RALT(KC_0), LSFT(KC_QUOT), 
-        KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPLY, LSFT(KC_7), RALT(KC_MINS), RALT(KC_NUBS), KC_CURRENCY, KC_PLUS, 
-        TG(_MOUSE), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_DOWN, KC_UP
-    ),
-
-    /* _RAISE
-     * ,-----------------------------------------------------------------------------------.
-     * |   1  |   2  |   3  |   4  |   5  |   `  |   6  |   7  |   8  |   9  |   0  |   ö  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   -  |   =  |   [  |   ]  |   ä  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   \  |   ,  |   .  |   /  |   é  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |!MOUSE| ____ | ____ | BSPC | ____ |     ____    | ____ |  |<< | >>|  |   ↓  |   ↑  |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_planck_grid(
-        KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, KC_6, KC_7, KC_8, KC_9, KC_0, DE_oe, 
-        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, DE_SZ, KC_MINS, KC_EQL, TD(TD_BRC), KC_RBRC, DE_ae, 
-        KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPLY, KC_BSLS, KC_COMM, KC_DOT, KC_SLSH, DE_EAIGU, 
-        TG(_MOUSE), KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_DOWN, KC_UP
-    ),
-
-    /* _RAISE_DE
-     * ,-----------------------------------------------------------------------------------.
-     * |   1  |   2  |   3  |   4  |   5  |   `  |   6  |   7  |   8  |   9  |   0  |   ö  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   -  |   =  |   [  |   ]  |   ä  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   \  |   ,  |   .  |   /  |   ´  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |!MOUSE| ____ | ____ | BSPC | ____ |     ____    | ____ |  |<< | >>|  |   ↓  |   ↑  |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE_DE] = LAYOUT_planck_grid(
-        KC_1, KC_2, KC_3, KC_4, KC_5, LSFT(KC_GRV), KC_6, KC_7, KC_8, KC_9, KC_0, KC_SCLN, 
-        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_SLSH, LSFT(KC_0), TD(TD_BRC_DE), RALT(KC_9), KC_QUOT, 
-        KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPLY, RALT(KC_MINS), KC_COMM, KC_DOT, DE_SLSH_QUST, KC_EQL, 
-        TG(_MOUSE), KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_DOWN, KC_UP
-    ),
-
-    /* _ADJUST
-     * ,-----------------------------------------------------------------------------------.
-     * | A-SFT| Boot | Debug|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | A-GRV|EEPRST|MUNEXT| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | ____ |AU_REV|AUNEXT| MU_ON|MU_OFF| MI_ON|MI_OFF| Vol- | MPLY | Vol+ | ____ | ____ |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | ____ | ____ | ____ | ____ | ____ |     ____    | ____ | ____ | ____ | ____ |EEPRST|
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_ADJUST] = LAYOUT_planck_grid(
-        LALT(KC_LSFT), QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DE_SWITCH, 
-        LALT(KC_GRV), EE_CLR, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, HRWIDECOLEMAK, WIDECOLEMAK, LALT(KC_GRV), LANG_SWITCH, GAMING, 
-        KC_TRNS, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_SVD_BD, KC_MPLY, KC_SVU_BU, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR
-    ),
-
-    /* _NAV
-     * ,-----------------------------------------------------------------------------------.
-     * |A(TAB)| C(->)| !LANG|A(GRV)| C(<-)| >>|  | HOME |  ->  | PGUP | COPY | PASTE| DE_SW|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |C(TAB)|  TAB |  ESC |  ENT |VIM_GG| MPLY |  <-  |   ↓  |   ↑  |  ->  |  END | VIM_O|  
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LSFT | XXXX |S(DEL)| CAPS | VIM_V| MUTE | HOME | PGDN | LSFT | RFST | C(F) | C(F) |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | XXXX | XXXX | ____ | BSPC | ____ |     ____    |  ENT |  DEL | ____ | ____ | DE_SW|
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_NAV] = LAYOUT_planck_grid(
-        ALT_TAB, LCTL(KC_RGHT), LANG_SWITCH, LALT(KC_GRV), LCTL(KC_LEFT), KC_MNXT, KC_HOME, KC_RIGHT, KC_PGUP, LCTL(KC_INS), LSFT(KC_INS), KC_DE_SWITCH, 
-        CTL_TAB, KC_TAB, KC_ESC, KC_ENT, TD(TD_VIM_GG), KC_MPLY, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_END, VIM_O, 
-        KC_LSFT, KC_NO, LSFT(KC_DEL), KC_CAPS, VIM_V, KC_MUTE, KC_HOME, KC_PGDN, KC_LSFT, KC_RSFT, LCTL(KC_F), LCTL(KC_F), 
-        KC_NO, KC_NO, KC_TRNS, KC_BSPC, KC_TRNS, LT(_NAV, KC_SPC), LT(_NAV, KC_SPC), KC_ENT, KC_DEL, KC_TRNS, KC_TRNS, KC_DE_SWITCH
-    ),
-
-    /* _VIM
-     * ,-----------------------------------------------------------------------------------.
-     * |A(TAB)| C(->)| !LANG|A(GRV)| C(<-)| >>|  | HOME |  ->  | PGUP | COPY | PASTE| DE_SW|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |C(TAB)|  TAB |  ESC |  ENT |VIM_GG| MPLY |  <-  |   ↓  |   ↑  |  ->  |  END | VIM_O|  
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LSFT | XXXX |S(DEL)| CAPS | VIM_V| MUTE | HOME | PGDN | LSFT | RFST | C(F) | C(F) |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | XXXX | XXXX | !VIM | BSPC | ____ |     ____    |  ENT |  DEL | ____ |   ↓  |   ↑  |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_VIM] = LAYOUT_planck_grid(
-        ALT_TAB, LCTL(KC_RGHT), LANG_SWITCH, LALT(KC_GRV), LCTL(KC_LEFT), KC_MNXT, KC_HOME, KC_RIGHT, KC_PGUP, LCTL(KC_INS), LSFT(KC_INS), KC_DE_SWITCH, 
-        CTL_TAB, KC_TAB, KC_ESC, KC_ENT, TD(TD_VIM_GG), KC_MPLY, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_END, VIM_O, 
-        KC_LSFT, KC_NO, LSFT(KC_DEL), KC_CAPS, VIM_V, KC_MUTE, KC_HOME, KC_PGDN, KC_LSFT, KC_RSFT, LCTL(KC_F), LCTL(KC_F), 
-        KC_NO, KC_NO, TG(_VIM), KC_BSPC, KC_TRNS, LT(_NAV, KC_SPC), LT(_NAV, KC_SPC), KC_ENT, KC_DEL, KC_TRNS, KC_DOWN, KC_UP
-    ),
-
-    /* _NUM
-     * ,-----------------------------------------------------------------------------------.
-     * |  F1  |  F2  |  F3  |  F4  |  |<< |NUMLCK| >>|  |   7  |   8  |   9  |   -  | ____ |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F5  |  F6  |  F7  |  F8  | Vol+ | MPLY |   *  |   4  |   5  |   6  |   +  |   .  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F9  |  F10 |  F11 |  F12 | Vol- | MUTE |   =  |   1  |   2  |   3  |   /  |   ,  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | ____ | ____ | ____ | ____ | ____ |     ____    |   0  |   .  |   ,  |   =  | ____ |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_NUM] = LAYOUT_planck_grid(
-        KC_F1, KC_F2,  KC_F3,  KC_F4, KC_MPRV, KC_NUM,  KC_MNXT, KC_P7, KC_P8, KC_P9, KC_MINS, KC_TRNS, 
-        KC_F5, KC_F6,  KC_F7,  KC_F8, KC_VOLU, KC_MPLY, KC_ASTR, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_DOT, 
-        KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLD, KC_MUTE, KC_EQL, KC_P1, KC_P2, KC_P3, KC_SLSH, KC_COMM, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_DOT, KC_COMM, KC_EQL, KC_TRNS
-    ),
-
-    /* _MOUSE
-     * ,-----------------------------------------------------------------------------------.
-     * | XXXX | XXXX | MBTN4| MBTN5| XXXX | Bri+ | XXXX | MWHL↑|MAUS↑ | MWHL↑| XXXX | XXXX |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | XXXX | MBTN3| MBTN2| MBTN1| XXXX | MPLY | XXXX |MAUS<-|MAUS↓ |MAUS->| XXXX | XXXX |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F9  | XXXX | XXXX | XXXX | XXXX | Bri- | XXXX | MWHL↓| XXXX | XXXX | ____ | XXXX |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |!MOUSE| XXXX | XXXX | ____ | XXXX | MAUS_ACCEL2 | ____ | XXXX | XXXX |   ↓  |   ↑  |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_MOUSE] = LAYOUT_planck_grid(
-        KC_NO, KC_NO, KC_BTN4, KC_BTN5, KC_NO, KC_BRIU, KC_NO, KC_WH_U, KC_MS_U, KC_WH_U, KC_NO, KC_NO, 
-        KC_NO, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO, KC_MPLY, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, 
-        KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRID, KC_NO, KC_WH_D, KC_NO, KC_NO, KC_TRNS, KC_NO, 
-        TG(_MOUSE), KC_NO, KC_NO, KC_TRNS, KC_NO, KC_ACL2, KC_ACL2, KC_TRNS, KC_NO, KC_NO, KC_DOWN, KC_UP
-    )
-
-};
-
-// define the tap dance functions
-void dance_prn(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code16(KC_LPRN);
-    } else {
-        tap_code16(KC_LPRN);
-        tap_code16(KC_RPRN);
-        tap_code(KC_LEFT);
-    }
-}
-void dance_brc(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code(KC_LBRC);
-    } else {
-        tap_code(KC_LBRC);
-        tap_code(KC_RBRC);
-        tap_code(KC_LEFT);
-    }
-}
-void dance_cbr(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code16(KC_LCBR);
-    } else {
-        tap_code16(KC_LCBR);
-        tap_code16(KC_RCBR);
-        tap_code(KC_LEFT);
-    }
-}
-void dance_prn_de(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code16(KC_ASTR);
-    } else {
-        tap_code16(KC_ASTR);
-        tap_code16(KC_LPRN);
-        tap_code(KC_LEFT);
-    }
-}
-void dance_brc_de(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code16(RALT(KC_8));
-    } else {
-        tap_code16(RALT(KC_8));
-        tap_code16(RALT(KC_9));
-        tap_code(KC_LEFT);
-    }
-}
-void dance_cbr_de(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code16(RALT(KC_7));
-    } else {
-        tap_code16(RALT(KC_7));
-        tap_code16(RALT(KC_0));
-        tap_code(KC_LEFT);
-    }
-}
-void vim_gg(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code16(LCTL(KC_END));
-    } else {
-        tap_code16(LCTL(KC_HOME));
-    }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    // declare tap dance actions here
-    [TD_PRN] = ACTION_TAP_DANCE_FN(dance_prn), [TD_BRC] = ACTION_TAP_DANCE_FN(dance_brc), [TD_CBR] = ACTION_TAP_DANCE_FN(dance_cbr), [TD_PRN_DE] = ACTION_TAP_DANCE_FN(dance_prn_de), [TD_BRC_DE] = ACTION_TAP_DANCE_FN(dance_brc_de), [TD_CBR_DE] = ACTION_TAP_DANCE_FN(dance_cbr_de), [TD_VIM_GG] = ACTION_TAP_DANCE_FN(vim_gg)};
-
-float thumb_factor  = 0.95;
-float index_factor  = 1.1;
-float middle_factor = 1.2;
-float ring_factor   = 1.25;
-float pinky_factor  = 1.15;
-float td_factor     = 1.4;
-
-// define the per_key_tapping_term
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // thumb keys
-        case RSFT_T(KC_DEL):
-            return TAPPING_TERM * thumb_factor;
-        case RCTL_T(KC_TAB):
-            return TAPPING_TERM * thumb_factor;
-        case LT(_NAV, KC_LEFT):
-            return TAPPING_TERM * thumb_factor;
-        case LT(_NAV, KC_RIGHT):
-            return TAPPING_TERM * thumb_factor;
-        case LT(_LOWER, KC_BSPC):
-            return TAPPING_TERM * thumb_factor;
-        case LT(_LOWER_DE, KC_BSPC):
-            return TAPPING_TERM * thumb_factor;
-        case LT(_RAISE, KC_ENT):
-            return TAPPING_TERM * thumb_factor;
-        case LT(_RAISE_DE, KC_ENT):
-            return TAPPING_TERM * thumb_factor;
-        case LT(_NAV, KC_SPC):
-            return TAPPING_TERM * 1.0;
-        case LALT_T(KC_ESC):
-            return TAPPING_TERM * thumb_factor;
-
-        // index finger keys
-        case LCTL_T(KC_P):
-            return TAPPING_TERM * index_factor;
-        case RCTL_T(KC_L):
-            return TAPPING_TERM * (index_factor + 0.1);
-        case LT(_NUM, KC_B):
-            return TAPPING_TERM * (index_factor + 0.1);
-        case LT(_NUM, KC_J):
-            return TAPPING_TERM * index_factor;
-
-        // middle finger keys
-        case LSFT_T(KC_F):
-            return TAPPING_TERM * middle_factor;
-        case RSFT_T(KC_U):
-            return TAPPING_TERM * middle_factor;
-
-        // ring finger keys
-        case LALT_T(KC_W):
-            return TAPPING_TERM * ring_factor;
-        case LALT_T(KC_Y):
-            return TAPPING_TERM * ring_factor;
-        case LGUI_T(KC_TAB):
-            return TAPPING_TERM * ring_factor;
-
-        // pinky keys
-        case LGUI_T(KC_Q):
-            return TAPPING_TERM * pinky_factor;
-        case RGUI_T(KC_SCLN):
-            return TAPPING_TERM * pinky_factor;
-        case RGUI_T(KC_LBRC):
-            return TAPPING_TERM * pinky_factor;
-        case LT(_MOUSE, KC_Z):
-            return TAPPING_TERM * pinky_factor;
-        case LT(_MOUSE, KC_SLSH):
-            return TAPPING_TERM * pinky_factor;
-        case LCTL_T(KC_CAPS):
-            return TAPPING_TERM * pinky_factor;
-
-        // tap-dance actions
-        case TD(TD_PRN):
-            return TAPPING_TERM * td_factor;
-        case TD(TD_BRC):
-            return TAPPING_TERM * td_factor;
-        case TD(TD_CBR):
-            return TAPPING_TERM * td_factor;
-        case TD(TD_PRN_DE):
-            return TAPPING_TERM * td_factor;
-        case TD(TD_BRC_DE):
-            return TAPPING_TERM * td_factor;
-        case TD(TD_CBR_DE):
-            return TAPPING_TERM * td_factor;
-        case TD(TD_VIM_GG):
-            return TAPPING_TERM * td_factor;
-
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-// alt tab function setup
-bool is_alt_tab_active = false;
-bool is_ctl_tab_active = false;
-bool de_layout_active  = false;
-
-static uint16_t key_timer;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case WIDECOLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_WIDECOLEMAK);
-            }
-            return false;
-            break;
-        case HRWIDECOLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_HRWIDECOLEMAK);
-            }
-            return false;
-            break;
-        case GAMING:
-            if (record->event.pressed) {
-                layer_invert(_GAMING);
-            }
-            return false;
-            break;
-        case TG_COLEMAK:
-            if (record->event.pressed) {
-                tap_code(KC_ENT);
-                layer_invert(_WIDECOLEMAK);
-            }
-            return false;
-            break;
-        case VIM_O:
-            if (record->event.pressed) {
-                tap_code(KC_END);
-                tap_code(KC_ENT);
-            }
-            return false;
-            break;
-        case VIM_V:
-            if (record->event.pressed) {
-                if (get_mods() & MOD_MASK_SHIFT) {
-                    clear_mods();
-                } else {
-                    register_mods(MOD_LSFT);
-                }
-            }
-            return false;
-            break;
-        case KC_SVU_BU:  // increase backlight when pressing shift and vol up
-            if (record->event.pressed) {
-                if (get_mods() & MOD_MASK_SHIFT) {
-                    register_code(KC_BRIU);
-                } else if (get_mods() & MOD_MASK_CTRL) {
-                    register_code(KC_MNXT);
-                } else {
-                    register_code(KC_VOLU);
-                }
-            } else {
-                unregister_code(KC_BRIU);
-                unregister_code(KC_MNXT);
-                unregister_code(KC_VOLU);
-            }
-            return false;
-        case KC_SVD_BD:  // decrease backlight when pressing shift and vol up
-            if (record->event.pressed) {
-                if (get_mods() & MOD_MASK_SHIFT) {
-                    register_code(KC_BRID);
-                } else if (get_mods() & MOD_MASK_CTRL) {
-                    register_code(KC_MPRV);
-                } else {
-                    register_code(KC_VOLD);
-                }
-            } else {
-                unregister_code(KC_BRID);
-                unregister_code(KC_MPRV);
-                unregister_code(KC_VOLD);
-            }
-            return false;
-        case KC_TAB_MPLY:  // press tab or play/pause when ctrl is pressed
-            if (record->event.pressed) {
-                if (get_mods() & MOD_MASK_CTRL) {
-                    register_code(KC_MPLY);
-                } else {
-                    register_code(KC_TAB);
-                }
-            } else {
-                unregister_code(KC_MPLY);
-                unregister_code(KC_TAB);
-            }
-            return false;
-        case ALT_TAB:
-            if (record->event.pressed) {
-                if (!is_alt_tab_active) {
-                    is_alt_tab_active = true;
-                    add_mods(MOD_BIT(KC_LALT));
-                }
-                register_code(KC_TAB);
-            } else {
-                unregister_code(KC_TAB);
-            }
-            break;
-        case CTL_TAB:
-            if (record->event.pressed) {
-                if (!is_ctl_tab_active) {
-                    is_ctl_tab_active = true;
-                    add_mods(MOD_BIT(KC_LCTL));
-                }
-                register_code(KC_TAB);
-            } else {
-                unregister_code(KC_TAB);
-            }
-            break;
-        // the next case allows us to use alt_tab without a timer
-        case LT(_NAV, KC_SPC):
-            if (record->event.pressed) {
-            } else {
-                unregister_mods(MOD_LALT);
-                unregister_mods(MOD_LCTL);
-                is_alt_tab_active = false;
-                is_ctl_tab_active = false;
-            }
-            break;
-        case DE_ae:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods();
-                if ((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-                    clear_oneshot_mods();
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P1);
-                    tap_code(KC_P9);
-                    tap_code(KC_P6);  // Ä
-                } else {
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P2);
-                    tap_code(KC_P8);  // ä
-                }
-                unregister_mods(MOD_LALT);
-                set_mods(temp_mods);
-            }
-            return false;
-            break;
-        case DE_AE:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods() | get_oneshot_mods();
-                clear_oneshot_mods();
-                clear_mods();
-                add_mods(MOD_BIT(KC_LALT));
-                tap_code(KC_P0);
-                tap_code(KC_P1);
-                tap_code(KC_P9);
-                tap_code(KC_P6);  // Ä
-                unregister_mods(MOD_LALT);
-                set_mods(temp_mods);
-            }
-            return false;
-            break;
-        case DE_oe:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods();
-                if ((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-                    clear_oneshot_mods();
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P1);
-                    tap_code(KC_P4);  // Ö
-                } else {
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P4);
-                    tap_code(KC_P6);  // ö
-                }
-                unregister_mods(MOD_LALT);
-                set_mods(temp_mods);
-            }
-            return false;
-            break;
-        case DE_OE:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods() | get_oneshot_mods();
-                clear_oneshot_mods();
-                clear_mods();
-                add_mods(MOD_BIT(KC_LALT));
-                tap_code(KC_P0);
-                tap_code(KC_P2);
-                tap_code(KC_P1);
-                tap_code(KC_P4);  // Ö
-                unregister_mods(MOD_LALT);
-                set_mods(temp_mods);
-            }
-            return false;
-            break;
-        case DE_ue:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods();
-                if ((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-                    clear_oneshot_mods();
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P2);
-                    tap_code(KC_P0);  // Ü
-                } else {
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P5);
-                    tap_code(KC_P2);  // ü
-                }
-                unregister_mods(MOD_LALT);
-                set_mods(temp_mods);
-            }
-            return false;
-            break;
-        case KC_DE_SWITCH:
-            if (record->event.pressed) {
-                if (de_layout_active) {
-                    de_layout_active = false;  // deactivate German overlay
-                    set_single_persistent_default_layer(_HRWIDECOLEMAK);
-                } else {
-                    de_layout_active = true;  // activate German overlay
-                    set_single_persistent_default_layer(_HRWIDECOLEMAK_DE);
-                }
-                return false;
-            }
-            break;
-        case LANG_SWITCH:
-            if (record->event.pressed) {
-                register_mods(MOD_LALT);
-                register_code(KC_LSFT);
-                if (de_layout_active) {
-                    de_layout_active = false;  // deactivate German overlay
-                    set_single_persistent_default_layer(_HRWIDECOLEMAK);
-                } else {
-                    de_layout_active = true;  // activate German overlay
-                    set_single_persistent_default_layer(_HRWIDECOLEMAK_DE);
-                }
-            } else {
-                unregister_code(KC_LSFT);
-                unregister_mods(MOD_LALT);
-            }
-            return false;
-        case DE_SZ:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods();
-                if ((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-                    clear_oneshot_mods();
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P1);
-                    tap_code(KC_P7);
-                    tap_code(KC_P6);  // °
-                } else {
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P2);
-                    tap_code(KC_P3);  // ß
-                }
-                unregister_mods(MOD_LALT);
-                set_mods(temp_mods);
-            }
-            return false;
-            break;
-        case DE_EGRAVE:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods();
-                if ((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-                    clear_oneshot_mods();
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P0);
-                    tap_code(KC_P0);  // È
-                } else {
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P3);
-                    tap_code(KC_P2);  // è
-                }
-                unregister_mods(MOD_LALT);
-                set_mods(temp_mods);
-            }
-            return false;
-            break;
-        case DE_EAIGU:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods();
-                if ((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-                    clear_oneshot_mods();
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P0);
-                    tap_code(KC_P1);  // É
-                } else {
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P2);
-                    tap_code(KC_P3);
-                    tap_code(KC_P3);  // é
-                }
-                unregister_mods(MOD_LALT);
-                set_mods(temp_mods);
-            }
-            return false;
-            break;
-        case KC_CURRENCY:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods();
-                if ((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-                    clear_oneshot_mods();
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P1);
-                    tap_code(KC_P5);
-                    tap_code(KC_P7);  // ¥
-                } else {
-                    clear_mods();
-                    add_mods(MOD_BIT(KC_LALT));
-                    tap_code(KC_P0);
-                    tap_code(KC_P1);
-                    tap_code(KC_P2);
-                    tap_code(KC_P8);  // €
-                }
-                unregister_mods(MOD_LALT);
-                set_mods(temp_mods);
-            }
-            return false;
-            break;
-        case DE_SLSH_QUST:
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                layer_on(_MOUSE);
-            } else {
-                if (timer_elapsed(key_timer) < (TAPPING_TERM * pinky_factor)) {
-                    layer_off(_MOUSE);
-                    uint8_t temp_mods = get_mods() | get_oneshot_mods();
-                    if (temp_mods & MOD_MASK_SHIFT) {
-                        tap_code(KC_MINS);  // ?
-                    } else {
-                        tap_code16(KC_AMPR);  // /
-                    }
-                } else {
-                    layer_off(_MOUSE);
-                }
-            }
-            return false;
-            break;
-        case DE_QUOT:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods() | get_oneshot_mods();
-                if (temp_mods & MOD_MASK_SHIFT) {
-                    register_code(KC_2);  // \"
-                } else {
-                    register_code16(KC_PIPE);  // /'
-                }
-            } else {
-                unregister_code(KC_2);
-                unregister_code16(KC_PIPE);
-            }
-            return true;
-        case DE_DOT_RAB:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods() | get_oneshot_mods();
-                if (temp_mods & MOD_MASK_SHIFT) {
-                    register_code16(LSFT(KC_NUBS));  // > right angle bracket 
-                } else {
-                    register_code(KC_DOT);  // .
-                }
-            } else {
-                unregister_code16(LSFT(KC_NUBS));
-                unregister_code(KC_DOT);
-            }
-            return true;
-        case DE_COMM_LAB:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods() | get_oneshot_mods();
-                if (temp_mods & MOD_MASK_SHIFT) {
-                    clear_mods();
-                    clear_oneshot_mods();
-                    register_code16(KC_NUBS);  // < left angle bracket
-                    set_mods(temp_mods);
-                } else {
-                    register_code(KC_COMM);  // ,
-                }
-            } else {
-                unregister_code16(KC_NUBS);
-                unregister_code(KC_COMM);
-            }
-            return true;
-        case DE_SCLN:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods() | get_oneshot_mods();
-                if (temp_mods & MOD_MASK_SHIFT) {
-                    tap_code(KC_DOT);  // ;
-                } else {
-                    add_mods(MOD_BIT(KC_LSFT));
-                    tap_code(KC_COMM);  // :
-                    del_mods(MOD_BIT(KC_LSFT));
-                }
-                return false;
-            }
-            break;
-        case DE_BSLS:
-            if (record->event.pressed) {
-                uint8_t temp_mods = get_mods() | get_oneshot_mods();
-                clear_mods();
-                clear_oneshot_mods();
-                add_mods(MOD_BIT(KC_RALT));
-                if (temp_mods & MOD_MASK_SHIFT) {
-                    register_code(KC_NUBS);  // | Pipe
-                } else {
-                    register_code(KC_MINS);  // Backslash
-                }
-                set_mods(temp_mods);
-            } else {
-                unregister_code(KC_NUBS);
-                unregister_code(KC_MINS);
-            }
-            return true;
-        // switch multiplexing for escape, short tap for escape, long press for context menu
-        case M_ESCM:
-            if (record->event.pressed) {
-                key_timer = timer_read();
-            } else {
-                if (timer_elapsed(key_timer) > TAPPING_TERM) {
-                    tap_code(KC_APP);
-                } else {
-                    tap_code(KC_ESC);
-                }
-            }
-            return false;
-        case M_RGUI_SCLN:
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                add_mods(MOD_BIT(KC_RGUI));
-            } else {
-                del_mods(MOD_BIT(KC_RGUI));
-                if (timer_elapsed(key_timer) < (TAPPING_TERM * pinky_factor)) {
-                    uint8_t temp_mods = get_mods() | get_oneshot_mods();
-                    if (temp_mods & MOD_MASK_SHIFT) {
-                        tap_code(KC_DOT);  // ;
-                    } else {
-                        add_mods(MOD_BIT(KC_LSFT));
-                        tap_code(KC_COMM);  // :
-                        del_mods(MOD_BIT(KC_LSFT));
-                    }
-                } else {
-                    tap_code(KC_RGUI);
-                }
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-bool     muse_mode      = false;
-uint8_t  last_muse_note = 0;
-uint16_t muse_counter   = 0;
-uint8_t  muse_offset    = 70;
-uint16_t muse_tempo     = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (muse_mode) {
-        if (IS_LAYER_ON(_RAISE)) {
-            if (clockwise) {
-                muse_offset++;
-            } else {
-                muse_offset--;
-            }
-        } else {
-            if (clockwise) {
-                muse_tempo += 1;
-            } else {
-                muse_tempo -= 1;
-            }
-        }
-    } else {
-        if (clockwise) {
-#ifdef MOUSEKEY_ENABLE
-            tap_code(KC_MS_WH_DOWN);
-#else
-            tap_code(KC_PGDN);
-#endif
-        } else {
-#ifdef MOUSEKEY_ENABLE
-            tap_code(KC_MS_WH_UP);
-#else
-            tap_code(KC_PGUP);
-#endif
-        }
-    }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(KC_F)) {
-      // Anything you can do in a macro.
-      SEND_STRING("QMK is awesome.");
-    }
-    if (leader_sequence_two_keys(KC_D, KC_D)) {
-      SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
-    }
-    if (leader_sequence_three_keys(KC_D, KC_D, KC_S)) {
-      SEND_STRING("https://start.duckduckgo.com\n");
-    }
-    if (leader_sequence_two_keys(KC_A, KC_S)) {
-      register_code(KC_LGUI);
-      register_code(KC_S);
-      unregister_code(KC_S);
-      unregister_code(KC_LGUI);
-    }
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            return true;
-    }
-}
-
-uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LSFT_T(KC_S):
-            return 0;
-        case RSFT_T(KC_E):
-            return 0;
-        case LSFT_T(KC_D):
-            return 0;
-        case RSFT_T(KC_K):
-            return 0;
-        case LSFT_T(KC_F):
-            return 0;
-        case RSFT_T(KC_U):
-            return 0;
-        case LT(_RAISE, KC_ENT):
-            return 0;
-        case LT(_RAISE_DE, KC_ENT):
-            return 0;
-        case LT(_LOWER, KC_BSPC):
-            return 0;
-        case LT(_LOWER_DE, KC_BSPC):
-            return 0;
-        default:
-            return QUICK_TAP_TERM;
-    }
-}
-
-// Set RGB to change with layer changes
-#define HSV_DARKORANGE 10, 255, 255
-#define HSV_DARKPINK 150, 100, 255
-#define HSV_GRASS 57, 255, 255
-#define HSV_OCEAN 148, 255, 255
-
-// Light LEDs 1 to 9 in darkorange when HRCOLEMAK is active
-const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 10, HSV_DARKORANGE});
-// Light LEDs 1 to 9 in green when HRWIDECOLEMAK is active
-const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 10, HSV_OCEAN});
-// Light LEDs 1 to 9 in darkorange when de_layout_active is true
-const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS({3, 4, HSV_DARKORANGE}, {0, 3, HSV_OCEAN}, {8, 3, HSV_OCEAN});
-// Light LEDs 1 to 9 in red when GAMING layer is active
-const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 10, HSV_RED});
-// Light LEDs 1 to 9 in white when WIDECOLEMAK is active
-const rgblight_segment_t PROGMEM my_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 10, HSV_WHITE});
-// Light bottom LEDs in purple when ADJUST layer is active
-const rgblight_segment_t PROGMEM my_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 2, HSV_MAGENTA}, {7, 3, HSV_MAGENTA});
-// Light bottom LEDs in red when caps lock is active. Hard to ignore!
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_GRASS}, {7, 3, HSV_GRASS});
-// Light LEDs 1 to 9 in white when NAVIGATION is active
-const rgblight_segment_t PROGMEM my_nav_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 10, HSV_WHITE});
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t *const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_layer0_layer,   // hrcolemak
-                                                                               my_layer1_layer,   // hrwidecolemak
-                                                                               my_layer2_layer,   // de_layout
-                                                                               my_layer3_layer,   // gaming
-                                                                               my_layer4_layer,   // widecolemak
-                                                                               my_layer5_layer,   // adjust
-                                                                               my_nav_layer,      // nav
-                                                                               my_capslock_layer  // capslock
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(7, led_state.caps_lock);
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(3, layer_state_cmp(state, _GAMING));
-    rgblight_set_layer_state(4, layer_state_cmp(state, _WIDECOLEMAK));
-    if ((layer_state_cmp(state, _LOWER) && layer_state_cmp(state, _RAISE)) || (layer_state_cmp(state, _LOWER_DE) && layer_state_cmp(state, _RAISE_DE))) {
-        return state | (1UL << _ADJUST);
-    } else {
-        return state & ~(1UL << _ADJUST);
-    }
-    // state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-    rgblight_set_layer_state(5, layer_state_cmp(state, _ADJUST));
-    // return state;
-}
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(4, layer_state_cmp(state, _WIDECOLEMAK));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _HRWIDECOLEMAK));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _HRWIDECOLEMAK_DE));
-    return state;
-}
diff --git a/keyboards/planck/keymaps/jweickm/readme.md b/keyboards/planck/keymaps/jweickm/readme.md
deleted file mode 100644
index dd34822b421..00000000000
--- a/keyboards/planck/keymaps/jweickm/readme.md
+++ /dev/null
@@ -1,154 +0,0 @@
-# Semi-wide German/English MIT Planck Layout
-Added keymap for my planck MIT.
-It has a German and an English switching mode, so that it works the exact same with both OS languages.
-It is a semi-wide layout, with the left hand all the way to the edge, and with one extra column in the middle used for media controls.
-Home row mods implemented in the top row with individual tapping_terms for different fingers.
-Mouse layer accessible through the pinkies.
-Navigation layer on space.
-
-```
-/* _HRWIDECOLEMAK
-* ,-----------------------------------------------------------------------------------.
-* |  G-Q |  A-W |  S-F |  C-P |_Num-B|Vol/B+|_Num-J|  C-L |  S-U |  A-Y |  G-/ |   ü  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |   A  |   R  |   S  |   T  |   G  | TAB  |   M  |   N  |   E  |   I  |   O  |   '  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |_Mo-Z |   X  |   C  |   D  |   V  |Vol/B-|   K  |   H  |   ,  |   .  |_Mo-/ |   \  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |C-CAPS| LEAD |MN-ESC|_L-BSP| LSFT |  _Nav-SPC   |_R-ENT|S-DEL | RALT |_Mo <-|_Mo ->|
-* `-----------------------------------------------------------------------------------'
-*/
-/* _HRWIDECOLEMAK_DE
-* same as above, when the PC is set to German layout
-* ,-----------------------------------------------------------------------------------.
-* |  G-Q |  A-W |  S-F |  C-P |_Num-B|Vol/B+|_Num-J|  C-L |  S-U |  A-Y |  G-/ |   ü  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |   A  |   R  |   S  |   T  |   G  | TAB  |   M  |   N  |   E  |   I  |   O  |   '  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |_Mo-Z |   X  |   C  |   D  |   V  |Vol/B-|   K  |   H  |   ,  |   .  |_Mo-/ |   \  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |C-CAPS| LEAD |MN-ESC|_L-BSP| LSFT |  _Nav-SPC   |_R-ENT|S-DEL | RALT |_Mo <-|_Mo ->|
-* `-----------------------------------------------------------------------------------'
-*/
-/* _GAMING
-* ,-----------------------------------------------------------------------------------.
-* | ESC  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |  F5  |  F8  |  F9  |Vol/B+|
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | TAB  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |Vol/B-|
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | LSFT |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   Z  |   M  |   ;  |_CM-EN|
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | LCTL |   C  |   B  |   X  | LALT |    SPACE    | ENT  | RALT | ____ | ____ | !GAME|
-* `-----------------------------------------------------------------------------------'
-*/
-/* WIDECOLEMAK
-* no mod taps
-* ,-----------------------------------------------------------------------------------.
-* |   Q  |   W  |   F  |   P  |   B  |Vol/B+|   J  |   L  |   U  |   Y  |   /  |   Ü  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |   A  |   R  |   S  |   T  |   G  | TAB  |   M  |   N  |   E  |   I  |   O  |   '  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |   Z  |   X  |   C  |   D  |   V  |Vol/B-|   K  |   H  |   ,  |   .  |   /  |!CM-EN|
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |C-CAPS|G-TAB |MN-ESC|_L-BSP| LSFT |  _NAV-SPC   |_R-ENT|S-DEL |C-TAB |_Mo <-|_Mo ->|
-* `-----------------------------------------------------------------------------------'
-*/
-/* _LOWER
-* ,-----------------------------------------------------------------------------------.
-* |   !  |   @  |   #  |   $  |   %  |   ~  |   ^  |   &  |   *  |   (  |   )  |   Ö  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   _  |   +  |   {  |   }  |   Ä  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   /  |   \  |   |  |   €  |   è  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |!MOUSE| ____ | ____ | ____ | ____ |     ____    | ____ | Vol- | Vol+ |   ↓  |   ↑  |
-* `-----------------------------------------------------------------------------------'
-*/
-/* _LOWER_DE
-* ,-----------------------------------------------------------------------------------.
-* |   !  |   @  |   #  |   $  |   %  |   ~  |   ^  |   &  |   *  |   (  |   )  |   Ö  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   _  |   +  |   {  |   }  |   Ä  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   /  |   \  |   |  |   €  |   `  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |!MOUSE| ____ | ____ | ____ | ____ |     ____    | ____ | Vol- | Vol+ |   ↓  |   ↑  |
-* `-----------------------------------------------------------------------------------'
-*/
-/* _RAISE
-* ,-----------------------------------------------------------------------------------.
-* |   1  |   2  |   3  |   4  |   5  |   `  |   6  |   7  |   8  |   9  |   0  |   ö  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   -  |   =  |   [  |   ]  |   ä  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   \  |   ,  |   .  |   /  |   é  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |!MOUSE| ____ | ____ | BSPC | ____ |     ____    | ____ |  |<< | >>|  |   ↓  |   ↑  |
-* `-----------------------------------------------------------------------------------'
-*/
-/* _RAISE_DE
-* ,-----------------------------------------------------------------------------------.
-* |   1  |   2  |   3  |   4  |   5  |   `  |   6  |   7  |   8  |   9  |   0  |   ö  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   -  |   =  |   [  |   ]  |   ä  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   \  |   ,  |   .  |   /  |   ´  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |!MOUSE| ____ | ____ | BSPC | ____ |     ____    | ____ |  |<< | >>|  |   ↓  |   ↑  |
-* `-----------------------------------------------------------------------------------'
-*/
-/* _ADJUST
-* ,-----------------------------------------------------------------------------------.
-* | A-SFT| RESET| Debug|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | A-GRV|EEPRST|MUNEXT| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | ____ |AUPREV|AUNEXT| MU_ON|MU_OFF| MI_ON|MI_OFF| Vol- | MPLY | Vol+ | ____ | ____ |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | ____ | ____ | ____ | ____ | ____ |     ____    | ____ | ____ | ____ | ____ |EEPRST|
-* `-----------------------------------------------------------------------------------'
-*/
-/* _NAV
-* ,-----------------------------------------------------------------------------------.
-* |A(TAB)| C(->)| !LANG|A(GRV)| C(<-)| >>|  | HOME |  ->  | PGUP | COPY | PASTE| DE_SW|
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |C(TAB)|  TAB |  ESC |  ENT |VIM_GG| MPLY |  <-  |   ↓  |   ↑  |  ->  |  END | VIM_O|  
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | LSFT | XXXX |S(DEL)| CAPS | VIM_V| MUTE | HOME | PGDN | LSFT | RFST | C(F) | C(F) |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | XXXX | XXXX | ____ | BSPC | ____ |     ____    |  ENT |  DEL | ____ | ____ | DE_SW|
-* `-----------------------------------------------------------------------------------'
-*/
-/* _VIM
-* ,-----------------------------------------------------------------------------------.
-* |A(TAB)| C(->)| !LANG|A(GRV)| C(<-)| >>|  | HOME |  ->  | PGUP | COPY | PASTE| DE_SW|
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |C(TAB)|  TAB |  ESC |  ENT |VIM_GG| MPLY |  <-  |   ↓  |   ↑  |  ->  |  END | VIM_O|  
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | LSFT | XXXX |S(DEL)| CAPS | VIM_V| MUTE | HOME | PGDN | LSFT | RFST | C(F) | C(F) |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | XXXX | XXXX | !VIM | BSPC | ____ |     ____    |  ENT |  DEL | ____ |   ↓  |   ↑  |
-* `-----------------------------------------------------------------------------------'
-*/
-/* _NUM
-* ,-----------------------------------------------------------------------------------.
-* |  F1  |  F2  |  F3  |  F4  |  |<< |NUMLCK| >>|  |   7  |   8  |   9  |   -  | ____ |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F5  |  F6  |  F7  |  F8  | Vol+ | MPLY |   *  |   4  |   5  |   6  |   +  |   .  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F9  |  F10 |  F11 |  F12 | Vol- | MUTE |   =  |   1  |   2  |   3  |   /  |   ,  |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | ____ | ____ | ____ | ____ | ____ |     ____    |   0  |   .  |   ,  |   =  | ____ |
-* `-----------------------------------------------------------------------------------'
-*/
-/* _MOUSE
-* ,-----------------------------------------------------------------------------------.
-* | XXXX | XXXX | MBTN4| MBTN5| XXXX | Bri+ | XXXX | MWHL↑|MAUS↑ | MWHL↑| XXXX | XXXX |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | XXXX | MBTN3| MBTN2| MBTN1| XXXX | MPLY | XXXX |MAUS<-|MAUS↓ |MAUS->| XXXX | XXXX |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |  F9  | XXXX | XXXX | XXXX | XXXX | Bri- | XXXX | MWHL↓| XXXX | XXXX | ____ | XXXX |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |!MOUSE| XXXX | XXXX | ____ | XXXX | MAUS_ACCEL2 | ____ | XXXX | XXXX |   ↓  |   ↑  |
-* `-----------------------------------------------------------------------------------'
- */
diff --git a/keyboards/planck/keymaps/jweickm/rules.mk b/keyboards/planck/keymaps/jweickm/rules.mk
deleted file mode 100644
index 067ac4768c9..00000000000
--- a/keyboards/planck/keymaps/jweickm/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-CONSOLE_ENABLE = no         # Console for debug
-LEADER_ENABLE = yes
-TAP_DANCE_ENABLE = yes			# enable tap dance functionality
-
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/kanbara/config.h b/keyboards/planck/keymaps/kanbara/config.h
deleted file mode 100644
index b701b9b40df..00000000000
--- a/keyboards/planck/keymaps/kanbara/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2021 Jay Morrow
- *
- * 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
-    #ifdef TEMPO_DEFAULT
-        #undef TEMPO_DEFAULT
-        #define TEMPO_DEFAULT 80
-    #endif
-
-    #define STARTUP_SONG SONG(MAJOR_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND), \
-                                  SONG(WORKMAN_SOUND) \
-                                }
-#endif
diff --git a/keyboards/planck/keymaps/kanbara/keymap.c b/keyboards/planck/keymaps/kanbara/keymap.c
deleted file mode 100644
index c3574ca4573..00000000000
--- a/keyboards/planck/keymaps/kanbara/keymap.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Copyright 2021 Jay Morrow
- *
- * 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 planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _LEAGUE,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-  _LRAISE,
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  LEAGUE,
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-#define LRAISE MO(_LRAISE)
-
-#define KC_LQ LCTL(KC_Q)
-#define KC_LW LCTL(KC_W)
-#define KC_LE LCTL(KC_E)
-#define KC_LR LCTL(KC_R)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Adjst| Ctrl | Alt  | GUI  | SPC  | Lower| Raise| Enter| Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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,
-    ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_ENT,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Adjst| Ctrl | Alt  | GUI  | SPC  | Lower| Raise| Enter| Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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,
-    ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_ENT,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* League
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |      |      |      | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |  Q   |  W   |  E   |  R   |  G   |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   P  |  B   |  S   |  D   |  F   |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust|      |      |      |      | Spc  | Raise|      | Ent  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LEAGUE] = LAYOUT_planck_grid(
-    KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    XXXXXXX,  XXXXXXX, XXXXXXX, KC_BSPC,
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_G,    XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_P,    KC_B,    KC_S,    KC_D,    KC_F,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX,
-    ADJUST,  XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  LRAISE,  XXXXXXX, KC_ENT,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |      |   _  |   +  |   \  |   {  |   }  |      |   7  |   8  |   9  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ~  |      |   _  |   =  |   |  |   [  |   ]  |      |   4  |   5  |   6  |  *   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |   (  |   )  |      |   1  |   2  |   3  |  -   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |  0   |   ,  |  .   |  +   |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_GRV,  XXXXXXX, KC_MINS, KC_PLUS, KC_BSLS, KC_LCBR, KC_RCBR, XXXXXXX,  KC_7,    KC_8,    KC_9,    KC_SLSH,
-    KC_TILD, XXXXXXX, KC_UNDS,  KC_EQL, KC_PIPE, KC_LBRC, KC_RBRC, XXXXXXX,  KC_4,    KC_5,    KC_6,    KC_ASTR,
-    _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, XXXXXXX,  KC_1,    KC_2,    KC_3,    KC_MINS,
-    _______, _______, _______, _______, _______, _______, _______, _______,  KC_0,    KC_COMM, KC_DOT,  KC_PLUS
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   F1 |   F2 |   F3 |   F4 |   F5 |  F6  |  F7  |  F8  |  F9  |  F10 | Home |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |   !  |   @  |  #   |   $  |  %   |  ^   |  &   |  *   |      |      | PgUp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | Vol- |  BR- |  BR+ | Vol+ |      |      |      | PgDn |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_HOME,
-    KC_DEL,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR,  _______, _______, KC_PGUP,
-    _______, _______, _______, _______, KC_VOLD, KC_BRMD, KC_BRMU, KC_VOLU,  _______, _______, _______, KC_PGDN,
-    _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, KC_END
-),
-
-/* Adjust
- * ,-----------------------------------------------------------------------------------.
- * |Reset |Debug |      |      |      |      |      |      |      |      |      |Qwerty|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |Colmk |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |League|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, QWERTY,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, COLEMAK,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LEAGUE,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* League Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |  F2  |  F3  |  F4  |  F5  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Ctrl-Q|Ctrl-W|Ctrl-E|Ctrl-R|      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LRAISE] = LAYOUT_planck_grid(
-    _______, KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, _______,  _______, _______, _______,
-    _______, KC_LQ,   KC_LW,   KC_LE,   KC_LR,   _______, _______, _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
-),
-
-
-};
-
-// set the default layer in ROM so that we preserve state across power transitions
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-   case LEAGUE:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_LEAGUE);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/kanbara/readme.md b/keyboards/planck/keymaps/kanbara/readme.md
deleted file mode 100644
index de32a84d298..00000000000
--- a/keyboards/planck/keymaps/kanbara/readme.md
+++ /dev/null
@@ -1,118 +0,0 @@
-kanbara's layout
-=======================
-This layout contains a Colemak and Qwerty mode (for easier pair programming with colleagues)
-as well as a mode specifically to play League of Legends, as the normal mode does not provide
-for accessible enough numbers and function keys
-
-
-## Base Layers (Qwerty/Colemak/League)
-After lots of tweaking, I've found that putting brackets in the middle is easier for
-programming, and having a separate numpad input is quite handy.
-
-- Contains split `space` and `enter`
-- Designed for macOS
-- Keeps the `Tab`/`Esc` swap which I quite like
-- Note the removal of evil caps lock
-
-### Qwerty
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Adjst| Ctrl | Alt  | GUI  | SPC  | Lower| Raise| Enter| Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-### Colemak
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Adjst| Ctrl | Alt  | GUI  | SPC  | Lower| Raise| Enter| Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-### League
-
-- Has it's own raise just for F-keys and Ctrl+{Q,W,E,R} as a hold toggle
-- Just the base keys needed for the game + the adjust and backspace
-
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |      |      |      | Bksp |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Esc  |  Q   |  W   |  E   |  R   |  G   |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|   P  |  B   |  S   |  D   |  F   |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|Adjust|      |      |      |      | Spc  | Raise|      | Ent  |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
-
-#### Raise
-```
-,-----------------------------------------------------------------------------------.
-|      |  F2  |  F3  |  F4  |  F5  |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |Ctrl-Q|Ctrl-W|Ctrl-E|Ctrl-R|      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
-
-## Lower Layer (Programming symbols + numpad)
-I've put a numpad on the right side, and brackets in the middle. I found that putting
-the shifted equivalents of `-`, `+`, `\` and `~` are quite convenient to type with one hand
-
-```
-,-----------------------------------------------------------------------------------.
-|   `  |      |   _  |   +  |   \  |   {  |   }  |      |   7  |   8  |   9  |  /   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|   ~  |      |   _  |   =  |   |  |   [  |   ]  |      |   4  |   5  |   6  |  *   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |   (  |   )  |      |   1  |   2  |   3  |  -   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |  0   |   ,  |  .   |  +   |
-`-----------------------------------------------------------------------------------'
-```
-
-## Raise Layer (Function keys + shifted numbers)
-Here are the Function keys, as well as shifted 1-9 in order, and some nav and OS keys
-
-```
-,-----------------------------------------------------------------------------------.
-|   ~  |   F1 |   F2 |   F3 |   F4 |   F5 |  F6  |  F7  |  F8  |  F9  |  F10 | Home |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Del  |   !  |   @  |  #   |   $  |  %   |  ^   |  &   |  *   |      |      | PgUp |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      | Vol- |  BR- |  BR+ | Vol+ |      |      |      | PgDn |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      | End  |
-`-----------------------------------------------------------------------------------'
-```
-
-## Adjust Layer
-Contains reset, debug and the layer on the right which are set in EEPROM across power
-transitions
-
-```
-,-----------------------------------------------------------------------------------.
-|Reset |Debug |      |      |      |      |      |      |      |      |      |Qwerty|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |Colmk |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |League|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/kanbara/rules.mk b/keyboards/planck/keymaps/kanbara/rules.mk
deleted file mode 100644
index 1286dbfa86e..00000000000
--- a/keyboards/planck/keymaps/kanbara/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = yes
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = no
-AUDIO_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/planck/keymaps/kelorean/config.h b/keyboards/planck/keymaps/kelorean/config.h
deleted file mode 100644
index 8b6773ed094..00000000000
--- a/keyboards/planck/keymaps/kelorean/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/planck/keymaps/kelorean/keymap.c b/keyboards/planck/keymaps/kelorean/keymap.c
deleted file mode 100644
index 0091a10f9bc..00000000000
--- a/keyboards/planck/keymaps/kelorean/keymap.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Esc  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Bksp |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Sft/En|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Brite| Alt  | GUI  |Lower |    Space    |Raise | Left |  Up  | Down |Ctr/Rt|
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_ESC,
-  KC_BSPC,   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,   SFT_T(KC_ENT),
-  KC_LCTL,   BACKLIT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_UP,   KC_DOWN,   CTL_T(KC_RGHT)
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Esc  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Bksp |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Sft/Es|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Sft/En|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Brite| Alt  | GUI  |Lower |    Space    |Raise | Left |  Up  | Down |Ctr/Rt|
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,   KC_ESC,
-  KC_BSPC,   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,   SFT_T(KC_ENT),
-  KC_LCTL,   BACKLIT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_UP,   KC_DOWN,   CTL_T(KC_RGHT)
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Esc  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Bksp |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Sft/Es|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Sft/En|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Brite| Alt  | GUI  |Lower |    Space    |Raise | Left |  Up  | Down |Ctr/Rt|
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,    KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,      KC_ESC,
-  KC_BSPC,   KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,      KC_QUOT,
-  KC_LSFT,   KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,      SFT_T(KC_ENT),
-  KC_LCTL,   BACKLIT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_UP,   KC_DOWN,   CTL_T(KC_RGHT)
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        PORTE &= ~(1<<6);
-      } else {
-        unregister_code(KC_RSFT);
-        PORTE |= (1<<6);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/kelorean/readme.md b/keyboards/planck/keymaps/kelorean/readme.md
deleted file mode 100644
index fd1f3517083..00000000000
--- a/keyboards/planck/keymaps/kelorean/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The Default Planck Layout
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/kifinnsson/config.h b/keyboards/planck/keymaps/kifinnsson/config.h
deleted file mode 100644
index 9020d2b9f88..00000000000
--- a/keyboards/planck/keymaps/kifinnsson/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/kifinnsson/keymap.c b/keyboards/planck/keymaps/kifinnsson/keymap.c
deleted file mode 100644
index 5f6ff887316..00000000000
--- a/keyboards/planck/keymaps/kifinnsson/keymap.c
+++ /dev/null
@@ -1,573 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-bool     is_lgui_active = false;
-uint16_t lgui_timer     = 0;
-
-
-enum planck_layers { _COLEMAK, _LOWER, _RAISE, _EXTEND, _MACRO, _ADJUST };
-
-enum planck_keycodes {
-    KI_BSPC = SAFE_RANGE,
-    KI_COMM,
-    KI_DOT,
-    KI_ESC,
-    KI_QUOT,
-    KI_SCLN,
-    KI_SLSH,
-    KI_TAB,
-    KI_A,
-    KI_B,
-    KI_C,
-    KI_D,
-    KI_E,
-    KI_F,
-    KI_G,
-    KI_H,
-    KI_I,
-    KI_J,
-    KI_K,
-    KI_L,
-    KI_M,
-    KI_N,
-    KI_O,
-    KI_P,
-    KI_Q,
-    KI_R,
-    KI_S,
-    KI_T,
-    KI_U,
-    KI_V,
-    KI_W,
-    KI_X,
-    KI_Y,
-    KI_Z,
-    KI_WLFT,
-    KI_WRGT,
-    KI_WUP,
-    KI_WDN
-    };
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define MACROS MO(_MACRO)
-#define EXTEND MO(_EXTEND)
-#define SPC_LOW LT(_LOWER, KC_SPC)
-#define SPC_RAI LT(_RAISE, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Colemak
-     * ,------------------------------------------------------------------------------------.
-     * | Tab  |   Q  |   W  |   F  |   P  |   G   |   J   |   L  |   U  |   Y  |   ;  | Bksp |
-     * |------+------+------+------+------+-------+-------+------+------+------+------+------|
-     * | Esc  |   A  |   R  |   S  |   T  |   D   |   H   |   N  |   E  |   I  |   O  |  "   |
-     * |------+------+------+------+------+-------+-------+------+------+------+------+------|
-     * | Shift|   Z  |   X  |   C  |   V  |   B   |   K   |   M  |   ,  |   .  |   /  |Enter |
-     * |------+------+------+------+------+-------+-------+------+------+------+------+------|
-     * | Brite| Ctrl | Alt  | GUI  |Lower |SPC_LOW|SPC_RAI|Raise | Left | Down |  Up  |Right |
-     * `-------------------------------------------------------------------------------------'
-     */
-    [_COLEMAK] = LAYOUT_planck_grid(
-        KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,  KC_G,    KC_J,    KC_L,  KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-        EXTEND,  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_ENT,
-        MACROS,  KC_LCTL, KC_LALT, KC_LGUI, LOWER, SPC_LOW, SPC_RAI, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-        ),
-
-    /* Lower
-     * ,-----------------------------------------------------------------------------------.
-     * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |XXXXXX|XXXXXX| Home | End  |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_planck_grid(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-        _______, 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,  XXXXXXX, XXXXXXX, KC_HOME, KC_END,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-        ),
-
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |XXXXXX|XXXXXX|Pg Up |Pg Dn |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_planck_grid(
-        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_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,  XXXXXXX, XXXXXXX, KC_PGUP, KC_PGDN, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-        ),
-
-    /* Extend
-     * ,-----------------------------------------------------------------------------------.
-     * |      | Esc  | WH_U | WBAK | WFWD | MS_U | PgUp | Home |  Up  | End  | Del  | Esc  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      | Alt  | WH_D |Shift | Ctrl | MS_D | PgDn | Left | Down |Right | Bksp | Menu |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | WH_L | Undo | Cut  | Copy |Paste |MS_B_1|MS_B_2|MS_B_3| MS_L | MS_R | WH_R |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_EXTEND] = LAYOUT_planck_grid(
-        _______, KC_ESC,  KC_WH_U, KC_WBAK, KC_WFWD, KC_MS_U, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,  KC_ESC,
-        _______, KC_LALT, KC_WH_D, KC_LSFT, KC_LCTL, KC_MS_D, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, KC_APP,
-        KC_WH_L, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE, KC_BTN1, KC_BTN2, KC_BTN3, KC_MS_L, KC_MS_R, KC_WH_R, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-        ),
-
-    /* Macros
-     * ,--------------------------------------------------------------------------------------.
-     * |KI_TAB| KI_Q | KI_W | KI_F | KI_P | KI_G | KI_J | KI_L | KI_U  | KI_Y |KI_SCLN|KI_BSPC|
-     * |------+------+------+------+------+------+------+------+-------+------+-------+-------|
-     * |KI_ESC| KI_A | KI_R | KI_S | KI_T | KI_D | KI_H | KI_N | KI_E  | KI_I | KI_O  |KI_QUOT|
-     * |------+------+------+------+------+------+------+------+-------+------+-------+-------|
-     * |      | KI_Z | KI_X | KI_C | KI_V | KI_B | KI_K | KI_M |KI_COMM|KI_DOT|KI_SLSH|       |
-     * |------+------+------+------+------+------+------+------+-------+------+-------+-------|
-     * |      |      |      |      |      |      |      |      |KI_WLFT|KI_WDN|KI_WUP |KI_WGRT|
-     * `--------------------------------------------------------------------------------------'
-     */
-    [_MACRO] = LAYOUT_planck_grid(
-        KI_TAB,  KI_Q,    KI_W,    KI_F,    KI_P,    KI_G,    KI_J,    KI_L,    KI_U,    KI_Y,   KI_SCLN, KI_BSPC,
-        KI_ESC,  KI_A,    KI_R,    KI_S,    KI_T,    KI_D,    KI_H,    KI_N,    KI_E,    KI_I,   KI_O,    KI_QUOT,
-        _______, KI_Z,    KI_X,    KI_C,    KI_V,    KI_B,    KI_K,    KI_M,    KI_COMM, KI_DOT, KI_SLSH, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KI_WLFT, KI_WDN, KI_WUP,  KI_WRGT
-        ),
-
-    /* Adjust (Lower + Raise)
-     * ,-----------------------------------------------------------------------------------.
-     * |      | Reset| Debug|      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |AGnorm|AGswap|      |Colemk|      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_ADJUST] = LAYOUT_planck_grid(
-        _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-        )
-    };
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); }
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode)
-        //
-        // Non-Alpha Macros
-        //
-        // 'Backspace' Macro
-        case KI_BSPC:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Backspace");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'Comma' Macro
-        case KI_COMM:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Comma");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'Dot' Macro
-        case KI_DOT:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Dot");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'Escape' Macro
-        case KI_ESC:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Escape");
-            } else {
-            }
-        // 'Quote' Macro
-        case KI_QUOT:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Quote");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'Semicolon' Macro
-        case KI_SCLN:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Semicolon");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'Slash' Macro
-        case KI_SLSH:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Slash");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'Tab' Macro
-        case KI_TAB:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Tab");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        //
-        // Alpha Macros
-        //
-        // 'A' Macro
-        case KI_A:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED A");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'B' Macro
-        case KI_B:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED B");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'C' Macro
-        case KI_C:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED C");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'D' Macro
-        case KI_D:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED D");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'E' Macro
-        case KI_E:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED E");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'F' Macro
-        case KI_F:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED F");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'G' Macro
-        case KI_G:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED G");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'H' Macro
-        case KI_H:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED H");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'I' Macro
-        case KI_I:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED I");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'J' Macro
-        case KI_J:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED J");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'K' Macro
-        case KI_K:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED K");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'L' Macro
-        case KI_L:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED L");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'M' Macro
-        case KI_M:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED M");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'N' Macro
-        case KI_N:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED N");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'O' Macro
-        case KI_O:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED O");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'P' Macro
-        case KI_P:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED P");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'Q' Macro
-        case KI_Q:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Q");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'R' Macro
-        case KI_R:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED R");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'S' Macro
-        case KI_S:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED S");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'T' Macro
-        case KI_T:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED T");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'U' Macro
-        case KI_U:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED U");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'V' Macro
-        case KI_V:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED V");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'W' Macro
-        case KI_W:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED W");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'X' Macro
-        case KI_X:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED X");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'Y' Macro
-        case KI_Y:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Y");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // 'Z' Macro
-        case KI_Z:
-            if (record->event.pressed) {
-                // Reserved for future use
-                //SEND_STRING("RESERVED Z");
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        //
-        // Arrow key macros
-        //
-        // Windows Win+Left tap to move window without resetting KC_LGUI
-        // Additional code is in matrix_scan_user()
-        case KI_WLFT:
-            if (record->event.pressed) {
-                if (!is_lgui_active) {
-                    is_lgui_active = true;
-                    register_code(KC_LGUI);
-                }
-                lgui_timer = timer_read();
-                tap_code(KC_LEFT);
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // Windows Win+Right tap to move window without resetting KC_LGUI
-        // Additional code is in matrix_scan_user()
-        case KI_WRGT:
-            if (record->event.pressed) {
-                if (!is_lgui_active) {
-                    is_lgui_active = true;
-                    register_code(KC_LGUI);
-                }
-                lgui_timer = timer_read();
-                tap_code(KC_RIGHT);
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // Windows Win+Up tap to move window without resetting KC_LGUI
-        // Additional code is in matrix_scan_user()
-        case KI_WUP:
-            if (record->event.pressed) {
-                if (!is_lgui_active) {
-                    is_lgui_active = true;
-                    register_code(KC_LGUI);
-                }
-                lgui_timer = timer_read();
-                tap_code(KC_UP);
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        // Windows Win+Down tap to move window without resetting KC_LGUI
-        // Additional code is in matrix_scan_user()
-        case KI_WDN:
-            if (record->event.pressed) {
-                if (!is_lgui_active) {
-                    is_lgui_active = true;
-                    register_code(KC_LGUI);
-                }
-                lgui_timer = timer_read();
-                tap_code(KC_DOWN);
-            } else {
-            }
-            return false;  // Skip all further processing of this key
-            break;
-        default:
-            return true;  // Process all other keycodes normally
-            break;
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-    // Check if KC_LGUI is active in KI_WLFT, KI_WRGT, KI_WUP
-    if (is_lgui_active) {
-        if (timer_elapsed(lgui_timer) > 1000) {
-            unregister_code(KC_LGUI);
-            is_lgui_active = false;
-        }
-    }
-}
diff --git a/keyboards/planck/keymaps/kifinnsson/readme.md b/keyboards/planck/keymaps/kifinnsson/readme.md
deleted file mode 100644
index 1a6c86e2a8a..00000000000
--- a/keyboards/planck/keymaps/kifinnsson/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# kifinnsson's planck layout
diff --git a/keyboards/planck/keymaps/kifinnsson/rules.mk b/keyboards/planck/keymaps/kifinnsson/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/kifinnsson/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/kloki/config.h b/keyboards/planck/keymaps/kloki/config.h
deleted file mode 100644
index 6166fea4a77..00000000000
--- a/keyboards/planck/keymaps/kloki/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/planck/keymaps/kloki/keymap.c b/keyboards/planck/keymaps/kloki/keymap.c
deleted file mode 100644
index 9ba40f318b4..00000000000
--- a/keyboards/planck/keymaps/kloki/keymap.c
+++ /dev/null
@@ -1,147 +0,0 @@
-#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _WORKMAN,
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  WORKMAN = SAFE_RANGE,
-  QWERTY,
-  LOWER,
-  RAISE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Workman
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   D  |   R  |   W  |   B  |   J  |   F  |   U  |   P  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ct/E |   A  |   S  |   H  |   T  |   G  |   Y  |   N  |   E  |   O  |   I  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   M  |   C  |   V  |   K  |   L  |   ,  |   .  |   /  | " '  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | GUI  | Alt  | Alt  |  [   |   ]  |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_WORKMAN] = LAYOUT_planck_grid(
-  KC_TAB,        KC_Q,    KC_D,    KC_R,    KC_W,  KC_B,    KC_J,    KC_F,  KC_U,    KC_P,    KC_SCLN, KC_BSPC ,
-  CTL_T(KC_ESC), KC_A,    KC_S,    KC_H,    KC_T,  KC_G,    KC_Y,    KC_N,  KC_E,    KC_O,    KC_I,    KC_ENT  ,
-  KC_LSFT,       KC_Z,    KC_X,    KC_M,    KC_C,  KC_V,    KC_K,    KC_L,  KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT ,
-  KC_LGUI,       KC_LALT, KC_LBRC, KC_RBRC, LOWER, KC_SPC,  KC_SPC,  RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-
-[_QWERTY] = LAYOUT_planck_grid(
-  _______, KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,    KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,    KC_BSPC,
-  _______, KC_A,    KC_S,    KC_D,    KC_F,  KC_G,    KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN, KC_ENT ,
-  _______, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,    KC_N,    KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
-  _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______
-),
-
-/* LOWER
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  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_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_BTN1, KC_MS_U, KC_BTN2, _______, _______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* RAISE
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   {  |   }  |   *  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |   #  |   $  |   (  |   )  |   `  |  -   |   _  |   +  |   =  |   \  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   %  |   ^  |   [  |   ]  |   ~  |   &  |  <   |   >  | Home | End  |   |  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_ASTR, KC_CIRC, KC_AMPR, KC_ASTR,  KC_LPRN, KC_RPRN, KC_DEL ,
-  KC_DEL,  KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,  KC_MINS, KC_UNDS, KC_PLUS,  KC_EQL, KC_BSLS,  _______,
-  _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_LABK, KC_RABK,  KC_HOME, KC_END,  KC_PIPE,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT,  KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |   T  |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|      |      |Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  _______, _______, QWERTY,  WORKMAN, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-};
-
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case WORKMAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WORKMAN);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/kloki/readme.md b/keyboards/planck/keymaps/kloki/readme.md
deleted file mode 100644
index 9b3ec3e00e4..00000000000
--- a/keyboards/planck/keymaps/kloki/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Kloki's planck layout
-
-Pretty much default with added workman layout. Removed stuff I dont use and rearanged the modifiers a bit.
-
diff --git a/keyboards/planck/keymaps/kloki/rules.mk b/keyboards/planck/keymaps/kloki/rules.mk
deleted file mode 100644
index 4f918913034..00000000000
--- a/keyboards/planck/keymaps/kloki/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE = yes
-NKRO_ENABLE = no
diff --git a/keyboards/planck/keymaps/kmontag42/config.h b/keyboards/planck/keymaps/kmontag42/config.h
deleted file mode 100644
index 59bf4aa2a3e..00000000000
--- a/keyboards/planck/keymaps/kmontag42/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/kmontag42/keymap.c b/keyboards/planck/keymaps/kmontag42/keymap.c
deleted file mode 100644
index 51e7149ce61..00000000000
--- a/keyboards/planck/keymaps/kmontag42/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,--------------------------------------------------------------------------------------.
- * | Tab     |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |---------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc     |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |---------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift/( |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |---------+------+------+------+------+------+------+------+------+------+------+------|
- * | GUI     | Ctrl | Alt  |   )  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `--------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LGUI, KC_LCTL, KC_LALT, KC_RPRN, LOWER,   QK_LEAD,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/kmontag42/readme.md b/keyboards/planck/keymaps/kmontag42/readme.md
deleted file mode 100644
index 61bcef4be41..00000000000
--- a/keyboards/planck/keymaps/kmontag42/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# KMontag42's Planck Layout
-
-[![Built with Spacemacs](https://cdn.rawgit.com/syl20bnr/spacemacs/442d025779da2f62fc86c2082703697714db6514/assets/spacemacs-badge.svg)](http://spacemacs.org)
-
-## Additional Notes
-This layout is  WIP as I continute to tinker with my Planck, expect more updates here soon.
-
-## Notable features
-* Split spacebar used leader key
-* Space cadet style parens
diff --git a/keyboards/planck/keymaps/kmontag42/rules.mk b/keyboards/planck/keymaps/kmontag42/rules.mk
deleted file mode 100644
index 5712a735d1e..00000000000
--- a/keyboards/planck/keymaps/kmontag42/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-UNICODE_ENABLE = yes
-LEADER_ENABLE = yes
-
diff --git a/keyboards/planck/keymaps/komidore64/config.h b/keyboards/planck/keymaps/komidore64/config.h
deleted file mode 100644
index d1afe52f240..00000000000
--- a/keyboards/planck/keymaps/komidore64/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2022 M. Adam Price
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-
-// QMK configuration /////////
-#define TAPPING_TERM 400
-#define PERMISSIVE_HOLD
-//////////////////////////////
-
-// k64 keymap configuration //
-#define KEYMAP_REVISION "11"
-#define VER_NEWLINE_WAIT 200 // in milliseconds
-//////////////////////////////
diff --git a/keyboards/planck/keymaps/komidore64/keymap.c b/keyboards/planck/keymaps/komidore64/keymap.c
deleted file mode 100644
index 6897f6c81ad..00000000000
--- a/keyboards/planck/keymaps/komidore64/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2022 M. Adam Price
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#include "version.h"
-
-enum custom_keycodes {
-    VER_STR = SAFE_RANGE,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case VER_STR:
-            if (record->event.pressed) {
-                SEND_STRING("# qmk " QMK_VERSION "\n");
-                wait_ms(VER_NEWLINE_WAIT);
-                SEND_STRING("# " QMK_KEYBOARD "/" QMK_KEYMAP " version " KEYMAP_REVISION "\n");
-                wait_ms(VER_NEWLINE_WAIT);
-                SEND_STRING("# built on: " QMK_BUILDDATE "\n");
-            }
-            break;
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_planck_1x2uC(
-            KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-            LCTL_T(KC_ESC), 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),
-            XXXXXXX,        KC_ALGR, KC_LGUI, KC_LALT, MO(1),   KC_SPC,           MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-    [1] = LAYOUT_planck_1x2uC(
-            KC_GRV,         KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-            _______,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-            _______,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-            KC_INS,         _______, _______, _______, _______, _______,          MO(3),   KC_HOME, KC_PGDN, KC_PGUP, KC_END
-    ),
-    [2] = LAYOUT_planck_1x2uC(
-            KC_TILD,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-            _______,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-            _______,        KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-            KC_INS,         _______, _______, _______, MO(3),   _______,          _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-    ),
-    [3] = LAYOUT_planck_1x2uC(
-            QK_BOOT,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPLY, KC_DEL,
-            XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, XXXXXXX, XXXXXXX,
-            KC_CAPS,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, VER_STR,
-            _______,        XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX,          _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-};
diff --git a/keyboards/planck/keymaps/komidore64/readme.md b/keyboards/planck/keymaps/komidore64/readme.md
deleted file mode 100644
index 85b632530f5..00000000000
--- a/keyboards/planck/keymaps/komidore64/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# komidore64 OLKB Plank rev6
-
-The fanciest change in this keymap compared to the default is I've added a
-version string output command.
-
-```
-# qmk 0.7.151-13-ga942ac
-# planck/rev6/komidore64 version 11
-# built on: 2020-02-12-12:21:46
-```
diff --git a/keyboards/planck/keymaps/kyle/keymap.c b/keyboards/planck/keymaps/kyle/keymap.c
deleted file mode 100644
index 896dfe93977..00000000000
--- a/keyboards/planck/keymaps/kyle/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid( /* Qwerty */
-  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_ENT,
-  KC_RCTL, KC_LCTL, KC_LALT, KC_LGUI, MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-                                                // Space is repeated to accommadate for both spacebar wiring positions
-),
-[1] = LAYOUT_planck_grid( /* Colemak */
-  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_ENT,
-  DF(0), KC_LCTL, KC_LALT, KC_LGUI, MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-),
-[2] = LAYOUT_planck_grid( /* RAISE */
-  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_TRNS, DF(0), DF(1), LSFT(RSFT(KC_PAUSE)), KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_TRNS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(2),     KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[3] = LAYOUT_planck_grid( /* LOWER */
-  S(KC_GRV),  S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    S(KC_9),    S(KC_0), KC_BSPC,
-  KC_TRNS, DF(0), DF(1), LSFT(RSFT(KC_PAUSE)), LSFT(RSFT(KC_D)), KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), S(KC_BSLS),
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-)
-};
diff --git a/keyboards/planck/keymaps/kyle/rules.mk b/keyboards/planck/keymaps/kyle/rules.mk
deleted file mode 100644
index d86b02fd1ce..00000000000
--- a/keyboards/planck/keymaps/kyle/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/lae3/keymap.c b/keyboards/planck/keymaps/lae3/keymap.c
deleted file mode 100644
index 86c89a30a4b..00000000000
--- a/keyboards/planck/keymaps/lae3/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 planck_layers {
-    _QWERTY,
-    _ARROW,
-    _NUMPAD,
-    _MOVEMENT,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-#define _MV _MOVEMENT
-
-enum planck_keycodes {
-    QWERTY = SAFE_RANGE,
-    ARROW,
-    NUMPAD,
-    LOWER,
-    RAISE,
-};
-
-#define KC_MUP KC_MS_UP
-#define KC_MDN KC_MS_DOWN
-#define KC_MLFT KC_MS_LEFT
-#define KC_MRGT KC_MS_RIGHT
-#define KC_MB1 KC_MS_BTN1
-#define KC_MB2 KC_MS_BTN2
-#define KC_MB3 KC_MS_BTN3
-#define KC_MB4 KC_MS_BTN4
-#define KC_MB5 KC_MS_BTN5
-#define KC_MWUP KC_MS_WH_UP
-#define KC_MWDN KC_MS_WH_DOWN
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty
-     * ,-----------------------------------------------------------------------------------.
-     * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |Shift |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Ctrl | GUI  | Alt  | Move |Lower |    Space    |Raise | Move | Alt  | GUI  | Ctrl |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_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_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, MO(_MV), LOWER,   KC_SPC,  KC_SPC,  RAISE,   MO(_MV), KC_RALT, KC_RGUI, KC_RCTL
-    ),
-
-    /* Arrow
-     * ,-----------------------------------------------------------------------------------.
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |  Up  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      |      | Left | Down | Right|
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_ARROW] = LAYOUT_planck_grid(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Numpad
-     * ,-----------------------------------------------------------------------------------.
-     * |      |      |      |      |      |      |NumLck|   7  |   8  |   9  |   /  |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |Enter |   4  |   5  |   6  |   *  |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |   3  |   2  |   1  |   -  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      |   0  |   .  |   +  |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_NUMPAD] = LAYOUT_planck_grid(
-        _______, _______, _______, _______, _______, _______, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______,
-        _______, _______, _______, _______, _______, _______, KC_PENT, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PPLS, _______
-    ),
-
-    /* Movement
-     * ,-----------------------------------------------------------------------------------.
-     * |      |MsBut2|Ms Up |MsBut1|MsWhUp|      | Home | PgDn | PgUp |  End |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |Ms Lft|Ms Dn |Ms Rgt|MsWhDn|      | Left | Down |  Up  | Right|      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_MOVEMENT] = LAYOUT_planck_grid(
-        _______, KC_MB2,  KC_MUP,  KC_MB1,  KC_MWUP, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
-        _______, KC_MLFT, KC_MDN,  KC_MRGT, KC_MWDN, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Lower
-     * ,-----------------------------------------------------------------------------------.
-     * |   `  |   1  |   2  |   3  |   4  |   5  |   -  |   =  |  Del | End  | PgDn |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Caps |   6  |   7  |   8  |   9  |   0  |   [  |   ]  |   \  |   '  |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |  F1  |  F2  |  F3  |  F4  |      |      |  F5  |  F6  |  F7  |  F8  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_planck_grid(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_EQL,  KC_DEL,  KC_END,  KC_PGDN, _______,
-        KC_CAPS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_QUOT, XXXXXXX, _______,
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, XXXXXXX, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * |   ~  |   !  |   @  |   #  |   $  |   %  |   _  |   +  |  Ins | Home | PgUp |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Caps |   ^  |   &  |   *  |   (  |   )  |   {  |   }  |   |  |   "  |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_planck_grid(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_UNDS, KC_PLUS, KC_INS,  KC_HOME, KC_PGUP, _______,
-        KC_CAPS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_PIPE, KC_DQUO, XXXXXXX, _______,
-        _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Adjust (Lower + Raise)
-     * ,-----------------------------------------------------------------------------------.
-     * |Reset |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |Bcklgt| Mute |Vol Dn|Vol Up|      |      |Qwerty|Arrow |Numpad|      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_ADJUST] = LAYOUT_planck_grid(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, BL_STEP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QWERTY,  ARROW,   NUMPAD,  _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-            } else {
-                layer_off(_LOWER);
-            }
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            return false;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-            } else {
-                layer_off(_RAISE);
-            }
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            return false;
-        case QWERTY:
-            if (record->event.pressed) {
-                layer_off(_ARROW);
-                layer_off(_NUMPAD);
-            }
-            return false;
-        case ARROW:
-            if (record->event.pressed) {
-                layer_off(_NUMPAD);
-                layer_on(_ARROW);
-            }
-            return false;
-        case NUMPAD:
-            if (record->event.pressed) {
-                layer_off(_ARROW);
-                layer_on(_NUMPAD);
-            }
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/planck/keymaps/lae3/readme.md b/keyboards/planck/keymaps/lae3/readme.md
deleted file mode 100644
index 57a2f38ddc7..00000000000
--- a/keyboards/planck/keymaps/lae3/readme.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# Lae3
-_Keymap based around mode-switching for extended functionality_
-
-## Base Layout
-
-    ┌-----------------------------------------------------------------------------------┐
-    | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |Shift |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    | Ctrl | GUI  | Alt  | Move |Lower |    Space    |Raise | Move | Alt  | GUI  | Ctrl |
-    └-----------------------------------------------------------------------------------┘
-
-This is more similar to a standard keyboard layout than the standard planck
-layout, but I have found that this is better for programming, especially for
-editor shortcuts.
-
-## Lower Layer
-
-    ┌-----------------------------------------------------------------------------------┐
-    |   `  |   1  |   2  |   3  |   4  |   5  |   -  |   =  |  Del | End  | PgDn |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Caps |   6  |   7  |   8  |   9  |   0  |   [  |   ]  |   \  |   '  |      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |  F1  |  F2  |  F3  |  F4  |      |      |  F5  |  F6  |  F7  |  F8  |      |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    |      |      |      |      |      |             |      |      |      |      |      |
-    └-----------------------------------------------------------------------------------┘
-
-All the numbers are on one hand so that they can all be easily accessed when
-playing games. The punctuation was placed in a way that is as similar as
-possible the qwerty punctuation layout on a standard keyboard.
-
-## Raise Layer
-
-    ┌-----------------------------------------------------------------------------------┐
-    |   ~  |   !  |   @  |   #  |   $  |   %  |   _  |   +  |  Ins | Home | PgUp |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    | Caps |   ^  |   &  |   *  |   (  |   )  |   {  |   }  |   |  |   "  |      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |      |      |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    |      |      |      |      |      |             |      |      |      |      |      |
-    └-----------------------------------------------------------------------------------┘
-
-This layer with the exception of the function and control keys is effectively
-the lower layer in combination with the shift key, like on the standard planck
-layout.
-
-## Movement Layer
-
-    ┌-----------------------------------------------------------------------------------┐
-    |      |MsBut2|Ms Up |MsBut1|MsWhUp|      | Home | PgDn | PgUp |  End |      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |Ms Lft|Ms Dn |Ms Rgt|MsWhDn|      | Left | Down |  Up  | Right|      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |      |      |      |      |      |      |      |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    |      |      |      |      |      |             |      |      |      |      |      |
-    └-----------------------------------------------------------------------------------┘
-
-Layer for simplifying movement.
-
-## Meta Layer
-
-    ┌-----------------------------------------------------------------------------------┐
-    |Reset |      |      |      |      |      |      |      |      |      |      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |Bcklgt| Mute |Vol Dn|Vol Up|      |      |Qwerty|Arrow |Numpad|      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |      |      |      |      |      |      |      |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    |      |      |      |      |      |             |      |      |      |      |      |
-    └-----------------------------------------------------------------------------------┘
-
-This Layer is activated when pressing both the Lower and Raise keys. The Arrow
-and Numpad keys each activate a layer between the base layer and the Movement
-layer. The Qwerty key disables both of the layers leaving just the base layer
-active.
-
-## Arrow Layer
-
-    ┌-----------------------------------------------------------------------------------┐
-    |      |      |      |      |      |      |      |      |      |      |      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |      |      |      |      |      |      |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |      |      |      |      |      |  Up  |      |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    |      |      |      |      |      |             |      |      | Left | Down | Right|
-    └-----------------------------------------------------------------------------------┘
-
-Replaces the bottom right of the keyboard with arrow keys for games like The
-Binding of Isaac.
-
-## Numpad Layer
-
-    ┌-----------------------------------------------------------------------------------┐
-    |      |      |      |      |      |      |NumLck|   7  |   8  |   9  |   /  |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |      |Enter |   4  |   5  |   6  |   *  |      |
-    |------+------+------+------+------+------+------+------+------+------+------+------|
-    |      |      |      |      |      |      |      |   3  |   2  |   1  |   -  |      |
-    |------+------+------+------+------+-------------+------+------+------+------+------|
-    |      |      |      |      |      |             |      |   0  |   .  |   +  |      |
-    └-----------------------------------------------------------------------------------┘
-
-Replaces the majority of the right side of the keyboard with a numpad because
-why not?
diff --git a/keyboards/planck/keymaps/lae3/rules.mk b/keyboards/planck/keymaps/lae3/rules.mk
deleted file mode 100644
index 2e02b0dd756..00000000000
--- a/keyboards/planck/keymaps/lae3/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/leo/keymap.c b/keyboards/planck/keymaps/leo/keymap.c
deleted file mode 100644
index 5a4a720fffa..00000000000
--- a/keyboards/planck/keymaps/leo/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid( /* BASE */
-  KC_ESC,  KC_LBRC, KC_QUOT, KC_SCLN, KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_TAB,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT,
-  KC_LSFT, KC_DOT,  KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_COMM,
-  KC_LCTL, KC_LALT, KC_LGUI, MO(4),   MO(3),   KC_SPC,  KC_SPC,  MO(2),   MO(4),   KC_RGUI, KC_RALT, KC_RCTL
-),
-[2] = LAYOUT_planck_grid( /* RAISE */
-  RALT(KC_RBRC),  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  S(KC_RBRC),
-  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
-),
-[3] = LAYOUT_planck_grid( /* LOWER */
-  S(KC_EQL),S(KC_1),S(KC_2),S(KC_3),RALT(KC_5),S(KC_5),   S(KC_6),  S(KC_7),RALT(KC_7),RALT(KC_0),S(KC_0), KC_MINS,
-  KC_TRNS,RALT(KC_2),S(KC_SLSH),KC_NUBS,S(KC_NUBS),RALT(KC_MINS),RALT(KC_NUBS), KC_NUHS, S(KC_8),  S(KC_9), S(KC_MINS), KC_SLSH,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, RALT(KC_8),   RALT(KC_9),   KC_TRNS,  KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-[4] = LAYOUT_planck_grid( /* META */
-  KC_TRNS,  KC_HOME,  KC_UP,    KC_END,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_UP,    KC_END,   KC_TRNS,  KC_DEL,
-  KC_TRNS,  KC_RGHT,  KC_DOWN,  KC_LEFT,  KC_PGUP,  KC_TRNS,  KC_PGUP,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_TRNS,  KC_TRNS,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PGDN,  KC_TRNS,  KC_PGDN,  KC_TRNS,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
-)
-};
diff --git a/keyboards/planck/keymaps/leo/rules.mk b/keyboards/planck/keymaps/leo/rules.mk
deleted file mode 100644
index 10de3bfc035..00000000000
--- a/keyboards/planck/keymaps/leo/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/lindgrenj6/config.h b/keyboards/planck/keymaps/lindgrenj6/config.h
deleted file mode 100644
index 4fcdb0fc7a7..00000000000
--- a/keyboards/planck/keymaps/lindgrenj6/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-#define TAPPING_TERM 160
diff --git a/keyboards/planck/keymaps/lindgrenj6/keymap.c b/keyboards/planck/keymaps/lindgrenj6/keymap.c
deleted file mode 100644
index 94353e32483..00000000000
--- a/keyboards/planck/keymaps/lindgrenj6/keymap.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum planck_layers {
-  _BASE,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-  _NUMPAD,
-  _EXTRA,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_planck_grid(
-    KC_TAB,         KC_Q,          KC_W,           KC_E,     KC_R,           KC_T,           KC_Y,           KC_U,           KC_I,           KC_O,           KC_P,           LT(_BASE, KC_MINUS),
-    MT(MOD_LCTL, KC_ESCAPE), KC_A, KC_S,           KC_D,     KC_F,           KC_G,           KC_H,           KC_J,           KC_K,           KC_L,           KC_SEMICOLON,   KC_QUOTE,
-    KC_LSFT, MT(MOD_LCTL|MOD_LSFT ,KC_Z), KC_X,  KC_C,     KC_V,           KC_B,           KC_N,           KC_M,           KC_COMMA,       KC_DOT,         KC_SLASH,       KC_INSERT,
-    LT(_EXTRA, KC_GRAVE), TG(_NUMPAD), KC_LGUI,    KC_LALT,  LT(_LOWER, KC_BSPC), KC_SPACE,  KC_SPACE, LT(_RAISE, KC_ENTER), KC_LEFT,        KC_DOWN,        KC_UP,          KC_RIGHT
-  ),
-
-  [_LOWER] = LAYOUT_planck_grid(
-    KC_TILDE, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, LT(KC_LBRC, KC_7), LT(KC_RBRC, KC_8), KC_MINUS,      KC_UNDS,        LT(KC_PGUP, KC_HOME),
-    _______, _______, _______, _______, _______, _______, KC_PIPE, KC_LCBR,           KC_RCBR,           KC_PLUS,        KC_EQUAL,       LT(KC_PGDN, KC_END),
-    _______, _______, _______, _______, _______, _______, _______, KC_LPRN,           KC_RPRN,           _______,        KC_BSLS,        KC_DELETE,
-    _______, _______, _______, _______, _______, _______, _______, _______,           C(S(KC_LEFT)),     C(KC_MINUS),    C(S(KC_PLUS)), C(S(KC_RIGHT))
-  ),
-
-  [_RAISE] = LAYOUT_planck_grid(
-    KC_GRAVE, KC_1,   KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    LGUI(KC_PGUP),
-    _______,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  _______, _______, _______, _______, LGUI(KC_PGDN),
-    _______,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  _______, _______, _______, KC_BSLS, _______,
-    _______, _______, _______, _______, _______, KC_PSCR, KC_PSCR, _______, _______, _______, _______, KC_MPLY
-  ),
-
-  [_ADJUST] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, AU_ON,   AU_OFF,  AU_TOGG, RGB_SPI, _______, RGB_TOG, RGB_VAI, RGB_HUI, KC_BRIGHTNESS_UP,   QK_BOOT,
-    _______, _______, MU_ON,   MU_OFF,  MU_TOGG, RGB_SPD, _______, RGB_MOD, RGB_VAD, RGB_HUD, KC_BRIGHTNESS_DOWN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_NUMPAD] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, KC_CALCULATOR, KC_KP_7, KC_KP_8, KC_KP_9,   KC_KP_MINUS, KC_KP_SLASH,
-    _______, _______, _______, _______, _______, _______, _______,       KC_KP_4, KC_KP_5, KC_KP_6,   KC_KP_PLUS,  KC_KP_ASTERISK,
-    _______, _______, _______, _______, _______, _______, _______,       KC_KP_1, KC_KP_2, KC_KP_3,   KC_KP_ENTER, _______,
-    _______, _______, _______, _______, _______, _______, _______,       KC_KP_0, _______, KC_KP_DOT, KC_KP_ENTER, _______
-  ),
-
-  [_EXTRA] = LAYOUT_planck_grid(
-    G(KC_L), KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, KC_LEFT,        KC_DOWN,        KC_UP,          KC_RIGHT,       _______, _______,
-    _______, _______, KC_LCTL,       _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, LT(_EXTRA, KC_MPLY)
-  ),
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-      case(LT(_BASE,KC_MINUS)):
-          if (record->tap.count && record->event.pressed) {
-              return true;
-          } else if(record->event.pressed) {
-              tap_code(KC_BSLS);
-              return false;
-          }
-          break;
-
-      case(LT(KC_LBRC, KC_7)):
-          if (record->tap.count && record->event.pressed) {
-              tap_code(KC_LBRC);
-              return false;
-          } else if(record->event.pressed) {
-              tap_code16(KC_AMPERSAND);
-              return false;
-          }
-          break;
-
-      case(LT(KC_RBRC, KC_8)):
-          if (record->tap.count && record->event.pressed) {
-              tap_code(KC_RBRC);
-              return false;
-          } else if(record->event.pressed) {
-              tap_code16(KC_ASTERISK);
-              return false;
-          }
-          break;
-
-      case(LT(KC_PGUP, KC_HOME)):
-          if (record->tap.count && record->event.pressed) {
-              tap_code(KC_PGUP);
-              return false;
-          } else if(record->event.pressed) {
-              tap_code(KC_HOME);
-              return false;
-          }
-          break;
-
-      case(LT(KC_PGDN, KC_END)):
-          if (record->tap.count && record->event.pressed) {
-              tap_code(KC_PGDN);
-              return false;
-          } else if(record->event.pressed) {
-              tap_code(KC_END);
-              return false;
-          }
-          break;
-
-      case(LT(_EXTRA, KC_MPLY)):
-          if (record->tap.count == 2 && record->event.pressed) {
-              tap_code(KC_MNXT);
-              return false;
-          } else if(record->event.pressed) {
-              tap_code(KC_MPLY);
-              return false;
-          }
-          break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            muse_mode = false;
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case LT(_RAISE, KC_ENTER):
-    case LT(_LOWER, KC_BSPC):
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/lindgrenj6/rules.mk b/keyboards/planck/keymaps/lindgrenj6/rules.mk
deleted file mode 100644
index 7aa6b2130f0..00000000000
--- a/keyboards/planck/keymaps/lindgrenj6/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-ifeq ($(strip $(AUDIO_ENABLE)), yes)
-    SRC += muse.c
-endif
-
-TRI_LAYER_ENABLE = yes
diff --git a/keyboards/planck/keymaps/lja83/config.h b/keyboards/planck/keymaps/lja83/config.h
deleted file mode 100644
index b0c34f5c02c..00000000000
--- a/keyboards/planck/keymaps/lja83/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#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
-
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/lja83/keymap.c b/keyboards/planck/keymaps/lja83/keymap.c
deleted file mode 100644
index 33e8f93e96a..00000000000
--- a/keyboards/planck/keymaps/lja83/keymap.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _NAV,
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define NAV MO(_NAV)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// clang-format off
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    LCTL_T(KC_ESC),  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),
-    BACKLIT,         KC_LCTL, KC_LGUI, KC_LALT, LOWER,   LT(_NAV, KC_SPC), KC_SPC,   RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_NAV] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX,    KC_MS_UP,   XXXXXXX,     KC_MS_WH_UP,   XXXXXXX, XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN, KC_LEFT, KC_DOWN,    KC_UP,      KC_RIGHT,   XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,    XXXXXXX,     XXXXXXX,       XXXXXXX, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,    XXXXXXX,     XXXXXXX,       XXXXXXX, XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX, XXXXXXX
-)
-};
-// clang-format on
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/lja83/readme.md b/keyboards/planck/keymaps/lja83/readme.md
deleted file mode 100644
index 3650ae446b1..00000000000
--- a/keyboards/planck/keymaps/lja83/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# LJA83 Planck Layout
-
diff --git a/keyboards/planck/keymaps/lja83/rules.mk b/keyboards/planck/keymaps/lja83/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/lja83/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/mason/keymap.c b/keyboards/planck/keymaps/mason/keymap.c
deleted file mode 100644
index 59966451aa5..00000000000
--- a/keyboards/planck/keymaps/mason/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  LOWER,
-  RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  ;:  |  '"  |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Caps | Esc  | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    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, KC_ENT ,
-    KC_CAPS, KC_ESC, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  ~   |  |   |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_planck_grid(
-    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,   KC_ASTR,    KC_LPRN, KC_RPRN, _______,
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,   KC_PLUS,    KC_LCBR, KC_RCBR, _______,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_GRV), S(KC_BSLS), _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,   KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      | Ins  | Home | PgUp | Pscr | Slck | Paus |   -  |   =  |   [  |   ]  |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      | Del  | End  | PgDn | Nlck |      |      |   `  |   \  |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_planck_grid(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    _______, KC_INS,  KC_HOME, KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-    _______, KC_DEL,  KC_END,  KC_PGDN, KC_NUM,  _______, _______, KC_GRV,  KC_BSLS, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      | Reset|      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |BLtogg|BLstep|      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |RGBtog|RGBhui|RGBhud|RGBmod|RGBsai|RGBsad|      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR,
-    _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_MOD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/masoncowen/keymap.c b/keyboards/planck/keymaps/masoncowen/keymap.c
deleted file mode 100644
index 9a0377a4caf..00000000000
--- a/keyboards/planck/keymaps/masoncowen/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 masoncowen
- *
- * 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 planck_layers {
-  _ZWFP,
-  _NUMNAV
-};
-
-enum planck_keycodes {
-  ZWFP = SAFE_RANGE,
-  NUMNAV
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_ZWFP] = LAYOUT_planck_grid(
-  KC_Z , KC_W , KC_F , KC_P , KC_Q , KC_NO , KC_NO , KC_J , KC_L , KC_U , KC_Y , OSL(_NUMNAV) ,
-  KC_A , KC_R , KC_S , KC_T , KC_G , KC_NO , KC_NO , KC_M , KC_N , KC_E , KC_I , KC_O ,
-  KC_X , KC_V , KC_C , KC_D , KC_B , KC_NO , KC_NO , KC_K , KC_H , KC_DOT , KC_COMM , KC_SCLN ,
-  KC_NO , KC_NO , KC_ESC , KC_SPC , OSM(MOD_LCTL) , KC_NO , KC_NO , KC_BSPC , OSM(MOD_LSFT) , OSM(MOD_LALT) , KC_NO , KC_NO
-),
-
-//TRANSPARENT keys are to be decided on
-[_NUMNAV] = LAYOUT_planck_grid(
-  KC_PPLS , KC_4 , KC_5 , KC_6 , KC_PAST , KC_NO , KC_NO , KC_BSLS , KC_HOME , KC_PGDN , KC_PGUP , KC_END ,
-  KC_0 , KC_1 , KC_2 , KC_3 , KC_PENT , KC_NO , KC_NO , KC_NUHS , KC_LEFT , KC_DOWN , KC_UP , KC_RIGHT ,
-  KC_PMNS , KC_7 , KC_8 , KC_9 , KC_PSLS , KC_NO , KC_NO , KC_QUOT , , _______ , _______ , _______ ,
-  KC_NO , KC_NO , _______ , _______ , _______ , KC_NO , KC_NO , _______ , _______ , _______ , KC_NO , KC_NO
-)
-
-};
-
-const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DEL);
-const key_override_t enter_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, KC_ENTER);
-const key_override_t tab_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_SPC, KC_TAB);
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-  &delete_key_override,
-  &enter_key_override,
-  &tab_key_override,
-  NULL
-};
diff --git a/keyboards/planck/keymaps/masoncowen/readme.md b/keyboards/planck/keymaps/masoncowen/readme.md
deleted file mode 100644
index 073cbe73b36..00000000000
--- a/keyboards/planck/keymaps/masoncowen/readme.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# ZWFP Layout Notes
-## About
-
-ZWFP is a layout largely based on Colemak Mod-DH.
-The layout rotates the QZXVB keys for the following reasons:
-* XCV are brought together.
-  * One design goal of colemak was to keep ZXCV close together as they are commonly uses control shortcuts.
-  * Mod-dh moved D to where the V key was as that position was too ergonomic for an infrequent letter like V.
-  * XCV benefit more from being together are Cut-Copy-Paste are more related than Undo (which Z commonly represents).
-* B is returned to its QWERTY position.
-  * This was an unintentional benefit.
-  * The original rotation of QZXV moved Q to a better position than B despite being was less frequent.
-    * This is based off the grid on [the colemak mod-dh page](https://colemakmods.github.io/mod-dh/model.html).
-    * This needs more testing, and may be reverted as despite the above mentioned grid, the current Q position feels easier than the current B position.
-* Based off [the layout analyser](https://colemakmods.github.io/mod-dh/analyze.html) its slightly better.
-* I like being different.
-
-## Todo
-* Work out punctuation locations.
-* Figure out what the thumb cluster is doing.
-  * I've somewhat settled on left home-row (centre) thumb key is space and right is shift OSL.
-* Maybe a deadkey instead of using shift-/alt- key overrides?
-* [Repeat key](https://www.jonashietala.se/blog/2021/09/05/t-34-0/)
-* Move Home, End, PgDn and PgUp to a kc/ko/dk with the arrow keys.
-
-### Keys still to add
-* A reset key, cba with finding small pokey things to use at the back.
-* Shifted numbers \(not including $^\*\)
-* Dedicated Pipe |
-* Dedicated Underscore \(\_\)
-* Backslash \(\\\) and shifted \(Don't forget to use NOUS\)
-* Square brackets \(\[ \]\) and shifted
-* Dedicated question mark
-* Backtick (`) and shifted
-* Function keys 1-12
-
-#### Obscure keys to add just for completeness
-* Normal Minus and Equals \(Don't know if they are needed or not \)
-* Function keys 13-24
-* Capslock \(Not sure if multi-tapping OSL actually counts as a caps lock for shift\)
-* Numlock, Scrolllock and the Locking lock keys
-* Keypad characters
-* Command Keys in general
-* International Keys
-* Right Modifiers
-* Windows keys for either side
diff --git a/keyboards/planck/keymaps/masoncowen/rules.mk b/keyboards/planck/keymaps/masoncowen/rules.mk
deleted file mode 100644
index 90c9b36df0c..00000000000
--- a/keyboards/planck/keymaps/masoncowen/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEY_OVERRIDE_ENABLE = yes
diff --git a/keyboards/planck/keymaps/matrixman/keymap.c b/keyboards/planck/keymaps/matrixman/keymap.c
deleted file mode 100644
index ad4844116ec..00000000000
--- a/keyboards/planck/keymaps/matrixman/keymap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// http://www.keyboard-layout-editor.com/#/gists/eb0696806831fc0d93c9
-
-#define _PROSE 0
-#define _SYMB_L 1
-#define _SYMB_R 2
-#define _NAV_L 3
-#define _NAV_R 4
-#define _NAV_ALT 5
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_PROSE] = LAYOUT_planck_grid(
-   LT(_NAV_L,KC_Q), KC_W,  KC_E,      KC_R,        KC_T,         KC_DELETE, KC_BSPC,          KC_Y,       KC_U,    KC_I,     KC_O, LT(_NAV_R,KC_P)
-  ,KC_A,            KC_S,  KC_D,      KC_F,        KC_G,     CTL_T(KC_ESC), CTL_T(KC_SCLN),   KC_H,       KC_J,    KC_K,     KC_L,     KC_QUOT
-  ,SFT_T(KC_Z),     KC_X,  KC_C,      KC_V,        KC_B,     ALT_T(KC_TAB), ALT_T(KC_INS),    KC_N,       KC_M,    KC_COMM,  KC_DOT,   SFT_T(KC_SLSH)
-  ,KC_LCTL,      KC_LGUI,  LM(_NAV_ALT, MOD_LALT), KC_TAB, LT(_SYMB_L, KC_ESC), KC_LSFT,  KC_LSFT,  LT(_SYMB_R,KC_SPC), KC_BSPC, LM(_NAV_ALT, MOD_LALT), KC_RCTL, KC_ENT
-),
-    // accessed via the left symb-layer key, includes a semicolon where the right symb-layer key was
-[_SYMB_L] = LAYOUT_planck_grid(
-   KC_GRV,         KC_TILD,    KC_ASTR,    KC_AMPR,          KC_SLSH,    LSFT(KC_COMM), LSFT(KC_DOT),  KC_BSLS,  KC_7,    KC_8,    KC_9,    KC_PIPE
-  ,KC_UNDS,        KC_CIRC,    KC_PERC,    KC_DLR,           KC_LPRN,    KC_LBRC,       KC_RBRC,       KC_RPRN,  KC_4,    KC_5,    KC_6,    KC_MINS
-  ,KC_EQL ,        KC_HASH,    KC_AT,      KC_EXLM,          KC_LCBR,    KC_TRNS,       KC_TRNS,       KC_RCBR,  KC_1,    KC_2,    KC_3,    KC_PLUS
-  ,LSFT(KC_QUOT),  KC_TRNS,    KC_COMM,    LSFT(KC_SLSH),    KC_TRNS,    KC_TRNS,       KC_TRNS,       KC_SCLN,  KC_0,    KC_DOT,  KC_DOT,  KC_TRNS
-),
-    // accessed via the right symb-layer key, includes a colon where the left symb-layer key was
-[_SYMB_R] = LAYOUT_planck_grid(
-   KC_GRV,         KC_TILD,    KC_ASTR,    KC_AMPR,          KC_SLSH,    LSFT(KC_COMM), LSFT(KC_DOT), KC_BSLS,  KC_7,    KC_8,    KC_9,    KC_PIPE
-  ,KC_UNDS,        KC_CIRC,    KC_PERC,    KC_DLR,           KC_LPRN,    KC_LBRC,       KC_RBRC,      KC_RPRN,  KC_4,    KC_5,    KC_6,    KC_MINS
-  ,KC_EQL ,        KC_HASH,    KC_AT,      KC_EXLM,          KC_LCBR,    KC_TRNS,       KC_TRNS,      KC_RCBR,  KC_1,    KC_2,    KC_3,    KC_PLUS
-  ,LSFT(KC_QUOT),  KC_TRNS,    KC_COMM,    LSFT(KC_SLSH),    KC_COLN,    KC_TRNS,       KC_TRNS,      KC_TRNS,  KC_0,    KC_DOT,  KC_TRNS, KC_TRNS
-),
-    // accessed via the left nav-layer key, includes a F10 where the right nav-layer key was
-[_NAV_L] = LAYOUT_planck_grid(
-   KC_TRNS,    KC_F2,    KC_F3,      KC_F4,         KC_F5,    QK_BOOT,    BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10
-  ,KC_BTN1,  KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCR,    KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
-  ,KC_BTN2,  KC_BTN4,    KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5,  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     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
-),
-    // accessed via the right nav-layer key, includes a F1 where the left nav-layer key was
-[_NAV_R] = LAYOUT_planck_grid(
-   KC_F1,    KC_F2,      KC_F3,      KC_F4,         KC_F5,    QK_BOOT,    BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_TRNS
-  ,KC_BTN1,  KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCR,    KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
-  ,KC_BTN2,  KC_BTN4,    KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5,  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     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
-),
-    // accessed via the lower alt keys, moves tab and delete to make alt+tab and ctrl+alt+del feel more standard
-[_NAV_ALT] = LAYOUT_planck_grid(
-   KC_F1,    KC_F2,      KC_F3,      KC_F4,         KC_F5,    QK_BOOT,    BL_STEP,    KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_DELETE
-  ,KC_TAB,   KC_MS_L,    KC_MS_U,    KC_MS_D,       KC_MS_R,  KC_PSCR,    KC_PAUSE,   KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_F11
-  ,KC_BTN2,  KC_BTN4,    KC_MS_WH_UP,KC_MS_WH_DOWN, KC_BTN5,  KC_TRNS,    KC_TRNS,    KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     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
-)
-};
diff --git a/keyboards/planck/keymaps/matrixman/readme.md b/keyboards/planck/keymaps/matrixman/readme.md
deleted file mode 100644
index 1f72d732216..00000000000
--- a/keyboards/planck/keymaps/matrixman/readme.md
+++ /dev/null
@@ -1,100 +0,0 @@
-The Matrixman Ergodox / Split-Planck Keyboard Layout
-====================================================
-
-### The problem
-
-These layouts were designed to give my aching pinkeys a break
-
-### The Design
-
- - Pinkeys do less:
-   - Left q, a, z, `, _, =, [Shift], [F1] [Click], [Right Click]
-   - Right p, ', /, |, -, +, [Shift], [F10], [F11], [F12]
- - Index fingers do more:
-   - Left: r, f, v, t, g, b, &, $, !, /, (, {, <, [, [Ctrl], [Tab], [Alt], [PrintScr]
-   - Right: u, j, m, y, h, n, 7, 4, 1, \, ), }, >, ], ;, [Ctrl], [Insert], [Alt], [Pause]
- - Thumbs do more:
-   - Left: [Esc], :, [Shift], [Tab]
-   - Right: [Space], ;, [Shift], [Backspace]
- - Palm Presses too:
-   - Left: [Ctrl], "
-   - Right: [Ctrl, [Enter]
-
-### The Plan
-
-I keep an Ergodox at home and at work, and when I'm mobile, I carry a planck.
-These keymaps are designed to minimize the difficulty of switching between the two.
-
-### Other features
-
-- 10-key at home row for right hand
-- "Matching" symbols use same finger on opposite hand: <> [] {} /\ () 1! 2@ 3# 4$ 5% 6^ 7& 8* -_ +=
-- Supports vim-like (hjkl) movements:
-  - mouse movement and scrolling
-  - arrow keys and nav keys (home, end, pg up, pg down)
-- All non-modal keys mapped (all keys from a typical 105 key keyboard except caps, num, and scroll lock)
-
-The Planck Layout
------------------
-
-For a picture, see here: http://www.keyboard-layout-editor.com/#/gists/eb0696806831fc0d93c9
-
-### Prose Layer
-
-    qwert▓▓yuiop
-    asdfg▓;hjkl'
-    zxcvb▓▓nm,./
-    ▓▓▓▓▓▓▓ ▓▓▓▓
-
-### Symbol Layer
-
-    `~*&/<>\789|
-    _^%$([])456-
-    =#@!{▓▓}123+
-    "▓,?:▓▓;0▓.▓
-
-### Nav Layer
-
-    FKEYF▓▓KEYFK
-    mouse▓▓arowE
-    scrol▓▓seekY
-    ▓▓▓▓▓▓▓▓▓▓▓▓
-
-
-The Ergodox Layout
-------------------
-
-For a picture, see here: http://www.keyboard-layout-editor.com/#/gists/9be130e4c9b503317619
-
-Wherever the Ergodox has keys that the Planck doesn't, whichever key would be expected on a typical 105 key is in that place
-
-### Prose Layer
-
-▓▓▓▓▓▓▓          ▓▓▓▓▓▓
-▓qwert▓         ▓yuiop\
-▓asdfg▓         ;hjkl;'
-▓zxcvb           nm,./▓
-▓▓▓▓▓▓           ▓▓▓▓▓▓
-        ▓▓   ▓▓
-       ▓▓▓   ▓ ▓
-
-### Symbol Layer
-
-▓▓▓▓▓▓           ▓▓▓▓▓▓
-▓`~*&/<         >\789|\
-▓_^%$([         ])456-▓
-▓=#@!{           }123+▓
-"▓▓▓▓▓▓           0▓.▓▓
-        ▓▓   ▓▓
-       ?:▓   ▓;.
-
-
-### Nav Layer
-
-▓▓▓▓▓▓▓          ▓▓▓▓▓▓
-▓FKEYF▓         ▓KEYFK▓
-▓mouse▓          arowE▓
-▓scrol           seekY▓
-▓▓▓▓▓▓           ▓▓▓▓▓▓
-        ▓▓   ▓▓
-       ▓▓▓   ▓▓▓
diff --git a/keyboards/planck/keymaps/max/keymap.c b/keyboards/planck/keymaps/max/keymap.c
deleted file mode 100644
index d947b6a1a0d..00000000000
--- a/keyboards/planck/keymaps/max/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid( /* Qwerty */
-  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_ENT ,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_LCTL, BL_STEP, KC_LALT, KC_LGUI, MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-                                                // Space is repeated to accommadate for both spacebar wiring positions
-),
-[1] = LAYOUT_planck_grid( /* Colemak */
-  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_ENT ,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_LCTL, BL_STEP, KC_LALT, KC_LGUI, MO(3),      KC_SPC,   KC_SPC,    MO(2),     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
-),
-[2] = LAYOUT_planck_grid( /* RAISE */
-  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_TRNS, DF(0), DF(1), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_TRNS,
-  KC_TRNS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, KC_BSLS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,  MO(2),     KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-[3] = LAYOUT_planck_grid( /* LOWER */
-  S(KC_GRV),  S(KC_1),    S(KC_2),    S(KC_3),    S(KC_4),    S(KC_5),    S(KC_6),    S(KC_7),    S(KC_8),    S(KC_9),    S(KC_0), KC_BSPC,
-  KC_TRNS, DF(0), DF(1), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL),  S(KC_LBRC), S(KC_RBRC), KC_TRNS,
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  S(KC_BSLS),
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3),     KC_TRNS,   KC_TRNS,   KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-)
-};
diff --git a/keyboards/planck/keymaps/max/rules.mk b/keyboards/planck/keymaps/max/rules.mk
deleted file mode 100644
index d86b02fd1ce..00000000000
--- a/keyboards/planck/keymaps/max/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/mgalisa/config.h b/keyboards/planck/keymaps/mgalisa/config.h
deleted file mode 100644
index 9020d2b9f88..00000000000
--- a/keyboards/planck/keymaps/mgalisa/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/mgalisa/keymap.c b/keyboards/planck/keymaps/mgalisa/keymap.c
deleted file mode 100644
index 8816bf40909..00000000000
--- a/keyboards/planck/keymaps/mgalisa/keymap.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _EMOJI,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV,
-  AUTO_SQ,
-  AUTO_PA,
-  AUTO_CB,
-  SHRUG,
-  F4R
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    LT(_EMOJI,KC_ESC),  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 ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    LT(_EMOJI,KC_ESC),  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    LT(_EMOJI,KC_ESC),  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-/* [_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-), */
-
-/* Raise - new
- * ,-----------------------------------------------------------------------------------.
- * |   `  |  F1  |  F2  |  F3  |  F4  |  {}  |   7  |   8  |   9  |   -  |   *  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F5  |  F6  |  F7  |  F8  |  ()  |   4  |   5  |   6  |   +  |   /  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |  []  |   1  |   2  |   3  |Vol - |Vol + |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      0      |      | Home |Pg Dn |Pg Up | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_GRV,  KC_F1,   KC_F2,    KC_F3,    KC_F4,   AUTO_CB,  KC_7,  KC_8, KC_9,  KC_MINS, KC_ASTR, KC_BSPC,
-    KC_DEL,  KC_F5,   KC_F6,    KC_F7,    KC_F8,   AUTO_PA,  KC_4,  KC_5, KC_6,  KC_PLUS, KC_SLSH, KC_BSLS,
-    _______, KC_F9,   KC_F10,   KC_F11,   KC_F12,  AUTO_SQ,  KC_1,  KC_2, KC_3,  KC_PGUP, KC_VOLU, _______,
-    _______, _______, _______, _______, _______, KC_0, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-[_EMOJI] = LAYOUT_planck_grid(
-    _______, _______, _______, F4R, _______, _______, _______, _______, _______,  _______, _______, _______,
-    KC_TRNS, _______, _______, SHRUG, _______, _______, _______, _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case AUTO_SQ:
-      if (record->event.pressed) {
-        SEND_STRING("[]SS_TAP(X_LEFT)");
-      }
-      return false;
-      break;
-    case AUTO_CB:
-      if (record->event.pressed) {
-        SEND_STRING("{}SS_TAP(X_LEFT)");
-      }
-      return false;
-      break;
-    case AUTO_PA:
-      if (record->event.pressed) {
-        SEND_STRING("()SS_TAP(X_LEFT)");
-      }
-      return false;
-      break;
-    case SHRUG:
-      if (record->event.pressed) {
-        SEND_STRING("/shrugSS_TAP(X_ENT)");
-      }
-      return false;
-      break;
-    case F4R:
-      if (record->event.pressed) {
-        SEND_STRING(":f-for-respects:");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/mgalisa/readme.md b/keyboards/planck/keymaps/mgalisa/readme.md
deleted file mode 100644
index 9d5b596016d..00000000000
--- a/keyboards/planck/keymaps/mgalisa/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# @mgalisa's Planck keymap
-
-A minor (so far) update to the default keymap. Probably more to come.
-
-## Raise layer
-
-![Raise layer](https://i.imgur.com/n0f4275.png)
-
-* Moved F-keys and number keys into 4x3 and 3x3 grid patterns for pseudo-numpad like effect
-* Added macros to the middle column that insert bracket/brace/paren pairs and moves the cursor inbetween
-* Minor adjustments
-
-## Emoji layer
-
-Activate by holding the Esc key from QWERTY/Dvorak/Colemak. Holds macros primarily for annoying coworkers via Slack.
diff --git a/keyboards/planck/keymaps/mgalisa/rules.mk b/keyboards/planck/keymaps/mgalisa/rules.mk
deleted file mode 100644
index 2afe5904385..00000000000
--- a/keyboards/planck/keymaps/mgalisa/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC += muse.c
-EXTRAKEY_ENABLE = yes
-# RGBLIGHT_ENABLE = yes
-## I bought the WS2812s...
-## just need the main branch to be updated.
-# Uncomment to make build fail.
diff --git a/keyboards/planck/keymaps/mikethetiger/config.h b/keyboards/planck/keymaps/mikethetiger/config.h
deleted file mode 100644
index 9020d2b9f88..00000000000
--- a/keyboards/planck/keymaps/mikethetiger/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/mikethetiger/keymap.c b/keyboards/planck/keymaps/mikethetiger/keymap.c
deleted file mode 100644
index c0964f1deee..00000000000
--- a/keyboards/planck/keymaps/mikethetiger/keymap.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        register_code(KC_MS_WH_DOWN);
-        unregister_code(KC_MS_WH_DOWN);
-      #else
-        register_code(KC_PGDN);
-        unregister_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        register_code(KC_MS_WH_UP);
-        unregister_code(KC_MS_WH_UP);
-      #else
-        register_code(KC_PGUP);
-        unregister_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/mikethetiger/readme.md b/keyboards/planck/keymaps/mikethetiger/readme.md
deleted file mode 100644
index ed039529658..00000000000
--- a/keyboards/planck/keymaps/mikethetiger/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# mikethetiger Planck Layout
-
diff --git a/keyboards/planck/keymaps/mikethetiger/rules.mk b/keyboards/planck/keymaps/mikethetiger/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/mikethetiger/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/mitch/config.h b/keyboards/planck/keymaps/mitch/config.h
deleted file mode 100644
index bb7989d90d8..00000000000
--- a/keyboards/planck/keymaps/mitch/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "../../config.h"
-
-// for the broken board
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { F1, F0, B0, B2, F4, F5, F6, F7, D4, D6, B4, D7 }
diff --git a/keyboards/planck/keymaps/mitch/keymap.c b/keyboards/planck/keymaps/mitch/keymap.c
deleted file mode 100644
index 814a28deb8b..00000000000
--- a/keyboards/planck/keymaps/mitch/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define QWERTY 0
-#define LOWER 1
-#define RAISE 2
-
-// In MacOS, switch between windows within an application
-#define GUI_GRV LGUI(KC_GRV)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctl  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Del  | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  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, MT(MOD_RSFT, KC_ENT) ,
-  KC_ESC,  KC_DEL,  KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | GUIGR|      |      |      |      |      |      |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |      | Mute | Vol- | Vol+ |      | Bksp |   $  |   %  |   ^  |   |  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   !  |   @  |   #  |   \  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |    Enter    |      |      | PgUp | PgUn |      |
- * `-----------------------------------------------------------------------------------'
- */
-[LOWER] = LAYOUT_planck_grid(
-  GUI_GRV, _______, _______, _______, _______, _______, _______, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BSPC, KC_DLR,  KC_PERC, KC_CIRC, KC_PIPE, KC_PIPE,
-  _______, _______, _______, _______, _______, _______, _______, KC_EXLM, KC_AT,   KC_HASH, KC_BSLS, KC_ENT,
-  _______, _______, _______, _______, _______, KC_ENT,  KC_ENT,  _______, _______, KC_PGDN, KC_PGUP, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   `  |   ~  |   (  |   )  |      |      |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  [   |   ]  |   {  |   }  |      |      |   4  |   5  |   6  |      |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  -   |   _  |  =   |  +   |      |      |   1  |   2  |   3  |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |    Enter    |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[RAISE] = LAYOUT_planck_grid(
-  KC_GRV,  KC_GRV,  KC_TILD, KC_LPRN, KC_RPRN, _______, _______, KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  _______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______, _______, KC_4,    KC_5,    KC_6,    _______, KC_BSLS,
-  _______, KC_MINS, KC_UNDS, KC_EQL,  KC_PLUS, _______, _______, KC_1,    KC_2,    KC_3,    _______, KC_ENT,
-  _______, _______, _______, _______, _______, KC_ENT,  KC_ENT,  _______, _______, KC_PGDN, KC_PGUP, _______
-)
-};
diff --git a/keyboards/planck/keymaps/mitch/readme.md b/keyboards/planck/keymaps/mitch/readme.md
deleted file mode 100644
index 9ed1133ef9c..00000000000
--- a/keyboards/planck/keymaps/mitch/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-## Flashing Keyboard
-
-1. Install `dfu` tools:
-
-    brew tap osx-cross/avr
-    brew install avr-libc
-    brew install dfu-programmer
-
-2. Move to this directory.
-3. Hit the reset button on the keyboard.
-4. run `make dfu`.
-
-## The Keymap
-
-This keymap is designed for a rev3 Planck Keyboard.
-
-The default layer is QWERTY. The raise layer has a ten key on the right
-and common programming punctuation on the left. The lower layer provides the
-rest of the symbols, mostly mapped with the ten key numbers.
-
-The normal right shift key uses the `MT` macro to trigger Enter on tap and right
-shift when held.
diff --git a/keyboards/planck/keymaps/mjt/config.h b/keyboards/planck/keymaps/mjt/config.h
deleted file mode 100644
index f6362935e96..00000000000
--- a/keyboards/planck/keymaps/mjt/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// fix iPhone power adapter issue
-
-#define USB_MAX_POWER_CONSUMPTION 50
-
-#endif
diff --git a/keyboards/planck/keymaps/mjt/keymap.c b/keyboards/planck/keymaps/mjt/keymap.c
deleted file mode 100644
index 7ab0fff2418..00000000000
--- a/keyboards/planck/keymaps/mjt/keymap.c
+++ /dev/null
@@ -1,236 +0,0 @@
-// This is MJT's bastardization of the planck and minivan defaults
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _DYN
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV,
-  MACSLEEP,
-  DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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, SFT_T(KC_ENT) ,
-  MO(_DYN), KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  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_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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Dn |Pg Up |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |Pg Dn |Pg Up | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGDN, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |Pause |PR SC |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |Sleep |Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |TogLED|      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-[_DYN] = LAYOUT_planck_grid(
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DM_REC1, DM_REC2, _______ ,
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dyn_macro_rec[][2]     = SONG(DVORAK_SOUND);
-float tone_dyn_macro_play[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  uint16_t macro_kc = (keycode == MO(_DYN) ? DM_RSTP : keycode);
-  if (!process_record_dynamic_macro(macro_kc, record)) {
-    return false;
-  }
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(tone_plover);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover_gb);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case MACSLEEP:
-      if (record->event.pressed) {
-          // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
-          register_code(KC_RSFT);
-          register_code(KC_RCTL);
-          register_code(KC_PWR);
-          unregister_code(KC_PWR);
-          unregister_code(KC_RCTL);
-          unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/mjt/readme.md b/keyboards/planck/keymaps/mjt/readme.md
deleted file mode 100644
index ce4d90f2170..00000000000
--- a/keyboards/planck/keymaps/mjt/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Mike's Plancklike Planck
-
-- Music/Audio
-- Dynamic Macros
-- Media Keys
-- Works with iPhone Camera Adapter
-
-## Layers
-
-Qwerty for letters and mods.
-
-Raise and Lower are mostly default with a few tweaks.
-
-Adjust layer is tough to get to so it is only for keyboard configuration stuff.
-
-## Dynamic Macros
-
-Hold TAB key, then press ";" to record macro 1 and "'" to record macro 2.
-
-When you are done recording, press TAB again.
-
-For playback of macros, TAB+"," plays macro 1 and TAB+","plays macro 2.
diff --git a/keyboards/planck/keymaps/mjtnumsym/config.h b/keyboards/planck/keymaps/mjtnumsym/config.h
deleted file mode 100644
index f6362935e96..00000000000
--- a/keyboards/planck/keymaps/mjtnumsym/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// fix iPhone power adapter issue
-
-#define USB_MAX_POWER_CONSUMPTION 50
-
-#endif
diff --git a/keyboards/planck/keymaps/mjtnumsym/keymap.c b/keyboards/planck/keymaps/mjtnumsym/keymap.c
deleted file mode 100644
index 4eaafb75d6c..00000000000
--- a/keyboards/planck/keymaps/mjtnumsym/keymap.c
+++ /dev/null
@@ -1,235 +0,0 @@
-// This is MJT's bastardization of the planck and minivan defaults
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 planck_layers {
-  _QWERTY,
-  _FKEYS,
-  _NUMSYM,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  PLOVER,
-  FKEYS,
-  NUMSYM,
-  BACKLIT,
-  EXT_PLV,
-  MACSLEEP,
-  DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |FKEYS |    Space    |NUMSYM | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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, SFT_T(KC_ENT) ,
-  KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, FKEYS,   KC_SPC,  KC_SPC,  NUMSYM,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* FKEYS
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  | F11  | F12  | F13  | F14  | F15  |      |      |Sleep |      | Rec1 | Rec2 |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Mac1 | Mac2 |      | Stop |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_FKEYS] = LAYOUT_planck_grid(
-  KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  KC_DEL,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F6,   _______, _______, MACSLEEP, DM_REC1, DM_REC2,
-  _______, _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, _______, DM_RSTP,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* NUMSYM
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  Del |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   _  |   +  |   {  |   }  |   |  |   -  |   =  |   [  |   ]  |   \  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |Pg Dn |Pg Up | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMSYM] = LAYOUT_planck_grid(
-  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_EXLM,  KC_AT,  KC_HASH, KC_DLR,  KC_PERC,  KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______,KC_UNDS,  KC_PLUS,KC_LCBR, KC_RCBR, KC_PIPE,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (FKEYS + NUMSYM)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |Pause |PR SC |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |Sleep |Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |TogLED|      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_DEL ,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, MACSLEEP,PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-) /*,
-[_DYN] = LAYOUT_planck_grid(
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DM_REC1, DM_REC2, _______ ,
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______ , _______, _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, _______
-)*/
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dyn_macro_rec[][2]     = SONG(DVORAK_SOUND);
-float tone_dyn_macro_play[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  uint16_t macro_kc = (keycode == FKEYS ? DM_RSTP : keycode);
-  if (!process_record_dynamic_macro(macro_kc, record)) {
-    return false;
-  }
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case FKEYS:
-      if (record->event.pressed) {
-        layer_on(_FKEYS);
-        update_tri_layer(_FKEYS, _NUMSYM, _ADJUST);
-      } else {
-        layer_off(_FKEYS);
-        update_tri_layer(_FKEYS, _NUMSYM, _ADJUST);
-      }
-      return false;
-      break;
-    case NUMSYM:
-      if (record->event.pressed) {
-        layer_on(_NUMSYM);
-        update_tri_layer(_FKEYS, _NUMSYM, _ADJUST);
-      } else {
-        layer_off(_NUMSYM);
-        update_tri_layer(_FKEYS, _NUMSYM, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(tone_plover);
-        #endif
-        layer_off(_NUMSYM);
-        layer_off(_FKEYS);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover_gb);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case MACSLEEP:
-      if (record->event.pressed) {
-          // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
-          register_code(KC_RSFT);
-          register_code(KC_RCTL);
-          register_code(KC_PWR);
-          unregister_code(KC_PWR);
-          unregister_code(KC_RCTL);
-          unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/mjtnumsym/readme.md b/keyboards/planck/keymaps/mjtnumsym/readme.md
deleted file mode 100644
index ba6d05144ca..00000000000
--- a/keyboards/planck/keymaps/mjtnumsym/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Mike's Rethought Planck
-
-- Music/Audio
-- Dynamic Macros
-- Media Keys
-- Works with iPhone Camera Adapter
-
-## Layers
-
-Qwerty for letters and mods.
-
-Numsym for all numbers and symbols used in typing. Follows a similar approach to
-planck but puts both on the same layer eschewing the F-keys.  
-
-Fkeys layer is for the seldom used stuff like F-keys and some additional features
-such as dynamic macros, media keys, and a sleep shortcut for OS X.
-
-Adjust layer is mainly for keyboard configuration stuff.
-
-## Dynamic Macros
-
-Hold TAB key, then press ";" to record macro 1 and "'" to record macro 2.
-
-When you are done recording, press TAB again.
-
-For playback of macros, TAB+"," plays macro 1 and TAB+","plays macro 2.
diff --git a/keyboards/planck/keymaps/mjuma/config.h b/keyboards/planck/keymaps/mjuma/config.h
deleted file mode 100644
index f399fa0c23d..00000000000
--- a/keyboards/planck/keymaps/mjuma/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2017-2021 M Juma
- *
- * 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 DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define TAPPING_TERM 200
diff --git a/keyboards/planck/keymaps/mjuma/keymap.c b/keyboards/planck/keymaps/mjuma/keymap.c
deleted file mode 100644
index c5faeb43859..00000000000
--- a/keyboards/planck/keymaps/mjuma/keymap.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/* Copyright 2017-2021 M Juma
- *
- * 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"
-
-enum planck_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _GAMING,
-    _ADJUST,
-    _FN,
-    _SPACE_FN
-};
-
-enum planck_keycodes {
-    QWERTY = SAFE_RANGE,
-    GAMING
-};
-
-enum taps {
-    TD_SHIFT_CAPS = 0
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_SHIFT_CAPS]  = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
-};
-
-// Fillers to make layering more clear
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define FN MO(_FN)
-#define SPACE_FN LT(_SPACE_FN, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | GEsc |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | FN   | GUI  | Alt  |Lower |  Space FN   |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,            KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,      KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    QK_GESC,           KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,      KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    TD(TD_SHIFT_CAPS), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      KC_N,      KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
-    KC_LCTL,           FN,      KC_LALT, KC_LGUI, LOWER,   SPACE_FN,  SPACE_FN,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |   *  |   4  |   5  |   6  |   -  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |   /  |   1  |   2  |   3  |   +  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |    Space    |      |   0  |   .  |   =  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_PAST,  KC_4,     KC_5,    KC_6,     KC_PMNS,  KC_BSLS,
-    _______, _______, _______, _______, _______, _______, KC_PSLS,  KC_1,     KC_2,    KC_3,     KC_PPLS,  MT(MOD_LSFT, KC_ENT),
-    _______, _______, _______, _______, _______, KC_SPC,  KC_SPC,   _______,  KC_0,    KC_PDOT,  KC_PEQL,  _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |   /  |   {  |   [  |   ]  |   }  |   \  |   -  |   =  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |   _  |   +  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |    Space    |      | Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    _______, _______, _______, KC_SLSH,    KC_LCBR,  KC_LBRC,  KC_RBRC,  KC_RCBR, KC_BSLS, KC_MINS, KC_EQL,  KC_PIPE,
-    _______, _______, _______, _______,    _______,  _______,  _______,  _______, _______, KC_UNDS, KC_PLUS, MT(MOD_LSFT, KC_ENT),
-    _______, _______, _______, _______,    _______,  KC_SPC,   KC_SPC,   _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* fn
- * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F11 |  F12 |  F13 |  F14 |  F15 |      |INSERT| Home | PgUp |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |DELETE| End  | PgDn |      | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |    Space    |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FN] = LAYOUT_planck_grid(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-    _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,   KC_F15,   _______,  KC_INS,  KC_HOME, KC_PGUP, _______, _______,
-    _______, _______, _______, _______, _______,  _______,  _______,  KC_DEL,  KC_END,  KC_PGDN, _______, MT(MOD_LSFT, KC_ENT),
-    _______, _______, _______, _______, _______,  KC_SPC,   KC_SPC,   _______, _______, _______, _______, _______
-),
-
-/* Space fn
- * ,------------------------------------------------------------------------------------.
- * |PRNT SC|      |  UP  |      |      |      |      |      |      |      |      |      |
- * |-------+------+------+------+------+-------------+------+------+------+------+------|
- * |       | LEFT | DOWN | RIGHT|      |      | LEFT | DOWN |  UP  | RIGHT|      |      |
- * |-------+------+------+------+------+------|------+------+------+------+------+------|
- * |       |ALT+1 |ALT+2 |ALT+3 |ALT+4 |ALT+5 |ALT+6 |ALT+7 |ALT+8 |ALT+9 |ALT+10|      |
- * |-------+------+------+------+------+------+------+------+------+------+------+------|
- * |       |      |      |      |VOLDWN|             |VOL UP| PREV | MUTE |PLY/PS| NEXT |
- * `------------------------------------------------------------------------------------'
- */
-[_SPACE_FN] = LAYOUT_planck_grid(
-    KC_PSCR, _______,    KC_UP,      _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-    _______, KC_LEFT,    KC_DOWN,    KC_RIGHT,   _______,    _______,    KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,   _______,    _______,
-    _______, LALT(KC_1), LALT(KC_2), LALT(KC_3), LALT(KC_4), LALT(KC_5), LALT(KC_6), LALT(KC_7), LALT(KC_8), LALT(KC_9), LALT(KC_0), _______,
-    _______, _______,    _______,    _______,    KC_VOLD,    _______,    _______,    KC_VOLU,    KC_MPRV,    KC_MUTE,    KC_MPLY,    KC_MNXT
-),
-
-/* Gaming Layer
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | FN   | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAMING] = LAYOUT_planck_grid(
-    KC_TAB,            KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,      KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    QK_GESC,           KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,      KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    TD(TD_SHIFT_CAPS), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      KC_N,      KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
-    KC_LCTL, FN,       KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,    RAISE,     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Boot |Debug |      |      |      |      |DMREC1|DMREC2|      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |GAMING|      |      |      |      |      |DMPLY1|DMPLY2|Audoff|Aud on|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |DMRSTP|      |Musoff|Mus on|MusMod|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |AG_TOG|      |             |      |      |Voice-|Voice+|      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG,   _______,   _______,  _______, _______, DM_REC1, DM_REC2,   _______,   _______,   _______,
-    _______, TG(_GAMING), ___,   _______,   _______,  _______, _______, DM_PLY1, DM_PLY2,   AU_OFF,    AU_ON,     _______,
-    _______, _______, _______,   _______,   _______,  _______, _______, DM_RSTP, _______,   MU_OFF,    MU_ON,     MU_NEXT,
-    _______, _______, _______,   AG_TOGG,   _______,  _______, _______, _______, _______,   AU_PREV,   AU_NEXT,    _______
-)
-
-};
-
-/* Layer Change Code
- * Runs everytime the layer gets changed
- */
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-    #ifdef AUDIO_ENABLE
-        if (muse_mode) {
-            if (muse_counter == 0) {
-                uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-                if (muse_note != last_muse_note) {
-                    stop_note(compute_freq_for_midi_note(last_muse_note));
-                    play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                    last_muse_note = muse_note;
-                }
-            }
-            muse_counter = (muse_counter + 1) % muse_tempo;
-        }
-    #endif
-}
-
-/* Controls which keycodes are processed when in music mode
- * Return: false if key should be honored in music mode
- */
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/planck/keymaps/mjuma/readme.md b/keyboards/planck/keymaps/mjuma/readme.md
deleted file mode 100644
index ee1299b878f..00000000000
--- a/keyboards/planck/keymaps/mjuma/readme.md
+++ /dev/null
@@ -1,183 +0,0 @@
-# M Juma Planck Layout
-
-## Layers
-
-```ascii
-Keymap: 32 Layers                   Layer: action code matrix
------------------                   ---------------------
-stack of layers                     array_of_action_code[row][column]
-       ____________ precedence               _______________________
-      /           / | high                  / ESC / F1  / F2  / F3   ....
-  31 /___________// |                      /-----/-----/-----/-----
-  30 /___________// |                     / TAB /  Q  /  W  /  E   ....
-  29 /___________/  |                    /-----/-----/-----/-----
-   :   _:_:_:_:_:__ |               :   /LCtrl/  A  /  S  /  D   ....
-   :  / : : : : : / |               :  /  :     :     :     :
-   2 /___________// |               2 `--------------------------
-   1 /___________// |               1 `--------------------------
-   0 /___________/  V low           0 `--------------------------
-```
-
-### Qwerty
-
-```ascii
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| GEsc |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl | FN   | GUI  | Alt  |Lower |  Space FN   |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-#### Qwerty Layer Features
-
-- [Grave Escape](https://docs.qmk.fm/#/feature_grave_esc)
-- [Tap Dance](https://docs.qmk.fm/#/feature_tap_dance) Left Shift
-    - Tap => Shift
-    - Double Tap => Capslock
-- [Mod-Tap](https://docs.qmk.fm/#/mod_tap) Enter
-    - Tap => Enter
-    - Hold => Right Shift
-- [Layer Toggle](https://docs.qmk.fm/#/feature_layers) Space
-    - Tap => Space
-    - Hold => Activate ***Space Function*** Layer
-
-### Raise
-
-```ascii
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |      |      |   *  |   4  |   5  |   6  |   -  |  \   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |   /  |   1  |   2  |   3  |   +  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |    Space    |      |   0  |   .  |   =  |      |
-`-----------------------------------------------------------------------------------'
-```
-
-### Lower
-
-```ascii
-,-----------------------------------------------------------------------------------.
-|   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |   /  |   {  |   [  |   ]  |   }  |   \  |   -  |   =  |  |   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |   _  |   +  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |    Space    |      | Home | PgDn | PgUp | End  |
-`-----------------------------------------------------------------------------------'
-```
-
-### Function
-
-```ascii
-,-----------------------------------------------------------------------------------.
-|      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |  F11 |  F12 |  F13 |  F14 |  F15 |      |INSERT| Home | PgUp |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |DELETE| End  | PgDn |      | Enter|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |    Space    |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
-
-### Space Function
-
-```ascii
-,------------------------------------------------------------------------------------.
-|PRNT SC|      |  UP  |      |      |      |      |      |      |      |      |      |
-|-------+------+------+------+------+-------------+------+------+------+------+------|
-|       | LEFT | DOWN | RIGHT|      |      | LEFT | DOWN |  UP  | RIGHT|      |      |
-|-------+------+------+------+------+------|------+------+------+------+------+------|
-|       |ALT+1 |ALT+2 |ALT+3 |ALT+4 |ALT+5 |ALT+6 |ALT+7 |ALT+8 |ALT+9 |ALT+10|      |
-|-------+------+------+------+------+------+------+------+------+------+------+------|
-|       |      |      |      |VOLDWN|             |VOL UP| PREV | MUTE |PLY/PS| NEXT |
-`------------------------------------------------------------------------------------'
-```
-
-### Gaming
-
-```ascii
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl | FN   | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-### Adjust (Lower + Raise)
-
-```ascii
-,-----------------------------------------------------------------------------------.
-|      |RESET |Debug |      |      |      |      |DMREC1|DMREC2|      |      |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |GAMING|      |      |      |      |      |DMPLY1|DMPLY2|Audoff|Aud on|      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |DMRSTP|      |Musoff|Mus on|MusMod|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |AG_TOG|      |             |      |      |Voice-|Voice+|      |
-`-----------------------------------------------------------------------------------'
-```
-
-#### Adjust Layer Features
-
-```text
-RESET:       Put the keyboard into bootloader mode for flashing
-Debug:       Toggle debug mode
-EE_CLR:      Reinitializes the keyboard’s EEPROM (persistent memory)
-
-AG_TOG:      Toggle Alt and GUI swap on both sides (Mac)
-
-DM_REC1:     Start recording Macro 1
-DM_REC2:     Start recording Macro 2
-DM_PLY1:     Replay Macro 1
-DM_PLY2:     Replay Macro 2
-DM_RSTP:     Finish the macro that is currently being recorded.
-
-AU_ON:   Audio mode on
-AU_OFF:  Audio mode off
-AU_TOGG: Toggles Audio mode
-MU_ON:   Turn music mode on
-MU_OFF:  Turn music mode off
-MU_TOGG: Toggle music mode
-MU_NEXT: Cycle through the music modes:
-    CHROMATIC_MODE:  Chromatic scale, row changes the octave
-    GUITAR_MODE:     Chromatic scale, but the row changes the string (+5 st)
-    VIOLIN_MODE:     Chromatic scale, but the row changes the string (+7 st)
-    MAJOR_MODE:      Major scale
-
-In Music Mode:
-    LCTL:    start a recording
-    LALT:    stop recording/stop playing
-    LGUI:    play recording
-    KC_UP:   speed-up playback
-    KC_DOWN: slow-down playback
-```
-
-## Compilation
-
-Use the docker image to compile this keyboard layout by running the following from the root of the repo:
-
-```sh
-util/docker_build.sh planck/rev6:mjuma
-```
-
-## Flashing
-
-Flashing on linux can be done through the docker image
-
-```sh
-sudo util/docker_build.sh planck/rev6:mjuma:flash
-```
-
-or on Windows using the [QMK Toolbox](https://github.com/qmk/qmk_toolbox)
diff --git a/keyboards/planck/keymaps/mjuma/rules.mk b/keyboards/planck/keymaps/mjuma/rules.mk
deleted file mode 100644
index 60f314e82bd..00000000000
--- a/keyboards/planck/keymaps/mjuma/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-DYNAMIC_MACRO_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/planck/keymaps/motform/config.h b/keyboards/planck/keymaps/motform/config.h
deleted file mode 100644
index 6f70f09beec..00000000000
--- a/keyboards/planck/keymaps/motform/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/planck/keymaps/motform/keymap.c b/keyboards/planck/keymaps/motform/keymap.c
deleted file mode 100644
index 54d472d7f10..00000000000
--- a/keyboards/planck/keymaps/motform/keymap.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_swedish.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-                    _COLEMAK,
-                    _LOWER,
-                    _RAISE,
-                    _ADJUST
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-/* These definitions can be removed once keymap_swe is properly vetted against MacOS */
-#define SE_DLR_MAC_V  ALGR(LALT(KC_4))
-#define SE_AT_MAC_V   ALGR(LALT(KC_2))
-
-/* Esc when pressed, ctrl when used as a modifier */
-#define KC_ECTL MT(MOD_LCTL, KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak_se
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   Ö  |  Å   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ECTR |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  Ä   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | SCSHE|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   -  |SCSHE |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | esc  | CTRL | Alt  | CMD  |Lower |Space |Bksp  |Raise | CMD  | RALT | HYPER| MEH  |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid
-(
- KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    SE_ODIA, SE_ARNG,
- KC_ECTL,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    SE_ADIA,
- SC_SENT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  SE_MINS, SC_SENT,
- KC_ESC,    KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_BSPC, RAISE,   KC_RGUI, KC_RALT, KC_HYPR, KC_MEH
- ),
-
-/* Lower
-* ,-----------------------------------------------------------------------------------.
-* |      | PIPE |   '  |   @  |   &  |      | DOWN |      | RIGHT|   `  |   ´  |  ~   |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |      |   !  |   "  |   #  |   ?  |   %  | LEFT |   /  |   \  |   =  |   +  |  *   |
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* |      |      |      |   [  |   ]  |      | UP   |   {  |   }  |      |      |      |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |      |      |      |      |      |      | DEL  |      | Next | Vol- | Vol+ | Play |
-* `-----------------------------------------------------------------------------------'
-*/
-[_LOWER] = LAYOUT_planck_grid
-(
- _______, SE_LCBR,     SE_QUOT, SE_AT_MAC_V, SE_AMPR,     _______, KC_DOWN, KC_NO,       KC_RGHT,     SE_GRV,  SE_GRV,  SE_TILD,
- _______, KC_EXLM,     SE_DQUO, KC_HASH,     SE_QUES,     KC_PERC, KC_LEFT, SE_SLSH,     S(SE_LCBR),  SE_EQL,  KC_PPLS, KC_PAST,
- _______, KC_NO,       KC_NO,   SE_LBRC,     SE_RBRC,     KC_NO,   KC_UP,   S(SE_LBRC),  S(SE_RBRC),  KC_NO,   KC_NO,   _______,
- _______, _______,     _______, _______,     _______,     _______, KC_DEL,  _______,     KC_MNXT,     KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
-/* Raise
-* ,-----------------------------------------------------------------------------------.
-* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | F11  | F12  |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |   ^  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  $   |
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* |      |      |      |   <  |   >  |      |      |  (   |   )  |Pg Up |Pg Dn |      |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-* `-----------------------------------------------------------------------------------'
-*/
-[_RAISE] = LAYOUT_planck_grid
-(
- KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,       KC_F10,  KC_F11,  KC_F12,
- SE_CIRC, KC_1,    KC_2,    KC_3,        KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        KC_9,    KC_0,    SE_DLR_MAC_V,
- _______, KC_NO,   KC_NO,   SE_SECT,     SE_HALF, KC_NO,   KC_NO,   SE_LPRN, SE_RPRN,     KC_PGUP, KC_PGDN, KC_NO,
- _______, _______, _______, _______,     _______, _______, _______, _______, KC_MNXT,     KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset| Debug|      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid
-(
- _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
- )
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/planck/keymaps/motform/readme.md b/keyboards/planck/keymaps/motform/readme.md
deleted file mode 100644
index d9bda61219e..00000000000
--- a/keyboards/planck/keymaps/motform/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Motform Planck Layout
-
-This layout is based off the [colemak-se](github.com/motform/colemak-se)
-layout and features many tweaks to make working with Emacs and
-evil-mode more ergonomic. As with the colemak layout itself, the idea
-is to concentrate as much movement as possible to the home row.
-
-To properly use the layout in Emacs, set Super to LGUI and Meta to RGUI.
-Unless you are running a permutation of the MacOS Swedish QWERTY-layout,
-modifiers will probably not work.
diff --git a/keyboards/planck/keymaps/msiu/config.h b/keyboards/planck/keymaps/msiu/config.h
deleted file mode 100644
index 86550ac5c0c..00000000000
--- a/keyboards/planck/keymaps/msiu/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/msiu/keymap.c b/keyboards/planck/keymaps/msiu/keymap.c
deleted file mode 100644
index 6e5301bcfd8..00000000000
--- a/keyboards/planck/keymaps/msiu/keymap.c
+++ /dev/null
@@ -1,210 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _NUMB,
-  _FUNC,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT_planck_grid(
-  LT(_NUMB, KC_TAB),   KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,      KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-  LCTL_T(KC_ESC),      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_HYPR, KC_LALT, KC_LGUI, LOWER, MO(_FUNC), KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_DVORAK] = LAYOUT_planck_grid(
-  _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,     KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______,
-  _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,     KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,     KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______,
-  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_LOWER] = LAYOUT_planck_grid(
-  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_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,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-  _______, _______,  _______, _______, _______, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-[_RAISE] = LAYOUT_planck_grid(
-  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_4,    KC_5,    KC_6,   KC_PLUS, KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_7,    KC_8,    KC_9,   KC_MINS, KC_F11,  KC_F12,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-  _______, _______, _______, _______, _______, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, _______, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
-),
-
-[_FUNC] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, KC_PSCR, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_NUMB] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,    _______, KC_BSPC,
-  _______, _______, _______, _______, _______, _______, _______, KC_4,    KC_5,    KC_6,    _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_1,    KC_2,    KC_3,    _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_0,    KC_0,    _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/msiu/readme.md b/keyboards/planck/keymaps/msiu/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/msiu/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/msiu/rules.mk b/keyboards/planck/keymaps/msiu/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/msiu/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/muzfuz/config.h b/keyboards/planck/keymaps/muzfuz/config.h
deleted file mode 100644
index 89b3042486b..00000000000
--- a/keyboards/planck/keymaps/muzfuz/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/muzfuz/keymap.c b/keyboards/planck/keymaps/muzfuz/keymap.c
deleted file mode 100644
index 0126ffdf25d..00000000000
--- a/keyboards/planck/keymaps/muzfuz/keymap.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers
-{
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes
-{
-  QWERTY = SAFE_RANGE,
-  BACKLIT,
-  EXT_PLV,
-  HASHRKT,
-  CLNEQLS
-};
-
-#define RSE_ENT LT(_RAISE, KC_ENT)
-#define LWR_SPC LT(_LOWER, KC_SPC)
-#define ESC_CTL CTL_T(KC_ESCAPE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |    Enter    |     Space   | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-    [_QWERTY] = LAYOUT_planck_grid(
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        ESC_CTL, 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,
-        BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, KC_NO, RSE_ENT, KC_NO, LWR_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-
-    /* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |ESCCTL|  :=  |      |  {   |  }   |   (  |   )  |   -  |   =  |   \  |   ~  | GUI |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  =>  |      |  [   |  ]   |     |     |   _  |   +  |  |   | Home  |  End  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |             |            | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-
-    [_LOWER] = LAYOUT_planck_grid(
-        KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-        ESC_CTL, CLNEQLS, _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_MINS, KC_EQL, KC_BSLS, KC_TILD, KC_RGUI,
-        _______, HASHRKT, _______, KC_LBRC, KC_RBRC, _______, _______, KC_UNDS, KC_PLUS, KC_PIPE, KC_HOME, KC_END,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
-
-    /* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |      |      |  Up  |      |      |      |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |ESCCTL|     | Left | Down | Right |      |      |   4  |   5  |   6  |      | GUI  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |  1   |  2   |  3   |     |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |             |             | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-    [_RAISE] = LAYOUT_planck_grid(
-        KC_GRV, _______, _______, KC_UP, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-        ESC_CTL, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_4, KC_5, KC_6, _______, KC_RGUI,
-        _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
-
-    /* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |             |             |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-    [_ADJUST] = LAYOUT_planck_grid(
-        _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-        _______, _______, MU_NEXT, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
-        _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-
-};
-
-#ifdef AUDIO_ENABLE
-float plover_song[][2] = SONG(PLOVER_SOUND);
-float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state)
-{
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  switch (keycode)
-  {
-  case HASHRKT:
-    if (record->event.pressed)
-    {
-      SEND_STRING("=>");
-    }
-    break;
-  case CLNEQLS:
-    if (record->event.pressed)
-    {
-      SEND_STRING(":=");
-    }
-    break;
-  case QWERTY:
-    if (record->event.pressed)
-    {
-      print("mode just switched to qwerty and this is a huge string\n");
-      set_single_persistent_default_layer(_QWERTY);
-    }
-    return false;
-    break;
-  case BACKLIT:
-    if (record->event.pressed)
-    {
-      register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-      backlight_step();
-#endif
-#ifdef KEYBOARD_planck_rev5
-      PORTE &= ~(1 << 6);
-#endif
-    }
-    else
-    {
-      unregister_code(KC_RSFT);
-#ifdef KEYBOARD_planck_rev5
-      PORTE |= (1 << 6);
-#endif
-    }
-    return false;
-    break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode)
-  {
-    if (IS_LAYER_ON(_RAISE))
-    {
-      if (clockwise)
-      {
-        muse_offset++;
-      }
-      else
-      {
-        muse_offset--;
-      }
-    }
-    else
-    {
-      if (clockwise)
-      {
-        muse_tempo += 1;
-      }
-      else
-      {
-        muse_tempo -= 1;
-      }
-    }
-  }
-  else
-  {
-    if (clockwise)
-    {
-#ifdef MOUSEKEY_ENABLE
-      register_code(KC_MS_WH_DOWN);
-      unregister_code(KC_MS_WH_DOWN);
-#else
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-#endif
-    }
-    else
-    {
-#ifdef MOUSEKEY_ENABLE
-      register_code(KC_MS_WH_UP);
-      unregister_code(KC_MS_WH_UP);
-#else
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-#endif
-    }
-  }
-    return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  switch (index)
-  {
-  case 0:
-    if (active)
-    {
-#ifdef AUDIO_ENABLE
-      PLAY_SONG(plover_song);
-#endif
-      layer_on(_ADJUST);
-    }
-    else
-    {
-#ifdef AUDIO_ENABLE
-      PLAY_SONG(plover_gb_song);
-#endif
-      layer_off(_ADJUST);
-    }
-    break;
-  case 1:
-    if (active)
-    {
-      muse_mode = true;
-    }
-    else
-    {
-      muse_mode = false;
-#ifdef AUDIO_ENABLE
-      stop_all_notes();
-#endif
-    }
-  }
-  return true;
-}
-
-void matrix_scan_user(void)
-{
-#ifdef AUDIO_ENABLE
-  if (muse_mode)
-  {
-    if (muse_counter == 0)
-    {
-      uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-      if (muse_note != last_muse_note)
-      {
-        stop_note(compute_freq_for_midi_note(last_muse_note));
-        play_note(compute_freq_for_midi_note(muse_note), 0xF);
-        last_muse_note = muse_note;
-      }
-    }
-    muse_counter = (muse_counter + 1) % muse_tempo;
-  }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode)
-{
-  switch (keycode)
-  {
-  case RAISE:
-  case LOWER:
-    return false;
-  default:
-    return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/muzfuz/readme.md b/keyboards/planck/keymaps/muzfuz/readme.md
deleted file mode 100644
index 6f78284d70d..00000000000
--- a/keyboards/planck/keymaps/muzfuz/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The muzfuz Planck Layout
-
-```shell
-make planck/rev6:muzfuz:dfu-util
-```
diff --git a/keyboards/planck/keymaps/muzfuz/rules.mk b/keyboards/planck/keymaps/muzfuz/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/muzfuz/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/mwpeterson/config.h b/keyboards/planck/keymaps/mwpeterson/config.h
deleted file mode 100644
index 657ffda599b..00000000000
--- a/keyboards/planck/keymaps/mwpeterson/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#define PERMISSIVE_HOLD
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(ONE_UP_SOUND)
-    // #define STARTUP_SONG SONG(PLANCK_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-    #define GOODBYE_SONG SONG(COIN_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/mwpeterson/keymap.c b/keyboards/planck/keymaps/mwpeterson/keymap.c
deleted file mode 100644
index 065750434f4..00000000000
--- a/keyboards/planck/keymaps/mwpeterson/keymap.c
+++ /dev/null
@@ -1,312 +0,0 @@
-// from <https://github.com/noahfrederick/dots/tree/master/planck
-
-#include QMK_KEYBOARD_H
-#include "keymap_plover.h"
-#include "version.h"
-
-extern keymap_config_t keymap_config;
-
-// Keymap layers
-enum planck_layers {
-  QWERTY_LAYER,
-  LOWER_LAYER,
-  RAISE_LAYER,
-  NAV_LAYER,
-  GUI_LAYER,
-  STENO_LAYER,
-  ADJUST_LAYER
-};
-
-// Dashes (macOS)
-#define KC_NDSH LALT(KC_MINS)
-#define KC_MDSH S(LALT(KC_MINS))
-
-// Window manager keys
-#define WM_FULL LALT(LGUI(KC_F))
-#define WM_NEXT LCTL(LALT(LGUI(KC_RGHT)))
-#define WM_PREV LCTL(LALT(LGUI(KC_LEFT)))
-#define WM_NW   LCTL(LGUI(KC_LEFT))
-#define WM_N    LALT(LGUI(KC_UP))
-#define WM_NE   LCTL(LGUI(KC_RGHT))
-#define WM_E    LALT(LGUI(KC_RGHT))
-#define WM_SE   S(LCTL(LGUI(KC_RGHT)))
-#define WM_S    LALT(LGUI(KC_DOWN))
-#define WM_SW   S(LCTL(LGUI(KC_LEFT)))
-#define WM_W    LALT(LGUI(KC_LEFT))
-#define WM_CNTR LALT(LGUI(KC_C))
-
-#define SFT_INS LSFT(KC_INS)
-
-// Unicode
-#ifdef UNICODEMAP_ENABLE
-enum unicode_name {
-  IBANG // ‽
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-  [IBANG]      = 0x0203D // ‽
-};
-#endif // UNICODEMAP_ENABLE
-
-// Custom key codes
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  STENO,
-  PV_EXIT,
-  PV_LOOK,
-  SEND_VERSION,
-  SEND_MAKE
-};
-
-#define LOWER MO(LOWER_LAYER)
-#define RAISE MO(RAISE_LAYER)
-
-#define GUI_L LT(GUI_LAYER, KC_LBRC)
-#define GUI_R LT(GUI_LAYER, KC_RBRC)
-
-#define NAV_SCLN LT(NAV_LAYER, KC_SCLN)
-#define NAV_O    LT(NAV_LAYER, KC_O)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Base layer (Qwerty)
-   *                ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   *                │  ⇥  │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  '  │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * Tap for Esc -- │  ⌃  │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │; Nav│  ⌃  │ -- Tap for Enter
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *   Tap for ( -- │  ⇧  │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  ⇧  │ -- Tap for )
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
-   *   Tap for [ -- │ GUI │Hyper│  ⌥  │  ⌘  │  ↓  │   Space   │  ↑  │  ⌘  │  ⌥  │Hyper│ GUI │ -- Tap for ]
-   *                └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
-   *                        /                                                     /
-   *   Tap for ] [ --------'-----------------------------------------------------'
-   */
-  [QWERTY_LAYER] = LAYOUT_planck_grid(
-    KC_TAB,        KC_Q,           KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,           KC_QUOT,
-    CTL_T(KC_ESC), KC_A,           KC_S,    KC_D,    KC_F,  KC_G,   KC_H,    KC_J,  KC_K,    KC_L,    NAV_SCLN,       CTL_T(KC_ENT),
-    SC_LSPO,       KC_Z,           KC_X,    KC_C,    KC_V,  KC_B,   KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH,        SC_RSPC,
-    GUI_L,         ALL_T(KC_RBRC), KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_RGUI, KC_RALT, ALL_T(KC_LBRC), GUI_R
-  ),
-
-  /* Numeric layer
-   *                ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * Application -- │  `  │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │  #  │
-   *      window    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *    switcher    │     │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │  -  │  +  │  `  │SFTIN│  :  │  |  │  ‽  │  ,  │  .  │  \  │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │     │     │     │     │ Backspace │     │     │     │     │     │
-   *                └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
-   */
-  [LOWER_LAYER] = LAYOUT_planck_grid(
-    KC_GRV,   KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  S(KC_3),
-    _______,  KC_1,    KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    _______,  KC_MINS, KC_PLUS,  KC_GRV,  SFT_INS, KC_COLN, KC_PIPE, UM(IBANG), KC_COMM, KC_DOT,  KC_BSLS, _______,
-    _______,  _______, _______, _______, _______,  KC_BSPC, KC_BSPC, _______, _______, _______, _______, _______
-  ),
-
-  /* Symbol layer
-   *                ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   *                │  ~  │ F11 │ F12 │ F13 │ F14 │ F15 │ F16 │ F17 │ F18 │ F19 │ F20 │  #  │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │  !  │  @  │  #  │  $  │  %  │  ^  │  &  │  *  │  '  │  "  │     │ \
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤  |-- Mostly shifted version
-   *                │     │  _  │  =  │  ~  │SFTIN│  :  │  |  │     │  ,  │  .  │  /  │     │ /    of lower layer
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │     │     │     │     │  Delete   │     │     │     │     │     │
-   *                └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
-   */
-  [RAISE_LAYER] = LAYOUT_planck_grid(
-    S(KC_GRV), KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,     S(KC_3),
-    _______,   S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), KC_QUOT, S(KC_QUOT), _______,
-    _______,   KC_UNDS, KC_EQL,  KC_TILD, SFT_INS, KC_COLN, KC_PIPE, XXXXXXX, KC_COMM, KC_DOT,  KC_SLSH,    _______,
-    _______,   _______, _______, _______, _______, KC_DEL,  KC_DEL,  _______, _______, _______, _______,    _______
-  ),
-
-  /* Directional navigation layer
-   *
-   *         Large movements -----/```````````````````\   /```````````````````\----- Vim-style arrow keys
-   *                ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   *                │     │     │     │     │     │     │     │     │     │     │     │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │     │Home │PgUp │PgDn │ End │  ←  │  ↓  │  ↑  │  →  │     │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │     │     │     │     │     │     │     │     │     │     │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │     │     │     │     │           │     │     │     │     │     │
-   *                └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
-   */
-  [NAV_LAYER] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,
-    _______, XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, NAV_SCLN, _______,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______,
-    _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______,  _______
-  ),
-
-  /* GUI (window management/mouse/media controls) layer
-   *
-   *        Mouse keys -----/```````````````````\               /```````````````````\----- Window manager
-   *                ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   *                │     │Ms B2│Ms Up│Ms B1│Ms WD│     │     │Prev │ NW  │  N  │ NE  │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │Ms L │Ms Dn│Ms R │Ms WU│     │     │Full │  W  │Centr│  E  │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │Undo │ Cut │Copy │Paste│     │     │Next │ SW  │  S  │ SE  │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │     │Prev │Play │Next │     │   Sleep   │     │Mute │Vol- │Vol+ │     │
-   *                └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
-   *                        \___ Media ___/   \___ Screen/sleep __/   \___ Volume __/
-   */
-  [GUI_LAYER] = LAYOUT_planck_grid(
-    _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_D, XXXXXXX, XXXXXXX, WM_PREV, WM_NW,   WM_N,    WM_NE,   _______,
-    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, XXXXXXX, XXXXXXX, WM_FULL, WM_W,    WM_CNTR, WM_E,    _______,
-    _______, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE, XXXXXXX, XXXXXXX, WM_NEXT, WM_SW,   WM_S,    WM_SE,   _______,
-    _______, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_SLEP, KC_WAKE, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, _______
-  ),
-
-  /* Base layer (Qwerty-Steno)
-   *                ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   *                │  #  │  #  │  #  │  #  │  #  │  #  │  #  │  #  │  #  │  #  │  #  │  #  │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │Look │     │  T  │  P  │  H  │           │  F  │  P  │  L  │  T  │  D  │
-   *                │ -up │  S  ├─────┼─────┼─────┤     *     ├─────┼─────┼─────┼─────┼─────┤
-   *                │     │     │  K  │  W  │  R  │           │  R  │  B  │  G  │  S  │  Z  │
-   *                ├─────┼─────┼─────┼─────┼─────┼───────────┼─────┼─────┼─────┼─────┼─────┤
-   *                │Exit │     │     │  A  │  O  │           │  E  │  U  │     │     │     │
-   *                └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
-   */
-  [STENO_LAYER] = LAYOUT_planck_grid(
-    PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM, PV_NUM, PV_NUM,  PV_NUM,  PV_NUM, PV_NUM, PV_NUM,  PV_NUM,  PV_NUM,
-    PV_LOOK, PV_LS,   PV_LT,   PV_LP,  PV_LH,  PV_STAR, PV_STAR, PV_RF,  PV_RP,  PV_RL,   PV_RT,   PV_RD,
-    PV_LOOK, PV_LS,   PV_LK,   PV_LW,  PV_LR,  PV_STAR, PV_STAR, PV_RR,  PV_RB,  PV_RG,   PV_RS,   PV_RZ,
-    PV_EXIT, XXXXXXX, XXXXXXX, PV_A,   PV_O,   KC_SPC,  KC_BSPC, PV_E,   PV_U,   XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* Keyboard settings layer
-   *                ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   *    Firmware -- │     │Reset│Make │     │     │     │     │     │     │     │Vers │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *             -- │Qwert│     │     │     │     │     │     │     │     │     │     │     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *       Audio -- │     │Voic-│Voic+│Mus +│Mus -│MIDI+│MIDI-│     │     │Aud +│Aud -│     │
-   *                ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
-   *                │Steno│     │Swap │Norm │     │           │     │     │     │     │     │
-   *                └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
-   *               Swap GUI/Alt _/________/             \_____________\_           _/
-   */
-  [ADJUST_LAYER] = LAYOUT_planck_grid(
-    XXXXXXX, QK_BOOT, SEND_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SEND_VERSION, XXXXXXX,
-    QWERTY,  XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,
-    XXXXXXX, AU_PREV, AU_NEXT,   MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,       XXXXXXX,
-    STENO,   XXXXXXX, AG_SWAP,   AG_NORM, LOWER,   XXXXXXX, XXXXXXX, RAISE,   XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX
-  )
-};
-
-#ifdef AUDIO_ENABLE
-float plover_song[][2]    = SONG(PLOVER_SOUND);
-float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-// Send PHROPB ({PLOVER:RESUME}).
-void plover_resume(void) {
-  register_code(PV_LP);
-  register_code(PV_LH);
-  register_code(PV_LR);
-  register_code(PV_O);
-  register_code(PV_RP);
-  register_code(PV_RB);
-  unregister_code(PV_LP);
-  unregister_code(PV_LH);
-  unregister_code(PV_LR);
-  unregister_code(PV_O);
-  unregister_code(PV_RP);
-  unregister_code(PV_RB);
-}
-
-// Send PHROF ({PLOVER:SUSPEND}).
-void plover_suspend(void) {
-  register_code(PV_LP);
-  register_code(PV_LH);
-  register_code(PV_LR);
-  register_code(PV_O);
-  register_code(PV_RF);
-  unregister_code(PV_LP);
-  unregister_code(PV_LH);
-  unregister_code(PV_LR);
-  unregister_code(PV_O);
-  unregister_code(PV_RF);
-}
-
-// Send PHROBG ({PLOVER:LOOKUP}).
-void plover_lookup(void) {
-  register_code(PV_LP);
-  register_code(PV_LH);
-  register_code(PV_LR);
-  register_code(PV_O);
-  register_code(PV_RB);
-  register_code(PV_RG);
-  unregister_code(PV_LP);
-  unregister_code(PV_LH);
-  unregister_code(PV_LR);
-  unregister_code(PV_O);
-  unregister_code(PV_RB);
-  unregister_code(PV_RG);
-}
-
-void matrix_init_user(void) {
-    set_unicode_input_mode(UNICODE_MODE_LINUX);
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, LOWER_LAYER, RAISE_LAYER, ADJUST_LAYER);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case STENO:
-      if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-        stop_all_notes();
-        PLAY_SONG(plover_song);
-#endif
-        layer_off(RAISE_LAYER);
-        layer_off(LOWER_LAYER);
-        layer_off(ADJUST_LAYER);
-        layer_on(STENO_LAYER);
-        if (!eeconfig_is_enabled()) {
-          eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-        plover_resume();
-      }
-      return false;
-    case PV_EXIT:
-      if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-        PLAY_SONG(plover_gb_song);
-#endif
-        plover_suspend();
-        layer_off(STENO_LAYER);
-      }
-      return false;
-    case PV_LOOK:
-      if (record->event.pressed) {
-        plover_lookup();
-      }
-      return false;
-    case SEND_VERSION:
-      if (record->event.pressed) {
-        SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION " (" QMK_BUILDDATE ")");
-      }
-      return false;
-    case SEND_MAKE:
-      if (record->event.pressed) {
-        SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP ":dfu\n");
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/mwpeterson/rules.mk b/keyboards/planck/keymaps/mwpeterson/rules.mk
deleted file mode 100644
index e8261702813..00000000000
--- a/keyboards/planck/keymaps/mwpeterson/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-BACKLIGHT_ENABLE    = no   # Enable keyboard backlight functionality
-CONSOLE_ENABLE      = no   # Console for debug
-COMMAND_ENABLE      = no   # Disable shift combination, which conflicts with shift-parens
-MOUSEKEY_ENABLE     = yes  # Mouse keys (disabled to save space)
-NKRO_ENABLE         = no   # N-key rollover required for use as a steno board
-AUDIO_ENABLE        = yes  # Audio output on port C6
-UNICODEMAP_ENABLE   = yes   # Enable extended unicode
diff --git a/keyboards/planck/keymaps/myoung34/config.h b/keyboards/planck/keymaps/myoung34/config.h
deleted file mode 100644
index f69cb622800..00000000000
--- a/keyboards/planck/keymaps/myoung34/config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#undef WORKMAN_SOUND
-#define WORKMAN_SOUND COLEMAK_SOUND
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#define WS2812_DI_PIN B2     // The pin the LED strip is connected to (PB2 by default)
-#define RGBLED_NUM 3      // Number of LEDs in your strip
-#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
-
-#endif
diff --git a/keyboards/planck/keymaps/myoung34/keymap.c b/keyboards/planck/keymaps/myoung34/keymap.c
deleted file mode 100644
index 1142ab8cb04..00000000000
--- a/keyboards/planck/keymaps/myoung34/keymap.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | Ctrl | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, RSFT_T(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_QUOT       ,
-    _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Tab  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | BL   |      |      |      |      |             |      | Play | Vol- | Vol+ | Next |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT_planck_grid(
-    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_TAB,  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_HOME, KC_END,  _______,
-    BL_TOGG, _______, _______, _______, _______, _______, _______, _______,    KC_MPLY,    KC_VOLD, KC_VOLU, KC_MNXT
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Tab  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | BL   |      |      |      |      |             |      | Play | Vol- | Vol+ | Next |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT_planck_grid(
-    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_TAB, 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_PGUP, KC_PGDN, _______,
-    BL_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT
-  ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_M_R, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-   case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/myoung34/readme.md b/keyboards/planck/keymaps/myoung34/readme.md
deleted file mode 100644
index 6814683840f..00000000000
--- a/keyboards/planck/keymaps/myoung34/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# myoung34's Planck Layout
-
-A basic Planck layout with simultaneous backlight and audio support.
-
-## Features
-
-- Base Layers
-  - QWERTY
-  - Colemak
-- Audio
-- Backlight
-
-## Building and flashing
-
-1. Put your board in DFU mode with either the button on the bottom, or with a software key in your current firmware
-1. Flash:
-    ```bash
-    $ make planck/rev4:myoung34:dfu
-    ```
diff --git a/keyboards/planck/keymaps/myoung34/rules.mk b/keyboards/planck/keymaps/myoung34/rules.mk
deleted file mode 100644
index 0560de1dc4b..00000000000
--- a/keyboards/planck/keymaps/myoung34/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-AUDIO_ENABLE = yes         # Audio output on port C6
-CONSOLE_ENABLE = no        # Console for debug(+400)
-MIDI_ENABLE = no           # MIDI controls
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-NKRO_ENABLE = no           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
-BACKLIGHT_ENABLE = yes
-
diff --git a/keyboards/planck/keymaps/navi/config.h b/keyboards/planck/keymaps/navi/config.h
deleted file mode 100644
index df9d67680c8..00000000000
--- a/keyboards/planck/keymaps/navi/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-#define MOUSEKEY_INTERVAL 16
-
-#define MOUSEKEY_DELAY 0
-
-#define MOUSEKEY_TIME_TO_MAX 60
-
-#define MOUSEKEY_MAX_SPEED 7
-
-#define MOUSEKEY_WHEEL_DELAY 0
-
-#define TAPPING_TERM 80
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/planck/keymaps/navi/keymap.c b/keyboards/planck/keymaps/navi/keymap.c
deleted file mode 100644
index 95f1dea79a2..00000000000
--- a/keyboards/planck/keymaps/navi/keymap.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Copyright 2015-2017 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.
- * cd /c/qmk_firmware-master... make planck/rev6:navi
- * 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
-
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _FUNCTION,
-  _ADJUST
-
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  FUNCTION
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | CtlE |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  FN  |CtlSE |  GUI |  Alt | Lower|    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- * CtlSE = Control+shift+esc/
- * CtlE = Control when held, esc when tapped
- * FN takes two taps to have it stay as FN
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  LCTL_T(KC_ESC),  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,
-  TT(_FUNCTION), LCTL(LALT(KC_DEL)), KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_BSPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |  ISO |  End | Home |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |Pg DN | Pg UP|      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  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_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_END, KC_HOME,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    _______, KC_PGDN  , KC_PGUP, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Shift |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / | End  | Home |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |Pg DN |Pg UP |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_END, KC_HOME,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    _______, KC_PGDN  , KC_PGUP, _______
-),
-
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * | Vol- | Mute | Vol+ | 	   | 	  |      |      |   #  |  7   |  8   |  9   | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Prev | Play | Next | 	   | 	  |      |      |   +  |  4   |  5   |  6   |  -   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | CALC |  MWU |  M1  |MouseU|  M2  |      |      |   $  |  1   |  2   |  3   | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  MWD |MouseL|MouseD|MouseR|             |   *  |  0   |  .   |Numlck|  /   |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_FUNCTION] = LAYOUT_planck_grid(
-  KC_VOLD, KC_MUTE, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_HASH, KC_KP_7, KC_KP_8, KC_KP_9, KC_BSPC,
-  KC_MPRV, KC_MPLY, KC_MNXT, AU_ON, AU_OFF, MU_ON, MU_OFF, KC_PPLS, KC_KP_4, KC_KP_5, KC_KP_6, KC_PMNS,
-  KC_CALC, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_DLR, KC_KP_1, KC_KP_2, KC_KP_3, KC_ENTER,
-  KC_TRNS, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_PAST, KC_KP_0, KC_KP_DOT,KC_NUM, KC_PSLS
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-	case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-	case FUNCTION:
-      if (record->event.pressed) {
-        layer_on(_FUNCTION);
-      } else {
-        layer_off(_FUNCTION);
-      }
-      return false;
-	  break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        register_code(KC_MS_WH_DOWN);
-        unregister_code(KC_MS_WH_DOWN);
-      #else
-        register_code(KC_PGDN);
-        unregister_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        register_code(KC_MS_WH_UP);
-        unregister_code(KC_MS_WH_UP);
-      #else
-        register_code(KC_PGUP);
-        unregister_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/navi/readme.md b/keyboards/planck/keymaps/navi/readme.md
deleted file mode 100644
index 2103b1ab1df..00000000000
--- a/keyboards/planck/keymaps/navi/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Navi (Navigatorade)'s personal key layout.
-# Primarily focused on qwerty & colemak
-# Added a numberpad layer, mainly for accounting
-
-
-
diff --git a/keyboards/planck/keymaps/navi/rules.mk b/keyboards/planck/keymaps/navi/rules.mk
deleted file mode 100644
index 4852442b36b..00000000000
--- a/keyboards/planck/keymaps/navi/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-AUDIO_ENABLE = yes
-MOUSEKEY_ENABLE = yes 
-
-DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/neo2planck/keymap.c b/keyboards/planck/keymaps/neo2planck/keymap.c
deleted file mode 100644
index 3650152033c..00000000000
--- a/keyboards/planck/keymaps/neo2planck/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-// for intellisense, has to be commented for building
-/*
-#include "..\..\..\..\quantum\keymap_extras\keymap_german.h"
-#include "..\..\..\..\tmk_core\common\keycode.h"
-*/
-
-/*
-This layout tries to emulate Neo2, and is intended to be used with a German QWERTZ softwarelayout.
-It has "üäöß" as it is optimized for a mix of German & English.
-The special character layer and the navigation & number block layer are designed to keep the fingers near the home row.
-*/
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
-,-----------------------------------------------------------------------------------.
-| Esc  |   X  |   V  |   L  |   C  |   W  |   K  |   H  |   G  |   F  |   Q  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Ent  |   U  |   I  |   A  |   E  |   O  |   S  |   N  |   R  |   T  |   D  |  Y   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Ü  |   Ö  |   Ä  |   P  |   Z  |   B  |   M  |   ,  |   .  |   J  |Shift |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl | GUI  | Alt  |  M2  |  M1  |    Space    |  M1  |  M2  | Alt  |MRight| Ctrl |
-`-----------------------------------------------------------------------------------'
-*/
-
-[0] = LAYOUT_planck_grid(
-     KC_ESC,        DE_X,    DE_V,    DE_L,  DE_C,  DE_W,   DE_K,   DE_H,  DE_G,    DE_F,     DE_Q,     KC_BSPC      ,
-     KC_ENT,        DE_U,    DE_I,    DE_A,  DE_E,  DE_O,   DE_S,   DE_N,  DE_R,    DE_T,     DE_D,     DE_Y         ,
-     KC_LSFT,       DE_UDIA, DE_ODIA, DE_ADIA, DE_P,  DE_Z,   DE_B,   DE_M,  DE_COMM, DE_DOT,   DE_J,     KC_LSFT      ,
-     KC_LCTL ,      KC_RGUI, KC_LALT, MO(2), MO(1), KC_SPC, KC_SPC, MO(1), MO(2),   KC_RALT,  KC_BTN2,  KC_RCTL
-),
-
-/* M1
- ,-----------------------------------------------------------------------------------.
- |  Esc |      |   _  |   [  |   ]  |   ^  |   !  |   <  |   >  |   =  |   &  |  ß   |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  Tab |   \  |   /  |   {  |   }  |   *  |   ?  |   (  |   )  |   -  |   :  |  @   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   #  |   $  |   |  |   ~  |   `  |   +  |   %  |   "  |   '  |   ;  |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M2  |  M1  |    Space    |  M1  |  M2  | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-*/
-[1] = LAYOUT_planck_grid(
-     _______, _______, DE_UNDS, DE_LBRC, DE_RBRC, DE_CIRC, DE_EXLM, DE_LABK, DE_RABK, DE_EQL,  DE_AMPR, DE_SS   ,
-     KC_TAB,  DE_BSLS, DE_SLSH, DE_LCBR, DE_RCBR, DE_ASTR, DE_QUES, DE_LPRN, DE_RPRN, DE_MINS, DE_COLN, DE_AT   ,
-     _______, DE_HASH, DE_DLR,  DE_PIPE, DE_TILD, DE_ACUT, DE_PLUS, DE_PERC, DE_DQUO, DE_QUOT, DE_SCLN, _______ ,
-     _______, _______, _______, MO(3),   _______, _______, _______, _______, MO(3),   _______, _______, _______
-),
-
-/* M2 Navigation & Number Blocks
-*  very easy to get used to & intuituve placement
-* ,-----------------------------------------------------------------------------------.
-* |      | PgUp | Bksp |  Up  |  DEL | PgDn |      |   7  |   8  |   9  |      | Ins  |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  Tab | Home |  Lft | Down | Right| End  |      |   4  |   5  |   6  |   .  | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|      |  Tab |      | Enter|      |   0  |   1  |   2  |   3  |   ,  |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M2  |  M1  |    Space    |  M1  |  M2  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[2] = LAYOUT_planck_grid(
-     XXXXXXX, KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,  KC_PGDN, XXXXXXX, DE_7,    DE_8,  DE_9,    XXXXXXX, KC_INS  ,
-     KC_TAB,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, DE_4,    DE_5,  DE_6,    DE_DOT,  KC_ENT  ,
-     _______, XXXXXXX, KC_TAB,  XXXXXXX, KC_ENT,  XXXXXXX, DE_0,    DE_1,    DE_2,  DE_3,    DE_COMM, _______ ,
-     _______, _______, _______, _______, MO(3), _______, _______, MO(3), _______,  _______, _______, _______
-),
-
-/* M3 Function & Media Keys
-* ,-----------------------------------------------------------------------------------.
-* |      |      | Print|Scroll|Pause |      |      |  F7  |  F8  |  F9  |  F12 |      |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* | Tab  |      | Mute | Vol- | Vol+ |      |   ³  |  F4  |  F5  |  F6  |  F11 | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|      | Prev | Play | Next |      |   ²  |  F1  |  F2  |  F3  |  F10 |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M2  |  M1  |    Space    |  M1  |  M2  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[3] = LAYOUT_planck_grid(
-     XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX, KC_F7, KC_F8,    KC_F9,   KC_F12,  XXXXXXX ,
-     KC_TAB,  XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, DE_SUP3, KC_F4, KC_F5,    KC_F6,   KC_F11,  KC_ENT  ,
-     _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, DE_SUP2,  KC_F1, KC_F2,    KC_F3,   KC_F10,  _______ ,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-};
diff --git a/keyboards/planck/keymaps/neo2planck/readme.md b/keyboards/planck/keymaps/neo2planck/readme.md
deleted file mode 100644
index 2f1c3205717..00000000000
--- a/keyboards/planck/keymaps/neo2planck/readme.md
+++ /dev/null
@@ -1,64 +0,0 @@
-Neo2Planck
-=====================================
-
-This layout tries to emulate Neo2, and is intended to be used with a German QWERTZ softwarelayout.
-It has "üäöß" as it is optimized for a mix of German & English.
-The special character layer and the navigation & number block layer are designed to keep the fingers near the home row.
-
-This layout has some adaptations, due to the limited keys available: 
-* function-keys moved to the bottom row
-* press M1 + M2 to get to layer 3
-
-Neo2 wiki page: http://wiki.neo-layout.org/
-
-## Neo2 Base Layer
-```
- ,-----------------------------------------------------------------------------------.
- | Esc  |   X  |   V  |   L  |   C  |   W  |   K  |   H  |   G  |   F  |   Q  | Bksp |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Ent  |   U  |   I  |   A  |   E  |   O  |   S  |   N  |   R  |   T  |   D  |  Y   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   Ü  |   Ö  |   Ä  |   P  |   Z  |   B  |   M  |   ,  |   .  |   J  |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M2  |  M1  |    Space    |  M1  |  M2  | Alt  |MRight| Ctrl |
- `-----------------------------------------------------------------------------------'
-```
-
-# M1 Special Characters
-```
- ,-----------------------------------------------------------------------------------.
- |  Esc |      |   _  |   [  |   ]  |   ^  |   !  |   <  |   >  |   =  |   &  |  ß   |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  Tab |   \  |   /  |   {  |   }  |   *  |   ?  |   (  |   )  |   -  |   :  |  @   | 
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|   #  |   $  |   |  |   ~  |   `  |   +  |   %  |   "  |   '  |   ;  |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M2  |  M1  |    Space    |  M1  |  M2  | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-```
-
-## M2 Navigation & Number Blocks
-```
- ,-----------------------------------------------------------------------------------.
- |      | PgUp | Bksp |  Up  |  DEL | PgDn |      |   7  |   8  |   9  |      | Ins  |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  Tab | Home |  Lft | Down | Right| End  |      |   4  |   5  |   6  |   .  | Enter|
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|      |  Tab |      | Enter|      |   0  |   1  |   2  |   3  |   ,  |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M2  |  M1  |    Space    |  M1  |  M2  | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-```
-
-## M3 F-Keys and Media-Keys
-```
- ,-----------------------------------------------------------------------------------.
- |      |      | Print|Scroll|Pause |      |      |  F7  |  F8  |  F9  |  F12 |      |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Tab  |      | Mute | Vol- | Vol+ |      |   ³  |  F4  |  F5  |  F6  |  F11 | Enter|
- |------+------+------+------+------+------|------+------+------+------+------+------|
- | Shift|      | Prev | Play | Next |      |   ²  |  F1  |  F2  |  F3  |  F10 |Shift |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI  | Alt  |  M2  |  M1  |    Space    |  M1  |  M2  | Alt  | Esc  | Ctrl |
- `-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/neo2planck/rules.mk b/keyboards/planck/keymaps/neo2planck/rules.mk
deleted file mode 100644
index bf83171565a..00000000000
--- a/keyboards/planck/keymaps/neo2planck/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes 		# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/nick/config.h b/keyboards/planck/keymaps/nick/config.h
deleted file mode 100644
index 3b8eff7513b..00000000000
--- a/keyboards/planck/keymaps/nick/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define TAP_CODE_DELAY 10
-#define ENCODER_RESOLUTION 2
diff --git a/keyboards/planck/keymaps/nick/keymap.c b/keyboards/planck/keymaps/nick/keymap.c
deleted file mode 100644
index 219665c201e..00000000000
--- a/keyboards/planck/keymaps/nick/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Adjust| Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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, ADJUST,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_MPLY, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    _______, 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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,  _______, KC_DEL,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise && !IS_LAYER_ON(_RAISE)) {
-        tap_code(KC_MS_WH_DOWN);
-    } else if (!clockwise && !IS_LAYER_ON(_RAISE)) {
-        tap_code(KC_MS_WH_UP);
-    } else if (clockwise && IS_LAYER_ON(_RAISE)) {
-        tap_code(KC_VOLU);
-    } else if (!clockwise && IS_LAYER_ON(_RAISE)) {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
diff --git a/keyboards/planck/keymaps/nick/readme.md b/keyboards/planck/keymaps/nick/readme.md
deleted file mode 100644
index da7d3861ac6..00000000000
--- a/keyboards/planck/keymaps/nick/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Nick's Planck Layout
-
-Similar to default layout with some minor changes:
-- scroll and volume control knob
-- added rule to remove audio 
-- encoder resolution altered to suit [this model](https://au.element14.com/alps/ec11e15244g1/encoder-vertical-11mm-30det-15ppr/dp/2064986?ost=EC11E15244G1&ddkey=https%3Aen-AU%2FElement14_Australia%2Fsearch)
diff --git a/keyboards/planck/keymaps/nick/rules.mk b/keyboards/planck/keymaps/nick/rules.mk
deleted file mode 100644
index 3bf3f273145..00000000000
--- a/keyboards/planck/keymaps/nick/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_ENABLE = no
diff --git a/keyboards/planck/keymaps/originerd/keymap.c b/keyboards/planck/keymaps/originerd/keymap.c
deleted file mode 100644
index d7c9ffb6b56..00000000000
--- a/keyboards/planck/keymaps/originerd/keymap.c
+++ /dev/null
@@ -1,146 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 planck_layers {
-  _NERD,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  NERD = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* NERD
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DEL  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_NERD] = 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_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_DEL,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_QUOT,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap| NERD |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, NERD,    _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_nerd[][2]       = SONG(QWERTY_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case NERD:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_nerd);
-        #endif
-        persistent_default_layer_set(1UL<<_NERD);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/originerd/readme.md b/keyboards/planck/keymaps/originerd/readme.md
deleted file mode 100644
index 6b627006e80..00000000000
--- a/keyboards/planck/keymaps/originerd/readme.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# The Originerd Planck Layout
-- MIT Layout
-
-## Nerd - Qwerty
-
-```
-,-----------------------------------------------------------------------------------.
-| Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| DEL  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## Lower
-
-```
-,-----------------------------------------------------------------------------------.
-|   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  \   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-`-----------------------------------------------------------------------------------'
-```
-
-## Upper Layer
-
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  '   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-`-----------------------------------------------------------------------------------'
-```
-
-## Adjust
-
-```
-,-----------------------------------------------------------------------------------.
-|      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |Aud on|Audoff|AGnorm|AGswap| NERD |      |      |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/orthodeluxe/config.h b/keyboards/planck/keymaps/orthodeluxe/config.h
deleted file mode 100644
index 05b5e8debbf..00000000000
--- a/keyboards/planck/keymaps/orthodeluxe/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 Erik Bakker
- *
- * 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 ENCODER_RESOLUTION 4
-#define TAPPING_TERM 175
-#define TAPPING_TOGGLE 3
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_MACOS_ROW 2
-#define BOOTMAGIC_LITE_MACOS_COLUMN 7
-#define BOOTMAGIC_LITE_WIN_ROW 0
-#define BOOTMAGIC_LITE_WIN_COLUMN 2
diff --git a/keyboards/planck/keymaps/orthodeluxe/keymap.c b/keyboards/planck/keymaps/orthodeluxe/keymap.c
deleted file mode 100644
index 7e5ee3139b6..00000000000
--- a/keyboards/planck/keymaps/orthodeluxe/keymap.c
+++ /dev/null
@@ -1,533 +0,0 @@
-/* Copyright 2020 Erik Bakker
- *
- * 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"
-
-enum planck_layers {
-    _BASELAYER_MACOS,
-    _BASELAYER_WINDOWS,
-    _LEFTYLAYER,
-    _NUMLAYER_MACOS,
-    _NUMLAYER_WINDOWS,
-    _NAVLAYER_MACOS,
-    _NAVLAYER_WINDOWS,
-    _SYMLAYER_MACOS,
-    _SYMLAYER_WINDOWS,
-    _UTILSLAYER
-};
-
-enum planck_keycodes {
-    MACOS = SAFE_RANGE, 
-    WINDOWS,
-    RCMDCTRL, 
-    LEFTYCUT, LEFTYCOPY, LEFTYPASTE,
-    PLUSCOLON,
-    APPSWITCH, TASKVIEW, PREVDESK, NEXTDESK,
-    QUOTES, DQUOTES,
-    POINTYBR, SQUAREBR, CURLYBR, ROUNDBR
-};
-
-enum appswitch_mode {
-    APPSWITCH_OFF, 
-    APPSWITCH_FIRST_TIME,
-    APPSWITCH_ON,
-    APPSWITCH_TASK_VIEW
-};
-
-enum quote_shapes {
-    SINGLE_QUOTE, DOUBLE_QUOTE
-};
-
-enum bracket_shapes {
-    POINTY, SQUARE, CURLY, ROUND
-};
-
-uint8_t windowsmode = 0;
-
-#define L_NUM_M MO(_NUMLAYER_MACOS)
-#define L_NUM_W MO(_NUMLAYER_WINDOWS)
-#define L_NAV_M MO(_NAVLAYER_MACOS)
-#define L_NAV_W MO(_NAVLAYER_WINDOWS)
-#define L_SYM_M MO(_SYMLAYER_MACOS)
-#define L_SYM_W MO(_SYMLAYER_WINDOWS)
-#define UTILSLAYER MO(_UTILSLAYER)
-
-static void set_keycodes_for_os(int os);
-static bool handle_app_switch(bool pressed);
-static bool app_switch_valid_keycode(uint16_t keycode);
-static bool handle_right_command_or_control(bool pressed);
-static bool handle_pluscolon(bool pressed);
-static bool type_quotes(uint8_t quote_shape, bool pressed);
-static bool type_brackets(uint8_t bracket_shape, bool pressed);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Base layer:
- * ,-----------------------------------------------------------------------------------.
- * |BckSpc|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Esc |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | ;  : | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab- |   Z  |   X  |   C  |   V  |   B  |   N  |   M  | ,  < | .  > | /  ? |  Tab |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Shift|      |      |      |NumLyr|    Space    |NavLyr|      |      |      | Shift|
- * `-----------------------------------------------------------------------------------'    
- *
- * Bottom row for MacOS:
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Shift| Ctrl |Option|  Cmd |NumLyr|    Space    |NavLyr|  Cmd |Option| Ctrl | Shift|
- * `-----------------------------------------------------------------------------------'
- *
- * Bottom row for Windows: 
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Shift|  Win |  Alt | Ctrl |NumLyr|    Space    |NavLyr| Ctrl |  Alt | Menu | Shift|
- * `-----------------------------------------------------------------------------------'
- */
-[_BASELAYER_MACOS] = LAYOUT_planck_grid(
-    KC_BSPC, KC_Q,     KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P,     KC_DEL,
-    KC_ESC,  KC_A,     KC_S,    KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,    KC_SCLN,  KC_ENT,
-    _______, KC_Z,     KC_X,    KC_C,     KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  KC_TAB,
-    KC_LSFT, KC_LCTL,  KC_LALT, KC_LGUI,  L_NUM_M, KC_SPC,  KC_SPC,  L_NAV_M, RCMDCTRL, KC_RALT, KC_RCTL,  KC_RSFT
-),
-[_BASELAYER_WINDOWS] = LAYOUT_planck_grid(
-    KC_BSPC, KC_Q,     KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P,     KC_DEL,
-    KC_ESC,  KC_A,     KC_S,    KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,    KC_SCLN,  KC_ENT,
-    _______, KC_Z,     KC_X,    KC_C,     KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  KC_TAB,
-    KC_LSFT, KC_LGUI,  KC_LALT, KC_LCTL,  L_NUM_W, KC_SPC,  KC_SPC,  L_NAV_W, RCMDCTRL, KC_RALT, KC_APP,   KC_RSFT
-),
-
-/* Lefty layer:
- * This layer enables lefties (who mouse with their left hand) to easily cut, copy and paste using their right hand.
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |  Cut | Copy | Paste|      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |(hold)|      |      |      |
- * '-----------------------------------------------------------------------------------'
- */
- 
- [_LEFTYLAYER] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_X,    KC_C,    KC_V,    _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Numpad layer:
- * ,-----------------------------------------------------------------------------------.
- * |      |   &  |   |  |   !  |   +  |   =  |   %  |   7  |   8  |   9  |   *  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   @  | '  ' | "  " |   -  |   _  |   €  |   4  |   5  |   6  | +  : | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | <  > | [  ] | {  } | (  ) |   \  |   $  |   1  |   2  |   3  |   /  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |(hold)|             |SymLyr|   0  |   .  |   -  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMLAYER_MACOS] = LAYOUT_planck_grid(
-    _______, KC_AMPR,  KC_PIPE,  KC_EXLM, KC_PPLS, KC_EQL,  KC_PERC,    KC_7,    KC_8,    KC_9,    KC_PAST,   KC_EQL,
-    _______, KC_AT,    QUOTES,   DQUOTES, KC_MINS, KC_UNDS, RALT(KC_2), KC_4,    KC_5,    KC_6,    PLUSCOLON, KC_PENT,
-    _______, POINTYBR, SQUAREBR, CURLYBR, ROUNDBR, KC_BSLS, KC_DLR,     KC_1,    KC_2,    KC_3,    KC_PSLS,   _______,
-    _______, _______,  _______,  _______, _______, _______, _______,    L_SYM_M, KC_0,    KC_PDOT, KC_PMNS,   _______
-),
-[_NUMLAYER_WINDOWS] = LAYOUT_planck_grid(
-    _______, KC_AMPR,  KC_PIPE,  KC_EXLM, KC_PPLS, KC_EQL,  KC_PERC,    KC_7,    KC_8,    KC_9,    KC_PAST,   KC_EQL,
-    _______, KC_AT,    QUOTES,   DQUOTES, KC_MINS, KC_UNDS, RALT(KC_5), KC_4,    KC_5,    KC_6,    PLUSCOLON, KC_PENT,
-    _______, POINTYBR, SQUAREBR, CURLYBR, ROUNDBR, KC_BSLS, KC_DLR,     KC_1,    KC_2,    KC_3,    KC_PSLS,   _______,
-    _______, _______,  _______,  _______, _______, _______, _______,    L_SYM_W, KC_0,    KC_PDOT, KC_PMNS,   _______
-),
-
-/* Symbol layer:
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |   €  |      |   ~  |      |   _  |   ^  |      |   %  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   @  |   $  |   $  |      |   `  |   #  |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |   !  |      |      |   \  |   ~  |   &  |      |      |   !  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |(hold)|  UtilsLayer |(hold)|      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_SYMLAYER_MACOS] = LAYOUT_planck_grid(
-    _______, XXXXXXX, XXXXXXX, RALT(KC_2), XXXXXXX, KC_TILD,    XXXXXXX,    KC_UNDS, KC_CIRC, XXXXXXX, KC_PERC, _______,
-    _______, KC_AT,   KC_DLR,  KC_DLR,     XXXXXXX, KC_GRV,     KC_HASH,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    _______, XXXXXXX, KC_EXLM, XXXXXXX,    XXXXXXX, KC_BSLS,    KC_TILD,    KC_AMPR, XXXXXXX, XXXXXXX, KC_EXLM, _______,
-    _______, _______, _______, _______,    _______, UTILSLAYER, UTILSLAYER, _______, _______, _______, _______, _______
-),
-[_SYMLAYER_WINDOWS] = LAYOUT_planck_grid(
-    _______, XXXXXXX, XXXXXXX, RALT(KC_5), XXXXXXX, KC_TILD,    XXXXXXX,    KC_UNDS, KC_CIRC, XXXXXXX, KC_PERC, _______,
-    _______, KC_AT,   KC_DLR,  KC_DLR,     XXXXXXX, KC_GRV,     KC_HASH,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    _______, XXXXXXX, KC_EXLM, XXXXXXX,    XXXXXXX, KC_BSLS,    KC_TILD,    KC_AMPR, XXXXXXX, XXXXXXX, KC_EXLM, _______,
-    _______, _______, _______, _______,    _______, UTILSLAYER, UTILSLAYER, _______, _______, _______, _______, _______
-),
-
-/* Navigation layer:
- * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |      | PgUp | Home |  Up  |  End |PrtScr| Lock |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F5  |  F6  |  F7  |  F8  |      | PgDn | Left | Down | Right| AppSw|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |      |      |PrDesk| Down |NxDesk|TaskVw|      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |SymLyr|             |(hold)|      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NAVLAYER_MACOS] = LAYOUT_planck_grid(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_PGUP, G(KC_LEFT), KC_UP,   G(KC_RGHT), SGUI(KC_4), C(G(KC_Q)),
-    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, KC_PGDN, KC_LEFT,    KC_DOWN, KC_RGHT,    APPSWITCH,  _______,
-    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, C(KC_LEFT), KC_DOWN, C(KC_RGHT), C(KC_UP),   _______,
-    _______, _______, _______, _______, L_SYM_M, _______, _______, _______,    _______, _______,    _______,    _______
-),
-[_NAVLAYER_WINDOWS] = LAYOUT_planck_grid(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_PGUP, KC_HOME,       KC_UP,   KC_END,        KC_PSCR,   G(KC_L),
-    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, KC_PGDN, KC_LEFT,       KC_DOWN, KC_RGHT,       APPSWITCH, _______,
-    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, C(G(KC_LEFT)), KC_DOWN, C(G(KC_RGHT)), G(KC_TAB), _______,
-    _______, _______, _______, _______, L_SYM_W, _______, _______, _______,       _______, _______,       _______,   _______
-),
-
-/* Utilities layer:
- * ,-----------------------------------------------------------------------------------.
- * |      |      |  Win |      | Reset|      |      |      |  Ins |      | Pause|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |ScrlLk| Debug|      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |CapsLk|      |      | NumLk|  Mac |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |(hold)|    (hold)   |(hold)|      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_UTILSLAYER] = LAYOUT_planck_grid(
-    _______, XXXXXXX, WINDOWS, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PAUS, _______,
-    _______, XXXXXXX, KC_SCRL, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    _______, XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX, XXXXXXX, KC_NUM,  MACOS,   XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-};
-
-/* Bootmagic keys (hold when plugging in the USB cable):
- * ,-----------------------------------------------------------------------------------.
- * |BootLd|      |  Win |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |  Mac |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool app_switch_active = false;
-static uint16_t timer;
-static uint16_t duration = 0;
-static bool double_tap = false;
-uint8_t active_modifiers = 0;
-bool shift_modifier_active = false;
-uint8_t keycode_rightcommand;
-uint8_t keycode_appswitch;
-
-/* main loop */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    /* Store modifiers in booleans for easy access in underlying methods. */
-    active_modifiers = get_mods();
-    shift_modifier_active = active_modifiers & ((1<<((KC_LSFT) & 0x07)) | (1<<((KC_RSFT) & 0x07)));
-
-    /* Switch off timer when double click time is exceeded. */
-    if (timer > 0) {
-        duration = timer_elapsed(timer);
-        if (duration > TAPPING_TERM) { timer = 0; }
-    }
-        
-    /* Keep app_switch_active true, while a valid key is pressed. */
-    if (app_switch_active) {
-        if ((keycode == L_NAV_M || keycode == L_NAV_W) && record->event.pressed == false) {
-            unregister_code(keycode_appswitch);
-            app_switch_active = false;
-        }
-        if (app_switch_valid_keycode(keycode) == false) {
-            unregister_code(keycode_appswitch);
-            app_switch_active = false;
-        }
-    }
-
-    switch (keycode) {
-        case MACOS:
-            #ifdef AUDIO_ENABLE
-                stop_all_notes();
-                PLAY_SONG(plover_song);
-            #endif
-            set_keycodes_for_os(MACOS);
-            default_layer_set(_BASELAYER_MACOS);
-            layer_on(_BASELAYER_MACOS);
-            layer_off(_BASELAYER_WINDOWS);
-            return false;
-            break;
-        case WINDOWS:
-            #ifdef AUDIO_ENABLE
-                stop_all_notes();
-                PLAY_SONG(plover_gb_song);
-            #endif
-            set_keycodes_for_os(WINDOWS);
-            default_layer_set(_BASELAYER_WINDOWS);
-            layer_on(_BASELAYER_WINDOWS);
-            layer_off(_BASELAYER_MACOS);
-            return false;
-            break;
-        case RCMDCTRL:
-            return handle_right_command_or_control(record->event.pressed);
-            break;
-        case APPSWITCH:
-            return handle_app_switch(record->event.pressed);
-            break;
-        case QUOTES:
-            return type_quotes(SINGLE_QUOTE, record->event.pressed);
-            break;
-        case DQUOTES:
-            return type_quotes(DOUBLE_QUOTE, record->event.pressed);
-            break;
-        case POINTYBR:
-            return type_brackets(POINTY, record->event.pressed);
-            break;
-        case SQUAREBR:
-            return type_brackets(SQUARE, record->event.pressed);
-            break;
-        case CURLYBR:
-            return type_brackets(CURLY, record->event.pressed);
-            break;
-        case ROUNDBR:
-            return type_brackets(ROUND, record->event.pressed);
-            break;
-        case PLUSCOLON:
-            return handle_pluscolon(record->event.pressed);
-            break;
-    }
-    return true;
-}
-
-void set_keycodes_for_os(int os) {
-    if (os == MACOS) {
-        keycode_rightcommand = KC_RGUI;
-        keycode_appswitch = KC_LGUI;
-    } else {
-        keycode_rightcommand = KC_RCTL;
-        keycode_appswitch = KC_LALT;
-    }
-}
-
-/* While lefties use their mouse with their left hand, it is handy to use their right hand for Cut, Copy and Paste. */
-bool handle_right_command_or_control(bool pressed) {
-    if (pressed) {
-        register_code(keycode_rightcommand);
-        layer_on(_LEFTYLAYER);
-    } else {
-        layer_off(_LEFTYLAYER);
-        unregister_code(keycode_rightcommand);
-    }
-    return false;
-}
-
-/* Key combo to easily switch applications. Press and hold Command or Alt, press and release Tab. Command or Alt is released when an invalid key is pressed in main loop. */
-bool handle_app_switch(bool pressed) {
-    if (pressed) {
-        if (app_switch_active == false) {
-          app_switch_active = true;
-          register_code(keycode_appswitch);
-        }
-        register_code(KC_TAB);
-    } else {
-        unregister_code(KC_TAB);
-    }
-    return false;
-}
-
-/* Defines valid keys for app_switch function. */
-bool app_switch_valid_keycode(uint16_t keycode) {
-    if (keycode == APPSWITCH || KC_UP || KC_LEFT || KC_DOWN || KC_RIGHT) {
-        return true;
-    }
-    return false;
-}
-
-/* Type 1 or 2 quotation marks, either single or double quotation marks.
- *  - Press once: type 1 quote and start timer. 
- *  - Quickly press twice: type pair of quotes and put cursor in between. 
- */
-bool type_quotes(uint8_t quote_shape, bool pressed) {
-    clear_mods();
-    bool use_shift = quote_shape == DOUBLE_QUOTE ? true : false;
-
-    duration = timer_elapsed(timer);
-
-    if (pressed) {
-        if ((timer == 0) || (duration == 0) || (duration > TAPPING_TERM)) {
-            if (use_shift) { register_code(KC_LSFT); }
-            register_code(KC_QUOT);
-            double_tap = false;
-        } else {
-            if (duration < TAPPING_TERM) {
-                if (use_shift) { 
-                    tap_code16(S(KC_QUOT));
-                } else {
-                    tap_code(KC_QUOT);
-                }
-                double_tap = true;
-            }
-        }
-    } else {
-        if (double_tap) {
-            tap_code(KC_LEFT);
-            timer = 0;
-            double_tap = false;
-        } else {
-            unregister_code(KC_QUOT);
-            if (use_shift) { unregister_code(KC_LSFT); }
-            timer = timer_read();
-            double_tap = false;
-        }
-    }
-
-    set_mods(active_modifiers);
-    return false;
-}
-
-/* Type a bracket or a pair of brackets
- *  - Press once: type opening bracket.
- *  - Press while holding shift: type closing bracket.
- *  - Quickly press twice: type pair of brackets and put cursor in between.
- */
-bool type_brackets(uint8_t bracket_shape, bool pressed) {
-    clear_mods();
-
-    uint8_t opening_bracket;
-    uint8_t closing_bracket;
-    bool use_shift;
-    switch (bracket_shape) {
-        case POINTY:
-            opening_bracket = KC_COMM;
-            closing_bracket = KC_DOT;
-            use_shift = true;
-            break;
-        case SQUARE:
-            opening_bracket = KC_LBRC;
-            closing_bracket = KC_RBRC;
-            use_shift = false;
-            break;
-        case CURLY:
-            opening_bracket = KC_LBRC;
-            closing_bracket = KC_RBRC;
-            use_shift = true;
-            break;
-        case ROUND:
-            opening_bracket = KC_9;
-            closing_bracket = KC_0;
-            use_shift = true;
-            break;
-    }
-    duration = timer_elapsed(timer);
-
-    if (pressed) {
-        if ((timer == 0) || (duration == 0) || (duration > TAPPING_TERM) || (shift_modifier_active)) {
-            if (use_shift) { register_code(KC_LSFT); }
-            register_code(shift_modifier_active ? closing_bracket : opening_bracket);
-            double_tap = false;
-        } else {
-            if (duration < TAPPING_TERM) {
-                if (use_shift) { 
-                    tap_code16(S(closing_bracket));
-                } else {
-                    tap_code(closing_bracket);
-                }
-                double_tap = true;
-            }
-        }
-    } else {
-        if (double_tap) {
-            tap_code(KC_LEFT);
-            timer = 0;
-            double_tap = false;
-        } else {
-            unregister_code(shift_modifier_active ? closing_bracket : opening_bracket);
-            if (use_shift) { unregister_code(KC_LSFT); }
-            timer = timer_read();
-            double_tap = false;
-        }
-    }
-
-    set_mods(active_modifiers);
-    return false;
-}
-
-/* On the Numpad-layer, the semicolon key produces a Plus ('+'). But to help entering time values, we like to have a colon (':') when shift is held. */
-bool handle_pluscolon(bool pressed) {
-    if (pressed) {
-        register_code(shift_modifier_active ? KC_SCLN : KC_PPLS);
-    } else {
-        unregister_code(shift_modifier_active ? KC_SCLN : KC_PPLS);
-    }
-    return false;
-}
-
-// Bootmagic configures the keyboard when initializing (starting up after connecting the USB cable)
-void bootmagic_lite(void) {
-    matrix_scan();
-    wait_ms(DEBOUNCE * 2);
-    matrix_scan();
-    int os;
-
-    // hold key in upper left corner while plugging in the USB cable to enter the Bootloader for flashing.
-    if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
-        bootloader_jump();
-    }
-
-    // hold M key while plugging in the USB cable to use the keyboard in MacOs mode.
-    if (matrix_get_row(BOOTMAGIC_LITE_MACOS_ROW) & (1 << BOOTMAGIC_LITE_MACOS_COLUMN)) {
-        os = MACOS;
-    }
-
-    // hold W key while plugging in the USB cable to use the keyboard in Windows mode.
-    if (matrix_get_row(BOOTMAGIC_LITE_WIN_ROW) & (1 << BOOTMAGIC_LITE_WIN_COLUMN)) {
-        os = WINDOWS;
-    }
-
-    switch (os){
-        case MACOS:
-            default_layer_set(_BASELAYER_MACOS);
-            layer_on(_BASELAYER_MACOS);
-            layer_off(_BASELAYER_WINDOWS);
-            break;
-        case WINDOWS:
-            default_layer_set(_BASELAYER_WINDOWS);
-            layer_on(_BASELAYER_WINDOWS);
-            layer_off(_BASELAYER_MACOS);
-            break;
-        default:
-            os = MACOS;
-            default_layer_set(_BASELAYER_MACOS);
-            layer_on(_BASELAYER_MACOS);
-            layer_off(_BASELAYER_WINDOWS);
-            break;
-    }
-    set_keycodes_for_os(os);
-}
diff --git a/keyboards/planck/keymaps/orthodeluxe/readme.md b/keyboards/planck/keymaps/orthodeluxe/readme.md
deleted file mode 100644
index 51ad27e95c2..00000000000
--- a/keyboards/planck/keymaps/orthodeluxe/readme.md
+++ /dev/null
@@ -1,64 +0,0 @@
-![Orthodeluxe Layout Image](https://i.imgur.com/xnq1gNj.png)
-
-# Orthodeluxe layout for Planck keyboards
-
-By Erik Bakker
-
-## Main idea
-
-I use a Planck keyboard as a daily driver since 2018. Over time, I improved the layout and added functionality to the firmware. The main idea was to easily access all keys and functions without moving my hands from the home position (when your fingers rest on ASDF and JKL;). I'd like to share this keyboard layout with you.
-
-## Notes about left handedness
-
-This keyboard layout is perfect for people that use the mouse with their left hand. I am right handed myself. But since a couple of years, I learned to use the mouse with my left hand. I started doing that to relieve strain in my right arm. But now, I really like a setup with the keyboard in the middle, a mouse on the left, and pen and paper on the right. For those that insist on using the mouse with their right hand, I plan to create an alternative layout called 'orthodeluxe-R'.
-
-## Base layer
-
-Apart from the basic QWERTY layout, the base layer features:
-
-- A 2U space bar and 2 keys to switch layers. Rotate you keycaps 180 degrees for comfortable access.
-- Shift keys in the lower left and lower right corners. You hit them with the sides of your hands.
-- 2 sets of modifiers, symmetrically layed out in the bottom row. You can switch between MacOs and Windows layouts.
-- In Windows layout, the Ctrl keys are located where you can easily reach it with your thumbs. Just like the command key on Apple keyboards.
-- Symmetrical layout of the left and right sides of the keyboard. Row 1: Backspace and Delete, row 2: Escape and Enter, row 3: Left and right Tab.
-
-## Numpad layer
-
-The numpad layer contains a numpad and non-alphanumeric characters, like math operators, brackets and quotes. 
-
-- Numpad, math operators and currency symbols are all operated by the right hand.
-- All symbols that programmers need are operated by the left hand.
-- Clicking a bracket key produces an opening bracket.
-- Holding shift while clicking a bracket key produces a closing bracket.
-- Double clicking a bracket key produces an opening and closing bracket with the cursor positioned in between.
-- Double clicking the quote keys produces 2 quotes with the cursor positioned in between.
-- The quote/apostrope is conveniently located at the S key, to easily type "It's everyone's favorite keyboard layout".
-
-## Navigation layer
-
-The navigation layer contains the cursor movement keys, keys F1-F12, and more:
-
-- The cursor keys are in an 'inverted T' configuration at the most comfortable position for the right hand (IJKL).
-- An 'App Switch' key to switch appslications, but smarter than just mapping Alt-Tab to that key.
-- A Key to easily access Task View in Windows (or Mission Control in MacOs).
-- Keys to switch virtual desktops in Windows (or spaces in MacOs).
-
-## Additional layers
-
-There are some additional layers for:
-
-- accessing lesser used symbols and functions;
-- switching between MacOs and Windows modes;
-- access Cut, Copy and Paste shortcuts wirth the right hand, for people that use the mouse with their left hand.
-
-## Bootmagic
-
-This keymap supports Bootmagic Lite. Bootmagic configures the keyboard when initializing (starting up after connecting the USB cable). 
-- hold key in upper left corner while plugging in the USB cable to enter the Bootloader for flashing.
-- hold M key while plugging in the USB cable to use the keyboard in MacOs mode.
-- hold W key while plugging in the USB cable to use the keyboard in Windows mode.
-
-
-## Build
-
-Owners of an older Planck (rev5 or older, those without a USB-C connector) need to disable audio in file 'rules .mk' before building. Otherwise the firmware size will be too large.
diff --git a/keyboards/planck/keymaps/orthodeluxe/rules.mk b/keyboards/planck/keymaps/orthodeluxe/rules.mk
deleted file mode 100644
index bf68f645ae0..00000000000
--- a/keyboards/planck/keymaps/orthodeluxe/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-AUDIO_ENABLE = yes
-BACKLIGHT_ENABLE = no
-KEY_LOCK_ENABLE = yes
-MOUSEKEY_ENABLE = no
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
diff --git a/keyboards/planck/keymaps/oryx/config.h b/keyboards/planck/keymaps/oryx/config.h
deleted file mode 100644
index d00398621d0..00000000000
--- a/keyboards/planck/keymaps/oryx/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 ZSA Technology Inc
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.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
-
-#ifdef AUDIO_ENABLE
-#    define STARTUP_SONG SONG(PLANCK_SOUND)
-#endif
-
-#define MIDI_BASIC
-
-#define ENCODER_RESOLUTION 4
-
-/*
-  Set any config.h overrides for your specific keymap here.
-  See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
-*/
-#define ORYX_CONFIGURATOR
-#define USB_SUSPEND_WAKEUP_DELAY 0
-#define FIRMWARE_VERSION u8"vAxxa/ZlQEV"
-#define RGB_MATRIX_DEFAULT_SPD 60
-
-#define PLANCK_EZ_LED_LOWER 1
-#define PLANCK_EZ_LED_RAISE 2
-#define PLANCK_EZ_LED_ADJUST 3
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
deleted file mode 100644
index 7996222beff..00000000000
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Copyright 2020 ZSA Technology Inc
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.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 planck_keycodes {
-    RGB_SLD = SAFE_RANGE,
-};
-
-enum planck_layers {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-#    define LOWER MO(_LOWER)
-#    define RAISE MO(_RAISE)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_planck_grid(
-    KC_TAB,         KC_Q,           KC_W,           KC_E,           KC_R,           KC_T,           KC_Y,           KC_U,           KC_I,           KC_O,           KC_P,           KC_BSPC,
-    KC_ESCAPE,      KC_A,           KC_S,           KC_D,           KC_F,           KC_G,           KC_H,           KC_J,           KC_K,           KC_L,           KC_SCLN,        KC_QUOTE,
-    KC_LSFT,        KC_Z,           KC_X,           KC_C,           KC_V,           KC_B,           KC_N,           KC_M,           KC_COMMA,       KC_DOT,         KC_SLASH,       KC_ENTER,
-    WEBUSB_PAIR,    KC_LCTL,        KC_LALT,        KC_LGUI,        LOWER,          KC_SPACE,       KC_NO,          RAISE,          KC_LEFT,        KC_DOWN,        KC_UP,          KC_RIGHT
-  ),
-
-  [_LOWER] = LAYOUT_planck_grid(
-    KC_TILD,        KC_EXLM,        KC_AT,          KC_HASH,        KC_DLR,         KC_PERC,        KC_CIRC,        KC_AMPR,        KC_ASTR,        KC_LPRN,        KC_RPRN,        _______,
-    KC_DELETE,      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,         KC_NONUS_HASH,  KC_NUBS,KC_HOME,        KC_END,         _______,
-    KC_COMMA,       _______, _______, _______, _______, _______, KC_NO,          _______, KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_MEDIA_PLAY_PAUSE
-  ),
-
-  [_RAISE] = LAYOUT_planck_grid(
-    KC_GRAVE,KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,           KC_8,           KC_9,           KC_0,           _______,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINUS,       KC_EQUAL,       KC_LBRC,        KC_RBRC,        KC_BSLS,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NONUS_HASH,  KC_NUBS,        KC_PGUP,        KC_PGDN,        _______,
-    _______, _______, _______, _______, _______, _______, KC_NO,   _______, KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_MEDIA_PLAY_PAUSE
-  ),
-
-  [_ADJUST] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_DEL,  _______, AU_ON,   AU_OFF,  AU_TOGG, _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, LED_LEVEL, QK_BOOT,
-    _______, _______, MU_ON,   MU_OFF,  MU_TOGG, _______, _______, RGB_MOD, RGB_HUI, RGB_HUD, TOGGLE_LAYER_COLOR, _______,
-    _______, _______, _______, _______, _______, _______, KC_NO,   _______, _______, _______, _______, _______
-  ),
-
-};
-// clang-format on
-
-const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
-    [0] = {{42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {146, 224, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {42, 255, 255}, {32, 255, 234}, {32, 255, 234}, {32, 255, 234}, {32, 255, 234}},
-
-    [1] = {{89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {169, 120, 255}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}, {89, 255, 246}},
-
-    [2] = {{216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {249, 228, 255}, {249, 228, 255}, {249, 228, 255}, {216, 255, 255}, {216, 255, 255}, {105, 255, 255}, {105, 255, 255}, {105, 255, 255}, {216, 255, 255}, {14, 255, 255}, {216, 255, 255}, {216, 255, 255}, {249, 228, 255}, {249, 228, 255}, {249, 228, 255}, {216, 255, 255}, {216, 255, 255}, {105, 255, 255}, {105, 255, 255}, {105, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}, {216, 255, 255}},
-
-};
-
-void set_layer_color(int layer) {
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        HSV hsv = {
-            .h = pgm_read_byte(&ledmap[layer][i][0]),
-            .s = pgm_read_byte(&ledmap[layer][i][1]),
-            .v = pgm_read_byte(&ledmap[layer][i][2]),
-        };
-        if (!hsv.h && !hsv.s && !hsv.v) {
-            rgb_matrix_set_color(i, 0, 0, 0);
-        } else {
-            RGB   rgb = hsv_to_rgb(hsv);
-            float f   = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-            rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b);
-        }
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-    if (keyboard_config.disable_layer_led) {
-        return;
-    }
-    switch (get_highest_layer(layer_state)) {
-        case 1:
-            set_layer_color(0);
-            break;
-        case 2:
-            set_layer_color(1);
-            break;
-        case 3:
-            set_layer_color(2);
-            break;
-        default:
-            if (rgb_matrix_get_flags() == LED_FLAG_NONE) rgb_matrix_set_color_all(0, 0, 0);
-            break;
-    }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case RGB_SLD:
-            if (record->event.pressed) {
-                rgblight_mode(1);
-            }
-            return false;
-    }
-    return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-#    ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-#    else
-        tap_code(KC_PGDN);
-#    endif
-    } else {
-#    ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-#    else
-        tap_code(KC_PGUP);
-#    endif
-    }
-    return true;
-}
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            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/planck/keymaps/oryx/rules.mk b/keyboards/planck/keymaps/oryx/rules.mk
deleted file mode 100644
index 5f561b32e1c..00000000000
--- a/keyboards/planck/keymaps/oryx/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set any rules.mk overrides for your specific keymap here.
-# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
-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/planck/keymaps/paget/config.h b/keyboards/planck/keymaps/paget/config.h
deleted file mode 100755
index 59bf4aa2a3e..00000000000
--- a/keyboards/planck/keymaps/paget/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/paget/keymap.c b/keyboards/planck/keymaps/paget/keymap.c
deleted file mode 100755
index 3e5c39ce019..00000000000
--- a/keyboards/planck/keymaps/paget/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-//Keymap I created to suit my working style
-
-#include QMK_KEYBOARD_H
-
-//Define the layers
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Enter | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
-*/
-
-[_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_LCTL, KC_ENT, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-),
-
-/*
- * ,-----------------------------------------------------------------------------------.
- * |  1   |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   _  |  =   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   `  |      |      |      |      |      |      |      |      |      |   [  |  ]   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   \  |      |      |      |      |      |      |      |      |   #  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      |      |Lower |    Space    |Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
-*/
-[_LOWER] = LAYOUT_planck_grid(
-    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_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_LBRC, KC_RBRC,
-    KC_TRNS, KC_NUBS, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NUHS, KC_TRNS,
-    KC_TRNS, KC_NO,   KC_NO, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO,   KC_NO
-),
-
-/*
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | CAPS |      |      |      |      |      |      |      |PrtScr| Lock |Break |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |      |Insert| Home | PgUp |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      | Alt  |Lower |    Space    |Raise |Delete| End  | PgDn |      |
- * `-----------------------------------------------------------------------------------'
-*/
-
-[_RAISE] = LAYOUT_planck_grid(
-    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_CAPS, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_SCRL, KC_PAUS, KC_NO,
-    KC_TRNS, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-    KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_NO
-)
-
-};
diff --git a/keyboards/planck/keymaps/palleiko/config.h b/keyboards/planck/keymaps/palleiko/config.h
deleted file mode 100644
index 928ddb1617e..00000000000
--- a/keyboards/planck/keymaps/palleiko/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/palleiko/keymap.c b/keyboards/planck/keymaps/palleiko/keymap.c
deleted file mode 100644
index f6258be5bf5..00000000000
--- a/keyboards/planck/keymaps/palleiko/keymap.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* Copyright 2015-2018 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/>.
- *
- * Palleiko Layout
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _NAV,
-  _NUM,
-  _WM,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  NAV,
-  WM,
-  NUM
-};
-
-// i3 Binds
-#define WM_1 LALT(KC_1)
-#define WM_2 LALT(KC_2)
-#define WM_3 LALT(KC_3)
-#define WM_4 LALT(KC_4)
-#define WM_5 LALT(KC_5)
-#define WM_6 LALT(KC_6)
-#define WM_7 LALT(KC_7)
-#define WM_8 LALT(KC_8)
-#define WM_9 LALT(KC_9)
-#define WM_0 LALT(KC_0)
-
-// NOP
-#define ___x___ KC_NO
-
-// MT Shift & Enter
-#define S_ENT MT(MOD_RSFT, KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  NUM | NAV  | Alt  |Lower |    Space    |Raise | NAV  | GUI  |  NUM |  WM  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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, S_ENT  ,
-  KC_LCTL, NUM,     NAV,     KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   NAV,     KC_RGUI, NUM,     WM
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  NUM | NAV  | Alt  |Lower |    Space    |Raise | NAV  | GUI  |  NUM |  WM  |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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, S_ENT  ,
-  KC_LCTL, NUM,     NAV,     KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   NAV,     KC_RGUI, NUM,     WM
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  NUM | NAV  | Alt  |Lower |    Space    |Raise | NAV  | GUI  |  NUM |  WM  |
- * `----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  KC_LCTL, NUM,     NAV,     KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   NAV,     KC_RGUI, NUM,     WM
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Hex Numpad
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |   {  |   }  |   A  |  B   |   7  |   8  |   9  |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  NUM |      |      |   (  |   )  |   C  |  D   |   4  |   5  |   6  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |   [  |   ]  |   E  |  F   |   1  |   2  |   3  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   0  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUM] = LAYOUT_planck_grid(
-  _______, ___x___, ___x___, KC_LCBR, KC_RCBR, KC_A,    KC_B,    KC_7,    KC_8,    KC_9,    ___x___, _______,
-  _______, ___x___, ___x___, KC_LPRN, KC_RPRN, KC_C,    KC_D,    KC_4,    KC_5,    KC_6,    ___x___, _______,
-  _______, ___x___, ___x___, KC_LBRC, KC_RBRC, KC_E,    KC_F,    KC_1,    KC_2,    KC_3,    ___x___, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_0,    _______, _______, _______
-),
-
-/* WM (i3 window binds)
- * ,-----------------------------------------------------------------------------------.
- * |      | WM1  | WM2  | WM3  | WM4  | WM5  | WM6  | WM7  | WM8  | WM9  | WM0  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             | WM6  | WM5  | WM4  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |             | WM1  | WM2  | WM3  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | WM0  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_WM] = LAYOUT_planck_grid(
-  _______, WM_1,    WM_2,    WM_3,    WM_4,    WM_5,    WM_6,    WM_7,    WM_8,    WM_9,    WM_0,    _______,
-  _______, _______, _______, _______, _______, _______, _______, WM_4,    WM_5,    WM_6,    _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, WM_1,    WM_2 ,   WM_3,    _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, WM_0,    _______, _______, _______
-),
-
-/* Navigation Layer (Vim-like arrow binds & i3 binds)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |             |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |        LEFT | DOWN |  UP  | RIGHT|  NAV |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NAV] = LAYOUT_planck_grid(
-  ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,
-  ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, ___x___, ___x___,
-  _______, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Reset| Debug|      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, _______, _______, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case NUM:
-      if (record->event.pressed) {
-        layer_on(_NUM);
-      } else {
-        layer_off(_NUM);
-      }
-      return false;
-      break;
-    case NAV:
-      if (record->event.pressed) {
-        layer_on(_NAV);
-      } else {
-        layer_off(_NAV);
-      }
-      return false;
-      break;
-    case WM:
-      if (record->event.pressed) {
-        layer_on(_WM);
-      } else {
-        layer_off(_WM);
-      }
-      return false;
-      break;
-    }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/palleiko/readme.md b/keyboards/planck/keymaps/palleiko/readme.md
deleted file mode 100644
index d8c70a65261..00000000000
--- a/keyboards/planck/keymaps/palleiko/readme.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# Palleiko's Layout
----
-
-This layout is mostly stock with a increased functionality for my usage.
-
-Changes over stock keymap:
-1. Altered R1 
-1. Home row navigation layer
-1. Hexadecimal numpad layer
-1. Window manager layer for my i3 setup
-
-All-in-all, anyone used to the standard map would have no problem using this.
-
-### QWERTY Keymap & Addded Layers
-##### Qwerty
-```
-Hold Enter for Right Shift
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   | 
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl |  NUM | NAV  | Alt  |Lower |    Space    |Raise | NAV  | GUI  |  NUM |  WM  |
-`-----------------------------------------------------------------------------------'
-```
-##### Hex Numpad
-```
-,-----------------------------------------------------------------------------------.
-|      |      |      |   {  |   }  |   A  |  B   |   7  |   8  |   9  |      |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| _NUM |      |      |   (  |   )  |   C  |  D   |   4  |   5  |   6  |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |   [  |   ]  |   E  |  F   |   1  |   2  |   3  |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |   0  |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
-##### WM (i3 window binds)
-```
-,-----------------------------------------------------------------------------------.
-|      | WM1  | WM2  | WM3  | WM4  | WM5  | WM6  | WM7  | WM8  | WM9  | WM0  |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |      |             | WM6  | WM5  | WM4  |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |             | WM1  | WM2  | WM3  |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      | WM0  |      |      | _WM  |
-`-----------------------------------------------------------------------------------'
-```
-##### Navigation Layer (Vim-like arrow binds & i3 binds)
-```
-,-----------------------------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |      |      | LEFT | DOWN |  UP  | RIGHT|      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | _NAV |      |      |      |             |      |      |      | _NAV |      |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/palleiko/rules.mk b/keyboards/planck/keymaps/palleiko/rules.mk
deleted file mode 100644
index d5ff6cd3ba6..00000000000
--- a/keyboards/planck/keymaps/palleiko/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Atmel ATMEGA23U4 Bootloader
-BOOTLOADER = atmel-dfu
diff --git a/keyboards/planck/keymaps/pascamel/config.h b/keyboards/planck/keymaps/pascamel/config.h
deleted file mode 100644
index fcf90b41320..00000000000
--- a/keyboards/planck/keymaps/pascamel/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/pascamel/keymap.c b/keyboards/planck/keymaps/pascamel/keymap.c
deleted file mode 100644
index 779cb5f2d06..00000000000
--- a/keyboards/planck/keymaps/pascamel/keymap.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  BACKLIT,
-  MY_PWD
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Brite |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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_LALT, KC_LGUI, BACKLIT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Prev | Play | Next |      |      |   *  |   4  |   5  |   6  |   -  | Del  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |  Pwd | Vol- | MUTE | Vol+ |      |      |   /  |   1  |   2  |   3  |   +  | PgUp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   0  |   .  |   =  | PgDn |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_ASTR, KC_4,    KC_5,    KC_6,    KC_MINS, KC_DEL,
-    MY_PWD,  KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_SLSH, KC_1,    KC_2,    KC_3,    KC_PLUS, KC_PGUP,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_0,    KC_DOT,  KC_EQL,  KC_PGDN
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   ~  |      |   /  |   {  |   [  |   ]  |   }  |   \  |   -  |   +  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |   _  |   =  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-
-    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-    _______, KC_TILD, _______, KC_SLSH, KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, KC_BSLS, KC_MINS, KC_PLUS, KC_PIPE,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_EQL,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case MY_PWD:
-      if (record->event.pressed) {
-        SEND_STRING("My secret password!");
-        false;
-      }
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/pascamel/readme.md b/keyboards/planck/keymaps/pascamel/readme.md
deleted file mode 100644
index b6be21cc978..00000000000
--- a/keyboards/planck/keymaps/pascamel/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-#### Base Layer
-
-A regular QWERTY layer, with Ctrl/alt/cmd on the bottom right corner
-
-![Qwerty](https://i.imgur.com/FpRNJZH.png)
-
-
-
-#### Lower ⇓
-
-Focused on numbers and calculations
-
-![Lower](https://i.imgur.com/PyXSGba.png)
-
-
-
-#### Raise ⇑
-
-Symbols
-
-![Raise](https://i.imgur.com/pYhqcnI.png)
-
-
-
-#### Adjust ⇑+⇓
-
-Settings and configurations
-
-![Adjust](https://i.imgur.com/JN7a0Ku.png)
diff --git a/keyboards/planck/keymaps/pascamel/rules.mk b/keyboards/planck/keymaps/pascamel/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/pascamel/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/pevecyan/config.h b/keyboards/planck/keymaps/pevecyan/config.h
deleted file mode 100644
index d21e85693a4..00000000000
--- a/keyboards/planck/keymaps/pevecyan/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/pevecyan/keymap.c b/keyboards/planck/keymaps/pevecyan/keymap.c
deleted file mode 100644
index e630b12d281..00000000000
--- a/keyboards/planck/keymaps/pevecyan/keymap.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#include "action_layer.h"
-#include "muse.h"
-#include "keymap_slovenian.h"
-
-#define ALTG(kc) ALGR(kc) // FIXME: Remove this
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-  _ALTGR,
-  _CAPS,
-  _MEMA,
-  _CARON
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define CAPS MO(_CAPS)
-#define ALTGR MO(_ALTGR)
-#define MEMA MO(_MEMA)
-#define CARON LT(_CARON, SI_QUOT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | CAPS |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |CARON |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | GUI  |LOWER |    Space    |RAISE | ALTGR| MEMA |  F12 |  F5  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,   SI_Q,     SI_W,     SI_E,     SI_R,   SI_T,    SI_Z,    SI_U,    SI_I,    SI_O,    SI_P,    KC_BSPC,
-    CAPS,     SI_A,     SI_S,     SI_D,     SI_F,   SI_G,    SI_H,    SI_J,    SI_K,    SI_L,    CARON,   KC_ENT,
-    KC_LSFT,  SI_Y,     SI_X,     SI_C,     SI_V,   SI_B,    SI_N,    SI_M,    SI_COMM, SI_DOT,  SI_MINS, KC_RSFT,
-    KC_LCTL,  KC_LALT,  KC_LALT,  KC_LGUI,  LOWER,  KC_SPC,  KC_SPC,  RAISE,   ALTGR,   MEMA,    KC_F12,  KC_F5
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   "  |   #  |   $  |   %  |   &  |   /  |   (  |   )  |   =  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ?  |   *  |   `  |   +  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |   <  |   >  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    SI_TILD, SI_EXLM, SI_DQUO, KC_HASH, SI_DLR,  SI_PERC, SI_AMPR, SI_SLSH, SI_LPRN, SI_RPRN, SI_EQL,  _______,
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   SI_QUES, SI_ASTR, SI_GRV,  SI_PLUS, _______,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, SI_LABK, SI_RABK, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |      |      |      |      |      |      |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Altgr <>
- * ,-----------------------------------------------------------------------------------.
- * |      |   \  |   |  |   €  |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |   [  |   ]  |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |   @  |   {  |   }  |      |   <  |   >  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ALTGR] = LAYOUT_planck_grid(
-    _______, SI_BSLS, SI_PIPE, SI_EURO, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, SI_LBRC, SI_RBRC, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, SI_AT,   SI_LCBR, SI_RCBR, _______, SI_LABK, SI_RABK, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_CAPS] = LAYOUT_planck_grid(
-    KC_ESC , KC_BSPC, KC_UP  , KC_DEL , _______, _______, _______, _______, _______, KC_HOME,       KC_END,         KC_DEL ,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, LCTL(KC_LEFT), LCTL(KC_RIGHT), _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,        _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,        _______
-),
-
-[_MEMA] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_MPLY, KC_VOLU,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_CARON] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, SI_ZCAR  , _______, _______, _______, _______, _______,
-    _______, _______, SI_SCAR,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, SI_CCAR,   _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/pevecyan/readme.md b/keyboards/planck/keymaps/pevecyan/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/pevecyan/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/pevecyan/rules.mk b/keyboards/planck/keymaps/pevecyan/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/pevecyan/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/phreed/config.h b/keyboards/planck/keymaps/phreed/config.h
deleted file mode 100644
index 59bf4aa2a3e..00000000000
--- a/keyboards/planck/keymaps/phreed/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/phreed/keymap.c b/keyboards/planck/keymaps/phreed/keymap.c
deleted file mode 100644
index 21d6fbd501c..00000000000
--- a/keyboards/planck/keymaps/phreed/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERT__Y = 0,
-  _NP = 1, // Number Pad
-  _SC = 2, // Special Characters
-  _CD = 3, // Command Keys
-  _FN = 4, // Function Key
-  _PLOVER = 5 // Stenography
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERT__Y] = LAYOUT_planck_grid(
-  KC_Q,    KC_W,    KC_E,    KC_R,         KC_T,   MEH_T(KC_ESC),  GUI_T(KC_BSLS),   KC_Y,         KC_U,    KC_I,    KC_O,     KC_P,
-  KC_A,    KC_S,    KC_D,    LT(_NP,KC_F), KC_G,   ALT_T(KC_TAB),  ALT_T(KC_QUOT),   KC_H, LT(_FN,KC_J),    KC_K,    KC_L,  KC_SCLN,
-  KC_Z,    KC_X,    KC_C,    LT(_SC,KC_V), KC_B,   KC_LBRC,               KC_RBRC,   KC_N, LT(_CD,KC_M), KC_COMM,  KC_DOT,  KC_SLSH,
-  KC_LEFT, KC_DOWN, KC_BSPC, KC_ENT,       SC_LSPO,CTL_T(KC_MINS),  CTL_T(KC_EQL),SC_RSPC,       KC_SPC,  KC_DEL,   KC_UP,  KC_RGHT
-),
-
-[_NP] = LAYOUT_planck_grid(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LABK, KC_RABK, KC_7,    KC_8,    KC_9,    KC_DOT,
-  XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_LALT, KC_PPLS, KC_PMNS, KC_4,    KC_5,    KC_6,    KC_0,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_PSLS, KC_1,    KC_2,    KC_3,    KC_EQL,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LSFT, KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-[_SC] = LAYOUT_planck_grid(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_AMPR, KC_ASTR, KC_TILD, XXXXXXX ,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, KC_DLR,  KC_PERC, KC_CIRC, KC_GRV,
-  XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_EXLM, KC_AT,   KC_HASH, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LSFT, KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-[_FN] = LAYOUT_planck_grid(
-  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_LALT, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-[_CD] = LAYOUT_planck_grid(
-  KC_HOME, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_PGUP, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_PGDN, KC_INS,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
diff --git a/keyboards/planck/keymaps/phreed/readme.md b/keyboards/planck/keymaps/phreed/readme.md
deleted file mode 100644
index 963740058b9..00000000000
--- a/keyboards/planck/keymaps/phreed/readme.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# The Phreed Planck Layout
-
-
-|  Q  |  W  |  E  |  R  |  T  | ESC |           | \  |  Y  |  U  |  I  |  O  |  P  |
-|-----|-----|-----|-----|-----|-----|:---------:|-----|-----|-----|-----|-----|-----|
-|     |     |     |     |     | meh |    MOD    | gui |     |     |     |     |     |
-| f1  | f2  | f3  | f4  | f5  | f6  |<fn]  [num>|  <  |  >  |  7  |  8  |  9  |  .  |
-|home | end |     |     |     |     |<cmd][spec>|     |     |  &  |  *  |  ~  |     |
-
-|  A  |  S  |  D  |  F  |  G  | Tab |           | ' " |  H  |  J  |  K  |  L  | ; : |
-|-----|-----|-----|-----|-----|-----|:---------:|-----|-----|-----|-----|-----|-----|
-|     |     |     | num |     | alt |    MOD    | alt |     | fn  |     |     |     |
-| f7  | f8  | f9  | f10 | f11 | f12 |<fn]  [num>|  +  |  -  |  4  |  5  |  6  |  0  |
-|pg up| del |     |     |     |     |<cmd][spec>|     |     |  $  |  %  |  ^  |  `  |
-
-|  Z  |  X  |  C  |  V  |  B  | [ { |           | ] } |  N  |  M  | , < | . > | / ? |
-|-----|-----|-----|-----|-----|-----|:---------:|-----|-----|-----|-----|-----|-----|
-|     |     |     |spec |     |     |    MOD    |     |     | cmd |     |     |     |
-| f13 | f14 | f15 | f16 | f17 | f18 |<fn]  [num>|  *  |  /  |  1  |  2  |  3  |  =  |
-|pg dn| ins |     |     |     |     |<cmd][spec>|     |     |  !  |  @  |  #  |     |
-
-| <-- | dwn | <__ |enter|  (  | - _ |           | = + |  )  | spc | __< | up  | --> |
-|-----|-----|-----|-----|-----|-----|:---------:|-----|-----|-----|-----|-----|-----|
-|     |     |     |     |shift| ctl |    MOD    | ctl |shift|     |     |     |     |
-| f19 | f20 | f21 | f22 | f23 | f24 |<fn]  [num>|     |     |     |     |     |     |
-|pg dn| ins |     |     |     |     |<cmd][spec>|     |     |     |     |     |     |
-
-
-Make example for this keyboard (after setting up your build environment):
-
-    make planck/rev3:phreed
-
-To flash the keyboard
-
-    make planck/rev3:phreed:dfu
-
-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/planck/keymaps/pickle_jr/README.md b/keyboards/planck/keymaps/pickle_jr/README.md
deleted file mode 100644
index c26a97f2e55..00000000000
--- a/keyboards/planck/keymaps/pickle_jr/README.md
+++ /dev/null
@@ -1,102 +0,0 @@
-Pickle\_Jr's Layout
-===================
-
-Thanks for checking out my layout! This is the layout I have on my planck.
-
-Main
-------
-```
-  ,---------------------------------------------------------------------------------------------------.
-  | Tab/CALC |   Q      |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O   |   P      |  "/CALC |
-  |----------+----------+------+------+------+-------------+------+------+-------+----------+---------|
-  | Esc      |   A      |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L   |   ;/Nav  | Enter   |
-  |----------+----------+------+------+------+------|------+------+------+-------+----------+---------|
-  |   (/SFT  |   Z      |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .   |   /      |  )/SFT  |
-  |----------+----------+------+------+------+------+------+------+------+-------+----------+---------|
-  |   [/SPC  |   CTRL   |PrintS| GUI  | Bksp |Lower |Raise |  SPC | ALT  |VIMSAVE|  CTRL    |  ]/SPC  |
-  `---------------------------------------------------------------------------------------------------'
-```
-
-Lower
------
-```
-  ,-----------------------------------------------------------------------------------.
-  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   F7 |   F8 |   F9 |  F10 |  F11 | F12  |
-  |------+------+------+------+------+-------------+------+------+------+------+------|
-  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |      |      |
-  |------+------+------+------+------+------|------+------+------+------+------+------|
-  |      |      |      |      |      |      |      |      |      |      |      |      |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |      |      |      |      |      |      |      | DEL  |      |      |      |      |
-  `-----------------------------------------------------------------------------------'
-```
-
-Raise
------
-```
-  ,-----------------------------------------------------------------------------------.
-  |      |      |      |      |      |      |      |      |      |      |      |      |
-  |------+------+------+------+------+-------------+------+------+------+------+------|
-  |   !  |   @  |   #  |   $  |   %  |   ^  |  &   |  *   |  -   |  =   |  +   |      |
-  |------+------+------+------+------+------|------+------+------+------+------+------|
-  |      |      |  ~   |   `  | CTRL |      |  |   |      |  _   |      |      |      |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |      |      |      |      |      |             |      |      |      |      |      |
-  `-----------------------------------------------------------------------------------'
-```
-
-Special (SPC on main)
--------
-```
-  ,------------------------------------------------------------------------------------.
-  |      |  M2  | MUP  |  M1  | WUP  |      | CAPS  |      |      |      |      |      |
-  |------+------+------+------+------+--------------+------+------+------+------+------|
-  |      |MLEFT |MDOWN |MRIGHT|WDOWN |      |       |      |      |      |      |      |
-  |------+------+------+------+------+------|-------+------+------+------+------+------|
-  |      |WLEFT |  M3  |WRIGHT|      |      |CTLALTD|      |      |      |      |      |
-  |------+------+------+------+------+------+-------+------+------+------+------+------|
-  |      | PREV | PLAY | NEXT |      |      | LOCK  |      | MUTE | VOL- | VOL+ |      |
-  `------------------------------------------------------------------------------------'
-```
-
-Calc
-----
-```
-  ,-----------------------------------------------------------------------------------.
-  |      |   F7 |  F8  |  F9  |      |      |  *   |   7  |  8   |  9   |  /   |      |
-  |------+------+------+------+------+-------------+------+------+------+------+------|
-  |      |   F4 |  F5  |  F6  |      |      |  +   |   4  |  5   |  6   |  -   |  \   |
-  |------+------+------+------+------+------|------+------+------+------+------+------|
-  |      |   F1 |  F2  |  F3  |      |      |      |   1  |  2   |  3   |  =   |      |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |      |      |  F11 |  F12 |      | DEL  | Bksp |  0   |      |      |      | RET  |
-  `-----------------------------------------------------------------------------------'
-```
-
-Nav
----
-```
-  ,-----------------------------------------------------------------------------------.
-  |      |      |      |      |      |      |      |      |      |      |      |      |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |      |      | HOME | PGUP | PGDN | END  | LEFT | DOWN |  UP  |RIGHT |      |      |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |      |      |      |      |      |      |      |      |      |      |      |      |
-  |------+------+------+------+------+------+------+------+------+------+------+------|
-  |      |      |      |      |      |      |      |      |      |      |      |      |
-  `-----------------------------------------------------------------------------------'
-```
-
-Adjust (Lower + Raise)
-----------------------
-```
-  ,-------------------------------------------------------------------------------------------.
-  |      | Reset|      |RGB_TOG|RGB_MOD|RGB_HUI|RGB_HUD|RGB_SAI|RGB_SAD|RGB_VAI|RGB_VAD|  Del |
-  |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
-  |      |      |MuNext|Aud on |Audoff |AGnorm |AGswap |       |       |       |       |      |
-  |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
-  |      |Voice-|Voice+|Mus on |Musoff |MIDIon |MIDIof |TERMon |TERMof |       |       |      |
-  |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
-  |      |      |      |       |       |               |       |       |       |       |      |
-  `-------------------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/pickle_jr/config.h b/keyboards/planck/keymaps/pickle_jr/config.h
deleted file mode 100644
index 526ebe8e87f..00000000000
--- a/keyboards/planck/keymaps/pickle_jr/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-#endif
-
-#define MOUSEKEY_DELAY       0
-#define MOUSEKEY_INTERVAL    16
-#define MOUSEKEY_MAX_SPEED   7
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_WHEEL_DELAY 0
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/planck/keymaps/pickle_jr/keymap.c b/keyboards/planck/keymaps/pickle_jr/keymap.c
deleted file mode 100644
index 92da3c50bd1..00000000000
--- a/keyboards/planck/keymaps/pickle_jr/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _SPECIAL 3
-#define _CALC 4
-#define _NAV 5
-#define _ADJUST 6
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-#define LPSFT SFT_T(KC_RPRN)
-#define LCCTL CTL_T(KC_LCBR)
-#define RCCTL MT(MOD_RCTL,KC_RCBR)
-#define RPSFT MT(MOD_RSFT,KC_LPRN)
-
-#define SCOLNAV LT(_NAV,KC_SCLN)
-#define TABCALC LT(_CALC, KC_TAB)
-#define QUOCALC LT(_CALC, KC_QUOT)
-#define LBRACK LT(_SPECIAL,KC_LBRC)
-#define RBRACK LT(_SPECIAL,KC_RBRC)
-
-#define LOCK RGUI(KC_L)
-
-enum custom_keycoedes {
-  CTLALTD = SAFE_RANGE,
-  VIMSAVE,
-  VIMWQ
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if(record->event.pressed) {
-    switch(keycode) {
-      case CTLALTD:
-        SEND_STRING(SS_DOWN(X_LCTL)SS_DOWN(X_LALT)SS_DOWN(X_DELETE)SS_UP(X_DELETE)SS_UP(X_LALT)SS_UP(X_LCTL));
-        return false;
-      case VIMSAVE:
-        SEND_STRING(":w");
-        return false;
-    }
-  }
-  return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,----------------------------------------------------------------------------------------------------.
- * | Tab/CALC |   Q      |   W   |   E  |   R  |   T  |   Y  |   U  |   I  |   O   |   P      |  "/CALC |
- * |----------+----------+-------+------+------+-------------+------+------+-------+----------+---------|
- * | Esc      |   A      |   S   |   D  |   F  |   G  |   H  |   J  |   K  |   L   |   ;/Nav  | Enter   |
- * |----------+----------+-------+------+------+------|------+------+------+-------+----------+---------|
- * |   (/SFT  |   Z      |   X   |   C  |   V  |   B  |   N  |   M  |   ,  |   .   |   /      |  )/SFT  |
- * |----------+----------+-------+------+------+------+------+------+------+-------+----------+---------|
- * |   [/SPC  |   CTRL   |PrintS | GUI  | Bksp |Lower |Raise |  SPC | ALT  |VIMSAVE|  CTRL    |  ]/SPC  |
- * `----------------------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  TABCALC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,     KC_O,    KC_P,    QUOCALC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,     KC_L,    SCOLNAV, KC_ENT ,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, SC_RSPC,
-  LBRACK , KC_LCTL, KC_PSCR, KC_LGUI, KC_BSPC, LOWER,  RAISE,  KC_SPC,  KC_RALT,  VIMSAVE, KC_RCTL, RBRACK
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   F7 |   F8 |   F9 |  F10 |  F11 | F12  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | DEL  |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  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,    _______, _______,
-  _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, KC_TRNS,  _______, KC_DEL,  _______, _______, _______, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   !  |   @  |   #  |   $  |   %  |   ^  |  &   |  *   |  -   |  =   |  +   |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |  ~   |   `  | CTRL |      |  |   |      |  _   |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,
-  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,  KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,  KC_PLUS, _______,
-  _______, _______, KC_TILD, KC_GRV,  KC_LCTL,  _______, KC_PIPE, _______, KC_UNDS, _______, _______, _______,
-  _______, _______, _______, _______, _______,  _______, KC_TRNS, _______, _______, _______, _______, _______
-),
-
-/* Special
- * ,------------------------------------------------------------------------------------.
- * |      |  M2  | MUP  |  M1  | WUP  |      | CAPS  |      |      |      |      |      |
- * |------+------+------+------+------+--------------+------+------+------+------+------|
- * |      |MLEFT |MDOWN |MRIGHT|WDOWN |      |PRTSCRE|      |      |      |      |      |
- * |------+------+------+------+------+------|-------+------+------+------+------+------|
- * |      |WLEFT |  M3  |WRIGHT|      |      |CTLALTD|      |      |      |      |      |
- * |------+------+------+------+------+------+-------+------+------+------+------+------|
- * |      | PREV | PLAY | NEXT |      |      | LOCK  |      | MUTE | VOL- | VOL+ |      |
- * `------------------------------------------------------------------------------------'
- */
-[_SPECIAL] = LAYOUT_planck_grid(
-  _______,  KC_BTN2,  KC_MS_U, KC_BTN1, KC_WH_U, _______, KC_CAPS, _______,  _______, _______, _______, _______,
-  _______,  KC_MS_L,  KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______,  _______, _______, _______, _______,
-  _______,  KC_WH_L,  KC_BTN3, KC_WH_R, _______, _______, CTLALTD, _______,  _______, _______, _______, _______,
-  KC_TRNS,  KC_MPRV,  KC_MPLY, KC_MNXT, _______, _______, LOCK,    _______,  KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS
-),
-
-/* Calc
- * ,-----------------------------------------------------------------------------------.
- * |      |   F7 |  F8  |  F9  |      |      |  *   |   7  |  8   |  9   |  /   |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   F4 |  F5  |  F6  |      |      |  +   |   4  |  5   |  6   |  -   |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   F1 |  F2  |  F3  |      |      |      |   1  |  2   |  3   |  =   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |  F11 |  F12 |      | DEL  | Bksp |  0   |      |      |      | RET  |
- * `-----------------------------------------------------------------------------------'
- */
-[_CALC] = LAYOUT_planck_grid(
-  KC_TRNS,  KC_F7,   KC_F8,   KC_F9,   _______, _______, KC_ASTR, KC_7, KC_8,    KC_9,    KC_BSLS, KC_TRNS,
-  _______,  KC_F4,   KC_F5,   KC_F6,   _______, _______, KC_PLUS, KC_4, KC_5,    KC_6,    KC_MINS, KC_BSLS,
-  _______,  KC_F1,   KC_F2,   KC_F3,   _______, _______, _______, KC_1, KC_2,    KC_3,    KC_EQL,  _______,
-  _______,  _______, KC_F11,  KC_F12,  _______, KC_DEL,  KC_BSPC, KC_0, _______, _______, KC_ENT,  _______
-),
-
-/* Nav
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      | HOME | PGUP | PGDN | END  | LEFT | DOWN |  UP  |RIGHT |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NAV] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
-  _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_TRNS,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-------------------------------------------------------------------------------------------.
- * |      | Reset|      |RGB_TOG|RGB_MOD|RGB_HUI|RGB_HUD|RGB_SAI|RGB_SAD|RGB_VAI|RGB_VAD|  Del |
- * |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
- * |      |      |MUNEXT|Aud on |Audoff |AGnorm |AGswap |       |       |       |       |      |
- * |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
- * |      |Voice-|Voice+|Mus on |Musoff |MIDIon |MIDIof |TERMon |TERMof |       |       |      |
- * |------+------+------+-------+-------+-------+-------+-------+-------+-------+-------+------|
- * |      |      |      |       |       |               |       |       |       |       |      |
- * `-------------------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, KC_TRNS, KC_TRNS, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-};
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-};
diff --git a/keyboards/planck/keymaps/pickle_jr/rules.mk b/keyboards/planck/keymaps/pickle_jr/rules.mk
deleted file mode 100644
index 6933bd75551..00000000000
--- a/keyboards/planck/keymaps/pickle_jr/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/piemod/README.md b/keyboards/planck/keymaps/piemod/README.md
deleted file mode 100644
index 9c29e75db34..00000000000
--- a/keyboards/planck/keymaps/piemod/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-PieMod
-======
-
-A keymap for users that need:
-
-- *P*: Programming symbols.
-
-- *I*: i3wm.
-
-- *E*: Emacs.
-
-- *M*: Macros.
-
-- *O*: Ortholinear.
-
-- *D*: Dvorak.
-
-Still a work-in-progress. Suggestions welcome @ https://github.com/dwrz/piemod.
-
-### TODO
-
-- [ ] Add Emacs layer.
-- [ ] Add Macro layer.
-- [ ] Add system control keys (rotation, brightness).
-- [ ] Switch " and ' quotes (or function to toggle default).
-- [ ] Add capslock.
-.
diff --git a/keyboards/planck/keymaps/piemod/keymap.c b/keyboards/planck/keymaps/piemod/keymap.c
deleted file mode 100644
index 60fb2bbf125..00000000000
--- a/keyboards/planck/keymaps/piemod/keymap.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define DVORAK 0
-#define ARROW 1
-#define SYMBOL 2
-#define NUMBER 3
-#define FUNCTION 4
-#define EMACS 5
-#define CUSTOM_MACROS 6
-#define MOUSE 7
-
-#define LT_1A LT(1, KC_A)
-#define LT_2O LT(2, KC_O)
-#define LT_3E LT(3, KC_E)
-#define LT_4U LT(4, KC_U)
-#define LT_5Q LT(5, KC_Q)
-#define LT_6CTL LT(6, KC_LCTL)
-#define LT_7COM LT(7, KC_COMM)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [DVORAK] = LAYOUT_planck_grid(
-    KC_ESC,  KC_QUOTE,  LT_7COM,  KC_DOT,  KC_P,  KC_Y,  KC_F,  KC_G,  KC_C,  KC_R,  KC_L,  KC_DELETE,
-    KC_TAB,  LT_1A,  LT_2O,  LT_3E,  LT_4U,  KC_I,  KC_D,  KC_H,  KC_T,  KC_N,  KC_S,  KC_ENTER,
-    KC_LSFT,  KC_SCLN,  LT_5Q,   KC_J,   KC_K,  KC_X,   KC_B,   KC_M,   KC_W,  KC_V,  KC_Z,  KC_MINUS,
-    C(KC_LALT), LT_6CTL,  KC_MENU, KC_LALT,  KC_LGUI,  KC_BSPC,  KC_SPACE,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT
-  ),
-
-  [ARROW] = LAYOUT_planck_grid(
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_HOME,  KC_UP,  KC_END,  KC_PGUP,
-    KC_NO,  KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_PGDN,
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,  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
-  ),
-
-  [SYMBOL] = LAYOUT_planck_grid(
-    KC_TILD,  KC_GRAVE,  KC_NO,  KC_EQUAL,  KC_PLUS,  KC_NO,  KC_LBRC,  KC_RBRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,
-    KC_NO,  KC_NO,  KC_TRNS,  KC_SCLN,  KC_COLN,  KC_NO,  KC_LCBR,  KC_RCBR,  KC_DLR,  KC_PERC,  KC_CIRC,  S(KC_SLSH),
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BSLS,  KC_SLASH,  KC_EXLM,  KC_AT,  KC_HASH,  KC_PIPE,
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_ASTR,   KC_SLASH,  KC_MINUS,  KC_PLUS,  KC_EQUAL
-  ),
-
-  [NUMBER] = LAYOUT_planck_grid(
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_7,  KC_8,  KC_9,  KC_NO,
-    KC_NO,  KC_NO,  KC_NO,  KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_4,  KC_5,  KC_6,  KC_NO,
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_0,  KC_1,  KC_2,  KC_3,  KC_NO,
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_ASTR,  KC_SLASH,  KC_MINUS,  KC_PLUS,  KC_EQUAL
-  ),
-
-  [FUNCTION] = LAYOUT_planck_grid(
-    KC_PSCR,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,
-     KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_TRNS,  KC_NO,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,
-     KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, KC_NO,  KC_AUDIO_MUTE,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  KC_MEDIA_PLAY_PAUSE,
-     QK_BOOT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_DELETE,  KC_INSERT,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
-    ),
-
-    [EMACS] = LAYOUT_planck_grid(
-      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,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-      KC_NO,  KC_TRNS,  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,  KC_NO,  KC_NO,  KC_NO
-    ),
-
-    [CUSTOM_MACROS] = LAYOUT_planck_grid(
-      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,  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_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-    ),
-
-    [MOUSE] = LAYOUT_planck_grid(
-      KC_NO,  KC_NO,  KC_TRNS,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_MS_U,  KC_NO,  KC_NO,
-      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_MS_L,  KC_MS_D,  KC_MS_R,  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,  KC_MS_BTN1,  KC_MS_BTN2,  KC_MS_BTN3,  KC_NO,  KC_NO,  KC_NO
-    ),
-
-  };
diff --git a/keyboards/planck/keymaps/piemod/rules.mk b/keyboards/planck/keymaps/piemod/rules.mk
deleted file mode 100644
index 4f83056a800..00000000000
--- a/keyboards/planck/keymaps/piemod/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-AUDIO_ENABLE = yes 
-
-ifeq ($(MCU),at90usb1286)
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-BLUETOOTH_ENABLE = no
-else
-BLUETOOTH_ENABLE = yes
-endif
-
diff --git a/keyboards/planck/keymaps/pjanx/config.h b/keyboards/planck/keymaps/pjanx/config.h
deleted file mode 100644
index b38db026e06..00000000000
--- a/keyboards/planck/keymaps/pjanx/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2015-2018 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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/pjanx/keymap.c b/keyboards/planck/keymaps/pjanx/keymap.c
deleted file mode 100644
index a491a34f960..00000000000
--- a/keyboards/planck/keymaps/pjanx/keymap.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- * Copyright 2021 Přemysl Eric Janouch
- *
- * 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"
-
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LCtrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |RShift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | Caps | LGUI | LAlt |Lower |    Space    |Raise | RAlt | Down |  Up  |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    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, KC_RSFT,
-    KC_ESC,  KC_CAPS, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_RALT, KC_DOWN, KC_UP,   KC_ENT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Ins  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |RCtrl |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | RGUI |      |      |      |             |      | Left | Vol- | Vol+ | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_INS,
-    KC_RCTL, 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_HOME, KC_END, _______,
-    _______, KC_RGUI, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_VOLD, KC_VOLU, KC_RGHT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |RCtrl |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / | PgDn | PgUp |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | App  |      |      |      |             |      | Left | Vol- | Vol+ | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_RCTL, 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_PGDN, KC_PGUP, _______,
-    _______, KC_APP,  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_VOLD, KC_VOLU, KC_RGHT
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  M1  |  M2  |  M3  |      |      |             |      |  <-  |  vv  |  ^^  |  ->  |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, _______, _______, _______, _______, _______, KC_MS_LEFT,  KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update(bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-  return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/pjanx/readme.md b/keyboards/planck/keymaps/pjanx/readme.md
deleted file mode 100644
index e53397847d6..00000000000
--- a/keyboards/planck/keymaps/pjanx/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Modified Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/pjanx/rules.mk b/keyboards/planck/keymaps/pjanx/rules.mk
deleted file mode 100644
index 3a551bd429b..00000000000
--- a/keyboards/planck/keymaps/pjanx/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC += muse.c
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/planck/keymaps/pok3r/config.h b/keyboards/planck/keymaps/pok3r/config.h
deleted file mode 100644
index 1c42f854eae..00000000000
--- a/keyboards/planck/keymaps/pok3r/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/pok3r/keymap.c b/keyboards/planck/keymaps/pok3r/keymap.c
deleted file mode 100644
index b5340db4ab5..00000000000
--- a/keyboards/planck/keymaps/pok3r/keymap.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _FUNCTION
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV,
-  FUNCTION
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Func |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Esc  | Alt  |Lower |    Space    |Raise | Left | Up   | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB         , KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  FUNCTION       , KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SFT_T(KC_ESC)  , KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
-  KC_LCTL        , KC_LGUI, KC_ESC,  KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Func |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Esc  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB         , KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  FUNCTION       , KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SFT_T(KC_ESC)  , KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT(MOD_RSFT, KC_ENT),
-  KC_LCTL        , KC_LGUI, KC_ESC,  KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Func |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Esc  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB         , KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  FUNCTION       , KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  SFT_T(KC_ESC)  , KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    MT(MOD_RSFT, KC_ENT),
-  KC_LCTL        , KC_LGUI, KC_ESC,  KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |Pg Up |Pg Dn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  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_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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_HOME,    KC_PGUP, KC_PGDN, KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |Pg Up |Pg Dn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Caps |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      | Caps |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  KC_CAPS, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_CAPS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |      | Prev | Play | Next |      |      |Pg Up |  Up  |Pg Dn |Prt Sc| Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | Vol- | Mute | Vol+ |      | Home | Left | Down |Right | End  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | Esc  |             | Esc  | Home |Pg Up |Pg Dn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT_planck_grid(
-  KC_ESC , _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_DEL,
-  _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, KC_ESC , _______, _______, KC_ESC , KC_HOME, KC_PGUP, KC_PGDN, KC_END
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case FUNCTION:
-      if (record->event.pressed) {
-        layer_on(_FUNCTION);
-      } else {
-        layer_off(_FUNCTION);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/pok3r/readme.md b/keyboards/planck/keymaps/pok3r/readme.md
deleted file mode 100644
index 66320e9916e..00000000000
--- a/keyboards/planck/keymaps/pok3r/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-This layout adds a new function layer similar to the default one from the pok3r:
-
-    /* Function
-     * ,-----------------------------------------------------------------------------------.
-     * | Esc  |      | Prev | Play | Next |      |      |Pg Up |  Up  |Pg Dn |Prt Sc| Del  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      | Vol- | Mute | Vol+ |      | Home | Left | Down |Right | End  |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      | Home |Pg Up |Pg Dn | End  |
-     * `-----------------------------------------------------------------------------------'
-     */
-
-You can acces this layer by holding the first key on the second line from the top.
diff --git a/keyboards/planck/keymaps/premek/config.h b/keyboards/planck/keymaps/premek/config.h
deleted file mode 100644
index 6a7e5f734c1..00000000000
--- a/keyboards/planck/keymaps/premek/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/planck/keymaps/premek/keymap.c b/keyboards/planck/keymaps/premek/keymap.c
deleted file mode 100644
index 839a53a6fc1..00000000000
--- a/keyboards/planck/keymaps/premek/keymap.c
+++ /dev/null
@@ -1,182 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _ADJUST 16
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                 KC_DEL,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   ,
-  KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                 KC_TAB,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-  KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                 KC_BSPC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-  KC_LGUI, _______, _______, KC_LALT, LOWER,   MT(MOD_LSFT, KC_SPC), KC_ENT,  KC_SPC,  RAISE,   KC_RALT, _______, KC_RGUI
-),
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_LOWER] = LAYOUT_planck_grid(
-  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,   KC_HOME, KC_PGDN, KC_PGUP, KC_END ,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, KC_F12,  KC_PLUS, KC_PIPE, KC_LCBR, KC_RCBR,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-[_RAISE] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-  _______, _______, _______, KC_QUOT, KC_MINS, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-  _______, KC_TILD, KC_GRV,  KC_PLUS, KC_EQL,  KC_PIPE, _______, KC_BSLS, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MS_BTN3
-),
-
-[_PLOVER] = LAYOUT_planck_grid(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(tone_plover);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_plover_gb);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/premek/readme.md b/keyboards/planck/keymaps/premek/readme.md
deleted file mode 100644
index 98ca55be43e..00000000000
--- a/keyboards/planck/keymaps/premek/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Split Layout
-Inspired by TECK
-
-[Layout](http://www.keyboard-layout-editor.com/##@_switchMount=cherry&switchBrand=gateron&switchType=KS-3-Tea&pcb:true%3B&@_c=%23e6e6e6&t=%23757575&a:7&fa@:5%3B%3B&=Esc&_a:4&fa@:5&:0&:0&:0&:0&:0&:0&:0&:0&:5%3B%3B&=%0A%0A!%0A1%0A%0A%0A%0A%0A%0AQ&=%0A%0A%2F@%0A2%0A%0A%0A%0A%0A%0AW&=%0A%0A%23%0A3%0A%0A%0A%0A%0A%0AE&=%0A%0A$%0A4%0A%0A%0A%0A%0A%0AR&=%0A%0A%25%0A5%0A%0A%0A%0A%0A%0AT&_c=%23e3b02d&a:7%3B&=Del&_c=%23e6e6e6&a:4%3B&=%0A%0A%5E%0A6%0A%0A%0A%0A%0A%0AY&=%0A%0A%2F&%0A7%0A%0A%0A%0A%0A%0AU&=%0A%0A*%0A8%0A%0A%0A%0A%0A%0AI&=%0A%0A(%0A9%0A%0A%0A%0A%0A%0AO&=%0A%0A)%0A0%0A%0A%0A%0A%0A%0AP%3B&@_a:7%3B&=Shift&_a:4%3B&=%0A%0A%0AF1%0A%0A%0A%0A%0A%0AA&=%0A%0A%0AF2%0A%0A%0A%0A%0A%0AS&=%0A%0A'%0AF3%0A%0A%0A%0A%0A%0AD&_c=%23e3b02d&n:true%3B&=%0A%0A-%0AF4%0A%0A%0A%0A%0A%0AF&_c=%23e6e6e6%3B&=%0A%0A%0AF5%0A%0A%0A%0A%0A%0AG&_c=%23e3b02d&a:7%3B&=Tab&_c=%23e6e6e6&a:4%3B&=%0A%0A%0AF6%0A%0A%0A%0A%0A%0AH&_c=%23e3b02d&fa@:5&:0&:4&:0&:0&:0&:0&:0&:0&:5%3B&n:true%3B&=%0A%0A%2F&larr%2F%3B%0AHom%0A%0A%0A%0A%0A%0AJ&_c=%23e6e6e6%3B&=%0A%0A%2F&darr%2F%3B%0APgD%0A%0A%0A%0A%0A%0AK&_fa@:5&:0&:5&:0&:0&:0&:0&:0&:0&:5%3B%3B&=%0A%0A%2F&uarr%2F%3B%0APgU%0A%0A%0A%0A%0A%0AL&=%0A%0A%2F&rarr%2F%3B%0AEnd%0A%0A%0A%0A%0A%0A%2F%3B%3B&@_a:7%3B&=Ctrl&_a:4&fa@:5&:0&:0&:0&:0&:0&:0&:0&:0&:5%3B%3B&=%0A%0A~%0AF7%0A%0A%0A%0A%0A%0AZ&=%0A%0A%60%0AF8%0A%0A%0A%0A%0A%0AX&=%0A%0A+%0AF9%0A%0A%0A%0A%0A%0AC&=%0A%0A%2F=%0AF10%0A%0A%0A%0A%0A%0AV&=%0A%0A%7C%0AF11%0A%0A%0A%0A%0A%0AB&_c=%23e3b02d&a:7%3B&=BSp&_c=%23e6e6e6&a:4%3B&=%0A%0A%5C%0AF12%0A%0A%0A%0A%0A%0AN&=%0A%0A%5B%0A%0A%0A%0A%0A%0A%0AM&=%0A%0A%5D%0A%0A%0A%0A%0A%0A%0A,&=%0A%0A%7B%0A%0A%0A%0A%0A%0A%0A.&=%0A%0A%7D%0A%0A%0A%0A%0A%0A%0A%2F%2F%3B&@_a:7%3B&=Alt&=&=&=Super&_c=%23e3b02d%3B&=%2F&dArr%2F%3B&_c=%23e6e6e6%3B&=Shift&_c=%23e3b02d%3B&=%2F&crarr%2F%3B&_c=%23e6e6e6%3B&=spc&_c=%23e3b02d%3B&=%2F&uArr%2F%3B&_c=%23e6e6e6&a:4%3B&=%0A%0AVolUp&=%0A%0AVolDn&_fa@:5&:0&:2%3B%3B&=%0A%0AMdlClick)
diff --git a/keyboards/planck/keymaps/premek/rules.mk b/keyboards/planck/keymaps/premek/rules.mk
deleted file mode 100644
index 10de3bfc035..00000000000
--- a/keyboards/planck/keymaps/premek/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/priyadi/config.h b/keyboards/planck/keymaps/priyadi/config.h
deleted file mode 100644
index d72b6d39083..00000000000
--- a/keyboards/planck/keymaps/priyadi/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define PRIYADI_PLANCK
-
-#define UNICODE_TYPE_DELAY 0
-
-#define LAYOUT_DVORAK
-#define LAYOUT_COLEMAK
-#define LAYOUT_NORMAN
-#define LAYOUT_WORKMAN
-
-#define DOUBLESPACE_LAYER_ENABLE
-    // #define TOLELOT_ENABLE
-
-#ifdef __AVR__
-#define LAYOUT( \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
-    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, \
-    tp1, tp2, tp3 \
-) \
-{ \
-    {k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c}, \
-    {k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-    {k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c}, \
-    {k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c} \
-}
-#elif KEYBOARD_planck_rev6
-#define LAYOUT( \
-    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, \
-    tp1, tp2, tp3 \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k39, k3a, k3b }, \
-    { k06, k07, k08, k09, k0a, k0b }, \
-    { k16, k17, k18, k19, k1a, k1b }, \
-    { k26, k27, k28, k29, k2a, k2b }, \
-    { k36, k37, k38, k33, k34, k35 } \
-}
-#endif
-
-#endif
diff --git a/keyboards/planck/keymaps/priyadi/keymap.c b/keyboards/planck/keymaps/priyadi/keymap.c
deleted file mode 100644
index bb3a2e92c4e..00000000000
--- a/keyboards/planck/keymaps/priyadi/keymap.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../handwired/promethium/keymaps/priyadi/keymap.c"
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/priyadi/readme.md b/keyboards/planck/keymaps/priyadi/readme.md
deleted file mode 100644
index 99bdd9d9b63..00000000000
--- a/keyboards/planck/keymaps/priyadi/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Priyadi's Planck Layout
-
-Features:
-
-- Supports QWERTY, Colemak and Workman layouts.
-- Cursor and nav cluster on home row.
-- Hybrid number row and numpad, located on home row.
-- Number layer supports hexadecimal input.
-- Left and right side modifiers.
-- Emoji layer. An entire layer filled with common emojis.
-- Faux-clickey (poor man's replacement for Cherry blue switches)
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/priyadi/rules.mk b/keyboards/planck/keymaps/priyadi/rules.mk
deleted file mode 100644
index 694d38b3f8b..00000000000
--- a/keyboards/planck/keymaps/priyadi/rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = yes     # Unicode map
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-ifeq ($(strip $(KEYBOARD)), planck/rev4)
-BACKLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
-endif
-
-ifeq ($(strip $(KEYBOARD)), planck/rev6)
-DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
-endif
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/planck/keymaps/ptillemans/config.h b/keyboards/planck/keymaps/ptillemans/config.h
deleted file mode 100644
index c88a9c01497..00000000000
--- a/keyboards/planck/keymaps/ptillemans/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-
-// setup double tapping to lock layers
-#define TAPPING_TERM 175
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/planck/keymaps/ptillemans/keymap.c b/keyboards/planck/keymaps/ptillemans/keymap.c
deleted file mode 100644
index 6d55617f7ff..00000000000
--- a/keyboards/planck/keymaps/ptillemans/keymap.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-#define MY_SHEN MT(MOD_LSFT, KC_ENT)
-#define MY_CTES MT(MOD_LCTL, KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  | PgUp |  Up  |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  | PgDn | Down |   H  |   J  |   K  |   L  |   ;  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  | Home |  End |   N  |   M  |   ,  |   .  |   /  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Raise| Tab  | super| Alt  |  BS  |   Ctrl/Esc |Spc/Alt| Lower|   '  |   \  |Sh/Ent|
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_PGUP,   KC_UP,    KC_Y,    KC_U,   KC_I,     KC_O,    KC_P,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_PGDN, KC_DOWN,    KC_H,    KC_J,   KC_K,     KC_L, KC_SCLN,
-    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_HOME,  KC_END,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,
-    LOWER, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, MY_CTES, MY_CTES,  KC_SPC,   RAISE, KC_QUOT,KC_MINUS, MY_SHEN
-),
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB , KC_QUOT, KC_COMM,  KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L, KC_BSPC,
-    MY_CTES,    KC_A,    KC_O,    KC_E,  KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S, KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,       KC_J,  KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z, MY_SHEN ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,  KC_SPC,  KC_SPC,   RAISE, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Ins  | Home |  Up  | End  | PgUp |      |      |      |  F7  |  F8  |  F9  |  F10 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  | Left | Down |Right | PgDn |      |      |      |  F4  |  F5  |  F6  |  F11 |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Vol+ |      |      |      |      |      |      |  F1  |  F2  |  F3  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Vol- |      |      | Next |             |      |      |PrtScr| Lock | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_INS, KC_HOME,    KC_UP,  KC_END, KC_PGUP, KC_PERC, KC_CIRC, KC_AMPR,   KC_F7,   KC_F8,   KC_F9,  KC_F10,
-    KC_DEL, KC_LEFT,  KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______,   KC_F4,   KC_F5,   KC_F6,  KC_F11,
-    _______, KC_VOLU, _______, _______, _______, _______, _______, KC_TILD,   KC_F1,   KC_F2,   KC_F3,  KC_F12,
-    _______, KC_VOLD, _______, _______, KC_MNXT, _______, _______, _______,  TO(_QWERTY), KC_PSCR, KC_SCRL, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   !  |   @  |  Up  |   _  |   +  |      |      | PgUp |   7  |   8  |   9  |   *  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   #  | Left | Down |Right |   $  |      |      | PgDn |   4  |   5  |   6  |   +
-|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   [  |   ]  |   (  |   )  |   &  |      |      |   `  |   1  |   2  |   3  |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |   .  |   0  |   =  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_EXLM,   KC_AT,   KC_UP, KC_UNDS, KC_PLUS, _______, _______,  KC_PGUP,    KC_7,    KC_8,    KC_9, KC_ASTR,
-    KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT,  KC_DLR, _______, _______,  KC_PGDN,    KC_4,    KC_5,    KC_6, KC_PLUS,
-    KC_MINS,  KC_EQL, KC_LPRN, KC_RPRN, KC_AMPR, _______, _______,   KC_GRV,    KC_1,    KC_2,    KC_3, KC_BSLS,
-    _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY),  KC_DOT,     KC_0,  KC_RBRC
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|      |Qwerty|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  QWERTY, DVORAK,  PLOVER,  _______,
-    BACKLIT, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        register_code(KC_MS_WH_DOWN);
-        unregister_code(KC_MS_WH_DOWN);
-      #else
-        register_code(KC_PGDN);
-        unregister_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        register_code(KC_MS_WH_UP);
-        unregister_code(KC_MS_WH_UP);
-      #else
-        register_code(KC_PGUP);
-        unregister_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/ptillemans/readme.md b/keyboards/planck/keymaps/ptillemans/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/ptillemans/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/ptillemans/rules.mk b/keyboards/planck/keymaps/ptillemans/rules.mk
deleted file mode 100644
index c329d16ff8a..00000000000
--- a/keyboards/planck/keymaps/ptillemans/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC += muse.c
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/planck/keymaps/raffle/config.h b/keyboards/planck/keymaps/raffle/config.h
deleted file mode 100644
index d21e85693a4..00000000000
--- a/keyboards/planck/keymaps/raffle/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/raffle/keymap.c b/keyboards/planck/keymaps/raffle/keymap.c
deleted file mode 100644
index 08059e1d406..00000000000
--- a/keyboards/planck/keymaps/raffle/keymap.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-  _NAV,
-  _DEV
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  BACKLIT,
-  // my macros
-  R_ASGN,
-  R_PIPE,
-  R_CMLN,
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-// my defs
-#define LT_ESC LT(_NAV, KC_ESC) //tap for esc, hold for mouse nav layer
-#define DEV MO(_DEV) // get to dev layer
-#define KC_CAD LALT(LCTL(KC_DEL)) // because awkwardness
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | CTRL |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ESC  | APP  | GUI  | ALT  |Lower |    Space    |Raise | DEV  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    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, KC_ENT ,
-    LT_ESC,  KC_APP,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE, DEV, _______, _______, _______
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      | Home | END  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DEL  |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    _______, 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,  _______,    KC_HOME,    KC_END,  _______, _______,
-    KC_DEL,  _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |Pg Up |Pg Dn |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |      |      |      |      |             |      | Next | Vol- | Vol+ | Play
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______, _______,
-    KC_DEL,  _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Nav Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      | PGUP | UP   | PGDN |      |KC_CAD|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      | HOME | LEFT | DOWN |RIGHT |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      | END  |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NAV] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, _______, KC_CAD,
-    _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, KC_END,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* DEV Layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |R_CMLM|      |      |      |      |      |      |      |KC_CAD|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |R_ASGN|R_PIPE|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_DEV] = LAYOUT_planck_grid(
-    _______, _______, _______, R_CMLN,  _______, _______, _______, _______, _______, _______, _______, KC_CAD,
-    _______, _______, _______, _______, _______, _______, _______, R_ASGN,  R_PIPE,  _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    // my macros
-    case R_ASGN:
-      if (record->event.pressed) {
-	SEND_STRING(" <- ");
-      }
-      return false;
-      break;
-    case R_PIPE:
-      if (record->event.pressed) {
-	SEND_STRING(" %>%\n");
-      }
-      return false;
-      break;
-    case R_CMLN:
-      if (record->event.pressed) {
-	SEND_STRING("################################################################################");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/raffle/readme.md b/keyboards/planck/keymaps/raffle/readme.md
deleted file mode 100644
index 4cfb312b951..00000000000
--- a/keyboards/planck/keymaps/raffle/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Raffle's Planck Layout
-
-- Caps -> LCtrl
-- LCtrol -> Nav Layer
-  + Nav uses pok3r-like nav (IJKL, H/N for home/end, U/P for pgup/pgdn)
-- RArrow -> Dev layer
-  + handy macros for R programming
-  
-Also removes keymaps I don't use (dvorak, etc).
-
-
diff --git a/keyboards/planck/keymaps/raffle/rules.mk b/keyboards/planck/keymaps/raffle/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/raffle/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/rennerom/config.h b/keyboards/planck/keymaps/rennerom/config.h
deleted file mode 100644
index af93b5e2cec..00000000000
--- a/keyboards/planck/keymaps/rennerom/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2022 Max Renner (@rennerom)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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
-
-#define TAPPING_TERM 200
-
-/*
- * 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
-
-// Most tactile encoders have detents every 4 stages
-//#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/rennerom/keymap.c b/keyboards/planck/keymaps/rennerom/keymap.c
deleted file mode 100644
index 67394b8964b..00000000000
--- a/keyboards/planck/keymaps/rennerom/keymap.c
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2022 Max Renner (@rennerom)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER, 
-  _RAISE, 
-  _ADJUST,
-  _FN,
-  _NAV
-};
-
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define ESCNAV LT(_NAV, KC_ESC)
-#define WORDL LALT(KC_LEFT)
-#define WORDR LALT(KC_RGHT)
-#define EOL LGUI(KC_RIGHT)
-#define BOL LGUI(KC_LEFT)
-#define SPOTLT LGUI(KC_SPC)
-#define VBA LSFT(LALT(KC_F11))
-#define UNDO LGUI(KC_Z)
-#define CUT LGUI(KC_X)
-#define COPY LGUI(KC_C)
-#define PSTE LGUI(KC_V)
-#define ALL LGUI(KC_A)
-#define FIND LGUI(KC_F)
-#define SAVE LGUI(KC_S)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |ESCNAV|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |shfent|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  fn  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    ESCNAV,  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, SC_SENT ,
-    FN,      KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* fn
- * ,------------------------------------------------------------------------------------.
- * |      |  f1  |  f2  |  f3  |  f4  |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |  f5  |  f6  |  f7  |  f8  |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |  f9  |  f10 |  f11 |  f12 |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |             |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- */
-
-[_FN] = LAYOUT_planck_grid(
-	_______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  KC_F5,    KC_F6,    KC_F7,    KC_F8,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
-),
-
-/* NAV
- * ,------------------------------------------------------------------------------------.
- * |      |      | WORDL| WORDR|      |      |      |      |Insert|      |      |  Del |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      | Left | Down |  Up  | Right|      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |OpenSpotlight|      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- */
-
-[_NAV] = LAYOUT_planck_grid(
-	_______,  _______,  WORDL,    WORDR,    _______,  _______,  _______,  KC_INS ,  _______,  _______,  _______,  KC_DEL,
-    _______,  ALL,      SAVE,     _______,  FIND,     _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,
-    _______,  UNDO,     CUT,      COPY,     PSTE,     _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  SPOTLT,   SPOTLT,   _______,  _______,  _______,  _______,  _______
-), 
-    
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | ` ~  | 1 !  | 2 @  | 3 #  | 4 $  | 5 %  | 6 ^  | 7 &  | 8 *  | 9 (  | 0 )  | Bksp |
- * ,------------------------------------------------------------------------------------.
- * | Del  |  { [ |  } ] |   (  |   )  |  - _ |   +  |   =  |   *  |   %  |   _  |  \ | |
- * ,------------------------------------------------------------------------------------.
- * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- */
-
-[_LOWER] = LAYOUT_planck_grid(
-		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_DEL,   KC_LBRC,  KC_RBRC,  KC_LPRN,  KC_RPRN,  KC_MINS,  KC_PLUS,  KC_EQL,   KC_ASTR,  KC_PERC,  KC_UNDS,  KC_BSLS,
-    _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
-),
-
-/* Raise
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * | Del  |      |      |      |      |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |Brite-|Brite+| Vol- | Vol+ |
- * ,------------------------------------------------------------------------------------.
- */
-
-[_RAISE] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_DEL,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, VBA,     _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU
-),
-
-/* Adjust (Lower + Raise)
- * ,------------------------------------------------------------------------------------.
- * |      |  f1  |  f2  |  f3  |  f4  |RGBTOG|      |HUE - |HUE + |      |Debug |Reset |
- * ,------------------------------------------------------------------------------------.
- * |      |  f5  |  f6  |  f7  |  f8  |RGBM -|RGBM +|SAT - |SAT + |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |  f9  |  f10 |  f11 |  f12 |RGBsp-|RGBsp+|VIB - |VIB + |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |             |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- */
-
-[_ADJUST] = LAYOUT_planck_grid(
-    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    RGB_TOG,  _______,  RGB_HUD,  RGB_HUI,  _______,  DB_TOGG,  QK_BOOT,
-    _______,  KC_F5,    KC_F6,    KC_F7,    KC_F8,    RGB_RMOD, RGB_MOD,  RGB_SAD,  RGB_SAI,  _______,  _______,  _______,
-    _______,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   RGB_SPD,  RGB_SPI,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
-)
-
-
-};
-
-/* fn
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * ,------------------------------------------------------------------------------------.
- */
-
-//#ifdef AUDIO_ENABLE
-//  float plover_song[][2]     = SONG(PLOVER_SOUND);
-//  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-//#endif
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/planck/keymaps/rennerom/readme.md b/keyboards/planck/keymaps/rennerom/readme.md
deleted file mode 100644
index 81d580bba30..00000000000
--- a/keyboards/planck/keymaps/rennerom/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# A Modified Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/rennerom/rules.mk b/keyboards/planck/keymaps/rennerom/rules.mk
deleted file mode 100644
index acf0896a321..00000000000
--- a/keyboards/planck/keymaps/rennerom/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/rjhilgefort/config.h b/keyboards/planck/keymaps/rjhilgefort/config.h
deleted file mode 100644
index 9020d2b9f88..00000000000
--- a/keyboards/planck/keymaps/rjhilgefort/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/rjhilgefort/keymap.c b/keyboards/planck/keymaps/rjhilgefort/keymap.c
deleted file mode 100644
index 08e9809e907..00000000000
--- a/keyboards/planck/keymaps/rjhilgefort/keymap.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _MAC,
-  _LINUX,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  MAC = SAFE_RANGE,
-  LINUX,
-  BACKLIT,
-};
-
-#define ALT_ESC ALT_T(KC_ESC)
-#define CTL_ESC CTL_T(KC_ESC)
-#define GUI_ESC GUI_T(KC_ESC)
-#define HYPER LGUI(LSFT(KC_LALT))
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_MAC] = LAYOUT_planck_grid(
-// ,-----------------------------------------------------------------------------------------------------------.
-      KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     CTL_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, _______,   RAISE, ALT_ESC, KC_LGUI,  KC_SPC,  KC_SPC,   LOWER,   HYPER, _______, _______, _______
-// ,-----------------------------------------------------------------------------------------------------------.
-),
-
-[_LINUX] = LAYOUT_planck_grid(
-// ,-----------------------------------------------------------------------------------------------------------.
-      KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     ALT_ESC,    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,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, _______,   RAISE, GUI_ESC, KC_LCTL,  KC_SPC,  KC_SPC,   LOWER,   HYPER, _______, _______, _______
-// ,-----------------------------------------------------------------------------------------------------------.
-),
-
-[_LOWER] = LAYOUT_planck_grid(
-// ,-----------------------------------------------------------------------------------------------------------.
-     _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD, KC_PIPE,  KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, _______,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN,  KC_GRV, KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-// ,-----------------------------------------------------------------------------------------------------------.
-),
-
-[_RAISE] = LAYOUT_planck_grid(
-// ,-----------------------------------------------------------------------------------------------------------.
-     _______, _______, KC_BRID, KC_VOLU, KC_BRIU, _______, _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, _______, _______, KC_VOLD, _______, _______, _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, _______, _______, _______, _______, _______, _______, _______,    KC_0,  KC_DOT, _______, _______
-// ,-----------------------------------------------------------------------------------------------------------.
-),
-
-[_ADJUST] = LAYOUT_planck_grid(
-// ,-----------------------------------------------------------------------------------------------------------.
-     _______,     MAC,   LINUX, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______, _______,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-// ,-----------------------------------------------------------------------------------------------------------.
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case MAC:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_MAC);
-      }
-      return false;
-      break;
-    case LINUX:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_LINUX);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/rjhilgefort/readme.md b/keyboards/planck/keymaps/rjhilgefort/readme.md
deleted file mode 100644
index 08c07317855..00000000000
--- a/keyboards/planck/keymaps/rjhilgefort/readme.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# [🐦 @rjhilgefort](https://twitter.com/rjhilgefort) Planck Layout
-
-Fairly straight forward Planck layout, but arranges the symbols more toward coding and features a Mac and Linux base layer instead of multiple Alpha layouts.
-
-![Imgur](https://i.imgur.com/elygxAb.jpg)
-
-## Features
-
-Here's some highlights/features of the layout.
-
--   Ergonomic symbols layer.
--   Media and Numpad layer.
--   Supports Mac and Linux as 1st class citizens giving each a dedicated base layer and a media layer for each that matches media keys for each OS. The Linux default layer focuses on `Ctrl` instead of `Super` and vice versa for Mac. (When you set Linux as your base layer, the Linux media layer is what you shift into. Same for the Mac layer when that's the base)
-
-## Layers
-
-#### Base (Mac)
-
-```
-,-----------------------------------------------------------------------------------------------------------.
-   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  CTL_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, _______,   RAISE, ALT_ESC, KC_LGUI,  KC_SPC,  KC_SPC,   LOWER,   HYPER, _______, _______, _______
-,-----------------------------------------------------------------------------------------------------------.
-```
-
-#### Base (Linux)
-
-```
-,-----------------------------------------------------------------------------------------------------------.
-   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  ALT_ESC,    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,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, _______,   RAISE, GUI_ESC, KC_LCTL,  KC_SPC,  KC_SPC,   LOWER,   HYPER, _______, _______, _______
-,-----------------------------------------------------------------------------------------------------------.
-```
-
-#### Lower: Symbol Layer
-
-```
-,-----------------------------------------------------------------------------------------------------------.
-  _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD, KC_PIPE,  KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, _______,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN,  KC_GRV, KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-,-----------------------------------------------------------------------------------------------------------.
-```
-
-#### Raise: Media & Numbers
-
-```
-,-----------------------------------------------------------------------------------------------------------.
-  _______, _______, KC_BRID, KC_VOLU, KC_BRIU, _______, _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, _______, _______, KC_VOLD, _______, _______, _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_0,  KC_DOT, _______, _______
-,-----------------------------------------------------------------------------------------------------------.
-```
-
-#### Adjust
-
-```
-,-----------------------------------------------------------------------------------------------------------.
-  _______,     MAC,   LINUX, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______, _______,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-,-----------------------------------------------------------------------------------------------------------.
-)
-```
-
-## Building And Flashing
-
-#### CLI
-
-```
-sudo make planck/rev6:rjhilgefort-dualos:flash
-```
-
-#### Docker
-
-```
-util/docker_build.sh planck/rev6:rjhilgefort-dualos:flash
-```
diff --git a/keyboards/planck/keymaps/rjhilgefort/rules.mk b/keyboards/planck/keymaps/rjhilgefort/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/rjhilgefort/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/rodhaene/config.h b/keyboards/planck/keymaps/rodhaene/config.h
deleted file mode 100644
index a63f3c2f23e..00000000000
--- a/keyboards/planck/keymaps/rodhaene/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-
-#endif
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/rodhaene/keymap.c b/keyboards/planck/keymaps/rodhaene/keymap.c
deleted file mode 100644
index 2cf441bf167..00000000000
--- a/keyboards/planck/keymaps/rodhaene/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* Copyright 2018 Robert Dhaene
- *
- * 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
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _NUMPAD,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  NUMPAD,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_NUMPAD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Delete|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |   "  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      | Alt  | GUI  |Lower |Enter |Space |Raise | Left |  Up  | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_DEL,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT ,
-  KC_LCTL, _______, KC_LALT, KC_LGUI, LOWER,   KC_ENT,  KC_SPC,  RAISE,   KC_LEFT, KC_UP, KC_DOWN,   KC_RGHT
-),
-
-/* Number Pad
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |  7   |  8   |  9   | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |  4   |  5   |  6   |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |  1   |  2   |  3   |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |      |      |      |      |      |  0   |  .   |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_7   , KC_8   , KC_9   , KC_BSPC ,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_4   , KC_5   , KC_6   , KC_ENT  ,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_1   , KC_2   , KC_3   , _______,
-  EXT_NUMPAD, _______, _______, _______, _______, _______, _______, _______, KC_0   , KC_DOT , _______, _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Numpad|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Brite |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NUMPAD,  _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        PORTE &= ~(1<<6);
-      } else {
-        unregister_code(KC_RSFT);
-        PORTE |= (1<<6);
-      }
-      return false;
-      break;
-    case NUMPAD:
-      if(record->event.pressed) {
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_NUMPAD);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_NUMPAD:
-      if(record->event.pressed) {
-        layer_off(_NUMPAD);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/rodhaene/readme.md b/keyboards/planck/keymaps/rodhaene/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/planck/keymaps/rodhaene/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/rodhaene/rules.mk b/keyboards/planck/keymaps/rodhaene/rules.mk
deleted file mode 100644
index 4b9265909ff..00000000000
--- a/keyboards/planck/keymaps/rodhaene/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight.
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/roguepullrequest/config.h b/keyboards/planck/keymaps/roguepullrequest/config.h
deleted file mode 100644
index 13d3a6370f7..00000000000
--- a/keyboards/planck/keymaps/roguepullrequest/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-
-
-
-#ifdef AUDIO_ENABLE
-	#define STARTUP_SONG SONG(RICK_ROLL)
-#endif
diff --git a/keyboards/planck/keymaps/roguepullrequest/keymap.c b/keyboards/planck/keymaps/roguepullrequest/keymap.c
deleted file mode 100644
index 31cce52a5f5..00000000000
--- a/keyboards/planck/keymaps/roguepullrequest/keymap.c
+++ /dev/null
@@ -1,257 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef AUDIO_ENABLE
-	float mushroom[][2] = SONG(MARIO_MUSHROOM);
-#endif
-
-
-extern keymap_config_t keymap_config;
-
-// Complex Tapdance hoopla
-typedef struct {
-	bool is_press_action;
-	int state;
-} tap;
-
-enum {
-	SINGLE_TAP = 1,
-	SINGLE_HOLD = 2,
-	DOUBLE_TAP = 3,
-	DOUBLE_HOLD = 4,
-	TRIPLE_TAP = 5,
-	TRIPLE_HOLD = 6,
-};
-
-// Tap dance enums
-enum {
-	X_AT_FUN = 0,
-	RSHIFT,
-	LSHIFT,
-	TD_S,
-	SLASH
-};
-
-int cur_dance (tap_dance_state_t *state);
-
-void x_finished (tap_dance_state_t *state, void *user_data);
-void x_reset (tap_dance_state_t *state, void *user_data);
-void lshift_finished (tap_dance_state_t *state, void *user_data);
-void lshift_reset(tap_dance_state_t *state, void *user_data);
-
-
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-
-// Modified Programmer Dvorak enums
-
-enum planck_layers {
-	_PDVORAK,
-	_UPPER,
-	_LOWER,
-	_FUNCTION,
-};
-
-enum custom_keycodes {
-	PDVK = SAFE_RANGE,
-	KC_LAST,
-	ALT_TAB
-};
-
-// For getting the last arg in shell line (SUPER THANKS to Drashna over on Discord)
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  static uint16_t macro_timer;
-
-  switch (keycode) {
-    case ALT_TAB:
-      if (record->event.pressed) {
-        if (!is_alt_tab_active) {
-          is_alt_tab_active = true;
-          register_code(KC_LALT);
-        }
-        alt_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-  }
-
-  switch (keycode){
-    case KC_LAST:
-      if(record->event.pressed){
-        macro_timer = timer_read();
-        register_mods(MOD_BIT(KC_LCTL));
-      } else {
-        unregister_mods(MOD_BIT(KC_LCTL));
-        if (timer_elapsed(macro_timer) < 150) {
-          SEND_STRING("!$");
-        }
-      }
-    return false;
-  }
-  return true;
-}
-
-void matrix_scan_user(void) {
-  if (is_alt_tab_active) {
-    if (timer_elapsed(alt_tab_timer) > 1000) {
-      unregister_code16(KC_LALT);
-      is_alt_tab_active = false;
-    }
-  }
-}
-
-#define PDVORAK MO(_PDVORAK)
-#define LOWER MO(_LOWER)
-#define UPPER MO(_UPPER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-	/* Programmer Dvorak */
-	[_PDVORAK] = LAYOUT_planck_grid(
-		  QK_GESC, KC_SCLN, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
-   		KC_LAST, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, TD(TD_S), TD(SLASH),
-   		TD(LSHIFT), KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, TD(RSHIFT),
-    	TD(X_AT_FUN), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, ALT_TAB, KC_SPACE, KC_ENTER, MT(MOD_LCTL | MOD_LSFT, KC_LGUI), KC_PGUP, KC_PGDN, LT(_LOWER, KC_PLUS)
-   	),
-
-	[_UPPER] = LAYOUT_planck_grid(
-		KC_GRAVE, KC_AMPR, KC_PERC, KC_NO, KC_NO, KC_EQL, KC_ASTR, KC_NO, KC_NO, KC_EXLM, KC_HASH, KC_TRNS,
-		KC_PLUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSLS,
-		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
-	),
-
-	[_LOWER] = LAYOUT_planck_grid(
-		KC_DLR, KC_7, KC_5, KC_3, KC_1, KC_9, KC_0, KC_2, KC_4, KC_6, KC_8, KC_TRNS,
-		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, CK_DOWN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
-	),
-
-	[_FUNCTION] = LAYOUT_planck_grid(
-		KC_F11, KC_F7, KC_F5, KC_F3, KC_F1, KC_F9, KC_F12, KC_F2, KC_F4, KC_F6, KC_F8, QK_BOOT,
-		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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
-	),
-};
-
-
-// Super crazy tap dancing stuff - see quad dance in feature_tap_dance.md
-
-int cur_dance (tap_dance_state_t *state) {
-	if (state->count == 1) {
-		if (state->interrupted || !state->pressed) return SINGLE_TAP;
-		// key not interrupted, but still held sends 'HOLD'
-		else return SINGLE_HOLD;
-	}
-	else if (state->count == 2) {
-		if (state->interrupted || !state->pressed) return DOUBLE_TAP;
-		else return DOUBLE_HOLD;
-	}
-	else if (state->count == 3) {
-		if (state->interrupted || !state->pressed)return TRIPLE_TAP;
-		else return TRIPLE_HOLD;
-	}
-	else return 8; // magic number that i dont believe works.
-}
-
-// instance of tap for the 'X' dance.
-static tap xtap_state = {
-	.is_press_action = true,
-	.state = 0
-};
-
-// registering keypresses
-void x_finished (tap_dance_state_t *state, void *user_data) {
-	xtap_state.state = cur_dance(state);
-	switch (xtap_state.state) {
-		case SINGLE_TAP: register_code16(KC_AT); break;
-		case SINGLE_HOLD: set_oneshot_layer(_UPPER, ONESHOT_START); break;
-		case DOUBLE_TAP: set_oneshot_layer(_FUNCTION, ONESHOT_START); break;
-		case DOUBLE_HOLD: reset_keyboard(); break;
-	}
-}
-
-void lshift_finished (tap_dance_state_t *state, void *user_data) {
-	xtap_state.state = cur_dance(state);
-	switch (xtap_state.state) {
-		case SINGLE_TAP: register_code16(KC_LSFT); register_code16(KC_9); break;
-		case SINGLE_HOLD: register_code16(KC_LSFT); break;
-		case DOUBLE_TAP: register_code16(KC_LBRC); break;
-		case TRIPLE_TAP: register_code16(KC_LSFT); register_code16(KC_LBRC); break;
-	}
-}
-void s_finished (tap_dance_state_t *state, void *user_data) {
-	xtap_state.state = cur_dance(state);
-	switch (xtap_state.state) {
-		case SINGLE_TAP: register_code16(KC_S); break;
-		case DOUBLE_TAP: register_code16(KC_MINUS); break;
-		case TRIPLE_TAP: register_code16(KC_LSFT); register_code16(KC_MINUS); break;
-	}
-}
-
-void rshift_finished (tap_dance_state_t *state, void *user_data) {
-	xtap_state.state = cur_dance(state);
-	switch (xtap_state.state) {
-		case SINGLE_TAP: register_code16(KC_LSFT); register_code16(KC_0); break;
-		case SINGLE_HOLD: register_code16(KC_RSFT); break;
-		case DOUBLE_TAP: register_code16(KC_RBRC); break;
-		case TRIPLE_TAP: register_code16(KC_LSFT); register_code16(KC_RBRC); break;
-	}
-}
-
-// forgetting keypresses
-
-void x_reset (tap_dance_state_t *state, void *user_data) {
-	switch (xtap_state.state) {
-		case SINGLE_TAP: unregister_code16(KC_AT); break;
-		case SINGLE_HOLD: clear_oneshot_layer_state(ONESHOT_PRESSED); break;
-		case DOUBLE_TAP: clear_oneshot_layer_state(ONESHOT_PRESSED); break;
-		case DOUBLE_HOLD: reset_keyboard(); break;
-	}
-	xtap_state.state = 0;
-}
-void lshift_reset (tap_dance_state_t *state, void *user_data) {
-	switch (xtap_state.state) {
-		case SINGLE_TAP: unregister_code16(KC_9); unregister_code16(KC_LSFT); break;
-		case SINGLE_HOLD: unregister_code16(KC_LSFT); break;
-		case DOUBLE_TAP: unregister_code16(KC_LBRC); break;
-		case TRIPLE_TAP: unregister_code16(KC_LBRC); unregister_code16(KC_LSFT); break;
-	}
-	xtap_state.state = 0;
-}
-
-void rshift_reset (tap_dance_state_t *state, void *user_data) {
-	switch (xtap_state.state) {
-		case SINGLE_TAP: unregister_code16(KC_0); unregister_code16(KC_LSFT); break;
-		case SINGLE_HOLD: unregister_code16(KC_RSFT); break;
-		case DOUBLE_TAP: unregister_code16(KC_RBRC); break;
-		case TRIPLE_TAP: unregister_code16(KC_RBRC); unregister_code16(KC_LSFT); break;
-	}
-	xtap_state.state = 0;
-}
-void s_reset (tap_dance_state_t *state, void *user_data) {
-	switch (xtap_state.state) {
-		case SINGLE_TAP: unregister_code16(KC_S); break;
-		case DOUBLE_TAP: unregister_code16(KC_MINUS); break;
-		case TRIPLE_TAP: unregister_code16(KC_MINUS); unregister_code16(KC_LSFT);  break;
-	}
-	xtap_state.state = 0;
-}
-tap_dance_action_t tap_dance_actions[] = {
-	[X_AT_FUN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset),
-	[LSHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lshift_finished, lshift_reset),
-	[RSHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rshift_finished, rshift_reset),
-	[TD_S] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, s_finished, s_reset),
-	[SLASH] = ACTION_TAP_DANCE_DOUBLE(KC_SLASH, KC_BSLS),
-
-};
-
-bool shutdown_user(bool jump_to_bootloader) {
-    clear_keyboard();
-    return true;
-}
diff --git a/keyboards/planck/keymaps/roguepullrequest/readme.md b/keyboards/planck/keymaps/roguepullrequest/readme.md
deleted file mode 100644
index 687a65fc932..00000000000
--- a/keyboards/planck/keymaps/roguepullrequest/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Programmer Dvorak for the Planck (Light)
-
-
-|          |         |       |     |      |       |       |      |      |      |      |      |
-|----------|---------|-------|-----|------|-------|-------|------|------|------|------|------|
-| GRAVE_ESC | ; [u]; [l]7 | , [u]% [l]5 | . [l]3 | p [l]1 | y [u]= [l]9 | f [u]* [l]0 | g [l]2 | c [l]4 | r [u]! [l]6 | l [u]# [l]8 | BKSP |
-| LCTRL [TD]!$ | a | o | e | u | i | d | h | t | n | s [TD]- _ | / [TD]\ |
-| LSHFT [TD]( [ { | ' | q | j | k | x | b | m | w | v | z | LSHFT [TD]) ] } |
-| @ [TD]UPPER FUN RESET | LEFT | DOWN | UP | RIGHT | ALT_TAB | SPACE | ENTER | LGUI | PGUP | PGDOWN | = [TD]LOWER |
-
-# Layout notes
--  [u] = UPPER symbol
--  [l] = LOWER symbol
--  [TD] = Tap Dances
--  ALT_TAB = cycle through windows as long as you keep tapping it keeps alt tabbing
--  LAST = "!$" = is useful for using the last parm in bash/zsh 
--  More to come
-
-
-# Dvorak base Layer
diff --git a/keyboards/planck/keymaps/roguepullrequest/rules.mk b/keyboards/planck/keymaps/roguepullrequest/rules.mk
deleted file mode 100644
index 5eb053e886a..00000000000
--- a/keyboards/planck/keymaps/roguepullrequest/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_ENABLE = yes
-COMMAND_ENABLE = no
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h
deleted file mode 100644
index 3d2d3f38a63..00000000000
--- a/keyboards/planck/keymaps/rootiest/config.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Copyright 2021 Chris Laprade
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*
- * USB/POWER OPTIONS
- */
-// #define USB_MAX_POWER_CONSUMPTION 500
-#define USB_SUSPEND_WAKEUP_DELAY 200
-#define USB_POLLING_INTERVAL_MS 1
-
-/*
- * MUSIC/AUDIO options
- */
-#ifdef AUDIO_ENABLE
-#    define AUDIO_CLICKY
-#    define MUSIC_MAP
-#    define AUDIO_VOICES
-#    define AUDIO_VOICE_DEFAULT something
-#    define AUDIO_DAC_SAMPLE_MAX 2732U
-
-#    define DEFAULT_LAYER_SONGS \
-        { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
-
-/* Plays during keyboard startup */
-#    define STARTUP_SONG SONG(NO_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
-
-/*
- * ENCODER options
- */
-#define ENCODER_DIRECTION_FLIP
-#define ENCODER_RESOLUTION 4  // Define number of stages between detents on encoders
-#define ENCODERS_PAD_A \
-    { B12 }
-#define ENCODERS_PAD_B \
-    { B13 }
-
-/*
- * RGB options
- */
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_SLEEP // Allows rgb to sleep when the host/keyboard does
-#    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 RGBLIGHT_LAYERS                  // Enable indicating layers using layered rgb assignments
-#    define RGBLIGHT_LAYER_BLINK             // Allows rgb layers to be blinked (activate for a set amount of time)
-#    define RGBLIGHT_MAX_LAYERS 32           // Overides the default (8) max number of rgb layers
-#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Allows rgb layers to work even when rgb is toggled off
-#endif
-
-/*
- * UNICODE options
- */
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS  // Define the methods used for in/outputting unicode
-
-/*
- * TAP-DANCE options
- */
-#define TAPPING_TERM_PER_KEY // Control Tap-Dance time individually by key
-#define TAPPING_TERM 250     // Default time allowed before resetting a Tap-Dance combo
-#define ONESHOT_TAP_TOGGLE 5 /* Tapping this number of times holds the key until tapped once again. */
-#define ONESHOT_TIMEOUT 5000 /* Time (in ms) before the one shot key is released */
-#define TAPPING_TOGGLE 3
-
-/*
- * LEADER-KEY options
- */     // Used for on-board chording
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 500
-
-/*
- * COMBO-KEY options
- */
-#define COMBO_TERM 300
-/*
- * MACRO per-key options
- */
-#define RETRO_TAPPING_PER_KEY             // Control Retro-Tap individually by key
-#define QUICK_TAP_TERM_PER_KEY            // Control Quick-Tap individually by key
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY   // Control Hold-on-Other-Key-Press individually by key
-#define PERMISSIVE_HOLD_PER_KEY           // Control Permissive-Hold individually by key
-
-#define MK_KINETIC_SPEED  // Use kinetic acceleration for mouse-keys
-
-// Fall-back defines to prevent compile errors if user_song_list is missing
-#ifndef ZELDA_PUZZLE2
-#    define ZELDA_PUZZLE2 Q__NOTE(_G5)
-#endif
-#ifndef SONIC_RING2
-#    define SONIC_RING2 E__NOTE(_E6)
-#endif
-#ifndef ZELDA_CHEST2
-#    define ZELDA_CHEST2 Q__NOTE(_G5)
-#endif
-#ifndef COIN_SOUND2
-#    define COIN_SOUND2 E__NOTE(_A5)
-#endif
-#ifndef ONE_UP_SOUND2
-#    define ONE_UP_SOUND2 Q__NOTE(_E6)
-#endif
-#ifndef IMPERIAL_MARCH
-#    define IMPERIAL_MARCH HD_NOTE(_A4)
-#endif
-#ifndef MARIO_GAMEOVER
-#    define MARIO_GAMEOVER HD_NOTE(_C5)
-#endif
-#ifndef LEAD_START_SOUND
-#    define LEAD_START_SOUND E__NOTE(_C5)
-#endif
-#ifndef LEAD_SUCCESS_SOUND
-#    define LEAD_SUCCESS_SOUND E__NOTE(_A5), HD_NOTE(_E6),
-#endif
-#ifndef LEAD_FAIL_SOUND
-#    define LEAD_FAIL_SOUND E__NOTE(_A5), HD_NOTE(_E4),
-#endif
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
deleted file mode 100644
index a8ff2dd8d92..00000000000
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ /dev/null
@@ -1,1931 +0,0 @@
-/* Copyright 2021 Chris Laprade
- *
- * 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 "raw_hid.h"
-#include "print.h"
-#include "muse.h"
-
-/*
- * Define keyboard name to be used by UI.
- * This allows for using a different name
- * than the one defined by QMK for your board.
- */
-#define KEEB_MODEL_NAME "The Rootiest BoogieBoard"
-
-// Give names to the layers so they are easier to reference
-enum custom_layers {
-    _BASE,
-    _QWERTY = _BASE,
-    _COLEMAK,
-    _DVORAK,
-    _SYMBLS,
-    _RAISE = _SYMBLS,
-    _NUMBRS,
-    _LOWER = _NUMBRS,
-    _PLOVER,
-    _FEATURS,
-    _ADJUST = _FEATURS,
-    _NUMPD,
-    _TABULA,
-    _MOUSY,
-};
-
-#define LOWER MO(_NUMBRS)
-#define RAISE MO(_SYMBLS)
-
-// unicode hexes
-#define UC_DEG UC(0x00B0)   // °
-#define UC_DEGF UC(0x2109)  // ℉
-
-// Time (ms) to wait between frames for the wake rgb animation
-#define WAKE_ANIMATION_TIMER_FREQUENCY 50
-
-// Is a display connected
-// #define USING_OLED_DISPLAY false
-
-// wait DELAY ms before unregistering media keys
-#define TAP_CODE_DELAY 10
-
-// Modifier remover
-#define WITHOUT_MODS(...)                      \
-    do {                                       \
-        const uint8_t _real_mods = get_mods(); \
-        clear_mods();                          \
-        {__VA_ARGS__} set_mods(_real_mods);    \
-    } while (0)
-
-// A whole boatload of audio "songs" defined for use by the keyboard
-#ifdef AUDIO_ENABLE
-float planck_song[][2]    = SONG(PLANCK_SOUND);
-float hello_song[][2]     = SONG(ONE_UP_SOUND2);
-float bye_song[][2]       = SONG(GOODBYE_SOUND);
-float num_song[][2]       = SONG(DVORAK_SOUND);
-float qwerty_song[][2]    = SONG(QWERTY_SOUND);
-float colemak_song[][2]   = SONG(COLEMAK_SOUND);
-float dvorak_song[][2]    = SONG(DVORAK_SOUND);
-float funk_song[][2]      = SONG(COLEMAK_SOUND);
-float workman_song[][2]   = SONG(WORKMAN_SOUND);
-float term_song[][2]      = SONG(TERMINAL_SOUND);
-float lover_song[][2]     = SONG(PLOVER_SOUND);
-float ode_song[][2]       = SONG(ODE_TO_JOY);
-float rock_song[][2]      = SONG(ROCK_A_BYE_BABY);
-float clue_song[][2]      = SONG(CLUEBOARD_SOUND);
-float camp_song[][2]      = SONG(CAMPANELLA);
-float imp_march_song[][2] = SONG(IMPERIAL_MARCH);
-float gameover_song[][2]  = SONG(MARIO_GAMEOVER);
-float puzzle_song[][2]    = SONG(ZELDA_PUZZLE2);
-float caps_on[][2]        = SONG(CAPS_LOCK_ON_SOUND);
-float caps_off[][2]       = SONG(CAPS_LOCK_OFF_SOUND);
-float slctl_on[][2]       = SONG(SCROLL_LOCK_ON_SOUND);
-float slctl_off[][2]      = SONG(SCROLL_LOCK_OFF_SOUND);
-float slalt_on[][2]       = SONG(NUM_LOCK_ON_SOUND);
-float slalt_off[][2]      = SONG(NUM_LOCK_OFF_SOUND);
-float leader_started[][2] = SONG(LEAD_START_SOUND);
-float leader_succeed[][2] = SONG(LEAD_SUCCESS_SOUND);
-float leader_fail[][2]    = SONG(LEAD_FAIL_SOUND);
-float plover_song[][2]    = SONG(PLOVER_SOUND);
-float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-// Declare stored memory config
-typedef union {
-    uint32_t raw;
-    struct {
-        bool    do_wakeup_animation : 1;
-        uint8_t rgbcon_tracker : 8;
-        bool    do_wakeup_audio : 1;
-    };
-} user_config_t;
-
-user_config_t user_config;
-
-// Initialize variable holding the binary
-// representation of active modifiers.
-uint8_t mod_state = 0;
-
-// Declare custom keycodes
-enum custom_keycodes {
-    MO_BASE = SAFE_RANGE,
-    MO_SYMBLS,
-    MO_NUMBRS,
-    MO_FEATURS,
-    QWERTY,
-    COLEMAK,
-    DVORAK,
-    PLOVER,
-    BACKLIT,
-    MUSIC_ON,
-    MUSIC_OFF,
-    EXT_PLV,
-    MY_RGBCON,
-    MY_DEGREES,
-    ALT_TAB,
-    PRINT_WPM_KEY,
-    IRONY,
-    WAKE_ANI_TOG,
-    WAKE_AUD_TOG,
-    DO_RESET,
-    KC_PRVWD,
-    KC_NXTWD,
-    KC_LSTRT,
-    KC_LEND,
-    KC_DLINE,
-    KC_REDO,
-    KC_SAVE,
-    KC_SLCTALL,
-    KC_ALTF4,
-    KC_KILL,
-    KC_LCUT,
-    KC_LCOPY,
-    KC_NXTAB,
-    KC_PRVTAB,
-};
-
-// Declare unicode map array
-enum unicode_names { BANG, SNEK };
-const uint32_t unicode_map[] PROGMEM = {
-    //[UCD_BANG]  = 0x203D,   // ‽
-    //[UCD_IRONY] = 0x2E2E,   // ⸮
-    [SNEK] = 0x1F40D,  // 🐍
-};
-
-enum combo_events { ZC_COPY, XV_PASTE };
-
-const uint16_t PROGMEM copy_combo[]  = {KC_Z, KC_C, COMBO_END};
-const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END};
-
-combo_t key_combos[] = {
-    [ZC_COPY]  = COMBO_ACTION(copy_combo),
-    [XV_PASTE] = COMBO_ACTION(paste_combo),
-};
-
-// Tap Dance key declarations
-enum {
-    TD_DEG_DEGF,
-    TD_SMILEY,
-    TD_LSHFT_CAPS,
-    TD_LCTL_STICKY,
-    TD_LALT_STICKY,
-    TD_LOWER,
-    TD_RAISE,
-};
-
-// Declare available Tap-Dance states
-typedef enum {
-    TD_NONE,
-    TD_SINGLE_TAP,
-    TD_DOUBLE_TAP,
-    TD_TRIPLE_TAP,
-    TD_DOUBLE_SINGLE_TAP,
-    TD_SINGLE_HOLD,
-    TD_DOUBLE_HOLD,
-    TD_TRIPLE_HOLD,
-    TD_UNKNOWN,
-} td_state_t;
-
-// Tap-Dance struct
-typedef struct {
-    bool       is_press_action;
-    td_state_t state;
-} td_tap_t;
-
-// Whether or not to do the wake animation+sound
-bool do_wake_animation;
-
-// Variable to keep track of the rgb mode assigned by the RGB_CON key
-static uint8_t rgbcon_tracker = 0;
-
-// Used by the on-board WPM tracker
-char wpm_str[12];
-
-// Variables used for the alt-tab key
-bool     is_alt_tab_active = false;
-uint16_t alt_tab_timer     = 0;
-
-// Variables used by the Irony key
-#define IRONY_HOLD_DELAY 500
-uint16_t irony_pressed_time;
-bool     irony_active  = false;
-bool     irony_shifted = false;
-char     irony_str[4]  = "⸮";
-char     bang_str[4]   = "‽";
-
-// Variables used for the rgb wakeup animation
-static uint16_t wake_rgb_timer;
-static uint8_t  wake_rgb_count = 0;
-bool            waking_up      = false;
-bool            do_wake_audio  = false;
-
-// Muse variables
-bool     muse_mode      = false;
-bool     musical_mode   = false;
-uint8_t  last_muse_note = 0;
-uint16_t muse_counter   = 0;
-uint8_t  muse_offset    = 70;
-uint16_t muse_tempo     = 50;
-
-// Used by Leader key chords
-bool did_leader_succeed;
-
-// Tap-Dance stuffs, initializing functions that are coded further below
-td_state_t cur_dance(tap_dance_state_t* state);
-void       sml_finished(tap_dance_state_t* state, void* user_data);
-void       sml_reset(tap_dance_state_t* state, void* user_data);
-void       scap_finished(tap_dance_state_t* state, void* user_data);
-void       scap_reset(tap_dance_state_t* state, void* user_data);
-void       slctl_finished(tap_dance_state_t* state, void* user_data);
-void       slctl_reset(tap_dance_state_t* state, void* user_data);
-void       slalt_finished(tap_dance_state_t* state, void* user_data);
-void       slalt_reset(tap_dance_state_t* state, void* user_data);
-bool       lctl_sticky = false;
-bool       lalt_sticky = false;
-
-// This function is called when lock indicators (caps-lock led) are changed/toggled/updated
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(10, led_state.caps_lock);
-#ifdef AUDIO_ENABLE
-    static uint8_t caps_state = 0;
-    if (caps_state != led_state.caps_lock) {
-        // When the caps-lock led state changes play sounds
-        led_state.caps_lock ? PLAY_SONG(caps_on) : PLAY_SONG(caps_off);
-        caps_state = led_state.caps_lock;
-    }
-#endif
-    return true;
-}
-
-// Define key layout/layers
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                             // Define all the layers
-    [_BASE] = LAYOUT_planck_mit(                                                                           //
-        QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,                      //
-        LT(_TABULA, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,       //
-        TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_SENT,    //
-        TD(TD_LCTL_STICKY), QK_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-    /*
-    Base Layer [0]
-     * ,-----------------------------------------------------------------------------------.
-     * |Gr/ESC|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |BckSpc|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |Tabula|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |SH/CAP|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LCtrl|Leader|  OS  |  Alt |Symbol|    Space    |Number| Left | Dwn  |  Up  | Right|
-     * `-----------------------------------------------------------------------------------'
-    */
-
-    [_COLEMAK] = LAYOUT_planck_mit(                                                                        //
-        QK_GESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,                   //
-        LT(_TABULA, KC_TAB), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,          //
-        TD(TD_LSHFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_SENT,    //
-        TD(TD_LCTL_STICKY), QK_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-    /*
-    Colemak Layer [1]
-     * ,-----------------------------------------------------------------------------------.
-     * |Gr/ESC|   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |Tabula|   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |SH/CAP|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LCtrl|Leader|  OS  |  Alt |Symbol|    Space    |Number| Left | Dwn  |  Up  | Right|
-     * `-----------------------------------------------------------------------------------'
-    */
-
-    [_DVORAK] = LAYOUT_planck_mit(                                                                    //
-        QK_GESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,         //
-        LT(_TABULA, KC_TAB), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_TRNS, KC_S, KC_SLSH,  //
-        TD(TD_LSHFT_CAPS), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SC_SENT,    //
-        TD(TD_LCTL_STICKY), QK_LEAD, KC_LGUI, TD(TD_LALT_STICKY), MO(_SYMBLS), KC_SPC, MO(_NUMBRS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-    /* Dvorak Layer [2]
-     * ,-----------------------------------------------------------------------------------.
-     * |Gr/ESC|   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |Tabula|   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |SH/CAP|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LCtrl|Leader|  OS  |  Alt |Symbol|    Space    |Number| Left | Dwn  |  Up  | Right|
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_SYMBLS] = LAYOUT_planck_mit(                                                                                     //
-        KC_MPLY, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,       //
-        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_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, LSFT(KC_LCTL), LSFT(KC_LCTL), KC_HOME, KC_END, KC_TRNS,  //
-        TG(_NUMPD), KC_TRNS, KC_TRNS, KC_TRNS, TO(_BASE), KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
-    /*
-    Symbols Layer [3]
-    * ,-----------------------------------------------------------------------------------.
-    * | Play |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |BckSpc|
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |Delete|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |   |  |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Shift|  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |LShLCt|LShLCt| Home |  End |------|
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | TG(7)|------|------|------| Base |    -----    | MO(4)| Next | Vol- | Vol+ | Play |
-    * `-----------------------------------------------------------------------------------'
-    */
-
-    [_NUMBRS] = LAYOUT_planck_mit(                                                                          //
-        KC_MPLY, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,                       //
-        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_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, KC_TRNS,  //
-        TG(_NUMPD), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(_BASE), KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
-
-    /*
-    Numbers Layer [4]
-    * ,-----------------------------------------------------------------------------------.
-    * | Play |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |BckSpc|
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |Delete|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |   \  |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Shift|  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   #  |   /  | PgUp | PgDwn|------|
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | TG(7)|------|------|------| MO(3)|    -----    | Base | Next | Vol- | Vol+ | Play |
-    * `-----------------------------------------------------------------------------------'
-    */
-
-    [_PLOVER] = LAYOUT_planck_mit(                                                        //
-        KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1,           //
-        XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,     //
-        XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,  //
-        EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX),
-    /* Plover Layer [5]
-     * ,-----------------------------------------------------------------------------------.
-     * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-
-    [_FEATURS] = LAYOUT_planck_mit(                                                                                                         //
-        LCTL(LALT(KC_DEL)), DO_RESET, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, TD(TD_DEG_DEGF), TD(TD_SMILEY), KC_DEL,  //
-        RGB_VAI, RGB_VAD, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, DF(_BASE), DF(_COLEMAK), DF(_DVORAK), TO(_PLOVER), MY_RGBCON,            //
-        KC_TRNS, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, KC_TRNS, KC_TRNS, CK_ON, CK_OFF, KC_ENTER,                                  //
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(_MOUSY), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-    /*
-    Special Features Layer [6]
-    * ,-----------------------------------------------------------------------------------.
-    * |C+A+DL| Reset| Debug|RGBTog|RGBMod| Hue+ | Hue- | Sat+ | Sat- |Unicod| Emoji|Delete|
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |RGBVAI|RGBVAD|MUNEXT| AU_ON|AU_OFF|RALTGU|SALTGU| Base |Colemk|Dvorak|Plover|RGBCON|
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |------|AUPREV|AU_EXT| MU_ON|MU_OFF| MI_ON|MI_OFF|------|------|CLK-ON|CLKOFF|Enter |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |------|------|------|------|------|    TG(8)    |------|------|------|------|------|
-    * `-----------------------------------------------------------------------------------'
-    */
-
-    [_NUMPD] = LAYOUT_planck_mit(                                                                              //
-        KC_ESC, KC_HOME, KC_UP, KC_END, KC_PERC, KC_LCBR, KC_RCBR, KC_TAB, KC_P7, KC_P8, KC_P9, KC_BSPC,       //
-        KC_TILD, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSLS, KC_LBRC, KC_RBRC, KC_PSLS, KC_P4, KC_P5, KC_P6, KC_PMNS,  //
-        KC_LSFT, KC_SLSH, KC_CUT, KC_COPY, KC_PASTE, KC_LT, KC_GT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PPLS,      //
-        TO(_BASE), QK_LEAD, KC_LGUI, KC_LALT, SC_LCPO, KC_SPC, SC_RCPC, KC_HASH, KC_P0, KC_PDOT, KC_PENT),
-    /*
-    Numpad Layer [7]
-    * ,-----------------------------------------------------------------------------------.
-    * | Esc  | Home |  Up  |  End |   %  |   {  |   }  |  Tab |   7  |   8  |   9  |BckSpc|
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |   ~  | Left | Down | Right|   \  |   [  |   ]  |   /  |   4  |   5  |   6  |   -  |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Shift|   /  |Ctrl+X|Ctrl+C|Ctrl+V|   <  |   >  |   *  |   1  |   2  |   3  |   +  |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Base |Leader|  Alt |  OS  |LCtl/(|    Space    |)/RCtl|   #  |   0  |   .  |Enter |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_TABULA] = LAYOUT_planck_mit(                                                                                                   //
-        KC_ESC, KC_ALTF4, VK_TOGG, PRINT_WPM_KEY, WAKE_ANI_TOG, WAKE_AUD_TOG, KC_REDO, UC_NEXT, UC_WINC, CG_TOGG, AG_TOGG, KC_DLINE,  //
-        KC_NXTAB, KC_SLCTALL, KC_SAVE, KC_TRNS, KC_FIND, SH_TOGG, SH_TOGG, IRONY, KC_LCUT, KC_LCOPY, KC_TRNS, KC_KILL,                   //
-        KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, TG(_MOUSY), KC_TRNS, KC_HOME, KC_END, SC_SENT,              //
-        TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, SC_LSPO, ALT_TAB, SC_RSPC, KC_PRVWD, KC_BRID, KC_BRIU, KC_NXTWD),
-    /* Tabular Layer [8]
-     * ,-----------------------------------------------------------------------------------.
-     * |  Esc |Alt+F4|Veloci|  WPM |WakANI|WakAUD|Ctrl+Y|UCMode|UCWinC|CtGUTg|AltGTg| DLine|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  Tab |Ctrl+A|Ctrl+S|------|Ctrl+F| SWAP | SWAP |  ⸮^‽ |CutLin|CpyLin|------|DelLin|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Shift|Ctrl+Z|Ctrl+X|Ctrl+C|Ctrl+V|PrVWin|NxtWin| TG(8)|------| Home |  End |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Base | LCtrl|  Alt |  OS  |LSft/(|   Alt+Tab   |)/RSft|PrvSel|ScrBr-|ScrBr+|NxtSel|
-     * `-----------------------------------------------------------------------------------'
-     */
-
-    [_MOUSY] = LAYOUT_planck_mit(                                                                                                  //
-        KC_ESC, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, UC_NEXT, UC_WINC, CG_TOGG, AG_TOGG, KC_BSPC,  //
-        KC_TAB, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, IRONY, VK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS,                   //
-        KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_PRVWD, KC_NXTWD, KC_TRNS, KC_HOME, KC_BTN3, KC_END, SC_SENT,               //
-        TO(_BASE), KC_LCTL, KC_LGUI, KC_LALT, KC_BTN1, ALT_TAB, KC_BTN2, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R)};
-/* MousePad Layer [9]
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |MsBtn1| MsUp |MsBtn2|------|------|------|UCMode|UCWinC|CtGUTg|AltGTg|BckSpc|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ~  |MsLeft|MsDown|MsRigt|------|------|------|  ⸮^‽ |Veloci|------|------|------|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|------|Ctrl+X|Ctrl+C|Ctrl+V|------|------|------| Home |MsBtn3|  End |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Base | LCtrl|  Alt |  OS  |MsBtn1|   Alt+Tab   |MsBtn2|MsWhlL|MsWhlD|MsWhlU|MsWhlR|
- * `-----------------------------------------------------------------------------------'
- */
-
-// Define RGB layers | assign leds and their values for each rgb layer
-const rgblight_segment_t PROGMEM my_warning_layer[]  = RGBLIGHT_LAYER_SEGMENTS({1, 9, HSV_RED}, {0, 1, HSV_RED});
-const rgblight_segment_t PROGMEM my_allgood_layer[]  = RGBLIGHT_LAYER_SEGMENTS({1, 9, HSV_GREEN}, {0, 1, HSV_GREEN});
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_RED}, {8, 1, HSV_RED});
-const rgblight_segment_t PROGMEM my_number_layer[]   = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_MAGENTA}, {8, 1, HSV_MAGENTA});
-const rgblight_segment_t PROGMEM my_symbol_layer[]   = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}, {8, 1, HSV_GREEN});
-const rgblight_segment_t PROGMEM my_tabula_layer[]   = RGBLIGHT_LAYER_SEGMENTS({3, 4, HSV_CORAL}, {1, 1, HSV_CORAL}, {8, 1, HSV_CORAL});
-const rgblight_segment_t PROGMEM my_mousy_layer[]    = RGBLIGHT_LAYER_SEGMENTS({3, 4, HSV_TURQUOISE}, {1, 1, HSV_TURQUOISE}, {8, 1, HSV_TURQUOISE}, {7, 1, HSV_MAGENTA});
-const rgblight_segment_t PROGMEM my_numpad_layer[]   = RGBLIGHT_LAYER_SEGMENTS({3, 4, HSV_GOLD}, {1, 1, HSV_GOLD}, {8, 1, HSV_GOLD}, {7, 1, HSV_BLUE});
-const rgblight_segment_t PROGMEM my_features_layer[] = RGBLIGHT_LAYER_SEGMENTS({3, 4, HSV_BLUE}, {1, 1, HSV_BLUE}, {8, 1, HSV_BLUE});
-const rgblight_segment_t PROGMEM my_base_layer[]     = RGBLIGHT_LAYER_SEGMENTS({0, 0, HSV_BLACK});
-const rgblight_segment_t PROGMEM my_colemak_layer[]  = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN});
-const rgblight_segment_t PROGMEM my_dvorak_layer[]   = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_ORANGE});
-const rgblight_segment_t PROGMEM my_plover_layer[]   = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GOLD});
-
-// Define the array of rgb layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_base_layer,      // Base Layer
-                                                                               my_colemak_layer,   // Overrides previous layer
-                                                                               my_dvorak_layer,    // Overrides previous layers
-                                                                               my_symbol_layer,    // Overrides previous layers
-                                                                               my_number_layer,    // ...etc                                                                              my_features_layer,  // Overrides  layers
-                                                                               my_plover_layer,    //
-                                                                               my_features_layer,  //
-                                                                               my_numpad_layer,    //
-                                                                               my_tabula_layer,    //
-                                                                               my_mousy_layer,     //
-                                                                               my_capslock_layer,  //
-                                                                               my_warning_layer,   //
-                                                                               my_allgood_layer);  // CapsLock Layer);
-
-// Configure encoders
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (musical_mode) {
-        if (clockwise) {
-            tap_code16(MU_NEXT);
-        } else {
-            tap_code16(MU_NEXT);
-        }
-    } else {
-        if (muse_mode) {
-            if (IS_LAYER_ON(_RAISE)) {
-                if (clockwise) {
-                    muse_offset++;
-                } else {
-                    muse_offset--;
-                }
-            } else {
-                if (clockwise) {
-                    muse_tempo += 1;
-                } else {
-                    muse_tempo -= 1;
-                }
-            }
-        } else {
-            if (index == 0) { /* First encoder */
-                uint16_t held_keycode_timer = timer_read();
-                switch (get_highest_layer(layer_state)) {
-                    case 0:                                 // Base Layer
-                        if ((get_mods() & MOD_MASK_GUI)) {  // GUI-ed
-                            if (clockwise) {
-                                tap_code(KC_RIGHT);
-
-                            } else {
-                                tap_code(KC_LEFT);
-                            }
-                        } else if ((get_mods() & MOD_MASK_ALT)) {  // Alt-ed
-                            if (clockwise) {
-                                tap_code16(LALT(KC_TAB));  // Alt+Tabbing
-                            } else {
-                                tap_code16(LSA(KC_TAB));
-                            }
-                        } else if ((get_mods() & MOD_MASK_SHIFT)) {  // Shifted
-                            const uint8_t _real_mods = get_mods();
-                            unregister_code16(KC_LSFT);
-                            unregister_code16(KC_RSFT);
-                            clear_mods();
-                            if (clockwise) {
-                                tap_code16(KC_MS_WH_DOWN);
-                            } else {
-                                tap_code16(KC_MS_WH_UP);
-                            }
-                            set_mods(_real_mods);
-                        } else if ((get_mods() & MOD_MASK_CTRL)) {  // Ctrl-ed
-                            if (clockwise) {
-                                tap_code16(RCTL(KC_TAB));  // Ctrl+Tabbing
-                            } else {
-                                tap_code16(RCS(KC_TAB));
-                            }
-                        } else {  // Normal or unspecified modifiers
-                            if (clockwise) {
-                                // Volume control requires extra timer to function correctly
-                                register_code(KC_VOLU);
-                                while (timer_elapsed(held_keycode_timer) < TAP_CODE_DELAY) {
-                                    // no-op
-                                }
-                                unregister_code(KC_VOLD);
-                            } else {
-                                register_code(KC_VOLD);
-                                while (timer_elapsed(held_keycode_timer) < TAP_CODE_DELAY) {
-                                    // no-op
-                                }
-                                unregister_code(KC_VOLU);
-                            }
-                        }
-                        return false;
-                        break;
-                    case 3:  // Symbols Layer
-                        if (clockwise) {
-                            tap_code(KC_WH_D);  // Mouse wheeling
-                        } else {
-                            tap_code(KC_WH_U);
-                        }
-                        return false;
-                        break;
-                    case 4:  // Numbers Layer
-                        if (clockwise) {
-                            tap_code(KC_WH_D);  // Mouse wheeling
-                        } else {
-                            tap_code(KC_WH_U);
-                        }
-                        return false;
-                        break;
-                    case 6:  // Features Layer
-                        if (clockwise) {
-                            tap_code16(KC_DOWN);
-                        } else {
-                            tap_code16(KC_UP);
-                        }
-                    default:  // Any other layer
-                        if ((get_mods() & MOD_MASK_CSAG)) {
-                            if (clockwise) {
-                                WITHOUT_MODS({ SEND_STRING(SS_TAP(X_RIGHT)); });
-                            } else {
-                                WITHOUT_MODS({ SEND_STRING(SS_TAP(X_LEFT)); });
-                            }
-                        } else {
-                            if (clockwise) {
-                                tap_code(KC_DOWN);  // Simple Up/Down
-                            } else {
-                                tap_code(KC_UP);
-                            }
-                        }
-                        return false;
-                        break;
-                }
-            } else if (index == 1) { /* Second encoder (if we had one) */
-                if (clockwise) {
-                    tap_code16(LCTL(KC_LEFT));  // Ctrl+Left/Right
-                } else {
-                    tap_code16(LCTL(KC_RIGHT));
-                }
-            }
-        }
-    }
-    return true;
-}
-
-// OLED CONFIGURATION
-/*
-static void render_logo(void) {
-    static const char PROGMEM qmk_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00};
-
-    oled_write_P(qmk_logo, false);
-}
-*/
-
-// Process Combo events
-void process_combo_event(uint16_t combo_index, bool pressed) {
-    switch (combo_index) {
-        case ZC_COPY:
-            if (pressed) {
-                tap_code16(LCTL(KC_C));
-            }
-            break;
-        case XV_PASTE:
-            if (pressed) {
-                tap_code16(LCTL(KC_V));
-            }
-            break;
-    }
-}
-
-// Runs every time a key is pressed or released
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-#ifdef CONSOLE_ENABLE
-    dprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-#endif
-    // Store the current modifier state in the variable for later reference
-    mod_state = get_mods();
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-                PLAY_SONG(qwerty_song);
-            }
-            return false;
-            break;
-        case COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-                PLAY_SONG(colemak_song);
-            }
-            return false;
-            break;
-        case DVORAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_DVORAK);
-                PLAY_SONG(dvorak_song);
-            }
-            return false;
-            break;
-        case PLOVER:
-            if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-                stop_all_notes();
-                PLAY_SONG(plover_song);
-#endif
-                layer_off(_RAISE);
-                layer_off(_LOWER);
-                layer_off(_ADJUST);
-                layer_on(_PLOVER);
-                if (!eeconfig_is_enabled()) {
-                    eeconfig_init();
-                }
-                keymap_config.raw  = eeconfig_read_keymap();
-                keymap_config.nkro = 1;
-                eeconfig_update_keymap(keymap_config.raw);
-            }
-            return false;
-            break;
-        case EXT_PLV:
-            if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-                PLAY_SONG(plover_gb_song);
-#endif
-                layer_off(_PLOVER);
-            }
-            return false;
-            break;
-        case MO_SYMBLS:
-            if (record->event.pressed) {
-                layer_on(_SYMBLS);
-            } else {
-                layer_off(_SYMBLS);
-            }
-            return false;
-        case MO_NUMBRS:
-            if (record->event.pressed) {
-                layer_on(_NUMBRS);
-            } else {
-                layer_off(_NUMBRS);
-            }
-            return false;
-        case MO_FEATURS:
-            if (record->event.pressed) {
-                layer_on(_FEATURS);
-            } else {
-                layer_off(_FEATURS);
-            }
-            return false;
-        case MUSIC_ON:
-            if (record->event.pressed) {
-                musical_mode = true;
-                register_code16(MU_ON);
-            } else {
-                unregister_code16(MU_ON);
-            }
-            break;
-        case MUSIC_OFF:
-            if (record->event.pressed) {
-                musical_mode = false;
-                register_code16(MU_OFF);
-            } else {
-                unregister_code16(MU_OFF);
-            }
-            break;
-        case KC_PRVWD:  // Control+Left
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_LEFT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                }
-            }
-            break;
-        case KC_NXTWD:  // Control+Right
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                }
-            }
-            break;
-        case KC_PRVTAB:  // Control+Shift+Tab
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_mods(mod_config(MOD_LSFT));
-                register_code(KC_TAB);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_mods(mod_config(MOD_LSFT));
-                unregister_code(KC_TAB);
-            }
-            break;
-        case KC_NXTAB:  // Control+Tab
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_TAB);
-                } else {
-                    register_mods(mod_config(MOD_LSFT));
-                    register_code(KC_TAB);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                }
-            }
-            break;
-        case KC_LSTRT:  // Basically just Home
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    // CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                } else {
-                    register_code(KC_HOME);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_code(KC_HOME);
-                }
-            }
-            break;
-        case KC_LEND:  // Basically just End
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    // CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_code(KC_END);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_code(KC_END);
-                }
-            }
-            break;
-        case KC_DLINE:  // Control+BackSpace
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_BSPC);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_BSPC);
-            }
-            break;
-        case KC_COPY:  // Copy: Control+C
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_C);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_C);
-            }
-            return false;
-        case KC_PASTE:  // Paste: Control+V
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_V);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_V);
-            }
-            return false;
-        case KC_CUT:  // Cut: Control+X
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_X);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_X);
-            }
-            return false;
-            break;
-        case KC_UNDO:  // Undo: Control+Z
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_Z);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_Z);
-            }
-            return false;
-        case KC_REDO:  // Redo: Control+Y
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_Y);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_Y);
-            }
-            break;
-        case KC_SAVE:  // Save: Control+S
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_S);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_S);
-            }
-            return false;
-        case KC_FIND:  // Find: Control+F
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_F);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_F);
-            }
-            return false;
-        case KC_SLCTALL:  // Select All: Control+A
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_A);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_A);
-            }
-            return false;
-        case KC_KILL:  // Kill: Delete Line
-            if (record->event.pressed) {
-                tap_code(KC_HOME);
-                register_mods(mod_config(MOD_LSFT));
-                tap_code(KC_END);
-                unregister_mods(mod_config(MOD_LSFT));
-                tap_code(KC_DELETE);
-            } else {
-            }
-            return false;
-        case KC_LCUT:  // Cut Line
-            if (record->event.pressed) {
-                tap_code(KC_HOME);
-                register_mods(mod_config(MOD_LSFT));
-                tap_code(KC_END);
-                unregister_mods(mod_config(MOD_LSFT));
-                register_mods(mod_config(MOD_LCTL));
-                tap_code(KC_X);
-                unregister_mods(mod_config(MOD_LCTL));
-            } else {
-            }
-            return false;
-        case KC_LCOPY:  // Copy Line
-            if (record->event.pressed) {
-                tap_code(KC_HOME);
-                register_mods(mod_config(MOD_LSFT));
-                tap_code(KC_END);
-                unregister_mods(mod_config(MOD_LSFT));
-                register_mods(mod_config(MOD_LCTL));
-                tap_code(KC_C);
-                unregister_mods(mod_config(MOD_LCTL));
-                tap_code(KC_END);
-            } else {
-            }
-            return false;
-        case KC_ALTF4:  // Close Window: Alt+F4
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LALT));
-                register_code(KC_F4);
-            } else {
-                unregister_mods(mod_config(MOD_LALT));
-                unregister_code(KC_F4);
-            }
-            return false;
-        case ALT_TAB:  // Change Window: Super ⭍ Alt+Tab
-            if (record->event.pressed) {
-                if (!is_alt_tab_active) {
-                    is_alt_tab_active = true;
-                    register_code(KC_LALT);
-                }
-                alt_tab_timer = timer_read();
-                register_code(KC_TAB);
-#ifdef CONSOLE_ENABLE
-                dprint("I've tabbed to another window!\n");
-#endif
-            } else {
-                unregister_code(KC_TAB);
-            }
-            break;
-        case KC_BSPC: {
-            // Initialize a boolean variable that keeps track
-            // of the delete key status: registered or not?
-            static bool delkey_registered;
-            if (record->event.pressed) {
-                // Detect the activation of either shift keys
-                if (mod_state & MOD_MASK_SHIFT) {
-                    // First temporarily canceling both shifts so that
-                    // shift isn't applied to the KC_DEL keycode
-                    del_mods(MOD_MASK_SHIFT);
-                    register_code(KC_DEL);
-                    // Update the boolean variable to reflect the status of KC_DEL
-                    delkey_registered = true;
-                    // Reapplying modifier state so that the held shift key(s)
-                    // still work even after having tapped the Backspace/Delete key.
-                    set_mods(mod_state);
-                    return false;
-                }
-            } else {  // on release of KC_BSPC
-                // In case KC_DEL is still being sent even after the release of KC_BSPC
-                if (delkey_registered) {
-                    unregister_code(KC_DEL);
-                    delkey_registered = false;
-                    return false;
-                }
-            }
-        }
-            // Let QMK process the KC_BSPC keycode as usual outside of shift
-            return true;
-
-        case DO_RESET:  // Reset button with LED indication
-            if (record->event.pressed) {
-                rgblight_set_effect_range(0, 9);
-                rgblight_sethsv_noeeprom(HSV_RED);
-                rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-                rgblight_blink_layer(11, 5000);
-                reset_keyboard();
-            }
-            break;
-        case WAKE_ANI_TOG:  // Toggle the Wakeup RGB animation
-            if (record->event.pressed) {
-                user_config.do_wakeup_animation ^= 1;   // Toggles the status
-                eeconfig_update_user(user_config.raw);  // Writes the new status to EEPROM
-                if (user_config.do_wakeup_animation) {
-                    print("Wake animation enabled.\n");
-                    PLAY_SONG(slctl_on);
-
-                } else {
-                    print("Wake animation disabled.\n");
-                    PLAY_SONG(slctl_off);
-                }
-            }
-            break;
-        case WAKE_AUD_TOG:  // Toggle the wake-up music
-            if (record->event.pressed) {
-                user_config.do_wakeup_audio ^= 1;       // Toggles the status
-                eeconfig_update_user(user_config.raw);  // Writes the new status to EEPROM
-                if (user_config.do_wakeup_audio) {
-                    print("Wake music enabled.\n");
-                    PLAY_SONG(slctl_on);
-
-                } else {
-                    print("Wake music disabled.\n");
-                    PLAY_SONG(slctl_off);
-                }
-            }
-            break;
-        case IRONY:  // Outputs Irony/Interrobang symbols
-            if ((get_mods() & MOD_MASK_SHIFT)) {
-                irony_shifted = true;
-            } else {
-                irony_shifted = false;
-            }
-            if (record->event.pressed) {
-                if (irony_shifted) {
-                    send_unicode_string(bang_str);
-                } else {
-                    send_unicode_string(irony_str);
-                }
-                irony_active       = true;
-                irony_pressed_time = timer_read();
-            } else {
-                irony_active       = false;
-                irony_pressed_time = 0;
-                irony_shifted      = false;
-            }
-            return false;
-        case TG(_NUMPD):  // Toggle the NumPad layer
-            if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-                PLAY_SONG(hello_song);
-#endif
-                print("I've activated the NumPad!\n");
-            } else {
-            }
-            break;
-        case TG(_TABULA):  // Toggle the Tabula layer
-            if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-                PLAY_SONG(lover_song);
-#endif
-                print("I've activated Tabular!\n");
-            } else {
-            }
-            break;
-        case TG(_MOUSY):  // Toggle the MouseyPad layer
-            if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-                PLAY_SONG(funk_song);
-#endif
-                print("I've activated the MousePad!\n");
-            } else {
-            }
-            break;
-        case TO(_BASE):  // Return to the base layer
-            if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-                PLAY_SONG(planck_song);
-#endif
-                print("I've returned to the Base Layer!\n");
-            } else {
-            }
-            break;
-        case PRINT_WPM_KEY:  // Prints the current average words-per-minute to the console
-            sprintf(wpm_str, "Current WPM: %hu", get_current_wpm());
-            printf("%s\n", wpm_str);
-            break;
-
-        case MY_RGBCON:  // Cycles through custom RGB animation presets
-            if (record->event.pressed) {
-                // when keycode RGB-CON is pressed
-                user_config.rgbcon_tracker = rgbcon_tracker + 1;  // Toggles the status
-                eeconfig_update_user(user_config.raw);
-                switch (rgbcon_tracker) {
-                    case 0:
-                        rgblight_set_effect_range(0, 9);
-                        rgblight_sethsv(HSV_BLACK);
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        print("Changed RGB mode to: Disabled RGB\n");
-                        rgbcon_tracker++;
-                        break;
-                    case 1:
-                        rgblight_set_effect_range(0, 9);
-                        rgblight_sethsv(HSV_WHITE);
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        print("Changed RGB mode to: Static White\n");
-                        rgbcon_tracker++;
-                        break;
-                    case 2:
-                        rgblight_set_effect_range(0, 9);
-                        rgblight_sethsv(HSV_CYAN);
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        print("Changed RGB mode to: Static Cyan\n");
-                        rgbcon_tracker++;
-                        break;
-                    case 3:
-                        rgblight_set_effect_range(0, 9);
-                        rgblight_sethsv(HSV_WHITE);
-                        rgblight_mode(RGBLIGHT_MODE_BREATHING);
-                        print("Changed RGB mode to: Breathing Lights\n");
-#ifdef AUDIO_ENABLE
-                        print("Played Marching song!\n");
-                        PLAY_SONG(imp_march_song);
-#endif
-                        rgbcon_tracker++;
-                        break;
-                    case 4:
-                        rgblight_set_effect_range(0, 9);
-                        rgblight_sethsv(HSV_RED);
-                        rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
-                        print("Changed RGB mode to: Rainbow Swirl\n");
-                        rgbcon_tracker++;
-                        break;
-                    case 5:
-                        rgblight_set_effect_range(0, 9);
-                        rgblight_sethsv(HSV_CYAN);
-                        rgblight_mode(RGBLIGHT_MODE_RAINBOW_MOOD);
-                        print("Changed RGB mode to: Rainbow Mood\n");
-#ifdef AUDIO_ENABLE
-                        print("Played Game Over song!\n");
-                        PLAY_SONG(gameover_song);
-#endif
-                        rgbcon_tracker = 0;
-                        break;
-                    case 6:
-                        rgblight_set_effect_range(0, 9);
-                        rgblight_sethsv(HSV_BLACK);
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        print("Changed RGB mode to: Disabled RGB\n");
-                        rgbcon_tracker = 1;
-                        break;
-                }
-            } else {
-            }
-            break;
-    }
-    return true;
-};
-
-// Runs *after* a key is pressed
-void post_process_record_user(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        case QK_DEBUG_TOGGLE:
-            // Blink the warning layer when the debug key is pressed
-            rgblight_blink_layer_repeat(debug_enable ? 11 : 12, 1500, 3);
-
-            // Update the console with the debug mode status
-            if (debug_enable) {
-                print("Debug mode enabled.\n");
-                PLAY_SONG(slctl_on);
-
-            } else {
-                print("Debug mode disabled.\n");
-                PLAY_SONG(slctl_off);
-            }
-            break;
-    }
-}
-
-// RGB Default Layer assignments
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    state = update_tri_layer_state(state, _SYMBLS, _NUMBRS, _FEATURS);
-
-    // Sets the default RGB layer states
-    rgblight_set_layer_state(0, layer_state_cmp(state, _BASE));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _COLEMAK));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _DVORAK));
-    return state;
-}
-
-// RGB Layer assignments
-layer_state_t layer_state_set_user(layer_state_t state) {
-    state = update_tri_layer_state(state, _SYMBLS, _NUMBRS, _FEATURS);
-
-    // Sets the RGB layer states
-    rgblight_set_layer_state(5, layer_state_cmp(state, _PLOVER));
-    rgblight_set_layer_state(6, layer_state_cmp(state, _FEATURS));
-    rgblight_set_layer_state(3, layer_state_cmp(state, _SYMBLS));
-    rgblight_set_layer_state(4, layer_state_cmp(state, _NUMBRS));
-    rgblight_set_layer_state(7, layer_state_cmp(state, _NUMPD));
-    rgblight_set_layer_state(8, layer_state_cmp(state, _TABULA));
-    rgblight_set_layer_state(9, layer_state_cmp(state, _MOUSY));
-    return state;
-}
-
-// Runs the wakeup rgb animation + music
-void rgb_wakeup_sequence(void) {
-    if (waking_up) {
-        if ((timer_elapsed(wake_rgb_timer) > WAKE_ANIMATION_TIMER_FREQUENCY)) {
-            if (wake_rgb_count < 1) {
-                rgblight_sethsv_noeeprom(HSV_OFF);
-                rgblight_set_effect_range(0, 9);
-            } else if (wake_rgb_count < 2 && wake_rgb_count > 0) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 2);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(2, 9);
-            } else if (wake_rgb_count < 3 && wake_rgb_count > 1) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 2);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(2, 9);
-            } else if (wake_rgb_count < 4 && wake_rgb_count > 2) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 3);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(3, 9);
-            } else if (wake_rgb_count < 5 && wake_rgb_count > 3) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 4);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(4, 9);
-            } else if (wake_rgb_count < 6 && wake_rgb_count > 4) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 5);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(5, 9);
-            } else if (wake_rgb_count < 7 && wake_rgb_count > 5) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 6);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(6, 9);
-            } else if (wake_rgb_count < 8 && wake_rgb_count > 6) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 7);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(7, 9);
-            } else if (wake_rgb_count < 9 && wake_rgb_count > 7) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 8);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(8, 9);
-            } else if (wake_rgb_count < 10 && wake_rgb_count > 8) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 0);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(0, 9);
-            } else if (wake_rgb_count < 11 && wake_rgb_count > 9) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 8);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(8, 9);
-            } else if (wake_rgb_count < 12 && wake_rgb_count > 10) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 7);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(7, 9);
-            } else if (wake_rgb_count < 13 && wake_rgb_count > 11) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 6);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(6, 9);
-            } else if (wake_rgb_count < 14 && wake_rgb_count > 12) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 5);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(5, 9);
-            } else if (wake_rgb_count < 15 && wake_rgb_count > 13) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 4);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(4, 9);
-            } else if (wake_rgb_count < 16 && wake_rgb_count > 14) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 3);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(3, 9);
-            } else if (wake_rgb_count < 17 && wake_rgb_count > 15) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 2);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(2, 9);
-            } else if (wake_rgb_count < 18 && wake_rgb_count > 16) {
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 1);
-                rgblight_sethsv_noeeprom(HSV_WHITE);
-                rgblight_set_effect_range(1, 9);
-            } else if (wake_rgb_count > 17) {
-                // Final frame of wake-up rgb animation
-                rgblight_sethsv_noeeprom(HSV_BLACK);
-                rgblight_set_effect_range(0, 9);
-                waking_up = false;
-                print("I have awoken!\n");
-#ifdef AUDIO_ENABLE
-                // Play the wake-up sound *after* we finish the animation
-                if (do_wake_audio) {
-                    PLAY_SONG(puzzle_song);
-                }
-#endif
-            }
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            wake_rgb_count++;
-            wake_rgb_timer = timer_read();
-        }
-    }
-}
-
-// Spits out some unicode special characters in response to a tap-dance
-void send_degree_symbol(tap_dance_state_t* state, void* user_data) {
-    switch (state->count) {
-        case 4:
-            // ℃
-            register_unicode(0x2103);
-            print("You pressed the Degrees key 4 times!\n");
-            reset_tap_dance(state);
-            break;
-        case 3:
-            //℉
-            register_unicode(0x2109);
-            print("You pressed the Degrees key 3 times!\n");
-            reset_tap_dance(state);
-            break;
-        case 2:
-            // €
-            register_unicode(0x20AC);
-            print("You pressed the Degrees key 2 times!\n");
-            reset_tap_dance(state);
-            break;
-        case 1:
-            // °
-            register_unicode(0x00B0);
-            print("You pressed the Degrees key 1 time!\n");
-            reset_tap_dance(state);
-            break;
-    }
-}
-
-// Handles per-key configuration of Retro-Tapping
-bool get_retro_tapping(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        default:
-            return false;
-    }
-}
-// Handles per-key configuration of Hold-on-Other-Key-Press
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
-            return true;
-        default:
-            return false;
-    }
-}
-// Handles per-key configuration of Quick-Tap
-uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        default:
-            return QUICK_TAP_TERM;
-    }
-}
-// Handles per-key configuration of Permissive-Hold
-bool get_permissive_hold(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        default:
-            return false;
-    }
-}
-/*
- * The following two functions make leader keys "musical"
- * by playing sound at different stages of the leader chord
- */
-// Called when you tap the Leader key
-void leader_start_user(void) {
-#ifdef AUDIO_ENABLE
-    PLAY_SONG(leader_started);
-#endif
-}
-// Called when either the leader sequence is completed, or the leader timeout is hit
-void leader_end_user(void) {
-    did_leader_succeed = false;
-
-    if (leader_sequence_one_key(KC_E)) {
-        SEND_STRING(SS_LCTL(SS_LSFT("t")));
-        did_leader_succeed = true;
-    }
-    if (leader_sequence_one_key(KC_C)) {
-        SEND_STRING(SS_LGUI("r") SS_DELAY(250) "calc\n");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_one_key(KC_V)) {
-        SEND_STRING(SS_LCTL("v"));
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_two_keys(KC_E, KC_D)) {
-        SEND_STRING(SS_LGUI("r") "cmd\n" SS_LCTL("c"));
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_two_keys(KC_A, KC_C)) {
-        SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_three_keys(KC_C, KC_A, KC_T)) {
-        send_unicode_string("😸");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_three_keys(KC_B, KC_A, KC_T)) {
-        send_unicode_string("🦇");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_three_keys(KC_D, KC_O, KC_G)) {
-        send_unicode_string("🐶");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_five_keys(KC_S, KC_M, KC_I, KC_L, KC_E)) {
-        send_unicode_string("🙂");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_four_keys(KC_H, KC_A, KC_P, KC_Y)) {
-        send_unicode_string("🙂");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_five_keys(KC_H, KC_A, KC_P, KC_P, KC_Y)) {
-        send_unicode_string("🙂");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_three_keys(KC_S, KC_A, KC_D)) {
-        send_unicode_string("🙁");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_three_keys(KC_Y, KC_E, KC_S)) {
-        send_unicode_string("👍");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_two_keys(KC_N, KC_O)) {
-        send_unicode_string("👎");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_three_keys(KC_W, KC_O, KC_W)) {
-        send_unicode_string("🤯");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_three_keys(KC_P, KC_O, KC_O)) {
-        send_unicode_string("💩");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_four_keys(KC_P, KC_O, KC_O, KC_P)) {
-        send_unicode_string("💩");
-        did_leader_succeed = true;
-    }
-    else if (leader_sequence_four_keys(KC_B, KC_O, KC_A, KC_T)) {
-        send_unicode_string("⛵");
-        did_leader_succeed = true;
-    }
-
-    if (did_leader_succeed) {
-#ifdef AUDIO_ENABLE
-        PLAY_SONG(leader_succeed);
-#endif
-    } else {
-#ifdef AUDIO_ENABLE
-        PLAY_SONG(leader_fail);
-#endif
-    }
-}
-
-// Monitors and labels the current state of any tap-dances
-td_state_t cur_dance(tap_dance_state_t* state) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return TD_SINGLE_TAP;
-        // Key has not been interrupted, but the key is still held. Means you want to send a 'HOLD'.
-        else
-            return TD_SINGLE_HOLD;
-    } else if (state->count == 2) {
-        if (state->interrupted)
-            return TD_DOUBLE_SINGLE_TAP;
-        else if (state->pressed)
-            return TD_DOUBLE_HOLD;
-        else
-            return TD_DOUBLE_TAP;
-    }
-    if (state->count == 3) {
-        if (state->interrupted || !state->pressed)
-            return TD_TRIPLE_TAP;
-        else
-            return TD_TRIPLE_HOLD;
-    } else
-        return TD_UNKNOWN;
-}
-
-// Create an instance of 'td_tap_t' for each tap dance.
-static td_tap_t sml_state   = {.is_press_action = true, .state = TD_NONE};
-static td_tap_t scap_state  = {.is_press_action = true, .state = TD_NONE};
-static td_tap_t slctl_state = {.is_press_action = true, .state = TD_NONE};
-static td_tap_t slalt_state = {.is_press_action = true, .state = TD_NONE};
-
-// Left-Shift->Sticky-Caps tap-dance finished
-void scap_finished(tap_dance_state_t* state, void* user_data) {
-    scap_state.state = cur_dance(state);
-    switch (scap_state.state) {
-        case TD_SINGLE_HOLD:
-            register_code(KC_LSFT);
-            break;
-        default:
-            if (host_keyboard_led_state().caps_lock) {
-                tap_code(KC_CAPS);
-                reset_tap_dance(state);
-                break;
-            } else {
-                if ((state->count) >= TAPPING_TOGGLE) {
-                    tap_code(KC_CAPS);
-                    reset_tap_dance(state);
-                    break;
-                } else {
-                    register_code(KC_LSFT);
-                    break;
-                }
-            }
-    }
-}
-
-// Left-Shift->Sticky-Caps tap-dance reset
-void scap_reset(tap_dance_state_t* state, void* user_data) {
-    unregister_code(KC_LSFT);
-    scap_state.state = TD_NONE;
-}
-
-// Sticky-Left-Control tap-dance finished
-void slctl_finished(tap_dance_state_t* state, void* user_data) {
-    slctl_state.state = cur_dance(state);
-    switch (slctl_state.state) {
-        case TD_SINGLE_HOLD:
-            register_code(KC_LCTL);
-            break;
-        default:
-            if (lctl_sticky) {
-                unregister_code(KC_LCTL);
-                lctl_sticky = false;
-                PLAY_SONG(slctl_off);
-                reset_tap_dance(state);
-                break;
-            } else {
-                if ((state->count) >= TAPPING_TOGGLE) {
-                    register_code(KC_LCTL);
-                    lctl_sticky = true;
-                    PLAY_SONG(slctl_on);
-                    reset_tap_dance(state);
-                    break;
-                } else {
-                    register_code(KC_LCTL);
-                    reset_tap_dance(state);
-                    break;
-                }
-            }
-    }
-}
-
-// Sticky-Left-Control tap-dance reset
-void slctl_reset(tap_dance_state_t* state, void* user_data) {
-    if (!lctl_sticky) {
-        unregister_code(KC_LCTL);
-        slctl_state.state = TD_NONE;
-    } else {
-        slctl_state.state = TD_NONE;
-    }
-}
-
-// Sticky-Left-Alt tap-dance finished
-void slalt_finished(tap_dance_state_t* state, void* user_data) {
-    slalt_state.state = cur_dance(state);
-    switch (slalt_state.state) {
-        case TD_SINGLE_HOLD:
-            register_code(KC_LALT);
-            break;
-        default:
-            if (lalt_sticky) {
-                unregister_code(KC_LALT);
-                lalt_sticky = false;
-                PLAY_SONG(slalt_off);
-                reset_tap_dance(state);
-                break;
-            } else {
-                if ((state->count) >= TAPPING_TOGGLE) {
-                    register_code(KC_LALT);
-                    lalt_sticky = true;
-                    PLAY_SONG(slalt_on);
-                    reset_tap_dance(state);
-                    break;
-                } else {
-                    register_code(KC_LALT);
-                    reset_tap_dance(state);
-                    break;
-                }
-            }
-    }
-}
-
-// Sticky-Left-Alt tap-dance reset
-void slalt_reset(tap_dance_state_t* state, void* user_data) {
-    if (!lalt_sticky) {
-        unregister_code(KC_LALT);
-        slalt_state.state = TD_NONE;
-    } else {
-        slalt_state.state = TD_NONE;
-    }
-}
-
-// Smiley key tap-dance finished
-void sml_finished(tap_dance_state_t* state, void* user_data) {
-    sml_state.state = cur_dance(state);
-    switch (sml_state.state) {
-        default:
-            switch (state->count) {
-                default:
-                    // 👍
-                    send_unicode_string("👍");
-                    print("You pressed the Emoji key at least 11 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 10:
-                    // 👎
-                    send_unicode_string("👎");
-                    print("You pressed the Emoji key 10 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 9:
-                    //🍌
-                    send_unicode_string("🍌");
-                    print("You pressed the Emoji key 9 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 8:
-                    // 🍑
-                    send_unicode_string("🍑");
-                    print("You pressed the Emoji key 8 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 7:
-                    // 🐕
-                    send_unicode_string("🐕");
-                    print("You pressed the Emoji key 7 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 6:
-                    // 🐈
-                    send_unicode_string("🐈");
-                    print("You pressed the Emoji key 6 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 5:
-                    // 🐍
-                    send_unicode_string("🐍");
-                    print("You pressed the Emoji key 5 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 4:
-                    //🐒
-                    send_unicode_string("🐒");
-                    print("You pressed the Emoji key 4 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 3:
-                    // 💩
-                    send_unicode_string("💩");
-                    print("You pressed the Emoji key 3 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 2:
-                    // 🙁
-                    send_unicode_string("🙁");
-                    print("You pressed the Emoji key 2 times!\n");
-                    reset_tap_dance(state);
-                    break;
-                case 1:
-                    // 🙂
-                    send_unicode_string("🙂");
-                    print("You pressed the Emoji key 1 time!\n");
-                    reset_tap_dance(state);
-                    break;
-            }
-            break;
-        case TD_SINGLE_HOLD:
-            // 👍
-            send_unicode_string("👍");
-            print("You single-held the Emoji key!\n");
-            reset_tap_dance(state);
-            break;
-        case TD_DOUBLE_HOLD:
-            // 👎
-            send_unicode_string("👎");
-            print("You double-held the Emoji key!\n");
-            reset_tap_dance(state);
-            break;
-        case TD_TRIPLE_HOLD:
-            //🤯
-            send_unicode_string("🤯");
-            print("You triple-held the Emoji key!\n");
-            reset_tap_dance(state);
-            break;
-        case TD_NONE:
-            reset_tap_dance(state);
-            break;
-    }
-}
-void sml_reset(tap_dance_state_t* state, void* user_data) { sml_state.state = TD_NONE; }
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for °, twice for ℉, thrice for ℃
-    [TD_DEG_DEGF]    = ACTION_TAP_DANCE_FN(send_degree_symbol),                          //
-    [TD_LSHFT_CAPS]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, scap_finished, scap_reset),    //
-    [TD_LCTL_STICKY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, slctl_finished, slctl_reset),  //
-    [TD_LALT_STICKY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, slalt_finished, slalt_reset),  //
-    [TD_SMILEY]      = ACTION_TAP_DANCE_FN_ADVANCED(NULL, sml_finished, sml_reset),
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_LSHFT_CAPS):
-        case TD(TD_LCTL_STICKY):
-        case TD(TD_LALT_STICKY):
-            return 200;
-        case TD(TD_SMILEY):
-            return 500;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-// Dip-Switch controls
-void dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) {
-                    PLAY_SONG(plover_song);
-                }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) {
-                    PLAY_SONG(plover_gb_song);
-                }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-}
-
-// Runs at every complete matrix scan
-void matrix_scan_user(void) {
-    // Some code for controlling MIDI output
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-    // Check the shift-state and hold-time for the Irony key
-    if (irony_active) {
-        if ((get_mods() & MOD_MASK_SHIFT)) {
-            irony_shifted = true;
-        } else {
-            irony_shifted = false;
-        }
-        if (timer_elapsed(irony_pressed_time) >= IRONY_HOLD_DELAY) {
-            if (irony_shifted) {
-                send_unicode_string(bang_str);
-            } else {
-                send_unicode_string(irony_str);
-            }
-        }
-    }
-
-    // Monitor and respond to the current Alt+Tab state
-    if (is_alt_tab_active) {
-        if (timer_elapsed(alt_tab_timer) > 1000) {
-            unregister_code(KC_LALT);
-            is_alt_tab_active = false;
-        }
-    }
-    // Run the wake-up RGB animation if performing wake-up
-    if (do_wake_animation) {
-        rgb_wakeup_sequence();
-    }
-}
-
-// Music mask controls
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            return true;
-    }
-}
-
-void suspend_power_down_user(void) {
-    // Runs during start of system suspend
-    print("Going to sleep.");
-}
-
-void suspend_wakeup_init_user(void) {
-    // Runs during wake from system suspend
-}
-
-void keyboard_post_init_user(void) {
-    // Print welcome message to console
-    printf("Welcome to %s!\n", KEEB_MODEL_NAME);
-    // Read the user config from EEPROM
-    user_config.raw   = eeconfig_read_user();
-    do_wake_animation = user_config.do_wakeup_animation;
-    do_wake_audio     = user_config.do_wakeup_audio;
-    rgbcon_tracker    = user_config.rgbcon_tracker;
-
-    // Tell the console the status of saved config
-    if (user_config.do_wakeup_animation) {
-        print("Wake animation enabled.\n");
-    } else {
-        print("Wake animation disabled.\n");
-    }
-    if (user_config.do_wakeup_audio) {
-        print("Wake music enabled.\n");
-    } else {
-        print("Wake music disabled.\n");
-    }
-    switch (user_config.rgbcon_tracker) {
-        case 2:
-            print("RGB mode: Static White\n");
-            break;
-        case 3:
-            print("RGB mode: Static Cyan\n");
-            break;
-        case 4:
-            print("RGB mode: Breathing Lights\n");
-            break;
-        case 5:
-            print("RGB mode: Rainbow Swirl\n");
-            break;
-        case 6:
-            print("RGB mode: Rainbow Mood\n");
-            break;
-        default:
-            print("RGB mode: Disabled RGB\n");
-            break;
-    }
-
-    // Enable the LED layers
-    rgblight_enable_noeeprom();  // Enables RGB, without saving settings
-    rgblight_layers = my_rgb_layers;
-
-    /*
-     * Initialize the LED crawl wake animation here
-     * To perform it on just the first wake
-     */
-    wake_rgb_timer = timer_read();
-    waking_up      = true;
-
-    // Initialize OLED display
-    /*
-        if (USING_OLED_DISPLAY) {
-            print("Initializing display!\n");
-            render_logo();
-        }
-    */
-}
-
-// EEPROM is getting reset!
-void eeconfig_init_user(void) {
-    user_config.raw                 = 0;
-    eeconfig_update_user(user_config.raw);  // Write default value to EEPROM now
-}
-
-// Communicate 2-way with host via HID_RAW
-#ifdef RAW_ENABLE
-void raw_hid_receive(uint8_t* data, uint8_t length) {
-    //  Sample code below simply echoes back to the console any data received by the raw_hid process
-
-#    ifdef CONSOLE_ENABLE
-    dprint("Received USB data from host system:\n");
-    dprintf("%s\n", data);
-#    endif
-}
-#endif
diff --git a/keyboards/planck/keymaps/rootiest/readme.md b/keyboards/planck/keymaps/rootiest/readme.md
deleted file mode 100644
index 7932ce3fee3..00000000000
--- a/keyboards/planck/keymaps/rootiest/readme.md
+++ /dev/null
@@ -1,37 +0,0 @@
-
-![Layout Image](https://github.com/rootiest/rootiest.github.io/raw/main/img/rootiest-planck_legend.png)
-
-# The Rootiest Planck Layout
-
-This layout takes advantage of as many QMK features as possible for a huge complicated beast of a keyboard!
-
-## Features include
-
-- Encoder functions further extended by layers and modifiers
-- Extensive use of the on-board speaker
-- Extensive use of the backlight LEDs for startup animations, layer indicators, and bootloader/debug warnings, etc
-- Many layers, both toggled and momentary.
-- A toggled Numpad layer, with an emphasis on coding/accounting and with arrow keys on WASD
-- A "Tabular" layer accessed by holding Tab with frequently used functions, including Alt+Tab via pressing Space
-- A toggled Mouse-keys layer that allows full control of the mouse movement and buttons from the keyboard
-- Use of Space-Cadet Shift/Ctrl keys on various layers
-- Hold enter for Right-Shift
-- Shift+BackSpace for Delete
-- Grave-Esc in the top-left Esc key position
-- Music, Terminal, MIDI, and RGB control on Functions layer
-- QWERTY, COLEMAK, DVORAK, and PLOVER layers
-- Special keys for common Ctrl+ combos like Ctrl+C, Ctrl+V, etc
-- Special keys for Copy-Line, Cut-Line, Delete-Line, etc
-- Special keys for Ctrl+Alt+Del, Alt+F4, etc
-- Settings like rgb animation state and startup animation/sound are stored in the EEPROM to survive restart
-- "Sticky keys" with audible indication allow most modifiers to be locked by pressing multiple times in quick succession
-- Sticky-locking the Shift key toggles CapsLock instead of locking Shift
-- Unicode characters and emoji can be sent via custom tap-dance keys
-- Emoji and app-specific functions can be sent via leader-key chording
-- VelociKey and word-per-minute tracking are also included
-
-See the layout here: [Keyboard Layout](http://www.keyboard-layout-editor.com/#/gists/e48e19bc251a8d07ff8475fc1a16f43b)
-
-To build and flash this keymap, use this command:
-
-    qmk flash -kb planck/rev6 -km rootiest
diff --git a/keyboards/planck/keymaps/rootiest/rules.mk b/keyboards/planck/keymaps/rootiest/rules.mk
deleted file mode 100644
index d6f42b33ad5..00000000000
--- a/keyboards/planck/keymaps/rootiest/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-SRC += muse.c
-ENCODER_ENABLE = yes # Enables basic encoder support
-OLED_ENABLE = yes
-# UNICODE_ENABLE = yes # Allow inputting basic unicode characters
-UNICODEMAP_ENABLE = yes # Enable use of Unicode mapping array
-# UCIS_ENABLE = yes # Another method for generating Unicode characters via maps
-TAP_DANCE_ENABLE = yes # Enable Tap-Dance
-NKRO_ENABLE = yes # Enable N-Key rollover
-MOUSEKEY_ENABLE = yes # Enable mouse emulation
-EXTRAKEY_ENABLE = yes # Allows audio control and System control
-RAW_ENABLE = yes # Enable bi-directional communication to host
-CONSOLE_ENABLE = yes # Enable outputting debugging data/logs to terminal
-WPM_ENABLE = yes # Enable on-board words-per-minute tracking
-VELOCIKEY_ENABLE = yes # Enables dynamically changing rgb animation speed based on WPM
-LEADER_ENABLE = yes # Enables Leader-Key
-COMBO_ENABLE = yes # Enables combo keys
-KEY_LOCK_ENABLE = yes # Enables using lock key to maintain holds
-# LTO_ENABLE = yes # Does some optimisation to make firmware size smaller
-# SWAP_HANDS_ENABLE = yes # Enables the swap hands function
-# DEBOUNCE_TYPE = sym_eager_pk # Change debounce algorithm
-
-# NOTE: The following is not yet available in main qmk branch
-KEY_OVERRIDE_ENABLE = yes # Allows overiding modifier combos (change Shift+1 without affecting 1 or Shift's normal operation)
diff --git a/keyboards/planck/keymaps/samuel/README.org b/keyboards/planck/keymaps/samuel/README.org
deleted file mode 100644
index ab6ce423939..00000000000
--- a/keyboards/planck/keymaps/samuel/README.org
+++ /dev/null
@@ -1,492 +0,0 @@
-#+Title: Samuel's Literate QMK Config
-#+PROPERTY: header-args :tangle ~/qmk_firmware/keyboards/planck/keymaps/samuel/keymap.c
-
-This is my qmk firmware for my keyboard. I grew tired of organizing the keycode
-array in plain text so I made it a literate .org file. I've never done this
-before, so bear with me.
-
-* Layers
-
-  #+BEGIN_COMMENT
-  #+NAME: empty-layer
-  | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    | <6>    |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
-  | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
-  | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
-  | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      | -      |
-  |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-  #+END_COMMENT
-
-  This is my "pretty" org mode organized table for my main dvorak layer. If you
-  don't use org mode, it won't be that exciting, but if you enjoy working in org
-  mode, you can edit this table directly, and this file is tangled to the actual
-  keymap. No more organizing spaces or converting to and from comments.
-
-  #+NAME: home-layer
-  |--------+--------+------+------+-----+-----+------+-----+------+-------+--------+--------|
-  | T_LRSE | QUOT   | COMM | DOT  | P   | Y   | F    | G   | C    | R     | L      | T_RRSE |
-  | T_LSFT | A      | O    | E    | U   | I   | D    | H   | T    | N     | S      | T_RSFT |
-  | T_LCTL | SCLN   | Q    | J    | K   | X   | B    | M   | W    | V     | Z      | T_RCTL |
-  | T_LGUI | T_LALT | UP   | DOWN | SPC | EQL | GRAVE | SPC | LEFT | RIGHT | T_RALT | T_RGUI |
-  |--------+--------+------+------+-----+-----+------+-----+------+-------+--------+--------|
-
-  Tap keys. Used only with the "T_" keys above.
-
-  #+NAME: tap-layer
-  |----------+------+---+---+---+---+---+---+---+---+------+----------|
-  | DEL      | -    | - | - | - | - | - | - | - | - | -    | BSPC     |
-  | TAB      | -    | - | - | - | - | - | - | - | - | -    | ENTER    |
-  | LBRACKET | -    | - | - | - | - | - | - | - | - | -    | RBRACKET |
-  | SLASH    | LPRN | - | - | - | - | - | - | - | - | RPRN | MINS     |
-  |----------+------+---+---+---+---+---+---+---+---+------+----------|
-
-  #+NAME: hold-layer
-  |------+------+---+---+---+---+---+---+---+---+------+------|
-  | RISE | -    | - | - | - | - | - | - | - | - | -    | RISE |
-  | LSFT | -    | - | - | - | - | - | - | - | - | -    | RSFT |
-  | LCTL | -    | - | - | - | - | - | - | - | - | -    | RCTL |
-  | LGUI | LALT | - | - | - | - | - | - | - | - | RALT | RGUI |
-  |------+------+---+---+---+---+---+---+---+---+------+------|
-
-  I tried to keep my layout bare bones, just what would be available on a normal
-  keyboard, minus some keys I never used. This one secondary layer should cover a
-  majority of the keys not found on the home layer. The bottom left copies a normal
-  keyboards symbols from shifted numbers, and the rest is placed where convenient,
-  with some considerations for one handed use, hence the shortcuts in the top
-  left.
-
-  #+NAME: secondary-layer
-  |--------+--------+--------+--------+--------+------+--------+-----+--------+--------+-------+--------|
-  | --     | EZUNDO | EZCOPY | EZCUT  | EZPSTE | INS  | ASTR   |   7 |      8 |      9 | --    | --     |
-  | EZSHFT | ESC    | CAPS   | PGUP   | PGDN   | HOME | AMPR   |   4 |      5 |      6 | 0     | EZSHFT |
-  | EZCTRL | EXLM   | AT     | HASH   | DLR    | PERC | CIRC   |   1 |      2 |      3 | COM   | EZCTRL |
-  | EZGUI  | EZALT  | EZUP   | EZDOWN | SPC    | PIPE | BSLASH | END | EZLEFT | EZRGHT | EZALT | EZGUI  |
-  |--------+--------+--------+--------+--------+------+--------+-----+--------+--------+-------+--------|
-
-  Basic command layer for one-shot macros and function keys.
-
-  #+NAME: command-layer
-  |----+-----+-----+-----+-----+--------+--------+-----+-----+-----+-----+----|
-  | -- | F1  | F2  | F3  | F4  | F5     | F6     | F7  | F8  | F9  | F10 | -- |
-  | -- | F11 | F12 | F13 | F14 | F15    | F16    | F17 | F18 | F19 | F20 | -- |
-  | -- | F21 | F22 | F23 | F24 | QWERTY | DVORAK | --  | --  | --  | --  | -- |
-  | -- | --  | --  | --  | --  | --     | --     | --  | --  | --  | --  | -- |
-  |----+-----+-----+-----+-----+--------+--------+-----+-----+-----+-----+----|
-
-  This qwerty layout is just so normal people can try out the board. Tap keys
-  would need to be customized I think, more on that later. I also put another
-  dvorak key here because I have nightmares of getting trapped in this forsaken
-  layout.
-
-  #+NAME: qwerty-layer
-  |--------+--------+----+------+-----+-----+------+-----+------+-------+--------+--------|
-  | T_LRSE | Q      | W  | E    | R   | T   | Y    | U   | I    | O     | P      | T_RRSE |
-  | T_LSFT | A      | S  | D    | F   | G   | H    | J   | K    | L     | SCLN   | T_RSFT |
-  | T_LCTL | Z      | X  | C    | V   | B   | N    | M   | COMM | DOT   | QUOT   | T_RCTL |
-  | T_LGUI | T_LALT | UP | DOWN | SPC | EQL | GRAVE | SPC | LEFT | RIGHT | T_RALT | DVORAK |
-  |--------+--------+----+------+-----+-----+------+-----+------+-------+--------+--------|
-
-
-* Keymap Conversion in Python
-
-  This python can convert that table into the array needed for the keymap file. It
-  simply prepends every key with "KC_". I used to use a dictionary to convert some
-  keys from the table into qmk keycodes, but the double convertion was
-  unneccessary so I just prepended all my macros with KC and moved all the
-  implementation to the `process-user-input` function.
-
-  #+NAME:layer-to-array
-  #+BEGIN_SRC python :var keys=secondary-layer :tangle no
-  row = 0
-  results = ''
-  while row < len(keys):
-    key = 0
-    while key < len(keys[row]):
-      keyName = str(keys[row][key])
-      if keyName == '--':
-        keyName = 'TRANSPARENT'
-      results += 'KC_' + keyName
-      if key != 11:
-        results += ', '
-      key+=1
-    if row != 3:
-      results += ','
-    results += '\n'
-    row+=1
-  return results
-  #+END_SRC
-
-  Tap keys are technically defined in the mod_lift function. but this is will
-  implement that function from the org table.
-
-  #+NAME:define-tap-key
-  #+BEGIN_SRC python :var row=3 :var col=1 :var id=0 :var tapkeys=tap-layer :var holdkeys=hold-layer :tangle no
-  def getKey(keys, istapkey):
-    if istapkey == True:
-      keyName = str(keys[row][col])
-    else:
-      keyName = str(keys[row][col])
-    if keyName == '--':
-      keyName = 'TRANSPARENT'
-    if istapkey == False:
-      return 'KC_T_' + keyName, 'KC_' + keyName
-    else:
-      return 'KC_' + keyName
-  tapKeyName = getKey(tapkeys, True)
-  holdKeyMacro, holdKeyName = getKey(holdkeys, False)
-  return """case %s:
-  if (record->event.pressed) {
-     mod_press(%s, %s, %i);
-  } else {
-     mod_lift(%s, %s, %i);
-  }
-  return false;
-  break;""" % (holdKeyMacro, tapKeyName, holdKeyName, id, tapKeyName, holdKeyName, id)
-
-  #+END_SRC
-
-
-* keymap.c
-
-  Now that we laid out our layout, lets lay out our keymap file.
-
-** Headers
-
-   #+BEGIN_SRC C :noweb yes
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-   #+END_SRC
-
-** Keycodes
-
-   #+BEGIN_SRC C :noweb yes
-// where the 'T_' communicates how the key does something different when tapped.
-enum planck_keycodes {
-//DVORAK = SAFE_RANGE,
-KC_T_LALT = SAFE_RANGE,
-KC_T_RALT,
-KC_T_LGUI,
-KC_T_RGUI,
-KC_T_LCTL,
-KC_T_RCTL,
-KC_T_LSFT,
-KC_T_RSFT,
-KC_T_LRSE,
-KC_T_RRSE,
-KC_EZRGHT,
-KC_EZLEFT,
-KC_EZUP,
-KC_EZDOWN,
-KC_EZUNDO,
-KC_EZCOPY,
-KC_EZCUT,
-KC_EZPSTE,
-KC_EZSHFT,
-KC_EZCTRL,
-KC_EZGUI,
-KC_EZALT,
-KC_DVORAK,
-KC_QWERTY,
-KC_COM
-};
-
-   #+END_SRC
-
-** Import Key table
-
-   #+BEGIN_SRC C :noweb yes
-enum planck_layers {
-_DVORAK,
-_QWERTY,
-_RISE,
-_COMMAND
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-   #+END_SRC
-
-   #+BEGIN_SRC C :noweb yes
-[_DVORAK] = LAYOUT_planck_grid(
-<<layer-to-array(home-layer)>>
-),
-[_QWERTY] = LAYOUT_planck_grid(
-<<layer-to-array(qwerty-layer)>>
-),
-[_RISE] = LAYOUT_planck_grid(
-<<layer-to-array(secondary-layer)>>
-),
-[_COMMAND] = LAYOUT_planck_grid(
-<<layer-to-array(command-layer)>>
-)
-};
-
-   #+END_SRC
-
-** Tap Keys
-
-   I don't like tap keys coming out on release. When modified, I often let go of
-   the modifier too early because the tap button doesn't come out untill release. I
-   guess you could save the state of the board on press and then apply it after the
-   timer, but what I really want is the keys to come out on press when they can and
-   when it is most useful. For me, that is when they are modified a single time. So
-   I kind of "locked" the board into only doing single modifiers, making them faster.
-   Disadvantages are double modified keys must be done with one shot keys (its
-   actually not that bad, it feels like emacs!) and triple modified keys are
-   impossible at the moment.
-
-   #+BEGIN_SRC C :noweb yes
-
-  static uint16_t tap_timer = 0;
-  char last_mod = 10;
-
-  void mod_press(uint16_t tap_code, uint16_t hold_code, int id) {
-      /* this first if body makes double modified keys impossible, but stops the */
-      /* delay when modifying a tap key which would result in the tap key not */
-      /* getting modified. */
-      if (last_mod != id && last_mod != 10) {
-          tap_code16(tap_code);
-          last_mod = 10;
-      } else {
-          tap_timer = timer_read();
-          last_mod = id;
-          register_code(hold_code);
-      }
-  }
-
-  void mod_lift(uint16_t tap_code, uint16_t hold_code, int id) {
-      unregister_code(hold_code);
-      if (last_mod == id && timer_elapsed(tap_timer) < TAPPING_TERM) {
-          tap_code16(tap_code);
-      }
-      last_mod = 10;
-  }
-
-   #+END_SRC
-** Process User Input
-
-   #+BEGIN_SRC C :noweb yes
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-   #+END_SRC
-
-*** Layouts
-
-    Set Dvorak layout
-
-    #+BEGIN_SRC C :noweb yes
- case KC_DVORAK:
- if (record->event.pressed) {
-     set_single_persistent_default_layer(_DVORAK);
- }
- return true;
- break;
-
-    #+END_SRC
-
-    Set Qwerty layout.
-
-    #+BEGIN_SRC C :noweb yes
- case KC_QWERTY:
- if (record->event.pressed) {
-     set_single_persistent_default_layer(_QWERTY);
- }
- return true;
- break;
-
-    #+END_SRC
-
-*** Custom Keys
-**** Command Layer One Shot
-
-    #+BEGIN_SRC C :noweb yes
- case KC_COM:
- if (record->event.pressed) {
-     layer_on(_COMMAND);
-     set_oneshot_layer(_COMMAND, ONESHOT_START);
-     last_mod = 10;
- } else {
-     clear_oneshot_layer_state (ONESHOT_PRESSED);
- }
- return false;
- break;
-    #+END_SRC
-
-**** Tap Keys
-
-    #+BEGIN_SRC C :noweb yes
-    <<define-tap-key(3, 1, 0)>>
-    <<define-tap-key(3, 10, 1)>>
-    <<define-tap-key(3, 0, 2)>>
-    <<define-tap-key(3, 11, 3)>>
-    <<define-tap-key(2, 0, 4)>>
-    <<define-tap-key(2, 11, 5)>>
-    <<define-tap-key(1, 0, 6)>>
-    <<define-tap-key(1, 11, 7)>>
-    #+END_SRC
-
-**** Rise Keys
-
-    #+BEGIN_SRC C :noweb yes
- case KC_T_LRSE:
- if (record->event.pressed) {
-     tap_timer = timer_read();
-     last_mod = 8;
-     layer_on(_RISE);
- } else {
-     layer_off(_RISE);
-     if (last_mod == 8 && timer_elapsed(tap_timer) < TAPPING_TERM) {
-         tap_code16(KC_DELETE);
-         last_mod = 10;
-     }
- }
- return false;
- break;
- case KC_T_RRSE:
- if (record->event.pressed) {
-     tap_timer = timer_read();
-     last_mod = 9;
-     layer_on(_RISE);
- } else {
-     layer_off(_RISE);
-     if (last_mod == 9 && timer_elapsed(tap_timer) < TAPPING_TERM) {
-         tap_code16(KC_BACKSPACE);
-         last_mod = 10;
-     }
- }
- return false;
- break;
-
-    #+END_SRC
-
-**** One Shot Keys
-
-     Since I made modified tap keys occur on press instead of release, I need one
-     shot keys to press any key with more than one modifier.
-
-     #+BEGIN_SRC C :noweb yes
- case KC_EZSHFT:
- if (record->event.pressed) {
-     set_oneshot_mods(MOD_LSFT);
-     last_mod = 10;
- }
- return false;
- break;
- case KC_EZCTRL:
- if (record->event.pressed) {
-     set_oneshot_mods(MOD_LCTL);
-     last_mod = 10;
- }
- return false;
- break;
- case KC_EZALT:
- if (record->event.pressed) {
-     set_oneshot_mods(MOD_LALT);
-     last_mod = 10;
- }
- return false;
- break;
- case KC_EZGUI:
- if (record->event.pressed) {
-     set_oneshot_mods(MOD_LGUI);
-     last_mod = 10;
- }
- return false;
- break;
-
-     #+END_SRC
-
-**** C-S Arrows
-
-     I use ctrl+shift+arrows keys a lot, so when the layer key is pressed they became
-     lazy versions of themselves with control and shift already pressed.
-
-     I also added undo, copy, paste, and cut to be easily available with only the
-     left hand like on a qwerty or colemek keyboard.
-
-     #+BEGIN_SRC C :noweb yes
- case KC_EZRGHT:
- if (record->event.pressed) {
-     register_code(KC_LCTL);
-     tap_code16(S(KC_RGHT));
-     unregister_code(KC_LCTL);
-     last_mod = 10;
- }
- return false;
- break;
- case KC_EZLEFT:
- if (record->event.pressed) {
-     register_code(KC_LCTL);
-     tap_code16(S(KC_LEFT));
-     unregister_code(KC_LCTL);
-     last_mod = 10;
- }
- return false;
- break;
- case KC_EZDOWN:
- if (record->event.pressed) {
-     register_code(KC_LCTL);
-     tap_code16(S(KC_DOWN));
-     unregister_code(KC_LCTL);
-     last_mod = 10;
- }
- return false;
- break;
- case KC_EZUP:
- if (record->event.pressed) {
-     register_code(KC_LCTL);
-     tap_code16(S(KC_UP));
-     unregister_code(KC_LCTL);
-     last_mod = 10;
- }
- return false;
- break;
-     #+END_SRC
-
-**** Undo, Copy, Cut, Paste
-
-     #+BEGIN_SRC C :noweb yes
- case KC_EZUNDO:
- if (record->event.pressed) {
-     tap_code16(C(KC_Z));
-     last_mod = 10;
- }
- return false;
- break;
- case KC_EZCOPY:
- if (record->event.pressed) {
-     tap_code16(C(KC_C));
-     last_mod = 10;
- }
- return false;
- break;
- case KC_EZCUT:
- if (record->event.pressed) {
-     tap_code16(C(KC_X));
-     last_mod = 10;
- }
- return false;
- break;
- case KC_EZPSTE:
- if (record->event.pressed) {
-     tap_code16(C(KC_V));
-     last_mod = 10;
- }
- return false;
- break;
-     #+END_SRC
-
-*** Standard inputs interupt tap
-
-    Finally, if just a standard key is tapped, set the interupted flag.
-    Keep this last.
-
-    #+BEGIN_SRC C :noweb yes
- }
- last_mod = 10;
- return true;
- }
-    #+END_SRC
diff --git a/keyboards/planck/keymaps/samuel/config.h b/keyboards/planck/keymaps/samuel/config.h
deleted file mode 100644
index 95bfdd36fef..00000000000
--- a/keyboards/planck/keymaps/samuel/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define TAPPING_TERM 250
diff --git a/keyboards/planck/keymaps/samuel/keymap.c b/keyboards/planck/keymaps/samuel/keymap.c
deleted file mode 100644
index c6e4240916b..00000000000
--- a/keyboards/planck/keymaps/samuel/keymap.c
+++ /dev/null
@@ -1,315 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// where the 'T_' communicates how the key does something different when tapped.
-enum planck_keycodes {
-//DVORAK = SAFE_RANGE,
-KC_T_LALT = SAFE_RANGE,
-KC_T_RALT,
-KC_T_LGUI,
-KC_T_RGUI,
-KC_T_LCTL,
-KC_T_RCTL,
-KC_T_LSFT,
-KC_T_RSFT,
-KC_T_LRSE,
-KC_T_RRSE,
-KC_EZRGHT,
-KC_EZLEFT,
-KC_EZUP,
-KC_EZDOWN,
-KC_EZUNDO,
-KC_EZCOPY,
-KC_EZCUT,
-KC_EZPSTE,
-KC_EZSHFT,
-KC_EZCTRL,
-KC_EZGUI,
-KC_EZALT,
-KC_DVORAK,
-KC_QWERTY,
-KC_COM
-};
-
-enum planck_layers {
-_DVORAK,
-_QWERTY,
-_RISE,
-_COMMAND
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DVORAK] = LAYOUT_planck_grid(
-KC_T_LRSE, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_T_RRSE,
-KC_T_LSFT, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_T_RSFT,
-KC_T_LCTL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_T_RCTL,
-KC_T_LGUI, KC_T_LALT, KC_UP, KC_DOWN, KC_SPC, KC_EQL, KC_GRAVE, KC_SPC, KC_LEFT, KC_RIGHT, KC_T_RALT, KC_T_RGUI
-),
-[_QWERTY] = LAYOUT_planck_grid(
-KC_T_LRSE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_T_RRSE,
-KC_T_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_T_RSFT,
-KC_T_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_T_RCTL,
-KC_T_LGUI, KC_T_LALT, KC_UP, KC_DOWN, KC_SPC, KC_EQL, KC_GRAVE, KC_SPC, KC_LEFT, KC_RIGHT, KC_T_RALT, KC_DVORAK
-),
-[_RISE] = LAYOUT_planck_grid(
-KC_TRANSPARENT, KC_EZUNDO, KC_EZCOPY, KC_EZCUT, KC_EZPSTE, KC_INS, KC_ASTR, KC_7, KC_8, KC_9, KC_TRANSPARENT, KC_TRANSPARENT,
-KC_EZSHFT, KC_ESC, KC_CAPS, KC_PGUP, KC_PGDN, KC_HOME, KC_AMPR, KC_4, KC_5, KC_6, KC_0, KC_EZSHFT,
-KC_EZCTRL, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_1, KC_2, KC_3, KC_COM, KC_EZCTRL,
-KC_EZGUI, KC_EZALT, KC_EZUP, KC_EZDOWN, KC_SPC, KC_PIPE, KC_BSLS, KC_END, KC_EZLEFT, KC_EZRGHT, KC_EZALT, KC_EZGUI
-),
-[_COMMAND] = LAYOUT_planck_grid(
-KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRANSPARENT,
-KC_TRANSPARENT, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_TRANSPARENT,
-KC_TRANSPARENT, KC_F21, KC_F22, KC_F23, KC_F24, KC_QWERTY, KC_DVORAK, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
-)
-};
-
-static uint16_t tap_timer = 0;
-char last_mod = 10;
-
-void mod_press(uint16_t tap_code, uint16_t hold_code, int id) {
-    /* this first if body makes double modified keys impossible, but stops the */
-    /* delay when modifying a tap key which would result in the tap key not */
-    /* getting modified. */
-    if (last_mod != id && last_mod != 10) {
-        tap_code16(tap_code);
-        last_mod = 10;
-    } else {
-        tap_timer = timer_read();
-        last_mod = id;
-        register_code(hold_code);
-    }
-}
-
-void mod_lift(uint16_t tap_code, uint16_t hold_code, int id) {
-    unregister_code(hold_code);
-    if (last_mod == id && timer_elapsed(tap_timer) < TAPPING_TERM) {
-        tap_code16(tap_code);
-    }
-    last_mod = 10;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-
-case KC_DVORAK:
-if (record->event.pressed) {
-    set_single_persistent_default_layer(_DVORAK);
-}
-return true;
-break;
-
-case KC_QWERTY:
-if (record->event.pressed) {
-    set_single_persistent_default_layer(_QWERTY);
-}
-return true;
-break;
-
-case KC_COM:
-if (record->event.pressed) {
-    layer_on(_COMMAND);
-    set_oneshot_layer(_COMMAND, ONESHOT_START);
-    last_mod = 10;
-} else {
-    clear_oneshot_layer_state (ONESHOT_PRESSED);
-}
-return false;
-break;
-
-case KC_T_LALT:
-	if (record->event.pressed) {
-	   mod_press(KC_LPRN, KC_LALT, 0);
-	} else {
-	   mod_lift(KC_LPRN, KC_LALT, 0);
-	}
-	return false;
-	break;
-case KC_T_RALT:
-	if (record->event.pressed) {
-	   mod_press(KC_RPRN, KC_RALT, 1);
-	} else {
-	   mod_lift(KC_RPRN, KC_RALT, 1);
-	}
-	return false;
-	break;
-case KC_T_LGUI:
-	if (record->event.pressed) {
-	   mod_press(KC_SLASH, KC_LGUI, 2);
-	} else {
-	   mod_lift(KC_SLASH, KC_LGUI, 2);
-	}
-	return false;
-	break;
-case KC_T_RGUI:
-	if (record->event.pressed) {
-	   mod_press(KC_MINS, KC_RGUI, 3);
-	} else {
-	   mod_lift(KC_MINS, KC_RGUI, 3);
-	}
-	return false;
-	break;
-case KC_T_LCTL:
-	if (record->event.pressed) {
-	   mod_press(KC_LEFT_BRACKET, KC_LCTL, 4);
-	} else {
-	   mod_lift(KC_LEFT_BRACKET, KC_LCTL, 4);
-	}
-	return false;
-	break;
-case KC_T_RCTL:
-	if (record->event.pressed) {
-	   mod_press(KC_RIGHT_BRACKET, KC_RCTL, 5);
-	} else {
-	   mod_lift(KC_RIGHT_BRACKET, KC_RCTL, 5);
-	}
-	return false;
-	break;
-case KC_T_LSFT:
-	if (record->event.pressed) {
-	   mod_press(KC_TAB, KC_LSFT, 6);
-	} else {
-	   mod_lift(KC_TAB, KC_LSFT, 6);
-	}
-	return false;
-	break;
-case KC_T_RSFT:
-	if (record->event.pressed) {
-	   mod_press(KC_ENTER, KC_RSFT, 7);
-	} else {
-	   mod_lift(KC_ENTER, KC_RSFT, 7);
-	}
-	return false;
-	break;
-
-case KC_T_LRSE:
-if (record->event.pressed) {
-    tap_timer = timer_read();
-    last_mod = 8;
-    layer_on(_RISE);
-} else {
-    layer_off(_RISE);
-    if (last_mod == 8 && timer_elapsed(tap_timer) < TAPPING_TERM) {
-        tap_code16(KC_DELETE);
-        last_mod = 10;
-    }
-}
-return false;
-break;
-case KC_T_RRSE:
-if (record->event.pressed) {
-    tap_timer = timer_read();
-    last_mod = 9;
-    layer_on(_RISE);
-} else {
-    layer_off(_RISE);
-    if (last_mod == 9 && timer_elapsed(tap_timer) < TAPPING_TERM) {
-        tap_code16(KC_BACKSPACE);
-        last_mod = 10;
-    }
-}
-return false;
-break;
-
-case KC_EZSHFT:
-if (record->event.pressed) {
-    set_oneshot_mods(MOD_LSFT);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZCTRL:
-if (record->event.pressed) {
-    set_oneshot_mods(MOD_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZALT:
-if (record->event.pressed) {
-    set_oneshot_mods(MOD_LALT);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZGUI:
-if (record->event.pressed) {
-    set_oneshot_mods(MOD_LGUI);
-    last_mod = 10;
-}
-return false;
-break;
-
-case KC_EZRGHT:
-if (record->event.pressed) {
-    register_code(KC_LCTL);
-    tap_code16(S(KC_RGHT));
-    unregister_code(KC_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZLEFT:
-if (record->event.pressed) {
-    register_code(KC_LCTL);
-    tap_code16(S(KC_LEFT));
-    unregister_code(KC_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZDOWN:
-if (record->event.pressed) {
-    register_code(KC_LCTL);
-    tap_code16(S(KC_DOWN));
-    unregister_code(KC_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZUP:
-if (record->event.pressed) {
-    register_code(KC_LCTL);
-    tap_code16(S(KC_UP));
-    unregister_code(KC_LCTL);
-    last_mod = 10;
-}
-return false;
-break;
-
-case KC_EZUNDO:
-if (record->event.pressed) {
-    tap_code16(C(KC_Z));
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZCOPY:
-if (record->event.pressed) {
-    tap_code16(C(KC_C));
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZCUT:
-if (record->event.pressed) {
-    tap_code16(C(KC_X));
-    last_mod = 10;
-}
-return false;
-break;
-case KC_EZPSTE:
-if (record->event.pressed) {
-    tap_code16(C(KC_V));
-    last_mod = 10;
-}
-return false;
-break;
-
-}
-last_mod = 10;
-return true;
-}
diff --git a/keyboards/planck/keymaps/sascha/keymap.c b/keyboards/planck/keymaps/sascha/keymap.c
deleted file mode 100644
index aaa2c282153..00000000000
--- a/keyboards/planck/keymaps/sascha/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "backlight.h"
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_planck_grid(
-        /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-         * │ Esc  │   Q  │   W  │   E  │   R  │   T  │   Z  │   U  │   I  │   O  │   P  │ Bksp │
-         * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-         * │ Tab  │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │ ;  : │ Entr │
-         * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-         * │ Shft │   Y  │   X  │   C  │   V  │   B  │   N  │   M  │ ,  < │ .  > │ /  ? │ '  " │
-         * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-         * │ Ctrl │ Alt  │ `  ~ │ -  _ │ =  + │ Spce │ \  | │   (  │   )  │ [  { │ ]  } │ Lr 1 │
-         * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
-         */
-        KC_ESC  , KC_Q    , KC_W    , KC_E    , KC_R   , KC_T   , KC_Z    , 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_ENT,
-        KC_LSFT , KC_Y    , KC_X    , KC_C    , KC_V   , KC_B   , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_QUOT,
-        KC_LCTL , KC_LALT , KC_GRV  , KC_MINS , KC_EQL , KC_SPC , KC_BSLS , KC_LPRN , KC_RPRN , KC_LBRC , KC_RBRC , MO(1)
-    ),
-[1] = LAYOUT_planck_grid(
-        /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-         * │   ~  │   1  │   2  │   3  │   4  │   5  │   6  │   7  │   8  │   9  │   0  │ DEL  │
-         * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-         * │   `  │   !  │   @  │   #  │   $  │   %  │   ^  │   &  │   *  │   ü  │   ö  │   ä  │
-         * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-         * │ SINS │   …  │   ’  │   “  │   ”  │   ←  │   →  │   €  │   ß  │   Ü  │   Ö  │   Ä  │
-         * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-         * │ Rset │ BLSt │  F1  │ Home │ End  │ PgUp │ PgDn │ Left │ Down │  Up  │ Rght │      │
-         * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
-         */
-        KC_TILD   , KC_1     , KC_2     , KC_3     , KC_4     , KC_5      , KC_6     , KC_7     , KC_8     , KC_9     , KC_0     , KC_DEL,
-        KC_GRV    , KC_EXLM  , KC_AT    , KC_HASH  , KC_DLR   , KC_PERC   , KC_CIRC  , KC_AMPR  , KC_ASTR  , UC(L'ü') , UC(L'ö') , UC(L'ä'),
-        S(KC_INS) , UC(L'…') , UC(L'’') , UC(L'“') , UC(L'”') , UC(L'←')  , UC(L'→') , UC(L'€') , UC(L'ß') , UC(L'Ü') , UC(L'Ö') , UC(L'Ä'),
-        QK_BOOT     , BL_STEP  , KC_F1    , KC_HOME  , KC_END   , KC_PGUP   , KC_PGDN  , KC_LEFT  , KC_DOWN  , KC_UP    , KC_RGHT  , KC_TRNS
-    )
-};
-
-void matrix_init_user(void) {
-    set_unicode_input_mode(UNICODE_MODE_LINUX);
-};
diff --git a/keyboards/planck/keymaps/sascha/rules.mk b/keyboards/planck/keymaps/sascha/rules.mk
deleted file mode 100644
index 41157c39d77..00000000000
--- a/keyboards/planck/keymaps/sascha/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-AUTO_SHIFT_ENABLE = no
-UNICODE_ENABLE = yes
-LTO_ENABLE = yes
-
-ifeq ($(strip $(KEYBOARD)), planck/rev5)
-BACKLIGHT_ENABLE = yes
-CONSOLE_ENABLE = no
-endif
-ifeq ($(strip $(KEYBOARD)), planck/rev6)
-BACKLIGHT_ENABLE = no
-CONSOLE_ENABLE = yes
-EXTRALDFLAGS = -Wl,--build-id=none
-UNICODE_ENABLE = yes
-endif
diff --git a/keyboards/planck/keymaps/scottzach1/config.h b/keyboards/planck/keymaps/scottzach1/config.h
deleted file mode 100644
index 387eb45c974..00000000000
--- a/keyboards/planck/keymaps/scottzach1/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2022 Zac Scott (@scottzach1)
-// SPDX-License-Identifier: GPL-2.0
-
-#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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/scottzach1/keymap.c b/keyboards/planck/keymaps/scottzach1/keymap.c
deleted file mode 100755
index ea3cd134c0f..00000000000
--- a/keyboards/planck/keymaps/scottzach1/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2022 Zac Scott (@scottzach1)
-// SPDX-License-Identifier: GPL-2.0
-
-#include QMK_KEYBOARD_H
-
-enum planck_layers {
-    _COLEMAK,
-    _LOWER,
-    _RAISE,
-    _FUNCTION,
-    _DEBUG
-};
-
-#define xxxxxxx KC_NO
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define FUNCT MO(_FUNCTION)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak Mod-DH
- * ,-----------------------------------------------------------------------------------------------------------.
- * | Tab    |   Q    |   W    |   F    |   P    |   B    |   J    |   L    |   U    |   Y    |   ;    |  '     |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Func   |   A    |   R    |   S    |   T    |   G    |   M    |   N    |   E    |   I    |   O    | Enter  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Shift  |   Z    |   X    |   C    |   D    |   V    |   K    |   H    |   ,    |   .    |   /    |  \     |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Ctrl   |  GUI   |  Alt   | Shift  | Space  | Lower  | Raise  | Bkspc  | Shift  |   -    |   =    | Ctrl   |
- * `-----------------------------------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_QUOT,
-    FUNCT,   KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, KC_SPC,  LOWER,   RAISE,   KC_BSPC, KC_RSFT, KC_MINS, KC_EQL,  KC_RCTL
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------------------------------.
- * | Tab    |        |   {    |   }    |        |        |   `    |   7    |   8    |   9    |   0    |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Func   |        |   (    |   )    |        |        |   *    |   4    |   5    |   6    |   -    | Enter  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Shift  |        |   [    |   ]    |        |        |   /    |   1    |   2    |   3    |   +    |   =    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Ctrl   |  GUI   | Alt    | Shift  | Space  | Lower  | Func   | Bkspc  |   0    |   .    |   =    | Ctrl   |
- * `-----------------------------------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-    _______, xxxxxxx, KC_LCBR, KC_RCBR, xxxxxxx,  xxxxxxx, KC_GRV,  KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    _______, xxxxxxx, KC_LPRN, KC_RPRN, xxxxxxx,  xxxxxxx, KC_ASTR, KC_4,    KC_5,    KC_6,    KC_MINS, _______,
-    _______, xxxxxxx, KC_LBRC, KC_RBRC, xxxxxxx,  xxxxxxx, KC_SLSH, KC_1,    KC_2,    KC_3,    KC_PLUS, KC_EQL,
-    _______, _______, _______, _______, _______,  _______, FUNCT,   _______, KC_0,    KC_DOT,  _______,  _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------------------------------.
- * | Tab    |        |   {    |   }    |        |        |        | Pg_Up  |  Up    | Pg_Dn  |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Func   |        |   (    |   )    |        |        | Home   | Left   | Down   | Right  |  Del   | Ent er |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Shift  |        |   [    |   ]    |        |        |        |  End   |  Ins   | Caps   |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Ctrl   |  GUI   | Alt    | Shift  | Space  | Func   | Raise  | Bkspc  |        |        |        | Ctr l  |
- * `-----------------------------------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-    _______, xxxxxxx,  KC_LCBR, KC_RCBR, xxxxxxx,  xxxxxxx, xxxxxxx, KC_PGUP, KC_UP,   KC_PGDN, _______, _______,
-    _______, xxxxxxx,  KC_LPRN, KC_RPRN, xxxxxxx,  xxxxxxx, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______,
-    _______, xxxxxxx,  KC_LBRC, KC_RBRC, xxxxxxx,  xxxxxxx, KC_SLSH, KC_END,  KC_INS,  KC_CAPS, xxxxxxx, xxxxxxx,
-    _______, _______,  _______, _______, _______,  FUNCT,   _______, _______, _______, _______, _______, _______
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------------------------------.
- * |  Esc   |        | Prev   | Play   | Next   |        |        |  F7    |  F8    |  F9    | F10    |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        | Vol-   | Vol+   | Mute   |        |        |  F4    |  F5    |  F6    | F11    |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |  F1    |  F2    |  F3    | F12    |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        | Funct  | Funct  |        |        |        |        |        |
- * `-----------------------------------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT_ortho_4x12(
-    KC_ESC,  xxxxxxx, KC_MPRV, KC_MPLY, KC_MNXT, xxxxxxx, xxxxxxx, KC_F7,   KC_F8,   KC_F9,   KC_F10,  xxxxxxx,
-    _______, xxxxxxx, KC_VOLD, KC_VOLU, KC_MUTE, xxxxxxx, xxxxxxx, KC_F4,   KC_F5,   KC_F6,   KC_F11,  _______,
-    _______, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, KC_F1,   KC_F2,   KC_F3,   KC_F12,  _______,
-    _______, _______, _______, _______, _______, DB_TOGG, DB_TOGG, _______, _______, _______, _______, _______
-),
-
-/* Debug
- * ,-----------------------------------------------------------------------------------------------------------.
- * | Reset  | Debug  |        |        |        |        |        |        |        |        |        |  EEP   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * `-----------------------------------------------------------------------------------------------------------'
- */
-[_DEBUG] = LAYOUT_ortho_4x12(
-    QK_BOOT, DB_TOGG, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, EE_CLR,
-    xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
-    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/planck/keymaps/scottzach1/readme.md b/keyboards/planck/keymaps/scottzach1/readme.md
deleted file mode 100644
index 76a337f6d1f..00000000000
--- a/keyboards/planck/keymaps/scottzach1/readme.md
+++ /dev/null
@@ -1,76 +0,0 @@
-![Personal Planck Rev6](https://github.com/scottzach1/Planck/blob/master/img/img_05.jpg)
-
-# Scottzach1 Planck Layout
-
-Upstream: [scottzach1/planck](https://github.com/scottzach1/Planck)
-
-This keyboard layout implements a personal variation of Colemak Mod-DH with M-K switched.
-One notable change with this layout is space + backspace in line with the homing keys.
-As such, Lower and Raise have been moved to occupy the middle two keys.
-
-I have been using this layout happily daily now since June 2019. 
-
-``` 
- Colemak Mod-DH
-,-----------------------------------------------------------------------------------------------.
-| Tab   |   Q   |   W   |   F   |   P   |   B   |   J   |   L   |   U   |   Y   |   ;   |  '    |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-| Func  |   A   |   R   |   S   |   T   |   G   |   M   |   N   |   E   |   I   |   O   | Enter |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-| Shift |   Z   |   X   |   C   |   D   |   V   |   K   |   H   |   ,   |   .   |   /   |  \    |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-| Ctrl  |  GUI  |  Alt  | Shift | Space | Lower | Raise | Bkspc | Shift |   -   |   =   | Ctrl  |
-`-----------------------------------------------------------------------------------------------'
-```
-
-```
- Lower
-,-----------------------------------------------------------------------------------------------.
-| Tab   |       |   {   |   }   |       |       |   `   |   7  |   8   |   9   |   0    |       |
-|-------+-------+-------+-------+-------+-------+-------+------+-------+-------+--------+-------|
-| Func  |       |   (   |   )   |       |       |   *   |   4  |   5   |   6   |   -    | Enter |
-|-------+-------+-------+-------+-------+-------+-------+------+-------+-------+--------+-------|
-| Shift |       |   [   |   ]   |       |       |   /   |   1  |   2   |   3   |   +    |   =   |
-|-------+-------+-------+-------+-------+-------+-------+------+-------+-------+--------+-------|
-| Ctrl  |  GUI  | Alt   | Shift | Space | Lower | Func  | Bksp |   0   |   .   |   =    | Ctrl  |
-`-----------------------------------------------------------------------------------------------'
-```
-
-```
- Raise
-,-----------------------------------------------------------------------------------------------.
-| Tab   |       |   {   |   }   |       |       |       | Pg_Up |  Up   | Pg_Dn |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-| Func  |       |   (   |   )   |       |       | Home  | Left  | Down  | Right |  Del  | Enter |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-| Shift |       |   [   |   ]   |       |       |       |  End  |  Ins  | Caps  |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-| Ctrl  |  GUI  | Alt   | Shift | Space | Func  | Raise | Bkspc |       |       |       | Ctrl  |
-`-----------------------------------------------------------------------------------------------'
-```
-
-```
- Function
-,-----------------------------------------------------------------------------------------------.
-|  Esc  |       | Prev  | Play  | Next  |       |       |  F7   |  F8   |  F9   | F10   |       |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-|       |       | Vol-  | Vol+  | Mute  |       |       |  F4   |  F5   |  F6   | F11   |       |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |       |       |  F1   |  F2   |  F3   | F12   |       |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       | Funct | Funct |       |       |       |       |       |
-`-----------------------------------------------------------------------------------------------'
-```
-
-```
- Debug
-,-----------------------------------------------------------------------------------------------.
-| Reset | Debug |       |       |       |       |       |       |       |       |       |  EEP  |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |       |       |       |       |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |       |       |       |       |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |       |       |       |       |       |       |       |
-`-----------------------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/sdothum/beakl.h b/keyboards/planck/keymaps/sdothum/beakl.h
deleted file mode 100644
index 999f0aac95a..00000000000
--- a/keyboards/planck/keymaps/sdothum/beakl.h
+++ /dev/null
@@ -1,551 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .................................................................... BEAKL EZ
-#ifdef BEAKLEZ
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   K  | ^Alt | ^GUI |   F  |   G  |   R  |   C  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   "  | ↑Alt | ↑GUI |   L  |   S  |   T  |   N  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   ;  |   ,  |   J  |   .  |   X  | Caps |^Shift|   B  |   D  |   M  |   P  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_K,    CNTR_TL, CNTR_TR, KC_F,    KC_G,    KC_R,    KC_C,    KC_V   ,
-    KC_H,    KC_I,    KC_E,    HOME_A,  TD_QUOT, CNTR_HL, CNTR_HR, KC_L,    KC_S,    KC_T,    KC_N,    KC_W   ,
-    KC_SCLN, KC_COMM, KC_J,    KC_DOT,  KC_X,    CNTR_BL, CNTR_BR, KC_B,    KC_D,    KC_M,    KC_P,    KC_Z   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_K), CNTR_TL, CNTR_TR, S(KC_F), S(KC_G), S(KC_R), S(KC_C), S(KC_V),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), TD_QUOT, CNTR_HL, CNTR_HR, S(KC_L), S(KC_S), S(KC_T), S(KC_N), S(KC_W),
-    KC_SCLN, KC_COMM, S(KC_J), KC_DOT,  S(KC_X), CNTR_BL, CNTR_BR, S(KC_B), S(KC_D), S(KC_M), S(KC_P), S(KC_Z),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   K  | ^Alt | ^GUI |   F  |   G  |   R  |   C  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   "  | ↑Alt | ↑GUI |   L  |   S  |   T  |   N  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   :  |   ~  |   J  |   `  |   X  | Caps |^Shift|   B  |   D  |   M  |   P  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_K), CNTR_TL, CNTR_TR, S(KC_F), S(KC_G), S(KC_R), S(KC_C), S(KC_V),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), TD_DQOT, CNTR_HL, CNTR_HR, S(KC_L), S(KC_S), S(KC_T), S(KC_N), S(KC_W),
-    TD_COLN, TD_TILD, S(KC_J), TD_GRV,  S(KC_X), CNTR_BL, CNTR_BR, S(KC_B), S(KC_D), S(KC_M), S(KC_P), S(KC_Z),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   K  | ^Alt | ^GUI |   F  |   G  |   R  |   C  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   H  |   I  |   E  |   A  |   "  | ↑Alt | ↑GUI |   L  |   S  |   T  |   N  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   :  |   /  |   J  |   ?  |   X  | Caps |^Shift|   B  |   D  |   M  |   P  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_K), CNTR_TL, CNTR_TR, S(KC_F), S(KC_G), S(KC_R), S(KC_C), S(KC_V),
-    S(KC_H), S(KC_I), S(KC_E), S(KC_A), TD_DQOT, CNTR_HL, CNTR_HR, S(KC_L), S(KC_S), S(KC_T), S(KC_N), S(KC_W),
-    TD_COLN, KC_SLSH, S(KC_J), KC_QUES, S(KC_X), CNTR_BL, CNTR_BR, S(KC_B), S(KC_D), S(KC_M), S(KC_P), S(KC_Z),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ..................................................................... BEAKL 8
-#ifdef BEAKL8
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   C  |   R  |   F  |   Z  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  | ↑Alt | ↑GUI |   D  |   S  |   T  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_X,    CNTR_TL, CNTR_TR, KC_G,    KC_C,    KC_R,    KC_F,    KC_Z   ,
-    KC_K,    KC_H,    KC_E,    HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_D,    KC_S,    KC_T,    KC_N,    KC_B   ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_W,    KC_M,    KC_L,    KC_P,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_C), S(KC_R), S(KC_F), S(KC_Z),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_D), S(KC_S), S(KC_T), S(KC_N), S(KC_B),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   C  |   R  |   F  |   Z  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ~  | ↑Alt | ↑GUI |   D  |   S  |   T  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   `  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_C), S(KC_R), S(KC_F), S(KC_Z),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), TD_TILD, CNTR_HL, CNTR_HR, S(KC_D), S(KC_S), S(KC_T), S(KC_N), S(KC_B),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), TD_GRV,  CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT ,
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   C  |   R  |   F  |   Z  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   D  |   S  |   T  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_C), S(KC_R), S(KC_F), S(KC_Z),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_D), S(KC_S), S(KC_T), S(KC_N), S(KC_B),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// .................................................................... BEAKL 8P
-#ifdef BEAKL8P
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | ^Alt | ^GUI |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  | ↑Alt | ↑GUI |   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_R,    KC_F,    KC_X   ,
-    KC_K,    KC_H,    KC_E,    HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    KC_T,    KC_S,    KC_N,    KC_B   ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_W,    KC_M,    KC_L,    KC_P,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ,
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ,
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   {  |   }  |   $  | ^Alt | ^GUI |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   <  |   >  |   ~  | ↑Alt | ↑GUI |   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), KC_LCBR, KC_RCBR, KC_DLR,  CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_J), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | ^Alt | ^GUI |   ^  |   [  |   ]  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   |  |   (  |   )  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  | Caps |^Shift|   \  |   $  |   *  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, KC_CIRC, KC_LBRC, KC_RBRC, S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, S(KC_N), S(KC_B),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_DLR,  KC_ASTR, S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ................................................................... BEAKL 8TX
-#ifdef BEAKL8TX
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   J  | ^Alt | ^GUI |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  | ↑Alt | ↑GUI |   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   ;  |   "  |   I  |   ,  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_J,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_R,    KC_F,    KC_X   ,
-    HOME_K,  HOME_H,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_S,  HOME_N,  HOME_B ,
-    KC_Z,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_W,    KC_M,    KC_L,    KC_P,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_Z), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   $  |   {  |   }  |   J  | ^Alt | ^GUI |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   /  |   <  |   >  |   ~  | ↑Alt | ↑GUI |   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   :  |   !  |   =  |   `  | Caps |^Shift|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), KC_DLR,  KC_LCBR, KC_RCBR, S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), KC_SLSH, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   J  | ^Alt | ^GUI |   G  |   [  |   ]  |   ^  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   |  |   (  |   )  |   $  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   :  |   "  |   I  |   /  | Caps |^Shift|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), KC_LBRC, KC_RBRC, KC_CIRC, S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  S(KC_B),
-    S(KC_Z), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ................................................................... BEAKL 8TT
-#ifdef BEAKL8TT
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   J  |   Fn | Caps |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  |Cursor| Mouse|   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   ;  |   "  |   I  |   ,  |  Num | Regex|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_J,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_R,    KC_F,    KC_X   ,
-    HOME_K,  HOME_H,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_S,  HOME_N,  HOME_B ,
-    KC_Z,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_W,    KC_M,    KC_L,    KC_P,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_Z), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   $  |   {  |   }  |   J  |   Fn | Caps |   G  |   D  |   R  |   F  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   /  |   <  |   >  |   ~  |Cursor| Mouse|   C  |   T  |   S  |   N  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   :  |   !  |   =  |   `  |  Num | Regex|   W  |   M  |   L  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), KC_DLR,  KC_LCBR, KC_RCBR, S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_R), S(KC_F), S(KC_X),
-    S(KC_K), KC_SLSH, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_S), S(KC_N), S(KC_B),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_W), S(KC_M), S(KC_L), S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   J  |   Fn | Caps |   G  |   [  |   ]  |   ^  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  |Cursor| Mouse|   |  |   (  |   )  |   $  |   B  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   :  |   "  |   I  |   /  |  Num | Regex|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_J), CNTR_TL, CNTR_TR, S(KC_G), KC_LBRC, KC_RBRC, KC_CIRC, S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  S(KC_B),
-    S(KC_Z), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// .................................................................... BEAKL 10
-#ifdef BEAKL10
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   H  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   D  |   N  |   M  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   Y  |   I  |   E  |   A  |   .  | ↑Alt | ↑GUI |   C  |   S  |   R  |   T  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   ,  |   Z  | Caps |^Shift|   B  |   P  |   L  |   F  |   K  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_H,    KC_O,    KC_U,    KC_X,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_V   ,
-    KC_Y,    KC_I,    KC_E,    HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    KC_S,    KC_R,    KC_T,    KC_W   ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_COMM, KC_Z,    CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_K   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_H), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_V),
-    S(KC_Y), S(KC_I), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_S), S(KC_R), S(KC_T), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, KC_COMM, S(KC_Z), CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_K),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   [  |   !  |   ]  |   X  | ^Alt | ^GUI |   G  |   D  |   N  |   M  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   Y  |   <  |   =  |   >  |   ~  | ↑Alt | ↑GUI |   C  |   S  |   R  |   T  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   `  |   Z  | Caps |^Shift|   B  |   P  |   L  |   F  |   K  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), TD_LBRC, KC_EXLM, TD_RBRC, S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_V),
-    S(KC_Y), TD_LT,   KC_EQL,  TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_S), S(KC_R), S(KC_T), S(KC_W),
-    S(KC_J), KC_COLN, TD_DQOT, TD_GRV,  S(KC_Z), CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_K),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   H  |   O  |   U  |   X  | ^Alt | ^GUI |   G  |   {  |   +  |   }  |   V  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   Y  |   I  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   C  |   (  |   *  |   )  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   /  |   Z  | Caps |^Shift|   B  |   P  |   L  |   F  |   K  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_H), S(KC_O), S(KC_U), S(KC_X), CNTR_TL, CNTR_TR, S(KC_G), TD_LCBR, KC_PLUS, TD_RCBR, S(KC_V),
-    S(KC_Y), S(KC_I), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, S(KC_C), TD_LPRN, KC_ASTR, TD_RPRN, S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, KC_SLSH, S(KC_Z), CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_K),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ............................................................... BEAKL Mash Up
-#ifdef BEAKL810
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | ^Alt | ^GUI |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  | ↑Alt | ↑GUI |   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  | Caps |^Shift|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_X   ,
-    KC_K,    KC_H,    KC_E,    HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    KC_T,    KC_R,    KC_S,    KC_W   ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   {  |   }  |   $  | ^Alt | ^GUI |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   <  |   >  |   ~  | ↑Alt | ↑GUI |   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  | Caps |^Shift|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), KC_LCBR, KC_RCBR, KC_DLR,  CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | ^Alt | ^GUI |   ^  |   [  |   ]  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  | ↑Alt | ↑GUI |   |  |   (  |   )  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  | Caps |^Shift|   \  |   $  |   *  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, KC_CIRC, KC_LBRC, KC_RBRC, S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, S(KC_S), S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_DLR,  KC_ASTR, S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// .................................................................... BEAKL MU
-#ifdef BEAKLMU
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  |  Fn  | Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_X   ,
-    HOME_K,  HOME_H,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_R,  HOME_S,  HOME_W ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   $  |   {  |   }  |   Z  |  Fn  | Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   /  |   <  |   >  |   ~  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   _  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), KC_DLR,  KC_LCBR, KC_RCBR, S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), KC_SLSH, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_UNDS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  |  Fn  | Caps |   G  |   [  |   ]  |   ^  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  |Cursor| Mouse|   |  |   (  |   )  |   $  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  |  Num | Regex|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   -  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), KC_LBRC, KC_RBRC, KC_CIRC, S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_MINS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// .................................................................... BEAKL SP
-#ifdef BEAKLSP
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   .  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   ;  |   "  |   I  |   ,  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Ins | Left |  Ent | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_Y,    KC_O,    KC_U,    KC_Z,    CNTR_TL, CNTR_TR, KC_G,    KC_D,    KC_N,    KC_M,    KC_X   ,
-    HOME_K,  HOME_H,  HOME_E,  HOME_A,  KC_DOT,  CNTR_HL, CNTR_HR, KC_C,    HOME_T,  HOME_R,  HOME_S,  HOME_W ,
-    KC_J,    KC_SCLN, TD_QUOT, KC_I,    KC_COMM, CNTR_BL, CNTR_BR, KC_B,    KC_P,    KC_L,    KC_F,    KC_V   ,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_DOT,  CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_J), KC_SCLN, TD_QUOT, S(KC_I), KC_COMM, CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_INS,  SP_LEFT, TD_ENT,  SP_BSPC, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   [  |   ]  |   Z  | Shift| Caps |   G  |   D  |   N  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   ^  |   <  |   >  |   ~  |Cursor| Mouse|   C  |   T  |   R  |   S  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   !  |   =  |   `  |  Num | Regex|   B  |   P  |   L  |   F  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | ↑Tab |  f() |  Ins | Left |   _  |  Del | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), KC_LBRC, KC_RBRC, S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), S(KC_D), S(KC_N), S(KC_M), S(KC_X),
-    S(KC_K), KC_CIRC, TD_LT,   TD_GT,   TD_TILD, CNTR_HL, CNTR_HR, S(KC_C), S(KC_T), S(KC_R), S(KC_S), S(KC_W),
-    S(KC_Z), KC_COLN, KC_EXLM, KC_EQL,  TD_GRV,  CNTR_BL, CNTR_BR, S(KC_B), S(KC_P), S(KC_L), S(KC_F), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  S_TAB,   ___fn__, LT_INS,  S_LEFT,  KC_UNDS, SP_DEL,  S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   Y  |   O  |   U  |   Z  | Shift| Caps |   G  |   {  |   }  |   M  |   X  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   K  |   H  |   E  |   A  |   ?  |Cursor| Mouse|   |  |   (  |   )  |   $  |   W  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   J  |   :  |   "  |   I  |   /  |  Num | Regex|   \  |   *  |   .  |   P  |   V  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Tab |   -  |  Ins | Left |  f() | Bksp | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_Y), S(KC_O), S(KC_U), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_G), KC_LCBR, KC_RCBR, S(KC_M), S(KC_X),
-    S(KC_K), S(KC_H), S(KC_E), S(KC_A), KC_QUES, CNTR_HL, CNTR_HR, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  S(KC_W),
-    S(KC_J), TD_COLN, TD_DQOT, S(KC_I), KC_SLSH, CNTR_BL, CNTR_BR, KC_BSLS, KC_ASTR, KC_DOT,  S(KC_P), S(KC_V),
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_TAB,  KC_MINS, LT_INS,  S_LEFT,  ___fn__, SP_BSPC, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
diff --git a/keyboards/planck/keymaps/sdothum/colemak.h b/keyboards/planck/keymaps/sdothum/colemak.h
deleted file mode 100644
index 3d8f0d4863d..00000000000
--- a/keyboards/planck/keymaps/sdothum/colemak.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .............................................................. Colemak Mod-DH
-#ifdef COLEMAK
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   F  |   P  |   B  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   ;  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   G  | ↑Alt | ↑GUI |   M  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   D  |   V  | Caps |^Shift|   K  |   H  |   ,  |   .  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    CNTR_TL, CNTR_TR, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    CNTR_HL, CNTR_HR, KC_M,    KC_N,    KC_E,    KC_I,    KC_O   ,
-    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    CNTR_BL, CNTR_BR, KC_K,    KC_H,    KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_B), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_SCLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_G), CNTR_HL, CNTR_HR, S(KC_M), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_D), S(KC_V), CNTR_BL, CNTR_BR, S(KC_K), S(KC_H), KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   F  |   P  |   B  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   :  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   G  | ↑Alt | ↑GUI |   M  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   D  |   V  | Caps |^Shift|   K  |   H  |   /  |   ?  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   -  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_B), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), TD_COLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_G), CNTR_HL, CNTR_HR, S(KC_M), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_D), S(KC_V), CNTR_BL, CNTR_BR, S(KC_K), S(KC_H), KC_SLSH, KC_QUES, TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_MINS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   F  |   P  |   B  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   :  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   G  | ↑Alt | ↑GUI |   M  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   D  |   V  | Caps |^Shift|   K  |   H  |   ~  |   `  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   _  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_B), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), TD_COLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_G), CNTR_HL, CNTR_HR, S(KC_M), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_D), S(KC_V), CNTR_BL, CNTR_BR, S(KC_K), S(KC_H), TD_TILD, TD_GRV,  TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_UNDS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
-// ..................................................................... ColemaX
-#ifdef COLEMAX
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   C  |   G  |   Z  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   ;  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   B  | ↑Alt | ↑GUI |   K  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   X  |   V  |   F  |   D  |   P  | Caps |^Shift|   M  |   H  |   ,  |   .  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_W,    KC_C,    KC_G,    KC_Z,    CNTR_TL, CNTR_TR, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-    KC_A,    KC_R,    KC_S,    KC_T,    KC_B,    CNTR_HL, CNTR_HR, KC_K,    KC_N,    KC_E,    KC_I,    KC_O   ,
-    KC_X,    KC_V,    KC_F,    KC_D,    KC_P,    CNTR_BL, CNTR_BR, KC_M,    KC_H,    KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_C), S(KC_G), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_SCLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_B), CNTR_HL, CNTR_HR, S(KC_K), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_X), S(KC_V), S(KC_F), S(KC_D), S(KC_P), CNTR_BL, CNTR_BR, S(KC_M), S(KC_H), KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   C  |   G  |   Z  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   :  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   B  | ↑Alt | ↑GUI |   K  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   X  |   V  |   F  |   D  |   P  | Caps |^Shift|   M  |   H  |   /  |   ?  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   -  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_C), S(KC_G), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), TD_COLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_B), CNTR_HL, CNTR_HR, S(KC_K), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_X), S(KC_V), S(KC_F), S(KC_D), S(KC_P), CNTR_BL, CNTR_BR, S(KC_M), S(KC_H), KC_SLSH, KC_QUES, TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_MINS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   C  |   G  |   Z  | ^Alt | ^GUI |   J  |   L  |   U  |   Y  |   :  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   R  |   S  |   T  |   B  | ↑Alt | ↑GUI |   K  |   N  |   E  |   I  |   O  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   X  |   V  |   F  |   D  |   P  | Caps |^Shift|   M  |   H  |   ~  |   `  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   _  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_C), S(KC_G), S(KC_Z), CNTR_TL, CNTR_TR, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), TD_COLN,
-    S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_B), CNTR_HL, CNTR_HR, S(KC_K), S(KC_N), S(KC_E), S(KC_I), S(KC_O),
-    S(KC_X), S(KC_V), S(KC_F), S(KC_D), S(KC_P), CNTR_BL, CNTR_BR, S(KC_M), S(KC_H), TD_TILD, TD_GRV,  TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_UNDS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
diff --git a/keyboards/planck/keymaps/sdothum/common/chord_layout.h b/keyboards/planck/keymaps/sdothum/common/chord_layout.h
deleted file mode 100644
index cb1b7f67855..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/chord_layout.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// .................................................................. Short Cuts
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      | Copy | Paste|      |      |      |      |      |      |      |      |
-  // |--------------------------------------------------------------+------+------+------|
-  // | Undo |  Cut | Copy | Paste|      |      |      |      | PRIV |  PUB |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |  Nak |  Eot |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |  f() |      |      |      |      |      |
-  // |      |      |      |      |      |      |      |  f() |      |      |      |      | see _PLOVER
-  // '-----------------------------------------------------------------------------------'
-
-  [_EDIT] = LAYOUT_planck_grid(
-    _______, _______, TMCOPY,  TMPASTE, _______, _______, _______, _______, _______, _______, _______, _______,
-    UNDO,    CUT,     COPY,    PASTE,   _______, _______, _______, _______, TD_PRIV, TD_SEND, _______, _______,
-    _______, _______, NAK,     EOT,     _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, ___fn__, ___fn__, _______, _______, _______, _______
-  ),
-
-// ................................................................ Adjust Layer
-
-  // ,-----------------------------------------------------------------------------------.
-  // |Plover|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |Aud on|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Reset|      |      |      |      |      |      |      |      |      |      |      |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |      |      |      |  f() |      |      |      |      |  f() |      |      |      |
-  // `-----------------------------------------------------------------------------------'
-
-  [_ADJUST] = LAYOUT_planck_grid(
-    PLOVER,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    AU_ON,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, ___fn__, _______, _______, _______, _______, ___fn__, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/sdothum/common/init.h b/keyboards/planck/keymaps/sdothum/common/init.h
deleted file mode 100644
index e6bb7101e92..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/init.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// ....................................................................... Audio
-
-void matrix_init_user(void)
-{
-#ifdef STENO_ENABLE
-  steno_set_mode(STENO_MODE_BOLT);          // or STENO_MODE_GEMINI
-#endif
-}
-
-#ifdef AUDIO_ENABLE
-#ifdef BACKLIGHT_ENABLE
-bool led_update_user(led_t led_state)
-{
-  static led_t old_led_state = {0};
-  _delay_ms(10);                            // gets rid of tick
-  if (!is_playing_notes()) {
-    if (led_state.caps_lock && !old_led_state.caps_lock) {
-      // if capslock LED is turning on
-      PLAY_SONG(song_caps_on);
-    }
-    else if (!led_state.caps_lock && old_led_state.caps_lock) {
-      // if capslock LED is turning off
-      PLAY_SONG(song_caps_off);
-    }
-  }
-  old_led_state = led_state;
-  return false;
-}
-#endif
-#endif
diff --git a/keyboards/planck/keymaps/sdothum/common/keycode_functions.h b/keyboards/planck/keymaps/sdothum/common/keycode_functions.h
deleted file mode 100644
index 86d2645b4c5..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/keycode_functions.h
+++ /dev/null
@@ -1,656 +0,0 @@
-
-// .......................................................... Keycode Primitives
-
-// register simple key press
-void tap_key(uint16_t keycode)
-{
-  register_code  (keycode);
-  unregister_code(keycode);
-}
-
-void shift_key(uint16_t keycode)
-{
-  register_code  (KC_LSFT);
-  tap_key        (keycode);
-  unregister_code(KC_LSFT);
-}
-
-#define SHIFT   1
-#define NOSHIFT 0
-
-static uint16_t key_timer = 0;
-
-// key press for thumb_layer() and lt_shift() macros
-bool key_press(uint8_t shift, uint16_t keycode)
-{
-  if (keycode) {
-    if (timer_elapsed(key_timer) < TAPPING_TERM) {
-      if (shift) {
-        shift_key(keycode);
-      }
-      else {
-        tap_key(keycode);
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-// ALT_T, CTL_T, GUI_T, SFT_T for shifted keycodes
-void mt_shift(keyrecord_t *record, uint16_t modifier, uint16_t modifier2, uint16_t keycode)
-{
-  if (record->event.pressed) {
-    key_timer = timer_read();
-    register_code(modifier);
-    if (modifier2) {
-      register_code(modifier2);
-    }
-  }
-  else {
-    unregister_code(modifier);
-    if (modifier2) {
-      unregister_code(modifier2);
-    }
-    if (timer_elapsed(key_timer) < TAPPING_TERM) {
-      shift_key(keycode);
-    }
-    key_timer = 0;
-  }
-}
-
-// ................................................................... Mod Masks
-
-// tap dance persistant mods, see process_record_user()
-// keyboard_report->mods (?) appears to be cleared by tap dance
-static uint8_t mods = 0;
-
-void tap_mods(keyrecord_t *record, uint16_t keycode)
-{
-  if (record->event.pressed) {
-    mods |= MOD_BIT(keycode);
-  }
-  else {
-    mods &= ~(MOD_BIT(keycode));
-  }
-}
-
-// (un)register modifiers
-void modifier(void (*f)(uint8_t))
-{
-  if (mods & MOD_BIT(KC_LCTL)) {
-    (*f)(KC_LCTL);
-  }
-  if (mods & MOD_BIT(KC_LGUI)) {
-    (*f)(KC_LGUI);
-  }
-  if (mods & MOD_BIT(KC_LALT)) {
-    (*f)(KC_LALT);
-  }
-}
-
-// .................................................... Triple Dance Shift/Layer
-
-static uint8_t dt_shift = 0;
-
-void double_shift(uint16_t keycode, uint8_t layer)
-{
-  tap_key (keycode);
-  if (DT_SHIFT) {
-    // set_oneshot_mods(MOD_LSFT);
-    // layer_on(layer);
-    layer_on         (_SHIFT);
-    set_oneshot_layer(_SHIFT, ONESHOT_START);
-    dt_shift = 1;
-  }
-  else {
-    layer_on(layer);
-  }
-}
-
-// tap dance LT (LAYER, KEY) emulation with <KEY><DOWN> -> <KEY><SHIFT> and auto-repeat extensions!
-void tap_shift(tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
-{
-  // double tap plus down
-  if (state->count > 2) {
-    // double enter shift
-    if (keycode == KC_ENT) {
-      tap_key     (keycode);
-      double_shift(keycode, layer);
-    }
-    // repeating keycode
-    else {
-      register_code(keycode);
-    }
-  }
-  // tap plus down (or double tap): keycode (one shot) shift
-  else if (state->count > 1) {
-    double_shift(keycode, layer);
-  }
-  // down: shift
-  else if (state->pressed) {
-    layer_on(layer);
-  }
-  // tap: keycode
-  else {
-    modifier(register_code);
-    tap_key (keycode);
-    modifier(unregister_code);
-  }
-}
-
-void tap_reset(uint16_t keycode, uint8_t layer)
-{
-  unregister_code(keycode);
-  if (DT_SHIFT && dt_shift) {
-    clear_oneshot_layer_state(ONESHOT_PRESSED);
-    dt_shift = 0;
-  }
-  else {
-    layer_off(layer);
-  }
-}
-
-// augment pseudo LT (_RSHIFT, KC_ENT) handling below for rapid <ENTER><SHIFT> sequences
-void enter(tap_dance_state_t *state, void *user_data)
-{
-  tap_shift(state, KC_ENT, _RSHIFT);
-}
-
-void enter_reset(tap_dance_state_t *state, void *user_data)
-{
-  tap_reset(KC_ENT, _RSHIFT);
-}
-
-// augment pseudo LT (_LSHIFT, KC_SPC) handling below for rapid <SPACE><SHIFT> sequences
-void space(tap_dance_state_t *state, void *user_data)
-{
-  tap_shift(state, KC_SPC, _LSHIFT);
-}
-
-void space_reset(tap_dance_state_t *state, void *user_data)
-{
-  tap_reset(KC_SPC, _LSHIFT);
-}
-
-// ......................................................... Triple Dance Insert
-
-void double_max(uint8_t count, uint8_t shift, uint16_t keycode)
-{
-  if (shift) {
-    shift_key(keycode);
-    if (count > 1) {
-      shift_key(keycode);
-    }
-  }
-  else {
-    tap_key(keycode);
-    if (count > 1) {
-      tap_key(keycode);
-    }
-  }
-}
-
-void colon(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    shift_key(KC_SCLN);
-    shift_key(KC_SCLN);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_SCLN);
-  }
-  reset_tap_dance(state);
-}
-
-void eql(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key(KC_SPC);
-    tap_key(KC_SLSH);
-    tap_key(KC_EQL);
-    tap_key(KC_SPC);
-  }
-  else {
-    double_max(state->count, NOSHIFT, KC_EQL);
-  }
-  reset_tap_dance(state);
-}
-
-void greater(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    tap_key  (KC_MINS);
-    shift_key(KC_DOT);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_DOT);
-  }
-  reset_tap_dance(state);
-}
-
-void lesser(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 2) {
-    tap_key  (KC_SPC);
-    shift_key(KC_COMM);
-    tap_key  (KC_MINS);
-    tap_key  (KC_SPC);
-  }
-  else {
-    double_max(state->count, SHIFT, KC_COMM);
-  }
-  reset_tap_dance(state);
-}
-
-void tilde(tap_dance_state_t *state, void *user_data)
-{
-  // double tap plus down: repeating keycode
-  if (state->count > 2) {
-    register_code(KC_LSFT);
-    register_code(KC_GRV);
-  }
-  // tap: keycode
-  else {
-    shift_key(KC_GRV);
-    // double tap: unix home directory
-    if (state->count > 1) {
-      tap_key(KC_SLSH);
-    }
-  }
-}
-
-void tilde_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_GRV);
-  unregister_code(KC_LSFT);
-}
-
-// ............................................................. Tap Dance Pairs
-
-// tap dance shift rules
-#define S_NEVER  0
-#define S_SINGLE 1
-#define S_DOUBLE 2
-#define S_ALWAYS S_SINGLE | S_DOUBLE
-
-void symbol_pair(uint8_t shift, uint16_t left, uint16_t right)
-{
-  if (shift & S_DOUBLE) {
-    shift_key(left);
-    shift_key(right);
-  }
-  else {
-    tap_key(left);
-    tap_key(right);
-  }
-}
-
-#define CLOSE 1
-
-// tap dance symbol pairs
-void tap_pair(tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
-{
-  // triple tap: left right with cursor between symbol pair a la vim :-)
-  if (state->count > 2) {
-    symbol_pair(shift, left, right);
-    tap_key    (KC_LEFT);
-  }
-  // double tap: left right
-  else if (state->count > 1) {
-    symbol_pair(shift, left, right);
-  }
-  // down: modifier
-  else if (state->pressed) {
-    if (modifier) {
-      register_code(modifier);
-    }
-  }
-  // tap: left (close: right)
-  else {
-    if (shift & S_SINGLE) {
-      shift_key(close ? right : left);
-    }
-    else {
-      tap_key(close ? right : left);
-    }
-  }
-  if (!modifier) {
-    reset_tap_dance(state);
-  }
-}
-
-void doublequote(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_QUOT, KC_QUOT, 0, 0);
-}
-
-void grave(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_GRV, KC_GRV, 0, 0);
-}
-
-void lbrace(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, 0);
-}
-
-void lcurly(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, 0);
-}
-
-void lparen(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_9, KC_0, KC_LCTL, 0);
-}
-
-void lparen_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LCTL);
-}
-
-void quote(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_QUOT, KC_QUOT, 0, 0);
-}
-
-void rangle(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_COMM, KC_DOT, 0, CLOSE);
-}
-
-void rbrace(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, CLOSE);
-}
-
-void rcurly(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, CLOSE);
-}
-
-void rparen(tap_dance_state_t *state, void *user_data)
-{
-  tap_pair(state, S_ALWAYS, KC_9, KC_0, 0, CLOSE);
-}
-
-void rparen_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LCTL);
-}
-
-// ............................................................ Tap Dance Insert
-
-void comma(tap_dance_state_t *state, void *user_data)
-{
-  tap_key(KC_COMM);
-  if (state->count > 1) {
-    tap_key(KC_SPC);
-  }
-  reset_tap_dance(state);
-}
-
-void dot(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    shift_key(KC_COLN);
-  }
-  else {
-    tap_key(KC_DOT);
-  }
-  reset_tap_dance(state);
-}
-
-// compile time macro string, see functions/hardware planck script
-void private(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-#ifdef PRIVATE_STRING
-#include "private_string.h"
-#endif
-  }
-  reset_tap_dance(state);
-}
-
-// config.h defined string
-void send(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    SEND_STRING(PUBLIC_STRING);
-  }
-  reset_tap_dance(state);
-}
-
-// .......................................................... Tap Dance One Shot
-
-void caps(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count > 1) {
-    tap_key(KC_CAPS);
-  }
-  else {
-    set_oneshot_mods(MOD_LSFT);
-    register_code   (KC_LSFT);              // on hold down
-  }
-}
-
-void caps_reset(tap_dance_state_t *state, void *user_data)
-{
-  unregister_code(KC_LSFT);
-}
-
-// ................................................................... Tap Dance
-
-tap_dance_action_t tap_dance_actions[] = {
-  [_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps, caps_reset)
- ,[_COLN] = ACTION_TAP_DANCE_FN         (colon)
- ,[_COMM] = ACTION_TAP_DANCE_FN         (comma)
- ,[_DOT]  = ACTION_TAP_DANCE_FN         (dot)
- ,[_DQOT] = ACTION_TAP_DANCE_FN         (doublequote)
- ,[_ENT]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, enter, enter_reset)
- ,[_EQL]  = ACTION_TAP_DANCE_FN         (eql)
- ,[_GRV]  = ACTION_TAP_DANCE_FN         (grave)
- ,[_GT]   = ACTION_TAP_DANCE_FN         (greater)
- ,[_LBRC] = ACTION_TAP_DANCE_FN         (lbrace)
- ,[_LCBR] = ACTION_TAP_DANCE_FN         (lcurly)
- ,[_LPRN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lparen, lparen_reset)
- ,[_LT]   = ACTION_TAP_DANCE_FN         (lesser)
- ,[_PRIV] = ACTION_TAP_DANCE_FN         (private)
- ,[_QUOT] = ACTION_TAP_DANCE_FN         (quote)
- ,[_RBRC] = ACTION_TAP_DANCE_FN         (rbrace)
- ,[_RCBR] = ACTION_TAP_DANCE_FN         (rcurly)
- ,[_RNGL] = ACTION_TAP_DANCE_FN         (rangle)
- ,[_RPRN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rparen, rparen_reset)
- ,[_SEND] = ACTION_TAP_DANCE_FN         (send)
- ,[_SPC]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, space, space_reset)
- ,[_TILD] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tilde, tilde_reset)
-};
-
-// .............................................................. Dynamic Layers
-
-#define        LEFT    1
-#define        RIGHT   2
-static uint8_t thumb = 0;
-
-// LEFT (KC_SPC, S(KC_BSLS)), RIGHT (KC_LEFT, S(KC_LEFT)) opposite thumb combinations, see process_record_user()
-// up,   up   -> _BASE
-// up,   down -> _SYMBOL
-// down, up   -> _NUMBER
-// down, down -> _MOUSE                     // see layer keycodes that raise mouse layer
-#define THUMBS_DOWN _MOUSE                  // layer
-
-static uint8_t overlayer = 0;
-
-// left right thumb layer combinations
-void thumb_layer(keyrecord_t *record, uint8_t side, uint8_t shift, uint16_t keycode, uint8_t thumb_dn_layer, uint8_t thumb_up_layer)
-{
-  if (record->event.pressed) {
-    // layer_on via tap_layer(), see process_record_user()
-    key_timer = timer_read();
-    thumb     = thumb | side;
-  }
-  else {
-    layer_off(thumb_dn_layer);
-    // opposite thumb_layer() thumb may have switched effective layer!
-    if (overlayer) {
-      layer_off(overlayer);
-      overlayer = 0;
-    }
-    if (!key_press(shift, keycode)) {
-      layer_off(THUMBS_DOWN);               // both thumbs needed
-      // opposite thumb down? see left right combination layer table above
-      if (thumb & (side == LEFT ? RIGHT : LEFT)) {
-        layer_on(thumb_up_layer);
-        overlayer = thumb_up_layer;
-      }
-    }
-    clear_mods();
-    thumb     = thumb & ~side;
-    key_timer = 0;
-  }
-}
-
-// #ifdef STENO_ENABLE
-// // LT for steno keycode
-// void stn_layer(keyrecord_t *record, uint16_t keycode, uint8_t layer)
-// {
-//   if (record->event.pressed) {
-//     key_timer = timer_read();
-//     if (keycode) {
-//       process_steno(keycode, record);
-//     }
-//     layer_on(layer);
-//   }
-//   else {
-//     layer_off(layer);
-//     if (keycode) {
-//       if (timer_elapsed(key_timer) < TAPPING_TERM) {
-//         process_steno(keycode, record);
-//       }
-//       else {
-//         // clear pressed state (request push of updated) process_steno.c and .h
-//         // steno_clear_state();
-//       }
-//     }
-//     key_timer = 0;
-//   }
-// }
-// #endif
-
-// LT for S(keycode)
-void lt_shift(keyrecord_t *record, uint16_t keycode, uint8_t layer)
-{
-  if (record->event.pressed) {
-    key_timer = timer_read();
-    layer_on(layer);
-  }
-  else {
-    layer_off(layer);
-    // for shifted keycodes, hence, LT_SHIFT
-    key_press(SHIFT, keycode);
-    clear_mods();
-    key_timer = 0;
-  }
-}
-
-// set layer asap to overcome macro latency errors, notably tap dance and LT usage
-// this routine inexplicably (?) sets layer_on() faster than can be done in thumb_layer()
-void tap_layer(keyrecord_t *record, uint8_t layer)
-{
-  if (record->event.pressed) {
-    layer_on(layer);
-  }
-  else {
-    layer_off(layer);
-  }
-}
-
-// ..................................................................... Keymaps
-
-// void persistant_default_layer_set(uint16_t default_layer)
-// {
-//   eeconfig_update_default_layer(default_layer);
-//   default_layer_set            (default_layer);
-// }
-
-void clear_layers(void)
-{
-  uint8_t layer;
-  for (layer = 0; layer < _END_LAYERS; layer++) {
-    layer_off(layer);
-  }
-}
-
-#ifdef CENTER_TT
-static uint16_t tt_keycode = 0;             // current TT keycode
-
-void clear_tt(void)
-{
-  if (tt_keycode == KC_CAPS) {
-    tap_key(KC_CAPS);                       // clear capslock
-  }
-  tt_keycode = 0;
-  clear_layers();
-  set_single_persistent_default_layer(_BASE);
-}
-#endif
-
-// txbolt plover run state
-static uint8_t plover = 0;
-
-void base_layer(void)
-{
-#ifdef AUDIO_ENABLE
-  if (plover) {
-    PLAY_SONG(song_plover_gb);
-  }
-  else {
-    PLAY_SONG(song_qwerty);
-  }
-#endif
-  clear_layers();
-  set_single_persistent_default_layer(_BASE);
-}
-
-void toggle_plover(uint8_t state)
-{
-  if (plover != state) {
-#ifdef PLOVER_KEYBIND
-#include "plover_keybind.h"
-#endif
-    plover = state;
-  }
-}
-
-void steno(keyrecord_t *record)
-{
-  if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-    PLAY_SONG(song_plover);
-#endif
-    clear_layers();
-    layer_on(_PLOVER);
-    if (!eeconfig_is_enabled()) {
-      eeconfig_init();
-    }
-    keymap_config.raw  = eeconfig_read_keymap();
-    keymap_config.nkro = 1;
-    eeconfig_update_keymap(keymap_config.raw);
-    if (!plover) {
-      toggle_plover(1);
-    }
-  }
-}
-
-void steno_exit(keyrecord_t *record)
-{
-  if (record->event.pressed) {
-    base_layer();
-    toggle_plover(0);
-  }
-}
diff --git a/keyboards/planck/keymaps/sdothum/common/number_fkey_layout.h b/keyboards/planck/keymaps/sdothum/common/number_fkey_layout.h
deleted file mode 100644
index e19a6097c10..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/number_fkey_layout.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ......................................................... Number Keypad Layer
-#ifdef SHIFT_SYMBOLS
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   G  |   \  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() |      |      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_CTL,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0,    LT_EQL,  ___x___, ___x___, ___x___
-#else
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL,  LT_0,    ___x___, ___x___, ___x___
-#endif
-  ),
-#else
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   X  |   G  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   0  |   =  |      |      |      |
-  // |      |      |      |  f() |      |      |      |   =  |   0  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, _______, _______, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_CTL,  GT_C,    AT_B,    LT_A,    _______, _______, _______, KC_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, MT_X,    S(KC_G), _______, _______, _______, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_0,    LT_EQL,  ___x___, ___x___, ___x___
-#else
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_EQL,  LT_0,    ___x___, ___x___, ___x___
-#endif
-  ),
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |   {  |   &  |   ?  |   :  |   }  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   (  |   $  |   %  |   ^  |   )  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |   [  |   <  |   ~  |   >  |   ]  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |  f() |      |      |      |   \  |   |  |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_NUMSYM] = LAYOUT_planck_grid(
-    _______, _______, _______, ___x___, _______, _______, _______, TD_LCBR, KC_AMPR, KC_QUES, KC_COLN, KC_RCBR,
-    ___x___, ___x___, ___x___, ___fn__, _______, _______, _______, TD_LPRN, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN,
-    _______, _______, _______, ___x___, _______, _______, _______, TD_LBRC, KC_LT,   KC_TILD, KC_GT,   KC_RBRC,
-    ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___, KC_BSLS, KC_PIPE, ___x___, ___x___, ___x___
-  ),
-#endif
-
-// ............ .................................................. Function Keys
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      |  F7  |  F8  |  F9  |  F12 |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |  GUI |  Alt | Shift|      |      |      |      |  F4  |  F5  |  F6  |  F11 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F10 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |  f() |      |   +  |      |      |      |      |
-  // |      |      |      |      |  f() |      |      |   +  |      |      |      |      | see _PLOVER
-  // '-----------------------------------------------------------------------------------'
-
-  [_FNCKEY] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 ,
-    OS_CTL,  OS_GUI,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 ,
-    _______, _______, _______, _______, ___fn__, ___fn__, _______, KC_PLUS, _______, _______, _______, _______
-  ),
-
diff --git a/keyboards/planck/keymaps/sdothum/common/plover_keybind.h b/keyboards/planck/keymaps/sdothum/common/plover_keybind.h
deleted file mode 100644
index 88ec727bfd6..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/plover_keybind.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// simple window manager specific plover keybind hook
-
-// toggle plover application, see herbstluftwm/config/appbinds
-register_code  (KC_LGUI);
-shift_key      (KC_RGHT);
-unregister_code(KC_LGUI);
diff --git a/keyboards/planck/keymaps/sdothum/common/sounds.h b/keyboards/planck/keymaps/sdothum/common/sounds.h
deleted file mode 100644
index 1bfc7a6da0c..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/sounds.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// ................................................................ Audio Sounds
-
-#ifdef AUDIO_ENABLE
-float song_startup  [][2] = SONG(STARTUP_SOUND);
-float song_colemak  [][2] = SONG(COLEMAK_SOUND);
-float song_qwerty   [][2] = SONG(QWERTY_SOUND);
-float song_plover   [][2] = SONG(PLOVER_SOUND);
-float song_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
-float song_caps_on  [][2] = SONG(CAPS_LOCK_ON_SOUND);
-float song_caps_off [][2] = SONG(CAPS_LOCK_OFF_SOUND);
-float music_scale   [][2] = SONG(MUSIC_SCALE_SOUND);
-float song_goodbye  [][2] = SONG(GOODBYE_SOUND);
-#endif
diff --git a/keyboards/planck/keymaps/sdothum/common/steno_layout.h b/keyboards/planck/keymaps/sdothum/common/steno_layout.h
deleted file mode 100644
index c1f2b5b24ab..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/steno_layout.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ...................................................................... Plover
-#ifdef STENO_ENABLE
-  // ,-----------------------------------------------------------------------------------.
-  // |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // | Base |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Base |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |                           |   A  |   O  |   E  |   U  |                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_PLOVER] = LAYOUT_planck_grid(
-    STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-    BASE1,   STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-    BASE2,   STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-    _______, _______, _______, PS_STNA, PS_STNO, _______, _______, PS_STNE, PS_STNU, _______, _______, _______
-  ),
-#else
-  // ,-----------------------------------------------------------------------------------.
-  // |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |   1  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // | Base |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // | Base |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |                           |   A  |   O  |   E  |   U  |                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    BASE1,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    BASE2,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    _______, _______, _______, LT_C,    LT_V,    _______, _______, LT_N,    LT_M,    _______, _______, _______
-  ),
-#endif
diff --git a/keyboards/planck/keymaps/sdothum/common/symbol_guifn_layout.h b/keyboards/planck/keymaps/sdothum/common/symbol_guifn_layout.h
deleted file mode 100644
index d33ca8baa80..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/symbol_guifn_layout.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ..................................................... Symbol Navigation Layer
-#ifdef SHIFT_SYMBOLS
-  // .-----------------------------------------------------------------------------------.
-  // |      |   ~  |   *  |   &  |      |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |   ^  |   %  |   $  |      |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   @  |   !  |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |Adjust|   \  |      |      |      |  f() |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_SYMBOL] = LAYOUT_planck_grid(
-    _______, KC_TILD, KC_ASTR, KC_AMPR, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    OS_CTL,  SM_CIRC, SM_PERC, SM_DLR,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-    _______, KC_HASH, KC_AT,   KC_EXLM, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    ___x___, ___x___, ___x___, ADJUST,  LT_BSLS, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___
-  ),
-#else
-  // .-----------------------------------------------------------------------------------.
-  // |   {  |   .  |   *  |   &  |   }  |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // |   (  |   ^  |   %  |   $  |   )  |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |   [  |   #  |   @  |   !  |   ]  |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |   |  |   \  |      |      |      |  f() |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_SYMBOL] = LAYOUT_planck_grid(
-    KC_LCBR, KC_DOT,  KC_ASTR, KC_AMPR, TD_RCBR, _______, _______, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    SM_LPRN, SM_CIRC, SM_PERC, SM_DLR,  TD_RPRN, _______, _______, _______, LT_LFTX, KC_DOWN, KC_RGHT, KC_PGDN,
-    KC_LBRC, KC_HASH, KC_AT,   KC_EXLM, TD_RBRC, _______, _______, _______, _______, _______, _______, _______,
-    ___x___, ___x___, ___x___, SL_PIPE, LT_BSLS, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___
-  ),
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   ?  |   +  |   ~  |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   <  |   =  |   >  |      |      |      |      |  f() |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   3  |   2  |   1  |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  f() |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_SYMREG] = LAYOUT_planck_grid(
-    ___x___, KC_QUES, KC_PLUS, KC_TILD, ___x___, _______, _______, _______, ___x___, ___x___, ___x___, ___x___,
-    ___x___, KC_LT,   KC_EQL,  TD_RNGL, ___x___, _______, _______, _______, ___fn__, ___x___, ___x___, ___x___,
-    ___x___, KC_3,    KC_2,    KC_1,    ___x___, _______, _______, _______, _______, _______, _______, _______,
-    ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___fn__, ___x___, ___x___, ___x___
-  ),
-#endif
-
-// ............................................................... Mouse Actions
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Left |  Up  | Right|  Up  |
-  // |-----------------------------------------------------------------------------------|
-  // |      | Btn3 | Btn2 | Btn1 |      |      |      |      | Left | Down | Right| Down |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |  f() |      |      |      |  f() |      |      |      |
-  // '-----------------------------------------------------------------------------------'
-
-  [_MOUSE] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,
-    _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, ___fn__, _______, _______, _______, ___fn__, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/sdothum/common/tapdance.h b/keyboards/planck/keymaps/sdothum/common/tapdance.h
deleted file mode 100644
index d778286bf1e..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/tapdance.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// tap dance keys
-enum tap_dance {
-  _CAPS = 0
- ,_COLN
- ,_COMM
- ,_DOT
- ,_DQOT
- ,_ENT
- ,_EQL
- ,_GRV
- ,_GT
- ,_LBRC
- ,_LCBR
- ,_LPRN
- ,_LT
- ,_PRIV
- ,_QUOT
- ,_RBRC
- ,_RCBR
- ,_RNGL
- ,_RPRN
- ,_SEND
- ,_SPC
- ,_TILD
-};
-
-#define TD_CAPS TD(_CAPS)
-#define TD_COLN TD(_COLN)
-#define TD_COMM TD(_COMM)
-#define TD_DOT  TD(_DOT)
-#define TD_DQOT TD(_DQOT)
-#define TD_ENT  TD(_ENT)
-#define TD_EQL  TD(_EQL)
-#define TD_GRV  TD(_GRV)
-#define TD_GT   TD(_GT)
-#define TD_LBRC TD(_LBRC)
-#define TD_LCBR TD(_LCBR)
-#define TD_LPRN TD(_LPRN)
-#define TD_LT   TD(_LT)
-#define TD_PRIV TD(_PRIV)                   // compile time macro string, provided in private_string.h
-#define TD_QUOT TD(_QUOT)
-#define TD_RBRC TD(_RBRC)
-#define TD_RCBR TD(_RCBR)
-#define TD_RNGL TD(_RNGL)
-#define TD_RPRN TD(_RPRN)
-#define TD_SEND TD(_SEND)                   // config.h defined macro string
-#define TD_SPC  TD(_SPC)                    // see process_record_user() for extended handling of Spc
-#define TD_TILD TD(_TILD)
diff --git a/keyboards/planck/keymaps/sdothum/common/toggle_layout.h b/keyboards/planck/keymaps/sdothum/common/toggle_layout.h
deleted file mode 100644
index ae44576df9d..00000000000
--- a/keyboards/planck/keymaps/sdothum/common/toggle_layout.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ......................................................... Number Keypad Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |   F  |   E  |   D  |      |      |      |   /  |   7  |   8  |   9  |   *  |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |   C  |   B  |   A  |      |      |      |   .  |   4  |   5  |   6  |   -  |
-  // |-----------------------------------------------------------------------------------|
-  // |      |   #  |   G  |   \  |      |      |      |   ,  |   1  |   2  |   3  |   +  |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |  f() | Space|   0  |   =  |                           |
-  // |                           |  f() | Space|   =  |   0  |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTNUMBER] = LAYOUT_planck_grid(
-    _______, KC_F,    MT_E,    KC_D,    _______, ___x___, ___x___, KC_SLSH, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    OS_CTL,  GT_C,    AT_B,    ST_A,    _______, ___x___, ___x___, TD_DOT,  KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, KC_HASH, SM_G,    KC_BSLS, _______, ___x___, ___x___, TD_COMM, KC_1,    KC_2,    KC_3,    KC_PLUS,
-#ifdef THUMB_0
-    _______, _______, _______, _______, TT_ESC,  KC_SPC,  KC_0,    LT_EQL,  _______, _______, _______, _______
-#else
-    _______, _______, _______, _______, TT_ESC,  KC_SPC,  KC_EQL,  LT_0,    _______, _______, _______, _______
-#endif
-  ),
-
-// ............ .................................................. Function Keys
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      |  F7  |  F8  |  F9  |  F12 |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |  GUI |  Alt | Shift|      |      |      |      |  F4  |  F5  |  F6  |  F11 |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |  F1  |  F2  |  F3  |  F10 |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |  f() |      |   +  |      |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTFNCKEY] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F7,   KC_F8,   KC_F9,   KC_F12 ,
-    OS_CTL,  OS_GUI,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_F4,   KC_F5,   KC_F6,   KC_F11 ,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_F1,   KC_F2,   KC_F3,   KC_F10 ,
-    _______, _______, _______, _______, TT_ESC,  _______, KC_PLUS, _______, _______, _______, _______, _______
-  ),
-
-// ....................................................................... Regex
-
-  // ,-----------------------------------------------------------------------------------.
-  // |      |   ~  |   {  |   }  |   &  |      |      |   %  |   [  |   ]  |   @  |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |      |   ^  |   <  |   >  |   ?  |      |      |   |  |   (  |   )  |   $  |      |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |      |   :  |   !  |   =  |   /  |      |      |   \  |   *  |   .  |   #  |      |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // |                           |  f() |   -  |   +  | Space|                           |
-  // `-----------------------------------------------------------------------------------'
-
-  [_TTREGEX] = LAYOUT_planck_grid(
-    ___x___, KC_TILD, KC_LCBR, KC_RCBR, KC_AMPR, ___x___, ___x___, KC_PERC, KC_LBRC, KC_RBRC, KC_AT,   ___x___,
-    ___x___, KC_CIRC, KC_LT,   KC_GT,   KC_QUES, ___x___, ___x___, KC_PIPE, KC_LPRN, KC_RPRN, KC_DLR,  ___x___,
-    ___x___, KC_COLN, KC_EXLM, KC_EQL,  KC_SLSH, ___x___, ___x___, KC_BSLS, KC_ASTR, KC_DOT,  KC_HASH, ___x___,
-    _______, _______, _______, _______, TT_ESC,  KC_MINS, KC_PLUS, KC_SPC,  _______, _______, _______, _______
-  ),
-
-// ............................................................ Navigation Layer
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Home |  Up  |  End | PgUp |
-  // |-----------------------------------------------------------------------------------|
-  // | Ctrl |  GUI |  Alt | Shift|      |      |      |      | Left | Down | Right| PgDn |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |  f() |      |      |      |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTCURSOR] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP,
-    OS_CTL,  OS_GUI,  OS_ALT,  OS_SFT,  _______, ___x___, ___x___, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______
-  ),
-
-// ............................................................... Mouse Actions
-
-  // .-----------------------------------------------------------------------------------.
-  // |      |      |      |      |      |      |      |      | Left |  Up  | Right|  Up  |
-  // |-----------------------------------------------------------------------------------|
-  // |      | Btn3 | Btn2 | Btn1 |      |      |      |      | Left | Down | Right| Down |
-  // |-----------------------------------------------------------------------------------|
-  // |      |      |      |      |      |      |      |      |      |      |      |      |
-  // |-----------------------------------------------------------------------------------|
-  // |                           |  f() |      |      |      |                           |
-  // '-----------------------------------------------------------------------------------'
-
-  [_TTMOUSE] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U,
-    _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, ___x___, ___x___, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    _______, _______, _______, _______, _______, ___x___, ___x___, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, TT_ESC,  _______, _______, _______, _______, _______, _______, _______
-  ),
diff --git a/keyboards/planck/keymaps/sdothum/config.h b/keyboards/planck/keymaps/sdothum/config.h
deleted file mode 100644
index 6afcc69064b..00000000000
--- a/keyboards/planck/keymaps/sdothum/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// tap dance key press termination interval
-#define TAPPING_TERM 250
-
-// smooth mouse motion
-// #define MOUSEKEY_INTERVAL    20
-// #define MOUSEKEY_DELAY       0
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_MAX_SPEED   7
-// #define MOUSEKEY_WHEEL_DELAY 0
-
-// compile time macro string, see functions/hardware planck script (undefine otherwise)
-//#define PRIVATE_STRING
-
-// compile time macro string, must be in quotes
-#define PUBLIC_STRING ":%s/arch=(.*)/arch=('any')\n"
-
-// thumb key tap-shift() double tap: one shot shift (0) off (1) on
-#define DT_SHIFT 1
-
-// number layer 0 position KEYPAD_0, THUMB_0
-#define THUMB_0
-
-// home block shift symbol clustes defined (no overlays required for extended symbols, undefine otherwise)
-#define SHIFT_SYMBOLS
-
-// center column TT assignments (undefine for OSM chords)
-#define CENTER_TT
-#define TAPPING_TOGGLE 1
-
-// home row modifiers
-#define HOME_MODS
-// fix dual function timing
-#define PERMISSIVE_HOLD
-
-// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
-#define BEAKLSP
-
-// sync app with window manager keybind hook defined in plover_keybind.h
-#define PLOVER_KEYBIND
-
-#endif
diff --git a/keyboards/planck/keymaps/sdothum/keymap.c b/keyboards/planck/keymaps/sdothum/keymap.c
deleted file mode 100644
index 03c605020c9..00000000000
--- a/keyboards/planck/keymaps/sdothum/keymap.c
+++ /dev/null
@@ -1,469 +0,0 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-//
-// To flash planck firmware
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   Reset keyboard or press hw reset button on base (hole)
-//
-//   cd qmk_firmware/keyboards/planck
-//   sudo make KEYMAP=sdothum dfu
-//
-//   sudo make clean          (good practice before flashing)
-//   sudo make KEYMAP=sdothum (to compile check)
-//
-// Package requirements (for arch linux)
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   avr-gcc-atmel
-//   avr-libc-atmel
-//   dfu-programmer
-//
-// Notes
-// ▔▔▔▔▔
-//   ** E R G O   W I D E   S P L I T ** Layout
-//
-//   Autocompletion tap dance key pairs (),[],{} are available from the
-//   number/symbol layer, as well as, numerous (un)shift key values
-//
-//   The navigation pad provides a single hand right thumb activated cluster
-//   with left hand modifiers
-//
-//   #define PRIVATE_STRING includes private_string.h, a user defined code
-//   block for the PRIV tap dance e.g. SEND_STRING("secret messape"),
-//   see function private()
-//
-// Modifier clusters
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   The num and sym keys together access the navigation pad layer
-//
-//   ,-----------------------------------------------------------------------------------.
-//   | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-//   `-----------------------------------------------------------------------------------'
-//
-// Hint
-// ▔▔▔▔
-//   For sculpted keycaps such as Cherry or OEM profile, reverse the Alt, Num,
-//   Shift, Shift, Nav, Sym keycaps for more ergonomic thumb orientation and
-//   actuation
-//
-// Code
-// ▔▔▔▔
-//   This source is shamelessly based on the "default" planck layout
-//
-//   #ifdef/#endif block structures are not indented, as syntax highlighting
-//   in vim is sufficient for identification
-//
-//   c++ commenting style is used throughout
-//
-// Change history
-// ▔▔▔▔▔▔▔▔▔▔▔▔▔▔
-//   See http://thedarnedestthing.com/planck%20constant
-//   See http://thedarnedestthing.com/planck%20done
-
-
-
-//                === N O T E ===
-//
-// sudo CPATH=<keymap.c directory>/common make ...
-
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _BASE = 0
- ,_SHIFT
- ,_LSHIFT
- ,_RSHIFT
- ,_PLOVER
- ,_NUMBER
- ,_SYMBOL
- ,_FNCKEY
- ,_MOUSE
-#ifdef CENTER_TT
- ,_TTNUMBER
- ,_TTREGEX
- ,_TTFNCKEY
- ,_TTCURSOR
- ,_TTMOUSE
-#endif
-#ifndef SHIFT_SYMBOLS
- ,_NUMSYM
- ,_SYMREG
-#endif
- ,_EDIT
- ,_QWERTY
- ,_ADJUST
- ,_END_LAYERS
-};
-
-enum planck_keycodes {
-  BASE = SAFE_RANGE
- ,BASE1
- ,BASE2
- ,PLOVER
- ,PLOEXIT
- ,SM_CIRC   // pseudo GUI_T(S(KC_6))                      for shifted key-codes, see process_record_user()
- ,SM_DLR    // pseudo SFT_T(S(KC_4))                      for shifted key-codes, see process_record_user()
- ,SM_G      // pseudo MT   (MOD_LALT | MOD_LSFT, S(KC_G)) for shifted key-codes, see process_record_user()
- ,SM_PERC   // pseudo ALT_T(S(KC_5))                      for shifted key-codes, see process_record_user()
- ,SM_LPRN   // pseudo CTL_T(S(KC_9))                      for shifted key-codes, see process_record_user()
- ,SL_LEFT   // pseudo LT   (_MOUSE, S(KC_LEFT))           for shifted key-codes, see process_record_user()
- ,SP_DEL    // pseudo LT   (_MOUSE, KC_DEL)               for shifted key-codes, see process_record_user()
- ,SL_PIPE   // pseudo LT   (_ADJUST, S(KC_BSLS))          for shifted key-codes, see process_record_user()
- ,SL_TAB    // pseudo LT   (_FNCKEY, S(KC_TAB))           for shifted key-codes, see process_record_user()
-#ifdef CENTER_TT
- ,TT_ESC
-#endif
-#ifdef STENO_ENABLE
- ,PS_STNA = STN_A
- ,PS_STNO = STN_O
- ,PS_STNE = STN_E
- ,PS_STNU = STN_U
-#else
- ,LT_C    = LT (_NUMBER, KC_C)
- ,LT_V    = LT (_FNCKEY, KC_V)
- ,LT_N    = LT (_EDIT,   KC_N)
- ,LT_M    = LT (_SYMBOL, KC_M)
-#endif
- ,PS_BASE
-};
-
-// modifier keys
-#define AT_B    ALT_T(KC_B)
-#define AT_DOWN ALT_T(KC_DOWN)
-#define CT_RGHT CTL_T(KC_RGHT)
-#define GT_C    GUI_T(KC_C)
-#define GT_UP   GUI_T(KC_UP)
-#define MT_E    MT   (MOD_LCTL | MOD_LALT, KC_E)
-#define MT_X    MT   (MOD_LALT | MOD_LSFT, KC_X)
-#define ST_A    SFT_T(KC_A)
-#ifdef HOME_MODS
-#define HOME_K  CTL_T(KC_K)
-#define HOME_H  GUI_T(KC_H)
-#define HOME_E  ALT_T(KC_E)
-#define HOME_A  SFT_T(KC_A)
-#if defined(BEAKLMU) || defined(BEAKLSP)
-#define HOME_T  SFT_T(KC_T)
-#define HOME_R  ALT_T(KC_R)
-#define HOME_S  GUI_T(KC_S)
-#define HOME_W  CTL_T(KC_W)
-#else
-#define HOME_T  SFT_T(KC_T)
-#define HOME_S  ALT_T(KC_S)
-#define HOME_N  GUI_T(KC_N)
-#define HOME_B  CTL_T(KC_B)
-#endif
-#else
-#define HOME_K  KC_K
-#define HOME_H  KC_H
-#define HOME_E  KC_E
-#define HOME_A  KC_A
-#define HOME_T  KC_T
-#define HOME_S  KC_S
-#define HOME_N  KC_N
-#define HOME_B  KC_B
-#endif
-
-#define S_DOWN  S    (KC_DOWN)
-#define S_LEFT  S    (KC_LEFT)
-#define S_RGHT  S    (KC_RGHT)
-#define S_TAB   S    (KC_TAB)
-#define S_UP    S    (KC_UP)
-
-#include "common/tapdance.h"
-
-// keycodes
-#define ___x___ KC_TRNS
-#define ___fn__ KC_TRNS
-#undef  _______
-#define _______ KC_NO
-
-#define COPY    LCTL(KC_C)
-#define CUT     LCTL(KC_X)
-#define EOT     LCTL(KC_D)
-#define NAK     LCTL(KC_U)
-#define PASTE   LCTL(KC_V)
-#define UNDO    LCTL(KC_Z)
-#define TMCOPY  LALT(LCTL(KC_C))
-#define TMPASTE LALT(LCTL(KC_V))
-#define LT_BSLS LT  (_MOUSE,  KC_BSLS)      // see process_record_user() for extended handling
-#define LT_BSPC LT  (_EDIT,   KC_BSPC)
-#define SP_LEFT LT  (_EDIT,   KC_LEFT)
-#define LT_ESC  LT  (_NUMBER, KC_ESC)
-#define LT_LEFT LT  (_SYMBOL, KC_LEFT)      // see process_record_user() for extended handling
-#define SP_BSPC LT  (_SYMBOL, KC_BSPC)      // see process_record_user() for extended handling
-#define LT_TAB  LT  (_FNCKEY, KC_TAB)
-#define LT_INS  LT  (_FNCKEY, KC_INS)
-#define LT_ALTG LT  (_FNCKEY, KC_RALT)
-#define ADJUST  MO  (_ADJUST)
-#define OS_ALT  OSM (MOD_LALT)
-#define OS_CTL  OSM (MOD_LCTL)
-#define OS_GUI  OSM (MOD_LGUI)
-#define OS_SFT  OSM (MOD_LSFT)
-#define OS_CALT OSM (MOD_LALT | MOD_LCTL)
-#define OS_CGUI OSM (MOD_LGUI | MOD_LCTL)
-#define OS_CSFT OSM (MOD_LSFT | MOD_LCTL)
-#define OS_SALT OSM (MOD_LALT | MOD_LSFT)
-#define OS_SGUI OSM (MOD_LGUI | MOD_LSFT)
-
-#ifdef CENTER_TT
-#ifdef BEAKLSP
-#define CNTR_TL OSM (MOD_LSFT)
-#else
-#define CNTR_TL TT  (_TTFNCKEY)
-#endif
-#define CNTR_TR KC_CAPS
-#define CNTR_HL TT  (_TTCURSOR)
-#define CNTR_HR TT  (_TTMOUSE)
-#define CNTR_BL TT  (_TTNUMBER)
-#define CNTR_BR TT  (_TTREGEX)
-#else
-#define CNTR_TL OSM (MOD_LALT | MOD_LCTL)
-#define CNTR_TR OSM (MOD_LGUI | MOD_LCTL)
-#define CNTR_HL OSM (MOD_LALT | MOD_LSFT)
-#define CNTR_HR OSM (MOD_LGUI | MOD_LSFT)
-#define CNTR_BL TD  (_CAPS)
-#define CNTR_BR OSM (MOD_LSFT | MOD_LCTL)
-#endif
-
-#ifdef THUMB_0
-#define LT_EQL  LT  (_ADJUST, KC_EQL)
-#else
-#define LT_0    LT  (_ADJUST, KC_0)
-#endif
-#ifndef SHIFT_SYMBOLS
-#define LT_A    LT  (_NUMSYM, KC_A)
-#define LT_LFTX LT  (_SYMREG, KC_LEFT)
-#endif
-
-// ........................................................ Default Alpha Layout
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-#include "beakl.h"
-#include "colemak.h"
-#include "qwerty.h"
-#include "common/steno_layout.h"
-
-// ...................................................... Number / Function Keys
-
-#include "common/number_fkey_layout.h"
-
-// ......................................................... Symbol / Navigation
-
-#include "common/symbol_guifn_layout.h"
-
-// ............................................................... Toggle Layers
-
-#ifdef CENTER_TT
-#include "common/toggle_layout.h"
-#endif
-
-// ......................................................... Short Cuts / Adjust
-
-#include "common/chord_layout.h"
-
-};
-
-// ...................................................................... Sounds
-
-#include "common/sounds.h"
-
-// ........................................................... User Keycode Trap
-
-#include "common/keycode_functions.h"
-
-#define BASE_1  1
-#define BASE_2  2
-#define BASE_12 3
-static uint8_t base_n = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  switch (keycode) {
-    case BASE1:
-      if (record->event.pressed) {
-        base_n = base_n | BASE_1;
-        if (base_n == BASE_12) {
-          base_layer();
-        }
-      }
-      else {
-        base_n = base_n & ~BASE_1;
-      }
-      return false;
-    case BASE2:
-      if (record->event.pressed) {
-        base_n = base_n | BASE_2;
-        if (base_n == BASE_12) {
-          base_layer();
-        }
-      }
-      else {
-        base_n = base_n & ~BASE_2;
-      }
-      return false;
-    case AT_DOWN:
-#ifdef HOME_MODS
-    case HOME_E:
-#if defined(BEAKLMU) || defined(BEAKLSP)
-    case HOME_R:
-#else
-    case HOME_S:
-#endif
-#endif
-      tap_mods(record, KC_LALT);
-      break;
-    case CT_RGHT:
-#ifdef HOME_MODS
-    case HOME_K:
-#if defined(BEAKLMU) || defined(BEAKLSP)
-    case HOME_W:
-#else
-    case HOME_B:
-#endif
-#endif
-      tap_mods(record, KC_LCTL);
-      break;
-    case GT_UP:
-#ifdef HOME_MODS
-    case HOME_H:
-#if defined(BEAKLMU) || defined(BEAKLSP)
-    case HOME_S:
-#else
-    case HOME_N:
-#endif
-#endif
-      tap_mods(record, KC_LGUI);
-      break;
-#ifdef HOME_MODS
-    case HOME_A:
-    case HOME_T:
-      tap_mods(record, KC_LSFT);
-      break;
-#endif
-#ifdef CENTER_TT
-    case TT_ESC:
-      clear_tt();                           // exit TT layer
-      return false;
-#endif
-    case LT_ESC:
-#ifdef CENTER_TT
-      if (tt_keycode != 0) {
-        clear_tt();                         // exit TT layer
-        return false;
-      }
-#endif
-      tap_layer(record, _NUMBER);
-      break;
-    case LT_LEFT:
-    case SP_BSPC:
-      tap_layer(record, _SYMBOL);
-      // LT (_SYMBOL, KC_LEFT) left right combination layer
-      thumb_layer(record, RIGHT, 0, 0, _SYMBOL, _LSHIFT);
-      break;
-    case OS_ALT:
-      tap_mods(record, KC_LALT);
-      break;
-    case OS_CTL:
-      tap_mods(record, KC_LCTL);
-      break;
-    case OS_GUI:
-      tap_mods(record, KC_LGUI);
-      break;
-    case SM_CIRC:
-      // GUI_T(S(KC_6))
-      mt_shift(record, KC_LGUI, 0, KC_6);
-      break;
-    case SM_DLR:
-      // SFT_T(S(KC_4))
-      mt_shift(record, KC_LSFT, 0, KC_4);
-      break;
-    case SM_G:
-      // MT(MOD_LALT | MOD_LSFT, S(KC_G))
-      mt_shift(record, KC_LALT, KC_LSFT, KC_G);
-      break;
-    case SM_LPRN:
-      // CTL_T(S(KC_9))
-      mt_shift(record, KC_LCTL, 0, KC_9);
-      break;
-    case SM_PERC:
-      // ALT_T(S(KC_5))
-      mt_shift(record, KC_LALT, 0, KC_5);
-      break;
-    case LT_BSLS:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, KC_BSLS) left right combination layer, see #define LT_BSLS
-      thumb_layer(record, LEFT, 0, 0, _MOUSE, _SYMBOL);
-      break;
-    case SL_LEFT:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, S(KC_LEFT)) left right combination layer
-      thumb_layer(record, RIGHT, SHIFT, KC_LEFT, _MOUSE, _LSHIFT);
-      break;
-    case SP_DEL:
-      tap_layer(record, _MOUSE);
-      // LT (_MOUSE, S(KC_LEFT)) left right combination layer
-      thumb_layer(record, RIGHT, NOSHIFT, KC_DEL, _MOUSE, _LSHIFT);
-      break;
-    case SL_PIPE:
-      // LT (_ADJUST, S(KC_BSLS)) emulation
-      lt_shift(record, KC_BSLS, _ADJUST);
-      break;
-    case SL_TAB:
-      // LT (_FNCKEY, S(KC_TAB)) emulation
-      lt_shift(record, KC_TAB, _FNCKEY);
-      break;
-    case TD_ENT:
-      tap_layer(record, _RSHIFT);
-      // LT (_RSHIFT, KC_ENT) emulation, see tap dance enter
-      break;
-    case TD_SPC:
-      tap_layer(record, _LSHIFT);
-      // LT (_LSHIFT, KC_SPC) left right combination layer, see tap dance TD_SPC
-      thumb_layer(record, LEFT, 0, 0, _LSHIFT, _SYMBOL);
-      break;
-#ifdef CENTER_TT
-    case CNTR_TL:
-    case CNTR_TR:
-    case CNTR_HL:
-    case CNTR_HR:
-    case CNTR_BL:
-    case CNTR_BR:
-      if (tt_keycode != keycode && tt_keycode != 0) {
-        clear_tt();                         // return to base layer first if different TT layer selected
-      }
-      tt_keycode = keycode;
-      break;
-#endif
-// #ifdef STENO_ENABLE
-//     case PS_STNA:
-//       stn_layer(record, STN_A, _NUMBER);
-//       break;
-//     case PS_STNO:
-//       stn_layer(record, STN_O, _FNCKEY);
-//       break;
-//     case PS_STNE:
-//       stn_layer(record, STN_E, _EDIT);
-//       break;
-//     case PS_STNU:
-//       stn_layer(record, STN_U, _SYMBOL);
-//       break;
-// #endif
-    case PS_BASE:
-      if (record->event.pressed) {
-        base_layer();
-      }
-      return false;
-    case PLOVER:
-      steno(record);
-      return false;
-    case PLOEXIT:
-      steno_exit(record);
-      return false;
-  }
-  return true;
-}
-
-#include "common/init.h"
diff --git a/keyboards/planck/keymaps/sdothum/qwerty.h b/keyboards/planck/keymaps/sdothum/qwerty.h
deleted file mode 100644
index 3bfdb3e7043..00000000000
--- a/keyboards/planck/keymaps/sdothum/qwerty.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// ...................................................................... Qwerty
-#ifdef QWERTY
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   E  |   R  |   T  | ^Alt | ^GUI |   Y  |   U  |   I  |   O  |   P  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   S  |   D  |   F  |   G  | ↑Alt | ↑GUI |   H  |   J  |   K  |   L  |   ;  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   V  |   B  | Caps |^Shift|   N  |   M  |   ,  |   .  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc | Space|  Tab | Bksp |  Ent | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_BASE] = LAYOUT_planck_grid(
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    CNTR_TL, CNTR_TR, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   ,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    CNTR_HL, CNTR_HR, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CNTR_BL, CNTR_BR, KC_N,    KC_M,    KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  [_SHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), CNTR_TL, CNTR_TR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P),
-    S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), CNTR_HL, CNTR_HR, S(KC_H), S(KC_J), S(KC_K), S(KC_L), KC_SCLN,
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), CNTR_BL, CNTR_BR, S(KC_N), S(KC_M), KC_COMM, KC_DOT,  TD_QUOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  TD_SPC,  LT_TAB,  LT_BSPC, TD_ENT,  LT_LEFT, AT_DOWN, GT_UP,   CT_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   E  |   R  |   T  | ^Alt | ^GUI |   Y  |   U  |   I  |   O  |   P  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   S  |   D  |   F  |   G  | ↑Alt | ↑GUI |   H  |   J  |   K  |   L  |   :  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   V  |   B  | Caps |^Shift|   N  |   M  |   /  |   ?  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt |  Esc |  f() |  Tab |  Del |   -  | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_LSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), CNTR_TL, CNTR_TR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P),
-    S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), CNTR_HL, CNTR_HR, S(KC_H), S(KC_J), S(KC_K), S(KC_L), TD_COLN,
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), CNTR_BL, CNTR_BR, S(KC_N), S(KC_M), KC_SLSH, KC_QUES, TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  LT_ESC,  ___fn__, LT_TAB,  KC_DEL,  KC_MINS, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-
-  // ,-----------------------------------------------------------------------------------.
-  // |   Q  |   W  |   E  |   R  |   T  | ^Alt | ^GUI |   Y  |   U  |   I  |   O  |   P  |
-  // |------+------+------+------+------+-------------+------+------+------+------+------|
-  // |   A  |   S  |   D  |   F  |   G  | ↑Alt | ↑GUI |   H  |   J  |   K  |   L  |   :  |
-  // |------+------+------+------+------+------|------+------+------+------+------+------|
-  // |   Z  |   X  |   C  |   V  |   B  | Caps |^Shift|   N  |   M  |   ~  |   `  |   "  |
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-  // | Ctrl |  GUI |  Alt | Caps |   _  | ↑Tab | Bksp |  f() | Left | Down |  Up  | Right|
-  // `-----------------------------------------------------------------------------------'
-
-  [_RSHIFT] = LAYOUT_planck_grid(
-    S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), CNTR_TL, CNTR_TR, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P),
-    S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), CNTR_HL, CNTR_HR, S(KC_H), S(KC_J), S(KC_K), S(KC_L), TD_COLN,
-    S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), CNTR_BL, CNTR_BR, S(KC_N), S(KC_M), TD_TILD, TD_GRV,  TD_DQOT,
-    OS_CTL,  OS_GUI,  OS_ALT,  KC_CAPS, KC_UNDS, SL_TAB,  LT_BSPC, ___fn__, SL_LEFT, S_DOWN,  S_UP,    S_RGHT
-  ),
-#endif
-
diff --git a/keyboards/planck/keymaps/sdothum/readme.md b/keyboards/planck/keymaps/sdothum/readme.md
deleted file mode 100644
index 58f73e3b445..00000000000
--- a/keyboards/planck/keymaps/sdothum/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# The sdothum extended Default Planck Layout
-
-- Colemak-DH layout layer with shift/tab key overlays
-- Number and symbol/function key layer
-- Hexadecimal keypad layer
-- Navigation keypad layer
-- Dynamic macro layer
-- Autocompletion tap key pairs (),[],{}
-- Normalized enter and esc key position across keyboard layers
-- Extensive use of tap keys
diff --git a/keyboards/planck/keymaps/sdothum/rules.mk b/keyboards/planck/keymaps/sdothum/rules.mk
deleted file mode 100644
index ea9abc2a80d..00000000000
--- a/keyboards/planck/keymaps/sdothum/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Build Options:
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes  # mouse keys(+4700)
-EXTRAKEY_ENABLE  = no   # audio control and System control(+450)
-CONSOLE_ENABLE   = no   # console for debug(+400)
-COMMAND_ENABLE   = no   # commands for debug and configuration
-NKRO_ENABLE      = yes  # nkey rollover
-BACKLIGHT_ENABLE = no   # enable keyboard backlight functionality
-MIDI_ENABLE      = no   # MIDI controls
-AUDIO_ENABLE     = no   # audio output on port C6
-UNICODE_ENABLE   = no   # unicode
-BLUETOOTH_ENABLE = no   # enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no   # enable WS2812 RGB underlight, do not enable this with audio at the same time.
-STENO_ENABLE     = yes	# enable TX Bolt protocol, requires VIRTSER and may not work with mouse keys
-
-# do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no   # breathing sleep LED during USB suspend
-
-TAP_DANCE_ENABLE = yes  # enable double tap completion of (),[],{}
-
diff --git a/keyboards/planck/keymaps/sean/config.h b/keyboards/planck/keymaps/sean/config.h
deleted file mode 100644
index 2bebf48a1ca..00000000000
--- a/keyboards/planck/keymaps/sean/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/sean/keymap.c b/keyboards/planck/keymaps/sean/keymap.c
deleted file mode 100644
index 42847b646c1..00000000000
--- a/keyboards/planck/keymaps/sean/keymap.c
+++ /dev/null
@@ -1,304 +0,0 @@
-// This is Sean Hunter's keymap file, customized from the canonical layout file for the Quantum project.
-// If you want to add another keyboard, that is the style you want to emulate.
-
-#include QMK_KEYBOARD_H
-#include "mymappings.h"
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-
-enum planck_layers {
-  _DVRK,
-  _LOWER,
-  _RAISE,
-  _SDRK,
-  _SLWER,
-  _SRAIS,
-  _NMPD,
-  _MVMT,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  DVRK = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  SDRK,
-  SLWER,
-  SRAIS,
-  BACKLIT,
-  BACKTOG,
-  CUT,
-  COPY,
-  PASTE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * |   "  |   ,  |   .  |   P  |   Y  |   /  |   =  |   F  |   G  |   C  |   R  |   L  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   A  |   O  |   E  |   U  |   I  | ESC  | BSPC |   D  |   H  |   T  |   N  |   S  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ;  |   Q  |   J  |   K  |   X  | TAB  | ENT  |   B  |   M  |   W  |   V  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Sft  | Ctl  | Alt  | Gui  |Lower |    Space    |Raise |   <  |   v  |   ^  |   >  |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVRK] = LAYOUT_planck_grid(
-  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_SLSH, KC_EQL,  KC_F,     KC_G,    KC_C,   KC_R,    KC_L,
-  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_ESC,  KC_BSPC, KC_D,     KC_H,    KC_T,   KC_N,    KC_S,
-  KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_TAB,  KC_ENT,  KC_B,     KC_M,    KC_W,   KC_V,    KC_Z,
-  KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE, KC_LEFT, KC_DOWN,  KC_UP, KC_RIGHT
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | F1   |  F2  |  F3  |  F4  |  F5  |  {   |  }   |  F6  |  F7  |  F8  |  F9  | F10  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  1   |   2  |   3  |   4  |   5  |  [   |  ]   |   6  |   7  |   8  |   9  |  0   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   ~  |   |  |   `  |   -  |   _  | INS  | DEL  |   (  |   )  |   +  |   =  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Sft  | Ctl  | Alt  | Gui  |Lower |             |Raise | Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_LCBR, KC_RCBR, KC_F6,     KC_F7,    KC_F8,   KC_F9,    KC_F10,
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LBRC, KC_RBRC, KC_6,      KC_7,     KC_8,    KC_9,     KC_0,
-  KC_TILD, KC_PIPE, KC_GRV,  KC_MINS, KC_UNDS, KC_INS,  KC_DEL,  KC_LPRN,   KC_RPRN,  KC_PLUS, KC_EQL,   KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______,   KC_HOME,  KC_PGDN, KC_PGUP,  KC_END
-),
-
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | F11  |  F12 |  F13 |  F14 |  F15 |      |      |  F16 |  F17 |  F18 |  F19 | F20  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  !   |   @  |   #  |   $  |   %  |Sleep | Wake |   ^  |   &  |   *  |   (  |  )   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | GUI1 | GUI2 | GUI3 | GUI4 | GUI5 |             | GUI6 | GUI7 | GUI8 | GUI9 |GUI10 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Sft  | Ctl  | Alt  | Gui  |Lower |             |Raise | Gui  | Alt  | Ctl  | Sft  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-   KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15, _______, _______,   KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,
-  KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_SLEP, KC_WAKE,   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-    GUI_1,   GUI_2,   GUI_3,   GUI_4,   GUI_5, _______, _______,     GUI_6,   GUI_7,   GUI_8,   GUI_9,  GUI_10,
-  KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,   LOWER,  KC_SPC,  KC_SPC,     RAISE, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
-),
-
-/* 'Software Dvorak': Designed to look like dvorak in the mapping but depend on software
- * dvorak (ie the OS keymapping changed to dvorak).
- * ,-----------------------------------------------------------------------------------.
- * |   "  |   ,  |   .  |   P  |   Y  |   /  |   =  |   F  |   G  |   C  |   R  |   L  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   A  |   O  |   E  |   U  |   I  | ESC  | BSPC |   D  |   H  |   T  |   N  |   S  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ;  |   Q  |   J  |   K  |   X  | TAB  | ENT  |   B  |   M  |   W  |   V  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Sft  | Ctl  | Alt  | Gui  |SLower|    Space    |SRaise|   <  |   v  |   ^  |   >  |
- * `-----------------------------------------------------------------------------------'
- */
-[_SDRK] = LAYOUT_planck_grid(
-  DV_QUOT, DV_COMM, DV_DOT,  DV_P,    DV_Y,    DV_SLSH, DV_EQL,  DV_F,     DV_G,    DV_C,   DV_R,    DV_L,
-  DV_A,    DV_O,    DV_E,    DV_U,    DV_I,    KC_ESC,  KC_BSPC, DV_D,     DV_H,    DV_T,   DV_N,    DV_S,
-  DV_SCLN, DV_Q,    DV_J,    DV_K,    DV_X,    KC_TAB,  KC_ENT,  DV_B,     DV_M,    DV_W,   DV_V,    DV_Z,
-  KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, SLWER,   KC_SPC,  KC_SPC, SRAIS, KC_LEFT, KC_DOWN,  KC_UP, KC_RIGHT
-),
-
-
-/* 'Software dvorak lower mode':  Puts all the braces etc in the right places so it works
- * just like the lower mode above except that it depends on the OS keymapping being set
- * to dvorak.
- * ,-----------------------------------------------------------------------------------.
- * | F1   |  F2  |  F3  |  F4  |  F5  |  {   |  }   |  F6  |  F7  |  F8  |  F9  | F10  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  1   |   2  |   3  |   4  |   5  |  [   |  ]   |   6  |   7  |   8  |   9  |  0   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   ~  |   |  |   `  |   -  |   _  | INS  | DEL  |   (  |   )  |   +  |   =  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Sft  | Ctl  | Alt  | Gui  |SLower|             |SRaise| Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_SLWER] = LAYOUT_planck_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   DV_LCBR, DV_RCBR, KC_F6,     KC_F7,    KC_F8,   KC_F9,    KC_F10,
-  DV_1,    DV_2,    DV_3,    DV_4,    DV_5,    DV_LBRC, DV_RBRC, DV_6,      DV_7,     DV_8,    DV_9,     DV_0,
-  DV_TILD, DV_PIPE, DV_GRV,  DV_MINS, DV_UNDS, KC_INS,  KC_DEL,  DV_LPRN,   DV_RPRN,  DV_PLUS, DV_EQL,   DV_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______,   KC_HOME,  KC_PGDN, KC_PGUP,  KC_END
-),
-
-
-/* 'Software dvorak raise mode'
- * ,-----------------------------------------------------------------------------------.
- * | F11  |  F12 |  F13 |  F14 |  F15 |      |      |  F16 |  F17 |  F18 |  F19 | F20  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  !   |   @  |   #  |   $  |   %  |Sleep | Wake |   ^  |   &  |   *  |   (  |  )   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | GUI1 | GUI2 | GUI3 | GUI4 | GUI5 |             | GUI6 | GUI7 | GUI8 | GUI9 |GUI10 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Sft  | Ctl  | Alt  | Gui  |Lower |             |Raise | Gui  | Alt  | Ctl  | Sft  |
- * `-----------------------------------------------------------------------------------'
- */
-[_SRAIS] = LAYOUT_planck_grid(
-   KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15, _______, _______,   KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,
-  DV_EXLM,   DV_AT, DV_HASH,  DV_DLR, DV_PERC, KC_SLEP, KC_WAKE,   DV_CIRC, DV_AMPR, DV_ASTR, DV_LPRN, DV_RPRN,
-    GUI_1,   GUI_2,   GUI_3,   GUI_4,   GUI_5, _______, _______,     GUI_6,   GUI_7,   GUI_8,   GUI_9,  GUI_10,
-  KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,   SLWER,  KC_SPC,  KC_SPC,     SRAIS, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
-),
-
-
-/* Adjust (Lower + Raise or SLower + SRaise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |AGnorm|AGswap|      |      |HRevl |HReset|HMenu |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | PWR  | EJCT | CUT  | COPY |PASTE |PrScr |SysReq| CAPS | <<   |  >>  | Mute | Stop |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |DVORAK|NUMPAD| MVMT | SDRK |      |      |      |      | Next | Vol- | Vol+ | Play |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Brite |BToggl|      |      |             |      |      | Gui  | Alt  | Ctl  | Sft  |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______,     QK_BOOT, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______,    HRVL,  HRESET,  HMENU,
-   KC_PWR,   KC_EJCT,       CUT,    COPY,   PASTE, KC_PSCR, KC_SYRQ, KC_CAPS, KC_MRWD, KC_MFFD, KC_MUTE, KC_MSTP,
-     DVRK, TO(_NMPD), TO(_MVMT),    SDRK, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
-  BACKLIT,   BACKTOG,   _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
-),
-
-
-/* Numpad
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |NumLck|   7  |   8  |   9  |   /  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Enter |   4  |   5  |   6  |   *  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |DVORAK|NUMPAD| MVMT | SDRK |      |      |      |      |   3  |   2  |   1  |   -  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |   0  |   .  |   +  |
- * `-----------------------------------------------------------------------------------'
- */
-[_NMPD] = LAYOUT_planck_grid(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_PSLS,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PENT, KC_P4,   KC_P5,   KC_P6,   KC_PAST,
-    TO(_DVRK),TO(_NMPD),TO(_MVMT),SDRK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PPLS
-),
-
-
-/* Movement
- * ,-----------------------------------------------------------------------------------.
- * |MsBut2|MsWhDn|MsWhUp|MsBut1|MsBut3|      |      |      | Home | PgDn | PgUp |  End |
- * +------+------+------+------+------+------+------+------+------+------+------+------+
- * |Ms Lft|Ms Dn |Ms Up |Ms Rht|      |      |      |      | Left | Down |  Up  | Right|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |DVORAK|NUMPAD| MVMT | SDRK |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Sft  | Ctl  | Alt  | Gui  |      |             |      | Gui  | Alt  | Ctl  | Sft  |
- * `-----------------------------------------------------------------------------------'
- */
-[_MVMT] = LAYOUT_planck_grid(
-    KC_MB2,  KC_MWDN, KC_MWUP, KC_MB1,   KC_MB3, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END,
-    KC_MLFT, KC_MDN,  KC_MUP,  KC_MRGT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-    TO(_DVRK),TO(_NMPD),TO(_MVMT),SDRK,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, _______, _______, _______, _______, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
-),
-};
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case DVRK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVRK);
-        layer_on(_DVRK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case SDRK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_SDRK);
-        layer_on(_SDRK);
-      }
-      return false;
-      break;
-    case SLWER:
-      if (record->event.pressed) {
-        layer_on(_SLWER);
-        update_tri_layer(_SLWER, _SRAIS, _ADJUST);
-      } else {
-        layer_off(_SLWER);
-        update_tri_layer(_SLWER, _SRAIS, _ADJUST);
-      }
-      return false;
-      break;
-    case SRAIS:
-      if (record->event.pressed) {
-        layer_on(_SRAIS);
-        update_tri_layer(_SLWER, _SRAIS, _ADJUST);
-      } else {
-        layer_off(_SRAIS);
-        update_tri_layer(_SLWER, _SRAIS, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case BACKTOG:
-      if (record->event.pressed) {
-        #ifdef BACKLIGHT_ENABLE
-          backlight_toggle();
-        #endif
-      }
-      return false;
-      break;
-    case CUT: //cut macro
-	    return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_X), UP(KC_LCTL), END );
-    case COPY: // copy macro
-	    return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_C), UP(KC_LCTL), END );
-    case PASTE: // paste macro
-	    return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_V), UP(KC_LCTL), END );
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-}
diff --git a/keyboards/planck/keymaps/sean/mymappings.h b/keyboards/planck/keymaps/sean/mymappings.h
deleted file mode 100644
index 676cf018ebb..00000000000
--- a/keyboards/planck/keymaps/sean/mymappings.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//Defines etc for Sean Hunter's keymap.
-
-#include "keymap_extras/keymap_dvorak.h"
-
-#define PERMISSIVE_HOLD
-
-//Special hammerspoon keys
-#define HMENU  LCTL(LSFT(KC_BSLS))
-#define HRESET LCTL(LSFT(KC_EQL))
-#define HRVL   LCTL(LSFT(KC_SLSH))
-
-//Make virtual desktops a little easier on i3 (otherwise on this keyboard they're awkward
-#define GUI_1 LGUI(KC_1)
-#define GUI_2 LGUI(KC_2)
-#define GUI_3 LGUI(KC_3)
-#define GUI_4 LGUI(KC_4)
-#define GUI_5 LGUI(KC_5)
-#define GUI_6 LGUI(KC_6)
-#define GUI_7 LGUI(KC_7)
-#define GUI_8 LGUI(KC_8)
-#define GUI_9 LGUI(KC_9)
-#define GUI_10 LGUI(KC_0)
-
-//Abbreviations for mouse keys
-#define KC_MUP KC_MS_UP
-#define KC_MDN KC_MS_DOWN
-#define KC_MLFT KC_MS_LEFT
-#define KC_MRGT KC_MS_RIGHT
-#define KC_MB1 KC_MS_BTN1
-#define KC_MB2 KC_MS_BTN2
-#define KC_MB3 KC_MS_BTN3
-#define KC_MB4 KC_MS_BTN4
-#define KC_MB5 KC_MS_BTN5
-#define KC_MWUP KC_MS_WH_UP
-#define KC_MWDN KC_MS_WH_DOWN
diff --git a/keyboards/planck/keymaps/sean/readme.md b/keyboards/planck/keymaps/sean/readme.md
deleted file mode 100644
index ac39d185ffa..00000000000
--- a/keyboards/planck/keymaps/sean/readme.md
+++ /dev/null
@@ -1,130 +0,0 @@
-# Sean Hunter's Planck Layout
-
-## Main layout
-
-Inspired by my old typematrix dvorak keyboard, with escape, tab, enter and
-backspace in the middle.  
-
-```
- ,-----------------------------------------------------------------------------------.
- |   "  |   ,  |   .  |   P  |   Y  |   /  |   =  |   F  |   G  |   C  |   R  |   L  |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |   A  |   O  |   E  |   U  |   I  | ESC  | BSPC |   D  |   H  |   T  |   N  |   S  |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |   ;  |   Q  |   J  |   K  |   X  | TAB  | ENT  |   B  |   M  |   W  |   V  |   Z  |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Sft  | Ctl  | Alt  | Gui  |Lower |    Space    |Raise |   <  |   v  |   ^  |   >  |
- `-----------------------------------------------------------------------------------'
- ```
-
-## Lower
-
-With Lower, the numbers are on the home row.  Brackets and braces are down the
-centre of the keyboard when holding lower, and most other special characters,
-can be found on the row below home.  One row up are the main function keys.
-The arrow keys become `Home`, `End` and `Page Up` and `Page Down`.
-
- ```
- ,-----------------------------------------------------------------------------------.
- | F1   |  F2  |  F3  |  F4  |  F5  |  {   |  }   |  F6  |  F7  |  F8  |  F9  | F10  | 
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  1   |   2  |   3  |   4  |   5  |  [   |  ]   |   6  |   7  |   8  |   9  |  0   |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |   ~  |   |  |   `  |   -  |   _  | INS  | DEL  |   (  |   )  |   +  |   =  |  \   |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Sft  | Ctl  | Alt  | Gui  |Lower |             |Raise | Home | PgDn | PgUp | End  |
- `-----------------------------------------------------------------------------------'
-```
-
-## Raise
-
-With Raise, the middle row functions as though we are holding shift and typing
-numbers.  This makes it a little easier than trying to hold lower and shift at
-the same time.  The row below home is a set of keys mapped from `Gui-1` to
-`Gui-0`.  I use these to change virtual desktops on [i3](https://i3wm.org/).  I
-also include 'right' versions of the modifier keys on here.
-
-
- ```
- ,-----------------------------------------------------------------------------------.
- | F11  |  F12 |  F13 |  F14 |  F15 |      |      |  F16 |  F17 |  F18 |  F19 | F20  | 
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |  !   |   @  |   #  |   $  |   %  |Sleep | Wake |   ^  |   &  |   *  |   (  |  )   |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | GUI1 | GUI2 | GUI3 | GUI4 | GUI5 |      |      | GUI6 | GUI7 | GUI8 | GUI9 |GUI10 |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Sft  | Ctl  | Alt  | Gui  |Lower |             |Raise | Gui  | Alt  | Ctl  | Sft  |
- `-----------------------------------------------------------------------------------'
-
-```
-
-## Adjust
-
-Raise and lower at the same time give an adjustment layer, which allows
-changing to the numpad and movement layer, and adjusting the backlights
-(assuming you have them - I don't yet).  I have also added various media keys
-and the all-important `Reset` key for programming the keyboard.  I've got the
-ability to swap `Alt` and `Gui` in hardware and three special keys set up for
-[hammerspoon]( http://www.hammerspoon.org/) on mac.  If I ever start using this
-keyboard seriously on mac again (I'm using it mainly on Windows and Linux atm)
-I'll write a special Mac mode and redo all my hammerspoon config to be more
-like i3 on Linux.
-
-```
- Adjust (Lower + Raise)
- ,-----------------------------------------------------------------------------------.
- |      | Reset|      |      |      |AGnorm|AGswap|      |      |HRevl |HReset|HMenu |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | PWR  | EJCT | CUT  | COPY |PASTE |PrScr |SysReq| CAPS | <<   |  >>  | Mute | Stop |
- |------+------+------+------+------+------|------+------+------+------+------+------|
- |DVORAK|NUMPAD| MVMT | SDRK |      |      |      |      | Next | Vol- | Vol+ | Play |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |Brite |BToggl|      |      |             |      |      | Gui  | Alt  | Ctl  | Sft  |
- `-----------------------------------------------------------------------------------'
-```
-
-## Numpad                                                                                                             
-
-I have added a numpad, although this is a little annoying at the moment as you
-have to first press `NumLock` to use.  I guess I could make a macro so as soon as
-you go into numpad mode it turns `NumLock` on.
-
-```
- ,-----------------------------------------------------------------------------------.
- |      |      |      |      |      |      |      |NumLck|   7  |   8  |   9  |   /  |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |      |      |Enter |   4  |   5  |   6  |   *  |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |DVORAK|NUMPAD| MVMT | SDRK |      |      |      |      |   3  |   2  |   1  |   -  |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- |      |      |      |      |      |             |      |      |   0  |   .  |   +  |
- `-----------------------------------------------------------------------------------'
-```
-
-## Movement
-
-I have added a movement layer but at present I seldom use it.
-
-```
- ,-----------------------------------------------------------------------------------.
- |MsBut2|MsWhDn|MsWhUp|MsBut1|MsBut3|      |      |      | Home | PgDn | PgUp |  End |
- +------+------+------+------+------+------+------+------+------+------+------+------+
- |Ms Lft|Ms Dn |Ms Up |Ms Rht|      |      |      |      | Left | Down |  Up  | Right|
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |DVORAK|NUMPAD| MVMT | SDRK |      |      |      |      |      |      |      |      |
- |------+------+------+------+------+-------------+------+------+------+------+------|
- | Sft  | Ctl  | Alt  | Gui  |      |             |      | Gui  | Alt  | Ctl  | Sft  |
- `-----------------------------------------------------------------------------------'
-```
-
-## Software Dvorak mode
-
-I have implemented a version of the main, lower and raise maps that works if
-the computer itself is in dvorak mode at the os level.  This allows me to work
-well on my laptop when I have to take it with me (eg to go to a meeting) and
-don't want the keyboard with me.  I simply set it in dvorak mode in the os and
-then put the keyboard into this mode.
-
-## TODO
-
-1. Actually learn to use the media keys
diff --git a/keyboards/planck/keymaps/sebas/keymap.c b/keyboards/planck/keymaps/sebas/keymap.c
deleted file mode 100644
index 631ad6fc231..00000000000
--- a/keyboards/planck/keymaps/sebas/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include QMK_KEYBOARD_H
-enum planck_layers {
-  _DEFAULT,
-  _LOWER,
-  _RAISE,
-  _FN
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define FN MO(_FN)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Default
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  Tab |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   "  |  ;   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |  FN  | Lower|    Space    |Raise |   /  | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DEFAULT] = 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_QUOT, KC_SCLN,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,    KC_ENT ,
-    KC_LCTL, KC_LALT, KC_LGUI, FN,      LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN,  KC_RGHT
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |   _  |   +  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |   {  |   }  | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |   ?  |      | Vol- |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, KC_PIPE,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_VOLU, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_QUES, _______, KC_VOLD, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |  -   |   =   |     |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |   [  |   ]  | Vol- |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      | Vol+ |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_MINS, KC_EQL,  _______, KC_BSLS,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_VOLU, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______ 
-),
- 
- /* FN
- * ,-----------------------------------------------------------------------------------.
- * | Reset| F1   |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |  F11 |  F12 |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | TRNS |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FN] = LAYOUT_planck_grid(
-    QK_BOOT, 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/planck/keymaps/sebas/readme.md b/keyboards/planck/keymaps/sebas/readme.md
deleted file mode 100644
index 4a0ad84fb69..00000000000
--- a/keyboards/planck/keymaps/sebas/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Sebas Planck layout
-My personal layout
diff --git a/keyboards/planck/keymaps/sgoodwin/config.h b/keyboards/planck/keymaps/sgoodwin/config.h
deleted file mode 100644
index 2bebf48a1ca..00000000000
--- a/keyboards/planck/keymaps/sgoodwin/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/sgoodwin/keymap.c b/keyboards/planck/keymaps/sgoodwin/keymap.c
deleted file mode 100644
index fbfe793cb8a..00000000000
--- a/keyboards/planck/keymaps/sgoodwin/keymap.c
+++ /dev/null
@@ -1,186 +0,0 @@
-// This is sgoodwin's layout file for the Quantum project.
-// It doesn't have Plover or Dvorak layers because he doesn't use that.
-// It Also doesn't allow for swapping alt with CMD because that only happens in error.
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _COLEMAK 0
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum planck_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  LOWER,
-  RAISE,
-  BACKLIT,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |SHEnt |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Hyper| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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, MT(MOD_RSFT, KC_ENT) ,
-  ALL_T(KC_NO),  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |SHEnt |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Hyper| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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, MT(MOD_RSFT, KC_ENT) ,
-  ALL_T(KC_NO),  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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),_______, _______, _______,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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, _______, _______, _______,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|      |      |Qwerty|Colemk|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  _______, _______, QWERTY,  COLEMAK, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/sgoodwin/readme.md b/keyboards/planck/keymaps/sgoodwin/readme.md
deleted file mode 100644
index dfa88f380da..00000000000
--- a/keyboards/planck/keymaps/sgoodwin/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# sgoodwin's Planck Layout
-
-Includes:
-
-1. No Dvorak or Plover
-2. No alt-swapping
-3. Right enter is shift when held down, enter when tapped.
-4. Bottom left corner in normal layers is Hyper and not brightness control.
-5. Brightness is instead in the bottom corner on raise/lower.
-
diff --git a/keyboards/planck/keymaps/sgoodwin/rules.mk b/keyboards/planck/keymaps/sgoodwin/rules.mk
deleted file mode 100644
index 10de3bfc035..00000000000
--- a/keyboards/planck/keymaps/sgoodwin/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/skank/keymap.c b/keyboards/planck/keymaps/skank/keymap.c
deleted file mode 100644
index fa933dca27f..00000000000
--- a/keyboards/planck/keymaps/skank/keymap.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* Copyright 2019 Khader Syed
- *
- * 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 skank_layers {
-  _QWERTY,
-  _COLEMAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum skank_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |   /  |Lower | Space|Space |Raise |   /  | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    QK_GESC, 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_UP,   KC_ENT,
-    KC_LCTL, KC_LALT, KC_LGUI, KC_BSLS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |  Up  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  |   /  |Lower | Space|Space |Raise |   /  | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_4x12(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    QK_GESC, 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_UP,   KC_ENT,
-    KC_LCTL, KC_LALT, KC_LGUI, KC_BSLS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   _  |   +  |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12(
-    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_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_UNDS, KC_PLUS, KC_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   _  |   +  | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_UNDS, KC_PLUS, KC_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|Qwerty|Colemk|      |      |      |      | Reset|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, AU_ON,   AU_OFF,   QWERTY, COLEMAK, _______, _______, _______, _______, QK_BOOT,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,   MI_ON,   MI_OFF, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/skank/readme.md b/keyboards/planck/keymaps/skank/readme.md
deleted file mode 100644
index 673956aca19..00000000000
--- a/keyboards/planck/keymaps/skank/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# My planck layout
-
-These are my changes:  
-
-- add a colemak layout
-- keep it clean
-- add option to enable mouse keys
-- and just enable some sound
diff --git a/keyboards/planck/keymaps/skank/rules.mk b/keyboards/planck/keymaps/skank/rules.mk
deleted file mode 100644
index 4c65d4af1e3..00000000000
--- a/keyboards/planck/keymaps/skank/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-
diff --git a/keyboards/planck/keymaps/skug/config.h b/keyboards/planck/keymaps/skug/config.h
deleted file mode 100644
index b82385f2685..00000000000
--- a/keyboards/planck/keymaps/skug/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-// Override SpaceCadet Settings
-#undef LSPO_KEY
-#undef RSPC_KEY
-#define LSPO_KEY KC_8 // Nordic Left SpaceCadet
-#define RSPC_KEY KC_9 // Nordic Right SpaceCadet
-
-// Audio
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(COIN_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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/skug/keymap.c b/keyboards/planck/keymaps/skug/keymap.c
deleted file mode 100644
index 05fcf93e750..00000000000
--- a/keyboards/planck/keymaps/skug/keymap.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert, Christoffer Holmberg
- *
- * 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_swedish.h"
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _DEFAULT,
-  _LOWER,
-  _RAISE,
-  _UTILITY,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  DEFAULT = SAFE_RANGE,
-  RAISE,
-  LOWER,
-  UTILITY,
-  BACKLIT,
-  S1, S2, S3, S4, S5, S6, S7, S8, S9
-};
-
-#define ESC_LOW LT(_LOWER, KC_ESC)
-#define BSP_RAI LT(_RAISE, KC_BSPC)
-#define LFT_CTR CTL_T(SE_QUOT)
-#define RGT_CTR CTL_T(KC_TILD)
-#define UTILITY MO(_UTILITY)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  Å   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Fn   |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   Ö  |  Ä   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   -  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Super| Alt  |      |L/Esc | Ret  | Space|R/Bspc|      |AltGr |   *  |  ¨   |
- * `-----------------------------------------------------------------------------------'
- */
-[_DEFAULT] = LAYOUT_planck_grid(
-    KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y    , KC_U   , KC_I   , KC_O   , KC_P   , SE_ARNG,
-    UTILITY, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H    , KC_J   , KC_K   , KC_L   , SE_ODIA, SE_ADIA,
-    SC_LSPO, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N    , KC_M   , KC_COMM, KC_DOT , SE_MINS, SC_RSPC,
-    LFT_CTR, KC_LALT, KC_LGUI, SE_AT  , ESC_LOW, KC_ENT , KC_SPC  , BSP_RAI, _______, KC_ALGR, SE_ASTR, RGT_CTR
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   +  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PLUS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, SE_RABK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    SE_HALF, LSFT(KC_1), SE_DQUO, LSFT(KC_3), SE_CURR, LSFT(KC_5), SE_AMPR, SE_SLSH, SE_LPRN, SE_RPRN, SE_EQL , SE_QUES,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, SE_LABK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Utility layer
- * ,-----------------------------------------------------------------------------------.
- * |      |      |  up  |      |      |      |      |      |  S1  |  S2  |  S3  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | left | down | right|      |      |      |      |  S4  |  S5  |  S6  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |  S7  |  S8  |  S9  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | Del  |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_UTILITY] = LAYOUT_planck_grid(
-    _______, _______, KC_UP  , _______, _______, _______, _______, _______, S1     , S2     , S3     , _______,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, S4     , S5     , S6     , _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, S7     , S8     , S9     , _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_DEL , _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |Reset |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |Utilit|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
-    _______, QK_BOOT, MU_NEXT, AU_ON  , AU_OFF , AG_NORM, AG_SWAP, DEFAULT, XXXXXXX, XXXXXXX, UTILITY, _______,
-    _______, SE_PIPE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-  float s1[][2]              = SONG(NUMBER_ONE);
-  float s2[][2]              = SONG(ZELDA_PUZZLE);
-  float s3[][2]              = SONG(ZELDA_TREASURE);
-  float s4[][2]              = SONG(OVERWATCH_THEME);
-  float s5[][2]              = SONG(IMPERIAL_MARCH);
-  float s6[][2]              = SONG(E1M1_DOOM);
-  float s7[][2]              = SONG(COIN_SOUND);
-  float s8[][2]              = SONG(ONE_UP_SOUND);
-  float s9[][2]              = SONG(SONIC_RING);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case DEFAULT:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DEFAULT);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case S1:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(s1);
-        #endif //AUDIO_ENABLE
-      }
-      return false;
-      break;
-    case S2:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(s2);
-        #endif //AUDIO_ENABLE
-      }
-      return false;
-      break;
-    case S3:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(s3);
-        #endif //AUDIO_ENABLE
-      }
-      return false;
-      break;
-    case S4:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(s4);
-        #endif //AUDIO_ENABLE
-      }
-      return false;
-      break;
-    case S5:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(s5);
-        #endif //AUDIO_ENABLE
-      }
-      return false;
-      break;
-    case S6:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(s6);
-        #endif //AUDIO_ENABLE
-      }
-      return false;
-      break;
-    case S7:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(s7);
-        #endif //AUDIO_ENABLE
-      }
-      return false;
-      break;
-    case S8:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(s8);
-        #endif //AUDIO_ENABLE
-      }
-      return false;
-      break;
-    case S9:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(s9);
-        #endif //AUDIO_ENABLE
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/skug/readme.md b/keyboards/planck/keymaps/skug/readme.md
deleted file mode 100644
index aa3e6cda006..00000000000
--- a/keyboards/planck/keymaps/skug/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-![Nordic Planck](https://i.imgur.com/0ZOLnx2.png)
-
-# Nordic Planck
-
-This is my attempt at making a Nordic layout for the planck with all nordic
-characters available in the default layer, things to note are the bottom row
-with Esc, Enter, Space and Backspace in the middle for easy thumb access and
-an arrow cluster on the left.
diff --git a/keyboards/planck/keymaps/skug/rules.mk b/keyboards/planck/keymaps/skug/rules.mk
deleted file mode 100644
index 9721fcd747e..00000000000
--- a/keyboards/planck/keymaps/skug/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-EXTRAKEY_ENABLE = no
-CONSOLE_ENABLE = no
diff --git a/keyboards/planck/keymaps/smittey/config.h b/keyboards/planck/keymaps/smittey/config.h
deleted file mode 100644
index 17ffcca383d..00000000000
--- a/keyboards/planck/keymaps/smittey/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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
-
-#define MIDI_BASIC
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/smittey/keymap.c b/keyboards/planck/keymaps/smittey/keymap.c
deleted file mode 100644
index d65f0ffd3ee..00000000000
--- a/keyboards/planck/keymaps/smittey/keymap.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST,
-  _FN,
-  _SPACE_FN
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-// Fillers to make layering more clear
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define FN MO(_FN)
-#define SPACE_FN LT(_SPACE_FN, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-  * ,-----------------------------------------------------------------------------------.
-  * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Ctrl |  FN  | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_QWERTY] = LAYOUT_planck_grid(
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,      KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-      KC_ESC,  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, MT(MOD_LSFT, KC_ENT),
-      KC_LCTL, FN,      KC_LALT, KC_LGUI, LOWER,   SPACE_FN,  SPACE_FN,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-
-  /* Lower
-  * ,-----------------------------------------------------------------------------------.
-  * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * |      |      |      |      |      |      |   *  |   4  |   5  |   6  |   -  |      |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * |      |      |      |      |      |      |   /  |   1  |   2  |   3  |   +  |Enter |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * |      |      |      |      |      |    Space    |      |   0  |   .  |   =  |      |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_LOWER] = LAYOUT_planck_grid(
-      XXXXXXX, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,     KC_0,     KC_BSPC,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ASTR,  KC_4,     KC_5,    KC_6,     KC_MINS,  XXXXXXX,
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLSH,  KC_1,     KC_2,    KC_3,     KC_PLUS,  MT(MOD_LSFT, KC_ENT),
-      _______, XXXXXXX, _______, _______, _______, KC_SPC,  KC_SPC,   _______,  KC_0,    KC_DOT,   KC_EQL,   XXXXXXX
-  ),
-
-  /* Raise
-  * ,-----------------------------------------------------------------------------------.
-  * |   `  |   !  |   "  |   £  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * |      |   ~  |   #  |   /  |   {  |   [  |   ]  |   }  |   \  |   -  |   =  |  |   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * |      |      |      |      |      |      |      |      |      |   _  |   +  |Enter |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * |      |      |      |      |      |    Space    |      | Home | PgDn | PgUp | End  |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_RAISE] = LAYOUT_planck_grid(
-      KC_GRV,   KC_EXLM, KC_DQUO,  LALT(KC_4), KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-      XXXXXXX,  KC_TILD, KC_NUHS,  KC_SLSH,    KC_LCBR,  KC_LBRC,  KC_RBRC,  KC_RCBR, KC_BSLS, KC_MINS, KC_EQL,  KC_PIPE,
-      XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, MT(MOD_LSFT, KC_ENT),
-      _______,  XXXXXXX, _______,  _______,    _______,  KC_SPC,   KC_SPC,   _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-  ),
-
-
-  /* fn
-  * ,-----------------------------------------------------------------------------------.
-  * |DelWrd|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | Del  |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * |      |  F11 |  F12 |      |      |      |      |      |      |      |      |      |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * |      |      |      |      |      |      |      |      |      |      |      | Enter|
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * |      |      |      |      |      |    Space    |      |      |      |      |      |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_FN] = LAYOUT_planck_grid(
-      LALT(KC_BSPC),  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-      XXXXXXX,        KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX,        _______, XXXXXXX, XXXXXXX, XXXXXXX,  KC_SPC,   KC_SPC,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-
-  /* Space fn
-  * ,-----------------------------------------------------------------------------------.
-  * |PRNT SC|      |  UP  |      |      |      |      |      |      |      |      |SLEEP |
-  * |-------+------+------+------+------+-------------+------+------+------+------+------|
-  * |       | LEFT | DOWN | RIGHT|      |      |      | LEFT | DOWN |  UP  | RIGHT|      |
-  * |-------+------+------+------+------+------|------+------+------+------+------+------|
-  * |       |      |      |      |      |      |      |      |      |      |      |      |
-  * |-------+------+------+------+------+------+------+------+------+------+------+------|
-  * |       |      |      |      |      |             |      | MUTE |VOLDWN|VOL UP|      |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_SPACE_FN] = LAYOUT_planck_grid(
-      KC_PSCR,  XXXXXXX, KC_UP,    XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,    KC_SLEP,
-      XXXXXXX,  KC_LEFT, KC_DOWN,  KC_RIGHT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT, KC_DOWN,  KC_UP,    KC_RIGHT,   XXXXXXX,
-      XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,    XXXXXXX,
-      XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX,   XXXXXXX,  _______,  _______,  XXXXXXX, KC_MUTE,  KC_VOLD,  KC_VOLU,    XXXXXXX
-  ),
-
-
-  /* Adjust (Lower + Raise)
-  * ,-----------------------------------------------------------------------------------.
-  * | Reset|Qwerty|      |      |      |      |      |      |      |MIDIof|MIDIon|  Del |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * |      |      |      |Dvorak|      |AGnorm|AGswap|      |      |Audoff|Aud on|      |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * |      |      |      |Colemk|      |      |      |      |      |Musoff|Mus on|      |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * |Plover|      |      |      |      |             |      |      |Voice-|Voice+|      |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_ADJUST] = LAYOUT_planck_grid(
-      QK_BOOT, QWERTY,  XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   MI_OFF,   MI_ON,   KC_DEL,
-      XXXXXXX, XXXXXXX, XXXXXXX,   DVORAK,    XXXXXXX,  AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX,   AU_OFF,   AU_ON,   XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX,   COLEMAK,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   MU_OFF,   MU_ON,   XXXXXXX,
-      PLOVER,  XXXXXXX, XXXXXXX,   XXXXXXX,   _______,  XXXXXXX, XXXXXXX, _______, XXXXXXX,   AU_PREV,  AU_NEXT, XXXXXXX
-  ),
-
-
-  /* Colemak
-  * ,-----------------------------------------------------------------------------------.
-  * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_COLEMAK] = LAYOUT_planck_grid(
-      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-      KC_ESC,  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, MT(MOD_LSFT, KC_ENT),
-      BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-
-  /* Dvorak
-  * ,-----------------------------------------------------------------------------------.
-  * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_DVORAK] = LAYOUT_planck_grid(
-      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-      KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    MT(MOD_LSFT, KC_ENT),
-      BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-
-  /* Plover layer (http://opensteno.org)
-  * ,-----------------------------------------------------------------------------------.
-  * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
-  * `-----------------------------------------------------------------------------------'
-  */
-
-  [_PLOVER] = LAYOUT_planck_grid(
-      KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,
-      XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-      XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-      EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return true;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return true;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return true;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return true;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return true;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return true;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      tap_code(KC_PGDN);
-    } else {
-      tap_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/smittey/readme.md b/keyboards/planck/keymaps/smittey/readme.md
deleted file mode 100644
index 28084765509..00000000000
--- a/keyboards/planck/keymaps/smittey/readme.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Planck Layout created by [Smittey](https://github.com/smittey) 
-
-A layout with a focus around coding, utilising the home row for symbols. There is an additional FN layer and Space function layer
-
-Main - Qwerty with ctrl swapped around and enter changed to be shift on hold
-Lower - Numbers and calculations
-Raise - Symbols
-Adjust - Keyboard settings and layout changers
-FN - Function keys
-Space FN - Navigation and media
-
-## Main
-![Main layer layout](https://i.imgur.com/jRbqGUN.png)
-
-## Lower
-![Lower layer layout](https://i.imgur.com/YmdM1q5.png)
-  
-## Raise
-![Raise layer layout](https://i.imgur.com/BXxOK1S.png)
-
-## Adjust
-![Adjust layer layout](https://i.imgur.com/M6qBaXO.png)
-
-## FN
-![FN layer layout](https://i.imgur.com/1eiUOH1.png)
-
-## Space Function
-![Space function layer layout](https://i.imgur.com/RJMFEdy.png)
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/smittey/rules.mk b/keyboards/planck/keymaps/smittey/rules.mk
deleted file mode 100644
index acf0896a321..00000000000
--- a/keyboards/planck/keymaps/smittey/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/smt/config.h b/keyboards/planck/keymaps/smt/config.h
deleted file mode 100644
index 2bebf48a1ca..00000000000
--- a/keyboards/planck/keymaps/smt/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/smt/keymap.c b/keyboards/planck/keymaps/smt/keymap.c
deleted file mode 100644
index 7d558e43830..00000000000
--- a/keyboards/planck/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,218 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define MEH_GRV     MEH_T(KC_GRV)               // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_ESC, 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, SFT_ENT,
-  MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  -   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT,
-  MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   0  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   $  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   4  |   5  |   6  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  ALL_T(KC_0),   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  CTL_T(KC_DLR), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_4,    KC_5,    KC_6,    _______, _______,
-  _______,       KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_1,    KC_2,    KC_3,    _______, _______,
-  _______,       _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |   _  |   ?  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |   -  |   /  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Home |PageDn|PageUp| End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  ALL_T(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_UNDS, KC_QUES, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______,        _______, _______, _______, _______, _______, KC_MINS, KC_SLSH, KC_EQL,  KC_LBRC, KC_RBRC, SFT_T(KC_BSLS),
-  _______,        _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      | Reset|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-#endif
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/smt/readme.md b/keyboards/planck/keymaps/smt/readme.md
deleted file mode 100644
index dc7c9cf9f14..00000000000
--- a/keyboards/planck/keymaps/smt/readme.md
+++ /dev/null
@@ -1,124 +0,0 @@
-# smt's Planck keymap
-
-This keymap is primarily based on the default Planck keymap.
-
-Notable differences from the default are:
-
-- **[Mod-Tap](https://github.com/jackhumbert/qmk_firmware/wiki#fun-with-modifier-keys) keys**
-
-    - `Esc/Ctrl`
-
-        I am experimenting with using Left Shift as a mod-tap key for Escape, similar to how I use the Enter key. It's set up like this on my Minivan, so in the interest of consistency...
-
-    - `Enter/Shift`
-
-        I use both the left and right shift keys when I type. When I want to modify a key with shift, I hold shift with the hand opposite the one typing the key. In the default keymap, Enter is where shift would be on a standard keyboard layout. Oh, muscle memory.
-
-    - `Tab/Hyper` (Super+Ctrl+Shift+Alt)
-
-        It's great to be able to use Tab as a custom modifier key. I tend to use [Hyper](http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/) commands for various OS-specific operations depending on what machine I'm working on.
-
-    - `Backtick/Meh` (Ctrl+Shift+Alt)
-
-        Why use backtick in the lower left corner? I use it as my tmux prefix key, so I need to type it more frequently than most people. Putting it on the base layer works well for me. The "Meh" mapping is just a less-cool "Hyper"; the same, just without Super.
-
-- **Swapped responsibilities of "lower" and "raise" layers**
-
-    I prefer to use symbols via the "raise" layer, and numbers via the "lower" layer.
-
-- **Removed Plover layer**
-
-    I don't intend to use stenography anytime soon, so Plover just didn't have a place in my keymap.
-
-
-## Qwerty
-
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|   `  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## Colemak
-
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|   `  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## Dvorak
-
-```
-,-----------------------------------------------------------------------------------.
-| Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  -   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|   `  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## Lower
-
-This is where I put the number row, a numpad cluster, function keys, and media controls.
-
-```
-,-----------------------------------------------------------------------------------.
-|   0  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|   $  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   4  |   5  |   6  |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-`-----------------------------------------------------------------------------------'
-```
-
-## Raise
-
-As a developer, it makes the most sense for me to group all the commonly-used symbols that don't fit on the main layer. In particular, having the dual-column of parens-braces-brackets really helps a lot. I've also added cursorkeys to correspond to the arrows.
-
-I haven't completely filled this layer, which leaves room for future mappings and macros.
-
-```
-,-----------------------------------------------------------------------------------.
-|   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |      |      |   _  |   ?  |   +  |   {  |   }  |  |   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |   -  |   /  |   =  |   [  |   ]  |  \   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      | Home |PageDn|PageUp| End  |
-`-----------------------------------------------------------------------------------'
-```
-
-## Adjust (Lower + Raise)
-
-Utility layer. This is where I'd switch between Qwerty and Dvorak, ~~fool around with~~ adjust the audio/music settings, or put the Planck into bootloader mode.
-
-```
-,-----------------------------------------------------------------------------------.
-|      | Reset|      |      |      |      |      |      |      |      |      | Reset|
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/planck/keymaps/snowkuma/config.h b/keyboards/planck/keymaps/snowkuma/config.h
deleted file mode 100644
index c61d2528045..00000000000
--- a/keyboards/planck/keymaps/snowkuma/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-// Settings for homerow mods
-#define TAPPING_TERM 250
-
-
-// Add the leader key feature
-#define LEADER_TIMEOUT 300
diff --git a/keyboards/planck/keymaps/snowkuma/custom_keycodes.h b/keyboards/planck/keymaps/snowkuma/custom_keycodes.h
deleted file mode 100644
index 5e4353c049a..00000000000
--- a/keyboards/planck/keymaps/snowkuma/custom_keycodes.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// These definitions are for convenience.
-// It is not wise to put sensitive information here such as passwords
-// as anyone with access to your keyboard will be able to use them!
-
-// magnet keycodes
-#define M_LEFT LCA(KC_LEFT)
-#define M_TOP LCA(KC_UP)
-#define M_BOTT LCA(KC_DOWN)
-#define M_RGHT LCA(KC_RGHT)
-
-#define M_TOPL LCA(KC_U)
-#define M_TOPR LCA(KC_I)
-#define M_BOTL LCA(KC_J)
-#define M_BOTR LCA(KC_K)
-
-#define M_L13 LCA(KC_D)
-#define M_L23 LCA(KC_E)
-#define M_C13 LCA(KC_F)
-#define M_R23 LCA(KC_T)
-#define M_R13 LCA(KC_G)
-
-#define M_NEXT LCAG(KC_RGHT)
-#define M_PREV LCAG(KC_LEFT)
-
-#define M_MAX LCA(KC_ENT)
-#define M_CEN LCA(KC_C)
-#define M_REST LCA(KC_BSPC)
-
-// Shortcuts
-#define INPUT_L LCAG(KC_SPC)
-#define TXT_PLS LGUI(KC_PLUS)
-#define TXT_MIN LGUI(KC_MINS)
-#define SC_CAPF LGUI(LSFT(KC_3))  // Capture the full screen to file
-#define SC_CAPP LGUI(LSFT(KC_4))  // Capture portion of screen to file
- 
-// Special Layer keycodes
-#define ESC_NUM LT(_NUMBER, KC_ESC)
-#define BSP_REG LT(_REGEX, KC_BSPC)
-#define DEL_REG LT(_REGEX, KC_DEL)
-#define MIN_ARR LT(_ARRANGE, KC_MINS)
-#define TAB_SFT LSFT_T(KC_TAB)
-#define SPC_SYM LT(_SYMBOL, KC_SPC)
-#define ENT_THU LT(_THUMB, KC_ENT)
-#define FUN_L MO(_FUNCTION)
-
-// HOMEROW SHIFT
-#define T_SFT LSFT_T(KC_T)
-#define N_SFT RSFT_T(KC_N)
-
-// Special Characters
-#define GBP LALT(KC_3)
-#define EURO LALT(S(KC_2))
-
-// Modifier tap holds
-#define Q_CTL LCTL_T(KC_Q)
-#define W_ALT LALT_T(KC_W)
-#define F_GUI LGUI_T(KC_F)
-#define U_GUI LGUI_T(KC_U)
-#define Y_ALT LALT_T(KC_Y)
-#define SCL_CTL LCTL_T(KC_SCLN)
diff --git a/keyboards/planck/keymaps/snowkuma/keymap.c b/keyboards/planck/keymaps/snowkuma/keymap.c
deleted file mode 100644
index 0df04d87fc7..00000000000
--- a/keyboards/planck/keymaps/snowkuma/keymap.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-/*                                   _
- *  ___   _ __     ___   __      __ | | __  _   _   _ __ ___     __ _
- * / __| | '_ \   / _ \  \ \ /\ / / | |/ / | | | | | '_ ` _ \   / _` |
- * \__ \ | | | | | (_) |  \ V  V /  |   <  | |_| | | | | | | | | (_| |
- * |___/ |_| |_|  \___/    \_/\_/   |_|\_\  \__,_| |_| |_| |_|  \__,_|
- *
- * https://github.com/snowkuma
- *
- * version 0.1
-*/
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-#include "custom_keycodes.h"
-#include "my_strings.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _COLEMAK = 0,
-  _SYMBOL,
-  _SFT_NAV,
-  _REGEX,
-  _NUMBER,
-  _ARRANGE,
-  _FUNCTION,
-  _MOUSE,
-  _THUMB
-};
-
-enum planck_keycodes {
-  EMAIL = SAFE_RANGE,
-  EMOJI,
-  EXT_PLV,
-  ITERM,
-  LESSON,
-  TYPE_FU,
-  VS_CODE,
-  VIM
-};
-
-
-// Tap Dance Declarations
-enum {
-  TD_RESET = 0,
-  TD_TILD
-};
-
-// Tap Dance Definitions
-void safe_reset(tap_dance_state_t *state, void *user_data) {
-    if (state->count >=3) {
-        // Reset the keyboard if you tap the key more than three times
-        reset_keyboard();
-        reset_tap_dance(state);
-    }
-}; void tilde_home(tap_dance_state_t *state, void *user_data) {
-    if (state->count > 2) {
-	register_code(KC_LSFT);
-        register_code(KC_GRV);
-    }
-    else {
-        register_code(KC_LSFT);
-        register_code(KC_GRV);
-	if (state->count > 1) {
-	// Outputs ~/ if tilde tapped twice
-          unregister_code(KC_GRV);
-          unregister_code(KC_LSFT);
-          register_code(KC_SLSH);
-        }
-    }
-}
-
-void tilde_reset(tap_dance_state_t *state, void *user_data)
-{
-  if (state->count == 2) {
-    unregister_code(KC_SLSH);
-  } else {
-    unregister_code(KC_GRV);
-    unregister_code(KC_LSFT);
-  }
-}
-
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_RESET] = ACTION_TAP_DANCE_FN (safe_reset),
-  [TD_TILD] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, tilde_home, tilde_reset)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* COLEMAK
- *
- * Base layer
- * ,-----------------------------------------------------------------------------------------------------------.
- * |   q    |   w    |   f    |   p    |   g    |        |        |   j    |   l    |   u    |   y    |   ;    |
- * |  CTRL  |  ALT   |  GUI   |        |        |        |        |        |        |  GUI   |  ALT   |  CTRL  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   a    |   r    |   s    |   t    |   d    |        |        |   h    |   n    |   e    |   i    |   o    |
- * |        |        |        | Shift  |        |        |        |        | Shift  |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   z    |   x    |   c    |   v    |   b    |        |        |   k    |   m    |   ,    |   .    |   '    |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |  Esc   | BkSp   |   -    |  Tab   | Space  | Enter  |        |        |
- * |        |        |        |  Num   | Regex  | Arrange| Shift  |  Sym   | Thumb  |        |        |        |
- * `--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    Q_CTL,   W_ALT,   F_GUI,   KC_P,    KC_G,    _______, _______, KC_J,    KC_L,    U_GUI,   Y_ALT,   SCL_CTL,
-    KC_A,    KC_R,    KC_S,    T_SFT,   KC_D,    _______, _______, KC_H,    N_SFT,   KC_E,    KC_I,    KC_O,
-    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_QUOT,
-    _______, _______, _______, ESC_NUM, BSP_REG, MIN_ARR, TAB_SFT, SPC_SYM, ENT_THU, _______, _______, _______
-),
-
-/* Symbol & Cursor Nav layer
- * ,-----------------------------------------------------------------------------------------------------------.
- * |   !    |   @    |   €    |   &    |   |    |        |        |        |  Home  |   Up   |  End   |  PgUp  |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   ~    |   <    |   %    |   >    |   +    |        |        |        |  Left  |  Down  | Right  |  PgDn  |
- * | 2x ~/  |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   `    |        |   £    |   =    |   -    |        |        |        |        |        |        |        |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |   _    |  Del   |   -    |        |  f()   |        |        |        |        |
- * |        |        |        |        | Mouse  |        |        |  Sym   |Function|        |        |        |
- * `--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
- */
-[_SYMBOL] = LAYOUT_planck_grid(
-    KC_EXLM, KC_AT,   EURO,    KC_AMPR, KC_PIPE,  _______, _______, _______, KC_HOME, KC_UP,   KC_END, KC_PGUP,
-    TD(TD_TILD), KC_LT, KC_PERC, KC_GT, KC_PLUS,  _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-    KC_GRV,  _______, GBP,     KC_EQL,  KC_MINS,  _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, KC_UNDS, DEL_REG,  KC_MINS, _______, _______, _______, _______, _______, _______
-),
-
-/* Regex layer
- * ,-----------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |   *    |   [    |   ^    |    ]   |   :    |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |   ?    |   (    |   $    |    )   |   /    |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |   |    |   {    |   #    |    }   |   \    |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |   f()  |        |        | Space  |        |        |        |
- * |        |        |        |        |  Regex |        |        | Mouse  |  Enter |        |        |        |
- * `--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
- */
-[_REGEX] = LAYOUT_planck_grid(
-    _______, _______, _______, _______, _______, _______, _______, KC_ASTR, KC_LBRC, KC_CIRC, KC_RBRC, KC_COLN,
-    _______, _______, _______, _______, _______, _______, _______, KC_QUES, KC_LPRN, KC_DLR,  KC_RPRN, KC_SLSH,
-    _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_LCBR, KC_HASH, KC_RCBR, KC_BSLS,
-    _______, _______, _______, _______, _______, _______, _______,  _______, KC_ENT,  _______, _______, _______
-),
-
-/* Number Layer
- * ,-----------------------------------------------------------------------------------------------------------.
- * |   :    |   F    |   E    |   D    |   G    |        |        |   *    |   7    |   8    |   9    |   0    |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   #    |   C    |   B    |   A    |   +    |        |        |   .    |   4    |   5    |   6    |   /    |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   €    |   x    |   £    |   =    |   -    |        |        |   ,    |   1    |   2    |   3    |   \    |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |  f()   |        |        |        |        |        |        |        |        |
- * |        |        |        | Number |        |        |        | Space  | Enter  |        |        |        |
- * `--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
-*
-*/
-[_NUMBER] = LAYOUT_planck_grid(
-    KC_COLN, S(KC_F), S(KC_E), S(KC_D), S(KC_G), _______, _______, KC_ASTR, KC_7,    KC_8,    KC_9,    KC_0,
-    KC_HASH, S(KC_C), S(KC_B), S(KC_A), KC_PLUS, _______, _______, KC_DOT,  KC_4,    KC_5,    KC_6,    KC_SLSH,
-    EURO,    KC_X,    GBP,     KC_EQL,  KC_MINS, _______, _______, KC_COMM, KC_1,    KC_2,    KC_3,    KC_BSLS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Mouse Layer
- * ,-----------------------------------------------------------------------------------------------------------.
- * |  Ctrl  |  Alt   |  GUI   |        |        |        |        |        |        |   Up   |        |  wUp   |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |  Btn3  |  Btn2  |  Btn1  | Shift  |        |        |        |        | Left   |  Down  | Right  |  wDn   |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |  f()   |        |        |  f()   |        |        |        |
- * |        |        |        |        | Mouse  |        |        | Mouse  |        |        |        |        |
- * `--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
-*/
-[_MOUSE] = LAYOUT_planck_grid(
-    KC_LCTL, KC_LALT, KC_LGUI, _______, _______, _______, _______, _______, _______, KC_MS_U, _______, KC_WH_U,
-    KC_BTN3, KC_BTN2, KC_BTN1, KC_LSFT, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Thumb Layer
- * ,-----------------------------------------------------------------------------------------------------------.
- * | Reset  |        | SC_CAPF| SC_CAPP|        |        |        |        |Input L |        |        |        |
- * |  (3x)  |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        | TypeFu | CMD +  |        |        |        | Caps   | emoji  | iterm  |        |
- * |        |        |        |        |        |        |        |        | Lock   |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        | VS_Code|  Vim   | CMD -  |        |        |        |        |        |        |        |
- * |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |  f()   |        |        |        |
- * |        |        |        |        |        |        |        |        | Thumb  |        |        |        |
- * `--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
- */
-[_THUMB] = LAYOUT_planck_grid(
-    TD(TD_RESET), _______, SC_CAPF, SC_CAPP, _______, _______, _______, _______, INPUT_L, _______, _______, _______,
-    _______, _______, _______, TYPE_FU, TXT_PLS,  _______, _______, _______, KC_CAPS, EMOJI,   ITERM,   _______,
-    _______, _______, VS_CODE, VIM,     TXT_MIN,  _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Arrange Layer
- * ,-----------------------------------------------------------------------------------------------------------.
- * |        |        |  Full  |        |        |        |        |        | Top L  |  Top   | Top R  |        |
- * |        |        | Screen |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |  L 1/3 | L 2/3  | C 1/3  | R 2/3  | R 1/3  |        |        | Prev   | Left   | Bottom | Right  | Next   |
- * |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Restore|        | Center |        |        |        |        |        | Bottom |        | Bottom |        |
- * |        |        |        |        |        |        |        |        |  Left  |        | Right  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |  f()   |        |        |        |        |        |
- * |        |        |        |        |        | Arrange|        |        |        |        |        |        |
- * `--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
-*/
-[_ARRANGE] = LAYOUT_planck_grid(
-    _______, _______, M_MAX,   _______, _______, _______, _______, _______, M_TOPL,  M_TOP,   M_TOPR,  _______,
-    M_L13,   M_L23,   M_C13,   M_R23,   M_R13,   _______, _______, M_PREV,  M_LEFT,  M_BOTT,  M_RGHT,  M_NEXT,
-    M_REST,  _______, M_CEN,   _______, _______, _______, _______, _______, M_BOTL,  _______, M_BOTR,  _______,
-    _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Function Layer
- * ,-----------------------------------------------------------------------------------------------------------.
- * | Ctrl   | Alt    |  GUI   |        |        |        |        |        |  F7    |  F8    |  F9    |  F10   |
- * |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        | Shift  |        |        |        |        |  F4    |  F5    |  F6    |  F11   |
- * |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |  F1    |  F2    |  F3    |  F12   |
- * |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |  f()   |  f()   |        |        |        |
- * |        |        |        |        |        |        |        |Function|Function|        |        |        |
- * `--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
-*/
-[_FUNCTION] = LAYOUT_planck_grid(
-    KC_LCTL, KC_LALT, KC_LGUI, _______, _______, _______, _______, KC_F13,  KC_F7,   KC_F8,   KC_F9,   KC_F10,
-    _______, _______, _______, KC_LSFT, _______, _______, _______, KC_F14,  KC_F4,   KC_F5,   KC_F6,   KC_F11,
-    _______, _______, _______, _______, _______, _______, _______, KC_F15,  KC_F1,   KC_F2,   KC_F3,   KC_F12,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  state = update_tri_layer_state(state, _SYMBOL, _THUMB, _FUNCTION);
-  state = update_tri_layer_state(state, _SYMBOL, _REGEX, _MOUSE);
-  return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case EMAIL:
-        if (record->event.pressed) {
-            SEND_STRING(MY_EMAIL);
-        }
-        return false;
-        break;
-    case ITERM:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LGUI(" "));
-            SEND_STRING("iterm" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case TYPE_FU:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LGUI(" "));
-            SEND_STRING("type fu" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case VIM:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LGUI(" "));
-            SEND_STRING("macvim.app" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case VS_CODE:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LGUI(" "));
-            SEND_STRING("visual studio code" SS_TAP(X_ENTER));
-        }
-        return false;
-        break;
-    case EMOJI:
-        if (record->event.pressed) {
-            register_code(KC_LGUI);
-            register_code(KC_LCTL);
-            register_code(KC_SPC);
-            unregister_code(KC_LGUI);
-            unregister_code(KC_LCTL);
-            unregister_code(KC_SPC);
-        }
-        return false;
-        break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-void matrix_scan_user(void) {
-    #ifdef AUDIO_ENABLE
-        if (muse_mode) {
-            if (muse_counter == 0) {
-                uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-                if (muse_note != last_muse_note) {
-                    stop_note(compute_freq_for_midi_note(last_muse_note));
-                    play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                    last_muse_note = muse_note;
-                }
-            }
-            muse_counter = (muse_counter + 1) % muse_tempo;
-        }
-    #endif
-}
-
-void matrix_init_user(void) {
-    set_unicode_input_mode(UNICODE_MODE_MACOS);
-}
diff --git a/keyboards/planck/keymaps/snowkuma/my_strings.h b/keyboards/planck/keymaps/snowkuma/my_strings.h
deleted file mode 100644
index 4e2ee6f770f..00000000000
--- a/keyboards/planck/keymaps/snowkuma/my_strings.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Email address
-#define MY_EMAIL "myname@email.com"
-// Canned responses
-#define CANNED_1 "A canned response / template for emails."
diff --git a/keyboards/planck/keymaps/snowkuma/readme.md b/keyboards/planck/keymaps/snowkuma/readme.md
deleted file mode 100644
index b1d5ff9c925..00000000000
--- a/keyboards/planck/keymaps/snowkuma/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Snowkuma's Planck Layout  v.0.1
-
-Wide colemak planck layout.  Heavily influenced by the ideas of sdothum and his blog.
-
-Aims to minimize key usage to minimal set and have hands in a comfortable position.
-
-![Colemak](https://i.imgur.com/4B3HdCE.png)
-![Symbol](https://i.imgur.com/WYxIJqv.png)
-![Regex](https://i.imgur.com/PxTCT6P.png)
-![Number](https://i.imgur.com/NzhW26R.png)
-![Arrange](https://i.imgur.com/BlTJjyW.png)
-![Shortcuts](https://i.imgur.com/p2ooSrC.png)
-![Function](https://i.imgur.com/U1F5J3R.png)
-![Mouse](https://i.imgur.com/nCHabXV.png)
diff --git a/keyboards/planck/keymaps/snowkuma/rules.mk b/keyboards/planck/keymaps/snowkuma/rules.mk
deleted file mode 100644
index e7706a252da..00000000000
--- a/keyboards/planck/keymaps/snowkuma/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-SRC += muse.c
-
-AUDIO_ENABLE     = yes
-BACKLIGHT_ENABLE = no
-BLUETOOTH_ENABLE = no 
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMBO_ENABLE     = no
-COMMAND_ENABLE   = no
-CONSOLE_ENABLE   = no
-EXTRAKEY_ENABLE  = yes
-LEADER_ENABLE    = yes
-MIDI_ENABLE      = no
-MOUSEKEY_ENABLE  = yes 
-NKRO_ENABLE      = yes # nkey rollover
-RGBLIGHT_ENABLE  = no
-SLEEP_LED_ENABLE = no
-STENO_ENABLE     = yes
-TAP_DANCE_ENABLE = yes
-UNICODE_ENABLE   = yes
diff --git a/keyboards/planck/keymaps/squarecut/config.h b/keyboards/planck/keymaps/squarecut/config.h
deleted file mode 100644
index 6e6d0f3ac73..00000000000
--- a/keyboards/planck/keymaps/squarecut/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* 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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/squarecut/keymap.c b/keyboards/planck/keymaps/squarecut/keymap.c
deleted file mode 100644
index 3bfb2d499e0..00000000000
--- a/keyboards/planck/keymaps/squarecut/keymap.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/* 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _QWERTY,
-  _OSX,
-  _NIXQWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  OSX,
-  NIXQWERTY,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Brite | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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, SFT_ENT,
-    KC_LCTL, BACKLIT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* OSX - Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | CMD  |Brite | Alt  | CTRL |Raise |    Space    |Lower | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_OSX] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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_LGUI, BACKLIT, KC_LALT, KC_LCTL, RAISE,   KC_SPC,  KC_SPC,  LOWER,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* NixQwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Brite | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_NIXQWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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, BACKLIT, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Del  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  `   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Home  | End  | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_DEL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_GRV,  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_HOME, KC_END,  KC_ENT, 
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Del  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ~    |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Pg Up |Pg Dn |Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_DEL, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    KC_TILD,  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_PGUP, KC_PGDN, KC_ENT,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|NixQty| OSX  |Plover|Colemk|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,   RGB_VAI, RGB_VAD, KC_DEL,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  NIXQWERTY, OSX,     PLOVER,  COLEMAK,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______,   DVORAK,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case OSX:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_OSX);
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-      }
-      return false;
-      break;
-    case NIXQWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_NIXQWERTY);
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/squarecut/readme.md b/keyboards/planck/keymaps/squarecut/readme.md
deleted file mode 100644
index 2aff8d543b8..00000000000
--- a/keyboards/planck/keymaps/squarecut/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# The Almost Default Planck Layout
-
-Simple changes right now, just some key shifts. Nothing major.
-
-# Based off foreveranapple keymap
-Lower on left, RAISE on right
-Swap Tab and Esc
-Assign long press Shift, short press Enter
-Continuous enter on lower/upper Enter
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/squarecut/rules.mk b/keyboards/planck/keymaps/squarecut/rules.mk
deleted file mode 100644
index 87df38d49e7..00000000000
--- a/keyboards/planck/keymaps/squarecut/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC += muse.c
-AUDIO_ENABLED = yes
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/steno/config.h b/keyboards/planck/keymaps/steno/config.h
deleted file mode 100644
index d3db1ffac1a..00000000000
--- a/keyboards/planck/keymaps/steno/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/planck/keymaps/steno/keymap.c b/keyboards/planck/keymaps/steno/keymap.c
deleted file mode 100644
index 4d22ee4ff3c..00000000000
--- a/keyboards/planck/keymaps/steno/keymap.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define ST_BOLT QK_STENO_BOLT
-#define ST_GEM  QK_STENO_GEMINI
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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 ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  FN  |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |  PWR | RES1 | RES2 |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-  STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-  STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-  XXXXXXX, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-  EXT_PLV, XXXXXXX, XXXXXXX, STN_A,   STN_O,   XXXXXXX, XXXXXXX, STN_E,   STN_U,   STN_PWR, STN_RE1, STN_RE2
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |TXBOLT|GEM RP|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, ST_BOLT, ST_GEM,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (!record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_PLOVER);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/steno/readme.md b/keyboards/planck/keymaps/steno/readme.md
deleted file mode 100644
index e8ffd975652..00000000000
--- a/keyboards/planck/keymaps/steno/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# The Default Planck Layout with TX Bolt for the Plover Layer
-
-To use set Plover to TX Bolt and select the COM port that represents your keyboard.
-
diff --git a/keyboards/planck/keymaps/steno/rules.mk b/keyboards/planck/keymaps/steno/rules.mk
deleted file mode 100644
index b2fd63a893d..00000000000
--- a/keyboards/planck/keymaps/steno/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRAKEY_ENABLE = no
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-STENO_ENABLE = yes          # Additional protocols for Stenography(+1700), requires VIRTSER
-AUDIO_ENABLE = no           # Audio output on port C6
-MIDI_ENABLE = no            # MIDI controls
-
diff --git a/keyboards/planck/keymaps/stuartfong1/config.h b/keyboards/planck/keymaps/stuartfong1/config.h
deleted file mode 100644
index 7245bc8063d..00000000000
--- a/keyboards/planck/keymaps/stuartfong1/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 Stuart Fong
- *
- * 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 MIDI_BASIC
-#define DYNAMIC_MACRO_NO_NESTING
-#define AUTO_SHIFT_TIMEOUT 175
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
diff --git a/keyboards/planck/keymaps/stuartfong1/keymap.c b/keyboards/planck/keymaps/stuartfong1/keymap.c
deleted file mode 100644
index 8d770ae83b1..00000000000
--- a/keyboards/planck/keymaps/stuartfong1/keymap.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* Copyright 2020 Stuart Fong
- *
- * 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"
-
-enum planck_layers 
-{
-    _COLEMAK,
-    _PLOVER,
-    _LOWER,
-    _RAISE,
-    _SYMBOL,
-    _FUNCTION,
-    _ADJUST
-};
-
-enum planck_keycodes {
-    COLEMAK = SAFE_RANGE,
-    PLOVER,
-    EXT_PLV,
-    CBR,  // {}
-    PRN,  // ()
-    BRC,  // []
-    DQUO, // ""
-    PRTSC3, // Capture Entire Screen
-    PRTSC4, // Capture Selected Portion
-    PRTSC5  // Screenshot Toolbar
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define SYMBOL MO(_SYMBOL)
-#define FUNCTION MO(_FUNCTION)
-
-#define LTL LT(LOWER, KC_BSPC)
-#define LTS LT(SYMBOL, KC_TAB)
-#define LTF LT(FUNCTION, KC_ENT)
-#define LTR LT(RAISE, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = 
-{
-    /* Colemak
-     * ,-----------------------------------------------------------------------------------.
-     * |   Q  |   W  |   F  |   P  |   B  |Macro1|Macro2|   J  |   L  |   U  |   Y  |   ;  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   A  |   R  |   S  |   T  |   G  |Play 1|Play 2|   M  |   N  |   E  |   I  |   O  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   Z  |   X  |   C  |   D  |   V  | Shift| Shift|   K  |   H  |   ,  |   .  |   /  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl | Alt  | GUI  | Bksp |  Tab | Caps |  Esc | Enter| Space|  GUI |  Alt | Ctrl |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_COLEMAK] = LAYOUT_planck_grid(
-        KC_Q,    KC_W,    KC_F,    KC_P, KC_B, DM_REC1, DM_REC2, KC_J, KC_L, KC_U,    KC_Y,    KC_SCLN, 
-        KC_A,    KC_R,    KC_S,    KC_T, KC_G, DM_PLY1, DM_PLY2, KC_M, KC_N, KC_E,    KC_I,    KC_O, 
-        KC_Z,    KC_X,    KC_C,    KC_D, KC_V, KC_LSFT, KC_RSFT, KC_K, KC_H, KC_COMM, KC_DOT,  KC_SLSH, 
-        KC_LCTL, KC_LALT, KC_LGUI, LTL,  LTS,  KC_CAPS, KC_ESC,  LTF,  LTR,  KC_RGUI, KC_RALT, KC_RCTL
-    ),
-
-    /* Plover layer (http://opensteno.org)
-     * ,-----------------------------------------------------------------------------------.
-     * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  Tab |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Enter|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Exit |  Up  | Down |   A  |   O  | Bksp | Space|   E  |   U  | Left | Right|  Esc |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_PLOVER] = LAYOUT_planck_grid(
-        KC_1,    KC_1,    KC_1,    KC_1, KC_1, KC_1,    KC_1,    KC_1, KC_1, KC_1,     KC_1,    KC_1,
-        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_ENT,  KC_A,    KC_S,    KC_D, KC_F, KC_G,    KC_H,    KC_J, KC_K, KC_L,     KC_SCLN, KC_QUOT,
-        EXT_PLV, KC_UP,   KC_DOWN, KC_C, KC_V, KC_BSPC, KC_SPC,  KC_N, KC_M, KC_LEFT,  KC_RGHT, KC_ESC
-    ),
-
-    /* Lower
-     * ,-----------------------------------------------------------------------------------.
-     * |   -  |   '  |   ;  |  {}  |   %  |      |      |   +  |   7  |   8  |   9  |   .  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   _  |   "  |   =  |  ()  |   /  |      |      |   -  |   4  |   5  |   6  |   0  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   \  |   &  |   !  |  []  |   ^  |      |      |   *  |   1  |   2  |   3  |   ,  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      | Enter| Space| Bksp |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_planck_grid(
-        KC_MINS, KC_QUOT, KC_SCLN, CBR,     KC_PERC, XXXXXXX, XXXXXXX, KC_PPLS, KC_P7, KC_P8,   KC_P9,   KC_DOT, 
-        KC_UNDS, DQUO,    KC_PEQL, PRN,     KC_PSLS, XXXXXXX, XXXXXXX, KC_PMNS, KC_P4, KC_P5,   KC_P6,   KC_P0, 
-        KC_PIPE, KC_AMPR, KC_EXLM, BRC,     KC_CIRC, XXXXXXX, XXXXXXX, KC_PAST, KC_P1, KC_P2,   KC_P3,   KC_COMM, 
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT,  LTR,   KC_BSPC, XXXXXXX, XXXXXXX
-    ),
-
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * |Buttn4|Buttn3|RClick|LClick| Mute |      |      |Accel2| Home | PgDn | PgUp |  End |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |MouseL|MouseU|MouseD|MouseR| VolD |      |      |Accel1| Left | Down |  Up  | Right|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |WheelL|WheelD|WheelU|WheelR| VolU |      |      |Accel0|  RWD | Play |  FFD | Stop |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_planck_grid(
-        KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_MUTE, XXXXXXX, XXXXXXX, KC_ACL2, KC_HOME, KC_PGDN, KC_PGUP, KC_END, 
-        KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R, KC_VOLD, XXXXXXX, XXXXXXX, KC_ACL1, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, 
-        KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_VOLU, XXXXXXX, XXXXXXX, KC_ACL0, KC_MRWD, KC_MPLY, KC_MFFD, KC_MSTP, 
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    /* Symbol
-     * ,-----------------------------------------------------------------------------------.
-     * |   !  |   @  |   #  |   $  |      |      |      |      |   +  |   {  |   }  |   '  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   %  |   ^  |   &  |   |  |      |      |      |      |   -  |   (  |   }  |   "  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   =  |   `  |   \  |   ~  |      |      |      |      |   *  |   (  |   )  |   _  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_SYMBOL] = LAYOUT_planck_grid(
-        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PLUS, KC_LCBR, KC_RCBR, KC_QUOT,
-        KC_PERC, KC_CIRC, KC_AMPR, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_LPRN, KC_RPRN, KC_DQUO,
-        KC_EQL,  KC_GRV,  KC_BSLS, KC_TILD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ASTR, KC_LBRC, KC_RBRC, KC_UNDS,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    /* Function
-     * ,-----------------------------------------------------------------------------------.
-     * |  F1  |  F2  |  F3  |  F4  |PrtSc5|      |      |      |  F13 |  F14 |  F15 |  F16 |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F5  |  F6  |  F7  |  F8  |PrtSc4|      |      |      |  F17 |  F18 |  F19 |  F20 |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F9  |  F10 |  F11 |  F12 |PrtSc3|      |      |      |  F21 |  F22 |  F23 |  F24 |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_FUNCTION] = LAYOUT_planck_grid(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   PRTSC5,  XXXXXXX, XXXXXXX, XXXXXXX, KC_F13,  KC_F14,  KC_F15,  KC_F16,
-        KC_F5,   KC_F6,   KC_F7,   KC_F8,   PRTSC4,  XXXXXXX, XXXXXXX, XXXXXXX, KC_F17,  KC_F18,  KC_F19,  KC_F20,
-        KC_F9,   KC_F10,  KC_F11,  KC_F12,  PRTSC3,  XXXXXXX, XXXXXXX, XXXXXXX, KC_F21,  KC_F22,  KC_F23,  KC_F24,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    /* Adjust (Lower + Raise)
-     *                      v------------------------RGB CONTROL--------------------v
-     * ,-----------------------------------------------------------------------------------.
-     * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|      |Plover|      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_ADJUST] = LAYOUT_planck_grid(
-        XXXXXXX, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, 
-        XXXXXXX, XXXXXXX, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, PLOVER,  XXXXXXX, XXXXXXX, XXXXXXX, 
-        XXXXXXX, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-};
-
-#ifdef AUDIO_ENABLE
-    float plover_song[][2]     = SONG(PLOVER_SOUND);
-    float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    bool is_plover_on = layer_state_cmp(state, _PLOVER);
-    bool static was_plover_on = false, autoshift_on;
-    if (is_plover_on != was_plover_on) {
-        if (is_plover_on) {
-            autoshift_on = get_autoshift_state();
-            autoshift_disable();
-        } else {
-            if (autoshift_on) {
-                autoshift_enable();
-                autoshift_on = false;
-            }
-        }
-        was_plover_on = is_plover_on;
-     }
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case CBR:
-            if (record->event.pressed) {
-                SEND_STRING("{}" SS_TAP(X_LEFT));
-            }
-            return false;
-            break;
-        case PRN:
-            if (record->event.pressed) {
-                SEND_STRING("()" SS_TAP(X_LEFT));
-            }
-            return false;
-            break;
-        case BRC:
-            if (record->event.pressed) {
-                SEND_STRING("[]" SS_TAP(X_LEFT));
-            }
-            return false;
-            break;
-        case DQUO:
-            if (record->event.pressed) {
-                SEND_STRING("\"\"" SS_TAP(X_LEFT));
-            }
-            return false;
-            break;
-        case PRTSC3:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCMD(SS_LSFT("3")));
-            }
-            return false;
-            break;
-        case PRTSC4:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCMD(SS_LSFT("4")));
-            }
-            return false;
-            break;
-        case PRTSC5:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCMD(SS_LSFT("5")));
-            }
-            return false;
-            break;
-        case PLOVER:
-            if (record->event.pressed) {
-                #ifdef AUDIO_ENABLE
-                    stop_all_notes();
-                    PLAY_SONG(plover_song);
-                #endif
-                layer_off(_RAISE);
-                layer_off(_LOWER);
-                layer_off(_ADJUST);
-                layer_on(_PLOVER);
-                if (!eeconfig_is_enabled()) {
-                    eeconfig_init();
-                }
-                keymap_config.raw  = eeconfig_read_keymap();
-                keymap_config.nkro = 1;
-                eeconfig_update_keymap(keymap_config.raw);
-            }
-            return false;
-            break;
-        case EXT_PLV:
-            if (record->event.pressed) {
-                #ifdef AUDIO_ENABLE
-                    PLAY_SONG(plover_gb_song);
-                #endif
-                    layer_off(_PLOVER);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/planck/keymaps/stuartfong1/readme.md b/keyboards/planck/keymaps/stuartfong1/readme.md
deleted file mode 100644
index 1e5bc5e0cd2..00000000000
--- a/keyboards/planck/keymaps/stuartfong1/readme.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# stuartfong1's Planck Layout
-
-I made this layout to improve ergonomics during daily usage, and to make access to symbols easier when writing code. The main idea is to make all keys easily accessible while reducing the risk of finger strain. 
-
-## Specifications
-This was made to work on a Planck rev. 6.1, and is used on macOS.
-
-## Base Layer
-
-![Image of Base Layer](https://i.imgur.com/XO7sgv4.png)
-
-This uses the Colemak DH layout with the wide mod.
-
-- Colemak is an alternative to the QWERTY layout designed for efficient and ergonomic typing in the English language (https://colemak.com). The Colemak DH is a modification of Colemak that makes the D and H keys easier to reach. The wide mod shifts the halves of the keyboard apart, making it easier on the shoulders (https://colemakmods.github.io/mod-dh/).
-- Space and backspace are located under the thumbs. Rotate the keys on the bottom row 180° for ease of use.
-- I use Auto Shift. This allows me to hold a key to shift it, which prevents me from having to reach for the shift key. The time to activate auto shift can be changed in the config.h file.
-- The 4 keys in the center are used for dynamic macros. On each side, hold the top key to start recording, and tap it to stop recording. Tap the middle key to play the macro. 2 macros can be stored at a time; the keys on the left are used for macro #1, and the keys on the right are used for macro #2.
-- Modifiers are located at the bottom left and bottom right of the keyboard. They can be accessed by moving the thumbs or with the sides of your hands.
-
-## Numpad Layer
-
-![Image of Numpad Layer](https://i.imgur.com/dPzvYM6.png)
-
-This contains a numpad and some non-alphanumeric characters such as math symbols and quotes.
-
-- The numpad is found under the right hand. It contains numbers and basic math symbols.
-- Brackets are typed using the left index finger. These keys. as well as the quotation marks, are macros that type both the beginning and end bracket, and move the cursor inside them.
-- The rest of the keys are those that are commonly used while writing code.
-
-## Navigation Layer
-
-![Image of Navigation Layer](https://i.imgur.com/Mr4EQbW.png)
-
-This contains mouse keys, arrow keys, and other keys used for navigation.
-
-- The left side has all the basic functionality of a mouse. The keys on the home row are used to move the mouse, the top ones are used for clicking on something, and the keys on the bottom are used to move the scroll wheel. The speed of the mouse can be adjusted using the right index finger.
-- The arrow keys are located on the right hand on the home row. Above these keys are some keys that are located on the navigation cluster.
-- Media keys are located on the bottom right, and the volume can be adjusted by using the left index finger.
-
-## Symbol Layer
-
-![Image of Symbol Layer](https://i.imgur.com/1ny1x9H.png)
-
-This contains all the symbols that are not found on the other layers.
-
-- The left side has most of the shifted number keys in increasing order. Some other keys here are for bitwise operators.
-- The right side has symbols that are repeated in the numpad layer. Individual brackets are located here in case I accidentally press backspace on one.
-
-## Function Layer
-
-![Image of Function Layer](https://i.imgur.com/Sc3qUs3.png)
-
-This has all the function keys from F1 to F24.
-
-- The function keys are sorted in increasing order.
-- F14 and F15 are used to lower and increase the brightness respectively.
-- Commands to screenshot / screen record are accessed with the left index finger.
-
-## Additional Layers
-
-- Adjust: Some settings for RGB control, music mode, and to reset the keyboard.
-
-![Image of Adjust Layer](https://i.imgur.com/gjxXXqj.png)
-
-- Plover: Used for stenography (http://www.openstenoproject.org). As I am still learning, I have included some extra keys.
-
-![Image of Plover Layer](https://i.imgur.com/uoSHgIC.png)
-
diff --git a/keyboards/planck/keymaps/stuartfong1/rules.mk b/keyboards/planck/keymaps/stuartfong1/rules.mk
deleted file mode 100644
index d6c7c7277dc..00000000000
--- a/keyboards/planck/keymaps/stuartfong1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SRC += muse.c
-AUTO_SHIFT_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
-STENO_ENABLE = yes
diff --git a/keyboards/planck/keymaps/synth_sample/config.h b/keyboards/planck/keymaps/synth_sample/config.h
deleted file mode 100644
index 930b26b0001..00000000000
--- a/keyboards/planck/keymaps/synth_sample/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright 2020 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 AUDIO_PIN A5
-    #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
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/synth_sample/keymap.c b/keyboards/planck/keymaps/synth_sample/keymap.c
deleted file mode 100644
index 4b6c53c3a83..00000000000
--- a/keyboards/planck/keymaps/synth_sample/keymap.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* Copyright 2019 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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 ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        register_code(KC_MS_WH_DOWN);
-        unregister_code(KC_MS_WH_DOWN);
-      #else
-        register_code(KC_PGDN);
-        unregister_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        register_code(KC_MS_WH_UP);
-        unregister_code(KC_MS_WH_UP);
-      #else
-        register_code(KC_PGUP);
-        unregister_code(KC_PGUP);
-      #endif
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
-
-#include "sample.h"
-
-uint32_t dac_sample_custom_counter = 0;
-
-uint16_t dac_value_generate(void) {
-  if (is_playing_note()) {
-    uint16_t sample = dac_sample_custom[dac_sample_custom_counter];
-    dac_sample_custom_counter = (dac_sample_custom_counter + 1) % AUDIO_DAC_SAMPLE_CUSTOM_LENGTH;
-    return sample;
-  } else {
-    return AUDIO_DAC_OFF_VALUE;
-  }
-}
diff --git a/keyboards/planck/keymaps/synth_sample/rules.mk b/keyboards/planck/keymaps/synth_sample/rules.mk
deleted file mode 100644
index ebfcda22143..00000000000
--- a/keyboards/planck/keymaps/synth_sample/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-AUDIO_ENABLE = yes
-AUDIO_DRIVER = dac_additive
diff --git a/keyboards/planck/keymaps/synth_sample/sample.h b/keyboards/planck/keymaps/synth_sample/sample.h
deleted file mode 100644
index 71c1b87e762..00000000000
--- a/keyboards/planck/keymaps/synth_sample/sample.h
+++ /dev/null
@@ -1,3797 +0,0 @@
-/*
-Copyright 2020 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/>.
-*/
-
-#define AUDIO_DAC_SAMPLE_CUSTOM_LENGTH 30208
-
-static const dacsample_t dac_sample_custom[30208] = {
-    2041, 2039, 2039, 2037, 2035, 2037, 2037, 2037,
-    2038, 2037, 2037, 2040, 2039, 2038, 2036, 2035,
-    2036, 2036, 2036, 2034, 2034, 2034, 2032, 2032,
-    2033, 2034, 2032, 2030, 2029, 2031, 2030, 2029,
-    2029, 2030, 2029, 2030, 2030, 2031, 2028, 2028,
-    2028, 2027, 2025, 2026, 2027, 2026, 2025, 2026,
-    2026, 2025, 2023, 2022, 2023, 2021, 2021, 2023,
-    2020, 2023, 2023, 2022, 2022, 2021, 2021, 2020,
-    2022, 2020, 2017, 2016, 2015, 2018, 2017, 2015,
-    2013, 2012, 2015, 2013, 2011, 2012, 2011, 2011,
-    2010, 2008, 2008, 2010, 2010, 2006, 2006, 2006,
-    2004, 2005, 2006, 2006, 2005, 2002, 2005, 2003,
-    2003, 2004, 2002, 2001, 2003, 2003, 2002, 2003,
-    2003, 2000, 2000, 2000, 1998, 1997, 1998, 1999,
-    1997, 1995, 1995, 1996, 1996, 1992, 1995, 1995,
-    1994, 1994, 1995, 1997, 1996, 1996, 1997, 1997,
-    1997, 1996, 1996, 1995, 1997, 1997, 1996, 1998,
-    1995, 1996, 1996, 1996, 1996, 1994, 1990, 1991,
-    1992, 1991, 1994, 1992, 1993, 1995, 1994, 1995,
-    1992, 1991, 1991, 1992, 1993, 1992, 1992, 1993,
-    1993, 1992, 1990, 1989, 1991, 1992, 1991, 1991,
-    1990, 1990, 1992, 1992, 1991, 1992, 1992, 1994,
-    1992, 1992, 1992, 1993, 1993, 1994, 1995, 1993,
-    1991, 1992, 1990, 1989, 1990, 1988, 1988, 1987,
-    1989, 1989, 1985, 1986, 1987, 1985, 1986, 1986,
-    1987, 1988, 1988, 1989, 1989, 1988, 1988, 1990,
-    1991, 1991, 1990, 1991, 1992, 1994, 1994, 1995,
-    1994, 1995, 1997, 1995, 1995, 1995, 1997, 1997,
-    1997, 1996, 1999, 2000, 1997, 1998, 1999, 2002,
-    2001, 2001, 2001, 2002, 2000, 1998, 2000, 2004,
-    2002, 2001, 2003, 2005, 2004, 2004, 2002, 2004,
-    2004, 2001, 2000, 2001, 2003, 2005, 2005, 2005,
-    2005, 2006, 2010, 2010, 2009, 2007, 2006, 2008,
-    2006, 2007, 2007, 2005, 2005, 2005, 2007, 2005,
-    2006, 2007, 2009, 2010, 2008, 2007, 2006, 2006,
-    2005, 2005, 2005, 2004, 2005, 2004, 2004, 2003,
-    2007, 2006, 2006, 2004, 2005, 2006, 2007, 2007,
-    2006, 2010, 2007, 2008, 2009, 2012, 2012, 2010,
-    2011, 2010, 2014, 2012, 2013, 2013, 2014, 2014,
-    2013, 2012, 2012, 2012, 2010, 2013, 2012, 2010,
-    2011, 2011, 2012, 2012, 2013, 2013, 2015, 2016,
-    2015, 2015, 2015, 2015, 2015, 2014, 2012, 2014,
-    2016, 2017, 2016, 2015, 2018, 2019, 2017, 2017,
-    2017, 2017, 2016, 2016, 2017, 2017, 2018, 2021,
-    2020, 2019, 2019, 2022, 2022, 2024, 2024, 2023,
-    2023, 2023, 2024, 2025, 2026, 2025, 2024, 2025,
-    2025, 2026, 2026, 2023, 2023, 2023, 2023, 2023,
-    2023, 2024, 2024, 2025, 2024, 2022, 2022, 2021,
-    2021, 2022, 2022, 2024, 2023, 2023, 2023, 2021,
-    2023, 2023, 2024, 2024, 2025, 2024, 2026, 2027,
-    2025, 2026, 2028, 2026, 2027, 2027, 2025, 2024,
-    2027, 2028, 2027, 2028, 2027, 2027, 2028, 2028,
-    2030, 2029, 2032, 2031, 2030, 2029, 2028, 2030,
-    2027, 2028, 2028, 2028, 2026, 2027, 2028, 2027,
-    2029, 2032, 2030, 2030, 2032, 2033, 2030, 2030,
-    2032, 2030, 2030, 2030, 2032, 2032, 2033, 2031,
-    2034, 2032, 2029, 2028, 2028, 2030, 2028, 2029,
-    2030, 2028, 2029, 2029, 2029, 2030, 2032, 2033,
-    2031, 2036, 2034, 2032, 2032, 2031, 2032, 2031,
-    2032, 2033, 2035, 2033, 2032, 2034, 2035, 2036,
-    2037, 2038, 2039, 2038, 2038, 2038, 2040, 2040,
-    2041, 2041, 2041, 2043, 2041, 2041, 2043, 2043,
-    2041, 2040, 2042, 2042, 2042, 2044, 2044, 2041,
-    2042, 2043, 2042, 2044, 2043, 2044, 2044, 2045,
-    2045, 2044, 2045, 2044, 2045, 2043, 2042, 2043,
-    2043, 2043, 2043, 2044, 2044, 2044, 2045, 2044,
-    2044, 2043, 2042, 2045, 2046, 2045, 2046, 2048,
-    2048, 2046, 2046, 2046, 2049, 2048, 2050, 2049,
-    2049, 2050, 2053, 2051, 2049, 2050, 2047, 2050,
-    2048, 2052, 2050, 2051, 2053, 2051, 2051, 2048,
-    2051, 2050, 2049, 2051, 2052, 2051, 2050, 2051,
-    2050, 2050, 2051, 2050, 2048, 2049, 2049, 2048,
-    2050, 2050, 2050, 2049, 2048, 2048, 2048, 2048,
-    2049, 2049, 2049, 2050, 2051, 2050, 2053, 2051,
-    2051, 2053, 2052, 2052, 2052, 2051, 2053, 2055,
-    2056, 2056, 2055, 2056, 2056, 2056, 2059, 2058,
-    2055, 2057, 2059, 2057, 2056, 2056, 2056, 2057,
-    2059, 2060, 2060, 2059, 2059, 2059, 2059, 2061,
-    2059, 2059, 2060, 2061, 2059, 2057, 2058, 2060,
-    2060, 2061, 2060, 2061, 2062, 2063, 2062, 2060,
-    2062, 2060, 2061, 2061, 2060, 2060, 2061, 2062,
-    2062, 2062, 2061, 2059, 2062, 2063, 2062, 2063,
-    2063, 2063, 2063, 2063, 2063, 2063, 2065, 2063,
-    2063, 2065, 2065, 2066, 2065, 2067, 2067, 2066,
-    2065, 2065, 2065, 2066, 2066, 2063, 2064, 2062,
-    2063, 2062, 2062, 2061, 2062, 2063, 2062, 2061,
-    2061, 2062, 2058, 2059, 2061, 2062, 2062, 2062,
-    2062, 2064, 2063, 2063, 2062, 2061, 2061, 2063,
-    2060, 2059, 2059, 2058, 2059, 2059, 2059, 2062,
-    2063, 2063, 2062, 2061, 2061, 2061, 2061, 2062,
-    2060, 2058, 2059, 2060, 2060, 2059, 2059, 2057,
-    2059, 2059, 2056, 2057, 2056, 2057, 2056, 2056,
-    2056, 2057, 2057, 2057, 2055, 2055, 2055, 2053,
-    2054, 2054, 2054, 2054, 2052, 2051, 2054, 2055,
-    2055, 2053, 2055, 2054, 2055, 2055, 2053, 2053,
-    2054, 2052, 2051, 2053, 2051, 2052, 2052, 2054,
-    2054, 2053, 2051, 2051, 2053, 2052, 2051, 2050,
-    2049, 2049, 2048, 2049, 2049, 2047, 2046, 2047,
-    2047, 2047, 2046, 2048, 2046, 2046, 2046, 2044,
-    2043, 2044, 2045, 2046, 2043, 2044, 2043, 2046,
-    2044, 2044, 2043, 2043, 2042, 2039, 2037, 2039,
-    2038, 2039, 2039, 2038, 2038, 2038, 2039, 2036,
-    2034, 2034, 2033, 2035, 2034, 2032, 2031, 2034,
-    2035, 2033, 2034, 2032, 2032, 2033, 2031, 2031,
-    2031, 2032, 2032, 2032, 2030, 2030, 2029, 2029,
-    2029, 2025, 2024, 2024, 2024, 2025, 2025, 2028,
-    2028, 2025, 2024, 2026, 2025, 2022, 2023, 2021,
-    2018, 2019, 2020, 2020, 2020, 2021, 2021, 2018,
-    2017, 2019, 2017, 2016, 2018, 2019, 2018, 2016,
-    2017, 2016, 2014, 2017, 2017, 2017, 2016, 2014,
-    2012, 2011, 2011, 2011, 2011, 2012, 2011, 2009,
-    2011, 2011, 2011, 2012, 2009, 2009, 2010, 2011,
-    2011, 2011, 2008, 2008, 2010, 2009, 2009, 2008,
-    2007, 2010, 2009, 2011, 2012, 2011, 2012, 2012,
-    2010, 2010, 2011, 2009, 2010, 2010, 2010, 2012,
-    2011, 2011, 2011, 2010, 2010, 2009, 2012, 2008,
-    2009, 2010, 2010, 2008, 2008, 2009, 2007, 2007,
-    2007, 2007, 2009, 2008, 2006, 2006, 2010, 2011,
-    2011, 2009, 2010, 2007, 2008, 2007, 2009, 2011,
-    2009, 2009, 2008, 2009, 2009, 2009, 2007, 2010,
-    2008, 2009, 2013, 2011, 2011, 2009, 2010, 2009,
-    2007, 2007, 2008, 2008, 2009, 2010, 2008, 2009,
-    2009, 2010, 2010, 2010, 2009, 2007, 2008, 2007,
-    2011, 2012, 2010, 2009, 2009, 2010, 2008, 2010,
-    2011, 2010, 2010, 2012, 2011, 2010, 2013, 2014,
-    2013, 2014, 2016, 2015, 2016, 2017, 2016, 2020,
-    2022, 2022, 2020, 2022, 2023, 2024, 2023, 2022,
-    2021, 2020, 2023, 2022, 2023, 2022, 2023, 2024,
-    2022, 2021, 2021, 2021, 2021, 2021, 2021, 2023,
-    2024, 2024, 2022, 2022, 2023, 2026, 2027, 2024,
-    2025, 2029, 2027, 2029, 2030, 2029, 2029, 2028,
-    2029, 2029, 2028, 2031, 2031, 2029, 2027, 2026,
-    2026, 2028, 2025, 2025, 2021, 2022, 2025, 2025,
-    2028, 2026, 2025, 2025, 2023, 2024, 2024, 2027,
-    2027, 2029, 2028, 2025, 2027, 2029, 2031, 2028,
-    2026, 2028, 2028, 2028, 2028, 2030, 2026, 2028,
-    2029, 2029, 2030, 2030, 2030, 2032, 2032, 2032,
-    2031, 2030, 2031, 2031, 2033, 2035, 2033, 2032,
-    2031, 2032, 2032, 2032, 2032, 2031, 2030, 2030,
-    2028, 2030, 2029, 2027, 2029, 2028, 2027, 2029,
-    2032, 2031, 2031, 2032, 2030, 2029, 2032, 2033,
-    2032, 2027, 2026, 2029, 2030, 2031, 2033, 2033,
-    2033, 2035, 2035, 2034, 2035, 2034, 2035, 2036,
-    2037, 2035, 2035, 2034, 2034, 2034, 2037, 2036,
-    2035, 2033, 2033, 2034, 2033, 2035, 2035, 2036,
-    2038, 2037, 2035, 2038, 2038, 2033, 2033, 2035,
-    2036, 2036, 2038, 2037, 2037, 2038, 2038, 2039,
-    2039, 2038, 2038, 2040, 2041, 2040, 2042, 2042,
-    2042, 2043, 2042, 2040, 2041, 2040, 2041, 2043,
-    2040, 2042, 2042, 2041, 2044, 2045, 2043, 2043,
-    2045, 2045, 2047, 2045, 2044, 2046, 2045, 2048,
-    2049, 2050, 2050, 2050, 2050, 2048, 2050, 2051,
-    2050, 2050, 2052, 2053, 2053, 2055, 2054, 2053,
-    2055, 2053, 2053, 2052, 2050, 2052, 2052, 2053,
-    2053, 2054, 2053, 2055, 2056, 2055, 2053, 2053,
-    2054, 2054, 2056, 2054, 2054, 2056, 2054, 2053,
-    2054, 2057, 2055, 2054, 2056, 2057, 2056, 2058,
-    2057, 2058, 2059, 2057, 2058, 2057, 2057, 2055,
-    2056, 2056, 2055, 2059, 2057, 2055, 2052, 2050,
-    2053, 2054, 2052, 2053, 2055, 2056, 2055, 2054,
-    2055, 2055, 2053, 2053, 2053, 2054, 2055, 2055,
-    2055, 2052, 2054, 2056, 2057, 2059, 2058, 2055,
-    2056, 2057, 2056, 2056, 2056, 2057, 2057, 2056,
-    2057, 2056, 2057, 2055, 2056, 2057, 2057, 2058,
-    2057, 2055, 2055, 2056, 2057, 2056, 2056, 2056,
-    2057, 2057, 2058, 2058, 2058, 2059, 2057, 2056,
-    2057, 2055, 2053, 2055, 2056, 2056, 2056, 2057,
-    2059, 2058, 2058, 2058, 2057, 2060, 2058, 2058,
-    2058, 2059, 2059, 2060, 2061, 2060, 2058, 2059,
-    2060, 2060, 2058, 2058, 2059, 2058, 2056, 2058,
-    2059, 2059, 2058, 2058, 2057, 2059, 2060, 2058,
-    2058, 2058, 2057, 2059, 2058, 2056, 2061, 2061,
-    2060, 2059, 2061, 2062, 2062, 2062, 2059, 2061,
-    2059, 2058, 2060, 2061, 2058, 2058, 2058, 2059,
-    2059, 2057, 2060, 2058, 2058, 2057, 2055, 2054,
-    2056, 2056, 2059, 2056, 2056, 2059, 2059, 2057,
-    2055, 2052, 2051, 2052, 2052, 2052, 2053, 2051,
-    2052, 2052, 2051, 2050, 2048, 2049, 2050, 2052,
-    2050, 2052, 2051, 2052, 2053, 2052, 2050, 2050,
-    2052, 2051, 2051, 2053, 2052, 2051, 2053, 2055,
-    2055, 2054, 2053, 2054, 2051, 2052, 2052, 2053,
-    2053, 2052, 2052, 2053, 2053, 2049, 2048, 2051,
-    2048, 2048, 2049, 2050, 2051, 2049, 2047, 2047,
-    2049, 2050, 2051, 2049, 2048, 2045, 2045, 2046,
-    2046, 2046, 2045, 2046, 2045, 2043, 2044, 2043,
-    2043, 2043, 2044, 2042, 2042, 2042, 2044, 2046,
-    2044, 2039, 2040, 2039, 2038, 2040, 2040, 2040,
-    2040, 2039, 2039, 2039, 2037, 2036, 2036, 2037,
-    2037, 2034, 2036, 2035, 2034, 2033, 2033, 2031,
-    2029, 2027, 2029, 2028, 2028, 2029, 2030, 2029,
-    2027, 2027, 2026, 2028, 2028, 2026, 2026, 2024,
-    2025, 2028, 2027, 2025, 2026, 2027, 2023, 2018,
-    2017, 2021, 2020, 2019, 2018, 2016, 2014, 2013,
-    2011, 2010, 2007, 2010, 2009, 2006, 2008, 2008,
-    2004, 2005, 2006, 2009, 2009, 2010, 2009, 2007,
-    2007, 2008, 2007, 2006, 2008, 2009, 2008, 2008,
-    2006, 2007, 2009, 2008, 2007, 2007, 2008, 2007,
-    2007, 2009, 2008, 2007, 2008, 2009, 2007, 2006,
-    2005, 2004, 2007, 2006, 2006, 2004, 2004, 2003,
-    2001, 2001, 2002, 2004, 2003, 2003, 2001, 2001,
-    2002, 1998, 2000, 1999, 2000, 2001, 2001, 1999,
-    2000, 1999, 1998, 1998, 2001, 2000, 1998, 1997,
-    1996, 1995, 1994, 1994, 1995, 1995, 1993, 1996,
-    1996, 1994, 1992, 1992, 1993, 1991, 1990, 1989,
-    1991, 1987, 1988, 1989, 1989, 1989, 1992, 1990,
-    1992, 1993, 1992, 1993, 1992, 1990, 1989, 1991,
-    1990, 1990, 1988, 1989, 1991, 1991, 1992, 1991,
-    1994, 1993, 1991, 1991, 1991, 1991, 1989, 1990,
-    1990, 1991, 1989, 1991, 1990, 1991, 1989, 1988,
-    1988, 1987, 1987, 1990, 1990, 1988, 1988, 1988,
-    1988, 1987, 1987, 1984, 1986, 1985, 1986, 1988,
-    1988, 1987, 1987, 1988, 1987, 1988, 1989, 1988,
-    1989, 1991, 1990, 1988, 1990, 1989, 1987, 1987,
-    1987, 1985, 1986, 1987, 1988, 1985, 1987, 1985,
-    1986, 1988, 1988, 1988, 1988, 1987, 1988, 1988,
-    1988, 1988, 1989, 1987, 1988, 1989, 1989, 1991,
-    1990, 1992, 1990, 1990, 1991, 1991, 1993, 1994,
-    1994, 1996, 1993, 1995, 1995, 1998, 1997, 1996,
-    1997, 1997, 1998, 1998, 1997, 1999, 1999, 2000,
-    2001, 2003, 2004, 2004, 2006, 2005, 2003, 2008,
-    2006, 2005, 2005, 2005, 2008, 2009, 2011, 2011,
-    2009, 2008, 2010, 2010, 2012, 2013, 2014, 2015,
-    2015, 2014, 2015, 2015, 2013, 2013, 2013, 2013,
-    2014, 2015, 2018, 2018, 2016, 2016, 2018, 2019,
-    2017, 2015, 2017, 2016, 2016, 2016, 2015, 2017,
-    2018, 2018, 2017, 2016, 2018, 2017, 2019, 2018,
-    2016, 2015, 2014, 2014, 2016, 2018, 2018, 2015,
-    2016, 2016, 2017, 2017, 2016, 2015, 2015, 2015,
-    2015, 2018, 2016, 2017, 2016, 2014, 2016, 2017,
-    2020, 2019, 2018, 2018, 2016, 2017, 2019, 2017,
-    2017, 2013, 2015, 2016, 2015, 2015, 2016, 2016,
-    2017, 2015, 2013, 2016, 2016, 2017, 2018, 2017,
-    2016, 2017, 2016, 2016, 2017, 2019, 2019, 2021,
-    2020, 2018, 2019, 2019, 2019, 2018, 2018, 2018,
-    2020, 2021, 2022, 2023, 2019, 2018, 2022, 2022,
-    2022, 2022, 2023, 2024, 2021, 2022, 2023, 2024,
-    2024, 2024, 2025, 2027, 2028, 2029, 2030, 2028,
-    2029, 2027, 2028, 2026, 2029, 2028, 2029, 2030,
-    2029, 2031, 2029, 2030, 2029, 2028, 2028, 2030,
-    2029, 2029, 2031, 2029, 2029, 2030, 2029, 2030,
-    2030, 2029, 2027, 2026, 2025, 2024, 2024, 2023,
-    2024, 2024, 2024, 2023, 2024, 2024, 2025, 2029,
-    2027, 2025, 2027, 2029, 2029, 2033, 2034, 2035,
-    2034, 2036, 2038, 2035, 2035, 2036, 2037, 2038,
-    2036, 2038, 2038, 2037, 2038, 2039, 2039, 2033,
-    2031, 2031, 2030, 2030, 2029, 2031, 2031, 2031,
-    2031, 2032, 2034, 2034, 2037, 2038, 2038, 2039,
-    2038, 2037, 2040, 2039, 2041, 2040, 2039, 2039,
-    2038, 2041, 2038, 2035, 2037, 2037, 2037, 2035,
-    2033, 2036, 2037, 2037, 2037, 2036, 2036, 2037,
-    2035, 2036, 2038, 2039, 2040, 2039, 2039, 2038,
-    2039, 2041, 2042, 2042, 2044, 2042, 2042, 2041,
-    2041, 2040, 2041, 2041, 2040, 2041, 2041, 2042,
-    2042, 2039, 2041, 2040, 2040, 2038, 2030, 2025,
-    2024, 2015, 1982, 1933, 1910, 1911, 1896, 1878,
-    1888, 1889, 1882, 1894, 1915, 1938, 1950, 1959,
-    1977, 1987, 1989, 2008, 2032, 2054, 2074, 2093,
-    2112, 2129, 2145, 2158, 2166, 2164, 2146, 2135,
-    2129, 2105, 2079, 2064, 2040, 2017, 1999, 1987,
-    1980, 1972, 1963, 1962, 1963, 1965, 1968, 1974,
-    1982, 1991, 2001, 2014, 2031, 2043, 2058, 2074,
-    2089, 2102, 2120, 2136, 2134, 2127, 2123, 2121,
-    2116, 2102, 2092, 2087, 2073, 2048, 2032, 2017,
-    1998, 1986, 1973, 1960, 1956, 1949, 1945, 1951,
-    1957, 1960, 1964, 1976, 1985, 1994, 2014, 2031,
-    2039, 2059, 2079, 2089, 2104, 2113, 2117, 2118,
-    2114, 2115, 2117, 2112, 2108, 2106, 2085, 2057,
-    2049, 2039, 2026, 2019, 2006, 1988, 1975, 1961,
-    1958, 1961, 1957, 1956, 1962, 1965, 1966, 1975,
-    1988, 1997, 2008, 2012, 2018, 2029, 2036, 2047,
-    2059, 2063, 2061, 2057, 2059, 2065, 2062, 2053,
-    2048, 2042, 2029, 2024, 2023, 2023, 2023, 2020,
-    2015, 2015, 2020, 2021, 2028, 2040, 2042, 2043,
-    2049, 2053, 2053, 2058, 2066, 2068, 2061, 2071,
-    2089, 2081, 2072, 2088, 2089, 2074, 2061, 2052,
-    2049, 2041, 2027, 2014, 2011, 2007, 2010, 2025,
-    2026, 2000, 1982, 1984, 1991, 1993, 1992, 1998,
-    1997, 2001, 2015, 2038, 2052, 2052, 2057, 2068,
-    2070, 2067, 2071, 2084, 2092, 2087, 2079, 2086,
-    2089, 2076, 2091, 2106, 2076, 2063, 2079, 2070,
-    2058, 2064, 2060, 2040, 2022, 2035, 2043, 2023,
-    2024, 2042, 2037, 2022, 2026, 2044, 2030, 2014,
-    2025, 2029, 2023, 2034, 2043, 2048, 2051, 2031,
-    2030, 2043, 2037, 2039, 2046, 2041, 2033, 2026,
-    2038, 2050, 2044, 2050, 2056, 2047, 2041, 2035,
-    2036, 2044, 2035, 2028, 2033, 2028, 2029, 2031,
-    2038, 2048, 2027, 2017, 2036, 2036, 2033, 2036,
-    2039, 2039, 2031, 2034, 2049, 2050, 2045, 2033,
-    2032, 2037, 2022, 2021, 2036, 2032, 2031, 2028,
-    2032, 2038, 2028, 2028, 2036, 2025, 2017, 2013,
-    2017, 2021, 2014, 2018, 2027, 2020, 2021, 2038,
-    2042, 2032, 2021, 2026, 2036, 2026, 2014, 2021,
-    2023, 2009, 2001, 2003, 2002, 1998, 1986, 1985,
-    1992, 1981, 1979, 2006, 2013, 2003, 2013, 2026,
-    2027, 2029, 2047, 2064, 2055, 2040, 2052, 2069,
-    2069, 2063, 2053, 2052, 2046, 2028, 2007, 1999,
-    1993, 1985, 1981, 1977, 1976, 1971, 1976, 1986,
-    1977, 1973, 1984, 1996, 2006, 2018, 2029, 2038,
-    2045, 2052, 2073, 2092, 2105, 2115, 2106, 2063,
-    2025, 2028, 2033, 1998, 1963, 1962, 1957, 1928,
-    1932, 1964, 1977, 1980, 1979, 1996, 2011, 2003,
-    2001, 2012, 2028, 2039, 2041, 2060, 2086, 2091,
-    2093, 2112, 2108, 2078, 2072, 2073, 2047, 2018,
-    1989, 1972, 1968, 1939, 1916, 1928, 1925, 1906,
-    1904, 1923, 1950, 1953, 1945, 1974, 2006, 2012,
-    2042, 2095, 2105, 2098, 2110, 2108, 2097, 2111,
-    2111, 2067, 2035, 2022, 1989, 1970, 1956, 1929,
-    1915, 1889, 1861, 1867, 1873, 1875, 1893, 1898,
-    1916, 1937, 1945, 1985, 2034, 2062, 2080, 2101,
-    2113, 2117, 2142, 2178, 2174, 2152, 2142, 2126,
-    2110, 2077, 2040, 2046, 2017, 1943, 1932, 1944,
-    1911, 1882, 1892, 1928, 1922, 1899, 1949, 1987,
-    1968, 1974, 2010, 2042, 2041, 2024, 2063, 2094,
-    2082, 2105, 2114, 2114, 2123, 2111, 2131, 2121,
-    2064, 2060, 2046, 2015, 2001, 1965, 1958, 1953,
-    1938, 1957, 1955, 1979, 2008, 1983, 2027, 2079,
-    2038, 2052, 2115, 2120, 2093, 2092, 2122, 2126,
-    2103, 2103, 2109, 2106, 2073, 2025, 2035, 2018,
-    1956, 1950, 1939, 1887, 1861, 1850, 1851, 1873,
-    1863, 1870, 1912, 1936, 1960, 1994, 2022, 2060,
-    2082, 2081, 2114, 2142, 2132, 2146, 2165, 2166,
-    2156, 2137, 2143, 2144, 2100, 2076, 2083, 2051,
-    2018, 2004, 1984, 1971, 1946, 1935, 1955, 1962,
-    1973, 1991, 1990, 2012, 2041, 2054, 2094, 2122,
-    2104, 2120, 2135, 2114, 2136, 2152, 2137, 2137,
-    2123, 2128, 2127, 2082, 2083, 2077, 2017, 1986,
-    1969, 1938, 1910, 1894, 1901, 1896, 1905, 1928,
-    1921, 1958, 2016, 2007, 2012, 2046, 2031, 2038,
-    2079, 2074, 2074, 2093, 2091, 2102, 2131, 2117,
-    2102, 2109, 2101, 2084, 2076, 2073, 2058, 2032,
-    2016, 2006, 2004, 2009, 1990, 1981, 2006, 1996,
-    1982, 2010, 2035, 2023, 2021, 2040, 2045, 2035,
-    2033, 2065, 2079, 2050, 2047, 2074, 2093, 2116,
-    2124, 2123, 2129, 2117, 2126, 2145, 2157, 2161,
-    2115, 2056, 2011, 1943, 1899, 1882, 1861, 1837,
-    1795, 1781, 1812, 1825, 1842, 1895, 1920, 1929,
-    1948, 1966, 1998, 2039, 2072, 2100, 2139, 2179,
-    2230, 2299, 2359, 2371, 2355, 2347, 2345, 2314,
-    2274, 2244, 2183, 2096, 2018, 1968, 1954, 1911,
-    1860, 1868, 1870, 1850, 1854, 1874, 1916, 1951,
-    1948, 1976, 2058, 2103, 2106, 2166, 2246, 2250,
-    2237, 2292, 2361, 2357, 2314, 2333, 2334, 2254,
-    2225, 2223, 2161, 2099, 2047, 2009, 2004, 1971,
-    1936, 1926, 1887, 1852, 1883, 1911, 1896, 1942,
-    1999, 1955, 1965, 2055, 2063, 2096, 2166, 2165,
-    2156, 2152, 2153, 2179, 2174, 2160, 2142, 2090,
-    2086, 2085, 2045, 2052, 2047, 2003, 1985, 1996,
-    2024, 2019, 2009, 2035, 2003, 1957, 1988, 2028,
-    2047, 2039, 2015, 2029, 2040, 2024, 2046, 2086,
-    2086, 2049, 2036, 2066, 2056, 2031, 2046, 2058,
-    2024, 2008, 2029, 2032, 2023, 2038, 2043, 2026,
-    2034, 2052, 2059, 2071, 2082, 2069, 2042, 2059,
-    2091, 2079, 2065, 2085, 2086, 2066, 2100, 2140,
-    2106, 2090, 2131, 2120, 2080, 2087, 2088, 2031,
-    1987, 1986, 1965, 1930, 1928, 1957, 1972, 1962,
-    1969, 2023, 2075, 2066, 2085, 2149, 2139, 2113,
-    2166, 2204, 2159, 2145, 2185, 2183, 2164, 2192,
-    2207, 2198, 2220, 2226, 2194, 2186, 2185, 2160,
-    2127, 2116, 2092, 2018, 1990, 2024, 2011, 1975,
-    2015, 2069, 2056, 2051, 2112, 2149, 2131, 2136,
-    2165, 2167, 2147, 2143, 2161, 2183, 2178, 2173,
-    2217, 2237, 2217, 2227, 2217, 2182, 2153, 2107,
-    2080, 2073, 2026, 1969, 1939, 1909, 1879, 1869,
-    1888, 1899, 1891, 1904, 1935, 1966, 1995, 2030,
-    2069, 2105, 2107, 2085, 2107, 2134, 2109, 2104,
-    2149, 2159, 2133, 2156, 2196, 2187, 2184, 2200,
-    2191, 2162, 2140, 2110, 2059, 1991, 1940, 1916,
-    1882, 1870, 1864, 1831, 1829, 1866, 1889, 1900,
-    1928, 1948, 1934, 1917, 1941, 1954, 1934, 1942,
-    1953, 1937, 1957, 1998, 2036, 2076, 2104, 2124,
-    2126, 2111, 2113, 2116, 2079, 2029, 1992, 1945,
-    1883, 1881, 1918, 1894, 1878, 1928, 1936, 1936,
-    1997, 2025, 2012, 2037, 2053, 2045, 2058, 2068,
-    2078, 2105, 2120, 2110, 2107, 2116, 2123, 2133,
-    2150, 2145, 2135, 2139, 2111, 2106, 2141, 2125,
-    2099, 2107, 2100, 2097, 2109, 2113, 2126, 2133,
-    2135, 2158, 2179, 2177, 2167, 2177, 2189, 2156,
-    2127, 2146, 2115, 2068, 2098, 2095, 2055, 2055,
-    2064, 2077, 2086, 2096, 2135, 2152, 2148, 2171,
-    2176, 2162, 2172, 2168, 2159, 2144, 2126, 2121,
-    2095, 2097, 2110, 2083, 2090, 2108, 2094, 2086,
-    2083, 2064, 2042, 2027, 2022, 2000, 1986, 1994,
-    1989, 1997, 2002, 2004, 2048, 2075, 2066, 2096,
-    2114, 2096, 2102, 2113, 2081, 2049, 2051, 2061,
-    2039, 2025, 2034, 2017, 2016, 2032, 2055, 2065,
-    2063, 2080, 2084, 2063, 2042, 2053, 2030, 1987,
-    2002, 1986, 1928, 1937, 1953, 1924, 1937, 1982,
-    1985, 1973, 1983, 1989, 1971, 1963, 1975, 1953,
-    1915, 1900, 1906, 1928, 1934, 1936, 1935, 1944,
-    1964, 1966, 1954, 1945, 1926, 1895, 1876, 1856,
-    1826, 1814, 1808, 1791, 1785, 1797, 1802, 1819,
-    1840, 1849, 1875, 1900, 1890, 1886, 1908, 1923,
-    1913, 1891, 1897, 1915, 1902, 1902, 1923, 1935,
-    1960, 1988, 2021, 2066, 2093, 2121, 2153, 2175,
-    2204, 2227, 2229, 2241, 2257, 2266, 2270, 2291,
-    2314, 2318, 2338, 2362, 2337, 2306, 2310, 2309,
-    2272, 2231, 2194, 2176, 2193, 2173, 2148, 2166,
-    2180, 2188, 2212, 2244, 2271, 2300, 2316, 2313,
-    2346, 2371, 2353, 2356, 2371, 2361, 2340, 2332,
-    2340, 2330, 2322, 2329, 2336, 2339, 2331, 2337,
-    2354, 2328, 2297, 2297, 2276, 2254, 2251, 2251,
-    2267, 2287, 2299, 2312, 2353, 2396, 2393, 2380,
-    2388, 2374, 2323, 2274, 2243, 2211, 2164, 2120,
-    2103, 2099, 2073, 2055, 2068, 2065, 2049, 2043,
-    2037, 2025, 2017, 2011, 2000, 1995, 1992, 1977,
-    1967, 1979, 1977, 1955, 1948, 1951, 1946, 1923,
-    1905, 1895, 1864, 1815, 1765, 1733, 1683, 1627,
-    1593, 1563, 1542, 1544, 1551, 1563, 1590, 1613,
-    1631, 1654, 1676, 1692, 1698, 1703, 1716, 1731,
-    1743, 1767, 1789, 1802, 1817, 1839, 1859, 1863,
-    1856, 1843, 1827, 1801, 1774, 1754, 1727, 1695,
-    1677, 1654, 1635, 1635, 1625, 1610, 1618, 1634,
-    1634, 1643, 1665, 1681, 1689, 1711, 1726, 1742,
-    1774, 1815, 1880, 1951, 2022, 2119, 2197, 2263,
-    2363, 2462, 2534, 2609, 2666, 2684, 2710, 2746,
-    2766, 2776, 2767, 2757, 2763, 2765, 2770, 2760,
-    2731, 2718, 2701, 2673, 2666, 2653, 2622, 2604,
-    2616, 2632, 2630, 2655, 2718, 2777, 2832, 2873,
-    2915, 2982, 3039, 3059, 3076, 3083, 3031, 2947,
-    2886, 2790, 2659, 2541, 2422, 2298, 2187, 2089,
-    2012, 1960, 1912, 1862, 1820, 1812, 1835, 1854,
-    1884, 1926, 1963, 1992, 2034, 2093, 2133, 2162,
-    2205, 2232, 2233, 2245, 2258, 2252, 2247, 2228,
-    2184, 2136, 2088, 2040, 1994, 1963, 1932, 1898,
-    1889, 1908, 1931, 1964, 2010, 2050, 2083, 2116,
-    2151, 2177, 2197, 2209, 2200, 2178, 2150, 2115,
-    2066, 2015, 1957, 1883, 1804, 1730, 1654, 1568,
-    1487, 1408, 1326, 1253, 1202, 1167, 1145, 1151,
-    1180, 1227, 1295, 1377, 1462, 1555, 1648, 1727,
-    1796, 1855, 1892, 1913, 1929, 1931, 1916, 1892,
-    1856, 1820, 1784, 1738, 1689, 1637, 1584, 1541,
-    1504, 1470, 1443, 1431, 1421, 1422, 1454, 1496,
-    1546, 1619, 1694, 1765, 1857, 1957, 2043, 2126,
-    2187, 2228, 2280, 2307, 2307, 2322, 2309, 2280,
-    2262, 2240, 2227, 2237, 2241, 2254, 2279, 2311,
-    2352, 2392, 2436, 2473, 2505, 2567, 2638, 2668,
-    2697, 2757, 2812, 2856, 2902, 2928, 2945, 2967,
-    2985, 2986, 2985, 2982, 2970, 2957, 2932, 2917,
-    2937, 2958, 2961, 2977, 3007, 3023, 3065, 3135,
-    3154, 3137, 3091, 2996, 2881, 2762, 2607, 2430,
-    2270, 2102, 1967, 1888, 1827, 1784, 1774, 1771,
-    1771, 1779, 1790, 1792, 1788, 1781, 1776, 1780,
-    1798, 1843, 1889, 1941, 2014, 2092, 2170, 2242,
-    2299, 2344, 2381, 2408, 2411, 2392, 2350, 2297,
-    2244, 2188, 2151, 2119, 2096, 2080, 2086, 2108,
-    2139, 2178, 2208, 2221, 2219, 2211, 2187, 2143,
-    2087, 2017, 1940, 1863, 1792, 1733, 1681, 1631,
-    1583, 1530, 1478, 1435, 1393, 1353, 1316, 1282,
-    1257, 1246, 1248, 1269, 1308, 1345, 1390, 1452,
-    1515, 1573, 1631, 1676, 1708, 1738, 1755, 1752,
-    1740, 1718, 1678, 1636, 1597, 1560, 1527, 1500,
-    1476, 1460, 1463, 1478, 1487, 1506, 1540, 1576,
-    1612, 1668, 1726, 1786, 1863, 1927, 1999, 2116,
-    2199, 2257, 2356, 2424, 2455, 2493, 2514, 2529,
-    2536, 2529, 2516, 2496, 2487, 2480, 2468, 2461,
-    2452, 2449, 2466, 2501, 2527, 2557, 2594, 2636,
-    2682, 2733, 2769, 2807, 2872, 2910, 2921, 2966,
-    3030, 3088, 3147, 3185, 3218, 3259, 3314, 3374,
-    3388, 3375, 3362, 3368, 3375, 3366, 3338, 3227,
-    3059, 2936, 2802, 2623, 2447, 2265, 2083, 1951,
-    1873, 1837, 1819, 1812, 1806, 1806, 1824, 1841,
-    1851, 1853, 1825, 1786, 1762, 1759, 1778, 1799,
-    1811, 1841, 1898, 1971, 2050, 2110, 2151, 2179,
-    2195, 2203, 2203, 2192, 2176, 2146, 2138, 2149,
-    2172, 2204, 2235, 2273, 2315, 2363, 2418, 2466,
-    2496, 2505, 2495, 2469, 2439, 2397, 2321, 2217,
-    2109, 2007, 1915, 1837, 1772, 1708, 1649, 1602,
-    1566, 1526, 1470, 1398, 1324, 1250, 1186, 1129,
-    1086, 1072, 1075, 1104, 1155, 1226, 1311, 1390,
-    1462, 1520, 1560, 1586, 1597, 1584, 1562, 1537,
-    1500, 1471, 1448, 1423, 1402, 1392, 1403, 1417,
-    1436, 1462, 1497, 1531, 1571, 1613, 1654, 1693,
-    1722, 1758, 1814, 1873, 1932, 1999, 2068, 2129,
-    2200, 2288, 2360, 2394, 2415, 2415, 2392, 2377,
-    2356, 2314, 2263, 2220, 2206, 2218, 2251, 2294,
-    2337, 2363, 2393, 2438, 2495, 2547, 2566, 2559,
-    2562, 2588, 2624, 2666, 2709, 2732, 2741, 2785,
-    2857, 2907, 2948, 2987, 3028, 3078, 3140, 3206,
-    3255, 3286, 3297, 3318, 3359, 3381, 3376, 3373,
-    3353, 3261, 3141, 3049, 2919, 2735, 2553, 2360,
-    2188, 2078, 2000, 1936, 1890, 1861, 1845, 1848,
-    1861, 1863, 1847, 1832, 1817, 1805, 1799, 1786,
-    1774, 1775, 1787, 1792, 1805, 1849, 1912, 1961,
-    1996, 2042, 2087, 2111, 2118, 2115, 2101, 2083,
-    2073, 2081, 2105, 2128, 2151, 2186, 2238, 2297,
-    2350, 2399, 2441, 2474, 2487, 2480, 2458, 2418,
-    2344, 2245, 2137, 2031, 1931, 1843, 1758, 1680,
-    1623, 1574, 1514, 1466, 1423, 1358, 1288, 1243,
-    1198, 1146, 1111, 1103, 1113, 1150, 1195, 1244,
-    1311, 1383, 1443, 1495, 1540, 1567, 1569, 1559,
-    1540, 1517, 1485, 1447, 1408, 1367, 1337, 1320,
-    1311, 1321, 1340, 1356, 1389, 1459, 1526, 1582,
-    1659, 1739, 1799, 1864, 1928, 1978, 2035, 2088,
-    2126, 2179, 2241, 2284, 2325, 2368, 2389, 2399,
-    2414, 2406, 2385, 2367, 2333, 2295, 2294, 2309,
-    2314, 2334, 2371, 2399, 2441, 2502, 2553, 2596,
-    2635, 2651, 2679, 2731, 2789, 2823, 2844, 2861,
-    2884, 2921, 2960, 3004, 3027, 3029, 3057, 3111,
-    3181, 3251, 3291, 3320, 3363, 3407, 3433, 3458,
-    3475, 3419, 3287, 3161, 3060, 2925, 2788, 2641,
-    2459, 2316, 2249, 2211, 2185, 2170, 2134, 2079,
-    2044, 2037, 2017, 1964, 1880, 1795, 1725, 1681,
-    1658, 1653, 1655, 1661, 1694, 1754, 1843, 1947,
-    2015, 2054, 2081, 2102, 2127, 2137, 2118, 2081,
-    2049, 2039, 2058, 2094, 2124, 2144, 2165, 2204,
-    2265, 2332, 2388, 2414, 2420, 2416, 2411, 2405,
-    2381, 2315, 2216, 2133, 2069, 2004, 1955, 1909,
-    1847, 1795, 1757, 1709, 1660, 1607, 1516, 1410,
-    1330, 1252, 1168, 1113, 1080, 1063, 1082, 1126,
-    1180, 1255, 1338, 1398, 1449, 1496, 1523, 1519,
-    1495, 1465, 1438, 1404, 1357, 1317, 1292, 1272,
-    1262, 1270, 1293, 1314, 1343, 1394, 1447, 1498,
-    1554, 1607, 1645, 1702, 1762, 1800, 1846, 1912,
-    1975, 2039, 2110, 2189, 2264, 2336, 2396, 2435,
-    2467, 2473, 2457, 2433, 2402, 2364, 2333, 2317,
-    2315, 2329, 2356, 2391, 2441, 2503, 2557, 2593,
-    2632, 2678, 2718, 2738, 2745, 2762, 2784, 2803,
-    2835, 2876, 2895, 2927, 2997, 3046, 3098, 3186,
-    3242, 3273, 3344, 3410, 3434, 3453, 3465, 3456,
-    3444, 3411, 3316, 3201, 3100, 2979, 2842, 2716,
-    2594, 2480, 2382, 2314, 2287, 2267, 2228, 2179,
-    2143, 2119, 2086, 2047, 2013, 1979, 1939, 1893,
-    1847, 1832, 1837, 1824, 1802, 1801, 1828, 1864,
-    1900, 1931, 1955, 1974, 1982, 1989, 1997, 2002,
-    1990, 1983, 2001, 2040, 2081, 2108, 2145, 2201,
-    2261, 2317, 2368, 2413, 2445, 2458, 2460, 2458,
-    2449, 2422, 2357, 2270, 2201, 2148, 2088, 2020,
-    1948, 1869, 1802, 1737, 1670, 1617, 1554, 1464,
-    1386, 1338, 1296, 1250, 1212, 1189, 1191, 1213,
-    1236, 1271, 1320, 1364, 1392, 1423, 1454, 1468,
-    1455, 1429, 1400, 1373, 1340, 1305, 1263, 1234,
-    1211, 1192, 1197, 1219, 1242, 1268, 1303, 1353,
-    1421, 1491, 1555, 1618, 1679, 1757, 1830, 1879,
-    1944, 2019, 2070, 2119, 2181, 2235, 2279, 2319,
-    2346, 2361, 2380, 2383, 2365, 2357, 2355, 2347,
-    2335, 2344, 2368, 2396, 2431, 2472, 2520, 2574,
-    2619, 2666, 2725, 2772, 2805, 2838, 2875, 2914,
-    2949, 2979, 3001, 3024, 3055, 3082, 3106, 3134,
-    3177, 3221, 3258, 3312, 3367, 3408, 3456, 3495,
-    3502, 3481, 3419, 3321, 3218, 3105, 2971, 2827,
-    2692, 2583, 2498, 2440, 2404, 2379, 2350, 2316,
-    2286, 2255, 2220, 2176, 2115, 2057, 1997, 1929,
-    1867, 1819, 1781, 1752, 1726, 1714, 1726, 1754,
-    1793, 1837, 1879, 1922, 1953, 1968, 1976, 1982,
-    1979, 1967, 1966, 1976, 1985, 1999, 2030, 2074,
-    2130, 2188, 2247, 2309, 2355, 2385, 2403, 2412,
-    2403, 2378, 2338, 2284, 2218, 2152, 2109, 2076,
-    2025, 1959, 1898, 1840, 1775, 1715, 1658, 1580,
-    1500, 1425, 1356, 1307, 1269, 1221, 1177, 1165,
-    1162, 1160, 1184, 1220, 1250, 1276, 1309, 1337,
-    1359, 1372, 1375, 1364, 1345, 1319, 1288, 1252,
-    1217, 1188, 1163, 1152, 1157, 1178, 1204, 1244,
-    1288, 1344, 1407, 1466, 1524, 1589, 1649, 1710,
-    1771, 1834, 1901, 1960, 2014, 2073, 2125, 2176,
-    2223, 2261, 2295, 2329, 2348, 2362, 2376, 2384,
-    2391, 2403, 2417, 2418, 2421, 2439, 2465, 2501,
-    2540, 2581, 2624, 2676, 2722, 2765, 2824, 2870,
-    2891, 2916, 2943, 2961, 2993, 3028, 3063, 3097,
-    3136, 3183, 3238, 3300, 3345, 3372, 3400, 3428,
-    3440, 3420, 3379, 3313, 3222, 3138, 3059, 2955,
-    2843, 2738, 2634, 2561, 2514, 2465, 2418, 2379,
-    2338, 2299, 2283, 2268, 2230, 2181, 2127, 2056,
-    1974, 1906, 1857, 1802, 1741, 1704, 1690, 1699,
-    1727, 1761, 1793, 1825, 1850, 1868, 1881, 1891,
-    1887, 1875, 1873, 1881, 1885, 1895, 1920, 1950,
-    1988, 2035, 2085, 2133, 2175, 2214, 2248, 2264,
-    2275, 2286, 2280, 2258, 2233, 2198, 2148, 2109,
-    2083, 2027, 1964, 1908, 1840, 1773, 1732, 1686,
-    1620, 1566, 1512, 1443, 1392, 1359, 1301, 1247,
-    1218, 1187, 1163, 1171, 1189, 1205, 1224, 1252,
-    1279, 1300, 1323, 1338, 1335, 1319, 1303, 1288,
-    1265, 1238, 1213, 1189, 1181, 1186, 1187, 1195,
-    1223, 1250, 1283, 1334, 1388, 1436, 1500, 1563,
-    1619, 1679, 1740, 1802, 1859, 1914, 1962, 2008,
-    2057, 2107, 2156, 2209, 2258, 2293, 2321, 2359,
-    2388, 2407, 2427, 2442, 2446, 2445, 2452, 2471,
-    2494, 2516, 2543, 2579, 2620, 2666, 2717, 2769,
-    2816, 2854, 2889, 2933, 2971, 3001, 3042, 3079,
-    3106, 3147, 3185, 3217, 3254, 3285, 3299, 3323,
-    3344, 3334, 3313, 3300, 3253, 3184, 3133, 3067,
-    2976, 2893, 2808, 2725, 2666, 2615, 2555, 2509,
-    2470, 2425, 2393, 2374, 2345, 2315, 2282, 2231,
-    2180, 2124, 2060, 2004, 1955, 1900, 1851, 1821,
-    1799, 1792, 1804, 1815, 1827, 1841, 1848, 1860,
-    1876, 1881, 1882, 1888, 1893, 1893, 1898, 1914,
-    1932, 1951, 1980, 2011, 2047, 2082, 2116, 2147,
-    2170, 2184, 2199, 2208, 2201, 2187, 2157, 2122,
-    2101, 2066, 2014, 1960, 1903, 1839, 1794, 1760,
-    1711, 1669, 1632, 1587, 1555, 1537, 1503, 1467,
-    1444, 1412, 1372, 1358, 1353, 1341, 1344, 1350,
-    1354, 1363, 1384, 1393, 1401, 1402, 1397, 1393,
-    1383, 1358, 1334, 1310, 1288, 1273, 1266, 1266,
-    1268, 1275, 1299, 1334, 1370, 1415, 1467, 1515,
-    1564, 1620, 1676, 1722, 1775, 1825, 1861, 1903,
-    1945, 1981, 2024, 2073, 2109, 2143, 2190, 2241,
-    2276, 2320, 2372, 2402, 2426, 2457, 2481, 2498,
-    2521, 2544, 2563, 2584, 2603, 2629, 2662, 2696,
-    2729, 2758, 2785, 2808, 2839, 2876, 2907, 2936,
-    2972, 3010, 3045, 3083, 3121, 3150, 3175, 3200,
-    3217, 3234, 3245, 3238, 3220, 3201, 3178, 3145,
-    3107, 3061, 3001, 2936, 2877, 2827, 2774, 2718,
-    2665, 2610, 2561, 2522, 2484, 2447, 2410, 2366,
-    2317, 2266, 2210, 2155, 2110, 2059, 2010, 1968,
-    1935, 1910, 1905, 1903, 1896, 1898, 1906, 1903,
-    1903, 1912, 1912, 1910, 1919, 1926, 1926, 1927,
-    1937, 1948, 1952, 1965, 1980, 1986, 2000, 2015,
-    2021, 2031, 2046, 2058, 2061, 2059, 2048, 2036,
-    2025, 2005, 1976, 1943, 1905, 1860, 1823, 1798,
-    1772, 1745, 1719, 1685, 1659, 1644, 1621, 1597,
-    1580, 1550, 1511, 1484, 1466, 1451, 1450, 1453,
-    1443, 1434, 1441, 1454, 1460, 1458, 1453, 1445,
-    1434, 1423, 1406, 1386, 1371, 1360, 1343, 1334,
-    1335, 1333, 1336, 1350, 1370, 1394, 1429, 1471,
-    1509, 1546, 1585, 1641, 1696, 1740, 1781, 1824,
-    1865, 1905, 1950, 1988, 2018, 2056, 2093, 2130,
-    2176, 2220, 2252, 2289, 2337, 2370, 2389, 2427,
-    2464, 2479, 2504, 2542, 2566, 2591, 2627, 2654,
-    2677, 2712, 2753, 2788, 2812, 2841, 2886, 2932,
-    2976, 3012, 3042, 3078, 3118, 3143, 3160, 3180,
-    3197, 3204, 3206, 3206, 3202, 3195, 3183, 3166,
-    3140, 3105, 3074, 3045, 3003, 2952, 2903, 2859,
-    2823, 2780, 2725, 2682, 2646, 2608, 2573, 2532,
-    2486, 2443, 2399, 2342, 2287, 2244, 2199, 2152,
-    2109, 2065, 2033, 2022, 2002, 1975, 1960, 1952,
-    1938, 1935, 1934, 1928, 1921, 1922, 1924, 1924,
-    1933, 1944, 1947, 1958, 1973, 1981, 1985, 1992,
-    2002, 2004, 2004, 2013, 2020, 2019, 2009, 1999,
-    1993, 1984, 1969, 1945, 1904, 1864, 1831, 1797,
-    1768, 1741, 1709, 1678, 1655, 1641, 1628, 1613,
-    1605, 1595, 1572, 1557, 1554, 1547, 1537, 1535,
-    1531, 1522, 1520, 1525, 1520, 1512, 1509, 1497,
-    1480, 1465, 1446, 1427, 1406, 1392, 1378, 1364,
-    1360, 1354, 1347, 1355, 1374, 1390, 1413, 1439,
-    1471, 1510, 1558, 1606, 1657, 1707, 1748, 1791,
-    1834, 1869, 1906, 1940, 1965, 1998, 2029, 2063,
-    2099, 2138, 2175, 2211, 2250, 2283, 2310, 2340,
-    2370, 2396, 2422, 2455, 2477, 2504, 2533, 2565,
-    2596, 2632, 2667, 2695, 2730, 2768, 2806, 2845,
-    2889, 2920, 2951, 2991, 3035, 3069, 3094, 3113,
-    3129, 3141, 3149, 3150, 3145, 3139, 3127, 3111,
-    3102, 3091, 3065, 3039, 3017, 2982, 2948, 2918,
-    2886, 2846, 2807, 2770, 2729, 2696, 2669, 2632,
-    2587, 2544, 2495, 2441, 2389, 2344, 2289, 2232,
-    2189, 2143, 2101, 2072, 2048, 2023, 2002, 1987,
-    1970, 1954, 1949, 1935, 1922, 1923, 1914, 1906,
-    1911, 1919, 1927, 1936, 1946, 1950, 1955, 1959,
-    1959, 1950, 1942, 1930, 1922, 1916, 1905, 1889,
-    1879, 1871, 1854, 1836, 1807, 1772, 1738, 1707,
-    1679, 1653, 1632, 1608, 1582, 1569, 1559, 1542,
-    1534, 1531, 1515, 1497, 1492, 1487, 1482, 1485,
-    1487, 1481, 1478, 1482, 1484, 1479, 1473, 1458,
-    1437, 1416, 1395, 1372, 1348, 1332, 1317, 1303,
-    1295, 1293, 1294, 1301, 1313, 1328, 1347, 1367,
-    1390, 1421, 1458, 1496, 1534, 1576, 1621, 1660,
-    1696, 1734, 1765, 1797, 1829, 1853, 1877, 1910,
-    1939, 1970, 2010, 2049, 2077, 2111, 2144, 2166,
-    2196, 2231, 2253, 2281, 2309, 2331, 2361, 2403,
-    2436, 2469, 2507, 2536, 2567, 2600, 2636, 2673,
-    2707, 2743, 2776, 2812, 2856, 2893, 2921, 2950,
-    2976, 2994, 3003, 3010, 3014, 3014, 3015, 3013,
-    3005, 2999, 2989, 2978, 2966, 2953, 2939, 2915,
-    2891, 2861, 2835, 2809, 2781, 2758, 2734, 2705,
-    2666, 2628, 2588, 2532, 2478, 2426, 2371, 2312,
-    2257, 2206, 2159, 2124, 2094, 2064, 2034, 2016,
-    1990, 1973, 1967, 1947, 1929, 1921, 1907, 1890,
-    1888, 1892, 1893, 1897, 1902, 1908, 1907, 1908,
-    1906, 1893, 1879, 1864, 1849, 1830, 1814, 1803,
-    1789, 1775, 1765, 1748, 1722, 1693, 1662, 1629,
-    1597, 1568, 1539, 1512, 1496, 1481, 1467, 1458,
-    1452, 1437, 1425, 1412, 1399, 1390, 1389, 1391,
-    1394, 1392, 1394, 1404, 1406, 1410, 1411, 1403,
-    1383, 1364, 1345, 1318, 1294, 1276, 1257, 1238,
-    1231, 1226, 1222, 1227, 1234, 1240, 1255, 1274,
-    1291, 1314, 1346, 1384, 1420, 1460, 1504, 1544,
-    1583, 1622, 1651, 1679, 1707, 1733, 1750, 1773,
-    1802, 1829, 1857, 1892, 1927, 1955, 1985, 2014,
-    2040, 2061, 2090, 2114, 2132, 2160, 2194, 2226,
-    2265, 2306, 2346, 2383, 2419, 2459, 2497, 2534,
-    2571, 2603, 2633, 2671, 2709, 2742, 2778, 2811,
-    2836, 2864, 2886, 2902, 2915, 2925, 2924, 2932,
-    2938, 2943, 2943, 2944, 2945, 2942, 2941, 2935,
-    2923, 2914, 2897, 2878, 2861, 2840, 2818, 2800,
-    2779, 2755, 2726, 2693, 2651, 2602, 2556, 2504,
-    2453, 2399, 2341, 2291, 2243, 2208, 2172, 2138,
-    2111, 2082, 2053, 2035, 2022, 2002, 1987, 1977,
-    1958, 1944, 1939, 1934, 1931, 1932, 1934, 1930,
-    1928, 1925, 1916, 1898, 1883, 1861, 1839, 1824,
-    1810, 1800, 1787, 1775, 1762, 1741, 1714, 1682,
-    1650, 1616, 1578, 1545, 1514, 1482, 1464, 1449,
-    1430, 1420, 1414, 1396, 1380, 1373, 1367, 1355,
-    1352, 1349, 1345, 1346, 1352, 1360, 1362, 1365,
-    1366, 1355, 1341, 1332, 1317, 1294, 1277, 1255,
-    1233, 1221, 1215, 1209, 1208, 1212, 1212, 1219,
-    1233, 1250, 1270, 1293, 1319, 1353, 1388, 1425,
-    1469, 1515, 1552, 1580, 1612, 1636, 1655, 1678,
-    1698, 1712, 1734, 1769, 1789, 1813, 1848, 1878,
-    1901, 1929, 1952, 1969, 1991, 2013, 2035, 2059,
-    2092, 2123, 2156, 2192, 2233, 2275, 2314, 2360,
-    2404, 2440, 2479, 2518, 2555, 2595, 2632, 2669,
-    2705, 2739, 2766, 2794, 2818, 2836, 2861, 2881,
-    2889, 2901, 2915, 2929, 2946, 2966, 2973, 2975,
-    2988, 2990, 2982, 2985, 2976, 2953, 2937, 2926,
-    2910, 2889, 2876, 2858, 2831, 2800, 2767, 2722,
-    2670, 2624, 2575, 2517, 2462, 2414, 2361, 2314,
-    2276, 2243, 2208, 2180, 2156, 2125, 2099, 2085,
-    2068, 2051, 2041, 2029, 2015, 2008, 2007, 2011,
-    2013, 2010, 2007, 1996, 1985, 1972, 1958, 1933,
-    1908, 1892, 1873, 1855, 1845, 1836, 1821, 1807,
-    1790, 1762, 1733, 1706, 1674, 1638, 1604, 1576,
-    1547, 1521, 1503, 1483, 1462, 1449, 1431, 1410,
-    1396, 1383, 1366, 1360, 1355, 1346, 1343, 1343,
-    1343, 1343, 1342, 1340, 1334, 1323, 1311, 1297,
-    1283, 1268, 1251, 1236, 1220, 1209, 1204, 1200,
-    1201, 1202, 1208, 1215, 1227, 1244, 1262, 1287,
-    1318, 1352, 1385, 1424, 1459, 1490, 1522, 1554,
-    1578, 1598, 1620, 1637, 1656, 1680, 1711, 1740,
-    1764, 1797, 1826, 1854, 1884, 1916, 1945, 1967,
-    1994, 2019, 2044, 2074, 2108, 2145, 2178, 2217,
-    2253, 2294, 2334, 2374, 2419, 2463, 2506, 2552,
-    2594, 2640, 2681, 2717, 2756, 2793, 2820, 2849,
-    2878, 2903, 2924, 2948, 2968, 2982, 3009, 3030,
-    3045, 3064, 3082, 3095, 3100, 3105, 3103, 3093,
-    3089, 3073, 3057, 3045, 3028, 3009, 2985, 2956,
-    2922, 2881, 2833, 2776, 2716, 2661, 2599, 2537,
-    2483, 2428, 2378, 2336, 2295, 2260, 2229, 2206,
-    2178, 2153, 2136, 2116, 2102, 2092, 2084, 2069,
-    2061, 2058, 2057, 2055, 2056, 2054, 2046, 2036,
-    2025, 2008, 1990, 1969, 1946, 1923, 1903, 1888,
-    1873, 1860, 1852, 1833, 1811, 1788, 1760, 1735,
-    1711, 1686, 1662, 1634, 1608, 1593, 1569, 1541,
-    1518, 1491, 1454, 1426, 1406, 1382, 1369, 1364,
-    1347, 1326, 1324, 1318, 1307, 1298, 1290, 1277,
-    1261, 1252, 1242, 1229, 1219, 1211, 1195, 1178,
-    1171, 1163, 1149, 1145, 1145, 1137, 1139, 1149,
-    1159, 1173, 1191, 1215, 1239, 1265, 1293, 1321,
-    1353, 1382, 1414, 1446, 1469, 1497, 1524, 1551,
-    1583, 1614, 1642, 1665, 1697, 1727, 1753, 1787,
-    1818, 1840, 1868, 1896, 1921, 1948, 1980, 2009,
-    2040, 2077, 2113, 2149, 2187, 2226, 2267, 2309,
-    2357, 2405, 2452, 2501, 2549, 2596, 2644, 2685,
-    2722, 2759, 2797, 2831, 2863, 2900, 2934, 2958,
-    2993, 3021, 3042, 3068, 3094, 3116, 3134, 3152,
-    3165, 3173, 3181, 3180, 3173, 3164, 3154, 3139,
-    3123, 3103, 3075, 3049, 3014, 2979, 2933, 2869,
-    2798, 2732, 2669, 2597, 2532, 2466, 2396, 2341,
-    2299, 2259, 2228, 2201, 2176, 2148, 2125, 2107,
-    2094, 2082, 2076, 2066, 2044, 2034, 2033, 2031,
-    2033, 2038, 2032, 2023, 2020, 2010, 1995, 1976,
-    1956, 1932, 1907, 1887, 1870, 1854, 1843, 1834,
-    1811, 1788, 1770, 1748, 1728, 1712, 1700, 1684,
-    1667, 1652, 1636, 1615, 1592, 1569, 1534, 1489,
-    1447, 1408, 1380, 1354, 1328, 1301, 1280, 1260,
-    1242, 1231, 1219, 1201, 1179, 1159, 1137, 1121,
-    1108, 1095, 1087, 1077, 1069, 1064, 1058, 1055,
-    1057, 1054, 1051, 1059, 1064, 1070, 1081, 1096,
-    1113, 1134, 1158, 1179, 1200, 1218, 1240, 1267,
-    1293, 1322, 1349, 1373, 1409, 1452, 1491, 1529,
-    1570, 1605, 1632, 1663, 1693, 1718, 1749, 1780,
-    1799, 1822, 1858, 1896, 1928, 1963, 2001, 2033,
-    2066, 2107, 2141, 2177, 2223, 2264, 2301, 2351,
-    2400, 2449, 2498, 2546, 2593, 2636, 2683, 2730,
-    2769, 2810, 2858, 2901, 2939, 2986, 3032, 3065,
-    3101, 3137, 3164, 3193, 3219, 3236, 3257, 3273,
-    3275, 3276, 3281, 3273, 3258, 3247, 3225, 3201,
-    3173, 3143, 3108, 3061, 3009, 2947, 2872, 2788,
-    2704, 2627, 2545, 2457, 2380, 2310, 2243, 2191,
-    2156, 2123, 2094, 2072, 2046, 2025, 2014, 2002,
-    1984, 1972, 1967, 1955, 1950, 1958, 1961, 1965,
-    1970, 1975, 1972, 1964, 1960, 1943, 1920, 1898,
-    1872, 1844, 1816, 1799, 1781, 1767, 1757, 1748,
-    1733, 1716, 1706, 1700, 1701, 1704, 1706, 1710,
-    1710, 1702, 1692, 1675, 1648, 1616, 1578, 1536,
-    1492, 1453, 1411, 1382, 1356, 1321, 1289, 1266,
-    1241, 1208, 1179, 1152, 1115, 1085, 1062, 1038,
-    1020, 1006, 997, 994, 988, 987, 986, 993,
-    998, 1002, 1012, 1021, 1036, 1049, 1060, 1076,
-    1091, 1109, 1128, 1149, 1166, 1179, 1193, 1215,
-    1245, 1276, 1307, 1339, 1374, 1413, 1456, 1500,
-    1540, 1574, 1602, 1635, 1670, 1709, 1747, 1783,
-    1820, 1860, 1899, 1941, 1988, 2035, 2076, 2112,
-    2146, 2181, 2215, 2252, 2287, 2320, 2360, 2401,
-    2450, 2498, 2546, 2597, 2649, 2697, 2747, 2800,
-    2851, 2901, 2953, 3010, 3057, 3100, 3144, 3182,
-    3221, 3265, 3301, 3327, 3359, 3385, 3406, 3427,
-    3442, 3454, 3457, 3447, 3431, 3412, 3385, 3351,
-    3320, 3284, 3234, 3187, 3136, 3076, 3012, 2935,
-    2845, 2749, 2654, 2562, 2465, 2374, 2289, 2216,
-    2153, 2100, 2059, 2020, 1990, 1968, 1946, 1926,
-    1911, 1899, 1891, 1889, 1887, 1887, 1894, 1902,
-    1915, 1926, 1932, 1937, 1932, 1922, 1911, 1893,
-    1876, 1861, 1845, 1827, 1808, 1794, 1784, 1779,
-    1776, 1762, 1745, 1734, 1725, 1730, 1743, 1757,
-    1771, 1783, 1787, 1790, 1792, 1781, 1756, 1720,
-    1674, 1624, 1580, 1541, 1498, 1459, 1422, 1384,
-    1352, 1326, 1281, 1230, 1189, 1144, 1086, 1040,
-    1005, 966, 939, 923, 915, 908, 911, 917,
-    919, 922, 931, 944, 948, 952, 961, 972,
-    981, 1004, 1031, 1046, 1060, 1074, 1088, 1104,
-    1126, 1151, 1174, 1203, 1239, 1279, 1322, 1376,
-    1421, 1457, 1494, 1528, 1559, 1586, 1625, 1665,
-    1702, 1747, 1794, 1851, 1909, 1968, 2021, 2064,
-    2103, 2136, 2169, 2198, 2223, 2252, 2281, 2316,
-    2356, 2398, 2446, 2496, 2543, 2593, 2645, 2697,
-    2748, 2803, 2862, 2919, 2979, 3036, 3090, 3140,
-    3185, 3221, 3251, 3278, 3300, 3323, 3348, 3375,
-    3398, 3422, 3441, 3464, 3489, 3504, 3505, 3499,
-    3489, 3467, 3440, 3414, 3375, 3335, 3309, 3270,
-    3221, 3180, 3122, 3038, 2947, 2844, 2737, 2623,
-    2503, 2388, 2277, 2176, 2098, 2039, 1989, 1943,
-    1901, 1864, 1828, 1809, 1791, 1762, 1748, 1749,
-    1745, 1753, 1780, 1804, 1828, 1854, 1876, 1889,
-    1902, 1911, 1910, 1896, 1888, 1889, 1886, 1879,
-    1876, 1875, 1866, 1859, 1857, 1841, 1817, 1795,
-    1771, 1753, 1754, 1763, 1769, 1785, 1813, 1843,
-    1868, 1885, 1883, 1853, 1819, 1786, 1750, 1709,
-    1667, 1624, 1580, 1548, 1525, 1496, 1462, 1419,
-    1361, 1298, 1228, 1154, 1083, 1016, 951, 889,
-    843, 808, 789, 778, 772, 776, 785, 797,
-    812, 830, 841, 858, 880, 893, 912, 938,
-    960, 985, 1021, 1052, 1081, 1115, 1145, 1182,
-    1227, 1268, 1313, 1356, 1390, 1424, 1460, 1487,
-    1507, 1530, 1547, 1561, 1586, 1620, 1659, 1709,
-    1764, 1823, 1885, 1945, 1994, 2039, 2079, 2113,
-    2138, 2162, 2190, 2211, 2237, 2270, 2316, 2368,
-    2419, 2473, 2530, 2584, 2638, 2705, 2766, 2821,
-    2877, 2941, 2995, 3046, 3103, 3157, 3202, 3240,
-    3280, 3322, 3364, 3401, 3433, 3476, 3516, 3548,
-    3588, 3630, 3656, 3656, 3652, 3650, 3629, 3599,
-    3563, 3524, 3479, 3434, 3398, 3367, 3334, 3294,
-    3252, 3205, 3128, 3029, 2911, 2771, 2633, 2492,
-    2352, 2209, 2076, 1972, 1887, 1824, 1787, 1752,
-    1719, 1689, 1660, 1634, 1620, 1605, 1591, 1586,
-    1588, 1592, 1610, 1642, 1675, 1703, 1733, 1762,
-    1787, 1819, 1843, 1856, 1865, 1872, 1877, 1878,
-    1867, 1854, 1840, 1821, 1804, 1786, 1765, 1743,
-    1726, 1723, 1741, 1769, 1793, 1828, 1861, 1902,
-    1944, 1976, 1994, 2000, 1988, 1959, 1929, 1908,
-    1883, 1843, 1800, 1754, 1711, 1658, 1596, 1535,
-    1455, 1354, 1259, 1171, 1075, 977, 877, 780,
-    701, 638, 580, 545, 531, 516, 513, 548,
-    590, 623, 669, 724, 767, 808, 859, 898,
-    925, 951, 978, 1007, 1033, 1070, 1111, 1141,
-    1169, 1209, 1251, 1287, 1318, 1342, 1356, 1376,
-    1397, 1415, 1431, 1450, 1475, 1504, 1544, 1595,
-    1645, 1687, 1739, 1799, 1853, 1903, 1953, 1994,
-    2023, 2052, 2082, 2102, 2123, 2147, 2168, 2184,
-    2213, 2256, 2294, 2331, 2382, 2434, 2480, 2536,
-    2592, 2645, 2699, 2760, 2820, 2878, 2951, 3015,
-    3072, 3132, 3193, 3263, 3327, 3380, 3423, 3474,
-    3526, 3562, 3598, 3642, 3672, 3691, 3711, 3728,
-    3735, 3723, 3700, 3678, 3657, 3608, 3548, 3499,
-    3457, 3382, 3313, 3273, 3208, 3142, 3075, 2959,
-    2817, 2667, 2519, 2370, 2221, 2069, 1919, 1806,
-    1717, 1645, 1604, 1570, 1528, 1489, 1456, 1427,
-    1402, 1369, 1344, 1348, 1363, 1373, 1404, 1457,
-    1507, 1553, 1606, 1660, 1709, 1755, 1788, 1814,
-    1831, 1842, 1851, 1841, 1823, 1812, 1799, 1787,
-    1788, 1790, 1774, 1756, 1750, 1751, 1765, 1798,
-    1819, 1836, 1865, 1907, 1947, 1986, 2017, 2027,
-    2025, 2025, 2033, 2050, 2070, 2073, 2068, 2054,
-    2022, 1971, 1907, 1814, 1695, 1575, 1452, 1322,
-    1207, 1104, 999, 907, 833, 756, 684, 625,
-    552, 482, 446, 421, 396, 394, 417, 445,
-    486, 556, 636, 709, 784, 863, 927, 986,
-    1044, 1096, 1138, 1182, 1228, 1277, 1328, 1379,
-    1423, 1452, 1474, 1484, 1485, 1486, 1495, 1510,
-    1525, 1544, 1574, 1609, 1638, 1671, 1709, 1738,
-    1758, 1777, 1800, 1826, 1856, 1892, 1932, 1975,
-    2014, 2050, 2083, 2116, 2140, 2148, 2151, 2157,
-    2161, 2170, 2187, 2210, 2240, 2284, 2344, 2409,
-    2477, 2550, 2624, 2702, 2778, 2854, 2938, 3026,
-    3115, 3202, 3281, 3353, 3429, 3507, 3561, 3601,
-    3650, 3683, 3706, 3747, 3797, 3830, 3873, 3924,
-    3949, 3972, 3978, 3955, 3922, 3887, 3821, 3732,
-    3655, 3579, 3479, 3401, 3352, 3285, 3209, 3141,
-    3040, 2876, 2688, 2517, 2355, 2168, 1979, 1819,
-    1679, 1564, 1495, 1459, 1424, 1386, 1344, 1301,
-    1274, 1256, 1223, 1201, 1210, 1236, 1261, 1312,
-    1384, 1449, 1511, 1577, 1641, 1695, 1750, 1801,
-    1834, 1853, 1880, 1912, 1919, 1911, 1910, 1906,
-    1897, 1903, 1903, 1884, 1856, 1834, 1824, 1842,
-    1887, 1927, 1954, 1992, 2046, 2096, 2142, 2177,
-    2194, 2185, 2167, 2166, 2186, 2213, 2246, 2277,
-    2306, 2334, 2333, 2288, 2207, 2101, 1966, 1800,
-    1634, 1475, 1312, 1164, 1042, 941, 857, 784,
-    716, 654, 599, 541, 481, 435, 405, 384,
-    379, 399, 446, 520, 616, 713, 806, 898,
-    986, 1072, 1150, 1217, 1280, 1331, 1368, 1404,
-    1442, 1478, 1507, 1520, 1518, 1506, 1489, 1474,
-    1482, 1505, 1526, 1549, 1577, 1614, 1655, 1687,
-    1707, 1719, 1719, 1711, 1715, 1727, 1744, 1767,
-    1803, 1848, 1899, 1953, 1994, 2024, 2043, 2045,
-    2035, 2020, 2002, 1986, 1975, 1971, 1987, 2018,
-    2059, 2111, 2166, 2228, 2299, 2377, 2464, 2553,
-    2637, 2724, 2814, 2914, 3028, 3140, 3240, 3332,
-    3412, 3474, 3542, 3616, 3671, 3720, 3764, 3805,
-    3855, 3908, 3953, 3986, 4025, 4042, 4044, 4048,
-    4038, 3998, 3961, 3927, 3885, 3828, 3774, 3712,
-    3639, 3573, 3491, 3406, 3320, 3221, 3102, 2943,
-    2742, 2530, 2346, 2173, 1982, 1799, 1648, 1520,
-    1422, 1366, 1330, 1297, 1248, 1199, 1170, 1160,
-    1130, 1098, 1100, 1128, 1156, 1198, 1264, 1342,
-    1427, 1518, 1601, 1680, 1763, 1838, 1889, 1930,
-    1965, 1996, 2010, 2003, 1990, 1980, 1974, 1977,
-    1988, 1997, 1998, 1992, 1984, 2002, 2047, 2085,
-    2102, 2124, 2152, 2181, 2216, 2246, 2262, 2268,
-    2263, 2275, 2302, 2335, 2376, 2413, 2447, 2483,
-    2511, 2513, 2494, 2446, 2364, 2246, 2118, 1985,
-    1833, 1679, 1530, 1383, 1250, 1135, 1038, 947,
-    858, 776, 700, 640, 579, 518, 464, 420,
-    396, 395, 421, 465, 520, 577, 648, 746,
-    848, 938, 1029, 1115, 1188, 1256, 1322, 1372,
-    1413, 1441, 1448, 1443, 1450, 1461, 1469, 1480,
-    1500, 1528, 1562, 1606, 1649, 1675, 1692, 1699,
-    1687, 1682, 1680, 1671, 1665, 1675, 1693, 1724,
-    1764, 1809, 1853, 1888, 1915, 1933, 1945, 1947,
-    1929, 1901, 1866, 1838, 1823, 1814, 1817, 1829,
-    1846, 1875, 1915, 1969, 2030, 2093, 2161, 2232,
-    2308, 2389, 2471, 2554, 2644, 2731, 2823, 2918,
-    3032, 3147, 3228, 3317, 3411, 3490, 3582, 3674,
-    3736, 3781, 3821, 3846, 3882, 3932, 3947, 3947,
-    3976, 4000, 4013, 4047, 4080, 4083, 4083, 4079,
-    4052, 4025, 3978, 3903, 3825, 3745, 3646, 3543,
-    3457, 3355, 3229, 3081, 2872, 2637, 2440, 2233,
-    2004, 1804, 1624, 1462, 1332, 1234, 1156, 1091,
-    1036, 971, 913, 884, 848, 800, 797, 850,
-    917, 990, 1081, 1192, 1306, 1426, 1536, 1625,
-    1715, 1785, 1832, 1867, 1904, 1953, 1978, 1982,
-    1993, 2014, 2031, 2047, 2067, 2072, 2064, 2041,
-    2013, 2008, 2027, 2043, 2045, 2054, 2088, 2131,
-    2168, 2198, 2230, 2248, 2259, 2287, 2329, 2375,
-    2421, 2470, 2517, 2569, 2613, 2619, 2593, 2547,
-    2484, 2404, 2326, 2256, 2172, 2065, 1941, 1812,
-    1679, 1549, 1416, 1271, 1127, 994, 860, 747,
-    663, 577, 491, 424, 376, 356, 342, 336,
-    334, 347, 378, 429, 509, 594, 677, 766,
-    867, 969, 1064, 1145, 1220, 1288, 1342, 1389,
-    1428, 1461, 1481, 1503, 1528, 1554, 1589, 1622,
-    1627, 1615, 1602, 1584, 1577, 1569, 1559, 1560,
-    1566, 1571, 1585, 1614, 1640, 1660, 1670, 1685,
-    1706, 1720, 1723, 1727, 1731, 1736, 1740, 1743,
-    1747, 1745, 1731, 1709, 1690, 1678, 1671, 1667,
-    1676, 1700, 1740, 1787, 1841, 1903, 1965, 2033,
-    2109, 2189, 2267, 2352, 2441, 2527, 2626, 2743,
-    2857, 2965, 3071, 3173, 3259, 3334, 3404, 3461,
-    3530, 3603, 3653, 3704, 3752, 3795, 3834, 3883,
-    3935, 3970, 4002, 4038, 4052, 4058, 4075, 4095,
-    4094, 4084, 4076, 4046, 4017, 3989, 3933, 3855,
-    3773, 3674, 3558, 3452, 3351, 3209, 3023, 2797,
-    2555, 2342, 2122, 1878, 1665, 1482, 1308, 1166,
-    1067, 979, 909, 855, 779, 731, 714, 658,
-    615, 635, 679, 744, 832, 920, 1027, 1152,
-    1272, 1387, 1507, 1618, 1709, 1767, 1810, 1867,
-    1929, 1956, 1961, 1974, 1984, 1992, 2018, 2034,
-    2038, 2044, 2024, 2000, 2018, 2051, 2063, 2059,
-    2067, 2090, 2128, 2158, 2185, 2209, 2224, 2237,
-    2277, 2334, 2395, 2452, 2504, 2562, 2627, 2677,
-    2694, 2677, 2632, 2570, 2504, 2446, 2397, 2332,
-    2259, 2182, 2109, 2034, 1951, 1852, 1732, 1593,
-    1437, 1291, 1167, 1047, 926, 810, 706, 632,
-    577, 522, 487, 465, 427, 397, 412, 435,
-    454, 488, 532, 593, 675, 760, 828, 903,
-    980, 1041, 1108, 1181, 1249, 1306, 1354, 1402,
-    1465, 1533, 1578, 1605, 1614, 1611, 1609, 1603,
-    1592, 1592, 1597, 1588, 1594, 1620, 1651, 1686,
-    1702, 1700, 1696, 1700, 1695, 1694, 1695, 1690,
-    1693, 1699, 1717, 1743, 1753, 1754, 1754, 1751,
-    1742, 1731, 1719, 1702, 1688, 1687, 1693, 1706,
-    1723, 1741, 1767, 1803, 1851, 1905, 1964, 2034,
-    2106, 2183, 2272, 2373, 2471, 2564, 2660, 2756,
-    2847, 2947, 3037, 3120, 3209, 3289, 3362, 3432,
-    3508, 3576, 3621, 3668, 3712, 3749, 3784, 3803,
-    3821, 3862, 3892, 3900, 3928, 3973, 3988, 4005,
-    4037, 4047, 4036, 4022, 3988, 3946, 3912, 3858,
-    3784, 3710, 3633, 3546, 3446, 3344, 3221, 3046,
-    2803, 2566, 2353, 2113, 1878, 1678, 1481, 1308,
-    1191, 1088, 989, 921, 837, 727, 653, 596,
-    519, 479, 498, 538, 606, 699, 799, 919,
-    1049, 1174, 1286, 1387, 1485, 1579, 1642, 1695,
-    1788, 1878, 1921, 1960, 2014, 2042, 2065, 2100,
-    2117, 2128, 2133, 2116, 2104, 2123, 2160, 2166,
-    2160, 2179, 2208, 2224, 2237, 2255, 2260, 2261,
-    2285, 2325, 2381, 2455, 2530, 2598, 2674, 2751,
-    2806, 2823, 2811, 2779, 2726, 2681, 2652, 2618,
-    2569, 2519, 2465, 2408, 2352, 2286, 2196, 2075,
-    1944, 1798, 1652, 1527, 1395, 1256, 1133, 1024,
-    935, 856, 784, 704, 619, 550, 509, 485,
-    458, 435, 419, 429, 462, 503, 547, 591,
-    633, 673, 727, 792, 851, 912, 984, 1059,
-    1136, 1222, 1305, 1377, 1427, 1460, 1488, 1512,
-    1532, 1549, 1570, 1601, 1635, 1683, 1734, 1790,
-    1841, 1867, 1888, 1905, 1912, 1910, 1904, 1894,
-    1890, 1904, 1926, 1936, 1943, 1950, 1957, 1959,
-    1952, 1930, 1901, 1864, 1822, 1795, 1773, 1754,
-    1730, 1700, 1677, 1663, 1646, 1629, 1627, 1634,
-    1652, 1687, 1739, 1801, 1868, 1938, 2004, 2077,
-    2152, 2223, 2290, 2356, 2436, 2523, 2615, 2721,
-    2831, 2939, 3034, 3118, 3199, 3263, 3307, 3338,
-    3360, 3385, 3412, 3443, 3484, 3532, 3590, 3636,
-    3678, 3741, 3795, 3823, 3843, 3860, 3869, 3883,
-    3905, 3922, 3931, 3949, 3961, 3967, 3971, 3950,
-    3917, 3867, 3796, 3725, 3641, 3527, 3364, 3145,
-    2925, 2727, 2501, 2257, 2038, 1833, 1624, 1458,
-    1332, 1208, 1102, 997, 875, 772, 695, 608,
-    539, 519, 519, 538, 589, 658, 758, 881,
-    1002, 1121, 1249, 1370, 1484, 1576, 1646, 1729,
-    1821, 1872, 1910, 1966, 2011, 2047, 2093, 2135,
-    2168, 2194, 2196, 2185, 2192, 2210, 2209, 2187,
-    2176, 2179, 2183, 2183, 2191, 2198, 2198, 2214,
-    2249, 2296, 2358, 2432, 2503, 2580, 2662, 2731,
-    2778, 2798, 2799, 2781, 2760, 2744, 2719, 2690,
-    2660, 2627, 2593, 2566, 2531, 2471, 2388, 2293,
-    2188, 2074, 1965, 1850, 1725, 1591, 1448, 1321,
-    1214, 1114, 1024, 945, 875, 819, 781, 749,
-    711, 677, 640, 606, 595, 587, 579, 581,
-    595, 622, 669, 735, 803, 875, 950, 1028,
-    1106, 1177, 1229, 1266, 1295, 1321, 1350, 1381,
-    1407, 1440, 1481, 1528, 1587, 1654, 1716, 1771,
-    1812, 1836, 1853, 1871, 1877, 1876, 1877, 1878,
-    1887, 1903, 1917, 1932, 1943, 1947, 1954, 1959,
-    1961, 1953, 1935, 1911, 1883, 1851, 1812, 1763,
-    1708, 1651, 1605, 1568, 1536, 1512, 1488, 1474,
-    1470, 1482, 1502, 1527, 1554, 1580, 1608, 1649,
-    1698, 1750, 1808, 1878, 1960, 2048, 2149, 2257,
-    2358, 2448, 2534, 2620, 2711, 2796, 2863, 2917,
-    2964, 3004, 3034, 3064, 3108, 3140, 3164, 3205,
-    3250, 3293, 3327, 3355, 3386, 3423, 3462, 3484,
-    3508, 3534, 3552, 3569, 3604, 3639, 3672, 3707,
-    3737, 3772, 3803, 3829, 3844, 3850, 3840, 3814,
-    3772, 3714, 3647, 3559, 3425, 3233, 3027, 2851,
-    2657, 2445, 2257, 2089, 1918, 1770, 1645, 1522,
-    1414, 1300, 1158, 1036, 939, 826, 725, 680,
-    664, 668, 707, 755, 830, 935, 1031, 1122,
-    1213, 1296, 1373, 1440, 1486, 1558, 1641, 1689,
-    1732, 1791, 1842, 1889, 1940, 1977, 2013, 2045,
-    2051, 2040, 2045, 2053, 2046, 2029, 2016, 2016,
-    2020, 2012, 2010, 2013, 2013, 2034, 2069, 2111,
-    2173, 2244, 2312, 2387, 2472, 2545, 2598, 2627,
-    2643, 2655, 2658, 2667, 2675, 2678, 2686, 2699,
-    2704, 2707, 2705, 2682, 2629, 2562, 2483, 2394,
-    2306, 2212, 2115, 2022, 1933, 1845, 1755, 1661,
-    1569, 1481, 1391, 1305, 1234, 1166, 1093, 1024,
-    968, 922, 897, 866, 837, 821, 809, 795,
-    792, 812, 829, 848, 872, 913, 966, 1020,
-    1062, 1098, 1135, 1167, 1191, 1217, 1244, 1277,
-    1316, 1357, 1410, 1472, 1532, 1583, 1633, 1677,
-    1716, 1747, 1761, 1770, 1783, 1802, 1821, 1844,
-    1872, 1897, 1918, 1929, 1934, 1937, 1934, 1922,
-    1908, 1891, 1875, 1863, 1849, 1833, 1815, 1797,
-    1774, 1753, 1730, 1706, 1679, 1652, 1636, 1622,
-    1616, 1617, 1624, 1633, 1648, 1671, 1695, 1721,
-    1752, 1794, 1843, 1894, 1958, 2022, 2084, 2144,
-    2203, 2264, 2320, 2372, 2412, 2457, 2501, 2538,
-    2577, 2616, 2651, 2683, 2711, 2736, 2764, 2789,
-    2798, 2808, 2817, 2824, 2838, 2858, 2873, 2897,
-    2921, 2939, 2971, 3004, 3030, 3054, 3079, 3104,
-    3131, 3168, 3202, 3242, 3282, 3308, 3342, 3376,
-    3408, 3432, 3444, 3445, 3442, 3428, 3404, 3378,
-    3344, 3295, 3219, 3110, 2992, 2886, 2763, 2622,
-    2498, 2377, 2254, 2155, 2056, 1960, 1891, 1803,
-    1704, 1622, 1549, 1471, 1411, 1370, 1342, 1334,
-    1331, 1342, 1378, 1427, 1475, 1521, 1557, 1594,
-    1638, 1671, 1699, 1738, 1774, 1794, 1821, 1855,
-    1876, 1905, 1924, 1930, 1937, 1943, 1935, 1919,
-    1905, 1898, 1885, 1871, 1865, 1867, 1867, 1863,
-    1862, 1859, 1865, 1878, 1891, 1909, 1942, 1989,
-    2040, 2100, 2166, 2229, 2279, 2325, 2362, 2394,
-    2427, 2458, 2478, 2496, 2523, 2549, 2567, 2590,
-    2601, 2602, 2588, 2564, 2529, 2490, 2444, 2390,
-    2334, 2279, 2227, 2174, 2121, 2068, 2014, 1954,
-    1887, 1820, 1760, 1701, 1638, 1580, 1524, 1479,
-    1444, 1415, 1391, 1372, 1355, 1338, 1322, 1314,
-    1304, 1293, 1293, 1302, 1311, 1328, 1351, 1377,
-    1413, 1450, 1478, 1506, 1535, 1567, 1604, 1641,
-    1678, 1714, 1746, 1777, 1808, 1834, 1856, 1867,
-    1870, 1869, 1870, 1866, 1856, 1852, 1852, 1853,
-    1858, 1861, 1865, 1868, 1872, 1880, 1883, 1885,
-    1885, 1886, 1887, 1888, 1891, 1895, 1895, 1888,
-    1885, 1881, 1872, 1860, 1841, 1834, 1823, 1813,
-    1809, 1804, 1803, 1804, 1810, 1817, 1825, 1836,
-    1847, 1857, 1870, 1888, 1904, 1919, 1937, 1960,
-    1983, 2004, 2026, 2045, 2066, 2084, 2098, 2115,
-    2132, 2150, 2169, 2185, 2206, 2227, 2243, 2257,
-    2271, 2285, 2295, 2302, 2309, 2316, 2323, 2333,
-    2347, 2361, 2379, 2395, 2410, 2421, 2436, 2449,
-    2465, 2480, 2491, 2500, 2513, 2525, 2538, 2557,
-    2577, 2595, 2613, 2632, 2651, 2674, 2691, 2710,
-    2727, 2745, 2758, 2769, 2785, 2800, 2810, 2816,
-    2826, 2832, 2828, 2823, 2817, 2805, 2797, 2779,
-    2750, 2716, 2684, 2650, 2609, 2569, 2528, 2485,
-    2447, 2408, 2377, 2351, 2323, 2301, 2281, 2267,
-    2257, 2247, 2241, 2243, 2247, 2247, 2253, 2259,
-    2270, 2289, 2301, 2308, 2320, 2331, 2341, 2346,
-    2348, 2350, 2347, 2338, 2330, 2321, 2311, 2302,
-    2290, 2271, 2256, 2239, 2211, 2183, 2161, 2140,
-    2115, 2087, 2064, 2047, 2029, 2015, 2001, 1988,
-    1980, 1971, 1959, 1954, 1955, 1956, 1962, 1970,
-    1978, 1987, 1995, 1998, 2001, 2003, 2000, 1997,
-    1989, 1984, 1980, 1973, 1967, 1963, 1958, 1947,
-    1939, 1929, 1917, 1905, 1893, 1880, 1869, 1860,
-    1850, 1841, 1833, 1827, 1820, 1820, 1821, 1822,
-    1824, 1824, 1822, 1824, 1830, 1831, 1837, 1849,
-    1857, 1864, 1874, 1880, 1884, 1894, 1902, 1901,
-    1900, 1900, 1903, 1909, 1910, 1909, 1901, 1895,
-    1891, 1884, 1875, 1867, 1854, 1839, 1829, 1821,
-    1811, 1803, 1791, 1779, 1774, 1764, 1751, 1735,
-    1724, 1714, 1703, 1693, 1684, 1676, 1669, 1663,
-    1659, 1656, 1655, 1653, 1650, 1650, 1651, 1652,
-    1652, 1652, 1654, 1656, 1661, 1670, 1677, 1681,
-    1690, 1700, 1711, 1719, 1729, 1742, 1750, 1761,
-    1771, 1782, 1793, 1803, 1815, 1826, 1836, 1849,
-    1861, 1874, 1884, 1894, 1910, 1921, 1934, 1947,
-    1960, 1969, 1980, 1995, 2005, 2014, 2022, 2029,
-    2035, 2040, 2048, 2054, 2059, 2066, 2074, 2082,
-    2088, 2091, 2096, 2102, 2100, 2101, 2104, 2107,
-    2113, 2121, 2131, 2136, 2140, 2145, 2148, 2151,
-    2156, 2162, 2165, 2170, 2175, 2179, 2184, 2191,
-    2198, 2206, 2219, 2229, 2240, 2252, 2268, 2282,
-    2295, 2310, 2328, 2346, 2364, 2383, 2402, 2420,
-    2439, 2456, 2472, 2489, 2503, 2516, 2530, 2545,
-    2561, 2575, 2587, 2595, 2602, 2610, 2615, 2620,
-    2620, 2619, 2615, 2612, 2609, 2600, 2594, 2583,
-    2571, 2559, 2545, 2531, 2513, 2496, 2477, 2465,
-    2451, 2438, 2426, 2409, 2395, 2385, 2369, 2354,
-    2344, 2332, 2321, 2310, 2299, 2293, 2289, 2284,
-    2277, 2265, 2256, 2249, 2234, 2223, 2215, 2201,
-    2189, 2180, 2169, 2158, 2148, 2136, 2120, 2105,
-    2091, 2073, 2053, 2034, 2016, 1998, 1982, 1968,
-    1959, 1946, 1936, 1929, 1919, 1914, 1909, 1902,
-    1899, 1894, 1892, 1890, 1891, 1894, 1895, 1897,
-    1895, 1895, 1892, 1892, 1888, 1882, 1877, 1872,
-    1869, 1862, 1859, 1858, 1854, 1849, 1843, 1837,
-    1828, 1821, 1813, 1801, 1788, 1781, 1772, 1763,
-    1752, 1745, 1735, 1724, 1713, 1704, 1693, 1685,
-    1677, 1671, 1667, 1667, 1668, 1668, 1670, 1674,
-    1678, 1680, 1681, 1683, 1686, 1688, 1689, 1694,
-    1696, 1694, 1694, 1700, 1704, 1707, 1711, 1717,
-    1721, 1730, 1736, 1741, 1746, 1753, 1760, 1765,
-    1775, 1782, 1786, 1793, 1798, 1803, 1811, 1815,
-    1822, 1830, 1836, 1844, 1852, 1857, 1864, 1870,
-    1873, 1878, 1883, 1885, 1888, 1893, 1894, 1900,
-    1905, 1908, 1912, 1916, 1921, 1925, 1927, 1931,
-    1936, 1935, 1940, 1945, 1945, 1946, 1952, 1955,
-    1958, 1963, 1965, 1967, 1970, 1969, 1969, 1974,
-    1974, 1973, 1974, 1975, 1977, 1979, 1983, 1984,
-    1989, 1996, 2002, 2002, 2007, 2016, 2021, 2022,
-    2029, 2038, 2039, 2041, 2049, 2051, 2054, 2058,
-    2063, 2065, 2072, 2079, 2084, 2091, 2100, 2109,
-    2114, 2122, 2128, 2135, 2142, 2153, 2162, 2167,
-    2179, 2191, 2195, 2204, 2215, 2222, 2233, 2244,
-    2253, 2259, 2267, 2275, 2281, 2289, 2297, 2302,
-    2301, 2308, 2316, 2316, 2321, 2324, 2324, 2329,
-    2334, 2335, 2337, 2339, 2339, 2341, 2342, 2344,
-    2344, 2345, 2346, 2349, 2348, 2349, 2350, 2351,
-    2350, 2351, 2352, 2350, 2350, 2351, 2347, 2346,
-    2346, 2346, 2340, 2339, 2340, 2341, 2337, 2335,
-    2335, 2329, 2327, 2324, 2322, 2318, 2318, 2315,
-    2311, 2309, 2305, 2303, 2300, 2303, 2301, 2295,
-    2292, 2290, 2286, 2282, 2277, 2272, 2267, 2256,
-    2248, 2242, 2231, 2220, 2207, 2196, 2185, 2176,
-    2166, 2153, 2144, 2132, 2121, 2111, 2100, 2087,
-    2074, 2060, 2051, 2042, 2030, 2025, 2015, 2005,
-    1998, 1993, 1985, 1978, 1969, 1960, 1954, 1947,
-    1940, 1932, 1928, 1921, 1915, 1912, 1904, 1899,
-    1892, 1889, 1887, 1879, 1873, 1866, 1860, 1852,
-    1848, 1842, 1837, 1835, 1833, 1832, 1828, 1827,
-    1826, 1825, 1825, 1824, 1823, 1827, 1829, 1830,
-    1833, 1835, 1839, 1841, 1843, 1842, 1846, 1848,
-    1851, 1853, 1857, 1863, 1866, 1870, 1871, 1875,
-    1877, 1879, 1880, 1881, 1882, 1882, 1883, 1882,
-    1884, 1885, 1886, 1886, 1889, 1890, 1890, 1893,
-    1893, 1891, 1891, 1893, 1892, 1894, 1896, 1897,
-    1900, 1904, 1908, 1913, 1913, 1914, 1919, 1919,
-    1923, 1929, 1932, 1937, 1940, 1945, 1949, 1953,
-    1955, 1958, 1962, 1967, 1973, 1976, 1977, 1982,
-    1986, 1989, 1993, 1999, 2001, 2007, 2009, 2012,
-    2018, 2022, 2025, 2033, 2040, 2045, 2051, 2059,
-    2064, 2073, 2081, 2082, 2092, 2098, 2105, 2111,
-    2116, 2121, 2128, 2133, 2136, 2139, 2142, 2146,
-    2152, 2156, 2158, 2161, 2167, 2165, 2169, 2173,
-    2174, 2179, 2175, 2176, 2179, 2181, 2184, 2185,
-    2186, 2188, 2191, 2189, 2190, 2190, 2191, 2193,
-    2197, 2197, 2196, 2199, 2199, 2199, 2201, 2203,
-    2205, 2208, 2210, 2212, 2214, 2216, 2219, 2222,
-    2222, 2227, 2229, 2229, 2233, 2234, 2236, 2238,
-    2240, 2242, 2244, 2248, 2249, 2251, 2250, 2250,
-    2251, 2248, 2248, 2247, 2248, 2250, 2250, 2248,
-    2247, 2247, 2247, 2247, 2248, 2250, 2252, 2253,
-    2253, 2254, 2256, 2258, 2257, 2257, 2256, 2259,
-    2258, 2257, 2257, 2256, 2253, 2256, 2258, 2254,
-    2251, 2247, 2245, 2243, 2240, 2236, 2231, 2227,
-    2224, 2221, 2217, 2215, 2214, 2210, 2206, 2202,
-    2200, 2199, 2193, 2190, 2186, 2182, 2180, 2175,
-    2171, 2168, 2162, 2157, 2152, 2148, 2144, 2139,
-    2131, 2125, 2118, 2113, 2109, 2104, 2099, 2095,
-    2090, 2087, 2082, 2076, 2070, 2068, 2065, 2056,
-    2052, 2051, 2048, 2048, 2043, 2041, 2037, 2034,
-    2030, 2026, 2023, 2021, 2020, 2017, 2014, 2011,
-    2009, 2005, 2004, 2003, 2002, 2001, 2000, 1995,
-    1993, 1992, 1987, 1984, 1984, 1979, 1976, 1972,
-    1967, 1966, 1962, 1960, 1957, 1956, 1956, 1955,
-    1953, 1951, 1949, 1946, 1944, 1942, 1938, 1936,
-    1937, 1934, 1932, 1932, 1930, 1928, 1929, 1926,
-    1925, 1925, 1923, 1923, 1922, 1919, 1922, 1920,
-    1920, 1921, 1919, 1924, 1926, 1928, 1929, 1929,
-    1934, 1936, 1936, 1937, 1937, 1939, 1939, 1943,
-    1944, 1947, 1948, 1950, 1952, 1955, 1959, 1959,
-    1963, 1964, 1967, 1970, 1972, 1975, 1978, 1981,
-    1985, 1985, 1991, 1994, 1997, 2002, 2007, 2013,
-    2016, 2022, 2025, 2028, 2031, 2032, 2033, 2035,
-    2040, 2043, 2046, 2049, 2053, 2052, 2052, 2051,
-    2050, 2052, 2054, 2053, 2053, 2058, 2062, 2063,
-    2064, 2066, 2068, 2066, 2069, 2070, 2071, 2073,
-    2074, 2074, 2076, 2076, 2076, 2078, 2077, 2079,
-    2078, 2079, 2079, 2078, 2078, 2077, 2074, 2074,
-    2073, 2074, 2070, 2068, 2070, 2069, 2067, 2067,
-    2064, 2064, 2066, 2065, 2065, 2064, 2063, 2066,
-    2066, 2066, 2064, 2065, 2067, 2065, 2067, 2068,
-    2067, 2067, 2068, 2068, 2068, 2068, 2069, 2069,
-    2071, 2071, 2072, 2075, 2076, 2076, 2076, 2076,
-    2076, 2077, 2078, 2080, 2082, 2084, 2087, 2089,
-    2090, 2091, 2091, 2093, 2091, 2093, 2097, 2097,
-    2098, 2100, 2102, 2102, 2105, 2104, 2103, 2103,
-    2105, 2105, 2111, 2112, 2109, 2111, 2111, 2110,
-    2108, 2108, 2109, 2110, 2112, 2110, 2106, 2106,
-    2106, 2106, 2101, 2102, 2103, 2101, 2098, 2098,
-    2098, 2096, 2092, 2092, 2088, 2089, 2085, 2082,
-    2081, 2077, 2074, 2069, 2068, 2062, 2058, 2057,
-    2054, 2051, 2048, 2046, 2042, 2041, 2037, 2037,
-    2031, 2026, 2026, 2021, 2018, 2015, 2011, 2006,
-    2000, 1999, 1994, 1991, 1986, 1983, 1984, 1982,
-    1980, 1978, 1978, 1977, 1976, 1975, 1973, 1974,
-    1974, 1974, 1974, 1974, 1977, 1978, 1977, 1976,
-    1976, 1977, 1976, 1978, 1981, 1982, 1980, 1983,
-    1984, 1985, 1986, 1985, 1982, 1983, 1983, 1984,
-    1984, 1987, 1984, 1983, 1984, 1980, 1979, 1984,
-    1981, 1980, 1983, 1985, 1984, 1984, 1982, 1982,
-    1987, 1987, 1986, 1992, 1989, 1989, 1998, 2001,
-    2000, 2002, 2003, 2003, 2004, 2005, 2007, 2009,
-    2010, 2010, 2013, 2013, 2014, 2014, 2016, 2021,
-    2018, 2019, 2022, 2026, 2029, 2028, 2029, 2029,
-    2033, 2034, 2032, 2035, 2035, 2035, 2038, 2039,
-    2041, 2044, 2047, 2046, 2047, 2052, 2054, 2058,
-    2059, 2058, 2060, 2063, 2065, 2068, 2067, 2069,
-    2068, 2067, 2071, 2073, 2073, 2073, 2075, 2073,
-    2071, 2069, 2072, 2072, 2072, 2073, 2072, 2067,
-    2063, 2068, 2069, 2068, 2067, 2066, 2066, 2064,
-    2065, 2064, 2063, 2061, 2061, 2059, 2061, 2061,
-    2059, 2058, 2059, 2056, 2051, 2052, 2051, 2047,
-    2045, 2042, 2039, 2041, 2041, 2036, 2035, 2032,
-    2031, 2032, 2031, 2028, 2028, 2026, 2026, 2023,
-    2022, 2021, 2022, 2022, 2020, 2019, 2016, 2018,
-    2017, 2016, 2015, 2013, 2016, 2019, 2019, 2021,
-    2023, 2024, 2025, 2027, 2029, 2030, 2033, 2032,
-    2035, 2041, 2042, 2043, 2046, 2050, 2051, 2053,
-    2057, 2056, 2058, 2055, 2056, 2056, 2054, 2051,
-    2051, 2051, 2046, 2045, 2047, 2046, 2046, 2047,
-    2046, 2043, 2044, 2041, 2041, 2040, 2040, 2041,
-    2040, 2041, 2038, 2036, 2035, 2036, 2037, 2037,
-    2034, 2035, 2033, 2030, 2030, 2029, 2029, 2028,
-    2027, 2028, 2028, 2026, 2025, 2025, 2028, 2028,
-    2030, 2031, 2031, 2033, 2038, 2039, 2040, 2042,
-    2044, 2048, 2050, 2050, 2055, 2059, 2064, 2065,
-    2068, 2071, 2074, 2076, 2076, 2080, 2086, 2085,
-    2086, 2091, 2090, 2092, 2096, 2096, 2097, 2100,
-    2103, 2105, 2103, 2104, 2104, 2106, 2107, 2106,
-    2107, 2108, 2107, 2108, 2109, 2107, 2107, 2109,
-    2107, 2108, 2105, 2103, 2102, 2101, 2101, 2101,
-    2101, 2100, 2102, 2099, 2100, 2103, 2100, 2098,
-    2095, 2096, 2091, 2088, 2087, 2087, 2086, 2084,
-    2084, 2081, 2082, 2081, 2077, 2075, 2073, 2071,
-    2069, 2067, 2067, 2067, 2066, 2065, 2068, 2068,
-    2066, 2066, 2064, 2063, 2063, 2060, 2058, 2058,
-    2057, 2057, 2057, 2055, 2051, 2048, 2049, 2047,
-    2046, 2045, 2042, 2042, 2042, 2040, 2040, 2039,
-    2038, 2034, 2032, 2032, 2032, 2031, 2029, 2029,
-    2028, 2028, 2028, 2026, 2024, 2025, 2026, 2023,
-    2024, 2024, 2023, 2023, 2020, 2021, 2020, 2021,
-    2023, 2024, 2024, 2026, 2026, 2026, 2026, 2030,
-    2028, 2030, 2032, 2034, 2032, 2032, 2032, 2034,
-    2038, 2039, 2039, 2037, 2036, 2041, 2043, 2043,
-    2044, 2046, 2050, 2052, 2046, 2045, 2048, 2051,
-    2049, 2049, 2047, 2047, 2046, 2042, 2041, 2043,
-    2040, 2040, 2045, 2045, 2043, 2043, 2038, 2040,
-    2037, 2030, 2027, 2031, 2038, 2034, 2038, 2039,
-    2033, 2032, 2032, 2028, 2029, 2035, 2037, 2038,
-    2038, 2038, 2044, 2047, 2042, 2039, 2043, 2042,
-    2044, 2048, 2048, 2051, 2051, 2056, 2058, 2058,
-    2055, 2055, 2055, 2060, 2066, 2067, 2070, 2072,
-    2074, 2069, 2069, 2070, 2070, 2074, 2076, 2074,
-    2074, 2077, 2079, 2080, 2080, 2081, 2078, 2082,
-    2084, 2084, 2086, 2086, 2087, 2081, 2087, 2090,
-    2088, 2089, 2090, 2087, 2087, 2087, 2086, 2090,
-    2094, 2090, 2088, 2093, 2093, 2091, 2090, 2089,
-    2087, 2088, 2089, 2092, 2095, 2092, 2086, 2085,
-    2085, 2085, 2088, 2087, 2084, 2078, 2075, 2078,
-    2079, 2073, 2065, 2063, 2066, 2066, 2065, 2067,
-    2063, 2056, 2060, 2062, 2060, 2059, 2062, 2057,
-    2056, 2055, 2056, 2059, 2058, 2059, 2052, 2052,
-    2054, 2054, 2057, 2055, 2053, 2055, 2056, 2054,
-    2048, 2044, 2043, 2041, 2037, 2033, 2031, 2033,
-    2035, 2035, 2030, 2025, 2024, 2025, 2028, 2024,
-    2021, 2023, 2020, 2016, 2020, 2020, 2012, 2009,
-    2015, 2019, 2021, 2019, 2015, 2018, 2017, 2012,
-    2011, 2017, 2015, 2012, 2011, 2010, 2011, 2017,
-    2018, 2014, 2013, 2015, 2011, 2006, 2006, 2005,
-    2005, 2006, 2001, 2002, 2009, 2009, 2010, 2013,
-    2017, 2021, 2019, 2020, 2024, 2025, 2028, 2029,
-    2028, 2032, 2034, 2037, 2040, 2038, 2036, 2036,
-    2040, 2039, 2034, 2034, 2033, 2027, 2030, 2033,
-    2030, 2030, 2032, 2030, 2028, 2029, 2027, 2023,
-    2022, 2022, 2017, 2018, 2021, 2020, 2017, 2014,
-    2017, 2017, 2015, 2020, 2021, 2018, 2019, 2020,
-    2021, 2019, 2017, 2017, 2018, 2021, 2021, 2021,
-    2024, 2029, 2031, 2035, 2035, 2035, 2036, 2035,
-    2038, 2043, 2047, 2048, 2046, 2043, 2045, 2047,
-    2046, 2047, 2047, 2048, 2051, 2052, 2052, 2052,
-    2052, 2051, 2052, 2050, 2045, 2047, 2050, 2048,
-    2049, 2048, 2046, 2050, 2051, 2051, 2052, 2052,
-    2055, 2056, 2056, 2055, 2060, 2061, 2057, 2061,
-    2064, 2064, 2061, 2061, 2060, 2064, 2064, 2065,
-    2068, 2067, 2066, 2066, 2067, 2069, 2070, 2068,
-    2069, 2069, 2069, 2073, 2074, 2074, 2075, 2078,
-    2082, 2081, 2079, 2084, 2088, 2086, 2085, 2088,
-    2091, 2092, 2096, 2100, 2107, 2109, 2110, 2110,
-    2113, 2112, 2110, 2114, 2116, 2116, 2116, 2115,
-    2114, 2112, 2109, 2110, 2111, 2112, 2112, 2109,
-    2108, 2108, 2111, 2113, 2113, 2111, 2109, 2107,
-    2107, 2106, 2106, 2106, 2106, 2104, 2100, 2105,
-    2105, 2101, 2104, 2104, 2104, 2103, 2098, 2096,
-    2100, 2102, 2098, 2098, 2097, 2094, 2094, 2091,
-    2089, 2090, 2091, 2091, 2087, 2086, 2086, 2086,
-    2087, 2088, 2085, 2082, 2079, 2078, 2079, 2077,
-    2079, 2077, 2078, 2078, 2077, 2078, 2083, 2083,
-    2082, 2082, 2085, 2086, 2092, 2095, 2092, 2092,
-    2096, 2096, 2100, 2102, 2103, 2106, 2108, 2106,
-    2104, 2106, 2108, 2109, 2108, 2108, 2106, 2106,
-    2103, 2103, 2105, 2103, 2102, 2099, 2098, 2101,
-    2101, 2103, 2104, 2107, 2106, 2105, 2106, 2108,
-    2108, 2107, 2107, 2106, 2109, 2111, 2108, 2107,
-    2107, 2108, 2104, 2105, 2104, 2102, 2101, 2103,
-    2107, 2103, 2101, 2099, 2096, 2097, 2098, 2098,
-    2098, 2098, 2098, 2100, 2099, 2098, 2099, 2098,
-    2098, 2100, 2102, 2099, 2098, 2096, 2095, 2097,
-    2094, 2095, 2092, 2086, 2081, 2079, 2070, 2063,
-    2053, 2046, 1902, 1613, 1570, 1719, 1812, 1882,
-    1946, 1964, 1959, 1931, 1918, 1942, 1980, 2003,
-    2025, 2040, 2049, 2063, 2059, 2053, 2062, 2086,
-    2102, 2119, 2114, 2081, 2034, 2009, 2013, 2033,
-    2068, 2109, 2134, 2126, 2096, 2053, 2007, 1980,
-    1980, 2016, 2063, 2086, 2092, 2088, 2082, 2065,
-    2051, 2037, 2030, 2040, 2056, 2065, 2048, 2026,
-    2014, 2015, 2032, 2054, 2075, 2080, 2069, 2054,
-    2031, 2011, 1994, 1982, 1987, 2005, 2030, 2055,
-    2064, 2037, 1997, 1967, 1965, 1984, 2004, 2011,
-    2007, 2002, 1993, 1985, 1985, 1984, 1985, 1988,
-    1994, 1991, 1979, 1960, 1946, 1938, 1931, 1937,
-    1952, 1972, 1984, 1979, 1953, 1927, 1909, 1894,
-    1897, 1914, 1932, 1939, 1932, 1920, 1914, 1907,
-    1913, 1933, 1944, 1937, 1933, 1935, 1925, 1916,
-    1909, 1909, 1918, 1936, 1954, 1958, 1953, 1941,
-    1927, 1914, 1908, 1925, 1941, 1949, 1955, 1954,
-    1950, 1946, 1940, 1929, 1926, 1929, 1937, 1945,
-    1950, 1942, 1932, 1925, 1928, 1940, 1947, 1950,
-    1951, 1947, 1937, 1924, 1922, 1928, 1931, 1939,
-    1947, 1950, 1948, 1941, 1938, 1932, 1927, 1924,
-    1926, 1929, 1929, 1931, 1928, 1915, 1909, 1906,
-    1909, 1914, 1919, 1921, 1919, 1912, 1903, 1897,
-    1899, 1901, 1906, 1909, 1901, 1896, 1897, 1896,
-    1893, 1887, 1880, 1884, 1884, 1878, 1878, 1881,
-    1875, 1866, 1863, 1854, 1852, 1860, 1865, 1861,
-    1853, 1859, 1865, 1865, 1858, 1859, 1858, 1853,
-    1852, 1849, 1848, 1846, 1845, 1841, 1830, 1820,
-    1827, 1834, 1827, 1828, 1826, 1806, 1804, 1805,
-    1806, 1818, 1818, 1813, 1814, 1808, 1804, 1806,
-    1813, 1816, 1820, 1821, 1816, 1815, 1813, 1814,
-    1818, 1823, 1831, 1841, 1844, 1831, 1825, 1825,
-    1821, 1826, 1827, 1827, 1831, 1836, 1841, 1840,
-    1830, 1834, 1843, 1845, 1851, 1855, 1849, 1842,
-    1839, 1838, 1837, 1841, 1841, 1842, 1842, 1836,
-    1830, 1826, 1830, 1842, 1846, 1855, 1864, 1860,
-    1859, 1857, 1850, 1853, 1859, 1858, 1862, 1867,
-    1868, 1862, 1850, 1842, 1842, 1839, 1847, 1864,
-    1870, 1869, 1870, 1862, 1850, 1842, 1846, 1856,
-    1859, 1866, 1870, 1866, 1857, 1847, 1844, 1848,
-    1858, 1863, 1863, 1861, 1856, 1853, 1858, 1867,
-    1873, 1883, 1889, 1892, 1891, 1885, 1884, 1886,
-    1891, 1904, 1919, 1925, 1924, 1919, 1911, 1904,
-    1894, 1894, 1904, 1915, 1927, 1936, 1937, 1936,
-    1926, 1918, 1920, 1926, 1931, 1938, 1937, 1935,
-    1936, 1946, 1958, 1962, 1965, 1963, 1953, 1950,
-    1947, 1935, 1923, 1914, 1911, 1914, 1925, 1931,
-    1933, 1934, 1927, 1923, 1921, 1926, 1926, 1924,
-    1929, 1938, 1952, 1956, 1956, 1959, 1957, 1960,
-    1964, 1958, 1946, 1947, 1953, 1960, 1969, 1977,
-    1983, 1981, 1975, 1965, 1955, 1948, 1937, 1921,
-    1916, 1922, 1931, 1945, 1954, 1960, 1957, 1944,
-    1927, 1922, 1923, 1925, 1929, 1932, 1943, 1952,
-    1960, 1958, 1953, 1953, 1939, 1914, 1901, 1887,
-    1880, 1878, 1878, 1883, 1881, 1882, 1888, 1896,
-    1895, 1879, 1864, 1846, 1829, 1831, 1842, 1846,
-    1851, 1867, 1873, 1866, 1852, 1838, 1834, 1833,
-    1831, 1828, 1823, 1820, 1829, 1836, 1838, 1838,
-    1837, 1827, 1814, 1801, 1801, 1802, 1797, 1797,
-    1814, 1830, 1837, 1844, 1847, 1840, 1830, 1818,
-    1803, 1797, 1801, 1811, 1823, 1838, 1837, 1823,
-    1810, 1798, 1783, 1765, 1744, 1723, 1708, 1701,
-    1701, 1715, 1728, 1737, 1731, 1725, 1723, 1719,
-    1700, 1679, 1672, 1671, 1668, 1672, 1678, 1683,
-    1692, 1698, 1695, 1684, 1671, 1662, 1660, 1653,
-    1641, 1639, 1644, 1657, 1672, 1668, 1647, 1632,
-    1626, 1617, 1598, 1584, 1588, 1597, 1603, 1613,
-    1622, 1621, 1614, 1606, 1600, 1592, 1575, 1551,
-    1537, 1531, 1525, 1531, 1557, 1573, 1574, 1571,
-    1571, 1568, 1558, 1561, 1554, 1538, 1531, 1539,
-    1553, 1560, 1558, 1547, 1531, 1511, 1498, 1493,
-    1491, 1500, 1509, 1508, 1505, 1502, 1505, 1519,
-    1531, 1527, 1524, 1529, 1524, 1513, 1517, 1521,
-    1527, 1547, 1569, 1592, 1598, 1587, 1569, 1553,
-    1538, 1528, 1531, 1538, 1540, 1540, 1544, 1552,
-    1552, 1552, 1551, 1557, 1560, 1557, 1557, 1550,
-    1535, 1513, 1493, 1501, 1524, 1536, 1543, 1542,
-    1534, 1531, 1533, 1544, 1568, 1596, 1616, 1636,
-    1653, 1658, 1654, 1647, 1641, 1634, 1637, 1632,
-    1630, 1634, 1634, 1637, 1639, 1639, 1650, 1674,
-    1689, 1687, 1672, 1663, 1647, 1635, 1646, 1661,
-    1680, 1707, 1728, 1731, 1732, 1727, 1710, 1702,
-    1711, 1730, 1758, 1770, 1772, 1779, 1778, 1776,
-    1793, 1811, 1815, 1822, 1828, 1821, 1811, 1809,
-    1812, 1828, 1852, 1871, 1891, 1899, 1881, 1856,
-    1837, 1828, 1834, 1853, 1882, 1912, 1930, 1936,
-    1931, 1924, 1934, 1962, 1991, 2007, 2007, 2003,
-    2001, 1999, 2015, 2038, 2066, 2093, 2112, 2120,
-    2119, 2112, 2104, 2106, 2123, 2136, 2155, 2178,
-    2195, 2188, 2162, 2145, 2144, 2148, 2160, 2180,
-    2194, 2201, 2196, 2189, 2186, 2197, 2213, 2233,
-    2243, 2238, 2230, 2217, 2201, 2203, 2216, 2232,
-    2251, 2267, 2278, 2283, 2276, 2258, 2252, 2264,
-    2279, 2294, 2304, 2302, 2293, 2283, 2277, 2285,
-    2302, 2315, 2320, 2313, 2309, 2311, 2316, 2322,
-    2334, 2349, 2359, 2368, 2381, 2390, 2384, 2377,
-    2381, 2404, 2430, 2449, 2464, 2479, 2481, 2471,
-    2475, 2491, 2510, 2524, 2528, 2524, 2520, 2516,
-    2523, 2539, 2550, 2559, 2572, 2582, 2583, 2579,
-    2573, 2570, 2572, 2574, 2581, 2589, 2600, 2610,
-    2602, 2594, 2596, 2610, 2629, 2641, 2642, 2638,
-    2643, 2648, 2652, 2660, 2672, 2683, 2682, 2682,
-    2692, 2700, 2699, 2703, 2715, 2721, 2724, 2734,
-    2740, 2740, 2732, 2726, 2729, 2733, 2731, 2725,
-    2721, 2722, 2718, 2708, 2703, 2707, 2714, 2720,
-    2722, 2722, 2719, 2708, 2701, 2698, 2693, 2686,
-    2679, 2678, 2676, 2676, 2672, 2671, 2663, 2648,
-    2632, 2620, 2614, 2615, 2617, 2616, 2611, 2609,
-    2603, 2592, 2586, 2587, 2590, 2594, 2590, 2584,
-    2574, 2561, 2548, 2534, 2522, 2511, 2503, 2503,
-    2501, 2496, 2488, 2488, 2486, 2484, 2492, 2504,
-    2499, 2484, 2478, 2474, 2467, 2461, 2458, 2456,
-    2449, 2438, 2429, 2426, 2422, 2413, 2404, 2394,
-    2387, 2390, 2392, 2392, 2389, 2382, 2375, 2372,
-    2367, 2355, 2347, 2346, 2344, 2340, 2333, 2325,
-    2317, 2313, 2307, 2303, 2307, 2305, 2297, 2292,
-    2288, 2282, 2280, 2282, 2289, 2295, 2298, 2289,
-    2276, 2262, 2254, 2253, 2254, 2252, 2249, 2246,
-    2234, 2221, 2213, 2214, 2208, 2198, 2192, 2194,
-    2190, 2179, 2169, 2167, 2166, 2167, 2167, 2163,
-    2155, 2144, 2133, 2130, 2130, 2127, 2123, 2124,
-    2124, 2120, 2120, 2116, 2112, 2114, 2116, 2103,
-    2083, 2074, 2068, 2068, 2069, 2079, 2093, 2098,
-    2089, 2085, 2088, 2090, 2084, 2075, 2074, 2075,
-    2079, 2081, 2079, 2075, 2076, 2086, 2096, 2099,
-    2104, 2107, 2109, 2112, 2112, 2111, 2113, 2119,
-    2123, 2128, 2131, 2130, 2123, 2117, 2118, 2120,
-    2125, 2128, 2134, 2135, 2139, 2137, 2131, 2126,
-    2123, 2127, 2127, 2126, 2121, 2119, 2114, 2115,
-    2118, 2121, 2123, 2123, 2123, 2119, 2113, 2110,
-    2107, 2102, 2102, 2105, 2109, 2109, 2099, 2085,
-    2077, 2076, 2081, 2087, 2097, 2101, 2102, 2103,
-    2104, 2103, 2104, 2108, 2111, 2112, 2111, 2109,
-    2106, 2100, 2097, 2095, 2089, 2094, 2094, 2085,
-    2074, 2067, 2058, 2053, 2056, 2058, 2056, 2052,
-    2044, 2038, 2030, 2023, 2024, 2027, 2028, 2026,
-    2019, 2015, 2020, 2022, 2020, 2013, 2013, 2010,
-    2005, 2005, 2007, 2009, 2017, 2019, 2020, 2020,
-    2021, 2021, 2019, 2015, 2019, 2023, 2031, 2039,
-    2044, 2046, 2042, 2041, 2039, 2042, 2039, 2034,
-    2030, 2025, 2019, 2020, 2022, 2026, 2028, 2026,
-    2017, 2007, 1996, 1983, 1981, 1984, 1984, 1976,
-    1973, 1974, 1966, 1953, 1947, 1948, 1947, 1943,
-    1933, 1922, 1911, 1905, 1911, 1918, 1924, 1934,
-    1942, 1938, 1933, 1927, 1928, 1932, 1937, 1950,
-    1960, 1963, 1961, 1960, 1964, 1962, 1959, 1963,
-    1964, 1956, 1946, 1936, 1935, 1931, 1925, 1926,
-    1935, 1935, 1927, 1914, 1905, 1899, 1901, 1907,
-    1910, 1912, 1910, 1908, 1908, 1909, 1914, 1918,
-    1917, 1912, 1909, 1911, 1909, 1905, 1909, 1921,
-    1931, 1936, 1938, 1940, 1942, 1937, 1934, 1926,
-    1929, 1948, 1961, 1960, 1960, 1963, 1963, 1957,
-    1954, 1955, 1955, 1953, 1950, 1948, 1953, 1959,
-    1956, 1945, 1945, 1952, 1951, 1941, 1929, 1923,
-    1926, 1931, 1933, 1940, 1959, 1969, 1961, 1949,
-    1948, 1956, 1955, 1955, 1952, 1952, 1957, 1961,
-    1968, 1977, 1986, 1991, 1985, 1987, 1991, 1988,
-    1989, 1996, 2004, 2010, 2019, 2036, 2048, 2048,
-    2044, 2041, 2040, 2048, 2062, 2075, 2078, 2074,
-    2080, 2092, 2105, 2118, 2129, 2129, 2123, 2130,
-    2141, 2144, 2148, 2163, 2173, 2168, 2169, 2179,
-    2187, 2187, 2182, 2179, 2178, 2183, 2181, 2182,
-    2190, 2202, 2204, 2195, 2194, 2196, 2198, 2197,
-    2193, 2187, 2186, 2189, 2192, 2196, 2199, 2201,
-    2198, 2196, 2201, 2201, 2196, 2191, 2193, 2202,
-    2216, 2225, 2226, 2224, 2223, 2229, 2231, 2231,
-    2236, 2241, 2242, 2240, 2251, 2260, 2265, 2267,
-    2277, 2277, 2271, 2278, 2290, 2294, 2292, 2293,
-    2301, 2308, 2320, 2332, 2339, 2336, 2327, 2320,
-    2330, 2349, 2359, 2361, 2361, 2364, 2361, 2366,
-    2371, 2378, 2380, 2379, 2374, 2367, 2367, 2370,
-    2375, 2376, 2373, 2374, 2376, 2366, 2361, 2363,
-    2362, 2358, 2354, 2351, 2355, 2360, 2359, 2361,
-    2364, 2368, 2372, 2374, 2376, 2378, 2382, 2385,
-    2393, 2400, 2400, 2393, 2394, 2399, 2399, 2397,
-    2397, 2398, 2399, 2399, 2406, 2415, 2414, 2408,
-    2402, 2405, 2408, 2405, 2404, 2404, 2404, 2410,
-    2414, 2417, 2423, 2419, 2419, 2420, 2418, 2420,
-    2423, 2423, 2420, 2424, 2421, 2420, 2426, 2431,
-    2429, 2423, 2417, 2413, 2413, 2413, 2420, 2425,
-    2424, 2424, 2419, 2416, 2417, 2422, 2418, 2420,
-    2423, 2423, 2422, 2426, 2436, 2441, 2442, 2444,
-    2446, 2446, 2442, 2443, 2446, 2449, 2446, 2445,
-    2449, 2454, 2459, 2457, 2453, 2451, 2448, 2443,
-    2441, 2445, 2447, 2449, 2450, 2452, 2455, 2459,
-    2457, 2451, 2444, 2439, 2439, 2441, 2448, 2453,
-    2455, 2462, 2468, 2471, 2476, 2482, 2486, 2490,
-    2486, 2488, 2493, 2500, 2511, 2517, 2520, 2518,
-    2521, 2526, 2525, 2521, 2528, 2539, 2545, 2547,
-    2554, 2562, 2568, 2573, 2578, 2581, 2586, 2592,
-    2596, 2600, 2607, 2612, 2619, 2631, 2639, 2641,
-    2639, 2635, 2634, 2639, 2647, 2647, 2645, 2651,
-    2650, 2649, 2646, 2635, 2628, 2628, 2627, 2621,
-    2614, 2604, 2593, 2591, 2596, 2601, 2595, 2588,
-    2590, 2587, 2578, 2579, 2585, 2590, 2589, 2587,
-    2589, 2587, 2581, 2582, 2583, 2578, 2572, 2576,
-    2576, 2578, 2577, 2576, 2577, 2580, 2584, 2586,
-    2588, 2583, 2581, 2587, 2588, 2585, 2591, 2602,
-    2605, 2607, 2607, 2609, 2611, 2612, 2614, 2615,
-    2615, 2610, 2610, 2610, 2608, 2608, 2609, 2611,
-    2600, 2591, 2593, 2592, 2589, 2582, 2575, 2572,
-    2572, 2567, 2562, 2557, 2553, 2541, 2532, 2534,
-    2534, 2530, 2529, 2526, 2522, 2518, 2512, 2504,
-    2507, 2514, 2506, 2494, 2493, 2495, 2490, 2485,
-    2487, 2489, 2483, 2470, 2468, 2471, 2471, 2468,
-    2465, 2458, 2454, 2449, 2444, 2438, 2429, 2418,
-    2416, 2412, 2408, 2404, 2394, 2395, 2395, 2384,
-    2376, 2369, 2365, 2359, 2350, 2343, 2343, 2339,
-    2331, 2330, 2324, 2320, 2315, 2303, 2295, 2292,
-    2289, 2281, 2279, 2276, 2273, 2268, 2266, 2264,
-    2259, 2251, 2248, 2244, 2242, 2238, 2234, 2231,
-    2231, 2223, 2218, 2218, 2221, 2217, 2209, 2205,
-    2201, 2200, 2199, 2202, 2205, 2207, 2203, 2202,
-    2201, 2198, 2195, 2195, 2194, 2192, 2191, 2194,
-    2196, 2200, 2199, 2202, 2200, 2199, 2196, 2197,
-    2203, 2201, 2202, 2204, 2207, 2208, 2211, 2216,
-    2215, 2214, 2212, 2213, 2217, 2223, 2227, 2230,
-    2236, 2239, 2248, 2254, 2258, 2263, 2269, 2277,
-    2286, 2300, 2315, 2331, 2342, 2355, 2371, 2385,
-    2398, 2413, 2430, 2443, 2458, 2473, 2486, 2497,
-    2512, 2523, 2529, 2533, 2538, 2542, 2546, 2549,
-    2553, 2559, 2564, 2564, 2560, 2563, 2559, 2552,
-    2548, 2546, 2545, 2540, 2540, 2541, 2537, 2539,
-    2544, 2542, 2536, 2531, 2532, 2528, 2522, 2519,
-    2516, 2524, 2527, 2527, 2531, 2536, 2536, 2532,
-    2531, 2539, 2544, 2544, 2545, 2553, 2564, 2570,
-    2571, 2571, 2573, 2574, 2578, 2587, 2595, 2598,
-    2603, 2610, 2618, 2628, 2632, 2640, 2652, 2653,
-    2650, 2652, 2655, 2660, 2671, 2676, 2681, 2691,
-    2688, 2681, 2687, 2690, 2696, 2699, 2698, 2704,
-    2709, 2706, 2708, 2717, 2717, 2711, 2710, 2709,
-    2710, 2704, 2696, 2691, 2681, 2675, 2668, 2654,
-    2634, 2608, 2581, 2560, 2539, 2511, 2479, 2446,
-    2408, 2367, 2330, 2289, 2248, 2195, 2139, 2091,
-    2037, 1980, 1927, 1871, 1817, 1766, 1716, 1665,
-    1613, 1558, 1507, 1465, 1427, 1394, 1363, 1339,
-    1315, 1291, 1276, 1266, 1257, 1252, 1253, 1260,
-    1271, 1279, 1294, 1316, 1338, 1365, 1393, 1420,
-    1443, 1471, 1502, 1534, 1568, 1599, 1629, 1655,
-    1681, 1709, 1734, 1755, 1774, 1789, 1803, 1818,
-    1828, 1841, 1851, 1855, 1859, 1862, 1864, 1869,
-    1868, 1860, 1856, 1850, 1845, 1842, 1837, 1832,
-    1824, 1818, 1807, 1802, 1794, 1792, 1786, 1778,
-    1773, 1767, 1767, 1769, 1772, 1773, 1772, 1773,
-    1777, 1782, 1788, 1799, 1816, 1836, 1857, 1880,
-    1905, 1928, 1951, 1974, 2000, 2027, 2055, 2085,
-    2120, 2149, 2179, 2208, 2240, 2272, 2298, 2323,
-    2347, 2371, 2397, 2422, 2446, 2467, 2487, 2501,
-    2516, 2532, 2544, 2550, 2557, 2561, 2567, 2575,
-    2578, 2578, 2579, 2580, 2583, 2585, 2585, 2586,
-    2587, 2585, 2582, 2590, 2595, 2599, 2601, 2602,
-    2608, 2619, 2631, 2635, 2642, 2649, 2660, 2669,
-    2683, 2704, 2721, 2739, 2755, 2769, 2791, 2811,
-    2829, 2849, 2870, 2888, 2909, 2931, 2948, 2968,
-    2989, 3004, 3031, 3052, 3063, 3069, 3081, 3095,
-    3102, 3097, 3073, 3042, 3007, 2964, 2919, 2869,
-    2814, 2755, 2694, 2634, 2584, 2535, 2473, 2404,
-    2319, 2222, 2138, 2079, 2021, 1957, 1890, 1819,
-    1758, 1713, 1675, 1641, 1610, 1569, 1526, 1500,
-    1493, 1504, 1519, 1531, 1548, 1567, 1587, 1608,
-    1634, 1661, 1680, 1704, 1738, 1782, 1844, 1901,
-    1949, 1987, 2025, 2062, 2095, 2129, 2158, 2179,
-    2192, 2209, 2225, 2246, 2277, 2294, 2301, 2296,
-    2281, 2267, 2259, 2260, 2268, 2267, 2258, 2245,
-    2229, 2214, 2201, 2187, 2168, 2145, 2119, 2090,
-    2065, 2040, 2013, 1981, 1950, 1932, 1907, 1860,
-    1805, 1751, 1700, 1661, 1626, 1591, 1554, 1504,
-    1442, 1388, 1340, 1296, 1263, 1237, 1213, 1194,
-    1173, 1159, 1154, 1154, 1160, 1173, 1190, 1202,
-    1210, 1213, 1242, 1277, 1318, 1370, 1421, 1473,
-    1517, 1558, 1603, 1657, 1711, 1762, 1812, 1857,
-    1895, 1926, 1956, 1985, 2009, 2027, 2039, 2044,
-    2042, 2038, 2037, 2039, 2047, 2055, 2057, 2049,
-    2030, 2008, 1990, 1981, 1974, 1971, 1966, 1957,
-    1949, 1943, 1944, 1953, 1964, 1979, 1986, 1991,
-    2002, 2018, 2040, 2069, 2099, 2130, 2163, 2189,
-    2212, 2233, 2261, 2297, 2338, 2381, 2416, 2454,
-    2493, 2537, 2578, 2621, 2664, 2701, 2730, 2753,
-    2776, 2805, 2841, 2877, 2914, 2940, 2961, 2975,
-    2984, 2993, 3008, 3028, 3044, 3054, 3055, 3054,
-    3058, 3063, 3072, 3080, 3086, 3082, 3074, 3069,
-    3070, 3078, 3094, 3116, 3134, 3147, 3155, 3161,
-    3171, 3185, 3203, 3222, 3235, 3235, 3229, 3218,
-    3210, 3205, 3190, 3171, 3144, 3109, 3055, 3002,
-    2953, 2902, 2840, 2760, 2669, 2559, 2445, 2337,
-    2236, 2132, 2031, 1930, 1828, 1731, 1635, 1546,
-    1473, 1410, 1352, 1298, 1258, 1226, 1205, 1195,
-    1206, 1238, 1269, 1305, 1354, 1404, 1461, 1534,
-    1624, 1727, 1839, 1952, 2056, 2159, 2258, 2362,
-    2465, 2569, 2668, 2751, 2819, 2882, 2944, 3005,
-    3063, 3111, 3143, 3152, 3148, 3135, 3115, 3092,
-    3068, 3039, 2996, 2942, 2881, 2812, 2744, 2679,
-    2611, 2549, 2481, 2412, 2346, 2283, 2230, 2185,
-    2142, 2090, 2025, 1945, 1869, 1809, 1762, 1720,
-    1681, 1633, 1574, 1519, 1480, 1451, 1427, 1397,
-    1363, 1325, 1286, 1258, 1241, 1236, 1234, 1229,
-    1226, 1224, 1222, 1220, 1230, 1252, 1284, 1329,
-    1379, 1436, 1490, 1540, 1591, 1652, 1720, 1787,
-    1850, 1907, 1961, 2016, 2078, 2145, 2213, 2274,
-    2319, 2349, 2369, 2380, 2387, 2400, 2411, 2407,
-    2392, 2366, 2329, 2292, 2255, 2225, 2192, 2149,
-    2101, 2046, 1995, 1956, 1932, 1913, 1897, 1880,
-    1851, 1825, 1806, 1799, 1808, 1830, 1854, 1880,
-    1905, 1935, 1978, 2031, 2093, 2154, 2209, 2259,
-    2315, 2369, 2428, 2497, 2564, 2630, 2685, 2733,
-    2777, 2822, 2862, 2904, 2943, 2976, 3003, 3026,
-    3043, 3062, 3076, 3079, 3077, 3076, 3075, 3063,
-    3048, 3035, 3029, 3022, 3021, 3021, 3020, 3012,
-    3004, 3001, 2998, 3004, 3013, 3022, 3031, 3035,
-    3038, 3044, 3054, 3058, 3057, 3050, 3036, 3019,
-    2998, 2976, 2955, 2925, 2883, 2829, 2770, 2691,
-    2600, 2506, 2403, 2296, 2176, 2054, 1938, 1819,
-    1703, 1592, 1488, 1383, 1281, 1183, 1096, 1024,
-    961, 917, 890, 874, 873, 880, 901, 937,
-    983, 1040, 1112, 1195, 1283, 1390, 1504, 1623,
-    1753, 1883, 2011, 2131, 2245, 2356, 2464, 2566,
-    2664, 2752, 2833, 2906, 2968, 3010, 3039, 3068,
-    3070, 3054, 3033, 3002, 2960, 2908, 2853, 2792,
-    2724, 2645, 2564, 2476, 2380, 2289, 2199, 2116,
-    2039, 1969, 1899, 1839, 1780, 1722, 1670, 1626,
-    1585, 1544, 1503, 1462, 1412, 1370, 1340, 1320,
-    1299, 1272, 1252, 1224, 1193, 1168, 1156, 1155,
-    1152, 1147, 1140, 1129, 1116, 1113, 1115, 1130,
-    1143, 1146, 1152, 1169, 1187, 1215, 1258, 1301,
-    1345, 1385, 1428, 1469, 1511, 1555, 1611, 1669,
-    1716, 1761, 1802, 1841, 1880, 1920, 1959, 1995,
-    2024, 2045, 2060, 2069, 2073, 2071, 2067, 2057,
-    2039, 2006, 1965, 1921, 1879, 1835, 1799, 1764,
-    1727, 1688, 1654, 1621, 1596, 1575, 1562, 1556,
-    1549, 1545, 1545, 1557, 1578, 1610, 1654, 1700,
-    1752, 1808, 1869, 1935, 2007, 2089, 2173, 2253,
-    2327, 2396, 2458, 2518, 2580, 2640, 2694, 2739,
-    2772, 2798, 2824, 2852, 2878, 2901, 2925, 2935,
-    2940, 2938, 2935, 2931, 2927, 2927, 2921, 2911,
-    2897, 2881, 2866, 2861, 2861, 2860, 2860, 2859,
-    2858, 2855, 2858, 2860, 2863, 2864, 2863, 2856,
-    2841, 2817, 2798, 2777, 2750, 2716, 2676, 2629,
-    2570, 2498, 2413, 2325, 2232, 2122, 2010, 1907,
-    1791, 1673, 1558, 1448, 1348, 1253, 1159, 1073,
-    993, 920, 863, 823, 799, 791, 793, 806,
-    836, 870, 913, 973, 1048, 1135, 1229, 1332,
-    1440, 1556, 1679, 1806, 1939, 2067, 2184, 2295,
-    2398, 2490, 2579, 2663, 2733, 2800, 2849, 2882,
-    2903, 2910, 2900, 2880, 2851, 2810, 2755, 2692,
-    2623, 2550, 2473, 2393, 2308, 2220, 2127, 2035,
-    1944, 1859, 1783, 1713, 1649, 1596, 1549, 1509,
-    1478, 1445, 1415, 1385, 1360, 1340, 1317, 1291,
-    1271, 1259, 1243, 1229, 1219, 1212, 1199, 1181,
-    1170, 1164, 1165, 1161, 1158, 1156, 1153, 1149,
-    1150, 1159, 1173, 1185, 1196, 1212, 1236, 1264,
-    1297, 1339, 1383, 1424, 1464, 1507, 1547, 1584,
-    1627, 1668, 1711, 1747, 1781, 1813, 1845, 1872,
-    1901, 1928, 1947, 1958, 1964, 1965, 1962, 1954,
-    1943, 1927, 1906, 1875, 1838, 1802, 1770, 1737,
-    1702, 1671, 1644, 1620, 1597, 1577, 1565, 1556,
-    1550, 1547, 1549, 1557, 1572, 1587, 1610, 1645,
-    1686, 1734, 1786, 1845, 1906, 1973, 2045, 2126,
-    2209, 2289, 2365, 2435, 2502, 2571, 2632, 2690,
-    2745, 2789, 2826, 2859, 2890, 2916, 2935, 2955,
-    2975, 2991, 2997, 2994, 2989, 2977, 2966, 2959,
-    2952, 2949, 2937, 2913, 2888, 2865, 2848, 2834,
-    2820, 2794, 2762, 2729, 2699, 2671, 2644, 2619,
-    2584, 2538, 2488, 2428, 2368, 2301, 2224, 2142,
-    2053, 1956, 1853, 1754, 1662, 1572, 1481, 1390,
-    1308, 1226, 1147, 1074, 1012, 962, 921, 893,
-    877, 865, 870, 889, 924, 970, 1024, 1086,
-    1153, 1230, 1315, 1407, 1510, 1618, 1729, 1841,
-    1944, 2043, 2141, 2233, 2319, 2402, 2475, 2538,
-    2598, 2649, 2685, 2714, 2732, 2734, 2725, 2703,
-    2663, 2611, 2549, 2481, 2415, 2348, 2276, 2196,
-    2114, 2031, 1949, 1867, 1792, 1723, 1661, 1605,
-    1552, 1505, 1468, 1436, 1411, 1383, 1352, 1314,
-    1281, 1252, 1236, 1221, 1201, 1186, 1171, 1157,
-    1149, 1149, 1146, 1136, 1132, 1127, 1123, 1124,
-    1135, 1145, 1155, 1163, 1160, 1169, 1187, 1210,
-    1238, 1273, 1311, 1355, 1404, 1452, 1503, 1550,
-    1598, 1647, 1691, 1729, 1764, 1798, 1828, 1857,
-    1885, 1910, 1928, 1939, 1953, 1964, 1968, 1963,
-    1955, 1941, 1919, 1892, 1865, 1834, 1804, 1772,
-    1731, 1695, 1659, 1627, 1603, 1584, 1566, 1557,
-    1554, 1551, 1552, 1560, 1580, 1595, 1617, 1646,
-    1679, 1724, 1772, 1825, 1882, 1938, 1994, 2063,
-    2135, 2205, 2276, 2347, 2419, 2491, 2564, 2640,
-    2709, 2770, 2815, 2857, 2897, 2932, 2966, 2993,
-    3017, 3035, 3045, 3052, 3059, 3067, 3068, 3072,
-    3071, 3054, 3030, 3006, 2988, 2967, 2945, 2926,
-    2897, 2854, 2807, 2758, 2711, 2665, 2621, 2573,
-    2512, 2443, 2366, 2289, 2212, 2128, 2034, 1924,
-    1801, 1677, 1567, 1465, 1369, 1283, 1202, 1126,
-    1051, 982, 931, 896, 866, 842, 835, 845,
-    865, 900, 951, 1014, 1086, 1160, 1242, 1332,
-    1430, 1535, 1650, 1772, 1896, 2020, 2142, 2253,
-    2352, 2438, 2514, 2578, 2632, 2675, 2708, 2731,
-    2748, 2755, 2752, 2738, 2707, 2660, 2601, 2531,
-    2453, 2371, 2289, 2206, 2121, 2038, 1951, 1867,
-    1784, 1701, 1624, 1556, 1497, 1452, 1413, 1382,
-    1366, 1357, 1345, 1330, 1316, 1299, 1272, 1237,
-    1203, 1181, 1167, 1153, 1142, 1134, 1123, 1102,
-    1086, 1080, 1077, 1072, 1067, 1071, 1079, 1087,
-    1099, 1120, 1149, 1174, 1197, 1227, 1260, 1301,
-    1348, 1402, 1464, 1528, 1587, 1642, 1694, 1739,
-    1779, 1814, 1845, 1873, 1894, 1913, 1928, 1946,
-    1962, 1974, 1982, 1978, 1964, 1939, 1912, 1883,
-    1856, 1827, 1793, 1758, 1719, 1677, 1640, 1610,
-    1583, 1561, 1542, 1537, 1538, 1546, 1567, 1592,
-    1623, 1659, 1689, 1718, 1751, 1791, 1831, 1877,
-    1930, 1990, 2051, 2110, 2172, 2236, 2297, 2353,
-    2402, 2449, 2495, 2541, 2584, 2619, 2648, 2671,
-    2693, 2711, 2727, 2742, 2753, 2769, 2782, 2803,
-    2829, 2851, 2878, 2904, 2927, 2941, 2950, 2951,
-    2942, 2928, 2917, 2901, 2876, 2843, 2803, 2766,
-    2714, 2660, 2605, 2539, 2459, 2361, 2250, 2134,
-    2021, 1900, 1768, 1634, 1507, 1377, 1254, 1147,
-    1050, 960, 877, 803, 754, 726, 703, 690,
-    699, 722, 757, 805, 874, 956, 1044, 1134,
-    1238, 1357, 1481, 1608, 1737, 1864, 1991, 2113,
-    2225, 2328, 2418, 2488, 2545, 2587, 2618, 2635,
-    2642, 2639, 2620, 2592, 2552, 2505, 2447, 2375,
-    2296, 2214, 2126, 2035, 1947, 1857, 1771, 1686,
-    1604, 1532, 1471, 1415, 1371, 1338, 1316, 1304,
-    1307, 1318, 1330, 1339, 1343, 1344, 1338, 1328,
-    1319, 1297, 1262, 1225, 1196, 1172, 1148, 1120,
-    1093, 1068, 1037, 1005, 987, 976, 965, 949,
-    943, 942, 943, 953, 976, 1006, 1038, 1073,
-    1118, 1173, 1236, 1308, 1381, 1456, 1531, 1599,
-    1659, 1718, 1767, 1807, 1843, 1878, 1908, 1926,
-    1936, 1943, 1945, 1941, 1934, 1917, 1890, 1851,
-    1806, 1761, 1719, 1673, 1624, 1579, 1538, 1496,
-    1460, 1442, 1435, 1437, 1447, 1467, 1499, 1536,
-    1581, 1632, 1683, 1737, 1795, 1853, 1914, 1979,
-    2042, 2105, 2168, 2238, 2308, 2369, 2428, 2482,
-    2533, 2582, 2623, 2661, 2688, 2700, 2712, 2724,
-    2733, 2739, 2735, 2729, 2724, 2719, 2718, 2734,
-    2756, 2772, 2784, 2800, 2822, 2836, 2839, 2823,
-    2803, 2780, 2749, 2714, 2676, 2636, 2582, 2508,
-    2439, 2379, 2307, 2207, 2097, 1977, 1841, 1695,
-    1563, 1455, 1351, 1237, 1117, 1015, 923, 843,
-    781, 739, 709, 686, 675, 696, 742, 803,
-    874, 961, 1055, 1146, 1237, 1334, 1440, 1562,
-    1693, 1830, 1968, 2097, 2218, 2322, 2415, 2498,
-    2564, 2606, 2631, 2638, 2623, 2603, 2579, 2547,
-    2506, 2451, 2371, 2276, 2176, 2077, 1988, 1900,
-    1818, 1734, 1648, 1571, 1500, 1429, 1366, 1308,
-    1252, 1206, 1176, 1163, 1164, 1186, 1215, 1244,
-    1267, 1279, 1285, 1271, 1246, 1230, 1216, 1196,
-    1172, 1147, 1109, 1061, 1018, 988, 970, 944,
-    908, 878, 858, 847, 850, 874, 915, 942,
-    958, 979, 1013, 1060, 1118, 1193, 1280, 1361,
-    1435, 1512, 1598, 1679, 1755, 1819, 1866, 1903,
-    1928, 1939, 1954, 1973, 1977, 1973, 1961, 1934,
-    1892, 1842, 1790, 1744, 1700, 1654, 1600, 1540,
-    1483, 1428, 1385, 1354, 1329, 1309, 1296, 1298,
-    1318, 1358, 1414, 1485, 1560, 1628, 1696, 1767,
-    1842, 1913, 1991, 2071, 2150, 2229, 2292, 2350,
-    2414, 2479, 2535, 2582, 2628, 2658, 2673, 2682,
-    2700, 2721, 2728, 2725, 2719, 2707, 2679, 2653,
-    2642, 2645, 2649, 2649, 2658, 2676, 2697, 2726,
-    2755, 2770, 2767, 2755, 2739, 2722, 2696, 2663,
-    2621, 2565, 2499, 2432, 2359, 2262, 2157, 2046,
-    1915, 1769, 1624, 1487, 1368, 1254, 1134, 1031,
-    931, 833, 759, 706, 669, 645, 635, 651,
-    689, 745, 819, 914, 1021, 1131, 1240, 1348,
-    1460, 1580, 1706, 1839, 1977, 2111, 2231, 2338,
-    2431, 2513, 2577, 2616, 2638, 2643, 2627, 2592,
-    2550, 2503, 2451, 2386, 2304, 2208, 2103, 1997,
-    1897, 1801, 1719, 1645, 1576, 1513, 1455, 1402,
-    1358, 1322, 1296, 1270, 1253, 1244, 1252, 1269,
-    1290, 1315, 1335, 1346, 1342, 1325, 1299, 1269,
-    1236, 1190, 1140, 1090, 1038, 986, 931, 880,
-    837, 794, 755, 723, 711, 714, 726, 754,
-    795, 844, 896, 954, 1020, 1100, 1186, 1273,
-    1369, 1472, 1574, 1672, 1766, 1855, 1932, 1995,
-    2040, 2069, 2094, 2106, 2103, 2096, 2079, 2048,
-    2006, 1953, 1897, 1834, 1774, 1708, 1641, 1579,
-    1520, 1465, 1414, 1377, 1348, 1328, 1321, 1319,
-    1329, 1361, 1410, 1471, 1540, 1618, 1698, 1779,
-    1866, 1952, 2034, 2117, 2192, 2258, 2320, 2377,
-    2431, 2479, 2521, 2558, 2581, 2596, 2610, 2617,
-    2616, 2618, 2625, 2624, 2610, 2601, 2597, 2589,
-    2584, 2589, 2594, 2612, 2633, 2651, 2692, 2745,
-    2787, 2813, 2835, 2854, 2852, 2837, 2821, 2803,
-    2774, 2715, 2641, 2566, 2481, 2384, 2272, 2143,
-    2003, 1843, 1666, 1507, 1374, 1251, 1128, 1015,
-    915, 821, 744, 691, 659, 650, 654, 671,
-    713, 783, 872, 979, 1108, 1238, 1364, 1477,
-    1592, 1713, 1838, 1966, 2090, 2207, 2314, 2405,
-    2475, 2525, 2559, 2571, 2561, 2537, 2497, 2435,
-    2363, 2295, 2229, 2157, 2073, 1981, 1880, 1778,
-    1689, 1613, 1551, 1506, 1470, 1436, 1418, 1406,
-    1398, 1399, 1408, 1421, 1435, 1449, 1461, 1480,
-    1502, 1516, 1514, 1500, 1473, 1432, 1372, 1303,
-    1236, 1162, 1081, 995, 917, 848, 785, 718,
-    669, 632, 595, 575, 574, 601, 646, 693,
-    755, 835, 929, 1024, 1124, 1236, 1354, 1468,
-    1576, 1688, 1800, 1903, 1985, 2051, 2106, 2150,
-    2168, 2162, 2149, 2130, 2093, 2045, 1989, 1929,
-    1862, 1792, 1715, 1639, 1573, 1511, 1451, 1398,
-    1359, 1335, 1321, 1323, 1331, 1356, 1402, 1453,
-    1507, 1576, 1665, 1755, 1838, 1929, 2023, 2110,
-    2190, 2261, 2323, 2373, 2415, 2449, 2473, 2497,
-    2513, 2504, 2491, 2485, 2468, 2443, 2430, 2413,
-    2380, 2358, 2355, 2354, 2349, 2368, 2388, 2403,
-    2436, 2478, 2526, 2594, 2673, 2745, 2809, 2877,
-    2926, 2942, 2962, 2981, 2972, 2937, 2882, 2829,
-    2752, 2666, 2568, 2448, 2320, 2183, 2012, 1813,
-    1625, 1455, 1286, 1138, 1015, 902, 802, 715,
-    646, 613, 614, 626, 649, 694, 772, 872,
-    983, 1118, 1271, 1428, 1569, 1695, 1806, 1920,
-    2040, 2151, 2251, 2344, 2415, 2460, 2491, 2500,
-    2491, 2458, 2398, 2319, 2231, 2136, 2038, 1941,
-    1856, 1782, 1709, 1633, 1556, 1487, 1428, 1387,
-    1366, 1364, 1378, 1396, 1416, 1443, 1479, 1520,
-    1565, 1604, 1637, 1658, 1671, 1679, 1685, 1674,
-    1649, 1602, 1528, 1432, 1320, 1199, 1073, 955,
-    842, 731, 635, 553, 482, 426, 391, 382,
-    389, 409, 450, 515, 603, 706, 824, 959,
-    1108, 1257, 1397, 1531, 1672, 1808, 1928, 2040,
-    2137, 2213, 2259, 2286, 2291, 2285, 2256, 2196,
-    2120, 2038, 1952, 1861, 1764, 1679, 1604, 1528,
-    1451, 1384, 1332, 1293, 1267, 1256, 1265, 1294,
-    1334, 1386, 1453, 1535, 1634, 1741, 1845, 1948,
-    2053, 2151, 2234, 2305, 2380, 2451, 2504, 2523,
-    2527, 2531, 2528, 2509, 2474, 2446, 2422, 2382,
-    2322, 2274, 2253, 2240, 2215, 2184, 2172, 2186,
-    2199, 2212, 2257, 2327, 2392, 2450, 2522, 2612,
-    2714, 2823, 2921, 3008, 3092, 3154, 3180, 3186,
-    3189, 3174, 3128, 3049, 2951, 2839, 2711, 2572,
-    2418, 2254, 2092, 1912, 1708, 1505, 1315, 1151,
-    1010, 895, 805, 739, 696, 670, 667, 710,
-    786, 872, 967, 1070, 1196, 1336, 1482, 1634,
-    1793, 1945, 2069, 2157, 2225, 2301, 2370, 2412,
-    2438, 2451, 2442, 2407, 2349, 2283, 2213, 2133,
-    2031, 1925, 1823, 1731, 1643, 1573, 1531, 1507,
-    1497, 1485, 1485, 1492, 1520, 1560, 1611, 1676,
-    1738, 1796, 1848, 1893, 1934, 1964, 1978, 1976,
-    1957, 1904, 1815, 1726, 1631, 1513, 1380, 1243,
-    1097, 940, 788, 649, 532, 436, 351, 290,
-    258, 256, 276, 316, 391, 494, 613, 739,
-    878, 1029, 1181, 1343, 1509, 1669, 1819, 1947,
-    2052, 2145, 2220, 2263, 2282, 2284, 2264, 2223,
-    2158, 2081, 1997, 1914, 1827, 1736, 1646, 1560,
-    1483, 1424, 1377, 1346, 1339, 1346, 1359, 1391,
-    1444, 1512, 1579, 1658, 1751, 1849, 1944, 2040,
-    2133, 2221, 2300, 2372, 2426, 2464, 2490, 2496,
-    2484, 2467, 2437, 2400, 2360, 2309, 2255, 2205,
-    2169, 2130, 2080, 2051, 2049, 2068, 2081, 2113,
-    2173, 2239, 2309, 2396, 2499, 2606, 2715, 2815,
-    2917, 3026, 3140, 3237, 3323, 3408, 3472, 3491,
-    3454, 3398, 3342, 3252, 3136, 3009, 2868, 2715,
-    2552, 2390, 2240, 2090, 1934, 1769, 1609, 1465,
-    1338, 1221, 1116, 1058, 1049, 1040, 1032, 1052,
-    1100, 1169, 1245, 1330, 1438, 1550, 1650, 1740,
-    1838, 1933, 2015, 2072, 2112, 2149, 2167, 2156,
-    2133, 2126, 2121, 2105, 2072, 2027, 1981, 1930,
-    1881, 1839, 1802, 1768, 1740, 1723, 1721, 1739,
-    1773, 1812, 1866, 1924, 1988, 2047, 2102, 2159,
-    2210, 2251, 2274, 2286, 2278, 2254, 2212, 2157,
-    2084, 1999, 1909, 1802, 1678, 1548, 1416, 1278,
-    1139, 997, 841, 704, 599, 505, 421, 370,
-    363, 374, 395, 448, 538, 646, 759, 880,
-    1015, 1157, 1299, 1422, 1541, 1671, 1790, 1879,
-    1949, 2008, 2060, 2084, 2077, 2065, 2043, 2003,
-    1939, 1867, 1803, 1735, 1659, 1589, 1536, 1507,
-    1486, 1466, 1462, 1485, 1534, 1587, 1638, 1703,
-    1781, 1853, 1917, 1987, 2058, 2121, 2172, 2215,
-    2258, 2301, 2331, 2335, 2341, 2355, 2355, 2327,
-    2291, 2261, 2221, 2172, 2122, 2080, 2050, 2030,
-    2012, 2015, 2042, 2060, 2081, 2126, 2184, 2241,
-    2296, 2369, 2449, 2526, 2596, 2663, 2741, 2830,
-    2900, 2954, 3003, 3058, 3092, 3101, 3128, 3167,
-    3178, 3160, 3129, 3100, 3050, 2972, 2880, 2785,
-    2696, 2597, 2481, 2383, 2299, 2221, 2146, 2075,
-    2018, 1959, 1883, 1804, 1739, 1681, 1619, 1568,
-    1548, 1541, 1536, 1536, 1548, 1577, 1613, 1648,
-    1678, 1710, 1737, 1750, 1758, 1779, 1804, 1822,
-    1826, 1831, 1845, 1852, 1858, 1872, 1904, 1943,
-    1970, 1991, 2015, 2044, 2070, 2084, 2097, 2110,
-    2117, 2118, 2120, 2135, 2155, 2171, 2188, 2210,
-    2226, 2223, 2208, 2194, 2173, 2142, 2097, 2046,
-    1988, 1918, 1836, 1761, 1699, 1622, 1528, 1438,
-    1355, 1269, 1186, 1109, 1036, 968, 906, 845,
-    798, 773, 757, 749, 762, 803, 857, 915,
-    984, 1067, 1151, 1229, 1305, 1380, 1451, 1518,
-    1568, 1613, 1657, 1693, 1716, 1736, 1756, 1768,
-    1769, 1759, 1750, 1750, 1744, 1728, 1709, 1700,
-    1702, 1700, 1700, 1712, 1735, 1766, 1799, 1839,
-    1887, 1935, 1969, 1999, 2036, 2069, 2092, 2106,
-    2117, 2130, 2136, 2136, 2145, 2153, 2148, 2145,
-    2142, 2141, 2136, 2131, 2134, 2147, 2154, 2157,
-    2164, 2171, 2176, 2200, 2244, 2290, 2326, 2368,
-    2436, 2502, 2560, 2631, 2712, 2769, 2814, 2855,
-    2894, 2939, 2991, 3028, 3042, 3069, 3115, 3144,
-    3139, 3149, 3177, 3146, 3045, 2956, 2888, 2804,
-    2708, 2608, 2497, 2401, 2333, 2263, 2194, 2157,
-    2126, 2058, 1970, 1902, 1862, 1818, 1760, 1719,
-    1681, 1625, 1582, 1558, 1531, 1528, 1528, 1526,
-    1534, 1553, 1588, 1610, 1631, 1655, 1670, 1654,
-    1639, 1651, 1670, 1683, 1721, 1789, 1857, 1919,
-    1977, 2027, 2076, 2120, 2145, 2162, 2177, 2191,
-    2200, 2201, 2211, 2226, 2230, 2219, 2210, 2200,
-    2188, 2183, 2180, 2179, 2162, 2132, 2093, 2045,
-    1983, 1911, 1840, 1773, 1711, 1638, 1572, 1539,
-    1512, 1456, 1381, 1314, 1248, 1178, 1112, 1042,
-    980, 936, 887, 833, 809, 817, 825, 832,
-    859, 909, 961, 1014, 1085, 1169, 1246, 1316,
-    1375, 1420, 1468, 1524, 1575, 1623, 1672, 1715,
-    1746, 1773, 1802, 1822, 1833, 1823, 1807, 1794,
-    1778, 1761, 1754, 1754, 1768, 1792, 1804, 1818,
-    1845, 1882, 1918, 1951, 1984, 2014, 2036, 2047,
-    2062, 2071, 2068, 2066, 2068, 2068, 2064, 2063,
-    2077, 2103, 2118, 2120, 2135, 2152, 2149, 2139,
-    2148, 2171, 2185, 2192, 2211, 2254, 2303, 2353,
-    2404, 2436, 2463, 2510, 2546, 2562, 2586, 2620,
-    2648, 2674, 2701, 2718, 2744, 2786, 2828, 2847,
-    2860, 2897, 2940, 2944, 2953, 2989, 3012, 3010,
-    3010, 3007, 2977, 2931, 2881, 2830, 2764, 2696,
-    2632, 2553, 2463, 2383, 2308, 2227, 2147, 2068,
-    1981, 1885, 1804, 1738, 1656, 1584, 1538, 1514,
-    1501, 1484, 1482, 1504, 1534, 1573, 1613, 1649,
-    1691, 1734, 1762, 1782, 1814, 1847, 1865, 1877,
-    1896, 1922, 1940, 1954, 1973, 1997, 2022, 2036,
-    2039, 2043, 2052, 2057, 2055, 2059, 2061, 2064,
-    2065, 2076, 2094, 2119, 2139, 2155, 2175, 2187,
-    2186, 2175, 2156, 2131, 2096, 2051, 1997, 1944,
-    1877, 1783, 1686, 1620, 1554, 1449, 1335, 1249,
-    1153, 1045, 978, 932, 869, 820, 804, 793,
-    790, 821, 881, 942, 1009, 1099, 1189, 1267,
-    1349, 1437, 1508, 1563, 1617, 1660, 1676, 1686,
-    1705, 1723, 1722, 1712, 1703, 1688, 1666, 1651,
-    1646, 1636, 1634, 1650, 1663, 1682, 1726, 1772,
-    1822, 1888, 1957, 2014, 2065, 2121, 2172, 2209,
-    2237, 2255, 2252, 2240, 2225, 2204, 2169, 2139,
-    2119, 2081, 2047, 2036, 2029, 2002, 1986, 2001,
-    2023, 2039, 2065, 2114, 2155, 2197, 2257, 2326,
-    2387, 2446, 2502, 2539, 2590, 2671, 2725, 2742,
-    2786, 2852, 2893, 2909, 2931, 2955, 2967, 2974,
-    2990, 3006, 3012, 3030, 3055, 3078, 3110, 3146,
-    3172, 3187, 3175, 3122, 3050, 2998, 2952, 2876,
-    2779, 2702, 2649, 2594, 2518, 2453, 2423, 2375,
-    2289, 2205, 2122, 2041, 1980, 1915, 1848, 1793,
-    1727, 1661, 1602, 1558, 1544, 1537, 1531, 1556,
-    1597, 1638, 1679, 1727, 1763, 1782, 1783, 1771,
-    1775, 1793, 1826, 1875, 1938, 2019, 2096, 2144,
-    2174, 2207, 2230, 2232, 2226, 2229, 2232, 2235,
-    2238, 2249, 2267, 2275, 2267, 2261, 2266, 2270,
-    2278, 2291, 2310, 2326, 2314, 2272, 2217, 2158,
-    2089, 2015, 1952, 1906, 1868, 1820, 1771, 1747,
-    1731, 1670, 1566, 1474, 1385, 1287, 1202, 1122,
-    1035, 976, 956, 932, 901, 904, 930, 952,
-    991, 1055, 1130, 1195, 1253, 1314, 1372, 1419,
-    1463, 1505, 1539, 1569, 1616, 1675, 1730, 1765,
-    1786, 1802, 1815, 1814, 1802, 1780, 1758, 1764,
-    1780, 1789, 1814, 1862, 1914, 1967, 2019, 2068,
-    2111, 2153, 2194, 2211, 2219, 2230, 2220, 2196,
-    2171, 2142, 2109, 2083, 2068, 2048, 2031, 2030,
-    2039, 2044, 2040, 2048, 2071, 2099, 2123, 2159,
-    2208, 2266, 2333, 2404, 2458, 2498, 2553, 2617,
-    2651, 2660, 2681, 2704, 2706, 2691, 2674, 2667,
-    2662, 2652, 2653, 2663, 2680, 2704, 2738, 2777,
-    2833, 2895, 2936, 2970, 3020, 3065, 3101, 3148,
-    3207, 3260, 3300, 3332, 3338, 3311, 3244, 3157,
-    3055, 2947, 2826, 2691, 2553, 2429, 2328, 2240,
-    2156, 2069, 1987, 1916, 1854, 1798, 1759, 1717,
-    1672, 1653, 1667, 1676, 1669, 1679, 1708, 1740,
-    1781, 1833, 1874, 1906, 1930, 1941, 1929, 1913,
-    1895, 1866, 1836, 1814, 1812, 1829, 1856, 1895,
-    1946, 1994, 2042, 2084, 2128, 2170, 2203, 2235,
-    2266, 2292, 2311, 2320, 2325, 2338, 2348, 2342,
-    2331, 2325, 2320, 2301, 2262, 2216, 2163, 2097,
-    2025, 1953, 1890, 1838, 1796, 1768, 1755, 1738,
-    1678, 1583, 1524, 1524, 1492, 1387, 1313, 1302,
-    1264, 1200, 1181, 1187, 1175, 1151, 1115, 1105,
-    1128, 1150, 1177, 1219, 1268, 1316, 1358, 1394,
-    1436, 1476, 1523, 1577, 1629, 1681, 1720, 1745,
-    1779, 1820, 1839, 1841, 1836, 1835, 1843, 1849,
-    1852, 1870, 1909, 1941, 1944, 1944, 1968, 1999,
-    2008, 2017, 2038, 2055, 2055, 2050, 2057, 2070,
-    2073, 2060, 2049, 2050, 2058, 2059, 2054, 2064,
-    2087, 2092, 2088, 2084, 2103, 2136, 2159, 2183,
-    2222, 2267, 2310, 2349, 2391, 2434, 2465, 2475,
-    2489, 2517, 2542, 2564, 2576, 2602, 2640, 2683,
-    2727, 2763, 2792, 2822, 2893, 2982, 3023, 3033,
-    3073, 3122, 3156, 3207, 3257, 3268, 3288, 3328,
-    3359, 3391, 3399, 3342, 3235, 3125, 3034, 2927,
-    2795, 2671, 2547, 2464, 2432, 2398, 2365, 2327,
-    2260, 2199, 2151, 2078, 2010, 1966, 1924, 1892,
-    1861, 1812, 1760, 1710, 1682, 1660, 1624, 1618,
-    1643, 1664, 1687, 1723, 1746, 1744, 1728, 1693,
-    1662, 1659, 1673, 1709, 1777, 1874, 1986, 2078,
-    2131, 2162, 2187, 2193, 2185, 2180, 2179, 2174,
-    2171, 2187, 2212, 2224, 2217, 2197, 2177, 2170,
-    2173, 2182, 2197, 2213, 2218, 2200, 2168, 2126,
-    2074, 2021, 1980, 1956, 1951, 1960, 1976, 1994,
-    1990, 1953, 1870, 1770, 1693, 1623, 1514, 1393,
-    1338, 1331, 1292, 1241, 1226, 1199, 1124, 1047,
-    1013, 1026, 1043, 1046, 1072, 1135, 1198, 1244,
-    1300, 1372, 1438, 1487, 1540, 1604, 1674, 1726,
-    1742, 1749, 1765, 1768, 1732, 1679, 1657, 1657,
-    1664, 1678, 1705, 1744, 1778, 1791, 1795, 1820,
-    1856, 1881, 1907, 1952, 1996, 2032, 2074, 2104,
-    2119, 2124, 2110, 2079, 2046, 2023, 2009, 1982,
-    1947, 1923, 1905, 1880, 1860, 1867, 1885, 1908,
-    1937, 1991, 2068, 2132, 2179, 2234, 2293, 2334,
-    2370, 2401, 2419, 2438, 2479, 2513, 2518, 2531,
-    2549, 2544, 2525, 2524, 2537, 2549, 2556, 2573,
-    2607, 2654, 2705, 2766, 2848, 2924, 2965, 3009,
-    3095, 3191, 3244, 3263, 3285, 3322, 3360, 3369,
-    3358, 3366, 3377, 3362, 3309, 3223, 3100, 2971,
-    2853, 2705, 2544, 2429, 2334, 2258, 2244, 2247,
-    2249, 2259, 2246, 2209, 2162, 2093, 2036, 1997,
-    1927, 1841, 1792, 1772, 1753, 1701, 1644, 1621,
-    1614, 1607, 1606, 1603, 1600, 1609, 1609, 1587,
-    1573, 1569, 1570, 1597, 1651, 1730, 1838, 1959,
-    2065, 2153, 2212, 2247, 2253, 2234, 2202, 2168,
-    2139, 2119, 2113, 2118, 2127, 2127, 2128, 2135,
-    2136, 2143, 2153, 2172, 2190, 2190, 2179, 2166,
-    2147, 2123, 2095, 2068, 2062, 2066, 2078, 2096,
-    2113, 2110, 2076, 2028, 1963, 1880, 1789, 1692,
-    1585, 1439, 1286, 1214, 1227, 1225, 1179, 1161,
-    1195, 1237, 1278, 1329, 1359, 1366, 1356, 1329,
-    1322, 1337, 1354, 1373, 1427, 1494, 1557, 1610,
-    1653, 1676, 1670, 1652, 1633, 1618, 1592, 1550,
-    1524, 1539, 1592, 1648, 1708, 1783, 1849, 1916,
-    1987, 2036, 2066, 2101, 2110, 2080, 2044, 2026,
-    2007, 1983, 1963, 1957, 1956, 1956, 1944, 1929,
-    1928, 1926, 1899, 1866, 1847, 1847, 1861, 1889,
-    1921, 1962, 2034, 2115, 2179, 2234, 2301, 2358,
-    2384, 2393, 2392, 2381, 2362, 2343, 2330, 2339,
-    2362, 2383, 2408, 2442, 2475, 2524, 2594, 2642,
-    2654, 2663, 2705, 2764, 2806, 2840, 2899, 2984,
-    3073, 3150, 3210, 3274, 3351, 3398, 3413, 3414,
-    3426, 3448, 3427, 3394, 3394, 3422, 3435, 3389,
-    3293, 3187, 3082, 2982, 2890, 2789, 2677, 2584,
-    2551, 2552, 2545, 2534, 2520, 2465, 2386, 2306,
-    2218, 2135, 2067, 1985, 1891, 1796, 1711, 1655,
-    1602, 1532, 1459, 1434, 1451, 1476, 1514, 1567,
-    1615, 1641, 1652, 1656, 1658, 1666, 1684, 1714,
-    1771, 1860, 1952, 2039, 2107, 2133, 2122, 2096,
-    2060, 2029, 2009, 1992, 1984, 2002, 2044, 2093,
-    2131, 2166, 2195, 2222, 2254, 2291, 2333, 2381,
-    2411, 2416, 2396, 2362, 2316, 2259, 2200, 2145,
-    2107, 2091, 2088, 2089, 2084, 2057, 2020, 1972,
-    1921, 1875, 1833, 1805, 1787, 1760, 1725, 1711,
-    1724, 1723, 1665, 1582, 1539, 1528, 1519, 1470,
-    1395, 1321, 1257, 1221, 1211, 1204, 1206, 1241,
-    1307, 1386, 1481, 1564, 1612, 1640, 1645, 1639,
-    1637, 1644, 1652, 1669, 1688, 1710, 1743, 1777,
-    1792, 1785, 1773, 1763, 1752, 1748, 1750, 1751,
-    1761, 1784, 1804, 1820, 1848, 1890, 1937, 1973,
-    1999, 2027, 2053, 2064, 2054, 2025, 1990, 1950,
-    1912, 1883, 1867, 1856, 1844, 1858, 1887, 1904,
-    1929, 1966, 1997, 2011, 2021, 2044, 2090, 2135,
-    2170, 2194, 2221, 2265, 2308, 2339, 2360, 2365,
-    2374, 2383, 2393, 2411, 2432, 2433, 2417, 2442,
-    2509, 2565, 2589, 2630, 2706, 2777, 2825, 2879,
-    2951, 3017, 3067, 3106, 3145, 3206, 3269, 3305,
-    3331, 3370, 3399, 3399, 3409, 3429, 3426, 3423,
-    3438, 3448, 3428, 3388, 3318, 3224, 3143, 3055,
-    2938, 2822, 2753, 2717, 2689, 2666, 2655, 2661,
-    2657, 2613, 2524, 2431, 2341, 2221, 2102, 2012,
-    1921, 1819, 1714, 1615, 1549, 1530, 1516, 1486,
-    1483, 1518, 1560, 1594, 1627, 1650, 1647, 1627,
-    1606, 1601, 1617, 1644, 1689, 1759, 1844, 1919,
-    1969, 1991, 1983, 1960, 1934, 1899, 1879, 1887,
-    1909, 1937, 1996, 2073, 2145, 2204, 2262, 2319,
-    2371, 2416, 2452, 2479, 2500, 2503, 2474, 2425,
-    2365, 2308, 2251, 2209, 2191, 2197, 2208, 2216,
-    2229, 2240, 2232, 2203, 2160, 2115, 2081, 2062,
-    2057, 2063, 2082, 2102, 2109, 2102, 2086, 2055,
-    2006, 1946, 1855, 1713, 1552, 1432, 1352, 1247,
-    1135, 1105, 1156, 1213, 1273, 1373, 1474, 1529,
-    1555, 1553, 1526, 1488, 1435, 1396, 1396, 1421,
-    1447, 1484, 1523, 1547, 1561, 1565, 1553, 1534,
-    1524, 1516, 1511, 1525, 1554, 1587, 1630, 1687,
-    1742, 1811, 1896, 1976, 2036, 2089, 2132, 2128,
-    2082, 2033, 1984, 1932, 1874, 1837, 1834, 1856,
-    1881, 1912, 1958, 2005, 2033, 2043, 2056, 2062,
-    2060, 2052, 2051, 2059, 2071, 2088, 2103, 2109,
-    2114, 2124, 2127, 2114, 2101, 2088, 2075, 2049,
-    2015, 1989, 1971, 1978, 2007, 2040, 2083, 2137,
-    2211, 2308, 2398, 2456, 2487, 2520, 2553, 2590,
-    2637, 2610, 2541, 2576, 2666, 2721, 2798, 2921,
-    3018, 3073, 3113, 3155, 3193, 3195, 3196, 3234,
-    3295, 3344, 3386, 3442, 3477, 3483, 3516, 3567,
-    3562, 3505, 3425, 3332, 3226, 3113, 3003, 2915,
-    2846, 2762, 2686, 2652, 2632, 2626, 2646, 2648,
-    2600, 2514, 2408, 2265, 2114, 1969, 1837, 1697,
-    1544, 1430, 1392, 1388, 1372, 1366, 1399, 1443,
-    1472, 1489, 1481, 1450, 1434, 1427, 1410, 1403,
-    1418, 1449, 1494, 1555, 1620, 1690, 1760, 1808,
-    1831, 1839, 1830, 1823, 1830, 1841, 1857, 1901,
-    1974, 2050, 2131, 2226, 2331, 2429, 2521, 2589,
-    2625, 2644, 2641, 2605, 2553, 2498, 2446, 2401,
-    2368, 2349, 2345, 2357, 2375, 2392, 2406, 2406,
-    2386, 2341, 2282, 2228, 2182, 2144, 2109, 2078,
-    2060, 2044, 2018, 1989, 1961, 1934, 1897, 1845,
-    1788, 1732, 1671, 1601, 1516, 1439, 1390, 1356,
-    1315, 1272, 1251, 1253, 1265, 1276, 1291, 1306,
-    1319, 1320, 1325, 1343, 1362, 1369, 1373, 1381,
-    1393, 1409, 1439, 1474, 1514, 1554, 1591, 1634,
-    1669, 1688, 1684, 1682, 1694, 1712, 1736, 1770,
-    1812, 1866, 1925, 1980, 2018, 2044, 2056, 2048,
-    2034, 2023, 2012, 1992, 1969, 1961, 1960, 1964,
-    1961, 1956, 1950, 1952, 1952, 1947, 1946, 1939,
-    1924, 1908, 1891, 1874, 1865, 1863, 1854, 1854,
-    1864, 1870, 1863, 1855, 1852, 1846, 1824, 1794,
-    1780, 1781, 1785, 1791, 1802, 1816, 1839, 1868,
-    1903, 1943, 1974, 1996, 2020, 2039, 2066, 2101,
-    2126, 2145, 2173, 2219, 2276, 2326, 2383, 2457,
-    2529, 2596, 2678, 2775, 2858, 2928, 3002, 3073,
-    3156, 3217, 3222, 3232, 3276, 3292, 3278, 3276,
-    3286, 3298, 3326, 3372, 3409, 3426, 3448, 3477,
-    3507, 3517, 3507, 3499, 3475, 3430, 3384, 3331,
-    3252, 3169, 3102, 3032, 2937, 2838, 2773, 2714,
-    2632, 2546, 2452, 2363, 2276, 2179, 2062, 1935,
-    1831, 1751, 1652, 1538, 1472, 1461, 1462, 1453,
-    1460, 1505, 1543, 1560, 1562, 1537, 1486, 1430,
-    1380, 1344, 1329, 1335, 1370, 1432, 1511, 1599,
-    1677, 1734, 1790, 1847, 1884, 1926, 1987, 2058,
-    2126, 2195, 2258, 2320, 2373, 2411, 2448, 2487,
-    2526, 2572, 2614, 2641, 2658, 2661, 2637, 2591,
-    2545, 2506, 2478, 2464, 2477, 2514, 2556, 2588,
-    2604, 2602, 2572, 2518, 2446, 2365, 2292, 2233,
-    2181, 2132, 2089, 2049, 2002, 1947, 1891, 1842,
-    1802, 1771, 1752, 1737, 1724, 1714, 1703, 1677,
-    1641, 1606, 1585, 1577, 1578, 1594, 1610, 1607,
-    1584, 1557, 1530, 1489, 1431, 1367, 1306, 1285,
-    1323, 1372, 1373, 1384, 1451, 1526, 1581, 1625,
-    1663, 1702, 1742, 1767, 1791, 1811, 1811, 1794,
-    1771, 1771, 1786, 1799, 1812, 1831, 1854, 1872,
-    1884, 1894, 1914, 1926, 1917, 1921, 1956, 1998,
-    2021, 2032, 2043, 2061, 2074, 2051, 2014, 1986,
-    1959, 1926, 1888, 1848, 1817, 1794, 1764, 1740,
-    1734, 1741, 1755, 1765, 1781, 1802, 1810, 1809,
-    1808, 1798, 1776, 1754, 1729, 1708, 1694, 1692,
-    1680, 1667, 1657, 1655, 1647, 1641, 1651, 1658,
-    1673, 1705, 1741, 1766, 1792, 1835, 1890, 1935,
-    1957, 1977, 2017, 2055, 2080, 2109, 2140, 2164,
-    2188, 2224, 2263, 2305, 2344, 2396, 2466, 2534,
-    2617, 2713, 2807, 2896, 2988, 3086, 3178, 3240,
-    3270, 3278, 3263, 3229, 3190, 3154, 3122, 3091,
-    3079, 3114, 3189, 3260, 3320, 3390, 3475, 3555,
-    3606, 3610, 3599, 3605, 3578, 3521, 3455, 3383,
-    3306, 3208, 3112, 3042, 2970, 2890, 2812, 2744,
-    2699, 2661, 2598, 2528, 2484, 2433, 2374, 2329,
-    2285, 2244, 2187, 2104, 2015, 1908, 1774, 1629,
-    1506, 1424, 1369, 1336, 1349, 1409, 1490, 1561,
-    1624, 1652, 1664, 1676, 1661, 1644, 1666, 1708,
-    1753, 1807, 1861, 1918, 1961, 1974, 1972, 1982,
-    2004, 2041, 2097, 2170, 2258, 2338, 2399, 2453,
-    2491, 2511, 2525, 2541, 2584, 2645, 2696, 2737,
-    2767, 2767, 2730, 2658, 2561, 2472, 2398, 2340,
-    2309, 2314, 2344, 2376, 2398, 2402, 2387, 2353,
-    2298, 2240, 2195, 2154, 2115, 2075, 2035, 1984,
-    1919, 1833, 1744, 1672, 1617, 1581, 1569, 1581,
-    1606, 1630, 1642, 1640, 1628, 1607, 1581, 1567,
-    1578, 1602, 1643, 1691, 1733, 1760, 1766, 1759,
-    1733, 1704, 1681, 1673, 1688, 1724, 1778, 1837,
-    1898, 1950, 1994, 2018, 2006, 1947, 1860, 1802,
-    1808, 1852, 1877, 1871, 1876, 1905, 1928, 1927,
-    1913, 1887, 1844, 1813, 1817, 1858, 1912, 1934,
-    1926, 1913, 1900, 1874, 1832, 1788, 1751, 1724,
-    1708, 1705, 1715, 1720, 1702, 1674, 1656, 1661,
-    1676, 1684, 1686, 1701, 1723, 1732, 1718, 1693,
-    1667, 1641, 1611, 1590, 1586, 1595, 1614, 1630,
-    1644, 1658, 1660, 1638, 1616, 1619, 1628, 1629,
-    1638, 1662, 1703, 1733, 1745, 1760, 1780, 1787,
-    1779, 1769, 1774, 1787, 1798, 1794, 1791, 1788,
-    1786, 1790, 1795, 1810, 1831, 1853, 1884, 1930,
-    1974, 2000, 2014, 2016, 2009, 1999, 1991, 1991,
-    1995, 2005, 2030, 2059, 2084, 2107, 2125, 2147,
-    2175, 2207, 2246, 2290, 2337, 2392, 2451, 2507,
-    2555, 2598, 2638, 2667, 2690, 2719, 2744, 2751,
-    2748, 2745, 2745, 2760, 2783, 2827, 2871, 2902,
-    2943, 3006, 3067, 3102, 3129, 3176, 3221, 3233,
-    3258, 3285, 3304, 3307, 3285, 3257, 3210, 3162,
-    3135, 3116, 3096, 3072, 3061, 3066, 3069, 3044,
-    3013, 2994, 2960, 2933, 2904, 2868, 2849, 2832,
-    2808, 2778, 2711, 2622, 2529, 2419, 2281, 2128,
-    1981, 1840, 1737, 1683, 1663, 1682, 1732, 1810,
-    1909, 2005, 2075, 2105, 2088, 2029, 1944, 1831,
-    1726, 1639, 1568, 1521, 1501, 1511, 1545, 1591,
-    1631, 1669, 1715, 1770, 1836, 1901, 1958, 2015,
-    2062, 2089, 2103, 2105, 2089, 2074, 2069, 2074,
-    2094, 2116, 2134, 2150, 2150, 2128, 2089, 2045,
-    2016, 2010, 2029, 2077, 2155, 2245, 2333, 2399,
-    2435, 2435, 2393, 2327, 2242, 2154, 2072, 1999,
-    1945, 1904, 1870, 1845, 1828, 1820, 1829, 1846,
-    1880, 1921, 1966, 2007, 2030, 2033, 2009, 1959,
-    1893, 1818, 1749, 1706, 1681, 1674, 1689, 1707,
-    1726, 1736, 1732, 1724, 1711, 1701, 1702, 1719,
-    1750, 1792, 1844, 1893, 1928, 1950, 1957, 1952,
-    1938, 1923, 1907, 1889, 1877, 1865, 1862, 1864,
-    1867, 1866, 1850, 1822, 1803, 1810, 1830, 1855,
-    1887, 1930, 1989, 2050, 2084, 2070, 2027, 1966,
-    1895, 1822, 1755, 1707, 1691, 1694, 1722, 1770,
-    1814, 1842, 1859, 1856, 1841, 1830, 1820, 1814,
-    1803, 1791, 1782, 1769, 1750, 1730, 1705, 1676,
-    1653, 1648, 1652, 1649, 1649, 1652, 1651, 1647,
-    1635, 1625, 1628, 1632, 1641, 1667, 1695, 1713,
-    1724, 1715, 1695, 1674, 1649, 1621, 1594, 1576,
-    1580, 1597, 1617, 1645, 1685, 1719, 1738, 1755,
-    1776, 1797, 1812, 1810, 1801, 1798, 1806, 1810,
-    1805, 1790, 1780, 1790, 1806, 1817, 1832, 1843,
-    1868, 1901, 1919, 1932, 1942, 1950, 1961, 1968,
-    1973, 1983, 1991, 1993, 1994, 1993, 1983, 1976,
-    1976, 1979, 1987, 2000, 2010, 2033, 2072, 2108,
-    2148, 2196, 2244, 2299, 2353, 2397, 2440, 2468,
-    2478, 2473, 2451, 2426, 2426, 2449, 2477, 2503,
-    2537, 2609, 2715, 2815, 2883, 2932, 2965, 2970,
-    2953, 2930, 2929, 2967, 3017, 3056, 3089, 3121,
-    3185, 3277, 3343, 3378, 3378, 3376, 3385, 3349,
-    3291, 3264, 3246, 3209, 3174, 3163, 3193, 3258,
-    3315, 3361, 3385, 3377, 3372, 3372, 3338, 3251,
-    3163, 3068, 2932, 2807, 2675, 2534, 2433, 2362,
-    2322, 2314, 2331, 2364, 2376, 2350, 2292, 2214,
-    2120, 2012, 1907, 1840, 1802, 1771, 1764, 1746,
-    1706, 1661, 1587, 1504, 1444, 1419, 1420, 1455,
-    1516, 1579, 1640, 1699, 1727, 1725, 1703, 1664,
-    1628, 1624, 1655, 1699, 1741, 1783, 1822, 1836,
-    1818, 1792, 1780, 1799, 1857, 1940, 2039, 2144,
-    2251, 2331, 2360, 2349, 2315, 2264, 2199, 2150,
-    2137, 2145, 2177, 2222, 2254, 2275, 2288, 2285,
-    2271, 2257, 2249, 2257, 2272, 2281, 2286, 2269,
-    2227, 2166, 2100, 2037, 1978, 1938, 1924, 1930,
-    1954, 1988, 2010, 2017, 2007, 1985, 1947, 1910,
-    1885, 1872, 1877, 1884, 1894, 1899, 1897, 1885,
-    1866, 1840, 1814, 1807, 1810, 1823, 1842, 1870,
-    1901, 1926, 1941, 1952, 1960, 1968, 1977, 1987,
-    2003, 2022, 2040, 2058, 2069, 2068, 2065, 2062,
-    2061, 2068, 2082, 2107, 2141, 2176, 2213, 2243,
-    2261, 2262, 2234, 2179, 2126, 2097, 2086, 2073,
-    2058, 2058, 2082, 2107, 2107, 2088, 2059, 2022,
-    1981, 1951, 1924, 1896, 1875, 1861, 1863, 1873,
-    1875, 1868, 1861, 1852, 1834, 1817, 1803, 1788,
-    1766, 1729, 1687, 1655, 1637, 1615, 1587, 1579,
-    1605, 1641, 1678, 1710, 1739, 1767, 1773, 1767,
-    1752, 1738, 1706, 1677, 1654, 1649, 1664, 1682,
-    1694, 1707, 1738, 1773, 1797, 1815, 1836, 1858,
-    1880, 1882, 1877, 1879, 1877, 1869, 1852, 1843,
-    1840, 1840, 1844, 1852, 1862, 1872, 1883, 1890,
-    1894, 1892, 1896, 1906, 1916, 1923, 1931, 1937,
-    1941, 1948, 1950, 1941, 1932, 1931, 1928, 1921,
-    1916, 1910, 1905, 1913, 1931, 1961, 1990, 2008,
-    2024, 2042, 2056, 2063, 2043, 2011, 1982, 1956,
-    1936, 1927, 1932, 1950, 1979, 2012, 2046, 2082,
-    2113, 2128, 2137, 2142, 2148, 2161, 2180, 2196,
-    2213, 2248, 2299, 2350, 2405, 2460, 2499, 2530,
-    2546, 2550, 2556, 2556, 2547, 2548, 2577, 2640,
-    2720, 2786, 2846, 2921, 3004, 3063, 3069, 3056,
-    3055, 3065, 3067, 3060, 3049, 3054, 3077, 3103,
-    3126, 3137, 3145, 3161, 3187, 3206, 3211, 3231,
-    3246, 3242, 3228, 3203, 3182, 3176, 3157, 3118,
-    3075, 3031, 3006, 2990, 2952, 2903, 2849, 2812,
-    2790, 2763, 2745, 2712, 2653, 2579, 2502, 2404,
-    2267, 2098, 1929, 1827, 1771, 1732, 1734, 1804,
-    1919, 2028, 2098, 2107, 2069, 1992, 1851, 1667,
-    1499, 1371, 1291, 1254, 1250, 1289, 1363, 1435,
-    1495, 1544, 1583, 1627, 1676, 1733, 1789, 1827,
-    1845, 1849, 1833, 1798, 1746, 1692, 1667, 1686,
-    1750, 1843, 1955, 2066, 2162, 2232, 2266, 2261,
-    2230, 2198, 2180, 2188, 2219, 2271, 2335, 2398,
-    2437, 2442, 2422, 2386, 2341, 2290, 2242, 2209,
-    2207, 2215, 2226, 2232, 2230, 2232, 2228, 2219,
-    2214, 2219, 2226, 2229, 2216, 2188, 2141, 2071,
-    1991, 1905, 1834, 1782, 1761, 1775, 1819, 1878,
-    1938, 1990, 2025, 2038, 2028, 2001, 1958, 1917,
-    1876, 1841, 1811, 1792, 1783, 1781, 1782, 1793,
-    1813, 1841, 1874, 1912, 1946, 1977, 1996, 2002,
-    2000, 1987, 1971, 1955, 1947, 1952, 1966, 1985,
-    2007, 2032, 2052, 2065, 2076, 2081, 2080, 2083,
-    2090, 2103, 2120, 2139, 2159, 2181, 2201, 2211,
-    2215, 2214, 2204, 2192, 2175, 2156, 2135, 2117,
-    2102, 2086, 2077, 2075, 2081, 2084, 2078, 2081,
-    2093, 2099, 2076, 2020, 1937, 1824, 1714, 1648,
-    1607, 1576, 1560, 1579, 1647, 1740, 1800, 1814,
-    1801, 1770, 1725, 1675, 1627, 1576, 1531, 1481,
-    1439, 1424, 1430, 1437, 1449, 1470, 1511, 1561,
-    1622, 1687, 1744, 1780, 1781, 1758, 1726, 1704,
-    1679, 1638, 1611, 1619, 1643, 1675, 1713, 1751,
-    1786, 1810, 1824, 1833, 1846, 1858, 1865, 1864,
-    1862, 1858, 1856, 1856, 1859, 1858, 1851, 1842,
-    1840, 1843, 1843, 1842, 1842, 1845, 1838, 1830,
-    1827, 1836, 1849, 1863, 1877, 1888, 1902, 1916,
-    1915, 1893, 1865, 1837, 1810, 1797, 1799, 1806,
-    1817, 1834, 1864, 1897, 1929, 1960, 1981, 2007,
-    2031, 2035, 2034, 2028, 2019, 2006, 1982, 1964,
-    1965, 1983, 2006, 2033, 2067, 2104, 2144, 2179,
-    2199, 2203, 2195, 2192, 2185, 2176, 2171, 2173,
-    2194, 2222, 2244, 2259, 2284, 2315, 2342, 2376,
-    2405, 2415, 2426, 2436, 2443, 2460, 2474, 2481,
-    2488, 2505, 2544, 2598, 2652, 2706, 2760, 2798,
-    2814, 2836, 2865, 2865, 2833, 2807, 2795, 2803,
-    2827, 2847, 2877, 2928, 2958, 2979, 3006, 3042,
-    3081, 3090, 3065, 3050, 3061, 3071, 3063, 3036,
-    3006, 2987, 2962, 2932, 2920, 2919, 2895, 2866,
-    2855, 2855, 2853, 2828, 2756, 2623, 2409, 2184,
-    2063, 1996, 1882, 1807, 1871, 2060, 2301, 2485,
-    2555, 2552, 2477, 2278, 1995, 1698, 1429, 1241,
-    1139, 1114, 1204, 1368, 1522, 1640, 1719, 1756,
-    1761, 1742, 1745, 1784, 1820, 1830, 1820, 1789,
-    1722, 1606, 1446, 1308, 1235, 1253, 1354, 1533,
-    1763, 1996, 2199, 2322, 2338, 2264, 2138, 2010,
-    1902, 1827, 1805, 1859, 1970, 2091, 2185, 2220,
-    2213, 2189, 2150, 2102, 2083, 2113, 2184, 2253,
-    2304, 2335, 2342, 2316, 2258, 2188, 2128, 2099,
-    2117, 2163, 2209, 2240, 2237, 2199, 2137, 2062,
-    1982, 1911, 1879, 1900, 1971, 2061, 2149, 2224,
-    2266, 2259, 2213, 2139, 2046, 1958, 1890, 1844,
-    1823, 1821, 1826, 1839, 1859, 1879, 1897, 1923,
-    1966, 2014, 2061, 2091, 2106, 2103, 2069, 2004,
-    1927, 1856, 1808, 1787, 1785, 1809, 1867, 1943,
-    2022, 2090, 2145, 2185, 2208, 2215, 2211, 2201,
-    2186, 2172, 2156, 2140, 2126, 2120, 2121, 2132,
-    2154, 2184, 2218, 2253, 2282, 2309, 2320, 2319,
-    2308, 2289, 2271, 2258, 2243, 2230, 2231, 2233,
-    2225, 2217, 2211, 2196, 2178, 2162, 2141, 2114,
-    2090, 2078, 2077, 2063, 2049, 2059, 2070, 2077,
-    2073, 2050, 2013, 1985, 1942, 1879, 1823, 1787,
-    1762, 1756, 1764, 1774, 1792, 1795, 1793, 1805,
-    1809, 1801, 1789, 1770, 1752, 1739, 1712, 1678,
-    1656, 1643, 1633, 1629, 1646, 1681, 1722, 1753,
-    1776, 1804, 1824, 1830, 1822, 1805, 1784, 1763,
-    1740, 1727, 1731, 1745, 1762, 1776, 1805, 1843,
-    1870, 1883, 1901, 1915, 1917, 1915, 1908, 1901,
-    1899, 1893, 1873, 1862, 1859, 1864, 1870, 1877,
-    1892, 1910, 1927, 1939, 1945, 1944, 1940, 1938,
-    1932, 1922, 1911, 1904, 1908, 1915, 1919, 1923,
-    1931, 1939, 1944, 1947, 1953, 1964, 1973, 1977,
-    1986, 2006, 2027, 2033, 2031, 2040, 2061, 2078,
-    2085, 2087, 2099, 2114, 2124, 2130, 2140, 2153,
-    2165, 2178, 2196, 2223, 2250, 2268, 2279, 2292,
-    2310, 2333, 2344, 2344, 2344, 2346, 2347, 2352,
-    2350, 2345, 2346, 2361, 2383, 2408, 2426, 2436,
-    2455, 2474, 2476, 2473, 2484, 2485, 2479, 2479,
-    2477, 2470, 2467, 2461, 2456, 2464, 2470, 2482,
-    2504, 2522, 2537, 2556, 2561, 2556, 2547, 2534,
-    2522, 2509, 2485, 2473, 2487, 2502, 2512, 2513,
-    2527, 2553, 2558, 2535, 2528, 2544, 2556, 2542,
-    2518, 2513, 2521, 2527, 2520, 2500, 2497, 2511,
-    2517, 2501, 2467, 2427, 2396, 2367, 2310, 2253,
-    2226, 2226, 2250, 2280, 2302, 2331, 2358, 2366,
-    2357, 2320, 2263, 2197, 2131, 2069, 2016, 1979,
-    1949, 1933, 1934, 1943, 1951, 1964, 1982, 2007,
-    2036, 2056, 2066, 2068, 2057, 2030, 1980, 1911,
-    1844, 1795, 1766, 1751, 1754, 1781, 1832, 1887,
-    1936, 1974, 2007, 2027, 2032, 2025, 2006, 1989,
-    1976, 1963, 1948, 1934, 1918, 1915, 1914, 1919,
-    1931, 1953, 1990, 2033, 2069, 2096, 2117, 2127,
-    2125, 2111, 2084, 2056, 2040, 2029, 2023, 2025,
-    2032, 2038, 2046, 2057, 2067, 2073, 2077, 2083,
-    2095, 2107, 2113, 2121, 2123, 2122, 2121, 2117,
-    2109, 2102, 2101, 2100, 2102, 2104, 2103, 2104,
-    2104, 2101, 2096, 2093, 2091, 2093, 2100, 2108,
-    2121, 2134, 2141, 2137, 2130, 2118, 2103, 2085,
-    2068, 2055, 2047, 2042, 2046, 2052, 2059, 2069,
-    2080, 2094, 2103, 2113, 2120, 2120, 2119, 2110,
-    2098, 2084, 2072, 2058, 2047, 2040, 2039, 2044,
-    2064, 2075, 2086, 2092, 2089, 2095, 2104, 2112,
-    2113, 2104, 2082, 2056, 2033, 2026, 2027, 2025,
-    2025, 2023, 2018, 2018, 2010, 1989, 1975, 1966,
-    1946, 1919, 1910, 1920, 1932, 1939, 1939, 1939,
-    1943, 1925, 1878, 1815, 1771, 1740, 1694, 1656,
-    1659, 1689, 1722, 1751, 1766, 1779, 1792, 1791,
-    1778, 1756, 1730, 1697, 1667, 1642, 1629, 1615,
-    1589, 1580, 1583, 1593, 1621, 1656, 1696, 1743,
-    1775, 1796, 1810, 1810, 1797, 1762, 1719, 1681,
-    1649, 1632, 1627, 1640, 1670, 1702, 1741, 1785,
-    1821, 1848, 1865, 1875, 1882, 1877, 1856, 1835,
-    1815, 1796, 1775, 1749, 1738, 1742, 1756, 1774,
-    1799, 1834, 1869, 1896, 1916, 1931, 1929, 1918,
-    1905, 1888, 1869, 1852, 1842, 1849, 1860, 1872,
-    1889, 1910, 1933, 1954, 1974, 1990, 2007, 2021,
-    2029, 2028, 2034, 2041, 2042, 2045, 2058, 2072,
-    2082, 2092, 2113, 2137, 2156, 2171, 2183, 2201,
-    2225, 2242, 2248, 2260, 2279, 2300, 2322, 2337,
-    2350, 2369, 2385, 2396, 2395, 2397, 2412, 2430,
-    2446, 2459, 2471, 2493, 2516, 2539, 2555, 2570,
-    2589, 2606, 2626, 2650, 2658, 2659, 2672, 2697,
-    2709, 2714, 2721, 2737, 2762, 2772, 2768, 2775,
-    2799, 2820, 2818, 2803, 2790, 2789, 2780, 2753,
-    2717, 2681, 2647, 2577, 2477, 2416, 2401, 2371,
-    2325, 2324, 2389, 2484, 2552, 2565, 2540, 2494,
-    2418, 2288, 2121, 1974, 1863, 1782, 1728, 1721,
-    1757, 1808, 1862, 1900, 1913, 1916, 1922, 1923,
-    1922, 1918, 1907, 1895, 1866, 1812, 1734, 1642,
-    1550, 1471, 1429, 1439, 1501, 1606, 1729, 1852,
-    1956, 2028, 2050, 2026, 1979, 1920, 1854, 1789,
-    1754, 1754, 1777, 1803, 1819, 1830, 1846, 1863,
-    1880, 1905, 1951, 2014, 2077, 2127, 2174, 2199,
-    2191, 2146, 2082, 2012, 1948, 1913, 1908, 1928,
-    1967, 2013, 2062, 2107, 2139, 2153, 2149, 2143,
-    2144, 2152, 2162, 2179, 2203, 2220, 2218, 2197,
-    2166, 2128, 2089, 2058, 2039, 2040, 2058, 2085,
-    2114, 2144, 2169, 2176, 2163, 2141, 2124, 2113,
-    2099, 2085, 2077, 2071, 2061, 2044, 2021, 1995,
-    1970, 1945, 1927, 1926, 1942, 1970, 2004, 2038,
-    2065, 2087, 2093, 2090, 2081, 2063, 2039, 2018,
-    2001, 1994, 1993, 1996, 2001, 2009, 2017, 2026,
-    2039, 2057, 2080, 2107, 2130, 2151, 2170, 2180,
-    2182, 2172, 2152, 2128, 2104, 2084, 2072, 2073,
-    2079, 2094, 2116, 2139, 2159, 2174, 2187, 2194,
-    2195, 2190, 2186, 2185, 2182, 2172, 2161, 2153,
-    2139, 2125, 2116, 2109, 2103, 2101, 2104, 2118,
-    2141, 2162, 2177, 2188, 2189, 2185, 2173, 2158,
-    2145, 2129, 2114, 2099, 2091, 2085, 2077, 2070,
-    2065, 2058, 2056, 2052, 2051, 2062, 2071, 2077,
-    2080, 2079, 2072, 2059, 2042, 2019, 1997, 1981,
-    1970, 1959, 1958, 1961, 1970, 1976, 1976, 1977,
-    1979, 1976, 1974, 1969, 1960, 1954, 1952, 1951,
-    1949, 1948, 1941, 1937, 1933, 1927, 1923, 1923,
-    1927, 1930, 1931, 1932, 1920, 1892, 1884, 1894,
-    1895, 1884, 1871, 1875, 1890, 1907, 1909, 1885,
-    1865, 1864, 1874, 1884, 1883, 1878, 1870, 1865,
-    1858, 1846, 1829, 1823, 1829, 1832, 1834, 1849,
-    1874, 1902, 1917, 1920, 1920, 1929, 1941, 1948,
-    1947, 1938, 1939, 1946, 1950, 1954, 1960, 1971,
-    1979, 1989, 1998, 2011, 2026, 2046, 2066, 2079,
-    2083, 2080, 2083, 2086, 2086, 2076, 2060, 2049,
-    2052, 2060, 2067, 2076, 2081, 2089, 2101, 2114,
-    2124, 2128, 2128, 2129, 2126, 2125, 2127, 2126,
-    2121, 2117, 2109, 2098, 2093, 2096, 2109, 2119,
-    2123, 2130, 2141, 2159, 2170, 2172, 2169, 2168,
-    2175, 2172, 2163, 2165, 2168, 2170, 2170, 2169,
-    2169, 2177, 2185, 2189, 2182, 2186, 2193, 2199,
-    2206, 2218, 2224, 2217, 2215, 2212, 2209, 2205,
-    2202, 2198, 2193, 2193, 2200, 2207, 2208, 2205,
-    2208, 2208, 2205, 2207, 2209, 2208, 2208, 2212,
-    2215, 2224, 2234, 2239, 2242, 2240, 2240, 2243,
-    2239, 2233, 2238, 2245, 2241, 2242, 2243, 2243,
-    2244, 2242, 2241, 2242, 2247, 2253, 2257, 2260,
-    2268, 2274, 2271, 2262, 2258, 2256, 2252, 2244,
-    2231, 2226, 2225, 2224, 2222, 2218, 2214, 2211,
-    2208, 2209, 2212, 2213, 2215, 2218, 2220, 2220,
-    2216, 2208, 2199, 2191, 2178, 2165, 2151, 2144,
-    2140, 2137, 2131, 2127, 2128, 2127, 2123, 2118,
-    2111, 2108, 2101, 2093, 2086, 2080, 2071, 2063,
-    2052, 2039, 2028, 2016, 2007, 1998, 1990, 1987,
-    1985, 1987, 1990, 1992, 1995, 1995, 1992, 1986,
-    1979, 1973, 1966, 1955, 1945, 1938, 1929, 1926,
-    1922, 1919, 1918, 1923, 1925, 1929, 1936, 1942,
-    1944, 1946, 1947, 1945, 1942, 1937, 1934, 1930,
-    1925, 1923, 1924, 1928, 1932, 1938, 1944, 1950,
-    1959, 1969, 1974, 1979, 1984, 1985, 1983, 1983,
-    1983, 1981, 1980, 1975, 1975, 1972, 1976, 1981,
-    1983, 1986, 1987, 1989, 1990, 1990, 1992, 1993,
-    1992, 1996, 1998, 1998, 1995, 1994, 1993, 1991,
-    1988, 1982, 1977, 1973, 1970, 1968, 1965, 1963,
-    1966, 1968, 1969, 1971, 1974, 1979, 1984, 1985,
-    1987, 1988, 1985, 1979, 1973, 1965, 1957, 1954,
-    1950, 1947, 1948, 1948, 1952, 1959, 1966, 1974,
-    1980, 1986, 1990, 1992, 1993, 1994, 1992, 1987,
-    1979, 1975, 1976, 1977, 1973, 1973, 1977, 1986,
-    1995, 2004, 2008, 2018, 2026, 2025, 2026, 2024,
-    2021, 2019, 2013, 2009, 2006, 2005, 2007, 2007,
-    2011, 2018, 2028, 2038, 2047, 2056, 2063, 2074,
-    2083, 2087, 2087, 2089, 2090, 2087, 2086, 2085,
-    2090, 2094, 2094, 2105, 2118, 2127, 2131, 2136,
-    2145, 2153, 2156, 2155, 2150, 2152, 2156, 2158,
-    2155, 2154, 2158, 2165, 2167, 2165, 2166, 2170,
-    2177, 2184, 2185, 2190, 2195, 2199, 2202, 2200,
-    2198, 2197, 2199, 2199, 2196, 2193, 2197, 2202,
-    2203, 2203, 2206, 2208, 2208, 2209, 2210, 2210,
-    2210, 2212, 2213, 2214, 2214, 2215, 2215, 2214,
-    2216, 2217, 2212, 2208, 2212, 2214, 2213, 2215,
-    2216, 2222, 2226, 2226, 2229, 2225, 2221, 2224,
-    2222, 2215, 2208, 2203, 2196, 2192, 2184, 2175,
-    2170, 2165, 2163, 2159, 2154, 2150, 2146, 2142,
-    2138, 2137, 2133, 2130, 2126, 2124, 2121, 2113,
-    2104, 2094, 2087, 2081, 2075, 2064, 2058, 2054,
-    2052, 2049, 2045, 2044, 2042, 2039, 2038, 2032,
-    2028, 2025, 2022, 2020, 2015, 2008, 1999, 1993,
-    1988, 1982, 1974, 1970, 1972, 1972, 1975, 1977,
-    1977, 1980, 1980, 1976, 1973, 1973, 1970, 1966,
-    1962, 1961, 1957, 1955, 1954, 1955, 1956, 1956,
-    1958, 1961, 1969, 1975, 1978, 1981, 1983, 1984,
-    1988, 1985, 1982, 1981, 1980, 1980, 1982, 1985,
-    1990, 1997, 2003, 2010, 2015, 2021, 2027, 2030,
-    2033, 2035, 2036, 2039, 2042, 2044, 2045, 2049,
-    2050, 2050, 2052, 2055, 2056, 2058, 2061, 2066,
-    2070, 2069, 2073, 2074, 2076, 2079, 2081, 2079,
-    2077, 2076, 2074, 2075, 2074, 2072, 2070, 2070,
-    2070, 2069, 2066, 2064, 2062, 2063, 2060, 2059,
-    2060, 2061, 2061, 2057, 2055, 2053, 2049, 2043,
-    2036, 2027, 2021, 2012, 2010, 1999, 1994, 1992,
-    1987, 1980, 1972, 1973, 1972, 1968, 1965, 1965,
-    1966, 1967, 1963, 1958, 1954, 1947, 1945, 1940,
-    1935, 1933, 1930, 1929, 1931, 1933, 1933, 1933,
-    1933, 1934, 1935, 1936, 1934, 1932, 1934, 1934,
-    1933, 1935, 1933, 1932, 1934, 1933, 1930, 1928,
-    1931, 1930, 1931, 1932, 1931, 1934, 1932, 1932,
-    1932, 1934, 1937, 1936, 1937, 1940, 1943, 1942,
-    1946, 1945, 1944, 1944, 1942, 1944, 1946, 1948,
-    1947, 1949, 1953, 1956, 1958, 1961, 1964, 1968,
-    1970, 1971, 1975, 1976, 1979, 1981, 1982, 1985,
-    1988, 1990, 1992, 1997, 2002, 2009, 2013, 2018,
-    2027, 2033, 2039, 2042, 2049, 2054, 2061, 2062,
-    2062, 2066, 2069, 2076, 2080, 2084, 2089, 2094,
-    2099, 2105, 2110, 2114, 2120, 2125, 2130, 2137,
-    2141, 2146, 2152, 2159, 2164, 2168, 2172, 2177,
-    2182, 2186, 2187, 2192, 2197, 2201, 2205, 2210,
-    2218, 2220, 2224, 2228, 2232, 2238, 2243, 2246,
-    2249, 2252, 2250, 2248, 2248, 2246, 2249, 2250,
-    2252, 2252, 2252, 2258, 2262, 2264, 2268, 2271,
-    2272, 2274, 2271, 2269, 2268, 2268, 2264, 2262,
-    2261, 2261, 2255, 2251, 2249, 2248, 2248, 2243,
-    2241, 2244, 2246, 2249, 2248, 2247, 2246, 2246,
-    2245, 2240, 2238, 2237, 2241, 2240, 2240, 2239,
-    2240, 2240, 2238, 2236, 2234, 2233, 2230, 2226,
-    2222, 2222, 2219, 2215, 2213, 2209, 2204, 2201,
-    2193, 2185, 2182, 2175, 2169, 2164, 2161, 2154,
-    2150, 2143, 2134, 2132, 2127, 2122, 2114, 2109,
-    2104, 2097, 2092, 2085, 2077, 2068, 2060, 2054,
-    2049, 2045, 2039, 2035, 2033, 2033, 2031, 2029,
-    2027, 2023, 2023, 2018, 2015, 2013, 2010, 2008,
-    2008, 2005, 2001, 2002, 1997, 1996, 1993, 1991,
-    1991, 1995, 1996, 1996, 1997, 1998, 1999, 1999,
-    1995, 1994, 1998, 1996, 1996, 1997, 1999, 2001,
-    2002, 2006, 2009, 2011, 2012, 2015, 2017, 2020,
-    2023, 2031, 2035, 2039, 2041, 2042, 2047, 2049,
-    2048, 2049, 2052, 2056, 2058, 2060, 2064, 2068,
-    2071, 2073, 2071, 2073, 2077, 2079, 2077, 2078,
-    2077, 2077, 2076, 2073, 2073, 2071, 2069, 2068,
-    2069, 2066, 2068, 2070, 2069, 2070, 2068, 2070,
-    2067, 2067, 2064, 2062, 2059, 2056, 2050, 2048,
-    2047, 2044, 2041, 2040, 2038, 2038, 2036, 2036,
-    2035, 2035, 2035, 2033, 2035, 2032, 2030, 2027,
-    2024, 2019, 2015, 2014, 2013, 2011, 2011, 2011,
-    2011, 2010, 2012, 2012, 2009, 2009, 2005, 2004,
-    2002, 1997, 1995, 1991, 1990, 1989, 1985, 1983,
-    1982, 1982, 1980, 1978, 1978, 1980, 1980, 1980,
-    1984, 1986, 1984, 1984, 1986, 1987, 1987, 1986,
-    1987, 1986, 1987, 1988, 1989, 1989, 1987, 1990,
-    1992, 1996, 1998, 2002, 2007, 2011, 2015, 2018,
-    2021, 2026, 2028, 2028, 2028, 2026, 2026, 2025,
-    2024, 2024, 2024, 2025, 2027, 2033, 2033, 2034,
-    2038, 2040, 2043, 2041, 2044, 2043, 2042, 2040,
-    2036, 2036, 2038, 2040, 2043, 2044, 2045, 2048,
-    2049, 2055, 2058, 2059, 2061, 2064, 2064, 2064,
-    2064, 2064, 2063, 2064, 2064, 2064, 2065, 2066,
-    2067, 2070, 2074, 2076, 2078, 2077, 2079, 2074,
-    2075, 2074, 2071, 2073, 2073, 2074, 2075, 2077,
-    2079, 2079, 2080, 2080, 2079, 2083, 2087, 2091,
-    2093, 2093, 2097, 2098, 2100, 2105, 2108, 2107,
-    2109, 2111, 2112, 2116, 2119, 2121, 2123, 2126,
-    2131, 2134, 2138, 2140, 2143, 2144, 2148, 2149,
-    2151, 2152, 2152, 2154, 2152, 2155, 2156, 2157,
-    2158, 2162, 2165, 2165, 2167, 2169, 2171, 2170,
-    2173, 2171, 2172, 2174, 2174, 2171, 2168, 2169,
-    2168, 2163, 2162, 2164, 2166, 2167, 2169, 2165,
-    2167, 2166, 2165, 2165, 2165, 2162, 2160, 2160,
-    2159, 2156, 2153, 2152, 2152, 2146, 2143, 2141,
-    2139, 2136, 2133, 2129, 2125, 2120, 2114, 2111,
-    2108, 2103, 2100, 2092, 2091, 2091, 2087, 2080,
-    2076, 2076, 2073, 2068, 2065, 2061, 2056, 2053,
-    2050, 2044, 2039, 2036, 2032, 2028, 2024, 2024,
-    2021, 2018, 2017, 2017, 2013, 2007, 2006, 2001,
-    1996, 1997, 1992, 1990, 1988, 1982, 1979, 1977,
-    1973, 1970, 1967, 1965, 1963, 1961, 1960, 1958,
-    1954, 1955, 1951, 1949, 1947, 1941, 1937, 1935,
-    1935, 1934, 1934, 1931, 1933, 1935, 1936, 1936,
-    1936, 1937, 1939, 1939, 1942, 1943, 1946, 1945,
-    1944, 1945, 1946, 1948, 1949, 1950, 1952, 1949,
-    1948, 1948, 1947, 1946, 1946, 1949, 1949, 1949,
-    1952, 1954, 1956, 1955, 1953, 1954, 1954, 1955,
-    1957, 1953, 1952, 1950, 1948, 1948, 1948, 1948,
-    1947, 1949, 1949, 1947, 1946, 1948, 1951, 1950,
-    1951, 1953, 1953, 1952, 1955, 1955, 1953, 1951,
-    1952, 1953, 1951, 1950, 1950, 1953, 1954, 1953,
-    1954, 1951, 1952, 1953, 1953, 1952, 1953, 1954,
-    1956, 1955, 1954, 1955, 1953, 1953, 1953, 1951,
-    1951, 1951, 1950, 1954, 1955, 1956, 1956, 1957,
-    1956, 1961, 1964, 1965, 1969, 1970, 1974, 1978,
-    1980, 1981, 1981, 1983, 1983, 1986, 1987, 1992,
-    1997, 2000, 2002, 2006, 2011, 2016, 2020, 2027,
-    2031, 2033, 2039, 2044, 2046, 2049, 2053, 2058,
-    2059, 2060, 2061, 2064, 2067, 2072, 2077, 2081,
-    2086, 2090, 2096, 2100, 2102, 2104, 2108, 2111,
-    2115, 2115, 2116, 2118, 2120, 2119, 2119, 2119,
-    2118, 2119, 2119, 2120, 2120, 2120, 2124, 2128,
-    2127, 2127, 2127, 2127, 2129, 2127, 2125, 2124,
-    2124, 2125, 2124, 2125, 2123, 2122, 2123, 2122,
-    2121, 2122, 2125, 2128, 2129, 2132, 2134, 2133,
-    2134, 2136, 2135, 2137, 2136, 2134, 2137, 2137,
-    2138, 2139, 2137, 2134, 2139, 2139, 2141, 2142,
-    2145, 2150, 2152, 2154, 2156, 2159, 2159, 2160,
-    2160, 2159, 2160, 2160, 2159, 2160, 2163, 2166,
-    2166, 2166, 2165, 2166, 2168, 2169, 2171, 2174,
-    2178, 2176, 2176, 2176, 2177, 2177, 2176, 2174,
-    2174, 2177, 2181, 2181, 2182, 2183, 2186, 2188,
-    2189, 2191, 2190, 2191, 2188, 2186, 2186, 2185,
-    2183, 2185, 2186, 2184, 2183, 2183, 2182, 2183,
-    2180, 2180, 2177, 2175, 2175, 2172, 2168, 2165,
-    2165, 2165, 2163, 2162, 2162, 2158, 2158, 2154,
-    2150, 2146, 2143, 2138, 2139, 2134, 2130, 2124,
-    2122, 2117, 2116, 2109, 2104, 2099, 2097, 2089,
-    2084, 2079, 2072, 2068, 2064, 2061, 2055, 2048,
-    2043, 2041, 2034, 2032, 2028, 2022, 2019, 2012,
-    2008, 2005, 2001, 1996, 1991, 1989, 1988, 1985,
-    1982, 1978, 1974, 1972, 1970, 1967, 1964, 1960,
-    1961, 1959, 1955, 1952, 1951, 1949, 1949, 1947,
-    1944, 1945, 1944, 1944, 1942, 1941, 1940, 1937,
-    1934, 1931, 1932, 1931, 1931, 1932, 1932, 1930,
-    1929, 1927, 1926, 1926, 1928, 1931, 1933, 1935,
-    1935, 1935, 1937, 1938, 1940, 1941, 1937, 1938,
-    1940, 1940, 1942, 1942, 1943, 1945, 1947, 1948,
-    1950, 1954, 1953, 1955, 1957, 1959, 1961, 1965,
-    1965, 1965, 1966, 1968, 1971, 1971, 1972, 1972,
-    1974, 1975, 1975, 1978, 1980, 1980, 1982, 1983,
-    1983, 1984, 1986, 1988, 1992, 1993, 1994, 1997,
-    1996, 1994, 1994, 1998, 1999, 2002, 2004, 2007,
-    2009, 2010, 2012, 2013, 2017, 2020, 2022, 2024,
-    2027, 2027, 2030, 2034, 2037, 2039, 2041, 2045,
-    2049, 2050, 2052, 2055, 2055, 2057, 2060, 2062,
-    2067, 2072, 2075, 2077, 2078, 2082, 2085, 2089,
-    2090, 2094, 2095, 2098, 2099, 2103, 2107, 2108,
-    2111, 2113, 2115, 2115, 2117, 2116, 2117, 2118,
-    2120, 2121, 2124, 2125, 2126, 2126, 2127, 2129,
-    2129, 2129, 2129, 2131, 2129, 2129, 2129, 2128,
-    2128, 2126, 2127, 2127, 2128, 2128, 2126, 2126,
-    2125, 2126, 2125, 2124, 2121, 2120, 2119, 2118,
-    2118, 2118, 2116, 2114, 2114, 2116, 2115, 2115,
-    2111, 2110, 2110, 2110, 2107, 2108, 2108, 2106,
-    2109, 2109, 2110, 2110, 2109, 2108, 2107, 2103,
-    2102, 2102, 2102, 2101, 2099, 2101, 2098, 2096,
-    2093, 2093, 2094, 2093, 2094, 2095, 2095, 2097,
-    2094, 2090, 2091, 2088, 2084, 2083, 2083, 2082,
-    2079, 2076, 2076, 2076, 2076, 2073, 2073, 2071,
-    2068, 2069, 2068, 2066, 2063, 2063, 2063, 2065,
-    2064, 2063, 2062, 2063, 2065, 2065, 2068, 2068,
-    2066, 2068, 2066, 2062, 2064, 2067, 2063, 2063,
-    2063, 2063, 2064, 2061, 2060, 2062, 2061, 2061,
-    2059, 2061, 2060, 2057, 2059, 2059, 2058, 2058,
-    2055, 2053, 2054, 2052, 2047, 2044, 2041, 2042,
-    2040, 2041, 2041, 2042, 2039, 2039, 2040, 2042,
-    2042, 2040, 2040, 2036, 2036, 2037, 2035, 2034,
-    2034, 2032, 2031, 2028, 2027, 2026, 2023, 2025,
-    2026, 2028, 2027, 2027, 2028, 2026, 2026, 2027,
-    2025, 2022, 2019, 2016, 2011, 2010, 2008, 2008,
-    2004, 2001, 1999, 1998, 1996, 1997, 1994, 1992,
-    1993, 1990, 1989, 1985, 1984, 1983, 1980, 1979,
-    1975, 1970, 1969, 1971, 1970, 1969, 1969, 1969,
-    1970, 1971, 1973, 1975, 1974, 1974, 1974, 1975,
-    1972, 1974, 1974, 1974, 1976, 1972, 1973, 1973,
-    1973, 1973, 1969, 1972, 1972, 1977, 1981, 1984,
-    1987, 1989, 1989, 1990, 1991, 1991, 1990, 1991,
-    1989, 1987, 1985, 1988, 1987, 1986, 1987, 1988,
-    1989, 1988, 1992, 1993, 1992, 1994, 1995, 1995,
-    1994, 1993, 1991, 1994, 1992, 1990, 1992, 1990,
-    1994, 1994, 1997, 1997, 1999, 2001, 2002, 2003,
-    2003, 2003, 2005, 2003, 2000, 2000, 2001, 2003,
-    2004, 2004, 2002, 2002, 2003, 2002, 2002, 2002,
-    2003, 2002, 2001, 2005, 2003, 2001, 2001, 2003,
-    2002, 2001, 2001, 2000, 2002, 2000, 2002, 2002,
-    2002, 2003, 2002, 2005, 2004, 2004, 2008, 2007,
-    2008, 2010, 2013, 2018, 2019, 2020, 2021, 2022,
-    2023, 2023, 2024, 2024, 2022, 2022, 2023, 2025,
-    2026, 2026, 2029, 2030, 2030, 2032, 2032, 2034,
-    2032, 2033, 2031, 2033, 2035, 2036, 2037, 2037,
-    2036, 2035, 2038, 2040, 2040, 2040, 2039, 2039,
-    2040, 2041, 2040, 2040, 2039, 2041, 2040, 2039,
-    2041, 2039, 2038, 2038, 2041, 2042, 2042, 2044,
-    2042, 2042, 2040, 2042, 2044, 2043, 2043, 2045,
-    2045, 2044, 2047, 2048, 2048, 2049, 2050, 2049,
-    2051, 2052, 2053, 2056, 2055, 2055, 2056, 2056,
-    2059, 2056, 2058, 2056, 2055, 2056, 2054, 2058,
-    2059, 2059, 2059, 2058, 2057, 2058, 2056, 2056,
-    2059, 2060, 2060, 2062, 2064, 2064, 2063, 2065,
-    2065, 2066, 2064, 2065, 2067, 2064, 2064, 2064,
-    2066, 2064, 2066, 2064, 2064, 2066, 2065, 2065,
-    2064, 2064, 2063, 2064, 2063, 2063, 2064, 2063,
-    2064, 2066, 2066, 2068, 2068, 2063, 2062, 2062,
-    2063, 2065, 2065, 2063, 2062, 2064, 2064, 2067,
-    2064, 2065, 2066, 2062, 2063, 2064, 2064, 2065,
-    2066, 2064, 2066, 2069, 2069, 2070, 2070, 2070,
-    2068, 2069, 2071, 2073, 2074, 2077, 2076, 2079,
-    2080, 2082, 2082, 2083, 2083, 2082, 2082, 2081,
-    2083, 2083, 2080, 2081, 2081, 2083, 2083, 2083,
-    2083, 2080, 2081, 2084, 2085, 2084, 2085, 2085,
-    2083, 2082, 2080, 2081, 2080, 2080, 2078, 2079,
-    2077, 2076, 2076, 2076, 2078, 2076, 2077, 2078,
-    2080, 2080, 2082, 2084, 2082, 2082, 2082, 2081,
-    2082, 2082, 2083, 2083, 2084, 2085, 2086, 2086,
-    2084, 2085, 2086, 2087, 2087, 2089, 2088, 2085,
-    2086, 2089, 2088, 2087, 2086, 2086, 2086, 2090,
-    2089, 2089, 2090, 2092, 2094, 2095, 2095, 2097,
-    2098, 2099, 2100, 2099, 2101, 2104, 2102, 2101,
-    2101, 2101, 2103, 2102, 2099, 2096, 2097, 2098,
-    2097, 2097, 2099, 2099, 2100, 2100, 2102, 2105,
-    2104, 2100, 2099, 2096, 2097, 2095, 2092, 2094,
-    2092, 2089, 2089, 2088, 2088, 2085, 2085, 2083,
-    2082, 2081, 2080, 2081, 2082, 2082, 2080, 2080,
-    2080, 2079, 2080, 2078, 2076, 2074, 2073, 2073,
-    2073, 2072, 2071, 2067, 2067, 2069, 2070, 2072,
-    2074, 2077, 2078, 2078, 2080, 2078, 2076, 2076,
-    2073, 2073, 2071, 2070, 2071, 2069, 2069, 2069,
-    2069, 2068, 2069, 2069, 2068, 2068, 2068, 2069,
-    2068, 2066, 2064, 2064, 2063, 2062, 2061, 2055,
-    2058, 2059, 2057, 2056, 2055, 2058, 2057, 2055,
-    2054, 2055, 2056, 2055, 2055, 2055, 2052, 2053,
-    2055, 2054, 2055, 2052, 2051, 2051, 2050, 2049,
-    2049, 2050, 2048, 2049, 2049, 2049, 2050, 2052,
-    2052, 2052, 2052, 2053, 2054, 2057, 2057, 2058,
-    2058, 2058, 2061, 2061, 2062, 2064, 2065, 2066,
-    2068, 2067, 2070, 2071, 2073, 2075, 2075, 2076,
-    2078, 2078, 2077, 2076, 2080, 2077, 2079, 2080,
-    2081, 2079, 2076, 2075, 2074, 2077, 2075, 2071,
-    2071, 2070, 2070, 2073, 2073, 2076, 2074, 2071,
-    2072, 2072, 2071, 2072, 2069, 2066, 2064, 2062,
-    2061, 2062, 2063, 2062, 2064, 2062, 2060, 2062,
-    2062, 2061, 2061, 2060, 2056, 2057, 2057, 2055,
-    2056, 2056, 2055, 2056, 2057, 2057, 2058, 2059,
-    2060, 2059, 2062, 2065, 2067, 2068, 2067, 2067,
-    2067, 2066, 2066, 2065, 2063, 2060, 2064, 2067,
-    2067, 2065, 2063, 2062, 2063, 2063, 2061, 2061,
-    2060, 2060, 2059, 2059, 2061, 2060, 2064, 2064,
-    2063, 2062, 2061, 2061, 2060, 2060, 2059, 2057,
-    2056, 2055, 2056, 2058, 2058, 2060, 2058, 2060,
-    2060, 2057, 2056, 2055, 2055, 2054, 2052, 2051,
-    2052, 2048, 2048, 2050, 2051, 2046, 2044, 2043,
-    2045, 2045, 2042, 2044, 2044, 2045, 2046, 2048,
-    2047, 2049, 2045, 2043, 2042, 2042, 2040, 2039,
-    2040, 2039, 2042, 2041, 2042, 2044, 2043, 2041,
-    2040, 2039, 2036, 2038, 2039, 2040, 2042, 2043,
-    2042, 2042, 2043, 2043, 2042, 2042, 2041, 2042,
-    2041, 2044, 2044, 2041, 2042, 2043, 2040, 2041,
-    2040, 2038, 2038, 2036, 2034, 2034, 2035, 2032,
-    2032, 2031, 2032, 2031, 2029, 2030, 2029, 2029,
-    2027, 2025, 2024, 2025, 2022, 2021, 2016, 2012,
-    2012, 2014, 2014, 2014, 2013, 2011, 2010, 2008,
-    2010, 2009, 2008, 2007, 2006, 2008, 2009, 2010,
-    2011, 2008, 2009, 2011, 2010, 2012, 2012, 2011,
-    2011, 2008, 2010, 2012, 2012, 2014, 2014, 2013,
-    2007, 2012, 2017, 2018, 2016, 2013, 2011, 2015,
-    2016, 2018, 2020, 2019, 2018, 2020, 2021, 2023,
-    2024, 2023, 2026, 2024, 2025, 2027, 2027, 2026,
-    2025, 2026, 2026, 2024, 2025, 2024, 2019, 2017,
-    2015, 2012, 2010, 2009, 2010, 2010, 2008, 2005,
-    2007, 2008, 2004, 2002, 1999, 1995, 1994, 1997,
-    1997, 1997, 1996, 1995, 2000, 2001, 1998, 1998,
-    1994, 1994, 1993, 1993, 1990, 1991, 1991, 1991,
-    1996, 1993, 1995, 1995, 1997, 1994, 1994, 1994,
-    1993, 1993, 1990, 1990, 1992, 1994, 1996, 1998,
-    1998, 1998, 2000, 2002, 2001, 2001, 2000, 1998,
-    2003, 2004, 2002, 2003, 2006, 2006, 2007, 2004,
-    2002, 2001, 2000, 2000, 2002, 2001, 2002, 2003,
-    2003, 2005, 2002, 2003, 2004, 2004, 2003, 1999,
-    1996, 1998, 2000, 2001, 2001, 2000, 2001, 2003,
-    2007, 2006, 2006, 2006, 2007, 2005, 2009, 2008,
-    2008, 2011, 2011, 2017, 2016, 2016, 2019, 2021,
-    2022, 2023, 2020, 2019, 2021, 2022, 2022, 2019,
-    2020, 2021, 2022, 2021, 2025, 2027, 2025, 2025,
-    2026, 2028, 2029, 2031, 2029, 2030, 2033, 2034,
-    2034, 2031, 2030, 2032, 2033, 2032, 2033, 2032,
-    2032, 2033, 2033, 2033, 2034, 2033, 2033, 2035,
-    2034, 2032, 2033, 2034, 2030, 2028, 2026, 2026,
-    2029, 2028, 2028, 2027, 2029, 2031, 2033, 2034,
-    2034, 2033, 2032, 2034, 2034, 2032, 2031, 2034,
-    2032, 2034, 2030, 2032, 2033, 2031, 2032, 2031,
-    2030, 2031, 2031, 2030, 2029, 2028, 2027, 2028,
-    2029, 2029, 2027, 2027, 2027, 2028, 2029, 2025,
-    2024, 2022, 2022, 2025, 2026, 2027, 2026, 2027,
-    2030, 2032, 2030, 2030, 2028, 2029, 2028, 2027,
-    2028, 2030, 2032, 2030, 2032, 2033, 2032, 2031,
-    2030, 2033, 2031, 2031, 2034, 2033, 2039, 2039,
-    2039, 2041, 2043, 2043, 2041, 2039, 2038, 2038,
-    2039, 2040, 2041, 2040, 2044, 2044, 2043, 2044,
-    2044, 2047, 2049, 2045, 2046, 2046, 2044, 2046,
-    2046, 2046, 2047, 2043, 2040, 2041, 2040, 2041,
-    2045, 2044, 2044, 2046, 2043, 2042, 2042, 2041,
-    2041, 2041, 2042, 2043, 2043, 2044, 2044, 2042,
-    2042, 2044, 2044, 2044, 2046, 2045, 2046, 2046,
-    2044, 2043, 2044, 2041, 2040, 2042, 2043, 2042,
-    2043, 2047, 2046, 2048, 2045, 2045, 2046, 2046,
-    2045, 2046, 2046, 2044, 2042, 2042, 2043, 2045,
-    2047, 2046, 2046, 2048, 2048, 2049, 2050, 2049,
-    2047, 2047, 2048, 2050, 2050, 2049, 2050, 2050,
-    2051, 2050, 2048, 2048, 2047, 2044, 2044, 2043,
-    2042, 2043, 2041, 2040, 2041, 2039, 2038, 2038,
-    2038, 2038, 2039, 2036, 2034, 2034, 2031, 2031,
-    2031, 2029, 2028, 2027, 2028, 2028, 2026, 2025,
-    2027, 2030, 2028, 2027, 2025, 2024, 2023, 2020,
-    2021, 2020, 2018, 2021, 2021, 2020, 2018, 2020,
-    2019, 2021, 2026, 2027, 2027, 2027, 2028, 2027,
-    2028, 2026, 2029, 2026, 2025, 2028, 2029, 2030,
-    2033, 2034, 2034, 2034, 2036, 2036, 2039, 2041,
-    2041, 2040, 2039, 2036, 2033, 2030, 2032, 2031,
-    2029, 2034, 2039, 2044, 2048, 2051, 2054, 2055,
-    2054, 2057, 2059, 2056, 2053, 2050, 2048, 2044,
-    2037, 2033, 2030, 2026, 2027, 2028, 2031, 2037,
-    2042, 2046, 2051, 2051, 2056, 2056, 2052, 2048,
-    2044, 2037, 2029, 2023, 2014, 2007, 2003, 2002,
-    2001, 1999, 1952, 1835, 1745, 1700, 1674, 1683,
-    1730, 1806, 1892, 1979, 2053, 2095, 2102, 2106,
-    2121, 2130, 2119, 2100, 2071, 2028, 1984, 1947,
-    1918, 1900, 1904, 1935, 1979, 2022, 2068, 2117,
-    2154, 2185, 2200, 2203, 2195, 2171, 2138, 2103,
-    2079, 2045, 2012, 2001, 2006, 2014, 2025, 2046,
-    2071, 2087, 2104, 2123, 2137, 2145, 2147, 2156,
-    2150, 2130, 2105, 2082, 2044, 2005, 1982, 1967,
-    1967, 1976, 1996, 1991, 1900, 1837, 1827, 1801,
-    1808, 1817, 1847, 1897, 1932, 1965, 1973, 1967,
-    1969, 2007, 2030, 2021, 2003, 1972, 1936, 1895,
-    1870, 1845, 1822, 1827, 1856, 1892, 1915, 1937,
-    1964, 1985, 2006, 2025, 2041, 2046, 2029, 2015,
-    2001, 1988, 1969, 1936, 1912, 1908, 1909, 1918,
-    1931, 1948, 1974, 2003, 2029, 2050, 2066, 2074,
-    2075, 2065, 2045, 2027, 2012, 1990, 1967, 1957,
-    1960, 1970, 1981, 1996, 2015, 2026, 2040, 2054,
-    2058, 2051, 2049, 2056, 2058, 2049, 2029, 2008,
-    1991, 1985, 1983, 1975, 1951, 1915, 1878, 1859,
-    1850, 1841, 1846, 1863, 1891, 1923, 1957, 1977,
-    1975, 1960, 1953, 1956, 1965, 1970, 1964, 1957,
-    1943, 1933, 1923, 1910, 1898, 1892, 1897, 1914,
-    1945, 1973, 2000, 2018, 2031, 2040, 2038, 2026,
-    2002, 1975, 1954, 1945, 1942, 1938, 1941, 1951,
-    1964, 1971, 1972, 1970, 1979, 1989, 1996, 2004,
-    2013, 2012, 2009, 2022, 2016, 1991, 1975, 1980,
-    1974, 1947, 1934, 1950, 1976, 2002, 2023, 2035,
-    2041, 2047, 2053, 2046, 2030, 2021, 2017, 2011,
-    2015, 2021, 2010, 1991, 1984, 1996, 2011, 2016,
-    2013, 2008, 2006, 2017, 2024, 2023, 2026, 2032,
-    2031, 2030, 2029, 2025, 2004, 1987, 1996, 2021,
-    2041, 2042, 2035, 2033, 2031, 2026, 2011, 1998,
-    1989, 1977, 1963, 1956, 1957, 1951, 1941, 1935,
-    1939, 1951, 1956, 1956, 1952, 1948, 1950, 1950,
-    1945, 1938, 1908, 1840, 1792, 1779, 1765, 1742,
-    1726, 1745, 1771, 1801, 1839, 1877, 1904, 1924,
-    1950, 1965, 1975, 1976, 1957, 1929, 1906, 1900,
-    1888, 1864, 1847, 1846, 1861, 1881, 1909, 1945,
-    1986, 2019, 2043, 2056, 2062, 2055, 2026, 2000,
-    1988, 1976, 1954, 1935, 1934, 1950, 1972, 1984,
-    1998, 2022, 2047, 2060, 2063, 2064, 2062, 2057,
-    2046, 2040, 2033, 2016, 2000, 1991, 1978, 1969,
-    1972, 1995, 2016, 2028, 2051, 2070, 2071, 2066,
-    2059, 2044, 2023, 2007, 2003, 1999, 1984, 1970,
-    1965, 1963, 1962, 1970, 1982, 1988, 1993, 1996,
-    2001, 2005, 2000, 2001, 1999, 1991, 1984, 1972,
-    1960, 1944, 1929, 1920, 1919, 1935, 1958, 1974,
-    1980, 1991, 2005, 2018, 2015, 1997, 1984, 1971,
-    1956, 1948, 1945, 1940, 1945, 1963, 1973, 1972,
-    1975, 1981, 1986, 1988, 1995, 2009, 2020, 2032,
-    2035, 2026, 2008, 1991, 1973, 1962, 1964, 1971,
-    1981, 1999, 2025, 2050, 2063, 2068, 2062, 2052,
-    2044, 2038, 2033, 2028, 2027, 2028, 2031, 2031,
-    2033, 2029, 2021, 2019, 2017, 2021, 2031, 2044,
-    2058, 2068, 2075, 2074, 2067, 2056, 2044, 2031,
-    2015, 2002, 2000, 1997, 2001, 2010, 2012, 2025,
-    2035, 2041, 2044, 2046, 2048, 2043, 2039, 2035,
-    2036, 2032, 2025, 2016, 2004, 1989, 1982, 1983,
-    1989, 1998, 2008, 2021, 2032, 2036, 2037, 2035,
-    2031, 2021, 2012, 2011, 2008, 2002, 1999, 2000,
-    2001, 2003, 2011, 2021, 2025, 2024, 2027, 2033,
-    2036, 2036, 2038, 2039, 2042, 2040, 2037, 2034,
-    2027, 2019, 2013, 2012, 2013, 2018, 2030, 2043,
-    2057, 2067, 2074, 2075, 2069, 2060, 2051, 2044,
-    2036, 2030, 2031, 2033, 2037, 2040, 2043, 2043,
-    2048, 2053, 2054, 2054, 2061, 2069, 2066, 2060,
-    2059, 2056, 2052, 2050, 2054, 2057, 2053, 2055,
-    2055, 2059, 2060, 2063, 2067, 2069, 2068, 2070,
-    2067, 2058, 2047, 2043, 2042, 2039, 2040, 2047,
-    2051, 2050, 2052, 2055, 2058, 2056, 2055, 2053,
-    2053, 2049, 2047, 2045, 2040, 2036, 2031, 2028,
-    2026, 2026, 2032, 2039, 2047, 2053, 2058, 2061,
-    2060, 2062, 2056, 2046, 2043, 2040, 2040, 2037,
-    2036, 2037, 2041, 2042, 2044, 2048, 2048, 2050,
-    2056, 2062, 2066, 2068, 2071, 2072, 2070, 2069,
-    2066, 2057, 2048, 2044, 2044, 2047, 2050, 2055,
-    2061, 2067, 2072, 2078, 2083, 2085, 2088, 2087,
-    2084, 2083, 2076, 2071, 2067, 2062, 2060, 2060,
-    2058, 2056, 2059, 2065, 2073, 2079, 2088, 2089,
-    2093, 2097, 2097, 2092, 2084, 2078, 2074, 2067,
-    2060, 2058, 2056, 2058, 2058, 2065, 2067, 2073,
-    2077, 2081, 2080, 2074, 2072, 2069, 2067, 2063,
-    2062, 2059, 2061, 2060, 2057, 2055, 2054, 2057,
-    2061, 2065, 2067, 2065, 2063, 2063, 2061, 2058,
-    2053, 2052, 2050, 2051, 2053, 2057, 2059, 2061,
-    2060, 2058, 2060, 2058, 2061, 2068, 2071, 2070,
-    2066, 2069, 2067, 2061, 2055, 2052, 2054, 2054,
-    2055, 2056, 2061, 2063, 2065, 2066, 2071, 2076,
-    2080, 2082, 2081, 2080, 2075, 2068, 2058, 2048,
-    2040, 2036, 2035, 2040, 2050, 2059, 2070, 2083,
-    2092, 2097, 2094, 2091, 2087, 2077, 2070, 2062,
-    2054, 2049, 2048, 2048, 2046, 2044, 2051, 2058,
-    2067, 2075, 2088, 2091, 2085, 2077, 2068, 2063,
-    2056, 2056, 2062, 2064, 2061, 2056, 2051, 2046,
-    2044, 2047, 2050, 2057, 2063, 2064, 2061, 2056,
-    2057, 2059, 2063, 2068, 2068, 2068, 2063, 2054,
-    2043, 2036, 2033, 2035, 2039, 2045, 2048, 2051,
-    2049, 2047, 2048, 2046, 2052, 2057, 2058, 2058,
-    2054, 2046, 2040, 2039, 2036, 2037, 2041, 2045,
-    2049, 2052, 2049, 2042, 2030, 2022, 2020, 2022,
-    2029, 2039, 2048, 2058, 2064, 2062, 2056, 2045,
-    2040, 2036, 2032, 2029, 2024, 2020, 2014, 2012,
-    2016, 2023, 2034, 2043, 2051, 2053, 2052, 2048,
-    2041, 2034, 2030, 2028, 2027, 2024, 2016, 2008,
-    2003, 2001, 2003, 2009, 2019, 2026, 2032, 2033,
-    2033, 2032, 2033, 2036, 2038, 2038, 2034, 2035,
-    2031, 2029, 2024, 2023, 2024, 2027, 2027, 2026,
-    2020, 2017, 2018, 2022, 2026, 2031, 2038, 2039,
-    2038, 2039, 2038, 2036, 2030, 2024, 2022, 2020,
-    2016, 2012, 2011, 2011, 2013, 2018, 2025, 2028,
-    2026, 2024, 2018, 2014, 2008, 2003, 2001, 2007,
-    2014, 2025, 2029, 2026, 2019, 2008, 1999, 1990,
-    1985, 1984, 1989, 1995, 2007, 2015, 2015, 2015,
-    2014, 2013, 2012, 2016, 2016, 2015, 2014, 2008,
-    2001, 1991, 1987, 1984, 1986, 1989, 1995, 2004,
-    2009, 2011, 2010, 2006, 2000, 1996, 1997, 1996,
-    2000, 2000, 1999, 2002, 2001, 2000, 1997, 1994,
-    1989, 1988, 1986, 1981, 1977, 1979, 1982, 1986,
-    1990, 1998, 2000, 2002, 2001, 2000, 1993, 1983,
-    1977, 1970, 1963, 1960, 1963, 1962, 1965, 1966,
-    1967, 1969, 1968, 1972, 1976, 1979, 1983, 1984,
-    1985, 1986, 1982, 1975, 1969, 1963, 1960, 1958,
-    1961, 1965, 1969, 1972, 1976, 1980, 1983, 1988,
-    1989, 1990, 1991, 1990, 1986, 1984, 1983, 1980,
-    1974, 1972, 1973, 1977, 1984, 1992, 1997, 2000,
-    2005, 2009, 2009, 2003, 1998, 1992, 1986, 1983,
-    1977, 1973, 1969, 1968, 1974, 1977, 1984, 1992,
-    1998, 2004, 2001, 1996, 1990, 1986, 1984, 1982,
-    1982, 1986, 1988, 1990, 1988, 1986, 1984, 1984,
-    1983, 1984, 1988, 1993, 1998, 2003, 2005, 2001,
-    1996, 1991, 1986, 1983, 1979, 1982, 1983, 1986,
-    1991, 1992, 1990, 1986, 1984, 1980, 1982, 1982,
-    1984, 1986, 1984, 1987, 1987, 1982, 1984, 1986,
-    1983, 1984, 1985, 1987, 1986, 1985, 1982, 1982,
-    1984, 1985, 1988, 1986, 1988, 1990, 1991, 1992,
-    1993, 1992, 1991, 1991, 1988, 1987, 1990, 1991,
-    1994, 1997, 2001, 2001, 1999, 1995, 1988, 1984,
-    1980, 1976, 1976, 1982, 1985, 1987, 1989, 1991,
-    1993, 1993, 1996, 1999, 2003, 2005, 2004, 2004,
-    2002, 1998, 1994, 1989, 1986, 1984, 1983, 1984,
-    1983, 1981, 1985, 1986, 1986, 1986, 1988, 1992,
-    1997, 2000, 1999, 1996, 1991, 1991, 1988, 1982,
-    1983, 1980, 1981, 1984, 1984, 1985, 1985, 1989,
-    1991, 1994, 1999, 1996, 1994, 1989, 1988, 1988,
-    1979, 1980, 1979, 1980, 1979, 1980, 1982, 1984,
-    1985, 1986, 1988, 1988, 1992, 1991, 1989, 1987,
-    1988, 1987, 1987, 1991, 1994, 1999, 2003, 2001,
-    2000, 1999, 1996, 1991, 1990, 1990, 1991, 1990,
-    1992, 1994, 1993, 1997, 1997, 2002, 2009, 2016,
-    2022, 2025, 2028, 2027, 2024, 2024, 2024, 2022,
-    2025, 2024, 2022, 2021, 2019, 2017, 2014, 2017,
-    2020, 2023, 2026, 2030, 2034, 2036, 2033, 2032,
-    2030, 2029, 2027, 2021, 2019, 2017, 2016, 2019,
-    2027, 2031, 2033, 2035, 2032, 2030, 2024, 2022,
-    2016, 2015, 2017, 2014, 2013, 2013, 2012, 2012,
-    2014, 2017, 2023, 2029, 2033, 2036, 2037, 2034,
-    2032, 2029, 2029, 2029, 2030, 2030, 2032, 2030,
-    2026, 2021, 2019, 2021, 2027, 2033, 2038, 2040,
-    2044, 2047, 2043, 2038, 2035, 2033, 2031, 2030,
-    2030, 2030, 2031, 2033, 2038, 2039, 2038, 2037,
-    2039, 2038, 2037, 2035, 2036, 2039, 2042, 2043,
-    2041, 2042, 2042, 2040, 2036, 2037, 2040, 2040,
-    2042, 2046, 2049, 2046, 2044, 2044, 2043, 2040,
-    2036, 2039, 2042, 2045, 2048, 2043, 2040, 2037,
-    2036, 2034, 2033, 2032, 2032, 2032, 2036, 2037,
-    2040, 2041, 2042, 2043, 2047, 2051, 2051, 2049,
-    2047, 2043, 2035, 2031, 2027, 2025, 2026, 2024,
-    2030, 2034, 2036, 2038, 2039, 2045, 2052, 2054,
-    2055, 2054, 2053, 2052, 2051, 2048, 2046, 2044,
-    2048, 2048, 2046, 2046, 2047, 2046, 2047, 2048,
-    2049, 2051, 2051, 2052, 2051, 2052, 2052, 2055,
-    2062, 2064, 2067, 2068, 2066, 2068, 2067, 2066,
-    2069, 2069, 2070, 2072, 2071, 2071, 2067, 2062,
-    2061, 2063, 2064, 2067, 2067, 2067, 2071, 2071,
-    2074, 2079, 2080, 2081, 2080, 2078, 2074, 2072,
-    2068, 2062, 2060, 2061, 2064, 2065, 2069, 2073,
-    2076, 2081, 2084, 2089, 2091, 2094, 2093, 2093,
-    2090, 2086, 2085, 2081, 2081, 2081, 2082, 2082,
-    2081, 2081, 2080, 2078, 2080, 2084, 2086, 2090,
-    2096, 2095, 2095, 2093, 2091, 2085, 2086, 2088,
-    2088, 2090, 2091, 2091, 2089, 2088, 2089, 2088,
-    2087, 2089, 2089, 2092, 2096, 2099, 2102, 2101,
-    2100, 2102, 2102, 2098, 2096, 2092, 2089, 2086,
-    2084, 2086, 2093, 2097, 2105, 2111, 2115, 2116,
-    2114, 2112, 2111, 2112, 2113, 2116, 2114, 2119,
-    2124, 2127, 2122, 2115, 2114, 2111, 2111, 2112,
-    2114, 2115, 2118, 2123, 2127, 2131, 2133, 2135,
-    2136, 2135, 2131, 2130, 2130, 2131, 2130, 2129,
-    2131, 2135, 2136, 2139, 2139, 2137, 2133, 2130,
-    2126, 2124, 2129, 2129, 2129, 2126, 2126, 2128,
-    2128, 2126, 2127, 2127, 2132, 2134, 2131, 2129,
-    2126, 2124, 2122, 2119, 2115, 2112, 2110, 2111,
-    2112, 2114, 2114, 2116, 2115, 2118, 2121, 2125,
-    2126, 2124, 2124, 2120, 2118, 2115, 2113, 2110,
-    2111, 2111, 2109, 2108, 2110, 2112, 2115, 2119,
-    2121, 2123, 2123, 2121, 2121, 2120, 2123, 2124,
-    2125, 2127, 2128, 2129, 2127, 2124, 2119, 2114,
-    2112, 2110, 2111, 2114, 2114, 2118, 2123, 2126,
-    2127, 2125, 2126, 2130, 2131, 2133, 2130, 2128,
-    2125, 2120, 2118, 2117, 2116, 2119, 2129, 2132,
-    2133, 2134, 2131, 2132, 2131, 2134, 2137, 2139,
-    2140, 2139, 2138, 2133, 2130, 2126, 2123, 2123,
-    2127, 2128, 2130, 2134, 2133, 2134, 2137, 2140,
-    2142, 2144, 2144, 2141, 2136, 2133, 2128, 2121,
-    2118, 2120, 2127, 2129, 2134, 2138, 2138, 2138,
-    2134, 2133, 2131, 2133, 2134, 2131, 2126, 2121,
-    2115, 2108, 2109, 2114, 2120, 2128, 2136, 2141,
-    2142, 2142, 2143, 2139, 2139, 2139, 2137, 2135,
-    2128, 2123, 2116, 2110, 2108, 2108, 2110, 2116,
-    2119, 2122, 2128, 2129, 2126, 2123, 2125, 2127,
-    2130, 2128, 2124, 2119, 2113, 2106, 2104, 2105,
-    2107, 2110, 2115, 2118, 2118, 2118, 2118, 2115,
-    2114, 2115, 2115, 2115, 2114, 2112, 2111, 2111,
-    2110, 2112, 2115, 2116, 2117, 2119, 2116, 2115,
-    2112, 2111, 2110, 2108, 2107, 2105, 2106, 2106,
-    2106, 2106, 2106, 2106, 2107, 2108, 2108, 2107,
-    2110, 2113, 2115, 2113, 2108, 2103, 2094, 2086,
-    2084, 2086, 2087, 2084, 2085, 2089, 2090, 2091,
-    2096, 2100, 2103, 2105, 2110, 2108, 2105, 2098,
-    2093, 2091, 2087, 2089, 2094, 2099, 2101, 2101,
-    2097, 2094, 2093, 2090, 2096, 2104, 2109, 2110,
-    2108, 2104, 2102, 2102, 2104, 2108, 2113, 2117,
-    2120, 2119, 2118, 2118, 2113, 2115, 2119, 2120,
-    2125, 2126, 2121, 2117, 2111, 2108, 2110, 2112,
-    2116, 2121, 2127, 2129, 2130, 2127, 2128, 2128,
-    2130, 2134, 2137, 2136, 2133, 2129, 2124, 2119,
-    2115, 2115, 2117, 2121, 2127, 2131, 2132, 2132,
-    2131, 2131, 2135, 2138, 2140, 2138, 2136, 2130,
-    2124, 2122, 2123, 2125, 2132, 2138, 2144, 2147,
-    2147, 2146, 2144, 2144, 2143, 2143, 2144, 2143,
-    2138, 2133, 2127, 2121, 2118, 2121, 2128, 2135,
-    2143, 2151, 2154, 2152, 2151, 2147, 2143, 2142,
-    2142, 2139, 2135, 2134, 2133, 2133, 2134, 2135,
-    2136, 2140, 2144, 2143, 2143, 2144, 2144, 2144,
-    2144, 2145, 2148, 2146, 2145, 2144, 2143, 2139,
-    2139, 2138, 2139, 2140, 2141, 2144, 2149, 2152,
-    2155, 2157, 2158, 2160, 2160, 2160, 2157, 2156,
-    2153, 2151, 2152, 2152, 2149, 2148, 2148, 2147,
-    2149, 2152, 2158, 2161, 2165, 2164, 2165, 2166,
-    2166, 2164, 2161, 2163, 2163, 2163, 2160, 2157,
-    2157, 2156, 2153, 2155, 2159, 2162, 2163, 2166,
-    2171, 2171, 2170, 2166, 2161, 2157, 2153, 2153,
-    2155, 2155, 2152, 2153, 2155, 2157, 2159, 2160,
-    2165, 2168, 2167, 2167, 2161, 2156, 2154, 2152,
-    2152, 2154, 2155, 2157, 2156, 2159, 2156, 2157,
-    2157, 2158, 2159, 2163, 2169, 2166, 2162, 2158,
-    2154, 2153, 2151, 2148, 2152, 2158, 2156, 2155,
-    2157, 2159, 2156, 2154, 2154, 2157, 2156, 2158,
-    2160, 2158, 2156, 2153, 2151, 2149, 2146, 2150,
-    2155, 2156, 2159, 2160, 2161, 2163, 2166, 2168,
-    2168, 2169, 2170, 2169, 2164, 2157, 2152, 2150,
-    2150, 2148, 2150, 2155, 2162, 2165, 2170, 2172,
-    2177, 2181, 2184, 2184, 2182, 2180, 2175, 2171,
-    2164, 2160, 2156, 2157, 2161, 2162, 2164, 2167,
-    2165, 2163, 2165, 2165, 2167, 2169, 2171, 2172,
-    2172, 2171, 2170, 2170, 2173, 2176, 2172, 2171,
-    2171, 2171, 2165, 2160, 2153, 2154, 2159, 2167,
-    2170, 2170, 2171, 2173, 2172, 2170, 2169, 2171,
-    2174, 2176, 2180, 2179, 2174, 2170, 2168, 2168,
-    2167, 2167, 2168, 2169, 2171, 2169, 2169, 2171,
-    2173, 2177, 2179, 2185, 2189, 2191, 2188, 2181,
-    2179, 2178, 2176, 2179, 2182, 2183, 2178, 2177,
-    2172, 2165, 2159, 2158, 2164, 2168, 2169, 2173,
-    2173, 2170, 2173, 2175, 2177, 2179, 2185, 2189,
-    2193, 2190, 2186, 2183, 2180, 2182, 2182, 2184,
-    2188, 2188, 2185, 2180, 2174, 2172, 2171, 2170,
-    2173, 2178, 2178, 2178, 2176, 2177, 2177, 2179,
-    2184, 2188, 2194, 2199, 2200, 2198, 2193, 2188,
-    2182, 2177, 2175, 2172, 2172, 2172, 2174, 2173,
-    2175, 2173, 2179, 2186, 2190, 2197, 2200, 2201,
-    2196, 2190, 2185, 2180, 2176, 2174, 2169, 2167,
-    2164, 2162, 2158, 2157, 2158, 2162, 2169, 2177,
-    2185, 2190, 2192, 2192, 2186, 2180, 2175, 2173,
-    2169, 2166, 2165, 2162, 2158, 2153, 2152, 2155,
-    2161, 2168, 2176, 2185, 2185, 2184, 2181, 2180,
-    2176, 2174, 2175, 2177, 2181, 2185, 2185, 2179,
-    2177, 2172, 2169, 2170, 2172, 2174, 2175, 2176,
-    2172, 2170, 2171, 2174, 2179, 2185, 2191, 2198,
-    2203, 2202, 2197, 2190, 2190, 2190, 2188, 2190,
-    2188, 2183, 2178, 2173, 2168, 2167, 2166, 2173,
-    2180, 2188, 2199, 2202, 2205, 2202, 2201, 2195,
-    2192, 2191, 2190, 2189, 2186, 2182, 2179, 2177,
-    2175, 2176, 2178, 2185, 2189, 2193, 2196, 2195,
-    2197, 2195, 2192, 2193, 2194, 2196, 2196, 2189,
-    2183, 2181, 2180, 2182, 2185, 2190, 2198, 2201,
-    2206, 2203, 2198, 2192, 2186, 2185, 2182, 2179,
-    2178, 2179, 2175, 2175, 2180, 2186, 2191, 2195,
-    2199, 2201, 2199, 2196, 2190, 2190, 2185, 2184,
-    2182, 2179, 2177, 2170, 2164, 2162, 2162, 2165,
-    2169, 2173, 2180, 2186, 2191, 2193, 2194, 2193,
-    2193, 2192, 2190, 2186, 2185, 2182, 2175, 2172,
-    2171, 2171, 2172, 2174, 2179, 2180, 2182, 2188,
-    2190, 2191, 2192, 2192, 2192, 2190, 2188, 2190,
-    2188, 2185, 2183, 2182, 2181, 2179, 2178, 2178,
-    2175, 2175, 2175, 2176, 2179, 2180, 2183, 2182,
-    2179, 2179, 2178, 2177, 2179, 2180, 2187, 2188,
-    2192, 2194, 2194, 2193, 2191, 2192, 2192, 2188,
-    2185, 2183, 2183, 2182, 2180, 2184, 2186, 2191,
-    2195, 2199, 2200, 2203, 2201, 2201, 2203, 2206,
-    2208, 2207, 2209, 2205, 2198, 2193, 2186, 2185,
-    2183, 2188, 2190, 2194, 2198, 2199, 2200, 2199,
-    2200, 2202, 2203, 2204, 2202, 2202, 2200, 2192,
-    2186, 2183, 2177, 2174, 2172, 2166, 2164, 2161,
-    2160, 2158, 2158, 2160, 2161, 2167, 2169, 2169,
-    2165, 2162, 2160, 2161, 2161, 2162, 2164, 2167,
-    2167, 2165, 2161, 2156, 2155, 2150, 2146, 2147,
-    2150, 2152, 2156, 2158, 2161, 2164, 2166, 2166,
-    2165, 2165, 2163, 2163, 2161, 2159, 2158, 2157,
-    2160, 2157, 2158, 2156, 2153, 2148, 2147, 2150,
-    2154, 2155, 2159, 2162, 2166, 2165, 2165, 2166,
-    2164, 2163, 2158, 2154, 2152, 2151, 2151, 2151,
-    2148, 2147, 2147, 2147, 2148, 2149, 2154, 2158,
-    2162, 2165, 2166, 2170, 2172, 2172, 2172, 2169,
-    2169, 2166, 2164, 2162, 2160, 2159, 2159, 2162,
-    2166, 2167, 2168, 2170, 2172, 2172, 2174, 2175,
-    2177, 2178, 2183, 2185, 2181, 2179, 2176, 2174,
-    2169, 2164, 2162, 2163, 2161, 2165, 2165, 2165,
-    2169, 2171, 2173, 2175, 2177, 2178, 2177, 2177,
-    2176, 2174, 2174, 2176, 2177, 2177, 2177, 2174,
-    2173, 2170, 2167, 2167, 2170, 2173, 2179, 2182,
-    2182, 2183, 2183, 2185, 2188, 2190, 2192, 2194,
-    2193, 2193, 2192, 2191, 2190, 2191, 2194, 2194,
-    2196, 2201, 2203, 2202, 2198, 2198, 2199, 2205,
-    2208, 2214, 2218, 2220, 2218, 2220, 2218, 2219,
-    2220, 2219, 2218, 2216, 2213, 2212, 2214, 2210,
-    2210, 2212, 2213, 2215, 2217, 2216, 2217, 2218,
-    2220, 2223, 2223, 2226, 2228, 2228, 2224, 2223,
-    2220, 2219, 2218, 2219, 2218, 2216, 2216, 2218,
-    2221, 2221, 2225, 2230, 2238, 2245, 2250, 2250,
-    2250, 2249, 2241, 2237, 2235, 2232, 2230, 2227,
-    2227, 2230, 2230, 2231, 2235, 2238, 2238, 2240,
-    2244, 2246, 2244, 2243, 2244, 2246, 2247, 2246,
-    2243, 2239, 2237, 2233, 2231, 2230, 2231, 2231,
-    2234, 2237, 2240, 2243, 2242, 2239, 2238, 2240,
-    2243, 2242, 2243, 2246, 2250, 2253, 2251, 2249,
-    2251, 2250, 2249, 2249, 2249, 2247, 2247, 2247,
-    2247, 2246, 2246, 2248, 2249, 2251, 2253, 2254,
-    2256, 2258, 2258, 2261, 2261, 2260, 2261, 2258,
-    2257, 2252, 2251, 2252, 2247, 2245, 2244, 2243,
-    2245, 2241, 2239, 2239, 2241, 2241, 2242, 2243,
-    2246, 2244, 2241, 2237, 2235, 2235, 2232, 2231,
-    2231, 2232, 2230, 2230, 2229, 2230, 2233, 2233,
-    2233, 2237, 2239, 2239, 2238, 2237, 2239, 2242,
-    2244, 2244, 2245, 2243, 2236, 2232, 2227, 2223,
-    2225, 2226, 2230, 2232, 2235, 2234, 2234, 2234,
-    2235, 2240, 2240, 2245, 2248, 2249, 2245, 2239,
-    2235, 2231, 2226, 2224, 2223, 2219, 2218, 2217,
-    2217, 2217, 2221, 2223, 2227, 2230, 2232, 2233,
-    2231, 2231, 2228, 2226, 2226, 2224, 2219, 2218,
-    2216, 2211, 2211, 2213, 2217, 2218, 2221, 2223,
-    2226, 2231, 2235, 2242, 2248, 2251, 2251, 2253,
-    2254, 2259, 2259, 2254, 2255, 2254, 2250, 2246,
-    2241, 2238, 2232, 2231, 2234, 2239, 2241, 2243,
-    2248, 2250, 2254, 2256, 2259, 2262, 2264, 2263,
-    2261, 2255, 2251, 2246, 2240, 2233, 2230, 2233,
-    2232, 2228, 2224, 2223, 2222, 2221, 2223, 2227,
-    2230, 2235, 2234, 2232, 2230, 2231, 2230, 2232,
-    2232, 2232, 2229, 2227, 2228, 2225, 2224, 2224,
-    2227, 2229, 2227, 2228, 2227, 2228, 2230, 2230,
-    2229, 2231, 2233, 2233, 2231, 2226, 2226, 2223,
-    2223, 2223, 2225, 2228, 2227, 2228, 2226, 2226,
-    2224, 2221, 2223, 2224, 2225, 2227, 2229, 2227,
-    2228, 2225, 2224, 2223, 2226, 2224, 2224, 2226,
-    2225, 2226, 2226, 2226, 2225, 2224, 2225, 2227,
-    2225, 2223, 2223, 2227, 2227, 2226, 2227, 2226,
-    2226, 2225, 2226, 2228, 2227, 2229, 2229, 2232,
-    2231, 2232, 2230, 2233, 2232, 2232, 2231, 2230,
-    2231, 2230, 2230, 2231, 2231, 2233, 2234, 2235,
-    2235, 2231, 2228, 2227, 2226, 2224, 2222, 2222,
-    2222, 2224, 2221, 2220, 2217, 2215, 2213, 2214,
-    2215, 2216, 2215, 2212, 2211, 2209, 2211, 2212,
-    2209, 2211, 2212, 2210, 2206, 2203, 2199, 2197,
-    2198, 2199, 2203, 2207, 2210, 2212, 2214, 2216,
-    2219, 2220, 2222, 2224, 2226, 2227, 2223, 2217,
-    2212, 2206, 2203, 2197, 2193, 2193, 2195, 2199,
-    2203, 2209, 2213, 2216, 2218, 2223, 2225, 2227,
-    2228, 2222, 2219, 2214, 2213, 2213, 2213, 2210,
-    2210, 2207, 2207, 2206, 2204, 2201, 2204, 2207,
-    2209, 2212, 2214, 2216, 2215, 2211, 2206, 2204,
-    2203, 2199, 2200, 2198, 2199, 2202, 2200, 2199,
-    2198, 2198, 2198, 2200, 2201, 2199, 2201, 2199,
-    2198, 2193, 2192, 2191, 2190, 2190, 2192, 2192,
-    2192, 2191, 2191, 2191, 2193, 2193, 2194, 2193,
-    2192, 2192, 2188, 2185, 2182, 2181, 2177, 2177,
-    2178, 2175, 2176, 2174, 2175, 2172, 2173, 2172,
-    2172, 2172, 2170, 2169, 2164, 2158, 2153, 2149,
-    2144, 2143, 2138, 2134, 2132, 2135, 2138, 2137,
-    2138, 2140, 2144, 2147, 2148, 2149, 2150, 2147,
-    2144, 2143, 2141, 2139, 2136, 2134, 2132, 2132,
-    2133, 2132, 2131, 2136, 2138, 2142, 2146, 2146,
-    2147, 2146, 2148, 2147, 2142, 2140, 2139, 2138,
-    2138, 2133, 2130, 2126, 2122, 2121, 2123, 2124,
-    2123, 2125, 2127, 2128, 2126, 2125, 2123, 2120,
-    2117, 2112, 2110, 2107, 2104, 2102, 2096, 2092,
-    2091, 2091, 2087, 2086, 2087, 2089, 2090, 2089,
-    2087, 2086, 2088, 2090, 2094, 2095, 2095, 2093,
-    2089, 2085, 2081, 2078, 2077, 2075, 2075, 2074,
-    2073, 2073, 2069, 2066, 2065, 2064, 2064, 2062,
-    2064, 2064, 2065, 2067, 2067, 2067, 2066, 2067,
-    2065, 2064, 2064, 2062, 2059, 2055, 2053, 2053,
-    2055, 2054, 2055, 2054, 2054, 2050, 2050, 2051,
-    2051, 2051, 2052, 2055, 2059, 2060, 2058, 2058,
-    2052, 2049, 2047, 2044, 2044, 2046, 2045, 2050,
-    2051, 2052, 2051, 2052, 2055, 2053, 2055, 2056,
-    2052, 2051, 2052, 2049, 2046, 2045, 2046, 2044,
-    2043, 2043, 2043, 2041, 2042, 2043, 2045, 2047,
-    2049, 2050, 2049, 2049, 2047, 2046, 2045, 2041,
-    2042, 2041, 2041, 2038, 2039, 2038, 2036, 2036,
-    2033, 2029, 2030, 2028, 2029, 2033, 2030, 2032,
-    2031, 2030, 2030, 2030, 2029, 2028, 2031, 2030,
-    2031, 2028, 2028, 2029, 2025, 2022, 2019, 2017,
-    2013, 2011, 2010, 2009, 2011, 2012, 2013, 2016,
-    2017, 2019, 2020, 2019, 2018, 2012, 2011, 2012,
-    2012, 2013, 2009, 2008, 2007, 2008, 2008, 2011,
-    2012, 2009, 2008, 2007, 2006, 2004, 2003, 2002,
-    2003, 2001, 2001, 2001, 2002, 2002, 2005, 2004,
-    2005, 2003, 2000, 2000, 1998, 1997, 1996, 1994,
-    1990, 1987, 1983, 1985, 1985, 1988, 1991, 1994,
-    1999, 2000, 1999, 1997, 1998, 1997, 1994, 1994,
-    1993, 1990, 1988, 1985, 1979, 1977, 1977, 1977,
-    1979, 1981, 1978, 1980, 1979, 1982, 1981, 1981,
-    1983, 1983, 1983, 1984, 1983, 1985, 1983, 1977,
-    1976, 1976, 1977, 1976, 1977, 1979, 1977, 1976,
-    1971, 1966, 1965, 1963, 1962, 1965, 1968, 1967,
-    1968, 1967, 1967, 1963, 1965, 1964, 1965, 1967,
-    1969, 1968, 1964, 1962, 1960, 1957, 1955, 1953,
-    1949, 1949, 1948, 1949, 1950, 1951, 1953, 1957,
-    1963, 1964, 1963, 1965, 1960, 1959, 1957, 1951,
-    1948, 1946, 1943, 1941, 1941, 1940, 1937, 1936,
-    1939, 1939, 1941, 1944, 1944, 1945, 1945, 1946,
-    1944, 1945, 1941, 1940, 1940, 1940, 1941, 1939,
-    1935, 1936, 1936, 1934, 1933, 1934, 1935, 1937,
-    1936, 1934, 1938, 1938, 1938, 1938, 1939, 1938,
-    1938, 1939, 1939, 1940, 1937, 1936, 1932, 1933,
-    1933, 1934, 1932, 1933, 1933, 1936, 1937, 1936,
-    1941, 1944, 1946, 1948, 1952, 1954, 1953, 1950,
-    1949, 1947, 1946, 1943, 1942, 1939, 1940, 1940,
-    1940, 1938, 1939, 1940, 1940, 1940, 1942, 1945,
-    1949, 1949, 1947, 1946, 1947, 1944, 1939, 1937,
-    1938, 1936, 1936, 1939, 1937, 1938, 1937, 1935,
-    1934, 1935, 1933, 1932, 1930, 1932, 1932, 1932,
-    1933, 1933, 1936, 1938, 1942, 1945, 1947, 1948,
-    1948, 1952, 1951, 1949, 1947, 1947, 1948, 1946,
-    1945, 1945, 1945, 1946, 1944, 1945, 1948, 1952,
-    1958, 1959, 1962, 1964, 1965, 1963, 1964, 1960,
-    1957, 1956, 1951, 1947, 1943, 1942, 1938, 1939,
-    1935, 1937, 1939, 1940, 1943, 1946, 1949, 1950,
-    1948, 1947, 1948, 1948, 1947, 1943, 1938, 1939,
-    1938, 1937, 1934, 1935, 1933, 1934, 1936, 1940,
-    1941, 1942, 1943, 1943, 1946, 1944, 1944, 1944,
-    1945, 1946, 1946, 1945, 1946, 1945, 1944, 1942,
-    1939, 1936, 1937, 1935, 1935, 1936, 1935, 1937,
-    1938, 1939, 1938, 1939, 1938, 1940, 1938, 1937,
-    1936, 1935, 1932, 1929, 1926, 1925, 1921, 1921,
-    1918, 1915, 1912, 1915, 1916, 1915, 1917, 1918,
-    1921, 1925, 1927, 1924, 1921, 1918, 1920, 1918,
-    1917, 1920, 1924, 1923, 1925, 1925, 1923, 1922,
-    1923, 1926, 1929, 1929, 1932, 1936, 1937, 1936,
-    1934, 1934, 1932, 1934, 1933, 1932, 1932, 1927,
-    1926, 1926, 1926, 1927, 1925, 1924, 1923, 1923,
-    1922, 1923, 1921, 1921, 1921, 1922, 1922, 1923,
-    1922, 1923, 1925, 1926, 1927, 1927, 1927, 1928,
-    1926, 1925, 1922, 1921, 1922, 1922, 1922, 1922,
-    1920, 1921, 1921, 1918, 1919, 1919, 1923, 1924,
-    1929, 1931, 1934, 1932, 1931, 1932, 1931, 1932,
-    1933, 1931, 1931, 1930, 1931, 1932, 1930, 1930,
-    1931, 1930, 1932, 1932, 1931, 1932, 1932, 1928,
-    1928, 1930, 1931, 1932, 1932, 1933, 1932, 1930,
-    1929, 1927, 1925, 1924, 1924, 1924, 1925, 1924,
-    1925, 1927, 1927, 1927, 1924, 1925, 1928, 1927,
-    1926, 1925, 1923, 1925, 1926, 1927, 1924, 1922,
-    1921, 1919, 1921, 1918, 1917, 1918, 1921, 1922,
-    1926, 1928, 1928, 1928, 1927, 1928, 1929, 1931,
-    1931, 1930, 1932, 1932, 1928, 1930, 1928, 1927,
-    1929, 1931, 1934, 1937, 1937, 1937, 1936, 1938,
-    1938, 1939, 1937, 1938, 1937, 1937, 1936, 1933,
-    1932, 1932, 1931, 1930, 1931, 1930, 1930, 1930,
-    1932, 1932, 1932, 1934, 1936, 1937, 1937, 1936,
-    1935, 1936, 1938, 1938, 1938, 1937, 1934, 1937,
-    1934, 1928, 1930, 1928, 1930, 1930, 1932, 1934,
-    1939, 1940, 1939, 1944, 1943, 1945, 1945, 1943,
-    1940, 1940, 1942, 1939, 1942, 1938, 1936, 1935,
-    1933, 1930, 1934, 1932, 1929, 1930, 1929, 1931,
-    1929, 1927, 1928, 1926, 1925, 1923, 1920, 1920,
-    1916, 1915, 1915, 1913, 1912, 1913, 1914, 1914,
-    1911, 1911, 1909, 1907, 1909, 1909, 1907, 1909,
-    1908, 1907, 1908, 1908, 1910, 1912, 1912, 1910,
-    1910, 1913, 1912, 1915, 1916, 1913, 1914, 1911,
-    1912, 1911, 1911, 1912, 1913, 1913, 1913, 1914,
-    1916, 1916, 1914, 1912, 1911, 1909, 1909, 1907,
-    1903, 1903, 1904, 1906, 1907, 1909, 1911, 1912,
-    1913, 1912, 1913, 1913, 1912, 1914, 1913, 1913,
-    1911, 1909, 1907, 1907, 1907, 1911, 1914, 1917,
-    1920, 1922, 1925, 1927, 1928, 1929, 1927, 1927,
-    1926, 1927, 1928, 1926, 1927, 1928, 1929, 1934,
-    1937, 1938, 1939, 1940, 1941, 1940, 1938, 1937,
-    1934, 1933, 1933, 1932, 1930, 1928, 1927, 1928,
-    1928, 1928, 1930, 1934, 1936, 1934, 1936, 1938,
-    1940, 1937, 1938, 1936, 1934, 1930, 1928, 1927,
-    1929, 1928, 1925, 1928, 1930, 1932, 1936, 1940,
-    1942, 1944, 1944, 1940, 1944, 1943, 1944, 1942,
-    1941, 1941, 1942, 1941, 1943, 1944, 1946, 1950,
-    1950, 1953, 1950, 1949, 1947, 1945, 1946, 1946,
-    1946, 1948, 1950, 1948, 1946, 1946, 1947, 1946,
-    1946, 1948, 1948, 1950, 1951, 1949, 1949, 1949,
-    1948, 1944, 1942, 1946, 1945, 1946, 1944, 1949,
-    1950, 1952, 1954, 1956, 1957, 1955, 1954, 1953,
-    1952, 1949, 1948, 1949, 1950, 1951, 1955, 1956,
-    1960, 1962, 1963, 1962, 1963, 1965, 1966, 1970,
-    1970, 1969, 1967, 1964, 1962, 1959, 1958, 1957,
-    1956, 1956, 1956, 1960, 1960, 1963, 1964, 1965,
-    1965, 1966, 1964, 1963, 1962, 1960, 1959, 1958,
-    1958, 1957, 1957, 1958, 1955, 1954, 1956, 1956,
-    1956, 1957, 1957, 1958, 1959, 1959, 1957, 1958,
-    1961, 1960, 1957, 1956, 1954, 1957, 1958, 1959,
-    1958, 1957, 1961, 1961, 1963, 1959, 1960, 1963,
-    1963, 1963, 1964, 1965, 1965, 1966, 1965, 1967,
-    1965, 1967, 1968, 1966, 1971, 1971, 1970, 1969,
-    1970, 1971, 1971, 1972, 1971, 1972, 1970, 1970,
-    1969, 1967, 1967, 1966, 1967, 1971, 1972, 1974,
-    1977, 1976, 1976, 1975, 1974, 1974, 1974, 1973,
-    1971, 1972, 1973, 1973, 1973, 1974, 1974, 1975,
-    1977, 1979, 1979, 1977, 1979, 1980, 1978, 1978,
-    1976, 1976, 1975, 1975, 1974, 1973, 1971, 1974,
-    1976, 1977, 1978, 1977, 1977, 1976, 1980, 1981,
-    1977, 1977, 1977, 1976, 1975, 1977, 1975, 1974,
-    1969, 1970, 1969, 1969, 1965, 1965, 1965, 1966,
-    1968, 1967, 1970, 1971, 1972, 1973, 1974, 1973,
-    1972, 1975, 1978, 1977, 1976, 1976, 1978, 1978,
-    1979, 1981, 1980, 1980, 1981, 1980, 1981, 1980,
-    1980, 1981, 1979, 1979, 1977, 1979, 1980, 1982,
-    1983, 1984, 1985, 1987, 1992, 1994, 1996, 1997,
-    1993, 1992, 1990, 1990, 1989, 1989, 1987, 1987,
-    1988, 1986, 1988, 1992, 1993, 1993, 1993, 1994,
-    1994, 1997, 1999, 2001, 2003, 2000, 1999, 1996,
-    1997, 1996, 1996, 1995, 1996, 1996, 1994, 1994,
-    1995, 1998, 1999, 2000, 2001, 2001, 2001, 2001,
-    1999, 2001, 2004, 2003, 2006, 2008, 2005, 2007,
-    2008, 2007, 2005, 2005, 2001, 2001, 2002, 2000,
-    2001, 2002, 2000, 2001, 2003, 2001, 1997, 1994,
-    1995, 1999, 2001, 2003, 2008, 2005, 2003, 2002,
-    2001, 2001, 2000, 1999, 2000, 2001, 1998, 1997,
-    1997, 1996, 1996, 1994, 1994, 1995, 1995, 1997,
-    1996, 1996, 1999, 2001, 2001, 2003, 2006, 2004,
-    2005, 2003, 2004, 2000, 1999, 1997, 1997, 1997,
-    1994, 1994, 1993, 1993, 1994, 1996, 1995, 1994,
-    1992, 1993, 1991, 1991, 1990, 1992, 1991, 1987,
-    1986, 1986, 1985, 1984, 1986, 1982, 1980, 1979,
-    1976, 1978, 1973, 1977, 1978, 1978, 1979, 1980,
-    1981, 1981, 1983, 1982, 1983, 1985, 1982, 1985,
-    1985, 1983, 1982, 1980, 1980, 1982, 1981, 1984,
-    1986, 1986, 1986, 1986, 1984, 1982, 1984, 1987,
-    1988, 1990, 1990, 1988, 1986, 1985, 1985, 1984,
-    1983, 1983, 1984, 1986, 1986, 1986, 1986, 1986,
-    1985, 1985, 1984, 1987, 1987, 1988, 1985, 1983,
-    1981, 1979, 1980, 1976, 1974, 1977, 1978, 1979,
-    1981, 1981, 1980, 1981, 1980, 1983, 1985, 1987,
-    1986, 1984, 1983, 1981, 1980, 1978, 1980, 1978,
-    1979, 1979, 1975, 1975, 1975, 1973, 1972, 1971,
-    1971, 1969, 1971, 1970, 1970, 1969, 1966, 1964,
-    1964, 1964, 1965, 1966, 1968, 1968, 1966, 1968,
-    1967, 1967, 1968, 1964, 1962, 1964, 1962, 1963,
-    1960, 1960, 1959, 1961, 1964, 1963, 1966, 1966,
-    1968, 1969, 1971, 1968, 1967, 1969, 1969, 1969,
-    1970, 1968, 1966, 1964, 1966, 1964, 1962, 1964,
-    1964, 1962, 1961, 1961, 1958, 1957, 1958, 1958,
-    1959, 1957, 1956, 1958, 1958, 1959, 1960, 1960,
-    1961, 1960, 1961, 1958, 1958, 1956, 1955, 1954,
-    1951, 1949, 1948, 1950, 1951, 1952, 1953, 1954,
-    1955, 1955, 1956, 1957, 1958, 1956, 1954, 1954,
-    1954, 1951, 1948, 1946, 1946, 1946, 1945, 1946,
-    1946, 1946, 1946, 1946, 1946, 1946, 1945, 1943,
-    1945, 1944, 1941, 1940, 1939, 1941, 1941, 1938,
-    1939, 1941, 1944, 1941, 1941, 1939, 1938, 1939,
-    1936, 1931, 1931, 1933, 1932, 1932, 1931, 1932,
-    1933, 1933, 1934, 1934, 1936, 1937, 1934, 1935,
-    1933, 1932, 1931, 1930, 1928, 1927, 1927, 1927,
-    1928, 1930, 1928, 1928, 1930, 1930, 1930, 1930,
-    1930, 1929, 1927, 1925, 1924, 1922, 1922, 1923,
-    1918, 1917, 1915, 1916, 1917, 1916, 1916, 1915,
-    1914, 1915, 1917, 1918, 1920, 1918, 1916, 1917,
-    1916, 1914, 1912, 1913, 1914, 1913, 1914, 1914,
-    1912, 1909, 1908, 1910, 1912, 1912, 1913, 1914,
-    1914, 1913, 1912, 1914, 1914, 1915, 1914, 1913,
-    1912, 1910, 1910, 1909, 1905, 1906, 1910, 1910,
-    1910, 1906, 1908, 1905, 1903, 1906, 1908, 1908,
-    1909, 1910, 1906, 1905, 1905, 1905, 1905, 1905,
-    1907, 1907, 1908, 1910, 1911, 1911, 1909, 1910,
-    1910, 1909, 1907, 1905, 1903, 1903, 1904, 1905,
-    1907, 1905, 1905, 1906, 1906, 1907, 1909, 1909,
-    1911, 1911, 1911, 1910, 1910, 1907, 1907, 1907,
-    1906, 1905, 1903, 1902, 1905, 1903, 1906, 1907,
-    1907, 1909, 1907, 1908, 1910, 1907, 1907, 1908,
-    1908, 1905, 1904, 1903, 1903, 1903, 1904, 1905,
-    1907, 1908, 1907, 1907, 1906, 1904, 1907, 1905,
-    1905, 1906, 1903, 1902, 1901, 1901, 1901, 1898,
-    1896, 1895, 1895, 1895, 1894, 1896, 1897, 1900,
-    1896, 1896, 1898, 1897, 1898, 1901, 1900, 1899,
-    1901, 1901, 1901, 1899, 1899, 1899, 1898, 1901,
-    1903, 1904, 1904, 1905, 1906, 1905, 1903, 1903,
-    1907, 1906, 1907, 1908, 1908, 1911, 1909, 1908,
-    1911, 1911, 1913, 1916, 1917, 1915, 1915, 1913,
-    1913, 1912, 1913, 1915, 1915, 1914, 1916, 1915,
-    1917, 1918, 1916, 1918, 1920, 1920, 1922, 1921,
-    1922, 1920, 1919, 1916, 1916, 1917, 1917, 1917,
-    1918, 1921, 1920, 1921, 1919, 1920, 1922, 1921,
-    1920, 1922, 1922, 1922, 1921, 1918, 1918, 1918,
-    1919, 1919, 1919, 1919, 1919, 1920, 1920, 1925,
-    1925, 1923, 1922, 1922, 1922, 1923, 1922, 1923,
-    1922, 1919, 1919, 1919, 1919, 1920, 1919, 1921,
-    1921, 1921, 1920, 1921, 1920, 1921, 1921, 1920,
-    1921, 1924, 1924, 1923, 1922, 1923, 1921, 1923,
-    1923, 1922, 1923, 1922, 1923, 1920, 1917, 1918,
-    1916, 1917, 1921, 1922, 1922, 1923, 1925, 1925,
-    1926, 1925, 1928, 1926, 1925, 1928, 1927, 1926,
-    1926, 1925, 1925, 1925, 1922, 1923, 1923, 1925,
-    1927, 1925, 1924, 1925, 1926, 1926, 1924, 1926,
-    1924, 1922, 1925, 1925, 1925, 1925, 1925, 1926,
-    1925, 1925, 1925, 1925, 1925, 1925, 1925, 1926,
-    1927, 1926, 1926, 1926, 1926, 1926, 1927, 1926,
-    1924, 1927, 1927, 1929, 1928, 1926, 1926, 1926,
-    1925, 1926, 1926, 1927, 1931, 1932, 1932, 1932,
-    1933, 1931, 1931, 1931, 1929, 1928, 1928, 1930,
-    1931, 1931, 1931, 1931, 1931, 1929, 1932, 1932,
-    1932, 1933, 1930, 1932, 1933, 1936, 1936, 1935,
-    1933, 1932, 1930, 1931, 1931, 1932, 1932, 1932,
-    1935, 1934, 1934, 1937, 1937, 1937, 1938, 1935,
-    1935, 1935, 1935, 1936, 1937, 1937, 1939, 1941,
-    1942, 1942, 1942, 1942, 1944, 1943, 1944, 1944,
-    1943, 1943, 1944, 1946, 1949, 1949, 1947, 1947,
-    1945, 1945, 1946, 1943, 1942, 1947, 1944, 1943,
-    1942, 1942, 1943, 1944, 1945, 1946, 1949, 1949,
-    1948, 1951, 1949, 1950, 1950, 1948, 1949, 1944,
-    1945, 1946, 1946, 1946, 1944, 1945, 1949, 1950,
-    1953, 1953, 1954, 1954, 1954, 1953, 1954, 1957,
-    1955, 1957, 1958, 1956, 1955, 1953, 1953, 1952,
-    1951, 1953, 1954, 1955, 1955, 1955, 1952, 1953,
-    1954, 1951, 1953, 1952, 1953, 1956, 1957, 1957,
-    1955, 1954, 1957, 1950, 1948, 1950, 1949, 1951,
-    1950, 1947, 1946, 1943, 1943, 1942, 1942, 1944,
-    1944, 1947, 1948, 1947, 1947, 1949, 1949, 1949,
-    1951, 1950, 1946, 1945, 1945, 1945, 1942, 1939,
-    1943, 1943, 1943, 1943, 1944, 1947, 1945, 1943,
-    1944, 1946, 1947, 1949, 1949, 1948, 1949, 1951,
-    1947, 1946, 1944, 1943, 1945, 1944, 1943, 1942,
-    1940, 1940, 1939, 1940, 1941, 1939, 1939, 1939,
-    1942, 1943, 1943, 1942, 1943, 1944, 1947, 1946,
-    1946, 1948, 1946, 1944, 1943, 1941, 1941, 1940,
-    1941, 1942, 1944, 1944, 1945, 1944, 1945, 1946,
-    1943, 1945, 1945, 1946, 1944, 1945, 1945, 1947,
-    1947, 1946, 1942, 1942, 1940, 1938, 1937, 1936,
-    1936, 1936, 1936, 1936, 1936, 1937, 1937, 1939,
-    1940, 1942, 1941, 1940, 1938, 1938, 1938, 1939,
-    1938, 1935, 1936, 1935, 1934, 1934, 1933, 1934,
-    1934, 1934, 1933, 1932, 1933, 1933, 1933, 1929,
-    1928, 1929, 1929, 1928, 1928, 1929, 1927, 1928,
-    1929, 1929, 1928, 1930, 1931, 1929, 1927, 1927,
-    1925, 1926, 1926, 1928, 1928, 1927, 1925, 1923,
-    1923, 1924, 1925, 1924, 1927, 1929, 1930, 1928,
-    1927, 1929, 1928, 1927, 1927, 1927, 1926, 1927,
-    1928, 1927, 1930, 1930, 1929, 1930, 1926, 1927,
-    1929, 1932, 1933, 1933, 1931, 1929, 1927, 1927,
-    1925, 1926, 1928, 1928, 1928, 1925, 1926, 1927,
-    1929, 1929, 1932, 1931, 1930, 1929, 1928, 1928,
-    1926, 1926, 1925, 1927, 1927, 1927, 1924, 1924,
-    1923, 1923, 1922, 1923, 1925, 1921, 1921, 1920,
-    1922, 1923, 1921, 1921, 1921, 1918, 1918, 1916,
-    1916, 1915, 1914, 1913, 1913, 1913, 1911, 1910,
-    1910, 1909, 1908, 1908, 1908, 1909, 1912, 1911,
-    1909, 1909, 1907, 1908, 1910, 1907, 1907, 1906,
-    1907, 1906, 1905, 1902, 1902, 1900, 1899, 1900,
-    1900, 1901, 1901, 1901, 1902, 1902, 1901, 1901,
-    1898, 1898, 1899, 1900, 1899, 1899, 1898, 1896,
-    1895, 1895, 1893, 1892, 1893, 1890, 1890, 1889,
-    1889, 1891, 1891, 1893, 1894, 1897, 1898, 1898,
-    1897, 1899, 1898, 1897, 1897, 1896, 1896, 1895,
-    1892, 1891, 1891, 1888, 1889, 1893, 1893, 1895,
-    1895, 1896, 1899, 1902, 1900, 1899, 1899, 1900,
-    1901, 1901, 1901, 1900, 1901, 1901, 1903, 1900,
-    1902, 1903, 1904, 1902, 1902, 1903, 1902, 1901,
-    1902, 1903, 1902, 1900, 1900, 1896, 1892, 1891,
-    1897, 1899, 1902, 1908, 1907, 1914, 1916, 1917,
-    1918, 1918, 1917, 1912, 1904, 1898, 1891, 1886,
-    1885, 1884, 1886, 1885, 1888, 1894, 1900, 1911,
-    1917, 1923, 1927, 1931, 1930, 1927, 1920, 1915,
-    1911, 1902, 1894, 1887, 1883, 1883, 1887, 1891,
-    1894, 1900, 1906, 1915, 1922, 1925, 1930, 1931,
-    1931, 1925, 1921, 1915, 1907, 1901, 1898, 1895,
-    1891, 1893, 1897, 1901, 1905, 1912, 1921, 1923,
-    1929, 1934, 1936, 1937, 1934, 1932, 1928, 1924,
-    1918, 1915, 1910, 1908, 1908, 1910, 1910, 1910,
-    1914, 1918, 1922, 1925, 1928, 1927, 1929, 1927,
-    1930, 1929, 1928, 1927, 1924, 1922, 1921, 1921,
-    1921, 1921, 1918, 1918, 1920, 1920, 1920, 1920,
-    1922, 1927, 1931, 1930, 1932, 1933, 1933, 1937,
-    1935, 1935, 1935, 1932, 1930, 1929, 1928, 1926,
-    1926, 1926, 1927, 1928, 1930, 1933, 1936, 1939,
-    1941, 1945, 1945, 1947, 1946, 1942, 1939, 1935,
-    1932, 1929, 1928, 1928, 1927, 1929, 1931, 1935,
-    1936, 1938, 1939, 1942, 1945, 1946, 1949, 1949,
-    1946, 1946, 1943, 1939, 1937, 1934, 1935, 1934,
-    1934, 1934, 1933, 1935, 1938, 1940, 1942, 1942,
-    1944, 1943, 1944, 1943, 1944, 1944, 1943, 1943,
-    1942, 1941, 1941, 1941, 1941, 1941, 1942, 1943,
-    1942, 1943, 1945, 1946, 1947, 1947, 1948, 1950,
-    1949, 1948, 1947, 1945, 1947, 1949, 1949, 1948,
-    1950, 1952, 1948, 1950, 1954, 1952, 1952, 1955,
-    1955, 1956, 1956, 1955, 1957, 1956, 1956, 1957,
-    1960, 1958, 1959, 1960, 1959, 1960, 1963, 1964,
-    1963, 1963, 1962, 1964, 1964, 1964, 1964, 1965,
-    1967, 1967, 1966, 1964, 1965, 1962, 1961, 1961,
-    1962, 1960, 1962, 1961, 1961, 1962, 1963, 1966,
-    1968, 1969, 1967, 1968, 1967, 1967, 1966, 1967,
-    1969, 1967, 1968, 1966, 1967, 1967, 1968, 1966,
-    1966, 1969, 1970, 1973, 1972, 1974, 1978, 1976,
-    1976, 1977, 1979, 1978, 1975, 1974, 1972, 1972,
-    1971, 1969, 1969, 1970, 1971, 1972, 1974, 1976,
-    1979, 1980, 1979, 1980, 1981, 1982, 1982, 1982,
-    1980, 1978, 1980, 1980, 1978, 1976, 1977, 1979,
-    1979, 1977, 1978, 1979, 1981, 1982, 1986, 1987,
-    1988, 1989, 1989, 1994, 1993, 1995, 1994, 1993,
-    1993, 1994, 1997, 1997, 1995, 1993, 1993, 1993,
-    1995, 1995, 1997, 1996, 2000, 2002, 2001, 2001,
-    2000, 2002, 2002, 2001, 2000, 2001, 2001, 2000,
-    2001, 1998, 1998, 1998, 1998, 1997, 1997, 1998,
-    1996, 1996, 1997, 1998, 2000, 1999, 2000, 2000,
-    2000, 2003, 2002, 2001, 2001, 2002, 2004, 2005,
-    2002, 2001, 2001, 2001, 2001, 1998, 2000, 1999,
-    2000, 2000, 1998, 1999, 2001, 2000, 2002, 2004,
-    2005, 2007, 2006, 2006, 2004, 2004, 2004, 2003,
-    2003, 2001, 2001, 2000, 2000, 1999, 1999, 1998,
-    1996, 1998, 1998, 1998, 1996, 1997, 1996, 1994,
-    1995, 1995, 1994, 1997, 1997, 1997, 2002, 2002,
-    2000, 2000, 1999, 2000, 1998, 2000, 2001, 2001,
-    2001, 1999, 1998, 1998, 1999, 1999, 1999, 2000,
-    2003, 2006, 2006, 2008, 2006, 2004, 2006, 2007,
-    2008, 2007, 2007, 2006, 2005, 2007, 2006, 2010,
-    2009, 2007, 2008, 2010, 2011, 2011, 2012, 2013,
-    2012, 2014, 2011, 2012, 2014, 2013, 2015, 2013,
-    2015, 2013, 2012, 2014, 2014, 2012, 2013, 2010,
-    2010, 2012, 2013, 2014, 2014, 2011, 2013, 2014,
-    2013, 2011, 2010, 2011, 2009, 2009, 2008, 2008,
-    2007, 2006, 2005, 2005, 2004, 2005, 2005, 2004,
-    2004, 2003, 2003, 2004, 2006, 2007, 2008, 2007,
-    2008, 2010, 2011, 2009, 2008, 2006, 2007, 2007,
-    2007, 2005, 2005, 2006, 2005, 2007, 2009, 2008,
-    2008, 2008, 2008, 2007, 2006, 2004, 2004, 2005,
-    2004, 2004, 2003, 2003, 2002, 2002, 2001, 2000,
-    2000, 1999, 2000, 1997, 2000, 2000, 1999, 1999,
-    2000, 2002, 2002, 2004, 2003, 2003, 2003, 2003,
-    2002, 2003, 2006, 2007, 2007, 2009, 2007, 2006,
-    2005, 2005, 2004, 2002, 2001, 2001, 2002, 2000,
-    1999, 1996, 1999, 2000, 1999, 2001, 2001, 2000,
-    1998, 2000, 2001, 2001, 2001, 2001, 2000, 1999,
-    1998, 1998, 2000, 2000, 2000, 1999, 1998, 1996,
-    1994, 1992, 1992, 1993, 1994, 1993, 1995, 1994,
-    1993, 1998, 1999, 1996, 1994, 1995, 1995, 1996,
-    1994, 1994, 1995, 1995, 1994, 1994, 1992, 1992,
-    1993, 1992, 1992, 1993, 1994, 1994, 1994, 1996,
-    1996, 1996, 1996, 1996, 1995, 1997, 1997, 1998,
-    2001, 2000, 2000, 1998, 1999, 2000, 1999, 2000,
-    1999, 1998, 1998, 1997, 1999, 2001, 2000, 2000,
-    2001, 1998, 1998, 1997, 1998, 1998, 1998, 1998,
-    1998, 1997, 1994, 1995, 1997, 1997, 1995, 1996,
-    1995, 1993, 1995, 1994, 1997, 1995, 1995, 1994,
-    1997, 1997, 1996, 1998, 1999, 1998, 1997, 1999,
-    1999, 1999, 1999, 1998, 1997, 1995, 1998, 1999,
-    1999, 1997, 1998, 1999, 1998, 1999, 2000, 2000,
-    1998, 1998, 1997, 1992, 1994, 1996, 1993, 1994,
-    1993, 1995, 1995, 1997, 1994, 1995, 1995, 1995,
-    1994, 1993, 1993, 1992, 1991, 1993, 1992, 1993,
-    1992, 1991, 1993, 1991, 1992, 1992, 1991, 1992,
-    1989, 1990, 1990, 1992, 1990, 1991, 1991, 1991,
-    1989, 1991, 1989, 1990, 1989, 1990, 1991, 1990,
-    1990, 1990, 1990, 1990, 1991, 1993, 1991, 1991,
-    1991, 1992, 1993, 1994, 1993, 1994, 1994, 1994,
-    1995, 1995, 2000, 2000, 1999, 2001, 2000, 1997,
-    1999, 1998, 1996, 1997, 1996, 1996, 1996, 1995,
-    1997, 1997, 1997, 1996, 1995, 1997, 1997, 1999,
-    1999, 2000, 1999, 1999, 2000, 2001, 2000, 2002,
-    2005, 2004, 2007, 2006, 2006, 2005, 2005, 2006,
-    2006, 2008, 2007, 2008, 2009, 2009, 2011, 2013,
-    2013, 2013, 2017, 2017, 2019, 2020, 2019, 2021,
-    2021, 2021, 2022, 2022, 2023, 2022, 2024, 2023,
-    2027, 2025, 2027, 2027, 2026, 2029, 2029, 2027,
-    2029, 2030, 2029, 2029, 2031, 2029, 2028, 2030,
-    2029, 2033, 2032, 2035, 2032, 2031, 2032, 2027,
-    2031, 2030, 2029, 2030, 2030, 2029, 2030, 2034,
-    2033, 2033, 2036, 2038, 2038, 2039, 2038, 2040,
-    2040, 2041, 2040, 2040, 2039, 2040, 2040, 2043,
-    2044, 2044, 2044, 2044, 2045, 2047, 2045, 2047,
-    2048, 2047, 2048, 2048, 2049, 2051, 2051, 2051,
-    2051, 2054, 2052, 2049, 2051, 2051, 2049, 2050,
-    2050, 2050, 2052, 2050, 2052, 2052, 2051, 2051,
-    2051, 2050, 2051, 2050, 2052, 2053, 2053, 2052,
-    2054, 2053, 2052, 2053, 2054, 2052, 2056, 2057,
-    2057, 2056, 2057, 2056, 2056, 2057, 2057, 2056,
-    2056, 2056, 2059, 2058, 2058, 2059, 2059, 2059,
-    2059, 2061, 2059, 2059, 2059, 2062, 2062, 2061,
-    2062, 2061, 2062, 2063, 2063, 2064, 2064, 2064,
-    2064, 2062, 2061, 2061, 2061, 2061, 2059, 2058,
-    2059, 2061, 2062, 2059, 2059, 2061, 2060, 2059,
-    2060, 2060, 2062, 2062, 2064, 2067, 2064, 2066,
-    2067, 2066, 2066, 2066, 2067, 2067, 2066, 2066,
-    2066, 2066, 2069, 2068, 2066, 2069, 2067, 2067,
-    2069, 2069, 2070, 2069, 2071, 2072, 2074, 2072,
-    2071, 2073, 2073, 2073, 2071, 2073, 2076, 2073,
-    2071, 2072, 2074, 2072, 2075, 2073, 2074, 2077,
-    2079, 2080, 2081, 2084, 2083, 2083, 2082, 2086,
-    2087, 2086, 2086, 2086, 2088, 2089, 2088, 2088,
-    2088, 2088, 2090, 2090, 2090, 2090, 2093, 2093,
-    2093, 2094, 2093, 2097, 2098, 2096, 2096, 2094,
-    2095, 2096, 2096, 2092, 2095, 2097, 2094, 2096,
-    2095, 2097, 2097, 2095, 2095, 2097, 2097, 2097,
-    2095, 2094, 2097, 2097, 2098, 2097, 2096, 2096,
-    2096, 2099, 2100, 2100, 2098, 2099, 2099, 2099,
-    2102, 2104, 2103, 2103, 2105, 2104, 2105, 2104,
-    2106, 2107, 2107, 2106, 2107, 2109, 2110, 2110,
-    2111, 2113, 2115, 2113, 2114, 2116, 2114, 2116,
-    2113, 2114, 2112, 2112, 2112, 2111, 2114, 2114,
-    2112, 2112, 2112, 2115, 2116, 2115, 2114, 2112,
-    2113, 2114, 2114, 2114, 2114, 2114, 2114, 2112,
-    2113, 2115, 2113, 2115, 2114, 2115, 2117, 2115,
-    2116, 2116, 2117, 2118, 2116, 2116, 2117, 2117,
-    2117, 2118, 2118, 2120, 2121, 2120, 2117, 2116,
-    2118, 2120, 2121, 2120, 2120, 2122, 2121, 2124,
-    2122, 2120, 2123, 2121, 2121, 2123, 2121, 2121,
-    2121, 2119, 2119, 2118, 2115, 2117, 2119, 2117,
-    2116, 2115, 2115, 2115, 2114, 2113, 2112, 2113,
-    2111, 2111, 2111, 2112, 2110, 2111, 2111, 2111,
-    2111, 2111, 2112, 2111, 2111, 2112, 2111, 2110,
-    2111, 2113, 2113, 2111, 2111, 2109, 2110, 2109,
-    2107, 2109, 2110, 2112, 2111, 2112, 2109, 2109,
-    2110, 2110, 2109, 2112, 2112, 2110, 2108, 2108,
-    2108, 2109, 2107, 2108, 2112, 2111, 2109, 2108,
-    2109, 2111, 2112, 2108, 2106, 2107, 2108, 2107,
-    2107, 2106, 2106, 2107, 2107, 2107, 2107, 2109,
-    2109, 2112, 2111, 2108, 2106, 2108, 2108, 2105,
-    2106, 2107, 2106, 2107, 2105, 2104, 2105, 2105,
-    2104, 2104, 2103, 2102, 2101, 2100, 2098, 2099,
-    2098, 2098, 2098, 2097, 2099, 2099, 2097, 2094,
-    2095, 2097, 2094, 2094, 2090, 2092, 2093, 2093,
-    2094, 2094, 2094, 2093, 2094, 2094, 2094, 2093,
-    2090, 2093, 2092, 2089, 2092, 2091, 2092, 2088,
-    2088, 2090, 2088, 2087, 2087, 2088, 2087, 2088,
-    2086, 2087, 2087, 2088, 2089, 2085, 2085, 2086,
-    2088, 2087, 2086, 2088, 2087, 2085, 2085, 2086,
-    2087, 2086, 2085, 2084, 2085, 2085, 2087, 2089,
-    2091, 2091, 2086, 2086, 2085, 2083, 2083, 2082,
-    2081, 2084, 2085, 2085, 2082, 2081, 2082, 2080,
-    2082, 2084, 2082, 2082, 2082, 2079, 2080, 2080,
-    2079, 2078, 2077, 2076, 2076, 2075, 2076, 2076,
-    2077, 2074, 2077, 2077, 2075, 2075, 2075, 2074,
-    2074, 2074, 2075, 2075, 2072, 2073, 2071, 2072,
-    2072, 2070, 2070, 2068, 2070, 2068, 2069, 2068,
-    2067, 2068, 2069, 2066, 2063, 2065, 2067, 2065,
-    2065, 2065, 2064, 2064, 2062, 2063, 2062, 2061,
-    2061, 2060, 2063, 2060, 2059, 2058, 2055, 2058,
-    2059, 2059, 2061, 2058, 2057, 2057, 2058, 2058,
-    2058, 2057, 2056, 2054, 2054, 2055, 2056, 2058,
-    2058, 2058, 2054, 2058, 2060, 2059, 2056, 2056,
-    2055, 2056, 2058, 2057, 2057, 2057, 2056, 2056,
-    2057, 2058, 2058, 2058, 2058, 2058, 2058, 2058,
-    2059, 2059, 2059, 2060, 2061, 2060, 2059, 2059,
-    2060, 2061, 2062, 2063, 2065, 2063, 2062, 2061,
-    2062, 2063, 2064, 2064, 2061, 2061, 2062, 2065,
-    2067, 2065, 2068, 2065, 2066, 2066, 2066, 2067,
-    2068, 2069, 2070, 2068, 2068, 2068, 2066, 2066,
-    2066, 2068, 2070, 2068, 2071, 2070, 2068, 2067,
-    2066, 2068, 2069, 2068, 2067, 2069, 2067, 2067,
-    2070, 2069, 2068, 2067, 2066, 2066, 2068, 2069,
-    2069, 2069, 2069, 2071, 2071, 2069, 2070, 2070,
-    2067, 2070, 2072, 2073, 2074, 2073, 2068, 2069,
-    2071, 2073, 2075, 2077, 2080, 2078, 2079, 2078,
-    2078, 2078, 2078, 2077, 2076, 2078, 2076, 2079,
-    2079, 2079, 2078, 2079, 2080, 2079, 2081, 2080,
-    2082, 2084, 2084, 2085, 2085, 2086, 2088, 2089,
-    2087, 2087, 2088, 2090, 2090, 2090, 2091, 2092,
-    2093, 2093, 2092, 2094, 2093, 2095, 2093, 2093,
-    2093, 2094, 2093, 2095, 2096, 2097, 2095, 2092,
-    2097, 2093, 2093, 2094, 2096, 2095, 2092, 2092,
-    2093, 2093, 2093, 2095, 2093, 2092, 2092, 2090,
-    2090, 2091, 2091, 2092, 2094, 2095, 2096, 2094,
-    2096, 2097, 2094, 2097, 2096, 2094, 2096, 2096,
-    2096, 2097, 2097, 2097, 2094, 2095, 2097, 2098,
-    2100, 2099, 2099, 2099, 2098, 2100, 2100, 2097,
-    2099, 2100, 2101, 2100, 2100, 2102, 2102, 2100,
-    2100, 2100, 2102, 2103, 2106, 2104, 2102, 2101,
-    2101, 2101, 2099, 2100, 2102, 2103, 2103, 2103,
-    2102, 2101, 2103, 2105, 2104, 2106, 2104, 2105,
-    2105, 2105, 2105, 2102, 2101, 2102, 2103, 2103,
-    2103, 2102, 2101, 2102, 2103, 2101, 2105, 2102,
-    2103, 2104, 2104, 2103, 2104, 2104, 2103, 2105,
-    2103, 2102, 2103, 2103, 2105, 2104, 2101, 2100,
-    2099, 2099, 2100, 2101, 2101, 2099, 2100, 2100,
-    2101, 2103, 2104, 2104, 2105, 2103, 2103, 2104,
-    2103, 2103, 2102, 2100, 2100, 2101, 2101, 2100,
-    2101, 2099, 2098, 2099, 2099, 2102, 2101, 2099,
-    2099, 2098, 2100, 2103, 2103, 2104, 2107, 2106,
-    2108, 2107, 2105, 2107, 2104, 2104, 2105, 2105,
-    2104, 2104, 2107, 2107, 2107, 2108, 2107, 2108,
-    2108, 2109, 2110, 2111, 2112, 2111, 2110, 2110,
-    2111, 2110, 2111, 2112, 2113, 2114, 2114, 2112,
-    2112, 2112, 2116, 2116, 2115, 2116, 2116, 2118,
-    2119, 2120, 2119, 2121, 2122, 2120, 2122, 2125,
-    2125, 2124, 2124, 2125, 2124, 2123, 2123, 2123,
-    2121, 2122, 2122, 2125, 2124, 2123, 2124, 2126,
-    2123, 2125, 2126, 2126, 2125, 2125, 2124, 2125,
-    2125, 2124, 2126, 2126, 2127, 2127, 2125, 2127,
-    2126, 2128, 2128, 2126, 2127, 2129, 2129, 2131,
-    2131, 2131, 2131, 2132, 2130, 2130, 2132, 2132,
-    2132, 2130, 2132, 2132, 2134, 2136, 2136, 2137,
-    2139, 2138, 2138, 2136, 2136, 2136, 2135, 2132,
-    2133, 2132, 2133, 2133, 2132, 2134, 2132, 2133,
-    2136, 2131, 2132, 2133, 2133, 2135, 2134, 2134,
-    2133, 2132, 2132, 2133, 2135, 2133, 2133, 2132,
-    2133, 2133, 2133, 2134, 2135, 2136, 2135, 2133,
-    2135, 2137, 2136, 2136, 2137, 2136, 2139, 2138,
-    2137, 2138, 2137, 2139, 2138, 2138, 2139, 2139,
-    2137, 2137, 2139, 2136, 2132, 2134, 2134, 2132,
-    2130, 2132, 2132, 2129, 2128, 2126, 2126, 2128,
-    2129, 2128, 2127, 2128, 2128, 2127, 2129, 2130,
-    2130, 2128, 2128, 2128, 2129, 2129, 2131, 2132,
-    2130, 2128, 2129, 2130, 2128, 2127, 2128, 2128,
-    2128, 2128, 2129, 2131, 2131, 2132, 2132, 2132,
-    2131, 2132, 2131, 2130, 2130, 2132, 2131, 2127,
-    2130, 2127, 2127, 2127, 2128, 2124, 2123, 2124,
-    2124, 2124, 2124, 2125, 2124, 2122, 2121, 2121,
-    2119, 2120, 2119, 2118, 2117, 2118, 2118, 2114,
-    2114, 2113, 2113, 2115, 2112, 2114, 2114, 2111,
-    2111, 2111, 2111, 2109, 2110, 2110, 2109, 2108,
-    2111, 2113, 2110, 2110, 2107, 2109, 2108, 2106,
-    2108, 2106, 2107, 2106, 2108, 2109, 2109, 2108,
-    2108, 2109, 2108, 2107, 2110, 2108, 2104, 2103,
-    2105, 2106, 2104, 2104, 2103, 2103, 2102, 2102,
-    2102, 2103, 2103, 2101, 2102, 2101, 2103, 2106,
-    2105, 2102, 2104, 2103, 2102, 2100, 2101, 2102,
-    2099, 2101, 2102, 2104, 2102, 2101, 2101, 2101,
-    2103, 2102, 2103, 2105, 2103, 2104, 2102, 2102
-};
diff --git a/keyboards/planck/keymaps/synth_wavetable/config.h b/keyboards/planck/keymaps/synth_wavetable/config.h
deleted file mode 100644
index 930b26b0001..00000000000
--- a/keyboards/planck/keymaps/synth_wavetable/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright 2020 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 AUDIO_PIN A5
-    #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
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/synth_wavetable/keymap.c b/keyboards/planck/keymaps/synth_wavetable/keymap.c
deleted file mode 100644
index f23c426014a..00000000000
--- a/keyboards/planck/keymaps/synth_wavetable/keymap.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Copyright 2019 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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 ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
-
-#include "wavetable.h"
-
-float dac_if[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
-uint8_t dac_morph = 0;
-
-
-uint16_t dac_value_generate(void) {
-  uint16_t value = AUDIO_DAC_OFF_VALUE;
-  uint8_t active_tones = audio_get_number_of_active_tones();
-  if (active_tones > AUDIO_MAX_SIMULTANEOUS_TONES)
-    active_tones = AUDIO_MAX_SIMULTANEOUS_TONES;
-
-  if (active_tones > 0) {
-    uint16_t value_avg = 0;
-    for (uint8_t i = 0; i < active_tones; i++) {
-      dac_if[i] = dac_if[i]
-          + ((audio_get_frequency(i) * AUDIO_DAC_BUFFER_SIZE) / AUDIO_DAC_SAMPLE_RATE)
-          * 2/3; // necessary to adjust for the gpt-timer frequency (three times the sample rate) and the dac-conversion beeing called twice per sample
-
-      // Needed because % doesn't work with floats
-      while (dac_if[i] >= (AUDIO_DAC_BUFFER_SIZE))
-        dac_if[i] = dac_if[i] - AUDIO_DAC_BUFFER_SIZE;
-
-      // #define AUDIO_DAC_MORPH_SPEED 372
-      // #define AUDIO_DAC_MORPH_SPEED_COMPUTED (AUDIO_DAC_SAMPLE_RATE / AUDIO_DAC_WAVETABLE_CUSTOM_LENGTH * (1000 / AUDIO_DAC_MORPH_SPEED))
-
-      uint16_t dac_i = (uint16_t)dac_if[i];
-      // value_avg += dac_buffer_custom[dac_morph_flipped][dac_i] / active_tones / 2 * ((dac_morph >= 63) ? 6400 - dac_morph_counter : dac_morph_counter) / 6400;
-      // value_avg += dac_buffer_custom[dac_morph_flipped + 1][dac_i] / active_tones / 2 * ((dac_morph >= 63) ? dac_morph_counter : 6400 - dac_morph_counter) / 6400;
-
-      // value_avg += dac_wavetable_custom[dac_morph][dac_i] / active_tones / 2 * (AUDIO_DAC_MORPH_SPEED_COMPUTED - dac_morph_counter) / AUDIO_DAC_MORPH_SPEED_COMPUTED;
-      // value_avg += dac_wavetable_custom[dac_morph + 1][dac_i] / active_tones / 2 * dac_morph_counter / AUDIO_DAC_MORPH_SPEED_COMPUTED;
-      value_avg += dac_wavetable_custom[dac_morph][dac_i] / active_tones;
-    }
-    value = value_avg;
-
-    // dac_morph_counter++;
-    // if (dac_morph_counter >= AUDIO_DAC_MORPH_SPEED_COMPUTED) {
-      // dac_morph_counter = 0;
-      // dac_morph = (dac_morph + 1) % 125;
-      // dac_morph_flipped = ((dac_morph >= 63) ? (125 - dac_morph) : dac_morph);
-      // dac_morph = (dac_morph + 1) % (AUDIO_DAC_WAVETABLE_CUSTOM_LENGTH - 1);
-    // }
-  }
-  return value;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (clockwise) {
-    dac_morph = (dac_morph + 1) % AUDIO_DAC_WAVETABLE_CUSTOM_LENGTH;
-  } else {
-    if (dac_morph == 0)
-      dac_morph = (AUDIO_DAC_WAVETABLE_CUSTOM_LENGTH - 1);
-    else
-      dac_morph--;
-  }
-    return true;
-}
diff --git a/keyboards/planck/keymaps/synth_wavetable/rules.mk b/keyboards/planck/keymaps/synth_wavetable/rules.mk
deleted file mode 100644
index ebfcda22143..00000000000
--- a/keyboards/planck/keymaps/synth_wavetable/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-AUDIO_ENABLE = yes
-AUDIO_DRIVER = dac_additive
diff --git a/keyboards/planck/keymaps/synth_wavetable/wavetable.h b/keyboards/planck/keymaps/synth_wavetable/wavetable.h
deleted file mode 100644
index 89a0eefcbb7..00000000000
--- a/keyboards/planck/keymaps/synth_wavetable/wavetable.h
+++ /dev/null
@@ -1,2197 +0,0 @@
-/*
-Copyright 2020 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/>.
-*/
-
-#define AUDIO_DAC_WAVETABLE_CUSTOM_LENGTH 64
-
-static const dacsample_t dac_wavetable_custom[64][256] = {
-  {
-    3038, 4095, 3745, 3945, 3779, 3889, 3782, 3850,
-    3775, 3817, 3766, 3788, 3755, 3762, 3743, 3738, 
-    3729, 3716, 3715, 3695, 3700, 3676, 3683, 3658,
-    3667, 3642, 3649, 3626, 3632, 3611, 3614, 3596,
-    3596, 3581, 3579, 3567, 3561, 3552, 3544, 3537,
-    3528, 3522, 3511, 3507, 3495, 3491, 3479, 3476,
-    3464, 3460, 3449, 3444, 3433, 3428, 3419, 3412,
-    3404, 3397, 3389, 3382, 3374, 3366, 3359, 3351,
-    3345, 3336, 3330, 3322, 3314, 3307, 3299, 3293,
-    3285, 3279, 3270, 3265, 3255, 3251, 3241, 3237,
-    3227, 3223, 3213, 3208, 3200, 3194, 3187, 3179,
-    3173, 3165, 3161, 3150, 3149, 3136, 3137, 3121,
-    3125, 3107, 3112, 3093, 3099, 3080, 3086, 3068,
-    3072, 3056, 3058, 3045, 3043, 3036, 3027, 3027,
-    3010, 3019, 2992, 3013, 2974, 3007, 2955, 3002,
-    2935, 2999, 2913, 2998, 2886, 3006, 2842, 3067,
-    2464, 221, 205, 228, 215, 260, 231, 285,
-    249, 307, 270, 326, 291, 344, 313, 359,
-    335, 374, 357, 388, 378, 403, 399, 416,
-    419, 431, 438, 445, 457, 460, 475, 476,
-    492, 492, 509, 508, 525, 524, 540, 541,
-    555, 558, 571, 574, 586, 591, 601, 607,
-    616, 624, 631, 639, 647, 656, 662, 671,
-    677, 687, 692, 702, 708, 718, 723, 733,
-    738, 748, 753, 763, 768, 777, 783, 792,
-    798, 806, 812, 820, 827, 834, 842, 848,
-    857, 862, 872, 875, 887, 888, 901, 902,
-    915, 915, 929, 929, 943, 942, 956, 956,
-    969, 971, 981, 986, 992, 1001, 1003, 1017,
-    1013, 1032, 1023, 1048, 1033, 1064, 1043, 1079,
-    1054, 1093, 1065, 1106, 1078, 1118, 1092, 1127,
-    1109, 1132, 1130, 1132, 1160, 1118, 1217, 1036
-  },
-  {
-    2048, 2049, 2056, 2071, 2096, 2130, 2174, 2225,
-    2280, 2337, 2392, 2444, 2490, 2529, 2559, 2581,
-    2593, 2597, 2594, 2589, 2585, 2588, 2603, 2635,
-    2685, 2755, 2842, 2943, 3050, 3157, 3258, 3347,
-    3423, 3485, 3535, 3577, 3612, 3641, 3665, 3682,
-    3692, 3694, 3692, 3689, 3690, 3700, 3724, 3761,
-    3811, 3867, 3924, 3972, 4005, 4019, 4013, 3993,
-    3964, 3936, 3915, 3906, 3912, 3931, 3959, 3990,
-    4020, 4043, 4059, 4067, 4068, 4063, 4051, 4030,
-    3997, 3946, 3875, 3782, 3671, 3546, 3419, 3299,
-    3197, 3120, 3072, 3053, 3062, 3091, 3133, 3180,
-    3224, 3257, 3276, 3277, 3259, 3221, 3163, 3084,
-    2986, 2870, 2741, 2607, 2474, 2351, 2245, 2161,
-    2102, 2069, 2058, 2067, 2091, 2124, 2160, 2195,
-    2222, 2239, 2245, 2238, 2219, 2191, 2155, 2116,
-    2077, 2042, 2014, 1995, 1987, 1991, 2003, 2023,
-    2048, 2074, 2101, 2124, 2144, 2158, 2166, 2170,
-    2172, 2175, 2181, 2195, 2221, 2260, 2315, 2384,
-    2465, 2555, 2648, 2740, 2826, 2903, 2971, 3029,
-    3076, 3114, 3142, 3159, 3167, 3167, 3160, 3153,
-    3150, 3157, 3180, 3222, 3283, 3362, 3452, 3546,
-    3636, 3715, 3777, 3823, 3854, 3874, 3889, 3905,
-    3923, 3944, 3968, 3989, 4007, 4019, 4026, 4030,
-    4033, 4040, 4051, 4066, 4081, 4090, 4086, 4063,
-    4019, 3956, 3878, 3794, 3716, 3651, 3606, 3586,
-    3589, 3612, 3647, 3688, 3728, 3760, 3781, 3787,
-    3780, 3757, 3718, 3661, 3584, 3485, 3366, 3230,
-    3085, 2938, 2801, 2683, 2589, 2525, 2492, 2486,
-    2503, 2537, 2580, 2624, 2663, 2691, 2703, 2698,
-    2674, 2633, 2574, 2500, 2415, 2322, 2228, 2139,
-    2059, 1994, 1945, 1914, 1900, 1901, 1913, 1933,
-    1957, 1983, 2006, 2025, 2038, 2046, 2049, 2048
-  },
-  {
-    2048, 2053, 2074, 2119, 2191, 2291, 2416, 2559,
-    2710, 2860, 3000, 3124, 3225, 3301, 3350, 3371,
-    3364, 3334, 3288, 3234, 3182, 3144, 3127, 3137,
-    3173, 3231, 3304, 3378, 3441, 3483, 3495, 3475,
-    3423, 3344, 3243, 3128, 3002, 2867, 2726, 2581,
-    2433, 2286, 2142, 2001, 1865, 1731, 1597, 1460,
-    1317, 1171, 1023, 881, 750, 637, 546, 476,
-    423, 380, 341, 300, 254, 205, 154, 109,
-    75, 56, 55, 72, 105, 153, 217, 296,
-    395, 513, 651, 806, 972, 1139, 1299, 1444,
-    1572, 1680, 1772, 1855, 1935, 2018, 2110, 2212,
-    2323, 2442, 2563, 2680, 2786, 2877, 2944, 2982,
-    2986, 2951, 2877, 2771, 2640, 2498, 2360, 2238,
-    2145, 2087, 2069, 2088, 2140, 2215, 2303, 2392,
-    2469, 2524, 2550, 2543, 2505, 2437, 2346, 2241,
-    2132, 2031, 1949, 1893, 1870, 1878, 1915, 1974,
-    2048, 2128, 2206, 2276, 2332, 2371, 2394, 2402,
-    2403, 2404, 2417, 2449, 2510, 2603, 2728, 2882,
-    3056, 3236, 3410, 3564, 3690, 3783, 3842, 3868,
-    3864, 3833, 3777, 3700, 3604, 3495, 3378, 3261,
-    3150, 3048, 2958, 2877, 2801, 2723, 2637, 2536,
-    2420, 2289, 2146, 1997, 1847, 1698, 1552, 1410,
-    1271, 1133, 999, 870, 748, 637, 536, 446,
-    364, 288, 216, 150, 92, 49, 29, 37,
-    76, 144, 235, 339, 444, 541, 623, 689,
-    741, 784, 826, 874, 933, 1009, 1101, 1209,
-    1330, 1461, 1598, 1739, 1877, 2007, 2123, 2219,
-    2291, 2338, 2364, 2374, 2378, 2385, 2404, 2443,
-    2503, 2585, 2684, 2794, 2904, 3004, 3084, 3136,
-    3154, 3133, 3070, 2965, 2823, 2650, 2458, 2261,
-    2075, 1914, 1787, 1701, 1656, 1649, 1675, 1726,
-    1791, 1861, 1927, 1981, 2020, 2043, 2051, 2050
-  },
-  {
-    2048, 2051, 2065, 2095, 2144, 2212, 2298, 2397,
-    2504, 2612, 2716, 2811, 2894, 2961, 3011, 3042,
-    3055, 3052, 3036, 3014, 2996, 2988, 3001, 3040,
-    3108, 3204, 3324, 3459, 3598, 3728, 3841, 3930,
-    3992, 4029, 4045, 4045, 4032, 4009, 3975, 3930,
-    3874, 3809, 3738, 3665, 3596, 3534, 3481, 3436,
-    3397, 3357, 3312, 3255, 3184, 3099, 3003, 2900,
-    2795, 2693, 2595, 2503, 2413, 2325, 2235, 2143,
-    2048, 1950, 1850, 1750, 1651, 1554, 1460, 1370,
-    1287, 1215, 1159, 1122, 1105, 1107, 1124, 1147,
-    1168, 1179, 1172, 1143, 1091, 1019, 931, 836,
-    741, 655, 584, 535, 510, 514, 549, 618,
-    721, 856, 1019, 1201, 1388, 1569, 1730, 1862,
-    1956, 2012, 2029, 2013, 1971, 1911, 1844, 1779,
-    1725, 1690, 1676, 1686, 1719, 1771, 1838, 1913,
-    1989, 2059, 2115, 2152, 2167, 2161, 2136, 2097,
-    2048, 1994, 1942, 1894, 1856, 1829, 1813, 1805,
-    1803, 1800, 1788, 1762, 1715, 1643, 1544, 1420,
-    1276, 1120, 962, 811, 675, 558, 463, 390,
-    337, 304, 290, 294, 316, 353, 399, 447,
-    489, 517, 526, 513, 479, 430, 375, 322,
-    283, 264, 269, 297, 345, 405, 473, 542,
-    612, 682, 754, 829, 910, 996, 1086, 1179,
-    1273, 1366, 1459, 1553, 1649, 1747, 1848, 1949,
-    2048, 2141, 2227, 2305, 2375, 2440, 2505, 2574,
-    2649, 2733, 2825, 2923, 3023, 3122, 3215, 3300,
-    3373, 3433, 3476, 3499, 3496, 3465, 3403, 3313,
-    3200, 3073, 2945, 2829, 2735, 2672, 2644, 2652,
-    2691, 2756, 2836, 2921, 3000, 3062, 3101, 3111,
-    3090, 3036, 2950, 2835, 2695, 2539, 2375, 2214,
-    2069, 1947, 1855, 1795, 1766, 1765, 1786, 1824,
-    1871, 1920, 1965, 2003, 2029, 2044, 2050, 2049
-  },
-  {
-    2048, 2061, 2117, 2228, 2396, 2610, 2844, 3065,
-    3240, 3343, 3358, 3283, 3125, 2900, 2629, 2337,
-    2048, 1783, 1558, 1379, 1241, 1136, 1049, 971,
-    900, 843, 815, 838, 930, 1103, 1358, 1680,
-    2048, 2435, 2816, 3170, 3479, 3729, 3908, 4008,
-    4025, 3959, 3819, 3616, 3364, 3076, 2757, 2413,
-    2048, 1667, 1285, 922, 601, 347, 175, 92,
-    93, 168, 304, 490, 722, 998, 1315, 1668,
-    2048, 2437, 2818, 3173, 3483, 3736, 3919, 4021,
-    4035, 3956, 3788, 3544, 3247, 2924, 2605, 2309,
-    2048, 1819, 1614, 1422, 1234, 1050, 878, 733,
-    633, 597, 635, 751, 939, 1186, 1471, 1768,
-    2048, 2280, 2443, 2523, 2523, 2457, 2354, 2241,
-    2146, 2087, 2067, 2081, 2113, 2142, 2149, 2118,
-    2048, 1944, 1824, 1711, 1629, 1601, 1637, 1740,
-    1896, 2080, 2261, 2404, 2481, 2478, 2394, 2243,
-    2048, 1835, 1634, 1468, 1354, 1299, 1300, 1342,
-    1408, 1479, 1540, 1586, 1625, 1670, 1744, 1865,
-    2048, 2292, 2585, 2903, 3215, 3491, 3707, 3846,
-    3899, 3864, 3745, 3550, 3296, 2999, 2682, 2360,
-    2048, 1749, 1462, 1186, 917, 661, 432, 250,
-    137, 112, 184, 351, 600, 912, 1268, 1651,
-    2048, 2444, 2828, 3184, 3496, 3749, 3932, 4040,
-    4072, 4031, 3919, 3739, 3493, 3185, 2828, 2441,
-    2048, 1675, 1346, 1074, 862, 705, 592, 516,
-    476, 475, 524, 632, 806, 1046, 1343, 1684,
-    2048, 2412, 2755, 3051, 3279, 3421, 3468, 3421,
-    3295, 3116, 2914, 2717, 2543, 2398, 2277, 2166,
-    2048, 1909, 1744, 1557, 1361, 1178, 1031, 940,
-    919, 975, 1102, 1284, 1497, 1708, 1886, 2004,
-    2048, 2018, 1931, 1812, 1689, 1590, 1536, 1534,
-    1585, 1676, 1786, 1894, 1981, 2035, 2056, 2053
-  },
-  {
-    2048, 2072, 2162, 2326, 2531, 2717, 2808, 2744,
-    2504, 2112, 1636, 1162, 781, 560, 536, 708,
-    1040, 1468, 1922, 2340, 2681, 2929, 3082, 3144,
-    3108, 2958, 2676, 2261, 1739, 1174, 654, 273,
-    103, 179, 496, 1009, 1653, 2344, 2997, 3529,
-    3874, 3994, 3882, 3563, 3082, 2497, 1866, 1246,
-    698, 284, 64, 82, 347, 829, 1459, 2145,
-    2795, 3334, 3712, 3900, 3885, 3668, 3262, 2702,
-    2048, 1375, 770, 310, 56, 39, 261, 696,
-    1287, 1952, 2594, 3120, 3458, 3578, 3497, 3260,
-    2927, 2549, 2159, 1774, 1409, 1084, 836, 709,
-    741, 951, 1327, 1819, 2353, 2844, 3211, 3395,
-    3374, 3170, 2846, 2488, 2179, 1975, 1891, 1901,
-    1956, 2008, 2027, 2015, 1996, 2006, 2073, 2203,
-    2370, 2529, 2630, 2636, 2539, 2368, 2176, 2032,
-    1989, 2070, 2251, 2471, 2649, 2712, 2622, 2385,
-    2048, 1681, 1362, 1153, 1086, 1157, 1334, 1565,
-    1803, 2019, 2207, 2378, 2545, 2706, 2837, 2892,
-    2819, 2583, 2185, 1674, 1130, 653, 328, 216,
-    337, 675, 1182, 1782, 2392, 2928, 3328, 3557,
-    3606, 3490, 3229, 2845, 2359, 1803, 1223, 690,
-    283, 77, 118, 409, 910, 1551, 2247, 2916,
-    3483, 3886, 4077, 4031, 3750, 3266, 2640, 1948,
-    1273, 689, 261, 35, 43, 291, 753, 1368,
-    2048, 2691, 3210, 3550, 3691, 3645, 3437, 3096,
-    2649, 2126, 1569, 1033, 587, 298, 216, 362,
-    722, 1248, 1866, 2486, 3015, 3375, 3519, 3446,
-    3200, 2855, 2490, 2166, 1911, 1723, 1584, 1478,
-    1404, 1379, 1435, 1593, 1858, 2201, 2566, 2885,
-    3090, 3140, 3027, 2785, 2480, 2196, 2006, 1951,
-    2026, 2183, 2350, 2459, 2469, 2375, 2208, 2022,
-    1871, 1793, 1798, 1865, 1955, 2028, 2061, 2057
-  },
-  {
-    2048, 1736, 1511, 1423, 1476, 1630, 1822, 1987,
-    2083, 2101, 2063, 2006, 1968, 1967, 2000, 2045,
-    2073, 2061, 2011, 1944, 1899, 1908, 1981, 2099,
-    2218, 2291, 2292, 2226, 2129, 2054, 2044, 2111,
-    2237, 2375, 2471, 2480, 2385, 2198, 1962, 1735,
-    1574, 1515, 1563, 1694, 1861, 2022, 2148, 2232,
-    2282, 2305, 2299, 2254, 2154, 1996, 1798, 1599,
-    1449, 1393, 1464, 1664, 1967, 2319, 2651, 2890,
-    2979, 2896, 2660, 2325, 1964, 1648, 1430, 1334,
-    1360, 1494, 1707, 1967, 2238, 2480, 2658, 2740,
-    2709, 2561, 2310, 1987, 1639, 1327, 1114, 1056,
-    1181, 1476, 1889, 2335, 2720, 2967, 3034, 2923,
-    2673, 2345, 2010, 1727, 1537, 1455, 1475, 1580,
-    1747, 1955, 2184, 2411, 2607, 2733, 2751, 2632,
-    2378, 2025, 1643, 1320, 1132, 1123, 1287, 1573,
-    1902, 2192, 2386, 2461, 2433, 2339, 2225, 2123,
-    2048, 1993, 1946, 1898, 1854, 1834, 1865, 1966,
-    2133, 2334, 2512, 2611, 2593, 2463, 2263, 2058,
-    1913, 1862, 1902, 1996, 2088, 2130, 2099, 2001,
-    1871, 1755, 1694, 1710, 1795, 1918, 2036, 2111,
-    2130, 2104, 2062, 2034, 2032, 2044, 2044, 2008,
-    1930, 1832, 1756, 1745, 1830, 2008, 2250, 2502,
-    2700, 2790, 2741, 2556, 2273, 1955, 1672, 1483,
-    1414, 1463, 1600, 1789, 1998, 2202, 2383, 2519,
-    2590, 2574, 2460, 2253, 1979, 1682, 1414, 1233,
-    1183, 1291, 1551, 1925, 2344, 2723, 2981, 3065,
-    2964, 2707, 2356, 1983, 1656, 1424, 1315, 1335,
-    1468, 1686, 1950, 2223, 2467, 2652, 2748, 2736,
-    2601, 2347, 2004, 1624, 1283, 1058, 1009, 1154,
-    1466, 1873, 2285, 2614, 2801, 2826, 2710, 2501,
-    2259, 2036, 1862, 1751, 1697, 1692, 1733, 1822,
-    1963, 2154, 2374, 2582, 2721, 2742, 2619, 2369
-  },
-  {
-    2048, 2099, 2228, 2259, 1999, 1514, 1195, 1450,
-    2280, 3163, 3424, 2780, 1605, 678, 618, 1447,
-    2593, 3312, 3203, 2425, 1510, 990, 1120, 1807,
-    2685, 3258, 3119, 2226, 1045, 353, 712, 2001,
-    3423, 4031, 3396, 1899, 483, 41, 848, 2389,
-    3692, 3949, 3033, 1544, 405, 291, 1255, 2722,
-    3811, 3831, 2719, 1136, 90, 268, 1555, 3114,
-    3964, 3614, 2324, 895, 183, 617, 1954, 3388,
-    4020, 3424, 1949, 514, 27, 798, 2345, 3693,
-    3997, 3089, 1590, 481, 425, 1338, 2538, 3274,
-    3197, 2470, 1563, 978, 1033, 1728, 2698, 3356,
-    3224, 2300, 1137, 500, 836, 1934, 3058, 3478,
-    2986, 2018, 1282, 1194, 1621, 2108, 2314, 2242,
-    2102, 2039, 2030, 2009, 2004, 2101, 2286, 2386,
-    2222, 1832, 1496, 1506, 1876, 2312, 2478, 2313,
-    2077, 2067, 2276, 2385, 2108, 1542, 1143, 1321,
-    2048, 2836, 3127, 2729, 1951, 1338, 1247, 1633,
-    2172, 2537, 2581, 2321, 1874, 1441, 1300, 1669,
-    2465, 3215, 3317, 2530, 1269, 374, 507, 1646,
-    3076, 3872, 3523, 2269, 928, 339, 820, 2008,
-    3150, 3579, 3074, 1933, 812, 393, 1006, 2361,
-    3636, 3973, 3084, 1503, 242, 106, 1176, 2779,
-    3923, 3906, 2735, 1128, 88, 267, 1552, 3134,
-    4033, 3701, 2345, 796, 14, 497, 1947, 3438,
-    4019, 3364, 1958, 721, 380, 1054, 2279, 3324,
-    3589, 2905, 1647, 566, 367, 1237, 2668, 3752,
-    3780, 2721, 1257, 332, 511, 1607, 2838, 3413,
-    3085, 2234, 1489, 1248, 1506, 2001, 2450, 2652,
-    2503, 2030, 1460, 1167, 1432, 2176, 2932, 3161,
-    2674, 1808, 1170, 1163, 1680, 2239, 2430, 2258,
-    2059, 2108, 2334, 2426, 2195, 1777, 1510, 1606,
-    1957, 2266, 2327, 2193, 2057, 2033, 2068, 2069
-  },
-  {
-    2048, 2119, 2229, 2372, 2541, 2724, 2909, 3085,
-    3240, 3368, 3466, 3533, 3571, 3581, 3566, 3529,
-    3473, 3403, 3326, 3251, 3188, 3144, 3128, 3145,
-    3195, 3276, 3382, 3503, 3628, 3747, 3850, 3932,
-    3992, 4032, 4055, 4067, 4071, 4069, 4061, 4047,
-    4025, 3996, 3965, 3934, 3910, 3898, 3902, 3922,
-    3956, 3998, 4040, 4074, 4093, 4093, 4074, 4041,
-    4002, 3964, 3935, 3920, 3921, 3936, 3961, 3991,
-    4020, 4044, 4062, 4073, 4078, 4078, 4073, 4060,
-    4035, 3994, 3932, 3848, 3744, 3626, 3504, 3389,
-    3291, 3220, 3180, 3174, 3198, 3247, 3313, 3388,
-    3462, 3527, 3577, 3607, 3615, 3598, 3553, 3479,
-    3374, 3240, 3081, 2904, 2720, 2541, 2379, 2245,
-    2146, 2087, 2069, 2088, 2140, 2218, 2311, 2410,
-    2503, 2580, 2633, 2654, 2639, 2585, 2492, 2361,
-    2199, 2014, 1817, 1619, 1435, 1273, 1142, 1045,
-    984, 959, 967, 1005, 1067, 1148, 1238, 1328,
-    1408, 1468, 1498, 1493, 1450, 1369, 1254, 1113,
-    956, 796, 643, 508, 397, 311, 251, 214,
-    196, 195, 211, 240, 283, 334, 391, 445,
-    489, 515, 519, 496, 449, 380, 299, 215,
-    137, 74, 31, 7, 0, 3, 10, 16,
-    18, 14, 8, 2, 0, 2, 8, 16,
-    23, 25, 22, 13, 4, 0, 7, 31,
-    76, 139, 215, 296, 371, 432, 472, 486,
-    476, 445, 398, 345, 291, 244, 207, 183,
-    172, 177, 199, 241, 305, 395, 510, 648,
-    800, 958, 1109, 1242, 1347, 1416, 1448, 1443,
-    1404, 1338, 1255, 1164, 1077, 1002, 947, 918,
-    919, 954, 1024, 1129, 1268, 1436, 1624, 1822,
-    2017, 2197, 2351, 2472, 2554, 2597, 2602, 2571,
-    2510, 2427, 2331, 2232, 2141, 2070, 2027, 2018
-  },
-  {
-    2048, 2055, 2083, 2142, 2236, 2366, 2526, 2705,
-    2891, 3068, 3227, 3358, 3455, 3515, 3537, 3522,
-    3473, 3396, 3302, 3199, 3101, 3015, 2946, 2896,
-    2859, 2827, 2789, 2734, 2652, 2541, 2399, 2232,
-    2048, 1853, 1656, 1461, 1273, 1094, 929, 779,
-    649, 541, 454, 384, 327, 277, 229, 182,
-    139, 106, 93, 108, 158, 244, 363, 506,
-    666, 832, 999, 1165, 1330, 1499, 1674, 1857,
-    2048, 2243, 2440, 2635, 2825, 3005, 3173, 3324,
-    3453, 3552, 3614, 3635, 3614, 3558, 3476, 3382,
-    3291, 3215, 3159, 3125, 3110, 3105, 3100, 3084,
-    3048, 2986, 2897, 2783, 2647, 2497, 2341, 2188,
-    2048, 1931, 1846, 1799, 1790, 1815, 1863, 1922,
-    1978, 2017, 2030, 2012, 1962, 1885, 1789, 1687,
-    1592, 1517, 1473, 1467, 1501, 1574, 1678, 1805,
-    1940, 2069, 2176, 2249, 2282, 2272, 2224, 2146,
-    2048, 1941, 1837, 1745, 1672, 1623, 1598, 1591,
-    1596, 1599, 1590, 1558, 1495, 1398, 1269, 1117,
-    956, 802, 670, 575, 523, 516, 554, 630,
-    738, 873, 1027, 1196, 1372, 1550, 1724, 1890,
-    2048, 2198, 2346, 2498, 2659, 2833, 3019, 3210,
-    3398, 3573, 3724, 3847, 3939, 4004, 4046, 4069,
-    4078, 4071, 4048, 4005, 3939, 3852, 3743, 3618,
-    3479, 3331, 3173, 3006, 2830, 2642, 2446, 2245,
-    2048, 1860, 1690, 1539, 1406, 1286, 1172, 1057,
-    936, 808, 676, 546, 425, 322, 242, 192,
-    172, 186, 235, 319, 438, 590, 769, 965,
-    1166, 1356, 1526, 1668, 1779, 1864, 1931, 1988,
-    2048, 2117, 2202, 2304, 2419, 2541, 2659, 2764,
-    2845, 2893, 2899, 2857, 2767, 2633, 2463, 2272,
-    2078, 1899, 1750, 1642, 1579, 1563, 1587, 1643,
-    1721, 1807, 1890, 1961, 2012, 2041, 2052, 2050
-  },
-  {
-    2048, 2060, 2109, 2207, 2360, 2560, 2787, 3015,
-    3217, 3368, 3451, 3458, 3391, 3257, 3067, 2840,
-    2593, 2344, 2110, 1900, 1717, 1554, 1404, 1253,
-    1093, 924, 753, 596, 475, 410, 418, 507,
-    673, 905, 1189, 1509, 1849, 2196, 2537, 2858,
-    3146, 3391, 3587, 3732, 3830, 3884, 3899, 3876,
-    3811, 3695, 3524, 3294, 3012, 2689, 2345, 1999,
-    1666, 1358, 1077, 824, 599, 404, 246, 133,
-    75, 80, 151, 285, 478, 721, 1006, 1323,
-    1660, 2000, 2324, 2612, 2847, 3019, 3127, 3181,
-    3197, 3192, 3179, 3165, 3148, 3119, 3064, 2972,
-    2833, 2647, 2419, 2162, 1894, 1634, 1404, 1223,
-    1109, 1072, 1113, 1222, 1379, 1556, 1726, 1867,
-    1965, 2019, 2035, 2029, 2021, 2027, 2060, 2127,
-    2222, 2333, 2441, 2526, 2569, 2558, 2487, 2361,
-    2197, 2016, 1849, 1723, 1659, 1666, 1742, 1876,
-    2048, 2234, 2412, 2562, 2670, 2729, 2742, 2718,
-    2674, 2627, 2591, 2574, 2575, 2583, 2581, 2548,
-    2465, 2322, 2116, 1859, 1568, 1267, 977, 719,
-    508, 354, 266, 245, 291, 396, 550, 737,
-    945, 1165, 1394, 1634, 1891, 2170, 2472, 2790,
-    3109, 3408, 3667, 3870, 4007, 4077, 4082, 4030,
-    3923, 3765, 3559, 3306, 3013, 2689, 2347, 1998,
-    1653, 1320, 1006, 719, 468, 266, 126, 61,
-    76, 167, 322, 524, 752, 993, 1237, 1486,
-    1741, 2008, 2289, 2582, 2875, 3157, 3411, 3623,
-    3780, 3872, 3893, 3841, 3715, 3523, 3282, 3013,
-    2740, 2489, 2276, 2107, 1979, 1879, 1791, 1699,
-    1592, 1467, 1331, 1196, 1082, 1005, 980, 1015,
-    1109, 1256, 1438, 1635, 1821, 1973, 2068, 2097,
-    2059, 1967, 1844, 1713, 1601, 1526, 1499, 1525,
-    1594, 1694, 1805, 1908, 1988, 2036, 2055, 2053
-  },
-  {
-    2048, 2072, 2095, 2075, 2062, 2149, 2347, 2534,
-    2584, 2527, 2537, 2732, 3017, 3166, 3074, 2884,
-    2844, 3021, 3223, 3212, 2982, 2782, 2838, 3104,
-    3321, 3317, 3206, 3252, 3548, 3896, 4028, 3910,
-    3782, 3875, 4095, 4095, 4095, 3855, 3719, 3863,
-    4080, 4065, 3759, 3424, 3355, 3556, 3739, 3649,
-    3342, 3105, 3136, 3332, 3412, 3231, 2919, 2715,
-    2707, 2768, 2724, 2551, 2362, 2259, 2219, 2157,
-    2048, 1944, 1881, 1811, 1665, 1473, 1350, 1361,
-    1417, 1359, 1150, 949, 947, 1145, 1329, 1300,
-    1095, 955, 1044, 1254, 1316, 1103, 782, 627,
-    713, 835, 759, 498, 306, 386, 653, 834,
-    792, 690, 804, 1192, 1608, 1771, 1678, 1603,
-    1778, 2118, 2309, 2159, 1822, 1629, 1734, 1954,
-    1990, 1762, 1493, 1456, 1681, 1943, 2022, 1925,
-    1847, 1930, 2119, 2249, 2238, 2153, 2095, 2080,
-    2048, 1973, 1912, 1915, 1938, 1892, 1763, 1668,
-    1723, 1885, 1968, 1842, 1593, 1438, 1481, 1578,
-    1487, 1150, 775, 614, 689, 765, 627, 325,
-    123, 191, 407, 501, 366, 185, 212, 466,
-    698, 671, 436, 273, 366, 584, 630, 389,
-    77, 8, 248, 539, 586, 384, 215, 329,
-    667, 935, 929, 753, 682, 863, 1169, 1364,
-    1361, 1292, 1331, 1505, 1700, 1812, 1863, 1934,
-    2048, 2147, 2196, 2244, 2360, 2521, 2615, 2582,
-    2519, 2589, 2834, 3096, 3182, 3084, 3009, 3147,
-    3446, 3657, 3604, 3387, 3271, 3380, 3552, 3521,
-    3228, 2893, 2770, 2865, 2939, 2800, 2540, 2436,
-    2621, 2923, 3052, 2930, 2780, 2860, 3153, 3370,
-    3268, 2930, 2671, 2689, 2844, 2820, 2484, 2039,
-    1804, 1875, 2038, 2026, 1804, 1593, 1602, 1812,
-    2013, 2049, 1961, 1906, 1958, 2053, 2091, 2066
-  },
-  {
-    2048, 2070, 2146, 2287, 2483, 2702, 2900, 3027,
-    3040, 2918, 2664, 2307, 1895, 1485, 1132, 876,
-    736, 714, 794, 950, 1160, 1403, 1672, 1964,
-    2279, 2614, 2955, 3279, 3551, 3731, 3784, 3687,
-    3434, 3043, 2547, 1997, 1446, 948, 545, 265,
-    123, 122, 252, 500, 850, 1280, 1768, 2284,
-    2795, 3265, 3654, 3930, 4065, 4046, 3875, 3567,
-    3152, 2664, 2143, 1626, 1146, 731, 405, 187,
-    94, 136, 319, 637, 1073, 1592, 2150, 2693,
-    3169, 3530, 3746, 3807, 3720, 3514, 3223, 2886,
-    2537, 2196, 1875, 1578, 1306, 1063, 862, 723,
-    671, 729, 908, 1201, 1584, 2009, 2421, 2763,
-    2992, 3084, 3043, 2896, 2687, 2466, 2275, 2142,
-    2070, 2044, 2037, 2021, 1974, 1892, 1789, 1690,
-    1628, 1627, 1697, 1828, 1989, 2140, 2238, 2252,
-    2173, 2016, 1819, 1633, 1508, 1484, 1577, 1776,
-    2048, 2343, 2610, 2807, 2911, 2919, 2849, 2726,
-    2581, 2434, 2291, 2147, 1986, 1794, 1565, 1306,
-    1043, 816, 670, 645, 766, 1034, 1430, 1909,
-    2417, 2895, 3293, 3576, 3726, 3744, 3643, 3442,
-    3162, 2819, 2430, 2008, 1570, 1139, 742, 413,
-    189, 97, 158, 374, 732, 1201, 1741, 2303,
-    2842, 3316, 3692, 3947, 4067, 4047, 3887, 3596,
-    3191, 2697, 2150, 1590, 1066, 621, 297, 117,
-    94, 220, 475, 826, 1240, 1683, 2127, 2551,
-    2937, 3270, 3535, 3711, 3780, 3723, 3531, 3209,
-    2779, 2282, 1770, 1302, 930, 693, 608, 664,
-    834, 1076, 1345, 1606, 1836, 2031, 2199, 2355,
-    2509, 2665, 2811, 2922, 2971, 2931, 2792, 2562,
-    2271, 1966, 1698, 1514, 1444, 1491, 1632, 1826,
-    2020, 2164, 2228, 2200, 2097, 1953, 1809, 1705,
-    1663, 1689, 1767, 1869, 1964, 2029, 2055, 2053
-  },
-  {
-    2048, 2561, 2882, 1925, 1133, 2097, 3797, 4088,
-    2776, 1767, 2291, 3280, 3257, 2487, 2059, 2126,
-    2101, 1630, 1064, 1182, 1941, 2104, 1196, 546,
-    1140, 2073, 2181, 1769, 1821, 2365, 2600, 2511,
-    2925, 3644, 3507, 2704, 2607, 3268, 3505, 3065,
-    2629, 2418, 2195, 2003, 2003, 1859, 1066, 110,
-    157, 1030, 1220, 450, 80, 694, 1448, 1721,
-    1786, 2100, 2633, 2799, 2270, 1758, 2203, 3394,
-    4094, 3495, 2357, 2200, 3036, 3279, 2512, 2047,
-    2132, 1482, 103, 0, 966, 2027, 1434, 250,
-    475, 1883, 2525, 1973, 1589, 1913, 2175, 1995,
-    1842, 2221, 3014, 3437, 3043, 2581, 2900, 3549,
-    3502, 2694, 2013, 1982, 2001, 1505, 1262, 2009,
-    2685, 2173, 1503, 2031, 3013, 2982, 2080, 1531,
-    1740, 2035, 2040, 2150, 2357, 2095, 1711, 2170,
-    3093, 3197, 2417, 1724, 1547, 1653, 1797, 1905,
-    2048, 2242, 2334, 2300, 2332, 2628, 3225, 3649,
-    3156, 2071, 1676, 2141, 2380, 2129, 2035, 2014,
-    1542, 1048, 1384, 2197, 2109, 877, 120, 825,
-    1656, 1357, 856, 1254, 1923, 2056, 2093, 2657,
-    3405, 3542, 2994, 2621, 2942, 3334, 3120, 2552,
-    2206, 2220, 2250, 1874, 1385, 1543, 1973, 1423,
-    198, 29, 1125, 1695, 806, 0, 263, 1560,
-    2130, 2050, 2522, 3231, 2971, 2280, 2656, 3851,
-    4095, 3374, 2153, 1810, 2357, 2798, 2562, 2088,
-    1879, 1846, 1581, 940, 509, 921, 1484, 1011,
-    31, 79, 1132, 1898, 1978, 1988, 2205, 2327,
-    2334, 2625, 3035, 2727, 1825, 1636, 2371, 2727,
-    2323, 2121, 2341, 2265, 1886, 1866, 2171, 1986,
-    1120, 626, 1239, 2015, 1854, 1326, 1485, 2132,
-    2467, 2287, 2008, 2142, 2522, 2233, 1167, 733,
-    1793, 3076, 2860, 1469, 909, 1947, 2928, 2560
-  },
-  {
-    2048, 2504, 2795, 1937, 1211, 2093, 3713, 4049,
-    2790, 1746, 2327, 3617, 3862, 2964, 2133, 1958,
-    2048, 1906, 1540, 1495, 1969, 2095, 1253, 469,
-    957, 2084, 2288, 1309, 413, 609, 1420, 1878,
-    2048, 2416, 2641, 2415, 2445, 3116, 3618, 3425,
-    3094, 3057, 2976, 2556, 2157, 2260, 2607, 2510,
-    2048, 1846, 1730, 1126, 470, 562, 1118, 1256,
-    707, 0, 0, 657, 1800, 2252, 1982, 1778,
-    2048, 2337, 2178, 2155, 3149, 4095, 3814, 2019,
-    1613, 3417, 4095, 4095, 2914, 2060, 2283, 2403,
-    2048, 2008, 2319, 1963, 931, 522, 1245, 2190,
-    2418, 1813, 1007, 831, 1340, 1749, 1701, 1701,
-    2048, 2283, 2008, 1749, 2382, 3485, 3459, 2102,
-    1281, 1916, 2557, 2061, 1334, 1451, 2031, 2222,
-    2048, 2033, 2105, 1834, 1584, 1987, 2435, 1916,
-    981, 920, 1695, 2348, 2505, 2404, 2271, 2175,
-    2048, 1874, 1791, 1820, 1787, 1507, 926, 477,
-    918, 2022, 2475, 1928, 1548, 1878, 2145, 2009,
-    2048, 2386, 2390, 1952, 2002, 3023, 3848, 3333,
-    2518, 3030, 4095, 4095, 2947, 2084, 2100, 2270,
-    2048, 1702, 1663, 1726, 1412, 921, 893, 1364,
-    1762, 1577, 771, 85, 433, 1479, 2005, 1899,
-    2048, 2447, 2401, 2251, 3043, 4095, 4095, 3226,
-    1627, 2142, 3851, 4095, 3076, 2212, 2305, 2408,
-    2048, 1782, 2003, 2215, 1703, 660, 90, 449,
-    1182, 1559, 1324, 832, 814, 1398, 1831, 1842,
-    2048, 2517, 2569, 2216, 2218, 2717, 3036, 2810,
-    2563, 2830, 3111, 2643, 1890, 1817, 2179, 2205,
-    2048, 2021, 1715, 1061, 879, 1567, 2270, 1959,
-    932, 554, 1292, 2021, 1905, 1587, 1757, 2076,
-    2048, 1774, 1737, 2244, 2760, 2283, 1035, 637,
-    1788, 3057, 2821, 1509, 1006, 1957, 2836, 2504
-  },
-  {
-    2048, 2448, 2705, 1949, 1297, 2089, 3594, 3952,
-    2776, 1740, 2347, 3840, 4095, 3348, 2198, 1801,
-    1994, 2206, 2113, 1926, 2015, 2073, 1535, 882,
-    1140, 2082, 2300, 1162, 0, 0, 565, 1339,
-    1170, 960, 1385, 1871, 1992, 2142, 2460, 2617,
-    2629, 2757, 2854, 2594, 2196, 2427, 3507, 4095,
-    3938, 2920, 2662, 3067, 3099, 2608, 2195, 2028,
-    1786, 1282, 808, 955, 1777, 2367, 1886, 688,
-    1, 586, 1725, 1880, 843, 258, 1065, 2058,
-    2132, 2013, 2527, 3003, 2625, 2061, 2503, 3589,
-    3621, 2244, 1338, 2198, 3558, 3686, 2746, 1947,
-    1842, 2145, 2321, 2155, 1950, 1904, 1660, 1024,
-    593, 1060, 2140, 2565, 1577, 323, 565, 1997,
-    2685, 2145, 1719, 2040, 2341, 2179, 2045, 2244,
-    2355, 2087, 1946, 2350, 2626, 2116, 1633, 2182,
-    3093, 3120, 2374, 1774, 1637, 1732, 1850, 1936,
-    2048, 2199, 2274, 2250, 2281, 2539, 3089, 3542,
-    3156, 2073, 1590, 2184, 2670, 2289, 1876, 2152,
-    2553, 2428, 2091, 2069, 2066, 1520, 887, 1098,
-    1656, 1132, 0, 0, 782, 1984, 1924, 1117,
-    690, 1029, 1618, 1893, 1959, 2147, 2351, 2330,
-    2206, 2379, 3157, 4095, 4095, 3062, 2159, 2793,
-    3897, 3778, 2732, 2273, 2711, 2971, 2487, 2018,
-    2130, 2013, 1044, 328, 923, 1791, 1414, 226,
-    0, 708, 1938, 2310, 1670, 958, 958, 1461,
-    1879, 2035, 2162, 2506, 2870, 2767, 2466, 2936,
-    4064, 4095, 3409, 2348, 2278, 2767, 2907, 2584,
-    2334, 2371, 2327, 2100, 2069, 2158, 1901, 1584,
-    1772, 1935, 1261, 335, 403, 1472, 2281, 1965,
-    1120, 944, 1561, 2033, 1989, 1946, 2085, 2015,
-    1628, 1297, 1503, 2326, 2936, 2317, 964, 610,
-    1793, 3007, 2766, 1557, 1113, 1967, 2741, 2447
-  },
-  {
-    2048, 2391, 2614, 1962, 1390, 2084, 3441, 3798,
-    2733, 1749, 2349, 3933, 4095, 3601, 2245, 1678,
-    1949, 2480, 2673, 2383, 2069, 2045, 1963, 1657,
-    1630, 2067, 2213, 1389, 126, 0, 478, 1190,
-    807, 179, 564, 1450, 1580, 1095, 969, 1325,
-    1647, 1798, 1949, 2078, 2078, 2176, 2736, 3459,
-    3495, 2877, 2778, 3608, 4095, 3832, 3049, 2830,
-    3286, 3873, 3912, 3170, 2242, 1891, 2097, 2250,
-    2048, 1830, 1948, 1965, 1182, 208, 570, 2072,
-    2449, 693, 0, 0, 845, 2027, 1506, 582,
-    844, 1928, 2383, 1996, 1740, 1958, 2133, 2012,
-    1906, 2171, 2762, 3132, 2879, 2533, 2914, 3805,
-    4095, 3243, 1950, 1562, 2441, 3329, 3017, 2076,
-    1754, 2015, 2102, 2047, 2244, 2409, 2068, 1514,
-    1479, 1988, 2180, 1686, 1404, 1975, 2465, 1917,
-    1062, 1061, 1753, 2291, 2407, 2322, 2217, 2143,
-    2048, 1917, 1853, 1872, 1843, 1611, 1109, 674,
-    1004, 2023, 2508, 1904, 1355, 1759, 2273, 1890,
-    1114, 1014, 1626, 2105, 2060, 1990, 2239, 2366,
-    2228, 2562, 3518, 3922, 3105, 2107, 2178, 3174,
-    3968, 3797, 3010, 2570, 2795, 3051, 2841, 2406,
-    2157, 2164, 2183, 1932, 1602, 1703, 1995, 1593,
-    632, 402, 1233, 1703, 667, 0, 0, 882,
-    2436, 1965, 539, 279, 1239, 1921, 1852, 1776,
-    2048, 2247, 2081, 1919, 2319, 3168, 3686, 3445,
-    2847, 2530, 2827, 3508, 3758, 3148, 2545, 2893,
-    3591, 3482, 2690, 2150, 2095, 2087, 1943, 1859,
-    1850, 1637, 1317, 1517, 2233, 2422, 1719, 1252,
-    1659, 1911, 1215, 442, 674, 1620, 2200, 2001,
-    1621, 1677, 1967, 2049, 2087, 2327, 2405, 1960,
-    1272, 921, 1332, 2380, 3036, 2331, 957, 652,
-    1807, 2930, 2695, 1612, 1229, 1978, 2645, 2391
-  },
-  {
-    2048, 2334, 2522, 1976, 1490, 2079, 3258, 3593,
-    2665, 1773, 2333, 3889, 4095, 3697, 2269, 1604,
-    1919, 2679, 3113, 2768, 2118, 2017, 2415, 2552,
-    2260, 2045, 2060, 1896, 1377, 998, 1204, 1514,
-    1170, 558, 718, 1443, 1509, 781, 350, 647,
-    1021, 1071, 1139, 1531, 1928, 1784, 1177, 880,
-    1264, 1772, 1926, 2007, 2266, 2439, 2386, 2410,
-    2792, 3438, 3834, 3414, 2357, 1705, 2214, 3417,
-    4094, 3520, 2379, 2228, 3421, 4095, 3464, 2029,
-    1806, 2675, 3147, 2715, 2168, 2047, 1957, 1561,
-    1396, 1948, 2471, 1943, 827, 498, 1262, 2186,
-    2411, 1809, 922, 606, 1091, 1557, 1271, 647,
-    593, 1304, 2100, 2265, 1910, 1752, 1973, 2052,
-    1898, 2005, 2283, 2056, 1407, 1270, 2012, 2828,
-    2791, 2119, 1898, 2432, 2701, 2118, 1653, 2168,
-    2934, 2918, 2303, 1839, 1742, 1817, 1905, 1968,
-    2048, 2156, 2211, 2195, 2221, 2422, 2863, 3260,
-    2987, 2070, 1612, 2188, 2750, 2353, 1795, 2236,
-    3268, 3558, 2766, 1923, 2007, 2675, 2881, 2459,
-    2139, 2121, 1934, 1615, 1678, 2021, 1977, 1347,
-    690, 653, 1185, 1519, 1188, 713, 799, 1352,
-    1768, 1592, 799, 53, 282, 1342, 1981, 1671,
-    1281, 1501, 1912, 2039, 2186, 2693, 3057, 2588,
-    1814, 2110, 3494, 4095, 3331, 2323, 2700, 3882,
-    4095, 3396, 2161, 1766, 2478, 3411, 3618, 3112,
-    2529, 2271, 2311, 2368, 2218, 2019, 1965, 1767,
-    1212, 861, 1236, 1839, 1861, 1367, 1080, 1309,
-    1542, 1252, 897, 1342, 2261, 2426, 1753, 1413,
-    1772, 1963, 1600, 1328, 1568, 1949, 2059, 2054,
-    2265, 2525, 2397, 2065, 2176, 2648, 2657, 1920,
-    1034, 696, 1245, 2400, 3050, 2324, 1016, 763,
-    1831, 2827, 2610, 1674, 1353, 1989, 2548, 2334
-  },
-  {
-    2048, 2277, 2428, 1990, 1595, 2073, 3049, 3342,
-    2572, 1810, 2299, 3712, 4095, 3626, 2267, 1589,
-    1909, 2769, 3349, 2999, 2150, 1997, 2763, 3291,
-    2819, 2024, 1903, 2466, 2932, 2799, 2368, 2132,
-    2048, 1862, 1745, 1856, 1832, 1442, 1103, 1156,
-    1308, 1252, 1212, 1508, 1905, 1682, 615, 0,
-    1, 1020, 1235, 461, 0, 472, 1211, 1424,
-    1100, 697, 708, 1259, 1913, 2154, 2014, 1912,
-    2048, 2193, 2114, 2104, 2644, 3339, 3110, 2029,
-    1740, 3127, 4095, 4095, 3180, 2068, 2650, 3863,
-    3750, 2248, 1351, 2193, 3506, 3666, 2770, 1935,
-    1786, 2199, 2674, 2737, 2430, 2203, 2224, 2222,
-    2048, 1929, 2068, 2203, 1867, 1232, 1199, 2013,
-    2590, 2151, 1589, 2033, 2980, 3075, 2091, 1155,
-    1243, 1973, 2195, 1680, 1441, 1984, 2396, 1944,
-    1293, 1318, 1836, 2218, 2295, 2234, 2162, 2111,
-    2048, 1960, 1917, 1928, 1907, 1741, 1373, 1032,
-    1249, 2028, 2432, 1921, 1395, 1755, 2298, 1853,
-    727, 320, 1170, 2212, 2107, 1013, 427, 1035,
-    1715, 1412, 760, 855, 1561, 2029, 2021, 1936,
-    2048, 2221, 2244, 2215, 2391, 2686, 2742, 2490,
-    2249, 2419, 3196, 4095, 4095, 3026, 2157, 2808,
-    4050, 4086, 2953, 2398, 3348, 4095, 4095, 2977,
-    1750, 2109, 3132, 3289, 2604, 2133, 2179, 2229,
-    2048, 1914, 2025, 2135, 1861, 1261, 870, 1014,
-    1435, 1663, 1397, 758, 436, 929, 1494, 1001,
-    0, 0, 711, 1758, 1825, 1337, 1158, 1447,
-    1683, 1541, 1408, 1710, 2133, 2168, 1981, 1969,
-    2048, 2061, 2217, 2563, 2680, 2320, 1914, 2105,
-    2836, 3225, 2727, 2076, 2234, 2841, 2792, 1901,
-    951, 652, 1252, 2385, 2978, 2298, 1136, 936,
-    1864, 2700, 2513, 1742, 1484, 2000, 2449, 2277
-  },
-  {
-    2048, 2220, 2334, 2004, 1704, 2067, 2818, 3053,
-    2460, 1858, 2251, 3414, 4031, 3396, 2240, 1636,
-    1919, 2736, 3335, 3028, 2158, 1991, 2907, 3645,
-    3117, 2011, 1802, 2860, 4086, 4095, 3365, 2704,
-    2925, 3282, 2971, 2401, 2313, 2568, 2620, 2422,
-    2252, 2173, 2097, 2033, 2032, 1982, 1693, 1304,
-    1264, 1583, 1622, 1093, 632, 815, 1302, 1412,
-    933, 196, 0, 488, 1712, 2406, 1877, 671,
-    1, 568, 1709, 1859, 557, 0, 319, 2073,
-    2409, 947, 0, 0, 1270, 2035, 1732, 1227,
-    1396, 1984, 2220, 2022, 1893, 2003, 2090, 2030,
-    1975, 2111, 2427, 2640, 2519, 2335, 2587, 3208,
-    3502, 2962, 1965, 1594, 2464, 3628, 3486, 2101,
-    1295, 1914, 2598, 2064, 1043, 989, 2005, 2899,
-    2791, 2114, 1918, 2362, 2555, 2100, 1766, 2130,
-    2640, 2614, 2210, 1917, 1860, 1907, 1962, 2000,
-    2048, 2113, 2146, 2137, 2154, 2281, 2567, 2837,
-    2675, 2063, 1737, 2152, 2593, 2298, 1828, 2222,
-    3268, 3696, 2916, 1879, 1984, 3221, 3994, 3348,
-    2509, 3013, 4095, 4095, 3169, 2103, 2157, 2910,
-    3405, 3203, 2647, 2357, 2471, 2597, 2469, 2233,
-    2103, 2106, 2115, 1990, 1824, 1873, 2020, 1808,
-    1281, 1126, 1573, 1837, 1154, 17, 0, 1100,
-    2397, 1964, 283, 0, 655, 1759, 1382, 204,
-    0, 692, 1932, 2342, 1581, 491, 132, 630,
-    1328, 1655, 1467, 1039, 941, 1374, 1757, 1575,
-    1212, 1292, 1716, 1996, 2024, 2028, 2100, 2143,
-    2148, 2260, 2435, 2338, 1942, 1826, 2252, 2573,
-    2323, 2152, 2746, 3548, 3505, 2575, 1821, 2134,
-    3142, 3559, 2864, 2080, 2248, 2864, 2784, 1908,
-    1034, 795, 1352, 2336, 2826, 2253, 1312, 1163,
-    1903, 2555, 2406, 1814, 1620, 2012, 2350, 2220
-  },
-  {
-    2048, 2162, 2239, 2018, 1817, 2061, 2571, 2735,
-    2332, 1916, 2190, 3018, 3473, 3030, 2190, 1738,
-    1949, 2585, 3073, 2846, 2140, 1999, 2806, 3502,
-    3055, 2012, 1798, 2909, 4095, 4095, 3680, 2913,
-    3288, 3935, 3590, 2702, 2599, 3294, 3674, 3370,
-    3014, 2978, 2933, 2572, 2176, 2355, 3177, 3803,
-    3495, 2741, 2573, 3035, 3287, 2966, 2522, 2392,
-    2561, 2764, 2748, 2454, 2116, 1994, 2064, 2115,
-    2048, 1975, 2014, 2019, 1744, 1382, 1493, 2057,
-    2214, 1451, 509, 482, 1366, 2035, 1658, 822,
-    844, 1898, 2597, 1926, 735, 474, 1281, 2179,
-    2390, 1822, 969, 628, 1067, 1516, 1146, 273,
-    0, 841, 2149, 2578, 1584, 370, 585, 1996,
-    2756, 2169, 1562, 2033, 2887, 2910, 2081, 1383,
-    1479, 1997, 2143, 1819, 1683, 2010, 2245, 1990,
-    1639, 1660, 1937, 2135, 2174, 2142, 2105, 2080,
-    2048, 2004, 1982, 1987, 1976, 1890, 1695, 1508,
-    1615, 2037, 2265, 1974, 1655, 1865, 2210, 1916,
-    1114, 762, 1356, 2185, 2101, 1041, 329, 863,
-    1613, 1105, 0, 0, 800, 1983, 1912, 910,
-    127, 281, 1047, 1476, 1166, 733, 851, 1391,
-    1784, 1613, 829, 23, 149, 1226, 1961, 1482,
-    632, 672, 1462, 1829, 1265, 533, 635, 1534,
-    2209, 2015, 1481, 1408, 1764, 2004, 1982, 1957,
-    2048, 2114, 2059, 2003, 2143, 2453, 2663, 2596,
-    2379, 2260, 2417, 2799, 3016, 2744, 2406, 2754,
-    3591, 3831, 3101, 2291, 2248, 2738, 2991, 2750,
-    2524, 2799, 3150, 2742, 1829, 1638, 2389, 2851,
-    2436, 2185, 2913, 3805, 3668, 2608, 1817, 2132,
-    3078, 3425, 2768, 2075, 2215, 2713, 2634, 1939,
-    1272, 1106, 1533, 2258, 2607, 2193, 1531, 1433,
-    1948, 2394, 2291, 1890, 1760, 2024, 2249, 2162
-  },
-  {
-    2048, 2105, 2143, 2033, 1932, 2054, 2312, 2396,
-    2192, 1980, 2121, 2551, 2793, 2565, 2123, 1882,
-    1994, 2341, 2615, 2495, 2100, 2020, 2490, 2908,
-    2654, 2026, 1892, 2594, 3514, 3739, 3149, 2645,
-    2925, 3416, 3196, 2548, 2482, 3061, 3413, 3196,
-    2917, 2917, 2909, 2579, 2184, 2389, 3368, 4095,
-    3938, 3011, 2828, 3622, 4095, 3770, 3023, 2835,
-    3362, 4095, 4095, 3707, 2396, 1681, 2219, 3427,
-    4094, 3530, 2389, 2240, 3598, 4095, 3939, 2019,
-    1621, 3410, 4095, 4095, 3221, 2068, 2626, 3750,
-    3621, 2232, 1405, 2183, 3439, 3644, 2793, 1924,
-    1740, 2243, 2953, 3201, 2820, 2454, 2719, 3335,
-    3502, 2881, 1979, 1697, 2347, 3111, 2958, 2079,
-    1621, 1976, 2331, 2056, 1572, 1565, 2029, 2411,
-    2355, 2074, 1997, 2168, 2238, 2067, 1946, 2077,
-    2256, 2244, 2103, 2003, 1984, 2000, 2019, 2032,
-    2048, 2069, 2080, 2078, 2084, 2127, 2226, 2321,
-    2268, 2053, 1935, 2086, 2252, 2144, 1961, 2118,
-    2553, 2751, 2430, 1970, 2017, 2626, 3049, 2749,
-    2309, 2624, 3428, 3604, 2854, 2090, 2139, 2833,
-    3405, 3329, 2793, 2485, 2742, 3116, 3052, 2617,
-    2285, 2453, 3232, 4095, 4062, 2961, 2148, 2746,
-    3897, 3959, 2917, 2395, 3395, 4095, 4095, 3220,
-    1635, 2142, 3978, 4095, 3496, 2342, 2719, 3896,
-    4095, 3406, 2164, 1747, 2533, 3703, 4095, 3653,
-    2897, 2533, 2807, 3457, 3716, 3158, 2579, 3029,
-    4064, 4095, 3279, 2318, 2260, 2748, 2965, 2704,
-    2476, 2700, 2973, 2612, 1875, 1734, 2302, 2630,
-    2323, 2143, 2632, 3208, 3096, 2403, 1904, 2099,
-    2667, 2862, 2468, 2063, 2143, 2420, 2372, 1988,
-    1628, 1543, 1774, 2158, 2340, 2123, 1781, 1732,
-    1997, 2223, 2170, 1968, 1903, 2036, 2149, 2105
-  },
-  {
-    2048, 2081, 2108, 2062, 2033, 2108, 2213, 2231,
-    2171, 2169, 2313, 2495, 2523, 2399, 2282, 2198,
-    2086, 2082, 2304, 2509, 2430, 2273, 2364, 2557,
-    2495, 2238, 2211, 2647, 3262, 3494, 3182, 2884,
-    3081, 3340, 3015, 2465, 2546, 3166, 3465, 3191,
-    2875, 2836, 2831, 2605, 2347, 2539, 3295, 3937,
-    3765, 3197, 3214, 3747, 3836, 3319, 3028, 3351,
-    3799, 3942, 3782, 3381, 2828, 2390, 2345, 2780,
-    3431, 3666, 3188, 2747, 3186, 3917, 3676, 2669,
-    2404, 3379, 4095, 4095, 3542, 2912, 2971, 3195,
-    2856, 2177, 2097, 2766, 3226, 2929, 2452, 2338,
-    2369, 2329, 2435, 2739, 2953, 2972, 2976, 3055,
-    3070, 2820, 2318, 1989, 2255, 2794, 2819, 2258,
-    1859, 1983, 2135, 1924, 1650, 1723, 2062, 2302,
-    2263, 2109, 2092, 2194, 2176, 2011, 1965, 2133,
-    2271, 2208, 2073, 2013, 2010, 2007, 2008, 2025,
-    2048, 2062, 2073, 2093, 2113, 2126, 2178, 2283,
-    2302, 2132, 1953, 2000, 2163, 2178, 2096, 2181,
-    2443, 2593, 2437, 2158, 2152, 2515, 2813, 2693,
-    2533, 2857, 3355, 3288, 2694, 2318, 2490, 2851,
-    3034, 3022, 2962, 2951, 2919, 2748, 2575, 2643,
-    2816, 2840, 2969, 3484, 3859, 3453, 2747, 2699,
-    3236, 3489, 3234, 3128, 3642, 4095, 4095, 3247,
-    2351, 2675, 3676, 3893, 3199, 2870, 3422, 3924,
-    3615, 2867, 2387, 2435, 2850, 3295, 3533, 3569,
-    3399, 2991, 2695, 2959, 3443, 3394, 2993, 3131,
-    3787, 3963, 3300, 2558, 2412, 2676, 2811, 2651,
-    2532, 2756, 2984, 2622, 1895, 1703, 2209, 2582,
-    2419, 2303, 2653, 3027, 2911, 2454, 2158, 2257,
-    2522, 2573, 2384, 2295, 2416, 2406, 2088, 1777,
-    1737, 1830, 1894, 1984, 2097, 2096, 1974, 1898,
-    1956, 2060, 2088, 2032, 2001, 2056, 2110, 2082
-  },
-  {
-    2048, 1781, 1533, 1328, 1188, 1124, 1143, 1240,
-    1403, 1614, 1851, 2091, 2309, 2484, 2597, 2633,
-    2583, 2447, 2234, 1964, 1663, 1365, 1105, 912,
-    811, 812, 918, 1116, 1384, 1696, 2022, 2334,
-    2610, 2832, 2990, 3078, 3096, 3046, 2937, 2779,
-    2588, 2381, 2175, 1988, 1831, 1709, 1621, 1557,
-    1503, 1443, 1361, 1248, 1094, 899, 665, 395,
-    95, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 166, 384, 583, 766,
-    938, 1107, 1283, 1476, 1697, 1953, 2250, 2587,
-    2956, 3344, 3735, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 3719, 3312, 2947, 2640, 2399, 2226, 2113,
-    2048, 2012, 1986, 1950, 1884, 1773, 1608, 1389,
-    1126, 836, 546, 284, 83, 0, 0, 59,
-    274, 587, 976, 1413, 1868, 2312, 2719, 3070,
-    3346, 3538, 3638, 3645, 3564, 3409, 3198, 2956,
-    2709, 2483, 2299, 2168, 2094, 2069, 2080, 2107,
-    2131, 2132, 2096, 2015, 1884, 1704, 1477, 1212,
-    917, 605, 291, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    195, 562, 935, 1298, 1639, 1951, 2228, 2469,
-    2677, 2855, 3015, 3168, 3329, 3511, 3729, 3991,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 3769, 3464, 3233, 3077, 2987, 2951,
-    2950, 2961, 2963, 2934, 2858, 2727, 2540, 2308
-  },
-  {
-    2048, 1952, 1949, 1768, 1386, 1123, 1378, 2211,
-    3175, 3594, 3098, 1985, 1073, 1108, 2177, 3602,
-    4095, 4052, 2791, 1493, 964, 1374, 2192, 2654,
-    2372, 1590, 934, 876, 1388, 2030, 2357, 2278,
-    2048, 1963, 2047, 2045, 1726, 1193, 892, 1244,
-    2221, 3244, 3550, 2777, 1292, 0, 0, 118,
-    983, 1287, 636, 0, 0, 0, 0, 779,
-    1546, 1488, 916, 452, 518, 1050, 1650, 1981,
-    2048, 2115, 2382, 2741, 2875, 2608, 2181, 2155,
-    2966, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 3621, 2562, 2500, 3327,
-    4095, 4095, 4095, 3627, 2872, 2516, 2453, 2357,
-    2048, 1668, 1511, 1672, 1890, 1743, 1060, 167,
-    0, 121, 1263, 2408, 2778, 2135, 981, 181,
-    286, 1100, 1823, 1683, 543, 0, 0, 0,
-    0, 565, 1406, 1588, 1422, 1356, 1574, 1898,
-    2048, 1971, 1925, 2214, 2846, 3444, 3531, 2971,
-    2159, 1763, 2181, 3173, 3984, 3916, 2897, 1582,
-    883, 1282, 2447, 3481, 3584, 2644, 1282, 365,
-    373, 1108, 1940, 2337, 2229, 1947, 1840, 1956,
-    2048, 1886, 1553, 1420, 1810, 2663, 3513, 3854,
-    3587, 3151, 3191, 3999, 4095, 4095, 4095, 4095,
-    3032, 2330, 2796, 4021, 4095, 4095, 4095, 3178,
-    2396, 2381, 2873, 3295, 3253, 2807, 2325, 2091,
-    2048, 1899, 1453, 865, 538, 744, 1328, 1772,
-    1624, 918, 212, 166, 965, 2085, 2614, 1931,
-    204, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 808, 1588, 1863, 1805, 1795,
-    2048, 2419, 2597, 2452, 2221, 2322, 2954, 3842,
-    4095, 4095, 3540, 2958, 3201, 4095, 4095, 4095,
-    4095, 4095, 3278, 2418, 2608, 3384, 3934, 3743,
-    2950, 2165, 1934, 2315, 2887, 3143, 2906, 2416
-  },
-  {
-    2048, 2249, 2630, 3002, 3260, 3501, 3941, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4049, 4012, 4008, 3770, 3277, 2720, 2299,
-    2048, 1828, 1484, 998, 506, 139, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 970, 2325, 2665, 2012, 1093,
-    817, 1633, 3210, 4095, 4095, 4095, 3150, 1878,
-    1285, 1384, 1706, 1717, 1236, 549, 159, 400,
-    1194, 2129, 2764, 2912, 2708, 2426, 2253, 2169,
-    2048, 1826, 1593, 1502, 1589, 1683, 1506, 908,
-    47, 0, 0, 0, 0, 102, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 276, 753, 1285, 1720,
-    2048, 2395, 2870, 3414, 3810, 3864, 3601, 3308,
-    3340, 3843, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 3704, 3989, 4095,
-    4095, 4095, 4095, 4051, 2637, 2334, 3235, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 3282, 2286, 2136, 2589, 3105, 3255,
-    2981, 2548, 2276, 2280, 2418, 2463, 2320, 2109
-  },
-  {
-    2048, 1981, 2022, 2010, 1837, 1586, 1497, 1768,
-    2349, 2925, 3133, 2858, 2376, 2189, 2660, 3701,
-    4095, 4095, 4095, 3995, 3304, 3429, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 3832, 3750, 3782, 3652, 3274, 2774, 2342,
-    2048, 1790, 1424, 922, 427, 127, 60, 23,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 24, 0, 0, 0,
-    0, 0, 22, 745, 854, 467, 36, 0,
-    431, 1118, 1677, 1894, 1833, 1725, 1753, 1908,
-    2048, 2060, 1990, 1997, 2183, 2459, 2576, 2336,
-    1788, 1254, 1108, 1472, 2077, 2413, 2102, 1214,
-    260, 0, 244, 1107, 1727, 1510, 430, 0,
-    0, 0, 0, 788, 1040, 227, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 40, 66, 241, 660, 1203, 1688,
-    2048, 2376, 2811, 3365, 3880, 4095, 4095, 4066,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 3805, 3597, 3930, 4095, 4095,
-    4026, 3378, 2835, 2600, 2608, 2634, 2512, 2264
-  },
-  {
-    2048, 1979, 2009, 1964, 1767, 1541, 1505, 1758,
-    2132, 2275, 1927, 1182, 498, 415, 1153, 2399,
-    3472, 3777, 3230, 2333, 1819, 2110, 2990, 3747,
-    3706, 2764, 1532, 945, 1611, 3353, 4095, 4095,
-    4095, 4095, 3789, 3389, 3945, 4095, 4095, 4095,
-    3758, 2753, 2668, 3694, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4055, 3294,
-    2817, 2815, 3125, 3395, 3363, 3026, 2587, 2249,
-    2048, 1864, 1579, 1221, 950, 892, 965, 883,
-    359, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 25, 0, 0, 0,
-    0, 0, 272, 531, 159, 0, 0, 0,
-    112, 1003, 1620, 1819, 1749, 1675, 1747, 1917,
-    2048, 2087, 2137, 2350, 2744, 3124, 3204, 2846,
-    2219, 1720, 1692, 2143, 2708, 2905, 2525, 1832,
-    1408, 1721, 2721, 3800, 4095, 3433, 1879, 361,
-    0, 227, 1372, 2263, 2247, 1378, 370, 51,
-    733, 1941, 2725, 2320, 702, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    265, 688, 265, 0, 0, 0, 0, 0,
-    349, 696, 720, 703, 872, 1233, 1620, 1885,
-    2048, 2262, 2651, 3160, 3571, 3694, 3553, 3408,
-    3559, 4089, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 3630, 3510, 3867, 4095, 4095,
-    3651, 3107, 2795, 2789, 2907, 2897, 2658, 2307
-  },
-  {
-    2048, 1872, 1766, 1689, 1616, 1562, 1560, 1621,
-    1701, 1715, 1605, 1390, 1179, 1103, 1224, 1486,
-    1746, 1869, 1832, 1740, 1752, 1968, 2344, 2724,
-    2953, 2991, 2957, 3045, 3380, 3923, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4063,
-    3723, 3511, 3391, 3280, 3110, 2869, 2590, 2314,
-    2048, 1762, 1431, 1059, 683, 332, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    50, 538, 940, 1218, 1401, 1552, 1714, 1886,
-    2048, 2191, 2340, 2527, 2752, 2966, 3097, 3104,
-    3013, 2909, 2869, 2903, 2942, 2891, 2712, 2471,
-    2305, 2325, 2529, 2785, 2913, 2805, 2509, 2198,
-    2051, 2125, 2315, 2419, 2288, 1922, 1470, 1113,
-    925, 814, 584, 80, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 138, 382, 682, 1035, 1400, 1738,
-    2048, 2359, 2699, 3058, 3393, 3664, 3881, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4019, 3703, 3441, 3199, 2929, 2620, 2307
-  },
-  {
-    2048, 2324, 2624, 2954, 3284, 3568, 3796, 4005,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 3881, 3732,
-    3693, 3578, 3283, 2863, 2500, 2370, 2510, 2788,
-    2985, 2945, 2673, 2325, 2089, 2063, 2189, 2312,
-    2292, 2097, 1816, 1580, 1463, 1441, 1421, 1321,
-    1138, 950, 855, 909, 1092, 1337, 1585, 1816,
-    2048, 2293, 2541, 2762, 2946, 3128, 3378, 3746,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4031, 3757, 3452, 3099, 2725, 2371,
-    2048, 1733, 1398, 1043, 710, 449, 268, 119,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 62, 277, 623, 1009, 1254, 1223, 941,
-    599, 434, 584, 993, 1456, 1759, 1818, 1730,
-    1683, 1824, 2153, 2532, 2794, 2860, 2799, 2761,
-    2873, 3137, 3439, 3623, 3604, 3411, 3161, 2970,
-    2880, 2853, 2815, 2720, 2581, 2438, 2318, 2203,
-    2048, 1821, 1537, 1244, 981, 748, 506, 225,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 108, 359, 569, 812, 1113, 1444, 1762
-  },
-  {
-    2048, 2136, 2184, 2258, 2362, 2450, 2495, 2543,
-    2698, 3031, 3494, 3907, 4050, 3808, 3252, 2597,
-    2059, 1711, 1452, 1102, 565, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 427,
-    900, 1324, 1741, 2214, 2763, 3334, 3848, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 3382, 2375, 1392, 392,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 195, 503, 850, 1247, 1656,
-    2048, 2448, 2907, 3435, 3967, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 3718, 2480, 1360,
-    481, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    1, 806, 1558, 2292, 3019, 3707, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4046, 3131, 2308, 1533, 749,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 74, 551, 1028, 1482, 1838
-  },
-  {
-    2048, 1652, 1202, 705, 224, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 1214, 2449, 3595, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 3911, 3359, 2788, 2223, 1730, 1342,
-    1019, 683, 285, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 236, 1269, 2189, 2856, 3287,
-    3595, 3868, 4095, 4095, 4063, 3715, 3216, 2650,
-    2048, 1375, 591, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 386, 1403, 2358, 3256, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 3807, 3002, 2267, 1658, 1199,
-    849, 542, 257, 54, 38, 267, 673, 1087,
-    1334, 1350, 1222, 1104, 1090, 1126, 1049, 726,
-    188, 0, 0, 0, 282, 1093, 1794, 2245,
-    2504, 2743, 3095, 3544, 3939, 4095, 4046, 3813,
-    3592, 3498, 3518, 3536, 3436, 3179, 2817, 2428
-  },
-  {
-    2048, 824, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 661, 1505, 2315, 3100, 3819, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 3826, 3648,
-    3469, 3194, 2815, 2426, 2146, 2043, 2107, 2294,
-    2591, 3033, 3661, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 3630, 2887,
-    2048, 1109, 133, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 354, 1368, 2393, 3450, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 3514,
-    3057, 2966, 3065, 3137, 3087, 2988, 3006, 3240,
-    3624, 3948, 4002, 3708, 3173, 2605, 2182, 1954,
-    1859, 1803, 1751, 1735, 1808, 1977, 2194, 2399,
-    2590, 2832, 3206, 3724, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 3196
-  },
-  {
-    2048, 1477, 923, 367, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 223, 940, 1648, 2184, 2491, 2611,
-    2612, 2516, 2290, 1898, 1357, 736, 105, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 774, 1727, 2702, 3715,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4050, 2990,
-    2048, 1224, 481, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 174, 807,
-    1142, 1166, 1034, 944, 978, 1044, 964, 629,
-    117, 0, 0, 0, 571, 1314, 1898, 2238,
-    2420, 2586, 2817, 3071, 3233, 3221, 3048, 2808,
-    2590, 2413, 2220, 1944, 1572, 1160, 775, 428,
-    63, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 442, 1643, 2875, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
-    4095, 4095, 4095, 4095, 4095, 4095, 3458, 2696
-  },
-  {
-    1987, 2084, 2164, 2206, 2261, 2413, 2694, 3034,
-    3296, 3367, 3248, 3051, 2909, 2853, 2781, 2527,
-    2008, 1320, 710, 426, 552, 949, 1342, 1506,
-    1401, 1175, 1033, 1084, 1263, 1404, 1385, 1232,
-    1112, 1214, 1614, 2226, 2867, 3375, 3694, 3867,
-    3964, 4006, 3959, 3788, 3507, 3183, 2884, 2610,
-    2289, 1846, 1285, 729, 350, 262, 431, 704,
-    918, 1027, 1128, 1368, 1808, 2329, 2693, 2698,
-    2326, 1780, 1359, 1274, 1522, 1915, 2227, 2346,
-    2336, 2355, 2510, 2771, 2994, 3032, 2852, 2551,
-    2286, 2163, 2180, 2259, 2327, 2370, 2421, 2501,
-    2577, 2576, 2454, 2250, 2071, 2006, 2043, 2054,
-    1878, 1451, 867, 332, 27, 0, 107, 208,
-    231, 284, 575, 1246, 2243, 3308, 4095, 4095,
-    4095, 4095, 4032, 3954, 3931, 3821, 3535, 3119,
-    2706, 2412, 2246, 2115, 1902, 1565, 1157, 778,
-    494, 300, 155, 42, 6, 113, 382, 742,
-    1067, 1277, 1411, 1619, 2051, 2729, 3500, 4095,
-    4095, 4095, 4046, 3783, 3614, 3452, 3122, 2520,
-    1730, 1003, 607, 659, 1051, 1532, 1869, 1985,
-    1967, 1963, 2057, 2209, 2308, 2272, 2117, 1938,
-    1825, 1796, 1793, 1750, 1652, 1552, 1515, 1550,
-    1597, 1579, 1488, 1407, 1460, 1699, 2044, 2314,
-    2354, 2157, 1892, 1802, 2033, 2537, 3104, 3508,
-    3666, 3670, 3698, 3846, 4036, 4048, 3685, 2913,
-    1911, 960, 286, 0, 0, 0, 0, 0,
-    0, 147, 539, 957, 1333, 1674, 2033, 2442,
-    2863, 3202, 3389, 3436, 3433, 3474, 3572, 3638,
-    3555, 3291, 2949, 2712, 2705, 2888, 3052, 2955,
-    2488, 1760, 1030, 544, 377, 414, 461, 408,
-    315, 362, 697, 1307, 2009, 2557, 2796, 2743,
-    2546, 2367, 2278, 2242, 2188, 2087, 1981, 1939
-  },
-  {
-    1039, 1027, 1033, 1037, 1091, 1279, 1630, 2072,
-    2464, 2687, 2739, 2725, 2771, 2905, 3017, 2936,
-    2574, 2024, 1528, 1331, 1517, 1944, 2340, 2478,
-    2320, 2016, 1776, 1709, 1757, 1756, 1587, 1283,
-    1014, 971, 1234, 1723, 2254, 2669, 2915, 3034,
-    3099, 3131, 3097, 2959, 2732, 2482, 2273, 2105,
-    1904, 1591, 1168, 753, 518, 570, 873, 1271,
-    1597, 1802, 1979, 2275, 2746, 3274, 3619, 3578,
-    3135, 2494, 1955, 1731, 1825, 2052, 2188, 2131,
-    1946, 1798, 1799, 1925, 2035, 1988, 1752, 1429,
-    1176, 1099, 1197, 1389, 1600, 1810, 2049, 2332,
-    2619, 2831, 2916, 2907, 2904, 2991, 3150, 3247,
-    3121, 2703, 2088, 1482, 1069, 890, 832, 736,
-    544, 371, 432, 878, 1662, 2532, 3179, 3416,
-    3281, 2985, 2759, 2699, 2735, 2721, 2567, 2313,
-    2086, 1997, 2048, 2137, 2143, 2013, 1796, 1585,
-    1442, 1357, 1286, 1211, 1176, 1247, 1446, 1704,
-    1900, 1956, 1920, 1945, 2188, 2677, 3264, 3709,
-    3827, 3613, 3229, 2878, 2649, 2456, 2125, 1549,
-    811, 162, 0, 34, 558, 1180, 1666, 1933,
-    2065, 2206, 2436, 2712, 2921, 2977, 2896, 2770,
-    2689, 2670, 2656, 2579, 2427, 2254, 2126, 2054,
-    1981, 1834, 1605, 1382, 1292, 1391, 1602, 1747,
-    1675, 1382, 1041, 895, 1094, 1592, 2178, 2628,
-    2857, 2957, 3102, 3389, 3733, 3912, 3723, 3129,
-    2301, 1517, 997, 790, 788, 838, 859, 880,
-    983, 1211, 1522, 1827, 2061, 2234, 2405, 2611,
-    2821, 2948, 2928, 2779, 2599, 2489, 2466, 2445,
-    2313, 2039, 1728, 1562, 1664, 1990, 2326, 2427,
-    2176, 1673, 1173, 911, 958, 1189, 1406, 1491,
-    1501, 1612, 1969, 2562, 3205, 3657, 3764, 3549,
-    3166, 2782, 2476, 2220, 1948, 1639, 1342, 1132
-  },
-  {
-    1698, 1773, 1820, 1816, 1815, 1903, 2116, 2392,
-    2597, 2628, 2490, 2304, 2205, 2228, 2272, 2169,
-    1833, 1355, 971, 922, 1281, 1894, 2479, 2798,
-    2801, 2627, 2480, 2462, 2511, 2466, 2208, 1776,
-    1348, 1125, 1199, 1500, 1857, 2122, 2250, 2295,
-    2330, 2380, 2410, 2380, 2296, 2217, 2198, 2224,
-    2211, 2068, 1786, 1475, 1299, 1363, 1630, 1944,
-    2144, 2189, 2181, 2278, 2549, 2887, 3065, 2889,
-    2353, 1666, 1131, 962, 1157, 1527, 1841, 1982,
-    2007, 2066, 2260, 2552, 2792, 2830, 2629, 2287,
-    1964, 1769, 1707, 1708, 1706, 1696, 1719, 1805,
-    1925, 2010, 2017, 1983, 2010, 2181, 2472, 2743,
-    2823, 2630, 2245, 1862, 1651, 1641, 1709, 1686,
-    1512, 1300, 1266, 1568, 2165, 2818, 3229, 3226,
-    2861, 2359, 1962, 1777, 1742, 1715, 1608, 1457,
-    1384, 1491, 1769, 2102, 2355, 2461, 2455, 2417,
-    2397, 2382, 2320, 2194, 2048, 1959, 1955, 1980,
-    1926, 1730, 1454, 1267, 1336, 1700, 2220, 2658,
-    2831, 2730, 2511, 2367, 2375, 2435, 2358, 2023,
-    1500, 1023, 850, 1085, 1613, 2178, 2549, 2649,
-    2573, 2476, 2453, 2475, 2444, 2289, 2036, 1789,
-    1645, 1623, 1668, 1707, 1722, 1757, 1865, 2044,
-    2221, 2309, 2288, 2232, 2258, 2417, 2627, 2712,
-    2523, 2064, 1519, 1141, 1095, 1348, 1705, 1955,
-    2024, 2014, 2106, 2397, 2804, 3100, 3075, 2682,
-    2080, 1535, 1250, 1262, 1450, 1650, 1772, 1839,
-    1932, 2093, 2286, 2428, 2466, 2419, 2361, 2343,
-    2345, 2295, 2138, 1899, 1684, 1592, 1641, 1740,
-    1769, 1688, 1589, 1642, 1956, 2475, 2974, 3197,
-    3021, 2542, 2014, 1673, 1595, 1665, 1693, 1573,
-    1374, 1286, 1466, 1913, 2451, 2843, 2941, 2767,
-    2472, 2218, 2076, 2006, 1933, 1822, 1711, 1662
-  },
-  {
-    951, 1041, 1085, 1054, 1021, 1103, 1347, 1669,
-    1899, 1910, 1721, 1488, 1376, 1423, 1500, 1419,
-    1094, 642, 321, 349, 753, 1341, 1831, 2037,
-    1960, 1750, 1562, 1452, 1366, 1237, 1069, 945,
-    951, 1087, 1258, 1350, 1327, 1264, 1269, 1380,
-    1513, 1528, 1361, 1099, 939, 1036, 1369, 1732,
-    1872, 1675, 1249, 858, 734, 921, 1266, 1546,
-    1625, 1531, 1394, 1318, 1305, 1277, 1174, 1031,
-    951, 1020, 1222, 1444, 1575, 1591, 1567, 1596,
-    1677, 1700, 1527, 1134, 670, 385, 457, 862,
-    1374, 1722, 1768, 1592, 1406, 1385, 1534, 1707,
-    1733, 1556, 1274, 1043, 960, 994, 1037, 1015,
-    951, 937, 1038, 1229, 1416, 1527, 1581, 1669,
-    1851, 2065, 2134, 1893, 1335, 659, 170, 85,
-    396, 890, 1303, 1500, 1536, 1575, 1725, 1943,
-    2073, 1978, 1660, 1262, 960, 843, 868, 927,
-    951, 961, 1025, 1167, 1326, 1408, 1377, 1312,
-    1354, 1580, 1907, 2126, 2039, 1619, 1047, 603,
-    477, 654, 940, 1131, 1161, 1133, 1213, 1471,
-    1812, 2042, 2014, 1735, 1354, 1049, 908, 902,
-    951, 1013, 1113, 1284, 1493, 1630, 1585, 1354,
-    1076, 946, 1074, 1384, 1664, 1714, 1501, 1184,
-    992, 1051, 1290, 1503, 1517, 1324, 1085, 997,
-    1139, 1416, 1637, 1659, 1485, 1235, 1041, 957,
-    951, 979, 1052, 1225, 1522, 1860, 2071, 2010,
-    1671, 1215, 870, 775, 884, 1023, 1040, 933,
-    855, 983, 1356, 1820, 2126, 2104, 1784, 1371,
-    1096, 1056, 1176, 1291, 1286, 1169, 1031, 957,
-    951, 965, 974, 1026, 1205, 1538, 1928, 2188,
-    2167, 1868, 1455, 1139, 1023, 1036, 1006, 822,
-    548, 389, 540, 1025, 1653, 2139, 2287, 2105,
-    1769, 1482, 1334, 1279, 1213, 1092, 962, 905
-  },
-  {
-    1705, 1810, 1851, 1793, 1729, 1803, 2071, 2426,
-    2667, 2650, 2412, 2142, 2026, 2092, 2194, 2142,
-    1878, 1538, 1355, 1478, 1855, 2278, 2533, 2547,
-    2396, 2204, 2035, 1868, 1680, 1526, 1535, 1796,
-    2245, 2669, 2834, 2657, 2271, 1930, 1811, 1898,
-    2008, 1966, 1754, 1523, 1462, 1641, 1955, 2217,
-    2316, 2290, 2266, 2334, 2459, 2523, 2444, 2257,
-    2078, 1988, 1947, 1828, 1555, 1212, 1025, 1198,
-    1745, 2444, 2971, 3109, 2878, 2489, 2168, 2005,
-    1934, 1849, 1722, 1631, 1671, 1844, 2041, 2131,
-    2083, 1993, 1996, 2131, 2293, 2317, 2134, 1851,
-    1684, 1783, 2103, 2422, 2511, 2311, 1976, 1746,
-    1770, 1998, 2247, 2350, 2274, 2104, 1943, 1812,
-    1670, 1504, 1397, 1492, 1864, 2416, 2903, 3085,
-    2900, 2499, 2127, 1942, 1906, 1857, 1671, 1393,
-    1204, 1277, 1622, 2075, 2421, 2546, 2502, 2421,
-    2390, 2384, 2319, 2163, 1991, 1920, 1988, 2095,
-    2069, 1827, 1472, 1246, 1355, 1799, 2359, 2743,
-    2786, 2547, 2232, 2025, 1959, 1943, 1880, 1778,
-    1740, 1857, 2100, 2330, 2406, 2306, 2136, 2031,
-    2025, 2022, 1899, 1644, 1407, 1399, 1716, 2238,
-    2693, 2843, 2653, 2299, 2026, 1965, 2060, 2150,
-    2116, 1973, 1823, 1744, 1719, 1672, 1577, 1518,
-    1634, 1988, 2472, 2859, 2956, 2749, 2409, 2151,
-    2067, 2064, 1966, 1691, 1341, 1139, 1254, 1663,
-    2166, 2528, 2639, 2553, 2401, 2267, 2141, 1983,
-    1813, 1736, 1849, 2129, 2405, 2467, 2232, 1832,
-    1528, 1525, 1816, 2191, 2399, 2335, 2094, 1881,
-    1829, 1916, 2015, 2029, 1982, 1987, 2122, 2343,
-    2512, 2511, 2349, 2146, 2017, 1964, 1877, 1655,
-    1335, 1111, 1198, 1657, 2314, 2862, 3060, 2889,
-    2534, 2226, 2079, 2041, 1987, 1858, 1710, 1647
-  },
-  {
-    1144, 1198, 1236, 1220, 1256, 1498, 1990, 2580,
-    3014, 3122, 2948, 2697, 2556, 2538, 2499, 2288,
-    1909, 1529, 1341, 1403, 1593, 1730, 1729, 1658,
-    1647, 1748, 1886, 1951, 1934, 1974, 2238, 2746,
-    3301, 3592, 3419, 2835, 2106, 1518, 1195, 1071,
-    1019, 992, 1053, 1274, 1625, 1966, 2173, 2255,
-    2364, 2643, 3076, 3449, 3501, 3131, 2477, 1826,
-    1399, 1224, 1171, 1115, 1063, 1132, 1407, 1829,
-    2218, 2417, 2426, 2383, 2429, 2573, 2682, 2623,
-    2404, 2187, 2145, 2298, 2464, 2405, 2021, 1449,
-    964, 779, 913, 1222, 1552, 1858, 2191, 2580,
-    2940, 3119, 3034, 2771, 2536, 2481, 2566, 2577,
-    2302, 1726, 1061, 603, 523, 776, 1178, 1581,
-    1963, 2380, 2832, 3200, 3316, 3115, 2717, 2344,
-    2153, 2114, 2064, 1872, 1576, 1354, 1362, 1583,
-    1829, 1895, 1741, 1524, 1469, 1683, 2078, 2463,
-    2706, 2818, 2888, 2952, 2932, 2709, 2273, 1779,
-    1455, 1419, 1570, 1669, 1535, 1206, 921, 932,
-    1318, 1939, 2561, 3025, 3314, 3477, 3507, 3315,
-    2831, 2128, 1439, 1019, 968, 1161, 1361, 1415,
-    1373, 1414, 1672, 2096, 2486, 2665, 2620, 2502,
-    2475, 2571, 2672, 2636, 2436, 2180, 2004, 1932,
-    1854, 1648, 1325, 1058, 1048, 1351, 1804, 2147,
-    2226, 2111, 2030, 2171, 2533, 2940, 3191, 3203,
-    3032, 2762, 2401, 1897, 1248, 607, 235, 329,
-    867, 1593, 2194, 2507, 2599, 2661, 2815, 3011,
-    3087, 2937, 2613, 2279, 2058, 1930, 1775, 1516,
-    1222, 1063, 1161, 1467, 1789, 1956, 1962, 1964,
-    2128, 2464, 2797, 2915, 2746, 2427, 2187, 2161,
-    2286, 2380, 2302, 2060, 1775, 1545, 1360, 1148,
-    909, 781, 967, 1553, 2391, 3157, 3555, 3510,
-    3184, 2829, 2581, 2401, 2164, 1816, 1448, 1202
-  },
-  {
-    1925, 1987, 2037, 2030, 2087, 2379, 2938, 3577,
-    4008, 4060, 3804, 3468, 3236, 3108, 2955, 2685,
-    2367, 2173, 2208, 2399, 2553, 2539, 2413, 2363,
-    2529, 2862, 3172, 3307, 3296, 3312, 3486, 3756,
-    3894, 3697, 3168, 2517, 1999, 1727, 1646, 1657,
-    1757, 2044, 2579, 3251, 3804, 4014, 3875, 3595,
-    3425, 3440, 3489, 3352, 2942, 2387, 1919, 1686,
-    1669, 1770, 1951, 2282, 2827, 3495, 4031, 4095,
-    3856, 3301, 2843, 2698, 2822, 2999, 3038, 2922,
-    2758, 2633, 2515, 2313, 2030, 1824, 1908, 2356,
-    3005, 3555, 3790, 3733, 3585, 3526, 3555, 3514,
-    3265, 2837, 2405, 2130, 2020, 1959, 1854, 1773,
-    1899, 2352, 3045, 3709, 4087, 4095, 3946, 3756,
-    3596, 3363, 2942, 2375, 1873, 1658, 1780, 2087,
-    2371, 2544, 2685, 2914, 3234, 3491, 3522, 3319,
-    3071, 3005, 3182, 3441, 3524, 3300, 2864, 2435,
-    2170, 2058, 1994, 1936, 1977, 2245, 2744, 3288,
-    3627, 3647, 3473, 3352, 3437, 3649, 3745, 3534,
-    3032, 2435, 1947, 1640, 1475, 1427, 1580, 2054,
-    2846, 3729, 4095, 4095, 4095, 3589, 3154, 2933,
-    2832, 2696, 2486, 2300, 2249, 2320, 2381, 2328,
-    2214, 2227, 2517, 3033, 3531, 3760, 3659, 3396,
-    3207, 3191, 3247, 3196, 2970, 2671, 2458, 2387,
-    2361, 2244, 2030, 1884, 2007, 2447, 3035, 3516,
-    3751, 3802, 3831, 3907, 3919, 3679, 3119, 2392,
-    1780, 1490, 1521, 1726, 1974, 2266, 2682, 3223,
-    3730, 3979, 3863, 3510, 3189, 3093, 3188, 3257,
-    3105, 2732, 2320, 2068, 2025, 2094, 2168, 2258,
-    2472, 2868, 3331, 3627, 3592, 3289, 2979, 2914,
-    3137, 3451, 3591, 3433, 3059, 2642, 2283, 1965,
-    1659, 1444, 1506, 1980, 2784, 3620, 4095, 4095,
-    4031, 3737, 3527, 3366, 3117, 2724, 2293, 2000
-  },
-  {
-    1117, 1190, 1253, 1255, 1331, 1665, 2274, 2933,
-    3330, 3305, 2964, 2552, 2241, 2014, 1766, 1479,
-    1282, 1326, 1599, 1899, 1996, 1843, 1635, 1631,
-    1925, 2370, 2721, 2850, 2827, 2790, 2766, 2626,
-    2237, 1641, 1080, 811, 903, 1198, 1477, 1667,
-    1883, 2264, 2785, 3234, 3381, 3179, 2793, 2430,
-    2150, 1848, 1419, 930, 618, 693, 1149, 1751,
-    2236, 2511, 2678, 2865, 3054, 3086, 2829, 2351,
-    1891, 1661, 1666, 1723, 1652, 1461, 1331, 1421,
-    1704, 1986, 2103, 2083, 2115, 2351, 2733, 3031,
-    3045, 2777, 2407, 2101, 1865, 1577, 1177, 795,
-    677, 970, 1568, 2188, 2594, 2767, 2863, 3009,
-    3154, 3114, 2775, 2226, 1695, 1355, 1187, 1058,
-    907, 856, 1104, 1712, 2486, 3090, 3293, 3127,
-    2813, 2546, 2345, 2112, 1804, 1533, 1464, 1633,
-    1869, 1930, 1727, 1422, 1300, 1520, 1986, 2451,
-    2733, 2842, 2898, 2949, 2891, 2584, 2038, 1467,
-    1139, 1151, 1352, 1496, 1473, 1406, 1518, 1908,
-    2452, 2917, 3161, 3218, 3188, 3073, 2747, 2108,
-    1260, 527, 249, 531, 1175, 1844, 2318, 2594,
-    2782, 2923, 2935, 2732, 2377, 2080, 2022, 2176,
-    2305, 2168, 1744, 1261, 1006, 1094, 1405, 1735,
-    1989, 2229, 2534, 2852, 3006, 2864, 2498, 2159,
-    2059, 2181, 2288, 2137, 1700, 1186, 861, 839,
-    1049, 1375, 1794, 2366, 3076, 3715, 3966, 3636,
-    2834, 1923, 1265, 989, 979, 1051, 1142, 1323,
-    1650, 2041, 2319, 2386, 2341, 2398, 2670, 3025,
-    3174, 2917, 2326, 1687, 1277, 1163, 1220, 1308,
-    1418, 1633, 1980, 2323, 2461, 2326, 2084, 2016,
-    2271, 2723, 3066, 3059, 2705, 2198, 1730, 1347,
-    999, 697, 596, 878, 1557, 2395, 3041, 3286,
-    3189, 2978, 2823, 2694, 2448, 2022, 1538, 1203
-  },
-  {
-    1117, 1190, 1253, 1255, 1331, 1665, 2274, 2933,
-    3330, 3305, 2964, 2552, 2241, 2014, 1766, 1479,
-    1282, 1326, 1599, 1899, 1996, 1843, 1635, 1631,
-    1925, 2370, 2721, 2850, 2827, 2790, 2766, 2626,
-    2237, 1641, 1080, 811, 903, 1198, 1477, 1667,
-    1883, 2264, 2785, 3234, 3381, 3179, 2793, 2430,
-    2150, 1848, 1419, 930, 618, 693, 1149, 1751,
-    2236, 2511, 2678, 2865, 3054, 3086, 2829, 2351,
-    1891, 1661, 1666, 1723, 1652, 1461, 1331, 1421,
-    1704, 1986, 2103, 2083, 2115, 2351, 2733, 3031,
-    3045, 2777, 2407, 2101, 1865, 1577, 1177, 795,
-    677, 970, 1568, 2188, 2594, 2767, 2863, 3009,
-    3154, 3114, 2775, 2226, 1695, 1355, 1187, 1058,
-    907, 856, 1104, 1712, 2486, 3090, 3293, 3127,
-    2813, 2546, 2345, 2112, 1804, 1533, 1464, 1633,
-    1869, 1930, 1727, 1422, 1300, 1520, 1986, 2451,
-    2733, 2842, 2898, 2949, 2891, 2584, 2038, 1467,
-    1139, 1151, 1352, 1496, 1473, 1406, 1518, 1908,
-    2452, 2917, 3161, 3218, 3188, 3073, 2747, 2108,
-    1260, 527, 249, 531, 1175, 1844, 2318, 2594,
-    2782, 2923, 2935, 2732, 2377, 2080, 2022, 2176,
-    2305, 2168, 1744, 1261, 1006, 1094, 1405, 1735,
-    1989, 2229, 2534, 2852, 3006, 2864, 2498, 2159,
-    2059, 2181, 2288, 2137, 1700, 1186, 861, 839,
-    1049, 1375, 1794, 2366, 3076, 3715, 3966, 3636,
-    2834, 1923, 1265, 989, 979, 1051, 1142, 1323,
-    1650, 2041, 2319, 2386, 2341, 2398, 2670, 3025,
-    3174, 2917, 2326, 1687, 1277, 1163, 1220, 1308,
-    1418, 1633, 1980, 2323, 2461, 2326, 2084, 2016,
-    2271, 2723, 3066, 3059, 2705, 2198, 1730, 1347,
-    999, 697, 596, 878, 1557, 2395, 3041, 3286,
-    3189, 2978, 2823, 2694, 2448, 2022, 1538, 1203
-  },
-  {
-    1718, 1921, 1999, 1656, 1132, 1032, 1712, 2848,
-    3643, 3512, 2596, 1623, 1246, 1506, 1915, 2017,
-    1844, 1803, 2145, 2612, 2653, 2019, 1111, 688,
-    1190, 2308, 3242, 3398, 2864, 2229, 1969, 2022,
-    1965, 1564, 1094, 1081, 1711, 2557, 2915, 2470,
-    1625, 1150, 1483, 2345, 3029, 3067, 2612, 2185,
-    2096, 2139, 1883, 1234, 647, 732, 1629, 2782,
-    3379, 3061, 2216, 1596, 1624, 2069, 2372, 2248,
-    1953, 1942, 2320, 2666, 2456, 1648, 817, 673,
-    1391, 2432, 3022, 2838, 2248, 1891, 2042, 2394,
-    2450, 2085, 1692, 1745, 2251, 2681, 2470, 1618,
-    757, 605, 1314, 2340, 2962, 2917, 2559, 2405,
-    2574, 2687, 2333, 1581, 995, 1097, 1825, 2543,
-    2617, 2016, 1334, 1217, 1764, 2469, 2751, 2515,
-    2186, 2209, 2546, 2708, 2296, 1481, 909, 1099,
-    1922, 2684, 2761, 2163, 1491, 1343, 1761, 2265,
-    2393, 2177, 2070, 2401, 2954, 3126, 2538, 1473,
-    689, 746, 1508, 2285, 2490, 2151, 1804, 1902,
-    2355, 2664, 2482, 2010, 1796, 2145, 2747, 2934,
-    2340, 1301, 593, 739, 1553, 2355, 2620, 2417,
-    2233, 2394, 2701, 2669, 2100, 1381, 1161, 1710,
-    2604, 3073, 2700, 1796, 1093, 1072, 1566, 2017,
-    2081, 1946, 2065, 2586, 3118, 3090, 2358, 1432,
-    1049, 1496, 2335, 2804, 2518, 1780, 1244, 1274,
-    1656, 1913, 1860, 1810, 2187, 2986, 3642, 3514,
-    2517, 1276, 618, 874, 1639, 2210, 2240, 1983,
-    1918, 2192, 2465, 2316, 1768, 1353, 1601, 2477,
-    3320, 3416, 2637, 1569, 968, 1111, 1625, 1943,
-    1888, 1782, 2016, 2544, 2867, 2552, 1738, 1103,
-    1261, 2175, 3150, 3442, 2895, 2013, 1437, 1358,
-    1450, 1342, 1089, 1143, 1827, 2881, 3588, 3398,
-    2455, 1508, 1250, 1731, 2377, 2578, 2246, 1815
-  },
-  {
-    1956, 2312, 2492, 2158, 1587, 1440, 2075, 3103,
-    3686, 3310, 2251, 1289, 964, 1148, 1318, 1207,
-    1102, 1470, 2337, 3132, 3196, 2466, 1596, 1370,
-    1972, 2846, 3266, 3016, 2500, 2211, 2166, 1932,
-    1202, 279, 0, 514, 1825, 2970, 3298, 2911,
-    2460, 2438, 2721, 2794, 2395, 1846, 1708, 2128,
-    2613, 2496, 1639, 644, 310, 889, 1878, 2537,
-    2593, 2411, 2483, 2835, 2993, 2546, 1687, 1118,
-    1375, 2266, 3014, 2986, 2268, 1526, 1315, 1565,
-    1757, 1572, 1273, 1419, 2191, 3093, 3371, 2751,
-    1734, 1144, 1359, 2019, 2463, 2416, 2209, 2316,
-    2752, 2995, 2547, 1529, 660, 598, 1311, 2116,
-    2356, 2015, 1666, 1816, 2379, 2798, 2684, 2258,
-    2113, 2543, 3164, 3261, 2510, 1347, 574, 613,
-    1161, 1574, 1564, 1455, 1755, 2519, 3211, 3232,
-    2567, 1849, 1757, 2343, 2992, 3048, 2449, 1737,
-    1454, 1580, 1619, 1216, 628, 520, 1267, 2504,
-    3408, 3450, 2855, 2318, 2281, 2532, 2517, 2013,
-    1407, 1298, 1822, 2459, 2530, 1902, 1140, 958,
-    1517, 2286, 2609, 2356, 2002, 2057, 2485, 2743,
-    2396, 1643, 1184, 1516, 2413, 3111, 3038, 2338,
-    1674, 1530, 1760, 1837, 1500, 1087, 1183, 1941,
-    2834, 3122, 2577, 1723, 1337, 1707, 2410, 2796,
-    2657, 2373, 2410, 2734, 2807, 2177, 1045, 176,
-    210, 1065, 2032, 2466, 2362, 2242, 2514, 3006,
-    3170, 2727, 2032, 1745, 2140, 2771, 2886, 2175,
-    1096, 437, 583, 1209, 1704, 1825, 1894, 2338,
-    3102, 3601, 3299, 2321, 1415, 1285, 1930, 2673,
-    2829, 2339, 1732, 1513, 1639, 1648, 1264, 805,
-    906, 1822, 3065, 3773, 3486, 2550, 1755, 1582,
-    1830, 1959, 1751, 1543, 1806, 2530, 3118, 2944,
-    2015, 1030, 751, 1302, 2097, 2453, 2239, 1915
-  },
-  {
-    1964, 2362, 2559, 2189, 1568, 1414, 2067, 3059,
-    3526, 3046, 2033, 1276, 1149, 1327, 1288, 987,
-    936, 1584, 2708, 3521, 3425, 2621, 1903, 1856,
-    2309, 2599, 2335, 1808, 1611, 1918, 2247, 1998,
-    1166, 443, 549, 1503, 2603, 3140, 3062, 2903,
-    3077, 3364, 3157, 2203, 1000, 375, 684, 1474,
-    1982, 1920, 1700, 1887, 2497, 2950, 2717, 1961,
-    1425, 1673, 2496, 3112, 2972, 2281, 1721, 1683,
-    1882, 1764, 1217, 782, 1086, 2110, 3112, 3324,
-    2695, 1899, 1625, 1901, 2178, 2031, 1671, 1687,
-    2317, 3076, 3199, 2439, 1367, 825, 1111, 1751,
-    2065, 1899, 1721, 2001, 2610, 2919, 2518, 1731,
-    1353, 1830, 2779, 3352, 3069, 2250, 1598, 1445,
-    1472, 1203, 669, 468, 1120, 2420, 3528, 3741,
-    3144, 2457, 2266, 2453, 2438, 1916, 1254, 1094,
-    1614, 2272, 2351, 1722, 1001, 913, 1554, 2336,
-    2649, 2506, 2458, 2890, 3503, 3576, 2750, 1475,
-    615, 626, 1170, 1560, 1528, 1462, 1874, 2718,
-    3334, 3129, 2236, 1437, 1396, 2018, 2602, 2606,
-    2183, 1928, 2145, 2474, 2310, 1544, 781, 764,
-    1596, 2598, 2979, 2593, 2012, 1853, 2129, 2320,
-    2047, 1576, 1549, 2236, 3140, 3434, 2781, 1683,
-    980, 1029, 1443, 1618, 1441, 1379, 1878, 2749,
-    3283, 2983, 2126, 1531, 1738, 2479, 2991, 2808,
-    2197, 1776, 1790, 1858, 1476, 702, 214, 644,
-    1885, 3131, 3627, 3348, 2903, 2803, 2914, 2686,
-    1876, 935, 595, 1104, 1936, 2317, 2009, 1510,
-    1471, 1978, 2486, 2467, 2030, 1820, 2285, 3129,
-    3560, 3092, 2049, 1221, 1077, 1352, 1459, 1214,
-    1058, 1522, 2535, 3375, 3355, 2530, 1651, 1420,
-    1826, 2259, 2233, 1913, 1866, 2338, 2895, 2850,
-    2036, 1061, 736, 1277, 2114, 2503, 2272, 1916
-  },
-  {
-    1639, 1664, 1562, 1341, 1360, 1915, 2829, 3528,
-    3547, 2949, 2219, 1761, 1548, 1288, 877, 621,
-    938, 1861, 2903, 3446, 3282, 2734, 2268, 2022,
-    1771, 1321, 868, 873, 1570, 2635, 3406, 3454,
-    2920, 2299, 1919, 1689, 1347, 896, 694, 1077,
-    1938, 2737, 2992, 2720, 2385, 2390, 2662, 2769,
-    2419, 1793, 1356, 1365, 1621, 1732, 1581, 1463,
-    1732, 2345, 2832, 2753, 2162, 1583, 1512, 1960,
-    2502, 2750, 2711, 2665, 2725, 2631, 2028, 958,
-    0, 0, 496, 1736, 2834, 3458, 3723, 3841,
-    3752, 3184, 2069, 822, 110, 289, 1094, 1902,
-    2304, 2395, 2518, 2782, 2906, 2557, 1804, 1148,
-    1076, 1597, 2255, 2598, 2593, 2554, 2689, 2805,
-    2511, 1715, 836, 485, 898, 1731, 2409, 2656,
-    2660, 2728, 2863, 2746, 2156, 1334, 853, 1093,
-    1868, 2596, 2846, 2685, 2489, 2460, 2405, 2012,
-    1304, 722, 730, 1335, 2064, 2430, 2399, 2364,
-    2665, 3183, 3442, 3110, 2344, 1619, 1245, 1108,
-    918, 647, 646, 1270, 2402, 3433, 3752, 3276,
-    2479, 1920, 1759, 1753, 1669, 1610, 1864, 2469,
-    3015, 2959, 2167, 1103, 447, 518, 1081, 1689,
-    2157, 2652, 3327, 3959, 4051, 3323, 2069, 966,
-    513, 658, 980, 1199, 1437, 1979, 2804, 3469,
-    3484, 2808, 1918, 1372, 1319, 1472, 1526, 1535,
-    1822, 2522, 3289, 3542, 3008, 2017, 1205, 958,
-    1133, 1343, 1427, 1594, 2085, 2776, 3197, 2987,
-    2297, 1689, 1605, 1967, 2306, 2280, 2009, 1884,
-    2086, 2358, 2294, 1817, 1301, 1203, 1573, 2011,
-    2103, 1872, 1753, 2114, 2839, 3420, 3451, 2996,
-    2439, 2029, 1639, 1019, 242, 0, 205, 1436,
-    2883, 3816, 3952, 3559, 3062, 2600, 2024, 1278,
-    664, 643, 1346, 2343, 2958, 2854, 2286, 1788
-  },
-  {
-    1664, 1710, 1621, 1407, 1442, 2003, 2873, 3465,
-    3372, 2745, 2084, 1708, 1489, 1146, 713, 612,
-    1202, 2315, 3312, 3633, 3266, 2647, 2153, 1768,
-    1286, 760, 609, 1212, 2410, 3513, 3856, 3344,
-    2445, 1678, 1182, 798, 495, 559, 1284, 2512,
-    3601, 3926, 3426, 2610, 2030, 1793, 1607, 1266,
-    968, 1098, 1726, 2439, 2713, 2438, 2006, 1863,
-    2044, 2194, 2047, 1785, 1847, 2396, 3057, 3245,
-    2741, 1890, 1225, 956, 880, 784, 811, 1334,
-    2449, 3684, 4095, 4001, 3035, 2052, 1429, 1079,
-    781, 592, 827, 1619, 2608, 3172, 2997, 2384,
-    1932, 1937, 2162, 2183, 1912, 1690, 1855, 2317,
-    2620, 2441, 1951, 1617, 1681, 1910, 1901, 1595,
-    1381, 1666, 2386, 3011, 3069, 2603, 2079, 1865,
-    1879, 1787, 1488, 1298, 1590, 2308, 2924, 2932,
-    2348, 1676, 1389, 1493, 1645, 1637, 1660, 2042,
-    2762, 3350, 3316, 2665, 1904, 1532, 1564, 1603,
-    1355, 1002, 995, 1531, 2303, 2818, 2898, 2809,
-    2868, 3011, 2849, 2155, 1229, 689, 883, 1548,
-    2098, 2207, 2062, 2049, 2261, 2408, 2227, 1862,
-    1767, 2190, 2838, 3128, 2766, 2035, 1479, 1347,
-    1410, 1328, 1118, 1157, 1721, 2593, 3217, 3234,
-    2828, 2472, 2390, 2340, 1956, 1257, 718, 808,
-    1498, 2286, 2699, 2716, 2652, 2684, 2608, 2120,
-    1299, 686, 820, 1690, 2713, 3260, 3186, 2822,
-    2502, 2202, 1692, 990, 515, 722, 1593, 2569,
-    3045, 2906, 2541, 2359, 2356, 2214, 1783, 1351,
-    1368, 1923, 2586, 2811, 2473, 1952, 1679, 1683,
-    1634, 1326, 1011, 1176, 1997, 3075, 3770, 3769,
-    3287, 2713, 2162, 1452, 521, 0, 0, 704,
-    2221, 3469, 3925, 3689, 3199, 2718, 2167, 1448,
-    794, 672, 1285, 2261, 2912, 2846, 2291, 1798
-  },
-  {
-    1007, 1856, 3088, 3141, 1847, 693, 1019, 2402,
-    3221, 2669, 1652, 1511, 2265, 2661, 1926, 902,
-    1029, 2441, 3641, 3260, 1719, 730, 1238, 2375,
-    2679, 1956, 1422, 1994, 3006, 3042, 1827, 706,
-    1023, 2433, 3287, 2649, 1408, 1118, 2052, 2925,
-    2601, 1546, 1185, 2010, 2913, 2633, 1438, 857,
-    1747, 3148, 3408, 2207, 934, 975, 2063, 2745,
-    2291, 1564, 1775, 2782, 3198, 2211, 766, 519,
-    1815, 3231, 3271, 2120, 1291, 1679, 2511, 2481,
-    1542, 991, 1744, 3042, 3318, 2172, 930, 1040,
-    2298, 3130, 2564, 1398, 1127, 2028, 2866, 2544,
-    1544, 1280, 2202, 3139, 2764, 1349, 530, 1323,
-    2864, 3450, 2579, 1454, 1382, 2157, 2479, 1781,
-    1038, 1485, 2882, 3653, 2796, 1178, 554, 1486,
-    2736, 2860, 1960, 1411, 1992, 2872, 2739, 1593,
-    829, 1472, 2813, 3235, 2228, 1036, 1114, 2328,
-    3157, 2624, 1479, 1185, 2020, 2769, 2363, 1324,
-    1121, 2227, 3406, 3187, 1710, 604, 1030, 2335,
-    2953, 2368, 1638, 1880, 2743, 2873, 1777, 620,
-    857, 2375, 3534, 3105, 1716, 1022, 1666, 2595,
-    2523, 1612, 1201, 1986, 3034, 2956, 1739, 846,
-    1407, 2768, 3270, 2302, 1044, 990, 2114, 2978,
-    2598, 1645, 1484, 2330, 2945, 2295, 996, 656,
-    1854, 3341, 3494, 2243, 1092, 1233, 2166, 2501,
-    1839, 1266, 1837, 3059, 3406, 2261, 808, 665,
-    1934, 3095, 2878, 1764, 1266, 1962, 2817, 2600,
-    1538, 1039, 1834, 2968, 2975, 1770, 819, 1333,
-    2738, 3371, 2522, 1266, 1073, 1987, 2681, 2254,
-    1408, 1483, 2608, 3416, 2742, 1172, 431, 1320,
-    2771, 3183, 2343, 1540, 1807, 2599, 2598, 1556,
-    737, 1323, 2823, 3559, 2693, 1261, 902, 1879,
-    2844, 2605, 1599, 1244, 2041, 2919, 2658, 1531
-  },
-  {
-    1940, 2558, 3310, 3167, 1867, 350, 0, 1062,
-    2800, 3765, 3383, 2325, 1683, 1824, 2122, 1810,
-    973, 562, 1363, 3030, 4095, 3948, 2338, 733,
-    312, 1081, 2042, 2327, 2055, 2043, 2730, 3541,
-    3433, 2069, 354, 0, 660, 2465, 3674, 3555,
-    2627, 1952, 1980, 2174, 1778, 840, 310, 1054,
-    2820, 4095, 4095, 2750, 1016, 328, 870, 1758,
-    2102, 1931, 2002, 2773, 3699, 3704, 2351, 483,
-    0, 332, 2127, 3511, 3617, 2819, 2147, 2119,
-    2272, 1849, 837, 165, 780, 2548, 4095, 4095,
-    3056, 1293, 441, 815, 1624, 1964, 1795, 1856,
-    2655, 3707, 3898, 2665, 738, 0, 137, 1836,
-    3299, 3559, 2871, 2228, 2206, 2400, 2025, 983,
-    161, 577, 2243, 3964, 4095, 3212, 1509, 607,
-    911, 1683, 1987, 1722, 1634, 2344, 3478, 3919,
-    2958, 1144, 0, 179, 1657, 3024, 3299, 2677,
-    2126, 2247, 2633, 2411, 1352, 294, 368, 1792,
-    3522, 4095, 3306, 1795, 924, 1157, 1829, 2014,
-    1589, 1330, 1958, 3199, 3921, 3260, 1583, 231,
-    275, 1525, 2778, 3042, 2448, 1949, 2189, 2781,
-    2774, 1790, 573, 315, 1429, 3049, 3826, 3210,
-    1931, 1202, 1494, 2155, 2234, 1577, 1016, 1432,
-    2711, 3741, 3497, 2102, 754, 565, 1507, 2523,
-    2671, 2061, 1640, 2072, 2958, 3236, 2353, 953,
-    300, 1029, 2487, 3382, 3051, 2056, 1509, 1878,
-    2532, 2499, 1601, 718, 888, 2167, 3485, 3671,
-    2604, 1315, 927, 1562, 2316, 2308, 1645, 1274,
-    1887, 3079, 3677, 2945, 1400, 361, 677, 1927,
-    2902, 2843, 2138, 1788, 2244, 2901, 2778, 1670,
-    489, 408, 1648, 3195, 3762, 3008, 1804, 1276,
-    1670, 2211, 2062, 1311, 912, 1616, 3052, 3976,
-    3474, 1900, 566, 489, 1470, 2418, 2532, 2072
-  },
-  {
-    2305, 1950, 1626, 1814, 2468, 2972, 2698, 1651,
-    599, 493, 1629, 3299, 4095, 3750, 2036, 322,
-    0, 716, 2337, 3494, 3539, 2733, 1873, 1551,
-    1713, 1874, 1704, 1400, 1477, 2176, 3100, 3465,
-    2796, 1444, 411, 557, 1859, 3357, 3885, 3012,
-    1398, 273, 466, 1773, 3173, 3670, 3055, 1956,
-    1225, 1225, 1645, 1927, 1865, 1776, 2102, 2843,
-    3423, 3156, 1941, 508, 0, 771, 2528, 3975,
-    4081, 2811, 1147, 304, 788, 2069, 3085, 3132,
-    2367, 1558, 1356, 1763, 2238, 2291, 1965, 1758,
-    2067, 2709, 3020, 2475, 1275, 311, 477, 1870,
-    3595, 4095, 3648, 1838, 238, 0, 953, 2472,
-    3385, 3239, 2444, 1786, 1701, 1974, 2076, 1773,
-    1386, 1465, 2176, 3031, 3252, 2491, 1234, 486,
-    945, 2362, 3668, 3808, 2604, 928, 25, 542,
-    2045, 3415, 3744, 2992, 1892, 1252, 1307, 1669,
-    1826, 1700, 1681, 2158, 2993, 3517, 3093, 1773,
-    411, 53, 1073, 2800, 3984, 3764, 2346, 833,
-    342, 1140, 2499, 3344, 3124, 2182, 1357, 1230,
-    1687, 2150, 2196, 1957, 1926, 2378, 2991, 3078,
-    2252, 913, 57, 492, 2102, 3831, 4095, 3481,
-    1632, 203, 113, 1246, 2634, 3287, 2946, 2155,
-    1671, 1781, 2137, 2202, 1837, 1454, 1587, 2295,
-    3011, 3008, 2101, 926, 482, 1281, 2841, 3994,
-    3798, 2312, 588, 0, 597, 2192, 3484, 3681,
-    2895, 1901, 1409, 1511, 1759, 1733, 1500, 1531,
-    2148, 3075, 3557, 3017, 1650, 404, 259, 1409,
-    3036, 3917, 3390, 1883, 571, 434, 1497, 2873,
-    3520, 3065, 2014, 1233, 1196, 1675, 2076, 2072,
-    1891, 2018, 2606, 3204, 3117, 2089, 689, 0,
-    611, 2318, 3929, 4095, 3162, 1386, 241, 446,
-    1669, 2875, 3209, 2628, 1811, 1479, 1772, 2227
-  },
-  {
-    2335, 1960, 1685, 1991, 2665, 2957, 2364, 1256,
-    1187, 675, 1385, 2969, 4095, 3891, 2178, 296,
-    0, 858, 2528, 3499, 3277, 2384, 1687, 1864,
-    1755, 1891, 1800, 1493, 1474, 2117, 3086, 3446,
-    2627, 1190, 321, 799, 2247, 3423, 3310, 3107,
-    1738, 395, 255, 1464, 3033, 3737, 3149, 1995,
-    1297, 1347, 1704, 1834, 1723, 1823, 2108, 2639,
-    3261, 3208, 2125, 617, 0, 748, 2661, 4066,
-    3914, 2447, 933, 547, 1394, 1601, 2804, 3229,
-    2646, 1734, 1332, 1636, 2113, 2142, 1819, 1735,
-    2218, 2881, 2971, 2189, 1720, 621, 355, 1441,
-    3232, 4095, 3802, 1959, 273, 50, 1212, 2640,
-    3225, 2756, 1910, 2316, 1840, 1897, 2026, 1814,
-    1434, 1470, 2204, 3124, 3256, 2304, 984, 435,
-    1171, 2551, 3314, 3642, 2920, 1289, 77, 298,
-    1775, 3318, 3760, 2948, 1844, 1312, 1466, 1796,
-    1872, 1825, 1577, 1917, 2711, 3406, 3216, 1970,
-    487, 10, 1148, 2954, 3986, 3485, 1998, 851,
-    972, 994, 2116, 3181, 3271, 2421, 1473, 1207,
-    1641, 2110, 2109, 1863, 1914, 2408, 2823, 2479,
-    2808, 1550, 347, 282, 1634, 3479, 4095, 3526,
-    1607, 217, 326, 1591, 2839, 3159, 2604, 1942,
-    1762, 1656, 1999, 2221, 1988, 1609, 1694, 2407,
-    3070, 2862, 1756, 638, 549, 1686, 3126, 3294,
-    3719, 2662, 912, 0, 407, 2032, 3459, 3612,
-    2747, 1800, 1467, 1676, 1899, 1861, 1595, 1503,
-    1915, 2795, 3437, 3078, 1735, 392, 309, 1631,
-    3271, 3888, 3033, 1515, 651, 866, 1341, 2604,
-    3487, 3253, 2196, 1262, 1125, 1617, 2009, 1977,
-    1857, 2125, 2738, 3044, 2446, 2512, 1180, 155,
-    433, 2025, 3791, 4095, 3137, 1246, 193, 622,
-    1932, 2950, 3001, 2393, 2115, 1507, 1558, 1991
-  },
-  {
-    2299, 1606, 1862, 2187, 2600, 3114, 2824, 819,
-    742, 762, 1777, 2857, 3979, 4095, 2607, 70,
-    0, 1274, 2290, 3296, 3402, 2624, 1883, 2093,
-    1423, 1682, 1942, 1277, 1503, 2618, 2805, 3895,
-    2249, 1512, 0, 904, 1903, 3739, 3659, 3477,
-    1378, 119, 643, 1169, 2648, 4095, 3128, 2162,
-    1306, 1460, 1690, 1974, 1373, 1684, 1967, 3108,
-    3257, 3304, 2323, 309, 7, 529, 2826, 4095,
-    3817, 2606, 606, 565, 1564, 1755, 2924, 3206,
-    2565, 1884, 1147, 1262, 2231, 2237, 2195, 2100,
-    1944, 2626, 3225, 1916, 1444, 924, 395, 1723,
-    3132, 4095, 3586, 1748, 42, 268, 1482, 2742,
-    3110, 2570, 2025, 2385, 1828, 2180, 1616, 1958,
-    1380, 1703, 2019, 3249, 3581, 2116, 685, 199,
-    1554, 2900, 3289, 3588, 2850, 1045, 0, 597,
-    1989, 3292, 3640, 3076, 1633, 1156, 1650, 2200,
-    1884, 1603, 1349, 2034, 2754, 3521, 3437, 1599,
-    744, 0, 1040, 3065, 4095, 3458, 1782, 963,
-    997, 977, 1824, 3559, 3467, 2488, 1558, 699,
-    1750, 1983, 2306, 1793, 2240, 2704, 2237, 2629,
-    2939, 1330, 530, 545, 1391, 3086, 4095, 3624,
-    1583, 443, 206, 1788, 2457, 3132, 2913, 1810,
-    1654, 1539, 2375, 2330, 2305, 1378, 1366, 2269,
-    3182, 3207, 1447, 648, 813, 1931, 3069, 3286,
-    3459, 2647, 833, 0, 589, 2201, 3797, 3585,
-    2499, 1455, 1353, 2169, 2045, 1862, 1599, 1248,
-    1735, 3087, 3519, 3073, 1783, 586, 403, 1230,
-    3053, 4030, 3230, 1553, 814, 1012, 1239, 2409,
-    3612, 3022, 2454, 988, 1344, 1690, 2015, 2311,
-    1661, 1882, 2970, 3096, 2259, 2286, 1362, 415,
-    382, 2202, 4077, 4095, 2592, 1052, 470, 805,
-    2008, 3117, 3179, 2167, 1896, 1466, 1818, 2081
-  },
-  {
-    1966, 2056, 2324, 2444, 1716, 1440, 1465, 1652,
-    1875, 2034, 2094, 2076, 2037, 2105, 2583, 1888,
-    994, 1008, 1565, 2138, 2414, 2398, 2270, 2152,
-    2001, 1726, 1370, 1159, 1325, 1872, 2502, 2825,
-    2599, 1908, 1177, 1358, 1754, 1897, 1956, 1973,
-    1965, 1970, 2000, 2020, 1980, 1914, 1867, 1698,
-    1633, 1822, 2021, 2054, 1931, 1831, 1905, 2094,
-    2140, 1824, 1297, 1964, 2188, 1828, 1576, 2128,
-    2255, 1961, 1600, 1533, 1823, 2209, 2347, 2115,
-    1705, 1447, 1526, 1839, 2117, 2168, 2035, 1919,
-    1948, 2041, 1998, 1724, 1392, 1362, 1896, 2811,
-    2122, 1739, 1726, 1901, 2062, 2040, 1867, 1669,
-    1531, 1527, 1740, 2238, 2702, 2377, 1984, 1563,
-    1305, 1376, 1742, 2165, 2333, 2139, 1788, 1624,
-    1819, 2208, 2414, 2176, 1596, 1106, 1087, 1600,
-    2354, 2838, 2758, 2219, 1598, 1247, 1250, 1468,
-    1734, 2029, 2451, 2851, 2030, 1593, 1481, 1600,
-    1808, 1954, 2009, 2012, 1969, 1886, 1800, 1768,
-    1812, 1937, 2247, 2475, 1925, 1398, 1223, 1479,
-    1957, 2335, 2421, 2267, 2054, 1870, 1614, 1148,
-    1402, 2051, 2361, 2381, 2151, 1806, 1621, 1674,
-    1793, 1900, 1995, 2059, 2054, 1959, 1750, 1419,
-    1732, 2123, 2329, 2207, 1857, 1571, 1594, 1896,
-    2180, 2116, 1639, 1438, 1959, 2116, 2093, 2051,
-    2049, 2037, 1956, 1739, 1214, 911, 2104, 2666,
-    2618, 2292, 1979, 1758, 1557, 1351, 1268, 1485,
-    2014, 2601, 2861, 2571, 1885, 1233, 989, 1278,
-    1853, 2301, 2449, 2380, 2080, 1765, 1562, 1513,
-    1617, 1930, 2552, 2071, 1735, 1723, 1797, 1809,
-    1807, 1898, 2059, 2111, 2091, 2188, 1924, 1185,
-    1048, 1869, 2546, 2656, 2239, 1647, 1338, 1500,
-    1926, 2232, 2194, 1935, 1853, 1585, 1647, 1843
-  },
-  {
-    1659, 2675, 2749, 995, 2173, 1940, 1758, 1737,
-    1805, 1884, 1945, 2020, 2163, 2406, 1786, 2321,
-    991, 844, 1698, 2413, 2642, 2402, 2020, 1879,
-    1873, 1701, 1340, 1179, 1629, 2362, 2546, 2823,
-    2611, 635, 1054, 2099, 1830, 1970, 2091, 2189,
-    2174, 2003, 1706, 1379, 1301, 1802, 2504, 3525,
-    1931, 631, 1107, 1894, 2188, 2207, 2261, 2251,
-    1696, 718, 3108, 1636, 1614, 2164, 1962, 1527,
-    2214, 2001, 1463, 1379, 1962, 2680, 2826, 2236,
-    1296, 814, 1099, 1902, 2559, 2590, 2142, 1841,
-    1891, 2012, 1954, 1594, 1161, 1342, 2876, 1538,
-    2388, 2161, 1968, 1905, 1876, 1872, 1781, 1648,
-    1622, 1774, 2024, 1808, 1350, 3460, 2891, 1498,
-    1072, 1273, 1372, 1966, 2476, 2263, 1679, 1448,
-    1930, 2703, 2997, 2280, 930, 682, 802, 982,
-    2550, 3717, 3622, 2527, 1167, 573, 651, 1194,
-    2057, 3027, 3472, 328, 2460, 2176, 1868, 1735,
-    1734, 1783, 1780, 1757, 1784, 1880, 2039, 2201,
-    2229, 2073, 1483, 1629, 2971, 1691, 851, 1072,
-    1864, 2609, 2790, 2451, 1961, 1515, 1103, 1847,
-    2014, 1647, 1888, 2020, 2063, 2184, 2102, 1878,
-    1874, 1891, 1808, 1635, 1480, 1540, 2049, 3897,
-    1024, 1088, 2025, 2385, 2069, 1655, 1649, 2000,
-    2132, 1527, 1310, 2922, 1737, 1758, 1870, 1969,
-    2088, 2176, 2080, 1699, 1295, 1033, 1600, 2820,
-    2718, 2287, 1985, 1875, 1713, 1312, 1028, 1302,
-    2030, 2858, 3103, 2414, 1614, 1352, 673, 1103,
-    3016, 3299, 1642, 303, 1899, 2475, 2407, 2217,
-    2137, 2046, 0, 2298, 2414, 2355, 2160, 1584,
-    1115, 1349, 2022, 3000, 3585, 1751, 1024, 1398,
-    0, 1191, 3177, 3342, 3377, 2277, 1124, 914,
-    1094, 1158, 1371, 2973, 3320, 3253, 614, 540
-  },
-  {
-    2099, 2469, 2236, 702, 2306, 2265, 1928, 1672,
-    1726, 1987, 2127, 1964, 1717, 1825, 1554, 2705,
-    1775, 1502, 1837, 2050, 2091, 1947, 1738, 1739,
-    1928, 2072, 2002, 1816, 1805, 1889, 1699, 2154,
-    2518, 1076, 1654, 2496, 1911, 1823, 1821, 1849,
-    1867, 1940, 2050, 1998, 1745, 1642, 1760, 2739,
-    1747, 1219, 1994, 2375, 1945, 1549, 1785, 2277,
-    2037, 959, 3051, 1449, 1562, 2284, 2050, 1433,
-    2072, 2097, 1863, 1753, 1851, 1981, 1988, 1929,
-    1821, 1824, 1884, 1978, 2013, 1910, 1751, 1793,
-    1972, 2055, 2014, 1821, 1560, 1700, 2938, 1246,
-    1937, 1827, 1891, 2013, 2000, 1913, 1785, 1739,
-    1875, 2124, 2270, 1727, 862, 2745, 2341, 1478,
-    1641, 2081, 1896, 1913, 2030, 1912, 1750, 1767,
-    1969, 2110, 2036, 1726, 1441, 2175, 2393, 1596,
-    1717, 1928, 1974, 1960, 1874, 1981, 1892, 1671,
-    1728, 2290, 2824, 56, 2531, 2354, 1939, 1671,
-    1684, 1912, 2091, 2064, 1866, 1685, 1736, 2015,
-    2225, 2101, 1361, 1380, 2857, 1977, 1503, 1703,
-    2007, 2108, 1943, 1793, 1857, 1922, 1671, 2226,
-    2096, 1558, 1797, 1981, 2008, 2034, 1869, 1668,
-    1813, 2043, 2128, 1982, 1677, 1472, 1753, 3561,
-    869, 1194, 2258, 2509, 1963, 1436, 1561, 2174,
-    2442, 1702, 1200, 2655, 1589, 1862, 2067, 1960,
-    1757, 1756, 1974, 2111, 2016, 1591, 1633, 2335,
-    2028, 1730, 1723, 1922, 2063, 1955, 1810, 1841,
-    1901, 1979, 1939, 1732, 1897, 2363, 1614, 1272,
-    2407, 2579, 1525, 879, 2556, 2497, 1674, 1351,
-    1926, 2700, 844, 2684, 1928, 1498, 1787, 2108,
-    2115, 1928, 1585, 1766, 2412, 1472, 1850, 2833,
-    998, 1559, 2529, 2010, 2009, 1560, 1460, 2158,
-    2552, 1961, 1049, 1816, 2175, 2885, 1132, 1374
-  },
-  {
-    2298, 2981, 1544, 1907, 2114, 2357, 2312, 2031,
-    1922, 2051, 2257, 2329, 2136, 1889, 1951, 2330,
-    2524, 1904, 1503, 2689, 2381, 1845, 1847, 2222,
-    2478, 2244, 1733, 1671, 2468, 3711, 0, 2679,
-    2483, 2319, 2099, 1806, 1780, 2394, 3172, 907,
-    2428, 2019, 1976, 3332, 949, 2022, 2567, 2323,
-    1942, 1935, 2190, 2256, 2131, 2022, 2136, 2259,
-    2068, 1982, 2103, 2405, 2424, 1147, 2599, 2418,
-    2080, 1906, 1999, 2236, 2336, 2151, 1935, 1952,
-    2363, 2253, 1921, 2191, 2200, 1994, 1982, 2335,
-    2577, 1839, 774, 4095, 1331, 2647, 760, 2895,
-    2687, 1875, 1701, 2040, 2404, 2410, 2086, 1796,
-    1879, 2320, 2724, 2512, 11, 3311, 3102, 1436,
-    1248, 3032, 2012, 2081, 2195, 1962, 2073, 2353,
-    2250, 1298, 3430, 1288, 2013, 2392, 2304, 2042,
-    1870, 2446, 1774, 2216, 2566, 1933, 1739, 2235,
-    2345, 2240, 2076, 1867, 2092, 2289, 2236, 2183,
-    2067, 1880, 1944, 2478, 2615, 1919, 1406, 1820,
-    3158, 2882, 1131, 777, 3423, 2936, 1687, 1391,
-    1985, 2647, 2670, 1894, 950, 3538, 1441, 2122,
-    2405, 2205, 1920, 1914, 2189, 2417, 2283, 1842,
-    1983, 2034, 2172, 2886, 2024, 916, 2464, 2887,
-    2448, 1253, 1916, 2446, 2377, 2219, 2125, 1761,
-    1342, 3767, 1742, 1619, 2008, 2362, 2340, 2127,
-    1995, 1992, 2119, 2263, 2278, 2123, 1862, 1684,
-    3480, 1143, 1973, 2577, 2351, 1813, 1654, 2372,
-    3429, 458, 2493, 2385, 2266, 2090, 1932, 2110,
-    1759, 3261, 1250, 2307, 2104, 1810, 2959, 1710,
-    1826, 2277, 2319, 2116, 2022, 2111, 2165, 2106,
-    2081, 2200, 2374, 2014, 1103, 3510, 1988, 1764,
-    1659, 2400, 2848, 1755, 1832, 1996, 2283, 2580,
-    2140, 1399, 2388, 2249, 2290, 2145, 2045, 1628
-  },
-  {
-    1924, 2444, 2813, 2991, 2986, 2843, 2628, 2452,
-    2434, 2498, 2306, 1709, 1257, 1437, 1788, 1893,
-    1862, 1859, 1900, 1934, 1937, 2067, 2535, 3037,
-    2605, 1507, 2993, 4095, 2387, 1241, 1643, 1400,
-    1577, 1690, 1700, 1583, 1320, 1297, 897, 4095,
-    1859, 4095, 3945, 1699, 4095, 2586, 839, 274,
-    2773, 861, 522, 638, 3159, 670, 3569, 3585,
-    2275, 2822, 3052, 2773, 1831, 1291, 2065, 1950,
-    1808, 1722, 1680, 1706, 1839, 2112, 2552, 3205,
-    3077, 2986, 9, 2037, 2278, 2969, 1623, 247,
-    814, 3418, 3028, 3659, 3881, 1185, 3474, 610,
-    706, 1054, 1511, 1892, 2219, 2487, 2671, 2743,
-    2690, 2535, 2346, 2195, 2099, 2027, 1929, 1766,
-    1551, 1422, 1955, 3456, 1602, 1469, 1901, 2533,
-    2937, 2774, 2129, 1705, 2157, 2768, 2283, 1411,
-    1188, 1551, 2052, 2447, 2685, 2751, 2625, 2315,
-    1913, 1593, 1500, 1659, 1967, 2259, 2430, 2493,
-    2525, 2565, 2554, 2374, 1960, 1424, 1070, 1200,
-    1881, 2674, 2940, 2849, 2779, 2370, 1681, 1327,
-    1582, 2205, 2654, 2062, 1522, 2701, 2513, 2191,
-    1971, 1869, 1866, 1953, 2125, 2366, 2612, 2655,
-    1259, 2467, 2051, 1394, 2036, 1824, 2313, 2528,
-    2549, 2764, 2979, 100, 3505, 2383, 1098, 570,
-    3751, 1455, 1648, 1943, 2152, 2304, 2368, 2476,
-    2677, 2783, 2720, 2510, 2188, 1792, 1355, 904,
-    494, 1440, 749, 4095, 3212, 2926, 4095, 1520,
-    2034, 1383, 1679, 1814, 1792, 1641, 1368, 1075,
-    3968, 1321, 4081, 1908, 2868, 2153, 433, 2197,
-    2089, 1958, 1946, 1979, 2098, 2196, 2320, 2614,
-    2993, 3269, 3108, 2003, 630, 616, 1624, 1690,
-    1185, 1322, 1960, 2600, 3081, 3429, 3627, 3562,
-    3123, 2349, 1527, 976, 714, 658, 869, 1345
-  },
-  {
-    1978, 2287, 2526, 2669, 2687, 2577, 2388, 2225,
-    2197, 2323, 2481, 2505, 2388, 2223, 1976, 1694,
-    1507, 1450, 1453, 1439, 1427, 1561, 2010, 2746,
-    3403, 3628, 4078, 3807, 2389, 899, 1003, 1447,
-    1671, 1739, 1691, 1522, 1184, 554, 648, 3083,
-    3818, 3891, 3918, 3834, 3555, 2432, 1470, 767,
-    771, 762, 962, 883, 941, 1513, 3249, 4000,
-    3729, 3335, 2717, 2321, 2333, 2123, 1688, 1383,
-    1269, 1282, 1383, 1574, 1866, 2260, 2766, 3457,
-    4095, 3462, 1413, 1042, 1071, 1153, 780, 812,
-    1586, 3041, 4083, 3878, 3731, 3467, 2518, 32,
-    304, 967, 1415, 1780, 2103, 2382, 2594, 2715,
-    2729, 2642, 2496, 2374, 2319, 2292, 2230, 2098,
-    1878, 1568, 1256, 1339, 1443, 1902, 2434, 2940,
-    3241, 3172, 2728, 2140, 1745, 1611, 1490, 1512,
-    1766, 2091, 2349, 2503, 2567, 2543, 2416, 2195,
-    1936, 1741, 1692, 1804, 2010, 2210, 2339, 2400,
-    2437, 2471, 2465, 2345, 2074, 1728, 1483, 1520,
-    1888, 2416, 2792, 2848, 2593, 2085, 1562, 1321,
-    1470, 1907, 2449, 2909, 2959, 2629, 2217, 1945,
-    1799, 1740, 1744, 1802, 1916, 2092, 2334, 2643,
-    2867, 2610, 1676, 1174, 1590, 2542, 2417, 2057,
-    2012, 2246, 2772, 2886, 2961, 2174, 1527, 927,
-    1176, 1434, 1980, 2292, 2408, 2433, 2521, 2716,
-    2869, 2872, 2728, 2479, 2159, 1797, 1417, 1020,
-    551, 0, 965, 3313, 4095, 4095, 4036, 1891,
-    1026, 1725, 2085, 2203, 2157, 1975, 1642, 1080,
-    858, 1439, 3279, 3362, 2978, 2705, 2345, 2051,
-    1614, 1552, 1722, 1899, 1989, 2034, 2174, 2497,
-    2904, 3160, 3029, 2405, 1550, 993, 950, 1074,
-    1350, 1848, 2358, 2732, 2971, 3126, 3193, 3108,
-    2807, 2308, 1746, 1299, 1076, 1091, 1304, 1631
-  },
-  {
-    1974, 2482, 2875, 3104, 3130, 2965, 2685, 2444,
-    2398, 2432, 1941, 1529, 1311, 1281, 1417, 1638,
-    1741, 1802, 1867, 1875, 1834, 1943, 2424, 3078,
-    2950, 3018, 3414, 3767, 1893, 292, 1172, 1495,
-    1619, 1650, 1618, 1519, 1311, 830, 542, 2902,
-    3970, 3585, 3716, 4095, 3246, 2351, 1679, 1158,
-    715, 432, 429, 557, 1153, 2006, 2746, 3118,
-    3104, 2866, 2619, 2497, 2500, 2536, 2518, 2417,
-    2251, 2029, 1729, 1335, 915, 637, 609, 848,
-    1492, 2361, 3139, 3618, 3787, 3748, 3570, 3205,
-    2516, 1447, 246, 0, 141, 0, 1344, 3608,
-    3264, 2852, 2669, 2550, 2442, 2336, 2235, 2148,
-    2085, 2047, 2016, 1955, 1850, 1735, 1654, 1631,
-    1679, 1810, 2036, 2349, 2723, 2936, 2377, 1778,
-    1434, 1578, 2217, 2631, 2160, 1995, 2078, 2414,
-    2843, 2278, 1754, 1414, 1251, 1265, 1475, 1865,
-    2337, 2726, 2890, 2798, 2540, 2262, 2057, 1923,
-    1798, 1655, 1563, 1640, 1947, 2381, 2691, 2628,
-    2133, 1456, 1160, 1408, 1536, 2233, 2960, 3266,
-    3025, 2384, 1601, 1562, 1834, 1990, 2038, 2014,
-    1962, 1916, 1895, 1901, 1924, 1944, 1932, 1833,
-    1534, 1899, 2945, 3446, 3179, 2286, 1999, 2217,
-    2057, 1587, 814, 1088, 1536, 1786, 1929, 2092,
-    2305, 2494, 2576, 2539, 2454, 2421, 2474, 2546,
-    2514, 2299, 1938, 1557, 1276, 1131, 1077, 1094,
-    1249, 1656, 2360, 3211, 3866, 3997, 3421, 2169,
-    772, 1352, 1724, 1879, 1916, 1860, 1692, 1325,
-    485, 1603, 3374, 3302, 2657, 2380, 2388, 2362,
-    1822, 1674, 1777, 1871, 1880, 1838, 1921, 2255,
-    2723, 3033, 2863, 2051, 920, 840, 1432, 1622,
-    1483, 1466, 2179, 2729, 3087, 3321, 3428, 3313,
-    2880, 2155, 1339, 723, 458, 499, 853, 1398
-  },
-  {
-    2279, 2196, 2046, 1841, 1621, 1468, 1478, 1682,
-    1981, 2172, 2058, 1578, 1603, 1950, 2077, 2075,
-    2013, 1946, 1898, 1848, 1763, 1631, 1488, 1448,
-    1612, 1884, 2125, 2292, 2378, 2372, 2259, 2020,
-    1630, 1020, 0, 1267, 2810, 2483, 2166, 2366,
-    3306, 2194, 1046, 725, 1498, 1846, 1907, 1695,
-    1498, 1747, 2090, 2433, 2596, 2448, 2018, 1500,
-    1142, 1098, 1352, 1750, 2108, 2310, 2340, 2238,
-    2048, 1801, 1550, 1398, 1482, 1896, 2603, 1967,
-    1676, 1600, 1639, 1732, 1835, 1922, 2015, 2173,
-    2124, 2066, 1991, 1537, 1367, 1433, 1626, 1856,
-    2058, 2186, 2208, 2120, 1947, 1754, 1650, 1828,
-    2055, 1266, 1253, 1769, 2332, 2499, 2108, 1342,
-    1447, 2148, 2385, 2317, 2024, 1567, 936, 850,
-    1389, 2093, 2694, 2927, 2690, 2117, 1485, 1062,
-    1250, 1474, 1423, 1730, 2003, 2236, 2408, 2460,
-    2333, 2031, 1654, 1353, 1243, 1334, 1540, 1754,
-    1927, 2090, 2286, 2487, 2568, 2383, 1892, 1253,
-    771, 729, 1201, 1984, 2690, 2961, 2668, 1948,
-    1188, 1675, 1847, 1892, 1871, 1789, 1633, 1343,
-    592, 1891, 3408, 2563, 2227, 1999, 1802, 1619,
-    1456, 1343, 1324, 1459, 1807, 2286, 2475, 2255,
-    2021, 1904, 1852, 1813, 1759, 1681, 1589, 1523,
-    1555, 1773, 2269, 2057, 1921, 1968, 2072, 2100,
-    2003, 1824, 1657, 1561, 1535, 1547, 1591, 1712,
-    1955, 2290, 2567, 2580, 2192, 1458, 763, 1698,
-    1995, 1819, 1036, 1630, 2202, 2731, 2993, 1909,
-    1342, 1142, 1288, 1852, 2834, 1816, 1329, 1438,
-    1885, 2275, 2331, 2041, 1606, 1686, 1699, 1684,
-    1779, 1942, 2064, 2106, 2069, 1940, 1660, 1087,
-    1472, 2026, 2215, 2204, 2118, 1966, 1691, 1679,
-    1969, 2028, 1853, 1400, 1193, 1701, 2076, 2258
-  },
-  {
-    2084, 2007, 2033, 2179, 2411, 2617, 2660, 2466,
-    2097, 1732, 1555, 1632, 1858, 2024, 1955, 1623,
-    1136, 625, 1234, 1712, 2121, 2454, 2702, 2873,
-    2976, 3011, 2962, 2795, 2457, 1905, 1840, 2225,
-    2377, 2208, 1524, 1695, 2066, 2151, 2080, 1907,
-    1634, 1214, 462, 498, 1595, 2495, 3312, 2586,
-    2206, 2032, 2016, 2142, 2357, 2511, 2491, 2398,
-    2385, 2535, 2903, 2783, 2397, 2106, 1917, 1809,
-    1778, 1839, 1977, 2104, 2076, 1772, 1187, 711,
-    1265, 1519, 1606, 1578, 1443, 1129, 1080, 2214,
-    3585, 4095, 3795, 3636, 3792, 3998, 2811, 1929,
-    1447, 1217, 1030, 812, 683, 851, 1401, 2164,
-    2767, 2855, 2327, 1433, 643, 374, 758, 1597,
-    2511, 3177, 3493, 3554, 3493, 3321, 2894, 2032,
-    1194, 1977, 2284, 2397, 2397, 2311, 2145, 1894,
-    1549, 1075, 625, 1121, 1481, 1663, 1693, 1674,
-    1732, 1935, 2244, 2554, 2771, 2876, 2920, 2957,
-    2974, 2899, 2671, 2325, 2013, 1910, 2072, 2352,
-    2441, 2048, 1087, 0, 824, 1237, 1469, 1617,
-    1714, 1765, 1732, 1478, 1188, 3153, 4095, 4095,
-    4095, 4095, 2770, 981, 1235, 1454, 1479, 1428,
-    1319, 1132, 794, 25, 829, 2188, 2980, 3127,
-    2836, 2442, 2205, 2192, 2294, 2361, 2327, 2242,
-    2205, 2259, 2350, 2372, 2259, 2048, 1854, 1787,
-    1878, 2061, 2231, 2314, 2296, 2191, 1991, 1659,
-    1187, 672, 673, 528, 1256, 2661, 4095, 3440,
-    3037, 2800, 2620, 2461, 2317, 2194, 2102, 2051,
-    2043, 2043, 1976, 1822, 1654, 1532, 1474, 1475,
-    1527, 1611, 1700, 1786, 1889, 2036, 2231, 2419,
-    2501, 2470, 2431, 2455, 2562, 2770, 3156, 4014,
-    3029, 1936, 1119, 505, 696, 858, 752, 640,
-    1462, 2286, 2867, 3090, 3001, 2745, 2465, 2238
-  },
-  {
-    2258, 2290, 2417, 2658, 2973, 3251, 3352, 3201,
-    2860, 2505, 2321, 2374, 2560, 2670, 2531, 2115,
-    1533, 918, 1416, 1778, 2070, 2285, 2419, 2481,
-    2484, 2428, 2301, 2070, 1683, 1099, 1019, 1408,
-    1581, 1450, 821, 1063, 1519, 1701, 1738, 1680,
-    1529, 1233, 605, 763, 1977, 2985, 3901, 3262,
-    2954, 2837, 2860, 3007, 3224, 3362, 3307, 3161,
-    3080, 3146, 3416, 3186, 2682, 2266, 1948, 1710,
-    1551, 1488, 1510, 1531, 1408, 1023, 374, 0,
-    375, 619, 716, 717, 629, 380, 412, 1642,
-    3121, 4054, 3575, 3547, 3836, 4095, 3115, 2355,
-    1985, 1857, 1758, 1612, 1539, 1743, 2310, 3072,
-    3653, 3701, 3115, 2145, 1264, 891, 1160, 1875,
-    2659, 3193, 3376, 3306, 3120, 2831, 2298, 1343,
-    426, 1147, 1410, 1497, 1491, 1418, 1284, 1084,
-    807, 416, 63, 669, 1147, 1455, 1615, 1727,
-    1916, 2244, 2672, 3091, 3406, 3595, 3708, 3795,
-    3846, 3786, 3554, 3185, 2831, 2670, 2758, 2948,
-    2936, 2432, 1352, 17, 838, 1124, 1232, 1261,
-    1248, 1198, 1078, 750, 403, 2327, 4029, 3456,
-    3518, 3701, 2009, 284, 617, 927, 1055, 1114,
-    1122, 1056, 839, 191, 1111, 2580, 3472, 3709,
-    3495, 3163, 2973, 2990, 3104, 3167, 3111, 2988,
-    2897, 2881, 2890, 2819, 2605, 2285, 1977, 1794,
-    1770, 1840, 1904, 1887, 1779, 1596, 1331, 949,
-    441, 0, 0, 0, 537, 1988, 3802, 2902,
-    2585, 2443, 2365, 2314, 2281, 2269, 2286, 2340,
-    2430, 2519, 2531, 2443, 2327, 2244, 2207, 2214,
-    2255, 2312, 2359, 2388, 2421, 2486, 2589, 2678,
-    2654, 2515, 2366, 2282, 2284, 2393, 2689, 3468,
-    2415, 1266, 411, 0, 0, 127, 46, 0,
-    852, 1745, 2408, 2723, 2735, 2585, 2416, 2301
-  },
-  {
-    2185, 2170, 2249, 2442, 2711, 2942, 2998, 2803,
-    2420, 2025, 1803, 1822, 1976, 2058, 1894, 1457,
-    857, 229, 718, 1076, 1368, 1587, 1730, 1806,
-    1827, 1793, 1693, 1493, 1141, 595, 558, 991,
-    1213, 1133, 558, 855, 1367, 1607, 1703, 1705,
-    1613, 1376, 806, 1021, 2290, 3352, 4095, 3728,
-    3467, 3392, 3454, 3636, 3884, 4049, 4017, 3890,
-    3822, 3896, 4095, 3941, 3432, 3007, 2675, 2419,
-    2238, 2150, 2142, 2130, 1971, 1548, 856, 289,
-    769, 966, 1015, 968, 831, 532, 515, 1697,
-    3129, 4016, 3493, 3422, 3671, 3972, 2878, 2086,
-    1687, 1532, 1411, 1246, 1156, 1348, 1907, 2662,
-    3242, 3290, 2708, 1746, 875, 515, 800, 1533,
-    2337, 2892, 3098, 3053, 2893, 2630, 2124, 1196,
-    307, 1055, 1344, 1457, 1476, 1428, 1316, 1137,
-    880, 506, 170, 789, 1280, 1597, 1765, 1883,
-    2074, 2404, 2832, 3249, 3559, 3741, 3847, 3925,
-    3966, 3894, 3649, 3267, 2899, 2723, 2796, 2972,
-    2944, 2425, 1330, 0, 789, 1062, 1158, 1176,
-    1153, 1095, 966, 632, 279, 2200, 3899, 3324,
-    3385, 3569, 1879, 157, 493, 808, 941, 1006,
-    1021, 961, 751, 110, 1038, 2513, 3413, 3656,
-    3448, 3122, 2937, 2959, 3077, 3143, 3090, 2969,
-    2878, 2864, 2872, 2800, 2584, 2262, 1951, 1765,
-    1737, 1804, 1864, 1844, 1732, 1545, 1277, 892,
-    383, 0, 0, 0, 479, 1933, 3751, 2856,
-    2546, 2411, 2343, 2302, 2281, 2282, 2313, 2383,
-    2489, 2596, 2626, 2558, 2462, 2398, 2382, 2409,
-    2471, 2548, 2614, 2662, 2712, 2794, 2912, 3014,
-    3002, 2872, 2730, 2651, 2655, 2764, 3057, 3829,
-    2767, 1607, 736, 79, 241, 388, 280, 179,
-    1024, 1882, 2507, 2783, 2752, 2559, 2345, 2185
-  }
-};
diff --git a/keyboards/planck/keymaps/tehwalris/config.h b/keyboards/planck/keymaps/tehwalris/config.h
deleted file mode 100644
index 8bcacb05f37..00000000000
--- a/keyboards/planck/keymaps/tehwalris/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#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
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/planck/keymaps/tehwalris/keymap.c b/keyboards/planck/keymaps/tehwalris/keymap.c
deleted file mode 100644
index 243748cfec7..00000000000
--- a/keyboards/planck/keymaps/tehwalris/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  DVORAK,
-  OVL_L, // Left overlay
-  OVL_R, // Right overlay
-  OVL_C, // Corner overlay
-  OVL_N, // Number overlay
-  OVL_F, // F-key overlay
-};
-
-enum planck_keycodes {
-  UMLT_A = SAFE_RANGE,
-  UMLT_O,
-  UMLT_U,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT,   KC_COMM, KC_DOT,  KC_P,    KC_Y,      KC_F,      KC_G,    KC_C,    KC_R,      KC_L,    OSL(OVL_C),
-  KC_ESC,  KC_A,      KC_O,    KC_E,    KC_U,    KC_I,      KC_D,      KC_H,    KC_T,    KC_N,      KC_S,    KC_ENT    ,
-  KC_LSFT, KC_SCLN,   KC_Q,    KC_J,    KC_K,    KC_X,      KC_B,      KC_M,    KC_W,    KC_V,      KC_Z,    KC_RSFT   ,
-  KC_LGUI, MO(OVL_N), KC_LCTL, KC_RCTL, KC_BSPC, MO(OVL_L), MO(OVL_R), KC_SPC,  KC_LALT, MO(OVL_F), KC_RALT, KC_RGUI
-),
-
-[OVL_L] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RGHT, _______,
-  _______, KC_UNDS, KC_MINS, KC_BSLS, KC_SLSH, KC_PLUS, KC_DLR,  KC_LEFT, KC_EQL,  KC_LCBR, KC_RCBR, _______,
-  _______, KC_SCLN, _______, _______, _______, _______, _______, _______, KC_GRV,  KC_HASH, KC_PIPE, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[OVL_R] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_EXLM, KC_CIRC, KC_QUES, KC_PERC, KC_AMPR, KC_ASTR, _______,
-  _______, KC_TILD, KC_AT,   KC_DOWN, KC_UP,   _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[OVL_C] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  _______,
-  _______, UMLT_A,  UMLT_O,  _______, UMLT_U,  _______, _______, KC_HOME, _______, _______, _______, _______,
-  _______, _______, _______, KC_PGDN, KC_PGUP, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, KC_DEL,  _______, _______, KC_INS,  _______, _______, _______, _______
-),
-
-[OVL_N] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,    _______, _______,
-  _______, KC_PLUS, KC_UNDS, KC_LPRN, KC_RPRN, _______, _______, KC_4,    KC_5,    KC_6,    _______, _______,
-  _______, KC_ASTR, KC_SLSH, _______, _______, _______, _______, KC_1,    KC_2,    KC_3,    KC_EQL,  _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_0,    _______, _______, _______, _______
-),
-
-[OVL_F] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, KC_F7,   KC_F8,   KC_F9,   _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_F4,   KC_F5,   KC_F6,   _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_F10,  KC_F11,  KC_F12,  _______, _______
-)
-
-};
-
-static bool is_left_shift_pressed = false;
-static bool is_right_shift_pressed = false;
-
-// This will only work on linux with xkbmap option "compose:prsc"
-void press_umlaut_of(uint16_t keycode) {
-  bool is_shift_pressed = (is_left_shift_pressed || is_right_shift_pressed);
-  register_code(KC_PRINT_SCREEN);
-  unregister_code(KC_PRINT_SCREEN);
-  if (!is_shift_pressed) {
-    register_code(KC_LSFT);
-  }
-  register_code(KC_QUOT);
-  unregister_code(KC_QUOT);
-  if (!is_shift_pressed) {
-    unregister_code(KC_LSFT);
-  }
-  register_code(keycode);
-  unregister_code(keycode);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case KC_LSFT:
-      is_left_shift_pressed = record->event.pressed;
-      break;
-    case KC_RSFT:
-      is_right_shift_pressed = record->event.pressed;
-      break;
-    case UMLT_A:
-      if (record->event.pressed) {
-        press_umlaut_of(KC_A);
-      }
-      break;
-    case UMLT_O:
-      if (record->event.pressed) {
-        press_umlaut_of(KC_O);
-      }
-      break;
-    case UMLT_U:
-      if (record->event.pressed) {
-        press_umlaut_of(KC_U);
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/that_canadian/keymap.c b/keyboards/planck/keymaps/that_canadian/keymap.c
deleted file mode 100644
index d7b8a6b3565..00000000000
--- a/keyboards/planck/keymaps/that_canadian/keymap.c
+++ /dev/null
@@ -1,170 +0,0 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _LOWER 2
-#define _RAISE 3
-
-#define _FUNCTION 15
-#define _ADJUST 16
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Func |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  `   | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,        KC_Q,   KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-  MO(_FUNCTION), KC_A,   KC_S,    KC_D,    KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  OSM(MOD_LSFT), KC_Z,   KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_LCTL,       KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      | Mute |      |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower | Bksp | Bksp |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_ESC,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-  _______, KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_MUTE, _______, KC_PIPE,
-  _______, _______,  _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   4  |   5  |   6  |   +  |  F5  |  F6  |   -  |   =  |   [  |   ]  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Enter |   7  |   8  |   9  |   -  |  F11 |  F12 |ISO # |ISO / | Mute |      |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ,  |   0  |  .   |Lower | Bksp | Bksp |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  KC_ESC,  KC_1,    KC_2,  KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  _______, KC_4,    KC_5,  KC_6,   KC_PLUS, KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  KC_ENT,  KC_7,    KC_8,  KC_9,   KC_MINS, KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS,
-  _______, KC_COMM, KC_0,  KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Taskmg|      |      |      |      |      |      |      |      |      |      |caltde|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | QK_BOOT|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  TSKMGR,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |  Up  |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Caps |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/planck/keymaps/that_canadian/readme.md b/keyboards/planck/keymaps/that_canadian/readme.md
deleted file mode 100644
index 267b4f94f8c..00000000000
--- a/keyboards/planck/keymaps/that_canadian/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# That-Canadian personal planck layout
-
diff --git a/keyboards/planck/keymaps/tk/config.h b/keyboards/planck/keymaps/tk/config.h
deleted file mode 100644
index 213d7345b45..00000000000
--- a/keyboards/planck/keymaps/tk/config.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2020 Tushar Khan
- * 
- * 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 ENCODER_RESOLUTION 4    // dependent on rotary encoder
-
-#define TAP_CODE_DELAY 10       // delay between key press and release on `tapcode(kc)`
-
-#define TAPPING_TERM 200        // mod tap tap-window
-
-// oneshot keys --
-
-#define ONESHOT_TAP_TOGGLE 25   // taps to toggle a one-shot layer/key persistence
-
-#define ONESHOT_TIMEOUT 500     // one-shot layer/key timeout
-
-// dynamic macros --
-
-// you can store HALF of this number of keypresses in both macros together
-#define DYNAMIC_MACRO_SIZE 256
-
-// mouse keys --
-
-#define MK_3_SPEED
-
-// mouse speeds
-
-// cursor offset per movement
-#define MK_C_OFFSET_1 4
-#define MK_C_OFFSET_2 16
-
-// time between cursor movements (ms)
-#define MK_C_INTERVAL_1 16  // 16 ms = 60 Hz refresh rate
-#define MK_C_INTERVAL_2 16
-
-// scroll speeds
-
-// scroll steps per scroll action
-#define MK_W_OFFSET_1 1
-#define MK_W_OFFSET_2 4
-
-// time between scroll steps (ms)
-#define MK_W_INTERVAL_1 16
-#define MK_W_INTERVAL_2 16
-
-
-// audio --
-
-#define AUDIO_CLICKY
-#define AUDIO_CLICKY_FREQ_RANDOMNESS 1
diff --git a/keyboards/planck/keymaps/tk/keymap.c b/keyboards/planck/keymaps/tk/keymap.c
deleted file mode 100644
index cb512b73a38..00000000000
--- a/keyboards/planck/keymaps/tk/keymap.c
+++ /dev/null
@@ -1,691 +0,0 @@
-/* Copyright 2020 Tushar Khan
- *
- * 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"
-
-
-/*
-    ██████╗ ███████╗███████╗██╗███╗   ██╗██╗████████╗██╗ ██████╗ ███╗   ██╗███████╗
-    ██╔══██╗██╔════╝██╔════╝██║████╗  ██║██║╚══██╔══╝██║██╔═══██╗████╗  ██║██╔════╝
-    ██║  ██║█████╗  █████╗  ██║██╔██╗ ██║██║   ██║   ██║██║   ██║██╔██╗ ██║███████╗
-    ██║  ██║██╔══╝  ██╔══╝  ██║██║╚██╗██║██║   ██║   ██║██║   ██║██║╚██╗██║╚════██║
-    ██████╔╝███████╗██║     ██║██║ ╚████║██║   ██║   ██║╚██████╔╝██║ ╚████║███████║
-    ╚═════╝ ╚══════╝╚═╝     ╚═╝╚═╝  ╚═══╝╚═╝   ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚══════╝
-*/
-
-
-#define LCTL_MASK (get_mods() & MOD_BIT(KC_LCTL))
-#define RCTL_MASK (get_mods() & MOD_BIT(KC_RCTL))
-#define CTL_MASK  (LCTL_MASK || RCTL_MASK)
-#define LSFT_MASK (get_mods() & MOD_BIT(KC_LSFT))
-#define RSFT_MASK (get_mods() & MOD_BIT(KC_RSFT))
-#define SFT_MASK  (LSFT_MASK || RSFT_MASK)
-#define LALT_MASK (get_mods() & MOD_BIT(KC_LALT))
-#define RALT_MASK (get_mods() & MOD_BIT(KC_RALT))
-#define ALT_MASK  (LALT_MASK || RALT_MASK)
-
-// Layers
-
-enum planck_layers {
-    _BASE,
-    _LOWER1,
-    _RAISE1,
-    _LOWER2,
-    _RAISE2,
-    _HYPER,
-    _ROTOR,
-};
-
-#define BASE    TO(_BASE)
-#define HYPER   MO(_HYPER)
-#define R_MODES MO(_ROTOR)
-
-#define LOWER1  OSL(_LOWER1)
-#define LOWER2  OSL(_LOWER2)
-#define RAISE1  OSL(_RAISE1)
-#define RAISE2  OSL(_RAISE2)
-
-// Custom keycodes
-
-#define CTL_TAB MT(MOD_LCTL, KC_TAB)
-#define SH_ESC  MT(MOD_LSFT, KC_ESC)
-#define SH_QUOT MT(MOD_RSFT, KC_QUOT)
-
-enum keycodes {
-    ROTARY = SAFE_RANGE,
-    PANIC,                  // backspace on tap, delete on tap with RSHIFT
-
-    // rotary modes
-    R_VOL, R_MEDIA, R_BRI, R_SC_V, R_SC_H, R_AR_V, R_AR_H,
-
-    // command-line macros
-    DEL_LN,     // [delete line]
-    EMAIL,      // [email address]
-    PHONE,      // [phone number]
-    GT_CMT,     // git commit -m ''
-    SHEBANG,    // #!/usr/bin/env
-    CHMOD,      // chmod 744 *sh
-    PY_VENV,    // source *env*/bin/activate
-};
-
-// Rotary encoder states
-
-enum encoder_states {
-    VOLUME,     // volume up/down, toggle mute
-    MEDIA,      // media next/previous, play/pause
-    BRIGHTNESS, // brightness up/down
-    SCROLL_V,   // scroll up/down, middle click
-    SCROLL_H,   // scroll right/left, middle click
-    ARROW_V,    // arrow up/down
-    ARROW_H,    // arrow left/right
-};
-
-enum encoder_states rotary_state = VOLUME;
-
-// Songs
-
-#ifdef AUDIO_ENABLE
-// feedback songs
-float confirm_song[][2]         = SONG(MARIO_COIN);
-float reject_song[][2]          = SONG(MARIO_BUMP);
-
-// dynamic macro songs
-float dmacro_recs_song[][2]     = SONG(MARIO_CAVE_1);
-float dmacro_rece_song[][2]     = SONG(MARIO_CAVE_2);
-float dmacro_play_song[][2]     = SONG(MARIO_PIPE);
-
-// layer toggle songs
-float base_song[][2]            = SONG(MARIO_BUMP);
-float hyper_song[][2]           = SONG(MARIO_POWERUP_BLOCK);
-float rotary_song[][2]          = SONG(MARIO_POWERUP);
-float raise1_song[][2]          = SONG(MARIO_POWERUP_BLOCK);
-float raise2_song[][2]          = SONG(MARIO_POWERUP);
-float lower1_song[][2]          = SONG(MARIO_POWERUP_BLOCK);
-float lower2_song[][2]          = SONG(MARIO_POWERUP);
-
-// shortcut songs
-float caps_on_song[][2]         = SONG(MARIO_CAVE_1);
-float caps_off_song[][2]        = SONG(MARIO_CAVE_2);
-float save_song[][2]            = SONG(MARIO_COIN);
-float cut_song[][2]             = SONG(MARIO_STOMP);
-float copy_song[][2]            = SONG(MARIO_STOMP);
-float paste_song[][2]           = SONG(MARIO_FIREBALL);
-float undo_song[][2]            = SONG(MARIO_KICK);
-float redo_song[][2]            = SONG(MARIO_ONEUP);
-#endif
-
-
-/*
-██╗  ██╗███████╗██╗   ██╗███╗   ███╗ █████╗ ██████╗ ███████╗
-██║ ██╔╝██╔════╝╚██╗ ██╔╝████╗ ████║██╔══██╗██╔══██╗██╔════╝
-█████╔╝ █████╗   ╚████╔╝ ██╔████╔██║███████║██████╔╝███████╗
-██╔═██╗ ██╔══╝    ╚██╔╝  ██║╚██╔╝██║██╔══██║██╔═══╝ ╚════██║
-██║  ██╗███████╗   ██║   ██║ ╚═╝ ██║██║  ██║██║     ███████║
-╚═╝  ╚═╝╚══════╝   ╚═╝   ╚═╝     ╚═╝╚═╝  ╚═╝╚═╝     ╚══════╝
-*/
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Base
-
-        |-----------------------------------------------------------------------------------------------|
-        | Rotary|   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   | Panic |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |  Tab  |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   ;   | Enter |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |  Esc  |   Z   |   X   |   C   |   V   |   B   |   N   |   M   |   ,   |   .   |   /   |   '   |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        | HYPER |  Caps |  Meta | Super | LOWER1|     Space     | RAISE1|DM1 Ply|DM2 Ply|DM1 Rec|DM2 Rec|
-        |-----------------------------------------------------------------------------------------------|
-
-        * PANIC:            BACKSPACE on tap, DELETE on tap with RSHIFT
-        * TAB:              CTRL on hold
-        * ESC and ':        SHIFT on hold
-
-    */
-
-    [_BASE] = LAYOUT_planck_grid(
-        ROTARY,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,     KC_Y,     KC_U,   KC_I,    KC_O,    KC_P,    PANIC,
-        CTL_TAB, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,     KC_H,     KC_J,   KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        SH_ESC,  KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,     KC_N,     KC_M,   KC_COMM, KC_DOT,  KC_SLSH, SH_QUOT,
-        HYPER,   KC_CAPS, KC_LALT, KC_LGUI, LOWER1, KC_SPACE, KC_SPACE, RAISE1, DM_PLY1, DM_PLY2, DM_REC1, DM_REC2
-    ),
-
-    /* Hyper - keyboard adjustments and function keys
-
-        |-----------------------------------------------------------------------------------------------|
-        | ROTARY|  F1   |  F2   |  F3   |  F4   |  F5   |  F6   |  F7   |  F8   |  F9   |  F10  | Reset |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |T Audio|  F11  |  F12  |  F13  |  F14  |  F15  |  F16  |  F17  |  F18  |  F19  |  F20  |T Music|
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |T Click|  F21  |  F22  |  F23  |  F24  |       |       |       |       |       |       |C Music|
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |  xXx  |  Wake | Sleep |PrntScr|  xXx  |      BASE     |  xXx  |       |       |       |       |
-        |-----------------------------------------------------------------------------------------------|
-
-    */
-    [_HYPER] = LAYOUT_planck_grid(
-        R_MODES, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  QK_BOOT,
-        AU_TOGG, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  MU_TOGG,
-        CK_TOGG, KC_F21,  KC_F22,  KC_F23,  KC_F24,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_NEXT,
-        XXXXXXX, KC_WAKE, KC_SLEP, KC_PSCR, XXXXXXX, BASE,    BASE,    XXXXXXX, _______, _______, _______, _______
-    ),
-
-    /* Rotary - change rotary encoder mode
-
-        |-----------------------------------------------------------------------------------------------|
-        |       |       |       |       |       |       |       |scrll h|scrll v|scrll v|scrll h|       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       |       |       |       |       |       |arrow h|arrow v|arrow v|arrow h|       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       |       |       |  vol  | bright|       | media |       |       |       |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       |       |       |  xXx  |      BASE     |  xXx  |       |       |       |       |
-        |-----------------------------------------------------------------------------------------------|
-
-    */
-    [_ROTOR] = LAYOUT_planck_grid(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, R_SC_H,  R_SC_V,  R_SC_V,  R_SC_H,  XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, R_AR_H,  R_AR_V,  R_AR_V,  R_AR_H,  XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, R_VOL,   R_BRI,   XXXXXXX, R_MEDIA, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BASE,    BASE,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    /* Lower I - numbers and brackets
-
-        |-----------------------------------------------------------------------------------------------|
-        |       |   1   |   2   |   3   |   $   |   *   |   /   |       |       |       |       |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |   4   |   5   |   6   |   .   |   +   |   =   |   [   |   ]   |   {   |   }   |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |   7   |   8   |   9   |   0   |   -   |   _   |   (   |   )   |   <   |   >   |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       |       |       | LOWER2|      BASE     | RAISE1|       |       |       |       |
-        |-----------------------------------------------------------------------------------------------|
-
-        * The following symbols are found on other layers: $ * /
-        * It is recommended to not primarily use this layer for those symbols
-        * They are merely on this layer for numerical-typing convenience
-
-    */
-    [_LOWER1] = LAYOUT_planck_grid(
-        _______, KC_1,    KC_2,    KC_3,    KC_DLR, KC_ASTR, KC_SLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, KC_4,    KC_5,    KC_6,    KC_DOT, KC_PLUS, KC_EQL,  KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______,
-        _______, KC_7,    KC_8,    KC_9,    KC_0,   KC_MINS, KC_UNDS, KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______,
-        _______, _______, _______, _______, LOWER2, BASE,    BASE,    RAISE1,  _______, _______, _______, _______
-    ),
-
-    /* Lower II - macros
-
-        |-----------------------------------------------------------------------------------------------|
-        |       |       |       | email |       |       |       |       |       |       | phone |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       | g stat| del ln|       |       |       |       |       |       |       |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       | CHMOD |       | g cmt |py venv|       |       |       |       |       |       |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       |       |       |  xXx  |      BASE     | RAISE1|       |       |       |       |
-        |-----------------------------------------------------------------------------------------------|
-
-        * DO NOT INCLUDE DESTRUCTIVE MACROS
-
-    */
-    [_LOWER2] = LAYOUT_planck_grid(
-        _______, XXXXXXX, XXXXXXX, EMAIL,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, PHONE,   _______,
-        _______, XXXXXXX, SHEBANG, DEL_LN,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, CHMOD,   XXXXXXX, GT_CMT,  PY_VENV, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, _______, _______, _______, XXXXXXX, BASE,    BASE,    RAISE1,  _______, _______, _______, _______
-    ),
-
-    /* Raise I - symbols and movement
-
-        |-----------------------------------------------------------------------------------------------|
-        |       |   !   |   @   |   #   |       |       |       | S lt  | S up  | S dn  | S rt  |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |   $   |   %   |   ^   |       |       |       | Left  | Down  |  Up   | Right |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |   &   |   *   |   (   |   )   |       |       |   ~   |   `   |   |   |   \   |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       |       |       | LOWER1|      BASE     | RAISE2|       |       |       |       |
-        |-----------------------------------------------------------------------------------------------|
-
-        * It is not recomended to use the (  ) symbols on this layer
-        * They are merely here for uniformity
-
-    */
-    [_RAISE1] = LAYOUT_planck_grid(
-        _______, KC_EXLM, KC_AT,   KC_HASH, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,  _______,
-        _______, KC_DLR,  KC_PERC, KC_CIRC, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______,
-        _______, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, KC_TILD, KC_GRV,  KC_PIPE, KC_BSLS,  _______,
-        _______, _______, _______, _______, LOWER1,  BASE,    BASE,    RAISE2,  _______, _______, _______,  _______
-    ),
-
-    /* Raise II - mouse navigation
-
-        |-----------------------------------------------------------------------------------------------|
-        |       |       |       |       |       |       |       | S lt  | S up  | S dn  | S rt  |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       |       |       |       |       |       | M lt  | M dn  | M up  | M rt  |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       |       |       |       |       |       | L Ck  | R ck  | Slow  | Fast  |       |
-        |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-        |       |       |       |       | LOWER1|      BASE     |  xXx  |       |       |       |       |
-        |-----------------------------------------------------------------------------------------------|
-
-    */
-    [_RAISE2] = LAYOUT_planck_grid(
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, _______,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, KC_ACL1, KC_ACL2, _______,
-        _______, _______, _______, _______, LOWER1,  BASE,    BASE,    XXXXXXX, _______, _______, _______, _______
-    ),
-
-};
-
-
-/*
- ██████╗██╗   ██╗███████╗████████╗ ██████╗ ███╗   ███╗    ██╗      ██████╗  ██████╗ ██╗ ██████╗
-██╔════╝██║   ██║██╔════╝╚══██╔══╝██╔═══██╗████╗ ████║    ██║     ██╔═══██╗██╔════╝ ██║██╔════╝
-██║     ██║   ██║███████╗   ██║   ██║   ██║██╔████╔██║    ██║     ██║   ██║██║  ███╗██║██║
-██║     ██║   ██║╚════██║   ██║   ██║   ██║██║╚██╔╝██║    ██║     ██║   ██║██║   ██║██║██║
-╚██████╗╚██████╔╝███████║   ██║   ╚██████╔╝██║ ╚═╝ ██║    ███████╗╚██████╔╝╚██████╔╝██║╚██████╗
- ╚═════╝ ╚═════╝ ╚══════╝   ╚═╝    ╚═════╝ ╚═╝     ╚═╝    ╚══════╝ ╚═════╝  ╚═════╝ ╚═╝ ╚═════╝
-*/
-
-
-// Keyboard initialization
-
-void keyboard_post_init_user(void) {
-    clicky_off();
-}
-
-// Dynamic macros
-
-static bool prerecord_clicky = false;
-
-void dynamic_macro_record_start_user(int8_t direction) {
-    prerecord_clicky = is_clicky_on();
-    if (!prerecord_clicky) {
-        clicky_on();
-    }
-
-    #ifdef AUDIO_ENABLE
-    PLAY_SONG(dmacro_recs_song);
-    #endif
-}
-
-void dynamic_macro_record_end_user(int8_t direction) {
-    if (!prerecord_clicky) {
-        clicky_off();
-    }
-
-    #ifdef AUDIO_ENABLE
-    PLAY_SONG(dmacro_rece_song);
-    #endif
-}
-
-void dynamic_macro_play_user(int8_t direction) {
-    #ifdef AUDIO_ENABLE
-    PLAY_SONG(dmacro_play_song);
-    #endif
-}
-
-// Layers
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // play layer activation audio
-    #ifdef AUDIO_ENABLE
-    switch (get_highest_layer(state)) {
-        case _BASE:
-            // enabling base layer song breaks a lot of other songs including
-            // - macro recording start song
-            // - rotary feedback songs
-
-            // PLAY_SONG(base_song);
-            break;
-        case _HYPER:
-            PLAY_SONG(hyper_song);
-            break;
-        case _ROTOR:
-            PLAY_SONG(rotary_song);
-            break;
-        case _LOWER1:
-            PLAY_SONG(lower1_song);
-            break;
-        case _LOWER2:
-            PLAY_SONG(lower2_song);
-            break;
-        case _RAISE1:
-            PLAY_SONG(raise1_song);
-            break;
-        case _RAISE2:
-            PLAY_SONG(raise2_song);
-            break;
-        default:
-            break;
-    }
-    #endif
-
-    return state;
-}
-
-// Keycode events
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool panic_del = false;      // PANIC in delete-mode
-    static bool caps_active = false;
-
-    switch (keycode) {
-
-        /*
-        ██   ██ ███████ ██    ██  ██████  ██████  ██████  ███████ ███████
-        ██  ██  ██       ██  ██  ██      ██    ██ ██   ██ ██      ██
-        █████   █████     ████   ██      ██    ██ ██   ██ █████   ███████
-        ██  ██  ██         ██    ██      ██    ██ ██   ██ ██           ██
-        ██   ██ ███████    ██     ██████  ██████  ██████  ███████ ███████
-        */
-
-        case PANIC:
-            if (record->event.pressed) {
-                if (RSFT_MASK) {
-                    unregister_code(KC_RSFT);
-                    register_code(KC_DEL);
-                    panic_del = true;
-                }
-                else {
-                    register_code(KC_BACKSPACE);
-                }
-            }
-            else {
-                if (panic_del) {
-                    register_code(KC_RSFT);
-                    unregister_code(KC_DEL);
-                    panic_del = false;
-                }
-                else {
-                    unregister_code(KC_BACKSPACE);
-                }
-            }
-            return false;
-        case KC_CAPS:
-            if (record->event.pressed) {
-                caps_active = !caps_active;
-            }
-            break;
-
-        // rotary encoder
-
-        case R_VOL:
-            if (record->event.pressed) {
-                rotary_state = VOLUME;
-            }
-            break;
-        case R_MEDIA:
-            if (record->event.pressed) {
-                rotary_state = MEDIA;
-            }
-            break;
-        case R_BRI:
-            if (record->event.pressed) {
-                rotary_state = BRIGHTNESS;
-            }
-            break;
-        case R_SC_V:
-            if (record->event.pressed) {
-                rotary_state = SCROLL_V;
-            }
-            break;
-        case R_SC_H:
-            if (record->event.pressed) {
-                rotary_state = SCROLL_H;
-            }
-            break;
-        case R_AR_V:
-            if (record->event.pressed) {
-                rotary_state = ARROW_V;
-            }
-            break;
-        case R_AR_H:
-            if (record->event.pressed) {
-                rotary_state = ARROW_H;
-            }
-            break;
-        case ROTARY:
-            if (record->event.pressed) {
-                if (rotary_state == VOLUME) {
-                    tap_code(KC_MUTE);  // toggle mute
-                }
-                else if (rotary_state == MEDIA) {
-                    tap_code(KC_MPLY);  // play/pause media
-                }
-                else if (rotary_state == SCROLL_V || rotary_state == SCROLL_H) {
-                    tap_code(KC_BTN3);  // middle mouse button
-                }
-            }
-            return false;
-
-        /*
-        ███    ███  █████   ██████ ██████   ██████  ███████
-        ████  ████ ██   ██ ██      ██   ██ ██    ██ ██
-        ██ ████ ██ ███████ ██      ██████  ██    ██ ███████
-        ██  ██  ██ ██   ██ ██      ██   ██ ██    ██      ██
-        ██      ██ ██   ██  ██████ ██   ██  ██████  ███████
-        */
-
-        case DEL_LN:
-            if (record->event.pressed) {
-                tap_code16(LCTL(KC_E)); // go to start of line
-                tap_code16(LCTL(KC_U)); // clear to beginning of line
-            }
-            break;
-        case EMAIL:
-            if (record->event.pressed) {
-                SEND_STRING("email macro not set");
-            }
-            break;
-        case PHONE:
-            if (record->event.pressed) {
-                SEND_STRING("phone macro not set");
-            }
-            break;
-        case SHEBANG:
-            if (record->event.pressed) {
-                SEND_STRING("#!/usr/bin/env ");
-            }
-            break;
-        case CHMOD:
-            if (record->event.pressed) {
-                SEND_STRING("chmod 744 *.sh ");
-            }
-            break;
-        case GT_CMT:
-            if (record->event.pressed) {
-                SEND_STRING("git commit -m ''");
-                tap_code(KC_LEFT);
-            }
-            break;
-        case PY_VENV:
-            if (record->event.pressed) {
-                SEND_STRING("source *env*/bin/activate");
-            }
-            break;
-    };
-
-    /*
-         █████  ██    ██ ██████  ██  ██████
-        ██   ██ ██    ██ ██   ██ ██ ██    ██
-        ███████ ██    ██ ██   ██ ██ ██    ██
-        ██   ██ ██    ██ ██   ██ ██ ██    ██
-        ██   ██  ██████  ██████  ██  ██████
-    */
-
-    #ifdef AUDIO_ENABLE
-    if (record->event.pressed) {
-        switch (keycode) {
-            case KC_S: // CTRL+S
-                if (CTL_MASK) {
-                    PLAY_SONG(save_song);
-                }
-                break;
-            case KC_C: // CTRL+C
-                if (CTL_MASK) {
-                    PLAY_SONG(copy_song);
-                }
-                break;
-            case KC_V: // CTRL+V
-                if (CTL_MASK) {
-                    PLAY_SONG(paste_song);
-                }
-                break;
-            case KC_X: // CTRL+X
-                if (CTL_MASK) {
-                    PLAY_SONG(cut_song);
-                }
-                break;
-            case KC_Z: // CTRL+Z
-                if (CTL_MASK) {
-                    PLAY_SONG(undo_song);
-                }
-                break;
-            case KC_Y: // CTRL+Y
-                if (CTL_MASK) {
-                    PLAY_SONG(redo_song);
-                }
-                break;
-            case KC_CAPS:
-                if (caps_active) {
-                    PLAY_SONG(caps_on_song);
-                }
-                else {
-                    PLAY_SONG(caps_off_song);
-                }
-                break;
-
-            // rotary encoder
-
-            case R_VOL:
-            case R_MEDIA:
-            case R_BRI:
-            case R_SC_V:
-            case R_SC_H:
-            case R_AR_V:
-            case R_AR_H:
-                PLAY_SONG(confirm_song);
-                break;
-
-            default:
-                if (IS_LAYER_ON(_ROTOR)) {
-                    PLAY_SONG(reject_song);
-                }
-        };
-    }
-    #endif
-
-    return true;
-}
-
-void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-}
-
-
-/*
-██████╗  ██████╗ ████████╗ █████╗ ██████╗ ██╗   ██╗    ███████╗███╗   ██╗ ██████╗ ██████╗ ██████╗ ███████╗██████╗
-██╔══██╗██╔═══██╗╚══██╔══╝██╔══██╗██╔══██╗╚██╗ ██╔╝    ██╔════╝████╗  ██║██╔════╝██╔═══██╗██╔══██╗██╔════╝██╔══██╗
-██████╔╝██║   ██║   ██║   ███████║██████╔╝ ╚████╔╝     █████╗  ██╔██╗ ██║██║     ██║   ██║██║  ██║█████╗  ██████╔╝
-██╔══██╗██║   ██║   ██║   ██╔══██║██╔══██╗  ╚██╔╝      ██╔══╝  ██║╚██╗██║██║     ██║   ██║██║  ██║██╔══╝  ██╔══██╗
-██║  ██║╚██████╔╝   ██║   ██║  ██║██║  ██║   ██║       ███████╗██║ ╚████║╚██████╗╚██████╔╝██████╔╝███████╗██║  ██║
-╚═╝  ╚═╝ ╚═════╝    ╚═╝   ╚═╝  ╚═╝╚═╝  ╚═╝   ╚═╝       ╚══════╝╚═╝  ╚═══╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝╚═╝  ╚═╝
-*/
-
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    static int scroll_interval = 5;
-
-    switch (rotary_state) {
-        case VOLUME:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            }
-            else {
-                tap_code(KC_VOLD);
-            }
-            break;
-        case MEDIA:
-            if (clockwise) {
-                tap_code(KC_MNXT);
-            }
-            else {
-                tap_code(KC_MPRV);
-            }
-            break;
-        case BRIGHTNESS:
-            if (clockwise) {
-                tap_code(KC_BRIU);
-            }
-            else {
-                tap_code(KC_BRID);
-            }
-            break;
-        case SCROLL_V:
-            if (clockwise) {
-                // tap_code(KC_PGDN);
-                for (int i=0; i<scroll_interval; i++) {
-                    tap_code(KC_WH_D);
-                }
-            }
-            else {
-                // tap_code(KC_PGUP);
-                for (int i=0; i<scroll_interval; i++) {
-                    tap_code(KC_WH_U);
-                }
-            }
-            break;
-        case SCROLL_H:
-            if (clockwise) {
-                for (int i=0; i<scroll_interval; i++) {
-                    tap_code(KC_WH_R);
-                }
-            }
-            else {
-                for (int i=0; i<scroll_interval; i++) {
-                    tap_code(KC_WH_L);
-                }
-            }
-            break;
-        case ARROW_V:
-            if (clockwise) {
-                tap_code(KC_DOWN);
-            }
-            else {
-                tap_code(KC_UP);
-            }
-            break;
-        case ARROW_H:
-            if (clockwise) {
-                tap_code(KC_RIGHT);
-            }
-            else {
-                tap_code(KC_LEFT);
-            }
-            break;
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/planck/keymaps/tk/rules.mk b/keyboards/planck/keymaps/tk/rules.mk
deleted file mode 100644
index 3e001cdf960..00000000000
--- a/keyboards/planck/keymaps/tk/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-SRC += muse.c
-
-COMMAND_ENABLE = no
-
-AUDIO_ENABLE = yes
-
-ENCODER_ENABLE = yes
-
-MOUSEKEY_ENABLE = yes
-
-DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/planck/keymaps/tom/config.h b/keyboards/planck/keymaps/tom/config.h
deleted file mode 100644
index 9020d2b9f88..00000000000
--- a/keyboards/planck/keymaps/tom/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/tom/keymap.c b/keyboards/planck/keymaps/tom/keymap.c
deleted file mode 100644
index 1190502e2c9..00000000000
--- a/keyboards/planck/keymaps/tom/keymap.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  BACKLIT
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |   /  | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  |   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home |  End |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Vol- | Vol+ |Brite-|Brite+|
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_PIPE,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_QUOT,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_VOLD,    KC_VOLU, KC_BRMD, KC_BRMU
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  \   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Vol- | Vol+ |Brite-|Brite+|
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_QUOT,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_BRMD, KC_BRMU
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    C(G(S(KC_4))), QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
-
-bool rgb_matrix_indicators_user(void) {
-  #ifdef RGB_MATRIX_ENABLE
-  switch (get_highest_layer(layer_state)) {
-    case _RAISE:
-      for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-          rgb_matrix_set_color(i, 0x6B, 0x00, 0x80);
-        } else {
-          rgb_matrix_set_color(i, 0x00, 0xFF, 0x00);
-        }
-      }
-      break;
-
-    case _LOWER:
-      for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-          rgb_matrix_set_color(i, 0xFF, 0xA5, 0x00);
-        } else {
-          rgb_matrix_set_color(i, 0x00, 0x67, 0xC7);
-        }
-      }
-      break;
-
-    case _ADJUST:
-      for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        rgb_matrix_set_color(i, 0xFF, 0x99, 0x00);
-      }
-      rgb_matrix_set_color(1, 0xFF, 0x00, 0x00);
-      break;
-
-    default:
-      break;
-  }
-  #endif
-    return false;
-}
diff --git a/keyboards/planck/keymaps/tom/readme.md b/keyboards/planck/keymaps/tom/readme.md
deleted file mode 100644
index 8326cc13d85..00000000000
--- a/keyboards/planck/keymaps/tom/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# tomholford's layout
-
-This layout is data-driven: I installed [WhatPulse](https://whatpulse.org/) a few months ago and generated a heatmap of the most frequently used keys. I also optimized for my most-used programming languages, and muscle memory.
-
-## Changes from Default
-
-### QWERTY
-
-- swap escape and tab
-- rearrange arrows in original layout
-- swap rshift and Enter
-- map / to original location of left arrow key
-
-### RAISE
-
-- move backslash to backspace
-- map quote to original location from qwerty layer
-- map brightness up / down to original location of left and up arrows
-- map volume up / down to original location of down and right arrows
-
-### LOWER
-
-- move pipe to backspace
-- map quote to original location from qwerty layer
-- map brightness up / down to original location of left and up arrows
-- map volume up / down to original location of down and right arrows
-
-### ADJUST
-
-- map to esc key: screenshot region to clipboard - an alias for ctrl + cmd + shift + 4
-
-
-## RGB LED
-
-- Illuminate when pressing RAISE, LOWER, or ADJUST ([source](https://www.reddit.com/r/olkb/comments/8wvk8s/custom_rgb_configuration_by_keycodelayer/))
diff --git a/keyboards/planck/keymaps/tom/rules.mk b/keyboards/planck/keymaps/tom/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/tom/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/tomkonidas/config.h b/keyboards/planck/keymaps/tomkonidas/config.h
deleted file mode 100644
index 6e6d0f3ac73..00000000000
--- a/keyboards/planck/keymaps/tomkonidas/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* 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
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/tomkonidas/keymap.c b/keyboards/planck/keymaps/tomkonidas/keymap.c
deleted file mode 100644
index 9f9464280f4..00000000000
--- a/keyboards/planck/keymaps/tomkonidas/keymap.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-
-enum planck_layers {
-  _DVORAK,
-  _QWERTY,
-  _COLEMAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  DVORAK = SAFE_RANGE,
-  QWERTY,
-  COLEMAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    KC_LCTL, KC_LALT, BACKLIT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  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_LALT, BACKLIT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    KC_LCTL, KC_LALT, BACKLIT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |      |      |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/tomkonidas/readme.md b/keyboards/planck/keymaps/tomkonidas/readme.md
deleted file mode 100644
index fa62bf8be75..00000000000
--- a/keyboards/planck/keymaps/tomkonidas/readme.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Planck Rev6 Layers
-
-```
- Dvorak
- ,-----------------------------------------------------------------------------------.
- | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- `-----------------------------------------------------------------------------------'
-
-```
-
-```
- Qwerty
- ,-----------------------------------------------------------------------------------.
- | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- `-----------------------------------------------------------------------------------'
-
-```
-
-```
- Colemak
- ,-----------------------------------------------------------------------------------.
- | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- `-----------------------------------------------------------------------------------'
-
-```
-
-```
- Lower
- ,-----------------------------------------------------------------------------------.
- |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- `-----------------------------------------------------------------------------------'
-
-```
-
-```
- Raise
- ,-----------------------------------------------------------------------------------.
- |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- `-----------------------------------------------------------------------------------'
-
-```
-
-
-```
- Adjust (Lower + Raise)
-                      v------------------------RGB CONTROL--------------------v
- ,-----------------------------------------------------------------------------------.
- |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |      |      |      |      |      |      |      |      |      |      |      |
- `-----------------------------------------------------------------------------------'
-
-```
-
-```
- Plover layer (http://opensteno.org)
- ,-----------------------------------------------------------------------------------.
- |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- |------+------+------+------+------+------+------+------+------+------+------+------|
- | Exit |      |      |   A  |   O  |      |      |   E  |   U  |      |      |      |
- `-----------------------------------------------------------------------------------'
-
-```
diff --git a/keyboards/planck/keymaps/tomkonidas/rules.mk b/keyboards/planck/keymaps/tomkonidas/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/tomkonidas/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/tong92/keymap.c b/keyboards/planck/keymaps/tong92/keymap.c
deleted file mode 100644
index 52549854413..00000000000
--- a/keyboards/planck/keymaps/tong92/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-//Author: tong92 <tong92power@gmail.com>
-
-#include QMK_KEYBOARD_H
-
-enum planck_layers {
-  _WINDOW,
-  _MAC,
-  _LOWER,
-  _RAISE,
-  _WINDOW_SHORTCUT,
-  _MAC_SHORTCUT,
-  _MOUSE
-};
-
-enum planck_keycodes {
-  WINDOW = SAFE_RANGE,
-  MAC,
-  MOUSE,
-  BACKLIT,
-  EXT_MOUSE
-};
-
-#define LOWER M(1)
-#define RAISE M(2)
-#define WINDOW_SHORTCUT MO(_WINDOW_SHORTCUT)
-#define MAC_SHORTCUT MO(_MAC_SHORTCUT)
-
-//MIT Layout
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Window - Qwerty
-* ,-----------------------------------------------------------------------.
-* |Tab  | q   | w   | e   | r   | t   | y   | u   | i   | o   | p   | BS  |
-* |-----------------------------------------------------------------------|
-* |Ctrl | a   | s   | d   | f   | g   | h   | j   | k   | l   | ;   |enter|
-* |-----------------------------------------------------------------------|
-* |Shift| z   | x   | c   | v   | b   | n   | m   |  ,  |  .  |  /  |Shift|
-* |-----------------------------------------------------------------------|
-* | Fn  |Ctrl | Win | Alt |Lower|   Space   |Upper|  '  |  [  |  ]  | Alt |
-* `-----------------------------------------------------------------------'
-*/
-[_WINDOW] = LAYOUT_planck_grid(
-KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R, KC_T,  KC_Y,  KC_U, KC_I,   KC_O,   KC_P,   KC_BSPC,
-KC_LCTL,KC_A,   KC_S,   KC_D,   KC_F, KC_G,  KC_H,  KC_J, KC_K,   KC_L,   KC_SCLN,KC_ENT ,
-KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V, KC_B,  KC_N,  KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
-WINDOW_SHORTCUT,  KC_RCTL,KC_LGUI,KC_LALT,LOWER,KC_SPC,KC_SPC,RAISE,KC_QUOT,KC_LBRC,KC_RBRC,KC_RALT
-),
-/* Mac - Qwerty
-* ,-----------------------------------------------------------------------.
-* |Tab  | q   | w   | e   | r   | t   | y   | u   | i   | o   | p   | BS  |
-* |-----------------------------------------------------------------------|
-* |LComd| a   | s   | d   | f   | g   | h   | j   | k   | l   | ;   |enter|
-* |-----------------------------------------------------------------------|
-* |Shift| z   | x   | c   | v   | b   | n   | m   |  ,  |  .  |  /  |Shift|
-* |-----------------------------------------------------------------------|
-* | Fn  |Lang |Ctrl | Alt |Lower|   Space   |Upper|  '  |  [  |  ]  |SPOT |
-* `-----------------------------------------------------------------------'
-*/
-[_MAC] = LAYOUT_planck_grid(
-KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R, KC_T,  KC_Y,  KC_U, KC_I,   KC_O,   KC_P,   KC_BSPC,
-KC_LGUI,KC_A,   KC_S,   KC_D,   KC_F, KC_G,  KC_H,  KC_J, KC_K,   KC_L,   KC_SCLN,KC_ENT ,
-KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V, KC_B,  KC_N,  KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
-MAC_SHORTCUT,  LCTL(KC_SPC),KC_LCTL,KC_LALT,LOWER,KC_SPC,KC_SPC,RAISE,KC_QUOT,KC_LBRC,KC_RBRC,LGUI(KC_SPC)
-),
-/* LOWER
-* ,-----------------------------------------------------------------------.
-* |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | BS  |
-* |-----------------------------------------------------------------------|
-* |     | F1  | F2  | F3  | F4  | F5  | F6  |  -  |  +  |  [  |  ]  |  \  |
-* |-----------------------------------------------------------------------|
-* |     | F7  | F8  | F9  | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
-* |-----------------------------------------------------------------------|
-* |     |     |     |     |     |   SPACE   |     | END | LEFT| DOWN|RIGHT|
-* `-----------------------------------------------------------------------'
-*/
-[_LOWER] = LAYOUT_planck_grid(
-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_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5, KC_F6, KC_MINS,KC_PLUS,KC_LBRC,KC_RBRC,KC_BSLS ,
-_______,KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,KC_F12,_______,KC_HOME,KC_PGUP,KC_UP  ,KC_PGDN ,
-XXXXXXX,_______,_______,_______,_______,KC_SPC,KC_SPC,_______,KC_END, KC_LEFT,KC_DOWN,KC_RIGHT
-),
-/* RAISE
-* ,-----------------------------------------------------------------------.
-* |  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  | BS  |
-* |-----------------------------------------------------------------------|
-* |     | F1  | F2  | F3  | F4  | F5  | F6  |  _  |  =  |  {  |  }  |  |  |
-* |-----------------------------------------------------------------------|
-* |     | F7  | F8  | F9  | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
-* |-----------------------------------------------------------------------|
-* |     |     |     |     |     |   SPACE   |     | END | LEFT| DOWN|RIGHT|
-* `-----------------------------------------------------------------------'
-*/
-[_RAISE] = LAYOUT_planck_grid(
-KC_TILD,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_BSPC ,
-_______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_UNDS,KC_EQL, KC_LCBR,KC_RCBR,KC_PIPE ,
-_______,KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,KC_HOME,KC_PGUP,KC_UP  ,KC_PGDN ,
-XXXXXXX,_______,_______,_______,_______,KC_SPC, KC_SPC, _______,KC_END, KC_LEFT,KC_DOWN,KC_RIGHT
-),
-/* Window Shortcut
-* ,-----------------------------------------------------------------------.
-* | ESC |WinOf|WinUp|     |     |Sh+Ca|     | PgUp| UP  | PgDo|PrtSc| DEL |
-* |-----------------------------------------------------------------------|
-* |     |WinLe|WinDo|WinRi|     |Al+Ca|CapsL| LEFT| DOWN|RIGHT|     |     |
-* |-----------------------------------------------------------------------|
-* |     |WinLW|WinRW|     |     |Ct+Ca|ScroL| HOME|     | END |     |     |
-* |-----------------------------------------------------------------------|
-* |     |DeskL|DeskR|DeskX|Task | ChangeLang|     |     |     |     | LED |
-* `-----------------------------------------------------------------------'
-*/
-[_WINDOW_SHORTCUT] = LAYOUT_planck_grid(
-KC_ESC ,LALT(KC_F4)        ,LGUI(KC_UP)         ,XXXXXXX          ,XXXXXXX    ,S(KC_CAPS)   ,XXXXXXX,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,KC_DEL,
-_______,LGUI(KC_LEFT)      ,LGUI(KC_DOWN)       ,LGUI(KC_RIGHT)   ,XXXXXXX    ,LALT(KC_CAPS),KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX,XXXXXXX,
-_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX          ,XXXXXXX    ,LCTL(KC_CAPS),KC_SCRL,KC_HOME,XXXXXXX,KC_END,XXXXXXX,XXXXXXX,
-KC_TRNS,LGUI(LCTL(KC_LEFT)),LGUI(LCTL(KC_RIGHT)),LGUI(LCTL(KC_F4)),LCTL(LALT(KC_DEL)),LGUI(KC_SPC),LGUI(KC_SPC),XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,BACKLIT
-),
-/* Mac Shortcut
-* ,-----------------------------------------------------------------------.
-* | ESC |CmdUp|CmdDo|     |     |     |     | PgUp| UP  | PgDo|PrtSc| DEL |
-* |-----------------------------------------------------------------------|
-* |     |WBlkL|WBlkR|     |ScrF |     |CapsL| LEFT| DOWN|RIGHT|     |     |
-* |-----------------------------------------------------------------------|
-* |     |BlckL|BlckR|     |     |     |     | HOME|     | END |     |     |
-* |-----------------------------------------------------------------------|
-* |     |     |     |     |     |   MOUSE   |     |     |     |     | LED |
-* `-----------------------------------------------------------------------'
-*/
-[_MAC_SHORTCUT] = LAYOUT_planck_grid(
-KC_ESC ,LGUI(KC_UP)        ,LGUI(KC_DOWN)       ,XXXXXXX,XXXXXXX         ,XXXXXXX,XXXXXXX,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,KC_DEL,
-_______,LALT(LSFT(KC_LEFT)),LALT(LSFT(KC_RIGHT)),XXXXXXX,LGUI(LCTL(KC_F)),XXXXXXX,KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX,XXXXXXX,
-_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX,XXXXXXX         ,XXXXXXX,XXXXXXX,KC_HOME,XXXXXXX,KC_END,XXXXXXX,XXXXXXX,
-KC_TRNS,_______            ,_______             ,MOUSE  ,MOUSE           ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,BACKLIT
-),
-/* 10: mouse layer
-* ,-----------------------------------------------------------------------.
-* |     |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     |QK_BOOT|
-* |-----------------------------------------------------------------------|
-* |     |     |Mo_Le|Mo_Do|Mo_Ri|     |     |M_Bt1|M_WhD|M_Bt2|     |     |
-* |-----------------------------------------------------------------------|
-* |     |     |     |     |     |     |     |M_AC0|M_AC1|M_AC2|     |WINDO|
-* |-----------------------------------------------------------------------|
-* |     |     |     |     |     |  GO_DEFT  |     |     |     |     | MAC |
-* `-----------------------------------------------------------------------'
-*/
-[_MOUSE] = LAYOUT_planck_grid(
-XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,XXXXXXX,KC_WH_L,KC_WH_U,KC_WH_R,XXXXXXX,QK_BOOT,
-XXXXXXX,XXXXXXX,KC_MS_L,KC_MS_D,KC_MS_R,XXXXXXX,XXXXXXX,KC_BTN1,KC_WH_D,KC_BTN2,XXXXXXX,XXXXXXX,
-XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_ACL0,KC_ACL1,KC_ACL2,XXXXXXX,WINDOW,
-XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,EXT_MOUSE,EXT_MOUSE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,MAC
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case WINDOW:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WINDOW);
-      }
-      return false;
-      break;
-    case MAC:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_MAC);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      }
-      return false;
-      break;
-    case MOUSE:
-      if (record->event.pressed) {
-        layer_on(_MOUSE);
-      }
-      return false;
-      break;
-    case EXT_MOUSE:
-      if (record->event.pressed) {
-        layer_off(_MOUSE);
-        layer_off(_WINDOW_SHORTCUT);
-        layer_off(_MAC_SHORTCUT);
-      }
-      return false;
-      break;
-  }
-  return true;
-};
diff --git a/keyboards/planck/keymaps/tong92/readme.md b/keyboards/planck/keymaps/tong92/readme.md
deleted file mode 100644
index 328d005f6f5..00000000000
--- a/keyboards/planck/keymaps/tong92/readme.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# The Tong92 Layout
-- MIT Layout
-- my keymap for WIndow User
-- Lower && Upper Hold -> Mouse Layer
-- Mouse Layer : space -> Default Layer
-- No Audio
-
-## 1. Default Layer - Qwerty 
-
-    ,-----------------------------------------------------------------------.
-    |Tab  | q   | w   | e   | r   | t   | y   | u   | i   | o   | p   | BS  |
-    |-----------------------------------------------------------------------|
-    |Ctrl | a   | s   | d   | f   | g   | h   | j   | k   | l   | ;   |enter|
-    |-----------------------------------------------------------------------|
-    |Shift| z   | x   | c   | v   | b   | n   | m   |  ,  |  .  |  /  |Shift|
-    |-----------------------------------------------------------------------|
-    | Fn  |Ctrl | Win | Alt |Lower|   Space   |Upper|  '  |  [  |  ]  | Alt |
-    `-----------------------------------------------------------------------'
-
-## 2. Lower Layer
-
-    ,-----------------------------------------------------------------------.
-    |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | BS  |
-    |-----------------------------------------------------------------------|
-    |     | F1  | F2  | F3  | F4  | F5  | F6  |  -  |  +  |  [  |  ]  |  \  |
-    |-----------------------------------------------------------------------|
-    |     | F7  | F8  | F9  | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
-    |-----------------------------------------------------------------------|
-    |     |     |     |     |     |   SPACE   |mouse| END | LEFT| DOWN|RIGHT|
-    `-----------------------------------------------------------------------'
-
-## 3. Upper Layer
-
-    ,-----------------------------------------------------------------------.
-    |  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  | BS  |
-    |-----------------------------------------------------------------------|
-    |     | F1  | F2  | F3  | F4  | F5  | F6  |  _  |  =  |  {  |  }  |  |  |
-    |-----------------------------------------------------------------------|
-    |     | F7  | F8  | F9  | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
-    |-----------------------------------------------------------------------|
-    |     |     |     |     |mouse|   SPACE   |     | END | LEFT| DOWN|RIGHT|
-    `-----------------------------------------------------------------------'
-
-## 4. Fn Layer -  Window Shortcuts
-
-    ,-----------------------------------------------------------------------.
-    | ESC |WinOf|WinUp|     |     |Sh+Ca|     | PgUp| UP  | PgDo|PrtSc| DEL |
-    |-----------------------------------------------------------------------|
-    |     |WinLe|WinDo|WinRi|     |Al+Ca|CapsL| LEFT| DOWN|RIGHT|     |     |
-    |-----------------------------------------------------------------------|
-    |     |WinLW|WinRW|     |     |Ct+Ca|ScroL| HOME|     | END |     |     |
-    |-----------------------------------------------------------------------|
-    |     |DeskL|DeskR|DeskX|Task | ChangeLang|     |     |     |     | LED |
-    `-----------------------------------------------------------------------'
-
-## 5. Mouse Layer
-
-    ,-----------------------------------------------------------------------.
-    |     |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     |RESET|
-    |-----------------------------------------------------------------------|
-    |     |     |Mo_Le|Mo_Do|Mo_Ri|     |     |M_Bt1|M_WhD|M_Bt2|     |     |
-    |-----------------------------------------------------------------------|
-    |     |     |     |     |     |     |     |M_AC0|M_AC1|M_AC2|     |     |
-    |-----------------------------------------------------------------------|
-    |     |     |     |     |     |GO_DEFAULT |     |     |     |     |     |
-    `-----------------------------------------------------------------------'
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/tong92/rules.mk b/keyboards/planck/keymaps/tong92/rules.mk
deleted file mode 100644
index f836e54d5e7..00000000000
--- a/keyboards/planck/keymaps/tong92/rules.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device.
-#                Please customize your programmer settings(PROGRAM_CMD)
-#
-# make teensy = Download the hex file to the device, using teensy_loader_cli.
-#               (must have teensy_loader_cli installed).
-#
-# make dfu = Download the hex file to the device, using dfu-programmer (must
-#            have dfu-programmer installed).
-#
-# make flip = Download the hex file to the device, using Atmel FLIP (must
-#             have Atmel FLIP installed).
-#
-# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
-#               (must have dfu-programmer installed).
-#
-# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
-#                (must have Atmel FLIP installed).
-#
-# make debug = Start either simulavr or avarice as specified for debugging,
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
-# Build Options
-#   change to "no" to disable the options, or define them in the makefile.mk in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE  = no # Audio control and System control(+450)
-CONSOLE_ENABLE   = no  # Console for debug(+400)
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-NKRO_ENABLE      = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-MIDI_ENABLE      = no  # MIDI controls
-AUDIO_ENABLE     = no # Audio output on port C6
-UNICODE_ENABLE   = no  # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/ttys0/config.h b/keyboards/planck/keymaps/ttys0/config.h
deleted file mode 100644
index 2c7d3aeecd5..00000000000
--- a/keyboards/planck/keymaps/ttys0/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Sean Johnson
-  *
-  * 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(COLEMAK_SOUND)
-#endif
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/ttys0/keymap.c b/keyboards/planck/keymaps/ttys0/keymap.c
deleted file mode 100644
index c98cda20be1..00000000000
--- a/keyboards/planck/keymaps/ttys0/keymap.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* Copyright 2021 Sean Johnson
-  *
-  * 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"
-
-#define a KC_A
-#define b KC_B
-#define c KC_C
-#define d KC_D
-#define e KC_E
-#define f KC_F
-#define g KC_G
-#define h KC_H
-#define i KC_I
-#define j KC_J
-#define k KC_K
-#define l KC_L
-#define m KC_M
-#define n KC_N
-#define o KC_O
-#define p KC_P
-#define q KC_Q
-#define r KC_R
-#define s KC_S
-#define t KC_T
-#define u KC_U
-#define v KC_V
-#define w KC_W
-#define x KC_X
-#define y KC_Y
-#define z KC_Z
-
-#define lopt KC_LALT
-#define lctl KC_LCTL
-#define lsft KC_LSFT
-#define ropt KC_RALT
-#define rctl KC_RCTL
-#define rsft KC_RSFT
-
-#define n0 KC_0
-#define n1 KC_1
-#define n2 KC_2
-#define n3 KC_3
-#define n4 KC_4
-#define n5 KC_5
-#define n6 KC_6
-#define n7 KC_7
-#define n8 KC_8
-#define n9 KC_9
-
-#define bspc KC_BSPC
-#define caps KC_CAPS
-#define comm KC_COMM
-#define dash A(KC_MINS)
-#define scln KC_SCLN
-#define slsh KC_SLSH
-#define spc KC_SPC
-#define tab KC_TAB
-#define del KC_DEL
-#define dot KC_DOT
-#define ent KC_ENT
-#define mins KC_MINS
-#define quot KC_QUOT
-#define esc KC_ESC
-#define escg QK_GESC
-
-#define down KC_DOWN
-#define home G(KC_LEFT)
-#define end G(KC_RGHT)
-#define up KC_UP
-#define pgdn KC_PGDN
-#define pgup KC_PGUP
-#define left KC_LEFT
-#define rght KC_RGHT
-
-#define tabl G(S(KC_LBRC))
-#define tabr G(S(KC_RBRC))
-#define fwd G(KC_RBRC)
-#define back G(KC_LBRC)
-#define dtl C(KC_LEFT)
-#define dtr C(KC_RGHT)
-#define slup S(A(KC_UP))
-#define sldn S(A(KC_DOWN))
-
-#define f1 KC_F1
-#define f2 KC_F2
-#define f3 KC_F3
-#define f4 KC_F4
-#define f5 KC_F5
-#define f6 KC_F6
-#define f7 KC_F7
-#define f8 KC_F8
-#define f9 KC_F9
-#define f10 KC_F10
-#define f11 KC_F11
-#define f12 KC_F12
-#define f13 KC_F13
-#define f14 KC_F14
-#define f15 KC_F15
-#define f16 KC_F16
-#define f17 KC_F17
-#define f18 KC_F18
-#define f19 KC_F19
-#define f20 KC_F20
-
-#define mute KC_MUTE
-#define next KC_MNXT
-#define play KC_MPLY
-#define prev KC_MPRV
-#define vold KC_VOLD
-#define volu KC_VOLU
-
-#define symb MO(SYMB)
-#define move MO(MOVE)
-#define func MO(FUNC)
-
-#define rset QK_BOOT
-#define powr KC_PWR
-
-#define ____ KC_TRNS
-#define xxxx KC_NO
-
-#define emji LCMD(LCTL(KC_SPC))
-#define hypr OSM(MOD_HYPR)
-#define brup KC_BRMU
-#define brdn KC_BRMD
-#define escf LT(FUNC,KC_ESC)
-
-enum planck_layers {
-    BASE,
-    SYMB,
-    MOVE,
-    FUNC,
-};
-
-enum planck_keycodes {
-    ampr = SAFE_RANGE,
-    astr,
-    at,
-    bsls,
-    circ,
-    dlr,
-    eql,
-    exlm,
-    grv,
-    hash,
-    lbrc,
-    lcbr,
-    lprn,
-    perc,
-    pipe,
-    plus,
-    rbrc,
-    rcbr,
-    rprn,
-    tild,
-    cmd,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BASE] = LAYOUT_planck_grid(
-         tab,    q,    w,    f,    p,    g,    j,    l,    u,    y, scln, mins,
-        bspc,    a,    r,    s,    t,    d,    h,    n,    e,    i,    o, quot,
-        lsft,    z,    x,    c,    v,    b,    k,    m, comm,  dot, slsh, rsft,
-        hypr, lctl, lopt,  cmd, move,  ent,  spc, symb,  cmd, ropt, rctl, func
-    ),
-
-    [SYMB] = LAYOUT_planck_grid(
-         esc,   n7,   n5,   n3,   n1,   n9,   n8,   n0,   n2,   n4,   n6, dash,
-        bspc, lbrc, lcbr, lprn, hash, pipe, astr,  dlr, rprn, rcbr, rbrc,   at,
-        ____,  grv, exlm, circ, tild, perc, ampr, plus, mins,  eql, bsls, ____,
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____
-    ),
-
-    [MOVE] = LAYOUT_planck_grid(
-         esc, xxxx, slup,  dtl,  dtr, xxxx, xxxx, home,   up,  end, xxxx, ____,
-         del, xxxx, sldn, tabl, tabr, xxxx, xxxx, left, down, rght, xxxx, ____,
-        ____, xxxx, xxxx, back,  fwd, xxxx, xxxx, pgdn, pgup, xxxx, xxxx, ____,
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____
-    ),
-
-    [FUNC] = LAYOUT_planck_grid(
-        rset,   f7,   f5,   f3,   f1,   f9,   f8,  f10,   f2,   f4,   f6, volu,
-        powr,  f17,  f15,  f13,  f11,  f19,  f18,  f20,  f12,  f14,  f16, vold,
-        brup, ____, xxxx, xxxx, xxxx, xxxx, xxxx, xxxx, xxxx, xxxx, xxxx, mute,
-        brdn, caps, ____, ____, ____, ____, ____, ____, prev, next, play, ____
-    ),
-};
-
-
-bool send_string_if_keydown(keyrecord_t *record, const char *s) {
-    if (record->event.pressed) {
-        send_string(s);
-    }
-    return true;
-}
-
-int cmd_keys_down = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // Override the default auto shifted symbols to use SEND_STRING See
-        // https://github.com/qmk/qmk_firmware/issues/4072
-        case ampr:
-            return send_string_if_keydown(record, "&");
-        case astr:
-            return send_string_if_keydown(record, "*");
-        case at:
-            return send_string_if_keydown(record, "@");
-        case bsls:
-            return send_string_if_keydown(record, "\\");
-        case circ:
-            return send_string_if_keydown(record, "^");
-        case dlr:
-            return send_string_if_keydown(record, "$");
-        case eql:
-            return send_string_if_keydown(record, "=");
-        case exlm:
-            return send_string_if_keydown(record, "!");
-        case grv:
-            return send_string_if_keydown(record, "`");
-        case hash:
-            return send_string_if_keydown(record, "#");
-        case lbrc:
-            return send_string_if_keydown(record, "[");
-        case lcbr:
-            return send_string_if_keydown(record, "{");
-        case lprn:
-            return send_string_if_keydown(record, "(");
-        case perc:
-            return send_string_if_keydown(record, "%");
-        case pipe:
-            return send_string_if_keydown(record, "|");
-        case plus:
-            return send_string_if_keydown(record, "+");
-        case rbrc:
-            return send_string_if_keydown(record, "]");
-        case rcbr:
-            return send_string_if_keydown(record, "}");
-        case rprn:
-            return send_string_if_keydown(record, ")");
-        case tild:
-            return send_string_if_keydown(record, "~");
-
-        // cmd + cmd -> cmd + ctl
-        case cmd:
-            if (record->event.pressed) {
-                if (cmd_keys_down == 0) {
-                    register_code(KC_LCMD);
-                } else {
-                    register_code(KC_LCTL);
-                }
-                cmd_keys_down++;
-            } else {
-                if (cmd_keys_down == 1) {
-                    unregister_code(KC_LCMD);
-                } else {
-                    unregister_code(KC_LCTL);
-                }
-                cmd_keys_down--;
-            }
-            return true;
-    }
-    return true;
-}
-
diff --git a/keyboards/planck/keymaps/ttys0/readme.md b/keyboards/planck/keymaps/ttys0/readme.md
deleted file mode 100644
index 9684d1042d5..00000000000
--- a/keyboards/planck/keymaps/ttys0/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Sean's Planck Config
-
-This is basically a copy of the `callum` layout with a few minor adjustments to better fit my style.
-
-[Keyboard Layout Editor](http://www.keyboard-layout-editor.com/#/gists/7fef3554143712e2317b466c09a73a27)
diff --git a/keyboards/planck/keymaps/ttys0/rules.mk b/keyboards/planck/keymaps/ttys0/rules.mk
deleted file mode 100644
index faa09801bec..00000000000
--- a/keyboards/planck/keymaps/ttys0/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Make some noise
-SRC += muse.c
-
-
diff --git a/keyboards/planck/keymaps/tylerwince/config.h b/keyboards/planck/keymaps/tylerwince/config.h
deleted file mode 100644
index d0fb8680e33..00000000000
--- a/keyboards/planck/keymaps/tylerwince/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-#define STARTUP_SONG SONG(PLANCK_SOUND)
-#endif
-
-#define MIDI_BASIC
-
-#define ENCODER_RESOLUTION 4
-
-/*
-  Set any config.h overrides for your specific keymap here.
-  See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
-*/
-#define QUICK_TAP_TERM 0
-
-#define EECONFIG_RGB_MATRIX (uint32_t *)16
diff --git a/keyboards/planck/keymaps/tylerwince/keymap.c b/keyboards/planck/keymaps/tylerwince/keymap.c
deleted file mode 100644
index 5477dab6a18..00000000000
--- a/keyboards/planck/keymaps/tylerwince/keymap.c
+++ /dev/null
@@ -1,296 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum planck_keycodes {
-  RGB_SLD = SAFE_RANGE,
-  TOGGLE_LAYER_COLOR,
-};
-
-enum planck_layers {
-  _BASE,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-  _LAYER4,
-};
-
-//Tap Dance Declarations
-enum {
-  TD_SEMI_COLON,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_SEMI_COLON] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN),
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_planck_grid(
-            /* _BASE
-             * ,-----------------------------------------------------------------------------------.
-             * | Tab  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |   /  |
-             * |------+------+------+------+------+-------------+------+------+------+------+------|
-             * |CtlEsc|   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  | Bksp |
-             * |------+------+------+------+------+------|------+------+------+------+------+------|
-             * |      |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-             * |------+------+------+------+------+------+------+------+------+------+------+------|
-             * |      | Ctrl | Alt  | GUI  |LOWER | Shift/Space | RAISE|      |      |      |      |
-             * `-----------------------------------------------------------------------------------'
-             */
-          KC_TAB,            KC_QUOTE,          KC_COMMA, KC_DOT,  KC_P,  KC_Y,             KC_F,  KC_G,  KC_C,    KC_R,    KC_L,    KC_SLASH,
-          LCTL_T(KC_ESCAPE), KC_A,              KC_O,     KC_E,    KC_U,  KC_I,             KC_D,  KC_H,  KC_T,    KC_N,    KC_S,    KC_BSPC,
-          _______,           TD(TD_SEMI_COLON), KC_Q,     KC_J,    KC_K,  KC_X,             KC_B,  KC_M,  KC_W,    KC_V,    KC_Z,    KC_ENTER,
-          _______,           KC_LCTL,           KC_LALT,  KC_LGUI, LOWER, LSFT_T(KC_SPACE), KC_NO, RAISE, _______, _______, _______, _______
-          ),
-
-  [_LOWER] = LAYOUT_planck_grid(
-            /* _LOWER
-             * ,-----------------------------------------------------------------------------------.
-             * |  `   |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   \  |
-             * |------+------+------+------+------+-------------+------+------+------+------+------|
-             * |  ~   |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   |  |
-             * |------+------+------+------+------+------|------+------+------+------+------+------|
-             * |      |      |      |      |      |      |      |   _  |   +  |   {  |   }  |Delete|
-             * |------+------+------+------+------+------+------+------+------+------+------+------|
-             * |      | Ctrl | Alt  | GUI  |LOWER | Shift/Space | RAISE|      |   [  |   ]  |      |
-             * `-----------------------------------------------------------------------------------'
-             */
-          KC_GRAVE, KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,        KC_0,    KC_BSLS,
-          KC_TILD,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,     KC_RPRN, KC_PIPE,
-          _______,  _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR,     KC_RCBR, KC_DELETE,
-          _______,  KC_LCTL,  KC_LALT, KC_LGUI, _______, _______, KC_NO,   _______, _______, KC_LBRC,     KC_RBRC, _______
-          ),
-
-  [_RAISE] = LAYOUT_planck_grid(
-            /* _RAISE
-             * ,-----------------------------------------------------------------------------------.
-             * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |      |      |      |RIGHT |      |
-             * |------+------+------+------+------+-------------+------+------+------+------+------|
-             * |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      | LEFT |      |      |      |Delete|
-             * |------+------+------+------+------+------|------+------+------+------+------+------|
-             * |      |      |      | DOWN |  UP  |      |      |   -  |   =  |      |      |      |
-             * |------+------+------+------+------+------+------+------+------+------+------+------|
-             * |THINGS|1PASS |      |      |LOWER | Shift/Space | RAISE|      |      |      |      |
-             * `-----------------------------------------------------------------------------------'
-             */
-
-          KC_F1,          KC_F2,           KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______,  _______,  _______, KC_RIGHT, _______,
-          KC_F7,          KC_F8,           KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_LEFT,  _______,  _______, _______,  KC_DELETE,
-          _______,        _______,         _______, KC_DOWN, KC_UP,   _______, _______, KC_MINUS, KC_EQUAL, _______, _______,  _______,
-          LALT(KC_SPACE), LGUI(KC_BSLS),   _______, _______, _______, _______, KC_NO,   _______,  _______,  _______, _______,  _______
-          ),
-
-  [_ADJUST] = LAYOUT_planck_grid(
-            /* _LOWER
-             * ,-----------------------------------------------------------------------------------.
-             * |Reset |      |      |      |      |WIN-TL|WIN-TR|      |      |      |WIN-R |      |
-             * |------+------+------+------+------+-------------+------+------+------+------+------|
-             * |      |      |      |      |      |WIN-BL|WIN-BR|WIN-L |      |      |      |      |
-             * |------+------+------+------+------+------|------+------+------+------+------+------|
-             * |      |      |      |WIN-B |WIN-T |      |      |      |      |      |      |      |
-             * |------+------+------+------+------+------+------+------+------+------+------+------|
-             * | BASE |LAYER4|      |      |LOWER | Shift/Space | RAISE|VOL-DN| BR-DN|BR-UP |VOL-UP|
-             * `-----------------------------------------------------------------------------------'
-             */
-
-          QK_BOOT, _______, _______, _______,          _______,          LALT(LCTL(KC_7)), LALT(LCTL(KC_8)), _______,          _______,           _______, LALT(LCTL(KC_L)), _______,
-          _______, _______, _______, _______,          _______,          LALT(LCTL(KC_U)), LALT(LCTL(KC_I)), LALT(LCTL(KC_H)), _______,           _______, _______,          _______,
-          _______, _______, _______, LALT(LCTL(KC_J)), LALT(LCTL(KC_K)), _______,          _______,          _______,          _______,           _______, _______,          LALT(LCTL(KC_ENTER)),
-          TO(0),   TO(4),   _______, _______,          _______,          _______,          KC_NO,            _______,          KC_AUDIO_VOL_DOWN, KC_F14,  KC_F15,           KC_AUDIO_VOL_UP
-          ),
-
-  [_LAYER4] = LAYOUT_planck_grid(
-            /* _LOWER
-             * ,-----------------------------------------------------------------------------------.
-             * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   '  |
-             * |------+------+------+------+------+-------------+------+------+------+------+------|
-             * |CtlEsc|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Bksp |
-             * |------+------+------+------+------+------|------+------+------+------+------+------|
-             * |      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-             * |------+------+------+------+------+------+------+------+------+------+------+------|
-             * |      | Ctrl | Alt  | GUI  |LOWER | Shift/Space | RAISE|      |      |      |      |
-             * `-----------------------------------------------------------------------------------'
-             */
-
-          KC_TAB,            KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,             KC_Y,  KC_U,  KC_I,     KC_O,    KC_P,      KC_QUOTE,
-          LCTL_T(KC_ESCAPE), KC_A,    KC_S,    KC_D,    KC_F,  KC_G,             KC_H,  KC_J,  KC_K,     KC_L,    KC_SCLN, KC_BSPC,
-          _______,           KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,             KC_N,  KC_M,  KC_COMMA, KC_DOT,  KC_SLASH,  KC_ENTER,
-          _______,           KC_LCTL, KC_LALT, KC_LGUI, LOWER, LSFT_T(KC_SPACE), KC_NO, RAISE, _______,  _______, _______,   _______
-          ),
-
-};
-
-extern bool g_suspend_state;
-extern rgb_config_t rgb_matrix_config;
-bool disable_layer_color = 0;
-
-void keyboard_post_init_user(void) {
-  rgb_matrix_enable();
-}
-
-const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
-    [0] = { {32,255,234}, {32,255,234}, {12,225,241}, {12,225,241}, {0,204,255}, {0,204,255}, {169,120,255}, {169,120,255}, {169,120,255}, {146,224,255}, {146,224,255}, {146,224,255},
-            {32,255,234}, {32,255,234}, {12,225,241}, {12,225,241}, {0,204,255}, {0,204,255}, {169,120,255}, {169,120,255}, {169,120,255}, {146,224,255}, {146,224,255}, {146,224,255},
-            {32,255,234}, {32,255,234}, {12,225,241}, {12,225,241}, {0,204,255}, {0,204,255}, {169,120,255}, {169,120,255}, {169,120,255}, {146,224,255}, {146,224,255}, {146,224,255},
-            {32,255,234}, {32,255,234}, {12,225,241}, {12,225,241}, {0,204,255}, {0,0,0},     {169,120,255}, {169,120,255}, {146,224,255}, {146,224,255}, {146,224,255} },
-
-    [1] = { {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255},
-            {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255},
-            {0,0,0},     {0,0,0},     {0,0,0},     {0,0,0},     {0,0,0},     {0,0,0},     {0,0,0},     {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255},
-            {0,0,0},     {0,204,255}, {0,204,255}, {0,204,255}, {0,204,255}, {0,0,0},     {0,0,0},     {0,0,0},     {0,204,255}, {0,204,255}, {0,0,0} },
-
-    [2] = { {169,120,255}, {169,120,255}, {169,120,255}, {169,120,255}, {169,120,255}, {169,120,255}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {169,120,255}, {0,0,0},
-            {169,120,255}, {169,120,255}, {169,120,255}, {169,120,255}, {169,120,255}, {169,120,255}, {0,0,0}, {169,120,255}, {0,0,0}, {0,0,0}, {0,0,0}, {169,120,255},
-            {0,0,0}, {0,0,0}, {0,0,0}, {169,120,255}, {169,120,255}, {0,0,0}, {0,0,0}, {169,120,255}, {169,120,255}, {0,0,0}, {0,0,0}, {0,0,0},
-            {169,120,255}, {169,120,255}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {169,120,255}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0} },
-
-    [4] = { {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255}, {105,255,255} },
-
-};
-
-void set_layer_color(int layer) {
-  for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-    HSV hsv = {
-      .h = pgm_read_byte(&ledmap[layer][i][0]),
-      .s = pgm_read_byte(&ledmap[layer][i][1]),
-      .v = pgm_read_byte(&ledmap[layer][i][2]),
-    };
-    if (!hsv.h && !hsv.s && !hsv.v) {
-        rgb_matrix_set_color( i, 0, 0, 0 );
-    } else {
-        RGB rgb = hsv_to_rgb( hsv );
-        rgb_matrix_set_color( i, rgb.r, rgb.g, rgb.b );
-    }
-  }
-}
-
-bool rgb_matrix_indicators_user(void) {
-  if (g_suspend_state || disable_layer_color) { return; }
-  switch (get_highest_layer(layer_state)) {
-    case 0:
-      set_layer_color(0);
-      break;
-    case 1:
-      set_layer_color(1);
-      break;
-    case 2:
-      set_layer_color(2);
-      break;
-    case 4:
-      set_layer_color(4);
-      break;
-  }
-    return false;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case RGB_SLD:
-      if (record->event.pressed) {
-        rgblight_mode(1);
-      }
-      return false;
-    case RGB_TOG:
-  if (record->event.pressed) {
-    if (rgb_matrix_config.val) {
-      rgb_matrix_sethsv(rgb_matrix_config.hue, rgb_matrix_config.sat, 0);
-    } else {
-      rgb_matrix_sethsv(rgb_matrix_config.hue, rgb_matrix_config.sat, 255);
-    }
-  }
-  return false;
-    case TOGGLE_LAYER_COLOR:
-      if (record->event.pressed) {
-        disable_layer_color ^= 1;
-      }
-      return false;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (muse_mode) {
-        if (IS_LAYER_ON(_RAISE)) {
-            if (clockwise) {
-                muse_offset++;
-            } else {
-                muse_offset--;
-            }
-        } else {
-            if (clockwise) {
-                muse_tempo+=1;
-            } else {
-                muse_tempo-=1;
-            }
-        }
-    } else {
-        if (clockwise) {
-        #ifdef MOUSEKEY_ENABLE
-            tap_code(KC_MS_WH_DOWN);
-        #else
-            tap_code(KC_PGDN);
-        #endif
-        } else {
-        #ifdef MOUSEKEY_ENABLE
-            tap_code(KC_MS_WH_UP);
-        #else
-            tap_code(KC_PGUP);
-        #endif
-        }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-    case RAISE:
-    case LOWER:
-        return false;
-    default:
-        return true;
-    }
-}
-layer_state_t layer_state_set_user(layer_state_t state) {
-    palClearPad(GPIOB, 8);
-    palClearPad(GPIOB, 9);
-    uint8_t layer = get_highest_layer(state);
-    switch (layer) {
-        case _LOWER:
-            palSetPad(GPIOB, 9);
-            break;
-        case _RAISE:
-            palSetPad(GPIOB, 8);
-            break;
-        case _ADJUST:
-            palSetPad(GPIOB, 9);
-            palSetPad(GPIOB, 8);
-            break;
-        default:
-            break;
-    }
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/planck/keymaps/tylerwince/rules.mk b/keyboards/planck/keymaps/tylerwince/rules.mk
deleted file mode 100644
index 2c1585883fb..00000000000
--- a/keyboards/planck/keymaps/tylerwince/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-SRC += muse.c
-# Set any rules.mk overrides for your specific keymap here.
-# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
-LTO_ENABLE = yes
-COMMAND_ENABLE = no
-MOUSEKEY_ENABLE = no
-TAP_DANCE_ENABLE=yes
diff --git a/keyboards/planck/keymaps/unagi/config.h b/keyboards/planck/keymaps/unagi/config.h
deleted file mode 100644
index 9b4fb883235..00000000000
--- a/keyboards/planck/keymaps/unagi/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(SONIC_RING)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-    #define MUSIC_ON_SONG SONG(ZELDA_PUZZLE)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define TAPPING_TERM 200
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/unagi/keymap.c b/keyboards/planck/keymaps/unagi/keymap.c
deleted file mode 100644
index 6227a73e4f0..00000000000
--- a/keyboards/planck/keymaps/unagi/keymap.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-// Tap Dance Declarations
-enum {
-  SFT_CAP = 0
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    TD(SFT_CAP), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_T(KC_ENT),
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [SFT_CAP] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          PORTE &= ~(1<<6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          PORTE |= (1<<6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_song);
-        #endif
-        layer_on(_ADJUST);
-      } else {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/planck/keymaps/unagi/readme.md b/keyboards/planck/keymaps/unagi/readme.md
deleted file mode 100644
index 08477d7ee89..00000000000
--- a/keyboards/planck/keymaps/unagi/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# The Unagi Planck Layout
-
-This layout is a modified version of the default Planck keymap with the following additions:
-- Double tap left shift for caps lock
-- Hold enter for right shift (enter on-tap)
-- "Sonic Ring" startup tone
-- "Zelda Puzzle" music tone
-
diff --git a/keyboards/planck/keymaps/unagi/rules.mk b/keyboards/planck/keymaps/unagi/rules.mk
deleted file mode 100644
index 5433b3b6825..00000000000
--- a/keyboards/planck/keymaps/unagi/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC += muse.c
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/planck/keymaps/vaire/config.h b/keyboards/planck/keymaps/vaire/config.h
deleted file mode 100644
index a5e236e4a9e..00000000000
--- a/keyboards/planck/keymaps/vaire/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-#define MOUSEKEY_INTERVAL 16
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 7
-#define MOUSEKEY_WHEEL_DELAY 0
-
-#define MIDI_BASIC
-
-#define BACKLIGHT_BREATHING
-
-
-/* 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/planck/keymaps/vaire/keymap.c b/keyboards/planck/keymaps/vaire/keymap.c
deleted file mode 100644
index 00b49e52d7a..00000000000
--- a/keyboards/planck/keymaps/vaire/keymap.c
+++ /dev/null
@@ -1,125 +0,0 @@
-#include QMK_KEYBOARD_H
- #include "action_layer.h"
-
-
-extern keymap_config_t keymap_config;
-
-#define EXCEL_HOME LALT(KC_H)
-#define EXCEL_COL LCTL(KC_SPC)
-#define EXCEL_ROW LSFT(KC_SPC)
-#define DESK_LEFT LCTL(LGUI(KC_LEFT))
-#define WIN_LEFT LSFT(KC_TAB)
-#define WIN_CLOSE LALT(KC_F4)
-#define WIN_RIGHT KC_TAB
-#define DESK_RIGHT LCTL(LGUI(KC_RGHT))
-#define DOCS LGUI(KC_E)
-#define SNAP_RIGHT LGUI(KC_RGHT)
-#define SNAP_UP LGUI(KC_UP)
-#define SNAP_LEFT LGUI(KC_LEFT)
-#define SNAP_DOWN LGUI(KC_DOWN)
-#define COPY LCTL(KC_C)
-#define PASTE LCTL(KC_V)
-#define CUT LCTL(KC_X)
-#define UNDO LCTL(KC_Z)
-#define FIND LCTL(KC_F)
-
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-
-  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_UP,          SFT_T(KC_ENT),
-    MO(1),      KC_LCTL,    	KC_LALT,        KC_LGUI,        MO(2),          LT(5,KC_ENT),   LT(4,KC_SPC), 	MO(3),      	KC_SLSH,    	KC_LEFT,        KC_DOWN,        CTL_T(KC_RGHT)),
-
-  LAYOUT_planck_grid(
-    KC_ESC,     KC_NUM,     	LCTL(KC_SPC),   KC_UP,          LSFT(KC_SPC),   KC_DLR,         KC_EQL,     	KC_P7,      	KC_P8,      	KC_P9,          KC_PPLS,        LCTL(KC_BSPC),
-    KC_TAB,     FIND,       	KC_LEFT,        KC_DOWN,        KC_RGHT,        KC_PERC,        KC_CIRC,    	KC_P4,      	KC_P5,      	KC_P6,          KC_PMNS,        KC_BSLS,
-    KC_LSFT,    UNDO,       	CUT,            COPY,           PASTE,          EXCEL_HOME,     KC_PSCR,    	KC_P1,      	KC_P2,      	KC_P3,          KC_PSLS,        KC_LSFT,
-    KC_TRNS, 	KC_LCTL,    	KC_LALT,        KC_LGUI,        TO(1),          KC_ENT,         KC_SPC,     	KC_PENT,    	KC_P0,      	KC_PDOT,        KC_PAST,        KC_LCTL),
-
-  LAYOUT_planck_grid(
-    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_CAPS,    KC_F1,      	KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,      	KC_UNDS,    	KC_EQL,     	KC_LT,        	KC_GT,       	KC_LPRN,
-    KC_LSFT,    KC_F7,      	KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,     	KC_MUTE,    	KC_MPLY,    	KC_MNXT,       	KC_PGUP,       	SFT_T(KC_VOLU),
-    TO(0),      KC_LCTL,    	KC_LALT,        KC_LGUI,        KC_TRNS,      	KC_ENT,         KC_SPC,     	MO(3),      	KC_PSCR,    	KC_MPRV,        KC_PGDN,    	CTL_T(KC_VOLD)),
-
-  LAYOUT_planck_grid(
-    KC_TILD,    DESK_LEFT,  	WIN_LEFT,       KC_F4,          WIN_RIGHT,      DESK_RIGHT,     DOCS,       	SNAP_LEFT, 	SNAP_UP,     	SNAP_RIGHT,     SNAP_DOWN,      KC_DEL,
-    KC_CAPS,    KC_QUOT,    	KC_LBRC,        KC_LCBR,        KC_LPRN,        KC_BSLS,        KC_SLSH,    	KC_RPRN, 	KC_RCBR,     	KC_RBRC,    	KC_DQUO,        KC_QUOT,
-    KC_PWR,     KC_SLEP,    	KC_WAKE,        KC_HOME,        BL_BRTG,        BL_STEP,        KC_TRNS,    	KC_CALC, 	KC_LT,     	    KC_GT,     	    KC_COLON,   	KC_LSFT,
-    TO(0),      KC_LCTL,    	KC_LALT,        KC_LGUI,        KC_LALT,        KC_LCTL,        KC_TRNS,    	KC_TRNS, 	AU_TOGG,      	MU_TOGG,     	MU_NEXT,     	LCTL(KC_RGHT)),
-
-  LAYOUT_planck_grid(
-    TO(0),      KC_LSCR,    	WIN_LEFT,       KC_MS_WH_UP,    WIN_RIGHT,  	KC_TRNS,        KC_TRNS,    	KC_MS_BTN1, 	KC_MS_U,    	KC_MS_BTN2,    	KC_TRNS,        KC_TRNS,
-    KC_TRNS,    KC_INS,    	    KC_MS_WH_LEFT,  KC_MS_WH_DOWN,  KC_MS_WH_RIGHT, KC_TRNS,        KC_TRNS,    	KC_MS_L,    	KC_MS_D,    	KC_MS_R,        KC_TRNS,        KC_TRNS,
-    QK_BOOT,    KC_APP,    	    KC_MS_ACCEL0,   KC_MS_ACCEL0,   KC_MS_ACCEL0,   KC_TRNS,        KC_TRNS,    	TO(0),      	TO(1),      	TO(2),          TO(3),          TO(4),
-    TO(0),      KC_MENU,    	KC_TRNS,        KC_TRNS,        KC_LALT,        KC_LCTL,        KC_TRNS,     	KC_TRNS,    	KC_TRNS,    	KC_LEFT,        KC_DOWN,   	KC_RCTL),
-
-  LAYOUT_planck_grid(
-    KC_BSPC,    KC_P,       	KC_O,           KC_I,           KC_U,           KC_Y,           KC_T,       	KC_R,       	KC_E,       	KC_W,           KC_Q,            KC_BSPC,
-    KC_TAB,     KC_SCLN,        KC_L,           KC_K,           KC_J,           KC_H,           KC_G,       	KC_F,       	KC_D,       	KC_S,           KC_A,            KC_QUOT,
-    KC_LSFT,    KC_ENT,         KC_DOT,    	    KC_COMM,   	    KC_M,           KC_N,           KC_B,       	KC_V,       	KC_C,		   KC_X,         	KC_Z,            SFT_T(KC_ENT),
-    TO(0),      KC_LCTL,        KC_LALT,        KC_LGUI,        MO(2),          KC_TRNS,   	    KC_TRNS,     	MO(3),      	KC_SLSH,    	KC_LEFT,        KC_DOWN,	     LCTL(KC_RGHT)),
-
-
-
-};
-
-
-#ifdef AUDIO_ENABLE
-
-void matrix_init_user(void)
-{
-    set_voice(default_voice);
-    println("Matrix Init");
-}
-
-bool led_update_user(led_t led_state)
-{
-    static led_t old_led_state = {0};
-
-    _delay_ms(10); // gets rid of tick
-
-    if (!is_playing_notes())
-    {
-        if (led_state.caps_lock && !old_led_state.caps_lock)
-        {
-                // If CAPS LK LED is turning on...
-                PLAY_SONG(tone_caps_on);
-        }
-        else if (!led_state.caps_lock && old_led_state.caps_lock)
-        {
-                // If CAPS LK LED is turning off...
-                PLAY_SONG(tone_caps_off);
-        }
-        else if (led_state.num_lock && !old_led_state.num_lock)
-        {
-                // If NUM LK LED is turning on...
-                PLAY_SONG(tone_numlk_on);
-        }
-        else if (!led_state.num_lock && old_led_state.num_lock)
-        {
-                // If NUM LED is turning off...
-                PLAY_SONG(tone_numlk_off);
-        }
-        else if (led_state.scroll_lock && !old_led_state.scroll_lock)
-        {
-                // If SCROLL LK LED is turning on...
-                PLAY_SONG(tone_scroll_on);
-        }
-        else if (!led_state.scroll_lock && old_led_state.scroll_lock)
-        {
-                // If SCROLL LED is turning off...
-                PLAY_SONG(tone_scroll_off);
-        }
-    }
-
-    old_led_state = led_state;
-    return false;
-}
-#endif /* AUDIO_ENABLE */
diff --git a/keyboards/planck/keymaps/vaire/readme.md b/keyboards/planck/keymaps/vaire/readme.md
deleted file mode 100644
index 6ce39de95d6..00000000000
--- a/keyboards/planck/keymaps/vaire/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-#The vaire planck layout
-
-- easy access numpad
-- mouse and wheel controls
-- flipped keyboard for one hand typing
-- sound on all num, scroll, and caps lock
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/vaire/rules.mk b/keyboards/planck/keymaps/vaire/rules.mk
deleted file mode 100644
index 427c06822c5..00000000000
--- a/keyboards/planck/keymaps/vaire/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/planck/keymaps/vifon/config.h b/keyboards/planck/keymaps/vifon/config.h
deleted file mode 100644
index 41cc7245385..00000000000
--- a/keyboards/planck/keymaps/vifon/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-/* A larger buffer for the dynamic macros as this keymap is not taking
- * up that much memory.
- */
-#define DYNAMIC_MACRO_SIZE 256
-
-#endif
diff --git a/keyboards/planck/keymaps/vifon/keymap.c b/keyboards/planck/keymaps/vifon/keymap.c
deleted file mode 100644
index bd82d7b642f..00000000000
--- a/keyboards/planck/keymaps/vifon/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-
-#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 userlayer {
-    _QW = 0,
-    _CM,
-    _PP,
-    _PPG,
-    _NM,
-    _LW,
-    _RS,
-    _DL,
-    _DYN,
-};
-
-enum planck_keycodes {
-    KM_LW = SAFE_RANGE,
-    KM_RS,
-    KM_SHLK,                    /* ShiftLock */
-    KM_HOLD,                    /* Any-key Lock */
-    KM_RST,                     /* Reset */
-    KM_NUM,                     /* Numeric layer */
-    KM_SLP,                     /* Sleep 250 ms */
-    KM_PP_GAME,                 /* Pure Pro Gaming layer */
-    KM_PP_HOLD,                 /* Pure Pro / PP Gaming layer */
-    DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QW] = LAYOUT_planck_mit( /* Qwerty */
-        KC_TAB,        KC_Q,     KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-        CTL_T(KC_ESC), 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, MT(MOD_RSFT, KC_ENT),
-        KC_LCTL,       MO(_DYN), KC_LGUI, KC_LALT, KM_LW,     KC_SPC,     KM_RS, KC_RALT, KC_DOWN, KC_UP,   KC_RCTL
-        ),
-    [_CM] = LAYOUT_planck_mit( /* Colemak */
-        KC_TAB,        KC_Q,     KC_W,    KC_F,    KC_P,  KC_G,   KC_J,   KC_L,  KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-        CTL_T(KC_ESC), 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, MT(MOD_RSFT, KC_ENT),
-        KC_LCTL,       MO(_DYN), KC_LGUI, KC_LALT, KM_LW,     KC_SPC,     KM_RS, KC_RALT, KC_DOWN, KC_UP,   KC_RCTL
-        ),
-    [_PP] = LAYOUT_planck_mit( /* Pure Pro */
-        KC_TAB,  KC_Q,     KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,                 KC_P,    KC_BSPC,
-        KC_ESC,  KC_A,     KC_S,    KC_D,    KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,                 KC_SCLN, KC_ENT,
-        KC_LSFT, KC_Z,     KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, MT(MOD_RSFT, KC_DOT), KC_UP,   MT(MOD_RCTL, KC_SLSH),
-        KC_LCTL, MO(_DYN), KC_LGUI, KC_LALT, KM_LW,     KC_SPC,     KM_RS, KC_RALT, KC_LEFT,              KC_DOWN, KC_RGHT
-        ),
-    [_PPG] = LAYOUT_planck_mit( /* Pure Pro: Gaming */
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, KC_RCTL,
-        _______, _______, KM_LW,   _______, KM_RS,        _______,     KM_RS  , _______, _______, _______, _______
-        ),
-    [_NM] = LAYOUT_planck_mit( /* Numeric */
-        KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,  _______, MT(MOD_RSFT, KC_ENT),
-        _______, _______, _______, _______, _______,      KC_SPC,      _______, _______, _______, _______, _______
-        ),
-    [_LW] = LAYOUT_planck_mit( /* LOWER */
-        KC_TILD, KC_EXLM,    KC_AT,      KC_HASH,    KC_DLR,     KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-        KC_ESC,  LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), KM_NUM,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-        _______, LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), KM_SLP,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_ENT,
-        _______, BL_TOGG,    _______,    _______,    _______,          KC_BTN1,       _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-        ),
-    [_RS] = LAYOUT_planck_mit( /* RAISE */
-        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_ESC,  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,  DF(_QW), DF(_CM), KM_PP_HOLD, KM_RST,  KC_ENT,
-        _______, BL_STEP, _______, _______, _______,     KC_BTN2,      _______, KC_MPLY, KC_VOLD,    KC_VOLU, _______
-        ),
-    [_DL] = LAYOUT_planck_mit( /* DUAL */
-        _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______,     _______,        KC_APP,  KC_INS,  _______, KC_PSCR, _______,
-        _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,     KC_LEFT,        KC_DOWN, KC_UP,   KC_RGHT, KC_ACL0, KC_ACL2,
-        _______, _______, KC_BTN2, KC_BTN3, KC_BTN1, KC_WWW_BACK, KC_WWW_FORWARD, KC_MUTE, _______, _______, _______, _______,
-        _______, _______, KC_LGUI, KC_LALT, _______,           _______,           _______, _______, _______, _______, _______
-        ),
-    [_DYN] = LAYOUT_planck_mit( /* special */
-        KM_HOLD,  DM_REC1, DM_PLY1, _______, _______,    _______, _______, KC_APP,  KC_INS,  _______, KC_PSCR, KC_PAUS,
-        QK_LOCK,  DM_REC2, DM_PLY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM,
-        KM_SHLK,  _______,        _______,         _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-        _______,  _______,        _______,         _______, KM_PP_GAME,      DF(_QW),     DF(_PP), _______, _______, _______, _______
-        ),
-};
-
-/* It's a pseudo-layer composed of two real layers, we need a function for this. */
-void enable_gaming_layer(void) {
-    default_layer_set((1UL << _PP) | (1UL << _PPG));
-#ifdef BACKLIGHT_ENABLE
-    backlight_toggle();
-    _delay_ms(100);
-    backlight_toggle();
-#endif
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint16_t key_timer;
-    static uint8_t ignore_up_events = 0;
-
-    uint16_t macro_kc = (keycode == MO(_DYN) ? DM_RSTP : keycode);
-    if (!process_record_dynamic_macro(macro_kc, record)) {
-        return false;
-    }
-
-    if (ignore_up_events > 0 && keycode != MO(_DYN) && keycode != KM_HOLD && !record->event.pressed) {
-        ignore_up_events -= 1;
-        return false;
-    }
-
-    switch (keycode) {
-    case KM_LW:
-        if (record->event.pressed) {
-            layer_on(_LW);
-        } else {
-            layer_off(_LW);
-        }
-        update_tri_layer(_LW, _RS, _DL);
-        return false;
-        break;
-    case KM_RS:
-        if (record->event.pressed) {
-            layer_on(_RS);
-        } else {
-            layer_off(_RS);
-        }
-        update_tri_layer(_LW, _RS, _DL);
-        return false;
-        break;
-    case KM_SHLK:
-        register_code(KC_LSFT);
-        break;
-    case KM_HOLD:
-        if (!record->event.pressed) {
-            ignore_up_events += 1;
-        }
-        break;
-    case KM_RST:
-    {
-        /* Make slash available on the PP layer. */
-        if ((1UL << _PP) & default_layer_state) {
-            int32_t old_default_layer_state = default_layer_state;
-            int32_t old_layer_state = layer_state;
-
-            layer_state = 0;
-            default_layer_state = (1UL << _QW);
-
-            process_record(record);
-
-            layer_state = old_layer_state;
-            default_layer_state = old_default_layer_state;
-
-            return false;
-        }
-    }
-
-        if (record->event.pressed) {
-            key_timer = timer_read();
-        } else {
-            if (timer_elapsed(key_timer) >= 500) {
-                clear_keyboard();
-                backlight_toggle();
-                _delay_ms(250);
-                backlight_toggle();
-                bootloader_jump();
-            }
-        }
-        break;
-    case KM_PP_GAME:
-        if (!record->event.pressed) {
-            enable_gaming_layer();
-        }
-        break;
-    case KM_PP_HOLD:
-        if (record->event.pressed) {
-            key_timer = timer_read();
-        } else {
-            if (timer_elapsed(key_timer) >= 250) {
-                enable_gaming_layer();
-            } else {
-                default_layer_set(1UL << _PP);
-            }
-        }
-        break;
-    case KM_NUM:
-        layer_on(_NM);
-        break;
-    case KM_SLP:
-        if (record->event.pressed) {
-            _delay_ms(250);
-        }
-        break;
-    }
-
-
-    if (record->event.pressed
-        && IS_LAYER_ON(_NM)
-        && keymap_key_to_keycode(_NM, record->event.key) == KC_TRNS) {
-
-        layer_off(_NM);
-    }
-
-    return true;
-}
diff --git a/keyboards/planck/keymaps/vifon/rules.mk b/keyboards/planck/keymaps/vifon/rules.mk
deleted file mode 100644
index 8cc3bcfd0cd..00000000000
--- a/keyboards/planck/keymaps/vifon/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-KEY_LOCK_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/planck/keymaps/vxid/config.h b/keyboards/planck/keymaps/vxid/config.h
deleted file mode 100644
index 6f70f09beec..00000000000
--- a/keyboards/planck/keymaps/vxid/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/planck/keymaps/vxid/keymap.c b/keyboards/planck/keymaps/vxid/keymap.c
deleted file mode 100644
index 82f28667fa9..00000000000
--- a/keyboards/planck/keymaps/vxid/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum planck_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_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_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,    KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
-    KC_LCTL, KC_LGUI, KC_LALT, LOWER, RAISE, KC_MINS, KC_SPC, KC_EQL, KC_LBRC, KC_RBRC, KC_QUOT, KC_GRV
-),
-
-[_LOWER] = LAYOUT_planck_grid(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______, _______, _______,  _______, KC_DEL,
-    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______,
-    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
-),
-
-[_RAISE] = LAYOUT_planck_grid(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_ADJUST] = LAYOUT_planck_grid(
-    QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/planck/keymaps/vxid/readme.md b/keyboards/planck/keymaps/vxid/readme.md
deleted file mode 100644
index 9e0ae33423b..00000000000
--- a/keyboards/planck/keymaps/vxid/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# vxid planck layout
-
-## Layout
-
-This planck layout aims at proviging most symbols on the base layer while remaining usable.
-The minus and space keys become alt and gui modifiers when pressed.
-Arrow keys are located on hjkl on the lower layer.
-
-## Building
-
-```
-    make planck/rev6:vxid:dfu-util
-```
diff --git a/keyboards/planck/keymaps/winternebs/config.h b/keyboards/planck/keymaps/winternebs/config.h
deleted file mode 100755
index 4e75e7a6ed4..00000000000
--- a/keyboards/planck/keymaps/winternebs/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2020 winterNebs <winternebs@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
-/*
-#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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-//#define ENCODER_RESOLUTION 4
-
-//Mouse stuff
-#define MOUSEKEY_DELAY 60
-#define MOUSEKEY_INTERVAL 8
-#define MOUSEKEY_MAX_SPEED 3
-#define MOUSEKEY_TIME_TO_MAX 0
-#define FORCE_NKRO
diff --git a/keyboards/planck/keymaps/winternebs/keymap.c b/keyboards/planck/keymaps/winternebs/keymap.c
deleted file mode 100755
index 8b2bb65034a..00000000000
--- a/keyboards/planck/keymaps/winternebs/keymap.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-
-enum planck_layers {
-  _QWERTY,
-  _WORKMAN,
-  _LOWER,
-  _ADJUST,
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  WORKMAN,
-  LOWER,
-};
-
-#define ADJUST MO(_ADJUST)
-//#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  |      | Alt  |Lower |Space |Space |Adjust|      | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_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_ENT ,
-    KC_LCTL, KC_LGUI, _______, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  ADJUST,  _______, KC_LEFT, KC_DOWN, KC_RGHT
-),
-/* Workman
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   D  |   R  |   W  |   B  |   J  |   F  |   U  |   P  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   H  |   T  |   G  |   Y  |   N  |   E  |   O  |   I  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   M  |   C  |   V  |   K  |   L  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  |      | Alt  |Lower |Space | Bksp |Adjust|      | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_WORKMAN] = LAYOUT_planck_grid(
-  KC_ESC,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_BSPC,
-  KC_TAB,  KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,	 KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LCTL, KC_LGUI, _______, KC_LALT, LOWER,   KC_SPC,  KC_BSPC, ADJUST,  _______, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |Pg Up |  UP  |Pg Dn |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |PrScr |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    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_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_PGUP, KC_UP,   KC_PGDN,
-    _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------
- * | Boot |Debug |       |Aud on|Audoff|      |      |      |      |      |      |Reset |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |QWERTY|WORKMAN|      |      | Help |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Home |  End | VOL+ | Play |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | NKRO |      |      |      |      |             |      |      | Prev | VOL- | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    QK_BOOT, DB_TOGG, _______, _______, AU_ON,    AU_OFF, _______, _______, _______, _______, _______, _______ ,
-    _______, _______, _______, QWERTY, WORKMAN , _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  KC_VOLU, KC_MPLY,
-    MAGIC_TOGGLE_NKRO, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-)
-};
-
-
-
-
-bool held[7][6] = {{false}};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if(record->event.key.row != 3 && record->event.key.row != 7 ){
-    held[record->event.key.row][record->event.key.col] = record->event.pressed;
-  }
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case WORKMAN:
-      if (record->event.pressed) {
-       set_single_persistent_default_layer(_WORKMAN);
-      }
-      return false;
-      break;
-    case LOWER:
-      if(record->event.pressed){
-        print("registered\n");
-        for(int i = 0; i < 7; i++){
-          for(int j = 0; j < 6; j++){
-            if(held[i][j]){
-              tap_code(pgm_read_word(&keymaps[_LOWER][i][j]));
-            }
-          }
-        }
-        layer_on(_LOWER);
-        return false;
-      }
-
-      layer_off(_LOWER);
-      return false;
-      break;
-  }
-  return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      break;
-   }
-   return true;
-}
diff --git a/keyboards/planck/keymaps/winternebs/readme.md b/keyboards/planck/keymaps/winternebs/readme.md
deleted file mode 100755
index d2040854ced..00000000000
--- a/keyboards/planck/keymaps/winternebs/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# winterNebs' Planck keymap
diff --git a/keyboards/planck/keymaps/winternebs/rules.mk b/keyboards/planck/keymaps/winternebs/rules.mk
deleted file mode 100755
index dcf16bef399..00000000000
--- a/keyboards/planck/keymaps/winternebs/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/planck/keymaps/xjtian/config.h b/keyboards/planck/keymaps/xjtian/config.h
deleted file mode 100644
index b417c13c68e..00000000000
--- a/keyboards/planck/keymaps/xjtian/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-#endif
-
-#define PERMISSIVE_HOLD
diff --git a/keyboards/planck/keymaps/xjtian/keymap.c b/keyboards/planck/keymaps/xjtian/keymap.c
deleted file mode 100644
index c05b6261bed..00000000000
--- a/keyboards/planck/keymaps/xjtian/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-enum planck_layers {
-    _QWERTY,
-    _NUM,
-    _SYMBOL,
-    _FUNCTION,
-    _ADJUST
-};
-
-#define MON MO(_NUM)
-#define MOS MO(_SYMBOL)
-#define MOF MO(_FUNCTION)
-#define MOA MO(_ADJUST)
-#define LTS LT(_SYMBOL, KC_ESC)
-#define LTN LT(_NUM, KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,---------------------------------------------------------------------------------------------------------.
- * |  Tab  |   Q  |   W  |   E   |     R    |    T    |   Y   |     U    |   I   |   O    |   P  |   Bksp    |
- * |-------+------+------+-------+----------+---------+-------+----------+-------+--------+------+-----------|
- * |Esc/Ctl|   A  |   S  |   D   |     F    |    G    |   H   |     J    |   K   |   L    |   ;  |    "      |
- * |-------+------+------+-------+----------+---------+-------+----------+-------+--------+------+-----------|
- * | Shift |   Z  |   X  |   C   |     V    |    B    |   N   |     M    |   ,   |   .    |   /  |Enter/Shift|
- * |-------+------+------+-------+----------+---------+-------+----------+-------+--------+------+-----------|
- * |  Ctrl |L(Fn) | Alt  |   OS  |Esc/L(Sym)|Shft/Bksp| Space |Ent/L(Num)|OS/Left|Alt/Down|Ctl/Up|   Right   |
- * `---------------------------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12(
-    KC_TAB,         KC_Q,  KC_W,    KC_E,     KC_R, KC_T,           KC_Y,   KC_U, KC_I,           KC_O,           KC_P,           KC_BSPC,
-    CTL_T(KC_ESC),  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_LCTL,        MOF,   KC_LALT, KC_LGUI,  LTS,  SFT_T(KC_BSPC), KC_SPC, LTN,  GUI_T(KC_LEFT), ALT_T(KC_DOWN), CTL_T(KC_UP),   KC_RGHT
-),
-
-
-/* Numbers, calculator
- * ,-------------------------------------------------------------------------.
- * |      |     |     |     |     |     |     |  =  |  -  |  *  |  /  | Bksp |
- * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
- * |  v   |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |      |
- * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
- * |  v   |     |     |     |     |     |     |     |  ,  |  .  |     |  v   |
- * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
- * |  v   |  v  |  v  |  v  |L(Ad)|  v  |  v  |  v  | OS  | Alt | Ctl |      |
- * `-------------------------------------------------------------------------'
- */
-[_NUM] = LAYOUT_ortho_4x12(
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_EQUAL, KC_MINUS, KC_PAST, KC_SLSH,  KC_BSPC,
-    _______, KC_1,    KC_2,    KC_3,    KC_4,  KC_5,    KC_6,    KC_7,     KC_8,     KC_9,    KC_0,     KC_NO,
-    _______, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,    KC_COMM,  KC_DOT,  KC_NO,    _______,
-    _______, _______, _______, _______, MOA,   _______, _______, _______,  KC_RGUI,  KC_RALT, KC_RCTL,  KC_NO
-),
-
-/* Symbols
- * ,------------------------------------------------------------------------.
- * |  `  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  -  |  =  | Bksp |
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
- * |  v  |     |  |  |  {  |  (  |  [  |  ]  |  )  |  }  |  \  |  '  |      |
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
- * |  v  |  ~  |     |     |     |     |     |     |     |  _  |  +  |  v   |
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
- * |  v  |  v  |  v  |  v  |  v  |  v  |  v  |L(Ad)| OS  | Alt | Ctl |      |
- * `------------------------------------------------------------------------'
- */
-[_SYMBOL] = LAYOUT_ortho_4x12(
-    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,   KC_BSPC,
-    _______, KC_NO,   KC_PIPE, KC_LCBR, KC_LPRN, KC_LBRC, KC_RBRC, KC_RPRN, KC_RCBR, KC_BSLS, KC_QUOT,  KC_NO,
-    _______, KC_TILD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_UNDS, KC_PLUS,  _______,
-    _______, _______, _______, _______, _______, _______, _______, MOA,     KC_RGUI, KC_RALT, KC_RCTL,  KC_NO
-),
-
-/* Function keys
- * ,------+------+------+------+------+------+------+------+------+------+------+------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * +------+------+------+------+------+------+------+------+------+------+------+------|
- * |  v   |      |      |      | Home |      |      | End  |      |      |      |      |
- * +------+------+------+------+------+------+------+------+------+------+------+------|
- * |  v   |      |      |      |      |      |      |      |      |      |      |  v   |
- * +------+------+------+------+------+------+------+------+------+------+------+------|
- * |  v   |  v   |  v   |  v   |  v   |  v   |  v   |   v  |  OS  | Alt  | Ctl  |      |
- * .-----------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT_ortho_4x12(
-    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_NO,   KC_NO,   KC_NO,   KC_HOME, KC_NO,   KC_NO,   KC_END,  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_RGUI, KC_RALT, KC_RCTL,  KC_NO
-),
-
-/* Adjust (Num + Symbol)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      | Left | Down |  Up  | Right|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Rewind| Vol- | Stop | Play | Vol+ | Skip |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |QK_BOOT |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(
-    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_MRWD, KC_VOLD, KC_MSTP, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_NO, KC_MRWD, KC_VOLD, KC_MSTP, KC_MPLY, KC_VOLU, KC_MFFD, KC_NO,   KC_NO, KC_NO,
-    QK_BOOT, 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/planck/keymaps/xjtian/readme.md b/keyboards/planck/keymaps/xjtian/readme.md
deleted file mode 100644
index f541f0004a8..00000000000
--- a/keyboards/planck/keymaps/xjtian/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Jacky Tian's Planck Layout
-
-This is a layout for a 4x12 grid layout Planck board with 3 custom layers and
-a bare-bones adjust layer. I've kept the layers sparse and tried to keep
-symbols close to where they would be on a standard staggered layout when
-possible so I don't have to rewire my muscle memory.
-
-I've generally tried to avoid having to hit the shift key for symbols so
-there's some duplication on the symbol layer. To me it's worth it since
-I'm using grid layout so I have the extra keys to support this. I find typing
-scoping delimiters like brackets and braces is much nicer only having to hit
-a single thumb key instead of two thumb keys or thumb + shift.
diff --git a/keyboards/planck/keymaps/yhaliaw/config.h b/keyboards/planck/keymaps/yhaliaw/config.h
deleted file mode 100644
index ac241b8a6c7..00000000000
--- a/keyboards/planck/keymaps/yhaliaw/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 Andrew Liaw
- *
- * 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)
-#endif
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LED_MAP {8, 2, 3, 7, 6, 5, 4, 0, 1}
-
-#define MK_COMBINED
-
-#define LEADER_TIMEOUT 200
-#define LEADER_PER_KEY_TIMING
diff --git a/keyboards/planck/keymaps/yhaliaw/keymap.c b/keyboards/planck/keymaps/yhaliaw/keymap.c
deleted file mode 100644
index 8931101fefc..00000000000
--- a/keyboards/planck/keymaps/yhaliaw/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* Copyright 2020 Andrew Liaw
- *
- * 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 planck_layers {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum planck_keycodes {
-    L_RESET = SAFE_RANGE,
-};
-
-#ifdef AUDIO_ENABLE
-float planck_sound[][2] = SONG(PLANCK_SOUND);
-#endif
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base
-     * ,-----------------------------------------------------------------------------------.
-     * |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  Esc |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   "  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Shift|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |Leader| Ctrl |  Alt |  GUI | Lower| Enter| Space| Raise|  GUI |  Alt | Ctrl |  Del |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_BASE] = LAYOUT_planck_grid(
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-        KC_ESC,  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,
-        QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_ENT,  KC_SPC,  RAISE,   KC_RGUI, KC_RALT, KC_RCTL, KC_DEL
-    ),
-
-    /* Lower
-     * ,-----------------------------------------------------------------------------------.
-     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Caps |      |      |      |      |      | Left | Down |  Up  | Right|      |  \   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      | Home | End  | Pg Up| Pg Dn|      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_planck_grid(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, KC_BSLS,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  |   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   _  |   +  |   {  |   }  |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_planck_grid(
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_PIPE,
-        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-
-    /* Adjust (Lower + Raise)
-     * ,-----------------------------------------------------------------------------------.
-     * |      | Reset| Debug| Clear|  RGB | HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |Aud on|Audoff| Swap | Norm |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |Mus on|Musoff| NKRO | 6KRO |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_ADJUST] = LAYOUT_planck_grid(
-        _______, L_RESET, DB_TOGG, EE_CLR,  RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
-        _______, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_SWAP, AG_NORM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, XXXXXXX, XXXXXXX, MU_ON,   MU_OFF,  NK_ON,   NK_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
-
-const rgblight_segment_t PROGMEM base_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 9, 0, 0, 0});
-
-const rgblight_segment_t PROGMEM lower_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 8, HSV_RED});
-
-const rgblight_segment_t PROGMEM raise_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 8, HSV_GREEN});
-
-const rgblight_segment_t PROGMEM adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 8, HSV_BLUE});
-
-const rgblight_segment_t PROGMEM capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({4, 5, HSV_WHITE});
-
-// Later layers take precedence.
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    base_layer,
-    lower_layer,
-    raise_layer,
-    adjust_layer,
-    capslock_layer
-);
-
-bool audio_disable = false;
-
-void keyboard_pre_init_user(void) {
-    // If the audio is off during hardware init,
-    // it causes problem when the audio is turn on later.
-    // The workaround is to always set the audio on during hardware init,
-    // then toggle audio back to the setting.
-#ifdef AUDIO_ENABLE
-    if (!is_audio_on()) {
-        audio_disable = true;
-        audio_on();
-    }
-#endif
-}
-
-void matrix_init_user(void) {
-    // To fix a audio related problem. See comments in keyboard_pre_init_user().
-#ifdef AUDIO_ENABLE
-    if (audio_disable) {
-        audio_off();
-    }
-#endif
-}
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = rgb_layers;
-    rgblight_set_layer_state(0, true);
-}
-
-bool leader_found;
-
-void leader_end_user(void) {
-    leader_found = false;
-
-    if (leader_sequence_one_key(L_RESET)) {
-        leader_found = true;
-        reset_keyboard();
-    } else if (leader_sequence_one_key(KC_DEL)) {
-        leader_found = true;
-        layer_clear();
-    } else if (leader_sequence_one_key(LOWER)) {
-        leader_found = true;
-        layer_on(_LOWER);
-    } else if (leader_sequence_one_key(RAISE)) {
-        leader_found = true;
-        layer_on(_RAISE);
-    }
-
-    // Plays sound on if leader sequence found.
-    if (leader_found) {
-#ifdef AUDIO_ENABLE
-        PLAY_SONG(planck_sound);
-#endif
-    }
-}
-
-bool led_update_user(led_t led_state) {
-    // Turn on RBG for capslock.
-    rgblight_set_layer_state(4, led_state.caps_lock);
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // Set RBG layer according to active keymap layer.
-    rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 1) && layer_state_cmp(state, 2));
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/planck/keymaps/yhaliaw/readme.md b/keyboards/planck/keymaps/yhaliaw/readme.md
deleted file mode 100644
index a10e54bd935..00000000000
--- a/keyboards/planck/keymaps/yhaliaw/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# yhaliaw Planck layout
-
-The layout for Planck by yhaliaw. 
-
-Developed and tested on Planck Rev 6.1.
-
-## Features
-
-Leader sequences can be used to turn on layers without holding the key and reset the layers.
-Leader sequences are triggered by key the series of key in quick succession.
-See Base layer notes in Layout section.
-
-Successful leader sequences will play the planck sound if sound is enabled.
-
-The RGB underglow is linked to the layers and capslock.
-
-## Keycodes
-
-Most Keycodes are standard [QMK keycodes](https://docs.qmk.fm/#/keycodes).
-
-### Custom Keycodes
-
-The `RESET` key to start the bootloader is access by a leader sequence.
-This is done to prevent a mispress.
-See Adjust layer notes in Layout section.
-
-The `Clear` key is used to clear the EEPROM of the keyboard.
-This can be seen as resetting the state of the keyboard. 
-Replug the keyboard to load in the resetted states.
-
-## Layout
-![yhaliaw planck layout](https://i.imgur.com/HvYva64.png)
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/yhaliaw/rules.mk b/keyboards/planck/keymaps/yhaliaw/rules.mk
deleted file mode 100644
index 2c8510c3e0e..00000000000
--- a/keyboards/planck/keymaps/yhaliaw/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LEADER_ENABLE = yes
-
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = no 
-DIP_SWITCH_ENABLE = no
diff --git a/keyboards/planck/keymaps/yttyx/README.md b/keyboards/planck/keymaps/yttyx/README.md
deleted file mode 100644
index 963438e3b0f..00000000000
--- a/keyboards/planck/keymaps/yttyx/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-
-This layout uses a mirror variant of Balance 12, created by Sasha Viminitz. See [this page](https://mathematicalmulticore.wordpress.com/the-keyboard-layout-project/) 
-for more information.
-
-## To build
-
-```
-make planck/rev6:yttyx
-```
-
-## To build and flash
-
-```
-make planck/rev6:yttyx:flash
-```
-
-## Layers
-
-### Balance 12 base (BA) layer
-![Base layer](https://i.imgur.com/I0TkIHT.png)
-
-### Numeric/Punctuation (NP) layer
-![Numeric/Punctuation layer](https://i.imgur.com/GgZ0PCq.png)
-
-### Function/Cursor (FC) layer
-![Function/Cursor layer](https://i.imgur.com/zcVID2d.png)
-
-### Plover (PL) layer
-![Plover layer](https://i.imgur.com/RikOGXe.png)
diff --git a/keyboards/planck/keymaps/yttyx/config.h b/keyboards/planck/keymaps/yttyx/config.h
deleted file mode 100644
index b9e113ec0bb..00000000000
--- a/keyboards/planck/keymaps/yttyx/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/planck/keymaps/yttyx/keymap.c b/keyboards/planck/keymaps/yttyx/keymap.c
deleted file mode 100644
index b3b39cd919b..00000000000
--- a/keyboards/planck/keymaps/yttyx/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _BA,           // Base (Balance Twelve mirror variant)
-  _NP,           // Numeric/Punctuation
-  _FC,           // Function
-  _PL            // Plover
-};
-
-// Abbreviations
-#define KX_SFT_Z   MT(MOD_LSFT, KC_Z)
-#define KX_SFT_X   MT(MOD_LSFT, KC_X)
-#define LT_ESC_FC  LT(_FC, KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base
-     .--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.
-     | P      | L      | C      | D      | W      |        |        | U      | O      | Y      | K      | Q      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | N      | R      | S      | T      | M      |        | BS     | A      | E      | I      | H      | V      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Z Sft  | J      | F      | G      | B      |        | Ent    | ' @    | , <    | . >    | X Sft  |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Ctl    | Alt    | Sup    | NP     | Spc    | Esc FC | Sft    | Sft    | Sup    | Alt    | Ctl    |        |
-     '--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'
-  */
-  [_BA] = LAYOUT_planck_grid( 
-    KC_P,     KC_L,    KC_C,    KC_D,    KC_W,   XXXXXXX,   XXXXXXX, KC_U,    KC_O,    KC_Y,    KC_K,     KC_Q,
-    KC_N,     KC_R,    KC_S,    KC_T,    KC_M,   XXXXXXX,   KC_BSPC, KC_A,    KC_E,    KC_I,    KC_H,     KC_V,
-    KX_SFT_Z, KC_J,    KC_F,    KC_G,    KC_B,   XXXXXXX,   KC_ENT,  KC_QUOT, KC_COMM, KC_DOT,  KX_SFT_X, XXXXXXX,
-    KC_LCTL,  KC_LALT, KC_LGUI, MO(_NP), KC_SPC, LT_ESC_FC, KC_LSFT, KC_LSFT, KC_LGUI, KC_LALT, KC_LCTL,  XXXXXXX
-  ),
-
-  /* Numeric/Punctuation (NP)
-     .--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.
-     | 1 !    | 2 "    | 3 �    | 4 $    | 5 %    | PL     |        | 6 ^    | 7 &    | 8 *    | 9 (    | 0 )    |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Tab    | Ctl-X  | Ctl-C  | Ctl-V  | Ctl-Z  |        |        | [ {    | ] }    | - _    | ; :    | \ |    |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Sft    |        |        | Del    | Ins    |        |        | / ?    | = +    | # ~    | `      |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Ctl    | Alt    | Sup    | NP     | Spc    |        | Sft    | Sft    | Sup    | Alt    | Ctl    |        |
-     '--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'
-  */                                           
-  [_NP] = LAYOUT_planck_grid(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    TO(_PL), XXXXXXX, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-    KC_TAB,  C(KC_X), C(KC_C), C(KC_V), C(KC_Z), XXXXXXX, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_SCLN, KC_NUBS,
-    KC_LSFT, XXXXXXX, XXXXXXX, KC_DEL,  KC_INS,  XXXXXXX, XXXXXXX, KC_SLSH, KC_EQL,  KC_NUHS, KC_GRV,  XXXXXXX, 
-    _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, XXXXXXX
-  ),
-
-  /* Function/Cursor (FC)
-     .--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.
-     | F1     | F2     | F3     | F4     | F5     |        |        | Home   | Up     | End    | PgUp   |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | F6     | F7     | F8     | F9     | F10    |        |        | Left   | Down   | Right  | PgDn   |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Sft    |        |        | F11    | F12    |        |        | PScr   | Break  | ScLk   | Caps   |        |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | Ctl    | Alt    | Sup    |        | Spc    |        | Sft    | Sft    | Sup    | Alt    | Ctl    |        |
-     '--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'
-  */
-  [_FC] = LAYOUT_planck_grid(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX, XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX,
-    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX,
-    _______, XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_PSCR, KC_BRK,  KC_SCRL, KC_CAPS, XXXXXXX,
-    _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, XXXXXXX
-  ),
-
-  /* Plover (PL)
-     .--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.--------.
-     | #      | #      | #      | #      | #      | BA     | #      | #      | #      | #      | #      | #      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | S      | T      | P      | H      | *      |        | *      | F      | P      | L      | T      | D      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     | S      | K      | W      | R      | *      |        | *      | R      | B      | G      | S      | Z      |
-     |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     |        |        |        | A      | O      |        | E      | U      |        |        |        |        |
-     '--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'--------'
-  */
-  [_PL] = LAYOUT_planck_grid(
-    STN_NUM, STN_NUM, STN_NUM, STN_NUM, STN_NUM, TO(_BA), STN_NUM, STN_NUM, STN_NUM, STN_NUM, STN_NUM, STN_NUM,
-    STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, XXXXXXX, STN_ST1, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
-    STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, XXXXXXX, STN_ST2, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR,
-    XXXXXXX, XXXXXXX, XXXXXXX, STN_A,   STN_O,   XXXXXXX, STN_E,   STN_U,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  )
-
-};
-
-void matrix_init_user(void) {
-  steno_set_mode(STENO_MODE_GEMINI);
-}
diff --git a/keyboards/planck/keymaps/yttyx/rules.mk b/keyboards/planck/keymaps/yttyx/rules.mk
deleted file mode 100644
index 94f6392790d..00000000000
--- a/keyboards/planck/keymaps/yttyx/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-AUDIO_ENABLE = no
-CONSOLE_ENABLE = no
-EXTRAKEY_ENABLE = no
-MIDI_ENABLE = no
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = yes
-RGBLIGHT_ENABLE = no
-STENO_ENABLE = yes
-VIRTSER_ENABLE = yes
-
diff --git a/keyboards/planck/keymaps/zach/config.h b/keyboards/planck/keymaps/zach/config.h
deleted file mode 100644
index c959cb06b50..00000000000
--- a/keyboards/planck/keymaps/zach/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-//#define LOCKING_SUPPORT_ENABLE
-#undef LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-#undef LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-#undef 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
-//#define DYNAMIC_MACRO_ENABLE    // Enable if you need to use the macro functionality
-//#define SPACE_CADET             // Parenthesis on L/R shift
-
-#endif
diff --git a/keyboards/planck/keymaps/zach/keymap.c b/keyboards/planck/keymaps/zach/keymap.c
deleted file mode 100644
index 50da3e3b2a5..00000000000
--- a/keyboards/planck/keymaps/zach/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-// Zach Nielsen     Custom Planck Keyboard layout
-#include QMK_KEYBOARD_H
-#define PLANCK_YES                  // This is the Planck
-#include "zach_common_functions.c"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_COLEMAK] = LAYOUT_planck_grid( /* Base Layer */
-  KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,   KC_J,   KC_L,    KC_U,    KC_Y,    KC_QUOT, KC_BSPC,
-  KC_BSPC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,   KC_H,   KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-  SHFT_CAP,KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_K,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  CTRLB,   TD(SUP), KC_LALT, KC_LCTL, TD(LOW), KC_SPC, KC_SPC, TD(RAI), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_SWCOLE] = LAYOUT_planck_grid( /* Software Colemak */
-  _______, CM_Q,    CM_W,    CM_F,    CM_P,    CM_G,    CM_J,    CM_L,    CM_U,    CM_Y,    KC_QUOT, _______,
-  _______, CM_A,    CM_R,    CM_S,    CM_T,    CM_D,    CM_H,    CM_N,    CM_E,    CM_I,    CM_O,    _______,
-  _______, CM_Z,    CM_X,    CM_C,    CM_V,    CM_B,    CM_K,    CM_M,    CM_COMM, CM_DOT,  CM_SLSH, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_RAISE] = LAYOUT_planck_grid( /* RAISE - Numpad and Unicode symbols */
-  KC_GRV,  SUPA2,   FACE,  DISFACE, SHRUG,   PLUMIN, IBANG,   KC_7,    KC_8, KC_9, KC_COLN, _______,
-  KC_DEL,  DEGREE,  MICRO, WOMEGA,  OMEGA,   PENGY,  KC_ENT,  KC_4,    KC_5, KC_6, KC_SLSH, KC_ASTR,
-  _______, KC_COLN, TFLIP, LAROW,   RAROW,   DUCK,   KC_SPC,  KC_1,    KC_2, KC_3, KC_MINS, KC_PLUS,
-  _______, KC_PIPE, TPUT,  _______, _______, KC_TAB, KC_TAB,  _______, KC_0, KC_0, KC_DOT,  KC_EQL
-),
-
-[_LOWER] = LAYOUT_planck_grid( /* LOWER - Symbols, Paging, CtrAltDel */
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_DQT,  KC_DEL,
-  KC_DEL,  KC_LBRC, KC_RBRC, KC_MINS, KC_UNDS, KC_HOME, KC_END,  KC_LPRN, KC_RPRN, KC_SLSH, KC_SCLN, KC_PGUP,
-  CPYPST,  XXXXXXX, C(KC_X), KC_LABK, KC_RABK, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_BSLS, KC_COLN, KC_PGDN,
-  _______, _______, _______, _______, _______, KC_TAB,  KC_TAB,  _______, _______, _______, _______, _______
-),
-
-[_ADJUST] = LAYOUT_planck_grid( /* ADJUST - Macros, Layer Switching, Function Keys */
-  UNIWIN,  XXXXXXX, XXXXXXX, PENGY,   DUCK,    KC_INS,  KC_NUM,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX,
-  UNILIN,  XXXXXXX, XXXXXXX, RANDIG,  RANDIG,  SWCOLE,  COLEMAK, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX,
-  _______, CADKEY,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,
-  _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-[_UNICODES] = LAYOUT_planck_grid( /* UNICODES - Extra layer for unicode stuff */
-  _______, TFLIP,   XXXXXXX, XXXXXXX, IBANG,   roman7,  XXXXXXX, XXXXXXX, ROMAN7,  XXXXXXX, XXXXXXX, _______,
-  KC_DEL,  TPUT,    FACE,    DISFACE, SHRUG,   roman4,  roman5,  roman6,  ROMAN4,  ROMAN5,  ROMAN6,  _______,
-  XXXXXXX, XXXXXXX, XXXXXXX, LAROW,   RAROW,   roman1,  roman2,  roman3,  ROMAN1,  ROMAN2,  ROMAN3,  XXXXXXX,
-  _______, _______, _______, _______, _______, KC_SPC,  KC_SPC,  _______, _______, _______, _______, _______
-)
-};
diff --git a/keyboards/planck/keymaps/zach/rules.mk b/keyboards/planck/keymaps/zach/rules.mk
deleted file mode 100644
index 544e10a456f..00000000000
--- a/keyboards/planck/keymaps/zach/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Zach Planck Makefile
-# Max .hex size is about 28636 bytes
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-TAP_DANCE_ENABLE    = yes   # Enable TapDance functionality
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE     = no    # Mouse keys(+4700)
-EXTRAKEY_ENABLE     = no    # Audio control and System control(+450)
-CONSOLE_ENABLE      = no    # Console for debug(+400)
-COMMAND_ENABLE      = no    # Commands for debug and configuration
-NKRO_ENABLE         = yes   # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE    = no    # Enable keyboard backlight functionality
-MIDI_ENABLE         = no    # MIDI controls
-AUDIO_ENABLE        = no    # Audio output on port C6
-#VARIABLE_TRACE      = no    # Debug changes to variable values
-UNICODE_ENABLE      = no    # Unicode (can't be used with unicodemap)
-UNICODEMAP_ENABLE   = yes   # Enable extended unicode
-BLUETOOTH_ENABLE    = no    # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE     = no    # Enable WS2812 RGB underlight.
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE    = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/planck/keymaps/zach/zach_common_functions.c b/keyboards/planck/keymaps/zach/zach_common_functions.c
deleted file mode 100644
index e17e31c7b51..00000000000
--- a/keyboards/planck/keymaps/zach/zach_common_functions.c
+++ /dev/null
@@ -1,415 +0,0 @@
-#ifndef ZACH_COMMON_FUNCTIONS
-#define ZACH_COMMON_FUNCTIONS
-#include "eeconfig.h"
-#include "action_layer.h"
-#include "keymap_colemak.h"
-extern keymap_config_t keymap_config;
-
-#undef C
-#define C(n)    RCTL(n)
-#define CADKEY  RCTL(RALT(KC_DEL))
-
-void tap(uint16_t keycode){
-    register_code(keycode);
-    unregister_code(keycode);
-};
-
-void persistent_default_layer_set(uint16_t default_layer){
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-};
-
-// Automatic number generation of important keywords
-enum my_keycodes{
-    // Layer numbers
-    _COLEMAK = 0,
-    _SWCOLE,
-    _RAISE,
-    _LOWER,
-    _ADJUST,
-    _UNICODES,
-    // These use process_record_user()
-    COLEMAK = SAFE_RANGE,
-    SWCOLE,
-    LOWER,
-    RAISE,
-    SHFT_CAP,
-    CTRLB,
-    CPYPST,
-    FACE,
-    UNIWIN,
-    UNILIN,
-    DISFACE,
-    TFLIP,
-    TPUT,
-    SHRUG,
-    RANDIG,
-    // Tap_Dance nums
-    RAI = 0,
-    LOW,
-    SUP
-};
-
-#ifdef AUDIO_ENABLE
-#include "audio.h"
-float tone_colemak[][2]         = SONG(COLEMAK_SOUND);
-float tone_swcole[][2]          = SONG(QWERTY_SOUND);
-float tone_capslock_on[][2]     = SONG(CAPS_LOCK_ON_SOUND);
-float tone_capslock_off[][2]    = SONG(CAPS_LOCK_OFF_SOUND);
-float tone_ctrl_mod[][2]        = SONG(COIN_SOUND);
-float tone_copy[][2]            = SONG(SCROLL_LOCK_ON_SOUND);
-float tone_paste[][2]           = SONG(SCROLL_LOCK_OFF_SOUND);
-float uniwin[][2]               = SONG(UNICODE_WINDOWS);
-float unilin[][2]               = SONG(UNICODE_LINUX);
-#endif
-
-#ifdef TAP_DANCE_ENABLE
-#define TAPPING_TERM 200
-
-void dance_raise_press(tap_dance_state_t *state, void *user_data){// Called on each tap
-  switch(state->count){      // Only turn the layer on once
-    case 1:
-        layer_off(_UNICODES);
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        break;
-  }
-};
-void dance_raise_lift(tap_dance_state_t *state, void *user_data){ // Called on release
-  switch(state->count){
-    case 1:         // Normal action. Turn off layers
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        layer_off(_UNICODES);
-        break;
-  }
-};
-/////////////////////////////////////////////////////////////////////
-void dance_lower_press(tap_dance_state_t *state, void *user_data){// Called on tap
-  switch(state->count){
-    case 1:         // Turn on lower
-        layer_off(_UNICODES);
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        break;
-  }
-};
-void dance_lower_lift(tap_dance_state_t *state, void *user_data){ // Called on release
-  switch(state->count){
-    case 1:         // Normal action. Turn off layers
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        layer_off(_UNICODES);
-        break;
-    case 2:         // Turn on _UNICODES layer
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        layer_on(_UNICODES);
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_ctrl_mod);
-        #endif
-        break;
-  }
-};
-/////////////////////////////////////////////////////////////////////
-void dance_super_press(tap_dance_state_t *state, void *user_data){   // Called on down
-    if(state->count == 1){
-        register_code(KC_LGUI);
-    }
-}
-void dance_super_done(tap_dance_state_t *state, void *user_data){    // Called on timeout
-  switch(state->count){
-    case 2:
-        register_code(KC_LGUI);
-        tap(KC_L);
-        unregister_code(KC_LGUI);
-        break;
-  }
-}
-void dance_super_lift(tap_dance_state_t *state, void *user_data){        // Called on up
-    unregister_code(KC_LGUI);
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [RAI] = ACTION_TAP_DANCE_FN_ADVANCED(dance_raise_press, NULL, dance_raise_lift),
-    [LOW] = ACTION_TAP_DANCE_FN_ADVANCED(dance_lower_press, NULL, dance_lower_lift),
-    [SUP] = ACTION_TAP_DANCE_FN_ADVANCED(dance_super_press, dance_super_done, dance_super_lift)
-};
-#endif
-
-//#ifdef UNICODE_ENABLE
-// Unicode shortcuts
-#define IBANG   UM(0x203D)
-#define RAROW   UM(0x2192)
-#define LAROW   UM(0x2190)
-#define DEGREE  UM(0x00B0)
-#define OMEGA   UM(0x03A9)
-#define WOMEGA  UM(0x03C9)
-#define MICRO   UM(0x00B5)
-#define PLUMIN  UM(0x00B1)
-#define SUPA2   UM(0x00B2)
-#define ROMAN1  UM(0x2160)
-#define ROMAN2  UM(0x2161)
-#define ROMAN3  UM(0x2162)
-#define ROMAN4  UM(0x2163)
-#define ROMAN5  UM(0x2164)
-#define ROMAN6  UM(0x2165)
-#define ROMAN7  UM(0x2166)
-#define roman1  UM(0x2170)
-#define roman2  UM(0x2171)
-#define roman3  UM(0x2172)
-#define roman4  UM(0x2173)
-#define roman5  UM(0x2174)
-#define roman6  UM(0x2175)
-#define roman7  UM(0x2176)
-
-#ifdef UNICODEMAP_ENABLE
-enum Ext_Unicode{
-    PENGUIN = 0,
-    BOAR,
-    MONKEY,
-    DRAGON,
-    CHICK,
-    TUMBLER
-};
-const uint32_t unicode_map[] PROGMEM = {
-    [PENGUIN]   = 0x1F427,
-    [BOAR]      = 0x1F417,
-    [MONKEY]    = 0x1F412,
-    [DRAGON]    = 0x1F409,
-    [CHICK]     = 0x1F425,
-    [TUMBLER]   = 0x1F943
-};
-#define PENGY   UM(PENGUIN)
-#define BOARY   UM(BOAR)
-#define MNKY    UM(MONKEY)
-#define DRGN    UM(DRAGON)
-#define DUCK    UM(CHICK)
-#define TMBL    UM(TUMBLER)
-#endif
-
-//#endif
-
-static uint16_t key_timer;
-static uint8_t  caps_status = 0;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-        if(record->event.pressed){
-            persistent_default_layer_set(1UL<<_COLEMAK);
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_colemak);
-            #endif
-        }
-        return false;
-        break;
-    case SWCOLE:
-        if(record->event.pressed){
-            persistent_default_layer_set(1UL<<_SWCOLE);
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_swcole);
-            #endif
-        }
-        return false;
-        break;
-    case RAISE:
-        if(record->event.pressed){
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case LOWER:
-        if(record->event.pressed){
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case SHFT_CAP:
-        if(record->event.pressed){
-            key_timer = timer_read();               // if the key is being pressed, we start the timer.
-            register_code(KC_LSFT);
-        } else {                                    // this means the key was just released (tap or "held down")
-            if(timer_elapsed(key_timer) < 152){     // Time in ms, the threshold we pick for counting something as a tap.
-                tap(KC_CAPS);
-                if(caps_status == 0){
-                    caps_status = 1;
-                    #ifdef AUDIO_ENABLE
-                        PLAY_SONG(tone_capslock_on);
-                    #endif
-                } else {
-                    caps_status = 0;
-                    #ifdef AUDIO_ENABLE
-                        PLAY_SONG(tone_capslock_off);
-                    #endif
-                }
-            }
-            unregister_code(KC_LSFT);
-        }
-        return false;
-        break;
-    case CTRLB:                                     // Control-B on tap (bold)
-        if(record->event.pressed){
-            key_timer = timer_read();               // if the key is being pressed, we start the timer.
-            register_code(KC_LCTL);
-        } else {                                    // this means the key was just released (tap or "held down")
-            if (timer_elapsed(key_timer) < 152) {   // Time in ms, the threshold we pick for counting something as a tap.
-                tap(KC_B);
-                #ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_ctrl_mod);
-                #endif
-                #ifdef BACKLIGHT_BREATHING
-                    breathing_period_set(2);
-                    breathing_pulse();
-                #endif
-            }
-            unregister_code(KC_LCTL);
-        }
-        return false;
-        break;
-    case CPYPST:                                    // One key copy/paste
-        if(record->event.pressed){
-            key_timer = timer_read();
-        } else {
-            if (timer_elapsed(key_timer) > 152) {   // Hold, copy
-                register_code(KC_LCTL);
-                tap(KC_C);
-                unregister_code(KC_LCTL);
-                #ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_copy);
-                #endif
-            } else {                                // Tap, paste
-                register_code(KC_LCTL);
-                tap(KC_V);
-                unregister_code(KC_LCTL);
-                #ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_paste);
-                #endif
-            }
-        }
-        return false;
-        break;
-    #ifdef UNICODE_ENABLE
-    case UNIWIN:
-        if(record->event.pressed){
-            set_unicode_input_mode(UNICODE_MODE_WINDOWS);
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(uniwin);
-            #endif
-        }
-        return false;
-        break;
-    case UNILIN:
-        if(record->event.pressed){
-            set_unicode_input_mode(UNICODE_MODE_LINUX);
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(unilin);
-            #endif
-        }
-        return false;
-        break;
-    case DISFACE:       // ಠ_ಠ
-        if(record->event.pressed){
-            process_unicode((0x0CA0|QK_UNICODE), record);   // Eye
-            register_code(KC_RSFT);
-            tap(KC_MINS);
-            unregister_code(KC_RSFT);
-            process_unicode((0x0CA0|QK_UNICODE), record);   // Eye
-        }
-        return false;
-        break;
-    case TFLIP:         // (╯°□°)╯ ︵ ┻━┻
-        if(record->event.pressed){
-            register_code(KC_RSFT);
-            tap(KC_9);
-            unregister_code(KC_RSFT);
-            process_unicode((0x256F|QK_UNICODE), record);   // Arm
-            process_unicode((0x00B0|QK_UNICODE), record);   // Eye
-            process_unicode((0x25A1|QK_UNICODE), record);   // Mouth
-            process_unicode((0x00B0|QK_UNICODE), record);   // Eye
-            register_code(KC_RSFT);
-            tap(KC_0);
-            unregister_code(KC_RSFT);
-            process_unicode((0x256F|QK_UNICODE), record);   // Arm
-            tap(KC_SPC);
-            process_unicode((0x0361|QK_UNICODE), record);   // Flippy
-            tap(KC_SPC);
-            process_unicode((0x253B|QK_UNICODE), record);   // Table
-            process_unicode((0x2501|QK_UNICODE), record);   // Table
-            process_unicode((0x253B|QK_UNICODE), record);   // Table
-        }
-        return false;
-        break;
-    case TPUT:          // ┬──┬ ノ( ゜-゜ノ)
-        if(record->event.pressed){
-            process_unicode((0x252C|QK_UNICODE), record);   // Table
-            process_unicode((0x2500|QK_UNICODE), record);   // Table
-            process_unicode((0x2500|QK_UNICODE), record);   // Table
-            process_unicode((0x252C|QK_UNICODE), record);   // Table
-            tap(KC_SPC);
-            process_unicode((0x30CE|QK_UNICODE), record);   // Arm
-            register_code(KC_RSFT);
-            tap(KC_9);
-            unregister_code(KC_RSFT);
-            tap(KC_SPC);
-            process_unicode((0x309C|QK_UNICODE), record);   // Eye
-            tap(KC_MINS);
-            process_unicode((0x309C|QK_UNICODE), record);   // Eye
-            process_unicode((0x30CE|QK_UNICODE), record);   // Arm
-            register_code(KC_RSFT);
-            tap(KC_0);
-            unregister_code(KC_RSFT);
-        }
-        return false;
-        break;
-    case SHRUG:         // ¯\_(ツ)_/¯
-        if(record->event.pressed){
-            process_unicode((0x00AF|QK_UNICODE), record);   // Hand
-            tap(KC_BSLS);                                   // Arm
-            register_code(KC_RSFT);
-            tap(KC_UNDS);                                   // Arm
-            tap(KC_LPRN);                                   // Head
-            unregister_code(KC_RSFT);
-            process_unicode((0x30C4|QK_UNICODE), record);   // Face
-            register_code(KC_RSFT);
-            tap(KC_RPRN);                                   // Head
-            tap(KC_UNDS);                                   // Arm
-            unregister_code(KC_RSFT);
-            tap(KC_SLSH);                                   // Arm
-            process_unicode((0x00AF|QK_UNICODE), record);   // Hand
-        }
-        return false;
-        break;
-    #endif
-    case FACE:          // (o_O)
-        if(record->event.pressed){
-            register_code(KC_RSFT);
-            tap(KC_LPRN);
-            unregister_code(KC_RSFT);
-            tap(KC_O);
-            register_code(KC_RSFT);
-            tap(KC_UNDS);
-            tap(KC_O);
-            tap(KC_RPRN);
-            unregister_code(KC_RSFT);
-        }
-        return false;
-        break;
-    case RANDIG:
-        if (record->event.pressed) {
-            tap_random_base64();
-        }
-        return false;
-        break;
-  }
-  return true;
-};
-
-#endif
diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h
index 6d12061b513..7c78d7cd3cd 100644
--- a/keyboards/planck/light/config.h
+++ b/keyboards/planck/light/config.h
@@ -9,55 +9,3 @@
 
 #define IS31FL3731_I2C_ADDRESS_1      IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2      IS31FL3731_I2C_ADDRESS_SDA
-
-#define DRIVER_1_LED_TOTAL 25
-#define DRIVER_2_LED_TOTAL 24
-#define RGB_MATRIX_LED_COUNT   (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-// 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
-#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
diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json
index b6f3df8fe64..8fc112664b4 100644
--- a/keyboards/planck/light/info.json
+++ b/keyboards/planck/light/info.json
@@ -9,6 +9,51 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
+    "animations": {
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_val": true,
+      "band_pinwheel_sat": true,
+      "band_pinwheel_val": true,
+      "band_spiral_sat": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "typing_heatmap": true,
+      "digital_rain": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true,
+      "solid_multisplash": true
+    },
     "driver": "is31fl3731"
   },
   "matrix_pins": {
diff --git a/keyboards/planck/light/light.c b/keyboards/planck/light/light.c
index 828319c66d2..44bd89dc116 100644
--- a/keyboards/planck/light/light.c
+++ b/keyboards/planck/light/light.c
@@ -16,7 +16,7 @@
 
 #include "quantum.h"
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/planck/light/rules.mk b/keyboards/planck/light/rules.mk
index dbc992922b7..a8efaf98f47 100644
--- a/keyboards/planck/light/rules.mk
+++ b/keyboards/planck/light/rules.mk
@@ -12,5 +12,3 @@ MIDI_ENABLE = yes           # MIDI support
 AUDIO_ENABLE = yes           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = yes
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/rev1/rules.mk b/keyboards/planck/rev1/rules.mk
index 8827627e99f..99b86919620 100644
--- a/keyboards/planck/rev1/rules.mk
+++ b/keyboards/planck/rev1/rules.mk
@@ -10,5 +10,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no            # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/rev2/rules.mk b/keyboards/planck/rev2/rules.mk
index 8827627e99f..99b86919620 100644
--- a/keyboards/planck/rev2/rules.mk
+++ b/keyboards/planck/rev2/rules.mk
@@ -10,5 +10,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no            # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/rev3/rules.mk b/keyboards/planck/rev3/rules.mk
index 8827627e99f..99b86919620 100644
--- a/keyboards/planck/rev3/rules.mk
+++ b/keyboards/planck/rev3/rules.mk
@@ -10,5 +10,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no            # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/rev4/rules.mk b/keyboards/planck/rev4/rules.mk
index 78e1ba9f7b1..73d6182ff40 100644
--- a/keyboards/planck/rev4/rules.mk
+++ b/keyboards/planck/rev4/rules.mk
@@ -10,5 +10,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/rev5/rules.mk b/keyboards/planck/rev5/rules.mk
index 78e1ba9f7b1..73d6182ff40 100644
--- a/keyboards/planck/rev5/rules.mk
+++ b/keyboards/planck/rev5/rules.mk
@@ -10,5 +10,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index a0a997f860f..7fec8be56bc 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -43,12 +43,8 @@
 /*
  * WS2812 Underglow Matrix options
  */
-#define RGB_MATRIX_LED_COUNT 9
-
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM2
 #define WS2812_DMA_CHANNEL 2
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json
index a6ad35281dc..add17963b44 100644
--- a/keyboards/planck/rev6/info.json
+++ b/keyboards/planck/rev6/info.json
@@ -16,7 +16,8 @@
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "ws2812"
+    "driver": "ws2812",
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk
index 048b723c4ce..ce96f940793 100644
--- a/keyboards/planck/rev6/rules.mk
+++ b/keyboards/planck/rev6/rules.mk
@@ -14,5 +14,3 @@ RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = no
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index a0a997f860f..7fec8be56bc 100644
--- a/keyboards/planck/rev6_drop/config.h
+++ b/keyboards/planck/rev6_drop/config.h
@@ -43,12 +43,8 @@
 /*
  * WS2812 Underglow Matrix options
  */
-#define RGB_MATRIX_LED_COUNT 9
-
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM2
 #define WS2812_DMA_CHANNEL 2
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json
index d224561c7ff..aff2eef5d72 100644
--- a/keyboards/planck/rev6_drop/info.json
+++ b/keyboards/planck/rev6_drop/info.json
@@ -16,7 +16,8 @@
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "ws2812"
+    "driver": "ws2812",
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
diff --git a/keyboards/planck/rev6_drop/rules.mk b/keyboards/planck/rev6_drop/rules.mk
index 3eb3eac7ebc..022a5ccd537 100644
--- a/keyboards/planck/rev6_drop/rules.mk
+++ b/keyboards/planck/rev6_drop/rules.mk
@@ -17,5 +17,3 @@ ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
 
 SRC += matrix.c
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/rev7/config.h b/keyboards/planck/rev7/config.h
index 678cb1d4387..a5e49c8a532 100644
--- a/keyboards/planck/rev7/config.h
+++ b/keyboards/planck/rev7/config.h
@@ -30,8 +30,6 @@
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM2
 #define WS2812_DMA_CHANNEL 2
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/planck/rev7/info.json b/keyboards/planck/rev7/info.json
index 72dce51d83c..d674af98d17 100644
--- a/keyboards/planck/rev7/info.json
+++ b/keyboards/planck/rev7/info.json
@@ -13,7 +13,8 @@
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "ws2812"
+    "driver": "ws2812",
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
@@ -25,7 +26,14 @@
   },
   "encoder": {
     "rotary": [
-      {"pin_a": "B12", "pin_b": "B13"}
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"}
     ]
   },
   "features": {
diff --git a/keyboards/planck/rev7/matrix.c b/keyboards/planck/rev7/matrix.c
index c89c399a40d..350ce93ce04 100644
--- a/keyboards/planck/rev7/matrix.c
+++ b/keyboards/planck/rev7/matrix.c
@@ -32,31 +32,16 @@
 #define STM32_IWDG_RL_MS(s) STM32_IWDG_RL_US(s * 1000.0)
 #define STM32_IWDG_RL_S(s) STM32_IWDG_RL_US(s * 1000000.0)
 
-#if !defined(PLANCK_ENCODER_RESOLUTION)
-#    define PLANCK_ENCODER_RESOLUTION 4
-#endif
-
 #if !defined(PLANCK_WATCHDOG_TIMEOUT)
 #   define PLANCK_WATCHDOG_TIMEOUT 1.0
 #endif
 
-#ifdef ENCODER_MAP_ENABLE
-#error "The encoder map feature is not currently supported by the Planck's encoder matrix"
-#endif
-
 /* matrix state(1:on, 0:off) */
 static pin_t matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static pin_t matrix_col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 
 static matrix_row_t matrix_inverted[MATRIX_COLS];
 
-#ifdef ENCODER_ENABLE
-int8_t  encoder_LUT[]     = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
-uint8_t encoder_state[8]  = {0};
-int8_t  encoder_pulses[8] = {0};
-uint8_t encoder_value[8]  = {0};
-#endif
-
 void matrix_init_custom(void) {
     // actual matrix setup - cols
     for (int i = 0; i < MATRIX_COLS; i++) {
@@ -84,31 +69,6 @@ void matrix_init_custom(void) {
 #endif
 }
 
-#ifdef ENCODER_ENABLE
-bool encoder_update(uint8_t index, uint8_t state) {
-    bool    changed = false;
-    uint8_t i       = index;
-
-    encoder_pulses[i] += encoder_LUT[state & 0xF];
-
-    if (encoder_pulses[i] >= PLANCK_ENCODER_RESOLUTION) {
-        encoder_value[index]++;
-        changed = true;
-        encoder_update_kb(index, false);
-    }
-    if (encoder_pulses[i] <= -PLANCK_ENCODER_RESOLUTION) {
-        encoder_value[index]--;
-        changed = true;
-        encoder_update_kb(index, true);
-    }
-    encoder_pulses[i] %= PLANCK_ENCODER_RESOLUTION;
-#ifdef ENCODER_DEFAULT_POS
-    encoder_pulses[i] = 0;
-#endif
-    return changed;
-}
-#endif
-
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
 #ifndef PLANCK_WATCHDOG_DISABLE
     // reset watchdog
@@ -149,40 +109,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
         changed |= old != current_matrix[row];
     }
 
-#ifdef ENCODER_ENABLE
-    // encoder-matrix functionality
-
-    // set up C/rows for encoder read
-    for (int i = 0; i < MATRIX_ROWS; i++) {
-        setPinOutput(matrix_row_pins[i]);
-        writePinHigh(matrix_row_pins[i]);
-    }
-
-    // set up A & B for reading
-    setPinInputHigh(B12);
-    setPinInputHigh(B13);
-
-    for (int i = 0; i < MATRIX_ROWS; i++) {
-        writePinLow(matrix_row_pins[i]);
-        wait_us(10);
-        uint8_t new_status = (palReadPad(GPIOB, 12) << 0) | (palReadPad(GPIOB, 13) << 1);
-        if ((encoder_state[i] & 0x3) != new_status) {
-            encoder_state[i] <<= 2;
-            encoder_state[i] |= new_status;
-            encoder_update(i, encoder_state[i]);
-        }
-        writePinHigh(matrix_row_pins[i]);
-    }
-
-    // revert A & B to matrix state
-    setPinInputLow(B12);
-    setPinInputLow(B13);
-
-    // revert C/rows to matrix state
-    for (int i = 0; i < MATRIX_ROWS; i++) {
-        setPinInputLow(matrix_row_pins[i]);
-    }
-#endif
-
     return changed;
 }
+
+uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b) {
+    pin_t pin = pad_b ? B13: B12;
+    setPinInputHigh(pin);
+    writePinLow(matrix_row_pins[index]);
+    wait_us(10);
+    uint8_t ret = readPin(pin) ? 1 : 0;
+    setPinInputLow(matrix_row_pins[index]);
+    setPinInputLow(pin);
+    return ret;
+}
diff --git a/keyboards/planck/rev7/rules.mk b/keyboards/planck/rev7/rules.mk
index 38710bc00b8..04b21019aed 100644
--- a/keyboards/planck/rev7/rules.mk
+++ b/keyboards/planck/rev7/rules.mk
@@ -5,5 +5,3 @@ CUSTOM_MATRIX = lite
 DIP_SWITCH_ENABLE = yes
 
 SRC += matrix.c
-
-LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/thk/keymaps/thk/keymap.c b/keyboards/planck/thk/keymaps/thk/keymap.c
deleted file mode 100644
index 8df45e8733c..00000000000
--- a/keyboards/planck/thk/keymaps/thk/keymap.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- * Copyright 2021 Erovia
- *
- * 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 planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  THK,
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | THK  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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 ,
-  THK,     KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | THK  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT ,
-  THK,     KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | THK  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  THK,     KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL ,
-  _______, _______, _______,  _______,   _______,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  _______,  _______,
-  _______, _______,  _______,  _______,   _______,  _______,   _______,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-    case THK:
-      if (record->event.pressed) {
-        SEND_STRING("Pretty cool keyboard, eh?");
-      }
-      return false;
-  }
-  return true;
-}
-
-bool encoder_mode = false;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  } else if (index == 1) { /* Second encoder */
-    if (clockwise) {
-      if (encoder_mode) {
-        tap_code(KC_RGHT);
-      } else {
-        tap_code_delay(KC_VOLU, 60);
-      }
-    } else {
-      if (encoder_mode) {
-        tap_code(KC_LEFT);
-      } else {
-        tap_code_delay(KC_VOLD, 60);
-      }
-    }
-  }
-  return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0: {
-      if (active) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-        }
-      }
-      break;
-    case 1:
-      if (active) {
-        encoder_mode = true;
-      } else {
-        encoder_mode = false;
-      }
-      break;
-    case 2:
-      SEND_STRING("QMK is the best thing ever");
-      break;
-    case 3:
-      SEND_STRING("This is a Planck THK");
-      break;
-  }
-    return true;
-}
diff --git a/keyboards/planck/thk/keymaps/thk/readme.md b/keyboards/planck/thk/keymaps/thk/readme.md
deleted file mode 100644
index bae51e067fe..00000000000
--- a/keyboards/planck/thk/keymaps/thk/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Keymap specifically for the Planck T.H.K.
-
-Based on the `default` Planck keymap.
diff --git a/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c b/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
deleted file mode 100644
index a8f66d8f518..00000000000
--- a/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-*KeLorean CA66 keymap.
-*Made for HHKB layout with CA66 badge in lower left corner and split spacebars.
-*Left Spacebar - tap for backspace, hold for Layer1
-*Right Spacebar - tap for space, hold for Layer2
-*Layer 2 is same as Layer 1 except Left Spacebar is now delete
-*Cap Locks has been replaced with Momentary Toggle to Layer3
-*Layer 4 can be reached only by Layer3 in the '\' key
-*Layer 4 tab is the soft reset.
-*/
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	//Base Layer
-	[0] = LAYOUT(
-		KC_ESC, 		   KC_1,     KC_2, 	   KC_3, 	KC_4, 	KC_5, 	  KC_6, 	KC_7, 	 KC_8, 		KC_9, 	KC_0, 	 KC_MINS, 	KC_EQL, 	KC_BSPC, KC_BSPC, 		KC_PSCR, 
-		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, 
-		MO(3), 			   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_RSFT, 	KC_UP, 								KC_PGDN, 
-		KC_NO, 			   KC_LCTL,  KC_LALT,  LT(1, KC_BSPC), 	LT(2, KC_SPC),  	KC_RALT, KC_RGUI,   KC_RCTL, 		   KC_LEFT, KC_DOWN, KC_RGHT),
-
-	//Layer1 Functions and Gaming Arrows over WASD
-	[1] = LAYOUT(
-		KC_GRV, 		   KC_F1, 	 KC_F2,    KC_F3, 	KC_F4, 	KC_F5, 	  KC_F6, 	KC_F7, 	 KC_F8,		KC_F9, 	KC_F10,   KC_F11, 	KC_F12, 	KC_NO, 	 KC_NO, 		KC_NO, 
-		KC_NO, 			   KC_NO, 	 KC_UP,    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_TRNS, 		   KC_LEFT,  KC_DOWN,  KC_RGHT, 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, 	 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),
-
-	//Layer2 Same as Layer1, for easy use of layers...you'll see.
-	[2] = LAYOUT(
-		KC_GRV, 		   KC_F1, 	 KC_F2,    KC_F3, 	KC_F4,  KC_F5, 	  KC_F6, 	KC_F7,   KC_F8, 	KC_F9, 	KC_F10,   KC_F11, 	KC_F12, 	KC_NO, 	 KC_NO, 		KC_NO, 
-		KC_NO, 			   KC_NO, 	 KC_UP,    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_LEFT,  KC_DOWN,  KC_RGHT, 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,   KC_NO, 	KC_NO, 	KC_NO, 	  KC_NO, 	KC_NO, 								KC_NO, 
-		KC_NO, 			   KC_NO, 	 KC_NO,    KC_DEL, 			KC_NO, 				KC_NO, 	 KC_NO, 	KC_NO, 				 KC_NO, KC_NO, KC_NO),
-
-	//Layer3, Lighting Function keys, media keys and '\' is now Momentary Toggle to Layer 4, which has the soft reset.
-	[3] = LAYOUT(
-		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, 	 RGB_HUD,  RGB_HUI, RGB_VAD, RGB_VAI, KC_NO, 	BL_TOGG, BL_DOWN,	BL_UP,   BL_STEP, KC_NO, 	KC_NO, 		MO(4), 	 				KC_NO,
-		KC_TRNS, 		   KC_NO, 	 RGB_RMOD, RGB_MOD, RGB_TOG, KC_NO,   KC_MSTP,  KC_MPLY, KC_MPRV,   KC_MNXT, KC_VOLD, KC_VOLU, 				KC_NO, 					KC_NO, 
-		KC_NO, KC_NO, 	   KC_NO, 	 RGB_SAD,  RGB_SAI, 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, KC_NO, KC_NO),
-
-	//Layer4, soft reset on Tab
-	[4] = LAYOUT(
-		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, 
-		QK_BOOT, 			   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_TRNS, 				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,    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, 	 		     KC_NO, KC_NO, KC_NO),
-};
diff --git a/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json b/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
deleted file mode 100644
index 2e40f6ad749..00000000000
--- a/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
+++ /dev/null
@@ -1 +0,0 @@
-[["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_PSCR", "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", "MO(3)", "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_RSFT", "KC_PGDN", "KC_UP", "KC_NO", "KC_LCTL", "KC_LALT", "KC_BSPC", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_NO", "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_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "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_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "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", "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_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "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_LEFT", "KC_DOWN", "KC_RGHT", "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", "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", "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", "RGB_HUD", "RGB_HUI", "KC_NO", "KC_NO", "KC_NO", "BL_TOGG", "BL_DOWN", "BL_UP", "BL_STEP", "KC_NO", "KC_NO", "MO(4)", "KC_NO", "KC_TRNS", "RGB_TOG", "RGB_RMOD", "RGB_MOD", "RGB_VAD", "RGB_VAI", "KC_MSTP", "KC_MPLY", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_SAD", "RGB_SAI", "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", "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", "QK_BOOT", "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_TRNS", "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", "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", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
deleted file mode 100644
index 8ef6c0499db..00000000000
--- a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  LAYOUT(
-    KC_ESC,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, 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_BSPC,         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_DEL,
-    KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,                    MO(1),
-	KC_NO,            KC_LALT, KC_LGUI,          KC_NO,            KC_SPC,           KC_NO,   KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  LAYOUT(
-	KC_PWR,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL, QK_BOOT,
-    KC_CAPS,          RGB_RMOD,RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_TOG, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,         KC_TRNS,
-    KC_TRNS,          KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, 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_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,                  KC_TRNS,
-	KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-bool led_update_user(led_t led_state) {
-	if (led_state.caps_lock) {
-		DDRD |= (1 << 1); PORTD &= ~(1 << 1);
-	} else {
-		DDRD &= ~(1 << 1); PORTD &= ~(1 << 1);
-	}
-	return false;
-}
diff --git a/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c b/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
deleted file mode 100644
index b6988e1cdc5..00000000000
--- a/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_minila(
-        KC_ESC,  KC_1,    KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRAVE, KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_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_LSFT, KC_UP,   KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT,  MO(1),                              KC_SPC,  MO(2),   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-
-    [1] = LAYOUT_minila(
-        QK_BOOT, 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_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-        _______, RGB_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_RMOD, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
-        _______, _______,  _______, _______,                            _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_MPLY 
-    ),
-
-    [2] = LAYOUT_minila(
-        _______, 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_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-        _______, RGB_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_RMOD, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
-        _______, _______,  _______, _______,                            _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END 
-    ),
-};
diff --git a/keyboards/playkbtw/pk60/keymaps/rfvizarra/readme.md b/keyboards/playkbtw/pk60/keymaps/rfvizarra/readme.md
deleted file mode 100644
index cd9a2210879..00000000000
--- a/keyboards/playkbtw/pk60/keymaps/rfvizarra/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# A personal keymap for Play Keyboard60 based on the minila layout
-
-![Mininla layout](https://i.imgur.com/K7ONE1k.jpg)
-
-To build the firmware use
-
-    make playkbtw/pk60:rfvizarra
-
-or if you prefer to use docker
-
-    util/docker_build.sh playkbtw/pk60:rfvizarra
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index 6e30ee857ae..3922034290b 100644
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@@ -16,27 +16,9 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-	#define RGB_MATRIX_KEYPRESSES
-	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-	#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
-	#define RGB_MATRIX_LED_PROCESS_LIMIT 20
-	#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-	#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-	#define RGB_MATRIX_LED_COUNT 64
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 
-
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define DISABLE_RGB_MATRIX_BAND_SAT
-#define DISABLE_RGB_MATRIX_BAND_VAL
-#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#endif
+#define RGB_MATRIX_LED_COUNT 64
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json
index 727b9c0a5cb..ee2849f14fe 100644
--- a/keyboards/playkbtw/pk64rgb/info.json
+++ b/keyboards/playkbtw/pk64rgb/info.json
@@ -9,7 +9,10 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "driver": "is31fl3733",
+        "led_flush_limit": 26,
+        "led_process_limit": 20,
+        "max_brightness": 160
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"],
diff --git a/keyboards/playkbtw/pk64rgb/pk64rgb.c b/keyboards/playkbtw/pk64rgb/pk64rgb.c
index 427d1cf04e0..b745c82b9d5 100644
--- a/keyboards/playkbtw/pk64rgb/pk64rgb.c
+++ b/keyboards/playkbtw/pk64rgb/pk64rgb.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -25,74 +25,74 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
  *   |  |      |      B location
  *   |  |      |      | */
 
-   {0, A_1,   B_1,   C_1},
-   {0, D_1,   E_1,   F_1},
-   {0, G_1,   H_1,   I_1},
-   {0, J_1,   K_1,   L_1},
-   {0, A_6,   B_6,   C_6},
-   {0, D_6,   E_6,   F_6},
-   {0, G_6,   H_6,   I_6},
-   {0, J_6,   K_6,   L_6},
-   {0, A_11,  B_11,  C_11},
-   {0, D_11,  E_11,  F_11},
-   {0, G_11,  H_11,  I_11},
-   {0, J_11,  K_11,  L_11},
-   {0, A_16,  B_16,  C_16},
-   {0, D_16,  E_16,  F_16},
+   {0, SW1_CS1,   SW2_CS1,   SW3_CS1},
+   {0, SW4_CS1,   SW5_CS1,   SW6_CS1},
+   {0, SW7_CS1,   SW8_CS1,   SW9_CS1},
+   {0, SW10_CS1,   SW11_CS1,   SW12_CS1},
+   {0, SW1_CS6,   SW2_CS6,   SW3_CS6},
+   {0, SW4_CS6,   SW5_CS6,   SW6_CS6},
+   {0, SW7_CS6,   SW8_CS6,   SW9_CS6},
+   {0, SW10_CS6,   SW11_CS6,   SW12_CS6},
+   {0, SW1_CS11,  SW2_CS11,  SW3_CS11},
+   {0, SW4_CS11,  SW5_CS11,  SW6_CS11},
+   {0, SW7_CS11,  SW8_CS11,  SW9_CS11},
+   {0, SW10_CS11,  SW11_CS11,  SW12_CS11},
+   {0, SW1_CS16,  SW2_CS16,  SW3_CS16},
+   {0, SW4_CS16,  SW5_CS16,  SW6_CS16},
       
-   {0, A_2,   B_2,   C_2},
-   {0, D_2,   E_2,   F_2},
-   {0, G_2,   H_2,   I_2},
-   {0, J_2,   K_2,   L_2},
-   {0, A_7,   B_7,   C_7},
-   {0, D_7,   E_7,   F_7},
-   {0, G_7,   H_7,   I_7},
-   {0, J_7,   K_7,   L_7},
-   {0, A_12,  B_12,  C_12},
-   {0, D_12,  E_12,  F_12},
-   {0, G_12,  H_12,  I_12},
-   {0, J_12,  K_12,  L_12},
-   {0, G_16,  H_16,  I_16},
-   {0, J_16,  K_16,  L_16},
+   {0, SW1_CS2,   SW2_CS2,   SW3_CS2},
+   {0, SW4_CS2,   SW5_CS2,   SW6_CS2},
+   {0, SW7_CS2,   SW8_CS2,   SW9_CS2},
+   {0, SW10_CS2,   SW11_CS2,   SW12_CS2},
+   {0, SW1_CS7,   SW2_CS7,   SW3_CS7},
+   {0, SW4_CS7,   SW5_CS7,   SW6_CS7},
+   {0, SW7_CS7,   SW8_CS7,   SW9_CS7},
+   {0, SW10_CS7,   SW11_CS7,   SW12_CS7},
+   {0, SW1_CS12,  SW2_CS12,  SW3_CS12},
+   {0, SW4_CS12,  SW5_CS12,  SW6_CS12},
+   {0, SW7_CS12,  SW8_CS12,  SW9_CS12},
+   {0, SW10_CS12,  SW11_CS12,  SW12_CS12},
+   {0, SW7_CS16,  SW8_CS16,  SW9_CS16},
+   {0, SW10_CS16,  SW11_CS16,  SW12_CS16},
 
-   {0, A_3,   B_3,   C_3},
-   {0, D_3,   E_3,   F_3},
-   {0, G_3,   H_3,   I_3},
-   {0, J_3,   K_3,   L_3},
-   {0, A_8,   B_8,   C_8},
-   {0, D_8,   E_8,   F_8},
-   {0, G_8,   H_8,   I_8},
-   {0, J_8,   K_8,   L_8},
-   {0, A_13,  B_13,  C_13},
-   {0, D_13,  E_13,  F_13},
-   {0, G_13,  H_13,  I_13},
-   {0, J_13,  K_13,  L_13},
-   {0, A_15,  B_15,  C_15},
+   {0, SW1_CS3,   SW2_CS3,   SW3_CS3},
+   {0, SW4_CS3,   SW5_CS3,   SW6_CS3},
+   {0, SW7_CS3,   SW8_CS3,   SW9_CS3},
+   {0, SW10_CS3,   SW11_CS3,   SW12_CS3},
+   {0, SW1_CS8,   SW2_CS8,   SW3_CS8},
+   {0, SW4_CS8,   SW5_CS8,   SW6_CS8},
+   {0, SW7_CS8,   SW8_CS8,   SW9_CS8},
+   {0, SW10_CS8,   SW11_CS8,   SW12_CS8},
+   {0, SW1_CS13,  SW2_CS13,  SW3_CS13},
+   {0, SW4_CS13,  SW5_CS13,  SW6_CS13},
+   {0, SW7_CS13,  SW8_CS13,  SW9_CS13},
+   {0, SW10_CS13,  SW11_CS13,  SW12_CS13},
+   {0, SW1_CS15,  SW2_CS15,  SW3_CS15},
 
-   {0, A_4,   B_4,   C_4},
-   {0, D_4,   E_4,   F_4},
-   {0, G_4,   H_4,   I_4},
-   {0, J_4,   K_4,   L_4},
-   {0, A_9,   B_9,   C_9},
-   {0, D_9,   E_9,   F_9},
-   {0, G_9,   H_9,   I_9},
-   {0, J_9,   K_9,   L_9},
-   {0, A_14,  B_14,  C_14},
-   {0, D_14,  E_14,  F_14},
-   {0, G_14,  H_14,  I_14},
-   {0, J_14,  K_14,  L_14},
-   {0, D_15,  E_15,  F_15},
-   {0, G_15,  H_15,  I_15},
+   {0, SW1_CS4,   SW2_CS4,   SW3_CS4},
+   {0, SW4_CS4,   SW5_CS4,   SW6_CS4},
+   {0, SW7_CS4,   SW8_CS4,   SW9_CS4},
+   {0, SW10_CS4,   SW11_CS4,   SW12_CS4},
+   {0, SW1_CS9,   SW2_CS9,   SW3_CS9},
+   {0, SW4_CS9,   SW5_CS9,   SW6_CS9},
+   {0, SW7_CS9,   SW8_CS9,   SW9_CS9},
+   {0, SW10_CS9,   SW11_CS9,   SW12_CS9},
+   {0, SW1_CS14,  SW2_CS14,  SW3_CS14},
+   {0, SW4_CS14,  SW5_CS14,  SW6_CS14},
+   {0, SW7_CS14,  SW8_CS14,  SW9_CS14},
+   {0, SW10_CS14,  SW11_CS14,  SW12_CS14},
+   {0, SW4_CS15,  SW5_CS15,  SW6_CS15},
+   {0, SW7_CS15,  SW8_CS15,  SW9_CS15},
 
-   {0, A_5,   B_5,   C_5},
-   {0, D_5,   E_5,   F_5},
-   {0, G_5,   H_5,   I_5},
-   {0, J_5,   K_5,   L_5},
-   {0, A_10,  B_10,  C_10},
-   {0, D_10,  E_10,  F_10},
-   {0, G_10,  H_10,  I_10},
-   {0, J_10,  K_10,  L_10},
-   {0, J_15,  K_15,  L_15}
+   {0, SW1_CS5,   SW2_CS5,   SW3_CS5},
+   {0, SW4_CS5,   SW5_CS5,   SW6_CS5},
+   {0, SW7_CS5,   SW8_CS5,   SW9_CS5},
+   {0, SW10_CS5,   SW11_CS5,   SW12_CS5},
+   {0, SW1_CS10,  SW2_CS10,  SW3_CS10},
+   {0, SW4_CS10,  SW5_CS10,  SW6_CS10},
+   {0, SW7_CS10,  SW8_CS10,  SW9_CS10},
+   {0, SW10_CS10,  SW11_CS10,  SW12_CS10},
+   {0, SW10_CS15,  SW11_CS15,  SW12_CS15}
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 94bd6ef6af6..86af11fc94b 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -32,3 +32,6 @@
 
 /* PMW33XX Settings */
 #define PMW33XX_CS_PIN B0
+
+/* Custom encoder needs to specify just how many encoders we have */
+#define NUM_ENCODERS 1
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index 5dc53392ff2..1f110aad71f 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -31,6 +31,12 @@
             ["D4", "D2", "E6", "B6", "D7", "C6", "C7", "B7"]
         ]
     },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "driver": "custom"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c
index e2dada4a155..5f4a82e474c 100644
--- a/keyboards/ploopyco/mouse/mouse.c
+++ b/keyboards/ploopyco/mouse/mouse.c
@@ -66,8 +66,6 @@ uint8_t  OptLowPin         = OPT_ENC1;
 bool     debug_encoder     = false;
 bool     is_drag_scroll    = false;
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
-
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
         return false;
@@ -83,7 +81,14 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 
-void process_wheel(void) {
+void encoder_driver_init(void) {
+    setPinInput(OPT_ENC1);
+    setPinInput(OPT_ENC2);
+
+    opt_encoder_init();
+}
+
+void encoder_driver_task(void) {
     // Lovingly ripped from the Ploopy Source
 
     // If the mouse wheel was just released, do not scroll.
@@ -111,12 +116,10 @@ void process_wheel(void) {
     int dir = opt_encoder_handler(p1, p2);
 
     if (dir == 0) return;
-    encoder_update_kb(0, dir > 0);
+    encoder_queue_event(0, dir == 1);
 }
 
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
-    process_wheel();
-
     if (is_drag_scroll) {
         mouse_report.h = mouse_report.x;
 #ifdef PLOOPY_DRAGSCROLL_INVERT
@@ -177,9 +180,6 @@ void keyboard_pre_init_kb(void) {
     // debug_mouse   = true;
     // debug_encoder = true;
 
-    setPinInput(OPT_ENC1);
-    setPinInput(OPT_ENC2);
-
     /* Ground all output pins connected to ground. This provides additional
      * pathways to ground. If you're messing with this, know this: driving ANY
      * of these pins high will cause a short. On the MCU. Ka-blooey.
@@ -204,8 +204,6 @@ void keyboard_pre_init_kb(void) {
 
 void pointing_device_init_kb(void) {
     pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
-    // initialize the scroll wheel's optical encoder
-    opt_encoder_init();
 }
 
 void eeconfig_init_kb(void) {
diff --git a/keyboards/ploopyco/mouse/rules.mk b/keyboards/ploopyco/mouse/rules.mk
index 17df9cc3c90..63569507805 100644
--- a/keyboards/ploopyco/mouse/rules.mk
+++ b/keyboards/ploopyco/mouse/rules.mk
@@ -16,9 +16,6 @@ POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSEKEY_ENABLE = yes       # Mouse keys
 
-ENCODER_ENABLE := no
-OPTS_DEF += -DENCODER_ENABLE
-
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += opt_encoder.c
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index de0ed1ebece..a1f3695d815 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -31,3 +31,6 @@
 /* PMW33XX Settings */
 #define PMW33XX_CS_PIN             B0
 #define POINTING_DEVICE_INVERT_Y
+
+/* Custom encoder needs to specify just how many encoders we have */
+#define NUM_ENCODERS 1
diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json
index 2c30755aa1e..110264ef1c6 100644
--- a/keyboards/ploopyco/trackball/info.json
+++ b/keyboards/ploopyco/trackball/info.json
@@ -12,6 +12,12 @@
     "bootmagic": {
         "matrix": [0, 3]
     },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "driver": "custom"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ploopyco/trackball/rules.mk b/keyboards/ploopyco/trackball/rules.mk
index ce7c4f29c86..ca1a8fd17a1 100644
--- a/keyboards/ploopyco/trackball/rules.mk
+++ b/keyboards/ploopyco/trackball/rules.mk
@@ -16,9 +16,6 @@ POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSEKEY_ENABLE = yes       # Mouse keys
 
-ENCODER_ENABLE := no
-OPTS_DEF += -DENCODER_ENABLE
-
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += opt_encoder.c
diff --git a/keyboards/ploopyco/trackball/trackball.c b/keyboards/ploopyco/trackball/trackball.c
index 8fd5b8650d3..0c606bab070 100644
--- a/keyboards/ploopyco/trackball/trackball.c
+++ b/keyboards/ploopyco/trackball/trackball.c
@@ -66,8 +66,6 @@ uint8_t  OptLowPin         = OPT_ENC1;
 bool     debug_encoder     = false;
 bool     is_drag_scroll    = false;
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
-
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
         return false;
@@ -83,7 +81,15 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 
-void process_wheel(void) {
+
+void encoder_driver_init(void) {
+    setPinInput(OPT_ENC1);
+    setPinInput(OPT_ENC2);
+
+    opt_encoder_init();
+}
+
+void encoder_driver_task(void) {
     // TODO: Replace this with interrupt driven code,  polling is S L O W
     // Lovingly ripped from the Ploopy Source
 
@@ -112,11 +118,10 @@ void process_wheel(void) {
     int dir = opt_encoder_handler(p1, p2);
 
     if (dir == 0) return;
-    encoder_update_kb(0, dir > 0);
+    encoder_queue_event(0, dir == 1);
 }
 
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
-    process_wheel();
 
     if (is_drag_scroll) {
 #ifdef PLOOPY_DRAGSCROLL_H_INVERT
@@ -189,9 +194,6 @@ void keyboard_pre_init_kb(void) {
     // debug_mouse   = true;
     // debug_encoder = true;
 
-    setPinInput(OPT_ENC1);
-    setPinInput(OPT_ENC2);
-
     /* Ground all output pins connected to ground. This provides additional
      * pathways to ground. If you're messing with this, know this: driving ANY
      * of these pins high will cause a short. On the MCU. Ka-blooey.
@@ -216,8 +218,6 @@ void keyboard_pre_init_kb(void) {
 
 void pointing_device_init_kb(void) {
     pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
-    // initialize the scroll wheel's optical encoder
-    opt_encoder_init();
 }
 
 void eeconfig_init_kb(void) {
diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h
index 789deb5a5f1..6b92563fa9e 100644
--- a/keyboards/ploopyco/trackball_mini/config.h
+++ b/keyboards/ploopyco/trackball_mini/config.h
@@ -32,3 +32,6 @@
 #define ADNS5050_CS_PIN           B4
 
 #define POINTING_DEVICE_ROTATION_270
+
+/* Custom encoder needs to specify just how many encoders we have */
+#define NUM_ENCODERS 1
diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json
index 301c8d18ec5..0e7b12d20d3 100644
--- a/keyboards/ploopyco/trackball_mini/info.json
+++ b/keyboards/ploopyco/trackball_mini/info.json
@@ -14,6 +14,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "driver": "custom"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ploopyco/trackball_mini/rules.mk b/keyboards/ploopyco/trackball_mini/rules.mk
index bcede0676ca..d2bacc39740 100644
--- a/keyboards/ploopyco/trackball_mini/rules.mk
+++ b/keyboards/ploopyco/trackball_mini/rules.mk
@@ -13,9 +13,6 @@ POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = adns5050
 MOUSEKEY_ENABLE = yes        # Mouse keys
 
-ENCODER_ENABLE := no
-OPTS_DEF += -DENCODER_ENABLE
-
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += opt_encoder.c
diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.c b/keyboards/ploopyco/trackball_mini/trackball_mini.c
index 8bc0ab99c23..8517a54e708 100644
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.c
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.c
@@ -74,8 +74,6 @@ uint8_t  OptLowPin         = OPT_ENC1;
 bool     debug_encoder     = false;
 bool     is_drag_scroll    = false;
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
-
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
         return false;
@@ -91,7 +89,14 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 
-void process_wheel(void) {
+void encoder_driver_init(void) {
+    setPinInput(OPT_ENC1);
+    setPinInput(OPT_ENC2);
+
+    opt_encoder_init();
+}
+
+void encoder_driver_task(void) {
     uint16_t p1 = adc_read(OPT_ENC1_MUX);
     uint16_t p2 = adc_read(OPT_ENC2_MUX);
 
@@ -113,21 +118,17 @@ void process_wheel(void) {
     }
 
     if (dir == 0) return;
-    encoder_update_kb(0, dir > 0);
+    encoder_queue_event(0, dir == 1);
 
     lastScroll = timer_read();
 }
 
 void pointing_device_init_kb(void) {
-    opt_encoder_init();
-
     // set the DPI.
     pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
 }
 
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
-    process_wheel();
-
     if (is_drag_scroll) {
         mouse_report.h = mouse_report.x;
 #ifdef PLOOPY_DRAGSCROLL_INVERT
@@ -180,9 +181,6 @@ void keyboard_pre_init_kb(void) {
     // debug_mouse = true;
     // debug_encoder = true;
 
-    setPinInput(OPT_ENC1);
-    setPinInput(OPT_ENC2);
-
     /* Ground all output pins connected to ground. This provides additional
      * pathways to ground. If you're messing with this, know this: driving ANY
      * of these pins high will cause a short. On the MCU. Ka-blooey.
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
deleted file mode 100644
index 370eb95aa03..00000000000
--- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * 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
-
-// Configuration options
-#define SCROLL_TIMEOUT 25
-#define DELTA_X_THRESHOLD 60
-#define DELTA_Y_THRESHOLD 15
-
-bool scroll_enabled = false;
-bool lock_state     = false;
-
-// State
-static int8_t delta_x = 0;
-static int8_t delta_y = 0;
-
-// Dummy
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
-
-report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
-    if (scroll_enabled) {
-        delta_x += mouse_report.x;
-        delta_y += mouse_report.y;
-
-        if (delta_x > DELTA_X_THRESHOLD) {
-            mouse_report.h = 1;
-            delta_x        = 0;
-        } else if (delta_x < -DELTA_X_THRESHOLD) {
-            mouse_report.h = -1;
-            delta_x        = 0;
-        }
-
-        if (delta_y > DELTA_Y_THRESHOLD) {
-            mouse_report.v = -1;
-            delta_y        = 0;
-        } else if (delta_y < -DELTA_Y_THRESHOLD) {
-            mouse_report.v = 1;
-            delta_y        = 0;
-        }
-        mouse_report.x = 0;
-        mouse_report.y = 0;
-    }
-    return mouse_report;
-}
-
-void keyboard_post_init_user(void) {
-	lock_state = host_keyboard_led_state().num_lock;
-}
-
-bool led_update_user(led_t led_state) {
-	static uint8_t lock_count = 0;
-	static uint16_t scroll_timer = 0;
-
-	if (timer_elapsed(scroll_timer) > SCROLL_TIMEOUT) {
-		scroll_timer = timer_read();
-		lock_count = 0;
-	}
-
-	if (led_state.num_lock != lock_state) {
-		lock_count++;
-
-		if (lock_count == 2) {
-			scroll_enabled = !scroll_enabled;
-			lock_count = 0;
-		}
-	}
-
-	lock_state = led_state.num_lock;
-	return true;
-}
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/maddie/readme.md b/keyboards/ploopyco/trackball_nano/keymaps/maddie/readme.md
deleted file mode 100644
index 3a597e38d81..00000000000
--- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-toggles scroll mode when numlock is double-tapped within 25ms. add a macro or something, unless you have ungodly fast fingers.
diff --git a/keyboards/ploopyco/trackball_thumb/config.h b/keyboards/ploopyco/trackball_thumb/config.h
index 8fc084c38ce..316755f6866 100644
--- a/keyboards/ploopyco/trackball_thumb/config.h
+++ b/keyboards/ploopyco/trackball_thumb/config.h
@@ -31,3 +31,6 @@
 
 /* PMW3360 Settings */
 #define POINTING_DEVICE_CS_PIN B0
+
+/* Custom encoder needs to specify just how many encoders we have */
+#define NUM_ENCODERS 1
diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json
index 72e236a5bbf..e27bf472521 100644
--- a/keyboards/ploopyco/trackball_thumb/info.json
+++ b/keyboards/ploopyco/trackball_thumb/info.json
@@ -18,7 +18,10 @@
         "mousekey": true,
         "nkro": true,
         "pointing_device": true,
-        "encoder": false
+        "encoder": true
+    },
+    "encoder": {
+        "driver": "custom"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/ploopyco/trackball_thumb/post_rules.mk b/keyboards/ploopyco/trackball_thumb/post_rules.mk
deleted file mode 100644
index d922afd9cd7..00000000000
--- a/keyboards/ploopyco/trackball_thumb/post_rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Force encoder to be disabled
-# But enable the defines for it
-ENCODER_ENABLE := no
-OPT_DEFS += -DENCODER_ENABLE
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
index bbc782da457..326410cf136 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
@@ -17,6 +17,7 @@
  */
 
 #include "trackball_thumb.h"
+#include "encoder.h"
 
 #ifndef OPT_DEBOUNCE
 #    define OPT_DEBOUNCE 5  // (ms) 			Time between scroll events
@@ -57,9 +58,6 @@ uint16_t last_mid_click    = 0;  // Stops scrollwheel from being read if it was
 bool     debug_encoder     = false;
 bool     is_drag_scroll    = false;
 
-// require, since core encoder.c (where is is normally defined isn't present
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
-
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
         return false;
@@ -75,25 +73,25 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 
-void encoder_init(void) { opt_encoder_init(); }
+void encoder_driver_init(void) { opt_encoder_init(); }
 
-bool encoder_read(void) {
+void encoder_driver_task(void) {
     // Lovingly ripped from the Ploopy Source
 
     // If the mouse wheel was just released, do not scroll.
     if (timer_elapsed(last_mid_click) < SCROLL_BUTT_DEBOUNCE) {
-        return false;
+        return;
     }
 
     // Limit the number of scrolls per unit time.
     if (timer_elapsed(last_scroll) < OPT_DEBOUNCE) {
-        return false;
+        return;
     }
 
     // Don't scroll if the middle button is depressed.
     if (is_scroll_clicked) {
 #ifndef IGNORE_SCROLL_CLICK
-        return false;
+        return;
 #endif
     }
 
@@ -104,10 +102,8 @@ bool encoder_read(void) {
 
     int dir = opt_encoder_handler(p1, p2);
 
-    if (dir == 0) return false;
-    ;
-    encoder_update_kb(0, dir == 1);
-    return true;
+    if (dir == 0) return;
+    encoder_queue_event(0, dir == 1);
 }
 
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
index 8ee17634f11..50a71601cf2 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
@@ -28,9 +28,6 @@
 #define OPT_ENC1_MUX 4
 #define OPT_ENC2_MUX 0
 
-bool encoder_update_kb(uint8_t index, bool clockwise);
-bool encoder_update_user(uint8_t index, bool clockwise);
-
 typedef union {
     uint32_t raw;
     struct {
diff --git a/keyboards/plywrks/ply8x/config.h b/keyboards/plywrks/ply8x/config.h
index cccedf8e231..3fc4de978d7 100644
--- a/keyboards/plywrks/ply8x/config.h
+++ b/keyboards/plywrks/ply8x/config.h
@@ -3,12 +3,8 @@
 
 #pragma once
 
-/* RGB */
 #define WS2812_SPI_DRIVER SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_EXTERNAL_PULLUP
-#define RGB_MATRIX_LED_COUNT 6
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/pmk/posey_split/config.h b/keyboards/pmk/posey_split/config.h
new file mode 100644
index 00000000000..f115e5fc2c6
--- /dev/null
+++ b/keyboards/pmk/posey_split/config.h
@@ -0,0 +1,18 @@
+// Copyright 2023 Javier Oliver (@joliverMI)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*Split keyboard configuration*/
+// Hardware Settings
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP1
+#define SERIAL_USART_RX_PIN GP0
+
+// Communication Settings
+#define FORCED_SYNC_THROTTLE_MS 1000
+#define SPLIT_MAX_CONNECTION_ERRORS 5
+#define SPLIT_CONNECTION_CHECK_TIMEOUT 2000
+
+// RGB Configuration
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 2.0 //1.0 to 2.7
\ No newline at end of file
diff --git a/keyboards/pmk/posey_split/v4/info.json b/keyboards/pmk/posey_split/v4/info.json
new file mode 100644
index 00000000000..016c4d7122e
--- /dev/null
+++ b/keyboards/pmk/posey_split/v4/info.json
@@ -0,0 +1,145 @@
+{
+    "manufacturer": "Posey's Mechanical Keyboards",
+    "keyboard_name": "posey_split_v4",
+    "maintainer": "joliverMI",
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "rgblight": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
+        "rows": ["GP10", "GP11", "GP12", "GP13", "GP14", "GP15"]
+    },
+    "processor": "RP2040",
+    "ws2812": {
+        "pin": "GP17",
+        "driver": "vendor"
+    },
+    "rgblight": {
+        "animations": {
+            "breathing": true
+        },
+        "layers": {
+            "enabled": true,
+            "max": 4
+        },
+        "led_count": 1,
+        "sleep": true,
+        "split": true,
+        "split_count": [1, 0]
+    },
+    "split": {
+        "enabled": true,
+        "handedness": {
+            "pin": "GP18"
+        }
+    },
+    "tags": ["split"],
+    "url": "poseysmechanicalkeyboards.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0003",
+        "vid": "0x4A4F"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "LED", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "F1", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "F2", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "F3", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "F4", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 7, "y": 0},
+                {"matrix": [6, 0], "label": "Layer", "x": 9.294, "y": 0},
+                {"matrix": [6, 1], "label": "F7", "x": 10.294, "y": 0},
+                {"matrix": [6, 2], "label": "F8", "x": 11.294, "y": 0},
+                {"matrix": [6, 3], "label": "F9", "x": 12.294, "y": 0},
+                {"matrix": [6, 4], "label": "F10", "x": 13.294, "y": 0},
+                {"matrix": [6, 5], "label": "F11", "x": 14.294, "y": 0},
+                {"matrix": [6, 6], "label": "Pause", "x": 15.294, "y": 0},
+                {"matrix": [6, 7], "label": "Delete", "x": 16.294, "y": 0},
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "1", "x": 1, "y": 1},
+                {"matrix": [1, 2], "label": "2", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "3", "x": 3, "y": 1},
+                {"matrix": [1, 4], "label": "4", "x": 4, "y": 1},
+                {"matrix": [1, 5], "label": "5", "x": 5, "y": 1},
+                {"matrix": [1, 6], "label": "6", "x": 6, "y": 1},
+                {"matrix": [1, 7], "label": "7", "x": 7, "y": 1},
+                {"matrix": [7, 0], "label": "&", "x": 9.294, "y": 1},
+                {"matrix": [7, 1], "label": "*", "x": 10.294, "y": 1},
+                {"matrix": [7, 2], "label": "(", "x": 11.294, "y": 1},
+                {"matrix": [7, 3], "label": ")", "x": 12.294, "y": 1},
+                {"matrix": [7, 4], "label": "_", "x": 13.294, "y": 1},
+                {"matrix": [7, 5], "label": "+", "x": 14.294, "y": 1},
+                {"matrix": [7, 6], "label": "Backspace", "x": 15.294, "y": 1, "w": 2},
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2},
+                {"matrix": [8, 0], "label": "Y", "x": 8.794, "y": 2},
+                {"matrix": [8, 1], "label": "U", "x": 9.794, "y": 2},
+                {"matrix": [8, 2], "label": "I", "x": 10.794, "y": 2},
+                {"matrix": [8, 3], "label": "O", "x": 11.794, "y": 2},
+                {"matrix": [8, 4], "label": "P", "x": 12.794, "y": 2},
+                {"matrix": [8, 5], "label": "{", "x": 13.794, "y": 2},
+                {"matrix": [8, 6], "label": "}", "x": 14.794, "y": 2},
+                {"matrix": [8, 7], "label": "|", "x": 15.794, "y": 2, "w": 1.5},
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3},
+                {"matrix": [9, 0], "label": "H", "x": 9.044, "y": 3},
+                {"matrix": [9, 1], "label": "J", "x": 10.044, "y": 3},
+                {"matrix": [9, 2], "label": "K", "x": 11.044, "y": 3},
+                {"matrix": [9, 3], "label": "L", "x": 12.044, "y": 3},
+                {"matrix": [9, 4], "label": ":", "x": 13.044, "y": 3},
+                {"matrix": [9, 5], "label": "\"", "x": 14.044, "y": 3},
+                {"matrix": [9, 6], "label": "Enter", "x": 15.044, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "label": "Z", "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "label": "X", "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "label": "C", "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "label": "V", "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "label": "B", "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "label": "N", "x": 7.25, "y": 4},
+                {"matrix": [10, 0], "label": "B", "x": 8.544, "y": 4},
+                {"matrix": [10, 1], "label": "N", "x": 9.544, "y": 4},
+                {"matrix": [10, 2], "label": "M", "x": 10.544, "y": 4},
+                {"matrix": [10, 3], "label": "<", "x": 11.544, "y": 4},
+                {"matrix": [10, 4], "label": ">", "x": 12.544, "y": 4},
+                {"matrix": [10, 5], "label": "?", "x": 13.544, "y": 4},
+                {"matrix": [10, 6], "label": "Shift", "x": 14.544, "y": 4, "w": 2.75},
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "label": "L2", "x": 3.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "label": "Space", "x": 5.5, "y": 5, "w": 2.75},
+                {"matrix": [11, 1], "label": "Space", "x": 8.794, "y": 5, "w": 2.25},
+                {"matrix": [11, 2], "label": "Space", "x": 11.044, "y": 5, "w": 1.25},
+                {"matrix": [11, 3], "label": "L2", "x": 12.294, "y": 5, "w": 1.25},
+                {"matrix": [11, 4], "label": "Win", "x": 13.544, "y": 5, "w": 1.25},
+                {"matrix": [11, 5], "label": "Menu", "x": 14.794, "y": 5, "w": 1.25},
+                {"matrix": [11, 7], "label": "Ctrl", "x": 16.044, "y": 5, "w": 1.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/pmk/posey_split/v4/keymaps/default/keymap.c b/keyboards/pmk/posey_split/v4/keymaps/default/keymap.c
new file mode 100644
index 00000000000..3a607c0296c
--- /dev/null
+++ b/keyboards/pmk/posey_split/v4/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2024 Javier Oliver (@joliverMI)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum my_layers {
+    _QWERTY,
+    _NAV,
+    _SYMB,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┐      ┌───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│LED│F1 │F2 │F3 │F4 │F5 │F6 │      │L1 │F7 │F8 │F9 │F10│F11│PAS│Del│ 16
+     * ├───┼───┼───┼───┼───┼───┼───┴───┤      ├───┴───┼───┼───┼───┼───┼───┴───┤
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │      │7  │8  │ 9 │ 0 │ - │ = │ Backsp│ 15
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘    ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ 
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │      │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ 15
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐     └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │      │ H │J  │ K │ L │ ; │ ' │  Enter │ 14
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐  ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │  │ B │ N │ M │ , │ . │ / │    Shift │ 14
+     * ├────┬───┴┬──┴┬──┴───┴┬──┴───┴───┤  └┬──┴───┴─┬─┴──┬┴───┴───┴┬─────────┤
+     * │Ctrl│GUI │L2 │Alt    │          │   │        | L3 │ Alt│ GUI│Menu│Ctrl│ 11
+     * └────┴────┴───┴───────┴──────────┘   └────────┴────┴────┴────┴────┴────┘
+     */
+    [_QWERTY] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_ESC,  KC_NO,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   MO(_SYMB),  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_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BACKSPACE,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,     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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_UP,
+     //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤
+        KC_LCTL,   KC_LGUI, MO(_NAV),    KC_LALT,                  KC_SPC,             KC_SPC,          MO(_NAV),   KC_RGUI, KC_LEFT, KC_DOWN,  KC_RIGHT
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    ),
+    [_NAV] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, MO(_SYMB), KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_ENT,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, 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, KC_LEFT, KC_DOWN, KC_RIGHT
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    ),
+    [_SYMB] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_ESC,  KC_TRNS, KC_TRNS, KC_F12,  KC_F13,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, QK_CLEAR_EEPROM,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      DT_UP,
+     //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤
+        KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,                 KC_TRNS,                   KC_TRNS,         KC_TRNS, KC_TRNS, DT_PRNT, DT_DOWN, KC_SLEP
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    )
+};
diff --git a/keyboards/pmk/posey_split/v4/keymaps/via/keymap.c b/keyboards/pmk/posey_split/v4/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ffe726ead71
--- /dev/null
+++ b/keyboards/pmk/posey_split/v4/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2024 Javier Oliver (@joliverMI)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum my_layers {
+    _QWERTY,
+    _NAV,
+    _SYMB,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┐      ┌───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│LED│F1 │F2 │F3 │F4 │F5 │F6 │      │L1 │F7 │F8 │F9 │F10│F11│PAS│Del│ 16
+     * ├───┼───┼───┼───┼───┼───┼───┴───┤      ├───┴───┼───┼───┼───┼───┼───┴───┤
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │      │7  │8  │ 9 │ 0 │ - │ = │ Backsp│ 15
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘    ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ 
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │      │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ 15
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐     └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │      │ H │J  │ K │ L │ ; │ ' │  Enter │ 14
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐  ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │  │ B │ N │ M │ , │ . │ / │    Shift │ 14
+     * ├────┬───┴┬──┴┬──┴───┴┬──┴───┴───┤  └┬──┴───┴─┬─┴──┬┴───┴───┴┬─────────┤
+     * │Ctrl│GUI │L2 │Alt    │          │   │        | L3 │ Alt│ GUI│Menu│Ctrl│ 11
+     * └────┴────┴───┴───────┴──────────┘   └────────┴────┴────┴────┴────┴────┘
+     */
+    [_QWERTY] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_ESC,  KC_NO,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   MO(_SYMB),  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_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BACKSPACE,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,     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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_UP,
+     //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤
+        KC_LCTL,   KC_LGUI, MO(_NAV),    KC_LALT,                  KC_SPC,                    KC_SPC,          MO(_NAV),   KC_RGUI, KC_LEFT, KC_DOWN,  KC_RIGHT
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    ),
+    [_NAV] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, MO(_SYMB), KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_ENT,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, 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, KC_LEFT, KC_DOWN, KC_RIGHT
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    ),
+    [_SYMB] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_ESC,  KC_TRNS, KC_TRNS, KC_F12,  KC_F13,  KC_TRNS,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, QK_CLEAR_EEPROM,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      DT_UP,
+     //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤
+        KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,                 KC_TRNS,                   KC_TRNS,         KC_TRNS, KC_TRNS, DT_PRNT, DT_DOWN, KC_SLEP
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    )
+};
diff --git a/keyboards/pmk/posey_split/v4/keymaps/via/rules.mk b/keyboards/pmk/posey_split/v4/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/pmk/posey_split/v4/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/pmk/posey_split/v4/readme.md b/keyboards/pmk/posey_split/v4/readme.md
new file mode 100644
index 00000000000..c4e15656206
--- /dev/null
+++ b/keyboards/pmk/posey_split/v4/readme.md
@@ -0,0 +1,30 @@
+# posey_split_v4
+
+![posey_split_v4](https://i.imgur.com/g3yf6alh.png)
+
+The Posey split keyboard was designed from the gournd up for gaming. By pushing the left half of your split keyboard out of the way, you'll be able to game with better posture and increase mouse movement. PMK's have additional keys on the right half to make sure you don't need to reach for your other half while gaming. 
+
+Version Changes from v4:
+-Changed bottom row on the left half to use standard modifier key sizes
+
+* Keyboard Maintainer: [Javier Oliver](https://github.com/joliverMI)
+* Hardware Supported: posey_split_v4, blizz_sorc_v1 and logic_module_v1
+* Hardware Availability: poseysmechanicalkeyboards.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pmk/posey_split/v4:default
+    
+Flashing example for this keyboard:
+
+    make pmk/posey_split/v4: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 Escape and plug in the keyboard
+* **Physical reset button**: Hold the button on the bottom of the keyboard while you plug in the USB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/pmk/posey_split/v4/rules.mk b/keyboards/pmk/posey_split/v4/rules.mk
new file mode 100644
index 00000000000..743228e94b6
--- /dev/null
+++ b/keyboards/pmk/posey_split/v4/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
\ No newline at end of file
diff --git a/keyboards/pmk/posey_split/v5/info.json b/keyboards/pmk/posey_split/v5/info.json
new file mode 100644
index 00000000000..9ef7d0af022
--- /dev/null
+++ b/keyboards/pmk/posey_split/v5/info.json
@@ -0,0 +1,145 @@
+{
+    "manufacturer": "Posey's Mechanical Keyboards",
+    "keyboard_name": "posey_split_v5",
+    "maintainer": "joliverMI",
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "rgblight": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
+        "rows": ["GP10", "GP11", "GP12", "GP13", "GP14", "GP15"]
+    },
+    "processor": "RP2040",
+    "ws2812": {
+        "pin": "GP17",
+        "driver": "vendor"
+    },
+    "rgblight": {
+        "animations": {
+            "breathing": true
+        },
+        "layers": {
+            "enabled": true,
+            "max": 4
+        },
+        "led_count": 1,
+        "sleep": true,
+        "split": true,
+        "split_count": [1, 0]
+    },
+    "split": {
+        "enabled": true,
+        "handedness": {
+            "pin": "GP18"
+        }
+    },
+    "tags": ["split"],
+    "url": "poseysmechanicalkeyboards.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0005",
+        "vid": "0x4A4F"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "LED", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "F1", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "F2", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "F3", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "F4", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 7, "y": 0},
+                {"matrix": [6, 0], "label": "Layer", "x": 9.294, "y": 0},
+                {"matrix": [6, 1], "label": "F7", "x": 10.294, "y": 0},
+                {"matrix": [6, 2], "label": "F8", "x": 11.294, "y": 0},
+                {"matrix": [6, 3], "label": "F9", "x": 12.294, "y": 0},
+                {"matrix": [6, 4], "label": "F10", "x": 13.294, "y": 0},
+                {"matrix": [6, 5], "label": "F11", "x": 14.294, "y": 0},
+                {"matrix": [6, 6], "label": "Pause", "x": 15.294, "y": 0},
+                {"matrix": [6, 7], "label": "Delete", "x": 16.294, "y": 0},
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "1", "x": 1, "y": 1},
+                {"matrix": [1, 2], "label": "2", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "3", "x": 3, "y": 1},
+                {"matrix": [1, 4], "label": "4", "x": 4, "y": 1},
+                {"matrix": [1, 5], "label": "5", "x": 5, "y": 1},
+                {"matrix": [1, 6], "label": "6", "x": 6, "y": 1},
+                {"matrix": [1, 7], "label": "7", "x": 7, "y": 1},
+                {"matrix": [7, 0], "label": "&", "x": 9.294, "y": 1},
+                {"matrix": [7, 1], "label": "*", "x": 10.294, "y": 1},
+                {"matrix": [7, 2], "label": "(", "x": 11.294, "y": 1},
+                {"matrix": [7, 3], "label": ")", "x": 12.294, "y": 1},
+                {"matrix": [7, 4], "label": "_", "x": 13.294, "y": 1},
+                {"matrix": [7, 5], "label": "+", "x": 14.294, "y": 1},
+                {"matrix": [7, 6], "label": "Backspace", "x": 15.294, "y": 1, "w": 2},
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2},
+                {"matrix": [8, 0], "label": "Y", "x": 8.794, "y": 2},
+                {"matrix": [8, 1], "label": "U", "x": 9.794, "y": 2},
+                {"matrix": [8, 2], "label": "I", "x": 10.794, "y": 2},
+                {"matrix": [8, 3], "label": "O", "x": 11.794, "y": 2},
+                {"matrix": [8, 4], "label": "P", "x": 12.794, "y": 2},
+                {"matrix": [8, 5], "label": "{", "x": 13.794, "y": 2},
+                {"matrix": [8, 6], "label": "}", "x": 14.794, "y": 2},
+                {"matrix": [8, 7], "label": "|", "x": 15.794, "y": 2, "w": 1.5},
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3},
+                {"matrix": [9, 0], "label": "H", "x": 9.044, "y": 3},
+                {"matrix": [9, 1], "label": "J", "x": 10.044, "y": 3},
+                {"matrix": [9, 2], "label": "K", "x": 11.044, "y": 3},
+                {"matrix": [9, 3], "label": "L", "x": 12.044, "y": 3},
+                {"matrix": [9, 4], "label": ":", "x": 13.044, "y": 3},
+                {"matrix": [9, 5], "label": "\"", "x": 14.044, "y": 3},
+                {"matrix": [9, 6], "label": "Enter", "x": 15.044, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "label": "Z", "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "label": "X", "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "label": "C", "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "label": "V", "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "label": "B", "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "label": "N", "x": 7.25, "y": 4},
+                {"matrix": [10, 0], "label": "B", "x": 8.544, "y": 4},
+                {"matrix": [10, 1], "label": "N", "x": 9.544, "y": 4},
+                {"matrix": [10, 2], "label": "M", "x": 10.544, "y": 4},
+                {"matrix": [10, 3], "label": "<", "x": 11.544, "y": 4},
+                {"matrix": [10, 4], "label": ">", "x": 12.544, "y": 4},
+                {"matrix": [10, 5], "label": "?", "x": 13.544, "y": 4},
+                {"matrix": [10, 6], "label": "Shift", "x": 14.544, "y": 4, "w": 2.75},
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "label": "Layer", "x": 2.5, "y": 5},
+                {"matrix": [5, 3], "label": "Alt", "x": 3.5, "y": 5, "w": 2},
+                {"matrix": [5, 6], "label": "Space", "x": 5.5, "y": 5, "w": 2.75},
+                {"matrix": [11, 1], "label": "Space", "x": 8.794, "y": 5, "w": 2.25},
+                {"matrix": [11, 2], "label": "Arrows", "x": 11.044, "y": 5, "w": 1.25},
+                {"matrix": [11, 3], "label": "Ctrl", "x": 12.294, "y": 5, "w": 1.25},
+                {"matrix": [11, 4], "label": "Win", "x": 13.544, "y": 5, "w": 1.25},
+                {"matrix": [11, 5], "label": "Menu", "x": 14.794, "y": 5, "w": 1.25},
+                {"matrix": [11, 7], "label": "Ctrl", "x": 16.044, "y": 5, "w": 1.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/pmk/posey_split/v5/keymaps/default/keymap.c b/keyboards/pmk/posey_split/v5/keymaps/default/keymap.c
new file mode 100644
index 00000000000..fa7fd018a01
--- /dev/null
+++ b/keyboards/pmk/posey_split/v5/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2024 Javier Oliver (@joliverMI)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum my_layers {
+    _QWERTY,
+    _NAV,
+    _SYMB,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┐      ┌───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│LED│F1 │F2 │F3 │F4 │F5 │F6 │      │L1 │F7 │F8 │F9 │F10│F11│PAS│Del│ 16
+     * ├───┼───┼───┼───┼───┼───┼───┴───┤      ├───┴───┼───┼───┼───┼───┼───┴───┤
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │      │7  │8  │ 9 │ 0 │ - │ = │ Backsp│ 15
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘    ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ 
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │      │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ 15
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐     └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │      │ H │J  │ K │ L │ ; │ ' │  Enter │ 14
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐  ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │  │ B │ N │ M │ , │ . │ / │    Shift │ 14
+     * ├────┬───┴┬──┴─┬─┴───┴┬──┴───┴───┤  └┬──┴───┴─┬─┴──┬┴───┴───┴┬─────────┤
+     * │Ctrl│GUI │Alt │L2    │          │   │        | L3 │ Alt│ GUI│Menu│Ctrl│ 11
+     * └────┴────┴────┴──────┴──────────┘   └────────┴────┴────┴────┴────┴────┘
+     */
+    [_QWERTY] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_ESC,  KC_NO,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   MO(_SYMB),  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_PAUS, KC_DEL,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BACKSPACE,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,     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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_UP,
+     //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤
+        KC_LCTL,   KC_LGUI, KC_LALT,   MO(_NAV),                  KC_SPC,                    KC_SPC,       MO(_NAV), KC_RGUI, KC_LEFT, KC_DOWN,KC_RIGHT
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    ),
+    [_NAV] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SYMB), KC_TRNS,KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_ENT,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, 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, KC_LEFT, KC_DOWN, KC_RIGHT
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    ),
+    [_SYMB] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_ESC,  KC_TRNS, KC_TRNS, KC_F12,  KC_F13,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, QK_CLEAR_EEPROM,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      DT_UP,
+     //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤
+        KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,                 KC_TRNS,                   KC_TRNS,         KC_TRNS, KC_TRNS, DT_PRNT, DT_DOWN, KC_SLEP
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    )
+};
diff --git a/keyboards/pmk/posey_split/v5/keymaps/via/keymap.c b/keyboards/pmk/posey_split/v5/keymaps/via/keymap.c
new file mode 100644
index 00000000000..fa7fd018a01
--- /dev/null
+++ b/keyboards/pmk/posey_split/v5/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2024 Javier Oliver (@joliverMI)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum my_layers {
+    _QWERTY,
+    _NAV,
+    _SYMB,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┐      ┌───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│LED│F1 │F2 │F3 │F4 │F5 │F6 │      │L1 │F7 │F8 │F9 │F10│F11│PAS│Del│ 16
+     * ├───┼───┼───┼───┼───┼───┼───┴───┤      ├───┴───┼───┼───┼───┼───┼───┴───┤
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │      │7  │8  │ 9 │ 0 │ - │ = │ Backsp│ 15
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘    ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ 
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │      │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ 15
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐     └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │      │ H │J  │ K │ L │ ; │ ' │  Enter │ 14
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐  ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │  │ B │ N │ M │ , │ . │ / │    Shift │ 14
+     * ├────┬───┴┬──┴─┬─┴───┴┬──┴───┴───┤  └┬──┴───┴─┬─┴──┬┴───┴───┴┬─────────┤
+     * │Ctrl│GUI │Alt │L2    │          │   │        | L3 │ Alt│ GUI│Menu│Ctrl│ 11
+     * └────┴────┴────┴──────┴──────────┘   └────────┴────┴────┴────┴────┴────┘
+     */
+    [_QWERTY] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_ESC,  KC_NO,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   MO(_SYMB),  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_PAUS, KC_DEL,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BACKSPACE,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,     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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_UP,
+     //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤
+        KC_LCTL,   KC_LGUI, KC_LALT,   MO(_NAV),                  KC_SPC,                    KC_SPC,       MO(_NAV), KC_RGUI, KC_LEFT, KC_DOWN,KC_RIGHT
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    ),
+    [_NAV] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SYMB), KC_TRNS,KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_ENT,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, 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, KC_LEFT, KC_DOWN, KC_RIGHT
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    ),
+    [_SYMB] = LAYOUT(
+    // ┌────────┐        ┌────────┬────────┬────────┬────────┬────────┬───────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬───────┐
+        KC_ESC,  KC_TRNS, KC_TRNS, KC_F12,  KC_F13,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
+     //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, QK_CLEAR_EEPROM,
+     //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┬───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴───────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
+     //├─────────────────┼────────┼────────┼────────┼────────┼────────┼───────┤ ├────────┼────────┼────────┼────────┼────────┼────────┴────────────────┤
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      DT_UP,
+     //├──────────┬──────┴─┬───────┼───────┴────────┼────────┴────────┴───────┤ ├────────┴────────┴────────┼────────┼────────┼────────┼────────────────┤
+        KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,                 KC_TRNS,                   KC_TRNS,         KC_TRNS, KC_TRNS, DT_PRNT, DT_DOWN, KC_SLEP
+     //└──────────┴────────┴───────┴────────────────┴─────────────────────────┘ └──────────────────────────┴────────┴────────┴────────┴───────┴────────┘
+    )
+};
diff --git a/keyboards/pmk/posey_split/v5/keymaps/via/rules.mk b/keyboards/pmk/posey_split/v5/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/pmk/posey_split/v5/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/pmk/posey_split/v5/readme.md b/keyboards/pmk/posey_split/v5/readme.md
new file mode 100644
index 00000000000..57fbf642c3d
--- /dev/null
+++ b/keyboards/pmk/posey_split/v5/readme.md
@@ -0,0 +1,30 @@
+# posey_split_v5
+
+![posey_split_v5](https://i.imgur.com/g3yf6al.png)
+
+The Posey split keyboard was designed from the gournd up for gaming. By pushing the left half of your split keyboard out of the way, you'll be able to game with better posture and increase mouse movement. PMK's have additional keys on the right half to make sure you don't need to reach for your other half while gaming. 
+
+Version Changes from v4:
+-Changed bottom row on the left half to use standard modifier key sizes
+
+* Keyboard Maintainer: [Javier Oliver](https://github.com/joliverMI)
+* Hardware Supported: posey_split_v5 and logic_module_v1
+* Hardware Availability: poseysmechanicalkeyboards.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pmk/posey_split/v5:default
+
+Flashing example for this keyboard:
+
+    make pmk/posey_split/v5: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 Escape and plug in the keyboard
+* **Physical reset button**: Hold the button on the bottom of the keyboard while you plug in the USB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/pmk/posey_split/v5/rules.mk b/keyboards/pmk/posey_split/v5/rules.mk
new file mode 100644
index 00000000000..743228e94b6
--- /dev/null
+++ b/keyboards/pmk/posey_split/v5/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
\ No newline at end of file
diff --git a/keyboards/pmk/recore/v3/config.h b/keyboards/pmk/recore/v3/config.h
new file mode 100644
index 00000000000..b4089fa81e9
--- /dev/null
+++ b/keyboards/pmk/recore/v3/config.h
@@ -0,0 +1,18 @@
+// Copyright 2023 Javier Oliver (@joliverMI)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*Split keyboard configuration*/
+// Hardware Settings
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP1
+#define SERIAL_USART_RX_PIN GP0
+
+// Communication Settings
+#define FORCED_SYNC_THROTTLE_MS 1000
+#define SPLIT_MAX_CONNECTION_ERRORS 5
+#define SPLIT_CONNECTION_CHECK_TIMEOUT 2000
+
+// RGB Configuration
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 2.0 //1.0 to 2.7
diff --git a/keyboards/pmk/recore/v3/info.json b/keyboards/pmk/recore/v3/info.json
new file mode 100644
index 00000000000..6bc095daa5f
--- /dev/null
+++ b/keyboards/pmk/recore/v3/info.json
@@ -0,0 +1,141 @@
+{
+    "manufacturer": "Posey's Mechanical Keyboards",
+    "keyboard_name": "recorev3",
+    "maintainer": "joliverMI",
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "rgblight": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
+        "rows": ["GP10", "GP11", "GP12", "GP13", "GP14"]
+    },
+    "processor": "RP2040",
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP17"
+    },
+    "rgblight": {
+        "animations": {
+            "breathing": true
+        },
+        "layers": {
+            "enabled": true,
+            "max": 4
+        },
+        "led_count": 2,
+        "sleep": true,
+        "split": true,
+        "split_count": [1, 1]
+    },
+    "split": {
+        "enabled": true,
+        "handedness": {
+            "pin": "GP18"
+        }
+    },
+    "tags": ["ortho", "split"],
+    "url": "poseysmechanicalkeyboards.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x4A4F"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0,0], "x": 0, "y": 0.75, "w": 1.25},
+                {"matrix": [0,1], "x": 1.25, "y": 0.75},
+                {"matrix": [0,2], "x": 2.25, "y": 0.2},
+                {"matrix": [0,3], "x": 3.25, "y": 0},
+                {"matrix": [0,4], "x": 4.25, "y": 0.2},
+                {"matrix": [0,5], "x": 5.25, "y": 0.3},
+                {"matrix": [0,6], "x": 6.25, "y": 0.55, "h": 1.25},
+                {"matrix": [0,7], "x": 7.25, "y": 0.55, "h": 1.25},
+
+                {"matrix": [5,0], "x": 9.25, "y": 0.55, "h": 1.25},
+                {"matrix": [5,1], "x": 10.25, "y": 0.55, "h": 1.25},
+                {"matrix": [5,2], "x": 11.25, "y": 0.3},
+                {"matrix": [5,3], "x": 12.25, "y": 0.2},
+                {"matrix": [5,4], "x": 13.25, "y": 0},
+                {"matrix": [5,5], "x": 14.25, "y": 0.2},
+                {"matrix": [5,6], "x": 15.25, "y": 0.75},
+                {"matrix": [5,7], "x": 16.25, "y": 0.75, "w": 1.25},
+
+                {"matrix": [1,0], "x": 0, "y": 1.75, "w": 1.25},
+                {"matrix": [1,1], "x": 1.25, "y": 1.75},
+                {"matrix": [1,2], "x": 2.25, "y": 1.2},
+                {"matrix": [1,3], "x": 3.25, "y": 1},
+                {"matrix": [1,4], "x": 4.25, "y": 1.2},
+                {"matrix": [1,5], "x": 5.25, "y": 1.3},
+                {"matrix": [1,6], "x": 6.25, "y": 1.8, "h": 1.25},
+                {"matrix": [1,7], "x": 7.25, "y": 1.8, "h": 1.25},
+
+                {"matrix": [6,0], "x": 9.25, "y": 1.8, "h": 1.25},
+                {"matrix": [6,1], "x": 10.25, "y": 1.8, "h": 1.25},
+                {"matrix": [6,2], "x": 11.25, "y": 1.3},
+                {"matrix": [6,3], "x": 12.25, "y": 1.2},
+                {"matrix": [6,4], "x": 13.25, "y": 1},
+                {"matrix": [6,5], "x": 14.25, "y": 1.2},
+                {"matrix": [6,6], "x": 15.25, "y": 1.75},
+                {"matrix": [6,7], "x": 16.25, "y": 1.75, "w": 1.25},
+
+                {"matrix": [2,0], "x": 0, "y": 2.75, "w": 1.25},
+                {"matrix": [2,1], "x": 1.25, "y": 2.75},
+                {"matrix": [2,2], "x": 2.25, "y": 2.2},
+                {"matrix": [2,3], "x": 3.25, "y": 2},
+                {"matrix": [2,4], "x": 4.25, "y": 2.2},
+                {"matrix": [2,5], "x": 5.25, "y": 2.3},
+
+                {"matrix": [7,2], "x": 11.25, "y": 2.3},
+                {"matrix": [7,3], "x": 12.25, "y": 2.2},
+                {"matrix": [7,4], "x": 13.25, "y": 2},
+                {"matrix": [7,5], "x": 14.25, "y": 2.2},
+                {"matrix": [7,6], "x": 15.25, "y": 2.75},
+                {"matrix": [7,7], "x": 16.25, "y": 2.75, "w": 1.25},
+
+                {"matrix": [3,0], "x": 0, "y": 3.75, "w": 1.25},
+                {"matrix": [3,1], "x": 1.25, "y": 3.75},
+                {"matrix": [3,2], "x": 2.25, "y": 3.2},
+                {"matrix": [3,3], "x": 3.25, "y": 3},
+                {"matrix": [3,4], "x": 4.25, "y": 3.2},
+                {"matrix": [3,5], "x": 5.25, "y": 3.3},
+                {"matrix": [3,6], "x": 6.25, "y": 3.05, "h": 1.25},
+                {"matrix": [3,7], "x": 7.25, "y": 3.05, "h": 1.25},
+
+                {"matrix": [8,0], "x": 9.25, "y": 3.05, "h": 1.25},
+                {"matrix": [8,1], "x": 10.25, "y": 3.05, "h": 1.25},
+                {"matrix": [8,2], "x": 11.25, "y": 3.3},
+                {"matrix": [8,3], "x": 12.25, "y": 3.2},
+                {"matrix": [8,4], "x": 13.25, "y": 3},
+                {"matrix": [8,5], "x": 14.25, "y": 3.2},
+                {"matrix": [8,6], "x": 15.25, "y": 3.75},
+                {"matrix": [8,7], "x": 16.25, "y": 3.75, "w": 1.25},
+
+                {"matrix": [4,0], "x": 0, "y": 4.75, "w": 1.25},
+                {"matrix": [4,1], "x": 1.25, "y": 4.75},
+                {"matrix": [4,2], "x": 2.25, "y": 4.2, "w": 1.25},
+                {"matrix": [4,3], "x": 3.5, "y": 4.2, "w": 1.25},
+                {"matrix": [4,5], "x": 4.75, "y": 4.3, "w": 1.25},
+                {"matrix": [4,6], "x": 6, "y": 4.8, "h": 1.25},
+                {"matrix": [4,7], "x": 7, "y": 5, "h": 1.25},
+
+                {"matrix": [9,0], "x": 9.5, "y": 5, "h": 1.25},
+                {"matrix": [9,1], "x": 10.5, "y": 4.8, "h": 1.25},
+                {"matrix": [9,2], "x": 11.5, "y": 4.3, "w": 1.25},
+                {"matrix": [9,4], "x": 12.75, "y": 4.2, "w": 1.25},
+                {"matrix": [9,5], "x": 14, "y": 4.2, "w": 1.25},
+                {"matrix": [9,6], "x": 15.25, "y": 4.75},
+                {"matrix": [9,7], "x": 16.25, "y": 4.75, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pmk/recore/v3/keymaps/default/keymap.c b/keyboards/pmk/recore/v3/keymaps/default/keymap.c
new file mode 100644
index 00000000000..a48ed4c82de
--- /dev/null
+++ b/keyboards/pmk/recore/v3/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2024 Javier Oliver (@joliverMI)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum my_layers {
+    _QWERTY,
+    _NAV,
+    _SYMB,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐
+   KC_GRV  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5   ,MO(_SYMB),MO(_NAV),MO(_NAV),MO(_SYMB),KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤
+   KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_LBRC ,KC_MPLY, KC_PAUS ,KC_RBRC , KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_EQL  ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤
+   KC_ESC  ,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_PGUP ,KC_PGDN , KC_HOME ,KC_END , KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   KC_LGUI ,KC_PMNS ,MO(_NAV) ,KC_LALT ,KC_LCTL ,KC_BSPC ,KC_DEL  ,                   KC_ENT, KC_SPC  ,MO(_NAV),KC_RALT ,KC_RCTL ,KC_LEFT ,KC_RGHT 
+//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘                  └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘
+    ),
+    [_SYMB] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐
+   _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,_______ ,_______,  _______ ,_______ ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,_______,  _______ ,KC_RCBR ,KC_PSLS ,KC_P7   ,KC_P8   ,KC_P9   ,KC_PMNS ,_______ ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤
+   _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,                                     KC_PAST ,KC_P4   ,KC_P5   ,KC_P6   ,KC_PPLS ,_______ ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ , _______ ,_______ ,KC_P0   ,KC_P1   ,KC_P2   ,KC_P3   ,KC_PENT ,_______ ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                   KC_ENT  ,_______ ,_______ ,_______ ,KC_PDOT ,KC_PENT ,_______ 
+//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘                  └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘
+    ),
+    [_NAV] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐
+   _______ ,XXXXXXX ,XXXXXXX ,KC_UP   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_UP   ,XXXXXXX ,XXXXXXX ,QK_BOOT ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,XXXXXXX ,XXXXXXX ,KC_UP   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_UP   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤
+   _______ ,KC_LEFT ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_RGHT ,                                     KC_LEFT ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_RGHT ,XXXXXXX ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,XXXXXXX ,XXXXXXX ,KC_DOWN ,XXXXXXX ,XXXXXXX ,_______ ,_______ , _______ ,_______ ,XXXXXXX ,XXXXXXX ,KC_DOWN ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,XXXXXXX ,XXXXXXX ,                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,EE_CLR
+//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘                  └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘
+    )
+};
diff --git a/keyboards/pmk/recore/v3/keymaps/via/keymap.c b/keyboards/pmk/recore/v3/keymaps/via/keymap.c
new file mode 100644
index 00000000000..a48ed4c82de
--- /dev/null
+++ b/keyboards/pmk/recore/v3/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2024 Javier Oliver (@joliverMI)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum my_layers {
+    _QWERTY,
+    _NAV,
+    _SYMB,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐
+   KC_GRV  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5   ,MO(_SYMB),MO(_NAV),MO(_NAV),MO(_SYMB),KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤
+   KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_LBRC ,KC_MPLY, KC_PAUS ,KC_RBRC , KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_EQL  ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤
+   KC_ESC  ,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_PGUP ,KC_PGDN , KC_HOME ,KC_END , KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   KC_LGUI ,KC_PMNS ,MO(_NAV) ,KC_LALT ,KC_LCTL ,KC_BSPC ,KC_DEL  ,                   KC_ENT, KC_SPC  ,MO(_NAV),KC_RALT ,KC_RCTL ,KC_LEFT ,KC_RGHT 
+//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘                  └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘
+    ),
+    [_SYMB] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐
+   _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,_______ ,_______,  _______ ,_______ ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,_______,  _______ ,KC_RCBR ,KC_PSLS ,KC_P7   ,KC_P8   ,KC_P9   ,KC_PMNS ,_______ ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤
+   _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,                                     KC_PAST ,KC_P4   ,KC_P5   ,KC_P6   ,KC_PPLS ,_______ ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ , _______ ,_______ ,KC_P0   ,KC_P1   ,KC_P2   ,KC_P3   ,KC_PENT ,_______ ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                   KC_ENT  ,_______ ,_______ ,_______ ,KC_PDOT ,KC_PENT ,_______ 
+//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘                  └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘
+    ),
+    [_NAV] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┬── L1 ──┬── X1 ──┐┌── X1 ──┬── L1 ──┬────────┬────────┬────────┬────────┬────────┬────────┐
+   _______ ,XXXXXXX ,XXXXXXX ,KC_UP   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_UP   ,XXXXXXX ,XXXXXXX ,QK_BOOT ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼── X2 ──┼── X3 ──┤├── X3 ──┼── X2 ──┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,XXXXXXX ,XXXXXXX ,KC_UP   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_UP   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┴────────┴────────┤
+   _______ ,KC_LEFT ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_RGHT ,                                     KC_LEFT ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_RGHT ,XXXXXXX ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┐┌────────┬────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,XXXXXXX ,XXXXXXX ,KC_DOWN ,XXXXXXX ,XXXXXXX ,_______ ,_______ , _______ ,_______ ,XXXXXXX ,XXXXXXX ,KC_DOWN ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘└────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+   _______ ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,XXXXXXX ,XXXXXXX ,                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,EE_CLR
+//└────────┴────────┴── T1 ──┴── T2 ──┴── T3 ──┴── T4 ──┴── T5 ──┘                  └── T5 ──┴── T4 ──┴── T3 ──┴── T2 ──┴── T1 ──┴────────┴────────┘
+    )
+};
diff --git a/keyboards/pmk/recore/v3/keymaps/via/rules.mk b/keyboards/pmk/recore/v3/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/pmk/recore/v3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/pmk/recore/v3/readme.md b/keyboards/pmk/recore/v3/readme.md
new file mode 100644
index 00000000000..2e346263f80
--- /dev/null
+++ b/keyboards/pmk/recore/v3/readme.md
@@ -0,0 +1,27 @@
+# recorev3
+
+![recorev3](https://i.imgur.com/28fVsP3.jpeg)
+
+The Posey Recore keyboard is an ortholinear keyboard designed from the gournd up for gaming. By pushing the left half of your split keyboard out of the way, you'll be able to game with better posture and increase mouse movement. The thumb cluster arc can be remapped to control and shift for use in gaming.
+
+* Keyboard Maintainer: [Javier Oliver](https://github.com/joliverMI)
+* Hardware Supported: recore_v3 and logic_module_v1
+* Hardware Availability: [poseysmechanicalkeyboards.com](https://poseysmechanicalkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pmk/recore/v3:default
+    
+Flashing example for this keyboard:
+
+    make pmk/recore/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 Escape and plug in the keyboard
+* **Physical reset button**: Hold the button on the bottom of the keyboard while you plug in the USB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/pmk/recore/v3/rules.mk b/keyboards/pmk/recore/v3/rules.mk
new file mode 100644
index 00000000000..161ec22b16e
--- /dev/null
+++ b/keyboards/pmk/recore/v3/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index 14f8d92d5db..d1b911c4c4a 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -20,8 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-//    #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 225 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-//    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
diff --git a/keyboards/preonic/keymaps/0xdec/README.md b/keyboards/preonic/keymaps/0xdec/README.md
deleted file mode 100644
index 603d3d45520..00000000000
--- a/keyboards/preonic/keymaps/0xdec/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Ergonomic Colemak Keymap
-========================
-An ergonomically optimized Colemak keymap for the grid-layout Preonic
-
-Modes
-----------
-
-#### Colemak
-
-> Base layer
-
-- All alphanumerics and symbols available on the base layer
-
-----------
-
-#### Game
-
-> QWERTY layout for use with games or number entry
-
-- Standard QWERTY layout
-- Integrated right-hand numpad in phone layout
-
-----------
-
-#### Function (Raise)
-
-> Functions and mode switching
-
-- Turns NEIO into arrow cluster, with nav cluster below (Home, Page Down, Page Up, End)
-- Reset key at lower left (Esc)
diff --git a/keyboards/preonic/keymaps/0xdec/config.h b/keyboards/preonic/keymaps/0xdec/config.h
deleted file mode 100644
index 868843398bd..00000000000
--- a/keyboards/preonic/keymaps/0xdec/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#undef  BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 5
-
-#endif
diff --git a/keyboards/preonic/keymaps/0xdec/keymap.c b/keyboards/preonic/keymaps/0xdec/keymap.c
deleted file mode 100644
index fad47842a52..00000000000
--- a/keyboards/preonic/keymaps/0xdec/keymap.c
+++ /dev/null
@@ -1,137 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Layer names
-#define _COLEMAK 0
-#define _GAME 1
-#define _RAISE 2
-
-enum preonic_keycodes {
-  COLEMAK = SAFE_RANGE,
-  GAME,
-  RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   =  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   [  |   ]  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   -  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |   '  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ;  |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  | ENTER|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ESC  | ALT  | GUI  | SHIFT| CTRL | BKSP | SPACE| RAISE| SHIFT|      | DEL  | TAB  |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_grid(
-  KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_BSLS,
-  KC_EQL ,KC_Q   ,KC_W   ,KC_F   ,KC_P   ,KC_G   ,KC_J   ,KC_L   ,KC_U   ,KC_Y   ,KC_LBRC,KC_RBRC,
-  KC_MINS,KC_A   ,KC_R   ,KC_S   ,KC_T   ,KC_D   ,KC_H   ,KC_N   ,KC_E   ,KC_I   ,KC_O   ,KC_QUOT,
-  KC_SCLN,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_K   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_ENT,
-  KC_ESC ,KC_LALT,KC_LGUI,KC_LSFT,KC_LCTL,KC_BSPC,KC_SPC ,RAISE  ,KC_RSFT,_______,KC_DEL ,KC_TAB
-),
-
-/* Game
- * ,-----------------------------------------------------------------------------------.
- * | ESC  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |NUM LK|   ÷  |   ×  |   -  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+
- * | TAB  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   1  |   2  |   3  |   +  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+
- * | CTRL |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   4  |   5  |   6  |   =  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+
- * | SHIFT|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   7  |   8  |   9  | ENTER|
- * |------+------+------+------+------+------+------+------+------+------+------+------+
- * |      | ALT  | GUI  | SPACE| CTRL | BKSP | SPACE| RAISE|   ,  |   0  |   .  | TAB  |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT_preonic_grid(
-  KC_ESC ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_NUM ,KC_PSLS,KC_PAST,KC_PMNS,
-  KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_P1  ,KC_P2  ,KC_P3  ,KC_PPLS,
-  KC_LCTL,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_P4  ,KC_P5  ,KC_P6  ,KC_PEQL,
-  KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_P7  ,KC_P8  ,KC_P9  ,KC_PENT,
-  XXXXXXX,KC_LALT,KC_LGUI,KC_SPC ,KC_LCTL,KC_BSPC,KC_SPC ,RAISE  ,KC_PCMM,KC_P0  ,KC_PDOT,KC_TAB
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | SLEEP|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |PRTSCR|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | SYM  |  F11 |  F12 |      |AU TOG| VOL+ |BL INC|COLMAK| GAME | MUSIC| MENU |SCRLCK|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | CAPS | PREV | STOP | PLAY | NEXT | VOL- |BL DEC| LEFT | DOWN |  UP  | RIGHT| PAUSE|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | BACK | STOP | RFRSH| FRWRD| MUTE |BL TOG| HOME | PGDN | PGUP | END  |INSERT|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | QK_BOOT|      |      |      |      | DEL  |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  KC_SLEP,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_PSCR,
-  XXXXXXX,KC_F11 ,KC_F12 ,XXXXXXX,AU_TOGG,KC_VOLU,BL_UP  ,COLEMAK,GAME   ,MU_TOGG,KC_MENU,KC_SCRL,
-  KC_CAPS,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,KC_VOLD,BL_DOWN,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,KC_PAUS,
-  XXXXXXX,KC_WBAK,KC_WSTP,KC_WREF,KC_WFWD,KC_MUTE,BL_TOGG,KC_HOME,KC_PGDN,KC_PGUP,KC_END ,KC_INS,
-  QK_BOOT,_______,_______,_______,_______,KC_DEL ,_______,_______,_______,_______,_______,_______
-)
-
-};
-
-
-
-#ifdef AUDIO_ENABLE
-float tone_colemak[][2] = SONG(COLEMAK_SOUND);
-float tone_game[][2]    = {
-  {NOTE_E6, 10}   ,{NOTE_E6, 10}  ,{NOTE_REST, 10} ,{NOTE_E6, 10}   ,
-  {NOTE_REST, 10} ,{NOTE_C6, 10}  ,{NOTE_E6, 10}   ,{NOTE_REST, 10} ,
-  {NOTE_G6, 10}   ,{NOTE_REST, 30},
-  {NOTE_G5, 10}   ,{NOTE_REST, 30}
-};
-#endif
-
-
-
-void matrix_init_user(void) {
-  #ifdef AUDIO_ENABLE
-  startup_user();
-  #endif
-}
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-        PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      break;
-    case GAME:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-        PLAY_SONG(tone_game);
-        #endif
-        persistent_default_layer_set(1UL<<_GAME);
-      }
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-      } else {
-        layer_off(_RAISE);
-      }
-      break;
-    default:
-      return true;
-      break;
-  }
-
-  return false;
-};
diff --git a/keyboards/preonic/keymaps/0xdec/rules.mk b/keyboards/preonic/keymaps/0xdec/rules.mk
deleted file mode 100644
index a68b26c24cb..00000000000
--- a/keyboards/preonic/keymaps/0xdec/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE   = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE   = yes # Audio control and System control(+450)
-CONSOLE_ENABLE    = no  # Console for debug(+400)
-COMMAND_ENABLE    = yes # Commands for debug and configuration
-NKRO_ENABLE       = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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   = no  # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE  = no  # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/preonic/keymaps/AlexDaigre/config.h b/keyboards/preonic/keymaps/AlexDaigre/config.h
deleted file mode 100644
index 37858350a84..00000000000
--- a/keyboards/preonic/keymaps/AlexDaigre/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/adjust.json b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/adjust.json
deleted file mode 100644
index 6dac52cb944..00000000000
--- a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/adjust.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "name": "Plank Don Gato Programming Raise Layer"
-  },
-  [
-    {
-      "a": 7
-    },
-    "F1",
-    "F2",
-    "F3",
-    "F4",
-    "F5",
-    "F6",
-    "F7",
-    "F8",
-    "F9",
-    "F10",
-    "F11",
-    "F12"
-  ],
-  [
-    "",
-    "Reset",
-    "Debug",
-    "",
-    "",
-    "",
-    "",
-    "Term On",
-    "Term Off",
-    "",
-    "",
-    ""
-  ],
-  [
-    "",
-    "",
-    "Mu Mod",
-    "Audio On",
-    "Audio Off",
-    "AG Norm",
-    "AG Swap",
-    "Qwerty",
-    "Colemak",
-    "Dvorak",
-    "",
-    ""
-  ],
-  [
-    "",
-    "Voice -",
-    "Voice +",
-    "Music On",
-    "Music Off",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    ""
-  ],
-  [
-    "",
-    "",
-    "",
-    "",
-    "",
-    {
-      "w": 2
-    },
-    "",
-    "",
-    "Next",
-    "Vol -",
-    "Vol +",
-    "Play"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/lower.json b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/lower.json
deleted file mode 100644
index ccf860653fc..00000000000
--- a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/lower.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "name": "Plank Don Gato Programming Lower Layer"
-  },
-  [
-    {
-      "a": 7
-    },
-    "Print Screen",
-    "Page Up",
-    "Page Down",
-    "Home",
-    "End",
-    "Insert",
-    "Scroll Lock",
-    "Num Lock",
-    "Pause",
-    "]",
-    "[",
-    "-"
-  ],
-  [
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "Delete"
-  ],
-  [
-    "Caps Lock",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    ""
-  ],
-  [
-    "Right Shift",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "\\",
-    "Menu"
-  ],
-  [
-    "Right Ctrl",
-    "Right Alt",
-    "Right Os",
-    "",
-    "",
-    {
-      "w": 2
-    },
-    "",
-    "",
-    "",
-    "",
-    "",
-    ""
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/main.json b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/main.json
deleted file mode 100644
index 77589c205cd..00000000000
--- a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/main.json
+++ /dev/null
@@ -1,95 +0,0 @@
-[
-  {
-    "name": "Plank Don Gato Programming Main Layer"
-  },
-  [
-    {
-      "a": 5
-    },
-    "~\n`",
-    "!\n1",
-    "@\n2",
-    "#\n3",
-    "$\n4",
-    "%\n5",
-    "^\n6",
-    "&\n7",
-    "*\n8",
-    "(\n9",
-    ")\n0",
-    "+\n="
-  ],
-  [
-    {
-      "a": 7
-    },
-    "Tab",
-    "Q",
-    "W",
-    "E",
-    "R",
-    "T",
-    "Y",
-    "U",
-    "I",
-    "O",
-    "P",
-    "Back Space"
-  ],
-  [
-    "Esc",
-    "A",
-    "S",
-    "D",
-    "F",
-    "G",
-    "H",
-    "J",
-    "K",
-    "L",
-    {
-      "a": 5
-    },
-    ":\n;",
-    "\"\n'"
-  ],
-  [
-    {
-      "a": 7
-    },
-    "Shift",
-    "Z",
-    "X",
-    "C",
-    "V",
-    "B",
-    "N",
-    "M",
-    {
-      "a": 5
-    },
-    "<\n,",
-    ">\n.",
-    {
-      "a": 7
-    },
-    "/",
-    "Return"
-  ],
-  [
-    "Ctrl",
-    "Alt",
-    "OS",
-    "Super",
-    "&dArr;",
-    {
-      "w": 2
-    },
-    "",
-    "&uArr;",
-    "&larr;",
-    "&darr;",
-    "&uarr;",
-    "&rarr;"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/raise.json b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/raise.json
deleted file mode 100644
index aae97d489fd..00000000000
--- a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/raise.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-    {
-      "name": "Plank Don Gato Programming Raise Layer"
-    },
-    [
-      {
-        "a": 7
-      },
-      "Print Screen",
-      "Page Up",
-      "Page Down",
-      "Home",
-      "End",
-      "Insert",
-      "Scroll Lock",
-      "Num Lock",
-      "Pause",
-      "{",
-      "}",
-      "_"
-    ],
-    [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "Delete"
-    ],
-    [
-      "Caps Lock",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-    ],
-    [
-      "Right Shift",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "|",
-      "Menu"
-    ],
-    [
-      "Right Ctrl",
-      "Right Alt",
-      "Right Os",
-      "",
-      "",
-      {
-        "w": 2
-      },
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-    ]
-  ]
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/AlexDaigre/keymap.c b/keyboards/preonic/keymaps/AlexDaigre/keymap.c
deleted file mode 100644
index 744ce94a81f..00000000000
--- a/keyboards/preonic/keymaps/AlexDaigre/keymap.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* Copyright 2020 Alex Daigre
- * Modified from layout provided by 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  =   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Alt |  GUI |Adjust| Lower|    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQUAL,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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_LALT, KC_LGUI, ADJUST,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  =   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Adjust| Lower|    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQUAL,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  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_ENT,
-  KC_LCTL, KC_LALT, KC_LGUI, ADJUST,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  =   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |Adjust| Lower|    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQUAL,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-  KC_LCTL, KC_LALT, KC_LGUI, ADJUST,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |PrtScr| PgUp | PgDw | Home |  End |Insert|ScrlLk|NumLck|Pause |   [  |   ]  |  -   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |   \  | Menu |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |RCtrl | RAlt | RGui |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_PSCR, KC_PGUP, KC_PGDN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LBRC, KC_RBRC, KC_MINUS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE,
-  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_RSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_MENU,
-  KC_RCTL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |PrtScr| PgUp | PgDw | Home |  End |Insert|ScrlLk|NumLck|Pause |  {   |   }  |  _   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |  |   | Menu |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |RCtrl | RAlt | RGui |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  KC_PSCR, KC_PGUP, KC_PGDN, KC_HOME, KC_END, KC_INSERT, KC_SCRL, KC_NUM, KC_PAUSE, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_UNDERSCORE,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE,
-  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_RSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_MENU,
-  KC_RCTL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Light|      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_COLEMAK);
-          }
-          return false;
-          break;
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DVORAK);
-          }
-          return false;
-          break;
-        case ADJUST:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            layer_on(_LOWER);
-            layer_on(_ADJUST);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            layer_off(_LOWER);
-            layer_off(_ADJUST);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            writePinLow(E6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            writePinHigh(E6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/AlexDaigre/readme.md b/keyboards/preonic/keymaps/AlexDaigre/readme.md
deleted file mode 100644
index 0aed8ebe092..00000000000
--- a/keyboards/preonic/keymaps/AlexDaigre/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-[Layout Images](https://imgur.com/a/k95XQlP)
-
-# Alex Daigre's programming Layout
-
-The default Preonic layout is suited to general english typing but not very convent to program on. This is my custom layout to re-optimise the keyboard for programming tasks.
-I have been programming with this keyboard layout at work and I found it much faster and easier to adjust to than the default layout.
-
-- Removed keys on the RAISE, LOWER, and ADJUST layers that duplicated keys on the main QWERTY layout.
-- Moved the control, alt, and gui keys to a more natural position.
-- Added the Caps-lock key on RAISE and LOWER in its position on a standard keyboard.
-- Moved {}[], -_, and \| (on RAISE and LOWER) to be close to to similar keys on the QWERTY layout to make them easier to remember. They are kept as close as possible to their locations on a standard layout so users won't have to ADJUST their muscle memory much.
-    - (), {}, and [] are all on the 9 and 0 keys. This is where () are placed naturally, so it is easy to find all of your braces.
-    - -_ are moved to the += key. Now you can remember that -, +, and = are all together. The keys are also right next to each-other on a standard layout, so it is a very small move.
-    - \ and | have beeb moved to the /? key. Easy to remember as / and \ are together.
-- Moved backspace to make room for +=.
-- Added delete to the backspace key on RAISE / LOWER
-- Removed backlight, from the main layer, and added an ADJUST key. As the Massdrop kits don't come with backlighting default, I think this is more useful for most users.
-- I have left the Colemak and Dvorak alternate layouts, but they won't map up as conveniently to the other layers.
-- I have included the keyboard layouts so that those wishing to make modifications or new versions of this layout can quickly update their images.
diff --git a/keyboards/preonic/keymaps/AlexDaigre/rules.mk b/keyboards/preonic/keymaps/AlexDaigre/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/AlexDaigre/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/bghull/keymap.c b/keyboards/preonic/keymaps/bghull/keymap.c
deleted file mode 100644
index 87cb9c6c699..00000000000
--- a/keyboards/preonic/keymaps/bghull/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum preonic_layers {
-  _QWERTY,
-  _STENO,
-  _NUMPAD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | '  " |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |NUMPAD|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  | /  ? |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Es/Ctl| FUNC | STENO| Alt  |    Bspc     |    Space    | Ctrl | Left | Down | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  _______ ,      KC_1,    KC_2,       KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_QUOT,
-  KC_TAB ,       KC_Q,    KC_W,       KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  MO(_NUMPAD),   KC_A,    KC_S,       KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  KC_LSFT ,      KC_Z,    KC_X,       KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_SLSH,
-  LCTL_T(KC_ESC),KC_LGUI, DF(_STENO), KC_LALT, _______, KC_BSPC, _______, KC_SPC,  KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-
-/* Steno
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  FN  |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |QWERTY|   A  |      O      |      E      |   U  |  PWR | RES1 | RES2 |
- * `-----------------------------------------------------------------------------------'
- */
-[_STENO] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______,  _______, _______, _______, _______,  _______, _______, _______, _______,
-  STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-  STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-  XXXXXXX, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-  XXXXXXX, XXXXXXX, DF(_QWERTY),STN_A,XXXXXXX, STN_O,   XXXXXXX, STN_E,   STN_U,   STN_PWR, STN_RE1, STN_RE2
-),
-
-/* 
- * ,-----------------------------------------------------------------------------------.
- * |      |RClick|  MsU |LClick|WheelU|   (  |  )   |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  MsL |  MsD |  MsR |WheelD|  [{  |  ]}  |   4  |   5  |   6  |   +  |  -_  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Mute | VolD | VolU |  `~  |   _  |  =   |   1  |   2  |   3  | PgUp | \  | |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      | QK_BOOT|      |      |             |      |   .  | Home | PgDn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_preonic_grid(
-  _______, _______,_______, _______,  _______, _______, _______, _______,  _______, _______, _______, _______,
-  _______, KC_BTN2, KC_MS_U, KC_BTN1,  KC_WH_U, KC_LPRN, KC_RPRN,    KC_7,     KC_8,    KC_9,    KC_0, _______,
-  _______, KC_MS_L, KC_MS_D, KC_MS_R,  KC_WH_D, KC_LBRC, KC_RBRC,    KC_4,     KC_5,    KC_6, KC_PPLS, KC_MINS,
-  _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_GRAVE, KC_UNDS,  KC_EQL,    KC_1,     KC_2,    KC_3, KC_PGUP, KC_BSLS,
-  _______, XXXXXXX, QK_BOOT, _______,  _______, _______, _______, _______,  KC_PDOT, KC_HOME, KC_PGDN, KC_END
-)
-
-};
diff --git a/keyboards/preonic/keymaps/bghull/rules.mk b/keyboards/preonic/keymaps/bghull/rules.mk
deleted file mode 100644
index 9711c485d7a..00000000000
--- a/keyboards/preonic/keymaps/bghull/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-SRC += muse.c
-AUTO_SHIFT_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-STENO_ENABLE = yes
-AUDIO_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/blake-newman/config.h b/keyboards/preonic/keymaps/blake-newman/config.h
deleted file mode 100644
index 5683fd47958..00000000000
--- a/keyboards/preonic/keymaps/blake-newman/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/blake-newman/keymap.c b/keyboards/preonic/keymaps/blake-newman/keymap.c
deleted file mode 100644
index c54d883b055..00000000000
--- a/keyboards/preonic/keymaps/blake-newman/keymap.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum preonic_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _NUMPAD,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  NUMPAD,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-  * ,-----------------------------------------------------------------------------------.
-  * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Bksp |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Shift|
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |      |  Alt | Ctrl | Shift|
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_QWERTY] = LAYOUT_preonic_1x2uC(
-    KC_GRV,  KC_1,    KC_2,    KC_5,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_BSPC,
-    KC_BSPC, 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,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   _______, KC_RALT, KC_RCTL, KC_RSFT
-  ),
-
-  /* Colemak
-  * ,-----------------------------------------------------------------------------------.
-  * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Bksp |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  | Shift|
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |      |  Alt | Ctrl | Shift|
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_COLEMAK] = LAYOUT_preonic_1x2uC(
-    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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_BSPC, 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,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   _______, KC_RALT, KC_RCTL, KC_RSFT
-  ),
-
-  /* Dvorak
-  * ,-----------------------------------------------------------------------------------.
-  * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Bksp |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  | Shift|
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |      |  Alt | Ctrl | Shift|
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_DVORAK] = LAYOUT_preonic_1x2uC(
-    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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_BSPC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   _______, KC_RALT, KC_RCTL, KC_RSFT
-  ),
-
-  /* Numpad
-  * ,-----------------------------------------------------------------------------------.
-  * | Esc  |      |      | PgDn | PgUp | Home |  End  |      |   /  |   *  |   -  | Del  |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Tab  |      |  Up  |      |      |      |      |   7  |   8  |   9  |   +  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Bksp | Left | Down | Right|      |      |      |   4  |   5  |   6  |      |  "   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|      |      |      |      |      |   ,  |   1  |   2  |   3  |      | Shift|
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |   0  |   .  | Ctrl | Shift|
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_NUMPAD] = LAYOUT_preonic_1x2uC(
-    KC_ESC,  _______, _______, KC_PGDN, KC_PGUP, KC_END,  KC_HOME, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL,
-    KC_TAB,  _______, KC_UP,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_BSPC,
-    KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, KC_QUOT,
-    KC_LSFT, _______, _______, _______, _______, _______, KC_COMM, KC_P1,   KC_P2,   KC_P3,   _______, KC_RSFT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_P0,   KC_PDOT, KC_RCTL, KC_RSFT
-  ),
-
-
-  /* Lower
-  * ,-----------------------------------------------------------------------------------.
-  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * |  Esc |      |  Up  |      |      |      |      |   -_ |   -  |   +  |   =  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * |  Bksp| Left | Down | Right|      |      |      |   {  |   }  |   [  |   ]  |   \  |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|   |  |      |      |      |      |      |      |      |   ¢  |   €  | Shift|
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Brite| Ctrl | Alt  | GUI  |Lower |    Enter    |Raise |      |  Alt | Ctrl | Shift|
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_LOWER] = LAYOUT_preonic_1x2uC(
-    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_ESC,  _______, KC_UP,   _______, _______, _______, _______, KC_UNDS, KC_MINS, KC_PLUS, KC_EQL,  KC_BSPC,
-    KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_LSFT, KC_PIPE, _______, _______, _______, _______, _______, _______, ALGR_T(KC_4), ALGR_T(KC_5), _______,  KC_RSFT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_ENT,       RAISE,   _______, KC_RALT, KC_RCTL, KC_RSFT
-  ),
-
-  /* Raise
-  * ,-----------------------------------------------------------------------------------.
-  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * |  Esc |      |  Up  |      |      |      |      |   -  |   _  |   =  |   +  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Bksp | Left | Down | Right|      |      |      |   [  |  ]   |   {  |   }  |   |  |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * | Shift|  \   |      |      |      |      |      |      |      |   £  |  $   | Shift|
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * | Brite| Ctrl | Alt  | GUI  |Lower |    Enter    |Raise |      |  Alt | Ctrl | Shift|
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_RAISE] = LAYOUT_preonic_1x2uC(
-    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_ESC,  _______, KC_UP,   _______, _______, _______, _______, KC_MINS, KC_UNDS, KC_EQL,  KC_PLUS, KC_BSPC,
-    KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_PIPE,
-    KC_LSFT, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, ALGR_T(KC_DLR), KC_DLR,  KC_RSFT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_ENT,       RAISE,   _______, KC_RALT, KC_RCTL, KC_RSFT
-  ),
-
-  /* Adjust (Lower + Raise)
-  * ,-----------------------------------------------------------------------------------.
-  * |      |      |      |      |      |      |      |      |      |      |      |      |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * |      | Reset| Debug|      |      |      |      |      |      | aPscr| sPscr| Pscr |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Caps |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Numpad|Insert|
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-  * `-----------------------------------------------------------------------------------'
-  */
-  [_ADJUST] = LAYOUT_preonic_1x2uC(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, LALT(KC_PSCR), LCTL(KC_PSCR), KC_PSCR,
-    KC_CAPS, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  NUMPAD,  KC_INS,
-    _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,      _______,     _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_COLEMAK);
-          }
-          return false;
-          break;
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DVORAK);
-          }
-          return false;
-          break;
-        case NUMPAD:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_NUMPAD);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            PORTE &= ~(1<<6);
-          } else {
-            unregister_code(KC_RSFT);
-            PORTE |= (1<<6);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
diff --git a/keyboards/preonic/keymaps/blake-newman/readme.md b/keyboards/preonic/keymaps/blake-newman/readme.md
deleted file mode 100644
index fe88b9816d1..00000000000
--- a/keyboards/preonic/keymaps/blake-newman/readme.md
+++ /dev/null
@@ -1,108 +0,0 @@
-# Preonic layout by [Blake Newman](https://github.com/blake-newman)
-
-## Layouts
-
-### Qwerty
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Bksp |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Shift|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |      |  Alt | Ctrl | Shift|
-`-----------------------------------------------------------------------------------'
-```
-
-### Colemak
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Bksp |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  | Shift|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |      |  Alt | Ctrl | Shift|
-`-----------------------------------------------------------------------------------'
-```
-
-### Dvorak
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Bksp |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  | Shift|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |      |  Alt | Ctrl | Shift|
-`-----------------------------------------------------------------------------------'
-```
-
-### Numpad
-```
-,-----------------------------------------------------------------------------------.
-| Esc  |      |      | PgDn | PgUp | Home |  End  |      |   /  |   *  |   -  | Del  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |      |  Up  |      |      |      |      |   7  |   8  |   9  |   +  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Bksp | Left | Down | Right|      |      |      |   4  |   5  |   6  |      |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|      |      |      |      |      |   ,  |   1  |   2  |   3  |      | Shift|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |   0  |   .  | Ctrl | Shift|
-`-----------------------------------------------------------------------------------'
-```
-
-### Lower
-```
-,-----------------------------------------------------------------------------------.
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|  Esc |      |  Up  |      |      |      |      |   -_ |   -  |   +  |   =  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|  Bksp| Left | Down | Right|      |      |      |   {  |   }  |   [  |   ]  |   \  |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   |  |      |      |      |      |      |      |      |   ¢  |   €  | Shift|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Enter    |Raise |      |  Alt | Ctrl | Shift|
-`-----------------------------------------------------------------------------------'
-```
-
-### Raise
-```
-,-----------------------------------------------------------------------------------.
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|  Esc |      |  Up  |      |      |      |      |   -  |   _  |   =  |   +  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Bksp | Left | Down | Right|      |      |      |   [  |  ]   |   {  |   }  |   |  |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|  \   |      |      |      |      |      |      |      |   £  |  $   | Shift|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Enter    |Raise |      |  Alt | Ctrl | Shift|
-`-----------------------------------------------------------------------------------'
-```
-
-### Adjust (Lower + Raise)
-```
-,-----------------------------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | Reset| Debug|      |      |      |      |      |      | aPscr| sPscr| Pscr |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Caps |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Numpad|Insert|
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/preonic/keymaps/boy314/config.h b/keyboards/preonic/keymaps/boy314/config.h
deleted file mode 100644
index 29d911d188b..00000000000
--- a/keyboards/preonic/keymaps/boy314/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
diff --git a/keyboards/preonic/keymaps/boy314/keymap.c b/keyboards/preonic/keymaps/boy314/keymap.c
deleted file mode 100644
index fa97661e4fb..00000000000
--- a/keyboards/preonic/keymaps/boy314/keymap.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#define FN_CAPS LT(_FL, KC_CAPS)
-
-// define layers
-#define _QWERTY 0
-#define _DVORAK 1
-#define _ARROWS 2
-#define _LOWER 10
-#define _RAISE 11
-#define _ADJUST 12
-
-// macro shortcuts
-#define QWERTY TO(_QWERTY)
-#define DVORAK TO(_DVORAK)
-#define LOWER M(_LOWER)
-#define RAISE M(_RAISE)
-#define ARROWS TO(_ARROWS)
- 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Enter|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  Del | Alt  | GUI  |Lower | Raise|    Space    | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_QWERTY] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_ENT,
-  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_LCTL, KC_DEL,  KC_LGUI, KC_LALT, LOWER,   RAISE,   KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |  /   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | CAPS |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Del  | Alt  | GUI  |Lower | Raise|    Space    | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_DVORAK] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT,
-  SC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_RSPC,
-  KC_LCTL, KC_DEL,  KC_LGUI, KC_LALT, LOWER,   RAISE, KC_SPC,  KC_SPC,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-),
-
-/* ARROWS
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |  Up  |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
- 
-[_ARROWS] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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,  _______, _______, KC_HOME, KC_END,  _______,
-  _______, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |      |      |  Up  |      |      |      |      |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |      | Left | Down |Right |      |      |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |PageDn|PageUP|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_RAISE] = LAYOUT_preonic_grid(
-  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_GRV,  _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  KC_DEL,  _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|Dvorak|      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |ARROWS|      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  DVORAK,  _______, _______, _______, _______,
-  _______, ARROWS,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{	
-	switch (keycode)
-	{
-		case QWERTY:
-			if (record->event.pressed)
-			{
-				set_single_persistent_default_layer(_QWERTY);
-			}
-			return false;
-			break;
-		case DVORAK:
-			if (record->event.pressed)
-			{
-				set_single_persistent_default_layer(_DVORAK);
-			}
-			return false;
-			break;
-		case ARROWS:
-			if (record->event.pressed)
-			{
-				set_single_persistent_default_layer(_ARROWS);
-			}
-			return false;
-			break;
-		case LOWER:
-			if (record->event.pressed)
-			{
-				layer_on(_LOWER);
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			}
-			else
-			{
-				layer_off(_LOWER);
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			}
-			return false;
-			break;
-		case RAISE:
-			if (record->event.pressed)
-			{
-				layer_on(_RAISE);
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			}
-			else
-			{
-				layer_off(_RAISE);
-				update_tri_layer(_LOWER, _RAISE, _ADJUST);
-			}
-			return false;
-			break;
-	}
-	return true;
-};
diff --git a/keyboards/preonic/keymaps/boy314/readme.md b/keyboards/preonic/keymaps/boy314/readme.md
deleted file mode 100644
index 9d8a2fd117c..00000000000
--- a/keyboards/preonic/keymaps/boy314/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Boy_314's XD75RE Layout
-- NOTE: ONLY SUPPORTS DVORAK AT THE MOMENT, WILL UPDATE WITH QWERTY WHEN I GET THE TIME TO DO SO.
-- Features many symbols and function keys in secondary layers.
-- NOTE: WORK IN PROGRESS
-# THINGS TO DO
-- make better use of bottom row
-- add numpad toggle layer
-- explore rgb underglow options
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/brauner/config.h b/keyboards/preonic/keymaps/brauner/config.h
deleted file mode 100644
index 4591d621023..00000000000
--- a/keyboards/preonic/keymaps/brauner/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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(PREONIC_SOUND)
-#    define DEFAULT_LAYER_SONGS \
-        { SONG(QWERTY_SOUND) }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-#define PERMISSVE_HOLD
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-
-#define LEADER_PER_KEY_TIMING
-
-#define LEADER_TIMEOUT 250
-
-#define LEADER_NO_TIMEOUT
-
-#define MK_3_SPEED
-#define MK_MOMENTARY_ACCEL
-
-#define COMBO_NO_TIMER
diff --git a/keyboards/preonic/keymaps/brauner/keymap.c b/keyboards/preonic/keymaps/brauner/keymap.c
deleted file mode 100644
index 398abfa741b..00000000000
--- a/keyboards/preonic/keymaps/brauner/keymap.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/* 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _MOUSE,
-    _MANAGE,
-    _COMPOSITOR,
-};
-
-enum preonic_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    MOUSE,
-    MANAGE,
-    COMPOSITOR,
-};
-
-#define MOD_TAP_LSFT_ESC LSFT_T(KC_ESC)
-#define MOD_TAP_LSFT_ENT LSFT_T(KC_ENT)
-
-#define LT_COPY_Y    LT(_QWERTY, KC_Y)
-#define LT_CUT_X     LT(_QWERTY, KC_X)
-#define LT_PASTE_P   LT(_QWERTY, KC_P)
-#define LT_AE_A      LT(_QWERTY, KC_A)
-#define LT_OE_O      LT(_QWERTY, KC_O)
-#define LT_UE_U      LT(_QWERTY, KC_U)
-#define LT_SZ_S      LT(_QWERTY, KC_S)
-#define LT_LOWER_SPC LT(_LOWER,  KC_SPC)
-
-#define LM_COMP_LALT      LM(_COMPOSITOR, MOD_LALT)
-
-#define KO_LAYER_MASK_EXCEPT(layer) ((~0) & ~(1 << layer))
-
-enum combos {
-    COMBO_LPRN_RPRN, /* (|) */
-    COMBO_LBRC_RBRC, /* [|] */
-    COMBO_LCBR_RCBR, /* {|} */
-    COMBO_LT_GT,     /* <|> */
-};
-
-const uint16_t PROGMEM combo_lprn_rprn[] = {KC_LPRN, KC_RPRN, COMBO_END};
-const uint16_t PROGMEM combo_lbrc_rbrc[] = {KC_LBRC, KC_RBRC, COMBO_END};
-const uint16_t PROGMEM combo_lcbr_rcbr[] = {KC_LCBR, KC_RCBR, COMBO_END};
-const uint16_t PROGMEM combo_lt_gt[]     = {KC_LT, KC_GT, COMBO_END};
-
-combo_t key_combos[] = {
-    [COMBO_LPRN_RPRN] = COMBO_ACTION(combo_lprn_rprn),
-    [COMBO_LBRC_RBRC] = COMBO_ACTION(combo_lbrc_rbrc),
-    [COMBO_LCBR_RCBR] = COMBO_ACTION(combo_lcbr_rcbr),
-    [COMBO_LT_GT]     = COMBO_ACTION(combo_lt_gt),
-};
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-    switch (combo_index) {
-        case COMBO_LPRN_RPRN:
-            if (pressed) {
-                tap_code16(KC_LPRN);
-                tap_code16(KC_RPRN);
-                tap_code16(KC_LEFT);
-            }
-            break;
-        case COMBO_LBRC_RBRC:
-            if (pressed) {
-                tap_code16(KC_LBRC);
-                tap_code16(KC_RBRC);
-                tap_code16(KC_LEFT);
-            }
-            break;
-        case COMBO_LCBR_RCBR:
-            if (pressed) {
-                tap_code16(KC_LCBR);
-                tap_code16(KC_RCBR);
-                tap_code16(KC_LEFT);
-            }
-            break;
-        case COMBO_LT_GT:
-            if (pressed) {
-                tap_code16(KC_LT);
-                tap_code16(KC_GT);
-                tap_code16(KC_LEFT);
-            }
-            break;
-    }
-}
-
-const key_override_t nop_shift_quote = ko_make_with_layers(MOD_MASK_SHIFT, KC_QUOT, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR)); /* " */
-const key_override_t nop_shift_dot   = ko_make_with_layers(MOD_MASK_SHIFT, KC_DOT, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));  /* < */
-const key_override_t nop_shift_comma = ko_make_with_layers(MOD_MASK_SHIFT, KC_COMM, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR)); /* > */
-const key_override_t nop_shift_slash = ko_make_with_layers(MOD_MASK_SHIFT, KC_SLSH, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR)); /* ? */
-const key_override_t nop_shift_one   = ko_make_with_layers(MOD_MASK_SHIFT, KC_1, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* ! */
-const key_override_t nop_shift_two   = ko_make_with_layers(MOD_MASK_SHIFT, KC_2, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* override @ */
-const key_override_t nop_shift_three = ko_make_with_layers(MOD_MASK_SHIFT, KC_3, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* override # */
-const key_override_t nop_shift_four  = ko_make_with_layers(MOD_MASK_SHIFT, KC_4, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* override $ */
-const key_override_t nop_shift_five  = ko_make_with_layers(MOD_MASK_SHIFT, KC_5, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* override % */
-const key_override_t nop_shift_six   = ko_make_with_layers(MOD_MASK_SHIFT, KC_6, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* override ^ */
-const key_override_t nop_shift_seven = ko_make_with_layers(MOD_MASK_SHIFT, KC_7, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* override & */
-const key_override_t nop_shift_eight = ko_make_with_layers(MOD_MASK_SHIFT, KC_8, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* override * */
-const key_override_t nop_shift_nine  = ko_make_with_layers(MOD_MASK_SHIFT, KC_9, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* override ( */
-const key_override_t nop_shift_zero  = ko_make_with_layers(MOD_MASK_SHIFT, KC_0, KC_NO, KO_LAYER_MASK_EXCEPT(_COMPOSITOR));    /* override ) */
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &nop_shift_quote,
-    &nop_shift_dot,
-    &nop_shift_comma,
-    &nop_shift_slash,
-    &nop_shift_one,
-    &nop_shift_two,
-    &nop_shift_three,
-    &nop_shift_four,
-    &nop_shift_five,
-    &nop_shift_six,
-    &nop_shift_seven,
-    &nop_shift_eight,
-    &nop_shift_nine,
-    &nop_shift_zero,
-    NULL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Qwerty
-     * ,----------------------------------------------------------------------------------------------------------.
-     * | Caps Lock    |   1   |  2   |  3   |  4   |  5   |     6     |  7   |  8   |   9  |  0    | Leader       |
-     * |--------------+-------+------+------+------+------+-----------+------+------+------+-------+--------------|
-     * | Ctrl         |   Q   |  W   |  E   |  R   |  T   |   Y/Copy  | U/Ü  |  I   | O/Ö  |P/Paste| Ctrl         |
-     * |--------------+-------+------+------+------+------+-----------+------+------+------+-------+--------------|
-     * | Shift/Esc    |  A/Ä  | S/ß  |  D   |  F   |  G   |     H     |  J   |  K   |   L  |  '    | Shift/Enter  |
-     * |--------------+-------+------+------+------+------+-----------+------+------+------+-------+--------------|
-     * | Alt          |   Z   |X/Cut |  C   |  V   |  B   |     N     |  M   |  ,   |   .  |  /    | Alt          |
-     * |--------------+-------+------+------+------+------+-----------+------+------+------+-------+--------------|
-     * | Mouse        |       |      |      |Raise |Lower |Lower/Space|Raise |      |      |       | Manage       |
-     * `----------------------------------------------------------------------------------------------------------'
-     */
-    [_QWERTY] = LAYOUT_preonic_grid(
-      KC_CAPS,          KC_1,    KC_2,     KC_3,    KC_4,   KC_5,  KC_6,         KC_7,    KC_8,    KC_9,     KC_0,       QK_LEAD,
-      KC_LCTL,          KC_Q,    KC_W,     KC_E,    KC_R,   KC_T,  LT_COPY_Y,    LT_UE_U, KC_I,    LT_OE_O,  LT_PASTE_P, KC_RCTL,
-      MOD_TAP_LSFT_ESC, LT_AE_A, LT_SZ_S,  KC_D,    KC_F,   KC_G,  KC_H,         KC_J,    KC_K,    KC_L,     KC_QUOT,    MOD_TAP_LSFT_ENT,
-      LM_COMP_LALT,     KC_Z,    LT_CUT_X, KC_C,    KC_V,   KC_B,  KC_N,         KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    LM_COMP_LALT,
-      TG(_MOUSE),       _______, _______,  _______, RAISE,  LOWER, LT_LOWER_SPC, RAISE,   _______,  _______, _______,    MANAGE
-    ),
-    /* Lower
-     * ,-----------------------------------------------------------------------------------.
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |  @   |  %   |  (   |   )  |      |      |  +   |  <   |  >   |      |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |  ~   |      |  [   |   ]  |      | Left | Down |  Up  |Right |  "   |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |  {   |   }  |      |      |      |  :   |   !  |  \   |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_preonic_grid(
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, KC_AT,   KC_PERC, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, KC_PLUS, KC_LT,   KC_GT,   XXXXXXX, XXXXXXX,
-      XXXXXXX, KC_TILD, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DQUO, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX, XXXXXXX, XXXXXXX, KC_COLN, KC_EXLM, KC_BSLS, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |  #   |  &   |      |      |      |      |   *  |  -   |  _   |  =   |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |  `   |      |      |      |      | Bspk |Pg Dn |Pg Up | Tab  |  $   | End  |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |  ;   |  ?   |  |   |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_preonic_grid(
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, KC_HASH, KC_AMPR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ASTR, KC_MINS, KC_UNDS, KC_EQL,  XXXXXXX,
-      XXXXXXX, KC_GRV,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC, KC_PGDN, KC_PGUP, KC_TAB,  KC_DLR,  KC_END,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUES, KC_PIPE, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    /* Mouse
-     * ,-------------------------------------------------------------------------------------------------------------------------------------------------------.
-     * |              |       |              |              |              |              |           |           |         |            |      |              |
-     * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
-     * |              |       |              |              |              |              |Wheel Left |Wheel Down |Wheel Up |Wheel Right |      | Ctrl         |
-     * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
-     * |              |       | Button 3     | Button 2     | Button 1     |              |Cursor Left|Cursor Down|Cursor Up|Cursor Right|      |              |
-     * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
-     * |Compositor+Alt|       |              |              |              |              |           |           |         |            |      |Compositor+Alt|
-     * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
-     * |Mouse         |       |              |Accelaration 2|Accelaration 1|Accelaration 0|           |           |         |            |      |              |
-     * `-------------------------------------------------------------------------------------------------------------------------------------------------------'
-     */
-    [_MOUSE] = LAYOUT_preonic_grid(
-      XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,       XXXXXXX,     XXXXXXX,        XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,      XXXXXXX,      XXXXXXX,      KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_UP, KC_MS_WH_RIGHT, XXXXXXX, _______,
-      XXXXXXX, XXXXXXX, KC_MS_BTN3, KC_MS_BTN2,   KC_MS_BTN1,   XXXXXXX,      KC_MS_LEFT,    KC_MS_DOWN,    KC_MS_UP,    KC_MS_RIGHT,    XXXXXXX, XXXXXXX,
-      _______, XXXXXXX, XXXXXXX,    XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,       XXXXXXX,     XXXXXXX,        XXXXXXX, _______,
-      _______, XXXXXXX, XXXXXXX,    KC_MS_ACCEL2, KC_MS_ACCEL1, KC_MS_ACCEL0, XXXXXXX,       XXXXXXX,       XXXXXXX,     XXXXXXX,        XXXXXXX, XXXXXXX
-    ),
-    /* Manage
-     * ,---------------------------------------------------------------------------------------.
-     * |  F1  |   F2   |   F3   |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-     * |------+--------+--------+------+------+------+------+------+------+------+------+------|
-     * |      |        |        |      |      |      |      |      |      |      |      |      |
-     * |------+--------+--------+------+------+-------------+------+------+------+------+------|
-     * |      |Aud prev|Aud next|Aud on|AudOff|      |      |Qwerty|      |      |      |      |
-     * |------+--------+--------+------+------+------|------+------+------+------+------+------|
-     * |      |        |Mus next|Mus on|MusOff|      |      |      |      |      |      |      |
-     * |------+--------+--------+------+------+------+------+------+------+------+------+------|
-     * |Reset |        |        |      |      |      |      |      |      |      |      |      |
-     * `---------------------------------------------------------------------------------------'
-     */
-    [_MANAGE] = LAYOUT_preonic_grid(
-      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, AU_PREV, AU_NEXT, AU_ON,   AU_OFF,  XXXXXXX, XXXXXXX, QWERTY,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, MU_NEXT, MU_ON,   MU_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    /* Compositor
-     * ,-----------------------------------------------------------------------------------.
-     * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |Shift |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   '  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |   Z  |   X  |   C  |  V   |   B  |   N  |   M  |   ,  |   .  |   /  |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |Space |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_COMPOSITOR] = LAYOUT_preonic_grid(
-      XXXXXXX,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    XXXXXXX,
-      XXXXXXX,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    XXXXXXX,
-      _______,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, _______,
-      XXXXXXX,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX,
-      XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-};
-
-static inline bool base_layer_hold_key(uint16_t keycode, keyrecord_t *record) {
-    if (!record->tap.count && record->event.pressed) {
-        tap_code16(keycode);
-        return false;
-    }
-    return true;
-}
-
-static inline bool toggle_layer(enum preonic_layers layer, keyrecord_t *record) {
-    if (record->event.pressed) {
-        layer_on(layer);
-    } else {
-        layer_off(layer);
-    }
-    return false;
-}
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case MOD_TAP_LSFT_ENT:
-        case MOD_TAP_LSFT_ESC:
-            /* Immediately select the hold action when another key is pressed. */
-            return true;
-        default:
-            /* Do not select the hold action when another key is pressed. */
-            return false;
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return false;
-        case LOWER:
-	    return toggle_layer(_LOWER, record);
-        case RAISE:
-	    return toggle_layer(_RAISE, record);
-        case MANAGE:
-	    return toggle_layer(_MANAGE, record);
-        case COMPOSITOR:
-	    return toggle_layer(_COMPOSITOR, record);
-        case LT_CUT_X:
-	    return base_layer_hold_key(C(KC_X), record); /* cut on hold */
-        case LT_COPY_Y:
-	    return base_layer_hold_key(C(KC_C), record); /* copy on hold */
-        case LT_PASTE_P:
-	    return base_layer_hold_key(C(KC_V), record); /* paste on hold */
-        case LT_AE_A:
-	    return base_layer_hold_key(RALT(KC_Q), record); /* 'ä' on hold */
-        case LT_OE_O:
-	    return base_layer_hold_key(RALT(KC_P), record); /* 'ö' on hold */
-        case LT_UE_U:
-	    return base_layer_hold_key(RALT(KC_Y), record); /* 'ü' on hold */
-        case LT_SZ_S:
-	    return base_layer_hold_key(RALT(KC_S), record); /* 'ß' on hold */
-    }
-
-    return true;
-};
-
-bool     muse_mode      = false;
-uint8_t  last_muse_note = 0;
-uint16_t muse_counter   = 0;
-uint8_t  muse_offset    = 70;
-uint16_t muse_tempo     = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (muse_mode) {
-        if (IS_LAYER_ON(_RAISE)) {
-            if (clockwise) {
-                muse_offset++;
-            } else {
-                muse_offset--;
-            }
-        } else {
-            if (clockwise) {
-                muse_tempo += 1;
-            } else {
-                muse_tempo -= 1;
-            }
-        }
-    } else {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_MANAGE);
-            } else {
-                layer_off(_MANAGE);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-static inline void register_ctrl_sequence(uint16_t keycode) {
-    tap_code16(RCTL(keycode));
-}
-
-void leader_end_user(void) {
-    if (leader_sequence_three_keys(KC_A, KC_C, KC_K)) {
-        SEND_STRING("Acked-by: Christian Brauner <brauner@kernel.org>");
-    }
-
-    if (leader_sequence_three_keys(KC_R, KC_V, KC_B)) {
-        SEND_STRING("Reviewed-by: Christian Brauner <brauner@kernel.org>");
-    }
-
-    if (leader_sequence_three_keys(KC_S, KC_O, KC_B)) {
-        SEND_STRING("Signed-off-by: Christian Brauner <brauner@kernel.org>");
-    }
-
-    /* Support vim-style copy. */
-    if (leader_sequence_one_key(KC_Y)) {
-        tap_code16(C(S(KC_C)));
-    }
-
-    /* Support vim-style paste. */
-    if (leader_sequence_one_key(KC_P)) {
-        tap_code16(C(S(KC_V)));
-    }
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/preonic/keymaps/brauner/readme.md b/keyboards/preonic/keymaps/brauner/readme.md
deleted file mode 100644
index 5614ab83049..00000000000
--- a/keyboards/preonic/keymaps/brauner/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Brauner's Preonic Keymap
-
-This is a keymap layout heavily optimized for vim.
-It mostly follows `QWERTY` but moves various symbols on to different layers.
-
-* Number keys function only as number keys.
-  Additional symbols they would produce when `Shift` is held are turned off as they are intercepted.
-* `Y`, `P`, and `X` function as `Ctrl+C`, `Ctrl+V`, and `Ctrl+X` when held.
-  This avoids having to hold down `Ctrl` and also aligns regular copy and paste with vim functionality.
-* Various keys perform different functions when tapped than when held.
-* `!` and `?` are on top of `.` on different layers.
-* `\` and `|` are on top of `/` on different layers.
-* `:` and `;` are on top of `,` on different layers.
-* All navigation is done via `H`, `J`, `K`, and `L`.
-* `O`, `U`, `S`, and `A` produce the Umlauts `Ö`, `Ü`, `ß`, and `Ä` when held.
-  This relies on the operating system keyboard layout to be set to US Intl.
-* Different layers will activate different types of navigation.
-  For example, left, right, up, and down or backspace, page up, page down, and tab.
-* There's a dedicated mouse layer which can be activated allowing to navigate solely with the keyboard where otherwise a mouse or trackpad would be needed.
-* There's a dedicated management layer where the boot loader can be entered or music mode can be turned on or off.
-* Lastly, there's a compositor layer which is optimized for managing a tiling window manager.
-  The layer is used specifically via layer-mod keys in the base layer.
-  In other words, specific modifiers are held when this layer is accessed.
-* Opening and closing brackets are always located on adjacent keys on the same layer.
-  Pressing a matching opening and closing bracket key at the same time will insert both brackets and move the cursor into the middle of the bracket pair.
-  As should be obvious, this is useful when programming: `(|)`, `[|]`, `{|}`, `<|>`.
diff --git a/keyboards/preonic/keymaps/brauner/rules.mk b/keyboards/preonic/keymaps/brauner/rules.mk
deleted file mode 100644
index a8fd3491386..00000000000
--- a/keyboards/preonic/keymaps/brauner/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LEADER_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-KEY_OVERRIDE_ENABLE = yes
-COMBO_ENABLE = yes
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/bucktooth/config.h b/keyboards/preonic/keymaps/bucktooth/config.h
deleted file mode 100644
index 23e9e0ed28f..00000000000
--- a/keyboards/preonic/keymaps/bucktooth/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define FORCE_NKRO 1
-
-#endif
diff --git a/keyboards/preonic/keymaps/bucktooth/keymap.c b/keyboards/preonic/keymaps/bucktooth/keymap.c
deleted file mode 100644
index 09602a16733..00000000000
--- a/keyboards/preonic/keymaps/bucktooth/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-#define L_QWERTSPLITLY 0
-#define L_FN 1
-
-// Defines for Mac specific key accelerators used in map. Some of these are very awkward to type.
-// These are the default bindings for Mac, some of which may be turned off or changed, check your
-// settings in System Preferences
-#define LS_TAB LSFT(KC_TAB) // Shift-TAB
-#define MF_MENU LCTL(KC_F2) // Move focus to menu bar default keybinding in MacOS
-#define MF_DOCK LCTL(KC_F3) // Move focus to dock
-#define MF_TOOL LCTL(KC_F5) // Move focus to window toolbar
-#define MF_STAT LCTL(KC_F8) // Move focus to status bar side of menu bar
-#define MF_DRWR LALT(LGUI(KC_QUOTE)) // Move focus to window drawer
-#define MF_LPAD LALT(LGUI(KC_Q)) // Show Launchpad
-#define MF_NOTI LALT(LGUI(LCTL(KC_B))) // Show Notification Center
-#define MF_DASH LALT(LGUI(LCTL(KC_C))) // Show Dashboard
-#define MF_HELP LSFT(LGUI(KC_SLASH)) // Position in menu Help search box
-
-// Momentary/Tap Combos used by this layout
-#define LT_FNESC LT(L_FN, KC_ESC) // ESC when tapped, Fn layer when held
-#define MT_RGENT MT(MOD_RGUI, KC_ENTER) // Enter when tapped, right GUI when held
-#define LT_FNLFT LT(L_FN, KC_LEFT) // Left when tapped, Fn layer when held
-#define MT_RSDOT MT(MOD_RSFT, KC_DOT) // Dot when tapped, right shift when held
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QwertSplitly
- * ,-----------------------------------------------------------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |   =  |   `  |   6  |   7  |   8  |   9  |   0  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   Q  |   W  |   E  |   R  |   T  |   [  |   ]  |   Y  |   U  |   I  |   O  |   P  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  |   -  |   '  |   H  |   J  |   K  |   L  |   ;  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   \  |   /  |   B  |   N  |   M  |   ,  |./RSft|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |ESC/fn|LCtrl | LOpt | LCmd |Space | Tab  | BkSp |Space |En/Cmd|<-/fn |CRSR v|CRSR->|
- * `-----------------------------------------------------------------------------------'
- */
-[L_QWERTSPLITLY] = LAYOUT_preonic_grid(
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL  ,KC_GRAVE,KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MINUS,KC_QUOTE,KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_BSLS, KC_SLASH,KC_B,    KC_N,    KC_M,    KC_COMM, MT_RSDOT,
-  LT_FNESC,KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  KC_TAB,  KC_BSPC, KC_SPC,  MT_RGENT,LT_FNLFT,KC_DOWN, KC_RIGHT
-),
-
-/* Fn
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  | Vol+ | Mute |  F6  |  F7  |  F8  |  F9  |  F10 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  F11 |  F12 |  F13 |  F14 |  F15 |Track-|Track+|M:WhUp|M:Lclk| M:Up |M:Rclk| PgUp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |^LPad |^DashB|^Help |^Drawr| Vol- | |>|| |M:WhDn|M:Left|M:Down|M:Rght| PgDn |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |RShift|^Menu |^SMenu|^Dock |^Tools|^Notif|  Ins |M:Slow|M:Norm|M:Fast| Home | End  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |[ESC] |RCtrl | ROpt | RCmd |Space |Sh-Tab|  Del |Space |PadEnt| [fn] |  Up  | Left |
- * `-----------------------------------------------------------------------------------'
- */
-[L_FN] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_VOLU, KC_MUTE, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_MRWD, KC_MFFD, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_PGUP,
-  KC_CAPS, MF_LPAD, MF_DASH, MF_HELP, MF_DRWR, KC_VOLD, KC_MPLY, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN,
-  KC_RSFT, MF_MENU, MF_STAT, MF_DOCK, MF_TOOL, MF_NOTI, KC_INS,  KC_ACL0, KC_ACL1, KC_ACL2, KC_HOME, KC_END,
-  _______, KC_RCTL, KC_RALT, KC_RGUI, _______, LS_TAB,  KC_DEL,  _______, KC_PENT, _______, KC_UP,   KC_LEFT
-)
-
-};
diff --git a/keyboards/preonic/keymaps/bucktooth/readme.md b/keyboards/preonic/keymaps/bucktooth/readme.md
deleted file mode 100644
index 4c1c6272114..00000000000
--- a/keyboards/preonic/keymaps/bucktooth/readme.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Bucktooth v2.0 (Mac)
-
-Bucktooth is an alternate layout that pushes the letters to the edges and puts most punctuation in the center. It's derived in part from my experience with Ergodox boards. I call the main layer layout QWERTSplitlY, you may notice the right side punctuation moving to the center and the control keys missing from the left.
-
-## Split QWERTY: Unorthodox
-
-     QwertSplitly
-     ,-----------------------------------------------------------------------------------.
-     |   1  |   2  |   3  |   4  |   5  |   +  |   `  |   6  |   7  |   8  |   9  |   0  |
-     |------+------+------+------+------+------+------+------+------+------+------+------|
-     |   Q  |   W  |   E  |   R  |   T  |   [  |   ]  |   Y  |   U  |   I  |   O  |   P  |
-     |------+------+------+------+------+-------------+------+------+------+------+------|
-     |   A  |   S  |   D  |   F  |   G  |   -  |   '  |   H  |   J  |   K  |   L  |   ;  |
-     |------+------+------+------+------+------|------+------+------+------+------+------|
-     |LShift|   Z  |   X  |   C  |   V  |   \  |   /  |   B  |   N  |   M  |   ,  |./RSft|
-     |------+------+------+------+------+------+------+------+------+------+------+------|
-     |ESC/fn|LCtrl | LOpt | LCmd |Space | Tab  | BkSp |Space |En/Cmd|<-/fn |CRSR v|CRSR->|
-     `-----------------------------------------------------------------------------------'
-
-
-It is a bit of a departure from normal Preonic layouts. You will notice that the bottom letter row is shifted right, and this is both an accomodation for the left shift and because I could never get used to C being directly under D and some other similar staggered keyboard tendencies. If you are used to the default ortho layouts you may want to adjust this back; but, you may find that it is slightly easier to move between a typical staggered layout and ortho boards in this layout. Plus, having a dedicated shift is a good thing, even though the dot key does double duty as a right shift.
-
-That left shift is the only control or modifier key on the top four rows. All the modifiers and control keys are in the bottom row. Most Ergodox boards put the braces ({}[]) in the center and keep the hands apart. The hands aren't very far apart in this layout but you can imagine moving between this layout and the Ergodox easily, if you can get used to the lack of the extra 1.5U columns on the left and right!
-
-With all control keys on the bottom row, the ESC key now lives in the bottom left and on my keyboard I actually put a very heavy keyswitch in that space to keep me from hitting it accidentally instead of ctrl. Hold it down and it becomes fn. I usually hit it with my whole hand since it is in the corner, without moving my fingers down to it.
-
-## Revision 2 Changes
-
-The move of B to the right side of the keyboard may be controversial but has felt more and more comfortable to me. Again if you split a staggered layout keyboard down a straight line B has more in common with Y than T. I don't understand breaking the board into left and right on anything but a vertical line despite the long history of bringing the staggered layout slewing left.
-
-Revision 2 also changes the positions of -, =, and ~ for better compatibility with sculpted profile keysets which offer a Dvorak set option that provides the middle row dash because a middle row backtick/tilde is not found anywhere.
-
-## Function Layer
-
-There are no raise and lower or multiple function pages. The Preonic has enough keys to avoid more than a single function page, and I prefer to have spacebars for both thumbs so the "Bucktooth" name comes from the typical keyset with darker function keys and lighter alphas and space keys giving the keyboard fang-like appearance where the two spaces are.
-
-
-     Fn
-     ,-----------------------------------------------------------------------------------.
-     |  F1  |  F2  |  F3  |  F4  |  F5  | Vol+ | Mute |  F6  |  F7  |  F8  |  F9  |  F10 |
-     |------+------+------+------+------+------+------+------+------+------+------+------|
-     |  F11 |  F12 |  F13 |  F14 |  F15 |Track-|Track+|M:WhUp|M:Lclk| M:Up |M:Rclk| PgUp |
-     |------+------+------+------+------+-------------+------+------+------+------+------|
-     | Caps |^LPad |^DashB|^Help |^Drawr| Vol- | |>|| |M:WhDn|M:Left|M:Down|M:Rght| PgDn |
-     |------+------+------+------+------+------|------+------+------+------+------+------|
-     |RShift|^Menu |^SMenu|^Dock |^Tools|^Notif|  Ins |M:Slow|M:Norm|M:Fast| Home | End  |
-     |------+------+------+------+------+------+------+------+------+------+------+------|
-     |[ESC] |RCtrl | ROpt | RCmd |Space |Sh-Tab|  Del |Space |PadEnt| [fn] |  Up  | Left |
-     `-----------------------------------------------------------------------------------'
-
-### Cursor Keys
-
-The cursor keys are a design I stole from the old Commodore computers which had DOWN and RIGHT keys on the bottom right part of the board. When shifted, they would move the cursor in the opposite direction, and Commodore saved two keys. Since shifted arrows are a common use case in selecting text, emulating this exactly is not desirable so the fn key is placed next to the cursor down and right keys and holding down fn will reverse their meaning. Unlike the Commodore keys they will not invert just by releasing fn but it is close. Because QMK supports it I also allow use the tap mode for fn to move the cursor left, so only going up requires the fn. This is surely the weirdest part of the layout for most people. As someone who learned to type on a Commodore keyboard, it is second nature to me!
-
-### Mac Keyboard navigation Combo Macros
-
-On Fn layer ZXCVB and SDFG keys I have set up the default key bindings for Mac OS Keyboard Focus keys since they are obscure and require FKeys mostly. They are pretty convenient for using the keyboard to search the menus, go to the dock, etc. Some like the one to jump to a window's toolbar and the one to jump to a window's accessory drawer are less commonly used.
-
----
-
-Contributed to QMK and released with the QMK license by Jeri C. Mason, 3/16/2018 - Revision 2 2/26/2019
diff --git a/keyboards/preonic/keymaps/bucktooth/rules.mk b/keyboards/preonic/keymaps/bucktooth/rules.mk
deleted file mode 100644
index fc265296522..00000000000
--- a/keyboards/preonic/keymaps/bucktooth/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # 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 = no        # Enable WS2812 RGB underlight. 
-
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/preonic/keymaps/choromanski/config.h b/keyboards/preonic/keymaps/choromanski/config.h
deleted file mode 100644
index 7442e21e329..00000000000
--- a/keyboards/preonic/keymaps/choromanski/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(COLEMAK_SOUND), \
-                                  SONG(QWERTY_SOUND), \
-                                  SONG(AUDIO_ON_SOUND), \
-                                  SONG(TERMINAL_SOUND), \
-                                  SONG(NO_SOUND), \
-                                  SONG(MUSIC_ON_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != MU_TOGG)
-
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
-
-#ifndef TAPPING_TERM
-#define TAPPING_TERM 200
-
-#endif
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/choromanski/keymap.c b/keyboards/preonic/keymaps/choromanski/keymap.c
deleted file mode 100644
index 8efe86d2827..00000000000
--- a/keyboards/preonic/keymaps/choromanski/keymap.c
+++ /dev/null
@@ -1,174 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum preonic_layers {
-  _COLEMAK,
-  _QWERTY,
-  _FUNCT,
-  _NUMPAD,
-  _SYMB,
-  _MUSIC
-};
-
-enum preonic_keycodes {
-  FUNCT
-};
-
-//Tap Dance Declarations
-enum {
-  G1 = 0,
-  BRC,
-  EQ
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for 1, twice for Grave
-  [G1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_GRV),
-  //Tap once for [, twice for ]
-  [BRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
-  //Tap once for = twice for Backslash
-  [EQ] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_BSLS)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |  1 ` |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |  = \ |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |  [ ] |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Numpad|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Symbol| Ctrl | Alt  | GUI  | Bksp | Del  |Enter |Space | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_grid(
-	TD(G1),		KC_2,		KC_3,		KC_4,		KC_5,		KC_6,	KC_7,	KC_8,	KC_9,		KC_0,		KC_MINS,	TD(EQ),
-	KC_TAB,		KC_Q,		KC_W,		KC_F,		KC_P,		KC_G,	KC_J,	KC_L,	KC_U,		KC_Y,		KC_SCLN,	TD(BRC),
-	KC_ESC,		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,	TG(_NUMPAD),
-	OSL(_SYMB),	KC_LCTL,	KC_LALT,	KC_LGUI,	KC_BSPC,	KC_DEL,	KC_ENT,	KC_SPC,	KC_LEFT,	KC_DOWN,	KC_UP,		KC_RGHT
-),
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |  1 ` |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |  = \ |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  [ ] |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Numpad|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Symbol| Ctrl | Alt  | GUI  | Bksp | Del  |Enter |Space | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-	TD(G1),		KC_2,		KC_3,		KC_4,		KC_5,		KC_6,	KC_7,	KC_8,	KC_9,		KC_0,		KC_MINS,	TD(EQ),
-	KC_TAB,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,	KC_Y,	KC_U,	KC_I,		KC_O,		KC_P,		TD(BRC),
-	KC_ESC,		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,	TG(_NUMPAD),
-	OSL(_SYMB),	KC_LCTL,	KC_LALT,	KC_LGUI,	KC_BSPC,	KC_DEL,	KC_ENT,	KC_SPC,	KC_LEFT,	KC_DOWN,	KC_UP,		KC_RGHT
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Symbol|      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCT] = LAYOUT_preonic_grid(
-	KC_F1,		KC_F2,		KC_F3,		KC_F4,		KC_F5,		KC_F6,		KC_F7,		KC_F8,		KC_F9,		KC_F10,		KC_F11,		KC_F12,
-	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
-	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______
-),
-
-/* Numpad & Mouse
- * ,-----------------------------------------------------------------------------------.
- * |   `  |      |      |M-clic|      |      |      |      |   /  |   *  |   -  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | ACL0 |L-clck|  Up  |R-clck|Scrl U|      |   7  |   8  |   9  |   +  |  ]   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | ACL1 | Left | Down |Right |Scrl D|      |   4  |   5  |   6  |   +  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | ACL2 | VOLU | PREV |PAUSE | NEXT |      |   1  |   2  |   3  |Enter | Back |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Symbol|      | VOLD | MUTE | Bksp | Del  |Enter |Space |   0  |   .  |Enter |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_preonic_grid(
-	KC_GRV,		_______,	_______,	KC_BTN3,	_______,	_______,	_______,	KC_NUM,	KC_SLSH,	KC_ASTR,	KC_MINS,	KC_BSLS,
-	_______,		KC_ACL0,	KC_BTN1,	KC_MS_U,	KC_BTN2,	KC_WH_U,	_______,	KC_7,		KC_8,		KC_9,		KC_PLUS,	KC_RBRC,
-	_______,		KC_ACL1,	KC_MS_L,	KC_MS_D,	KC_MS_R,	KC_WH_D,	_______,	KC_4,		KC_5,		KC_6,		KC_PLUS,	_______,
-	_______,		KC_ACL2,	KC_VOLU,	KC_MPRV,	KC_MPLY,	KC_MNXT,	_______,	KC_1,		KC_2,		KC_3,		KC_ENT,		_______,
-	OSL(_SYMB),	_______,	KC_VOLD,	KC_MUTE,	KC_BSPC,	KC_DEL,		KC_ENT,		KC_SPC,		KC_0,		KC_DOT,		KC_ENT,		_______
-),
-
-/* Symbol
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   |  |  +   |  <   |  >   |  #   |   ~  |   (  |   )  |   \  |   :  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   !  |  -   |  =   |  %   |  @   |   _  |   {  |   }  |   /  |   ?  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |MUSIC |   *  |  &   |  /   |  $   |  ^   |   |  |   [  |   ]  |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  FN  |COLMAK|QWERTY|      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_SYMB] = LAYOUT_preonic_grid(
-	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_PIPE,	KC_PLUS,		KC_LABK,		KC_RABK,	KC_HASH,	KC_TILD,	KC_LPRN,	KC_RPRN,	KC_BSLS,	KC_COLN,	_______,
-	_______,		KC_EXLM,	KC_MINS,		KC_EQL,			KC_PERC,	KC_AT,		KC_UNDS,	KC_LCBR,	KC_RCBR,	KC_SLSH,	KC_QUES,	_______,
-	TO(_MUSIC),	KC_ASTR,	KC_AMPR,		KC_SLSH,		KC_DLR,		KC_CIRC,	KC_PIPE,	KC_LBRC,	KC_RBRC,	_______,	_______,	_______,
-	_______,		FUNCT,		TO(_COLEMAK),	TO(_QWERTY),	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______
-),
-
-/* Music
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |COLMAK|      |      |      |      |      |      |      |      |      | MOD  | TOG  |
- * `-----------------------------------------------------------------------------------'
- */
-[_MUSIC] = LAYOUT_preonic_grid(
-	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,	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,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,
-	TO(_COLEMAK),	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	KC_NO,	MU_NEXT,	MU_TOGG
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		case FUNCT:
-			if (record->event.pressed) {
-				layer_off(_SYMB);
-				layer_on(_FUNCT);
-			}
-			return false;
-			break;
-	}
-	return true;
-};
diff --git a/keyboards/preonic/keymaps/choromanski/readme.md b/keyboards/preonic/keymaps/choromanski/readme.md
deleted file mode 100644
index 5b8d359009f..00000000000
--- a/keyboards/preonic/keymaps/choromanski/readme.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Choromanski
-
-## Features
-* Colemak
-* Qwerty
-* Toggable function row
-* Symbol layer programmer friendly
-* Numpad/Mouse layer with media controls
-
-## Layers
-
-### 0 Colemak
-```
-,-----------------------------------------------------------------------------------.
-|  1 ` |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |  = \ |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |  [ ] |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Numpad|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|Symbol| Ctrl | Alt  | GUI  | Bksp | Del  |Enter |Space | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-### 1 Qwerty
-```
-,-----------------------------------------------------------------------------------.
-|  1 ` |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |  = \ |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  [ ] |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Numpad|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|Symbol| Ctrl | Alt  | GUI  | Bksp | Del  |Enter |Space | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-### 2 Function Lock
-```
-,-----------------------------------------------------------------------------------.
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|Symbol|      |      |      |      |      |      |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
-### 3 Numpad/Mouse with Media Controls
-```
-,-----------------------------------------------------------------------------------.
-|   `  |      |      |M-clic|      |      |      |      |   /  |   |   -  |  \   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | ACL0 |L-clck|  Up  |R-clck|Scrl U|      |   7  |   8  |   9  |   +  |  ]   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | ACL1 | Left | Down |Right |Scrl D|      |   4  |   5  |   6  |   +  |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | ACL2 | VOLU | PREV |PAUSE | NEXT |      |   1  |   2  |   3  |Enter | Back |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|Symbol|      | VOLD | MUTE | Bksp | Del  |Enter |Space |   0  |   .  |Enter |      |
-`-----------------------------------------------------------------------------------'
-```
-### 4 Symbols
-```
-,-----------------------------------------------------------------------------------.
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |   |  |  +   |  <   |  >   |  #   |   ~  |   (  |   )  |   \  |   :  |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |   !  |  -   |  =   |  %   |  @   |   _  |   {  |   }  |   /  |   ?  |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|MUSIC |   *  |  &   |  /   |  $   |  ^   |   |  |   [  |   ]  |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |  FN  |COLMAK|QWERTY|      |      |      |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
-### 5 Music
-```
-,-----------------------------------------------------------------------------------.
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|COLMAK|      |      |      |      |      |      |      |      |      | MOD  | TOG  |
-`-----------------------------------------------------------------------------------'
-```
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/choromanski/rules.mk b/keyboards/preonic/keymaps/choromanski/rules.mk
deleted file mode 100644
index 9aae19dd97b..00000000000
--- a/keyboards/preonic/keymaps/choromanski/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-AUDIO_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/codecoffeecode/keymap.c b/keyboards/preonic/keymaps/codecoffeecode/keymap.c
deleted file mode 100644
index 8b1da584b4f..00000000000
--- a/keyboards/preonic/keymaps/codecoffeecode/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2020 codecoffeecode
- * 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] = {
-
-/* Main Layer
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[0] = LAYOUT_preonic_1x2uC(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL,
-  KC_ESC,  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_LCTL, KC_LALT, KC_LGUI, MO(1),       KC_SPC,       MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   -  |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[1] = LAYOUT_preonic_1x2uC(
-  KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,      _______,     _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |   -  |   =  |   [  |   ]  |   \  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[2] = LAYOUT_preonic_1x2uC(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_F12,  _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-)};
diff --git a/keyboards/preonic/keymaps/codecoffeecode/readme.md b/keyboards/preonic/keymaps/codecoffeecode/readme.md
deleted file mode 100644
index 9ec7e95490b..00000000000
--- a/keyboards/preonic/keymaps/codecoffeecode/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# This layout is largely based on codecoffeecode's niu_mini layout
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/cranium/config.h b/keyboards/preonic/keymaps/cranium/config.h
deleted file mode 100644
index 5975764d7ec..00000000000
--- a/keyboards/preonic/keymaps/cranium/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/cranium/keymap.c b/keyboards/preonic/keymaps/cranium/keymap.c
deleted file mode 100644
index 7b81774027d..00000000000
--- a/keyboards/preonic/keymaps/cranium/keymap.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty (base layer)
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Esc  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Esc  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Bksp |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  F12 |  GUI | Alt  |Lower |    Space    |Raise |AltGr |   [  |   ]  |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_ESC,
-  KC_BSPC, 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_BSLS,
-  KC_LCTL, KC_F12,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_RALT, KC_LBRC, KC_RBRC, KC_ENT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  ~   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   +  |   =  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | LGUI |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |   4  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      _      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, 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_MINS, KC_PLUS, KC_EQL,  _______, _______,
-  KC_LGUI, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_1,    KC_2,    KC_3,    KC_4,    _______,
-  _______, _______, _______, _______, _______, KC_UNDS, KC_UNDS, _______, _______, _______, _______, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  Up  | Down | Left |Right |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | Home | End  |      |      | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      _      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UP,   KC_DOWN, KC_LEFT, KC_RIGHT,_______,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_END,  _______, _______, KC_RSFT,
-  _______, _______, _______, _______, _______, KC_UNDS, KC_UNDS, _______, _______, _______, _______, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      | Sleep|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset| Debug|      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap| Vol+ | Vol- | Prev | Next |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |    Play     |      |      |      |      | PrScr|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, KC_PSCR
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      tap_code(KC_PGDN);
-    } else {
-      tap_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-      if (muse_counter) {
-        stop_all_notes();
-        muse_counter = 0;
-      }
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/cranium/readme.md b/keyboards/preonic/keymaps/cranium/readme.md
deleted file mode 100644
index 0f1d99598c9..00000000000
--- a/keyboards/preonic/keymaps/cranium/readme.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Cranium's Preonic layout
-
-This layout is based on the Preonic default with some changes I find interesting to share.
-
-## Default layer
-```
- ,-----------------------------------------------------------------------------------.
- |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Esc  |
- |------|------|------|------|------|------|------|------|------|------|------|------|
- | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Esc  |
- |------|------|------|------|------|-------------|------|------|------|------|------|
- | Bksp |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- |------|------|------|------|------|------|------|------|------|------|------|------|
- | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  |   |
- |------|------|------|------|------|------|------|------|------|------|------|------|
- | Ctrl |  F12 |  GUI | Alt  |Lower |    Space    |Raise |AltGr |   [  |   ]  |Enter |
- `-----------------------------------------------------------------------------------'
-```
-- As a Colemak user, Capslock was rebound to Backspace.
-- Escape was moved to the top-right of the keyboard
-- Enter was moved to the bottom-right of the keyboard. It's now easy to hit and can even be activated with the palm.
-- An F12 was put next to the left CTRL => it's the shortcut I use to toggle the Guake terminal.
-- I don't really use the key below my Escape (top-right, 2nd row), so I'll consider any ideas for the moment.
-
-
-## Lower
-```
- ,-----------------------------------------------------------------------------------.
- |  ~   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- |------|------|------|------|------|-------------|------|------|------|------|------|
- |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  Del |
- |------|------|------|------|------|-------------|------|------|------|------|------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   +  |   =  |      |      |
- |------|------|------|------|------|------|------|------|------|------|------|------|
- | LGUI |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |   4  |      |
- |------|------|------|------|------|------|------|------|------|------|------|------|
- |      |      |      |      |      |      _      |      |      |      |      |      |
- `-----------------------------------------------------------------------------------'
-```
-- Not much changes here
-
-## Raise
-```
- ,-----------------------------------------------------------------------------------.
- |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- |------|------|------|------|------|------|------|------|------|------|------|------|
- |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- |------|------|------|------|------|-------------|------|------|------|------|------|
- | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  Up  | Down | Left |Right |      |
- |------|------|------|------|------|------|------|------|------|------|------|------|
- |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | Home | End  |      |      | Shift|
- |------|------|------|------|------|------|------|------|------|------|------|------|
- |      |      |      |      |      |      _      |      |      |      |      |      |
- `-----------------------------------------------------------------------------------'
-```
-- Perhaps one of the most interesting change: the arrow keys were moved to the right-hand home row, activated with the Raise layer. It means I can use the arrow keys without moving my hand from the home row, by activating the Raise layer with my thumb. It took a while to adapt but it was totally worth it. To note, I also put Home/End on the same layer but one row below, with I also find really useful.
-
-## Adjust
-```
- ,-----------------------------------------------------------------------------------.
- |      |      |      |      |      |      |      |      |      |      |      | Sleep|
- |------|------|------|------|------|------|------|------|------|------|------|------|
- |      | Reset| Debug|      |      |      |      |      |      |      |      |      |
- |------|------|------|------|------|-------------|------|------|------|------|------|
- |      |      |      |Aud on|AudOff|AGnorm|AGswap| Vol+ | Vol- | Prev | Next |      |
- |------|------|------|------|------|------|------|------|------|------|------|------|
- |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- |------|------|------|------|------|------|------|------|------|------|------|------|
- |      |      |      |      |      |    Play     |      |      |      |      | PrScr|
- `-----------------------------------------------------------------------------------'
-```
-- The "arrow" keys act as Vol+/Vol-/Previous/Next on the Adjust layer (which is quite a natural mapping for these media keys).
diff --git a/keyboards/preonic/keymaps/cranium/rules.mk b/keyboards/preonic/keymaps/cranium/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/cranium/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/davidrambo/config.h b/keyboards/preonic/keymaps/davidrambo/config.h
deleted file mode 100644
index c99ca8381cb..00000000000
--- a/keyboards/preonic/keymaps/davidrambo/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 David Rambo
- *
- * 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_TERM 200
-#define PERMISSIVE_HOLD
diff --git a/keyboards/preonic/keymaps/davidrambo/keymap.c b/keyboards/preonic/keymaps/davidrambo/keymap.c
deleted file mode 100755
index aca8a7c1e37..00000000000
--- a/keyboards/preonic/keymaps/davidrambo/keymap.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* Copyright 2021 David Rambo
- *
- * 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
-
-//aliases for clarity in layering
-#define A_BSPC  LALT(KC_BSPC) // delete whole word in Mac
-#define C_BSPC  LCTL(KC_BSPC) // delete whole word in PC
-#define A_LEFT  LALT(KC_LEFT) // move cursor whole word back in Mac
-#define A_RGHT  LALT(KC_RGHT) // move cursor whole word forward in Mac
-#define C_RGHT  LCTL(KC_RGHT) // move cursor whole word back in PC
-#define C_LEFT  LCTL(KC_LEFT) // move cursor whole word forward in PC
-#define SftEnt  SFT_T(KC_ENT)
-#define BS_GUI  LGUI_T(KC_BSPC)
-#define BS_CTL  LCTL_T(KC_BSPC)
-#define RECT    LCA_T(KC_DEL) // Ctrl+Alt is the basis for Rectangle WM
-
-// internet browser tab shortcuts and window/application swapping for Mac and Win
-#define GSL     LGUI(S(KC_LEFT)) // back one tab in Safari
-#define GSR     LGUI(S(KC_RGHT)) // forward one tab in Safari
-#define CTLPGUP LCTL(KC_PGUP)   // back one tab on PC
-#define CTLPGDN LCTL(KC_PGDN)   // forward one tab on PC
-#define G_TAB   LGUI(KC_TAB)    // Mac: switch applications
-#define G_GRV   LGUI(KC_GRV)    // Mac: switch between windows within an application
-#define A_TAB   LALT(KC_TAB)
-#define C_TAB   LCTL(KC_TAB)
-
-// navigKC_ation layers for both Mac OS X and Windows
-#define NAVMAC  LT(5, KC_ESC)
-#define NAVPC   LT(6, KC_ESC)
-#define NAVQUD  LT(7, KC_ESC)
-
-enum custom_layers {
-    _COLEMAK,
-    _PC, 
-    _QUD,
-    _GAME,
-    _SYMBOL,
-    _NAVMAC,
-    _NAVPC,
-    _NAVQUD,
-}
-
-//tapdance declarations
-enum {
-  SFT_LCK
-};
-
-#define SftLck TD(SFT_LCK) /* alias for tapdance */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ESC` |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |SftLck|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |  /?  |SftEnt|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |PrnSc | GUI  | Alt  | Ctrl |BsGui | Space|Symbol| Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
-*/
-
-[_COLEMAK] = LAYOUT_preonic_grid(
-  KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5  , KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    TG(1)  ,
-  KC_TAB , KC_Q,    KC_W,    KC_F,    KC_P,    KC_G  , KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  NAVMAC , KC_A,    KC_R,    KC_S,    KC_T,    KC_D  , KC_H,   KC_N,   KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SftLck , KC_Z,    KC_X,    KC_C,    KC_V,    KC_B  , KC_K,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, SftEnt ,
-  RECT   , KC_RCTL, KC_LGUI, KC_LCTL, KC_LALT, BS_GUI, KC_SPC, MO(4),  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-  
-[_PC] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(2)  ,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  NAVPC  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_DEL , KC_PSCR, KC_LCTL, KC_LALT, KC_LGUI, BS_CTL , KC_SPC ,  MO(4) , _______, _______, _______, _______
-  ),
-  
-[_QUD] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(3)  ,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  NAVQUD , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_DEL , KC_PSCR, KC_LGUI, KC_LALT, KC_LCTL, NAVQUD , KC_SPC,  MO(4)  , _______, _______, _______, _______
-  ),
-
-[_GAME] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0)  ,
-  KC_TAB , KC_T   , KC_Q   , KC_W   , KC_E   , KC_R   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , _______,
-  KC_TAB , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, _______,
-  KC_LALT, KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_N   , KC_M   , _______, _______, _______, _______,
-  _______, _______, _______, KC_G   , KC_B   , KC_SPC , KC_I   , MO(4)  , _______, _______, _______, _______
-  ),
-
-/* Symbol
- * ,-----------------------------------------------------------------------------------.
- * |   [  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   ]  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  \|  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |  =+  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | Home | End  |      | Play | BRMD | BRMU |  -_  |Pg Up |      |   /  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  `~  |      |      |      |      |      |      |      |Pg Dn | Vol- | Vol+ |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_SYMBOL] = LAYOUT_preonic_grid(
-  KC_F12 , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-  KC_LBRC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_RBRC,
-  KC_BSLS, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL ,
-  _______, KC_HOME, KC_END , KC_MNXT, KC_MPLY, KC_WH_L, KC_WH_R, KC_MINS, KC_PGUP, KC_WH_D, KC_WH_U, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_MUTE 
-  ),
-
-/* Navigation*/
-
-[_NAVMAC] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, C_TAB  , A_LEFT , KC_UP  , A_RGHT , KC_DEL , _______,
-  _______, _______, _______, _______, _______, _______,S(C_TAB), KC_LEFT, KC_DOWN, KC_RGHT, C_TAB  , _______,
-  _______, _______, _______, _______, _______, _______, G_TAB  , A_BSPC , KC_HOME, KC_END , G_GRV  , _______,
-  QK_BOOT, _______, _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______
-),
-
-[_NAVPC] = LAYOUT_preonic_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, C_TAB  , C_LEFT , KC_UP  , C_RGHT , KC_DEL , _______,
-    _______, _______, _______, _______, _______, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
-    _______, _______, _______, _______, _______, _______, A_TAB  , C_BSPC , KC_HOME, KC_END , G_GRV  , _______,
-    QK_BOOT, _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______, _______
-),
-  
-[_NAVQUD] = LAYOUT_preonic_grid(
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_PSLS, KC_PAST, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_P7  , KC_P8  , KC_P9  , _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_P4  , KC_P2  , KC_P6  , _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_P1  , KC_P5  , KC_P3  , _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_PMNS, KC_PPLS, _______, _______
-)
-};
-
-// Shift vs capslock function. From bbaserdem's Planck keymap.
-void caps_tap (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_code (KC_LSFT);
-    } else if (state->count == 2) {
-        unregister_code (KC_LSFT);
-        register_code (KC_CAPS);
-    }
-}
-void caps_tap_end (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code (KC_LSFT);
-    } else {
-        unregister_code (KC_CAPS);
-    }
-}
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Shift, twice for Caps Lock
-  [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end )
-};
diff --git a/keyboards/preonic/keymaps/davidrambo/rules.mk b/keyboards/preonic/keymaps/davidrambo/rules.mk
deleted file mode 100644
index 6f0d3dc0bbd..00000000000
--- a/keyboards/preonic/keymaps/davidrambo/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TAP_DANCE_ENABLE = yes
-AUDIO_ENABLE = no
-
diff --git a/keyboards/preonic/keymaps/dothtm60/config.h b/keyboards/preonic/keymaps/dothtm60/config.h
deleted file mode 100644
index 718b2d4b650..00000000000
--- a/keyboards/preonic/keymaps/dothtm60/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* 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(PREONIC_SOUND)
-// #define STARTUP_SONG SONG(NO_SOUND)
-
-#    define DEFAULT_LAYER_SONGS \
-        { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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 HOLD_ON_OTHER_KEY_PRESS
diff --git a/keyboards/preonic/keymaps/dothtm60/keymap.c b/keyboards/preonic/keymaps/dothtm60/keymap.c
deleted file mode 100644
index fbcdb9b7974..00000000000
--- a/keyboards/preonic/keymaps/dothtm60/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 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 7 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_5x12(
-    [0] = 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_TAB,     KC_Q,       KC_W,       KC_E,       KC_R,          KC_T,         KC_Y,      KC_U,         KC_I,       KC_O,          KC_P,          KC_QUOT,
-        KC_ESC,     KC_A,       KC_S,       KC_D,       KC_F,          KC_G,         KC_H,      KC_J,         KC_K,       KC_L,          KC_SCLN,       KC_ENT,
-        KC_LSFT,    KC_Z,       KC_X,       KC_C,       KC_V,          KC_B,         KC_N,      KC_M,         KC_COMM,    KC_DOT,        KC_UP,         KC_RSFT,
-        MO(2),      KC_LCTL,    KC_LALT,    KC_LGUI,    LT(1,KC_SPC),  KC_SPC,       KC_SPC,    LT(1,KC_SPC), KC_RGUI,    KC_LEFT,       KC_DOWN,       KC_RGHT
-    ),
-
-    [1] = LAYOUT_ortho_5x12(
-        KC_TILD,    KC_F1,      KC_F2,      KC_F3,      KC_F4,         LGUI(KC_MINS), LGUI(KC_EQL),  KC_NO,        KC_NO,      KC_NO,         KC_NO,         KC_DEL,
-        KC_NO,      KC_F5,      KC_F6,      KC_F7,      KC_F8,         LGUI(KC_LCBR), LGUI(KC_RCBR), KC_LCBR,      KC_RCBR,    KC_DQUO,       KC_QUOT,       KC_BSLS,
-        KC_NO,      KC_F9,      KC_F10,     KC_F11,     KC_F12,        LGUI(KC_LBRC), LGUI(KC_RBRC), KC_LBRC,      KC_RBRC,    KC_LT,         KC_GT,         KC_PENT,
-        KC_TRNS,    KC_UNDS,    KC_PLUS,    KC_MINS,    KC_EQL,        LGUI(KC_QUES), LGUI(KC_SLSH), KC_QUES,      KC_SLSH,    KC_QUES,       LCAG(KC_UP),   KC_TRNS,
-        MO(15),     KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,       LGUI(KC_SPC),  LGUI(KC_SPC),   KC_TRNS,      KC_TRNS,    LGUI(KC_LBRC), LCAG(KC_DOWN), LGUI(KC_RBRC)
-    ),
-
-    [2] = LAYOUT_ortho_5x12(
-        DB_TOGG,    KC_F1,      KC_F2,      KC_F3,      KC_F4,         KC_F5,       KC_F6,      KC_F7,        KC_F8,      KC_F9,         KC_F10,        KC_DEL,
-        RGB_TOG,    KC_F11,     KC_F12,     KC_F13,     KC_F14,        KC_F15,      KC_F16,     KC_F17,       KC_F18,     KC_F19,        KC_F20,        KC_NO,
-        HYPR(KC_H), KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_NO,         KC_NO,       KC_F21,     KC_F22,       KC_F23,     KC_F24,        KC_NO,         KC_NO,
-        KC_TRNS,    KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_NO,         KC_NO,       KC_NO,      KC_NO,        KC_NO,      KC_NO,         KC_PGUP,       KC_TRNS,
-        KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    MO(15),        KC_NO,       KC_NO,      MO(15),       KC_TRNS,    KC_HOME,       KC_PGDN,       KC_END
-    ),
-
-
-
-
-    // Musical keys
-
-    [7] = LAYOUT_ortho_5x12(
-
-        // Chromatic Scale       Vertical
-        //      1,        2,        3,        4,        5,        6,        7,        8,        9,        10,       11,       12,
-        KC_ESC,     MI_C,       MI_E,       MI_Gs,      MI_C1,        MI_E1,      MI_Gs1,    MI_C2,       MI_E2,     MI_Gs2,       MI_C3,        MI_TR0,
-        KC_TAB,     MI_Cs,      MI_F,       MI_A,       MI_Cs1,       MI_F1,      MI_A1,     MI_Cs2,      MI_F2,     MI_A2,        MI_Cs3,       MI_TRSU,
-        KC_SPC,     MI_D,       MI_Fs,      MI_As,      MI_D1,        MI_Fs1,     MI_As1,    MI_D2,       MI_Fs2,    MI_As2,       MI_D3,        MI_TRSD,
-        MI_SUST,     MI_Ds,      MI_G,       MI_B,       MI_Ds1,       MI_G1,      MI_B1,     MI_Ds2,      MI_G2,     MI_B2,        MI_Ds3,       MI_OCTU,
-        MO(15),     KC_LCTL,    KC_LALT,    KC_LGUI,    MI_BNDD,      MI_SUST,      MI_SUST,     MI_BNDU,     KC_NO,      MI_MODD,      MI_MODU,      MI_OCTD
-    ),
-
-
-    [8] = LAYOUT_ortho_5x12(
-        // Pocket Operator Scale Vertical
-        //1,    2,       3,       4,        5,        6,        7,        8,        9,        10,       11,        12,
-        KC_ESC,     MI_C,       MI_G,       MI_C1,     MI_G1,        MI_C2,      MI_G2,     MI_C3,       MI_G3,     MI_C4,        MI_G4,        MI_TR0,
-        KC_TAB,     MI_D,       MI_Gs,      MI_D1,     MI_Gs1,       MI_D2,      MI_Gs2,    MI_D3,       MI_Gs3,    MI_D4,        MI_Gs4,       MI_TRSU,
-        KC_SPC,     MI_Ds,      MI_As,      MI_Ds1,    MI_As1,       MI_Ds2,     MI_As2,    MI_Ds3,      MI_As3,    MI_Ds4,       MI_As4,       MI_TRSD,
-        MI_SUST,     MI_F,       MI_B,       MI_F1,     MI_B1,        MI_F2,      MI_B2,     MI_F3,       MI_B3,     MI_F4,        MI_B4,        MI_OCTU,
-        MO(15),     KC_LCTL,    KC_LALT,    KC_LGUI,    MI_BNDD,      MI_SUST,      MI_SUST,     MI_BNDU,     KC_NO,      MI_MODD,      MI_MODU,      MI_OCTD
-    ),
-
-    [9] = LAYOUT_ortho_5x12(
-        // Major scale           Vertical
-        //      1,       2,       3,       4,        5,       6,       7,       8,       9,        10,       11,     12,
-        KC_ESC,     MI_C,       MI_G,       MI_D1,     MI_A1,        MI_E2,      MI_B2,     MI_F3,       MI_C4,     MI_G4,        MI_D5,        MI_TR0,
-        KC_TAB,     MI_D,       MI_A,       MI_E1,     MI_B1,        MI_F2,      MI_C3,     MI_G3,       MI_D4,     MI_A4,        MI_E5,        MI_TRSU,
-        KC_SPC,     MI_E,       MI_B,       MI_F1,     MI_C2,        MI_G2,      MI_D3,     MI_A3,       MI_E4,     MI_B4,        MI_F5,        MI_TRSD,
-        MI_SUST,     MI_F,       MI_C1,     MI_G1,     MI_D2,        MI_A2,      MI_E3,     MI_B3,       MI_F4,     MI_C5,        MI_G5,        MI_OCTU,
-        MO(15),     KC_LCTL,    KC_LALT,    KC_LGUI,    MI_BNDD,      MI_SUST,      MI_SUST,     MI_BNDU,     KC_NO,      MI_MODD,      MI_MODU,      MI_OCTD
-    ),
-
-    [10] = LAYOUT_ortho_5x12(
-        // Black Keys            Vertical
-        //      1,       2,        3,        4,        5,        6,        7,        8,        9,        10,       11,     12,
-        KC_ESC,     MI_C,       MI_A,       MI_G1,     MI_F2,        MI_D3,      MI_C4,     MI_A4,       MI_G5,     KC_NO,         KC_NO,         MI_TR0,
-        KC_TAB,     MI_D,       MI_C1,     MI_A1,     MI_G2,        MI_F3,      MI_D4,     MI_C5,       MI_A5,     KC_NO,         KC_NO,         MI_TRSU,
-        KC_SPC,     MI_F,       MI_D1,     MI_C2,     MI_A2,        MI_G3,      MI_F4,     MI_D5,       KC_NO,      KC_NO,         KC_NO,         MI_TRSD,
-        MI_SUST,     MI_G,       MI_F1,     MI_D2,     MI_C3,        MI_A3,      MI_G4,     MI_F5,       KC_NO,      KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),     KC_LCTL,    KC_LALT,    KC_LGUI,    MI_BNDD,      MI_SUST,      MI_SUST,     MI_BNDU,     KC_NO,      MI_MODD,      MI_MODU,      MI_OCTD
-    ),
-
-
-    [11] = LAYOUT_ortho_5x12(
-        // Chromatic Scale       Horizontal
-        //1,    2,        3,        4,        5,        6,        7,        8,        9,        10,
-        KC_ESC,     MI_C,       MI_Cs,      MI_D,       MI_Ds,         MI_E,        MI_F,       MI_Fs,        MI_G,       MI_Gs,         MI_A,          MI_TR0,
-        KC_TAB,     MI_As,      MI_B,       MI_C1,     MI_Cs1,       MI_D1,      MI_Ds1,    MI_E1,       MI_F1,     MI_Fs1,       MI_G1,        MI_TRSU,
-        KC_SPC,     MI_Gs1,    MI_A1,     MI_As1,    MI_B1,        MI_C2,      MI_Cs2,    MI_D2,       MI_Ds2,    MI_E2,        MI_F2,        MI_TRSD,
-        MI_SUST,     MI_Fs2,    MI_G2,     MI_Gs2,    MI_A2,        MI_As2,     MI_B2,     MI_C3,       MI_Cs3,    MI_D3,        MI_Ds3,       MI_OCTU,
-        MO(15),     KC_LCTL,    KC_LALT,    KC_LGUI,    MI_BNDD,      MI_SUST,      MI_SUST,     MI_BNDU,     KC_NO,      MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-    [12] = LAYOUT_ortho_5x12(
-        // Pocket Operator Scale Horizontal
-        //1,    2,        3,        4,        5,         6,         7,         8,         9,         10,
-        KC_ESC,     MI_C,       MI_D,       MI_Ds,      MI_F,          MI_G,        MI_Gs,      MI_As,        MI_B,       MI_C1,        MI_D1,        MI_TR0,
-        KC_TAB,     MI_Ds1,    MI_F1,     MI_G1,     MI_Gs1,       MI_As1,     MI_B1,     MI_C2,       MI_D2,     MI_Ds2,       MI_F2,        MI_TRSU,
-        KC_SPC,     MI_G2,     MI_Gs2,    MI_As2,    MI_B2,        MI_C3,      MI_D3,     MI_Ds3,      MI_F3,     MI_G3,        MI_Gs3,       MI_TRSD,
-        MI_SUST,     MI_As3,    MI_B3,     MI_C4,     MI_D4,        MI_Ds4,     MI_F4,     MI_G4,       MI_Gs4,    MI_As4,       MI_B4,        MI_OCTU,
-        MO(15),     KC_LCTL,    KC_LALT,    KC_LGUI,    MI_BNDD,      MI_SUST,      MI_SUST,     MI_BNDU,     KC_NO,      MI_MODD,      MI_MODU,      MI_OCTD
-
-
-
-    ),
-
-
-    [13] = LAYOUT_ortho_5x12(
-        // Major scale           Horizontal
-        //1,      2,          3,          4,        5,        6,          7,         8,        9,        10,
-        KC_ESC,     MI_C,       MI_D,       MI_E,       MI_F,          MI_G,        MI_A,       MI_B,         MI_C1,     MI_D1,        MI_E1,        MI_TR0,
-        KC_TAB,     MI_F1,     MI_G1,     MI_A1,     MI_B1,        MI_C2,      MI_D2,     MI_E2,       MI_F2,     MI_G2,        MI_A2,        MI_TRSU,
-        KC_SPC,     MI_B2,     MI_C3,     MI_D3,     MI_E3,        MI_F3,      MI_G3,     MI_A3,       MI_B3,     MI_C4,        MI_D4,        MI_TRSD,
-        MI_SUST,     MI_E4,     MI_F4,     MI_G4,     MI_A4,        MI_B4,      MI_C5,     MI_D5,       MI_E5,     MI_F5,        MI_G5,        MI_OCTU,
-        MO(15),     KC_LCTL,    KC_LALT,    KC_LGUI,    MI_BNDD,      MI_SUST,      MI_SUST,     MI_BNDU,     KC_NO,      MI_MODD,      MI_MODU,      MI_OCTD
-
-
-    ),
-    [14] = LAYOUT_ortho_5x12(
-        // Black Keys            Horizontal
-        //1,        2,         3,         4,          5,        6,          7,         8,        9,        10,
-        KC_ESC,     MI_C,       MI_D,       MI_F,       MI_G,          MI_A,        MI_C1,     MI_D1,       MI_F1,     MI_G1,        MI_A1,        MI_TR0,
-        KC_TAB,     MI_C2,     MI_D2,     MI_F2,     MI_G2,        MI_A2,      MI_C3,     MI_D3,       MI_F3,     MI_G3,        MI_A3,        MI_TRSU,
-        KC_SPC,     MI_C4,     MI_D4,     MI_F4,     MI_G4,        MI_A4,      MI_C,       MI_D,         MI_F,       MI_G,          MI_A,          MI_TRSD,
-        MI_SUST,     KC_NO,      KC_NO,      KC_NO,      KC_NO,         KC_NO,       KC_NO,      KC_NO,        KC_NO,      KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),     KC_LCTL,    KC_LALT,    KC_LGUI,    MI_BNDD,      MI_SUST,      MI_SUST,     MI_BNDU,     KC_NO,      MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-
-
-
-
-
-
-    // Settings
-    [15] = LAYOUT_ortho_5x12(
-        DB_TOGG,    MI_CH1,     MI_CH2,     MI_CH3,     MI_CH4,        MI_CH5,      MI_CH6,     MI_CH7,       MI_CH8,     AU_TOGG,        KC_NO,         QK_BOOT,
-        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,         KC_NO,       KC_NO,      KC_NO,        KC_NO,      KC_NO,         KC_NO,         KC_NO,
-        RGB_MOD,    RGB_HUI,    RGB_SAI,    RGB_VAI,    RGB_SPI,       KC_NO,       DF(11),     DF(12),       DF(13),     DF(14),        KC_NO,         DB_TOGG,
-        RGB_RMOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,    RGB_SPD,       KC_NO,       DF(7),      DF(8),        DF(9),      DF(10),        KC_NO,         KC_NO,
-        KC_TRNS,    KC_NO,      KC_NO,      KC_NO,      KC_TRNS,       DF(0),       DF(0),      KC_TRNS,      KC_TRNS,    KC_NO,         KC_NO,         KC_NO
-    )
-
-
-};
-
diff --git a/keyboards/preonic/keymaps/dothtm60/rules.mk b/keyboards/preonic/keymaps/dothtm60/rules.mk
deleted file mode 100644
index 4745e5384a7..00000000000
--- a/keyboards/preonic/keymaps/dothtm60/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-
-MIDI_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/drasbeck/config.h b/keyboards/preonic/keymaps/drasbeck/config.h
deleted file mode 100644
index f84356478df..00000000000
--- a/keyboards/preonic/keymaps/drasbeck/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck 
- *
- * You are free to:
- *
- *  Share — copy and redistribute the material in any medium or format
- *  Adapt — remix, transform, and build upon the material
- *   for any purpose, even commercially.
- *
- * The licensor cannot revoke these freedoms as long as you follow the license terms.
-*/
-
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND) }//,
-                                 //  SONG(COLEMAK_SOUND),
-                                 //  SONG(DVORAK_SOUND)
-                                //}
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/drasbeck/keymap.c b/keyboards/preonic/keymaps/drasbeck/keymap.c
deleted file mode 100644
index f6844beabb3..00000000000
--- a/keyboards/preonic/keymaps/drasbeck/keymap.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) 2020 Max Drasbeck
- *
- * You are free to:
- *
- *  Share — copy and redistribute the material in any medium or format
- *  Adapt — remix, transform, and build upon the material
- *   for any purpose, even commercially.
- *
- * The licensor cannot revoke these freedoms as long as you follow the license terms.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  KC_ESC,  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, SC_SENT,
-  KC_LCTL, KC_NO, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_NUBS, KC_LCTL, KC_NO,   KC_NO
-),
-
-[_COLEMAK] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
-  KC_ESC,  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_ENT,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_DVORAK] = LAYOUT_preonic_grid(
-  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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-  KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO  , KC_PGUP, KC_MINS, KC_EQL,  KC_RBRC,
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NO,   KC_HOME, KC_PGDN, KC_END,  KC_NO,   KC_NUHS,
-  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INT1, KC_ENT,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-[_RAISE] = LAYOUT_preonic_grid(
-  KC_TRNS, RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5), RALT(KC_6), RALT(KC_7), RALT(KC_8), RALT(KC_9), RALT(KC_0), KC_DEL,
-  KC_TRNS, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_UP,      KC_MINS,    KC_EQL,     KC_RBRC,
-  KC_ESC,  KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_LEFT,    KC_DOWN,    KC_RGHT,    KC_NO,      KC_NUHS,
-  KC_LSFT, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_INT1,    SC_SENT,
-  KC_TRNS, KC_TRNS,    KC_TRNS,    KC_RALT,    KC_TRNS,    KC_TRNS,    KC_TRNS, RALT(KC_NUBS), KC_TRNS,   KC_VOLD,    KC_VOLU,     KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_COLEMAK);
-          }
-          return false;
-          break;
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DVORAK);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            writePinLow(E6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            writePinHigh(E6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/drasbeck/readme.md b/keyboards/preonic/keymaps/drasbeck/readme.md
deleted file mode 100644
index 4975ae8b708..00000000000
--- a/keyboards/preonic/keymaps/drasbeck/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# drasbeck's Preonic keymap
-Danish layout with Danish characters on default layer.
-
-```
-Default
-,-----------------------------------------------------------------------------------.
-|KC_GRV|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   | BSPC |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| TAB  |  q   |  w   |  e   |  r   |  t   |  y   |  u   |  i   | o    |  p   |  å   |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| ESC  |  a   |  s   |  d   |  f   |  g   |  h   |  j   |  k   |  l   |  æ   |  ø   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|L SHFT|  z   |  x   |  c   |  v   |  b   |  n   |  m   |  ,   |  .   |  -   |SFTENT|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|L CTRL|      | L ALT| L GUI| LOWER|    SPACE    | RAISE| NUBS | L CTL|      |      |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/preonic/keymaps/drasbeck/rules.mk b/keyboards/preonic/keymaps/drasbeck/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/drasbeck/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/egstad/config.h b/keyboards/preonic/keymaps/egstad/config.h
deleted file mode 100644
index 16a4c267e5c..00000000000
--- a/keyboards/preonic/keymaps/egstad/config.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-#define TAPPING_TERM 200
-
-
-
-
-
-/* Leader Key
-   ========================================================================== */
-
-// Activates the leader key
-// #define LEADER_PER_KEY_TIMING
-// resets the timeout after each key is tapped
-// #define LEADER_TIMEOUT 240
-
-
-
-
-
-
-/* Autoshifting
-   ========================================================================== */
-
-// This controls how long you have to hold a key before you get the shifted state.
-#define AUTO_SHIFT_TIMEOUT 150
-
-// Do not Auto Shift special keys -_, =+, [{, ]}, ;:, '", ,<, .>, and /?
-// #define NO_AUTO_SHIFT_SPECIAL
-
-// Do not Auto Shift numeric keys, zero through nine.
-#define NO_AUTO_SHIFT_NUMERIC
-
-// Do not Auto Shift alpha characters, which include A through Z.
-// #define NO_AUTO_SHIFT_ALPHA
-
-// Lower the Auto Shift timeout variable (down)
-// AS_DOWN
-
-// Raise the Auto Shift timeout variable (up)
-// AS_UP
-
-// Report your current Auto Shift timeout value
-// AS_RPT
-
-// Turns on the Auto Shift Function
-// AS_ON
-
-// Turns off the Auto Shift Function
-// AS_OFF
-
-// Toggles the state of the Auto Shift feature
-// AS_TOGG
-
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(COIN_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
diff --git a/keyboards/preonic/keymaps/egstad/keymap.c b/keyboards/preonic/keymaps/egstad/keymap.c
deleted file mode 100644
index 6d674cffdca..00000000000
--- a/keyboards/preonic/keymaps/egstad/keymap.c
+++ /dev/null
@@ -1,229 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-
-
-
-
-/* LAYER NAMES
-   ==========================================================================
-   1. To create a layer, define a (readable) name and set layer value
-   2. Under "Layer definitions" section, define keymaps
-   ========================================================================== */
-
-enum layer_names {
-    L_QWERTY,
-    L_LOWER,
-    L_RAISE,
-    L_ADJUST,
-};
-
-
-
-
-/* TAP DANCE
-   ==========================================================================
-   1. Define TD names here
-   2. Register action in tap_dance_actions[]
-   ========================================================================== */
-
-enum {
-  TD_BRC = 0,
-  TD_MIN,
-  TD_GV_ESC,
-  TD_BS
-};
-
-
-
-
-/* CUSTOM KEYMAPS
-   ========================================================================== */
-
-// Tap dances
-#define TD_ESCP TD(TD_GV_ESC)           // Tap for grave, twice for escape
-#define TD_MINS TD(TD_MIN)              // Tap for minus, twice for equal
-#define TD_BRAC TD(TD_BRC)              // Tap for open brace, twice for close
-
-// Layers
-#define LT2_TAB LT(L_RAISE, KC_TAB)     // Tap for tab, hold for RAISE
-#define LT2_ENT LT(L_RAISE, KC_ENT)     // Tap for enter, hold for RAISE
-#define LT1_BSP LT(L_LOWER, KC_BSPC)    // Tap for backspace, hold for LOWER
-#define LT1_SPC LT(L_LOWER, KC_SPC)     // Tap for space, hold for LOWER
-
-// Modifiers
-#define LG_ZMIN LGUI(KC_EQUAL)          // Command + plus (zoom in)
-#define LG_ZMOT LGUI(KC_MINUS)          // Command + minus (zoom out)
-#define MT_SHFT MT(MOD_RSFT, KC_ENT)    // Tap for enter, hold for shift
-#define MT_HILF S(A(KC_LEFT))           // Press for shift + alt + left
-#define MT_HIRT S(A(KC_RGHT))           // Press for shift + alt + right
-#define MT_UNTB S(KC_TAB)               // Press for shift + tab
-
-
-
-
-
-
-/* Layer definitions
-   ========================================================================== */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------------------------------------------------------------.
- * | ` ESC |  1 !  |  2 @  |  3 #  |  4 $  |  5 %  |  6 ^  |  7 &  |  8 *  |  9 (  |  0 )  | -_ =+ |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | TB/RS |   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   | [{ }] |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | BS/LW |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   ;   |   '   |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |  SFT  |   Z   |   X   |   C   |   V   |   B   |   N   |   M   |   ,   |   .   |   /   | SF/RN |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | LEADR |       |  CTL  |  ALT  |  CMD  |  BSP  | SP/LW | RN/RS |   ←   |   ↑   |   ↓   |   →   |
- * `-----------------------------------------------------------------------------------------------
- */
-
-[L_QWERTY] = LAYOUT_preonic_grid(
-/*01          02          03          04          05          06          07          08          09          10          11          12         */
-  TD_ESCP,    KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       TD_MINS,
-  LT2_TAB,    KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       TD_BRAC,
-  LT1_BSP,    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,    MT_SHFT,
-  LG_ZMOT,    LG_ZMIN,    KC_LCTL,    KC_LALT,    KC_LGUI,    KC_BSPC,    LT1_SPC,    LT2_ENT,    KC_LEFT,    KC_UP,      KC_DOWN,    KC_RGHT
-),
-
-
-
-
-
-
- /* LOWER
- * ,-----------------------------------------------------------------------------------------------.
- * | ASHFT |       |       |       |       |       |       |       |       |       |       |  BSP  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | UNTAB |       |       |       |       |       |       |   -   |   +   |   *   |   /   |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       | S+A+← | S+A+→ |       |       |       |       |   ←   |   ↑   |   ↓   |   →   |  RTN  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |  [ {  |  ] }  |   (   |   )   |  \ |  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |  >||  |       |  <<   | Vol-U | Vol-D |  >>   |
- * `-----------------------------------------------------------------------------------------------'
- */
-
-[L_LOWER] = LAYOUT_preonic_grid(
-/*01          02          03          04          05          06          07          08          09          10          11          12         */
-  AS_TOGG,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_BSPC,
-  MT_UNTB,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MINUS,   KC_PLUS,    KC_PAST,    KC_PSLS,    _______,
-  _______,    MT_HILF,    MT_HIRT,    _______,    _______,    _______,    _______,    KC_LEFT,    KC_UP,      KC_DOWN,    KC_RIGHT,   KC_ENTER,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_LBRC,    KC_RBRC,    KC_LPRN,    KC_RPRN,    KC_BSLS,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_MRWD,    KC_VOLU,    KC_VOLD,    KC_MFFD
-),
-
-
-
-
-
-
-/* RAISE
- * ,-----------------------------------------------------------------------------------------------.
- * | ASHFT | BTSDN | BTSUP |  VUP  |  VDN  |       |       |   /   |   *   |   (   |   )   |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |   7   |   8   |   9   |   +   |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |   4   |   5   |   6   |   -   |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |  CAP  |       |       |       |       |       |       |   1   |   2   |   3   |   /   |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |       |   0   |   .   |   ,   |       |
- * `-----------------------------------------------------------------------------------------------'
- */
-[L_RAISE] = LAYOUT_preonic_grid(
-/*01          02          03          04          05          06          07          08          09          10          11          12         */
-  AS_TOGG,    KC_F1,      KC_F2,      KC_VOLU,    KC_VOLD,    _______,    _______,    KC_PSLS,    KC_PAST,    KC_LPRN,    KC_RPRN,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P7,      KC_P8,      KC_P9,      KC_PLUS,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P4,      KC_P5,      KC_P6,      KC_MINUS,   _______,
-  KC_CAPS,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P1,      KC_P2,      KC_P3,      KC_PSLS,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P0,      KC_PDOT,    KC_COMM,    _______
-),
-
-
-
-
-
-
-
-/* Adjust (Raise + Lower together)
- * ,-----------------------------------------------------------------------------------------------.
- * |  F12  |  FN2  |  FN3  |  FN4  |  FN5  |  FN6  |  FN7  |  FN8  |  FN9  |  F10  |  F11  |  FN1  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |       |       |       |       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |       |       |       |       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | TOG SF|       |       |       |       |       |       |       |       |       |       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | DESGN |       |       |       |       |       |       |       |       |       |       |       |
- * `-----------------------------------------------------------------------------------------------'
- */
-
-[L_ADJUST] = LAYOUT_preonic_grid(
-/*01          02          03          04          05          06          07          08          09          10          11          12         */
-  KC_F12,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  AS_TOGG,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______
-)
-
-};
-
-// this function
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, L_LOWER, L_RAISE, L_ADJUST);
-}
-
-
-
-
-
-
-/* BLANK
- * ,-----------------------------------------------------------------------------------------------.
- * |       |       |       |       |       |       |       |       |       |       |       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |       |       |       |       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |       |       |       |       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |       |       |       |       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |       |       |       |       |       |
- * `-----------------------------------------------------------------------------------------------'
- */
-/*
-[L_BLANK] = LAYOUT_preonic_grid(
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______
-),
-*/
-
-
-
-
-
-
-/* Tap Dance Definitions
-   ========================================================================== */
-
-tap_dance_action_t tap_dance_actions[] = {
-  // Tap once for Left Brace, twice for Right Brace
-  [TD_BRC]  = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
-  //Tap once for Minus, twice for Equal
-  [TD_MIN]  = ACTION_TAP_DANCE_DOUBLE(KC_MINUS, KC_EQUAL),
-  // Tap once for Grave, tap twice for Escape
-  [TD_GV_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_GRAVE, KC_ESCAPE)
-};
diff --git a/keyboards/preonic/keymaps/egstad/readme.md b/keyboards/preonic/keymaps/egstad/readme.md
deleted file mode 100644
index 2c8e095a4e7..00000000000
--- a/keyboards/preonic/keymaps/egstad/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Egstad's Layout
-
-## Build
-
-- Cd into this directory, run `npm start`
-- Cd into root with `npm run qmk`, locate bin file "preonic_rev3_egstad.bin"
-- Drop that bin into QMK Toolbox and flash Keeb
-
-## Learnings
-
- 1. Combos — Don't fuck with 'em. They made my keys feel sticky and increased typos. Would be great on macropad or something tho!
diff --git a/keyboards/preonic/keymaps/egstad/rules.mk b/keyboards/preonic/keymaps/egstad/rules.mk
deleted file mode 100644
index 5348bfdf946..00000000000
--- a/keyboards/preonic/keymaps/egstad/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-TAP_DANCE_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/ekis_isa/config.h b/keyboards/preonic/keymaps/ekis_isa/config.h
deleted file mode 100644
index 5683fd47958..00000000000
--- a/keyboards/preonic/keymaps/ekis_isa/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/ekis_isa/keymap.c b/keyboards/preonic/keymaps/ekis_isa/keymap.c
deleted file mode 100644
index 340d9235b58..00000000000
--- a/keyboards/preonic/keymaps/ekis_isa/keymap.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum preonic_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-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  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_1x2uC(
-  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  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, KC_ENT,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | `Esc |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_1x2uC(
-  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_LCTL, 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_ENT,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | `ESC |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_1x2uC(
-  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_1x2uC(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END, _______,
-  _______, _______, _______, _______, _______,      _______,     _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_1x2uC(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______,      _______,     _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_1x2uC(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_COLEMAK);
-          }
-          return false;
-          break;
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DVORAK);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            PORTE &= ~(1<<6);
-          } else {
-            unregister_code(KC_RSFT);
-            PORTE |= (1<<6);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
diff --git a/keyboards/preonic/keymaps/ekis_isa/readme.md b/keyboards/preonic/keymaps/ekis_isa/readme.md
deleted file mode 100644
index e911968dd96..00000000000
--- a/keyboards/preonic/keymaps/ekis_isa/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default Preonic layout - largely based on the Planck's
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/elisiano/config.h b/keyboards/preonic/keymaps/elisiano/config.h
deleted file mode 100644
index 37858350a84..00000000000
--- a/keyboards/preonic/keymaps/elisiano/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/elisiano/keymap.c b/keyboards/preonic/keymaps/elisiano/keymap.c
deleted file mode 100644
index 5728894c431..00000000000
--- a/keyboards/preonic/keymaps/elisiano/keymap.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-  _MOUSE
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  EMOJI
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-// replaced BACKLIT with EMOJI since I have no LEDs
-[_QWERTY] = LAYOUT_preonic_grid(
-  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_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  CTL_T(KC_ESC), 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),
-  EMOJI,         KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_grid(
-  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_TAB,        KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
-  CTL_T(KC_ESC), 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, RSFT_T(KC_ENT),
-  EMOJI,         KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_grid(
-  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_TAB,        KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
-  CTL_T(KC_ESC), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT,       KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    RSFT_T(KC_ENT),
-  EMOJI,         KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   !  |   @  |   #  |   $  |   %  |   6  |   7  | SCLK |  UP  | PAUS | PGUP |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  | LFT  | DOWN | RGT  | PGDN |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_6,    KC_7,    KC_SCRL, KC_UP,   KC_PAUS,  KC_PGUP,
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN,
-  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_PGUP, KC_PGDN,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU,  KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| Mouse|      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______,    _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,     COLEMAK, DVORAK,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TG(_MOUSE), _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______
-),
-
-
-[_MOUSE] = LAYOUT_preonic_grid(
-  _______, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN3, XXXXXXX, XXXXXXX,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_WH_L, XXXXXXX, KC_WH_R, XXXXXXX,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case EMOJI:
-          if (record->event.pressed) {
-            tap_code16(C(G(KC_SPC)));
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_COLEMAK);
-          }
-          return false;
-          break;
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DVORAK);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      tap_code(KC_PGDN);
-    } else {
-      tap_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/elisiano/readme.md b/keyboards/preonic/keymaps/elisiano/readme.md
deleted file mode 100644
index 9cfeaa5dbd0..00000000000
--- a/keyboards/preonic/keymaps/elisiano/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Elisiano's Preonic layout - largely based on the Planck's
-
-All layouts are documented in comments
diff --git a/keyboards/preonic/keymaps/elisiano/rules.mk b/keyboards/preonic/keymaps/elisiano/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/elisiano/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/era1112/config.h b/keyboards/preonic/keymaps/era1112/config.h
deleted file mode 100644
index a30a7733c7a..00000000000
--- a/keyboards/preonic/keymaps/era1112/config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2022 Era James(@Era1112)
-// SPDX - License - Identifier: GPL - 2.0 - or -later
-
-#pragma once
-
-
-//----------- Default statements -----------//
-//------------------------------------------//
-#define MUSIC_MASK (keycode < 0xFF)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-
-//----------- Added statements -------------//
-//------------------------------------------//
-#define TAPPING_TERM 200                        // For tapdances
-
-// Commented to see if it helps stalls on clicky mode #define DYNAMIC_MACRO_NO_NESTING                // Improve dynamic macro stability
-#ifdef AUDIO_ENABLE
-	#define AUDIO_INIT_DELAY                    // to make startup audio work
-	#define STARTUP_SONG SONG(PREONIC_SOUND)
-	#define AUDIO_CLICKY                        // enable clicky mode
-
-	// Clicky mode parameters
-	#define AUDIO_CLICKY_FREQ_MIN 65.0f         // Default 65
-	#define AUDIO_CLICKY_FREQ_DEFAULT 800.0f    // Default 440
-	#define AUDIO_CLICKY_FREQ_MAX 1500.0f       // Defaul 1500
-	#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.0f   // Default 0.05
-	#define AUDIO_CLICKY_DELAY_DURATION 0.1f    // Default 1
-#endif  //AUDIO_ENABLE
-
-#define RGBLIGHT_SLEEP                  // RGB lights turn off when host sleeps
-
-// Firmware minimization
-
-// Commented to see if it helps stalls on clicky mode
-// #define NO_ACTION_ONESHOT
-// #undef LOCKING_SUPPORT_ENABLE
-// #undef LOCKING_RESYNC_ENABLE
-// #define NO_MUSIC_MODE
-// #define LAYER_STATE_8BIT        // Limits keymap to 8 layers
diff --git a/keyboards/preonic/keymaps/era1112/keymap.c b/keyboards/preonic/keymaps/era1112/keymap.c
deleted file mode 100644
index 74ba6772d5c..00000000000
--- a/keyboards/preonic/keymaps/era1112/keymap.c
+++ /dev/null
@@ -1,365 +0,0 @@
-// Copyright 2022 Era James(@Era1112)
-// SPDX - License - Identifier: GPL - 2.0 - or -later
-
-#include QMK_KEYBOARD_H                     // Default statement
-
-#define HSV_RETRO_CONSOLE   36, 150, 255    //HSV_YELLOW = 43, 255, 255
-
-
-//----------- RGB Default Settings -----------//
-//--------------------------------------------//
-#ifdef RGBLIGHT_ENABLE
-
-void keyboard_post_init_user(void) {
-    rgblight_enable_noeeprom(); // Enables RGB, without saving settings
-    rgblight_sethsv_noeeprom(HSV_RETRO_CONSOLE);
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-}
-
-#endif  // RGBLIGHT_ENABLE
-
-//----------- Layer names -----------//
-//-----------------------------------//
-enum preonic_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-
-//----------- Sounds -----------//
-//------------------------------//
-#ifdef AUDIO_ENABLE
-
-    float capslockToggleSound[][2] = SONG(STARTUP_SOUND);
-    float dynamicBufferRecordSound[][2] = SONG(STARTUP_SOUND);
-    float dynamicBufferFullSound[][2] = SONG(GOODBYE_SOUND);
-
-#endif  // AUDIO_ENABLE
-
-
-//----------- Called when dynamic buffer full -----------//
-//-------------------------------------------------------//
-void backlight_toggle(void) {
-#ifdef AUDIO_ENABLE
-
-    PLAY_SONG(dynamicBufferFullSound);
-
-#endif  // AUDIO_ENABLE
-}
-
-
-//----------- Tapdance prelims -----------//
-//----------------------------------------//
-typedef enum {
-    TD_NONE,
-    TD_UNKNOWN,
-    TD_1_TAP,
-    TD_1_HOLD,
-    TD_2_TAP,
-    TD_2_HOLD,
-} td_state_t;
-
-typedef struct {
-    bool is_press_action;
-    td_state_t state;
-} td_tap_t;
-
-td_state_t cur_dance(tap_dance_state_t* state);
-
-/* Return an integer that corresponds to what kind of tap dance should be executed.
- *
- * 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
- *  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
- *  has ended, but the key is still being pressed down. This generally means the key is being "held".
- *
- * One thing that is currenlty not possible with qmk software in regards to tap dance is to mimic the "permissive hold"
- *  feature. In general, advanced tap dances do not work well if they are used with commonly typed letters.
- *  For example "A". Tap dances are best used on non-letter keys that are not hit while typing letters.
- *
- * Good places to put an advanced tap dance:
- *  z,q,x,j,k,v,b, any function key, home/end, comma, semi-colon
- *
- * Criteria for "good placement" of a tap dance key:
- *  Not a key that is hit frequently in a sentence
- *  Not a key that is used frequently to double tap, for example 'tab' is often double tapped in a terminal, or
- *    in a web form. So 'tab' would be a poor choice for a tap dance.
- *  Letters used in common words as a double. For example 'p' in 'pepper'. If a tap dance function existed on the
- *    letter 'p', the word 'pepper' would be quite frustating to type.
- *
- * For the third point, there does exist the 'TD_DOUBLE_SINGLE_TAP', however this is not fully tested
- *
- */
-td_state_t cur_dance(tap_dance_state_t* state) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) {
-            return TD_1_TAP;
-        // Key has not been interrupted, but the key is still held. Means you want to send a 'HOLD'.
-        } else {
-        return TD_1_HOLD;
-        }
-    } else if (state->count == 2) {
-        // TD_DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
-        // action when hitting 'pp'. Suggested use case for this return value is when you want to send two
-        // keystrokes of the key, and not the 'double tap' action/macro.
-        if (state->pressed) return TD_2_HOLD;
-        else return TD_2_TAP;
-    } else {
-        return TD_UNKNOWN;
-    }
-}
-
-
-//----------- 2tap capslock --------------//
-//----------------------------------------//
-void twoCapsLock_finished(tap_dance_state_t* state, void* user_data);
-void twoCapsLock_reset(tap_dance_state_t* state, void* user_data);
-
-static td_tap_t twoCapsLock_tap_state = {
-    .is_press_action = true,
-    .state = TD_NONE
-};
-
-void twoCapsLock_finished(tap_dance_state_t* state, void* user_data) {
-    twoCapsLock_tap_state.state = cur_dance(state);
-    switch (twoCapsLock_tap_state.state) {
-    case TD_NONE: register_code(KC_LSFT); break;
-    case TD_UNKNOWN: register_code(KC_LSFT); break;
-    case TD_1_TAP: register_code(KC_LSFT); break;
-    case TD_1_HOLD: register_code(KC_LSFT); break;
-    case TD_2_TAP:
-        register_code(KC_CAPS);
-#ifdef AUDIO_ENABLE
-        PLAY_SONG(capslockToggleSound);
-#endif  // AUDIO_ENABLE
-        break;
-    case TD_2_HOLD: register_code(KC_LSFT); break;      
-    }
-}
-
-void twoCapsLock_reset(tap_dance_state_t* state, void* user_data) {
-    switch (twoCapsLock_tap_state.state) {
-    case TD_UNKNOWN: unregister_code(KC_LSFT); break;
-    case TD_NONE: unregister_code(KC_LSFT); break;
-    case TD_1_TAP: unregister_code(KC_LSFT); break;
-    case TD_1_HOLD: unregister_code(KC_LSFT); break;
-    case TD_2_TAP:
-        unregister_code(KC_CAPS);
-#ifdef AUDIO_ENABLE
-        PLAY_SONG(capslockToggleSound);
-#endif  // AUDIO_ENABLE
-        break;
-    case TD_2_HOLD: unregister_code(KC_LSFT); break;
-    }
-    twoCapsLock_tap_state.state = TD_NONE;
-}
-
-
-//----------- Rotary Encoder --------------//
-//----------------------------------------//
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (layer_state_is(_QWERTY)) {
-        if (clockwise) {
-            tap_code(KC_WH_U);
-        } else {
-            tap_code(KC_WH_D);
-        }
-    }
-    else if (layer_state_is(_LOWER)) {
-        if (clockwise) {
-            tap_code16(S(KC_F3));
-        } else {
-            tap_code(KC_F3);
-        }
-    } else if (layer_state_is(_RAISE)) {
-        if (clockwise) {
-            tap_code16(C(KC_Z));
-        } else {
-            tap_code16(C(KC_Y));
-        }
-    }
-    return false;
-}
-
-//----------- Custom keycodes ------------//
-//----------------------------------------//
-enum {
-    TD_2_CAPSLOCK
-};
-
-enum custom_keycodes {
-    CU_BLNKON = SAFE_RANGE,
-    CU_BLNKOFF,
-    CU_RGBON,
-    CU_RGBOFF,
-    ENC_MODE
-};
-
-static bool blinky = false;         // Track blinky behavior on/off for keycode
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_2_CAPSLOCK] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, twoCapsLock_finished, twoCapsLock_reset)
-};
-
-
-//----------- Intercepts and overrides ------------//
-//-------------------------------------=-----------//
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-    // Turn RGB LEDs off
-    case CU_RGBOFF:
-
-        // If pressed
-        if (record->event.pressed) {
-            rgblight_sethsv_noeeprom(HSV_OFF);   
-            return true;
-
-        // If released
-        } else {
-            return true;
-        }
-
-    // Turn RGB LEDs on
-    case CU_RGBON:
-
-        // If pressed
-        if (record->event.pressed) {
-            rgblight_sethsv_noeeprom(HSV_RETRO_CONSOLE);  
-            return true;
-
-        // If released
-        } else {
-            return true;
-        }
-
-    // Turn blinky LEDs off
-    case CU_BLNKOFF:
-
-        // If pressed
-        if (record->event.pressed) {
-            blinky = false;
-            return true;
-
-        // If released
-        } else {
-            return true;
-        }
-
-    // Turn blinky LEDs on
-    case CU_BLNKON:
-
-        // If pressed
-        if (record->event.pressed) {
-            blinky = true;
-            return true;
-
-        // If released
-        } else {
-            return true;
-        }
-
-    // Sound when Dynamic recording started
-    case QK_DYNAMIC_MACRO_RECORD_START_1:
-
-        // If pressed
-        if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(dynamicBufferRecordSound);
-        #endif  // AUDIO_ENABLE
-            return true; // Let QMK send the press/release events
-
-        // If released
-        } else {
-            return true; // Let QMK send the press/release events
-        }
-
-    // Sound when Dynamic recording stopped
-    case QK_DYNAMIC_MACRO_RECORD_STOP:
-
-        // If pressed
-        if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(dynamicBufferFullSound); 
-        #endif  // AUDIO_ENABLE
-            return true; // Let QMK send the enter press/release events
-
-        // If released
-        } else {
-            return true; // Let QMK send the press/release events
-        }
-
-    // Encoder Click
-    case ENC_MODE:
-        if (record->event.pressed) {
-            if (layer_state_is(_QWERTY)) {
-                tap_code(KC_BTN1);
-                return false;
-            } else if (layer_state_is(_LOWER)) {
-                return false;
-            } else if (layer_state_is(_RAISE)) {
-                return false;
-            }
-        }
-
-
-    // Adds blinks if blinky is on
-    default:
-        if (blinky == true) {
-            rgblight_toggle();
-        }
-
-    return true; // Process all other keycodes normally
-
-    }
-}
-
-
-//----------- Keymap ------------//
-//-------------------------------//
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    // main layer
-    [_QWERTY] = LAYOUT_ortho_5x12 (
-        // (Non-disabled top row), uncomment and replace if you want preonic-style instead of planck-style
-        // KC_MINS,            KC_1,           KC_2,           KC_3,           KC_4,           KC_5,           KC_6,           KC_7,           KC_8,       KC_9,       KC_0,       KC_EQL,
-		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_TAB,             KC_Q,           KC_W,           KC_E,           KC_R,           KC_T,           KC_Y,           KC_U,           KC_I,       KC_O,       KC_P,       KC_BSPC,
-        KC_ESC,             KC_A,           KC_S,           KC_D,           KC_F,           KC_G,           KC_H,           KC_J,           KC_K,       KC_L,       KC_SCLN,    KC_ENT,
-        KC_LSFT,            KC_Z,           KC_X,           KC_C,           KC_V,           KC_B,           KC_N,           KC_M,           KC_COMM,    KC_DOT,     KC_SLSH,    TD(TD_2_CAPSLOCK),
-        ENC_MODE,           KC_LCTL,        KC_LGUI,        KC_LALT,        MO(_LOWER),     KC_SPC,         KC_SPC,         MO(_RAISE),     KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT
-    ),
-
-    // lower key
-    [_LOWER] = LAYOUT_ortho_5x12 (
-        DM_PLY1,            DM_REC1,        DM_RSTP,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,
-        KC_TRNS,            KC_1,           KC_2,           KC_3,           KC_4,           KC_5,           KC_6,           KC_7,               KC_8,           KC_9,       KC_0,       KC_DEL,
-        KC_BSPC,            KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,          KC_QUOT,            KC_GRV,         KC_LCBR,    KC_RCBR,    KC_TRNS,
-        KC_TRNS,            KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_MINS,            KC_EQL,         KC_TRNS,    KC_BSLS,    KC_TRNS,
-        KC_TRNS,            KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        MO(_ADJUST),        KC_HOME,        KC_PGDN,    KC_PGUP,    KC_END
-    ),
-
-    // raise key
-    [_RAISE] = LAYOUT_ortho_5x12 (
-        DM_PLY1,            DM_REC1,        DM_RSTP,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,
-        KC_TRNS,            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_DQUO,            KC_TILD,        KC_LBRC,    KC_RBRC,    KC_TRNS,
-        KC_TRNS,            KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_UNDS,            KC_PLUS	,       KC_TRNS,    KC_PIPE,    KC_TRNS,
-        KC_TRNS,            KC_TRNS,        KC_TRNS,        KC_TRNS,        MO(_ADJUST),    KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_MUTE,        KC_VOLD,    KC_VOLU,    KC_F24
-    ),
-
-    // hardware adjust layer, raise+lower
-    [_ADJUST] = LAYOUT_ortho_5x12 (
-        AU_ON,              AU_OFF,          CK_ON,           CK_OFF,          KC_NO,           KC_NO,           KC_NO,       KC_NO,           KC_NO,       KC_NO,       KC_NO,       KC_NO,
-																																															
-        CU_RGBON,           CU_RGBOFF,       CU_BLNKON,       CU_BLNKOFF,      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,       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,           KC_NO,       KC_NO,           KC_NO,       KC_NO,       KC_NO,       KC_NO
-    )
-    
-};
diff --git a/keyboards/preonic/keymaps/era1112/readme.md b/keyboards/preonic/keymaps/era1112/readme.md
deleted file mode 100644
index 76775b85aa6..00000000000
--- a/keyboards/preonic/keymaps/era1112/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-A preonic keymap that includes:
-- doubletap tapdance for caps lock
-- rotary encoder
-- macro record/playback
-- light on/off
-- sound on/off
-- blink-on-keypress w/ on/off keystroke
-- beep-on-keypress w/ on/off keystroke (this has stability issues when typing fast, still trying to remediate)
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/era1112/rules.mk b/keyboards/preonic/keymaps/era1112/rules.mk
deleted file mode 100644
index 4e83382dad4..00000000000
--- a/keyboards/preonic/keymaps/era1112/rules.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright 2022 Era James (@Era1112)
-## SPDX-License-Identifier: GPL-2.0-or-later
-
-# DEFAULT STATEMENTS
-# ==================
-
-SRC += muse.c
-
-
-# ADDED STATEMENTS
-# ================
-
-AUDIO_ENABLE = yes          # Audio output on
-TAP_DANCE_ENABLE = yes		# For double-tap tapdances
-DYNAMIC_MACRO_ENABLE = yes	# For dynamuic macros
-RGBLIGHT_ENABLE = yes		# For RGB lighting functions
-ENCODER_ENABLE = yes		# For Rotary encoders
-
-
-# Firmware minimization
-# Commented to see if it helps stalls on clicky mode 													 
-CONSOLE_ENABLE = no
-#LTO_ENABLE = yes
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no 
-MAGIC_ENABLE = no
diff --git a/keyboards/preonic/keymaps/fig-r/config.h b/keyboards/preonic/keymaps/fig-r/config.h
deleted file mode 100644
index fa5a6dd4245..00000000000
--- a/keyboards/preonic/keymaps/fig-r/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/preonic/keymaps/fig-r/keymap.c b/keyboards/preonic/keymaps/fig-r/keymap.c
deleted file mode 100644
index 210d3b94cb7..00000000000
--- a/keyboards/preonic/keymaps/fig-r/keymap.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Copyright 2015-2017 Fig
- *
- * 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 preonic_layers {
-  _DVORAK,
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-  _COMMAND
-};
-
-enum preonic_keycodes {
-  DVORAK = SAFE_RANGE,
-  QWERTY,
-  LOWER,
-  RAISE,
-  COMMAND
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | `    | 1    | 2    | 3    | 4    | 5    | 6    | 7    | 8    | 9    | 0    | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  | '    | ,    | .    | P    | Y    | F    | G    | C    | R    | L    | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | A    | O    | E    | U    | I    | D    | H    | T    | N    | S    | /    |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| ;    | Q    | J    | K    | X    | B    | M    | W    | V    | Z    |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Cmd  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down | Up   |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_grid(
-  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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-  COMMAND, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | `    | 1    | 2    | 3    | 4    | 5    | 6    | 7    | 8    | 9    | 0    | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  | Q    | W    | E    | R    | T    | Y    | U    | I    | O    | P    | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  | A    | S    | D    | F    | G    | H    | J    | K    | L    | ;    | '    |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| Z    | X    | C    | V    | B    | N    | M    | ,    | .    | /    |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Cmd  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down | Up   |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  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,
-  COMMAND, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | F1   | F2   | F3   | F4   | F5   | F6   | F7   | F8   | F9   | F10  | F11  | F12  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ~    | !    | @    | #    | $    | %    | ^    | &    | *    | (    | )    | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | `    |      |CtrlS |CtrlY |CtrlZ |      |      | _    | +    | {    | }    | |    |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |CtrlX |CtrlC |CtrlV |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home | Down | Up   | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  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_TILD, KC_EXLM, KC_AT,      KC_HASH,    KC_DLR,     KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  KC_GRV,  _______, LCTL(KC_S), LCTL(KC_Y), LCTL(KC_Z), _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, _______, LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______,    _______,    _______,    _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | F1   | F2   | F3   | F4   | F5   | F6   | F7   | F8   | F9   | F10  | F11  | F12  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ~    | !    | @    | #    | $    | %    | ^    | &    | *    | (    | )    | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | `    |      |      |      |      |      |      | -    | =    | [    | ]    | \    |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  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_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  KC_GRV,  _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Reset |Debug |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |MusMod|AudOn |AudOff|AGNorm|AGSwap|Qwerty|Dvorak|      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|MusOn |MusOff|MidOn |MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  DVORAK,  _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Cmd
-* ,-----------------------------------------------------------------------------------.
-* |      |      |      |      |      |      |      |      |      |      |      |      |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |      |      |      |      |      |      |      |      |      |      |      |      |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |      |      |      |      |      |      |      |      |      |      |      |      |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |      |      |      |      |      |      |      |      |      |      |      |      |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* |      |      |      |      |      |             |      |      |      |      |      |
-* `-----------------------------------------------------------------------------------'
- */
-[_COMMAND] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DVORAK);
-          }
-          return false;
-          break;
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case COMMAND:
-          if (record->event.pressed) {
-            layer_on(_COMMAND);
-          } else {
-            layer_off(_COMMAND);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
diff --git a/keyboards/preonic/keymaps/fig-r/readme.md b/keyboards/preonic/keymaps/fig-r/readme.md
deleted file mode 100644
index 16d752b79db..00000000000
--- a/keyboards/preonic/keymaps/fig-r/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Fig-r Preonic layout.
-
-Not designed!
-
-Version 1:
-
-Use Dvorak layout by default.
-
-_COMMAND layout is to work with sxhkd.
diff --git a/keyboards/preonic/keymaps/fsck/config.h b/keyboards/preonic/keymaps/fsck/config.h
deleted file mode 100644
index 2051a850cf2..00000000000
--- a/keyboards/preonic/keymaps/fsck/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-
-#define MIDI_BASIC
diff --git a/keyboards/preonic/keymaps/fsck/keymap.c b/keyboards/preonic/keymaps/fsck/keymap.c
deleted file mode 100644
index c05e552786e..00000000000
--- a/keyboards/preonic/keymaps/fsck/keymap.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |Brite | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  KC_ESC,  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, BACKLIT, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Vol- | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | ALTGr|      |             |      | Home |Pg Dn |Pg Up | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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_VOLD,KC_VOLU,_______,
-  _______, _______, _______, KC_RALT, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / | Vol- | Vol+ |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | ALTGr|      |             |      | Home |Pg Dn |Pg Up | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  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_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_VOLD, KC_VOLU, _______,
-  _______, _______, _______, KC_RALT, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            PORTE &= ~(1<<6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            PORTE |= (1<<6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/fsck/readme.md b/keyboards/preonic/keymaps/fsck/readme.md
deleted file mode 100644
index e459884eb6a..00000000000
--- a/keyboards/preonic/keymaps/fsck/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![preonic:fsck Layout Image](https://i.imgur.com/nI8fBco.png)
-
-# fsck's Preonic Layout
-
-This is based on the fsck layout for the Planck keyboard and similar to the Preonic default layout.
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/fsck/rules.mk b/keyboards/preonic/keymaps/fsck/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/fsck/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/guillermoap/config.h b/keyboards/preonic/keymaps/guillermoap/config.h
deleted file mode 100644
index d336623c032..00000000000
--- a/keyboards/preonic/keymaps/guillermoap/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2023 Guillermo Aguirre
- *
- * 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(PREONIC_SOUND)
-// #define STARTUP_SONG SONG(NO_SOUND)
-
-#    define DEFAULT_LAYER_SONGS \
-        { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
diff --git a/keyboards/preonic/keymaps/guillermoap/keymap.c b/keyboards/preonic/keymaps/guillermoap/keymap.c
deleted file mode 100644
index 066c986c150..00000000000
--- a/keyboards/preonic/keymaps/guillermoap/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Copyright 2023 Guillermo Aguirre
- *
- * 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"
-
-enum preonic_layers {
-    _BASE,
-    _GAMING,
-    _LOWER,
-    _RAISE,
-    _CONFIG,
-};
-
-enum preonic_keycodes {
-    BASE = SAFE_RANGE,
-    GAMING,
-    LOWER,
-    RAISE,
-    CONFIG,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Base
- * ,------------------------------------------------------------------------------------------.
- * | Esc         |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |-------------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab         |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |-------------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl        |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |-------------+------+------+------+------+------|------+------+------+------+------+------|
- * | HOLD Shift  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |  /   |
- * | TOGGLE Caps |      |      |      |      |      |      |      |      |      |      |      |
- * |-------------+------+------+------+------+------+------+------+------+------+------+------|
- * | GUI         |  `   |  Alt |Lower |Enter |Enter |Space |Space |Raise | Left | Down |Right |
- * `------------------------------------------------------------------------------------------'
- */
-[_BASE] = LAYOUT_preonic_grid(
-  KC_ESC,          KC_1,   KC_2,            KC_3,  KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    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_BSLS,
-  KC_LCTL,         KC_A,   KC_S,            KC_D,  KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  LSFT_T(KC_CAPS), KC_Z,   KC_X,            KC_C,  KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_UP,   KC_SLSH,
-  KC_LGUI,         KC_GRV, LALT_T(KC_RALT), MO(2), KC_ENT, KC_ENT, KC_SPC, KC_SPC, MO(3),   KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Gaming
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  `   |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  |  Alt |Lower |Space |Space |Enter |Enter |Raise | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAMING] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_1,    KC_2,    KC_3,  KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    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_BSLS,
-  KC_GRV,  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_UP,   KC_SLSH,
-  KC_LCTL, KC_LGUI, KC_LALT, MO(2), KC_SPC, KC_SPC, KC_ENT, KC_ENT, MO(3),   KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ▽  |   ▽  | Mute |Vol + | Play |   ▽  |   ▽  |   _  |   +  |   {  |   }  |  \   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ▽  |   ▽  | Prev |Vol - | Next |   ▽  |   ▽  |   -  |   =  |   [  |   ]  |  ▽   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   ▽  |CTRL_Z|   ▽  |CTRL_C|   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |CONFIG|   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  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_MUTE, KC_VOLU,    KC_MPLY, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS,
-  KC_TRNS, KC_TRNS,    KC_MPRV, KC_VOLD,    KC_MNXT, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_TRNS,
-  KC_TRNS, LCTL(KC_Z), KC_TRNS, LCTL(KC_C), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS,    KC_TRNS, TG(4),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   {  |   }  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ▽  |   6  |   7  |   8  |   9  |   0  |   ▽  |   ▽  |  Up  |   [  |   ]  |   ▽  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ctrl |   1  |   2  |   3  |   4  |   5  |   ▽  | Left | Down |Right |   ▽  |   ▽  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  | Home | End  | PgUp |PgDown|   ▽  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  GUI |PrntSc|R Alt |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_DEL,
-  KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS, KC_TRNS, KC_UP,   KC_LBRC, KC_RBRC, KC_TRNS,
-  KC_LCTL, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,
-  KC_RSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_TRNS,
-  KC_RGUI, KC_PSCR, KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-/* Config
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ▽  | Reset| Debug|   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ▽  |   ▽  |   ▽  |Aud on|AudOff|CGnorm|CGswap| Base |Gaming|   ▽  |   ▽  |   ▽  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   ▽  |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |   ▽  |
- * `-----------------------------------------------------------------------------------'
- */
-[_CONFIG] = LAYOUT_preonic_grid(
-  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, QK_BOOT, DB_TOGG, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-  KC_TRNS, KC_TRNS, MU_MOD,  AU_ON,   AU_OFF,   CG_NORM, CG_SWAP, DF(0),   DF(1),   KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,   MI_ON,   MI_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-)
-};
-
-/* Encoder
- * Currently using ENCONDER_MAP_ENABLE
- */
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] =   { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) },       // Mouse Scroll Down | Mouse Scroll Up
-    [_GAMING] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) },       // Mouse Scroll Down | Mouse Scroll Up
-    [_LOWER] =  { ENCODER_CCW_CW(LCTL(KC_TAB), LCTL(LSFT(KC_TAB))) }, // Ctrl + Tab        | Ctrl + Shift + Tab
-    [_RAISE] =  { ENCODER_CCW_CW(KC_MS_WH_LEFT, KC_MS_WH_RIGHT) },    // Mouse Scroll Left | Mouse Scroll Right
-    [_CONFIG] =  { },
-};
-#endif
-
-/* Default music config
- * Don't really understand what this does
- */
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_CONFIG);
-            } else {
-                layer_off(_CONFIG);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/preonic/keymaps/guillermoap/readme.md b/keyboards/preonic/keymaps/guillermoap/readme.md
deleted file mode 100644
index 29076523382..00000000000
--- a/keyboards/preonic/keymaps/guillermoap/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Preonic Double Spacebar HHKB layout mainly for programming
-This layout is highly curated to my needs and what I like. I mainly use it for programming in macOS, but also gaming in Windows.
-
-The main concept behind every key position is to be able to maximize how many things I can do without lifting my hands from the home row.
-## Layers
-### Base
-- Ctrl/Cmd is on the Caps Lock place (HHKB like)
-- Enter and Space are in the double space bar
-- Normal arrows position (not vim-like)
-- Left Shift on hold - Caps Lock Toggle on tap
-- Vertical scroll on encoder
-### Gaming
-- Switched Enter and Space to reach more easily when gaming
-- Left Shift doesn't have Caps Lock toggle
-- ` is in Ctrl space, mainly used for Push To Talk in games
-### Lower
-- Main programming symbols with right hand
-- Media controls with left hand
-- Full F1..F12 Function keys on number row
-- Ctrl + C | Ctrl + Z Macros to avoid having to constantly press encoder
-- Ctrl + Tab | Ctrl + Shift + Tab on encoder
-### Raise
-- Arrow keys on JKLI
-- Home End PgUp PgDown on M,.Up
-- Numbers on asdfgqwert
-- Del on BackSpace
-- Horizontal scroll on encoder
-### Config
-- Swap Ctrl and GUI on H so I have Cmd next to KC_A when on MacOS
-- Unswap Ctrl and GUI on G so I have Ctrl next to KC_A when on Windows
-- J switches to BASE layer
-- K switches to GAMING layer
-- Default Config for Preonic
diff --git a/keyboards/preonic/keymaps/guillermoap/rules.mk b/keyboards/preonic/keymaps/guillermoap/rules.mk
deleted file mode 100644
index da6657c8bdc..00000000000
--- a/keyboards/preonic/keymaps/guillermoap/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/jacwib/config.h b/keyboards/preonic/keymaps/jacwib/config.h
deleted file mode 100644
index 23e9e0ed28f..00000000000
--- a/keyboards/preonic/keymaps/jacwib/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define FORCE_NKRO 1
-
-#endif
diff --git a/keyboards/preonic/keymaps/jacwib/keymap.c b/keyboards/preonic/keymaps/jacwib/keymap.c
deleted file mode 100644
index 694c44b3c74..00000000000
--- a/keyboards/preonic/keymaps/jacwib/keymap.c
+++ /dev/null
@@ -1,238 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_nordic.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.
-#define _QWERTY 0
-#define _LOWER 3
-#define _RAISE 4
-#define _MQWERTY 5
-#define _MLOWER 8
-#define _MRAISE 9
-#define _ADJUST 16
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  MQWERTY,
-  MLOWER,
-  MRAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   +  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  Å   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   Ö  |  Ä   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   <  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   .  |   ,  |  -   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |AltGr |Lower | Space| Enter|Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    NO_PLUS, KC_BSPC,
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    NO_AM,
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    NO_AE,   NO_OSLH,
-  KC_LSFT, NO_LESS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, NO_MINS,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_ALGR, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |   @  |   £  |   $  |      |      |   {  |   [  |   ]  |   }  |   \  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |VolUp |      |      |  ~   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |LastS |PauseP|NextS |      |  *   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   |  |      |      |      |      |      |      |VolDwn|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |Bspc  |      |      |PgDn  |PgUp  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  _______, NO_AT,   NO_PND,  NO_DLR,  _______, _______, NO_LCBR, NO_LBRC, NO_RBRC, NO_RCBR, NO_BSLS, KC_DEL,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, NO_TILD,
-  _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, LSFT(KC_BSLS),
-  _______, NO_PIPE, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_BSPC, _______, _______, KC_PGDN, KC_PGUP, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   !  |   "  |   #  |   ¤  |   %  |   &  |   /  |   (  |   )  |   =  |   ?  | Ins  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Mouse^|      |      |      |      |ScrlUp|      |      |  ^   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |Mouse<|MouseV|Mouse>|      |      |MLC   |MMC   |MRC   |   '  |  ¨   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   >  |      |      |      |      |      |      |ScrlDown| :  |  ;   |  _   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |Bspc  |      |      |      | PgDn | PgUp |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  LSFT(KC_1),NO_QUO2,LSFT(KC_3), NO_BULT,LSFT(KC_5), NO_AMPR, NO_SLSH, NO_LPRN, NO_RPRN, NO_EQL,  NO_QUES, KC_INS,
-  _______, _______, _______, KC_MS_U, _______, _______, _______, _______, KC_WH_U, _______, _______, NO_CIRC,
-  _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, NO_APOS, NO_QUOT,
-  _______, NO_GRTR, _______, _______, _______, _______, _______, _______, KC_WH_D, NO_COLN, NO_SCLN, NO_UNDS,
-  _______, _______, _______, _______, _______, KC_BSPC, _______, _______, _______, KC_PGDN, KC_PGUP, _______
-),
-
-/* Mac Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   +  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  Å   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   Ö  |  Ä   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   <  |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   .  |   ,  |  -   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  |AltGr |Lower | Space| Enter|Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_MQWERTY] = LAYOUT_preonic_grid(
-  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    NO_PLUS, KC_BSPC,
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    NO_AM,
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    NO_AE,   NO_OSLH,
-  KC_LSFT, NO_LESS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, NO_MINS,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_ALGR, MLOWER,  KC_SPC,  KC_ENT,  MRAISE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Mac Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |   @  |   £  |   $  |      |      |   {  |   [  |   ]  |   }  |   \  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |VolUp |      |      |  ~   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |LastS |PauseP|NextS |      |  *   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   |  |      |      |      |      |      |      |VolDwn|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |Bspc  |      |      |PgDn  |PgUp  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MLOWER] = LAYOUT_preonic_grid(
-  _______, NO_AT,   NO_PND,  NO_DLR,  _______, _______, LSFT(LALT(KC_8)), NO_LBRC, NO_RBRC, LSFT(LALT(KC_9)), LSFT(LALT(KC_7)), KC_DEL,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, NO_TILD,
-  _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, LSFT(KC_BSLS),
-  _______, NO_LBRC, _______, _______, _______, _______, _______, _______, KC_VOLD, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_BSPC, _______, _______, KC_PGDN, KC_PGUP, _______
-),
-
-/* Mac Raise
- * ,-----------------------------------------------------------------------------------.
- * |   !  |   "  |   #  |   ¤  |   %  |   &  |   /  |   (  |   )  |   =  |   ?  | Ins  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Mouse^|      |      |      |      |ScrlUp|      |      |  ^   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |Mouse<|MouseV|Mouse>|      |      |MLC   |MMC   |MRC   |   '  |  ¨   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   >  |      |      |      |      |      |      |ScrlDown| :  |  ;   |  _   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |Bspc  |      |      |      | PgDn | PgUp |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_MRAISE] = LAYOUT_preonic_grid(
-  LSFT(KC_1),NO_QUO2,LSFT(KC_3), NO_BULT,LSFT(KC_5), NO_AMPR, NO_SLSH, NO_LPRN, NO_RPRN, NO_EQL,  NO_QUES, KC_INS,
-  _______, _______, _______, KC_MS_U, _______, _______, _______, _______, KC_WH_U, _______, _______, NO_CIRC,
-  _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, NO_APOS, NO_QUOT,
-  _______, NO_GRTR, _______, _______, _______, _______, _______, _______, KC_WH_D, NO_COLN, NO_SCLN, NO_UNDS,
-  _______, _______, _______, _______, _______, KC_BSPC, _______, _______, _______, KC_PGDN, KC_PGUP, _______
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | Reset|      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |Rshift|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |MusOn |MusOff|      |      |      |      |NrmMode|MacMode|    |      | Reset|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT,
-  _______, MU_ON,   MU_OFF,  _______, _______, _______, _______, TO(0),   TO(5),   _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case MQWERTY:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_MQWERTY);
-          }
-          return false;
-          break;
-        case MLOWER:
-          if (record->event.pressed) {
-            layer_on(_MLOWER);
-            update_tri_layer(_MLOWER, _MRAISE, _ADJUST);
-          } else {
-            layer_off(_MLOWER);
-            update_tri_layer(_MLOWER, _MRAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case MRAISE:
-          if (record->event.pressed) {
-            layer_on(_MRAISE);
-            update_tri_layer(_MLOWER, _MRAISE, _ADJUST);
-          } else {
-            layer_off(_MRAISE);
-            update_tri_layer(_MLOWER, _MRAISE, _ADJUST);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
diff --git a/keyboards/preonic/keymaps/jacwib/readme.md b/keyboards/preonic/keymaps/jacwib/readme.md
deleted file mode 100644
index 8658d6cdd74..00000000000
--- a/keyboards/preonic/keymaps/jacwib/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Jacwib's preonic keymap.
-
-Designed for use with a swedish language.
-
-Version 1.1:
-
-Added PgUp and PgDn keys.
-
-Also added "Mac mode". Unsure if it even works. Might however be able to test soon.
-
-Version 1.2:
-
-Changed around alt and super keys.
-
-Made "Mac mode" function, and tested it! (It works)
diff --git a/keyboards/preonic/keymaps/jacwib/rules.mk b/keyboards/preonic/keymaps/jacwib/rules.mk
deleted file mode 100644
index fc265296522..00000000000
--- a/keyboards/preonic/keymaps/jacwib/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # 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 = no        # Enable WS2812 RGB underlight. 
-
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/preonic/keymaps/jpe230/config.h b/keyboards/preonic/keymaps/jpe230/config.h
deleted file mode 100644
index 70cb9d826b2..00000000000
--- a/keyboards/preonic/keymaps/jpe230/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@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
-
-#ifdef AUDIO_ENABLE
-#define STARTUP_SONG SONG(ODE_TO_JOY)
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-#define ENABLE_COMPILE_KEYCODE
-#define AUDIO_ENABLE_TONE_MULTIPLEXING
-#define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/jpe230/jpe230.h b/keyboards/preonic/keymaps/jpe230/jpe230.h
deleted file mode 100644
index b53239bd31b..00000000000
--- a/keyboards/preonic/keymaps/jpe230/jpe230.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@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/>.
-*/
-
-enum jpe230_keycodes {
-  KC_LSRS = QK_KB_0,
-  KC_LERS,
-  KC_LSRE
-};
-
-#define LEFT_BAR 0, 9, 5
-#define RIGHT_BAR 0, 9, 1
-
-float song_lsrs[][2] = SONG(QWERTY_SOUND);
-float song_lers[][2] = SONG(COLEMAK_SOUND);
-float song_lsre[][2] = SONG(DVORAK_SOUND);
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/jpe230/keymap.c b/keyboards/preonic/keymaps/jpe230/keymap.c
deleted file mode 100644
index a5f459b5874..00000000000
--- a/keyboards/preonic/keymaps/jpe230/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@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
-#include "jpe230.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_preonic_grid(
-  //,-----------------------------------------------------------------------------------------------------------.
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  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_BSPC,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      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,  KC_ESC,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      KC_LBRC, KC_RBRC, KC_LGUI,   MO(1), _______,  KC_SPC, _______,  KC_ENT,   MO(2), KC_RALT, KC_MINS,  KC_EQL
-  //`-----------------------------------------------------------------------------------------------------------'
-  ),
-
-  [1] = LAYOUT_preonic_grid(
-  //,-----------------------------------------------------------------------------------------------------------.
-       KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-       KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______,   CK_UP, AU_TOGG,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      KC_CAPS, _______, _______, _______, _______, _______, _______,   KC_UP, _______, _______, CK_DOWN, _______,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      KC_LSFT, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______,  CK_RST, _______,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______, _______,   MO(3), _______, _______, _______
-  //`-----------------------------------------------------------------------------------------------------------'
-  ),
-
-  [2] = LAYOUT_preonic_grid(
-  //,-----------------------------------------------------------------------------------------------------------.
-       KC_GRV,  KC_F11,  KC_F12,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-       KC_ESC, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      KC_CAPS, _______, KC_MS_U, _______, _______, _______, KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      KC_LSFT, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,  MO(3),  _______, KC_BTN1, _______, _______, _______, _______, _______, _______
-  //`-----------------------------------------------------------------------------------------------------------'
-  ),
-
-  [3] = LAYOUT_preonic_grid(
-  //,-----------------------------------------------------------------------------------------------------------.
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      KC_MUTE, KC_WBAK, KC_WFWD,   KC_F7,   KC_F8,   KC_F9, _______,    KC_7,    KC_8,    KC_9, _______, QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      KC_VOLU, _______, KC_MNXT,   KC_F6,   KC_F5,   KC_F6, _______,    KC_6,    KC_5,    KC_4, _______, QK_MAKE,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      KC_VOLD, KC_MPRV, KC_MNXT,   KC_F1,   KC_F2,   KC_F3, KC_LSRS,    KC_1,    KC_2,    KC_3, _______, DB_TOGG,
-  //|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-      MU_TOGG, MU_NEXT, _______, _______, _______, KC_LSRE, _______, KC_LERS, _______, _______, _______,  EE_CLR
-  //`-----------------------------------------------------------------------------------------------------------'
-  )
-};
-
-/* 
-Logic to shift between the bars:
-    KC_LSRE => Left Bar - Space... Right Bar - Enter
-    KC_LERS => Left Bar - Enter... Right Bar - Space
-    KC_LSRS => Left Bar - Space... Right Bar - Space
-
-    Hack into dynamic_keymap_set_keycode and change the value of the keymap.
-    (Just like VIA does, but instead it is done inside the keyboard so no need
-    to open the app)
-
-    Possible alternatives:
-        - Create 3 layers but only change the KC_ENTER and KC_SPACE position between them
-        - Create a custom keycode and use process_record_user to alter the behaviour
-*/
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch (keycode) {
-    case KC_LSRS:
-      dynamic_keymap_set_keycode(LEFT_BAR, KC_SPC);
-      dynamic_keymap_set_keycode(RIGHT_BAR, KC_SPC);
-      PLAY_SONG(song_lsrs);
-      return false;
-    case KC_LERS:
-      dynamic_keymap_set_keycode(LEFT_BAR, KC_ENT);
-      dynamic_keymap_set_keycode(RIGHT_BAR, KC_SPC);
-      PLAY_SONG(song_lers);
-      return false;
-    case KC_LSRE:
-      dynamic_keymap_set_keycode(LEFT_BAR, KC_SPC);
-      dynamic_keymap_set_keycode(RIGHT_BAR, KC_ENT);
-      PLAY_SONG(song_lsre);
-      return false;
-    default:
-      return true; // Process all other keycodes normally
-    }
-  }
-  return true;
-}
diff --git a/keyboards/preonic/keymaps/jpe230/rules.mk b/keyboards/preonic/keymaps/jpe230/rules.mk
deleted file mode 100644
index d57d1e33f2d..00000000000
--- a/keyboards/preonic/keymaps/jpe230/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Disable unused features inherited from the kb rules.mk
-RGBLIGHT_ENABLE   = no 
-ENCODER_ENABLE    = no
-DIP_SWITCH_ENABLE = no
-CONSOLE_ENABLE    = no
-COMMAND_ENABLE    = no
-
-# Enable VIA
-VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/keelhauler/config.h b/keyboards/preonic/keymaps/keelhauler/config.h
deleted file mode 100644
index 37858350a84..00000000000
--- a/keyboards/preonic/keymaps/keelhauler/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/keelhauler/keymap.c b/keyboards/preonic/keymaps/keelhauler/keymap.c
deleted file mode 100644
index 3a3782353c4..00000000000
--- a/keyboards/preonic/keymaps/keelhauler/keymap.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-// Tap and hold mods
-      // Enter into right shift
-  #define ENT_RSFT RSFT_T(KC_ENT)
-
-enum preonic_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | PSCR |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  KC_ESC,  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, ENT_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_PSCR, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | PSCR |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
-  KC_ESC,  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, ENT_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_PSCR, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | PSCR |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_grid(
-  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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    ENT_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_PSCR, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      | Home | End  | Play |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Prev | Vol- | Vol+ | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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, _______,  _______, KC_HOME, KC_END, KC_MPLY,
-  _______, _______, _______, _______, _______, _______, _______, _______,  KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      | Pg Up| Pg Dn| Play |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Prev | Vol- | Vol+ | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  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_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_PGUP, KC_PGDN, KC_MPLY,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_COLEMAK);
-          }
-          return false;
-          break;
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DVORAK);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            writePinLow(E6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            writePinHigh(E6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/keelhauler/readme.md b/keyboards/preonic/keymaps/keelhauler/readme.md
deleted file mode 100644
index 93c026d9c6f..00000000000
--- a/keyboards/preonic/keymaps/keelhauler/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Keelhauler's Preonic layout
-
-## Aims to provide a more seamless transition from a normal full-size keyboard and layout to the otholinear 50% layout of the preonic than the stock keymap.
-
-## Includes some personal touches that I find more helpful than the stock keymaps.
-
-### Base Keymap Improvements
-
-    FN key removed
-    Bottom left redesign from FN, CTRL, ALT, OS to CTRL, OS, ALT, PSCR
-    Enter functions as RShift when held, Enter when tapped
diff --git a/keyboards/preonic/keymaps/keelhauler/rules.mk b/keyboards/preonic/keymaps/keelhauler/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/keelhauler/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/kjwon15/config.h b/keyboards/preonic/keymaps/kjwon15/config.h
deleted file mode 100644
index 71b9f9ba5db..00000000000
--- a/keyboards/preonic/keymaps/kjwon15/config.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-
-#define TAPPING_TERM 200
-
-/* #define MK_3_SPEED */
-#define MK_MOMENTARY_ACCEL
-#define MOUSEKEY_MAX_SPEED         8
-
-// Must raise 5 halftones
-/* #define CUSTOM_STARTUP \ */
-/*  Q__NOTE(_FS7), \ */
-/*  W__NOTE(_B7), */
-
-#undef MUSICAL_NOTE
-#define MUSICAL_NOTE(note, duration) {((NOTE##note) * 1.3348398541700344), duration}
-
-#define CUSTOM_STARTUP \
-    QD_NOTE(_A6),  \
-    QD_NOTE(_C7),  \
-    QD_NOTE(_A7),  \
-    QD_NOTE(_F7),  \
-    QD_NOTE(_G7),  \
-    HD_NOTE(_C8),
-
-#undef MUSICAL_NOTE
-#define MUSICAL_NOTE(note, duration) {(NOTE##note), duration}
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(CUSTOM_STARTUP)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-#define AUDIO_CLICKY
-#define AUDIO_CLICKY_FREQ_DEFAULT 440.f
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
diff --git a/keyboards/preonic/keymaps/kjwon15/keymap.c b/keyboards/preonic/keymaps/kjwon15/keymap.c
deleted file mode 100644
index 94f76b00b44..00000000000
--- a/keyboards/preonic/keymaps/kjwon15/keymap.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _PURE,
-  _BLANK,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-
-  _MOUSE
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  PURE,
-  BLANK,
-  LOWER,
-  RAISE,
-  KC_CESC,
-  SPC_MOU
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | ESC  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | [    |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | C/ESC|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | SF/EN|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Enter| Ctrl | GUI  | Alt  |Lower |Mouse |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_CESC,  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, SC_SENT,
-  KC_ENT,   KC_LCTL, KC_LGUI, KC_LALT, LOWER,   SPC_MOU, KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Pure
- * ,-----------------------------------------------------------------------------------.
- * | ESC  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | [    |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Cntl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Enter| Ctrl | GUI  | Alt  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_PURE] = LAYOUT_preonic_grid(
-  KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_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, KC_RSFT,
-  KC_ENT,   KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Blank
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |             |Raise |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_BLANK] = LAYOUT_preonic_grid(
-  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,    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,    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,    LOWER,    KC_NO,    KC_NO,    RAISE,    KC_NO,    KC_NO,    KC_NO,    KC_NO
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  ESC |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   -  |   =  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | HOME |  END |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Ralt | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL , KC_BSPC,
-  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_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_HOME, KC_END, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_RALT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | ESC  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |PrtScr|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | MUTE | VOL- | VOL+ |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | PLAY | PREV | NEXT | STOP |  F11 |  F12 |ISO # |ISO / | PGDN | PGUP |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Ralt | Vol- | Vol+ | Mute |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL,
-  _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGDN, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_RALT, KC_VOLD, KC_VOLU, KC_MUTE
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | LOCK | Reset|Clicky|AudMod|Qwerty|Colemk|Dvorak| WHL_D| MS_U | WHL_U|      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |Aud on|AudOff|Rclick|Lclick|AGnorm|AGswap| MS_L | MS_D | MS_R |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  QK_LOCK, QK_BOOT, CK_TOGG, MU_NEXT, QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,
-  _______, AU_ON,   AU_OFF,  KC_BTN2, KC_BTN1, AG_NORM, AG_SWAP, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_ACL0,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_ACL1,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ACL2
-),
-
-/* Mouse / LED
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |RGB_TO| WHL_U|Mclick|      | HU_D | HU_I | LCTL | MS_U | WHL_U|      |  Del |
- * +------|------+------+------+------+-------------+------+------+------+------+------|
- * |      |RGB_MO| WHL_D|Rclick|Lclick| SA_D | SA_I | MS_L | MS_D | MS_R |      | ACL0 |
- * +------|------+------+------+------+------|------+------+------+------+------+------|
- * |      |RGB_MR|      |      |      | VA_D | VA_I | WHL_D| WHL_L| WHL_R|      | ACL1 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | ACL2 |
- * `-----------------------------------------------------------------------------------'
- */
-[_MOUSE] = LAYOUT_preonic_grid(
-  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, KC_WH_U, KC_BTN3, _______, RGB_HUD, RGB_HUI, KC_LCTL, KC_MS_U, KC_WH_U, _______, KC_DEL,
-  _______, RGB_MOD, KC_WH_D, KC_BTN2, KC_BTN1, RGB_SAD, RGB_SAI, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_ACL0,
-  _______, RGB_RMOD,_______, _______, _______, RGB_VAD, RGB_VAI, KC_WH_D, KC_WH_L, KC_WH_R, _______, KC_ACL1,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ACL2
-  )
-
-
-};
-
-static bool cntl_interrupted = 0;
-static uint16_t cntl_timer = 0;
-
-static bool mouse_interrupted = 0;
-static uint16_t mouse_timer = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case PURE:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_PURE);
-          }
-          return false;
-          break;
-        case BLANK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_BLANK);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-
-        // BACKLIT is not used. If you want to use, uncomment below
-        /*
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            PORTE &= ~(1<<6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            PORTE |= (1<<6);
-            #endif
-          }
-          return false;
-          break;
-        */
-
-        case KC_CESC:
-          if (record->event.pressed) {
-           cntl_interrupted = false;
-           cntl_timer = timer_read();
-           register_mods(MOD_BIT(KC_LCTL));
-          } else if (!cntl_interrupted && timer_elapsed(cntl_timer) < TAPPING_TERM) {
-           unregister_mods(MOD_BIT(KC_LCTL));
-           tap_code(KC_ESC);
-          } else {
-           unregister_mods(MOD_BIT(KC_LCTL));
-          }
-          return false;
-          break;
-
-        case SPC_MOU:
-          if (record->event.pressed) {
-           mouse_interrupted = false;
-           mouse_timer = timer_read();
-
-           cntl_interrupted = true;
-           layer_on(_MOUSE);
-          } else if (!mouse_interrupted && timer_elapsed(mouse_timer) < TAPPING_TERM) {
-           layer_off(_MOUSE);
-           tap_code(KC_SPC);
-          } else {
-           layer_off(_MOUSE);
-          }
-          return false;
-          break;
-
-        default:
-          cntl_interrupted = true;
-          mouse_interrupted = true;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      tap_code(KC_PGDN);
-    } else {
-      tap_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/kjwon15/readme.md b/keyboards/preonic/keymaps/kjwon15/readme.md
deleted file mode 100644
index 5d03a1a0b8f..00000000000
--- a/keyboards/preonic/keymaps/kjwon15/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Kjwon15's Preonic layout
-
-
-## It provides almost full functionality for linux
-
-It has screen capture key which is also used on sysq
-
-
-## Mouse layer
-
-Press left spacebar to activate mouse mode.
-Right hand to move cursor/scroll, Left hand to click
-
-
-## Dual function keys
-
-Right shift is also Enter key. If you press and hold, that key act as shift. But if you tap that key, It is enter key.
-If you want to press and hold enter key, Use left-bottom key. That is pure enter.
-
-## Blank layout
-
-If you want to lock your keyboard, switch to this layout. It also useful when you want to clean your keyboard without disconnecting USB.
-
-
-## Pure mode
-
-Dual function keys are so annoying when you playing game. Then use this layout
diff --git a/keyboards/preonic/keymaps/kjwon15/rules.mk b/keyboards/preonic/keymaps/kjwon15/rules.mk
deleted file mode 100644
index 5ffe1ff3285..00000000000
--- a/keyboards/preonic/keymaps/kjwon15/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC += muse.c
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/laurentlaurent/config.h b/keyboards/preonic/keymaps/laurentlaurent/config.h
deleted file mode 100644
index 20ce699a199..00000000000
--- a/keyboards/preonic/keymaps/laurentlaurent/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-//#define RETRO_TAPPING
diff --git a/keyboards/preonic/keymaps/laurentlaurent/keymap.c b/keyboards/preonic/keymaps/laurentlaurent/keymap.c
deleted file mode 100644
index 1e9183dee3c..00000000000
--- a/keyboards/preonic/keymaps/laurentlaurent/keymap.c
+++ /dev/null
@@ -1,605 +0,0 @@
-/* Laurent's Preonic Layout
- */
-
-// For IntelliSense
-    #ifdef __INTELLISENSE__
-        #include "../../rev3/config.h"
-        #include "../../rev3/rev3.h"
-        enum dynamic_macro_keycodes {
-            DM_REC1 = DYNAMIC_MACRO_RANGE,
-            DM_REC2,
-            DM_RSTP,
-            DM_PLY1,
-            DM_PLY2,
-        };
-        #define QMK_KEYBOARD_H "rev3.h"
-    #endif
-
-    #include QMK_KEYBOARD_H
-    #include "muse.h"
-
-// ==== These keys allows usage of the home row as modifiers (when held) ====
-// Very bad for gaming, switch to gaming layout
-
-    // For _QWERTY_MAC
-        // S and L into Ctrl
-    #define LCT_S LCTL_T(KC_S)
-    #define LCT_L LCTL_T(KC_L)
-        // F, J and Z into CMD
-    #define LWN_F LGUI_T(KC_F)
-    #define LWN_Z LGUI_T(KC_Z)
-    #define LWN_J LGUI_T(KC_J)
-
-    // For _QWERTY_WIN
-        // S and L into WIN
-    #define LWN_S LGUI_T(KC_S)
-    #define LWN_L LGUI_T(KC_L)
-        // F, J and Z into Ctrl
-    #define LCT_F LCTL_T(KC_F)
-    #define LCT_Z LCTL_T(KC_Z)
-    #define LCT_J LCTL_T(KC_J)
-
-// ============================================================================
-
-// ==== For All ====
-
-    // Layout helper
-        #define __LYB__ KC_TRANSPARENT
-
-    // Mod Tap
-            // Changing K and D into Alt
-        #define LAT_D LALT_T(KC_D)
-        #define LAT_K LALT_T(KC_K)
-            // Equal into Ctrl+Alt+Cmd
-        #define LCAGEQ LCAG_T(KC_EQUAL)
-            // Esc into Meh
-        #define LMHESC MEH_T(KC_ESC)
-            // Space into Shift
-        #define LSHFSP SFT_T(KC_SPACE)
-            // Backspace into Shift
-        #define LSHFBK SFT_T(KC_BSPC)
-
-    // Switching layers
-        #define LTO_BS TO(_QWERTY_MAC)          // Go to Base Layer
-            // Go to _NAV
-        #define LLY_SC LT(_NAV, KC_SCLN)        // From ;
-        #define LLY_A LT(_NAV, KC_A)            // From A
-            // Go to _PUNC
-        #define LLY_TB LT(_PUNC, KC_TAB)        // From Tab
-        #define LLY_BK LT(_PUNC, KC_BSPC)       // From Backspace
-        #define LLY_BS LT(_PUNC, KC_BSLS)       // From Backslash
-            // Others
-        #define LLY_GR LT(_ONEHD, KC_GRV)       // Go to _ONEHD from `
-        #define LLY_ET LT(_EXTRA, KC_ENT)       // Go to _EXTRA from Enter
-        #define LLSWIT MO(_LYSWT)               // Layer Switcher
-        #define LLY_DL LT(_NUM, KC_DEL)         // Go to _NUM from Delete
-
-    // Shortcuts
-        // Mac Windows Resizing
-        #define LMW_L3 LCA(KC_E)                // Resize to 2/3 and move to the left
-        #define LMW_FS LCA(KC_ENTER)            // Resize to full screen
-        #define LMW_R3 LCA(KC_T)                // Resize to 2/3 and move to the right
-        #define LMW_L1 LCA(KC_D)                // Resize to 1/3 and move to the left
-        #define LMW_M1 LCA(KC_F)                // Resize to 1/3 and move to middle
-        #define LMW_R1 LCA(KC_G)                // Resize to 1/3 and move to right
-        #define LMW_TL LCA(KC_U)                // Fit on Top Left corner
-        #define LMW_TR LCA(KC_I)                // Fit on Top Left corner
-        #define LMW_BL LCA(KC_J)                // Fit on Top Left corner
-        #define LMW_BR LCA(KC_K)                // Fit on Top Left corner
-        #define LMW_LT LCA(KC_LEFT)             // Resize to 1/2 horizontally and move to the left
-        #define LMW_BT LCA(KC_DOWN)             // Resize to 1/2 vertically and move to the bottom
-        #define LMW_TP LCA(KC_UP)               // Resize to 1/2 vertically and move to the top
-        #define LMW_RT LCA(KC_RIGHT)            // Resize to 1/2 horizontally and move to the right
-
-// ==== Audio ====
-    #ifdef AUDIO_ENABLE
-        #include "audio.h"
-        float tone_macro1_record[][2]     = SONG(CAPS_LOCK_ON_SOUND);
-        float tone_macro2_record[][2]     = SONG(SCROLL_LOCK_ON_SOUND);
-        float tone_macro_record_stop[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
-    #endif
-
-enum preonic_layers {
-    _QWERTY_MAC,
-    _QWERTY_WIN,
-    _GAMING,
-    _MUSIC,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-    _PUNC,
-    _EXTRA,
-    _NUM,
-    _NAV,
-    _ONEHD,
-    _LYSWT };
-
-enum preonic_keycodes {
-    QWERTY = SAFE_RANGE,
-    QWWIN,
-    // COLEMAK,
-    // DVORAK,
-    LOWER,
-    RAISE,
-    BACKLIT,
-    DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty for Mac
-     * ,-----------------------------------------------------------------------------------.
-     * | CAG= |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LY|TB|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | LY|\ |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Hyper| LY|A | CT/S | AT/D | WN/F |   G  |   H  | WN/J | AT/K | CT/L | LY|; |  "   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift| WN/Z |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Sh/Bk|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LY|` |ESCMEH| LY|DL|LW|Bkp|LY|Bkp| Shift/Space |LY|ENT|RS|Bkp|   [  |   ]  |LY_SW |
-     * `-----------------------------------------------------------------------------------'
-     * LY|` 	-> To _NUM
-     * LY|; 	-> To _NAV
-     * LY|A 	-> To _NAV
-     * LY|TB 	-> To _PUNC
-     * LY|\ 	-> To _PUNC
-     * LY|Bkp 	-> To _PUNC
-     * LY|ENT 	-> To_EXTRA
-     */
-    [_QWERTY_MAC] = LAYOUT_preonic_grid(
-        LCAGEQ,	    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINUS,
-        LLY_TB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    LLY_BS,
-        KC_HYPR,    LLY_A, 	 LCT_S,   LAT_D,   LWN_F,   KC_G,    KC_H,    LWN_J,   LAT_K,   LCT_L,   LLY_SC,  KC_QUOT,
-        KC_LSFT,    LWN_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, LSHFBK,
-        LLY_GR,     LMHESC,  LLY_DL,  LOWER,   LLY_BK,  LSHFSP,  LSHFSP,  LLY_ET,  RAISE,   KC_LBRC, KC_RBRC, LLSWIT
-    ),
-
-    /* Qwerty for Windows
-     * ,-----------------------------------------------------------------------------------.
-     * | CAG= |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LY|TB|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | LY|\ |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Hyper| LY|A | WN/S | AT/D | CT/F |   G  |   H  | CT/J | AT/K | WN/L | LY/; |  "   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift| CT/Z |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Sh/Bk|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | LY|` |MH/ESC| LY|DL|LW|Bkp|LY|Bk |    Space    |LY|ENT|RS|Bkp|   [  |   ]  |LY_SW |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_QWERTY_WIN] = LAYOUT_preonic_grid(
-        LCAGEQ,	    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINUS,
-        LLY_TB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    LLY_BS,
-        KC_HYPR,    LLY_A, 	 LWN_S,   LAT_D,   LCT_F,   KC_G,    KC_H,    LCT_J,   LAT_K,   LWN_L,   LLY_SC,  KC_QUOT,
-        KC_LSFT,    LCT_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, LSHFBK,
-        LLY_GR,     LMHESC,  LLY_DL,  LOWER,   LLY_BK,  LSHFSP,  LSHFSP,  LLY_ET,  RAISE,   KC_LBRC, KC_RBRC, LLSWIT
-    ),
-
-    /* Gaming
-     * ,-----------------------------------------------------------------------------------.
-     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | LY|; |  "   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  =   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl | ESC  |  Alt |LW|Bkp|LY|Bk |    Space    |LY|ENT|RS|Bkp|   [  |   ]  |LY_SW |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_GAMING] = LAYOUT_preonic_grid(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINUS,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    LLY_SC,  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_EQUAL,
-        KC_LCTL, KC_ESC,  KC_LALT, LOWER,   LLY_BK,  KC_SPC,  KC_SPC,  LLY_ET,  RAISE,   KC_LBRC, KC_RBRC, LLSWIT
-    ),
-
-    /* Music Layer (Switch to this layer if want to use music mode)
-     * ,-----------------------------------------------------------------------------------.
-     * | Esc  | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | CTRL | ALT  | CMD  |      | XXXX |    Space    | XXXX |      | XXXX | XXXX |LY_SW |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_MUSIC] = LAYOUT_preonic_grid(
-        KC_ESC ,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-        XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-        _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-        _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-        KC_LCTL,  KC_LALT,  KC_LGUI,  _______,  XXXXXXX,  KC_SPC,   KC_SPC,   XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  LLSWIT
-    ),
-
-    /* Lower
-     * ,-----------------------------------------------------------------------------------.
-     * | ESC  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | F11  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Tab  | Home |  Up  | End  | PGUP | XXXX | XXXX | XXXX | PrSc | Home | PGUP | Del  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |  "   | Left | Down | Right|PGDWN | XXXX | XXXX | XXXX | Pause| End  |PGDWN | F12  |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      | CTRL |  Alt |  CMD | XXXX | XXXX | XXXX | XXXX | Prev | Play | Next | INS  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | CTRL |  Alt |  CMD | !!!! | Bksp |    Space    | Enter|      | Vol- | Vol+ |LY_SW |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_preonic_grid(
-        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_TAB,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_HOME, KC_PGUP,  KC_DEL,
-        KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAUS, KC_END,  KC_PGDN,  KC_F12,
-        _______, KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT,  KC_INS,
-        KC_LCTL, KC_LALT, KC_LGUI, __LYB__, KC_BSPC, KC_SPC,  KC_SPC,  KC_ENT, _______, KC_VOLD, KC_VOLU,  LLSWIT
-    ),
-
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * | ESC  |  F1  |  F2  |  F3  |  F4  |  F5  | SCLK |   &  |   *  |   (  |   )  | Bksp |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Tab  |  F7  |  F8  |  F9  |  F10 |  F11 | XXXX |   &  |   *  |   {  |   }  | Del  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Caps |  F1  |  F2  |  F3  |  F4  |  F5  | XXXX |   -  |   =  |   [  |   ]  | XXXX |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |  F7  |  F8  |  F9  |  F10 |  F11 | XXXX |ISO # |ISO \ | MRC1 | MRC2 | MRSP |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | CTRL |  Alt |  CMD |      | Bksp |    Space    | Enter| !!!! | MPL1 | MPL2 |LY_SW |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_preonic_grid(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_SCRL,  KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-        KC_TAB,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, XXXXXXX,  KC_AMPR, KC_ASTR, KC_LCBR, KC_RCBR, KC_DEL,
-        KC_CAPS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15, XXXXXXX,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, XXXXXXX,
-        _______, KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20, XXXXXXX,  KC_NUHS, KC_NUBS, DM_REC1, DM_REC2, DM_RSTP,
-        KC_LCTL, KC_LALT, KC_LGUI, _______, KC_BSPC, KC_SPC,  KC_SPC,  KC_ENT,  __LYB__, DM_PLY1, DM_PLY2, LLSWIT
-    ),
-
-    /* Adjust (Lower + Raise)
-     * ,-----------------------------------------------------------------------------------.
-     * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Tab  | Reset|      |      |      |      |      |      |      |      |      | XXXX |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |      |      |Aud on|AudOff|QWmac |QWwin |QWmac |QWin  |      |      |  F12 |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      |      |      |      |LY_SW |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_ADJUST] = LAYOUT_preonic_grid(
-        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_TAB,  QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
-    /*_______, _______, MU_NEXT,  AU_ON,   AU_OFF,  QWERTY,  QWWIN,	 QWERTY,  COLEMAK, DVORAK,  _______, _______, Remove this if adding Colemak and Dvorak*/
-        _______, _______, MU_NEXT, AU_ON,   AU_OFF,  QWERTY,  QWWIN,   QWERTY,  QWWIN,   _______, _______, KC_F12,
-        _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LLSWIT
-    ),
-
-    /* Punctuation Layer
-     * ,-----------------------------------------------------------------------------------.
-     * |  +   |  !   |  @   |  #   |  $   |  %   |  ^   |  &   |  *   |  (   |   )  |  _   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | !!!! |  &   |  |   |  {   |   }  |  -   |  -   | XXXX | XXXX |  {   |   }  |  |(!)|
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |  "   |  /   |  *   |  (   |   )  |  +   |  +   | XXXX | XXXX |  [   |   ]  |  "   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |  \   |  %   |  [   |   ]  |  =   |  =   | XXXX |   <  |  >   |   ?  | INS  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  ~   |  _   |  ^   | Del  | !!!! |    Space    | Enter| XXXX |  [   |   ]  |LY_SW |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_PUNC] = LAYOUT_preonic_grid(
-        KC_PLUS,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_UNDS,
-        __LYB__,  KC_AMPR,  KC_PIPE,  KC_LCBR,  KC_RCBR,  KC_MINS,  KC_MINS,  XXXXXXX,  XXXXXXX,  KC_LCBR,  KC_RCBR,  KC_PIPE,
-        KC_DQUO,  KC_SLSH,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_PLUS,  KC_PLUS,  XXXXXXX,  XXXXXXX,  KC_LBRC,  KC_RBRC,  KC_DQUO,
-        _______,  KC_BSLS,  KC_PERC,  KC_LBRC,  KC_RBRC,  KC_EQL,   KC_EQL,   XXXXXXX,  KC_LABK,  KC_RABK,  KC_QUES,  KC_INS,
-        KC_TILDE, KC_UNDS,  KC_CIRC,  KC_DEL,   __LYB__,  KC_SPC,   KC_SPC,   KC_ENT,   XXXXXXX,  KC_LBRC,  KC_RBRC,  LLSWIT
-    ),
-
-    /* Extra Layer
-     * ,-----------------------------------------------------------------------------------.
-     * |  ESC |      |      |      |      |      | SCLK |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Tab  |      |      |      |      |      |      |      |      |      |      | Del  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Caps |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      | MRC1 | MRC2 | MRSP |	   |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | CTRL |  ALT |  CMD |  Del | Bksp |    Space    | !!!! |      | MPL1 | MPL2 |LY_SW |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_EXTRA] = LAYOUT_preonic_grid(
-        KC_ESC,   _______,  _______,  _______,  _______,  KC_SCRL,  _______,  _______,  _______,  _______,  _______,  _______,
-        KC_TAB,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
-        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  DM_REC1,  DM_REC2,  DM_RSTP,
-        KC_LCTL,  KC_LALT,  KC_LGUI,  KC_DEL,  KC_BSPC,  KC_SPC,   KC_SPC,   __LYB__,  _______,   DM_PLY1,  DM_PLY2,  LLSWIT
-    ),
-
-    /* Numeric Pad
-     * ,-----------------------------------------------------------------------------------.
-     * |  ESC | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | NMLK | NUM/ | NUM* | NUM- | XXXX |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      | Home |  Up  | End  | PGUP | XXXX | XXXX | NUM7 | NUM8 | NUM9 | NUM+ | XXXX |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | XXXX | Left | Down | Right| PGDWN| XXXX | XXXX | NUM4 | NUM5 | NUM6 | NUM+ | XXXX |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      | CTRL |  ALT | CMD  | XXXX | XXXX | XXXX | NUM1 | NUM2 | NUM3 | NENT | Bksp |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      | XXXX | !!!! | XXXX | Bksp |    Space    | NUM0 | NUM0 | NUM. | NENT | QMAC |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_NUM] = LAYOUT_preonic_grid(
-        KC_ESC ,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,  XXXXXXX,
-        _______,  KC_HOME,  KC_UP,    KC_END,   KC_PGUP,  XXXXXXX,  XXXXXXX,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  XXXXXXX,
-        KC_DQUO,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_PGDN,  XXXXXXX,  XXXXXXX,  KC_P4,    KC_P5,    KC_P6,    KC_PPLS,  XXXXXXX,
-        _______,  KC_LCTL,  KC_LALT,  KC_LGUI,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_P1,    KC_P2,    KC_P3,    KC_PENT,  KC_BSPC,
-        _______,  XXXXXXX,  __LYB__,  XXXXXXX,  KC_BSPC,  KC_SPC,   KC_SPC,   KC_P0,    KC_P0,    KC_PDOT,  KC_PENT,  LTO_BS
-    ),
-
-    /* NAV
-     * ,-----------------------------------------------------------------------------------.
-     * |  ESC |      |      | MOB3 |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |   A  | MOB2 | MOUP | MOB1 | MOSU | PGUP | Home |  Up  | End  |      | Del  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      | !!!! | MOLF | MODN | MORT | MOSD | PGDN | Left | Down | Right| !!!! |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      | MOB4 | MOB5 | MOSL | MOSR | MOA2 | MOA0 | MPRV | MPLY | MNXT |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | CTRL | ALT  | CMD  |      | Bksp |    Space    | Enter| VILM | VOLD | VOLU | QMAC |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_NAV] = LAYOUT_preonic_grid(
-        KC_ESC,   _______,  _______,  KC_BTN3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  KC_A,     KC_BTN2,  KC_MS_U,  KC_BTN1,  KC_WH_U,  KC_PGUP,  KC_HOME,  KC_UP,    KC_END,   _______,  KC_DEL,
-        _______,  __LYB__,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_WH_D,  KC_PGDN,  KC_LEFT,  KC_DOWN,  KC_RGHT,  __LYB__,  _______,
-        _______,  _______,  KC_BTN4,  KC_BTN5,  KC_WH_L,  KC_WH_R,  KC_ACL2,  KC_ACL0,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,
-        KC_LCTL,  KC_LALT,  KC_LGUI,  _______,  KC_BSPC,  KC_SPC,   KC_SPC,   KC_ENT,   KC_MUTE,  KC_VOLD,  KC_VOLU,  LTO_BS
-    ),
-
-        /* One-Handed
-    * ,-----------------------------------------------------------------------------------.
-    * | Esc  |  6   |   7  |   8  |   9  |   0  |   -  | XXXX | XXXX | XXXX | XXXX | XXXX |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |      |   Y  |   U  |   I  |   O  |   P  | MWL3 | MWFS | MWR3 | MWTL | MWTR | XXXX |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      |   H  |   J  |   K  |   L  |   :  | MWL1 | MWM1 | MWR1 | MWBL | MWBR | XXXX |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * |      |   N  |   M  |   ,  |   .  |   /  | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | !!!! |  Esc |  Del |  Ent | Bksp |             | MWLT | MWBT | MWUP | MWRT |LY_SW |
-    * `-----------------------------------------------------------------------------------'
-    */
-    [_ONEHD] = LAYOUT_preonic_grid(
-        KC_ESC ,  KC_6,     KC_7,     KC_8,     KC_9,      KC_0,     KC_MINUS, XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,
-        _______,  KC_Y,     KC_U,     KC_I,     KC_O,      KC_P,     LMW_L3,   LMW_FS,   LMW_R3,   LMW_TL,   LMW_TR,  XXXXXXX,
-        _______,  KC_H,     KC_J,     KC_K,     KC_L,      KC_SCLN,  LMW_L1,   LMW_M1,   LMW_R1,   LMW_BL,   LMW_BR,  XXXXXXX,
-        _______,  KC_N,     KC_M,     KC_COMM,  KC_DOT,    KC_SLSH,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX,
-        __LYB__,  KC_ESC,  KC_DEL,    KC_ENT,   KC_BSPC,   KC_SPC,   KC_SPC,   LMW_LT,   LMW_BT,   LMW_TP,   LMW_RT,  LLSWIT
-    ),
-
-    /* Layer Switcher
-     * ,-----------------------------------------------------------------------------------.
-     * | Esc  | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |Brite | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | XXXX | XXXX | XXXX | XXXX | XXXX | GAME | XXXX | XXXX | XXXX | XXXX | NAV  | XXXX |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      | XXXX | XXXX | XXXX | XXXX | QMAC | XXXX | MUSC | XXXX | XXXX | XXXX | XXXX |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | XXXX | XXXX | NUM  | XXXX | XXXX |    XXXXX    | XXXX | XXXX | XXXX | XXXX | !!!! |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LYSWT] = LAYOUT_preonic_grid(
-        KC_ESC ,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  	XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-        BACKLIT,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  	XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-        XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  TO(_GAMING), XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  TO(_NAV), XXXXXXX,
-        XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  LTO_BS,   	XXXXXXX, TO(_MUSIC), XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-        XXXXXXX,   XXXXXXX,  TO(_NUM), XXXXXXX,  XXXXXXX,  XXXXXXX,  	XXXXXXX,  XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  _______
-    ) //, //Don't forget to add the comma if going to add more layers here
-};
-
-static uint16_t key_timer;
-static uint16_t timer_thresh = 200;
-bool            process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // For dynamic macros
-    if (!process_record_dynamic_macro(keycode, record)) {
-// Play sound on Macro stop
-#ifdef AUDIO_ENABLE
-        switch (keycode) {
-            case QK_DYNAMIC_MACRO_RECORD_STOP:
-                if (record->event.pressed) {
-                    PLAY_SONG(tone_macro_record_stop);
-                }
-                return false;
-                break;
-        }
-#endif
-        return false;
-    }
-
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY_MAC);
-            }
-            return false;
-            break;
-        case QWWIN:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY_WIN);
-            }
-            return false;
-            break;
-        // Reinstate these cases if COLEMAK, DVORAK are included in the layouts
-        /*case COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            return false;
-            break;
-        case DVORAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_DVORAK);
-            }
-            return false;
-            break;
-          */
-        case LOWER:
-            if (record->event.pressed) {
-                key_timer = timer_read(); // For Backspace on tap
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                // Backspace on tap
-                if (timer_elapsed(key_timer) < timer_thresh) {
-                    tap_code(KC_BSPC);
-                }
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                key_timer = timer_read(); // For Backspace on tap
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                // Backspace on tap
-                if (timer_elapsed(key_timer) < timer_thresh) {
-                    tap_code(KC_BSPC);
-                }
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-            break;
-        case BACKLIT:
-            if (record->event.pressed) {
-                register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-                backlight_step();
-#endif
-#ifdef __AVR__
-                PORTE &= ~(1 << 6);
-#endif
-            } else {
-                unregister_code(KC_RSFT);
-#ifdef __AVR__
-                PORTE |= (1 << 6);
-#endif
-            }
-            return false;
-            break;
-#ifdef AUDIO_ENABLE
-            // Play sound on Macro record start
-        case QK_DYNAMIC_MACRO_RECORD_START_1:
-            if (record->event.pressed) {
-                PLAY_SONG(tone_macro1_record);
-            }
-            return false;
-            break;
-        case QK_DYNAMIC_MACRO_RECORD_START_2:
-            if (record->event.pressed) {
-                PLAY_SONG(tone_macro2_record);
-            }
-            return false;
-            break;
-#endif
-    }
-    return true;
-};
-
-bool     muse_mode      = false;
-uint8_t  last_muse_note = 0;
-uint16_t muse_counter   = 0;
-uint8_t  muse_offset    = 70;
-uint16_t muse_tempo     = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (muse_mode) {
-        if (IS_LAYER_ON(_RAISE)) {
-            if (clockwise) {
-                muse_offset++;
-            } else {
-                muse_offset--;
-            }
-        } else {
-            if (clockwise) {
-                muse_tempo += 1;
-            } else {
-                muse_tempo -= 1;
-            }
-        }
-    } else {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-             tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            return true;
-    }
-}
diff --git a/keyboards/preonic/keymaps/laurentlaurent/readme.md b/keyboards/preonic/keymaps/laurentlaurent/readme.md
deleted file mode 100644
index b1909f8e1ea..00000000000
--- a/keyboards/preonic/keymaps/laurentlaurent/readme.md
+++ /dev/null
@@ -1,252 +0,0 @@
-# laurentlaurent's Preonic keyboard
-Largely similar to his [ErgoDox EZ](https://configure.ergodox-ez.com/ergodox-ez/layouts/jZpmo/latest/0)'s layout
-
-## Features
-
-### Special Modifiers for Global Shortcuts
-* Hyper key (Ctrl+Alt+Cmd+Shift)
-* CAG key (Ctrl+Alt+Cmd)
-* Meh key (Ctrl+Alt+Shift)
-
-### Home Row modifiers
-* Home Row modifiers (hold F/J to use CMD/Ctrl, D/L for Alt, ... )
-* Separate layers for Mac and Windows keyboard to improve muscle memory linked to Home Row modifiers (CMD is mapped to F and J on Mac, CTRL for Windows)
-* Extra CMD/CTRL key mapped to Z for one-handed CMD+F/CTRL+F
-
-### Qwerty Layout improvements
-* Backspace and Enter are on bottom row (next to Space bar)
-* = is where Esc would be expected to be
-* "-" is where Backspace would be expected to be
-* Grave is where LCTRL would be expected to be
-* Esc is where Alt (on Mac)/Win (on PC) would be expected to be
-* Del is where CMD (on Mac)/Alt (on PC) would be expected to be
-* Hyper key replaces Caps Lock
-
-### Mod taps
-* Home Row modifiers
-* Lower and Raise are Backspace on tap
-* Holding = is CAG (CTRL+ALT+CMD)
-* Holding Esc is MEH (Ctrl+Shift+Alt)
-* Right Shift is bound to RShift on hold, Backspace on tap
-* Spacebar acts like a LShift on hold, Spacebar on tap
-* In instances where repeated keys is needed:
-    * Tap then tap-hold repeats the key
-    * Lower, Raise (and most other layers) turns off mod-tap on most keys
-* Music layer disables all key mappings, Gaming layer disables modtaps
-
-### Layer Switching
-* Layer switcher key, used to switch layout (allows use of _NAV, _NUM layout without holding their layer keys)
-* **Punctuation layer** accessible by holding Tab, Backslash or Backspace
-* Grave switches to **One-Handed layer** on hold
-* **Mouse and arrow key layer** accessible by holding ; or A
-* Del switches to **Numpad** on hold
-* Enter switches to **Extra layer** on hold
-    * Extra layer will be used for applications shortcuts
-
-## Layers
-
-### Mac Qwerty
-```
-,-----------------------------------------------------------------------------------.
-| CAG/=|   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| LY|TB|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | LY|\ |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Hyper| LY|A | CT/S | AT/D | WN/F |   G  |   H  | WN/J | AT/K | CT/L | LY|; |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift| WN/Z |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Sh/Bk|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| LY|` |MH/ESC| LY|DL|LW|Bkp|LY|Bkp| Shift/Space |LY|ENT|RS|Bkp|   [  |   ]  |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-* Hold Tab (LY|TB), Backspace (LY|Bkp) or Backslash (LY|\ ) for **Punctuation Layer**
-* Hold Grave (LY|`) for **One-Handed Layer**
-* Hold Del (LY|DL) for **Numpad Layer**
-* Hold A or ; for **Navigation/Mouse Layer**
-* Hold Enter (LY|ENT) for **Extra layer**
-
-### Win Qwerty
-```
-,-----------------------------------------------------------------------------------.
-| CAG= |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| LY|TB|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | LY|\ |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Hyper| LY|A | WN/S | AT/D | CT/F |   G  |   H  | CT/J | AT/K | WN/L | LY/; |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift| CT/Z |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Sh/Bk|
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| LY|` |ESCMEH| LY|DL|LW|Bkp|LY|Bk |    Space    |LY|ENT|RS|Bkp|   [  |   ]  |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-* Hold Tab (LY|TB), Backspace (LY|Bkp) or Backslash (LY|\ ) for **Punctuation Layer**
-* Hold Grave (LY|`) for **One-Handed Layer**
-* Hold Del (LY|DL) for **Numpad Layer**
-* Hold A or ; for **Navigation/Mouse Layer**
-* Hold Enter (LY|ENT) for **Extra layer**
-
-### Gaming Qwerty
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | LY|; |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  =   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Ctrl | ESC  |  Alt |LW|Bkp|LY|Bk |    Space    |LY|ENT|RS|Bkp|   [  |   ]  |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-
-### Music Layer
-```
-,-----------------------------------------------------------------------------------.
-| Esc  | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| CTRL | ALT  | CMD  |      | XXXX |    Space    | XXXX |      | XXXX | XXXX |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-
-### Lower Layer
-```
-,-----------------------------------------------------------------------------------.
-| ESC  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | F11  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Tab  | Home |  Up  | End  | PGUP | XXXX | XXXX | XXXX | PrSc | Home | PGUP | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|  "   | Left | Down | Right|PGDWN | XXXX | XXXX | XXXX | Pause| End  |PGDWN | F12  |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      | CTRL |  Alt |  CMD | XXXX | XXXX | XXXX | XXXX | Prev | Play | Next | INS  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| CTRL |  Alt |  CMD | !!!! | Bksp |    Space    | Enter|      | Vol- | Vol+ |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-
-### Raise Layer
-```
-,-----------------------------------------------------------------------------------.
-| ESC  |  F1  |  F2  |  F3  |  F4  |  F5  | SCLK |   &  |   *  |   (  |   )  | Bksp |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |  F7  |  F8  |  F9  |  F10 |  F11 | XXXX |   &  |   *  |   {  |   }  | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Caps |  F1  |  F2  |  F3  |  F4  |  F5  | XXXX |   -  |   =  |   [  |   ]  | XXXX |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |  F7  |  F8  |  F9  |  F10 |  F11 | XXXX |ISO # |ISO \ | MRC1 | MRC2 | MRSP |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| CTRL |  Alt |  CMD |      | Bksp |    Space    | Enter| !!!! | MPL1 | MPL2 |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-
-### Adjust Layer
-```
-,-----------------------------------------------------------------------------------.
-|      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  | Reset|      |      |      |      |      |      |      |      |      | XXXX |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |Aud on|AudOff|QWmac |QWwin |QWmac |QWin  |      |      |  F12 |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |      |      |      |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-
-### Punctuation Layer
-```
-,-----------------------------------------------------------------------------------.
-|  +   |  !   |  @   |  #   |  $   |  %   |  ^   |  &   |  *   |  (   |   )  |  _   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| !!!! |  &   |  |   |  {   |   }  |  -   |  -   | XXXX | XXXX |  {   |   }  |  |(!)|
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|  "   |  /   |  *   |  (   |   )  |  +   |  +   | XXXX | XXXX |  [   |   ]  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |  \   |  %   |  [   |   ]  |  =   |  =   | XXXX |   <  |  >   |   ?  | INS  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|  ~   |  _   |  ^   | Del  | !!!! |    Space    | Enter| XXXX |  [   |   ]  |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-
-### Extra Layer
-```
-,-----------------------------------------------------------------------------------.
-|  ESC |      |      |      |      |      | SCLK |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|  Tab |      |      |      |      |      |      |      |      |      |      | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Caps |      |      |      |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      |      | MRC1 | MRC2 | MRSP |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| CTRL |  ALT |  CMD | Del  | Bksp |    Space    | !!!! |      | MPL1 | MPL2 |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-
-### Numeric Pad Layer
-```
-,-----------------------------------------------------------------------------------.
-|  ESC | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | NMLK | NUM/ | NUM* | NUM- | XXXX |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | Home |  Up  | End  | PGUP | XXXX | XXXX | NUM7 | NUM8 | NUM9 | NUM+ | XXXX |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| XXXX | Left | Down | Right| PGDWN| XXXX | XXXX | NUM4 | NUM5 | NUM6 | NUM+ | XXXX |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      | CTRL |  ALT | CMD  | XXXX | XXXX | XXXX | NUM1 | NUM2 | NUM3 | NENT | Bksp |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | XXXX | !!!! | XXXX | Bksp |    Space    | NUM0 | NUM0 | NUM. | NENT | QMAC |
-`-----------------------------------------------------------------------------------'
-```
-
-### Navigation Layer
-```
-,-----------------------------------------------------------------------------------.
-|  ESC |      |      | MOB3 |      |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |   A  | MOB2 | MOUP | MOB1 | MOSU | PGUP | Home |  Up  | End  |      | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      | !!!! | MOLF | MODN | MORT | MOSD | PGDN | Left | Down | Right| !!!! |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      | MOB4 | MOB5 | MOSL | MOSR | MOA2 | MOA0 | MPRV | MPLY | MNXT |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| CTRL | ALT  | CMD  |      | Bksp |    Space    | Enter| VILM | VOLD | VOLU | QMAC |
-`-----------------------------------------------------------------------------------'
-```
-
-### One-Handed Layer
-```
-,-----------------------------------------------------------------------------------.
-| Esc  |  6   |   7  |   8  |   9  |   0  |   -  | XXXX | XXXX | XXXX | XXXX | XXXX |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |   Y  |   U  |   I  |   O  |   P  | MWL3 | MWFS | MWR3 | MWTL | MWTR | XXXX |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |   H  |   J  |   K  |   L  |   :  | MWL1 | MWM1 | MWR1 | MWBL | MWBR | XXXX |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |   N  |   M  |   ,  |   .  |   /  | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| !!!! |  Esc |  Del |  Ent | Bksp |             | MWLT | MWBT | MWUP | MWRT |LY_SW |
-`-----------------------------------------------------------------------------------'
-```
-The right hand side of the keyboard contains shortcuts for moving windows on Mac (using Magnet)
-
-### Layer Switcher
-```
-,-----------------------------------------------------------------------------------.
-| Esc  | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|Brite | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| XXXX | XXXX | XXXX | XXXX | XXXX | GAME | XXXX | XXXX | XXXX | XXXX | NAV  | XXXX |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      | XXXX | XXXX | XXXX | XXXX | QMAC | XXXX | MUSC | XXXX | XXXX | XXXX | XXXX |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| XXXX | XXXX | NUM  | XXXX | XXXX |    XXXXX    | XXXX | XXXX | XXXX | XXXX | !!!! |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/preonic/keymaps/laurentlaurent/rules.mk b/keyboards/preonic/keymaps/laurentlaurent/rules.mk
deleted file mode 100644
index 3a551bd429b..00000000000
--- a/keyboards/preonic/keymaps/laurentlaurent/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC += muse.c
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/laurentlaurent/templates.c b/keyboards/preonic/keymaps/laurentlaurent/templates.c
deleted file mode 100644
index 2fe70caec63..00000000000
--- a/keyboards/preonic/keymaps/laurentlaurent/templates.c
+++ /dev/null
@@ -1,89 +0,0 @@
-// Templates for Preonic Keyboard
-
-/* BLANK Pass through
- * ,-----------------------------------------------------------------------------------.
- * |  ESC |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | CTRL |  ALT |  CMD |      |      |             |      |      |      |      |LY_SW |
- * `-----------------------------------------------------------------------------------'
- */
-[_BLANK] = LAYOUT_preonic_grid(
-    KC_ESC ,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    KC_LCTL,  KC_LALT,  KC_LGUI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  LLSWIT
-),
-
-/* BLANK No Pass through
- * ,-----------------------------------------------------------------------------------.
- * | Esc  | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX | XXXX |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | CTRL | ALT  | CMD  |      | XXXX |             | XXXX |      | XXXX | XXXX |LY_SW |
- * `-----------------------------------------------------------------------------------'
- */
-[_BLANK] = LAYOUT_preonic_grid(
-    KC_ESC ,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    KC_LCTL,  KC_LALT,  KC_LGUI,  _______,  XXXXXXX,  _______,  _______,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  LLSWIT
-),
-
-
-//===== From default preonic layouts
-// if you add this, make sure to add _COLEMAK and _DVORAK in the enum
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | XXXX | XXXX | XXXX |LY_SW |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_grid(
-    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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
-    KC_ESC,  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_ENT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   XXXXXXX, XXXXXXX, XXXXXXX, LLSWIT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | XXXX | XXXX | XXXX |LY_SW |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_grid(
-    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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   XXXXXXX, XXXXXXX, XXXXXXX, LLSWIT
-),
diff --git a/keyboards/preonic/keymaps/mechmaster48/config.h b/keyboards/preonic/keymaps/mechmaster48/config.h
deleted file mode 100644
index 208d7abdbce..00000000000
--- a/keyboards/preonic/keymaps/mechmaster48/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 mechmaster48
- *
- * 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(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
diff --git a/keyboards/preonic/keymaps/mechmaster48/keymap.c b/keyboards/preonic/keymaps/mechmaster48/keymap.c
deleted file mode 100644
index 7aa88267fde..00000000000
--- a/keyboards/preonic/keymaps/mechmaster48/keymap.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* Copyright 2021 MechMaster48 admin@mechbox.net
- *
- * 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"
-
-enum preonic_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |  Esc |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt | Gui  | Brite |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL,
-  KC_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_LCTL, KC_LALT, KC_LGUI, BACKLIT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / | Pg Up| Pg Dn|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset| Debug|      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |Aud cy|Aud on|AudOff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef RGBLIGHT_ENABLE
-              rgblight_step();
-            #endif
-            #ifdef __AVR__
-            writePinLow(E6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            writePinHigh(E6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-void dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-}
-
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/mechmaster48/readme.md b/keyboards/preonic/keymaps/mechmaster48/readme.md
deleted file mode 100644
index 8e2f9c11125..00000000000
--- a/keyboards/preonic/keymaps/mechmaster48/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# OLKB Preonic Rev3 layout by mechmaster48
-
-- A simple layout largely based on the default with minor tweaks to fit my typing.
-- The esacpe key has been moved to the top left, ctrl and alt moved to bottom left, and enter key has been moved up one space underneath delete.
-- Colemak and Dvorak layers have been removed in this keymap as I do not and will not use them.
-
-![base layer](https://i.imgur.com/zrmDHXx.gif)
-#------------------------------------------------------
-![lower layer](https://imgur.com/sDEeixE.gif)
-#------------------------------------------------------
-![raise layer](https://imgur.com/bGLukr1.gif)
-#------------------------------------------------------
-![adjust layer](https://imgur.com/UsB87YE.gif)
-#------------------------------------------------------
diff --git a/keyboards/preonic/keymaps/mechmaster48/rules.mk b/keyboards/preonic/keymaps/mechmaster48/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/mechmaster48/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/mikethetiger/config.h b/keyboards/preonic/keymaps/mikethetiger/config.h
deleted file mode 100644
index 1548d6c5dc1..00000000000
--- a/keyboards/preonic/keymaps/mikethetiger/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-
-#define MIDI_BASIC
-#define TAP_CODE_DELAY 10
-
-/* 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/mikethetiger/keymap.c b/keyboards/preonic/keymaps/mikethetiger/keymap.c
deleted file mode 100644
index f21d46ac9a2..00000000000
--- a/keyboards/preonic/keymaps/mikethetiger/keymap.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
-  KC_ESC,  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_ENT,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_grid(
-  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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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_HOME, KC_END, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  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_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_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_COLEMAK);
-          }
-          return false;
-          break;
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DVORAK);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            PORTE &= ~(1<<6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            PORTE |= (1<<6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/mikethetiger/readme.md b/keyboards/preonic/keymaps/mikethetiger/readme.md
deleted file mode 100644
index 6da54ebbb54..00000000000
--- a/keyboards/preonic/keymaps/mikethetiger/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# mikethetiger's Preonic layout - largely based on the Planck's
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/mikethetiger/rules.mk b/keyboards/preonic/keymaps/mikethetiger/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/mikethetiger/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/muzfuz/config.h b/keyboards/preonic/keymaps/muzfuz/config.h
deleted file mode 100644
index 37858350a84..00000000000
--- a/keyboards/preonic/keymaps/muzfuz/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/muzfuz/keymap.c b/keyboards/preonic/keymaps/muzfuz/keymap.c
deleted file mode 100644
index f1befddb833..00000000000
--- a/keyboards/preonic/keymaps/muzfuz/keymap.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes
-{
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  HASHRKT,
-  CLNEQLS
-};
-
-#define RSE_ENT LT(_RAISE, KC_ENT)
-#define LWR_SPC LT(_LOWER, KC_SPC)
-#define ESC_CTL CTL_T(KC_ESCAPE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   \  |
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ESCCTL  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower | Enter|Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-    [_QWERTY] = LAYOUT_preonic_grid(
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        ESC_CTL, 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,
-        BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, KC_NO, RSE_ENT, KC_NO, LWR_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-
-    /* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
- * ,-----------------------------------------------------------------------------------.
- * |      |  =>  |      |   [  |   ]  |      |      |   _  |   +  |   |   |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |ESCCTL|  :=  |      |  {   |  }   |   (  |   )  |   -  |   =  |   \  |   ~  | GUI |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |  [   |  ]   |     |     |      |      |      | Home  |  End  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-    [_LOWER] = LAYOUT_preonic_grid(
-        KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        _______, HASHRKT, _______, KC_LBRC, KC_RBRC, _______, _______, KC_UNDS, KC_PLUS, KC_PIPE, _______, _______,
-        ESC_CTL, CLNEQLS, _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_MINS, KC_EQL, KC_BSLS, KC_TILD, KC_RGUI,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
-
-    /* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |  Up  |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |ESCCTL|     | Left | Down | Right |      |      |      |      |      |      | GUI  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |     |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-    [_RAISE] = LAYOUT_preonic_grid(
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
-        _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______,
-        ESC_CTL, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, KC_RGUI,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
-
-    /* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-    [_ADJUST] = LAYOUT_preonic_grid(
-        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
-        _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
-        _______, _______, MU_NEXT, AU_ON, AU_OFF, _______, _______, QWERTY, _______, _______, _______, _______,
-        _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case HASHRKT:
-    if (record->event.pressed)
-    {
-      SEND_STRING("=>");
-    }
-    break;
-  case CLNEQLS:
-    if (record->event.pressed)
-    {
-      SEND_STRING(":=");
-    }
-    break;
-  case QWERTY:
-    if (record->event.pressed)
-    {
-      set_single_persistent_default_layer(_QWERTY);
-    }
-    return false;
-    break;
-  case LOWER:
-    if (record->event.pressed)
-    {
-      layer_on(_LOWER);
-      update_tri_layer(_LOWER, _RAISE, _ADJUST);
-    }
-    else
-    {
-      layer_off(_LOWER);
-      update_tri_layer(_LOWER, _RAISE, _ADJUST);
-    }
-    return false;
-    break;
-  case RAISE:
-    if (record->event.pressed)
-    {
-      layer_on(_RAISE);
-      update_tri_layer(_LOWER, _RAISE, _ADJUST);
-    }
-    else
-    {
-      layer_off(_RAISE);
-      update_tri_layer(_LOWER, _RAISE, _ADJUST);
-    }
-    return false;
-    break;
-  case BACKLIT:
-    if (record->event.pressed)
-    {
-      register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            PORTE &= ~(1<<6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            PORTE |= (1<<6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-  switch (index) {
-    case 0:
-      if (active) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      break;
-    case 1:
-      if (active) {
-        muse_mode = true;
-      } else {
-        muse_mode = false;
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-        #endif
-      }
-   }
-   return true;
-}
-
-void matrix_scan_user(void) {
-  #ifdef AUDIO_ENABLE
-    if (muse_mode) {
-      if (muse_counter == 0) {
-        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-        if (muse_note != last_muse_note) {
-          stop_note(compute_freq_for_midi_note(last_muse_note));
-          play_note(compute_freq_for_midi_note(muse_note), 0xF);
-          last_muse_note = muse_note;
-        }
-      }
-      muse_counter = (muse_counter + 1) % muse_tempo;
-    }
-  #endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/muzfuz/readme.md b/keyboards/preonic/keymaps/muzfuz/readme.md
deleted file mode 100644
index a709d5c946e..00000000000
--- a/keyboards/preonic/keymaps/muzfuz/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The muzfuz Preonic layout - largely based on the Planck's
-
-```shell
-make preonic/rev3:muzfuz:dfu-util
-```
diff --git a/keyboards/preonic/keymaps/muzfuz/rules.mk b/keyboards/preonic/keymaps/muzfuz/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/muzfuz/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/nikchi/config.h b/keyboards/preonic/keymaps/nikchi/config.h
deleted file mode 100644
index 2bebf48a1ca..00000000000
--- a/keyboards/preonic/keymaps/nikchi/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/nikchi/keymap.c b/keyboards/preonic/keymaps/nikchi/keymap.c
deleted file mode 100644
index 50589039b75..00000000000
--- a/keyboards/preonic/keymaps/nikchi/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#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 preonic_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | CTRL |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Lower|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Raise |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |BKSP  |SHIFT |ENTER |SPC   | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  KC_LCTL, 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, RAISE,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, KC_LSFT, KC_ENT,  KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  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_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
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_qwerty);
-            #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
diff --git a/keyboards/preonic/keymaps/nikchi/readme.md b/keyboards/preonic/keymaps/nikchi/readme.md
deleted file mode 100644
index e911968dd96..00000000000
--- a/keyboards/preonic/keymaps/nikchi/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default Preonic layout - largely based on the Planck's
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/pcurt854/config.h b/keyboards/preonic/keymaps/pcurt854/config.h
deleted file mode 100644
index eeeb89c8bfd..00000000000
--- a/keyboards/preonic/keymaps/pcurt854/config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2020 Pete Curt
- *
- * 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 LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 350
-
-
-#define RGBLIGHT_LAYERS
-
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-
-#define RGBLIGHT_SLEEP
-// so rgb sleeps when the system goes to sleep
-
-
-
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(CAMPANELLA)
-    // #define STARTUP_SONG SONG(FANTASIE_IMPROMPTU)
-    // #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    // DEFAULT_LAYER_SONGS are used in set_single_persistent_default_layer in quantum/quantum.c
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/pcurt854/keymap.c b/keyboards/preonic/keymaps/pcurt854/keymap.c
deleted file mode 100644
index af88b10f3b3..00000000000
--- a/keyboards/preonic/keymaps/pcurt854/keymap.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/* Copyright 2020 Pete Curt
- * Based on code by 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,	// 0
-  _COLEMAK,	// 1
-  _DVORAK,	// 2
-  _NUMPAD,	// 3
-  _SYMBOL,	// 4
-  _BRACKET,	// 5
-  _ADJUST	// 6
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  BACKLIT,
-  ABKPAIR,
-  RBKPAIR,
-  SBKPAIR,
-  CBKPAIR
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty layer 0
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |   Del|
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * | `~   |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |   Dnc|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Lead |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |    {}|      |      |      |    <>|      |      |      |      |
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * | LCtl |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |    []|    ()|    ap|      |      |      |      |      |      |      |      |
- * |osl(5)|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |osl(6)|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | osm  | RCtl | Opt  | Cmd  |osl(4)| Entr | Spc  | tt(3)|   /  | Left | Down | Rght |
- * | Lsft |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    QK_LEAD,
-  LCTL_T(KC_ESC),
-           KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  OSL(_BRACKET),
-           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   OSL(_ADJUST),
-  OSM(MOD_LSFT),
-           KC_RCTL, KC_LOPT, KC_LCMD, OSL(_SYMBOL),
-                                               KC_ENT,  KC_SPC,  TT(_NUMPAD),
-                                                                          KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Colemak layer 1
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |   Del|
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * | `~   |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |    <>|      |      |      |      |   Dnc|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Lead |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |    {}|      |      |      |      |      |      |
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * | LCtl |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |    []|    ()|    ap|      |      |      |      |      |      |      |      |
- * |osl(5)|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |osl(6)|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | osm  | RCtl | Opt  | Cmd  |osl(4)| Entr | Spc  | tt(3)|   /  | Left | Down | Rght |
- * | Lsft |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_grid(
-  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, QK_LEAD,
-  LCTL_T(KC_ESC),
-           KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  OSL(_BRACKET),
-           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   OSL(_ADJUST),
-  OSM(MOD_LSFT),
-           KC_RCTL, KC_LOPT, KC_LCMD, OSL(_SYMBOL),
-                                               KC_ENT,  KC_SPC,  TT(_NUMPAD),
-                                                                          KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Dvorak layer 2
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |   Del|
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * | `~   |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |    ap|      |      |   Dnc|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Lead |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |    {}|      |      |      |      |      |
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * | LCtl |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |    <>|      |    ()|      |      |      |      |    []|      |      |
- * |osl(5)|   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |  Up  |osl(6)|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | osm  | RCtl | Opt  | Cmd  |osl(4)| Entr | Spc  | tt(3)|   :  | Left | Down | Rght |
- * | Lsft |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_grid(
-  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    QK_LEAD,
-  LCTL_T(KC_ESC),
-           KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  OSL(_BRACKET),
-           KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_UP,   OSL(_ADJUST),
-  OSM(MOD_LSFT),
-           KC_RCTL, KC_LOPT, KC_LCMD, OSL(_SYMBOL),
-                                               KC_ENT,  KC_SPC,  TT(_NUMPAD),
-                                                                          KC_COLN, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-/* Numpad layer 3
- * ,-----------------------------------------------------------------------------------.
- * | ____ |   1  |   2  |   3  |   4  |   5  |  =+  |   7  |   8  |   9  |   ^  | ____ |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ____ |   6  |   7  |   8  |   9  |   0  |  -_  |   4  |   5  |   6  |   %  | ____ |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ____ |   1  |   2  |   3  |   4  |   5  |  *   |   1  |   2  |   3  | ____ | ____ |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | ____ |   6  |   7  |   8  |   9  |   0  |  /   |   0  | ____ | ____ | PgUp | ____ |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | tg(3)| ____ | Home | PgDn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_preonic_grid(
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL,  KC_7,    KC_8,    KC_9,    KC_CIRC, _______,
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_4,    KC_5,    KC_6,    KC_PERC, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_ASTR, KC_1,    KC_2,    KC_3,    _______, _______,
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH, KC_0,    _______, _______, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, _______, TG(_NUMPAD),
-                                                                          _______, KC_HOME, KC_PGDN, KC_END
-),
-
-/* Symbol layer 4
- * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | ____ |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ____ |      |      |   !  |   $  |   ~  |      |   _  |   |  |      |   %  | ____ |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | ____ |   @  |   *  |   &  |      |   `  |   #  |   -  |      |   +  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |   ^  |      |   \  |      |   =  |      |      | PgUp |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ____ | ____ | ____ | ____ | tg(4)| ____ | ____ |      |      | Home | PgDn | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_SYMBOL] = LAYOUT_preonic_grid(
-  XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  _______, XXXXXXX, XXXXXXX, KC_EXLM, KC_DLR,  KC_TILD, XXXXXXX, KC_UNDS, KC_PIPE, XXXXXXX, KC_PERC, _______,
-  _______, KC_AT,   KC_ASTR, KC_AMPR, XXXXXXX, KC_GRV,  KC_HASH, KC_MINS, XXXXXXX, KC_PLUS, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, XXXXXXX, KC_BSLS, XXXXXXX, KC_EQL,  XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX,
-  _______, _______, _______, _______, TG(_SYMBOL), _______, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END
-),
-
-/* Bracket layer 5
- * ,-----------------------------------------------------------------------------------.
- * |      |plain |breath|      |      |      |      |    < | <|>  | >    |      | ____ |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |snake |knight|      | rgb  | saT+ |      |    ( | (|)  | )    |      | ____ |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |rainbw|gradnt|      |      | mod+ | Hue+ |    [ | [|]  | ]    |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | tg(5)|swirl | Xmas | test |      | Brt+ |      |    { | {|}  | }    |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ____ | ____ | ____ | ____ |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_BRACKET] = LAYOUT_preonic_grid(
-  XXXXXXX, RGB_M_P,  RGB_M_B, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LABK, ABKPAIR, KC_RABK, XXXXXXX, _______,
-  XXXXXXX, RGB_M_SN, RGB_M_K, XXXXXXX, RGB_TOG, RGB_SAI, XXXXXXX, KC_LPRN, RBKPAIR, KC_RPRN, XXXXXXX, _______,
-  XXXXXXX, RGB_M_R,  RGB_M_G, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUI, KC_LBRC, SBKPAIR, KC_RBRC, XXXXXXX, XXXXXXX,
-  TG(_BRACKET),
-           RGB_M_SW, RGB_M_X, RGB_M_T, XXXXXXX, RGB_VAI, XXXXXXX, KC_LCBR, CBKPAIR, KC_RCBR, XXXXXXX, XXXXXXX,
-  _______, _______,  _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust layer 6
- *
- * The control sequences are highly personal.  Please change to adapt to your own system.
- *
- * ,-----------------------------------------------------------------------------------.
- * |      | F11  | F12  | F13  | F14  | F15  | F16  | F17  | F18  | F19  | F20  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Qwerty|Colemk|Dvorak|      |      |      |      |      |      |Print |QK_BOOT |
- * |      |      |      |      |      |      |      |      |      |      |screen|QK_BOOT |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |Sleep |show  |      |      |finder|mv win|      |Lock  |      |      |
- * |      |      |      |Dsktp |      |      |Hddn  |clkw  |      |screen|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      | Caps |Virus |      |      | Mute | vol+ |      | dsp+ | tg(6)|
- * |      |      |      |      |scan  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | ____ | ____ | ____ | ____ |      |      |      |      | vol- |      | dsp- |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  XXXXXXX, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  XXXXXXX,
-  XXXXXXX, QWERTY,  COLEMAK, DVORAK,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SCMD(KC_5), QK_BOOT,
-  XXXXXXX, XXXXXXX, C(LCMD(KC_PAUSE)),
-                             LCMD(KC_F4),
-                                      XXXXXXX, XXXXXXX, SCMD(KC_DOT),
-                                                                 LCA(KC_J), XXXXXXX, C(LCMD(KC_Q)), XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, SCMD(KC_V),
-                                               XXXXXXX, XXXXXXX, KC_MUTE,  KC_VOLU,     XXXXXXX, LCAG(KC_UP), TG(_ADJUST),
-  _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_VOLD,     XXXXXXX, LCAG(KC_DOWN), XXXXXXX
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_COLEMAK);
-          }
-          return false;
-          break;
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DVORAK);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            writePinLow(E6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            writePinHigh(E6);
-            #endif
-          }
-          return false;
-          break;
-        case ABKPAIR:
-          if (record->event.pressed) {
-              SEND_STRING("<>"SS_TAP(X_LEFT));
-          }
-          break;
-        case RBKPAIR:
-          if (record->event.pressed) {
-              SEND_STRING("()"SS_TAP(X_LEFT));
-          }
-          break;
-        case SBKPAIR:
-          if (record->event.pressed) {
-              SEND_STRING("[]"SS_TAP(X_LEFT));
-          }
-          break;
-        case CBKPAIR:
-          if (record->event.pressed) {
-              SEND_STRING("{}"SS_TAP(X_LEFT));
-          }
-          break;
-      }
-    return true;
-};
-
-/*
-  Preonic LEDs visible from the top:
-    6 5 4 3
-    7 8 1 2
-
-  The two numbers: starting LED number, number of LEDs
-*/
-const rgblight_segment_t PROGMEM my_numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {3, 3, HSV_ORANGE}
-);
-const rgblight_segment_t PROGMEM my_symbol_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {3, 3, HSV_MAGENTA}
-);
-const rgblight_segment_t PROGMEM my_bracket_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {3, 3, HSV_CYAN}
-);
-const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {3, 3, HSV_GREEN}
-);
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {6, 2, HSV_PINK}
-);
-
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_numpad_layer,
-    my_symbol_layer,
-    my_bracket_layer,
-    my_adjust_layer,
-    my_capslock_layer
-);
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = my_rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    for (int i = 0; i <= _ADJUST - _NUMPAD; i++) {
-        rgblight_set_layer_state(i, false);
-    }
-    int highest_layer = get_highest_layer(state);
-    if (highest_layer >= _NUMPAD && highest_layer <= _ADJUST) {
-        rgblight_set_layer_state(highest_layer-_NUMPAD, true);
-    }
-
-    return state;
-}
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(_ADJUST - _NUMPAD + 1, led_state.caps_lock);
-
-    return true;
-}
-
-bool did_leader_succeed;
-#ifdef AUDIO_ENABLE
-//float leader_start_song[][2] = SONG(CHROMATIC_SOUND);
-float leader_start_song[][2] = SONG(NO_SOUND);
-float leader_succeed_song[][2] = SONG(STARTUP_SOUND);
-//float leader_fail_song[][2] = SONG(GOODBYE_SOUND);
-float leader_fail_song[][2] = SONG(NO_SOUND);
-#endif
-
-void leader_start_user(void) {
-#ifdef AUDIO_ENABLE
-    PLAY_SONG(leader_start_song);
-#endif
-}
-
-void leader_end_user(void) {
-  did_leader_succeed = false;
-
-  // tap dance
-  // sort by first key
-
-  if (leader_sequence_one_key(KC_C)) {
-    SEND_STRING(SS_TAP(X_CAPS));
-    did_leader_succeed = true;
-  }
-
-  if (leader_sequence_one_key(KC_BSPC)) {
-    SEND_STRING(SS_TAP(X_DEL));
-    did_leader_succeed = true;
-  }
-
-  if (leader_sequence_one_key(KC_D)) {
-    SEND_STRING("{}"SS_TAP(X_LEFT));
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_two_keys(KC_D, KC_B)) {
-    SEND_STRING("Dear Brother");
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_three_keys(KC_D, KC_B, KC_S)) {
-    SEND_STRING("Dear Brothers and Sister");
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_two_keys(KC_D, KC_D)) {
-    SEND_STRING("{");
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_three_keys(KC_D, KC_D, KC_D)) {
-    SEND_STRING("}");
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_two_keys(KC_D, KC_S)) {
-    SEND_STRING("Dear Sister");
-    did_leader_succeed = true;
-  }
-
-  // Html Tags
-  if (leader_sequence_two_keys(KC_H, KC_T)) {
-    SEND_STRING("<></>"SS_TAP(X_LEFT));
-    did_leader_succeed = true;
-  }
-
-  if (leader_sequence_two_keys(KC_I, KC_C)) {
-    SEND_STRING("In Christ,");
-    did_leader_succeed = true;
-  }
-
-  if (leader_sequence_one_key(KC_J)) {
-    SEND_STRING("<>"SS_TAP(X_LEFT));
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_two_keys(KC_J, KC_J)) {
-    SEND_STRING("<");
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_three_keys(KC_J, KC_J, KC_J)) {
-    SEND_STRING(">");
-    did_leader_succeed = true;
-  }
-
-  if (leader_sequence_two_keys(KC_T, KC_S)) {
-    SEND_STRING("Thanks!");
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_two_keys(KC_T, KC_Y)) {
-    SEND_STRING("Thank you!");
-    did_leader_succeed = true;
-  }
-
-  if (leader_sequence_one_key(KC_X)) {
-    SEND_STRING("()"SS_TAP(X_LEFT));
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_two_keys(KC_X, KC_X)) {
-    SEND_STRING("(");
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_three_keys(KC_X, KC_X, KC_X)) {
-    SEND_STRING(")");
-    did_leader_succeed = true;
-  }
-
-  if (leader_sequence_one_key(KC_Z)) {
-    SEND_STRING("[]"SS_TAP(X_LEFT));
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_two_keys(KC_Z, KC_Z)) {
-    SEND_STRING("[");
-    did_leader_succeed = true;
-  }
-  if (leader_sequence_three_keys(KC_Z, KC_Z, KC_Z)) {
-    SEND_STRING("]");
-    did_leader_succeed = true;
-  }
-
-  if (did_leader_succeed) {
-#ifdef AUDIO_ENABLE
-    PLAY_SONG(leader_succeed_song);
-#endif
-  } else {
-#ifdef AUDIO_ENABLE
-    PLAY_SONG(leader_fail_song);
-#endif
-  }
-}
-
diff --git a/keyboards/preonic/keymaps/pcurt854/readme.md b/keyboards/preonic/keymaps/pcurt854/readme.md
deleted file mode 100644
index 51b522f9469..00000000000
--- a/keyboards/preonic/keymaps/pcurt854/readme.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# For programmers having trouble touch typing the top row
-
-### My problem and using preonic to solve it
-
-I am an okay letter typist, but often need to look and find special symbols, like $ and ^, on the top row.  Using layers, I assigned special symbols to keys corresponding to their names.
-
-When entering numbers, I like to use the numpad.  But the numpad on a full-sized keyboard is simply too far away.  Staggered keyboard makes it awkward to move the numpad in.  Preonic is ortholinear, and of the right size.  It's quite natural to move the numpad in.  Along the side of the numpad, I also included rows of 1-5 and 6-0.  Sometimes, it's simpler to enter numbers this way.
-
-For programmers, parentheses, brackets, and braces are important.  They are moved to under the fingers in an easy to remember layout as well.
-
-### Layer 0
-
-The middle section, from 1 to 0, plus three rows of letters, follows the traditional QWERTY layout.
-
-The left border, from top to bottom: Esc when tapped and ~ with Shift and ` with Command, Tab, Esc when tapped and Control when held, and One shot layer 5.
-
-The right border: Backspace, Tap dancing leader key, quotes, and One shot layer 6.
-
-Bottom row, left to right: One shot modifier Left shift, Control, Option, Command, One shot layer 4, Enter, Space, Layer 3 double tap to toggle, Slash (moved here to allow for a traditional cluster of arrows), Left, Down, and Right.
-
-### Layer 1
-
-Middle: Colemak
-
-Border: Same as QWERTY
-
-### Layer 2
-
-Middle: Dvorak
-
-Border: Same as QWERTY
-
-### Layer 3
-
-Numpad and common operators around it, with the left of board filled with rows of 1-5 and 6-0
-
-Home/End/Page Up/Down in place of arrow keys
-
-### Layer 4
-
-Special symbols using a character in their names:
-
-pLus (+), pIpe (|)
-
-anD (&), dollaR ($)
-
-At (@), Backslash (\\), Circumflex (^), Exclamation (!), Grave (`), Hash (#), Percent (%), Star (*), Tilde (~), Underscore (_)
-
-minus (\-) is put on J so it's under Underscore, easy to access, and matches the bump on J
-
-equal sign (=) is put on M, under J, because putting it on Q make accidential Command-Q likely
-
-Same Home/End/Page Up/Down cluster as that on Layer 3
-
-### Layer 5
-
-Brackets
-
-### Layer 6
-
-Reset, Caps lock. Base layer switches, RGB backlight controls, Volume controls, and other special functions
-
-### RGB backlight
-
-... is used to indicate the status of Cap locks and which of the higher layers is on.
-
-### Tap dancing
-
-With the Leader key, Tap dance the brackets: <> () [] {}, Cap lock, and some simple phrases.
-
-
diff --git a/keyboards/preonic/keymaps/pcurt854/rules.mk b/keyboards/preonic/keymaps/pcurt854/rules.mk
deleted file mode 100644
index ee75c8b3a84..00000000000
--- a/keyboards/preonic/keymaps/pcurt854/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_ENABLE = yes
-LEADER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/pezhore/config.h b/keyboards/preonic/keymaps/pezhore/config.h
deleted file mode 100644
index 1c0099ae402..00000000000
--- a/keyboards/preonic/keymaps/pezhore/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2015-2017 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
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/pezhore/keymap.c b/keyboards/preonic/keymaps/pezhore/keymap.c
deleted file mode 100644
index ec7cd731728..00000000000
--- a/keyboards/preonic/keymaps/pezhore/keymap.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _FN,
-  _NUMPAD,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  SHRUG,  // ¯\_(ツ)_/¯
-  TFLIP,  // (╯°□°)╯︵ ┻━┻
-  POOP,   // 💩
-  DPOINT, // (ಠ_ಠ)
-  STRUT   // ᕕ( ᐛ )ᕗ
-};
-
-#define TG_NUMP TG(_NUMPAD)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | FN   | Ctrl | GUI  | ALT  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  KC_ESC,  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,
-  MO(_FN), KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* FN
- * ,-----------------------------------------------------------------------------------.
- * |RGBTgl|Brigt-|Brigt+|      |      |      |      |      |      |      |      | POOP |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | RGB+ | Hue- | Hue+ |      |      |      |      |      |      |      |PrtScr|UC_Nxt|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | RGB- | Sat- | Sat+ |      |      |      |      |      |      |      |      |UC_Wnc|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Effct-|Effct+|      |      |      |      |      |      |      |      |UC_Lin|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |SHRUG |TFLIP |DPOINT|STRUT |      |      |      |      |TgNmpd|      |UC_Mac|
- * `-----------------------------------------------------------------------------------'
- */
-[_FN] = LAYOUT_preonic_grid(
-  RGB_TOG,  RGB_VAD, RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  POOP,
-  RGB_MOD,  RGB_HUD, RGB_HUI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  UC_NEXT,
-  RGB_RMOD, RGB_SAD, RGB_SAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  UC_WINC,
-  _______,  RGB_SPD, RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  UC_LINX,
-  _______,  SHRUG,   TFLIP,    DPOINT,   STRUT,    _______,  _______,  _______,   _______, TG_NUMP,  _______,  UC_MAC
-),
-
-/* Numpad
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |NumLk |   7  |   8  |   9  |   /  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |      |      |      |      |      |      |   4  |   5  |   6  |   *  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |      |      |      |      |      |      |   1  |   2  |   3  |   -  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   0  |   .  |   =  |   +  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_preonic_grid(
-  _______,  _______,  _______,  _______,  _______,  _______,  KC_NUM,    KC_P7,   KC_P8,    KC_P9,    KC_PSLS,  KC_BSPC,
-  KC_ESC,   _______,  _______,  _______,  _______,  _______,  _______,   KC_P4,   KC_P5,    KC_P6,    KC_PAST,  KC_DEL,
-  KC_TAB,   _______,  _______,  _______,  _______,  _______,  _______,   KC_P1,   KC_P2,    KC_P3,    KC_PMNS,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,   KC_P0,   KC_PDOT,  KC_PEQL,  KC_PPLS,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |Raise | Home | PgDn | PgUp | End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_BSPC,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  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,    _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      | Prev |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |      |      |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_BSPC,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  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_MPRV,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MPLY
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-  _______,  QK_BOOT,  DB_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,
-  _______,  _______,  MU_NEXT,  AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  _______,  _______,  _______,  _______,  _______,
-  _______,  AU_PREV,  AU_NEXT,  MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,  _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER,  _RAISE,  _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER,  _RAISE,  _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER,  _RAISE,  _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER,  _RAISE,  _ADJUST);
-          }
-          return false;
-          break;
-        case SHRUG:
-          if (record->event.pressed) {
-            send_unicode_string("¯\\_(ツ)_/¯");
-          }
-          return false;
-          break;
-        case TFLIP:
-          if (record->event.pressed) {
-            send_unicode_string("(╯°□°)╯︵ ┻━┻");
-          }
-          return false;
-          break;
-        case POOP:
-          if (record->event.pressed) {
-            send_unicode_string("💩");
-          }
-          return false;
-          break;
-        case DPOINT:
-          if (record->event.pressed) {
-            send_unicode_string("(ಠ_ಠ)");
-          }
-          return false;
-          break;
-        case STRUT:
-          if (record->event.pressed) {
-            send_unicode_string("ᕕ( ᐛ )ᕗ");
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      tap_code(KC_PGDN);
-    } else {
-      tap_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/pezhore/readme.md b/keyboards/preonic/keymaps/pezhore/readme.md
deleted file mode 100644
index e911968dd96..00000000000
--- a/keyboards/preonic/keymaps/pezhore/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default Preonic layout - largely based on the Planck's
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/pezhore/rules.mk b/keyboards/preonic/keymaps/pezhore/rules.mk
deleted file mode 100644
index 23198218b43..00000000000
--- a/keyboards/preonic/keymaps/pezhore/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-#UNICODEMAP_ENABLE = yes
-UNICODE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/pitty/config.h b/keyboards/preonic/keymaps/pitty/config.h
deleted file mode 100644
index 789d59b919b..00000000000
--- a/keyboards/preonic/keymaps/pitty/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-
-
-#    define STARTUP_SONG SONG(PREONIC_SOUND)
-#    define GOODBYE_SONG SONG(STARTUP_SOUND)
-#    define MUSIC_ON_SONG SONG(TERMINAL_SOUND)
-#endif
-
-#undef  TEMPO_DEFAULT
-
-#define TEMPO_DEFAULT 200
-
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-
diff --git a/keyboards/preonic/keymaps/pitty/keymap.c b/keyboards/preonic/keymaps/pitty/keymap.c
deleted file mode 100644
index 39c26eaa2d5..00000000000
--- a/keyboards/preonic/keymaps/pitty/keymap.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_hungarian.h" 
-
-enum preonic_layers {
-  _QWERTY,
-  _GAME,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  GAME,
-  LOWER,
-  RAISE,
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |  0   |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   Ö  |  Ü   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | TAB  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  |  Ő   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   É  |  Á   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   -  | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  ALt |Lower |    Space    | Bksp | Enter|Raise | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  HU_0,                  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    HU_ODIA, HU_UDIA,
-  KC_TAB,                KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    HU_Z,    KC_U,    KC_I,    KC_O,    KC_P,    HU_ODAC,
-  KC_ESC,                KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    HU_EACU, HU_AACU,
-  MT(MOD_LSFT, KC_NUBS), HU_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    HU_COMM, HU_DOT,  HU_MINS, KC_RSFT,
-  KC_LCTL,               KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  KC_ENT,  KC_BSPC, KC_RALT, RAISE,   KC_INS,  KC_DEL
-),
-
-
-/* Game
- * ,-----------------------------------------------------------------------------------.
- * |  0   |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   Ö  |  Ü   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | TAB  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  |  Ő   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   É  |  Á   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   -  | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  ALt |Raise |    Space    | Bksp | Enter|Lower | Left | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT_preonic_grid(
-  HU_0,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    HU_ODIA, HU_UDIA,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    HU_Z,    KC_U,    KC_I,    KC_O,    KC_P,    HU_ODAC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    HU_EACU, HU_AACU,
-  KC_LSFT, HU_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    HU_COMM, HU_DOT,  HU_MINS, KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, RAISE,   KC_SPC,  KC_SPC,  KC_ENT,  KC_BSPC, KC_RALT, LOWER,   KC_INS,  KC_DEL
-),
-
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |   7  |   8  |   9  |   +  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |  Up  |      |      |      |      |   4  |   5  |   6  |   -  |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Left | Down | Right|      |      |      |   1  |   2  |   3  |   *  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |Lnxcpy|Lnxpst|      |      |   0  |      |      |   /  |  =   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |PageDn|PageUp|  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, HU_7,    HU_8,    HU_9,    HU_PLUS,   _______,
-  _______, _______, KC_UP,   _______, _______, KC_HOME, KC_PGUP, HU_4,    HU_5,    HU_6,    HU_MINS,   _______,
-  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_END,  KC_PGDN, HU_1,    HU_2,    HU_3,    HU_ASTR,   _______,
-  _______, _______, _______, _______, _______, _______, _______, HU_0,    _______, _______, HU_SLSH,   HU_EQL,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_GAME), TO(_QWERTY)
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |  F12 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |  Up  |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Left | Down | Right|      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |PageDn|PageUp|  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,
-  _______, _______, KC_UP,   _______, _______, KC_HOME, KC_PGUP, _______, _______, _______, _______,   _______,
-  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_END,  KC_PGDN, _______, _______, _______, _______,   _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_GAME), TO(_QWERTY)
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    }
-  return true;
-}
-
-#ifdef AUDIO_ENABLE
-
-float raise_low[][2] = SONG(TERMINAL_SOUND);
-float gaming[][2] = SONG(AG_SWAP_SOUND);
-float adjust[][2] = SONG(UNICODE_LINUX);
-float my_song[][2] = SONG(NO_SOUND);
-
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _RAISE:
-        PLAY_SONG (raise_low);
-        break;
-    case _LOWER:
-        PLAY_SONG (raise_low);
-        break;
-    case _GAME:
-        PLAY_SONG (gaming);
-        break;
-    case _ADJUST:
-        PLAY_SONG (adjust);
-        break;
-    default: //  for any other layers, or the default layer
-        PLAY_SONG (my_song);
-        break;
-    }
-  return state;
-}
diff --git a/keyboards/preonic/keymaps/pitty/readme.md b/keyboards/preonic/keymaps/pitty/readme.md
deleted file mode 100644
index 42b3076089b..00000000000
--- a/keyboards/preonic/keymaps/pitty/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-My Preonic keymap
-
-Including Hungarian characters and layer reactive sound feedback
-
-make preonic/rev3:pitty:dfu-util
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/pvillano/config.h b/keyboards/preonic/keymaps/pvillano/config.h
deleted file mode 100644
index 6e86e51d330..00000000000
--- a/keyboards/preonic/keymaps/pvillano/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-// #define MUSIC_MAP
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/pvillano/keymap.c b/keyboards/preonic/keymaps/pvillano/keymap.c
deleted file mode 100644
index 01cec1f80bd..00000000000
--- a/keyboards/preonic/keymaps/pvillano/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Do as you please
- * - pvillano
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-  enum preonic_layers {
-    _QWERTY,
-    _GAME,
-    _ALT,
-    _FUN,
-  };
-
-  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------------------------------.
-   * |  Esc   |    1   |    2   |    3   |    4   |    5   |    6   |    7   |    8   |    9   |    0   |  Bksp  |
-   * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-   * |   `    |    Q   |    W   |    E   |    R   |    T   |    Y   |    U   |    I   |    O   |    P   |   \    |
-   * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
-   * |  Tab   |    A   |    S   |    D   |    F   |    G   |    H   |    J   |    K   |    L   |    ;   |   "    |
-   * |--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-   * |  Shift |    Z   |    X   |    C   |    V   |    B   |    N   |    M   |    ,   |    .   |    /   | Enter  |
-   * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-   * |  Ctrl  |  GUI   |  Alt   |  Func  |AltLayer|  Space |    _   |AltLayer|  Left  |  Down  |   Up   | Right  |
-   * `-----------------------------------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT_preonic_grid(
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-      KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-      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, MO(_FUN),MO(_ALT),KC_SPC,  KC_UNDS, MO(_ALT),KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Game
-   * ,-----------------------------------------------------------------------------------------------------------.
-   * |        |        |        |        |        |        |        |        |        |        |        |        |
-   * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-   * |        |        |        |        |        |        |        |        |        |        |        |        |
-   * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
-   * |        |        |        |        |        |        |        |        |        |        |        |        |
-   * |--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-   * |        |        |        |        |        |        |        |        |        |        |        |        |
-   * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-   * |        |  NOOP  |        |        |        |        |  ALT   |        |        |        |        |        |
-   * `-----------------------------------------------------------------------------------------------------------'
-   */
-  [_GAME] = LAYOUT_preonic_grid(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, XXXXXXX, _______, _______, _______, _______, KC_LALT, _______, _______, _______, _______, _______
-  ),
-
-  /* Alt
-   * ,-----------------------------------------------------------------------------------------------------------.
-   * |        |    !   |    @   |    #   |    $   |    %   |    ^   |    &   |    *   |    (   |    )   |  Bksp  |
-   * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-   * |        |Keypad 7|Keypad 8|Keypad 9|        |        |        |    -   |    +   |    {   |    }   |        |
-   * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
-   * |        |Keypad 4|Keypad 5|Keypad 6|        |        |        |    -   |    =   |    [   |    ]   |        |
-   * |--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-   * |        |Keypad 1|Keypad 2|Keypad 3|        |        |        |        |        |    <   |    >   |        |
-   * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-   * |        |Keypad 0|Keypad 0|        |        |        |        |        |        |        |        |        |
-   * `-----------------------------------------------------------------------------------------------------------'
-   */
-  [_ALT] = LAYOUT_preonic_grid(
-      _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-      _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-      _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-      _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, _______, KC_LT,   KC_GT,   _______,
-      _______, KC_P0,   KC_P0,   _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  /* Function
-   * ,-----------------------------------------------------------------------------------------------------------.
-   * |        |   F1   |   F2   |   F3   |   F4   |        |        |        |        |        |        |  Del   |
-   * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-   * |        |   F5   |   F6   |   F7   |   F8   |        |        |        |        |        |program |        |
-   * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
-   * |        |   F9   |   F10  |   F11  |   F12  |  Game  |        |        |        |        |        |        |
-   * |--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
-   * |        |        |        |        |        |        |Num Lock|  Music |        |        |        |        |
-   * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-   * |        |        |        |        |        |        |        |        |        |        |        |        |
-   * `-----------------------------------------------------------------------------------------------------------'
-   */
-  [_FUN] = LAYOUT_preonic_grid(
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, _______, _______, _______, _______, KC_DEL,
-      _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, _______, _______, _______, _______, QK_BOOT, _______,
-      _______, KC_F9,   KC_F10,  KC_F11,  KC_F12, TG(_GAME),_______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, KC_NUM,  MU_TOGG, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-  };
-
-
-  bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-      case MO(_FUN):
-      case MO(_ALT):
-      case KC_SPC:
-      case KC_UNDS:
-        return false;
-      default:
-        return true;
-    }
-  }
diff --git a/keyboards/preonic/keymaps/pvillano/readme.md b/keyboards/preonic/keymaps/pvillano/readme.md
deleted file mode 100644
index a1d11f8acb7..00000000000
--- a/keyboards/preonic/keymaps/pvillano/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# A preonic layout similar to the default,
-
-but with some extra conviences for programming and gaming
-
-## For programming
-
-* Underscore is next to space.
-* Backslash replaces Del on the default layer.
-* Brackets are easy to reach, and are arranged symmetrically.
-
-## For Gaming
-
-* Gaming mode disables OS key.
-* Gaming mode moves ALT to "right space", to be more easily reached.
-* Numpad is available with only the left hand (for emotes).
-
-## Personal taste
-
-* Esc is in the top left, where it belongs
-* Only one Alt layer and one Func layer
-* Function codes are mnemonic
-  * Func + G for Game mode
-  * Func + M for Music mode
-  * Func + N for Num lock
-* No multi-key combos with more than two keys
diff --git a/keyboards/preonic/keymaps/pvillano/rules.mk b/keyboards/preonic/keymaps/pvillano/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/pvillano/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/senseored/config.h b/keyboards/preonic/keymaps/senseored/config.h
deleted file mode 100644
index 9e6dc11513b..00000000000
--- a/keyboards/preonic/keymaps/senseored/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-
-#define MIDI_BASIC
-#define RGBLIGHT_SLEEP
-#define TAPPING_TOGGLE 2
-#define ALT_F4 LALT(KC_F4)
-#define CTALDEL LSFT(LCTL(KC_ESC))
-#define NO_DEBUG
-#define CTLZ LCTL(KC_Z)
-#define CTLX LCTL(KC_X)
-#define CTLC LCTL(KC_C)
-#define CTLV LCTL(KC_V)
-/* 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/senseored/keymap.c b/keyboards/preonic/keymaps/senseored/keymap.c
deleted file mode 100644
index 587e76398d9..00000000000
--- a/keyboards/preonic/keymaps/senseored/keymap.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY,
-  _FNL1,
-  _LOWER,
-  _RAISE,
-  _FNL2,
-  _ADJUST,
-  _GAMEMODE,
-  _FNL3,
-  _LOWER2,
-  _RAISE2
-};
-
-enum preonic_keycodes {
-  TBMACRO = SAFE_RANGE,
-  DGRMCRO,
-  WRKMOD,
-  BACKLIT,
-  RAISE,
-  LOWER
-};
-
-bool bnumlock = false;
-bool numlock_changed = false;
-bool workmode = true;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   [  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | FNL1 |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   "  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI  | Alt  | Bksp |Lower |    Space    |Raise | Bksp | AltGr|   *  | Esc  |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  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_TAB,     KC_Q,    KC_W,    KC_E,       KC_R,   KC_T,   KC_Y,       KC_U,    KC_I,   KC_O,     KC_P,  KC_LBRC,
-  TT(_FNL1),  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_DEL, TT(_LOWER), KC_SPC, KC_SPC, TT(_RAISE), KC_BSPC, KC_RALT, KC_NUHS,  KC_ESC
-),
-
-/* FNL1
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |TbMacr| Prev | Play | Next | AltF4| CapsL| Esc  | PgUp |  Up  | PgDn |PrScrn| Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | Vol- | Vol+ | Mute | NumL | Home | Left | Down | Right|      |  Del |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      | End  |      |      |      |   ?  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |   !  |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FNL1] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS,  KC_ESC, KC_PGUP,   KC_UP, KC_PGDN, KC_PSCR, KC_BSPC,
-  TT(_FNL1), _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
-  KC_LSFT,    CTLZ,    CTLX,    CTLC,    CTLV, _______,  KC_END, _______, _______, _______, LSFT(KC_MINS), _______,
-  _______, _______, CTALDEL, _______, _______, _______, _______, _______, _______, _______, LSFT(KC_1), _______
-),
-
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   §  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   +  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ´  |   `  |   @  |   £  |   $  |   €  |   ¨  |   {  |   [  |   ]  |   }  |   \  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   <  |   |  |   >  |   °  |      |      |   µ  |   ¨  |   ^  |   ~  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      | AltGr|      |      |             |      |      |      |      | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  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_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, S(KC_EQL),   RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_E), KC_RBRC, RALT(KC_7), RALT(KC_8), RALT(KC_9),    RALT(KC_0), RALT(KC_MINS),
-  KC_LSFT, KC_NUBS, RALT(KC_NUBS), S(KC_NUBS), DGRMCRO, XXXXXXX, XXXXXXX,   RALT(KC_M),   KC_RBRC,  S(KC_RBRC), RALT(KC_RBRC),       _______,
-  _______, _______,       KC_RALT,    _______,TO(_ADJUST), _______, _______,      _______,   _______,     _______,       _______, TO(_QWERTY)
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  Tab |  F1  |  F2  |  F3  |  F4  |  Esc | Bksp |   /  |   7  |   8  |   9  |   -  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | FNL2 |  F5  |  F6  |  F7  |  F8  |Insert| Home | PgUp |   4  |   5  |   6  |   +  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |  Del | End  | PgDn |   1  |   2  |   3  | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |  Alt |      |      |             |   *  |   0  |   ,  |   .  | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TAB,    KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_ESC, KC_BSPC, KC_PSLS,  KC_P7,  KC_P8,  KC_P9, KC_PMNS,
-  TT(_FNL2), KC_F5,   KC_F6,   KC_F7,   KC_F8,  KC_INS, KC_HOME, KC_PGUP,  KC_P4,  KC_P5,  KC_P6, KC_PPLS,
-  KC_LSFT,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_END, KC_PGDN,  KC_P1,  KC_P2,  KC_P3, KC_PENT,
-  _______, _______, KC_LALT, _______, TO(_QWERTY), _______, _______, KC_PAST,  KC_P0,  KC_PDOT, KC_DOT, TO(_QWERTY)
-),
-
-/* FNL2
- * ,-----------------------------------------------------------------------------------.
- * |TbMacr| Prev | Play | Next | AltF4| CapsL|      |PrScrn|Insert| Home | PgUp |ScrLck|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | Vol- | Vol+ | Mute | NumL |      |      |  Del | End  | PgDn | Pause|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |  Up  |      | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Left | Down | Right| BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_FNL2] = LAYOUT_preonic_grid(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS, _______, KC_PSCR,  KC_INS, KC_HOME, KC_PGUP, KC_SCRL,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  _______, _______,  KC_DEL,  KC_END, KC_PGDN, KC_PAUS,
-  _______,    CTLZ,    CTLX,    CTLC,    CTLV, _______, _______, _______, _______,   KC_UP, _______, KC_ENT,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, TO(_QWERTY)
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | GAME | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  TO(_GAMEMODE), QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY)
-),
-
-
-/* Game mode
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   [  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | FNL1 |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   "  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   1  | Lower| Bksp | Alt  |    Space    | Raise| Bksp | BAIL |   *  | Esc  |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAMEMODE] = LAYOUT_preonic_grid(
-  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_TAB,     KC_Q,    KC_W,    KC_E,       KC_R,   KC_T,   KC_Y,       KC_U,    KC_I,   KC_O,     KC_P,  KC_LBRC,
-  TT(_FNL3),  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_1, MO(_LOWER2),  KC_DEL, KC_LALT, KC_SPC, KC_SPC, MO(_RAISE2), KC_BSPC, TO(_QWERTY), KC_NUHS, KC_ESC
-),
-/* FNL3
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |TbMacr| Prev | Play | Next | AltF4| CapsL| Esc  | PgUp |  Up  | PgDn |PrScrn| Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | Vol- | Vol+ | Mute | NumL | Home | Left | Down | Right|      |  Del |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      | End  |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_FNL3] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  TBMACRO, KC_MPRV, KC_MPLY, KC_MNXT,  ALT_F4, KC_CAPS,  KC_ESC, KC_PGUP,   KC_UP, KC_PGDN, KC_PSCR, KC_BSPC,
-  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_NUM,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______,  KC_DEL,
-  KC_LSFT, _______, _______, _______, _______, _______,  KC_END, _______, _______, _______, LSFT(KC_MINS), _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LSFT(KC_1), _______
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Tab |  F1  |  F2  |  F3  |  F4  |  Esc | Bksp |   /  |   7  |   8  |   9  |   -  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | FNL2 |  F5  |  F6  |  F7  |  F8  |Insert| Home | PgUp |   4  |   5  |   6  |   +  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F9  |  F10 |  F11 |  F12 |  Del | End  | PgDn |   1  |   2  |   3  | Enter|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |  Alt |      |      |             |   *  |   0  |   ,  |   .  | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER2] = LAYOUT_preonic_grid(
-  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_TAB,    KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_ESC, KC_BSPC, KC_PSLS,  KC_P7,  KC_P8,  KC_P9, KC_PMNS,
-  TT(_FNL2), KC_F5,   KC_F6,   KC_F7,   KC_F8,  KC_INS, KC_HOME, KC_PGUP,  KC_P4,  KC_P5,  KC_P6, KC_PPLS,
-  KC_LSFT,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_END, KC_PGDN,  KC_P1,  KC_P2,  KC_P3, KC_PENT,
-  _______, _______, _______, _______, _______, _______, _______, KC_PAST,  KC_P0,  KC_PDOT, KC_DOT, TO(_GAMEMODE)
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   §  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   +  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ´  |   `  |   @  |   £  |   $  |   €  |   ¨  |   {  |   [  |   ]  |   }  |   \  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   <  |   |  |   >  |   °  |      |      |   µ  |   ¨  |   ^  |   ~  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      | AltGr|      |      |             |      |      |      |      | BAIL |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE2] = LAYOUT_preonic_grid(
-  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_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, S(KC_EQL),   RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_E), KC_RBRC, RALT(KC_7), RALT(KC_8), RALT(KC_9),    RALT(KC_0), RALT(KC_MINS),
-  KC_LSFT, KC_NUBS, RALT(KC_NUBS), S(KC_NUBS), DGRMCRO, XXXXXXX, XXXXXXX,   RALT(KC_M),   KC_RBRC,  S(KC_RBRC), RALT(KC_RBRC),       _______,
-  _______, _______,       KC_RALT,    _______, _______, _______, _______,      _______,   _______,     _______,       _______, TO(_GAMEMODE)
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case TBMACRO:
-                SEND_STRING(SS_TAP(X_TAB) SS_DOWN(X_LSFT) SS_TAP(X_HOME) SS_UP(X_LSFT) SS_TAP(X_DELETE));
-                return false;
-            case DGRMCRO:
-                if(!bnumlock) {
-                    tap_code(KC_NUM_LOCK);
-                    bnumlock = true;
-                }
-                //SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P0) SS_TAP(X_P1) SS_TAP(X_P7) SS_TAP(X_P6) SS_UP(X_LALT));
-                SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_KP_0) SS_TAP(X_KP_1) SS_TAP(X_KP_7) SS_TAP(X_KP_6) SS_UP(X_LALT) );
-                return false;
-
-            if(bnumlock) {
-                tap_code(KC_NUM_LOCK);
-                bnumlock = false;
-                }
-            case WRKMOD:
-                if(!workmode) {
-                    workmode = true;
-                    return false;
-                }
-                else {
-                    workmode = false;
-                    return false;
-                }
-        }
-
-    }
-    return true;
-  switch (keycode) {
-
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef __AVR__
-            PORTE &= ~(1<<6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            PORTE |= (1<<6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      register_code(KC_PGDN);
-      unregister_code(KC_PGDN);
-    } else {
-      register_code(KC_PGUP);
-      unregister_code(KC_PGUP);
-    }
-  }
-    return true;
-}
-
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if (active) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-    return true;
-}
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-//  if(rgblight_get_mode() == 1) {
-    switch (get_highest_layer(state)) {
-    case _QWERTY:
-        if(bnumlock) {
-            tap_code(KC_NUM_LOCK);
-        }
-        break;
-    case _LOWER:
-        if(!bnumlock) {
-            tap_code(KC_NUM_LOCK);
-        }
-
-        break;
-    case _ADJUST:
-        if(bnumlock) {
-                tap_code(KC_NUM_LOCK);
-        }
-        break;
-    case _RAISE:
-        if(bnumlock) {
-                tap_code(KC_NUM_LOCK);
-        }
-        break;
-    case _FNL1:
-        if(bnumlock) {
-                tap_code(KC_NUM_LOCK);
-        }
-        break;
-    case _GAMEMODE:
-        break;
-    default: //  for any other layers, or the default layer
-        if(bnumlock) {
-                tap_code(KC_NUM_LOCK);
-        }
-
-        break;
-    }
- // }
-  return state;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/senseored/readme.md b/keyboards/preonic/keymaps/senseored/readme.md
deleted file mode 100644
index 1b286acc89a..00000000000
--- a/keyboards/preonic/keymaps/senseored/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Swedish Preonic layout. Still figuring out what to do with numbers/symbols compared to a Planck-layout.
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/senseored/rules.mk b/keyboards/preonic/keymaps/senseored/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/senseored/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/seph/config.h b/keyboards/preonic/keymaps/seph/config.h
deleted file mode 100644
index 18812886f7e..00000000000
--- a/keyboards/preonic/keymaps/seph/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#undef  BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 8
-
-/* ws2812 RGB LED */
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN B3
-#undef RGBLED_NUM
-#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 11     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-
-#endif
diff --git a/keyboards/preonic/keymaps/seph/keymap.c b/keyboards/preonic/keymaps/seph/keymap.c
deleted file mode 100644
index 05c62409d11..00000000000
--- a/keyboards/preonic/keymaps/seph/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#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.
-#define _QW 0
-#define _LO 1
-#define _RA 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  -   |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | Left |Right |Lower |    Space    |Raise |  Up  | Down |  GUI |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_QW] = LAYOUT_ortho_5x12 (
-   QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL ,
-   KC_MINS, 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_LCTL, KC_LALT, KC_LEFT, KC_RGHT, MO(_LO), KC_SPC,  KC_SPC,  MO(_RA), KC_UP,   KC_DOWN, KC_RGUI, KC_ENT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |      |      |      |      |      |      |      |      |      |      |  |   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |      | Mute | Vol- | Vol+ |      |      |      |   +  |   {  |   }  | PrSc |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      | Prev | Play | Next |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      | Home |  End |      |     Ins     |      | PgUp | PgDN |      |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_LO] = LAYOUT_ortho_5x12 (
-   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-   KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE,
-   KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, KC_PSCR,
-   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______,
-   BL_STEP, _______, KC_HOME, KC_END,  _______, KC_INS,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |      |      |      |      |      |      |      |      |      |      |  \   |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps |      | Mute | Vol- | Vol+ |      |      |      |   =  |   [  |   ]  | PrSc |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      | Prev | Play | Next |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite|      | Home |  End |      |     Ins     |      | PgUp | PgDN |      |Enter |
- * `-----------------------------------------------------------------------------------'
- */
-[_RA] = LAYOUT_ortho_5x12 (
-   KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-   KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS,
-   KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_EQL,  KC_LBRC, KC_RBRC, KC_PSCR,
-   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______,
-   BL_STEP, _______, KC_HOME, KC_END,  _______, KC_INS,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______
-)
-
-};
diff --git a/keyboards/preonic/keymaps/seph/rules.mk b/keyboards/preonic/keymaps/seph/rules.mk
deleted file mode 100644
index 0869baa8d7e..00000000000
--- a/keyboards/preonic/keymaps/seph/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-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 = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/preonic/keymaps/shwilliam/config.h b/keyboards/preonic/keymaps/shwilliam/config.h
deleted file mode 100644
index 5e008982588..00000000000
--- a/keyboards/preonic/keymaps/shwilliam/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PREONIC_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-#endif
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-#define MIDI_BASIC
-
-/* enable advanced MIDI features */
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/keyboards/preonic/keymaps/shwilliam/keymap.c b/keyboards/preonic/keymaps/shwilliam/keymap.c
deleted file mode 100644
index c9d6cbab423..00000000000
--- a/keyboards/preonic/keymaps/shwilliam/keymap.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* Copyright 2020 William Lindvall
- *
- * 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 custom_keycodes {
-    LIQUOT = SAFE_RANGE,
-    RIQUOT,
-    LQUOT,
-    RQUOT,
-    LTITLE,
-    RTITLE,
-    TBULLET,
-    FBULLET,
-    FN_ARROW,
-    MAIL,
-    GITHUB,
-    HEART,
-    E_LCRY,
-    E_FLOWER,
-    E_SHEART,
-    E_KISS,
-    E_PHEART,
-    E_NOGOOD,
-    E_PARTY,
-    E_ROCKET,
-    E_SHRUG,
-    E_WIZARD,
-    E_OKBUST,
-    E_OKHAND,
-    E_SLEEP,
-    E_HUNNED,
-    E_2HEART
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LIQUOT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("300a"));
-        }
-        return false;
-        case RIQUOT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("300b"));
-        }
-        return false;
-        case LQUOT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("300c"));
-        }
-        return false;
-        case RQUOT:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("300d"));
-        }
-        return false;
-        case LTITLE:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("3010"));
-        }
-        return false;
-        case RTITLE:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("3011"));
-        }
-        return false;
-        case TBULLET:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("2023"));
-        }
-        return false;
-        case FBULLET:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("2055"));
-        }
-        return false;
-        case MAIL:
-        if (record->event.pressed) {
-            SEND_STRING("w-lindvall@outlook.com");
-        }
-        return false;
-        case GITHUB:
-        if (record->event.pressed) {
-            SEND_STRING("https://github.com/shwilliam");
-        }
-        return false;
-        case FN_ARROW:
-        if (record->event.pressed) {
-            SEND_STRING("=>");
-        }
-        return false;
-        case HEART:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("2661"));
-        }
-        return false;
-        case E_LCRY:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DE02"));
-        }
-        return false;
-        case E_FLOWER:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83C+DF38"));
-        }
-        return false;
-        case E_SHEART:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DC96"));
-        }
-        return false;
-        case E_KISS:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DE18"));
-        }
-        return false;
-        case E_PHEART:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DC9C"));
-        }
-        return false;
-        case E_NOGOOD:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DE45"));
-        }
-        return false;
-        case E_PARTY:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83C+DF8A"));
-        }
-        return false;
-        case E_ROCKET:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DE80"));
-        }
-        return false;
-        case E_SHRUG:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83E+DD37"));
-        }
-        return false;
-        case E_WIZARD:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83E+DDD9"));
-        }
-        return false;
-        case E_OKBUST:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DE46"));
-        }
-        return false;
-        case E_OKHAND:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DC4C"));
-        }
-        return false;
-        case E_SLEEP:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DE34"));
-        }
-        return false;
-        case E_HUNNED:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DCAF"));
-        }
-        return false;
-        case E_2HEART:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LALT("D83D+DC95"));
-        }
-        return false;
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* qwerty
-    * ,-----------------------------------------------------------------------------------.
-    * | `    |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   | Del  |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Tab  |  q   |  w   |  e   |  r   |  t   |  y   |  u   |  i   |  o   |  p   | Bksp |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * | H/Esc|  a   |  s   |  d   |  f   |  g   |  h   |  j   |  k   |  l   |  '   | Enter|
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * | Shift|  z   |  x   |  c   |  v   |  b   |  n   |  m   |  ,   |  .   |  /   |  ;   |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | PDown| PUp  | Alt  |  OS  | Opt  | Raise| Space| Lower| Left | Down |  Up  | Right|
-    * `-----------------------------------------------------------------------------------'
-    */
-
-    [0] = LAYOUT_preonic_grid(
-        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_TAB       ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSPC,
-        C_S_T(KC_ESC),KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,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_SCLN,
-        KC_PGDN      ,KC_PGUP ,KC_LALT ,KC_LGUI ,KC_LCTL ,MO(1)   ,KC_SPC  ,MO(2)   ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-    ),
-
-    /* raise
-    * ,-----------------------------------------------------------------------------------.
-    * | ~    |  !   |  @   |  #   |  $   |  %   |  ^   |  &   |  *   |  (   |  )   |SRight|
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |      |  Q   |  W   |  E   |  R   |  T   |  Y   |  U   |  I   |  O   |  P   | SLeft|
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      |  A   |  S   |  D   |  F   |  G   |  H   |  J   |  K   |  L   |  "   |  \   |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * | Emoji|  Z   |  X   |  C   |  V   |  B   |  N   |  M   |  <   |  >   |  ?   |  :   |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | End  | Home | ShAlt| ShOS | ShOpt|~~~~~~| Space|      |      | BDown| BUp  |      |
-    * `-----------------------------------------------------------------------------------'
-    */
-
-    [1] = LAYOUT_preonic_grid(
-        KC_TILD ,KC_EXLM   ,KC_AT        ,KC_HASH      ,KC_DLR       ,KC_PERC   ,KC_CIRC   ,KC_AMPR   ,KC_ASTR   ,KC_LPRN   ,KC_RPRN   ,SGUI(KC_RGHT),
-        KC_NO   ,LSFT(KC_Q),LSFT(KC_W)   ,LSFT(KC_E)   ,LSFT(KC_R)   ,LSFT(KC_T),LSFT(KC_Y),LSFT(KC_U),LSFT(KC_I),LSFT(KC_O),LSFT(KC_P),SGUI(KC_LEFT),
-        KC_NO   ,LSFT(KC_A),LSFT(KC_S)   ,LSFT(KC_D)   ,LSFT(KC_F)   ,LSFT(KC_G),LSFT(KC_H),LSFT(KC_J),LSFT(KC_K),LSFT(KC_L),KC_DQUO   ,KC_BSLS,
-        OSL(3)  ,LSFT(KC_Z),LSFT(KC_X)   ,LSFT(KC_C)   ,LSFT(KC_V)   ,LSFT(KC_B),LSFT(KC_N),LSFT(KC_M),KC_LT     ,KC_GT     ,KC_QUES   ,KC_COLN,
-        KC_END  ,KC_HOME   ,LSFT(KC_LALT),LSFT(KC_LGUI),LSFT(KC_LCTL),KC_TRNS   ,KC_SPC    ,KC_TRNS   ,KC_NO     ,KC_BRID   ,KC_BRIU   ,KC_NO
-    ),
-
-    /* lower
-    * ,-----------------------------------------------------------------------------------.
-    * |  ♡   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  |      |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |  ‣   | CLeft| MUp  |CRight|MWDown| 【   |  -   |  _   |  |   |  =   |  +   | DLeft|
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      | MLeft| MDown|MRight| MWUp |  】  | Left | Down |  Up  | Right|  (   |  )   |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * |      | 《   |  》  | 「   |  」  |  ⁕   |      |  {   |  }   |  [   |  ]   |  =>  |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * | Mail |GitHub|      |      |      |      | Space|~~~~~~| VMute| VDown| VUp  |      |
-    * `-----------------------------------------------------------------------------------'
-    */
-
-    [2] = LAYOUT_preonic_grid(
-        HEART   ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_NO,
-        TBULLET ,KC_BTN1 ,KC_MS_U ,KC_BTN2 ,KC_WH_D ,LTITLE  ,KC_MINS ,KC_UNDS ,KC_PIPE ,KC_EQL  ,KC_PLUS ,LGUI(KC_BSPC),
-        KC_NO   ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_U ,RTITLE  ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,KC_LPRN ,KC_RPRN,
-        KC_NO   ,LIQUOT  ,RIQUOT  ,LQUOT   ,RQUOT   ,FBULLET ,KC_NO   ,KC_LCBR ,KC_RCBR ,KC_LBRC ,KC_RBRC ,FN_ARROW,
-        MAIL    ,GITHUB  ,KC_NO   ,KC_NO   ,KC_NO   ,KC_TRNS ,KC_BSPC ,KC_TRNS ,KC_MUTE ,KC_VOLD ,KC_VOLU ,KC_NO
-    ),
-
-    /* emoji
-    * ,-----------------------------------------------------------------------------------.
-    * |      |  1   |  2   |      |      |      |      |      |      |      |      |      |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |      |      |  w   |      |  r   |      |  y   |      |      |  o   |  p   |      |
-    * |------+------+------+------+------+-------------+------+------+------+------+------|
-    * |      |      |  s   |      |  f   |      |  h   |      |  k   |  l   |      |      |
-    * |------+------+------+------+------+------|------+------+------+------+------+------|
-    * |      |  z   |      |  c   |      |      |  n   |      |      |      |      |      |
-    * |------+------+------+------+------+------+------+------+------+------+------+------|
-    * |      |      |      |      |      |      |      |      |      |      |      |      |
-    * `-----------------------------------------------------------------------------------'
-    *
-    * mnemonics:
-    *
-    * 100       -  💯
-    * 2 hearts  -  💕
-    * cry       -  😂
-    * flower    -  🌸
-    * heart     -  💖
-    * kiss      -  😘
-    * love      -  💜
-    * no        -  🙅
-    * ok        -  🙆
-    * party     -  🎊
-    * rocket    -  🚀
-    * shrug     -  🤷
-    * wizard    -  🧙
-    * yes       -  👌
-    * zzz       -  😴
-    *
-    */
-
-    [3] = LAYOUT_preonic_grid(
-        KC_NO   ,E_HUNNED,E_2HEART,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO,
-        KC_NO   ,KC_NO   ,E_WIZARD,KC_NO   ,E_ROCKET,KC_NO   ,E_OKHAND,KC_NO   ,KC_NO   ,E_OKBUST,E_PARTY ,KC_NO,
-        KC_NO   ,KC_NO   ,E_SHRUG ,KC_NO   ,E_FLOWER,KC_NO   ,E_SHEART,KC_NO   ,E_KISS  ,E_PHEART,KC_NO   ,KC_NO,
-        KC_NO   ,E_SLEEP ,KC_NO   ,E_LCRY  ,KC_NO   ,KC_NO   ,E_NOGOOD,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/preonic/keymaps/shwilliam/readme.md b/keyboards/preonic/keymaps/shwilliam/readme.md
deleted file mode 100644
index bb0f2e1797b..00000000000
--- a/keyboards/preonic/keymaps/shwilliam/readme.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# [@shwilliam](https://github.com/shwilliam)'s Preonic Layout
-
-![shwilliam's preonic layout image](https://user-images.githubusercontent.com/38357771/84585088-dc536380-adc0-11ea-8378-6fb8ffbc6a8d.png)
-
-## Overview
-
-- Shift, backspace, raise and lower on thumbs
-- Arrows on Vim keys
-- Function arrow key (`=>`)
-- Common parens one key from home-row
-- Brightness/volume control
-- Tap caps-lock for escape, hold for left control and left shift
-- Alternative punctuation
-  - Corner brackets
-  - Double-angle brackets
-  - Lenticular brackets
-- Select to left and right keys
-- Emoji layer
-
-## Layers
-
-### QWERTY
-
-- Base layer; similar to default Preonic keymap
-
-### Raise
-
-- Mostly shifted QWERTY layer with alternative actions
-- Brightness control
-
-### Lower
-
-- Common parentheses
-- Arrows on Vim keys
-- Mouse controls on WASD
-- Volume control
-
-### Emoji
-
-- Emoji layout based on mnemonics
diff --git a/keyboards/preonic/keymaps/shwilliam/rules.mk b/keyboards/preonic/keymaps/shwilliam/rules.mk
deleted file mode 100644
index dcf16bef399..00000000000
--- a/keyboards/preonic/keymaps/shwilliam/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/smt/config.h b/keyboards/preonic/keymaps/smt/config.h
deleted file mode 100644
index 2bebf48a1ca..00000000000
--- a/keyboards/preonic/keymaps/smt/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/*
- * 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
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/smt/keymap.c b/keyboards/preonic/keymaps/smt/keymap.c
deleted file mode 100644
index 22f6c39a923..00000000000
--- a/keyboards/preonic/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,233 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define MEH_GRV     MEH_T(KC_GRV)               // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_ESC, 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, SFT_ENT,
-  MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  -   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_preonic_grid(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT,
-  MEH_GRV, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   0  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   $  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   4  |   5  |   6  |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  ALL_T(KC_GRV), KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  ALL_T(KC_0),   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  CTL_T(KC_DLR), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_4,    KC_5,    KC_6,    _______, _______,
-  _______,       KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_1,    KC_2,    KC_3,    _______, _______,
-  _______,       _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |   _  |   ?  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |   -  |   /  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      | Home |PageDn|PageUp| End  |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  ALL_T(KC_TILD), KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  ALL_T(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_UNDS, KC_QUES, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______,        _______, _______, _______, _______, _______, KC_MINS, KC_SLSH, KC_EQL,  KC_LBRC, KC_RBRC, SFT_T(KC_BSLS),
-  _______,        _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      | Reset|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_qwerty);
-            #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_colemak);
-            #endif
-            persistent_default_layer_set(1UL<<_COLEMAK);
-          }
-          return false;
-          break;
-        case DVORAK:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_dvorak);
-            #endif
-            persistent_default_layer_set(1UL<<_DVORAK);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
diff --git a/keyboards/preonic/keymaps/smt/readme.md b/keyboards/preonic/keymaps/smt/readme.md
deleted file mode 100644
index 2ec2603f3eb..00000000000
--- a/keyboards/preonic/keymaps/smt/readme.md
+++ /dev/null
@@ -1,136 +0,0 @@
-# smt's Preonic keymap
-
-This keymap is primarily based on the default Preonic keymap, which in turn is derived from Planck's default.
-
-Notable differences from the default are:
-
-- **[Mod-Tap](https://github.com/jackhumbert/qmk_firmware/wiki#fun-with-modifier-keys) keys**
-
-    - `Esc/Ctrl`
-
-        I am experimenting with using Left Shift as a mod-tap key for Escape, similar to how I use the Enter key. It's set up like this on my Minivan, so in the interest of consistency...
-
-    - `Enter/Shift`
-
-        I use both the left and right shift keys when I type. When I want to modify a key with shift, I hold shift with the hand opposite the one typing the key. In the default keymap, Enter is where shift would be on a standard keyboard layout. Oh, muscle memory.
-
-    - `Tab/Hyper` (Super+Ctrl+Shift+Alt)
-
-        It's great to be able to use Tab as a custom modifier key. I tend to use [Hyper](http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/) commands for various OS-specific operations depending on what machine I'm working on.
-
-    - `Backtick/Meh` (Ctrl+Shift+Alt)
-
-        Why use backtick in the lower left corner? I use it as my tmux prefix key, so I need to type it more frequently than most people. Putting it on the base layer works well for me. The "Meh" mapping is just a less-cool "Hyper"; the same, just without Super.
-
-- **Swapped responsibilities of "lower" and "raise" layers**
-
-    I prefer to use symbols via the "raise" layer, and numbers via the "lower" layer.
-
-- **Removed Plover layer**
-
-    I don't intend to use stenography anytime soon, so Plover just didn't have a place in my keymap.
-
-
-## Qwerty
-
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|   `  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## Colemak
-
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|   `  | Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## Dvorak
-
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-| Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-| Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  -   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-| Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|   `  | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-`-----------------------------------------------------------------------------------'
-```
-
-## Lower
-
-This is where I put the number row, a numpad cluster, function keys, and media controls. Like the "Raise" layer, the top row is redundant to help with Planck compatibility.
-
-```
-,-----------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|   0  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|   $  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   4  |   5  |   6  |      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   1  |   2  |   3  |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-`-----------------------------------------------------------------------------------'
-```
-
-## Raise
-
-As a developer, it makes the most sense for me to group all the commonly-used symbols that don't fit on the main layer. In particular, having the dual-column of parens-braces-brackets really helps a lot. I've also added cursorkeys to correspond to the arrows.
-
-I haven't completely filled this layer, which leaves room for future mappings and macros.
-
-```
-,-----------------------------------------------------------------------------------.
-|   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |      |      |      |   _  |   ?  |   +  |   {  |   }  |  |   |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |      |      |      |      |      |   -  |   /  |   =  |   [  |   ]  |  \   |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |      | Home |PageDn|PageUp| End  |
-`-----------------------------------------------------------------------------------'
-```
-
-## Adjust (Lower + Raise)
-
-Utility layer. This is where I'd switch between Qwerty and Dvorak, ~~fool around with~~ adjust the audio/music settings, or put the Preonic into bootloader mode.
-
-```
-,-----------------------------------------------------------------------------------.
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      | Reset|      |      |      |      |      |      |      |      |      | Reset|
-|------+------+------+------+------+-------------+------+------+------+------+------|
-|      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
-|------+------+------+------+------+------|------+------+------+------+------+------|
-|      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
-|------+------+------+------+------+------+------+------+------+------+------+------|
-|      |      |      |      |      |             |      |      |      |      |      |
-`-----------------------------------------------------------------------------------'
-```
diff --git a/keyboards/preonic/keymaps/snowskeleton/config.h b/keyboards/preonic/keymaps/snowskeleton/config.h
deleted file mode 100644
index 7ad61e44c85..00000000000
--- a/keyboards/preonic/keymaps/snowskeleton/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 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(PREONIC_SOUND)
-// #define STARTUP_SONG SONG(NO_SOUND) // uncomment to silence startup sounds
-
-#endif
-#define MUSIC_MASK (keycode != KC_NO)
-#define MIDI_BASIC
-
-
-#define ENCODERS_PAD_A { B12 }
-#define ENCODERS_PAD_B { B13 }
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/preonic/keymaps/snowskeleton/keymap.c b/keyboards/preonic/keymaps/snowskeleton/keymap.c
deleted file mode 100644
index 8af85fde90f..00000000000
--- a/keyboards/preonic/keymaps/snowskeleton/keymap.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "muse.h"
-
-enum preonic_layers {
-  _QWERTY_MACOS,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum preonic_keycodes {
-  QWERTY_MACOS = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty Mac
- * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
- * │ Esc  │  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │  F7  │  F8  │  F9  │  F10 │ Bksp │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │   `  │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │  \   │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │ Tab  │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │   ;  │   '  │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │ Shft │   Z  │   X  │   C  │   V  │   B  │   N  │   M  │   ,  │   .  │   /  │ Shft │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │ Play │ Ctrl │ Alt  │ Gui  │Lower │    Space    │Raise │ Left │ Down │  Up  │ Right│
- * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
- */
-[_QWERTY_MACOS] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_F5,  KC_F6,  KC_F7, KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
-  KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSLS,
-  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_MPLY, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-
-/* RAISE
- * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
- * │      │  F11 │  F12 │  F13 │  F14 │  F15 │  F16 │  F17 │  F18 │  F19 │  F20 │      │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │   `  │   1  │   2  │   3  │   4  │   5  │   6  │   7  │   8  │   9  │   0  │  Del │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │  Del │      │      │      │      │      │ Left │ Down │  Up  │ Right│      │  \   │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │ Shft │      │      │      │      │      │      │      │      │      │      │Enter │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │      │      │      │      │      │      │      │      │      │      │      │      │
- * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  _______,
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DELETE,
-  KC_DEL,  _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, KC_BSLS,
-  KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ENTER,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-
-/* LOWER
- * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
- * │      │      │      │      │      │      │      │      │      │      │      │      │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │  ~   │  !   │  @   │  #   │  $   │  %   │  ^   │  &   │  *   │  (   │  )   │  Del │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │  Del │  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │  -   │      │  [   │  ]   │  \   │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │Enter │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │  +   │  =   │  {   │  }   │ Shft │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │      │      │      │      │      │      │      │      │      │      │      │      │
- * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_TILD,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELETE,
-  KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_UNDS, KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_ENTER, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PLUS, KC_EQL,  KC_LCBR, KC_RCBR, KC_RSFT,
-  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* ADJUST
- * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
- * │      │      │      │      │      │      │      │      │      │      │      │      │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │      │BOOT  │DBTOGG│AUTOGG│      │      │      │      │  Ins │      │      │  Del │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │ Caps │      │      │      │      │AGTOGG│      │      │      │      │      │      │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │      │      │  Del │      │      │      │      │      │      │      │      │      │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │      │      │      │      │      │      │      │      │      │      │      │      │
- * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, DB_TOGG, AU_TOGG, _______, _______, _______, _______, KC_INS,  _______, _______, KC_DELETE,
-  KC_CAPS, _______, _______, _______, _______, AG_TOGG, _______, _______, _______, _______, _______, _______,
-  _______, _______, KC_DEL,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-            #ifdef RGBLIGHT_ENABLE
-              rgblight_step();
-            #endif
-            #ifdef __AVR__
-            writePinLow(E6);
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-            #ifdef __AVR__
-            writePinHigh(E6);
-            #endif
-          }
-          return false;
-          break;
-      }
-    return true;
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_QWERTY_MACOS] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
-    [_LOWER] = { ENCODER_CCW_CW(_______, _______) },
-    [_RAISE] = { ENCODER_CCW_CW(KC_BRMU, KC_BRMD) },
-    [_ADJUST] = { ENCODER_CCW_CW(_______, _______) },
-};
-#endif
diff --git a/keyboards/preonic/keymaps/snowskeleton/readme.md b/keyboards/preonic/keymaps/snowskeleton/readme.md
deleted file mode 100644
index 76a1dda0032..00000000000
--- a/keyboards/preonic/keymaps/snowskeleton/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Snowskeleton Preonic Layout (with Rotery Encoder)
-This layout aims to optimize several corner cases where the default layout falls short.
-This is a opinionated layout, designed for efficient coding in English.
-As such, several internationalizations have been removed,
-and you may wish to add them back in when adjusting to your language.
-
-Special notes:
-
-the Enter key is only accessable through alternate layers,
-but there it is available on both sides of the board (depending on the layer).
-
-Numbers and their coorisponding symbols (1 and !, 2 and @, etc) can be typed several ways.
-Each is available on its own layer,
-while still following Shift key convention.
-
-Vim-like arrow keys on Raise layer.
-
-Instead of having a separate layout for Windows,
-I only support swapping the Gui and Alt keys.
-This provides 99% of the functionality without requiring the maintainence of two separate layouts.
diff --git a/keyboards/preonic/keymaps/snowskeleton/rules.mk b/keyboards/preonic/keymaps/snowskeleton/rules.mk
deleted file mode 100644
index da6657c8bdc..00000000000
--- a/keyboards/preonic/keymaps/snowskeleton/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/that_canadian/keymap.c b/keyboards/preonic/keymaps/that_canadian/keymap.c
deleted file mode 100644
index 18b2e046e8d..00000000000
--- a/keyboards/preonic/keymaps/that_canadian/keymap.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#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.
-#define _QWERTY 0
-
-#define _LOWER 3
-#define _RAISE 4
-
-#define _FUNCTION 15
-#define _ADJUST 16
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * |  Esc |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Func |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Enter|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  `   | GUI  | ALT  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  KC_ESC,        KC_1,   KC_2,    KC_3,    KC_4,  KC_5,   KC_6,   KC_7,  KC_8,    KC_9,    KC_0,    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_BSPC,
-  MO(_FUNCTION), KC_A,   KC_S,    KC_D,    KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  OSM(MOD_LSFT), KC_Z,   KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-  KC_LCTL,       KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      | Mute |      |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower |    Bksp     |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_TILD, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  KC_ESC,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-  _______, KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_MUTE, _______, KC_PIPE,
-  _______, _______,  _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   4  |   5  |   6  |   +  |  F5  |  F6  |   -  |   =  |   [  |   ]  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |Enter |   7  |   8  |   9  |   -  |  F11 |  F12 |ISO # |ISO / | Mute |      |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ,  |   0  |  .   |Lower |    Bksp     |Raise | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  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_ESC,  KC_1,    KC_2,  KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  _______, KC_4,    KC_5,  KC_6,   KC_PLUS, KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-  KC_ENT,  KC_7,    KC_8,  KC_9,   KC_MINS, KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS,
-  _______, KC_COMM, KC_0,  KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |  ESC |  F1  |  F2  |  F3  |ALTF4 |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |Taskmg|      |      |      |      |      |      |      |      |      |      |caltde|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |QK_BOOT |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   LALT(KC_F4), KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  TSKMGR,  _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, CALTDEL,
-  _______, _______, _______, AU_ON,   AU_OFF,      AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,      MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, QK_BOOT
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * |  Esc |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |   up |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Caps |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT_preonic_grid(
-  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_UP,   _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case QWERTY:
-          if (record->event.pressed) {
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_qwerty);
-            #endif
-            persistant_default_layer_set(1UL<<_QWERTY);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case BACKLIT:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            #ifdef BACKLIGHT_ENABLE
-              backlight_step();
-            #endif
-          } else {
-            unregister_code(KC_RSFT);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
diff --git a/keyboards/preonic/keymaps/that_canadian/readme.md b/keyboards/preonic/keymaps/that_canadian/readme.md
deleted file mode 100644
index 5d62a0a714e..00000000000
--- a/keyboards/preonic/keymaps/that_canadian/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# My personal Preonic layout, based on my Planck layout
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/that_canadian/rules.mk b/keyboards/preonic/keymaps/that_canadian/rules.mk
deleted file mode 100644
index 1c0fc580523..00000000000
--- a/keyboards/preonic/keymaps/that_canadian/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no      # 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 = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/preonic/keymaps/to-schneider/keymap.c b/keyboards/preonic/keymaps/to-schneider/keymap.c
deleted file mode 100644
index 41433901738..00000000000
--- a/keyboards/preonic/keymaps/to-schneider/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Torsten Schneider (@toschneider)
- *
- * 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_preonic_1x2uC(
-		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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-		KC_ESC,  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_LALT, KC_LGUI, KC_RALT, MO(1),   KC_SPC,           MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-	),
-	
-	[1] = LAYOUT_preonic_1x2uC(
-		KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NO,   KC_NO,   KC_LBRC, KC_RBRC, KC_TRNS,
-		KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_LCBR, KC_RCBR, KC_TRNS,
-		KC_TRNS, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_NO,   KC_NO,   KC_NO,   KC_UNDS, KC_PLUS,
-		KC_TRNS, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_NO,   KC_MINS, KC_EQL,  KC_BSLS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT
-	),
-	
-	[2] = LAYOUT_preonic_1x2uC(
-		KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS,
-		KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   LCA(KC_T), KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_TRNS,
-		KC_SLEP, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_TRNS, KC_NO,   KC_NO,   KC_CALC, KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_TRNS,            KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT
-	)
-};
diff --git a/keyboards/preonic/keymaps/to-schneider/rules.mk b/keyboards/preonic/keymaps/to-schneider/rules.mk
deleted file mode 100644
index dc1986915a1..00000000000
--- a/keyboards/preonic/keymaps/to-schneider/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/preonic/keymaps/trigotometry/config.h b/keyboards/preonic/keymaps/trigotometry/config.h
deleted file mode 100644
index eaf6997db1b..00000000000
--- a/keyboards/preonic/keymaps/trigotometry/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#define STARTUP_SONG SONG(PREONIC_SOUND)
-#define MUSIC_MASK (keycode != KC_NO)
-
-#define FORCE_NKRO 1
-#define PREVENT_STUCK_MODIFIERS
-#define GRAVE_ESC_GUI_OVERRIDE
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/trigotometry/keymap.c b/keyboards/preonic/keymaps/trigotometry/keymap.c
deleted file mode 100644
index 419f7a10bad..00000000000
--- a/keyboards/preonic/keymaps/trigotometry/keymap.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#include QMK_KEYBOARD_H
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-
-// Layer declarations
-enum preonic_layers {
-  _QWERTY = 1,
-  _GAMING = 2,
-  _LOWER = 3,
-  _RAISE = 4,
-};
-
-enum preonic_keycodes {
-  QWERTY = SAFE_RANGE,
-  GAMING,
-  LOWER,
-  RAISE,
-};
-
-// QMK predefined macros
-#define SFT_ENT   SFT_T(KC_ENT)   // Tap for Enter, hold for Shift
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------------------------------------------------.
- * | GEsc |  1   |  2   |  3   |  4   |  5   |   6  |   7  |   8  |   9  |   0  |  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |  Q   |  W   |  E   |  R   |  T   |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Shft |  A   |  S   |  D   |  F   |  G   |   H  |   J  |   K  |   L  |   ;  |   "  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |SFTENT|  Z   |  X   |  C   |  V   |  B   |   N  |   M  |   ,  |   .  |   /  | Entr |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Ctrl | Alt  | Supr |Lower |    Space    | Raise| Left | Down |  Up  | Rght |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_preonic_grid(
-  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_BSPC,
-  KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SFT_ENT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  XXXXXXX, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Gaming
- * ,-----------------------------------------------------------------------------------.
- * | Grve |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |  Y   |  U   |  I   |  O   |  P   | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Shft |   A  |   S  |   D  |   F  |   G  |  H   |  J   |  K   |  L   |  ;   |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shft |   Z  |   X  |   C  |   V  |   B  |  N   |  M   |  ,   |  .   |  /   | Entr |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Ctrl | Alt  | Alt  |Lower |    Space    | Raise| Left | Down |  Up  | Rght |
- * `-----------------------------------------------------------------------------------'
- */
-[_GAMING] = LAYOUT_preonic_grid(
-  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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_LSFT, 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_LCTL, KC_LALT, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |   *  |   /  |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | VolD |  Up  | VolU |      |      |   7  |   8  |   9  |   -  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      | Left | Down | Rght |      |      |   4  |   5  |   6  |   +  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      | Prev | Play | Skip |      |      |   1  |   2  |   3  |   =  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      | Supr |      |             |   0  | Home |PageDn|PageUp|  End |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_preonic_grid(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, KC_PAST, KC_PSLS, XXXXXXX, KC_DEL,
-  _______, XXXXXXX, KC_VOLD, KC_UP,   KC_VOLU, XXXXXXX, XXXXXXX, KC_7,    KC_8,    KC_9,    KC_PMNS, KC_BSPC,
-  _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_4,    KC_5,    KC_6,    KC_PPLS, XXXXXXX,
-  _______, XXXXXXX, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX, KC_1,    KC_2,    KC_3,    KC_PEQL, KC_ENT,
-  _______, _______, _______, KC_LGUI, _______, _______, _______, KC_0,    KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |  F12 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |  \   |      |      |   /  |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  |   |  [   |  {   |  (   |  <   |   >  |   )  |   }  |   ]  |   |  |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |  +   |  -   |   _  |   =  |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |Qwerty| Game |      | Reset|
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_preonic_grid(
-  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11 ,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, XXXXXXX, XXXXXXX, KC_PSLS, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  _______, KC_PIPE, KC_LBRC, KC_LCBR, KC_LPRN, KC_LABK, KC_RABK, KC_RPRN, KC_RCBR, KC_RBRC, KC_PIPE, XXXXXXX,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_PPLS, KC_PMNS, KC_UNDS, KC_EQL,  XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, QWERTY ,  GAMING, XXXXXXX, QK_BOOT
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QWERTY);
-          }
-          return false;
-          break;
-
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-          } else {
-            layer_off(_LOWER);
-          }
-          return false;
-          break;
-
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-          } else {
-            layer_off(_RAISE);
-          }
-          return false;
-          break;
-
-        case GAMING:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_GAMING);
-          }
-          return false;
-          break;
-
-      }
-    return true;
-};
-
-// NFI how to bring this inline with current QMK standards yet, or it's redundant and don't use it.
-// #ifdef AUDIO_ENABLE
-// float tone_startup[][2] = {
-//   {NOTE_D5, 8},
-//   {NOTE_E6, 8},
-//   {NOTE_D6, 8},
-//   {NOTE_E5, 8}
-// };
-
-// void startup_user(void)
-// {
-//     _delay_ms(20); // gets rid of tick
-//     PLAY_SONG(tone_startup);
-// }
-// #endif
diff --git a/keyboards/preonic/keymaps/trigotometry/readme.md b/keyboards/preonic/keymaps/trigotometry/readme.md
deleted file mode 100644
index aff01a22eae..00000000000
--- a/keyboards/preonic/keymaps/trigotometry/readme.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Trigotometry's v1.0
-
-This layout is the confluence of the standard Preonic QWERTY layout and some of my own tweaks to make it's software as logical and straight cut as it's physical presence, at least in my eyes. Some might say there's wasted space, though possibly true, I believe in keeping it minimal and only adding what is really needed. So if, like me, you're also beginning your journey of coding and enjoy some downtime with friends on the battlefield I think you'll find this layout a stellar place to kick off your customisation.
-
-## Qwerty
-	 /* Qwerty
-	 * ,-----------------------------------------------------------------------------------.
-	 * | GEsc |  1   |  2   |  3   |  4   |  5   |   6  |   7  |   8  |   9  |   0  |  Del |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------|
-	 * | Tab  |  Q   |  W   |  E   |  R   |  T   |   Y  |   U  |   I  |   O  |   P  | Bksp |
-	 * |------+------+------+------+------+-------------+------+------+------+------+------|
-	 * | Shft |  A   |  S   |  D   |  F   |  G   |   H  |   J  |   K  |   L  |   ;  |   "  |
-	 * |------+------+------+------+------+------|------+------+------+------+------+------|
-	 * |SFTENT|  Z   |  X   |  C   |  V   |  B   |   N  |   M  |   ,  |   .  |   /  |  ENT |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |      | Ctrl | Alt  | Supr |Lower |    Space    | Raise| Left | Down |  Up  | Rght |
-	 * `-----------------------------------------------------------------------------------
-	 */
-Take note of the dual Enter keys, located where normally there'd be a pair of Shifts. I did this to ensure the alphas stayed in the same spot when compared to a staggered and standard board. My brain found it easier to switch the mods across keyboard than the relative position in the alphas, however it's easy to reverse the Enters/Shifts and you'll be back an (nearly) square one!
-
-Also, LEnter acts as a Shift if it's held.
-
-
-
-## Gaming
-	/* Gaming
-	 * ,-----------------------------------------------------------------------------------.
-	 * | Grve |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  Del |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------|
-	 * | Tab  |   Q  |   W  |   E  |   R  |   T  |  Y   |  U   |  I   |  O   |  P   | Bksp |
-	 * |------+------+------+------+------+-------------+------+------+------+------+------|
-	 * | Shft |   A  |   S  |   D  |   F  |   G  |  H   |  J   |  K   |  L   |  ;   |  "   |
-	 * |------+------+------+------+------+------|------+------+------+------+------+------|
-	 * | Shft |   Z  |   X  |   C  |   V  |   B  |  N   |  M   |  ,   |  .   |  /   | Entr |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------|
-	 * | Ctrl | Ctrl | Alt  | Alt  |Lower |    Space    | Raise| Left | Down |  Up  | Rght |
-	 * `-----------------------------------------------------------------------------------'
-	 */
-Honestly it's pretty standard, however I've doubled up on the important modifiers and removed the Super. It's still accessable readily by holding Lower and the key to it's left. Neato? I thought so.
-
-
-
-## Raise Layer
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * |  F12 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |  \   |      |      |   /  |      |      |      |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |  |   |  [   |  {   |  (   |  <   |   >  |   )  |   }  |   ]  |   |  |      |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |  +   |  -   |   _  |   =  |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      |Qwerty| Game |      | Reset|
-     * `-----------------------------------------------------------------------------------'
-     */
-Pretty self explanatory I think.
-
-
-
-## Lower Layer
-	/* Lower
-	 * ,-----------------------------------------------------------------------------------.
-	 * | Esc  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |   *  |   /  |      |  Del |
-	 * |------+------+------+------+------+-------------+------+------+------+------+------|
-	 * |      |      | VolD |  Up  | VolU |      |      |   7  |   8  |   9  |   -  | Bksp |
-	 * |------+------+------+------+------+-------------+------+------+------+------+------|
-	 * |      |      | Left | Down | Rght |      |      |   4  |   5  |   6  |   +  |      |
-	 * |------+------+------+------+------+------|------+------+------+------+------+------|
-	 * |      |      | Prev | Play | Skip |      |      |   1  |   2  |   3  |   =  |      |
-	 * |------+------+------+------+------+------+------+------+------+------+------+------|
-	 * |      |      |      | Supr |      |             |   0  | Home |PageDn|PageUp|  End |
-	 * `-----------------------------------------------------------------------------------'
-	 */
- Music controls and arrows in prime location. F1-F6 there for extra mappings when in the Gaming layer.
diff --git a/keyboards/preonic/keymaps/trigotometry/rules.mk b/keyboards/preonic/keymaps/trigotometry/rules.mk
deleted file mode 100644
index a6bcd56379b..00000000000
--- a/keyboards/preonic/keymaps/trigotometry/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-#Build Options
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
diff --git a/keyboards/preonic/keymaps/ttys0/config.h b/keyboards/preonic/keymaps/ttys0/config.h
deleted file mode 100644
index f846d1477e0..00000000000
--- a/keyboards/preonic/keymaps/ttys0/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Sean Johnson
-  *
-  * 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(PREONIC_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/preonic/keymaps/ttys0/keymap.c b/keyboards/preonic/keymaps/ttys0/keymap.c
deleted file mode 100644
index fbcf3ea7b19..00000000000
--- a/keyboards/preonic/keymaps/ttys0/keymap.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/* Copyright 2021 Sean Johnson
-  *
-  * 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"
-
-#define a KC_A
-#define b KC_B
-#define c KC_C
-#define d KC_D
-#define e KC_E
-#define f KC_F
-#define g KC_G
-#define h KC_H
-#define i KC_I
-#define j KC_J
-#define k KC_K
-#define l KC_L
-#define m KC_M
-#define n KC_N
-#define o KC_O
-#define p KC_P
-#define q KC_Q
-#define r KC_R
-#define s KC_S
-#define t KC_T
-#define u KC_U
-#define v KC_V
-#define w KC_W
-#define x KC_X
-#define y KC_Y
-#define z KC_Z
-
-#define lopt KC_LALT
-#define lctl KC_LCTL
-#define lsft KC_LSFT
-#define ropt KC_RALT
-#define rctl KC_RCTL
-#define rsft KC_RSFT
-
-#define n0 KC_0
-#define n1 KC_1
-#define n2 KC_2
-#define n3 KC_3
-#define n4 KC_4
-#define n5 KC_5
-#define n6 KC_6
-#define n7 KC_7
-#define n8 KC_8
-#define n9 KC_9
-
-#define bspc KC_BSPC
-#define caps KC_CAPS
-#define comm KC_COMM
-#define dash A(KC_MINS)
-#define scln KC_SCLN
-#define slsh KC_SLSH
-#define spc KC_SPC
-#define tab KC_TAB
-#define del KC_DEL
-#define dot KC_DOT
-#define ent KC_ENT
-#define mins KC_MINS
-#define quot KC_QUOT
-#define esc KC_ESC
-
-#define down KC_DOWN
-#define home G(KC_LEFT)
-#define end G(KC_RGHT)
-#define up KC_UP
-#define pgdn KC_PGDN
-#define pgup KC_PGUP
-#define left KC_LEFT
-#define rght KC_RGHT
-
-#define tabl G(S(KC_LBRC))
-#define tabr G(S(KC_RBRC))
-#define fwd G(KC_RBRC)
-#define back G(KC_LBRC)
-#define dtl C(KC_LEFT)
-#define dtr C(KC_RGHT)
-#define slup S(A(KC_UP))
-#define sldn S(A(KC_DOWN))
-
-#define f1 KC_F1
-#define f2 KC_F2
-#define f3 KC_F3
-#define f4 KC_F4
-#define f5 KC_F5
-#define f6 KC_F6
-#define f7 KC_F7
-#define f8 KC_F8
-#define f9 KC_F9
-#define f10 KC_F10
-#define f11 KC_F11
-#define f12 KC_F12
-#define f13 KC_F13
-#define f14 KC_F14
-#define f15 KC_F15
-#define f16 KC_F16
-#define f17 KC_F17
-#define f18 KC_F18
-#define f19 KC_F19
-#define f20 KC_F20
-
-#define mute KC_MUTE
-#define next KC_MNXT
-#define play KC_MPLY
-#define prev KC_MPRV
-#define vold KC_VOLD
-#define volu KC_VOLU
-
-#define symb MO(SYMB)
-#define move MO(MOVE)
-#define func MO(FUNC)
-
-#define rset QK_BOOT
-#define powr KC_PWR
-
-#define ____ KC_TRNS
-#define xxxx KC_NO
-
-#define emji LCMD(LCTL(KC_SPC))
-#define hypr OSM(MOD_HYPR)
-#define brup KC_BRMU
-#define brdn KC_BRMD
-#define escf LT(FUNC,KC_ESC)
-
-enum preonic_layers {
-    BASE,
-    SYMB,
-    MOVE,
-    FUNC,
-};
-
-enum preonic_keycodes {
-    ampr = SAFE_RANGE,
-    astr,
-    at,
-    bsls,
-    circ,
-    dlr,
-    eql,
-    exlm,
-    grv,
-    hash,
-    lbrc,
-    lcbr,
-    lprn,
-    perc,
-    pipe,
-    plus,
-    rbrc,
-    rcbr,
-    rprn,
-    tild,
-    cmd,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BASE] = LAYOUT_preonic_grid(
-        tild,   n7,   n5,   n3,   n1,   n9,   n8,   n0,   n2,   n4,   n6, mins,
-         tab,    q,    w,    f,    p,    g,    j,    l,    u,    y, scln, pipe,
-        bspc,    a,    r,    s,    t,    d,    h,    n,    e,    i,    o, quot,
-        lsft,    z,    x,    c,    v,    b,    k,    m, comm,  dot, slsh, rsft,
-        hypr, lctl, lopt,  cmd, move,  ent,  spc, symb,  cmd, ropt, rctl, escf
-    ),
-
-    [SYMB] = LAYOUT_preonic_grid(
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        tild,   n7,   n5,   n3,   n1,   n9,   n8,   n0,   n2,   n4,   n6, dash,
-        bspc, lbrc, lcbr, lprn, hash, pipe, astr,  dlr, rprn, rcbr, rbrc,   at,
-        ____,  grv, exlm, circ, ampr, ____, ____, plus, mins,  eql, bsls, perc,
-        caps, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____
-    ),
-
-    [MOVE] = LAYOUT_preonic_grid(
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, xxxx, slup,  dtl,  dtr, xxxx, xxxx, home,   up,  end, xxxx, xxxx,
-         del, xxxx, sldn, tabl, tabr, xxxx, xxxx, left, down, rght, xxxx, xxxx,
-        ____, xxxx, xxxx, back,  fwd, xxxx, xxxx, pgdn, pgup, xxxx, xxxx, ____,
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____
-    ),
-
-    [FUNC] = LAYOUT_preonic_grid(
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        rset,   f7,   f5,   f3,   f1,   f9,   f8,  f10,   f2,   f4,   f6, volu,
-        powr,  f17,  f15,  f13,  f11,  f19,  f18,  f20,  f12,  f14,  f16, vold,
-        brup, brdn, xxxx, xxxx, xxxx, xxxx, xxxx, xxxx, xxxx, xxxx, xxxx, ____,
-        ____, ____, ____, ____, ____, ____, ____, mute, play, prev, next, ____
-    ),
-};
-
-
-bool send_string_if_keydown(keyrecord_t *record, const char *s) {
-    if (record->event.pressed) {
-        send_string(s);
-    }
-    return true;
-}
-
-int cmd_keys_down = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // Override the default auto shifted symbols to use SEND_STRING See
-        // https://github.com/qmk/qmk_firmware/issues/4072
-        case ampr:
-            return send_string_if_keydown(record, "&");
-        case astr:
-            return send_string_if_keydown(record, "*");
-        case at:
-            return send_string_if_keydown(record, "@");
-        case bsls:
-            return send_string_if_keydown(record, "\\");
-        case circ:
-            return send_string_if_keydown(record, "^");
-        case dlr:
-            return send_string_if_keydown(record, "$");
-        case eql:
-            return send_string_if_keydown(record, "=");
-        case exlm:
-            return send_string_if_keydown(record, "!");
-        case grv:
-            return send_string_if_keydown(record, "`");
-        case hash:
-            return send_string_if_keydown(record, "#");
-        case lbrc:
-            return send_string_if_keydown(record, "[");
-        case lcbr:
-            return send_string_if_keydown(record, "{");
-        case lprn:
-            return send_string_if_keydown(record, "(");
-        case perc:
-            return send_string_if_keydown(record, "%");
-        case pipe:
-            return send_string_if_keydown(record, "|");
-        case plus:
-            return send_string_if_keydown(record, "+");
-        case rbrc:
-            return send_string_if_keydown(record, "]");
-        case rcbr:
-            return send_string_if_keydown(record, "}");
-        case rprn:
-            return send_string_if_keydown(record, ")");
-        case tild:
-            return send_string_if_keydown(record, "~");
-
-        // cmd + cmd -> cmd + ctl
-        case cmd:
-            if (record->event.pressed) {
-                if (cmd_keys_down == 0) {
-                    register_code(KC_LCMD);
-                } else {
-                    register_code(KC_LCTL);
-                }
-                cmd_keys_down++;
-            } else {
-                if (cmd_keys_down == 1) {
-                    unregister_code(KC_LCMD);
-                } else {
-                    unregister_code(KC_LCTL);
-                }
-                cmd_keys_down--;
-            }
-            return true;
-    }
-    return true;
-}
-
diff --git a/keyboards/preonic/keymaps/ttys0/readme.md b/keyboards/preonic/keymaps/ttys0/readme.md
deleted file mode 100644
index e39a8ba5a0f..00000000000
--- a/keyboards/preonic/keymaps/ttys0/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sean's Preonic Config
-
-This is basically a copy of the `callum` Planck layout adjusted to the Preonic layout with a few minor adjustments.
diff --git a/keyboards/preonic/keymaps/ttys0/rules.mk b/keyboards/preonic/keymaps/ttys0/rules.mk
deleted file mode 100644
index 22df9b39f32..00000000000
--- a/keyboards/preonic/keymaps/ttys0/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Make some noise
-SRC += muse.c
diff --git a/keyboards/preonic/keymaps/yhaliaw/config.h b/keyboards/preonic/keymaps/yhaliaw/config.h
deleted file mode 100644
index 84ec6e1af3a..00000000000
--- a/keyboards/preonic/keymaps/yhaliaw/config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#pragma once
-
-#ifdef AUDIO_ENABLE
-#define STARTUP_SONG SONG(PLANCK_SOUND)
-#endif
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LED_MAP {8, 2, 3, 7, 6, 5, 4, 0, 1}
-
-#define LEADER_TIMEOUT 200
-#define LEADER_PER_KEY_TIMING
diff --git a/keyboards/preonic/keymaps/yhaliaw/keymap.c b/keyboards/preonic/keymaps/yhaliaw/keymap.c
deleted file mode 100644
index 7771199e9c6..00000000000
--- a/keyboards/preonic/keymaps/yhaliaw/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Copyright 2021 Andrew Liaw
- *
- * 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 preonic_layers {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum preonic_keycodes {
-  L_RESET = SAFE_RANGE,
-};
-
-#ifdef AUDIO_ENABLE
-float planck_sound[][2] = SONG(PLANCK_SOUND);
-#endif
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base
-     * ,-----------------------------------------------------------------------------------.
-     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Shift|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |Leader| Ctrl | Alt  | GUI  | Lower| Enter| Space| Raise| GUI  | Alt  | Ctrl | Del  |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_BASE] = LAYOUT_preonic_grid(
-        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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-        KC_ESC,  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,
-        QK_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_ENT,  KC_SPC,  RAISE,   KC_RGUI, KC_RALT, KC_RCTL, KC_DEL
-    ),
-
-    /* Lower
-     * ,-----------------------------------------------------------------------------------.
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | Caps |      |      |      |      |      | Left | Down |  Up  | Right|      |  \   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      | Home | End  | Pg Up| Pg Dn|      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_preonic_grid(
-        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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, KC_BSLS,
-        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |      |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  |   |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   _  |   +  |   {  |   }  |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_preonic_grid(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_PIPE,
-        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Adjust (Lower + Raise)
-     * ,-----------------------------------------------------------------------------------.
-     * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      | Reset| Debug| Clear|  RGB | HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |Aud on|Audoff| Swap | Norm |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |Mus on|Musoff| NKRO | 6KRO |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_ADJUST] = LAYOUT_preonic_grid(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, L_RESET, DB_TOGG, EE_CLR,  RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
-        _______, XXXXXXX, XXXXXXX, AU_ON,   AU_OFF,  AG_SWAP, AG_NORM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, XXXXXXX, XXXXXXX, MU_ON,   MU_OFF,  NK_ON,   NK_OFF,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
-
-const rgblight_segment_t PROGMEM base_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 9, 0, 0, 0});
-
-const rgblight_segment_t PROGMEM lower_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 8, HSV_RED});
-
-const rgblight_segment_t PROGMEM raise_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 8, HSV_GREEN});
-
-const rgblight_segment_t PROGMEM adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 8, HSV_BLUE});
-
-const rgblight_segment_t PROGMEM capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({4, 5, HSV_WHITE});
-
-// Later layers take precedence.
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    base_layer,
-    lower_layer,
-    raise_layer,
-    adjust_layer,
-    capslock_layer
-);
-
-bool audio_disable = false;
-
-void keyboard_pre_init_user(void) {
-    // If the audio is off during hardware init,
-    // it causes problem when the audio is turn on later.
-    // The workaround is to always set the audio on during hardware init,
-    // then toggle audio back to the setting.
-#ifdef AUDIO_ENABLE
-    if (!is_audio_on()) {
-        audio_disable = true;
-        audio_on();
-    }
-#endif
-}
-
-void matrix_init_user(void) {
-    // To fix a audio related problem. See comments in keyboard_pre_init_user().
-#ifdef AUDIO_ENABLE
-    if (audio_disable) {
-        audio_off();
-    }
-#endif
-}
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = rgb_layers;
-    rgblight_set_layer_state(0, true);
-}
-
-bool leader_found;
-
-void leader_end_user(void) {
-    leader_found = false;
-
-    if (leader_sequence_one_key(L_RESET)) {
-        leader_found = true;
-        reset_keyboard();
-    } else if (leader_sequence_one_key(KC_DEL)) {
-        leader_found = true;
-        layer_clear();
-    } else if (leader_sequence_one_key(LOWER)) {
-        leader_found = true;
-        layer_on(_LOWER);
-    } else if (leader_sequence_one_key(RAISE)) {
-        leader_found = true;
-        layer_on(_RAISE);
-    }
-
-    // Plays sound on if leader sequence found.
-    if (leader_found) {
-#ifdef AUDIO_ENABLE
-        PLAY_SONG(planck_sound);
-#endif
-    }
-}
-
-bool led_update_user(led_t led_state) {
-    // Turn on RBG for capslock.
-    rgblight_set_layer_state(4, led_state.caps_lock);
-    return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // Set RBG layer according to active keymap layer.
-    rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 1) && layer_state_cmp(state, 2));
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/preonic/keymaps/yhaliaw/rules.mk b/keyboards/preonic/keymaps/yhaliaw/rules.mk
deleted file mode 100644
index 8762502b561..00000000000
--- a/keyboards/preonic/keymaps/yhaliaw/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-LEADER_ENABLE = yes
-
-ENCODER_ENABLE = no
-DIP_SWITCH_ENABLE = no
diff --git a/keyboards/preonic/keymaps/zach/config.h b/keyboards/preonic/keymaps/zach/config.h
deleted file mode 100644
index f5e4d2c2045..00000000000
--- a/keyboards/preonic/keymaps/zach/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#define BACKLIGHT_BREATHING     // LED breathing
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 5
-
-#define NO_ACTION_TAPPING
diff --git a/keyboards/preonic/keymaps/zach/keymap.c b/keyboards/preonic/keymaps/zach/keymap.c
deleted file mode 100644
index 2712de6db99..00000000000
--- a/keyboards/preonic/keymaps/zach/keymap.c
+++ /dev/null
@@ -1,54 +0,0 @@
-// Zach Nielsen     Custom Preonic Keyboard layout
-#include QMK_KEYBOARD_H
-#define PREONIC_YES                 // This is the Preonic
-#include "zach_common_functions.c"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_COLEMAK] = LAYOUT_preonic_1x2uC(  /* Base Layer */
-  KC_ESC,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT, KC_ENT,
-  KC_BSPC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-  SHFT_CAP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  CTRLB,    TD(SUP), KC_LALT, KC_LCTL, TD(LOW),      KC_SPC,      TD(RAI), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-[_SWCOLE] = LAYOUT_preonic_1x2uC(  /* Software Colemak */
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, CM_Q,    CM_W,    CM_F,    CM_P,    CM_G,    CM_J,    CM_L,    CM_U,    CM_Y,    KC_QUOT, _______,
-  _______, CM_A,    CM_R,    CM_S,    CM_T,    CM_D,    CM_H,    CM_N,    CM_E,    CM_I,    CM_O,    _______,
-  _______, CM_Z,    CM_X,    CM_C,    CM_V,    CM_B,    CM_K,    CM_M,    CM_COMM, CM_DOT,  CM_SLSH, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-),
-
-[_RAISE] = LAYOUT_preonic_1x2uC(  /* RAISE - Numpad and Unicode symbols */
-  KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_GRV,  SUPA2,   FACE,    DISFACE, SHRUG,   PLUMIN,  IBANG,   KC_7,    KC_8,    KC_9,    KC_COLN, _______,
-  KC_DEL,  DEGREE,  MICRO,   WOMEGA,  OMEGA,   XXXXXXX, KC_ENT,  KC_4,    KC_5,    KC_6,    KC_SLSH, KC_ASTR,
-  _______, KC_COLN, TFLIP,   LAROW,   RAROW,   XXXXXXX, KC_SPC,  KC_1,    KC_2,    KC_3,    KC_MINS, KC_PLUS,
-  _______, KC_PIPE, TPUT,    _______, _______,      KC_TAB,      _______, KC_0,    KC_0,    KC_DOT,  KC_EQL
-),
-
-[_LOWER] = LAYOUT_preonic_1x2uC(  /* LOWER - Symbols, Paging, CtrAltDel */
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_DQT,  KC_DEL,
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_DQT,  KC_DEL,
-  KC_DEL,  KC_LBRC, KC_RBRC, KC_MINS, KC_UNDS, KC_HOME, KC_END,  KC_LPRN, KC_RPRN, KC_SLSH, KC_SCLN, KC_PGUP,
-  CPYPST,  XXXXXXX, C(KC_X), KC_LABK, KC_RABK, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_BSLS, KC_COLN, KC_PGDN,
-  _______, _______, _______, _______, _______,      KC_TAB,      _______, _______, _______, _______, _______
-),
-
-[_ADJUST] = LAYOUT_preonic_1x2uC(  /* ADJUST - Macros, Layer Switching, Function Keys */
-  UNIWIN,  XXXXXXX, XXXXXXX, RANDIG,  RANDIG,  KC_INS,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, AU_TOGG, MU_TOGG,
-  UNILIN,  SUPA2,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1,    KC_F2,   KC_F3,   KC_F4,   XXXXXXX,
-  XXXXXXX, DEGREE,  IBANG,   LAROW,   RAROW,   SWCOLE,  COLEMAK, KC_F5,    KC_F6,   KC_F7,   KC_F8,   BL_UP,
-  _______, CADKEY,  MICRO,   WOMEGA,  OMEGA,   XXXXXXX, XXXXXXX, KC_F9,    KC_F10,  KC_F11,  KC_F12,  BL_DOWN,
-  _______, _______, _______, _______, _______,      QK_BOOT,     _______,  XXXXXXX, AU_PREV, AU_NEXT, BL_TOGG
-),
-
-[_UNICODES] = LAYOUT_preonic_1x2uC(  /* UNICODES - Extra layer for unicode stuff */
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  _______, TFLIP,   XXXXXXX, XXXXXXX, IBANG,   roman7,  XXXXXXX, XXXXXXX, ROMAN7,  XXXXXXX, XXXXXXX, _______,
-  KC_DEL,  TPUT,    FACE,    DISFACE, SHRUG,   roman4,  roman5,  roman6,  ROMAN4,  ROMAN5,  ROMAN6,  _______,
-  XXXXXXX, XXXXXXX, XXXXXXX, LAROW,   RAROW,   roman1,  roman2,  roman3,  ROMAN1,  ROMAN2,  ROMAN3,  XXXXXXX,
-  _______, _______, _______, _______, _______,     KC_SPC,       _______, _______, _______, _______, _______
-)
-};
diff --git a/keyboards/preonic/keymaps/zach/rules.mk b/keyboards/preonic/keymaps/zach/rules.mk
deleted file mode 100644
index 8cd4f98eeb2..00000000000
--- a/keyboards/preonic/keymaps/zach/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Zach Preonic Makefile
-# Max .hex size is about 28636 bytes
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-TAP_DANCE_ENABLE    = yes   # Enable TapDance functionality
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE     = no    # Mouse keys(+4700)
-EXTRAKEY_ENABLE     = no    # Audio control and System control(+450)
-CONSOLE_ENABLE      = no    # Console for debug(+400)
-COMMAND_ENABLE      = no    # Commands for debug and configuration
-NKRO_ENABLE         = yes   # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE    = yes   # Enable keyboard backlight functionality
-MIDI_ENABLE         = no    # MIDI controls
-AUDIO_ENABLE        = yes   # Audio output on port C6
-#VARIABLE_TRACE      = no    # Debug changes to variable values
-UNICODE_ENABLE      = no    # Unicode
-UNICODEMAP_ENABLE   = yes   # Enable extended unicode
-BLUETOOTH_ENABLE    = no    # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE     = no    # Enable WS2812 RGB underlight.
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE    = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/preonic/keymaps/zach/zach_common_functions.c b/keyboards/preonic/keymaps/zach/zach_common_functions.c
deleted file mode 100644
index ba6c4025268..00000000000
--- a/keyboards/preonic/keymaps/zach/zach_common_functions.c
+++ /dev/null
@@ -1,417 +0,0 @@
-#ifndef ZACH_COMMON_FUNCTIONS
-#define ZACH_COMMON_FUNCTIONS
-#include "eeconfig.h"
-#include "action_layer.h"
-#include "keymap_colemak.h"
-extern keymap_config_t keymap_config;
-
-#undef C
-#define C(n)    RCTL(n)
-#define CADKEY  RCTL(RALT(KC_DEL))
-
-void tap(uint16_t keycode){
-    register_code(keycode);
-    unregister_code(keycode);
-};
-
-void persistent_default_layer_set(uint16_t default_layer){
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-};
-
-// Automatic number generation of important keywords
-enum my_keycodes{
-    // Layer numbers
-    _COLEMAK = 0,
-    _SWCOLE,
-    _RAISE,
-    _LOWER,
-    _ADJUST,
-    _UNICODES,
-    // These use process_record_user()
-    COLEMAK = SAFE_RANGE,
-    SWCOLE,
-    LOWER,
-    RAISE,
-    SHFT_CAP,
-    CTRLB,
-    CPYPST,
-    FACE,
-    UNIWIN,
-    UNILIN,
-    DISFACE,
-    TFLIP,
-    TPUT,
-    SHRUG,
-    RANDIG,
-    // Tap_Dance nums
-    RAI = 0,
-    LOW,
-    SUP
-};
-
-#ifdef AUDIO_ENABLE
-#include "audio.h"
-float tone_goodbye[][2]         = SONG(GOODBYE_SOUND);
-float tone_colemak[][2]         = SONG(COLEMAK_SOUND);
-float tone_swcole[][2]          = SONG(QWERTY_SOUND);
-float tone_capslock_on[][2]     = SONG(CAPS_LOCK_ON_SOUND);
-float tone_capslock_off[][2]    = SONG(CAPS_LOCK_OFF_SOUND);
-float tone_ctrl_mod[][2]        = SONG(COIN_SOUND);
-float tone_copy[][2]            = SONG(SCROLL_LOCK_ON_SOUND);
-float tone_paste[][2]           = SONG(SCROLL_LOCK_OFF_SOUND);
-float uniwin[][2]               = SONG(UNICODE_WINDOWS);
-float unilin[][2]               = SONG(UNICODE_LINUX);
-#endif
-
-#ifdef TAP_DANCE_ENABLE
-#define TAPPING_TERM 200
-
-void dance_raise_press(tap_dance_state_t *state, void *user_data){// Called on each tap
-  switch(state->count){      // Only turn the layer on once
-    case 1:
-        layer_off(_UNICODES);
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        break;
-  }
-};
-void dance_raise_lift(tap_dance_state_t *state, void *user_data){ // Called on release
-  switch(state->count){
-    case 1:         // Normal action. Turn off layers
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        layer_off(_UNICODES);
-        break;
-  }
-};
-/////////////////////////////////////////////////////////////////////
-void dance_lower_press(tap_dance_state_t *state, void *user_data){// Called on tap
-  switch(state->count){
-    case 1:         // Turn on lower
-        layer_off(_UNICODES);
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        break;
-  }
-};
-void dance_lower_lift(tap_dance_state_t *state, void *user_data){ // Called on release
-  switch(state->count){
-    case 1:         // Normal action. Turn off layers
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        layer_off(_UNICODES);
-        break;
-    case 2:         // Turn on _UNICODES layer
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        layer_on(_UNICODES);
-        #ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_ctrl_mod);
-        #endif
-        break;
-  }
-};
-/////////////////////////////////////////////////////////////////////
-void dance_super_press(tap_dance_state_t *state, void *user_data){   // Called on down
-    if(state->count == 1){
-        register_code(KC_LGUI);
-    }
-}
-void dance_super_done(tap_dance_state_t *state, void *user_data){    // Called on timeout
-  switch(state->count){
-    case 2:
-        register_code(KC_LGUI);
-        tap(KC_L);
-        unregister_code(KC_LGUI);
-        break;
-  }
-}
-void dance_super_lift(tap_dance_state_t *state, void *user_data){        // Called on up
-    unregister_code(KC_LGUI);
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [RAI] = ACTION_TAP_DANCE_FN_ADVANCED(dance_raise_press, NULL, dance_raise_lift),
-    [LOW] = ACTION_TAP_DANCE_FN_ADVANCED(dance_lower_press, NULL, dance_lower_lift),
-    [SUP] = ACTION_TAP_DANCE_FN_ADVANCED(dance_super_press, dance_super_done, dance_super_lift)
-};
-#endif
-
-//#ifdef UNICODE_ENABLE
-// Unicode shortcuts
-#define IBANG   UM(0x203D)
-#define RAROW   UM(0x2192)
-#define LAROW   UM(0x2190)
-#define DEGREE  UM(0x00B0)
-#define OMEGA   UM(0x03A9)
-#define WOMEGA  UM(0x03C9)
-#define MICRO   UM(0x00B5)
-#define PLUMIN  UM(0x00B1)
-#define SUPA2   UM(0x00B2)
-#define ROMAN1  UM(0x2160)
-#define ROMAN2  UM(0x2161)
-#define ROMAN3  UM(0x2162)
-#define ROMAN4  UM(0x2163)
-#define ROMAN5  UM(0x2164)
-#define ROMAN6  UM(0x2165)
-#define ROMAN7  UM(0x2166)
-#define roman1  UM(0x2170)
-#define roman2  UM(0x2171)
-#define roman3  UM(0x2172)
-#define roman4  UM(0x2173)
-#define roman5  UM(0x2174)
-#define roman6  UM(0x2175)
-#define roman7  UM(0x2176)
-
-#ifdef UNICODEMAP_ENABLE
-enum Ext_Unicode{
-    PENGUIN = 0,
-    BOAR,
-    MONKEY,
-    DRAGON,
-    CHICK,
-    TUMBLER
-};
-const uint32_t unicode_map[] PROGMEM = {
-    [PENGUIN]   = 0x1F427,
-    [BOAR]      = 0x1F417,
-    [MONKEY]    = 0x1F412,
-    [DRAGON]    = 0x1F409,
-    [CHICK]     = 0x1F425,
-    [TUMBLER]   = 0x1F943
-};
-#define PENGY   UM(PENGUIN)
-#define BOARY   UM(BOAR)
-#define MNKY    UM(MONKEY)
-#define DRGN    UM(DRAGON)
-#define DUCK    UM(CHICK)
-#define TMBL    UM(TUMBLER)
-#endif
-
-//#endif
-
-static uint16_t key_timer;
-static uint8_t  caps_status = 0;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-        if(record->event.pressed){
-            persistent_default_layer_set(1UL<<_COLEMAK);
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_colemak);
-            #endif
-        }
-        return false;
-        break;
-    case SWCOLE:
-        if(record->event.pressed){
-            persistent_default_layer_set(1UL<<_SWCOLE);
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(tone_swcole);
-            #endif
-        }
-        return false;
-        break;
-    case RAISE:
-        if(record->event.pressed){
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case LOWER:
-        if(record->event.pressed){
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case SHFT_CAP:
-        if(record->event.pressed){
-            key_timer = timer_read();               // if the key is being pressed, we start the timer.
-            register_code(KC_LSFT);
-        } else {                                    // this means the key was just released (tap or "held down")
-            if(timer_elapsed(key_timer) < 152){     // Time in ms, the threshold we pick for counting something as a tap.
-                tap(KC_CAPS);
-                if(caps_status == 0){
-                    caps_status = 1;
-                    #ifdef AUDIO_ENABLE
-                        PLAY_SONG(tone_capslock_on);
-                    #endif
-                } else {
-                    caps_status = 0;
-                    #ifdef AUDIO_ENABLE
-                        PLAY_SONG(tone_capslock_off);
-                    #endif
-                }
-            }
-            unregister_code(KC_LSFT);
-        }
-        return false;
-        break;
-    case CTRLB:                                     // Control-B on tap (bold)
-        if(record->event.pressed){
-            key_timer = timer_read();               // if the key is being pressed, we start the timer.
-            register_code(KC_LCTL);
-        } else {                                    // this means the key was just released (tap or "held down")
-            if (timer_elapsed(key_timer) < 152) {   // Time in ms, the threshold we pick for counting something as a tap.
-                tap(KC_B);
-                #ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_ctrl_mod);
-                #endif
-                #ifdef BACKLIGHT_BREATHING
-                    breathing_period_set(2);
-                    breathing_pulse();
-                #endif
-            }
-            unregister_code(KC_LCTL);
-        }
-        return false;
-        break;
-    case CPYPST:                                    // One key copy/paste
-        if(record->event.pressed){
-            key_timer = timer_read();
-        } else {
-            if (timer_elapsed(key_timer) > 152) {   // Hold, copy
-                register_code(KC_LCTL);
-                tap(KC_C);
-                unregister_code(KC_LCTL);
-                #ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_copy);
-                #endif
-            } else {                                // Tap, paste
-                register_code(KC_LCTL);
-                tap(KC_V);
-                unregister_code(KC_LCTL);
-                #ifdef AUDIO_ENABLE
-                    PLAY_SONG(tone_paste);
-                #endif
-            }
-        }
-        return false;
-        break;
-    #ifdef UNICODE_ENABLE
-    case UNIWIN:
-        if(record->event.pressed){
-            set_unicode_input_mode(UNICODE_MODE_WINDOWS);
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(uniwin);
-            #endif
-        }
-        return false;
-        break;
-    case UNILIN:
-        if(record->event.pressed){
-            set_unicode_input_mode(UNICODE_MODE_LINUX);
-            #ifdef AUDIO_ENABLE
-              PLAY_SONG(unilin);
-            #endif
-        }
-        return false;
-        break;
-    case DISFACE:       // ಠ_ಠ
-        if(record->event.pressed){
-            process_unicode((0x0CA0|QK_UNICODE), record);   // Eye
-            register_code(KC_RSFT);
-            tap(KC_MINS);
-            unregister_code(KC_RSFT);
-            process_unicode((0x0CA0|QK_UNICODE), record);   // Eye
-        }
-        return false;
-        break;
-    case TFLIP:         // (╯°□°)╯ ︵ ┻━┻
-        if(record->event.pressed){
-            register_code(KC_RSFT);
-            tap(KC_9);
-            unregister_code(KC_RSFT);
-            process_unicode((0x256F|QK_UNICODE), record);   // Arm
-            process_unicode((0x00B0|QK_UNICODE), record);   // Eye
-            process_unicode((0x25A1|QK_UNICODE), record);   // Mouth
-            process_unicode((0x00B0|QK_UNICODE), record);   // Eye
-            register_code(KC_RSFT);
-            tap(KC_0);
-            unregister_code(KC_RSFT);
-            process_unicode((0x256F|QK_UNICODE), record);   // Arm
-            tap(KC_SPC);
-            process_unicode((0x0361|QK_UNICODE), record);   // Flippy
-            tap(KC_SPC);
-            process_unicode((0x253B|QK_UNICODE), record);   // Table
-            process_unicode((0x2501|QK_UNICODE), record);   // Table
-            process_unicode((0x253B|QK_UNICODE), record);   // Table
-        }
-        return false;
-        break;
-    case TPUT:          // ┬──┬ ノ( ゜-゜ノ)
-        if(record->event.pressed){
-            process_unicode((0x252C|QK_UNICODE), record);   // Table
-            process_unicode((0x2500|QK_UNICODE), record);   // Table
-            process_unicode((0x2500|QK_UNICODE), record);   // Table
-            process_unicode((0x252C|QK_UNICODE), record);   // Table
-            tap(KC_SPC);
-            process_unicode((0x30CE|QK_UNICODE), record);   // Arm
-            register_code(KC_RSFT);
-            tap(KC_9);
-            unregister_code(KC_RSFT);
-            tap(KC_SPC);
-            process_unicode((0x309C|QK_UNICODE), record);   // Eye
-            tap(KC_MINS);
-            process_unicode((0x309C|QK_UNICODE), record);   // Eye
-            process_unicode((0x30CE|QK_UNICODE), record);   // Arm
-            register_code(KC_RSFT);
-            tap(KC_0);
-            unregister_code(KC_RSFT);
-        }
-        return false;
-        break;
-    case SHRUG:         // ¯\_(ツ)_/¯
-        if(record->event.pressed){
-            process_unicode((0x00AF|QK_UNICODE), record);   // Hand
-            tap(KC_BSLS);                                   // Arm
-            register_code(KC_RSFT);
-            tap(KC_UNDS);                                   // Arm
-            tap(KC_LPRN);                                   // Head
-            unregister_code(KC_RSFT);
-            process_unicode((0x30C4|QK_UNICODE), record);   // Face
-            register_code(KC_RSFT);
-            tap(KC_RPRN);                                   // Head
-            tap(KC_UNDS);                                   // Arm
-            unregister_code(KC_RSFT);
-            tap(KC_SLSH);                                   // Arm
-            process_unicode((0x00AF|QK_UNICODE), record);   // Hand
-        }
-        return false;
-        break;
-    #endif
-    case FACE:          // (o_O)
-        if(record->event.pressed){
-            register_code(KC_RSFT);
-            tap(KC_LPRN);
-            unregister_code(KC_RSFT);
-            tap(KC_O);
-            register_code(KC_RSFT);
-            tap(KC_UNDS);
-            tap(KC_O);
-            tap(KC_RPRN);
-            unregister_code(KC_RSFT);
-        }
-        return false;
-        break;
-    case RANDIG:
-        if (record->event.pressed) {
-            tap_random_base64();
-        }
-        return false;
-        break;
-  }
-  return true;
-};
-
-
-#endif
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index 0ca96c91645..7800131a90d 100644
--- a/keyboards/preonic/rev3/config.h
+++ b/keyboards/preonic/rev3/config.h
@@ -41,8 +41,6 @@
 //#define NO_ACTION_ONESHOT
 
 // RGB Matrix support
-#define RGB_MATRIX_LED_COUNT 9
-
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index 0ca96c91645..7800131a90d 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -41,8 +41,6 @@
 //#define NO_ACTION_ONESHOT
 
 // RGB Matrix support
-#define RGB_MATRIX_LED_COUNT 9
-
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c b/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c
deleted file mode 100644
index 5dbdc4cfc8d..00000000000
--- a/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2018 Holten Campbell
- *
- * 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 primee_layers {
-  _DEFAULT,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-#define CTLESC MT(MOD_LCTL, KC_ESC)
-#define LWRSPC LT(_LOWER, KC_SPC)
-#define RSEENT LT(_RAISE, KC_ENT)
-#define MOADJ  MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_DEFAULT] = LAYOUT(
-		KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,       KC_T,             KC_Y,     KC_U,        KC_I,      KC_O,      KC_P,      KC_DEL,    KC_BSPC,
-		CTLESC,    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,             MOADJ,    KC_N,        KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,
-		KC_LCTL,   KC_LGUI,                         KC_LALT,    LWRSPC,	          RSEENT,   KC_RALT,                                      KC_RCTL,   KC_RGUI
-    ),
-
-    [_LOWER] = LAYOUT(
-		KC_TRNS,   KC_EXLM,   KC_AT,     KC_HASH,   KC_DLR,     KC_PERC,          KC_CIRC,   KC_AMPR,    KC_ASTR,   KC_LPRN,   KC_RPRN,   KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_LBRC,    KC_RBRC,   KC_MINS,   KC_EQL,    KC_TRNS,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_GRV,    KC_BSLS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,                         KC_TRNS,    KC_TRNS,	      KC_TRNS,   KC_TRNS,                                     KC_TRNS,   KC_TRNS
-    ),
-
-    [_RAISE] = LAYOUT(
-		KC_TRNS,   KC_1,      KC_2,      KC_3,      KC_4,       KC_5,             KC_6,      KC_7,       KC_8,      KC_9,      KC_0,      KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_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,    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
-    ),
-
-    [_ADJUST] = LAYOUT(
-		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_TRNS,          KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-		QK_BOOT,   KC_TRNS,                         KC_TRNS,    KC_TRNS,	      KC_TRNS,   KC_TRNS,                                     KC_TRNS,   KC_TRNS
-    )
-};
-
-void matrix_init_user(void) {
-  // set CapsLock LED to output and low
-  setPinOutput(B1);
-  writePinLow(B1);
-  // set NumLock LED to output and low
-  setPinOutput(B2);
-  writePinLow(B2);
-  // set ScrollLock LED to output and low
-  setPinOutput(B3);
-  writePinLow(B3);
-}
-
-//function for layer indicator LED
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(B3, layer_state_cmp(state, 1));
-    writePin(B2, layer_state_cmp(state, 2));
-    writePin(B1, layer_state_cmp(state, 3));
-
-    return state;
-}
diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/readme.md b/keyboards/primekb/prime_e/keymaps/gwillad/readme.md
deleted file mode 100644
index 7886d3962e6..00000000000
--- a/keyboards/primekb/prime_e/keymaps/gwillad/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Gwillad keymap for prime e 
-This is gwillad's keymap for prime e
-
-Besides using a tweaked version of my prefered layout, this also includes:
-
-* code to use the prime e leds for layers (instead of caps lock or num lock or anything else), which I thought made more sense on a 40%
-* via enabled so people can still adjust their code without having to recompile
diff --git a/keyboards/primekb/prime_e/keymaps/ifohancroft/config.h b/keyboards/primekb/prime_e/keymaps/ifohancroft/config.h
deleted file mode 100644
index 9a0d0e54f71..00000000000
--- a/keyboards/primekb/prime_e/keymaps/ifohancroft/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 IFo Hancroft
- *
- * 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
-
-// place overrides here
-#define USB_POLLING_INTERVAL_MS 1
-#define FORCE_NKRO
diff --git a/keyboards/primekb/prime_e/keymaps/ifohancroft/keymap.c b/keyboards/primekb/prime_e/keymaps/ifohancroft/keymap.c
deleted file mode 100644
index 666153ea2c1..00000000000
--- a/keyboards/primekb/prime_e/keymaps/ifohancroft/keymap.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2021 IFo Hancroft
-  *
-  * 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] = {
-
-    /* Default Layer
-    * ------------------------------------------------------------------------------------------------------------------------------
-    * | Tab   || Q     || W     || E     || R     || T     ||       || Y     || U     || I     || O     || P     || [     || ]     |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * | ESC   || A     || S     || D     || F     || G     ||       || H     || J     || K     || L     || ;     || Enter ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * | Shift || Z     || X     || C     || V     || B     ||       || N     || M     || ,     || .     || /     || "     || Shift |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * | Ctrl  || Super ||       ||       || Alt   || Bkspc ||       || Space || MO(1) ||       ||       ||       || Alt   || Ctrl  |
-    * ------------------------------------------------------------------------------------------------------------------------------
-    */
-    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_RBRC,
-        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT, KC_RSFT,
-        KC_LCTL, KC_LWIN,                   KC_LALT, KC_BSPC,          KC_SPC,  MO(1),                              KC_RALT, KC_RCTL
-    ),
-
-    /* Secondary Layer
-    * ------------------------------------------------------------------------------------------------------------------------------
-    * | `     || 1     || 2     || 3     || 4     || 5     ||       || 6     || 7     || 8     || 9     || 0     || -     || =     |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       || \     ||       || Left  || Down  || Up    || Right || Del   ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       || F1    || F2    || F3    || F4    || F5    ||       || F6    || F7    || F8    || F9    || F10   || F11   || F12   |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT(
-        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DEL,  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_TRNS,                            KC_TRNS, KC_TRNS
-    ),
-
-    /* Empty Layer
-    * ------------------------------------------------------------------------------------------------------------------------------
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS
-    ),
-
-    /* Empty Layer
-    * ------------------------------------------------------------------------------------------------------------------------------
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, 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/primekb/prime_e/keymaps/ifohancroft/readme.md b/keyboards/primekb/prime_e/keymaps/ifohancroft/readme.md
deleted file mode 100644
index 06c15f76737..00000000000
--- a/keyboards/primekb/prime_e/keymaps/ifohancroft/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Will add layout image later when I get a KLE.
-
-# IFo Hancroft's Prime_E Layout
-
- - Layer 1: A standard 45% ANSI QWERTY layer. It contains the alphabet, as well as a couple of special characters.
- - Layer 2: A function layer. It contains the number keys, the F1-12 keys, as well as the rest of the special characters that do not fit on Layer 1.
- - Layer 3: An empty layer in-case I need something on-the-fly so I can remap with VIA.
- - Layer 4: An empty layer in-case I need something on-the-fly so I can remap with VIA.
-
-This keymap also sets the polling rate of the keyboard to 1ms, forces NKRO on, disables the EXTRAKEY feature, and enables the following features:
-
- - COMMAND
- - VIA
diff --git a/keyboards/primekb/prime_e/keymaps/ifohancroft/rules.mk b/keyboards/primekb/prime_e/keymaps/ifohancroft/rules.mk
deleted file mode 100644
index 625a37dc447..00000000000
--- a/keyboards/primekb/prime_e/keymaps/ifohancroft/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRAKEY_ENABLE = no
-COMMAND_ENABLE = yes
-VIA_ENABLE = yes
diff --git a/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c b/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c
deleted file mode 100644
index a45a841285f..00000000000
--- a/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2018 Holten Campbell
- *
- * 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 BLINK_DURATION 512
-#define CAPS_LED_PIN B1
-#define NUM_LED_PIN B2
-#define SCROLL_LED_PIN B3
-
-uint8_t CAPS;
-uint16_t BLINK_TIMER = 0;
-uint8_t CAPS_LED_STATE = 0;
-
-// Init togg_indicator so the compiler doesn't complain when I declare it last.
-static void togg_indicator(uint8_t *state, uint8_t pin);
-
-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_BSPC, KC_BSPC,
-    LT(2, KC_TAB), KC_A,    KC_S, KC_D,     KC_F,    KC_G,    KC_H,        KC_J,    KC_K,    KC_L,    KC_SCLN, LT(2, KC_ENT),
-    KC_LSFT,       KC_Z,    KC_X, KC_C,     KC_V,    KC_B,    LT(3, KC_B), KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL,       KC_LGUI,       KC_LALT,  LT(1, KC_SPC),    LT(1, KC_SPC),        KC_RALT,          KC_RGUI, KC_RCTL
-  ),
-
-  [1] = LAYOUT(
-    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_TRNS, KC_MINS, KC_EQL,  KC_SCLN, KC_QUOT, KC_TRNS,     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TRNS,
-    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,              KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS
-  ),
-
-  [2] = LAYOUT(
-    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_TRNS,
-    KC_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS,     KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
-    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,              KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS
-  ),
-
-  [3] = LAYOUT(
-    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_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,              KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS
-  )
-};
-
-void matrix_init_user(void) {
-  // set CapsLock LED to output and low
-  setPinOutput(CAPS_LED_PIN);
-  writePinLow(CAPS_LED_PIN);
-  // set NumLock LED to output and low
-  setPinOutput(NUM_LED_PIN);
-  writePinLow(NUM_LED_PIN);
-  // set ScrollLock LED to output and low
-  setPinOutput(SCROLL_LED_PIN);
-  writePinLow(SCROLL_LED_PIN);
-}
-
-void matrix_scan_user(void) {
-    if (CAPS == 1) {
-        // Blink the first led when capslock is active
-        if (BLINK_TIMER >= BLINK_DURATION) {
-            togg_indicator(&CAPS_LED_STATE, CAPS_LED_PIN);
-            BLINK_TIMER = 0;
-        }
-        BLINK_TIMER++;
-    }
-}
-
-//function for layer indicator LED
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        writePinHigh(CAPS_LED_PIN);
-    } else {
-        writePinLow(CAPS_LED_PIN);
-    }
-    if (layer_state_cmp(state, 2)) {
-        writePinHigh(NUM_LED_PIN);
-    } else {
-        writePinLow(NUM_LED_PIN);
-    }
-    if (layer_state_cmp(state, 3)) {
-        writePinHigh(SCROLL_LED_PIN);
-    } else {
-        writePinLow(SCROLL_LED_PIN);
-    }
-    return state;
-}
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        CAPS = 1;
-    }
-    else {
-        CAPS = 0;
-    }
-    return false;
-}
-
-void togg_indicator(uint8_t *state, uint8_t pin) {
-    // Toggles a pin based on the current state
-    if (*state == 0){
-        *state = 1;
-        writePinHigh(pin);
-    }
-    else if (*state == 1){
-        *state = 0;
-        writePinLow(pin);
-    }
-}
diff --git a/keyboards/primekb/prime_e/keymaps/madhatter/config.h b/keyboards/primekb/prime_e/keymaps/madhatter/config.h
deleted file mode 100644
index 3ec816d7ee2..00000000000
--- a/keyboards/primekb/prime_e/keymaps/madhatter/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 150
-
-#undef PRODUCT
-#define PRODUCT "MadHatter's Custom Ilpse"
diff --git a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
deleted file mode 100644
index 998046c6d7c..00000000000
--- a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2018 Holten Campbell
- *
- * 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 BLINK_DURATION 512
-#define CAPS_LED_PIN B1
-#define NUM_LED_PIN B2
-#define SCROLL_LED_PIN B3
-
-uint8_t CAPS;
-uint16_t BLINK_TIMER = 0;
-uint8_t CAPS_LED_STATE = 0;
-
-// Init togg_indicator so the compiler doesn't complain when I declare it last.
-static void togg_indicator(uint8_t *state, uint8_t pin);
-
-enum ilpse_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define GUBS RGUI_T(KC_BSPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-    QK_GESC, KC_Q,  KC_W,  KC_E,  KC_R,   KC_T,    KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_MINS, 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_ENT,
-    SC_LSPO, KC_Z,  KC_X,  KC_C,  KC_V,   KC_B,    KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-    KC_LCTL, KC_LALT,          LOWER,  GUBS,      KC_SPC,  RAISE,          KC_RGUI, KC_RCTL
-  ),
-
-  [_LOWER] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN, KC_QUOT,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS,
-    KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS
-  ),
-
-  [_RAISE] = LAYOUT(
-    KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,  KC_DEL,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_PIPE, KC_ENT,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    QK_BOOT, KC_TRNS,                  KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS
-  )
-};
-
-void matrix_init_user(void) {
-  // set CapsLock LED to output and low
-  setPinOutput(CAPS_LED_PIN);
-  writePinLow(CAPS_LED_PIN);
-  // set NumLock LED to output and low
-  setPinOutput(NUM_LED_PIN);
-  writePinLow(NUM_LED_PIN);
-  // set ScrollLock LED to output and low
-  setPinOutput(SCROLL_LED_PIN);
-  writePinLow(SCROLL_LED_PIN);
-}
-
-void matrix_scan_user(void) {
-    if (CAPS == 1) {
-        // Blink the first led when capslock is active
-        if (BLINK_TIMER >= BLINK_DURATION) {
-            togg_indicator(&CAPS_LED_STATE, CAPS_LED_PIN);
-            BLINK_TIMER = 0;
-        }
-        BLINK_TIMER++;
-    }
-}
-
-//function for layer indicator LED
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(CAPS_LED_PIN, layer_state_cmp(state, 0));
-    writePin(NUM_LED_PIN, layer_state_cmp(state, 1));
-    writePin(SCROLL_LED_PIN, layer_state_cmp(state, 2));
-    return state;
-}
-
-bool led_update_user(led_t led_state) {
-    CAPS = led_state.caps_lock;
-    return false;
-}
-
-void togg_indicator(uint8_t *state, uint8_t pin) {
-    // Toggles a pin based on the current state
-    if (*state == 0){
-        *state = 1;
-        writePinHigh(pin);
-    }
-    else if (*state == 1){
-        *state = 0;
-        writePinLow(pin);
-    }
-}
diff --git a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c b/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
deleted file mode 100644
index a3ab5711af1..00000000000
--- a/keyboards/primekb/prime_e/keymaps/peott-fr/keymap.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2021 Pierre-Emmanuel Ott
- *
- * 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 custom_layers {
-  _QWERTY,
-  _LEFTHAND,
-  _NUM,
-  _FUNC
-};
-
-#define SPC_LFT LT(_LEFTHAND, KC_SPC)
-#define FN_NUM LT(_NUM, KC_MNXT)
-#define BSP_FUNC LT(_FUNC, KC_BSPC)
-
-/* This keymap is a regular 40s keymap for most. My concessions include no numpad, and a dedicated left-hand layer.
-Enter is on a layer, which seems somewhat safe! 
-Changes/improvements include removing all the Quantum mod functions when on the arrow layer, so that Ctrl and Shift act without ambiguity based on short or long presses.
-The 3 LEDs on the board show Caps Lock/L1/L2 respectively. L3 has no LED. 
-*/
-
-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_RBRC, 
-		KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,             KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 
-		SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B,             KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, 
-		LCTL_T(KC_MPRV), LALT_T(KC_MPLY), FN_NUM, SPC_LFT, BSP_FUNC, LGUI_T(KC_DEL), RALT_T(KC_HOME), RCTL_T(KC_END)
-		),
-	[_LEFTHAND] = LAYOUT(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_ESC, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, 
-		KC_LSFT, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, 
-		KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_RGUI, KC_PGDN, KC_PGUP
-		),
-	[_NUM] = LAYOUT(
-		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_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, KC_BSLS, 
-		KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, 
-		KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, 				  KC_TRNS, KC_RGUI, KC_RALT, KC_RCTL
-		),
-	[_FUNC] = LAYOUT(
-		QK_BOOT, 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_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, KC_TRNS, KC_TRNS, 
-		KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_RSFT, 
-		KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS,          KC_TRNS, KC_RGUI, KC_RALT, KC_RCTL
-		)
-};
-
-void matrix_init_user(void) {
-  // set CapsLock LED to output and low
-  setPinOutput(B1);
-  writePinLow(B1);
-  // set Layer 1 to output and low
-  setPinOutput(B2);
-  writePinLow(B2);
-  // set Layer 2 to output and low
-  setPinOutput(B3);
-  writePinLow(B3);
-}
-
-//function to activate Caps Lock LED
-bool led_update_user(led_t led_state) {
-    writePin(B1, led_state.caps_lock);
-    return false;
-}
-
-//function for layer indicator LED
-layer_state_t layer_state_set_user(layer_state_t state)
-{
-    if (get_highest_layer(state) == 1) {
-    writePinHigh(B2);
-	} 
-	else {
-		writePinLow(B2);
-    }
-	if (get_highest_layer(state) == 2) {
-    writePinHigh(B3);
-	} 
-	else {
-		writePinLow(B3);
-    }
-    return state;
-}
\ No newline at end of file
diff --git a/keyboards/primekb/prime_m/keymaps/numpad/keymap.c b/keyboards/primekb/prime_m/keymaps/numpad/keymap.c
deleted file mode 100644
index 80c572db1bc..00000000000
--- a/keyboards/primekb/prime_m/keymaps/numpad/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- *
- * 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_5x6(
-		KC_ESC,  KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, KC_PMNS,
-		KC_A,    KC_B,    KC_P7,   KC_P8,   KC_P9,
-		KC_C,    KC_D,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-		KC_E,    KC_F,    KC_P1,   KC_P2,   KC_P3,
-		KC_LCTL, TG(1),      KC_P0,       KC_PDOT, KC_PENT
-    ),
-	[1] = LAYOUT_numpad_5x6(
-		QK_BOOT, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, KC_PMNS,
-		KC_A,    KC_B,    KC_HOME, KC_UP,   KC_PGUP,
-		KC_C,    KC_D,    KC_LEFT, KC_NO,   KC_RGHT, KC_PPLS,
-		KC_E,    KC_F,    KC_END,  KC_DOWN, KC_PGDN,
-		KC_LCTL, _______,      KC_INS,      KC_DEL,  KC_PENT
-    ),
-};
diff --git a/keyboards/primekb/prime_m/keymaps/numpad/readme.md b/keyboards/primekb/prime_m/keymaps/numpad/readme.md
deleted file mode 100644
index cd975583152..00000000000
--- a/keyboards/primekb/prime_m/keymaps/numpad/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The numpad keymap for Prime_M
\ No newline at end of file
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/config.h b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/config.h
deleted file mode 100644
index 4bcfa2ce5c6..00000000000
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- *
- * 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_TERM 200
-
-// place overrides here
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
deleted file mode 100644
index 2f0290dc033..00000000000
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- *
- * 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 L1BS LT(2, KC_BSPC)
-#define LSUP LSFT_T(KC_UP)
-#define CTLL LCTL_T(KC_LEFT)
-#define ECTL LCTL_T(KC_ESC)
-#define ALLM ALL_T(KC_MINS)
-#define SCLS LT(3, KC_SCLN)
-
-// Establishes tap dance keys
-enum {
-  TD_SPC_ENT = 0
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_SPC_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT)
-
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* BASE
- * ,---------------------------------------------------------------------------------------------------------------,
- * |  `   |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   | Del  | NMLK |  /   |  *   |  -   |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |  Q   |  W   |  E   |  R   |  T   |  Y   |  U   |  I   |  O   |  P   |  \   |  7   |  8   |  9   |  +   |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |  A   |  S   |  D   |  F   |  G   |  H   |  J   |  K   |  L   |  ;   |  '   |  4   |  5   |  6   |  =   |
- * | Ctrl |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  Z   |  X   |  C   |  V   |  B   |  N   |  M   |  ,   |  .   |  /   |  Up  |  1   |  2   |  3   |      |
- * | Shift|      |      |      |      |      |      |      |      |      |      | Shift|      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+ Enter|
- * |  -   |      |      |      |  Backspace  |    Space    |      |      | Left | Down | Right|  0   |  .   |      |
- * | ALL  | Ctrl | Alt  | GUI  |     Fn1     |             | GUI  | Alt  | Ctrl |      |      |      |      |      |
- * `---------------------------------------------------------------------------------------------------------------'
- */
-
-  [0] = LAYOUT(
-    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_NUM,    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_BSLS,  KC_7,      KC_8,     KC_9,     KC_PPLS,
-    ECTL,     KC_A,     KC_S,     KC_D,     KC_F,  KC_G,  KC_H,    KC_J,    KC_K,     KC_L,     SCLS,     KC_QUOT,  KC_4,      KC_5,     KC_6,     KC_PEQL,
-    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,  KC_B,  KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  LSUP,     KC_1,      KC_2,     KC_3,     KC_ENT,
-    ALLM,     KC_LCTL,  KC_LALT,  KC_LGUI,  L1BS,  L1BS,  KC_SPC,  KC_SPC,  KC_RGUI,  KC_RALT,  CTLL,     KC_DOWN,  KC_RIGHT,  KC_0,     KC_PDOT,  KC_ENT
-  ),
-
-/* GAME
- * ,---------------------------------------------------------------------------------------------------------------,
- * | Esc  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   | Del  | NMLK |  /   |  *   |  -   |
- * |  `   |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |  Q   |  W   |  E   |  R   |  T   |  Y   |  U   |  I   |  O   |  P   | '    |  7   |  8   |  9   |  +   |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Caps |  A   |  S   |  D   |  F   |  G   |  H   |  J   |  K   |  L   |  ;   | Rtrn |  4   |  5   |  6   |  =   |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  Z   |  X   |  C   |  V   |  B   |  N   |  M   |  ,   |  .   |  /   |  Up  |  1   |  2   |  3   |      |
- * | Shift|      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+ Enter|
- * |      |      |      |      |    Space    |  Backspace  |      |      | Left | Down | Right|  0   |  .   |      |
- * | Fn1  | Ctrl | Alt  | Alt  |             |             | GUI  | DF(0)|      |      |      |      |      |      |
- * `---------------------------------------------------------------------------------------------------------------'
- */
-
-  [1] = LAYOUT(
-    QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,     KC_8,     KC_9,    KC_0,     KC_DEL,   KC_NUM,    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_QUOT,  KC_7,      KC_8,     KC_9,     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_ENT,   KC_4,      KC_5,     KC_6,     KC_PEQL,
-    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,    KC_B,    KC_N,     KC_M,     KC_COMM,  KC_DOT,  KC_SLSH,  KC_UP,    KC_1,      KC_2,     KC_3,     KC_ENT,
-    MO(2),    KC_LCTL,  KC_LALT,  KC_LALT,  KC_SPC,  KC_SPC,  KC_BSPC,  KC_BSPC,  KC_RGUI,  DF(0),   KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_0,     KC_PDOT,  KC_ENT
-  ),
-
-/* SYMBOL
- * ,---------------------------------------------------------------------------------------------------------------,
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+-------------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |  #   |  [   |  <   |  >   |  ]   |  _   |  |   |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |  ~   |  (   |  {   |  }   |  )   |  @   |  -   |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+      |
- * |      |      |      |      |             |    Enter    |      |      |      |      |      |      |      |      |
- * |      |      |      |      |             |             |      |      |      |      |      |      |      |      |
- * `---------------------------------------------------------------------------------------------------------------'
- */
-
-	[2] = 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_HASH,  KC_LBRC,  KC_LT,    KC_GT,    KC_RBRC,  KC_UNDS,  KC_PIPE,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  KC_TILD,  KC_LPRN,  KC_LCBR,  KC_RCBR,  KC_RPRN,  KC_AT,    KC_MINS,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  KC_ENT,   KC_ENT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
-  ),
-
-/* SYSTEM
- * ,---------------------------------------------------------------------------------------------------------------,
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+-------------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | PgUp | Home |  Up  | End  |      |      | Vol- | Vol+ | Mute |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | PgDn | Left | Down |Right |      |      | Play | Prev | Next |      |      |      |      |      | QK_BOOT|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+  BL  |
- * |      |      |      |      |             |             |      |      |      |      |      |      |  BL  | TGGL |
- * | GAME |      |      |      |             |             |      |      |      |      |      |      | STEP |      |
- * `---------------------------------------------------------------------------------------------------------------'
- */
-
-	[3] = LAYOUT(
-    _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,      _______,    _______,   _______,  _______,  _______,  _______,  _______,   _______,
-    _______,  KC_PGUP,  KC_HOME,  KC_UP,    KC_END,  _______,  _______,  KC_VOLD,      KC_VOLU,    KC_MUTE,   _______,  _______,  _______,  _______,  _______,   _______,
-    _______,  KC_PGDN,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  KC_MPLY,     KC_MRWD,    KC_MFFD,   _______,  _______,  _______,  _______,  _______,   QK_BOOT,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,    _______,   _______,  _______,  _______,  _______,  _______,   BL_TOGG,
-    DF(1),    _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,    _______,   _______,  _______,  _______,  _______,  BL_STEP,  BL_TOGG
-  ),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/readme.md b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/readme.md
deleted file mode 100644
index e14e989e322..00000000000
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![reasonsandreasons Layout Image](https://imgur.com/a/xIpn2U5)
-
-# reasonsandreasons's Prime_O Layout
-
-This is a relatively simple layout for the Prime_O, designed for mostly typing use and occasional gaming. I'm still testing it and there will likely be minor changes, but most of the bones of it will likely stay the same.
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/rules.mk b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/rules.mk
deleted file mode 100644
index 645e8d523f6..00000000000
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = no                # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no           # Enable keyboard backlight functionality
-MIDI_ENABLE = no                # MIDI controls
-AUDIO_ENABLE = no               # Audio output on port C6
-UNICODE_ENABLE = no             # Unicode
-BLUETOOTH_ENABLE = no           # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no            # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-TAP_DANCE_ENABLE=yes            # Enable Tap Dance
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no           # Breathing sleep LED during USB suspend
diff --git a/keyboards/primekb/prime_r/keymaps/rooski/config.h b/keyboards/primekb/prime_r/keymaps/rooski/config.h
deleted file mode 100644
index 606f95096aa..00000000000
--- a/keyboards/primekb/prime_r/keymaps/rooski/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2018 Andrew Heaston
- *
- * 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/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-// place overrides here
-
-#define DISABLE_SPACE_CADET_ROLLOVER
-
-
-#endif
diff --git a/keyboards/primekb/prime_r/keymaps/rooski/keymap.c b/keyboards/primekb/prime_r/keymaps/rooski/keymap.c
deleted file mode 100644
index 94e35350046..00000000000
--- a/keyboards/primekb/prime_r/keymaps/rooski/keymap.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/* Copyright 2018  Andrew Heaston  @rooski15
- *
- * Developed by /u/holtenc at www.primekb.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/>.
- */// Prime_R Rev 1.0
-
-#include QMK_KEYBOARD_H
-
-//Arrow Cluster Toggle
-static bool arrow_toggle = false;
-
-//Arrow Keys
-enum custom_keycodes{
-  AR_TOG = SAFE_RANGE, //Toggle Arrow Keys
-  AR_LT,  //Num0 or Left Arrow
-  AR_RT,  //NumEnt or Right Arrow
-  AR_DN,  //NumDot or Down Arrow
-  AR_UP,  //Num2 or Up Arrow
-};
-
-// Tap/Hold Space Layer
-#define SPC_LT LT(1, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* (Base Layer) Default Layer
-   * ,---------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|BSP|DEL|HOM|END|
-   * |---------------------------------------------------------------|
-   * |Grv|  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  7|  8|  9|
-   * |---------------------------------------------------------------|
-   * |Tab |  A|  S|  D|  F|  G|  H|  J|  K|  L|  '|Return|  4|  5|  6|
-   * |---------------------------------------------------------------|
-   * |Shift|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  ?|Shift|  1|ARU|  3|  AR - U/D/L/R & Toggle
-   * |---------------------------------------------------------------|
-   * |Ctrl|Gui |Alt|TO1| 1/SP |  1/SP  |ART|App|Alt|Ctrl |ARL|ARD|ARR|  Arrow keys operate on AR Toggle to be numpad keys
-   * `---------------------------------------------------------------'
-   */
-  // 0: Base Layer
-  [0] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_BSPC, KC_DEL,  KC_HOME, KC_END,
-    KC_GRV,  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_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,          KC_ENT,  KC_P4,   KC_P5,   KC_P6,
-    SC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, KC_P1,   AR_UP,   KC_P3,
-    KC_LCTL,          KC_LGUI, KC_LALT, TO(1),   SPC_LT,           SPC_LT,           AR_TOG,  KC_APP,  KC_RALT, KC_RCTL, AR_LT,   AR_DN,   AR_RT
-  ),
-
-  /* (Function Layer)
-   * ,---------------------------------------------------------------.
-   * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9| F0|  =|BSP|HOM|END|DEL|
-   * |---------------------------------------------------------------|
-   * |Grv|  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  \|  7|  8|  9|
-   * |---------------------------------------------------------------|
-   * |BL  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  '|Return|  4|  5|  6|
-   * |---------------------------------------------------------------|
-   * |Shift|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  ?|Shift|  1|VUP|  3|
-   * |---------------------------------------------------------------|
-   * |Ctrl|Gui |Alt|TO0| 1/SP |  1/SP  |ART|TO2|Alt|Ctrl |MUT|VDN|STP|
-   * `---------------------------------------------------------------'
-   */
-  // 1: Function Layer
-  [1] = LAYOUT(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_EQL,  _______, KC_PSLS, KC_PAST, KC_PPLS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______, _______, _______,
-    BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT,          _______, _______, _______, _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
-    _______,          _______, _______, TO(0),   _______,          _______,          _______, TO(2),   _______, _______, KC_MUTE, KC_VOLD, KC_MSTP
-  ),
-
-  /* (Numpad Mods)
-   * ,---------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|BSP|  /|  *|  +| Mirrors base layer, but with numpad mods
-   * |---------------------------------------------------------------|
-   * |Grv|  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  7|  8|  9|
-   * |---------------------------------------------------------------|
-   * |Tab |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|Return|  4|  5|  6|
-   * |---------------------------------------------------------------|
-   * |Shift|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  ?|Shift|  1|ARU|  3|
-   * |---------------------------------------------------------------|
-   * |Ctrl|Gui |Alt|TO0| 1/SP |  1/SP  |ART|App|Alt|Ctrl |ARL|ARD|ARR|
-   * `---------------------------------------------------------------'
-   */
-    // 2: Numpad Mods
-  [2] = LAYOUT(
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, _______, KC_PSLS, KC_PAST, KC_PPLS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RBRC, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN,          _______, _______, _______, _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AR_UP,   _______,
-    _______,          _______, _______, TO(0),   _______,          _______,          _______, KC_APP,  _______, _______, AR_LT,   AR_DN,   AR_RT
-  ),
-
-  // 3: Extra
-  [3] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,          _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______
-  ),
-
-};
-
-void matrix_init_user(void) {
-  if (get_backlight_level() != 0){
-    backlight_toggle();
-  }
-};
-
-void matrix_scan_user(void) {
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if(record->event.pressed){
-    switch(keycode) {
-      case AR_TOG:
-        arrow_toggle = !arrow_toggle;
-        backlight_toggle();
-        return false; break;
-
-      case AR_UP:
-        if(arrow_toggle == 1){
-          SEND_STRING(SS_DOWN(X_UP));
-        } else {
-          SEND_STRING(SS_DOWN(X_KP_2));
-        }
-        return false; break;
-
-      case AR_DN:
-        if(arrow_toggle == 1){
-          SEND_STRING(SS_DOWN(X_DOWN));
-        } else {
-          SEND_STRING(SS_DOWN(X_KP_DOT));
-        }
-        return false; break;
-
-      case AR_LT:
-        if(arrow_toggle == 1){
-          SEND_STRING(SS_DOWN(X_LEFT));
-        } else {
-          SEND_STRING(SS_DOWN(X_KP_0));
-        }
-        return false; break;
-
-      case AR_RT:
-        if(arrow_toggle == 1){
-          SEND_STRING(SS_DOWN(X_RIGHT));
-        } else {
-          SEND_STRING(SS_DOWN(X_KP_ENTER));
-        }
-        return false; break;
-    }
-  }
-  if(!record->event.pressed){
-    switch(keycode) {
-      case AR_UP:
-        if(arrow_toggle == 1){
-          SEND_STRING(SS_UP(X_UP));
-        } else {
-          SEND_STRING(SS_UP(X_KP_2));
-        }
-        return false; break;
-      case AR_DN:
-        if(arrow_toggle == 1){
-          SEND_STRING(SS_UP(X_DOWN));
-        } else {
-          SEND_STRING(SS_UP(X_KP_DOT));
-        }
-        return false; break;
-      case AR_LT:
-        if(arrow_toggle == 1){
-          SEND_STRING(SS_UP(X_LEFT));
-        } else {
-          SEND_STRING(SS_UP(X_KP_0));
-        }
-        return false; break;
-      case AR_RT:
-        if(arrow_toggle == 1){
-          SEND_STRING(SS_UP(X_RIGHT));
-        } else {
-          SEND_STRING(SS_UP(X_KP_ENTER));
-        }
-        return false; break;
-    }
-  }
-  return true;
-};
diff --git a/keyboards/primekb/prime_r/keymaps/rooski/readme.md b/keyboards/primekb/prime_r/keymaps/rooski/readme.md
deleted file mode 100644
index c61314ee09f..00000000000
--- a/keyboards/primekb/prime_r/keymaps/rooski/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# /u/rooski15 layout
-
-Changes include numpad codes, layer additions, and a toggle-able arrow cluster that is non layer dependant.
\ No newline at end of file
diff --git a/keyboards/primekb/prime_r/keymaps/rooski/rules.mk b/keyboards/primekb/prime_r/keymaps/rooski/rules.mk
deleted file mode 100644
index f8165476809..00000000000
--- a/keyboards/primekb/prime_r/keymaps/rooski/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-COMMAND_ENABLE = no       # Commands for debug and configuration
diff --git a/keyboards/projectcain/vault35/atmega32u4/info.json b/keyboards/projectcain/vault35/atmega32u4/info.json
new file mode 100644
index 00000000000..9acd8ee34d4
--- /dev/null
+++ b/keyboards/projectcain/vault35/atmega32u4/info.json
@@ -0,0 +1,45 @@
+{
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D7", "pin_b": "D6", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "encoder": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B1", "D3", "F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5"],
+        "rows": ["B4", "D4", "B0", "C7"]
+    },
+    "processor": "atmega32u4",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "brightness_steps": 8,
+        "led_count": 12,
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "D5"
+    }
+}
diff --git a/keyboards/projectcain/vault35/atmega32u4/rules.mk b/keyboards/projectcain/vault35/atmega32u4/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/projectcain/vault35/atmega32u4/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h
deleted file mode 100644
index 7abf6b197c7..00000000000
--- a/keyboards/projectcain/vault35/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2021 projectcain
-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
-
-/* 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
-
-/*
- * 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
diff --git a/keyboards/projectcain/vault35/info.json b/keyboards/projectcain/vault35/info.json
index d23c4b2f467..5662cdbf6b3 100644
--- a/keyboards/projectcain/vault35/info.json
+++ b/keyboards/projectcain/vault35/info.json
@@ -1,27 +1,22 @@
 {
-    "keyboard_name": "Vault35",
     "manufacturer": "projectcain",
-    "url": "",
+    "keyboard_name": "Vault35",
     "maintainer": "projectcain",
-    "usb": {
-      "vid": "0xFEED",
-      "pid": "0x6060",
-      "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-      "cols": ["B1", "D3", "F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5"],
-      "rows": ["B4", "D4", "B0", "C7"]
-    },
     "diode_direction": "COL2ROW",
-    "encoder": {
-      "rotary": [
-        {"pin_a": "D6", "pin_b": "D7", "resolution": 2}
-      ]
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "url": "https://mechvault.net",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6060",
+        "vid": "0xFEED"
     },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
     "layouts": {
-        "LAYOUT_split_4space": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -33,8 +28,7 @@
                 {"matrix": [0, 7], "x": 7, "y": 0},
                 {"matrix": [0, 8], "x": 8, "y": 0},
                 {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-
+                {"matrix": [0, 10], "x": 10, "y": 0, "encoder": 0},
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
                 {"matrix": [1, 1], "x": 1.25, "y": 1},
                 {"matrix": [1, 2], "x": 2.25, "y": 1},
@@ -45,7 +39,6 @@
                 {"matrix": [1, 7], "x": 7.25, "y": 1},
                 {"matrix": [1, 8], "x": 8.25, "y": 1},
                 {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
-
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -56,16 +49,16 @@
                 {"matrix": [2, 7], "x": 7.75, "y": 2},
                 {"matrix": [2, 8], "x": 8.75, "y": 2},
                 {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
-
                 {"matrix": [3, 1], "x": 1.5, "y": 3},
                 {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 6], "x": 7.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 7], "x": 8.5, "y": 3}
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 7.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 9, "y": 3}
             ]
         },
-        "LAYOUT_split_3space": {
+        "LAYOUT_full_space": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -77,8 +70,7 @@
                 {"matrix": [0, 7], "x": 7, "y": 0},
                 {"matrix": [0, 8], "x": 8, "y": 0},
                 {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-
+                {"matrix": [0, 10], "x": 10, "y": 0, "encoder": 0},
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
                 {"matrix": [1, 1], "x": 1.25, "y": 1},
                 {"matrix": [1, 2], "x": 2.25, "y": 1},
@@ -89,7 +81,6 @@
                 {"matrix": [1, 7], "x": 7.25, "y": 1},
                 {"matrix": [1, 8], "x": 8.25, "y": 1},
                 {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
-
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -100,11 +91,8 @@
                 {"matrix": [2, 7], "x": 7.75, "y": 2},
                 {"matrix": [2, 8], "x": 8.75, "y": 2},
                 {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
-
                 {"matrix": [3, 1], "x": 1.5, "y": 3},
-                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6},
                 {"matrix": [3, 7], "x": 8.5, "y": 3}
             ]
         },
@@ -120,8 +108,7 @@
                 {"matrix": [0, 7], "x": 7, "y": 0},
                 {"matrix": [0, 8], "x": 8, "y": 0},
                 {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-
+                {"matrix": [0, 10], "x": 10, "y": 0, "encoder": 0},
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
                 {"matrix": [1, 1], "x": 1.25, "y": 1},
                 {"matrix": [1, 2], "x": 2.25, "y": 1},
@@ -132,7 +119,6 @@
                 {"matrix": [1, 7], "x": 7.25, "y": 1},
                 {"matrix": [1, 8], "x": 8.25, "y": 1},
                 {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
-
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -143,14 +129,13 @@
                 {"matrix": [2, 7], "x": 7.75, "y": 2},
                 {"matrix": [2, 8], "x": 8.75, "y": 2},
                 {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
-
                 {"matrix": [3, 1], "x": 1.5, "y": 3},
                 {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 3},
                 {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 3},
                 {"matrix": [3, 7], "x": 8.5, "y": 3}
             ]
         },
-        "LAYOUT_full_space": {
+        "LAYOUT_split_3space": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -162,8 +147,7 @@
                 {"matrix": [0, 7], "x": 7, "y": 0},
                 {"matrix": [0, 8], "x": 8, "y": 0},
                 {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-
+                {"matrix": [0, 10], "x": 10, "y": 0, "encoder": 0},
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
                 {"matrix": [1, 1], "x": 1.25, "y": 1},
                 {"matrix": [1, 2], "x": 2.25, "y": 1},
@@ -174,7 +158,6 @@
                 {"matrix": [1, 7], "x": 7.25, "y": 1},
                 {"matrix": [1, 8], "x": 8.25, "y": 1},
                 {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
-
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -185,9 +168,51 @@
                 {"matrix": [2, 7], "x": 7.75, "y": 2},
                 {"matrix": [2, 8], "x": 8.75, "y": 2},
                 {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
-
                 {"matrix": [3, 1], "x": 1.5, "y": 3},
-                {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6},
+                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 7], "x": 8.5, "y": 3}
+            ]
+        },
+        "LAYOUT_split_4space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0, "encoder": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 6], "x": 7.25, "y": 3, "w": 1.25},
                 {"matrix": [3, 7], "x": 8.5, "y": 3}
             ]
         }
diff --git a/keyboards/projectcain/vault35/keymaps/default/keymap.c b/keyboards/projectcain/vault35/keymaps/default/keymap.c
index 5bb3a622b23..ec9f3502180 100644
--- a/keyboards/projectcain/vault35/keymaps/default/keymap.c
+++ b/keyboards/projectcain/vault35/keymaps/default/keymap.c
@@ -1,19 +1,18 @@
-
- /* Copyright 2021 projectcain
-  *
-  * 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 2021 projectcain
+ *
+ * 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{
@@ -64,3 +63,11 @@ combo_t key_combos[] = {
   [KL_SLSH] = COMBO(kl_combo, S(KC_SLSH)),
   [JK_MINUS] = COMBO(jk_combo, KC_MINUS)
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+      [BASE] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+      [NUM]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+      [SYM]  = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/projectcain/vault35/keymaps/default/rules.mk b/keyboards/projectcain/vault35/keymaps/default/rules.mk
index ff681299e4e..cbd8b4aa81f 100644
--- a/keyboards/projectcain/vault35/keymaps/default/rules.mk
+++ b/keyboards/projectcain/vault35/keymaps/default/rules.mk
@@ -1 +1,2 @@
-COMBO_ENABLE = yes
\ No newline at end of file
+COMBO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/projectcain/vault35/rules.mk b/keyboards/projectcain/vault35/rules.mk
index b03b6fa9058..3cf3a331d8d 100644
--- a/keyboards/projectcain/vault35/rules.mk
+++ b/keyboards/projectcain/vault35/rules.mk
@@ -1,13 +1 @@
-# 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
+DEFAULT_FOLDER = projectcain/vault35/atmega32u4
diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h
index 8b162a21499..d7f9a52afe4 100644
--- a/keyboards/projectd/65/projectd_65_ansi/config.h
+++ b/keyboards/projectd/65/projectd_65_ansi/config.h
@@ -21,8 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
 
@@ -33,6 +31,4 @@
 #define SPI_MISO_PIN A6
 
 #define AW20216S_CS_PIN_1 A15
-#define AW20216S_EN_PIN_1 C13
-
-#define RGB_MATRIX_LED_COUNT 71
+#define AW20216S_EN_PIN C13
diff --git a/keyboards/projectd/65/projectd_65_ansi/info.json b/keyboards/projectd/65/projectd_65_ansi/info.json
index 861e3792db2..9cfe8ffb5d3 100644
--- a/keyboards/projectd/65/projectd_65_ansi/info.json
+++ b/keyboards/projectd/65/projectd_65_ansi/info.json
@@ -154,7 +154,8 @@
             { "flags": 4, "matrix": [0, 3], "x": 130, "y": 40 },
             { "flags": 4, "matrix": [1, 5], "x": 140, "y": 40 },
             { "flags": 4, "matrix": [2, 5], "x": 150, "y": 40 }
-        ]
+        ],
+        "sleep": true
     },
     "url": "",
     "usb": {
diff --git a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
index 0d6123ac019..e2a85a75c39 100644
--- a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
+++ b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
@@ -18,91 +18,91 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to AW20216S manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, Esc
-
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  0, Esc
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  1, 1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  2, 2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  3, 3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  4, 4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  5, 5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  6, 6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  7, 7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  8, 8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  9, 9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  10, 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  11, -
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  12, =
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  13, Backspace
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  14, Del
-
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  15, Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  16, Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  17, W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  18, E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  19, R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  20, T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  21, Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  22, U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  23, I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  24, O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  25, P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  26, [
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  27, ]
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  28, "\\"
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //  29, PGUP
-
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  30, CapsLock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  31, A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  32, S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  33, D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  34, F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  35, G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  36, H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  37, J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  38, K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  39, L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  40, ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  41, '
-    {0, CS13_SW12, CS14_SW12, CS15_SW12}, //  42, Enter
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  43, PGDN
-
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  44, LShift
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  45, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  46, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  47, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  48, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  49, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  50, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  51, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  52, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  53, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  54, /
-    {0, CS16_SW8,  CS17_SW8,  CS18_SW8},  //  55, RShift
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  56, Up
-    {0,  CS1_SW6,   CS2_SW6,   CS3_SW6},  //  57, END
-
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  58, LCtrl
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  59, LWin
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  60, LAlt
-    {0,  CS1_SW2,   CS2_SW2,   CS3_SW2},  //  61, LED71
-    {0,  CS1_SW3,   CS2_SW3,   CS3_SW3},  //  62, LED72
-    {0, CS16_SW4,  CS17_SW4,  CS18_SW4},  //  63, Space
-    {0, CS16_SW7,  CS17_SW7,  CS18_SW7},  //  64, LED73
-    {0,  CS1_SW8,   CS2_SW8,   CS3_SW8},  //  65, LED74
-    {0, CS16_SW5,  CS17_SW5,  CS18_SW5},  //  66, RAlt
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  67, FN
-
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  68, Left
-    {0, CS16_SW11, CS17_SW11, CS18_SW11}, //  69, Down
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  70, Right
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   0, Esc
+
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  0, Esc
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  1, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  2, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  3, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  4, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  5, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  6, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  7, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  8, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  9, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  10, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  11, -
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  12, =
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  13, Backspace
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  14, Del
+
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  15, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  16, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  17, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  18, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  19, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  20, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  21, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  22, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  23, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  24, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  25, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  26, [
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  27, ]
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  28, "\\"
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //  29, PGUP
+
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  30, CapsLock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  31, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  32, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  33, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  34, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  35, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  36, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  37, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  38, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  39, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  40, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  41, '
+    {0, SW12_CS13, SW12_CS14, SW12_CS15}, //  42, Enter
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  43, PGDN
+
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  44, LShift
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  45, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  46, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  47, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  48, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  49, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  50, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  51, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  52, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  53, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  54, /
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18},  //  55, RShift
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  56, Up
+    {0,  SW6_CS1,   SW6_CS2,   SW6_CS3},  //  57, END
+
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  58, LCtrl
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  59, LWin
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  60, LAlt
+    {0,  SW2_CS1,   SW2_CS2,   SW2_CS3},  //  61, LED71
+    {0,  SW3_CS1,   SW3_CS2,   SW3_CS3},  //  62, LED72
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18},  //  63, Space
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18},  //  64, LED73
+    {0,  SW8_CS1,   SW8_CS2,   SW8_CS3},  //  65, LED74
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18},  //  66, RAlt
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  67, FN
+
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  68, Left
+    {0, SW11_CS16, SW11_CS17, SW11_CS18}, //  69, Down
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  70, Right
 
 };
 
diff --git a/keyboards/projectd/75/ansi/ansi.c b/keyboards/projectd/75/ansi/ansi.c
index 1df76250022..f32bf369a90 100644
--- a/keyboards/projectd/75/ansi/ansi.c
+++ b/keyboards/projectd/75/ansi/ansi.c
@@ -18,108 +18,108 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |     R location
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, k00, Esc
-
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  F1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //  F2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //  F3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  F4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //  F5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  F6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  F7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  F8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  F9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  F10
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  F11
-    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  F12
-    {1, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  Printscreen
-    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  Delete
-
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  `
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  Backspace
-    {1, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  Home
-
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  ]
-    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  "\\"
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  PGUP
-
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  '
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  Enter
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  PGDN
-
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  L Shift
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  "/""
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  R Shift
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  Up
-    {1, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  END
-
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  L Ctrl
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  L Win
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  L Alt
-    {0, CS16_SW4,  CS17_SW4,  CS18_SW4},  //  LED1
-    {0, CS16_SW5,  CS17_SW5,  CS18_SW5},  //  LED2
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  Space
-    {0, CS16_SW7,  CS17_SW7,  CS18_SW7},  //  LED3
-    {0, CS16_SW8,  CS17_SW8,  CS18_SW8},  //  LED4
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  R Alt
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  FN
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  R Ctrl
-
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  Right
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   0, k00, Esc
+
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //  F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //  F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //  F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  F12
+    {1, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  Printscreen
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  Delete
+
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  Backspace
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  Home
+
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  "\\"
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  PGUP
+
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  Enter
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  PGDN
+
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  L Shift
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  "/""
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  R Shift
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  Up
+    {1, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  END
+
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  L Ctrl
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  L Win
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  L Alt
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18},  //  LED1
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18},  //  LED2
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  Space
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18},  //  LED3
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18},  //  LED4
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  R Alt
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  R Ctrl
+
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  Right
 };
 
 #endif
diff --git a/keyboards/projectd/75/ansi/config.h b/keyboards/projectd/75/ansi/config.h
index 3b685c09b82..a42dd6c1eee 100644
--- a/keyboards/projectd/75/ansi/config.h
+++ b/keyboards/projectd/75/ansi/config.h
@@ -21,8 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
 
@@ -32,11 +30,6 @@
 #define SPI_MOSI_PIN A7
 #define SPI_MISO_PIN A6
 
-#define DRIVER_1_CS A15
-#define DRIVER_2_CS B15
-#define DRIVER_1_EN C13
-#define DRIVER_2_EN C13
-
-#define DRIVER_1_LED_TOTAL 70
-#define DRIVER_2_LED_TOTAL 17
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define AW20216S_CS_PIN_1 A15
+#define AW20216S_CS_PIN_2 B15
+#define AW20216S_EN_PIN C13
diff --git a/keyboards/projectd/75/ansi/info.json b/keyboards/projectd/75/ansi/info.json
index 0e137de614b..2e57c353282 100644
--- a/keyboards/projectd/75/ansi/info.json
+++ b/keyboards/projectd/75/ansi/info.json
@@ -81,7 +81,7 @@
             "solid_multisplash": true
         },
         "center_point": [78, 20],
-        "driver": "aw20216",
+        "driver": "aw20216s",
         "layout": [
             { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
             { "flags": 4, "matrix": [2, 6], "x": 12.5, "y": 0 },
@@ -175,7 +175,8 @@
             { "flags": 4, "matrix": [0, 3], "x": 132.5, "y": 52.5 },
             { "flags": 4, "matrix": [7, 3], "x": 142.5, "y": 52.5 },
             { "flags": 4, "matrix": [0, 5], "x": 152.5, "y": 52.5 }
-        ]
+        ],
+        "sleep": true
     },
     "url": "",
     "usb": {
diff --git a/keyboards/projectkb/alice/keymaps/devinceble/keymap.c b/keyboards/projectkb/alice/keymaps/devinceble/keymap.c
deleted file mode 100644
index 6c153b4998d..00000000000
--- a/keyboards/projectkb/alice/keymaps/devinceble/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 Devinceble AKA Vimwarrior
- *
- * 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_default(
-        KC_INS, 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_BSLS, KC_GRV,
-        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_BSPC,
-        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_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, MO(1),
-        KC_LALT, KC_LGUI, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL
-    ),
-	[1] = LAYOUT_default(
-        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_DEL,
-        KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, 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_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [2] = LAYOUT_default(
-        RGB_TOG, 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_DEL,
-        RGB_MOD, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        RGB_RMOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_UP,  BL_DOWN,BL_TOGG, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
-    ),
-};
diff --git a/keyboards/projectkb/alice/keymaps/devinceble/readme.md b/keyboards/projectkb/alice/keymaps/devinceble/readme.md
deleted file mode 100644
index dfb0392e3d5..00000000000
--- a/keyboards/projectkb/alice/keymaps/devinceble/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Devinceble AKA Vimwarrior ProjectKeyboard Alice
-
-Build Hex File:
-
-    make projectkb/alice:devinceble
-
-Flash Keyboard
-
-    make projectkb/alice:devinceble:flash
diff --git a/keyboards/projectkb/alice/keymaps/devinceble/rules.mk b/keyboards/projectkb/alice/keymaps/devinceble/rules.mk
deleted file mode 100644
index 522abf46b15..00000000000
--- a/keyboards/projectkb/alice/keymaps/devinceble/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE    = yes
diff --git a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
deleted file mode 100644
index 10fbbd1547c..00000000000
--- a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright 2019 Khader Syed
-
-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 my_layers {
-    _QWERTY,
-    _NAVMED,
-    _FNMS
-};
-
-#define FNMS MO(_FNMS)
-#define NAVMED MO(_NAVMED)
-#define CAP_CTL CTL_T(KC_CAPS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_default(
-    QK_GESC, 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_BSLS, KC_DEL,
-    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_BSPC,
-    KC_PGDN, CAP_CTL, 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, FNMS,
-             KC_LCTL,              KC_LALT,    KC_LCMD, NAVMED,       KC_SPC,        KC_RALT,                              KC_RCTL
-  ),
-
-  [_NAVMED] = LAYOUT_default(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_HOME, _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-    KC_END,  _______, _______, _______, _______, _______, KC_MPLY,        KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,         EE_CLR,
-             _______, _______, _______, _______, _______, KC_VOLD,        KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
-             _______,                   _______,  _______, _______,        _______,          _______,                        _______
-  ),
-
-  [_FNMS] = LAYOUT_default(
-    RGB_TOG, _______, 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_MOD, _______, _______, _______, _______, _______, _______,        _______, _______, KC_MS_U, _______, _______, _______, _______, QK_BOOT,
-    VK_TOGG, _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______,         _______,
-             _______, BL_UP,    BL_DOWN,BL_TOGG, BL_BRTG, _______,        RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______,
-             AG_TOGG,                   _______,  _______, _______,        _______,          _______,                        _______
-  )
-};
-
-static uint8_t top = 0;
-static uint8_t middle = 0;
-static uint8_t bottom = 1;
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    top = middle = bottom = 0;
-    switch (get_highest_layer(state)) {
-      case _NAVMED:
-          top = 1;
-          break;
-      case _FNMS:
-          middle = 1;
-          break;
-      default:
-        break;
-    }
-  return state;
-}
-
-bool led_update_user(led_t usb_led) {
-    writePin(A0, !top);
-    writePin(A1, !middle);
-    writePin(A2, !bottom);
-    return false;
-}
diff --git a/keyboards/projectkb/alice/keymaps/madhatter/readme.md b/keyboards/projectkb/alice/keymaps/madhatter/readme.md
deleted file mode 100644
index 03c20e2fb05..00000000000
--- a/keyboards/projectkb/alice/keymaps/madhatter/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# The madhatter keymap
-
-- A layer for all functions and mouse keys
-- A layer for arrows and media
-- Arrows on IJKL
-- Caps and control on caps lock - wonderful
-- Velocikey on the map
-- Things to reduce my finger travel just about everywhere
diff --git a/keyboards/projectkb/alice/keymaps/madhatter/rules.mk b/keyboards/projectkb/alice/keymaps/madhatter/rules.mk
deleted file mode 100644
index 99cbe88b707..00000000000
--- a/keyboards/projectkb/alice/keymaps/madhatter/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VELOCIKEY_ENABLE = yes
-CONSOLE_ENABLE = no
diff --git a/keyboards/proteus67/config.h b/keyboards/proteus67/config.h
new file mode 100644
index 00000000000..66faa7a2981
--- /dev/null
+++ b/keyboards/proteus67/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define RGBLIGHT_MAX_LAYERS 3
+#define ENCODER_MAP_KEY_DELAY 10
+#define ENCODER_DEFAULT_POS 0x3
diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/info.json
new file mode 100644
index 00000000000..0ab7117ef27
--- /dev/null
+++ b/keyboards/proteus67/info.json
@@ -0,0 +1,129 @@
+{
+    "manufacturer": "gzowski",
+    "keyboard_name": "Proteus67",
+    "maintainer": "gzowski",
+    "development_board": "elite_pi",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP21", "pin_b": "GP9"}
+        ]
+    },
+    "features": {
+        "encoder": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP23", "GP20", "GP22", "GP26", "GP27", "GP28", "GP29"],
+        "rows": ["GP12", "GP13", "GP14", "GP15", "GP16"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": false,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "brightness_steps": 5,
+        "led_count": 21,
+        "saturation_steps": 5,
+        "sleep": true,
+        "layers": {
+            "enabled": true,
+            "override_rgb": false
+        }
+    },
+    "url": "https://github.com/gzowski",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x6F64",
+        "vid": "0x7072"
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x14": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/proteus67/keymaps/colemak/keymap.c b/keyboards/proteus67/keymaps/colemak/keymap.c
new file mode 100644
index 00000000000..df572f0bc01
--- /dev/null
+++ b/keyboards/proteus67/keymaps/colemak/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2023 James Gzowski
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layer {
+    _LAYERA,
+    _LAYERB,
+    _LAYERC,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_LAYERA] = LAYOUT_ortho_5x14(
+        KC_ESC , KC_1  ,KC_2   ,KC_3   , KC_4  , KC_5  , KC_PSCR  , 			KC_EQL  , KC_6   , KC_7    , KC_8    , KC_9   , KC_0   , KC_GRV ,
+        KC_TAB , KC_Q  ,KC_W   ,KC_F   , KC_P  , KC_G  , KC_END  , 			KC_HOME  , KC_J   , KC_L    , KC_U    , KC_Y   , KC_SCLN ,KC_MINUS,
+        KC_LCTL, KC_A  ,KC_R   ,KC_S   , KC_T  , KC_D  , KC_PGDN  , 			KC_PGUP  , 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_LBRC, 			KC_RBRC, KC_K   , KC_M    , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT,
+             KC_NO  , MO(_LAYERB) ,KC_LGUI,KC_LALT,       KC_SPC ,		KC_MUTE,            KC_ENT ,		KC_BSPC , MO(_LAYERC) , KC_INS , KC_DEL
+),
+    [_LAYERB] = LAYOUT_ortho_5x14(
+        RGB_TOG , RGB_HUD  ,RGB_HUI   ,RGB_SAD   , RGB_SAI  , RGB_VAD  , RGB_VAI  ,                       RGB_M_P  , RGB_M_B   , RGB_M_R    , RGB_M_SW    , RGB_M_K   , RGB_M_TW   , RGB_M_G ,
+        KC_TRNS , KC_TRNS, KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_BTN1    , KC_MS_U    , KC_BTN2   , KC_TRNS   ,KC_TRNS,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_MS_L    , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT ,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS ,               KC_TRNS  , KC_TRNS , KC_TRNS    , KC_TRNS , KC_TRNS , KC_NUBS, KC_TRNS,
+             KC_TRNS  , KC_TRNS ,KC_TRNS,KC_TRNS,  KC_TRNS ,                       RGB_RMOD,      KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS
+),
+    [_LAYERC] = LAYOUT_ortho_5x14(
+        KC_TRNS , KC_F1  ,KC_F2   ,KC_F3   , KC_F4  , KC_F5  , KC_TRNS  ,                       KC_TRNS  , KC_F6   , KC_F7    , KC_F8    , KC_F9   , KC_F10   , KC_GRV ,
+        KC_TRNS , KC_TRNS, KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_TRNS    , KC_TRNS, KC_TRNS   , KC_TRNS   ,KC_TRNS,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_LEFT    , KC_DOWN , KC_UP , KC_RIGHT,KC_QUOT ,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS ,               KC_TRNS  , KC_TRNS , KC_TRNS    , KC_TRNS , KC_TRNS , KC_NUBS, KC_TRNS,
+             KC_TRNS  , KC_TRNS ,KC_TRNS,KC_TRNS,  KC_TRNS ,                       RGB_MOD,      KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS
+)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_LAYERA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_LAYERB] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)},
+    [_LAYERC] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif
+
diff --git a/keyboards/proteus67/keymaps/colemak/rules.mk b/keyboards/proteus67/keymaps/colemak/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/proteus67/keymaps/colemak/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c
new file mode 100644
index 00000000000..bef2a5d1c5b
--- /dev/null
+++ b/keyboards/proteus67/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2023 James Gzowski
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layer {
+    _LAYERA,
+    _LAYERB,
+    _LAYERC,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_LAYERA] = LAYOUT_ortho_5x14(
+        KC_ESC , KC_1  ,KC_2   ,KC_3   , KC_4  , KC_5  , KC_MINUS  , 			KC_EQL  , 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_END  , 			KC_HOME  , KC_Y   , KC_U    , KC_I    , KC_O   , KC_P   ,KC_MINUS,
+        KC_LCTL, KC_A  ,KC_S   ,KC_D   , KC_F  , KC_G  , KC_PGDN  , 			KC_PGUP  , 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_NO  , MO(_LAYERB) ,KC_LGUI,KC_LALT,       KC_SPC ,		KC_MUTE,            KC_ENT ,		KC_BSPC , MO(_LAYERC) , KC_INS , KC_DEL
+),
+    [_LAYERB] = LAYOUT_ortho_5x14(
+        RGB_TOG , RGB_HUI  ,RGB_HUD   ,RGB_SAI   , RGB_SAD  , RGB_VAI  , RGB_VAD  ,                       RGB_M_P  , RGB_M_B   , RGB_M_R    , RGB_M_SW    , RGB_M_K   , RGB_M_X   , RGB_M_G ,
+        KC_TRNS , KC_TRNS, KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_BTN1    , KC_MS_U    , KC_BTN2   , KC_TRNS   ,KC_TRNS,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_MS_L    , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT ,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS ,               KC_TRNS  , KC_TRNS , KC_TRNS    , KC_TRNS , KC_TRNS , KC_NUBS, KC_TRNS,
+             KC_TRNS  , KC_TRNS ,KC_TRNS,KC_TRNS,  KC_TRNS ,                       RGB_RMOD,      KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS
+),
+    [_LAYERC] = LAYOUT_ortho_5x14(
+        KC_TRNS , KC_F1  ,KC_F2   ,KC_F3   , KC_F4  , KC_F5  , KC_TRNS  ,                       KC_TRNS  , KC_F6   , KC_F7    , KC_F8    , KC_F9   , KC_F10   , KC_GRV ,
+        KC_TRNS , KC_TRNS, KC_TRNS   ,KC_TRNS   , KC_TRNS  , 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  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_LEFT    , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT ,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS ,               KC_TRNS  , KC_TRNS , KC_TRNS    , KC_TRNS , KC_TRNS , KC_NUBS, KC_TRNS,
+             KC_TRNS  , KC_TRNS ,KC_TRNS,KC_TRNS,  KC_TRNS ,                       RGB_MOD,      KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS
+)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_LAYERA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_LAYERB] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)},
+    [_LAYERC] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif
diff --git a/keyboards/proteus67/keymaps/default/rules.mk b/keyboards/proteus67/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/proteus67/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c79ac61e9e6
--- /dev/null
+++ b/keyboards/proteus67/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2023 James Gzowski
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layer {
+    _LAYERA,
+    _LAYERB,
+    _LAYERC,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_LAYERA] = LAYOUT_ortho_5x14(
+        KC_ESC , KC_1  ,KC_2   ,KC_3   , KC_4  , KC_5  , KC_MINUS  , 			KC_EQL  , 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_END  , 			KC_HOME  , KC_Y   , KC_U    , KC_I    , KC_O   , KC_P   ,KC_MINUS,
+        KC_LCTL, KC_A  ,KC_S   ,KC_D   , KC_F  , KC_G  , KC_PGDN  , 			KC_PGUP  , 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_NO  , MO(_LAYERB) ,KC_LGUI,KC_LALT,       KC_SPC ,		KC_MUTE,            KC_ENT ,		KC_BSPC , MO(_LAYERC) , KC_INS , KC_DEL
+),
+    [_LAYERB] = LAYOUT_ortho_5x14(
+        RGB_TOG , RGB_HUD  ,RGB_HUI   ,RGB_SAD   , RGB_SAI  , RGB_VAD  , RGB_VAI  ,                       RGB_M_P  , RGB_M_B   , RGB_M_R    , RGB_M_SW    , RGB_M_K   , RGB_M_TW   , RGB_M_G ,
+        KC_TRNS , KC_TRNS, KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_BTN1    , KC_MS_U    , KC_BTN2   , KC_TRNS   ,KC_TRNS,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_MS_L    , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT ,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS ,               KC_TRNS  , KC_TRNS , KC_TRNS    , KC_TRNS , KC_TRNS , KC_NUBS, KC_TRNS,
+             KC_TRNS  , KC_TRNS ,KC_TRNS,KC_TRNS,  KC_TRNS ,                       RGB_RMOD,      KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS
+),
+    [_LAYERC] = LAYOUT_ortho_5x14(
+        KC_TRNS , KC_F1  ,KC_F2   ,KC_F3   , KC_F4  , KC_F5  , KC_TRNS  ,                       KC_TRNS  , KC_F6   , KC_F7    , KC_F8    , KC_F9   , KC_F10   , KC_GRV ,
+        KC_TRNS , KC_TRNS, KC_TRNS   ,KC_TRNS   , KC_TRNS  , 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  , KC_TRNS  , KC_TRNS  ,              KC_TRNS  , KC_TRNS , KC_LEFT    , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT ,
+        KC_TRNS, KC_TRNS  ,KC_TRNS   ,KC_TRNS   , KC_TRNS  , KC_TRNS  , KC_TRNS ,               KC_TRNS  , KC_TRNS , KC_TRNS    , KC_TRNS , KC_TRNS , KC_NUBS, KC_TRNS,
+             KC_TRNS  , KC_TRNS ,KC_TRNS,KC_TRNS,  KC_TRNS ,                       RGB_MOD,      KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS
+)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_LAYERA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_LAYERB] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)},
+    [_LAYERC] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif
diff --git a/keyboards/proteus67/keymaps/via/rules.mk b/keyboards/proteus67/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/proteus67/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/proteus67/proteus67.c b/keyboards/proteus67/proteus67.c
new file mode 100644
index 00000000000..4073ac87d3e
--- /dev/null
+++ b/keyboards/proteus67/proteus67.c
@@ -0,0 +1,42 @@
+// Copyright 2023 James Gzowski
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layer {
+    _LAYERA,
+    _LAYERB,
+    _LAYERC,
+};
+
+// MO(_LAYERB)
+const rgblight_segment_t PROGMEM backlight_layer_layerb[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 4, HSV_GOLD}
+);
+// MO(_LAYERC)
+const rgblight_segment_t PROGMEM backlight_layer_layerc[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 4, HSV_CYAN}
+);
+const rgblight_segment_t PROGMEM backlight_layer_layera[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 4, HSV_BLACK}
+);
+const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_LIST(
+    backlight_layer_layerb,
+    backlight_layer_layerc,
+    backlight_layer_layera
+);
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _LAYERB));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LAYERC));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _LAYERA));
+
+    return layer_state_set_user(state);
+}
+
+void keyboard_post_init_kb(void) {
+    rgblight_set_effect_range(4, 17);
+    rgblight_sethsv_range(HSV_BLACK, 0, 4);
+    rgblight_layers = set_backlight_mode;
+
+    keyboard_post_init_user();
+}
diff --git a/keyboards/proteus67/readme.md b/keyboards/proteus67/readme.md
new file mode 100644
index 00000000000..b1422b80421
--- /dev/null
+++ b/keyboards/proteus67/readme.md
@@ -0,0 +1,25 @@
+# proteus67
+
+![proteus67](https://i.imgur.com/mYhl7Jah.png)
+
+67 key ortholinear layout with rotary encoder.
+
+* Keyboard Maintainer: [James Gzowski](https://github.com/gzowski)
+* Hardware Supported: Elite-Pi or equivilent RP2040 controller with additional I/O along bottom.
+* Build Guide: [Proteus67](https://github.com/gzowski/Proteus67)
+
+Make example for this keyboard (after setting up your build environment):
+	
+    make proteus67:default
+
+Flashing example for this keyboard:
+
+    make proteus67: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
+
+* **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, if using a RP2040 press repeatidly to enter boot mode.
+* **Hold down boot loader button on MCU** Hold down the boot loader button on the MCU while plugging in the keyboard
diff --git a/keyboards/proteus67/rules.mk b/keyboards/proteus67/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/proteus67/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/prototypist/oceanographer/config.h b/keyboards/prototypist/oceanographer/config.h
index e5719bb1377..ed9c00df908 100644
--- a/keyboards/prototypist/oceanographer/config.h
+++ b/keyboards/prototypist/oceanographer/config.h
@@ -3,12 +3,6 @@
 
 #pragma once
 
-// RGB Light settings
-#define RGBLIGHT_LAYERS
-
-#define RGBLIGHT_MAX_LAYERS 4
-#define RGBLIGHT_DEFAULT_VAL 155
-
 // Audio Settings
 #ifdef AUDIO_ENABLE
 
diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/info.json
index 488f17eeb99..d7117d6abc3 100644
--- a/keyboards/prototypist/oceanographer/info.json
+++ b/keyboards/prototypist/oceanographer/info.json
@@ -30,6 +30,13 @@
         "animations": {
             "alternating": true,
             "breathing": true
+        },
+        "default": {
+            "val": 155
+        },
+        "layers": {
+            "enabled": true,
+            "max": 4
         }
     },
     "matrix_pins": {
diff --git a/keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c b/keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c
deleted file mode 100644
index 96499b8789c..00000000000
--- a/keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2021-22 Will McGLoughlin (wymcg)
-// 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,
-    _NAV,
-    _PROD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    KC_MUTE,    KC_MPRV,    KC_MPLY,    KC_MNXT,
-    TO(_NAV),   G(KC_1),    G(KC_2),    G(KC_3),
-    TO(_PROD),  G(KC_4),    G(KC_5),    G(KC_6)
-  ),
-  [_NAV] = LAYOUT(
-    TO(_BASE),  KC_HOME,    KC_UP,      KC_END,
-    A(KC_TAB),  KC_LEFT,    KC_DOWN,    KC_RIGHT,
-    G(KC_TAB),  KC_PGDN,    KC_PGUP,    MO(_BASE)
-  ),
-  [_PROD] = LAYOUT(
-    TO(_BASE),  KC_NO,      KC_NO,      KC_NO,
-    C(KC_Z),    C(KC_X),    C(KC_C),    C(KC_V),
-    C(KC_A),    C(KC_LEFT), C(KC_RIGHT),MO(_BASE)
-  )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    switch (biton32(layer_state)) {
-        case _BASE:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-            break;
-        case _NAV:
-            if (clockwise) {
-                tap_code16(C(G(KC_RIGHT)));
-            } else {
-                tap_code16(C(G(KC_LEFT)));
-            }
-            break;
-        case _PROD:
-            if (clockwise) {
-                tap_code16(C(KC_Y));
-            } else {
-                tap_code16(C(KC_Z));
-            }
-            break;
-    }
-    return false;
-}
diff --git a/keyboards/psuieee/pluto12/keymaps/wymcg/readme.md b/keyboards/psuieee/pluto12/keymaps/wymcg/readme.md
deleted file mode 100644
index 60d2f19be3c..00000000000
--- a/keyboards/psuieee/pluto12/keymaps/wymcg/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# wymcg's custom keymap
diff --git a/keyboards/punk75/keymaps/dsanchezseco/config.h b/keyboards/punk75/keymaps/dsanchezseco/config.h
deleted file mode 100644
index 3c0a98d4cc0..00000000000
--- a/keyboards/punk75/keymaps/dsanchezseco/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 dsanchezseco
- *
- * 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
-
-// place overrides here
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/punk75/keymaps/dsanchezseco/keymap.c b/keyboards/punk75/keymaps/dsanchezseco/keymap.c
deleted file mode 100644
index 3d8f41b4b41..00000000000
--- a/keyboards/punk75/keymaps/dsanchezseco/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright 2020 dsanchezseco
- *
- * 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 ESC_CTL LCTL_T(KC_ESC)
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _DVORAK,
-    _DVORAK_NUM,
-    _QWERTY,
-    _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_DVORAK] = LAYOUT_ortho_5x15( /* DVORAK */
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_GRV,   KC_BSLS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_LBRC,  KC_PSCR, KC_RBRC, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-        ESC_CTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_HOME,  KC_MNXT, KC_PGUP, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_END,   KC_MPLY, KC_PGDN, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_SENT,
-        KC_LCTL, KC_LGUI, KC_LALT, _______, MO(_FN), KC_SPC,  KC_SPC,   KC_MPRV, KC_BSPC, KC_BSPC, MO(_FN), _______, KC_RALT, KC_RGUI, KC_RCTL
-    ),
-    [_DVORAK_NUM] = LAYOUT_ortho_5x15( /* DVORAK with center NUMPAD*/
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_GRV,   KC_BSLS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_P7,    KC_P8,   KC_P9, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-        ESC_CTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_P4,    KC_P5,   KC_P6, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_P1,    KC_P2,   KC_P3, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_SENT,
-        KC_LCTL, KC_LGUI, KC_LALT, _______, MO(_FN), KC_SPC,  KC_SPC,   KC_P0,   KC_BSPC, KC_BSPC, MO(_FN), _______, KC_RALT, KC_RGUI, KC_RCTL
-    ),
-
-    [_QWERTY] = LAYOUT_ortho_5x15( /* QWERTY */
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_GRV,   KC_BSLS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,  KC_PSCR, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_SLSH,
-        ESC_CTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,  KC_MNXT, KC_PGUP, 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_END,   KC_MPLY, KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_MINS, SC_SENT,
-        KC_LCTL, KC_LGUI, KC_LALT, _______, MO(_FN), KC_SPC,  KC_SPC,   KC_MPRV, KC_BSPC, KC_BSPC, MO(_FN), _______, KC_RALT, KC_RGUI, KC_RCTL
-    ),
-
-    [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   DF(_QWERTY), DF(_DVORAK_NUM), DF(_DVORAK), KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RIGHT, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, _______, _______, _______,
-        _______, _______, _______, KC_DOWN, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, MO(_FN), _______, _______, KC_NUM,  KC_DEL,  KC_DEL,  MO(_FN), _______, _______, _______, _______
-    )
-
-};
-
-bool led_update_user(led_t led_state) {
-    // disable keyboard level handling
-    return false;
-}
-
-void led_keypress_update(pin_t led_pin, uint16_t keycode, keyrecord_t *record) {
-    // When a key is pressed turn on the LED, when released turn it off
-    writePin(led_pin, record->event.pressed);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Update LED state
-    led_keypress_update(LED, keycode, record);
-    return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* Encoder on the LEFT */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) { /* Encoder on the RIGHT */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/punk75/keymaps/dsanchezseco/readme.md b/keyboards/punk75/keymaps/dsanchezseco/readme.md
deleted file mode 100644
index cb3c40fa082..00000000000
--- a/keyboards/punk75/keymaps/dsanchezseco/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# dsanchezseco keymap for punk75
diff --git a/keyboards/pw88/config.h b/keyboards/pw88/config.h
deleted file mode 100644
index f655b925272..00000000000
--- a/keyboards/pw88/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2023 Matthijs Muller
-
-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 WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/keyboards/q4z/keymaps/default/rules.mk b/keyboards/q4z/keymaps/default/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/q4z/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/q4z/keymaps/rjboone/config.h b/keyboards/q4z/keymaps/rjboone/config.h
deleted file mode 100644
index 9264f33bae9..00000000000
--- a/keyboards/q4z/keymaps/rjboone/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 rjboone
- *
- * 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
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 300
-
-#define COMBO_TERM 50
diff --git a/keyboards/q4z/keymaps/rjboone/keymap.c b/keyboards/q4z/keymaps/rjboone/keymap.c
deleted file mode 100644
index c54ec014ec9..00000000000
--- a/keyboards/q4z/keymaps/rjboone/keymap.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2021 rjboone
- *
- * 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{
-  _BASE,
-  _NUM_SYM,
-  _NAV,
-  _GAME
-};
-
-enum combo_events {
-  COMBO_BSPC,
-  COMBO_NUMBAK,
-  COMBO_TAB,
-  COMBO_ESC,
-  COMBO_DEL,
-};
-
-#define KC_GA LGUI_T(KC_A)
-#define KC_AS LALT_T(KC_S)
-#define KC_CD LCTL_T(KC_D)
-#define KC_SF LSFT_T(KC_F)
-#define KC_SJ RSFT_T(KC_J)
-#define KC_CK RCTL_T(KC_K)
-#define KC_AL RALT_T(KC_L)
-#define KC_GSCLN RGUI_T(KC_SCLN)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-   KC_1, KC_2, KC_3, KC_4, KC_5,
-   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
-   KC_A, KC_S, KC_D, KC_SF, KC_G, KC_H, KC_SJ, KC_K, KC_L, KC_SCLN,
-   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
-   KC_LCTL, KC_LALT, KC_LGUI, LT(_NUM_SYM, KC_ENT), KC_SPC, MO(_NAV), TG(_GAME), KC_SLSH
-  ),
-
-  [_NUM_SYM] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_LBRC, KC_RBRC, KC_EQL, KC_TRNS, KC_TRNS, KC_QUOT,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_TRNS, KC_TRNS, KC_BSLS
-  ),
-
-  [_NAV] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    QK_BOOT, KC_TRNS, 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, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  [_GAME] = LAYOUT(
-    KC_1, KC_2, KC_3, KC_4, KC_5,
-    KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_NO,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_ENT, KC_NO, TG(_GAME), KC_NO
-  ),
-};
-
-#ifdef COMBO_ENABLE
-const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
-const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
-const uint16_t PROGMEM combo_tab[] = {KC_A, KC_S, COMBO_END};
-const uint16_t PROGMEM combo_esc[] = {KC_Q, KC_W, COMBO_END};
-const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
-
-combo_t key_combos[] = {
-  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
-  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
-  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
-  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
-  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
-
-};
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-#ifdef COMBO_ENABLE
-    switch(get_highest_layer(state)) {
-    case _GAME:
-      combo_disable();
-      break;
-    default:
-      combo_enable();
-      break;
-    }
-#endif // COMBO_ENABLE
-
-    return state;
-}
diff --git a/keyboards/q4z/keymaps/rjboone/readme.md b/keyboards/q4z/keymaps/rjboone/readme.md
deleted file mode 100644
index 29f2d31f6ff..00000000000
--- a/keyboards/q4z/keymaps/rjboone/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Default Le Chiffre Keymap
diff --git a/keyboards/q4z/keymaps/rjboone/rules.mk b/keyboards/q4z/keymaps/rjboone/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/q4z/keymaps/rjboone/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/q4z/readme.md b/keyboards/q4z/readme.md
deleted file mode 100644
index 6b3839a2cb9..00000000000
--- a/keyboards/q4z/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Q4Z
-
-![Q4Z](https://cdn.shopify.com/s/files/1/0501/7537/7592/products/q4n-6_470x.jpg?v=1623373518)
-
-Q4Z is a play on everybody's favorite 10.25u layout. With the addition of 5 number keys and a handle,
-this little board is ready for whatever a raging gamer can throw it at.
-
-* Keyboard Maintainer: [Ryan Boone](https://github.com/rjboone) (Drmmr#0004)
-* Hardware Supported: Pro Micro or equivalent
-* Hardware Availability: This board is available to purchase from [P3D Store](https://p3dstore.com)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make q4z:default
-
-Flashing example for this keyboard:
-
-    make q4z: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/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index 02bd670f713..9f86bdabd72 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -17,5 +17,3 @@
 #pragma once
 
 #define LOCKING_SUPPORT_ENABLE
-
-#define RGBLIGHT_DEFAULT_HUE 130
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index 45cdb5870ac..3fe0f71497c 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -20,7 +20,10 @@
     ]
   },
   "rgblight": {
-    "led_count": 4
+    "led_count": 4,
+    "default": {
+      "hue": 130
+    }
   },
   "ws2812": {
     "pin": "F0"
diff --git a/keyboards/quadrum/delta/info.json b/keyboards/quadrum/delta/info.json
index 118a2dcbd6b..bfdc0afd628 100644
--- a/keyboards/quadrum/delta/info.json
+++ b/keyboards/quadrum/delta/info.json
@@ -4,6 +4,9 @@
     "maintainer": "Sleepdealr",
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
+    "build": {
+        "lto": true
+    },
     "features": {
         "bootmagic": true,
         "command": false,
@@ -11,7 +14,6 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "lto": true,
         "encoder": true
     },
     "matrix_pins": {
diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h
index 84b3e5c03e5..d531fe5c4cf 100644
--- a/keyboards/quarkeys/z40/config.h
+++ b/keyboards/quarkeys/z40/config.h
@@ -14,35 +14,6 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 47
-#define RGB_MATRIX_KEYPRESSES                       // Reacts to Keypresses
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED              // Turn off effects when suspended
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130           // Limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-
-// RGB_MATRIX effects
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS 	            //Enables RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_BREATHING 	            //Enables RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN 	        //Enables RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON 	//Enables RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN 	            //Enables RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL 	    //Enables RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL 	        //Enables RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL 	            //Enables RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON 	            //Enables RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON 	        //Enables RGB_MATRIX_RAINBOW_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS 	    //Enables RGB_MATRIX_RAINBOW_PINWHEELS
-
-// RGB_MATRIX reactive effects
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-#endif
-
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define RGBLIGHT_LAYERS
diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json
index a045a9831a4..6e7d213614d 100644
--- a/keyboards/quarkeys/z40/info.json
+++ b/keyboards/quarkeys/z40/info.json
@@ -9,10 +9,31 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "breathing": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "solid_reactive": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "multisplash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "sat_steps": 8,
         "val_steps": 8,
-        "speed_steps": 10
+        "speed_steps": 10,
+        "max_brightness": 130,
+        "sleep": true
     },
     "rgblight": {
         "saturation_steps": 8,
diff --git a/keyboards/quarkeys/z40/z40.c b/keyboards/quarkeys/z40/z40.c
index 18ebec736b7..edd8946c119 100644
--- a/keyboards/quarkeys/z40/z40.c
+++ b/keyboards/quarkeys/z40/z40.c
@@ -26,7 +26,7 @@ led_config_t g_led_config = { {
         { 46,     45,     44,     43,     42,     41,     40,     39,     38,     37,     36,     35      },
         { 34,     33,     32,     31,     30,     29,     28,     27,     26,     25,     24,     23      },
         { 22,     21,     20,     29,     18,     17,     16,     15,     14,     13,     12,     11      },
-        { 10,      9,      8,      7,      6,          5,          4,      3,      2,      1,      0      }
+        { 10,      9,      8,      7,      6,      5, NO_LED,      4,      3,      2,      1,      0      }
   }, 
   {  // Index to Physical Position
       {225, 64}, {200, 64}, {180, 64}, {160, 64}, {140, 64},            {110, 64}, { 80, 64}, { 60, 64}, { 40, 64}, { 20, 64}, {  0, 64},
diff --git a/keyboards/quokka/config.h b/keyboards/quokka/config.h
index 6cacf0d5459..ae94f33a6fe 100644
--- a/keyboards/quokka/config.h
+++ b/keyboards/quokka/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 150U
 
 #define WS2812_PIO_USE_PIO1
-#define RGB_MATRIX_LED_COUNT 36
 
 #define I2C_DRIVER I2CD1
 #define I2C1_SDA_PIN GP2
diff --git a/keyboards/quokka/info.json b/keyboards/quokka/info.json
index 86037222bbe..0c34b0ee65f 100644
--- a/keyboards/quokka/info.json
+++ b/keyboards/quokka/info.json
@@ -10,7 +10,6 @@
     "features": {
         "audio": true,
         "extrakey": true,
-        "lto": true,
         "oled": true,
         "rgb_matrix": true
     },
@@ -23,42 +22,42 @@
         "center_point": [133, 54],
         "driver": "ws2812",
         "layout": [
-            { "flags": 4, "matrix": [3, 4], "x": 122, "y": 85 },
-            { "flags": 4, "matrix": [3, 3], "x": 102, "y": 85 },
-            { "flags": 4, "matrix": [3, 2], "x": 81, "y": 85 },
-            { "flags": 4, "matrix": [2, 4], "x": 102, "y": 64 },
-            { "flags": 4, "matrix": [1, 4], "x": 102, "y": 43 },
-            { "flags": 4, "matrix": [0, 4], "x": 102, "y": 21 },
-            { "flags": 4, "matrix": [0, 3], "x": 81, "y": 21 },
-            { "flags": 4, "matrix": [1, 3], "x": 81, "y": 43 },
-            { "flags": 4, "matrix": [2, 3], "x": 81, "y": 64 },
-            { "flags": 4, "matrix": [2, 2], "x": 61, "y": 64 },
-            { "flags": 4, "matrix": [1, 2], "x": 61, "y": 43 },
-            { "flags": 4, "matrix": [0, 2], "x": 61, "y": 21 },
-            { "flags": 4, "matrix": [0, 1], "x": 41, "y": 21 },
-            { "flags": 4, "matrix": [1, 1], "x": 41, "y": 43 },
-            { "flags": 4, "matrix": [2, 1], "x": 41, "y": 64 },
-            { "flags": 4, "matrix": [2, 0], "x": 20, "y": 64 },
-            { "flags": 4, "matrix": [1, 0], "x": 20, "y": 43 },
-            { "flags": 4, "matrix": [0, 0], "x": 20, "y": 21 },
-            { "flags": 4, "matrix": [7, 0], "x": 143, "y": 85 },
-            { "flags": 4, "matrix": [7, 1], "x": 163, "y": 85 },
-            { "flags": 4, "matrix": [7, 2], "x": 183, "y": 85 },
-            { "flags": 4, "matrix": [6, 0], "x": 163, "y": 64 },
-            { "flags": 4, "matrix": [5, 0], "x": 163, "y": 43 },
-            { "flags": 4, "matrix": [4, 0], "x": 163, "y": 21 },
-            { "flags": 4, "matrix": [4, 1], "x": 183, "y": 21 },
-            { "flags": 4, "matrix": [5, 1], "x": 183, "y": 43 },
-            { "flags": 4, "matrix": [6, 1], "x": 183, "y": 64 },
-            { "flags": 4, "matrix": [6, 2], "x": 204, "y": 64 },
-            { "flags": 4, "matrix": [5, 2], "x": 204, "y": 43 },
-            { "flags": 4, "matrix": [4, 2], "x": 204, "y": 21 },
-            { "flags": 4, "matrix": [4, 3], "x": 224, "y": 21 },
-            { "flags": 4, "matrix": [5, 3], "x": 224, "y": 43 },
-            { "flags": 4, "matrix": [6, 3], "x": 224, "y": 64 },
-            { "flags": 4, "matrix": [6, 4], "x": 244, "y": 64 },
-            { "flags": 4, "matrix": [5, 4], "x": 244, "y": 43 },
-            { "flags": 4, "matrix": [4, 4], "x": 244, "y": 21 }
+            {"matrix": [3, 4], "x": 122, "y": 85, "flags": 4},
+            {"matrix": [3, 3], "x": 102, "y": 85, "flags": 4},
+            {"matrix": [3, 2], "x": 81, "y": 85, "flags": 4},
+            {"matrix": [2, 4], "x": 102, "y": 64, "flags": 4},
+            {"matrix": [1, 4], "x": 102, "y": 43, "flags": 4},
+            {"matrix": [0, 4], "x": 102, "y": 21, "flags": 4},
+            {"matrix": [0, 3], "x": 81, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 81, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 81, "y": 64, "flags": 4},
+            {"matrix": [2, 2], "x": 61, "y": 64, "flags": 4},
+            {"matrix": [1, 2], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [0, 2], "x": 61, "y": 21, "flags": 4},
+            {"matrix": [0, 1], "x": 41, "y": 21, "flags": 4},
+            {"matrix": [1, 1], "x": 41, "y": 43, "flags": 4},
+            {"matrix": [2, 1], "x": 41, "y": 64, "flags": 4},
+            {"matrix": [2, 0], "x": 20, "y": 64, "flags": 4},
+            {"matrix": [1, 0], "x": 20, "y": 43, "flags": 4},
+            {"matrix": [0, 0], "x": 20, "y": 21, "flags": 4},
+            {"matrix": [7, 0], "x": 143, "y": 85, "flags": 4},
+            {"matrix": [7, 1], "x": 163, "y": 85, "flags": 4},
+            {"matrix": [7, 2], "x": 183, "y": 85, "flags": 4},
+            {"matrix": [6, 0], "x": 163, "y": 64, "flags": 4},
+            {"matrix": [5, 0], "x": 163, "y": 43, "flags": 4},
+            {"matrix": [4, 0], "x": 163, "y": 21, "flags": 4},
+            {"matrix": [4, 1], "x": 183, "y": 21, "flags": 4},
+            {"matrix": [5, 1], "x": 183, "y": 43, "flags": 4},
+            {"matrix": [6, 1], "x": 183, "y": 64, "flags": 4},
+            {"matrix": [6, 2], "x": 204, "y": 64, "flags": 4},
+            {"matrix": [5, 2], "x": 204, "y": 43, "flags": 4},
+            {"matrix": [4, 2], "x": 204, "y": 21, "flags": 4},
+            {"matrix": [4, 3], "x": 224, "y": 21, "flags": 4},
+            {"matrix": [5, 3], "x": 224, "y": 43, "flags": 4},
+            {"matrix": [6, 3], "x": 224, "y": 64, "flags": 4},
+            {"matrix": [6, 4], "x": 244, "y": 64, "flags": 4},
+            {"matrix": [5, 4], "x": 244, "y": 43, "flags": 4},
+            {"matrix": [4, 4], "x": 244, "y": 21, "flags": 4}
         ],
         "split_count": [18, 18]
     },
@@ -76,45 +75,46 @@
         "driver": "vendor",
         "pin": "GP29"
     },
+    "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                { "label": "L00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "L01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "L02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "L03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "L04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "label": "R00", "matrix": [4, 4], "w": 1, "x": 5, "y": 0 },
-                { "label": "R01", "matrix": [4, 3], "w": 1, "x": 6, "y": 0 },
-                { "label": "R02", "matrix": [4, 2], "w": 1, "x": 7, "y": 0 },
-                { "label": "R03", "matrix": [4, 1], "w": 1, "x": 8, "y": 0 },
-                { "label": "R04", "matrix": [4, 0], "w": 1, "x": 9, "y": 0 },
-                { "label": "L10", "matrix": [1, 0], "w": 1, "x": 10, "y": 0 },
-                { "label": "L11", "matrix": [1, 1], "w": 1, "x": 11, "y": 0 },
-                { "label": "L12", "matrix": [1, 2], "w": 1, "x": 12, "y": 0 },
-                { "label": "L13", "matrix": [1, 3], "w": 1, "x": 13, "y": 0 },
-                { "label": "L14", "matrix": [1, 4], "w": 1, "x": 14, "y": 0 },
-                { "label": "R10", "matrix": [5, 4], "w": 1, "x": 15, "y": 0 },
-                { "label": "R11", "matrix": [5, 3], "w": 1, "x": 16, "y": 0 },
-                { "label": "R12", "matrix": [5, 2], "w": 1, "x": 17, "y": 0 },
-                { "label": "R13", "matrix": [5, 1], "w": 1, "x": 18, "y": 0 },
-                { "label": "R14", "matrix": [5, 0], "w": 1, "x": 19, "y": 0 },
-                { "label": "L20", "matrix": [2, 0], "w": 1, "x": 20, "y": 0 },
-                { "label": "L21", "matrix": [2, 1], "w": 1, "x": 21, "y": 0 },
-                { "label": "L22", "matrix": [2, 2], "w": 1, "x": 22, "y": 0 },
-                { "label": "L23", "matrix": [2, 3], "w": 1, "x": 23, "y": 0 },
-                { "label": "L24", "matrix": [2, 4], "w": 1, "x": 24, "y": 0 },
-                { "label": "R20", "matrix": [6, 4], "w": 1, "x": 25, "y": 0 },
-                { "label": "R21", "matrix": [6, 3], "w": 1, "x": 26, "y": 0 },
-                { "label": "R22", "matrix": [6, 2], "w": 1, "x": 27, "y": 0 },
-                { "label": "R23", "matrix": [6, 1], "w": 1, "x": 28, "y": 0 },
-                { "label": "R24", "matrix": [6, 0], "w": 1, "x": 29, "y": 0 },
-                { "label": "L32", "matrix": [3, 2], "w": 1, "x": 30, "y": 0 },
-                { "label": "L33", "matrix": [3, 3], "w": 1, "x": 31, "y": 0 },
-                { "label": "L34", "matrix": [3, 4], "w": 1, "x": 32, "y": 0 },
-                { "label": "R30", "matrix": [7, 4], "w": 1, "x": 33, "y": 0 },
-                { "label": "R31", "matrix": [7, 3], "w": 1, "x": 34, "y": 0 },
-                { "label": "R32", "matrix": [7, 2], "w": 1, "x": 35, "y": 0 }
+                {"label": "L00", "matrix": [0, 0], "x": 0, "y": 1.25},
+                {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.25},
+                {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0.5},
+                {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.65},
+                {"label": "R00", "matrix": [4, 4], "x": 7, "y": 0.65},
+                {"label": "R01", "matrix": [4, 3], "x": 8, "y": 0.5},
+                {"label": "R02", "matrix": [4, 2], "x": 9, "y": 0},
+                {"label": "R03", "matrix": [4, 1], "x": 10, "y": 0.25},
+                {"label": "R04", "matrix": [4, 0], "x": 11, "y": 1.25},
+                {"label": "L10", "matrix": [1, 0], "x": 0, "y": 2.25},
+                {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.65},
+                {"label": "R10", "matrix": [5, 4], "x": 7, "y": 1.65},
+                {"label": "R11", "matrix": [5, 3], "x": 8, "y": 1.5},
+                {"label": "R12", "matrix": [5, 2], "x": 9, "y": 1},
+                {"label": "R13", "matrix": [5, 1], "x": 10, "y": 1.25},
+                {"label": "R14", "matrix": [5, 0], "x": 11, "y": 2.25},
+                {"label": "L20", "matrix": [2, 0], "x": 0, "y": 3.25},
+                {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.25},
+                {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2.5},
+                {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.65},
+                {"label": "R20", "matrix": [6, 4], "x": 7, "y": 2.65},
+                {"label": "R21", "matrix": [6, 3], "x": 8, "y": 2.5},
+                {"label": "R22", "matrix": [6, 2], "x": 9, "y": 2},
+                {"label": "R23", "matrix": [6, 1], "x": 10, "y": 2.25},
+                {"label": "R24", "matrix": [6, 0], "x": 11, "y": 3.25},
+                {"label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.65},
+                {"label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3.75},
+                {"label": "L34", "matrix": [3, 4], "x": 4.5, "y": 4.15},
+                {"label": "R30", "matrix": [7, 4], "x": 6.5, "y": 4.15},
+                {"label": "R31", "matrix": [7, 3], "x": 7.5, "y": 3.75},
+                {"label": "R32", "matrix": [7, 2], "x": 8.5, "y": 3.65}
             ]
         }
     }
diff --git a/keyboards/quokka/keymaps/default/keymap.c b/keyboards/quokka/keymaps/default/keymap.c
index 77375cd8a15..2aee8824f3b 100644
--- a/keyboards/quokka/keymaps/default/keymap.c
+++ b/keyboards/quokka/keymaps/default/keymap.c
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
-
 // clang-format off
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/qvex/lynepad2/config.h b/keyboards/qvex/lynepad2/config.h
index 9e1f70b38bc..c6fad65c978 100644
--- a/keyboards/qvex/lynepad2/config.h
+++ b/keyboards/qvex/lynepad2/config.h
@@ -25,9 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //Thumbwheel
 #define PIN_TC D2
-
-//Backlighting
-#define BACKLIGHT_DEFAULT_LEVEL 5
-
-//RGB arc
-#define RGBLIGHT_DEFAULT_VAL 64
\ No newline at end of file
diff --git a/keyboards/qvex/lynepad2/info.json b/keyboards/qvex/lynepad2/info.json
index 7919c2adc2a..31076407924 100644
--- a/keyboards/qvex/lynepad2/info.json
+++ b/keyboards/qvex/lynepad2/info.json
@@ -35,7 +35,10 @@
     "rgblight": {
         "led_count": 5,
         "max_brightness": 192,
-        "sleep": true
+        "sleep": true,
+        "default": {
+            "val": 64
+        }
     },
     "ws2812": {
         "pin": "D3"
@@ -44,7 +47,10 @@
         "breathing": true,
         "levels": 8,
         "max_brightness": 192,
-        "pin": "B7"
+        "pin": "B7",
+        "default": {
+            "brightness": 5
+        }
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/qvex/lynepad2/keymaps/mcrosson/keymap.c b/keyboards/qvex/lynepad2/keymaps/mcrosson/keymap.c
deleted file mode 100644
index ead8ab40a6d..00000000000
--- a/keyboards/qvex/lynepad2/keymaps/mcrosson/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-Copyright 2023 QVEX Tech
-
-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 RGB_HUE_LAYER0 0 //default layer
-#define RGB_HUE_LAYER1 50
-#define RGB_HUE_LAYER2 100
-#define RGB_HUE_LAYER3 150
-#define RGB_HUE_LAYER4 200
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT //Default
-    (
-        KC_MS_BTN4,   KC_MS_BTN2,   KC_MS_UP,    KC_MS_BTN1,
-        KC_MS_BTN5,   KC_MS_LEFT,   KC_MS_DOWN,  KC_MS_RIGHT,
-        KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2,
-
-        KC_VOLU,   KC_VOLD,   KC_MPRV,   KC_MNXT,   //joystick up, down, left, right
-        KC_MPLY,   MO(4)                            //joystick center push, thumbwheel push
-    ),
-
-    [1] = LAYOUT //KiCad
-    (
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,
-
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  //joystick up, down, left, right
-        XXXXXXX,   MO(4)                           //joystick center push, thumbwheel push
-    ),
-
-    [2] = LAYOUT
-    (
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,
-
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   //joystick up, down, left, right
-        XXXXXXX,   MO(4)                            //joystick center push, thumbwheel push
-    ),
-
-    [3] = LAYOUT
-    (
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,
-
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   //joystick up, down, left, right
-        XXXXXXX,   MO(4)                            //joystick center push, thumbwheel push
-    ),
-
-    [4] = LAYOUT
-    (
-        TO(0),     TO(1),     TO(2),     TO(3),
-        BL_TOGG,   BL_STEP,   XXXXXXX,   XXXXXXX,
-        QK_RBT,    EE_CLR,    QK_BOOT,
-
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   //joystick up, down, left, right
-        RGB_TOG,   XXXXXXX                          //joystick center push, thumbwheel push
-    )
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { 
-        ENCODER_CCW_CW(KC_VOLD, KC_VOLU), 
-        ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP)  
-    },
-
-    [1] = { 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX), 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX)  
-    },
-
-    [2] = { 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX), 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX)  
-    },
-
-    [3] = { 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX), 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX)  
-    },
-
-    [4] = { 
-        ENCODER_CCW_CW(RGB_VAD, RGB_VAI), 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX)  
-    }
-};
-#endif
-
-//set only hue, retain saturation, and value
-void rgblight_sethue_noeeprom(uint8_t hue) {
-    //only if rgb led ring is on
-    if (rgblight_get_mode()) {
-        rgblight_sethsv_noeeprom(hue,rgblight_get_sat(),rgblight_get_val());
-    }     
-}
-
-//set correct layer hue on layer change
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case 1:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER1);
-            break;
-        case 2:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER2);
-            break;
-        case 3:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER3);
-            break;
-        case 4:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER4);
-            break;
-        default:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER0);
-            break;
-
-    }
-    return state;
-}
-
-//set default layer hue upon init
-void keyboard_post_init_user(void) {
-  rgblight_init();
-  rgblight_sethue_noeeprom(RGB_HUE_LAYER0);
-}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/ansi.c b/keyboards/qwertykeys/qk100/ansi/ansi.c
index 87e1b99e1b7..e1102aab516 100644
--- a/keyboards/qwertykeys/qk100/ansi/ansi.c
+++ b/keyboards/qwertykeys/qk100/ansi/ansi.c
@@ -17,108 +17,108 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS2_SW1, CS3_SW1, CS1_SW1},    /* RGB0-ESC ROW0*/
-    {0, CS5_SW1, CS6_SW1, CS4_SW1},    /* RGB1-F1 */
-    {0, CS8_SW1, CS9_SW1, CS7_SW1},    /* RGB2-F2 */
-    {0, CS11_SW1, CS12_SW1, CS10_SW1}, /* RGB3-F3 */
-    {0, CS14_SW1, CS15_SW1, CS13_SW1}, /* RGB4-F4 */
-    {0, CS17_SW1, CS18_SW1, CS16_SW1}, /* RGB5-F5 */
-    {0, CS20_SW1, CS21_SW1, CS19_SW1}, /* RGB6-F6 */
-    {0, CS23_SW1, CS24_SW1, CS22_SW1}, /* RGB7-F7 */
-    {0, CS26_SW1, CS27_SW1, CS25_SW1}, /* RGB8-F8 */
-    {0, CS29_SW1, CS30_SW1, CS28_SW1}, /* RGB9-F9 */
-    {0, CS32_SW1, CS33_SW1, CS31_SW1}, /* RGB10-F10 */
-    {0, CS35_SW1, CS36_SW1, CS34_SW1}, /* RGB11-F11 */
-    {0, CS38_SW1, CS39_SW1, CS37_SW1}, /* RGB12-F12 */
-    {0, CS29_SW7, CS30_SW7, CS28_SW7}, /* RGB13-Delete */
-    {0, CS32_SW7, CS33_SW7, CS31_SW7}, /* RGB14-End */
-    {0, CS35_SW7, CS36_SW7, CS34_SW7}, /* RGB15-Insert */
-    {0, CS38_SW7, CS39_SW7, CS37_SW7}, /* RGB16-Home */
-    {0, CS2_SW2, CS3_SW2, CS1_SW2},    /* RGB17-~ ----ROW1*/
-    {0, CS5_SW2, CS6_SW2, CS4_SW2},    /* RGB18-1 */
-    {0, CS8_SW2, CS9_SW2, CS7_SW2},    /* RGB19-2 */
-    {0, CS11_SW2, CS12_SW2, CS10_SW2}, /* RGB20-3 */
-    {0, CS14_SW2, CS15_SW2, CS13_SW2}, /* RGB21-4 */
-    {0, CS17_SW2, CS18_SW2, CS16_SW2}, /* RGB22-5 */
-    {0, CS20_SW2, CS21_SW2, CS19_SW2}, /* RGB23-6 */
-    {0, CS23_SW2, CS24_SW2, CS22_SW2}, /* RGB24-7 */
-    {0, CS26_SW2, CS27_SW2, CS25_SW2}, /* RGB25-8 */
-    {0, CS29_SW2, CS30_SW2, CS28_SW2}, /* RGB26-9 */
-    {0, CS32_SW2, CS33_SW2, CS31_SW2}, /* RGB27-0 */
-    {0, CS35_SW2, CS36_SW2, CS34_SW2}, /* RGB28--- */
-    {0, CS38_SW2, CS39_SW2, CS37_SW2}, /* RGB29-+= */
-    {0, CS26_SW7, CS27_SW7, CS25_SW7}, /* RGB30-BS */
-    {0, CS29_SW8, CS30_SW8, CS28_SW8}, /* RGB31-Num Lock */
-    {0, CS32_SW8, CS33_SW8, CS31_SW8}, /* RGB32- / */
-    {0, CS35_SW8, CS36_SW8, CS34_SW8}, /* RGB33- * */
-    {0, CS38_SW8, CS39_SW8, CS37_SW8}, /* RGB34- - */
-    {0, CS2_SW3, CS3_SW3, CS1_SW3},    /* RGB35-TAB ----ROW2*/
-    {0, CS5_SW3, CS6_SW3, CS4_SW3},    /* RGB36-Q */
-    {0, CS8_SW3, CS9_SW3, CS7_SW3},    /* RGB37-W */
-    {0, CS11_SW3, CS12_SW3, CS10_SW3}, /* RGB38-E */
-    {0, CS14_SW3, CS15_SW3, CS13_SW3}, /* RGB39-R */
-    {0, CS17_SW3, CS18_SW3, CS16_SW3}, /* RGB40-T */
-    {0, CS20_SW3, CS21_SW3, CS19_SW3}, /* RGB41-Y */
-    {0, CS23_SW3, CS24_SW3, CS22_SW3}, /* RGB42-U */
-    {0, CS26_SW3, CS27_SW3, CS25_SW3}, /* RGB43-I */
-    {0, CS29_SW3, CS30_SW3, CS28_SW3}, /* RGB44-O */
-    {0, CS32_SW3, CS33_SW3, CS31_SW3}, /* RGB45-P */
-    {0, CS35_SW3, CS36_SW3, CS34_SW3}, /* RGB46-[ */
-    {0, CS38_SW3, CS39_SW3, CS37_SW3}, /* RGB47-] */
-    {0, CS26_SW9, CS27_SW9, CS25_SW9}, /* RGB48-\ */
-    {0, CS29_SW9, CS30_SW9, CS28_SW9}, /* RGB49-page up */
-    {0, CS32_SW9, CS33_SW9, CS31_SW9}, /* RGB50-7 */
-    {0, CS35_SW9, CS36_SW9, CS34_SW9}, /* RGB51-8 */
-    {0, CS38_SW9, CS39_SW9, CS37_SW9}, /* RGB52-9 */
-    {0, CS2_SW4, CS3_SW4, CS1_SW4},    /* RGB53-CAPS---ROW3*/
-    {0, CS5_SW4, CS6_SW4, CS4_SW4},    /* RGB54-A-- */
-    {0, CS8_SW4, CS9_SW4, CS7_SW4},    /* RGB55-S-- */
-    {0, CS11_SW4, CS12_SW4, CS10_SW4}, /* RGB56-D */
-    {0, CS14_SW4, CS15_SW4, CS13_SW4}, /* RGB57-F */
-    {0, CS17_SW4, CS18_SW4, CS16_SW4}, /* RGB58-G */
-    {0, CS20_SW4, CS21_SW4, CS19_SW4}, /* RGB59-H */
-    {0, CS23_SW4, CS24_SW4, CS22_SW4}, /* RGB60-J */
-    {0, CS26_SW4, CS27_SW4, CS25_SW4}, /* RGB61-K */
-    {0, CS29_SW4, CS30_SW4, CS28_SW4}, /* RGB62-L */
-    {0, CS32_SW4, CS33_SW4, CS31_SW4}, /* RGB63-;: */
-    {0, CS35_SW4, CS36_SW4, CS34_SW4}, /* RGB64-'" */
-    {0, CS38_SW4, CS39_SW4, CS37_SW4}, /* RGB65-ENTER */
-    {0, CS11_SW7, CS12_SW7, CS10_SW7}, /* RGB66-Page Down */
-    {0, CS14_SW7, CS15_SW7, CS13_SW7}, /* RGB67-4 */
-    {0, CS17_SW7, CS18_SW7, CS16_SW7}, /* RGB68-5 */
-    {0, CS20_SW7, CS21_SW7, CS19_SW7}, /* RGB69-6 */
-    {0, CS23_SW7, CS24_SW7, CS22_SW7}, /* RGB70-+ */
-    {0, CS2_SW5, CS3_SW5, CS1_SW5},    /* RGB71-LSF --ROW4*/
-    {0, CS5_SW5, CS6_SW5, CS4_SW5},    /* RGB72-Z */
-    {0, CS8_SW5, CS9_SW5, CS7_SW5},    /* RGB73-X */
-    {0, CS11_SW5, CS12_SW5, CS10_SW5}, /* RGB74-C */
-    {0, CS14_SW5, CS15_SW5, CS13_SW5}, /* RGB75-V */
-    {0, CS17_SW5, CS18_SW5, CS16_SW5}, /* RGB76-B */
-    {0, CS20_SW5, CS21_SW5, CS19_SW5}, /* RGB77-N */
-    {0, CS23_SW5, CS24_SW5, CS22_SW5}, /* RGB78-M */
-    {0, CS26_SW5, CS27_SW5, CS25_SW5}, /* RGB79-,< */
-    {0, CS29_SW5, CS30_SW5, CS28_SW5}, /* RGB80->. */
-    {0, CS32_SW5, CS33_SW5, CS31_SW5}, /* RGB81-?/ */
-    {0, CS35_SW5, CS36_SW5, CS34_SW5}, /* RGB82-RSF */
-    {0, CS38_SW5, CS39_SW5, CS37_SW5}, /* RGB83-UP */
-    {0, CS14_SW8, CS15_SW8, CS13_SW8}, /* RGB84-1*/
-    {0, CS17_SW8, CS18_SW8, CS16_SW8}, /* RGB85-2 */
-    {0, CS20_SW8, CS21_SW8, CS19_SW8}, /* RGB86-3 */
-    {0, CS23_SW8, CS24_SW8, CS22_SW8}, /* RGB87-Enter */
-    {0, CS2_SW6, CS3_SW6, CS1_SW6},    /* RGB88-lct-- ROW5*/
-    {0, CS5_SW6, CS6_SW6, CS4_SW6},    /* RGB89-lwin */
-    {0, CS8_SW6, CS9_SW6, CS7_SW6},    /* RGB90-lalt */
-    {0, CS11_SW6, CS12_SW6, CS10_SW6}, /* RGB91-sp0 */
-    {0, CS17_SW6, CS18_SW6, CS16_SW6}, /* RGB92-sp */
-    {0, CS26_SW6, CS27_SW6, CS25_SW6}, /* RGB93-sp2 */
-    {0, CS29_SW6, CS30_SW6, CS28_SW6}, /* RGB94-ralt */
-    {0, CS32_SW6, CS33_SW6, CS31_SW6}, /* RGB95- fn */
-    {0, CS35_SW6, CS36_SW6, CS34_SW6}, /* RGB96-left */
-    {0, CS38_SW6, CS39_SW6, CS37_SW6}, /* RGB97-down */
-    {0, CS11_SW9, CS12_SW9, CS10_SW9}, /* RGB98-right */
-    {0, CS14_SW9, CS15_SW9, CS13_SW9}, /* RGB99- 0 */
-    {0, CS20_SW9, CS21_SW9, CS19_SW9}  /* RGB100- . */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS2, SW1_CS3, SW1_CS1},    /* RGB0-ESC ROW0*/
+    {0, SW1_CS5, SW1_CS6, SW1_CS4},    /* RGB1-F1 */
+    {0, SW1_CS8, SW1_CS9, SW1_CS7},    /* RGB2-F2 */
+    {0, SW1_CS11, SW1_CS12, SW1_CS10}, /* RGB3-F3 */
+    {0, SW1_CS14, SW1_CS15, SW1_CS13}, /* RGB4-F4 */
+    {0, SW1_CS17, SW1_CS18, SW1_CS16}, /* RGB5-F5 */
+    {0, SW1_CS20, SW1_CS21, SW1_CS19}, /* RGB6-F6 */
+    {0, SW1_CS23, SW1_CS24, SW1_CS22}, /* RGB7-F7 */
+    {0, SW1_CS26, SW1_CS27, SW1_CS25}, /* RGB8-F8 */
+    {0, SW1_CS29, SW1_CS30, SW1_CS28}, /* RGB9-F9 */
+    {0, SW1_CS32, SW1_CS33, SW1_CS31}, /* RGB10-F10 */
+    {0, SW1_CS35, SW1_CS36, SW1_CS34}, /* RGB11-F11 */
+    {0, SW1_CS38, SW1_CS39, SW1_CS37}, /* RGB12-F12 */
+    {0, SW7_CS29, SW7_CS30, SW7_CS28}, /* RGB13-Delete */
+    {0, SW7_CS32, SW7_CS33, SW7_CS31}, /* RGB14-End */
+    {0, SW7_CS35, SW7_CS36, SW7_CS34}, /* RGB15-Insert */
+    {0, SW7_CS38, SW7_CS39, SW7_CS37}, /* RGB16-Home */
+    {0, SW2_CS2, SW2_CS3, SW2_CS1},    /* RGB17-~ ----ROW1*/
+    {0, SW2_CS5, SW2_CS6, SW2_CS4},    /* RGB18-1 */
+    {0, SW2_CS8, SW2_CS9, SW2_CS7},    /* RGB19-2 */
+    {0, SW2_CS11, SW2_CS12, SW2_CS10}, /* RGB20-3 */
+    {0, SW2_CS14, SW2_CS15, SW2_CS13}, /* RGB21-4 */
+    {0, SW2_CS17, SW2_CS18, SW2_CS16}, /* RGB22-5 */
+    {0, SW2_CS20, SW2_CS21, SW2_CS19}, /* RGB23-6 */
+    {0, SW2_CS23, SW2_CS24, SW2_CS22}, /* RGB24-7 */
+    {0, SW2_CS26, SW2_CS27, SW2_CS25}, /* RGB25-8 */
+    {0, SW2_CS29, SW2_CS30, SW2_CS28}, /* RGB26-9 */
+    {0, SW2_CS32, SW2_CS33, SW2_CS31}, /* RGB27-0 */
+    {0, SW2_CS35, SW2_CS36, SW2_CS34}, /* RGB28--- */
+    {0, SW2_CS38, SW2_CS39, SW2_CS37}, /* RGB29-+= */
+    {0, SW7_CS26, SW7_CS27, SW7_CS25}, /* RGB30-BS */
+    {0, SW8_CS29, SW8_CS30, SW8_CS28}, /* RGB31-Num Lock */
+    {0, SW8_CS32, SW8_CS33, SW8_CS31}, /* RGB32- / */
+    {0, SW8_CS35, SW8_CS36, SW8_CS34}, /* RGB33- * */
+    {0, SW8_CS38, SW8_CS39, SW8_CS37}, /* RGB34- - */
+    {0, SW3_CS2, SW3_CS3, SW3_CS1},    /* RGB35-TAB ----ROW2*/
+    {0, SW3_CS5, SW3_CS6, SW3_CS4},    /* RGB36-Q */
+    {0, SW3_CS8, SW3_CS9, SW3_CS7},    /* RGB37-W */
+    {0, SW3_CS11, SW3_CS12, SW3_CS10}, /* RGB38-E */
+    {0, SW3_CS14, SW3_CS15, SW3_CS13}, /* RGB39-R */
+    {0, SW3_CS17, SW3_CS18, SW3_CS16}, /* RGB40-T */
+    {0, SW3_CS20, SW3_CS21, SW3_CS19}, /* RGB41-Y */
+    {0, SW3_CS23, SW3_CS24, SW3_CS22}, /* RGB42-U */
+    {0, SW3_CS26, SW3_CS27, SW3_CS25}, /* RGB43-I */
+    {0, SW3_CS29, SW3_CS30, SW3_CS28}, /* RGB44-O */
+    {0, SW3_CS32, SW3_CS33, SW3_CS31}, /* RGB45-P */
+    {0, SW3_CS35, SW3_CS36, SW3_CS34}, /* RGB46-[ */
+    {0, SW3_CS38, SW3_CS39, SW3_CS37}, /* RGB47-] */
+    {0, SW9_CS26, SW9_CS27, SW9_CS25}, /* RGB48-\ */
+    {0, SW9_CS29, SW9_CS30, SW9_CS28}, /* RGB49-page up */
+    {0, SW9_CS32, SW9_CS33, SW9_CS31}, /* RGB50-7 */
+    {0, SW9_CS35, SW9_CS36, SW9_CS34}, /* RGB51-8 */
+    {0, SW9_CS38, SW9_CS39, SW9_CS37}, /* RGB52-9 */
+    {0, SW4_CS2, SW4_CS3, SW4_CS1},    /* RGB53-CAPS---ROW3*/
+    {0, SW4_CS5, SW4_CS6, SW4_CS4},    /* RGB54-A-- */
+    {0, SW4_CS8, SW4_CS9, SW4_CS7},    /* RGB55-S-- */
+    {0, SW4_CS11, SW4_CS12, SW4_CS10}, /* RGB56-D */
+    {0, SW4_CS14, SW4_CS15, SW4_CS13}, /* RGB57-F */
+    {0, SW4_CS17, SW4_CS18, SW4_CS16}, /* RGB58-G */
+    {0, SW4_CS20, SW4_CS21, SW4_CS19}, /* RGB59-H */
+    {0, SW4_CS23, SW4_CS24, SW4_CS22}, /* RGB60-J */
+    {0, SW4_CS26, SW4_CS27, SW4_CS25}, /* RGB61-K */
+    {0, SW4_CS29, SW4_CS30, SW4_CS28}, /* RGB62-L */
+    {0, SW4_CS32, SW4_CS33, SW4_CS31}, /* RGB63-;: */
+    {0, SW4_CS35, SW4_CS36, SW4_CS34}, /* RGB64-'" */
+    {0, SW4_CS38, SW4_CS39, SW4_CS37}, /* RGB65-ENTER */
+    {0, SW7_CS11, SW7_CS12, SW7_CS10}, /* RGB66-Page Down */
+    {0, SW7_CS14, SW7_CS15, SW7_CS13}, /* RGB67-4 */
+    {0, SW7_CS17, SW7_CS18, SW7_CS16}, /* RGB68-5 */
+    {0, SW7_CS20, SW7_CS21, SW7_CS19}, /* RGB69-6 */
+    {0, SW7_CS23, SW7_CS24, SW7_CS22}, /* RGB70-+ */
+    {0, SW5_CS2, SW5_CS3, SW5_CS1},    /* RGB71-LSF --ROW4*/
+    {0, SW5_CS5, SW5_CS6, SW5_CS4},    /* RGB72-Z */
+    {0, SW5_CS8, SW5_CS9, SW5_CS7},    /* RGB73-X */
+    {0, SW5_CS11, SW5_CS12, SW5_CS10}, /* RGB74-C */
+    {0, SW5_CS14, SW5_CS15, SW5_CS13}, /* RGB75-V */
+    {0, SW5_CS17, SW5_CS18, SW5_CS16}, /* RGB76-B */
+    {0, SW5_CS20, SW5_CS21, SW5_CS19}, /* RGB77-N */
+    {0, SW5_CS23, SW5_CS24, SW5_CS22}, /* RGB78-M */
+    {0, SW5_CS26, SW5_CS27, SW5_CS25}, /* RGB79-,< */
+    {0, SW5_CS29, SW5_CS30, SW5_CS28}, /* RGB80->. */
+    {0, SW5_CS32, SW5_CS33, SW5_CS31}, /* RGB81-?/ */
+    {0, SW5_CS35, SW5_CS36, SW5_CS34}, /* RGB82-RSF */
+    {0, SW5_CS38, SW5_CS39, SW5_CS37}, /* RGB83-UP */
+    {0, SW8_CS14, SW8_CS15, SW8_CS13}, /* RGB84-1*/
+    {0, SW8_CS17, SW8_CS18, SW8_CS16}, /* RGB85-2 */
+    {0, SW8_CS20, SW8_CS21, SW8_CS19}, /* RGB86-3 */
+    {0, SW8_CS23, SW8_CS24, SW8_CS22}, /* RGB87-Enter */
+    {0, SW6_CS2, SW6_CS3, SW6_CS1},    /* RGB88-lct-- ROW5*/
+    {0, SW6_CS5, SW6_CS6, SW6_CS4},    /* RGB89-lwin */
+    {0, SW6_CS8, SW6_CS9, SW6_CS7},    /* RGB90-lalt */
+    {0, SW6_CS11, SW6_CS12, SW6_CS10}, /* RGB91-sp0 */
+    {0, SW6_CS17, SW6_CS18, SW6_CS16}, /* RGB92-sp */
+    {0, SW6_CS26, SW6_CS27, SW6_CS25}, /* RGB93-sp2 */
+    {0, SW6_CS29, SW6_CS30, SW6_CS28}, /* RGB94-ralt */
+    {0, SW6_CS32, SW6_CS33, SW6_CS31}, /* RGB95- fn */
+    {0, SW6_CS35, SW6_CS36, SW6_CS34}, /* RGB96-left */
+    {0, SW6_CS38, SW6_CS39, SW6_CS37}, /* RGB97-down */
+    {0, SW9_CS11, SW9_CS12, SW9_CS10}, /* RGB98-right */
+    {0, SW9_CS14, SW9_CS15, SW9_CS13}, /* RGB99- 0 */
+    {0, SW9_CS20, SW9_CS21, SW9_CS19}  /* RGB100- . */
 };
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
diff --git a/keyboards/qwertykeys/qk100/ansi/config.h b/keyboards/qwertykeys/qk100/ansi/config.h
index 82766b88344..041dbdb928f 100644
--- a/keyboards/qwertykeys/qk100/ansi/config.h
+++ b/keyboards/qwertykeys/qk100/ansi/config.h
@@ -17,26 +17,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLIGHT_LAYERS                   
-#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF 
-#    define RGBLIGHT_LAYERS_RETAIN_VAL      
-#    define RGBLIGHT_DEFAULT_VAL 10
-#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
-#    define RGBLIGHT_SLEEP
+#define RGBLIGHT_LAYERS_RETAIN_VAL      
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
+
 /*== customize breathing effect ==*/
-#    define RGBLIGHT_BREATHE_TABLE_SIZE 128
-#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0
-#    define RGBLIGHT_EFFECT_BREATHE_MAX    60
+#define RGBLIGHT_BREATHE_TABLE_SIZE 128
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0
+#define RGBLIGHT_EFFECT_BREATHE_MAX    60
 
 /* RGB matrix */
 #define I2C1_CLOCK_SPEED 400000  
-#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2  
-#    define RGB_MATRIX_DISABLE_KEYCODES 
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_LED_PROCESS_LIMIT  4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT    26
-#    define RGB_MATRIX_STARTUP_VAL        128
-#    define DRIVER_ADDR_1                 0b0110000
-#    define RGB_MATRIX_LED_COUNT          101 
\ No newline at end of file
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
+
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+
+#define RGB_MATRIX_DISABLE_KEYCODES 
diff --git a/keyboards/qwertykeys/qk100/ansi/info.json b/keyboards/qwertykeys/qk100/ansi/info.json
index e9cd6ca3f20..3469f1c62e2 100644
--- a/keyboards/qwertykeys/qk100/ansi/info.json
+++ b/keyboards/qwertykeys/qk100/ansi/info.json
@@ -102,7 +102,9 @@
             {"matrix": [5, 0], "x": 0, "y": 52, "flags": 1},
             {"matrix": [5, 1], "x": 14, "y": 52, "flags": 1},
             {"matrix": [5, 2], "x": 28, "y": 52, "flags": 1},
+            {"x": 74, "y": 52, "flags": 4},
             {"matrix": [5, 5], "x": 74, "y": 52, "flags": 4},
+            {"x": 74, "y": 52, "flags": 4},
             {"matrix": [5, 9], "x": 122, "y": 52, "flags": 1},
             {"matrix": [5, 10], "x": 148, "y": 52, "flags": 1},
             {"matrix": [5, 12], "x": 158, "y": 52, "flags": 1},
@@ -112,7 +114,6 @@
             {"matrix": [5, 17], "x": 212, "y": 52, "flags": 4}
         ],
         "animations": {
-            "solid_color": true,
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
@@ -156,7 +157,13 @@
             "multisplash": true,
             "solid_splash": true,
             "solid_multisplash": true
-        }
+        },
+        "default": {
+            "val": 128
+        },
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/qwertykeys/qk100/info.json b/keyboards/qwertykeys/qk100/info.json
index c8498f3eafc..d020ca8ad20 100644
--- a/keyboards/qwertykeys/qk100/info.json
+++ b/keyboards/qwertykeys/qk100/info.json
@@ -34,8 +34,15 @@
         "brightness_steps": 10,
         "saturation_steps": 8,
         "led_count": 6,
-        "max_brightness": 120
-        
+        "max_brightness": 120,
+        "default": {
+            "val": 10
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
+        },
+        "sleep": true
     },
     "dynamic_keymap": {
         "layer_count": 2
diff --git a/keyboards/qwertykeys/qk100/solder/config.h b/keyboards/qwertykeys/qk100/solder/config.h
index 714f01a1daa..6a16c99f05f 100644
--- a/keyboards/qwertykeys/qk100/solder/config.h
+++ b/keyboards/qwertykeys/qk100/solder/config.h
@@ -17,13 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLIGHT_LAYERS                   
-#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF 
-#    define RGBLIGHT_LAYERS_RETAIN_VAL      
-#    define RGBLIGHT_DEFAULT_VAL 10
-#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
-#    define RGBLIGHT_SLEEP
+#define RGBLIGHT_LAYERS_RETAIN_VAL      
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
+
 /*== customize breathing effect ==*/
-#    define RGBLIGHT_BREATHE_TABLE_SIZE 128
-#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0
-#    define RGBLIGHT_EFFECT_BREATHE_MAX    60
\ No newline at end of file
+#define RGBLIGHT_BREATHE_TABLE_SIZE 128
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0
+#define RGBLIGHT_EFFECT_BREATHE_MAX    60
\ No newline at end of file
diff --git a/keyboards/rabbit/rabbit68/keymaps/kaiec/config.h b/keyboards/rabbit/rabbit68/keymaps/kaiec/config.h
deleted file mode 100644
index 1da00a29793..00000000000
--- a/keyboards/rabbit/rabbit68/keymaps/kaiec/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 Kai Eckert
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/raindrop/readme.md b/keyboards/raindrop/readme.md
deleted file mode 100644
index 2741cfafa75..00000000000
--- a/keyboards/raindrop/readme.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Raindrop
-
-![stacked](https://i.imgur.com/R2iPqjIh.png)  
-*Casing*  
-![PCB Front](https://i.imgur.com/00TpL3nh.png)  
-*PCB Front*  
-
-60% sized keyboard with a gasket mounted plate and aluminium case, made by Laneware Peripherals.
-
-* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
-* Hardware Supported: Raindrop PCB
-* Hardware Availability: Group Buy
-
-## Layouts
-The Raindrop PCB can be configured in the following key layouts: 
-| Key Layout | Keymap | Diagram |
-| :---: | :---: | :---: |
-| Standard 60% | default | ![diagram_ansi](https://i.imgur.com/oibG44o.png) |
-| 2u Left Shift with Arrow Keys | arrows | ![diagram_arrows](https://i.imgur.com/cQ4Kwb5h.png) |
-| HHKB with 6.25 Spacebar | hhkb | ![diagram_hhkb](https://i.imgur.com/WU6gb1Qh.png) |
-
-Make example for this keyboard (after setting up your build environment):
-
-    make raindrop:default
-
-Flashing example for this keyboard:
-
-    make raindrop: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 `QK_BOOT` if it is available
diff --git a/keyboards/rarepotato8de/3x3macropad/3x3macropad.c b/keyboards/rarepotato8de/3x3macropad/3x3macropad.c
new file mode 100644
index 00000000000..ad7ad642158
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/3x3macropad.c
@@ -0,0 +1,54 @@
+/* Copyright 2024 RarePotato8DE
+ *
+ * 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 "quantum.h"
+
+#ifdef OLED_ENABLE
+static void render_bongo1(void) {
+    static const char PROGMEM data[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x60, 0x20, 0x30, 0x30, 0x18, 0x1c, 0x0e, 0x03, 0x01, 0x03, 0x07, 0x1c, 0x38, 0x30, 0x60, 0x60, 0x60, 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, 0x00, 0x00, 0x00, 0x00,
+                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xe0, 0x30, 0x18, 0x18, 0x08, 0x18, 0x98, 0x30, 0x70, 0xf0, 0xb0, 0x18, 0x0c, 0x06, 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, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x60, 0x60, 0x60, 0xc0, 0x60, 0x60, 0x30, 0x30, 0x30, 0xf8, 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,
+                                        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x18, 0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80, 0x80, 0xff, 0xff, 0xc0, 0x80, 0x80, 0x8e, 0x06, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1e, 0x1e, 0x0e, 0x00, 0x10, 0x38, 0x70, 0x70, 0x70, 0x70, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0x3f, 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, 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, 0x01, 0x03, 0x03, 0x03, 0x03, 0x06, 0x06, 0x06, 0x06, 0x0c, 0x0c, 0x0c, 0x1c, 0x18, 0x18, 0x18, 0x38, 0x30, 0x30, 0x30, 0x30, 0x60, 0x60, 0x60, 0x60, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x87, 0xc7, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x3c, 0xf0, 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};
+    oled_write_raw_P(data, sizeof(data));
+}
+
+static void render_bongo2(void) {
+    static const char PROGMEM data[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xc0, 0x40, 0x60, 0x20, 0x20, 0x30, 0x10, 0x18, 0x0e, 0x07, 0x03, 0x01, 0x07, 0x0e, 0x1c, 0x30, 0x20, 0x60, 0x60, 0x40, 0xc0, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x60, 0x70, 0x30, 0x18, 0x0c, 0x06, 0x06, 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, 0x01, 0x01, 0x03, 0x03, 0x03, 0x06, 0x06, 0x06, 0x0c, 0x08, 0x18, 0x30, 0x30, 0x60, 0x60, 0xc0, 0x60, 0x60, 0x20, 0x30, 0x30, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x01, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x18, 0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe0, 0x38, 0x1c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1f, 0x0e, 0x04, 0x00, 0x38, 0x30, 0x70, 0x30, 0x70, 0xe0, 0xe0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0xc0, 0xe0, 0x60, 0x60, 0x70, 0x60, 0x60, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 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, 0x60, 0x60, 0x30, 0x90, 0x00, 0x1f, 0x31, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x30, 0x30, 0x10, 0x18, 0x18, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x38, 0x30, 0x30, 0x30, 0x30, 0x60, 0x60, 0x60, 0x60, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x03, 0x07, 0x07, 0x00, 0xff, 0xff, 0x00, 0x08, 0x01, 0x38, 0x38, 0x02, 0x00, 0x01, 0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x78, 0xe0, 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};
+    oled_write_raw_P(data, sizeof(data));
+}
+
+/* This code switches the shown image on the oled on every 350th call of this function */
+bool showBongo1 = true;
+int  calls      = 0;
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (calls++ > 350) {
+        showBongo1 = !showBongo1;
+        calls      = 0;
+    }
+    if (showBongo1) {
+        render_bongo1();
+    } else {
+        render_bongo2();
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/rarepotato8de/3x3macropad/info.json b/keyboards/rarepotato8de/3x3macropad/info.json
new file mode 100644
index 00000000000..6e5c553450c
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/info.json
@@ -0,0 +1,66 @@
+{
+    "manufacturer": "RarePotato8DE",
+    "keyboard_name": "3x3macropad",
+    "maintainer": "RarePotato8DE",
+    "development_board": "promicro",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F4", "pin_b": "B1"}
+        ]
+    },
+	"bootmagic": {
+		"matrix": [1, 0]
+	},
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "B3", "B2"],
+        "rows": ["F7", "B5", "B6"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true
+        },
+        "led_count": 6
+    },
+    "url": "https://github.com/rarepotato8de/3x3macropad",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0001",
+        "vid": "0x5353"
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "community_layouts": ["ortho_3x3"],
+    "layouts": {
+        "LAYOUT_ortho_3x3": {
+            "layout": [
+                {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c b/keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..7f68e145e73
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+/* Copyright 2024 RarePotato8DE
+ * 
+ * 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_3x3(
+        KC_1,   KC_2,   KC_3,
+        KC_4,   KC_5,   KC_6,
+        KC_7,   KC_8,   KC_9
+    )
+};
diff --git a/keyboards/rarepotato8de/3x3macropad/keymaps/vial/config.h b/keyboards/rarepotato8de/3x3macropad/keymaps/vial/config.h
new file mode 100644
index 00000000000..8540746d481
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/keymaps/vial/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2024 RarePotato8DE
+ * 
+ * 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 VIAL_KEYBOARD_UID {0x38, 0x9A, 0xC4, 0x78, 0xC1, 0x20, 0x60, 0x62}
+#define VIAL_UNLOCK_COMBO_ROWS { 1, 1 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 2 }
diff --git a/keyboards/rarepotato8de/3x3macropad/keymaps/vial/keymap.c b/keyboards/rarepotato8de/3x3macropad/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..468f5944726
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/keymaps/vial/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2024 RarePotato8DE
+ * 
+ * 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 ____ KC_TRNS
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_3x3(
+        KC_1,   KC_2,   KC_3,
+        KC_4,   KC_5,   KC_6,
+        KC_7,   KC_8,   KC_9
+    ),
+	[1] = LAYOUT_ortho_3x3(
+        ____,   ____,   ____,
+        ____,   ____,   ____,
+        ____,   ____,   ____
+    ),
+	[2] = LAYOUT_ortho_3x3(
+        ____,   ____,   ____,
+        ____,   ____,   ____,
+        ____,   ____,   ____
+    ),
+	[3] = LAYOUT_ortho_3x3(
+        ____,   ____,   ____,
+        ____,   ____,   ____,
+        ____,   ____,   ____
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =   { ENCODER_CCW_CW(____, ____) },
+    [2] =   { ENCODER_CCW_CW(____, ____) },
+    [3] =   { ENCODER_CCW_CW(____, ____) },
+};
+#endif
diff --git a/keyboards/rarepotato8de/3x3macropad/keymaps/vial/rules.mk b/keyboards/rarepotato8de/3x3macropad/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..5cf4baf9302
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/keymaps/vial/rules.mk
@@ -0,0 +1,7 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIAL_ENCODERS_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+QMK_SETTINGS = no
+TAP_DANCE_ENABLE = no
+COMBO_ENABLE = no
diff --git a/keyboards/rarepotato8de/3x3macropad/keymaps/vial/vial.json b/keyboards/rarepotato8de/3x3macropad/keymaps/vial/vial.json
new file mode 100644
index 00000000000..bd7ac061e6f
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/keymaps/vial/vial.json
@@ -0,0 +1,21 @@
+{
+    "name": "3x3macropad",
+    "vendorId": "0x5353",
+    "productId": "0x0001",
+    "lighting": "qmk_rgblight",
+    "matrix": {
+        "rows": 3,
+        "cols": 3
+    },
+    "layouts": {
+		"labels":[
+			"OLED",
+			"Encoder"
+		],
+		"keymap": [
+			[{"x":-2},{"d":true},"0,0\n\n\n0,1",{"d":true},"0,1\n\n\n0,1","0,0\n\n\n0,0","0,1\n\n\n0,0","0,2",{"x":-1},"0,1\n\n\n1,1\n\n\n\n\n\ne",{"d":true},"0,1\n\n\n1,0\n\n\n\n\n\ne"],
+			["1,0","1,1","1,2",{"x":-1},"0,0\n\n\n1,1\n\n\n\n\n\ne",{"d":true},"0,0\n\n\n1,0\n\n\n\n\n\ne"],
+			["2,0","2,1","2,2"]
+		]
+    }
+}
diff --git a/keyboards/rarepotato8de/3x3macropad/readme.md b/keyboards/rarepotato8de/3x3macropad/readme.md
new file mode 100644
index 00000000000..60a5caa2220
--- /dev/null
+++ b/keyboards/rarepotato8de/3x3macropad/readme.md
@@ -0,0 +1,28 @@
+# 3x3macropad
+
+![3x3macropad](https://i.imgur.com/LMkcKOw.jpg)
+
+The 3x3macropad is a small macropad with a cool OLED screen and rotary encoder.
+It was inspired by stacked FR4 keyboards like the Discipline65.
+
+* Keyboard Maintainer: [RarePotato8DE](https://github.com/rarepotato8de)
+* Hardware Supported: 3x3macropad
+* Hardware Availability: [Open source!](https://github.com/rarepotato8de/3x3macropad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rarepotato8de/3x3macropad:default
+
+Flashing example for this keyboard:
+
+    make rarepotato8de/3x3macropad: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,1) in the matrix (the top left one below the OLED) and plug in the keyboard
+* **Physical reset button**: Short the two through hole pins on the back of the PCB (positioned at the rotary encoder)
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/kudox_game/rev1/.noci b/keyboards/rarepotato8de/3x3macropad/rules.mk
similarity index 100%
rename from keyboards/kudox_game/rev1/.noci
rename to keyboards/rarepotato8de/3x3macropad/rules.mk
diff --git a/keyboards/rart/rartpad/keymaps/numpad/keymap.c b/keyboards/rart/rartpad/keymaps/numpad/keymap.c
deleted file mode 100644
index e3d8384dabe..00000000000
--- a/keyboards/rart/rartpad/keymaps/numpad/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2020 Alabahuy
-
-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(
-        KC_NUM,  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,            MO(1),   KC_PENT
-    ),
-    [1] = LAYOUT_numpad_5x4(
-        KC_TRNS, KC_TRNS, KC_TRNS,  QK_BOOT,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,          KC_TRNS,  KC_PDOT
-    )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) { /* Second encoder */
-        if (clockwise) {
-            tap_code(KC_PGUP);
-        } else {
-            tap_code(KC_PGDN);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c b/keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c
deleted file mode 100644
index a65df705739..00000000000
--- a/keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2023 Raster Software Vigo
- *
- * 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_hybrid(
-        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_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, KC_END,
-        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_NUHS, KC_INS,  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_DEL,  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,   LT(1, KC_APP),
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_APP,  KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_hybrid(
-        XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, RGB_TOG, RGB_MODE_FORWARD, RGB_MODE_REVERSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_MUTE, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_VOLU, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                                              XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLD, KC_VOLU
-    ),
-};
diff --git a/keyboards/rastersoft/minitkl/keymaps/hybrid/readme.md b/keyboards/rastersoft/minitkl/keymaps/hybrid/readme.md
deleted file mode 100644
index 121f6277f2c..00000000000
--- a/keyboards/rastersoft/minitkl/keymaps/hybrid/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# The HYBRID keymap for MiniTKL
-
-![keymap](https://images2.imgbox.com/00/22/vjrqgfHy_o.png)
-
-This keymap is designed to be able to have an ISO keyboard with the ANSI Return
-key. This is useful in, at least, two cases:
-
-* some programmers prefer the ANSI key, but want to use European languages.
-* some keycaps come without ISO return key, even for European languages layouts.
-
-The `Fn` key trigger `KC_APP` when tapped, and activate Layer 1 when held.
diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
index 8b5dcbc9f49..8a12d3d9ee7 100644
--- a/keyboards/rate/pistachio/rev2/config.h
+++ b/keyboards/rate/pistachio/rev2/config.h
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Split hand configration */
 #define SPLIT_HAND_MATRIX_GRID D4,D3
+#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
 
 #define RGBLIGHT_LAYERS
 
diff --git a/keyboards/rate/pistachio_pro/lib/bme280.c b/keyboards/rate/pistachio_pro/lib/bme280.c
index f3dc231dc54..ac7a4873bac 100644
--- a/keyboards/rate/pistachio_pro/lib/bme280.c
+++ b/keyboards/rate/pistachio_pro/lib/bme280.c
@@ -102,9 +102,9 @@ static int32_t t_fine;
 static void readTrim(void) {
     uint8_t data[32];
 
-    i2c_readReg(BME280_ADDRESS, BME280_REG_CALIB00, &data[0], 24, I2C_BME280_TIMEOUT);
-    i2c_readReg(BME280_ADDRESS, BME280_REG_CALIB25, &data[25], 1, I2C_BME280_TIMEOUT);
-    i2c_readReg(BME280_ADDRESS, BME280_REG_CALIB26, &data[25], 7, I2C_BME280_TIMEOUT);
+    i2c_read_register(BME280_ADDRESS, BME280_REG_CALIB00, &data[0], 24, I2C_BME280_TIMEOUT);
+    i2c_read_register(BME280_ADDRESS, BME280_REG_CALIB25, &data[25], 1, I2C_BME280_TIMEOUT);
+    i2c_read_register(BME280_ADDRESS, BME280_REG_CALIB26, &data[25], 7, I2C_BME280_TIMEOUT);
 
     dig_T1 = (data[1] << 8) | data[0];
     dig_T2 = (data[3] << 8) | data[2];
@@ -131,7 +131,7 @@ static void readTrim(void) {
 static void readData(void) {
     uint8_t data[8];
 
-    i2c_readReg(BME280_ADDRESS, 0xF7, &data[0], 8, I2C_BME280_TIMEOUT);
+    i2c_read_register(BME280_ADDRESS, 0xF7, &data[0], 8, I2C_BME280_TIMEOUT);
 
     pres_raw = data[0];
     pres_raw = (pres_raw<<8) | data[1];
@@ -210,9 +210,9 @@ void bme280_init(void) {
     config_reg = BME280_CONFIG_VAL;
 
     i2c_init();
-    i2c_writeReg(BME280_ADDRESS, BME280_REG_CTRL_HUM, &ctrl_hum_reg, 1, I2C_BME280_TIMEOUT);
-    i2c_writeReg(BME280_ADDRESS, BME280_REG_CTRL_MEAS, &ctrl_meas_reg, 1, I2C_BME280_TIMEOUT);
-    i2c_writeReg(BME280_ADDRESS, BME280_REG_CONFIG, &config_reg, 1, I2C_BME280_TIMEOUT);
+    i2c_write_register(BME280_ADDRESS, BME280_REG_CTRL_HUM, &ctrl_hum_reg, 1, I2C_BME280_TIMEOUT);
+    i2c_write_register(BME280_ADDRESS, BME280_REG_CTRL_MEAS, &ctrl_meas_reg, 1, I2C_BME280_TIMEOUT);
+    i2c_write_register(BME280_ADDRESS, BME280_REG_CONFIG, &config_reg, 1, I2C_BME280_TIMEOUT);
     readTrim();
 
     return;
diff --git a/keyboards/recompile_keys/choco60/config.h b/keyboards/recompile_keys/choco60/config.h
deleted file mode 100644
index 378fc07981e..00000000000
--- a/keyboards/recompile_keys/choco60/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2019 Naoto Takai
-
-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
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
index e7ca3c17601..42b68131be9 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
@@ -61,5 +61,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define WS2812_DI_PIN B5
   #define RGBLIGHT_TIMER
 
-  #define RGBLED_NUM 6
+  #define RGBLIGHT_LED_COUNT 6
 #endif
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
index e7ca3c17601..42b68131be9 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
@@ -61,5 +61,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define WS2812_DI_PIN B5
   #define RGBLIGHT_TIMER
 
-  #define RGBLED_NUM 6
+  #define RGBLIGHT_LED_COUNT 6
 #endif
diff --git a/keyboards/redox/keymaps/KL1RL/config.h b/keyboards/redox/keymaps/KL1RL/config.h
deleted file mode 100644
index f3f993be5c7..00000000000
--- a/keyboards/redox/keymaps/KL1RL/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2018 Mattia Dal Ben <matthewdibi@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 USE_I2C
-
-/* Select hand configuration */
-//#define MASTER_LEFT
-//#define MASTER_RIGHT
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/redox/keymaps/KL1RL/keymap.c b/keyboards/redox/keymaps/KL1RL/keymap.c
deleted file mode 100644
index a024cd1d564..00000000000
--- a/keyboards/redox/keymaps/KL1RL/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-#define _NAV 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
-};
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTES LCTL_T(KC_ESC)
-#define KC_CTQU RCTL_T(KC_QUOT)
-
-#define KC_NAGR LT(_NAV, KC_GRV)
-#define KC_NAMI LT(_NAV, KC_MINS)
-
-#define KC_ADEN LT(_ADJUST, KC_END)
-#define KC_ADPU LT(_ADJUST, KC_PGUP)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_NAGR ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_NAMI ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,SYM_L   ,                          SYM_L   ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_EQL  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_CTES ,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_QUOTE ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     KC_BSLS ,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_LGUI ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,KC_F6   ,                          KC_F7   ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,KC_WH_U ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,                          _______ ,KC_MS_L ,KC_MS_D ,KC_MS_U ,KC_MS_R ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_WH_D ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,KC_BTN3 ,        KC_BTN3 ,KC_BTN2 ,    KC_BTN1 ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,KC_F12  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,        XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_MUTE ,    KC_VOLD ,KC_VOLU  ,        KC_BRID ,KC_BRIU ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  )
-
-};
diff --git a/keyboards/redox/keymaps/KL1RL/readme.md b/keyboards/redox/keymaps/KL1RL/readme.md
deleted file mode 100644
index 520d0048131..00000000000
--- a/keyboards/redox/keymaps/KL1RL/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# A tweaked keymap for Redox
-
-I copied fculpo's layout and made a few modifcations more suited for my own needs. In general it seems to be a fairly straight foward adaptation
-of a standard QWERTY full size keyboard.  At least for me.
-
-![fculpo Layout Image](https://i.imgur.com/OXT8boJ.png)
-
-## Changes to the default keymap
-
-Keymap changes from the default keymap are:
-
-- Move `GUI` (`SUPER`) key to where default left `CTRL` is
-- Move `/?` into usual location next to right `SHIFT` - the default flash from Falbatech put `\|` here (might not be the Redox default?), which felt unintuitive
-- Put `\|` into bottom-left spot where `GUI` (`SUPER`) was - had to go somewhere and this bottom-left placement sort of balances with the almost bottom-right `/?`
-- Change default `ESC` into `ESC` on tap, `CTRL` on hold - for the love of the UNIX-ey `CTRL` key location and to keep `ESC` in the original position
-- Add `F11` and `F12` keys to two layers - needed on macOS if you want to control volume up and down from your keyboard (not shown, on a different layer)S
-- Access ADJUST layer by holding either `END` or `PAGEUP` off default layer.
-
-Changes by KL1RL are:
-- Remove the right hand `CTRL` combo key, it was bugging me.
-- Add Brightness Up and Brightness Down on the right hand thumb cluster on the ADJUST layer.
-- Add Mute, Vol Down and Vol Up on LH thumb cluster also on the ADJUST layer.
diff --git a/keyboards/redox/keymaps/KL1RL/rules.mk b/keyboards/redox/keymaps/KL1RL/rules.mk
deleted file mode 100644
index a81250cdf6d..00000000000
--- a/keyboards/redox/keymaps/KL1RL/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/redox/keymaps/cykedev/config.h b/keyboards/redox/keymaps/cykedev/config.h
deleted file mode 100644
index d93389278bb..00000000000
--- a/keyboards/redox/keymaps/cykedev/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2021 Christian Eiden, cykedev
-//
-// 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 MASTER_LEFT
-#undef  RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define TAPPING_TERM 200
diff --git a/keyboards/redox/keymaps/cykedev/keymap.c b/keyboards/redox/keymaps/cykedev/keymap.c
deleted file mode 100644
index 9ada4463b44..00000000000
--- a/keyboards/redox/keymaps/cykedev/keymap.c
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2021 Christian Eiden, cykedev
-//
-// 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 SY_LBRC LT(_SYMBOL, KC_LBRC)
-#define SY_RBRC LT(_SYMBOL, KC_RBRC)
-#define SY_SPC  LT(_SYMBOL, KC_SPC)
-#define A_COMM  LALT_T(KC_COMM)
-#define A_DOT   LALT_T(KC_DOT)
-#define ADJ     MO(_ADJUST)
-
-enum layer_names {
-    _QWERTY,
-    _SYMBOL,
-    _ADJUST
-  };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  /* QWERTY
-   * ,-----------------------------------------.                                    ,-----------------------------------------.
-   * | ESC  |   1  |   2  |   3  |   4  |   5  |                                    |   6  |   7  |   8  |   9  |   0  | Bsp  |
-   * |------+------+------+------+------+------|-------.                    ,-------|------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |  Home |                    |  End  |   Y  |   U  |   I  |   O  |   P  |  \   |
-   * |------+------+------+------+------+------|-------.                    ,-------|------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |  SYM  |                    |  SYM  |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------|   [   |                    |   ]   |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  '----------------,  ,----------------'   N  |   M  |   ,  |   .  |   /  | Shift|
-   * |-----------------------------------------/   =   /  Bsp  /    \    +  \    -  \-----------------------------------------|
-   * |  ADJ | Hypr |  Meh | Ctrl |    /  Alt  /-------/-------/      \-------\-------\  Alt  \    | Ctrl | PgUp | PgDn | ADJ  |
-   * |      |      |      |      |   /   ,   /  Cmd  / Shift /        \ Shift \  SYM  \   .   \   |      |      |      |      |
-   * `---------------------------'  '-------/       / Enter /          \ Enter \ Space \-------'  '---------------------------'
-   *                                        '--------------'            '--------------'
-   */
-     KC_ESC  , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                            KC_6   , KC_7   , KC_8    , KC_9    , KC_0    , KC_BSPC ,
-     KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_HOME ,                         KC_END , KC_Y   , KC_U   , KC_I    , KC_O    , KC_P    , KC_BSLS ,
-     KC_LCTL , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , SY_LBRC ,                         SY_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_PEQL , KC_BSPC   , KC_PPLS   , KC_MINS, KC_N   , KC_M   , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT ,
-     ADJ     , KC_HYPR, KC_MEH ,KC_LCTL ,          A_COMM , KC_LGUI , SC_SENT   , SC_SENT   , SY_SPC , A_DOT  ,          KC_RCTL , KC_PGUP , KC_PGDN , ADJ
-  ),
-
-  [_SYMBOL] = LAYOUT(
-  /* SYMBOL
-   * ,-----------------------------------------.                                    ,-----------------------------------------.
-   * |  ~   |  F1  |  F2  |  F3  |  F4  |  F5  |                                    |  F6  |  F7  |  F8  |  F9  |  F10 | Del  |
-   * |------+------+------+------+------+------|-------.                    ,-------|------+------+------+------+------+------|
-   * |      |   !  |   @  |   {  |   }  |   |  |   F11 |                    |  F12  |   &  |   +  |  up  |      |      |      |
-   * |------+------+------+------+------+------|-------.                    ,-------|------+------+------+------+------+------|
-   * |      |   #  |   $  |   (  |   )  |   `  |       |                    |       |   =  | left | down | right|      |      |
-   * |------+------+------+------+------+------|       |                    |       |------+------+------+------+------+------|
-   * |      |   %  |   ^  |   [  |   ]  |   ~  '----------------,  ,----------------'   *  |   -  |      |      |      |      |
-   * |-----------------------------------------/       /       /    \       \       \-----------------------------------------|
-   * |      |      |      |      |    /       /-------/-------/      \-------\-------\       \    |      |      |      |      |
-   * |      |      |      |      |   /       /       /       /        \       \       \       \   |      |      |      |      |
-   * `---------------------------'  '-------/       /       /          \       \       \-------'  '---------------------------'
-   *                                        '--------------'            '--------------'
-   */
-     KC_TILD , KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5   ,                                         KC_F6   , KC_F7   , KC_F8   , KC_F9   , KC_F10  , KC_DEL  ,
-     _______ , KC_EXLM , KC_AT   , KC_LCBR , KC_RCBR , KC_PIPE , KC_F11  ,                     KC_F12  , KC_AMPR , KC_PPLS , KC_UP   , XXXXXXX , XXXXXXX , XXXXXXX ,
-     _______ , KC_HASH , KC_DLR  , KC_LPRN , KC_RPRN , KC_GRV  , _______ ,                     _______ , KC_PEQL , KC_LEFT , KC_DOWN , KC_RGHT , XXXXXXX , XXXXXXX ,
-     _______ , KC_PERC , KC_CIRC , KC_LBRC , KC_RBRC , KC_TILD , _______ , _______ , _______ , _______ , KC_ASTR , KC_MINS , XXXXXXX , XXXXXXX , XXXXXXX , _______ ,
-     _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ ,           _______ , XXXXXXX , XXXXXXX , _______
-  ),
-
-  [_ADJUST] = LAYOUT(
-  /* ADJUST
-   * ,-----------------------------------------.                                    ,-----------------------------------------.
-   * | RST  |      |      |      |      |      |                                    |      |      |      |      |      | RST  |
-   * |------+------+------+------+------+------|-------.                    ,-------|------+------+------+------+------+------|
-   * |      | Mod+ | H +  | S +  |  V + | Vol+ |       |                    |       |  B + |      |      |      |      |      |
-   * |------+------+------+------+------+------|-------.                    ,-------|------+------+------+------+------+------|
-   * |      | Mod- | H -  | S -  |  V - | Vol- |  RGB  |                    |       |  B - |  <<  | play |  >>  |      |      |
-   * |------+------+------+------+------+------|       |                    |       |------+------+------+------+------+------|
-   * |      |      |      |      |      | Mute '----------------,  ,----------------'      |      |      |      |      |      |
-   * |-----------------------------------------/       /       /    \       \       \-----------------------------------------|
-   * |      |      |      |      |    /       /-------/-------/      \-------\-------\       \    |      |      |      |      |
-   * |      |      |      |      |   /       /       /       /        \       \       \       \   |      |      |      |      |
-   * `---------------------------'  '-------/       /       /          \       \       \-------'  '---------------------------'
-   *                                        '--------------'            '--------------'
-   */
-     EE_CLR  , XXXXXXX  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX ,                                         XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , EE_CLR  ,
-     XXXXXXX , RGB_MOD  , RGB_HUI , RGB_SAI , RGB_VAI , KC_VOLU , XXXXXXX ,                     XXXXXXX , KC_BRIU , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX ,
-     XXXXXXX , RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , KC_VOLD , RGB_TOG ,                     XXXXXXX , KC_BRID , KC_MRWD , KC_MPLY , KC_MFFD , XXXXXXX , XXXXXXX ,
-     XXXXXXX , XXXXXXX  , XXXXXXX , XXXXXXX , XXXXXXX , KC_MUTE , 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/redox/keymaps/cykedev/rules.mk b/keyboards/redox/keymaps/cykedev/rules.mk
deleted file mode 100644
index bc7b7546a8f..00000000000
--- a/keyboards/redox/keymaps/cykedev/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-RGBLIGHT_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-COMMAND_ENABLE  = yes
-MOUSEKEY_ENABLE = no
-LTO_ENABLE      = yes
-NKRO_ENABLE     = yes
\ No newline at end of file
diff --git a/keyboards/redox/keymaps/default/config.h b/keyboards/redox/keymaps/default/config.h
index 2a1801a78f4..ab4d588cb0b 100644
--- a/keyboards/redox/keymaps/default/config.h
+++ b/keyboards/redox/keymaps/default/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14
+#define RGBLIGHT_LED_COUNT 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/redox/keymaps/default/keymap.c b/keyboards/redox/keymaps/default/keymap.c
index ecf3ff4f804..bae5972fc73 100644
--- a/keyboards/redox/keymaps/default/keymap.c
+++ b/keyboards/redox/keymaps/default/keymap.c
@@ -1,19 +1,27 @@
-#include QMK_KEYBOARD_H
+/*
+Copyright 2018 Mattia Dal Ben <matthewdibi@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.
 
-// 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 _SYMB 1
-#define _NAV 2
-#define _ADJUST 3
+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 custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
+enum layers {
+   _QWERTY,
+   _SYMB,
+   _NAV,
+   _ADJUST
 };
 
 // Shortcut to make keymap more readable
diff --git a/keyboards/redox/keymaps/eightbitraptor/config.h b/keyboards/redox/keymaps/eightbitraptor/config.h
deleted file mode 100644
index 045b6a21656..00000000000
--- a/keyboards/redox/keymaps/eightbitraptor/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2018 Mattia Dal Ben <matthewdibi@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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#define RETRO_TAPPING
diff --git a/keyboards/redox/keymaps/eightbitraptor/keymap.c b/keyboards/redox/keymaps/eightbitraptor/keymap.c
deleted file mode 100644
index ab2dd307c81..00000000000
--- a/keyboards/redox/keymaps/eightbitraptor/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QWERTY,
-    _SYMB,
-    _NAV,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
-};
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-#define NAV_L   MO(_NAV)
-
-#define KC_NABS LT(_NAV, KC_BSLS)
-
-#define KC_ADEN LT(_ADJUST, KC_END)
-#define KC_ADPU LT(_ADJUST, KC_PGUP)
-
-#define KC_ECTL MT(MOD_LCTL, KC_ESC)
-#define KC_QCTL MT(MOD_RCTL, KC_QUOT)
-
-// TODO: Can I invert shift presses to invert ' and "?
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     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_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_UNDS ,                          KC_MINS ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_EQL  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ECTL ,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_QCTL ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     NAV_L   ,SYM_L   ,XXXXXXX ,KC_LALT ,     KC_LGUI ,    KC_SPC  ,KC_DEL  ,        KC_ENT  ,KC_BSPC ,    KC_RGUI ,     KC_LALT ,XXXXXXX ,SYM_L   ,KC_NABS
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,KC_PSLS ,KC_P7   ,KC_P8   ,KC_P9   ,KC_PMNS ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,KC_PAST ,KC_P4   ,KC_P5   ,KC_P6   ,KC_PPLS ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_P1   ,KC_P2   ,KC_P3   ,KC_PENT ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_P0   ,     KC_P0   ,KC_PDOT ,KC_PENT ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_MUTE ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,KC_MPRV ,        KC_MNXT ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    KC_BRID ,KC_VOLD ,        KC_VOLU ,KC_BRIU ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/redox/keymaps/eightbitraptor/rules.mk b/keyboards/redox/keymaps/eightbitraptor/rules.mk
deleted file mode 100644
index a81250cdf6d..00000000000
--- a/keyboards/redox/keymaps/eightbitraptor/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/redox/keymaps/fculpo/config.h b/keyboards/redox/keymaps/fculpo/config.h
deleted file mode 100644
index 17260ccd200..00000000000
--- a/keyboards/redox/keymaps/fculpo/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Mattia Dal Ben <matthewdibi@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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-//#define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/redox/keymaps/fculpo/keymap.c b/keyboards/redox/keymaps/fculpo/keymap.c
deleted file mode 100644
index 24c4767869d..00000000000
--- a/keyboards/redox/keymaps/fculpo/keymap.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _SYMB 1
-#define _NAV 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
-};
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTES LCTL_T(KC_ESC)
-#define KC_CTQU RCTL_T(KC_QUOT)
-
-#define KC_NAGR LT(_NAV, KC_GRV)
-#define KC_NAMI LT(_NAV, KC_MINS)
-
-#define KC_ADEN LT(_ADJUST, KC_END)
-#define KC_ADPU LT(_ADJUST, KC_PGUP)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_NAGR ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_NAMI ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,SYM_L   ,                          SYM_L   ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_EQL  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_CTES ,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_CTQU ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     KC_BSLS ,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_LGUI ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,KC_F6   ,                          KC_F7   ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,KC_F12  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,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/redox/keymaps/fculpo/keymap.json b/keyboards/redox/keymaps/fculpo/keymap.json
deleted file mode 100644
index ca7905b1695..00000000000
--- a/keyboards/redox/keymaps/fculpo/keymap.json
+++ /dev/null
@@ -1,399 +0,0 @@
-[
-  {
-    "name": "Redox/rev1",
-    "author": "Fabien Culpo",
-    "switchMount": "cherry",
-    "plate": false,
-    "pcb": false
-  },
-  [
-    {
-      "x": 3.5
-    },
-    "#\n3",
-    {
-      "x": 10.5
-    },
-    "*\n8"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "@\n2",
-    {
-      "x": 1
-    },
-    "$\n4",
-    {
-      "x": 8.5
-    },
-    "&\n7",
-    {
-      "x": 1
-    },
-    "(\n9"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "%\n5",
-    {
-      "x": 6.5
-    },
-    "^\n6"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 0.25,
-      "a": 5,
-      "w": 1.25
-    },
-    "`\nLayer 2\n\n\n\n\n~",
-    {
-      "a": 4
-    },
-    "!\n1",
-    {
-      "x": 14.5
-    },
-    ")\n0",
-    {
-      "a": 5,
-      "w": 1.25
-    },
-    "_\nLayer 2\n\n\n\n\n-"
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6.5
-    },
-    "Layer 1",
-    {
-      "x": 4.5
-    },
-    "Layer 1"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3.5,
-      "a": 4
-    },
-    "E",
-    {
-      "x": 10.5
-    },
-    "I"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "W",
-    {
-      "x": 1
-    },
-    "R",
-    {
-      "x": 8.5
-    },
-    "U",
-    {
-      "x": 1
-    },
-    "O"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "T",
-    {
-      "x": 6.5
-    },
-    "Y"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 0.25,
-      "a": 7,
-      "w": 1.25
-    },
-    "TAB",
-    {
-      "a": 4
-    },
-    "Q",
-    {
-      "x": 14.5
-    },
-    "P",
-    {
-      "a": 5,
-      "w": 1.25
-    },
-    "+\n="
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6.5,
-      "a": 7,
-      "h": 1.5
-    },
-    "[",
-    {
-      "x": 4.5,
-      "h": 1.5
-    },
-    "]"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3.5,
-      "a": 4
-    },
-    "D",
-    {
-      "x": 10.5
-    },
-    "K"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "S",
-    {
-      "x": 1,
-      "n": true
-    },
-    "F",
-    {
-      "x": 8.5,
-      "n": true
-    },
-    "J",
-    {
-      "x": 1
-    },
-    "L"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "G",
-    {
-      "x": 6.5
-    },
-    "H"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 0.25,
-      "a": 5,
-      "w": 1.25
-    },
-    "ESC\nCTRL",
-    {
-      "a": 4
-    },
-    "A",
-    {
-      "x": 14.5
-    },
-    ":\n;",
-    {
-      "a": 5,
-      "w": 1.25
-    },
-    "'\nCTRL"
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5,
-      "a": 4
-    },
-    "C",
-    {
-      "x": 10.5
-    },
-    "<\n,"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "X",
-    {
-      "x": 1
-    },
-    "V",
-    {
-      "x": 8.5
-    },
-    "M",
-    {
-      "x": 1
-    },
-    ">\n."
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5.5
-    },
-    "B",
-    {
-      "x": 6.5
-    },
-    "N"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 0.25,
-      "a": 5,
-      "w": 1.25
-    },
-    "SHIFT",
-    {
-      "a": 4
-    },
-    "Z",
-    {
-      "x": 14.5
-    },
-    "?\n/",
-    {
-      "a": 5,
-      "w": 1.25
-    },
-    "SHIFT"
-  ],
-  [
-    {
-      "y": -0.375,
-      "x": 3.5
-    },
-    "*\nALT",
-    {
-      "x": 10.5
-    },
-    "Left"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2.5
-    },
-    "-",
-    {
-      "x": 12.5
-    },
-    "Down"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 0.5
-    },
-    "|\n\n\n\n\n\n\\",
-    "+",
-    {
-      "x": 14.5
-    },
-    "Up",
-    {
-      "sb": "cherry",
-      "st": "MX1A-21xx"
-    },
-    "Right"
-  ],
-  [
-    {
-      "r": 15,
-      "y": -2.625,
-      "x": 5.75,
-      "a": 7,
-      "w": 1.25
-    },
-    "SUPER"
-  ],
-  [
-    {
-      "r": 30,
-      "rx": 6.5,
-      "ry": 4.25,
-      "y": -1,
-      "a": 5
-    },
-    "PgUp\nLay. 3",
-    {
-      "a": 7
-    },
-    "PgDn"
-  ],
-  [
-    {
-      "h": 1.5
-    },
-    "Bksp",
-    {
-      "h": 1.5
-    },
-    "Del"
-  ],
-  [
-    {
-      "r": -30,
-      "rx": 13,
-      "y": -1,
-      "x": -2
-    },
-    "Home",
-    {
-      "a": 5
-    },
-    "End\nLay. 3"
-  ],
-  [
-    {
-      "x": -2,
-      "a": 7,
-      "h": 1.5
-    },
-    "Enter",
-    {
-      "h": 1.5
-    },
-    "Space"
-  ],
-  [
-    {
-      "r": -15,
-      "rx": 0,
-      "ry": 0,
-      "y": 7.75,
-      "x": 11.75,
-      "w": 1.25
-    },
-    "ALT"
-  ]
-]
diff --git a/keyboards/redox/keymaps/fculpo/readme.md b/keyboards/redox/keymaps/fculpo/readme.md
deleted file mode 100644
index 1250e47b9c9..00000000000
--- a/keyboards/redox/keymaps/fculpo/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# A tweaked keymap for Redox
-
-This keymap modifies the [default keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/redox) for the awesome [Redox keyboard](https://github.com/mattdibi/redox-keyboard) designed by Mattia Dal Ben.
-
-Also heavily inspired by nrichers layout.
-
-![fculpo Layout Image](https://i.imgur.com/OXT8boJ.png)
-
-## Changes to the default keymap
-
-These keymap changes are meant to improve the usability of the layout in everyday use:
-
-- Move `GUI` (`SUPER`) key to where default left `CTRL` is
-- Move `/?` into usual location next to right `SHIFT` - the default flash from Falbatech put `\|` here (might not be the Redox default?), which felt unintuitive
-- Put `\|` into bottom-left spot where `GUI` (`SUPER`) was - had to go somewhere and this bottom-left placement sort of balances with the almost bottom-right `/?`
-- Change default `ESC` into `ESC` on tap, `CTRL` on hold - Love the UNIX-ey `CTRL` key location and wanted to keep `ESC` in the original position
-- Change default `'` above right `SHIFT` into `'` on tap, `CTRL` on hold - Love the UNIX-ey CTRL key location, but it can give you 'left claw hand', which a second, mirrored `CTRL` key fixes
-- Add `F11` and `F12` keys to two layers - needed on macOS if you want to control volume up and down from your keyboard (not shown, on a different layer)S
diff --git a/keyboards/redox/keymaps/fculpo/rules.mk b/keyboards/redox/keymaps/fculpo/rules.mk
deleted file mode 100644
index a81250cdf6d..00000000000
--- a/keyboards/redox/keymaps/fculpo/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/redox/keymaps/finex/config.h b/keyboards/redox/keymaps/finex/config.h
deleted file mode 100644
index e65e6100462..00000000000
--- a/keyboards/redox/keymaps/finex/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2018 Leonardo (FiNeX) Finetti <finex@finex.org>
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-// #define PERMISSIVE_HOLD
-#define TAPPING_TERM 200
diff --git a/keyboards/redox/keymaps/finex/keymap.c b/keyboards/redox/keymaps/finex/keymap.c
deleted file mode 100644
index 9057dee0744..00000000000
--- a/keyboards/redox/keymaps/finex/keymap.c
+++ /dev/null
@@ -1,386 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Layer names
-enum{
-  // - Base layers:
-  _COLEMAKDHMK,
-  _COLEMAKDHMK_MAC,
-  _QWERTY,
-  _QWERTY_MAC,
-  // - Symbols, numbers, functions and custom shifts:
-  _SYMB,
-  _NUMB,
-  _FUNC,
-  _RHSH, // Righ hand shifted keycodes
-  _LHSH, // Left hand shifted keycodes
-  // - Adjust layer:
-  _ADJUST
-};
-
-// Custom keycodes
-enum custom_keycodes {
-  COLEMAKDHMK = SAFE_RANGE,
-  COLEMAKDHMK_MAC,
-  QWERTY,
-  QWERTY_MAC,
-  ASC_SAR,
-  ASC_DAR,
-  ASC_SQT,
-  ASC_DQT,
-  ASC_CIRC,
-  ASC_TILD,
-  ASC_HAP,
-  ASC_SAD,
-  ASC_BKT,
-  ASC_CBRL,
-  ASC_CBRR
-};
-
-// Tap dance keycodes
-enum tap_dance{
-  TD_SCLN, // ;; -> :
-  TD_LBRC, // [[ -> {
-  TD_RBRC, // ]] -> }
-  TD_QMRK  // // -> ?
-};
-
-// Semicolon to Colon
-void dance_scln_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code (KC_SCLN);
-  } else {
-    register_code (KC_RSFT);
-    register_code (KC_SCLN);
-  }
-}
-void dance_scln_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_SCLN);
-  } else {
-    unregister_code (KC_RSFT);
-    unregister_code (KC_SCLN);
-  }
-}
-
-// Square braket to curly bracket (left)
-void dance_lbrc_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code (KC_LBRC);
-  } else {
-    register_code (KC_RSFT);
-    register_code (KC_LBRC);
-  }
-}
-void dance_lbrc_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_LBRC);
-  } else {
-    unregister_code (KC_RSFT);
-    unregister_code (KC_LBRC);
-  }
-}
-
-// Square braket to curly bracket (right)
-void dance_rbrc_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code (KC_RBRC);
-  } else {
-    register_code (KC_RSFT);
-    register_code (KC_RBRC);
-  }
-}
-void dance_rbrc_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_RBRC);
-  } else {
-    unregister_code (KC_RSFT);
-    unregister_code (KC_RBRC);
-  }
-}
-
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_SCLN]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_scln_finished, dance_scln_reset),
-  [TD_LBRC]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_lbrc_finished, dance_lbrc_reset),
-  [TD_RBRC]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_rbrc_finished, dance_rbrc_reset)
-};
-
-
-// Shortcut to make keymap more readable
-
-// - Adjustment Layer:
-#define KC_ADEN LT(_ADJUST, KC_END)   // End / _ADJUST layer
-#define KC_ADPU LT(_ADJUST, KC_PGUP)  // Page Up / _ADJUST layer
-
-// - Custom layers:
-#define KC_SYSP LT(_SYMB, KC_SPC)     // Space / _symbols
-#define KC_NUES LT(_NUMB, KC_ESC)     // Esc / _numbers
-#define KC_FUTA LT(_FUNC, KC_TAB)     // Tab / _functions
-#define KC_N_SH LT(_LHSH, KC_N)       // Pressing N key, enable shifted keys on other half (the left one)
-#define KC_T_SH LT(_RHSH, KC_T)       // Pressing T key, enable shifted keys on other half (the right one)
-
-// - Custom keys/modifiers:
-#define KC_ATAB RALT_T(KC_TAB)        // - Tab / Alt Gr
-#define KC_CESC LCTL_T(KC_ESC)        // - Esc / Left Ctrl
-#define KC_GSPC LGUI_T(KC_SPC)        // - Space / Left GUI
-#define KC_CBSP LCTL_T(KC_BSPC)       // - Backspace / Left Ctrl
-
-// -- Mac os mode:
-#define KC_CSPC LCTL_T(KC_SPC)        // - Space / Left Ctrl
-#define KC_GBSP LGUI_T(KC_BSPC)       // - Backspace / Left GUI
-
-
-#define KC_AEQL LALT_T(KC_EQL)        // - Equals / Alt (left alt)
-#define KC_CMIN RCTL_T(KC_MINUS)      // - Minus / Right Ctrl
-#define KC_ADEL RALT_T(KC_DEL)        // - Del / Alt Gr
-#define KC_RSEN RSFT_T(KC_ENT)        // - Enter / Right Shift (standard shift)
-#define KC_LAEN LALT_T(KC_ENT)        // - Enter / Left Alt
-
-// Home row mod tap keys:
-// - Left hand
-#define KC_CT_A CTL_T(KC_A)           // A / Left Ctrl
-#define KC_AL_S ALT_T(KC_S)           // S / Left Alt
-// - Right hand
-#define KC_AL_E ALT_T(KC_E)           // E / Left Alt
-#define KC_CT_O CTL_T(KC_O)           // O / Left Ctrl
-
-// - Tap dance:
-#define KC_TDSC TD(TD_SCLN)           // ;; -> :
-#define KC_TDLB TD(TD_LBRC)           // [[ -> {
-#define KC_TDRB TD(TD_RBRC)           // ]] -> }
-
-// - Keyboard base maps:
-#define LR1 COLEMAKDHMK
-#define LR2 COLEMAKDHMK_MAC
-#define LR3 QWERTY
-#define LR4 QWERTY_MAC
-
-
-// Send custom strings or change default base layer
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case ASC_SAR:
-        SEND_STRING("->");
-        return false;
-      case ASC_DAR:
-        SEND_STRING("=>");
-        return false;
-      case ASC_SQT:
-        // SS_RALT(): Avoid sending dead key on software intl layouts
-        SEND_STRING(SS_RALT("'"));
-        return false;
-      case ASC_DQT:
-        // SS_RALT(SS_LSFT()): Avoid sending dead key on software intl layouts
-        SEND_STRING(SS_RALT(SS_LSFT("\"")));
-        return false;
-      case ASC_CIRC:
-        // SS_RALT(): Avoid sending dead key on software intl layouts
-        SEND_STRING(SS_RALT("^"));
-        return false;
-      case ASC_TILD:
-        // SS_RALT(SS_LSFT()): Avoid sending dead key on software intl layouts
-        SEND_STRING(SS_RALT(SS_LSFT("~")));
-        return false;
-      case ASC_HAP:
-        SEND_STRING(":-) ");
-        return false;
-      case ASC_SAD:
-        SEND_STRING(":-( ");
-        return false;
-      case ASC_BKT:
-        // SS_RALT(): Avoid sending dead key on software intl layouts
-        SEND_STRING(SS_RALT("`"));
-        return false;
-      case ASC_CBRL:
-        SEND_STRING("{");
-        return false;
-      case ASC_CBRR:
-        SEND_STRING("}");
-        return false;
-      case QWERTY:
-        if (record->event.pressed) {
-          set_single_persistent_default_layer(_QWERTY);
-        }
-        return false;
-        break;
-      case COLEMAKDHMK:
-        if (record->event.pressed) {
-          set_single_persistent_default_layer(_COLEMAKDHMK);
-        }
-        return false;
-        break;
-      case QWERTY_MAC:
-        if (record->event.pressed) {
-          set_single_persistent_default_layer(_QWERTY_MAC);
-        }
-        return false;
-        break;
-      case COLEMAKDHMK_MAC:
-        if (record->event.pressed) {
-          set_single_persistent_default_layer(_COLEMAKDHMK_MAC);
-        }
-        return false;
-        break;
-    }
-  }
-  return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // Colemak DH-MK Mod
-  [_COLEMAKDHMK] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       XXXXXXX ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_ESC  ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_ATAB ,KC_Q    ,KC_W    ,KC_F    ,KC_P    ,KC_B    ,XXXXXXX ,                          XXXXXXX ,KC_J    ,KC_L    ,KC_U    ,KC_Y    ,KC_TDSC ,KC_AEQL ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_CESC ,KC_A    ,KC_R    ,KC_AL_S ,KC_T_SH ,KC_G    ,KC_TDLB ,                          KC_TDRB ,KC_M    ,KC_N_SH ,KC_AL_E ,KC_I    ,KC_O    ,KC_CMIN ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_D    ,KC_V    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_K    ,KC_H    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
-    //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-       KC_GSPC ,KC_HYPR ,KC_MEH  ,XXXXXXX ,     KC_NUES ,    KC_CBSP ,KC_FUTA ,        KC_LAEN ,KC_SYSP ,    KC_ADEL ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-    //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  // Colemak DH-MK Mod, Mac version (CTRL and GUI are swapped)
-  [_COLEMAKDHMK_MAC] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       XXXXXXX ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_ESC  ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_ATAB ,KC_Q    ,KC_W    ,KC_F    ,KC_P    ,KC_B    ,XXXXXXX ,                          XXXXXXX ,KC_J    ,KC_L    ,KC_U    ,KC_Y    ,KC_TDSC ,KC_AEQL ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_CESC ,KC_A    ,KC_R    ,KC_AL_S ,KC_T_SH ,KC_G    ,KC_TDLB ,                          KC_TDRB ,KC_M    ,KC_N_SH ,KC_AL_E ,KC_I    ,KC_O    ,KC_CMIN ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_D    ,KC_V    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_K    ,KC_H    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
-    //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-       KC_CSPC ,KC_HYPR ,KC_MEH  ,XXXXXXX ,     KC_NUES ,    KC_GBSP ,KC_FUTA ,        KC_LAEN ,KC_SYSP ,    KC_ADEL ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-    //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  // QWERTY
-  [_QWERTY] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       XXXXXXX ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_ESC  ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_ATAB ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,XXXXXXX ,                          XXXXXXX ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_AEQL ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_CESC ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_TDLB ,                          KC_TDRB ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_TDSC ,KC_CMIN ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
-    //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-       KC_GSPC ,KC_HYPR ,KC_MEH  ,XXXXXXX ,     KC_NUES ,    KC_CBSP ,KC_FUTA ,        KC_LAEN ,KC_SYSP ,    KC_ADEL ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-    //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  // QWERTY, Mac version (CTRL and GUI are swapped)
-  [_QWERTY_MAC] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       XXXXXXX ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_ESC  ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_ATAB ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,XXXXXXX ,                          XXXXXXX ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_AEQL ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       KC_CESC ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_TDLB ,                          KC_TDRB ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_TDSC ,KC_CMIN ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       SC_LSPO ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,SC_RSPC ,
-    //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-       KC_CSPC ,KC_HYPR ,KC_MEH  ,XXXXXXX ,     KC_NUES ,    KC_GBSP ,KC_FUTA ,        KC_LAEN ,KC_SYSP ,    KC_ADEL ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-    //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  // Symbols, home row arrows, function keys and macros layer
-  [_SYMB] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,_______ ,                          _______ ,ASC_CIRC,KC_AMPR ,KC_ASTR ,KC_PLUS ,_______ ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,KC_PIPE ,KC_PMNS ,ASC_SQT ,ASC_DQT ,KC_GRV  ,ASC_SAR ,                          ASC_DAR ,KC_QUOT ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,KC_BSLS ,KC_UNDS ,KC_COLN ,ASC_TILD,KC_EQL  ,ASC_SAD ,ASC_HAP ,        _______ ,_______ ,ASC_BKT ,KC_PGUP ,KC_PGDN ,KC_HOME ,KC_END  ,_______ ,
-    //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    _______ ,     _______ ,_______ ,_______ ,_______
-    //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  // Numeric keypad layer
-  [_NUMB] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,KC_PAST ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,KC_PPLS ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,KC_PMNS ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,KC_PSLS ,_______ ,
-    //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    XXXXXXX ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
-    //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  // Function layer and some extra keys on right hand
-  [_FUNC] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F12  ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,KC_F4   ,KC_F5   ,KC_F6   ,KC_F11  ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,KC_PSCR ,KC_NUM  ,KC_INS  ,KC_CAPS ,KC_APP  ,_______ ,_______ ,        _______ ,_______ ,_______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F10  ,_______ ,
-    //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    _______ ,     _______ ,_______ ,_______ ,_______
-    //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-
-  // Left hand shifted keycodes
-  [_LHSH] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,S(KC_Q) ,S(KC_W) ,S(KC_F) ,S(KC_P) ,S(KC_B) ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,S(KC_A) ,S(KC_R) ,S(KC_S) ,S(KC_T) ,S(KC_G) ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,S(KC_Z) ,S(KC_X) ,S(KC_C) ,S(KC_D) ,S(KC_V) ,_______ ,_______ ,        _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-    //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        KC_TAB  ,KC_BSPC ,    KC_ESC  ,     _______ ,_______ ,_______ ,_______
-    //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  // Right hand shifted keycodes
-  [_RHSH] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,S(KC_J) ,S(KC_L) ,S(KC_U) ,S(KC_Y) ,KC_COLN ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,S(KC_M) ,S(KC_N) ,S(KC_E) ,S(KC_I) ,S(KC_O) ,_______ ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,        _______ ,_______ ,S(KC_K) ,S(KC_H) ,KC_LABK ,KC_RABK ,KC_QUES ,_______ ,
-    //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-       _______ ,_______ ,_______ ,_______ ,     KC_DEL  ,    KC_SPC  ,KC_ENT  ,        _______ ,_______ ,    _______ ,     _______ ,_______ ,_______ ,_______
-    //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  // Adjust layer (RGB, Reset and base layer switch)
-  [_ADJUST] = LAYOUT(
-    //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-       XXXXXXX ,LR1     ,LR2     ,LR3     ,LR4     ,XXXXXXX ,                                            XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       XXXXXXX ,XXXXXXX ,RGB_M_B ,RGB_M_R ,RGB_M_SW,RGB_M_SN,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-       XXXXXXX ,XXXXXXX ,RGB_M_K ,RGB_M_X ,RGB_M_G ,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/redox/keymaps/finex/readme.md b/keyboards/redox/keymaps/finex/readme.md
deleted file mode 100644
index ae092e8064a..00000000000
--- a/keyboards/redox/keymaps/finex/readme.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Customized keymap for Redox by Leonardo (FiNeX) Finetti.
-
-
-## Features
-
-- PC Layouts: Colemak Mod DH-MK, Qwerty.
-- Mac Layouts: same as above with CTRL-GUI keys inverted.
-- Added redundant `Space`, `Esc`, `Ctrl` and `Enter` keys. I like to have this
-  keys on both halves.
-- Added macro to print `->` and `=>` strings.
-- Added macro to print `:-( ` and `:-) ` strings.
-- Added more arrows.
-- Added `(` and `)` on Shifts keys.
-- Tapdance: `:` (`;` × 2), `{` (`[` × 2), `}` (`]` × 2).
-- Removed Mouse and media support.
-- Added missing "Print Screen" and "Menu" keys.
-- Added missing "F11" and "F12" keys.
-- Added `Alt` modifier on home row.
-- Added `Shift other half` on home keys: this allows to shift the right half
-pressing `t` on the left (or `f` using Qwerty), and the opposite pressing `n`
-(or `j` for Qwerty layout).
-
-
-## Description
-
-This keymap use the default one with some changes to suit my needs. Mainly
-having most used symbol on a separated layer copying the common symbols on the
-number keys on the second row and adding other symbols and ``|´` dead keys for
-accents.
-
-
-## Main Keyboard Layout
-
-[TODO]
-
-
-## Changelog
-
-- 2018/11/13
-  First public release.
-- 2018/12/04
-  Added Caps Lock, Num Lock and Insert on Symbols Layout. Inverted KC_GRV and
-  KC_QUOT on Symbols Layout. Added "Toggle Symbols Layout" and "Momentarily
-  activates Symbols Layout" on bottom row. Added Space/Control on left bottom
-  corner: now both halves contains Enter and Space keys.
-- 2018/12/23
-  Moved around modifiers key.
-  Added MEH and HYPER keys.
-  Improved symbols layout.
-  Rearranged layers.
-- 2019/01/04
-  Added new layer with numeric keypad and rearranged symbols.
-- 2019/01/26
-  Added curly brackets on own keys (normally unused).
-  Added tap dance for testing purpose.
-  Minor fixes.
-- 2019/02/25
-  Major layouts upgrade, partially inspired by Steven Hum's Beakl layouts.
-- 2019/03/17
-  Aligned qwerty and mac to main layout.
-
-
-## TODO
-
-- Bring back mouse and multimedia keys.
-- Add default Colemak Mod DH layout.
-- Improve top corner keys.
-- Improve bottom row keys.
-- Improve README.md
diff --git a/keyboards/redox/keymaps/finex/rules.mk b/keyboards/redox/keymaps/finex/rules.mk
deleted file mode 100644
index f248688fb49..00000000000
--- a/keyboards/redox/keymaps/finex/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = yes
-COMMAND_ENABLE = no
-KEY_LOCK_ENABLE = yes
-TAP_DANCE_ENABLE=yes
diff --git a/keyboards/redox/keymaps/german/config.h b/keyboards/redox/keymaps/german/config.h
deleted file mode 100644
index cfb2a9378a7..00000000000
--- a/keyboards/redox/keymaps/german/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2018 Mattia Dal Ben <matthewdibi@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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/redox/keymaps/german/keymap.c b/keyboards/redox/keymaps/german/keymap.c
deleted file mode 100644
index 2ccd4b16783..00000000000
--- a/keyboards/redox/keymaps/german/keymap.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#include "keymap_german.h"
-
-extern keymap_config_t keymap_config;
-extern rgblight_config_t rgblight_config;
-
-// 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 _SYMB 1
-#define _NAV 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
-};
-
-// Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLS
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTPL LCTL_T(KC_PSLS)
-
-#define KC_NAGR LT(_NAV, DE_CIRC)
-#define KC_NAMI LT(_NAV, DE_SS)
-
-#define KC_ADEN LT(_ADJUST, KC_END)
-#define KC_ADPU LT(_ADJUST, KC_PGUP)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_NAGR ,DE_1    ,DE_2    ,DE_3    ,DE_4    ,DE_5    ,                                            DE_6    ,DE_7    ,DE_8    ,DE_9    ,DE_0    ,KC_NAMI ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,DE_Q    ,DE_W    ,DE_E    ,DE_R    ,DE_T    ,SYM_L   ,                          SYM_L   ,DE_Z    ,DE_U    ,DE_I    ,DE_O    ,DE_P    ,DE_UDIA ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ESC  ,DE_A    ,DE_S    ,DE_D    ,DE_F    ,DE_G    ,DE_ACUT ,                          DE_PLUS ,DE_H    ,DE_J    ,DE_K    ,DE_L    ,DE_ODIA ,DE_ADIA ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,DE_Y    ,DE_X    ,DE_C    ,DE_V    ,DE_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,DE_N    ,DE_M    ,DE_COMM ,DE_DOT  ,DE_MINS ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     KC_LGUI ,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_CTPL ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,DE_EXLM ,DE_AT   ,DE_LCBR ,DE_RCBR ,DE_PIPE ,_______ ,                          _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,KC_F12  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,DE_HASH ,DE_DLR  ,DE_LBRC ,DE_RBRC ,DE_TILD ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,DE_PERC ,DE_CIRC ,DE_LPRN ,DE_RPRN ,DE_GRV  ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,KC_LALT ,     KC_LCTL ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,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/redox/keymaps/german/readme.md b/keyboards/redox/keymaps/german/readme.md
deleted file mode 100644
index 91bc230fca6..00000000000
--- a/keyboards/redox/keymaps/german/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# German keymap for Redox
-
-The layout acommodates the German umlauts and the punctuation symbols
-at their usual positions relative to the other alphabetic characters.
-Apart from that it stays close to the default english redox layout. 
diff --git a/keyboards/redox/keymaps/german/rules.mk b/keyboards/redox/keymaps/german/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/redox/keymaps/german/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/redox/keymaps/italian/config.h b/keyboards/redox/keymaps/italian/config.h
deleted file mode 100644
index cfb2a9378a7..00000000000
--- a/keyboards/redox/keymaps/italian/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2018 Mattia Dal Ben <matthewdibi@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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/redox/keymaps/italian/keymap.c b/keyboards/redox/keymaps/italian/keymap.c
deleted file mode 100644
index 6b3cdd5475c..00000000000
--- a/keyboards/redox/keymaps/italian/keymap.c
+++ /dev/null
@@ -1,102 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#include "keymap_italian.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 _SYMB 1
-#define _NAV 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
-};
-
-// Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLS
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTPL LCTL_T(KC_PSLS)
-
-#define KC_NAGR LT(_NAV, KC_GRV)
-#define KC_NAMI LT(_NAV, KC_MINS)
-
-#define KC_ADEN LT(_ADJUST, KC_END)
-#define KC_ADPU LT(_ADJUST, KC_PGUP)
-
-// Italian specific shortcuts
-#define ALT_IACC RALT_T(IT_IGRV)
-#define GUI_LESS LGUI_T(IT_LABK)
-
-#define IT_SHSL  RSFT_T(KC_SLSH)
-#define IT_GRV   RALT(KC_MINS)
-#define IT_TILD  RALT(KC_EQL)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_NAGR ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_NAMI ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,SYM_L   ,                          SYM_L   ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,IT_EGRV ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ESC  ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,IT_LBRC ,                          IT_RBRC ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,IT_OGRV ,IT_AGRV ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,IT_UGRV ,IT_SHSL ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     GUI_LESS,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_CTPL ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    ALT_IACC,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,IT_EXLM ,IT_AT   ,IT_LCBR ,IT_RCBR ,IT_PIPE ,_______ ,                          _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,IT_HASH ,IT_DLR  ,IT_LBRC ,IT_RBRC ,IT_GRV  ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,IT_PERC ,IT_CIRC ,IT_LPRN ,IT_RPRN ,IT_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,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/redox/keymaps/italian/readme.md b/keyboards/redox/keymaps/italian/readme.md
deleted file mode 100644
index 85b48fdb6f9..00000000000
--- a/keyboards/redox/keymaps/italian/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The italian keymap for Redox
diff --git a/keyboards/redox/keymaps/italian/rules.mk b/keyboards/redox/keymaps/italian/rules.mk
deleted file mode 100644
index a81250cdf6d..00000000000
--- a/keyboards/redox/keymaps/italian/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/redox/keymaps/jeherve/config.h b/keyboards/redox/keymaps/jeherve/config.h
deleted file mode 100644
index 689e8f6e4df..00000000000
--- a/keyboards/redox/keymaps/jeherve/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 Jeremy Herve <jeremy@jeremy.hu>
-
-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
-
-/* Change the default tapping toggle value (normally 5) */
-#define TAPPING_TOGGLE 2
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
-/* Set Unicode mode by default */
-#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS
-
-/* Custom startup sound */
-#ifdef AUDIO_ENABLE
-#    define STARTUP_SONG SONG(ZELDA_PUZZLE)
-#endif
diff --git a/keyboards/redox/keymaps/jeherve/keymap.c b/keyboards/redox/keymaps/jeherve/keymap.c
deleted file mode 100644
index 35958221bb3..00000000000
--- a/keyboards/redox/keymaps/jeherve/keymap.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
-Copyright 2021 Jeremy Herve <jeremy@jeremy.hu>
-
-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.
-#define _COLEMAK 0
-#define _SYMB 1
-#define _NAV 2
-#define _INTER 3
-#define _ADJUST 4
-
-// Define song.
-#ifdef AUDIO_ENABLE
-float tone_zelda[][2] = SONG(ZELDA_TREASURE);
-#endif
-
-enum custom_keycodes {
-    COLEMAK = SAFE_RANGE,
-    SYMB,
-    NAV,
-    INTER,
-    ADJUST,
-    // These use process_record_user()
-    M_BRACKET_LEFT,
-    M_BRACKET_RIGHT,
-    SHRUG,
-    WAVE,
-    YOSHI,
-    THUMB_UP,
-    INV_1P,
-    ALFRED
-};
-
-// Is shift being held? Let's store this in a bool.
-static bool shift_held = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case SHRUG:
-            if (record->event.pressed) {
-                send_unicode_string("¯\\_(ツ)_/¯");
-            }
-            return false;
-            break;
-        case INV_1P:
-            if (record->event.pressed) {
-                SEND_STRING(SS_DOWN(X_LGUI) SS_DOWN(X_LALT) SS_TAP(X_BACKSLASH) SS_UP(X_LGUI) SS_UP(X_LALT));
-            }
-            return false;
-            break;
-        case ALFRED:
-            if (record->event.pressed) {
-                SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_SPACE) SS_UP(X_LALT));
-            }
-            return false;
-            break;
-        case YOSHI:
-            if (record->event.pressed) {
-#ifdef AUDIO_ENABLE
-                PLAY_SONG(tone_zelda);
-#endif
-                SEND_STRING(":yellow_yoshi:");
-            }
-            return false;
-            break;
-        case THUMB_UP:
-            if (record->event.pressed) {
-                register_unicode(0x1F44D);
-            }
-            return false;
-            break;
-        case WAVE:
-            if (record->event.pressed) {
-                register_unicode(0x1F44B);
-            }
-            return false;
-            break;
-        case KC_LSFT:
-            shift_held = record->event.pressed;
-            return true;
-            break;
-        case KC_RSFT:
-            shift_held = record->event.pressed;
-            return true;
-            break;
-        case M_BRACKET_LEFT: {
-            if (record->event.pressed) {
-                if (shift_held) {
-                    unregister_code(KC_LSFT);
-                    unregister_code(KC_RSFT);
-                    register_code(KC_LBRC);
-                } else {
-                    register_code(KC_LSFT);
-                    register_code(KC_9);
-                }
-            } else {  // Release the key
-                unregister_code(KC_LBRC);
-                unregister_code(KC_LSFT);
-                unregister_code(KC_RSFT);
-                unregister_code(KC_9);
-            }
-            return false;
-            break;
-        }
-        case M_BRACKET_RIGHT: {
-            if (record->event.pressed) {
-                if (shift_held) {
-                    unregister_code(KC_LSFT);
-                    unregister_code(KC_RSFT);
-                    register_code(KC_RBRC);
-                } else {
-                    register_code(KC_LSFT);
-                    register_code(KC_0);
-                }
-            } else {  // Release the key
-                unregister_code(KC_RBRC);
-                unregister_code(KC_LSFT);
-                unregister_code(KC_RSFT);
-                unregister_code(KC_0);
-            }
-            return false;
-            break;
-        }
-    }
-    return true;
-};
-
-// Shortcut to make keymap more readable
-#define KC_SYQT LT(_SYMB, KC_QUOT)
-#define SYM_L   MO(_SYMB)
-#define MO_INTR MO(_INTER)
-#define TT_ADJ  TT(_ADJUST)
-
-#define UC_00E0 UC(0x00E0)
-#define UC_00FC UC(0x00FC)
-#define UC_00E8 UC(0x00E8)
-#define UC_00F6 UC(0x00F6)
-#define UC_00E1 UC(0x00E1)
-#define UC_00F9 UC(0x00F9)
-#define UC_00E9 UC(0x00E9)
-#define UC_00ED UC(0x00ED)
-#define UC_00F3 UC(0x00F3)
-#define UC_00E2 UC(0x00E2)
-#define UC_00E7 UC(0x00E7)
-#define UC_0171 UC(0x0171)
-#define UC_00EA UC(0x00EA)
-#define UC_0151 UC(0x0151)
-// Non-breaking space.
-#define UC_00A0 UC(0x00a0)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_COLEMAK] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_EQL  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_F    ,KC_P    ,KC_G    ,KC_ESC  ,                           INV_1P ,KC_J    ,KC_L    ,KC_U    ,KC_Y    ,KC_SCLN ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     SYM_L   ,KC_A    ,KC_R    ,KC_S    ,KC_T    ,KC_D    ,M_BRACKET_LEFT,            M_BRACKET_RIGHT ,KC_H    ,KC_N    ,KC_E    ,KC_I    ,KC_O    ,KC_SYQT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,TT(_NAV),TT(_SYMB),      TT(_SYMB),TT(_NAV),KC_K    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     MO_INTR ,KC_LCTL ,KC_HYPR ,KC_LALT ,     KC_LCMD ,    KC_BSPC ,KC_LCTL ,        KC_ENT  ,KC_SPC  ,    ALFRED  ,     TT_ADJ  ,KC_HYPR ,KC_RCTL ,MO_INTR
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,_______ ,                          _______ ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,KC_LCBR ,                          KC_RCBR ,KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_MINS ,KC_UNDS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,KC_TILD ,KC_GRV , _______ ,_______ ,_______ ,        _______ ,_______ ,_______ ,KC_EQL  ,KC_PLUS ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    _______ ,     _______ ,_______ ,_______ ,_______
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_VOLD ,KC_VOLU ,KC_MUTE ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,_______ ,        _______ ,XXXXXXX ,    XXXXXXX ,     _______ ,XXXXXXX ,XXXXXXX ,_______
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_INTER] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,UC_00E0 ,WAVE    ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,UC_00FC ,UC_00E8 ,YOSHI   ,UC_00F6 ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,UC_00E1 ,XXXXXXX ,SHRUG   ,THUMB_UP,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,UC_00F9 ,UC_00E9 ,UC_00ED ,UC_00F3 ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,UC_00E2 ,XXXXXXX ,UC_00E7 ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,UC_0171 ,UC_00EA ,XXXXXXX ,UC_0151 ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,_______ ,        _______ ,UC_00A0 ,    XXXXXXX ,     _______ ,XXXXXXX ,XXXXXXX ,_______
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_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 ,RGB_VAD ,RGB_VAI ,RGB_TOG ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,QK_BOOT ,DB_TOGG ,AU_TOGG ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,_______ ,        _______ ,XXXXXXX ,    XXXXXXX ,     _______ ,XXXXXXX ,XXXXXXX ,_______
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  )
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-// Change LED colors depending on the layer.
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _SYMB:
-            rgblight_setrgb(RGB_ORANGE);
-            break;
-        case _NAV:
-            rgblight_setrgb(RGB_SPRINGGREEN);
-            break;
-        case _INTER:
-            rgblight_setrgb(RGB_TEAL);
-            break;
-        case _ADJUST:
-            rgblight_setrgb(RGB_RED);
-            break;
-        default:  //  for any other layers, or the default layer
-            rgblight_setrgb(RGB_YELLOW);
-            break;
-    }
-    return state;
-};
diff --git a/keyboards/redox/keymaps/jeherve/readme.md b/keyboards/redox/keymaps/jeherve/readme.md
deleted file mode 100644
index 72ed31919ba..00000000000
--- a/keyboards/redox/keymaps/jeherve/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# A Colemak keymap for the Redox keyboard
-
-----
-![jeherve-redox-layout-5](https://user-images.githubusercontent.com/426388/116534030-56f67600-a8e2-11eb-9bf3-3ce5362d717a.png)
-
-----
-
-This keymap is **a work in progress**, and is meant to be used on macOS, with the "Unicode Hex Input" keyboard input.
-
-![macOS keyboard input setting](https://user-images.githubusercontent.com/426388/43962498-1ee9e3fc-9cb8-11e8-88e3-dbb068ec5c67.png)
-
-I may change a lot of the keys over the next few months, and will update this repo when I do so.
-
-[View on KLE](http://www.keyboard-layout-editor.com/#/gists/3d5368842d87a8462c8f95d4382c4a19)
-
-## Layers
-
-My keymap uses 5 layers:
-
-1. The default base layer, using [Colemak](https://colemak.com/).
-2. A Symbol layer, so all symbols can be accessed from the home row. (top right legends)
-3. A Navigation / Media layer, with both sound control and arrows on the home row. (bottom right legends)
-4. An international / Emoji layer so I can type accented characters commonly used in France and in Hungary, as well as a few Emoji I often use. (top center legends)
-5. A keyboard control layer, not pictured above, allowing me to control the LED lighting as well as the keyboard debug functions.
-
-## Changelog
-
-- 2021.04.29
-	- Update code to replace deprecated code.
-	- Fix non-breaking space key.
-- 2018.12.20
-	- 2 new Macro keys, to invoke [Alfred](https://www.alfredapp.com/) and [1Password](https://1password.com/).
-	- No more Right Command key or Expose key, I didn't use those much.
-	- Updates to use newer QMK function to call ¯\_(ツ)_/¯
-	- Fix: you can now move back to the base layer when double tapping the thumb keys to switch to the Nav layer. 👍
-- 2018.09.06
-	- Initial submission to QMK. It's alive! ⌨️
-
-## Credits
-
-- Redox keyboard design by [Mattia Dal Ben](https://github.com/mattdibi/redox-keyboard).
-- This keymap is based off the default keymap for the Redox keyboard, available [here](https://github.com/qmk/qmk_firmware/tree/master/keyboards/redox) and also build by Mattia Dal Ben (thank you!).
-- This layout uses [QMK keyboard controller firmware](https://github.com/qmk/qmk_firmware/).
-
-I've also read posts by [Gergely Nagy](https://asylum.madhouse-project.org/blog/2016/10/15/multi-purpose-keys/), [Rebecca Le](https://sevenseacat.net/posts/2018/unicode-in-qmk-on-osx/), and [Justin Rogers](https://implementsblog.com/2016/10/16/my-ergodox-ezs-custom-layout/#comments) for inspiration.
diff --git a/keyboards/redox/keymaps/jeherve/rules.mk b/keyboards/redox/keymaps/jeherve/rules.mk
deleted file mode 100644
index ac2496b8c96..00000000000
--- a/keyboards/redox/keymaps/jeherve/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-UNICODE_ENABLE = yes
-AUDIO_ENABLE = yes
diff --git a/keyboards/redox/keymaps/nrichers/config.h b/keyboards/redox/keymaps/nrichers/config.h
deleted file mode 100755
index cfb2a9378a7..00000000000
--- a/keyboards/redox/keymaps/nrichers/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2018 Mattia Dal Ben <matthewdibi@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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/redox/keymaps/nrichers/keymap.c b/keyboards/redox/keymaps/nrichers/keymap.c
deleted file mode 100755
index cfe6895cdeb..00000000000
--- a/keyboards/redox/keymaps/nrichers/keymap.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _SYMB 1
-#define _NAV 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
-};
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTES LCTL_T(KC_ESC)
-#define KC_CTQU RCTL_T(KC_QUOT)
-
-#define KC_NAGR LT(_NAV, KC_GRV)
-#define KC_NAMI LT(_NAV, KC_MINS)
-
-#define KC_ADEN LT(_ADJUST, KC_END)
-#define KC_ADPU LT(_ADJUST, KC_PGUP)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_NAGR ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_NAMI ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,SYM_L   ,                          SYM_L   ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_EQL  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_CTES ,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_CTQU ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     KC_BSLS ,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_LGUI ,    KC_SPC  ,KC_BSPC ,        KC_DEL  ,KC_ENT  ,    KC_RGUI ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,KC_F12  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,KC_F12  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,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/redox/keymaps/nrichers/readme.md b/keyboards/redox/keymaps/nrichers/readme.md
deleted file mode 100755
index 6189e8e9b26..00000000000
--- a/keyboards/redox/keymaps/nrichers/readme.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# A tweaked keymap for Redox
-
-This keymap modifies the [default keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/redox) for the awesome [Redox keyboard](https://github.com/mattdibi/redox-keyboard) designed by Mattia Dal Ben.
-
-![Modified Redox keymap](https://github.com/nrichers/qmk_firmware/blob/master/keyboards/redox/keymaps/nrichers/keymap.png)
-
-## Changes to the default keymap ![#99fcbe](https://placehold.it/15/99fcbe/000000?text=+)
-
-These keymap changes are meant to improve the usability of the layout in everyday use:
-
-- Move `GUI` (`SUPER`) key to where default left `CTRL` and right `ALT` are - gives you two frequently used `CMD` keys on macOS where my brain expects them
-- Move `/?` into usual location next to right `SHIFT` - the default flash from Falbatech put `\|` here (might not be the Redox default?), which felt unintuitive
-- Put `\|` into bottom-left spot where `GUI` (`SUPER`) was - had to go somewhere and this bottom-left placement sort of balances with the almost bottom-right `/?`
-- Change default `ESC` into `ESC` on tap, `CTRL` on hold - Love the UNIX-ey `CTRL` key location and wanted to keep `ESC` in the original position
-- Change default `'` above right `SHIFT` into `'` on tap, `CTRL` on hold - Love the UNIX-ey CTRL key location, but it can give you 'left claw hand', which a second, mirrored `CTRL` key fixes
-- Add `F11` and `F12` keys to two layers - needed on macOS if you want to control volume up and down from your keyboard (not shown, on a different layer)
-- On thumb clusters: 
-  - Left: Move `SPACE` closest to left thumb and move `BACKSPACE` to the right of that - put the key for 'getting it right' closest to your thumb and reduce usage of my right hand (purely personal preference)
-  - Right: Move `ENTER` closest to right thumb and move `DEL` to the left of that - put the key for 'getting it right' closest to your thumb
-
-## Changes to the Redox layout ![#99e6fc](https://placehold.it/15/99e6fc/000000?text=+)
-
-These are physical keycap changes on the board that make reaching the `Layer 1` keys easier and that, subjectively, look more balanced visually:
-
-- Increase the `Layer 1` key sizes from 1U to 1.25U
-- Decrease the 1.5 U key size for `[` and `]` to 1.25U
-
-You could even make `[` and `]` 1U so that you can use keycaps from a standard ANSI key set and also increase the size of the `Layer 2` keys to 1.5U. 
diff --git a/keyboards/redox/keymaps/nrichers/rules.mk b/keyboards/redox/keymaps/nrichers/rules.mk
deleted file mode 100755
index a81250cdf6d..00000000000
--- a/keyboards/redox/keymaps/nrichers/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/redox/keymaps/ptillemans/config.h b/keyboards/redox/keymaps/ptillemans/config.h
deleted file mode 100644
index cfb2a9378a7..00000000000
--- a/keyboards/redox/keymaps/ptillemans/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2018 Mattia Dal Ben <matthewdibi@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
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/redox/keymaps/ptillemans/keymap.c b/keyboards/redox/keymaps/ptillemans/keymap.c
deleted file mode 100644
index cbb00e2db8a..00000000000
--- a/keyboards/redox/keymaps/ptillemans/keymap.c
+++ /dev/null
@@ -1,97 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _SYMB 1
-#define _NAV 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
-};
-
-// Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLS
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTES LCTL_T(KC_ESC)
-
-#define KC_NAGR LT(_NAV, KC_GRV)
-#define KC_NAMI LT(_NAV, KC_MINS)
-
-#define KC_ADEN LT(_ADJUST, KC_END)
-#define KC_ADPU LT(_ADJUST, KC_PGUP)
-
-#define KC_LBRS LT(_SYMB, KC_LBRC)
-#define KC_RBRS LT(_SYMB, KC_RBRC)
-#define KC_RSEN RSFT_T(KC_ENT)
-#define KC_RCQU RCTL_T(KC_QUOT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_NAGR ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_NAMI ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_PSCR ,                          KC_EQL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BKSL ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_CTES ,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_RCQU ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSEN ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     KC_LGUI ,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_LGUI ,    KC_BSPC , KC_SPC ,        KC_SPC  ,KC_ENT  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-                     ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI ,                          RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,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/redox/keymaps/ptillemans/readme.md b/keyboards/redox/keymaps/ptillemans/readme.md
deleted file mode 100644
index 8fa8ddf5cea..00000000000
--- a/keyboards/redox/keymaps/ptillemans/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for Redox
diff --git a/keyboards/redox/keymaps/ptillemans/rules.mk b/keyboards/redox/keymaps/ptillemans/rules.mk
deleted file mode 100644
index a81250cdf6d..00000000000
--- a/keyboards/redox/keymaps/ptillemans/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/redox/keymaps/thattolleyguy/config.h b/keyboards/redox/keymaps/thattolleyguy/config.h
deleted file mode 100644
index f3b73d8974b..00000000000
--- a/keyboards/redox/keymaps/thattolleyguy/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 Tyler Tolley <thattolleyguy@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
-
-/* Select hand configuration */
-// #define MASTER_LEFT
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN C6
-#define RGBLED_NUM 14    // Number of LEDs
-#define RGBLED_SPLIT { 7, 7 }
-#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/redox/keymaps/thattolleyguy/keymap.c b/keyboards/redox/keymaps/thattolleyguy/keymap.c
deleted file mode 100644
index 5bcb7e52cc1..00000000000
--- a/keyboards/redox/keymaps/thattolleyguy/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Copyright 2021 Tyler Tolley <thattolleyguy@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
-
-// 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 dactyl_layers {
-  _QWERTY,
-  _NUM,
-  _SYMB,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NUM,
-};
-
-// Shortcut to make keymap more readable
-#define L_SYM  MO(_SYMB)
-#define L_NUM  MO(_NUM)
-#define KC_DSKL LGUI(KC_PGUP)
-#define KC_DSKR LGUI(KC_PGDN)
-#define KC_CBP LCTL(KC_F11) //Clipboard previous
-#define KC_CBN LCTL(KC_F12) //Clipboard previous
-
-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    ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,DM_REC1 ,                          DM_REC2 ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,DM_PLY1 ,                          DM_PLY2 ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_QUOT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,XXXXXXX ,KC_GRV  ,        KC_DEL  ,KC_INS  ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     KC_CBP  ,KC_CBN  ,KC_DSKL ,KC_DSKR,      KC_LGUI ,    L_NUM   ,KC_ENT  ,        KC_SPC  ,L_SYM  ,     KC_RALT ,     KC_PGUP ,KC_PGDN ,KC_APP  ,KC_RCTL
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-    [_NUM] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX, KC_VOLU, KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,                                             XXXXXXX ,XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_MUTE, KC_VOLD, RGB_M_SW,RGB_TOG, XXXXXXX, XXXXXXX, _______ ,                          _______ ,XXXXXXX ,KC_P7   ,KC_P8   ,KC_P9   ,KC_PMNS ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, XXXXXXX, _______ ,                          _______ ,KC_PAST ,KC_P4   ,KC_P5   ,KC_P6   ,KC_PPLS ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,XXXXXXX, _______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_P1   ,KC_P2   ,KC_P3   ,KC_PENT ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    KC_P0   ,     KC_P0   ,KC_PDOT ,KC_PENT ,KC_PSCR
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11 ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,KC_UP   ,XXXXXXX ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_UNDS,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,KC_LEFT ,KC_DOWN ,KC_RIGHT,XXXXXXX ,_______ ,                          _______ ,KC_INS  ,KC_HOME ,KC_PPLS, KC_MINS, KC_TILD, KC_EQL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_END  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,QK_BOOT,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/redox/keymaps/thattolleyguy/readme.md b/keyboards/redox/keymaps/thattolleyguy/readme.md
deleted file mode 100644
index 8fa8ddf5cea..00000000000
--- a/keyboards/redox/keymaps/thattolleyguy/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for Redox
diff --git a/keyboards/redox/keymaps/thattolleyguy/rules.mk b/keyboards/redox/keymaps/thattolleyguy/rules.mk
deleted file mode 100644
index 9e6797ed307..00000000000
--- a/keyboards/redox/keymaps/thattolleyguy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/redox/keymaps/tw1t611/config.h b/keyboards/redox/keymaps/tw1t611/config.h
deleted file mode 100644
index 4f50e8507be..00000000000
--- a/keyboards/redox/keymaps/tw1t611/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/redox/keymaps/tw1t611/keymap.c b/keyboards/redox/keymaps/tw1t611/keymap.c
deleted file mode 100644
index da978de9fa4..00000000000
--- a/keyboards/redox/keymaps/tw1t611/keymap.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-enum {
-  QWERTZ = 0,
-  MOD,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [QWERTZ] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ESC  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,_______   ,                        _______ ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,DE_ADIA ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_BSPC ,                          KC_DEL  ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,DE_EQL  ,DE_ODIA ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     DE_UNDS ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_LCTL ,KC_BSPC ,        KC_DEL  ,KC_RCTL ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,DE_SS   ,DE_UDIA ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     KC_LALT ,    KC_SPC  ,KC_LSFT ,        MO(MOD) ,KC_ENT  ,    KC_LGUI ,     _______ ,_______ ,_______  ,_______ 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-  [MOD] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_F12  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     DE_CIRC ,DE_QUOT ,DE_DQUO ,DE_LCBR ,DE_RCBR ,DE_GRV  ,RGB_MOD ,                          QK_BOOT,DE_PERC ,DE_PLUS ,DE_MINS ,DE_ASTR  ,DE_SLSH ,DE_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     DE_TILD ,DE_EXLM ,DE_DLR  ,DE_LPRN ,DE_RPRN ,DE_AMPR ,RGB_TOG ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,DE_QUES ,DE_PIPE ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,DE_AT   ,DE_EURO ,DE_LBRC ,DE_RBRC ,_______ ,RGB_M_P ,_______ ,        _______ ,_______ ,DE_HASH ,DE_LABK ,DE_SCLN ,DE_COLN ,DE_RABK ,DE_SECT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    _______ ,     _______ ,_______ ,_______ ,_______ 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  )
-};
diff --git a/keyboards/redox/keymaps/tw1t611/readme.md b/keyboards/redox/keymaps/tw1t611/readme.md
deleted file mode 100644
index 1bb928f58df..00000000000
--- a/keyboards/redox/keymaps/tw1t611/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Keymap for Redox by tw1t611
diff --git a/keyboards/redox/keymaps/via/config.h b/keyboards/redox/keymaps/via/config.h
index cfb2a9378a7..7b9be07d977 100644
--- a/keyboards/redox/keymaps/via/config.h
+++ b/keyboards/redox/keymaps/via/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGBLED_NUM 14
+#define RGBLIGHT_LED_COUNT 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/redox/keymaps/via/keymap.c b/keyboards/redox/keymaps/via/keymap.c
index 474f03ecd71..2724199842b 100644
--- a/keyboards/redox/keymaps/via/keymap.c
+++ b/keyboards/redox/keymaps/via/keymap.c
@@ -1,19 +1,20 @@
- /* Copyright HarshitGoel96 2020
-  * With permission from mattdibi, the original maintainer of the Redox hardware.
-  * 
-  * 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 HarshitGoel96 2020
+* With permission from mattdibi, the original maintainer of the Redox hardware.
+* 
+* 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.
@@ -84,5 +85,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
   //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
   )
-
-};
\ No newline at end of file
+};
diff --git a/keyboards/redox/keymaps/via/rules.mk b/keyboards/redox/keymaps/via/rules.mk
index 43061db1dd4..36b7ba9cbc9 100644
--- a/keyboards/redox/keymaps/via/rules.mk
+++ b/keyboards/redox/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/keyboards/redox/readme.md b/keyboards/redox/readme.md
deleted file mode 100644
index 82b00d79f7b..00000000000
--- a/keyboards/redox/readme.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# The Redox keyboard
-
-<p align="center">
-<img src="https://github.com/mattdibi/redox-keyboard/raw/master/img/redox-logo.png" alt="Redox logo" width="600"/>
-</p>
-
-<p align="center">
-<img src="https://github.com/mattdibi/redox-keyboard/raw/master/img/redox-pcb2.jpg" alt="Redox PCB rev1.0" width="600"/>
-</p>
-
-**Redox**: the **R**educed **E**rgo**dox** project. More information and building instruction [here](https://github.com/mattdibi/redox-keyboard).
-
-- Keyboard Maintainer: [Mattia Dal Ben](https://github.com/mattdibi)  
-- Hardware Supported: Redox PCB rev1.0 w/ Pro Micro or Proton C
-- Hardware Availability: [Falbatech](https://falba.tech/product-category/keyboard-parts/redox-parts/)
-
-Make example for this keyboard (after setting up [qmk](https://docs.qmk.fm/#/getting_started_build_tools)):
-
-To build the Pro Micro firmware, first set your config:
-```sh
-qmk config user.keyboard=redox/rev1
-```
-or if your using the Proton C:
-```sh
-qmk config user.keyboard=redox/rev1/proton_c
-```
-
-Don't forget to set a layout. There's many to choose from in the keymaps folder.
-```sh
-qmk config user.keymap=default
-```
-
-Now you can build your firmware!
-```sh
-qmk compile
-```
-
-Flashing is also straightforward. Run:
-```sh
-qmk flash
-```
-Enter the bootloader when prompted by doing one of the following:
-* **Physical reset button**: Briefly press the button on the back of the PCB
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if you have a layout that has one.
-
-The WS2812 driver is *untested* on the Proton C, but if you choose to use this feature, you will need to source 5v from the Proton's VUSB pin and not use the PCB's dedicated pin which will be 3v3 *and* follow the [documentation](https://docs.qmk.fm/#/ws2812_driver) to enable the correct driver settings.
-
-Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json
index e0d1433115d..a4a3f3fe96e 100644
--- a/keyboards/redox/rev1/base/info.json
+++ b/keyboards/redox/rev1/base/info.json
@@ -13,6 +13,5 @@
     "ws2812": {
         "pin": "D3"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "development_board": "promicro"
 }
diff --git a/keyboards/redox/rev1/base/rules.mk b/keyboards/redox/rev1/base/rules.mk
index e69de29bb2d..3bbd2614291 100644
--- a/keyboards/redox/rev1/base/rules.mk
+++ b/keyboards/redox/rev1/base/rules.mk
@@ -0,0 +1 @@
+# File intentionally blank
diff --git a/keyboards/redox/rev1/info.json b/keyboards/redox/rev1/info.json
index c0c5ce6e1a6..446020179c2 100644
--- a/keyboards/redox/rev1/info.json
+++ b/keyboards/redox/rev1/info.json
@@ -8,9 +8,35 @@
     "pid": "0x5244",
     "device_version": "1.0.0"
   },
+  "features":{
+    "bootmagic": true,
+    "command": true,
+    "console": false,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true,
+    "rgblight": true
+  },
+  "split":{
+    "enabled": true
+  },
   "rgblight": {
     "led_count": 14,
-    "split": true
+    "split": true,
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "animations": {
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
+    }
   },
   "layouts": {
     "LAYOUT": {
diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h
index 08a74aef2c9..4d28bd2f4a8 100644
--- a/keyboards/redox/rev1/proton_c/config.h
+++ b/keyboards/redox/rev1/proton_c/config.h
@@ -24,19 +24,3 @@
 #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 #define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 #define SERIAL_USART_TIMEOUT 20    // USART driver timeout. default 20
-
-/*
- * 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
diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json
index 7fec1e79508..48bec826275 100644
--- a/keyboards/redox/rev1/proton_c/info.json
+++ b/keyboards/redox/rev1/proton_c/info.json
@@ -10,7 +10,5 @@
         "rows": ["B5", "B3", "B2", "B1", "B0"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C"
+    "development_board": "proton_c"
 }
diff --git a/keyboards/redox/rev1/readme.md b/keyboards/redox/rev1/readme.md
new file mode 100644
index 00000000000..6f336cde86d
--- /dev/null
+++ b/keyboards/redox/rev1/readme.md
@@ -0,0 +1,50 @@
+# The Redox keyboard
+
+<p align="center">
+<img src="https://github.com/mattdibi/redox-keyboard/raw/master/img/redox-logo.png" alt="Redox logo" width="600"/>
+</p>
+
+<p align="center">
+<img src="https://github.com/mattdibi/redox-keyboard/raw/master/img/redox-pcb2.jpg" alt="Redox PCB rev1.0" width="600"/>
+</p>
+
+**Redox**: the **R**educed **E**rgo**dox** project. More information and building instruction [here](https://github.com/mattdibi/redox-keyboard).
+
+- Keyboard Maintainer: [Mattia Dal Ben](https://github.com/mattdibi)  
+- Hardware Supported: 
+    - Redox PCB rev1.0 
+    - Pro Micro or Proton C micro controllers
+- Hardware Availability: [Falbatech](https://falba.tech/product-category/keyboard-parts/redox-parts/)
+
+Make example for this keyboard (after setting up [qmk](https://docs.qmk.fm/#/getting_started_build_tools)):
+
+To build the Pro Micro firmware, first set your config:
+```sh
+qmk config user.keyboard=redox/rev1
+```
+or if your using the Proton C:
+```sh
+qmk config user.keyboard=redox/rev1/proton_c
+```
+
+Don't forget to set a layout. There's many to choose from in the keymaps folder.
+```sh
+qmk config user.keymap=default
+```
+
+Now you can build your firmware!
+```sh
+qmk compile
+```
+
+Flashing is also straightforward. Run:
+```sh
+qmk flash
+```
+Enter the bootloader when prompted by doing one of the following:
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if you have a layout that has one.
+
+The WS2812 driver is *untested* on the Proton C, but if you choose to use this feature, you will need to source 5v from the Proton's VUSB pin and not use the PCB's dedicated pin which will be 3v3 *and* follow the [documentation](https://docs.qmk.fm/#/ws2812_driver) to enable the correct driver settings.
+
+Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/redox/rules.mk b/keyboards/redox/rules.mk
index 29ad3b9404e..a2f52752e05 100644
--- a/keyboards/redox/rules.mk
+++ b/keyboards/redox/rules.mk
@@ -1,18 +1,3 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = redox/rev1/base
 
 # Disable unsupported hardware
diff --git a/keyboards/redox/wireless/config.h b/keyboards/redox/wireless/config.h
new file mode 100644
index 00000000000..88e99b73529
--- /dev/null
+++ b/keyboards/redox/wireless/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2017 Mattia Dal Ben
+ * 
+ * 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
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define ONESHOT_TIMEOUT 500
diff --git a/keyboards/redox/wireless/info.json b/keyboards/redox/wireless/info.json
new file mode 100644
index 00000000000..86977f4602d
--- /dev/null
+++ b/keyboards/redox/wireless/info.json
@@ -0,0 +1,105 @@
+{
+  "keyboard_name": "Redox Wireless",
+  "manufacturer": "Mattia Dal Ben",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4D44",
+    "pid": "0x5257",
+    "device_version": "0.0.1"
+  },
+  "features":{
+    "bootmagic": true,
+    "command": true,
+    "console": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "development_board": "promicro",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.25},
+        {"matrix": [0, 1], "x": 1.25, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.25, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.25, "y": 0.25},
+
+        {"matrix": [0, 8], "x": 12.25, "y": 0.25},
+        {"matrix": [0, 9], "x": 13.25, "y": 0.125},
+        {"matrix": [0, 10], "x": 14.25, "y": 0},
+        {"matrix": [0, 11], "x": 15.25, "y": 0.125},
+        {"matrix": [0, 12], "x": 16.25, "y": 0.375},
+        {"matrix": [0, 13], "x": 17.25, "y": 0.375, "w": 1.25},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.25, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+        {"matrix": [0, 6], "x": 6.25, "y": 0.75},
+
+        {"matrix": [0, 7], "x": 11.25, "y": 0.75},
+        {"matrix": [1, 8], "x": 12.25, "y": 1.25},
+        {"matrix": [1, 9], "x": 13.25, "y": 1.125},
+        {"matrix": [1, 10], "x": 14.25, "y": 1},
+        {"matrix": [1, 11], "x": 15.25, "y": 1.125},
+        {"matrix": [1, 12], "x": 16.25, "y": 1.375},
+        {"matrix": [1, 13], "x": 17.25, "y": 1.375, "w": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.25},
+        {"matrix": [2, 1], "x": 1.25, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.25, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.25, "y": 2},
+        {"matrix": [2, 4], "x": 4.25, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+        {"matrix": [1, 6], "x": 6.25, "y": 1.75, "h": 1.5},
+
+        {"matrix": [1, 7], "x": 11.25, "y": 1.75, "h": 1.5},
+        {"matrix": [2, 8], "x": 12.25, "y": 2.25},
+        {"matrix": [2, 9], "x": 13.25, "y": 2.125},
+        {"matrix": [2, 10], "x": 14.25, "y": 2},
+        {"matrix": [2, 11], "x": 15.25, "y": 2.125},
+        {"matrix": [2, 12], "x": 16.25, "y": 2.375},
+        {"matrix": [2, 13], "x": 17.25, "y": 2.375, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.25, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+        {"matrix": [2, 6], "x": 6.75, "y": 3.75},
+        {"matrix": [3, 6], "x": 7.75, "y": 3.75},
+
+        {"matrix": [3, 7], "x": 9.75, "y": 3.75},
+        {"matrix": [2, 7], "x": 10.75, "y": 3.75},
+        {"matrix": [3, 8], "x": 12.25, "y": 3.25},
+        {"matrix": [3, 9], "x": 13.25, "y": 3.125},
+        {"matrix": [3, 10], "x": 14.25, "y": 3},
+        {"matrix": [3, 11], "x": 15.25, "y": 3.125},
+        {"matrix": [3, 12], "x": 16.25, "y": 3.375},
+        {"matrix": [3, 13], "x": 17.25, "y": 3.375, "w": 1.25},
+
+        {"matrix": [4, 0], "x": 0.25, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.5, "y": 5.25, "w": 1.25},
+        {"matrix": [4, 5], "x": 6.75, "y": 4.75, "h": 1.5},
+        {"matrix": [4, 6], "x": 7.75, "y": 4.75, "h": 1.5},
+
+        {"matrix": [4, 7], "x": 9.75, "y": 4.75, "h": 1.5},
+        {"matrix": [4, 8], "x": 10.75, "y": 4.75, "h": 1.5},
+        {"matrix": [4, 9], "x": 11.75, "y": 5.25, "w": 1.25},
+        {"matrix": [4, 10], "x": 14.25, "y": 4},
+        {"matrix": [4, 11], "x": 15.25, "y": 4.125},
+        {"matrix": [4, 12], "x": 16.25, "y": 4.375},
+        {"matrix": [4, 13], "x": 17.25, "y": 4.375}
+      ]
+    }
+  }
+}
diff --git a/keyboards/redox_w/matrix.c b/keyboards/redox/wireless/matrix.c
similarity index 100%
rename from keyboards/redox_w/matrix.c
rename to keyboards/redox/wireless/matrix.c
diff --git a/keyboards/redox/wireless/readme.md b/keyboards/redox/wireless/readme.md
new file mode 100644
index 00000000000..65386c94b1b
--- /dev/null
+++ b/keyboards/redox/wireless/readme.md
@@ -0,0 +1,34 @@
+# Redox Wireless
+=======
+
+<p align="center">
+<img src="https://github.com/mattdibi/redox-keyboard/raw/master/img/redox-logo.png" alt="Redox logo" width="600"/>
+</p>
+
+**Redox**: the **R**educed **E**rgo**dox** project. More information and building instruction [here](https://github.com/mattdibi/redox-keyboard).
+
+A wireless version of the Redox keyboard.
+
+- Keyboard Maintainer: [@mattdibi](https://github.com/mattdibi)  
+- Hardware Supported: Redox-w rev1.0W PCB  
+- Hardware Availability: Falbatech
+
+Make example for this keyboard (after setting up your build environment):
+
+```sh
+make redox/wireless:default
+```
+
+Example of flashing this keyboard:
+
+```sh
+make redox/wireless:default:avrdude
+```
+
+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).
+
+For nRF51822 firmware upload instruction and development see [the Redox wireless firmware repository](https://github.com/mattdibi/redox-w-firmware).
+
+## Notes
+
+These configuration files were based off the [Mitosis](https://github.com/qmk/qmk_firmware/tree/master/keyboards/mitosis) and [Atreus](https://github.com/technomancy/atreus) keyboard. It assumes a Pro Micro is being used, however retains the 'make upload' feature from the Atreus branch. This keyboard uses a completely different 'matrix scan' system to other keyboards, it relies on an external nRF51822 microcontroller maintaining a matrix of keystates received from the keyboard halves. The matrix.c file contains the code to poll the external microcontroller for the key matrix. As long as this file is not changed, all other QMK features are supported.
diff --git a/keyboards/redox/wireless/rules.mk b/keyboards/redox/wireless/rules.mk
new file mode 100644
index 00000000000..18d234d62a0
--- /dev/null
+++ b/keyboards/redox/wireless/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+
+# project specific files
+SRC += matrix.c
+UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/redox/wireless/wireless.c b/keyboards/redox/wireless/wireless.c
new file mode 100644
index 00000000000..30cefd9f4ea
--- /dev/null
+++ b/keyboards/redox/wireless/wireless.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2018 Mattia Dal Ben <matthewdibi@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 "wireless.h"
+
+void led_init(void) {
+    setPinOutput(D0);
+    setPinOutput(D1);
+    setPinOutput(F4);
+    setPinOutput(F5);
+    
+    writePinHigh(D0);
+    writePinHigh(D1);
+    writePinHigh(F4);
+    writePinHigh(F5);
+}
+
+
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+	matrix_init_user();
+	led_init();
+}
+
+#ifdef SWAP_HANDS_ENABLE
+__attribute__ ((weak))
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+{{13, 0}, {12, 0}, {11, 0}, {10, 0}, {9, 0}, {8, 0}, {7, 0}, {6, 0}, {5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
+{{13, 1}, {12, 1}, {11, 1}, {10, 1}, {9, 1}, {8, 1}, {7, 1}, {6, 1}, {5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
+{{13, 2}, {12, 2}, {11, 2}, {10, 2}, {9, 2}, {8, 2}, {7, 2}, {6, 2}, {5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
+{{13, 3}, {12, 3}, {11, 3}, {10, 3}, {9, 3}, {8, 3}, {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
+{{13, 4}, {12, 4}, {11, 4}, {10, 4}, {9, 4}, {8, 4}, {7, 4}, {6, 4}, {5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
+};
+#endif
diff --git a/keyboards/redox/wireless/wireless.h b/keyboards/redox/wireless/wireless.h
new file mode 100644
index 00000000000..a0ba09aff31
--- /dev/null
+++ b/keyboards/redox/wireless/wireless.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2018 Mattia Dal Ben <matthewdibi@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 red_led_off   writePinHigh(F5)
+#define red_led_on    writePinLow(F5)
+#define blu_led_off   writePinHigh(F4)
+#define blu_led_on    writePinLow(F4)
+#define grn_led_off   writePinHigh(D1)
+#define grn_led_on    writePinLow(D1)
+#define wht_led_off   writePinHigh(D0)
+#define wht_led_on    writePinLow(D0)
+
+#define set_led_off     red_led_off; grn_led_off; blu_led_off; wht_led_off
+#define set_led_red     red_led_on;  grn_led_off; blu_led_off; wht_led_off
+#define set_led_blue    red_led_off; grn_led_off; blu_led_on;  wht_led_off
+#define set_led_green   red_led_off; grn_led_on;  blu_led_off; wht_led_off
+#define set_led_white   red_led_off;  grn_led_off;  blu_led_off; wht_led_on
diff --git a/keyboards/redox_w/config.h b/keyboards/redox_w/config.h
deleted file mode 100644
index bbdfbb7d1f2..00000000000
--- a/keyboards/redox_w/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2017 Mattia Dal Ben
- * 
- * 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
-
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
-#define ONESHOT_TIMEOUT 500
-
-/*
- * 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
diff --git a/keyboards/redox_w/info.json b/keyboards/redox_w/info.json
deleted file mode 100644
index c765291258b..00000000000
--- a/keyboards/redox_w/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "keyboard_name": "Redox Wireless",
-  "manufacturer": "Mattia Dal Ben",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4D44",
-    "pid": "0x5257",
-    "device_version": "0.0.1"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.25},
-        {"matrix": [0, 1], "x": 1.25, "y": 0.375},
-        {"matrix": [0, 2], "x": 2.25, "y": 0.125},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0.125},
-        {"matrix": [0, 5], "x": 5.25, "y": 0.25},
-
-        {"matrix": [0, 8], "x": 12.25, "y": 0.25},
-        {"matrix": [0, 9], "x": 13.25, "y": 0.125},
-        {"matrix": [0, 10], "x": 14.25, "y": 0},
-        {"matrix": [0, 11], "x": 15.25, "y": 0.125},
-        {"matrix": [0, 12], "x": 16.25, "y": 0.375},
-        {"matrix": [0, 13], "x": 17.25, "y": 0.375, "w": 1.25},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.25},
-        {"matrix": [1, 1], "x": 1.25, "y": 1.375},
-        {"matrix": [1, 2], "x": 2.25, "y": 1.125},
-        {"matrix": [1, 3], "x": 3.25, "y": 1},
-        {"matrix": [1, 4], "x": 4.25, "y": 1.125},
-        {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-        {"matrix": [0, 6], "x": 6.25, "y": 0.75},
-
-        {"matrix": [0, 7], "x": 11.25, "y": 0.75},
-        {"matrix": [1, 8], "x": 12.25, "y": 1.25},
-        {"matrix": [1, 9], "x": 13.25, "y": 1.125},
-        {"matrix": [1, 10], "x": 14.25, "y": 1},
-        {"matrix": [1, 11], "x": 15.25, "y": 1.125},
-        {"matrix": [1, 12], "x": 16.25, "y": 1.375},
-        {"matrix": [1, 13], "x": 17.25, "y": 1.375, "w": 1.25},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.25},
-        {"matrix": [2, 1], "x": 1.25, "y": 2.375},
-        {"matrix": [2, 2], "x": 2.25, "y": 2.125},
-        {"matrix": [2, 3], "x": 3.25, "y": 2},
-        {"matrix": [2, 4], "x": 4.25, "y": 2.125},
-        {"matrix": [2, 5], "x": 5.25, "y": 2.25},
-        {"matrix": [1, 6], "x": 6.25, "y": 1.75, "h": 1.5},
-
-        {"matrix": [1, 7], "x": 11.25, "y": 1.75, "h": 1.5},
-        {"matrix": [2, 8], "x": 12.25, "y": 2.25},
-        {"matrix": [2, 9], "x": 13.25, "y": 2.125},
-        {"matrix": [2, 10], "x": 14.25, "y": 2},
-        {"matrix": [2, 11], "x": 15.25, "y": 2.125},
-        {"matrix": [2, 12], "x": 16.25, "y": 2.375},
-        {"matrix": [2, 13], "x": 17.25, "y": 2.375, "w": 1.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.25},
-        {"matrix": [3, 1], "x": 1.25, "y": 3.375},
-        {"matrix": [3, 2], "x": 2.25, "y": 3.125},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3.125},
-        {"matrix": [3, 5], "x": 5.25, "y": 3.25},
-        {"matrix": [2, 6], "x": 6.75, "y": 3.75},
-        {"matrix": [3, 6], "x": 7.75, "y": 3.75},
-
-        {"matrix": [3, 7], "x": 9.75, "y": 3.75},
-        {"matrix": [2, 7], "x": 10.75, "y": 3.75},
-        {"matrix": [3, 8], "x": 12.25, "y": 3.25},
-        {"matrix": [3, 9], "x": 13.25, "y": 3.125},
-        {"matrix": [3, 10], "x": 14.25, "y": 3},
-        {"matrix": [3, 11], "x": 15.25, "y": 3.125},
-        {"matrix": [3, 12], "x": 16.25, "y": 3.375},
-        {"matrix": [3, 13], "x": 17.25, "y": 3.375, "w": 1.25},
-
-        {"matrix": [4, 0], "x": 0.25, "y": 4.375},
-        {"matrix": [4, 1], "x": 1.25, "y": 4.375},
-        {"matrix": [4, 2], "x": 2.25, "y": 4.125},
-        {"matrix": [4, 3], "x": 3.25, "y": 4},
-        {"matrix": [4, 4], "x": 5.5, "y": 5.25, "w": 1.25},
-        {"matrix": [4, 5], "x": 6.75, "y": 4.75, "h": 1.5},
-        {"matrix": [4, 6], "x": 7.75, "y": 4.75, "h": 1.5},
-
-        {"matrix": [4, 7], "x": 9.75, "y": 4.75, "h": 1.5},
-        {"matrix": [4, 8], "x": 10.75, "y": 4.75, "h": 1.5},
-        {"matrix": [4, 9], "x": 11.75, "y": 5.25, "w": 1.25},
-        {"matrix": [4, 10], "x": 14.25, "y": 4},
-        {"matrix": [4, 11], "x": 15.25, "y": 4.125},
-        {"matrix": [4, 12], "x": 16.25, "y": 4.375},
-        {"matrix": [4, 13], "x": 17.25, "y": 4.375}
-      ]
-    }
-  }
-}
diff --git a/keyboards/redox_w/keymaps/default/keymap.c b/keyboards/redox_w/keymaps/default/keymap.c
deleted file mode 100644
index a463bfc6731..00000000000
--- a/keyboards/redox_w/keymaps/default/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-#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.
-#define _QWERTY 0
-#define _SYMB 1
-#define _NAV 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
-};
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTPL LCTL_T(KC_BSLS)
-
-#define KC_NAGR LT(_NAV, KC_GRV)
-#define KC_NAMI LT(_NAV, KC_MINS)
-
-#define KC_ADEN LT(_ADJUST, KC_END)
-#define KC_ADPU LT(_ADJUST, KC_PGUP)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_NAGR ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_NAMI ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,SYM_L   ,                          SYM_L   ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_EQL  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ESC  ,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_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     KC_LGUI ,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_CTPL ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,KC_PSLS ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_PMNS ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,KC_PAST ,KC_P4 	,KC_P5   ,KC_P6   ,KC_PPLS ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PENT ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_P0   ,     KC_P0   ,KC_PDOT ,KC_PENT ,XXXXXXX 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,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) {
-    switch (get_highest_layer(state)) {
-        case _QWERTY:
-            set_led_off;
-            break;
-        case _SYMB:
-            set_led_green;
-            break;
-        case _NAV:
-            set_led_blue;
-            break;
-        case _ADJUST:
-            set_led_red;
-            break;
-        default:
-            break;
-    }
-  return state;
-}
-
-
diff --git a/keyboards/redox_w/keymaps/default/readme.md b/keyboards/redox_w/keymaps/default/readme.md
deleted file mode 100644
index 32ab1253d7a..00000000000
--- a/keyboards/redox_w/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Default keymap for Redox Wireless
diff --git a/keyboards/redox_w/keymaps/dvorak/keymap.c b/keyboards/redox_w/keymaps/dvorak/keymap.c
deleted file mode 100644
index bf3d8917a45..00000000000
--- a/keyboards/redox_w/keymaps/dvorak/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Copyright 2021 66f94eae(66f94eae@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
-
-// 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 layers {
-    _DVORAK,
-    _SYMB,
-    _QWERTY,
-    _ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_DVORAK] = LAYOUT(
-//┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    QK_GESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,
-//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_TAB  ,KC_QUOT ,KC_COMM ,KC_DOT  ,KC_P    ,KC_Y    ,KC_LBRC,                          KC_RBRC ,KC_F    ,KC_G    ,KC_C    ,KC_R    ,KC_L    ,KC_SLSH  ,
-//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_LCTL  ,KC_A   ,KC_O    ,KC_E    ,KC_U    ,KC_I    ,KC_MINS,                          KC_EQL   ,KC_D    ,KC_H    ,KC_T    ,KC_N    ,KC_S    ,KC_BSLS ,
-//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_LSFT ,KC_SCLN ,KC_Q    ,KC_J    ,KC_K    ,KC_X    ,KC_PGUP ,KC_HOME ,        KC_END  ,KC_PGDN ,KC_B    ,KC_M    ,KC_W   ,KC_V     ,KC_Z    ,KC_RSFT ,
-//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-    KC_CAPS ,KC_APP ,KC_LALT ,KC_LGUI  ,    LT(3,KC_MUTE), KC_SPC  ,KC_INS  ,        KC_DEL  ,KC_ENT  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-//└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-),
-
-[_SYMB] = LAYOUT(
-//┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    QK_GESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F8   ,KC_F9   ,KC_F10   ,KC_F11  ,KC_F12 ,KC_BSPC ,
-//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_TAB , KC_BTN1 ,KC_MS_U  ,KC_BTN2 ,KC_WH_U ,KC_COPY ,KC_F6 ,                            KC_F7  ,KC_COPY ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_MPRV ,KC_PPLS ,
-//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_LCTL ,KC_MS_L ,KC_MS_D  ,KC_MS_R ,KC_WH_D ,KC_CUT  ,KC_VOLD ,                          KC_VOLU ,KC_CUT ,KC_P4 	,KC_P5   ,KC_P6   ,KC_MNXT ,KC_PMNS ,
-//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_LSFT ,KC_WH_L ,KC_UP   ,KC_WH_R ,KC_LGUI ,KC_PSTE ,KC_WH_U ,KC_SCRL ,        KC_NUM  ,KC_WH_D ,KC_PSTE ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PEQL ,KC_PAST ,
-//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-    KC_CAPS ,KC_LEFT ,KC_DOWN ,KC_RGHT, LT(3,KC_MUTE)     ,KC_SPC  ,KC_ESC ,        KC_DEL  ,KC_ENT ,    KC_APP   ,     KC_P0   ,KC_PDOT ,KC_PENT ,KC_PSLS 
-//└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-),
-
-[_QWERTY] = LAYOUT(
-//┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    QK_GESC  ,KC_1     ,KC_2   ,KC_3    ,KC_4     ,KC_5   ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9     ,KC_0  ,KC_BSPC,
-//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_TAB  ,KC_Q     ,KC_W   ,KC_E    ,KC_R    ,KC_T    ,KC_MINS ,                          KC_EQL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
-//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    KC_LCTL ,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_HOME ,KC_PGUP ,        KC_PGDN ,KC_END   ,KC_N   ,KC_M    ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT ,
-//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-    KC_CAPS ,KC_LGUI ,KC_LALT , KC_APP  ,LT(3,KC_MUTE) ,   KC_SPC ,KC_INS ,          KC_DEL ,KC_ENT       , KC_APP      , KC_LEFT ,KC_UP   ,KC_DOWN  ,KC_RGHT
-//└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-),
-
-[_ADJUST] = LAYOUT(
-//┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-    QK_GESC   ,TO(0)   ,TO(1)   ,TO(2)   ,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   ,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_LSFT  ,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_RSFT ,
-//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-    KC_NO   ,KC_NO   ,KC_NO   ,KC_LGUI        ,LT(3,KC_MUTE), KC_NO   ,KC_NO           ,KC_NO   ,KC_NO        ,KC_APP    ,KC_NO  ,KC_NO   ,KC_NO   ,KC_NO
-//└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state)
-{
-    switch (get_highest_layer(state)) {
-        case _DVORAK:
-            blu_led_off;
-            grn_led_off;
-            break;
-        case _SYMB:
-            blu_led_on;
-            grn_led_off;
-            break;
-        case _QWERTY:
-            blu_led_off;
-            grn_led_on;
-            break;
-        case _ADJUST:
-            blu_led_on;
-            grn_led_on;
-            break;
-        default:
-            break;
-    }
-    return state;
-}
-
-bool led_update_user(led_t led_state)
-{
-    if (led_state.caps_lock) {
-        red_led_on;
-    } else {
-        red_led_off;
-    }
-    if (led_state.num_lock) {
-        wht_led_on;
-    } else {
-        wht_led_off;
-    }
-    return false;
-}
diff --git a/keyboards/redox_w/keymaps/dvorak/readme.md b/keyboards/redox_w/keymaps/dvorak/readme.md
deleted file mode 100644
index cdc90976a77..00000000000
--- a/keyboards/redox_w/keymaps/dvorak/readme.md
+++ /dev/null
@@ -1,38 +0,0 @@
-### fork from default layout，and support dvorak layout[defalut layer]
-
-##### only use 3 layers
-
-```
-Keymap: 3 Layers                   
------------------                  
-stack of layers                     
-       ____________ precedence      
-      /           / | high                 
-  31 /___________// |                           
-   :   _:_:_:_:_:__ |           
-   3 /___________// | --- adjust   
-   2 /___________// | --- qwerty         
-   1 /___________// | --- symb
-   0 /___________/  | --- dvorak[default]        
-```
-
-defalut LED indicators
-
-RED --------- CAPS LOCK
-
-BLUE ------- SYMB layer
-
-GREEN----- QWERTY layer
-
-WHITE------ NUM LOCK *in my test case,this is inefficient on mac os*
-
-> BLUE and GREEN as a bit flag
-> 
-> 0                    0
-
-| BLUE(0) | GREEN(0) | STATUS | DESCRIBE                                            |
-|:-------:|:--------:|:------:|:--------------------------------------------------- |
-| 0       | 0        | 0      | layer 0[dvorak] is active,and blue,green led is off |
-| 1       | 0        | 1      | layer1[symb] is active, and blue led is on          |
-| 0       | 1        | 2      | layer 2[qwerty] is active,and green led is on       |
-| 1       | 1        | 3      | layer 3[adjust] is active,and blue,green led is on  |
diff --git a/keyboards/redox_w/keymaps/italian/keymap.c b/keyboards/redox_w/keymaps/italian/keymap.c
deleted file mode 100644
index 6d345028b25..00000000000
--- a/keyboards/redox_w/keymaps/italian/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#include "keymap_italian.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 _SYMB 1
-#define _NAV 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  SYMB,
-  NAV,
-  ADJUST,
-};
-
-// Shortcut to make keymap more readable
-#define KC_BKSL KC_BSLS
-#define SYM_L   MO(_SYMB)
-
-#define KC_ALAS LALT_T(KC_PAST)
-#define KC_CTPL LCTL_T(KC_PSLS)
-
-#define KC_NAGR LT(_NAV, KC_GRV)
-#define KC_NAMI LT(_NAV, KC_MINS)
-
-#define KC_ADEN LT(_ADJUST, KC_END)
-#define KC_ADPU LT(_ADJUST, KC_PGUP)
-
-// Italian specific shortcuts
-#define ALT_IACC RALT_T(IT_IGRV)
-#define GUI_LESS LGUI_T(IT_LABK)
-
-#define IT_SHSL  RSFT_T(KC_SLSH)
-#define IT_GRV   RALT(KC_MINS)
-#define IT_TILD  RALT(KC_EQL)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_NAGR ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_NAMI ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,SYM_L   ,                          SYM_L   ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,IT_EGRV ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ESC  ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,IT_LBRC ,                          IT_RBRC ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,IT_OGRV ,IT_AGRV ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_ADPU ,KC_PGDN ,        KC_HOME ,KC_ADEN ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,IT_UGRV ,IT_SHSL ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     GUI_LESS,KC_PPLS ,KC_PMNS ,KC_ALAS ,     KC_CTPL ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    ALT_IACC,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,IT_EXLM ,IT_AT   ,IT_LCBR ,IT_RCBR ,IT_PIPE ,_______ ,                          _______ ,XXXXXXX ,KC_KP_7 ,KC_KP_8 ,KC_KP_9 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,IT_HASH ,IT_DLR  ,IT_LBRC ,IT_RBRC ,IT_GRV  ,_______ ,                          _______ ,XXXXXXX ,KC_KP_4 ,KC_KP_5 ,KC_KP_6 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,IT_PERC ,IT_CIRC ,IT_LPRN ,IT_RPRN ,IT_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_KP_1 ,KC_KP_2 ,KC_KP_3 ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_KP_0 ,     KC_KP_0 ,KC_PDOT ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,        XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  )
-
-};
-
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    switch (layer) {
-        case _QWERTY:
-            set_led_off;
-            break;
-        case _SYMB:
-            set_led_green;
-            break;
-        case _NAV:
-            set_led_blue;
-            break;
-        case _ADJUST:
-            set_led_red;
-            break;
-        default:
-            break;
-    }
-};
diff --git a/keyboards/redox_w/keymaps/italian/readme.md b/keyboards/redox_w/keymaps/italian/readme.md
deleted file mode 100644
index a2b5ef70794..00000000000
--- a/keyboards/redox_w/keymaps/italian/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Italian keymap for Redox Wireless
diff --git a/keyboards/redox_w/keymaps/via/keymap.c b/keyboards/redox_w/keymaps/via/keymap.c
deleted file mode 100644
index 2ec63ec8522..00000000000
--- a/keyboards/redox_w/keymaps/via/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
- /* Copyright HarshitGoel96 2020
-  * With permission from mattdibi, the original maintainer of the Redox hardware.
-  * 
-  * 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 custom_keycodes {
-  _QWERTY,
-  _SYMB,
-  _NAV,
-  _ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,XXXXXXX   ,                          MO(_ADJUST)   ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_EQL  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_ESC  ,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    ,XXXXXXX ,KC_PGDN ,        KC_HOME ,XXXXXXX ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     KC_LGUI ,KC_PPLS ,KC_PMNS ,MO(_SYMB) ,     MO(_NAV) ,    KC_BSPC ,KC_DEL  ,        KC_ENT  ,KC_SPC  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                          _______ ,KC_PSLS ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_PMNS ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_HASH ,KC_DLR  ,KC_LBRC ,KC_RBRC ,KC_GRV  ,_______ ,                          _______ ,KC_PAST ,KC_P4 	,KC_P5   ,KC_P6   ,KC_PPLS ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,XXXXXXX ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PENT ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_P0   ,     KC_P0   ,KC_PDOT ,KC_PENT ,XXXXXXX 
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,QK_BOOT,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,        XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
-  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
-     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
-  )
-
-};
\ No newline at end of file
diff --git a/keyboards/redox_w/keymaps/via/readme.md b/keyboards/redox_w/keymaps/via/readme.md
deleted file mode 100644
index 32ab1253d7a..00000000000
--- a/keyboards/redox_w/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Default keymap for Redox Wireless
diff --git a/keyboards/redox_w/readme.md b/keyboards/redox_w/readme.md
deleted file mode 100644
index a47fc2eadd8..00000000000
--- a/keyboards/redox_w/readme.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Redox wireless
-=======
-
-<p align="center">
-<img src="https://github.com/mattdibi/redox-keyboard/raw/master/img/redox-logo.png" alt="Redox logo" width="600"/>
-</p>
-
-**Redox**: the **R**educed **E**rgo**dox** project. More information and building instruction [here](https://github.com/mattdibi/redox-keyboard).
-
-A wireless version of the Redox keyboard.
-
-- Keyboard Maintainer: [@mattdibi](https://github.com/mattdibi)  
-- Hardware Supported: Redox-w rev1.0W PCB  
-- Hardware Availability: Falbatech
-
-Make example for this keyboard (after setting up your build environment):
-
-```sh
-make redox_w:default
-```
-
-Example of flashing this keyboard:
-
-```sh
-make redox_w:default:avrdude
-```
-
-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).
-
-For nRF51822 firmware upload instruction and development see [the Redox wireless firmware repository](https://github.com/mattdibi/redox-w-firmware).
-
-## Redox-w Notes
-
-These configuration files were based off the [Mitosis](https://github.com/qmk/qmk_firmware/tree/master/keyboards/mitosis) and [Atreus](https://github.com/technomancy/atreus) keyboard. It assumes a Pro Micro is being used, however retains the 'make upload' feature from the Atreus branch. This keyboard uses a completely different 'matrix scan' system to other keyboards, it relies on an external nRF51822 microcontroller maintaining a matrix of keystates received from the keyboard halves. The matrix.c file contains the code to poll the external microcontroller for the key matrix. As long as this file is not changed, all other QMK features are supported.
diff --git a/keyboards/redox_w/redox_w.c b/keyboards/redox_w/redox_w.c
deleted file mode 100644
index 48ea7d3bed6..00000000000
--- a/keyboards/redox_w/redox_w.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "redox_w.h"
-
-void led_init(void) {
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(F4);
-    setPinOutput(F5);
-    
-    writePinHigh(D0);
-    writePinHigh(D1);
-    writePinHigh(F4);
-    writePinHigh(F5);
-}
-
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	matrix_init_user();
-	led_init();
-}
-
-#ifdef SWAP_HANDS_ENABLE
-__attribute__ ((weak))
-const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
-{{13, 0}, {12, 0}, {11, 0}, {10, 0}, {9, 0}, {8, 0}, {7, 0}, {6, 0}, {5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
-{{13, 1}, {12, 1}, {11, 1}, {10, 1}, {9, 1}, {8, 1}, {7, 1}, {6, 1}, {5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
-{{13, 2}, {12, 2}, {11, 2}, {10, 2}, {9, 2}, {8, 2}, {7, 2}, {6, 2}, {5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
-{{13, 3}, {12, 3}, {11, 3}, {10, 3}, {9, 3}, {8, 3}, {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
-{{13, 4}, {12, 4}, {11, 4}, {10, 4}, {9, 4}, {8, 4}, {7, 4}, {6, 4}, {5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
-};
-#endif
diff --git a/keyboards/redox_w/redox_w.h b/keyboards/redox_w/redox_w.h
deleted file mode 100644
index 086c8aae31d..00000000000
--- a/keyboards/redox_w/redox_w.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define red_led_off   writePinHigh(F5)
-#define red_led_on    writePinLow(F5)
-#define blu_led_off   writePinHigh(F4)
-#define blu_led_on    writePinLow(F4)
-#define grn_led_off   writePinHigh(D1)
-#define grn_led_on    writePinLow(D1)
-#define wht_led_off   writePinHigh(D0)
-#define wht_led_on    writePinLow(D0)
-
-#define set_led_off     red_led_off; grn_led_off; blu_led_off; wht_led_off
-#define set_led_red     red_led_on;  grn_led_off; blu_led_off; wht_led_off
-#define set_led_blue    red_led_off; grn_led_off; blu_led_on;  wht_led_off
-#define set_led_green   red_led_off; grn_led_on;  blu_led_off; wht_led_off
-#define set_led_white   red_led_off;  grn_led_off;  blu_led_off; wht_led_on
diff --git a/keyboards/redox_w/rules.mk b/keyboards/redox_w/rules.mk
deleted file mode 100644
index f543b5fd9a2..00000000000
--- a/keyboards/redox_w/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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 = yes        # 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
-CUSTOM_MATRIX = lite
-
-# project specific files
-SRC += matrix.c
-UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/redragon/k667/config.h b/keyboards/redragon/k667/config.h
index 33e26c4a39d..6408c97af4a 100644
--- a/keyboards/redragon/k667/config.h
+++ b/keyboards/redragon/k667/config.h
@@ -16,12 +16,5 @@
  
 #pragma once
 
-
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
-
-#define DRIVER_1_LED_TOTAL 45
-#define DRIVER_2_LED_TOTAL 45
-
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
-
diff --git a/keyboards/redragon/k667/info.json b/keyboards/redragon/k667/info.json
index 889ecd56c0c..5261d114763 100644
--- a/keyboards/redragon/k667/info.json
+++ b/keyboards/redragon/k667/info.json
@@ -31,7 +31,6 @@
     "processor": "STM32F103",
     "rgb_matrix": {
         "animations": {
-            "solid_color": true,
             "band_sat": true,
             "band_spiral_val": true,
             "band_spiral_sat": true,
diff --git a/keyboards/redragon/k667/k667.c b/keyboards/redragon/k667/k667.c
index 629e120b7b3..b84bfa40c1d 100644
--- a/keyboards/redragon/k667/k667.c
+++ b/keyboards/redragon/k667/k667.c
@@ -17,96 +17,96 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, G_1,    I_1,    H_1},            
-    {0, G_3,    I_3,    H_3},    
-    {0, G_4,    I_4,    H_4},    
-    {0, G_5,    I_5,    H_5},    
-    {0, G_6,    I_6,    H_6},    
-    {0, G_7,    I_7,    H_7},    
-    {0, G_8,    I_8,    H_8},    
-    {0, G_9,    I_9,    H_9},    
-    {0, G_10,   I_10,   H_10},    
-    {0, G_11,   I_11,   H_11},    
-    {0, G_12,   I_12,   H_12},    
-    {0, G_13,   I_13,   H_13},    
-    {0, G_14,   I_14,   H_14},    
-    {0, G_15,   I_15,   H_15},    
-    {0, D_1,    F_1,    E_1},        
-    {0, D_2,    F_2,    E_2},   
-    {0, D_3,    F_3,    E_3},    
-    {0, D_4,    F_4,    E_4},    
-    {0, D_5,    F_5,    E_5},    
-    {0, D_6,    F_6,    E_6},    
-    {0, D_7,    F_7,    E_7},    
-    {0, D_8,    F_8,    E_8},    
-    {0, D_9,    F_9,    E_9},    
-    {0, D_10,   F_10,   E_10},    
-    {0, D_11,   F_11,   E_11},    
-    {0, D_12,   F_12,   E_12},    
-    {0, D_13,   F_13,   E_13},    
-    {0, D_14,   F_14,   E_14},    
-    {0, D_15,   F_15,   E_15},    
-    {0, A_1,    C_1,    B_1},        
-    {0, A_2,    C_2,    B_2},   
-    {0, A_3,    C_3,    B_3},    
-    {0, A_4,    C_4,    B_4},    
-    {0, A_5,    C_5,    B_5},    
-    {0, A_6,    C_6,    B_6},    
-    {0, A_7,    C_7,    B_7},    
-    {0, A_8,    C_8,    B_8},    
-    {0, A_9,    C_9,    B_9},    
-    {0, A_10,   C_10,   B_10},    
-    {0, A_11,   C_11,   B_11},    
-    {0, A_12,   C_12,   B_12},    
-    {0, A_13,   C_13,   B_13},    
-    {0, A_14,   C_14,   B_14},    
-    {0, A_15,   C_15,   B_15},        
-    {1, G_1,    I_1,    H_1},        
-    {1, G_2,    I_2,    H_2},   
-    {1, G_3,    I_3,    H_3},    
-    {1, G_4,    I_4,    H_4},    
-    {1, G_5,    I_5,    H_5},    
-    {1, G_6,    I_6,    H_6},    
-    {1, G_7,    I_7,    H_7},    
-    {1, G_8,    I_8,    H_8},    
-    {1, G_9,    I_9,    H_9},    
-    {1, G_10,   I_10,   H_10},    
-    {1, G_11,   I_11,   H_11},    
-    {1, G_12,   I_12,   H_12},    
-    {1, G_13,   I_13,   H_13},    
-    {1, G_14,   I_14,   H_14},    
-    {1, G_15,   I_15,   H_15},    
-    {1, D_1,    F_1,    E_1},        
-    {1, D_2,    F_2,    E_2},   
-    {1, D_3,    F_3,    E_3},    
-    {1, D_4,    F_4,    E_4},    
-    {1, D_5,    F_5,    E_5},    
-    {1, D_6,    F_6,    E_6},    
-    {1, D_7,    F_7,    E_7},    
-    {1, D_8,    F_8,    E_8},    
-    {1, D_9,    F_9,    E_9},    
-    {1, D_10,   F_10,   E_10},    
-    {1, D_11,   F_11,   E_11},    
-    {1, D_12,   F_12,   E_12},    
-    {1, D_13,   F_13,   E_13},    
-    {1, D_14,   F_14,   E_14},    
-    {1, D_15,   F_15,   E_15},    
-    {1, A_1,    C_1,    B_1},        
-    {1, A_2,    C_2,    B_2},   
-    {1, A_3,    C_3,    B_3},        
-    {1, A_5,    C_5,    B_5},    
-    {1, A_6,    C_6,    B_6},    
-    {1, A_7,    C_7,    B_7},    
-    {1, A_8,    C_8,    B_8},    
-    {1, A_9,    C_9,    B_9},    
-    {1, A_10,   C_10,   B_10},    
-    {1, A_11,   C_11,   B_11},    
-    {1, A_12,   C_12,   B_12},    
-    {1, A_13,   C_13,   B_13},    
-    {1, A_14,   C_14,   B_14},    
-    {1, A_15,   C_15,   B_15},      
-    {0, G_2,    I_2,    H_2},
-    {1, A_4,    C_4,    B_4}
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+    {0, SW7_CS1,    SW9_CS1,    SW8_CS1},            
+    {0, SW7_CS3,    SW9_CS3,    SW8_CS3},    
+    {0, SW7_CS4,    SW9_CS4,    SW8_CS4},    
+    {0, SW7_CS5,    SW9_CS5,    SW8_CS5},    
+    {0, SW7_CS6,    SW9_CS6,    SW8_CS6},    
+    {0, SW7_CS7,    SW9_CS7,    SW8_CS7},    
+    {0, SW7_CS8,    SW9_CS8,    SW8_CS8},    
+    {0, SW7_CS9,    SW9_CS9,    SW8_CS9},    
+    {0, SW7_CS10,   SW9_CS10,   SW8_CS10},    
+    {0, SW7_CS11,   SW9_CS11,   SW8_CS11},    
+    {0, SW7_CS12,   SW9_CS12,   SW8_CS12},    
+    {0, SW7_CS13,   SW9_CS13,   SW8_CS13},    
+    {0, SW7_CS14,   SW9_CS14,   SW8_CS14},    
+    {0, SW7_CS15,   SW9_CS15,   SW8_CS15},    
+    {0, SW4_CS1,    SW6_CS1,    SW5_CS1},        
+    {0, SW4_CS2,    SW6_CS2,    SW5_CS2},   
+    {0, SW4_CS3,    SW6_CS3,    SW5_CS3},    
+    {0, SW4_CS4,    SW6_CS4,    SW5_CS4},    
+    {0, SW4_CS5,    SW6_CS5,    SW5_CS5},    
+    {0, SW4_CS6,    SW6_CS6,    SW5_CS6},    
+    {0, SW4_CS7,    SW6_CS7,    SW5_CS7},    
+    {0, SW4_CS8,    SW6_CS8,    SW5_CS8},    
+    {0, SW4_CS9,    SW6_CS9,    SW5_CS9},    
+    {0, SW4_CS10,   SW6_CS10,   SW5_CS10},    
+    {0, SW4_CS11,   SW6_CS11,   SW5_CS11},    
+    {0, SW4_CS12,   SW6_CS12,   SW5_CS12},    
+    {0, SW4_CS13,   SW6_CS13,   SW5_CS13},    
+    {0, SW4_CS14,   SW6_CS14,   SW5_CS14},    
+    {0, SW4_CS15,   SW6_CS15,   SW5_CS15},    
+    {0, SW1_CS1,    SW3_CS1,    SW2_CS1},        
+    {0, SW1_CS2,    SW3_CS2,    SW2_CS2},   
+    {0, SW1_CS3,    SW3_CS3,    SW2_CS3},    
+    {0, SW1_CS4,    SW3_CS4,    SW2_CS4},    
+    {0, SW1_CS5,    SW3_CS5,    SW2_CS5},    
+    {0, SW1_CS6,    SW3_CS6,    SW2_CS6},    
+    {0, SW1_CS7,    SW3_CS7,    SW2_CS7},    
+    {0, SW1_CS8,    SW3_CS8,    SW2_CS8},    
+    {0, SW1_CS9,    SW3_CS9,    SW2_CS9},    
+    {0, SW1_CS10,   SW3_CS10,   SW2_CS10},    
+    {0, SW1_CS11,   SW3_CS11,   SW2_CS11},    
+    {0, SW1_CS12,   SW3_CS12,   SW2_CS12},    
+    {0, SW1_CS13,   SW3_CS13,   SW2_CS13},    
+    {0, SW1_CS14,   SW3_CS14,   SW2_CS14},    
+    {0, SW1_CS15,   SW3_CS15,   SW2_CS15},        
+    {1, SW7_CS1,    SW9_CS1,    SW8_CS1},        
+    {1, SW7_CS2,    SW9_CS2,    SW8_CS2},   
+    {1, SW7_CS3,    SW9_CS3,    SW8_CS3},    
+    {1, SW7_CS4,    SW9_CS4,    SW8_CS4},    
+    {1, SW7_CS5,    SW9_CS5,    SW8_CS5},    
+    {1, SW7_CS6,    SW9_CS6,    SW8_CS6},    
+    {1, SW7_CS7,    SW9_CS7,    SW8_CS7},    
+    {1, SW7_CS8,    SW9_CS8,    SW8_CS8},    
+    {1, SW7_CS9,    SW9_CS9,    SW8_CS9},    
+    {1, SW7_CS10,   SW9_CS10,   SW8_CS10},    
+    {1, SW7_CS11,   SW9_CS11,   SW8_CS11},    
+    {1, SW7_CS12,   SW9_CS12,   SW8_CS12},    
+    {1, SW7_CS13,   SW9_CS13,   SW8_CS13},    
+    {1, SW7_CS14,   SW9_CS14,   SW8_CS14},    
+    {1, SW7_CS15,   SW9_CS15,   SW8_CS15},    
+    {1, SW4_CS1,    SW6_CS1,    SW5_CS1},        
+    {1, SW4_CS2,    SW6_CS2,    SW5_CS2},   
+    {1, SW4_CS3,    SW6_CS3,    SW5_CS3},    
+    {1, SW4_CS4,    SW6_CS4,    SW5_CS4},    
+    {1, SW4_CS5,    SW6_CS5,    SW5_CS5},    
+    {1, SW4_CS6,    SW6_CS6,    SW5_CS6},    
+    {1, SW4_CS7,    SW6_CS7,    SW5_CS7},    
+    {1, SW4_CS8,    SW6_CS8,    SW5_CS8},    
+    {1, SW4_CS9,    SW6_CS9,    SW5_CS9},    
+    {1, SW4_CS10,   SW6_CS10,   SW5_CS10},    
+    {1, SW4_CS11,   SW6_CS11,   SW5_CS11},    
+    {1, SW4_CS12,   SW6_CS12,   SW5_CS12},    
+    {1, SW4_CS13,   SW6_CS13,   SW5_CS13},    
+    {1, SW4_CS14,   SW6_CS14,   SW5_CS14},    
+    {1, SW4_CS15,   SW6_CS15,   SW5_CS15},    
+    {1, SW1_CS1,    SW3_CS1,    SW2_CS1},        
+    {1, SW1_CS2,    SW3_CS2,    SW2_CS2},   
+    {1, SW1_CS3,    SW3_CS3,    SW2_CS3},        
+    {1, SW1_CS5,    SW3_CS5,    SW2_CS5},    
+    {1, SW1_CS6,    SW3_CS6,    SW2_CS6},    
+    {1, SW1_CS7,    SW3_CS7,    SW2_CS7},    
+    {1, SW1_CS8,    SW3_CS8,    SW2_CS8},    
+    {1, SW1_CS9,    SW3_CS9,    SW2_CS9},    
+    {1, SW1_CS10,   SW3_CS10,   SW2_CS10},    
+    {1, SW1_CS11,   SW3_CS11,   SW2_CS11},    
+    {1, SW1_CS12,   SW3_CS12,   SW2_CS12},    
+    {1, SW1_CS13,   SW3_CS13,   SW2_CS13},    
+    {1, SW1_CS14,   SW3_CS14,   SW2_CS14},    
+    {1, SW1_CS15,   SW3_CS15,   SW2_CS15},      
+    {0, SW7_CS2,    SW9_CS2,    SW8_CS2},
+    {1, SW1_CS4,    SW3_CS4,    SW2_CS4}
 };
 #endif
diff --git a/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c b/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
deleted file mode 100644
index e6019db2ee0..00000000000
--- a/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2019 Andy Lee <alee@alittlepeacemusic.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
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    KC_P00 = SAFE_RANGE,
-    
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_60_ansi_numpad_split0(
-        QK_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, TG(1), 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_BSLS, KC_INS, KC_HOME, 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_DEL, KC_END, KC_PGDN, KC_PPLS, 
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, C(S(KC_TAB)), KC_UP, LCTL(KC_TAB), 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PENT
-    ),
-
-    [1] = LAYOUT_60_ansi_numpad_split0(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_4,    KC_5,    KC_6,    _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_1,    KC_2,    KC_3,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, KC_0,    KC_P00,  KC_DOT,  _______
-    ),
-    
-    [2] = LAYOUT_60_ansi_numpad_split0(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_P00:
-            if (record->event.pressed) {
-                SEND_STRING("00");
-                 }
-        break;
-         case TG(1):
-           if (record->event.pressed) {
-                tap_code(KC_NUM_LOCK);
-		return true;
-		}
-	   break;
-
-    }
-    return true;
-}
-
-void matrix_init_user (void) {
-  if (!host_keyboard_led_state ().num_lock) {
-      tap_code(KC_NUM_LOCK);
-  }
-}
-
-bool led_update_user(led_t led_state) {
-    if (led_state.num_lock) {
-        layer_on(1);
-    } else {
-        layer_off(1);
-    }
-    return true;
-}
diff --git a/keyboards/retro_75/keymaps/split_backspace/keymap.c b/keyboards/retro_75/keymaps/split_backspace/keymap.c
deleted file mode 100644
index f962b75b5c1..00000000000
--- a/keyboards/retro_75/keymaps/split_backspace/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = LAYOUT_split_bs(
-    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,    MO(1),
-    KC_LCTL,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-
-  [1] = LAYOUT_split_bs(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,  _______,                                _______,                                _______,  _______,  _______,  _______
-  ),
-};
diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
index e4d91482c9f..cc14e26943f 100644
--- a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
+++ b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
@@ -19,7 +19,7 @@
 // place overrides here
 
 #define WS2812_DI_PIN D3
-  #define RGBLED_NUM 9
+  #define RGBLIGHT_LED_COUNT 9
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
index e4d91482c9f..cc14e26943f 100644
--- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
+++ b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
@@ -19,7 +19,7 @@
 // place overrides here
 
 #define WS2812_DI_PIN D3
-  #define RGBLED_NUM 9
+  #define RGBLIGHT_LED_COUNT 9
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/reviung/reviung39/keymaps/default/config.h b/keyboards/reviung/reviung39/keymaps/default/config.h
index d868c539e42..d882e8ad949 100644
--- a/keyboards/reviung/reviung39/keymaps/default/config.h
+++ b/keyboards/reviung/reviung39/keymaps/default/config.h
@@ -19,7 +19,7 @@
 // place overrides here
 
 #define WS2812_DI_PIN D3
-  #define RGBLED_NUM 11
+  #define RGBLIGHT_LED_COUNT 11
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/reviung/reviung39/keymaps/default_s/config.h b/keyboards/reviung/reviung39/keymaps/default_s/config.h
index c44a5f9d7c3..3fd3c73fcc2 100644
--- a/keyboards/reviung/reviung39/keymaps/default_s/config.h
+++ b/keyboards/reviung/reviung39/keymaps/default_s/config.h
@@ -19,7 +19,7 @@
 // place overrides here
 
 #define WS2812_DI_PIN D3
-  #define RGBLED_NUM 6
+  #define RGBLIGHT_LED_COUNT 6
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/reviung/reviung39/keymaps/default_s/readme.md b/keyboards/reviung/reviung39/keymaps/default_s/readme.md
index b882ec40c28..a67401b97c3 100644
--- a/keyboards/reviung/reviung39/keymaps/default_s/readme.md
+++ b/keyboards/reviung/reviung39/keymaps/default_s/readme.md
@@ -3,4 +3,4 @@
 __REVIUNG39S is simple version__  
 
 The number of RGB LEDs is set to 6.  
-To change the number of RGB LEDs, change the "#define RGBLED_NUM 6" number in "default_s / config.h".
+To change the number of RGB LEDs, change the "#define RGBLIGHT_LED_COUNT 6" number in "default_s / config.h".
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
deleted file mode 100644
index a947a6c67f6..00000000000
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 gtips
- *
- * 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
-
-// place overrides here
-
-#define WS2812_DI_PIN D3
-  #define RGBLED_NUM 11
-  #define RGBLIGHT_HUE_STEP 16
-  #define RGBLIGHT_SAT_STEP 16
-  #define RGBLIGHT_VAL_STEP 16
-  #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
-#define RGBLIGHT_EFFECT_TWINKLE
-// /*== 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
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
deleted file mode 100644
index e47beb059b5..00000000000
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2019 gtips
- *
- * 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,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_reviung39(
-   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,   SFT_T(KC_SCLN), KC_RGUI,
-   KC_SPC, KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,             KC_N,  KC_M,  KC_RCTL, KC_DOT, KC_RALT, RGUI(KC_RSFT),
-                                       LOWER,  KC_ENT,  RAISE
-  ),
-
-  [_LOWER] = LAYOUT_reviung39(
-   KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR,  KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, RCMD(RALT(KC_I)), RCMD(RALT(KC_O)), _______,
-   _______, KC_LT, KC_GT, KC_LPRN, KC_RPRN, KC_GRV,       KC_MINS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_PIPE,
-   KC_LALT, _______, _______, ADJUST, KC_EQL, KC_QUES,   KC_UNDS, KC_PLUS, KC_COMM, _______, KC_SLSH, _______,
-                                      _______,  _______,  KC_RGUI
-  ),
-
-  [_RAISE] = LAYOUT_reviung39(
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  _______,
-  _______, KC_COLN, KC_SCLN, KC_DQT, KC_QUOT, KC_BSLS,    KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______,   ADJUST, _______, _______, _______, _______, _______,
-                                       KC_LGUI,  _______,  _______
-  ),
-
-  [_ADJUST] = LAYOUT_reviung39(
-    _______, _______, _______, _______, RCMD(LALT(KC_1)), RCMD(LALT(KC_2)), RCMD(LALT(KC_3)), RCMD(LALT(KC_4)), RCMD(LALT(KC_5)), RCMD(LALT(KC_6)), RCMD(LALT(KC_7)), RCMD(LALT(KC_0)),
-    RGB_SAI, RGB_HUI,  RGB_MOD,  _______,   RGB_TOG,    RGB_VAI,   RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, _______,   _______,
-    KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU,  QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,
-                                                   KC_LGUI,  _______,  _______
-  ),
-};
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/readme.md b/keyboards/reviung/reviung39/keymaps/toshi0383/readme.md
deleted file mode 100644
index 5a09f2559aa..00000000000
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# toshi0383's keymap for REVIUNG39
-
-__REVIUNG39 is regular version__  
diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/rules.mk b/keyboards/reviung/reviung39/keymaps/toshi0383/rules.mk
deleted file mode 100644
index 7ad666d1a38..00000000000
--- a/keyboards/reviung/reviung39/keymaps/toshi0383/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
deleted file mode 100644
index 1d7ad67a629..00000000000
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 @Ciutadellla
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define RGBLIGHT_LAYERS
-    // /*== or choose animations ==*/
-    #define RGBLIGHT_EFFECT_BREATHING
-    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-
-#define TAPPING_TERM 200
-#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
deleted file mode 100644
index a4279821ccc..00000000000
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* Copyright 2021 @Ciutadellla
- *
- * 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,
-     _LOWER,
-     _RAISE,
-     _MOVE,
-     _ADJUST
- };
-
- //UNICODES
- #include "process_unicode.h"
-
- enum unicode_names {
-     CKC_EUR,
-     N_TILDE,
-     COMB_ACUTE_ACCENT,
-     GRINNING_FACE, // 😃
-     BEAMING_FACE, // 😁
-     GRINNING_FACE_WITH_SWEAT, // 😅
-     ROLLING_LAUGHING, // 🤣
-     FACE_TEARS_JOY, // 😂
-     WINKING_FACE, // 😉
-     SMILING_FACE_HALO, // 😇
-     SMILING_FACE_HEARTS, // 🥰
-     SMILING_FACE_HEART_EYES, // 😍
-     FACE_BLOWING_KISS, // 😘
-     FACE_SAVORING_FOOD, // 😋
-     ZANY_FACE, // 🤪
-     HUGGING_FACE, // 🤗
-     SHUSHING_FACE, // 🤫
-     THINKING_FACE, // 🤔
-     FACE_RAISED_EYEBROW, // 🤨
-     NEUTRAL_FACE, // 😐
-     SMIRKING_FACE, // 😏
-     FACE_ROLLING_EYES, // 🙄
-     PENSIVE_FACE, // 😔
-     FACE_VOMITING, // 🤮
-     WOOZY_FACE, // 🥴
-     PLEADING_FACE, // 🥺
-     LOUDLY_CRYING_FACE, // 😭
-     DISAPPOINTED_FACE, // 😞
-     FACE_SYMBOLS_MOUTH, // 🤬
-     SMILING_FACE_HORNS, // 😈
-     SKULL, // 💀
-     PILE_POO, // 💩
-     GHOST, // 👻
-     ALIEN_MONSTER, // 👾
-     RED_HEART, // ❤
-     BOMB, // 💣
-     WAVING_HAND, // 👋
-     OK_HAND, // 👌
-     CLAPPING_HANDS, // 👏
-     EYES, // 👀
-     MAN_FACEPALMING, // 🤦
-     TURTLE, // 🐢
-     SNAKE, // 🐍
-     SPOUTING_WHALE, // 🐳
-     DRAGON, // 🐉
-     TREX, // 🦖
-     THUMBSDOWN, // 👍
-     THUMBSUP, // 👎
- };
-
- //https://unicode-table.com/en/#00F1
- const uint32_t unicode_map[] PROGMEM = {
-     [CKC_EUR] = 0x20AC, //€
-     [N_TILDE] = 0x00F1,  // ñ
-     [COMB_ACUTE_ACCENT] = 0x0301,  // ´
-     [GRINNING_FACE] = 0x1F603,
-     [BEAMING_FACE] = 0x1F601,
-     [GRINNING_FACE_WITH_SWEAT] = 0x1F605,
-     [ROLLING_LAUGHING] = 0x1F923,
-     [FACE_TEARS_JOY] = 0x1F602,
-     [WINKING_FACE] = 0x1F609,
-     [SMILING_FACE_HALO] = 0x1F607,
-     [SMILING_FACE_HEARTS] = 0x1F970,
-     [SMILING_FACE_HEART_EYES] = 0x1F60D,
-     [FACE_BLOWING_KISS] = 0x1F618,
-     [FACE_SAVORING_FOOD] = 0x1F60B,
-     [ZANY_FACE] = 0x1F92A,
-     [HUGGING_FACE] = 0x1F917,
-     [SHUSHING_FACE] = 0x1F92B,
-     [THINKING_FACE] = 0x1F914,
-     [FACE_RAISED_EYEBROW] = 0x1F928,
-     [NEUTRAL_FACE] = 0x1F610,
-     [SMIRKING_FACE] = 0x1F60F,
-     [FACE_ROLLING_EYES] = 0x1F644,
-     [PENSIVE_FACE] = 0x1F614,
-     [FACE_VOMITING] = 0x1F92E,
-     [WOOZY_FACE] = 0x1F974,
-     [PLEADING_FACE] = 0x1F97A,
-     [LOUDLY_CRYING_FACE] = 0x1F62D,
-     [DISAPPOINTED_FACE] = 0x1F61E,
-     [FACE_SYMBOLS_MOUTH] = 0x1F92C,
-     [SMILING_FACE_HORNS] = 0x1F608,
-     [SKULL] = 0x1F480,
-     [PILE_POO] = 0x1F4A9,
-     [GHOST] = 0x1F47B,
-     [ALIEN_MONSTER] = 0x1F47E,
-     [RED_HEART] = 0x2764,
-     [BOMB] = 0x1F4A3,
-     [WAVING_HAND] = 0x1F44B,
-     [OK_HAND] = 0x1F44C,
-     [CLAPPING_HANDS] = 0x1F44F,
-     [EYES] = 0x1F440,
-     [MAN_FACEPALMING] = 0x1F926,
-     [TURTLE] = 0x1F422,
-     [SNAKE] = 0x1F40D,
-     [SPOUTING_WHALE] = 0x1F433,
-     [DRAGON] = 0x1F409,
-     [TREX] = 0x1F996,
-     [THUMBSDOWN] = 0x1F44E,
-     [THUMBSUP] = 0x1F44D,
- };
-
-
- void matrix_init_user(void){
-     set_unicode_input_mode(UNICODE_MODE_MACOS);
- }
-
-
- // Shortcut to make keymap more readable
- #define KC_OSX_EJECT 0x66
- #define LOCK_OSX LSFT(LCTL(KC_OSX_EJECT))
- #define SLEEP_OSX LALT(LGUI(KC_OSX_EJECT))
- #define KC_C_LF  RCTL(KC_LEFT)     // control + left
- #define KC_C_RT  RCTL(KC_RGHT)     // control + right
-
- // tap dance declarations
- enum {
-     _TD_TAB_ESC = 0,
-     _TD_BSPC_WDEL,
-     _TD_SFT_CAPS,
-     _TD_SPC_ENT,
-     _TD_N_NTILDE,
-     _TD_CTRL_LANG,
-     _TD_SCLN_NTILDE
- };
-
- #define TD_TAB_ESC TD(_TD_TAB_ESC)
- #define TD_BSPC_WDEL TD(_TD_BSPC_WDEL)
- #define TD_SFT_CAPS TD(_TD_SFT_CAPS)
- #define TD_SPC_ENT TD(_TD_SPC_ENT)
- #define TD_N_NTILDE TD(_TD_N_NTILDE)
- #define TD_CTRL_LANG TD(_TD_CTRL_LANG)
- #define TD_SCLN_NTILDE TD(_TD_SCLN_NTILDE) //TP with costum keycodes has to be a funtion
-
- void td_scln_ntilde(tap_dance_state_t *state, void *user_data) {
-      if (state->count == 1) {
-         register_code(KC_SCLN);
-         unregister_code(KC_SCLN);
-      } else {
-         send_unicode_string("ñ");
-      }
-      reset_tap_dance(state);
- }
-
- // Tap Dance Definitions
- tap_dance_action_t tap_dance_actions[] = {
-     [_TD_TAB_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC),
-     [_TD_BSPC_WDEL] = ACTION_TAP_DANCE_DOUBLE(KC_BSPC, LALT(KC_BSPC)),
-     [_TD_SFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-     [_TD_SPC_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT),
-     [_TD_CTRL_LANG] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, LCTL(LSFT(KC_SPACE))),
-     [_TD_SCLN_NTILDE] = ACTION_TAP_DANCE_FN(td_scln_ntilde),
- };
-
-
- const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-     /* Qwerty 0
-    * ,-----------------------------------------+         +-----------------------------------------.
-    * | Tab  |   Q  |   W  |   E  |   R  |   T  |         |   Y  |   U  |   I  |   O  |   P  | Bksp |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * |CtlLNG|   A  |   S  |   D  |   F  |   G  |         |   H  |   J  |   K  |   L  |   ;  |   "  |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * | Shift|   Z  |   X  |   C  |   V  |   B  |         |   N  |   M  |   ,  |   .  |   /  | Shift|
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    *                             | GUI  | Lower|  Space  | Raise| Alt  |
-    *                             +-------------/         \--------------+
-    */
-     [_BASE] =  LAYOUT_reviung41(TD_TAB_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD_BSPC_WDEL, TD_CTRL_LANG, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD_SCLN_NTILDE, KC_QUOT, TD_SFT_CAPS, 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, MO(1), TD_SPC_ENT, MO(2), LT(4,KC_NO)),
-
-
-     /* LOWER 1
-    * ,-----------------------------------------+         +-----------------------------------------.
-    * | Tab  |   !  |  @   |   #  |   $  |   %  |         |   ^  |   &  |   *  |  ()  |   )  |  Del |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * | Ctl  |   _  |  +   |  {}  |   }  |   |  |         | LEFT | DOWN |  UP  | RIGHT|  ´   |   "  |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * | Shift| Esc  |  Gui |  Alt |  =   |  ""  |         | HOME | END  | PGUP | PDOWN|   /  | Shft |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    *                             | GUI  | Lower|  Space  | Raise| Alt  |
-    *                             +-------------/         \--------------+
-    */
-         [_LOWER] = LAYOUT_reviung41(KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_ESC, KC_LGUI, KC_LALT, KC_LCTL, KC_TRNS, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_PSCR, MT(MOD_LSFT | MOD_RSFT,KC_SPC), KC_TRNS, KC_TRNS, KC_ENT, MO(3), KC_TRNS),
-
-   /* Raise 2
-    * ,-----------------------------------------+         +-----------------------------------------.
-    * |      |   1  |   2  |   3  |   4  |   5  |         |   6  |   7  |   8  |   9  |   0  | DEL  |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * |      | MINS |  EQL | LBRC | RBRC | BSLS |         |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * |      |      |      |      |      | QUOT |         |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    *                             | ____ | MO(3)|   BSPC  | ____  | ____ |
-    *                             +-------------/         \--------------+
-    */
-
-            // [_RAISE] = LAYOUT_reviung41(
-     //     KC_TRNS, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5,                 KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, KC_DEL,
-     //     KC_TRNS, KC_LPRN, KC_RPRN, KC_LT, KC_GT, KC_AMPR,           KC_PMNS, KC_PPLS, KC_HASH, KC_PERC, KC_COLN, KC_PEQL,
-     //     KC_TRNS, KC_LCBR, KC_RCBR, KC_SLSH, KC_INT1, KC_PIPE,       KC_PSLS, KC_PAST, KC_PCMM, KC_PDOT, KC_HASH, KC_PENT,
-     //                                     KC_TRNS, MO(3), KC_BSPC, KC_TRNS, KC_TRNS
-     // ),
-
-     [_RAISE] = LAYOUT_reviung41(
-         KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_P0, KC_PPLS, KC_PMNS,
-         KC_COLN, KC_DQUO, KC_LCBR, KC_RCBR, KC_LT, KC_GT, KC_P4, KC_P5, KC_P6, KC_PERC, KC_PAST, KC_PSLS,
-         KC_AMPR, KC_PIPE, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_P1, KC_P2, KC_P3, KC_PCMM, KC_PDOT, KC_PEQL,
-         KC_TRNS, MO(3), KC_PENT, KC_TRNS, KC_TRNS
-         ),
-
-
-   /* _MOVE 3
-    * ,---------------------------------------------------+     +------------------------------------------.
-    * |       |       |       |         |       |         |     |      | WHD  |  WHU |      |      |  LOCK |
-    * |-------+-------+-------+---------+-------+---------+     +------+------+------+------+------+-------|
-    * |       |       |       |         |       |         |     | M_L  | M_D  | M_I  | M_R  |      | SLEEP |
-    * |-------+-------+-------+---------+-------+---------+     +------+------+------+------+------+-------|
-    * |       |       |       |         | SCRLFT| SCRRGHT |     | M_B1 |  M_B2|  M0  |  M2  |      | QK_BOOT |
-    * |-------+-------+-------+---------+-------+---------+     +------+------+------+------+------+-------|
-    *                                   | ____ | ____ |    BSPC   | ____  | ____ |
-    *                                   +-------------/            \--------------+
-    */
-     [_MOVE] = LAYOUT_reviung41(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, LOCK_OSX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL0, SLEEP_OSX, KC_F13, KC_F14, KC_F15, KC_F16, KC_C_LF, KC_C_RT, KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-     /* _ADJUST 4
-    * ,----------------------------------------+         +---------------------------------------------------.
-    * |  😃  |   😅 |  🤣  |  😉  |  😇  |  🥰  |          | RGBUP | HUEUP  | RGB_MOD |  BRIU  | PLAY  | VOLU |
-    * |------+-----+------+------+------+------+         +-------+--------+----------+-------+-------+------|
-    * |  😍  |  😘  |  🙄  |  😔  |  😭  |  💩  |          | RGBDWN| HUEDWN | RGB_TOG |  BRID  | STOP  | VOLD |
-    * |------+-----+------+------+------+------+         +-------+--------+----------+--------+------+------|
-    * |  👍  |  👎  |  👏  |  👀  |  🤦  |  👻  |          | RGB_TG|        |         |        |       | MUTE |
-    * |------+------+------+------+------+------+        +-------+--------+----------+--------+------+------|
-    *                             | GUI  | Lower|  BSPC   | Raise| Alt  |
-    *                             +-------------/         \--------------+
-    */
-
-     [_ADJUST] = LAYOUT_reviung41(UM(GRINNING_FACE), UM(GRINNING_FACE_WITH_SWEAT), UM(ROLLING_LAUGHING), UM(WINKING_FACE), UM(SMILING_FACE_HALO), UM(SMILING_FACE_HEARTS), RGB_VAI, RGB_HUI, RGB_MOD, KC_BRIU, KC_MPLY, KC_VOLU, UM(SMILING_FACE_HEART_EYES), UM(FACE_BLOWING_KISS), UM(FACE_ROLLING_EYES), UM(PENSIVE_FACE), UM(LOUDLY_CRYING_FACE), UM(PILE_POO), RGB_VAD, RGB_HUD, RGB_RMOD, KC_BRID, KC_MSTP, KC_VOLD, UM(THUMBSUP), UM(THUMBSDOWN), UM(CLAPPING_HANDS), UM(EYES), UM(MAN_FACEPALMING), UM(GHOST), RGB_TOG, RGB_SAD, RGB_SAI, RGB_SPD, RGB_SPI, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-
- };
-
-
-
- #ifdef RGBLIGHT_ENABLE
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_RED}    // Light 1 LED, starting with LED 0
- );
-
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_CYAN}    // Light 1 LED, starting with LED 0
- );
-
- const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_GREEN}  // Light 1 LED, starting with LED 1
- );
-
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_rise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_MAGENTA}    // Light 1 LED, starting with LED 0
- );
-
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_MOVE_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_YELLOW}    // Light 1 LED, starting with LED 0
- );
-
-
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_ADJUST_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_AZURE}    // Light 1 LED, starting with LED 0
- );
-
- // Now define the array of layers. Later layers take precedence
- const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-     my_base_layer,          // 0
-     my_lower_layer,         // 1
-     my_rise_layer,          // 2
-     my_MOVE_layer,        // 3
-     my_ADJUST_layer,   // 4
-     my_capslock_layer       // 5
- );
-
- // Enable the LED layers
- void keyboard_post_init_user(void) {
-     rgblight_layers = my_rgb_layers;
- }
-
- layer_state_t layer_state_set_user(layer_state_t state) {
-     rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER));
-     rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE));
-     rgblight_set_layer_state(3, layer_state_cmp(state, _MOVE));
-     rgblight_set_layer_state(4, layer_state_cmp(state, _ADJUST));
-     return state;
- }
-
- bool led_update_user(led_t led_state) {
-     rgblight_set_layer_state(5, led_state.caps_lock);
-     return true;
- }
- #endif
-
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/rules.mk b/keyboards/reviung/reviung41/keymaps/ciutadellla/rules.mk
deleted file mode 100644
index eeafc120062..00000000000
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# MCU name
-MCU = atmega32u4
-BOOTLOADER = atmel-dfu
-MOUSEKEY_ENABLE = yes        # Mouse keys
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-UNICODEMAP_ENABLE = yes         # Unicode
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
index 854af5142d1..ddd5ef6cf5f 100644
--- a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
+++ b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
@@ -20,7 +20,7 @@
 
 // ---  RGB underglow  ---
 #define WS2812_DI_PIN B7
-  #define RGBLED_NUM 12
+  #define RGBLIGHT_LED_COUNT 12
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/rgbkb/common/touch_encoder.c b/keyboards/rgbkb/common/touch_encoder.c
index 5f0e4f0ccad..18037b8fb57 100644
--- a/keyboards/rgbkb/common/touch_encoder.c
+++ b/keyboards/rgbkb/common/touch_encoder.c
@@ -125,7 +125,7 @@ bool touch_slave_init = false;
 slave_touch_status_t touch_slave_state = { 0, 0 };
 
 static bool write_register8(uint8_t address, uint8_t data) {
-    i2c_status_t status = i2c_writeReg((I2C_ADDRESS << 1), address, &data, sizeof(data), I2C_TIMEOUT);
+    i2c_status_t status = i2c_write_register((I2C_ADDRESS << 1), address, &data, sizeof(data), I2C_TIMEOUT);
     if (status != I2C_STATUS_SUCCESS) {
         xprintf("write_register8 %d failed %d\n", address, status);
     }
@@ -133,7 +133,7 @@ static bool write_register8(uint8_t address, uint8_t data) {
 }
 
 static bool read_register(uint8_t address, uint8_t* data, uint16_t length) {
-    i2c_status_t status = i2c_readReg((I2C_ADDRESS << 1), address, data, length, I2C_TIMEOUT);
+    i2c_status_t status = i2c_read_register((I2C_ADDRESS << 1), address, data, length, I2C_TIMEOUT);
     if (status != I2C_STATUS_SUCCESS) {
         xprintf("read_register %d failed %d\n", address, status);
         return false;
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 87a7fe13192..b247fa91cd0 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -43,63 +43,6 @@
 /* Split Transport Features */
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
 
-#define RGB_MATRIX_LED_COUNT 98
-#define RGB_MATRIX_SPLIT { 49, 49 }
-#define RGB_MATRIX_CENTER { 128, 34 }
-#define RGB_MATRIX_LED_FLUSH_LIMIT 33
-#define RGB_MATRIX_LED_PROCESS_LIMIT 10
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-#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
-
 #if RGB_UNLIMITED_POWER
   #define RGBLIGHT_LIMIT_VAL 255
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/rgbkb/mun/keymaps/default/config.h b/keyboards/rgbkb/mun/keymaps/default/config.h
index 88bdc06dee1..7b8e106b46a 100644
--- a/keyboards/rgbkb/mun/keymaps/default/config.h
+++ b/keyboards/rgbkb/mun/keymaps/default/config.h
@@ -18,4 +18,4 @@
 
 // 20m timeout (20m * 60s * 1000mil)
 // #define RGB_MATRIX_TIMEOUT 1200000
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
diff --git a/keyboards/rgbkb/mun/keymaps/peott-fr/config.h b/keyboards/rgbkb/mun/keymaps/peott-fr/config.h
deleted file mode 100644
index a0b6cced11f..00000000000
--- a/keyboards/rgbkb/mun/keymaps/peott-fr/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/Legonut> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
- * ----------------------------------------------------------------------------
- */
-
-#pragma once
-
-// No need for the single versions when multi performance isn't a problem =D
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define DISABLE_RGB_MATRIX_SPLASH
-#define DISABLE_RGB_MATRIX_SOLID_SPLASH
-
-// 20m timeout (20m * 60s * 1000mil)
-// #define RGB_MATRIX_TIMEOUT 1200000
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define STM32_ONBOARD_EEPROM_SIZE 2048
diff --git a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c b/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
deleted file mode 100644
index 4d62b95b963..00000000000
--- a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/Legonut> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
- * ----------------------------------------------------------------------------
- */
-
-#include QMK_KEYBOARD_H
-#include "common_oled.h"
-
-enum keymap_layers {
-    _BASE,
-    _LHAND,
-    _FUNC
-};
-
-//Layers and special keys.
-#define SPC_LHND LT(_LHAND, KC_SPC)
-#define BSP_FUNC LT(_FUNC, KC_BSPC)
-#define DEL_FUNC LT(_FUNC, KC_DEL)
-
-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      |   Home |  |   End  | H      | J      | K      | L      | :      | '      |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | Shift/(| Z      | X      | C      | V      | B      |   Play |  |   Mute | N      | M      | ,      | .      | /      | Shift/)|
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | LCtrl  | Win    | Alt    | MO(3)  | L2/Del | Space  | Space  |  | Bcksp  | Bcksp  | Left   | Down   | Up     | Right  | Ctrl   |
-     * '--------+--------+--------+--------+--------+--------+--------'  '--------+--------+--------+--------+--------+--------+--------'
-     *      Encoder 1         Encoder 2                                                                  Encoder 3         Encoder 4
-     * .-----------------------------------.                                                        .-----------------------------------.
-     * | VolUp  | VolDn  | VolUp  | VolDn  |                                                        | PgUp   | PgDn   | PgUp   | PgDn   |
-     * |--------+--------+--------+--------+--------.                                      .--------+--------+--------+--------+--------|
-     * | VolDn  | VolUp  | Next   | Play   | Prev   | Touch Encoder          Touch Encoder | RgbHuI | RgbHuD | RgbMdD | RgbTog | RgbMdI |
-     * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
-     */
-    [_BASE] = LAYOUT(
-			KC_ESC,  KC_1,    KC_2,    KC_3,  KC_4, 	KC_5,     KC_GRV, 		KC_EQL,   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_LBRC,  	KC_RBRC,  KC_Y,     KC_U,    KC_I,    KC_O,   KC_P,    KC_BSLS,
-			KC_LCTL, KC_A,    KC_S,    KC_D,  KC_F, 	KC_G,     KC_HOME,  	KC_END,   KC_H,     KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-			SC_LSPO, KC_Z,    KC_X,    KC_C,  KC_V,     KC_B,     KC_MPLY,  	KC_MUTE,  KC_N,     KC_M,    KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
-			KC_LCTL, KC_LGUI, KC_LALT, MO(3), DEL_FUNC, SPC_LHND, SPC_LHND, 	BSP_FUNC, BSP_FUNC, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, KC_RCTL,
-			// Here we have the encoder setup. Encoder 0 clockwise, Encoder 0 counter-clockwise, Encoder 1 clockwise, Encoder 1 counter-clockwise , then right side
-			KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV, RGB_HUI, RGB_HUD, RGB_RMOD, RGB_TOG, RGB_MOD
-			),
-    [_LHAND] = LAYOUT(
-			QK_BOOT,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,		KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_PGUP, 		KC_PGDN, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-			KC_LSFT, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT,  KC_BSPC, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN, KC_RSFT,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_TRNS,
-			// Encoders.
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-			),
-    [_FUNC] = LAYOUT(
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, QK_BOOT,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			// Encoders.
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-			),
-	// Placeholder layer!
-	[3] = LAYOUT(
-			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, 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, 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, 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,
-			// Encoders.
-			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-			)
-};
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
-    [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-    [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-    [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
-};
-#endif
diff --git a/keyboards/rgbkb/mun/keymaps/via/config.h b/keyboards/rgbkb/mun/keymaps/via/config.h
index a0f581b50a6..67ad76d191e 100644
--- a/keyboards/rgbkb/mun/keymaps/via/config.h
+++ b/keyboards/rgbkb/mun/keymaps/via/config.h
@@ -18,7 +18,7 @@
 
 // 20m timeout (20m * 60s * 1000mil)
 // #define RGB_MATRIX_TIMEOUT 1200000
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 // 224B per layer right now
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/config.h b/keyboards/rgbkb/mun/keymaps/xulkal2/config.h
deleted file mode 100644
index c945db14176..00000000000
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/Legonut> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
- * ----------------------------------------------------------------------------
- */
-
-#pragma once
-
-// Xulkal custom stuff
-#undef QUICK_TAP_TERM
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 175
-
-#define SPACE_CADET_MODIFIER_CARRYOVER
-#define LSPO_KEYS KC_LSFT, KC_TRNS, KC_LBRC
-#define RSPC_KEYS KC_RSFT, KC_TRNS, KC_RBRC
-#define LCPO_KEYS KC_LCTL, KC_TRNS, KC_MINS
-#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_EQL
-
-// No need for the single versions when multi performance isn't a problem =D
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-
-// 20m timeout (20m * 60s * 1000mil)
-// #define RGB_MATRIX_TIMEOUT 1200000
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define OLED_SCROLL_TIMEOUT 20000
-#define ONESHOT_TAP_TOGGLE 2
-
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 8
-
-#define ENCODER_RESOLUTION 2
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
deleted file mode 100644
index eefb59e676a..00000000000
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/Legonut> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
- * ----------------------------------------------------------------------------
- */
-
-#include QMK_KEYBOARD_H
-#include "common_oled.h"
-
-enum keymap_layers {
-    _QWERTY,
-    _FUNCTION,
-    _ADJUST
-};
-
-enum keymap_keycodes {
-    // Disables touch processing
-    TCH_TOG = SAFE_RANGE,
-    MENU_BTN,
-    MENU_UP,
-    MENU_DN,
-    RGB_RST
-};
-
-// Default Layers
-#define QWERTY   DF(_QWERTY)
-
-// Momentary Layers
-#define FN       OSL(_FUNCTION)
-#define ADJ      OSL(_ADJUST)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* QWERTY
-     * .--------------------------------------------------------------.  .--------------------------------------------------------------.
-     * | `~/ESC | 1      | 2      | 3      | 4      | 5      |        |  |        | 6      | 7      | 8      | 9      | 0      | Bckspc |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | Tab    | Q      | W      | E      | R      | T      |        |  |        | Y      | U      | I      | O      | P      | \      |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | Caps   | A      | S      | D      | F      | G      | Play   |  | MN BTN | H      | J      | K      | L      | :      | Enter  |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | Shft[  | Z      | X      | C      | V      | B      | {      |  | }      | N      | M      | ,      | .      | /      | Shft]  |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | Ctrl-  | Win    | Alt    | Del    | Space  |        | ADJ    |  | FN     |        | Space  | '"     | Alt    | App    | Ctrl=  |
-     * '--------+--------+--------+--------|--------+--------+--------'  '--------+--------+--------+--------+--------+--------+--------'
-     * |--------+--------+--------+--------+--------.                                      .--------+--------+--------+--------+--------|
-     * | VolDn  | VolUp  | Next   | Play   | Prev   | Touch Encoder          Touch Encoder | RgbHuI | RgbHuD | RgbMdD | RgbTog | RgbMdI |
-     * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
-     */
-    [_QWERTY] = LAYOUT(
-        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_NO,      KC_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_NO,      KC_NO,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MPLY,    MENU_BTN,KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,    KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-        SC_LCPO, KC_LGUI, KC_LALT, KC_DEL,  KC_SPC,  KC_NO,   ADJ,        FN,      KC_NO,   KC_SPC,  KC_QUOTE,KC_RALT, KC_APP,  SC_RCPC,
-
-        KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                        RGB_HUI, RGB_HUD, RGB_RMOD,RGB_TOG, RGB_MOD
-    ),
-
-    /* Function
-     * .--------------------------------------------------------------.  .--------------------------------------------------------------.
-     * | F12    | F1     | F2     | F3     | F4     | F5     |        |  |        | F6     | F7     | F8     | F9     | F10    | F11    |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | SPDI   | SAI    | VAI    | HUI    | RGBMD  |        |  |        |        |        | PrtScr | ScrLck | PseBrk |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | SPDD   | SAD    | VAD    | HUD    | RGBRMD |        |  |        |        |        | Ins    | Home   | PgUp   |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | RGBRST |        |        |        | RGBTOG |        |  |        |        |        | Del    | End    | PgDn   |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        |        |        |  |        |        | Play   | Prev   | Next   | VolUp  | VolDn  |
-     * '--------+--------+--------+--------+--------+--------+--------'  '--------+--------+--------+--------+--------+--------+--------'
-     * |--------+--------+--------+--------+--------.                                      .--------+--------+--------+--------+--------|
-     * |        |        |        |        |        | Touch Encoder          Touch Encoder |        |        |        |        |        |
-     * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
-     */
-    [_FUNCTION] = LAYOUT(
-        KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,    _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-        _______, RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, RGB_MOD, _______,    _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-        _______, RGB_SPD, RGB_SAD, RGB_VAD, RGB_HUD, RGB_RMOD,_______,    _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
-        _______, RGB_RST, _______, _______, _______, RGB_TOG, _______,    _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______,
-        _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLU, KC_VOLD,
-
-        _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______
-    ),
-
-    /* Adjust
-     * .--------------------------------------------------------------.  .--------------------------------------------------------------.
-     * |        |        |        |        |        |        |        |  |        |        | NumLck | /      | *      | -      | Del    |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | Home   | Up     | End    | Reset  | T_TOG  |        |  |        |        | 7      | 8      | 9      | +      |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | Left   | Down   | Right  |        |        |        |  |        |        | 4      | 5      | 6      | +      |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        | EepRst |        |  |        |        | 1      | 2      | 3      | Enter  |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        |        |        |  |        |        |        | 0      | .      | Enter  |        |
-     * '--------+--------+--------+--------+--------+--------+--------'  '--------+--------+--------+--------+--------+--------+--------'
-     *      Encoder 1         Encoder 2                                                                  Encoder 3         Encoder 4
-     * .-----------------------------------.                                                        .-----------------------------------.
-     * |        |        |        |        |                                                        |        |        |        |        |
-     * |--------+--------+--------+--------+--------.                                      .--------+--------+--------+--------+--------|
-     * |        |        |        |        |        | Touch Encoder          Touch Encoder |        |        |        |        |        |
-     * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
-     */
-    [_ADJUST] = LAYOUT(
-        KC_GRV,  _______, _______, _______, _______, _______, _______,    _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_DEL,
-        _______, KC_HOME, KC_UP,   KC_END,  QK_BOOT, TCH_TOG, _______,    _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______, _______,    _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______,
-        _______, _______, _______, _______, _______, EE_CLR,  _______,    _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______,
-        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, KC_KP_0, KC_PDOT, KC_PENT, _______,
-
-        _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______
-    )
-};
-// clang-format on
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode)
-    {
-        case MENU_BTN:
-            if (record->event.pressed) {
-                rgb_menu_selection();
-            }
-            return false;
-        case MENU_UP:
-            if (record->event.pressed) {
-                rgb_menu_action(true);
-            }
-            return false;
-        case MENU_DN:
-            if (record->event.pressed) {
-                rgb_menu_action(false);
-            }
-            return false;
-        case RGB_RST:
-            if (record->event.pressed) {
-                eeconfig_update_rgb_matrix_default();
-            }
-            return false;
-        case TCH_TOG:
-            if (record->event.pressed) {
-                touch_encoder_toggle();
-            }
-            return false;  // Skip all further processing of this key
-        default:
-            return true;
-    }
-}
-
-//#define MATRIX_SCAN_DEBUG
-#if !defined(MATRIX_SCAN_DEBUG)
-static void render_layer(void) {
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer"), false);
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("BASE "), false);
-            break;
-        case _FUNCTION:
-            oled_write_ln_P(PSTR("FUNC "), false);
-            break;
-        case _ADJUST:
-            oled_write_ln_P(PSTR("ADJS "), false);
-            break;
-    }
-}
-
-static void render_leds(void)
-{
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUMLK")     : PSTR("     "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPLK")    : PSTR("     "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLK")  : PSTR("     "), false);
-}
-
-static void render_touch(void)
-{
-    // Host Touch LED Status
-    oled_write_P(touch_encoder_is_on() ? PSTR("TOUCH")  : PSTR("     "), false);
-    oled_write_P(touch_encoder_is_calibrating() ? PSTR("CLBRT")  : PSTR("     "), false);
-}
-#else
-static uint32_t scan_counter = 0;
-static uint32_t scan_value = 0;
-static uint16_t scan_timer = 1000;
-
-void do_counters(void) {
-    scan_counter++;
-    uint16_t now = sync_timer_read();
-    if (timer_expired(now, scan_timer))
-    {
-        scan_timer += 1000;
-        scan_value = (scan_value + scan_counter) / 2;
-        scan_counter = 0;
-    }
-}
-
-void matrix_scan_user(void) {
-    do_counters();
-}
-
-void matrix_slave_scan_user(void) {
-    do_counters();
-}
-
-void render_debug_scan(void) {
-    static char buffer[6] = {0};
-    snprintf(buffer, sizeof(buffer), "%5d", scan_value);
-    oled_write_ln_P(buffer, false);
-}
-#endif
-
-bool oled_task_user(void) {
-#if !defined(MATRIX_SCAN_DEBUG)
-    if (is_keyboard_left()) {
-        render_layer();
-        oled_write_P(PSTR("     "), false);
-        render_leds();
-        oled_write_P(PSTR("     "), false);
-        render_touch();
-    }
-    else {
-        render_rgb_menu();
-    }
-#else
-    oled_write_P(PSTR("     "), false);
-    render_debug_scan();
-#endif
-    oled_set_cursor(0, 12);
-    render_icon();
-    return false;
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(MENU_DN, MENU_UP), ENCODER_CCW_CW(MENU_DN, MENU_UP) },
-    [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-    [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
-};
-#endif
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/rules.mk b/keyboards/rgbkb/mun/keymaps/xulkal2/rules.mk
deleted file mode 100644
index e6b71e56d17..00000000000
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = yes	# using for mouse wheel up and down, more granular than page up/down
-
-OPT_DEFS += -DRGB_UNLIMITED_POWER
-
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index 96d1a18e81f..7374f6cd478 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -29,7 +29,57 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [128, 34],
+        "driver": "ws2812",
+        "led_flush_limit": 33,
+        "led_process_limit": 10,
+        "sleep": true,
+        "split_count": [49, 49]
     },
     "matrix_pins": {
         "cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"],
diff --git a/keyboards/v60_type_r/keymaps/vimouse/readme.md b/keyboards/rgbkb/mun2/.noci
similarity index 100%
rename from keyboards/v60_type_r/keymaps/vimouse/readme.md
rename to keyboards/rgbkb/mun2/.noci
diff --git a/keyboards/rgbkb/mun2/config.h b/keyboards/rgbkb/mun2/config.h
new file mode 100644
index 00000000000..788665356d6
--- /dev/null
+++ b/keyboards/rgbkb/mun2/config.h
@@ -0,0 +1,127 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+//#include "config_common.h"
+
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
+
+/* Matrix Configuration - Rows are doubled up */
+#define MATRIX_ROWS 14
+// Last pins reserved for encoder / touch encoder support
+// Empty matrix entries used for encoder / touch encoder support
+#define MATRIX_ROW_PINS { GP10, GP9, GP1, GP2, GP3, NO_PIN, NO_PIN }
+#define MATRIX_ROW_PINS_RIGHT { GP10, GP9, GP1, GP2, GP3, NO_PIN, NO_PIN}
+#define MATRIX_COLS 8
+#define MATRIX_COL_PINS { GP26, GP29, GP18, GP22, GP21, GP23, GP19, GP20 }
+#define MATRIX_COL_PINS_RIGHT { GP28, GP29, GP18, GP22, GP21, GP20, GP19, GP23}
+
+/* Touchbar adjustments */
+#define TOUCH_DEADZONE 50 // width of a "button", wider inputs will be interpreted as a swipe
+#define TOUCH_TERM 350 // time of a "button" touch, longer inputs will be a swipe
+#define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
+#define TOUCH_SEGMENTS 3
+#define TAP_CODE_DELAY 1 // without a slight delay, the RP2040 doesn't register instant taps
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { GP7, GP27, GP4 }
+#define ENCODERS_PAD_A_RIGHT { GP27, GP7, GP5 }
+
+#define ENCODERS_PAD_B { GP6, GP28, GP5 }
+#define ENCODERS_PAD_B_RIGHT { GP26, GP6, GP4 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Split Keyboard Configuration */
+#define SPLIT_HAND_PIN GP11
+#define SPLIT_USB_DETECT
+#define SERIAL_USART_FULL_DUPLEX
+#define SELECT_SOFT_SERIAL_SPEED 2
+#define SERIAL_USART_RX_PIN GP17
+#define SERIAL_USART_TX_PIN GP16
+
+/* Split Transport Features */
+#define SPLIT_TRANSPORT_MIRROR
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+#define SPLIT_MODS_ENABLE
+#define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
+
+/* I2C Configuration */
+#define I2C_DRIVER I2CD0
+#define I2C1_SCL_PIN GP25
+#define I2C1_SDA_PIN GP24
+
+/* RGB Matrix Configuration */
+#define WS2812_PIO_USE_PIO1
+#define WS2812_DI_PIN GP15
+
+// NOTE: WS2812 uses the RGBLED_NUM define, RGB Matrix uses DRIVER_LED_TOTAL...
+// so make sure both are set and the same
+#define RGBLED_NUM 70
+#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_SPLIT { 35, 35 }
+#define RGB_MATRIX_CENTER { 117, 46 }
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
+#define RGB_MATRIX_LED_FLUSH_LIMIT 33
+#define RGB_MATRIX_LED_PROCESS_LIMIT 10
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+// 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 RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#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 RGB_MATRIX_KEYPRESSES
+#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
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/halconf.h b/keyboards/rgbkb/mun2/halconf.h
new file mode 100644
index 00000000000..23f14742005
--- /dev/null
+++ b/keyboards/rgbkb/mun2/halconf.h
@@ -0,0 +1,18 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#undef HAL_USE_I2C
+#define HAL_USE_I2C TRUE
+
+#undef HAL_USE_SIO
+#define HAL_USE_SIO TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/rgbkb/mun2/keymaps/default/config.h b/keyboards/rgbkb/mun2/keymaps/default/config.h
new file mode 100644
index 00000000000..3a3ddd5f7ed
--- /dev/null
+++ b/keyboards/rgbkb/mun2/keymaps/default/config.h
@@ -0,0 +1,21 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+// No need for the single versions when multi performance isn't a problem =D
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#undef ENABLE_RGB_MATRIX_SPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+
+// 20m timeout (20m * 60s * 1000mil)
+// #define RGB_DISABLE_TIMEOUT 1200000
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/keymaps/default/keymap.c b/keyboards/rgbkb/mun2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..91d2f8ef402
--- /dev/null
+++ b/keyboards/rgbkb/mun2/keymaps/default/keymap.c
@@ -0,0 +1,212 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#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 sol_layers {
+  _QWERTY,
+  _COLEMAK,
+  _FN,
+  _ADJUST
+};
+
+enum zygo_keycodes {
+  // Disables touch processing
+  TCH_TOG = SAFE_RANGE,
+  MENU_BTN,
+  MENU_UP,
+  MENU_DN,
+  RGB_RST
+};
+
+#define FN       MO(_FN)
+#define ADJUST   MO(_ADJUST)
+#define COLEMAK  DF(_COLEMAK)
+#define QWERTY   DF(_QWERTY)
+#define FN_CAPS  LT(_FN, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* QWERTY Layout
+  ┌──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┐
+  | ESC  |   1  |   2  |   3  |  4   |   5  |  |   6  |   7  |   8  |   9  |   0  | BkSp |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  | Tab  |   Q  |   W  |   E  |   R  |   T  |  |   Y  |   U  |   I  |   O  |   P  |   \  |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |FNCAPS|   A  |   S  |   D  |   F  |   G  |  |   H  |   J  |   K  |   L  |   ;  |   '  |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |Shift |   Z  |   X  |   C  |   V  |   B  |  |   N  |   M  |   ,  |   .  |   /  |Enter |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  | Ctrl |  Win |  Alt |  RGB |ADJUST| Space|  | Space|  FN  | Left | Down | Up   |Right |
+  └──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┘
+  ┌──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┐
+  │Vol Dn│Vol Up│Vol Dn│Vol Up│Vol Dn│Vol Up│  │Vol Dn│Vol Up│Vol Dn│Vol Up│Vol Dn│Vol Up│
+  └──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┘
+  ┌──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┐
+  │Vol Dn│Vol Up│ Prev │ Play │ Next │                │Vol Dn│Vol Up│ Prev │ Play │ Next │
+  └──────┴──────┴──────┴──────┴──────┘                └──────┴──────┴──────┴──────┴──────┘
+  */
+  [_QWERTY] = LAYOUT(
+   QK_GESC,      KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_MINS,      KC_EQL,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,  KC_BSPC,
+    KC_TAB,      KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,     KC_RBRC,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,  KC_BSLS,
+    FN_CAPS,     KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_LPRN,     KC_RPRN,     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_LCBR,     KC_RCBR,     KC_N,     KC_M,  KC_COMM,   KC_DOT,  KC_SLSH,   KC_ENT,
+    KC_LCTL,  KC_LGUI,  KC_LALT,  RGB_TOG,   ADJUST,   KC_SPC,      KC_SPC,      KC_SPC,   KC_SPC,       FN,  KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT,
+
+    KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,
+    KC_VOLU,  KC_VOLD,  KC_MNXT,  KC_MPLY,  KC_MPRV,                      KC_VOLU,  KC_VOLD,  KC_MNXT,  KC_MPLY,  KC_MPRV
+  ), 
+
+  /*  Colemak Layout
+  ┌──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┐
+  | GESC |  1   |  2   |  3   |  4   |  5   |  |  6   |  7   |  8   |  9   |  0   | BkSp |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  | Tab  |   Q  |   W  |   F  |   P  |   B  |  |   J  |   L  |   U  |   Y  |   ;  |   \  |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |FNCAPS|   A  |   R  |   S  |   T  |   G  |  |   K  |   N  |   E  |   I  |   O  |   '  |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |Shift |   Z  |   X  |   C  |   D  |   V  |  |   M  |   H  |   ,  |   .  |   /  |Enter |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  | Ctrl |  Win |  Alt |  RGB |ADJUST| Space|  | Space|  FN  | Left | Down | Up   |Right |
+  └──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┘
+  ┌──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┐
+  │Vol Dn│Vol Up│Vol Dn│Vol Up│Vol Dn│Vol Up│  │Vol Dn│Vol Up│Vol Dn│Vol Up│Vol Dn│Vol Up│
+  └──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┘
+  ┌──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┐
+  │Vol Dn│Vol Up│ Prev │ Play │ Next │                │Vol Dn│Vol Up│ Prev │ Play │ Next │
+  └──────┴──────┴──────┴──────┴──────┘                └──────┴──────┴──────┴──────┴──────┘
+  */
+  [_COLEMAK] = LAYOUT(
+    QK_GESC,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_F1,     KC_F5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,  KC_BSPC,
+     KC_TAB,     KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,     KC_F2,     KC_F6,     KC_J,     KC_L,     KC_U,     KC_Y,  KC_SCLN,  KC_BSLS,
+    FN_CAPS,     KC_A,     KC_R,     KC_S,     KC_T,     KC_G,     KC_F3,     KC_F7,     KC_K,     KC_N,     KC_E,     KC_I,     KC_O,  KC_QUOT,
+    KC_LSFT,     KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,     KC_F4,     KC_F8,     KC_M,     KC_H,  KC_COMM,   KC_DOT,  KC_SLSH,   KC_ENT,
+    KC_LCTL,  KC_LGUI,  KC_LALT,  RGB_TOG,   ADJUST,   KC_SPC,     KC_SPC,     KC_SPC,   KC_SPC,       FN,  KC_LEFT,  KC_DOWN,    KC_UP, KC_RIGHT,
+
+    KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,
+    KC_VOLU,  KC_VOLD,  KC_MNXT,  KC_MPLY,  KC_MPRV,                      KC_VOLU,  KC_VOLD,  KC_MNXT,  KC_MPLY,  KC_MPRV
+  ),
+
+  /*  FN Layout
+  ┌──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┐
+  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |      | PGDN |  UP  | PGUP |      |      |  |      | PGDN |  UP  | PGUP | PRINT| HOME |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |      | LEFT | DOWN | RIGHT|      |      |  |      | LEFT | DOWN | RIGHT|INSERT| END  |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |      |      |      |      |      |      |  |      |      |      |      |      |      |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |      |      |      |RGBMOD|      |      |  |      | PLAY | NEXT | MUTE | VOL- | VOL+ |
+  └──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┘
+  ┌──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┐
+  │      |      |      |      |      |      |  |      |      |      |      |      |      │
+  └──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┘
+  ┌──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┐
+  │      |      |      |      |      |                |      |      |      |      |      │
+  └──────┴──────┴──────┴──────┴──────┘                └──────┴──────┴──────┴──────┴──────┘
+  */
+  [_FN] = 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_PGDN,    KC_UP,  KC_PGUP,  _______,  _______,  _______,  _______,  _______,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_PSCR,  KC_HOME,
+    _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_INS,   KC_END,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,
+
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______
+  ),
+
+  /*  ADJ Layout
+  ┌──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┐
+  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |      | SAD  | VAI  | SAI  |QK_BOOT|     |  |      |      |      |      |      |      |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |      | HUD  | VAD  | HUI  |RGBRST|      |  |      |QWERTY|COLEMK|      |      |      |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |      |      |      |      |      |      |  |      |      |RGBTOG|  HUI |  SAI | VAI  |
+  ├──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┤
+  |      |      |      |RGBNXT|      |      |  |      |      |RGBPRV|  HUD |  SAD | VAD  |
+  └──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┘
+  ┌──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┐
+  │      |      |      |      |      |      |  |      |      |      |      |      |      │
+  └──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┘
+  ┌──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┐
+  │      |      |      |      |      |                |      |      |      |      |      │
+  └──────┴──────┴──────┴──────┴──────┘                └──────┴──────┴──────┴──────┴──────┘
+  */
+  [_ADJUST] =  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,
+    _______,  RGB_SAD,  RGB_VAI,  RGB_SAI,  QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  RGB_HUD,  RGB_VAD,  RGB_HUI,  RGB_RST,  _______,  _______,  _______,  _______,   QWERTY,  COLEMAK,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,
+    _______,  _______,  _______,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______, RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,
+
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______
+  )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode)
+    {
+        case MENU_BTN:
+            if (record->event.pressed) {
+                rgb_menu_selection();
+            }
+            return false;
+        case MENU_UP:
+            if (record->event.pressed) {
+                rgb_menu_action(true);
+            }
+            return false;
+        case MENU_DN:
+            if (record->event.pressed) {
+                rgb_menu_action(false);
+            }
+            return false;
+        case RGB_RST:
+            if (record->event.pressed) {
+                eeconfig_update_rgb_matrix_default();
+            }
+            return false;
+        case TCH_TOG:
+            if (record->event.pressed) {
+                touch_encoder_toggle();
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;
+    }
+}
+
+void render_layer_status(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer"), false);
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            oled_write_ln_P(PSTR("QWRTY"), false);
+            break;
+        case _COLEMAK:
+            oled_write_ln_P(PSTR("Colemk"), false);
+            break;
+        case _FN:
+            oled_write_ln_P(PSTR("FN   "), false);
+            break;
+        case _ADJUST:
+            oled_write_ln_P(PSTR("Adjst"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+    }
+}
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/keymaps/vial/config.h b/keyboards/rgbkb/mun2/keymaps/vial/config.h
new file mode 100644
index 00000000000..6af41456c70
--- /dev/null
+++ b/keyboards/rgbkb/mun2/keymaps/vial/config.h
@@ -0,0 +1,25 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+// No need for the single versions when multi performance isn't a problem =D
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#undef ENABLE_RGB_MATRIX_SPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+
+// 20m timeout (20m * 60s * 1000mil)
+// #define RGB_DISABLE_TIMEOUT 1200000
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define VIAL_KEYBOARD_UID {0x5F, 0x2E, 0x2D, 0x59, 0xF3, 0x4F, 0x90, 0x79}
+#define VIAL_UNLOCK_COMBO_ROWS { 1, 10 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 1 }
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/keymaps/vial/keymap.c b/keyboards/rgbkb/mun2/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..16a2763a0a7
--- /dev/null
+++ b/keyboards/rgbkb/mun2/keymaps/vial/keymap.c
@@ -0,0 +1,136 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#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 sol_layers {
+  _QWERTY,
+  _COLEMAK,
+  _FN,
+  _ADJUST
+};
+
+enum zygo_keycodes {
+  // Disables touch processing
+  TCH_TOG = SAFE_RANGE,
+  MENU_BTN,
+  MENU_UP,
+  MENU_DN,
+  RGB_RST
+};
+
+#define FN       MO(_FN)
+#define ADJUST   MO(_ADJUST)
+#define COLEMAK  DF(_COLEMAK)
+#define QWERTY   DF(_QWERTY)
+#define FN_CAPS  LT(_FN, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT(
+   QK_GESC,      KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_MINS,      KC_EQL,     KC_6,     KC_7,     KC_8,     KC_9,    KC_0,     KC_BSPC,
+    KC_TAB,      KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,     KC_RBRC,     KC_Y,     KC_U,     KC_I,     KC_O,    KC_P,     KC_BSLS,
+    FN_CAPS,     KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_LPRN,     KC_RPRN,     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_LCBR,     KC_RCBR,     KC_N,     KC_M,     KC_COMM,  KC_DOT,  KC_SLSH,  KC_ENT,
+    KC_LCTL,  KC_LGUI,  KC_LALT,  RGB_TOG,   ADJUST,   KC_SPC,      KC_SPC,      KC_SPC,     KC_SPC,   KC_LEFT,  KC_DOWN,  KC_UP,   KC_RIGHT, KC_RCTL,
+
+    KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,
+    KC_VOLU,  KC_VOLD,  KC_MNXT,  KC_MPLY,  KC_MPRV,                      KC_VOLU,  KC_VOLD,  KC_MNXT,  KC_MPLY,  KC_MPRV
+  ), 
+
+  [_COLEMAK] = LAYOUT(
+    QK_GESC,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_F1,     KC_F5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,  KC_BSPC,
+     KC_TAB,     KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,     KC_F2,     KC_F6,     KC_J,     KC_L,     KC_U,     KC_Y,  KC_SCLN,  KC_BSLS,
+    FN_CAPS,     KC_A,     KC_R,     KC_S,     KC_T,     KC_G,     KC_F3,     KC_F7,     KC_K,     KC_N,     KC_E,     KC_I,     KC_O,  KC_QUOT,
+    KC_LSFT,     KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,     KC_F4,     KC_F8,     KC_M,     KC_H,  KC_COMM,   KC_DOT,  KC_SLSH,   KC_ENT,
+    KC_LCTL,  KC_LGUI,  KC_LALT,  RGB_TOG,   ADJUST,   KC_SPC,     KC_SPC,     KC_SPC,   KC_SPC,   KC_LEFT,  KC_DOWN,  KC_UP,   KC_RIGHT, KC_RCTL, 
+
+    KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,  KC_VOLD,  KC_VOLU,
+    KC_VOLU,  KC_VOLD,  KC_MNXT,  KC_MPLY,  KC_MPRV,                      KC_VOLU,  KC_VOLD,  KC_MNXT,  KC_MPLY,  KC_MPRV
+  ),
+
+  [_FN] = LAYOUT(
+    _______,  KC_F1,    KC_F2,   KC_F3,    KC_F4,    KC_F5,     KC_F11,   KC_F12,  KC_F6,     KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
+    _______,  KC_PGDN,  KC_UP,   KC_PGUP,   _______,  _______,  _______,  _______,  _______,  KC_PGDN,  KC_UP,    KC_PGUP,  KC_PSCR,  KC_HOME,
+    _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_INS,   KC_END,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,
+
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______
+  ),
+
+  [_ADJUST] =  LAYOUT(
+    _______,  KC_F1,    KC_F2,   KC_F3,    KC_F4,    KC_F5,     KC_F11,   KC_F12,  KC_F6,     KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
+    _______,  RGB_SAD,  RGB_VAI,  RGB_SAI,  QK_BOOT,  _______,  _______,  _______,  _______,  KC_P7,   KC_P8,   KC_P9,   _______, _______,
+    _______,  RGB_HUD,  RGB_VAD,  RGB_HUI,  RGB_RST,  _______,  _______,  _______,  _______,  KC_P4,   KC_P5,   KC_P6,   _______, _______,
+    _______,  RGB_SPD, _______,   RGB_SPI,  _______,  _______,  _______,  _______,  _______,  KC_P1,   KC_P2,   KC_P3,   _______, _______,
+    _______,  _______,  _______,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  KC_P0,   KC_PDOT, KC_NUM,  QWERTY,  COLEMAK,
+
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______
+  )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode)
+    {
+        case MENU_BTN:
+            if (record->event.pressed) {
+                rgb_menu_selection();
+            }
+            return false;
+        case MENU_UP:
+            if (record->event.pressed) {
+                rgb_menu_action(true);
+            }
+            return false;
+        case MENU_DN:
+            if (record->event.pressed) {
+                rgb_menu_action(false);
+            }
+            return false;
+        case RGB_RST:
+            if (record->event.pressed) {
+                eeconfig_update_rgb_matrix_default();
+            }
+            return false;
+        case TCH_TOG:
+            if (record->event.pressed) {
+                touch_encoder_toggle();
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;
+    }
+}
+
+void render_layer_status(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer"), false);
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            oled_write_ln_P(PSTR("QWRTY"), false);
+            break;
+        case _COLEMAK:
+            oled_write_ln_P(PSTR("Colemk"), false);
+            break;
+        case _FN:
+            oled_write_ln_P(PSTR("FN   "), false);
+            break;
+        case _ADJUST:
+            oled_write_ln_P(PSTR("Adjst"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+    }
+}
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/keymaps/vial/rules.mk b/keyboards/rgbkb/mun2/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..31bb6d699f9
--- /dev/null
+++ b/keyboards/rgbkb/mun2/keymaps/vial/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIALRGB_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/keymaps/vial/vial.json b/keyboards/rgbkb/mun2/keymaps/vial/vial.json
new file mode 100644
index 00000000000..a91e92ccfb4
--- /dev/null
+++ b/keyboards/rgbkb/mun2/keymaps/vial/vial.json
@@ -0,0 +1,173 @@
+{
+    "lighting": "none",
+    "matrix": {
+        "rows": 14,
+        "cols": 8
+    },
+    "layouts": {
+        "labels":[],
+        "keymap":[
+  [
+    {
+      "c": "#d1d1d1",
+      "w": 1.5
+    },
+    "1,0",
+    "0,2",
+    "0,3",
+    "0,4",
+    "0,5",
+    "0,6",
+    "0,7",
+    {
+      "x": 1
+    },
+    "7,7",
+    "7,6",
+    "7,5",
+    "7,4",
+    "7,3",
+    "7,2",
+    {
+      "w": 1.5
+    },
+    "8,0"
+  ],
+  [
+    {
+      "w": 1.5
+    },
+    "1,1",
+    "1,2",
+    "1,3",
+    "1,4",
+    "1,5",
+    "1,6",
+    "1,7",
+    {
+      "x": 1
+    },
+    "8,7",
+    "8,6",
+    "8,5",
+    "8,4",
+    "8,3",
+    "8,2",
+    {
+      "w": 1.5
+    },
+    "8,1"
+  ],
+  [
+    {
+      "w": 1.5
+    },
+    "2,1",
+    "2,2",
+    "2,3",
+    "2,4",
+    "2,5",
+    "2,6",
+    "2,7",
+    {
+      "x": 1
+    },
+    "9,7",
+    "9,6",
+    "9,5",
+    "9,4",
+    "9,3",
+    "9,2",
+    {
+      "w": 1.5
+    },
+    "9,1"
+  ],
+  [
+    {
+      "w": 1.5
+    },
+    "3,1",
+    "3,2",
+    "3,3",
+    "3,4",
+    "3,5",
+    "3,6",
+    "3,7",
+    {
+      "x": 1
+    },
+    "10,7",
+    "10,6",
+    "10,5",
+    "10,4",
+    "10,3",
+    "10,2",
+    {
+      "w": 1.5
+    },
+    "10,1"
+  ],
+  [
+    {
+      "w": 1.5
+    },
+    "3,0",
+    "4,2",
+    "4,3",
+    "4,4",
+    "4,5",
+    "4,6",
+    "4,7",
+    {
+      "x": 1
+    },
+    "11,7",
+    "11,6",
+    "11,5",
+    "11,4",
+    "11,3",
+    "11,2",
+    {
+      "w": 1.5
+    },
+    "10,0"
+  ],
+  [
+    {
+      "y": 0.25
+    },
+    "5,0",
+    "5,1",
+    "5,2",
+    "5,3",
+    "5,4",
+    "5,5",
+    {
+      "x": 4
+    },
+    "12,0",
+    "12,1",
+    "12,2",
+    "12,3",
+    "12,4",
+    "12,5"
+  ],
+  [
+    "6,0",
+    "6,1",
+    "6,2",
+    "6,3",
+    "6,4",
+    {
+      "x": 6
+    },
+    "13,0",
+    "13,1",
+    "13,2",
+    "13,3",
+    "13,4"
+  ]
+]
+    }
+}
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/mcuconf.h b/keyboards/rgbkb/mun2/mcuconf.h
new file mode 100644
index 00000000000..7602048e2a6
--- /dev/null
+++ b/keyboards/rgbkb/mun2/mcuconf.h
@@ -0,0 +1,18 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 TRUE
+
+#undef RP_SIO_USE_UART0
+#define RP_SIO_USE_UART0 TRUE
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/mun2.c b/keyboards/rgbkb/mun2/mun2.c
new file mode 100644
index 00000000000..3536e9aa20d
--- /dev/null
+++ b/keyboards/rgbkb/mun2/mun2.c
@@ -0,0 +1,23 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#include "mun2.h"
+#include <transactions.h>
+
+void keyboard_post_init_kb(void) {
+    touch_encoder_init();
+    transaction_register_rpc(TOUCH_ENCODER_SYNC, touch_encoder_slave_sync);
+    transaction_register_rpc(RGB_MENU_SYNC, rgb_menu_slave_sync);
+    keyboard_post_init_user();
+}
+
+void housekeeping_task_kb(void) {
+    touch_encoder_update(TOUCH_ENCODER_SYNC);
+    rgb_menu_update(RGB_MENU_SYNC);
+}
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/mun2.h b/keyboards/rgbkb/mun2/mun2.h
new file mode 100644
index 00000000000..ccb4dbcd365
--- /dev/null
+++ b/keyboards/rgbkb/mun2/mun2.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 <https://github.com/Legonut>
+ * 
+ * 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
+
+#if defined(KEYBOARD_rgbkb_mun2_rev1)
+#    include "rev1.h"
+#endif
+
+#include "quantum.h"
+#include "touch_encoder.h"
+#include "common_oled.h"
diff --git a/keyboards/rgbkb/mun2/readme.md b/keyboards/rgbkb/mun2/readme.md
new file mode 100644
index 00000000000..6b5b5fc9fb2
--- /dev/null
+++ b/keyboards/rgbkb/mun2/readme.md
@@ -0,0 +1,3 @@
+# Mun 2
+
+* To flash the keyboard, plug the PCB in while holding the BOOT button. Or, while it's plugged in, hold BOOT and tap RESET. Then, drag your .uf2 file into the new file storage device that should pop up.
diff --git a/keyboards/rgbkb/mun2/rev1/info.json b/keyboards/rgbkb/mun2/rev1/info.json
new file mode 100644
index 00000000000..bd43b6533d2
--- /dev/null
+++ b/keyboards/rgbkb/mun2/rev1/info.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "Mun 2",
+    "manufacturer": "RGBKB",
+    "url": "https://github.com/",
+    "maintainer": "Legonut, RGBKB, XScorpion2",
+    "usb": {
+        "vid": "0x3535",
+        "pid": "0x3510",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "x":  0, "y": 0 },
+                { "x":  1, "y": 0 },
+                { "x":  2, "y": 0 },
+                { "x":  3, "y": 0 },
+                { "x":  4, "y": 0 },
+                { "x":  5, "y": 0 },
+                { "x":  6, "y": 0 },
+                { "x":  7, "y": 0 },
+
+                //{ "x": 15, "y": 0 },
+                ///{ "x": 14, "y": 0 },
+                { "x": 13, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x":  9, "y": 0 },
+                { "x":  8, "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": 15, "y": 1 },
+                //{ "x": 14, "y": 1 },
+                { "x": 13, "y": 1 },
+                { "x": 12, "y": 1 },
+                { "x": 11, "y": 1 },
+                { "x": 10, "y": 1 },
+                { "x":  9, "y": 1 },
+                { "x":  8, "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": 15, "y": 2 },
+                //{ "x": 14, "y": 2 },
+                { "x": 13, "y": 2 },
+                { "x": 12, "y": 2 },
+                { "x": 11, "y": 2 },
+                { "x": 10, "y": 2 },
+                { "x":  9, "y": 2 },
+                { "x":  8, "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": 15, "y": 3 },
+                //{ "x": 14, "y": 3 },
+                { "x": 13, "y": 3 },
+                { "x": 12, "y": 3 },
+                { "x": 11, "y": 3 },
+                { "x": 10, "y": 3 },
+                { "x":  9, "y": 3 },
+                { "x":  8, "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": 15, "y": 4 },
+                //{ "x": 14, "y": 4 },
+                { "x": 13, "y": 4 },
+                { "x": 12, "y": 4 },
+                { "x": 11, "y": 4 },
+                { "x": 10, "y": 4 },
+                { "x":  9, "y": 4 },
+                { "x":  8, "y": 4 },
+
+                { "x":  0, "y": 5 },
+                { "x":  1, "y": 5 },
+                { "x":  2, "y": 5 },
+                { "x":  3, "y": 5 },
+                { "x":  4, "y": 5 },
+                { "x":  5, "y": 5 },
+                { "x":  6, "y": 5 },
+                { "x":  7, "y": 5 },
+
+                //{ "x": 15, "y": 5 },
+                //{ "x": 14, "y": 5 },
+                //{ "x": 13, "y": 5 },
+                //{ "x": 12, "y": 5 },
+                { "x": 11, "y": 5 },
+                { "x": 10, "y": 5 },
+                { "x":  9, "y": 5 },
+                { "x":  8, "y": 5 },
+
+                { "x":  0, "y": 6 },
+                { "x":  1, "y": 6 },
+                { "x":  2, "y": 6 },
+                { "x":  3, "y": 6 },
+                { "x":  4, "y": 6 },
+                { "x":  5, "y": 6 },
+                { "x":  6, "y": 6 },
+                { "x":  7, "y": 0 },
+
+                //{ "x": 15, "y": 6 },
+                //{ "x": 14, "y": 6 },
+                //{ "x": 13, "y": 6 },
+                //{ "x": 12, "y": 6 },
+                //{ "x": 11, "y": 6 },
+                //{ "x": 10, "y": 6 },
+                { "x":  9, "y": 6 },
+                { "x":  8, "y": 6 }
+            ] 
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/rev1/rev1.c b/keyboards/rgbkb/mun2/rev1/rev1.c
new file mode 100644
index 00000000000..708439eb6cc
--- /dev/null
+++ b/keyboards/rgbkb/mun2/rev1/rev1.c
@@ -0,0 +1,235 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#include "rev1.h"
+#include "split_util.h"
+
+#define NUMBER_OF_TOUCH_ENCODERS 2
+#define TOUCH_ENCODER_OPTIONS TOUCH_SEGMENTS + 2
+
+#define NUMBER_OF_ENCODERS 6
+#define ENCODER_OPTIONS 2
+
+typedef struct PACKED {
+    uint8_t r;
+    uint8_t c;
+} encodermap_t;
+
+// this maps encoders and then touch encoders to their respective electrical matrix entry
+// mapping is row (y) then column (x) when looking at the electrical layout
+const encodermap_t encoder_map[NUMBER_OF_ENCODERS][ENCODER_OPTIONS] = 
+{
+    { {  5, 0 }, {  5, 1 } }, // Encoder 0 matrix entries
+    { {  5, 2 }, {  5, 3 } }, // Encoder 1 matrix entries
+    { {  5, 4 }, {  5, 5 } }, // Encoder 2 matrix entries
+    { { 12, 0 }, { 12, 1 } }, // Encoder 3 matrix entries
+    { { 12, 2 }, { 12, 3 } }, // Encoder 4 matrix entries
+    { { 12, 4 }, { 12, 5 } }  // Encoder 5 matrix entries
+};
+
+const encodermap_t touch_encoder_map[NUMBER_OF_TOUCH_ENCODERS][TOUCH_ENCODER_OPTIONS] = 
+{
+    { {  6, 0 }, {  6, 1 }, {  6, 2 }, {  6, 3 }, {  6, 4 }, }, // Touch Encoder 0 matrix entries
+    { { 13, 0 }, { 13, 1 }, { 13, 2 }, { 13, 3 }, { 13, 4 }, }  // Touch Encoder 1 matrix entries
+};
+
+static void process_encoder_matrix(encodermap_t pos) {
+    action_exec(MAKE_KEYEVENT(pos.r, pos.c, true));
+#if TAP_CODE_DELAY > 0
+    wait_ms(TAP_CODE_DELAY);
+#endif
+    action_exec(MAKE_KEYEVENT(pos.r, pos.c, false));
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise))
+        return false;
+
+    // Mapping clockwise (typically increase) to zero, and counter clockwise (decrease) to 1
+    process_encoder_matrix(encoder_map[index][clockwise ? 0 : 1]);
+    return false;
+}
+
+bool touch_encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!touch_encoder_update_user(index, clockwise))
+        return false;
+
+    // Mapping clockwise (typically increase) to zero, and counter clockwise (decrease) to 1
+    process_encoder_matrix(touch_encoder_map[index][clockwise ? 0 : 1]);
+    return false;
+}
+
+bool touch_encoder_tapped_kb(uint8_t index, uint8_t section) {
+    if (!touch_encoder_tapped_user(index, section))
+        return false;
+
+    process_encoder_matrix(touch_encoder_map[index][section + 2]);
+    return false;
+}
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = { {
+    {  NO_LED, NO_LED,   1,   2,   3,   4,   5,   6},
+    {  0, 13,  12,  11,  10,   9,   8,   7},
+    {  NO_LED, 14,  15,  16,  17,  18,  19,  20},
+    {  28, 27,  26,  25,  24,  23,  22,  21},
+    {  NO_LED, NO_LED,  29,  30,  31,  32,  33,  34},
+    
+    {  NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    {  NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+
+    {  NO_LED, NO_LED,  36,  37,  38,  39,  40,  41},
+    {  35, 48,  47,  46,  45,  44,  43,  42},
+    {  NO_LED, 49,  50,  51,  52,  53,  54,  55},
+    {  63, 62,  61,  60,  59,  58,  57,  56},
+    {  NO_LED, NO_LED,  64,  65,  66,  67,  68,  69},
+    
+    {  NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    {  NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
+}, { 
+    {  11,  16},{  34,  16},{  49,  16},{  64,  16},{  79,  16},{  94,  16},{ 109,  16},
+    { 109,  31},{  94,  31},{  79,  31},{  64,  31},{  49,  31},{  34,  31},{  11,  31},
+    {  11,  46},{  34,  46},{  49,  46},{  64,  46},{  79,  46},{  94,  46},{ 109,  46},
+    { 109,  61},{  94,  61},{  79,  61},{  64,  61},{  49,  61},{  34,  61},{  11,  61},
+    {  11,  76},{  34,  76},{  49,  76},{  64,  76},{  79,  72},{  94,  72},{ 109,  72},
+
+    //{  97,   5},{  91,   5},{  86,   5},{  80,   5},{  75,   5},{  69,   5},{  63,   5},
+    //{  58,   5},{  52,   5},{  46,   5},{  41,   5},{  35,   5},{  30,   5},{  24,   5},{ 18,   5},
+
+    { 219,  16},{ 199,  16},{ 184,  16},{ 169,  16},{ 154,  16},{ 139,  16},{ 124,  16},
+    { 124,  31},{ 139,  31},{ 154,  31},{ 169,  31},{ 184,  31},{ 199,  31},{ 219,  31},
+    { 219,  46},{ 199,  46},{ 184,  46},{ 169,  46},{ 154,  46},{ 139,  46},{ 124,  46},
+    { 124,  61},{ 139,  61},{ 154,  61},{ 169,  61},{ 184,  61},{ 199,  61},{ 219,  61},
+    { 219,  76},{ 199,  76},{ 184,  76},{ 169,  76},{ 154,  72},{ 139,  72},{ 124,  72}
+
+    //{ 159,   5},{ 164,   5},{ 170,   5},{ 176,   5},{ 181,   5},{ 187,   5},{ 192,   5},
+    //{ 198,   5},{ 204,   5},{ 209,   5},{ 215,   5},{ 221,   5},{ 226,   5},{ 232,   5},{ 238,   5}
+    
+}, {
+    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, 1, 1, 1, 1,
+    //2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    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, 1, 1, 1, 1
+    //2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+
+} };
+// clang-format on
+
+void rgb_matrix_increase_flags(void)
+{
+    switch (rgb_matrix_get_flags()) {
+        case LED_FLAG_ALL: {
+            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
+            rgb_matrix_set_color_all(0, 0, 0);
+            }
+            break;
+        case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
+            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+            rgb_matrix_set_color_all(0, 0, 0);
+            }
+            break;
+        case LED_FLAG_UNDERGLOW: {
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_disable_noeeprom();
+            }
+            break;
+        default: {
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            }
+            break;
+    }
+}
+#endif
+
+
+__attribute__((weak)) 
+void render_layer_status(void) {
+    // Keymap specific, expected to be overridden
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer"), false);
+    oled_write_ln_P(PSTR("Undef"), false);
+}
+
+__attribute__((weak))
+void render_leds_status(void)
+{
+    // Host Keyboard LED Status
+    static const char PROGMEM led_icon[] = {
+        0x0F,0x3A,0
+    };
+    oled_write_P(led_icon, false);
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(   led_state.num_lock ? PSTR("N") : PSTR(" "), false);
+    oled_write_P(  led_state.caps_lock ? PSTR("C") : PSTR(" "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("S") : PSTR(" "), false);
+}
+
+__attribute__((weak))
+void render_touch_status(void)
+{
+    // Host Touch LED Status
+    static const char PROGMEM touch_icon[] = {
+        0x12,0x3A,0
+    };
+    oled_write_P(touch_icon, false);
+    oled_write_P(         touch_encoder_is_on() ? PSTR("T") : PSTR(" "), false);
+    oled_write_P(touch_encoder_is_calibrating() ? PSTR("C") : PSTR(" "), false);
+    oled_write_P(PSTR(" "), false);
+}
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    // Sol 3 uses OLED_ROTATION_270 for default rotation on both halves
+    return oled_init_user(OLED_ROTATION_270);
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user())
+        return false;
+    
+    if (is_keyboard_left()) {
+        render_icon();
+        oled_write_P(PSTR("     "), false);
+        render_layer_status();
+        oled_write_P(PSTR("     "), false);
+        render_leds_status();
+        oled_write_P(PSTR("     "), false);
+        render_touch_status();
+    }
+    else {
+        render_icon();
+        oled_write_P(PSTR("     "), false);
+        render_rgb_menu();
+    }
+    return false;
+}
+
+//bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+//    if (!process_record_user(keycode, record))
+//        return false;
+//
+//    switch(keycode) {
+//#ifdef RGB_MATRIX_ENABLE
+//        case RGB_TOG:
+//            if (record->event.pressed) {
+//                rgb_matrix_increase_flags();
+//            }
+//            return false;
+//#endif
+//    }
+//    return true;
+//};
diff --git a/keyboards/rgbkb/mun2/rev1/rev1.h b/keyboards/rgbkb/mun2/rev1/rev1.h
new file mode 100644
index 00000000000..1cdd6e5ee44
--- /dev/null
+++ b/keyboards/rgbkb/mun2/rev1/rev1.h
@@ -0,0 +1,74 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#include "mun2.h"
+
+// clang-format off
+/* Blank ascii map to reuse, with labeled possible encoder positions
+┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐
+│      │      │      │      │      │      │  E1  │  │  E4  │      │      │      │      │      │      │
+├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+│      │      │      │      │      │      │  E1  │  │  E4  │      │      │      │      │      │      │
+├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+│      │      │      │      │      |      │  E2  │  │  E5  │      │      │      │      │      │      │
+├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+│      │      │      │      │      │      │  E2  │  │  E5  │      │      │      │      │      │      │
+├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+│      │      │  E3  │  E3  │  E3  │      │      │  │      │      │  E6  │  E6  │  E6  │      │      │
+└──────┴──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┴──────┘
+┌──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┐
+│  E0↑ │  E0↓ │  E1↑ │  E1↓ │  E2↑ │  E2↓ │  │  E3↑ │  E3↓ │  E4↑ │  E4↓ │  E5↑ │  E5↓ │
+└──────┴──────┴──────┴──────┴──────┴──────┘  └──────┴──────┴──────┴──────┴──────┴──────┘
+┌──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┐
+│  T0↑ │  T0↓ │      │      │      │                │  T1↑ │  T1↓ │      │      │      │
+└──────┴──────┴──────┴──────┴──────┘                └──────┴──────┴──────┴──────┴──────┘
+*/
+
+#define LAYOUT( \
+    L10, L02, L03, L04, L05, L06, L07,    R07, R06, R05, R04, R03, R02, R10, \
+    L11, L12, L13, L14, L15, L16, L17,    R17, R16, R15, R14, R13, R12, R11, \
+    L21, L22, L23, L24, L25, L26, L27,    R27, R26, R25, R24, R23, R22, R21,  \
+    L31, L32, L33, L34, L35, L36, L37,    R37, R36, R35, R34, R33, R32, R31,  \
+    L30, L42, L43, L44, L45, L46, L47,    R47, R46, R45, R44, R43, R42, R30, \
+    \
+    E0L, E0R, E1L, E1R, E2L, E2R,    E3L, E3R, E4L, E4R, E5L, E5R, \
+    LT0, LT1, LT2, LSL, LSR,              RT0, RT1, RT2, RSL, RSR \
+) \
+{ \
+    /* Left Half */ \
+    { KC_NO, KC_NO, L02, L03, L04, L05, L06, L07,}, \
+    {   L10,   L11, L12, L13, L14, L15, L16, L17,}, \
+    { KC_NO,   L21, L22, L23, L24, L25, L26, L27,}, \
+    {   L30,   L31, L32, L33, L34, L35, L36, L37,}, \
+    { KC_NO, KC_NO, L42, L43, L44, L45, L46, L47,}, \
+    { E0L, E0R, E1L, E1R, E2L, E2R, KC_NO, KC_NO, }, \
+    { LT0, LT1, LT2, LSL, LSR, KC_NO, KC_NO, KC_NO }, \
+    /* Right Half */ \
+    { KC_NO, KC_NO, R02, R03, R04, R05, R06, R07,}, \
+    {   R10,   R11, R12, R13, R14, R15, R16, R17,}, \
+    { KC_NO,   R21, R22, R23, R24, R25, R26, R27,}, \
+    {   R30,   R31, R32, R33, R34, R35, R36, R37,}, \
+    { KC_NO, KC_NO, R42, R43, R44, R45, R46, R47,}, \
+    { E3L, E3R, E4L, E4R, E5L, E5R, KC_NO, KC_NO,}, \
+    { RT0, RT1, RT2, RSL, RSR, KC_NO, KC_NO, KC_NO } \
+}
+// clang-format on
+
+// weak functions overridable by the user
+void render_layer_status(void);
+void render_leds_status(void);
+void render_touch_status(void);
+void render_audio_status(void);
+
+#ifdef RGB_MATRIX_ENABLE
+// utility function to cycle active led zones
+void rgb_matrix_increase_flags(void);
+#endif
\ No newline at end of file
diff --git a/keyboards/rgbkb/mun2/rev1/rules.mk b/keyboards/rgbkb/mun2/rev1/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/rgbkb/mun2/rules.mk b/keyboards/rgbkb/mun2/rules.mk
new file mode 100644
index 00000000000..73d69cf0def
--- /dev/null
+++ b/keyboards/rgbkb/mun2/rules.mk
@@ -0,0 +1,42 @@
+# MCU name
+MCU = RP2040
+
+# Bootloader selection
+BOOTLOADER = rp2040
+
+# Touch encoder needs
+VPATH += keyboards/rgbkb/common
+SRC += touch_encoder.c
+SRC += common_oled.c
+QUANTUM_LIB_SRC += i2c_master.c
+
+# 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
+AUDIO_ENABLE = no			# Audio output
+
+DYNAMIC_MACRO_ENABLE = yes
+DIP_SWITCH_ENABLE = no
+
+WS2812_DRIVER = vendor
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = ws2812
+
+OLED_ENABLE = yes
+OLED_DRIVER = ssd1306    # Enable the OLED Driver
+
+ENCODER_ENABLE = yes
+
+SPLIT_KEYBOARD = yes
+SERIAL_DRIVER = vendor
+
+OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\"
+
+DEFAULT_FOLDER = rgbkb/mun2/rev1
\ No newline at end of file
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index 58b047c2b35..abb9620a5d9 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -17,52 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGB_MATRIX_LED_COUNT 64
-
-// 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
-#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
diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json
index fdf3519bb65..60c4431d340 100644
--- a/keyboards/rgbkb/pan/info.json
+++ b/keyboards/rgbkb/pan/info.json
@@ -9,6 +9,51 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "custom"
     },
     "rgblight": {
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index 9a05fa04e3a..fb608c724c3 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -30,54 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 120
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #endif
-// 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
-#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 LED_HITS_TO_REMEMBER 5
 
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/config.h b/keyboards/rgbkb/sol/keymaps/brianweyer/config.h
deleted file mode 100644
index 452cdda8235..00000000000
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-
-// place overrides here
-
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
deleted file mode 100644
index 194ec4de2f0..00000000000
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
+++ /dev/null
@@ -1,272 +0,0 @@
-#include QMK_KEYBOARD_H
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-    _QWERTY = 0,
-    _FN,
-    _ADJ
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  FN,
-  ADJ,
-  RGBRST
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* QWERTY
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   -  |  |   =  |   6  |   7  |   8  |   9  |   0  | Bspc |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |  Tab |   Q  |   W  |   E  |   R  |   T  |   [  |  |   ]  |   Y  |   U  |   I  |   O  |   P  |   \  |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |  Esc |   A  |   S  |   D  |   F  |   G  |      |  |      |   H  |   J  |   K  |   L  |   ;  |   '  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |      |  |      |   N  |   M  |   ,  |   .  |   /  | Shift|
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * | Ctrl |  Alt |  FN  | LGui |  RGB |  Spc |  Del |  | Bspc |  Spc |  Adj | LGui |  FN  |  Alt | Ctrl |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   *                                    |  Spc |  Ent |  |  Ent |  Spc |
-   *                                    `-------------'  `-------------'
-   */
-  [_QWERTY] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------+--+--------+.   ,--------+--+--------+--------+--------+--------+--------+--------+
-          KC_GRV,       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_MINS,          KC_EQL,          KC_6,       KC_7,       KC_8,       KC_9,       KC_0,    KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-          KC_TAB,       KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_LBRC,         KC_RBRC,          KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,    KC_BSLS,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-          KC_ESC,       KC_A,       KC_S,       KC_D,       KC_F,       KC_G,    _______,      _______,          KC_H,       KC_J,       KC_K,       KC_L,    KC_SCLN,    KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-         SC_LSPO,       KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,    _______,      _______,          KC_N,       KC_M,    KC_COMM,     KC_DOT,    KC_SLSH,    SC_RSPC,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-         KC_LCTL,    KC_LALT,      FN,    KC_LGUI, RGB_MOD,        KC_SPC,     KC_DEL,         KC_BSPC,        KC_SPC,     ADJ,    KC_LGUI,      FN,    KC_LALT,    KC_LCTL,
-  //|--------+--------+--------+--------+--------+--+--------+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-                                                          KC_SPC,     KC_ENT,          KC_ENT,        KC_SPC
-  //                                                |--------+--------|    |--------+-----------+
-      ),
-
-  /* FN
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |  |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |      |      |  Up  |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |      | Left | Down | Right|      |      |  |      | Play | Next | Mute | V-Up |V-Down|      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-   */
-  [_FN] = 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_UP, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______,    KC_LEFT,    KC_DOWN,    KC_RGHT, _______,    _______,      _______,       KC_MPLY,    KC_MNXT,    KC_MUTE,    KC_VOLD,    KC_VOLU, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,    _______, _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--+--------+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-                                                      _______, _______,      _______,    _______
-  //                                                |--------+--------|    |--------+-----------+
-      ),
-
-  /* ADJ
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      | Sat+ | Val+ | Hue+ |Speed+|Toggle|      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      | Sat- | Val- | Hue- |Speed-|Reset |      |  |      |      |QWERTY| COLE |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-   */
-
-  [_ADJ] =  LAYOUT(
-  //,--------+--------+--------+--------+--------+--------+--+--------+.   ,--------+--+--------+--------+--------+--------+--------+--------+
-        QK_BOOT, _______, _______, _______, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______,   QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, RGB_SAI, RGB_VAI, RGB_HUI, RGB_SPI, RGB_TOG,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, RGB_SAD, RGB_VAD, RGB_HUD, RGB_SPD,  RGBRST,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,    _______, _______,      _______, _______,    _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--+--------+--------|    |--------+--------+--+--------+--------+--------+--------+--------|
-                                                      _______, _______,      _______, _______
-  //                                                |--------+--------|    |--------+--------+
-      )
-};
-
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  } else if (index == 1) { /* Second encoder*/
-    if (clockwise) {
-      tap_code(KC_UP);
-    } else {
-      tap_code(KC_DOWN);
-    }
-  }
-    return true;
-}
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case FN:
-      if (record->event.pressed) {
-        layer_on(_FN);
-      } else {
-        layer_off(_FN);
-      }
-      return false;
-      break;
-    case ADJ:
-        if (record->event.pressed) {
-          layer_on(_ADJ);
-        } else {
-          layer_off(_ADJ);
-        }
-        return false;
-        break;
-      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-#ifdef RGBLIGHT_ENABLE
-  RGB_current_mode = rgblight_config.mode;
-#endif
-}
-
-
-// OLED Driver Logic
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flip 180 for offhand
-  return rotation;
-}
-
-static void render_logo(void) {
-  static const char PROGMEM sol_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-  oled_write_P(sol_logo, false);
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_FN (1<<_FN)
-#define L_ADJ (1<<_ADJ)
-#define L_ADJ_TRI (L_ADJ|L_FN)
-
-static void render_status(void) {
-  // Render to mode icon
-  static const char PROGMEM mode_logo[4][4] = {
-    {0x95,0x96,0x0a,0},
-    {0xb5,0xb6,0x0a,0},
-    {0x97,0x98,0x0a,0},
-    {0xb7,0xb8,0x0a,0} };
-
-  if (keymap_config.swap_lalt_lgui != false) {
-    oled_write_P(mode_logo[0], false);
-    oled_write_P(mode_logo[1], false);
-  } else {
-    oled_write_P(mode_logo[2], false);
-    oled_write_P(mode_logo[3], false);
-  }
-
-  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-
-  oled_write_P(PSTR("Layer: "), false);
-  switch (layer_state) {
-    case L_BASE:
-      oled_write_P(PSTR("Laser     \n"), false);
-      break;
-    case L_FN:
-      oled_write_P(PSTR("Function  \n"), false);
-      break;
-    case L_ADJ:
-    case L_ADJ_TRI:
-      oled_write_P(PSTR("Adjustment\n"), false);
-      break;
-    default:
-      oled_write_P(PSTR("Undefined \n"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(led_state.num_lock ? PSTR("NUMLOCK ") : PSTR("        "), false);
-  oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR("     "), false);
-  oled_write_P(led_state.scroll_lock ? PSTR("SCLK ") : PSTR("     "), false);
-}
-
-bool oled_task_user(void) {
-  if (is_keyboard_master())
-    render_status();
-  else
-    render_logo();
-
-    return false;
-}
-
-#endif
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/rules.mk b/keyboards/rgbkb/sol/keymaps/brianweyer/rules.mk
deleted file mode 100644
index f9832323b43..00000000000
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Overridden build options from rev1
-
-# RGB Options
-LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
-
-# Misc
-OLED_ENABLE     = yes       # Enable the OLED Driver
-
-
-
-
-
-# Do not edit past here
-
-include keyboards/$(KEYBOARD)/post_rules.mk
diff --git a/keyboards/rgbkb/sol/keymaps/danielhklein/config.h b/keyboards/rgbkb/sol/keymaps/danielhklein/config.h
deleted file mode 100644
index 452cdda8235..00000000000
--- a/keyboards/rgbkb/sol/keymaps/danielhklein/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-
-// place overrides here
-
diff --git a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
deleted file mode 100644
index 24583f0d17a..00000000000
--- a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
+++ /dev/null
@@ -1,336 +0,0 @@
-#include QMK_KEYBOARD_H
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-    _QWERTY = 0,
-    _COLEMAK,
-    _FN,
-    _ADJ
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  FN,
-  ADJ,
-  BACKLIT,
-  RGBRST
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
-// Define your non-alpha grouping in this define's LAYOUT, and all your BASE_LAYERS will share the same mod/macro columns
-  /* Base Layout
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * | Esc  |   1  |   2  |   3  |   4  |   5  |   -  |  |   =  |   6  |   7  |   8  |   9  |   0  |  Del |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * | Tab  |      |      |      |      |      |   [  |  |   ]  |      |      |      |      |      | Enter|
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * | Caps |      |      |      |      |      |   {  |  |   }  |      |      |      |      |      |   '  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |Shift |      |      |      |      |      |   `  |  |   \  |      |      |      |      |      |Shift |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * | Left | Down | Ctrl |  Alt |  Gui | Bspc |  FN  |  |  ADJ | Space|  Gui |  Alt | Ctrl |  Up  |Right |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    | Bspc |  FN  |  |  ADJ | Space|
-   *                                    `-------------'  `-------------'
-   */
-#define BASE_LAYOUT( \
-  _00, _01, _02, _03, _04,  _05, _06, _07, _08, _09, \
-  _10, _11, _12, _13, _14,  _15, _16, _17, _18, _19, \
-  _20, _21, _22, _23, _24,  _25, _26, _27, _28, _29 \
-) \
-LAYOUT( \
-      KC_ESC,  KC_1,    KC_2,     KC_3,    KC_4,    KC_5,    KC_MINS,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_DEL,   \
-      KC_TAB,  _00,     _01,      _02,     _03,     _04,     KC_LBRC,  KC_RBRC, _05,     _06,     _07,     _08,      _09,     KC_ENT,   \
-      KC_CAPS, _10,     _11,      _12,     _13,     _14,     KC_LCBR,  KC_RCBR, _15,     _16,     _17,     _18,      _19,     KC_QUOT,  \
-      KC_LSFT, _20,     _21,      _22,     _23,     _24,     KC_GRV,   KC_BSLS, _25,     _26,     _27,     _28,      _29,     KC_RSFT,  \
-      KC_LEFT, KC_DOWN, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, FN,       ADJ,     KC_SPC,  KC_RGUI, KC_RALT, KC_RCTL,  KC_UP,   KC_RIGHT, \
-                                                    KC_BSPC, FN,       ADJ,     KC_SPC \
-)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   Q  |   W  |   E  |   R  |   T  |      |  |      |   Y  |   U  |   I  |   O  |   P  |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   A  |   S  |   D  |   F  |   G  |      |  |      |   H  |   J  |   K  |   L  |   ;  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |   Z  |   X  |   C  |   V  |   B  |      |  |      |   N  |   M  |   ,  |   .  |   /  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-   */
-  [_QWERTY] = BASE_LAYOUT(
-      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-      KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
-      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH
-  ),
-
-  /* Colemak
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   Q  |   W  |   F  |   P  |   G  |      |  |      |   J  |   L  |   U  |   Y  |   ;  |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   A  |   R  |   S  |   T  |   D  |      |  |      |   H  |   N  |   E  |   I  |   O  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |   Z  |   X  |   C  |   V  |   B  |      |  |      |   K  |   M  |   ,  |   .  |   /  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `--------=----'
-   */
-  [_COLEMAK] = BASE_LAYOUT(
-      KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,   KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-      KC_A,    KC_R,    KC_S,    KC_T,    KC_G,   KC_K,    KC_N,    KC_E,    KC_I,    KC_O,
-      KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,   KC_M,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH
-  ),
-
-
-  /* FN
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      | PGDN |  UP  | PGUP | PRINT| HOME |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      | LEFT | DOWN | RIGHT|INSERT| END  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |Shift |      |      |      |      |      |      |  |      | PLAY | MUTE | VOL- | VOL+ | LAST | NEXT |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |  Gui |      |      |  |      |      |      |      |      |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-   */
-  [_FN] = LAYOUT(
-      XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_UP,   KC_PGUP, KC_PSCR, KC_HOME,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_END,
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                                   XXXXXXX, _______, XXXXXXX, XXXXXXX
-      ),
-
-  /* ADJ
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |QK_BOOT |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  |      |   =  |   /  |   *  |   -  |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  |      |   7  |   8  |   9  |   +  |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      | HUI  | VAI  | SAI  |      |      |COLEMK|  |      |   4  |   5  |   6  | Enter|      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      | HUD  | VAD  | SAD  |      |      |QWERTY|  |      |   1  |   2  |   3  | Space|      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |RGBRST|RGBTOG|RGBMOD|RGBSMD|      |      |  |      |      |   0  |   .  | Bspc |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-   */
-
-  [_ADJ] =  LAYOUT(
-      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   XXXXXXX, KC_PEQL, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX,
-      XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX,
-      XXXXXXX, RGB_SAD, RGB_VAI, RGB_SAI, XXXXXXX,  XXXXXXX, COLEMAK, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   KC_PENT, XXXXXXX, XXXXXXX,
-      XXXXXXX, RGB_HUD, RGB_VAD, RGB_HUI, XXXXXXX,  XXXXXXX, QWERTY,  XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_SPC,  XXXXXXX, XXXXXXX,
-      XXXXXXX, RGBRST,  RGB_TOG, RGB_MOD, RGB_RMOD, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_P0,   KC_PDOT, KC_BSPC, XXXXXXX, XXXXXXX,
-                                                    XXXXXXX, XXXXXXX, _______, XXXXXXX
-      )
-};
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  } else if (index == 1) { /* Second encoder*/
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
-    return true;
-}
-#endif
-
-// Setting ADJ layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    #ifdef RGBLIGHT_ENABLE
-      //rgblight_mode(RGB_current_mode);
-    #endif
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT));
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if(record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case FN:
-      if (record->event.pressed) {
-        //not sure how to have keyboard check mode and set it to a variable, so my work around
-        //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          #ifdef RGBLIGHT_ENABLE
-            //rgblight_mode(15);
-          #endif
-        }
-        layer_on(_FN);
-      } else {
-        #ifdef RGBLIGHT_ENABLE
-          //rgblight_mode(RGB_current_mode);  // revert RGB to initial mode prior to RGB mode change
-        #endif
-        layer_off(_FN);
-        TOG_STATUS = false;
-      }
-      return false;
-      break;
-    case ADJ:
-        if (record->event.pressed) {
-          layer_on(_ADJ);
-        } else {
-          layer_off(_ADJ);
-        }
-        return false;
-        break;
-      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-#ifdef RGBLIGHT_ENABLE
-  RGB_current_mode = rgblight_config.mode;
-#endif
-}
-
-
-// OLED Driver Logic
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!has_usb())
-    return OLED_ROTATION_180;  // flip 180 for offhand
-  return rotation;
-}
-
-static void render_logo(void) {
-  static const char PROGMEM sol_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-  oled_write_P(sol_logo, false);
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_FN (1<<_FN)
-#define L_ADJ (1<<_ADJ)
-#define L_ADJ_TRI (L_ADJ|L_FN)
-
-static void render_status(void) {
-  // Render to mode icon
-  static const char PROGMEM mode_logo[4][4] = {
-    {0x95,0x96,0x0a,0},
-    {0xb5,0xb6,0x0a,0},
-    {0x97,0x98,0x0a,0},
-    {0xb7,0xb8,0x0a,0} };
-
-  if (keymap_config.swap_lalt_lgui != false) {
-    oled_write_P(mode_logo[0], false);
-    oled_write_P(mode_logo[1], false);
-  } else {
-    oled_write_P(mode_logo[2], false);
-    oled_write_P(mode_logo[3], false);
-  }
-
-  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-  oled_write_P(PSTR("Layer: "), false);
-  switch (layer_state) {
-    case L_BASE:
-      oled_write_P(PSTR("Default\n"), false);
-      break;
-    case L_FN:
-      oled_write_P(PSTR("FN     \n"), false);
-      break;
-    case L_ADJ:
-    case L_ADJ_TRI:
-      oled_write_P(PSTR("ADJ    \n"), false);
-      break;
-    default:
-      oled_write_P(PSTR("UNDEF  \n"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(led_state.num_lock ? PSTR("NUMLOCK ") : PSTR("        "), false);
-  oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR("     "), false);
-  oled_write_P(led_state.scroll_lock ? PSTR("SCLK ") : PSTR("     "), false);
-}
-
-bool oled_task_user(void) {
-  if (is_keyboard_master())
-    render_status();
-  else
-    render_logo();
-
-    return false;
-}
-
-#endif
diff --git a/keyboards/rgbkb/sol/keymaps/danielhklein/rules.mk b/keyboards/rgbkb/sol/keymaps/danielhklein/rules.mk
deleted file mode 100644
index 2993bdacc3b..00000000000
--- a/keyboards/rgbkb/sol/keymaps/danielhklein/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Overridden build options from rev1
-
-# Debug Options
-CONSOLE_ENABLE          = yes       # Console for debug(+400)
-COMMAND_ENABLE          = yes       # Commands for debug and configuration
-
-
-
-
-
-# Do not edit past here
-
-include keyboards/$(KEYBOARD)/post_rules.mk
-
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
deleted file mode 100644
index 0ef9def55de..00000000000
--- a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,363 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-enum layer_number {
-    _DVORAK = 0,
-    _DESTINY,
-    _QWERTY,
-    _COLEMAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-enum custom_keycodes {
-  DVORAK = SAFE_RANGE,
-  DESTINY,
-  QWERTY,
-  COLEMAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-  RGBRST,
-  RGB_MENU
-};
-
-// Aliases to make the keymap clearer.
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_DVORAK] = LAYOUT(
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_HOME,  KC_PGUP, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_END,   KC_PGDN, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-      KC_RCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    XXXXXXX,  XXXXXXX, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    XXXXXXX,  XXXXXXX, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-      KC_GRV,  KC_LGUI, KC_LEFT, KC_RGHT, LOWER,   KC_LCTL, KC_LALT,  KC_RALT, KC_RCTL, RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL,
-                                                   KC_BSPC, KC_LGUI,  KC_ENT,  KC_SPC
-
-  ),
-
-  [_DESTINY] = LAYOUT(
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_HOME,  KC_PGUP, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_END,   KC_PGDN, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-      KC_RCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    XXXXXXX,  XXXXXXX, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    XXXXXXX,  XXXXXXX, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-      KC_GRV,  KC_LGUI, KC_LEFT, KC_RGHT, LOWER,   KC_LCTL, KC_LALT,  KC_RALT, KC_RCTL, RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL,
-                                                   KC_BSPC, KC_DEL,   KC_ENT,  KC_SPC
-
-  ),
-
-  [_QWERTY] = LAYOUT(
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_HOME,  KC_PGUP, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_END,   KC_PGDN, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_SLSH,
-      KC_RCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    XXXXXXX,  XXXXXXX, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    XXXXXXX,  XXXXXXX, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-      KC_GRV,  KC_LGUI, KC_LEFT, KC_RGHT, LOWER,   KC_LCTL, KC_LALT,  KC_RALT, KC_RCTL, RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL,
-                                                   KC_BSPC, KC_LGUI,  KC_ENT,  KC_SPC
-  ),
-
-  [_COLEMAK] = LAYOUT(
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_HOME,  KC_PGUP, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_END,   KC_PGDN, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_SLSH,
-      KC_RCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    XXXXXXX,  XXXXXXX, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    XXXXXXX,  XXXXXXX, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-      KC_GRV,  KC_LGUI, KC_LEFT, KC_RGHT, LOWER,   KC_LCTL, KC_LALT,  KC_RALT, KC_RCTL, RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL,
-                                                   KC_BSPC, KC_LGUI,  KC_ENT,  KC_SPC
-  ),
-
-  [_LOWER] =  LAYOUT(
-      KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, XXXXXXX, XXXXXXX, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                   KC_DEL,  _______, _______, KC_INS
-  ),
-
-  [_RAISE] =  LAYOUT(
-      KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, XXXXXXX, XXXXXXX, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                   KC_DEL,  _______, _______, KC_INS
-  ),
-
-  [_ADJUST] =  LAYOUT(
-      _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_NUM,  _______, _______,
-      KC_CAPS, _______, QWERTY,  COLEMAK, DVORAK,  DESTINY, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,
-      _______, _______, _______, RGB_SPI, RGB_SPD, _______, XXXXXXX, XXXXXXX, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                   KC_DEL,  _______, _______, KC_INS
-      )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-   switch (keycode) {
-    case DVORAK:
-        set_single_persistent_default_layer(_DVORAK);
-      return false;
-    case DESTINY:
-        set_single_persistent_default_layer(_DESTINY);
-      return false;
-    case QWERTY:
-        set_single_persistent_default_layer(_QWERTY);
-      return false;
-    case COLEMAK:
-        set_single_persistent_default_layer(_COLEMAK);
-      return false;
-    case RGBRST:
-#if defined(RGBLIGHT_ENABLE)
-        eeconfig_update_rgblight_default();
-        rgblight_enable();
-#elif defined(RGB_MATRIX_ENABLE)
-        eeconfig_update_rgb_matrix_default();
-#endif
-      return false;
-#if defined(RGB_MATRIX_ENABLE) && defined(KEYBOARD_rgbkb_sol_rev2)
-    case RGB_TOG:
-      if (record->event.pressed) {
-        rgb_matrix_increase_flags();
-      }
-      return false;
-#endif
-    case RGB_MENU:
-#ifdef RGB_OLED_MENU
-      if (record->event.pressed) {
-        if (get_mods() & MOD_MASK_SHIFT) {
-          rgb_encoder_state = (rgb_encoder_state - 1);
-          if (rgb_encoder_state > 5) {
-            rgb_encoder_state = 5;
-          }
-        } else {
-          rgb_encoder_state = (rgb_encoder_state + 1) % 6;
-        }
-      }
-#endif
-      return false;
-    }
-  }
-  return true;
-};
-
-// For RGBRST Keycode
-#if defined(RGB_MATRIX_ENABLE)
-void rgb_matrix_increase_flags(void)
-{
-    switch (rgb_matrix_get_flags()) {
-        case LED_FLAG_ALL: {
-            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-            rgb_matrix_set_color_all(0, 0, 0);
-            }
-            break;
-        case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-            rgb_matrix_set_color_all(0, 0, 0);
-            }
-            break;
-        case LED_FLAG_UNDERGLOW: {
-            rgb_matrix_set_flags(LED_FLAG_NONE);
-            rgb_matrix_disable_noeeprom();
-            }
-            break;
-        default: {
-            rgb_matrix_set_flags(LED_FLAG_ALL);
-            rgb_matrix_enable_noeeprom();
-            }
-            break;
-    }
-}
-
-void rgb_matrix_decrease_flags(void)
-{
-    switch (rgb_matrix_get_flags()) {
-        case LED_FLAG_ALL: {
-            rgb_matrix_set_flags(LED_FLAG_NONE);
-            rgb_matrix_disable_noeeprom();
-            }
-            break;
-        case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-            rgb_matrix_set_flags(LED_FLAG_ALL);
-            rgb_matrix_set_color_all(0, 0, 0);
-            }
-            break;
-        case LED_FLAG_UNDERGLOW: {
-            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-            rgb_matrix_set_color_all(0, 0, 0);
-            }
-            break;
-        default: {
-            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-            rgb_matrix_enable_noeeprom();
-            }
-            break;
-    }
-}
-#endif
-
-#ifdef RGB_OLED_MENU
-uint8_t rgb_encoder_state = 4;
-
-typedef void (*rgb_matrix_f)(void);
-
-const rgb_matrix_f rgb_matrix_functions[6][2] = {
-    { rgb_matrix_increase_hue, rgb_matrix_decrease_hue },
-    { rgb_matrix_increase_sat, rgb_matrix_decrease_sat },
-    { rgb_matrix_increase_val, rgb_matrix_decrease_val },
-    { rgb_matrix_increase_speed, rgb_matrix_decrease_speed },
-    { rgb_matrix_step, rgb_matrix_step_reverse },
-    { rgb_matrix_increase_flags, rgb_matrix_decrease_flags }
-};
-#endif
-
-#ifdef ENCODER_ENABLE
-
-static pin_t encoders_pad_a[] = ENCODERS_PAD_A;
-#define NUMBER_OF_ENCODERS ARRAY_SIZE(encoders_pad_a)
-
-const uint16_t PROGMEM encoders[][NUMBER_OF_ENCODERS * 2][2]  = {
-    [_QWERTY] = ENCODER_LAYOUT(
-        KC_VOLU, KC_VOLD,
-        KC_VOLU, KC_VOLD
-    ),
-    [_COLEMAK] = ENCODER_LAYOUT(
-        _______, _______,
-        _______, _______
-    ),
-    [_FN] = ENCODER_LAYOUT(
-        _______, _______,
-        _______, _______
-    ),
-    [_ADJ] = ENCODER_LAYOUT(
-        _______, _______,
-        _______, _______
-    )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (!is_keyboard_master())
-    return;
-
-#ifdef RGB_OLED_MENU
-  if (index == RGB_OLED_MENU) {
-    (*rgb_matrix_functions[rgb_encoder_state][clockwise])();
-  } else
-#endif
-  {
-    uint8_t layer = get_highest_layer(layer_state);
-    uint16_t keycode = encoders[layer][index][clockwise];
-    while (keycode == KC_TRANSPARENT && layer > 0)
-    {
-      layer--;
-      if ((layer_state & (1 << layer)) != 0)
-          keycode = encoders[layer][index][clockwise];
-    }
-    if (keycode != KC_TRANSPARENT)
-      tap_code16(keycode);
-  }
-    return true;
-}
-#endif
-
-// OLED Driver Logic
-#ifdef OLED_ENABLE
- oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (is_keyboard_master())
-    return OLED_ROTATION_270;
-  return rotation;
-}
-
-static void render_logo(void) {
-  static const char PROGMEM sol_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
-  };
-  oled_write_P(sol_logo, false);
-}
-
-static void render_status(void) {
-  // Render to mode icon
-  static const char PROGMEM sol_icon[] = {
-    0x9b,0x9c,0x9d,0x9e,0x9f,
-    0xbb,0xbc,0xbd,0xbe,0xbf,
-    0xdb,0xdc,0xdd,0xde,0xdf,0
-  };
-  oled_write_P(sol_icon, false);
-
-  // Define layers here
-  oled_write_P(PSTR("     Layer-----"), false);
-  uint8_t layer = layer_state ? get_highest_layer(layer_state) : get_highest_layer(default_layer_state);
-  switch (layer) {
-    case _DVORAK:
-      oled_write_P(PSTR("DVRAK"), false);
-      break;
-    case _DESTINY:
-      oled_write_P(PSTR("DSTNY"), false);
-      break;
-    case _QWERTY:
-      oled_write_P(PSTR("QWRTY"), false);
-      break;
-    case _COLEMAK:
-      oled_write_P(PSTR("COLMK"), false);
-      break;
-    case _LOWER:
-      oled_write_P(PSTR("LOWER"), false);
-      break;
-    case _RAISE:
-      oled_write_P(PSTR("RAISE"), false);
-      break;
-    case _ADJUST:
-      oled_write_P(PSTR("ADJST"), false);
-      break;
-    default:
-      oled_write_P(PSTR("UNDEF"), false);
-  }
-
-  // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(PSTR("-----"), false);
-    oled_write_P(led_state.num_lock ? PSTR("NUMLK") : PSTR("     "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPLK") : PSTR("     "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLK") : PSTR("     "), false);
-
-#ifdef RGB_OLED_MENU
-    static char buffer[31] = { 0 };
-    snprintf(buffer, sizeof(buffer), "h%3d s%3d v%3d s%3d m%3d e%3d ", rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, rgb_matrix_config.speed, rgb_matrix_config.mode, rgb_matrix_get_flags());
-    buffer[4 + rgb_encoder_state * 5] = '<';
-
-    oled_write_P(PSTR("-----"), false);
-    oled_write(buffer, false);
-#endif
-}
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    render_status();
-  } else {
-    render_logo();
-    oled_scroll_left();
-  }
-    return false;
-}
-
-#endif
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/readme.md b/keyboards/rgbkb/sol/keymaps/xyverz/readme.md
deleted file mode 100644
index 9405a5a78c7..00000000000
--- a/keyboards/rgbkb/sol/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# Xyverz's Sol Layout
-## Layout
-
-### Base modifier layout
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * | ESC  |      |      |      |      |      |   -  |  |   =  |      |      |      |      |      |   \  |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * | Tab  |      |      |      |      |      |   [  |  |   ]  |      |      |      |      |      |   /  |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * | Del  |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |Shift |      |      |      |      |      |      |  |      |      |      |      |      |      |Shift |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * | Adj  | Alt  |   `  | Left | Rght | Ctrl | Alt  |  | Alt  | Ctrl |  Up  | Down |   /  |   =  | Adj  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    | BkSp | Win  |  | Enter| Space|
-   *                                    `-------------'  `-------------'
-```
-
-### Qwerty alphas
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   Q  |   W  |   E  |   R  |   T  |      |  |      |   Y  |   U  |   I  |   O  |   P  |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   A  |   S  |   D  |   F  |   G  |      |  |      |   H  |   J  |   K  |   L  |   ;  |   '  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |   Z  |   X  |   C  |   V  |   B  |      |  |      |   N  |   M  |   ,  |   .  |   /  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-```
-
-### Dvorak alphas
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   "  |   ,  |   .  |   P  |   Y  |      |  |      |   F  |   G  |   C  |   R  |   L  |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   A  |   O  |   E  |   U  |   I  |      |  |      |   D  |   H  |   T  |   N  |   S  |   -  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |   ;  |   Q  |   J  |   K  |   X  |      |  |      |   B  |   M  |   W  |   V  |   Z  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `--------=----'
-```
-### Colemak alphas
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   Q  |   W  |   F  |   P  |   B  |      |  |      |   J  |   L  |   U  |   Y  |   ;  |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   A  |   R  |   S  |   T  |   G  |      |  |      |   K  |   N  |   E  |   I  |   O  |   '  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |   Z  |   X  |   C  |   D  |   V  |      |  |      |   M  |   H  |   ,  |   .  |   /  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-```
-
-### Adjust (ADJ)
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  | RESET|  |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |      |QWERTY|DVORAK|COLEMK|      |      |  |      |      | PrSc | ScLk | NmLk |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |      | Mute | Vol- | Vol+ |      |      |  |      |RGBTOG|RGBMOD|  HUI |  SAI | VAI  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      | Prev | Play | Next |      |      |  |      |      |RGBRMD|  HUD |  SAD | VAD  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      | Home | End  |      |      |  |      |      | PgUp | PgDn |      |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    | Del  |      |  |      | Ins  |
-   *                                    `-------------'  `-------------'
-```
-
-## Customize
-
-see `qmk_firmware/keyboards/sol/rev1/keymaps/default/rules.mk`
-
-```
-
-# Variables you can set for SOL
-
-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 = ne         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-LED_ANIMATIONS = yes        # LED animations
-LED_MIRRORED = no           # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
-RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects. Can be very laggy
-RGBLIGHT_FULL_POWER = no    # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
-UNICODE_ENABLE = no         # Unicode
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-ENCODER_ENABLE_CUSTOM = yes # Enable rotary encoder
-
-OLED_ENABLE = yes           # OLED_ENABLE
-IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
-
-
-```
-## Compile
-
-go to qmk top directory.
-```
-$ cd qmk_firmware
-```
-
-build
-```
-$ make sol:xyverz
-```
-
-After the initial flash with AVRdudess, you should be able to flash using this:
-```
-$ make sol:xyverz:flash
-```
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk b/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
deleted file mode 100644
index 36416c8dbee..00000000000
--- a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-LED_MIRRORED = yes          # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
-RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects. Can be very laggy
-RGBLIGHT_FULL_POWER = no    # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
-UNICODE_ENABLE = no         # Unicode
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-ENCODER_ENABLE_CUSTOM = no  # Enable rotary encoder
-AUDIO_ENABLE = no
-
-OLED_ENABLE = no            # OLED_ENABLE
-IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
-DEFAULT_FOLDER = rgbkb/sol/rev1
-ENCODER_ENABLE = no
-OLED_ENABLE = yes
-
-# Do not edit past here
-
-ifeq ($(strip $(OLED_ENABLE)), yes)
-    OPT_DEFS += -DOLED_ENABLE
-endif
-
-ifeq ($(strip $(ENCODER_ENABLE_CUSTOM)), yes)
-    OPT_DEFS += -DENCODER_ENABLE_CUSTOM
-    SRC += common/knob_v2.c
-
-endif
-
-ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
-    OPT_DEFS += -DIOS_DEVICE_ENABLE
-
-else ifeq ($(strip $(RGBLIGHT_FULL_POWER)), yes)
-    OPT_DEFS += -DRGBLIGHT_FULL_POWER
-endif
-
-ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
-    OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
-endif
-
-ifeq ($(strip $(LED_MIRRORED)), yes)
-    OPT_DEFS += -DLED_MIRRORED
-endif
diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h
index a41959a88b7..8e18f9df2c7 100644
--- a/keyboards/rgbkb/sol/rev1/config.h
+++ b/keyboards/rgbkb/sol/rev1/config.h
@@ -19,10 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #ifdef LED_MIRRORED
-  #define RGBLED_NUM 35
+  #define RGBLIGHT_LED_COUNT 35
 #else
-  #define RGBLED_NUM 70
+  #define RGBLIGHT_LED_COUNT 70
 #endif
-#define RGB_MATRIX_LED_COUNT  RGBLED_NUM
-
-#define RGB_MATRIX_CENTER { 112, 35 }
+#define RGB_MATRIX_LED_COUNT  RGBLIGHT_LED_COUNT
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index 5b288088a9e..874b4ece22e 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -9,6 +9,52 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [112, 35],
         "driver": "ws2812"
     },
     "rgblight": {
diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h
index 19680c84b31..ab5150051a0 100644
--- a/keyboards/rgbkb/sol/rev2/config.h
+++ b/keyboards/rgbkb/sol/rev2/config.h
@@ -24,30 +24,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef LED_MIRRORED
   #ifdef FULLHAND_ENABLE
     #define FULLHAND_LEDS 24
-    #define RGBLED_NUM 74
+    #define RGBLIGHT_LED_COUNT 74
   #elif SF_ENABLE
     #define FULLHAND_LEDS 38
-    #define RGBLED_NUM 81
+    #define RGBLIGHT_LED_COUNT 81
   #else
     #define FULLHAND_LEDS 0
-    #define RGBLED_NUM 62
+    #define RGBLIGHT_LED_COUNT 62
   #endif
 #else
   #ifdef FULLHAND_ENABLE
     #define FULLHAND_LEDS 24
-    #define RGBLED_NUM 148
+    #define RGBLIGHT_LED_COUNT 148
   #elif SF_ENABLE
     #define FULLHAND_LEDS 38
-    #define RGBLED_NUM 162
+    #define RGBLIGHT_LED_COUNT 162
   #else
     #define FULLHAND_LEDS 0
-    #define RGBLED_NUM 124
+    #define RGBLIGHT_LED_COUNT 124
   #endif
 #endif
 
-#define RGB_MATRIX_LED_COUNT  RGBLED_NUM
-
-#define RGB_MATRIX_CENTER { 112, 37 }
+#define RGB_MATRIX_LED_COUNT  RGBLIGHT_LED_COUNT
 
 // Encoder support
 #ifndef EXTRA_ENCODERS_ENABLE
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index c71efbc7698..ac57e4e74eb 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -9,6 +9,52 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [112, 37],
         "driver": "ws2812"
     },
     "rgblight": {
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 102ebcda956..2d3caeea4e4 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -43,65 +43,6 @@
 /* Split Transport Features */
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
 
-#define RGB_MATRIX_LED_COUNT 156
-#define RGB_MATRIX_SPLIT { 78, 78 }
-#define RGB_MATRIX_CENTER { 81, 28 }
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_MATRIX_LED_FLUSH_LIMIT 33
-#define RGB_MATRIX_LED_PROCESS_LIMIT 10
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// 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 RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#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 RGB_MATRIX_KEYPRESSES
-#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 WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/rgbkb/sol3/keymaps/default/config.h b/keyboards/rgbkb/sol3/keymaps/default/config.h
index 88bdc06dee1..7b8e106b46a 100644
--- a/keyboards/rgbkb/sol3/keymaps/default/config.h
+++ b/keyboards/rgbkb/sol3/keymaps/default/config.h
@@ -18,4 +18,4 @@
 
 // 20m timeout (20m * 60s * 1000mil)
 // #define RGB_MATRIX_TIMEOUT 1200000
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
diff --git a/keyboards/rgbkb/sol3/keymaps/via/config.h b/keyboards/rgbkb/sol3/keymaps/via/config.h
index 7b7f8062619..8206f72fa62 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/config.h
+++ b/keyboards/rgbkb/sol3/keymaps/via/config.h
@@ -18,7 +18,7 @@
 
 // 20m timeout (20m * 60s * 1000mil)
 // #define RGB_MATRIX_TIMEOUT 1200000
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
 
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index c76e1f84dc2..96213156f0c 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -29,7 +29,57 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [81, 28],
+        "driver": "ws2812",
+        "led_flush_limit": 33,
+        "led_process_limit": 10,
+        "sleep": true,
+        "split_count": [78, 78]
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"],
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
index 1de23afd63b..e9d6659d603 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
+#define RGBLIGHT_LED_COUNT 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
deleted file mode 100644
index ca7d19afabb..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
-
-// place overrides here
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
deleted file mode 100644
index ece995075bc..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
+++ /dev/null
@@ -1,97 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _NAV 2
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  NAV,
-
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------.             .-----------------------------------------.
-   * | GESC |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |   \  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |CAPS(NAV)|A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |Shift |
-   * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------|
-   * | Ctrl | Alt  | GUI  | GUI  | NAV  |Space |Delete||Enter|Space |  NAV |   -  |   =  |RGBTOG|Enter |
-   * `------------------------------------------------''-----------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-    QK_GESC,          KC_1,    KC_2,    KC_3,    KC_4,     KC_5,                       KC_6,     KC_7,     KC_8,    KC_9,    KC_0,    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_BSLS,
-    LT(_NAV, 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_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_LALT, KC_LGUI, KC_LGUI, MO(_NAV), KC_SPC,  KC_DEL,  KC_ENT,   KC_SPACE, MO(_NAV), KC_MINS, KC_EQL,  RGB_TOG, KC_ENT
-  ),
-
-  /* NAV
-   * ,-----------------------------------------.             .-----------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |             |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |RGBSAI|RGBVAI|RGBSAD| QK_BOOT|  [   |             |   ]  | Pgup |  Up  | Pgdn |Insert| Home |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |RGBHUD|RGBVAD|RGBHUI|RGBMOD|      |             |      | Left | Down | Right|Delete| End  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |Shift |      |      |      |      |      |             | NKRO |      |      | Pause| Back | Next |
-   * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------|
-   * | Ctrl | Alt  | GUI  |      |      |      |      ||     |      |      |      | Mute | VOLUP| VOLDN|
-   * `------------------------------------------------''-----------------------------------------------'
-   */
-  [_NAV] = 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,
-    _______, RGB_SAI, RGB_VAI, RGB_SAD, QK_BOOT, KC_LBRC,                   KC_RBRC,           KC_PGUP,  KC_UP,   KC_PGDN, KC_INS,  KC_HOME,
-    _______, RGB_HUD, RGB_VAD, RGB_HUI, RGB_MOD, _______,                   _______,           KC_LEFT,  KC_DOWN, KC_RGHT, KC_DEL,  KC_END,
-    KC_LSFT, _______, _______, _______, _______, _______,                   MAGIC_TOGGLE_NKRO, _______,  _______, KC_MPLY, KC_MPRV, KC_MNXT,
-    KC_LCTL, KC_LALT, KC_LGUI, _______, _______, _______, _______, _______, _______,           _______,  _______, KC_MUTE, KC_VOLU, KC_VOLD
-  ),
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    //case COLEMAK:
-      //if (record->event.pressed) {
-        //#ifdef AUDIO_ENABLE
-          //PLAY_SONG(tone_colemak);
-        //#endif
-        //persistant_default_layer_set(1UL<<_COLEMAK);
-      //}
-      //return false;
-      //break;
-  }
-  return true;
-}
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h b/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h
deleted file mode 100644
index b3521279cf0..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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
-
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 4
-#define RGBLIGHT_SAT_STEP 4
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
deleted file mode 100644
index 19289846b65..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
- /* Copyright 2020 Martin J. Potier
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 3 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  */
-
-#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,
-    _NAV
-};
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  NAV,
-
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------.                              .-----------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |                              |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------|                              |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |   \  |
-   * |------+------+------+------+------+------|                              |------+------+------+------+------+------|
-   * |DELETE|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|                              |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |                              |   N  |   M  |   ,  |   .  |   /  |RGBMOD|
-   * |------+------+------+------+------+------+------.              .--------+------+------+------+------+------+------|
-   * | Ctrl | GUI  | Alt  |RGBTOG| NAV  |Space | ESC  |              |Enter|Space/NAV| AltGr|  NAV |      |   -  |   =  |
-   * `------------------------------------------------'              '--------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-    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_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,                      KC_Y,               KC_U,     KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_DEL,   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, RGB_MOD,
-    KC_LCTL,  KC_LGUI, KC_LALT, RGB_TOG, MO(_NAV), KC_SPC, QK_GESC,  KC_ENT,  LT(_NAV, KC_SPACE), KC_RALT, MO(_NAV), _______, KC_MINS, KC_EQL
-  ),
-
-  /* NAV
-   * ,-----------------------------------------.                            .-----------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                            |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |
-   * |------+------+------+------+------+------|                            |------+------+------+------+------+------|
-   * |      |RGBSAI|RGBVAI|RGBSAD|      |  [   |                            |   ]  | Pgup |  Up  | Pgdn |Insert| Home |
-   * |------+------+------+------+------+------|                            |------+------+------+------+------+------|
-   * |      |RGBHUD|RGBVAD|RGBHUI|      |      |                            |      | Left | Down | Right|Delete| End  |
-   * |------+------+------+------+------+------|                            |------+------+------+------+------+------|
-   * |Shift |      |      |      |      |      |                            |      |      |      | Pause| Back | Next |
-   * |------+------+------+------+------+------+------.              .------+------+------+------+------+------+------|
-   * | Ctrl | GUI  | Alt  |RGBMOD|      |      |      |              | QK_BOOT|      |      |      | Mute | VOLUP| VOLDN|
-   * `------------------------------------------------'              '------------------------------------------------'
-   */
-  [_NAV] = 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,
-    _______, RGB_SAI, RGB_VAI, RGB_SAD, _______, KC_LBRC,                   KC_RBRC, KC_PGUP,  KC_UP,   KC_PGDN, KC_INS,  KC_HOME,
-    _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______,                   _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_DEL,  KC_END,
-    KC_LSFT, _______, _______, _______, _______, _______,                   _______, _______,  _______, KC_MPLY, KC_MPRV, KC_MNXT,
-    KC_LCTL, KC_LGUI, KC_LALT, RGB_MOD, _______, _______, _______, QK_BOOT, _______, _______,  _______, KC_MUTE, KC_VOLU, KC_VOLD
-  ),
-
-};
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/samae/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/samae/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/samae/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
deleted file mode 100644
index d1fbe29c539..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2019 starcalleramethyst
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#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
-#define TAPPING_TERM 200
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
deleted file mode 100644
index 47e8e3fa244..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-#include QMK_KEYBOARD_H
-
-uint16_t copy_paste_timer;
-
-enum custom_keycodes {
-  S_H = SAFE_RANGE, // slack here
-  S_H_P,       // slack here + paste 
-  T_H_B,         // ticket header bike
-  T_H_T,       // ticket header tread 
-  E_OP,  	    // email open
-  E_CL,		    // email close 
-  E_FU,		    // email follow up 
-  E_SS,       // email service schedule
-  SCRN_C,	    // screen clip 
-  DC_C,       // double click + copy
-  KC_CCCV,    // one key copy/paste 
-  		
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-
-    case S_H:
-      if (record->event.pressed) {
-        SEND_STRING("@HERE");
-      }
- break;
-
-    case S_H_P:
-      if (record->event.pressed) {
-        SEND_STRING("@HERE" SS_TAP(X_SPC) SS_LCTL("v"));
-      }
- break;
-
- case T_H_B:
-      if (record->event.pressed) {
-        SEND_STRING("Your Peloton Bike - ");
-      }
- break;
-
- case T_H_T:
-      if (record->event.pressed) {
-        SEND_STRING("Your Peloton Tread - ");
-      }
- break;
-
-    case E_OP:
-      if (record->event.pressed) {
-        // when keycode E_OP is pressed
-        SEND_STRING("Hi , "SS_TAP(X_ENTER)SS_TAP(X_ENTER)"Thank you for contacting Peloton."SS_TAP(X_ENTER)SS_TAP(X_ENTER));
-      }
-break;
-
-    case E_CL:
-      if (record->event.pressed) {
-                SEND_STRING("Please let me know if you have any other questions."SS_TAP(X_ENTER)SS_TAP(X_ENTER)"Thank you for being the best part of Peloton."); 
-      }
-break;
-
-    case E_FU:
-      if (record->event.pressed) {
-                SEND_STRING("I will be personally watching this issue and will reach out to you after this is complete to make sure everything went smoothly."SS_TAP(X_ENTER)SS_TAP(X_ENTER)); 
-      }
-break;
-
-    case E_SS:
-      if (record->event.pressed) {
-                SEND_STRING("Please click here to schedule your service."SS_TAP(X_ENTER)SS_TAP(X_ENTER)); 
-      }
-break;
-
-    case SCRN_C:
-      if (record->event.pressed) {
-                tap_code16(C(S(KC_F5))); 
-      }
-break;
-
-   case DC_C:
-      if (record->event.pressed) {
-                tap_code(KC_BTN1);
-                tap_code(KC_BTN1);
-                tap_code16(C(KC_C)); 
-      }
-break;
-    
-    case KC_CCCV:  // One key copy/paste
-            if (record->event.pressed) {
-                copy_paste_timer = timer_read();
-            } else {
-                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
-                    tap_code16(C(KC_C));
-                } else {  // Tap, paste
-                    tap_code16(C(KC_V));
-                }
-            }
-break;
-
-  }
-  return true;
-};  
-
-//Tap Dance Declarations
-enum {
-  TD_SPC_DOT = 0
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Esc, twice for Caps Lock
-  [TD_SPC_DOT]  = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_PDOT) 
-// Other declarations would go here, separated by commas, if you have them
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT(
-QK_GESC, KC_1, 	KC_2, 	KC_3, 	KC_4, 	KC_5, 				KC_6, 	KC_7, 	KC_8, 	KC_9, 	KC_0, KC_BSLS, 
-KC_TAB,  KC_Q, 	KC_W, 	KC_E, 	KC_R, 	KC_T, 				KC_Y, 	KC_U, 	KC_I, 	KC_O, 	KC_P, KC_BSPC, 
-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, SC_SENT, 
-KC_CCCV,   KC_LGUI, KC_LALT, RGB_TOG, MO(1), TD(TD_SPC_DOT), KC_BSPC, KC_ENT, TD(TD_SPC_DOT), MO(2), KC_MINS, KC_EQL, KC_PGUP, KC_PGDN),
-
-	[1] = 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_TRNS, RGB_SAI, RGB_VAI, RGB_SAD, QK_BOOT, KC_LBRC, 			KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, 
-KC_CAPS, RGB_HUD, RGB_VAD, RGB_HUI, KC_TRNS, KC_TRNS, 			KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, 
-KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 			MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, 
-KC_NO,   KC_LGUI, KC_LALT, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLU, KC_VOLD),
-
-/*	[2] = LAYOUT(
-QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, 				KC_6,KC_7, KC_8, KC_9, KC_0, KC_BSLS, 
-KC_TAB,  KC_Q, KC_W, KC_F, KC_P, KC_G, 				KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, 
-KC_LCTL, 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_ENT, 
-KC_LCTL, KC_LGUI, KC_LALT, KC_NO, TO(0), KC_SPC, KC_BSPC, KC_ENT, KC_SPC, TO(0), KC_MINS, KC_EQL, KC_PGUP, KC_PGDN),
-*/
-	[2] = LAYOUT(
-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, S_H_P, KC_NO, 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-KC_NO, E_CL,  E_FU,  E_OP,  S_H,   SCRN_C, 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-KC_NO, DC_C, E_SS, T_H_T, T_H_B, 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_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
-
-};
-
-
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/rules.mk
deleted file mode 100644
index 8e3e2151428..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes 
-MOUSEKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h
deleted file mode 100644
index bcf57fff4aa..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.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 EE_HANDS
-
-#undef RGBLED_NUM
-#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/rgbkb/zen/rev1/keymaps/xyverz/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c
deleted file mode 100644
index f208a94780a..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* This is the Zen keyboard layout by Xyverz aka u/Zrevyx on r/mk.
-   This is pretty much a direct port of my Atreus62 keymap.
-
-   The bottom row is fairly Kinesis-ish since the Contour and Advantage
-   keyboards have been my daily drivers for the last 17 years. I hope
-   You can get some enjoyment out of this layout should you chose it!
-
-CHANGELOG:
-
- 0.1 - Initial commit. Based off of Profet's default keymap.
-
-TODO:
-
- * Figure out how to make the bottom row work best for me.
- * Add legends in comments for each layer. Maybe.
-
-*/
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _DVORAK 0
-#define _QWERTY 1
-#define _COLEMAK 2
-#define _WOW 3
-#define _LOWER 4
-#define _RAISE 5
-#define _ADJUST 16
-
-enum atreus52_keycodes {
-  DVORAK = SAFE_RANGE,
-  QWERTY,
-  COLEMAK,
-  WOW,
-  LOWER,
-  RAISE
-};
-
-// Aliases to make the keymap clearer.
-#define CTLBSPC CTL_T(KC_BSPC) // CTRL when held, BSPC when tapped.
-#define RGB_SWR RGB_M_SW // Swirl Animation alias
-#define RGB_SNK RGB_M_SN // Snake Animation alias
-#define ADJUST MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_DVORAK] = LAYOUT(
-    KC_RBRC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC,
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,                      KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    LOWER,   KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_BSPC, KC_LGUI, KC_ENT,  KC_SPC,  KC_UP,   KC_DOWN, KC_SLSH, KC_EQL,  RAISE
-  ),
-
-  [_QWERTY] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    LOWER,   KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_BSPC, KC_LGUI, KC_ENT,  KC_SPC,  KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL, RAISE
-  ),
-
-  [_COLEMAK] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL ,
-    KC_CAPS, 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,
-    LOWER,   KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, KC_BSPC, KC_LGUI, KC_ENT,  KC_SPC,  KC_UP,   KC_DOWN, KC_RGUI, KC_RCTL, RAISE
-  ),
-
-  [_WOW] = LAYOUT(
-    KC_RBRC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC,
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,                      KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    LOWER,   KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, CTLBSPC, KC_LALT, KC_ENT,  KC_SPC,  KC_UP,   KC_DOWN, KC_SLSH, KC_EQL,  RAISE
-  ),
-
-  [_LOWER] = LAYOUT(
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-    KC_TILD, KC_GRV,  _______, _______, _______, _______,                   _______, _______, _______, _______, _______, KC_PIPE,
-    KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-    _______, _______, _______, KC_HOME, KC_END,  KC_DEL,  _______, _______, KC_INS,  KC_PGUP, KC_PGDN, _______, _______, _______
-  ),
-
-  [_RAISE] = LAYOUT(
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-    KC_TILD, KC_GRV,  _______, _______, _______, _______,                   _______, _______, _______, _______, _______, KC_PIPE,
-    KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______,
-    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                   _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-    _______, _______, _______, KC_HOME, KC_END,  KC_DEL,  _______, _______, KC_INS,  KC_PGUP, KC_PGDN, _______, _______, _______
-  ),
-
-  [_ADJUST] = LAYOUT(
-    QK_BOOT, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_SNK,                   _______, QWERTY,  COLEMAK, DVORAK,  WOW,     _______,
-    RGB_TOG, RGB_MOD, RGB_SWR, RGB_M_K, RGB_M_G, RGB_HUI,                   RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-};
-
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-void matrix_init_user(void) {
-   // This will disable the red LEDs on the ProMicros
-   DDRD &= ~(1<<5);
-   PORTD &= ~(1<<5);
-   DDRB &= ~(1<<0);
-   PORTB &= ~(1<<0);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case DVORAK:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_DVORAK);
-          }
-          return false;
-          break;
-        case QWERTY:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_QWERTY);
-          }
-          return false;
-          break;
-        case COLEMAK:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_COLEMAK);
-          }
-          return false;
-          break;
-        case WOW:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_WOW);
-          }
-          return false;
-          break;
-        case LOWER:
-          if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-        case RAISE:
-          if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          }
-          return false;
-          break;
-      }
-    return true;
-};
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/xyverz/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/rgbkb/zen/rev2/keymaps/debug/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/debug/keymap.c
deleted file mode 100644
index e2d3d6a3567..00000000000
--- a/keyboards/rgbkb/zen/rev2/keymaps/debug/keymap.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <stdio.h>
-
-// extern keymap_config_t keymap_config;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { { { KC_TRNS } } };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static char buf[10] = " ";
-
-    if (record->event.pressed) {
-      snprintf(buf, 10, "C%dR%d ", record->event.key.col, record->event.key.row);
-
-      send_string(buf);
-    }
-    return false;
-
-  return true;
-}
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 8a46a941b7c..5e74a87f680 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -22,14 +22,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #ifndef RGBLIGHT_SPLIT_ENABLE
-    #define RGBLED_NUM 30
+    #define RGBLIGHT_LED_COUNT 30
 #else
-    #define RGBLED_NUM 60
+    #define RGBLIGHT_LED_COUNT 60
 #endif
 
-#define RGB_MATRIX_LED_COUNT 60
-#define RGB_MATRIX_SPLIT { 30, 30 }
-
 #ifdef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 40
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 40
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json
index 4cd4c876f00..3bd412cc3b3 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/info.json
@@ -9,7 +9,8 @@
       "device_version": "0.0.1"
     },
     "rgb_matrix": {
-      "driver": "ws2812"
+      "driver": "ws2812",
+      "split_count": [30, 30]
     },
     "matrix_pins": {
       "cols": ["F4", "F6", "C7", "C6", "B6", "D4"],
diff --git a/keyboards/riot_pad/readme.md b/keyboards/riot_pad/readme.md
deleted file mode 100644
index c2c3ffd4be5..00000000000
--- a/keyboards/riot_pad/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# riot_pad
-
-![riot_pad](https://i.imgur.com/zH6H3pSh.png)
-
-A RGB lovin', 6 key macropad.
-
-* Keyboard Maintainer: [ShandonCodes](https://github.com/ShandonCodes)
-* Hardware Supported: RiotPad PCB
-* Hardware Availability: [Limited Groupbuy](https://store.shandon.codes/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make riot_pad:default
-
-Flashing example for this keyboard:
-
-    make riot_pad: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 (top left key) and plug in the keyboard
diff --git a/keyboards/rmi_kb/equator/config.h b/keyboards/rmi_kb/equator/config.h
new file mode 100644
index 00000000000..c2a22b66711
--- /dev/null
+++ b/keyboards/rmi_kb/equator/config.h
@@ -0,0 +1,11 @@
+// Copyright 2024 Ramon Imbao (@ramonimbao)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* RGB */
+#define WS2812_SPI_DRIVER SPID2
+#define WS2812_SPI_MOSI_PAL_MODE 0
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 0
+#define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/rmi_kb/equator/equator.c b/keyboards/rmi_kb/equator/equator.c
new file mode 100644
index 00000000000..508eeea9e56
--- /dev/null
+++ b/keyboards/rmi_kb/equator/equator.c
@@ -0,0 +1,30 @@
+// Copyright 2024 Ramon Imbao (@ramonimbao)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { 
+        return false;
+    }
+    led_t state = host_keyboard_led_state();
+    uint32_t highest_layer = get_highest_layer(layer_state);
+
+
+    if (!(state.compose || state.scroll_lock)) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
+    }
+
+    if (!state.caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
+    }
+
+    if (highest_layer == 0) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 0);
+    }
+
+
+    return false;
+}
+#endif
diff --git a/keyboards/rmi_kb/equator/halconf.h b/keyboards/rmi_kb/equator/halconf.h
new file mode 100644
index 00000000000..e215e323c5d
--- /dev/null
+++ b/keyboards/rmi_kb/equator/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Ramon Imbao (@ramonimbao)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/rmi_kb/equator/info.json b/keyboards/rmi_kb/equator/info.json
new file mode 100644
index 00000000000..9e1ccab0fb5
--- /dev/null
+++ b/keyboards/rmi_kb/equator/info.json
@@ -0,0 +1,152 @@
+{
+    "manufacturer": "Ramon Imbao",
+    "keyboard_name": "EQUATOR",
+    "maintainer": "ramonimbao",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A9", "A8", "B2", "B11", "F1", "F0", "C15", "C14", "C13"],
+        "rows": ["B12", "B10", "A15", "A10", "B1"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xE0A1",
+        "vid": "0xB16B"
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "digital_rain": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"flags": 8, "x":224, "y":8},
+            {"flags": 8, "x":224, "y":4},
+            {"flags": 8, "x":224, "y":0}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x":10, "y": 0},
+                {"matrix": [0, 9], "x":11, "y": 0},
+                {"matrix": [0,10], "x":12, "y": 0},
+                {"matrix": [0,11], "x":13, "y": 0},
+                {"matrix": [0,12], "x":14, "y": 0},
+                {"matrix": [0,13], "x":15, "y": 0},
+                {"matrix": [0,14], "x":16, "y": 0},
+                {"matrix": [0,15], "x":17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0,   "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x":10.5, "y": 1},
+                {"matrix": [1,10], "x":11.5, "y": 1},
+                {"matrix": [1,11], "x":12.5, "y": 1},
+                {"matrix": [1,12], "x":13.5, "y": 1},
+                {"matrix": [1,13], "x":14.5, "y": 1},
+                {"matrix": [1,14], "x":15.5, "y": 1, "w": 1.5},
+                {"matrix": [1,15], "x":17,   "y": 1},
+
+                {"matrix": [2, 0], "x": 0,    "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x":10.75, "y": 2},
+                {"matrix": [2,10], "x":11.75, "y": 2},
+                {"matrix": [2,11], "x":12.75, "y": 2},
+                {"matrix": [2,12], "x":13.75, "y": 2},
+                {"matrix": [2,14], "x":14.75, "y": 2, "w": 2.25},
+                {"matrix": [2,15], "x":17,    "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x":10.25, "y": 3},
+                {"matrix": [3,10], "x":11.25, "y": 3},
+                {"matrix": [3,11], "x":12.25, "y": 3},
+                {"matrix": [3,12], "x":13.25, "y": 3},
+                {"matrix": [3,13], "x":14.25, "y": 3, "w": 1.75},
+                {"matrix": [3,14], "x":16,    "y": 3},
+                {"matrix": [3,15], "x":17,    "y": 3},
+
+                {"matrix": [4, 0], "x": 0,    "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 3, "w": 1.25},
+                {"matrix": [4, 5], "x": 4.5,  "y": 3, "w": 2.75},
+                {"matrix": [4, 8], "x": 8.25, "y": 3, "w": 2.25},
+                {"matrix": [4, 9], "x":10.5,  "y": 3, "w": 1.25},
+                {"matrix": [4,11], "x":12.5,  "y": 3, "w": 1.25},
+                {"matrix": [4,12], "x":13.75, "y": 3, "w": 1.25},
+                {"matrix": [4,13], "x":15,    "y": 3},
+                {"matrix": [4,14], "x":15,    "y": 3},
+                {"matrix": [4,15], "x":15,    "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rmi_kb/equator/keymaps/default/keymap.c b/keyboards/rmi_kb/equator/keymaps/default/keymap.c
new file mode 100644
index 00000000000..b5a0cdb458b
--- /dev/null
+++ b/keyboards/rmi_kb/equator/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_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,    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_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_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_SPC,  KC_RALT,          KC_RCTL, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_DEL,   KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,                            _______, _______,          _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/rmi_kb/equator/keymaps/via/keymap.c b/keyboards/rmi_kb/equator/keymaps/via/keymap.c
new file mode 100644
index 00000000000..b5a0cdb458b
--- /dev/null
+++ b/keyboards/rmi_kb/equator/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_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,    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_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_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_SPC,  KC_RALT,          KC_RCTL, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_DEL,   KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,                            _______, _______,          _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/rmi_kb/equator/keymaps/via/rules.mk b/keyboards/rmi_kb/equator/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/rmi_kb/equator/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/rmi_kb/equator/mcuconf.h b/keyboards/rmi_kb/equator/mcuconf.h
new file mode 100644
index 00000000000..aceb2e3dfc0
--- /dev/null
+++ b/keyboards/rmi_kb/equator/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Ramon Imbao (@ramonimbao)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
diff --git a/keyboards/rmi_kb/equator/readme.md b/keyboards/rmi_kb/equator/readme.md
new file mode 100644
index 00000000000..93755490f43
--- /dev/null
+++ b/keyboards/rmi_kb/equator/readme.md
@@ -0,0 +1,26 @@
+# EQUATOR
+
+![EQUATOR](https://i.imgur.com/0zjj6btl.png)
+
+An ergo 65% keyboard designed in collaboration with ronworks.
+
+* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
+* Hardware Supported: STM32F072
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rmi_kb/equator:default
+
+Flashing example for this keyboard:
+
+    make rmi_kb/equator: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**: Press and hold the button below the right alt and right ctrl keys
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/rmi_kb/equator/rules.mk b/keyboards/rmi_kb/equator/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/rmi_kb/equator/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/config.h b/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/config.h
deleted file mode 100644
index 0054f43e6bd..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2017 Baris Tosun
- *
- * 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
-
-// place overrides here
-
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
deleted file mode 100644
index ca2be62a194..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Copyright 2019 Josef Adamcik
- *
- *  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 katana_layers {
-    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
-    _M_COLEMAK,
-    _M_QWERTY,
-    _W_COLEMAK,
-    _W_QWERTY,
-    _NUMB,
-    _SYMB,
-    _M_EXT,
-    _W_EXT
-};
-
-enum katana_keycodes {
-    M_COLEMAK = SAFE_RANGE,
-    M_QWERTY,
-    W_COLEMAK,
-    W_QWERTY
-};
-
-#define K_SPCFN LT(_SYMB, KC_SPACE) /* Tap for space, hold for symbols layer */
-#define K_BSPFN LT(_SYMB, KC_BSPC)  /* Tap for backspace, hold for symbols layer */
-/* Linux/win variants */
-#define W_LEFT_MOD MT(MOD_RCTL, KC_LEFT)
-#define W_DOWN_MOD MT(MOD_RALT, KC_DOWN)
-#define W_UP_MOD MT(MOD_RGUI, KC_UP)
-#define W_UNDO    LCTL(KC_Z)
-#define W_CUT     LCTL(KC_X)
-#define W_COPY    LCTL(KC_C)
-#define W_PASTE   LCTL(KC_V)
-#define W_PRVWD LCTL(KC_LEFT)
-#define W_NXTWD LCTL(KC_RIGHT)
-#define W_LSTRT KC_HOME
-#define W_LEND KC_END
-/* Mac variants */
-#define M_LEFT_MOD MT(MOD_RGUI, KC_LEFT)
-#define M_DOWN_MOD MT(MOD_RALT, KC_DOWN)
-#define M_UP_MOD MT(MOD_RCTL, KC_UP)
-#define M_UNDO LGUI(KC_Z)
-#define M_CUT LGUI(KC_X)
-#define M_COPY LGUI(KC_C)
-#define M_PASTE LGUI(KC_V)
-#define M_PRVWD LALT(KC_LEFT)
-#define M_NXTWD LALT(KC_RIGHT)
-#define M_LSTRT LGUI(KC_LEFT)
-#define M_LEND LGUI(KC_RIGHT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_M_COLEMAK] = LAYOUT(
-    KC_ESC,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   TG(_NUMB),KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_LBRC,          KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    MO(_M_EXT),KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_MINS,          KC_QUOT, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EQL,  KC_DEL,  KC_BSLS, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_SYMB), KC_LCTL, KC_LALT, KC_LGUI,                   K_BSPFN, KC_ENT,  KC_SPACE,         M_LEFT_MOD,M_DOWN_MOD,M_UP_MOD,  KC_RIGHT,MO(_SYMB)
-),
-[_M_QWERTY] = LAYOUT(
-    KC_ESC,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   TG(_NUMB),KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,          KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    MO(_M_EXT),KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MINS,          KC_QUOT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EQL,  KC_DEL,  KC_BSLS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_SYMB), KC_LCTL, KC_LALT, KC_LGUI,                   K_BSPFN, KC_ENT,  KC_SPACE,         M_LEFT_MOD,M_DOWN_MOD,M_UP_MOD,   KC_RIGHT,MO(_SYMB)
-),
-[_W_COLEMAK] = LAYOUT(
-    KC_ESC,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   TG(_NUMB),KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_LBRC,          KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    MO(_W_EXT),KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_MINS,          KC_QUOT, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EQL,  KC_DEL,  KC_BSLS, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_SYMB), KC_LGUI, KC_LALT, KC_LCTL,                   K_BSPFN, KC_ENT,  KC_SPACE,         W_LEFT_MOD,W_DOWN_MOD,W_UP_MOD,  KC_RIGHT,MO(_SYMB)
-),
-[_W_QWERTY] = LAYOUT(
-    KC_ESC,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   TG(_NUMB),KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,          KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    MO(_W_EXT),KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MINS,          KC_QUOT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EQL,  KC_DEL,  KC_BSLS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_SYMB), KC_LGUI, KC_LALT, KC_LCTL,                   K_BSPFN, KC_ENT,  KC_SPACE,         W_LEFT_MOD,W_DOWN_MOD,W_UP_MOD,   KC_RIGHT,MO(_SYMB)
-),
-[_NUMB] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, KC_PSLS, KC_PAST, KC_PMNS, _______, _______,
-    _______, _______, _______, KC_MS_U, _______, _______, _______,          _______,_______, KC_7,    KC_8,    KC_9,    KC_PPLS, _______,
-    _______, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,          _______,_______, KC_4,    KC_5,    KC_6,    KC_PPLS, _______,
-    _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______,_______, KC_1,    KC_2,    KC_3,    KC_PENT, _______,
-    _______, _______, _______, _______,                   KC_BTN1, _______, KC_P0,            KC_PDOT, _______, _______, _______, _______
-),
-[_SYMB] = LAYOUT(
-    QK_BOOT, _______, 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_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,          _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_VOLD,          KC_VOLU, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-    _______, KC_PLUS, KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_MPRV, KC_MPLY, KC_MNXT, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-    _______, _______, _______, _______,                   KC_DEL,  _______, _______,          _______, _______, _______, _______, _______
-),
-[_M_EXT] = LAYOUT(
-    QK_BOOT,M_COLEMAK,M_QWERTY,W_COLEMAK,W_QWERTY,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, M_PRVWD, KC_UP,   M_NXTWD, _______, _______,
-    _______, KC_LALT, KC_LCTL, KC_LSFT, _______, KC_CAPS, _______,          _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  _______,
-    _______, M_UNDO,  M_CUT,   M_COPY,  M_PASTE, _______, _______, _______, _______, _______, M_LSTRT, _______, M_LEND,  _______, _______,
-    _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
-),
-[_W_EXT] = LAYOUT(
-    QK_BOOT,M_COLEMAK,M_QWERTY,W_COLEMAK,W_QWERTY,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, W_PRVWD, KC_UP,   W_NXTWD, _______, _______,
-    _______, KC_LALT, KC_LCTL, KC_LSFT, _______, KC_CAPS, _______,          _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  _______,
-    _______, W_UNDO,  W_CUT,   W_COPY,  W_PASTE, _______, _______, _______, _______, _______, W_LSTRT, _______, W_LEND,  _______, _______,
-    _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case M_QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_M_QWERTY);
-            }
-            return false;
-            break;
-        case M_COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_M_COLEMAK);
-            }
-            return false;
-            break;
-        case W_QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_W_QWERTY);
-            }
-            return false;
-            break;
-        case W_COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_W_COLEMAK);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/readme.md b/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/readme.md
deleted file mode 100644
index 5d72b1defa0..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-![Multi OS Katana60 layout image](https://i.imgur.com/1w2OA1o.png)
-
-# Multi OS Katana60 layout
-
-Based on the default Katana60 layout, customized by [Josef Adamcik](https://josef-adamcik.cz) with several basic layers (Colemak vs Qwerty, Mac OS vs Linux/Win)
-
-- Supports 4 default layers: Colemak Mac, Qwerty Mac, Colemak Win/Linux, Qwerty Win/Linux. Switching between default layers is persisted. For more details about Mac vs Win/Linux see below.
-- There are arrows mapped to the right side of the bottom row on Katana6O. I kept this mapping but modified it a bit - when you press and hold any of the first three arrow keys it acts as a modifier (CMD, OPT, CTRL). If you just tap it, it acts as an arrow.
-
-## Mac versus Win/Linux layers:
-
-- Modifiers are ordered differently. Mac version has (from the middle to the outside): CMD, ALT, CTRL, Win/Linux version has CTRL, ALT, CMD. It's meant to make switching between platforms easier.
-- Extend layer is different, so the keys which represent shortcuts ("previous/next word" and "copy", "paste", "cut", "undo") work properly.
-
-## More details - reasons for some choices in this layout
-
-I use Mac for work and Ubuntu at home. So I would like to stay compatible with both systems. The main problem is the modifiers. Firstly, they tend to be ordered differently on Mac keyboards. Secondly, the main modifier on Mac is CMD (equivalent to WIn or SUPER on other keyboards). The same role is played by CTRL on Windows and Linux. Most of IDE’s or editors (Android Studio, VS Code, SublimeText) follow this habit in their OS-specific keymaps.
-
-I am a user of the Colemak layout. But I would like to have the ability to switch to qwerty. That would allow my other people to use my keyboard occasionally.
-
-I am a heavy user of keyboard shortcuts. So I need the layout to support my needs. Some keyboard layout has modifiers only on one side of the keyboard or they hide some of them (CMD) under a key combination. I tend to press the modifiers for a key shortcut with the opposite hand to the one which presses the letter. 
-
-Layout in [keyboard-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/14d62ee67d36621c37888783fa29b107)
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/msiu/config.h b/keyboards/rominronin/katana60/rev1/keymaps/msiu/config.h
deleted file mode 100644
index b57cc482ec7..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/msiu/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2017 Baris Tosun
- *
- * 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
-
-
-// place overrides here
-
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c
deleted file mode 100644
index 7850d38c903..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Mod-Tap keys for cleaner code
-#define ESC_CTL LCTL_T(KC_ESC)
-#define SPC_LW LT(2, KC_SPC)
-#define ENT_FN LT(4, KC_ENT)
-
-#define _QW 0
-#define _DV 1
-#define _LW 2
-#define _RS 3
-#define _FN 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QW] = LAYOUT( /* Base */
-  KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    TG(1),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_PLUS,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,          KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  ESC_CTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,          KC_PGUP, 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_END,  KC_DEL,  KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  KC_LCTL, KC_HYPR, KC_LALT, KC_LGUI,                   SPC_LW,  ENT_FN,  KC_SPC,           MO(3),   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-    ),
-[_DV] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    _______,          _______, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______,
-  _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    _______,          _______, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    _______, _______, _______, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______,
-  _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
-    ),
-[_LW] = 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_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,          _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, 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,  _______, _______, _______, KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-  _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
-    ),
-[_RS] = 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_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,            _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-  _______, _______, _______, _______,                   _______, _______, _______,          _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
-    ),
-[_FN] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, KC_UP,   _______, KC_PSCR, _______,
-  _______, _______, _______, _______, _______, _______, _______,          _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/msiu/readme.md b/keyboards/rominronin/katana60/rev1/keymaps/msiu/readme.md
deleted file mode 100644
index e4f0ebdb6ec..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/msiu/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# msiu's keymap for katana: standard QWERTY layout with planck like layers
-
-This layout take a standard QWERTY default layer, with raise and lower layers similar to planck. It is for me to easily transition between keyboards. I put a few nav keys in the 'tree' middle, but I have come to realise I rarely use them as I am used to the planck layering. Top of the tree is a toggle for Dvorak layer. 
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/config.h b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/config.h
deleted file mode 100644
index 08c51f6cb50..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2017 Baris Tosun
- *
- * 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/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
deleted file mode 100644
index 615de932f89..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2017 Baris Tosun
- *
- * 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
-
-// MacOS based definitions.
-#define K_SPCFN LT(SYMB, KC_SPACE) // Tap for space, hold for symbols layer
-#define K_PRVWD LALT(KC_LEFT)      // Previous word
-#define K_NXTWD LALT(KC_RIGHT)     // Next word
-#define K_LSTRT LGUI(KC_LEFT)      // Start of line
-#define K_LEND  LGUI(KC_RIGHT)     // End of line
-#define UNDO    LGUI(KC_Z)         // UNDO
-#define CUT     LGUI(KC_X)         // CUT
-#define COPY    LGUI(KC_C)         // COPY
-#define PASTE   LGUI(KC_V)         // PASTE
-
-
-#define BASE 0 // Default
-#define NUMB 1 // Numbers
-#define SYMB 2 // Symbols
-#define CURS 3 // Text Editing
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE] = LAYOUT( /* Base */
-  KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(1),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_LBRC,          KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT, KC_BSPC,
-  MO(3),   KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_HOME,          KC_PGUP, KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_END,  KC_DEL,  KC_PGDN, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  MO(2),   KC_LCTL, KC_LALT, KC_LGUI,                   KC_BSPC, KC_ENT,  K_SPCFN,          KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,MO(2)
-    ),
-[NUMB] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, DF(0),   KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______,
-  _______, _______, _______, KC_MS_U, _______, _______, _______,          KC_7,    KC_8,    KC_9,    KC_PPLS, _______, _______, _______,
-  _______, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,          KC_4,    KC_5,    KC_6,    KC_PPLS, _______, _______, _______,
-  _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, KC_1,    KC_2,    KC_3,    KC_PENT, _______, _______, _______,
-  _______, _______, _______, _______,                   KC_BTN1, _______, KC_P0,            KC_PDOT, KC_PENT, _______, _______, _______
-    ),
-[SYMB] = LAYOUT(
-  QK_BOOT, _______, 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_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,          _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_VOLD,          KC_VOLU, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, KC_PLUS, KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_MPRV, KC_MPLY, KC_MNXT, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-  _______, _______, _______, _______,                   KC_DEL,  _______, _______,          _______, _______, _______, _______, _______
-    ),
-[CURS] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, KC_WH_U, _______, _______, _______, _______,          _______, _______, K_PRVWD, KC_UP,   K_NXTWD, _______, _______,
-  _______, KC_LCTL, KC_WH_D, KC_LSFT, _______, _______, _______,          _______, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  _______,
-  _______, UNDO,    CUT,     COPY,    PASTE,   _______, _______, _______, _______, _______, K_LSTRT, _______, K_LEND,  _______, _______,
-  _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
-    )
-
-};
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/readme.md b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/readme.md
deleted file mode 100644
index 9647426f702..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# RominRonin's keymap for katana60
-
-My own personal daily layout. OS keys are oriented for MacOS and the keys are in COLEMAK Mod-DH layout.
-
-# TODO: references to extend layer and symbol layers
\ No newline at end of file
diff --git a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/config.h b/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/config.h
deleted file mode 100644
index 06896764026..00000000000
--- a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 rominronin
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c b/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c
deleted file mode 100644
index 6919b469907..00000000000
--- a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2019 rominronin
- *
- * 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
-
-// MacOS based definitions.
-#define K_SPCFN LT(SYMB, KC_SPACE) // Tap for space, hold for symbols layer
-#define K_PRVWD LALT(KC_LEFT)      // Previous word
-#define K_NXTWD LALT(KC_RIGHT)     // Next word
-#define K_LSTRT LGUI(KC_LEFT)      // Start of line
-#define K_LEND  LGUI(KC_RIGHT)     // End of line
-#define UNDO    LGUI(KC_Z)         // UNDO
-#define CUT     LGUI(KC_X)         // CUT
-#define COPY    LGUI(KC_C)         // COPY
-#define PASTE   LGUI(KC_V)         // PASTE
-
-enum layer_names {
-    BASE,
-    NUMB,
-    SYMB,
-    CURS,
-    BASE2,
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_7u_a(/* Base */
-    KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(4),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,      KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_LBRC, KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT,      KC_BSPC,
-    MO(3),     KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_HOME,      KC_PGUP, KC_M,    KC_N,    KC_E,    KC_I,    KC_O,      KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_END,  KC_DEL,  KC_PGDN, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LGUI,                                     K_SPCFN,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-  ),
-  [NUMB] = LAYOUT_7u_a(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PEQL, KC_PSLS, KC_PAST, _______, _______,
-    _______,     _______, _______, KC_MS_U, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      _______,
-    DF(0),     KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,      _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,   _______,
-    _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-    _______, _______, _______,                                     KC_P0,                               KC_PDOT, KC_PENT, _______, _______
-  ),
-  [SYMB] = LAYOUT_7u_a(
-    QK_BOOT, _______, 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_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,         KC_DEL,
-    _______,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_VOLD,      KC_VOLU, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,   _______,
-    _______, KC_PLUS, KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_MPRV, KC_MPLY, KC_MNXT, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-    _______, _______, _______,                                     KC_DEL,                             _______, _______, _______, _______
-  ),
-  [CURS] = LAYOUT_7u_a(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,     _______, _______, _______, _______, _______, _______, _______, _______, K_PRVWD, KC_UP,   K_NXTWD, _______,      _______,
-    _______,   _______, KC_LCTL, KC_LALT, KC_LSFT, _______, _______,      _______, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,    _______,
-    _______, UNDO,    CUT,     COPY,    PASTE,   _______, _______, _______, _______, _______, K_LSTRT, _______, K_LEND,  _______, _______,
-    _______, _______, _______,                                      DF(1),                             _______, _______, _______, _______
-  ),
-  [BASE2] = LAYOUT_7u_a(/* Base */
-    KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(0),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,      KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_LBRC, KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT,      KC_BSPC,
-    KC_CAPS,   KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_HOME,      KC_PGUP, KC_M,    KC_N,    KC_E,    KC_I,    KC_O,      KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_END,  KC_DEL,  KC_PGDN, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LGUI,                                     KC_SPACE,                           KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-  )
-};
diff --git a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/readme.md b/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/readme.md
deleted file mode 100644
index 6d0bbe8b2d1..00000000000
--- a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for katana60_rev2
diff --git a/keyboards/rookiebwoy/late9/readme.md b/keyboards/rookiebwoy/late9/readme.md
new file mode 100644
index 00000000000..bc6dfab57e2
--- /dev/null
+++ b/keyboards/rookiebwoy/late9/readme.md
@@ -0,0 +1,25 @@
+# LATE-9
+
+
+The LATE-9 is a multi-tap input keyboard based on mobile phones from the late '90s. LATE-9 is intended as a dev board with 18 buttons and an OLED screen, made by through-hole components only. With this, you can experiment QMK OLED capabilities with very little expense.
+
+![LATE-9](https://i.imgur.com/QXycTC3h.jpg "LATE-9 first proto")
+
+* Keyboard maintainer: [rookiebwoy](https://github.com/rookiebwoy)
+* Hardware supported: ProMicro, _Elite-C (not tested)_
+* Hardware Availability: LATE-9 is open source, check the [project repository](https://github.com/rookiebwoy/late-9) for gerbers.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rookiebwoy/late9/rev1:default
+
+Flashing example for this keyboard:
+
+    make rookiebwoy/late9/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
+
+When asked by the terminal, short with a metal wire the pins on the backside of the board highlighted as `RST` (one is the `RESET` and the other one is `GROUND`) to enter the bootloader and let the OS detects the device.\
+After installing this firmware you can use Bootmagic to enter the bootloader while plugging in your LATE-9. By default it's the button on the upper-left of the keyboard.
\ No newline at end of file
diff --git a/keyboards/late9/rev1/config.h b/keyboards/rookiebwoy/late9/rev1/config.h
similarity index 100%
rename from keyboards/late9/rev1/config.h
rename to keyboards/rookiebwoy/late9/rev1/config.h
diff --git a/keyboards/rookiebwoy/late9/rev1/info.json b/keyboards/rookiebwoy/late9/rev1/info.json
new file mode 100644
index 00000000000..48f3cff840d
--- /dev/null
+++ b/keyboards/rookiebwoy/late9/rev1/info.json
@@ -0,0 +1,58 @@
+{
+    "keyboard_name": "LATE-9",
+    "manufacturer": "rookiebwoy",
+    "url": "https://github.com/rookiebwoy/late-9)",
+    "maintainer": "rookiebwoy",
+    "usb": {
+        "vid": "0x6961",
+        "pid": "0x3032",
+        "device_version": "0.1.0"
+    },
+    "tapping": {
+        "term": 400
+    },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "C6", "D4"],
+        "rows": ["B4", "E6", "D7", "B3", "B2", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+      "bootmagic": true,
+      "nkro": true,
+      "oled": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rookiebwoy/late9/rev1/keymaps/default/keymap.c b/keyboards/rookiebwoy/late9/rev1/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f93958fe8f3
--- /dev/null
+++ b/keyboards/rookiebwoy/late9/rev1/keymaps/default/keymap.c
@@ -0,0 +1,84 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * 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
+
+// Layers declarations
+enum layers {
+    _BL,
+    _OL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* BL: Base Layer
+ * ,-----------------------.
+ * |MO(OP) | ↑     | BSPC  |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | <-    | ↓     | ->    |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 1     | 2     | 3     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 4     | 5     | 6     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 7     | 8     | 9     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 0     | .     | =     |
+ * |       |       |       |
+ * `-----------------------'
+ */
+  [_BL] = LAYOUT(
+    MO(1),         KC_UP,         KC_BSPC,
+    KC_LEFT,       KC_DOWN,       KC_RIGHT,
+    KC_P1,         KC_P2,         KC_P3,
+    KC_P4,         KC_P5,         KC_P6,
+    KC_P7,         KC_P8,         KC_P9,
+    KC_P0,         KC_PDOT,       KC_PEQL
+  ),
+
+/* OP: Operators Layer
+ * ,-----------------------.
+ * |MO(OP) | ↑     | BSPC  |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | <-    | ↓     | ->    |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | /     | *     | -     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | (     | )     | +     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | &     | %     | ^     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | |     | .     | =     |
+ * |       |       |       |
+ * `-----------------------'
+ */
+  [_OL] = LAYOUT(
+    MO(1),         KC_UP,         KC_BSPC,
+    KC_LEFT,       KC_DOWN,       KC_RIGHT,
+    KC_PSLS,       KC_PAST,       KC_PMNS,
+    LSFT(KC_9),    LSFT(KC_0),    KC_PPLS,
+    LSFT(KC_7),    LSFT(KC_5),    LSFT(KC_6),
+    LSFT(KC_BSLS), KC_PDOT,       KC_PEQL
+  ),
+};
\ No newline at end of file
diff --git a/keyboards/late9/rev1/keymaps/default/readme.md b/keyboards/rookiebwoy/late9/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/late9/rev1/keymaps/default/readme.md
rename to keyboards/rookiebwoy/late9/rev1/keymaps/default/readme.md
diff --git a/keyboards/rookiebwoy/late9/rev1/keymaps/via/keymap.c b/keyboards/rookiebwoy/late9/rev1/keymaps/via/keymap.c
new file mode 100644
index 00000000000..f93958fe8f3
--- /dev/null
+++ b/keyboards/rookiebwoy/late9/rev1/keymaps/via/keymap.c
@@ -0,0 +1,84 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * 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
+
+// Layers declarations
+enum layers {
+    _BL,
+    _OL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* BL: Base Layer
+ * ,-----------------------.
+ * |MO(OP) | ↑     | BSPC  |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | <-    | ↓     | ->    |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 1     | 2     | 3     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 4     | 5     | 6     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 7     | 8     | 9     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 0     | .     | =     |
+ * |       |       |       |
+ * `-----------------------'
+ */
+  [_BL] = LAYOUT(
+    MO(1),         KC_UP,         KC_BSPC,
+    KC_LEFT,       KC_DOWN,       KC_RIGHT,
+    KC_P1,         KC_P2,         KC_P3,
+    KC_P4,         KC_P5,         KC_P6,
+    KC_P7,         KC_P8,         KC_P9,
+    KC_P0,         KC_PDOT,       KC_PEQL
+  ),
+
+/* OP: Operators Layer
+ * ,-----------------------.
+ * |MO(OP) | ↑     | BSPC  |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | <-    | ↓     | ->    |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | /     | *     | -     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | (     | )     | +     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | &     | %     | ^     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | |     | .     | =     |
+ * |       |       |       |
+ * `-----------------------'
+ */
+  [_OL] = LAYOUT(
+    MO(1),         KC_UP,         KC_BSPC,
+    KC_LEFT,       KC_DOWN,       KC_RIGHT,
+    KC_PSLS,       KC_PAST,       KC_PMNS,
+    LSFT(KC_9),    LSFT(KC_0),    KC_PPLS,
+    LSFT(KC_7),    LSFT(KC_5),    LSFT(KC_6),
+    LSFT(KC_BSLS), KC_PDOT,       KC_PEQL
+  ),
+};
\ No newline at end of file
diff --git a/keyboards/rookiebwoy/late9/rev1/keymaps/via/rules.mk b/keyboards/rookiebwoy/late9/rev1/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/rookiebwoy/late9/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/late9/rev1/readme.md b/keyboards/rookiebwoy/late9/rev1/readme.md
similarity index 100%
rename from keyboards/late9/rev1/readme.md
rename to keyboards/rookiebwoy/late9/rev1/readme.md
diff --git a/keyboards/late9/rev1/rev1.c b/keyboards/rookiebwoy/late9/rev1/rev1.c
similarity index 100%
rename from keyboards/late9/rev1/rev1.c
rename to keyboards/rookiebwoy/late9/rev1/rev1.c
diff --git a/keyboards/rookiebwoy/late9/rev1/rules.mk b/keyboards/rookiebwoy/late9/rev1/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/rookiebwoy/late9/rev1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/rookiebwoy/late9/rules.mk b/keyboards/rookiebwoy/late9/rules.mk
new file mode 100755
index 00000000000..358facb3caa
--- /dev/null
+++ b/keyboards/rookiebwoy/late9/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = rookiebwoy/late9/rev1
diff --git a/keyboards/rookiebwoy/neopad/readme.md b/keyboards/rookiebwoy/neopad/readme.md
new file mode 100644
index 00000000000..5b0ae7abc7f
--- /dev/null
+++ b/keyboards/rookiebwoy/neopad/readme.md
@@ -0,0 +1,25 @@
+# Neopad
+
+Neopad is a little macropad with four switches and two rotary encoders, made by through hole components only.
+_Actually the number of switches is six, because even the encoder are allowed to click._
+
+![Neopad](https://i.imgur.com/TgOkj2Fh.jpg "Neopad first proto")
+
+The Neopad in the photo above is the first prototype. See the project repository for revision 1 update and KiCad files.
+
+* Keyboard maintainer: [rookiebwoy](https://github.com/rookiebwoy)
+* Hardware supported: ProMicro, _Elite-C (not tested)_
+* Project repository: [Neopad on github](https://github.com/rookiebwoy/neopad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rookiebwoy/neopad/rev1:default
+
+Flashing example for this keyboard:
+
+    make rookiebwoy/neopad/rev1:default:flash
+
+When asked by the terminal, press the dedicated `RESET` button (the one above the 2 LEDs) to enter the bootloader and let the OS detects the device.
+
+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 [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
diff --git a/keyboards/neopad/rev1/config.h b/keyboards/rookiebwoy/neopad/rev1/config.h
similarity index 100%
rename from keyboards/neopad/rev1/config.h
rename to keyboards/rookiebwoy/neopad/rev1/config.h
diff --git a/keyboards/neopad/rev1/info.json b/keyboards/rookiebwoy/neopad/rev1/info.json
similarity index 100%
rename from keyboards/neopad/rev1/info.json
rename to keyboards/rookiebwoy/neopad/rev1/info.json
diff --git a/keyboards/neopad/rev1/keymaps/default/keymap.c b/keyboards/rookiebwoy/neopad/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/neopad/rev1/keymaps/default/keymap.c
rename to keyboards/rookiebwoy/neopad/rev1/keymaps/default/keymap.c
diff --git a/keyboards/neopad/rev1/readme.md b/keyboards/rookiebwoy/neopad/rev1/readme.md
similarity index 100%
rename from keyboards/neopad/rev1/readme.md
rename to keyboards/rookiebwoy/neopad/rev1/readme.md
diff --git a/keyboards/neopad/rev1/rev1.c b/keyboards/rookiebwoy/neopad/rev1/rev1.c
similarity index 100%
rename from keyboards/neopad/rev1/rev1.c
rename to keyboards/rookiebwoy/neopad/rev1/rev1.c
diff --git a/keyboards/neopad/rev1/rules.mk b/keyboards/rookiebwoy/neopad/rev1/rules.mk
similarity index 100%
rename from keyboards/neopad/rev1/rules.mk
rename to keyboards/rookiebwoy/neopad/rev1/rules.mk
diff --git a/keyboards/rookiebwoy/neopad/rules.mk b/keyboards/rookiebwoy/neopad/rules.mk
new file mode 100755
index 00000000000..c34c04435e3
--- /dev/null
+++ b/keyboards/rookiebwoy/neopad/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = rookiebwoy/neopad/rev1
diff --git a/keyboards/rose75/info.json b/keyboards/rose75/info.json
new file mode 100644
index 00000000000..9306cb211b6
--- /dev/null
+++ b/keyboards/rose75/info.json
@@ -0,0 +1,128 @@
+{
+    "manufacturer": "Matthijs Muller",
+    "keyboard_name": "ROSE75",
+    "maintainer": "Matthijs Muller",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP23", "GP21", "GP20", "GP19", "GP28", "GP12", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP10"],
+        "rows": ["GP27", "GP26", "GP25", "GP24", "GP18", "GP22"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 8},
+            {"matrix": [0, 1], "x": 15, "y": 15, "flags": 8}
+        ],
+        "max_brightness": 210,
+        "sleep": true
+    },
+    "url": "https://github.com/Smollchungus",
+    "usb": {
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "pid": "0x7503",
+        "vid": "0x5363"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP29"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "F9", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 11.5, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 12.5, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "Del", "matrix": [0, 14], "x": 15, "y": 0},
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "LB", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "RB", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "Pipe", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2.5},
+                {"label": "Capslock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "Quote", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3.5},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+                {"label": "Control", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Left", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/rose75/keymaps/default/keymap.c b/keyboards/rose75/keymaps/default/keymap.c
new file mode 100644
index 00000000000..043edaecbc1
--- /dev/null
+++ b/keyboards/rose75/keymaps/default/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2023 Matthijs Muller (@Smollchungus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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,  KC_END,
+        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_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_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/rose75/keymaps/via/keymap.c b/keyboards/rose75/keymaps/via/keymap.c
new file mode 100644
index 00000000000..043edaecbc1
--- /dev/null
+++ b/keyboards/rose75/keymaps/via/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2023 Matthijs Muller (@Smollchungus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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,  KC_END,
+        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_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_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/rose75/keymaps/via/rules.mk b/keyboards/rose75/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/rose75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/rose75/readme.md b/keyboards/rose75/readme.md
new file mode 100644
index 00000000000..85d4763d9b4
--- /dev/null
+++ b/keyboards/rose75/readme.md
@@ -0,0 +1,24 @@
+# rose75
+
+![rose75](https://i.imgur.com/f64Ttib.png)
+
+* Keyboard Maintainer: [Matthijs Muller](https://github.com/Smollchungus)
+* Hardware Supported: Rose75 Keyboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rose75:default
+
+Flashing example for this keyboard:
+
+    make rose75: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 `QK_BOOT` if it is available
diff --git a/keyboards/rose75/rose75.c b/keyboards/rose75/rose75.c
new file mode 100644
index 00000000000..d84f3da1d43
--- /dev/null
+++ b/keyboards/rose75/rose75.c
@@ -0,0 +1,20 @@
+// Copyright 2023 Matthijs Muller (@Smollchungus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+         return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(0, 200, 0, 0);
+        rgb_matrix_set_color(1, 200, 0, 0);
+    } else {
+        rgb_matrix_set_color(0, 0, 0, 0);
+        rgb_matrix_set_color(1, 0, 0, 0);
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/rose75/rules.mk b/keyboards/rose75/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/rose75/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json
new file mode 100644
index 00000000000..7ed0b5bd97a
--- /dev/null
+++ b/keyboards/rot13labs/hackboard/info.json
@@ -0,0 +1,132 @@
+{
+    "keyboard_name": "HACKBOARD",
+    "manufacturer": "rot13labs",
+    "url": "https://rot13labs.com",
+    "maintainer": "c0ldbru",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0xCAFE",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4", "A5", "A6", "A7", "D6", "D5", "D1", "D0", "D7"],
+        "rows": ["C2", "C3", "C7", "C4", "C6", "C5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 6, "y": 0, "w": 0.75, "h": 0.75},
+
+                {"matrix": [0, 0], "x": 0, "y": 1},
+
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+                {"matrix": [0, 4], "x": 4, "y": 1},
+                {"matrix": [0, 5], "x": 5, "y": 1},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 1},
+                {"matrix": [0, 7], "x": 7.5, "y": 1},
+                {"matrix": [0, 8], "x": 8.5, "y": 1},
+                {"matrix": [0, 9], "x": 9.5, "y": 1},
+
+                {"matrix": [0, 11], "x": 11, "y": 1},
+                {"matrix": [0, 12], "x": 12, "y": 1},
+                {"matrix": [0, 13], "x": 13, "y": 1},
+                {"matrix": [0, 14], "x": 14, "y": 1},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 1},
+                {"matrix": [0, 16], "x": 16.25, "y": 1},
+                {"matrix": [0, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2, "y": 2.25},
+                {"matrix": [1, 3], "x": 3, "y": 2.25},
+                {"matrix": [1, 4], "x": 4, "y": 2.25},
+                {"matrix": [1, 5], "x": 5, "y": 2.25},
+                {"matrix": [1, 6], "x": 6, "y": 2.25},
+                {"matrix": [1, 7], "x": 7, "y": 2.25},
+                {"matrix": [1, 8], "x": 8, "y": 2.25},
+                {"matrix": [1, 9], "x": 9, "y": 2.25},
+                {"matrix": [1, 10], "x": 10, "y": 2.25},
+                {"matrix": [1, 11], "x": 11, "y": 2.25},
+                {"matrix": [1, 12], "x": 12, "y": 2.25},
+                {"matrix": [1, 13], "x": 13, "y": 2.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 3.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 3.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 3.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 3.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 3.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 3.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 3.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 3.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 3.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 3.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 4.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 4.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 4.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 4.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 4.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 4.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 4.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 5.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 5.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 5.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 5.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 5.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 5.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 5.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 5.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 5.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 5.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 6.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 6.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 6.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 6.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 6.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c
new file mode 100644
index 00000000000..542d541bf31
--- /dev/null
+++ b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2023 rot13labs
+ *
+ * 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_NO,
+      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_SCRL, KC_PAUS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_INS,   KC_HOME, KC_PGUP,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,  KC_DEL,   KC_END,  KC_PGDN,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
+      KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,                     KC_UP,
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                 KC_RALT, KC_RGUI, MO(1),    KC_RCTL,            KC_LEFT, KC_DOWN, KC_RIGHT),
+  
+  [1] = LAYOUT(
+                                                      KC_NO,
+      _______,          _______, _______, _______,_______,_______,_______,_______,_______, _______, _______,  _______, _______,  _______,  _______, _______,
+      _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______,  _______, _______,  _______,  _______, _______,
+      _______, _______, _______, _______, QK_BOOT,  _______,_______,_______,_______,_______, _______, _______,  _______, _______,  _______,  _______, _______,
+      _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______,  _______,
+      _______,          _______, _______, _______,_______,_______,_______,_______,_______, _______, _______,  _______,                     KC_VOLU,
+      _______, _______, _______,                          _______,                _______, _______, _______,  _______,            _______, KC_VOLD, _______)
+};
diff --git a/keyboards/rot13labs/hackboard/readme.md b/keyboards/rot13labs/hackboard/readme.md
new file mode 100644
index 00000000000..c14b742326c
--- /dev/null
+++ b/keyboards/rot13labs/hackboard/readme.md
@@ -0,0 +1,22 @@
+# HACKBOARD
+
+![hackboard](https://i.imgur.com/te8feiB.png)
+
+A TKL keyboard for hackers based on the mysterium platform by coseyfannitutti
+
+* Keyboard Maintainer: [c0ldbru](https://github.com/c0ldbru)
+* Hardware Supported: HACKBOARD // atmega32a
+* Hardware Availability: [rot13labs](https://rot13labs.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rot13labs/hackboard: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
+
+You can enter the bootloader to flash on new firmware in one of two ways:
+
+* **Bootmagic**: Hold the ESC key (top left key) and hit reset
+* **Boot button**: Hold the boot button on the top of the PCB and hit reset
\ No newline at end of file
diff --git a/keyboards/rot13labs/hackboard/rules.mk b/keyboards/rot13labs/hackboard/rules.mk
new file mode 100644
index 00000000000..c2ee0bc86f9
--- /dev/null
+++ b/keyboards/rot13labs/hackboard/rules.mk
@@ -0,0 +1,2 @@
+# Processor frequency
+F_CPU = 16000000
diff --git a/keyboards/rot13labs/rotc0n/info.json b/keyboards/rot13labs/rotc0n/info.json
new file mode 100644
index 00000000000..a9dc27a4714
--- /dev/null
+++ b/keyboards/rot13labs/rotc0n/info.json
@@ -0,0 +1,39 @@
+{
+    "manufacturer": "rot13labs",
+    "keyboard_name": "rotc0n badge",
+    "maintainer": "c0ldbru",
+    "bootloader": "usbasploader",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2"],
+        "rows": ["B1", "B0"]
+    },
+    "processor": "atmega328p",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xBEEF",
+        "vid": "0xFEED"
+    },
+    "community_layouts": ["ortho_2x3"],
+    "layouts": {
+        "LAYOUT_ortho_2x3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/rot13labs/rotc0n/keymaps/default/keymap.c b/keyboards/rot13labs/rotc0n/keymaps/default/keymap.c
new file mode 100644
index 00000000000..98de5b727dc
--- /dev/null
+++ b/keyboards/rot13labs/rotc0n/keymaps/default/keymap.c
@@ -0,0 +1,18 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┐
+     * │ R │ O │ T │
+     * ├───┼───┼───┤
+     * │ C │ 0 │ N │
+     * └───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_2x3(
+        KC_R, KC_O, KC_T,
+        KC_C, KC_0, KC_N
+    )
+};
diff --git a/keyboards/rot13labs/rotc0n/readme.md b/keyboards/rot13labs/rotc0n/readme.md
new file mode 100644
index 00000000000..895d3b02571
--- /dev/null
+++ b/keyboards/rot13labs/rotc0n/readme.md
@@ -0,0 +1,22 @@
+# rotcon
+
+![rotcon](https://i.imgur.com/InAAdPph.jpg)
+
+rotcon 0 badge - 6 key macropad
+
+* Keyboard Maintainer: [c0ldbru](https://github.com/c0ldbru)
+* Hardware Supported: rotcon badge // atmega328p
+* Hardware Availability: https://goimagine.com/rotcon-0-badge/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rot13labs/rotc0n: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
+
+You can enter the bootloader to flash on new firmware in one of two ways:
+
+* **Bootmagic**: Hold the "R" key (top left key) and hit reset
+* **boot button**: Hold the boot button on the top of the PCB and hit reset
diff --git a/keyboards/rot13labs/rotc0n/rules.mk b/keyboards/rot13labs/rotc0n/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/rot13labs/rotc0n/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/rura66/rev1/oled_display.c b/keyboards/rura66/rev1/oled_display.c
index d2e3422bf9e..514fda99921 100644
--- a/keyboards/rura66/rev1/oled_display.c
+++ b/keyboards/rura66/rev1/oled_display.c
@@ -18,61 +18,59 @@
 
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
-  _QWERTY = 0,
-  _LOWER,
-  _RAISE,
-  _ADJUST
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
 };
 
 #ifdef OLED_ENABLE
 
 void render_status(void) {
+    // Render to mode icon
+    static const char os_logo[][2][3] PROGMEM = {{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}};
+    if (is_mac_mode()) {
+        oled_write_P(os_logo[0][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[0][1], false);
+    } else {
+        oled_write_P(os_logo[1][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[1][1], false);
+    }
 
-  // Render to mode icon
-  static const char os_logo[][2][3] PROGMEM  ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-  if (is_mac_mode()) {
-    oled_write_P(os_logo[0][0], false);
-    oled_write_P(PSTR("\n"), false);
-    oled_write_P(os_logo[0][1], false);
-  }else{
-    oled_write_P(os_logo[1][0], false);
-    oled_write_P(PSTR("\n"), false);
-    oled_write_P(os_logo[1][1], false);
-  }
-
-  oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR(" "), false);
 
-  // Host Keyboard Layer Status
-  oled_write_P(PSTR("Layer: "), false);
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
 
-  switch (get_highest_layer(layer_state)) {
-      case _QWERTY:
-          oled_write_P(PSTR("Default\n"), false);
-          break;
-      case _RAISE:
-          oled_write_P(PSTR("Raise\n"), false);
-          break;
-      case _LOWER:
-          oled_write_P(PSTR("Lower\n"), false);
-          break;
-      case _ADJUST:
-          oled_write_P(PSTR("Adjust\n"), false);
-          break;
-      default:
-          // Or use the write_ln shortcut over adding '\n' to the end of your string
-          oled_write_ln_P(PSTR("Undefined"), false);
-  }
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case _RAISE:
+            oled_write_P(PSTR("Raise\n"), false);
+            break;
+        case _LOWER:
+            oled_write_P(PSTR("Lower\n"), false);
+            break;
+        case _ADJUST:
+            oled_write_P(PSTR("Adjust\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
 
-  oled_write_P(PSTR("\n"), false);
+    oled_write_P(PSTR("\n"), false);
 
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-  oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
-  oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
 }
 
-
 static void render_logo(void) {
     static const char PROGMEM qmk_logo[] = {
         0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
@@ -84,35 +82,38 @@ static void render_logo(void) {
 }
 
 static void render_rgbled_status(bool full) {
-#ifdef RGBLIGHT_ENABLE
-  if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
-    if (full) {
-      // " LED %d:%d,%d,%d"
-      oled_write_P(PSTR(" LED"), false);
-      oled_write(get_u8_str(rgblight_get_mode(), ' '), false);
-      oled_write_char(':', false);
-      oled_write(get_u8_str(rgblight_get_hue()/RGBLIGHT_HUE_STEP, ' '), false);
-      oled_write_char(',', false);
-      oled_write(get_u8_str(rgblight_get_sat()/RGBLIGHT_SAT_STEP, ' '), false);
-      oled_write_char(',', false);
-      oled_write(get_u8_str(rgblight_get_val()/RGBLIGHT_VAL_STEP, ' '), false);
-    } else {
-      // "[%2d] "
-      oled_write_char('[', false);
-      oled_write(get_u8_str(rgblight_get_mode(), ' '), false);
-      oled_write_char(']', false);
+#    ifdef RGBLIGHT_ENABLE
+    if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
+        if (full) {
+            // " LED %d:%d,%d,%d"
+            oled_write_P(PSTR(" LED"), false);
+            oled_write(get_u8_str(rgblight_get_mode(), ' '), false);
+            oled_write_char(':', false);
+            oled_write(get_u8_str(rgblight_get_hue() / RGBLIGHT_HUE_STEP, ' '), false);
+            oled_write_char(',', false);
+            oled_write(get_u8_str(rgblight_get_sat() / RGBLIGHT_SAT_STEP, ' '), false);
+            oled_write_char(',', false);
+            oled_write(get_u8_str(rgblight_get_val() / RGBLIGHT_VAL_STEP, ' '), false);
+        } else {
+            // "[%2d] "
+            oled_write_char('[', false);
+            oled_write(get_u8_str(rgblight_get_mode(), ' '), false);
+            oled_write_char(']', false);
+        }
     }
-  }
-#endif
+#    endif
 }
 
-bool oled_task_user(void) {
-  if(is_keyboard_master()){
-    render_status();
-  }else{
-    render_logo();
-    render_rgbled_status(true);
-  }
-  return false;
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (is_keyboard_master()) {
+        render_status();
+    } else {
+        render_logo();
+        render_rgbled_status(true);
+    }
+    return true;
 }
 #endif
diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h
index 1ec96ddfdfb..9f01b96248d 100644
--- a/keyboards/ryanskidmore/rskeys100/config.h
+++ b/keyboards/ryanskidmore/rskeys100/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-
 /* Key Matrix Sizes */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 24
@@ -29,14 +28,6 @@
 
 /* The number of RGB LEDs connected */
 #define RGB_MATRIX_LED_COUNT 105
-/* Set the maximum brightness to 110 to avoid going over 500 mA.
- * At full brightness with all three indicator LEDs on, the power draw is about 450 mA. */
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 110
-/* Enable framebuffer effects */
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-/* Enable the cycle left right animation and set it as the startup mode */
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json
index 1e7bf808289..dfd6ce5c24c 100644
--- a/keyboards/ryanskidmore/rskeys100/info.json
+++ b/keyboards/ryanskidmore/rskeys100/info.json
@@ -11,7 +11,11 @@
         "pin": "C7"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "cycle_left_right": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 110
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/s_ol/0xc_pad/config.h b/keyboards/s_ol/0xc_pad/config.h
deleted file mode 100644
index 865ab45d31f..00000000000
--- a/keyboards/s_ol/0xc_pad/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 s-ol
- *
- * 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
-
-
-/* ws2812 RGB LED */
-#define RGB_MATRIX_LED_COUNT 12
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_MATRIX_CENTER \
-    { 112, 63 }
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER
-
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_SAT
-#define ENABLE_RGB_MATRIX_BAND_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_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_HUE_WAVE
-
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SPLASH
diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json
index 98092302609..a4809b9c7cf 100644
--- a/keyboards/s_ol/0xc_pad/info.json
+++ b/keyboards/s_ol/0xc_pad/info.json
@@ -10,6 +10,26 @@
         "pin": "C7"
     },
     "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_spiral": true,
+            "hue_breathing": true,
+            "hue_wave": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "typing_heatmap": true,
+            "solid_reactive": true,
+            "splash": true
+        },
+        "center_point": [112, 63],
         "driver": "ws2812"
     },
     "layouts": {
diff --git a/keyboards/s_ol/0xc_pad/keymaps/superfell/keymap.c b/keyboards/s_ol/0xc_pad/keymaps/superfell/keymap.c
deleted file mode 100644
index ff626b92364..00000000000
--- a/keyboards/s_ol/0xc_pad/keymaps/superfell/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2022 Simon Fell
- *
- * 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 custom_layers {
-    _NUMPAD,
-    _CONTROL,
-    _ADJUST,
-};
-
-#define RGBLIGHT_TIMEOUT 30000 // 30 seconds
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_NUMPAD] = LAYOUT(
-           TO(_CONTROL), KC_DOT,
-             KC_7 , KC_8, KC_9,
-           KC_4, KC_5, KC_6, KC_0,
-            KC_1  , KC_2 , KC_3
-    ),
-    [_CONTROL] = LAYOUT(
-                   TO(_ADJUST), _______,
-              LGUI(KC_X), LGUI(KC_C), LGUI(KC_V),
-        LGUI(KC_Q), LGUI(KC_W), LGUI(KC_N), LGUI(KC_S),
-            KC_VOLD  , KC_MUTE , KC_VOLU
-    ),
-    [_ADJUST] = LAYOUT(
-                TO(_NUMPAD), QK_BOOT,
-               XXXXXXX, XXXXXXX, XXXXXXX,
-           RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX,
-              RGB_TOG, RGB_VAD, RGB_VAI
-    ),
-};
-// clang-format on
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _NUMPAD:
-            rgblight_sethsv_noeeprom(170, 255, 128);
-            rgblight_mode_noeeprom(2);
-            break;
-        case _CONTROL:
-            rgblight_mode_noeeprom(3);
-            break;
-        case _ADJUST:
-            rgblight_mode_noeeprom(4);
-            break;
-    }
-    return state;
-}
-// turn rgb off after some amount of inactivity
-
-static uint16_t key_timer;              // timer to track the last keyboard activity
-static bool     is_rgb_timeout = false; // store if RGB has timed out or not in a boolean
-
-/* Runs at the end of each scan loop, check if RGB timeout has occurred */
-void housekeeping_task_user(void) {
-    if (!is_rgb_timeout && timer_elapsed(key_timer) > RGBLIGHT_TIMEOUT) {
-        rgblight_disable_noeeprom();
-        is_rgb_timeout = true;
-    }
-}
-
-/* Runs after each key press, check if activity occurred */
-void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        key_timer = timer_read(); // store time of last refresh
-        if (is_rgb_timeout) {     // only do something if rgb has timed out
-            is_rgb_timeout = false;
-            rgblight_enable_noeeprom();
-        }
-    }
-}
diff --git a/keyboards/s_ol/0xc_pad/keymaps/superfell/readme.md b/keyboards/s_ol/0xc_pad/keymaps/superfell/readme.md
deleted file mode 100644
index 85325649a65..00000000000
--- a/keyboards/s_ol/0xc_pad/keymaps/superfell/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# 0xC.pad Layout
-
-​
-This is a 3 layer layout comprising of numpad, a number of osx shortcuts and an adjust layer
-that can put it into boot mode.
-The top left key cycles between the layers.
-The layers all have unique rgb animations so you can easily tell which layer is active.
diff --git a/keyboards/saevus/cor_tkl/config.h b/keyboards/saevus/cor_tkl/config.h
deleted file mode 100644
index 7fedf4dce12..00000000000
--- a/keyboards/saevus/cor_tkl/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 Ramon Imbao
-
-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
-
-
-/* RGB Matrix setup */
-#define RGB_MATRIX_LED_COUNT 2
-#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h
deleted file mode 100644
index 09bf50b6ab1..00000000000
--- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
-//#define MASTER_RIGHT
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
deleted file mode 100644
index 58f6fb408ac..00000000000
--- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// 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,
-  _FLOCK,
-  _FN,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-enum tapdances{
-  TD_ESFL = 0,
-  TD_ESQW,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS,  JP_EQL, JP_BSLS, JP_ZKHK,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-       KC_TAB,    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_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT, MO(_FN),
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-         JP_ZKHK,LGUI_T(JP_MHEN),LT(_LOWER,KC_ENT), KC_BSPC,     KC_DEL, LT(_RAISE,KC_SPC),ALT_T(JP_HENK), KC_APP 
-          //`---------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_FLOCK] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-  TD(TD_ESQW),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______,              _______, _______,          _______, _______ 
-          //`---------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_FN] = 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_DEL,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, KC_PSCR, KC_SCRL,KC_PAUSE,   KC_UP, _______, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, KC_HOME, KC_PGUP, KC_LEFT,KC_RIGHT, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______,  KC_END, KC_PGDN, KC_DOWN, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______,              _______, _______,          KC_STOP, _______ 
-          //`---------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_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_INS,  KC_DEL,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,       KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH, _______, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,     XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,       KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______,MO(_LOWER), _______,            _______, MO(_RAISE),        JP_DOT, _______ 
-          //`---------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_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_INS,  KC_DEL,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, _______, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______,              _______, _______,          _______, _______ 
-          //`---------------------------------------------|   |--------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT( /* Base */
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_TOG, RGB_MOD, XXXXXXX, LCA(KC_DEL), LALT(KC_PSCR),KC_PSCR, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-               XXXXXXX, XXXXXXX, _______,   QK_BOOT,              QK_BOOT, _______,          KC_STOP, 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, _RAISE, _LOWER, _ADJUST);
-#ifdef RGBLIGHT_ENABLE
-    switch (get_highest_layer(state)) {
-    case _FLOCK:
-      rgblight_sethsv_at(HSV_YELLOW, 0);
-      break;
-    case _FN:
-      rgblight_sethsv_at(HSV_GREEN, 0);
-      break;
-    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, 11);
-#endif
-return state;
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  bool result = false;
-  switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h
deleted file mode 100644
index 8a42af5127b..00000000000
--- a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
deleted file mode 100644
index 22d9a683b1e..00000000000
--- a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-Copyright 2020 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_japanese.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,
-  _MOUSE,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-enum tapdances{
-  TD_ESMS = 0,
-  TD_ESAR,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESMS] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _MOUSE),
-  [TD_ESAR] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-  TD(TD_ESMS),   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_DEL,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS,  JP_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, JP_LBRC, JP_RBRC, JP_BSLS, KC_PGUP,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_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,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_ZKHK, KC_LGUI,ALT_T(JP_MHEN),LT(_LOWER,KC_ENT),KC_BSPC, KC_DEL,LT(_RAISE,KC_SPC),   ALT_T(JP_HENK),  KC_APP, KC_LEFT, KC_DOWN,KC_RIGHT
-  //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_MOUSE] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-  TD(TD_ESAR), _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, LCTL(KC_W),
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______,          _______, LCTL(LSFT(KC_T)),
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______,          KC_BTN1, KC_MS_U, KC_BTN2,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,          _______, _______,     _______, _______,          _______, _______,          KC_MS_L, KC_MS_D, KC_MS_R
-  //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-       KC_ESC, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,       KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH, _______, _______, KC_HOME,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LCTL_T(JP_QUOT),JP_HASH,JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,     XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL,          _______,  KC_END,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-SFT_T(JP_CIRC),JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,       KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS,          _______,   KC_UP, KC_PGUP,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,       MO(_LOWER), _______,     _______,MO(_RAISE),        _______, _______,          KC_LEFT, KC_DOWN,KC_RIGHT
-  //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, _______, _______, KC_HOME,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX,          _______,  KC_END,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN,          _______,   KC_UP, KC_PGUP,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,          _______, _______,     _______, _______,          _______, _______,          KC_LEFT, KC_DOWN,KC_RIGHT
-  //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT( /* Base */
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD,          RGB_SAI, 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) {
-    return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-#ifdef RGBLIGHT_ENABLE
-        case RGB_RST:
-            if (record->event.pressed) {
-                uint8_t mode = rgblight_get_mode();
-                eeconfig_update_rgblight_default();
-                rgblight_enable();
-                rgblight_mode(mode);
-             }
-             break;
-#endif
-    }
-    return true;
-}
diff --git a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/rules.mk
deleted file mode 100644
index 0bcbf86d5e4..00000000000
--- a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h
deleted file mode 100644
index 8a42af5127b..00000000000
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
deleted file mode 100644
index b0ceb7cf37c..00000000000
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-Copyright 2020 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_japanese.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,
-};
-
-enum tapdances{
-  TD_ENT = 0,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_ENT),
-};
-
-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_EQL,  KC_END, KC_HOME, KC_PSCR,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-       KC_TAB,    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_DEL,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,TD(TD_ENT),TD(TD_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, JP_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_ZKHK, KC_LGUI, JP_MHEN,LT(_LOWER,KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE,KC_SPC),JP_HENK,KC_LALT,KC_APP,           KC_LEFT, KC_DOWN,KC_RIGHT
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_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, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_DQUO, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,       KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,     XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
- _______,JP_CIRC,JP_PERC,JP_AMPR,JP_SCLN, JP_COLN, JP_PIPE,       KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS, _______,          _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,MO(_LOWER), _______,          _______,MO(_RAISE),  JP_DOT, _______, _______,          _______, _______, _______ 
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_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_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-_______,SFT_T(KC_F12),KC_F6,KC_F7, KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______,          _______, _______, _______ 
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-};
diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h
deleted file mode 100644
index 0e221d844d5..00000000000
--- a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
deleted file mode 100644
index bb8a503d57c..00000000000
--- a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-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_japanese.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(
-  //,--------------------------------------------------------------|     |--------------------------------------------------------------.
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,          KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,          KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
-  //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,          KC_G,    KC_H,    KC_J,    KC_K,    KC_L, JP_MINS,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,          KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS,
-  //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
-LALT_T(JP_ZKHK),KC_LGUI,  KC_UP, JP_MHEN,LT(_LOWER,KC_ENT),KC_BSPC,KC_DEL,KC_BSPC,KC_DEL,LT(_RAISE,KC_SPC),JP_HENK,KC_UP,KC_RSFT, KC_APP,
-  //|--------+--------+--------+--------+--------+--------+--------|     |--------+--------+--------+--------+--------+--------+--------|
-               KC_LEFT, KC_DOWN, KC_RGHT,                                                             KC_LEFT, KC_DOWN, KC_RGHT    
-  //|--------------------------------------------------------------|     |--------------------------------------------------------------'
-  ),
-
-  [_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_PSCR,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-      JP_DQUO, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD, _______,     _______,   KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT, _______,     _______, XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, _______,     _______,   KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______,MO(_LOWER),_______,_______,     _______, _______,MO(_RAISE),JP_DOT, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______,                                                           _______, _______, _______    
-  //|--------------------------------------------------------------|   |--------------------------------------------------------------'
-  ),
-
-  [_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_PSCR,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,     XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5, _______,     XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, _______,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, KC_VOLU, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
-               KC_MPRV, KC_VOLD, KC_MNXT,                                                           _______, _______, _______    
-  //|--------------------------------------------------------------|   |--------------------------------------------------------------'
-  ),
-
-  [_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, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,
-  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
-  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,   QK_BOOT, XXXXXXX,     XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+-----------------|   |--------+--------+--------+--------+--------+--------+--------|
-               XXXXXXX, XXXXXXX, XXXXXXX,                                                           XXXXXXX, XXXXXXX, XXXXXXX    
-  //|--------------------------------------------------------------|   |--------------------------------------------------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-return state;
-}
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h
deleted file mode 100644
index 8a42af5127b..00000000000
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
deleted file mode 100644
index 093ae4650ab..00000000000
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-Copyright 2020 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_japanese.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,
-  _MOUSE,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-enum tapdances{
-  TD_ESMS = 0,
-  TD_ESAR,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESMS] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _MOUSE),
-  [TD_ESAR] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-  TD(TD_ESMS),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_PSCR,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_ZKHK,    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_DEL,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-       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_ENT, KC_HOME,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_QUOT, JP_RBRC,           KC_END,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, JP_BSLS, KC_PGDN,   KC_UP, KC_PGUP,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_ZKHK, KC_LGUI, KC_LALT,JP_MHEN,LT(_LOWER,KC_ENT),KC_BSPC,KC_DEL,LT(_RAISE,KC_SPC),JP_HENK, JP_KANA,  KC_APP, KC_LEFT, KC_DOWN,KC_RIGHT
-  //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_MOUSE] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-  TD(TD_ESAR), _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, LCTL(KC_W),
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,          LCTL(LSFT(KC_T)),
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______,          KC_MS_L, KC_MS_D, KC_MS_R
-  //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-       KC_ESC, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,       KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH, _______, _______, KC_HOME,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LCTL_T(JP_QUOT),JP_HASH,JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,     XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL, _______,           KC_END,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-SFT_T(JP_CIRC),JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,       KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS, _______, KC_PGDN,   KC_UP, KC_PGUP,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, MO(_LOWER), _______,  _______,MO(_RAISE),_______,_______, _______,          KC_LEFT, KC_DOWN,KC_RIGHT
-  //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, _______, _______, KC_HOME,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______,           KC_END,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, KC_PGDN,   KC_UP, KC_PGUP,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______,          KC_LEFT, KC_DOWN,KC_RIGHT
-  //`-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT( /* Base */
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, 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) {
-    return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_RST:
-          if (record->event.pressed) {
-              uint8_t mode = rgblight_get_mode();
-              eeconfig_update_rgblight_default();
-              rgblight_enable();
-              rgblight_mode(mode);
-          }
-          break;
-    #endif
-    }
-    return true;
-}
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/rules.mk
deleted file mode 100644
index 8db2280906d..00000000000
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
index 12d57843740..f2a365a52e6 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
@@ -25,11 +25,11 @@
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 180
 
-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
+#ifdef RGBLIGHT_LED_COUNT
+  #undef RGBLIGHT_LED_COUNT
 #endif
 
-#define RGBLED_NUM 55    // Number of LEDs
+#define RGBLIGHT_LED_COUNT 55    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 7 }
 
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
index 392f2f97e8c..d0f71f4f9f7 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
@@ -25,10 +25,10 @@
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 180
 
-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
+#ifdef RGBLIGHT_LED_COUNT
+  #undef RGBLIGHT_LED_COUNT
 #endif
 
-#define RGBLED_NUM 69    // Number of LEDs
+#define RGBLIGHT_LED_COUNT 69    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 21 }
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
deleted file mode 100644
index b8a6b843ceb..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
-
-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
-#endif
-
-#define RGB_MATRIX_LED_COUNT 48
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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_LIMIT_VAL 50
-#    define RGB_MATRIX_VAL_STEP 5
-#    define RGB_MATRIX_SPD_STEP 10
-#endif
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
deleted file mode 100644
index e2a9f9ac4db..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,117 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-extern keymap_config_t keymap_config;
-
-//#ifdef RGB_MATRIX_ENABLE
-//Following line allows macro to read current RGB settings
-//extern rgblight_config_t rgblight_config;
-
-//#endif
-
-extern uint8_t is_master;
-
-// 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,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-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, JP_LBRC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-
-  [_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,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_HASH, JP_DQUO, 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_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, JP_ZKHK,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,  KC_DEL,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, JP_MHEN, _______, _______, _______, _______, JP_HENK, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT( /* Base */
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  bool result = false;
-  switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
-
-void matrix_init_user(void) {
-
-}
-
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/readme.md
deleted file mode 100644
index 6563bb46ff5..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/readme.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# The salicylic keymap for naked48
-
-## Default
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|  TAB |     Q|     W|     E|     R|     T|      |      |     Y|     U|     I|     O|     P|     [|
-|LCTRL |     A|     S|     D|     F|     G|      |      |     H|     J|     K|     L|     -|     ]|
-| LSFT |     Z|     X|     C|     V|     B|      |      |     N|     M|     ,|     .|     /|     \|
-|      |  LEFT| RIGHT|  LGUI|  MHEN|LOWER, ENT|BSPC|DEL|RAISE,SPC|HENK|  LALT|  DOWN|    UP|      |
-
-
-## Lower
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|   ESC|     !|     ?|     [|     ]|     ~|      |      |     6|     7|     8|     9|     *|     /|
-|     '|     #|     "|     (|     )|     @|      |      | XXXXX|     4|     5|     6|     -|     =|
-|     ^|     %|     &|     ;|     :|  PIPE|      |      |     0|     1|     2|     3|     +|   ENT|
-|      |  LEFT| RIGHT|  LGUI|  ZKHK| LOWER|  BSPC|   DEL| RAISE|  HENK|  LALT|  DOWN|    UP|      |
-
-
-## Raise
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|   ESC|     1|     2|     3|     4|     5|      |      |     6| XXXXX|    UP| XXXXX|  PGUP|   DEL|
-|F11,LCTRL| F1|    F2|    F3|    F4|    F5|      |      | XXXXX|  LEFT|  DOWN| RIGHT|  LSFT|   ENT|
-|F12,LSFT|  F6|    F7|    F8|    F9|   F10|      |      | XXXXX| XXXXX| XXXXX| XXXXX|  PGDN| XXXXX|
-|      |  LEFT| RIGHT|  LGUI|  MHEN| LOWER|  BSPC|   DEL| RAISE|  HENK|  LALT|  DOWN|    UP|      |
-
-
-## Adjust
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |    9   |    10  |   11   |   12   |    13   |    14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:------:|:------:|:------:|:------:|:-------:|:------:|
-|   ESC| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_RST|   XXXXX|   XXXXX|   XXXXX|    XXXXX|   XXXXX|
-| LCTRL| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_TOG| RGB_MOD|   XXXXX|   C+A+D| Alt+PSCR|    PSCR|
-|  LSFT| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_VAD| RGB_VAI| RGB_HUD| RGB_HUI|  RGB_SAD| RGB_SAI|
-|      |  LEFT| RIGHT|  LGUI|  MHEN| LOWER|  BSPC|   DEL|   RAISE|    HENK|    LALT|    DOWN|       UP|        |
-
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/rules.mk
deleted file mode 100644
index bdf3488cc1b..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = yes
-
-SPLIT_KEYBOARD = no
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h
deleted file mode 100644
index 12d57843740..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* 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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
-
-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
-#endif
-
-#define RGBLED_NUM 55    // Number of LEDs
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 48, 7 }
-
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
deleted file mode 100644
index e4653b03e1f..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
+++ /dev/null
@@ -1,139 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// 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,
-  _MOUSE,
-  _BROWSER,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,              TG(_MOUSE),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_LEFT, KC_DOWN,KC_RIGHT,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_MOUSE] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,              TG(_MOUSE),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,        KC_BTN1, KC_MS_U, KC_BTN2,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_MS_L, KC_MS_D, KC_MS_R,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_BROWSER] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,              LCTL(KC_W),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LCTL(LSFT(KC_T)),KC_WH_U,TG(_BROWSER),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,              TG(_MOUSE),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,                   XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,        KC_LEFT, KC_DOWN,KC_RIGHT,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,              TG(_MOUSE),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,        KC_LEFT, KC_DOWN,KC_RIGHT,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               _______, _______, _______, JP_MHEN, _______, _______, _______, _______, JP_HENK, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_with_nafuda( /* Base */
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                 RGB_VAD,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,        RGB_MOD, RGB_TOG, RGB_SAI,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  bool result = false;
-  switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
-
-void matrix_init_user(void) {
-
-}
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/readme.md
deleted file mode 100644
index 15e34e188c7..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# The salicylic_with_nafuda keymap for naked48
-
-Add Nafuda maps to the salicylic layout.
-
-## Default
-|  1   |  2   |  3   |
-|:----:|:----:|:----:|
-|      | MOUSE|      |
-| BS+Ad|    UP|Browser|
-|  LEFT|  DOWN| RIGHT|
-
-## Mouse
-|  1   |  2   |  3   |
-|:----:|:----:|:----:|
-|      |Default|     |
-|  BTN1|  MS_U|  BTN2|
-|  MS_L|  MS_D|  MS_R|
-
-## Browser
-|  1   |  2   |  3   |
-|:----:|:----:|:----:|
-|      |CloseTAB|    |
-|ReOpenTAB|WH_U|Default|
-|  LTAB|  WH_D|  RTAB|
-
-## Adjust
-|  1   |  2   |  3   |
-|:----:|:----:|:----:|
-|      |LED_VAD|      |
-|Default|LED_HUD|LED_VAI|
-|LED_MOD|LED_ON/Off|LED_HUI|
-
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/rules.mk
deleted file mode 100644
index f76b955efde..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes        # Mouse keys(+4700)
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h
deleted file mode 100644
index 392f2f97e8c..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
-
-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
-#endif
-
-#define RGBLED_NUM 69    // Number of LEDs
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 48, 21 }
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
deleted file mode 100644
index b1ff76d0178..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
+++ /dev/null
@@ -1,143 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// 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,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE,
-  SEND_SUM,
-  SEND_AVE,
-  SEND_CIF,
-  SEND_MAX,
-  SEND_MIN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_with_setta21(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NUM,  KC_ESC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, JP_EQL,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),JP_HENK, KC_LALT, KC_DOWN,   KC_UP,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
-          //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
-  ),
-
-  [_LOWER] = LAYOUT_with_setta21(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,    MO(_LOWER),XXXXXXX,KC_LEFT,XXXXXXX,XXXXXXX, KC_ESC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,                   XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL,               KC_DOWN,KC_DOWN,  KC_UP,KC_PSLS,  KC_F2,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,    MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, JP_EQL,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______,                        KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
-          //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
-  ),
-
-  [_RAISE] = LAYOUT_with_setta21(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,  KC_DEL,       _______, KC_F11,  KC_F4,  KC_F7,SEND_MIN, KC_ESC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,                KC_F12,  KC_F5,  KC_F8,SEND_MAX,  KC_F2,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,       _______,  KC_F3,  KC_F6,  KC_F9,SEND_CIF, JP_EQL,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, JP_MHEN, _______, _______, _______, _______, JP_HENK, _______, _______, _______,                        JP_RPRN,       SEND_SUM,SEND_AVE, KC_DEL
-          //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
-  ),
-
-  [_ADJUST] = LAYOUT_with_setta21( /* Base */
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,        RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,       _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______,                        RGB_MOD,        RGB_TOG,_______,_______
-          //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  bool result = false;
-  switch (keycode) {
-    case SEND_SUM:
-      if (record->event.pressed) {
-        SEND_STRING("_SUM*");
-      }
-      break;
-    case SEND_AVE:
-      if (record->event.pressed) {
-        SEND_STRING("_AVERAGE*");
-      }
-      break;
-    case SEND_CIF:
-      if (record->event.pressed) {
-        SEND_STRING("_COUNTIF*");
-      }
-      break;
-    case SEND_MAX:
-      if (record->event.pressed) {
-        SEND_STRING("_MAX*");
-      }
-      break;
-    case SEND_MIN:
-      if (record->event.pressed) {
-        SEND_STRING("_MIN*");
-      }
-      break;
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
-
-void matrix_init_user(void) {
-
-}
-
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/readme.md
deleted file mode 100644
index 2c76bc29074..00000000000
--- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/readme.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# The salicylic_with_setta21 keymap for naked48
-
-Add Setta21 maps to the salicylic layout.
-
-## Default
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-|   Num|     /|     *|     -|
-|     7|     8|     9|      |
-|     4|     5|     6|     +|
-|     1|     2|     3|      |
-| Rai+0|      | LOW + .|   ENT|
-
-## Lower
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| =MIN(| =MAX(|=COUNTIF(|=AVERAGE(|
-|    F7|    F8|    F9|      |
-|    F4|    F5|    F6| =SUM(|
-|   F11|   F12|    F3|      |
-| RAISE|      | LOWER|     )|
-
-## Raise
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| XXXXX|     /|     *|     -|
-| XXXXX|    UP| XXXXX|      |
-|  LEFT|  DOWN| RIGHT|     +|
-| XXXXX|  DOWN| XXXXX|      |
-| RAISE|      | LOWER|   ENT|
-
-## Adjust
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| XXXXX| XXXXX| XXXXX|     -|
-|LED_SAD|LED_SAI| XXXXX|      |
-|LED_HUD|LED_HUI| XXXXX|     +|
-|LED_VAD|LED_VAI| XXXXX|      |
-|LED_ON/Off|      | XXXXX|LED_MOD|
-
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
index 21494a0dfd2..a967ffd3c13 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
@@ -21,8 +21,8 @@
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 180
 
-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
+#ifdef RGBLIGHT_LED_COUNT
+  #undef RGBLIGHT_LED_COUNT
 #endif
 
 #define RGB_MATRIX_LED_COUNT 48
@@ -31,7 +31,7 @@
   #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 //  #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 //  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
-  #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+  #define RGB_MATRIX_SLEEP // turn off effects when suspended
   #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
index 84dbacba549..2f62289261b 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/config.h
@@ -21,5 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLIGHT_DEFAULT_VAL 50
diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index a2d7b0c8497..f0aa33b9625 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -39,6 +39,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 50
         }
     },
     "ws2812": {
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h
deleted file mode 100644
index c2844a6775b..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
deleted file mode 100644
index 85030c1402b..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-extern keymap_config_t keymap_config;
-
-extern uint8_t is_master;
-
-// 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,
-  _FLOCK,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum tapdances{
-  TD_ESFL = 0,
-  TD_ESQW,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN, LT(_LOWER,KC_ENT),KC_BSPC,  KC_DEL,LT(_RAISE,KC_SPC), JP_HENK, KC_LALT, KC_DOWN,   KC_UP
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-
-  [_FLOCK] = LAYOUT(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-  TD(TD_ESQW),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-
-  [_LOWER] = LAYOUT(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      JP_COLN, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_HASH, JP_DQUO, 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_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE),JP_DOT, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,  KC_DEL,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT( /* Base */
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-void matrix_init_user(void) {
-
-}
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/readme.md
deleted file mode 100644
index 2901dbf7fab..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/readme.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# The salicylic keymap for naked60
-
-## Default
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| ESC(FLock) |  1|  2|     3|     4|     5|      |      |     6|     7|     8|     9|     0|  BSPC|
-|  TAB |     Q|     W|     E|     R|     T|      |      |     Y|     U|     I|     O|     P|     [|
-|LCTRL |     A|     S|     D|     F|     G|      |      |     H|     J|     K|     L|     -|     ]|
-| LSFT |     Z|     X|     C|     V|     B|      |      |     N|     M|     ,|     .|     /|     \|
-|      |  LEFT| RIGHT|  LGUI|  MHEN|LOWER, ENT|BSPC|DEL|RAISE,SPC|HENK|  LALT|  DOWN|    UP|      |
-
-
-## FLock
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|  ESC(FLock)| F2| F3|    F4|    F5|    F6|      |      |    F7|    F8|    F9|   F10|   F11|  BSPC|
-|  TAB |     Q|     W|     E|     R|     T|      |      |     Y|     U|     I|     O|     P|     [|
-|LCTRL |     A|     S|     D|     F|     G|      |      |     H|     J|     K|     L|     -|     ]|
-| LSFT |     Z|     X|     C|     V|     B|      |      |     N|     M|     ,|     .|     /|     \|
-|      |  LEFT| RIGHT|  LGUI|  MHEN|LOWER, ENT|BSPC|DEL|RAISE,SPC|HENK|  LALT|  DOWN|    UP|      |
-
-
-## Lower
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|   ESC|    F2|    F3|    F4|    F5|    F6|      |      |    F7|    F8|    F9|   F10|   F11|   F12|
-|     :|     !|     ?|     [|     ]|     ~|      |      |     6|     7|     8|     9|     *|     /|
-|     '|     #|     "|     (|     )|     @|      |      | XXXXX|     4|     5|     6|     -|     =|
-|     ^|     %|     &|     ;|     :|  PIPE|      |      |     0|     1|     2|     3|     +|   ENT|
-|      |  LEFT| RIGHT|  LGUI|  ZKHK| LOWER|  BSPC|   DEL| RAISE|  HENK|  LALT|  DOWN|    UP|      |
-
-
-## Raise
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|   ESC|    F2|    F3|    F4|    F5|    F6|      |      |    F7|    F8|    F9|   F10|   F11|   F12|
-|   ESC|     1|     2|     3|     4|     5|      |      |     6| XXXXX|    UP| XXXXX|  PGUP|   DEL|
-|F11,LCTRL| F1|    F2|    F3|    F4|    F5|      |      | XXXXX|  LEFT|  DOWN| RIGHT|  LSFT|   ENT|
-|F12,LSFT|  F6|    F7|    F8|    F9|   F10|      |      | XXXXX| XXXXX| XXXXX| XXXXX|  PGDN| XXXXX|
-|      |  LEFT| RIGHT|  LGUI|  MHEN| LOWER|  BSPC|   DEL| RAISE|  HENK|  LALT|  DOWN|    UP|      |
-
-
-## Adjust
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |   9  |  10  |  11  |  12  |  13   |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:-----:|:----:|
-|   ESC|    F2|    F3|    F4|    F5|    F6|      |      |    F7|    F8|    F9|   F10|    F11|   F12|
-|   ESC| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | XXXXX|  BTN1|  MS_U|  BTN2| XXXXX|Alt+PSCR|
-| LCTRL| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | XXXXX|  MS_L|  MS_D|  MS_R| XXXXX|  PSCR|
-|  LSFT| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| C+A+D|
-|      |ADJUST| LCTRL|  LALT|  LGUI| LOWER| RESET| RESET| RAISE|  HENK|  LALT|  DOWN|    UP|      |
-
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h
deleted file mode 100644
index ed08dc121cb..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
deleted file mode 100644
index ad3a1cff2b0..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
+++ /dev/null
@@ -1,176 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// 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,
-  _FLOCK,
-  _MOUSE,
-  _BROWSER,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-enum tapdances{
-  TD_ESFL = 0,
-  TD_ESQW,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,              TG(_MOUSE),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,        KC_LEFT, KC_DOWN,KC_RIGHT,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC), JP_HENK, KC_LALT, KC_DOWN,   KC_UP
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_FLOCK] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-  TD(TD_ESQW),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,                 _______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,        _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,        _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_MOUSE] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,              TG(_MOUSE),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_U, KC_BTN2,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,        KC_MS_L, KC_MS_D, KC_MS_R,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_BROWSER] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,              LCTL(KC_W),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_T)),KC_WH_U,TG(_BROWSER),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,              TG(_MOUSE),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      JP_COLN, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,                   XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL,        KC_LEFT, KC_DOWN,KC_RIGHT,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
-      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE), JP_DOT,_______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,              TG(_MOUSE),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,  KC_DEL,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,        KC_LEFT, KC_DOWN,KC_RIGHT,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_with_nafuda( /* Base */
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,                 RGB_VAD,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),   _ADJUST, RGB_SAD, RGB_VAI,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,        RGB_MOD, RGB_TOG, RGB_SAI,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------------------------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  bool result = false;
-  switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
-
-void matrix_init_user(void) {
-
-}
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/readme.md
deleted file mode 100644
index 17b973b73a3..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/readme.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# The salicylic_with_nafuda keymap for naked60
-
-Add Nafuda maps to the salicylic layout.
-
-Default
-  //|--------------------|
-             Mouse,       
-  //|------+------+------|
-    BS + Ad,    UP,Browser,
-  //|------+------+------|
-       LEFT,  DOWN, RIGHT 
-  //|--------------------|
-
-Mouse
-  //|--------------------|
-           Default,       
-  //|------+------+------|
-       BTN1,  MS_U,  BTN2,
-  //|------+------+------|
-       MS_L,  MS_D,  MS_R 
-  //|--------------------|
-
-Browser
-  //|--------------------|
-          CloseTAB,       
-  //|------+------+------|
-  ReOpenTAB,  WH_U,Default,
-  //|------+------+------|
-       LTAB,  WH_D,  RTAB 
-  //|--------------------|
-
-Adjust
-  //|------------------------|
-               LED VAD,       
-  //|------+----------+------|
-    Default,   LED HUD,LED VAI,
-  //|------+----------+------|
-    LED MOD,LED ON/Off,LED HUI 
-  //|------------------------|
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h
deleted file mode 100644
index ed08dc121cb..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
deleted file mode 100644
index b80ef8ab4d4..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
+++ /dev/null
@@ -1,170 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-extern keymap_config_t keymap_config;
-
-extern uint8_t is_master;
-
-// 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,
-  _FLOCK,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE,
-  SEND_SUM,
-  SEND_AVE,
-  SEND_CIF,
-  SEND_MAX,
-  SEND_MIN
-};
-
-enum tapdances{
-  TD_ESFL = 0,
-  TD_ESQW,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_with_setta21(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,LT(_LOWER, KC_P0),KC_P1,  KC_P4,  KC_P7,KC_NUM,  KC_ESC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, JP_EQL,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-      KC_LEFT,KC_RIGHT, KC_LGUI, JP_MHEN, LT(_LOWER,KC_ENT),KC_BSPC,  KC_DEL,LT(_RAISE,KC_SPC), JP_HENK, KC_LALT, KC_DOWN,   KC_UP
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_FLOCK] = LAYOUT_with_setta21(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-  TD(TD_ESQW),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______,_______,_______,_______,_______,_______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,               _______,_______,_______,_______,_______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,       _______,_______,_______,_______,_______,_______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,               _______,        _______,_______,_______,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT_with_setta21(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,    MO(_LOWER),XXXXXXX,KC_LEFT,XXXXXXX,XXXXXXX, KC_ESC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      JP_COLN, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,               KC_DOWN,KC_DOWN,  KC_UP,KC_PSLS,  KC_F2,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,                   XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL,    MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, JP_EQL,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______, _______, _______, JP_ZKHK,MO(_LOWER),_______,_______,MO(_RAISE), JP_DOT,_______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_with_setta21(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |------------------------------------------------|
-       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______, KC_F11,  KC_F4,  KC_F7,SEND_MIN, KC_ESC,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+--------+-------|
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,  KC_DEL,                KC_F12,  KC_F5,  KC_F8,SEND_MAX,  KC_F2,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+--------+-------|
-LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,       _______,  KC_F3,  KC_F6,  KC_F9,SEND_CIF, JP_EQL,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+--------+-------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,               JP_RPRN,       SEND_SUM,SEND_AVE, KC_DEL,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |------------------------------------------------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_with_setta21( /* Base */
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),          RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-     KC_LCTL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,       _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),            RGB_MOD,        RGB_TOG,_______,_______,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______, _______, _______, _______, _______,   QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  bool result = false;
-  switch (keycode) {
-    case SEND_SUM:
-      if (record->event.pressed) {
-        SEND_STRING("_SUM*");
-      }
-      break;
-    case SEND_AVE:
-      if (record->event.pressed) {
-        SEND_STRING("_AVERAGE*");
-      }
-      break;
-    case SEND_CIF:
-      if (record->event.pressed) {
-        SEND_STRING("_COUNTIF*");
-      }
-      break;
-    case SEND_MAX:
-      if (record->event.pressed) {
-        SEND_STRING("_MAX*");
-      }
-      break;
-    case SEND_MIN:
-      if (record->event.pressed) {
-        SEND_STRING("_MIN*");
-      }
-      break;
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
-
-void matrix_init_user(void) {
-
-}
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/readme.md
deleted file mode 100644
index 1baa36703a4..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/readme.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# The salicylic_with_setta21 keymap for naked60
-
-Add Setta21 maps to the salicylic layout.
-
-## Default
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-|   Num|     /|     *|     -|
-|     7|     8|     9|      |
-|     4|     5|     6|     +|
-|     1|     2|     3|      |
-| Rai+0|      | LOW + .|   ENT|
-
-## Lower
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| =MIN(| =MAX(|=COUNTIF(|=AVERAGE(|
-|    F7|    F8|    F9|      |
-|    F4|    F5|    F6| =SUM(|
-|   F11|   F12|    F3|      |
-| RAISE|      | LOWER|     )|
-
-## Raise
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| XXXXX|     /|     *|     -|
-| XXXXX|    UP| XXXXX|      |
-|  LEFT|  DOWN| RIGHT|     +|
-| XXXXX|  DOWN| XXXXX|      |
-| RAISE|      | LOWER|   ENT|
-
-## Adjust
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| XXXXX| XXXXX| XXXXX|     -|
-|LED_SAD|LED_SAI| XXXXX|      |
-|LED_HUD|LED_HUI| XXXXX|     +|
-|LED_VAD|LED_VAI| XXXXX|      |
-|LED_ON/Off|      | XXXXX|LED_MOD|
-
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
index 73a3019540d..ebc2b46717c 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
@@ -25,6 +25,6 @@
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 180
 
-#define RGBLED_NUM 12    // Number of LEDs
+#define RGBLIGHT_LED_COUNT 12    // Number of LEDs
 #define RGBLIGHT_LED_MAP { 0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7 }
 
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h
deleted file mode 100644
index c2844a6775b..00000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
deleted file mode 100644
index 0ecc4d4a9cf..00000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,203 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// 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,
-  _MOUSE,
-  _BROWSER,
-  _FLOCK,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-enum tapdances{
-  TD_ESFL = 0,
-  TD_ESQW,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.
-   TG(_MOUSE),TD(TD_ESFL), KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                  KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
- TG(_BROWSER),  KC_TAB,    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_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_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH,   KC_UP, KC_RSFT,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               JP_ZKHK,  LGUI_T(JP_MHEN),LT(_LOWER,KC_ENT), KC_BSPC,                KC_DEL,LT(_RAISE,KC_SPC),ALT_T(JP_HENK),KC_LEFT,KC_DOWN,KC_RIGHT
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_MOUSE] = LAYOUT(
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.
-   TG(_MOUSE), _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_BROWSER] = LAYOUT(
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.
-      XXXXXXX, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
- TG(_BROWSER), _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, KC_PGUP,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, KC_PGDN,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______,LCTL(LSFT(KC_T)),KC_UP,LCTL(KC_W),
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______,          _______,          _______, _______,               _______,          _______, _______,LCTL(LSFT(KC_TAB)),KC_DOWN,LCTL(KC_TAB)
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_FLOCK] = LAYOUT(
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.
-      _______,TD(TD_ESQW),KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, _______, _______, _______
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_LOWER] = 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,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-      _______, JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                 KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,               XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL,  KC_ENT,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                 KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS,   KC_UP, KC_RSFT,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               JP_ZKHK,          _______,       MO(_LOWER), _______,               _______,       MO(_RAISE),  JP_DOT, KC_LEFT, KC_DOWN, KC_RIGHT
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_RAISE] = 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_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,               XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-        LCTL_T(KC_F11), XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5,               XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-         SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, _______, _______, _______
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT( /* Base */
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.
-      _______,   QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,XXXXXXX,
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|
-               _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, 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, _RAISE, _LOWER, _ADJUST);
-#ifdef RGBLIGHT_ENABLE
-    switch (get_highest_layer(state)) {
-    case _MOUSE:
-      rgblight_sethsv_at(HSV_RED, 0);
-      break;
-    case _BROWSER:
-      rgblight_sethsv_at(HSV_RED, 1);
-      break;
-    case _FLOCK:
-      rgblight_sethsv_range(HSV_YELLOW, 0, 2);
-      break;
-    case _LOWER:
-      rgblight_sethsv_range(HSV_BLUE, 0, 2);
-      break;
-    case _RAISE:
-      rgblight_sethsv_range(HSV_RED, 0, 2);
-      break;
-    case _ADJUST:
-      rgblight_sethsv_range(HSV_PURPLE, 0, 2);
-      break;
-    default: //  for any other layers, or the default layer
-      rgblight_sethsv_range( 0, 0, 0, 0, 2);
-      break;
-    }
-    rgblight_set_effect_range( 2, 6);
-#endif
-return state;
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  bool result = false;
-  switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
-
-void matrix_init_user(void) {
-
-}
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/readme.md
deleted file mode 100644
index 8b2d812ea4a..00000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/readme.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# The salicylic keymap for naked64
-
-## Default
-|  1   |     2    |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| PgUp |ESC(Flock)|     1|     2|     3|     4|     5|     6|     7|     8|     9|     0|     -|  BSPC|
-| PgDn |     Tab  |     Q|     W|     E|     R|     T|     Y|     U|     I|     O|     P|     [|     ]|
-|      |  Control |     A|     S|     D|     F|     G|     H|     J|     K|     L|     -|     \|   ENT|
-|      |   Shift  |     Z|     X|     C|     V|     B|     N|     M|     ,|     .|     /|    Up| Shift|
-|      |    ADJUST|      |  LALT|      |   SPC| LOWER| RAISE|   SPC|      |  LGUI|  Left|  Down| Right|
-
-
-
-## FLock
-|  1   |     2    |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| PgUp |ESC(Flock)|    F1|    F2|    F3|    F4|    F5|    F6|    F7|    F8|    F9|   F10|   F11|   F12|
-| PgDn |     Tab  |     Q|     W|     E|     R|     T|     Y|     U|     I|     O|     P|     [|     ]|
-|      |  Control |     A|     S|     D|     F|     G|     H|     J|     K|     L|     ;|     '|   ENT|
-|      |   Shift  |     Z|     X|     C|     V|     B|     N|     M|     ,|     .|     /|    Up| Shift|
-|      |    ADJUST|      |  LALT|      |   SPC| LOWER| RAISE|   SPC|      |  LGUI|  Left|  Down| Right|
-
-
-
-## Lower
-|  1   |     2    |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| PgUp |ESC(Flock)|    F1|    F2|    F3|    F4|    F5|    F6|    F7|    F8|    F9|   F10|   F11|   F12|
-| PgDn |     Tab  |     !|     @|     #|     $|     %|     ^|     &|     *|     (|     )|   DEL|     ]|
-|      |  Control |    F1|    F2|    F3|    F4|    F5|    F6|     _|     +|     {|     }|  PIPE|   ENT|
-|      |   Shift  |    F7|    F8|    F9|   F10|   F11|   F12| SNUHS| SNUBS|     ,|     .|  VoUp| Shift|
-|      |    ADJUST|      |  LALT|      |   SPC| LOWER| RAISE|   SPC|      |     ,|  MNxt|  VoDn|  Mply|
-
-
-
-## Raise
-|  1   |     2    |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| PgUp |     ESC  |    F1|    F2|    F3|    F4|    F5|    F6|    F7|    F8|    F9|   F10|   F11|   F12|
-| PgDn |     Tab  |     1|     2|     3|     4|     5|     6|     7|     8|     9|     0|     -|  BSPC|
-|      |  Control |    F1|    F2|    F3|    F4|    F5|    F6|     -|     =|     (|     )|     \|   ENT|
-|      |   Shift  |    F7|    F8|    F9|   F10|   F11|   F12|  NUHS|  NUBS|     .|     /|  VoUp| Shift|
-|      |    ADJUST|      |  LALT|      |   SPC| LOWER| RAISE|   SPC|      |  LGUI|  MNxt|  VoDn|  Mply|
-
-
-
-## Adjust
-|  1   |     2    |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| PgUp |     RST  |    F1|    F2|    F3|    F4|    F5|    F6|    F7|    F8|    F9|   F10|   F11|   F12|
-| PgDn |     Tab  | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|
-|      |  Control | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|  LTOG|  LMOD| XXXXX| C+A+D|Alt+PSCR|PSCR| XXXXX|
-|      |   Shift  | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|  LVAD|  LVAI|  LHUD|  LHUI|  LSAD|  LSAI| XXXXX|
-|      |    ADJUST|      |  LALT|      |   SPC| LOWER| RAISE|   SPC|      |  LGUI|  MNxt|  VoDn|  Mply|
-
-
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h
deleted file mode 100644
index ed08dc121cb..00000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
deleted file mode 100644
index 68250c44c29..00000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
+++ /dev/null
@@ -1,256 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// 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,
-  _MOUSE,
-  _BROWSER,
-  _FLOCK,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE,
-  SEND_SUM,
-  SEND_AVE,
-  SEND_CIF,
-  SEND_MAX,
-  SEND_MIN
-};
-
-enum tapdances{
-  TD_ESFL = 0,
-  TD_ESQW,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK),
-  [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY),
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define ADJUST MO(_ADJUST)
-#define LWR_ENT LT(_LOWER,KC_ENT)
-#define RSE_SPC LT(_RAISE,KC_SPC)
-#define LWR_P0 LT(_LOWER, KC_P0)
-#define RSE_DOT LT(_RAISE, KC_PDOT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_with_setta21(
-    //,--------------------------------------------------------------|             |--------------------------------------------------------------.             ,-----------------------------------.
-     TG(_MOUSE),TD(TD_ESFL), KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                  KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, KC_BSPC,              KC_ESC,   KC_F2,   KC_EQL,  KC_DEL,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-   TG(_BROWSER),  KC_TAB,    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_NUM,   KC_PSLS, KC_PAST, KC_PMNS,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                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_P7,    KC_P8,   KC_P9,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
-                 KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH,   KC_UP, KC_RSFT,              KC_P4,    KC_P5,   KC_P6,   KC_PPLS,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                 JP_ZKHK,  LGUI_T(JP_MHEN), LWR_ENT, KC_BSPC,                         KC_DEL ,RSE_SPC,   ALT_T(JP_HENK), KC_LEFT, KC_DOWN, KC_RGHT,              KC_P1,    KC_P2,   KC_P3,
-              //`---------------------------------------------------------------------------------------------------------------------------------'             |-----------------+--------|        |
-                                                                                                                                                                 LWR_P0,            RSE_DOT, KC_PENT
-              //                                                                                                                                                `-----------------------------------'
-    ),
-
-    [_MOUSE] = LAYOUT_with_setta21(
-    //,--------------------------------------------------------------|             |--------------------------------------------------------------.             ,-----------------------------------.
-     TG(_MOUSE), _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-        XXXXXXX, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
-                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2,               _______, _______, _______, _______,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                 _______,          _______,          _______, _______,               _______, _______,          _______, KC_MS_L, KC_MS_D, KC_MS_R,               _______, _______, _______,
-            //`-----------------------------------------------------------------------------------------------------------------------------------'             |-----------------+--------|        |
-                                                                                                                                                                  _______,          _______, _______
-            //                                                                                                                                                  `-----------------------------------'
-    ),
-
-    [_BROWSER] = LAYOUT_with_setta21(
-    //,--------------------------------------------------------------|             |---------------------------------------------------------------------.             ,-----------------------------------.
-        XXXXXXX, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______,      _______, _______,                 _______, _______, _______, _______,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+-------------+----------|             |--------+--------+--------+--------|
-   TG(_BROWSER), _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______,      _______, KC_PGUP,                 _______, _______, _______, _______,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+-------------+----------|             |--------+--------+--------+--------|
-                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______,      _______, KC_PGDN,                 _______, _______, _______,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+-------------+--------+----------|             |--------+--------+--------|        |
-                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, C(S(KC_T)),   KC_UP  , C(KC_W),                 _______, _______, _______, _______,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+----------|                  |--------+--------+--------+--------|
-                 _______,          _______,          _______, _______,               _______, _______,          _______, C(S(KC_TAB)), KC_DOWN, C(KC_TAB),               _______, _______, _______,
-            //`-----------------------------------------------------------------------------------------------------------------------------------'                    |-----------------+--------|        |
-                                                                                                                                                                         _______,          _______, _______
-            //                                                                                                                                                         `-----------------------------------'
-    ),
-
-    [_FLOCK] = LAYOUT_with_setta21(
-    //,--------------------------------------------------------------|             |--------------------------------------------------------------.             ,-----------------------------------.
-        _______,TD(TD_ESQW),KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,               _______, _______, _______, _______,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-        _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
-                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                 _______,          _______,          _______, _______,               _______, _______,          _______, _______, _______, _______,               _______, _______, _______,
-            //`-----------------------------------------------------------------------------------------------------------------------------------'             |-----------------+--------|        |
-                                                                                                                                                                  _______,          _______, _______
-            //                                                                                                                                                  `-----------------------------------'
-    ),
-
-    [_LOWER] = LAYOUT_with_setta21(
-    //,--------------------------------------------------------------|             |--------------------------------------------------------------.             ,-----------------------------------.
-        _______,  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_ESC,  KC_F2,   KC_EQL,  KC_DEL,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-        _______, JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                 KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH, XXXXXXX,               XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                 JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,               XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL,  KC_ENT,               XXXXXXX, KC_UP,   XXXXXXX,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
-                 JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                 KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS,   KC_UP, KC_RSFT,               KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
-                 JP_ZKHK,          _______,            LOWER, _______,               _______,   RAISE,           JP_DOT, KC_LEFT, KC_DOWN, KC_RGHT,               XXXXXXX, KC_DOWN, XXXXXXX,
-            //`-----------------------------------------------------------------------------------------------------------------------------------'             |-----------------+--------|        |
-                                                                                                                                                                    LOWER,            RAISE, KC_PENT
-            //                                                                                                                                                  `-----------------------------------'
-    ),
-
-    [_RAISE] = LAYOUT_with_setta21(
-    //,--------------------------------------------------------------|             |--------------------------------------------------------------.             ,---------------------------------------.
-        _______,  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_ESC,    KC_F2,   KC_EQL,   KC_DEL,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |---------+---------+---------+---------|
-        _______,  KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,               XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX,               SEND_MIN, SEND_MAX, SEND_CIF, SEND_AVE,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |---------+---------+---------+---------|
-          LCTL_T(KC_F11), XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5,               XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______,                  KC_F7,    KC_F8,    KC_F9,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |---------+---------+---------|         |
-           SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______,                  KC_F4,    KC_F5,    KC_F6, SEND_SUM,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |---------+---------+---------+---------|
-                 _______,          _______,          _______, _______,               _______,          _______, _______, _______, _______, _______,                 KC_F11,   KC_F12,    KC_F3,
-            //`-----------------------------------------------------------------------------------------------------------------------------------'             |-------------------+---------|         |
-                                                                                                                                                                   _______,            _______,  KC_RPRN
-            //                                                                                                                                                  `---------------------------------------'
-    ),
-
-
-    [_ADJUST] = LAYOUT_with_setta21( /* Base */
-    //,--------------------------------------------------------------|             |------------------------------------------------------------------------.             ,-----------------------------------.
-        _______,   QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,       KC_F9,        KC_F10,  KC_F11,  KC_F12,               _______, _______, _______, _______,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+------------+--------------+--------+--------|             |--------+--------+--------+--------|
-        _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_RST, XXXXXXX, XXXXXXX,     XXXXXXX,       XXXXXXX, XXXXXXX, _______,               XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+------------+--------------+--------+--------|             |--------+--------+--------+--------|
-                 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_TOG, RGB_MOD, XXXXXXX, LCA(KC_DEL), LALT(KC_PSCR), KC_PSCR, XXXXXXX,               RGB_SAD, RGB_SAI, XXXXXXX,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+------------+--------------+--------+--------|             |--------+--------+--------+--------|
-                 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_VAD, RGB_VAI, RGB_HUD,     RGB_HUI,       RGB_SAD, RGB_SAI, XXXXXXX,               RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG,
-    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+------------+--------------+--------+--------|             |--------+--------+--------+--------|
-                 _______,          _______,          _______, _______,               _______,          _______,     _______,       _______, _______, _______,               RGB_VAD, RGB_VAI, XXXXXXX,
-            //`---------------------------------------------------------------------------------------------------------------------------------------------'             |-----------------+--------+--------|
-                                                                                                                                                                            _______,          _______, RGB_MOD
-            //                                                                                                                                                            `-----------------------------------'
-    )
-};
-
-//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 _MOUSE:
-      rgblight_sethsv_at(HSV_RED, 0);
-      break;
-    case _BROWSER:
-      rgblight_sethsv_at(HSV_RED, 1);
-      break;
-    case _FLOCK:
-      rgblight_sethsv_range(HSV_YELLOW, 0, 2);
-      break;
-    case _LOWER:
-      rgblight_sethsv_range(HSV_BLUE, 0, 2);
-      break;
-    case _RAISE:
-      rgblight_sethsv_range(HSV_RED, 0, 2);
-      break;
-    case _ADJUST:
-      rgblight_sethsv_range(HSV_PURPLE, 0, 2);
-      break;
-    default: //  for any other layers, or the default layer
-      rgblight_sethsv_range( 0, 0, 0, 0, 2);
-      break;
-    }
-    rgblight_set_effect_range( 2, 6);
-#endif
-return state;
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  bool result = false;
-  switch (keycode) {
-    case SEND_SUM:
-      if (record->event.pressed) {
-        SEND_STRING("=SUM(");
-      }
-      break;
-    case SEND_AVE:
-      if (record->event.pressed) {
-        SEND_STRING("=AVERAGE(");
-      }
-      break;
-    case SEND_CIF:
-      if (record->event.pressed) {
-        SEND_STRING("=COUNTIF(");
-      }
-      break;
-    case SEND_MAX:
-      if (record->event.pressed) {
-        SEND_STRING("=MAX(");
-      }
-      break;
-    case SEND_MIN:
-      if (record->event.pressed) {
-        SEND_STRING("=MIN(");
-      }
-      break;
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
-
-void matrix_init_user(void) {
-
-}
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/readme.md
deleted file mode 100644
index cf09c1a74cc..00000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/readme.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# The salicylic_with_setta21 keymap for naked64
-
-Add Setta21 maps to the salicylic layout.
-
-## Default
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-|Ad+Num|     /|     *|     -|
-|     7|     8|     9|      |
-|     4|     5|     6|     +|
-|     1|     2|     3|      |
-| Rai+0|      | LOW + .|   ENT|
-
-## Lower
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| =MIN(| =MAX(|=COUNTIF(|=AVERAGE(|
-|    F7|    F8|    F9|      |
-|    F4|    F5|    F6| =SUM(|
-|   F11|   F12|    F3|      |
-| RAISE|      | LOWER|     )|
-
-## Raise
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| XXXXX|     /|     *|     -|
-| XXXXX|    UP| XXXXX|      |
-|  LEFT|  DOWN| RIGHT|     +|
-| XXXXX|  DOWN| XXXXX|      |
-| RAISE|      | LOWER|   ENT|
-
-## Adjust
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-|ADJUST| XXXXX| XXXXX|     -|
-|LED_SAD|LED_SAI| XXXXX|      |
-|LED_HUD|LED_HUI| XXXXX|     +|
-|LED_VAD|LED_VAI| XXXXX|      |
-|LED_ON/Off|      | XXXXX|LED_MOD|
-
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h
deleted file mode 100644
index 0e221d844d5..00000000000
--- a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
deleted file mode 100644
index 1853c1b58e1..00000000000
--- a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-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_japanese.h"
-
-
-
-extern uint8_t is_master;
-
-// 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,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-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_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, JP_LBRC, JP_RBRC, KC_BSLS,  KC_END,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     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_PGUP,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, KC_RSFT,            KC_UP, KC_PGDN,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_ZKHK, KC_LGUI, JP_MHEN,LT(_LOWER,KC_ENT), KC_BSPC,    LT(_RAISE,KC_SPC), JP_HENK, KC_LALT,  KC_APP,           KC_LEFT,KC_DOWN, KC_RGHT
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_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_DEL, KC_PSCR,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_DQUO, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,       KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH, _______, _______, LALT(KC_PSCR),
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,     XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL,          _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,       KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS, _______,          _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,MO(_LOWER),KC_DEL,           MO(_RAISE),           JP_DOT, _______, _______,          _______, _______, _______ 
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_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_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX,          _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,          _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, KC_DEL,              _______,          _______, _______, _______,          _______, _______, _______ 
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT( /* Base */
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,   XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,          _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, _______,   QK_BOOT,            _______,          _______, _______, _______,          _______, _______, _______ 
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  )
-};
-
-//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, 11);
-#endif
-return state;
-}
-
-uint8_t RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  bool result = false;
-  switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_get_mode();
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_get_mode();
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h
deleted file mode 100644
index d06aae947a5..00000000000
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
deleted file mode 100644
index 314889c2b2e..00000000000
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-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_japanese.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,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-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_DEL,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-       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_ENT, KC_PGUP,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS, JP_RBRC,          KC_PGDN,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH, JP_BSLS, KC_RSFT,   KC_UP,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,LT(_LOWER,KC_ENT),KC_BSPC,KC_DEL,LT(_RAISE,KC_SPC), JP_HENK,KC_RALT, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_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_PSCR,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_DQUO, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,       KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH, _______, _______, LALT(KC_PSCR),
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN,   JP_AT,     XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL, _______,          _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,       KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______,MO(_LOWER),_______,    _______, MO(_RAISE),JP_DOT, JP_DOT, _______,          _______, _______, _______ 
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_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_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______,          _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______,          _______, _______, _______ 
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT( /* Base */
-  //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,_______,    _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,   QK_BOOT,     QK_BOOT, _______, _______, _______, _______,          _______, _______, _______ 
-  //|-----------------------------------------------------|   |--------------------------------------------------------------------------------'
-  )
-};
-
-//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, 11);
-#endif
-return state;
-}
-
-uint8_t RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  bool result = false;
-  switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_get_mode();
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_get_mode();
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
deleted file mode 100644
index 540c819c2b0..00000000000
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
-
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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_LIMIT_VAL 50
-#    define RGB_MATRIX_VAL_STEP 5
-#    define RGB_MATRIX_SPD_STEP 10
-#endif
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
deleted file mode 100644
index b7cde4d4e09..00000000000
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,198 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-#ifdef OLED_ENABLE
-static uint32_t        oled_timer = 0;
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-  _BASE = 0,
-  _ARROW,
-  _MACRO,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE,
-  SEND_SUM,
-  SEND_AVE,
-  SEND_CIF,
-  SEND_MAX,
-  SEND_MIN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_numpad_6x4(
-      //,-----------------------------------|
-           KC_ESC,   KC_F2,  JP_EQL,  KC_DEL,
-      //|--------+--------+--------+--------|
-          KC_NUM,  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,
-      //|--------+--------+--------+--------|
-LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT
-      //`-----------------------------------'
-  ),
-
-  [_ARROW] = LAYOUT_numpad_6x4(
-      //,-----------------------------------|
-          _______, _______, _______, _______,
-      //|--------+--------+--------+--------|
-          XXXXXXX, _______, _______, _______,
-      //|--------+--------+--------+--------|
-          XXXXXXX,   KC_UP, XXXXXXX,
-      //|--------+--------+--------+--------|
-          KC_LEFT, KC_DOWN,KC_RIGHT, _______,
-      //|--------+--------+--------+--------|
-          XXXXXXX, KC_DOWN, XXXXXXX,
-      //|--------+--------+--------+--------|
-       MO(_ARROW),       MO(_MACRO), _______
-      //`-----------------------------------'
-  ),
-
-  [_MACRO] = LAYOUT_numpad_6x4(
-      //,-----------------------------------|
-          _______, _______, _______, _______,
-      //|--------+--------+--------+--------|
-         SEND_MIN,SEND_MAX,SEND_CIF,SEND_AVE,
-      //|--------+--------+--------+--------|
-            KC_F7,   KC_F8,   KC_F9,
-      //|--------+--------+--------+--------|
-            KC_F4,   KC_F5,   KC_F6,SEND_SUM,
-      //|--------+--------+--------+--------|
-           KC_F11,  KC_F12,   KC_F3,
-      //|--------+--------+--------+--------|
-          _______,          _______, JP_RPRN
-      //`-----------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_numpad_6x4( /* Base */
-      //,-----------------------------------|
-          _______, _______, _______, _______,
-      //|--------+--------+--------+--------|
-          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      //|--------+--------+--------+--------|
-          RGB_SAD, RGB_SAI, XXXXXXX,
-      //|--------+--------+--------+--------|
-          RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG,
-      //|--------+--------+--------+--------|
-          RGB_VAD, RGB_VAI, XXXXXXX,
-      //|--------+--------+--------+--------|
-          _______,          _______, RGB_MOD
-      //`-----------------------------------'
-  )
-};
-
-
-//A description for expressing the layer position in LED mode.
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _ARROW, _MACRO, _ADJUST);
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  bool result = false;
-  if (record->event.pressed) {
-     #ifdef OLED_ENABLE
-        oled_timer = timer_read32();
-     #endif
-  }
-  switch (keycode) {
-    case SEND_SUM:
-      if (record->event.pressed) {
-        SEND_STRING("_SUM*");
-      }
-      break;
-    case SEND_AVE:
-      if (record->event.pressed) {
-        SEND_STRING("_AVERAGE*");
-      }
-      break;
-    case SEND_CIF:
-      if (record->event.pressed) {
-        SEND_STRING("_COUNTIF*");
-      }
-      break;
-    case SEND_MAX:
-      if (record->event.pressed) {
-        SEND_STRING("_MAX*");
-      }
-      break;
-    case SEND_MIN:
-      if (record->event.pressed) {
-        SEND_STRING("_MIN*");
-      }
-      break;
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_0; }
-
-
-void render_layer_state(void) {
-    oled_write_P(PSTR("LAYER: "), false);
-    oled_write_P(PSTR(" Arrow "), layer_state_is(_ARROW));
-    oled_write_P(PSTR(" Macro "), layer_state_is(_MACRO));
-}
-
-void render_keylock_status(led_t led_state) {
-    oled_write_P(PSTR("NumLock"), led_state.num_lock);
-    oled_write_P(PSTR("              "), false);
-}
-
-void render_layer_messages(void) {
-    oled_write_P(PSTR("Setta21                For Your Good Job. "), false);
-}
-
-
-void render_status(void) {
-    /* Show Keyboard Layout  */
-    render_layer_messages();
-    render_keylock_status(host_keyboard_led_state());
-    render_layer_state();
-}
-
-bool oled_task_user(void) {
-    render_status();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    return false;
-}
-
-#endif
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/readme.md
deleted file mode 100644
index ad27736d2b9..00000000000
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/readme.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# The salicylic keymap for setta21
-
-## Base
-|       1    |   2  |      3    |  4   |
-|:----------:|:----:|:---------:|:----:|
-|     ESC    |  F2  |      =    |  Del |
-|   NumLock  |   /  |      *    | minus|
-|      7     |   8  |      9    |      |
-|      4     |   5  |      6    |   +  |
-|      1     |   2  |      3    |      |
-| Arrow , 0  |      | Macro , . |  Ent |
-
-
-
-## Arrow
-|       1    |   2  |   3   |  4   |
-|:----------:|:----:|:-----:|:----:|
-|     ESC    |  F2  |   =   |  Del |
-|    XXXXX   |   /  |   *   | minus|
-|    XXXXX   |  UP  | XXXXX |      |
-|     LEFT   | DOWN | RIGHT |   +  |
-|    XXXXX   | DOWN | XXXXX |      |
-|    Arrow   |      | Macro |  Ent |
-
-
-
-## Macro
-|       1    |    2   |      3    |     4    |
-|:----------:|:------:|:---------:|:--------:|
-|     ESC    |  F2    |      =    |    Del   |
-|    =MIN(   | =MAX(  | =COUNTIF( | =AVERAGE(|
-|      F7    |    F8  |     F9    |          |
-|      F4    |    F5  |     F6    |   =SUM(  |
-|     F11    |   F12  |     F3    |          |
-|    Arrow   |        |   Macro   |     )    |
-
-
-
-## Adjust
-|       1    |    2  |   3  |    4   |
-|:----------:|:-----:|:----:|:------:|
-|   Adjust   |   F2  |   =  |   Del  |
-|    XXXXX   | XXXXX | XXXXX|  XXXXX |
-|    XXXXX   |RGB_SAI| XXXXX|        |
-|     LEFT   |RGB_HUI| XXXXX| RGB_TOG|
-|   RGB_VAD  |RGB_VAI| XXXXX|        |
-|    Arrow   |       | Macro| RGB_MOD|
-
-
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
deleted file mode 100644
index ad721c13de4..00000000000
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
deleted file mode 100644
index 48f7774f111..00000000000
--- a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 sandwich
- *
- * 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_65_ansi(
-        QK_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_INS,
-        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_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(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FN] = LAYOUT_65_ansi(
-        _______, 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,
-        _______, _______, BL_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
-        _______, BL_TOGG, BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
-        _______, QK_BOOT, _______,                            _______,                   _______, MO(_FN), _______, _______, KC_VOLD, _______
-    )
-};
diff --git a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
deleted file mode 100644
index 392baa09619..00000000000
--- a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "quantum.h"
-#include "command.h"
-#include "action_pseudo_lut.h"
-
-static uint8_t send_key_shift_bit[SHIFT_BIT_SIZE];
-
-/*
- * Pseudo layout action.
- * This action converts a keycode in order to output the character according to the keymap you specified
- * still your keyboard layout recognized wrongly on your OS.
- * Memo: Using other layer keymap to get keycode
- */
-void action_pseudo_lut(keyrecord_t *record, uint8_t base_keymap_id, const uint16_t (*keymap)[2]) {
-  uint8_t prev_shift;
-  uint16_t keycode;
-  uint16_t pseudo_keycode;
-
-  /* get keycode from keymap you specified */
-  keycode = keymap_key_to_keycode(base_keymap_id, record->event.key);
-
-  prev_shift = keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT));
-
-  if (record->event.pressed) {
-    /* when magic commands entered, keycode does not converted */
-    if (IS_COMMAND()) {
-      if (prev_shift) {
-        add_shift_bit(keycode);
-      }
-      register_code(keycode);
-      return;
-    }
-
-    if (prev_shift) {
-      pseudo_keycode = convert_keycode(keymap, keycode, true);
-      dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-      add_shift_bit(keycode);
-
-      if (IS_LSFT(pseudo_keycode)) {
-        register_code(QK_LSFT ^ pseudo_keycode);
-      } else {
-        /* delete shift mod temporarily */
-        del_mods(prev_shift);
-        send_keyboard_report();
-        register_code(pseudo_keycode);
-        add_mods(prev_shift);
-        send_keyboard_report();
-      }
-    } else {
-      pseudo_keycode = convert_keycode(keymap, keycode, false);
-      dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-      if (IS_LSFT(pseudo_keycode)) {
-        add_weak_mods(MOD_BIT(KC_LSFT));
-        send_keyboard_report();
-        register_code(QK_LSFT ^ pseudo_keycode);
-        /* on Windows, prevent key repeat to avoid unintended output */
-        unregister_code(QK_LSFT ^ pseudo_keycode);
-        del_weak_mods(MOD_BIT(KC_LSFT));
-        send_keyboard_report();
-      } else {
-        register_code(pseudo_keycode);
-      }
-    }
-  } else {
-    if (get_shift_bit(keycode)) {
-      del_shift_bit(keycode);
-      pseudo_keycode = convert_keycode(keymap, keycode, true);
-    } else {
-      pseudo_keycode = convert_keycode(keymap, keycode, false);
-    }
-    dprintf("released: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-    if (IS_LSFT(pseudo_keycode)) {
-      unregister_code(QK_LSFT ^ pseudo_keycode);
-    } else {
-      unregister_code(pseudo_keycode);
-    }
-  }
-}
-
-uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shift_modded)
-{
-  uint16_t pseudo_keycode;
-
-  switch (keycode) {
-    case KC_A ... KC_CAPS_LOCK:
-      #if defined(__AVR__) 
-        if (shift_modded) {
-          pseudo_keycode = pgm_read_word(&keymap[keycode][1]);
-        } else {
-          pseudo_keycode = pgm_read_word(&keymap[keycode][0]);
-        }
-      #else
-        if (shift_modded) {
-          pseudo_keycode = keymap[keycode][1];
-        } else {
-          pseudo_keycode = keymap[keycode][0];
-        }
-      #endif
-      /* if undefined, use got keycode as it is */
-      if (pseudo_keycode == 0x00) {
-        if (shift_modded) {
-          pseudo_keycode = S(keycode);
-        } else {
-          pseudo_keycode = keycode;
-        }
-      }
-      break;
-    default:
-      if (shift_modded) {
-        pseudo_keycode = S(keycode);
-      } else {
-        pseudo_keycode = keycode;
-      }
-      break;
-  }
-  return pseudo_keycode;
-}
-
-uint8_t get_shift_bit(uint16_t keycode) {
-  if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-    return send_key_shift_bit[keycode >> 3] & (1 << (keycode & 7));
-  } else {
-    dprintf("get_shift_bit: Can't get shift bit. keycode: %02X\n", keycode);
-    return 0;
-  }
-}
-
-void add_shift_bit(uint16_t keycode) {
-  if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-    send_key_shift_bit[keycode >> 3] |= (1 << (keycode & 7));
-  } else {
-    dprintf("add_shift_bit: Can't add shift bit. keycode: %02X\n", keycode);
-  }
-}
-
-void del_shift_bit(uint16_t keycode) {
-  if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-    send_key_shift_bit[keycode >> 3] &= ~(1 << (keycode & 7));
-  } else {
-    dprintf("del_shift_bit: Can't delete shift bit. keycode: %02X\n", keycode);
-  }
-}
diff --git a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.h b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.h
deleted file mode 100644
index 681252440f4..00000000000
--- a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef ACTION_PSEUDO_LUT_H
-#define ACTION_PSEUDO_LUT_H
-
-#define SHIFT_BIT_SIZE (0xE7 / 8 + 1) // 1bit per 1key
-
-#define IS_LSFT(kc) ((QK_LSFT & (kc)) == QK_LSFT)
-
-void action_pseudo_lut(keyrecord_t *, uint8_t, const uint16_t (*)[2]);
-uint16_t convert_keycode(const uint16_t (*)[2], uint16_t, bool);
-
-uint8_t get_shift_bit(uint16_t);
-void add_shift_bit(uint16_t);
-void del_shift_bit(uint16_t);
-
-#endif
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c
deleted file mode 100644
index f57e97724c5..00000000000
--- a/keyboards/satt/comet46/keymaps/satt/keymap.c
+++ /dev/null
@@ -1,257 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#include QMK_KEYBOARD_H
-#include "keymap_jis2us.h"
-#include "action_pseudo_lut.h"
-#include "keymap_japanese.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 comet46_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _PSEUDO_US,
-  _PSEUDO_US_LOWER,
-  _PSEUDO_US_RAISE,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  PSEUDO_US,
-  JIS2US,
-};
-
-// JIS keycodes
-#define KC_JZHT JP_ZKHK  // hankaku/zenkaku|kanzi
-#define KC_JCIR JP_CIRC  // ^, ~
-#define KC_JAT  JP_AT    // @, `
-#define KC_JLBR JP_LBRC  // [, {
-#define KC_JCOL JP_COLN  // :, *
-#define KC_JRBR JP_RBRC  // ], }
-#define KC_JBSL JP_BSLS  // \, _
-#define KC_JMHE JP_MHEN  // muhenkan
-#define KC_JHEN JP_HENK  // henkan
-#define KC_JKAN JP_KANA  // katakana/hiragana|ro-mazi
-#define KC_JMKA JP_LANG1 //kana on MacOSX
-#define KC_JMEI KC_LNG2  //eisu on MacOSX
-#define KC_JAMP JP_AMPR  // &
-#define KC_JQUO JP_QUOT  // '
-#define KC_JLPR JP_LPRN  // (
-#define KC_JRPR JP_RPRN  // )
-#define KC_JEQL JP_EQL   // =
-#define KC_JTIL JP_TILD  // ~
-#define KC_JPIP JP_PIPE  // |
-#define KC_JGRV JP_GRV   // `
-#define KC_JLCB JP_LCBR  // {
-#define KC_JPLU JP_PLUS  // +
-#define KC_JAST JP_ASTR  // *
-#define KC_JRCB JP_RCBR  // }
-#define KC_JUND JP_UNDS  // _
-
-// Layer related keycodes
-#define KC_LWR  MO(_LOWER)
-#define KC_RSE  MO(_RAISE)
-#define KC_P_LW MO(_PSEUDO_US_LOWER)
-#define KC_P_RS MO(_PSEUDO_US_RAISE)
-#define KC_QWRT QWERTY
-#define KC_P_US PSEUDO_US
-#define KC_J2US JIS2US
-
-// Special keycodes
-#define KC_SPCT CTL_T(KC_SPC)
-#define KC_ENSF SFT_T(KC_ENT)
-#define KC_CAEC MT(MOD_LCTL | MOD_LALT, KC_ESC)
-#define KC_CSTB C_S_T(KC_TAB)
-#define KC_IMON ALT_T(KC_F13)
-#define KC_IMOF GUI_T(KC_F14)
-#define KC_CAD LCA(KC_DEL)
-#define KC_RST QK_BOOT
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     KC_CAEC, KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                 KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_DEL ,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     KC_CSTB, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,KC_LPRN,      KC_RPRN, KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_BSPC,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     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_QUOT,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         KC_IMOF,KC_LWR ,KC_SPCT,      KC_ENSF,KC_RSE ,KC_IMON
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,      KC_GRV ,KC_BSLS,KC_MINS,KC_EQL ,KC_LBRC,KC_RBRC,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,      KC_TILD,KC_PIPE,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                 KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,_______,      XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,_______,      KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_PSEUDO_US] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     KC_CAEC, KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                 KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_DEL ,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     KC_CSTB, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,KC_JLPR,      KC_JRPR, KC_H  , KC_J  , KC_K  , KC_L  ,KC_J2US,KC_BSPC,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_J2US,      KC_J2US, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_J2US,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         KC_IMOF,KC_P_LW,KC_SPCT,      KC_ENSF,KC_P_RS,KC_IMON
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-
-  [_PSEUDO_US_LOWER] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______,KC_EXLM,KC_JAT ,KC_HASH,KC_DLR ,KC_PERC,                KC_JCIR,KC_JAMP,KC_JAST,KC_JLPR,KC_JRPR,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,      KC_JGRV,KC_JBSL,KC_MINS,KC_JEQL,KC_JLBR,KC_JRBR,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,      KC_JTIL,KC_JPIP,KC_JUND,KC_JPLU,KC_JLCB,KC_JRCB,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_PSEUDO_US_RAISE] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                 KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,KC_JZHT,      XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,_______,      KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,KC_CAD ,      KC_QWRT,_______,_______,_______,_______,_______,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,KC_RST ,      KC_P_US,_______,_______,_______,_______,_______,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  )
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case _PSEUDO_US_LOWER:
-    case _PSEUDO_US_RAISE:
-      return update_tri_layer_state(state, _PSEUDO_US_RAISE, _PSEUDO_US_LOWER, _ADJUST);
-      break;
-    default:
-      return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-      break;
-  }
-}
-
-#ifdef OLED_ENABLE
-
-// You need to add source files to SRC in rules.mk when using OLED display functions
-void set_keylog(uint16_t keycode);
-const char *read_keylog(void);
-const char *read_modifier_state(void);
-const char *read_host_led_state(void);
-
-bool oled_task_user(void) {
-  // Layer state
-  char layer_str[22];
-  oled_write_P(PSTR("Layer: "), false);
-  uint8_t layer = get_highest_layer(layer_state);
-  uint8_t default_layer = get_highest_layer(eeconfig_read_default_layer());
-  switch (layer) {
-    case _QWERTY:
-      switch (default_layer) {
-        case _QWERTY:
-          snprintf(layer_str, sizeof(layer_str), "Qwerty");
-          break;
-        case _PSEUDO_US:
-          snprintf(layer_str, sizeof(layer_str), "Psuedo_US");
-          break;
-        default:
-          snprintf(layer_str, sizeof(layer_str), "Undef-%d", default_layer);
-          break;
-      }
-      break;
-    case _RAISE:
-      snprintf(layer_str, sizeof(layer_str), "Raise");
-      break;
-    case _LOWER:
-      snprintf(layer_str, sizeof(layer_str), "Lower");
-      break;
-      case _PSEUDO_US_RAISE:
-        snprintf(layer_str, sizeof(layer_str), "P_US_Raise");
-        break;
-      case _PSEUDO_US_LOWER:
-        snprintf(layer_str, sizeof(layer_str), "P_US_Lower");
-        break;
-    case _ADJUST:
-      snprintf(layer_str, sizeof(layer_str), "Adjust");
-      break;
-    default:
-      snprintf(layer_str, sizeof(layer_str), "Undef-%d", layer);
-  }
-  oled_write_ln(layer_str, false);
-  // Last entered keycode
-  oled_write_ln(read_keylog(), false);
-  // Modifier state
-  oled_write_ln(read_modifier_state(), false);
-  // Host Keyboard LED Status
-  oled_write(read_host_led_state(), false);
-
-  return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  #ifdef OLED_ENABLE
-    if (record->event.pressed) {
-      set_keylog(keycode);
-    }
-  #endif
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      break;
-    case PSEUDO_US:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_PSEUDO_US);
-      }
-      break;
-    case JIS2US:
-      action_pseudo_lut(record, _QWERTY, keymap_jis2us);
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h b/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
deleted file mode 100644
index a99af7770ec..00000000000
--- a/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef KEYMAP_JIS2US_H
-#define KEYMAP_JIS2US_H
-
-/* keymap for convert from JIS to US */
-const uint16_t PROGMEM keymap_jis2us[][2] = {
-  [KC_A ... KC_CAPS] = { 0x00, 0x00 }, /* default value */
-
-  [KC_1]    = { KC_1,    KC_EXLM    }, /* 1 and ! -> 1 and ! */
-  [KC_2]    = { KC_2,    KC_LBRC    }, /* 2 and " -> 2 and @ */
-  [KC_3]    = { KC_3,    KC_HASH    }, /* 3 and # -> 3 and # */
-  [KC_4]    = { KC_4,    KC_DLR     }, /* 4 and $ -> 4 and $ */
-  [KC_5]    = { KC_5,    KC_PERC    }, /* 5 and % -> 5 and % */
-  [KC_6]    = { KC_6,    KC_EQL     }, /* 6 and & -> 6 and ^ */
-  [KC_7]    = { KC_7,    KC_CIRC    }, /* 7 and ' -> 7 and & */
-  [KC_8]    = { KC_8,    KC_DQT     }, /* 8 and ( -> 8 and * */
-  [KC_9]    = { KC_9,    KC_ASTR    }, /* 9 and ) -> 9 and ( */
-  [KC_0]    = { KC_0,    KC_LPRN    }, /* 0 and (no assign) -> 0 and ) */
-  [KC_MINS] = { KC_MINS, S(KC_INT1) }, /* - and = -> - and _ */
-  [KC_EQL]  = { KC_UNDS, KC_COLN    }, /* ^ and ~ -> = and + */
-  [KC_LBRC] = { KC_RBRC, KC_RCBR    }, /* @ and ` -> [ and { */
-  [KC_RBRC] = { KC_BSLS, KC_PIPE    }, /* [ and { -> ] and } */
-  [KC_BSLS] = { KC_INT3, S(KC_INT3) }, /* ] and } -> / and | */
-  [KC_NUHS] = { KC_NUHS, S(KC_NUHS) }, /* (no assign) */
-  [KC_SCLN] = { KC_SCLN, KC_QUOT    }, /* ; and + -> ; and : */
-  [KC_QUOT] = { KC_AMPR, KC_AT      }, /* : and * -> ' and " */
-  [KC_GRV]  = { KC_LCBR, KC_PLUS    }, /* (no assign) -> ` and ~ */
-  [KC_COMM] = { KC_COMM, KC_LT      }, /* , and < -> , and < */
-  [KC_DOT]  = { KC_DOT,  KC_GT      }, /* . and > -> . and > */
-  [KC_SLSH] = { KC_SLSH, KC_QUES    }, /* / and ? -> / and ? */
-};
-
-#endif
diff --git a/keyboards/satt/comet46/keymaps/satt/readme.md b/keyboards/satt/comet46/keymaps/satt/readme.md
deleted file mode 100644
index 33bbad3264b..00000000000
--- a/keyboards/satt/comet46/keymaps/satt/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Pseudo US Layout
-
-On a Japanese Windows environment, ANSI keyboards may be recognized wrongly as a JIS keyboard.  
-By using this code, you can use your ANSI keyboard under a JIS keyboard environment without changing the settings and registry of your environment.
-
-Original code by [Shela](https://github.com/qmk/qmk_firmware/tree/master/keyboards/hhkb/keymaps/shela)
diff --git a/keyboards/satt/comet46/keymaps/satt/rules.mk b/keyboards/satt/comet46/keymaps/satt/rules.mk
deleted file mode 100644
index 9c07b12fcbd..00000000000
--- a/keyboards/satt/comet46/keymaps/satt/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC += action_pseudo_lut.c
-
-# If you want to change display settings of the OLED, you need to change the following lines
-SRC +=  ./lib/keylogger.c \
-        ./lib/modifier_state_reader.c \
-        ./lib/host_led_state_reader.c
-
-OLED_ENABLE = yes
diff --git a/keyboards/satt/vision/keymaps/satt/action_pseudo.c b/keyboards/satt/vision/keymaps/satt/action_pseudo.c
deleted file mode 100644
index 9c2b6e8ca52..00000000000
--- a/keyboards/satt/vision/keymaps/satt/action_pseudo.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Copyright 2020 shela
- *
- * 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 "quantum.h"
-#include "command.h"
-#include "action_pseudo.h"
-
-static uint8_t send_key_shift_bit[SHIFT_BIT_SIZE];
-
-/*
- * Action Pseudo Process.
- * Gets the keycode in the same position of the specified layer.
- * The keycode is sent after conversion according to the conversion keymap.
- */
-void action_pseudo_process(keyrecord_t *record, uint8_t base_layer, const uint16_t (*keymap)[2]) {
-    uint8_t  prev_shift;
-    uint16_t keycode;
-    uint16_t pseudo_keycode;
-
-    /* Get keycode from specified layer */
-    keycode = keymap_key_to_keycode(base_layer, record->event.key);
-
-    prev_shift = get_mods() & MOD_MASK_SHIFT;
-
-    if (record->event.pressed) {
-        /* If magic commands entered, keycode is not converted */
-        if (IS_COMMAND()) {
-            if (prev_shift) {
-                add_shift_bit(keycode);
-            }
-            register_code(keycode);
-            return;
-        }
-
-        if (prev_shift) {
-            pseudo_keycode = convert_keycode(keymap, keycode, true);
-            dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-            add_shift_bit(keycode);
-
-            if (IS_LSFT(pseudo_keycode)) {
-                register_code(QK_LSFT ^ pseudo_keycode);
-            } else {
-                /* Delete shift mod temporarily */
-                unregister_mods(prev_shift);
-                register_code(pseudo_keycode);
-                register_mods(prev_shift);
-            }
-        } else {
-            pseudo_keycode = convert_keycode(keymap, keycode, false);
-            dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-            if (IS_LSFT(pseudo_keycode)) {
-                register_weak_mods(MOD_LSFT);
-                register_code(QK_LSFT ^ pseudo_keycode);
-                /* Prevent key repeat to avoid unintended output on Windows */
-                unregister_code(QK_LSFT ^ pseudo_keycode);
-                unregister_weak_mods(MOD_LSFT);
-            } else {
-                register_code(pseudo_keycode);
-            }
-        }
-    } else {
-        if (get_shift_bit(keycode)) {
-            del_shift_bit(keycode);
-            pseudo_keycode = convert_keycode(keymap, keycode, true);
-        } else {
-            pseudo_keycode = convert_keycode(keymap, keycode, false);
-        }
-        dprintf("released: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-        if (IS_LSFT(pseudo_keycode)) {
-            unregister_code(QK_LSFT ^ pseudo_keycode);
-        } else {
-            unregister_code(pseudo_keycode);
-        }
-    }
-}
-
-/* Convert keycode according to the keymap */
-uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shift_modded) {
-    uint16_t pseudo_keycode = 0x00; /* default value */
-
-    switch (keycode) {
-        case KC_A ... KC_CAPS_LOCK:
-#if defined(__AVR__)
-            if (shift_modded) {
-                pseudo_keycode = pgm_read_word(&keymap[keycode][1]);
-            } else {
-                pseudo_keycode = pgm_read_word(&keymap[keycode][0]);
-            }
-#else
-            if (shift_modded) {
-                pseudo_keycode = keymap[keycode][1];
-            } else {
-                pseudo_keycode = keymap[keycode][0];
-            }
-#endif
-            break;
-    }
-
-    /* If pseudo keycode is the default value, use the keycode as it is */
-    if (pseudo_keycode == 0x00) {
-        if (shift_modded) {
-            pseudo_keycode = S(keycode);
-        } else {
-            pseudo_keycode = keycode;
-        }
-    }
-
-    return pseudo_keycode;
-}
-
-uint8_t get_shift_bit(uint16_t keycode) {
-    if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-        return send_key_shift_bit[keycode >> 3] & (1 << (keycode & 7));
-    } else {
-        dprintf("get_shift_bit: Can't get shift bit. keycode: %02X\n", keycode);
-        return 0;
-    }
-}
-
-void add_shift_bit(uint16_t keycode) {
-    if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-        send_key_shift_bit[keycode >> 3] |= (1 << (keycode & 7));
-    } else {
-        dprintf("add_shift_bit: Can't add shift bit. keycode: %02X\n", keycode);
-    }
-}
-
-void del_shift_bit(uint16_t keycode) {
-    if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-        send_key_shift_bit[keycode >> 3] &= ~(1 << (keycode & 7));
-    } else {
-        dprintf("del_shift_bit: Can't delete shift bit. keycode: %02X\n", keycode);
-    }
-}
diff --git a/keyboards/satt/vision/keymaps/satt/action_pseudo.h b/keyboards/satt/vision/keymaps/satt/action_pseudo.h
deleted file mode 100644
index 7c3d38fa07a..00000000000
--- a/keyboards/satt/vision/keymaps/satt/action_pseudo.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 shela
- *
- * 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 SHIFT_BIT_SIZE (0xE7 / 8 + 1) /* 1bit per 1key */
-#define IS_LSFT(kc) ((QK_LSFT & (kc)) == QK_LSFT)
-
-void     action_pseudo_process(keyrecord_t *, uint8_t, const uint16_t (*)[2]);
-uint16_t convert_keycode(const uint16_t (*)[2], uint16_t, bool);
-
-uint8_t get_shift_bit(uint16_t);
-void    add_shift_bit(uint16_t);
-void    del_shift_bit(uint16_t);
diff --git a/keyboards/satt/vision/keymaps/satt/keymap.c b/keyboards/satt/vision/keymaps/satt/keymap.c
deleted file mode 100644
index cc088d94f34..00000000000
--- a/keyboards/satt/vision/keymaps/satt/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-Copyright 2019 Sekigon
-
-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_jis2us.h"
-#include "action_pseudo.h"
-#include "keymap_japanese.h"
-
-enum custom_keycodes {
-    JIS2US = SAFE_RANGE,  /* JIS2US keycode                       */
-    QWERTY,               /* Layer  keycode                       */
-    PSEU_US,              /* Layer  keycode                       */
-    LOWER,                /* Layer  keycode                       */
-    RAISE,                /* Layer  keycode                       */
-    P_LOWER,              /* Layer  keycode                       */
-    P_RAISE               /* Layer  keycode                       */
-};
-
-enum layer_names {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _PSEUDO_US,
-    _PSEUDO_US_LOWER,
-    _PSEUDO_US_RAISE,
-    _ADJUST,
-};
-
-// Layer related keycodes
-#define ADJUST  MO(_ADJUST)
-
-// Special keycodes
-#define SPC_CTL CTL_T(KC_SPC)
-#define ENT_SFT SFT_T(KC_ENT)
-#define TB_CTSF C_S_T(KC_TAB)
-#define IMON_AL ALT_T(KC_F13)
-#define IMOF_AL ALT_T(KC_F14)
-#define CTALDEL LCA(KC_DEL)
-#define ESC_ADJ LT(_ADJUST, KC_ESC)
-#define GUI_E LGUI(KC_E)
-#define GUI_R LGUI(KC_R)
-#define CTLGRV LCTL(KC_GRV)
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[_QWERTY] = LAYOUT(
-        GUI_E,   ESC_ADJ, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, KC_DEL,
-        GUI_R,   TB_CTSF, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,     KC_BSPC,
-                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    CTLGRV,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-                 KC_LGUI,          IMOF_AL,     LOWER,        SPC_CTL,     RAISE,        ENT_SFT, IMON_AL,                   KC_RCTL
-    ),
-
-	[_LOWER] = LAYOUT(
-        _______, _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______,
-        _______, _______, _______, KC_F2,   KC_F5,   KC_F10,  KC_GRV,  KC_BSLS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,     _______,
-                 _______, _______, _______, _______, _______, KC_TILD, _______, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
-                 _______,          _______,     _______,      _______,     _______,      _______, _______,                   _______
-    ),
-
-	[_RAISE] = LAYOUT(
-        _______, _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_END,      _______,
-                 _______, _______, _______, _______, _______, _______, KC_HOME, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, _______, _______,
-                 _______,          _______,     _______,      _______,     _______,      _______, _______,                   _______
-    ),
-
-	[_PSEUDO_US] = LAYOUT(
-        _______, _______, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    _______, _______,
-        _______, _______, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    JIS2US,      _______,
-                 _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    JP_ZKHK, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JIS2US,
-                 _______,          _______,     P_LOWER,      _______,     P_RAISE,      _______, _______,                   _______
-    ),
-
-	[_PSEUDO_US_LOWER] = LAYOUT(
-        _______, _______, JP_EXLM, JP_AT,   JP_HASH, JP_DLR,  JP_PERC, JP_CIRC, JP_AMPR, JP_ASTR, JP_LPRN, JP_RPRN, _______, _______,
-        _______, _______, _______, KC_F2,   KC_F5,   KC_F10,  JP_GRV,  JP_BSLS, JP_MINS, JP_EQL,  JP_LBRC, JP_RBRC,     _______,
-                 _______, _______, _______, _______, _______, JP_TILD, _______, JP_PIPE, JP_UNDS, JP_PLUS, JP_LCBR, JP_RCBR, _______,
-                 _______,          _______,     _______,      _______,     _______,      _______, _______,                   _______
-    ),
-
-	[_PSEUDO_US_RAISE] = LAYOUT(
-        _______, _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_END,      _______,
-                 _______, _______, _______, _______, _______, _______, KC_HOME, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, _______, _______,
-                 _______,          _______,     _______,      _______,     _______,      _______, _______,                   _______
-    ),
-
-	[_ADJUST] = LAYOUT(
-        QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______, _______, _______, _______, QWERTY,  PSEU_US, CTALDEL, _______, _______, _______, _______, _______,     _______,
-                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                 _______,          _______,     _______,      _______,     _______,      _______, _______,                   _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case P_LOWER:
-      if (record->event.pressed) {
-        layer_on(_PSEUDO_US_LOWER);
-        update_tri_layer(_PSEUDO_US_LOWER, _PSEUDO_US_RAISE, _ADJUST);
-      } else {
-        layer_off(_PSEUDO_US_LOWER);
-        update_tri_layer(_PSEUDO_US_LOWER, _PSEUDO_US_RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case P_RAISE:
-      if (record->event.pressed) {
-        layer_on(_PSEUDO_US_RAISE);
-        update_tri_layer(_PSEUDO_US_LOWER, _PSEUDO_US_RAISE, _ADJUST);
-      } else {
-        layer_off(_PSEUDO_US_RAISE);
-        update_tri_layer(_PSEUDO_US_LOWER, _PSEUDO_US_RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      break;
-    case PSEU_US:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_PSEUDO_US);
-      }
-      break;
-    case JIS2US:
-      action_pseudo_process(record, _QWERTY, keymap_jis2us);
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/satt/vision/keymaps/satt/keymap_jis2us.h b/keyboards/satt/vision/keymaps/satt/keymap_jis2us.h
deleted file mode 100644
index 163ae84fb40..00000000000
--- a/keyboards/satt/vision/keymaps/satt/keymap_jis2us.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2020 shela
- *
- * 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 "keymap_japanese.h"
-
-// clang-format off
-/* Keymap for converting JIS to US */
-const uint16_t PROGMEM keymap_jis2us[][2] = {
-    [KC_A ... KC_CAPS] = { 0x00, 0x00 }, /* default value */
-
-    [KC_1]    = { KC_1,    JP_EXLM }, /* 1 and ! -> 1 and ! */
-    [KC_2]    = { KC_2,    JP_AT   }, /* 2 and " -> 2 and @ */
-    [KC_3]    = { KC_3,    JP_HASH }, /* 3 and # -> 3 and # */
-    [KC_4]    = { KC_4,    JP_DLR  }, /* 4 and $ -> 4 and $ */
-    [KC_5]    = { KC_5,    JP_PERC }, /* 5 and % -> 5 and % */
-    [KC_6]    = { KC_6,    JP_CIRC }, /* 6 and & -> 6 and ^ */
-    [KC_7]    = { KC_7,    JP_AMPR }, /* 7 and ' -> 7 and & */
-    [KC_8]    = { KC_8,    JP_ASTR }, /* 8 and ( -> 8 and * */
-    [KC_9]    = { KC_9,    JP_LPRN }, /* 9 and ) -> 9 and ( */
-    [KC_0]    = { KC_0,    JP_RPRN }, /* 0       -> 0 and ) */
-    [KC_MINS] = { JP_MINS, JP_UNDS }, /* - and = -> - and _ */
-    [KC_EQL]  = { JP_EQL,  JP_PLUS }, /* ^ and ~ -> = and + */
-    [KC_LBRC] = { JP_LBRC, JP_LCBR }, /* @ and ` -> [ and { */
-    [KC_RBRC] = { JP_RBRC, JP_RCBR }, /* [ and { -> ] and } */
-    [KC_BSLS] = { JP_YEN,  JP_PIPE }, /* ] and } -> \ and | */
-    [KC_NUHS] = { JP_YEN,  JP_PIPE }, /* ] and } -> \ and | */
-    [KC_SCLN] = { JP_SCLN, JP_COLN }, /* ; and + -> ; and : */
-    [KC_QUOT] = { JP_QUOT, JP_DQUO }, /* : and * -> ' and " */
-    [KC_GRV]  = { JP_GRV,  JP_TILD }, /* Han/Zen -> ` and ~ */
-    [KC_COMM] = { JP_COMM, JP_LABK }, /* , and < -> , and < */
-    [KC_DOT]  = { JP_DOT,  JP_RABK }, /* . and > -> . and > */
-    [KC_SLSH] = { JP_SLSH, JP_QUES }, /* / and ? -> / and ? */
-};
-// clang-format on
diff --git a/keyboards/satt/vision/keymaps/satt/readme.md b/keyboards/satt/vision/keymaps/satt/readme.md
deleted file mode 100644
index 33bbad3264b..00000000000
--- a/keyboards/satt/vision/keymaps/satt/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Pseudo US Layout
-
-On a Japanese Windows environment, ANSI keyboards may be recognized wrongly as a JIS keyboard.  
-By using this code, you can use your ANSI keyboard under a JIS keyboard environment without changing the settings and registry of your environment.
-
-Original code by [Shela](https://github.com/qmk/qmk_firmware/tree/master/keyboards/hhkb/keymaps/shela)
diff --git a/keyboards/satt/vision/keymaps/satt/rules.mk b/keyboards/satt/vision/keymaps/satt/rules.mk
deleted file mode 100644
index 029fdeeb1d0..00000000000
--- a/keyboards/satt/vision/keymaps/satt/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SRC += action_pseudo.c
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json
index 7aeb5ad38ab..b3d4f8f97c6 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json
@@ -1,8 +1,13 @@
 {
     "keyboard_name": "Krush60 - Solder",
     "manufacturer": "SawnsProjects",
-    "url": "",
     "maintainer": "MaiTheSan",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true
+    },
     "usb": {
         "vid": "0x5350",
         "pid": "0x6B32",
@@ -34,8 +39,6 @@
             "knight": true,
             "christmas": true,
             "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
             "twinkle": true
         }
     },
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md
deleted file mode 100644
index 1f6a41724df..00000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The default keymap for krush60 solder
-
-Assigns a keycode to every possible switch location.
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
index 39a6ee1be61..fa069945381 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
@@ -32,22 +32,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,                   _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
-    ),
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
-    ),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
-    ),
-
+    )
 };
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md
deleted file mode 100644
index a7ca3b9c274..00000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The VIA keymap for krush60 solder
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/readme.md
index 36da34d372f..1944ddaf09e 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/readme.md
+++ b/keyboards/sawnsprojects/krush/krush60/solder/readme.md
@@ -1,6 +1,6 @@
 # Krush60 solder
 
-![Krush60](https://cdn.discordapp.com/attachments/898507964942536715/906171092916391956/252763374_2899749087003964_8763371038132517512_n.png)
+![Krush60](https://i.imgur.com/v8n2ED7h.jpeg)
 
 A 60% keyboard PCB made and sold by SawnsProjects with Nuxros in [Facebook](https://www.facebook.com/groups/vnmkmarket/posts/1412997345762674). 
 
@@ -10,6 +10,18 @@ A 60% keyboard PCB made and sold by SawnsProjects with Nuxros in [Facebook](http
 
 Make example for this keyboard (after setting up your build environment):
 
-    make sawnsprojects/krush60/solder:default
+    make sawnsprojects/krush/krush60/solder:default
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
+Flashing example for this keyboard:
+
+    make sawnsprojects/krush/krush60/solder: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 `QK_BOOT` if it is available
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/rules.mk b/keyboards/sawnsprojects/krush/krush60/solder/rules.mk
index c6d01d3079b..6e7633bfe01 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/rules.mk
+++ b/keyboards/sawnsprojects/krush/krush60/solder/rules.mk
@@ -1,11 +1 @@
-# 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  = 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 = yes       # Enable keyboard RGB underglow
+# This file intentionally left blank
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/sawns/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/sawns/keymap.c
deleted file mode 100644
index d252058bde8..00000000000
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/sawns/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * 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(
-        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_GRV,  KC_PSCR, 
-        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_PGUP, 
-        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_PGDN, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
-    ),
-
-    [1] = LAYOUT_all(
-        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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  
-    ),
-    [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  
-    ),
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            case 0:
-                // main layer - move mouse right (CW) and left (CCW)
-                if (clockwise) {
-                    tap_code_delay(KC_VOLU, 10);
-                } else {
-                    tap_code_delay(KC_VOLD, 10);
-                }
-                break;
-            default:
-                // other layers - =/+ (quals/plus) (CW) and -/_ (minus/underscore) (CCW)
-                if (clockwise) {
-                    tap_code16(C(KC_EQL));
-                } else {
-                    tap_code16(C(KC_MINS));
-                }
-                break;
-        }
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/sawns/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/sawns/readme.md
deleted file mode 100644
index ff710c521f0..00000000000
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/sawns/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-#custom keymap for MikeTheSan
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/re65/info.json b/keyboards/sawnsprojects/re65/info.json
index 1aca08210ec..45e874db6d5 100644
--- a/keyboards/sawnsprojects/re65/info.json
+++ b/keyboards/sawnsprojects/re65/info.json
@@ -14,8 +14,8 @@
         "bootmagic": true,
         "mousekey": true,
         "extrakey": true,
-        "console": true,
-        "command": true,
+        "console": false,
+        "command": false,
         "nkro": true,
         "rgblight": true,
         "encoder": true
@@ -31,7 +31,7 @@
         ]
     },
     "rgblight": {
-        "led_count": 13,
+        "led_count": 32,
         "saturation_steps": 8,
         "brightness_steps": 8,
         "sleep": true,
@@ -52,7 +52,7 @@
         "pin": "GP21",
         "driver": "vendor"
     },
-    "community_layouts": ["65_ansi_blocker","65_ansi_blocker_split_bs"],
+    "community_layouts": ["65_ansi_blocker","65_ansi_blocker_split_bs","65_ansi_blocker_tsangan","65_ansi_blocker_tsangan_split_bs"],
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
@@ -206,6 +206,161 @@
                 {"matrix": [4, 10], "w": 1.25, "x": 10, "y": 4},
                 {"matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4},
 
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "w": 2,  "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
+
+                {"matrix": [4, 6], "w": 7, "x": 4, "y": 4},
+
+                {"matrix": [4, 11], "w": 1.5, "x": 11, "y": 4},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4},
+
+                {"matrix": [4, 6], "w": 7, "x": 4, "y": 4},
+
+                {"matrix": [4, 11], "w": 1.5, "x": 11, "y": 4},
+
                 {"matrix": [4, 12], "x": 13, "y": 4},
                 {"matrix": [4, 13], "x": 14, "y": 4},
                 {"matrix": [4, 14], "x": 15, "y": 4}
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
deleted file mode 100644
index d649c698aba..00000000000
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * 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_MATRIX_LED_COUNT 6
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#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 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Sets the default mode, if none has been set
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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
diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json
index 5d92db728ab..e56af19c7da 100644
--- a/keyboards/sawnsprojects/satxri6key/info.json
+++ b/keyboards/sawnsprojects/satxri6key/info.json
@@ -8,6 +8,58 @@
         "pid": "0x0727",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "solid_reactive_simple"
+        },
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "react_on_keyup": true
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/sawnsprojects/vcl65/solder/keymaps/sawns/keymap.c b/keyboards/sawnsprojects/vcl65/solder/keymaps/sawns/keymap.c
deleted file mode 100644
index 86209da7dc6..00000000000
--- a/keyboards/sawnsprojects/vcl65/solder/keymaps/sawns/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * 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(
-        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_GRV,  KC_PSCR, 
-        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_PGUP, 
-        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_PGDN, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT  
-    ),
-
-    [1] = LAYOUT_all(
-        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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  
-    ),
-    [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  
-    ),
-};
diff --git a/keyboards/sawnsprojects/vcl65/solder/keymaps/sawns/readme.md b/keyboards/sawnsprojects/vcl65/solder/keymaps/sawns/readme.md
deleted file mode 100644
index dd1d8879df9..00000000000
--- a/keyboards/sawnsprojects/vcl65/solder/keymaps/sawns/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The custom keymap for VCL65 solder by SawnsProjects
diff --git a/keyboards/sck/gtm/keymaps/tabs/keymap.c b/keyboards/sck/gtm/keymaps/tabs/keymap.c
deleted file mode 100644
index 6cc4b2c651f..00000000000
--- a/keyboards/sck/gtm/keymaps/tabs/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-LAYOUT(
-    KC_1, KC_2, KC_3, KC_4, KC_5,
-    KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENTER),
-
-};
-
-void matrix_init_user(void) {
-  debug_config.matrix = 1;
-  debug_config.keyboard = 1;
-  debug_config.enable = 1;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code16(C(KC_T));
-    } else {
-      tap_code16(C(KC_W));
-    }
-    return true;
-}
diff --git a/keyboards/sck/gtm/keymaps/vol/keymap.c b/keyboards/sck/gtm/keymaps/vol/keymap.c
deleted file mode 100644
index 3eaa696bb26..00000000000
--- a/keyboards/sck/gtm/keymaps/vol/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-LAYOUT(
-    KC_1, KC_2, KC_3, KC_4, KC_5,
-    KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENTER),
-
-};
-
-void matrix_init_user(void) {
-  debug_config.matrix = 1;
-  debug_config.keyboard = 1;
-  debug_config.enable = 1;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-     tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return true;
-}
diff --git a/keyboards/sck/m0116b/keymaps/m0116/config.h b/keyboards/sck/m0116b/keymaps/m0116/config.h
deleted file mode 100644
index 015191d1b6a..00000000000
--- a/keyboards/sck/m0116b/keymaps/m0116/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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_TERM 200
-// place overrides here
diff --git a/keyboards/sck/m0116b/keymaps/m0116/keymap.c b/keyboards/sck/m0116b/keymaps/m0116/keymap.c
deleted file mode 100644
index ec4cdde141f..00000000000
--- a/keyboards/sck/m0116b/keymaps/m0116/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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 custom_keycodes {
-  M0116B = SAFE_RANGE,
-};
-
-#define CALTDEL LCTL(LALT(KC_DEL))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Keymap BASE: (Base Layer) Default Layer
-   * ,---------------------------------------------------------------------------------.
-   * |                     |    CALTDEL   |                                            |
-   * `---------------------------------------------------------------------------------'
-   * ,-----------------------------------------------------------. .-------------------.
-   * | ~ | 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | |MO(1)| / | *  |Paus|
-   * |-----------------------------------------------------------| |-------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     | | 7  | 8  | 9  | +  |
-   * |-----------------------------------------------------|     | |-------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return | | 4  | 5  | 6  | -  |
-   * |-----------------------------------------------------------' |-------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     | | 1  | 2  | 3  | Ent|
-   * |-----------------------------------------------------------' `--------------|    |
-   * |CAPS|Opt |Cmd | ` |    Space        | \ |Left|Up|Down|Right| | 0       | .  |    |
-   * `-----------------------------------------------------------' `-------------------'
-   */
-[0] = LAYOUT_m0116_ansi( /* Base */
-															 CALTDEL,
-		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_NUM,  KC_PEQL, KC_PSLS, KC_PAST,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-		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_P4,   KC_P5,   KC_P6,	KC_PMNS,
-		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_P1,   KC_P2,   KC_P3,   KC_PENT,
-		KC_LCAP, KC_LALT, KC_LGUI, KC_GRV,                   KC_SPC,           LT(1, KC_BSLS),   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_P0,            KC_PDOT
-),
-/* Keymap Layer 1: (Layer 1) Layer 1
-   * ,---------------------------------------------------------------------------------.
-   * |                     |QK_BOOT|                                                     |
-   * `---------------------------------------------------------------------------------'
-   * ,-----------------------------------------------------------. .-------------------.
-   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|       | |    |    |    |    |
-   * |-----------------------------------------------------------| |-------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     | |    |    |    |    |
-   * |-----------------------------------------------------|     | |-------------------|
-   * |       |   |   |   |   |   |   |   |   |   |   |   |       | |    |    |    |    |
-   * |-----------------------------------------------------------' |-------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          | |    |    |    |    |
-   * |-----------------------------------------------------------' `--------------|    |
-   * |    |    |    |   |    M0116B       |   |   |    |    |    | |         |    |    |
-   * `-----------------------------------------------------------' `-------------------'
-   */
-[1] = LAYOUT_m0116_ansi( /* Layer 1 */
-	                                                          QK_BOOT,
-		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_DEL,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   M0116B,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case M0116B:
-      if (record->event.pressed) {
-        // when keycode M0116B is pressed
-        SEND_STRING("Golden Delicious - aka M0116B - The Apple M0116/M0118 Replacement PCB.");
-      } else {
-        // when keycode M0116B is released
-      }
-      break;
-
-  }
-  return true;
-};
diff --git a/keyboards/sck/m0116b/keymaps/m0116/readme.md b/keyboards/sck/m0116b/keymaps/m0116/readme.md
deleted file mode 100644
index 6f9eee3e229..00000000000
--- a/keyboards/sck/m0116b/keymaps/m0116/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for the Golden Delicious when used with a M0116
diff --git a/keyboards/sck/m0116b/keymaps/m0118/keymap.c b/keyboards/sck/m0116b/keymaps/m0118/keymap.c
deleted file mode 100644
index 351e1d57dbe..00000000000
--- a/keyboards/sck/m0116b/keymaps/m0118/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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 custom_keycodes {
-  M0116B = SAFE_RANGE,
-};
-
-#define CALTDEL LCTL(LALT(KC_DEL))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Keymap BASE: (Base Layer) Default Layer
-   * ,---------------------------------------------------------------------------------.
-   * |                     |  CALTDEL  |                                               |
-   * `---------------------------------------------------------------------------------'
-   * ,-----------------------------------------------------------. .-------------------.
-   * |Esc| 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | |MO(1)| = | /  |  * |
-   * |-----------------------------------------------------------| |-------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Enter| | 7  | 8  | 9  | +  |
-   * |--------------------------------------------------------|  | |-------------------|
-   * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| #  |  | | 4  | 5  | 6  | -  |
-   * |-----------------------------------------------------------' |-------------------|
-   * |Shift|<>|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift| Up | | 1  | 2  | 3  | Ent|
-   * |-----------------------------------------------------------' `--------------|    |
-   * |Ctrl | Opt | Cmd |       Space        |Cmd |Left|Right|Down| | 0       | .  |    |
-   * `-----------------------------------------------------------' `-------------------'
-   */
-[0] = LAYOUT_m0118_iso( /* Base */
-															 CALTDEL,
-		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_NUM,  KC_PEQL, KC_PSLS, KC_PAST,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-		KC_LCAP, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HASH,          KC_P4,   KC_P5,   KC_P6,	KC_PMNS,
-		KC_LSFT, KC_LABK, 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,                    LT(1, KC_RALT),   KC_LEFT, KC_RGHT, KC_DOWN, KC_P0,            KC_PDOT
-),
-/* Keymap Layer 1: (Layer 1) Layer 1
-   * ,---------------------------------------------------------------------------------.
-   * |                      |  Reset  |                                                |
-   * `---------------------------------------------------------------------------------'
-   * ,-----------------------------------------------------------. .-------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       | |    |    |    |    |
-   * |-----------------------------------------------------------| |-------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     | |    |    |    |    |
-   * |--------------------------------------------------------|  | |-------------------|
-   * |       |   |   |   |   |   |   |   |   |   |   |   |    |  | |    |    |    |    |
-   * |-----------------------------------------------------------' |-------------------|
-   * |     |  |   |   |   |   |   |   |   |   |   |   |     |    | |    |    |    |    |
-   * |-----------------------------------------------------------' `--------------|    |
-   * |     |     |     |     M0116B         |    |    |     |    | |         |    |    |
-   * `-----------------------------------------------------------' `-------------------'
-   */
-[1] = LAYOUT_m0118_iso( /* Layer 1 */
-	                                                          QK_BOOT,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                            M0116B,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case M0116B:
-      if (record->event.pressed) {
-        // when keycode M0116B is pressed
-        SEND_STRING("Golden Delicious - M0116B - The Apple M0116/M0118 Replacement PCB.");
-      } else {
-        // when keycode M0116B is released
-      }
-      break;
-
-  }
-  return true;
-};
diff --git a/keyboards/sck/m0116b/keymaps/m0118/readme.md b/keyboards/sck/m0116b/keymaps/m0118/readme.md
deleted file mode 100644
index 049dad83afe..00000000000
--- a/keyboards/sck/m0116b/keymaps/m0118/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for the Golden Delicious when used with a M0118
diff --git a/keyboards/sck/osa/keymaps/ocm/keymap.c b/keyboards/sck/osa/keymaps/ocm/keymap.c
deleted file mode 100644
index 87544b7375e..00000000000
--- a/keyboards/sck/osa/keymaps/ocm/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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] = {
- /* Keymap BASE: (Base Layer) Default Layer
-   * .----.,----------------------------------------------------------------------.
-   * | M1 ||Esc| 1 |  2|  3|  4|  5|  6|          |  7|  8|  9|  0|  -|  =| ~ | \ |
-   * |----||----------------------------------------------------------------------|
-   * | M2 ||Tab  |  Q|  W|  E|  R|  T|          |  Y|  U|  I|  O|  P| [ | ] |BkSpc|
-   * |----||----------------------------------------------------------------------|
-   * | M3 ||Ctrl   |  A|  S|  D|  F|  G|          |  H|  J|  K|  L|  ;|  '|Return |
-   * `----'|----------------------------------------------------------------------|
-   *       |Shift   |  Z|  X|  C|  V|  B|     |  B|  N|  M|  ,|  .|  /|Shift | Fn |
-   *       |----------------------------------------------------------------------|
-   *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
-   *       `----------------------------------------------------------------------'
-   */
-[0] = LAYOUT_all( /* OSA Base */
-	KC_DEL,   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_BSLS,
-	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_BSPC,
-	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_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_HOME,
-	          KC_LCTL,          KC_LALT,          KC_SPC, MO(1),                     KC_SPC,                    KC_RALT,                            KC_RCTL
-  ),
-/* Keymap BASE: (Base Layer) Default Layer
-   * .----.,----------------------------------------------------------------------.
-   * | M1 ||Esc| 1 |  2|  3|  4|  5|  6|          |  7|  8|  9|  0|  -|  =| ~ | \ |
-   * |----||----------------------------------------------------------------------|
-   * | M2 ||Tab  |  Q|  W|  E|  R|  T|          |  Y|  U|  I|  O|  P| [ | ] |BkSpc|
-   * |----||----------------------------------------------------------------------|
-   * | M3 ||Ctrl   |  A|  S|  D|  F|  G|          |  H|  J|  K|  L|  ;|  '|Return |
-   * `----'|----------------------------------------------------------------------|
-   *       |Shift   |  Z|  X|  C|  V|  B|     |  B|  N|  M|  ,|  .|  /|Shift | Fn |
-   *       |----------------------------------------------------------------------|
-   *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
-   *       `----------------------------------------------------------------------'
-   */
-[1] = LAYOUT_all( /* OSA Layer 1 */
-	KC_DEL,   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_BSLS,
-	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_BSPC,
-	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_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_HOME,
-	          KC_LCTL,          KC_LALT,          KC_SPC, MO(2),                     KC_SPC,                    KC_RALT,                            KC_RCTL
-  ),
-/* Keymap BASE: (Base Layer) Default Layer
-   * .----.,----------------------------------------------------------------------.
-   * | M1 ||Esc| 1 |  2|  3|  4|  5|  6|          |  7|  8|  9|  0|  -|  =| ~ | \ |
-   * |----||----------------------------------------------------------------------|
-   * | M2 ||Tab  |  Q|  W|  E|  R|  T|          |  Y|  U|  I|  O|  P| [ | ] |BkSpc|
-   * |----||----------------------------------------------------------------------|
-   * | M3 ||Ctrl   |  A|  S|  D|  F|  G|          |  H|  J|  K|  L|  ;|  '|Return |
-   * `----'|----------------------------------------------------------------------|
-   *       |Shift   |  Z|  X|  C|  V|  B|     |  B|  N|  M|  ,|  .|  /|Shift | Fn |
-   *       |----------------------------------------------------------------------|
-   *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
-   *       `----------------------------------------------------------------------'
-   */
-[2] = LAYOUT_all( /* OSA Layer 2 */
-	KC_DEL,   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_BSLS,
-	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_BSPC,
-	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_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_HOME,
-	          KC_LCTL,          KC_LALT,          KC_SPC, MO(1),                     KC_SPC,                    KC_RALT,                            KC_RCTL
-  ),
-};
diff --git a/keyboards/sck/osa/keymaps/ocm/readme.md b/keyboards/sck/osa/keymaps/ocm/readme.md
deleted file mode 100644
index 3624b1078ea..00000000000
--- a/keyboards/sck/osa/keymaps/ocm/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# OneCreativeMind's keymap for OSA
diff --git a/keyboards/sck/osa/keymaps/splitbs/keymap.c b/keyboards/sck/osa/keymaps/splitbs/keymap.c
deleted file mode 100644
index 367e084443a..00000000000
--- a/keyboards/sck/osa/keymaps/splitbs/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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] = {
- /* Keymap BASE: (Base Layer) Default Layer
-   * .----.,----------------------------------------------------------------------.
-   * | M1 ||Esc| 1 |  2|  3|  4|  5|  6|          |  7|  8|  9|  0|  -|  =| ~ | \ |
-   * |----||----------------------------------------------------------------------|
-   * | M2 ||Tab  |  Q|  W|  E|  R|  T|          |  Y|  U|  I|  O|  P| [ | ] |BkSpc|
-   * |----||----------------------------------------------------------------------|
-   * | M3 ||Ctrl   |  A|  S|  D|  F|  G|          |  H|  J|  K|  L|  ;|  '|Return |
-   * `----'|----------------------------------------------------------------------|
-   *       |Shift   |  Z|  X|  C|  V|  B|     |  B|  N|  M|  ,|  .|  /|Shift      |
-   *       |----------------------------------------------------------------------|
-   *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
-   *       `----------------------------------------------------------------------'
-   */
-[0] = LAYOUT_split_backspace( /* OSA Base */
-	KC_DEL,   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_BSLS,
-	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_BSPC,
-	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_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_LCTL,          KC_LALT,          KC_SPC, MO(1),                     KC_SPC,                    KC_RALT,                            KC_RCTL
-  ),
-/* Keymap BASE: (Base Layer) Default Layer
-   * .----.,----------------------------------------------------------------------.
-   * | M1 ||Esc| 1 |  2|  3|  4|  5|  6|          |  7|  8|  9|  0|  -|  =| ~ | \ |
-   * |----||----------------------------------------------------------------------|
-   * | M2 ||Tab  |  Q|  W|  E|  R|  T|          |  Y|  U|  I|  O|  P| [ | ] |BkSpc|
-   * |----||----------------------------------------------------------------------|
-   * | M3 ||Ctrl   |  A|  S|  D|  F|  G|          |  H|  J|  K|  L|  ;|  '|Return |
-   * `----'|----------------------------------------------------------------------|
-   *       |Shift   |  Z|  X|  C|  V|  B|     |  B|  N|  M|  ,|  .|  /|Shift      |
-   *       |----------------------------------------------------------------------|
-   *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
-   *       `----------------------------------------------------------------------'
-   */
-[1] = LAYOUT_split_backspace( /* OSA Layer 1 */
-	KC_DEL,   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_BSLS,
-	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_BSPC,
-	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_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_LCTL,          KC_LALT,          KC_SPC, _______,                     KC_SPC,                    KC_RALT,                            KC_RCTL
-  ),
-};
diff --git a/keyboards/sck/osa/keymaps/splitbs/readme.md b/keyboards/sck/osa/keymaps/splitbs/readme.md
deleted file mode 100644
index 33fb31b336f..00000000000
--- a/keyboards/sck/osa/keymaps/splitbs/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The split backspace keymap for osa
diff --git a/keyboards/sck/osa/keymaps/splitrs/keymap.c b/keyboards/sck/osa/keymaps/splitrs/keymap.c
deleted file mode 100644
index 92f156321c9..00000000000
--- a/keyboards/sck/osa/keymaps/splitrs/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2019 jrfhoutx
- *
- * 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] = {
- /* Keymap BASE: (Base Layer) Default Layer
-   * .----.,----------------------------------------------------------------------.
-   * | M1 || ~ | 1 |  2|  3|  4|  5|  6|          |  7|  8|  9|  0|  -|  =|Backsp |
-   * |----||----------------------------------------------------------------------|
-   * | M2 ||Tab  |  Q|  W|  E|  R|  T|          |  Y|  U|  I|  O|  P| [ | ] |  \  |
-   * |----||----------------------------------------------------------------------|
-   * | M3 ||Ctrl   |  A|  S|  D|  F|  G|          |  H|  J|  K|  L|  ;|  '|Return |
-   * `----'|----------------------------------------------------------------------|
-   *       |Shift   |  Z|  X|  C|  V|  B|     |  B|  N|  M|  ,|  .|  /|Shift | Fn |
-   *       |----------------------------------------------------------------------|
-   *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
-   *       `----------------------------------------------------------------------'
-   */
-[0] = LAYOUT_alice( /* OSA Base */
-	KC_DEL,   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_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_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_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_HOME,
-	          KC_LCTL,          KC_LALT,          KC_SPC, MO(1),                     KC_SPC,                    KC_RALT,                            KC_RCTL
-  ),
-/* Keymap BASE: (Base Layer) Default Layer
-   * .----.,----------------------------------------------------------------------.
-   * | M1 || ~ | 1 |  2|  3|  4|  5|  6|          |  7|  8|  9|  0|  -|  =|Backsp |
-   * |----||----------------------------------------------------------------------|
-   * | M2 ||Tab  |  Q|  W|  E|  R|  T|          |  Y|  U|  I|  O|  P| [ | ] |  \  |
-   * |----||----------------------------------------------------------------------|
-   * | M3 ||Ctrl   |  A|  S|  D|  F|  G|          |  H|  J|  K|  L|  ;|  '|Return |
-   * `----'|----------------------------------------------------------------------|
-   *       |Shift   |  Z|  X|  C|  V|  B|     |  B|  N|  M|  ,|  .|  /|Shift | Fn |
-   *       |----------------------------------------------------------------------|
-   *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
-   *       `----------------------------------------------------------------------'
-   */
-[1] = LAYOUT_alice( /* OSA Layer 1 */
-	KC_DEL,   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_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_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_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_HOME,
-	          KC_LCTL,          KC_LALT,          KC_SPC, _______,                     KC_SPC,                    KC_RALT,                            KC_RCTL
-  ),
-};
diff --git a/keyboards/sck/osa/keymaps/splitrs/readme.md b/keyboards/sck/osa/keymaps/splitrs/readme.md
deleted file mode 100644
index 9f2315c2a29..00000000000
--- a/keyboards/sck/osa/keymaps/splitrs/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The split right shift keymap for osa
diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h
deleted file mode 100644
index 44f0121915d..00000000000
--- a/keyboards/senselessclay/ck60/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2020 Hadi Iskandarani
-
-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
-
-/* RGB matrix lighting */ 
-#define RGB_MATRIX_LED_COUNT 62
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160   // limit brightness to not overamp the USB
-#define RGB_MATRIX_LED_FLUSH_LIMIT 16       // 16 is equivalent to limiting to 60fps
-#define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-
-// 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_VAL
-#    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_PINWHEEL
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json
index f05d94c9de4..e9971574367 100644
--- a/keyboards/senselessclay/ck60/info.json
+++ b/keyboards/senselessclay/ck60/info.json
@@ -12,7 +12,32 @@
         "pin": "B1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "solid_reactive": true,
+            "solid_reactive_multiwide": true,
+            "multisplash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "ws2812",
+        "max_brightness": 160,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/senselessclay/had60/keymaps/had/keymap.c b/keyboards/senselessclay/had60/keymaps/had/keymap.c
deleted file mode 100644
index add05955229..00000000000
--- a/keyboards/senselessclay/had60/keymaps/had/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 Hadi Iskandarani
- *
- * 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_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC, 
-		MO(1), 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_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2), 
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RALT, KC_RGUI, KC_RCTL),
-    [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_VOLD, KC_VOLU, KC_MUTE, KC_SLEP, 
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, 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_TRNS, KC_TRNS, KC_TRNS),
-    [2] = LAYOUT_all(
-        MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS, QK_BOOT, 
-		MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, 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_DOWN, 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/sentraq/s60_x/keymaps/amnesia0287/keymap.c b/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
deleted file mode 100644
index e9f82b2c37a..00000000000
--- a/keyboards/sentraq/s60_x/keymaps/amnesia0287/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#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.
-#define _BL  0
-#define _HLa 1
-#define _HLb 2
-#define _HL  3
-#define _XL  4
-
-enum hype_keycodes {
-  FN_HLa = SAFE_RANGE,
-  FN_HLb
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: ANSI qwerty */
-    [_BL] = LAYOUT(
-        KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_NO,   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_LCTL,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NO,   KC_ENT ,
-        KC_LSFT,   KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT, FN_HLb,
-        KC_LCTL,   KC_LGUI, KC_LALT,                   KC_SPC,                    KC_NO,   KC_RALT, FN_HLa,  KC_RCTL
-        ),
-    [_HLa] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL,  KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP,  KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,   KC_PGDN, KC_DOWN,          KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MPLY,                            KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-    [_HLb] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,          KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MPLY,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-    [_HL] = LAYOUT(
-        RGB_TOG, RGB_M_P, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, BL_BRTG, BL_OFF,  BL_STEP, BL_ON,   BL_DOWN, BL_UP,   KC_TRNS, LALT(KC_F4),
-        QK_BOOT, RGB_HUI, RGB_SAI,  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_HUD, RGB_SAD,  RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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,                                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case FN_HLa:
-      if (record->event.pressed)
-      {
-        layer_on(_HLa);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      else
-      {
-        layer_off(_HLa);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      return false;
-      break;
-    case FN_HLb:
-      if (record->event.pressed)
-      {
-        layer_on(_HLb);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      else
-      {
-        layer_off(_HLb);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/sentraq/s60_x/keymaps/amnesia0287/readme.md b/keyboards/sentraq/s60_x/keymaps/amnesia0287/readme.md
deleted file mode 100644
index 69cede566a9..00000000000
--- a/keyboards/sentraq/s60_x/keymaps/amnesia0287/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-### 1  Standard - ANSI
-This is a variation of the default keymap with added RGB underglow and in-switch LED controls.
-
-#### 1.0 Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │CAPSL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LCTRL│L_GUI│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │RCTRL│█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 1.1 Fn layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │GRAVE│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │ Up  │     │     │     │     │     │PGUP │PGDWN│PRTSC│SCLCK│PAUSE│     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │Left │Down │Right│     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │UGTOG│UGMOD│UGHUI│UGHUD│UGSAI│UGSAD│     │BLDEC│BLTOG│BLINC│▒▒▒▒▒│     │▒▒▒▒▒│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │█████│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
\ No newline at end of file
diff --git a/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c b/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
deleted file mode 100644
index 0c8d7063278..00000000000
--- a/keyboards/sentraq/s60_x/keymaps/dbroqua/keymap.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _DEFAULT 0
-#define _FN 1
-#define _SFX 2
-
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty gui/alt/space/alt/gui
- * ,-----------------------------------------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
- * |-----------------------------------------------------------------------------------------+
- *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
- *         `-----------------------------------------------------------------'
- */
-  [_DEFAULT] = LAYOUT( /* Basic QWERTY */
-      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_BSLS, 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_BSPC,
-      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_LSFT, ______,  KC_Z,    KC_X, KC_C, KC_V,   KC_B, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(_FN),
-      ______,  KC_LGUI, KC_LALT,                     KC_SPC,                       KC_RALT, KC_RGUI, ______,  ______
-      ),
-
-/* FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * | SFX | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |  CAPS  |     |     |     |     |     |     |     | Psc | Slck| Paus| Up  |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 | Stop  |       |
- *         `-----------------------------------------------------------------'
- */
-  [_FN] = LAYOUT( /* Layer 1 */
-      TG(_SFX),KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS,  KC_DEL,
-      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,  ______, ______,
-      ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______, ______,
-      ______,  ______,  KC_MPRV, KC_MPLY, KC_MNXT,______, ______, KC_PPLS,  KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,        ______, ______,
-      ______,  ______,  ______,                           ______,                          KC_MSTP, ______, ______, ______
-      ),
-
-
-/* SFX Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
- * |-----------------------------------------------------------------------------------------+
- * |        | BL- | BL+ | BL  |     |     |     |     |     |     |     |     |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | RGBT| RGBM|     |     |     |     |     |     |     |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |      |    |     |           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 |       |       |
- *         `-----------------------------------------------------------------'
- */
-  [_SFX] = LAYOUT(
-      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   BL_TOGG,BL_STEP,BL_DOWN,BL_UP,  ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   RGB_TOG,RGB_MOD,______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
-      ______,   ______, RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,______, ______, ______, ______,         ______, ______,
-      ______,   ______, ______,                         ______,                         ______, ______, ______, ______
-      )
-};
diff --git a/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c b/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
deleted file mode 100644
index 4773dadc0ae..00000000000
--- a/keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _CM 1
-#define _DV 2
-#define _AL 3
-#define _FL 4
-#define _UL 5
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: Main layer, swapped alt and GUI for Mac
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│DEL  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│END  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │BKSPC│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_ALT│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 0: ANSI qwerty */
-  [_BL] = LAYOUT_65_ansi(
-        QK_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_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_END,
-        LT(_FL, KC_BSPC), 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_LALT, KC_LGUI,            KC_SPC,            KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
-
-  /* 1: Colemak layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│DEL  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │ TAB │  Q  │  W  │  F  │  P  │  G  │  J  │  L  │  U  │  Y  │  ;  │  [  │  ]  │  \  │█████│END  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │BKSPC│  A  │  R  │  S  │  T  │  D  │  H  │  N  │  E  │  I  │  O  │  '  │▒▒▒▒▒│ENTER│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  K  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_ALT│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 1: Colemak layer */
-  [_CM] = LAYOUT_65_ansi(
-        QK_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_DEL,
-        KC_TAB,  KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
-        LT(_FL, KC_BSPC), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,       KC_ENT,     KC_PGUP,
-        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_UP, KC_PGDN,
-        KC_LCTL, KC_LALT, KC_LGUI,            KC_SPC,            KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
-
-
-  /* 2: Dvorak layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  [  │  ]  │▒▒▒▒▒│BKSPC│DEL  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │ TAB │  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │  \  │█████│END  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │BKSPC│  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│ENTER│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_ALT│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 2: Dvorak layer */
-  [_DV] = LAYOUT_65_ansi(
-        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_END,
-        LT(_FL, KC_BSPC), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,       KC_ENT,     KC_PGUP,
-        KC_LSFT,       KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,    KC_RSFT, KC_UP, KC_PGDN,
-        KC_LCTL, KC_LALT, KC_LGUI,            KC_SPC,            KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
-
-  /* 3: Locking arrow keys to WASD for when you need dedicated arrow keys
-   *  ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   *  │     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│▒▒▒▒▒│     │
-   *  ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *  │     │     │ Up  │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-   *  ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *  │     │Left │Down │Right│     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-   *  ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *  │     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │     │     │
-   *  ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *  │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │     │     │
-   *  └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
- /* 3: Locking arrow keys to WASD*/
-  [_AL] = LAYOUT_65_ansi(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______,               _______,                _______, _______, _______, _______, _______, _______),
-
-  /* 4: Fn layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │GRAVE│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │ _AL │ Up  │     │     │     │     │     │PGUP │PGDWN│PRTSC│SCLCK│PAUSE│     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │Left │Down │Right│     │     │Left │Down │ Up  │Right│     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │▒▒▒▒▒│_UL  │     │_CM  │_DV  │     │     │     │     │Home │End  │▒▒▒▒▒│     │Vol+ │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │Mute │Vol- │Play │
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  [_FL] = LAYOUT_65_ansi(
-      KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
-      _______, TG(_AL), KC_UP, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
-      _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______,
-      _______,    TG(_UL), _______, TG(_CM), TG(_DV), _______, _______, _______, KC_HOME, KC_END, _______, _______, KC_VOLU, _______,
-      _______, _______, _______,               _______,                _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY),
-
-  /* 5: Locking layer for controlling the underglow
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │BL On│BL St│     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │ On  │Mode │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │▒▒▒▒▒│     │Hue+ │Hue- │Sat+ │Sat- │Val+ │Val- │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │     │     │
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  [_UL] = LAYOUT_65_ansi(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______,               _______,                _______, _______, _______, _______, _______, _______),
-};
diff --git a/keyboards/sentraq/s65_x/keymaps/kelorean/readme.md b/keyboards/sentraq/s65_x/keymaps/kelorean/readme.md
deleted file mode 100644
index 12e39eae617..00000000000
--- a/keyboards/sentraq/s65_x/keymaps/kelorean/readme.md
+++ /dev/null
@@ -1,76 +0,0 @@
-### 1  ANSI
-A Mac ANSI layout that assumes standard sized shifts, enter, and backspace keys, Arrow layer, FN layers and Lighting functions layer...
-I added Colemak and Dvorak layer as layer 1 & 2 under base QWERTY layer. 
-
-#### 1.0 Default layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│DEL  │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │▒▒▒▒▒│END  │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │BKSPC│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│▒▒▒▒▒│PG_UP│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LCTRL│L_ALT│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │LEFT │DOWN │RIGHT│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 1.1: Colemak layer  
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│DEL  │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ TAB │  Q  │  W  │  F  │  P  │  G  │  J  │  L  │  U  │  Y  │  ;  │  [  │  ]  │  \  │█████│END  │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │BKSPC│  A  │  R  │  S  │  T  │  D  │  H  │  N  │  E  │  I  │  O  │  '  │▒▒▒▒▒│ENTER│█████│PG_UP│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  K  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LCTRL│L_ALT│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │LEFT │DOWN │RIGHT│
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘  
-#### 1.2: Dvorak layer  
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  [  │  ]  │▒▒▒▒▒│BKSPC│DEL  │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │ TAB │  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │  \  │█████│END  │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │BKSPC│  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│ENTER│█████│PG_UP│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LSHFT│▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │LCTRL│L_ALT│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │LEFT │DOWN │RIGHT│ 
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘  
-#### 1.3 Arrow layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │ Up  │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │Left │Down │Right│     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │     │     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │     │     │
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 1.4 Fn layer
-    ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-    │GRAVE│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │ _AL │ Up  │     │     │     │     │     │PGUP │PGDWN│PRTSC│SCLCK│PAUSE│     │▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │Left │Down │Right│     │     │Left │Down │ Up  │Right│     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │▒▒▒▒▒│_UL  │     │_CM  │_DV  │     │     │     │Home │ End │     │▒▒▒▒▒│▒▒▒▒▒│Vol+ │     │
-    ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-    │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │Mute │Vol- │Play │
-    └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-#### 1.5 Underglow layer
-     ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-     │     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│▒▒▒▒▒│     │
-     ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-     │     │BL On│BL St│     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-     ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-     │     │ On  │Mode │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-     ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-     │     │▒▒▒▒▒│     │Hue+ │Hue- │Sat+ │Sat- │Val+ │Val- │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-     ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-     │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │     │     │
-     └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
\ No newline at end of file
diff --git a/keyboards/sentraq/s65_x/keymaps/nall/keymap.c b/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
deleted file mode 100644
index b00cfbac647..00000000000
--- a/keyboards/sentraq/s65_x/keymaps/nall/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _AL 1
-#define _FL 2
-#define _UL 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: Main layer, swapped alt and GUI for Mac
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│DEL  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │ TAB │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│END  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │CAPSL│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_ALT│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 0: ANSI qwerty */
-  [_BL] = LAYOUT_65_ansi(
-        QK_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_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_END,
-        LT(_FL, 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,
-        SC_LSPO,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    SC_RSPC, KC_UP, KC_PGDN,
-        KC_LCTL, KC_LALT, KC_LGUI,            KC_SPC,            KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
-
-
-  /* 1: Locking arrow keys to WASD for when you need dedicated arrow keys
-   *  ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   *  │     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│▒▒▒▒▒│     │
-   *  ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *  │     │     │ Up  │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-   *  ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *  │     │Left │Down │Right│     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-   *  ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *  │     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │     │     │
-   *  ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   *  │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │     │     │
-   *  └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  [_AL] = 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_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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: Fn layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │GRAVE│ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │ _AL │ Up  │     │     │     │     │     │PGUP │PGDWN│PRTSC│SCLCK│PAUSE│     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │Left │Down │Right│     │     │Left │Down │ Up  │Right│     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │▒▒▒▒▒│_UL  │     │     │     │     │     │     │     │Home │End  │▒▒▒▒▒│     │Vol+ │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │Mute │Vol- │Play │
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  [_FL] = LAYOUT_65_ansi(
-      KC_GRAVE, 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, TG(_AL), KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS,    TG(_UL), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_MPLY),
-
-  /* 3: Locking layer for controlling the underglow
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │BL On│BL St│     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │ On  │Mode │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │▒▒▒▒▒│     │Hue+ │Hue- │Sat+ │Sat- │Val+ │Val- │     │     │     │▒▒▒▒▒│     │▒▒▒▒▒│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │█████│█████│█████│     │█████│█████│█████│     │     │     │     │     │     │
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  [_UL] = 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, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/sentraq/s65_x/keymaps/smt/keymap.c b/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
deleted file mode 100644
index 48e6da5f307..00000000000
--- a/keyboards/sentraq/s65_x/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _FL 3
-#define _CL 4
-
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK
-};
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: Qwerty layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│  `  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │H_TAB│  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │  \  │█████│ DEL │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │C_ESC│  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │▒▒▒▒▒│ENTER│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_GUI│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ _FL │R_GUI│LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 0: ANSI qwerty */
-  [_QWERTY] = LAYOUT_65_ansi(
-    QK_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_GRV,
-    HPR_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,
-    CTL_ESC,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_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,  SFT_ENT,  KC_UP,    KC_PGDN,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(_FL),  KC_RGUI,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* 1: Colemak layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │▒▒▒▒▒│BKSPC│  `  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │H_TAB│  Q  │  W  │  F  │  P  │  G  │  J  │  L  │  U  │  Y  │  ;  │  [  │  ]  │  \  │█████│ DEL │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │C_ESC│  A  │  R  │  S  │  T  │  D  │  H  │  N  │  E  │  I  │  O  │  '  │▒▒▒▒▒│ENTER│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  Z  │  X  │  C  │  V  │  B  │  K  │  M  │  ,  │  .  │  /  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_GUI│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ _FL │R_GUI│LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 1: ANSI colemak */
-  [_COLEMAK] = LAYOUT_65_ansi(
-    QK_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_GRV,
-    HPR_TAB,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,     KC_J,     KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_DEL,
-    CTL_ESC,  KC_A,     KC_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_I,     KC_O,     KC_QUOT,            KC_ENT,   KC_PGUP,
-    KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  SFT_ENT,  KC_UP,    KC_PGDN,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(_FL),  KC_RGUI,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* 2: Dvorak layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │ ESC │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  [  │  ]  │▒▒▒▒▒│BKSPC│  `  │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │H_TAB│  '  │  ,  │  .  │  P  │  Y  │  F  │  G  │  C  │  R  │  L  │  /  │  =  │  \  │█████│ DEL │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │C_ESC│  A  │  O  │  E  │  U  │  I  │  D  │  H  │  T  │  N  │  S  │  -  │▒▒▒▒▒│ENTER│█████│PG_UP│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LSHFT│▒▒▒▒▒│  ;  │  Q  │  J  │  K  │  X  │  B  │  M  │  W  │  V  │  Z  │▒▒▒▒▒│RSHFT│ UP  │PG_DN│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │LCTRL│L_GUI│L_GUI│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ _FL │R_GUI│LEFT │DOWN │RIGHT│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 2: ANSI dvorak */
-  [_DVORAK] = LAYOUT_65_ansi(
-    QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_LBRC,  KC_RBRC,  KC_BSPC,  KC_GRV,
-    HPR_TAB,  KC_QUOT,  KC_COMM,  KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,     KC_C,     KC_R,     KC_L,     KC_SLSH,  KC_EQL,   KC_BSLS,  KC_DEL,
-    CTL_ESC,  KC_A,     KC_O,     KC_E,     KC_U,     KC_I,     KC_D,     KC_H,     KC_T,     KC_N,     KC_S,     KC_MINS,            KC_ENT,   KC_PGUP,
-    KC_LSFT,            KC_SCLN,  KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,     KC_M,     KC_W,     KC_V,     KC_Z,     SFT_ENT,  KC_UP,    KC_PGDN,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(_FL),  KC_RGUI,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* 3: Function layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │  `  │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │▒▒▒▒▒│ F13 │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │     │     │     │     │PRSCR│SCLCK│PAUSE│     │     │     │█████│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │ _CL │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │PG_UP│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │█████│█████│█████│     │█████│█████│█████│     │ _FL │     │HOME │PG_DN│ END │
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 3: ANSI Fn layer */
-  [_FL] = 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_F13,   _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,  _______,
-    _______,  _______,  MO(_CL),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
-    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PGUP,  _______,
-    _______,  _______,  _______,                      _______,                                _______,  MO(_FL),  _______,  KC_HOME,  KC_PGDN,  KC_END),
-
-  /* 4: Control layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │     │     │     │     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │ RGB │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │QK_BOOT│     │     │QWRTY│COLMK│DVORK│     │     │     │     │█████│RGBV+│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │ _CL │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │█████│RGBV-│
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │ _FL │▒▒▒▒▒│     │     │     │     │     │     │     │     │     │     │▒▒▒▒▒│     │RGBS+│     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │█████│█████│█████│RGB_M│█████│█████│█████│     │ _FL │     │RGBH-│RGBS-│RGBH+│
-   * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-   */
-
-  /* 4: ANSI control layer */
-  [_CL] = LAYOUT_65_ansi(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, RGB_TOG,
-    _______,  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  QWERTY,   COLEMAK,  DVORAK,   _______,  _______,  _______,  _______, RGB_VAI,
-    _______,  _______,  MO(_CL),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, RGB_VAD,
-    MO(_FL),            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SAI, _______,
-    _______,  _______,  _______,                      RGB_MOD,                                _______,  MO(_FL),  _______,  RGB_HUD,  RGB_SAD, RGB_HUI),
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h
index c19b74dc539..5e35453f1f2 100644
--- a/keyboards/sets3n/kk980/config.h
+++ b/keyboards/sets3n/kk980/config.h
@@ -24,8 +24,3 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT 102
-#define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/sf2040/info.json b/keyboards/sf2040/info.json
new file mode 100644
index 00000000000..21acb322af4
--- /dev/null
+++ b/keyboards/sf2040/info.json
@@ -0,0 +1,105 @@
+{
+    "manufacturer": "Strayfade",
+    "keyboard_name": "sf2040",
+    "maintainer": "Strayfade",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+    },
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18", "GP19", "GP20"],
+        "rows": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5"]
+    },
+    "processor": "RP2040",
+    "url": "https://strayfade.com/sf2040",
+    "usb": {
+        "device_version": "1.0.1",
+        "pid": "0x0001",
+        "vid": "0x5346"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 2.75},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 4, "y": 5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 5},
+                {"matrix": [5, 6], "x": 12.5, "y": 5},
+                {"matrix": [5, 7], "x": 13.5, "y": 5, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sf2040/keymaps/default/keymap.c b/keyboards/sf2040/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ca5bcce3585
--- /dev/null
+++ b/keyboards/sf2040/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 Strayfade
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESCAPE, 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_AUDIO_VOL_UP, KC_AUDIO_VOL_DOWN,
+        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BACKSPACE,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LEFT_BRACKET, KC_RIGHT_BRACKET, KC_BACKSLASH,
+        KC_CAPS_LOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, KC_ENTER,
+        KC_LEFT_SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RIGHT_SHIFT,
+        KC_LEFT_CTRL, KC_LEFT_GUI, KC_LEFT_ALT, KC_SPACE, MO(1), KC_HOME, KC_END, KC_RIGHT_CTRL
+    ),
+    [1] = LAYOUT(
+        KC_TILDE, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_ENTER,
+        KC_LEFT_SHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RIGHT_SHIFT,
+        KC_LEFT_CTRL, KC_LEFT_GUI, KC_LEFT_ALT, KC_SPACE, _______, KC_HOME, KC_END, KC_RIGHT_CTRL
+    )
+    
+};
\ No newline at end of file
diff --git a/keyboards/sf2040/keymaps/via/keymap.c b/keyboards/sf2040/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ca5bcce3585
--- /dev/null
+++ b/keyboards/sf2040/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 Strayfade
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESCAPE, 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_AUDIO_VOL_UP, KC_AUDIO_VOL_DOWN,
+        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BACKSPACE,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LEFT_BRACKET, KC_RIGHT_BRACKET, KC_BACKSLASH,
+        KC_CAPS_LOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, KC_ENTER,
+        KC_LEFT_SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RIGHT_SHIFT,
+        KC_LEFT_CTRL, KC_LEFT_GUI, KC_LEFT_ALT, KC_SPACE, MO(1), KC_HOME, KC_END, KC_RIGHT_CTRL
+    ),
+    [1] = LAYOUT(
+        KC_TILDE, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_ENTER,
+        KC_LEFT_SHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RIGHT_SHIFT,
+        KC_LEFT_CTRL, KC_LEFT_GUI, KC_LEFT_ALT, KC_SPACE, _______, KC_HOME, KC_END, KC_RIGHT_CTRL
+    )
+    
+};
\ No newline at end of file
diff --git a/keyboards/sf2040/keymaps/via/rules.mk b/keyboards/sf2040/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/sf2040/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/sf2040/readme.md b/keyboards/sf2040/readme.md
new file mode 100644
index 00000000000..fb9ef2efe6e
--- /dev/null
+++ b/keyboards/sf2040/readme.md
@@ -0,0 +1,22 @@
+# sf2040
+
+![sf2040 Image](https://i.imgur.com/DZ9N17ph.png)
+
+The sf2040 is a mechanical 76-key keyboard based on the [RP2040](https://datasheets.raspberrypi.com/rp2040/rp2040-datasheet.pdf) microcontroller from Raspberry Pi.
+
+* Keyboard Maintainer: [strayfade](https://github.com/strayfade)
+* Hardware Availability: https://github.com/strayfade/sf2040
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sf2040:default
+
+Flashing example for this keyboard:
+
+    make sf2040: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
+
+**Bootmagic reset**: To enter the bootloader, hold down the key at (0,0) in the matrix (the top left key or Escape) and plug in the keyboard.
diff --git a/keyboards/sf2040/rules.mk b/keyboards/sf2040/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/sf2040/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/sha/config.h b/keyboards/sha/config.h
new file mode 100644
index 00000000000..f936d7b4737
--- /dev/null
+++ b/keyboards/sha/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Steven Karrmann (@skarrmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
\ No newline at end of file
diff --git a/keyboards/sha/info.json b/keyboards/sha/info.json
new file mode 100644
index 00000000000..8bb4091843a
--- /dev/null
+++ b/keyboards/sha/info.json
@@ -0,0 +1,107 @@
+{
+    "manufacturer": "Steven Karrmann",
+    "keyboard_name": "Sha",
+    "maintainer": "skarrmann",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14"],
+        "rows": ["GP28", "GP4", "GP27", "GP5", "GP26", "GP6", "GP15", "GP7"]
+    },
+    "processor": "RP2040",
+    "rgblight": {
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "val": 0
+        },
+        "led_count": 25,
+        "max_brightness": 24,
+        "sleep": true
+    },
+    "url": "https://github.com/skarrmann/sha",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP16"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [1, 1], "x": 8, "y": 0},
+                {"matrix": [1, 2], "x": 9, "y": 0},
+                {"matrix": [1, 3], "x": 10, "y": 0},
+                {"matrix": [1, 4], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [2, 1], "x": 1, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 1},
+                {"matrix": [2, 3], "x": 3, "y": 1},
+                {"matrix": [2, 4], "x": 4, "y": 1},
+                {"matrix": [2, 5], "x": 5, "y": 1},
+                {"matrix": [3, 1], "x": 8, "y": 1},
+                {"matrix": [3, 2], "x": 9, "y": 1},
+                {"matrix": [3, 3], "x": 10, "y": 1},
+                {"matrix": [3, 4], "x": 11, "y": 1},
+                {"matrix": [3, 5], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [4, 1], "x": 1, "y": 2},
+                {"matrix": [4, 2], "x": 2, "y": 2},
+                {"matrix": [4, 3], "x": 3, "y": 2},
+                {"matrix": [4, 4], "x": 4, "y": 2},
+                {"matrix": [4, 5], "x": 5, "y": 2},
+                {"matrix": [5, 1], "x": 8, "y": 2},
+                {"matrix": [5, 2], "x": 9, "y": 2},
+                {"matrix": [5, 3], "x": 10, "y": 2},
+                {"matrix": [5, 4], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [5, 6], "x": 13, "y": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+                {"matrix": [6, 5], "x": 5, "y": 3},
+                {"matrix": [6, 6], "x": 6, "y": 3},
+                {"matrix": [7, 0], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 3], "x": 10, "y": 3},
+                {"matrix": [7, 4], "x": 11, "y": 3},
+                {"matrix": [7, 5], "x": 12, "y": 3},
+                {"matrix": [7, 6], "x": 13, "y": 3}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/sha/keymaps/default/config.h b/keyboards/sha/keymaps/default/config.h
new file mode 100644
index 00000000000..12d21f94ccc
--- /dev/null
+++ b/keyboards/sha/keymaps/default/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Steven Karrmann (@skarrmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
\ No newline at end of file
diff --git a/keyboards/sha/keymaps/default/keymap.c b/keyboards/sha/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f3a2bbf3659
--- /dev/null
+++ b/keyboards/sha/keymaps/default/keymap.c
@@ -0,0 +1,90 @@
+// Copyright 2023 Steven Karrmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _SYMBOL,
+    _FUNCTION
+};
+
+#define SYM_TAB LT(_SYMBOL, KC_TAB)
+#define FUN_SPC LT(_FUNCTION, KC_SPC)
+#define QWERTY DF(_QWERTY)
+#define COLEMAK DF(_COLEMAK)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_GRV , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                   KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_MINS,
+        KC_EQL , 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_LCTL, KC_LALT, KC_LGUI, KC_APP , KC_DEL , SYM_TAB, KC_ESC , KC_ENT , FUN_SPC, KC_BSPC, KC_APP , KC_RGUI, KC_RALT, KC_RCTL
+    ),
+    [_COLEMAK] = LAYOUT(
+        KC_GRV , KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   ,                   KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_MINS,
+        KC_EQL , 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_LCTL, KC_LALT, KC_LGUI, KC_APP , KC_DEL , SYM_TAB, KC_ESC , KC_ENT , FUN_SPC, KC_BSPC, KC_APP , KC_RGUI, KC_RALT, KC_RCTL
+    ),
+    [_SYMBOL] = LAYOUT(
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                   KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_UNDS,
+        KC_PLUS, KC_EXLM, KC_LPRN, KC_RPRN, KC_DLR , KC_AMPR,                   KC_PIPE, KC_HASH, KC_LCBR, KC_RCBR, KC_COLN, KC_DQUO,
+        _______, KC_AT  , KC_LBRC, KC_RBRC, KC_BSLS, KC_PERC,                   KC_CIRC, KC_ASTR, KC_LABK, KC_RABK, KC_QUES, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [_FUNCTION] = LAYOUT(
+        QK_BOOT, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_PSCR,                   KC_SCRL, KC_HOME, KC_PGDN, KC_PGUP, KC_END , QWERTY ,
+        _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_INS ,                   KC_CAPS, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, COLEMAK,
+        _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , RGB_TOG,                   KC_NUM , KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
+
+const rgblight_segment_t PROGMEM rgb_scroll_lock[] = RGBLIGHT_LAYER_SEGMENTS(
+    {6, 3, HSV_BLUE}
+);
+const rgblight_segment_t PROGMEM rgb_caps_lock[] = RGBLIGHT_LAYER_SEGMENTS(
+    {11, 3, HSV_GREEN}
+);
+const rgblight_segment_t PROGMEM rgb_num_lock[] = RGBLIGHT_LAYER_SEGMENTS(
+    {16, 3, HSV_RED}
+);
+const rgblight_segment_t PROGMEM rgb_qwerty[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 6,  HSV_YELLOW},
+    {9, 2,  HSV_YELLOW},
+    {14, 2, HSV_YELLOW},
+    {19, 6, HSV_YELLOW}
+);
+const rgblight_segment_t PROGMEM rgb_colemak[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 6,  HSV_CYAN},
+    {9, 2,  HSV_CYAN},
+    {14, 2, HSV_CYAN},
+    {19, 6, HSV_CYAN}
+);
+
+const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    rgb_scroll_lock,
+    rgb_caps_lock,
+    rgb_num_lock,
+    rgb_qwerty,
+    rgb_colemak
+);
+
+void keyboard_post_init_user(void) {
+    rgblight_layers = rgb_layers;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.scroll_lock);
+    rgblight_set_layer_state(1, led_state.caps_lock);
+    rgblight_set_layer_state(2, led_state.num_lock);
+    return true;
+}
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(3, layer_state_cmp(state, _QWERTY));
+    rgblight_set_layer_state(4, layer_state_cmp(state, _COLEMAK));
+    return state;
+}
\ No newline at end of file
diff --git a/keyboards/sha/keymaps/default/readme.md b/keyboards/sha/keymaps/default/readme.md
new file mode 100644
index 00000000000..0ff118c21a2
--- /dev/null
+++ b/keyboards/sha/keymaps/default/readme.md
@@ -0,0 +1,13 @@
+# Sha Default Keymap
+
+The default keymap uses a QWERTY base layout, with a secondary Colemak base layout. Both layouts have symbol placement adjustments on the outer columns, and editing keys and layers on the thumb keys.
+
+There are two extended layers:
+
+* SYMBOL: For typing additional symbols. Activated by layer-tap on the main left thumb key.
+* FUNCTION: For function and navigation keys. Activated by layer-tap on the main right thumb key.
+
+When using a Waveshare RP2040-Matrix, the [RGB Light - Lighting Layers](https://docs.qmk.fm/#/feature_rgblight?id=lighting-layers) feature is used to demonstrate how the 5x5 RGB LEDs can indicate keyboard state. The indicators are:
+
+* Base layer on the outer LED ring: QWERTY = yellow, Colemak = cyan
+* Lock status indicators using the center 3x3 LEDs: Scroll lock = blue, Caps lock = green, Num lock = red
\ No newline at end of file
diff --git a/keyboards/sha/readme.md b/keyboards/sha/readme.md
new file mode 100644
index 00000000000..ac1b1d970c7
--- /dev/null
+++ b/keyboards/sha/readme.md
@@ -0,0 +1,27 @@
+# Sha
+
+![Sha](https://i.imgur.com/4yuQwRXh.jpg)
+
+Sha is a 50 key ortholinear keyboard, powered by a Waveshare RP2040-Zero or Waveshare RP2040-Matrix.
+
+* Keyboard Maintainer: [Steven Karrmann](https://github.com/skarrmann)
+* Hardware Supported: Sha PCBs with either RP2040-Zero or RP2040-Matrix
+* Hardware Availability: [Sha GitHub repository](https://github.com/skarrmann/sha)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sha:default
+
+Flashing example for this keyboard:
+
+    make sha: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 (the top left key) and plug in the keyboard.
+* **Physical reset button**: Doublet-tap the EN/RESET button on the MCU board.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/sha/rules.mk b/keyboards/sha/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/sha/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/flygone60/rev3/config.h b/keyboards/shandoncodes/flygone60/rev3/config.h
similarity index 100%
rename from keyboards/flygone60/rev3/config.h
rename to keyboards/shandoncodes/flygone60/rev3/config.h
diff --git a/keyboards/flygone60/rev3/info.json b/keyboards/shandoncodes/flygone60/rev3/info.json
similarity index 100%
rename from keyboards/flygone60/rev3/info.json
rename to keyboards/shandoncodes/flygone60/rev3/info.json
diff --git a/keyboards/flygone60/rev3/keymaps/default/keymap.c b/keyboards/shandoncodes/flygone60/rev3/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/flygone60/rev3/keymaps/default/keymap.c
rename to keyboards/shandoncodes/flygone60/rev3/keymaps/default/keymap.c
diff --git a/keyboards/flygone60/rev3/keymaps/default/readme.md b/keyboards/shandoncodes/flygone60/rev3/keymaps/default/readme.md
similarity index 100%
rename from keyboards/flygone60/rev3/keymaps/default/readme.md
rename to keyboards/shandoncodes/flygone60/rev3/keymaps/default/readme.md
diff --git a/keyboards/flygone60/rev3/keymaps/via/keymap.c b/keyboards/shandoncodes/flygone60/rev3/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/flygone60/rev3/keymaps/via/keymap.c
rename to keyboards/shandoncodes/flygone60/rev3/keymaps/via/keymap.c
diff --git a/keyboards/shandoncodes/flygone60/rev3/keymaps/via/rules.mk b/keyboards/shandoncodes/flygone60/rev3/keymaps/via/rules.mk
new file mode 100644
index 00000000000..43061db1dd4
--- /dev/null
+++ b/keyboards/shandoncodes/flygone60/rev3/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/shandoncodes/flygone60/rev3/readme.md b/keyboards/shandoncodes/flygone60/rev3/readme.md
new file mode 100644
index 00000000000..4bb24386023
--- /dev/null
+++ b/keyboards/shandoncodes/flygone60/rev3/readme.md
@@ -0,0 +1,19 @@
+# flygone60
+
+![Flygone60](https://i.imgur.com/x63gMG2h.jpeg)
+
+A 60% that takes arrow keys seriously!
+
+* Keyboard Maintainer: [ShandonCodes](https://github.com/ShandonCodes)
+* Hardware Supported: Flygone60
+* Hardware Availability: [Kit](https://www.etsy.com/listing/1025415290/flygone60-keyboard-kit?ga_order=most_relevant&ga_search_type=all&ga_view_type=gallery&ga_search_query=flygone60&ref=sr_gallery-1-13&organic_search_click=1&frs=1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make shandoncodes/flygone60/rev3:default
+
+Flashing example for this keyboard:
+
+    make shandoncodes/flygone60/rev3: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/flygone60/rev3/rules.mk b/keyboards/shandoncodes/flygone60/rev3/rules.mk
similarity index 100%
rename from keyboards/flygone60/rev3/rules.mk
rename to keyboards/shandoncodes/flygone60/rev3/rules.mk
diff --git a/keyboards/mino/hotswap/config.h b/keyboards/shandoncodes/mino/hotswap/config.h
similarity index 100%
rename from keyboards/mino/hotswap/config.h
rename to keyboards/shandoncodes/mino/hotswap/config.h
diff --git a/keyboards/mino/hotswap/info.json b/keyboards/shandoncodes/mino/hotswap/info.json
similarity index 100%
rename from keyboards/mino/hotswap/info.json
rename to keyboards/shandoncodes/mino/hotswap/info.json
diff --git a/keyboards/mino/hotswap/rules.mk b/keyboards/shandoncodes/mino/hotswap/rules.mk
similarity index 100%
rename from keyboards/mino/hotswap/rules.mk
rename to keyboards/shandoncodes/mino/hotswap/rules.mk
diff --git a/keyboards/mino/keymaps/default/keymap.c b/keyboards/shandoncodes/mino/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mino/keymaps/default/keymap.c
rename to keyboards/shandoncodes/mino/keymaps/default/keymap.c
diff --git a/keyboards/mino/keymaps/via/keymap.c b/keyboards/shandoncodes/mino/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mino/keymaps/via/keymap.c
rename to keyboards/shandoncodes/mino/keymaps/via/keymap.c
diff --git a/keyboards/mino/keymaps/via/rules.mk b/keyboards/shandoncodes/mino/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mino/keymaps/via/rules.mk
rename to keyboards/shandoncodes/mino/keymaps/via/rules.mk
diff --git a/keyboards/shandoncodes/mino/readme.md b/keyboards/shandoncodes/mino/readme.md
new file mode 100644
index 00000000000..7ccb70662b0
--- /dev/null
+++ b/keyboards/shandoncodes/mino/readme.md
@@ -0,0 +1,27 @@
+# mino
+
+![Mino](https://i.imgur.com/f5kHu8Qh.jpg)
+
+A 47 key board with a retro twist.
+
+* Keyboard Maintainer: [ShandonCodes](https://github.com/ShandonCodes)
+* Hardware Supported: Mino PCB
+* Hardware Availability: Groupbuy
+
+## 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 `QK_BOOT` if it is available. For the default keymap it is the middle spacebar on the second layer.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make shandoncodes/mino/hotswap:default
+
+Flashing example for this keyboard:
+
+    make shandoncodes/mino/hotswap: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/mino_plus/hotswap/config.h b/keyboards/shandoncodes/mino_plus/hotswap/config.h
similarity index 100%
rename from keyboards/mino_plus/hotswap/config.h
rename to keyboards/shandoncodes/mino_plus/hotswap/config.h
diff --git a/keyboards/mino_plus/hotswap/halconf.h b/keyboards/shandoncodes/mino_plus/hotswap/halconf.h
similarity index 100%
rename from keyboards/mino_plus/hotswap/halconf.h
rename to keyboards/shandoncodes/mino_plus/hotswap/halconf.h
diff --git a/keyboards/mino_plus/hotswap/hotswap.c b/keyboards/shandoncodes/mino_plus/hotswap/hotswap.c
similarity index 100%
rename from keyboards/mino_plus/hotswap/hotswap.c
rename to keyboards/shandoncodes/mino_plus/hotswap/hotswap.c
diff --git a/keyboards/mino_plus/hotswap/info.json b/keyboards/shandoncodes/mino_plus/hotswap/info.json
similarity index 100%
rename from keyboards/mino_plus/hotswap/info.json
rename to keyboards/shandoncodes/mino_plus/hotswap/info.json
diff --git a/keyboards/mino_plus/hotswap/keymaps/default/keymap.c b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mino_plus/hotswap/keymaps/default/keymap.c
rename to keyboards/shandoncodes/mino_plus/hotswap/keymaps/default/keymap.c
diff --git a/keyboards/mino_plus/hotswap/keymaps/via/keymap.c b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mino_plus/hotswap/keymaps/via/keymap.c
rename to keyboards/shandoncodes/mino_plus/hotswap/keymaps/via/keymap.c
diff --git a/keyboards/shandoncodes/mino_plus/hotswap/keymaps/via/rules.mk b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/shandoncodes/mino_plus/hotswap/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mino_plus/hotswap/mcuconf.h b/keyboards/shandoncodes/mino_plus/hotswap/mcuconf.h
similarity index 100%
rename from keyboards/mino_plus/hotswap/mcuconf.h
rename to keyboards/shandoncodes/mino_plus/hotswap/mcuconf.h
diff --git a/keyboards/mino_plus/hotswap/rules.mk b/keyboards/shandoncodes/mino_plus/hotswap/rules.mk
similarity index 100%
rename from keyboards/mino_plus/hotswap/rules.mk
rename to keyboards/shandoncodes/mino_plus/hotswap/rules.mk
diff --git a/keyboards/mino_plus/mino_plus.c b/keyboards/shandoncodes/mino_plus/mino_plus.c
similarity index 97%
rename from keyboards/mino_plus/mino_plus.c
rename to keyboards/shandoncodes/mino_plus/mino_plus.c
index cd651b6d171..0763a5292b7 100644
--- a/keyboards/mino_plus/mino_plus.c
+++ b/keyboards/shandoncodes/mino_plus/mino_plus.c
@@ -3,13 +3,13 @@
 #include "quantum.h"
 
 #ifdef OLED_ENABLE
-#define FRAMES 5
-#define ANIMATION_SIZE 512
-#define TAP_SPEED 30
+#    define FRAMES 5
+#    define ANIMATION_SIZE 512
+#    define TAP_SPEED 30
 
-uint8_t  current_frame = 0;
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
+uint8_t  current_frame       = 0;
+uint32_t anim_timer          = 0;
+uint32_t anim_sleep          = 0;
 uint32_t ANIM_FRAME_DURATION = 1000;
 
 static void render_animation(void) {
@@ -191,8 +191,8 @@ static void render_animation(void) {
     }
 
     if (get_current_wpm() != 000) {
-        oled_on();  // not essential but turns on animation OLED with any alpha keypress
-        if (get_current_wpm() > TAP_SPEED){
+        oled_on(); // not essential but turns on animation OLED with any alpha keypress
+        if (get_current_wpm() > TAP_SPEED) {
             ANIM_FRAME_DURATION = 100;
         } else {
             ANIM_FRAME_DURATION = 1000;
@@ -233,16 +233,19 @@ static void render_status(void) {
 }
 
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
-        return OLED_ROTATION_270; 
+    return OLED_ROTATION_270;
 }
 
 bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
     render_animation();
     render_status();
 
     oled_write_ln_P(PSTR("WPM:"), false);
     oled_write_ln(get_u8_str(get_current_wpm(), '0'), false);
 
-    return false;
+    return true;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/shandoncodes/mino_plus/readme.md b/keyboards/shandoncodes/mino_plus/readme.md
new file mode 100644
index 00000000000..8f2b06fa3cf
--- /dev/null
+++ b/keyboards/shandoncodes/mino_plus/readme.md
@@ -0,0 +1,29 @@
+# mino_plus
+
+![mino_plus](https://i.imgur.com/vZJ6kaNh.jpg)
+
+A 65% keyboard, inspried by tetrominos.
+
+* Keyboard Maintainer: [ShandonCodes](https://github.com/ShandonCodes)
+* Hardware Supported: Mino Plus PCB
+* Hardware Availability: https://store.shandon.codes/mino-plus/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make shandoncodes/mino_plus/soldered:default
+    make shandoncodes/mino_plus/hotswap:default
+
+Flashing example for this keyboard:
+
+    make shandoncodes/mino_plus/soldered:default:flash
+    make shandoncodes/mino_plus/hotswap: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 `FN` + `R` if it is available.
diff --git a/keyboards/mino_plus/soldered/config.h b/keyboards/shandoncodes/mino_plus/soldered/config.h
similarity index 100%
rename from keyboards/mino_plus/soldered/config.h
rename to keyboards/shandoncodes/mino_plus/soldered/config.h
diff --git a/keyboards/mino_plus/soldered/halconf.h b/keyboards/shandoncodes/mino_plus/soldered/halconf.h
similarity index 100%
rename from keyboards/mino_plus/soldered/halconf.h
rename to keyboards/shandoncodes/mino_plus/soldered/halconf.h
diff --git a/keyboards/mino_plus/soldered/info.json b/keyboards/shandoncodes/mino_plus/soldered/info.json
similarity index 100%
rename from keyboards/mino_plus/soldered/info.json
rename to keyboards/shandoncodes/mino_plus/soldered/info.json
diff --git a/keyboards/mino_plus/soldered/keymaps/default/keymap.c b/keyboards/shandoncodes/mino_plus/soldered/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mino_plus/soldered/keymaps/default/keymap.c
rename to keyboards/shandoncodes/mino_plus/soldered/keymaps/default/keymap.c
diff --git a/keyboards/mino_plus/soldered/keymaps/via/keymap.c b/keyboards/shandoncodes/mino_plus/soldered/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mino_plus/soldered/keymaps/via/keymap.c
rename to keyboards/shandoncodes/mino_plus/soldered/keymaps/via/keymap.c
diff --git a/keyboards/shandoncodes/mino_plus/soldered/keymaps/via/rules.mk b/keyboards/shandoncodes/mino_plus/soldered/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/shandoncodes/mino_plus/soldered/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mino_plus/soldered/mcuconf.h b/keyboards/shandoncodes/mino_plus/soldered/mcuconf.h
similarity index 100%
rename from keyboards/mino_plus/soldered/mcuconf.h
rename to keyboards/shandoncodes/mino_plus/soldered/mcuconf.h
diff --git a/keyboards/mino_plus/soldered/rules.mk b/keyboards/shandoncodes/mino_plus/soldered/rules.mk
similarity index 100%
rename from keyboards/mino_plus/soldered/rules.mk
rename to keyboards/shandoncodes/mino_plus/soldered/rules.mk
diff --git a/keyboards/mino_plus/soldered/soldered.c b/keyboards/shandoncodes/mino_plus/soldered/soldered.c
similarity index 100%
rename from keyboards/mino_plus/soldered/soldered.c
rename to keyboards/shandoncodes/mino_plus/soldered/soldered.c
diff --git a/keyboards/riot_pad/config.h b/keyboards/shandoncodes/riot_pad/config.h
similarity index 100%
rename from keyboards/riot_pad/config.h
rename to keyboards/shandoncodes/riot_pad/config.h
diff --git a/keyboards/riot_pad/halconf.h b/keyboards/shandoncodes/riot_pad/halconf.h
similarity index 100%
rename from keyboards/riot_pad/halconf.h
rename to keyboards/shandoncodes/riot_pad/halconf.h
diff --git a/keyboards/riot_pad/info.json b/keyboards/shandoncodes/riot_pad/info.json
similarity index 100%
rename from keyboards/riot_pad/info.json
rename to keyboards/shandoncodes/riot_pad/info.json
diff --git a/keyboards/riot_pad/keymaps/default/keymap.c b/keyboards/shandoncodes/riot_pad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/riot_pad/keymaps/default/keymap.c
rename to keyboards/shandoncodes/riot_pad/keymaps/default/keymap.c
diff --git a/keyboards/riot_pad/keymaps/via/keymap.c b/keyboards/shandoncodes/riot_pad/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/riot_pad/keymaps/via/keymap.c
rename to keyboards/shandoncodes/riot_pad/keymaps/via/keymap.c
diff --git a/keyboards/shandoncodes/riot_pad/keymaps/via/rules.mk b/keyboards/shandoncodes/riot_pad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/shandoncodes/riot_pad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/riot_pad/mcuconf.h b/keyboards/shandoncodes/riot_pad/mcuconf.h
similarity index 100%
rename from keyboards/riot_pad/mcuconf.h
rename to keyboards/shandoncodes/riot_pad/mcuconf.h
diff --git a/keyboards/shandoncodes/riot_pad/readme.md b/keyboards/shandoncodes/riot_pad/readme.md
new file mode 100644
index 00000000000..ce5f8742131
--- /dev/null
+++ b/keyboards/shandoncodes/riot_pad/readme.md
@@ -0,0 +1,25 @@
+# riot_pad
+
+![riot_pad](https://i.imgur.com/zH6H3pSh.png)
+
+A RGB lovin', 6 key macropad.
+
+* Keyboard Maintainer: [ShandonCodes](https://github.com/ShandonCodes)
+* Hardware Supported: RiotPad PCB
+* Hardware Availability: [Limited Groupbuy](https://store.shandon.codes/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make shandoncodes/riot_pad:default
+
+Flashing example for this keyboard:
+
+    make shandoncodes/riot_pad: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 (top left key) and plug in the keyboard
diff --git a/keyboards/shandoncodes/riot_pad/rules.mk b/keyboards/shandoncodes/riot_pad/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/shandoncodes/riot_pad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/shapeshifter4060/keymaps/debug/keymap.c b/keyboards/shapeshifter4060/keymaps/debug/keymap.c
deleted file mode 100644
index 06f9d8ea8f4..00000000000
--- a/keyboards/shapeshifter4060/keymaps/debug/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2021 Chuck "@vosechu" Lauer Vose <vosechu@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] = {
-  /* ============================= DEBUG LAYER ============================= */
-  [0] = LAYOUT(
-    KC_A, KC_1, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
-    KC_A, KC_2, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
-    KC_A, KC_3, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
-    KC_A, KC_4, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L
-  )
-};
diff --git a/keyboards/shapeshifter4060/keymaps/debug/readme.md b/keyboards/shapeshifter4060/keymaps/debug/readme.md
deleted file mode 100644
index b0b5ec75662..00000000000
--- a/keyboards/shapeshifter4060/keymaps/debug/readme.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Debug layout
-
-This layout is expressly for debugging to see if your keys are working.
-
-## Flashing
-
-**NOTE**: Make sure you don't have a second QMK keyboard plugged in when you do this!
-
-To compile and flash to the board:
-
-    make shapeshifter4060:debug:avrdude
-    
-If you want to use this with a Proton C, do this instead:
-
-    make shapeshifter4060:debug CONVERT_TO=proton_c
-
-To just compile:
-
-    make shapeshifter4060:debug
-
-Then use QMK toolbox to write the file
-
-# Testing
-
-Now that you've got the image flashed, do the following:
-
-* Open a new text document
-* Click each key in order and hit enter (with the other keyboard) between each line
-* For any keys that don't register, hit space (with the other keyboard) and continue on
-* You'll end up with something looking like this:
-
-    a1bcdefghijkl
-    a2bcdefghijkl
-    a3bcdefghijkl
-    a4bcdefghijkl
-
-But almost certainly it won't be perfect, so lets go through some scenarios:
-
-## Step 1: Get all the letters to output _something_
-
-For lines that look like this:
-
-    a1bc efg ijkl
-
-* Option 1: Bent pin - Pull out the switch in those spots, probably the pin got bent when you inserted it into the hotswap socket. Gently bend the pin straight and re-insert.
-* Option 2: Broken joint on hotswap - If the pin looks okay, try connecting the two metal plated holes underneath the hotswap holes to see if the letter comes out. If it does, reflow (aka, apply some flux to both pads and reheat) the solder joint.
-* Option 3: Diode is backwards - If connecting the two metal pins didn't work, double check that the diode is the right direction. This may also need to be reflowed.
-* Option 4: ??? - Hop in [the discord]() and let's chat!
-
-## Step 2: Correct double letters
-
-Once you have all the keys outputting _anything_, flash the default layout and do the same thing. If everything is working, your layout will look something like this:
-
-    qwertyuiop
-    asdfghjkl;'
-    zxcvbnm,./
-
-**Note**: Don't worry about hitting the backspace or command keys
-
-### Duplicate letters
-
-For lines that look like this:
-
-    qwertyyuiop (double y)
-
-* Option 1: Bent pin - Pull out the switch in those spots, probably the pin got bent when you inserted it into the hotswap socket. Gently bend the pin straight and re-insert.
-* Option 2: Switch is broken - Try connecting the two metal plated holes underneath the hotswap holes to see if the letter comes out just once. If it does, the switch is broken and should be replaced. If you don't have another switch, you _may_ be able to unbend the leaf inside the switch, but it's really tricky.
-
-### Second letter sent (same row)
-
-For lines that look like this:
-
-    qwertyyuiop (t sent t AND y)
-
-* Option 1: ??? - I can't imagine how this would happen with this layout, but let me know if it does!
-
-### Second letter sent (same column)
-
-For lines that look like this:
-
-    qwertgyuiop (t sent t AND g)
-    qwertgbyuiop (t sent t AND g AND b)
-
-* Option 1: Diodes are backwards - Some of the diodes on this column are backwards, you can use a diode tester to confirm the direction, or just check them with a magnifying glass and switch them if needed.
-* Option 2: ???
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/config.h b/keyboards/sharkoon/skiller_sgk50_s2/config.h
new file mode 100644
index 00000000000..1d0f8f9a901
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/config.h
@@ -0,0 +1,13 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/halconf.h b/keyboards/sharkoon/skiller_sgk50_s2/halconf.h
new file mode 100644
index 00000000000..9d456a5106f
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/info.json b/keyboards/sharkoon/skiller_sgk50_s2/info.json
new file mode 100644
index 00000000000..39d59ffa55a
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/info.json
@@ -0,0 +1,515 @@
+{
+    "manufacturer": "Sharkoon Technologies GmbH",
+    "keyboard_name": "SKILLER SGK50 S2",
+    "maintainer": "JoyLee",
+    "bootloader": "wb32-dfu",
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "backing_size": 4096,
+            "driver": "spi_flash"
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C4", "C5", "B0"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "C13"]
+    },
+    "processor": "WB32FQ95",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "val": 80
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [5, 6], "x": 75, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 124, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 137, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 149, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 162, "y": 64, "flags": 4},
+            {"matrix": [5, 14], "x": 174, "y": 64, "flags": 4},
+            {"matrix": [5, 15], "x": 187, "y": 64, "flags": 4},
+            {"matrix": [5, 16], "x": 199, "y": 64, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 64, "flags": 4},
+            {"matrix": [4, 18], "x": 224, "y": 51, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 51, "flags": 4},
+            {"matrix": [4, 16], "x": 199, "y": 51, "flags": 4},
+            {"matrix": [4, 15], "x": 187, "y": 51, "flags": 4},
+            {"matrix": [4, 14], "x": 174, "y": 51, "flags": 4},
+            {"matrix": [4, 12], "x": 149, "y": 51, "flags": 4},
+            {"matrix": [4, 11], "x": 137, "y": 51, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 51, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 51, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 51, "flags": 4},
+            {"matrix": [4, 7], "x": 87, "y": 51, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 51, "flags": 4},
+            {"matrix": [4, 5], "x": 62, "y": 51, "flags": 4},
+            {"matrix": [4, 4], "x": 50, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 37, "y": 51, "flags": 4},
+            {"matrix": [4, 2], "x": 25, "y": 51, "flags": 4},
+            {"matrix": [3, 2], "x": 25, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 37, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 50, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 62, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 75, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 87, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 100, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 112, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 124, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 137, "y": 38, "flags": 4},
+            {"matrix": [3, 12], "x": 149, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 162, "y": 38, "flags": 4},
+            {"x": 162, "y": 38, "flags": 4},
+            {"matrix": [3, 15], "x": 187, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 199, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 18], "x": 224, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 199, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 187, "y": 26, "flags": 4},
+            {"x": 162, "y": 26, "flags": 4},
+            {"matrix": [3, 13], "x": 162, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 149, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 137, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 124, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 112, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 100, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 87, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 75, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 62, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 50, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 25, "y": 26, "flags": 4},
+            {"matrix": [2, 1], "x": 12, "y": 26, "flags": 4},
+            {"matrix": [1, 1], "x": 12, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 25, "y": 13, "flags": 4},
+            {"matrix": [1, 3], "x": 37, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 50, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 62, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 75, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 87, "y": 13, "flags": 4},
+            {"matrix": [1, 8], "x": 100, "y": 13, "flags": 4},
+            {"matrix": [1, 9], "x": 112, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 124, "y": 13, "flags": 4},
+            {"matrix": [1, 11], "x": 137, "y": 13, "flags": 4},
+            {"matrix": [1, 12], "x": 149, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 162, "y": 13, "flags": 4},
+            {"matrix": [1, 15], "x": 187, "y": 13, "flags": 4},
+            {"matrix": [1, 16], "x": 199, "y": 13, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 13, "flags": 4},
+            {"matrix": [1, 18], "x": 224, "y": 13, "flags": 4},
+            {"matrix": [0, 18], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [0, 17], "x": 212, "y": 0, "flags": 4},
+            {"matrix": [0, 16], "x": 199, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 187, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 174, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 162, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 149, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 137, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 100, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 87, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 62, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 37, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 25, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 12, "y": 0, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1},
+            {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1},
+            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 12, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 25, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 12, "y": 51, "flags": 4}
+        ],
+        "max_brightness": 110,
+        "val_steps": 28,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3662",
+        "suspend_wakeup_delay": 1000,
+        "vid": "0x6332"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": ["96_ansi", "96_iso"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [0, 18], "x": 18, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+                {"matrix": [1, 17], "x": 17, "y": 1},
+                {"matrix": [1, 18], "x": 18, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+                {"matrix": [2, 17], "x": 17, "y": 2},
+                {"matrix": [2, 18], "x": 18, "y": 2, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [3, 17], "x": 17, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4},
+                {"matrix": [4, 17], "x": 17, "y": 4},
+                {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5},
+                {"matrix": [5, 16], "x": 16, "y": 5},
+                {"matrix": [5, 17], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [0, 18], "x": 18, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+                {"matrix": [1, 17], "x": 17, "y": 1},
+                {"matrix": [1, 18], "x": 18, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+                {"matrix": [2, 17], "x": 17, "y": 2},
+                {"matrix": [2, 18], "x": 18, "y": 2, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [3, 17], "x": 17, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4},
+                {"matrix": [4, 17], "x": 17, "y": 4},
+                {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5},
+                {"matrix": [5, 16], "x": 16, "y": 5},
+                {"matrix": [5, 17], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [0, 18], "x": 18, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+                {"matrix": [1, 17], "x": 17, "y": 1},
+                {"matrix": [1, 18], "x": 18, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+                {"matrix": [2, 17], "x": 17, "y": 2},
+                {"matrix": [2, 18], "x": 18, "y": 2, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [3, 17], "x": 17, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4},
+                {"matrix": [4, 17], "x": 17, "y": 4},
+                {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5},
+                {"matrix": [5, 16], "x": 16, "y": 5},
+                {"matrix": [5, 17], "x": 17, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..01e78f31240
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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_PAUS, KC_HOME, KC_END,    KC_PGUP,  KC_PGDN,  KC_DEL,
+        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_NUM,    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_BSLS,          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_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_all(
+        EE_CLR,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,  KC_VOLD, KC_VOLU, RGB_SPD,  RGB_SPI,  _______, _______, KC_PSCR, KC_SCRL, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______, RGB_VAI, _______, _______, _______, _______,
+        _______, GU_TOGG, _______,                             _______,                              _______, _______, _______, RGB_HUI, RGB_VAD, RGB_MOD, _______, _______
+    ),
+};
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..01e78f31240
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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_PAUS, KC_HOME, KC_END,    KC_PGUP,  KC_PGDN,  KC_DEL,
+        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_NUM,    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_BSLS,          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_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_all(
+        EE_CLR,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,  KC_VOLD, KC_VOLU, RGB_SPD,  RGB_SPI,  _______, _______, KC_PSCR, KC_SCRL, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______, RGB_VAI, _______, _______, _______, _______,
+        _______, GU_TOGG, _______,                             _______,                              _______, _______, _______, RGB_HUI, RGB_VAD, RGB_MOD, _______, _______
+    ),
+};
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h b/keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h
new file mode 100644
index 00000000000..ae7ee58001a
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/readme.md b/keyboards/sharkoon/skiller_sgk50_s2/readme.md
new file mode 100644
index 00000000000..7be331eac5b
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/readme.md
@@ -0,0 +1,24 @@
+# SHARKOON SKILLER SGK50 S2
+
+![ISO](https://i.imgur.com/itgy5Bk.png)
+
+* Keyboard Maintainer: [JoyLee](https://github.com/itarze)
+* Hardware Supported: [SHARKOON SKILLER SGK50 S2 PCB](https://zh-hant.sharkoon.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sharkoon/skiller_sgk50_s2:default
+
+Flashing example for this keyboard:
+
+    make sharkoon/skiller_sgk50_s2: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 `QK_BOOT` if it is available
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/config.h b/keyboards/sharkoon/skiller_sgk50_s3/config.h
new file mode 100644
index 00000000000..7cc691ea956
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s3/config.h
@@ -0,0 +1,13 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/halconf.h b/keyboards/sharkoon/skiller_sgk50_s3/halconf.h
new file mode 100644
index 00000000000..8760386e815
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s3/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/info.json b/keyboards/sharkoon/skiller_sgk50_s3/info.json
new file mode 100644
index 00000000000..0b228b034b6
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s3/info.json
@@ -0,0 +1,455 @@
+{
+    "manufacturer": "Sharkoon Technologies GmbH",
+    "keyboard_name": "SKILLER SGK50 S3",
+    "maintainer": "JoyLee",
+    "bootloader": "wb32-dfu",
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "C13"]
+    },
+    "processor": "WB32FQ95",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "val": 80
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [5, 6], "x": 90, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 149, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 164, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 179, "y": 64, "flags": 4},
+            {"matrix": [5, 13], "x": 194, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1},
+            {"matrix": [4, 15], "x": 224, "y": 51, "flags": 4},
+            {"matrix": [4, 14], "x": 209, "y": 51, "flags": 1},
+            {"matrix": [4, 12], "x": 179, "y": 51, "flags": 1},
+            {"matrix": [4, 11], "x": 164, "y": 51, "flags": 4},
+            {"matrix": [4, 10], "x": 149, "y": 51, "flags": 4},
+            {"matrix": [4, 9], "x": 134, "y": 51, "flags": 4},
+            {"matrix": [4, 8], "x": 119, "y": 51, "flags": 4},
+            {"matrix": [4, 7], "x": 105, "y": 51, "flags": 4},
+            {"matrix": [4, 6], "x": 90, "y": 51, "flags": 4},
+            {"matrix": [4, 5], "x": 75, "y": 51, "flags": 4},
+            {"matrix": [4, 4], "x": 60, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 45, "y": 51, "flags": 4},
+            {"matrix": [4, 2], "x": 30, "y": 51, "flags": 4},
+            {"matrix": [3, 2], "x": 30, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 60, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 75, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 90, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 105, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 119, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 134, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 149, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 164, "y": 38, "flags": 4},
+            {"matrix": [3, 12], "x": 179, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 194, "y": 38, "flags": 4},
+            {"x": 194, "y": 38, "flags": 4},
+            {"matrix": [3, 15], "x": 224, "y": 38, "flags": 4},
+            {"matrix": [2, 15], "x": 224, "y": 26, "flags": 4},
+            {"x": 194, "y": 26, "flags": 4},
+            {"matrix": [3, 13], "x": 194, "y": 26, "flags": 1},
+            {"matrix": [2, 12], "x": 179, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 164, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 149, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 134, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 119, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 105, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 90, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 75, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 60, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 45, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 1], "x": 15, "y": 26, "flags": 4},
+            {"matrix": [1, 1], "x": 15, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 30, "y": 13, "flags": 4},
+            {"matrix": [1, 3], "x": 45, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 60, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 75, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 90, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 105, "y": 13, "flags": 4},
+            {"matrix": [1, 8], "x": 119, "y": 13, "flags": 4},
+            {"matrix": [1, 9], "x": 134, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 149, "y": 13, "flags": 4},
+            {"matrix": [1, 11], "x": 164, "y": 13, "flags": 4},
+            {"matrix": [1, 12], "x": 179, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 194, "y": 13, "flags": 4},
+            {"matrix": [1, 15], "x": 224, "y": 13, "flags": 4},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 209, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 194, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 38, "flags": 1},
+            {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1},
+            {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1},
+            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 15, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 30, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 15, "y": 51, "flags": 4}
+        ],
+        "max_brightness": 110,
+        "val_steps": 28,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3663",
+        "suspend_wakeup_delay": 1000,
+        "vid": "0x6332"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": [
+        "75_ansi",
+        "75_iso"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/keymaps/default/keymap.c b/keyboards/sharkoon/skiller_sgk50_s3/keymaps/default/keymap.c
new file mode 100644
index 00000000000..dd09e560605
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s3/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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_INS,  KC_HOME, KC_DEL,
+        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_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_END,
+        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_WHOM,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_all(
+        EE_CLR,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,  KC_VOLD, KC_VOLU, _______,  _______,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, RGB_SPD, RGB_SPI, _______,          RGB_SAI,
+        _______, _______, KC_UP,   _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          RGB_SAD,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______, RGB_VAI, _______,
+        _______, GU_TOGG, _______,                             _______,                              _______, _______, _______, RGB_HUI, RGB_VAD, RGB_MOD
+    ),
+};
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/keymaps/via/keymap.c b/keyboards/sharkoon/skiller_sgk50_s3/keymaps/via/keymap.c
new file mode 100644
index 00000000000..dd09e560605
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s3/keymaps/via/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+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_INS,  KC_HOME, KC_DEL,
+        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_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_END,
+        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_WHOM,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_all(
+        EE_CLR,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,  KC_VOLD, KC_VOLU, _______,  _______,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, RGB_SPD, RGB_SPI, _______,          RGB_SAI,
+        _______, _______, KC_UP,   _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          RGB_SAD,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______, RGB_VAI, _______,
+        _______, GU_TOGG, _______,                             _______,                              _______, _______, _______, RGB_HUI, RGB_VAD, RGB_MOD
+    ),
+};
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/keymaps/via/rules.mk b/keyboards/sharkoon/skiller_sgk50_s3/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/mcuconf.h b/keyboards/sharkoon/skiller_sgk50_s3/mcuconf.h
new file mode 100644
index 00000000000..ca0e017ebdf
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s3/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/readme.md b/keyboards/sharkoon/skiller_sgk50_s3/readme.md
new file mode 100644
index 00000000000..46bc97d81fb
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s3/readme.md
@@ -0,0 +1,24 @@
+# SHARKOON SKILLER SGK50 S3
+
+![ISO](https://i.imgur.com/q35h8v0h.png)
+
+* Keyboard Maintainer: [JoyLee](https://github.com/itarze)
+* Hardware Supported: SHARKOON SKILLER SGK50 S3 PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sharkoon/skiller_sgk50_s3:default
+
+Flashing example for this keyboard:
+
+    make sharkoon/skiller_sgk50_s3: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 `QK_BOOT` if it is available
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/rules.mk b/keyboards/sharkoon/skiller_sgk50_s3/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s3/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/shoc/keymaps/bongo/keymap.c b/keyboards/shoc/keymaps/bongo/keymap.c
deleted file mode 100644
index 0242e5adad3..00000000000
--- a/keyboards/shoc/keymaps/bongo/keymap.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright 2022 JannikB5825
- *
- * 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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,          KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC, KC_LBRC, 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_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, KC_SLSH, KC_UP,   KC_EQL,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [1] = 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_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC, KC_LBRC, 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_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_COMM, KC_SLSH, KC_UP,   KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT)
-
-
-};
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_0;
-}
-//full credit goes to https://www.reddit.com/user/Pop-X-/ only small feature comforts were added
-
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 30 // below this wpm value your animation will idle
-#define TAP_FRAMES 2
-#define TAP_SPEED 60 // above this wpm value typing animation to triggere
-
-#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
-#define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-// Images credit j-inc(/James Incandenza) and pixelbenny. Credit to obosob for initial animation approach.
-static void render_anim(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-        {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  4,  4,  4,  8, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,100,130,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 56,  4,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  4,  4,  4,  8, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,100,130,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 56,  4,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16,  8,  4,  2,  2,  4, 24, 96,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 60,194,  1,  1,  2,  2,  4,  4,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96, 96,  0,129,130,130,132,  8, 16, 32, 64,128,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 25,  6,  0,  0,  0,  0,  0,  0,  0, 24, 24, 24, 27,  3,  0, 64,160, 34, 36, 20, 18, 18, 18, 11,  8,  8,  8,  8,  5,  5,  9,  9, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  4,  2,  2,  2,  4, 56, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28,226,  1,  1,  2,  2,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        }
-    };
-    static const char PROGMEM prep[][ANIM_SIZE] = {
-        {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,129,128,128,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,  0,  1,225, 26,  6,  9, 49, 53,  1,138,124,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0, 24,  6,  5,152,153,132,195,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  4,  4,  4,  4,  2,  2,  2,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        }
-    };
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-        {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,248,248,248,248,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,129,128,128,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,  0,  1,  1,  2,  4,  8, 16, 32, 67,135,  7,  1,  0,184,188,190,159, 95, 95, 79, 76, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0, 24,  6,  5,152,153,132, 67,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1, 61,124,252,252,252,252,252, 60, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,  0,  1,225, 26,  6,  9, 49, 53,  1,138,124,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  4,  4,  4,  4,  2,  2,  2,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,122,122,121,121,121,121, 57, 49,  2,  2,  4,  4,  8,  8,  8,136,136,135,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 16,  8,  8,  8,  8,  4,  4,  4,  4,  2,  2,  2,  2,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,120,124,254,255, 63,  7,  0,  0,  0,  0,255,255,127,127, 63, 62, 28, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-    };
-
-    //assumes 1 frame prep stage
-    void animation_phase(void) {
-        if(get_current_wpm() <=IDLE_SPEED){
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-         }
-         if(get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED){
-             oled_write_raw_P(prep[0], ANIM_SIZE);
-         }
-         if(get_current_wpm() >=TAP_SPEED){
-             current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-             oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-         }
-    }
-    if(get_current_wpm() != 000) {
-        oled_on();
-        if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {
-        if(timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-
-bool oled_task_user(void) {
-    render_anim();
-    oled_set_cursor(0,6);
-    oled_write_P(PSTR("       WPM: "), false);
-    oled_write(get_u8_str(get_current_wpm(), '0'), false);
-    if(host_keyboard_led_state().caps_lock){
-        oled_set_cursor(0,5);
-        oled_write_P(PSTR("      CAPS  LOCK"), false);
-    }
-    else{
-        oled_set_cursor(0,5);
-        oled_write_P(PSTR("                 "), false);
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/config.h b/keyboards/signum/3_0/keymaps/sgurenkov/config.h
deleted file mode 100644
index 17f6d094795..00000000000
--- a/keyboards/signum/3_0/keymaps/sgurenkov/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.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 ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_TIMEOUT 5000
-#define LEADER_TIMEOUT 600
-#define LEADER_PER_KEY_TIMING 300
-
-// default but used in macros
-#define TAPPING_TERM 300
-
-// Auto Shift and Retro Shift (Auto Shift for Tap Hold).
-#define AUTO_SHIFT_TIMEOUT TAPPING_TERM
-
-// Mouse key speed and acceleration.
-#undef MOUSEKEY_DELAY
-#define MOUSEKEY_DELAY 0
-#undef MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL 16
-#undef MOUSEKEY_WHEEL_DELAY
-#define MOUSEKEY_WHEEL_DELAY 0
-#undef MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_MAX_SPEED 6
-#undef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX 64
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c b/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
deleted file mode 100644
index 9353d28472a..00000000000
--- a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.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
-
-#define M0(kc) MT(MOD_HYPR, kc)
-#define M1(kc) MT(MOD_LGUI, kc)
-#define M2(kc) MT(MOD_LCTL, kc)
-#define M3(kc) MT(MOD_LALT, kc)
-#define M4(kc) MT(MOD_LSFT, kc)
-#define LTH1 LT(L_LEFT, KC_SPC)
-#define LTH2 LT(L_NUM, KC_BSPC)
-#define RTH1 LT(L_RIGHT, KC_SPC)
-#define RTH2 LT(L_NUM, KC_ENT)
-#define COPY LCMD(KC_C)
-#define PASTE LCMD(KC_V)
-// Layers
-#define L_BASE 0
-#define L_LEFT 1
-#define L_RIGHT 2
-#define L_NUM 3
-
-bool is_cmd_tab_active = false;
-
-enum custom_keycodes {
-    CMD_TAB = SAFE_RANGE,
-};
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-// L_BASE
-	LAYOUT(
-    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,         M4(KC_A),  M3(KC_S),   M2(KC_D),  M1(KC_F),  M0(KC_G),   M0(KC_H), M1(KC_J), M2(KC_K), M3(KC_L), M4(KC_COLN),  KC_QUOT,
-    KC_GRV,         KC_Z,      KC_X,       KC_C,      KC_V,      KC_B,       KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,      KC_BSLS,
-    OSM(MOD_LSFT),  QK_LEAD,   KC_LGUI,    LTH1,      XXXXXXX,   LTH2,       RTH2,     XXXXXXX,  RTH1,     KC_RGUI,  QK_LEAD,      OSM(MOD_HYPR)),
-
-// L_LEFT
-    LAYOUT(
-    _______, XXXXXXX,   XXXXXXX, KC_EQL,  KC_PERC, KC_AT,        COPY,     KC_UNDS, KC_HASH, RALT(KC_SPC), KC_PLUS,  _______,
-    _______, KC_LSFT,   KC_LALT, KC_LCTL, KC_LGUI, KC_HYPR,      KC_LEFT,  KC_DOWN, KC_UP,   KC_RIGHT,     KC_LBRC,  KC_RBRC,
-    _______, XXXXXXX,   KC_EXLM, KC_CIRC, XXXXXXX, KC_HOME,      KC_END,   KC_MINS, KC_LPRN, KC_RPRN,      PASTE,    XXXXXXX,
-    _______, KC_BRID,   KC_BRIU, _______, _______,  _______,     _______, _______, _______,  KC_VOLD,      KC_VOLU,  _______),
-
-// L_RIGHT
-    LAYOUT(
-    _______, XXXXXXX, XXXXXXX, KC_EQL,  KC_PERC,      KC_AT,        COPY,    KC_UNDS, KC_HASH,  RALT(KC_SPC), KC_PLUS,  _______,
-    _______, KC_AMPR, KC_ASTR, KC_DLR,  LGUI(KC_GRV), XXXXXXX,      KC_LEFT, KC_DOWN, KC_UP,    KC_RIGHT,     KC_RSFT,  KC_RBRC,
-    _______, XXXXXXX, KC_EXLM, KC_CIRC, XXXXXXX,      KC_HOME,      KC_END,  KC_MINS, KC_LPRN,  KC_RPRN,      PASTE,    XXXXXXX,
-    _______, KC_BRID, KC_BRIU, _______, _______,      _______,      _______, _______, _______,  KC_VOLD,      KC_VOLU,  _______),
-
-// L_NUM
-  	LAYOUT(
-    _______,  XXXXXXX,     KC_F7,     KC_F8,     KC_F9,     KC_F12,         KC_MINS,    KC_7,     KC_8,     KC_9,                  KC_COMM,              _______,
-    _______,  M4(KC_LSFT), M3(KC_F4), M2(KC_F5), M1(KC_F6), M0(KC_F11),     M0(KC_DOT), M1(KC_4), M2(KC_5), M3(KC_6),              M4(KC_0),             _______,
-    _______,  XXXXXXX,     KC_F1,     KC_F2,     KC_F3,     KC_F10,         KC_PLUS,    KC_1,     KC_2,     KC_3,                  KC_DOT,               _______,
-    _______,  _______,     _______,   _______,   _______,   _______,        _______,    _______,  _______,  KC_MEDIA_PREV_TRACK ,  KC_MEDIA_NEXT_TRACK,  KC_MEDIA_PLAY_PAUSE),
-
-    LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-};
-// clang-format on
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case CMD_TAB:
-            if (record->event.pressed) {
-                register_code(KC_LCMD);
-                tap_code(KC_TAB);
-                layer_on(2);
-            } else {
-                unregister_code(KC_LCMD);
-                layer_off(2);
-            }
-            break;
-        case KC_ESC:
-            layer_clear();
-    }
-    return true;
-}
-
-void leader_end_user(void) {
-    // Cancel task CTRL+C
-    if (leader_sequence_one_key(KC_C)) {
-        tap_code16(C(KC_C));
-    }
-    // copy
-    if (leader_sequence_one_key(KC_Y)) {
-        tap_code16(G(KC_C));
-    }
-    // cut
-    if (leader_sequence_one_key(KC_X)) {
-        tap_code16(G(KC_X));
-    }
-    // paste
-    if (leader_sequence_one_key(KC_P)) {
-        tap_code16(G(KC_V));
-    }
-    // undo
-    if (leader_sequence_one_key(KC_U)) {
-        tap_code16(G(KC_Z));
-    }
-    // redo
-    if (leader_sequence_one_key(KC_R)) {
-        tap_code16(S(G(KC_Z)));
-    }
-    // delete line
-    if (leader_sequence_two_keys(KC_D, KC_D)) {
-        register_code(KC_LGUI);
-
-        tap_code(KC_RIGHT);
-
-        tap_code(KC_BACKSPACE);
-
-        unregister_code(KC_LGUI);
-    }
-    // go to the beginning of the string
-    if (leader_sequence_one_key(KC_H)) {
-        tap_code16(G(KC_LEFT));
-    }
-    // go to the end of the string
-    if (leader_sequence_one_key(KC_L)) {
-        tap_code16(G(KC_RIGHT));
-    }
-}
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/rules.mk b/keyboards/signum/3_0/keymaps/sgurenkov/rules.mk
deleted file mode 100644
index 5c9a4b49b71..00000000000
--- a/keyboards/signum/3_0/keymaps/sgurenkov/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-LEADER_ENABLE = yes
-AUTO_SHIFT_ENABLE = no
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index e8f1cca7ebb..acba2932dbe 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -19,16 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MASTER_RIGHT
 
-  #ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_LED_COUNT 52
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-    #define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-
-    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
-  #else
+#ifdef RGBLIGHT_ENABLE
 /*== customize breathing effect ==*/
   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
     #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
@@ -36,10 +27,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_EFFECT_BREATHE_CENTER 2     // 1 to 2.7
     #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 /*== customize snake effect ==*/
-    #define RGBLIGHT_EFFECT_SNAKE_LENGTH RGBLED_NUM
+    #define RGBLIGHT_EFFECT_SNAKE_LENGTH RGBLIGHT_LED_COUNT
 /*== customize knight effect ==*/
     #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 6
-  #endif
+#endif
 
 /* Audio */
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index a761288fb4d..fe45ad86c5c 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -12,7 +12,14 @@
         "pin": "D3"
     },
     "rgb_matrix": {
+        "animations": {
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "typing_heatmap"
+        },
         "driver": "ws2812",
+        "max_brightness": 150,
         "sat_steps": 8,
         "val_steps": 8,
         "speed_steps": 8
diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c
deleted file mode 100644
index 8c3933525ce..00000000000
--- a/keyboards/silverbullet44/keymaps/FKML/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Copyright 2020 FKML
- *
- * 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 {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,-----------------------------------------.                                  ,-----------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                                  |   Y  |   U  |   I  |   O  |   P  |  =   |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |Shift |   A  |   S  |   D  |   F  |   G  |                                  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * | CMD  |   Z  |   X  |   C  |   V  |   B  |-------.-------.  ,---------------|   N  |   M  |   ,  |   .  |   /  |  -   |
- * `-----------------------------------------/       /       /   \       \      \-----------------------------------------'
- *                            | CAPS  | LOWER| Space/  Bcsp /     \    .  \ Ent | RAISE|LEDOff|
- *                            `----------------------------'       '--------------------------'
- */
-  [_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_EQL,
-    KC_LSFT,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                      KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-    KC_LCMD,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,                      KC_N,   KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
-                            KC_CAPS,  LOWER, KC_SPC, KC_BSPC,    KC_DOT,  KC_ENT,  RAISE, RGB_TOG
-  ),
-
-/* LOWER
- * ,-----------------------------------------.                                  ,-----------------------------------------.
- * |   `  |   !  |   @  |   #  |   $  |   %  |                                  |   ^  |   &  |   *  |   (  |   )  |   |  |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                                  |   1  |   2  |   3  |   4  |   5  |      |
- * |------+------+------+------+------+------+                                  +------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.-------.  ,---------------|   6  |   7  |   8  |   9  |   0  |      |
- * `-----------------------------------------/       /       /   \       \      \-----------------------------------------'
- *                             |      |      |      /       /     \       \     |      |      |
- *                             `---------------------------'       '--------------------------'
- */
-  [_LOWER] = LAYOUT(
-    KC_GRV , KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, KC_PIPE,
-    _______, _______, _______, _______, _______, _______,                     KC_1,     KC_2,     KC_3,     KC_4,    KC_5, _______,
-    _______, _______, _______, _______, _______, _______,                     KC_6,     KC_7,     KC_8,     KC_9,    KC_0, _______,
-                               _______, _______, _______, _______,  _______, _______, _______, _______
-  ),
-
-/* RAISE
- * ,-----------------------------------------.                                  ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                                  |      |      |      |      |  -   |   +  |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |  F6  |  F7  |  F8  |  F9  |  F10 |                                  |      |      |      |      |  [   |   ]  |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |  F11 |  F12 |      |      |      |-------.-------.  ,---------------|      |      | Left |  Up  | Down |Right |
- * `-----------------------------------------/       /       /   \       \      \-----------------------------------------'
- *                            |      |      |      /       /     \       \     |      |      |
- *                             `---------------------------'       '--------------------------'
- */
-  [_RAISE] = LAYOUT(
-    _______,   KC_F1,   KC_F2,    KC_F3,   KC_F4,  KC_F5,                     _______, _______, _______, _______,  KC_MINS, KC_PLUS,
-    _______,   KC_F6,   KC_F7,    KC_F8,   KC_F9,  KC_F10,                    _______, _______, _______, _______,  KC_LBRC, KC_RBRC,
-    _______,  KC_F11,   KC_F12, _______, _______, _______,                    _______, _______, KC_LEFT,   KC_UP,  KC_DOWN, KC_RGHT,
-                                _______, _______, _______, _______,  _______, _______, _______, _______
-  ),
-
-/*   ADJUST
- * ,-----------------------------------------.                                  ,-----------------------------------------.
- * |      |      |      |FrqRst|      |      |                                  |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |      |Music |FrqUp |Sound |      |                                  | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ |      |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |      |Scale |FrqDwn|      |      |-------.-------.  ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- |      |
- * `-----------------------------------------/       /       /   \       \      \-----------------------------------------'
- *                             |      |      |      /       /     \       \     |      |      |
- *                             `---------------------------'       '--------------------------'
- */
-
- [_ADJUST] = LAYOUT(
-    _______, XXXXXXX, XXXXXXX, CK_RST,  XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    XXXXXXX, XXXXXXX, MU_TOGG, CK_UP,   AU_TOGG, XXXXXXX,                      RGB_SPI, RGB_MOD,  RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX,
-    XXXXXXX, XXXXXXX, MU_NEXT, CK_DOWN, XXXXXXX, XXXXXXX,                      RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX,
-                               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  )
-};
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-int RGB_current_mode;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-void matrix_init_user(void) {
-#ifdef RGBLIGHT_ENABLE
-    RGB_current_mode = rgblight_config.mode;
-#endif
-}
diff --git a/keyboards/silverbullet44/keymaps/FKML/readme.md b/keyboards/silverbullet44/keymaps/FKML/readme.md
deleted file mode 100644
index c9c4c133eb3..00000000000
--- a/keyboards/silverbullet44/keymaps/FKML/readme.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# The default keymap for silverbullet44
-
-```
-QWERTY
-,-----------------------------------------.                                  ,-----------------------------------------.
-| Tab  |   Q  |   W  |   E  |   R  |   T  |                                  |   Y  |   U  |   I  |   O  |   P  |  =   |
-|------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-|Shift |   A  |   S  |   D  |   F  |   G  |                                  |   H  |   J  |   K  |   L  |   ;  |  '   |
-|------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-| CMD  |   Z  |   X  |   C  |   V  |   B  |-------.-------.  ,---------------|   N  |   M  |   ,  |   .  |   /  |  -   |
-`-----------------------------------------/       /       /   \       \      \-----------------------------------------'
-                            | CAPS | LOWER| Space/  Bcsp /     \    .  \ Ent | RAISE|LEDOff|
-                            `---------------------------'       '--------------------------'
-
-LOWER
- ,-----------------------------------------.                                  ,-----------------------------------------.
- |   `  |   !  |   @  |   #  |   $  |   %  |                                  |   ^  |   &  |   *  |   (  |   )  |   |  |
- |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- |      |      |      |      |      |      |                                  |   1  |   2  |   3  |   4  |   5  |      |
- |------+------+------+------+------+------+                                  +------+------+------+------+------+------|
- |      |      |      |      |      |      |-------.-------.  ,---------------|   6  |   7  |   8  |   9  |   0  |      |
- `-----------------------------------------/       /       /   \       \      \-----------------------------------------'
-                             |      |      |      /       /     \       \     |      |      |
-                             `---------------------------'       '--------------------------'
- 
- RAISE
- ,-----------------------------------------.                                  ,-----------------------------------------.
- |      |  F1  |  F2  |  F3  |  F4  |  F5  |                                  |      |      |      |      |  -   |   +  |
- |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- |      |  F6  |  F7  |  F8  |  F9  |  F10 |                                  |      |      |      |      |  [   |   ]  |
- |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- |      |  F11 |  F12 |      |      |      |-------.-------.  ,---------------|      |      | Left |  Up  | Down |Right |
- `-----------------------------------------/       /       /   \       \      \-----------------------------------------'
-                             |      |      |      /       /     \       \     |      |      |
-                             `---------------------------'       '--------------------------'
-
-ADJUST
-,-----------------------------------------.                                  ,-----------------------------------------.
-|      |      |      |FrqRst|      |      |                                  |      |      |      |      |      |      |
-|------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-|      |      |Music |FrqUp |Sound |      |                                  | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ |      |
-|------+------+------+------+------+------|                                  |------+------+------+------+------+------|
-|      |      |Scale |FrqDwn|      |      |-------.-------.  ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- |      |
-`-----------------------------------------/       /       /   \       \      \-----------------------------------------'
-                            |      |      |      /       /     \       \     |      |      |
-                            `---------------------------'       '--------------------------'
-```
\ No newline at end of file
diff --git a/keyboards/singa/keymaps/amnesia0287/config.h b/keyboards/singa/keymaps/amnesia0287/config.h
deleted file mode 100644
index 78fb88b4406..00000000000
--- a/keyboards/singa/keymaps/amnesia0287/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2018 amnesia0287
- *
- * 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/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-// place overrides here
-
-#endif
diff --git a/keyboards/singa/keymaps/amnesia0287/keymap.c b/keyboards/singa/keymaps/amnesia0287/keymap.c
deleted file mode 100644
index 4fa90618967..00000000000
--- a/keyboards/singa/keymaps/amnesia0287/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2018 amnesia0287
- *
- * 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 _BL  0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BL] = LAYOUT_wkl( /* 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_PSCR, KC_SCRL, KC_DEL,
-    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_PGUP,
-    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_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,   LT(_FL, KC_END),
-    KC_LGUI, KC_LALT, KC_SPC, MO(_FL),  KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [_FL] = LAYOUT_wkl(
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_DEL,  KC_TRNS,
-    KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_PGUP, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_HOME, KC_PGDN, KC_END
-  )
-};
diff --git a/keyboards/singa/keymaps/amnesia0287/readme.md b/keyboards/singa/keymaps/amnesia0287/readme.md
deleted file mode 100644
index 1f19a96b46e..00000000000
--- a/keyboards/singa/keymaps/amnesia0287/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for singa
\ No newline at end of file
diff --git a/keyboards/sirius/unigo66/keymaps/danielhklein/config.h b/keyboards/sirius/unigo66/keymaps/danielhklein/config.h
deleted file mode 100644
index 271f48d0011..00000000000
--- a/keyboards/sirius/unigo66/keymaps/danielhklein/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-// place overrides here
diff --git a/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c b/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
deleted file mode 100644
index 5b55d1ba246..00000000000
--- a/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_number {
-    _MAC = 0,
-    _WINDOWS,
-    _FN,
-    _ADJ
-};
-
-enum custom_keycodes {
-  MAC = SAFE_RANGE,
-  WINDOWS,
-  FN,
-  ADJ
-};
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
-/* Mac
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   1  |   2  |   3  |   4  |   5  |  -   |           |  =   |   6  |   7  |   8  |   9  |   0  |  Bsp   |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |  [   |           |  ]   |   Y  |   U  |   I  |   O  |   P  |  Enter |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Caps   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
- * |--------+------+------+------+------+------|  `   |           |  \   |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  /   | RShift |
- * `--------+------+------+---------------------------'           `---------------------------+------+------+--------'
- *   | Ctrl |  Alt |  Gui |                                                                   |  Gui |  Alt | Ctrl |
- *   `--------------------'                                                                   `--------------------'
- *                                        ,-------------.       ,--------------.
- *                                        |      |      |       |      |       |  
- *                                        | Bspc |  FN  |       |  ADJ | Space |
- *                                        |      |      |       |      |       | 
- *                                        `-------------'       `--------------'
- */
-    [_MAC] = LAYOUT(
-	KC_ESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_MINS,       KC_EQL,  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,    KC_DEL,
-	KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC,       KC_RBRC, KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,    KC_ENT,
-	KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                           KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN, KC_QUOT, 
-	KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_GRV,        KC_BSLS, KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,
-	KC_LCTL, KC_LALT,KC_LGUI,                                                                        KC_RGUI,KC_RALT, KC_RCTL,
-                                           KC_BSPC,FN,            ADJ, KC_SPC,
-                                           KC_BSPC,FN,            ADJ, KC_SPC
-    ),
-/* Windows
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   1  |   2  |   3  |   4  |   5  |  -   |           |  =   |   6  |   7  |   8  |   9  |   0  |  Bsp   |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |  [   |           |  ]   |   Y  |   U  |   I  |   O  |   P  |  Enter |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Caps   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
- * |--------+------+------+------+------+------|  `   |           |  \   |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  /   | RShift |
- * `--------+------+------+---------------------------'           `---------------------------+------+------+--------'
- *   | Gui  |  Alt | Ctrl |                                                                   | Ctrl |  Alt |  Gui |
- *   `--------------------'                                                                   `--------------------'
- *                                        ,-------------.       ,--------------.
- *                                        |      |      |       |      |       |  
- *                                        | Bspc |  FN  |       |  ADJ | Space | 
- *                                        |      |      |       |      |       | 
- *                                        `-------------'       `--------------'
- */
-    [_WINDOWS] = LAYOUT(
-  KC_ESC,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_MINS,       KC_EQL,  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,    KC_DEL,
-  KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_LBRC,       KC_RBRC, KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,    KC_ENT,
-  KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                           KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN, KC_QUOT, 
-  KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_GRV,        KC_BSLS, KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,
-  KC_LGUI, KC_LALT,KC_LCTL,                                                                        KC_RCTL,KC_RALT, KC_RGUI,
-                                           KC_BSPC,FN,            ADJ, KC_SPC,
-                                           KC_BSPC,FN,            ADJ, KC_SPC
-    ),
-/* FN
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | QK_BOOT  |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | MAC    |      |      |      |      |      |      |           |      |      | PgDn |  Up  | PgUp | Print|  Home  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | WINDOWS|      |      |      |      |      |------|           |------|      | Left | Down | Right|Insert|  End   |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Shift  |      |      |      |      |      |      |           |      | Play | Mute | Vol- | Vol+ | Last |  Next  |
- * `--------+------+------+---------------------------'           `---------------------------+------+------+--------'
- *   |      |      |GuiCtl|                                                                   |GuiCtl|      |      |
- *   `--------------------'                                                                   `--------------------'
- *                                        ,-------------.       ,--------------.
- *                                        |      |      |       |      |       |  
- *                                        |      |      |       |      |       | 
- *                                        |      |      |       |      |       | 
- *                                        `-------------'       `--------------'
- */
-    [_FN] = LAYOUT(
-  QK_BOOT, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  MAC,     XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_UP,   KC_PGUP, KC_PSCR, KC_HOME,
-  WINDOWS, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,                     XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_END, 
-  _______, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,   XXXXXXX, XXXXXXX, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MFFD,
-  XXXXXXX, XXXXXXX,_______,                                                                             _______, XXXXXXX, XXXXXXX,
-                                                XXXXXXX,   _______, XXXXXXX, XXXXXXX,
-                                                XXXXXXX,   _______, XXXXXXX, XXXXXXX
-    ),
-
-/* ADJ
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   F1   |  F2  |  F3  |  F4  |  F5  |  F6  |      |           |Nlock |  =   |  /   |  *   |  -   |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |   F7   |  F8  |  F9  |  F10 |  F11 |  F12 |      |           |      |  7   |  8   |  9   |  +   |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|  4   |  5   |  6   | Enter|      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |  1   |  2   |  3   | Space|      |        |
- * `--------+------+------+---------------------------'           `---------------------------+------+------+--------'
- *   |      |      |      |                                                                   |  0   |  .   |      |
- *   `--------------------'                                                                   `--------------------'
- *                                        ,-------------.       ,--------------.
- *                                        |      |      |       |      |       |  
- *                                        |      |      |       |      |       | 
- *                                        |      |      |       |      |       | 
- *                                        `-------------'       `--------------'
- */
-    [_ADJ] = LAYOUT(
-  KC_F1,   KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX,
-  KC_F7,   KC_F8,  KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   KC_P4,   KC_P5,   KC_P6,   KC_PENT, XXXXXXX, XXXXXXX, 
-  XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_SPC,  XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX,XXXXXXX,                                                                         KC_P0,   KC_PDOT, XXXXXXX,
-                                              XXXXXXX, XXXXXXX, _______, XXXXXXX,
-                                              XXXXXXX, XXXXXXX, _______, XXXXXXX
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-   switch (keycode) {
-    case MAC:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_MAC);
-      }
-      return false;
-      break;
-    case WINDOWS:
-      if(record->event.pressed) {
-        set_single_persistent_default_layer(_WINDOWS);
-      }
-      return false;
-      break;
-    case FN:
-      if (record->event.pressed) {
-        layer_on(_FN);
-      } else {
-        layer_off(_FN);
-      }
-      return false;
-      break;
-    case ADJ:
-        if (record->event.pressed) {
-          layer_on(_ADJ);
-        } else {
-          layer_off(_ADJ);
-        }
-        return false;
-        break;
-  }
-  return true;
-}
diff --git a/keyboards/sirius/unigo66/main.c b/keyboards/sirius/unigo66/main.c
index b4f2a91e49d..4f8e2f0c94f 100644
--- a/keyboards/sirius/unigo66/main.c
+++ b/keyboards/sirius/unigo66/main.c
@@ -85,7 +85,7 @@ int main(void)
         _delay_ms(1000);
     }
 
-    debug("init: done\n");
+    dprintln("init: done");
 
     for (;;) {
         keyboard_task();
diff --git a/keyboards/sixkeyboard/keymaps/semicolonsnet/keymap.c b/keyboards/sixkeyboard/keymaps/semicolonsnet/keymap.c
deleted file mode 100644
index 86fdc90b65e..00000000000
--- a/keyboards/sixkeyboard/keymaps/semicolonsnet/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 Chase Nordengren 
-  * 
-  * 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 custom_keycodes {
-    QMKPASS = SAFE_RANGE,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case QMKPASS:
-        if (record->event.pressed) {
-            // when keycode QMKPASS is pressed
-            SEND_STRING("Sample string");
-        } else {
-            // when keycode QMKPASS is released
-        }
-        break;
-    }
-    return true;
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_ESC, SGUI(KC_R), SGUI(KC_S), QMKPASS, SGUI(KC_A), SGUI(KC_V))
-};
-
diff --git a/keyboards/sixkeyboard/keymaps/semicolonsnet/readme.md b/keyboards/sixkeyboard/keymaps/semicolonsnet/readme.md
deleted file mode 100644
index e791b12a653..00000000000
--- a/keyboards/sixkeyboard/keymaps/semicolonsnet/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Techkeys SixKeyBoard
-===
-
-Keyboard Maintainer: QMK Community  
-Hardware Supported: Techkeys SixKeyBoard PCB  
-Hardware Availability: [Techkeys](http://techkeys.us/collections/accessories/products/sixkeyboard)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make sixkeyboard:semicolonsnet
-
-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.
-
-## Hardware Info
-
-The schematic is like this:
-
-```
- switches       leds
-,--+--+--.   ,--+--+--.
-|C7|B7|B5|   |C6|B6|B4|
-+--+--+--+   +--+--+--+
-|D6|D1|D4|   |D5|D2|D3|
-`--+--+--'   `--+--+--'
-```
-
-The LED on the bottom is `C4`. All 7 of the leds are turned on when the keyboard boots-up in the `sixkeyboard.c` file - backlight_enable is not required. The MCU is an Atmega16u2, so the flash memory is limited to 0x3000 bytes - the current setup uses just about all of that! I'm sure things can be opitimised a bit.
-
-There is a jumper on the bottom of the board (next to the USB port) that serves as a reset button - I drilled a hole in my case to allow for quick access via a screwdriver/metal object.
diff --git a/keyboards/skeletonkbd/frost68/config.h b/keyboards/skeletonkbd/frost68/config.h
index eaf7a31fb6e..7066497f1a0 100644
--- a/keyboards/skeletonkbd/frost68/config.h
+++ b/keyboards/skeletonkbd/frost68/config.h
@@ -3,59 +3,4 @@
 
 #pragma once
 
-#define WS2812_PIO_USE_PIO1
-#define RGB_MATRIX_LED_COUNT 68
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define USB_SUSPEND_WAKEUP_DELAY 200
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
-#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_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
diff --git a/keyboards/skeletonkbd/frost68/info.json b/keyboards/skeletonkbd/frost68/info.json
index 742daf8d578..0411a3826d5 100644
--- a/keyboards/skeletonkbd/frost68/info.json
+++ b/keyboards/skeletonkbd/frost68/info.json
@@ -26,6 +26,54 @@
         "pin": "GP0"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_up_down"
+        },
         "driver": "ws2812",
         "layout": [
             {"matrix": [0, 0], "x": 33.1, "y": 3.7, "flags": 4},
@@ -98,9 +146,11 @@
             {"matrix": [0, 15], "x": 233.9, "y": 1.5, "flags": 4}
         ],
         "max_brightness": 118,
+        "react_on_keyup": true,
         "sat_steps": 8,
         "speed_steps": 10,
-        "val_steps": 8
+        "val_steps": 8,
+        "sleep": true
     },
     "url": "https://skeletonkbd.com/",
     "usb": {
diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
index afdacdd0803..b352868d2d4 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
+++ b/keyboards/skippys_custom_pcs/rooboard65/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json
index 11a50e87b1f..b6151a303c4 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/info.json
+++ b/keyboards/skippys_custom_pcs/rooboard65/info.json
@@ -25,6 +25,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "matrix_pins": {
diff --git a/keyboards/skme/zeno/keymaps/paulgali/keymap.c b/keyboards/skme/zeno/keymaps/paulgali/keymap.c
deleted file mode 100644
index abd141b9120..00000000000
--- a/keyboards/skme/zeno/keymaps/paulgali/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Holten Campbell
-
-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_default(
-		QK_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_BSLS, 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_BSPC,
-		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,          MO(1),
-		KC_LCTL, KC_LGUI,                   KC_LALT, KC_SPC,  LT(1,KC_SPC),  KC_RALT,  KC_RALT,                               MO(1),  KC_RCTL
-    ),
-    [1] = LAYOUT_default(
-        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_TRNS, QK_BOOT,
-        CL_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        CL_CTRL, KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS,                   KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/skmt/15k/config.h b/keyboards/skmt/15k/config.h
deleted file mode 100644
index 6e0360ec7b3..00000000000
--- a/keyboards/skmt/15k/config.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2022 Jimmy Lye (@satorusaka)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/*
- * 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 RGB_MATRIX_LED_COUNT 15 // Number of LEDs
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#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
-#    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
diff --git a/keyboards/skmt/15k/info.json b/keyboards/skmt/15k/info.json
index 0f333620920..903a13b985e 100644
--- a/keyboards/skmt/15k/info.json
+++ b/keyboards/skmt/15k/info.json
@@ -16,7 +16,7 @@
     "matrix_pins": {
         "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"],
         "rows": ["GP7", "GP8", "GP9"]
-        },
+    },
     "processor": "RP2040",
     "url": "https://github.com/satorusaka/15k-macropad",
     "usb": {
@@ -47,6 +47,51 @@
         }
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [2, 4], "x": 224, "y": 64},
@@ -64,7 +109,8 @@
             {"flags": 4, "matrix": [0, 2], "x": 112, "y": 0},
             {"flags": 4, "matrix": [0, 1], "x": 56, "y": 0},
             {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}
-        ]
+        ],
+        "sleep": true
     },
     "ws2812": {
         "pin": "GP1",
diff --git a/keyboards/skmt/15k/keymaps/fns/keymap.c b/keyboards/skmt/15k/keymaps/fns/keymap.c
deleted file mode 100644
index 8933260d5fd..00000000000
--- a/keyboards/skmt/15k/keymaps/fns/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 Jimmy Lye (@satorusaka)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌────┬───┬───┬───┬────┐
-     * │ F3 │ 9 │ 6 │ 3 │ fn │
-     * ├────┼───┼───┼───┼────┤
-     * │ F2 │ 8 │ 5 │ 2 │ .  │
-     * ├────┼───┼───┼───┼────┤
-     * │ F1 │ 7 │ 4 │ 1 │ O  │
-     * └────┴───┴───┴───┴────┘
-     */
-    [0] = LAYOUT_default(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   LT(1, KC_KB_MUTE),
-        KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_KB_VOLUME_UP,
-        KC_F9,   KC_F10,   KC_F11,   KC_F12,   KC_KB_VOLUME_DOWN
-    ),
-    [1] = LAYOUT_default(
-        RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
-        RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
-    )
-};
diff --git a/keyboards/skmt/15k/keymaps/qwert/keymap.c b/keyboards/skmt/15k/keymaps/qwert/keymap.c
deleted file mode 100644
index 16464c93bc8..00000000000
--- a/keyboards/skmt/15k/keymaps/qwert/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 Jimmy Lye (@satorusaka)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬─────────────────────┐
-     * │ Q │ W │ E │ R │ BACKSPACE (LAYER 1) │
-     * ├───┼───┼───┼───┼─────────────────────┤
-     * │ A │ S │ D │ F │ ENTER               │
-     * ├───┼───┼───┼───┼─────────────────────┤
-     * │ Z │ X │ C │ V │ SPACE               │
-     * └───┴───┴───┴───┴─────────────────────┘
-     */
-    [0] = LAYOUT_default(
-        KC_Q,   KC_W,   KC_E,   KC_R,   LT(1, KC_BSPC),
-        KC_A,   KC_S,   KC_D,   KC_F,   KC_ENT,
-        KC_Z,   KC_X,   KC_C,   KC_V,   KC_SPC
-    ),
-    [1] = LAYOUT_default(
-        RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
-        RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
-    )
-};
diff --git a/keyboards/skyloong/dt40/config.h b/keyboards/skyloong/dt40/config.h
index e67b7ae0a9a..b0aa9780633 100644
--- a/keyboards/skyloong/dt40/config.h
+++ b/keyboards/skyloong/dt40/config.h
@@ -15,13 +15,7 @@
  */
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 44   //The number of LEDs connected
-#define RGB_MATRIX_KEYPRESSES  //Reacts to keypress
-#define RGB_DISABLE_WHEN_USB_SUSPENDED   //turn off effects when suspended
-
-#define RGB_MATRIX_DEFAULT_VAL 150  //Sets the default mode, if none has been set
 #define RGB_TRIGGER_ON_KEYDOWN  //Triggers RGB keypress events on key down
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 1
 
 //Set WS2812 driver
@@ -32,5 +26,3 @@
 #define WS2812_PWM_PAL_MODE 2
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
-
-
diff --git a/keyboards/skyloong/dt40/info.json b/keyboards/skyloong/dt40/info.json
index b6172465e68..a79b48289a8 100644
--- a/keyboards/skyloong/dt40/info.json
+++ b/keyboards/skyloong/dt40/info.json
@@ -48,6 +48,9 @@
             "raindrops": true,
             "ranbow_beacon": true
         },
+        "default": {
+            "val": 150
+        },
         "driver": "ws2812",
         "hue_steps": 20,
         "layout": [
@@ -99,7 +102,8 @@
         "max_brightness": 180,
         "sat_steps": 20,
         "speed_steps": 20,
-        "val_steps": 20
+        "val_steps": 20,
+        "sleep": true
     },
     "url": "https://github.com/JZ-Skyloong",
     "usb": {
diff --git a/keyboards/skyloong/gk61/pro/config.h b/keyboards/skyloong/gk61/pro/config.h
index 8e9b5f9258c..db02496f8b4 100644
--- a/keyboards/skyloong/gk61/pro/config.h
+++ b/keyboards/skyloong/gk61/pro/config.h
@@ -3,17 +3,10 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 64
+#define IS31FL3743A_I2C_ADDRESS_1 IS31FL3743A_I2C_ADDRESS_GND_GND
+#define IS31FL3743A_SDB_PIN C1
+
 #define CAPS_LOCK_INDEX 28
 #define WIN_MOD_INDEX 16
 #define MAC_MOD_INDEX 17
 #define WIN_LOCK_INDEX 54
-#define SDB C1 //RGB matrix Power control PIN
-
-/* 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_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/skyloong/gk61/pro/pro.c b/keyboards/skyloong/gk61/pro/pro.c
index 1936964b32b..06d9ce721d8 100644
--- a/keyboards/skyloong/gk61/pro/pro.c
+++ b/keyboards/skyloong/gk61/pro/pro.c
@@ -6,81 +6,81 @@ int FN_MAC = 0;
 int L_WIN = 0;
 int L_MAC = 0;
 
-const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |          G location
  *   |  |          |          B location
  *   |  |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},
-
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},
-    {0, CS16_SW4,  CS17_SW4,  CS18_SW4},
-    {0, CS16_SW5,  CS17_SW5,  CS18_SW5},
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},
-
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},
-    {0, CS16_SW7,  CS17_SW7,  CS18_SW7},
-    {0, CS16_SW8,  CS17_SW8,  CS18_SW8},
-
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},
-
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},
+
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18},
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18},
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},
+
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18},
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18},
+
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},
+
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}
 };
 
 #if defined(RGB_MATRIX_ENABLE)  /*&& defined(CAPS_LOCK_INDEX)*/
@@ -213,14 +213,14 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
 
 void suspend_power_down_kb() {
 #    ifdef RGB_MATRIX_ENABLE
-    writePinLow(SDB);
+    writePinLow(IS31FL3743A_SDB_PIN);
 #    endif
      suspend_power_down_user();
 }
 
 void suspend_wakeup_init_kb() {
 #    ifdef RGB_MATRIX_ENABLE
-    writePinHigh(SDB);
+    writePinHigh(IS31FL3743A_SDB_PIN);
 #    endif
      suspend_wakeup_init_user();
 }
@@ -228,8 +228,4 @@ void suspend_wakeup_init_kb() {
 void board_init(void) {
     // JTAG-DP Disabled and SW-DP Disabled
     AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE;
-#    ifdef RGB_MATRIX_ENABLE
-    setPinOutput(SDB);
-    writePinHigh(SDB);
-#   endif
 }
diff --git a/keyboards/skyloong/gk61/pro_48/config.h b/keyboards/skyloong/gk61/pro_48/config.h
index df94455a9ea..5b4976e2dad 100644
--- a/keyboards/skyloong/gk61/pro_48/config.h
+++ b/keyboards/skyloong/gk61/pro_48/config.h
@@ -3,14 +3,11 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 64
+#define IS31FL3743A_I2C_ADDRESS_1 IS31FL3743A_I2C_ADDRESS_GND_GND
+#define IS31FL3743A_SDB_PIN A4
+
 #define CAPS_LOCK_INDEX 28
 #define WIN_MOD_INDEX 16
 #define MAC_MOD_INDEX 17
-#define SDB A4
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
 #define g_suspend_state rgb_matrix_get_suspend_state()
diff --git a/keyboards/skyloong/gk61/pro_48/info.json b/keyboards/skyloong/gk61/pro_48/info.json
index 0e49e005aa9..10a663f3c71 100644
--- a/keyboards/skyloong/gk61/pro_48/info.json
+++ b/keyboards/skyloong/gk61/pro_48/info.json
@@ -123,7 +123,8 @@
         "hue_steps": 20,
         "sat_steps": 20,
         "speed_steps": 20,
-        "val_steps": 20
+        "val_steps": 20,
+        "sleep": true
     },
     "url": "https://github.com/JZ-Skyloong",
     "usb": {
diff --git a/keyboards/skyloong/gk61/pro_48/pro_48.c b/keyboards/skyloong/gk61/pro_48/pro_48.c
index e4f64c022fd..c5758ffcf4c 100644
--- a/keyboards/skyloong/gk61/pro_48/pro_48.c
+++ b/keyboards/skyloong/gk61/pro_48/pro_48.c
@@ -7,81 +7,81 @@ _Bool L_WIN = 0;
 _Bool L_MAC = 0;
 
 #if defined(RGB_MATRIX_ENABLE)  /*&& defined(CAPS_LOCK_INDEX)*/
-const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |          G location
  *   |  |          |          B location
  *   |  |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},
-
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},
-    {0, CS16_SW4,  CS17_SW4,  CS18_SW4},
-    {0, CS16_SW5,  CS17_SW5,  CS18_SW5},
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},
-
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},
-    {0, CS16_SW7,  CS17_SW7,  CS18_SW7},
-    {0, CS16_SW8,  CS17_SW8,  CS18_SW8},
-
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},
-
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},
+
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18},
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18},
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},
+
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18},
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18},
+
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},
+
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}
 };
 
 bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
@@ -149,12 +149,12 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
 
 
 void suspend_power_down_kb(void) {
-    writePinLow(SDB);
+    writePinLow(IS31FL3743A_SDB_PIN);
     suspend_power_down_user();
 }
 
 void suspend_wakeup_init_kb(void) {
-    writePinHigh(SDB);
+    writePinHigh(IS31FL3743A_SDB_PIN);
     suspend_wakeup_init_user();
 }
 #endif
@@ -220,8 +220,4 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 void board_init(void) {
     // JTAG-DP Disabled and SW-DP Disabled
     AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE;
-#    ifdef RGB_MATRIX_ENABLE
-    setPinOutput(SDB);
-    writePinHigh(SDB);
-#   endif
 }
diff --git a/keyboards/skyloong/gk61/v1/config.h b/keyboards/skyloong/gk61/v1/config.h
index bd9cab743f6..d1dae51219f 100644
--- a/keyboards/skyloong/gk61/v1/config.h
+++ b/keyboards/skyloong/gk61/v1/config.h
@@ -16,10 +16,4 @@
 #pragma once
 
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
-
-#define RGB_MATRIX_LED_COUNT 64
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS  //Enable frame effects
-#define RGB_MATRIX_KEYPRESSES  //Reacts to keypress
-#define RGB_DISABLE_WHEN_USB_SUSPENDED   //turn off effects when suspended
-#define SDB C1
+#define SNLED27351_SDB_PIN C1
diff --git a/keyboards/skyloong/gk61/v1/info.json b/keyboards/skyloong/gk61/v1/info.json
index 6015efa12c2..d5320fa7655 100644
--- a/keyboards/skyloong/gk61/v1/info.json
+++ b/keyboards/skyloong/gk61/v1/info.json
@@ -113,7 +113,8 @@
         "max_brightness": 200,
         "sat_steps": 20,
         "speed_steps": 20,
-        "val_steps": 20
+        "val_steps": 20,
+        "sleep": true
     },
     "url": "https://github.com/JZ-Skyloong",
     "usb": {
diff --git a/keyboards/skyloong/gk61/v1/v1.c b/keyboards/skyloong/gk61/v1/v1.c
index cb3772f6b4c..01e6b6c6ae6 100644
--- a/keyboards/skyloong/gk61/v1/v1.c
+++ b/keyboards/skyloong/gk61/v1/v1.c
@@ -17,103 +17,98 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
 /* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    B_1,    A_1},
-    {0, C_2,    B_2,    A_2},
-    {0, C_3,    B_3,    A_3},
-    {0, C_4,    B_4,    A_4},
-    {0, C_5,    B_5,    A_5},
-    {0, C_6,    B_6,    A_6},
-    {0, C_7,    B_7,    A_7},
-    {0, C_8,    B_8,    A_8},
-    {0, C_9,    B_9,    A_9},
-    {0, C_10,   B_10,   A_10},
-    {0, C_11,   B_11,   A_11},
-    {0, C_12,   B_12,   A_12},
-    {0, C_13,   B_13,   A_13},
-    {0, C_14,   B_14,   A_14},
-
-
-    {0, F_1,    E_1,    D_1},
-    {0, F_2,    E_2,    D_2},
-    {0, F_3,    E_3,    D_3},
-    {0, F_4,    E_4,    D_4},
-    {0, F_5,    E_5,    D_5},
-    {0, F_6,    E_6,    D_6},
-    {0, F_7,    E_7,    D_7},
-    {0, F_8,    E_8,    D_8},
-    {0, F_9,    E_9,    D_9},
-    {0, F_10,   E_10,   D_10},
-    {0, F_11,   E_11,   D_11},
-    {0, F_12,   E_12,   D_12},
-    {0, F_13,   E_13,   D_13},
-    {0, F_14,   E_14,   D_14},
-
-
-    {0, I_1,    H_1,    G_1},
-    {0, I_2,    H_2,    G_2},
-    {0, I_3,    H_3,    G_3},
-    {0, I_4,    H_4,    G_4},
-    {0, I_5,    H_5,    G_5},
-    {0, I_6,    H_6,    G_6},
-    {0, I_7,    H_7,    G_7},
-    {0, I_8,    H_8,    G_8},
-    {0, I_9,    H_9,    G_9},
-    {0, I_10,   H_10,   G_10},
-    {0, I_11,   H_11,   G_11},
-    {0, I_12,   H_12,   G_12},
-    {0, I_13,   H_13,   G_13},
-
-
-
-    {0, L_1,    K_1,    J_1},
-    {0, L_2,    K_2,    J_2},
-    {0, L_3,    K_3,    J_3},
-    {0, L_4,    K_4,    J_4},
-    {0, L_5,    K_5,    J_5},
-    {0, L_6,    K_6,    J_6},
-    {0, L_7,    K_7,    J_7},
-    {0, L_8,    K_8,    J_8},
-    {0, L_9,    K_9,    J_9},
-    {0, L_10,   K_10,   J_10},
-    {0, L_11,   K_11,   J_11},
-    {0, L_13,   K_13,   J_13},
-
-    {0, L_15,   K_15,   J_15},
-    {0, L_16,   K_16,   J_16},
-    {0, I_15,   H_15,   G_15},
-    {0, I_16,   H_16,   G_16},
-    {0, F_15,   E_15,   D_15},
-    {0, F_16,   E_16,   D_16},
-    {0, C_15,   B_15,   A_15},
-    {0, C_16,   B_16,   A_16},
-    {0, I_14,   H_14,   G_14},
-    {0, L_12,   K_12,   J_12},
-    {0, L_14,   K_14,   J_14},
+    {0, CB3_CA1,    CB2_CA1,    CB1_CA1},
+    {0, CB3_CA2,    CB2_CA2,    CB1_CA2},
+    {0, CB3_CA3,    CB2_CA3,    CB1_CA3},
+    {0, CB3_CA4,    CB2_CA4,    CB1_CA4},
+    {0, CB3_CA5,    CB2_CA5,    CB1_CA5},
+    {0, CB3_CA6,    CB2_CA6,    CB1_CA6},
+    {0, CB3_CA7,    CB2_CA7,    CB1_CA7},
+    {0, CB3_CA8,    CB2_CA8,    CB1_CA8},
+    {0, CB3_CA9,    CB2_CA9,    CB1_CA9},
+    {0, CB3_CA10,   CB2_CA10,   CB1_CA10},
+    {0, CB3_CA11,   CB2_CA11,   CB1_CA11},
+    {0, CB3_CA12,   CB2_CA12,   CB1_CA12},
+    {0, CB3_CA13,   CB2_CA13,   CB1_CA13},
+    {0, CB3_CA14,   CB2_CA14,   CB1_CA14},
+
+
+    {0, CB6_CA1,    CB5_CA1,    CB4_CA1},
+    {0, CB6_CA2,    CB5_CA2,    CB4_CA2},
+    {0, CB6_CA3,    CB5_CA3,    CB4_CA3},
+    {0, CB6_CA4,    CB5_CA4,    CB4_CA4},
+    {0, CB6_CA5,    CB5_CA5,    CB4_CA5},
+    {0, CB6_CA6,    CB5_CA6,    CB4_CA6},
+    {0, CB6_CA7,    CB5_CA7,    CB4_CA7},
+    {0, CB6_CA8,    CB5_CA8,    CB4_CA8},
+    {0, CB6_CA9,    CB5_CA9,    CB4_CA9},
+    {0, CB6_CA10,   CB5_CA10,   CB4_CA10},
+    {0, CB6_CA11,   CB5_CA11,   CB4_CA11},
+    {0, CB6_CA12,   CB5_CA12,   CB4_CA12},
+    {0, CB6_CA13,   CB5_CA13,   CB4_CA13},
+    {0, CB6_CA14,   CB5_CA14,   CB4_CA14},
+
+
+    {0, CB9_CA1,    CB8_CA1,    CB7_CA1},
+    {0, CB9_CA2,    CB8_CA2,    CB7_CA2},
+    {0, CB9_CA3,    CB8_CA3,    CB7_CA3},
+    {0, CB9_CA4,    CB8_CA4,    CB7_CA4},
+    {0, CB9_CA5,    CB8_CA5,    CB7_CA5},
+    {0, CB9_CA6,    CB8_CA6,    CB7_CA6},
+    {0, CB9_CA7,    CB8_CA7,    CB7_CA7},
+    {0, CB9_CA8,    CB8_CA8,    CB7_CA8},
+    {0, CB9_CA9,    CB8_CA9,    CB7_CA9},
+    {0, CB9_CA10,   CB8_CA10,   CB7_CA10},
+    {0, CB9_CA11,   CB8_CA11,   CB7_CA11},
+    {0, CB9_CA12,   CB8_CA12,   CB7_CA12},
+    {0, CB9_CA13,   CB8_CA13,   CB7_CA13},
+
+
+
+    {0, CB12_CA1,    CB11_CA1,    CB10_CA1},
+    {0, CB12_CA2,    CB11_CA2,    CB10_CA2},
+    {0, CB12_CA3,    CB11_CA3,    CB10_CA3},
+    {0, CB12_CA4,    CB11_CA4,    CB10_CA4},
+    {0, CB12_CA5,    CB11_CA5,    CB10_CA5},
+    {0, CB12_CA6,    CB11_CA6,    CB10_CA6},
+    {0, CB12_CA7,    CB11_CA7,    CB10_CA7},
+    {0, CB12_CA8,    CB11_CA8,    CB10_CA8},
+    {0, CB12_CA9,    CB11_CA9,    CB10_CA9},
+    {0, CB12_CA10,   CB11_CA10,   CB10_CA10},
+    {0, CB12_CA11,   CB11_CA11,   CB10_CA11},
+    {0, CB12_CA13,   CB11_CA13,   CB10_CA13},
+
+    {0, CB12_CA15,   CB11_CA15,   CB10_CA15},
+    {0, CB12_CA16,   CB11_CA16,   CB10_CA16},
+    {0, CB9_CA15,   CB8_CA15,   CB7_CA15},
+    {0, CB9_CA16,   CB8_CA16,   CB7_CA16},
+    {0, CB6_CA15,   CB5_CA15,   CB4_CA15},
+    {0, CB6_CA16,   CB5_CA16,   CB4_CA16},
+    {0, CB3_CA15,   CB2_CA15,   CB1_CA15},
+    {0, CB3_CA16,   CB2_CA16,   CB1_CA16},
+    {0, CB9_CA14,   CB8_CA14,   CB7_CA14},
+    {0, CB12_CA12,   CB11_CA12,   CB10_CA12},
+    {0, CB12_CA14,   CB11_CA14,   CB10_CA14},
 
 
 };
 #endif // RGB_MATRIX_ENABLE
 
 void suspend_power_down_kb() {
-    writePinLow(SDB);
+    writePinLow(SNLED27351_SDB_PIN);
 
     suspend_power_down_user();
 }
 
 void suspend_wakeup_init_kb() {
-    writePinHigh(SDB);
-    
-    suspend_wakeup_init_user();
-}
+    writePinHigh(SNLED27351_SDB_PIN);
 
-void board_init(void) {
-    setPinOutput(SDB);
-    writePinHigh(SDB);
+    suspend_wakeup_init_user();
 }
diff --git a/keyboards/skyloong/qk21/v1/config.h b/keyboards/skyloong/qk21/v1/config.h
index c74d5cce78a..4410f06c6a8 100644
--- a/keyboards/skyloong/qk21/v1/config.h
+++ b/keyboards/skyloong/qk21/v1/config.h
@@ -5,8 +5,3 @@
 
 /* Enable num-lock LED */
 #define NUM_LOCK_INDEX 13
-
-#define RGB_MATRIX_LED_COUNT 21
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS  //Enable frame effects
-#define RGB_MATRIX_KEYPRESSES  //Reacts to keypress
-#define RGB_DISABLE_WHEN_USB_SUSPENDED   //turn off effects when suspended
diff --git a/keyboards/skyloong/qk21/v1/info.json b/keyboards/skyloong/qk21/v1/info.json
index d5aa5e8be9b..3f22fc0ccbc 100644
--- a/keyboards/skyloong/qk21/v1/info.json
+++ b/keyboards/skyloong/qk21/v1/info.json
@@ -89,7 +89,8 @@
         "max_brightness": 200,
         "sat_steps": 20,
         "speed_steps": 20,
-        "val_steps": 20
+        "val_steps": 20,
+        "sleep": true
     },
     "url": "https://github.com/JZ-Skyloong",
     "usb": {
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index d98a2b6ef27..9a6ca310e42 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -17,56 +17,4 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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 IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-
-#define RGB_MATRIX_LED_COUNT 6
-#endif
diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json
index 9fb889d28e1..d5a64f465ad 100644
--- a/keyboards/smallkeyboard/info.json
+++ b/keyboards/smallkeyboard/info.json
@@ -9,7 +9,36 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "is31fl3731"
+    "animations": {
+      "alphas_mods": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_val": true,
+      "band_pinwheel_val": true,
+      "band_spiral_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "cycle_out_in_dual": true,
+      "cycle_pinwheel": true,
+      "cycle_spiral": true,
+      "dual_beacon": true,
+      "rainbow_beacon": true,
+      "rainbow_pinwheels": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "typing_heatmap": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true
+    },
+    "driver": "is31fl3731",
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5"],
diff --git a/keyboards/smallkeyboard/smallkeyboard.c b/keyboards/smallkeyboard/smallkeyboard.c
index ce79c7df5de..7442444b009 100644
--- a/keyboards/smallkeyboard/smallkeyboard.c
+++ b/keyboards/smallkeyboard/smallkeyboard.c
@@ -17,7 +17,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
      *   driver
      *   |  R location
diff --git a/keyboards/smithrune/iron160/iron160_h/config.h b/keyboards/smithrune/iron160/iron160_h/config.h
deleted file mode 100644
index 4edf24a4d9d..00000000000
--- a/keyboards/smithrune/iron160/iron160_h/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2022 Gondolindrim
-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
-
-/* Defining RGB default brightness to zero */
-#define RGBLIGHT_DEFAULT_VAL 0
diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json
index ae65246d26e..3fb14989d69 100644
--- a/keyboards/smithrune/iron160/iron160_h/info.json
+++ b/keyboards/smithrune/iron160/iron160_h/info.json
@@ -17,9 +17,12 @@
    "ws2812": {
        "pin": "B15"
    },
-   "rgblight": {
-       "led_count": 1
-   },
+    "rgblight": {
+        "led_count": 1,
+        "default": {
+           "val": 50
+        }
+    },
    "diode_direction": "COL2ROW",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60_tsangan_hhkb"
diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h
index 9749d68d72d..b803959d13c 100644
--- a/keyboards/smithrune/iron165r2/config.h
+++ b/keyboards/smithrune/iron165r2/config.h
@@ -39,5 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #       define RGBLIGHT_LED_MAP {21 , 2  , 3  , 4  , 5  , 1  , 20 , 0  , 6  , 7  , 8  , 9  , 10 , 11 , 12 , 13 , 19 , 14 , 15 , 16 , 17 , 18 }
 //                               D18, D19, D20, D21, D22, D23, D24, D25, D26, D27, D28, D29, D60, D61, D62, D63, D64, D65, D66, D67, D68, D69}
 #endif
-
-#define RGBLIGHT_DEFAULT_VAL 0
diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json
index 209266ad102..2cbbaa84f3f 100644
--- a/keyboards/smithrune/iron165r2/f072/info.json
+++ b/keyboards/smithrune/iron165r2/f072/info.json
@@ -17,6 +17,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 0
         }
     },
     "ws2812": {
diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json
index 72547e955e6..ff685e3cdd8 100644
--- a/keyboards/smithrune/iron165r2/f411/info.json
+++ b/keyboards/smithrune/iron165r2/f411/info.json
@@ -20,6 +20,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 0
         }
     },
     "ws2812": {
diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/info.json
index aecd10ef84d..4707f326646 100644
--- a/keyboards/smithrune/iron180/info.json
+++ b/keyboards/smithrune/iron180/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Iron180",
+    "keyboard_name": "Iron180 V1",
     "manufacturer": "SmithRune",
     "url": "",
     "maintainer": "Gondolindrim",
diff --git a/keyboards/smithrune/iron180v2/readme.md b/keyboards/smithrune/iron180v2/readme.md
new file mode 100644
index 00000000000..2df6b965211
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/readme.md
@@ -0,0 +1,27 @@
+# Iron180 V2 PCBs QMK firmware folder
+
+## Introduction
+
+This is the QMK Firmware repository for the Iron180 PCB, a keyboard designed by [Smith and Rune](https://smithrune.com/) and PCB designed by [Gondolindrim](http://github.com/Gondolindrim).
+
+The Iron180 PCB PCB had two versions. The first version used an STM32F072 microcontroller, and was available only in solderable version; it also supports ALPS switches, in-switch single-color LEDs and a multi-layout design for default or 7U bottom row, ISO layout, split backspace and right shift.
+
+The second version used an STM32F401 microcontroller and was available in hotswap and solderable version. The solderable version removes in-switch LED support and ALPS support, but keeps all layout compatibilities of the first version. The hotswap incarnation removes ISO layout support.
+
+As of November 2020, the only way to obtain an Iron180 was through the [Group Buy](https://geekhack.org/index.php?topic=109513) which is already over and all spots were filled. There was a sale for the V2 PCBs in october, 2023.
+
+## How to compile
+
+After setting up your build environment, you can compile the Iron180 default keymap by using:
+
+    make smithrune/iron180v2/<version>/default
+
+Where `<version>` can be `v2s` or `v2h`.
+
+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 into bootloader DFU
+Enter the bootloader DFU mode in 3 ways:
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape in the default keymap) and plug in the keyboard
+* **Physical reset button**: press and hold the reset button on the back of the PCB for five seconds
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` (Escape key on layer 1 in the default keymap)
diff --git a/keyboards/smithrune/iron180v2/v2h/config.h b/keyboards/smithrune/iron180v2/v2h/config.h
new file mode 100644
index 00000000000..1d195c5a458
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2h/config.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2023 Gondolindrim  <gondolindrim@acheronproject.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
+
+/* 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 WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE 4096
diff --git a/keyboards/smithrune/iron180v2/v2h/info.json b/keyboards/smithrune/iron180v2/v2h/info.json
new file mode 100644
index 00000000000..a41c9d7e952
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2h/info.json
@@ -0,0 +1,674 @@
+{
+    "keyboard_name": "Iron180H v2",
+    "manufacturer": "SmithRune",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x8384",
+        "pid": "0x1182",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C8" , "C7" , "C6" , "B15", "B14", "B13", "B12", "B3" , "D2" , "B1" , "B0" , "C12", "C10", "A10", "A15", "C0" , "C1" , "C4"],
+        "rows": ["B4" , "C11", "A8" , "C9" , "B10", "C5" , "B5" , "B6"]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_split_bs_rshift"
+    },
+    "community_layouts": [
+        "tkl_f13_ansi",
+        "tkl_f13_ansi_split_bs_rshift",
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_ansi_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/smithrune/iron180v2/v2h/keymaps/default/keymap.c b/keyboards/smithrune/iron180v2/v2h/keymaps/default/keymap.c
new file mode 100755
index 00000000000..82cc8162ad5
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2h/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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_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_F13 ,             KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,    KC_INS , KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,                      KC_UP  ,
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RWIN, MO(1)  , KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+    )
+};
diff --git a/keyboards/smithrune/iron180v2/v2h/keymaps/via/keymap.c b/keyboards/smithrune/iron180v2/v2h/keymaps/via/keymap.c
new file mode 100755
index 00000000000..82cc8162ad5
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2h/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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_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_F13 ,             KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,    KC_INS , KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,                      KC_UP  ,
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RWIN, MO(1)  , KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+    )
+};
diff --git a/keyboards/smithrune/iron180v2/v2h/keymaps/via/rules.mk b/keyboards/smithrune/iron180v2/v2h/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2h/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/smithrune/iron180v2/v2h/matrix_diagram.md b/keyboards/smithrune/iron180v2/v2h/matrix_diagram.md
new file mode 100644
index 00000000000..2e6310bcb68
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2h/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for SmithRune Iron180 V2 H
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0G │0F │0E │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E ││1F │1G │3G │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └───────┘
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │             
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘                       
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                          
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐                 
+│40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │    │4F │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│50  │51  │52  │56                      │59  │5A  │5B  │5C  ││5E │5F │5G │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+                                                 ┌──────────┐
+                                    2.75u RShift │4C        │
+                                                 └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │56                         │5A   │5B │5C   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/smithrune/iron180v2/v2h/rules.mk b/keyboards/smithrune/iron180v2/v2h/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2h/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/smithrune/iron180v2/v2s/config.h b/keyboards/smithrune/iron180v2/v2s/config.h
new file mode 100644
index 00000000000..bf443b56f15
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2s/config.h
@@ -0,0 +1,46 @@
+/*
+Copyright 2023 Gondolindrim  <gondolindrim@acheronproject.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 BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   3
+#define BACKLIGHT_PAL_MODE      2
+
+/* 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 WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE 4096
+
+/*
+ * 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
diff --git a/keyboards/smithrune/iron180v2/v2s/halconf.h b/keyboards/smithrune/iron180v2/v2s/halconf.h
new file mode 100644
index 00000000000..c58ddcbf7bd
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2s/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/iron180/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/smithrune/iron180v2/v2s/info.json b/keyboards/smithrune/iron180v2/v2s/info.json
new file mode 100644
index 00000000000..82744159912
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2s/info.json
@@ -0,0 +1,1432 @@
+{
+    "keyboard_name": "Iron180 Sv2",
+    "manufacturer": "SmithRune",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x8384",
+        "pid": "0x1181",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C7" , "C6" , "B15", "B14", "B13", "B12", "B10", "B3" , "D2" , "B0" , "C5" , "C12", "C10", "A10", "A15", "C0" , "C1" , "A7"],
+        "rows": ["B4" , "C11", "A8" , "C9" , "B1" , "C4" , "B5" , "B6"]
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "C8",
+        "levels": 20,
+        "breathing": false,
+        "as_caps_lock": true
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "community_layouts": [
+        "tkl_f13_ansi",
+        "tkl_f13_ansi_split_bs_rshift",
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_ansi_tsangan_split_bs_rshift",
+        "tkl_f13_iso",
+        "tkl_f13_iso_split_bs_rshift",
+        "tkl_f13_iso_tsangan",
+        "tkl_f13_iso_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 14], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [6, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [6, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [6, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [7, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/smithrune/iron180v2/v2s/keymaps/default/keymap.c b/keyboards/smithrune/iron180v2/v2s/keymaps/default/keymap.c
new file mode 100755
index 00000000000..f2d58a163d8
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2s/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+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_F13 ,             KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,    KC_INS , KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
+        KC_LSFT, KC_BSLS, 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_UP  ,
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RWIN, MO(1)  , KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+    )
+};
diff --git a/keyboards/smithrune/iron180v2/v2s/keymaps/via/keymap.c b/keyboards/smithrune/iron180v2/v2s/keymaps/via/keymap.c
new file mode 100755
index 00000000000..f2d58a163d8
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2s/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+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_F13 ,             KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,    KC_INS , KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
+        KC_LSFT, KC_BSLS, 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_UP  ,
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RWIN, MO(1)  , KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
+    )
+};
diff --git a/keyboards/smithrune/iron180v2/v2s/keymaps/via/rules.mk b/keyboards/smithrune/iron180v2/v2s/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2s/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/smithrune/iron180v2/v2s/matrix_diagram.md b/keyboards/smithrune/iron180v2/v2s/matrix_diagram.md
new file mode 100644
index 00000000000..d946162263a
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2s/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for SmithRune Iron180 V2 S
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │0F │0G │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E ││6F │6F │6G │    │3E     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││7E │7F │7G │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐3D  │ ISO Enter
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                │3C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │    │4H │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│50  │51  │52  │56                      │59  │5A  │5B  │5C  ││5E │5H │5G │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│40      │ 2.25u LShift             2.75u RShift │4C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │56                         │5A   │5B │5C   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/smithrune/iron180v2/v2s/mcuconf.h b/keyboards/smithrune/iron180v2/v2s/mcuconf.h
new file mode 100644
index 00000000000..b7b462f8cd3
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2s/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Gondolindrim <gondolindrim@acheronproject.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_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keyboards/smithrune/iron180v2/v2s/rules.mk b/keyboards/smithrune/iron180v2/v2s/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/smithrune/iron180v2/v2s/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/smithrune/magnus/m75h/config.h b/keyboards/smithrune/magnus/m75h/config.h
index 310d7b19817..e72ba069692 100644
--- a/keyboards/smithrune/magnus/m75h/config.h
+++ b/keyboards/smithrune/magnus/m75h/config.h
@@ -27,6 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE 4096
diff --git a/keyboards/smithrune/magnus/m75h/info.json b/keyboards/smithrune/magnus/m75h/info.json
index 0592d2a7a6d..a4f2ce57682 100644
--- a/keyboards/smithrune/magnus/m75h/info.json
+++ b/keyboards/smithrune/magnus/m75h/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1676",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "features": {
         "audio": false,
         "backlight": false,
@@ -16,7 +24,6 @@
         "console": false,
         "encoder": false,
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
diff --git a/keyboards/smithrune/magnus/m75s/config.h b/keyboards/smithrune/magnus/m75s/config.h
index 61f5f8e0a5f..1e8874caa4e 100644
--- a/keyboards/smithrune/magnus/m75s/config.h
+++ b/keyboards/smithrune/magnus/m75s/config.h
@@ -29,6 +29,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE 4096
diff --git a/keyboards/smithrune/magnus/m75s/info.json b/keyboards/smithrune/magnus/m75s/info.json
index da2f4e3eff8..5b834631f78 100644
--- a/keyboards/smithrune/magnus/m75s/info.json
+++ b/keyboards/smithrune/magnus/m75s/info.json
@@ -8,6 +8,14 @@
         "pid": "0x1675",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "features": {
         "audio": false,
         "backlight": true,
@@ -16,7 +24,6 @@
         "console": false,
         "encoder": false,
         "extrakey": true,
-        "lto": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
diff --git a/keyboards/lefty/config.h b/keyboards/smoll/lefty/config.h
similarity index 100%
rename from keyboards/lefty/config.h
rename to keyboards/smoll/lefty/config.h
diff --git a/keyboards/lefty/info.json b/keyboards/smoll/lefty/info.json
similarity index 100%
rename from keyboards/lefty/info.json
rename to keyboards/smoll/lefty/info.json
diff --git a/keyboards/lefty/keymaps/default/keymap.c b/keyboards/smoll/lefty/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lefty/keymaps/default/keymap.c
rename to keyboards/smoll/lefty/keymaps/default/keymap.c
diff --git a/keyboards/lefty/keymaps/via/keymap.c b/keyboards/smoll/lefty/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/lefty/keymaps/via/keymap.c
rename to keyboards/smoll/lefty/keymaps/via/keymap.c
diff --git a/keyboards/smoll/lefty/keymaps/via/rules.mk b/keyboards/smoll/lefty/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/smoll/lefty/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/lefty/lefty.c b/keyboards/smoll/lefty/lefty.c
similarity index 100%
rename from keyboards/lefty/lefty.c
rename to keyboards/smoll/lefty/lefty.c
diff --git a/keyboards/lefty/readme.md b/keyboards/smoll/lefty/readme.md
similarity index 100%
rename from keyboards/lefty/readme.md
rename to keyboards/smoll/lefty/readme.md
diff --git a/keyboards/lefty/rev1/info.json b/keyboards/smoll/lefty/rev1/info.json
similarity index 100%
rename from keyboards/lefty/rev1/info.json
rename to keyboards/smoll/lefty/rev1/info.json
diff --git a/keyboards/smoll/lefty/rev1/rules.mk b/keyboards/smoll/lefty/rev1/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/lefty/rev2/info.json b/keyboards/smoll/lefty/rev2/info.json
similarity index 100%
rename from keyboards/lefty/rev2/info.json
rename to keyboards/smoll/lefty/rev2/info.json
diff --git a/keyboards/smoll/lefty/rev2/rules.mk b/keyboards/smoll/lefty/rev2/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/smoll/lefty/rules.mk b/keyboards/smoll/lefty/rules.mk
new file mode 100644
index 00000000000..d8d08e502c8
--- /dev/null
+++ b/keyboards/smoll/lefty/rules.mk
@@ -0,0 +1,17 @@
+# 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 = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
+
+OLED_ENABLE = yes
+
+DEFAULT_FOLDER = smoll/lefty/rev2
diff --git a/keyboards/pw88/info.json b/keyboards/smoll/pw88/info.json
similarity index 100%
rename from keyboards/pw88/info.json
rename to keyboards/smoll/pw88/info.json
diff --git a/keyboards/pw88/keymaps/default/keymap.c b/keyboards/smoll/pw88/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pw88/keymaps/default/keymap.c
rename to keyboards/smoll/pw88/keymaps/default/keymap.c
diff --git a/keyboards/pw88/keymaps/via/keymap.c b/keyboards/smoll/pw88/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pw88/keymaps/via/keymap.c
rename to keyboards/smoll/pw88/keymaps/via/keymap.c
diff --git a/keyboards/smoll/pw88/keymaps/via/rules.mk b/keyboards/smoll/pw88/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/smoll/pw88/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/pw88/readme.md b/keyboards/smoll/pw88/readme.md
similarity index 100%
rename from keyboards/pw88/readme.md
rename to keyboards/smoll/pw88/readme.md
diff --git a/keyboards/pw88/rules.mk b/keyboards/smoll/pw88/rules.mk
similarity index 100%
rename from keyboards/pw88/rules.mk
rename to keyboards/smoll/pw88/rules.mk
diff --git a/keyboards/snes_macropad/keymaps/jbarberu/keymap.c b/keyboards/snes_macropad/keymaps/jbarberu/keymap.c
deleted file mode 100644
index 478d1461e25..00000000000
--- a/keyboards/snes_macropad/keymaps/jbarberu/keymap.c
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2023 John Barbero Unenge (@jbarberu)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum Layer {
-    L_Numpad = 0,
-    L_Symbols,
-    L_EasyEDA,
-    L_RGB,
-    L_Adjust
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-   * Macropad Button Order
-   * ┌───┬───┬───┬───┐
-   * │ 7 │ 8 │ 9 │ - │
-   * ├───┼───┼───┼───┤
-   * │ 4 │ 5 │ 6 │ + │
-   * ├───┼───┼───┼───┤
-   * │ 1 │ 2 │ 3 │ 0 │
-   * └───┴───┴───┴───┘
-   *
-   * SNES Button Order
-   * ┌────────┬────────┬────────┬────────┐
-   * │   LT   │   RT   │ START  │ SELECT │
-   * ├────────┼────────┼────────┼────────┤
-   * │   UP   │  DOWN  │  LEFT  │ RIGHT  │
-   * ├────────┼────────┼────────┼────────┤
-   * │   A    │   B    │   X    │   Y    │
-   * └────────┴────────┴────────┴────────┘
-   *
-   */
-  [L_Numpad] = LAYOUT(
-      KC_P7,   KC_P8,   KC_P9,       TO(L_EasyEDA)
-    , KC_P4,   KC_P5,   KC_P6,       LT(L_Symbols, KC_PCMM)
-    , KC_P1,   KC_P2,   KC_P3,       KC_P0
-
-    , KC_A,    KC_S,    KC_ENT,      KC_BSPC
-    , KC_UP,   KC_DOWN, KC_LEFT,     KC_RIGHT
-    , KC_X,    KC_Z,    LSFT(KC_F1), KC_TAB
-  ),
-  [L_EasyEDA] = LAYOUT(
-      KC_COMM, KC_DOT,  KC_K,    TO(L_RGB)
-    , KC_LSFT, KC_M,    KC_N,    TO(L_Numpad)
-    , KC_LCTL, KC_SPC,  KC_DEL,  KC_BSPC
-
-    , KC_A,    KC_B,    KC_C,    KC_D
-    , QK_BOOT, KC_TRNS, KC_G,    KC_H
-    , KC_I,    KC_J,    KC_K,    KC_L
-  ),
-  [L_RGB] = LAYOUT(
-      RGB_M_P,  RGB_M_B, RGB_TOG, TO(L_Adjust)
-    , RGB_MOD,  RGB_HUI, RGB_VAI, TO(L_Numpad)
-    , RGB_RMOD, RGB_HUD, RGB_VAD, KC_NO
-
-    , KC_A,    KC_B,    KC_C,    KC_D
-    , KC_E,    KC_F,    KC_G,    KC_H
-    , KC_I,    KC_J,    KC_K,    KC_L
-  ),
-  [L_Adjust] = LAYOUT(
-      KC_NO,   KC_P8,   KC_NO,   KC_NO
-    , KC_NO,   RGB_HUD, KC_NO,   TO(L_Numpad)
-    , RGB_HUI, KC_NO,   KC_TRNS, KC_NO
-
-    , KC_A,    KC_B,    KC_C,    KC_D
-    , KC_E,    KC_F,    KC_G,    KC_H
-    , KC_I,    KC_J,    KC_K,    KC_L
-  ),
-  [L_Symbols] = LAYOUT(
-      KC_PPLS, KC_PMNS, KC_PEQL, KC_NO
-    , KC_PAST, KC_PSLS, KC_ENT,  KC_TRNS
-    , KC_NUM,  KC_NO,   KC_NO,   QK_BOOT
-
-    , KC_A,    KC_B,    KC_C,    KC_D
-    , KC_E,    KC_F,    KC_G,    KC_H
-    , KC_I,    KC_J,    KC_K,    KC_L
-  )
-};
-// clang-format on
-
-const char * get_layer_name_user(uint8_t layer) {
-    switch (layer) {
-        case L_Numpad:
-            return "Numpad";
-        case L_EasyEDA:
-            return "EasyEDA";
-        case L_RGB:
-            return "RGB Controls";
-        case L_Adjust:
-            return "Adjust";
-        case L_Symbols:
-            return "Symbols";
-        default:
-            return "Undef";
-    }
-}
diff --git a/keyboards/snes_macropad/snes_macropad.c b/keyboards/snes_macropad/snes_macropad.c
index 1dcfda33ec1..9f4f410fa3e 100644
--- a/keyboards/snes_macropad/snes_macropad.c
+++ b/keyboards/snes_macropad/snes_macropad.c
@@ -90,7 +90,7 @@ static void setupForFlashing(void) {
     // Set alternating backlight colors
     const uint8_t max = 20;
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    for (size_t i = 0; i < RGBLED_NUM; ++i) {
+    for (size_t i = 0; i < RGBLIGHT_LED_COUNT; ++i) {
         rgb_led_t *led_ = (rgb_led_t *)&led[i];
         switch (i % 2) {
             case 0:
diff --git a/keyboards/sofle/info.json b/keyboards/sofle/info.json
new file mode 100644
index 00000000000..91fdfd38be1
--- /dev/null
+++ b/keyboards/sofle/info.json
@@ -0,0 +1,117 @@
+{
+    "keyboard_name": "Sofle",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "usb": {
+        "vid": "0xFC32"
+    },
+    "diode_direction": "COL2ROW",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "led_count": 72,
+        "split_count": [36, 36],
+        "sleep": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [36, 36],
+        "sleep": true,
+        "layout": [
+            {"x": 96, "y": 40, "flags": 8},
+            {"x": 16, "y": 20, "flags": 2},
+            {"x": 48, "y": 10, "flags": 2},
+            {"x": 80, "y": 18, "flags": 2},
+            {"x": 88, "y": 60, "flags": 2},
+            {"x": 56, "y": 57, "flags": 2},
+            {"x": 24, "y": 60, "flags": 2},
+            {"matrix": [4, 0], "x": 32, "y": 57, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 36, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 24, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 12, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 12, "flags": 4},
+            {"matrix": [1, 1], "x": 16, "y": 24, "flags": 4},
+            {"matrix": [2, 1], "x": 16, "y": 36, "flags": 4},
+            {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
+            {"matrix": [4, 1], "x": 48, "y": 55, "flags": 4},
+            {"matrix": [4, 2], "x": 64, "y": 57, "flags": 4},
+            {"matrix": [3, 2], "x": 32, "y": 45, "flags": 4},
+            {"matrix": [2, 2], "x": 32, "y": 33, "flags": 4},
+            {"matrix": [1, 2], "x": 32, "y": 21, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 9, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 7, "flags": 4},
+            {"matrix": [1, 3], "x": 48, "y": 19, "flags": 4},
+            {"matrix": [2, 3], "x": 48, "y": 31, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 43, "flags": 4},
+            {"matrix": [4, 3], "x": 80, "y": 59, "flags": 4},
+            {"matrix": [4, 4], "x": 96, "y": 64, "flags": 4},
+            {"matrix": [3, 4], "x": 64, "y": 45, "flags": 4},
+            {"matrix": [2, 4], "x": 64, "y": 33, "flags": 4},
+            {"matrix": [1, 4], "x": 64, "y": 21, "flags": 4},
+            {"matrix": [0, 4], "x": 64, "y": 9, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 10, "flags": 4},
+            {"matrix": [1, 5], "x": 80, "y": 22, "flags": 4},
+            {"matrix": [2, 5], "x": 80, "y": 34, "flags": 4},
+            {"matrix": [3, 5], "x": 80, "y": 47, "flags": 4},
+            {"x": 128, "y": 40, "flags": 8},
+            {"x": 208, "y": 20, "flags": 2},
+            {"x": 176, "y": 10, "flags": 2},
+            {"x": 144, "y": 18, "flags": 2},
+            {"x": 136, "y": 60, "flags": 2},
+            {"x": 168, "y": 57, "flags": 2},
+            {"x": 200, "y": 60, "flags": 2},
+            {"matrix": [9, 0], "x": 192, "y": 57, "flags": 4},
+            {"matrix": [8, 0], "x": 224, "y": 48, "flags": 4},
+            {"matrix": [7, 0], "x": 224, "y": 36, "flags": 4},
+            {"matrix": [6, 0], "x": 224, "y": 24, "flags": 4},
+            {"matrix": [5, 0], "x": 224, "y": 12, "flags": 4},
+            {"matrix": [5, 1], "x": 208, "y": 12, "flags": 4},
+            {"matrix": [6, 1], "x": 208, "y": 24, "flags": 4},
+            {"matrix": [7, 1], "x": 208, "y": 36, "flags": 4},
+            {"matrix": [8, 1], "x": 208, "y": 48, "flags": 4},
+            {"matrix": [9, 1], "x": 176, "y": 55, "flags": 4},
+            {"matrix": [9, 2], "x": 160, "y": 57, "flags": 4},
+            {"matrix": [8, 2], "x": 192, "y": 45, "flags": 4},
+            {"matrix": [7, 2], "x": 192, "y": 33, "flags": 4},
+            {"matrix": [6, 2], "x": 192, "y": 21, "flags": 4},
+            {"matrix": [5, 2], "x": 192, "y": 9, "flags": 4},
+            {"matrix": [5, 3], "x": 176, "y": 7, "flags": 4},
+            {"matrix": [6, 3], "x": 176, "y": 19, "flags": 4},
+            {"matrix": [7, 3], "x": 176, "y": 31, "flags": 4},
+            {"matrix": [8, 3], "x": 176, "y": 43, "flags": 4},
+            {"matrix": [9, 3], "x": 144, "y": 59, "flags": 4},
+            {"matrix": [9, 4], "x": 128, "y": 64, "flags": 4},
+            {"matrix": [8, 4], "x": 160, "y": 45, "flags": 4},
+            {"matrix": [7, 4], "x": 160, "y": 33, "flags": 4},
+            {"matrix": [6, 4], "x": 160, "y": 21, "flags": 4},
+            {"matrix": [5, 4], "x": 160, "y": 9, "flags": 4},
+            {"matrix": [5, 5], "x": 144, "y": 10, "flags": 4},
+            {"matrix": [6, 5], "x": 144, "y": 22, "flags": 4},
+            {"matrix": [7, 5], "x": 144, "y": 34, "flags": 4},
+            {"matrix": [8, 5], "x": 144, "y": 47, "flags": 4}
+        ]
+    }
+}
diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
old mode 100755
new mode 100644
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index ae7c4a1935b..8c76e875b01 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -1,14 +1,11 @@
 {
     "keyboard_name": "Sofle",
     "manufacturer": "Keyhive",
+    "development_board": "elite_c",
     "usb": {
-        "vid": "0xFC32",
         "pid": "0x1287",
         "device_version": "0.0.2"
     },
-    "ws2812": {
-        "pin": "D3"
-    },
     "rgblight": {
         "hue_steps": 10,
         "led_count": 74,
@@ -21,14 +18,12 @@
         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", null],
         "rows": ["C6", "D7", "E6", "B4", "B5"]
     },
-    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4"}
         ]
     },
     "split": {
-        "soft_serial_pin": "D2",
         "encoder": {
             "right": {
                 "rotary": [
@@ -44,17 +39,11 @@
         },
         "transport": {
             "sync": {
-                "matrix_state": true,
                 "oled": true,
                 "wpm": true
             }
         }
     },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/sofle/keyhive/readme.md b/keyboards/sofle/keyhive/readme.md
old mode 100755
new mode 100644
diff --git a/keyboards/sofle/keyhive/rules.mk b/keyboards/sofle/keyhive/rules.mk
old mode 100755
new mode 100644
index 00719ebea0c..6e7633bfe01
--- a/keyboards/sofle/keyhive/rules.mk
+++ b/keyboards/sofle/keyhive/rules.mk
@@ -1,16 +1 @@
-# 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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h b/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
deleted file mode 100644
index dd3b6d8f5a7..00000000000
--- a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
- /* Copyright 2022 Bastien Baloup
-  *
-  * 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
-
-// More lighting options in quantum/rgblight/rgblight.h
-#ifdef RGBLIGHT_ENABLE
-
-    // Disabling some of these is a good way to save flash space.
-//  #define RGBLIGHT_EFFECT_ALTERNATING
-//  #define RGBLIGHT_EFFECT_RGB_TEST
-//  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//  #define RGBLIGHT_EFFECT_BREATHING
-//  #define RGBLIGHT_EFFECT_KNIGHT
-//  #define RGBLIGHT_EFFECT_SNAKE
-//  #define RGBLIGHT_EFFECT_CHRISTMAS
-//  #define RGBLIGHT_EFFECT_TWINKLE
-
-    // Set default lighting option
-    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+2
-    // Allow use of LEDs as modifier/layer indicators without disrupting animations.
-    #define RGBLIGHT_LAYERS
-
-    // Allow compiling to work on sofle/rev1
-    #if defined(KEYBOARD_sofle_rev1)
-	    #define RGBLED_NUM 70
-	    // D3 for ws2812 RGB LED
-	    #define WS2812_DI_PIN D3
-    #endif
-#endif
-
-// Disabled to save space
-#define NO_ACTION_ONESHOT
-#define NO_MUSIC_MODE
-#undef  LOCKING_SUPPORT_ENABLE
-#undef  LOCKING_RESYNC_ENABLE
-
-// Limit the number of layers that the firmware can use to save space
-#define LAYER_STATE_8BIT
diff --git a/keyboards/sofle/keymaps/bastien-baloup_fr/keymap.c b/keyboards/sofle/keymaps/bastien-baloup_fr/keymap.c
deleted file mode 100644
index ee207ae34ea..00000000000
--- a/keyboards/sofle/keymaps/bastien-baloup_fr/keymap.c
+++ /dev/null
@@ -1,211 +0,0 @@
- /* Copyright 2022 Bastien Baloup
-  *
-  * 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 custom_keycodes {
-    // CL_ keycodes are here for charaters that need capslock on to be inputed.
-    CL_AGRV = SAFE_RANGE,      // À
-    CL_EACU,                   // É
-    CL_EGRV,                   // È
-    // UC_ keycodes uses (ctrl+shift+u)+code+enter to input unicode.
-    // I do not use the qmk unicode implementation because it does not uses the right keycodes to input numbers in a french layout.
-    UC_PI  ,                   // π
-    UC_ELIP                    // …
-};
-
-// Following keymaps are made for the french ISO keyboard layout
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * LOWERcase
- * ,-----------------------------------------.                     ,-----------------------------------------.
- * |   ²  |   &  |   é  |   "  |   '  |   ^  |                     |   ¨  |   è  |   %  |   ç  |   à  |  TG3 |
- * |------+------+------+------+------+------|                     |------+------+------+------+------+------|
- * | ESC  |   a  |   z  |   e  |   r  |   t  |                     |   y  |   u  |   i  |   o  |   p  | Bspc |
- * |------+------+------+------+------+------|                     |------+------+------+------+------+------|
- * | Tab  |   q  |   s  |   d  |   f  |   g  |-------.     ,-------|   h  |   j  |   k  |   l  |   m  |   ù  |
- * |------+------+------+------+------+------|       |     | Mute  |------+------+------+------+------+------|
- * | MO1  |   w  |   x  |   c  |   v  |   b  |-------|     |-------|   n  |   ,  |   ;  |   :  |   !  |  MO1 |
- * `-----------------------------------------/       /      \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |  MO2 | /Enter  /        \Space \  |  MO3 | RCTR | RAlt | HYPER|
- *            |      |      |      |      |/       /          \      \ |      |      |      |      |
- *            `-----------------------------------'            '------''---------------------------'
- */
-
-[0] = LAYOUT(
-   KC_GRV    , KC_1   , KC_2   , KC_3   , KC_4   , KC_LBRC,                         S(KC_LBRC), KC_7   , S(KC_QUOT), KC_9   , KC_0   , TG(3)  ,
-   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,
-   MO(1)     , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , XXXXXXX,       KC_MUTE, KC_N      , KC_M   , KC_COMM   , KC_DOT , KC_SLSH, MO(1)  ,
-                      KC_LGUI, KC_LALT, KC_LCTL, MO(2)  , KC_ENT,           KC_SPC, MO(3)  , KC_RCTL, KC_RALT, KC_HYPR
-),
-// I use a uppercase layer instead of using the Shift key because I find it easier to change the effect of shift+key chords this way.
-/*
- * UPPERcase
- * ,-----------------------------------------.                     ,-----------------------------------------.
- * |      |   1  |   2  |   3  |   4  |   5  |                     |   6  |   7  |   8  |   9  |   0  |  TG3 |
- * |------+------+------+------+------+------|                     |------+------+------+------+------+------|
- * | ESC  |   A  |   Z  |   E  |   R  |   T  |                     |   Y  |   U  |   I  |   O  |   P  | Bspc |
- * |------+------+------+------+------+------|                     |------+------+------+------+------+------|
- * | TAB  |   Q  |   S  |   D  |   F  |   G  |-------.     ,-------|   H  |   J  |   K  |   L  |   M  |   µ  |
- * |------+------+------+------+------+------|       |     | Mute  |------+------+------+------+------+------|
- * | MO1  |   W  |   X  |   C  |   V  |   B  |-------|     |-------|   N  |   ?  |   .  |   /  |   §  |  MO1 |
- * `-----------------------------------------/       /      \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |  MO2 | /Enter  /        \Space \  |  MO3 | RCTR | RAlt | HYPER|
- *            |      |      |      |      |/       /          \      \ |      |      |      |      |
- *            `-----------------------------------'            '------''---------------------------'
- */
-[1] = LAYOUT(
-   _______, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5),                         S(KC_6) , S(KC_7), S(KC_8)   , S(KC_9)  , S(KC_0)   , _______   ,
-   _______, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T),                         S(KC_Y) , S(KC_U), S(KC_I)   , S(KC_O)  , S(KC_P)   , _______   ,
-   _______, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G),                         S(KC_H) , S(KC_J), S(KC_K)   , S(KC_L)  , S(KC_SCLN), S(KC_NUHS),
-   _______, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), _______,       _______, S(KC_N) , S(KC_M), S(KC_COMM), S(KC_DOT), S(KC_SLSH), _______   ,
-                   _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______
-),
-
-// I replaced MO1 with the Shift key in the next layers to be able to use it for some shortcuts.
-
-/* SYMBOLS
- * ,-----------------------------------------.                     ,-----------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                     |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------|                     |------+------+------+------+------+------|
- * | ESC  |   À  |   È  |   É  |   (  |   )  |                     |   =  |   |  |   \  |   ·  |   @  | Bspc |
- * |------+------+------+------+------+------|                     |------+------+------+------+------+------|
- * | Tab  |   `  |   ~  |   #  |   <  |   >  |-------.     ,-------|   +  |   -  |   /  |   *  |   °  |   …  |
- * |------+------+------+------+------+------|       |     | Play  |------+------+------+------+------+------|
- * | Shift|   ¤  |   [  |   ]  |   {  |   }  |-------|     |-------|   π  |   _  |   €  |   $  |   £  | Shift|
- * `-----------------------------------------/       /      \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |  MO2 | /Enter  /        \Space \  |  MO3 | RCTR | RAlt | HYPER|~
- *            |      |      |      |      |/       /          \      \ |      |      |      |      |
- *            `-----------------------------------'            '------''---------------------------'
- */
-[2] = 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 ,
-  _______, CL_AGRV      , CL_EGRV   , CL_EACU      , KC_5      , KC_MINS     ,                         KC_EQL   , ALGR(KC_6), ALGR(KC_8), ALGR(KC_COMM), ALGR(KC_0), _______,
-  _______, ALGR(KC_7)   , ALGR(KC_2), ALGR(KC_3)   , KC_NUBS   , S(KC_NUBS)  ,                         S(KC_EQL), KC_6      , S(KC_DOT) , KC_NUHS      , S(KC_MINS), UC_ELIP,
-  KC_LSFT, ALGR(KC_RBRC), ALGR(KC_5), ALGR(KC_MINS), ALGR(KC_4), ALGR(KC_EQL), _______,       KC_MPLY, UC_PI    , KC_8      , ALGR(KC_E), KC_RBRC      , S(KC_RBRC), KC_RSFT,
-                                         _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______
-),
-/* UTILS
- * ,----------------------------------------.                      ,-----------------------------------------.
- * |      |   &  |   é  |   "  |   (  |   ^  |                     | CLock|PScr  |ScLock| Pause|  Ins |  TG3 |
- * |------+------+------+------+------+------|                     |------+------+------+------+------+------|
- * | Esc  |   a  |   z  |   e  |   r  |  t   |                     | PgUp | Home |  Up  | End  |  Del | Bspc |
- * |------+------+------+------+------+------|                     |------+------+------+------+------+------|
- * | Tab  |   q  |   s  |   d  |   f  |  g   |-------.     ,-------| PgDo | Left | Down | Rigth|CALeft|CARigt|
- * |------+------+------+------+------+------|       |     | Play  |------+------+------+------+------+------|
- * |Shift |   w  |   x  |   c  |   v  |  b   |-------|     |-------|      | PWrd |      | NWrd | Menu | Shift|
- * `-----------------------------------------/      /       \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |  MO2 | /Enter  /        \Space \  |  MO3 | RCTR | RAlt | HYPER|
- *            |      |      |      |      |/      /           \      \ |      |      |      |      |
- *            `----------------------------------'             '------''---------------------------'
- */
-[3] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                         KC_CAPS, KC_PSCR   , KC_SCRL, KC_PAUS   , KC_INS       , _______      ,
-  _______, _______, _______, _______, _______, _______,                         KC_PGUP, KC_HOME   , KC_UP  , KC_END    , KC_DEL       , _______      ,
-  _______, _______, _______, _______, _______, _______,                         KC_PGDN, KC_LEFT   , KC_DOWN, KC_RGHT   , C(A(KC_LEFT)), C(A(KC_RGHT)),
-  KC_LSFT, _______, _______, _______, _______, _______, _______,       KC_MPLY, XXXXXXX, C(KC_LEFT), XXXXXXX, C(KC_RGHT), KC_MENU      , KC_RSFT      ,
-                  _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______
-)
-};
-
-// Custom keycode handling.
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // handling this once instead of in each keycode uses less program memory.
-    if (record->event.pressed) {
-	    switch (keycode) {
-	        case CL_AGRV:
-	            // capsLockOn à capsLockOff
-	            SEND_STRING(SS_TAP(X_CAPS)"0"SS_TAP(X_CAPS));
-	            break;
-	        case CL_EACU:
-	            // capsLockOn é capsLockOff
-	            SEND_STRING(SS_TAP(X_CAPS)"2"SS_TAP(X_CAPS));
-	            break;
-	        case CL_EGRV:
-	            // capsLockOn è capsLockOff
-	            SEND_STRING(SS_TAP(X_CAPS)"7"SS_TAP(X_CAPS));
-	            break;
-	        case UC_PI:
-	            // Ctrl+Shift+u 3CO Enter
-	            tap_code16(LCTL(LSFT(KC_U)));
-	            tap_code16(S(KC_3));
-	            tap_code16(KC_C);
-	            tap_code16(S(KC_0));
-	            tap_code16(KC_ENT);
-	            break;
-	        case UC_ELIP:
-	            // Ctrl+Shift+u 2026 Enter
-	            tap_code16(LCTL(LSFT(KC_U)));
-	            tap_code16(S(KC_2));
-	            tap_code16(S(KC_0));
-	            tap_code16(S(KC_2));
-	            tap_code16(S(KC_6));
-	            tap_code16(KC_ENT);
-	            break;
-	    }
-    }
-    // this uses less memory than returning in each case.
-    return keycode < SAFE_RANGE;
-};
-
-#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
-// This section is like the keymap matrix, but for rotary encoders
-// My left encoder is currently not working, so I'm using Layers instead
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
-    [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
-    [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(KC_MNXT, KC_MPRV)},
-    [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(KC_MNXT, KC_MPRV)},
-};
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-// This section define RGB_Lighting overrides by layers
-
-const rgblight_segment_t PROGMEM rgb_layer_1[] = RGBLIGHT_LAYER_SEGMENTS(
-    {30, 6, HSV_TURQUOISE},
-    {38, 6, HSV_TURQUOISE}
-);
-const rgblight_segment_t PROGMEM rgb_layer_2[] = RGBLIGHT_LAYER_SEGMENTS(
-    {30, 6, HSV_TEAL},
-    {38, 6, HSV_TEAL}
-);
-const rgblight_segment_t PROGMEM rgb_layer_3[] = RGBLIGHT_LAYER_SEGMENTS(
-    {38, 6, HSV_PURPLE}
-);
-
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    rgb_layer_1,     // Overrides for layer 1
-    rgb_layer_2,     // Overrides for layer 2
-    rgb_layer_3     // Overrides for layer 3
-);
-
-// Enable the LED layers
-void keyboard_post_init_user(void) {
-    rgblight_layers = rgb_layers;
-}
-
-// Set activation conditions for each LED layers
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(1, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 3));
-    return state;
-}
-
-#endif
diff --git a/keyboards/sofle/keymaps/bastien-baloup_fr/readme.md b/keyboards/sofle/keymaps/bastien-baloup_fr/readme.md
deleted file mode 100644
index 315f172a747..00000000000
--- a/keyboards/sofle/keymaps/bastien-baloup_fr/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![Bastien-Baloup_FR keymap for sofle keyboard](https://i.imgur.com/Zlv1dj1h.jpg)
-
-# Bastien-Baloup's French keymap for sofle keyboard
-
-Keymap based on the french azerty keyboard layout.
diff --git a/keyboards/sofle/keymaps/bastien-baloup_fr/rules.mk b/keyboards/sofle/keymaps/bastien-baloup_fr/rules.mk
deleted file mode 100644
index e3a0bd51934..00000000000
--- a/keyboards/sofle/keymaps/bastien-baloup_fr/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-RGBLIGHT_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-LTO_ENABLE = yes
-ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
-OLED_ENABLE = no
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
diff --git a/keyboards/sofle/keymaps/default/config.h b/keyboards/sofle/keymaps/default/config.h
deleted file mode 100644
index c5494c20aab..00000000000
--- a/keyboards/sofle/keymaps/default/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-/* The way how "handedness" is decided (which half is which),
-see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
-for more options.
-*/
diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c
index 377b4498e62..37996c3e413 100644
--- a/keyboards/sofle/keymaps/default/keymap.c
+++ b/keyboards/sofle/keymaps/default/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include QMK_KEYBOARD_H
 
 enum sofle_layers {
@@ -10,16 +12,14 @@ enum sofle_layers {
 };
 
 enum custom_keycodes {
-    KC_QWERTY = SAFE_RANGE,
+    KC_QWERTY = QK_USER,
     KC_COLEMAK,
     KC_PRVWD,
     KC_NXTWD,
     KC_LSTRT,
-    KC_LEND,
-    KC_DLINE
+    KC_LEND
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
  * QWERTY
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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_MUTE,     XXXXXXX,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTL, MO(_LOWER), KC_ENT,      KC_SPC,  MO(_RAISE), KC_RCTL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTL, TL_LOWR, KC_ENT,      KC_SPC,  TL_UPPR, KC_RCTL, KC_RALT, KC_RGUI
 ),
 /*
  * COLEMAK
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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_MUTE,      XXXXXXX,KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTL,MO(_LOWER), KC_ENT,        KC_SPC,  MO(_RAISE), KC_RCTL, KC_RALT, KC_RGUI
+                 KC_LGUI,KC_LALT,KC_LCTL,TL_LOWR, KC_ENT,        KC_SPC,  TL_UPPR, KC_RCTL, KC_RALT, KC_RGUI
 ),
 /* LOWER
  * ,-----------------------------------------.                    ,-----------------------------------------.
@@ -104,9 +104,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_RAISE] = LAYOUT(
   _______, _______ , _______ , _______ , _______ , _______,                           _______,  _______  , _______,  _______ ,  _______ ,_______,
-  _______,  KC_INS,  KC_PSCR,   KC_APP,  XXXXXXX, XXXXXXX,                        KC_PGUP, KC_PRVWD,   KC_UP, KC_NXTWD,KC_DLINE, KC_BSPC,
+  _______,  KC_INS,  KC_PSCR,   KC_APP,  XXXXXXX, XXXXXXX,                        KC_PGUP, KC_PRVWD,   KC_UP, KC_NXTWD,C(KC_BSPC), KC_BSPC,
   _______, KC_LALT,  KC_LCTL,  KC_LSFT,  XXXXXXX, KC_CAPS,                       KC_PGDN,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_DEL, KC_BSPC,
-  _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   XXXXXXX, _______,
+  _______, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), XXXXXXX,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   XXXXXXX, _______,
                          _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______
 ),
 /* ADJUST
@@ -132,86 +132,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-#ifdef OLED_ENABLE
-
-static void render_logo(void) {
-    static const char PROGMEM qmk_logo[] = {
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
-    };
-
-    oled_write_P(qmk_logo, false);
-}
-
-static void print_status_narrow(void) {
-    // Print current mode
-    oled_write_P(PSTR("\n\n"), false);
-    oled_write_ln_P(PSTR("MODE"), false);
-    oled_write_ln_P(PSTR(""), false);
-    if (keymap_config.swap_lctl_lgui) {
-        oled_write_ln_P(PSTR("MAC"), false);
-    } else {
-        oled_write_ln_P(PSTR("WIN"), false);
-    }
-
-    switch (get_highest_layer(default_layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("Qwrt"), false);
-            break;
-        case _COLEMAK:
-            oled_write_ln_P(PSTR("Clmk"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    // Print current layer
-    oled_write_ln_P(PSTR("LAYER"), false);
-    switch (get_highest_layer(layer_state)) {
-        case _COLEMAK:
-        case _QWERTY:
-            oled_write_P(PSTR("Base\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adj\n"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    led_t led_usb_state = host_keyboard_led_state();
-    oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-    return rotation;
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        print_status_narrow();
-    } else {
-        render_logo();
-    }
-    return false;
-}
-
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case KC_QWERTY:
@@ -298,73 +218,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             break;
-        case KC_DLINE:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_BSPC);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_BSPC);
-            }
-            break;
-        case KC_COPY:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_C);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_C);
-            }
-            return false;
-        case KC_PASTE:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_V);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_V);
-            }
-            return false;
-        case KC_CUT:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_X);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_X);
-            }
-            return false;
-            break;
-        case KC_UNDO:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_Z);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_Z);
-            }
-            return false;
     }
     return true;
 }
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
-
-#endif
diff --git a/keyboards/sofle/keymaps/default/readme.md b/keyboards/sofle/keymaps/default/readme.md
index 6d6dea228c9..879513af069 100644
--- a/keyboards/sofle/keymaps/default/readme.md
+++ b/keyboards/sofle/keymaps/default/readme.md
@@ -1,12 +1,10 @@
-![SofleKeyboard default keymap](https://github.com/josefadamcik/SofleKeyboard/raw/master/Images/soflekeyboard.png)
-![SofleKeyboard adjust layer](https://github.com/josefadamcik/SofleKeyboard/raw/master/Images/soflekeyboard_layout_adjust.png)
-
+![SofleKeyboard default keymap](https://i.imgur.com/MZxVvm9.png)
+![SofleKeyboard adjust layer](https://i.imgur.com/f5sKy0I.png)
 
 # Default keymap for Sofle Keyboard
 
 Layout in [Keyboard Layout Editor](http://www.keyboard-layout-editor.com/#/gists/76efb423a46cbbea75465cb468eef7ff) and [adjust layer](http://www.keyboard-layout-editor.com/#/gists/4bcf66f922cfd54da20ba04905d56bd4)
 
-
 Features:
 
 - Symmetric modifiers (CMD/Super, Alt/Opt, Ctrl, Shift)
@@ -15,5 +13,3 @@ Features:
 - Modes for Mac vs Linux/Win support -> different order of modifiers and different action shortcuts on the "UPPER" layer (the red one in the image). Designed to simplify transtions when switching between operating systems often.
 - The OLED on master half shows selected mode and caps lock state and is rotated.
 - Left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN.
-
-
diff --git a/keyboards/sofle/keymaps/default/rules.mk b/keyboards/sofle/keymaps/default/rules.mk
index ab79c07969f..7c9bf212a6f 100644
--- a/keyboards/sofle/keymaps/default/rules.mk
+++ b/keyboards/sofle/keymaps/default/rules.mk
@@ -1,5 +1 @@
-
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-CONSOLE_ENABLE = no
-EXTRAKEY_ENABLE = yes
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/flare576/config.h b/keyboards/sofle/keymaps/flare576/config.h
deleted file mode 100644
index c89f38c127f..00000000000
--- a/keyboards/sofle/keymaps/flare576/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 Flare576 <flare576@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 MAIN_BOARD
-#define MASTER_RIGHT
-#define ENCODER_DIRECTION_FLIP
-#define OLED_TIMEOUT 10000
-
-#define MOUSEKEY_INTERVAL 16
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 7
-#define MOUSEKEY_WHEEL_DELAY 0
-#define TAPPING_TERM_PER_KEY
-
-#ifdef ENCODER_RESOLUTION
-    #undef ENCODER_RESOLUTION
-#endif
-#define ENCODER_RESOLUTION 4
-
-#ifdef TAPPING_TERM
-    #undef TAPPING_TERM
-#endif
-#define TAPPING_TERM 200
-
-#undef MANUFACTURER
-#define MANUFACTURER "Flare576"
diff --git a/keyboards/sofle/keymaps/flare576/enums.h b/keyboards/sofle/keymaps/flare576/enums.h
deleted file mode 100644
index 7edcc1110f3..00000000000
--- a/keyboards/sofle/keymaps/flare576/enums.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Flare576 <flare576@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
-enum _layers {
-    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
-    _BASE,
-    _MOUS,
-    _SYMS,
-    _FF14,
-    _ESDF,
-};
-
-enum custom_keycodes {
-    _COMP1  = SAFE_RANGE,
-    _COMP2,
-};
-
-enum custom_tapdance {
-    TD_PLAY,
-    TD_HOME,
-};
diff --git a/keyboards/sofle/keymaps/flare576/graphics.c b/keyboards/sofle/keymaps/flare576/graphics.c
deleted file mode 100644
index 8cade61668d..00000000000
--- a/keyboards/sofle/keymaps/flare576/graphics.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/* Copyright 2021 Flare576 <flare576@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
-#include "enums.h"
-#include "logos.h"
-int current_wpm = -1; // Enable screen-on at startup
-bool isJumping = false;
-bool showedJump = true;
-
-#ifdef OLED_DRIVER_ENABLE
-
-#ifdef MAIN_BOARD
-static void render_logos(void){}
-void luna_jump(bool newJump){
-    isJumping = newJump;
-    if (newJump) {
-        showedJump = false;
-    }
-}
-
-// START Luna vars
-#define MIN_WALK_SPEED 10
-#define MIN_RUN_SPEED 40
-
-#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
-#define ANIM_SIZE 96 // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer = 0;
-uint8_t current_frame = 0;
-
-bool isSneaking = false;
-static void render_luna(int LUNA_X, int LUNA_Y) {
-
-    static const char PROGMEM sit[2][ANIM_SIZE] = {
-        // 'sit1', 32x22px
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c,
-            0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x68, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28,
-            0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        },
-
-        // 'sit2', 32x22px
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c,
-            0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x90, 0x08, 0x18, 0x60, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28,
-            0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        }
-    };
-
-    static const char PROGMEM walk[2][ANIM_SIZE] = {
-        // 'walk1', 32x22px
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x90, 0x90, 0x90, 0xa0, 0xc0, 0x80, 0x80,
-            0x80, 0x70, 0x08, 0x14, 0x08, 0x90, 0x10, 0x10, 0x08, 0xa4, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00,
-            0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0xea, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x03,
-            0x06, 0x18, 0x20, 0x20, 0x3c, 0x0c, 0x12, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        },
-
-        // 'walk2', 32x22px
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00,
-            0x00, 0xe0, 0x10, 0x28, 0x10, 0x20, 0x20, 0x20, 0x10, 0x48, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0xf8, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-            0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x30, 0xd5, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e,
-            0x02, 0x1c, 0x14, 0x08, 0x10, 0x20, 0x2c, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        }
-    };
-
-    static const char PROGMEM run[2][ANIM_SIZE] = {
-        // 'run1', 32x22px
-        {
-            0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0xc8, 0xb0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-            0x80, 0x40, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0xc4, 0xa4, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x58, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x09, 0x04, 0x04, 0x04, 0x04, 0x02, 0x03, 0x02, 0x01, 0x01,
-            0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
-        },
-
-        // 'run2', 32x22px
-        {
-            0x00, 0x00, 0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-            0x80, 0x80, 0x78, 0x28, 0x08, 0x10, 0x20, 0x30, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xb0, 0x50, 0x55, 0x20, 0x1f, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37,
-            0x02, 0x1e, 0x20, 0x20, 0x18, 0x0c, 0x14, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        }
-    };
-
-    static const char PROGMEM sneak[2][ANIM_SIZE] = {
-        // 'sneak1', 32x22px
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x1e, 0x21, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x04,
-            0x04, 0x04, 0x03, 0x01, 0x00, 0x00, 0x09, 0x01, 0x80, 0x80, 0xab, 0x04, 0xf8, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x02, 0x06,
-            0x18, 0x20, 0x20, 0x38, 0x08, 0x10, 0x18, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
-        },
-
-        // 'sneak2', 32x22px
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0xe0, 0xa0, 0x20, 0x40, 0x80, 0xc0, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x3e, 0x41, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 0x04,
-            0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x40, 0x55, 0x82, 0x7c, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x04,
-            0x18, 0x10, 0x08, 0x10, 0x20, 0x28, 0x34, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-        }
-    };
-
-    // animation state
-    void animation_phase(void) {
-
-        if (isJumping || !showedJump) {
-
-            // clear
-            oled_set_cursor(LUNA_X,LUNA_Y +2);
-            oled_write("     ", false);
-
-            oled_set_cursor(LUNA_X,LUNA_Y -1);
-
-            showedJump = true;
-        } else {
-
-            // clear
-            oled_set_cursor(LUNA_X,LUNA_Y -1);
-            oled_write("     ", false);
-
-            oled_set_cursor(LUNA_X,LUNA_Y);
-        }
-
-        current_frame = (current_frame + 1) % 2;
-
-        if(isSneaking) {
-            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
-
-        } else if(current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
-
-        } else if(current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
-
-        } else {
-            oled_write_raw_P(run[current_frame], ANIM_SIZE);
-        }
-    }
-
-    // animation timer
-    if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-        anim_timer = timer_read32();
-        animation_phase();
-    }
-
-}
-// END Luna vars
-
-
-static void main_board(void) {
-    int layer = get_highest_layer(layer_state);
-    isSneaking = false;
-    // Print current mode
-    oled_write_ln_P(PSTR("Flare"), false);
-    oled_write_ln_P(PSTR("Sofle"), false);
-    if (layer == _FF14) {
-        oled_write_raw_P(ffxiv, 16*8);
-    } else if (keymap_config.swap_lalt_lgui) {
-        oled_write_raw_P(windows, 16*8);
-    } else {
-        oled_write_raw_P(apple, 16*8);
-    }
-    oled_set_cursor(0, 9);
-
-    switch (layer) {
-        case _BASE:
-            oled_write_ln_P(PSTR("ALL"), false);
-            oled_write_P(PSTR(" YOUR"), false);
-            oled_write_ln_P(PSTR("BASE"), false);
-            break;
-        case _MOUS:
-            isSneaking = true;
-            oled_write_ln_P(PSTR("Mouse"), false);
-            break;
-        case _SYMS:
-            oled_write_ln_P(PSTR("@$*&#"), false);
-            break;
-        case _FF14:
-            oled_write_ln_P(PSTR("FFXIV"), false);
-            break;
-        case _ESDF:
-            oled_write_ln_P(PSTR("ESDF "), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-    }
-    if (layer != _BASE) {
-        oled_write_P(PSTR("\n"), false);
-    }
-
-    // Don't re-write if not in use
-    if (current_wpm > 0) {
-        render_luna(0,13);
-    }
-}
-
-// End "MAIN_BOARD"
-#else
-static void main_board(void){}
-static void luna_jump(bool newJump){}
-
-#define MARQUEE_FRAME_DURATION 200 // how long each frame lasts in ms
-#define LOGO_BYTES 128
-#define LOGO_COUNT 7
-static const char *const secondary_logos[] = { js, apple, docker, python, qmk, brew, windows };
-#define MARQUEE_FRAMES (LOGO_COUNT * 4)
-#define MARQUEE_SIZE ( LOGO_COUNT * LOGO_BYTES)
-#define MARQUEE_SCROLL_UP true
-uint32_t marquee_timer = 0;
-uint32_t marquee_frame = 0;
-
-static void render_logos(void) {
-    void marquee_phase(void) {
-        marquee_frame = (marquee_frame + 1) % MARQUEE_FRAMES;
-        int marquee_start = MARQUEE_SIZE - (marquee_frame * 32);
-        static char output[MARQUEE_SIZE];
-        for (int i = 0; i < LOGO_COUNT; i++) {
-            for (int j = 0; j < LOGO_BYTES; j++) {
-                int pos = ( i * LOGO_BYTES + j + marquee_start ) % MARQUEE_SIZE;
-                output[pos] = pgm_read_byte_near(secondary_logos[i] + j);
-            }
-        }
-        oled_write_raw(output, MARQUEE_SIZE);
-    }
-
-    // animation timer
-    if(timer_elapsed32(marquee_timer) > MARQUEE_FRAME_DURATION) {
-        marquee_timer = timer_read32();
-        marquee_phase();
-    }
-}
-
-// End "MAIN_BOARD" false
-#endif
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-void oled_task_user(void) {
-    // Prevent blank screen on startup
-    if (current_wpm == -1) {
-        set_current_wpm(10);
-    }
-    current_wpm = get_current_wpm();
-    if (is_keyboard_master()) {
-        // can't gate main_board on wpm; won't get mode changes that don't trigger wpm
-        main_board();
-    } else if (current_wpm > 0) {
-        render_logos();
-    }
-}
-
-// End "OLED_DRIVER_ENABLE"
-#else
-static void luna_jump(bool newJump){}
-// End "OLED_DRIVER_ENABLE" false
-#endif
diff --git a/keyboards/sofle/keymaps/flare576/graphics.h b/keyboards/sofle/keymaps/flare576/graphics.h
deleted file mode 100644
index 3979ee43d9e..00000000000
--- a/keyboards/sofle/keymaps/flare576/graphics.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Flare576 <flare576@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/>.
- */
-void luna_jump(bool newJump);
diff --git a/keyboards/sofle/keymaps/flare576/keymap.c b/keyboards/sofle/keymaps/flare576/keymap.c
deleted file mode 100644
index 57784d633b1..00000000000
--- a/keyboards/sofle/keymaps/flare576/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* Copyright 2021 Flare576 <flare576@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
-#include "print.h"
-#include "enums.h"
-#include "graphics.h"
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_PLAY] = ACTION_TAP_DANCE_DOUBLE(KC_MPLY, KC_MNXT),
-    [TD_HOME] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
-};
-
-#define KC_TPLY TD(TD_PLAY)
-#define KC_THME TD(TD_HOME)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * BASE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |Alt/Tb|   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |LShift|   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|  PLAY |    | PAGE  |------+------+------+------+------+------|
- * |LCtrl |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |+/SHFT|
- * `-----------------------------------------/       /     \Enter \-----------------------------------------'
- *            | ESDF | LAlt | ESC/ | LGUI | /Space  /       \ or   \  | Bspc | Alt+ |Delete|FFXIV |
- *            |      |      |Symbol|      |/       /         \Mouse \ |      |Shift |      |      |
- *            `----------------------------------'           '------''---------------------------'
- *
- * Note: Apple's keyboard settings don't seem to discern right- and left-ALT, so swapping keys there breaks TAB & META
- */
-[_BASE] = LAYOUT(
-  KC_GRV,         KC_1, KC_2,      KC_3,    KC_4,             KC_5,                                KC_6,    KC_7,          KC_8,    KC_9,     KC_0,    KC_MINS,
-  RALT_T(KC_TAB), KC_Q, KC_W,      KC_E,    KC_R,             KC_T,                                KC_Y,    KC_U,          KC_I,    KC_O,     KC_P,    KC_BSLS,
-  KC_LSFT,        KC_A, KC_S,      KC_D,    KC_F,             KC_G,                                KC_H,    KC_J,          KC_K,    KC_L,     KC_SCLN, KC_QUOT,
-  KC_LCTL,        KC_Z, KC_X,      KC_C,    KC_V,             KC_B,    KC_TPLY, KC_THME,           KC_N,    KC_M,          KC_COMM, KC_DOT,   KC_SLSH, RSFT_T(KC_PLUS),
-                        TG(_ESDF), KC_LALT, LT(_SYMS,KC_ESC), KC_LGUI, KC_SPC,  LT(_MOUS, KC_ENT), KC_BSPC, RSFT(KC_RALT), KC_DEL,  TG(_FF14)
-),
-
-/*
- * MOUS
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |CTRL+W|ALT+A |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | TRNS |PRNTSC|      | M UP | HOME | PGUP |                    |M Wl U|M Wl D|M Wl L|M Wl R|      |COMP1 |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | TRNS |SC LCK|M LFT |M DWN |M RGHT|      |-------.    ,-------|  UP  | DOWN | LEFT |RIGHT |      |COMP2 |
- * |------+------+------+------+------+------| TRNS  |    | TRNS  |------+------+------+------+------+------|
- * | TRNS |PAUSE |      |      | END  | PGDN |-------|    |-------|MOUS1 |MOUS2 |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            |      | TRNS | TRNS |TRNS  | / TRNS  /       \ TRNS \  |MOUS3 |MOUS4 |MOUS5 |      |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_MOUS] = LAYOUT(
-  LCTL(KC_W), LALT(KC_A), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
-  _______,    KC_PSCR,    XXXXXXX, KC_MS_U, KC_HOME, KC_PGUP,                   KC_WH_U, KC_WH_D, KC_WH_L, KC_WH_R,  XXXXXXX, _COMP1,
-  _______,    KC_SCRL,    KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, XXXXXXX, _COMP2,
-  _______,    KC_PAUS,    XXXXXXX, XXXXXXX, KC_END,  KC_PGDN, _______, _______, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
-                          XXXXXXX, _______, _______, _______, _______, _______, KC_BTN3, KC_BTN4, KC_BTN5, XXXXXXX
-),
-
-/* SYMS
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  | F5   |                    |      |      |   {  |   }  |      | QK_BOOT|
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | TRNS |  F6  |  F7  |  F8  |  F9  | F10  |                    |      |      |   (  |   )  |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | TRNS | F11  | F12  | F13  | F14  | F15  |-------.    ,-------|      |      |   [  |   ]  |      |      |
- * |------+------+------+------+------+------| TRNS  |    | TRNS  |------+------+------+------+------+------|
-   | TRNS | UNDO | CUT  | COPY |PASTE | F20  |-------|    |-------|      |      |   <  |   >  |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | TRNS | TRNS | TRNS | TRNS | / TRNS  /       \ TRNS \  | TRNS | TRNS | TRNS | TRNS |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_SYMS] = LAYOUT(
-  XXXXXXX, KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,                      XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX, QK_BOOT,
-  _______, KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,                     XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX,
-  _______, KC_F11,     KC_F12,     KC_F13,     KC_F14,     KC_F15,                     XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX,
-  _______, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), KC_F20,  _______,  _______, XXXXXXX, XXXXXXX, KC_LT,   KC_GT,   XXXXXXX, XXXXXXX,
-                       XXXXXXX,    _______,    _______,    _______, _______,  _______, _______, _______, _______, XXXXXXX
-),
-
-/* FF14
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |                    | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | TAB  | TRNS | TRNS | TRNS | TRNS | TRNS |                    | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |-------.    ,-------| TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |
- * |------+------+------+------+------+------| TRNS  |    | TRNS  |------+------+------+------+------+------|
- * | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |-------|    |-------| TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | ESDF |      | ESC  | TRNS | / TRNS  /       \ TRNS \  | TRNS |PrntSc| TRNS | TRNS |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_FF14] = LAYOUT(
-  _______, _______, _______,   _______, _______, _______,                   _______, _______, _______, _______, _______,  _______,
-  KC_TAB,  _______, _______,   _______, _______, _______,                   _______, _______, _______, _______, _______,  _______,
-  _______, _______, _______,   _______, _______, _______,                   _______, _______, _______, _______, _______,  _______,
-  _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
-                    TO(_ESDF), XXXXXXX, KC_ESC,  _______, _______, _______, _______, KC_PSCR, _______, _______
-),
-
-/* ESDF
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |   ~  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |   =  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   T  |  Tab |   Q  |   W  |   E  |   R  |                    | Ctl-Y| Ctl-U| Ctl-I| Ctl-O| Ctl-P| PGUP |
- * |------|------+------+------+------+------+                    |------+------+------+------+------+------|
- * |   G  |LShift|   A  |   S  |   D  |   F  |-------.    ,-------| Ctl-H| Ctl-J| Ctl-K| Ctl-L| Ctl-;| PGDN |
- * |------|------+------+------+------+------+       |    |       |------+------+------+------+------+------|
- * | LCtrl|  Z   |   X  |   C  |   V  |   B  |-------|    |-------| Ctl-N| Ctl-M| Ctl-,| Ctl-.| Ctl-/|   M  |
- * `-----------------------------------------/       /     \Enter \-----------------------------------------'
- *            | TRNS |      | ESC  | LAlt | /Space  /       \      \  |PrnScr|      |      | FF14 |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_ESDF] = LAYOUT(
-  KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,       KC_7,       KC_8,          KC_9,         KC_0,          KC_EQL,
-  KC_T,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,                      RCTL(KC_Y), RCTL(KC_U), RCTL(KC_I),    RCTL(KC_O),   RCTL(KC_P),    KC_PGUP,
-  KC_G,   KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,                      RCTL(KC_H), RCTL(KC_J), RCTL(KC_K),    RCTL(KC_L),   RCTL(KC_SCLN), KC_PGDN,
-  KC_LCTL, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, RCTL(KC_N), RCTL(KC_M), RCTL(KC_COMM), RCTL(KC_DOT), RCTL(KC_SLSH), KC_M,
-                   _______, XXXXXXX, _______, _______, _______, _______, _______,    KC_PSCR,    _______,       TO(_FF14)
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case _COMP1:
-            if (record->event.pressed) {
-                // SEND_STRING(SS_TAP(X_RCTL) SS_DELAY(100) SS_TAP(X_RCTL) SS_DELAY(100) "1" SS_TAP(X_ENTER));
-                keymap_config.swap_lalt_lgui = false;
-            }
-            return false;
-        case _COMP2:
-            if (record->event.pressed) {
-                // SEND_STRING(SS_TAP(X_RCTL) SS_DELAY(100) SS_TAP(X_RCTL) SS_DELAY(100) "2" SS_TAP(X_ENTER));
-                keymap_config.swap_lalt_lgui = true;
-            }
-            return false;
-        case KC_SPC:
-            luna_jump(record->event.pressed);
-            break;
-    }
-    return true;
-}
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_THME:
-        case KC_TPLY:
-            return TAPPING_TERM + 250;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
-            tap_code(KC_VOLU);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
-
-#endif
diff --git a/keyboards/sofle/keymaps/flare576/logos.h b/keyboards/sofle/keymaps/flare576/logos.h
deleted file mode 100644
index 18de1b3d525..00000000000
--- a/keyboards/sofle/keymaps/flare576/logos.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2021 Flare576 <flare576@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/>.
- */
-static const char PROGMEM ffxiv[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0x00, 0xf0, 0xc0, 0xe0, 0x80, 0x00, 0x02,
-    0x0c, 0x2e, 0xfc, 0xfc, 0xfc, 0xfc, 0x78, 0x78, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x3f, 0x37, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8,
-    0xf8, 0xf8, 0xf1, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xf0, 0xb0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x7b, 0xdf, 0x1f, 0x3f, 0x3f,
-    0x1f, 0x1f, 0x3f, 0x5f, 0x9f, 0x8f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x06, 0x07, 0x0f, 0x1c, 0x74,
-    0x0c, 0x0d, 0x09, 0x09, 0x11, 0x01, 0x03, 0x03, 0x07, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-static const char PROGMEM windows[] = {
-    0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x00, 0xf8,
-    0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0x00,
-    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0xfe,
-    0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,
-    0x00, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x00, 0x1f,
-    0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00
-};
-static const char PROGMEM apple[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xe0, 0x78, 0x7c, 0x7e, 0x3e, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe,
-    0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3e, 0x0e, 0x0c, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00
-};
-const char PROGMEM docker[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
-    0x70, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x80, 0x80, 0xb0, 0xb0, 0xb0, 0x80, 0xb7, 0xb7, 0xb7, 0x80, 0xb7, 0xb7, 0xb7, 0x80, 0xb7,
-    0xb7, 0xb7, 0x80, 0xb0, 0xb0, 0xb0, 0x80, 0x80, 0xfe, 0xfe, 0xfc, 0xf0, 0xf0, 0xf0, 0x70, 0x00,
-    0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03,
-    0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-static const char PROGMEM python[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x7e, 0x66, 0x66, 0x67, 0x7f, 0x7f, 0x7f,
-    0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xf0, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x9f, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0,
-    0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x03, 0xf9, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x0f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff,
-    0xfe, 0xfe, 0xfe, 0xe6, 0x66, 0x66, 0x7e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-static const char PROGMEM js[] = {
-    0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0x1e, 0x9f,
-    0x9e, 0x1e, 0x3c, 0x3c, 0x78, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x03, 0x01, 0xf1, 0xf8, 0xfc, 0xfc, 0x06, 0x06, 0xff, 0x0f,
-    0x0f, 0x67, 0x67, 0xe6, 0xcc, 0x8c, 0xf8, 0xf9, 0x01, 0x03, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x80, 0x1f, 0x3f, 0x3f, 0x3f, 0x00, 0x80, 0xff, 0xe3,
-    0xe2, 0xce, 0xce, 0x4c, 0x64, 0x20, 0x11, 0x9f, 0x80, 0xc0, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0x3c, 0x3c, 0x78, 0x79,
-    0xf9, 0x78, 0x3c, 0x3c, 0x1e, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00,
-};
-static const char PROGMEM qmk[] = {
-    0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xf8,
-    0xf8, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x99, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf1, 0xf3, 0xe3, 0xe7, 0x00,
-    0x00, 0xe7, 0xe3, 0xf3, 0xf1, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x99, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x0f, 0x0f, 0x1f,
-    0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x0f, 0x0f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00,
-};
-static const char PROGMEM brew[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe7, 0xff, 0xfe, 0xfc, 0xf8, 0xfe,
-    0xe4, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xe7, 0x43, 0x41, 0x41, 0x4b, 0xcf, 0x87, 0x87, 0x8f,
-    0x87, 0x03, 0x03, 0xc3, 0x47, 0xe7, 0xa4, 0xb8, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x01, 0x02, 0x02, 0x03, 0x00, 0xfe, 0x02, 0x02, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x40, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-    0x80, 0x80, 0x80, 0xc0, 0x40, 0x7b, 0x0a, 0x0a, 0x0b, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
diff --git a/keyboards/sofle/keymaps/flare576/readme.md b/keyboards/sofle/keymaps/flare576/readme.md
deleted file mode 100644
index 9f8ad5f2487..00000000000
--- a/keyboards/sofle/keymaps/flare576/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-![Flare576 Keycaps](https://raw.githubusercontent.com/Flare576/sofle/main/images/keycaps.png)
-![Flare576 Chord Guide](https://raw.githubusercontent.com/Flare576/sofle/main/images/chords.png)
-
-# Flare576's keymap for Sofle Keyboard
-
-[Layout](http://www.keyboard-layout-editor.com/#/gists/fb8b42a6156458e20ca421a6f80cec48) and [Chord Mapping](http://www.keyboard-layout-editor.com/#/gists/884e3bc833cdf80fed9337ffee93a500) in Keyboard Layout Manager
-
-
-Features:
-
-- WASD -> ESDF Gaming layer
-- Mouse/Arrow Keys Layer with **amazing** rates
-- Tap/Hold keys for `=/+`/`SHIFT`, `TAB`/`ALT`
-- Bracket layer with Fn Keys
-- Right-hand primary OLED
-  * Mode logo
-  * Mode title
-  * Luna WPM indicator
-- Left-hand secondary OLED scrolling logo marquee
-- Left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN/Home.
-
-See [My Sofle Project](https://github.com/flare576/sofle) for more details
diff --git a/keyboards/sofle/keymaps/flare576/rules.mk b/keyboards/sofle/keymaps/flare576/rules.mk
deleted file mode 100644
index abfcc01d94b..00000000000
--- a/keyboards/sofle/keymaps/flare576/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-MOUSEKEY_ENABLE = yes
-ENCODER_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-WPM_ENABLE = yes
-SRC += graphics.c
diff --git a/keyboards/sofle/keymaps/foureight84/config.h b/keyboards/sofle/keymaps/foureight84/config.h
deleted file mode 100644
index 2104124f3a6..00000000000
--- a/keyboards/sofle/keymaps/foureight84/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 Khoa Truong <foureight84@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 EE_HANDS
-
-/* clear default encoder def */
-#undef TAP_CODE_DELAY
-
-/* encoder support */
-#define TAP_CODE_DELAY 100
-
-#define SPLIT_WPM_ENABLE
-#define SPLIT_OLED_ENABLE
-
-#define POINTING_DEVICE_ROTATION_90
-#define SPLIT_POINTING_ENABLE
-#define POINTING_DEVICE_RIGHT
-#define POINTING_DEVICE_TASK_THROTTLE_MS 8
\ No newline at end of file
diff --git a/keyboards/sofle/keymaps/foureight84/keymap.c b/keyboards/sofle/keymaps/foureight84/keymap.c
deleted file mode 100644
index e05eca7a7fe..00000000000
--- a/keyboards/sofle/keymaps/foureight84/keymap.c
+++ /dev/null
@@ -1,616 +0,0 @@
-/* Copyright 2022 Khoa Truong <foureight84@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
-#include <string.h>
-#include "lib/lib8tion/lib8tion.h"
-
-
-enum sofle_layers {
-    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
-    _QWERTY,
-    _COLEMAK,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-    _MOUSE,
-};
-
-enum custom_keycodes {
-    KC_QWERTY = SAFE_RANGE,
-    KC_COLEMAK,
-    KC_LOWER,
-    KC_RAISE,
-    KC_ADJUST,
-    KC_PRVWD,
-    KC_NXTWD,
-    KC_LSTRT,
-    KC_LEND,
-    KC_DLINE,
-    KC_MOUSE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |LCtrl |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            |   [  | LGUI | LAlt |LOWER | /Space  /       \Enter \  |RAISE | RCTR | RAlt |   ]  |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *             `----------------------------------'           '------''---------------------------'
- */
-
-[_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_BSPC,
-  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_BSLS,
-  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_MUTE,     XXXXXXX,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LBRC ,KC_LGUI, KC_LALT, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_RBRC
-),
-/*
- * COLEMAK
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | ESC  |   Q  |   W  |   F  |   P  |   G  |                    |   J  |   L  |   U  |   Y  |   ;  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | TAB  |   A  |   R  |   S  |   T  |   D  |-------.    ,-------|   H  |   N  |   E  |   I  |   O  |  '   |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   K  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *             `----------------------------------'           '------''---------------------------'
- */
-
-[_COLEMAK] = LAYOUT(
-  KC_GRV,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_GRV,
-  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_MUTE,      XXXXXXX,KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  |  F10  | F11  | F12 |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | MOUSE|   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   |  |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * | Shift|  =   |  -   |  +   |   {  |   }  |-------|    |-------|   [  |   ]  |   ;  |   :  |   \  | Shift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | 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_1,    KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  _______,
-  KC_MOUSE, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
-  _______,  KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______,       _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-                       _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______
-),
-/* RAISE
- * ,----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Esc  | Ins  | Pscr | Menu |      |      |                    |      | PWrd |  Up  | NWrd | DLine| Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  | LAt  | LCtl |LShift|      | Caps |-------.    ,-------|      | Left | Down | Rigth|  Del | Bspc |
- * |------+------+------+------+------+------|  MPLY |    |       |------+------+------+------+------+------|
- * |Shift | Undo |  Cut | Copy | Paste|      |-------|    |-------|      | LStr |      | LEnd |      | Shift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *             `----------------------------------'           '------''---------------------------'
- */
-[_RAISE] = LAYOUT(
-  _______, _______ , _______ , _______ , _______ , _______,                           _______,  _______  , _______,  _______ ,  _______ ,_______,
-  _______,  KC_INS,  KC_PSCR,   KC_APP,  XXXXXXX, XXXXXXX,                        KC_PGUP, KC_PRVWD,   KC_UP, KC_NXTWD,KC_DLINE, KC_BSPC,
-  _______, KC_LALT,  KC_LCTL,  KC_LSFT,  XXXXXXX, KC_CAPS,                       KC_PGDN,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_DEL, KC_BSPC,
-  _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,  KC_MPLY,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   XXXXXXX, _______,
-                         _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______
-),
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | QK_BOOT|      |QWERTY|COLEMAK|      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |MACWIN|      |      |      |-------.    ,-------|      | VOLDO| MUTE | VOLUP|      |      |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      | PREV | PLAY | NEXT |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *             `----------------------------------'           '------''---------------------------'
- */
-  [_ADJUST] = LAYOUT(
-  XXXXXXX , XXXXXXX,  XXXXXXX ,  XXXXXXX , XXXXXXX, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  QK_BOOT, XXXXXXX,KC_QWERTY,KC_COLEMAK,CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX , XXXXXXX,CG_TOGG, XXXXXXX,    XXXXXXX,  XXXXXXX,                     XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
-  XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,  XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-                   _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
-  ),
-  /* MOUSE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|MS_BT1|MS_BT2|      |      |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *             `----------------------------------'           '------''---------------------------'
- */
-  [_MOUSE] = 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,                     KC_MS_BTN1, KC_MS_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                   _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
-  )
-};
-
-#ifdef OLED_ENABLE
-
-static void print_status_narrow(void) {
-    // Print current mode
-    oled_write_P(PSTR("\n\n"), false);
-    oled_write_ln_P(PSTR("MODE"), false);
-    oled_write_ln_P(PSTR(""), false);
-    if (keymap_config.swap_lctl_lgui) {
-        oled_write_ln_P(PSTR("MAC"), false);
-    } else {
-        oled_write_ln_P(PSTR("WIN"), false);
-    }
-
-    switch (get_highest_layer(default_layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("Qwrt"), false);
-            break;
-        case _COLEMAK:
-            oled_write_ln_P(PSTR("Clmk"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    // Print current layer
-    oled_write_ln_P(PSTR("LAYER"), false);
-    switch (get_highest_layer(layer_state)) {
-        case _COLEMAK:
-        case _QWERTY:
-            oled_write_P(PSTR("Base\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adj\n"), false);
-            break;
-        case _MOUSE:
-            oled_write_P(PSTR("Mouse\n"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    led_t led_usb_state = host_keyboard_led_state();
-    oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-
-    if (!is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-    return rotation;
-}
-
-
-/* Animation bit by j-inc https://github.com/qmk/qmk_firmware/tree/master/keyboards/kyria/keymaps/j-inc */
-// WPM-responsive animation stuff here
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 40 // below this wpm value your animation will idle
-
-// #define PREP_FRAMES 1 // uncomment if >1
-
-#define TAP_FRAMES 2
-#define TAP_SPEED 60 // above this wpm value typing animation to triggere
-
-#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
-// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#define ANIM_SIZE 320 // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
-uint8_t current_tap_frame = 0;
-
-// Implementation credit j-inc(/James Incandenza), pixelbenny, and obosob.
-// Bongo cat images changed and adapted for sofle keyboard oled size.
-// Original gif can be found here: https://www.pixilart.com/art/bongo-cat-bd2a8e9323aa705
-static void render_anim(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-        {
-        0x00, 0xc0, 0x3e, 0x01, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0x03, 0x00, 0x03, 0x0c, 0x30, 0xc0, 0x00,
-        0xe1, 0x1e, 0x00, 0xc0, 0xbc, 0x83, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x3c, 0x03, 0x00, 0x00, 0x00, 0x80, 0x78, 0x87, 0x00, 0x03, 0x0c, 0x30, 0xc0, 0x00, 0xe0, 0x1f,
-        0x01, 0xc0, 0x3c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x31, 0x05, 0x41, 0x12, 0x04,
-        0x00, 0x00, 0x00, 0x00, 0xf8, 0x87, 0x00, 0x01, 0x06, 0x18, 0x60, 0x80, 0xc0, 0x3f, 0x03, 0x80,
-        0x78, 0x07, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x03, 0x05,
-        0x00, 0x00, 0xf0, 0xcf, 0x00, 0x01, 0x06, 0x18, 0x60, 0x80, 0x80, 0x79, 0x07, 0x80, 0x78, 0x07,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0xe0, 0x1e, 0x01, 0x00, 0x03, 0x0c, 0x30, 0xc0, 0x00, 0xf9, 0x07, 0x80, 0x78, 0x07, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xc0, 0x2c, 0x32, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x07, 0x03, 0x0c, 0x30, 0xc0, 0x00, 0x00, 0xf0, 0x0f, 0x80, 0x78, 0x07, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x18, 0x60, 0x80, 0x00, 0x00, 0xe1, 0x1e, 0x01, 0xf0, 0x8f, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-        0x0e, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x08, 0x08, 0x09, 0x0e, 0x0e, 0x01, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x19,
-        0x19, 0x41, 0x0a, 0x22, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x18,
-        0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x70, 0x80,
-        0x00, 0x00, 0xf0, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x04, 0x02, 0x01,
-        }
-    };
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-        {
-        0x00, 0xc0, 0x3e, 0x01, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0x7c, 0x70, 0x40, 0x40,
-        0x61, 0x5e, 0x80, 0xc0, 0xbc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x3c, 0x03, 0x00, 0x00, 0x00, 0x80, 0x78, 0x87, 0x00, 0x03, 0x0f, 0x3f, 0xf8, 0xf0, 0xf0, 0x20,
-        0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xf8, 0x87, 0x00, 0x01, 0x06, 0x18, 0x60, 0x80, 0xc0, 0x3f, 0x03, 0x80,
-        0x78, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04,
-        0x00, 0x00, 0xf0, 0xcf, 0x00, 0x01, 0x06, 0x18, 0x60, 0x80, 0x80, 0x79, 0x07, 0x80, 0x78, 0x07,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0xe0, 0x1e, 0x01, 0x00, 0x03, 0x0c, 0x30, 0xc0, 0x00, 0xf9, 0x07, 0x80, 0x78, 0x07, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xc0, 0x2c, 0x32, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x07, 0x03, 0x0c, 0x30, 0xc0, 0x00, 0x00, 0xf0, 0x0f, 0x80, 0x78, 0x07, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x18, 0x60, 0x80, 0x00, 0x00, 0xe1, 0x1e, 0x01, 0xf0, 0x8f, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-        0x0e, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x08, 0x08, 0x09, 0x0e, 0x0e, 0x01, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x19,
-        0x19, 0x41, 0x0a, 0x22, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x18,
-        0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x70, 0x80,
-        0x00, 0x00, 0xf0, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x04, 0x02, 0x01,
-        },
-        {
-        0x00, 0xc0, 0x3e, 0x01, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0x03, 0x00, 0x03, 0x0c, 0x30, 0xc0, 0x00,
-        0xe1, 0x1e, 0x00, 0xc0, 0xbc, 0x83, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x3c, 0x03, 0x00, 0x00, 0x00, 0x80, 0x78, 0x87, 0x00, 0x03, 0x0c, 0x30, 0xc0, 0x00, 0xe0, 0x1f,
-        0x01, 0xc0, 0x3c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x31, 0x05, 0x41, 0x12, 0x04,
-        0x00, 0x00, 0x00, 0x00, 0xf8, 0x87, 0x00, 0x01, 0x06, 0x18, 0x60, 0x80, 0xc0, 0x3f, 0x03, 0x80,
-        0x78, 0x07, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x03, 0x05,
-        0x00, 0x00, 0xf0, 0xcf, 0x00, 0x01, 0x06, 0x18, 0x60, 0x80, 0x80, 0x79, 0x07, 0x80, 0x78, 0x07,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0xe0, 0xfe, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xc0, 0x00, 0xf9, 0x07, 0x80, 0x78, 0x07, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xc0, 0x2c, 0x32, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x07, 0x03, 0x0f, 0x3f, 0xff, 0x03, 0x01, 0x03, 0x07, 0x18, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x18, 0x60, 0x80, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3c, 0x00, 0x00, 0x00, 0x00,
-        0x0e, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x08, 0x08, 0x09, 0x0e, 0x0e, 0x01, 0xf3, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x18,
-        0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x70, 0x80,
-        0x00, 0x00, 0xf0, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x04, 0x02, 0x01
-        },
-    };
-
-    //assumes 1 frame prep stage
-    void animation_phase(void) {
-        if(get_current_wpm() <=IDLE_SPEED){
-            oled_write_raw_P(idle[0], ANIM_SIZE);
-         }
-         if(get_current_wpm() >=TAP_SPEED){
-             current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-             oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-         }
-    }
-    if(get_current_wpm() != 000) {
-        oled_on(); // not essential but turns on animation OLED with any alpha keypress
-        if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {
-        if(timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        print_status_narrow();
-    } else {
-        render_anim();
-        oled_set_cursor(1,12);
-        oled_write_P(PSTR("WPM"), false);
-        oled_set_cursor(1,13);
-        oled_write(get_u8_str(get_current_wpm(), '0'), false);
-    }
-    return false;
-}
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    switch (keycode) {
-        case KC_QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return false;
-        case KC_COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            return false;
-        case KC_LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-        case KC_PRVWD:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_LEFT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                }
-            }
-            break;
-        case KC_NXTWD:
-             if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                }
-            }
-            break;
-        case KC_LSTRT:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                     //CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                } else {
-                    register_code(KC_HOME);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_code(KC_HOME);
-                }
-            }
-            break;
-        case KC_LEND:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    //CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_code(KC_END);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_code(KC_END);
-                }
-            }
-            break;
-        case KC_DLINE:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_BSPC);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_BSPC);
-            }
-            break;
-        case KC_COPY:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_C);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_C);
-            }
-            return false;
-        case KC_PASTE:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_V);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_V);
-            }
-            return false;
-        case KC_CUT:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_X);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_X);
-            }
-            return false;
-            break;
-        case KC_UNDO:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_Z);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_Z);
-            }
-            return false;
-        case KC_MOUSE:
-            if (record->event.pressed) {
-                layer_on(_MOUSE);
-            } else {
-                layer_off(_MOUSE);
-            }
-            return false;
-    }
-    return true;
-}
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    switch (get_highest_layer(layer_state)) {
-        case _COLEMAK:
-        case _QWERTY:
-            if (index == 0) {
-                if (clockwise) {
-                    tap_code(KC_VOLD);
-                } else {
-                    tap_code(KC_VOLU);
-                }
-            }
-        break;
-
-        case _RAISE:
-            if (index == 0) {
-                if (clockwise) {
-                    tap_code(KC_MPRV);
-                } else {
-                    tap_code(KC_MNXT);
-                }
-            }
-        break;
-    }
-    return true;
-}
-
-#endif
-
-static uint32_t       last_mouse_activity = 0;
-static report_mouse_t last_mouse_report   = {0};
-static bool           is_scrolling        = false;
-
-report_mouse_t smooth_mouse_movement(report_mouse_t mouse_report) {
-    // Linear interpolation and ease-in-out
-    static fract8 fract = 0.5;
-    int8_t        x     = 0;
-    int8_t        y     = 0;
-    int8_t        h     = 0;
-    int8_t        v     = 0;
-
-    if (!is_scrolling) {
-        x = ease8InOutApprox(lerp8by8(last_mouse_report.x, mouse_report.x, fract));
-        y = ease8InOutApprox(lerp8by8(last_mouse_report.y, mouse_report.y, fract));
-    } else {
-        h = ease8InOutApprox(lerp8by8(last_mouse_report.x, mouse_report.x, fract));
-        v = ease8InOutApprox(lerp8by8(last_mouse_report.y, mouse_report.y, fract));
-    }
-
-    // update the new smoothed report
-    mouse_report.x = x;
-    mouse_report.y = y;
-    mouse_report.h = h;
-    mouse_report.v = v;
-
-    return mouse_report;
-}
-
-report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
-
-    if (has_mouse_report_changed(&last_mouse_report, &mouse_report)) {
-        last_mouse_activity = timer_read32();
-        memcpy(&last_mouse_report, &mouse_report, sizeof(mouse_report));
-    }
-
-    return smooth_mouse_movement(mouse_report);
-}
\ No newline at end of file
diff --git a/keyboards/sofle/keymaps/foureight84/readme.md b/keyboards/sofle/keymaps/foureight84/readme.md
deleted file mode 100644
index e88b0e04f66..00000000000
--- a/keyboards/sofle/keymaps/foureight84/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-For more information on integrating the Pimoroni Trackball, please see: https://github.com/foureight84/sofle-keyboard-pimoroni
diff --git a/keyboards/sofle/keymaps/foureight84/rules.mk b/keyboards/sofle/keymaps/foureight84/rules.mk
deleted file mode 100644
index 102742ab1ce..00000000000
--- a/keyboards/sofle/keymaps/foureight84/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-WPM_ENABLE = yes
-
-#Debug options
-VERBOSE = no
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-
-LTO_ENABLE = yes
-
-SPLIT_KEYBOARD = yes
-
-VIA_ENABLE = no
-
-POINTING_DEVICE_ENABLE = yes
-POINTING_DEVICE_DRIVER = pimoroni_trackball
-
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no 
-MAGIC_ENABLE = no
-MUSIC_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/sofle/keymaps/helltm/config.h b/keyboards/sofle/keymaps/helltm/config.h
deleted file mode 100644
index a7950a4b183..00000000000
--- a/keyboards/sofle/keymaps/helltm/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
- /* Copyright 2021 HellSingCoder
-  *
-  * 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 OLED_TIMEOUT 120000
-#define OLED_BRIGHTNESS 120
-#define SPLIT_WPM_ENABLE
diff --git a/keyboards/sofle/keymaps/helltm/keymap.c b/keyboards/sofle/keymaps/helltm/keymap.c
deleted file mode 100644
index 7ea73b63399..00000000000
--- a/keyboards/sofle/keymaps/helltm/keymap.c
+++ /dev/null
@@ -1,677 +0,0 @@
-/* Copyright 2021 HellSingCoder
- *
- * 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 sofle_layers {
-    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
-    _QWERTY,
-    _GAMING,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-// clang-format off
-enum custom_keycodes {
-    KC_QWERTY = SAFE_RANGE,
-    KC_GAMING,
-    KC_LOWER,
-    KC_RAISE,
-    KC_ADJUST,
-    KC_PRVWD,
-    KC_NXTWD,
-    KC_LSTRT,
-    KC_LEND,
-    KC_DLINE,
-    KC_BSPC_DEL,
-    KC_LAYER
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * QWERTY
-     * ,-----------------------------------------.                    ,-----------------------------------------.
-     * | Esc  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  BS  |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  `   |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * | Caps |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
-     * |------+------+------+------+------+------|  play |    | mute  |------+------+------+------+------+------|
-     * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |  \   |
-     * `-----------------------------------------/       /     \      \-----------------------------------------'
-     *            | LGUI | LAlt | LAYER| LCTR | /Enter  /       \Space \  |  [   |  ]   |  -   |  =   |
-     *            |      |      |      |      |/       /         \      \ |      |      |      |      |
-     *            `----------------------------------'           '------''---------------------------'
-     */
-
-[_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_BSPC_DEL,
-  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_GRV,
-  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_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_GAMING,     KC_QWERTY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_BSLS,
-                 KC_LGUI,KC_LALT,KC_LAYER, KC_LCTL, KC_ENT,      KC_SPC,  KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
-),
-
-/*
- * GAMING
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  BS  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  `   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Caps |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |  Up  |  '   |
- * |------+------+------+------+------+------|  play |    | mute  |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  | Left | Down | Right|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LAYER| LCTR | /Space  /       \Enter \  |  [   |  ]   |  -   |  =   |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-
-[_GAMING] = LAYOUT(
-  KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_BSPC_DEL,
-  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,  KC_GRV,
-  KC_CAPS,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L, KC_UP,  KC_QUOT,
-  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MPLY,     KC_MUTE,KC_N,    KC_M, KC_COMM,  KC_LEFT, KC_DOWN,  KC_RIGHT,
-                 KC_LGUI,KC_LALT,KC_LAYER, KC_LCTL, KC_SPC,      KC_ENT,  KC_LBRC, KC_RBRC, KC_MINS, KC_EQL
-),
-
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * | Esc  |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |      |  Up  |      | QK_BOOT|      |                    | PWrd | NWrd | Pscr |Scroll| Pause| F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Caps | Left | Down | Rigth|      |      |-------.    ,-------|      |      |  Ins | Home | PUp  |      |
- * |------+------+------+------+------+------|  play |    | mute  |------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |-------|    |-------|      | Menu |  Del |  End | PDown|      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            |MACWIN| RAlt | LAYER| RCTR | /Enter  /       \Space \  |      |      |      |      |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_LOWER] = LAYOUT(
-  _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-  _______, XXXXXXX,   KC_UP, XXXXXXX,   QK_BOOT, XXXXXXX,                       KC_PRVWD, KC_NXTWD, KC_PSCR,  KC_SCRL, KC_PAUS,  KC_F12,
-  _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,                       XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_PGUP, XXXXXXX,
-  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,       _______, XXXXXXX, KC_APP, KC_DEL, KC_END, KC_PGDN, XXXXXXX,
-                    CG_TOGG, KC_RALT, _______, KC_RCTL, _______,       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* RAISE
- * ,----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Esc  | Ins  | Pscr | Menu |      |      |                    |      | PWrd |  Up  | NWrd | DLine| Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  | LAt  | LCtl |LShift|      | Caps |-------.    ,-------|      | Left | Down | Rigth|  Del | Bspc |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * |Shift | Undo |  Cut | Copy | Paste|      |-------|    |-------|      | LStr |      | LEnd |      | Shift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_RAISE] = LAYOUT(
-  _______, _______ , _______ , _______ , _______ , _______,                           _______,  _______  , _______,  _______ ,  _______ ,_______,
-  _______,  KC_INS,  KC_PSCR,   KC_APP,  XXXXXXX, XXXXXXX,                        KC_PGUP, KC_PRVWD,   KC_UP, KC_NXTWD,KC_DLINE, KC_BSPC,
-  _______, KC_LALT,  KC_LCTL,  KC_LSFT,  XXXXXXX, KC_CAPS,                       KC_PGDN,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_DEL, KC_BSPC,
-  _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   _______, _______,
-                         _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______
-),
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | QK_BOOT|      |QWERTY|      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |MACWIN|      |      |      |-------.    ,-------|      | VOLDO| MUTE | VOLUP|      |      |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      | PREV | PLAY | NEXT |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-  [_ADJUST] = LAYOUT(
-  XXXXXXX , XXXXXXX,  XXXXXXX ,  XXXXXXX , XXXXXXX, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  QK_BOOT, XXXXXXX,KC_QWERTY,XXXXXXX,CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX , XXXXXXX,CG_TOGG, XXXXXXX,    XXXXXXX,  XXXXXXX,                     XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
-  XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,  XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-                   _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
-  )
-};
-// clang-format on
-
-#ifdef OLED_ENABLE
-
-/* 32 * 32 logo */
-static void render_logo(void) {
-    static const char PROGMEM hell_logo[] = {0x00, 0x80, 0xc0, 0xc0, 0x60, 0x60, 0x30, 0x30, 0x18, 0x1c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x78, 0x1e, 0x06, 0x00, 0x0c, 0x1c, 0x18, 0x30, 0x30, 0x60, 0x60, 0xc0, 0xc0, 0x80, 0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x70, 0x60, 0x00, 0xc0, 0xf0, 0x3c, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x60, 0x70, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x07, 0x03, 0x01, 0x00, 0xf8, 0xf8, 0x80, 0x80, 0x80, 0xf8, 0xf8, 0x00, 0x80, 0xc0, 0xc0, 0x40, 0xc0, 0xc0, 0x80, 0x00, 0xf8, 0xf8, 0x00, 0xf8, 0xf8, 0x00, 0x08, 0x38, 0x08, 0x00, 0x38, 0x08, 0x30, 0x08, 0x38, 0x00, 0x1f, 0x1f, 0x01, 0x01, 0x01, 0x1f, 0x1f, 0x00, 0x0f, 0x1f, 0x1a, 0x12, 0x1a, 0x1b, 0x0b, 0x00, 0x1f, 0x1f, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-    oled_write_raw_P(hell_logo, sizeof(hell_logo));
-}
-
-/* 32 * 14 os logos */
-static const char PROGMEM windows_logo[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0xbc, 0xbe, 0xbe, 0x00, 0xbe, 0xbe, 0xbf, 0xbf, 0xbf, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x0f, 0x0f, 0x00, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-static const char PROGMEM mac_logo[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf0, 0xf6, 0xfb, 0xfb, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x1f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x0f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* Smart Backspace Delete */
-
-bool            shift_held = false;
-static uint16_t held_shift = 0;
-
-/* KEYBOARD PET START */
-
-/* settings */
-#    define MIN_WALK_SPEED      10
-#    define MIN_RUN_SPEED       40
-
-/* advanced settings */
-#    define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
-#    define ANIM_SIZE           96   // number of bytes in array. If you change sprites, minimize for adequate firmware size. max is 1024
-
-/* timers */
-uint32_t anim_timer = 0;
-
-/* current frame */
-uint8_t current_frame = 0;
-
-/* status variables */
-int   current_wpm = 0;
-led_t led_usb_state;
-
-bool isSneaking = false;
-bool isJumping  = false;
-bool showedJump = true;
-
-/* logic */
-static void render_luna(int LUNA_X, int LUNA_Y) {
-    /* Sit */
-    static const char PROGMEM sit[2][ANIM_SIZE] = {/* 'sit1', 32x22px */
-                                                   {
-                                                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x68, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   },
-
-                                                   /* 'sit2', 32x22px */
-                                                   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x90, 0x08, 0x18, 0x60, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-
-    /* Walk */
-    static const char PROGMEM walk[2][ANIM_SIZE] = {/* 'walk1', 32x22px */
-                                                    {
-                                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x90, 0x90, 0x90, 0xa0, 0xc0, 0x80, 0x80, 0x80, 0x70, 0x08, 0x14, 0x08, 0x90, 0x10, 0x10, 0x08, 0xa4, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0xea, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x03, 0x06, 0x18, 0x20, 0x20, 0x3c, 0x0c, 0x12, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    },
-
-                                                    /* 'walk2', 32x22px */
-                                                    {
-                                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x28, 0x10, 0x20, 0x20, 0x20, 0x10, 0x48, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0xf8, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x30, 0xd5, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x02, 0x1c, 0x14, 0x08, 0x10, 0x20, 0x2c, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    }};
-
-    /* Run */
-    static const char PROGMEM run[2][ANIM_SIZE] = {/* 'run1', 32x22px */
-                                                   {
-                                                       0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0xc8, 0xb0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0xc4, 0xa4, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x58, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x09, 0x04, 0x04, 0x04, 0x04, 0x02, 0x03, 0x02, 0x01, 0x01, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   },
-
-                                                   /* 'run2', 32x22px */
-                                                   {
-                                                       0x00, 0x00, 0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x78, 0x28, 0x08, 0x10, 0x20, 0x30, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xb0, 0x50, 0x55, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x1e, 0x20, 0x20, 0x18, 0x0c, 0x14, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   }};
-
-    /* Bark */
-    static const char PROGMEM bark[2][ANIM_SIZE] = {/* 'bark1', 32x22px */
-                                                    {
-                                                        0x00, 0xc0, 0x20, 0x10, 0xd0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    },
-
-                                                    /* 'bark2', 32x22px */
-                                                    {
-                                                        0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x2c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x20, 0x4a, 0x09, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    }};
-
-    /* Sneak */
-    static const char PROGMEM sneak[2][ANIM_SIZE] = {/* 'sneak1', 32x22px */
-                                                     {
-                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x21, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x04, 0x04, 0x04, 0x03, 0x01, 0x00, 0x00, 0x09, 0x01, 0x80, 0x80, 0xab, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x02, 0x06, 0x18, 0x20, 0x20, 0x38, 0x08, 0x10, 0x18, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
-                                                     },
-
-                                                     /* 'sneak2', 32x22px */
-                                                     {
-                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xa0, 0x20, 0x40, 0x80, 0xc0, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x41, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x40, 0x55, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x04, 0x18, 0x10, 0x08, 0x10, 0x20, 0x28, 0x34, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                     }};
-
-    /* animation */
-    void animate_luna(void) {
-        /* jump */
-        if (isJumping || !showedJump) {
-            /* clear */
-            oled_set_cursor(LUNA_X, LUNA_Y + 2);
-            oled_write("     ", false);
-
-            oled_set_cursor(LUNA_X, LUNA_Y - 1);
-
-            showedJump = true;
-        } else {
-            /* clear */
-            oled_set_cursor(LUNA_X, LUNA_Y - 1);
-            oled_write("     ", false);
-
-            oled_set_cursor(LUNA_X, LUNA_Y);
-        }
-
-        /* switch frame */
-        current_frame = (current_frame + 1) % 2;
-
-        /* current status */
-        if (led_usb_state.caps_lock) {
-            oled_write_raw_P(bark[current_frame], ANIM_SIZE);
-
-        } else if (isSneaking) {
-            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
-
-        } else if (current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
-
-        } else if (current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
-
-        } else {
-            oled_write_raw_P(run[current_frame], ANIM_SIZE);
-        }
-    }
-
-#    if OLED_TIMEOUT > 0
-    /* the animation prevents the normal timeout from occuring */
-    if (last_input_activity_elapsed() > OLED_TIMEOUT && last_led_activity_elapsed() > OLED_TIMEOUT) {
-        oled_off();
-        return;
-    } else {
-        oled_on();
-    }
-#    endif
-
-    /* animation timer */
-    if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-        anim_timer = timer_read32();
-        animate_luna();
-    }
-}
-
-/* KEYBOARD PET END */
-
-static void print_logo_narrow(void) {
-    render_logo();
-
-    /* wpm counter */
-    uint8_t n = get_current_wpm();
-    char    wpm_str[4];
-    oled_set_cursor(0, 14);
-    wpm_str[3] = '\0';
-    wpm_str[2] = '0' + n % 10;
-    wpm_str[1] = '0' + (n /= 10) % 10;
-    wpm_str[0] = '0' + n / 10;
-    oled_write(wpm_str, false);
-
-    oled_set_cursor(0, 15);
-    oled_write(" wpm", false);
-}
-
-static void print_status_narrow(void) {
-    /* Print current mode */
-    oled_set_cursor(0, 0);
-    if (keymap_config.swap_lctl_lgui) {
-        oled_write_raw_P(mac_logo, sizeof(mac_logo));
-    } else {
-        oled_write_raw_P(windows_logo, sizeof(windows_logo));
-    }
-
-    oled_set_cursor(0, 3);
-
-    switch (get_highest_layer(default_layer_state)) {
-        case _QWERTY:
-            oled_write("QWRTY", false);
-            break;
-        case _GAMING:
-            oled_write("GAMES", false);
-            break;
-        default:
-            oled_write("UNDEF", false);
-    }
-
-    oled_set_cursor(0, 5);
-
-    /* Print current layer */
-    oled_write("LAYER", false);
-
-    oled_set_cursor(0, 6);
-
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write("Base ", false);
-            break;
-        case _GAMING:
-            oled_write("Games", false);
-            break;
-        case _RAISE:
-            oled_write("Raise", false);
-            break;
-        case _LOWER:
-            oled_write("Lower", false);
-            break;
-        case _ADJUST:
-            oled_write("Adj  ", false);
-            break;
-        default:
-            oled_write("Undef", false);
-    }
-
-    /* caps lock */
-    oled_set_cursor(0, 8);
-    oled_write("CPSLK", led_usb_state.caps_lock);
-
-    /* KEYBOARD PET RENDER START */
-
-    render_luna(0, 13);
-
-    /* KEYBOARD PET RENDER END */
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
-
-bool oled_task_user(void) {
-    /* KEYBOARD PET VARIABLES START */
-
-    current_wpm   = get_current_wpm();
-    led_usb_state = host_keyboard_led_state();
-
-    /* KEYBOARD PET VARIABLES END */
-
-    if (is_keyboard_master()) {
-        print_status_narrow();
-    } else {
-        print_logo_narrow();
-    }
-    return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return false;
-        case KC_GAMING:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_GAMING);
-            }
-            return false;
-        case KC_LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-        case KC_PRVWD:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_LEFT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                }
-            }
-            break;
-        case KC_NXTWD:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                }
-            }
-            break;
-        case KC_LSTRT:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    /* CMD-arrow on Mac, but we have CTL and GUI swapped */
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                } else {
-                    register_code(KC_HOME);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_code(KC_HOME);
-                }
-            }
-            break;
-        case KC_LEND:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    /* CMD-arrow on Mac, but we have CTL and GUI swapped */
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_code(KC_END);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_code(KC_END);
-                }
-            }
-            break;
-        case KC_DLINE:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_BSPC);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_BSPC);
-            }
-            break;
-        case KC_COPY:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_C);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_C);
-            }
-            return false;
-        case KC_PASTE:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_V);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_V);
-            }
-            return false;
-        case KC_CUT:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_X);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_X);
-            }
-            return false;
-            break;
-        case KC_UNDO:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_Z);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_Z);
-            }
-            return false;
-
-            /* Smart Backspace Delete */
-
-        case KC_RSFT:
-        case KC_LSFT:
-            shift_held = record->event.pressed;
-            held_shift = keycode;
-            break;
-        case KC_BSPC_DEL:
-            if (record->event.pressed) {
-                if (shift_held) {
-                    unregister_code(held_shift);
-                    register_code(KC_DEL);
-                } else {
-                    register_code(KC_BSPC);
-                }
-            } else {
-                unregister_code(KC_DEL);
-                unregister_code(KC_BSPC);
-                if (shift_held) {
-                    register_code(held_shift);
-                }
-            }
-            return false;
-
-            /* LAYER */
-
-        case KC_LAYER:
-            if (record->event.pressed) {
-                if (shift_held) {
-                    if (record->event.pressed) {
-                        if (get_highest_layer(default_layer_state) == _QWERTY) {
-                            set_single_persistent_default_layer(_GAMING);
-                        } else if (get_highest_layer(default_layer_state) == _GAMING) {
-                            set_single_persistent_default_layer(_QWERTY);
-                        }
-                    }
-                } else {
-                    layer_on(_LOWER);
-                    update_tri_layer(_LOWER, _RAISE, _ADJUST);
-                }
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-
-            /* KEYBOARD PET STATUS START */
-
-        case KC_LCTL:
-        case KC_RCTL:
-            if (record->event.pressed) {
-                isSneaking = true;
-            } else {
-                isSneaking = false;
-            }
-            break;
-        case KC_SPC:
-            if (record->event.pressed) {
-                isJumping  = true;
-                showedJump = false;
-            } else {
-                isJumping = false;
-            }
-            break;
-
-            /* KEYBOARD PET STATUS END */
-    }
-    return true;
-}
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            if (shift_held) {
-                tap_code(KC_MNXT);
-            } else {
-                tap_code(KC_RIGHT);
-            }
-        } else {
-            if (shift_held) {
-                tap_code(KC_MPRV);
-            } else {
-                tap_code(KC_LEFT);
-            }
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            if (shift_held) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_DOWN);
-            }
-        } else {
-            if (shift_held) {
-                tap_code(KC_VOLD);
-            } else {
-                tap_code(KC_UP);
-            }
-        }
-    }
-    return true;
-}
-
-#endif
diff --git a/keyboards/sofle/keymaps/helltm/readme.md b/keyboards/sofle/keymaps/helltm/readme.md
deleted file mode 100644
index 3034f740ab6..00000000000
--- a/keyboards/sofle/keymaps/helltm/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-[![Luna - The QMK Keyboard Pet](https://www.simonepellegrino.com/wp-content/uploads/2021/05/luna.jpg)](https://www.youtube.com/watch?v=HgIQRazCAjo)
-
-# Personal keymap for Sofle Keyboard rev1
-
-
-Features:
-
-- Modes for Qwerty and Games support. Games swaps enter and space to play FPS games and adds directional arrows.
-- Modified Qwerty layout to allow usage without hidden layers (for the most).
-- The OLED on master half shows selected OS, Layer and caps lock state.
-- The secondary display shows a logo and the wpm counter.
-- Left encoder controls arrow left/right. Right encoder arrow up/down.
-- Holding shift changes the encoders to next/previous and volup/voldown respectively.
-- Press the encoders to play/pause and mute.
-- Smart Backspace (shift + backspace to delete)
-- Single Layer button (press to Lower, shift + press to change mode)
-- **Features Luna, your keyboard pet!**
-
-#Luna, the keyboard pet
-
-Features:
-- Luna reacts to your wpm counter
-    - under 10 wpm she sits
-    - between 10 and 40 wpm she walks
-    - over 40 wpm she runs
-- She will move sneakily if you hold down Ctrl
-- Will bark at people on the internet if you activate Caps Lock!
-- Luna jumps every time you hit Space
-
-
-Learn how to adopt a keyboard pet here
-https://www.youtube.com/watch?v=HgIQRazCAjo
diff --git a/keyboards/sofle/keymaps/helltm/rules.mk b/keyboards/sofle/keymaps/helltm/rules.mk
deleted file mode 100644
index 8cba5309595..00000000000
--- a/keyboards/sofle/keymaps/helltm/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-CONSOLE_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-
-WPM_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/j4ckofalltrades/encoder.c b/keyboards/sofle/keymaps/j4ckofalltrades/encoder.c
deleted file mode 100644
index 9faaccd38f1..00000000000
--- a/keyboards/sofle/keymaps/j4ckofalltrades/encoder.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Jordan Duabe
- *
- * 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/>.
- */
-
-#ifdef ENCODER_ENABLE
-#    include QMK_KEYBOARD_H
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
-
-#endif
diff --git a/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c b/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c
deleted file mode 100644
index 87677c78af4..00000000000
--- a/keyboards/sofle/keymaps/j4ckofalltrades/keymap.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2021 Jordan Duabe
- *
- * 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] = {
-/*
- * QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------| TO(2) |    | TO(1) |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'            '------''---------------------------'
- */
-
-[0] = LAYOUT(
-  KC_GRV,               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_BSPC,
-  MT(MOD_LCTL, KC_ESC), 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, TO(2),     TO(1), KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT,
-                        KC_LGUI, KC_LALT, KC_LCTL,  MO(2), KC_ENT,                 KC_SPC,  MO(1),   KC_RCTL,  KC_RALT, KC_RGUI
-),
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Esc  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   |  |
- * |------+------+------+------+------+------| TO(2) |    | TO(1) |------+------+------+------+------+------|
- * |LShift|  =   |  -   |  +   |   {  |   }  |-------|    |-------|   [  |   ]  |   ;  |   :  |   \  | Shift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'            '------''---------------------------'
- */
-[1] = LAYOUT(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_F12,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
-  _______, KC_EQL,  KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______,     _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-                    _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
-),
-/* LOWER
- * ,----------------------------------------.                    ,-----------------------------------------.
- * |      | Pscr | Slck |Pause |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  | Ins  | Home | PgUp |      |      |                    |      |      |      |       |     |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Esc  | Del  | End  | PgDn |      |      |-------.    ,-------| Left | Down | Up   | Right |     |      |
- * |------+------+------+------+------+------| TO(2) |    | TO(1) |------+------+------+------+------+------|
- * |Shift | Undo |  Cut | Copy | Paste|      |-------|    |-------|      |      |      |       |     |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'            '------''---------------------------'
- */
-[2] = LAYOUT(
-  _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______,  _______,                       _______, _______, _______, _______,  _______, _______,
-  _______, KC_INS,  KC_HOME, KC_PGUP,  XXXXXXX,  XXXXXXX,                       _______, _______, _______, _______,  _______, _______,
-  _______, KC_DEL,  KC_END,  KC_PGDN,  XXXXXXX,  XXXXXXX,                       KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, XXXXXXX, XXXXXXX,
-  _______, KC_UNDO, KC_CUT,  KC_COPY,  KC_PASTE, XXXXXXX, _______,     _______, XXXXXXX, _______, XXXXXXX, _______,  XXXXXXX, _______,
-                      _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
-)
-};
diff --git a/keyboards/sofle/keymaps/j4ckofalltrades/oled.c b/keyboards/sofle/keymaps/j4ckofalltrades/oled.c
deleted file mode 100644
index de561bd0fa0..00000000000
--- a/keyboards/sofle/keymaps/j4ckofalltrades/oled.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 Jordan Duabe
- *
- * 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/>.
- */
-
-#ifdef OLED_ENABLE
-#    include QMK_KEYBOARD_H
-
-static void render_logo(void) {
-    static const char PROGMEM qmk_logo[] = {
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
-    };
-
-    oled_write_P(qmk_logo, false);
-}
-
-static void print_status_narrow(void) {
-    oled_write_P(PSTR("Sofle"), false);
-    oled_write_P(PSTR("\n\n\n"), false);
-    // Print current mode
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_ln_P(PSTR("Qwrt"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Mod\n"), false);
-            break;
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    // Print current layer
-    oled_write_ln_P(PSTR("LAYER"), false);
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_P(PSTR("Base\n"), false);
-            break;
-        case 1:
-            oled_write_P(PSTR("Raise"), false);
-            break;
-        case 2:
-            oled_write_P(PSTR("Lower"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-    return rotation;
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        print_status_narrow();
-    } else {
-        render_logo();
-    }
-    return false;
-}
-
-#endif
diff --git a/keyboards/sofle/keymaps/j4ckofalltrades/readme.md b/keyboards/sofle/keymaps/j4ckofalltrades/readme.md
deleted file mode 100644
index bb232ef6256..00000000000
--- a/keyboards/sofle/keymaps/j4ckofalltrades/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-![SofleKeyboard custom keymap](https://raw.githubusercontent.com/j4ckofalltrades/keebs/master/sofle/assets/soflekeyboard.png)
-
-# Via-compatible custom keymap for Sofle
-
-Modified version of default Via-compatible keymap with focus on adding a standard navigation cluster layer plus some
-Vim-inspired features e.g. soft escape (Esc when held, Ctrl when tapped), using 'h', 'j', 'k', 'l' as arrow keys.
-
-## Layout
-
-View in [Keyboard Layout Editor](http://www.keyboard-layout-editor.com/#/gists/a1f6519e723ad81ca151741b53a28b80)
-
-## Features
-
-- Via support
-- Mode for soft escape (`Esc` when tapped, `Ctrl` when held) 
-- Vim-style navigation (`h` `j` `k` `l` as arrow keys)
-- Mode for standard navigation cluster
-- Toggling between layers when encoders are pressed
-- Left encoder controls `VOLUP`/`VOLDOWN`. Right encoder `PGUP`/`PGDN`.
diff --git a/keyboards/sofle/keymaps/j4ckofalltrades/rules.mk b/keyboards/sofle/keymaps/j4ckofalltrades/rules.mk
deleted file mode 100644
index dc95fd5b777..00000000000
--- a/keyboards/sofle/keymaps/j4ckofalltrades/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-CONSOLE_ENABLE = no
-EXTRAKEY_ENABLE = yes
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-
-SRC += oled.c encoder.c
diff --git a/keyboards/sofle/keymaps/killmaster/config.h b/keyboards/sofle/keymaps/killmaster/config.h
deleted file mode 100644
index 10c9ea450ee..00000000000
--- a/keyboards/sofle/keymaps/killmaster/config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2021 Carlos Martins
- *
- * 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
-
-/* The way how "handedness" is decided (which half is which),
-see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
-for more options.
-*/
-
-#define WS2812_DI_PIN D3
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define RGBLED_NUM 72
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 10
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_SPLIT {36,36}
-#define SPLIT_TRANSPORT_MIRROR
-
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SPLIT
-#define RGBLED_NUM 70
-#define RGB_SPLIT {36,36}
-#define RGBLIGHT_LIMIT_VAL 120
-//   #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
-#endif
-
-#define MEDIA_KEY_DELAY 2
-
-#define USB_POLLING_INTERVAL_MS 1
diff --git a/keyboards/sofle/keymaps/killmaster/keymap.c b/keyboards/sofle/keymaps/killmaster/keymap.c
deleted file mode 100644
index 65c02bb952e..00000000000
--- a/keyboards/sofle/keymaps/killmaster/keymap.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/* Copyright 2021 Carlos Martins
- *
- * 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 <stdio.h>
-
-enum sofle_layers {
-    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-    KC_QWERTY = SAFE_RANGE,
-    KC_LOWER,
-    KC_RAISE,
-    KC_ADJUST,
-    KC_PRVWD,
-    KC_NXTWD,
-    KC_LSTRT,
-    KC_LEND,
-    KC_DLINE
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | ESC  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Space  /       \Enter \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-
-[_QWERTY] = LAYOUT(
-  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_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,
-  SC_LSPO,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,     KC_MPLY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  SC_RSPC,
-                 KC_LGUI,KC_LALT,KC_LCTL, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   |  |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * | Shift|  =   |  -   |  +   |   {  |   }  |-------|    |-------|   [  |   ]  |   ;  |   :  |   \  | Shift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | 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_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_F12,
-  _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
-  _______,  KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______,       _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-                       _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______
-),
-/* RAISE
- * ,----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Esc  | Ins  | Pscr | Menu |      |RGBTog|                    |      | PWrd |  Up  | NWrd | DLine| Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  | LAt  | LCtl |LShift|      | Caps |-------.    ,-------|      | Left | Down | Rigth|  Del | Bspc |
- * |------+------+------+------+------+------|  MUTE  |    |       |------+------+------+------+------+------|
- * |Shift | Undo |  Cut | Copy | Paste|      |-------|    |-------|      | LStr |      | LEnd |      | Shift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_RAISE] = LAYOUT(
-  _______, _______ , _______ , _______ , RGB_RMOD , RGB_MOD,                           _______,  _______  , _______,  _______ ,  _______ ,_______,
-  _______,  KC_INS,  KC_PSCR,   KC_APP,  XXXXXXX, RGB_TOG,                        KC_PGUP, KC_PRVWD,   KC_UP, KC_NXTWD,KC_DLINE, KC_BSPC,
-  _______, KC_LALT,  KC_LCTL,  KC_LSFT,  XXXXXXX, KC_CAPS,                       KC_PGDN,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_DEL, KC_BSPC,
-  _______,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   XXXXXXX, _______,
-                         _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______
-),
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | QK_BOOT|      |QWERTY|COLEMAK|      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |MACWIN|      |      |      |-------.    ,-------|      | VOLDO| MUTE | VOLUP|      |      |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      | PREV | PLAY | NEXT |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-  [_ADJUST] = LAYOUT(
-  XXXXXXX , XXXXXXX,  XXXXXXX ,  XXXXXXX , XXXXXXX, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  QK_BOOT, XXXXXXX, KC_QWERTY,  XXXXXXX , CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX , XXXXXXX,CG_TOGG, XXXXXXX,    XXXXXXX,  XXXXXXX,                     XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
-  XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,  XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-                   _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
-  )
-};
-
-#ifdef OLED_ENABLE
-
-static void render_logo(void) {
-    static const char PROGMEM bananas_logo[] = {
-        // 'killmaster_bananas', 128x32px
-        0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0x02, 0x0e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
-        0x00, 0x00, 0x80, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0xd8, 0xc8, 0x00, 0x00, 0x00, 0x00,
-        0x08, 0x08, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf8, 0xf8, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xc0, 0x40, 0x40, 0xc0, 0x80, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40,
-        0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0xc0, 0x40, 0x00, 0x00, 0x40, 0x40, 0xf0,
-        0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00,
-        0x40, 0xc0, 0x80, 0x40, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x01, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xf0,
-        0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
-        0x02, 0x07, 0x0d, 0x10, 0x20, 0x20, 0x00, 0x00, 0x20, 0x20, 0x3f, 0x3f, 0x20, 0x20, 0x00, 0x00,
-        0x00, 0x00, 0x1f, 0x3f, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x3f, 0x20, 0x20, 0x20,
-        0x00, 0x00, 0x3f, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x1c, 0x36, 0x22, 0x22, 0x22,
-        0x1f, 0x20, 0x00, 0x00, 0x10, 0x23, 0x22, 0x22, 0x26, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x1f,
-        0x30, 0x20, 0x20, 0x20, 0x00, 0x00, 0x0f, 0x1f, 0x32, 0x22, 0x22, 0x32, 0x23, 0x00, 0x00, 0x00,
-        0x20, 0x3f, 0x21, 0x20, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f,
-        0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3e, 0x3e, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-    oled_write_raw_P(bananas_logo, sizeof(bananas_logo));
-}
-
-static void print_status_narrow(void) {
-    // Print current mode
-    oled_write_P(PSTR("Sofle"), false);
-    oled_write_P(PSTR("\n\n\n"), false);
-    switch (get_highest_layer(default_layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("QWERT"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    // Print current layer
-    oled_write_ln_P(PSTR("Layer"), false);
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR("Base\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adj\n"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-    else {
-        return OLED_ROTATION_180;
-    }
-    return rotation;
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        print_status_narrow();
-    } else {
-        render_logo();
-    }
-    return false;
-}
-
-
-
-#endif // OLED_ENABLE
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return false;
-        case KC_LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-        case KC_PRVWD:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_LEFT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                }
-            }
-            break;
-        case KC_NXTWD:
-             if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                }
-            }
-            break;
-        case KC_LSTRT:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                     //CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                } else {
-                    register_code(KC_HOME);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_code(KC_HOME);
-                }
-            }
-            break;
-        case KC_LEND:
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    //CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_code(KC_END);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_code(KC_END);
-                }
-            }
-            break;
-        case KC_DLINE:
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_BSPC);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_BSPC);
-            }
-            break;
-    }
-    return true;
-}
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    uint8_t temp_mod = get_mods();
-    uint8_t temp_osm = get_oneshot_mods();
-    bool    is_ctrl  = (temp_mod | temp_osm) & MOD_MASK_CTRL;
-    bool    is_shift = (temp_mod | temp_osm) & MOD_MASK_SHIFT;
-
-    if (is_shift) {
-        if (index == 0) { /* First encoder */
-            if (clockwise) {
-                rgb_matrix_increase_hue();
-            } else {
-                rgb_matrix_decrease_hue();
-            }
-        } else if (index == 1) { /* Second encoder */
-            if (clockwise) {
-                rgb_matrix_decrease_sat();
-            } else {
-                rgb_matrix_increase_sat();
-            }
-        }
-    } else if (is_ctrl) {
-        if (index == 0) { /* First encoder */
-            if (clockwise) {
-                rgb_matrix_increase_val();
-            } else {
-                rgb_matrix_decrease_val();
-            }
-        } else if (index == 1) { /* Second encoder */
-            if (clockwise) {
-                rgb_matrix_increase_speed();
-            } else {
-                rgb_matrix_decrease_speed();
-            }
-        }
-    } else {
-        if (index == 1) { /* First encoder */
-            if (clockwise) {
-                tap_code(KC_PGUP);
-                // tap_code(KC_MS_WH_UP);
-            } else {
-                tap_code(KC_PGDN);
-                // tap_code(KC_MS_WH_DOWN);
-            }
-        } else if (index == 0) { /* Second encoder */
-            uint16_t mapped_code        = 0;
-            if (clockwise) {
-                mapped_code = KC_VOLD;
-            } else {
-                mapped_code = KC_VOLU;
-            }
-            tap_code_delay(mapped_code, MEDIA_KEY_DELAY);
-        }
-    }
-    return true;
-}
-
-#endif
diff --git a/keyboards/sofle/keymaps/killmaster/readme.md b/keyboards/sofle/keymaps/killmaster/readme.md
deleted file mode 100644
index 6d6dea228c9..00000000000
--- a/keyboards/sofle/keymaps/killmaster/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-![SofleKeyboard default keymap](https://github.com/josefadamcik/SofleKeyboard/raw/master/Images/soflekeyboard.png)
-![SofleKeyboard adjust layer](https://github.com/josefadamcik/SofleKeyboard/raw/master/Images/soflekeyboard_layout_adjust.png)
-
-
-# Default keymap for Sofle Keyboard
-
-Layout in [Keyboard Layout Editor](http://www.keyboard-layout-editor.com/#/gists/76efb423a46cbbea75465cb468eef7ff) and [adjust layer](http://www.keyboard-layout-editor.com/#/gists/4bcf66f922cfd54da20ba04905d56bd4)
-
-
-Features:
-
-- Symmetric modifiers (CMD/Super, Alt/Opt, Ctrl, Shift)
-- Various modes, can be switched (using Adjust layer and the selected one is stored in EEPROM.
-- Modes for Qwerty and Colemak support
-- Modes for Mac vs Linux/Win support -> different order of modifiers and different action shortcuts on the "UPPER" layer (the red one in the image). Designed to simplify transtions when switching between operating systems often.
-- The OLED on master half shows selected mode and caps lock state and is rotated.
-- Left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN.
-
-
diff --git a/keyboards/sofle/keymaps/killmaster/rules.mk b/keyboards/sofle/keymaps/killmaster/rules.mk
deleted file mode 100644
index 95b415488c2..00000000000
--- a/keyboards/sofle/keymaps/killmaster/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRAKEY_ENABLE = yes
-LTO_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = ws2812
diff --git a/keyboards/sofle/keymaps/michal/config.h b/keyboards/sofle/keymaps/michal/config.h
deleted file mode 100644
index 0f326f7605a..00000000000
--- a/keyboards/sofle/keymaps/michal/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2023 Michal S. (@not-my-segfault)
-// SPDX-License-Identifier: GPL-3.0-only
-
-#pragma once
-
-// I don't use too many layers, so this is more than enough
-#define LAYER_STATE_8BIT
-
-// Saving space
-#define NO_ACTION_ONESHOT
-#define NO_ACTION_TAPPING
-#define NO_MUSIC_MODE
-
-// If I recall correctly, these aren't necessary for the sofle
-// so i disable them to save more space.
-#undef LOCKING_SUPPORT_ENABLE
-#undef LOCKING_RESYNC_ENABLE
\ No newline at end of file
diff --git a/keyboards/sofle/keymaps/michal/keymap.c b/keyboards/sofle/keymaps/michal/keymap.c
deleted file mode 100644
index cbb0dc36ab0..00000000000
--- a/keyboards/sofle/keymaps/michal/keymap.c
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2023 Michal S. (@not-my-segfault)
-// SPDX-License-Identifier: GPL-3.0-only
-
-#include QMK_KEYBOARD_H 
-
-// This specifies the layers that will be used
-enum sofle_layers {
-    _WORKMAN,
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-enum custom_keycodes {
-    KC_WORKMAN = SAFE_RANGE,
-    KC_QWERTY,
-    KC_LOWER,
-    KC_RAISE,
-    KC_ADJUST,
-    KC_TOGGLE,
-};
-
-// Here the keymaps are defined in matrix form using KC_XYZ form keycodes
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * WORKMAN
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  | Prnt |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Esc  |   Q  |   D  |   R  |   W  |   B  |                    |   J  |   F  |   U  |   P  |   ;  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   H  |   T  |   G  |-------.    ,-------|   Y  |   N  |   E  |   O  |   I  |  '   |
- * |------+------+------+------+------+------|       |    | MUTE  |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   M  |   C  |   V  |-------|    |-------|   K  |   L  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_WORKMAN] = LAYOUT(
-  KC_GRV,  KC_1,   KC_2,    KC_3,    KC_4,     KC_5,                            KC_6,     KC_7,     KC_8,    KC_9,   KC_0,    KC_PSCR,
-  KC_ESC,  KC_Q,   KC_D,    KC_R,    KC_W,     KC_B,                            KC_J,     KC_F,     KC_U,    KC_P,   KC_SCLN, KC_BSPC,
-  KC_TAB,  KC_A,   KC_S,    KC_H,    KC_T,     KC_G,                            KC_Y,     KC_N,     KC_E,    KC_O,   KC_I,    KC_QUOT,
-  KC_LSFT, KC_Z,   KC_X,    KC_M,    KC_C,     KC_V,     XXXXXXX,      KC_MUTE, KC_K,     KC_L,     KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-                   KC_LGUI, KC_LALT, KC_LCTL,  KC_LOWER, KC_ENT,       KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
-),
-
-/*
- * QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  | Prnt |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|       |    | MUTE  |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Space  /       \Enter \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_QWERTY] = LAYOUT(
-  KC_GRV,  KC_1,   KC_2,    KC_3,    KC_4,     KC_5,                           KC_6,       KC_7,     KC_8,    KC_9,   KC_0,    KC_PSCR,
-  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,     XXXXXXX,     KC_MUTE, KC_N,       KC_M,     KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-                   KC_LGUI, KC_LALT, KC_LCTL,  KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_RGUI
-),
-
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |      |      |      | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |   |  |
- * |------+------+------+------+------+------|       |    | Togg. |------+------+------+------+------+------|
- * |      |  =   |  -   |  +   |   {  |   }  |-------|    |-------|   [  |   ]  |      |      |   \  |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            |      |      |      |LOWER | /       /       \      \  |      |      |      |      |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_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_PIPE,
-  _______,  KC_EQL,  KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______,       KC_TOGGLE,   KC_LBRC, KC_RBRC, _______, _______, KC_BSLS, _______,
-                     _______, _______, _______, _______, _______,       _______,     _______, _______, _______, _______
-),
-
-/* RAISE
- * ,----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      | ASTG |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                    |      |      |  Up  |      |      | Del  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.    ,-------|      | Left | Down | Rght |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      | Home | End  |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            |      |      |      |      | /       /       \      \  |RAISE |      |      |      |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_RAISE] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, AS_TOGG,
-  _______, _______, _______, _______, _______, _______,                         _______, _______, KC_UP,   _______, _______, KC_DEL,
-  _______, _______, _______, _______, _______, _______,                         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, XXXXXXX,
-  _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, KC_HOME, KC_END,  _______, _______,
-                    _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______
-)};
-
-#ifdef OLED_ENABLE
-
-static void oled_screen(void) {
-    oled_set_cursor(0, 0); // Write nothing
-}
-
-// Set correct rotation so the text doesn't end up sideways
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (!is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-    return rotation;
-}
-
-// I only draw to the right screen because I accidentally
-// burned the left one with a soldering iron. Oops.
-bool oled_task_user(void) {
-    if (!is_keyboard_master()) {
-        oled_screen();
-    }
-    return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_QWERTY:
-                if (record->event.pressed) {
-                    set_single_persistent_default_layer(_QWERTY);
-                }
-                return false;
-            case KC_WORKMAN:
-                if (record->event.pressed) {
-                    set_single_persistent_default_layer(_WORKMAN);
-                }
-                return false;
-            case KC_TOGGLE: // Toggle between QWERTY and WORKMAN
-                if (record->event.pressed) {
-                    layer_invert(_QWERTY);
-                    layer_invert(_WORKMAN);
-                }
-                return false;
-            case KC_LOWER:
-                if (record->event.pressed) {
-                    layer_on(_LOWER);
-                    update_tri_layer(_LOWER, _RAISE, _ADJUST);
-                } else {
-                    layer_off(_LOWER);
-                    update_tri_layer(_LOWER, _RAISE, _ADJUST);
-                }
-                return false;
-            case KC_RAISE:
-                if (record->event.pressed) {
-                    layer_on(_RAISE);
-                    update_tri_layer(_LOWER, _RAISE, _ADJUST);
-                } else {
-                    layer_off(_RAISE);
-                    update_tri_layer(_LOWER, _RAISE, _ADJUST);
-                }
-                return false;
-    }
-    return true;
-}
-
-#ifdef ENCODER_ENABLE
-
-// This section is like the keymap matrix, but for rotary encoders
-// My left encoder is currently not working, so I'm using Layers to cope :')
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_WORKMAN] = { ENCODER_CCW_CW(_______,     _______), ENCODER_CCW_CW(KC_VOLD,     KC_VOLU      )},
-    [_QWERTY]  = { ENCODER_CCW_CW(_______,     _______), ENCODER_CCW_CW(KC_VOLD,     KC_VOLU      )},
-    [_LOWER]   = { ENCODER_CCW_CW(_______,     _______), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)},
-    [_RAISE]   = { ENCODER_CCW_CW(_______,     _______), ENCODER_CCW_CW(_______,     _______      )},
-};
-
-#endif
diff --git a/keyboards/sofle/keymaps/michal/rules.mk b/keyboards/sofle/keymaps/michal/rules.mk
deleted file mode 100644
index 06a046f0736..00000000000
--- a/keyboards/sofle/keymaps/michal/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-BOOTLOADER = atmel-dfu
-
-OLED_ENABLE = yes
-
-# These are turned off to save space
-COMMAND_ENABLE = no
-CONSOLE_ENABLE = no
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
-
-# I actually use these features
-ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-
-# More space-saving
-LTO_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/noqmk/keymap.c b/keyboards/sofle/keymaps/noqmk/keymap.c
deleted file mode 100644
index 209118b4c92..00000000000
--- a/keyboards/sofle/keymaps/noqmk/keymap.c
+++ /dev/null
@@ -1,684 +0,0 @@
-// Copyright 2022 axtlos (@axtloss)
-// SPDX-License-Identifier: GPL-2.0-only
-#include QMK_KEYBOARD_H
-
-
-enum sofle_layers {
-    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
-    _QWERTY,
-    _COLEMAK,
-    _GAME,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-    KC_COLEMAK = SAFE_RANGE,
-    KC_QWERTY,
-    KC_LOWER,
-    KC_RAISE,
-    KC_ADJUST,
-    KC_GAME,
-    KC_PRVWD,
-    KC_NXTWD,
-    KC_LSTRT,
-    KC_LEND,
-    KC_DLINE,
-    KC_UNLOCK,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /*
- * COLEMAK
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | ESC  |   Q  |   W  |   F  |   P  |   G  |                    |   J  |   L  |   U  |   Y  |   ;  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | TAB  |   A  |   R  |   S  |   T  |   D  |-------.    ,-------|   H  |   N  |   E  |   I  |   O  |  '   |
- * |------+------+------+------+------+------|  MUTE |    |ADJUST |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   K  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Space  /       \Enter \  |RAISE | RCTR | RAlt | MOUSE |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-
-[_COLEMAK] = LAYOUT(
-  KC_GRV,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_GRV,
-  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_MUTE,      KC_CAPS ,KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-                 KC_LGUI,KC_LALT,KC_LCTL,KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_PSCR
-),
-/*
- * QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | ESC  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | Print|
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
-     */
-
-[_QWERTY] = LAYOUT(
-  KC_GRV,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_GRV,
-  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_MUTE,       KC_MPLY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-  KC_LGUI,KC_LALT,KC_LCTL, KC_LOWER, KC_ENT,      KC_SPC,  KC_RAISE, KC_RCTL, KC_RALT, KC_PSCR
-),
-/* LOWER
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  | F12  |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   |  |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * | Shift|  =   |  -   |  +   |   {  |   }  |-------|    |-------|   [  |   ]  |   ;  |   :  |   \  | Shift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | 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_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_F12,
-  _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
-  _______,  KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______,       _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-                       _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______
-),
-/* RAISE
- * ,----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Esc  | Ins  | Pscr | Menu |      |      |                    |      | PWrd |  Up  | NWrd | DLine| Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |  ae  |  ue  |  oe  |  ss  | euro |-------.    ,-------|      | Left | Down | Rigth|  Del | Bspc |
- * |------+------+------+------+------+------|  MUTE  |   |       |------+------+------+------+------+------|
- * |Shift | Undo |  Cut | Copy | Paste| caps |-------|    |-------|      | LStr |      | LEnd |      | Shift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-[_RAISE] = LAYOUT(
-  _______, _______ , _______ , _______ , _______ , _______,                           _______,  _______  , _______,  _______ ,  _______ ,_______,
-  _______,  LGUI(KC_1),  LGUI(KC_2),  LGUI(KC_3),  LGUI(KC_4), LGUI(KC_5),                        LGUI(KC_6), LGUI(KC_7),   KC_UP, LGUI(KC_9),LGUI(KC_0), KC_BSPC,
-  _______, RALT(KC_Q), RALT(KC_Y),  RALT(KC_P), RALT(KC_S) , RALT(KC_5),                       KC_PGDN,  KC_LEFT, KC_DOWN, KC_RGHT,  KC_DEL, KC_BSPC,
-  _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_CAPS,  _______,       _______,  XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND,   XXXXXXX, _______,
-                         _______, _______, _______, _______, KC_ENT,       _______, _______, _______, _______, _______
-),
-/*
- * QWERTY
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | ESC  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | Bspc |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Space  /       \Enter \  |RAISE | RCTR | RAlt | Print|
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
- */
-
-[_GAME] = 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_BSPC,
-  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_MUTE,       KC_MPLY,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT,
-  KC_LGUI,KC_LALT,KC_SPC, KC_LOWER, KC_SPC,      KC_ENT,  KC_RAISE, KC_RCTL, KC_RALT, KC_PSCR
-),
-/* ADJUST
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | QK_BOOT|      |QWERTY|COLEMAK|      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |      |      |MACWIN|GAMING|      |      |-------.    ,-------|      | VOLDO| MUTE | VOLUP|      |      |
- * |------+------+------+------+------+------|  MUTE |    |       |------+------+------+------+------+------|
- * |UNLOCK|      |      |      |      |      |-------|    |-------|      | PREV | PLAY | NEXT |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
- *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `---------------------------''------'           '------''---------------------------'
- */
-[_ADJUST] = LAYOUT(
-  XXXXXXX , XXXXXXX,  XXXXXXX ,  XXXXXXX , XXXXXXX, XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  QK_BOOT  , XXXXXXX,KC_QWERTY,KC_COLEMAK,CG_TOGG,XXXXXXX,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX , XXXXXXX,CG_TOGG, KC_GAME,    XXXXXXX,  XXXXXXX,                     XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
-  KC_UNLOCK , XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,  XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-                   _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______
-),
-};
-
-#ifdef OLED_ENABLE
-
-bool show_lock = true; // this is used to display the lock icon and disable keypresses when the keyboard is locked
-
-static void render_logo(void) {
-    static const char PROGMEM no_qmk[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x80, 0x80, 0x80,
-                                          0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0xe0, 0xf0,
-                                          0xf8, 0xf8, 0xe0, 0x00, 0x00, 0x0e, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-                                          0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 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, 0xf0,
-                                          0x08, 0x88, 0x88, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00,
-                                          0x08, 0x08, 0x88, 0x88, 0x88, 0x48, 0x48, 0x48, 0x28, 0x28, 0x18, 0x18, 0x08, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0xf0, 0xfc, 0xf8, 0x03, 0xf3, 0xe7, 0xdf, 0x9f, 0x3f, 0xfe, 0xfe, 0xfc, 0xf9,
-                                          0xfb, 0xf3, 0xf7, 0xf7, 0xe7, 0xef, 0xcf, 0x90, 0xa1, 0x81, 0x81, 0x81, 0xa0, 0xbd, 0xff, 0xff,
-                                          0xff, 0xff, 0x7f, 0x3f, 0x9c, 0xdc, 0xf8, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
-                                          0x60, 0x00, 0x00, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x4c, 0x4f,
-                                          0x47, 0x43, 0x43, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0xc2, 0xc2, 0x41, 0x00, 0x00, 0x00, 0x00,
-                                          0xe3, 0x13, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0xe2, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x3f, 0x7f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                          0xff, 0xff, 0x03, 0x79, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x79, 0x03, 0xff, 0xff, 0xff, 0xff, 0x1f,
-                                          0x03, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x40, 0x40,
-                                          0x40, 0x40, 0x40, 0x40, 0x44, 0x4a, 0x4a, 0x51, 0x51, 0x60, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,
-                                          0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 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, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f,
-                                          0x3f, 0x3f, 0x7f, 0x7c, 0x78, 0x78, 0x78, 0x78, 0x7c, 0x7e, 0x7f, 0x7f, 0x4f, 0x43, 0x40, 0x60,
-                                          0x60, 0x78, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-                                          0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x21,
-                                          0x11, 0x11, 0x09, 0x09, 0x05, 0x05, 0x03, 0x03, 0x05, 0x09, 0x11, 0x21, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    oled_write_raw_P(no_qmk, sizeof(no_qmk));
-}
-
-static const char PROGMEM locked_logo[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xce, 0xc6,
-                                           0xc6, 0xce, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
-                                           0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* 32 * 14 os logos */
-static const char PROGMEM linux_logo[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x27, 0x27, 0x8f, 0x9f, 0x03,
-                                          0x73, 0xff, 0x03, 0xf2, 0xfe, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x19, 0x19, 0x1b, 0x1b, 0x1b,
-                                          0x1a, 0x18, 0x18, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static const char PROGMEM mac_logo[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf0, 0xf6, 0xfb, 0xfb, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x1f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x0f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-
-/* KEYBOARD PET START */
-
-/* settings */
-#    define MIN_WALK_SPEED      10
-#    define MIN_RUN_SPEED       40
-
-/* advanced settings */
-#    define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
-#    define ANIM_SIZE           96   // number of bytes in array. If you change sprites, minimize for adequate firmware size. max is 1024
-
-/* timers */
-uint32_t anim_timer = 0;
-
-/* current frame */
-uint8_t current_frame = 0;
-
-/* status variables */
-int   current_wpm = 0;
-led_t led_usb_state;
-
-bool isSneaking = false;
-bool isJumping  = false;
-bool showedJump = true;
-
-/* logic */
-static void render_luna(int LUNA_X, int LUNA_Y) {
-    /* Sit */
-    static const char PROGMEM sit[2][ANIM_SIZE] = {/* 'sit1', 32x22px */
-                                                   {
-                                                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x68, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   },
-
-                                                   /* 'sit2', 32x22px */
-                                                   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x90, 0x08, 0x18, 0x60, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-
-    /* Walk */
-    static const char PROGMEM walk[2][ANIM_SIZE] = {/* 'walk1', 32x22px */
-                                                    {
-                                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x90, 0x90, 0x90, 0xa0, 0xc0, 0x80, 0x80, 0x80, 0x70, 0x08, 0x14, 0x08, 0x90, 0x10, 0x10, 0x08, 0xa4, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0xea, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x03, 0x06, 0x18, 0x20, 0x20, 0x3c, 0x0c, 0x12, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    },
-
-                                                    /* 'walk2', 32x22px */
-                                                    {
-                                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x28, 0x10, 0x20, 0x20, 0x20, 0x10, 0x48, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0xf8, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x30, 0xd5, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x02, 0x1c, 0x14, 0x08, 0x10, 0x20, 0x2c, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    }};
-
-    /* Run */
-    static const char PROGMEM run[2][ANIM_SIZE] = {/* 'run1', 32x22px */
-                                                   {
-                                                       0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0xc8, 0xb0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0xc4, 0xa4, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x58, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x09, 0x04, 0x04, 0x04, 0x04, 0x02, 0x03, 0x02, 0x01, 0x01, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   },
-
-                                                   /* 'run2', 32x22px */
-                                                   {
-                                                       0x00, 0x00, 0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x78, 0x28, 0x08, 0x10, 0x20, 0x30, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xb0, 0x50, 0x55, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x1e, 0x20, 0x20, 0x18, 0x0c, 0x14, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   }};
-
-    /* Bark */
-    static const char PROGMEM bark[2][ANIM_SIZE] = {/* 'bark1', 32x22px */
-                                                    {
-                                                        0x00, 0xc0, 0x20, 0x10, 0xd0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    },
-
-                                                    /* 'bark2', 32x22px */
-                                                    {
-                                                        0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x2c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x20, 0x4a, 0x09, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    }};
-
-    /* Sneak */
-    static const char PROGMEM sneak[2][ANIM_SIZE] = {/* 'sneak1', 32x22px */
-                                                     {
-                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x21, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x04, 0x04, 0x04, 0x03, 0x01, 0x00, 0x00, 0x09, 0x01, 0x80, 0x80, 0xab, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x02, 0x06, 0x18, 0x20, 0x20, 0x38, 0x08, 0x10, 0x18, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
-                                                     },
-
-                                                     /* 'sneak2', 32x22px */
-                                                     {
-                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xa0, 0x20, 0x40, 0x80, 0xc0, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x41, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x40, 0x55, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x04, 0x18, 0x10, 0x08, 0x10, 0x20, 0x28, 0x34, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                     }};
-
-    /* animation */
-    void animate_luna(void) {
-        /* jump */
-        if (isJumping || !showedJump) {
-            /* clear */
-            oled_set_cursor(LUNA_X, LUNA_Y + 2);
-            oled_write("     ", false);
-
-            oled_set_cursor(LUNA_X, LUNA_Y - 1);
-
-            showedJump = true;
-        } else {
-            /* clear */
-            oled_set_cursor(LUNA_X, LUNA_Y - 1);
-            oled_write("     ", false);
-
-            oled_set_cursor(LUNA_X, LUNA_Y);
-        }
-
-        /* switch frame */
-        current_frame = (current_frame + 1) % 2;
-
-        /* current status */
-        if (led_usb_state.caps_lock) {
-            oled_write_raw_P(bark[current_frame], ANIM_SIZE);
-
-        } else if (isSneaking) {
-            oled_write_raw_P(sneak[current_frame], ANIM_SIZE);
-
-        } else if (current_wpm <= MIN_WALK_SPEED) {
-            oled_write_raw_P(sit[current_frame], ANIM_SIZE);
-
-        } else if (current_wpm <= MIN_RUN_SPEED) {
-            oled_write_raw_P(walk[current_frame], ANIM_SIZE);
-
-        } else {
-            oled_write_raw_P(run[current_frame], ANIM_SIZE);
-        }
-    }
-
-#    if OLED_TIMEOUT > 0
-    /* the animation prevents the normal timeout from occuring */
-    if (last_input_activity_elapsed() > OLED_TIMEOUT && last_led_activity_elapsed() > OLED_TIMEOUT) {
-        oled_off();
-        return;
-    } else {
-        oled_on();
-    }
-#    endif
-
-    /* animation timer  */
-    if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-        anim_timer = timer_read32();
-        animate_luna();
-    }
-}
-
-/* KEYBOARD PET END */
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-    return rotation;
-}
-
-static void print_logo_narrow(void) {
-    render_logo();
-}
-
-static void print_status_narrow(void) {
-    /* Print current mode */
-    oled_set_cursor(0, 0);
-    if (show_lock == true) {
-        oled_write_raw_P(locked_logo, sizeof(locked_logo));
-    } else if (keymap_config.swap_lctl_lgui) {
-        oled_write_raw_P(mac_logo, sizeof(mac_logo));
-    } else {
-        oled_write_raw_P(linux_logo, sizeof(linux_logo));
-    }
-
-    oled_set_cursor(0, 3);
-
-    switch (get_highest_layer(default_layer_state)) {
-        case _COLEMAK:
-            oled_write_P(PSTR(" CLMK "), false);
-            break;
-        case _GAME:
-            oled_write_P(PSTR(" GAME "), false);
-            break;
-        case _QWERTY:
-            oled_write_P(PSTR("QWERT"), false);
-            break;
-        default:
-            oled_write_P(PSTR("UNDEF"), false);
-    }
-
-    oled_set_cursor(0, 5);
-
-    /* Print current layer */
-    oled_write_P(PSTR("LAYER"), false);
-
-    oled_set_cursor(0, 6);
-
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR("Base "), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR(" Adj "), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undef"), false);
-    }
-
-    /* caps lock */
-    oled_set_cursor(0, 8);
-    oled_write_P(PSTR("CPSLK"), led_usb_state.caps_lock);
-
-    /* KEYBOARD PET RENDER START */
-
-    render_luna(0, 13);
-
-    /* KEYBOARD PET RENDER END */
-}
-
-bool oled_task_user(void) {
-    /* KEYBOARD PET VARIABLES START */
-
-    current_wpm   = get_current_wpm();
-    led_usb_state = host_keyboard_led_state();
-
-    /* KEYBOARD PET VARIABLES END */
-
-    if (is_keyboard_master()) {
-        print_status_narrow();
-    } else {
-        print_logo_narrow();
-    }
-    return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_QWERTY:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            return false;
-        case KC_COLEMAK:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            return false;
-        case KC_GAME:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_GAME);
-            }
-            return false;
-        case KC_LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-        case KC_ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-        case KC_PRVWD:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_LEFT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                }
-            }
-            break;
-        case KC_NXTWD:
-            if (show_lock == true) {
-                return false;
-            }
-             if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    register_mods(mod_config(MOD_LALT));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LALT));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                }
-            }
-            break;
-        case KC_LSTRT:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                     //CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_LEFT);
-                } else {
-                    register_code(KC_HOME);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_LEFT);
-                } else {
-                    unregister_code(KC_HOME);
-                }
-            }
-            break;
-        case KC_LEND:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                if (keymap_config.swap_lctl_lgui) {
-                    //CMD-arrow on Mac, but we have CTL and GUI swapped
-                    register_mods(mod_config(MOD_LCTL));
-                    register_code(KC_RIGHT);
-                } else {
-                    register_code(KC_END);
-                }
-            } else {
-                if (keymap_config.swap_lctl_lgui) {
-                    unregister_mods(mod_config(MOD_LCTL));
-                    unregister_code(KC_RIGHT);
-                } else {
-                    unregister_code(KC_END);
-                }
-            }
-            break;
-        case KC_DLINE:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_RCTL));
-                register_code(KC_BSPC);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_BSPC);
-            }
-            break;
-        case KC_COPY:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_C);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_C);
-            }
-            return false;
-        case KC_PASTE:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_V);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_V);
-            }
-            return false;
-        case KC_CUT:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_X);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_X);
-            }
-            return false;
-            break;
-        case KC_UNDO:
-            if (show_lock == true) {
-                return false;
-            }
-            if (record->event.pressed) {
-                register_mods(mod_config(MOD_LCTL));
-                register_code(KC_Z);
-            } else {
-                unregister_mods(mod_config(MOD_LCTL));
-                unregister_code(KC_Z);
-            }
-            return false;
-        case KC_UNLOCK:
-            if (record->event.pressed) {
-                if (show_lock == true) {
-                    show_lock = false;
-                    print_status_narrow();
-                } else {
-                    show_lock = true;
-                    print_status_narrow();
-                }
-            }
-    }
-    /* This stops any keypress to be sent to the computer when the keyboard is locked */
-    if (show_lock == false) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_MNXT);
-        } else {
-            tap_code(KC_MPRV);
-        }
-    }
-    return true;
-}
-
-#endif
diff --git a/keyboards/sofle/keymaps/noqmk/readme.md b/keyboards/sofle/keymaps/noqmk/readme.md
deleted file mode 100644
index 8fce20ad0c6..00000000000
--- a/keyboards/sofle/keymaps/noqmk/readme.md
+++ /dev/null
@@ -1,28 +0,0 @@
-![no qmk?](https://user-images.githubusercontent.com/60044824/181124856-0ebe0cc9-4b91-4fa2-89df-4e0841a61b9d.png)
-
-
-# Custom keymap for Sofle Keyboard, based on [Helltm](https://github.com/qmk/qmk_firmware/tree/master/keyboards/sofle/keymaps/helltm)
-
-Features:
-
-- Symmetric modifiers (CMD/Super, Alt/Opt, Ctrl, Shift)
-- Various modes, can be switched (using Adjust layer and the selected one is stored in EEPROM).
-- Modes for Qwerty and Colemak support
-- Modes for Mac vs Linux/Win support -> different order of modifiers and different action shortcuts on the "UPPER" layer. Designed to simplify transtions when switching between operating systems often.
-- The OLED on master half shows selected mode and caps lock state and is rotated.
-- Left encoder controls volume up/down/mute. Right encoder PREV/NEXT media controls.
-- Keyboard lock, change to the adjust layer (up and down pressed at the same time) and press the left shift to lock/unlock, current lock state is displayed on oled
-- Apple logo for Mac mode, Fedora Silverblue logo for Linux/Win mode, Lock icon for locked
-- Fixed flickering on main OLED
-- Gaming layout, switches space to the left half of the keyboard and raises the most left column up by one key
-
-#Luna, the keyboard pet
-
-Features:
-- Luna reacts to your wpm counter
-    - under 10 wpm she sits
-    - between 10 and 40 wpm she walks
-    - over 40 wpm she runs
-- She will move sneakily if you hold down Ctrl
-- Will bark at people on the internet if you activate Caps Lock!
-- Luna jumps every time you hit Space
diff --git a/keyboards/sofle/keymaps/noqmk/rules.mk b/keyboards/sofle/keymaps/noqmk/rules.mk
deleted file mode 100644
index 58813926229..00000000000
--- a/keyboards/sofle/keymaps/noqmk/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-CONSOLE_ENABLE = no
-EXTRAKEY_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index 7d14c6e3375..314322c9293 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -49,13 +49,13 @@
 
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGBLED_NUM 35    // Number of LEDs
-#define RGBLED_NUM 35    // Number of LEDs
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGBLIGHT_LED_COUNT 35    // Number of LEDs
+#define RGBLIGHT_LED_COUNT 35    // Number of LEDs
+#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
+    #undef RGBLIGHT_LED_COUNT
 
 	//#define RGBLIGHT_EFFECT_BREATHING
 	#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -68,11 +68,11 @@
 	//#define RGBLIGHT_EFFECT_ALTERNATING
 	//#define RGBLIGHT_EFFECT_TWINKLE
 
-    #define RGBLED_NUM 70
+    #define RGBLIGHT_LED_COUNT 70
 	//#define RGBLED_SPLIT
 	#define RGBLED_SPLIT { 35, 35 } // haven't figured out how to use this yet
 
-	//#define RGBLED_NUM 30
+	//#define RGBLIGHT_LED_COUNT 30
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
     #define RGBLIGHT_SAT_STEP 17
@@ -82,7 +82,7 @@
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#   define RGB_MATRIX_SLEEP // turn off effects when suspended
 #   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 // #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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)
diff --git a/keyboards/sofle/keymaps/via/config.h b/keyboards/sofle/keymaps/via/config.h
deleted file mode 100644
index e53881987da..00000000000
--- a/keyboards/sofle/keymaps/via/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2020 Josef Adamcik
- * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
- *
- * 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
-
-/* By default left side is selected as master, 
-see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
-for more options. */
-
-#if defined(KEYBOARD_sofle_rev1)
-// Add RGB underglow and top facing lighting
-#    define WS2812_DI_PIN D3
-#    define RGBLED_NUM 72
-#    define RGBLED_SPLIT \
-        { 36, 36 }
-#    ifdef RGB_MATRIX_ENABLE
-#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#        define RGB_MATRIX_SPLIT RGBLED_SPLIT
-#        define SPLIT_TRANSPORT_MIRROR
-#    else
-#        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 RGBLIGHT_LIMIT_VAL 120
-#        define RGBLIGHT_HUE_STEP 10
-#        define RGBLIGHT_SAT_STEP 17
-#        define RGBLIGHT_VAL_STEP 17
-#    endif
-#endif
diff --git a/keyboards/sofle/keymaps/via/keymap.c b/keyboards/sofle/keymaps/via/keymap.c
index 21717a7a6c2..8207f35fd91 100644
--- a/keyboards/sofle/keymaps/via/keymap.c
+++ b/keyboards/sofle/keymaps/via/keymap.c
@@ -1,22 +1,21 @@
  /* Copyright 2020 Josef Adamcik
   * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
-  * 
-  * 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
-#include "oled.c"
 
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
diff --git a/keyboards/sofle/keymaps/via/oled.c b/keyboards/sofle/keymaps/via/oled.c
deleted file mode 100644
index 74f06cedc54..00000000000
--- a/keyboards/sofle/keymaps/via/oled.c
+++ /dev/null
@@ -1,85 +0,0 @@
- /* Copyright 2020 Josef Adamcik
-  * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
-  *
-  * 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/>.
-  */
-
-//Sets up what the OLED screens display.
-
-#ifdef OLED_ENABLE
-
-static void render_logo(void) {
-    static const char PROGMEM qmk_logo[] = {
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
-    };
-
-    oled_write_P(qmk_logo, false);
-}
-
-static void print_status_narrow(void) {
-    // Print current mode
-    oled_write_P(PSTR("\n\n"), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_ln_P(PSTR("Qwrt"), false);
-            break;
-        case 1:
-            oled_write_ln_P(PSTR("Clmk"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Mod\n"), false);
-            break;
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    // Print current layer
-    oled_write_ln_P(PSTR("LAYER"), false);
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-        case 1:
-            oled_write_P(PSTR("Base\n"), false);
-            break;
-        case 2:
-            oled_write_P(PSTR("Raise"), false);
-            break;
-        case 3:
-            oled_write_P(PSTR("Lower"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-    }
-    oled_write_P(PSTR("\n\n"), false);
-    led_t led_usb_state = host_keyboard_led_state();
-    oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-    return rotation;
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        print_status_narrow();
-    } else {
-        render_logo();
-    }
-    return false;
-}
-
-#endif
diff --git a/keyboards/sofle/keymaps/via/readme.md b/keyboards/sofle/keymaps/via/readme.md
index 8470c69bcfb..e0a87253e60 100644
--- a/keyboards/sofle/keymaps/via/readme.md
+++ b/keyboards/sofle/keymaps/via/readme.md
@@ -2,7 +2,6 @@
 
 Layout in [Keyboard Layout Editor](http://www.keyboard-layout-editor.com/#/gists/76efb423a46cbbea75465cb468eef7ff) and [adjust layer](http://www.keyboard-layout-editor.com/#/gists/4bcf66f922cfd54da20ba04905d56bd4)
 
-
 Features:
 
 - Symmetric modifiers (CMD/Super, Alt/Opt, Ctrl, Shift)
@@ -11,4 +10,3 @@ Features:
 - Left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN.
 - Via support
 - RGB underglow support
-
diff --git a/keyboards/sofle/keymaps/via/rules.mk b/keyboards/sofle/keymaps/via/rules.mk
index c8ca49919c8..2c37cfdddd6 100644
--- a/keyboards/sofle/keymaps/via/rules.mk
+++ b/keyboards/sofle/keymaps/via/rules.mk
@@ -1,8 +1,3 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-CONSOLE_ENABLE = no
-EXTRAKEY_ENABLE = yes
 VIA_ENABLE = yes
-LTO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/sofle/readme.md b/keyboards/sofle/readme.md
index 27071e6f337..7e8ef215c23 100644
--- a/keyboards/sofle/readme.md
+++ b/keyboards/sofle/readme.md
@@ -1,6 +1,6 @@
 # Sofle Keyboard
 
-![SofleKeyboard version 1](https://raw.githubusercontent.com/josefadamcik/SofleKeyboard/master/Images/IMG_20200126_114622.jpg)
+![SofleKeyboard version 1](https://i.imgur.com/S5GTKth.jpeg)
 
 Sofle is 6×4+5 keys column-staggered split keyboard. Based on Lily58, Corne and Helix keyboards.
 
diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json
index 5ab71ff1e37..20548d6baff 100644
--- a/keyboards/sofle/rev1/info.json
+++ b/keyboards/sofle/rev1/info.json
@@ -1,10 +1,9 @@
 {
-    "keyboard_name": "Sofle",
     "manufacturer": "JosefAdamcik",
     "url": "https://github.com/josefadamcik/SofleKeyboard",
     "maintainer": "Josef Adamcik <josef.adamcik@gmail.com>",
+    "development_board": "promicro",
     "usb": {
-        "vid": "0xFC32",
         "pid": "0x0287",
         "device_version": "0.0.1"
     },
@@ -12,14 +11,12 @@
         "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["C6", "D7", "E6", "B4", "B5"]
     },
-    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
         ]
     },
     "split": {
-        "soft_serial_pin": "D2",
         "encoder": {
             "right": {
                 "rotary": [
@@ -28,14 +25,6 @@
             }
         }
     },
-    "tapping": {
-        "term": 100
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/sofle/rev1/readme.md b/keyboards/sofle/rev1/readme.md
index 629d568e609..1d229030c4b 100644
--- a/keyboards/sofle/rev1/readme.md
+++ b/keyboards/sofle/rev1/readme.md
@@ -1,6 +1,6 @@
 # Sofle Keyboard
 
-![SofleKeyboard version 1](https://raw.githubusercontent.com/josefadamcik/SofleKeyboard/master/Images/IMG_20200126_114622.jpg)
+![SofleKeyboard version 1](https://i.imgur.com/S5GTKth.jpeg)
 
 Sofle is 6×4+5 keys column-staggered split keyboard. Based on Lily58, Corne and Helix keyboards.
 
diff --git a/keyboards/sofle/rev1/rev1.c b/keyboards/sofle/rev1/rev1.c
deleted file mode 100644
index df0f23a26cc..00000000000
--- a/keyboards/sofle/rev1/rev1.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2021 Carlos Martins
- *
- * 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 "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-  // Physical Layout
-  // Columns
-  // 0  1  2  3  4  5  6  7  8  9  10 11 12 13
-  //                                           ROWS
-  // 12 13 22 23 32 33       33 32 23 22 13 12  0
-  //    02    03    04       04    03    02
-  // 11 14 21 24 31 34       34 31 24 21 14 11  1
-  //                01       01
-  // 10 15 20 25 30 35       35 30 25 20 15 10  2
-  //
-  // 09 16 19 26 29 36       36 29 26 19 16 09  3
-  //
-  //     08 17 18 27 28     28 27 18 17 08      4
-  //    07    06    05       05    06    07
-
-led_config_t g_led_config = {
-    {
-        {  11,  12,  21,  22,  31,  32 },
-        {  10,  13,  20,  23,  30,  33 },
-        {  9,   14,  19,  24,  29,  34},
-        {  8,   15,  18,  25,  28,  35},
-        {  7,   16,  17,  26,  27,  NO_LED },
-        {  47,  48,  57,  58,  67,  68},
-        {  46,  49,  56,  59,  66,  69},
-        {  45,  50,  55,  60,  65,  70},
-        {  44,  51,  54,  61,  64,  71},
-        {  43,  52,  53,  62,  63,  NO_LED }
-    },
-    {
-       // Left side underglow
-        {96, 40}, {16, 20}, {48, 10}, {80, 18}, {88, 60}, {56, 57}, {24,60},
-        // Left side Matrix
-        {32, 57}, { 0, 48}, { 0, 36}, { 0, 24}, { 0, 12},
-        {16, 12}, {16, 24}, {16, 36}, {16, 48}, {48, 55},
-        {64, 57}, {32, 45}, {32, 33}, {32, 21}, {32,  9},
-        {48,  7}, {48, 19}, {48, 31}, {48, 43}, {80, 59},
-        {96, 64}, {64, 45}, {64, 33}, {64, 21}, {64,  9},
-        {80, 10}, {80, 22}, {80, 34}, {80, 47},
-
-
-        // Right side underglow
-        {128, 40}, {208, 20}, {176, 10}, {144, 18}, {136, 60}, {168, 57}, {200,60},
-        // Right side Matrix
-        {192, 57}, {224, 48}, {224, 36}, {224, 24}, {224, 12},
-        {208, 12}, {208, 24}, {208, 36}, {208, 48}, {176, 55},
-        {160, 57}, {192, 45}, {192, 33}, {192, 21}, {192,  9},
-        {176,  7}, {176, 19}, {176, 31}, {176, 43}, {144, 59},
-        {128, 64}, {160, 45}, {160, 33}, {160, 21}, {160,  9},
-        {144, 10}, {144, 22}, {144, 34}, {144, 47},
-    },
-    {
-        LED_FLAG_INDICATOR, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_INDICATOR, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT
-    }
-};
-#endif
diff --git a/keyboards/sofle/rev1/rules.mk b/keyboards/sofle/rev1/rules.mk
index 5ec06e96091..6e7633bfe01 100644
--- a/keyboards/sofle/rev1/rules.mk
+++ b/keyboards/sofle/rev1/rules.mk
@@ -1,2 +1 @@
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/sofle/rules.mk b/keyboards/sofle/rules.mk
index e03eb21a90c..a7307c3499e 100644
--- a/keyboards/sofle/rules.mk
+++ b/keyboards/sofle/rules.mk
@@ -1,3 +1 @@
-SPLIT_KEYBOARD = yes
 DEFAULT_FOLDER = sofle/rev1
-SWAP_HANDS_ENABLE = yes
diff --git a/keyboards/sofle/sofle.c b/keyboards/sofle/sofle.c
index bd3f3e157c5..3f88e2b5ba7 100644
--- a/keyboards/sofle/sofle.c
+++ b/keyboards/sofle/sofle.c
@@ -1,3 +1,5 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
@@ -44,3 +46,90 @@ const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0};
 #    endif
 
 #endif
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    if (is_keyboard_master()) {
+        return OLED_ROTATION_270;
+    }
+    return rotation;
+}
+
+static void render_logo(void) {
+    static const char PROGMEM qmk_logo[] = {
+        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
+    };
+    oled_write_P(qmk_logo, false);
+}
+
+void print_status_narrow(void) {
+    oled_write_P(PSTR("\n\n"), false);
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_ln_P(PSTR("Qwrt"), false);
+            break;
+        case 1:
+            oled_write_ln_P(PSTR("Clmk"), false);
+            break;
+        default:
+            oled_write_P(PSTR("Mod\n"), false);
+            break;
+    }
+    oled_write_P(PSTR("\n\n"), false);
+    oled_write_ln_P(PSTR("LAYER"), false);
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+        case 1:
+            oled_write_P(PSTR("Base\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("Raise"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("Lower"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+    }
+    oled_write_P(PSTR("\n\n"), false);
+    led_t led_usb_state = host_keyboard_led_state();
+    oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (is_keyboard_master()) {
+        print_status_narrow();
+    } else {
+        render_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) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/sofle_choc/info.json b/keyboards/sofle_choc/info.json
index b59def38b0d..f0ce6d78e04 100644
--- a/keyboards/sofle_choc/info.json
+++ b/keyboards/sofle_choc/info.json
@@ -24,7 +24,6 @@
         "driver": "ws2812",
         "split_count": [29, 29],
         "animations": {
-            "solid_color": true,
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
diff --git a/keyboards/sofle_choc/keymaps/default/config.h b/keyboards/sofle_choc/keymaps/default/config.h
index 93f173e84de..d48529d816a 100644
--- a/keyboards/sofle_choc/keymaps/default/config.h
+++ b/keyboards/sofle_choc/keymaps/default/config.h
@@ -24,6 +24,6 @@
 // I've found this helps with some ProMicros where the slave does not boot
 #define SPLIT_USB_DETECT
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
+#define RGB_MATRIX_SLEEP     // turn off effects when suspended
 #define SPLIT_TRANSPORT_MIRROR             // If LED_MATRIX_KEYPRESSES or LED_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100  // limits maximum brightness of LEDs (max 255). Higher may cause the controller to crash.
diff --git a/keyboards/sofle_choc/keymaps/via/config.h b/keyboards/sofle_choc/keymaps/via/config.h
index 93f173e84de..d48529d816a 100644
--- a/keyboards/sofle_choc/keymaps/via/config.h
+++ b/keyboards/sofle_choc/keymaps/via/config.h
@@ -24,6 +24,6 @@
 // I've found this helps with some ProMicros where the slave does not boot
 #define SPLIT_USB_DETECT
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
+#define RGB_MATRIX_SLEEP     // turn off effects when suspended
 #define SPLIT_TRANSPORT_MIRROR             // If LED_MATRIX_KEYPRESSES or LED_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100  // limits maximum brightness of LEDs (max 255). Higher may cause the controller to crash.
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h
deleted file mode 100644
index 0836a67e880..00000000000
--- a/keyboards/sowbug/68keys/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 Mike Tsao
- *
- * 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/>.
- */
-
-// config.h
-
-#pragma once
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_COUNT 68
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
-// 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
-#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
diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json
index 641ed0aa063..aa22cb804a1 100644
--- a/keyboards/sowbug/68keys/info.json
+++ b/keyboards/sowbug/68keys/info.json
@@ -12,7 +12,53 @@
         "pin": "B9"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 128
     },
     "matrix_pins": {
         "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
deleted file mode 100644
index 4b1538b6450..00000000000
--- a/keyboards/sowbug/ansi_tkl/config.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2021 Mike Tsao
- *
- * 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/>.
- */
-
-// config.h
-
-#pragma once
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_COUNT 87
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
-
-// 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
-#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
diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json
index 39cc57a8f39..6c6f2346bda 100644
--- a/keyboards/sowbug/ansi_tkl/info.json
+++ b/keyboards/sowbug/ansi_tkl/info.json
@@ -12,7 +12,53 @@
         "pin": "B9"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 128
     },
     "matrix_pins": {
         "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"],
diff --git a/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c b/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c
deleted file mode 100644
index e59133c3100..00000000000
--- a/keyboards/sowbug/ansi_tkl/keymaps/sowbug/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Mike Tsao
- *
- * 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/>.
- */
-
-// keymaps/sowbug/keymap.c
-
-#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,             KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                              KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(1),   KC_RALT, KC_RCTL, KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_MUTE, _______, QK_BOOT,
-        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPLY, KC_MSTP, KC_VOLU,
-        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_TOG, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    /*
-    [X] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
-    ),
-    */
-};
diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h
deleted file mode 100755
index aba496d469d..00000000000
--- a/keyboards/spaceholdings/nebula12b/config.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright 2022 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/>.
-*/
-
-#pragma once
-
-/* RGB options */
-
-#define RGB_MATRIX_LED_COUNT 16
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// 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
-#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
-
diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json
index f7ba574efc7..d6e02d1b973 100755
--- a/keyboards/spaceholdings/nebula12b/info.json
+++ b/keyboards/spaceholdings/nebula12b/info.json
@@ -12,7 +12,53 @@
         "pin": "D5"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "D7"],
diff --git a/keyboards/spaceholdings/nebula68/nebula68.c b/keyboards/spaceholdings/nebula68/nebula68.c
index af51c4805e1..db8a31b8319 100755
--- a/keyboards/spaceholdings/nebula68/nebula68.c
+++ b/keyboards/spaceholdings/nebula68/nebula68.c
@@ -29,134 +29,134 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 
-    {1, B_1,   A_1,   C_1}, //LB1
-    {1, E_1,   D_1,   F_1}, //LB2
-    {1, H_1,   G_1,   I_1}, //LB3
-    {1, K_1,   J_1,   L_1}, //LB4
-    {1, B_2,   A_2,   C_2}, //LB5
-    {1, E_2,   D_2,   F_2}, //LB6
-    {1, H_2,   G_2,   I_2}, //LB7
-    {1, K_2,   J_2,   L_2}, //LB8
-    {1, B_3,   A_3,   C_3}, //LB9
-    {1, E_3,   D_3,   F_3}, //LB10
-    {1, H_3,   G_3,   I_3}, //LB11
-    {1, K_3,   J_3,   L_3}, //LB12
-    {1, B_4,   A_4,   C_4}, //LB13
-    {1, E_4,   D_4,   F_4}, //LB14
-    {1, H_4,   G_4,   I_4}, //LB15
-    {1, K_4,   J_4,   L_4}, //LB16
-    {1, B_5,   A_5,   C_5}, //LB17
-    {1, E_5,   D_5,   F_5}, //LB18
-    {1, H_5,   G_5,   I_5}, //LB19
-    {1, K_5,   J_5,   L_5}, //LB20
-    {1, B_6,   A_6,   C_6}, //LB21
-    {1, E_6,   D_6,   F_6}, //LB22
-    {1, H_6,   G_6,   I_6}, //LB23
-    {1, K_6,   J_6,   L_6}, //LB24
-    {1, B_7,   A_7,   C_7}, //LB25
-    {1, E_7,   D_7,   F_7}, //LB26
-    {1, H_7,   G_7,   I_7}, //LB27
-    {1, K_7,   J_7,   L_7}, //LB28
-    {1, B_8,   A_8,   C_8}, //LB29
-    {1, E_8,   D_8,   F_8}, //LB30
-    {1, H_8,   G_8,   I_8}, //LB31
-    {1, K_8,   J_8,   L_8}, //LB32
-    {1, B_9,   A_9,   C_9}, //LB33
-    {1, E_9,   D_9,   F_9}, //LB34
-    {1, H_9,   G_9,   I_9}, //LB35
-    {1, K_9,   J_9,   L_9}, //LB36
-    {1, B_10,  A_10,  C_10}, //LB37
-    {1, E_10,  D_10,  F_10}, //LB38
-    {1, H_10,  G_10,  I_10}, //LB39
-    {1, K_10,  J_10,  L_10}, //LB40
-    {1, B_11,  A_11,  C_11}, //LB41
-    {1, E_11,  D_11,  F_11}, //LB42
-    {1, H_11,  G_11,  I_11}, //LB43
-    {1, K_11,  J_11,  L_11}, //LB44
-    {1, B_12,  A_12,  C_12}, //LB45
-    {1, E_12,  D_12,  F_12}, //LB46
-    {1, H_12,  G_12,  I_12}, //LB47
-    {1, K_12,  J_12,  L_12}, //LB48
-    {1, B_13,  A_13,  C_13}, //LB49
-    {1, E_13,  D_13,  F_13}, //LB50
-    {1, H_13,  G_13,  I_13}, //LB51
-    {1, K_13,  J_13,  L_13}, //LB52
-    {1, B_14,  A_14,  C_14}, //LB53
-    {1, E_14,  D_14,  F_14}, //LB54
-    {1, H_14,  G_14,  I_14}, //LB55
-    {1, K_14,  J_14,  L_14}, //LB56
-    {1, B_15,  A_15,  C_15}, //LB57
-    {1, E_15,  D_15,  F_15}, //LB58
-    {1, H_15,  G_15,  I_15}, //LB59
-    {1, K_15,  J_15,  L_15}, //LB60
-    {1, B_16,  A_16,  C_16}, //LB61
-    {1, E_16,  D_16,  F_16}, //LB62
-    {1, H_16,  G_16,  I_16}, //LB63
-    {1, K_16,  J_16,  L_16}, //LB64
+    {1, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LB1
+    {1, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LB2
+    {1, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LB3
+    {1, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LB4
+    {1, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LB5
+    {1, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LB6
+    {1, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LB7
+    {1, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LB8
+    {1, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LB9
+    {1, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LB10
+    {1, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LB11
+    {1, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LB12
+    {1, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LB13
+    {1, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LB14
+    {1, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LB15
+    {1, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LB16
+    {1, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LB17
+    {1, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LB18
+    {1, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LB19
+    {1, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LB20
+    {1, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LB21
+    {1, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LB22
+    {1, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LB23
+    {1, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LB24
+    {1, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LB25
+    {1, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LB26
+    {1, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LB27
+    {1, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LB28
+    {1, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LB29
+    {1, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LB30
+    {1, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LB31
+    {1, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LB32
+    {1, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LB33
+    {1, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LB34
+    {1, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LB35
+    {1, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LB36
+    {1, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LB37
+    {1, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LB38
+    {1, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LB39
+    {1, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LB40
+    {1, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LB41
+    {1, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LB42
+    {1, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LB43
+    {1, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LB44
+    {1, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LB45
+    {1, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LB46
+    {1, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LB47
+    {1, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LB48
+    {1, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LB49
+    {1, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LB50
+    {1, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LB51
+    {1, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LB52
+    {1, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LB53
+    {1, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LB54
+    {1, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LB55
+    {1, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LB56
+    {1, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LB57
+    {1, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LB58
+    {1, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LB59
+    {1, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LB60
+    {1, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LB61
+    {1, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LB62
+    {1, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LB63
+    {1, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LB64
 };
 #endif
diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h
deleted file mode 100755
index 4da2b5894a2..00000000000
--- a/keyboards/spaceholdings/nebula68b/config.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright 2021 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/>.
-*/
-
-#pragma once
-
-/* RGB options */
-
-#define RGB_MATRIX_LED_COUNT 79
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// 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
-#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
diff --git a/keyboards/spaceholdings/nebula68b/hs/config.h b/keyboards/spaceholdings/nebula68b/hs/config.h
deleted file mode 100755
index 472798f7555..00000000000
--- a/keyboards/spaceholdings/nebula68b/hs/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 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/>.
-*/
-
-#pragma once
-
-#undef RGB_MATRIX_LED_COUNT
-#define RGB_MATRIX_LED_COUNT 78
diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json
index c82e52299d3..61514668948 100755
--- a/keyboards/spaceholdings/nebula68b/info.json
+++ b/keyboards/spaceholdings/nebula68b/info.json
@@ -12,7 +12,54 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 130,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
diff --git a/keyboards/spaceman/2_milk/keymaps/binary/keymap.c b/keyboards/spaceman/2_milk/keymaps/binary/keymap.c
deleted file mode 100644
index c8df8e9ff02..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/binary/keymap.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-      [0] = LAYOUT(
-          KC_P0, 
-          KC_P1
-          )
-};
diff --git a/keyboards/spaceman/2_milk/keymaps/binary/readme.md b/keyboards/spaceman/2_milk/keymaps/binary/readme.md
deleted file mode 100644
index 5ebcbd3e587..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/binary/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Binary keymap 
-0 and 1 that's it 
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta/keymap.c b/keyboards/spaceman/2_milk/keymaps/copypasta/keymap.c
deleted file mode 100644
index c82a6ff2169..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/copypasta/keymap.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-      [0] = LAYOUT(
-          RCTL(KC_C), 
-          RCTL(KC_V)
-          )
-};
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta/readme.md b/keyboards/spaceman/2_milk/keymaps/copypasta/readme.md
deleted file mode 100644
index 6c2f4e8fbf8..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/copypasta/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copy/Paste Keymap
-![Picture](https://i.imgur.com/7LMZZrL.png)
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h
deleted file mode 100644
index bbd93cfc162..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 Ryan Neff (@JellyTitan)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define TAPPING_TERM 200
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
deleted file mode 100644
index 93c0f0eee38..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2022 Ryan Neff (@JellyTitan)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum tapdance_keycodes { 
-    TD_KEY_1,
-    TD_KEY_2
-};
-
-void dance_key_one(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        /* Copy for Mac. */
-        /* Windows & Linux use Ctrl+C: tap_code16(C(KC_C)) */
-        tap_code16(G(KC_C));
-        reset_tap_dance(state);
-    } else if (state->count == 2) {
-        /* Cut for Mac. */
-        /* Windows & Linux use Ctrl+X: tap_code16(C(KC_X)) */
-        tap_code16(G(KC_X));
-        reset_tap_dance(state);
-    } else if (state->count == 3) {
-        /* Plain old Tab. */
-        tap_code(KC_TAB);
-        reset_tap_dance(state);
-    }
-}
-
-void dance_key_two(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        /* Paste for Mac. */
-        /* Windows & Linux use Ctrl+V: tap_code16(C(KC_V)) */
-        tap_code16(G(KC_V));
-        reset_tap_dance(state);
-    } else if (state->count == 2) {
-        /* Paste as value Gui+Shift+V for Mac. */
-        /* Windows & Linux use Ctrl+Shift V: tap_code16(C(S(KC_V))) */
-        tap_code16(G(S(KC_V)));
-        reset_tap_dance(state);
-    } else if (state->count == 3) {
-        /* Tab between programs for mac Gui+Tab.  */
-        /* Windows & Linux use Ctrl+Tab: tap_code16(C(KC_TAB)) */
-        tap_code16(G(KC_TAB));
-        reset_tap_dance(state);
-    }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_KEY_1] = ACTION_TAP_DANCE_FN(dance_key_one), 
-    [TD_KEY_2] = ACTION_TAP_DANCE_FN(dance_key_two)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(TD(TD_KEY_1),
-    TD(TD_KEY_2))
-};
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md
deleted file mode 100644
index 722e7491bcb..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copypasta Macfancy Keymap for Milk 2%
-
-![copypasta_macfancy](https://i.imgur.com/7LMZZrL.png)
-
-Extra fancy copy/paste utilities for the Milk 2% keyboard on MacOS. Milk 2% designed by [Spaceman](https://github.com/Spaceboards/SpaceboardsHardware/tree/master/Keyboards/2%25%20Milk).
-
-Uses Tapping term for double and tripple tapping.
-Tapping speed can be adjusted with TAPPING_TERM in config.h
-
-### Key One
-- 1 Tap: Copy
-- 2 Taps: Cut
-- 3 Taps: Tab
-
-### Key Two
-- 1 Tap: Paste
-- 2 Taps: Paste as Value
-- 3 Taps: Tab between programs
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk
deleted file mode 100644
index 628a960a710..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2022 Ryan Neff (@JellyTitan)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-TAP_DANCE_ENABLE = yes	# Tap Dance
diff --git a/keyboards/spaceman/2_milk/keymaps/encg/config.h b/keyboards/spaceman/2_milk/keymaps/encg/config.h
deleted file mode 100644
index abb80c2a343..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/encg/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 encg
- *
- * 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 UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
-#define UNICODE_CYCLE_PERSIST true
diff --git a/keyboards/spaceman/2_milk/keymaps/encg/keymap.c b/keyboards/spaceman/2_milk/keymaps/encg/keymap.c
deleted file mode 100644
index fab1debf023..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/encg/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* Copyright 2020 encg
- *
- * 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 <stdio.h> 
-#include <stdlib.h> 
-#include <time.h>
-
-enum my_keycodes {
-    SPIN = SAFE_RANGE,
-    RULES,
-};
-
-enum unicode_names {
-    COW,
-    BTTR,
-    CHIKN,
-    FISH,
-    SEED,
-    RENV,
-    MBAG,
-    FACE,
-    WING,
-    SIGN,
-    WAVE
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    [COW]   = 0x1F404,  // 🐄
-    [BTTR]  = 0x1F9C8,  // 🧈
-    [CHIKN] = 0x1F414,  // 🐔
-    [FISH]  = 0x1F3A3,  // 🎣
-    [SEED]  = 0x1F331,  // 🌱
-    [RENV]  = 0x1F9E7,  // 🧧
-    [MBAG]  = 0x1F4B0,  // 💰
-    [FACE]  = 0x1F911,  // 🤑
-    [WING]  = 0x1F4B8,  // 💸
-    [SIGN]  = 0x1F4B2,  // 💲
-    [WAVE]  = 0x1F44B,  // 👋
-};
-
-/* Emojis stored in an array in order to be randomly accessed */
-const char* emoji[5] = {"🐄", "🧈", "🐔", "🎣", "🌱"};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case SPIN:
-            if (record->event.pressed) {
-                /* Seed RNG used by rand() with timer_read() https://beta.docs.qmk.fm/developing-qmk/qmk-reference/ref_functions#software-timers */
-                srand(timer_read());
-                int rng1 = rand() % 5; 
-                send_unicode_string(emoji[rng1]);
-                wait_ms(200);    
-                int rng2 = rand() % 5;
-                send_unicode_string(emoji[rng2]);
-                wait_ms(200);
-                int rng3 = rand() % 5;
-                send_unicode_string(emoji[rng3]);
-                wait_ms(200);
-                    if (rng1 == rng2 && rng1 == rng3) {
-                        if (rng1 == 0) {
-                            wait_ms(200);
-                            SEND_STRING("   ");
-                            send_unicode_string("🧧🧧🧧");
-                            wait_ms(200);
-                            SEND_STRING("\n");
-                          } else if (rng1 == 1) {
-                            wait_ms(200);
-                            SEND_STRING("   ");
-                            send_unicode_string("💰💰💰");
-                            wait_ms(200);
-                            SEND_STRING("\n");
-                          } else if (rng1 == 2) {
-                            wait_ms(200);
-                            SEND_STRING("   ");
-                            send_unicode_string("🤑🤑🤑");
-                            wait_ms(200);
-                            SEND_STRING("\n");
-                          } else if (rng1 == 3) {
-                            wait_ms(200);
-                            SEND_STRING("   ");
-                            send_unicode_string("💲💲💲");
-                            wait_ms(200);
-                            SEND_STRING("\n");
-                          } else if (rng1 == 4) {
-                            wait_ms(200);
-                            SEND_STRING("   ");
-                            send_unicode_string("📈📈📈");
-                            wait_ms(200);
-                            SEND_STRING("\n");
-                        }
-                    } else {
-                          SEND_STRING("   ");
-                          send_unicode_string("👋💸");
-                          SEND_STRING("\n");
-                    }
-      }
-            return false;
-            break;
-        case RULES:
-            if (record->event.pressed) {
-                send_unicode_string("🐄");
-                wait_ms(200);
-                send_unicode_string("🐄");
-                wait_ms(200);
-                send_unicode_string("🐄");
-                wait_ms(200);
-                SEND_STRING("   ");
-                send_unicode_string("🧧");
-                wait_ms(200);
-                send_unicode_string("🧧");
-                wait_ms(200);
-                send_unicode_string("🧧");
-                SEND_STRING("\n");
-                wait_ms(100);
-                send_unicode_string("🧈");
-                wait_ms(200);
-                send_unicode_string("🧈");
-                wait_ms(200);
-                send_unicode_string("🧈");
-                wait_ms(200);
-                SEND_STRING("   ");
-                send_unicode_string("💰");
-                wait_ms(200);
-                send_unicode_string("💰");
-                wait_ms(200);
-                send_unicode_string("💰");
-                SEND_STRING("\n");
-                wait_ms(100);
-                send_unicode_string("🐔");
-                wait_ms(200);
-                send_unicode_string("🐔");
-                wait_ms(200);
-                send_unicode_string("🐔");
-                wait_ms(200);
-                SEND_STRING("   ");
-                send_unicode_string("🤑");
-                wait_ms(200);
-                send_unicode_string("🤑");
-                wait_ms(200);
-                send_unicode_string("🤑");
-                SEND_STRING("\n");
-                wait_ms(100);
-                send_unicode_string("🎣");
-                wait_ms(200);
-                send_unicode_string("🎣");
-                wait_ms(200);
-                send_unicode_string("🎣");
-                wait_ms(200);
-                SEND_STRING("   ");
-                send_unicode_string("💲");
-                wait_ms(200);
-                send_unicode_string("💲");
-                wait_ms(200);
-                send_unicode_string("💲");
-                SEND_STRING("\n");
-                wait_ms(100);
-                send_unicode_string("🌱");
-                wait_ms(200);
-                send_unicode_string("🌱");
-                wait_ms(200);
-                send_unicode_string("🌱");
-                wait_ms(200);
-                SEND_STRING("   ");
-                send_unicode_string("📈");
-                wait_ms(200);
-                send_unicode_string("📈");
-                wait_ms(200);
-                send_unicode_string("📈");
-                SEND_STRING("\n\n");
-            }
-            return false;
-            break;    
-            }
-    return false;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        SPIN, /* bottom button */
-        RULES /* top button */
-    )
-};
diff --git a/keyboards/spaceman/2_milk/keymaps/encg/readme.md b/keyboards/spaceman/2_milk/keymaps/encg/readme.md
deleted file mode 100644
index 73232ec32ff..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/encg/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# encg's Keymap
-
-## What is this?
-
-A simple slot machine emulator for the [2% Milk Keyboard](https://github.com/Spaceman/SpaceboardsHardware/tree/master/Keyboards/2%25%20Milk). This idea is based on the [implementation by /u/ln8r on /r/mechanicalkeyboards](https://www.reddit.com/r/MechanicalKeyboards/comments/hcw21b/2_milk_slot_machine/).
-
-## How does it work?
-
-The top button outputs all possible winning emoji combinations followed by a corresponding "score." Emojis are output one-by-one with a short delay to simulate the "slots" feel.
-
-![IMG](https://i.imgur.com/rUc3IOn.gif)
-
-The bottom button outputs 3 random emojis one by one. The random function takes `timer_read()` as its seed value [(referenced here)](https://beta.docs.qmk.fm/developing-qmk/qmk-reference/ref_functions#software-timers).
-
-![IMG](https://i.imgur.com/4EREsIq.png)
-
-## Unicode Setup
-
-This keymap's default unicode input mode is `UNICODE_MODE_WINCOMPOSE` which requires [WinCompose](https://github.com/samhocevar/wincompose). For other OSes, see [QMK documentation on unicode input modes](https://docs.qmk.fm/#/feature_unicode?id=input-modes).
-
-## Ideas for the future
-
-- [ ] Factor in emoji hierarchy into RNG algorithm
-- [ ] Random/Wildcard emoji
-- [ ] Keep a count for winng combinations
-- [ ] Implement tap dance for easily switching unicode input types
diff --git a/keyboards/spaceman/2_milk/keymaps/encg/rules.mk b/keyboards/spaceman/2_milk/keymaps/encg/rules.mk
deleted file mode 100644
index 502b2def762..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/encg/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-UNICODEMAP_ENABLE = yes
diff --git a/keyboards/spaceman/2_milk/keymaps/excessbread/keymap.c b/keyboards/spaceman/2_milk/keymaps/excessbread/keymap.c
deleted file mode 100644
index a01b47f271d..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/excessbread/keymap.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-      [0] = LAYOUT(
-          KC_LGUI,
-          KC_F11	
-          )
-};
diff --git a/keyboards/spaceman/2_milk/keymaps/excessbread/readme.md b/keyboards/spaceman/2_milk/keymaps/excessbread/readme.md
deleted file mode 100644
index a6535e62cf7..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/excessbread/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# ExcessBread's keymap
-requested by excessbread
diff --git a/keyboards/spaceman/2_milk/keymaps/mikethetiger/keymap.c b/keyboards/spaceman/2_milk/keymaps/mikethetiger/keymap.c
deleted file mode 100644
index 20e2292f08d..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/mikethetiger/keymap.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-      [0] = LAYOUT(
-          KC_VOLU,
-          KC_VOLD
-          )
-};
diff --git a/keyboards/spaceman/2_milk/keymaps/mikethetiger/readme.md b/keyboards/spaceman/2_milk/keymaps/mikethetiger/readme.md
deleted file mode 100644
index 677732b0578..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/mikethetiger/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# mikethetiger's keymap for 2% Milk
diff --git a/keyboards/spaceman/2_milk/keymaps/mikethetiger/rules.mk b/keyboards/spaceman/2_milk/keymaps/mikethetiger/rules.mk
deleted file mode 100644
index 04ae9270ffb..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/mikethetiger/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = no	# Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE  = yes	# Console for debug(+400)
-COMMAND_ENABLE  = yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE  = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE  = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE  = no  # Custom backlighting code is used, so this should not be enabled
-AUDIO_ENABLE  = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE  = yes # This can be enabled if a ws2812 strip is connected to the expansion port.
diff --git a/keyboards/spaceman/2_milk/keymaps/mouse/keymap.c b/keyboards/spaceman/2_milk/keymaps/mouse/keymap.c
deleted file mode 100644
index a8ba44fb46c..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/mouse/keymap.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-      [0] = LAYOUT(
-          KC_BTN1,
-          KC_BTN2	
-          )
-};
diff --git a/keyboards/spaceman/2_milk/keymaps/mouse/readme.md b/keyboards/spaceman/2_milk/keymaps/mouse/readme.md
deleted file mode 100644
index 8ecb99eddbb..00000000000
--- a/keyboards/spaceman/2_milk/keymaps/mouse/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# left and right mouse buttons
-requested by WanderingVagrant
diff --git a/keyboards/spacetime/keymaps/kyleterry/keymap.c b/keyboards/spacetime/keymaps/kyleterry/keymap.c
deleted file mode 100644
index 5aaab878145..00000000000
--- a/keyboards/spacetime/keymaps/kyleterry/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Copyright 2019 Kyle Terry
- *
- * 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 LOWER       MO(_LOWER)
-#define RAISE       MO(_RAISE)
-#define NUM         MO(_NUM)
-#define CTL_ESC     CTL_T(KC_ESC)
-#define OS_LGUI     OSM (MOD_LGUI)
-#define SGAME       TO(_GAMING)
-#define SQWER       TO(_QWERTY)
-
-enum layers {
-  _QWERTY,
-  _GAMING,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-  _NUM
-};
-
-enum {
-  /* tap dance for raise and lower layer switching */
-  TD_RL = 0,
-  /* tap dance for common cording */
-  TD_C  = 1,
-  /* tap dance for media keys */
-  TD_MD = 2,
-};
-
-/*  layer template:
- *  [_LAYER] = LAYOUT(
- *    _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
- *    _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
- *    _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
- *        _______,                        _______, _______, _______,   _______, _______, _______,                        _______
- *  ),
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_LCTL,    TD(TD_C),KC_Y,    KC_U,   KC_I,    KC_O,     KC_P,    KC_BSPC,
-    CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_LALT,    KC_ENT,  KC_H,    KC_J,   KC_K,    KC_L,     KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   NUM,        OS_LGUI, KC_N,    KC_M,   KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT,
-        KC_LCTL,                        OS_LGUI, KC_SPC, LOWER,      RAISE,   KC_SPC,  OS_LGUI,                        KC_RALT
-  ),
-
-  [_GAMING] = LAYOUT(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_LCTL,    TD(TD_C),KC_Y,    KC_U,   KC_I,    KC_O,     KC_P,    KC_BSPC,
-    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_ESC,     KC_ENT,  KC_H,    KC_J,   KC_K,    KC_L,     KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   NUM,        OS_LGUI, KC_N,    KC_M,   KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT,
-        KC_LALT,                        KC_V,    KC_SPC, LOWER,      RAISE,   KC_SPC,  OS_LGUI,                        KC_RALT
-  ),
-
-  [_LOWER] = LAYOUT(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LPRN,   KC_RPRN, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-    _______, _______, _______, _______, _______, _______, KC_LBRC,   KC_RBRC, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, _______, _______, _______, _______, _______, KC_LCBR,   KC_RCBR, _______, _______, _______, _______, TD(TD_MD), KC_MNXT,
-        _______,                        _______, _______, _______,   _______, _______, _______,                        _______
-  ),
-
-  [_RAISE] = LAYOUT(
-    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_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_VOLD, KC_VOLU,
-        _______,                        _______, _______, _______,   _______, _______, _______,                        _______
-  ),
-
-  [_ADJUST] = LAYOUT(
-    _______, _______, KC_PGUP, _______, _______, _______, SQWER,     _______, _______, _______, KC_INS,  _______, KC_PSCR, _______,
-    _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, SGAME,     _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
-        _______,                        _______, _______, _______,   _______, _______, _______,                        _______
-  ),
-
-  [_NUM] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, KC_7,    KC_8,    KC_9,    KC_ASTR,
-    _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, KC_4,    KC_5,    KC_6,    KC_MINS,
-    _______, _______, _______, _______, _______, _______, _______,   _______, _______, KC_DOT,  KC_1,    KC_2,    KC_3,    KC_PLUS,
-        _______,                        _______, _______, _______,   _______, _______, _______,                        KC_0
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-void td_common(tap_dance_state_t *state, void *user_data) {
-  switch (state->count) {
-    case 1:
-      /* this case handles ctrl+o which is my tmux prefix
-       */
-      tap_code16(C(KC_O));
-      reset_tap_dance(state);
-      break;
-    case 2:
-      /* this case handles shift+insert which is a common way
-       * for me to paste text in linux
-       */
-      tap_code16(S(KC_INS));
-      reset_tap_dance(state);
-      break;
-  }
-}
-
-void td_media(tap_dance_state_t *state, void *user_data) {
-  switch (state->count) {
-    case 1:
-      tap_code16(KC_MPLY);
-      reset_tap_dance(state);
-      break;
-    case 2:
-      tap_code16(KC_MUTE);
-      reset_tap_dance(state);
-      break;
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_C]  = ACTION_TAP_DANCE_FN(td_common),
-  [TD_MD] = ACTION_TAP_DANCE_FN(td_media),
-};
diff --git a/keyboards/spacetime/keymaps/kyleterry/rules.mk b/keyboards/spacetime/keymaps/kyleterry/rules.mk
deleted file mode 100644
index 31e0fcf2933..00000000000
--- a/keyboards/spacetime/keymaps/kyleterry/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE=yes
diff --git a/keyboards/spacey/readme.md b/keyboards/spacey/readme.md
deleted file mode 100644
index e6158526933..00000000000
--- a/keyboards/spacey/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# spacey
-
-![spacey](https://i.imgur.com/Dzon2hbh.jpeg)
-
-Spacey, designed by Vanilla Keyboards is a 45/65% keyboard with a little personality. Hosting ortholinear alphas with traditional modifiers, diamond shaped arrows, rotary encoder, and a couple optional spacebars at the top of the board, it's a balance between functional and unique.
-
-* Keyboard Maintainer: [vanilla](https://github.com/vanillakeyboards)
-* Hardware Supported: Elite C, Spacey PCB plates and acrylic drop_in case
-* Hardware Availability: https://p3dstore.com/collections/ended-group-buys/products/spacey?variant=37742593147064 and https://keeb.io/products/elite-c-low-profile-version-usb-c-pro-micro-replacement-atmega32u4
-
-Make example for this keyboard (after setting up your build environment):
-
-    make spacey:default
-
-Flashing example for this keyboard:
-
-    make spacey: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/sparrow62/keymaps/74th/config.h b/keyboards/sparrow62/keymaps/74th/config.h
deleted file mode 100644
index e1fae611ce1..00000000000
--- a/keyboards/sparrow62/keymaps/74th/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2020 Atsushi Morimoto @74th
- *
- * 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 QUICK_TAP_TERM 0
-#define TAPPING_TERM 180
diff --git a/keyboards/sparrow62/keymaps/74th/keymap.c b/keyboards/sparrow62/keymaps/74th/keymap.c
deleted file mode 100644
index 1915dbd5014..00000000000
--- a/keyboards/sparrow62/keymaps/74th/keymap.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright 2020 Atsushi Morimoto @74th
-
-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,
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOCK,
-    ESC_MHEN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT(
-    // /-------+-------+-------+-------+-------+-------\                 /-------+-------+-------+-------+-------+-------.
-    // |  `    |   1   |   2   |   3   |   4   |   5   |                 |   7   |   8   |   9   |   0   |   -   |   =   |
-        KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,                     KC_7,   KC_8,   KC_9,   KC_0,  KC_MINS,KC_EQL,
-    // |-------+-------+-------+-------+-------+-------+-------\ /-------+-------+-------+-------+-------+-------+-------|
-    // |  `    |   Q   |   W   |   E   |   R   |   T   |   6   | |   6   |   Y   |   U   |   I   |   O   |   P   |   =   |
-        KC_GRV,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_6,     KC_6,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,  KC_EQL,
-    // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
-    // |Ctr(TAB|   A   |   S   |   D   |   F   |   G   |   [   | |   ]   |   H   |   J   |   K   |   L   |  ; :  |  ' "  |
-    CTL_T(KC_TAB),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,
-    // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
-    // |Sft(ESC|   Z   |   X   |   C   |   V   |   B   |   [   | |   ]   |   N   |   M   |  , <  |  . >  |  / ?  |  \ |  |
-    SFT_T(KC_ESC),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_BSLS,
-    // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
-    //                       |  ESC  |Alt(TAB|Sf(Eisu|Ctl(SPC|     |Ctl(ENT|  FN   |GU(Kana|  BS   |
-    ESC_MHEN, ALT_T(KC_TAB), SFT_T(KC_INT5), CTL_T(KC_SPC), CTL_T(KC_ENT), MO(_FN), GUI_T(KC_INT4), KC_BSPC
-    //                       \-------+-------+-------+-------/     \-------+-------+-------+-------/
-    ),
-
-    [_FN] = LAYOUT(
-    // /-------+-------+-------+-------+-------+-------\                 /-------+-------+-------+-------+-------+-------.
-    // | Lock  |CMD+F1 |Sft+F2 |CMD+F3 |CMD+F4 |CMD+F5 |                 |CMD+F6 |CMD+F7 |CMD+F8 |CMD+F9 |       |       |
-    C(G(KC_Q)),LCMD(KC_F1),SCMD(KC_F2),LCMD(KC_F3),LCMD(KC_F4),LCMD(KC_F5),LCMD(KC_F6),LCMD(KC_F7),LCMD(KC_F8),LCMD(KC_F9),_______,_______,
-    // |-------+-------+-------+-------+-------+-------+-------\ /-------+-------+-------+-------+-------+-------+-------|
-    // | ESC   |  F1   |  F2   |  F3   |  F4   |  F5   |  F6   | |  F6   |  F7   |  F8   |  F9   |  F10  |  F11  |  F12  |
-        KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,    KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,
-    // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
-    // |   ~   |   !   |   @   |   #   |   $   |   %   |   ^   | |   ^   |   &   |   *   |       | PrSC  | PrSC2 | PrSC3 |
-        KC_GRV, KC_EXLM, KC_AT, KC_HASH,KC_DLR, KC_PERC,KC_CIRC,  KC_CIRC,KC_AMPR,KC_ASTR,_______,KC_PSCR,LALT(KC_PSCR),LSFT(KC_PSCR),
-    // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
-    // |       |       |       |       |       |       |       | |       |   ←   |   ↓   |   ↑   |   →   | HOME  |  END  |
-        _______,_______,_______,_______,_______,_______,_______,  _______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,
-    // |-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
-    //                       |  ESC  |Alt(TAB|Sf(Eisu|Ctl(SPC|     |       |  FN   | RAlt  |  DEL  |
-                              _______,_______,_______,_______,      _______,_______,_______,KC_DEL
-    //                       \-------+-------+-------+-------/     \-------+-------+-------+-------/
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case ESC_MHEN:
-                tap_code(KC_INT5);
-                tap_code(KC_ESC);
-                return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/spiderisland/split78/keymaps/vial/config.h b/keyboards/spiderisland/split78/keymaps/vial/config.h
new file mode 100644
index 00000000000..c217519ce9f
--- /dev/null
+++ b/keyboards/spiderisland/split78/keymaps/vial/config.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID { 0x52, 0x5F, 0x74, 0x9A, 0xEB, 0xA5, 0x18, 0xC9 }
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 6 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 10 }
+
+#define VIAL_COMBO_ENTRIES 12
+#define VIAL_TAP_DANCE_ENTRIES 12
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/spiderisland/split78/keymaps/vial/keymap.c b/keyboards/spiderisland/split78/keymaps/vial/keymap.c
new file mode 100644
index 00000000000..6cb31a180f2
--- /dev/null
+++ b/keyboards/spiderisland/split78/keymaps/vial/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 unrelenting.technology
+ *
+ * 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(
+        QK_GESC,          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_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_QUOT, KC_SCLN,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
+        KC_LCTL, KC_LGUI, KC_LALT, TT(_FN),          KC_SPC,           KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT(
+        QK_BOOT,            KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   KC_DEL,
+        KC_NUM,  XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        BL_TOGG, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
+        KC_SCRL,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_SLSH, KC_PGUP, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          KC_P0,            KC_PDOT, KC_PENT, KC_HOME, KC_PGDN, KC_END
+    )
+};
diff --git a/keyboards/spiderisland/split78/keymaps/vial/rules.mk b/keyboards/spiderisland/split78/keymaps/vial/rules.mk
new file mode 100644
index 00000000000..46f9f1360fb
--- /dev/null
+++ b/keyboards/spiderisland/split78/keymaps/vial/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/spiderisland/split78/keymaps/vial/vial.json b/keyboards/spiderisland/split78/keymaps/vial/vial.json
new file mode 100644
index 00000000000..3a718634561
--- /dev/null
+++ b/keyboards/spiderisland/split78/keymaps/vial/vial.json
@@ -0,0 +1,174 @@
+{
+    "lighting": "qmk_backlight",
+    "matrix": {
+        "rows": 8,
+        "cols": 14
+    },
+    "layouts": {
+        "keymap": [
+            [
+                "0,0",
+                {
+                    "x": 0.75
+                },
+                "1,0",
+                "2,0",
+                "3,0",
+                "4,0",
+                {
+                    "x": 0.5
+                },
+                "5,0",
+                {
+                    "x": 1
+                },
+                "0,7",
+                "1,7",
+                "2,7",
+                {
+                    "x": 0.75
+                },
+                "3,7",
+                "4,7",
+                "5,7",
+                "6,7"
+            ],
+            [
+                {
+                    "y": 0.25
+                },
+                "0,1",
+                "1,1",
+                "2,1",
+                "3,1",
+                "4,1",
+                "5,1",
+                "5,5",
+                {
+                    "x": 1
+                },
+                "0,8",
+                "1,8",
+                "2,8",
+                "3,8",
+                "4,8",
+                "5,8",
+                {
+                    "w": 2
+                },
+                "6,8"
+            ],
+            [
+                {
+                    "w": 1.5
+                },
+                "0,2",
+                "1,2",
+                "2,2",
+                "3,2",
+                "4,2",
+                "5,2",
+                {
+                    "x": 1
+                },
+                "0,9",
+                "1,9",
+                "2,9",
+                "3,9",
+                "4,9",
+                "5,9",
+                "6,9",
+                {
+                    "w": 1.5
+                },
+                "0,12"
+            ],
+            [
+                {
+                    "w": 1.75
+                },
+                "0,3",
+                "1,3",
+                "2,3",
+                "3,3",
+                "4,3",
+                "5,3",
+                {
+                    "x": 1
+                },
+                "0,10",
+                "1,10",
+                "2,10",
+                "3,10",
+                "5,10",
+                "4,10",
+                {
+                    "w": 2.25
+                },
+                "6,10"
+            ],
+            [
+                {
+                    "w": 2.25
+                },
+                "0,4",
+                "1,4",
+                "2,4",
+                "3,4",
+                "4,4",
+                "5,4",
+                {
+                    "x": 1
+                },
+                "0,11",
+                "1,11",
+                "2,11",
+                "3,11",
+                {
+                    "w": 1.75
+                },
+                "4,11",
+                "5,11",
+                "6,11"
+            ],
+            [
+                {
+                    "w": 1.25
+                },
+                "0,5",
+                {
+                    "w": 1.25
+                },
+                "1,5",
+                {
+                    "w": 1.25
+                },
+                "2,5",
+                {
+                    "w": 1.25
+                },
+                "3,5",
+                {
+                    "w": 2.25
+                },
+                "4,5",
+                {
+                    "x": 1,
+                    "w": 2.25
+                },
+                "1,12",
+                {
+                    "w": 1.25
+                },
+                "2,12",
+                {
+                    "w": 1.25
+                },
+                "3,12",
+                "4,12",
+                "5,12",
+                "6,12"
+            ]
+        ]
+    }
+}
diff --git a/keyboards/spleeb/keymaps/chrishoage/config.h b/keyboards/spleeb/keymaps/chrishoage/config.h
deleted file mode 100644
index 0ac75d3041e..00000000000
--- a/keyboards/spleeb/keymaps/chrishoage/config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2022 Chris Hoage (@chrishoage)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define AUTO_MOUSE_TIME 250
-
-#define CIRQUE_PINNACLE_DIAMETER_MM 35
-#define POINTING_DEVICE_ROTATION_180
-
-#define SPLEEB_DRAGSCROLL_REVERSE_X
-#define SPLEEB_ENCODER_MODE_MAP_ENABLE
-
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 6
diff --git a/keyboards/spleeb/keymaps/chrishoage/keymap.c b/keyboards/spleeb/keymaps/chrishoage/keymap.c
deleted file mode 100644
index c3dfb8f02b4..00000000000
--- a/keyboards/spleeb/keymaps/chrishoage/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2022 Chris Hoage (@chrishoage)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// Double tap TD(0) to enter bootloader
-static void enter_qk_boot(tap_dance_state_t *state, void *user_data) {
-    if (state->count >= 2) {
-        reset_keyboard();
-        reset_tap_dance(state);
-    }
-}
-
-enum SpleebLayer { _BASE = 0, _FN, _MOUSE };
-
-tap_dance_action_t tap_dance_actions[] = {[0] = ACTION_TAP_DANCE_FN(enter_qk_boot)};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[_BASE] = LAYOUT(
-         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,  KC_ESC,                                          KC_BSPC,    KC_6,    KC_7,    KC_8,   KC_9,    KC_0, KC_BSLS,
-         KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_MINS,                                           KC_EQL,    KC_Y,    KC_U,    KC_I,   KC_O,    KC_P, KC_QUOT,
-        KC_LSFT,    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_RSFT,
-                    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_MUTE,                        ENC_STR,             KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH,
-                                            KC_LCTL, KC_LALT, KC_LGUI,  KC_ENT,   MO(1),        MO(1),  KC_SPC, KC_RGUI, KC_RALT, KC_RCTL
-    ),
-
-	[_FN] = LAYOUT(
-        KC_PAUS,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_ESC,                                           KC_DEL,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, KC_PSCR,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                          KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, KC_TRNS, KC_TRNS,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                          KC_TRNS, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, KC_TRNS,  QK_RBT,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          ENC_STL,                        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   TD(0),
-                                            KC_TRNS, KC_TRNS, KC_TRNS,  KC_SPC, KC_TRNS,      KC_TRNS,  KC_ENT, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-	[_MOUSE] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        DRGSCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, SNIPING,                                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN3,          KC_TRNS,                         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-};
-// clang-format on
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (get_mods() & MOD_MASK_GUI) {
-        // When GUI is held trigger [ ] to move workspaces
-        tap_code(clockwise ? KC_RBRC : KC_LBRC);
-        return false;
-    }
-
-    if (get_mods() & MOD_MASK_CTRL) {
-        // When CTRL is hled trigger page up/down to move tabs (Firefox, VSCode)
-        tap_code(clockwise ? KC_PGDN : KC_PGUP);
-        return false;
-    }
-
-    if (get_mods() & MOD_MASK_ALT) {
-        // When ALT is held trigger up/down to move line up/down
-        tap_code(clockwise ? KC_DOWN : KC_UP);
-        return false;
-    }
-
-    // Defer to encoder_update_kb to trigger spleeb_encoder_mode_trigger
-    return true;
-}
-
-enum spleeb_enc_mode {
-    DEF_DPI,
-    SNP_DPI,
-    VOL,
-    SEL,
-};
-
-void spleeb_encoder_mode_trigger(uint8_t mode, bool clockwise) {
-    dprintf("spleeb_encoder_mode_trigger m: %u, c: %u\n", mode, clockwise);
-    switch (mode) {
-        case DEF_DPI:
-            spleeb_cycle_pointer_default_dpi(clockwise);
-            break;
-        case SNP_DPI:
-            spleeb_cycle_pointer_sniping_dpi(clockwise);
-            break;
-        case VOL:
-            tap_code(clockwise ? KC_VOLU : KC_VOLD);
-            break;
-        case SEL: {
-            bool     is_shift = get_mods() & MOD_MASK_SHIFT;
-            uint16_t dir      = clockwise ? KC_RIGHT : KC_LEFT;
-            if (is_shift) {
-                tap_code(dir);
-            } else {
-                tap_code16(LSFT(LCTL(dir)));
-            }
-            break;
-        }
-
-        default:
-            break;
-    }
-}
-
-const char *spleeb_encoder_mode_string(uint8_t mode) {
-    switch (mode) {
-        case DEF_DPI:
-            return "df dpi";
-        case SNP_DPI:
-            return "sn dpi";
-        case VOL:
-            return "volume";
-        case SEL:
-            return "select";
-    }
-
-    return get_u8_str(mode, ' ');
-}
-
-void pointing_device_init_user(void) {
-    set_auto_mouse_layer(_MOUSE);
-}
-
-const spleeb_enc_mode_t spleeb_encoder_mode_map[NUM_ENCODERS][SPLEEB_ENCODER_MODE_COUNT] = {
-    [0] = {SPLEEB_ENC_MODE(VOL), SPLEEB_ENC_MODE(SEL)},
-    [1] = {SPLEEB_ENC_MODE(DEF_DPI), SPLEEB_ENC_MODE(SNP_DPI), SPLEEB_ENC_MODE(SEL)},
-};
diff --git a/keyboards/spleeb/keymaps/chrishoage/rules.mk b/keyboards/spleeb/keymaps/chrishoage/rules.mk
deleted file mode 100644
index 271c920da89..00000000000
--- a/keyboards/spleeb/keymaps/chrishoage/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-TAP_DANCE_ENABLE = yes
-BOOTMAGIC_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-ENCODER_ENABLE = yes
-
-POINTING_DEVICE_ENABLE = yes
-POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
-
-OLED_ENABLE = yes
diff --git a/keyboards/splitkb/aurora/corne/keymaps/x123/config.h b/keyboards/splitkb/aurora/corne/keymaps/x123/config.h
deleted file mode 100644
index 29d2337f107..00000000000
--- a/keyboards/splitkb/aurora/corne/keymaps/x123/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2022 x123 <@x123>
-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_TAP_TOGGLE 3  /* Tapping this number of times holds the key until tapped once again. */
-#define ONESHOT_TIMEOUT 5000  /* Time (in ms) before the one shot key is released */
-
-#define TAPPING_TOGGLE 1
-#define TAPPING_TERM 280
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
diff --git a/keyboards/splitkb/aurora/corne/keymaps/x123/keymap.c b/keyboards/splitkb/aurora/corne/keymaps/x123/keymap.c
deleted file mode 100644
index 6087c698ded..00000000000
--- a/keyboards/splitkb/aurora/corne/keymaps/x123/keymap.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-Copyright 2022 x123 <@x123>
-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 {
-    _QWERTY,
-    _QWERTY_NOHOMEROW,
-    _COLEMAK,
-    _COLEMAK_NOHOMEROW,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-    _ONESHOT,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  QWERTY_NOHOMEROW,
-  COLEMAK,
-  COLEMAK_NOHOMEROW,
-  LOWER,
-  RAISE,
-  ADJUST,
-  ONESHOT,
-  DT_UP_50,
-  DT_DOWN_50,
-  DT_UP_X2,
-  DT_DOWN_X2,
-  DT_200,
-  DT_MAX,
-};
-
-#define LSFT_KA LSFT_T(KC_A)
-#define LCTL_KS LCTL_T(KC_S)
-#define LGUI_KD LGUI_T(KC_D)
-#define LALT_KF LALT_T(KC_F)
-#define LALT_KJ LALT_T(KC_J)
-#define RGUI_KK RGUI_T(KC_K)
-#define RCTL_KL RCTL_T(KC_L)
-#define RS_SCLN RSFT_T(KC_SCLN)
-
-#define LCTL_KR LCTL_T(KC_R)
-#define LGUI_KS LGUI_T(KC_S)
-#define LALT_KT LALT_T(KC_T)
-#define LALT_KN LALT_T(KC_N)
-#define RGUI_KE RGUI_T(KC_E)
-#define RCTL_KI RCTL_T(KC_I)
-#define RSFT_KO RSFT_T(KC_O)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_BSPC, LSFT_KA, LCTL_KS, LGUI_KD, LALT_KF,    KC_G,                         KC_H, LALT_KJ, RGUI_KK, RCTL_KL, RS_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_LALT,   LOWER,  KC_SPC,     KC_ENT,   RAISE, OSL(_ONESHOT)
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [_QWERTY_NOHOMEROW] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_BSPC,    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_LALT,   LOWER,  KC_SPC,     KC_ENT,   RAISE, OSL(_ONESHOT)
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [_COLEMAK] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                         KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_BSLS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_BSPC, LSFT_KA, LCTL_KR, LGUI_KS, LALT_KT,    KC_G,                         KC_M, LALT_KN, RGUI_KE, RCTL_KI, RSFT_KO, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                         KC_K,    KC_H, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT,   LOWER,  KC_SPC,     KC_ENT,   RAISE, OSL(_ONESHOT)
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_COLEMAK_NOHOMEROW] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                         KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_BSLS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_BSPC,    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                         KC_M,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                         KC_K,    KC_H, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT,   LOWER,  KC_SPC,     KC_ENT,   RAISE, OSL(_ONESHOT)
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_LOWER] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, KC_LBRC, KC_LCBR,                      KC_RCBR, KC_RBRC,  KC_EQL, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, KC_ESC, KC_WH_U, KC_WBAK, KC_WFWD, KC_MS_U,                       KC_PGUP, KC_HOME,   KC_UP,  KC_END,  KC_DEL, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, KC_RALT, KC_WH_D, KC_LSFT, KC_LCTL, KC_MS_D,                      KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, C(KC_Z), C(KC_X), C(KC_C), KC_BTN1, C(KC_V),                      KC_BTN2, KC_BTN3, KC_MS_L, KC_MS_R, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, _______
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_ONESHOT] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_F12,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                        KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, COLEMAK,  QWERTY, _______, _______, _______,                      QK_BOOT, _______, _______, QWERTY_NOHOMEROW, COLEMAK_NOHOMEROW, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, _______
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case QWERTY_NOHOMEROW:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY_NOHOMEROW);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case COLEMAK_NOHOMEROW:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK_NOHOMEROW);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ONESHOT:
-      if (record->event.pressed) {
-        set_oneshot_layer(_ONESHOT, ONESHOT_START);
-      } else {
-        clear_oneshot_layer_state(ONESHOT_PRESSED);
-      }
-      return false;
-      break;
-    case DT_UP_50:
-      if (record->event.pressed) {
-        g_tapping_term += 50;
-      }
-      return false;
-      break;
-    case DT_DOWN_50:
-      if (record->event.pressed) {
-        g_tapping_term -= 50;
-      }
-      return false;
-      break;
-    case DT_UP_X2:
-      if (record->event.pressed) {
-        g_tapping_term *= 2;
-      }
-      return false;
-      break;
-    case DT_DOWN_X2:
-      if (record->event.pressed) {
-        g_tapping_term /= 2;
-      }
-      return false;
-      break;
-    case DT_200:
-      if (record->event.pressed) {
-        g_tapping_term = 200;
-      }
-      return false;
-      break;
-    case DT_MAX:
-      if (record->event.pressed) {
-        g_tapping_term = 34464;
-      }
-      return false;
-      break;
-  }
-  return true;
-}
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/corne/keymaps/x123/readme.md b/keyboards/splitkb/aurora/corne/keymaps/x123/readme.md
deleted file mode 100644
index f1599938c10..00000000000
--- a/keyboards/splitkb/aurora/corne/keymaps/x123/readme.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# x123 Keymap for the Aurora Corne
-
-This keymap is based on many concepts from Dreymar's big bag theory (see https://dreymar.colemak.org/index.html), tweaked a bit for my own preferences and adopted to the Aurora Corne.
-
-## Features
-
-- Supports both QWERTY and COLEMAK layouts
-- Layouts switchable on the fly
-- Homerow mods can be toggled (very useful for gaming)
-- Normal capslock key location has been replaced with backspace for ergonomics. Note that backspace is also placed in it's normal location for the QWERTY layouts (useful for letting others test the keyboard/layout)
-- Uses Dreymar's EXTEND for the RAISE layer
-- Keeps numbers and symbols on the LOWER layer
-- Function keys and quick configuration settings on the oneshot layer
-- Designed to use RALT as a compose key, which is accessible via the RAISE layer
-
-### QWERTY
-
-Basic QWERTY with homerow mods enabled.
-
-![QWERTY](https://i.imgur.com/NwIF3zJ.png)
-
-### QWERTY_NOHOMEROW
-
-Basic QWERTY with homerow mods disabled.
-
-![QWERTY_NOHOMEROW](https://i.imgur.com/2C1IGrX.png)
-
-### COLEMAK
-
-COLEMAK with homerow mods enabled.
-
-![COLEMAK](https://i.imgur.com/u5G6YWn.png)
-
-### COLEMAK_NOHOMEROW
-
-COLEMAK with homerow mods disabled.
-
-![COLEMAK_NOHOMEROW](https://i.imgur.com/enSnhcA.png)
-
-### LOWER
-
-LOWER is where numbers and symbols live.
-
-![LOWER](https://i.imgur.com/HabJ4hv.png)
-
-### RAISE
-
-RAISE is basically a direct rip of Dreymar's EXTEND for small keyboards (see the very bottom image on https://dreymar.colemak.org/layers-extend.html). This is where you'll find the arrow keys, navigation keys, mouse controls, and others.
-
-![RAISE](https://i.imgur.com/CtzQdKD.png)
-
-### ONESHOT
-
-ONESHOT is houses the function keys, it also allows quick access to swap between default layers described above as well as issue a QK_BOOT to the keyboard for use when flashing.
-
-![ONESHOT](https://i.imgur.com/cckg75i.png)
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/corne/keymaps/x123/rules.mk b/keyboards/splitkb/aurora/corne/keymaps/x123/rules.mk
deleted file mode 100644
index 1a8ca4fa0db..00000000000
--- a/keyboards/splitkb/aurora/corne/keymaps/x123/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2022 x123
-#
-# 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/>.
-
-RGB_MATRIX_ENABLE = no
-RGBLIGHT_ENABLE = no
-MOUSEKEY_ENABLE = yes    # Mouse keys
-OLED_ENABLE     = no
-LTO_ENABLE      = yes
-UNICODE_ENABLE  = yes
-DYNAMIC_TAPPING_TERM_ENABLE	= yes
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/corne/rev1/config.h b/keyboards/splitkb/aurora/corne/rev1/config.h
index 340aff824a2..f37b59a9521 100644
--- a/keyboards/splitkb/aurora/corne/rev1/config.h
+++ b/keyboards/splitkb/aurora/corne/rev1/config.h
@@ -25,11 +25,3 @@
 #    define OLED_DISPLAY_128X32
 #    define SPLIT_OLED_ENABLE
 #endif
-
-// Not yet available in `info.json`
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
-#    define RGB_MATRIX_LED_COUNT 54
-#    define RGB_MATRIX_SPLIT { 27, 27 }
-#    define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json
index d1725f215e8..2e0b74b5a87 100644
--- a/keyboards/splitkb/aurora/corne/rev1/info.json
+++ b/keyboards/splitkb/aurora/corne/rev1/info.json
@@ -95,6 +95,11 @@
                     {"pin_a": "F6", "pin_b": "F7"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "rgblight": {
@@ -164,6 +169,7 @@
             {"flags": 4, "matrix": [5, 0], "x": 224, "y": 24}, // R SW12
             {"flags": 4, "matrix": [6, 0], "x": 224, "y": 41}  // R SW18
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "split_count": [27, 27]
     }
 }
diff --git a/keyboards/splitkb/aurora/helix/keymaps/default/config.h b/keyboards/splitkb/aurora/helix/keymaps/default/config.h
index 869e99b779d..a6863a01e8e 100644
--- a/keyboards/splitkb/aurora/helix/keymaps/default/config.h
+++ b/keyboards/splitkb/aurora/helix/keymaps/default/config.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
 #define RGB_MATRIX_KEYPRESSES
 #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/splitkb/aurora/helix/rev1/config.h b/keyboards/splitkb/aurora/helix/rev1/config.h
index bbf6c500735..f8b8a190fe2 100644
--- a/keyboards/splitkb/aurora/helix/rev1/config.h
+++ b/keyboards/splitkb/aurora/helix/rev1/config.h
@@ -20,5 +20,3 @@
 
 #define OLED_DISPLAY_128X32
 #define SPLIT_OLED_ENABLE
-
-#define RGB_MATRIX_LED_COUNT 76
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/lily58/rev1/config.h b/keyboards/splitkb/aurora/lily58/rev1/config.h
index 1356c62ea17..08a61a2978d 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/config.h
+++ b/keyboards/splitkb/aurora/lily58/rev1/config.h
@@ -25,10 +25,3 @@
 #    define OLED_DISPLAY_128X32
 #    define SPLIT_OLED_ENABLE
 #endif
-
-// Not yet available in `info.json`
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 68
-#    define RGB_MATRIX_SPLIT { 34, 34 }
-#    define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/info.json
index 6a7bfdd26db..f81da08464d 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/info.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/info.json
@@ -106,6 +106,11 @@
                     {"pin_a": "F7", "pin_b": "F6"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "rgblight": {
@@ -189,6 +194,7 @@
             {"flags": 4, "matrix": [9, 3], "x": 173, "y": 62}, // R SW27
             {"flags": 4, "matrix": [9, 2], "x": 188, "y": 62}  // R SW26
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "split_count": [34, 34]
     }
 }
diff --git a/keyboards/splitkb/aurora/sofle_v2/keymaps/default/config.h b/keyboards/splitkb/aurora/sofle_v2/keymaps/default/config.h
index 353c0ee3495..75d233f42ea 100644
--- a/keyboards/splitkb/aurora/sofle_v2/keymaps/default/config.h
+++ b/keyboards/splitkb/aurora/sofle_v2/keymaps/default/config.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
 #define RGB_MATRIX_KEYPRESSES
 #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/config.h b/keyboards/splitkb/aurora/sofle_v2/rev1/config.h
index 1896af3cb5c..7292b3d8b08 100644
--- a/keyboards/splitkb/aurora/sofle_v2/rev1/config.h
+++ b/keyboards/splitkb/aurora/sofle_v2/rev1/config.h
@@ -20,5 +20,3 @@
 
 #define OLED_DISPLAY_128X32
 #define SPLIT_OLED_ENABLE
-
-#define RGB_MATRIX_LED_COUNT 70
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/default/config.h b/keyboards/splitkb/aurora/sweep/keymaps/default/config.h
index b35ec79511b..4605cb782a4 100644
--- a/keyboards/splitkb/aurora/sweep/keymaps/default/config.h
+++ b/keyboards/splitkb/aurora/sweep/keymaps/default/config.h
@@ -18,7 +18,7 @@
 
 // Not yet available in `keymap.json` format
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_SLEEP
 #    define RGB_MATRIX_KEYPRESSES
 #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/.clang-format b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/.clang-format
deleted file mode 100644
index f87f20d8b68..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-ColumnLimit: 110
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/config.h b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/config.h
deleted file mode 100644
index f14e2b17e18..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2023 Florent Linguenheld (@FLinguenheld)
- *
- * 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
-
-/* Flash */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET              // Activates the double-tap behavior
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // In ms in which the double tap can occur
-
-/* OLED */
-#undef OLED_FONT_H
-#define OLED_FONT_H "./oled/glcdfont.c"
-
-#define OLED_TIMEOUT 25000
-#define OLED_BRIGHTNESS 50 // Protect my eyesss
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
-#define SPLIT_OLED_ENABLE
-
-/* Auto shift ♥ */
-#define AUTO_SHIFT_TIMEOUT 115
-#define TAPPING_TERM 155
-
-/* Unicode */
-// #define UNICODE_SELECTED_MODES UC_LNX
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
-
-/* leader */
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 280
-#define LEADER_NO_TIMEOUT
-
-/* Mouse */
-#define MK_3_SPEED
-#define MK_MOMENTARY_ACCEL
-
-#define MK_C_OFFSET_0 1
-#define MK_C_INTERVAL_0 12
-
-#define MK_C_OFFSET_1 4
-#define MK_C_INTERVAL_1 18
-
-#define MK_C_OFFSET_UNMOD 13
-#define MK_C_INTERVAL_UNMOD 15
-
-#define MK_C_OFFSET_2 25
-#define MK_C_INTERVAL_2 10
-
-#define MK_W_OFFSET_0 1
-#define MK_W_INTERVAL_0 160
-
-#define MK_W_OFFSET_1 2
-#define MK_W_INTERVAL_1 120
-
-#define MK_W_OFFSET_UNMOD 4
-#define MK_W_INTERVAL_UNMOD 70
-
-#define MK_W_OFFSET_2 10
-#define MK_W_INTERVAL_2 30
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/auto_shift.c b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/auto_shift.c
deleted file mode 100644
index d5bf9f02235..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/auto_shift.c
+++ /dev/null
@@ -1,504 +0,0 @@
-// Copyright 2023 Florent Linguenheld (@FLinguenheld)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keycodes.h"
-
-/* Only for basis letters
-   Exceptions like Tab or Enter */
-bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case KC_TAB:
-    // case KC_ENT:
-
-  case US_EACU:
-  case US_CCED:
-  case US_AE:
-  case US_OE:
-
-  // --
-  case KC_A:
-  case KC_B:
-  case KC_C:
-  case KC_D:
-  case KC_E:
-  case KC_F:
-  case KC_G:
-  case KC_H:
-  case KC_I:
-  case KC_J:
-  case KC_K:
-  case KC_L:
-  case KC_M:
-  case KC_N:
-  case KC_O:
-  case KC_P:
-  case KC_Q:
-  case KC_R:
-  case KC_S:
-  case KC_T:
-  case KC_U:
-  case KC_V:
-  case KC_W:
-  case KC_X:
-  case KC_Y:
-  case KC_Z:
-
-    return true;
-  }
-
-  return get_custom_auto_shifted_key(keycode, record);
-}
-
-/* Custom auto shift
-   I use this instead of tap dance because double tap is horrible
-   Add here the letter or the custom enum, then add in press_user and press_release the actions */
-bool get_custom_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case KC_BSPC:
-
-  // Double them !!!
-  case KC_AMPERSAND:
-  case KC_AT:
-  case KC_BACKSLASH:
-  case KC_CIRCUMFLEX:
-  case KC_COLON:
-  case KC_DOLLAR:
-  case KC_EQUAL:
-  case KC_EXCLAIM:
-  case KC_GRAVE:
-  case KC_HASH:
-  case KC_MINUS:
-  case KC_PERC:
-  case KC_PIPE:
-  case KC_PLUS:
-  case KC_QUESTION:
-  case KC_QUOTE:
-  case KC_DOUBLE_QUOTE:
-  case KC_SEMICOLON:
-  case KC_SLASH:
-  case KC_ASTERISK:
-  case KC_TILDE:
-  case KC_UNDERSCORE:
-
-  case KC_LEFT_ANGLE_BRACKET: // Easy indent with vim
-  case KC_RIGHT_ANGLE_BRACKET:
-
-  case KC_LEFT_BRACKET:
-  case KC_RIGHT_BRACKET:
-  case KC_LEFT_CURLY_BRACE:
-  case KC_RIGHT_CURLY_BRACE:
-  case KC_LEFT_PAREN:
-  case KC_RIGHT_PAREN:
-
-  /* French */
-  case CS_A_GRAVE:
-  case CS_E_GRAVE:
-  case CS_U_GRAVE:
-
-  case CS_A_CIRCUMFLEX:
-  case CS_E_CIRCUMFLEX:
-  case CS_I_CIRCUMFLEX:
-  case CS_O_CIRCUMFLEX:
-  case CS_U_CIRCUMFLEX:
-
-  case CS_E_DIAERESIS:
-  case CS_I_DIAERESIS:
-  case CS_U_DIAERESIS:
-  case CS_Y_DIAERESIS:
-    return true;
-
-  default:
-    return false;
-  }
-}
-
-void autoshift_press_user(uint16_t keycode, bool shifted, keyrecord_t *record) {
-  switch (keycode) {
-  case KC_BSPC:
-    if (shifted) {
-      tap_code16(KC_DEL);
-    } else {
-      tap_code16(KC_BSPC);
-    }
-    break;
-    break;
-
-  case KC_AMPERSAND:
-    if (shifted) {
-      tap_code16(KC_AMPERSAND);
-      tap_code16(KC_AMPERSAND);
-    } else {
-      tap_code16(KC_AMPERSAND);
-    }
-    break;
-  case KC_AT:
-    if (shifted) {
-      tap_code16(KC_AT);
-      tap_code16(KC_AT);
-    } else {
-      tap_code16(KC_AT);
-    }
-    break;
-  case KC_BACKSLASH:
-    if (shifted) {
-      tap_code16(KC_BACKSLASH);
-      tap_code16(KC_BACKSLASH);
-    } else {
-      tap_code16(KC_BACKSLASH);
-    }
-    break;
-  case KC_CIRCUMFLEX:
-    if (shifted) {
-      tap_code16(KC_CIRCUMFLEX);
-      tap_code16(KC_CIRCUMFLEX);
-    } else {
-      tap_code16(KC_CIRCUMFLEX);
-    }
-    break;
-  case KC_COLON:
-    if (shifted) {
-      tap_code16(KC_COLON);
-      tap_code16(KC_COLON);
-    } else {
-      tap_code16(KC_COLON);
-    }
-    break;
-  case KC_DOLLAR:
-    if (shifted) {
-      tap_code16(KC_DOLLAR);
-      tap_code16(KC_DOLLAR);
-    } else {
-      tap_code16(KC_DOLLAR);
-    }
-    break;
-  case KC_EQUAL:
-    if (shifted) {
-      tap_code16(KC_EQUAL);
-      tap_code16(KC_EQUAL);
-    } else {
-      tap_code16(KC_EQUAL);
-    }
-    break;
-  case KC_EXCLAIM:
-    if (shifted) {
-      tap_code16(KC_EXCLAIM);
-      tap_code16(KC_EXCLAIM);
-    } else {
-      tap_code16(KC_EXCLAIM);
-    }
-    break;
-  case KC_GRAVE:
-    if (shifted) {
-      tap_code16(KC_GRAVE);
-      tap_code16(KC_GRAVE);
-    } else {
-      tap_code16(KC_GRAVE);
-    }
-    break;
-  case KC_HASH:
-    if (shifted) {
-      tap_code16(KC_HASH);
-      tap_code16(KC_HASH);
-    } else {
-      tap_code16(KC_HASH);
-    }
-    break;
-  case KC_MINUS:
-    if (shifted) {
-      tap_code16(KC_MINUS);
-      tap_code16(KC_MINUS);
-    } else {
-      tap_code16(KC_MINUS);
-    }
-    break;
-  case KC_PERCENT:
-    if (shifted) {
-      tap_code16(KC_PERCENT);
-      tap_code16(KC_PERCENT);
-    } else {
-      tap_code16(KC_PERCENT);
-    }
-    break;
-  case KC_PIPE:
-    if (shifted) {
-      tap_code16(KC_PIPE);
-      tap_code16(KC_PIPE);
-    } else {
-      tap_code16(KC_PIPE);
-    }
-    break;
-  case KC_PLUS:
-    if (shifted) {
-      tap_code16(KC_PLUS);
-      tap_code16(KC_PLUS);
-    } else {
-      tap_code16(KC_PLUS);
-    }
-    break;
-  case KC_QUESTION:
-    if (shifted) {
-      tap_code16(KC_QUESTION);
-      tap_code16(KC_QUESTION);
-    } else {
-      tap_code16(KC_QUESTION);
-    }
-    break;
-  case KC_QUOTE:
-    if (shifted) {
-      tap_code16(KC_QUOTE);
-      tap_code16(KC_QUOTE);
-    } else {
-      tap_code16(KC_QUOTE);
-    }
-    break;
-  case KC_DOUBLE_QUOTE:
-    if (shifted) {
-      tap_code16(KC_DOUBLE_QUOTE);
-      tap_code16(KC_DOUBLE_QUOTE);
-    } else {
-      tap_code16(KC_DOUBLE_QUOTE);
-    }
-    break;
-  case KC_SEMICOLON:
-    if (shifted) {
-      tap_code16(KC_SEMICOLON);
-      tap_code16(KC_SEMICOLON);
-    } else {
-      tap_code16(KC_SEMICOLON);
-    }
-    break;
-  case KC_SLASH:
-    if (shifted) {
-      tap_code16(KC_SLASH);
-      tap_code16(KC_SLASH);
-    } else {
-      tap_code16(KC_SLASH);
-    }
-    break;
-  case KC_ASTERISK:
-    if (shifted) {
-      tap_code16(KC_ASTERISK);
-      tap_code16(KC_ASTERISK);
-    } else {
-      tap_code16(KC_ASTERISK);
-    }
-    break;
-  case KC_TILDE:
-    if (shifted) {
-      tap_code16(KC_TILDE);
-      tap_code16(KC_TILDE);
-    } else {
-      tap_code16(KC_TILDE);
-    }
-    break;
-  case KC_UNDERSCORE:
-    if (shifted) {
-      tap_code16(KC_UNDERSCORE);
-      tap_code16(KC_UNDERSCORE);
-    } else {
-      tap_code16(KC_UNDERSCORE);
-    }
-    break;
-
-  case KC_LEFT_ANGLE_BRACKET:
-    if (shifted) {
-      tap_code16(KC_LEFT_ANGLE_BRACKET);
-      tap_code16(KC_LEFT_ANGLE_BRACKET);
-    } else {
-      tap_code16(KC_LEFT_ANGLE_BRACKET);
-    }
-    break;
-  case KC_RIGHT_ANGLE_BRACKET:
-    if (shifted) {
-      tap_code16(KC_RIGHT_ANGLE_BRACKET);
-      tap_code16(KC_RIGHT_ANGLE_BRACKET);
-    } else {
-      tap_code16(KC_RIGHT_ANGLE_BRACKET);
-    }
-    break;
-
-  case KC_LEFT_BRACKET:
-    if (shifted) {
-      tap_code16(KC_LEFT_BRACKET);
-      tap_code16(KC_LEFT_BRACKET);
-    } else {
-      tap_code16(KC_LEFT_BRACKET);
-    }
-    break;
-  case KC_RIGHT_BRACKET:
-    if (shifted) {
-      tap_code16(KC_RIGHT_BRACKET);
-      tap_code16(KC_RIGHT_BRACKET);
-    } else {
-      tap_code16(KC_RIGHT_BRACKET);
-    }
-    break;
-  case KC_LEFT_CURLY_BRACE:
-    if (shifted) {
-      tap_code16(KC_LEFT_CURLY_BRACE);
-      tap_code16(KC_LEFT_CURLY_BRACE);
-    } else {
-      tap_code16(KC_LEFT_CURLY_BRACE);
-    }
-    break;
-  case KC_RIGHT_CURLY_BRACE:
-    if (shifted) {
-      tap_code16(KC_RIGHT_CURLY_BRACE);
-      tap_code16(KC_RIGHT_CURLY_BRACE);
-    } else {
-      tap_code16(KC_RIGHT_CURLY_BRACE);
-    }
-    break;
-  case KC_LEFT_PAREN:
-    if (shifted) {
-      tap_code16(KC_LEFT_PAREN);
-      tap_code16(KC_LEFT_PAREN);
-    } else {
-      tap_code16(KC_LEFT_PAREN);
-    }
-    break;
-  case KC_RIGHT_PAREN:
-    if (shifted) {
-      tap_code16(KC_RIGHT_PAREN);
-      tap_code16(KC_RIGHT_PAREN);
-    } else {
-      tap_code16(KC_RIGHT_PAREN);
-    }
-    break;
-
-  /* French
-     Release is not necessary with 'send_unicode_string()' */
-  case CS_A_GRAVE:
-    if (shifted) {
-      tap_code16(US_DGRV);
-      tap_code16(S(KC_A));
-    } else {
-      tap_code16(US_DGRV);
-      tap_code16(KC_A);
-    }
-    break;
-  case CS_E_GRAVE:
-    if (shifted) {
-      tap_code16(US_DGRV);
-      tap_code16(S(KC_E));
-    } else {
-      tap_code16(US_DGRV);
-      tap_code16(KC_E);
-    }
-    break;
-  case CS_U_GRAVE:
-    if (shifted) {
-      tap_code16(US_DGRV);
-      tap_code16(S(KC_U));
-    } else {
-      tap_code16(US_DGRV);
-      tap_code16(KC_U);
-    }
-    break;
-
-  case CS_A_CIRCUMFLEX:
-    if (shifted) {
-      tap_code16(US_DCIR);
-      tap_code16(S(KC_A));
-    } else {
-      tap_code16(US_DCIR);
-      tap_code16(KC_A);
-    }
-    break;
-  case CS_E_CIRCUMFLEX:
-    if (shifted) {
-      tap_code16(US_DCIR);
-      tap_code16(S(KC_E));
-    } else {
-      tap_code16(US_DCIR);
-      tap_code16(KC_E);
-    }
-    break;
-  case CS_I_CIRCUMFLEX:
-    if (shifted) {
-      tap_code16(US_DCIR);
-      tap_code16(S(KC_I));
-    } else {
-      tap_code16(US_DCIR);
-      tap_code16(KC_I);
-    }
-    break;
-  case CS_O_CIRCUMFLEX:
-    if (shifted) {
-      tap_code16(US_DCIR);
-      tap_code16(S(KC_O));
-    } else {
-      tap_code16(US_DCIR);
-      tap_code16(KC_O);
-    }
-    break;
-  case CS_U_CIRCUMFLEX:
-    if (shifted) {
-      tap_code16(US_DCIR);
-      tap_code16(S(KC_U));
-    } else {
-      tap_code16(US_DCIR);
-      tap_code16(KC_U);
-    }
-    break;
-
-  case CS_E_DIAERESIS:
-    if (shifted) {
-      tap_code16(US_DIAE);
-      tap_code16(S(KC_E));
-    } else {
-      tap_code16(US_DIAE);
-      tap_code16(KC_E);
-    }
-    break;
-  case CS_I_DIAERESIS:
-    if (shifted) {
-      tap_code16(US_DIAE);
-      tap_code16(S(KC_I));
-    } else {
-      tap_code16(US_DIAE);
-      tap_code16(KC_I);
-    }
-    break;
-  case CS_U_DIAERESIS:
-    if (shifted) {
-      tap_code16(US_DIAE);
-      tap_code16(S(KC_U));
-    } else {
-      tap_code16(US_DIAE);
-      tap_code16(KC_U);
-    }
-    break;
-  case CS_Y_DIAERESIS:
-    if (shifted) {
-      tap_code16(US_DIAE);
-      tap_code16(S(KC_Y));
-    } else {
-      tap_code16(US_DIAE);
-      tap_code16(KC_Y);
-    }
-    break;
-
-  default:
-    if (shifted) {
-      add_weak_mods(MOD_BIT(KC_LSFT));
-    }
-    /* & 0xFF gets the Tap key for Tap Holds, required when using Retro Shift */
-    register_code16((IS_RETRO(keycode)) ? keycode & 0xFF : keycode);
-  }
-}
-
-void autoshift_release_user(uint16_t keycode, bool shifted, keyrecord_t *record) {
-  switch (keycode) {
-  case KC_BSPC:
-    unregister_code16((!shifted) ? KC_BSPC : KC_DEL);
-    break;
-
-  default:
-    /* & 0xFF gets the Tap key for Tap Holds, required when using Retro Shift
-       The IS_RETRO check isn't really necessary here, always using
-       keycode & 0xFF would be fine. */
-    unregister_code16((IS_RETRO(keycode)) ? keycode & 0xFF : keycode);
-  }
-}
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/combo.c b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/combo.c
deleted file mode 100644
index de0436b361e..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/combo.c
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright 2023 Florent Linguenheld (@FLinguenheld)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keycodes.h"
-
-/* How to :
-        - Add an entry in the enum
-        - Create a new sequence of keys
-        - Link the enum to this sequence in the key_combos table
-
-   For macros :
-        - Same steps
-        - And add the macro in the process_combo_event() function
-*/
-
-enum combos {
-  LEADER,
-  BOOTLOADER,
-
-  LAYER_ADJ,
-  LAYER_FN,
-  LAYER_LEFT_HAND,
-  LAYER_MOUSE,
-  LAYER_MOUSE_BACK,
-
-  /* French */
-  C_CEDILLA,
-  E_A,
-  E_O,
-
-  A_GRAVE,
-  E_GRAVE,
-  U_GRAVE,
-
-  A_CIRCUMFLEX,
-  E_CIRCUMFLEX,
-  I_CIRCUMFLEX,
-  O_CIRCUMFLEX,
-  U_CIRCUMFLEX,
-
-  E_DIAERESIS,
-  I_DIAERESIS,
-  U_DIAERESIS,
-  Y_DIAERESIS,
-
-  /* -- */
-  AMPERSAND,
-  AT_SIGN,
-  BACKSLASH,
-  CIRCUMFLEX,
-  COLON,
-  DOLLAR,
-  EQUAL,
-  EXCLAMATION_MARK,
-  GRAVE,
-  HASH,
-  MINUS,
-  PERCENT,
-  PIPE,
-  PLUS,
-  QUESTION_MARK,
-  QUOTE,
-  QUOTE_DOUBLE,
-  SEMICOLON,
-  SLASH,
-  STAR,
-  TILDE,
-  UNDERSCORE,
-
-  ANGLE_BRACKET_LEFT,
-  ANGLE_BRACKET_RIGHT,
-
-  BRACKET_LEFT,
-  BRACKET_RIGHT,
-  CURLY_BRACKET_LEFT,
-  CURLY_BRACKET_RIGHT,
-  PARENTHESIS_LEFT,
-  PARENTHESIS_RIGHT,
-
-  /* Non qwerty */
-  EURO,
-
-  /* One hand special */
-  CONTROL_RIGHT,
-  CONTROL_SHIFT_RIGHT,
-
-  ALT_LEFT,
-  SHIFT_LEFT,
-  CONTROL_SHIFT_LEFT,
-
-  /* Just to replace the define in config.h */
-  COMBO_LENGTH,
-};
-uint16_t COMBO_LEN = COMBO_LENGTH;
-
-/* Sequences fo keys */
-const uint16_t PROGMEM combo_leader[] = {LT(_MOUSE, KC_COMM), LT(_ARROWS, KC_DOT), COMBO_END};
-const uint16_t PROGMEM combo_bootloader[] = {KC_K, KC_TAB, KC_Z, KC_BSPC, KC_V, KC_J, COMBO_END};
-
-const uint16_t PROGMEM combo_ADJ[] = {CTL_T(KC_SPACE), LT(_NUMERIC, KC_ENT), COMBO_END};
-const uint16_t PROGMEM combo_fn[] = {LT(_NUMERIC, KC_ENT), KC_N, COMBO_END};
-const uint16_t PROGMEM combo_left_hand[] = {LT(_MOUSE, KC_COMM), GUI_T(KC_ESC), COMBO_END};
-const uint16_t PROGMEM combo_mouse[] = {KC_A, KC_I, KC_E, KC_U, COMBO_END};
-const uint16_t PROGMEM combo_mouse_back[] = {KC_MS_LEFT, KC_MS_UP, KC_MS_DOWN, KC_MS_RIGHT, COMBO_END};
-/* -- */
-const uint16_t PROGMEM combo_c_cedilla[] = {LT(_ARROWS, KC_DOT), KC_C, COMBO_END};
-const uint16_t PROGMEM combo_ea[] = {US_EACU, KC_A, COMBO_END};
-const uint16_t PROGMEM combo_eo[] = {US_EACU, KC_O, COMBO_END};
-
-const uint16_t PROGMEM combo_a_grave[] = {CTL_T(KC_SPACE), KC_A, COMBO_END};
-const uint16_t PROGMEM combo_e_grave[] = {CTL_T(KC_SPACE), KC_E, COMBO_END};
-const uint16_t PROGMEM combo_u_grave[] = {CTL_T(KC_SPACE), KC_U, COMBO_END};
-
-const uint16_t PROGMEM combo_a_circumflex[] = {LT(_MOUSE, KC_COMM), KC_A, COMBO_END};
-const uint16_t PROGMEM combo_e_circumflex[] = {LT(_MOUSE, KC_COMM), KC_E, COMBO_END};
-const uint16_t PROGMEM combo_i_circumflex[] = {LT(_MOUSE, KC_COMM), KC_I, COMBO_END};
-const uint16_t PROGMEM combo_o_circumflex[] = {LT(_MOUSE, KC_COMM), KC_O, COMBO_END};
-const uint16_t PROGMEM combo_u_circumflex[] = {LT(_MOUSE, KC_COMM), KC_U, COMBO_END};
-
-const uint16_t PROGMEM combo_e_diaeresis[] = {US_EACU, KC_E, COMBO_END};
-const uint16_t PROGMEM combo_i_diaeresis[] = {US_EACU, KC_I, COMBO_END};
-const uint16_t PROGMEM combo_u_diaeresis[] = {US_EACU, KC_U, COMBO_END};
-const uint16_t PROGMEM combo_y_diaeresis[] = {US_EACU, KC_Y, COMBO_END};
-
-/* -- */
-const uint16_t PROGMEM combo_ampersand[] = {KC_E, KC_U, COMBO_END};
-const uint16_t PROGMEM combo_at_sign[] = {KC_D, KC_L, COMBO_END};
-const uint16_t PROGMEM combo_backslash[] = {KC_B, KC_E, COMBO_END};
-const uint16_t PROGMEM combo_circumflex[] = {KC_B, KC_O, COMBO_END};
-const uint16_t PROGMEM combo_colon[] = {KC_C, KC_G, COMBO_END};
-const uint16_t PROGMEM combo_dollar[] = {KC_O, KC_W, COMBO_END};
-const uint16_t PROGMEM combo_equal[] = {KC_T, KC_H, COMBO_END};
-const uint16_t PROGMEM combo_exclamation_mark[] = {KC_Q, KC_Y, COMBO_END};
-const uint16_t PROGMEM combo_grave[] = {KC_T, KC_G, COMBO_END};
-const uint16_t PROGMEM combo_hash[] = {KC_X, KC_U, COMBO_END};
-const uint16_t PROGMEM combo_minus[] = {KC_T, KC_R, COMBO_END};
-const uint16_t PROGMEM combo_percent[] = {KC_B, KC_U, COMBO_END};
-const uint16_t PROGMEM combo_pipe[] = {KC_I, KC_E, COMBO_END};
-const uint16_t PROGMEM combo_plus[] = {KC_T, KC_L, COMBO_END};
-const uint16_t PROGMEM combo_question_mark[] = {KC_P, KC_D, COMBO_END};
-const uint16_t PROGMEM combo_quote[] = {KC_T, KC_N, COMBO_END};
-const uint16_t PROGMEM combo_quote_double[] = {KC_A, KC_U, COMBO_END};
-const uint16_t PROGMEM combo_semicolon[] = {KC_G, KC_H, COMBO_END};
-const uint16_t PROGMEM combo_slash[] = {KC_S, KC_L, COMBO_END};
-const uint16_t PROGMEM combo_star[] = {KC_S, KC_T, COMBO_END};
-const uint16_t PROGMEM combo_tilde[] = {KC_I, KC_U, COMBO_END};
-const uint16_t PROGMEM combo_underscore[] = {KC_S, KC_R, COMBO_END};
-
-const uint16_t PROGMEM combo_angle_bracket_left[] = {KC_C, KC_S, COMBO_END};
-const uint16_t PROGMEM combo_angle_bracket_right[] = {KC_S, KC_H, COMBO_END};
-const uint16_t PROGMEM combo_bracket_left[] = {KC_I, KC_O, COMBO_END};
-const uint16_t PROGMEM combo_bracket_right[] = {KC_O, KC_U, COMBO_END};
-const uint16_t PROGMEM combo_curly_bracket_left[] = {KC_X, KC_E, COMBO_END};
-const uint16_t PROGMEM combo_curly_bracket_right[] = {KC_E, KC_Y, COMBO_END};
-const uint16_t PROGMEM combo_parenthesis_left[] = {KC_T, KC_D, COMBO_END};
-const uint16_t PROGMEM combo_parenthesis_right[] = {KC_D, KC_R, COMBO_END};
-
-/* Non qwerty */
-const uint16_t PROGMEM combo_euro[] = {KC_X, KC_Q, COMBO_END};
-
-/* One hand special */
-const uint16_t PROGMEM combo_control_right[] = {LT(_NUMERIC, KC_ENT), KC_R, COMBO_END};
-const uint16_t PROGMEM combo_control_shift_right[] = {LT(_NUMERIC, KC_ENT), KC_S, COMBO_END};
-
-const uint16_t PROGMEM combo_shift_left[] = {LT(_MOUSE, KC_COMM), US_EACU, COMBO_END};
-const uint16_t PROGMEM combo_alt_left[] = {CTL_T(KC_SPACE), US_EACU, COMBO_END};
-const uint16_t PROGMEM combo_control_shift_left[] = {CTL_T(KC_SPACE), GUI_T(KC_ESC), COMBO_END};
-
-/* Sequences fo keys */
-combo_t key_combos[] = {
-    [LEADER] = COMBO(combo_leader, QK_LEAD),
-    [BOOTLOADER] = COMBO(combo_bootloader, QK_BOOTLOADER),
-
-    [LAYER_ADJ] = COMBO(combo_ADJ, OSL(_ADJ)),
-    [LAYER_FN] = COMBO(combo_fn, OSL(_FN)),
-    [LAYER_LEFT_HAND] = COMBO(combo_left_hand, OSL(_LEFT_HAND)),
-    [LAYER_MOUSE] = COMBO(combo_mouse, TG(_MOUSE)),
-    [LAYER_MOUSE_BACK] = COMBO(combo_mouse_back, TG(_MOUSE)),
-
-    /* French */
-    [C_CEDILLA] = COMBO(combo_c_cedilla, US_CCED),
-    [E_A] = COMBO(combo_ea, US_AE),
-    [E_O] = COMBO(combo_eo, US_OE),
-
-    [A_GRAVE] = COMBO(combo_a_grave, CS_A_GRAVE),
-    [E_GRAVE] = COMBO(combo_e_grave, CS_E_GRAVE),
-    [U_GRAVE] = COMBO(combo_u_grave, CS_U_GRAVE),
-
-    [A_CIRCUMFLEX] = COMBO(combo_a_circumflex, CS_A_CIRCUMFLEX),
-    [E_CIRCUMFLEX] = COMBO(combo_e_circumflex, CS_E_CIRCUMFLEX),
-    [I_CIRCUMFLEX] = COMBO(combo_i_circumflex, CS_I_CIRCUMFLEX),
-    [O_CIRCUMFLEX] = COMBO(combo_o_circumflex, CS_O_CIRCUMFLEX),
-    [U_CIRCUMFLEX] = COMBO(combo_u_circumflex, CS_U_CIRCUMFLEX),
-
-    [E_DIAERESIS] = COMBO(combo_e_diaeresis, CS_E_DIAERESIS),
-    [I_DIAERESIS] = COMBO(combo_i_diaeresis, CS_I_DIAERESIS),
-    [U_DIAERESIS] = COMBO(combo_u_diaeresis, CS_U_DIAERESIS),
-    [Y_DIAERESIS] = COMBO(combo_y_diaeresis, CS_Y_DIAERESIS),
-
-    /* -- */
-    [AMPERSAND] = COMBO(combo_ampersand, KC_AMPERSAND),
-    [AT_SIGN] = COMBO(combo_at_sign, KC_AT),
-    [BACKSLASH] = COMBO(combo_backslash, KC_BACKSLASH),
-    [CIRCUMFLEX] = COMBO(combo_circumflex, KC_CIRCUMFLEX),
-    [COLON] = COMBO(combo_colon, KC_COLON),
-    [DOLLAR] = COMBO(combo_dollar, KC_DOLLAR),
-    [EQUAL] = COMBO(combo_equal, KC_EQUAL),
-    [EXCLAMATION_MARK] = COMBO(combo_exclamation_mark, KC_EXCLAIM),
-    [GRAVE] = COMBO(combo_grave, KC_GRAVE),
-    [HASH] = COMBO(combo_hash, KC_HASH),
-    [MINUS] = COMBO(combo_minus, KC_MINUS),
-    [PERCENT] = COMBO(combo_percent, KC_PERCENT),
-    [PIPE] = COMBO(combo_pipe, KC_PIPE),
-    [PLUS] = COMBO(combo_plus, KC_PLUS),
-    [QUESTION_MARK] = COMBO(combo_question_mark, KC_QUESTION),
-    [QUOTE] = COMBO(combo_quote, KC_QUOTE),
-    [QUOTE_DOUBLE] = COMBO(combo_quote_double, KC_DOUBLE_QUOTE),
-    [SEMICOLON] = COMBO(combo_semicolon, KC_SEMICOLON),
-    [SLASH] = COMBO(combo_slash, KC_SLASH),
-    [STAR] = COMBO(combo_star, KC_ASTERISK),
-    [TILDE] = COMBO(combo_tilde, KC_TILDE),
-    [UNDERSCORE] = COMBO(combo_underscore, KC_UNDERSCORE),
-
-    [ANGLE_BRACKET_LEFT] = COMBO(combo_angle_bracket_left, KC_LEFT_ANGLE_BRACKET),
-    [ANGLE_BRACKET_RIGHT] = COMBO(combo_angle_bracket_right, KC_RIGHT_ANGLE_BRACKET),
-
-    [BRACKET_LEFT] = COMBO(combo_bracket_left, KC_LEFT_BRACKET),
-    [BRACKET_RIGHT] = COMBO(combo_bracket_right, KC_RIGHT_BRACKET),
-    [CURLY_BRACKET_LEFT] = COMBO(combo_curly_bracket_left, KC_LEFT_CURLY_BRACE),
-    [CURLY_BRACKET_RIGHT] = COMBO(combo_curly_bracket_right, KC_RIGHT_CURLY_BRACE),
-    [PARENTHESIS_LEFT] = COMBO(combo_parenthesis_left, KC_LEFT_PAREN),
-    [PARENTHESIS_RIGHT] COMBO(combo_parenthesis_right, KC_RIGHT_PAREN),
-
-    /* Non qwerty */
-    [EURO] COMBO(combo_euro, US_EURO),
-
-    /* One hand special */
-    [CONTROL_RIGHT] = COMBO(combo_control_right, KC_RCTL),
-    [CONTROL_SHIFT_RIGHT] = COMBO(combo_control_shift_right, C(S(XXXXXXX))),
-
-    [ALT_LEFT] = COMBO(combo_alt_left, KC_LALT),
-    [SHIFT_LEFT] = COMBO(combo_shift_left, KC_LSFT),
-    [CONTROL_SHIFT_LEFT] = COMBO(combo_control_shift_left, C(S(XXXXXXX))),
-};
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/leader.c b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/leader.c
deleted file mode 100644
index 1964fb428fe..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/leader.c
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright 2023 Florent Linguenheld (@FLinguenheld)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keycodes.h"
-#include <stdlib.h>
-
-void leader_end_user(void) {
-  if (leader_sequence_two_keys(KC_M, KC_S)) {
-    SEND_STRING("f@linguenheld.fr");
-  } else if (leader_sequence_two_keys(KC_M, KC_L)) {
-    SEND_STRING("florent@linguenheld.fr");
-  } else if (leader_sequence_two_keys(KC_F, KC_L)) {
-    SEND_STRING("flinguenheld");
-
-  } else if (leader_sequence_three_keys(KC_D, KC_O, KC_T)) {
-    SEND_STRING("https://github.com/flinguenheld/dotfiles");
-  } else if (leader_sequence_three_keys(KC_H, KC_U, KC_B)) {
-    SEND_STRING("https://github.com/flinguenheld/");
-  } else if (leader_sequence_three_keys(KC_Q, KC_M, KC_K)) {
-    SEND_STRING("$HOME/qmk_firmware/keyboards/splitkb/aurora/sweep/keymaps/sweep_keymap");
-  } else if (leader_sequence_three_keys(KC_Q, KC_M, KC_C)) {
-    SEND_STRING("qmk compile && qmk flash");
-
-  } else if (leader_sequence_three_keys(KC_T, KC_E, KC_S)) {
-    SEND_STRING("test01234");
-  } else if (leader_sequence_three_keys(KC_A, KC_D, KC_M)) {
-    SEND_STRING("admin01234");
-
-  } else if (leader_sequence_one_key(KC_C)) {
-    SEND_STRING(" | xclip -r -selection clipboard");
-
-    /* Keyring requests, improbable combinaisons used by i3 */
-  } else if (leader_sequence_three_keys(KC_G, KC_I, KC_T)) {
-    register_code(KC_LEFT_GUI);
-    register_code(KC_LEFT_SHIFT);
-    register_code(KC_LEFT_CTRL);
-    register_code(KC_0);
-    unregister_code(KC_0);
-    unregister_code(KC_LEFT_GUI);
-    unregister_code(KC_LEFT_SHIFT);
-    unregister_code(KC_LEFT_CTRL);
-
-  } else if (leader_sequence_three_keys(KC_M, KC_A, KC_I)) {
-    register_code(KC_LEFT_GUI);
-    register_code(KC_LEFT_SHIFT);
-    register_code(KC_LEFT_CTRL);
-    register_code(KC_1);
-    unregister_code(KC_1);
-    unregister_code(KC_LEFT_GUI);
-    unregister_code(KC_LEFT_SHIFT);
-    unregister_code(KC_LEFT_CTRL);
-
-  } else if (leader_sequence_three_keys(KC_P, KC_A, KC_S)) {
-    register_code(KC_LEFT_GUI);
-    register_code(KC_LEFT_SHIFT);
-    register_code(KC_LEFT_CTRL);
-    register_code(KC_2);
-    unregister_code(KC_2);
-    unregister_code(KC_LEFT_GUI);
-    unregister_code(KC_LEFT_SHIFT);
-    unregister_code(KC_LEFT_CTRL);
-
-    /* ----- */
-  } else if (leader_sequence_three_keys(KC_D, KC_E, KC_G)) {
-    tap_code16(US_DEG); // °
-  } else if (leader_sequence_three_keys(KC_D, KC_I, KC_A)) {
-    tap_code16(US_OSTR); // ø
-  } else if (leader_sequence_three_keys(KC_S, KC_E, KC_C)) {
-    tap_code16(US_SECT); // §
-
-    /* Copyright / Register */
-  } else if (leader_sequence_three_keys(KC_C, KC_O, KC_P)) {
-    tap_code16(US_COPY); // ©
-  } else if (leader_sequence_three_keys(KC_R, KC_E, KC_G)) {
-    tap_code16(US_REGD); // ®
-
-    /* Currency */
-  } else if (leader_sequence_three_keys(KC_E, KC_U, KC_R)) {
-    tap_code16(US_EURO); // €
-  } else if (leader_sequence_three_keys(KC_P, KC_O, KC_U)) {
-    tap_code16(US_PND); // £
-  } else if (leader_sequence_three_keys(KC_Y, KC_E, KC_N)) {
-    tap_code16(US_YEN); // ¥
-  } else if (leader_sequence_three_keys(KC_C, KC_E, KC_N)) {
-    tap_code16(US_CENT); // ¢
-
-    /* Fractions */
-  } else if (leader_sequence_three_keys(KC_F, KC_C, KC_T)) {
-    tap_code16(US_QRTR); // ¼
-  } else if (leader_sequence_three_keys(KC_F, KC_C, KC_G)) {
-    tap_code16(US_HALF); // ½
-  } else if (leader_sequence_three_keys(KC_F, KC_H, KC_T)) {
-    tap_code16(US_TQTR); // ¾
-
-    /* Maths */
-  } else if (leader_sequence_three_keys(KC_M, KC_U, KC_L)) {
-    tap_code16(US_MUL); // ×
-  } else if (leader_sequence_three_keys(KC_D, KC_I, KC_V)) {
-    tap_code16(US_DIV); // ÷
-  } else if (leader_sequence_two_keys(KC_P, KC_M)) {
-    send_unicode_string("±");
-  } else if (leader_sequence_three_keys(KC_I, KC_N, KC_E)) {
-    send_unicode_string("≠");
-  } else if (leader_sequence_three_keys(KC_A, KC_L, KC_M)) {
-    send_unicode_string("≈");
-  } else if (leader_sequence_three_keys(KC_S, KC_Q, KC_U)) {
-    send_unicode_string("√");
-  } else if (leader_sequence_three_keys(KC_I, KC_N, KC_F)) {
-    send_unicode_string("∞");
-  } else if (leader_sequence_two_keys(KC_LABK, KC_LABK)) {
-    send_unicode_string("≤");
-  } else if (leader_sequence_two_keys(KC_RABK, KC_RABK)) {
-    send_unicode_string("≥");
-
-    /* Greek */
-  } else if (leader_sequence_three_keys(KC_B, KC_E, KC_T)) {
-    tap_code16(US_SS); // ß
-  } else if (leader_sequence_three_keys(KC_M, KC_I, KC_C)) {
-    tap_code16(US_MICR); // µ
-  } else if (leader_sequence_two_keys(KC_P, KC_I)) {
-    send_unicode_string("π");
-  } else if (leader_sequence_three_keys(KC_P, KC_I, KC_I)) {
-    send_unicode_string("Π");
-
-  } else if (leader_sequence_three_keys(KC_O, KC_M, KC_E)) {
-    send_unicode_string("ω");
-  } else if (leader_sequence_four_keys(KC_O, KC_M, KC_E, KC_G)) {
-    send_unicode_string("Ω");
-
-    /* Icons */
-  } else if (leader_sequence_three_keys(KC_L, KC_O, KC_V)) {
-    send_unicode_string("♥");
-  } else if (leader_sequence_three_keys(KC_F, KC_L, KC_A)) {
-    send_unicode_string("⚡");
-  } else if (leader_sequence_three_keys(KC_S, KC_T, KC_A)) {
-    send_unicode_string("✶");
-  } else if (leader_sequence_three_keys(KC_B, KC_U, KC_L)) {
-    send_unicode_string("💡");
-  } else if (leader_sequence_four_keys(KC_I, KC_N, KC_F, KC_O)) {
-    send_unicode_string("ℹ️");
-  } else if (leader_sequence_three_keys(KC_G, KC_E, KC_A)) {
-    send_unicode_string("⚙️");
-
-  } else if (leader_sequence_one_key(KC_V)) {
-    send_unicode_string("✓");
-  } else if (leader_sequence_two_keys(KC_V, KC_B)) {
-    send_unicode_string("✔");
-  } else if (leader_sequence_two_keys(KC_V, KC_V)) {
-    send_unicode_string("✅");
-
-  } else if (leader_sequence_one_key(KC_X)) {
-    send_unicode_string("✗");
-  } else if (leader_sequence_two_keys(KC_X, KC_B)) {
-    send_unicode_string("✘");
-
-  } else if (leader_sequence_one_key(KC_QUESTION)) {
-    send_unicode_string("❔");
-  } else if (leader_sequence_one_key(KC_EXCLAIM)) {
-    send_unicode_string("❗");
-  } else if (leader_sequence_two_keys(KC_QUESTION, KC_QUESTION)) {
-    send_unicode_string("❓");
-  } else if (leader_sequence_two_keys(KC_EXCLAIM, KC_EXCLAIM)) {
-    send_unicode_string("❕");
-
-    /* Subscript / superscript */
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_N)) {
-    send_unicode_string("⁰");
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_N)) {
-    send_unicode_string("₀");
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_C)) {
-    tap_code16(US_SUP1); // ¹
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_C)) {
-    send_unicode_string("₁");
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_G)) {
-    tap_code16(US_SUP2); // ²
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_G)) {
-    send_unicode_string("₂");
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_H)) {
-    tap_code16(US_SUP3); // ³
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_H)) {
-    send_unicode_string("₃");
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_T)) {
-    send_unicode_string("⁴");
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_T)) {
-    send_unicode_string("₄");
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_S)) {
-    send_unicode_string("⁵");
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_S)) {
-    send_unicode_string("₅");
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_R)) {
-    send_unicode_string("⁶");
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_R)) {
-    send_unicode_string("₆");
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_P)) {
-    send_unicode_string("⁷");
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_P)) {
-    send_unicode_string("₇");
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_D)) {
-    send_unicode_string("⁸");
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_D)) {
-    send_unicode_string("₈");
-  } else if (leader_sequence_three_keys(KC_U, KC_P, KC_L)) {
-    send_unicode_string("⁹");
-  } else if (leader_sequence_three_keys(KC_D, KC_N, KC_L)) {
-    send_unicode_string("₉");
-  };
-}
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/keycodes.h b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/keycodes.h
deleted file mode 100644
index 4439f958b7e..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/keycodes.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2023 Florent Linguenheld (@FLinguenheld)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#include "keymap_us_extended.h"
-
-enum custom_layers {
-  _BASE,
-  _NUMERIC,
-  _ARROWS,
-  _MOUSE,
-  _ADJ,
-  _FN,
-  _LEFT_HAND,
-};
-
-enum custom_keys {
-  UNICODE = QK_KB_0, // Replace SAFE_RANGE, see pr #19909
-
-  /* See auto-shift */
-  CS_A_GRAVE,
-  CS_E_GRAVE,
-  CS_U_GRAVE,
-
-  CS_A_CIRCUMFLEX,
-  CS_E_CIRCUMFLEX,
-  CS_I_CIRCUMFLEX,
-  CS_O_CIRCUMFLEX,
-  CS_U_CIRCUMFLEX,
-
-  CS_E_DIAERESIS,
-  CS_I_DIAERESIS,
-  CS_U_DIAERESIS,
-  CS_Y_DIAERESIS,
-};
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/keymap.c b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/keymap.c
deleted file mode 100644
index f024859e7cc..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright 2023 Florent Linguenheld (@FLinguenheld)
- *
- * 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 "keycodes.h"
-
-// clang-format off
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    /* Macros */
-    switch (keycode) {
-
-        case UNICODE:
-            if (record->event.pressed) {
-                tap_code16(C(S(KC_U)));
-            } break;
-    }
-
-    return true;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_BASE] = LAYOUT(
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-        GUI_T(KC_ESC) ,     KC_B      ,     KC_O      ,     KC_W      ,     KC_BSPC   ,             KC_J      ,      KC_P     ,      KC_D     ,      KC_L     ,      KC_F     ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-            KC_A      ,     KC_I      ,     KC_E      ,     KC_U      ,     KC_TAB    ,             KC_V      ,      KC_T     ,      KC_S     ,      KC_R     ,      KC_N     ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           US_EACU    ,     KC_X      ,     KC_Q      ,     KC_Y      ,      KC_K     ,             KC_Z      ,      KC_C     ,      KC_G     ,      KC_H     ,      KC_M     ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-                                          LT(_MOUSE, KC_COMM)  ,     CTL_T(KC_SPACE)     ,    LT(_NUMERIC, KC_ENT)   ,  LT(_ARROWS, KC_DOT)
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-    ),
-
-    [_NUMERIC] = LAYOUT(
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           _______    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    _______    ,            XXXXXXX    ,     KC_7      ,     KC_8      ,     KC_9      ,    KC_DOT     ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    _______    ,            XXXXXXX    ,     KC_4      ,     KC_5      ,     KC_6      ,     KC_0      ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,            XXXXXXX    ,     KC_1      ,     KC_2      ,     KC_3      ,    KC_COMM    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-                                                XXXXXXX        ,         UNICODE         ,          XXXXXXX          ,       XXXXXXX
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-    ),
-
-    [_MOUSE] = LAYOUT(
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-        KC_MS_WH_LEFT ,  KC_MS_WH_UP  , KC_MS_WH_DOWN , KC_MS_WH_RIGHT,    _______    ,            XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-          KC_MS_LEFT  ,   KC_MS_UP    ,  KC_MS_DOWN   ,  KC_MS_RIGHT  ,    _______    ,            XXXXXXX    ,  KC_MS_ACCEL0 ,  KC_MS_ACCEL1 ,  KC_MS_ACCEL2 ,    XXXXXXX    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-          KC_MS_BTN1  ,    XXXXXXX    ,  KC_MS_BTN3   ,  KC_MS_BTN2   ,    XXXXXXX    ,            XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-                                                XXXXXXX        ,        _______          ,         KC_MS_BTN1        ,       KC_MS_BTN2
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-    ),
-
-    [_ARROWS] = LAYOUT(
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           _______    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    _______    ,            XXXXXXX    ,    KC_HOME    ,  KC_PAGE_DOWN ,   KC_PAGE_UP  ,     KC_END    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    _______    ,            XXXXXXX    ,    KC_LEFT    ,    KC_DOWN    ,     KC_UP     ,    KC_RIGHT   ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,            XXXXXXX    ,    XXXXXXX    ,    C(KC_D)    ,    C(KC_U)    ,    XXXXXXX    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-                                                XXXXXXX        ,        _______          ,           XXXXXXX         ,       XXXXXXX
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-    ),
-
-    [_ADJ] = LAYOUT(
-    //|---------------+---------------+---------------+---------------+------------------|       |---------------+---------------+---------------+-----------------+----------|
-           XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,  KC_PRINT_SCREEN ,            XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    , KC_AUDIO_VOL_UP ,  XXXXXXX ,
-    //|---------------+---------------+---------------+---------------+------------------|       |---------------+---------------+---------------+-----------------+----------|
-           XXXXXXX    ,  G(C(S(KC_G))),    XXXXXXX    ,    XXXXXXX    ,S(KC_PRINT_SCREEN),            XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,KC_AUDIO_VOL_DOWN,  XXXXXXX ,
-    //|---------------+---------------+---------------+---------------+------------------|       |---------------+---------------+---------------+-----------------+----------|
-           XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,     XXXXXXX      ,            XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,  KC_AUDIO_MUTE  ,  XXXXXXX ,
-    //|---------------+---------------+---------------+---------------+------------------|       |---------------+---------------+---------------+-----------------+----------|
-    //                                  |-------------------------+-------------------------| |-------------------------+-------------------------|
-                                                   XXXXXXX        ,        _______          ,           XXXXXXX         ,       XXXXXXX
-    //                                  |-------------------------+-------------------------| |-------------------------+-------------------------|
-    ),
-
-    [_FN] = LAYOUT(
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           _______    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    _______    ,            XXXXXXX    ,     KC_F7     ,     KC_F8     ,     KC_F9     ,     KC_F10    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    _______    ,            XXXXXXX    ,     KC_F4     ,     KC_F5     ,     KC_F6     ,     KC_F11    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           _______    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,            XXXXXXX    ,     KC_F1     ,     KC_F2     ,     KC_F3     ,     KC_F12    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-                                                XXXXXXX        ,        _______          ,           XXXXXXX         ,       XXXXXXX
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-    ),
-
-    [_LEFT_HAND] = LAYOUT(
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           _______    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    _______    ,            XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           XXXXXXX    ,    KC_CUT     ,    KC_COPY    ,    KC_PASTE   ,    _______    ,            XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-           XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    C(KC_Z)    ,    XXXXXXX    ,            XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,    XXXXXXX    ,
-    //|---------------+---------------+---------------+---------------+---------------|       |---------------+---------------+---------------+---------------+---------------|
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-                                                XXXXXXX        ,       KC_ENTER          ,           XXXXXXX         ,       XXXXXXX
-    //                               |-------------------------+-------------------------| |-------------------------+-------------------------|
-    ),
-};
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/oled/glcdfont.c b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/oled/glcdfont.c
deleted file mode 100644
index 8ca414fdd0f..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/oled/glcdfont.c
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2023 Florent Linguenheld (@FLinguenheld)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "progmem.h"
-
-/* Online editor: https://joric.github.io/qle/ */
-static const unsigned char PROGMEM font[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFE, 0x0E, 0x06, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xFE, 0xFE,
-    0xE6, 0xE6, 0xE6, 0x06, 0x06, 0xE6, 0xE6, 0xE6, 0xFE, 0xFE, 0x06, 0x06, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
-    0xFE, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x7F, 0x70, 0x60, 0x67, 0x67,
-    0x67, 0x67, 0x67, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x60, 0x60, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x60, 0x60,
-    0x67, 0x67, 0x67, 0x67, 0x67, 0x7F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
-    0xFE, 0x0E, 0x06, 0xE6, 0xE6, 0xE6, 0xE6, 0x06, 0x0E, 0xFE, 0xFE, 0x06, 0x06, 0xFE, 0xFE, 0xFE, 0xFE,
-    0xFE, 0xFE, 0xE6, 0xE6, 0xE6, 0x06, 0x06, 0xE6, 0xE6, 0xE6, 0xFE, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFE, 0x0E, 0x06, 0x66, 0x66, 0x66, 0x66, 0xE6,
-    0xFE, 0xFE, 0x06, 0x06, 0x66, 0x66, 0x66, 0xE6, 0xE6, 0xFE, 0xFE, 0xE6, 0xE6, 0xE6, 0x06, 0x06, 0xE6,
-    0xE6, 0xE6, 0xFE, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x3F, 0x7F, 0x60, 0x60, 0x7C, 0x7C, 0x7C, 0x7C, 0x60, 0x60, 0x7F, 0x7F, 0x60,
-    0x60, 0x67, 0x67, 0x67, 0x67, 0x67, 0x7F, 0x7F, 0x7F, 0x7F, 0x60, 0x60, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x7F, 0x67, 0x66,
-    0x66, 0x66, 0x66, 0x60, 0x70, 0x7F, 0x7F, 0x60, 0x60, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
-    0x7F, 0x7F, 0x60, 0x60, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFE, 0x0E, 0x06, 0xE6, 0xE6, 0xE6, 0x06,
-    0x0E, 0xFE, 0xFE, 0x0E, 0x06, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xFE, 0xFE, 0x06, 0x06, 0x66, 0x66, 0x66,
-    0x66, 0x06, 0x0E, 0xFE, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xFC, 0xFE, 0x0E, 0x06, 0xE6, 0xE6, 0xE6, 0xE6, 0xE6, 0xFE, 0xFE, 0x06, 0x06, 0xCE, 0x9E, 0x9E,
-    0xCE, 0x06, 0x06, 0xFE, 0xFE, 0x06, 0x06, 0xE6, 0xE6, 0xE6, 0x0E, 0x1E, 0xFE, 0xFC, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x7F, 0x60,
-    0x60, 0x7C, 0x7C, 0x7C, 0x60, 0x60, 0x7F, 0x7F, 0x70, 0x60, 0x67, 0x67, 0x64, 0x60, 0x70, 0x7F, 0x7F,
-    0x60, 0x60, 0x7E, 0x7E, 0x78, 0x70, 0x62, 0x67, 0x7F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x7F, 0x70, 0x60, 0x67, 0x67, 0x67, 0x67, 0x67, 0x7F, 0x7F,
-    0x60, 0x60, 0x7F, 0x7F, 0x7F, 0x7F, 0x60, 0x60, 0x7F, 0x7F, 0x60, 0x60, 0x67, 0x67, 0x67, 0x70, 0x78,
-    0x7F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-    0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00,
-};
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/oled/oled.c b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/oled/oled.c
deleted file mode 100644
index 2d00ef4e3a7..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/oled/oled.c
+++ /dev/null
@@ -1,466 +0,0 @@
-// Copyright 2023 Florent Linguenheld (@FLinguenheld)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keycodes.h"
-
-/* Blank space to place modifiers */
-void add_blank(void) {
-
-  oled_write_char(0x10, false);
-  oled_write_char(0x11, false);
-  oled_write_char(0x12, false);
-  oled_write_char(0x13, false);
-  oled_write_char(0x14, false);
-
-  oled_write_char(0x30, false);
-  oled_write_char(0x31, false);
-  oled_write_char(0x32, false);
-  oled_write_char(0x33, false);
-  oled_write_char(0x34, false);
-}
-
-void oled_display(void) {
-
-  /* Layers */
-  switch (get_highest_layer(layer_state)) {
-
-  case _BASE:;
-    if (is_keyboard_master()) {
-      static const char PROGMEM qmk_logo_master[] = {
-          // 'raven', 32x128px
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 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, 0xc0, 0xc0, 0xc0,
-          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, 0x07, 0x8f, 0x5f, 0x31, 0x79, 0x33, 0x7f,
-          0x3b, 0x71, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x4c, 0x02, 0x01, 0x95, 0xff, 0xb5, 0x05, 0x02, 0x4c, 0x30,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x7e, 0x01, 0x01, 0x01, 0x7e, 0x40, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 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, 0xe0, 0xe0, 0xf0,
-          0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0x7c, 0x7c, 0xf8, 0xf0, 0xe0, 0x80, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xcf, 0xef, 0xe7, 0xf3, 0xfb, 0xf9, 0xfd,
-          0xfc, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x0e, 0x1a, 0x23, 0x43, 0x3f, 0x03, 0x00, 0x00,
-          0x0c, 0x1e, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x80, 0x40, 0xe0, 0xbf, 0x33, 0x30,
-          0x60, 0x20, 0x21, 0xff, 0x20, 0x60, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc,
-          0xfc, 0x7c, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0xfc, 0xf8, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x30, 0x20,
-          0x30, 0x20, 0x32, 0x20, 0x32, 0x20, 0x30, 0x20, 0x1c, 0x02, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-      oled_write_raw_P(qmk_logo_master, sizeof(qmk_logo_master));
-
-    } else {
-      static const char PROGMEM qmk_logo_slave[] = {
-          // 'birds', 32x128px
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x40, 0xc0, 0xe0, 0xd0, 0x88, 0x84, 0x04, 0x04, 0xc4, 0xc4, 0x08, 0x08, 0x10, 0x60, 0x80,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0xf8, 0x46, 0x81, 0x02, 0x02, 0x06, 0x04, 0x04, 0x04, 0x74, 0x84, 0x06, 0x03, 0x81,
-          0x42, 0x24, 0x18, 0x10, 0xa0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x01, 0x06, 0x08, 0x11, 0x12, 0x24, 0x24, 0x48, 0xc8, 0x48, 0x48, 0xc9, 0x49, 0x4a,
-          0x4a, 0x26, 0x25, 0x25, 0x14, 0x14, 0x14, 0x1d, 0x15, 0x2e, 0x54, 0x60, 0x40, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x01, 0x05, 0x02, 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, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x20, 0x10, 0x08, 0x08, 0x08, 0x08, 0x88, 0xc8, 0x08, 0x30, 0xc0, 0xc0, 0x80, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x18, 0x04, 0x03,
-          0x00, 0x00, 0x00, 0x80, 0x80, 0x70, 0x18, 0x00, 0x00, 0x00, 0x80, 0x70, 0x0f, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x70, 0x50, 0x48, 0x48, 0x24, 0x24, 0x12, 0x0a, 0x05, 0x09, 0x13, 0x12, 0x22, 0x22,
-          0xe1, 0x21, 0x21, 0x20, 0xe0, 0x20, 0x20, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x04, 0x07, 0x04, 0x00, 0x04, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-      oled_write_raw_P(qmk_logo_slave, sizeof(qmk_logo_slave));
-    }
-    break;
-
-  case _NUMERIC:;
-    static const char PROGMEM qmk_numeric[] = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x01, 0x03, 0x07, 0x0f, 0x1e, 0x3c, 0x78, 0xf0,
-        0xe0, 0xc0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x87, 0x87, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03,
-        0x87, 0x87, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x07, 0x0f, 0x0f, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x07, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-        0xff, 0x0e, 0x1c, 0x38, 0x70, 0xe0, 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xc7, 0xc7, 0xc7,
-        0xc7, 0xc7, 0xc7, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x3f, 0x3f, 0x38, 0x38, 0x38, 0x38, 0x38,
-        0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c,
-        0x1c, 0x1c, 0x1c, 0xfc, 0xfc, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0e, 0x1e,
-        0x3e, 0x77, 0xe7, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x70, 0x70, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0x70, 0x70, 0x70, 0x70,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xff, 0xff, 0xff, 0xff, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-        0xc0, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc0, 0xc0, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
-        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, 0x07, 0x0f, 0x0f, 0x0e, 0x0e,
-        0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00};
-
-    oled_write_raw_P(qmk_numeric, sizeof(qmk_numeric));
-    break;
-
-  case _MOUSE:;
-    static const char PROGMEM qmk_mouse[] = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x3e, 0x3c, 0x78, 0xf0, 0xe0, 0xc0, 0xc0, 0xe0, 0xf0,
-        0x78, 0x3c, 0x3e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x01, 0x81, 0xc1, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc1,
-        0x81, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-        0xff, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0xff, 0xff,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff,
-        0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xff, 0xff, 0x7f, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc1, 0x01, 0x01,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xc1, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x3f, 0x7f, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70,
-        0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x7f, 0x3f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70,
-        0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x3f, 0x7f, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-        0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-        0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x01, 0x81, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0,
-        0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-        0xff, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xc1,
-        0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00};
-
-    oled_write_raw_P(qmk_mouse, sizeof(qmk_mouse));
-    break;
-
-  case _ARROWS:;
-    static const char PROGMEM qmk_arrows[] = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 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, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xf8, 0xf0,
-        0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x7c, 0x3e, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0xff, 0xff, 0xff, 0xff, 0x01, 0x03, 0x07,
-        0x0f, 0x1f, 0x3e, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0,
-        0xf0, 0xf8, 0x7c, 0x3c, 0x1c, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1e, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xde,
-        0x9e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x0f,
-        0x0e, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
-        0x30, 0x70, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78,
-        0x78, 0x79, 0x7b, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x38, 0x3c, 0x3e,
-        0x1f, 0x0f, 0x07, 0x03, 0x01, 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, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x7c,
-        0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0xff, 0xff, 0xff, 0xff, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0x7c, 0x3e, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-        0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 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};
-
-    oled_write_raw_P(qmk_arrows, sizeof(qmk_arrows));
-    break;
-
-  case _ADJ:;
-    static const char PROGMEM qmk_ADJ[] = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xf8, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-        0x38, 0x38, 0x38, 0x38, 0xf8, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-        0x38, 0x38, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x0f, 0xfe, 0xfc,
-        0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0xff, 0xff, 0xff, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xff, 0x7f, 0x3f, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0xe1,
-        0xe1, 0xe0, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 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,
-        0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x3f,
-        0x3f, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
-        0x87, 0x87, 0x87, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3,
-        0xc3, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xe0, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xff, 0xff, 0x7f,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
-        0x70, 0x70, 0x70, 0x70, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00};
-
-    oled_write_raw_P(qmk_ADJ, sizeof(qmk_ADJ));
-    break;
-
-  case _FN:;
-    static const char PROGMEM qmk_fn[] = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-        0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-        0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-        0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-        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, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfe, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x07, 0x1f, 0x7f, 0xfe, 0xf8, 0xe0, 0x80, 0x00,
-        0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x7f, 0xfe, 0xf8, 0xe0,
-        0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
-        0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x7f, 0x7f,
-        0x7f, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00};
-
-    oled_write_raw_P(qmk_fn, sizeof(qmk_fn));
-    break;
-
-  case _LEFT_HAND:;
-    static const char PROGMEM qmk_left_hand[] = {
-        // 'layers_left_hand', 32x128px
-        0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-        0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0xf1, 0xf1, 0x71,
-        0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x38, 0x38, 0x38,
-        0x38, 0x00, 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, 0x1f, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c,
-        0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x87, 0x87, 0x87, 0x87, 0x87, 0x07, 0x07,
-        0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x80, 0x80, 0x80, 0x71, 0x71, 0x71, 0x70, 0x70, 0xf0, 0xf0, 0xf0, 0x70, 0x70, 0x70, 0x70, 0x70, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff,
-        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xf0, 0xf8, 0xfc, 0x3c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x3c, 0xfc, 0xf8, 0xf0, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-        0xff, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 0xe3, 0xe3,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 0xe3, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x0f, 0x1e,
-        0x3c, 0x78, 0xf0, 0xe0, 0xc0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x01, 0x03, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x07, 0x07, 0x07, 0x07, 0x07, 0x0f,
-        0x1e, 0xfc, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0x78, 0x3f,
-        0x1f, 0x0f};
-
-    oled_write_raw_P(qmk_left_hand, sizeof(qmk_left_hand));
-    break;
-  }
-
-  /* Leader */
-  if (leader_sequence_active()) {
-
-    static const char PROGMEM qmk_leader[] = {
-        0x00, 0x00, 0xf8, 0xf8, 0x78, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-        0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x38, 0x78, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00,
-        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-        0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xc1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xff, 0xff, 0xff, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x03, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-        0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-        0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
-        0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0x00, 0x0e, 0x0e,
-        0x0e, 0x0e, 0x0e, 0xfe, 0xfc, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f, 0x00, 0x70, 0x70, 0x70, 0x70,
-        0x70, 0x7f, 0x3f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff,
-        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xf8, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
-        0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xc6, 0xc6, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xc0, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xe1, 0xc1, 0x81, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0x38, 0x38, 0x38, 0x78, 0xf8, 0xf8, 0xbf, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-        0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07,
-        0x00, 0x00};
-
-    oled_write_raw_P(qmk_leader, sizeof(qmk_leader));
-  }
-
-  /* Modifier keys */
-  if (get_mods()) {
-
-    if (get_mods() & MOD_MASK_GUI) {
-
-      oled_write_char(0x8B, false);
-      oled_write_char(0x8C, false);
-      oled_write_char(0x8D, false);
-      oled_write_char(0x8E, false);
-      oled_write_char(0x8F, false);
-
-      oled_write_char(0xAB, false);
-      oled_write_char(0xAC, false);
-      oled_write_char(0xAD, false);
-      oled_write_char(0xAE, false);
-      oled_write_char(0xAF, false);
-    } else {
-      add_blank();
-    }
-
-    if (get_mods() & MOD_MASK_CTRL) {
-
-      oled_write_char(0x01, false);
-      oled_write_char(0x02, false);
-      oled_write_char(0x03, false);
-      oled_write_char(0x04, false);
-      oled_write_char(0x05, false);
-
-      oled_write_char(0x21, false);
-      oled_write_char(0x22, false);
-      oled_write_char(0x23, false);
-      oled_write_char(0x24, false);
-      oled_write_char(0x25, false);
-    } else {
-      add_blank();
-    }
-
-    if (get_mods() & MOD_BIT(KC_LALT)) {
-
-      oled_write_char(0x41, false);
-      oled_write_char(0x42, false);
-      oled_write_char(0x43, false);
-      oled_write_char(0x44, false);
-      oled_write_char(0x45, false);
-
-      oled_write_char(0x61, false);
-      oled_write_char(0x62, false);
-      oled_write_char(0x63, false);
-      oled_write_char(0x64, false);
-      oled_write_char(0x65, false);
-    } else {
-      add_blank();
-    }
-
-    if (get_mods() & MOD_MASK_SHIFT) {
-
-      oled_write_char(0x4B, false);
-      oled_write_char(0x4C, false);
-      oled_write_char(0x4D, false);
-      oled_write_char(0x4E, false);
-      oled_write_char(0x4F, false);
-
-      oled_write_char(0x6B, false);
-      oled_write_char(0x6C, false);
-      oled_write_char(0x6D, false);
-      oled_write_char(0x6E, false);
-      oled_write_char(0x6F, false);
-    } else {
-      add_blank();
-    }
-
-    if (get_mods() & MOD_BIT(KC_RALT)) {
-
-      oled_write_char(0x81, false);
-      oled_write_char(0x82, false);
-      oled_write_char(0x83, false);
-      oled_write_char(0x84, false);
-      oled_write_char(0x85, false);
-
-      oled_write_char(0xA1, false);
-      oled_write_char(0xA2, false);
-      oled_write_char(0xA3, false);
-      oled_write_char(0xA4, false);
-      oled_write_char(0xA5, false);
-    }
-
-    // Add a line
-    oled_write_char(0xC1, false);
-    oled_write_char(0xC2, false);
-    oled_write_char(0xC3, false);
-    oled_write_char(0xC4, false);
-    oled_write_char(0xC5, false);
-  }
-};
-
-bool oled_task_user(void) {
-  oled_display();
-  return false;
-}
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/readme.md b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/readme.md
deleted file mode 100644
index b70b3655da7..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/readme.md
+++ /dev/null
@@ -1,97 +0,0 @@
-### Custom aurora sweep keymap
-
-This keymap is inspired by [optimot](https://optimot.fr) which is a French layout.  
-Nonetheless it uses the US international extended keymap for French keys.
-
-It uses the _best_ QMK features :
-
--   combos ♥
--   auto shift
--   leader
-
-I tried to optimise key positions for neovim and i3wm while limit digrams.  
-The oled screens are used to display the current layout, the modifier keys and the leader key.
-
-![oledmodifiers](https://i.imgur.com/on95jx0.png)
-![oledmouse](https://i.imgur.com/PwkR6P2.png)
-
-#### Install
-
-Clone this repo in the folder :
-
-    ~/qmk_firmware/keyboards/splitkb/aurora/sweep/keymaps/
-
-#### Compile and flash
-
-Navigate into the keymap folder and launch this command for both sides :
-
-    qmk compile && qmk flash
-
-And :
-
-    Click twice on the flash button and use nautilus for instance to clic on the keyboard.
-    Don't forget to flash with the double tap bootloader define before soldering.
-
-#### Layout
-
-Set the us altgr international to activate French keys :
-
-    /usr/share/X11/xkb/symbols/
-    localectl list-x11-keymap-variants us
-
-    setxkbmap us altgr-intl
-
-#### Links
-
-[qmk](https://docs.qmk.fm/#/)  
-[ferris sweep](https://github.com/davidphilipbarr/Sweep)  
-[splitkb](https://splitkb.com)
-
-#### Layouts
-
-![base](https://i.imgur.com/i7NgrCD.png)  
-![numeric](https://i.imgur.com/6Yso40L.png)  
-![mouse](https://i.imgur.com/skSL4Lo.png)  
-![arrows](https://i.imgur.com/NIjJR2I.png)  
-![adjust](https://i.imgur.com/xj6i70P.png)  
-![fn](https://i.imgur.com/Q41ZdQi.png)  
-![left hand](https://i.imgur.com/WDEGxGM.png)
-
-![combos](https://i.imgur.com/wj6DEY0.png)
-
-#### Leader
-
-| -             |            |
-| ------------- | ---------- |
-| M + S         | mail short |
-| M + L         | mail long  |
-| D + E + G     | °          |
-| C + O + P     | ©          |
-| R + E + G     | ®          |
-| D + I + A     | ø          |
-| D + I + A + M | Ø          |
-| E + U + R     | €          |
-| P + O + U     | £          |
-| Y + E + N     | ¥          |
-| C + E + N     | ¢          |
-| P + I         | π          |
-| P + I + I     | Π          |
-| O + M + E     | ω          |
-| O + M + E + G | Ω          |
-| U + P + F     | ⁰          |
-| D + N + F     | ₀          |
-
-| -         |     |
-| --------- | --- |
-| M + U + L | ×   |
-| D + I + V | ÷   |
-| P + M     | ±   |
-| I + N + E | ≠   |
-| A + L + M | ≈   |
-| S + Q + U | √   |
-| I + N + F | ∞   |
-| < + <     | ≤   |
-| > + >     | ≥   |
-| F + S + T | ¼   |
-| F + S + G | ½   |
-| F + H + T | ¾   |
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk
deleted file mode 100644
index dd3e45125d9..00000000000
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LTO_ENABLE = yes
-CONVERT_TO = elite_pi
-
-SRC += features/auto_shift.c
-INTROSPECTION_KEYMAP_C = features/combo.c # Replace SRC, see issue #21137
-SRC += features/leader.c
-SRC += oled/oled.c
-
-OLED_ENABLE = yes
-
-MOUSEKEY_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
-COMBO_ENABLE = yes
-LEADER_ENABLE = yes
-
-UNICODE_ENABLE = yes
-SEND_STRING_ENABLE = yes
diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h
index a3b2cc893e1..f37b59a9521 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/config.h
+++ b/keyboards/splitkb/aurora/sweep/rev1/config.h
@@ -25,10 +25,3 @@
 #    define OLED_DISPLAY_128X32
 #    define SPLIT_OLED_ENABLE
 #endif
-
-// Not yet available in `info.json`
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 46
-#    define RGB_MATRIX_SPLIT { 23, 23 }
-#    define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json
index 74de07cedaf..0d235cd5b2f 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/info.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -92,6 +92,11 @@
                     {"pin_a": "F5", "pin_b": "D4"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "rgblight": {
@@ -153,6 +158,7 @@
             {"flags": 4, "matrix": [7, 0], "x": 132, "y": 64},
             {"flags": 4, "matrix": [7, 1], "x": 153, "y": 60}
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "split_count": [23, 23]
     }
 }
diff --git a/keyboards/splitkb/kyria/keymaps/artflag/config.h b/keyboards/splitkb/kyria/keymaps/artflag/config.h
deleted file mode 100644
index de044c8d29e..00000000000
--- a/keyboards/splitkb/kyria/keymaps/artflag/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 Thomas Baart <thomas@splitkb.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_TERM 175
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/splitkb/kyria/keymaps/artflag/keymap.c b/keyboards/splitkb/kyria/keymaps/artflag/keymap.c
deleted file mode 100644
index 311a1c75e2e..00000000000
--- a/keyboards/splitkb/kyria/keymaps/artflag/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2021 Your Name (@artflag)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// Tap Dance declarations
-
-enum {
-    CT_CLN, // Reverses colon and semicolon and triggers semicolon on tap dance.
-};
-
-void dance_cln_finished(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_code16(KC_COLN);
-    } else {
-        register_code(KC_SCLN);
-    }
-}
-
-void dance_cln_reset(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code16(KC_COLN);
-    } else {
-        unregister_code(KC_SCLN);
-    }
-}
-
-// All tap dance functions would go here.
-tap_dance_action_t tap_dance_actions[] = {
-    [CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_cln_finished, dance_cln_reset),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_ESC, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, TD(CT_CLN), KC_BSPC, KC_LGUI, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT, KC_TAB, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_BSLS, TT(2), KC_LBRC, KC_RBRC, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, KC_GRV, KC_LCTL, KC_LALT, KC_SPC, SC_LSPO, TT(1), TT(1), SC_RSPC, KC_ENT, KC_MINS, KC_EQL),
-	[1] = LAYOUT(KC_TRNS, KC_NO, KC_7, KC_8, KC_9, KC_NO, KC_NO, KC_NO, KC_UP, KC_PGUP, KC_PSLS, KC_TRNS, KC_TRNS, KC_0, KC_4, KC_5, KC_6, KC_PDOT, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_PAST, KC_PPLS, KC_TRNS, KC_NO, KC_1, KC_2, KC_3, KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_HOME, KC_END, KC_PGDN, KC_EXLM, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[2] = LAYOUT(KC_NO, KC_NO, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_MPLY, KC_VOLU, KC_BRIU, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_F5, KC_F6, KC_F7, KC_F8, KC_NO, KC_MSTP, KC_VOLD, KC_BRID, KC_NO, KC_NO, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO)
-};
diff --git a/keyboards/splitkb/kyria/keymaps/artflag/readme.md b/keyboards/splitkb/kyria/keymaps/artflag/readme.md
deleted file mode 100644
index 02cb1ce19a4..00000000000
--- a/keyboards/splitkb/kyria/keymaps/artflag/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Simple workman layout
-
-## Features
-
-- Workman layout
-- semicolon and colon are flipped. Colon on tap, semicolon on double tap.
-
-## Using the layout
-
-1. Use https://config.qmk.fm/#/splitkb/kyria/rev2/LAYOUT to edit `workman-artflag.json`.
-
-1. Convert to `keymap.c`:
-
-   ```bash
-   cd keyboards/splitkb/kyria/keymaps/ArtFlag
-   qmk json2c workman-artflag.json > keymap.c
-   cd ../../../../..
-   ```
-
-1. Git diff to bring back the code for tap dancing.
-1. Compile and flash:
-
-   ```bash
-   qmk compile && qmk flash
-   ```
-   
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/artflag/rules.mk b/keyboards/splitkb/kyria/keymaps/artflag/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/splitkb/kyria/keymaps/artflag/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/artflag/workman-artflag.json b/keyboards/splitkb/kyria/keymaps/artflag/workman-artflag.json
deleted file mode 100644
index be4096b72b2..00000000000
--- a/keyboards/splitkb/kyria/keymaps/artflag/workman-artflag.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-  "version": 1,
-  "notes": "",
-  "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-  "keyboard": "splitkb/kyria/rev2",
-  "keymap": "workman-artflag",
-  "layout": "LAYOUT",
-  "layers": [
-    [
-      "KC_ESC",
-      "KC_Q",
-      "KC_D",
-      "KC_R",
-      "KC_W",
-      "KC_B",
-      "KC_J",
-      "KC_F",
-      "KC_U",
-      "KC_P",
-      "KC_SCLN",
-      "KC_BSPC",
-      "KC_LGUI",
-      "KC_A",
-      "KC_S",
-      "KC_H",
-      "KC_T",
-      "KC_G",
-      "KC_Y",
-      "KC_N",
-      "KC_E",
-      "KC_O",
-      "KC_I",
-      "KC_QUOT",
-      "KC_TAB",
-      "KC_Z",
-      "KC_X",
-      "KC_M",
-      "KC_C",
-      "KC_V",
-      "KC_BSLS",
-      "TT(2)",
-      "KC_LBRC",
-      "KC_RBRC",
-      "KC_K",
-      "KC_L",
-      "KC_COMM",
-      "KC_DOT",
-      "KC_SLSH",
-      "KC_GRV",
-      "KC_LCTL",
-      "KC_LALT",
-      "KC_SPC",
-      "SC_LSPO",
-      "TT(1)",
-      "TT(1)",
-      "SC_RSPC",
-      "KC_ENT",
-      "KC_MINS",
-      "KC_EQL"
-    ],
-    [
-      "KC_TRNS",
-      "KC_NO",
-      "KC_7",
-      "KC_8",
-      "KC_9",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_UP",
-      "KC_PGUP",
-      "KC_PSLS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_0",
-      "KC_4",
-      "KC_5",
-      "KC_6",
-      "KC_PDOT",
-      "KC_NO",
-      "KC_LEFT",
-      "KC_DOWN",
-      "KC_RGHT",
-      "KC_PAST",
-      "KC_PPLS",
-      "KC_TRNS",
-      "KC_NO",
-      "KC_1",
-      "KC_2",
-      "KC_3",
-      "KC_PCMM",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_DEL",
-      "KC_HOME",
-      "KC_END",
-      "KC_PGDN",
-      "KC_EXLM",
-      "KC_PMNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS"
-    ],
-    [
-      "KC_NO",
-      "KC_NO",
-      "KC_F9",
-      "KC_F10",
-      "KC_F11",
-      "KC_F12",
-      "KC_NO",
-      "KC_MPLY",
-      "KC_VOLU",
-      "KC_BRIU",
-      "KC_NO",
-      "KC_MUTE",
-      "KC_NO",
-      "KC_NO",
-      "KC_F5",
-      "KC_F6",
-      "KC_F7",
-      "KC_F8",
-      "KC_NO",
-      "KC_MSTP",
-      "KC_VOLD",
-      "KC_BRID",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_F1",
-      "KC_F2",
-      "KC_F3",
-      "KC_F4",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO"
-    ]
-  ],
-  "author": ""
-}
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/config.h b/keyboards/splitkb/kyria/keymaps/asapjockey/config.h
deleted file mode 100644
index 32d8bb76119..00000000000
--- a/keyboards/splitkb/kyria/keymaps/asapjockey/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP
-#endif
-
-// EC11K encoders have a different resolution than other EC11 encoders.
-// When using the default resolution of 4, if you notice your encoder skipping
-// every other tick, lower the resolution to 2.
-#define ENCODER_RESOLUTION 2
-
-// The Leader key allows to flexibly assign macros to key sequences.
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 350
-
-#define TAPPING_TERM 200
-
-// Allows to use either side as the master. Look at the documentation for info:
-// https://docs.qmk.fm/#/config_options?id=setting-handedness
-#define EE_HANDS
-
-// Allows media codes to properly register in macros and rotary encoder code
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
deleted file mode 100644
index cb8eb1e1e7b..00000000000
--- a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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 layers {
-    QWERTY,
-    LOWER,
-    RAISE,
-    NAV,
-    ADJUST
-};
-
-enum custom_keycodes {
-    KC_LBR = SAFE_RANGE,
-    KC_RBR
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * | TAB    |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  | RCTL   |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * | LCTL   |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  ' "   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LSFT   |   Z  |   X  |   C  |   V  |   B  | Del  | Raise|  |Adjust| Esc  |   N  |   M  | ,  < | . >  | /  ? | LSFT   |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      | LALT |      | Bspc | Lower|  | Enter| Space| [ {  | ] }  |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [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_RCTL,
-      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_DEL,  MO(RAISE), MO(ADJUST), KC_ESC,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,
-                            XXXXXXX,   KC_LALT, XXXXXXX, KC_BSPC, MO(LOWER), KC_ENT,     KC_SPC,     KC_LBR,  KC_RBR,  XXXXXXX
-    ),
-/*
- * Lower Layer: Numbers, functions, symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        | 1 !  | 2 @  | 3 #  | 4 $  | 5 %  |                              | 6 ^  | 7 &  | 8 *  | 9 (  | 0 )  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | !    | @    | #    | $    | %    |                              | ^    | &    | *    | (    | )    |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        | F1   | F2   | F3   | F4   | F5   |      |      |  |      |      | F6   | F7   | F8   | F9   | F10  |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      | (    | )    |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [LOWER] = LAYOUT(
-      _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-      _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-                                 _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, _______
-    ),
-/*
- * Raise Layer: Functions, Numbers
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      | F7   | F8   | F9   |      |                              |      | 7 &  | 8 *  | 9 (  | - _  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      | F4   | F5   | F6   |      |                              |      | 4 *  | 5 %  | 6 ^  | = +  | RCTL   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      | F1   | F2   | F3   |      |      |      |  |      |      |      | 1 !  | 2 @  | 3 #  | \ |  |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      | 0 )  |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [RAISE] = LAYOUT(
-      _______, _______, KC_F7,   KC_F8,   KC_F9,   _______,                                     _______, KC_7,    KC_8,    KC_9,    _______, _______,
-      _______, _______, KC_F4,   KC_F5,   KC_F6,   _______,                                     _______, KC_4,    KC_5,    KC_6,    _______, KC_RCTL,
-      _______, _______, KC_F1,   KC_F2,   KC_F3,   _______, _______, _______, _______, _______, _______, KC_1,    KC_2,    KC_3,    _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, KC_0,    _______, _______
-    ),
-/*
- * Navigation Layer
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              |      |      | Up   |      |      | RGBTOG |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |                              |      | Left | Down | Right|      | RGBOFF |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      | RGBON  |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      | Reset|Debug |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [ADJUST] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     _______, _______, KC_UP,   _______, _______, RGB_TOG,
-      _______, _______, _______, _______, _______, _______,                                     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_HUI,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
-                                 _______, _______, _______, _______, _______, _______, _______, QK_BOOT, DB_TOGG, _______
-    ),
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_LBR: {
-            if (record->event.pressed) {
-                if ((get_mods() & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
-                    register_code(KC_9);
-                } else {
-                    register_code(KC_LBRC);
-                }
-            } else { // Release the key
-                if ((get_mods() & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
-                    unregister_code(KC_9);
-                } else {
-                    unregister_code(KC_LBRC);
-                }
-            }
-            return false;
-            break;
-        }
-        case KC_RBR: {
-            if (record->event.pressed) {
-                if ((get_mods() & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
-                    register_code(KC_0);
-                } else {
-                    register_code(KC_RBRC);
-                }
-            } else { // Release the key
-                if ((get_mods() & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
-                    unregister_code(KC_0);
-                } else {
-                    unregister_code(KC_RBRC);
-                }
-            }
-            return false;
-            break;
-        }
-    }
-    return true;
-}
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(KC_F)) { // Shift + Ctrl + F
-        tap_code16(S(C(KC_F)));
-    }
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-static void render_kyria_logo(void) {
-    static const char PROGMEM kyria_logo[] = {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-        0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-    };
-    oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-}
-
-static void render_qmk_logo(void) {
-  static const char PROGMEM qmk_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-  oled_write_P(qmk_logo, false);
-}
-
-static void render_status(void) {
-    // QMK Logo and version information
-    render_qmk_logo();
-    oled_write_P(PSTR("       Kyria rev1.0\n\n"), false);
-
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case QWERTY:
-            oled_write_P(PSTR("Default\n"), false);
-            break;
-        case LOWER:
-            oled_write_P(PSTR("Lower\n"), false);
-            break;
-        case RAISE:
-            oled_write_P(PSTR("Raise\n"), false);
-            break;
-        case NAV:
-            oled_write_P(PSTR("Navigation\n"), false);
-            break;
-        case ADJUST:
-            oled_write_P(PSTR("Adjust\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undefined\n"), false);
-    }
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_kyria_logo();
-    }
-    return false;
-}
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            case QWERTY:
-                if (clockwise) { // Ctrl + I
-                    tap_code16(C(KC_I));
-                } else { // Shift + F3
-                    tap_code16(S(KC_F3));
-                }
-                break;
-            case LOWER:
-                // History scrubbing. For Adobe products, hold shift while moving
-                // backward to go forward instead.
-                if (clockwise) {
-                    tap_code16(C(KC_Y));
-                } else {
-                    tap_code16(C(KC_Z));
-                }
-                break;
-            case RAISE:
-                 if (clockwise) { // Subscript: CTRL + =
-                    tap_code16(C(KC_EQL));
-                }
-                break;
-            default:
-                // Nothing
-                break;
-        }
-    } else if (index == 1) {
-        switch (get_highest_layer(layer_state)) {
-            case QWERTY:
-                // Scroll by letter horizontally
-                if (clockwise) {
-                    tap_code16(KC_RGHT);
-                } else {
-                    tap_code16(KC_LEFT);
-                }
-            case LOWER:
-                // Nothing
-                break;
-            case RAISE:
-                // Find previous/Find next
-                if (clockwise) {
-                    tap_code(KC_F3);
-                } else {
-                    tap_code16(S(KC_F3));
-                }
-            default:
-                // Nothing
-                break;
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk b/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk
deleted file mode 100644
index a64a9f4e15f..00000000000
--- a/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-LEADER_ENABLE = yes        # Enable the Leader Key feature
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/benji/config.h b/keyboards/splitkb/kyria/keymaps/benji/config.h
deleted file mode 100644
index 5481f82e5d6..00000000000
--- a/keyboards/splitkb/kyria/keymaps/benji/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-  #define OLED_FONT_H "keyboards/splitkb/kyria/keymaps/benji/glcdfont.c"
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_LIMIT_VAL 150
-#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/splitkb/kyria/keymaps/benji/glcdfont.c b/keyboards/splitkb/kyria/keymaps/benji/glcdfont.c
deleted file mode 100644
index bb1cca3384a..00000000000
--- a/keyboards/splitkb/kyria/keymaps/benji/glcdfont.c
+++ /dev/null
@@ -1,228 +0,0 @@
-#include "progmem.h"
-
-static const unsigned char font[] PROGMEM = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-    0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-    0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00,
-    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-    0xFC, 0x18, 0x24, 0x24, 0x18, 0x00,
-    0x18, 0x24, 0x24, 0x18, 0xFC, 0x00,
-    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xF0, 0xA0, 0x00, 0xC0, 0xFE,
-    0xC0, 0x00, 0x40, 0xF8, 0x00, 0x00,
-    0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x40, 0xC0, 0xC0, 0xC0, 0xC0, 0x00,
-    0x00, 0x00, 0x40, 0xC0, 0xC0, 0xC0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0,
-    0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0,
-    0x40, 0x40, 0x40, 0xC0, 0xC0, 0x40,
-    0x00, 0x00, 0x00, 0x40, 0xC0, 0xC0,
-    0xC0, 0x40, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x80, 0xC0, 0xC0, 0x40, 0x40,
-    0xC0, 0xC0, 0x40, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 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, 0xF0, 0xF8, 0xFC, 0x3E,
-    0x1E, 0x06, 0x01, 0x00, 0x00, 0x00,
-    0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00,
-    0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00,
-    0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
-    0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
-    0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
-    0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x06, 0x07, 0x0C,
-    0x1F, 0x3F, 0x7E, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFE, 0x7F, 0x3F, 0x0E, 0x0E,
-    0x0F, 0x02, 0x00, 0x00, 0xC0, 0xF0,
-    0x3C, 0x0F, 0x03, 0x0F, 0x3F, 0xFF,
-    0xFC, 0x3C, 0x07, 0x07, 0x0F, 0x3F,
-    0xFF, 0xFC, 0xE0, 0x80, 0x00, 0x60,
-    0xF8, 0xFF, 0x37, 0x30, 0x00, 0x03,
-    0x1F, 0x7F, 0xFF, 0xF8, 0xE0, 0x80,
-    0x08, 0x7F, 0xFF, 0xFF, 0xFF, 0x80,
-    0x00, 0x00, 0x00, 0xF8, 0xF0, 0xF8,
-    0xB0, 0x00, 0x00, 0x00, 0xFF, 0xFF,
-    0xFF, 0x88, 0x00, 0x00, 0x3E, 0x7F,
-    0xFF, 0xFF, 0xC1, 0x00, 0x00, 0x00,
-    0x00, 0x81, 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, 0x03, 0x0F, 0x1F, 0x3F, 0x3C,
-    0x78, 0x70, 0x60, 0x00, 0x00, 0x00,
-    0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00,
-    0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00,
-    0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
-    0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
-    0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
-    0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
-    0x00, 0x00, 0x00, 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, 0x03, 0x0F,
-    0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x03, 0x00, 0x00, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 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, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
diff --git a/keyboards/splitkb/kyria/keymaps/benji/keymap.c b/keyboards/splitkb/kyria/keymaps/benji/keymap.c
deleted file mode 100644
index 1ad50e5fc4f..00000000000
--- a/keyboards/splitkb/kyria/keymaps/benji/keymap.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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 layers {
-    _QWERTY = 0,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * Base Layer: QWERTY
-     *
-     * ,-------------------------------------------.                              ,-------------------------------------------.
-     * |RAIS/ESC|   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  | \   |
-     * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-     * |Ctrl/BS |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  ' "   |
-     * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-     * | LShift |   Z  |   X  |   C  |   V  |   B  |LShift|LShift|  |LShift|LShift|   N  |   M  | ,  < | . >  | /  ? |  - _   |
-     * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-     *                        | GUI  | Del  | Enter| Space| Esc  |  | Enter| Space| Tab  | Bksp | AltGr|
-     *                        |      |      | Alt  | Lower| Raise|  | Lower| Raise|      |      |      |
-     *                        `----------------------------------'  `----------------------------------'
-     */
-    [_QWERTY] = LAYOUT(
-            LT(_RAISE, KC_ESC),       KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_PIPE,
-            MT(MOD_LCTL, KC_BSPC),   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_LSFT,   KC_LSFT, KC_LSFT, KC_LSFT, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_MINS,
-            KC_LGUI, KC_DEL, MT(MOD_LALT, KC_ENT), LT(_LOWER, KC_SPC), KC_LGUI, LT(_LOWER, KC_ENT), LT(_RAISE, KC_SPC), KC_TAB,  KC_BSPC, KC_RALT
-            ),
-    /*
-     * Lower Layer: Symbols
-     *
-     * ,-------------------------------------------.                              ,-------------------------------------------.
-     * |        |  !   |  @   |  {   |  }   |  |   |                              |      |      |      |      |      |  | \   |
-     * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-     * |        |  #   |  $   |  (   |  )   |  `   |                              |   +  |  -   |  /   |  *   |  %   |  ' "   |
-     * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-     * |        |  %   |  ^   |  [   |  ]   |  ~   |      |      |  |      |      |   &  |  =   |  ,   |  .   |  / ? | - _    |
-     * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-     *                        |      |      |      |  ;   |  =   |  |  =   |  ;   |      |      |      |
-     *                        |      |      |      |      |      |  |      |      |      |      |      |
-     *                        `----------------------------------'  `----------------------------------'
-     */
-    [_LOWER] = LAYOUT(
-            _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,                                     _______, _______, _______, _______, _______, KC_BSLS,
-            _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,                                      KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_PERC, KC_QUOT,
-            _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_EQL,  KC_COMM, KC_DOT,  KC_SLSH, KC_MINS,
-            _______, _______, _______, KC_SCLN, KC_EQL,  KC_EQL,  KC_SCLN, _______, _______, _______
-            ),
-    /*
-     * Raise Layer: Number keys, media, navigation
-     *
-     * ,-------------------------------------------.                              ,-------------------------------------------.
-     * |        |   1  |  2   |  3   |  4   |  5   |                              |  6   |  7   |  8   |  9   |  0   |        |
-     * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-     * |        |      | Prev | Play | Next | VolUp|                              | Left | Down | Up   | Right|      |        |
-     * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-     * |        |      |      |      | Mute | VolDn|      |      |  |      |      | MLeft| Mdown| MUp  |MRight|      |        |
-     * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-     *                        |      |Mbtn1 |Mbtn2 |Mbtn3 |      |  | Mbtn4|Mbtn5 |      |      |      |
-     *                        |      |      |      |      |      |  |      |      |      |      |      |
-     *                        `----------------------------------'  `----------------------------------'
-     */
-    [_RAISE] = LAYOUT(
-            _______, KC_1, 	  KC_2,    KC_3,    KC_4,    KC_5,                                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-            _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU,                                     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-            _______, _______, _______, _______, KC_MUTE, KC_VOLD, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
-            _______, KC_BTN1, KC_BTN2, KC_BTN3, _______, KC_BTN4, KC_BTN5, _______, _______, _______
-            ),
-    /*
-     * Adjust Layer: Function keys, RGB
-     *
-     * ,-------------------------------------------.                              ,-------------------------------------------.
-     * |        | F1   |  F2  | F3   | F4   | F5   |                              | F6   | F7   |  F8  | F9   | F10  |        |
-     * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-     * |        | TOG  | SAI  | HUI  | VAI  | MOD  |                              |      |      |      | F11  | F12  |        |
-     * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-     * |        |      | SAD  | HUD  | VAD  | RMOD |      |      |  |      |      |      |      |      |      |      |        |
-     * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-     *                        |      |      |      |      |      |  |      |      |      |      |      |
-     *                        |      |      |      |      |      |  |      |      |      |      |      |
-     *                        `----------------------------------'  `----------------------------------'
-     */
-    [_ADJUST] = LAYOUT(
-            _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-            _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD,                                     _______, _______, _______, KC_F11,  KC_F12,  _______,
-            _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-            ),
-    // /*
-    //  * Layer template
-    //  *
-    //  * ,-------------------------------------------.                              ,-------------------------------------------.
-    //  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-    //  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-    //  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-    //  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-    //  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-    //  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-    //  *                        |      |      |      |      |      |  |      |      |      |      |      |
-    //  *                        |      |      |      |      |      |  |      |      |      |      |      |
-    //  *                        `----------------------------------'  `----------------------------------'
-    //  */
-    //     [_LAYERINDEX] = LAYOUT(
-    //       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-    //       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-    //       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    //                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    //     ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;
-}
-
-static void render_kyria_logo(void) {
-    static const char PROGMEM kyria_logo[] = {
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,48,24,108,244,130,194,193,25,125,119,97,1,193,226,178,52,44,24,48,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,192,64,64,64,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,136,24,48,56,28,221,193,156,62,127,127,127,62,156,193,221,156,14,6,4,140,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,64,64,64,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,48,76,230,243,253,254,252,190,255,223,255,255,159,158,254,249,243,230,76,48,192,0,0,0,0,0,0,0,0,0,1,6,12,26,22,38,35,65,64,67,119,95,76,65,33,32,23,27,12,6,1,0,0,0,0,0,0,0,0,0,0,192,48,12,6,3,1,0,192,224,240,248,252,254,255,224,128,0,1,3,6,12,48,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,96,130,7,15,7,3,2,6,13,255,255,255,7,2,2,3,7,7,7,131,96,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,96,128,0,0,0,127,255,255,255,255,255,255,255,255,227,99,62,0,0,128,96,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,6,4,8,9,19,17,17,19,17,19,18,10,8,4,6,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,6,4,8,8,17,17,17,17,17,17,17,8,8,4,6,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,96,48,152,72,228,52,34,10,74,74,58,178,50,116,228,200,24,176,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,96,48,152,200,228,228,242,242,242,242,242,242,242,228,228,200,152,48,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,1,0,0,192,240,248,248,248,248,184,152,140,204,249,231,255,191,159,223,6,1,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,1,0,63,127,249,240,240,241,251,159,191,159,251,241,240,240,249,127,63,0,1,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,12,24,49,39,79,79,143,143,143,143,149,149,149,67,65,33,49,24,12,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,12,24,48,32,64,71,159,135,159,135,159,135,159,135,159,71,64,32,48,24,12,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-
-
-
-//        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-//        0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,232,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-//        0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-//        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-//        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-//        0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-//        0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-//        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-    };
-    oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-}
-
-static void render_qmk_logo(void) {
-    static const char PROGMEM qmk_logo[] = {
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-    oled_write_P(qmk_logo, false);
-}
-
-static void render_status(void) {
-    // QMK Logo and version information
-    //render_kyria_logo();
-    render_qmk_logo();
-    oled_write_P(PSTR("Kyria rev B3nJ.P0tt3r\n\n"), false);
-
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR("Chandra\n"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Jace\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Karn\n"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Teferi\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Ashiok\n"), false);
-    }
-
-    // Host Keyboard LED Status
-    led_t led_usb_state = host_keyboard_led_state();
-    oled_write_P(led_usb_state.num_lock? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(led_usb_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_kyria_logo();
-    }
-    return false;
-}
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            case _RAISE:
-                // Volume control
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-                break;
-            case _LOWER:
-                // Page up/Page down
-                if (clockwise) {
-                    tap_code(KC_PGDN);
-                } else {
-                    tap_code(KC_PGUP);
-                }
-                break;
-            case _QWERTY:
-                // Page up/Page down
-                if (clockwise) {
-                    tap_code(KC_DOWN);
-                } else {
-                    tap_code(KC_UP);
-                }
-                break;
-            default:
-                break;
-
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/benji/readme.md b/keyboards/splitkb/kyria/keymaps/benji/readme.md
deleted file mode 100644
index 57ea5e81736..00000000000
--- a/keyboards/splitkb/kyria/keymaps/benji/readme.md
+++ /dev/null
@@ -1,246 +0,0 @@
-# Kyria's Default Keymap
-
-[insert pretty KLE visualization once the keymap is vetted]
-
-The default keymap contains 5 layers which allows it to include all keys found on a ISO layout TKL keyboard plus media keys.
-Hardware features of the Kyria such as OLEDs, rotary encoders and underglow are also supported.
-
-The five different layers are the following:
-1. Base layer (QWERTY, Colemak-DH or Dvorak)
-2. Navigation layer
-3. Symbols/Numbers layer
-4. Function layer
-5. Adjust layer
-
-## Base layer(s)
-```
-Base Layer: -
-
-,-------------------------------------------.                              ,-------------------------------------------.
-|  Tab   |   -  |   -  |   -  |   -  |   -  |                              |   -  |   -  |   -  |   -  |   -  |  Bksp  |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|Ctrl/Esc|   -  |   -  |   -  |   -  |   -  |                              |   -  |   -  |   -  |   -  |   -  |Ctrl/ - |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| LShift |   -  |   -  |   -  |   -  |   -  | [ {  |CapsLk|  |F-Keys|  ] } |   -  |   -  |   -  |   -  |   -  | RShift |
-`----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-                       |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
-                       |      |      | Enter|      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-Three different well-known keyboard layouts are provided to fill in the placeholder `-` keys: QWERTY, Colemak-DH, and Dvorak. The default layer can be changed at runtime, more info on that in the section on the [adjust layer](#adjust-layer).
-
-For the rest of this write-up, the base layer will be assumed to be QWERTY and will be used as a reference to describe physical keys, e.g. “<kbd>B</kbd> key” vs, the much more verbose, “lower inner index key”.
-
-```
-Base Layer: QWERTY
-
-,-------------------------------------------.                              ,-------------------------------------------.
-|  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |Ctrl/' "|
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| LShift |   Z  |   X  |   C  |   V  |   B  | [ {  |CapsLk|  |F-keys|  ] } |   N  |   M  | ,  < | . >  | /  ? | RShift |
-`----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-                       |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
-                       |      |      | Enter|      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-
-Aside from variations in the alpha cluster, the rest of the base keys remain the same and are designed to feel familiar.
-
-![Step-by-step animation of the transformation of an ortholinear TKL to a Kyria](https://i.imgur.com/uVDCOek.gif)
-
-<details>
-After making transformations to the classic ANSI US QWERTY TKL 60% to arrive to the layout of the Kyria, as illustrated in the animation above, the result looks like this:
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-| Cap Lk |   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : | '  "   |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| LShift |   Z  |   X  |   C  |   V  |   B  |      |      |  |      |      |   N  |   M  | ,  < | . >  | /  ? | RShift |
-`--------+-------------+--------------------+------+------|  |------+------+--------------------+------+---------------'
-                       | LCtrl| LGUI | LAlt | Space|      |  |      | Space| AltGr| RGUI | Menu |
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       `----------------------------------'  '----------------------------------'
-```
-
-First thing to notice is the presence of blank keys. To fill in the blank keys above the <kbd>Space</kbd> keys, we can take inspiration from other split keyboards featuring an extra inner index column on each half. A common mapping for those kind of keys are the bracket keys that got removed in the fourth step of the animated transformation. The thumb keys besides <kbd>Space</kbd>s is prime real estate for dedicated layer-switching keys. It doesn't matter on which side is assigned the sym-layer-switch key but it helps to keep the nav-layer-switch on the left in order to keep the arrow keys on the right side like on a classic keyboard, so we'll put nav on the left and sym on the right. We'll address the remaining blank thumb keys later.
-
-The base layer is starting to form but there remains some flaws. One glaring issue is the position of Control. Control is a very commonly used function but the key on which it sits right now is way too tucked in under the hand to be able to press it comfortably with either the thumb or the pinky from resting position. In fact, installing a rotary encoder there is a common move among Kyria users and I guarantee you that activating Control by holding down a rotary encoder does not spark joy. Instead, let's employ a popular trick that involves remapping the current Caps Lock key, which is positioned at a comfortable position on the keyboard, to Control. 
-
-We can go further though; a variant of this trick makes the Control key produce Escape when tapped. This is called a “modtap”. There is no use to tapping Control by itself without chording it with another key and there is no use to holding down the Esc key so why not combine the two into a single key?
-
-All of this leaves us with three blank keys.
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : | '  "   |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| LShift |   Z  |   X  |   C  |   V  |   B  | [ {  |      |  |      |  ] } |   N  |   M  | ,  < | . >  | /  ? | RShift |
-`--------+-------------+--------------------+------+------|  |------+------+--------------------+------+---------------'
-                       |      | LGUI | LAlt | Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       `----------------------------------'  '----------------------------------'
-```
-
-These keys are not easily reachable while touch typing (that is, not reachable without picking up your hand) and should thus be associated with functions that you are not likely to be typed within a stream of text. The idea is that if you have to pick up your hand to hit a key, you want it to be at a time when you are likely to be pausing your interaction with the machine, rather than in the midst of a flurry of typing.  They're thus well suited for accessing the adjust layer and the function layer. We can also toss in Caps Lock even though it is an editing-type function that gets used within a stream of text because shouting in ALL-CAPS should be a deliberate action.
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : | '  "   |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| LShift |   Z  |   X  |   C  |   V  |   B  | [ {  |CapsLk|  |F-keys|  ] } |   N  |   M  | ,  < | . >  | /  ? | RShift |
-`----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-                       |Adjust| LGUI | LAlt | Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-
-The next glaring issue is the absence of an Enter key on the current base layer this far. Enter is a very frequently used key so it deserves to be placed at a good spot in the keymap. The best way to insert it in the keymap with minimal changes to the current layout is to use modtaps. A tempting solution is to turn the <kbd>RShift</kbd> key into a <kbd>RShift/Enter</kbd> modtap but that can result in chat messages sent too frustratingly early when you're not used to it. Using GUI is also sub-optimal because tapping the GUI modifier actually has a use as opposed to taps of the Control or the Shift key. Pressing and releasing the GUI key by itself opens the App menu in many desktop environments. The natural choice is thus <kbd>LAlt/Enter</kbd>. That way, Enter is 1u away from resting thumb position and is unlikely to get accidentally activated because Alt is very rarely used in the midst of prose.
-
-Finally, we're one Quality-Of-Life update away from the actual base layer. <kbd>Ctrl/' "</kbd> not only preserves symmetry in the keymap with <kbd>Ctrl/Esc</kbd> but also helps balance the load between your pinkies and invites you to use both hands instead of contortions. Perhaps more importantly, it also frees you from the necessity of picking up your hand, breaking touch typing position and pressing a pinky key with your ring finger in order to execute Ctrl+A or Ctrl+Z. That becomes even more important on a board with such an aggressive pinky columnar stagger like the Kyria.
-
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |Ctrl/' "|
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| LShift |   Z  |   X  |   C  |   V  |   B  | [ {  |CapsLk|  |F-keys|  ] } |   N  |   M  | ,  < | . >  | /  ? | RShift |
-`----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-                       |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
-                       |      |      | Enter|      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-
-</details>
-
-## Navigation layer
-
-```
-Nav Layer: Media, navigation
-                                                                                                                         
-,-------------------------------------------.                              ,-------------------------------------------.
-|        |      |      |      |      |      |                              | PgUp | Home |   ↑  | End  | VolUp| Delete |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|        |  GUI |  Alt | Ctrl | Shift|      |                              | PgDn |  ←   |   ↓  |   →  | VolDn| Insert |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-|        |      |      |      |      |      |      |ScLck |  |      |      | Pause|M Prev|M Play|M Next|VolMut| PrtSc  |
-`----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-
-This is where you'll find all the keys that are generally between the main block of a classic keyboard and the numpad in addition to media controls and modifiers on easy access on the home row for fast and comfortable chording with navigation keys.
-
-Useful mnemonics:
-- “GACS” to remember the order of the modifiers on the left-hand home row
-- <kbd>Scroll Lock</kbd> is on the same key as <kbd>Caps Lock</kbd> because they're both locks
-- <kbd>Delete</kbd> is on the same key as <kbd>Backspace</kbd> because they both erase characters
-- <kbd>Home</kbd> is the leftmost position on the current line so it is above <kbd>←</kbd>. Same logic applies for <kbd>End</kbd>.
-- <kbd>Media Previous</kbd> = ⏮, <kbd>Media Next</kbd> = ⏭
-- <kbd>Page Up</kbd>, <kbd>Page Down</kbd> and <kbd>Volume Up</kbd>, <kbd>Volume Down</kbd> are positioned like the main <kbd>Up</kbd> and <kbd>Down</kbd> keys.
-
-## Sym layer
-```
-Sym Layer: Numbers, symbols
-                                                                                                                         
-,-------------------------------------------.                              ,-------------------------------------------.
-|    `   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   =    |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|    ~   |  !   |  @   |  #   |  $   |  %   |                              |   ^  |  &   |  *   |  (   |  )   |   +    |
-|--------+------+------+------+------+------+-------------.  ,------+-------------+------+------+------+------+--------|
-|    |   |   \  |  :   |  ;   |  -   | \ |  | [ {  |      |  |      |  ] } |  # ~ |  _   |  ,   |  .   |  /   |   ?    |
-`----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-The top row is the unshifted num row, the home row of the layer is the shifted num row and the bottom row contains ISO keys (<kbd>\ |</kbd> and <kbd># ~</kbd>, which are respectively `KC_NUBS` and `KC_NUHS`), the hyphen `-` and the underscore `_` on the best lower row spot because of how frequent they are and redundant symbols that are already present on the base layer but are reproduced here to avoid juggling back and forth between base, shift, and sym when typing a string of symbols.
-
-The layout of the first two rows needs no introduction, you're already used to them but it's worth looking into the structure of the bottom row.
-
-The two halves are mirrored in a sense. On the right, you can find <kbd>,</kbd> <kbd>.</kbd> <kbd>/</kbd> at their usual spots with the addition of <kbd>Shift</kbd>+<kbd>/</kbd>=<kbd>?</kbd> to the right of the <kbd>/</kbd> key to remove the need to press simultaneously <kbd>Sym</kbd> and a <kbd>Shift</kbd> key to access `?`. 
-
-Now, if you look at the left side, you'll notice that the mirror of <kbd>,</kbd> is <kbd>;</kbd>, the mirror of <kbd>.</kbd> is <kbd>:</kbd> and the mirror of <kbd>/</kbd> is <kbd>\\</kbd>. The same logic used for <kbd>Shift</kbd>+<kbd>/</kbd>=<kbd>?</kbd> also applies to <kbd>Shift</kbd>+<kbd>\\</kbd>=<kbd>|</kbd>.
-
-As for the ISO keys, they are positioned more or less like they would on a classic keyboard: `KC_NUBS` on the left and `KC_NUHS` on the right.
-
-## Function layer
-```
-Function Layer: Function keys
-                                                                                                                         
-,-------------------------------------------.                              ,-------------------------------------------.
-|        |  F9  | F10  | F11  | F12  |      |                              |      |      |      |      |      |        |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|        |  F5  |  F6  |  F7  |  F8  |      |                              |      | Shift| Ctrl |  Alt |  GUI |        |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-|        |  F1  |  F2  |  F3  |  F4  |      |      |      |  |      |      |      |      |      |      |      |        |
-`--------+------+------+--------------------+------+------|  |------+------+------+------+------+----------------------'
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-In a similar fashion to the nav layer, pressing down `FKEYS` with the right thumb enables a numpad of function keys on the opposite hand and modifiers on the right-hand home row. Once again, mirror symmetry is leveraged in this keymap for the order of the right-hand modifiers.
-
-Since there are more than 10 function keys, the cluster of F-keys does not follow the usual 3×3+1 numpad arrangement.
-
-
-## Adjust layer
-```
-Adjust Layer: Default layer settings, RGB
-                                                                                                                         
-,-------------------------------------------.                              ,-------------------------------------------.
-|        |      |      |QWERTY|      |      |                              |      |      |      |      |      |        |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|        |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  |        |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-|        |      |      |Colmak|      |      |      |      |  |      |      |      | SAD  | HUD  | VAD  | RMOD |        |
-`----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-
-Default layer settings on the left and various RGB underglow controls on the right.
-
-The default layer settings are lined up on the middle finger column because the home middle finger key is <kbd>D</kbd> on QWERTY (like the “D” in “Dvorak”) and the lower middle finger key is <kbd>C</kbd> on QWERTY (like the “C” in “Colemak”). I can hear you say that “QWERTY” doesn't start with “E” but Dvorak and Colemak were already aligned in a column so the QWERTY may as well join the formation.
-
-NOTE: The default layer settings set by those keys are *NOT* stored in EEPROM and thus do not persist through boots. If you wish to change the default layer in a non-volatile manner, either change the order of the layers in the firmware, for example like so if you want to set Dvorak as the new default:
-```c
-enum layers {
-    _DVORAK = 0,
-    _QWERTY,
-    _COLEMAK_DH,
-    _NAV,
-    _SYM,
-    _FUNCTION,
-    _ADJUST
-};
-```
-or re-define the `QWERTY`, `COLEMAK` and `DVORAK` keys to point to custom keycodes starting on `SAFE_RANGE` and calling the `set_single_persistent_default_layer` function inside of `process_record_user`.
-
-## Hardware Features
-
-### Rotary Encoder
-The left rotary encoder is programmed to control the volume whereas the right encoder sends <kbd>PgUp</kbd> or <kbd>PgDn</kbd> on every turn.
-
-### OLEDs
-The OLEDs display the current layer at the top of the active layers stack, the Kyria logo and lock status (caps lock, num lock, scroll lock).
-
-### Underglow
-The underglow LEDs should be red.
-
-## Going further...
-
-This default keymap can be used as is, unchanged, as a daily driver for your Kyria but you're invited to treat your keymap like a bonsai. At the beginning, it's just like the default keymap but from time to time, you can tweak it a little. Cut a little key here, let another combo grow there. Slowly but surely it will be a unique keymap like no other, that will fit you like a glove.
-
-Check out the #keymap-ideas channel on the official SplitKB Discord server for inspiration.
diff --git a/keyboards/splitkb/kyria/keymaps/benji/rules.mk b/keyboards/splitkb/kyria/keymaps/benji/rules.mk
deleted file mode 100644
index 7b3d2303508..00000000000
--- a/keyboards/splitkb/kyria/keymaps/benji/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/splitkb/kyria/keymaps/corodiak/config.h b/keyboards/splitkb/kyria/keymaps/corodiak/config.h
deleted file mode 100644
index 5738773f8de..00000000000
--- a/keyboards/splitkb/kyria/keymaps/corodiak/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-#endif
-
-// The Leader key allows to flexibly assign macros to key sequences.
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 350
-
-#define TAPPING_TERM 200
-
-// Turn off on slave
-#define WAIT_FOR_USB
-
-// 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
-
-// Allows to use either side as the master. Look at the documentation for info:
-// https://docs.qmk.fm/#/config_options?id=setting-handedness
-#define EE_HANDS
diff --git a/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c b/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c
deleted file mode 100644
index c0ed9f133ce..00000000000
--- a/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-typedef union {
-    uint32_t raw;
-    struct {
-        bool osIsWindows;
-    };
-} user_config_t;
-
-user_config_t user_config;
-
-enum layers {
-    _QWERTY = 0,
-    _COLEMAK,
-    _NAV,
-    _SYMBOLS,
-    _NUM,
-    _ADJUST
-};
-
-enum custom_keycodes {
-    Qwerty = SAFE_RANGE,
-    Colemak,
-    Undo,
-    Cut,
-    Copy,
-    Paste,
-    NxtWord,
-    PrvWord
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |   TAB  |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |   NAV  |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  ' "   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |Enter |  ESC |  |ADJUST|Space |   N  |   M  | ,  < | . >  | /  ? |  Del   |
- * `----------------------+------+------+------+      +------|  |------+      +------+------+------+----------------------'
- *                        | LCTL | GUI  | RALT |      | NUM  |  | NUM  |      | SYMB | NAV  |LEADER|
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_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_BSPC,
-      MO(_NAV), 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 , XXXXXXX, KC_ESC , MO(_ADJUST), XXXXXXX, KC_N,  KC_M ,KC_COMM, KC_DOT ,KC_SLSH, RSFT_T(KC_DEL),
-                                 KC_LCTL, KC_LGUI, KC_RALT, KC_ENT ,TT(_NUM),TT(_NUM), KC_SPC, MO(_SYMBOLS), MO(_NAV), QK_LEAD
-    ),
-
-/*
- * Base Layer: Colemak
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |   TAB  |   Q  |   W  |   F  |   P  |   G  |                              |   J  |   L  |   U  |   Y  | ;  : |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |   NAV  |   A  |   R  |  S   |   T  |   D  |                              |   H  |   N  |   E  |   I  |   O  |  ' "   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |Enter |  ESC |  |ADJUST|Space |   K  |   M  | ,  < | . >  | /  ? |  Del   |
- * `----------------------+------+------+------+      +------|  |------+      +------+------+------+----------------------'
- *                        | LCTL | GUI  | RALT |      | NUM  |  | NUM  |      | SYMB | NAV  |LEADER|
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_COLEMAK] = LAYOUT(
-      KC_TAB  , KC_Q ,  KC_W   ,  KC_F  ,   KC_P ,   KC_G ,                                        KC_J,   KC_L ,  KC_U ,   KC_Y ,KC_SCLN, KC_BSPC,
-      MO(_NAV), 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 , XXXXXXX, KC_ESC , MO(_ADJUST), XXXXXXX, KC_K,  KC_M ,KC_COMM, KC_DOT ,KC_SLSH, RSFT_T(KC_DEL),
-                                 KC_LCTL, KC_LGUI, KC_RALT, KC_ENT ,TT(_NUM),TT(_NUM), KC_SPC, MO(_SYMBOLS), MO(_NAV), QK_LEAD
-    ),
-
-/*
- * Navigation Layer: Cursor, Text Navigation
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |WheelU|      |      |                              |      |PrvWord| Up |NxtWord|      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |       | LCTL |WheelD|LSFT | Bksp |                              | Bksp | Left | Down |Right | Del  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        | Undo | Cut  | Copy |Paste |      |      |      |  |      |      |      | Home |      | End  |      |        |
- * `----------------------+------+------+------+      +------|  |------+      +------+------+------+----------------------'
- *                        |      |      |      |      |Space |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_NAV] = LAYOUT(
-      _______, _______, _______, KC_WH_U, _______, _______,                                     _______, PrvWord, KC_UP  , NxtWord, _______, _______,
-      _______, _______, KC_LCTL, KC_WH_D, KC_LSFT, KC_BSPC,                                     KC_BSPC, KC_LEFT, KC_DOWN,KC_RIGHT, KC_DEL , _______,
-      _______,  Undo  ,   Cut  ,  Copy  , Paste  , _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_HOME, _______, KC_END , _______, _______,
-                                 _______, _______, _______, _______, KC_SPC , _______, _______, _______, _______, _______
-    ),
-
-/*
- * Symbol Layer
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  ` ~   |   !  |  @   |  #   |  $   |  %   |                              |  ^   |  {   |  }   |      |  €   |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |   ~    |      |      | - _  | = +  |  &   |                              |  *   |  (   |  )   |      |  |   |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |  _   |  +   |      |      |      |  |      |      |      | [ {  | ] }  |      | \ |  |        |
- * `----------------------+------+------+------+      +------|  |------+      +------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_SYMBOLS] = LAYOUT(
-       KC_GRV, KC_EXLM,  KC_AT , KC_HASH, KC_DLR , KC_PERC,                                     KC_CIRC, KC_LCBR, KC_RCBR, _______,ALGR(KC_5),_______,
-      KC_TILD, _______, _______, KC_MINS, KC_EQL , KC_AMPR,                                     KC_ASTR, KC_LPRN, KC_RPRN, _______, KC_PIPE, _______,
-      _______, _______, _______, KC_UNDS, KC_PLUS, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_LBRC, KC_RBRC, _______, KC_BSLS, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Num Layer
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  1 ! |  2 @ |  3 # |  4 $ |  5 % |                              |  /   |  7 & |  8 * |  9 ( |  -   |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  6 ^ |  7 & |  8 * |  9 ( |  0 ) |                              |  *   |  4 $ |  5 % |  6 ^ |  +   | Space  |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |  0 ) |  1 ! |  2 @ |  3 # |  =   | Enter  |
- * `----------------------+------+------+------+      +------|  |------+      +------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |  ,   |  .   |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_NUM] = LAYOUT(
-      _______,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,                                     KC_PSLS,  KC_7  ,  KC_8  ,  KC_9  , KC_PMNS, _______,
-      _______,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  ,                                     KC_PAST,  KC_4  ,  KC_5  ,  KC_6  , KC_PLUS, KC_SPC ,
-      _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX,  KC_0  ,  KC_1  ,  KC_2  ,  KC_3  , KC_PEQL, KC_ENT ,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, KC_PCMM,  KC_DOT
-    ),
-
-/*
- * Adjust Layer: Media
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  F9  | F10  | F11  | F12  |      |                              | SAI  |      | Vol+ |      | Play |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  F5  |  F6  |  F7  |  F8  |      |                              | HUI  | Prev | Vol- |  Nxt |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |  F1  |  F2  |  F3  |  F4  |      |      |      |  |      |      | VAI  | Mute |      |      |      |        |
- * `----------------------+------+------+------+      +------|  |------+      +------+------+------+----------------------'
- *                       |Qwerty|Colemak|      |      |      |  | RGB  |      | RGB  |      |      |
- *                        | Dflt | Dflt |      |      |      |  |Toggle|      | Mode |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_ADJUST] = LAYOUT(
-      _______,  KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______,                                     RGB_SAI, _______, KC_VOLU, _______, KC_MPLY, _______,
-      _______,  KC_F5 ,  KC_F6 ,  KC_F7 ,  KC_F8 , _______,                                     RGB_HUI, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______,
-      _______,  KC_F1 ,  KC_F2 ,  KC_F3 ,  KC_F4 , _______, XXXXXXX, _______, _______, XXXXXXX, RGB_VAI, KC_MUTE, _______, _______, _______, _______,
-                                 Qwerty , Colemak, _______, _______, _______, RGB_TOG, _______, RGB_MOD, _______, _______
-    ),
-
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-void keyboard_post_init_user(void) {
-    // Call the post init code.
-
-    // Read the user config from EEPROM
-    user_config.raw = eeconfig_read_user();
-
-    // Default RGB settings, without saving settings
-    rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom(HSV_CYAN);
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch(keycode) {
-        case Qwerty:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWERTY);
-            }
-            break;
-        case Colemak:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            break;
-        case Undo:
-            if (record->event.pressed) {
-                if (user_config.osIsWindows == 1) {
-                    tap_code16(C(KC_Z));
-                } else if (user_config.osIsWindows == 0) {
-                    tap_code16(G(KC_Z));
-                }
-            }
-            break;
-        case Cut:
-            if (record->event.pressed) {
-                if (user_config.osIsWindows == 1) {
-                    tap_code16(C(KC_X));
-                } else if (user_config.osIsWindows == 0) {
-                    tap_code16(G(KC_X));
-                }
-            }
-            break;
-        case Copy:
-            if (record->event.pressed) {
-                if (user_config.osIsWindows == 1) {
-                    tap_code16(C(KC_C));
-                } else if (user_config.osIsWindows == 0) {
-                    tap_code16(G(KC_C));
-                }
-            }
-            break;
-        case Paste:
-            if (record->event.pressed) {
-                if (user_config.osIsWindows == 1) {
-                    tap_code16(C(KC_V));
-                } else if (user_config.osIsWindows == 0) {
-                    tap_code16(G(KC_V));
-                }
-            }
-            break;
-        case PrvWord:
-            if (record->event.pressed) {
-                if (user_config.osIsWindows == 1) {
-                    tap_code16(C(KC_LEFT));
-                } else if (user_config.osIsWindows == 0) {
-                    tap_code16(A(KC_LEFT));
-                }
-            }
-            break;
-        case NxtWord:
-            if (record->event.pressed) {
-                if (user_config.osIsWindows == 1) {
-                    tap_code16(C(KC_RGHT));
-                } else if (user_config.osIsWindows == 0) {
-                    tap_code16(A(KC_RGHT));
-                }
-            }
-            break;
-    }
-    return true;
-};
-
-void leader_end_user(void) {
-    // Set current OS indicator to macOs
-    if (leader_sequence_one_key(KC_M)) {
-        user_config.osIsWindows = false;
-        eeconfig_update_user(user_config.raw);
-    }
-
-    // Set current OS indicator to Windows
-    if (leader_sequence_one_key(KC_W)) {
-        user_config.osIsWindows = true;
-        eeconfig_update_user(user_config.raw);
-    }
-
-    // Screenshot
-    if (leader_sequence_one_key(KC_S)) {
-        if (user_config.osIsWindows == 1) {
-            tap_code16(S(G(KC_S)));
-        } else if (user_config.osIsWindows == 0) {
-            tap_code16(S(G(KC_4)));
-        }
-    }
-
-    // Video
-    if (leader_sequence_one_key(KC_V)) {
-        if (user_config.osIsWindows == 0) {
-            tap_code16(S(G(KC_5)));
-        }
-    }
-
-    // Sleep
-    if (leader_sequence_one_key(KC_P)) {
-        if (user_config.osIsWindows == 1) {
-            SEND_STRING(SS_LGUI("x") "u" "h");
-        } else if (user_config.osIsWindows == 0) {
-            tap_code16(A(G(KC_PWR)));
-        }
-    }
-}
diff --git a/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk b/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk
deleted file mode 100644
index 2ed0ad91c79..00000000000
--- a/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# OLED_ENABLE = yes
-# ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-LEADER_ENABLE = yes        # Enables the Leader shortcut funtionality
diff --git a/keyboards/splitkb/kyria/keymaps/ghidalgo93/config.h b/keyboards/splitkb/kyria/keymaps/ghidalgo93/config.h
deleted file mode 100644
index 4efed7cade2..00000000000
--- a/keyboards/splitkb/kyria/keymaps/ghidalgo93/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-#endif
-
-// encoder resolution from default 4 to 2
-#define ENCODER_RESOLUTION 2
-
-// 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
-
-//allows for either side as the master.
-#define EE_HANDS
diff --git a/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c b/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c
deleted file mode 100644
index df542977a1f..00000000000
--- a/keyboards/splitkb/kyria/keymaps/ghidalgo93/keymap.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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 layers {
-    _QWERTY = 0,
-    _LOWER,
-    _RAISE,
-    _NAV,
-    _ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |   ESC  |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  | \   |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  Ctrl  |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  ' "   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |      |  |      |      |   N  |   M  | ,  < | . >  | /  ? |  - _   |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |  GUI |      | Tab  | Enter|  | Bksp | Space| Alt  | Home | End  |
- *                        |      |      | LCTL | Lower|      |  |      | Raise|      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_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_PIPE,
-      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, KC_MINS,
-             _______, KC_LGUI , KC_LCTL, LT(_LOWER, KC_TAB), LT(_NAV, KC_ENT),                      KC_BSPC, LT(_RAISE, KC_SPC), KC_RALT,  KC_HOME, KC_END
-    ),
-/*
- * Lower Layer: Number keys, media
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              |      |  7   |  8   |  9   |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      | Prev | Play | Next | VolUp|                              |      |  4   |  5   |  6   |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      | Mute | VolDn|      |      |  |      |      |  0   |  1   |  2   |  3   |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_LOWER] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     _______, KC_7   , KC_8   , KC_9   , _______, _______,
-      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU,                                     _______, KC_4   , KC_5   , KC_6   , _______, _______,
-      _______, _______, _______, _______, KC_MUTE, KC_VOLD, _______, _______, _______, _______, KC_0   , KC_1   , KC_2   , KC_3   , _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Raise Layer: Symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  @   |  !   |  {   |  }   |      |                              |   `  |  ~   |  &   |  *   |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  #   |  $   |  (   |  )   |      |                              |   _  |  -   |  =   |  |   | ' "  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |  %   |  ^   |  [   |  ]   |      |      |      |  |      |      |      |  +   |  \   |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_RAISE] = LAYOUT(
-      _______, KC_AT  , KC_EXLM, KC_LCBR, KC_RCBR, _______,                                     KC_GRV , KC_TILD, KC_AMPR, KC_ASTR, _______, _______,
-      _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, _______,                                     KC_UNDS, KC_MINS, KC_EQL , KC_PIPE, KC_QUOT, _______,
-      _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, KC_PLUS, KC_BSLS, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-// /*
-//  * Navigation Layer
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              | home |pg dn |pg up | end  |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              | left | down |  up  | right|      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-     [_NAV] = LAYOUT(
-       _______, _______, _______, _______, _______, _______,                                     KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______, _______,
-       _______, _______, _______, _______, _______, _______,                                     KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-     ),
-/*
- * Adjust Layer: Function keys, RGB
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        | F1   |  F2  | F3   | F4   | F5   |                              | F6   | F7   |  F8  | F9   | F10  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |                              |      |      |      | F11  | F12  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_ADJUST] = 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,  _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-static void render_kyria_logo(void) {
-    static const char PROGMEM kyria_logo[] = {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-        0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-    };
-    oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-}
-
-static void render_qmk_logo(void) {
-  static const char PROGMEM qmk_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-  oled_write_P(qmk_logo, false);
-}
-
-static void render_status(void) {
-    // QMK Logo and version information
-    render_qmk_logo();
-    oled_write_P(PSTR("Kyria rev1.0\n\n"), false);
-
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR("Default\n"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise\n"), false);
-            break;
-        case _NAV:
-            oled_write_P(PSTR("Nav\n"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adjust\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undefined\n"), false);
-    }
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_kyria_logo();
-    }
-    return false;
-}
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    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/splitkb/kyria/keymaps/ghidalgo93/rules.mk b/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk
deleted file mode 100644
index d1f3f0f9f47..00000000000
--- a/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUTO_SHIFT_ENABLE = yes    # Enable auto shift
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/README.md b/keyboards/splitkb/kyria/keymaps/gotham/README.md
deleted file mode 100644
index 1598e95a73e..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Gotham's Keymap for [Kyria](https://github.com/splitkb/kyria)
-
-## Keymap
-This is my personal keymap for Kyria with some mods.
-
-More information about the Kyria keyboard can be found [here](https://blog.splitkb.com/blog/introducing-the-kyria)
-
-### Rotary Encoders
-
-Press the encoder on each half to cycle between:
-- Volume
-- Word Nav (Ctrl + Left / Right)
-- Left / Right
-- Up / Down
-- Page Up / Page Down
-
-### OLEDs
-
-Master-side OLED displays dynamic data:
-- Current layer
-- Current mode of each rotary encoder
-- Current mode of thumbstick
-
-Slave-side OLED currently only displays a static content.
-
-### Thumbstick
-
-A PSP 2000 thumbstick is attached to the right half. It will currently only function when the USB cable is connected to the right half. When I figure out how to transfer data between halves using serial link, I will make this work regardless of which side is the master.
-
-#### Thumbstick Configuration
-
-- __THUMBSTICK_ENABLE:__ Enable thumbstick.
-- __THUMBSTICK_PIN_X/Y (mandatory):__ The QMK pins to use for the respective axis. The values are from the [QMK's ADC driver](https://docs.qmk.fm/#/adc_driver). I used F0 and F1, for example.
-- __THUMBSTICK_FLIP_X/Y:__ Mirror the direction of the respective axis. Use to compensate for actual orientation of thumbstick.
-- __THUMBSTICK_DEBUG:__ Print raw and calculated values from analogReadPin to console. Will only work with CONSOLE_ENABLE turned on.
-
-#### Thumbstick Fine-tuning
-
-More tunables are described here. Values like deadzone threshold are hardware-specific. The theoretical range for analog readings is [0, 1023], but emperical readings don't extend the entire range. To find the right values, turn on CONSOLE_ENABLE in rules.mk and THUMBSTICK_DEBUG in config.h to look at the raw values from the pins using hid_listen (or QMK Toolbox).
-
-- __THUMBSTICK_DEAD_ZONE 90:__ Values below this are ignored (deadzone).
-- __THUMBSTICK_FINE_ZONE 180:__  Values below this enable fine movement.
-
-- __THUMBSTICK_MODE <mode>:__ One of THUMBSTICK_MODE_MOUSE, THUMBSTICK_MODE_ARROWS and THUMBSTICK_MODE_SCROLL. This is just the default mode, it can be changed by calling ```void thumbstick_mode_cycle(bool reverse)``` within code.
-
-- __THUMBSTICK_SPEED 127:__ Cursor speed in THUMBSTICK_MODE_MOUSE.
-- __THUMBSTICK_FINE_SPEED 64:__ Fine cursor speed in THUMBSTICK_MODE_MOUSE (kicks in when slightly nudging the thumbstick).
-- __THUMBSTICK_SCROLL_SPEED 1:__ Scrolling speed in THUMBSTICK_MODE_SCROLL.
-
-- __THUMBSTICK_EIGHT_AXIS true:__ 8-axis toggle for ARROW and SCROLL modes. Disable to fall back to 4 axes (think D-pads vs analog stick).
-- __THUMBSTICK_AXIS_SEPARATION 0.5f:__ Float value between 0 and 1, used to discretize the circular range into distinct zones for 8-axis. Imagine the top-right quadrant on a graph, and picture the diagonal. This value indicates the angular "distance" from the diagonal to either axis. Moving from the diagonal to each of the axes, this value changes from 0 to 1. So, a value of 0.5 will "sweep" from the center to half-way towards each axis, creating a zone across the diagonal. Smaller values make narrower diagonal zones, and vice versa.
-
-#### Thanks
-
-- @pyrho and u/\_GEIST\_ for the inspiration and initial reference code.
-- @zvecr and @drashna for code review and more pointers.
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/config.h b/keyboards/splitkb/kyria/keymaps/gotham/config.h
deleted file mode 100644
index 8feb6042f5d..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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 EE_HANDS
-
-// Fix for Elite C rev3
-#define SPLIT_USB_DETECT
-// Speed up slave half startup
-#define SPLIT_USB_TIMEOUT 1000
-
-#ifdef OLED_ENABLE
-#    define OLED_DISPLAY_128X64
-#    define OLED_TIMEOUT 10000
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_KNIGHT
-#endif
-
-#ifdef ENCODER_ENABLE
-#    define ENCODER_DIRECTION_FLIP
-#    define ENCODER_RESOLUTION 2
-#endif
-
-#ifdef THUMBSTICK_ENABLE
-#    define THUMBSTICK_FLIP_X
-#    define THUMBSTICK_PIN_X F0
-#    define THUMBSTICK_PIN_Y F1
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/encoder_utils.c b/keyboards/splitkb/kyria/keymaps/gotham/encoder_utils.c
deleted file mode 100644
index 1c2962339d3..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/encoder_utils.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include "encoder_utils.h"
-
-void encoder_utils_init(void) {
-    encoder_left_mode  = ENC_MODE_VOLUME;
-    encoder_right_mode = ENC_MODE_LEFT_RIGHT;
-}
-
-void set_encoder_mode(bool left, encoder_mode_t mode) {
-    if (left) {
-        encoder_left_mode = mode;
-    } else {
-        encoder_right_mode = mode;
-    }
-}
-
-encoder_mode_t get_encoder_mode(bool left) {
-    if (left) {
-        return encoder_left_mode;
-    } else {
-        return encoder_right_mode;
-    }
-}
-
-void cycle_encoder_mode(bool left, bool reverse) {
-    encoder_mode_t mode = get_encoder_mode(left);
-    if (reverse) {
-        mode = (mode == 0) ? (_ENC_MODE_LAST - 1) : (mode - 1);
-    } else {
-        mode = (mode == (_ENC_MODE_LAST - 1)) ? 0 : (mode + 1);
-    }
-    set_encoder_mode(left, mode);
-}
-
-void encoder_action_volume(uint8_t clockwise) {
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-}
-
-void encoder_action_word_nav(uint8_t clockwise) {
-    if (clockwise) {
-        tap_code16(C(KC_RIGHT));
-    } else {
-        tap_code16(C(KC_LEFT));
-    }
-}
-
-void encoder_action_left_right(uint8_t clockwise) {
-    if (clockwise) {
-        tap_code(KC_RIGHT);
-    } else {
-        tap_code(KC_LEFT);
-    }
-}
-
-void encoder_action_up_down(uint8_t clockwise) {
-    if (clockwise) {
-        tap_code(KC_UP);
-    } else {
-        tap_code(KC_DOWN);
-    }
-}
-
-void encoder_action_paging(uint8_t clockwise) {
-    if (clockwise) {
-        tap_code(KC_PGUP);
-    } else {
-        tap_code(KC_PGDN);
-    }
-}
-
-void encoder_action(encoder_mode_t mode, uint8_t clockwise) {
-    switch (mode) {
-        case ENC_MODE_VOLUME:
-            encoder_action_volume(clockwise);
-            break;
-        case ENC_MODE_WORD_NAV:
-            encoder_action_word_nav(clockwise);
-            break;
-        case ENC_MODE_LEFT_RIGHT:
-            encoder_action_left_right(clockwise);
-            break;
-        case ENC_MODE_UP_DOWN:
-            encoder_action_up_down(clockwise);
-            break;
-        case ENC_MODE_PAGING:
-            encoder_action_paging(clockwise);
-            break;
-        default:
-            encoder_action_volume(clockwise);
-    }
-}
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/encoder_utils.h b/keyboards/splitkb/kyria/keymaps/gotham/encoder_utils.h
deleted file mode 100644
index 60db6c6bd85..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/encoder_utils.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-
-#include "quantum.h"
-
-typedef enum {
-    ENC_MODE_VOLUME = 0,
-    ENC_MODE_WORD_NAV,
-    ENC_MODE_LEFT_RIGHT,
-    ENC_MODE_UP_DOWN,
-    ENC_MODE_PAGING,
-    _ENC_MODE_LAST  // Do not use, except for looping through enum values
-} encoder_mode_t;
-
-encoder_mode_t encoder_left_mode;
-encoder_mode_t encoder_right_mode;
-
-void encoder_utils_init(void);
-
-void set_encoder_mode(bool left, encoder_mode_t mode);
-
-encoder_mode_t get_encoder_mode(bool left);
-
-void cycle_encoder_mode(bool left, bool reverse);
-
-void encoder_action_volume(uint8_t clockwise);
-
-void encoder_action_word_nav(uint8_t clockwise);
-
-void encoder_action_left_right(uint8_t clockwise);
-
-void encoder_action_up_down(uint8_t clockwise);
-
-void encoder_action_paging(uint8_t clockwise);
-
-void encoder_action(encoder_mode_t mode, uint8_t clockwise);
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/keycodes.h b/keyboards/splitkb/kyria/keymaps/gotham/keycodes.h
deleted file mode 100644
index 0730d49250d..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/keycodes.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-enum layers { _QWERTY = 0, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes {
-    ENC_MODE_L = SAFE_RANGE,
-    ENC_MODE_R,
-    TMB_MODE,
-};
-
-#define ESC_RAISE LT(_RAISE, KC_ESC)
-#define BSLS_RAISE LT(_RAISE, KC_BSLS)
-#define SFT_QUOT MT(MOD_RSFT, KC_QUOT)
-#define CTL_MINS MT(MOD_RCTL, KC_MINS)
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/keymap.c b/keyboards/splitkb/kyria/keymaps/gotham/keymap.c
deleted file mode 100644
index 5fdeb494e67..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/keymap.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#include "keycodes.h"
-
-#ifdef ENCODER_ENABLE
-#    include "encoder_utils.h"
-#endif
-
-#ifdef OLED_ENABLE
-#    include "oled_utils.h"
-#endif
-
-#ifdef THUMBSTICK_ENABLE
-#    include "thumbstick.h"
-#endif
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
-*/
-    [_QWERTY] = LAYOUT(
-      ESC_RAISE,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,                                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     BSLS_RAISE,
-      KC_LSFT,      KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                                       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  SFT_QUOT,
-      KC_LCTL,      KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  KC_LGUI,  KC_NO,  TMB_MODE,  KC_NO,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  CTL_MINS,
-        ENC_MODE_L, KC_LALT, LT(_LOWER, KC_SPC), LT(_RAISE, KC_TAB), KC_LSFT,  KC_EQL, LT(_RAISE, KC_ENT), LT(_LOWER, KC_BSPC),  KC_DEL, ENC_MODE_R
-    ),
-/*
- * Lower Layer: Symbols, Navigation
- */
-    [_LOWER] = LAYOUT(
-      _______, KC_HASH, KC_DLR,  KC_LCBR, KC_RCBR, KC_PIPE,                                     _______, _______, _______, _______, _______, KC_PIPE,
-      _______, KC_EXLM, KC_AT,   KC_LPRN, KC_RPRN, KC_GRV,                                      KC_PGUP, KC_LEFT, KC_UP,   KC_RGHT, _______, KC_QUOT,
-      _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, _______, _______, KC_PGDN, KC_HOME, KC_DOWN, KC_END,  _______, KC_MINS,
-                                 _______, _______, _______, KC_SCLN, KC_EQL,  KC_EQL,  KC_SCLN, _______, _______, _______
-    ),
-/*
- * Raise Layer: Number keys, media, more symbols
-  */
-    [_RAISE] = LAYOUT(
-      _______, KC_1, 	  KC_2,    KC_3,    KC_4,    KC_5,                                         KC_6,    KC_7, KC_8,    KC_9,    KC_0,    _______,
-      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU,                                     KC_MINS, KC_PLUS, KC_ASTR, KC_SLSH, KC_PERC, _______,
-      _______, _______, _______, _______, KC_MUTE, KC_VOLD, _______, _______, _______, _______, KC_AMPR, KC_PIPE, KC_COMM, KC_DOT,  KC_SLSH, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Adjust Layer: Function keys, RGB
-  */
-    [_ADJUST] = LAYOUT(
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-      _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD,                                     _______, _______, _______, KC_F11,  KC_F12,  _______,
-      _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-};
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef ENCODER_ENABLE
-    encoder_utils_init();
-#endif
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); }
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-#ifdef ENCODER_ENABLE
-        case ENC_MODE_L:
-            if (record->event.pressed) {
-                cycle_encoder_mode(true, false);
-            }
-            break;
-        case ENC_MODE_R:
-            if (record->event.pressed) {
-                cycle_encoder_mode(false, false);
-            }
-            break;
-#endif
-#ifdef THUMBSTICK_ENABLE
-        case TMB_MODE:
-            if (record->event.pressed) {
-                thumbstick_mode_cycle(false);
-            }
-#endif
-    }
-    return true;
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-
-bool oled_task_user(void) {
-    render_status();
-    return false;
-}
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        encoder_action(get_encoder_mode(true), clockwise);
-#    ifdef OLED_ENABLE
-        oled_on();
-#    endif
-    } else if (index == 1) {
-        encoder_action(get_encoder_mode(false), clockwise);
-#    ifdef OLED_ENABLE
-        oled_on();
-#    endif
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/oled_utils.c b/keyboards/splitkb/kyria/keymaps/gotham/oled_utils.c
deleted file mode 100644
index 9d76c974916..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/oled_utils.c
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "oled_utils.h"
-
-  void render_qmk_logo(void) {
-      static const char PROGMEM qmk_logo[] = {
-          0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
-          0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
-          0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
-      };
-
-      oled_write_P(qmk_logo, false);
-  }
-
-void render_layer(void) {
-    oled_write_P(PSTR("\nLayer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR("Default\n"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise\n"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adjust\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("???\n"), false);
-    }
-}
-
-#ifdef ENCODER_ENABLE
-void render_encoder(encoder_mode_t mode) {
-    switch (mode) {
-        case ENC_MODE_VOLUME:
-            oled_write_P(PSTR("Volume\n"), false);
-            break;
-        case ENC_MODE_WORD_NAV:
-            oled_write_P(PSTR("Word Nav\n"), false);
-            break;
-        case ENC_MODE_LEFT_RIGHT:
-            oled_write_P(PSTR("Left / Right\n"), false);
-            break;
-        case ENC_MODE_UP_DOWN:
-            oled_write_P(PSTR("Up / Down\n"), false);
-            break;
-        case ENC_MODE_PAGING:
-            oled_write_P(PSTR("PgUp / PgDwn\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("???\n"), false);
-    }
-}
-#endif
-
-#ifdef THUMBSTICK_ENABLE
-void render_thumbstick(thumbstick_mode_t mode) {
-    switch (mode) {
-        case THUMBSTICK_MODE_MOUSE:
-            oled_write_P(PSTR("Mouse"), false);
-            break;
-        case THUMBSTICK_MODE_ARROWS:
-            oled_write_P(PSTR("Arrows"), false);
-            break;
-        case THUMBSTICK_MODE_SCROLL:
-            oled_write_P(PSTR("Scroll"), false);
-            break;
-        default:
-            oled_write_P(PSTR("???\n"), false);
-    }
-}
-#endif
-
-void render_status(void) {
-    if (is_keyboard_master()) {
-        // Host Keyboard Layer Status
-        render_layer();
-#ifdef ENCODER_ENABLE
-        // Encoder state
-        oled_write_P(PSTR("L-Enc: "), false);
-        render_encoder(encoder_left_mode);
-        oled_write_P(PSTR("R-Enc: "), false);
-        render_encoder(encoder_right_mode);
-#endif
-#ifdef THUMBSTICK_ENABLE
-        if (!isLeftHand) {
-            // Thumbstick state
-            oled_write_P(PSTR("Joystick: "), false);
-            render_thumbstick(thumbstick_state.config.mode);
-        }
-#endif
-        // Host Keyboard LED Status
-        led_t led_state = host_keyboard_led_state();
-        oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR("       "), false);
-        oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false);
-        oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-    } else {
-        // QMK Logo and version information
-        render_qmk_logo();
-        oled_write_P(PSTR("\n      Kyria v1.0\n"), false);
-    }
-}
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/oled_utils.h b/keyboards/splitkb/kyria/keymaps/gotham/oled_utils.h
deleted file mode 100644
index 7e3bf44c82c..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/oled_utils.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "keycodes.h"
-
-#ifdef ENCODER_ENABLE
-#    include "encoder_utils.h"
-#endif
-
-#ifdef THUMBSTICK_ENABLE
-#    include "thumbstick.h"
-#endif
-
-void render_kyria_logo(void);
-
-void render_layer(void);
-
-#ifdef ENCODER_ENABLE
-void render_encoder(encoder_mode_t mode);
-#endif
-
-#ifdef THUMBSTICK_ENABLE
-void render_thumbstick(thumbstick_mode_t mode);
-#endif
-
-void render_status(void);
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/rules.mk b/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
deleted file mode 100644
index 00b2868c1f0..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-CONSOLE_ENABLE     = yes  # Console for debug
-ENCODER_ENABLE     = yes  # ENables the use of one or more encoders
-RGBLIGHT_ENABLE    = yes  # Enable keyboard RGB underglow
-MOUSEKEY_ENABLE    = no   # Mouse keys
-OLED_ENABLE = yes
-THUMBSTICK_ENABLE  = yes  # Enables analog thumbstick code
-
-ifeq ($(strip $(ENCODER_ENABLE)), yes)
-	SRC += encoder_utils.c
-endif
-
-ifeq ($(strip $(OLED_ENABLE)), yes)
-	SRC += oled_utils.c
-endif
-
-ifeq ($(strip $(THUMBSTICK_ENABLE)), yes)
-    ANALOG_DRIVER_REQUIRED = yes
-    POINTING_DEVICE_ENABLE = yes
-    POINTING_DEVICE_DRIVER = custom
-    OPT_DEFS += -DTHUMBSTICK_ENABLE
-	SRC += thumbstick.c
-endif
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.c b/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.c
deleted file mode 100644
index bb307b149f1..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.c
+++ /dev/null
@@ -1,195 +0,0 @@
-#include "thumbstick.h"
-
-void thumbstick_init(void) {
-    thumbstickTimer       = 0;
-    thumbstickScrollTimer = 0;
-
-    thumbstick_state.config.mode           = THUMBSTICK_MODE_MOUSE;
-    thumbstick_state.config.deadZone       = THUMBSTICK_DEAD_ZONE;
-    thumbstick_state.config.fineZone       = THUMBSTICK_FINE_ZONE;
-    thumbstick_state.config.speed          = THUMBSTICK_SPEED;
-    thumbstick_state.config.fineSpeed      = THUMBSTICK_FINE_SPEED;
-    thumbstick_state.config.axisSeparation = THUMBSTICK_AXIS_SEPARATION;
-    thumbstick_state.config.eightAxis      = THUMBSTICK_EIGHT_AXIS;
-
-#if defined THUMBSTICK_DEBUG
-    rawX               = 0;
-    rawY               = 0;
-    distX              = 0;
-    distY              = 0;
-    thumbstickLogTimer = 0;
-#endif
-}
-
-// Axis-level wrapper to read raw value, do logging and calculate speed
-int16_t thumbstick_get_component(uint8_t pin) {
-    uint16_t analogValue = analogReadPin(pin);
-    // Compute direction
-    bool directionIsPositive = (analogValue > THUMBSTICK_RANGE_CENTER);
-    // Compute distance from the center
-    uint16_t distance = directionIsPositive ? (analogValue - THUMBSTICK_RANGE_CENTER) : (THUMBSTICK_RANGE_CENTER - analogValue);
-#if defined THUMBSTICK_DEBUG
-    if (pin == THUMBSTICK_PIN_X) {
-        rawX  = analogValue;
-        distX = distance;
-    } else {
-        rawY  = analogValue;
-        distY = distance;
-    }
-#endif
-    // Compute component (range of [0 to 1023])
-    return directionIsPositive ? distance : -(int16_t)distance;
-}
-
-void thumbstick_mode_set(thumbstick_mode_t mode) { thumbstick_state.config.mode = mode; }
-
-thumbstick_mode_t thumbstick_mode_get(void) { return thumbstick_state.config.mode; }
-
-void thumbstick_mode_cycle(bool reverse) {
-    thumbstick_mode_t mode = thumbstick_mode_get();
-    if (reverse) {
-        mode = (mode == 0) ? (_THUMBSTICK_MODE_LAST - 1) : (mode - 1);
-    } else {
-        mode = (mode == (_THUMBSTICK_MODE_LAST - 1)) ? 0 : (mode + 1);
-    }
-    thumbstick_mode_set(mode);
-}
-
-// Get mouse speed
-int16_t thumbstick_get_mouse_speed(int16_t component) {
-    int16_t  maxSpeed;
-    uint16_t distance = abs(component);
-    if (distance > THUMBSTICK_FINE_ZONE) {
-        maxSpeed = THUMBSTICK_SPEED;
-    } else if (distance > THUMBSTICK_DEAD_ZONE) {
-        maxSpeed = THUMBSTICK_FINE_SPEED;
-    } else {
-        return 0;
-    }
-    return (float)maxSpeed * component / THUMBSTICK_RANGE_CENTER;
-}
-
-// Fix direction within one of 8 axes (or 4 if 8-axis is disabled)
-thumbstick_direction_t thumbstick_get_discretized_direction(thumbstick_vector_t vector, float axisSeparation, bool eightAxis) {
-    thumbstick_direction_t direction;
-    uint16_t               absX                = abs(vector.x);
-    uint16_t               absY                = abs(vector.y);
-    uint16_t               maxComponent        = (absX > absY) ? absX : absY;
-    bool                   insideDeadZone      = (maxComponent <= THUMBSTICK_DEAD_ZONE);
-    bool                   outsideDiagonalZone = ((abs(absX - absY) / (float)maxComponent) >= axisSeparation);
-    if (insideDeadZone) {
-        direction.up = direction.down = direction.left = direction.right = false;
-    } else {
-        direction.up    = (vector.y < 0);
-        direction.down  = (vector.y > 0);
-        direction.left  = (vector.x < 0);
-        direction.right = (vector.x > 0);
-        // Let only the dominant direction remain under the right conditions
-        if (outsideDiagonalZone || !eightAxis) {
-            if (absX > absY) {
-                direction.up = direction.down = false;
-            } else {
-                direction.left = direction.right = false;
-            }
-        }
-    }
-    return direction;
-}
-
-thumbstick_direction_t scrollDirection;  // Declaring global to save stack space
-void                   thumbstick_process(void) {
-    if (timer_elapsed(thumbstickTimer) > THUMBSTICK_TIMEOUT) {
-        thumbstickTimer = timer_read();
-#ifndef THUMBSTICK_FLIP_X
-        thumbstick_state.vector.x = thumbstick_get_component(THUMBSTICK_PIN_X);
-#else
-        thumbstick_state.vector.x = -thumbstick_get_component(THUMBSTICK_PIN_X);
-#endif
-#ifndef THUMBSTICK_FLIP_Y
-        thumbstick_state.vector.y = thumbstick_get_component(THUMBSTICK_PIN_Y);
-#else
-        thumbstick_state.vector.y = -thumbstick_get_component(THUMBSTICK_PIN_Y);
-#endif
-        switch (thumbstick_state.config.mode) {
-            case THUMBSTICK_MODE_MOUSE:
-                thumbstick_state.report.x = thumbstick_get_mouse_speed(thumbstick_state.vector.x);
-                thumbstick_state.report.y = thumbstick_get_mouse_speed(thumbstick_state.vector.y);
-                break;
-            case THUMBSTICK_MODE_ARROWS:
-                thumbstick_state.direction = thumbstick_get_discretized_direction(thumbstick_state.vector, thumbstick_state.config.axisSeparation, thumbstick_state.config.eightAxis);
-                break;
-            case THUMBSTICK_MODE_SCROLL:
-                if (timer_elapsed(thumbstickScrollTimer) > THUMBSTICK_SCROLL_TIMEOUT) {
-                    thumbstickScrollTimer     = timer_read();
-                    scrollDirection           = thumbstick_get_discretized_direction(thumbstick_state.vector, thumbstick_state.config.axisSeparation, false);
-                    thumbstick_state.report.v = (scrollDirection.up || scrollDirection.down) ? (scrollDirection.up ? THUMBSTICK_SCROLL_SPEED : -THUMBSTICK_SCROLL_SPEED) : 0;
-                    thumbstick_state.report.h = (scrollDirection.left || scrollDirection.right) ? (scrollDirection.left ? -THUMBSTICK_SCROLL_SPEED : THUMBSTICK_SCROLL_SPEED) : 0;
-                } else {
-                    thumbstick_state.report.v = thumbstick_state.report.h = 0;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-}
-
-void update_keycode_status(uint16_t keycode, bool last, bool current) {
-    if (last != current) {
-        if (current) {
-            register_code16(keycode);
-        } else {
-            unregister_code16(keycode);
-        }
-    }
-}
-
-void pointing_device_init(void) { thumbstick_init(); }
-
-bool pointing_device_task(void) {
-    report_mouse_t report = pointing_device_get_report();
-
-    if (!isLeftHand) {
-        thumbstick_process();
-        switch (thumbstick_state.config.mode) {
-            case THUMBSTICK_MODE_MOUSE:
-                report.x = thumbstick_state.report.x;
-                report.y = thumbstick_state.report.y;
-#ifdef THUMBSTICK_DEBUG
-                if (timer_elapsed(thumbstickLogTimer) > 100) {
-                    thumbstickLogTimer = timer_read();
-                    uprintf("Raw (%d, %d); Dist (%u, %u); Vec (%d, %d);\n", rawX, rawY, distX, distY, thumbstick_state.vector.x, thumbstick_state.vector.y);
-                }
-#endif
-                break;
-            case THUMBSTICK_MODE_ARROWS:
-                update_keycode_status(KC_UP, thumbstick_state.lastDirection.up, thumbstick_state.direction.up);
-                update_keycode_status(KC_DOWN, thumbstick_state.lastDirection.down, thumbstick_state.direction.down);
-                update_keycode_status(KC_LEFT, thumbstick_state.lastDirection.left, thumbstick_state.direction.left);
-                update_keycode_status(KC_RIGHT, thumbstick_state.lastDirection.right, thumbstick_state.direction.right);
-                thumbstick_state.lastDirection = thumbstick_state.direction;
-#ifdef THUMBSTICK_DEBUG
-                if (timer_elapsed(thumbstickLogTimer) > 100) {
-                    thumbstickLogTimer = timer_read();
-                    uprintf("Up %d; Down %d; Left: %d; Right %d; Vec (%d, %d);\n", direction.up, direction.down, direction.left, direction.right, thumbstick_state.vector.x, thumbstick_state.vector.y);
-                }
-#endif
-                break;
-            case THUMBSTICK_MODE_SCROLL:
-                report.v = thumbstick_state.report.v;
-                report.h = thumbstick_state.report.h;
-#ifdef THUMBSTICK_DEBUG
-                if (timer_elapsed(thumbstickLogTimer) > 100) {
-                    thumbstickLogTimer = timer_read();
-                    uprintf("Scroll (%d, %d)\n", report.h, report.v);
-                }
-#endif
-                break;
-            default:
-                break;
-        }
-    }
-
-    pointing_device_set_report(report);
-    return pointing_device_send();
-}
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.h b/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.h
deleted file mode 100644
index aff939c746c..00000000000
--- a/keyboards/splitkb/kyria/keymaps/gotham/thumbstick.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#pragma once
-
-typedef enum {
-    THUMBSTICK_MODE_MOUSE = 0,
-    THUMBSTICK_MODE_ARROWS,
-    THUMBSTICK_MODE_SCROLL,
-    _THUMBSTICK_MODE_LAST  // Do not use, except for looping through enum values
-} thumbstick_mode_t;
-
-// Parameters
-#define THUMBSTICK_DEAD_ZONE 90   // Values below this are ignored (deadzone)
-#define THUMBSTICK_FINE_ZONE 180  // Values below this enable fine movement
-
-#define THUMBSTICK_MODE THUMBSTICK_MODE_MOUSE
-#define THUMBSTICK_SPEED 256
-#define THUMBSTICK_FINE_SPEED 96
-#define THUMBSTICK_SCROLL_SPEED 1
-
-#define THUMBSTICK_EIGHT_AXIS true
-#define THUMBSTICK_AXIS_SEPARATION 0.5f
-
-// Implicit and derived constants
-#define THUMBSTICK_TIMEOUT 10          // Mouse report throttling time in ms
-#define THUMBSTICK_SCROLL_TIMEOUT 200  // Mouse scroll throttling time in ms
-#define THUMBSTICK_RANGE_START 0
-#define THUMBSTICK_RANGE_STOP 1023
-#define THUMBSTICK_RANGE_CENTER (THUMBSTICK_RANGE_STOP - THUMBSTICK_RANGE_START + 1) / 2
-#define THUMBSTICK_RANGE_MOVEMENT (THUMBSTICK_RANGE_CENTER - THUMBSTICK_DEAD_ZONE)
-
-#include "timer.h"
-#include "analog.h"
-#include "split_util.h"
-#include "pointing_device.h"
-
-#if defined THUMBSTICK_DEBUG
-#    include "print.h"
-uint16_t rawX;
-uint16_t rawY;
-uint16_t distX;
-uint16_t distY;
-uint16_t thumbstickLogTimer;
-#endif
-
-typedef struct {
-    thumbstick_mode_t mode;
-    uint16_t          deadZone;
-    uint16_t          fineZone;
-    uint16_t          speed;
-    uint16_t          fineSpeed;
-    float             axisSeparation;
-    bool              eightAxis;
-} thumbstick_config_t;
-
-typedef struct {
-    int16_t x;
-    int16_t y;
-} thumbstick_vector_t;
-
-typedef struct {
-    bool up;
-    bool right;
-    bool down;
-    bool left;
-} thumbstick_direction_t;
-
-typedef struct {
-    thumbstick_config_t    config;
-    thumbstick_vector_t    vector;
-    thumbstick_direction_t direction;
-    thumbstick_direction_t lastDirection;
-    report_mouse_t         report;
-} thumbstick_state_t;
-
-uint16_t thumbstickTimer;
-uint16_t thumbstickScrollTimer;
-
-thumbstick_state_t thumbstick_state;
-
-void thumbstick_mode_set(thumbstick_mode_t mode);
-
-thumbstick_mode_t thumbstick_mode_get(void);
-
-void thumbstick_mode_cycle(bool reverse);
-
-void thumbstick_init(void);
-
-// Axis-level wrapper to read raw value, do logging and calculate speed
-int16_t thumbstick_get_component(uint8_t pin);
-
-// Get mouse speed
-int16_t thumbstick_get_mouse_speed(int16_t component);
-
-// Fix direction within one of 8 axes (or 4 if 8-axis is disabled)
-thumbstick_direction_t thumbstick_get_discretized_direction(thumbstick_vector_t vector, float axisSeparation, bool eightAxis);
-
-void thumbstick_process(void);
-
-void update_keycode_status(uint16_t keycode, bool last, bool current);
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/config.h b/keyboards/splitkb/kyria/keymaps/j-inc/config.h
deleted file mode 100644
index dc7d9610dd3..00000000000
--- a/keyboards/splitkb/kyria/keymaps/j-inc/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-  #define OLED_TIMEOUT 300000
-#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
-#define SPLIT_USB_TIMEOUT 1000
-
-#define MASTER_RIGHT
-#define ENCODER_DIRECTION_FLIP
-
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_ONESHOT
-#define OLED_FONT_END 127
-
-
-#ifdef RGBLIGHT_ENABLE
-    #define RGBLIGHT_LED_MAP {0,1,2,9,8,7,4,3,5,6,19,18,17,10,11,12,15,16,14,13} // Orients Kyria LEDs to a circle around both halves.
-    //#define RBGLIGHT_LED_MAP {9,8,6,7,5,3,2,4,1,0,10,12,13,11,14,16,17,15,18,19} // Orients Kyria LEDs for a left half-right half columnar progression.
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    //#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-    #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c b/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c
deleted file mode 100644
index f193c6e00c2..00000000000
--- a/keyboards/splitkb/kyria/keymaps/j-inc/keymap.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-#include <stdio.h>
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-
-char wpm_str[10];
-
-enum layers {
-    _QWERTY,
-    _2WERTY, //pronounced "twerty," obviously
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |RAIS/ESC|   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  BKSP  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Tab     |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  ' "   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | CTRL   |   Z  |   X  |   C  |   V  |   B  |Enter |Ctrl  |  |Ctrl  |(2u)  |   N  |   M  | ,  < | . >  | /  ? |  - _   |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        | TG(1)| Alt  | Win  | Shift| Back |  | Enter| Space| Win  | Alt  |TG(3) |
- *                        |      |      |      | Lower| space|  | Lower| Raise|      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_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_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_LCTL,   KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,    KC_ENT,  KC_LCTL,       KC_RCTL, _______,     KC_N,    KC_M,   KC_COMM,  KC_DOT,  KC_SLSH, KC_MINS,
-                                 TG(1), KC_LALT, KC_LGUI, KC_LSFT,  KC_BSPC,      LT(3, KC_ENT), LT(2, KC_SPC), KC_RGUI,  KC_RALT, TG(2)
-    ),
-/*
- * This layer exists to change encoder functions.
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_2WERTY] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 KC_TRNS, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Lower Layer: numpad and arrow
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |   7  |   8  |  9   |  0   |                              | PGUP |      |  UP  |      |      |   Del
-   |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * | CAPS   |      |   4  |   5  |  6   | Tab  |                              | PGDN | Left | Down | Right|      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |   1  |  2   |  3   | Ent  |      |      |  |      |      |      | LBRC | RBRC |      |   |\ |  +=    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      | Tab  | Ent  |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-     [_LOWER] = LAYOUT(
-        _______, _______,    KC_7,    KC_8,    KC_9,    KC_0,                                            KC_PGUP, _______,   KC_UP, _______, _______,  KC_DEL,
-        KC_CAPS, _______,    KC_4,    KC_5,    KC_6,  KC_TAB,                                            KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-        KC_LSFT,    KC_0,    KC_1,    KC_2,    KC_3,  KC_ENT,   KC_TRNS,  KC_TRNS,       MO(4), _______, KC_LBRC, KC_RBRC, _______, _______, KC_BSLS,  KC_EQL,
-                                   KC_TRNS,    KC_TAB,  KC_ENT, KC_TRNS,  KC_TRNS,     KC_TRNS, KC_TRNS, _______, _______, _______
-    ),
-/*
- * Raise Layer: F keys and media
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              |  F9  | F10  |  F11 |  F12 |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      | Prev | Play | Next | VolUp|                              | F5   | F6   | F7   | F8   |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      | Mute | VolDn|      |      |  |      |      | F1   | F2   | F3   |  F4  |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_RAISE] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                       KC_F9,  KC_F10,  KC_F11, KC_F12, _______, _______,
-      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU,                                       KC_F5,   KC_F6,   KC_F7,  KC_F8, _______, _______,
-      _______, _______, _______, _______, KC_MUTE, KC_VOLD, _______, _______, _______, _______,   KC_F1,   KC_F2,   KC_F3,  KC_F4, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_TRNS
-    ),
-/*
- * Adjust Layer: Function keys, RGB
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        | F1   |  F2  | F3   | F4   | F5   |                              | F6   | F7   |  F8  | F9   | F10  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | VAI  | SAI  | HUI  | SPI  | MOD  |                              |      |      |      | F11  | F12  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        | VID  | SAD  | HUD  | SPD  | RMOD |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_ADJUST] = LAYOUT(
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-      RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, RGB_SPI, RGB_MOD,                                     _______, _______, _______, KC_F11,  KC_F12,  _______,
-      _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_SPD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 KC_TRNS, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-static void render_status(void) {
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR("QWERTY"), false);
-            break;
-        case _2WERTY:
-            oled_write_P(PSTR("2WERTY"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Numpad"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("F Keys"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("RGB   "), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undefined"), false);
-    }
-
-    //Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("       "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR("       "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRL") : PSTR("       "), false);
-}
-
-
-// WPM-responsive animation stuff here
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 40 // below this wpm value your animation will idle
-
-// #define PREP_FRAMES 1 // uncomment if >1
-
-#define TAP_FRAMES 2
-#define TAP_SPEED 60 // above this wpm value typing animation to triggere
-
-#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
-// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
-uint8_t current_tap_frame = 0;
-
-// Images credit j-inc(/James Incandenza) and pixelbenny. Credit to obosob for initial animation approach.
-static void render_anim(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-        {
-        0,  0,126,126, 24, 60,102, 66,  0, 12, 28,112,112, 28, 12,  0,116,116, 20, 20,124,104,  0,124,124,  0,112,120, 44, 36,124,124,0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  4,  4,  4,  8, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,192, 96, 48, 24, 12,132,198, 98, 35, 51, 17,145,113,241,113,145, 17, 51, 35, 98,198,132, 12, 24, 48, 96,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,100,130,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,252, 15,  1,  0,248, 14, 31,109,140,148,148,164,166,249,224,255,224,249,166,164,148,148,140,109, 31, 14,248,  0,  1, 15,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 56,  4,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-        0,  0, 31,120,192,  0, 15, 56,124,219,152, 20, 20, 18, 50,207,  3,255,  3,207, 50, 18, 20, 20,152,219,124, 56, 15,  0,192,120, 31, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 17, 11, 14, 12, 24, 16, 49, 35, 98,102, 68, 68, 71, 71, 71, 68, 68,102, 98, 35, 49, 16, 24, 12,  6,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,126,126, 24, 60,102, 66,  0, 12, 28,112,112, 28, 12,  0,116,116, 20, 20,124,104,  0,124,124,  0,112,120, 44, 36,124,124,0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16, 16,  8,  8,  4,  4,  4,  8, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,192, 96, 48, 24, 12,132,198, 98, 35, 51, 17,145,113,241,113,145, 17, 51, 35, 98,198,132, 12, 24, 48, 96,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,100,130,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,252, 15,  1,  0,248, 14, 31,109,140,148,148,164,166,249,224,255,224,249,166,164,148,148,140,109, 31, 14,248,  0,  1, 15,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 56,  4,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-        0,  0, 31,120,192,  0, 15, 56,124,219,152, 20, 20, 18, 50,207,  3,255,  3,207, 50, 18, 20, 20,152,219,124, 56, 15,  0,192,120, 31, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 17, 11, 14, 12, 24, 16, 49, 35, 98,102, 68, 68, 71, 71, 71, 68, 68,102, 98, 35, 49, 16, 24, 12,  6,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,126,126, 24, 60,102, 66,  0, 12, 28,112,112, 28, 12,  0,116,116, 20, 20,124,104,  0,124,124,  0,112,120, 44, 36,124,124,0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16,  8,  4,  2,  2,  4, 24, 96,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,192, 96, 48, 24, 12,132,198, 98, 35, 51, 17,145,113,241,113,145, 17, 51, 35, 98,198,132, 12, 24, 48, 96,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 60,194,  1,  1,  2,  2,  4,  4,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96, 96,  0,129,130,130,132,  8, 16, 32, 64,128,  0,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,252, 15,  1,  0,248, 14, 31,109,140,148,148,164,166,249,224,255,224,249,166,164,148,148,140,109, 31, 14,248,  0,  1, 15,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 25,  6,  0,  0,  0,  0,  0,  0,  0, 24, 24, 24, 27,  3,  0, 64,160, 34, 36, 20, 18, 18, 18, 11,  8,  8,  8,  8,  5,  5,  9,  9, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-        0,  0, 31,120,192,  0, 15, 56,124,219,152, 20, 20, 18, 50,207,  3,255,  3,207, 50, 18, 20, 20,152,219,124, 56, 15,  0,192,120, 31, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 17, 11, 14, 12, 24, 16, 49, 35, 98,102, 68, 68, 71, 71, 71, 68, 68,102, 98, 35, 49, 16, 24, 12,  6,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,126,126, 24, 60,102, 66,  0, 12, 28,112,112, 28, 12,  0,116,116, 20, 20,124,104,  0,124,124,  0,112,120, 44, 36,124,124,0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,192, 96, 48, 24, 12,132,198, 98, 35, 51, 17,145,113,241,113,145, 17, 51, 35, 98,198,132, 12, 24, 48, 96,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,252, 15,  1,  0,248, 14, 31,109,140,148,148,164,166,249,224,255,224,249,166,164,148,148,140,109, 31, 14,248,  0,  1, 15,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-        0,  0, 31,120,192,  0, 15, 56,124,219,152, 20, 20, 18, 50,207,  3,255,  3,207, 50, 18, 20, 20,152,219,124, 56, 15,  0,192,120, 31, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 17, 11, 14, 12, 24, 16, 49, 35, 98,102, 68, 68, 71, 71, 71, 68, 68,102, 98, 35, 49, 16, 24, 12,  6,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,126,126, 24, 60,102, 66,  0, 12, 28,112,112, 28, 12,  0,116,116, 20, 20,124,104,  0,124,124,  0,112,120, 44, 36,124,124,0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  4,  2,  2,  2,  4, 56, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,192, 96, 48, 24, 12,132,198, 98, 35, 51, 17,145,113,241,113,145, 17, 51, 35, 98,198,132, 12, 24, 48, 96,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28,226,  1,  1,  2,  2,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,192,193,193,194,  4,  8, 16, 32, 64,128,  0,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,252, 15,  1,  0,248, 14, 31,109,140,148,148,164,166,249,224,255,224,249,166,164,148,148,140,109, 31, 14,248,  0,  1, 15,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0,  0,  0,  0,  0,  0, 12, 12, 12, 13,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-        0,  0, 31,120,192,  0, 15, 56,124,219,152, 20, 20, 18, 50,207,  3,255,  3,207, 50, 18, 20, 20,152,219,124, 56, 15,  0,192,120, 31, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  2,  2,  4,  4,  8,  8,  8,  8,  8,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 17, 11, 14, 12, 24, 16, 49, 35, 98,102, 68, 68, 71, 71, 71, 68, 68,102, 98, 35, 49, 16, 24, 12,  6,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        }
-    };
-    static const char PROGMEM prep[][ANIM_SIZE] = {
-        {
-        0,  0,126,126, 24, 60,102, 66,  0, 12, 28,112,112, 28, 12,  0,116,116, 20, 20,124,104,  0,124,124,  0,112,120, 44, 36,124,124,0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,192, 96, 48, 24, 12,132,198, 98, 35, 51, 17,145,113,241,113,145, 17, 51, 35, 98,198,132, 12, 24, 48, 96,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,129,128,128,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,  0,  1,225, 26,  6,  9, 49, 53,  1,138,124,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,252, 15,  1,  0,248, 14, 31,109,140,148,148,164,166,249,224,255,224,249,166,164,148,148,140,109, 31, 14,248,  0,  1, 15,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0, 24,  6,  5,152,153,132,195,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  4,  4,  4,  4,  2,  2,  2,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-        0,  0, 31,120,192,  0, 15, 56,124,219,152, 20, 20, 18, 50,207,  3,255,  3,207, 50, 18, 20, 20,152,219,124, 56, 15,  0,192,120, 31, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 17, 11, 14, 12, 24, 16, 49, 35, 98,102, 68, 68, 71, 71, 71, 68, 68,102, 98, 35, 49, 16, 24, 12,  6,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        }
-    };
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-        {
-        0,  0,126,126, 24, 60,102, 66,  0, 12, 28,112,112, 28, 12,  0,116,116, 20, 20,124,104,  0,124,124,  0,112,120, 44, 36,124,124,0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,248,248,248,248,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,192, 96, 48, 24, 12,132,198, 98, 35, 51, 17,145,113,241,113,145, 17, 51, 35, 98,198,132, 12, 24, 48, 96,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,129,128,128,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,  0,  1,  1,  2,  4,  8, 16, 32, 67,135,  7,  1,  0,184,188,190,159, 95, 95, 79, 76, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,252, 15,  1,  0,248, 14, 31,109,140,148,148,164,166,249,224,255,224,249,166,164,148,148,140,109, 31, 14,248,  0,  1, 15,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0, 24,  6,  5,152,153,132, 67,124, 65, 65, 64, 64, 32, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  8,  8, 16, 16, 16, 16, 16, 17, 15,  1, 61,124,252,252,252,252,252, 60, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-        0,  0, 31,120,192,  0, 15, 56,124,219,152, 20, 20, 18, 50,207,  3,255,  3,207, 50, 18, 20, 20,152,219,124, 56, 15,  0,192,120, 63, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,  2,  2,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 17, 11, 14, 12, 24, 16, 49, 35, 98,102, 68, 68, 71, 71, 71, 68, 68,102, 98, 35, 49, 16, 24, 12,  6,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-        {
-        0,  0,126,126, 24, 60,102, 66,  0, 12, 28,112,112, 28, 12,  0,116,116, 20, 20,124,104,  0,124,124,  0,112,120, 44, 36,124,124,0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,128, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  4,  2,  1,  1,  2, 12, 48, 64,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,128,
-        0,  0,  0,  0,192, 96, 48, 24, 12,132,198, 98, 35, 51, 17,145,113,241,113,145, 17, 51, 35, 98,198,132, 12, 24, 48, 96,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,225,  0,  0,  1,  1,  2,  2,  1,  0,  0,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0, 48, 48,  0,  0,  1,225, 26,  6,  9, 49, 53,  1,138,124,  0,  0,128,128,128,128, 64, 64, 64, 64, 32, 32, 32, 32, 16, 16, 16, 16,  8,  8,  8,  8,  8,196,  4,196,  4,196,  2,194,  2,194,  1,  1,  1,  1,  0,  0,  0,
-        0,  0,252, 15,  1,  0,248, 14, 31,109,140,148,148,164,166,249,224,255,224,249,166,164,148,148,140,109, 31, 14,248,  0,  1, 15,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,112, 12,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0, 64,160, 33, 34, 18, 17, 17, 17,  9,  8,  8,  8,  8,  4,  4,  4,  4,  4,  4,  2,  2,  2,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,170,170,255,255,195,191,127,  3,127,191,195,255,255,170,170,  0,  0,  0,  0,
-        0,  0, 31,120,192,  0, 15, 56,124,219,152, 20, 20, 18, 50,207,  3,255,  3,207, 50, 18, 20, 20,152,219,124, 56, 15,  0,192,120, 31, 16, 16, 16, 16,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,  2,  3,122,122,121,121,121,121, 57, 49,  2,  2,  4,  4,  8,  8,  8,136,136,135,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,130,135, 31,  7,159,  7, 28,  7,159,  7,159,  7,  2,130,  0,  0,  0,  0,
-        32, 16, 16, 16, 17, 11, 14, 12, 24, 16, 49, 35, 98,102, 68, 68, 71, 71, 71, 68, 68,102, 98, 35, 49, 16, 24, 12,  6,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,120,124,254,255, 63,  7,  0,  0,  0,  0,255,255,127,127, 63, 62, 28, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  8, 23,  0, 15,  1,  2,  1, 15,  0, 15,  2,  5,  8
-        },
-    };
-
-    //assumes 1 frame prep stage
-    void animation_phase(void) {
-        if(get_current_wpm() <=IDLE_SPEED){
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-         }
-         if(get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED){
-             // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
-             oled_write_raw_P(prep[0], ANIM_SIZE);  // remove if IDLE_FRAMES >1
-         }
-         if(get_current_wpm() >=TAP_SPEED){
-             current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-             oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-         }
-    }
-    if(get_current_wpm() != 000) {
-        oled_on(); // not essential but turns on animation OLED with any alpha keypress
-        if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {
-        if(timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-// static void render_skull(void) { // Helen Tseong (http://shewolfe.co/), the original artist behind the skull, sadly only allowing use of the skull for my personal use. Her (excellent) works are copyright her, and I claim no ownership. Reach out to her for permission!
-//     static const char PROGMEM skull[] = {
-//     };
-//      oled_write_raw_P(skull, 801);
-//  }
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        //render_skull();
-        //oled_set_cursor(7,6);
-        render_status();
-     // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_anim();
-        oled_set_cursor(0,6);
-        uint8_t n = get_current_wpm();
-        wpm_str[3] = '\0';
-        wpm_str[2] = '0' + n % 10;
-        wpm_str[1] = '0' + (n /= 10) % 10;
-        wpm_str[0] = '0' + n / 10 ;
-        oled_write_P(PSTR("       WPM: "), false);
-        oled_write(wpm_str, false);
-
-    }
-    return false;
-}
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    switch(get_highest_layer(layer_state)){
-        case 1:
-            if (clockwise) {
-                tap_code16(C(KC_TAB));
-            } else {
-                tap_code16(S(C(KC_TAB)));
-            }
-            break;
-        default:
-            if (clockwise) {
-                if (!is_alt_tab_active) {
-                    is_alt_tab_active = true;
-                    register_code(KC_LALT);
-                }
-                alt_tab_timer = timer_read();
-                tap_code16(KC_TAB);
-            } else {
-                tap_code16(S(KC_TAB));
-                }
-            break;
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-    if (is_alt_tab_active) {
-        if (timer_elapsed(alt_tab_timer) > 1250) {
-            unregister_code(KC_LALT);
-            is_alt_tab_active = false;
-            }
-        }
-}
-
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk b/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
deleted file mode 100644
index 7bcef000f3a..00000000000
--- a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-WPM_ENABLE = yes
-MOUSEKEY_ENABLE = no
-
-TAP_DANCE_ENABLE = no
-STENO_ENABLE = no
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
-KEY_LOCK_ENABLE = no
-AUDIO_ENABLE = no
-CONSOLE_ENABLE = no
-VELOCIKEY_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/config.h b/keyboards/splitkb/kyria/keymaps/jhelvy/config.h
deleted file mode 100644
index 518c9378e41..00000000000
--- a/keyboards/splitkb/kyria/keymaps/jhelvy/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#define ENCODER_RESOLUTION 2
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200
-#define AUTO_SHIFT_TIMEOUT 150
-
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 16
-#define MOUSEKEY_MAX_SPEED 2
-#define MOUSEKEY_WHEEL_MAX_SPEED 42
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 15
diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c b/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
deleted file mode 100644
index 55b0d85afc6..00000000000
--- a/keyboards/splitkb/kyria/keymaps/jhelvy/keymap.c
+++ /dev/null
@@ -1,203 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    QWERTY = 0,
-    HOTKEYS,
-    TEXT,
-    SELECT,
-    NUMBERS,
-};
-
-enum custom_keycodes {
-    SIG_PROF = SAFE_RANGE,
-    SIG_JOHN,
-    R_PIPE,
-    R_ASSIGN,
-    R_COLS,
-    R_IN,
-    TEX,
-    E_GMAIL,
-    E_GWU,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[QWERTY] = LAYOUT(LALT(KC_A), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LALT, KC_LCTL, KC_LGUI, MO(2), MO(4), KC_BSPC, KC_SPC, MO(1), KC_PGDN, TG(1)),
-
-[HOTKEYS] = LAYOUT(KC_F6, LGUI(LALT(KC_1)), LGUI(LALT(KC_2)), LCTL(KC_U), SGUI(KC_R), KC_F2, SGUI(KC_K), LCTL(KC_9), LCTL(KC_0), KC_F14, KC_F11, KC_F15, KC_F7, LGUI(LCTL(KC_A)), KC_F10, KC_LBRC, KC_RBRC, KC_F9, SIG_JOHN, LSFT(KC_TAB), KC_TAB, E_GMAIL, KC_F12, KC_F16, KC_F8, AS_TOGG, KC_NO, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, SIG_PROF, KC_F3, KC_F4, E_GWU, KC_F13, KC_F17, KC_F5, KC_NO, KC_LGUI, KC_LGUI, KC_LCTL, KC_BSPC, KC_SPC, KC_TRNS, KC_NO, KC_TRNS),
-
-[TEXT] = LAYOUT(LGUI(KC_BSPC), LGUI(KC_Q), LGUI(KC_W), KC_ESC, LGUI(KC_R), LGUI(KC_T), LCTL(KC_Y), LGUI(KC_LEFT), KC_UP, LGUI(KC_RGHT), KC_SCLN, R_PIPE, KC_BSPC, MO(3), LGUI(KC_S), LGUI(KC_C), LGUI(KC_V), LGUI(KC_X), KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV, KC_ENT, KC_F18, LGUI(KC_A), LGUI(KC_D), KC_F1, LGUI(KC_Z), LGUI(KC_Y), KC_NO, KC_NO, KC_NO, KC_NO, KC_BSPC, LGUI(KC_F), SGUI(KC_G), LGUI(KC_G), KC_BSLS, R_ASSIGN, KC_LALT, KC_LCTL, KC_LGUI, KC_TRNS, KC_NO, KC_BSPC, KC_SPC, KC_LGUI, KC_PGUP, KC_NO),
-
-[SELECT] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, SGUI(KC_LEFT), LSFT(KC_UP), SGUI(KC_RGHT), KC_NO, R_COLS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_RGHT), KC_NO, R_IN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LALT(LSFT(KC_LEFT)), LALT(LSFT(KC_RIGHT)), KC_NO, TEX, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSPC, KC_SPC, KC_LGUI, KC_NO, KC_NO),
-
-[NUMBERS] = LAYOUT(KC_NO, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), KC_EQL, KC_7, KC_8, KC_9, KC_TILD, KC_MINS, KC_NO, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_PLUS, KC_4, KC_5, KC_6, KC_COLN, KC_ENT, SC_LSPO, KC_NO, KC_NO, KC_CIRC, KC_AMPR, KC_ASTR, KC_NO, KC_NO, KC_NO, KC_NO, KC_MINS, KC_1, KC_2, KC_3, KC_SLSH, KC_PIPE, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_BSPC, KC_SPC, KC_0, KC_DOT, KC_COMM)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case SIG_PROF:
-        if (record->event.pressed) {
-            SEND_STRING("Cheers,\nProfessor Helveston");
-        } else {
-        }
-        break;
-
-    case SIG_JOHN:
-        if (record->event.pressed) {
-            SEND_STRING("Cheers,\nJohn");
-        } else {
-        }
-        break;
-
-    case R_PIPE:
-        if (record->event.pressed) {
-            SEND_STRING(" %>% ");
-        } else {
-        }
-        break;
-
-    case R_ASSIGN:
-        if (record->event.pressed) {
-            SEND_STRING(" <- ");
-        } else {
-        }
-        break;
-
-    case R_COLS:
-        if (record->event.pressed) {
-            SEND_STRING(".leftcol[\n]\n.rightcol[\n]\n");
-        } else {
-        }
-        break;
-
-    case R_IN:
-        if (record->event.pressed) {
-            SEND_STRING(" %in% ");
-        } else {
-        }
-        break;
-
-    case TEX:
-        if (record->event.pressed) {
-            SEND_STRING("\\text{}");
-        } else {
-        }
-        break;
-
-    case E_GMAIL:
-        if (record->event.pressed) {
-            SEND_STRING("john.helveston@gmail.com");
-        } else {
-        }
-        break;
-
-    case E_GWU:
-        if (record->event.pressed) {
-            SEND_STRING("jph@gwu.edu");
-        } else {
-        }
-        break;
-
-    }
-
-    return true;
-};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-static void render_kyria_logo(void) {
-    static const char PROGMEM kyria_logo[] = {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-        0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-    };
-    oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-}
-
-static void render_qmk_logo(void) {
-  static const char PROGMEM qmk_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-  oled_write_P(qmk_logo, false);
-}
-
-static void render_status(void) {
-    // QMK Logo and version information
-    render_qmk_logo();
-    oled_write_P(PSTR("       Kyria rev1.0\n\n"), false);
-
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case QWERTY:
-            oled_write_P(PSTR("QWERTY\n"), false);
-            break;
-        case HOTKEYS:
-            oled_write_P(PSTR("HOTKEYS\n"), false);
-            break;
-        case TEXT:
-            oled_write_P(PSTR("TEXT\n"), false);
-            break;
-        case SELECT:
-            oled_write_P(PSTR("SELECT\n"), false);
-            break;
-        case NUMBERS:
-            oled_write_P(PSTR("NUMBERS\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undefined\n"), false);
-    }
-
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_kyria_logo();
-    }
-    return false;
-}
-#endif
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (IS_LAYER_ON(HOTKEYS)) {
-        if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
-            tap_code(KC_VOLU);
-        }
-    } else if (IS_LAYER_ON(TEXT)) {
-        if (clockwise) {
-            tap_code(KC_MS_WH_LEFT);
-        } else {
-            tap_code(KC_MS_WH_RIGHT);
-        }
-    } else if (IS_LAYER_ON(NUMBERS)) {
-        if (clockwise) {
-            tap_code16(G(KC_MINS));
-        } else {
-            register_code(KC_LGUI);
-            tap_code(KC_EQL);
-            unregister_code(KC_LGUI);
-        }
-    } else {
-        if (clockwise) {
-            tap_code(KC_MS_WH_UP);
-        } else {
-            tap_code(KC_MS_WH_DOWN);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk b/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk
deleted file mode 100644
index 21b26a04a4b..00000000000
--- a/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTO_SHIFT_ENABLE = yes # Autoshift by holding down a key
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = no      # Enable keyboard RGB underglow
-LEADER_ENABLE = no        # Enable the Leader Key feature
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c b/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c
deleted file mode 100644
index 5c217ae65be..00000000000
--- a/keyboards/splitkb/kyria/keymaps/jimmysjolund/keymap.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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 layers {
-    _QWERTY = 0,
-    _DVORAK,
-    _COLEMAK_DH,
-    _NAV,
-    _SYM,
-    _FUNCTION,
-    _ADJUST,
-};
-
-
-// Aliases for readability
-#define QWERTY   DF(_QWERTY)
-#define COLEMAK  DF(_COLEMAK_DH)
-#define DVORAK   DF(_DVORAK)
-
-#define SYM      MO(_SYM)
-#define NAV      MO(_NAV)
-#define FKEYS    MO(_FUNCTION)
-#define ADJUST   MO(_ADJUST)
-
-#define CTL_ESC  MT(MOD_LCTL, KC_ESC)
-#define CTL_QUOT MT(MOD_RCTL, KC_QUOTE)
-#define CTL_MINS MT(MOD_RCTL, KC_MINUS)
-#define ALT_ENT  MT(MOD_LALT, KC_ENT)
-
-// Note: LAlt/Enter (ALT_ENT) is not the same thing as the keyboard shortcut Alt+Enter.
-// The notation `mod/tap` denotes a key that activates the modifier `mod` when held down, and
-// produces the key `tap` when tapped (i.e. pressed and released).
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |Ctrl/' "|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  | [ {  |CapsLk|  |F-keys|  ] } |   N  |   M  | ,  < | . >  | /  ? | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
- *                        |      |      | Enter|      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-
-/*
- * jimmysjolund 2022-09-13
- *
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Esc   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  Tab   |   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  ' "   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |  Nav   |   Z  |   X  |   C  |   V  |   B  | [ {  | Alt  |  | Nav  |  ] } |   N  |   M  | ,  < | . >  | /  ? | Adjust |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Ctrl+ | LGUI | Shift|Bksp/ | Sym  |  |Enter | Space| AltGr|  ←   |  →   |
- *                        |  Alt |      |      | Ctrl |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-
-
-
-
-    [_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_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,
-     NAV    , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , KC_LBRC, KC_LALT,               NAV , KC_RBRC, KC_N,   KC_M ,KC_COMM, KC_DOT ,KC_SLSH, ADJUST,
-                                LCTL(KC_LALT) , KC_LGUI, KC_LSFT, LCTL_T(KC_BSPC), SYM,     KC_ENT, KC_SPC ,KC_ALGR, KC_LEFT, KC_RGHT
-    ),
-
-/*
- * Base Layer: Dvorak
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Tab   | ' "  | , <  | . >  |   P  |   Y  |                              |   F  |   G  |   C  |   R  |   L  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Ctrl/Esc|   A  |   O  |   E  |   U  |   I  |                              |   D  |   H  |   T  |   N  |   S  |Ctrl/- _|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift | ; :  |   Q  |   J  |   K  |   X  | [ {  |CapsLk|  |F-keys|  ] } |   B  |   M  |   W  |   V  |   Z  | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
- *                        |      |      | Enter|      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_DVORAK] = LAYOUT(
-     KC_TAB  ,KC_QUOTE,KC_COMM,  KC_DOT,   KC_P ,   KC_Y ,                                        KC_F,   KC_G ,  KC_C ,   KC_R ,  KC_L , KC_BSPC,
-     CTL_ESC , KC_A ,  KC_O   ,  KC_E  ,   KC_U ,   KC_I ,                                        KC_D,   KC_H ,  KC_T ,   KC_N ,  KC_S , CTL_MINS,
-     KC_LSFT ,KC_SCLN, KC_Q   ,  KC_J  ,   KC_K ,   KC_X , KC_LBRC,KC_CAPS,     FKEYS  , KC_RBRC, KC_B,   KC_M ,  KC_W ,   KC_V ,  KC_Z , KC_RSFT,
-                                 ADJUST, KC_LGUI, ALT_ENT, KC_SPC , NAV   ,     SYM    , KC_SPC ,KC_RALT, KC_RGUI, KC_APP
-    ),
-
-/*
- * Base Layer: Colemak DH
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Tab   |   Q  |   W  |   F  |   P  |   B  |                              |   J  |   L  |   U  |   Y  | ;  : |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Ctrl/Esc|   A  |   R  |   S  |   T  |   G  |                              |   M  |   N  |   E  |   I  |   O  |Ctrl/' "|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   D  |   V  | [ {  |CapsLk|  |F-keys|  ] } |   K  |   H  | ,  < | . >  | /  ? | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
- *                        |      |      | Enter|      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-
-/*
- * jimmysjolund 2022-09-10
- * Base Layer: Colemak DH
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Esc   |   Q  |   W  |   F  |   P  |   G  |                              |   J  |   L  |   U  |   Y  | ;  : |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  Tab   |   A  |   R  |   S  |   T  |   D  |                              |   H  |   N  |   E  |   I  |   O  |Ctrl/' "|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |  Sym   |   Z  |   X  |   C  |   V  |   B  | [ {  | Alt  |  |  Nav |  ] } |   K  |   M  | ,  < | . >  | /  ? | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LGUI |LShift| Bksp | Ctrl |  | Enter| Space| AltGr|  ←   |  →   |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-
-
-    [_COLEMAK_DH] = LAYOUT(
-     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 , CTL_QUOT,
-     SYM     , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , KC_LBRC, KC_LALT,     NAV    , KC_RBRC, KC_K,   KC_M ,KC_COMM, KC_DOT ,KC_SLSH, KC_RSFT,
-                                 ADJUST, KC_LGUI, KC_LSFT, KC_BSPC ,KC_LCTL,    KC_ENT , KC_SPC ,KC_ALGR, KC_LEFT, KC_RGHT
-    ),
-
-/*
- * Nav Layer: Media, navigation
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              | PgUp | Home |   ↑  | End  | VolUp| Delete |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  GUI |  Alt | Ctrl | Shift|      |                              | PgDn |  ←   |   ↓  |   →  | VolDn| Insert |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |ScLck |  |      |      | Pause|M Prev|M Play|M Next|VolMut| PrtSc  |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_NAV] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
-      _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
-      _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Sym Layer: Numbers and symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |    `   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   =    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |    ~   |  !   |  @   |  #   |  $   |  %   |                              |   ^  |  &   |  *   |  (   |  )   |   +    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |    |   |   \  |  :   |  ;   |  -   |  [   |  {   |      |  |      |   }  |   ]  |  _   |  ,   |  .   |  /   |   ?    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_SYM] = LAYOUT(
-      KC_GRV ,   KC_1 ,   KC_2 ,   KC_3 ,   KC_4 ,   KC_5 ,                                       KC_6 ,   KC_7 ,   KC_8 ,   KC_9 ,   KC_0 , KC_EQL ,
-     KC_TILD , KC_EXLM,  KC_AT , KC_HASH,  KC_DLR, KC_PERC,                                     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
-     KC_PIPE , KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_LCBR, _______, _______, KC_RCBR, KC_RBRC, KC_UNDS, KC_COMM,  KC_DOT, KC_SLSH, KC_QUES,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Function Layer: Function keys
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  F9  | F10  | F11  | F12  |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  F5  |  F6  |  F7  |  F8  |      |                              |      | Shift| Ctrl |  Alt |  GUI |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |  F1  |  F2  |  F3  |  F4  |      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_FUNCTION] = LAYOUT(
-      _______,  KC_F9 ,  KC_F10,  KC_F11,  KC_F12, _______,                                     _______, _______, _______, _______, _______, _______,
-      _______,  KC_F5 ,  KC_F6 ,  KC_F7 ,  KC_F8 , _______,                                     _______, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, _______,
-      _______,  KC_F1 ,  KC_F2 ,  KC_F3 ,  KC_F4 , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Adjust Layer: Default layer settings, RGB
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |QWERTY|      |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |Colmak|      |      |      |      |  |      |      |      | SAD  | HUD  | VAD  | RMOD |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_ADJUST] = LAYOUT(
-      _______, _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, _______,
-      _______, _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, _______,
-      _______, _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, _______,
-                                 _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
-    ),
-
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk b/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
deleted file mode 100644
index 7b3d2303508..00000000000
--- a/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/config.h b/keyboards/splitkb/kyria/keymaps/john-ezra/config.h
deleted file mode 100644
index 70b41675a39..00000000000
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 John Ezra
- *
- * 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 OLED_FONT_H "keyboards/splitkb/kyria/keymaps/john-ezra/glcdfont.c"
-#define OLED_FONT_END 255
-#define OLED_TIMEOUT 30000
-#define OLED_DISPLAY_128X64
-
-#ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_HUE_STEP 5
-  #define RGBLIGHT_SAT_STEP 5
-  #define RGBLIGHT_VAL_STEP 5
-  #define RGBLIGHT_LIMIT_VAL 150
-#endif
-
-#undef DEBOUNCE
-#define DEBOUNCE 1
-
-#define TAPPING_TERM 125
-
-#define SPLIT_WPM_ENABLE
-
-#define USB_POLLING_INTERVAL_MS 1
-
-#define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/glcdfont.c b/keyboards/splitkb/kyria/keymaps/john-ezra/glcdfont.c
deleted file mode 100644
index 86fb5d86e35..00000000000
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/glcdfont.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Copyright 2021 John Ezra
-*
-* 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 "progmem.h"
-
-static const unsigned char font[] PROGMEM = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-  0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-  0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-  0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-  0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-  0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-  0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-  0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-  0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-  0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-  0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-  0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-  0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-  0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-  0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-  0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-  0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-  0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-  0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-  0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-  0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-  0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-  0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-  0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-  0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-  0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-  0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-  0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-  0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-  0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-  0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-  0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-  0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-  0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-  0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-  0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-  0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-  0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-  0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-  0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-  0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-  0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-  0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-  0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-  0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-  0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-  0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-  0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-  0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-  0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-  0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-  0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-  0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-  0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-  0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-  0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-  0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-  0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-  0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-  0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-  0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-  0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-  0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-  0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-  0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-  0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-  0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-  0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-  0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-  0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-  0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-  0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-  0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-  0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-  0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-  0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-  0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-  0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-  0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-  0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-  0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-  0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-  0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-  0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-  0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-  0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-  0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-  0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-  0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-  0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-  0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-  0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-  0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-  0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-  0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-  0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-  0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-  0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-  0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-  0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-  0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-  0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-  0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-  0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-  0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-  0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-  0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-  0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-  0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-  0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-  0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-  0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-  0x00, 0xF0, 0x08, 0x24, 0x52, 0xE2,
-  0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
-  0x24, 0x22, 0x42, 0x82, 0x02, 0x02,
-  0x22, 0x22, 0x02, 0x02, 0xFE, 0x00,
-  0x00, 0xF0, 0x08, 0x04, 0x02, 0x82,
-  0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
-  0x04, 0x82, 0x42, 0x22, 0x12, 0x22,
-  0x42, 0x82, 0x02, 0x02, 0xFE, 0x00,
-  0x00, 0xF0, 0x08, 0x84, 0x42, 0x42,
-  0x82, 0x82, 0x42, 0x42, 0x42, 0x82,
-  0x04, 0x82, 0xC2, 0xE2, 0xF2, 0xE2,
-  0xC2, 0x82, 0x02, 0x02, 0xFE, 0x00,
-  0x00, 0xF0, 0x08, 0x44, 0x42, 0xF2,
-  0x42, 0x42, 0x42, 0xF2, 0x42, 0x42,
-  0x04, 0x82, 0xE2, 0x92, 0x92, 0x92,
-  0xE2, 0x82, 0x02, 0x02, 0xFE, 0x00,
-  0x00, 0xF0, 0x08, 0x84, 0x82, 0x02,
-  0x82, 0x02, 0x02, 0x82, 0x82, 0x02,
-  0x02, 0x02, 0x82, 0x82, 0x02, 0x02,
-  0xE2, 0x12, 0x12, 0xE2, 0x02, 0x62,
-  0x92, 0x92, 0x22, 0x02, 0xFE, 0x00,
-  0x00, 0xF0, 0x08, 0x04, 0xF2, 0x02,
-  0x02, 0x02, 0xF2, 0x02, 0x82, 0x02,
-  0x02, 0x02, 0x02, 0x02, 0x02, 0x22,
-  0xF2, 0x02, 0x02, 0xE2, 0x12, 0x12,
-  0x12, 0xE2, 0x02, 0x02, 0xFE, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x02, 0xFE, 0x00, 0x00, 0xF0, 0x08,
-  0x02, 0xFE, 0x00, 0x00, 0xF0, 0xF8,
-  0x00, 0x7F, 0x40, 0x44, 0x4A, 0x47,
-  0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
-  0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
-  0x44, 0x44, 0x40, 0x40, 0x7F, 0x00,
-  0x00, 0x7F, 0x40, 0x40, 0x41, 0x40,
-  0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
-  0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
-  0x4F, 0x41, 0x41, 0x40, 0x7F, 0x00,
-  0x00, 0x7F, 0x40, 0x41, 0x42, 0x42,
-  0x42, 0x41, 0x41, 0x42, 0x42, 0x41,
-  0x40, 0x40, 0x40, 0x4B, 0x4B, 0x4B,
-  0x40, 0x40, 0x40, 0x40, 0x7F, 0x00,
-  0x00, 0x7F, 0x40, 0x42, 0x42, 0x4F,
-  0x42, 0x42, 0x42, 0x4F, 0x42, 0x42,
-  0x40, 0x4F, 0x4F, 0x4F, 0x48, 0x4F,
-  0x4F, 0x4F, 0x40, 0x40, 0x7F, 0x00,
-  0x00, 0x7F, 0x40, 0x4F, 0x40, 0x4F,
-  0x40, 0x4F, 0x44, 0x4A, 0x4A, 0x4F,
-  0x48, 0x47, 0x48, 0x48, 0x45, 0x40,
-  0x47, 0x48, 0x48, 0x47, 0x40, 0x44,
-  0x48, 0x48, 0x47, 0x40, 0x7F, 0x00,
-  0x00, 0x7F, 0x40, 0x40, 0x47, 0x48,
-  0x47, 0x48, 0x47, 0x40, 0x4E, 0x40,
-  0x4F, 0x41, 0x41, 0x4E, 0x40, 0x48,
-  0x4F, 0x48, 0x40, 0x47, 0x48, 0x48,
-  0x48, 0x47, 0x40, 0x40, 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,
-  0x40, 0x7F, 0x00, 0x00, 0x7F, 0x40,
-  0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F,
-  0x00, 0xF0, 0xF8, 0xDC, 0xAE, 0x1E,
-  0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
-  0xDC, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-  0xDE, 0xDE, 0xFE, 0xFE, 0xFE, 0x00,
-  0x00, 0xF0, 0xF8, 0xFC, 0xFE, 0x7E,
-  0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
-  0xFC, 0x7E, 0x3E, 0x1E, 0x0E, 0x1E,
-  0x3E, 0x7E, 0xFE, 0xFE, 0xFE, 0x00,
-  0x00, 0xF0, 0xF8, 0x7C, 0xBE, 0xBE,
-  0x7E, 0x7E, 0xBE, 0xBE, 0xBE, 0x7E,
-  0xFC, 0x7E, 0x3E, 0x1E, 0x0E, 0x1E,
-  0x3E, 0x7E, 0xFE, 0xFE, 0xFE, 0x00,
-  0x00, 0xF0, 0xF8, 0xBC, 0xBE, 0x0E,
-  0xBE, 0xBE, 0xBE, 0x0E, 0xBE, 0xBE,
-  0xFC, 0x7E, 0x1E, 0x6E, 0x6E, 0x6E,
-  0x1E, 0x7E, 0xFE, 0xFE, 0xFE, 0x00,
-  0x00, 0xF0, 0xF8, 0x7C, 0x7E, 0xFE,
-  0x7E, 0xFE, 0xFE, 0x7E, 0x7E, 0xFE,
-  0xFE, 0xFE, 0x7E, 0x7E, 0xFE, 0xFE,
-  0x1E, 0xEE, 0xEE, 0x1E, 0xFE, 0x9E,
-  0x6E, 0x6E, 0xDE, 0xFE, 0xFE, 0x00,
-  0x00, 0xF0, 0xF8, 0xFC, 0x0E, 0xFE,
-  0xFE, 0xFE, 0x0E, 0xFE, 0x7E, 0xFE,
-  0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xDE,
-  0x0E, 0xFE, 0xFE, 0x1E, 0xEE, 0xEE,
-  0xEE, 0x1E, 0xFE, 0xFE, 0xFE, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xFE, 0xFE, 0x00, 0x00, 0xF0, 0x08,
-  0xFE, 0xFE, 0x00, 0x00, 0xF0, 0xF8,
-  0x00, 0x7F, 0x7F, 0x7B, 0x75, 0x78,
-  0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
-  0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
-  0x7B, 0x7B, 0x7F, 0x7F, 0x7F, 0x00,
-  0x00, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
-  0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
-  0x7E, 0x7E, 0x70, 0x70, 0x70, 0x70,
-  0x70, 0x7E, 0x7E, 0x7F, 0x7F, 0x00,
-  0x00, 0x7F, 0x7F, 0x7E, 0x7D, 0x7D,
-  0x7D, 0x7E, 0x7E, 0x7D, 0x7D, 0x7E,
-  0x7F, 0x7F, 0x7F, 0x74, 0x74, 0x74,
-  0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x00,
-  0x00, 0x7F, 0x7F, 0x7D, 0x7D, 0x70,
-  0x7D, 0x7D, 0x7D, 0x70, 0x7D, 0x7D,
-  0x7F, 0x70, 0x70, 0x70, 0x77, 0x70,
-  0x70, 0x70, 0x7F, 0x7F, 0x7F, 0x00,
-  0x00, 0x7F, 0x7F, 0x70, 0x7F, 0x70,
-  0x7F, 0x70, 0x7B, 0x75, 0x75, 0x70,
-  0x77, 0x78, 0x77, 0x77, 0x7A, 0x7F,
-  0x78, 0x77, 0x77, 0x78, 0x7F, 0x7B,
-  0x77, 0x77, 0x78, 0x7F, 0x7F, 0x00,
-  0x00, 0x7F, 0x7F, 0x7F, 0x78, 0x77,
-  0x78, 0x77, 0x78, 0x7F, 0x71, 0x7F,
-  0x70, 0x7E, 0x7E, 0x71, 0x7F, 0x77,
-  0x70, 0x77, 0x7F, 0x78, 0x77, 0x77,
-  0x77, 0x78, 0x7F, 0x7F, 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,
-  0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x40,
-  0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F,
-};
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
deleted file mode 100644
index 71af5f80bde..00000000000
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* Copyright 2021 John Ezra
-*
-* 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 kyria_layers {
-  _HNTS,
-  _GAME,
-  _NUMPAD,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-enum kyria_keycodes {
-  HNTS = SAFE_RANGE,
-  ESC_NUM,
-  LOWER,
-  RAISE,
-  MSS_CTL,
-  CPY_PST,
-  UNDO,
-  FIND
-};
-
-#define HNTS DF(_HNTS)
-#define GAME TG(_GAME)
-#define NUMPAD TG(_NUMPAD)
-#define MSS_CTL MT(MOD_LCTL, C(KC_UP))
-#define BSP_CMD MT(MOD_LGUI, KC_BSPC)
-#define TAB_CMD MT(MOD_LGUI, KC_TAB)
-#define SFT_ENT MT(MOD_LSFT, KC_ENT)
-#define ALT_ESC MT(MOD_LALT, KC_ESC)
-#define ALT_TAB A(KC_TAB)
-#define UNDO G(KC_Z)
-#define FIND G(KC_F)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * Default: HNTS
- *
- * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * |  Find |   Z   |   R   |   L   |   D   |   W   |                                  |   Y   |   P   |   U   |   X   |   Q   |  | \  |
- * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * |Cpy/Pst|   H   |   N   |   T   |   S   |   C   |                                  |   B   |   I   |   E   |   O   |   A   |  ` ~  |
- * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |  Undo |   K   |   V   |   M   |   F   |   G   |  Esc  |MssnCtl|  |MssnCtl|  Esc  |   J   |  ; :  |  , <  |  . >  |  / ?  |  ' "  |
- * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
- *                         | Numpad| Enter | Lower | Space | BSPC  |  |  Tab  | Shift | Raise |  Del  | Caps  |
- *                         `---------------------------------------'  `---------------------------------------'
- */
-
-[_HNTS] = LAYOUT(
-       FIND,    KC_Z,    KC_R,    KC_L,    KC_D,    KC_W,                                         KC_Y,    KC_P,    KC_U,    KC_X,    KC_Q, KC_BSLS,
-    CPY_PST,    KC_H,    KC_N,    KC_T,    KC_S,    KC_C,                                         KC_B,    KC_I,    KC_E,    KC_O,    KC_A,  KC_GRV,
-       UNDO,    KC_K,    KC_V,    KC_M,    KC_F,    KC_G, ALT_ESC, MSS_CTL,   MSS_CTL, ALT_ESC,   KC_J, KC_SCLN, KC_COMM,  KC_DOT, KC_SLSH, KC_QUOT,
-                                NUMPAD, SFT_ENT,   LOWER,  KC_SPC, BSP_CMD,   TAB_CMD, SFT_ENT,  RAISE,  KC_DEL, KC_CAPS
-),
-
-/*
- * Game: Gaming Layer
- *
- * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * |   0   |   Z   |   R   |   L   |   D   |   W   |                                  |   Y   |   P   |   U   |   X   |   Q   |  Esc  |
- * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * |   1   |   H   |   N   |   T   |   S   |   C   |                                  |   B   |   I   |   E   |   O   |   A   | Enter |
- * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |   2   |   K   |   V   |   M   |   F   |   G   |   8   |   9   |  |Default|  Esc  |   J   |  ; :  |  , <  |  . >  |  / ?  |Alt+Tab|
- * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
- *                         |   3   |   4   |   5   |   6   |   7   |  |  Tab  | Shift | Raise |  Del  | Caps  |
- *                         `---------------------------------------'  `---------------------------------------'
- */
-
-[_GAME] = LAYOUT(
-       KC_0,    KC_Z,    KC_R,    KC_L,    KC_D,    KC_W,                                         KC_Y,    KC_P,    KC_U,    KC_X,    KC_Q,  KC_ESC,
-       KC_1,    KC_H,    KC_N,    KC_T,    KC_S,    KC_C,                                         KC_B,    KC_I,    KC_E,    KC_O,    KC_A,  KC_ENT,
-       KC_2,    KC_K,    KC_V,    KC_M,    KC_F,    KC_G,    KC_8,    KC_9,      GAME, ALT_ESC,   KC_J, KC_SCLN, KC_COMM,  KC_DOT, KC_SLSH, ALT_TAB,
-                                  KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   TAB_CMD, SFT_ENT,  RAISE,  KC_DEL, KC_CAPS
-),
-
-/*
- * Numpad
- *
- * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * |   *   |   +   |   7   |   8   |   9   |   0   |                                  |       |       |       |       |       |       |
- * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * |   /   |   -   |   4   |   5   |   6   |   (   |                                  |       | Left  |  Up   | Down  | Right |       |
- * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |   =   |   .   |   1   |   2   |   3   |   )   |       |       |  |       |       |       |       |       |       |       |       |
- * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
- *                         |       |       |       |       |       |  |       |       |       |       |       |
- *                         `---------------------------------------'  `---------------------------------------'
- */
-
-[_NUMPAD] = LAYOUT(
-    KC_ASTR, KC_PLUS,    KC_7,    KC_8,    KC_9,    KC_0,                                      _______, _______, _______, _______, _______, _______,
-    KC_SLSH, KC_MINS,    KC_4,    KC_5,    KC_6, KC_LPRN,                                      _______, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, _______,
-     KC_EQL,  KC_DOT,    KC_1,    KC_2,    KC_3, KC_RPRN, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
-                               _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
-),
-
-/*
- * Lower: Symbols & Media
- *
- * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * |  Tab  |   *   |   /   |   +   |   -   |   =   |                                  |   |   |   {   |   }   |   @   |   !   |   `   |
- * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * | Enter | Left  |  Up   | Down  | Right |       |                                  |   \   |   (   |   )   |   $   |   #   |   ~   |
- * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |  Esc  | Vol-  | Vol+  | Prev  | Play  |  Next |       |       |  |       |       |   _   |   [   |   ]   |   ^   |   %   |   &   |
- * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
- *                         |       |       |       |       |       |  |       |       |       |       |       |
- *                         `---------------------------------------'  `---------------------------------------'
- */
-
-[_LOWER] = LAYOUT(
-    KC_TAB,  KC_ASTR, KC_SLSH, KC_PLUS, KC_MINS,  KC_EQL,                                      KC_PIPE, KC_LCBR, KC_RCBR,   KC_AT, KC_EXLM,  KC_GRV,
-    KC_ENT,  KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, _______,                                      KC_BSLS, KC_LPRN, KC_RPRN,  KC_DLR, KC_HASH, KC_TILD,
-    KC_ESC,  KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,  _______, _______, KC_UNDS, KC_LBRC, KC_RBRC, KC_CIRC, KC_PERC, KC_AMPR,
-                               _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
-),
-
-/*
- * Raise: Numbers
- *
- * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * |       |  F1   |  F2   |  F3   |  F4   |  F5   |                                  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
- * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * |       |   1   |   2   |   3   |   4   |   5   |                                  |   6   |   7   |   8   |   9   |   0   |  F12  |
- * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       |       |       |       |       |  |       |       |       |  Left |   Up  |  Down | Right |  Esc  |
- * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
- *                         |       |       |       |       |       |  |       |       |       |       |       |
- *                         `---------------------------------------'  `---------------------------------------'
- */
-
-[_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_1,    KC_2,    KC_3,    KC_4,    KC_5,                                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_F12,
-    _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT,  KC_ESC,
-                               _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
-),
-
-/*
- * Adjust: Function Keys & RGB
- *
- * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * | Reset |       |       |       |       |       |                                  |       |  NKRO |CG SWAP|       |       | HNTS  |
- * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * |       |  TOG  |  SAI  |  HUI  |  VAI  |  MOD  |                                  |       |Bright+|Bright-|       |       |       |
- * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |       |       |  SAD  |  HUD  |  VAD  | RMOD  |       |       |  |       |       |       |       |       |       |       |       |
- * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
- *                         |       |       |       |       |       |  |       |       |       |       |       |
- *                         `---------------------------------------'  `---------------------------------------'
- */
-
-[_ADJUST] = LAYOUT(
-   QK_BOOT, _______, _______, _______, _______, _______,                                     _______, NK_TOGG, CG_TOGG, _______,    GAME,    HNTS,
-   _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD,                                     _______, KC_BRIU, KC_BRID, _______, _______, _______,
-   _______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
-                             _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
-),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case CPY_PST:  // Hold to Copy, Hold with GUI to Cut, Tap to Paste
-      {
-      static uint16_t copy_paste_timer;
-        if (record->event.pressed) {
-          copy_paste_timer = timer_read();
-        } else {
-           if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {
-             if (get_mods() & MOD_MASK_GUI) {
-               tap_code16(LGUI(KC_X));
-             } else {
-               tap_code16(LGUI(KC_C));
-             }
-           } else {
-             tap_code16(LGUI(KC_V));
-           }
-        }
-      }
-      break;
-    case MSS_CTL:
-      if (record->event.pressed && record->tap.count) {
-          tap_code16(C(KC_UP));
-          return false;
-      }
-      break;
-    case UNDO:  // Tap to Undo, Tap with GUI to Redo
-      if (get_mods() & MOD_MASK_GUI) {
-        if (record->event.pressed) {
-          tap_code(KC_Y);
-        }
-        return false;
-      }
-      break;
-    case FIND:  // Tap to Find, Tap with GUI to Select All
-      if (get_mods() & MOD_MASK_GUI) {
-        if (record->event.pressed) {
-          tap_code(KC_A);
-        }
-        return false;
-      }
-      break;
-    }
-  return true;
-};
-
-const key_override_t ctrl_h = ko_make_basic(MOD_MASK_CTRL, KC_H, C(KC_LEFT)); //MocOS Desktop Navigation
-const key_override_t ctrl_n = ko_make_basic(MOD_MASK_CTRL, KC_N, C(KC_UP));  //MocOS Desktop Navigation
-const key_override_t ctrl_t = ko_make_basic(MOD_MASK_CTRL, KC_T, C(KC_DOWN));  //MocOS Desktop Navigation
-const key_override_t ctrl_s = ko_make_basic(MOD_MASK_CTRL, KC_S, C(KC_RGHT));  //MocOS Desktop Navigation
-const key_override_t bsp_del = ko_make_basic(MOD_MASK_SHIFT, BSP_CMD, KC_DEL);  //  Shift+Bksp sends Delete
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &ctrl_h,
-    &ctrl_n,
-    &ctrl_t,
-    &ctrl_s,
-    &bsp_del,
-    NULL
-};
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
deleted file mode 100644
index 732cca8f7b8..00000000000
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/* Copyright 2021 John Ezra
-*
-* 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/>.
-*/
-
-//Sets up what the OLED screens display.
-
-#include QMK_KEYBOARD_H
-
-int timer = 0;
-char wpm_counter[5];
-int x = 31;
-int currwpm = 0;
-int vert_count = 0;
-
-//=============  USER CONFIG PARAMS  ===============
-float max_wpm = 150.0f; //WPM value at the top of the graph window
-int graph_refresh_interval = 100; //in milliseconds
-int graph_area_fill_interval = 3; //determines how dense the horizontal lines under the graph line are; lower = more dense
-int vert_interval = 3; //determines frequency of vertical lines under the graph line
-bool vert_line = false; //determines whether to draw vertical lines
-int graph_line_thickness = 2; //determines thickness of graph line in pixels
-//=============  END USER PARAMS  ===============
-
-#ifdef OLED_ENABLE
-	oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-		return OLED_ROTATION_180;
-}
-
-static void render_qmk_logo(void) {
-	static const char PROGMEM qmk_logo[] = {
-		0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0x70, 0x70, 0x7e, 0xf0, 0xf0, 0xfe, 0xf0, 0x70, 0x7e,
-		0x70, 0xf0, 0xfe, 0xf0, 0xf0, 0x7e, 0x70, 0x70, 0xf0, 0xe0, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x92, 0x92, 0x92, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-		0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x92, 0x92, 0x92, 0x00, 0x00,
-		0xf8, 0xfc, 0x0e, 0x06, 0x06, 0x06, 0x0e, 0xfc, 0xf8, 0x00, 0xfe, 0xfe, 0x1c, 0x38, 0x70, 0xe0,
-		0x70, 0x38, 0x1c, 0xfe, 0xfe, 0x00, 0xfe, 0xfe, 0xe0, 0xf0, 0xb8, 0x1c, 0x0e, 0x06, 0x00, 0x00,
-		0x00, 0xfe, 0xfe, 0xc6, 0xc6, 0xc6, 0x06, 0x00, 0xe6, 0xe6, 0x00, 0xf0, 0xf0, 0x60, 0x30, 0x30,
-		0x60, 0x00, 0xf0, 0xf0, 0x30, 0x30, 0xe0, 0xc0, 0x30, 0x30, 0x30, 0xe0, 0xc0, 0x00, 0xf0, 0xf0,
-		0x00, 0xc0, 0xe0, 0x70, 0xe0, 0xc0, 0x00, 0xf0, 0xf0, 0x00, 0x20, 0xb0, 0x90, 0xb0, 0xf0, 0xe0,
-		0x00, 0xf0, 0xf0, 0x60, 0x30, 0x30, 0x60, 0x00, 0xc0, 0xe0, 0x30, 0x30, 0x30, 0xe0, 0xc0, 0x00,
-		0x00, 0x24, 0x24, 0x24, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xf1, 0xe3, 0xe3, 0x00, 0x00,
-		0x00, 0xe3, 0xe3, 0xf1, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0x24, 0x24, 0x24, 0x00, 0x00,
-		0x03, 0x07, 0x0e, 0x0c, 0x0c, 0x1c, 0x1e, 0x17, 0x13, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x0f, 0x0f, 0x00, 0x01, 0x03, 0x07, 0x0e, 0x0c, 0x00, 0x00,
-		0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x01, 0x0f,
-		0x0f, 0x07, 0x01, 0x00, 0x01, 0x07, 0x0f, 0x0f, 0x01, 0x00, 0x07, 0x0f, 0x0c, 0x04, 0x0f, 0x0f,
-		0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0d, 0x09, 0x09, 0x0d, 0x04, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x07, 0x07, 0x3f, 0x07, 0x07, 0x3f, 0x07, 0x07, 0x3f,
-		0x07, 0x07, 0x3f, 0x07, 0x07, 0x3f, 0x07, 0x07, 0x07, 0x03, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-		};
-		oled_write_raw_P(qmk_logo, sizeof(qmk_logo));
-}
-
-// Loop to create line by line rendering for Horizontal display
-// Input is oled_render_image(how many rows tall, how many pixels wide, what to render, X pos, Y pos, Frame offset)
-void oled_render_image(int lines, int px, const char render_line[][px], int X_pos, int Y_pos, int frame) {
-	for (uint8_t i = 0; i < lines; i++){
-		oled_set_cursor(X_pos, Y_pos + i);
-		oled_write_raw_P(render_line[i + frame], px);
-	}
-}
-
-static void render_layers(void) {
-	static const char PROGMEM layer_background_r1[1][38] = {
-		{0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x02, 0x02, 0x02, 0x02, 0x82, 0x82, 0x82, 0x42,
-		0x42, 0x42, 0x22, 0x22, 0x22, 0x42, 0x42, 0x42, 0x82, 0x82, 0x82, 0x02, 0x02, 0x02, 0x02, 0x02,
-		0x02, 0x02, 0x02, 0x02, 0x02, 0xfe}
-		};
-	static const char PROGMEM layer_background_r2[1][38] = {
-		{0x00, 0xff, 0x00, 0x44, 0x44, 0x44, 0xaa, 0xaa, 0xaa, 0x11, 0x11, 0x11, 0x20, 0x20, 0x20, 0x40,
-		0x40, 0x40, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x11, 0x11, 0x11, 0xaa, 0xaa,
-		0xaa, 0x44, 0x44, 0x44, 0x00, 0xff}
-		};
-	static const char PROGMEM layer_background_r3[1][38] = {
-		{0x00, 0xff, 0x00, 0x44, 0x44, 0x44, 0xaa, 0xaa, 0xaa, 0x11, 0x11, 0x11, 0x22, 0x22, 0x22, 0x44,
-		0x44, 0x44, 0x88, 0x88, 0x88, 0x44, 0x44, 0x44, 0x22, 0x22, 0x22, 0x11, 0x11, 0x11, 0xaa, 0xaa,
-		0xaa, 0x44, 0x44, 0x44, 0x00, 0xff}
-		};
-	static const char PROGMEM layer_background_r4[1][38] = {
-		{0x00, 0x7f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x44,
-		0x44, 0x44, 0x48, 0x48, 0x48, 0x44, 0x44, 0x44, 0x42, 0x42, 0x42, 0x41, 0x41, 0x41, 0x40, 0x40,
-		0x40, 0x40, 0x40, 0x40, 0x40, 0x7f}
-		};
-	static const char PROGMEM base[1][38] = {
-		{0x00, 0xff, 0x00, 0x44, 0x44, 0x44, 0xae, 0xae, 0xae, 0x1f, 0x1f, 0x1f, 0x3e, 0x3e, 0x3e, 0x7c,
-		0x7c, 0x7c, 0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7c, 0x3e, 0x3e, 0x3e, 0x1f, 0x1f, 0x1f, 0xae, 0xae,
-		0xae, 0x44, 0x44, 0x44, 0x00, 0xff}
-		};
-	static const char PROGMEM lower[2][38] = {
-		{0x00, 0xff, 0x00, 0x44, 0x44, 0x44, 0xea, 0xea, 0xea, 0xf1, 0xf1, 0xf1, 0xe2, 0xe2, 0xe2, 0xc4,
-		0xc4, 0xc4, 0x88, 0x88, 0x88, 0xc4, 0xc4, 0xc4, 0xe2, 0xe2, 0xe2, 0xf1, 0xf1, 0xf1, 0xea, 0xea,
-		0xea, 0x44, 0x44, 0x44, 0x00, 0xff},
-		{0x00, 0x7f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 0x41, 0x41, 0x43, 0x43, 0x43, 0x47,
-		0x47, 0x47, 0x4f, 0x4f, 0x4f, 0x47, 0x47, 0x47, 0x43, 0x43, 0x43, 0x41, 0x41, 0x41, 0x40, 0x40,
-		0x40, 0x40, 0x40, 0x40, 0x40, 0x7f}
-		};
-	static const char PROGMEM raise[][38] = {
-		{0x00, 0xff, 0x00, 0x44, 0x44, 0x44, 0xea, 0xea, 0xea, 0xf1, 0xf1, 0xf1, 0xe0, 0xe0, 0xe0, 0xc0,
-		0xc0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf1, 0xf1, 0xf1, 0xea, 0xea,
-		0xea, 0x44, 0x44, 0x44, 0x00, 0xff},
-		{0x00, 0xff, 0x00, 0x44, 0x44, 0x44, 0xaa, 0xaa, 0xaa, 0x11, 0x11, 0x11, 0x23, 0x23, 0x23, 0x47,
-		0x47, 0x47, 0x8f, 0x8f, 0x8f, 0x47, 0x47, 0x47, 0x23, 0x23, 0x23, 0x11, 0x11, 0x11, 0xaa, 0xaa,
-		0xaa, 0x44, 0x44, 0x44, 0x00, 0xff}
-		};
-	static const char PROGMEM adjust[][38] = {
-		{0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x02, 0x02, 0x02, 0x02, 0x82, 0x82, 0x82, 0xc2,
-		0xc2, 0xc2, 0xe2, 0xe2, 0xe2, 0xc2, 0xc2, 0xc2, 0x82, 0x82, 0x82, 0x02, 0x02, 0x02, 0x02, 0x02,
-		0x02, 0x02, 0x02, 0x02, 0x02, 0xfe},
-		{0x00, 0xff, 0x00, 0x44, 0x44, 0x44, 0xae, 0xae, 0xae, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f,
-		0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0xae, 0xae,
-		0xae, 0x44, 0x44, 0x44, 0x00, 0xff}
-		};
-	static const char PROGMEM custom[][38] = {
-		{0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x02, 0x02, 0x02, 0x02, 0x82, 0x82, 0x82, 0x42,
-		0xc2, 0x42, 0xa2, 0x62, 0xa2, 0x42, 0xc2, 0x42, 0x82, 0x82, 0x82, 0x02, 0x02, 0x02, 0x02, 0x02,
-		0x02, 0x02, 0x02, 0x02, 0x02, 0xfe},
-		{0x00, 0xff, 0x00, 0x44, 0x44, 0x44, 0xaa, 0xee, 0xaa, 0x55, 0xbb, 0x55, 0xaa, 0x75, 0xaa, 0x55,
-		0xea, 0x55, 0xaa, 0xd5, 0xaa, 0x55, 0xea, 0x55, 0xaa, 0x75, 0xaa, 0x55, 0xbb, 0x55, 0xaa, 0xee,
-		0xaa, 0x44, 0x44, 0x44, 0x00, 0xff},
-		{0x00, 0xff, 0x00, 0x44, 0x44, 0x44, 0xaa, 0xee, 0xaa, 0x55, 0xbb, 0x55, 0xaa, 0x77, 0xaa, 0x55,
-		0xee, 0x55, 0xaa, 0xdd, 0xaa, 0x55, 0xee, 0x55, 0xaa, 0x77, 0xaa, 0x55, 0xbb, 0x55, 0xaa, 0xee,
-		0xaa, 0x44, 0x44, 0x44, 0x00, 0xff},
-		{0x00, 0x7f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 0x41, 0x41, 0x42, 0x43, 0x42, 0x45,
-		0x46, 0x45, 0x4a, 0x4d, 0x4a, 0x45, 0x46, 0x45, 0x42, 0x43, 0x42, 0x41, 0x41, 0x41, 0x40, 0x40,
-		0x40, 0x40, 0x40, 0x40, 0x40, 0x7f}
-		};
-
-	switch (get_highest_layer(layer_state)) {
-		case 0:
-			oled_render_image(1, 38, layer_background_r1, 15, 4, 0);
-			oled_render_image(1, 38, layer_background_r2, 15, 5, 0);
-			oled_render_image(1, 38, base, 15, 6, 0);
-			oled_render_image(1, 38, layer_background_r4, 15, 7, 0);
-		break;
-		case 3:
-			oled_render_image(2, 38, lower, 15, 6, 0);
-		break;
-		case 4:
-			oled_render_image(1, 38, layer_background_r1, 15, 4, 0);
-			oled_render_image(2, 38, raise, 15, 5, 0);
-			oled_render_image(1, 38, layer_background_r4, 15, 7, 0);
-		break;
-		case 5:
-			oled_render_image(2, 38, adjust, 15, 4, 0);
-			oled_render_image(1, 38, layer_background_r3, 15, 6, 0);
-			oled_render_image(1, 38, layer_background_r4, 15, 7, 0);
-		break;
-		default:
-			oled_render_image(4, 38, custom, 15, 4, 0);
-		break;
-	}
-}
-
-void render_mod_state(uint8_t modifiers) {
-	static const char PROGMEM gui_off [][3]= {{0x80, 0x81, 0}, {0xa0, 0xa1, 0}};
-	static const char PROGMEM gui_on [][3]= {{0xc0, 0xc1, 0}, {0xe0, 0xe1, 0}};
-	static const char PROGMEM alt_off [][3]= {{0x82, 0x83, 0}, {0xa2, 0xa3, 0}};
-	static const char PROGMEM alt_on [][3]= {{0xc2, 0xc3, 0}, {0xe2, 0xe3, 0}};
-	static const char PROGMEM ctrl_off [][3]= {{0x84, 0x85, 0}, {0xa4, 0xa5, 0}};
-	static const char PROGMEM ctrl_on [][3]= {{0xc4, 0xc5, 0}, {0xe4, 0xe5, 0}};
-	static const char PROGMEM shift_off [][3]= {{0x86, 0x87, 0}, {0xa6, 0xa7, 0}};
-	static const char PROGMEM shift_on [][3]= {{0xc6, 0xc7, 0}, {0xe6, 0xe7, 0}};
-
-	// fillers between the modifier icons bleed into the icon frames
-
-	static const char PROGMEM off_off [][2]= {{0x9e, 0}, {0xbe, 0}};
-	static const char PROGMEM on_on [][2]= {{0xdf, 0}, {0xff, 0}};
-	static const char PROGMEM on_off [][2]= {{0xde, 0}, {0xfe, 0}};
-	static const char PROGMEM off_on [][2]= {{0x9f, 0}, {0xbf, 0}};
-
-	// render icons
-
-	if(modifiers & MOD_MASK_GUI) {
-		oled_set_cursor(0, 4);
-		oled_write_P(gui_on[0], false);
-		oled_set_cursor(0, 5);
-		oled_write_P(gui_on[1], false);
-	} else {
-		oled_set_cursor(0, 4);
-		oled_write_P(gui_off[0], false);
-		oled_set_cursor(0, 5);
-		oled_write_P(gui_off[1], false);
-	}
-	if(modifiers & MOD_MASK_ALT) {
-		oled_set_cursor(3, 4);
-		oled_write_P(alt_on[0], false);
-		oled_set_cursor(3, 5);
-		oled_write_P(alt_on[1], false);
-	} else {
-		oled_set_cursor(3, 4);
-		oled_write_P(alt_off[0], false);
-		oled_set_cursor(3, 5);
-		oled_write_P(alt_off[1], false);
-	}
-	if(modifiers & MOD_MASK_CTRL) {
-		oled_set_cursor(0, 6);
-		oled_write_P(ctrl_on[0], false);
-		oled_set_cursor(0, 7);
-		oled_write_P(ctrl_on[1], false);
-	} else {
-		oled_set_cursor(0, 6);
-		oled_write_P(ctrl_off[0], false);
-		oled_set_cursor(0, 7);
-		oled_write_P(ctrl_off[1], false);
-	}
-	if(modifiers & MOD_MASK_SHIFT) {
-		oled_set_cursor(3, 6);
-		oled_write_P(shift_on[0], false);
-		oled_set_cursor(3, 7);
-		oled_write_P(shift_on[1], false);
-	} else {
-		oled_set_cursor(3, 6);
-		oled_write_P(shift_off[0], false);
-		oled_set_cursor(3, 7);
-		oled_write_P(shift_off[1], false);
-	}
-
-	// render fillers
-
-	if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
-		oled_set_cursor(2, 4);
-		oled_write_P(on_on[0], false);
-		oled_set_cursor(2, 5);
-		oled_write_P(on_on[1], false);
-	} else if(modifiers & MOD_MASK_GUI) {
-		oled_set_cursor(2, 4);
-		oled_write_P(on_off[0], false);
-		oled_set_cursor(2, 5);
-		oled_write_P(on_off[1], false);
-	} else if(modifiers & MOD_MASK_ALT) {
-		oled_set_cursor(2, 4);
-		oled_write_P(off_on[0], false);
-		oled_set_cursor(2, 5);
-		oled_write_P(off_on[1], false);
-	} else {
-		oled_set_cursor(2, 4);
-		oled_write_P(off_off[0], false);
-		oled_set_cursor(2, 5);
-		oled_write_P(off_off[1], false);
-	}
-
-	if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
-		oled_set_cursor(2, 6);
-		oled_write_P(on_on[0], false);
-		oled_set_cursor(2, 7);
-		oled_write_P(on_on[1], false);
-	} else if(modifiers & MOD_MASK_CTRL) {
-		oled_set_cursor(2, 6);
-		oled_write_P(on_off[0], false);
-		oled_set_cursor(2, 7);
-		oled_write_P(on_off[1], false);
-	} else if(modifiers & MOD_MASK_SHIFT) {
-		oled_set_cursor(2, 6);
-		oled_write_P(off_on[0], false);
-		oled_set_cursor(2, 7);
-		oled_write_P(off_on[1], false);
-	} else {
-		oled_set_cursor(2, 6);
-		oled_write_P(off_off[0], false);
-		oled_set_cursor(2, 7);
-		oled_write_P(off_off[1], false);
-	}
-}
-
-void render_bootmagic_status(void) {
-	static const char PROGMEM nkro_off [][3]= {{0x88, 0x89, 0}, {0xa8, 0xa9, 0}};
-	static const char PROGMEM nkro_on [][3]= {{0xc8, 0xc9, 0}, {0xe8, 0xe9, 0}};
-	static const char PROGMEM mac_os_off [][6]= {{0x90, 0x91, 0x92, 0x93, 0x94, 0}, {0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0}};
-	static const char PROGMEM mac_os_on [][6]= {{0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0}, {0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0}};
-	static const char PROGMEM windows_off [][6]= {{0x95, 0x96, 0x97, 0x98, 0x99, 0}, {0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0}};
-	static const char PROGMEM windows_on [][6]= {{0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0}, {0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0}};
-
-	if (keymap_config.nkro) {
-		oled_set_cursor(5, 4);
-		oled_write_P(nkro_on[0], false);
-		oled_set_cursor(5, 5);
-		oled_write_P(nkro_on[1], false);
-	}	else {
-		oled_set_cursor(5, 4);
-		oled_write_P(nkro_off[0], false);
-		oled_set_cursor(5, 5);
-		oled_write_P(nkro_off[1], false);
-	}
-	if (keymap_config.swap_lctl_lgui) {
-		oled_set_cursor(10, 6);
-		oled_write_P(windows_on[0], false);
-		oled_set_cursor(10, 7);
-		oled_write_P(windows_on[1], false);
-		oled_set_cursor(10, 4);
-		oled_write_P(mac_os_off[0], false);
-		oled_set_cursor(10, 5);
-		oled_write_P(mac_os_off[1], false);
-	}	else {
-		oled_set_cursor(10, 4);
-		oled_write_P(mac_os_on[0], false);
-		oled_set_cursor(10, 5);
-		oled_write_P(mac_os_on[1], false);
-		oled_set_cursor(10, 6);
-		oled_write_P(windows_off[0], false);
-		oled_set_cursor(10, 7);
-		oled_write_P(windows_off[1], false);
-	}
-}
-
-void render_lock_status(void) {
-	static const char PROGMEM caps_off [][3]= {{0x8a, 0x8b, 0}, {0xaa, 0xab, 0}};
-	static const char PROGMEM caps_on [][3]= {{0xca, 0xcb, 0}, {0xea, 0xeb, 0}};
-	static const char PROGMEM num_off [][3]= {{0x8c, 0x8d, 0}, {0xac, 0xad, 0}};
-	static const char PROGMEM num_on [][3]= {{0xcc, 0xcd, 0}, {0xec, 0xed, 0}};
-	static const char PROGMEM scrl_off [][3]= {{0x8e, 0x8f, 0}, {0xae, 0xaf, 0}};
-	static const char PROGMEM scrl_on [][3]= {{0xce, 0xcf, 0}, {0xee, 0xef, 0}};
-
-	static const char PROGMEM off_off [][2]= {{0x9e, 0}, {0xbe, 0}};
-	static const char PROGMEM on_on [][2]= {{0xdf, 0}, {0xff, 0}};
-	static const char PROGMEM on_off [][2]= {{0xde, 0}, {0xfe, 0}};
-	static const char PROGMEM off_on [][2]= {{0x9f, 0}, {0xbf, 0}};
-
-	led_t led_usb_state = host_keyboard_led_state();
-	if (led_usb_state.caps_lock) {
-	oled_set_cursor(8, 4);
-	oled_write_P(caps_on[0], false);
-	oled_set_cursor(8, 5);
-	oled_write_P(caps_on[1], false);
-	}	else {
-	oled_set_cursor(8, 4);
-	oled_write_P(caps_off[0], false);
-	oled_set_cursor(8, 5);
-	oled_write_P(caps_off[1], false);
-	}
-	if (led_usb_state.num_lock) {
-	oled_set_cursor(5, 6);
-	oled_write_P(num_on[0], false);
-	oled_set_cursor(5, 7);
-	oled_write_P(num_on[1], false);
-	}	else {
-	oled_set_cursor(5, 6);
-	oled_write_P(num_off[0], false);
-	oled_set_cursor(5, 7);
-	oled_write_P(num_off[1], false);
-	}
-	if (led_usb_state.scroll_lock) {
-	oled_set_cursor(8, 6);
-	oled_write_P(scrl_on[0], false);
-	oled_set_cursor(8, 7);
-	oled_write_P(scrl_on[1], false);
-	}	else {
-	oled_set_cursor(8, 6);
-	oled_write_P(scrl_off[0], false);
-	oled_set_cursor(8, 7);
-	oled_write_P(scrl_off[1], false);
-	}
-
-	// render fillers
-
-	if ((led_usb_state.caps_lock) && (keymap_config.nkro)) {
-		oled_set_cursor(7, 4);
-		oled_write_P(on_on[0], false);
-		oled_set_cursor(7, 5);
-		oled_write_P(on_on[1], false);
-	} else if(keymap_config.nkro) {
-		oled_set_cursor(7, 4);
-		oled_write_P(on_off[0], false);
-		oled_set_cursor(7, 5);
-		oled_write_P(on_off[1], false);
-	} else if(led_usb_state.caps_lock) {
-		oled_set_cursor(7, 4);
-		oled_write_P(off_on[0], false);
-		oled_set_cursor(7, 5);
-		oled_write_P(off_on[1], false);
-	} else {
-		oled_set_cursor(7, 4);
-		oled_write_P(off_off[0], false);
-		oled_set_cursor(7, 5);
-		oled_write_P(off_off[1], false);
-	}
-	if ((led_usb_state.num_lock) && (led_usb_state.scroll_lock)) {
-		oled_set_cursor(7, 6);
-		oled_write_P(on_on[0], false);
-		oled_set_cursor(7, 7);
-		oled_write_P(on_on[1], false);
-	} else if(led_usb_state.num_lock) {
-		oled_set_cursor(7, 6);
-		oled_write_P(on_off[0], false);
-		oled_set_cursor(7, 7);
-		oled_write_P(on_off[1], false);
-	} else if(led_usb_state.scroll_lock) {
-		oled_set_cursor(7, 6);
-		oled_write_P(off_on[0], false);
-		oled_set_cursor(7, 7);
-		oled_write_P(off_on[1], false);
-	} else {
-		oled_set_cursor(7, 6);
-		oled_write_P(off_off[0], false);
-		oled_set_cursor(7, 7);
-		oled_write_P(off_off[1], false);
-	}
-}
-
-
-
-void render_wpm_graph(void) {
-	currwpm = get_current_wpm();  //get current WPM value
-	if(timer_elapsed(timer) > graph_refresh_interval){  //check if it's been long enough before refreshing graph
-			x = 63 - ((currwpm / max_wpm) * 63);  // main calculation to plot graph line
-			for(int i = 0; i <= graph_line_thickness - 1; i++){  //first draw actual value line
-			oled_write_pixel(1, x + i, true);
-			}
-		if(vert_line){  //then fill in area below the value line
-			if(vert_count == vert_interval){
-				vert_count = 0;
-				while(x <= 63){
-					oled_write_pixel(1, x, true);
-					x++;
-					}
-			} else {
-				for(int i = 63; i > x; i--){
-					if(i % graph_area_fill_interval == 0){
-						oled_write_pixel(1, i, true);
-					}
-				}
-			vert_count++;
-			}
-		} else {
-			for(int i = 63; i > x; i--){
-				if(i % graph_area_fill_interval == 0){
-					oled_write_pixel(1, i, true);
-				}
-			}
-		}
-		oled_pan(false);  //then move the entire graph one pixel to the right
-		timer = timer_read();  //refresh the timer for the next iteration
-	}
-	char buf[4];  //format current WPM value into a printable string
-	oled_set_cursor(14, 0);
-	oled_write("WPM:", false);
-	buf[0] = currwpm >= 100 ? ((currwpm/100) + '0') : ' ';
-	buf[1] = currwpm >= 10 ? (((currwpm/10) % 10) + '0') : ' ';
-	buf[2] = (currwpm % 10) + '0';
-	buf[3] = 0;
-	oled_write(buf, false);
-}
-
-void render_status_main(void) {
-	render_qmk_logo();
-	render_layers();
-	render_mod_state(get_mods());
-	render_bootmagic_status();
-	render_lock_status();
-
-}
-
-void render_status_secondary(void) {
-	render_wpm_graph();
-}
-
-bool oled_task_user(void) {
-	if (is_keyboard_master()) {
-		render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-	} else {
-		render_status_secondary();
-	}
-    return false;
-}
-
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/readme.md b/keyboards/splitkb/kyria/keymaps/john-ezra/readme.md
deleted file mode 100644
index 8a3280614b4..00000000000
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-### This Keymap uses the nanoBoot bootloader to maximize available firmware space.
-
-As is, the firmware will be too large if using the standard bootloader.  Removing `DEBOUNCE_TYPE = sym_eager_pk` from the `rules.mk` should get the size under the limit.
-
-If nanoBoot is not going to be used, delete or comment out the following from your `rules.mk`:
-```make
-BOOTLOADER = hid
-BOOTLOADER_SIZE = 512
-PROGRAM_CMD = 	$(HID_BOOTLOADER_CLI) -mmcu=$(MCU) -w -v $(BUILD_DIR)/$(TARGET).hex
-```
-
-nanoBoot can be found here: [nanoBoot](https://github.com/sigprof/nanoBoot) I used the string-descriptors branch as it was the latest update.
-
-To ISP Flash nanoBoot: `avrdude -p atmega32u4 -c avrisp -U flash:w:/Users/DempseyTech/nanoBoot/nanoBoot.hex:i -P /dev/cu.usbmodem123451 -U lfuse:w:0x7F:m -U hfuse:w:0xD6:m -U efuse:w:0xC7:m`
-
-You will need to change the path in the CLI command to match your file structure.
-
-QMK Toolbox will not recognize controllers using nanoBoot, instead use the CLI to flash.
-
-To Flash: `qmk flash -kb splitkb/kyria/rev1 -km john-ezra -bl hid_bootloader`
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
deleted file mode 100644
index 802e7a0f8a9..00000000000
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-OLED_ENABLE = yes          # Enables the use of OLED displays
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-NKRO_ENABLE = yes          # Enable N-Key Rollover
-ENCODER_ENABLE = no        # Disable Rotary Encoder
-SPACE_CADET_ENABLE = no    # Disable Space Cadet Shift
-GRAVE_ESC_ENABLE = no      # Disable Grave Escape
-MOUSEKEY_ENABLE =  no      # Disable Mousekeys
-WPM_ENABLE = yes           # Enable WPM Counter (Works with default wpm files, but works better with vectorstorm updated wpm.c and wpm.h -> https://github.com/vectorstorm/qmk_firmware/tree/wpm_exact)
-KEY_OVERRIDE_ENABLE = yes  # Enable Key Overrides
-CONSOLE_ENABLE = no
-
-DEBOUNCE_TYPE = sym_eager_pk
-
-BOOTLOADER = hid           # This Keymap Uses nanoBoot, more info in readme
-BOOTLOADER_SIZE = 512
-PROGRAM_CMD = 	$(HID_BOOTLOADER_CLI) -mmcu=$(MCU) -w -v $(BUILD_DIR)/$(TARGET).hex
-
-SRC += oled.c
diff --git a/keyboards/splitkb/kyria/keymaps/kejadlen/config.h b/keyboards/splitkb/kyria/keymaps/kejadlen/config.h
deleted file mode 100644
index 0e2fd449da9..00000000000
--- a/keyboards/splitkb/kyria/keymaps/kejadlen/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-    #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP
-#endif
-
-// EC11K encoders have a different resolution than other EC11 encoders.
-// When using the default resolution of 4, if you notice your encoder skipping
-// every other tick, lower the resolution to 2.
-#define ENCODER_RESOLUTION 2
-
-// The Leader key allows to flexibly assign macros to key sequences.
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 350
-
-#define TAPPING_TERM 200
-
-// Allows to use either side as the master. Look at the documentation for info:
-// https://docs.qmk.fm/#/config_options?id=setting-handedness
-#define EE_HANDS
-
-// Allows media codes to properly register in macros and rotary encoder code
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/splitkb/kyria/keymaps/kejadlen/keymap.c b/keyboards/splitkb/kyria/keymaps/kejadlen/keymap.c
deleted file mode 100644
index 9de9be55525..00000000000
--- a/keyboards/splitkb/kyria/keymaps/kejadlen/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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 layers {
-    NOR = 0,
-    NAV,
-    SYM,
-    ETC,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [NOR] = LAYOUT(
-                     KC_NO,   KC_Q, KC_W, KC_D, KC_F, KC_K,                                     KC_J, KC_U, KC_R,    KC_L,   KC_SCLN, KC_BSLS,
-                     KC_LSFT, KC_A, KC_S, KC_E, KC_T, KC_G,                                     KC_Y, KC_N, KC_I,    KC_O,   KC_H,    KC_QUOT,
-                     KC_NO,   KC_Z, KC_X, KC_C, KC_V, KC_B, MO(NAV), MO(ETC), MO(ETC), MO(NAV), KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-       LCAG_T(KC_NO), KC_LALT, GUI_T(KC_TAB), LT(SYM,KC_BSPC), CTL_T(KC_ESC), SFT_T(KC_ENT), LT(SYM,KC_SPC), GUI_T(KC_TAB), KC_LALT, RCAG_T(KC_NO)
-    ),
-
-    [NAV] = LAYOUT(
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS,
-      KC_TRNS, KC_LSFT, KC_LCTL, KC_LOPT, KC_LCMD, KC_TRNS,                                     KC_VOLU, KC_LEFT, KC_DOWN, KC_UP,   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_VOLD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS,
-                                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-    [SYM] = LAYOUT(
-      KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,                                     KC_EQL,  KC_7,   KC_8,    KC_9, KC_PLUS, KC_TRNS,
-      KC_AMPR, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_BSLS,                                     KC_MINS, KC_4,   KC_5,    KC_6, KC_QUOT, KC_TRNS,
-      KC_GRV,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_ASTR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_1,   KC_2,    KC_3, KC_DQUO, KC_TRNS,
-                                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0,    KC_DOT, KC_TRNS
-    ),
-
-    [ETC] = LAYOUT(
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_LSFT, KC_LCTL, KC_LOPT, KC_LCMD, KC_TRNS,                                     KC_TRNS, KC_F4,   KC_F5,   KC_F6,   KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_TRNS, KC_TRNS,
-                                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-    /*
-      [__TEMPLATE__] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/splitkb/kyria/keymaps/kejadlen/rules.mk b/keyboards/splitkb/kyria/keymaps/kejadlen/rules.mk
deleted file mode 100644
index e11b7e936d4..00000000000
--- a/keyboards/splitkb/kyria/keymaps/kejadlen/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = no   # Enables the use of OLED displays
-ENCODER_ENABLE = no       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = no      # Enable keyboard RGB underglow
-LEADER_ENABLE = no        # Enable the Leader Key feature
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h b/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h
deleted file mode 100644
index 003e21ca5c0..00000000000
--- a/keyboards/splitkb/kyria/keymaps/lms_ace01/config.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2021 Luis Moreno <acevice69@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
-
-// Set handedness by EEPROM
-#define EE_HANDS
-
-// Tapping / One Shot settings
-#define TAPPING_TOGGLE               2
-#define TAPPING_TERM               175
-
-#define ONESHOT_TAP_TOGGLE           2
-#define ONESHOT_TIMEOUT           2250
-
-// OLED settings -if applicable-
-#ifdef OLED_DRIVER_ENABLE
-    #define OLED_DISPLAY_128X64
-#endif
-
-// Encoder settings -if applicable-
-#ifdef ENCODER_ENABLE
-    #define ENCODER_RESOLUTION       4
-#endif
-
-// RGB settings -if applicable-
-#ifdef RGBLIGHT_ENABLE
-    #define RGBLIGHT_EFFECT_BREATHING
-
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
-
-    #define RGBLIGHT_HUE_STEP        2
-    #define RGBLIGHT_SAT_STEP        2
-    #define RGBLIGHT_VAL_STEP        2
-    #define RGBLIGHT_LIMIT_VAL     230
-
-    #define RGBLIGHT_SLEEP
-    #define RGBLIGHT_SPLIT
-
-    #define RGBLIGHT_DEFAULT_MODE  RGBLIGHT_MODE_BREATHING + 2
-    #define RGBLIGHT_DEFAULT_HUE   201
-    #define RGBLIGHT_DEFAULT_SAT   255
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c b/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c
deleted file mode 100644
index 6e709b01a66..00000000000
--- a/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c
+++ /dev/null
@@ -1,852 +0,0 @@
-/* Copyright 2021 Luis Moreno <acevice69@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
-#include "keymap_spanish.h"
-
-// Insert key state definition (Insert/Overwrite Mode)
-static bool ins_state = true;
-
-// Git Commands
-static const char *sendstring_commands[] = {
-    // Config
-    "config //global",
-
-    // Create
-    "init",
-    "clone",
-
-    // Local changes
-    "status",
-    "diff",
-    "add",
-    "rm",
-    "mv",
-    "commit",
-    "stash",
-    "reset",
-    "revert",
-
-    // Branches and Tags
-    "branch /b @",
-    "switch",
-    "checkout",
-    "tag",
-
-    // Update & Publish
-    "remote",
-    "fetch",
-    "pull",
-    "push",
-
-    // Merge & Rebase
-    "merge",
-    "rebase",
-
-    // Commit history
-    "logg"
-};
-
-// Layers definition
-enum layers {
-    _QWERTY_ES,
-    _COLEMAK_ES,
-    _SYMBOL,
-    _FN_NUMPAD,
-    _NAVIGATION,
-    _GIT_CMDS,
-    _SETTINGS
-};
-
-// Encoder Modes definition
-#ifdef ENCODER_ENABLE
-#define ENC_ALT_MAX_TIME 1250
-
-typedef enum {
-    ENC_MODE_CHAR_LINE,
-    ENC_MODE_WORD_PAGE,
-    ENC_MODE_TABBING,
-    ENC_MODE_VOLUME,
-    ENC_MODE_LAST
-} encoder_mode_t;
-
-static encoder_mode_t enc_mode;
-
-void encoder_cycle_mode(bool up);
-#endif
-
-// Tap Dance declarations/definitions
-#ifdef TAP_DANCE_ENABLE
-#define ACTION_TAP_DANCE_FN_ADVANCED_USER(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, user_user_data) \
-    { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = (void *)user_user_data, }
-
-#define MAX_MOD 3  // Max number of modifiers: 0-Base, 1-Shift, 2-Ctrl
-
-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;
-
-typedef struct {
-    uint16_t keycode;         // Keycode:
-                              //  - Tap if keycode != KC_NO
-    uint8_t  layer[MAX_MOD];  // Layer with modifiers (0-Base, 1-Shift, 2-Ctrl):
-                              //  - Tap if keycode == KC_NO
-                              //  - Single Hold: Activate while holding
-                              //  - Double Tap: (Un)lock Layer
-} td_user_data_t;
-
-enum td_actions {
-    TAB,
-    ESC,
-    SPC,
-    ENT,
-    LWR,
-    RAI
-};
-
-static td_tap_t td_tap_state = {
-    .is_press_action = true,
-    .state           = TD_NONE
-};
-
-td_state_t td_current       (tap_dance_state_t *state);
-void       td_kc_ly_finished(tap_dance_state_t *state, void *user_data);
-void       td_kc_ly_reset   (tap_dance_state_t *state, void *user_data);
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_CAPS),
-    [ESC] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset,
-                                              &((td_user_data_t) { KC_ESC, { _NAVIGATION, _QWERTY_ES, _QWERTY_ES }})),
-    [SPC] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset,
-                                              &((td_user_data_t) { KC_SPC, { _SYMBOL    , _QWERTY_ES, _QWERTY_ES }})),
-    [ENT] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset,
-                                              &((td_user_data_t) { KC_ENT, { _SYMBOL    , _QWERTY_ES, _QWERTY_ES }})),
-    [LWR] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset,
-                                              &((td_user_data_t) {  KC_NO, { _NAVIGATION, _GIT_CMDS , _QWERTY_ES }})),
-    [RAI] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset,
-                                              &((td_user_data_t) {  KC_NO, { _FN_NUMPAD , _GIT_CMDS , _QWERTY_ES }}))
-};
-#endif
-
-// Keycode definitions
-enum custom_keycodes {
-    CK_QUOT = SAFE_RANGE,  // Single/Double quote
-    CK_BSDI,               // Backspace/Delete/Insert
-    CK_ENCM,               // Encoder Mode (-)
-    CK_ENCP,               // Encoder Mode (+)
-    CK_LYDF,               // Activate Default Layer
-    G_CONF,                // Git Commands
-    G_INIT,
-    G_CLONE,
-    G_STAT,
-    G_DIFF,
-    G_ADD,
-    G_RM,
-    G_MV,
-    G_COMM,
-    G_STASH,
-    G_RESET,
-    G_REVER,
-    G_BRANC,
-    G_SWTCH,
-    G_CHECK,
-    G_TAG,
-    G_REMOT,
-    G_FETCH,
-    G_PULL,
-    G_PUSH,
-    G_MERGE,
-    G_REBAS,
-    G_LOG
-};
-
-#define LY_QWES  DF(_QWERTY_ES)
-#define LY_CLES  DF(_COLEMAK_ES)
-
-#ifdef TAP_DANCE_ENABLE
-    #define TD_TBCP  TD(TAB)
-    #define TD_ESSY  TD(ESC)
-    #define TD_SPSY  TD(SPC)
-    #define TD_ENSY  TD(ENT)
-    #define TD_LOWR  TD(LWR)
-    #define TD_RAIS  TD(RAI)
-#else
-    #define TD_TBCP  MT(MOD_LSFT, KC_TAB)
-    #define TD_ESSY  LT(_SYMBOL , KC_ESC)
-    #define TD_SPSY  KC_SPC
-    #define TD_ENSY  KC_ENT
-    #define TD_LOWR  TT(_NAVIGATION)
-    #define TD_RAIS  TT(_SYMBOL)
-#endif
-
-#define MO_LSFT OSM(MOD_LSFT)
-#define MO_LCTL OSM(MOD_LCTL)
-#define MO_LALT OSM(MOD_LALT)
-
-#define MT_RGUI  MT(MOD_RGUI, KC_LEFT)
-#define MT_RALT  MT(MOD_RALT, KC_DOWN)
-#define MT_RCTL  MT(MOD_RCTL, KC_UP)
-#define MT_RSFT  MT(MOD_RSFT, KC_RGHT)
-
-// Keymap definitions
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-// clang-format off
-/*
- * Basic characters (QWERTY ES)
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |Esc/LNav|   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |BS/Dl/In|
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Tab/Caps|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  |   Ñ  |   ´ ¨  |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |EncMode-|   Z  |   X  |   C  |   V  |   B  | LGit |      |  |      | LGit |   N  |   M  |  , ; |  . : |  - _ |EncMode+|
- * `-------------------------------------------| LNav | Space|  | Enter|LFnNum|-------------------------------------------'
- *                        +--------------------+------+   /  |  |   /  +------+--------------------+
- *                        | Shift| Ctrl | Alt  | GUI  | LSym |  | LSym | GUI  | AltGr| Ctrl | Shift|
- *                        |      |      |      |      |      |  |      |  <-  |   v  |   ^  |  ->  |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_QWERTY_ES] = LAYOUT(
-      TD_ESSY,    ES_Q,    ES_W,    ES_E,    ES_R,    ES_T,                                        ES_Y,    ES_U,    ES_I,    ES_O,    ES_P, CK_BSDI,
-      TD_TBCP,    ES_A,    ES_S,    ES_D,    ES_F,    ES_G,                                        ES_H,    ES_J,    ES_K,    ES_L, ES_NTIL, ES_ACUT,
-      CK_ENCM,    ES_Z,    ES_X,    ES_C,    ES_V,    ES_B, TD_LOWR, XXXXXXX, XXXXXXX, TD_RAIS,    ES_N,    ES_M, ES_COMM,  ES_DOT, ES_MINS, CK_ENCP,
-                                 MO_LSFT, MO_LCTL, MO_LALT, KC_LGUI, TD_SPSY, TD_ENSY, MT_RGUI, MT_RALT, MT_RCTL, MT_RSFT
-    ),
-/*
- * Basic characters (COLEMAK ES)
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |Esc/LNav|   Q  |   W  |   F  |   P  |   G  |                              |   J  |   L  |   U  |   Y  |   Ñ  |BS/Dl/In|
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Tab/Caps|   A  |   R  |   S  |   T  |   D  |                              |   H  |   N  |   E  |   I  |   O  |   ´ ¨  |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |EncMode-|   Z  |   X  |   C  |   V  |   B  | LGit |      |  |      | LGit |   K  |   M  |  , ; |  . : |  - _ |EncMode+|
- * `-------------------------------------------| LNav | Space|  | Enter|LFnNum|-------------------------------------------'
- *                        +--------------------+------+   /  |  |   /  +------+--------------------+
- *                        | Shift| Ctrl | Alt  | GUI  | LSym |  | LSym | GUI  | AltGr| Ctrl | Shift|
- *                        |      |      |      |      |      |  |      |  <-  |   v  |   ^  |  ->  |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_COLEMAK_ES] = LAYOUT(
-      TD_ESSY,    ES_Q,    ES_W,    ES_F,    ES_P,    ES_G,                                        ES_J,    ES_L,    ES_U,    ES_Y, ES_NTIL, CK_BSDI,
-      TD_TBCP,    ES_A,    ES_R,    ES_S,    ES_T,    ES_D,                                        ES_H,    ES_N,    ES_E,    ES_I,    ES_O, ES_ACUT,
-      CK_ENCM,    ES_Z,    ES_X,    ES_C,    ES_V,    ES_B, TD_LOWR, XXXXXXX, XXXXXXX, TD_RAIS,    ES_K,    ES_M, ES_COMM,  ES_DOT, ES_MINS, CK_ENCP,
-                                 MO_LSFT, MO_LCTL, MO_LALT, KC_LGUI, TD_SPSY, TD_ENSY, MT_RGUI, MT_RALT, MT_RCTL, MT_RSFT
-    ),
-/*
- * Symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  1 ! |  2 " |  3 · |  4 $ |  5 % |                              |  6 & |  7 / |  8 ( |  9 ) |  0 = |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  ¡ ¿ |  ' " |  º ª |   \  |  | ¡ |                              |  ~ $ |  + * |  - _ |   /  |  ' ? |  ` ^   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |  @ ⅛ |   {  |   (  |  [ ° |  < > |      |      |  |      |      |   >  |  ] ¯ |   )  |  } ˘ |  # £ |        |
- * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_SYMBOL] = LAYOUT(
-      _______,    ES_1,    ES_2,    ES_3,    ES_4,    ES_5,                                        ES_6,    ES_7,    ES_8,    ES_9,    ES_0, _______,
-      _______, ES_IEXL, CK_QUOT, ES_MORD, ES_BSLS, ES_PIPE,                                     ES_TILD, ES_PLUS, ES_MINS, ES_SLSH, ES_QUOT,  ES_GRV,
-      _______,   ES_AT, ES_LCBR, ES_LPRN, ES_LBRC, ES_LABK, _______, XXXXXXX, XXXXXXX, _______, ES_RABK, ES_RBRC, ES_RPRN, ES_RCBR, ES_HASH, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Function keys, NumPad keys
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |      |                              |  , ; |  7 / |  8 ( |  9 ) |   *  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  F5  |  F6  |  F7  |  F8  |      |                              |  . : |  4 $ |  5 % |  6 & |  - _ |  + *   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |  F9  |  F10 |  F11 |  F12 |      |      |      |  |      |      |  0 = |  1 ! |  2 " |  3 · |   /  |        |
- * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_FN_NUMPAD] = LAYOUT(
-      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX,                                     ES_COMM,    ES_7,    ES_8,    ES_9, ES_ASTR, _______,
-      _______,   KC_F5,   KC_F6,   KC_F7,   KC_F8, XXXXXXX,                                      ES_DOT,    ES_4,    ES_5,    ES_6, ES_MINS, ES_PLUS,
-      _______,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______,    ES_0,    ES_1,    ES_2,    ES_3, ES_SLSH, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Navigation (Mouse deactivated for space saving)
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      | MBt1 | MUp  | MBt2 |      |                              | PgUp | Home |  Up  |  End | PgUp |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | Menu | MLeft| MDown|MRight|      |                              | PgDn | Left | Down | Right| PgDn |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |PrtScr|ScrLck| Pause|      |        |
- * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_NAVIGATION] = LAYOUT(
-      _______, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,                                     KC_PGUP, KC_HOME,   KC_UP,  KC_END, KC_PGUP, _______,
-      _______,  KC_APP, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Git Commands
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |Config|      |      | Init |      |                              |      | Clone|      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | Diff | Add  |  Rm  |  Mv  |      |                              |Remote| Fetch| Pull | Push | Merge| Rebase |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |Commit| Stash| Reset|Revert|Status|      |      |  |      |      |  Log |Branch|Switch|ChkOut|  Tag |        |
- * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_GIT_CMDS] = LAYOUT(
-      _______,  G_CONF, XXXXXXX, XXXXXXX,  G_INIT, XXXXXXX,                                     XXXXXXX, G_CLONE, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-      _______,  G_DIFF,   G_ADD,    G_RM,    G_MV, XXXXXXX,                                     G_REMOT, G_FETCH,  G_PULL,  G_PUSH, G_MERGE, G_REBAS,
-      _______,  G_COMM, G_STASH, G_RESET, G_REVER,  G_STAT, _______, XXXXXXX, XXXXXXX, _______,   G_LOG, G_BRANC, G_SWTCH, G_CHECK,   G_TAG, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Settings (Default Layer, RGB, Media)
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |QWE_ES|CLM_ES|      |      |      |                              |      |      | Vol+ |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | TOG  | HUE+ | SAT+ | VAL+ | MOD  |                              | Mute | Prev | Play | Next |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |  LDef  |      | HUE- | SAT- | VAL- | RMOD |      |      |  |      |      |      |      | Vol- |      |      |  LDef  |
- * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_SETTINGS] = LAYOUT(
-      _______, LY_QWES, LY_CLES, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, KC_VOLU, XXXXXXX, XXXXXXX, _______,
-      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,                                     KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
-      CK_LYDF, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,_______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, KC_VOLD, XXXXXXX, XXXXXXX, CK_LYDF,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+      |  |      +------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-// clang-format on
-
-/*
- * INITIALIZING FUNCTIONS
- */
-void matrix_init_user(void) {
-#ifdef ENCODER_ENABLE
-    enc_mode = ENC_MODE_CHAR_LINE;
-#endif
-}
-
-/*
- * LAYER FUNCTIONS
- */
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // Activate Settings layer when both Symbol and Navigation layers are on
-    return update_tri_layer_state(state, _SYMBOL, _NAVIGATION, _SETTINGS);
-}
-
-/*
- * MACRO FUNCTIONS
- */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Get current modifier status (Normal and One Shot)
-    uint8_t mod_state = get_mods();
-    uint8_t osm_state = get_oneshot_mods();
-
-    // Process keycode
-    switch (keycode) {
-        case CK_QUOT:  // Single/Double Quote
-            if (record->event.pressed) {
-                if ((mod_state | osm_state) & MOD_MASK_SHIFT) {
-                    register_code(ES_2);       // Shift(2)     -> "
-                } else {
-                    register_code(ES_QUOT);    // Single Quote -> '
-                }
-            } else {
-                if ((mod_state | osm_state) & MOD_MASK_SHIFT) {
-                    unregister_code(ES_2);     // Shift(2)     -> "
-                } else {
-                    unregister_code(ES_QUOT);  // Single Quote -> '
-                }
-            }
-
-            return false;
-            break;
-        case CK_BSDI: {  // Backspace/Delete/Insert
-            static bool delkey_registered = false;
-
-            if (record->event.pressed) {
-                // Ctrl   -> Insert/Overwrite Mode
-                // Shift  -> Delete
-                // Normal -> Backspace
-                if ((mod_state | osm_state) & MOD_MASK_CTRL) {
-                    del_mods(MOD_MASK_CTRL);
-                    del_oneshot_mods(MOD_MASK_CTRL);
-
-                    tap_code(KC_INS);
-
-                    set_mods(mod_state);
-                    set_oneshot_mods(osm_state);
-
-                    ins_state = !ins_state;
-                } else if ((mod_state | osm_state) & MOD_MASK_SHIFT) {
-                    delkey_registered = true;
-
-                    del_mods(MOD_MASK_SHIFT);
-                    del_oneshot_mods(MOD_MASK_SHIFT);
-
-                    register_code(KC_DEL);
-
-                    set_mods(mod_state);
-                    set_oneshot_mods(osm_state);
-                } else {
-                    register_code(KC_BSPC);
-                }
-            } else {
-                // Unregister keycode sent after the release of CK_BSDI
-                if (delkey_registered) {
-                    unregister_code(KC_DEL);
-                    delkey_registered = false;
-                } else {
-                    unregister_code(KC_BSPC);
-                }
-            }
-
-            return false;
-        }
-            break;
-        case CK_LYDF:  // De-activate all layers and activate Default layer
-            layer_move(get_highest_layer(default_layer_state));
-
-            return false;
-            break;
-        case G_CONF ... G_LOG:
-            if (record->event.pressed) {
-                del_mods(MOD_MASK_SHIFT);
-                del_oneshot_mods(MOD_MASK_SHIFT);
-
-                SEND_STRING("git ");
-                send_string(sendstring_commands[keycode - G_CONF]);
-
-                set_mods(mod_state);
-                set_oneshot_mods(osm_state);
-            }
-
-            break;
-#ifdef ENCODER_ENABLE
-        case CK_ENCM:  // Encoder Mode (-)
-            if (record->event.pressed) {
-                encoder_cycle_mode(false);
-            }
-
-            break;
-        case CK_ENCP:  // Encoder Mode (+)
-            if (record->event.pressed) {
-                encoder_cycle_mode(true);
-            }
-
-            break;
-#endif
-    }
-
-    return true;
-};
-
-/*
- * TAP DANCE FUNCTIONS
- */
-#ifdef TAP_DANCE_ENABLE
-td_state_t td_current(tap_dance_state_t *state) {
-    switch (state->count) {
-        case 1:
-            return ((!state->pressed) ? TD_SINGLE_TAP : TD_SINGLE_HOLD);
-        case 2:
-            return TD_DOUBLE_TAP;
-        default:
-            return TD_UNKNOWN;
-    }
-}
-
-void td_kc_ly_finished(tap_dance_state_t *state, void *user_data) {
-    td_tap_state.state  = td_current(state);
-    uint16_t  keycode   = ((td_user_data_t *)user_data)->keycode;
-    uint8_t  *layer_arr = ((td_user_data_t *)user_data)->layer;
-    uint8_t   layer_sel = *(layer_arr + 0);
-
-    // Get current modifier status (Normal and One Shot) and select layer
-    uint8_t mod_state = get_mods();
-    uint8_t osm_state = get_oneshot_mods();
-
-    if ((mod_state | osm_state) & MOD_MASK_SHIFT) {
-        if (*(layer_arr + 1) > _QWERTY_ES) {
-            layer_sel = *(layer_arr + 1);
-        }
-    }
-
-    if ((mod_state | osm_state) & MOD_MASK_CTRL) {
-        if (*(layer_arr + 2) > _QWERTY_ES) {
-            layer_sel = *(layer_arr + 2);
-        }
-    }
-
-    switch (td_tap_state.state) {
-        case TD_NONE:
-        case TD_UNKNOWN:
-            break;
-        case TD_SINGLE_TAP:
-            // Send keycode if available
-            // Otherwise, Lock Layer (Base/Shift/Ctrl) and Unlock rest of selectable layers
-            if (keycode != KC_NO) {
-                tap_code(keycode);
-            } else {
-                uint8_t layer_aux;
-
-                for (layer_aux = _GIT_CMDS; layer_aux >= _SYMBOL; layer_aux--) {
-                    if ((layer_aux == layer_sel) && (!layer_state_is(layer_aux))) {
-                        layer_on(layer_aux);
-                    } else {
-                        layer_off(layer_aux);
-                    }
-                }
-            }
-
-            break;
-        case TD_SINGLE_HOLD:
-            // Lock Layer (Base/Shift/Ctrl) while Single Hold on the way
-            layer_on(layer_sel);
-            break;
-        case TD_DOUBLE_TAP:
-            // (Un)lock Layer (Base/Shift/Ctrl)
-            if (layer_state_is(layer_sel)) {
-                layer_off(layer_sel);
-            } else {
-                layer_on(layer_sel);
-            }
-
-            break;
-    }
-}
-
-void td_kc_ly_reset(tap_dance_state_t *state, void *user_data) {
-    uint8_t *layer_arr = ((td_user_data_t *)user_data)->layer;
-
-    if (td_tap_state.state == TD_SINGLE_HOLD) {
-        // Unlock any Layer (Base/Shift/Ctrl) when Single Hold finalizes
-        uint8_t i;
-        uint8_t layer_aux;
-
-        for (i = 0; i < MAX_MOD; i++) {
-            layer_aux = *(layer_arr + i);
-
-            if ((layer_aux > _QWERTY_ES)) {
-                layer_off(layer_aux);
-            }
-        }
-    }
-
-    td_tap_state.state = TD_NONE;
-}
-#endif
-
-/*
- * OLED FUNCTIONS
- */
-#ifdef OLED_DRIVER_ENABLE
-static void render_kyria_logo(void) {
-    static const char PROGMEM kyria_logo[] = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0x78, 0x38, 0x1c, 0x1e, 0x0e,
-        0x8e, 0x86, 0x86, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x86,
-        0x86, 0x8e, 0x0e, 0x1e, 0x1c, 0x38, 0x78, 0xf0, 0xe0, 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, 0xe0, 0xf0, 0xfc, 0x3e, 0x0f, 0x07, 0x83, 0xe1, 0xf0, 0xf8, 0xbc, 0x9e, 0x8f, 0x87,
-        0x87, 0x83, 0x81, 0x81, 0xe0, 0x78, 0x1f, 0x07, 0xff, 0xff, 0x07, 0x1f, 0x78, 0xe0, 0x81, 0x81,
-        0x83, 0x87, 0x87, 0x8f, 0x9e, 0xbc, 0xf8, 0xf0, 0xe1, 0x83, 0x07, 0x0f, 0x3e, 0xfc, 0xf0, 0xe0,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xfc, 0xff, 0x03, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x07, 0x07, 0x3f, 0x73, 0xc7, 0x8f, 0x8d,
-        0x89, 0x99, 0x99, 0xb1, 0xf7, 0xee, 0xf8, 0xf0, 0xff, 0xff, 0xf0, 0xf8, 0xee, 0xf7, 0xb1, 0x99,
-        0x99, 0x89, 0x8d, 0x8f, 0xc7, 0x73, 0x3f, 0x07, 0x07, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff,
-        0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 0xe0, 0xfc, 0xce, 0xe3, 0xf1, 0xb1,
-        0x91, 0x99, 0x99, 0x8d, 0xef, 0x77, 0x1f, 0x0f, 0xff, 0xff, 0x0f, 0x1f, 0x77, 0xef, 0x8d, 0x99,
-        0x99, 0x91, 0xb1, 0xf1, 0xe3, 0xce, 0xfc, 0xe0, 0xe0, 0xff, 0x3f, 0x00, 0x00, 0x00, 0xc0, 0xff,
-        0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x0f, 0x3f, 0x7c, 0xf0, 0xe0, 0xc1, 0x87, 0x0f, 0x1f, 0x3d, 0x79, 0xf1, 0xe1,
-        0xe1, 0xc1, 0x81, 0x81, 0x07, 0x1e, 0xf8, 0xe0, 0xff, 0xff, 0xe0, 0xf8, 0x1e, 0x07, 0x81, 0x81,
-        0xc1, 0xe1, 0xe1, 0xf1, 0x79, 0x3d, 0x1f, 0x0f, 0x87, 0xc1, 0xe0, 0xf0, 0x7c, 0x3f, 0x0f, 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, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x03, 0x07, 0x07, 0x0f, 0x1e, 0x1c, 0x38, 0x78, 0x70,
-        0x71, 0x61, 0x61, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x61,
-        0x61, 0x71, 0x70, 0x78, 0x38, 0x1c, 0x1e, 0x0f, 0x07, 0x07, 0x03, 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, 0x00, 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, 0xfe, 0xfe, 0xfe, 0xc6, 0xe0, 0xf0, 0x70, 0x30, 0x10, 0x00, 0x70,
-        0xf0, 0xf0, 0x80, 0x00, 0xc0, 0xf0, 0xf0, 0x70, 0x10, 0xc0, 0xf0, 0xf0, 0xf0, 0x70, 0x30, 0x30,
-        0x30, 0xc0, 0xf6, 0xf6, 0xf6, 0x06, 0x00, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xf0, 0xf0, 0xe0, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x10, 0x1f, 0x1f, 0x1f, 0x03, 0x0f, 0x1f, 0x1e, 0x18, 0x10, 0x00, 0xc0, 0xc0,
-        0xe7, 0xff, 0x7f, 0x3f, 0x0f, 0x03, 0x01, 0x00, 0x18, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00,
-        0x18, 0x1f, 0x1f, 0x1f, 0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x19, 0x0d, 0x1f, 0x1f, 0x1f, 0x03, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    };
-
-    oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-}
-
-static void render_qmk_logo(void) {
-    static const char PROGMEM qmk_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0
-    };
-
-    oled_write_P(qmk_logo, false);
-}
-
-static void render_status(void) {
-    // Get current modifier status (Normal and One Shot)
-    uint8_t mod_state = get_mods();
-    uint8_t osm_state = get_oneshot_mods();
-    uint8_t osl_state = get_oneshot_locked_mods();
-    bool    caps_lock = host_keyboard_led_state().caps_lock;
-
-    // QMK Logo
-    render_qmk_logo();
-
-#ifdef ENCODER_ENABLE
-    // Host Keyboard Encoder Mode
-    switch (enc_mode) {
-        case ENC_MODE_CHAR_LINE:
-            oled_write_P(PSTR("ENC \020 CHAR/LINE\n"), false);
-            break;
-        case ENC_MODE_WORD_PAGE:
-            oled_write_P(PSTR("ENC \020 WORD/PAGE\n"), false);
-            break;
-        case ENC_MODE_TABBING:
-            oled_write_P(PSTR("ENC \020 TABBING\n"),   false);
-            break;
-        case ENC_MODE_VOLUME:
-        case ENC_MODE_LAST:
-            oled_write_P(PSTR("ENC \020 VOLUME\n"),    false);
-            break;
-    }
-#else
-    oled_write_P(PSTR("\n"), false);
-#endif
-
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("\n"), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY_ES:
-            oled_write_P(PSTR("L00 \020 QWERTY (ES)\n"),  false);
-            break;
-        case _COLEMAK_ES:
-            oled_write_P(PSTR("L00 \020 COLEMAK (ES)\n"), false);
-            break;
-        case _SYMBOL:
-            oled_write_P(PSTR("L01 \020 SYMBOLS\n"),      false);
-            break;
-        case _FN_NUMPAD:
-            oled_write_P(PSTR("L02 \020 FN / NUMPAD\n"),  false);
-            break;
-        case _NAVIGATION:
-            oled_write_P(PSTR("L03 \020 NAVIGATION\n"),   false);
-            break;
-        case _GIT_CMDS:
-            oled_write_P(PSTR("L04 \020 GIT COMMANDS\n"), false);
-            break;
-        case _SETTINGS:
-            oled_write_P(PSTR("L05 \020 SETTINGS\n"),     false);
-            break;
-    }
-
-    // Host Keyboard Locked Modifiers Status
-    oled_write_P((osl_state & MOD_MASK_SHIFT) ? PSTR("LCK ")  : PSTR("    ") , false);
-    oled_write_P((osl_state & MOD_MASK_CTRL)  ? PSTR("LCK ")  : PSTR("    ") , false);
-    oled_write_P((osl_state & MOD_MASK_ALT)   ? PSTR("LCK ")  : PSTR("    ") , false);
-    oled_write_P(                                               PSTR("    ") , false);
-    oled_write_P((caps_lock)                  ? PSTR(" CAPS") : PSTR("     "), false);
-
-    // Host Keyboard Modifiers Status
-    oled_write_P(((mod_state | osm_state) & MOD_MASK_SHIFT) ? PSTR("SHF ")  : PSTR("    ") , false);
-    oled_write_P(((mod_state | osm_state) & MOD_MASK_CTRL)  ? PSTR("CTR ")  : PSTR("    ") , false);
-    oled_write_P(((mod_state | osm_state) & MOD_MASK_ALT)   ? PSTR("ALT ")  : PSTR("    ") , false);
-    oled_write_P(((mod_state | osm_state) & MOD_MASK_GUI)   ? PSTR("GUI ")  : PSTR("    ") , false);
-    oled_write_P((ins_state)                                ? PSTR("  INS") : PSTR("  OWR"), false);
-}
-
-static void render_settings(void) {
-#ifdef RGBLIGHT_ENABLE
-    char rgb_str[4];
-
-    oled_write_P(PSTR("\n\n"), false);
-
-    oled_write_P(PSTR("\020H: "), false);
-    itoa(rgblight_get_hue(), rgb_str, 10);
-    oled_write_ln(rgb_str, false);
-
-    oled_write_P(PSTR("\020S: "), false);
-    itoa(rgblight_get_sat(), rgb_str, 10);
-    oled_write_ln(rgb_str, false);
-
-    oled_write_P(PSTR("\020V: "), false);
-    itoa(rgblight_get_val(), rgb_str, 10);
-    oled_write_ln(rgb_str, false);
-#else
-    oled_write_P(PSTR("\n\n\n\n\n"), false);
-#endif
-
-    switch (get_highest_layer(default_layer_state)) {
-        case _QWERTY_ES:
-            oled_write_ln_P(PSTR("        \020QWERTY (ES)") , false);
-            break;
-        case _COLEMAK_ES:
-            oled_write_P   (PSTR("        \020COLEMAK (ES)"), false);
-            break;
-    }
-
-#ifdef RGBLIGHT_ENABLE
-    oled_write_ln_P(PSTR("  RGB      DEFAULT"), false);
-    oled_write_ln_P(PSTR("SETTINGS    LAYER "), false);
-#else
-    oled_write_ln_P(PSTR("           DEFAULT"), false);
-    oled_write_ln_P(PSTR("            LAYER "), false);
-#endif
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;
-}
-
-void oled_task_user(void) {
-    if (is_keyboard_master()) {  // Main screen: Renders keyboard state (layer, modifiers) / RGB settings
-        if (get_highest_layer(layer_state) != _SETTINGS) {
-            render_status();
-        } else {
-            render_settings();
-        }
-    } else {                     // Auxiliar screen: Renders Kyria logo with scroll
-        render_kyria_logo();
-        oled_scroll_right();
-    }
-}
-#endif
-
-/*
- * ENCODER FUNCTIONS
- */
-#ifdef ENCODER_ENABLE
-void encoder_cycle_mode(bool up) {
-    if (enc_mode == 0 && !up) {
-        enc_mode = ENC_MODE_LAST - 1;
-    } else {
-        enc_mode = (enc_mode + (up ? +1 : -1)) % ENC_MODE_LAST;
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    // Select encoder mode
-    switch (enc_mode) {
-        case ENC_MODE_CHAR_LINE:
-            // Left Encoder: Character Left/Right. Right Encoder: Line Up/Down.
-            tap_code(!clockwise ? (index == 0 ? KC_LEFT : KC_UP): (index == 0 ? KC_RGHT : KC_DOWN));
-            break;
-        case ENC_MODE_WORD_PAGE:
-            // Left Encoder: Word Left/Right. Right Encoder: Page Up/Down.
-            tap_code16(!clockwise ? (index == 0 ? C(KC_LEFT) : KC_PGUP): (index == 0 ? C(KC_RGHT) : KC_PGDN));
-            break;
-        case ENC_MODE_TABBING:
-            // Left Encoder: Navigation Tabbing. Right Encoder: Editor Tabbing.
-            tap_code16(!clockwise ? (index == 0 ? S(C(KC_TAB)) : C(KC_PGUP)): (index == 0 ? C(KC_TAB) : C(KC_PGDN)));
-            break;
-        case ENC_MODE_VOLUME:
-        case ENC_MODE_LAST:
-            // Volume control
-            tap_code(clockwise ? KC_VOLU : KC_VOLD);
-            break;
-    }
-
-    return true;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/readme.md b/keyboards/splitkb/kyria/keymaps/lms_ace01/readme.md
deleted file mode 100644
index aae1260ffb6..00000000000
--- a/keyboards/splitkb/kyria/keymaps/lms_ace01/readme.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# AceVice One's Keymap for [Kyria](https://github.com/splitkb/kyria)
-
-## Introduction
-
-This is my first personal keymap for Kyria with a little bunch of *steroids*.
-
-The hardware build implements 2 rotatory encoders and 2 OLED displays.
-
-## Features
-
-These are some of the generic features built in:
-
-- Two alternative default character distributions (**QWERTY**, **COLEMAK**) with *Spanish* layout.
-- Layer selection on some keys (**Esc**, **Lower**, **Space**, **Enter**, **Raise**).
-- Multiple selectable layers:
-  - **Symbols**: Numbers on top row, common programming symbols (curly, square and angle brackets, parentheses, at and hash) on bottom row with symmetric distribution (open on left, close on right).
-  - **Function**/**Numpad**: Function keys on left side, Number Pad on right side.
-  - **Navigation**: Mouse keys on left side, Navigation keys on right side.
-  - **Git commands**: The most common and useful Git commands at your fingertips.
-  - **Settings**: Select default distribution, Media keys, RGB settings.
-- Symmetric design -left/right side- for modifiers (**Shift**, **Ctrl**, **Alt** and **GUI**).
-- **Arrows**/**Modifiers** on same keys (right side).
-- **Tab**/**Caps Lock** key.
-- **Backspace**/**Delete** with **Insert**/**Overwrite** selectable mode on same key.
-- **Single/Double Quote** (`' "`) on same key as English layouts.
-- Handedness set by EEPROM.
-- Mouse Keys has been disabled by default for space saving (Pro Micro controller limit).
-
-Some of the more specific features are described below:
-
-### Tap Dance
-
-- Use of `ACTION_TAP_DANCE_DOUBLE()` for **Tab**/**Caps Lock** key.
-- Implementation of new `ACTION_TAP_DANCE_FN_ADVANCED_USER()` function:
-  - Any user data can be sent to personalized functions.
-  - Generalized design makes action reuse easy.
-  - User can tap a keycode and/or layer selection (single tap, single hold, double tap) depending on modifiers (**None**, **Shift**, **Ctrl**).
-
-### OLEDs
-
-Master-side OLED displays dynamic data:
-
-- Current layer.
-- Modifiers state (lock mode included).
-- Caps Lock state.
-- Insert/Overwrite state.
-
-Slave-side OLED displays horizontal scrolling Kyria logo.
-
-### Rotary Encoders
-
-Encoders click buttons for mode changing. Supported modes are:
-
-- Character Left / Right, Line Up / Down.
-- Word Left / Right, Page Up / Down.
-- Tabbing Left / Right (Navigator, Editor).
-- Volume Up / Down.
-
-## TODO list
-
-- [x] Show modifiers in OLED when triggered as One Shot keys
-- [x] Manage Backspace key with dual funcion (Delete when shifted)
-- [x] OLED modifier status bar one line down
-- [x] Show INS/OWR Mode in right OLED
-- [x] Show RGB Led Settings on OLED when Settings layer on
-- [x] Show Locked Modifiers (Shift, Control, Alt, GUI)
-- [x] Arrow keys on right modifier keys
-- [x] Improve Esc/Layer Symbol: Tap -> Keycode, Hold -> Momentary Layer, Double Tap -> Toggler Layer
-- [x] Check transparent keys on all layers (avoid collateral effects)
-- [x] Add "Print Screen" / "Scroll Lock" / "Pause Break" keys on Navigation layer
-- [x] Add Basic characters layers: COLEMAK (ES)
-- [x] Create custom keycode with quotes (single/double) for ES layout
-- [x] Add Tap-Dance actions for keycodes (Tab, Space, Enter) and layer selection
-- [x] Add Git commands to some layer
-- [x] Disable Mouse Keys (saving space)
-- [x] Settings Layer not accesible
-- [x] Layer buttons with double/triple function (Normal/Shift/Control mode)
-- [x] Tab/Caps Lock on same key (single/double tap)
-- [x] Backspace/Delete/Insert on same key (Normal/Shift/Ctrl)
-- [x] Separate default layer from RGB settings rendering for conditional compiling
-- [x] Encoders: Improve with more functionality (modes)
-- [ ] Encoders: Add mode for navigation through windows (applications)
-- [ ] Show more info about RGB Led Settings (On/Off, Animation, ...)
-- [ ] Activate "Nums Lock" when Fn/NumPad layer locked
-- [ ] Show status indicator when locked layer
-- [ ] Set RGB Led Color by selected Layer (activable)
-- [ ] Add more uses for left OLED
-- [ ] Something strange returning from One Shot hold
-
-## Acknowledgements
-
-Thanks to the entire QMK community for your invaluable help.
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk b/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
deleted file mode 100644
index 61577a39a52..00000000000
--- a/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-BOOTLOADER         = caterina  # Pro Micro bootloader
-
-TAP_DANCE_ENABLE   = yes       # Enable Tap Dance
-
-ENCODER_ENABLE     = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE    = yes       # Enable keyboard RGB underglow
-
-MOUSEKEY_ENABLE    = no        # Disable mouse (saving space)
diff --git a/keyboards/splitkb/kyria/keymaps/lw/config.h b/keyboards/splitkb/kyria/keymaps/lw/config.h
deleted file mode 100644
index efacab2ffe6..00000000000
--- a/keyboards/splitkb/kyria/keymaps/lw/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Lucas Waelti (@LucasWaelti)
- *
- * 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
-
-// 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
-
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode 
diff --git a/keyboards/splitkb/kyria/keymaps/lw/keymap.c b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
deleted file mode 100644
index 8cc29c84631..00000000000
--- a/keyboards/splitkb/kyria/keymaps/lw/keymap.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* Copyright 2022 Lucas Waelti (@LucasWaelti)
- *
- * 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_us_international.h>
-// US_ACUT KC_QUOT // ´ (dead)
-// US_DGRV KC_GRV  // ` (dead)
-// US_DCIR S(US_6)    // ^ (dead)
-// US_DIAE S(US_ACUT) // ¨ (dead)
-
-enum layers {
-    _QWERTZ = 0,    // base text layer
-    _SYM,           // symbol layer 
-    _NAV,           // navigation layer + accents 
-};
-
-enum unicode_names {
-    APOST,
-    QUOTE,
-    CIRCUM,
-    GRAVE,
-    ACUTE,
-    UMLAUT,
-    CEDIL_MAJ,
-    CEDIL,
-    SECTION,
-    DEGREE,
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    [APOST]         = 0x0027, // '
-    [QUOTE]         = 0x0022, // "
-    [ACUTE]         = 0x00B4, // ´
-    [GRAVE]         = 0x0060, // `
-    [CIRCUM]        = 0x005E, // ^ 
-    [UMLAUT]        = 0x00A8, // ¨
-    [CEDIL_MAJ]     = 0x00C7, // Ç
-    [CEDIL]         = 0x00E7, // ç
-    [SECTION]       = 0x00A7, // §
-    [DEGREE]        = 0x00B0, // °
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
-/*
- * 0. Base Layer: QWERTZ
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Esc   |   Q  |   W  |   E  |   R  |   T  |                              |   Z  |   U  |   I  |   O  |   P  |  Del   |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  Tab   |   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ' "  | BkSpace|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Y  |   X  |   C  |   V  |   B  | \ |  |  ` ~ |  |  (   |   )  |   N  |   M  | ,  < | . >  | ;  : | CpLock |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |LCtrl | LGUI | LAlt | Space| MO(1)|  | MO(2)| Enter| - _  |  !   | / ?  |
- *                        |      |      |      |      |      |  |      |/shift|      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_QWERTZ] = LAYOUT(
-  KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                        KC_Z,    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, UP(APOST,QUOTE), KC_BSPC, //  UP(APOST,QUOTE) or KC_QUOT
- KC_LSFT,    KC_Y,    KC_X,    KC_C,    KC_V,    KC_B, KC_BSLS, KC_GRV,  KC_LPRN,    KC_RPRN, KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SCLN, KC_CAPS,
-                            KC_LCTL, KC_LGUI, KC_LALT,  KC_SPC,   MO(1),   MO(2),    SC_SENT, KC_MINS, KC_EXLM, KC_SLSH
-    ),
-
-// /*
-//  * 1. Sym Layer: Numbers and symbols (DEPRECATED)
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |   F1   | F2   | F3   | F4   | F5   | F6   |                              |  F7  | F8   | F9   | F10  | F11  |  F12   |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |    .   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   =    |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |  LAlt  |   ?  |  !   |  @   |  #   |  <   |  [   |  {   |  |  }   |  ]   |   >  |  ^   |  /   |  *   |  -   |   +    |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |  $   |  %   |  &   |      | MO(1)|  | MO(2)| RAlt |   ~  |   _  |  |   |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_SYM] = 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_DOT,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_PEQL,
-//  KC_LALT, KC_QUES, KC_EXLM,   KC_AT, KC_HASH,   KC_LT, KC_LBRC, KC_LCBR, KC_RCBR, KC_RBRC,   KC_GT, KC_CIRC, KC_PSLS, KC_ASTR, KC_PMNS, KC_PLUS,
-//                              KC_DLR, KC_PERC, KC_AMPR, _______,   MO(1),   MO(2), KC_RALT, KC_TILD, KC_UNDS, KC_PIPE
-//     ),
-
-/*
- * 1. Sym Layer: Numbers and symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |   F1   |  F2  |  F3  |  F4  | LAlt | PASTE|                              |   ,  |  7   |  8   |  9   |  *   |  /     |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |   F5   |  F6  |  F7  |  F8  |  @   | COPY |                              |   .  |  6   |  7   |  8   |  =   |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |   F9   |  F10 |  F11 |  F12 |  &   |  CUT | UNDO | FIND |  |   [  |  ]   |   0  |  1   |  2   |  3   |  +   |   -    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |  $   |  #   |  %   |      | MO(1)|  | MO(2)|      |  \ | |  {   |   }  |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_SYM] = LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_LALT,LCTL(KC_V),                                         KC_COMM,     KC_7,    KC_8,    KC_9,  KC_ASTR, KC_PSLS,
-  KC_F5,   KC_F6,   KC_F7,   KC_F8, KC_AT,  LCTL(KC_C),                                          KC_DOT,     KC_4,    KC_5,    KC_6,  KC_PEQL, _______,
-  KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_AMPR,LCTL(KC_X),LCTL(KC_Z), LCTL(KC_F), KC_LBRC, KC_RBRC,   KC_0,     KC_1,    KC_2,    KC_3,  KC_PLUS, KC_PMNS,
-                            KC_DLR, KC_HASH,   KC_PERC, _______,   MO(1),        MO(2), _______, KC_BSLS, KC_LCBR, KC_RCBR
-    ),
-
-/*
- * 2. Nav Layer: Media, navigation, accents
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        | Brt+ | Next | Fwd  | Play | Vol+ |                              | Home | PgUp |  Up  | PgDn |      | Del    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | Brt- | Prev | Bckw | Stop | Vol- |                              |  End | Left | Down | Right|ScrLck| BkSpace|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |  ´   |  `   |  ^   |  ¨   | Mute |      |UC_Nxt|  |RShift| Menu | PrtSc| ç/Ç  | § °  |      | SAVE | Insert |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |LCtrl | LGUI | LAlt |      | MO(1)|  | MO(2)| UNDO |  CUT | COPY | PASTE|
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_NAV] = LAYOUT(
- _______, KC_BRIU, KC_MNXT, KC_MFFD, KC_MPLY, KC_VOLU,                                     KC_HOME, KC_PGUP,   KC_UP, KC_PGDN, _______,  KC_DEL,
- _______, KC_BRID, KC_MPRV, KC_MRWD, KC_MSTP, KC_VOLD,                                      KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_SCRL, KC_BSPC,
- KC_LSFT, US_ACUT, US_DGRV, US_DCIR, US_DIAE, KC_MUTE, _______, UC_NEXT, KC_RSFT,  KC_APP, KC_PSCR, UP(CEDIL,CEDIL_MAJ), UP(SECTION,DEGREE), _______, LCTL(KC_S),  KC_INS,
-                            KC_LCTL, KC_LGUI, KC_LALT, _______,   MO(1),   MO(2), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V)
-    ),
-
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-/* The default OLED and rotary encoder code can be found at the bottom of qmk_firmware/keyboards/splitkb/kyria/rev1/rev1.c
- * These default settings can be overriden by your own settings in your keymap.c
- * For your convenience, here's a copy of those settings so that you can uncomment them if you wish to apply your own modifications.
- * DO NOT edit the rev1.c file; instead override the weakly defined default functions by your own.
- */
-
-/* DELETE THIS LINE TO UNCOMMENT (1/2)
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        // QMK Logo and version information
-        // clang-format off
-        static const char PROGMEM qmk_logo[] = {
-            0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-            0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-            0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-        // clang-format on
-
-        oled_write_P(qmk_logo, false);
-        oled_write_P(PSTR("Kyria rev1.0\n\n"), false);
-
-        // Host Keyboard Layer Status
-        oled_write_P(PSTR("Layer: "), false);
-        switch (get_highest_layer(layer_state|default_layer_state)) {
-            case _QWERTZ:
-                oled_write_P(PSTR("QWERTZ\n"), false);
-                break;
-            case _NAV:
-                oled_write_P(PSTR("Nav\n"), false);
-                break;
-            case _SYM:
-                oled_write_P(PSTR("Sym\n"), false);
-                break;
-            default:
-                oled_write_P(PSTR("Undefined\n"), false);
-        }
-
-        // Write host Keyboard LED Status to OLEDs
-        led_t led_usb_state = host_keyboard_led_state();
-        oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-    } else {
-        // clang-format off
-        static const char PROGMEM kyria_logo[] = {
-            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-            0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-        };
-        // clang-format on
-        oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-    }
-    return false;
-}
-#endif
-
-#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
-// DELETE THIS LINE TO UNCOMMENT (2/2) */
diff --git a/keyboards/splitkb/kyria/keymaps/lw/readme.md b/keyboards/splitkb/kyria/keymaps/lw/readme.md
deleted file mode 100644
index 87d4d17e96f..00000000000
--- a/keyboards/splitkb/kyria/keymaps/lw/readme.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Kyria's lw Keymap
-
-Custom keymap for the [kyria keyboard](https://blog.splitkb.com/blog/introducing-the-kyria). It is intended to be used with an *English (US, intl. with dead keys)* keyboard layout (includes the `keymap_us_international.h` header). 
-
-This layout is mainly designed for every day writing in either English, French or German and programming. 
-
-The layout implements all accents and symbols (leveraging dead keys) found on a **swiss** keyboard. It uses Unicode for special characters. It makes use of the [Linux built-in IBus Unicode input](https://docs.qmk.fm/#/feature_unicode?id=input-modes) and relies on [WinCompose](https://github.com/samhocevar/wincompose) for Windows. 
-
-## Build this keymap
-```bash
-qmk compile -kb splitkb/kyria/rev1 -km lw
-```
-
-## Flash this keymap
-
-> **Note**: this was tested for an Elite-C microcontroller. 
-
-First, check that the bootloader is visible. For instance:
-```bash
-$ lsusb
-...
-Bus 001 Device 034: ID 03eb:2ff4 Atmel Corp. atmega32u4 DFU bootloader
-...
-```
-If the bootloader is not visible, press the reset button of the microcontroller. The bootloader should become visible when running the `lsusb` command again. 
-
-The microcontroller can now be flashed: 
-```bash
-qmk flash -kb splitkb/kyria/rev1 -km lw
-```
-> **Note**: if there is any issue, run `qmk doctor` to see whether the qmk configuration is valid. 
-
-## Implemented keymaps
-The default keymap contains 5 layers which allows it to include all keys found on an ANSI layout TKL keyboard plus media keys.
-Hardware features of the Kyria such as OLEDs, rotary encoders and underglow are also supported.
-
-The five different layers are the following:
-1. Base layer (QWERTZ)
-2. Symbols/Numbers layer
-3. Navigation layer
-
-### Base layer
-This layer is activated by default. 
-
-```
-/*
- * 0. Base Layer: QWERTZ
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Esc   |   Q  |   W  |   E  |   R  |   T  |                              |   Z  |   U  |   I  |   O  |   P  |  Del   |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  Tab   |   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ' "  | BkSpace|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Y  |   X  |   C  |   V  |   B  | \ |  |  ` ~ |  |  (   |   )  |   N  |   M  | ,  < | . >  | ;  : | CpLock |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |LCtrl | LGUI | LAlt | Space| MO(1)|  | MO(2)| Enter| - _  |  !   | / ?  |
- *                        |      |      |      |      |      |  |      |/shift|      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-```
-
-Hold down the `Enter` key to make it a shift. This compensates for the poor placement of the dedicated `LShift` key. 
-
-### Symbol layer
-This layer is activated when holding `MO(1)`.
-
-```
-/*
- * 1. Sym Layer: Numbers and symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |   F1   |  F2  |  F3  |  F4  | LAlt | PASTE|                              |   ,  |  7   |  8   |  9   |  *   |  /     |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |   F5   |  F6  |  F7  |  F8  |  @   | COPY |                              |   .  |  6   |  7   |  8   |  =   |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |   F9   |  F10 |  F11 |  F12 |  &   |  CUT | UNDO | FIND |  |   [  |  ]   |   0  |  1   |  2   |  3   |  +   |   -    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |  $   |  #   |  %   |      | MO(1)|  | MO(2)|      |  \ | |  {   |   }  |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-```
-
-### Navigation layer
-This layer is activated when holding `MO(2)`.
-
-```
-/*
- * 2. Nav Layer: Media, navigation, accents
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        | Brt+ | Next | Fwd  | Play | Vol+ |                              | Home | PgUp |  Up  | PgDn |      | Del    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | Brt- | Prev | Bckw | Stop | Vol- |                              |  End | Left | Down | Right|ScrLck| BkSpace|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |  ´   |  `   |  ^   |  ¨   | Mute |      |UC_Nxt|  |RShift| Menu | PrtSc| ç/Ç  | § °  |      | SAVE | Insert |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |LCtrl | LGUI | LAlt |      | MO(1)|  | MO(2)| UNDO |  CUT | COPY | PASTE|
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-```
-
-The key `UC_NEXT` allows to switch between Linux and Windows unicode. Note however that [WinCompose](https://github.com/samhocevar/wincompose) must be installed on Windows (simply download and install the latest release and it will run). 
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/lw/rules.mk b/keyboards/splitkb/kyria/keymaps/lw/rules.mk
deleted file mode 100644
index 36553b7b25c..00000000000
--- a/keyboards/splitkb/kyria/keymaps/lw/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = no 
-ENCODER_ENABLE = no     # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = no    # Enable keyboard RGB underglow
-
-UNICODEMAP_ENABLE = yes	# Enable unicode 
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h b/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
deleted file mode 100644
index e4146661c64..00000000000
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP  8
-#    define RGBLIGHT_SAT_STEP  8
-#    define RGBLIGHT_VAL_STEP  8
-#    define RGBLIGHT_LIMIT_VAL 150
-#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/splitkb/kyria/keymaps/maherma-adg/keymap.c b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
deleted file mode 100644
index eb5a38d0993..00000000000
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-#include "keymap_spanish.h"
-
-enum layers {
-    _QWERTY = 0,
-    _DVORAK,
-    _COLEMAK_DH,
-    _NAV,
-    _SYM,
-    _FUNCTION,
-    _ADJUST,
-    _NUMPAD,
-    _MOUSE
-};
-
-
-// Aliases for readability
-#define QWERTY   DF(_QWERTY)
-#define COLEMAK  DF(_COLEMAK_DH)
-#define DVORAK   DF(_DVORAK)
-
-#define NUMPAD   DF(_NUMPAD)
-#define MOUSE    DF(_MOUSE)
-#define DNAV     DF(_NAV)
-
-#define SYM      MO(_SYM)
-#define NAV      MO(_NAV)
-#define FKEYS    MO(_FUNCTION)
-#define ADJUST   MO(_ADJUST)
-
-#define CTL_ESC  MT(MOD_LCTL, KC_ESC)
-#define CTL_QUOT MT(MOD_RCTL, KC_QUOTE)
-#define CTL_MINS MT(MOD_RCTL, KC_MINUS)
-#define ALT_ENT  MT(MOD_LALT, KC_ENT) 
-#define LGUI_ENT MT(MOD_LGUI, KC_ENT)
-#define LALT_SUP MT(MOD_LALT, KC_DEL)
-#define RGUI_TAB MT(MOD_RGUI, KC_TAB)
-#define RALT_BS  MT(MOD_RALT, KC_BSPC)
-#define LSFT_LPR MT(MOD_LSFT, ES_LPRN)
-#define RSFT_RPR MT(MOD_RSFT, ES_RPRN)
-
-#define NAV_ESC  LT(NAV, KC_ESC)
-#define SYM_SPC  LT(SYM, KC_SPC)
-#define NAV_SPC  LT(NAV, KC_SPC)
-#define SYM_ENT  LT(SYM, KC_ENT)
-
-#define OSX_TILD ALGR(KC_SCLN)
-
-// Note: LAlt/Enter (ALT_ENT) is not the same thing as the keyboard shortcut Alt+Enter.
-// The notation `mod/tap` denotes a key that activates the modifier `mod` when held down, and
-// produces the key `tap` when tapped (i.e. pressed and released).
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  |   Ñ  |Ctrl/´ ¨|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |LShift/(|   Z  |   X  |   C  |   V  |   B  | `^[  |CapsLk|  |F-keys|  +*] |   N  |   M  | , ;  | . :  | -  _ |RShift/)|
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LAlt/| LGUI/| Sym/ | Nav/ |  | Sym/ | Nav/ | RGUI/| RAlt/| Menu |
- *                        |      | Supr | Enter| Space| Esc  |  | Enter| Space| Tab  | Bksp |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_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_BSPC,
-     CTL_ESC  , KC_A ,  KC_S   ,  KC_D  ,   KC_F ,   KC_G ,                                        KC_H,   KC_J ,  KC_K ,   KC_L  , KC_SCLN, CTL_QUOT,
-     LSFT_LPR , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , ES_GRV , KC_CAPS,       FKEYS  , ES_PLUS , KC_N    ,  KC_M,  KC_COMM , KC_DOT , KC_SLSH, RSFT_RPR,
-                                ADJUST , LALT_SUP, LGUI_ENT, SYM_SPC , NAV_ESC,     SYM_ENT, NAV_SPC , RGUI_TAB, RALT_BS, KC_APP
-    ),
-
-/*
- * Base Layer: Dvorak
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Tab   | ´ ¨  | , ;  | . :  |   P  |   Y  |                              |   F  |   G  |   C  |   R  |   L  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Ctrl/Esc|   A  |   O  |   E  |   U  |   I  |                              |   D  |   H  |   T  |   N  |   S  |Ctrl/' ?|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |LShift/(|   Ñ  |   Q  |   J  |   K  |   X  | `^[  |CapsLk|  |F-keys|  +*] |   B  |   M  |   W  |   V  |   Z  |RShift/)|
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LAlt/| LGUI/| Sym/ | Nav/ |  | Sym/ | Nav/ | RGUI/| RAlt/| Menu |
- *                        |      | Supr | Enter| Space| Esc  |  | Enter| Space| Tab  | Bksp |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_DVORAK] = LAYOUT(
-     KC_TAB   ,KC_QUOTE,KC_COMM,  KC_DOT,   KC_P ,   KC_Y ,                                        KC_F,   KC_G ,  KC_C ,   KC_R ,  KC_L , KC_BSPC,
-     CTL_ESC  , KC_A ,  KC_O   ,  KC_E  ,   KC_U ,   KC_I ,                                        KC_D,   KC_H ,  KC_T ,   KC_N ,  KC_S , CTL_MINS,
-     LSFT_LPR ,KC_SCLN, KC_Q   ,  KC_J  ,   KC_K ,   KC_X , ES_GRV, KC_CAPS,     FKEYS  , ES_PLUS, KC_B,   KC_M ,  KC_W ,   KC_V ,  KC_Z , RSFT_RPR,
-                                ADJUST , LALT_SUP, LGUI_ENT, SYM_SPC , NAV_ESC,     SYM_ENT, NAV_SPC , RGUI_TAB, RALT_BS, KC_APP
-    ),
-
-/*
- * Base Layer: Colemak DH
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Tab   |   Q  |   W  |   F  |   P  |   B  |                              |   J  |   L  |   U  |   Y  |   Ñ  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Ctrl/Esc|   A  |   R  |   S  |   T  |   G  |                              |   M  |   N  |   E  |   I  |   O  |Ctrl/´ ¨|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |LShift/(|   Z  |   X  |   C  |   D  |   V  | `^[  |CapsLk|  |F-keys|  +*] |   K  |   H  | , ;  | . :  | -  _ |RShift/)|
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LAlt/| LGUI/| Sym/ | Nav/ |  | Sym/ | Nav/ | RGUI/| RAlt/| Menu |
- *                        |      | Supr | Enter| Space| Esc  |  | Enter| Space| Tab  | Bksp |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_COLEMAK_DH] = LAYOUT(
-     KC_TAB   , KC_Q ,  KC_W   ,  KC_F  ,   KC_P ,   KC_B ,                                        KC_J,   KC_L , KC_U    , KC_Y    , KC_SCLN , KC_BSPC,
-     CTL_ESC  , KC_A ,  KC_R   ,  KC_S  ,   KC_T ,   KC_G ,                                        KC_M,   KC_N , KC_E    , KC_I    , KC_O    , CTL_QUOT,
-     LSFT_LPR , KC_Z ,  KC_X   ,  KC_C  ,   KC_D ,   KC_V , ES_GRV, KC_CAPS,        FKEYS  , ES_PLUS , KC_K     , KC_H    , KC_COMM , KC_DOT  , KC_SLSH, RSFT_RPR,
-                                ADJUST , LALT_SUP, LGUI_ENT, SYM_SPC , NAV_ESC,     SYM_ENT, NAV_SPC , RGUI_TAB , RALT_BS , KC_APP
-    ),
-
-/*
- * Nav Layer: Media, navigation
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              | PgUp | Home |   ↑  | End  | VolUp| Delete |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | Shift| Ctrl | Alt  |  GUI |      |                              | PgDn |  ←   |   ↓  |   →  | VolDn| Insert |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |ScLck |  |      |      | Pause|M Prev|M Play|M Next|VolMut| PrtSc  |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_NAV] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
-      _______, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
-      _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Sym Layer: Numbers and symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |    º   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   '    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |    ª   |  !   |  "   |  ·   |  $   |  %   |                              |   &  |  /   |  (   |  )   |  =   |   ?    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |    \   |  |   |   @  |  #   |  ~   |  €   |  ¬   |      |  |      |      |   ¡  |  <   |  >   |   {  |  }   |   ¿    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_SYM] = LAYOUT(
-     KC_NUBS,   KC_1 ,   KC_2 ,   KC_3 ,   KC_4 ,   KC_5 ,                                               KC_6 ,   KC_7 ,   KC_8 ,   KC_9 ,   KC_0 , ES_QUOT,
-     S(KC_NUBS) , ES_EXLM,  ES_DQUO , ES_BULT,  ES_DLR, ES_PERC,                                       ES_AMPR, ES_SLSH, ES_LPRN, ES_RPRN, ES_EQL, ES_QUES,
-     A(KC_NUBS), ES_PIPE, ES_AT, ES_HASH , OSX_TILD, A(KC_E), ES_NOT, _______,   S(ES_CCED), ES_CCED,  ES_IEXL, KC_GRAVE, S(KC_GRAVE),  ES_LCBR, ES_RCBR, ES_IQUE,
-                                  _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______
-    ),
-
-/*
- * Sym Layer: Numbers and symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |    `   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   '    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |    ~   |  !   |  @   |  ·   |  $   |  %   |                              |   &  |  /   |  (   |  )   |  =   |   ¿    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |    |   |   \  |  :   |  ;   |  -   |  [   |  {   |      |  |      |   }  |   ]  |  _   |  ,   |  .   |  /   |   ?    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-//    [_SYM] = LAYOUT(
-//     C(KC_GRV),   KC_1 ,   KC_2 ,   KC_3 ,   KC_4 ,   KC_5 ,                                       KC_6 ,   KC_7 ,   KC_8 ,   KC_9 ,   KC_0 , KC_EQL ,
-//     OSX_TILD , KC_EXLM,  KC_AT , KC_HASH,  KC_DLR, KC_PERC,                                     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
-//     ES_PIPE , A(KC_NUHS) , ES_COLN, ES_SCLN, ES_MINS, ES_LBRC, ES_LCBR, _______, _______, ES_RCBR, ES_RBRC, ES_UNDS, ES_COMM,  ES_DOT, ES_SLSH, ES_QUOT,
-//                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//    ),
-
-/*
- * Function Layer: Function keys
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  F9  | F10  | F11  | F12  |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  F5  |  F6  |  F7  |  F8  |      |                              |      |  GUI |  Alt | Ctrl | Shift|        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |  F1  |  F2  |  F3  |  F4  |      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_FUNCTION] = LAYOUT(
-      _______,  KC_F9 ,  KC_F10,  KC_F11,  KC_F12, _______,                                     _______, _______, _______, _______, _______, _______,
-      _______,  KC_F5 ,  KC_F6 ,  KC_F7 ,  KC_F8 , _______,                                     _______, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT, _______,
-      _______,  KC_F1 ,  KC_F2 ,  KC_F3 ,  KC_F4 , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Adjust Layer: Default layer settings, RGB
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * | NumPad |      |      |QWERTY|      |      |                              |      |      |      |      |      |  Boot  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * | Mouse  |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  | Debug  |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |Nav Perm|      |      |Colmak|      |      |      |      |  |      |      |      | SAD  | HUD  | VAD  | RMOD | EE_CLR |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_ADJUST] = LAYOUT(
-      NUMPAD , _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, QK_BOOT,
-      MOUSE  , _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, DB_TOGG,
-      DNAV   , _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, EE_CLR,
-                                 _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Layer NumPad
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust|      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_NUMPAD] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 ADJUST , _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Layer Mouse
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              |      |MS LCL| MS ↑ |MS RCL| Whl ↑|        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | Shift| Ctrl | Alt  |  GUI |      |                              |      | MS ← | MS ↓ | MS → | Whl ↓|        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust|      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_MOUSE] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______,
-      _______, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, _______,                                     _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 ADJUST , _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-/* The default OLED and rotary encoder code can be found at the bottom of qmk_firmware/keyboards/splitkb/kyria/rev1/rev1.c
- * These default settings can be overriden by your own settings in your keymap.c
- * For your convenience, here's a copy of those settings so that you can uncomment them if you wish to apply your own modifications.
- * DO NOT edit the rev1.c file; instead override the weakly defined default functions by your own.
- */
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        // QMK Logo and version information
-        // clang-format off
-        static const char PROGMEM qmk_logo[] = {
-            0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-            0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-            0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-        // clang-format on
-
-        oled_write_P(qmk_logo, false);
-        oled_write_P(PSTR("Kyria AdG v0.1\n\n"), false);
-
-        // Host Keyboard Layer Status
-        oled_write_P(PSTR("Layer: "), false);
-        switch (get_highest_layer(layer_state|default_layer_state)) {
-            case _QWERTY:
-                oled_write_P(PSTR("QWERTY\n"), false);
-                break;
-            case _DVORAK:
-                oled_write_P(PSTR("Dvorak\n"), false);
-                break;
-            case _COLEMAK_DH:
-                oled_write_P(PSTR("Colemak-DH\n"), false);
-                break;
-            case _NAV:
-                oled_write_P(PSTR("Nav\n"), false);
-                break;
-            case _SYM:
-                oled_write_P(PSTR("Sym\n"), false);
-                break;
-            case _FUNCTION:
-                oled_write_P(PSTR("Function\n"), false);
-                break;
-            case _ADJUST:
-                oled_write_P(PSTR("Adjust\n"), false);
-                break;
-            case _NUMPAD:
-                oled_write_P(PSTR("NumPad\n"), false);
-                break;
-            case _MOUSE:
-                oled_write_P(PSTR("Mouse\n"), false);
-                break;
-            default:
-                oled_write_P(PSTR("Undefined\n"), false);
-        }
-
-        // Write host Keyboard LED Status to OLEDs
-        led_t led_usb_state = host_keyboard_led_state();
-        oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-    } else {
-        // clang-format off
-        static const char PROGMEM kyria_logo[] = {
-            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-            0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-        };
-        // clang-format on
-        oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-    }
-    return false;
-}
-#endif
-
-#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
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LSFT_LPR:
-            if (record->tap.count && record->event.pressed) {
-                tap_code16(ES_LPRN); // Send KC_DQUO on tap
-                return false;        // Return false to ignore further processing of key
-            }
-            break;
-        case RSFT_RPR:
-            if (record->tap.count && record->event.pressed) {
-                tap_code16(ES_RPRN); // Send KC_DQUO on tap
-                return false;        // Return false to ignore further processing of key
-            }
-            break;
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/readme.md b/keyboards/splitkb/kyria/keymaps/maherma-adg/readme.md
deleted file mode 100644
index bf54275d2b6..00000000000
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Kyria's Keymap adapted to Spanish MacOS (WIP)
-
-
-
-The default keymap contains 7 layers which allows it to include all keys found on spanish Apple keyboard plus media keys.
-Hardware features of the Kyria such as OLEDs and underglow are also supported.
-
-The five different layers are the following:
-1. Base layer (QWERTY, Colemak-DH or Dvorak)
-2. Navigation layer
-3. Symbols/Numbers layer
-4. Function layer
-5. Adjust layer
-6. Numpad layer
-7. Mouse layer
-
-Look into keymap.c to view mappings
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk b/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
deleted file mode 100644
index 2f8de3561ef..00000000000
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = no       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-MOUSEKEY_ENABLE = yes	 # Enable mouse movements
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/config.h b/keyboards/splitkb/kyria/keymaps/mattir/config.h
deleted file mode 100644
index 40b6f4434eb..00000000000
--- a/keyboards/splitkb/kyria/keymaps/mattir/config.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-#    define OLED_DISPLAY_128X64
-#    define OLED_TIMEOUT 300000
-#    define OLED_UPDATE_INTERVAL 30
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_LIMIT_VAL 150
-#    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 RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
-#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
-
-// Set the layer toggle to only need 2 clicks instead of 5
-#define TAPPING_TOGGLE 2
-
-// EC11K encoders have a different resolution than other EC11 encoders.
-#define ENCODER_RESOLUTION 2
-
-// The Leader key allows to flexibly assign macros to key sequences.
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 350
-
-#define TAPPING_TERM 200
-
-// Allows to use either side as the master. Look at the documentation for info:
-// https://docs.qmk.fm/#/config_options?id=setting-handedness
-#define EE_HANDS
-
-// Allows media codes to properly register in macros and rotary encoder code
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir/keymap.c
deleted file mode 100644
index 5bc0b8215e3..00000000000
--- a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* Copyright 2020 Matthew Gilbert <hello+github@mattir.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 layers {
-  QWERTY = 0,
-  LOWER,
-  RAISE,
-  FUNCS,
-  RGBLED
-};
-
-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_BSLS,
-      KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
-      QK_LEAD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, XXXXXXX, XXXXXXX, KC_MINS, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
-      KC_MUTE, KC_LCTL, KC_LGUI, TT(RAISE), SFT_T(KC_SPC), SFT_T(KC_SPC), TT(LOWER), KC_BSPC, KC_LALT, TG(RGBLED)
-      ),
-  [LOWER] = LAYOUT(
-      _______, KC_EXLM, KC_AT, KC_HASH, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______,
-      _______, KC_DLR, KC_PERC, KC_CIRC, KC_LPRN, KC_RPRN, KC_EQL, KC_PLUS, KC_MINS, KC_ASTR, KC_SLSH, _______,
-      TG(FUNCS), KC_AMPR, _______, _______, KC_LBRC, KC_RBRC, _______, XXXXXXX, XXXXXXX, _______, _______, _______, KC_COMM, KC_DOT, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      ),
-  [RAISE] = LAYOUT(
-      _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
-      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
-      _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______, XXXXXXX, XXXXXXX, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______
-      ),
-  [FUNCS] = LAYOUT(
-      _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PAST, _______,
-      _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PSLS, _______,
-      TG(FUNCS), KC_F11, KC_F12, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PDOT, KC_PEQL,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      ),
-  [RGBLED] = LAYOUT(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, RGB_VAI, RGB_HUI, RGB_SAI, RGB_MOD, _______, _______, _______, _______, _______, _______,
-      _______, _______, RGB_VAD, RGB_HUD, RGB_SAD, RGB_RMOD, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, _______,
-      RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, TG(RGBLED)
-      ),
-};
-
-void leader_end_user(void) {
-  if (leader_sequence_one_key(KC_A)) {
-    tap_code16(SGUI(KC_L));
-  }
-  if (leader_sequence_two_keys(KC_S, KC_S)) {
-    tap_code16(SGUI(KC_5));
-  }
-}
-
-bool is_cmd_tab_active = false;
-uint16_t cmd_tab_timer = 0;
-
-void matrix_scan_user(void) {
-  if (is_cmd_tab_active) {
-    if (timer_elapsed(cmd_tab_timer) > 1000) {
-      unregister_code(KC_LGUI);
-      is_cmd_tab_active = false;
-    }
-  }
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  return OLED_ROTATION_180;
-}
-
-static void render_mattir_logo(void) {
-  static const char PROGMEM mattir_logo[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x3c, 0xfc, 0xf8, 0xe0,
-    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, 0x80, 0xe0, 0xe0, 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, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x83, 0x07,
-    0x1f, 0x7e, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0x3f, 0x1f, 0x7f, 0xff,
-    0xfc, 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, 0x0f, 0xff, 0xfc, 0xf8, 0x1c, 0x0f, 0x07, 0x00,
-    0x00, 0x00, 0x01, 0x07, 0x1f, 0x7e, 0xf8, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0x7f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x0f,
-    0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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,
-    0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfe, 0xff, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x7f, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x80,
-    0xe0, 0xf8, 0xfe, 0x3f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x01, 0x3f, 0xff, 0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
-    0xfe, 0xff, 0x7f, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0x7f, 0xff, 0xff, 0xe0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0,
-    0x00, 0x00, 0xe0, 0xfe, 0xfe, 0xfe, 0xe0, 0xe0, 0x00, 0xe0, 0xfe, 0xfe, 0xfe, 0xe0, 0x60, 0x00,
-    0xe3, 0xe3, 0xe3, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0x1f,
-    0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x07, 0xff, 0xff, 0xf8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff,
-    0xff, 0x07, 0x00, 0x01, 0x07, 0x1f, 0x7f, 0xf8, 0xfe, 0x3f, 0x07, 0x01, 0x00, 0x03, 0xff, 0xff,
-    0xfc, 0x00, 0x00, 0x00, 0x1e, 0x7f, 0xff, 0xe1, 0xc0, 0xc0, 0xc0, 0xc0, 0xe1, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x80, 0xfc, 0xff, 0x7f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-    0xfe, 0xff, 0xff, 0x1f, 0x7f, 0xfe, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0x7f, 0x1f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01,
-    0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff,
-    0xff, 0x3f, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0f, 0x3f, 0xff, 0xfc, 0xf0, 0xc0, 0x80, 0x00, 0xc0,
-    0xf0, 0xfc, 0xfe, 0x3f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xf0, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x78, 0xff, 0xef, 0xcf, 0xce, 0xfc, 0x7c, 0x30, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x38, 0x3f, 0x3f, 0x3f, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x3c, 0x3f, 0x3f,
-    0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x1f, 0x3f, 0x3f, 0x1f,
-    0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x3f, 0x3f, 0x3c, 0x38,
-    0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39, 0x39, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x30,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
-  oled_write_raw_P(mattir_logo, sizeof(mattir_logo));
-}
-
-static void render_qmk_logo(void) {
-  static const char PROGMEM qmk_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
-  };
-  oled_write_P(qmk_logo, false);
-}
-
-static void render_status(void) {
-  // QMK Logo and version information
-  render_qmk_logo();
-  oled_write_P(PSTR("Matt's Kyria\n\n"), false);
-  // Host Keyboard Layer Status
-  oled_write_P(PSTR("Layer: "), false);
-  switch (get_highest_layer(layer_state)) {
-    case QWERTY:
-      oled_write_P(PSTR("Default\n"), false);
-      break;
-    case LOWER:
-      oled_write_P(PSTR("Lower\n"), false);
-      break;
-    case RAISE:
-      oled_write_P(PSTR("Raise\n"), false);
-      break;
-    case FUNCS:
-      oled_write_P(PSTR("F-keys\n"), false);
-      break;
-    case RGBLED:
-      oled_write_P(PSTR("Underglow\n"), false);
-      break;
-    default:
-      oled_write_P(PSTR("No idea dog\n"), false);
-  }
-}
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    render_status(); // Renders the current keyboard layer
-  } else {
-    render_mattir_logo();
-  }
-    return false;
-}
-#endif
-
-// Layer-specific encoder knob functions
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { // left knob
-    switch (get_highest_layer(layer_state)) {
-      case QWERTY: // Volume
-        if (clockwise) {
-          tap_code(KC_VOLD);
-        } else {
-          tap_code(KC_VOLU);
-        }
-        break;
-      case LOWER: // Desktop switching
-        if (clockwise) {
-          tap_code16(C(KC_RIGHT));
-        } else {
-          tap_code16(C(KC_LEFT));
-        }
-        break;
-      case RAISE: // Mousewheel L/R
-        if (clockwise) {
-          tap_code(KC_WH_L);
-        } else {
-          tap_code(KC_WH_R);
-        }
-        break;
-      case RGBLED: // Underglow color
-        if (clockwise) {
-          rgblight_increase_hue();
-        } else {
-          rgblight_decrease_hue();
-        }
-        break;
-      default: // No action
-        if (clockwise) {
-          tap_code(KC_NO);
-        } else {
-          tap_code(KC_NO);
-        }
-        break;
-    }
-  } else if (index == 1) { // right knob
-    switch (get_highest_layer(layer_state)) {
-      case QWERTY: // Undo / Redo
-        if (clockwise) {
-          tap_code16(LGUI(KC_Z));
-        } else {
-          tap_code16(SGUI(KC_Z));
-        }
-        break;
-      case LOWER: // App switching
-        if (clockwise) {
-          if (!is_cmd_tab_active) {
-            is_cmd_tab_active = true;
-            register_code(KC_LGUI);
-          }
-          cmd_tab_timer = timer_read();
-          tap_code16(KC_TAB);
-        } else {
-          tap_code16(S(KC_TAB));
-        }
-        break;
-      case RAISE: // Mouse wheel U/D
-        if (clockwise) {
-          tap_code(KC_WH_U);
-        } else {
-          tap_code(KC_WH_D);
-        }
-        break;
-      case RGBLED: // Underglow brightness
-        if (clockwise) {
-          rgblight_increase_val();
-        } else {
-          rgblight_decrease_val();
-        }
-        break;
-      default: // No action
-        if (clockwise) {
-          tap_code(KC_NO);
-        } else {
-          tap_code(KC_NO);
-        }
-        break;
-    }
-  }
-    return true;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/readme.md b/keyboards/splitkb/kyria/keymaps/mattir/readme.md
deleted file mode 100644
index 9a3dcc1e607..00000000000
--- a/keyboards/splitkb/kyria/keymaps/mattir/readme.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# Mattir's keymap & configs for [Kyria](https://github.com/splitkb/kyria)
-
-## Keymap
-
-This is my customized keymap and layer setup for my kyria. It's based largely on the defaults, but with several things moved to new layers.
-
-Keys in the diagrams below that are blank are "transparent" and they drop down to the lowest layer that has them defined. The keys at the end of the bottom row marked as `ENC` are where my rotary encoders are installed. The 2U height `Spce/Shft` keys are multi-function. You tap them for a space, or hold them for shift.
-
-### Base layer `QWERTY`
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-| Tab    |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  | \   |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-| Esc    |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  Enter |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| Leader |   Z  |   X  |   C  |   V  |   B  | ~ `  |      |  |      | - _  |   N  |   M  | ,  < | . >  | /  ? |  ' "   |
-`----------------------+------+------+------+------| Spce |  | Spce |------+------+------+------+----------------------'
-                       | ENC  | Ctrl | Supr | Rais | Shft |  | Shft | Lowr | Bksp  | Alt | ENC  |
-                       `----------------------------------'  `----------------------------------'
-```
-
-### Symbols layer `LOWER`
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|        |  !   |  @   |  #   |  {   |  }   |                              |      |      |      |      |      |        |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|        |  $   |  %   |  ^   |  (   |  )   |                              |   =  |  +   |  -   |  *   |  /   |        |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-|  FUNCS |  &   |      |      |  [   |  ]   |      |      |  |      |      |      |      |  ,   |  .   |      |        |
-`----------------------+------+------+------+------|      |  |      |------+------+------+------+----------------------'
-                       | ENC  |      |      |      |      |  |      |      |      |      | ENC  |
-                       `----------------------------------'  `----------------------------------'
-```
-
-### Numbers and mouse-keys layer `RAISE`
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|        |   1  |  2   |  3   |  4   |  5   |                              |  6   |  7   |  8   |  9   |  0   |        |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|        |      | Prev | Play | Next |      |                              | Left | Down | Up   | Right|      |        |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-|        |      | LMsB | MMsB | RMsB |      |      |      |  |      |      | MLeft| Mdown| MUp  |MRight|      |        |
-`----------------------+------+------+------+------|      |  |      |------+------+------+------+----------------------'
-                       | ENC  |      |      |      |      |  |      |      | Del  |      | ENC  |
-                       `----------------------------------'  `----------------------------------'
-```
-
-### F-Keys and number-pad layer `FUNCS`
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|        | F1   |  F2  | F3   | F4   | F5   |                              | np + | np 7 | np 8 | np 9 | np * |        |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|        | F6   |  F7  | F8   | F9   | F10  |                              | np - | np 4 | np 5 | np 6 | np / |        |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| FUNCS  | F11  |  F12 |      |      |      |      |      |  |      |      | np 0 | np 1 | np 2 | np 3 | np . |  =     |
-`----------------------+------+------+------+------|      |  |      |------+------+------+------+----------------------'
-                       | ENC  |      |      |      |      |  |      |      |      |      | ENC  |
-                       `----------------------------------'  `----------------------------------'
-```
-
-### LED Underglow layer `RGBLED`
-
-There's not much on this layer since several of the functions are set up for my rotary encoders.
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|        |      |      |      |      |      |                              |      |      |      |      |      |        |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|        |      |ValUp |HueUp | SatUp| Mode |                              |      |      |      |      |      |        |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-|        |      |ValDn |HueDn | SatDn| Rmode|      |      |  |      |      |      |      |      |      |      |        |
-`----------------------+------+------+------+------|      |  |      |------+------+------+------+----------------------'
-                       | ENC  |      |      |      |      |  |      |      |      |      | ENC  |
-                       `----------------------------------'  `----------------------------------'
-```
-
-## Rotary Encoders
-
-I've set up the 2 rotary encoders to serve different functions depending on the active layer. I'll call them `ENC-L` and `ENC-R` for the encoder on the left side, or on the right side. Note that many of these functions are Mac-specific in my case, and if you want to use them for Windows or Linux, you'll need to tweak the key-codes generated.
-
-### Defaults
-
-If a layer is undefined somehow, I have both encoders set to be ignored on rotation.
-
-### Base layer `QWERTY`
-
-`ENC-L`
-* Rotate - Volume up and down, determined by rotation direction.
-* Click - Mute audio.
-
-`ENC-R`
-* Rotate - Undo (command-Z) and Redo (shift-command-Z)
-* Click - Toggle to `RGBLED` layer.
-
-### Symbols layer `LOWER`
-
-`ENC-L`
-* Rotate - Desktop switching on Mac
-* Click - no change (transparent)
-
-`ENC-R`
-* Rotate - App switching on Mac
-* Click - no change (transparent)
-
-### Numbers and mouse-keys layer `RAISE`
-
-`ENC-L`
-* Rotate - Mouse-wheel left and right (equal to side-swiping on Mac trackpads)
-* Click - no change (transparent)
-
-`ENC-R`
-* Rotate - Mouse-wheel up and down
-* Click - no change (transparent)
-
-### F-Keys and number-pad layer `FUNCS`
-
-`ENC-L`
-* Rotate - nothing defined, falls back to defaults
-* Click - no change (transparent)
-
-`ENC-R`
-* Rotate - nothing defined, falls back to defaults
-* Click - no change (transparent)
-
-### LED Underglow layer `RGBLED`
-
-`ENC-L`
-* Rotate - Adjust hue (color) forward and back
-* Click - Turn on/off the underglow LEDs
-
-`ENC-R`
-* Rotate - Adjust the value (brightness) up and down
-* Click - return to the base `QWERTY` layer
-
-## OLEDs
-
-There isn't much special here that isn't already in the default keymap for the Kyria. The main side (where the USB cable is plugged in) will show the QMK logo and the active layer. The secondary side (connected to the main via the TRRS cable) will show my personal logo.
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/rules.mk b/keyboards/splitkb/kyria/keymaps/mattir/rules.mk
deleted file mode 100644
index 2a9ca4aff97..00000000000
--- a/keyboards/splitkb/kyria/keymaps/mattir/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-LEADER_ENABLE = yes        # Enables the use of the leader key
diff --git a/keyboards/splitkb/kyria/keymaps/mattir2/config.h b/keyboards/splitkb/kyria/keymaps/mattir2/config.h
deleted file mode 100644
index ee61cfae356..00000000000
--- a/keyboards/splitkb/kyria/keymaps/mattir2/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Matt Gilbert <web@mattir.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
-
-// Set the layer toggle to only need 2 clicks instead of 5
-#define TAPPING_TOGGLE 2
-
-// The Leader key allows to flexibly assign macros to key sequences.
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 350
-
-#define TAPPING_TERM 200
-
-// Allows to use either side as the master. Look at the documentation for info:
-// https://docs.qmk.fm/#/config_options?id=setting-handedness
-#define EE_HANDS
diff --git a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
deleted file mode 100644
index f42889da90f..00000000000
--- a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2020 Matthew Gilbert <hello+github@mattir.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 layers {
-  QWERTY,
-  LOWER,
-  RAISE,
-  FUNCS
-};
-
-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_BSLS,
-      KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
-      QK_LEAD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LSFT, KC_GRV, TT(FUNCS), KC_RSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
-      KC_LSFT, KC_LALT, KC_LGUI, LT(LOWER, KC_SPC), LT(RAISE, KC_ENT), LT(RAISE, KC_ENT), LT(LOWER, KC_SPC), KC_BSPC, KC_LCTL, KC_RSFT
-      ),
-  [LOWER] = LAYOUT(
-      _______, KC_EXLM, KC_AT, KC_HASH, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______,
-      _______, KC_DLR, KC_PERC, KC_CIRC, KC_LPRN, KC_RPRN, KC_EQL, KC_PLUS, KC_MINS, KC_ASTR, KC_SLSH, _______,
-      _______, KC_AMPR, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      ),
-  [RAISE] = LAYOUT(
-      _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
-      KC_VOLU, _______, KC_BTN1, KC_BTN3, KC_BTN2, KC_WH_U, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, _______,
-      KC_VOLD, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_WH_D, KC_WH_L, KC_WH_R, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BRID, _______,
-      _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______
-      ),
-  [FUNCS] = LAYOUT(
-      _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PAST, _______,
-      _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PSLS, KC_PEQL,
-      _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PDOT, KC_PENT,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      ),
-};
-
-void leader_end_user(void) {
-  if (leader_sequence_one_key(KC_A)) {
-    tap_code16(SGUI(KC_L));
-  }
-  if (leader_sequence_two_keys(KC_S, KC_S)) {
-    tap_code16(SGUI(KC_5));
-  }
-}
diff --git a/keyboards/splitkb/kyria/keymaps/mattir2/readme.md b/keyboards/splitkb/kyria/keymaps/mattir2/readme.md
deleted file mode 100644
index 117fba751d0..00000000000
--- a/keyboards/splitkb/kyria/keymaps/mattir2/readme.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Mattir's keymap & configs for [Kyria](https://github.com/splitkb/kyria)
-
-## Keymap
-
-This is my customized keymap and layer setup for my second Kyria split keyboard. It's based largely on the defaults, but with several things moved to new layers. Keys in the diagrams below that are blank are "transparent" and they drop down to the lowest layer that has them defined.
-
-The PCBs for the Kyria are rev. 1.3
-Each half uses an Elite-C low-profile (rev 4) microcontroller with USB-C connector
-The boards are outfitted with Kailh Choc Jade switches and MBK keycaps
-
-Unlike my first build, this is a minimal build with no encoders, RGB LEDs, or OLED displays.
-
-### Base layer `QWERTY`
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-| Esc    |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  \ |   |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-| Tab    |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  ' "   |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| Leader |   Z  |   X  |   C  |   V  |   B  | Shft | ` ~  |  | L3   | Shft |   N  |   M  | ,  < | . >  | /  ? |  - _   |
-`----------------------+------+------+------+------|------|  |------|------+------+------+------+----------------------'
-                       | Shft | Alt  | Supr |L1/Spc|L2/Ent|  |L2/Ent|L1/Spc| Bksp |  Alt | Shft |
-                       `----------------------------------'  `----------------------------------'
-```
-
-### Symbols layer `LOWER`
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|        |  !   |  @   |  #   |  {   |  }   |                              |      |      |      |      |      |        |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|        |  $   |  %   |  ^   |  (   |  )   |                              |   =  |  +   |  -   |  *   |  /   |        |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-|        |  &   |      |      |  [   |  ]   |      |      |  |      |      |      |      |      |      |      |        |
-`----------------------+------+------+------+------|------|  |------|------+------+------+------+----------------------'
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-
-### Numbers and mouse-keys layer `RAISE`
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|        |   1  |  2   |  3   |  4   |  5   |                              |  6   |  7   |  8   |  9   |  0   |        |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-| Vol Up |      | LMsB | MMsB | RMsB | MW Up|                              | Left | Down | Up   | Right|Bri Up|        |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-| Vol Dn | Mute | Prev | Play | Next | MW Dn| MW L | MW R |  |      |      | MLeft| Mdown| MUp  |MRight|Bri Dn|        |
-`----------------------+------+------+------+------|------|  |------|------+------+------+------+----------------------'
-                       |      |      |      |      |      |  |      |      | Del  |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
-
-### F-Keys and number-pad layer `FUNCS`
-
-```
-,-------------------------------------------.                              ,-------------------------------------------.
-|        | F1   |  F2  | F3   | F4   | F5   |                              | np + | np 7 | np 8 | np 9 | np * |        |
-|--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-|        | F6   |  F7  | F8   | F9   | F10  |                              | np - | np 4 | np 5 | np 6 | np / |  =     |
-|--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-|        | F11  |  F12 |      |      |      |      |      |  |      |      | np 0 | np 1 | np 2 | np 3 | np . |  Enter |
-`----------------------+------+------+------+------|      |  |      |------+------+------+------+----------------------'
-                       |      |      |      |      |      |  |      |      |      |      |      |
-                       `----------------------------------'  `----------------------------------'
-```
diff --git a/keyboards/splitkb/kyria/keymaps/mattir2/rules.mk b/keyboards/splitkb/kyria/keymaps/mattir2/rules.mk
deleted file mode 100644
index d51a30bfeba..00000000000
--- a/keyboards/splitkb/kyria/keymaps/mattir2/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-OLED_ENABLE = no    # Enables the use of OLED displays
-ENCODER_ENABLE = no        # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-LEADER_ENABLE = yes        # Enables the use of the leader key
diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/config.h b/keyboards/splitkb/kyria/keymaps/ohlin/config.h
deleted file mode 100644
index 6e07be170b8..00000000000
--- a/keyboards/splitkb/kyria/keymaps/ohlin/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2022 Kevin Ohlin (@ohlin)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#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 RGBLIGHT_LIMIT_VAL 150
-#define RGBLIGHT_LED_MAP {0,1,2,9,8,7,4,3,5,6,19,18,17,10,11,12,15,16,14,13} // Orients Kyria LEDs to a circle around both halves.
-// #define RBGLIGHT_LED_MAP {9,8,6,7,5,3,2,4,1,0,10,12,13,11,14,16,17,15,18,19} // Orients Kyria LEDs for a left half-right half columnar progression.
-// #define RBGLIGHT_LED_MAP {8,9,2,3,4,5,1,0,6,7,17,16,10,11,15,14,13,12,19,18} // Another attempt at an LED mapping
-
-#define OLED_FADE_OUT
-#define OLED_FADE_OUT_INTERVAL 6
-
-// Configure the global tapping term (default: 200ms)
-#define TAPPING_TERM 175
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/keymap.c b/keyboards/splitkb/kyria/keymaps/ohlin/keymap.c
deleted file mode 100644
index e2d95d3a48c..00000000000
--- a/keyboards/splitkb/kyria/keymaps/ohlin/keymap.c
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright 2022 Kevin Ohlin (@ohlin)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY = 0,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-
-// Layers
-#define QWERTY   DF(_QWERTY)
-#define LOWER    MO(_LOWER)
-#define RAISE    MO(_RAISE)
-// Home row mods
-#define CTL_A    LCTL_T(KC_A)
-#define OPT_S    LOPT_T(KC_S)
-#define CMD_D    LCMD_T(KC_D)
-#define SFT_F    LSFT_T(KC_F)
-#define SFT_J    RSFT_T(KC_J)
-#define CMD_K    RCMD_T(KC_K)
-#define OPT_L    LOPT_T(KC_L)
-#define CTL_SCLN RCTL_T(KC_SCLN)
-// Other
-#define CTL_ESC  MT(MOD_LCTL, KC_ESC)
-#define CTL_QUOT MT(MOD_RCTL, KC_QUOTE)
-#define CTL_MINS MT(MOD_RCTL, KC_MINUS)
-#define OPT_ENT  MT(MOD_LALT, KC_ENT)
-#define SFT_SPC  MT(MOD_LSFT, KC_SPC)
-#define YTC      LOPT(KC_C)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                                               ,-------------------------------------------.
- * |  Tab   |   Q  |   W  |   E  |   R  |   T  |                                               |   Y  |   U  |   I  |   O  |   P  |   F3   |
- * |--------+------+------+------+------+------|                                               |------+------+------+------+------+--------|
- * |Ctrl/Esc| CTL/A| OPT/S| CMD/D| SFT/F|   G  |                                               |   H  | SFT/J| CMD/K| OPT/L| CTL/;| RClick |
- * |--------+------+------+------+------+------+-------------.                   ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  | [ {  | Hyper|                   | Hyper|  ] } |   N  |   M  | ,  < | . >  |  / ? | LClick |
- * `----------------------+------+------+------+------+------|                   |------+------+------+------+------+----------------------'
- *                        |      | LCMD | LOPT/|Shift/| Lower|                   | Raise|Shift/| Bcksp| RCMD |Scroll|
- *                        |      |      | Enter| Space|      |                   |      | Space|      |      |      |
- *                        `----------------------------------'                   `----------------------------------'
- */
-    [_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_F3,
-     CTL_ESC,  CTL_A,   OPT_S,   CMD_D,   SFT_F,   KC_G,                                           KC_H,    SFT_J,   CMD_K,   OPT_L,  CTL_SCLN, KC_BTN2,
-     KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC, KC_HYPR,    KC_HYPR, KC_RBRC, KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH,  KC_BTN1,
-                                 _______, KC_LCMD, OPT_ENT, SFT_SPC, LOWER,      RAISE,   SFT_SPC, KC_BSPC, KC_RCMD, KC_BTN5
-    ),
-
-/*
- * Lower Layer
- *
- * ,-----------------------------------------.                                                  ,-------------------------------------------.
- * |  (   |  )   |  7   |  8   |  9   |  0   |                                                  | VolUp|      |   ↑  |      |      |        |
- * |------|------+------+------+------+------+                                                  |------+------+------+------+------+--------|
- * |  [   |  ]   |  4   |  5   |  6   |  +   |                                                  | VolDn|  ←   |   ↓  |   →  |      |        |
- * |------+------+------+------+------+------+-------------.                      ,-------------+------+------+------+------+------+--------|
- * |  {   |  }   |  1   |  2   |  3   |  -   |      |      |                      |      |      |VolMut|      |      |      |      |        |
- * `--------------------+------+------+------+------+------|                      |------+------+------+------+------+----------------------'
- *                      |      |      |      |      |xxxxxx|                      |      |      |      |      |      |
- *                      |      |      |      |      |xxxxxx|                      |      |      |      |      |      |
- *                      `----------------------------------'                      `----------------------------------'
- */
-    [_LOWER] = LAYOUT(
-      KC_LPRN, KC_RPRN, KC_7,   KC_8,    KC_9,    KC_0,                                            KC_VOLU, _______, KC_UP,   _______, _______, _______,
-      KC_LBRC, KC_RBRC, KC_4,   KC_5,    KC_6,    KC_EQL,                                          KC_VOLD, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-      KC_LCBR, KC_RCBR, KC_1,   KC_2,    KC_3,    KC_MINUS, _______, KC_LSFT,    _______, _______, KC_MUTE, _______, _______, _______, _______, _______,
-                                KC_BTN5, KC_BTN2, KC_BTN1,  _______, _______,    _______, _______, _______, _______, _______
-    ),
-
-/*
- * Raise Layer
- *
- * ,-------------------------------------------.                                              ,-------------------------------------------.
- * |    `   |      |      |      |      |      |                                              | VolUp|      |   ↑  |      |      |        |
- * |--------+------+------+------+------+------|                                              |------+------+------+------+------+--------|
- * |    ~   |  !   |  @   |  #   |  $   |  %   |                                              | VolDn|  ←   |   ↓  |   →  |      |Ctrl/' "|
- * |--------+------+------+------+------+------+-------------.                  ,-------------+------+------+------+------+------+--------|
- * |    |   |   \  |  :   |  ;   |  -   |  [   |  {   |      |                  |      |      |VolMut| Opt+C|  <   |   >  |      |        |
- * `----------------------+------+------+------+------+------|                  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |                  |xxxxxx|      |      |      |      |
- *                        |      |      |      |      |      |                  |xxxxxx|      |      |      |      |
- *                        `----------------------------------'                  `----------------------------------'
- */
-    [_RAISE] = LAYOUT(
-     KC_GRV,  _______, _______, _______, _______, _______,                                        KC_VOLU, _______, KC_UP,   _______, _______, _______,
-     KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                        KC_VOLD, KC_LEFT, KC_DOWN, KC_RGHT, _______, CTL_QUOT,
-     KC_PIPE, KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_LCBR, _______,    _______, _______, KC_MUTE, YTC,     KC_LT,   KC_GT,   _______, _______,
-                                _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______
-    ),
-
-/*
- * Adjust Layer: RGB
- *
- * ,-------------------------------------------.                                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                                              |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |                                              | TOG  | SAI  | HUI  | VAI  | MOD  |        |
- * |--------+------+------+------+------+------+-------------.                  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |                  |      |      |      | SAD  | HUD  | VAD  | RMOD |        |
- * `----------------------+------+------+------+------+------|                  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |xxxxxx|                  |xxxxxx|      |      |      |      |
- *                        |      |      |      |      |xxxxxx|                  |xxxxxx|      |      |      |      |
- *                        `----------------------------------'                  `----------------------------------'
- */
-    [_ADJUST] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                       _______, _______, _______, _______, _______,  _______,
-      _______, _______, _______, _______, _______, _______,                                       RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_M_P,  _______,
-      _______, _______, _______, _______, _______, _______,_______, _______,    _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_M_SW, _______,
-                                 _______, _______, _______,_______, _______,    _______, _______, _______, _______, _______
-    ),
-
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                                               ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                                               |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                                               |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                                               |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.                   ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |                   |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|                   |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |                   |      |      |      |      |      |
-//  *                        |      |      |      |      |      |                   |      |      |      |      |      |
-//  *                        `----------------------------------'                   `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______
-//     ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        // QMK Logo and version information
-        // clang-format off
-        static const char PROGMEM qmk_logo[] = {
-            0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-            0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-            0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-        // clang-format on
-
-        oled_write_P(qmk_logo, false);
-        oled_write_P(PSTR("\nKyria rev2.1\n\n"), false);
-
-        // Host Keyboard Layer Status
-        oled_write_P(PSTR("Layer: "), false);
-        switch (get_highest_layer(layer_state|default_layer_state)) {
-            case _QWERTY:
-                oled_write_P(PSTR("QWERTY\n"), false);
-                break;
-            case _LOWER:
-                oled_write_P(PSTR("Lower\n"), false);
-                break;
-            case _RAISE:
-                oled_write_P(PSTR("Raise\n"), false);
-                break;
-            case _ADJUST:
-                oled_write_P(PSTR("Adjust\n"), false);
-                break;
-            default:
-                oled_write_P(PSTR("Undefined\n"), false);
-        }
-
-        // Write host Keyboard LED Status to OLEDs
-        led_t led_usb_state = host_keyboard_led_state();
-        oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-    } else {
-        // clang-format off
-        static const char PROGMEM ko_logo[] = {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 
-            0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x70, 0x18, 0x04, 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, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 
-            0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 
-            0x30, 0x18, 0x8c, 0xe6, 0x73, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 
-            0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-            0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xe0, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-            0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 
-            0x07, 0x01, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x03, 0x01, 0xc0, 0xf0, 
-            0x78, 0x1e, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-            0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 
-            0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x07, 0x01, 0x00, 0x80, 0xc0, 0x60, 
-            0x30, 0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0e, 0x0f, 0x0f, 0x0d, 
-            0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x8d, 0xcd, 0xed, 0x7d, 
-            0x3d, 0xbd, 0xdd, 0xed, 0xf5, 0xf1, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 
-            0x07, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf1, 0xc7, 0x86, 0x06, 
-            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x86, 0xe6, 0xfe, 0x7e, 
-            0x1e, 0x0e, 0x02, 0x80, 0xc0, 0xc0, 0x60, 0x70, 0x38, 0x1c, 0x0e, 0x07, 0xf3, 0xf9, 0xfc, 0xfe, 
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 
-            0xfc, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x78, 0xbc, 0xcf, 0xc7, 0xe3, 0x70, 0x38, 
-            0x1c, 0x0e, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-            0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 
-            0x7f, 0x9f, 0xcf, 0xf3, 0xf8, 0x7e, 0xbf, 0xdf, 0x8f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0f, 
-            0x1f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 
-            0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 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, 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, 0x20, 0x11, 0x0d, 
-            0x06, 0x03, 0x03, 0x01, 0x00, 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, 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
-        };
-        // clang-format on
-        oled_write_raw_P(ko_logo, sizeof(ko_logo));
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/readme.md b/keyboards/splitkb/kyria/keymaps/ohlin/readme.md
deleted file mode 100644
index 0db8d2d9761..00000000000
--- a/keyboards/splitkb/kyria/keymaps/ohlin/readme.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# @ohlin's Kyria Keymap
-###### _This keymap is a work in progress._ 
-
-I am a Product Manager and QA Lead, not a developer, so I spend a lot of my time doing things that require a mouse, so one handed keyboard shortcuts are very useful to me.
-
-This keymap is used on a Mac in conjunction with a [Ploopy Nano](https://github.com/ploopyco/nano-trackball) trackball.
-
-```
-,-----------------------------.                      ,-----------------------------.   .--------------.
-|    |    |    |    |    |    |                      |    |    |    |    |    |    |  |      ----      |
-|----+----+----+----+----+----|                      |----|----+----+----+----+----|  |   PL°°°°°°PY   |
-|    |    |    |    |    |    |                      |    |    |    |    |    |    |  |  PL°°°°°°°°PY  |
-|----+----+----+----+----+----+---------.  ,---------+----+----+----+----+----+----|  |  PL°°°°°°°°PY  |
-|    |    |    |    |    |    |    |    |  |    |    |    |    |    |    |    |    |  |   PL°°°°°°PY   |
-`-------------------+----+----+----+----|  |----+----+----+----+----+----+---------'  |      ----      |
-               |    |    |    |    |    |  |    |    |    |    |    |                  '--------------'
-               `------------------------'  `------------------------'
-```
-
-## Home Row Mods
-Home row mods help came from @precondition's in-depth article, [_A guide to home row mods_](https://precondition.github.io/home-row-mods). `CAGS` makes the most sense to me as a Mac user.
-
-## Karabiner Elements
-Karabiner Elements has been a part of my Mac workflow for years now, so when I switched from a Planck to this Kyria, it fit neatly around this keymap to make things easier. Karabiner serves two primary functions here:
-
-- Change `Caps Lock` to `Hyper` (`ctrl + opt + cmd + shift`)
-- Hold mouse button 5 to enable `mouse_motion_to_scroll`
-
-### Caps Lock to Hyper
-Years ago, following Brett Terpstra's article [_A useful Caps Lock key_](https://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/), I swapped caps lock for hyper, then mapped a number of system-wide keyboard shortcuts to `Hyper` + `[key]`, such as launching apps using [Alfred](https://www.alfredapp.com/) workflows, resizing and moving windows using [Rectangle](https://github.com/rxhanson/Rectangle), and changing all of my montiors' brightness levels together using [Display Buddy](https://displaybuddy.app/). 
-
-Remapping the Caps Lock key in Karabiner ensures I can still easily use these shortcuts with the built-in keyboard on my laptop as well as with any QMK keyboard (where I use the `KC_HYPR` key code directly).
-### Scrolling with the Ploopy Nano
-Initially, I tried using the NumLock scroll developed by [@zealws](https://github.com/zealws/qmk_firmware/commit/293d3c211d9e93c127b628ac9ef9e4cb201a01da) ([Reddit post here](https://old.reddit.com/r/ploopy/comments/nlvgkq/how_to_scroll_with_the_trackball_nano/)), but had some difficulty making it work on Mac. Since I was already using Karabiner for the Caps Lock to Hyper Switch, I decided to just use it for [mouse motion to scroll](https://karabiner-elements.pqrs.org/docs/json/complex-modifications-manipulator-definition/other-types/mouse-motion-to-scroll/) as well by holding Mouse Button 5. Easily done.
-
-Despite not being able to make the NumLock scroll work, I did keep the [Ploopy Acceleration](https://github.com/zealws/qmk_firmware/commit/293d3c211d9e93c127b628ac9ef9e4cb201a01da#diff-d9cdae01e54acdc5c6ec6f6b28f48a676287d2f9cc2c9c3aaf63724fa625f520R90-R96) from @zealws' code, as it made using the Nano much easier when moving across the 3 monitors I typically use for work.
-## OLED Logo
-I created my own OLED logo in [Figma](https://www.figma.com/), converted it with @javl's [image2cpp](https://javl.github.io/image2cpp), and cleaned up the result with @joric's [QMK Logo Editor](https://joric.github.io/qle/).
-```
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡/1‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡! ,‡‡‡‡‡‡‡‡‡z!!!!!!!!!!!!r‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡!       .1‡‡‡‡‡‡‡@!  '&‡‡‡‡‡‡_"                ';1‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡'       `‡‡‡‡‡‡‡BI ` `‡‡‡‡‡‡<                      `‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡?        ;‡‡‡‡‡‡@l.;j'>‡‡‡‡‡&'         .""""`         .j‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡!       `‡‡‡‡‡‡@I ,‡r ,‡‡‡‡‡‡l        `M‡‡‡‡‡‡‡(         M‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡1.       "#‡‡‡‡z>';j‡; '&‡‡‡‡‡‡.       i‡‡‡‡‡‡‡‡‡‡l        .‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡^       ;8‡‡‡‡('.;#‡‡" >‡‡‡‡‡‡‡‡        ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡/        )‡‡‡‡r`.{‡‡‡‡` M‡‡‡‡‡‡‡‡‡        ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ""       "j‡‡‡j".;#‡‡‡c  .""""""""""""""""1/‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡                 ,‡‡‡1' ,‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡<  `!  ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡                 'M‡`.;j‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡1'',;'   ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡                   \<                .‡‡‡‡(  /!      ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡;        >‡‡‡‡‡‡‡‡‡‡‡‡1 '1‡‡j;''1‡'       ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡M        !‡‡‡‡‡‡‡‡‡‡' ^‡‡‡` .<‡‡‡        ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡r        .(‡‡‡‡‡‡‡' ;‡1" ,j‡‡‡‡‡        ‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡l        >‡‡‡‡; `jl."1@‡‡‡‡‡‡‡        >‡‡‡‡‡‡‡‡‡‡-         ‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡B.       I‡z  "^  t‡‡‡‡‡‡‡‡‡‡;        I‡‡‡‡‡‡‡‡t         c‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡x       ./'   ^/‡‡‡‡‡‡‡‡‡‡‡‡z.         `""""".         (‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡`    `<   Ir‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡!                      `‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡         ‡‡‡‡‡‡‡‡‡‡‡,  "^  ""1‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡i`                ."1‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡!!!!!!!!!‡‡‡‡‡‡‡‡‡‡‡‡!{` !‡!!!!‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡x!!!!!!!!!!!!?M‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡>';#‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡u8‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡‡
-```
diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/rules.mk b/keyboards/splitkb/kyria/keymaps/ohlin/rules.mk
deleted file mode 100644
index 90846dfb537..00000000000
--- a/keyboards/splitkb/kyria/keymaps/ohlin/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-ENCODER_ENABLE = no
-MOUSEKEY_ENABLE = yes
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
deleted file mode 100644
index 280e6b1d129..00000000000
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2020 Pierre Chevalier <pierrechevalier83@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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-#endif
-
-#ifdef ENCODER_ENABLE
-  #define ENCODER_DIRECTION_FLIP
-  #define ENCODER_RESOLUTION 2
-#endif
-
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-#define QUICK_TAP_TERM 0
-// Allows to use either side as the master. Look at the documentation for info:
-// https://docs.qmk.fm/#/config_options?id=setting-handedness
-#define EE_HANDS
-
-// Allows media codes to properly register in macros and rotary encoder code
-#define TAP_CODE_DELAY 10
-
-// 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
-
-// Set the mouse settings to a comfortable speed/accuracy trade-off
-// Assume the screen refresh rate is 60 Htz or higher
-// The default is 50. This makes the mouse ~3 times faster and more accurate
-#define MOUSEKEY_INTERVAL 16
-// The default is 20. Since we made the mouse about 3 times faster with the previous setting,
-// give it more time to accelerate to max speed to retain precise control over short distances.
-#define MOUSEKEY_TIME_TO_MAX 40
-// The default is 300. Let's try and make this as low as possible while keeping the cursor responsive
-#define MOUSEKEY_DELAY 100
-// It makes sense to use the same delay for the mouseweel
-#define MOUSEKEY_WHEEL_DELAY 100
-// The default is 100
-#define MOUSEKEY_WHEEL_INTERVAL 50
-// The default is 40
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/encoders.c b/keyboards/splitkb/kyria/keymaps/pierrec83/encoders.c
deleted file mode 100644
index 7505925e72f..00000000000
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/encoders.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "layers.h"
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            case WORKMAN:
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-                break;
-            case SYMBOLS:
-            case FN:
-                if (clockwise) {
-                    tap_code(KC_PGDN);
-                } else {
-                    tap_code(KC_PGUP);
-                }
-                break;
-            case NAV:
-            case RNAV:
-            default:
-                if (clockwise) {
-                    tap_code16(C(A(KC_RIGHT)));
-                } else {
-                    tap_code16(C(A(KC_LEFT)));
-                }
-                break;
-        }
-    } else if (index == 1) {
-        switch (get_highest_layer(layer_state)) {
-            case WORKMAN:
-                if (clockwise) {
-                    tap_code(KC_BRIU);
-                } else {
-                    tap_code(KC_BRID);
-                   }
-                break;
-            case SYMBOLS:
-            case FN:
-                if (clockwise) {
-                    tap_code16(C(KC_RIGHT));
-                } else {
-                    tap_code16(C(KC_LEFT));
-                }
-                break;
-            case NAV:
-            case RNAV:
-            default:
-                if (clockwise) {
-                    tap_code16(C(KC_TAB));
-                } else {
-                    tap_code16(C(S(KC_TAB)));
-                }
-                break;
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/keymap.c b/keyboards/splitkb/kyria/keymaps/pierrec83/keymap.c
deleted file mode 100644
index 204895dc104..00000000000
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/* THIS FILE WAS GENERATED!
- *
- * This file was generated by qmk json2c. You may or may not want to
- * edit it directly.
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_NO, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_NO, KC_NO, LSFT_T(KC_A), LT(5,KC_S), LT(1,KC_H), LT(3,KC_T), KC_G, KC_Y, LT(4,KC_N), LT(2,KC_E), LT(6,KC_O), LSFT_T(KC_I), KC_NO, KC_NO, KC_Z, KC_X, KC_M, KC_C, KC_V, TG(2), TG(2), TG(1), TG(1), KC_K, KC_L, LALT_T(KC_COMM), LCTL_T(KC_DOT), KC_SLSH, KC_NO, KC_NO, KC_NO, LCA(KC_LEFT), KC_BSPC, KC_NO, KC_NO, LT(7,KC_SPC), LCA(KC_RGHT), KC_NO, KC_NO),
-	[1] = LAYOUT(KC_TRNS, KC_TRNS, LCTL(LSFT(KC_C)), KC_PGUP, LCTL(LSFT(KC_V)), KC_TRNS, RGB_MOD, KC_BTN1, KC_WH_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_NO, KC_BTN1, KC_TRNS, RGB_RMOD, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, TG(1), TG(1), KC_TRNS, KC_TRNS, RGB_TOG, KC_WH_L, KC_WH_D, KC_WH_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LCTL(LSFT(KC_TAB)), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_TAB), KC_TRNS, KC_TRNS),
-	[2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS, RGB_RMOD, KC_LGUI, KC_NO, LCTL(KC_LALT), LCA(KC_LSFT), KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, TG(2), TG(2), RGB_TOG, KC_TRNS, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LGUI(KC_LEFT), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LGUI(KC_RGHT), KC_TRNS, KC_TRNS),
-	[3] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PIPE, KC_QUOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_CIRC, KC_ASTR, KC_AMPR, KC_NO, KC_TRNS, KC_HASH, KC_TILD, KC_SLSH, KC_DQUO, KC_DLR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_BSLS, KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRID, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRIU, KC_TRNS, KC_TRNS),
-	[4] = LAYOUT(KC_TRNS, KC_TRNS, KC_COLN, KC_LT, KC_GT, KC_SCLN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_AT, KC_TRNS, KC_NO, KC_EQL, KC_PLUS, KC_PERC, KC_TRNS, KC_TRNS, KC_TRNS, KC_EXLM, KC_LBRC, KC_RBRC, KC_TRNS, KC_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_VOLU, KC_TRNS, KC_TRNS),
-	[5] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_F4, KC_F5, KC_F6, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_LALT), KC_TRNS, KC_TRNS, KC_TRNS),
-	[6] = LAYOUT(KC_TRNS, KC_PSLS, KC_7, KC_8, KC_9, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_4, KC_5, KC_6, KC_PMNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_1, KC_2, KC_3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[7] = LAYOUT(KC_TRNS, KC_TRNS, KC_ESC, KC_COLN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_PERC, KC_SLSH, KC_ENT, KC_EXLM, KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RALT_T(KC_COMM), RCTL_T(KC_DOT), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS)
-};
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/keymap.json b/keyboards/splitkb/kyria/keymaps/pierrec83/keymap.json
deleted file mode 100644
index 79d88009c12..00000000000
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/keymap.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version":1,"notes":"My awesome keymap","documentation":"\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n","keyboard":"kyria/rev1","keymap":"pierrec83","layout":"LAYOUT","layers":[["KC_NO","KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_SCLN","KC_NO","KC_NO","LSFT_T(KC_A)","LT(5,KC_S)","LT(1,KC_H)","LT(3,KC_T)","KC_G","KC_Y","LT(4,KC_N)","LT(2,KC_E)","LT(6,KC_O)","LSFT_T(KC_I)","KC_NO","KC_NO","KC_Z","KC_X","KC_M","KC_C","KC_V","TG(2)","TG(2)","TG(1)","TG(1)","KC_K","KC_L","LALT_T(KC_COMM)","LCTL_T(KC_DOT)","KC_SLSH","KC_NO","KC_NO","KC_NO","LCA(KC_LEFT)","KC_BSPC","KC_NO","KC_NO","LT(7,KC_SPC)","LCA(KC_RGHT)","KC_NO","KC_NO"],["KC_TRNS","KC_TRNS","ANY(LCTL(LSFT(KC_C)))","KC_PGUP","ANY(LCTL(LSFT(KC_V)))","KC_TRNS","RGB_MOD","KC_BTN1","KC_WH_U","KC_BTN2","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_BTN2","KC_NO","KC_BTN1","KC_TRNS","RGB_RMOD","KC_MS_L","KC_MS_D","KC_MS_U","KC_MS_R","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_PGDN","KC_TRNS","KC_TRNS","TG(1)","TG(1)","KC_TRNS","KC_TRNS","RGB_TOG","KC_WH_L","KC_WH_D","KC_WH_R","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","ANY(LCTL(LSFT(KC_TAB)))","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","LCTL(KC_TAB)","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","RGB_MOD","KC_TRNS","KC_WH_U","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LEFT","KC_UP","KC_DOWN","KC_RGHT","KC_TRNS","RGB_RMOD","KC_LGUI","KC_NO","LCTL(KC_LALT)","LCA(KC_LSFT)","KC_TRNS","KC_TRNS","KC_TRNS","KC_HOME","KC_PGDN","KC_END","KC_TRNS","KC_TRNS","KC_TRNS","TG(2)","TG(2)","RGB_TOG","KC_TRNS","KC_WH_D","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","LGUI(KC_LEFT)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","LGUI(KC_RGHT)","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UNDS","KC_PIPE","KC_QUOT","KC_TRNS","KC_TRNS","KC_TRNS","KC_CIRC","KC_ASTR","KC_AMPR","KC_NO","KC_TRNS","KC_HASH","KC_TILD","KC_SLSH","KC_DQUO","KC_DLR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MINS","KC_BSLS","KC_GRV","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_BRID","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_BRIU","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_COLN","KC_LT","KC_GT","KC_SCLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_LPRN","KC_RPRN","KC_AT","KC_TRNS","KC_NO","KC_EQL","KC_PLUS","KC_PERC","KC_TRNS","KC_TRNS","KC_TRNS","KC_EXLM","KC_LBRC","KC_RBRC","KC_TRNS","KC_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_VOLU","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F7","KC_F8","KC_F9","KC_F10","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_F4","KC_F5","KC_F6","KC_F11","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_F1","KC_F2","KC_F3","KC_F12","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","LCTL(KC_LALT)","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_PSLS","KC_7","KC_8","KC_9","KC_PPLS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_0","KC_4","KC_5","KC_6","KC_PMNS","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_PAST","KC_1","KC_2","KC_3","KC_PEQL","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_ESC","KC_COLN","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_DEL","KC_TRNS","KC_TRNS","KC_TRNS","KC_PERC","KC_SLSH","KC_ENT","KC_EXLM","KC_TRNS","KC_LGUI","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","RALT_T(KC_COMM)","RCTL_T(KC_DOT)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TAB","KC_TRNS","KC_TRNS","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS"]],"author":"Anonymous"}
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/layers.h b/keyboards/splitkb/kyria/keymaps/pierrec83/layers.h
deleted file mode 100644
index 12a988d37e4..00000000000
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/layers.h
+++ /dev/null
@@ -1,7 +0,0 @@
-enum layers {
-    WORKMAN = 0,
-    RNAV,
-    NAV,
-    SYMBOLS,
-    FN,
-};
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/readme.md b/keyboards/splitkb/kyria/keymaps/pierrec83/readme.md
deleted file mode 100644
index fae22f83666..00000000000
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/readme.md
+++ /dev/null
@@ -1,44 +0,0 @@
-@pierrec83's keymap for the Kyria
-===
-
-A comfortable for me using 34 keys.
-
-This keymap has evolved over a period of time from iterating as I observed pain points in my interacting with my home and work computers (MacOS and Linux. I edited many of the shortcuts in MacOS to match those in Linux for consistency).
-
-Features
----
-* Mouse keys with constants tuned so the keyboard usable for me as my sole pointing device
-* Homerow layers activation
-* Minimal unhoming of the thumbs (the one side thumb key I do use does not overlap with typing english or code)
-* Minimal side-index motion thanks to workman base layer and similar principles in other layers
-* Two symbol layers, both activated with one homerow key and either another key on the same hand's homerow or a key from the other hand
-* Mousing around, including left and right clicking can be done either one-handed or fully on the homerow with both hands
-* Easy chaining of common command line or vim patterns, such as `~/`, `()`, `ESC : w ENTER` etc.
-* Outer pinky columns unused for ergonomic reasons
-* Common OS shortcuts like switching workspaces on gnome or MacOS easily accessible (for the shortcuts I use. This may not apply to others)
-
-Instructions to update the keymap
----
-
-For now, I am still more comfortable updating the keymap through the qmk configurator as I don't trust myself to manually keep comments describing the keymap in sync with the code itself. This means that my keymap.c is generated and not really readable. For a readble view of my keymap, one must import keymap.json into [qmk configurator](https://config.qmk.fm) and use the web UI or print it.
-
-To update the keymap,
-* Load keymap.json into qmk configurator
-* Perform any edits
-* Export the keymap. This should save a json file in `~/Downloads/pierrec83.json` or equivalent for your OS
-* From the root of qmk_firmware, move the keymap to its destination:
-```
-mv ~/Downloads/pierrec83.json keyboards/kyria/keymaps/pierrec83/keymap.json
-```
-* Regenerate the `keymap.c`:
-```
-qmk json2c keyboards/kyria/keymaps/pierrec83/keymap.json -o keyboards/kyria/keymaps/pierrec83/keymap.c
-```
-* Flash the firmware (for instance, if left hand is plugged):
-```
-qmk flash -kb kyria -km pierrec83 -bl dfu-split-left
-```
-
-Author
----
-I am @pierrec83 on Twitter, @pierrechevalier83 on github. I chose the shorter nickname for my keymap.
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/rules.mk b/keyboards/splitkb/kyria/keymaps/pierrec83/rules.mk
deleted file mode 100644
index fbccedd565d..00000000000
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = no   # Enables the use of OLED displays
-ENCODER_ENABLE = yes       # ENables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-
-SRC += encoders.c
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/README.md b/keyboards/splitkb/kyria/keymaps/plattfot/README.md
deleted file mode 100644
index 70bb01353d7..00000000000
--- a/keyboards/splitkb/kyria/keymaps/plattfot/README.md
+++ /dev/null
@@ -1,172 +0,0 @@
-# plattfot's keymap for [Kyria](https://github.com/splitkb/kyria)
-
-![Keyboard](https://i.imgur.com/mcefoHnh.jpg)
-
-Designed to be ease of use when programming, typing in both English
-and Swedish and navigating around in a tiling window manager, in my
-case [sway](https://swaywm.org/). Uses the two rotary encoders (lower
-left/right thumb row) as two palm buttons.
-
-This keymap avoids [Mod-tap](https://docs.qmk.fm/#/mod_tap) as they do
-not work for me. [Kyria](https://github.com/splitkb/kyria) has enough
-thumb keys to make it work without them.
-
-The symbols are split into two layers, one for each hand. Then the
-layers are activated by the opposite thumb. Found that having all
-symbols on one layer then have one thumb activate them made it awkward
-to press keys with the index finger on the same hand.
-
-Custom feature I call the close tap (Clotap) key, I based on a code
-snippet from a
-[reddit post](https://www.reddit.com/r/olkb/comments/citkbx/double_key_press_modifier_qmkwould_work_like/ev9cue8).
-When pressed, it will insert the closing equivivalent key and press
-`←` (left arrow). For example tapping Clotap then press `(` will
-result in the keypresses `()←`, if pressing `"` will result in `""←`,
-if pressing `)` will result in `)←(`. Really nice to have when
-programming, it is editor agnostic and saves me two keypresses (need
-to press NAV+j for `←`). It also removes the need for having specific
-macros for these as I had before.
-
-
-# Base Layer: Default
-```
-//  ,-------------------------------------------.                              ,-------------------------------------------.
-//  |  Esc   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Del   |
-//  |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  |  Tab   |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  |   ;  |   '    |
-//  |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  | LShift |   Z  |   X  |   C  |   V  |   B  | Lead | RAISE|  | LOWER|BSpace|   N  |   M  |   ,  |   .  |   /  | RShift |
-//  `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//                         | MPlay| GUI  | LCtrl| Space| LALT |  | RCtrl| Enter| NAV  | RALT |Scroll|
-//                         |      |      |      |      |      |  |      |      |      |      | Lock |
-//                         `----------------------------------'  `----------------------------------'
-```
-
-Setup for using the
-[EurKey](https://eurkey.steffen.bruentjen.eu/layout.html) layout. As
-it's annoying to have to toggle us and swedish layout which shifts
-symbols around.
-
-AltGr is used to access the extra keys in the
-[EurKey](https://eurkey.steffen.bruentjen.eu/layout.html) layout.
-
-## Notable features on this layer
-
-Left rotary encoder
-- Press: play/pause
-- Rotate: Volume control
-
-Right rotary encoder
-- Press: Scroll lock
-- Rotate: Page up/Page down. Used mouse scrolling at first. But
-          scrolling only works in the window where the mouse pointer
-          is. Which kind of defeated the purpose of having the scroll
-          on the keyboard, as I still needed to move my hand to the
-          mouse and then I could just use the scroll on the mouse.
-
-[Leader key](https://docs.qmk.fm/#/feature_leader_key) is mainly used
-for jumping between workspaces. Otherwise I would need to use both
-hands everytime I need to switch. With the leader key I can jump
-between 1-5 with just the left hand.
-
-# Lower Layer: Left symbols/Right function keys
-```
-//  ,-------------------------------------------.                              ,-------------------------------------------.
-//  |        |  !   |  @   |  #   |  $   |  %   |                              |  F6  |  F7  |  F8  |  F9  | F10  |        |
-//  |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  |        |  |   |  _   |  \   |  -   |  +   |                              | F12  |      |      |      |      |        |
-//  |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  |        |  °   |  :   |  (   |  )   |  ×   |      |ADJUST|  |      |      |CLOTAP|      |      |      |      |        |
-//  `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//                         |      |      |      |      |      |  |      |      |      |      |      |
-//                         |      |      |      |      |      |  |      |      |      |      |      |
-//                         `----------------------------------'  `----------------------------------'
-```
-
-Symbols for the left hand, function keys for the right hand.
-
-I had the function keys at the bottom on the navigation layer. But it
-was annoying when typing version strings. Hitting f1-5+f11 involved
-both hands. And it turned out that my keybinding for closing a window
-(Super+Shift+c) and rebooting my machine (Super+Shift+f3) ended up on
-the same physical keys.
-
-Splitting them up like this allows me to hit all the function keys
-with just one hand and I wont accidentally reboot my machine when
-trying to close a window.
-
-## Notable features on this layer
-
-Left rotary encoder
-- Rotate: Skip next/previous song
-
-Clotap on the right hand.
-
-Has two Eurkey specific symbols `°` and `×` on the left hand.
-
-# Raise Layer: Left function/Right symbols + state keys
-```
-//  ,-------------------------------------------.                              ,-------------------------------------------.
-//  |        |  F1  |  F2  |  F3  |  F4  |  F5  |                              |   ^  |  &   |  *   |  ~   |  ?   |        |
-//  |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  |        |      |      |      |      | F11  |                              |   =  |  {   |  }   |  [   |  ]   |   `    |
-//  |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  |        |      |      |      |      |CLOTAP|      |      |  |ADJUST|      |   …  |  "   |  <   |  >   |  /   |CapsLock|
-//  `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//                         | Mute |      |      |      |      |  |      |      |      |      |Insert|
-//                         |      |      |      |      |      |  |      |      |      |      |      |
-//                         `----------------------------------'  `----------------------------------'
-```
-
-Function keys for the left hand, symbols for the right hand. 
-
-This layer also includes caps lock and insert.
-
-## Notable features on this layer
-
-Left rotary encoder
-- Press: mute
-
-Right rotary encoder
-- Press: Toggle insert mode
-- Rotate: Scrolling between workspaces in `sway`.
-
-Clotap on the left hand.
-
-# Navigation Layer: Number keys, navigation
-```
- //
- // ,-------------------------------------------.                              ,-------------------------------------------.
- // |        |   1  |  2   |  3   |  4   |  5   |                              |  6   |  7   |  8   |  9   |  0   |        |
- // |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- // |        |      |      |      |      |      |                              |      | Left | Up   | Down | Right|        |
- // |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- // |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
- // `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- //                        |      |      |      |      |      |  |      |      |      |      |      |
- //                        |      |      |      |      |      |  |      |      |      |      |      |
- //                        `----------------------------------'  `----------------------------------'
-```
-
-Access to the number and the arrow keys. Got use to the number row
-after using [ErgoDox](https://www.ergodox.io/) keyboards for a few
-years. Do not feel I need a numpad layer, which seems to be quite
-common with small keyboards like this.
-
-# Adjust Layer: RGB
-```
- //
- // ,-------------------------------------------.                              ,-------------------------------------------.
- // |        |      |      |      |      |      |                              |      |      |      |      |      |        |
- // |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- // |        | TOG  | SAI  | HUI  | VAI  | MOD  |                              |      |      |      |      |      |        |
- // |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- // |        |      | SAD  | HUD  | VAD  | RMOD |      |      |  |      |      |      |      |      |      |      |        |
- // `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- //                        |      |      |      |      |      |  |      |      |      |      |      |
- //                        |      |      |      |      |      |  |      |      |      |      |      |
- //                        `----------------------------------'  `----------------------------------'
-```
-
-Right now it only contains adjustment to the underglow. Activated by
-holding down `RAISE` and `LOWER` at the same time.
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/config.h b/keyboards/splitkb/kyria/keymaps/plattfot/config.h
deleted file mode 100644
index 96447d0c4c3..00000000000
--- a/keyboards/splitkb/kyria/keymaps/plattfot/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
- * Copyright 2020-2021 Fredrik Salomonsson <plattfot@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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-#endif
-
-#define ENCODER_DIRECTION_FLIP
-// Fixing the skipping with the EC11K encoder
-#define ENCODER_RESOLUTION 2
-
-#define EE_HANDS
-
-// The Leader key allows to flexibly assign macros to key sequences.
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 350
-
-// Remove the delay for the OSL keys. Not using any other tap keys.
-// Otherwise TAPPING_TERM_PER_KEY would be the way to go.
-#define TAPPING_TERM 0
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
deleted file mode 100644
index 2233e9b01bd..00000000000
--- a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c
+++ /dev/null
@@ -1,475 +0,0 @@
-/* Copyright 2020-2021 Fredrik Salomonsson <plattfot@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
-#include "version.h"
-
-enum custom_keycodes {
-    PLACEHOLDER = SAFE_RANGE,  // can always be here
-    // New keys
-    CLO_TAP,  // Close the next key press
-};
-
-// Close tap feature based on a post from drashna
-// https://www.reddit.com/r/olkb/comments/citkbx/double_key_press_modifier_qmkwould_work_like/ev9cue8/
-// Will insert the closing equivalent key and move the cursor inside.
-// For example clo_tap and then ( will result in (|), where | is the
-// cursor. For " it will be "|" as the close equivalent key is the
-// same key.
-enum close_tap_modes {
-  CLO_DISABLED = 0b000,
-  CLO_PRESSED  = 0b001, // Close tap key is pressed
-  CLO_ACTIVE   = 0b010, // Close tap next keypress
-  CLO_USED     = 0b100, // Turn off when close tap key is released
-};
-
-#define CLO_RELEASE(flag) flag & ~CLO_PRESSED
-
-static enum close_tap_modes close_tap_it = CLO_DISABLED;
-
-enum layers {
-    _DEFAULT,
-    _LOWER,
-    _RAISE,
-    _NAV,
-    _ADJUST,
-};
-
-#define MO_ADJT MO(_ADJUST)
-#define L_RAISE OSL(_RAISE)
-#define L_LOWER OSL(_LOWER)
-#define L_NAV   MO(_NAV)
-#define EU_TDOT RSA(KC_SLSH)
-#define EU_CDOT RALT(KC_EQUAL)
-#define EU_DEG  RALT(KC_SCLN)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: Default
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Esc   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Del   |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  Tab   |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  |   ;  |   '    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  | Lead | RAISE|  | LOWER|BSpace|   N  |   M  |   ,  |   .  |   /  | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        | MPlay| GUI  | LCtrl| Space| LALT |  | RCtrl| Enter| NAV  | RALT |Scroll|
- *                        |      |      |      |      |      |  |      |      |      |      | Lock |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_DEFAULT] = LAYOUT(
-      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,    QK_LEAD,  L_RAISE, L_LOWER, KC_BSPC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                               KC_MPLY,KC_LGUI,KC_LCTL, KC_SPACE, KC_LALT, KC_RCTL,  KC_ENT, L_NAV,   KC_RALT, KC_SCRL
-    ),
-
-/*
- * Lower Layer: Left symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  !   |  @   |  #   |  $   |  %   |                              |  F6  |  F7  |  F8  |  F9  | F10  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  |   |  _   |  \   |  -   |  +   |                              | F12  |      |      |      |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |  °   |  :   |  (   |  )   |  ×   |      |ADJUST|  |      |      |CLOTAP|      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_LOWER] = LAYOUT(
-      _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-      _______, KC_PIPE, KC_UNDS, KC_BSLS, KC_MINS, KC_PLUS,                                     KC_F12,  _______, _______, _______, _______, _______,
-      _______, EU_DEG,  KC_COLN, KC_LPRN, KC_RPRN, EU_CDOT, _______, MO_ADJT, _______, _______, CLO_TAP, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Raise Layer: Right symbols + state
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |                              |   ^  |  &   |  *   |  ~   |  ?   |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |      |      | F11  |                              |   =  |  {   |  }   |  [   |  ]   |   `    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |CLOTAP|      |      |  |ADJUST|      |   …  |  "   |  <   |  >   |  /   |CapsLock|
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        | Mute |      |      |      |      |  |      |      |      |      |Insert|
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_RAISE] = LAYOUT(
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_CIRC, KC_AMPR, KC_ASTR, KC_TILDE,KC_QUES, _______,
-      _______, _______, _______, _______, _______, KC_F11,                                      KC_EQUAL,KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_GRV,
-      _______, _______, _______, _______, _______, CLO_TAP, _______, _______, MO_ADJT, _______, EU_TDOT, KC_DQUO, KC_LT,   KC_GT,   _______, KC_CAPS,
-                                 KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS
-
-    ),
-/*
- * Navigation Layer: Number/Function keys, navigation
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |   1  |  2   |  3   |  4   |  5   |                              |  6   |  7   |  8   |  9   |  0   |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |                              |      | Left | Up   | Down | Right|        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_NAV] = LAYOUT(
-      _______, KC_1, 	KC_2,    KC_3,    KC_4,    KC_5,                                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-      _______, _______, _______, _______, _______, _______,                                     _______, KC_LEFT, KC_UP, KC_DOWN,   KC_RGHT, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Adjust Layer: RGB
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | TOG  | SAI  | HUI  | VAI  | MOD  |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      | SAD  | HUD  | VAD  | RMOD |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_ADJUST] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-      _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD,                                     _______, _______, _______, _______, _______, _______,
-      _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-// clang-format on
-
-/* void keyboard_post_init_user(void) { */
-/*   rgblight_setrgb(51, 135, 204); */
-/* } */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case CLO_TAP:
-                close_tap_it = close_tap_it & CLO_ACTIVE?
-                    CLO_USED:
-                    CLO_ACTIVE|CLO_PRESSED;
-                return false;
-            case QK_LEADER:
-                close_tap_it = CLO_DISABLED;
-                return true;
-        }
-    } else if (close_tap_it & CLO_ACTIVE &&
-               keycode != CLO_TAP &&
-               keycode != OSL(_RAISE) &&
-               keycode != OSL(_LOWER) &&
-               keycode != MO(_NAV)) {
-
-        close_tap_it = close_tap_it & CLO_PRESSED?
-            close_tap_it | CLO_USED:
-            CLO_DISABLED;
-        switch(keycode)
-        {
-        case KC_LPRN:
-          tap_code16(KC_RPRN);
-          tap_code16(KC_LEFT);
-          break;
-        case KC_RPRN:
-          tap_code16(KC_LEFT);
-          tap_code16(KC_LPRN);
-          break;
-        case KC_LCBR:
-          tap_code16(KC_RCBR);
-          tap_code16(KC_LEFT);
-          break;
-        case KC_RCBR:
-          tap_code16(KC_LEFT);
-          tap_code16(KC_LCBR);
-          break;
-        case KC_LBRC:
-          tap_code16(KC_RBRC);
-          tap_code16(KC_LEFT);
-          break;
-        case KC_RBRC:
-          tap_code16(KC_LEFT);
-          tap_code16(KC_LBRC);
-          break;
-        case KC_LT:
-          tap_code16(KC_GT);
-          tap_code16(KC_LEFT);
-          break;
-        case KC_GT:
-          tap_code16(KC_LEFT);
-          tap_code16(KC_LT);
-          break;
-        default:
-          tap_code16(keycode);
-          tap_code16(KC_LEFT);
-          break;
-        }
-    } else {
-        switch (keycode) {
-            case CLO_TAP:
-                close_tap_it = close_tap_it & CLO_USED?
-                    CLO_DISABLED:
-                    CLO_RELEASE(close_tap_it);
-        }
-    }
-
-    return true;
-}
-
-//layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); }
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-
-// clang-format off
-static void render_qmk_logo(void) {
-    static const char PROGMEM qmk_logo[] = {
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-    oled_write_P(qmk_logo, false);
-}
-// clang-format on
-static void render_static_info(void) {
-    render_qmk_logo();
-    oled_write_P(PSTR("Kyria rev1.0\n"), false);
-    oled_write_P(PSTR("Keymap: plattfot v2\n"), false);
-}
-
-static void render_status(void) {
-    // QMK Logo and version information
-    render_qmk_logo();
-    oled_write_P(PSTR("Kyria rev1.0\n"), false);
-    oled_write_P(PSTR("v" QMK_VERSION "\n"), false);
-
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case _DEFAULT:
-            oled_write_P(PSTR("base\n"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("<-sym/fun->\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("<-fun/sym->\n"), false);
-            break;
-        case _NAV:
-            oled_write_P(PSTR("num/nav\n"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("adjust\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("undefined\n"), false);
-    }
-
-    // Host Keyboard LED Status and Double tap
-    led_t led_state = host_keyboard_led_state();
-    if (led_state.num_lock) {
-        oled_write_P(PSTR("NUMLCK "), false);
-    } else if (close_tap_it) {
-        oled_write_P(PSTR("Close  "), false);
-    } else {
-        oled_write_P(PSTR("       "), false);
-    }
-
-    if (led_state.caps_lock) {
-        oled_write_P(PSTR("CAPLCK "), false);
-    } else if (close_tap_it) {
-        oled_write_P(PSTR("Tap    "), false);
-    } else {
-        oled_write_P(PSTR("       "), false);
-    }
-
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_static_info();
-    }
-    return false;
-}
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            case _LOWER:
-                // Skip/Prev song
-                if (clockwise) {
-                    tap_code(KC_MNXT);
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                } else {
-                    tap_code(KC_MPRV);
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                }
-                break;
-            case _NAV:
-                // Brightness control
-                if (clockwise) {
-                    tap_code(KC_BRIU);
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                } else {
-                    tap_code(KC_BRID);
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                }
-                break;
-            default:
-                // Volume control
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                } else {
-                    tap_code(KC_VOLD);
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                }
-                break;
-        }
-    } else if (index == 1) {
-        switch (get_highest_layer(layer_state)) {
-            case _RAISE:
-                // Scroll through the workspaces
-                if (clockwise) {
-                    tap_code16(G(KC_GT));
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                } else {
-                    tap_code16(G(KC_LT));
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                }
-                break;
-            default:
-                // Scrolling
-                if (clockwise) {
-                    tap_code(KC_PGDN);
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                } else {
-                    tap_code(KC_PGUP);
-                    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-                }
-                break;
-        }
-    }
-    return true;
-}
-#endif
-
-void leader_end_user(void) {
-    // Sway navigation
-    if (leader_sequence_one_key(KC_Q)) {  // Jump to workspace 1
-        SEND_STRING(SS_LGUI("1"));
-    }
-    if (leader_sequence_one_key(KC_W)) {  // Jump to workspace 2
-        SEND_STRING(SS_LGUI("2"));
-    }
-    if (leader_sequence_one_key(KC_E)) {  // Jump to workspace 3
-        SEND_STRING(SS_LGUI("3"));
-    }
-    if (leader_sequence_one_key(KC_R)) {  // Jump to workspace 4
-        SEND_STRING(SS_LGUI("4"));
-    }
-    if (leader_sequence_one_key(KC_T)) {  // Jump to workspace 5
-        SEND_STRING(SS_LGUI("5"));
-    }
-
-    if (leader_sequence_one_key(KC_Y)) {  // Jump to workspace 6
-        SEND_STRING(SS_LGUI("6"));
-    }
-    if (leader_sequence_one_key(KC_U)) {  // Jump to workspace 7
-        SEND_STRING(SS_LGUI("7"));
-    }
-    if (leader_sequence_one_key(KC_I)) {  // Jump to workspace 8
-        SEND_STRING(SS_LGUI("8"));
-    }
-    if (leader_sequence_one_key(KC_O)) {  // Jump to workspace 9
-        SEND_STRING(SS_LGUI("9"));
-    }
-    if (leader_sequence_one_key(KC_P)) {  // Jump to workspace 0
-        SEND_STRING(SS_LGUI("0"));
-    }
-    if (leader_sequence_one_key(KC_G)) {  // View scratch pad
-        SEND_STRING(SS_LGUI("-"));
-    }
-
-    // Sway move window
-    if (leader_sequence_two_keys(KC_M, KC_Q)) {  // Move to workspace 1
-        SEND_STRING(SS_LSFT(SS_LGUI("1")));
-    }
-    if (leader_sequence_two_keys(KC_M, KC_W)) {  // Move to workspace 2
-        SEND_STRING(SS_LSFT(SS_LGUI("2")));
-    }
-    if (leader_sequence_two_keys(KC_M, KC_E)) {  // Move to workspace 3
-        SEND_STRING(SS_LSFT(SS_LGUI("3")));
-    }
-    if (leader_sequence_two_keys(KC_M, KC_R)) {  // Move to workspace 4
-        SEND_STRING(SS_LSFT(SS_LGUI("4")));
-    }
-    if (leader_sequence_two_keys(KC_M, KC_T)) {  // Move to workspace 5
-        SEND_STRING(SS_LSFT(SS_LGUI("5")));
-    }
-
-    if (leader_sequence_two_keys(KC_M, KC_Y)) {  // Move to workspace 6
-        SEND_STRING(SS_LSFT(SS_LGUI("6")));
-    }
-    if (leader_sequence_two_keys(KC_M, KC_U)) {  // Move to workspace 7
-        SEND_STRING(SS_LSFT(SS_LGUI("7")));
-    }
-    if (leader_sequence_two_keys(KC_M, KC_I)) {  // Move to workspace 8
-        SEND_STRING(SS_LSFT(SS_LGUI("8")));
-    }
-    if (leader_sequence_two_keys(KC_M, KC_O)) {  // Move to workspace 9
-        SEND_STRING(SS_LSFT(SS_LGUI("9")));
-    }
-    if (leader_sequence_two_keys(KC_M, KC_P)) {  // Move to workspace 0
-        SEND_STRING(SS_LSFT(SS_LGUI("0")));
-    }
-    if (leader_sequence_two_keys(KC_M, KC_G)) {  // Move to scratch pad
-        SEND_STRING(SS_LSFT(SS_LGUI("-")));
-    }
-}
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk b/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk
deleted file mode 100644
index f35aee8683d..00000000000
--- a/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-LEADER_ENABLE = yes        # Enable the Leader Key feature
-MOUSEKEY_ENABLE = no       # Disable mouse, need to save space.
diff --git a/keyboards/splitkb/kyria/keymaps/shinze/config.h b/keyboards/splitkb/kyria/keymaps/shinze/config.h
deleted file mode 100644
index f722e8b8e0d..00000000000
--- a/keyboards/splitkb/kyria/keymaps/shinze/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-#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/splitkb/kyria/keymaps/shinze/keymap.c b/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
deleted file mode 100644
index ecc70055b2c..00000000000
--- a/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-#include "keymap_bepo.h"
-
-enum layers {
-    _BEPO = 0,
-    _LOWER,
-    _RAISE,
-    _ADJUST
-};
-
-#define RESC LT(_RAISE, KC_ESC)
-#define BP_EA BP_EACU
-#define BP_AG BP_AGRV
-#define BP_EG BP_EGRV
-#define BP_DC BP_DCIR
-#define BP_AP BP_QUOT
-#define BP_CO BP_COMM
-#define BP_DT BP_DOT
-#define LS KC_LSFT
-#define BP_DOL BP_DLR
-
-/* Bottom Row */
-#define BR01 KC_LCTL
-#define BR02 KC_LALT
-#define BR03 MT(MOD_LGUI, KC_ENT)
-#define BR04 LT(_LOWER, KC_SPC)
-#define BR05 LT(_RAISE, KC_ESC)
-#define BR06 LT(_LOWER, KC_ENT)
-#define BR07 LT(_RAISE, KC_SPC)
-#define BR08 KC_TAB
-#define BR09 KC_BSPC
-#define BR10 KC_RALT
-
-/* Under the screen row */
-#define U1 KC_LSFT
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * Base Layer: BÉPO
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |RAIS/ESC|   B  |   É  |   P  |   O  |   È  |                              |   ^  |   V  |   D  |   L  |   J  |  | Z   |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |   W    |   A  |   U  |  I   |   E  |   ,  |                              |   C  |   T  |   S  |   R  |   N  |   M    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   À  |   Y  |   X  |   .  |   K  |  SPC |LShift|  |LShift|LShift|   ’  |   Q  |   G  |   H  |   F  |   Ç    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        | CTRL | Alt  | Enter| Space| Esc  |  | Enter| Space| Tab  | Bksp | AltGr|
- *                        |      |      | CMD  | Lower| Raise|  | Lower| Raise|      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_BEPO] = LAYOUT(
-      RESC, BP_B,  BP_EA, BP_P, BP_O,  BP_EG,                         BP_DC, BP_V, BP_D, BP_L, BP_J, BP_Z,
-      BP_W, BP_A,  BP_U,  BP_I, BP_E,  BP_CO,                         BP_C,  BP_T, BP_S, BP_R, BP_N, BP_M,
-      LS,   BP_AG, BP_Y,  BP_X, BP_DT, BP_K, KC_SPC, U1,    U1,   U1,   BP_AP, BP_Q, BP_G, BP_H, BP_F, BP_CCED,
-                          BR01, BR02,  BR03, BR04, BR05,  BR06, BR07, BR08,  BR09, BR10
-    ),
-/*
- * Lower Layer: Numbers and symbols ?
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |    $   |  "   |  «   |  »   |  (   |  )   |                              |   @  |   +  |   -  |   /  |   *  |   =    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |    #   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   °    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |    %   |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |   `    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_LOWER] = LAYOUT(
-      BP_DOL , BP_DQUO, BP_LDAQ, BP_RDAQ, BP_LPRN, BP_RPRN,                                       BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL,
-      BP_HASH, BP_1,    BP_2,    BP_3,    BP_4,    BP_5,                                          BP_6,    BP_7,     BP_8,    BP_9,    BP_0,   BP_DEG,
-      BP_PERC, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, BP_GRV,
-                                 _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______
-    ),
-/*
- * Raise Layer: Media
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      | Prev | Play | Next | VolUp|                              | Left | Down | Up   | Right|      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      | Mute | VolDn|      |      |  |      |      | MLeft| Mdown| MUp  |MRight|      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_RAISE] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                       _______, _______, _______, _______, _______, _______,
-      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU,                                       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-      _______, _______, _______, _______, KC_MUTE, KC_VOLD, _______, _______,   _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
-                                 _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______
-    ),
-/*
- * Adjust Layer: Function keys, RGB
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        | F1   |  F2  | F3   | F4   | F5   |                              | F6   | F7   |  F8  | F9   | F10  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | TOG  | SAI  | HUI  | VAI  | MOD  |                              |      |      |      | F11  | F12  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      | SAD  | HUD  | VAD  | RMOD |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_ADJUST] = LAYOUT(
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-      _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD,                                     _______, _______, _______, KC_F11,  KC_F12,  _______,
-      _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                      _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                      _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
-//     ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;
-}
-
-static void render_kyria_logo(void) {
-    static const char PROGMEM kyria_logo[] = {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-        0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-    };
-    oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-}
-
-static void render_qmk_logo(void) {
-  static const char PROGMEM qmk_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-  oled_write_P(qmk_logo, false);
-}
-
-static void render_status(void) {
-    // QMK Logo and version information
-    render_qmk_logo();
-    oled_write_P(PSTR("Kyria rev1.0\n\n"), false);
-
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case _BEPO:
-            oled_write_P(PSTR("BEPO\n"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("NumSym\n"), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Media\n"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adjust\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undefined\n"), false);
-    }
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_kyria_logo();
-    }
-    return false;
-}
-#endif
-
-#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 true;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/shinze/rules.mk b/keyboards/splitkb/kyria/keymaps/shinze/rules.mk
deleted file mode 100644
index 7b3d2303508..00000000000
--- a/keyboards/splitkb/kyria/keymaps/shinze/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/splitkb/kyria/keymaps/squigglybob/config.h b/keyboards/splitkb/kyria/keymaps/squigglybob/config.h
deleted file mode 100755
index 5ed5c847939..00000000000
--- a/keyboards/splitkb/kyria/keymaps/squigglybob/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 Thomas Baart <thomas@splitkb.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
-
-#ifdef RGBLIGHT_ENABLE
-#    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_SAT_STEP  8
-#    define RGBLIGHT_VAL_STEP  8
-#    define RGBLIGHT_LIMIT_VAL 150
-#endif
-
-#define TAPPING_TOGGLE 2    // can double tap into a layer if set using TT
-#define TAPPING_TERM 175
diff --git a/keyboards/splitkb/kyria/keymaps/squigglybob/keymap.c b/keyboards/splitkb/kyria/keymaps/squigglybob/keymap.c
deleted file mode 100755
index 2b5df2a8f5a..00000000000
--- a/keyboards/splitkb/kyria/keymaps/squigglybob/keymap.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* Copyright 2019 Thomas Baart<thomas @splitkb.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 layers {
-    _DVERTY = 0,
-    _QWERTY,
-    _DVORAK,
-    _NAV,
-    _SYM,
-    _SYM_DVERTY,
-    _FUNCTION,
-    _ADJUST,
-};
-
-// Aliases for readability
-#define QWERTY DF(_QWERTY)
-#define DVERTY DF(_DVERTY)
-#define DVORAK DF(_DVORAK)
-
-#define SYM MO(_SYM)
-#define SYM_DVERTY MO(_SYM_DVERTY)
-#define NAV MO(_NAV)
-#define FKEYS MO(_FUNCTION)
-#define ADJUST MO(_ADJUST)
-
-#define CTL_ESC MT(MOD_LCTL, KC_ESC)
-#define CTL_QUOT MT(MOD_RCTL, KC_QUOTE)
-#define CTL_MINS MT(MOD_RCTL, KC_MINUS)
-#define ALT_ENT MT(MOD_LALT, KC_ENT)
-#define CTL_ENT MT(MOD_LCTL, KC_ENT)
-#define SFT_SPC MT(MOD_LSFT, KC_SPC)
-#define ALT KC_LEFT_ALT
-
-#define UK_BKSL KC_NUBS     // UK backslash
-#define UK_PIPE S(UK_BKSL)  // UK pipe symbol
-#define DV_AT S(KC_Q)       // Dvorak @ symbol
-
-// Note: LAlt/Enter (ALT_ENT) is not the same thing as the keyboard shortcut Alt+Enter.
-// The notation `mod/tap` denotes a key that activates the modifier `mod` when held down, and
-// produces the key `tap` when tapped (i.e. pressed and released)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY (default map)
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |Ctrl/' "|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  | [ {  |CapsLk|  |F-keys|  ] } |   N  |   M  | ,  < | . >  | /  ? | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
- *                        |      |      | Enter|      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_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_BSPC,
-     CTL_ESC , KC_A ,  KC_S   ,  KC_D  ,   KC_F ,   KC_G ,                                        KC_H,   KC_J ,  KC_K ,   KC_L ,KC_SCLN,CTL_QUOT,
-     KC_LSFT , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , KC_LBRC,KC_CAPS,     FKEYS  , KC_RBRC, KC_N,   KC_M ,KC_COMM, KC_DOT ,KC_SLSH, KC_RSFT,
-                                ADJUST , KC_LGUI, ALT_ENT, KC_SPC , NAV   ,     SYM    , KC_SPC ,KC_RALT, KC_RGUI, KC_APP
-    ),
-
-/*
- * Base Layer: DVERTY (a qwerty layout keyboard optimised for a system running UK dvorak)
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |Ctrl/' "|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  | { [  |CapsLk|  |F-keys| } ]  |   N  |   M  | ,  < | . >  | /  ? | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LGUI | LAlt |Space/| Nav  |  | Sym  |Enter/| RGUI | AltGr| Menu |
- *                        |      |      |      |LShift|      |  |      | Ctrl |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_DVERTY] = LAYOUT(
-     KC_TAB  , KC_Q ,  KC_W   ,  KC_E  ,   KC_R ,   KC_T ,                                        KC_Y,   KC_U ,  KC_I ,   KC_O ,  KC_P ,   KC_BSPC,
-     CTL_ESC , KC_A ,  KC_S   ,  KC_D  ,   KC_F ,   KC_G ,                                        KC_H,   KC_J ,  KC_K ,   KC_L ,  KC_SCLN, CTL_QUOT,
-     KC_LSFT , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , KC_MINS,KC_CAPS,     FKEYS  , KC_EQL , KC_N,   KC_M ,  KC_COMM, KC_DOT ,KC_SLSH, KC_RSFT,
-                                ADJUST , KC_LGUI,   ALT  , SFT_SPC ,NAV,      SYM_DVERTY, CTL_ENT , KC_RGUI,KC_RALT,KC_APP
-    ),
-
-/*
- * Base Layer: Dvorak
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  Tab   | ' "  | , <  | . >  |   P  |   Y  |                              |   F  |   G  |   C  |   R  |   L  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |Ctrl/Esc|   A  |   O  |   E  |   U  |   I  |                              |   D  |   H  |   T  |   N  |   S  |Ctrl/- _|
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift | ; :  |   Q  |   J  |   K  |   X  | [ {  |CapsLk|  |F-keys|  ] } |   B  |   M  |   W  |   V  |   Z  | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |Adjust| LGUI | LAlt/| Space| Nav  |  | Sym  | Space| AltGr| RGUI | Menu |
- *                        |      |      | Enter|      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_DVORAK] = LAYOUT(
-     KC_TAB  ,KC_QUOTE,KC_COMM,  KC_DOT,   KC_P ,   KC_Y ,                                        KC_F,   KC_G ,  KC_C ,   KC_R ,  KC_L , KC_BSPC,
-     CTL_ESC , KC_A ,  KC_O   ,  KC_E  ,   KC_U ,   KC_I ,                                        KC_D,   KC_H ,  KC_T ,   KC_N ,  KC_S , CTL_MINS,
-     KC_LSFT ,KC_SCLN, KC_Q   ,  KC_J  ,   KC_K ,   KC_X , KC_LBRC,KC_CAPS,     FKEYS  , KC_RBRC, KC_B,   KC_M ,  KC_W ,   KC_V ,  KC_Z , KC_RSFT,
-                                 ADJUST, KC_LGUI, ALT_ENT, KC_SPC , NAV   ,     SYM    , KC_SPC ,KC_RALT, KC_RGUI, KC_APP
-    ),
-
-/*
- * Nav Layer: Media, navigation
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              | PgUp | Home |   ↑  | End  | VolUp| Delete |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  GUI |  Alt | Ctrl | Shift|      |                              | PgDn |  ←   |   ↓  |   →  | VolDn| Insert |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |ScLck |  |      |      | Pause|M Prev|M Play|M Next|VolMut| PrtSc  |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_NAV] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
-      _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
-      _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Sym Layer: Numbers and symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |    `   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   =    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |    ~   |  !   |  @   |  #   |  $   |  %   |                              |   ^  |  &   |  *   |  (   |  )   |   +    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |    |   |   \  |  :   |  ;   |  -   |  [   |  {   |      |  |      |   }  |   ]  |  _   |  ,   |  .   |  /   |   ?    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_SYM] = LAYOUT(
-      KC_GRV ,   KC_1 ,   KC_2 ,   KC_3 ,   KC_4 ,   KC_5 ,                                       KC_6 ,   KC_7 ,   KC_8 ,   KC_9 ,   KC_0 , KC_EQL ,
-     KC_TILD , KC_EXLM,  KC_AT , KC_HASH,  KC_DLR, KC_PERC,                                     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
-     KC_PIPE , KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_LCBR, _______, _______, KC_RCBR, KC_RBRC, KC_UNDS, KC_COMM,  KC_DOT, KC_SLSH, KC_QUES,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Sym Layer: Numbers and symbols for Dverty layout
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |    `   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   ~    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  CTRL  |  !   |  "   |  £   |  $   |  %   |                              |   ^  |  &   |  *   |  (   |  )   |   #    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |  SHIFT |   \  |  =   |  +   |  [   |  {   |      |      |  |      |      |  }   |  ]   |  /   |   ?  |   |  |   @    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |   /  |  ?   |  | layer|      |      |      |      |
- *                        |      |      |      |      |      |  |  off |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_SYM_DVERTY] = LAYOUT(
-      KC_GRV ,   KC_1 ,   KC_2 ,   KC_3 ,   KC_4 ,   KC_5 ,                                       KC_6 ,   KC_7 ,   KC_8 ,   KC_9 ,   KC_0 , KC_PIPE ,
-     CTL_ESC, KC_EXLM ,  KC_AT , KC_HASH,  KC_DLR, KC_PERC,                                     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSLS,
-     KC_LSFT , UK_BKSL, KC_RBRC, KC_RCBR, KC_MINS, KC_UNDS, _______, _______, _______, _______, KC_PLUS, KC_EQL,  KC_LBRC, KC_LCBR, UK_PIPE, DV_AT,
-                                 _______, _______, _______, KC_LBRC, KC_LCBR, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Function Layer: Function keys
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  F1    |  F2  |  F3  |  F4  |  F5  |  F6  |                              |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  F7    |  F8  |  F9  |  F10 |  F11 |  F12 |                              |      | Shift| Ctrl |  Alt |  GUI |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_FUNCTION] = 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_RSFT, KC_RCTL, KC_LALT, KC_RGUI, _______,
-      _______, _______ ,  _______ ,  _______ ,  _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-/*
- * Adjust Layer: Default layer settings, RGB
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |QWERTY|      |      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |Colmak|      |      |      |      |  |      |      |      | SAD  | HUD  | VAD  | RMOD |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [_ADJUST] = LAYOUT(
-      _______, _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, _______,
-      _______, _______, _______, DVERTY , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, _______,
-      _______, _______, _______, DVORAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, _______,
-                                 _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
-    ),
-
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-/* The default OLED and rotary encoder code can be found at the bottom of qmk_firmware/keyboards/splitkb/kyria/rev1/rev1.c
- * These default settings can be overriden by your own settings in your keymap.c
- * For your convenience, here's a copy of those settings so that you can uncomment them if you wish to apply your own modifications.
- * DO NOT edit the rev1.c file; instead override the weakly defined default functions by your own.
- */
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        // QMK Logo and version information
-        // clang-format off
-        static const char PROGMEM qmk_logo[] = {
-            0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-            0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-            0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-        // clang-format on
-
-        oled_write_P(qmk_logo, false);
-        oled_write_P(PSTR("Kyria rev2\n\n"), false);
-
-        // Host Keyboard Layer Status
-        oled_write_P(PSTR("Layer: "), false);
-        switch (get_highest_layer(layer_state|default_layer_state)) {
-            case _QWERTY:
-                oled_write_P(PSTR("QWERTY\n"), false);
-                break;
-            case _DVORAK:
-                oled_write_P(PSTR("Dvorak\n"), false);
-                break;
-            case _DVERTY:
-                oled_write_P(PSTR("Dverty\n"), false);
-                break;
-            case _NAV:
-                oled_write_P(PSTR("Nav\n"), false);
-                break;
-            case _SYM_DVERTY:
-                oled_write_P(PSTR("Sym\n"), false);
-                break;
-            case _SYM:
-                oled_write_P(PSTR("Sym\n"), false);
-                break;
-            case _FUNCTION:
-                oled_write_P(PSTR("Function\n"), false);
-                break;
-            case _ADJUST:
-                oled_write_P(PSTR("Adjust\n"), false);
-                break;
-            default:
-                oled_write_P(PSTR("Undefined\n"), false);
-        }
-
-        // Write host Keyboard LED Status to OLEDs
-        led_t led_usb_state = host_keyboard_led_state();
-        oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-    } else {
-        // clang-format off
-        static const char PROGMEM kyria_logo[] = {
-            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-            0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-        };
-        // clang-format on
-        oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/squigglybob/rules.mk b/keyboards/splitkb/kyria/keymaps/squigglybob/rules.mk
deleted file mode 100755
index 7de296873af..00000000000
--- a/keyboards/splitkb/kyria/keymaps/squigglybob/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/config.h b/keyboards/splitkb/kyria/keymaps/tessachka/config.h
deleted file mode 100644
index 1309aec0286..00000000000
--- a/keyboards/splitkb/kyria/keymaps/tessachka/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
deleted file mode 100644
index 87f51c4cd35..00000000000
--- a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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 layers {
-    QWERTY = 0,
-    LOWER,
-    RAISE,
-    ADJUST
-};
-
-enum custom_keycodes {
-    RGBRST = SAFE_RANGE,
-    KC_RACL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * | ESC    |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  | BSPC   |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * | TAB/ADJ|   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : | ENTER  |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LSHIFT |   Z  |   X  |   C  |   V  |   B  |      |      |  |      |      |   N  |   M  | ,  < | . >  | /  ? | F16    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      | Space|  | MYCM | Calc | F15  |      |      |
- *                        |      |      | Ctrl | LAlt | Lower|  | Raise|      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [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_BSPC,
-      LT(ADJUST,KC_TAB), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-      KC_LSFT,           KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_F16,
-            XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, LT(LOWER,KC_SPC),   LT(RAISE,KC_MYCM), KC_CALC, KC_F15, XXXXXXX, XXXXXXX
-    ),
-/*
- * Lower Layer: Numbers and symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * | `      | 1 !  | 2 @  | 3 #  | 4 $  | 5 %  |                              | 6 ^  | 7 &  | 8 *  | 9 (  | 0 )  | DEL    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * | CAPS   | - _  | = +  | [ {  | ] }  |      |                              |      |      |      |      | ' "  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LSHIFT | TAB  |      |      |      |      |      |      |  |      |      | Home | PgDn | PgUp | End  | \ |  |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      | Space|  | Space|      |      |      |      |
- *                        |      |      | Ctrl | LAlt | Lower|  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [LOWER] = LAYOUT(
-      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_CAPS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_NO,                                       KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_QUOT, KC_NO,
-      KC_LSFT, KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_BSLS, KC_NO,
-                                 _______, _______, _______, _______, _______, KC_SPC,  KC_NO,   KC_NO, _______, _______
-    ),
-/*
- * Raise Layer: Function Keys
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        | F1   | F2   | F3   | F4   | F5   |                              | F6   | F7   | F8   | F9   | F10  | F11    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |EEPRST|      |      |      |                              |      |      |      |      |      | F12    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LSHIFT | TAB  | QK_BOOT|      |      |      |      |      |  |      |      | Play |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      | Space|  | MYCM | Prev | Next  |      |      |
- *                        |      |      | Ctrl | LAlt |      |  | Raise|      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [RAISE] = LAYOUT(
-      KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-      KC_NO,   KC_NO,   EE_CLR,  KC_NO,   KC_NO,   KC_NO,                                       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F12,
-      KC_LSFT, KC_TAB,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   _______, _______, _______, _______, KC_MPLY, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-                                 _______, _______, _______, _______, KC_SPC , KC_MPRV, KC_MNXT, _______, _______, _______
-    ),
-/*
- * Adjust Layer: Arrow keys, RGB
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        | BTN2 | Up   | BTN1 |RGBMOD|RGBTOG|                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        | Left | Down | Right|RGBSAI|RGBHUI|                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | RGBRST |      |RGBVAI|RGBVAD|RGBSAD|RGBHUD|      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      | WBAK | BTN3 | WFWD |  | MYCM | Calc | F15  |      |      |
- *                        |      |      |      |      |      |  | Raise|      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [ADJUST] = LAYOUT(
-      KC_NO,   KC_BTN2, KC_UP,   KC_BTN1, RGB_MOD, RGB_TOG,                                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-      KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_SAI, RGB_HUI,                                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-      RGBRST,  KC_NO,   RGB_VAI, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-                                 _______, _______, KC_WBAK, KC_BTN3, KC_WFWD, _______, _______, _______, _______, _______
-    ),
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, LOWER, RAISE, ADJUST);
-}
-
-// bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//     switch (keycode) {
-//         case MyCustomKeycode:
-//             if (record->event.pressed) {
-//                 // What to do if the button was pressed
-//             } else {
-//                 // What to do if the button was released
-//             }
-//             break;
-//     }
-//     return true;
-// }
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-static void render_kyria_logo(void) {
-    static const char PROGMEM kyria_logo[] = {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-        0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-    };
-    oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-}
-
-static void render_tessachka_logo(void) {
-    static const char PROGMEM Tessachka_OLED_Logo_Inverted[] =
-        {
-              0,   0,   0,   0,   0,   0,   0,   0,   0, 128, 192, 192, 192, 192, 192, 192, 192,
-            192, 192, 192,  64,   0,   0, 128, 128, 192, 192, 192, 192, 192, 192, 64,    0,   0,
-            128, 192, 192, 192, 192, 192, 192, 192, 192, 192,  64,   0,   0, 128, 192, 192, 192,
-            192, 192, 192, 192, 192, 192,  64,   0,   0,   0,   0,   0,   0, 192, 192,   0,   0,
-              0,   0,   0,   0,   0, 128, 192, 192, 192, 192, 192, 192, 192, 192, 128,   0,   0,
-            192, 128,   0,   0,   0,   0,   0,   0,   0,   0, 128, 192,   0, 192, 128,   0,   0,
-              0,   0, 128, 192, 192, 128,   0,   0,   0,   0,   0,   0,   0, 192, 192,   0,   0,
-              0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-              1,   1,   1,   1, 255, 255, 255, 127,   1,   1,   1,   0,  24, 126, 255, 255, 219,
-            219, 153, 153, 153, 137, 128, 128,   0, 135, 143, 159, 153, 153, 153, 153, 153, 153,
-            249, 240, 224,   0, 135, 143, 159, 153, 153, 153, 153, 153, 153, 249, 240, 224,   0,
-              0, 192, 240, 252, 159, 135, 135, 159, 124, 240, 192,   0,  60, 255, 255, 231, 195,
-            129,   0,   0,   0, 129, 195, 195, 195,   0, 255, 255, 255,  24,  24,  24,  24,  24,
-             24, 255, 255, 255,   0, 255, 255, 255,  28,  62, 127, 247, 227, 193, 128,   0,   0,
-              0, 192, 240, 252, 159, 135, 135, 159, 124, 240, 192,   0,   0,   0,   0,   0,   0,
-              0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   1,   0,   0,
-              0,   0,   0,   0,   0,   0,   0,   1,   1,   3,   3,   3,   3,   3,   1,   0,   0,
-              0,   1,   3,   3,   3,   3,   3,   3,   3,   3,   1,   0,   0,   0,   1,   3,   3,
-              3,   3,   3,   3,   3,   3,   1,   0,   0,   3,   3,   3,   3,   3,   3,   1,   0,
-              0,   1,   3,   3,   0,   0,   1,   3,   3,   3,   3,   3,   3,   3,   3,   1,   0,
-              0,   0,   1,   3,   0,   0,   0,   0,   0,   0,   3,   1,   0,   0,   0,   1,   3,
-              0,   0,   0,   0,   1,   3,   3,   1,   0,   3,   3,   3,   3,   3,   3,   1,   0,
-              0,   1,   3,   3,   0,   0,   0,   0,   0,   0
-        };
-    oled_write_raw_P(Tessachka_OLED_Logo_Inverted, sizeof(Tessachka_OLED_Logo_Inverted));
-    oled_advance_page(false);
-    oled_advance_page(false);
-    oled_advance_page(false);
-}
-
-static void render_status(void) {
-    // Logo and version information
-    render_tessachka_logo();
-    oled_write_P(PSTR("Kyria rev1.0\n\n"), false);
-
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case QWERTY:
-            oled_write_P(PSTR("Default\n"), false);
-            break;
-        case LOWER:
-            oled_write_P(PSTR("Lower\n"), false);
-            break;
-        case RAISE:
-            oled_write_P(PSTR("Raise\n"), false);
-            break;
-        case ADJUST:
-            oled_write_P(PSTR("Adjust\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undefined\n"), false);
-    }
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_kyria_logo();
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk b/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk
deleted file mode 100644
index 7fe734fb724..00000000000
--- a/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-OLED_ENABLE = yes
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/config.h b/keyboards/splitkb/kyria/keymaps/thomasbaart/config.h
deleted file mode 100644
index 32d8bb76119..00000000000
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#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 RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP
-#endif
-
-// EC11K encoders have a different resolution than other EC11 encoders.
-// When using the default resolution of 4, if you notice your encoder skipping
-// every other tick, lower the resolution to 2.
-#define ENCODER_RESOLUTION 2
-
-// The Leader key allows to flexibly assign macros to key sequences.
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 350
-
-#define TAPPING_TERM 200
-
-// Allows to use either side as the master. Look at the documentation for info:
-// https://docs.qmk.fm/#/config_options?id=setting-handedness
-#define EE_HANDS
-
-// Allows media codes to properly register in macros and rotary encoder code
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
deleted file mode 100644
index 14ce1b1a6e1..00000000000
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-uint16_t copy_paste_timer;
-
-enum layers {
-    QWERTY = 0,
-    LOWER,
-    RAISE,
-    NAV,
-    ADJUST
-};
-
-enum custom_keycodes {
-    KC_CCCV = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * | ESC    |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  | \   |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * | LSFT   |   A  |   S  |  D   |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |  ' "   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LCTL   |   Z  |   X  |   C  |   V  |   B  | CCCV |      |  | Del  |Leader|   N  |   M  | ,  < | . >  | /  ? |  - _   |
- * `----------------------+------+------+------+------+      |  |------+------+------+------+------+----------------------'
- *                        | GUI  | Alt  |      | Space| Enter|  | Bspc | Space|      | Tab  | AltGr|
- *                        |      |      | Lower| Shift| Alt  |  |      | Nav  | Raise|      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [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_PIPE,
-      KC_LSFT, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,                                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-      KC_LCTL, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_CCCV,   XXXXXXX, KC_DEL, QK_LEAD,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_MINS,
-              KC_LGUI, KC_LALT, MO(LOWER), MT(MOD_LSFT, KC_SPC), MT(MOD_LALT, KC_ENT), KC_BSPC, LT(NAV, KC_SPC), MO(RAISE), KC_TAB, KC_RALT
-    ),
-/*
- * Lower Layer: Numpad, Media
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      | VolUp|      |      |                              | / ?  | 7 &  | 8 *  | 9 (  | - _  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      | Prev | Play | Next |      |                              | *    | 4 $  | 5 %  | 6 ^  | , <  | +      |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      | VolDn| Mute |      |      |      |  |      |      | 0 )  | 1 !  | 2 @  | 3 #  | = +  |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      | Lower|      |      |  |      | Nav  | Raise|      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [LOWER] = LAYOUT(
-      _______, _______, _______, KC_VOLU, _______, _______,                                     KC_SLSH, KC_7,    KC_8,    KC_9, KC_MINS, _______,
-      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                                     KC_ASTR, KC_4,    KC_5,    KC_6, KC_COMM, KC_PLUS,
-      _______, _______, _______, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_0,    KC_1,    KC_2,    KC_3, KC_EQL,  _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Raise Layer: Symbols
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |  !   |  @   |  {   |  }   |  |   |                              |      |  _   |  €   |      |      |  \     |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |  #   |  $   |  (   |  )   |  `   |                              |   +  |  -   |  /   |  *   |  %   |  ' "   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |  %   |  ^   |  [   |  ]   |  ~   |      |      |  |      |      |   &  |  =   |  ,   |  .   |  / ? | - _    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      | Lower|      |      |  |      | Nav  | Raise|      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [RAISE] = LAYOUT(
-      _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,                                     _______, KC_UNDS, ALGR(KC_5),_______,_______,KC_BSLS,
-      _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,                                      KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_PERC, KC_QUOT,
-      _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_EQL,  KC_COMM, KC_DOT,  KC_SLSH, KC_MINS,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Navigation Layer
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              | PgUp | Home | Up   | End  |      | ScrlLk |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |                              | PgDn | Left | Down | Right|      | CapsLk |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      | Lower|      |      |  |      | Nav  | Raise|      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [NAV] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______, KC_SCRL,
-      _______, _______, _______, _______, _______, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_CAPS,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-/*
- * Adjust Layer
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |      |      |      |                              |      | F7   | F8   | F9   | F10  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      | SAI  | HUI  | VAI  |      |                              |      | F4   | F5   | F6   | F11  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      | SAD  | HUD  | VAD  |      |      |      |  |      |      |      | F1   | F2   | F3   | F12  |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [ADJUST] = LAYOUT(
-      _______, _______, _______, _______, _______, _______,                                     _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-      _______, _______, RGB_SAI, RGB_HUI, RGB_VAI, _______,                                     _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,  _______,
-      _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,  _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, LOWER, RAISE, ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_CCCV:  // One key copy/paste
-            if (record->event.pressed) {
-                copy_paste_timer = timer_read();
-            } else {
-                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
-                    tap_code16(LCTL(KC_C));
-                } else { // Tap, paste
-                    tap_code16(LCTL(KC_V));
-                }
-            }
-            break;
-    }
-    return true;
-}
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(KC_C)) { // Inline Code
-        SEND_STRING("`` " SS_TAP(X_LEFT) SS_TAP(X_LEFT));
-    }
-    if (leader_sequence_one_key(KC_P)) { // Invoke Password Manager
-        SEND_STRING(SS_LCTL(SS_LALT("\\")));
-    }
-    if (leader_sequence_one_key(KC_S)) { // Windows screenshot
-        SEND_STRING(SS_LGUI("\nS"));
-    }
-    if (leader_sequence_two_keys(KC_F, KC_P)) { // Fusion Projection prefix
-        SEND_STRING("[Projection] ");
-    }
-    if (leader_sequence_two_keys(KC_B, KC_B)) { // Basecone invoice description
-        SEND_STRING("[Leveranciersnaam] [Factuurnummer]");
-    }
-    if (leader_sequence_two_keys(KC_E, KC_S)) { // Support email splitkb
-        SEND_STRING("support@splitkb.com");
-    }
-    if (leader_sequence_two_keys(KC_E, KC_T)) { // Email splitkb
-        SEND_STRING("thomas@splitkb.com");
-    }
-    if (leader_sequence_two_keys(KC_E, KC_P)) { // Email personal
-        SEND_STRING("mail@thomasbaart.nl");
-    }
-    if (leader_sequence_two_keys(KC_S, KC_D)) { // Splitkb documentation
-        SEND_STRING("https://docs.splitkb.com/");
-    }
-    if (leader_sequence_two_keys(KC_S, KC_V)) { // Splitkb VAT number
-        SEND_STRING("NL210593349B01");
-    }
-    if (leader_sequence_two_keys(KC_B, KC_C)) { // Discord bongocat
-        SEND_STRING(":bongocat:\n");
-    }
-    if (leader_sequence_two_keys(KC_C, KC_B)) { // Discord code block
-        SEND_STRING("```c" SS_LSFT("\n\n") "``` " SS_TAP(X_UP));
-    }
-    if (leader_sequence_two_keys(KC_Y, KC_S)) { // Greeting
-        SEND_STRING("Yours sincerely,\n\nThomas Baart");
-    }
-    if (leader_sequence_three_keys(KC_M, KC_V, KC_G)) { // Greeting
-        SEND_STRING("Met vriendelijke groet,\n\nThomas Baart");
-    }
-}
-
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-
-void matrix_scan_user(void) {
-    if (is_alt_tab_active) {
-        if (timer_elapsed(alt_tab_timer) > 1000) {
-            unregister_code(KC_LALT);
-            is_alt_tab_active = false;
-        }
-    }
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-static void render_kyria_logo(void) {
-    static const char PROGMEM kyria_logo[] = {
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-        0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-        0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-    };
-    oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-}
-
-static void render_qmk_logo(void) {
-  static const char PROGMEM qmk_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-  oled_write_P(qmk_logo, false);
-}
-
-static void render_status(void) {
-    // QMK Logo and version information
-    render_qmk_logo();
-    oled_write_P(PSTR("       Kyria rev1.0\n\n"), false);
-
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-    switch (get_highest_layer(layer_state)) {
-        case QWERTY:
-            oled_write_P(PSTR("Default\n"), false);
-            break;
-        case LOWER:
-            oled_write_P(PSTR("Lower\n"), false);
-            break;
-        case RAISE:
-            oled_write_P(PSTR("Raise\n"), false);
-            break;
-        case NAV:
-            oled_write_P(PSTR("Navigation\n"), false);
-            break;
-        case ADJUST:
-            oled_write_P(PSTR("Adjust\n"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Undefined\n"), false);
-    }
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_kyria_logo();
-    }
-    return false;
-}
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            case QWERTY:
-                // History scrubbing. For Adobe products, hold shift while moving
-                // backward to go forward instead.
-                if (clockwise) {
-                    tap_code16(C(KC_Z));
-                } else {
-                    tap_code16(C(KC_Y));
-                }
-                break;
-            default:
-                // Switch between windows on Windows with alt tab.
-                if (clockwise) {
-                    if (!is_alt_tab_active) {
-                        is_alt_tab_active = true;
-                        register_code(KC_LALT);
-                    }
-                    alt_tab_timer = timer_read();
-                    tap_code16(KC_TAB);
-                } else {
-                    tap_code16(S(KC_TAB));
-                }
-                break;
-        }
-    } else if (index == 1) {
-        switch (get_highest_layer(layer_state)) {
-            case QWERTY:
-                // Scrolling with PageUp and PgDn.
-                if (clockwise) {
-                    tap_code(KC_PGDN);
-                } else {
-                    tap_code(KC_PGUP);
-                }
-                break;
-            default:
-                // Volume control.
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-                break;
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk b/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk
deleted file mode 100644
index a64a9f4e15f..00000000000
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-LEADER_ENABLE = yes        # Enable the Leader Key feature
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/travishi/config.h b/keyboards/splitkb/kyria/keymaps/travishi/config.h
deleted file mode 100644
index c579a76ecc8..00000000000
--- a/keyboards/splitkb/kyria/keymaps/travishi/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 TravisHi
- *
- * 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 OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_LAYERS
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP
-#endif
-
-// The Leader key allows to flexibly assign macros to key sequences.
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 350
-
-#define TAPPING_TERM 200
-
-// Allows to use either side as the master. Look at the documentation for info:
-// https://docs.qmk.fm/#/config_options?id=setting-handedness
-#define EE_HANDS
-
-// Allows media codes to properly register in macros and rotary encoder code
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/splitkb/kyria/keymaps/travishi/keymap.c b/keyboards/splitkb/kyria/keymaps/travishi/keymap.c
deleted file mode 100644
index e91d16b8f9b..00000000000
--- a/keyboards/splitkb/kyria/keymaps/travishi/keymap.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/* Copyright 2022 TravisHi
- *
- * 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 {
-  DVORAK = 0,
-  QWERTY,
-  LAYERS,
-  NUMSYM,
-  FPSGAMES,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * Base Layer: DVORAK
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  ESC   |  ' " | , <  |   .  |   P  |   Y  |                              |   F  |   G  |   C  |   R  |   L  |L_Qwerty|
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  Tab   |   A  |   O  |   E  |   U  |   I  |                              |   D  |   H  |   T  |   N  |   S  |   -    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift | :  ; |   Q  |   J  |   K  |   X  |LCtrl |      |  |  Win |L_Lay |   B  |   M  |   W  |   V  |   Z  | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'	
- *                        | Left |Right |L_NumS| Space| Bksp |  |R_Alt | ENTER|  Del |  Up  | Down |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-  [DVORAK] = LAYOUT(
-    KC_ESC,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                                                 KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    DF(QWERTY),
-    KC_TAB,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                                                 KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,  KC_LCTL, XXXXXXX,       KC_LWIN,  DF(LAYERS),  KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                      KC_LEFT, KC_RGHT, MO(NUMSYM),     KC_SPC,  KC_BSPC,       KC_RALT,  KC_ENT,      KC_DEL,  KC_UP,  KC_DOWN
-  ),
-
-
-
-
-
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  ESC   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |L_Dvorak|
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  Tab   |   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ;  : |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |LCtrl |      |  |  Win |L_Lay |   N  |   M  | ,  < | . >  | /  ? | RShift |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'	
- *                        | Left |Right |L_NumS| Space| Bksp |  | RAlt | ENTER|  Del |  Up  | Down |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [QWERTY] = LAYOUT(
-      KC_ESC,  KC_Q,  KC_W,   KC_E,   KC_R,    KC_T,                                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    DF(DVORAK),
-      KC_TAB,  KC_A,  KC_S,   KC_D,   KC_F,    KC_G,                                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, XXXXXXX,
-      KC_LSFT, KC_Z,  KC_X,   KC_C,   KC_V,    KC_B,  KC_LCTL, XXXXXXX,      KC_LWIN,  DF(LAYERS), KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                      KC_LEFT,  KC_RGHT, MO(NUMSYM),  KC_SPC,  KC_BSPC,      KC_RALT,  KC_ENT,     KC_DEL,  KC_UP,  KC_DOWN
-    ),
-
-
-
-
-
-/*
- * Base Layer: FPSGAMES
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |  ESC   |  1   |   Q  |   W  |   E  |   R  |                              |   Y  |   U  |   I  |   O  |   P  |L_Dvorak|
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |  Tab   |  2   |   A  |   S  |   D  |   F  |                              |  H   |   K  |   J  |   L  |   ;  |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * | LShift |  3   |   Z  |   X  |   C   |  V  |      |L_NumS|  |      |L_Lay |   N  |   M  | , <  | . >  |  / ? |         |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'	
- *                        |      |      | LCtrl| Space| LAlt |  |      |      | Mute |Vol U |Vol D |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [FPSGAMES] = LAYOUT(
-      KC_ESC,  KC_1,   KC_Q,   KC_W,   KC_E,    KC_R,                                                 KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    DF(DVORAK),
-      KC_TAB,  KC_2,   KC_A,   KC_S,   KC_D,    KC_F,                                                 KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, XXXXXXX,
-      KC_LSFT, KC_3,   KC_Z,   KC_X,   KC_C,    KC_V, XXXXXXX, MO(NUMSYM),       XXXXXXX, DF(LAYERS), KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, XXXXXXX,
-                          XXXXXXX,  XXXXXXX, KC_LCTL, KC_SPC,  KC_LALT,          XXXXXXX, XXXXXXX,    KC_MUTE, KC_VOLU, KC_VOLD
-    ),
-
-
-
-
-
-/*
- * MO Layer: Numbers, symbols & Vol control
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |    `   |  !   |  @   |  #   |  $   |  %   |                              |   ^  |  &   |  *   |  (   |  )   |   +    |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |    ~   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   =    |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |    |   |   \  |  :   |  ;   |  -   |  [   |  {   |   (  |  |   )  |   }  |   ]  |  _   |  ,   |  .   |  /   |   ?    |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        | Left |Right |      |LShift| Home |  |  End |      | Mute |Vol U |Vol D |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [NUMSYM] = LAYOUT(
-      KC_GRV,  KC_EXLM, KC_AT,    KC_HASH, KC_DLR, KC_PERC,                                            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
-      KC_TILD, KC_1,    KC_2,     KC_3,    KC_4,   KC_5,                                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
-      KC_PIPE, KC_BSLS, KC_COLN,  KC_SCLN, KC_MINS, KC_LBRC, KC_LCBR, KC_LPRN,       KC_RPRN, KC_RCBR, KC_RBRC, KC_UNDS, KC_COMM, KC_DOT,  KC_SLSH, KC_QUES,
-                                  KC_LEFT, KC_RGHT, XXXXXXX, KC_LSFT, KC_HOME,       KC_END,  XXXXXXX, KC_MUTE, KC_VOLU, KC_VOLD
-    ),
-
-
-
-
-
-/*
- * Adjust Layer: Layer index
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |        |      |      |FPSGames|Dvorak|    |                              |      |      |      |      |      |L_Dvorak|
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |        |      |      |      |QWERTY|      |                              |      |      |      |      |      |        |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |      |      |      |NUMSYM|      |      |      |  |      |      |      |      |      |      |      |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        |      |      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-    [LAYERS] = LAYOUT(
-      _______, _______, _______, DF(FPSGAMES), DF(DVORAK), _______,                                    _______, _______, _______, _______,  _______, DF(DVORAK),
-      _______, _______, _______, _______, DF(QWERTY), _______,                                    _______, _______, _______, _______,  _______, _______,
-      _______, _______, _______, _______, MO(NUMSYM), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-};
-
-// END LAYERS
-
-
-
-
-
-///////////////////////////
-// OLED Display settings
-#ifdef OLED_ENABLE
-
-
-
-
-// WPM-responsive animation stuff here
-#    define IDLE_FRAMES 2
-#    define IDLE_SPEED 20  // below this wpm value your animation will idle
-
-// #define PREP_FRAMES 1 // uncomment if >1
-
-#    define TAP_FRAMES 2
-#    define TAP_SPEED 40  // above this wpm value typing animation to trigger
-
-#    define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
-// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#    define ANIM_SIZE 1024  // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
-uint8_t current_tap_frame = 0;
-
-// Code containing pixel art, contains:
-// 5 idle frames, 1 prep frame, and 2 tap frames
-
-// To make your own pixel art:
-// save a png/jpeg of an 128x32 image (resource: https://www.pixilart.com/draw )
-// follow this guide up to and including "CONVERT YOUR IMAGE" https://docs.splitkb.com/hc/en-us/articles/360013811280-How-do-I-convert-an-image-for-use-on-an-OLED-display-
-// replace numbers in brackets with your own
-// if you start getting errors when compiling make sure you didn't accedentally delete a bracket
-
-
-static void render_anim(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 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, 0xc0, 0x40, 
-0x40, 0x60, 0x20, 0x20, 0x20, 0x20, 0x20, 0x60, 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, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x60, 0x30, 
-0x18, 0x0c, 0x06, 0x02, 0xc2, 0x42, 0x62, 0x22, 0x22, 0x24, 0x2f, 0x39, 0x31, 0x60, 0xe0, 0x10, 
-0x10, 0x08, 0x88, 0xcc, 0x44, 0x66, 0x23, 0x21, 0x31, 0x10, 0x98, 0x89, 0x8b, 0x0e, 0x08, 0x10, 
-0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x10, 0x60, 0x18, 
-0xe4, 0x1a, 0xe4, 0x1a, 0xcc, 0x30, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x78, 0x08, 0x08, 0x0c, 0x84, 0x9f, 0xe0, 0xb0, 
-0x98, 0x08, 0x0c, 0x04, 0x04, 0x04, 0xe6, 0xe2, 0xf2, 0xf2, 0xb2, 0xb3, 0xe1, 0xe1, 0xc1, 0x81, 
-0xe3, 0xbf, 0x81, 0xc0, 0x40, 0x40, 0x60, 0xa0, 0xbe, 0x3f, 0x1b, 0x9b, 0x8f, 0xcf, 0x66, 0x32, 
-0x9e, 0xb1, 0x40, 0x40, 0xc0, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18, 0x0f, 0x08, 0x08, 0x10, 
-0xd0, 0x70, 0x08, 0x0e, 0x02, 0x03, 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, 0xfc, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x01, 0x01, 0x01, 0x01, 0x11, 0x11, 0x89, 0xcb, 0x4b, 0x4b, 0x8b, 0x87, 0x91, 0x4b, 0x45, 
-0xe0, 0xa0, 0xb0, 0xd0, 0x51, 0x79, 0xad, 0xb4, 0xd6, 0x5a, 0x6b, 0x2d, 0x34, 0x96, 0xfb, 0xa9, 
-0xbd, 0x46, 0x66, 0x33, 0x19, 0x0c, 0x07, 0x01, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x70, 0x1c, 0x07, 
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 
-0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 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, 0x07, 0x0c, 0x38, 0xe0, 0x80, 0xc0, 0x40, 0x60, 0x20, 0x20, 0x20, 
-0x20, 0x20, 0x60, 0xc0, 0x80, 0x80, 0x80, 0x87, 0x8c, 0x88, 0x99, 0xd2, 0x5a, 0x6a, 0x29, 0x2d, 
-0x34, 0x94, 0x96, 0x9a, 0xcb, 0x49, 0x69, 0x2c, 0xb4, 0x96, 0x9a, 0x8b, 0x4d, 0x45, 0x46, 0x42, 
-0x21, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0e, 0x0b, 0x09, 0x04, 0x04, 0x04, 0x04, 
-0x02, 0x02, 0x02, 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, 0xf0, 0x1e, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x06, 0x0e, 0x0a, 0x1a, 0x1b, 0x35, 0x65, 0x45, 
-0x45, 0xc3, 0x82, 0x82, 0x81, 0x01, 0x01, 0x01, 0x00, 0x10, 0xf0, 0xf8, 0xf8, 0x78, 0x18, 0x00, 
-0x00, 0x80, 0xe0, 0xf0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0xc0, 0x20, 0x50, 0x10, 0xa0, 0x20, 0x40, 
-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, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 
-0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 
-0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x06, 
-0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x18, 0x10, 0x10, 0x30, 0x20, 0x20, 0x60, 
-0x40, 0x80, 0x80, 0xc0, 0x41, 0x63, 0x26, 0x3c, 0x10, 0x48, 0x88, 0xab, 0x29, 0x70, 0xc0, 0x88, 
-0x8e, 0xcf, 0x47, 0x43, 0x41, 0x40, 0x60, 0x20, 0x20, 0x20, 0x30, 0x10, 0x10, 0x18, 0x08, 0x08, 
-0x0c, 0x05, 0x06, 0x02, 0x0c, 0x19, 0x3c, 0x29, 0x6a, 0x44, 0x44, 0xc5, 0x84, 0x04, 0x02, 0x01, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x04, 0x0b, 0x0b, 0x36, 0x28, 0x2f, 0x2c, 0x29, 0x1a, 0x1c, 0x18, 0x1d, 0x16, 0x0a, 0x07, 
-0x01, 0x02, 0x02, 0x06, 0x06, 0x0e, 0x0e, 0x1e, 0x1c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 
-0x02, 0x02, 0x06, 0x04, 0x04, 0x04, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x18, 0x10, 0x10, 0x10},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 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, 0xc0, 0x40, 
-0x40, 0x60, 0x20, 0x20, 0x20, 0x20, 0x20, 0x60, 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, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x60, 0x30, 
-0x18, 0x0c, 0x06, 0x02, 0xc2, 0x42, 0x62, 0x22, 0x22, 0x24, 0x2f, 0x39, 0x31, 0x60, 0xe0, 0x10, 
-0x10, 0x08, 0x88, 0xcc, 0x44, 0x66, 0x23, 0x21, 0x31, 0x10, 0x98, 0x89, 0x8b, 0x0e, 0x08, 0x10, 
-0x20, 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, 0x98, 0x66, 0x0d, 0x72, 0x0d, 0x72, 0x0c, 0x30, 0x08, 
-0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x78, 0x08, 0x08, 0x0c, 0x84, 0x9f, 0xe0, 0xb0, 
-0x98, 0x08, 0x0c, 0x04, 0x04, 0x04, 0xe6, 0xe2, 0xf2, 0xf2, 0xb2, 0xb3, 0xe1, 0xe1, 0xc1, 0x81, 
-0xe3, 0xbf, 0x81, 0xc0, 0x40, 0x40, 0x60, 0xa0, 0xbe, 0x3f, 0x1b, 0x9b, 0x8f, 0xcf, 0x66, 0x32, 
-0x9e, 0xb1, 0x40, 0x40, 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, 0x01, 0x01, 0x07, 0x04, 0xf8, 0x08, 0x08, 0x04, 0x04, 
-0x07, 0x0c, 0xf8, 0x80, 0x00, 0xfc, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x01, 0x01, 0x01, 0x01, 0x11, 0x11, 0x89, 0xcb, 0x4b, 0x4b, 0x8b, 0x87, 0x91, 0x4b, 0x45, 
-0xe0, 0xa0, 0xb0, 0xd0, 0x51, 0x79, 0xad, 0xb4, 0xd6, 0x5a, 0x6b, 0x2d, 0x34, 0x96, 0xfb, 0x29, 
-0x3d, 0x16, 0x16, 0x13, 0x11, 0x10, 0x30, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 
-0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 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, 0x0f, 0x38, 0xe0, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x07, 0x3c, 0xe7, 0x8c, 0x38, 0xe0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 
-0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x87, 0x8c, 0x88, 0x99, 0xd2, 0x5a, 0x6a, 0x29, 0x2d, 
-0x34, 0x94, 0x96, 0x9a, 0xcb, 0x49, 0x69, 0x2c, 0xb4, 0x96, 0x9a, 0x8b, 0x4d, 0x45, 0x46, 0x42, 
-0x20, 0x20, 0x20, 0x60, 0x40, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 
-0x0a, 0x12, 0x22, 0x21, 0x41, 0x81, 0x01, 0x00, 0x00, 0x04, 0x1c, 0xfc, 0x3c, 0x0c, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07, 0x3c, 
-0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x82, 0x87, 0x85, 0x8d, 0x49, 0x49, 0x49, 
-0x6c, 0x24, 0x24, 0x24, 0x24, 0x14, 0x14, 0x16, 0x12, 0x0a, 0x0a, 0x0a, 0x0b, 0x05, 0x05, 0x05, 
-0x05, 0x03, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x02, 0x02, 0x06, 0x04, 0x04, 0x0c, 0x08, 
-0x18, 0x20, 0xe0, 0xf0, 0x90, 0x18, 0xc9, 0x0e, 0x44, 0x92, 0x22, 0x2a, 0x4a, 0x9c, 0xb0, 0xe0, 
-0x60, 0x04, 0x07, 0x87, 0x83, 0x81, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 
-0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 
-0x04, 0x03, 0x03, 0x02, 0x02, 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, 0x80, 0x40, 0x40, 0x80, 0x80, 0x80, 
-0x80, 0xc0, 0x40, 0x40, 0x40, 0x40, 0x60, 0x20, 0x20, 0x20, 0x30, 0x10, 0x10, 0x18, 0x08, 0x08, 
-0x0c, 0x05, 0x02, 0x02, 0x0d, 0x1a, 0x3b, 0x2b, 0x6a, 0x46, 0x47, 0xc6, 0x87, 0x05, 0x02, 0x01, 
-0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 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, 0x04, 0x0a, 0x0a, 0x32, 0x22, 0x25, 0x29, 0x21, 0x15, 0x10, 0x15, 0x10, 0x12, 0x08, 0x05, 
-0x03, 0x00, 0x00, 0x00, 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, 
-0x02, 0x02, 0x06, 0x04, 0x04, 0x04, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x18, 0x10, 0x10, 0x10}
-};
-
-
-
-    // assumes 1 frame prep stage
-    void animation_phase(void) {
-      current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-      oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
-    }
-    
-    if (get_current_wpm() != 000) {
-        oled_on();  // not essential but turns on animation OLED with any alpha keypress
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    }
-    else {
-
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        
-    }
-}
-
-
-
-
-
-
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-
-static void render_keymap(void) {
-  // Host Keyboard Layer Status
-  oled_write_P(PSTR("Layer: "), false);
-  switch (get_highest_layer(default_layer_state)) {
-      case DVORAK:
-          oled_write_P(PSTR("Dvorak\n\n"), false);
-          oled_write_P(PSTR("' , . p y   f g c r l \n"), false);
-          oled_write_P(PSTR("a o e i u   d h t n s \n"), false);
-          oled_write_P(PSTR("; q j k x   b m w v z \n"), false);
-          break;
-      case QWERTY:
-          oled_write_P(PSTR("Qwerty\n\n"), false);
-          oled_write_P(PSTR("q w e r t   y u i o p \n"), false);
-          oled_write_P(PSTR("a s d f g   h j k l ; \n"), false);
-          oled_write_P(PSTR("z x c v b   n m , . / \n"), false);
-          break;
-      case NUMSYM:
-          oled_write_P(PSTR("Num & Sym\n\n"), false);
-          oled_write_P(PSTR("`12345 | 67890= \n"), false);
-          oled_write_P(PSTR("~!@#$P | ^&*()+ \n"), false);
-          oled_write_P(PSTR("|\\:;-[{ }]_,./? \n"), false);
-          break;
-      case FPSGAMES:
-          oled_write_P(PSTR("FPS Games \n\n"), false);
-          oled_write_P(PSTR("1 q W e r | \n"), false);
-          oled_write_P(PSTR("2 A S D f | \n"), false);
-          oled_write_P(PSTR("3 z x c v | \n"), false);
-          break;
-      case LAYERS:
-          oled_write_P(PSTR("Index Layer\n\n"), false);
-          oled_write_P(PSTR("- - G D - | - - - - - \n"), false);
-          oled_write_P(PSTR("- - - Q - | - - - - - \n"), false);
-          oled_write_P(PSTR("- - - N - | - - - - - \n"), false);
-          break;
-      default:
-          oled_write_P(PSTR("ERR No Layer!\n"), false);
-  }
-}
-
-
-
-// Host Keyboard LED Status
-/*
-static void render_indicator_status(void) {
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("       "), false);
-  oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR("       "), false);
-  oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-}
-*/
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    render_keymap();
-  } else {
-    //render_indicator_status();
-    //oled_write_P(PSTR("       Kyria rev1.4\n\n"), false);
-    render_anim();  // renders pixelart
-  }
-  return false;
-}
-#endif
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/travishi/readme.md b/keyboards/splitkb/kyria/keymaps/travishi/readme.md
deleted file mode 100644
index c7b1f6dd1ac..00000000000
--- a/keyboards/splitkb/kyria/keymaps/travishi/readme.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# Introduction
-This keyboard layout centers around Dvorak,  harnesing the power of the Kyria thumb
-clusters and layers to reduce finger and wrist movement.
-
-## IMPORTANT NOTE
-This keymap will only work if you have all the kyria keys available! If you've used 2u keys on the thumb cluster, or have broken off a column, this layout will not work!
-
----
-
-## Features
-- **Dvorak:** So you don't have to leave the home row so much.
-- **Qwerty:** So you don't have to remap common programs.
-- **Custom FPS gaming layer:** Because the WASD stagger is so extreme on the Kyria.
-- **A number layer:** To access numbers, symbols and volume controls.
-- **Index Layer:** To help navigate thru base layers without wasting accessible keys.
-- And a very *very* rare **fren** to tag along on your adventures.
-
-## Guiding ideology
-- Use lower thumb keys as much as possible.
-- Minimise home row departure.
-- Minimize or eliminate non home row pinkie finger use.
-- Create macros for very common key shortcuts (ctrl + c/v/s, ctrl+shift+home etc.).
-- Create macros for very common commands (git status, git pull, git push etc.).
-- Use hints to indicate current layer (rgb lighting/OLED display).
-- Allow graceful layer handling (emergency return to default layer/layer index layer).
----
-
-
-# Current Layers
-- Base1: dvorak
-- Base2: qwerty
-- Base3: Gaming layer (WASD is too staggered on Kyria)
-- MO layer: Number, Symbol & volume control layer
-
-## Future Layers
-
-- F keys
-- FE macros
-- Git macros
-
----
-
-
-# Issues
-### Major
-- [x] None
-
-### Minor
-- [ ] Backlight LEDs dont indicate layer
-- [ ] Not fully using thumb clusters
-- [ ] Function keys and indicators missing (NUM, CAPS, SCROLL)
-- [ ] No Macro layers
-
----
-
-# Helpful Links
-
-- QMK Docs https://docs.qmk.fm/#/
-- [Keymap diagram editor for the Kyria](http://www.keyboard-layout-editor.com/##@_name=Kyria%3B&@_y:0.25&x:3&a:7%3B&=&_x:9%3B&=%3B&@_y:-0.75&x:2%3B&=&_x:1%3B&=&_x:7%3B&=&_x:1%3B&=%3B&@_y:-0.875&x:5%3B&=&_x:5%3B&=%3B&@_y:-0.625%3B&=&=&_x:13%3B&=&=%3B&@_y:-0.75&x:3%3B&=&_x:9%3B&=%3B&@_y:-0.75&x:2%3B&=&_x:1%3B&=&_x:7%3B&=&_x:1%3B&=%3B&@_y:-0.875&x:5%3B&=&_x:5%3B&=%3B&@_y:-0.625%3B&=&=&_x:13%3B&=&=%3B&@_y:-0.75&x:3%3B&=&_x:9%3B&=%3B&@_y:-0.75&x:2%3B&=&_x:1%3B&=&_x:7%3B&=&_x:1%3B&=%3B&@_y:-0.875&x:5%3B&=&_x:5%3B&=%3B&@_y:-0.625%3B&=&=&_x:13%3B&=&=%3B&@_y:-0.5&x:2.5%3B&=&_x:10%3B&=%3B&@_rx:4&ry:8.175&y:-4.675000000000001&x:-0.5%3B&=%3B&@_rx:13&y:-4.675000000000001&x:-0.5%3B&=%3B&@_r:15&rx:4&y:-4.675000000000001&x:-0.5%3B&=%3B&@_r:30&y:-2&x:-0.5%3B&=%3B&@_x:-0.5%3B&=%3B&@_r:45&y:-2&x:-0.5%3B&=%3B&@_x:-0.5%3B&=%3B&@_r:-45&rx:13&y:-5.675000000000001&x:-0.5%3B&=%3B&@_x:-0.5%3B&=%3B&@_r:-30&y:-2&x:-0.5%3B&=%3B&@_x:-0.5%3B&=%3B&@_r:-15&y:-1&x:-0.5%3B&=)
-- [Thomas' Guide for creating OLED images](https://docs.splitkb.com/hc/en-us/articles/360013811280)
-- [Image converter](https://javl.github.io/image2cpp/)
-
----
-
-## Useful notes
-Various useful info for setting up your own keyboard layout.
-
-### Install QMK Tool steps
-[QMK Setup (Windows)](https://docs.qmk.fm/#/newbs_getting_started)
-- Install QMK MSYS,
-- Install Toolbox,
-- Using QMK MSYS, follow the setup guide, then `cd` to where you've cloned the `qmk_firmware` folder,
-- `qmk compile` to generate your .hex file (it should be located in the `qmk_firmware` folder),
-- Using QMK Toolbox, flash the .hex file to your keyboard halves (drag your hex file into the toolbox window, press the reset button on the keyboard, the toolbox should detect this, then press flash. You need to reset each half separately).
-- Congrats, all done!
-
-
----
-### Layer template
-```
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-```
-
diff --git a/keyboards/splitkb/kyria/keymaps/travishi/rules.mk b/keyboards/splitkb/kyria/keymaps/travishi/rules.mk
deleted file mode 100644
index 398b5debfa7..00000000000
--- a/keyboards/splitkb/kyria/keymaps/travishi/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Enabled features
-LEADER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-OLED_ENABLE = yes
-
-WPM_ENABLE = yes
-
-
-# Disabled features
-ENCODER_ENABLE = no       # Enables the use of one or more encoders
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/config.h b/keyboards/splitkb/kyria/keymaps/winternebs/config.h
deleted file mode 100755
index 95e2a04152a..00000000000
--- a/keyboards/splitkb/kyria/keymaps/winternebs/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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 OLED_FONT_H "keyboards/splitkb/kyria/keymaps/winternebs/glcdfont.c"
-#define OLED_FONT_END 127
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X64
-#endif
-
-#define FORCE_NKRO
-#define ENCODER_RESOLUTION 4
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_ONESHOT
-#define QUICK_TAP_TERM 0
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/glcdfont.c b/keyboards/splitkb/kyria/keymaps/winternebs/glcdfont.c
deleted file mode 100755
index 7303c6afff5..00000000000
--- a/keyboards/splitkb/kyria/keymaps/winternebs/glcdfont.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "progmem.h"
-
-// Helidox 8x6 font with QMK Firmware Logo
-// Online editor: http://teripom.x0.com/
-
-static const unsigned char font[] PROGMEM = {// 'download (1)', 192x32px
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x5b, 0x4f, 0x5b, 0x3e, 0x00, 0x3e, 0x6b, 0x4f, 0x6b, 
-0x3e, 0x00, 0x1c, 0x3e, 0x7c, 0x3e, 0x1c, 0x00, 0x18, 0x3c, 0x7e, 0x3c, 0x18, 0x00, 0x1c, 0x57, 
-0x7d, 0x57, 0x1c, 0x00, 0x1c, 0x5e, 0x7f, 0x5e, 0x1c, 0x00, 0x00, 0x18, 0x3c, 0x18, 0x00, 0x00, 
-0xff, 0xe7, 0xc3, 0xe7, 0xff, 0x00, 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 0xff, 0xe7, 0xdb, 0xe7, 
-0xff, 0x00, 0x30, 0x48, 0x3a, 0x06, 0x0e, 0x00, 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 0x40, 0x7f, 
-0x05, 0x05, 0x07, 0x00, 0x40, 0x7f, 0x05, 0x25, 0x3f, 0x00, 0x5a, 0x3c, 0xe7, 0x3c, 0x5a, 0x00, 
-0x7f, 0x3e, 0x1c, 0x1c, 0x08, 0x00, 0x08, 0x1c, 0x1c, 0x3e, 0x7f, 0x00, 0x14, 0x22, 0x7f, 0x22, 
-0x14, 0x00, 0x5f, 0x5f, 0x00, 0x5f, 0x5f, 0x00, 0x06, 0x09, 0x7f, 0x01, 0x7f, 0x00, 0x00, 0x66, 
-0x89, 0x95, 0x6a, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x94, 0xa2, 0xff, 0xa2, 0x94, 0x00, 
-0x08, 0x04, 0x7e, 0x04, 0x08, 0x00, 0x10, 0x20, 0x7e, 0x20, 0x10, 0x00, 0x08, 0x08, 0x2a, 0x1c, 
-0x08, 0x00, 0x08, 0x1c, 0x2a, 0x08, 0x08, 0x00, 0x1e, 0x10, 0x10, 0x10, 0x10, 0x00, 0x0c, 0x1e, 
-0x0c, 0x1e, 0x0c, 0x00, 0x30, 0x38, 0x3e, 0x38, 0x30, 0x00, 0x06, 0x0e, 0x3e, 0x0e, 0x06, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x07, 
-0x00, 0x00, 0x14, 0x7f, 0x14, 0x7f, 0x14, 0x00, 0x24, 0x2a, 0x7f, 0x2a, 0x12, 0x00, 0x23, 0x13, 
-0x08, 0x64, 0x62, 0x00, 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 
-0x00, 0x1c, 0x22, 0x41, 0x00, 0x00, 0x00, 0x41, 0x22, 0x1c, 0x00, 0x00, 0x2a, 0x1c, 0x7f, 0x1c, 
-0x2a, 0x00, 0x08, 0x08, 0x3e, 0x08, 0x08, 0x00, 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 0x08, 0x08, 
-0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 
-0x3e, 0x51, 0x49, 0x45, 0x3e, 0x00, 0x00, 0x42, 0x7f, 0x40, 0x00, 0x00, 0x72, 0x49, 0x49, 0x49, 
-0x46, 0x00, 0x21, 0x41, 0x49, 0x4d, 0x33, 0x00, 0x18, 0x14, 0x12, 0x7f, 0x10, 0x00, 0x27, 0x45, 
-0x45, 0x45, 0x39, 0x00, 0x3c, 0x4a, 0x49, 0x49, 0x31, 0x00, 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 0x46, 0x49, 0x49, 0x29, 0x1e, 0x00, 0x00, 0x00, 0x14, 0x00, 
-0x00, 0x00, 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 0x14, 0x14, 
-0x14, 0x14, 0x14, 0x00, 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 
-0x3e, 0x41, 0x5d, 0x59, 0x4e, 0x00, 0x7c, 0x12, 0x11, 0x12, 0x7c, 0x00, 0x7f, 0x49, 0x49, 0x49, 
-0x36, 0x00, 0x3e, 0x41, 0x41, 0x41, 0x22, 0x00, 0x7f, 0x41, 0x41, 0x41, 0x3e, 0x00, 0x7f, 0x49, 
-0x49, 0x49, 0x41, 0x00, 0x7f, 0x09, 0x09, 0x09, 0x01, 0x00, 0x3e, 0x41, 0x41, 0x51, 0x73, 0x00, 
-0x7f, 0x08, 0x08, 0x08, 0x7f, 0x00, 0x00, 0x41, 0x7f, 0x41, 0x00, 0x00, 0x20, 0x40, 0x41, 0x3f, 
-0x01, 0x00, 0x7f, 0x08, 0x14, 0x22, 0x41, 0x00, 0x7f, 0x40, 0x40, 0x40, 0x40, 0x00, 0x7f, 0x02, 
-0x1c, 0x02, 0x7f, 0x00, 0x7f, 0x04, 0x08, 0x10, 0x7f, 0x00, 0x3e, 0x41, 0x41, 0x41, 0x3e, 0x00, 
-0x7f, 0x09, 0x09, 0x09, 0x06, 0x00, 0x3e, 0x41, 0x51, 0x21, 0x5e, 0x00, 0x7f, 0x09, 0x19, 0x29, 
-0x46, 0x00, 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 0x03, 0x01, 0x7f, 0x01, 0x03, 0x00, 0x3f, 0x40, 
-0x40, 0x40, 0x3f, 0x00, 0x1f, 0x20, 0x40, 0x20, 0x1f, 0x00, 0x3f, 0x40, 0x38, 0x40, 0x3f, 0x00, 
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 0x61, 0x59, 0x49, 0x4d, 
-0x43, 0x00, 0x00, 0x7f, 0x41, 0x41, 0x41, 0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, 0x41, 
-0x41, 0x41, 0x7f, 0x00, 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00, 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, 0x7f, 0x28, 0x44, 0x44, 
-0x38, 0x00, 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, 0x38, 0x44, 0x44, 0x28, 0x7f, 0x00, 0x38, 0x54, 
-0x54, 0x54, 0x18, 0x00, 0x00, 0x08, 0x7e, 0x09, 0x02, 0x00, 0x18, 0xa4, 0xa4, 0x9c, 0x78, 0x00, 
-0x7f, 0x08, 0x04, 0x04, 0x78, 0x00, 0x00, 0x44, 0x7d, 0x40, 0x00, 0x00, 0x20, 0x40, 0x40, 0x3d, 
-0x00, 0x00, 0x7f, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00, 0x41, 0x7f, 0x40, 0x00, 0x00, 0x7c, 0x04, 
-0x78, 0x04, 0x78, 0x00, 0x7c, 0x08, 0x04, 0x04, 0x78, 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 
-0xfc, 0x18, 0x24, 0x24, 0x18, 0x00, 0x18, 0x24, 0x24, 0x18, 0xfc, 0x00, 0x7c, 0x08, 0x04, 0x04, 
-0x08, 0x00, 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, 0x04, 0x04, 0x3f, 0x44, 0x24, 0x00, 0x3c, 0x40, 
-0x40, 0x20, 0x7c, 0x00, 0x1c, 0x20, 0x40, 0x20, 0x1c, 0x00, 0x3c, 0x40, 0x30, 0x40, 0x3c, 0x00, 
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 0x4c, 0x90, 0x90, 0x90, 0x7c, 0x00, 0x44, 0x64, 0x54, 0x4c, 
-0x44, 0x00, 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x00, 0x41, 
-0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3c, 0x26, 0x23, 0x26, 0x3c, 0x00
-};
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c b/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c
deleted file mode 100755
index 4f0df9354f9..00000000000
--- a/keyboards/splitkb/kyria/keymaps/winternebs/keymap.c
+++ /dev/null
@@ -1,733 +0,0 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.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
-
-#ifdef CONSOLE_ENABLE
-	#include <print.h>
-#endif
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  WORKMAN,
-  ADJUST,
-  SBKSP,
-  ENDW
-};
-
-enum layers {
-	_QWERTY = 0,
-	_WORKMAN,
-	_LOWER,
-	_RAISE,
-	_ADJUST
-};
-#define RAISE LT(_RAISE, KC_ENT)
-#define LOWER MO(_LOWER)
-#define HOME_A KC_A
-#define HOME_S KC_S
-#define HOME_H CTL_T(KC_H)
-#define HOME_T SFT_T(KC_T)
-#define HOME_N SFT_T(KC_N)
-#define HOME_E CTL_T(KC_E)
-#define HOME_O KC_O
-#define HOME_I KC_I
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |   ESC  |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |   TAB  |   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  |   ;  |    '   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |  CTRL  |   Z  |   X  |   C  |   V  |   B  |      |      |  |      |      |   N  |   M  |   ,  |   .  |   /  |  ENTER |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        | GUI  |  ALT | LOWER| Space|      |  | SHIFT| Bksp | RAISE|      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-	[_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_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-	KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, _______, _______,     _______, _______,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-							   KC_LGUI, KC_LALT, LOWER, KC_SPC, _______,     KC_LSFT, KC_BSPC, RAISE, _______, _______
-	),
-	/*
- * Workman Layer
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |   ESC  |   Q  |   D  |   R  |   W  |   B  |                              |   J  |   F  |   U  |   P  |   ;  |  Bksp  |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |   TAB  |   A  |   S  |   H  |   T  |   G  |                              |   Y  |   N  |   E  |   O  |   I  |    '   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |   Z  |   X  |   M  |   C  |   V  | SHIFT| Space|  |      | ENTER|   K  |   L  |   ,  |   .  |   /  |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |  GUI |  ESC | LOWER| Space| SWAP |  | SWAP | Bksp | RAISE|      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-	[_WORKMAN] = LAYOUT(
-	KC_ESC, KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,                                          KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_BSPC,
-	KC_TAB, HOME_A,  HOME_S,  HOME_H,  HOME_T,  KC_G,                                          KC_Y,    HOME_N,  HOME_E,  HOME_O,  HOME_I,  KC_QUOT,
-    XXXXXXX, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,  KC_LSFT, KC_SPC,     SH_MON, KC_ENT,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX,
-							   KC_LGUI, KC_LALT,  LOWER, KC_SPC,  SH_MON,     SH_MON, KC_BSPC,   RAISE,   XXXXXXX, _______
-	),
-/*
- * Lower Layer: NUM/symb
- *
- * ,-------------------------------------------.                              ,-------------------------------------------.
- * |    `   |   1  |   2  |   3  |   4  |   5  |                              |   6  |   7  |   8  |   9  |   0  |        |
- * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
- * |   DEL  |   $  |   +  |   (  |   )  |   @  |                              |   |  |   -  |   =  |   _  |   *  |    \   |
- * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
- * |        |   !  |   #  |   {  |   }  |   ~  |      |      |  |      |      |   &  |   [  |   ]  |   %  |   ^  |        |
- * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
- *                        |prints|      |      |      |      |  |      |      |      |      |      |
- *                        `----------------------------------'  `----------------------------------'
- */
-	[_LOWER] = LAYOUT(
-	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_DLR,  KC_PLUS, KC_LPRN, KC_RPRN, KC_AT,                                           KC_PIPE, KC_MINS, KC_EQL,  KC_UNDS, KC_ASTR, KC_BSLS,
-	_______, KC_EXLM, KC_HASH, KC_LCBR, KC_RCBR, KC_TILD, _______, _______,     _______, _______, KC_AMPR, KC_LBRC, KC_RBRC, KC_PERC, KC_CIRC, _______,
-							   KC_PSCR, _______, _______, _______, _______,     _______, KC_BSPC, _______, _______, _______
-	),
- /*
-  * Raise Layer: VIM Movement
-  *
-  * ,-------------------------------------------.                              ,-------------------------------------------.
-  * |        |      | PgDn |      | Word | Back |                              | Down |      | PgUp |      |      |        |
-  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-  * |        |      |      | Left |      |      |                              |      |      |  End |      |      |        |
-  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-  * |        |      |      |      |      |      |      |      |  |      |      |  Up  | Right|      |      |      |        |
-  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-  *                        |      |      |      |      |      |  |      |      |      |      |      |
-  *                        |      |      |      |      |      |  |      |      |      |      |      |
-  *                        `----------------------------------'  `----------------------------------'
-  */
-	 [_RAISE] = LAYOUT(
-       _______, _______, KC_PGDN, _______, C(KC_RGHT), C(KC_LEFT),                               KC_DOWN, _______, KC_PGUP, _______, _______, _______,
-       _______, _______, _______, KC_LEFT, _______, _______,                                     _______, _______, ENDW,     _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   KC_RGHT, _______, _______, _______, _______,
-                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-	 ),
- /*
-  * Layer template
-  *
-  * ,-------------------------------------------.                              ,-------------------------------------------.
-  * |    F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                              |  F7  |  F8  |  F9  |  F10 |  F11 |   F12  |
-  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-  * |        |      |      |      |QWERTY|WRKMAN|      |      |  |      |      |      |      |      |      |      |        |
-  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-  *                        |      |      |      |      |      |  |      |      |      |      |      |
-  *                        |      |      |      |      |      |  |      |      |      |      |      |
-  *                        `----------------------------------'  `----------------------------------'
-  */
-	 [_ADJUST] = 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,
-	   _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-	   _______, _______, _______, _______, QWERTY,  WORKMAN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-								  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-	 ),
-// /*
-//  * Layer template
-//  *
-//  * ,-------------------------------------------.                              ,-------------------------------------------.
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
-//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
-//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
-//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        |      |      |      |      |      |  |      |      |      |      |      |
-//  *                        `----------------------------------'  `----------------------------------'
-//  */
-//     [_LAYERINDEX] = LAYOUT(
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
-//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-//     ),
-};
-
-
-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_RGHT);
-		} else {
-			tap_code(KC_LEFT);
-		}
-	}
-	else if (index == 1) {
-		// Page up/Page down
-		if (clockwise) {
-			tap_code(KC_DOWN);
-		} else {
-			tap_code(KC_UP);
-		}
-	}
-    return true;
-}
-#endif
-#ifdef OLED_ENABLE
-bool left = false;
-bool right = false;
-bool lastl = false;
-bool lastr = false;
-#endif
-bool bksp = false;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	#ifdef CONSOLE_ENABLE
-	uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u, total: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.key.col + 10 * record->event.key.row);
-	#endif
-	#ifdef OLED_ENABLE
-	if(record->event.pressed){
-		uint8_t n = record->event.key.col + 10 * record->event.key.row;
-		if (n<40) {
-			left = true;
-		}
-		else {
-			right = true;
-		}
-	}
-	#endif
-	switch (keycode) {
-		case QWERTY:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_QWERTY);
-			}
-			return false;
-			break;
-		case WORKMAN:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_WORKMAN);
-			}
-			return false;
-			break;
-		case SBKSP:
-			if (record->event.pressed) {
-				register_code(KC_LSFT);
-				bksp = true;
-			}
-			else {
-				unregister_code(KC_LSFT);
-				if (bksp) {
-					tap_code(KC_BSPC);
-				}
-			}
-			return false;
-			break;
-        case ENDW:
-            if (record->event.pressed) {
-                register_code(KC_LCTL);
-                tap_code(KC_RGHT);
-                unregister_code(KC_LCTL);
-                tap_code(KC_LEFT);
-            }
-	}
-	bksp = false;
-	return true;
-
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-
-
-char wpm_str[10];
-// WPM-responsive animation stuff here
-#define IDLE_FRAMES 2
-#define IDLE_SPEED 10 // below this wpm value your animation will idle
-
-
-#define TAP_FRAMES 3
-
-#define ANIM_FRAME_DURATION 400 // how long each frame lasts in ms
-// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#define ANIM_SIZE 896 // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
-uint8_t current_tap_frame = 0;
-// Credit to obosob for initial animation approach.
-static void render_anim(void) {
-	static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-		{
-// 'bongo0', 128x56px
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-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, 0x40, 0x60, 0x20, 0x30, 0x30, 0x10,
-0x18, 0x08, 0x0c, 0x04, 0x04, 0x04, 0x86, 0x82, 0xc2, 0x42, 0x22, 0x12, 0x12, 0x12, 0x12, 0x14,
-0x14, 0x14, 0x14, 0x14, 0x18, 0x19, 0x19, 0x11, 0x11, 0x10, 0x10, 0x00, 0x20, 0xf0, 0x2f, 0x24,
-0x66, 0xda, 0xd1, 0x11, 0x91, 0x91, 0x11, 0x11, 0x11, 0x12, 0x1e, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x20, 0x18, 0x04, 0x02, 0x01, 0x80, 0x80, 0x00, 0x40, 0x40, 0xc0, 0x40, 0x30,
-0x90, 0x88, 0x44, 0x42, 0x42, 0x41, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0xf0, 0x88, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x03, 0x06, 0x08, 0x71, 0x81, 0x02, 0x06, 0x04, 0x08, 0x10, 0x20, 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, 0x03, 0x82, 0xe2, 0x39, 0x09, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x39,
-0x1c, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xe0, 0xf0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x06, 0x38, 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, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x40, 0x20, 0x30,
-0x18, 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02,
-0x02, 0x04, 0x08, 0x08, 0x10, 0x08, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x0d, 0xf3, 0x06, 0x0c, 0x10,
-0x20, 0x20, 0xc1, 0xff, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x01, 0x01, 0x02, 0x02, 0xfa, 0x06, 0x06, 0x03, 0x03, 0x02, 0x02, 0x04, 0x18,
-0xf0, 0x80, 0xc0, 0x60, 0x20, 0x10, 0x18, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x10, 0x10,
-0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40,
-0x40, 0x40, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x02, 0x02, 0x02, 0x03, 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, 0xf8,
-0x8e, 0x03, 0x01, 0x01, 0x01, 0x03, 0x06, 0x9c, 0xf0, 0x80, 0xc0, 0x40, 0x60, 0x20, 0x30, 0x10,
-0x08, 0x0d, 0x07, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 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
-		},
-		{
-// 'bongo1', 128x56px
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 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, 0xc0, 0x40,
-0x60, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x10, 0x10, 0x90, 0x90, 0x90, 0x90, 0x90, 0xa0, 0xa0,
-0xa0, 0xa0, 0xa0, 0xc0, 0xc0, 0xc1, 0x80, 0x80, 0x81, 0x81, 0x02, 0x06, 0x84, 0x7c, 0x5f, 0x58,
-0x4c, 0x46, 0x42, 0x42, 0x42, 0x43, 0x61, 0x23, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xa0, 0x20, 0x20,
-0x30, 0x10, 0x10, 0x18, 0x08, 0x08, 0x0c, 0x04, 0x06, 0x02, 0x03, 0x01, 0x08, 0x18, 0x18, 0x28,
-0x68, 0x44, 0x84, 0x84, 0x86, 0x02, 0x02, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x09, 0x07, 0x01, 0x01, 0x03,
-0x06, 0x06, 0x10, 0x3c, 0x4c, 0xc8, 0x88, 0x08, 0x08, 0x18, 0x10, 0x30, 0x60, 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, 0x01, 0x01,
-0x01, 0x01, 0x81, 0xc1, 0x21, 0x31, 0x11, 0x0d, 0x05, 0x01, 0x03, 0x02, 0x06, 0x0e, 0xc6, 0xe4,
-0x04, 0x04, 0x04, 0x06, 0x02, 0x03, 0x01, 0x03, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
-0x81, 0x01, 0x01, 0x01, 0x00, 0x00, 0x07, 0x0c, 0x30, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x1e, 0x30, 0x40, 0x80, 0x00, 0x00, 0x00, 0x01, 0x07,
-0x1c, 0x70, 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, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x40, 0x20, 0x30,
-0x18, 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x02, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
-0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x02, 0x02,
-0x06, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x0c, 0x04, 0x0c, 0x3c, 0x15, 0xd3, 0x72, 0x10, 0x20,
-0x20, 0x20, 0x21, 0x23, 0x26, 0x24, 0x2c, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x01, 0x01, 0x02, 0x02, 0xfa, 0x06, 0x06, 0x03, 0x03, 0x02, 0x02, 0x04, 0x18,
-0xf0, 0x80, 0xc0, 0x60, 0x20, 0x10, 0x18, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x10, 0x10,
-0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40,
-0x40, 0x40, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x02, 0x02, 0x02, 0x03, 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, 0xf8,
-0x8e, 0x03, 0x01, 0x01, 0x01, 0x03, 0x06, 0x9c, 0xf0, 0x80, 0xc0, 0x40, 0x60, 0x20, 0x30, 0x10,
-0x08, 0x0d, 0x07, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 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
-		}
-	};
-	static const char PROGMEM prep[][ANIM_SIZE] = {
-		{
-// 'bongo2', 128x56px
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-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, 0x40, 0x60, 0x20, 0x30, 0x30, 0x10,
-0x18, 0x08, 0x0c, 0x04, 0x04, 0x04, 0x86, 0x82, 0xc2, 0x42, 0x22, 0x12, 0x12, 0x12, 0x12, 0x14,
-0x14, 0x14, 0x14, 0x14, 0x18, 0x19, 0x19, 0x11, 0x11, 0x10, 0x10, 0x00, 0x20, 0xf0, 0x2f, 0x24,
-0x66, 0xda, 0xd1, 0x11, 0x91, 0x91, 0x11, 0x11, 0x11, 0x12, 0x1e, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x20, 0x18, 0x04, 0x02, 0x01, 0x80, 0x80, 0x00, 0x40, 0x40, 0xc0, 0x40, 0x30,
-0x90, 0x88, 0x44, 0x42, 0x42, 0x41, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0xf0, 0x88, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x03, 0x06, 0x08, 0x71, 0x81, 0x02, 0x06, 0x04, 0x08, 0x10, 0x20, 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, 0xe0, 0x18, 0x08, 0x0c, 0x04, 0x04,
-0x04, 0x07, 0x0a, 0x92, 0xf9, 0xc9, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x39,
-0x1c, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xe0, 0xf0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x46, 0x78, 0x20, 0x20, 0x20, 0x20, 0x40,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x06, 0x38, 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, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1e, 0x64, 0xc4, 0x04, 0x04,
-0x00, 0x02, 0x03, 0x01, 0x00, 0x01, 0x03, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xe0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x60, 0x20,
-0x30, 0x19, 0x0e, 0x38, 0xcc, 0x08, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x0d, 0xf3, 0x06, 0x0c, 0x10,
-0x20, 0x20, 0xc1, 0xff, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x04, 0x05, 0x07, 0x0e,
-0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x10, 0x10,
-0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40,
-0x40, 0x40, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x83, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x0e, 0x38, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 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, 0x01,
-0x01, 0x01, 0x03, 0x02, 0x02, 0x02, 0x03, 0x03, 0x02, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10,
-0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-		}
-	};
-	static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-		{
-	  // 'bongo3', 128x56px
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-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, 0x40, 0x60, 0x20, 0x30, 0x30, 0x10,
-0x18, 0x08, 0x0c, 0x04, 0x04, 0x04, 0x86, 0x82, 0xc2, 0x42, 0x22, 0x12, 0x12, 0x12, 0x12, 0x14,
-0x14, 0x14, 0x14, 0x14, 0x18, 0x19, 0x19, 0x11, 0x11, 0x10, 0x10, 0x00, 0x20, 0xf0, 0x2f, 0x24,
-0x66, 0xda, 0xd1, 0x11, 0x91, 0x91, 0x11, 0x11, 0x11, 0x12, 0x1e, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0xc0, 0x20, 0x18, 0x04, 0x02, 0x01, 0x80, 0x80, 0x00, 0x40, 0x40, 0xc0, 0x40, 0x30,
-0x90, 0x88, 0x44, 0x42, 0x42, 0x41, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0xf0, 0x88, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x03, 0x06, 0x08, 0x71, 0x81, 0x02, 0x06, 0x04, 0x08, 0x10, 0x20, 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, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x03, 0x82, 0xe2, 0x39, 0x09, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x39,
-0x1c, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xe0, 0xf0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x46, 0x78, 0x20, 0x20, 0x20, 0x20, 0x40,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x06, 0x38, 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, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0xe0, 0xf8, 0xf8, 0xf0,
-0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x01, 0x03, 0x1f, 0x0f, 0x07, 0x00, 0x80, 0xc0, 0x40, 0x20, 0x30,
-0x18, 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xe0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x60, 0x20,
-0x30, 0x19, 0x0e, 0x38, 0xcc, 0x08, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x0d, 0xf3, 0x06, 0x0c, 0x10,
-0x20, 0x20, 0xc1, 0xff, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f,
-0x1f, 0x1f, 0x0f, 0x07, 0x01, 0x02, 0x02, 0xfa, 0x06, 0x06, 0x03, 0x03, 0x02, 0x02, 0x04, 0x18,
-0xf0, 0x80, 0xc0, 0x60, 0x20, 0x10, 0x18, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x10, 0x10,
-0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40,
-0x40, 0x40, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x83, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x0e, 0x38, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xe0, 0xf0, 0xf8, 0xf9, 0xe1, 0x81, 0x02, 0x02, 0x02, 0x03, 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, 0x01, 0x01, 0x01, 0x01,
-0x01, 0x01, 0x03, 0x02, 0x02, 0x02, 0x03, 0x03, 0x02, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10,
-0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x08, 0x1c, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-		},
-		{
-			// 'bongo4', 128x56px
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-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, 0x40, 0x60, 0x20, 0x30, 0x30, 0x10,
-0x18, 0x08, 0x0c, 0x04, 0x04, 0x04, 0x86, 0x82, 0xc2, 0x42, 0x22, 0x12, 0x12, 0x12, 0x12, 0x14,
-0x14, 0x14, 0x14, 0x14, 0x18, 0x19, 0x19, 0x11, 0x11, 0x10, 0x10, 0x00, 0x20, 0xf0, 0x2f, 0x24,
-0x66, 0xda, 0xd1, 0x11, 0x91, 0x91, 0x11, 0x11, 0x11, 0x12, 0x1e, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x20, 0x18, 0x04, 0x02, 0x01, 0x80, 0x80, 0x00, 0x40, 0x40, 0xc0, 0x40, 0x30,
-0x90, 0x88, 0x44, 0x42, 0x42, 0x41, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0xf0, 0x88, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x03, 0x06, 0x08, 0x71, 0x81, 0x02, 0x06, 0x04, 0x08, 0x10, 0x20, 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, 0xe0, 0x18, 0x08, 0x0c, 0x04, 0x04,
-0x04, 0x07, 0x0a, 0x92, 0xf9, 0xc9, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x39,
-0x1c, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xe0, 0xf0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x06, 0x38, 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, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1e, 0x64, 0xc4, 0x04, 0x04,
-0x00, 0x02, 0x03, 0x01, 0x00, 0x01, 0x03, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02,
-0x02, 0x04, 0x08, 0x08, 0x10, 0x08, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x0d, 0xf3, 0x06, 0x0c, 0x10,
-0x20, 0x20, 0xc1, 0xff, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x04, 0x05, 0x07, 0x0e,
-0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x10, 0x10,
-0x10, 0x10, 0x10, 0x10, 0x20, 0xa0, 0xa0, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40,
-0x40, 0x40, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7c, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3e, 0x1e, 0x1e, 0x1c, 0x0c, 0x00, 0xf8,
-0x8e, 0x03, 0x01, 0x01, 0x01, 0x03, 0x06, 0x9c, 0xf0, 0x80, 0xc0, 0x40, 0x60, 0x20, 0x30, 0x10,
-0x08, 0x0d, 0x07, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10,
-0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x38, 0x38, 0x78, 0x7c, 0x7e, 0xff, 0xff, 0xff, 0xfc,
-0xf1, 0xe1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x03, 0x07, 0x06, 0x0e,
-0x1e, 0x3e, 0x3e, 0x7e, 0x7e, 0x1e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-		},
-		{
-// 'bongo5', 128x56px
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-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, 0x40, 0x60, 0x20, 0x30, 0x30, 0x10,
-0x18, 0x08, 0x0c, 0x04, 0x04, 0x04, 0x86, 0x82, 0xc2, 0x42, 0x22, 0x12, 0x12, 0x12, 0x12, 0x14,
-0x14, 0x14, 0x14, 0x14, 0x18, 0x19, 0x19, 0x11, 0x11, 0x10, 0x10, 0x00, 0x20, 0xf0, 0x2f, 0x24,
-0x66, 0xda, 0xd1, 0x11, 0x91, 0x91, 0x11, 0x11, 0x11, 0x12, 0x1e, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0xc0, 0x20, 0x18, 0x04, 0x02, 0x01, 0x80, 0x80, 0x00, 0x40, 0x40, 0xc0, 0x40, 0x30,
-0x90, 0x88, 0x44, 0x42, 0x42, 0x41, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0xf0, 0x88, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x03, 0x06, 0x08, 0x71, 0x81, 0x02, 0x06, 0x04, 0x08, 0x10, 0x20, 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, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x03, 0x82, 0xe2, 0x39, 0x09, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x39,
-0x1c, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xe0, 0xf0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x18, 0x20, 0x40, 0x80, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x06, 0x38, 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, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0xe0, 0xf8, 0xf8, 0xf0,
-0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x01, 0x03, 0x1f, 0x0f, 0x07, 0x00, 0x80, 0xc0, 0x40, 0x20, 0x30,
-0x18, 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02,
-0x02, 0x04, 0x08, 0x08, 0x10, 0x08, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x0d, 0xf3, 0x06, 0x0c, 0x10,
-0x20, 0x20, 0xc1, 0xff, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f,
-0x1f, 0x1f, 0x0f, 0x07, 0x01, 0x02, 0x02, 0xfa, 0x06, 0x06, 0x03, 0x03, 0x02, 0x02, 0x04, 0x18,
-0xf0, 0x80, 0xc0, 0x60, 0x20, 0x10, 0x18, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x10, 0x10,
-0x10, 0x10, 0x10, 0x10, 0x20, 0xa0, 0xa0, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40,
-0x40, 0x40, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xe0, 0xf0, 0xf8, 0xf9, 0xe1, 0x81, 0x02, 0x02, 0x02, 0x03, 0x01, 0x01,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7c, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3e, 0x1e, 0x1e, 0x1c, 0x0c, 0x00, 0xf8,
-0x8e, 0x03, 0x01, 0x01, 0x01, 0x03, 0x06, 0x9c, 0xf0, 0x80, 0xc0, 0x40, 0x60, 0x20, 0x30, 0x10,
-0x08, 0x0d, 0x07, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10,
-0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x08, 0x1c, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x38, 0x38, 0x78, 0x7c, 0x7e, 0xff, 0xff, 0xff, 0xfc,
-0xf1, 0xe1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x03, 0x07, 0x06, 0x0e,
-0x1e, 0x3e, 0x3e, 0x7e, 0x7e, 0x1e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-		}
-	};
-
-	//assumes 1 frame prep stage
-	void animation_phase(void) {
-		if(get_current_wpm() <= IDLE_SPEED){
-			current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-			oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-		}
-		else {
-			// if  is true 2 frames in a row make it false;
-			if(left && !lastl && right && !lastr) {
-				oled_write_raw_P(tap[2], ANIM_SIZE);
-			}
-			else if (left && !lastl) {
-				oled_write_raw_P(tap[0], ANIM_SIZE);
-			}
-			else if (right && !lastr) {
-				oled_write_raw_P(tap[1], ANIM_SIZE);
-			}
-			else {
-				oled_write_raw_P(prep[0], ANIM_SIZE);
-				left = false;
-				right = false;
-			}
-			lastl = left;
-			lastr = right;
-			left = false;
-			right = false;
-		}
-	}
-	if(get_current_wpm() != 000) {
-		oled_on(); // not essential but turns on animation OLED with any alpha keypress
-		if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-			anim_timer = timer_read32();
-			animation_phase();
-		}
-		anim_sleep = timer_read32();
-	} else {
-		if(timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-			oled_off();
-		} else {
-			if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-				anim_timer = timer_read32();
-				animation_phase();
-			}
-		}
-	}
-}
-bool wpm_keycode_user(uint16_t keycode) {
-	return true;
-}
-static void render_logo(void) {
-	oled_set_cursor(0,0);
-	oled_write_P(PSTR(" play asc "), false);
-	oled_set_cursor(3,3);
-	oled_write_P(PSTR(" play asc "), false);
-	oled_set_cursor(6,6);
-	oled_write_P(PSTR(" play asc "), false);
-}
-bool oled_task_user(void) {
-	if (is_keyboard_master()) {
-		render_anim();
-		oled_set_cursor(0,7);
-        uint8_t n = get_current_wpm();
-        wpm_str[3] = '\0';
-        wpm_str[2] = '0' + n % 10;
-        wpm_str[1] = '0' + (n /= 10) % 10;
-        wpm_str[0] = '0' + n / 10 ;
-        oled_write_P(PSTR("WPM: "), false);
-        oled_write(wpm_str, false);
-        oled_write_P(PSTR("   "), false);
-    		switch (get_highest_layer(layer_state)) {
-			case _QWERTY:
-				oled_write_ln_P(PSTR("base"), false);
-				break;
-			case _LOWER:
-				oled_write_ln_P(PSTR("LOWER"), false);
-				break;
-			case _RAISE:
-				oled_write_ln_P(PSTR("RAISE"), false);
-				break;
-			case _ADJUST:
-				oled_write_ln_P(PSTR("ADJUST"), false);
-				break;
-			default:
-				oled_write_ln_P(PSTR("Undefined"), false);
-		}
-	} else {
-		render_logo();
-		oled_scroll_left();
-
-	}
-    return false;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk b/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk
deleted file mode 100755
index c09579035c1..00000000000
--- a/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # Enables the use of one or more
-NKRO_ENABLE = yes
-WPM_ENABLE = yes
-CONSOLE_ENABLE = no     # Console for debug
-AUDIO_ENABLE   = no     # Audio output
-SPACE_CADET_ENABLE = no
-EXTRAKEY_ENABLE = no
-MOUSEKEY_ENABLE = no
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-SWAP_HANDS_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 6c21b12a849..d6660991355 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -45,12 +45,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
 #endif
-
-/* RGB matrix support */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
-#    define RGB_MATRIX_SPLIT { 10, 10 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#endif
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index aa38a7dd0c6..38a2e6bf3fa 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -9,7 +9,10 @@
         "split_count": [10, 10]
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "max_brightness": 170,
+        "sleep": true,
+        "split_count": [10, 10]
     },
     "matrix_pins": {
         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
@@ -28,6 +31,11 @@
                     {"pin_a": "B5", "pin_b": "C6"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "layout_aliases": {
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 198688772be..452e011f0ab 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Side detection
 // col 4 row 3 on right-hand-side
 #define SPLIT_HAND_MATRIX_GRID E6, B3 // row first because the board is col2row
-#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
 #define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `rev2.c`
 
 /*
@@ -51,12 +50,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
 #endif
-
-/* RGB matrix support */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
-#    define RGB_MATRIX_SPLIT { 10, 10 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#endif
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index 6e362d95483..0290153f4ad 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -9,7 +9,10 @@
         "split_count": [10, 10]
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "max_brightness": 170,
+        "sleep": true,
+        "split_count": [10, 10]
     },
     "matrix_pins": {
         "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
@@ -34,6 +37,11 @@
                 "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
                 "rows": ["D4", "C6", "D7", "E6"]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "layout_aliases": {
diff --git a/keyboards/splitkb/kyria/rev3/config.h b/keyboards/splitkb/kyria/rev3/config.h
index 5168e8678e5..b0a64320c60 100644
--- a/keyboards/splitkb/kyria/rev3/config.h
+++ b/keyboards/splitkb/kyria/rev3/config.h
@@ -25,10 +25,3 @@
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
 #endif
-
-// Not yet available in `info.json`
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 62
-#    define RGB_MATRIX_SPLIT { 31, 31 }
-#    define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json
index 07713f9658f..4a426cb2060 100644
--- a/keyboards/splitkb/kyria/rev3/info.json
+++ b/keyboards/splitkb/kyria/rev3/info.json
@@ -110,6 +110,11 @@
                     {"pin_a": "F4", "pin_b": "F5"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "rgblight": {
@@ -187,6 +192,7 @@
             {"flags": 4, "matrix": [4, 5], "x": 210, "y": 11}, // R SW05
             {"flags": 4, "matrix": [4, 6], "x": 224, "y": 11}  // R SW06
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "split_count": [31, 31]
     }
 }
diff --git a/keyboards/splitography/keymaps/jeandeaual/keymap.c b/keyboards/splitography/keymaps/jeandeaual/keymap.c
deleted file mode 100644
index 6e0f8186886..00000000000
--- a/keyboards/splitography/keymaps/jeandeaual/keymap.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/* Copyright 2021 Alexis Jeandeau
- *
- * 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 keyboard_layers {
-    _GEMINI = 0,
-    _QWERTY,
-    _DVORAK,
-    _BLUE,
-    _ORANGE,
-    _GREEN,
-    _NUM,
-    _END_LAYERS,
-};
-
-enum keyboard_keycodes {
-    QWERTY = SAFE_RANGE,
-    DVORAK,
-    BASE,
-    BASE1,
-    BASE2,
-    GEMINI,
-    BLUE,
-    ORANGE,
-};
-
-#define COPY LCTL(KC_C)
-#define CUT LCTL(KC_X)
-#define PASTE LCTL(KC_V)
-#define UNDO LCTL(KC_Z)
-#define TG_NUM TG(_NUM)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // ...................................................................... GeminiPR
-    //
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Base │   S  │   T  │   P  │   H  │   *  │   *  │   F  │   P  │   L  │   T  │   D  │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Base │   S  │   K  │   W  │   R  │   *  │   *  │   R  │   B  │   G  │   S  │   Z  │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │   A  │   O  │   E  │   U  │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_GEMINI] = LAYOUT(
-        STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-        BASE1,   STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-        BASE2,   STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-                                            STN_A,   STN_O,   STN_E,   STN_U
-    ),
-
-    // ...................................................................... Qwerty
-    //
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │  Esc │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │ Bksp │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Ctrl │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │   ;  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│   Z  │   X  │   C  │   V  │   B  │   N  │   M  │   ,  │   .  │   /  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │Orange│ Blue │ Space│  Alt │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_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_BSPC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT ,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LGUI,
-                                            ORANGE,  BLUE,    KC_SPC,  KC_LALT
-    ),
-
-    // ...................................................................... Dvorak
-    //
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │  Esc │   "  │   ,  │   .  │   P  │   Y  │   F  │   G  │   C  │   R  │   L  │ Bksp │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Ctrl │   A  │   O  │   E  │   U  │   I  │   D  │   H  │   T  │   N  │   S  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│   ;  │   Q  │   J  │   K  │   X  │   B  │   M  │   W  │   V  │   Z  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │Orange│ Blue │ Space│  Alt │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_DVORAK] = LAYOUT(
-        KC_ESC,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-        KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT ,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_LGUI,
-                                            ORANGE,  BLUE,    KC_SPC,  KC_LALT
-    ),
-
-    // .................................................................. Blue Layer
-    //
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │   `  │   1  │   2  │   3  │   4  │   5  │   6  │   7  │   8  │   9  │   0  │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Ctrl │ Stop │ Prev │ Play │ Next │ +Vol │      │      │      │   [  │   ]  │   '  │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│ Undo │  Cut │ Copy │ Paste│ -Vol │ Mute │      │      │   -  │   =  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │Orange│  f() │  Del │  Alt │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_BLUE] = LAYOUT(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    XXXXXXX,
-        KC_LCTL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_QUOT,
-        KC_LSFT, UNDO,    CUT,     COPY,    PASTE,   KC_VOLD, KC_MUTE, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  KC_LGUI,
-                                            ORANGE,  _______, KC_DEL,  KC_LALT
-    ),
-
-    // ................................................................ Orange Layer
-    //
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │      │  F1  │  F2  │  F3  │  F4  │      │  App │ PrScr│ScrLck│ Pause│      │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Ctrl │  F5  │  F6  │  F7  │  F8  │      │      │Insert│ Home │ PgUp │      │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│  F9  │  F10 │  F11 │  F12 │      │      │  Del │  End │ PgDn │   \  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │  f() │ Blue │  Tab │  Alt │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_ORANGE] = LAYOUT(
-        XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX,
-        KC_LCTL, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX,
-        KC_LSFT, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_DEL,  KC_END,  KC_PGDN, KC_BSLS, KC_LGUI,
-                                            _______, BLUE,    KC_TAB,  KC_LALT
-    ),
-
-    // ................................................................. Green Layer
-    //
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │Gemini│QWERTY│Dvorak│      │      │Scroll│   /  │   7  │   8  │   9  │   -  │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Ctrl │ Home │  Up  │  End │ PgUp │ Caps │   *  │   4  │   5  │   6  │   +  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│ Left │ Down │ Right│ PgDn │  Num │   0  │   1  │   2  │   3  │      │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │  f() │  f() │  --  │  Alt │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_GREEN] = LAYOUT(
-        GEMINI,  QWERTY,  DVORAK,  XXXXXXX, XXXXXXX, KC_SCRL, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
-        KC_LCTL, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_CAPS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_ENT ,
-        KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TG_NUM,  KC_P0,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_LGUI,
-                                            _______, _______, XXXXXXX, KC_LALT
-    ),
-
-    // ................................................................... Num Layer
-    //
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │      │      │      │      │      │      │   /  │   7  │   8  │   9  │   -  │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Ctrl │ Home │  Up  │  End │ PgUp │      │   *  │   4  │   5  │   6  │   +  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│ Left │ Down │ Right│ PgDn │  f() │   0  │   1  │   2  │   3  │      │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │  --  │  --  │  --  │  Alt │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_NUM] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, XXXXXXX,
-        KC_LCTL, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_ENT ,
-        KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  BASE,   KC_P0,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_LGUI,
-                                            XXXXXXX, XXXXXXX, XXXXXXX, KC_LALT
-    ),
-};
-// clang-format on
-
-// ..................................................................... Keymaps
-
-#define BASE_1 1
-#define BASE_2 2
-#define BASE_12 3
-static uint8_t base_n = 0;
-
-void (*base_layer)(void) = NULL;
-
-void qwerty(void) {
-    base_layer = qwerty;
-    base_n     = 0;
-    layer_move(0);
-    set_single_persistent_default_layer(_QWERTY);
-}
-
-void dvorak(void) {
-    base_layer = dvorak;
-    base_n     = 0;
-    layer_move(0);
-    set_single_persistent_default_layer(_DVORAK);
-}
-
-void gemini(void) {
-    layer_move(0);
-    set_single_persistent_default_layer(_GEMINI);
-}
-
-// ........................................................... User Keycode Trap
-
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                qwerty();
-            }
-            return false;
-        case DVORAK:
-            if (record->event.pressed) {
-                dvorak();
-            }
-            return false;
-        case KC_QUOT:
-            if ((base_layer != dvorak) || (get_highest_layer(layer_state) != _BLUE)) {
-                break;
-            }
-            if (record->event.pressed) {
-                register_code(KC_SLSH);
-            } else {
-                unregister_code(KC_SLSH);
-            }
-            return false;
-        case BASE:
-            if (record->event.pressed) {
-                base_layer();
-            }
-            return false;
-        case BASE1:
-            if (record->event.pressed) {
-                base_n = base_n | BASE_1;
-                if (base_n == BASE_12) {
-                    base_layer();
-                }
-            } else {
-                base_n = base_n & ~BASE_1;
-            }
-            return false;
-        case BASE2:
-            if (record->event.pressed) {
-                base_n = base_n | BASE_2;
-                if (base_n == BASE_12) {
-                    base_layer();
-                }
-            } else {
-                base_n = base_n & ~BASE_2;
-            }
-            return false;
-        case BLUE:
-            if (record->event.pressed) {
-                layer_on(_BLUE);
-                update_tri_layer(_BLUE, _ORANGE, _GREEN);
-            } else {
-                layer_off(_BLUE);
-                update_tri_layer(_BLUE, _ORANGE, _GREEN);
-            }
-            return false;
-        case ORANGE:
-            if (record->event.pressed) {
-                layer_on(_ORANGE);
-                update_tri_layer(_BLUE, _ORANGE, _GREEN);
-            } else {
-                layer_off(_ORANGE);
-                update_tri_layer(_BLUE, _ORANGE, _GREEN);
-            }
-            return false;
-        case GEMINI:
-            if (record->event.pressed) {
-                gemini();
-            }
-            return false;
-    }
-    return true;
-}
-
-// Initialize the steno protocol
-void eeconfig_init_user(void) {
-    steno_set_mode(STENO_MODE_GEMINI);  // or STENO_MODE_BOLT
-    base_layer = dvorak;
-}
diff --git a/keyboards/splitography/keymaps/jeandeaual/readme.md b/keyboards/splitography/keymaps/jeandeaual/readme.md
deleted file mode 100644
index 8e786b7fc58..00000000000
--- a/keyboards/splitography/keymaps/jeandeaual/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Differences with the [default layout](../default)
-
-* Alt and Ctrl are shifted.
-* Use Gemini PR instead of TX Bolt.
-* The Plover layer has been removed.
-* QWERTY and Dvorak like in the [multi layout](../multi).
-* The default layer is set to the steno (Gemini PR) layout.
diff --git a/keyboards/splitography/keymaps/multi/keymap.c b/keyboards/splitography/keymaps/multi/keymap.c
deleted file mode 100644
index 42ab737698a..00000000000
--- a/keyboards/splitography/keymaps/multi/keymap.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/* Copyright 2021 Alexis Jeandeau
- *
- * 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 keyboard_layers {
-    _QWERTY = 0,
-    _DVORAK,
-    _COLEMAK,
-    _WORKMAN,
-    _TXBOLT,
-    _PLOVER,
-    _BLUE,
-    _ORANGE,
-    _GREEN,
-    _NUM,
-    _END_LAYERS,
-};
-
-enum keyboard_keycodes {
-    QWERTY = SAFE_RANGE,
-    DVORAK,
-    COLEMAK,
-    WORKMAN,
-    BASE,
-    BASE1,
-    BASE2,
-    TXBOLT,
-    PLOVER,
-    BLUE,
-    ORANGE,
-};
-
-#define COPY LCTL(KC_C)
-#define CUT LCTL(KC_X)
-#define PASTE LCTL(KC_V)
-#define UNDO LCTL(KC_Z)
-#define TG_NUM TG(_NUM)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // ...................................................................... Qwerty
-    //
-    // http://www.keyboard-layout-editor.com/#/gists/1b04ce6be0cee6e5d2998b2a8efb8b09
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │  Esc │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │ Bksp │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │  Alt │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │   ;  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│   Z  │   X  │   C  │   V  │   B  │   N  │   M  │   ,  │   .  │   /  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │Orange│ Blue │ Space│ Ctrl │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_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_BSPC,
-        KC_LALT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT ,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LGUI,
-                                            ORANGE,  BLUE,    KC_SPC,  KC_LCTL
-    ),
-
-    // ...................................................................... Dvorak
-    //
-    // http://www.keyboard-layout-editor.com/#/gists/1b04ce6be0cee6e5d2998b2a8efb8b09
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │  Esc │   "  │   ,  │   .  │   P  │   Y  │   F  │   G  │   C  │   R  │   L  │ Bksp │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │  Alt │   A  │   O  │   E  │   U  │   I  │   D  │   H  │   T  │   N  │   S  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│   ;  │   Q  │   J  │   K  │   X  │   B  │   M  │   W  │   V  │   Z  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │Orange│ Blue │ Space│ Ctrl │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_DVORAK] = LAYOUT(
-        KC_ESC,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-        KC_LALT, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT ,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_LGUI,
-                                            ORANGE,  BLUE,    KC_SPC,  KC_LCTL
-    ),
-
-    // ..................................................................... Colemak
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │  Esc │   Q  │   W  │   F  │   P  │   G  │   J  │   L  │   U  │   Y  │   ;  │ Bksp │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │  Alt │   A  │   R  │   S  │   T  │   D  │   H  │   N  │   E  │   I  │   O  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│   Z  │   X  │   C  │   V  │   B  │   K  │   M  │   ,  │   .  │   /  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │Orange│ Blue │ Space│ Ctrl │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_COLEMAK] = LAYOUT(
-        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_LALT, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT ,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LGUI,
-                                            ORANGE,  BLUE,    KC_SPC,  KC_LCTL
-    ),
-
-    // ..................................................................... Workman
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │  Esc │   Q  │   D  │   R  │   W  │   B  │   J  │   F  │   U  │   P  │   ;  │ Bksp │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │  Alt │   A  │   S  │   H  │   T  │   G  │   Y  │   N  │   E  │   O  │   I  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│   Z  │   X  │   M  │   C  │   V  │   K  │   L  │   ,  │   .  │   /  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │Orange│ Blue │ Space│ Ctrl │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_WORKMAN] = LAYOUT(
-        KC_ESC,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN,    KC_BSPC,
-        KC_LALT, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,       KC_ENT ,
-        KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH,    KC_LGUI,
-                                            ORANGE,  BLUE,    KC_SPC,  KC_LCTL
-    ),
-
-    // .................................................................. Blue Layer
-    //
-    // http://www.keyboard-layout-editor.com/#/gists/054b8bc0e31971bb962ea1c781232e0b
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │   `  │   1  │   2  │   3  │   4  │   5  │   6  │   7  │   8  │   9  │   0  │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │  Alt │ Stop │ Prev │ Play │ Next │ +Vol │      │      │      │   [  │   ]  │   '  │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│ Undo │  Cut │ Copy │ Paste│ -Vol │ Mute │      │      │   -  │   =  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │Orange│  f() │  Del │ Ctrl │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_BLUE] = LAYOUT(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    XXXXXXX,
-        KC_LALT, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_QUOT,
-        KC_LSFT, UNDO,    CUT,     COPY,    PASTE,   KC_VOLD, KC_MUTE, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL,  KC_LGUI,
-                                            ORANGE,  _______, KC_DEL,  KC_LCTL
-    ),
-
-    // ................................................................ Orange Layer
-    //
-    // http://www.keyboard-layout-editor.com/#/gists/83ccc7c3faa78b1f67f6fef65063a248
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │Plover│  F1  │  F2  │  F3  │  F4  │      │  App │ PrScr│ScrLck│ Pause│      │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │  Alt │  F5  │  F6  │  F7  │  F8  │      │      │Insert│ Home │ PgUp │      │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│  F9  │  F10 │  F11 │  F12 │      │      │  Del │  End │ PgDn │   \  │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │  f() │ Blue │  Tab │ Ctrl │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_ORANGE] = LAYOUT(
-        PLOVER,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   XXXXXXX, KC_APP,  KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX,
-        KC_LALT, KC_F5,   KC_F6,   KC_F7,   KC_F8,   XXXXXXX, XXXXXXX, KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX,
-        KC_LSFT, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_DEL,  KC_END,  KC_PGDN, KC_BSLS, KC_LGUI,
-                                            _______, BLUE,    KC_TAB,  KC_LCTL
-    ),
-
-    // ................................................................. Green Layer
-    //
-    // http://www.keyboard-layout-editor.com/#/gists/bc7902f1eada4d7d34d3445aa1eccdab
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │TxBolt│QWERTY│Dvorak│Colemk│Workmn│Scroll│   /  │   7  │   8  │   9  │   -  │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │  Alt │ Home │  Up  │  End │ PgUp │ Caps │   *  │   4  │   5  │   6  │   +  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│ Left │ Down │ Right│ PgDn │  Num │   0  │   1  │   2  │   3  │      │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │  f() │  f() │  --  │ Ctrl │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_GREEN] = LAYOUT(
-        TXBOLT,  QWERTY,  DVORAK,  COLEMAK, WORKMAN, KC_SCRL, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, XXXXXXX,
-        KC_LALT, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_CAPS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_ENT ,
-        KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TG_NUM,  KC_P0,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_LGUI,
-                                            _______, _______, XXXXXXX, KC_LCTL
-    ),
-
-    // ................................................................... Num Layer
-    //
-    // http://www.keyboard-layout-editor.com/#/gists/bc7902f1eada4d7d34d3445aa1eccdab
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │      │      │      │      │      │      │   /  │   7  │   8  │   9  │   -  │      │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │  Alt │ Home │  Up  │  End │ PgUp │      │   *  │   4  │   5  │   6  │   +  │ Enter│
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Shift│ Left │ Down │ Right│ PgDn │  f() │   0  │   1  │   2  │   3  │      │  GUI │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │  --  │  --  │  --  │ Ctrl │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_NUM] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, XXXXXXX,
-        KC_LALT, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_ENT ,
-        KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  BASE,   KC_P0,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX, KC_LGUI,
-                                            XXXXXXX, XXXXXXX, XXXXXXX, KC_LCTL
-    ),
-
-    // ...................................................................... Plover
-    //
-    // http://www.keyboard-layout-editor.com/#/gists/27b8f8649393a8ba4071ba946a9306f4
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │   1  │   1  │   1  │   1  │   1  │   1  │   1  │   1  │   1  │   1  │   1  │   1  │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Base │   S  │   T  │   P  │   H  │   *  │   *  │   F  │   P  │   L  │   T  │   D  │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Base │   S  │   K  │   W  │   R  │   *  │   *  │   R  │   B  │   G  │   S  │   Z  │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │   A  │   O  │   E  │   U  │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_PLOVER] = LAYOUT(
-        KC_1,  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-        BASE1, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-        BASE2, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-                                          KC_C,    KC_V,    KC_N,    KC_M
-    ),
-
-    // ...................................................................... TxBolt
-    //
-    // http://www.keyboard-layout-editor.com/#/gists/27b8f8649393a8ba4071ba946a9306f4
-
-    // ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-    // │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │   #  │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Base │   S  │   T  │   P  │   H  │   *  │   *  │   F  │   P  │   L  │   T  │   D  │
-    // ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-    // │ Base │   S  │   K  │   W  │   R  │   *  │   *  │   R  │   B  │   G  │   S  │   Z  │
-    // └──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-    //                             │   A  │   O  │   E  │   U  │
-    //                             └──────┴──────┴──────┴──────┘
-
-    [_TXBOLT] = LAYOUT(
-        STN_N1, STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
-        BASE1,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-        BASE2,  STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-                                           STN_A,   STN_O,   STN_E,   STN_U
-    ),
-};
-// clang-format on
-
-// ..................................................................... Keymaps
-
-#define BASE_1 1
-#define BASE_2 2
-#define BASE_12 3
-static uint8_t base_n = 0;
-
-void (*base_layer)(void) = NULL;
-
-void qwerty(void) {
-    base_layer = qwerty;
-    base_n     = 0;
-    layer_move(0);
-    set_single_persistent_default_layer(_QWERTY);
-}
-
-void dvorak(void) {
-    base_layer = dvorak;
-    base_n     = 0;
-    layer_move(0);
-    set_single_persistent_default_layer(_DVORAK);
-}
-
-void colemak(void) {
-    base_layer = colemak;
-    base_n     = 0;
-    layer_move(0);
-    set_single_persistent_default_layer(_COLEMAK);
-}
-
-void workman(void) {
-    base_layer = workman;
-    base_n     = 0;
-    layer_move(0);
-    set_single_persistent_default_layer(_WORKMAN);
-}
-
-void plover(keyrecord_t *record) {
-    if (record->event.pressed) {
-        layer_move(0);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw  = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-    }
-}
-
-void txbolt(void) {
-    layer_move(0);
-    layer_on(_TXBOLT);
-}
-
-// ........................................................... User Keycode Trap
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                qwerty();
-            }
-            return false;
-        case DVORAK:
-            if (record->event.pressed) {
-                dvorak();
-            }
-            return false;
-        case KC_QUOT:
-            if ((base_layer != dvorak) || (get_highest_layer(layer_state) != _BLUE)) {
-                break;
-            }
-            if (record->event.pressed) {
-                register_code(KC_SLSH);
-            } else {
-                unregister_code(KC_SLSH);
-            }
-            return false;
-        case COLEMAK:
-            if (record->event.pressed) {
-                colemak();
-            }
-            return false;
-        case WORKMAN:
-            if (record->event.pressed) {
-                workman();
-            }
-            return false;
-        case BASE:
-            if (record->event.pressed) {
-                base_layer();
-            }
-            return false;
-        case BASE1:
-            if (record->event.pressed) {
-                base_n = base_n | BASE_1;
-                if (base_n == BASE_12) {
-                    base_layer();
-                }
-            } else {
-                base_n = base_n & ~BASE_1;
-            }
-            return false;
-        case BASE2:
-            if (record->event.pressed) {
-                base_n = base_n | BASE_2;
-                if (base_n == BASE_12) {
-                    base_layer();
-                }
-            } else {
-                base_n = base_n & ~BASE_2;
-            }
-            return false;
-        case BLUE:
-            if (record->event.pressed) {
-                layer_on(_BLUE);
-                update_tri_layer(_BLUE, _ORANGE, _GREEN);
-            } else {
-                layer_off(_BLUE);
-                update_tri_layer(_BLUE, _ORANGE, _GREEN);
-            }
-            return false;
-        case ORANGE:
-            if (record->event.pressed) {
-                layer_on(_ORANGE);
-                update_tri_layer(_BLUE, _ORANGE, _GREEN);
-            } else {
-                layer_off(_ORANGE);
-                update_tri_layer(_BLUE, _ORANGE, _GREEN);
-            }
-            return false;
-        case PLOVER:
-            plover(record);
-            return false;
-        case TXBOLT:
-            if (record->event.pressed) {
-                txbolt();
-            }
-            return false;
-    }
-    return true;
-}
-
-// Initialize the steno protocol
-void eeconfig_init_user(void) {
-    steno_set_mode(STENO_MODE_BOLT);  // or STENO_MODE_BOLT
-}
diff --git a/keyboards/splitography/keymaps/multi/readme.md b/keyboards/splitography/keymaps/multi/readme.md
deleted file mode 100644
index 2eb7d8f98c6..00000000000
--- a/keyboards/splitography/keymaps/multi/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Differences with the [default layout](../default)
-
-* QWERTY, Dvorak, Colemak and Workman are available by pressing Orange + Blue + one of the top left keys:
-
-```
-┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-│TxBolt│QWERTY│Dvorak│Colemk│Workmn│Scroll│   /  │   7  │   8  │   9  │   -  │      │
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│  Alt │ Home │  Up  │  End │ PgUp │ Caps │   *  │   4  │   5  │   6  │   +  │ Enter│
-├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-│ Shift│ Left │ Down │ Right│ PgDn │  Num │   0  │   1  │   2  │   3  │      │  GUI │
-└──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┘
-                            │  f() │  f() │  --  │ Ctrl │
-                            └──────┴──────┴──────┴──────┘
-```
diff --git a/keyboards/stenokeyboards/the_uni/keymaps/utility_belt/keymap.c b/keyboards/stenokeyboards/the_uni/keymaps/utility_belt/keymap.c
deleted file mode 100644
index 0962521903f..00000000000
--- a/keyboards/stenokeyboards/the_uni/keymaps/utility_belt/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2022 Peter C. Park <peter@stenokeyboards.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 uni_layers {
-    _PLOVER,
-    _UTILITY,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_PLOVER] = LAYOUT(
-        STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1,  STN_ST3,  STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
-        STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2,  STN_ST4,  STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
-                          MO(_UTILITY),  STN_A,   STN_O,    STN_E,    STN_U,   STN_N2),
-    [_UTILITY] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_LSFT,  KC_LCTL,  KC_LALT,  KC_LCMD,  KC_SPC, KC_VOLD,  KC_LEFT, KC_DOWN, KC_UP ,KC_RIGHT,  KC_VOLU,
-                          _______,  STN_N1,   XXXXXXX,    XXXXXXX,    XXXXXXX,   XXXXXXX),
-
-};
-
-void keyboard_post_init_user(void) {
-    steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
- }
diff --git a/keyboards/stenokeyboards/the_uni/keymaps/utility_belt/readme.md b/keyboards/stenokeyboards/the_uni/keymaps/utility_belt/readme.md
deleted file mode 100644
index 152ef0bbe1e..00000000000
--- a/keyboards/stenokeyboards/the_uni/keymaps/utility_belt/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Utility Bar Uni Layout
-
-## Default layer
-
-![The Uni Layout Image](https://i.imgur.com/z9AfjYZ.png)
-
-## Utility bar layer
-
-![The Uni Layout Image](https://i.imgur.com/JcU2Frh.png)
-
-
-Use this layout if you want to do modifier+mouse actions like shift+click. There is also arrows and volume keys on the right side.
-
-To use, press and hold the bottom left number key, which temporarily switches the layer to the utility bar layer.
diff --git a/keyboards/stront/config.h b/keyboards/stront/config.h
index 13c76a80e2d..c1dfd3162a1 100644
--- a/keyboards/stront/config.h
+++ b/keyboards/stront/config.h
@@ -34,60 +34,3 @@
 #define BACKLIGHT_PWM_DRIVER PWMD7
 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A
 #define QUANTUM_PAINTER_LVGL_USE_CUSTOM_CONF
-
-/* RGB config */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_KEYPRESSES
-
-#    define ENABLE_RGB_MATRIX_ALPHAS_MODS            // Static dual hue, speed is hue for secondary hue
-#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN       // Static gradient top to bottom, speed controls how much gradient changes
-#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT    // Static gradient left to right, speed controls how much gradient changes
-#    define ENABLE_RGB_MATRIX_BREATHING              // Single hue brightness cycling animation
-#    define ENABLE_RGB_MATRIX_BAND_SAT               // Single hue band fading saturation scrolling left to right
-#    define ENABLE_RGB_MATRIX_BAND_VAL               // Single hue band fading brightness scrolling left to right
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT      // Single hue 3 blade spinning pinwheel fades saturation
-#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL      // Single hue 3 blade spinning pinwheel fades brightness
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT        // Single hue spinning spiral fades saturation
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL        // Single hue spinning spiral fades brightness
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL              // Full keyboard solid hue cycling through full gradient
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT       // Full gradient scrolling left to right
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN          // Full gradient scrolling top to bottom
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN           // Full gradient scrolling out to in
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL      // Full dual gradients scrolling out to in
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradient Chevron shaped scrolling left to right
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL         // Full gradient spinning pinwheel around center of keyboard
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL           // Full gradient spinning spiral around center of keyboard
-#    define ENABLE_RGB_MATRIX_DUAL_BEACON            // Full gradient spinning around center of keyboard
-#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON         // Full tighter gradient spinning around center of keyboard
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS      // Full dual gradients spinning two halfs of keyboard
-#    define ENABLE_RGB_MATRIX_RAINDROPS              // Randomly changes a single key's hue
-#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS    // Randomly changes a single key's hue and saturation
-#    define ENABLE_RGB_MATRIX_HUE_BREATHING          // Hue shifts up a slight amount at the same time, then shifts back
-#    define ENABLE_RGB_MATRIX_HUE_PENDULUM           // Hue shifts up a slight amount in a wave to the right, then back to the left
-#    define ENABLE_RGB_MATRIX_HUE_WAVE               // Hue shifts up a slight amount and then back down in a wave to the right
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL          // Single hue fractal filled keys pulsing horizontally out to edges
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW             // Pulsing RGB flow along LED wiring with random hues
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN             // Randomly light keys with random hues
-#    if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
-#        define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
-#        define ENABLE_RGB_MATRIX_DIGITAL_RAIN   // That famous computer simulation
-#    endif
-#    if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#        define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-#        define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-#        define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-#    endif
-#endif
diff --git a/keyboards/stront/info.json b/keyboards/stront/info.json
index 40be3646888..88ccb2c6d03 100644
--- a/keyboards/stront/info.json
+++ b/keyboards/stront/info.json
@@ -65,6 +65,7 @@
         "transport": {
             "sync": {
                 "indicators": true,
+                "matrix_state": true,
                 "modifiers": true
             }
         }
@@ -101,6 +102,51 @@
         "split_count": [19, 19]
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "led_count": 38,
         "split_count": [19, 19],
@@ -144,7 +190,8 @@
             { "flags": 4, "matrix": [4, 2], "x": 180, "y": 0 },
             { "flags": 4, "matrix": [4, 3], "x": 167, "y": 5 },
             { "flags": 4, "matrix": [4, 4], "x": 153, "y": 7 }
-        ]
+        ],
+        "sleep": true
     },
     "usb": {
         "device_version": "1.0.0",
diff --git a/keyboards/stront/keymaps/zzeneg/config.h b/keyboards/stront/keymaps/zzeneg/config.h
deleted file mode 100644
index 38fad1c0fdd..00000000000
--- a/keyboards/stront/keymaps/zzeneg/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// #define DEBUG_MATRIX_SCAN_RATE
-
-#define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_HID_SYNC, RPC_ID_USER_CAPS_WORD_SYNC, RPC_ID_USER_LAYER_SYNC
-#define QUANTUM_PAINTER_DISPLAY_TIMEOUT 0
-
-#define I2C_DRIVER I2CD1
-#define I2C1_SDA_PIN GP10
-#define I2C1_SCL_PIN GP11
-
-#define CIRQUE_PINNACLE_TAP_ENABLE
-#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE
-#define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
-#define MOUSE_EXTENDED_REPORT
-
-#define TAPPING_TERM 150
-#define TAPPING_TERM_PER_KEY
-#define QUICK_TAP_TERM 0
-
-#define CAPS_WORD_IDLE_TIMEOUT 2500
-#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_TIMEOUT 300000
-#    define RGB_TRIGGER_ON_KEYDOWN
-#endif
diff --git a/keyboards/stront/keymaps/zzeneg/fonts/montserrat_20_en_ru.c b/keyboards/stront/keymaps/zzeneg/fonts/montserrat_20_en_ru.c
deleted file mode 100644
index f03a7835a61..00000000000
--- a/keyboards/stront/keymaps/zzeneg/fonts/montserrat_20_en_ru.c
+++ /dev/null
@@ -1,782 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*******************************************************************************
- * Size: 20 px
- * Bpp: 4
- * Opts:
- ******************************************************************************/
-
-#ifdef __has_include
-#    if __has_include("lvgl.h")
-#        ifndef LV_LVGL_H_INCLUDE_SIMPLE
-#            define LV_LVGL_H_INCLUDE_SIMPLE
-#        endif
-#    endif
-#endif
-
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#    include "lvgl.h"
-#else
-#    include "lvgl/lvgl.h"
-#endif
-
-#ifndef MONTSERRAT_20_EN_RU
-#    define MONTSERRAT_20_EN_RU 1
-#endif
-
-#if MONTSERRAT_20_EN_RU
-
-/*-----------------
- *    BITMAPS
- *----------------*/
-
-/*Store the image of the glyphs*/
-static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
-    /* U+0020 " " */
-
-    /* U+0021 "!" */
-    0x3f, 0x63, 0xf6, 0x2f, 0x52, 0xf5, 0x1f, 0x41, 0xf4, 0xf, 0x40, 0xf3, 0xf, 0x30, 0xf2, 0x2, 0x0, 0x0, 0x1, 0x5, 0xf8, 0x3f, 0x60,
-
-    /* U+0022 "\"" */
-    0x9a, 0x3, 0xf0, 0x99, 0x2, 0xf0, 0x99, 0x2, 0xf0, 0x89, 0x2, 0xf0, 0x89, 0x1, 0xf0, 0x44, 0x0, 0x70,
-
-    /* U+0023 "#" */
-    0x0, 0x0, 0x6b, 0x0, 0x2, 0xe0, 0x0, 0x0, 0x0, 0x79, 0x0, 0x4, 0xc0, 0x0, 0x0, 0x0, 0x97, 0x0, 0x6, 0xa0, 0x0, 0x0, 0x0, 0xb6, 0x0, 0x8, 0x80, 0x0, 0xc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0x1, 0x22, 0xf4, 0x22, 0x2c, 0x62, 0x20, 0x0, 0x1, 0xf0, 0x0, 0xd, 0x30, 0x0, 0x0, 0x2, 0xe0, 0x0, 0xf, 0x10, 0x0, 0x0, 0x4, 0xc0, 0x0, 0x1f, 0x0, 0x0, 0x0, 0x6, 0xa0, 0x0, 0x3d, 0x0, 0x0, 0x6f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa0, 0x12, 0x2b, 0x82, 0x22, 0x8b, 0x22, 0x10, 0x0, 0xc, 0x50, 0x0, 0x88, 0x0, 0x0, 0x0, 0xe, 0x30, 0x0, 0xa6, 0x0, 0x0, 0x0, 0xf, 0x10, 0x0, 0xc4, 0x0, 0x0,
-
-    /* U+0024 "$" */
-    0x0, 0x0, 0x4, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xb0, 0x0, 0x0, 0x0, 0x6, 0xcf, 0xfe, 0xb6, 0x0, 0x0, 0xbf, 0x98, 0xd6, 0xaf, 0x90, 0x6, 0xf4, 0x4, 0xb0, 0x1, 0x20, 0xa, 0xc0, 0x4, 0xb0, 0x0, 0x0, 0xb, 0xc0, 0x4, 0xb0, 0x0, 0x0, 0x7, 0xf6, 0x4, 0xb0, 0x0, 0x0, 0x0, 0xcf, 0xca, 0xb0, 0x0, 0x0, 0x0, 0x6, 0xcf, 0xfe, 0x92, 0x0, 0x0, 0x0, 0x5, 0xda, 0xff, 0x60, 0x0, 0x0, 0x4, 0xb0, 0x1b, 0xf1, 0x0, 0x0, 0x4, 0xb0, 0x3, 0xf5, 0x0, 0x0, 0x4, 0xb0, 0x2, 0xf4, 0xb, 0x50, 0x4, 0xb0, 0x9, 0xf1, 0x9, 0xfd, 0x88, 0xd7, 0xcf, 0x50, 0x0, 0x29, 0xdf, 0xfe, 0xa3, 0x0, 0x0, 0x0, 0x4, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x50, 0x0, 0x0,
-
-    /* U+0025 "%" */
-    0x0, 0x9d, 0xd9, 0x0, 0x0, 0x0, 0xd5, 0x0, 0x8, 0x90, 0x9, 0x80, 0x0, 0x7, 0xb0, 0x0, 0xe, 0x10, 0x1, 0xe0, 0x0, 0x2e, 0x10, 0x0, 0x2d, 0x0, 0x0, 0xd2, 0x0, 0xb6, 0x0, 0x0, 0x2e, 0x0, 0x0, 0xe2, 0x6, 0xc0, 0x0, 0x0, 0xe, 0x10, 0x1, 0xe0, 0x1e, 0x20, 0x0, 0x0, 0x8, 0xb1, 0x1b, 0x80, 0xa8, 0x0, 0x0, 0x0, 0x0, 0x8e, 0xe8, 0x4, 0xd0, 0x2b, 0xfd, 0x40, 0x0, 0x0, 0x0, 0xe, 0x30, 0xe5, 0x3, 0xe2, 0x0, 0x0, 0x0, 0x99, 0x6, 0xa0, 0x0, 0x88, 0x0, 0x0, 0x3, 0xe1, 0x8, 0x70, 0x0, 0x4b, 0x0, 0x0, 0xd, 0x50, 0x8, 0x70, 0x0, 0x4b, 0x0, 0x0, 0x7b, 0x0, 0x6, 0xa0, 0x0, 0x78, 0x0, 0x2, 0xe1, 0x0, 0x0, 0xe3, 0x2, 0xe2, 0x0, 0xc, 0x60, 0x0, 0x0, 0x2c, 0xdd, 0x40,
-
-    /* U+0026 "&" */
-    0x0, 0x1, 0xae, 0xfd, 0x50, 0x0, 0x0, 0x0, 0xd, 0xc3, 0x16, 0xf3, 0x0, 0x0, 0x0, 0x3f, 0x20, 0x0, 0xc8, 0x0, 0x0, 0x0, 0x3f, 0x10, 0x0, 0xc7, 0x0, 0x0, 0x0, 0xf, 0x70, 0x6, 0xf2, 0x0, 0x0, 0x0, 0x6, 0xf4, 0x9f, 0x50, 0x0, 0x0, 0x0, 0x0, 0xcf, 0xd2, 0x0, 0x0, 0x0, 0x0, 0x1b, 0xfc, 0xe2, 0x0, 0x0, 0x0, 0x1, 0xdc, 0x10, 0xcd, 0x10, 0xa, 0x20, 0x9, 0xd0, 0x0, 0xd, 0xd1, 0x1f, 0x10, 0xf, 0x70, 0x0, 0x1, 0xdc, 0x8c, 0x0, 0xf, 0x60, 0x0, 0x0, 0x2e, 0xf6, 0x0, 0xc, 0xc0, 0x0, 0x0, 0x1c, 0xfa, 0x0, 0x3, 0xfd, 0x63, 0x48, 0xec, 0x4f, 0x90, 0x0, 0x29, 0xef, 0xfc, 0x60, 0x4, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0027 "'" */
-    0x9a, 0x99, 0x99, 0x89, 0x89, 0x44,
-
-    /* U+0028 "(" */
-    0x0, 0xd8, 0x5, 0xf1, 0xc, 0x90, 0x1f, 0x40, 0x5f, 0x0, 0x9d, 0x0, 0xba, 0x0, 0xd9, 0x0, 0xe8, 0x0, 0xe7, 0x0, 0xe8, 0x0, 0xd9, 0x0, 0xba, 0x0, 0x9d, 0x0, 0x5f, 0x0, 0x1f, 0x40, 0xc, 0x90, 0x5, 0xf1, 0x0, 0xd8,
-
-    /* U+0029 ")" */
-    0xe, 0x70, 0x0, 0x7e, 0x0, 0x1, 0xf5, 0x0, 0xb, 0xb0, 0x0, 0x7f, 0x0, 0x3, 0xf2, 0x0, 0x1f, 0x40, 0x0, 0xf6, 0x0, 0xe, 0x70, 0x0, 0xe7, 0x0, 0xe, 0x70, 0x0, 0xf6, 0x0, 0x1f, 0x40, 0x3, 0xf2, 0x0, 0x7f, 0x0, 0xb, 0xa0, 0x1, 0xf5, 0x0, 0x7e, 0x0, 0xe, 0x60, 0x0,
-
-    /* U+002A "*" */
-    0x0, 0x9, 0x50, 0x0, 0x23, 0x9, 0x50, 0x50, 0x3e, 0x9a, 0x7c, 0xc1, 0x0, 0x9f, 0xf5, 0x0, 0x6, 0xed, 0xdd, 0x30, 0x5b, 0x29, 0x54, 0xd1, 0x0, 0x9, 0x50, 0x0, 0x0, 0x4, 0x20, 0x0,
-
-    /* U+002B "+" */
-    0x0, 0x0, 0xb4, 0x0, 0x0, 0x0, 0x0, 0xe6, 0x0, 0x0, 0x0, 0x0, 0xe6, 0x0, 0x0, 0x0, 0x0, 0xe6, 0x0, 0x0, 0x9f, 0xff, 0xff, 0xff, 0xf1, 0x13, 0x33, 0xe8, 0x33, 0x30, 0x0, 0x0, 0xe6, 0x0, 0x0, 0x0, 0x0, 0xe6, 0x0, 0x0, 0x0, 0x0, 0xe6, 0x0, 0x0, 0x0, 0x0, 0x21, 0x0, 0x0,
-
-    /* U+002C "," */
-    0x12, 0xd, 0xf1, 0xaf, 0x15, 0xc0, 0x88, 0xc, 0x30,
-
-    /* U+002D "-" */
-    0x0, 0x0, 0x0, 0xcf, 0xff, 0xf7, 0x33, 0x33, 0x31,
-
-    /* U+002E "." */
-    0x12, 0xd, 0xf1, 0xad, 0x0,
-
-    /* U+002F "/" */
-    0x0, 0x0, 0x0, 0x7, 0x20, 0x0, 0x0, 0x3, 0xf1, 0x0, 0x0, 0x0, 0x9b, 0x0, 0x0, 0x0, 0xe, 0x60, 0x0, 0x0, 0x4, 0xf1, 0x0, 0x0, 0x0, 0x9b, 0x0, 0x0, 0x0, 0xe, 0x60, 0x0, 0x0, 0x4, 0xf0, 0x0, 0x0, 0x0, 0x9b, 0x0, 0x0, 0x0, 0xe, 0x50, 0x0, 0x0, 0x4, 0xf0, 0x0, 0x0, 0x0, 0xaa, 0x0, 0x0, 0x0, 0xf, 0x50, 0x0, 0x0, 0x4, 0xf0, 0x0, 0x0, 0x0, 0xaa, 0x0, 0x0, 0x0, 0xf, 0x50, 0x0, 0x0, 0x5, 0xf0, 0x0, 0x0, 0x0, 0xaa, 0x0, 0x0, 0x0, 0xf, 0x40, 0x0, 0x0, 0x5, 0xf0, 0x0, 0x0, 0x0,
-
-    /* U+0030 "0" */
-    0x0, 0x8, 0xdf, 0xea, 0x20, 0x0, 0x1, 0xdf, 0x86, 0x7d, 0xf3, 0x0, 0xb, 0xe2, 0x0, 0x0, 0xce, 0x10, 0x3f, 0x50, 0x0, 0x0, 0x1f, 0x70, 0x9e, 0x0, 0x0, 0x0, 0xa, 0xd0, 0xca, 0x0, 0x0, 0x0, 0x7, 0xf0, 0xe8, 0x0, 0x0, 0x0, 0x4, 0xf2, 0xf8, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xe8, 0x0, 0x0, 0x0, 0x4, 0xf2, 0xca, 0x0, 0x0, 0x0, 0x7, 0xf0, 0x9e, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x3f, 0x50, 0x0, 0x0, 0x1f, 0x70, 0xb, 0xe2, 0x0, 0x0, 0xce, 0x10, 0x1, 0xdf, 0x96, 0x7e, 0xf3, 0x0, 0x0, 0x8, 0xdf, 0xea, 0x20, 0x0,
-
-    /* U+0031 "1" */
-    0xdf, 0xff, 0xe4, 0x55, 0xae, 0x0, 0x8, 0xe0, 0x0, 0x8e, 0x0, 0x8, 0xe0, 0x0, 0x8e, 0x0, 0x8, 0xe0, 0x0, 0x8e, 0x0, 0x8, 0xe0, 0x0, 0x8e, 0x0, 0x8, 0xe0, 0x0, 0x8e, 0x0, 0x8, 0xe0, 0x0, 0x8e, 0x0, 0x8, 0xe0,
-
-    /* U+0032 "2" */
-    0x0, 0x7c, 0xff, 0xea, 0x20, 0x2, 0xdf, 0x96, 0x68, 0xef, 0x20, 0x4c, 0x10, 0x0, 0x1, 0xea, 0x0, 0x0, 0x0, 0x0, 0x9, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x0, 0x0, 0xc, 0xb0, 0x0, 0x0, 0x0, 0x4, 0xf5, 0x0, 0x0, 0x0, 0x2, 0xea, 0x0, 0x0, 0x0, 0x2, 0xec, 0x0, 0x0, 0x0, 0x1, 0xdc, 0x0, 0x0, 0x0, 0x1, 0xdd, 0x10, 0x0, 0x0, 0x1, 0xdd, 0x10, 0x0, 0x0, 0x0, 0xce, 0x10, 0x0, 0x0, 0x0, 0xcf, 0x75, 0x55, 0x55, 0x53, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x90,
-
-    /* U+0033 "3" */
-    0x3f, 0xff, 0xff, 0xff, 0xfc, 0x1, 0x55, 0x55, 0x55, 0x8f, 0x70, 0x0, 0x0, 0x0, 0xc, 0xc0, 0x0, 0x0, 0x0, 0x8, 0xf2, 0x0, 0x0, 0x0, 0x3, 0xf6, 0x0, 0x0, 0x0, 0x0, 0xdc, 0x0, 0x0, 0x0, 0x0, 0x8f, 0x20, 0x0, 0x0, 0x0, 0xf, 0xff, 0xb4, 0x0, 0x0, 0x0, 0x33, 0x5b, 0xf6, 0x0, 0x0, 0x0, 0x0, 0xa, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x40, 0x0, 0x0, 0x0, 0x4, 0xf3, 0x67, 0x0, 0x0, 0x0, 0xbf, 0x6, 0xfe, 0x96, 0x68, 0xdf, 0x50, 0x2, 0x8d, 0xff, 0xea, 0x30, 0x0,
-
-    /* U+0034 "4" */
-    0x0, 0x0, 0x0, 0x2, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9e, 0x10, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x40, 0x0, 0x0, 0x0, 0x0, 0x2e, 0x90, 0x0, 0x0, 0x0, 0x0, 0xc, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x8, 0xf2, 0x0, 0x2a, 0x10, 0x0, 0x4, 0xf6, 0x0, 0x4, 0xf2, 0x0, 0x1, 0xea, 0x0, 0x0, 0x4f, 0x20, 0x0, 0xbe, 0x21, 0x11, 0x15, 0xf3, 0x10, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x44, 0x44, 0x44, 0x47, 0xf5, 0x43, 0x0, 0x0, 0x0, 0x0, 0x4f, 0x20, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4f, 0x20, 0x0,
-
-    /* U+0035 "5" */
-    0x0, 0xef, 0xff, 0xff, 0xfc, 0x0, 0xf, 0x95, 0x55, 0x55, 0x40, 0x1, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x20, 0x0, 0x0, 0x0, 0x4, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x11, 0x0, 0x0, 0x0, 0x8, 0xff, 0xff, 0xeb, 0x40, 0x0, 0x24, 0x44, 0x47, 0xcf, 0x80, 0x0, 0x0, 0x0, 0x0, 0x9f, 0x20, 0x0, 0x0, 0x0, 0x1, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf, 0x80, 0x0, 0x0, 0x0, 0x1, 0xf6, 0x3c, 0x20, 0x0, 0x0, 0xaf, 0x13, 0xef, 0xb7, 0x67, 0xdf, 0x60, 0x0, 0x7c, 0xef, 0xeb, 0x40, 0x0,
-
-    /* U+0036 "6" */
-    0x0, 0x5, 0xbe, 0xfe, 0xb4, 0x0, 0xa, 0xfa, 0x64, 0x6a, 0x60, 0x9, 0xf3, 0x0, 0x0, 0x0, 0x2, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x0, 0x0, 0xc, 0xa0, 0x0, 0x0, 0x0, 0x0, 0xe8, 0x7, 0xdf, 0xfc, 0x50, 0xf, 0x8c, 0xc5, 0x35, 0xaf, 0x80, 0xee, 0xb0, 0x0, 0x0, 0x8f, 0x2d, 0xf2, 0x0, 0x0, 0x0, 0xf7, 0xaf, 0x0, 0x0, 0x0, 0xe, 0x85, 0xf3, 0x0, 0x0, 0x0, 0xf7, 0xd, 0xb0, 0x0, 0x0, 0x8f, 0x20, 0x2e, 0xd6, 0x45, 0xbf, 0x60, 0x0, 0x19, 0xdf, 0xfb, 0x40, 0x0,
-
-    /* U+0037 "7" */
-    0x5f, 0xff, 0xff, 0xff, 0xff, 0xe5, 0xf6, 0x55, 0x55, 0x55, 0xeb, 0x5f, 0x10, 0x0, 0x0, 0x3f, 0x55, 0xf1, 0x0, 0x0, 0xa, 0xe0, 0x2, 0x0, 0x0, 0x1, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x10, 0x0, 0x0, 0x0, 0xe, 0xa0, 0x0, 0x0, 0x0, 0x5, 0xf3, 0x0, 0x0, 0x0, 0x0, 0xcc, 0x0, 0x0, 0x0, 0x0, 0x2f, 0x60, 0x0, 0x0, 0x0, 0x9, 0xe0, 0x0, 0x0, 0x0, 0x1, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x20, 0x0, 0x0, 0x0, 0xd, 0xb0, 0x0, 0x0, 0x0, 0x4, 0xf4, 0x0, 0x0, 0x0,
-
-    /* U+0038 "8" */
-    0x0, 0x5, 0xcf, 0xfe, 0xa3, 0x0, 0x0, 0x9f, 0xa5, 0x46, 0xcf, 0x50, 0x3, 0xf7, 0x0, 0x0, 0xb, 0xe0, 0x7, 0xf0, 0x0, 0x0, 0x4, 0xf3, 0x8, 0xf0, 0x0, 0x0, 0x3, 0xf4, 0x5, 0xf3, 0x0, 0x0, 0x7, 0xf1, 0x0, 0xce, 0x40, 0x0, 0x7f, 0x80, 0x0, 0x1e, 0xff, 0xff, 0xfb, 0x0, 0x2, 0xed, 0x63, 0x33, 0x7e, 0xc0, 0xc, 0xd0, 0x0, 0x0, 0x2, 0xf7, 0xf, 0x70, 0x0, 0x0, 0x0, 0xbc, 0xf, 0x80, 0x0, 0x0, 0x0, 0xcb, 0xb, 0xe1, 0x0, 0x0, 0x4, 0xf7, 0x2, 0xee, 0x85, 0x45, 0xaf, 0xc0, 0x0, 0x18, 0xdf, 0xfe, 0xb6, 0x0,
-
-    /* U+0039 "9" */
-    0x0, 0x2a, 0xef, 0xea, 0x20, 0x0, 0x4, 0xfc, 0x64, 0x6c, 0xf4, 0x0, 0xe, 0xb0, 0x0, 0x0, 0x9e, 0x10, 0x3f, 0x30, 0x0, 0x0, 0x1f, 0x80, 0x5f, 0x10, 0x0, 0x0, 0xd, 0xd0, 0x4f, 0x20, 0x0, 0x0, 0xf, 0xf0, 0x1f, 0x90, 0x0, 0x0, 0x7f, 0xf1, 0x7, 0xf9, 0x21, 0x28, 0xf7, 0xf2, 0x0, 0x6e, 0xff, 0xfc, 0x35, 0xf1, 0x0, 0x0, 0x23, 0x10, 0x7, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0x50, 0x0, 0x0, 0x0, 0x2, 0xdc, 0x0, 0x3, 0xb6, 0x55, 0x9f, 0xc1, 0x0, 0x3, 0xae, 0xff, 0xc6, 0x0, 0x0,
-
-    /* U+003A ":" */
-    0xbe, 0x1d, 0xf1, 0x12, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x12, 0xd, 0xf1, 0xad, 0x0,
-
-    /* U+003B ";" */
-    0xbe, 0x1d, 0xf1, 0x12, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x12, 0xd, 0xf1, 0xaf, 0x15, 0xc0, 0x88, 0xc, 0x30,
-
-    /* U+003C "<" */
-    0x0, 0x0, 0x0, 0x0, 0x50, 0x0, 0x0, 0x1, 0x7e, 0xe1, 0x0, 0x3, 0xaf, 0xc5, 0x0, 0x6, 0xdf, 0x93, 0x0, 0x0, 0x9f, 0x70, 0x0, 0x0, 0x0, 0x5d, 0xe8, 0x20, 0x0, 0x0, 0x0, 0x4b, 0xfb, 0x40, 0x0, 0x0, 0x0, 0x28, 0xee, 0x70, 0x0, 0x0, 0x0, 0x5, 0xc1, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+003D "=" */
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xff, 0xff, 0xff, 0xf1, 0x13, 0x33, 0x33, 0x33, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xff, 0xff, 0xff, 0xf1, 0x13, 0x33, 0x33, 0x33, 0x30,
-
-    /* U+003E ">" */
-    0x41, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xb4, 0x0, 0x0, 0x0, 0x2, 0x9f, 0xd7, 0x10, 0x0, 0x0, 0x0, 0x6c, 0xf9, 0x30, 0x0, 0x0, 0x0, 0x3c, 0xf1, 0x0, 0x0, 0x5, 0xbf, 0xa0, 0x0, 0x18, 0xee, 0x81, 0x0, 0x3b, 0xfb, 0x50, 0x0, 0x0, 0x89, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+003F "?" */
-    0x1, 0x7c, 0xff, 0xe9, 0x20, 0x2e, 0xe8, 0x55, 0x8e, 0xe2, 0x5b, 0x10, 0x0, 0x2, 0xfa, 0x0, 0x0, 0x0, 0x0, 0xbd, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x2, 0xf6, 0x0, 0x0, 0x0, 0x2e, 0xc0, 0x0, 0x0, 0x2, 0xec, 0x0, 0x0, 0x0, 0xc, 0xd0, 0x0, 0x0, 0x0, 0x3f, 0x50, 0x0, 0x0, 0x0, 0x27, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x50, 0x0, 0x0, 0x0, 0x5f, 0x40, 0x0,
-
-    /* U+0040 "@" */
-    0x0, 0x0, 0x4, 0x9d, 0xff, 0xec, 0x82, 0x0, 0x0, 0x0, 0x0, 0x2c, 0xe8, 0x31, 0x1, 0x49, 0xe9, 0x0, 0x0, 0x0, 0x4f, 0x80, 0x0, 0x0, 0x0, 0x1, 0xad, 0x10, 0x0, 0x2f, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8c, 0x0, 0xb, 0x80, 0x0, 0x4b, 0xff, 0xc5, 0xf, 0x50, 0xc7, 0x3, 0xf0, 0x0, 0x6f, 0x83, 0x25, 0xd7, 0xf5, 0x3, 0xe0, 0x89, 0x0, 0x2f, 0x50, 0x0, 0x0, 0xdf, 0x50, 0xd, 0x4c, 0x50, 0x9, 0xc0, 0x0, 0x0, 0x4, 0xf5, 0x0, 0x97, 0xe3, 0x0, 0xd8, 0x0, 0x0, 0x0, 0xf, 0x50, 0x7, 0x9f, 0x20, 0xe, 0x60, 0x0, 0x0, 0x0, 0xf5, 0x0, 0x69, 0xe3, 0x0, 0xd8, 0x0, 0x0, 0x0, 0x1f, 0x50, 0x7, 0x9c, 0x50, 0x9, 0xd0, 0x0, 0x0, 0x5, 0xf5, 0x0, 0x96, 0x89, 0x0, 0x2f, 0x70, 0x0, 0x1, 0xdf, 0x50, 0xe, 0x23, 0xf0, 0x0, 0x6f, 0xa4, 0x36, 0xe7, 0xcc, 0x39, 0xb0, 0xb, 0x80, 0x0, 0x4b, 0xff, 0xc5, 0x3, 0xdf, 0xb1, 0x0, 0x2e, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2c, 0xe8, 0x31, 0x12, 0x5a, 0x40, 0x0, 0x0, 0x0, 0x0, 0x4, 0x9d, 0xff, 0xeb, 0x71, 0x0, 0x0, 0x0,
-
-    /* U+0041 "A" */
-    0x0, 0x0, 0x0, 0xcf, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xc7, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xf6, 0x1f, 0x60, 0x0, 0x0, 0x0, 0x0, 0x7e, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xe, 0x80, 0x3, 0xf4, 0x0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0xd, 0xa0, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x6f, 0x10, 0x0, 0x0, 0x3f, 0x40, 0x0, 0x0, 0xf8, 0x0, 0x0, 0x9, 0xe0, 0x0, 0x0, 0x9, 0xe0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff, 0xff, 0x60, 0x0, 0x7f, 0x33, 0x33, 0x33, 0x33, 0xcc, 0x0, 0xd, 0xa0, 0x0, 0x0, 0x0, 0x4, 0xf3, 0x5, 0xf3, 0x0, 0x0, 0x0, 0x0, 0xe, 0xa0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x10,
-
-    /* U+0042 "B" */
-    0xbf, 0xff, 0xff, 0xfe, 0xb4, 0x0, 0xbd, 0x44, 0x44, 0x46, 0xcf, 0x60, 0xbc, 0x0, 0x0, 0x0, 0xb, 0xf0, 0xbc, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xbc, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xbc, 0x0, 0x0, 0x0, 0x9, 0xe0, 0xbc, 0x0, 0x0, 0x2, 0x8f, 0x50, 0xbf, 0xff, 0xff, 0xff, 0xf9, 0x0, 0xbd, 0x33, 0x33, 0x34, 0x7d, 0xe2, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xda, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x8e, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xbc, 0x0, 0x0, 0x0, 0x1, 0xeb, 0xbd, 0x44, 0x44, 0x45, 0x7e, 0xf3, 0xbf, 0xff, 0xff, 0xff, 0xd9, 0x20,
-
-    /* U+0043 "C" */
-    0x0, 0x0, 0x7c, 0xff, 0xeb, 0x50, 0x0, 0x3, 0xef, 0xa7, 0x57, 0xbf, 0xc1, 0x3, 0xfc, 0x20, 0x0, 0x0, 0x3d, 0x20, 0xdd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x30, 0x0, 0x0, 0x0, 0x0, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x20, 0x0, 0x0, 0x4e, 0x30, 0x4, 0xef, 0xa7, 0x67, 0xbf, 0xb0, 0x0, 0x0, 0x7c, 0xff, 0xeb, 0x50, 0x0,
-
-    /* U+0044 "D" */
-    0xbf, 0xff, 0xff, 0xfd, 0xa3, 0x0, 0x0, 0xbd, 0x55, 0x55, 0x58, 0xdf, 0xa0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x5, 0xfb, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x4f, 0x70, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xa, 0xe0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf4, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf6, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf7, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x1, 0xf6, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf4, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xa, 0xe0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x4f, 0x70, 0xbc, 0x0, 0x0, 0x0, 0x5, 0xfb, 0x0, 0xbd, 0x55, 0x55, 0x58, 0xdf, 0xa0, 0x0, 0xbf, 0xff, 0xff, 0xfd, 0xa3, 0x0, 0x0,
-
-    /* U+0045 "E" */
-    0xbf, 0xff, 0xff, 0xff, 0xfe, 0xb, 0xd5, 0x55, 0x55, 0x55, 0x40, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xb, 0xff, 0xff, 0xff, 0xff, 0x0, 0xbd, 0x33, 0x33, 0x33, 0x30, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xb, 0xd5, 0x55, 0x55, 0x55, 0x51, 0xbf, 0xff, 0xff, 0xff, 0xff, 0x30,
-
-    /* U+0046 "F" */
-    0xbf, 0xff, 0xff, 0xff, 0xfe, 0xbd, 0x55, 0x55, 0x55, 0x54, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x11, 0x11, 0x11, 0x10, 0xbf, 0xff, 0xff, 0xff, 0xf0, 0xbd, 0x44, 0x44, 0x44, 0x40, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0047 "G" */
-    0x0, 0x0, 0x6c, 0xef, 0xec, 0x60, 0x0, 0x3, 0xef, 0xa7, 0x57, 0xaf, 0xd2, 0x3, 0xfc, 0x20, 0x0, 0x0, 0x2c, 0x40, 0xdd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x30, 0x0, 0x0, 0x0, 0x0, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0x80, 0x0, 0x0, 0x0, 0x0, 0x64, 0xe9, 0x0, 0x0, 0x0, 0x0, 0xd, 0x9b, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xd9, 0x6f, 0x30, 0x0, 0x0, 0x0, 0xd, 0x90, 0xdd, 0x0, 0x0, 0x0, 0x0, 0xd9, 0x3, 0xfc, 0x20, 0x0, 0x0, 0x2f, 0x90, 0x3, 0xef, 0xb7, 0x67, 0xbf, 0xe3, 0x0, 0x0, 0x7c, 0xff, 0xeb, 0x60, 0x0,
-
-    /* U+0048 "H" */
-    0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x11, 0x11, 0x11, 0x11, 0x8f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbd, 0x44, 0x44, 0x44, 0x44, 0xaf, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x7f,
-
-    /* U+0049 "I" */
-    0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc, 0xbc,
-
-    /* U+004A "J" */
-    0x0, 0xbf, 0xff, 0xff, 0xd0, 0x3, 0x55, 0x55, 0xbd, 0x0, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0x0, 0x9d, 0x0, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0x0, 0x9d, 0x0, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0x0, 0x9d, 0x0, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0x0, 0x9d, 0x0, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0x0, 0xbc, 0xb, 0x50, 0x0, 0x1f, 0x80, 0x9f, 0xa5, 0x6d, 0xf1, 0x0, 0x6d, 0xff, 0xb2, 0x0,
-
-    /* U+004B "K" */
-    0xbc, 0x0, 0x0, 0x0, 0x7, 0xf4, 0xb, 0xc0, 0x0, 0x0, 0x6, 0xf5, 0x0, 0xbc, 0x0, 0x0, 0x4, 0xf7, 0x0, 0xb, 0xc0, 0x0, 0x3, 0xf9, 0x0, 0x0, 0xbc, 0x0, 0x2, 0xea, 0x0, 0x0, 0xb, 0xc0, 0x1, 0xec, 0x0, 0x0, 0x0, 0xbc, 0x1, 0xde, 0x10, 0x0, 0x0, 0xb, 0xc0, 0xcf, 0xf3, 0x0, 0x0, 0x0, 0xbc, 0xbe, 0x3d, 0xe1, 0x0, 0x0, 0xb, 0xff, 0x30, 0x2f, 0xb0, 0x0, 0x0, 0xbf, 0x40, 0x0, 0x5f, 0x80, 0x0, 0xb, 0xc0, 0x0, 0x0, 0x7f, 0x50, 0x0, 0xbc, 0x0, 0x0, 0x0, 0xaf, 0x20, 0xb, 0xc0, 0x0, 0x0, 0x0, 0xdd, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x2, 0xeb, 0x0,
-
-    /* U+004C "L" */
-    0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0xbd, 0x55, 0x55, 0x55, 0x53, 0xbf, 0xff, 0xff, 0xff, 0xf9,
-
-    /* U+004D "M" */
-    0xbc, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xdb, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfd, 0xbf, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xcf, 0xdb, 0xef, 0x60, 0x0, 0x0, 0x0, 0x4f, 0xed, 0xbb, 0xbe, 0x0, 0x0, 0x0, 0xd, 0xc9, 0xdb, 0xb2, 0xf7, 0x0, 0x0, 0x5, 0xf3, 0x9d, 0xbb, 0x9, 0xf1, 0x0, 0x0, 0xda, 0x9, 0xdb, 0xb0, 0x1e, 0x90, 0x0, 0x6f, 0x10, 0x9d, 0xbb, 0x0, 0x6f, 0x20, 0xe, 0x80, 0x9, 0xdb, 0xb0, 0x0, 0xda, 0x8, 0xe0, 0x0, 0x9d, 0xbb, 0x0, 0x4, 0xf4, 0xf6, 0x0, 0x9, 0xdb, 0xb0, 0x0, 0xb, 0xfd, 0x0, 0x0, 0x9d, 0xbb, 0x0, 0x0, 0x2f, 0x40, 0x0, 0x9, 0xdb, 0xb0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x9d, 0xbb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xd0,
-
-    /* U+004E "N" */
-    0xbd, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xbf, 0xa0, 0x0, 0x0, 0x0, 0x7f, 0xbf, 0xf6, 0x0, 0x0, 0x0, 0x7f, 0xbd, 0xef, 0x30, 0x0, 0x0, 0x7f, 0xbc, 0x4f, 0xd1, 0x0, 0x0, 0x7f, 0xbc, 0x7, 0xfb, 0x0, 0x0, 0x7f, 0xbc, 0x0, 0xbf, 0x70, 0x0, 0x7f, 0xbc, 0x0, 0x1e, 0xf3, 0x0, 0x7f, 0xbc, 0x0, 0x3, 0xfe, 0x10, 0x7f, 0xbc, 0x0, 0x0, 0x7f, 0xc0, 0x7f, 0xbc, 0x0, 0x0, 0xa, 0xf8, 0x7f, 0xbc, 0x0, 0x0, 0x0, 0xdf, 0xcf, 0xbc, 0x0, 0x0, 0x0, 0x2f, 0xff, 0xbc, 0x0, 0x0, 0x0, 0x6, 0xff, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x9f,
-
-    /* U+004F "O" */
-    0x0, 0x0, 0x7c, 0xff, 0xeb, 0x50, 0x0, 0x0, 0x3, 0xef, 0xa6, 0x57, 0xbf, 0xc1, 0x0, 0x3, 0xfc, 0x20, 0x0, 0x0, 0x3e, 0xe1, 0x0, 0xdd, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xa0, 0x6f, 0x30, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x2b, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf7, 0xe9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xaf, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbb, 0xe9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xab, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x6f, 0x30, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x20, 0xdd, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xa0, 0x3, 0xfc, 0x20, 0x0, 0x0, 0x3e, 0xe1, 0x0, 0x3, 0xef, 0xa7, 0x67, 0xcf, 0xc1, 0x0, 0x0, 0x0, 0x7c, 0xff, 0xeb, 0x50, 0x0, 0x0,
-
-    /* U+0050 "P" */
-    0xbf, 0xff, 0xff, 0xec, 0x60, 0x0, 0xbd, 0x55, 0x55, 0x6a, 0xfc, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x3f, 0x90, 0xbc, 0x0, 0x0, 0x0, 0x8, 0xf0, 0xbc, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xbc, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xbc, 0x0, 0x0, 0x0, 0x7, 0xf1, 0xbc, 0x0, 0x0, 0x0, 0x1e, 0xb0, 0xbc, 0x11, 0x11, 0x26, 0xee, 0x20, 0xbf, 0xff, 0xff, 0xff, 0xa1, 0x0, 0xbd, 0x44, 0x44, 0x30, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0051 "Q" */
-    0x0, 0x0, 0x7c, 0xff, 0xeb, 0x50, 0x0, 0x0, 0x0, 0x3e, 0xfa, 0x65, 0x7b, 0xfc, 0x10, 0x0, 0x3, 0xfc, 0x20, 0x0, 0x0, 0x3e, 0xe1, 0x0, 0xd, 0xd0, 0x0, 0x0, 0x0, 0x2, 0xfa, 0x0, 0x6f, 0x30, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x20, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0xe9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xa0, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xb0, 0xe9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xa0, 0xbd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x70, 0x6f, 0x30, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x20, 0xd, 0xd0, 0x0, 0x0, 0x0, 0x2, 0xfa, 0x0, 0x3, 0xfc, 0x20, 0x0, 0x0, 0x3e, 0xe1, 0x0, 0x0, 0x3e, 0xfa, 0x76, 0x7c, 0xfc, 0x10, 0x0, 0x0, 0x0, 0x7c, 0xff, 0xfb, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf7, 0x0, 0x0, 0x50, 0x0, 0x0, 0x0, 0x0, 0x8f, 0x81, 0x18, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x5, 0xef, 0xfe, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x20, 0x0,
-
-    /* U+0052 "R" */
-    0xbf, 0xff, 0xff, 0xec, 0x60, 0x0, 0xbd, 0x55, 0x55, 0x6a, 0xfc, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x3f, 0x90, 0xbc, 0x0, 0x0, 0x0, 0x8, 0xf0, 0xbc, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xbc, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xbc, 0x0, 0x0, 0x0, 0x7, 0xf1, 0xbc, 0x0, 0x0, 0x0, 0x1e, 0xb0, 0xbc, 0x11, 0x11, 0x26, 0xee, 0x20, 0xbf, 0xff, 0xff, 0xff, 0xa1, 0x0, 0xbd, 0x44, 0x43, 0x4f, 0x70, 0x0, 0xbc, 0x0, 0x0, 0x7, 0xf2, 0x0, 0xbc, 0x0, 0x0, 0x0, 0xcc, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x2f, 0x70, 0xbc, 0x0, 0x0, 0x0, 0x7, 0xf2,
-
-    /* U+0053 "S" */
-    0x0, 0x6, 0xcf, 0xfe, 0xb6, 0x0, 0x0, 0xbf, 0x95, 0x46, 0xaf, 0x90, 0x6, 0xf4, 0x0, 0x0, 0x1, 0x20, 0xa, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0xcf, 0xc7, 0x20, 0x0, 0x0, 0x0, 0x6, 0xcf, 0xfe, 0x92, 0x0, 0x0, 0x0, 0x1, 0x5a, 0xff, 0x60, 0x0, 0x0, 0x0, 0x0, 0x1b, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x2, 0xf4, 0xb, 0x50, 0x0, 0x0, 0x9, 0xf1, 0x9, 0xfd, 0x85, 0x57, 0xcf, 0x50, 0x0, 0x29, 0xdf, 0xfe, 0xa3, 0x0,
-
-    /* U+0054 "T" */
-    0xef, 0xff, 0xff, 0xff, 0xff, 0xf6, 0x45, 0x55, 0x5f, 0xa5, 0x55, 0x52, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0,
-
-    /* U+0055 "U" */
-    0xda, 0x0, 0x0, 0x0, 0x0, 0xca, 0xda, 0x0, 0x0, 0x0, 0x0, 0xca, 0xda, 0x0, 0x0, 0x0, 0x0, 0xca, 0xda, 0x0, 0x0, 0x0, 0x0, 0xca, 0xda, 0x0, 0x0, 0x0, 0x0, 0xca, 0xda, 0x0, 0x0, 0x0, 0x0, 0xca, 0xda, 0x0, 0x0, 0x0, 0x0, 0xca, 0xda, 0x0, 0x0, 0x0, 0x0, 0xca, 0xda, 0x0, 0x0, 0x0, 0x0, 0xca, 0xcb, 0x0, 0x0, 0x0, 0x0, 0xd9, 0xad, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x6f, 0x30, 0x0, 0x0, 0x5, 0xf3, 0xe, 0xd1, 0x0, 0x0, 0x2e, 0xb0, 0x3, 0xee, 0x96, 0x69, 0xfd, 0x10, 0x0, 0x19, 0xdf, 0xfd, 0x80, 0x0,
-
-    /* U+0056 "V" */
-    0xbd, 0x0, 0x0, 0x0, 0x0, 0x0, 0xcb, 0x5f, 0x40, 0x0, 0x0, 0x0, 0x3, 0xf4, 0xe, 0xa0, 0x0, 0x0, 0x0, 0x9, 0xe0, 0x7, 0xf1, 0x0, 0x0, 0x0, 0x1f, 0x70, 0x1, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0x10, 0x0, 0xae, 0x0, 0x0, 0x0, 0xda, 0x0, 0x0, 0x4f, 0x50, 0x0, 0x4, 0xf3, 0x0, 0x0, 0xd, 0xb0, 0x0, 0xa, 0xd0, 0x0, 0x0, 0x6, 0xf2, 0x0, 0x1f, 0x60, 0x0, 0x0, 0x0, 0xf8, 0x0, 0x8f, 0x0, 0x0, 0x0, 0x0, 0x9e, 0x0, 0xe9, 0x0, 0x0, 0x0, 0x0, 0x2f, 0x65, 0xf2, 0x0, 0x0, 0x0, 0x0, 0xc, 0xcc, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0xee, 0x0, 0x0, 0x0,
-
-    /* U+0057 "W" */
-    0x1f, 0x60, 0x0, 0x0, 0x0, 0xaf, 0x0, 0x0, 0x0, 0x1, 0xf5, 0xc, 0xb0, 0x0, 0x0, 0x0, 0xff, 0x50, 0x0, 0x0, 0x6, 0xf0, 0x7, 0xf1, 0x0, 0x0, 0x5, 0xfd, 0xa0, 0x0, 0x0, 0xb, 0xb0, 0x2, 0xf5, 0x0, 0x0, 0xa, 0xb7, 0xf0, 0x0, 0x0, 0xf, 0x60, 0x0, 0xda, 0x0, 0x0, 0xf, 0x62, 0xf4, 0x0, 0x0, 0x5f, 0x10, 0x0, 0x8f, 0x0, 0x0, 0x4f, 0x10, 0xd9, 0x0, 0x0, 0xac, 0x0, 0x0, 0x3f, 0x40, 0x0, 0x9b, 0x0, 0x8e, 0x0, 0x0, 0xf7, 0x0, 0x0, 0xe, 0x90, 0x0, 0xe6, 0x0, 0x2f, 0x30, 0x4, 0xf2, 0x0, 0x0, 0x9, 0xe0, 0x4, 0xf1, 0x0, 0xd, 0x80, 0x9, 0xd0, 0x0, 0x0, 0x4, 0xf3, 0x9, 0xc0, 0x0, 0x8, 0xd0, 0xe, 0x80, 0x0, 0x0, 0x0, 0xf8, 0xe, 0x70, 0x0, 0x3, 0xf3, 0x3f, 0x30, 0x0, 0x0, 0x0, 0xad, 0x3f, 0x20, 0x0, 0x0, 0xe8, 0x8e, 0x0, 0x0, 0x0, 0x0, 0x5f, 0xbc, 0x0, 0x0, 0x0, 0x9d, 0xd9, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf7, 0x0, 0x0, 0x0, 0x4f, 0xf4, 0x0, 0x0, 0x0, 0x0, 0xb, 0xf2, 0x0, 0x0, 0x0, 0xe, 0xe0, 0x0, 0x0,
-
-    /* U+0058 "X" */
-    0x1e, 0xb0, 0x0, 0x0, 0x0, 0x8f, 0x20, 0x4f, 0x60, 0x0, 0x0, 0x3f, 0x60, 0x0, 0x9f, 0x20, 0x0, 0xd, 0xb0, 0x0, 0x0, 0xec, 0x0, 0x9, 0xe1, 0x0, 0x0, 0x4, 0xf7, 0x4, 0xf5, 0x0, 0x0, 0x0, 0x9, 0xf4, 0xea, 0x0, 0x0, 0x0, 0x0, 0xd, 0xfe, 0x10, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xcf, 0x50, 0x0, 0x0, 0x0, 0xd, 0xc0, 0xbe, 0x10, 0x0, 0x0, 0x8, 0xf2, 0x1, 0xeb, 0x0, 0x0, 0x4, 0xf6, 0x0, 0x5, 0xf6, 0x0, 0x0, 0xeb, 0x0, 0x0, 0xa, 0xf2, 0x0, 0x9f, 0x20, 0x0, 0x0, 0x1e, 0xb0, 0x5f, 0x60, 0x0, 0x0, 0x0, 0x4f, 0x60,
-
-    /* U+0059 "Y" */
-    0xbd, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x62, 0xf7, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x8, 0xf1, 0x0, 0x0, 0x3, 0xf4, 0x0, 0x1e, 0x90, 0x0, 0x0, 0xca, 0x0, 0x0, 0x6f, 0x20, 0x0, 0x5f, 0x20, 0x0, 0x0, 0xdb, 0x0, 0xe, 0x80, 0x0, 0x0, 0x4, 0xf4, 0x8, 0xe0, 0x0, 0x0, 0x0, 0xb, 0xd2, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xed, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0x40, 0x0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x10, 0x0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x10, 0x0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0x0, 0x0, 0x0,
-
-    /* U+005A "Z" */
-    0xf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x20, 0x55, 0x55, 0x55, 0x55, 0x6f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xf2, 0x0, 0x0, 0x0, 0x0, 0x6, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x2, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0x20, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x60, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xa0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x1, 0xeb, 0x0, 0x0, 0x0, 0x0, 0x0, 0xcf, 0x65, 0x55, 0x55, 0x55, 0x52, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x60,
-
-    /* U+005B "[" */
-    0xbf, 0xff, 0xbc, 0x33, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbb, 0x0, 0xbc, 0x33, 0xbf, 0xff,
-
-    /* U+005C "\\" */
-    0x45, 0x0, 0x0, 0x0, 0x5, 0xe0, 0x0, 0x0, 0x0, 0xf, 0x40, 0x0, 0x0, 0x0, 0xa9, 0x0, 0x0, 0x0, 0x5, 0xe0, 0x0, 0x0, 0x0, 0xf, 0x40, 0x0, 0x0, 0x0, 0xaa, 0x0, 0x0, 0x0, 0x5, 0xf0, 0x0, 0x0, 0x0, 0xf, 0x40, 0x0, 0x0, 0x0, 0xaa, 0x0, 0x0, 0x0, 0x5, 0xf0, 0x0, 0x0, 0x0, 0xf, 0x50, 0x0, 0x0, 0x0, 0xaa, 0x0, 0x0, 0x0, 0x4, 0xf0, 0x0, 0x0, 0x0, 0xe, 0x50, 0x0, 0x0, 0x0, 0x9a, 0x0, 0x0, 0x0, 0x4, 0xf0, 0x0, 0x0, 0x0, 0xe, 0x50, 0x0, 0x0, 0x0, 0x9b, 0x0, 0x0, 0x0, 0x4, 0xf0,
-
-    /* U+005D "]" */
-    0x9f, 0xff, 0x12, 0x37, 0xf1, 0x0, 0x5f, 0x10, 0x5, 0xf1, 0x0, 0x5f, 0x10, 0x5, 0xf1, 0x0, 0x5f, 0x10, 0x5, 0xf1, 0x0, 0x5f, 0x10, 0x5, 0xf1, 0x0, 0x5f, 0x10, 0x5, 0xf1, 0x0, 0x5f, 0x10, 0x5, 0xf1, 0x0, 0x5f, 0x10, 0x5, 0xf1, 0x0, 0x5f, 0x12, 0x37, 0xf1, 0x9f, 0xff, 0x10,
-
-    /* U+005E "^" */
-    0x0, 0x0, 0x73, 0x0, 0x0, 0x0, 0x4f, 0xc0, 0x0, 0x0, 0xa, 0x7e, 0x30, 0x0, 0x1, 0xf1, 0x89, 0x0, 0x0, 0x7a, 0x2, 0xf0, 0x0, 0xe, 0x40, 0xb, 0x60, 0x5, 0xd0, 0x0, 0x5d, 0x0, 0xb7, 0x0, 0x0, 0xe3, 0x2f, 0x10, 0x0, 0x8, 0xa0,
-
-    /* U+005F "_" */
-    0xff, 0xff, 0xff, 0xff, 0xff,
-
-    /* U+0060 "`" */
-    0x7, 0x60, 0x0, 0x2, 0xda, 0x0, 0x0, 0xb, 0xb0,
-
-    /* U+0061 "a" */
-    0x4, 0xae, 0xff, 0xb3, 0x6, 0xfb, 0x64, 0x6d, 0xf3, 0x14, 0x0, 0x0, 0xe, 0xa0, 0x0, 0x0, 0x0, 0x9e, 0x0, 0x0, 0x0, 0x8, 0xe0, 0x6c, 0xef, 0xff, 0xfe, 0x7f, 0x73, 0x22, 0x29, 0xed, 0x90, 0x0, 0x0, 0x8e, 0xd9, 0x0, 0x0, 0xd, 0xe7, 0xf7, 0x11, 0x4c, 0xde, 0x6, 0xdf, 0xfc, 0x57, 0xe0,
-
-    /* U+0062 "b" */
-    0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf, 0x61, 0x9e, 0xfe, 0x91, 0x0, 0xf, 0x9e, 0xb6, 0x47, 0xee, 0x30, 0xf, 0xf7, 0x0, 0x0, 0x1d, 0xd0, 0xf, 0xc0, 0x0, 0x0, 0x3, 0xf5, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe8, 0xf, 0x60, 0x0, 0x0, 0x0, 0xca, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe8, 0xf, 0xc0, 0x0, 0x0, 0x3, 0xf5, 0xf, 0xf8, 0x0, 0x0, 0x1d, 0xd0, 0xf, 0x8e, 0xb6, 0x58, 0xee, 0x20, 0xf, 0x52, 0x9e, 0xfe, 0x91, 0x0,
-
-    /* U+0063 "c" */
-    0x0, 0x4, 0xbe, 0xfe, 0x91, 0x0, 0x7, 0xfb, 0x64, 0x7e, 0xe1, 0x4, 0xf7, 0x0, 0x0, 0x1a, 0x20, 0xcc, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x1, 0xf5, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf8, 0x0, 0x0, 0x1a, 0x20, 0x7, 0xfb, 0x65, 0x8e, 0xd1, 0x0, 0x3, 0xbe, 0xfe, 0x91, 0x0,
-
-    /* U+0064 "d" */
-    0x0, 0x0, 0x0, 0x0, 0x0, 0xd9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd9, 0x0, 0x4, 0xbf, 0xfd, 0x60, 0xd9, 0x0, 0x8f, 0xb5, 0x47, 0xea, 0xd9, 0x5, 0xf7, 0x0, 0x0, 0x1d, 0xf9, 0xc, 0xc0, 0x0, 0x0, 0x3, 0xf9, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe9, 0x1f, 0x50, 0x0, 0x0, 0x0, 0xd9, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe9, 0xc, 0xc0, 0x0, 0x0, 0x4, 0xf9, 0x4, 0xf7, 0x0, 0x0, 0x1d, 0xf9, 0x0, 0x8f, 0xb6, 0x58, 0xea, 0xc9, 0x0, 0x4, 0xbf, 0xfd, 0x60, 0xc9,
-
-    /* U+0065 "e" */
-    0x0, 0x5, 0xcf, 0xfc, 0x50, 0x0, 0x0, 0x8f, 0x95, 0x49, 0xf9, 0x0, 0x4, 0xf4, 0x0, 0x0, 0x4f, 0x50, 0xc, 0xa0, 0x0, 0x0, 0x9, 0xc0, 0xf, 0x60, 0x0, 0x0, 0x4, 0xf0, 0x1f, 0xfe, 0xee, 0xee, 0xef, 0xf2, 0xf, 0x71, 0x11, 0x11, 0x11, 0x10, 0xb, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf7, 0x0, 0x0, 0x5, 0x0, 0x0, 0x7f, 0xc6, 0x56, 0xcf, 0x30, 0x0, 0x3, 0xbe, 0xfe, 0xa2, 0x0,
-
-    /* U+0066 "f" */
-    0x0, 0x7, 0xef, 0xd3, 0x0, 0x6f, 0x74, 0x72, 0x0, 0xbb, 0x0, 0x0, 0x0, 0xc9, 0x0, 0x0, 0xaf, 0xff, 0xff, 0xd0, 0x23, 0xdb, 0x33, 0x30, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0,
-
-    /* U+0067 "g" */
-    0x0, 0x4, 0xbf, 0xfd, 0x70, 0xab, 0x0, 0x8f, 0xa4, 0x35, 0xcc, 0xab, 0x4, 0xf6, 0x0, 0x0, 0xb, 0xfb, 0xc, 0xc0, 0x0, 0x0, 0x1, 0xfb, 0xf, 0x70, 0x0, 0x0, 0x0, 0xcb, 0x1f, 0x50, 0x0, 0x0, 0x0, 0xbb, 0xf, 0x70, 0x0, 0x0, 0x0, 0xcb, 0xc, 0xc0, 0x0, 0x0, 0x2, 0xfb, 0x4, 0xf7, 0x0, 0x0, 0xc, 0xfb, 0x0, 0x8f, 0xb6, 0x57, 0xeb, 0xbb, 0x0, 0x4, 0xbf, 0xfd, 0x70, 0xba, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe8, 0x0, 0x50, 0x0, 0x0, 0x6, 0xf2, 0x3, 0xfd, 0x85, 0x46, 0xaf, 0x80, 0x0, 0x18, 0xcf, 0xfe, 0xb5, 0x0,
-
-    /* U+0068 "h" */
-    0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf6, 0x0, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf6, 0x0, 0x0, 0x0, 0x0, 0xf, 0x63, 0xbe, 0xfd, 0x80, 0x0, 0xfa, 0xfa, 0x65, 0x9f, 0xb0, 0xf, 0xf4, 0x0, 0x0, 0x6f, 0x40, 0xfb, 0x0, 0x0, 0x0, 0xe8, 0xf, 0x70, 0x0, 0x0, 0xc, 0xa0, 0xf6, 0x0, 0x0, 0x0, 0xca, 0xf, 0x60, 0x0, 0x0, 0xc, 0xa0, 0xf6, 0x0, 0x0, 0x0, 0xca, 0xf, 0x60, 0x0, 0x0, 0xc, 0xa0, 0xf6, 0x0, 0x0, 0x0, 0xca, 0xf, 0x60, 0x0, 0x0, 0xc, 0xa0,
-
-    /* U+0069 "i" */
-    0x2f, 0x83, 0xf9, 0x0, 0x0, 0x0, 0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60,
-
-    /* U+006A "j" */
-    0x0, 0x1, 0xe9, 0x0, 0x1, 0xfa, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe8, 0x0, 0x0, 0xe7, 0x0, 0x0, 0xf6, 0x56, 0x4b, 0xf1, 0x6e, 0xfd, 0x40,
-
-    /* U+006B "k" */
-    0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf6, 0x0, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf6, 0x0, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0xcd, 0x10, 0xf6, 0x0, 0x1, 0xcd, 0x10, 0xf, 0x60, 0x1, 0xdd, 0x10, 0x0, 0xf6, 0x1, 0xdd, 0x10, 0x0, 0xf, 0x62, 0xef, 0x20, 0x0, 0x0, 0xf9, 0xec, 0xfb, 0x0, 0x0, 0xf, 0xfc, 0x5, 0xf7, 0x0, 0x0, 0xfc, 0x0, 0x8, 0xf3, 0x0, 0xf, 0x60, 0x0, 0xc, 0xe1, 0x0, 0xf6, 0x0, 0x0, 0x1e, 0xb0, 0xf, 0x60, 0x0, 0x0, 0x4f, 0x70,
-
-    /* U+006C "l" */
-    0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60, 0xf6, 0xf, 0x60,
-
-    /* U+006D "m" */
-    0xf, 0x53, 0xbf, 0xfd, 0x60, 0x4, 0xcf, 0xfc, 0x50, 0x0, 0xf9, 0xf9, 0x56, 0xbf, 0x77, 0xf9, 0x56, 0xbf, 0x70, 0xf, 0xf4, 0x0, 0x0, 0xaf, 0xf4, 0x0, 0x0, 0xbf, 0x0, 0xfb, 0x0, 0x0, 0x3, 0xfa, 0x0, 0x0, 0x3, 0xf3, 0xf, 0x70, 0x0, 0x0, 0x1f, 0x60, 0x0, 0x0, 0x1f, 0x50, 0xf6, 0x0, 0x0, 0x0, 0xf6, 0x0, 0x0, 0x1, 0xf5, 0xf, 0x60, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x1f, 0x50, 0xf6, 0x0, 0x0, 0x0, 0xf6, 0x0, 0x0, 0x1, 0xf5, 0xf, 0x60, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x1f, 0x50, 0xf6, 0x0, 0x0, 0x0, 0xf6, 0x0, 0x0, 0x1, 0xf5, 0xf, 0x60, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x1f, 0x50,
-
-    /* U+006E "n" */
-    0xf, 0x53, 0xbe, 0xfd, 0x80, 0x0, 0xf9, 0xfa, 0x65, 0x9f, 0xb0, 0xf, 0xf4, 0x0, 0x0, 0x6f, 0x40, 0xfb, 0x0, 0x0, 0x0, 0xe8, 0xf, 0x70, 0x0, 0x0, 0xc, 0xa0, 0xf6, 0x0, 0x0, 0x0, 0xca, 0xf, 0x60, 0x0, 0x0, 0xc, 0xa0, 0xf6, 0x0, 0x0, 0x0, 0xca, 0xf, 0x60, 0x0, 0x0, 0xc, 0xa0, 0xf6, 0x0, 0x0, 0x0, 0xca, 0xf, 0x60, 0x0, 0x0, 0xc, 0xa0,
-
-    /* U+006F "o" */
-    0x0, 0x4, 0xbf, 0xfd, 0x81, 0x0, 0x0, 0x8f, 0xb5, 0x47, 0xee, 0x20, 0x4, 0xf7, 0x0, 0x0, 0x1d, 0xd0, 0xc, 0xc0, 0x0, 0x0, 0x3, 0xf4, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe8, 0x1f, 0x50, 0x0, 0x0, 0x0, 0xd9, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe8, 0xb, 0xc0, 0x0, 0x0, 0x4, 0xf4, 0x4, 0xf7, 0x0, 0x0, 0x1d, 0xc0, 0x0, 0x7f, 0xb6, 0x58, 0xee, 0x20, 0x0, 0x4, 0xbf, 0xfd, 0x81, 0x0,
-
-    /* U+0070 "p" */
-    0xf, 0x52, 0xae, 0xfe, 0x91, 0x0, 0xf, 0x8e, 0xb6, 0x47, 0xee, 0x30, 0xf, 0xf7, 0x0, 0x0, 0x1d, 0xd0, 0xf, 0xc0, 0x0, 0x0, 0x3, 0xf5, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe8, 0xf, 0x60, 0x0, 0x0, 0x0, 0xca, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe8, 0xf, 0xc0, 0x0, 0x0, 0x3, 0xf5, 0xf, 0xf8, 0x0, 0x0, 0x1d, 0xd0, 0xf, 0x8e, 0xb6, 0x58, 0xee, 0x20, 0xf, 0x61, 0x9e, 0xfe, 0x91, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0071 "q" */
-    0x0, 0x4, 0xbf, 0xfd, 0x60, 0xc9, 0x0, 0x8f, 0xb5, 0x47, 0xea, 0xc9, 0x5, 0xf7, 0x0, 0x0, 0x1d, 0xf9, 0xc, 0xc0, 0x0, 0x0, 0x3, 0xf9, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe9, 0x1f, 0x50, 0x0, 0x0, 0x0, 0xd9, 0xf, 0x70, 0x0, 0x0, 0x0, 0xe9, 0xc, 0xc0, 0x0, 0x0, 0x4, 0xf9, 0x4, 0xf7, 0x0, 0x0, 0x1d, 0xf9, 0x0, 0x8f, 0xb6, 0x58, 0xea, 0xd9, 0x0, 0x4, 0xbf, 0xfd, 0x60, 0xd9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd9,
-
-    /* U+0072 "r" */
-    0xf, 0x53, 0xbf, 0x40, 0xf9, 0xf9, 0x51, 0xf, 0xf4, 0x0, 0x0, 0xfb, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0xf6, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0xf6, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0xf6, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0,
-
-    /* U+0073 "s" */
-    0x0, 0x7d, 0xff, 0xd9, 0x20, 0x9, 0xf8, 0x44, 0x7d, 0x80, 0xf, 0x60, 0x0, 0x0, 0x0, 0xf, 0x60, 0x0, 0x0, 0x0, 0xb, 0xf8, 0x30, 0x0, 0x0, 0x0, 0x8e, 0xff, 0xc7, 0x0, 0x0, 0x0, 0x14, 0x8f, 0xb0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0x3, 0x0, 0x0, 0x6, 0xf1, 0x4f, 0xc7, 0x55, 0x8f, 0xa0, 0x4, 0xae, 0xff, 0xc7, 0x0,
-
-    /* U+0074 "t" */
-    0x0, 0x65, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0xaf, 0xff, 0xff, 0xd0, 0x23, 0xdb, 0x33, 0x30, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x0, 0x6f, 0x84, 0x82, 0x0, 0x8, 0xef, 0xc3,
-
-    /* U+0075 "u" */
-    0x2f, 0x40, 0x0, 0x0, 0xf, 0x72, 0xf4, 0x0, 0x0, 0x0, 0xf7, 0x2f, 0x40, 0x0, 0x0, 0xf, 0x72, 0xf4, 0x0, 0x0, 0x0, 0xf7, 0x2f, 0x40, 0x0, 0x0, 0xf, 0x72, 0xf4, 0x0, 0x0, 0x0, 0xf7, 0x1f, 0x50, 0x0, 0x0, 0xf, 0x70, 0xf7, 0x0, 0x0, 0x4, 0xf7, 0xb, 0xe1, 0x0, 0x0, 0xcf, 0x70, 0x3f, 0xd7, 0x57, 0xda, 0xe7, 0x0, 0x2b, 0xef, 0xd7, 0xe, 0x70,
-
-    /* U+0076 "v" */
-    0xcb, 0x0, 0x0, 0x0, 0xc, 0x95, 0xf2, 0x0, 0x0, 0x3, 0xf2, 0xe, 0x80, 0x0, 0x0, 0xac, 0x0, 0x8e, 0x0, 0x0, 0x1f, 0x50, 0x1, 0xf6, 0x0, 0x7, 0xe0, 0x0, 0xa, 0xc0, 0x0, 0xe7, 0x0, 0x0, 0x3f, 0x30, 0x5f, 0x10, 0x0, 0x0, 0xca, 0xc, 0xa0, 0x0, 0x0, 0x6, 0xf4, 0xf3, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x8f, 0x50, 0x0, 0x0,
-
-    /* U+0077 "w" */
-    0xab, 0x0, 0x0, 0x0, 0xf9, 0x0, 0x0, 0x1, 0xf3, 0x4f, 0x10, 0x0, 0x5, 0xfe, 0x0, 0x0, 0x6, 0xd0, 0xe, 0x60, 0x0, 0xb, 0xaf, 0x50, 0x0, 0xc, 0x80, 0x9, 0xc0, 0x0, 0x1f, 0x3a, 0xa0, 0x0, 0x2f, 0x20, 0x3, 0xf1, 0x0, 0x6d, 0x4, 0xf1, 0x0, 0x7c, 0x0, 0x0, 0xd7, 0x0, 0xc7, 0x0, 0xe6, 0x0, 0xd6, 0x0, 0x0, 0x8d, 0x2, 0xf1, 0x0, 0x8c, 0x3, 0xf1, 0x0, 0x0, 0x2f, 0x28, 0xc0, 0x0, 0x3f, 0x19, 0xb0, 0x0, 0x0, 0xc, 0x8e, 0x60, 0x0, 0xd, 0x7e, 0x50, 0x0, 0x0, 0x6, 0xff, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x1, 0xfa, 0x0, 0x0, 0x1, 0xf9, 0x0, 0x0,
-
-    /* U+0078 "x" */
-    0x1e, 0x80, 0x0, 0x0, 0xdb, 0x0, 0x5f, 0x40, 0x0, 0x9e, 0x10, 0x0, 0x9e, 0x10, 0x5f, 0x30, 0x0, 0x0, 0xcb, 0x2e, 0x70, 0x0, 0x0, 0x2, 0xfe, 0xb0, 0x0, 0x0, 0x0, 0xa, 0xf5, 0x0, 0x0, 0x0, 0x5, 0xfc, 0xe1, 0x0, 0x0, 0x1, 0xe8, 0xd, 0xb0, 0x0, 0x0, 0xcc, 0x0, 0x2f, 0x70, 0x0, 0x8f, 0x20, 0x0, 0x6f, 0x30, 0x4f, 0x50, 0x0, 0x0, 0xad, 0x0,
-
-    /* U+0079 "y" */
-    0xc, 0xb0, 0x0, 0x0, 0x0, 0xc9, 0x5, 0xf2, 0x0, 0x0, 0x3, 0xf2, 0x0, 0xe9, 0x0, 0x0, 0xa, 0xb0, 0x0, 0x7f, 0x0, 0x0, 0x1f, 0x40, 0x0, 0x1f, 0x60, 0x0, 0x8d, 0x0, 0x0, 0x9, 0xd0, 0x0, 0xe7, 0x0, 0x0, 0x2, 0xf4, 0x5, 0xf0, 0x0, 0x0, 0x0, 0xbb, 0xc, 0x90, 0x0, 0x0, 0x0, 0x5f, 0x5f, 0x20, 0x0, 0x0, 0x0, 0xd, 0xfb, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x8, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x60, 0x0, 0x0, 0x3c, 0x55, 0xdd, 0x0, 0x0, 0x0, 0x1a, 0xff, 0xb1, 0x0, 0x0, 0x0,
-
-    /* U+007A "z" */
-    0xf, 0xff, 0xff, 0xff, 0xf4, 0x3, 0x33, 0x33, 0x3d, 0xd0, 0x0, 0x0, 0x0, 0x7f, 0x20, 0x0, 0x0, 0x3, 0xf5, 0x0, 0x0, 0x0, 0x1e, 0x90, 0x0, 0x0, 0x0, 0xbd, 0x0, 0x0, 0x0, 0x8, 0xf2, 0x0, 0x0, 0x0, 0x4f, 0x50, 0x0, 0x0, 0x1, 0xe9, 0x0, 0x0, 0x0, 0xb, 0xe4, 0x33, 0x33, 0x31, 0x2f, 0xff, 0xff, 0xff, 0xf6,
-
-    /* U+007B "{" */
-    0x0, 0x5d, 0xf4, 0x0, 0xfb, 0x40, 0x3, 0xf4, 0x0, 0x3, 0xf3, 0x0, 0x3, 0xf3, 0x0, 0x3, 0xf3, 0x0, 0x3, 0xf3, 0x0, 0x3, 0xf3, 0x0, 0x6, 0xf2, 0x0, 0xcf, 0xb0, 0x0, 0x28, 0xf1, 0x0, 0x3, 0xf3, 0x0, 0x3, 0xf3, 0x0, 0x3, 0xf3, 0x0, 0x3, 0xf3, 0x0, 0x3, 0xf3, 0x0, 0x3, 0xf3, 0x0, 0x0, 0xfb, 0x41, 0x0, 0x5d, 0xf4,
-
-    /* U+007C "|" */
-    0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, 0xb9,
-
-    /* U+007D "}" */
-    0x9f, 0xb2, 0x0, 0x25, 0xeb, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x7f, 0x20, 0x0, 0x1e, 0xf7, 0x0, 0x6f, 0x51, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x0, 0x8e, 0x0, 0x25, 0xeb, 0x0, 0x9f, 0xb2, 0x0,
-
-    /* U+007E "~" */
-    0x9, 0xfd, 0x50, 0x0, 0xc3, 0x6c, 0x36, 0xe8, 0x4, 0xe0, 0xb4, 0x0, 0x2c, 0xff, 0x50, 0x10, 0x0, 0x0, 0x20, 0x0,
-
-    /* U+0401 "Ё" */
-    0x0, 0x4e, 0x20, 0xba, 0x0, 0x0, 0x3, 0xb1, 0x8, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xae, 0x55, 0x55, 0x55, 0x55, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0xff, 0xff, 0xf1, 0xa, 0xe3, 0x33, 0x33, 0x33, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xae, 0x55, 0x55, 0x55, 0x55, 0x1a, 0xff, 0xff, 0xff, 0xff, 0xf4,
-
-    /* U+0410 "А" */
-    0x0, 0x0, 0x0, 0x8f, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xf5, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x0, 0xca, 0xc, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x30, 0x6f, 0x10, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x0, 0xe8, 0x0, 0x0, 0x0, 0x1, 0xf6, 0x0, 0x8, 0xe0, 0x0, 0x0, 0x0, 0x8f, 0x0, 0x0, 0x2f, 0x50, 0x0, 0x0, 0xe, 0x80, 0x0, 0x0, 0xbc, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0x5, 0xf3, 0x0, 0x0, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xa0, 0x0, 0x3f, 0x63, 0x33, 0x33, 0x33, 0x8f, 0x10, 0xa, 0xe0, 0x0, 0x0, 0x0, 0x1, 0xf7, 0x1, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xa, 0xe0, 0x7f, 0x10, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x50,
-
-    /* U+0411 "Б" */
-    0xaf, 0xff, 0xff, 0xff, 0xff, 0x90, 0xad, 0x44, 0x44, 0x44, 0x44, 0x20, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0xff, 0xff, 0xc6, 0x0, 0xad, 0x33, 0x33, 0x35, 0xaf, 0xa0, 0xad, 0x0, 0x0, 0x0, 0x7, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x1, 0xf6, 0xad, 0x0, 0x0, 0x0, 0x1, 0xf6, 0xad, 0x0, 0x0, 0x0, 0x8, 0xf2, 0xad, 0x33, 0x33, 0x35, 0xaf, 0x80, 0xaf, 0xff, 0xff, 0xfe, 0xb4, 0x0,
-
-    /* U+0412 "В" */
-    0xaf, 0xff, 0xff, 0xfe, 0xa2, 0x0, 0xad, 0x33, 0x33, 0x36, 0xdf, 0x30, 0xad, 0x0, 0x0, 0x0, 0x1e, 0xb0, 0xad, 0x0, 0x0, 0x0, 0x9, 0xe0, 0xad, 0x0, 0x0, 0x0, 0x9, 0xe0, 0xad, 0x0, 0x0, 0x0, 0xd, 0xa0, 0xad, 0x0, 0x0, 0x3, 0xbd, 0x10, 0xaf, 0xff, 0xff, 0xff, 0xf5, 0x0, 0xad, 0x33, 0x33, 0x34, 0x7e, 0xa0, 0xad, 0x0, 0x0, 0x0, 0x3, 0xf5, 0xad, 0x0, 0x0, 0x0, 0x0, 0xd9, 0xad, 0x0, 0x0, 0x0, 0x0, 0xe9, 0xad, 0x0, 0x0, 0x0, 0x4, 0xf6, 0xad, 0x33, 0x33, 0x34, 0x8f, 0xc0, 0xaf, 0xff, 0xff, 0xff, 0xc7, 0x0,
-
-    /* U+0413 "Г" */
-    0xaf, 0xff, 0xff, 0xff, 0xf4, 0xad, 0x55, 0x55, 0x55, 0x51, 0xac, 0x0, 0x0, 0x0, 0x0, 0xac, 0x0, 0x0, 0x0, 0x0, 0xac, 0x0, 0x0, 0x0, 0x0, 0xac, 0x0, 0x0, 0x0, 0x0, 0xac, 0x0, 0x0, 0x0, 0x0, 0xac, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0414 "Д" */
-    0x0, 0x5, 0xff, 0xff, 0xff, 0xff, 0xf2, 0x0, 0x0, 0x5, 0xf5, 0x55, 0x55, 0x58, 0xf2, 0x0, 0x0, 0x6, 0xe0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0x7, 0xe0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0x7, 0xd0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0x8, 0xd0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0x8, 0xc0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0x9, 0xb0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0xb, 0xa0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0xd, 0x80, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0xf, 0x50, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0x3f, 0x20, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x0, 0xac, 0x0, 0x0, 0x0, 0x5, 0xf2, 0x0, 0x49, 0xf8, 0x55, 0x55, 0x55, 0x58, 0xf6, 0x51, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xc9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xf3, 0xc9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xf3, 0xc9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xf3, 0x32, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40,
-
-    /* U+0415 "Е" */
-    0xaf, 0xff, 0xff, 0xff, 0xff, 0xa, 0xe5, 0x55, 0x55, 0x55, 0x50, 0xad, 0x0, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xff, 0xff, 0xff, 0x10, 0xae, 0x33, 0x33, 0x33, 0x30, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xa, 0xe5, 0x55, 0x55, 0x55, 0x51, 0xaf, 0xff, 0xff, 0xff, 0xff, 0x40,
-
-    /* U+0416 "Ж" */
-    0xd, 0xb0, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0x8, 0xf1, 0x4, 0xf5, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0x2f, 0x70, 0x0, 0xad, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0xbd, 0x0, 0x0, 0x1f, 0x70, 0x0, 0x9, 0xd0, 0x0, 0x4, 0xf4, 0x0, 0x0, 0x7, 0xf1, 0x0, 0x9, 0xd0, 0x0, 0xd, 0xa0, 0x0, 0x0, 0x0, 0xda, 0x0, 0x9, 0xd0, 0x0, 0x7f, 0x10, 0x0, 0x0, 0x0, 0x3f, 0x41, 0x1a, 0xd1, 0x12, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xff, 0xff, 0xff, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x74, 0x4b, 0xe4, 0x45, 0xf9, 0x0, 0x0, 0x0, 0x1, 0xfb, 0x0, 0x9, 0xd0, 0x0, 0x7f, 0x40, 0x0, 0x0, 0xa, 0xf1, 0x0, 0x9, 0xd0, 0x0, 0xd, 0xd0, 0x0, 0x0, 0x4f, 0x60, 0x0, 0x9, 0xd0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0xec, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0x9f, 0x20, 0x9, 0xf2, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0xe, 0xc0, 0x3f, 0x80, 0x0, 0x0, 0x9, 0xd0, 0x0, 0x0, 0x4, 0xf6,
-
-    /* U+0417 "З" */
-    0x0, 0x15, 0x9a, 0x96, 0x10, 0x0, 0x7, 0xff, 0xdb, 0xcf, 0xf6, 0x0, 0x7, 0x71, 0x0, 0x1, 0xaf, 0x40, 0x0, 0x0, 0x0, 0x0, 0xe, 0xb0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xe, 0x90, 0x0, 0x0, 0x0, 0x3, 0xbe, 0x10, 0x0, 0xb, 0xff, 0xff, 0xe2, 0x0, 0x0, 0x2, 0x33, 0x35, 0xaf, 0x50, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x1, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf5, 0x9, 0x10, 0x0, 0x0, 0x1c, 0xf1, 0x1c, 0xfa, 0x64, 0x59, 0xef, 0x40, 0x0, 0x5b, 0xff, 0xfe, 0x92, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0,
-
-    /* U+0418 "И" */
-    0xad, 0x0, 0x0, 0x0, 0x0, 0x9f, 0x2a, 0xd0, 0x0, 0x0, 0x0, 0x4f, 0xf2, 0xad, 0x0, 0x0, 0x0, 0x1e, 0xff, 0x2a, 0xd0, 0x0, 0x0, 0xb, 0xe6, 0xf2, 0xad, 0x0, 0x0, 0x7, 0xf4, 0x5f, 0x2a, 0xd0, 0x0, 0x3, 0xf9, 0x5, 0xf2, 0xad, 0x0, 0x0, 0xdc, 0x0, 0x5f, 0x2a, 0xd0, 0x0, 0xaf, 0x20, 0x5, 0xf2, 0xad, 0x0, 0x5f, 0x60, 0x0, 0x5f, 0x2a, 0xd0, 0x2f, 0xa0, 0x0, 0x5, 0xf2, 0xad, 0xc, 0xe1, 0x0, 0x0, 0x5f, 0x2a, 0xd8, 0xf3, 0x0, 0x0, 0x5, 0xf2, 0xaf, 0xf8, 0x0, 0x0, 0x0, 0x5f, 0x2a, 0xfc, 0x0, 0x0, 0x0, 0x5, 0xf2, 0xaf, 0x20, 0x0, 0x0, 0x0, 0x5f, 0x20,
-
-    /* U+0419 "Й" */
-    0x0, 0x8, 0x0, 0x0, 0x53, 0x0, 0x0, 0x0, 0xc8, 0x0, 0x3e, 0x30, 0x0, 0x0, 0x1, 0xad, 0xec, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x9f, 0x2a, 0xd0, 0x0, 0x0, 0x0, 0x4f, 0xf2, 0xad, 0x0, 0x0, 0x0, 0x1e, 0xff, 0x2a, 0xd0, 0x0, 0x0, 0xb, 0xe6, 0xf2, 0xad, 0x0, 0x0, 0x7, 0xf4, 0x5f, 0x2a, 0xd0, 0x0, 0x3, 0xf9, 0x5, 0xf2, 0xad, 0x0, 0x0, 0xdc, 0x0, 0x5f, 0x2a, 0xd0, 0x0, 0xaf, 0x20, 0x5, 0xf2, 0xad, 0x0, 0x5f, 0x60, 0x0, 0x5f, 0x2a, 0xd0, 0x2f, 0xa0, 0x0, 0x5, 0xf2, 0xad, 0xc, 0xe1, 0x0, 0x0, 0x5f, 0x2a, 0xd8, 0xf3, 0x0, 0x0, 0x5, 0xf2, 0xaf, 0xf8, 0x0, 0x0, 0x0, 0x5f, 0x2a, 0xfc, 0x0, 0x0, 0x0, 0x5, 0xf2, 0xaf, 0x20, 0x0, 0x0, 0x0, 0x5f, 0x20,
-
-    /* U+041A "К" */
-    0xac, 0x0, 0x0, 0x0, 0x9, 0xe1, 0xac, 0x0, 0x0, 0x0, 0x4f, 0x40, 0xac, 0x0, 0x0, 0x1, 0xe9, 0x0, 0xac, 0x0, 0x0, 0xa, 0xd0, 0x0, 0xac, 0x0, 0x0, 0x5f, 0x30, 0x0, 0xac, 0x0, 0x1, 0xf7, 0x0, 0x0, 0xad, 0x11, 0x1b, 0xc0, 0x0, 0x0, 0xaf, 0xff, 0xff, 0x50, 0x0, 0x0, 0xad, 0x44, 0x4d, 0xd0, 0x0, 0x0, 0xac, 0x0, 0x2, 0xfa, 0x0, 0x0, 0xac, 0x0, 0x0, 0x5f, 0x50, 0x0, 0xac, 0x0, 0x0, 0xa, 0xf2, 0x0, 0xac, 0x0, 0x0, 0x0, 0xdc, 0x0, 0xac, 0x0, 0x0, 0x0, 0x3f, 0x80, 0xac, 0x0, 0x0, 0x0, 0x6, 0xf4,
-
-    /* U+041B "Л" */
-    0x0, 0x2, 0xff, 0xff, 0xff, 0xff, 0xf5, 0x0, 0x3, 0xf6, 0x55, 0x55, 0x56, 0xf5, 0x0, 0x3, 0xf1, 0x0, 0x0, 0x2, 0xf5, 0x0, 0x4, 0xf0, 0x0, 0x0, 0x2, 0xf5, 0x0, 0x4, 0xf0, 0x0, 0x0, 0x2, 0xf5, 0x0, 0x5, 0xf0, 0x0, 0x0, 0x2, 0xf5, 0x0, 0x5, 0xf0, 0x0, 0x0, 0x2, 0xf5, 0x0, 0x6, 0xe0, 0x0, 0x0, 0x2, 0xf5, 0x0, 0x7, 0xd0, 0x0, 0x0, 0x2, 0xf5, 0x0, 0x9, 0xb0, 0x0, 0x0, 0x2, 0xf5, 0x0, 0xb, 0x90, 0x0, 0x0, 0x2, 0xf5, 0x0, 0xf, 0x60, 0x0, 0x0, 0x2, 0xf5, 0x0, 0x6f, 0x20, 0x0, 0x0, 0x2, 0xf5, 0x58, 0xfb, 0x0, 0x0, 0x0, 0x2, 0xf5, 0xbf, 0xb1, 0x0, 0x0, 0x0, 0x2, 0xf5,
-
-    /* U+041C "М" */
-    0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xea, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x2, 0xfe, 0xaf, 0xe0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xea, 0xef, 0x70, 0x0, 0x0, 0x0, 0x3f, 0xee, 0xac, 0x9f, 0x10, 0x0, 0x0, 0xb, 0xd8, 0xea, 0xc1, 0xf9, 0x0, 0x0, 0x4, 0xf4, 0x8e, 0xac, 0x7, 0xf2, 0x0, 0x0, 0xcb, 0x8, 0xea, 0xc0, 0xe, 0xa0, 0x0, 0x5f, 0x20, 0x8e, 0xac, 0x0, 0x5f, 0x30, 0xd, 0x90, 0x8, 0xea, 0xc0, 0x0, 0xcb, 0x6, 0xf1, 0x0, 0x8e, 0xac, 0x0, 0x3, 0xf5, 0xe7, 0x0, 0x8, 0xea, 0xc0, 0x0, 0xa, 0xfe, 0x0, 0x0, 0x8e, 0xac, 0x0, 0x0, 0x1f, 0x50, 0x0, 0x8, 0xea, 0xc0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x8e, 0xac, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8, 0xe0,
-
-    /* U+041D "Н" */
-    0xad, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x1a, 0xd0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0xad, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x1a, 0xd0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0xad, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x1a, 0xd0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0xad, 0x11, 0x11, 0x11, 0x11, 0x7f, 0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xae, 0x44, 0x44, 0x44, 0x44, 0x9f, 0x1a, 0xd0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0xad, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x1a, 0xd0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0xad, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x1a, 0xd0, 0x0, 0x0, 0x0, 0x6, 0xf1, 0xad, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x10,
-
-    /* U+041E "О" */
-    0x0, 0x0, 0x6b, 0xef, 0xeb, 0x60, 0x0, 0x0, 0x2, 0xdf, 0xb7, 0x57, 0xbf, 0xd2, 0x0, 0x2, 0xed, 0x20, 0x0, 0x0, 0x3d, 0xe2, 0x0, 0xce, 0x10, 0x0, 0x0, 0x0, 0x1e, 0xc0, 0x4f, 0x50, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x49, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe9, 0xca, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xcd, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0xca, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xc9, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe9, 0x4f, 0x50, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x40, 0xce, 0x10, 0x0, 0x0, 0x0, 0x1e, 0xc0, 0x2, 0xed, 0x20, 0x0, 0x0, 0x3d, 0xe2, 0x0, 0x2, 0xdf, 0xb7, 0x67, 0xbf, 0xd2, 0x0, 0x0, 0x0, 0x6b, 0xef, 0xeb, 0x60, 0x0, 0x0,
-
-    /* U+041F "П" */
-    0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2a, 0xe5, 0x55, 0x55, 0x55, 0x58, 0xf2, 0xad, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x2a, 0xd0, 0x0, 0x0, 0x0, 0x5, 0xf2, 0xad, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x2a, 0xd0, 0x0, 0x0, 0x0, 0x5, 0xf2, 0xad, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x2a, 0xd0, 0x0, 0x0, 0x0, 0x5, 0xf2, 0xad, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x2a, 0xd0, 0x0, 0x0, 0x0, 0x5, 0xf2, 0xad, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x2a, 0xd0, 0x0, 0x0, 0x0, 0x5, 0xf2, 0xad, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x2a, 0xd0, 0x0, 0x0, 0x0, 0x5, 0xf2, 0xad, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x20,
-
-    /* U+0420 "Р" */
-    0xaf, 0xff, 0xff, 0xfc, 0x70, 0x0, 0xae, 0x55, 0x55, 0x6a, 0xfd, 0x10, 0xad, 0x0, 0x0, 0x0, 0x3e, 0xa0, 0xad, 0x0, 0x0, 0x0, 0x7, 0xf1, 0xad, 0x0, 0x0, 0x0, 0x3, 0xf4, 0xad, 0x0, 0x0, 0x0, 0x2, 0xf4, 0xad, 0x0, 0x0, 0x0, 0x5, 0xf2, 0xad, 0x0, 0x0, 0x0, 0xd, 0xc0, 0xad, 0x11, 0x11, 0x26, 0xdf, 0x30, 0xaf, 0xff, 0xff, 0xff, 0xb2, 0x0, 0xae, 0x44, 0x44, 0x30, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0421 "С" */
-    0x0, 0x0, 0x6b, 0xef, 0xeb, 0x60, 0x0, 0x2, 0xdf, 0xb7, 0x57, 0xaf, 0xd2, 0x2, 0xed, 0x30, 0x0, 0x0, 0x2d, 0x40, 0xce, 0x10, 0x0, 0x0, 0x0, 0x0, 0x4f, 0x50, 0x0, 0x0, 0x0, 0x0, 0x9, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4f, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0xce, 0x10, 0x0, 0x0, 0x0, 0x0, 0x2, 0xed, 0x30, 0x0, 0x0, 0x3d, 0x40, 0x2, 0xdf, 0xb7, 0x67, 0xbf, 0xd1, 0x0, 0x0, 0x6b, 0xef, 0xeb, 0x60, 0x0,
-
-    /* U+0422 "Т" */
-    0xcf, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x45, 0x55, 0x5e, 0xb5, 0x55, 0x52, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x0, 0x0,
-
-    /* U+0423 "У" */
-    0x5f, 0x40, 0x0, 0x0, 0x0, 0x6, 0xf2, 0xc, 0xc0, 0x0, 0x0, 0x0, 0xd, 0x90, 0x4, 0xf3, 0x0, 0x0, 0x0, 0x6f, 0x10, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xd9, 0x0, 0x0, 0x4f, 0x30, 0x0, 0x6, 0xf1, 0x0, 0x0, 0xc, 0xb0, 0x0, 0xd, 0x80, 0x0, 0x0, 0x4, 0xf3, 0x0, 0x6f, 0x10, 0x0, 0x0, 0x0, 0xcb, 0x0, 0xd8, 0x0, 0x0, 0x0, 0x0, 0x4f, 0x36, 0xf1, 0x0, 0x0, 0x0, 0x0, 0xc, 0xbd, 0x70, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x86, 0xaf, 0x50, 0x0, 0x0, 0x0, 0x2, 0xdf, 0xd5, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0424 "Ф" */
-    0x0, 0x0, 0x0, 0x6, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x8c, 0xef, 0xff, 0xda, 0x50, 0x0, 0x0, 0xa, 0xfc, 0x75, 0xae, 0x46, 0xaf, 0xd3, 0x0, 0xc, 0xe4, 0x0, 0x8, 0xd0, 0x0, 0x1b, 0xf2, 0x6, 0xf3, 0x0, 0x0, 0x8d, 0x0, 0x0, 0xd, 0xc0, 0xca, 0x0, 0x0, 0x8, 0xd0, 0x0, 0x0, 0x5f, 0x2f, 0x70, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x2, 0xf4, 0xf7, 0x0, 0x0, 0x8, 0xd0, 0x0, 0x0, 0x1f, 0x5d, 0xa0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x4, 0xf2, 0x8f, 0x10, 0x0, 0x8, 0xd0, 0x0, 0x0, 0xbd, 0x0, 0xdd, 0x20, 0x0, 0x8d, 0x0, 0x0, 0x9f, 0x40, 0x2, 0xdf, 0x94, 0x28, 0xd1, 0x37, 0xdf, 0x50, 0x0, 0x0, 0x6b, 0xff, 0xff, 0xff, 0xd8, 0x10, 0x0, 0x0, 0x0, 0x0, 0x19, 0xe2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x59, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0425 "Х" */
-    0xd, 0xd0, 0x0, 0x0, 0x0, 0xdd, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x9f, 0x30, 0x0, 0x9f, 0x30, 0x0, 0x3f, 0x80, 0x0, 0x0, 0xdd, 0x0, 0xd, 0xd0, 0x0, 0x0, 0x3, 0xf8, 0x9, 0xf3, 0x0, 0x0, 0x0, 0x9, 0xf7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xe, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xdf, 0x40, 0x0, 0x0, 0x0, 0xd, 0xd0, 0xde, 0x0, 0x0, 0x0, 0x9, 0xf3, 0x3, 0xf9, 0x0, 0x0, 0x3, 0xf7, 0x0, 0x8, 0xf4, 0x0, 0x0, 0xdc, 0x0, 0x0, 0xd, 0xd0, 0x0, 0x9f, 0x20, 0x0, 0x0, 0x3f, 0x90, 0x3f, 0x70, 0x0, 0x0, 0x0, 0x8f, 0x30,
-
-    /* U+0426 "Ц" */
-    0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0xae, 0x55, 0x55, 0x55, 0x55, 0xdd, 0x55, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x37,
-
-    /* U+0427 "Ч" */
-    0xda, 0x0, 0x0, 0x0, 0x3, 0xf3, 0xda, 0x0, 0x0, 0x0, 0x3, 0xf3, 0xda, 0x0, 0x0, 0x0, 0x3, 0xf3, 0xda, 0x0, 0x0, 0x0, 0x3, 0xf3, 0xda, 0x0, 0x0, 0x0, 0x3, 0xf3, 0xca, 0x0, 0x0, 0x0, 0x3, 0xf3, 0xbd, 0x0, 0x0, 0x0, 0x3, 0xf3, 0x6f, 0x50, 0x0, 0x0, 0x4, 0xf3, 0xc, 0xf8, 0x21, 0x25, 0xaf, 0xf3, 0x1, 0x9f, 0xff, 0xff, 0xb8, 0xf3, 0x0, 0x0, 0x34, 0x20, 0x3, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf3,
-
-    /* U+0428 "Ш" */
-    0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0xae, 0x55, 0x55, 0x55, 0xdc, 0x55, 0x55, 0x55, 0xf8, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8,
-
-    /* U+0429 "Щ" */
-    0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xad, 0x0, 0x0, 0x0, 0xcb, 0x0, 0x0, 0x0, 0xf8, 0x0, 0xae, 0x55, 0x55, 0x55, 0xdc, 0x55, 0x55, 0x55, 0xfa, 0x53, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x55,
-
-    /* U+042A "Ъ" */
-    0xcf, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x55, 0x9f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, 0xff, 0xff, 0xc6, 0x0, 0x0, 0x0, 0x6f, 0x43, 0x33, 0x35, 0xbf, 0x90, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x8, 0xf3, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x1, 0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x1, 0xf6, 0x0, 0x0, 0x6f, 0x0, 0x0, 0x0, 0x9, 0xf1, 0x0, 0x0, 0x6f, 0x43, 0x33, 0x35, 0xbf, 0x60, 0x0, 0x0, 0x6f, 0xff, 0xff, 0xfe, 0xa3, 0x0,
-
-    /* U+042B "Ы" */
-    0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xaf, 0xff, 0xff, 0xfe, 0xb4, 0x0, 0x4, 0xf3, 0xad, 0x33, 0x33, 0x46, 0xcf, 0x60, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0xb, 0xf0, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x4, 0xf3, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x2, 0xf4, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x4, 0xf3, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0xc, 0xe0, 0x4, 0xf3, 0xad, 0x33, 0x33, 0x46, 0xdf, 0x40, 0x4, 0xf3, 0xaf, 0xff, 0xff, 0xfd, 0x92, 0x0, 0x4, 0xf3,
-
-    /* U+042C "Ь" */
-    0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0xff, 0xfe, 0xb4, 0x0, 0xad, 0x33, 0x33, 0x46, 0xcf, 0x60, 0xad, 0x0, 0x0, 0x0, 0xb, 0xf0, 0xad, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0x2, 0xf4, 0xad, 0x0, 0x0, 0x0, 0x4, 0xf3, 0xad, 0x0, 0x0, 0x0, 0xc, 0xe0, 0xad, 0x33, 0x33, 0x46, 0xdf, 0x40, 0xaf, 0xff, 0xff, 0xfd, 0x92, 0x0,
-
-    /* U+042D "Э" */
-    0x0, 0x39, 0xdf, 0xfd, 0x81, 0x0, 0x0, 0x8f, 0xd8, 0x66, 0x9f, 0xf4, 0x0, 0x1e, 0x70, 0x0, 0x0, 0x1b, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdb, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xd0, 0x0, 0xc, 0xff, 0xff, 0xff, 0xfe, 0x0, 0x0, 0x23, 0x33, 0x33, 0x3b, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x60, 0x0, 0x0, 0x0, 0x0, 0xc, 0xe0, 0x1c, 0x50, 0x0, 0x0, 0x1b, 0xf4, 0x0, 0x9f, 0xd8, 0x66, 0xaf, 0xf5, 0x0, 0x0, 0x3a, 0xdf, 0xfd, 0x81, 0x0, 0x0,
-
-    /* U+042E "Ю" */
-    0xad, 0x0, 0x0, 0x0, 0x3a, 0xef, 0xfc, 0x60, 0x0, 0xa, 0xd0, 0x0, 0x0, 0x9f, 0xb6, 0x45, 0x9f, 0xd2, 0x0, 0xad, 0x0, 0x0, 0xaf, 0x50, 0x0, 0x0, 0x2d, 0xe1, 0xa, 0xd0, 0x0, 0x5f, 0x50, 0x0, 0x0, 0x0, 0x1e, 0xa0, 0xad, 0x0, 0xc, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x1a, 0xd0, 0x1, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x1, 0xf6, 0xad, 0x11, 0x5f, 0x30, 0x0, 0x0, 0x0, 0x0, 0xe, 0x9a, 0xff, 0xff, 0xf2, 0x0, 0x0, 0x0, 0x0, 0x0, 0xda, 0xad, 0x44, 0x7f, 0x30, 0x0, 0x0, 0x0, 0x0, 0xe, 0x9a, 0xd0, 0x1, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x1, 0xf6, 0xad, 0x0, 0xc, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x1a, 0xd0, 0x0, 0x5f, 0x60, 0x0, 0x0, 0x0, 0x1e, 0xa0, 0xad, 0x0, 0x0, 0xaf, 0x50, 0x0, 0x0, 0x2d, 0xe1, 0xa, 0xd0, 0x0, 0x0, 0x9f, 0xb6, 0x45, 0x9f, 0xd2, 0x0, 0xad, 0x0, 0x0, 0x0, 0x3a, 0xef, 0xfc, 0x60, 0x0, 0x0,
-
-    /* U+042F "Я" */
-    0x0, 0x29, 0xef, 0xff, 0xff, 0xf4, 0x5, 0xfd, 0x85, 0x55, 0x57, 0xf4, 0x1f, 0xb0, 0x0, 0x0, 0x3, 0xf4, 0x7f, 0x10, 0x0, 0x0, 0x3, 0xf4, 0xad, 0x0, 0x0, 0x0, 0x3, 0xf4, 0xad, 0x0, 0x0, 0x0, 0x3, 0xf4, 0x8f, 0x0, 0x0, 0x0, 0x3, 0xf4, 0x3f, 0x70, 0x0, 0x0, 0x3, 0xf4, 0x9, 0xf8, 0x31, 0x0, 0x3, 0xf4, 0x0, 0x7e, 0xff, 0xff, 0xff, 0xf4, 0x0, 0xd, 0xb3, 0x33, 0x36, 0xf4, 0x0, 0x7f, 0x10, 0x0, 0x3, 0xf4, 0x2, 0xf7, 0x0, 0x0, 0x3, 0xf4, 0xb, 0xd0, 0x0, 0x0, 0x3, 0xf4, 0x6f, 0x30, 0x0, 0x0, 0x3, 0xf4,
-
-    /* U+0430 "а" */
-    0x4, 0xae, 0xff, 0xb3, 0x6, 0xfb, 0x64, 0x6d, 0xf3, 0x14, 0x0, 0x0, 0xe, 0xa0, 0x0, 0x0, 0x0, 0x9d, 0x0, 0x0, 0x0, 0x8, 0xe0, 0x6c, 0xef, 0xff, 0xfe, 0x7f, 0x73, 0x22, 0x29, 0xed, 0x90, 0x0, 0x0, 0x8e, 0xd9, 0x0, 0x0, 0xd, 0xe7, 0xf6, 0x11, 0x4c, 0xce, 0x6, 0xdf, 0xfc, 0x57, 0xe0,
-
-    /* U+0431 "б" */
-    0x0, 0x0, 0x0, 0x0, 0x4, 0x30, 0x0, 0x0, 0x5, 0x9d, 0xff, 0x80, 0x0, 0x8, 0xff, 0xd9, 0x52, 0x0, 0x0, 0xcf, 0x71, 0x0, 0x0, 0x0, 0x8, 0xe2, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x60, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x5, 0xcf, 0xfe, 0x80, 0x0, 0x8d, 0x8e, 0x74, 0x49, 0xfd, 0x0, 0xae, 0xd1, 0x0, 0x0, 0x3f, 0x90, 0xaf, 0x50, 0x0, 0x0, 0x9, 0xf0, 0x9f, 0x10, 0x0, 0x0, 0x5, 0xf2, 0x6f, 0x10, 0x0, 0x0, 0x5, 0xf1, 0x2f, 0x60, 0x0, 0x0, 0x9, 0xe0, 0xb, 0xe2, 0x0, 0x0, 0x4f, 0x70, 0x1, 0xee, 0x74, 0x48, 0xfb, 0x0, 0x0, 0x19, 0xef, 0xfc, 0x60, 0x0,
-
-    /* U+0432 "в" */
-    0xff, 0xff, 0xff, 0xb3, 0xf, 0x72, 0x22, 0x4b, 0xf2, 0xf6, 0x0, 0x0, 0xf, 0x7f, 0x60, 0x0, 0x0, 0xf6, 0xf6, 0x0, 0x1, 0x9e, 0x1f, 0xff, 0xff, 0xff, 0x50, 0xf7, 0x22, 0x22, 0x6f, 0x6f, 0x60, 0x0, 0x0, 0xac, 0xf6, 0x0, 0x0, 0xa, 0xdf, 0x82, 0x22, 0x37, 0xf7, 0xff, 0xff, 0xff, 0xd7, 0x0,
-
-    /* U+0433 "г" */
-    0xff, 0xff, 0xff, 0xf7, 0xf9, 0x44, 0x44, 0x42, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0,
-
-    /* U+0434 "д" */
-    0x0, 0x2f, 0xff, 0xff, 0xff, 0xa0, 0x0, 0x2, 0xf6, 0x44, 0x44, 0xda, 0x0, 0x0, 0x3f, 0x10, 0x0, 0xc, 0xa0, 0x0, 0x4, 0xf0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x5f, 0x0, 0x0, 0xc, 0xa0, 0x0, 0x6, 0xe0, 0x0, 0x0, 0xca, 0x0, 0x0, 0x7d, 0x0, 0x0, 0xc, 0xa0, 0x0, 0xa, 0xa0, 0x0, 0x0, 0xca, 0x0, 0x0, 0xe6, 0x0, 0x0, 0xc, 0xa0, 0x3, 0xaf, 0x44, 0x44, 0x44, 0xdb, 0x41, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4d, 0x80, 0x0, 0x0, 0x0, 0x1, 0xf4, 0xd8, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x46, 0x40, 0x0, 0x0, 0x0, 0x0, 0x82,
-
-    /* U+0435 "е" */
-    0x0, 0x4b, 0xff, 0xc6, 0x0, 0x0, 0x7f, 0xa5, 0x48, 0xfa, 0x0, 0x3f, 0x50, 0x0, 0x3, 0xf6, 0xa, 0xb0, 0x0, 0x0, 0x8, 0xe0, 0xe7, 0x0, 0x0, 0x0, 0x3f, 0x2f, 0xfe, 0xee, 0xee, 0xef, 0xf3, 0xe8, 0x11, 0x11, 0x11, 0x11, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x51, 0x0, 0x6f, 0xc7, 0x56, 0xbf, 0x40, 0x0, 0x3a, 0xef, 0xea, 0x30, 0x0,
-
-    /* U+0436 "ж" */
-    0x1f, 0x80, 0x0, 0x7, 0xf0, 0x0, 0x1, 0xe8, 0x0, 0x6f, 0x20, 0x0, 0x7f, 0x0, 0x0, 0x9e, 0x0, 0x0, 0xcb, 0x0, 0x7, 0xf0, 0x0, 0x3f, 0x40, 0x0, 0x2, 0xf5, 0x0, 0x7f, 0x0, 0xd, 0xa0, 0x0, 0x0, 0x7, 0xe1, 0x7, 0xf0, 0x7, 0xe1, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x9, 0xf4, 0x39, 0xf3, 0x39, 0xf2, 0x0, 0x0, 0x4, 0xf6, 0x0, 0x7f, 0x0, 0xd, 0xc0, 0x0, 0x1, 0xeb, 0x0, 0x7, 0xf0, 0x0, 0x3f, 0x70, 0x0, 0xaf, 0x10, 0x0, 0x7f, 0x0, 0x0, 0x8f, 0x30, 0x5f, 0x60, 0x0, 0x7, 0xf0, 0x0, 0x0, 0xdd, 0x0,
-
-    /* U+0437 "з" */
-    0x2, 0x9e, 0xff, 0xc6, 0x0, 0xc, 0xc7, 0x56, 0xaf, 0xa0, 0x1, 0x0, 0x0, 0x8, 0xf1, 0x0, 0x0, 0x0, 0x5, 0xf1, 0x0, 0x0, 0x0, 0x3d, 0x90, 0x0, 0x9, 0xff, 0xfb, 0x0, 0x0, 0x1, 0x22, 0x4c, 0xe1, 0x0, 0x0, 0x0, 0x1, 0xf7, 0x1, 0x0, 0x0, 0x3, 0xf6, 0x3f, 0xa6, 0x45, 0x8f, 0xc0, 0x3, 0xae, 0xff, 0xc7, 0x0,
-
-    /* U+0438 "и" */
-    0xf7, 0x0, 0x0, 0x1, 0xdb, 0xf7, 0x0, 0x0, 0xb, 0xfb, 0xf7, 0x0, 0x0, 0x8f, 0xdb, 0xf7, 0x0, 0x5, 0xf4, 0xbb, 0xf7, 0x0, 0x3f, 0x70, 0xbb, 0xf7, 0x1, 0xea, 0x0, 0xbb, 0xf7, 0xc, 0xd0, 0x0, 0xbb, 0xf7, 0x9f, 0x20, 0x0, 0xbb, 0xfc, 0xf4, 0x0, 0x0, 0xbb, 0xff, 0x70, 0x0, 0x0, 0xbb, 0xfb, 0x0, 0x0, 0x0, 0xbb,
-
-    /* U+0439 "й" */
-    0x2, 0xe0, 0x0, 0x5b, 0x0, 0x0, 0xd7, 0x1, 0xc6, 0x0, 0x0, 0x2b, 0xed, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x1, 0xdb, 0xf7, 0x0, 0x0, 0xb, 0xfb, 0xf7, 0x0, 0x0, 0x8f, 0xdb, 0xf7, 0x0, 0x5, 0xf4, 0xbb, 0xf7, 0x0, 0x3f, 0x70, 0xbb, 0xf7, 0x1, 0xea, 0x0, 0xbb, 0xf7, 0xc, 0xd0, 0x0, 0xbb, 0xf7, 0x9f, 0x20, 0x0, 0xbb, 0xfc, 0xf4, 0x0, 0x0, 0xbb, 0xff, 0x70, 0x0, 0x0, 0xbb, 0xfb, 0x0, 0x0, 0x0, 0xbb,
-
-    /* U+043A "к" */
-    0xf7, 0x0, 0x0, 0xc, 0xb0, 0xf7, 0x0, 0x0, 0x9e, 0x10, 0xf7, 0x0, 0x5, 0xf3, 0x0, 0xf7, 0x0, 0x2e, 0x70, 0x0, 0xf7, 0x0, 0xca, 0x0, 0x0, 0xff, 0xff, 0xf2, 0x0, 0x0, 0xf9, 0x33, 0xdc, 0x0, 0x0, 0xf7, 0x0, 0x2f, 0x90, 0x0, 0xf7, 0x0, 0x5, 0xf6, 0x0, 0xf7, 0x0, 0x0, 0x7f, 0x30, 0xf7, 0x0, 0x0, 0xa, 0xe1,
-
-    /* U+043B "л" */
-    0x0, 0x1f, 0xff, 0xff, 0xff, 0xa0, 0x2, 0xf6, 0x44, 0x44, 0xda, 0x0, 0x3f, 0x10, 0x0, 0xc, 0xa0, 0x3, 0xf0, 0x0, 0x0, 0xca, 0x0, 0x4f, 0x0, 0x0, 0xc, 0xa0, 0x5, 0xe0, 0x0, 0x0, 0xca, 0x0, 0x7d, 0x0, 0x0, 0xc, 0xa0, 0x9, 0xb0, 0x0, 0x0, 0xca, 0x0, 0xd7, 0x0, 0x0, 0xc, 0xa3, 0x8f, 0x20, 0x0, 0x0, 0xca, 0xdf, 0x60, 0x0, 0x0, 0xc, 0xa0,
-
-    /* U+043C "м" */
-    0xfb, 0x0, 0x0, 0x0, 0x0, 0xdc, 0xff, 0x40, 0x0, 0x0, 0x6, 0xfc, 0xfd, 0xd0, 0x0, 0x0, 0xe, 0xdc, 0xf5, 0xe6, 0x0, 0x0, 0x8c, 0x8c, 0xf5, 0x6e, 0x10, 0x2, 0xf3, 0x8c, 0xf5, 0xc, 0x80, 0xb, 0x90, 0x8c, 0xf5, 0x3, 0xf2, 0x4f, 0x10, 0x8c, 0xf5, 0x0, 0xab, 0xd7, 0x0, 0x8c, 0xf5, 0x0, 0x2f, 0xd0, 0x0, 0x8c, 0xf5, 0x0, 0x6, 0x40, 0x0, 0x8c, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x8c,
-
-    /* U+043D "н" */
-    0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf9, 0x33, 0x33, 0x33, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7,
-
-    /* U+043E "о" */
-    0x0, 0x3b, 0xef, 0xe9, 0x10, 0x0, 0x6f, 0xb6, 0x47, 0xde, 0x30, 0x3f, 0x80, 0x0, 0x0, 0xce, 0xa, 0xd0, 0x0, 0x0, 0x2, 0xf6, 0xe8, 0x0, 0x0, 0x0, 0xd, 0x9f, 0x70, 0x0, 0x0, 0x0, 0xbb, 0xe8, 0x0, 0x0, 0x0, 0xd, 0x9a, 0xd0, 0x0, 0x0, 0x2, 0xf5, 0x3f, 0x90, 0x0, 0x1, 0xcd, 0x0, 0x6f, 0xc6, 0x57, 0xee, 0x20, 0x0, 0x3b, 0xef, 0xe9, 0x10, 0x0,
-
-    /* U+043F "п" */
-    0xff, 0xff, 0xff, 0xff, 0xf7, 0xf9, 0x44, 0x44, 0x44, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7, 0xf7, 0x0, 0x0, 0x0, 0xf7,
-
-    /* U+0440 "р" */
-    0xf6, 0x19, 0xef, 0xe9, 0x10, 0xf, 0x8e, 0xb6, 0x47, 0xee, 0x30, 0xff, 0x80, 0x0, 0x1, 0xce, 0xf, 0xd0, 0x0, 0x0, 0x2, 0xf5, 0xf8, 0x0, 0x0, 0x0, 0xd, 0x9f, 0x70, 0x0, 0x0, 0x0, 0xba, 0xf8, 0x0, 0x0, 0x0, 0xd, 0x9f, 0xd0, 0x0, 0x0, 0x2, 0xf5, 0xff, 0x80, 0x0, 0x1, 0xcd, 0xf, 0x9e, 0xc6, 0x57, 0xee, 0x30, 0xf7, 0x19, 0xef, 0xe9, 0x10, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0441 "с" */
-    0x0, 0x3a, 0xef, 0xe9, 0x10, 0x6, 0xfc, 0x64, 0x7d, 0xe2, 0x3f, 0x80, 0x0, 0x0, 0xa2, 0xad, 0x0, 0x0, 0x0, 0x0, 0xe8, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xe8, 0x0, 0x0, 0x0, 0x0, 0xad, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x90, 0x0, 0x0, 0xa2, 0x6, 0xfc, 0x65, 0x7e, 0xe2, 0x0, 0x3a, 0xef, 0xe9, 0x10,
-
-    /* U+0442 "т" */
-    0xff, 0xff, 0xff, 0xff, 0xf6, 0x44, 0x44, 0xf9, 0x44, 0x42, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0,
-
-    /* U+0443 "у" */
-    0xa, 0xd0, 0x0, 0x0, 0x0, 0xab, 0x3, 0xf4, 0x0, 0x0, 0x1, 0xf4, 0x0, 0xcb, 0x0, 0x0, 0x8, 0xd0, 0x0, 0x5f, 0x20, 0x0, 0xe, 0x70, 0x0, 0xe, 0x90, 0x0, 0x5f, 0x0, 0x0, 0x7, 0xf0, 0x0, 0xc9, 0x0, 0x0, 0x1, 0xf6, 0x3, 0xf2, 0x0, 0x0, 0x0, 0x9d, 0xa, 0xb0, 0x0, 0x0, 0x0, 0x2f, 0x6f, 0x40, 0x0, 0x0, 0x0, 0xb, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x5, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x6, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xe, 0x80, 0x0, 0x0, 0x1c, 0x65, 0xbe, 0x10, 0x0, 0x0, 0x9, 0xef, 0xc2, 0x0, 0x0, 0x0,
-
-    /* U+0444 "ф" */
-    0x0, 0x0, 0x0, 0x6, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0x80, 0x0, 0x0, 0x0, 0x0, 0x18, 0xcf, 0xff, 0xeb, 0x60, 0x0, 0x0, 0x5f, 0xe8, 0x5e, 0xa6, 0xaf, 0xd2, 0x0, 0x3f, 0x90, 0x0, 0xd8, 0x0, 0x2d, 0xd0, 0xb, 0xd0, 0x0, 0xd, 0x80, 0x0, 0x2f, 0x60, 0xe7, 0x0, 0x0, 0xd8, 0x0, 0x0, 0xca, 0xf, 0x60, 0x0, 0xd, 0x80, 0x0, 0xb, 0xb0, 0xe7, 0x0, 0x0, 0xd8, 0x0, 0x0, 0xca, 0xb, 0xd0, 0x0, 0xd, 0x80, 0x0, 0x2f, 0x60, 0x3f, 0xa0, 0x0, 0xd8, 0x0, 0x2d, 0xd0, 0x0, 0x5f, 0xe8, 0x5e, 0xa6, 0xaf, 0xd2, 0x0, 0x0, 0x18, 0xcf, 0xff, 0xeb, 0x60, 0x0, 0x0, 0x0, 0x0, 0xd, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd8, 0x0, 0x0, 0x0,
-
-    /* U+0445 "х" */
-    0x2f, 0x70, 0x0, 0x1, 0xe9, 0x0, 0x6f, 0x30, 0x0, 0xad, 0x0, 0x0, 0xad, 0x0, 0x6f, 0x20, 0x0, 0x0, 0xda, 0x2f, 0x60, 0x0, 0x0, 0x3, 0xfe, 0xa0, 0x0, 0x0, 0x0, 0xb, 0xf3, 0x0, 0x0, 0x0, 0x6, 0xfc, 0xd0, 0x0, 0x0, 0x2, 0xf7, 0x1e, 0x90, 0x0, 0x0, 0xdb, 0x0, 0x3f, 0x50, 0x0, 0x9e, 0x10, 0x0, 0x8f, 0x20, 0x5f, 0x40, 0x0, 0x0, 0xcd, 0x0,
-
-    /* U+0446 "ц" */
-    0xf7, 0x0, 0x0, 0x2, 0xf4, 0xf, 0x70, 0x0, 0x0, 0x2f, 0x40, 0xf7, 0x0, 0x0, 0x2, 0xf4, 0xf, 0x70, 0x0, 0x0, 0x2f, 0x40, 0xf7, 0x0, 0x0, 0x2, 0xf4, 0xf, 0x70, 0x0, 0x0, 0x2f, 0x40, 0xf7, 0x0, 0x0, 0x2, 0xf4, 0xf, 0x70, 0x0, 0x0, 0x2f, 0x40, 0xf7, 0x0, 0x0, 0x2, 0xf4, 0xf, 0x94, 0x44, 0x44, 0x6f, 0x74, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x5, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x27,
-
-    /* U+0447 "ч" */
-    0x1f, 0x50, 0x0, 0x0, 0x7f, 0x1f, 0x50, 0x0, 0x0, 0x7f, 0x1f, 0x50, 0x0, 0x0, 0x7f, 0xf, 0x50, 0x0, 0x0, 0x7f, 0xf, 0x80, 0x0, 0x0, 0x7f, 0x9, 0xf6, 0x10, 0x26, 0xdf, 0x0, 0x9f, 0xff, 0xfc, 0xbf, 0x0, 0x0, 0x22, 0x0, 0x7f, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0x0, 0x7f,
-
-    /* U+0448 "ш" */
-    0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x8f, 0x70, 0x0, 0x6, 0xf0, 0x0, 0x0, 0xe8, 0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x8f, 0x70, 0x0, 0x6, 0xf0, 0x0, 0x0, 0xe8, 0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x8f, 0x70, 0x0, 0x6, 0xf0, 0x0, 0x0, 0xe8, 0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x8f, 0x70, 0x0, 0x6, 0xf0, 0x0, 0x0, 0xe8, 0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x8f, 0x94, 0x44, 0x49, 0xf4, 0x44, 0x44, 0xe8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80,
-
-    /* U+0449 "щ" */
-    0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x80, 0xf, 0x70, 0x0, 0x6, 0xf0, 0x0, 0x0, 0xe8, 0x0, 0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x80, 0xf, 0x70, 0x0, 0x6, 0xf0, 0x0, 0x0, 0xe8, 0x0, 0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x80, 0xf, 0x70, 0x0, 0x6, 0xf0, 0x0, 0x0, 0xe8, 0x0, 0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x80, 0xf, 0x70, 0x0, 0x6, 0xf0, 0x0, 0x0, 0xe8, 0x0, 0xf7, 0x0, 0x0, 0x6f, 0x0, 0x0, 0xe, 0x80, 0xf, 0x94, 0x44, 0x49, 0xf4, 0x44, 0x44, 0xea, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x81,
-
-    /* U+044A "ъ" */
-    0xff, 0xff, 0xb0, 0x0, 0x0, 0x0, 0x44, 0x4c, 0xb0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xb0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xb0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xff, 0xff, 0xeb, 0x30, 0x0, 0xb, 0xc2, 0x22, 0x4b, 0xf3, 0x0, 0xb, 0xb0, 0x0, 0x0, 0xe9, 0x0, 0xb, 0xb0, 0x0, 0x0, 0xbb, 0x0, 0xb, 0xb0, 0x0, 0x0, 0xe9, 0x0, 0xb, 0xc2, 0x22, 0x4b, 0xf3, 0x0, 0xb, 0xff, 0xff, 0xeb, 0x30,
-
-    /* U+044B "ы" */
-    0xf7, 0x0, 0x0, 0x0, 0x0, 0xbb, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xbb, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xbb, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xbb, 0xff, 0xff, 0xfd, 0x91, 0x0, 0xbb, 0xf8, 0x22, 0x25, 0xde, 0x0, 0xbb, 0xf7, 0x0, 0x0, 0x2f, 0x60, 0xbb, 0xf7, 0x0, 0x0, 0xf, 0x70, 0xbb, 0xf7, 0x0, 0x0, 0x2f, 0x50, 0xbb, 0xf7, 0x11, 0x15, 0xdd, 0x0, 0xbb, 0xff, 0xff, 0xfd, 0x91, 0x0, 0xbb,
-
-    /* U+044C "ь" */
-    0xf7, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0xf7, 0x0, 0x0, 0x0, 0xf, 0x70, 0x0, 0x0, 0x0, 0xff, 0xff, 0xfe, 0xa2, 0xf, 0x82, 0x22, 0x4c, 0xe1, 0xf7, 0x0, 0x0, 0x1f, 0x7f, 0x70, 0x0, 0x0, 0xe9, 0xf7, 0x0, 0x0, 0x1f, 0x7f, 0x81, 0x12, 0x4c, 0xe1, 0xff, 0xff, 0xfe, 0x91, 0x0,
-
-    /* U+044D "э" */
-    0x1, 0x9d, 0xff, 0xc6, 0x0, 0x2, 0xfc, 0x63, 0x48, 0xfb, 0x0, 0x5, 0x0, 0x0, 0x2, 0xe9, 0x0, 0x0, 0x0, 0x0, 0x5, 0xf1, 0x0, 0x0, 0x0, 0x0, 0xf, 0x50, 0x0, 0x8f, 0xff, 0xff, 0xf7, 0x0, 0x1, 0x22, 0x22, 0x2f, 0x50, 0x0, 0x0, 0x0, 0x5, 0xf1, 0x3, 0x0, 0x0, 0x2, 0xe9, 0x2, 0xfb, 0x63, 0x48, 0xfb, 0x0, 0x2, 0x9d, 0xff, 0xc6, 0x0, 0x0,
-
-    /* U+044E "ю" */
-    0xf7, 0x0, 0x0, 0x5c, 0xff, 0xc6, 0x0, 0xf, 0x70, 0x0, 0x9f, 0x84, 0x37, 0xfb, 0x0, 0xf7, 0x0, 0x6f, 0x40, 0x0, 0x2, 0xf8, 0xf, 0x70, 0xd, 0xa0, 0x0, 0x0, 0x8, 0xf0, 0xf7, 0x12, 0xf5, 0x0, 0x0, 0x0, 0x3f, 0x3f, 0xff, 0xff, 0x30, 0x0, 0x0, 0x2, 0xf4, 0xf9, 0x45, 0xf5, 0x0, 0x0, 0x0, 0x3f, 0x3f, 0x70, 0xd, 0xa0, 0x0, 0x0, 0x8, 0xe0, 0xf7, 0x0, 0x6f, 0x40, 0x0, 0x3, 0xf7, 0xf, 0x70, 0x0, 0x9f, 0x84, 0x37, 0xfb, 0x0, 0xf7, 0x0, 0x0, 0x5c, 0xff, 0xc6, 0x0, 0x0,
-
-    /* U+044F "я" */
-    0x2, 0xae, 0xff, 0xff, 0xf1, 0x3f, 0xd7, 0x44, 0x47, 0xf1, 0xae, 0x0, 0x0, 0x3, 0xf1, 0xca, 0x0, 0x0, 0x3, 0xf1, 0xbc, 0x0, 0x0, 0x3, 0xf1, 0x4f, 0x81, 0x0, 0x3, 0xf1, 0x5, 0xdf, 0xff, 0xff, 0xf1, 0x0, 0x9d, 0x22, 0x25, 0xf1, 0x4, 0xf4, 0x0, 0x3, 0xf1, 0xd, 0x90, 0x0, 0x3, 0xf1, 0x8e, 0x10, 0x0, 0x3, 0xf1,
-
-    /* U+0451 "ё" */
-    0x0, 0x5e, 0x10, 0xc9, 0x0, 0x0, 0x3, 0xb1, 0x9, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4b, 0xff, 0xc6, 0x0, 0x0, 0x7f, 0xa5, 0x48, 0xfa, 0x0, 0x3f, 0x50, 0x0, 0x3, 0xf6, 0xa, 0xb0, 0x0, 0x0, 0x8, 0xe0, 0xe7, 0x0, 0x0, 0x0, 0x3f, 0x2f, 0xfe, 0xee, 0xee, 0xef, 0xf3, 0xe8, 0x11, 0x11, 0x11, 0x11, 0xa, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x51, 0x0, 0x6f, 0xc7, 0x56, 0xbf, 0x40, 0x0, 0x3a, 0xef, 0xea, 0x30, 0x0};
-
-/*---------------------
- *  GLYPH DESCRIPTION
- *--------------------*/
-
-static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {{.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
-                                                        {.bitmap_index = 0, .adv_w = 84, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 0, .adv_w = 83, .box_w = 3, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 23, .adv_w = 119, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 9},
-                                                        {.bitmap_index = 41, .adv_w = 223, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 146, .adv_w = 197, .box_w = 12, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
-                                                        {.bitmap_index = 266, .adv_w = 265, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 386, .adv_w = 214, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -1},
-                                                        {.bitmap_index = 498, .adv_w = 65, .box_w = 2, .box_h = 6, .ofs_x = 1, .ofs_y = 9},
-                                                        {.bitmap_index = 504, .adv_w = 105, .box_w = 4, .box_h = 19, .ofs_x = 2, .ofs_y = -4},
-                                                        {.bitmap_index = 542, .adv_w = 105, .box_w = 5, .box_h = 19, .ofs_x = 0, .ofs_y = -4},
-                                                        {.bitmap_index = 590, .adv_w = 124, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = 7},
-                                                        {.bitmap_index = 622, .adv_w = 184, .box_w = 10, .box_h = 10, .ofs_x = 1, .ofs_y = 2},
-                                                        {.bitmap_index = 672, .adv_w = 68, .box_w = 3, .box_h = 6, .ofs_x = 1, .ofs_y = -3},
-                                                        {.bitmap_index = 681, .adv_w = 122, .box_w = 6, .box_h = 3, .ofs_x = 1, .ofs_y = 4},
-                                                        {.bitmap_index = 690, .adv_w = 68, .box_w = 3, .box_h = 3, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 695, .adv_w = 107, .box_w = 9, .box_h = 20, .ofs_x = -1, .ofs_y = -2},
-                                                        {.bitmap_index = 785, .adv_w = 212, .box_w = 12, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 875, .adv_w = 116, .box_w = 5, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 913, .adv_w = 182, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 996, .adv_w = 180, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 1079, .adv_w = 212, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 1177, .adv_w = 181, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 1260, .adv_w = 195, .box_w = 11, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 1343, .adv_w = 188, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 1426, .adv_w = 204, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 1516, .adv_w = 195, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 1606, .adv_w = 68, .box_w = 3, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 1623, .adv_w = 68, .box_w = 3, .box_h = 14, .ofs_x = 1, .ofs_y = -3},
-                                                        {.bitmap_index = 1644, .adv_w = 184, .box_w = 10, .box_h = 10, .ofs_x = 1, .ofs_y = 2},
-                                                        {.bitmap_index = 1694, .adv_w = 184, .box_w = 10, .box_h = 8, .ofs_x = 1, .ofs_y = 3},
-                                                        {.bitmap_index = 1734, .adv_w = 184, .box_w = 10, .box_h = 10, .ofs_x = 1, .ofs_y = 2},
-                                                        {.bitmap_index = 1784, .adv_w = 181, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 1859, .adv_w = 331, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -4},
-                                                        {.bitmap_index = 2040, .adv_w = 229, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 2153, .adv_w = 241, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 2243, .adv_w = 230, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 2341, .adv_w = 264, .box_w = 14, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 2446, .adv_w = 214, .box_w = 11, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 2529, .adv_w = 203, .box_w = 10, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 2604, .adv_w = 247, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 2702, .adv_w = 260, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 2792, .adv_w = 97, .box_w = 2, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 2807, .adv_w = 160, .box_w = 9, .box_h = 15, .ofs_x = -1, .ofs_y = 0},
-                                                        {.bitmap_index = 2875, .adv_w = 228, .box_w = 13, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 2973, .adv_w = 188, .box_w = 10, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 3048, .adv_w = 306, .box_w = 15, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 3161, .adv_w = 260, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 3251, .adv_w = 268, .box_w = 15, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 3364, .adv_w = 230, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 3454, .adv_w = 268, .box_w = 16, .box_h = 19, .ofs_x = 1, .ofs_y = -4},
-                                                        {.bitmap_index = 3606, .adv_w = 231, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 3696, .adv_w = 197, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 3786, .adv_w = 184, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 3876, .adv_w = 253, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 3966, .adv_w = 223, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 4071, .adv_w = 356, .box_w = 22, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 4236, .adv_w = 210, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 4334, .adv_w = 203, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 4432, .adv_w = 208, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 4530, .adv_w = 102, .box_w = 4, .box_h = 19, .ofs_x = 2, .ofs_y = -4},
-                                                        {.bitmap_index = 4568, .adv_w = 107, .box_w = 9, .box_h = 20, .ofs_x = -1, .ofs_y = -2},
-                                                        {.bitmap_index = 4658, .adv_w = 102, .box_w = 5, .box_h = 19, .ofs_x = 0, .ofs_y = -4},
-                                                        {.bitmap_index = 4706, .adv_w = 184, .box_w = 9, .box_h = 9, .ofs_x = 1, .ofs_y = 3},
-                                                        {.bitmap_index = 4747, .adv_w = 160, .box_w = 10, .box_h = 1, .ofs_x = 0, .ofs_y = -1},
-                                                        {.bitmap_index = 4752, .adv_w = 192, .box_w = 6, .box_h = 3, .ofs_x = 2, .ofs_y = 13},
-                                                        {.bitmap_index = 4761, .adv_w = 189, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 4811, .adv_w = 217, .box_w = 12, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 4901, .adv_w = 180, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 4962, .adv_w = 217, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 5052, .adv_w = 193, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 5118, .adv_w = 108, .box_w = 8, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 5178, .adv_w = 219, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -4},
-                                                        {.bitmap_index = 5268, .adv_w = 216, .box_w = 11, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 5351, .adv_w = 86, .box_w = 3, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 5374, .adv_w = 88, .box_w = 6, .box_h = 19, .ofs_x = -2, .ofs_y = -4},
-                                                        {.bitmap_index = 5431, .adv_w = 192, .box_w = 11, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 5514, .adv_w = 86, .box_w = 3, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 5537, .adv_w = 340, .box_w = 19, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 5642, .adv_w = 216, .box_w = 11, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 5703, .adv_w = 201, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 5769, .adv_w = 217, .box_w = 12, .box_h = 15, .ofs_x = 1, .ofs_y = -4},
-                                                        {.bitmap_index = 5859, .adv_w = 217, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -4},
-                                                        {.bitmap_index = 5949, .adv_w = 128, .box_w = 7, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 5988, .adv_w = 156, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 6043, .adv_w = 130, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 6099, .adv_w = 215, .box_w = 11, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 6160, .adv_w = 173, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 6221, .adv_w = 281, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 6320, .adv_w = 171, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 6381, .adv_w = 173, .box_w = 12, .box_h = 15, .ofs_x = -1, .ofs_y = -4},
-                                                        {.bitmap_index = 6471, .adv_w = 164, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 6526, .adv_w = 107, .box_w = 6, .box_h = 19, .ofs_x = 1, .ofs_y = -4},
-                                                        {.bitmap_index = 6583, .adv_w = 94, .box_w = 2, .box_h = 19, .ofs_x = 2, .ofs_y = -4},
-                                                        {.bitmap_index = 6602, .adv_w = 107, .box_w = 6, .box_h = 19, .ofs_x = 0, .ofs_y = -4},
-                                                        {.bitmap_index = 6659, .adv_w = 184, .box_w = 10, .box_h = 4, .ofs_x = 1, .ofs_y = 5},
-                                                        {.bitmap_index = 6679, .adv_w = 211, .box_w = 11, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 6778, .adv_w = 238, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 6891, .adv_w = 232, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 6981, .adv_w = 240, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 7071, .adv_w = 183, .box_w = 10, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 7146, .adv_w = 254, .box_w = 16, .box_h = 19, .ofs_x = 0, .ofs_y = -4},
-                                                        {.bitmap_index = 7298, .adv_w = 211, .box_w = 11, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 7381, .adv_w = 324, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 7531, .adv_w = 204, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -1},
-                                                        {.bitmap_index = 7627, .adv_w = 264, .box_w = 13, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 7725, .adv_w = 264, .box_w = 13, .box_h = 19, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 7849, .adv_w = 225, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 7939, .adv_w = 251, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 8044, .adv_w = 308, .box_w = 15, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 8157, .adv_w = 263, .box_w = 13, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 8255, .adv_w = 272, .box_w = 15, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 8368, .adv_w = 264, .box_w = 13, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 8466, .adv_w = 227, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 8556, .adv_w = 229, .box_w = 13, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 8654, .adv_w = 188, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 8744, .adv_w = 218, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 8849, .adv_w = 293, .box_w = 17, .box_h = 16, .ofs_x = 1, .ofs_y = -1},
-                                                        {.bitmap_index = 8985, .adv_w = 208, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 9083, .adv_w = 265, .box_w = 14, .box_h = 19, .ofs_x = 2, .ofs_y = -4},
-                                                        {.bitmap_index = 9216, .adv_w = 234, .box_w = 12, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 9306, .adv_w = 350, .box_w = 18, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 9441, .adv_w = 357, .box_w = 20, .box_h = 19, .ofs_x = 2, .ofs_y = -4},
-                                                        {.bitmap_index = 9631, .adv_w = 262, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 9751, .adv_w = 313, .box_w = 16, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 9871, .adv_w = 227, .box_w = 12, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 9961, .adv_w = 226, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 10059, .adv_w = 349, .box_w = 19, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 10202, .adv_w = 234, .box_w = 12, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 10292, .adv_w = 187, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 10342, .adv_w = 211, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 10438, .adv_w = 195, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 10488, .adv_w = 152, .box_w = 8, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 10532, .adv_w = 208, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -3},
-                                                        {.bitmap_index = 10623, .adv_w = 198, .box_w = 11, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 10684, .adv_w = 264, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 10778, .adv_w = 171, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 10833, .adv_w = 220, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 10888, .adv_w = 220, .box_w = 10, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 10963, .adv_w = 186, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 11018, .adv_w = 202, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 11079, .adv_w = 253, .box_w = 12, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 11145, .adv_w = 216, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 11200, .adv_w = 204, .box_w = 11, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 11261, .adv_w = 216, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 11316, .adv_w = 220, .box_w = 11, .box_h = 15, .ofs_x = 2, .ofs_y = -4},
-                                                        {.bitmap_index = 11399, .adv_w = 180, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 11454, .adv_w = 151, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 11509, .adv_w = 179, .box_w = 12, .box_h = 15, .ofs_x = -1, .ofs_y = -4},
-                                                        {.bitmap_index = 11599, .adv_w = 251, .box_w = 15, .box_h = 20, .ofs_x = 0, .ofs_y = -4},
-                                                        {.bitmap_index = 11749, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 11810, .adv_w = 219, .box_w = 11, .box_h = 14, .ofs_x = 2, .ofs_y = -3},
-                                                        {.bitmap_index = 11887, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 11942, .adv_w = 297, .box_w = 15, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 12025, .adv_w = 297, .box_w = 17, .box_h = 14, .ofs_x = 2, .ofs_y = -3},
-                                                        {.bitmap_index = 12144, .adv_w = 199, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 12210, .adv_w = 251, .box_w = 12, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 12276, .adv_w = 180, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 12326, .adv_w = 183, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 12387, .adv_w = 277, .box_w = 15, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 12470, .adv_w = 194, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 12525, .adv_w = 198, .box_w = 11, .box_h = 15, .ofs_x = 1, .ofs_y = 0}};
-
-/*---------------------
- *  CHARACTER MAPPING
- *--------------------*/
-
-/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {{.range_start = 32, .range_length = 95, .glyph_id_start = 1, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY}, {.range_start = 1025, .range_length = 1, .glyph_id_start = 96, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY}, {.range_start = 1040, .range_length = 64, .glyph_id_start = 97, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY}, {.range_start = 1105, .range_length = 1, .glyph_id_start = 161, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY}};
-
-/*-----------------
- *    KERNING
- *----------------*/
-
-/*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] = {0, 0, 1, 2, 0, 3, 4, 5, 2, 6, 7, 8, 9, 10, 9, 10, 11, 12, 0, 13, 14, 15, 16, 17, 18, 19, 12, 20, 20, 0, 0, 0, 21, 22, 23, 24, 25, 22, 26, 27, 28, 29, 29, 30, 31, 32, 29, 29, 22, 33, 34, 35, 3, 36, 30, 37, 37, 38, 39, 40, 41, 42, 43, 0, 44, 0, 45, 46, 47, 48, 49, 50, 51, 45, 52, 52, 53, 48, 45, 45, 46, 46, 54, 55, 56, 57, 51, 58, 58, 59, 58, 60, 41, 0, 0, 9, 26, 23, 61, 24, 62, 63, 26, 38, 24, 29, 29, 38, 29, 29, 29, 22, 29, 33, 25, 36, 37, 22, 38, 63, 29, 29, 63, 64, 29, 64, 22, 22, 29, 51, 46, 0, 65, 51, 49, 59, 0, 51, 51, 59, 51, 51, 51, 46, 51, 46, 47, 65, 58, 46, 59, 51, 51, 51, 51, 66, 51, 66, 46, 46, 51, 49};
-
-/*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] = {0, 0, 1, 2, 0, 3, 4, 5, 2, 6, 7, 8, 9, 10, 9, 10, 11, 12, 13, 14, 15, 16, 17, 12, 18, 19, 20, 21, 21, 0, 0, 0, 22, 23, 24, 25, 23, 25, 25, 25, 23, 25, 25, 26, 25, 25, 25, 25, 23, 25, 23, 25, 3, 27, 28, 29, 29, 30, 31, 32, 33, 34, 35, 0, 36, 0, 37, 38, 39, 39, 39, 40, 39, 38, 41, 42, 38, 38, 43, 43, 39, 43, 39, 43, 44, 45, 46, 47, 47, 48, 49, 50, 0, 0, 35, 9, 25, 24, 25, 25, 25, 51, 25, 30, 52, 25, 25, 25, 53, 25, 25, 23, 25, 25, 23, 27, 30, 23, 30, 25, 54, 25, 25, 27, 25, 25, 52, 25, 30, 37, 23, 43, 43, 55, 39, 48, 56, 43, 43, 43, 55, 43, 43, 39, 43, 43, 39, 57, 47, 39, 48, 43, 46, 43, 43, 57, 43, 43, 56, 43, 48, 39};
-
-/*Kern values between classes*/
-static const int8_t kern_class_values[] = {0,   0,  0,   0,   0,  0,  0,   2,   0,   0,   0,   0,   3,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   8,   6,   0,   3,   0,  6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,  0,   0,   0,   0,  0,   0,  0,   0,  0,  0,   0,   0,   0,   0,   0,   0,   14,  0,  9,   -8,  0,   0,   6,  0,   -18, -19, 3,   15,  8,   6,  -13, 3,   17,  1,  14, 3,   11,  0,  -14, 0,   0,   2,   0,   0,  0,   0,   0,  0,   19,  2,  -3,  0,   0,   0,   0,   0,   0,  0,   0,   0,  0,  0,  0,   0,  0,   -13, 0,   -13, 0,   0,   0,   0,   0,   -10, 0,  0,   0,   0,   0,   -6, 6,   6,   0,   0,  -3,  0,   -3,  3,   0,  -3,  0,  -3,  -2,  -6, 0,   0,   0,   0,  -3,  0,   0,  -4,  -5,  0,   0,   -3,  0,   -6,  0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   -3,  -3,  -3,  0,   -6,  0,   -6,  -7,  0,   -1,  -4,  0,   -9,  0,   -38, 0,  0,   -6, -16, 6,   10,  0,   0,   -6,  3,   3,   11,  6,   -6,  6,   0,   0,   -19, 0,   0,   0,   0,  0,
-                                           0,   0,  0,   0,   0,  0,  -12, 0,   0,   5,   0,   7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  -4,  -17, 0,   -13, -3,  0,   0,   -10, 0,   1,   14, 0,  -10, -2,  0,   0,  0,   -6, 0,   0,  -2, -25, 0,   5,   0,   11,  -9,  0,   -6,  0,  -13, 5,   0,   -26, -2, 14,  3,   0,   0,   0,   0,   0,  0,   0,   3,   0,  -4, 0,   -4,  0,  0,   0,   0,   0,   0,   0,  0,   0,   0,  0,   0,   0,  0,   0,   0,   0,   0,   10,  0,  3,   0,   0,  -6, 0,  0,   0,  0,   0,   0,   0,   0,   0,   0,   -5,  0,   0,   0,  0,   0,   0,   11,  2,  0,   0,   0,   0,  0,   0,   26,  0,   0,  0,   0,  0,   0,   0,  0,   0,   -2,  0,  -4,  -4,  -7, -8,  0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   -12, 0,   0,   0,   0,   0,  0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  -11,
-                                           0,   0,  0,   2,   6,  3,  10,  -3,  0,   0,   6,   -3,  -10, -45, 3,   9,   6,   1,   -4,  0,   13,  0,   11,  0,   11,  0,   -29, 0,   -4,  10, 0,   11,  -3,  6,   3,   0,   0,   0,   -3,  0,   0,  -6, 0,   0,   0,   26, 0,   10, 0,   14, 4,  14,  6,   0,   0,   0,   0,   0,   0,   0,  0,   0,   -6,  -12, 0,  0,   0,   -3,  0,   -2,  0,   3,  -5,  -4,  -6,  3,  0,  -3,  0,   0,  0,   -13, 3,   -5,  0,   -6, -10, 0,   -7, -5,  -10, 0,  0,   -21, 0,   0,   0,   0,   3,  0,   0,   0,  0,  0,  3,   0,  -4,  -7,  -4,  -4,  -2,  -5,  -6,  -8,  -4,  -6,  -7, 0,   -18, 3,   -20, 0,  0,   0,   -10, -2, 0,   33,  -4,  -4,  3,  3,   -4, 0,   -4,  3,  0,   0,   -17, -6, 11,  0,   19, -10, -3,  -12, 0,   -12, 6,   0,   -31, 0,  3,   3,   0,   -5,  0,   0,   3,   0,   0,   -3,  -5,  -11, 0,   -11, 0,   8,   0,   8,   -16, 6,   0,   -12, 0,   19, -6,  0,  -12, 0,   10,  0,   -21, -31, -21, -6,  10,  0,   0,   -22, 0,   5,   -7,  0,   -5,  0,   -6, -13,
-                                           0,   -3, 10,  0,   10, 0,  10,  0,   0,   10,  10,  -40, -22, 0,   -22, 0,   2,   0,   -22, -22, -9,  -22, -10, -20, -10, -22, 0,   0,   0,   0,  0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   3,  3,  -4,  -6,  0,   0,  0,   -3, 0,   0,  -3, 0,   0,   0,   -6,  0,   -2,  0,   -7,  -6, 0,   -8,  -10, -10, -7, 0,   -6,  0,   -6,  0,   0,   0,  0,   0,   -3,  0,  0,  3,   0,   3,  -3,  3,   0,   0,   0,   0,  0,   0,   0,  0,   0,   0,  0,   3,   -3,  0,   0,   0,   -3, 3,   3,   -1, 0,  0,  0,   -7, 0,   -1,  0,   0,   0,   0,   0,   0,   0,   4,   -3, 0,   -4,  0,   -5,  0,  0,   -3,  0,   10, 0,   0,   -3,  0,   0,  0,   0,  0,   0,   -1, 1,   -3,  1,   -3, 0,   0,   0,  0,   0,   0,   0,   0,   -3,  0,   -3,  0,  0,   0,   0,   0,   0,   0,   0,   0,   -2,  -2,  0,   -3,  -4,  0,   0,   0,   0,   0,   1,   0,   0,   -2,  0,   -3, -3,  -3, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   -2,  0,   0,   0,   0,   -2,  -4,  -2,  0,  0,
-                                           0,   0,  0,   0,   0,  0,  0,   -10, -3,  -10, 6,   0,   0,   -6,  3,   6,   9,   0,   -8,  -1,  -5,  0,   -1,  -16, 3,   -3,  2,   -17, 3,   0,  0,   0,   -16, 0,   -17, -2,  -28, -3,  0,   -16, 0,  6,  9,   0,   4,   0,  0,   0,  0,   0,  0,  0,   -5,  -4,  -5,  0,   0,   0,   0,   0,  0,   0,   0,   0,   0,  0,   -3,  0,   0,   0,   -3,  0,  0,   0,   0,   0,  -2, -2,  0,   -2, -4,  0,   0,   0,   0,   0,  0,   0,   -3, -3,  0,   -2, -4,  -3,  0,   0,   -3,  0,   0,  0,   0,   0,  0,  0,  0,   0,  0,   0,   0,   -2,  -2,  -2,  0,   0,   0,   0,   0,  0,   0,   0,   0,   -3, 0,   -6,  3,   0,  0,   -5,  2,   3,   3,  0,   0,  0,   0,   0,  0,   -3,  0,   0,  0,   0,   0,  3,   0,   0,   -3,  0,   -3,  -3,  -5,  0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   -3,  0,   0,   0,   0,   -3,  -5,  -3,  0,   0,   0,   0,   0,   0,   0,  0,   0,  10,  -3,  0,   -11, 0,   0,   9,   -16, -17, -14, -6,  3,   0,   -3,  -21, -6,  0,   -6,  0,  -6,
-                                           5,   -6, -21, 0,   -9, 0,  0,   2,   -1,  2,   -3,  0,   3,   -1,  -10, -12, 0,   -16, 0,   0,   -7,  -8,  -10, -5,  -9,  -1,  -7,  -1,  -10, 0,  0,   0,   0,   0,   0,   0,   0,   1,   0,   -3,  0,  0,  0,   3,   0,   3,  0,   0,  0,   0,  0,  0,   0,   0,   0,   0,   0,   -3,  0,   -2, 0,   -1,  -3,  0,   -5, -7,  -7,  -1,  0,   -10, 0,   0,  0,   0,   0,   0,  0,  -3,  0,   0,  0,   0,   1,   -1,  1,   0,  0,   0,   0,  0,   0,   0,  0,   0,   3,   0,   0,   0,   0,  0,   0,   0,  0,  14, 0,   0,  0,   0,   0,   0,   3,   0,   0,   0,   -3,  0,   3,  0,   12,  -3,  0,   -7, -2,  -12, 0,   0,  -5,  0,   3,   0,   0,  0,   0,  0,   0,   0,  0,   2,   0,   3,  -3,  3,   0,  0,   0,   0,   0,   0,   0,   0,   -3,  0,  0,   0,   -7,  0,   0,   5,   0,   -16, -10, 0,   0,   0,   -5,  -16, 0,   0,   -3,  3,   0,   -10, 0,   -13, 0,   -9, 0,   0,  -4,  -5,  -4,  -3,  -6,  0,   0,   -7,  0,   0,   -3,  0,   0,   0,   0,   0,   0,   0,   3,  0,
-                                           3,   0,  0,   0,   0,  0,  0,   0,   0,   0,   -6,  0,   0,   0,   0,   5,   0,   3,   -6,  -6,  0,   -3,  -3,  -4,  0,   0,   0,   0,   0,   0,  -10, 0,   -3,  0,   -5,  -3,  0,   -7,  -8,  -10, -3, 0,  -6,  0,   -10, 0,  0,   0,  0,   0,  26, 0,   0,   2,   0,   0,   -4,  0,   0,   -6, -6,  -6,  -5,  -5,  -6, -5,  0,   -14, 0,   0,   0,   0,  0,   -29, -5,  11, 10, -2,  -13, 0,  3,   -5,  0,   -16, -2,  -4, 3,   -22, -3, 3,   0,   5,  -11, -5,  -12, -10, -13, 0,   0,  -19, 0,   19, 0,  0,  -2,  0,  0,   0,   0,   -2,  -2,  -3,  -8,  -10, -8,  0,   0,  0,   0,   -14, 0,   0,  -14, 0,   0,   0,  0,   0,   0,   0,   0,  0,   0,  0,   0,   0,  0,   0,   0,   0,  0,   0,   0,  0,   0,   0,   0,   0,   0,   -3,  0,   -2, -3,  -5,  0,   0,   -6,  0,   -3,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,  0,   0,   0,   0,   -1,  0,   -6,  0,   0,   6,   0,   4,   0,   -7,  3,   -3,  -1,  -10, -3, 0,
-                                           -4,  -3, -1,  0,   -5, -6, 0,   0,   -3,  0,   -3,  -6,  -5,  0,   0,   -3,  0,   3,   -3,  0,   -7,  0,   0,   0,   0,   -6,  0,   -6,  0,   -6, 0,   -6,  -6,  0,   -6,  -4,  -8,  -5,  -5,  0,   0,  0,  0,   0,   0,   0,  0,   -6, 3,   0,  -5, 0,   -3,  -5,  -12, -3,  -3,  -3,  -1,  -3, -5,  -1,  0,   0,   0,  0,   0,   -3,  -3,  -3,  0,   0,  0,   0,   5,   -3, 0,  -3,  0,   0,  0,   0,   -3,  -5,  -3,  -4, -5,  -4,  -4, 0,   0,   0,  0,   0,   0,   0,   2,   13,  -1, 0,   -10, 0,  -3, 6,  0,   -3, -14, -4,  5,   -1,  0,   -16, -6,  3,   -6,  2,   0,  -4,  -3,  -11, 0,   -5, 2,   0,   0,   -6, 0,   0,   0,   3,   3,  -6,  -7, 0,   -6,  0,  0,   -5,  -3,  -3, 0,   -6,  2,  -7,  2,   -6,  -13, -5,  -13, -5,  -13, -8, -5,  0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   -6,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,
-                                           0,   0,  0,   0,   0,  0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   -3, 0,  0,   0,   0,   0,  0,   0,  0,   0,  0,  0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   -4,  0,   -4, -6,  0,   0,   0,   0,   0,   0,  0,   0,   0,   0,  0,  0,   -3,  -3, 0,   0,   0,   0,   0,   0,  0,   0,   0,  0,   0,   0,  -5,  0,   0,   -4,  0,   0,   -3, -3,  0,   0,  0,  0,  -3,  0,  0,   0,   0,   0,   -2,  0,   0,   0,   0,   0,   -3, 0,   0,   -7,  0,   -7, -8,  -5,  -5,  -5, 0,   0,   -5,  0,   -6, 0,   0,  0,   -10, 0,  3,   -7,  6,   0,  -3,  -15, 0,  0,   -7,  -3,  0,   -13, -8,  -9,  0,   0,  -13, -3,  -13, -12, -15, 0,   -10, 0,   2,   22,  -4,  0,   -8,  0,   0,   -1,  -3,  -6,  -9,  -6,  -12, -12, -12, -7, -1,  -8, -1,  -11, 0,   -8,  -13, 0,   0,   -3,  0,   0,   0,   0,   -22, -4,  10,  8,   -8,  -12, 0,  0,
-                                           -12, 0,  -16, -3,  -3, 6,  -30, -4,  0,   0,   0,   -21, -4,  -17, -3,  -24, 0,   0,   -22, 0,   20,  0,   0,   -3,  0,   0,   0,   0,   0,   -2, -3,  -12, -3,  -12, 0,   0,   0,   0,   0,   0,   0,  0,  0,   0,   0,   0,  -11, 0,  -4,  0,  0,  -9,  -15, 0,   0,   -2,  -5,  -10, -3,  0,  -2,  0,   0,   0,   0,  -14, -3,  -11, -11, -2,  -5,  -8, -3,  -6,  0,   -6, -4, -10, -5,  0,  -4,  0,   0,   -3,  -7,  0,  2,   0,   -3, -11, -3,  0,  -11, -6,  -11, -6,  -14, -6,  -4, 0,   -6,  0,  0,  0,  0,   5,  0,   3,   -6,  12,  0,   -3,  -3,  -4,  0,   0,   0,  0,   0,   0,   -10, 0,  -3,  0,   -5,  -3, 0,   -7,  -8,  -10, -3, 0,   -6, 2,   13,  0,  0,   0,   0,   0,  26,  0,   0,  2,   0,   0,   -4,  0,   0,   -6,  -6,  -6, -5,  -5,  -6,  -5,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   -3,  -6,  0,   0,   0,   0,  0,   -2, 0,   0,   0,   -3,  -3,  0,   0,   -6,  -3,  0,   0,   -6,  0,   6,   -2,  0,   0,   0,   0,  0,
-                                           0,   0,  2,   0,   0,  0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   6,   2,   -4,  0,   -11, -6,  0,   10,  -10, -10, -6,  -6,  13,  5,   3,  -28, -2,  6,   -3,  0,   -3,  2,   -3,  -11, 0,   -3, 3,  -4,  -2,  -10, -2, 0,   0,  10,  6,  0,  -9,  0,   -18, 0,   0,   7,   -4,  -12, 0,  -4,  -11, -11, -11, -3, -12, 0,   -12, -5,  -22, -15, -7, 3,   0,   -5,  0,  -9, 0,   2,   11, -7,  -12, -13, -8,  10,  0,  0,   -23, -2, 3,   -5,  -2, -7,  0,   -7,  -12, -5,  -5,  -2, 0,   0,   -7, -6, -3, 0,   10, 7,   -3,  -18, 0,   -18, 0,   -6,  -6,  -11, -18, 0,  -10, -5,  -11, -5,  -9, -7,  -1,  -7,  0,  -11, -15, -6,  0,   0,  -4,  0,  -6,  -4,  0,  -3,  -5,  0,   6,  -10, 3,   0,  0,   -17, 0,   -3,  -7,  -5,  -2,  -10, -8, -10, -8,  0,   -10, -3,  -7,  -7,  -10, -3,  0,   0,   0,   15,  -5,  0,   -10, 0,   0,   0,   -3,  -6,  -7,  -8,  -8, -11, -8, -4,  -4,  -17, -4,  -12, -5,  -12, -16, 6,   0,   -5,  0,   -16, -5,  1,   6,   -10, -12, -6, -10,
-                                           10,  -3, 2,   -29, -5, 6,  -7,  -5,  -12, 0,   -10, -13, -5,  -3,  -2,  -3,  -6,  -10, 0,   0,   0,   10,  8,   -3,  -21, 0,   -19, 0,   -4,  6,  -12, -21, -6,  -11, -13, -16, -13, -10, -9,  0,   -9, -5, -18, -18, -7,  0,  0,   0,  0,   -5, 0,  0,   3,   -5,  6,   3,   -7,  6,   0,   0,  -12, -1,  0,   -1,  0,  0,   0,   -3,  0,   0,   0,   0,  0,   0,   -3,  0,  0,  0,   0,   2,  10,  0,   0,   -5,  0,   0,  0,   0,   0,  -3,  -3,  -5, 0,   -5,  0,   0,   0,   0,   0,  0,   0,   0,  0,  2,  0,   0,  0,   0,   2,   0,   -3,  0,   11,  0,   5,   0,   0,  -4,  0,   6,   0,   0,  0,   2,   0,   0,  0,   0,   6,   0,   7,  0,   8,  0,   0,   10, 0,   8,   -4,  0,  0,   0,   0,  32,  0,   0,   0,   0,   0,   0,   0,   0,  3,   -4,  -4,  -4,  -6,  -5,  -3,  0,   -19, 0,   -3,  6,   0,   10,  -45, 0,   33,  5,   -6,  -6,  3,   3,   -3,  0,  -16, 0,  0,   14,  -19, -6,  10,  0,   10,  -6,  -3,  -13, 6,   -6,  0,   0,   -21, 11,  45,  0,   0,  0,
-                                           0,   0,  38,  0,   0,  0,  0,   6,   0,   6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,  0,   0,   -6,  0,  0,   -7, -4,  0,  0,  0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,  0,   0,   0,   -4,  -5,  -4,  -5, -4,  -4,  0,   0,  -3, 6,   -9,  0,  0,   0,   -3,  0,   3,   43, -6,  -3,  11, 9,   -9,  3,  0,   0,   3,   3,   -3,  -10, 19, 10,  27,  0,  -3, -3, 15,  -3, 6,   0,   -42, 8,   0,   -3,  0,   -9,  0,   0,   34, 0,   3,   -6,  -9,  -4, 12,  6,   10,  0,  0,   0,   0,   0,   0,  0,   0,  0,   0,   -9, 0,   0,   0,   -9, 0,   0,   0,  0,   -7,  -2,  0,   0,   0,   -7,  0,   -5, 0,   -15, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   -22, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,  -3,  0,   -3,  0,   0,   0,   0,   -18, 0,   0,   -3,  0,   -5,  0,   -9,  0,   0,   0,   -6, 3,
-                                           -5,  0,  0,   -9,  -3, -8, 0,   0,   -9,  0,   -3,  0,   -15, 0,   -2,  0,   0,   -27, -7,  -13, -2,  -11, 0,   0,   -22, 0,   -9,  -1,  0,   0,  0,   0,   0,   0,   0,   0,   0,   -5,  -6,  -5,  -3, -3, -8,  -3,  -8,  -1, -1,  -6, 0,   0,  0,  0,   -8,  0,   -7,  4,   -2,  6,   0,   -3, -8,  -3,  -6,  -7,  0,  -5,  -2,  -3,  2,   -9,  0,   0,  0,   0,   -30, -2, -3, 0,   -5,  0,  -3,  -15, -4,  0,   0,   -3, -3,  0,   -3, 0,   0,   0,  2,   0,   -3,  -6,  -3,  -3,  0,  0,   0,   0,  -6, -6, -3,  0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,  0,   0,   0,   0,  0,   0,   0,   0,   0,  0,   0,  0,   0,   0,  0,   0,   0,   0,  0,   0,   0,  0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   -8,  0,   -3,  0,   0,   0,   -6,  3,   0,   0,   0,   -9,  -3, -6,  0,  0,   -9,  0,   -3,  0,   -15, 0,   0,   0,   0,   -31, 0,   -6,  -12, -16, 0,   0,   -22, 0,  -2,
-                                           -5,  0,  0,   0,   0,  0,  0,   0,   0,   0,   -3,  -5,  -3,  -2,  -6,  0,   -6,  -7,  -4,  -5,  -7,  0,   0,   0,   6,   -4,  0,   9,   17,  -3, -3,  -10, 5,   17,  6,   8,   -9,  5,   14,  5,   10, 8,  9,   0,   0,   0,  0,   0,  0,   0,  0,  0,   0,   0,   20,  15,  -5,  -3,  0,   -3, 1,   0,   13,  0,   0,  0,   0,   3,   0,   3,   0,   0,  0,   0,   0,   0,  0,  0,   0,   0,  -6,  0,   0,   0,   0,   0,  0,   0,   0,  0,   -3,  0,  0,   0,   0,   0,   0,   0,   0,  3,   0,   0,  0,  0,  -29, -5, -2,  -14, -17, 0,   0,   -22, 0,   0,   0,   0,   0,  0,   0,   0,   0,   0,  0,   0,   0,   0,  0,   0,   0,   -7,  0,  -14, 0,  -4,  0,   0,  0,   -6,  0,   0,  0,   0,   0,  0,   0,   0,   0,   -3,  0,   0,   0,   0,  0,   0,   0,   0,   3,   0,   0,   0,   0,   -29, -5,  -2,  -14, -17, 0,   0,   -16, 0,   0,   0,   0,   0,   0,   0,  0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   -7,  0,   -14, 0,   -4,  0,   0,   0,   0,   0,   -2, 0,
-                                           0,   0,  -7,  3,   0,  -3, 2,   5,   3,   -10, 0,   -1,  -2,  3,   0,   2,   0,   0,   0,   0,   -10, 0,   -4,  -3,  -6,  0,   -4,  -13, 0,   21, -3,  0,   -7,  0,   0,   0,   -3,  -5,  0,   -3,  -9, -6, -9,  -4,  0,   0,  0,   -6, 2,   -7, 0,  0,   0,   -6,  0,   0,   0,   0,   0,   0,  0,   0,   0,   -3,  0,  0,   0,   0,   0,   0,   0,   0,  3,   0,   0,   0,  0,  -29, -5,  -2, -14, -17, 0,   0,   -22, 0,  0,   0,   0,  0,   0,   0,  16,  0,   0,   0,   0,   0,   0,  0,   0,   0,  -7, 0,  -14, 0,  -4,  0,   0,   0,   -6,  0,   -11, -5,  -4,  10,  -4, -3,  -13, 0,   -3,  0,  -3,  -10, 0,   7,  0,   2,   0,   2,   -8, -12, -5, 0,   -14, -7, -9,  -14, -13, 0,  -6,  -6,  -5, -4,  -15, -3,  -4,  0,   -3,  0,   -3,  -1, 5,   0,   5,   -3,  5,   0,   -13, -7,  -13, -6,  -12, -9,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   -3, -3,  -3,  0,   0,   -9,  0,   -2,  0,   -6,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,
-                                           -19, 0,  0,   0,   0,  0,  0,   0,   0,   0,   0,   0,   0,   -3,  -3,  -3,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   -3,  0,  0,   -6,  -3,  3,   0,   -6,  -7,  -3,  0,   -11, -3, -8, -2,  -5,  0,   -6, 0,   0,  0,   0,  0,  0,   0,   0,   0,   0,   0,   -22, 0,   11, 0,   0,   -6,  0,   0,  0,   0,   0,   -4,  0,   -3,  0,  -3,  0,   0,   0,  0,  0,   0,   0,  0,   0,   0,   -3,  0,   -7, 0,   0,   14, -4,  -11, -9, 3,   2,   2,   -1,  -8,  3,   5,  3,   10,  3,  10, -3, -8,  0,  0,   -16, 0,   0,   -10, -9,  0,   0,   -6,  0,   -4, -5,  0,   -5,  0,   0,  -5,  0,   -2,  5,  0,   -2,  -10, -2,  -3, -8,  0,  -8,  -5,  -7, -4,  0,   0,   0,  -4,  0,   -6, 0,   0,   4,   -7,  0,   3,   -3,  2,   -1, 0,   -10, 0,   -3,  0,   0,   -3,  2,   -2,  0,   0,   0,   -16, -5,  -7,  0,   -10, 0,   0,   -15, 0,   12,  -3,  0,  -6,  0,  0,   -1,  0,   -3,  0,   -3,  -10, 0,   -10, -3,  0,   -2,  0,   -8,  0,   -10, -4,  0,   0,  0,
-                                           0,   -3, 0,   0,   3,  -4, 0,   0,   0,   -5,  -3,  0,   -5,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  -21, 0,   8,   0,   0,   -3,  0,   0,   0,   0,   0,  0,  0,   -3,  -3,  -3, 0,   0,  0,   0,  0,  0,   0,   0,   -3,  -6,  0,   0,   0,   0,  0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   -6, 0,  0,   0,   0,  -13, -5,  -11, -7,  -11, 0,  0,   0,   0,  0,   0,   0,  0,   0,   0,   0,   0,   0,   0,  0,   -5,  -6, -5, 0,  -6,  0,  -6,  -11, -4,  -5,  -9,  0,   0,   0,   0,   0,   0,  0,   0,   -65, -58, 0,  0,   0,   0,   0,  0,   0,   0,   0,   0,  0,   0,  -30, -42, 0,  0,   0,   0,   0,  0,   0,   0,  0,   0,   0,   0,   0,   -3,  -49, 0,   -3, 0,   -38, 0,   0,   0,   -38, -38, -38, 0,   -28, 0,   -28, -6,  -50, -45, -36, 0,   -6,  0,   0,   0,   0,   0,   0,  -8,  1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   -15, 0,   0,   0,   0,   -8,  0,   -8, 0,
-                                           -9,  0,  0,   0,   1,  0,  0,   0,   -5,  0,   0,   0,   0,   0,   0,   0,   -11, -7,  -11, 0,   0,   0,   0,   -7,  0,   -6,  -10, 0,   -9,  -6, 0,   0,   0,   -5,  0,   0,   -9,  0,   0,   0,   0,  0,  0,   0,   0,   0,  0,   0,  -12, 0,  -2, 0,   0,   -21, 0,   -10, -14, -13, 0,   0,  0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,  0,   -6,  -5,  -6, 0,  -8,  -6,  -8, -2,  -5,  -5,  -8,  0,   0,  0,   0,   0,  0,   -2,  0,  -7,  -14, 0,   0,   0,   0,   0,  0,   0,   0,  0,  0,  0,   0,  0,   -12, 0,   0,   0,   0,   -2,  -11, -7,  0,   0,  0,   0,   0,   0,   0,  -8,  0,   0,   0,  0,   0,   0,   0,   0,  -4,  0,  0,   -13, 0,  -13, -3,  -10, -5, 4,   0,   0,  0,   0,   0,   0,   0,   0,   0,   -3,  0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   -13, 0,   0,   0,   0,   -35, 0,   -12, -10, -10, 0,   0,   0,   -4, 0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   -10, -12, -10, 0,   -5,  0,   -5,  -24, -6,  -2, -17};
-
-/*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes = {
-    .class_pair_values   = kern_class_values,
-    .left_class_mapping  = kern_left_class_mapping,
-    .right_class_mapping = kern_right_class_mapping,
-    .left_class_cnt      = 66,
-    .right_class_cnt     = 57,
-};
-
-/*--------------------
- *  ALL CUSTOM DATA
- *--------------------*/
-
-#    if LV_VERSION_CHECK(8, 0, 0)
-/*Store all the custom data of the font*/
-static lv_font_fmt_txt_glyph_cache_t cache;
-static const lv_font_fmt_txt_dsc_t   font_dsc = {
-#    else
-static lv_font_fmt_txt_dsc_t font_dsc            = {
-#    endif
-    .glyph_bitmap  = glyph_bitmap,
-    .glyph_dsc     = glyph_dsc,
-    .cmaps         = cmaps,
-    .kern_dsc      = &kern_classes,
-    .kern_scale    = 16,
-    .cmap_num      = 4,
-    .bpp           = 4,
-    .kern_classes  = 1,
-    .bitmap_format = 0,
-#    if LV_VERSION_CHECK(8, 0, 0)
-    .cache = &cache
-#    endif
-};
-
-/*-----------------
- *  PUBLIC FONT
- *----------------*/
-
-/*Initialize a public general font descriptor*/
-#    if LV_VERSION_CHECK(8, 0, 0)
-const lv_font_t montserrat_20_en_ru = {
-#    else
-lv_font_t                    montserrat_20_en_ru = {
-#    endif
-    .get_glyph_dsc    = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/
-    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
-    .line_height      = 23,                            /*The maximum line height required by the font*/
-    .base_line        = 4,                             /*Baseline measured from the bottom of the line*/
-#    if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
-    .subpx = LV_FONT_SUBPX_NONE,
-#    endif
-#    if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
-    .underline_position  = -2,
-    .underline_thickness = 1,
-#    endif
-    .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
-};
-
-#endif /*#if MONTSERRAT_20_EN_RU*/
diff --git a/keyboards/stront/keymaps/zzeneg/fonts/montserrat_48_digits.c b/keyboards/stront/keymaps/zzeneg/fonts/montserrat_48_digits.c
deleted file mode 100644
index ed0c74797d4..00000000000
--- a/keyboards/stront/keymaps/zzeneg/fonts/montserrat_48_digits.c
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*******************************************************************************
- * Size: 48 px
- * Bpp: 4
- * Opts:
- ******************************************************************************/
-
-#ifdef __has_include
-#    if __has_include("lvgl.h")
-#        ifndef LV_LVGL_H_INCLUDE_SIMPLE
-#            define LV_LVGL_H_INCLUDE_SIMPLE
-#        endif
-#    endif
-#endif
-
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#    include "lvgl.h"
-#else
-#    include "lvgl/lvgl.h"
-#endif
-
-#ifndef MONTSERRAT_48_DIGITS
-#    define MONTSERRAT_48_DIGITS 1
-#endif
-
-#if MONTSERRAT_48_DIGITS
-
-/*-----------------
- *    BITMAPS
- *----------------*/
-
-/*Store the image of the glyphs*/
-static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
-    /* U+002E "." */
-    0x0, 0x44, 0x0, 0xc, 0xff, 0xd1, 0x5f, 0xff, 0xf8, 0x6f, 0xff, 0xf9, 0x2f, 0xff, 0xf5, 0x6, 0xef, 0x80,
-
-    /* U+0030 "0" */
-    0x0, 0x0, 0x0, 0x0, 0x3, 0x9c, 0xef, 0xfe, 0xb8, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xfb, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xff, 0xe8, 0x54, 0x45, 0x9e, 0xff, 0xff, 0x90, 0x0, 0x0, 0x0, 0x0, 0xbf, 0xff, 0xe5, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x7, 0xff, 0xfd, 0x10, 0x0, 0x0, 0x0, 0x0, 0x3, 0xef, 0xff, 0x40, 0x0, 0x0, 0x1f, 0xff, 0xe1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xd0, 0x0, 0x0, 0x9f, 0xff, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xf6, 0x0, 0x1, 0xff, 0xfb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xfd, 0x0, 0x6, 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x30, 0xb, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0xf, 0xff, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xc0, 0x2f, 0xff, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xff, 0xf0, 0x4f, 0xff,
-    0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xf1, 0x6f, 0xff, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, 0xf3, 0x7f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xff, 0xf4, 0x7f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xf5, 0x7f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xf5, 0x7f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xff, 0xf4, 0x6f, 0xff, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, 0xf3, 0x4f, 0xff, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xf1, 0x2f, 0xff, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xff, 0xf0, 0xf, 0xff, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xc0, 0xb, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x6, 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x30, 0x1, 0xff, 0xfb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xfd, 0x0, 0x0, 0x9f, 0xff, 0x40, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x7, 0xff, 0xf6, 0x0, 0x0, 0x1f, 0xff, 0xe1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xd0, 0x0, 0x0, 0x7, 0xff, 0xfd, 0x10, 0x0, 0x0, 0x0, 0x0, 0x3, 0xef, 0xff, 0x40, 0x0, 0x0, 0x0, 0xbf, 0xff, 0xe5, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xff, 0xd8, 0x54, 0x45, 0x9e, 0xff, 0xff, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xfb, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x9c, 0xef, 0xfe, 0xb8, 0x20, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0031 "1" */
-    0x9f, 0xff, 0xff, 0xff, 0xff, 0xfd, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xfd, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xfd, 0x12, 0x22, 0x22, 0x22, 0xbf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0,
-    0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfd,
-
-    /* U+0032 "2" */
-    0x0, 0x0, 0x0, 0x4, 0x8b, 0xef, 0xff, 0xec, 0x95, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd2, 0x0, 0x0, 0x0, 0xbf, 0xff, 0xff, 0xb8, 0x54, 0x34, 0x69, 0xdf, 0xff, 0xfe, 0x10, 0x0, 0xc, 0xff, 0xff, 0x71, 0x0, 0x0, 0x0, 0x0, 0x5, 0xef, 0xff, 0xb0, 0x0, 0x6, 0xff, 0xc1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2e, 0xff, 0xf3, 0x0, 0x0, 0x4a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xfa, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x4f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xef, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xcf, 0xff, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xcf, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xdf, 0xff, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1d, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xdf, 0xff, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1d, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xdf, 0xff, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2e, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xef, 0xff, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2e, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x2, 0xef, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2e, 0xff, 0xf7, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x21, 0x1, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7,
-
-    /* U+0033 "3" */
-    0x2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf6, 0x0, 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x60, 0x2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0x0, 0x2, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x28, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xef, 0xfe, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xcf, 0xff, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4f, 0xff, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1d, 0xff, 0xe2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xff, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xff, 0xec, 0xa6,
-    0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4f, 0xff, 0xff, 0xff, 0xff, 0xb2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x59, 0xef, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xff, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdf, 0xfb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0xff, 0x60, 0x5c, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xf1, 0xe, 0xfe, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xfa, 0x5, 0xff, 0xff, 0xd6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3c, 0xff,
-    0xff, 0x10, 0x8, 0xff, 0xff, 0xff, 0xb8, 0x54, 0x34, 0x58, 0xcf, 0xff, 0xff, 0x40, 0x0, 0x3, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x40, 0x0, 0x0, 0x0, 0x5b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0x10, 0x0, 0x0, 0x0, 0x0, 0x1, 0x69, 0xce, 0xff, 0xfe, 0xc9, 0x50, 0x0, 0x0, 0x0,
-
-    /* U+0034 "4" */
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4f, 0xff, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1e, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xe1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xfa, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xef, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xcf, 0xff, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff,
-    0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1e, 0xff, 0xe1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xf3, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x1, 0xdf, 0xfe, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbf, 0xff, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xff, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x5f, 0xff, 0xc2, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x2f, 0xff, 0x72, 0x22, 0x22, 0x20, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x11, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0x1f, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0x50, 0x0, 0x0, 0x0,
-
-    /* U+0035 "5" */
-    0x0, 0x0, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x0, 0x0, 0x3f, 0xff, 0x32, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x21, 0x0, 0x0, 0x5, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfa, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdf, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xf2, 0x22, 0x22, 0x11, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xeb, 0x83, 0x0,
-    0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0x60, 0x0, 0x0, 0x0, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x36, 0xae, 0xff, 0xff, 0xe2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6, 0xef, 0xff, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xdf, 0xff, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xff, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0xff, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6, 0xff, 0xf2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0x0, 0x96, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xa0, 0x4f, 0xfa, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2e, 0xff, 0xf3, 0xb, 0xff, 0xff, 0x92, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f,
-    0xff, 0xf9, 0x0, 0x2d, 0xff, 0xff, 0xfd, 0x96, 0x44, 0x34, 0x6a, 0xef, 0xff, 0xfc, 0x0, 0x0, 0x8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x0, 0x0, 0x0, 0x1, 0x8e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x7a, 0xdf, 0xff, 0xfd, 0xb8, 0x30, 0x0, 0x0, 0x0,
-
-    /* U+0036 "6" */
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x37, 0xbd, 0xff, 0xfe, 0xda, 0x73, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc4, 0x0, 0x0, 0x0, 0x0, 0x2d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x5, 0xff, 0xff, 0xfc, 0x74, 0x21, 0x12, 0x47, 0xbf, 0xe0, 0x0, 0x0, 0x0, 0x5f, 0xff, 0xfa, 0x20, 0x0, 0x0, 0x0, 0x0, 0x1, 0x40, 0x0, 0x0, 0x2, 0xff, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, 0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xfb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xff, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe, 0xff, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4f, 0xff, 0x30, 0x0, 0x1, 0x7b, 0xdf, 0xff, 0xdb, 0x61, 0x0, 0x0, 0x0, 0x5f, 0xff, 0x10, 0x1,
-    0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x91, 0x0, 0x0, 0x7f, 0xff, 0x0, 0x4e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x40, 0x0, 0x7f, 0xff, 0x4, 0xff, 0xfe, 0x84, 0x10, 0x1, 0x49, 0xef, 0xff, 0xf4, 0x0, 0x7f, 0xff, 0x2f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x9, 0xff, 0xfe, 0x10, 0x7f, 0xff, 0xbf, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xa0, 0x6f, 0xff, 0xff, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xff, 0xf1, 0x5f, 0xff, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xf6, 0x3f, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xf9, 0xf, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbf, 0xfb, 0xd, 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xfb, 0x8, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbf, 0xfb, 0x3, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xf9, 0x0, 0xdf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xf5, 0x0, 0x5f, 0xff, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xf0, 0x0, 0xb, 0xff, 0xf5,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xff, 0x80, 0x0, 0x1, 0xef, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x19, 0xff, 0xfd, 0x0, 0x0, 0x0, 0x3e, 0xff, 0xfe, 0x84, 0x10, 0x1, 0x48, 0xef, 0xff, 0xe2, 0x0, 0x0, 0x0, 0x2, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0x20, 0x0, 0x0, 0x0, 0x0, 0x7, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x9c, 0xef, 0xff, 0xda, 0x50, 0x0, 0x0, 0x0,
-
-    /* U+0037 "7" */
-    0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf2, 0x7f, 0xff, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x2f, 0xff, 0xc0, 0x7f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, 0x40, 0x7f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdf, 0xfd, 0x0, 0x7f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xff, 0xf6, 0x0, 0x7f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xe0, 0x0, 0x7f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x80, 0x0, 0x37, 0x77, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xfa, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8, 0xff, 0xf3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x40, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xdf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xaf, 0xff, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xff, 0xf2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbf, 0xff, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xf9, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9, 0xff, 0xf2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+0038 "8" */
-    0x0, 0x0, 0x0, 0x2, 0x6a, 0xde, 0xff, 0xfe, 0xb8, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x10, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x40, 0x0, 0x0, 0x0, 0xaf, 0xff, 0xfd, 0x73, 0x10, 0x0, 0x25, 0x9f, 0xff, 0xff, 0x40, 0x0, 0x0, 0x6f, 0xff, 0xe5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x19, 0xff, 0xfe, 0x10, 0x0, 0xe, 0xff, 0xe2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8, 0xff, 0xf8, 0x0, 0x4, 0xff, 0xf6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xe0, 0x0, 0x7f, 0xff, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xff, 0x10, 0x7, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6, 0xff, 0xf1, 0x0, 0x6f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x0, 0x3, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xd0, 0x0, 0xe, 0xff, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5, 0xff, 0xf8, 0x0, 0x0, 0x5f, 0xff, 0xc2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6, 0xff, 0xfe, 0x10, 0x0, 0x0, 0x8f, 0xff, 0xf9, 0x40, 0x0, 0x0,
-    0x1, 0x6c, 0xff, 0xfe, 0x30, 0x0, 0x0, 0x0, 0x5e, 0xff, 0xff, 0xfe, 0xdc, 0xdf, 0xff, 0xff, 0xfb, 0x20, 0x0, 0x0, 0x0, 0x0, 0x1d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0x30, 0x0, 0x0, 0x1, 0xcf, 0xff, 0xfb, 0x63, 0x10, 0x0, 0x24, 0x8e, 0xff, 0xff, 0x60, 0x0, 0x0, 0xcf, 0xff, 0xb2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6, 0xff, 0xff, 0x60, 0x0, 0x8f, 0xff, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xef, 0xff, 0x20, 0x1f, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xfa, 0x6, 0xff, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xff, 0xf0, 0x9f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, 0x3a, 0xff, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xff, 0xf4, 0xbf, 0xfd, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4f, 0xff, 0x49, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6, 0xff, 0xf3, 0x6f, 0xff, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbf, 0xff, 0x1,
-    0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xb0, 0xa, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2e, 0xff, 0xf3, 0x0, 0x1e, 0xff, 0xfc, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0xff, 0xf9, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xb6, 0x31, 0x0, 0x2, 0x48, 0xef, 0xff, 0xfb, 0x0, 0x0, 0x0, 0x2d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x6, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x37, 0xbd, 0xef, 0xff, 0xec, 0x95, 0x10, 0x0, 0x0, 0x0,
-
-    /* U+0039 "9" */
-    0x0, 0x0, 0x0, 0x5, 0x9c, 0xef, 0xfe, 0xda, 0x51, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0x91, 0x0, 0x0, 0x0, 0x0, 0x1, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x40, 0x0, 0x0, 0x0, 0x2e, 0xff, 0xff, 0x94, 0x10, 0x1, 0x37, 0xcf, 0xff, 0xf5, 0x0, 0x0, 0x0, 0xcf, 0xff, 0xa1, 0x0, 0x0, 0x0, 0x0, 0x4, 0xef, 0xff, 0x40, 0x0, 0x7, 0xff, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1d, 0xff, 0xe1, 0x0, 0xe, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xf9, 0x0, 0x3f, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xff, 0x10, 0x6f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x70, 0x7f, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xc0, 0x8f, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xf1, 0x6f, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xf4, 0x4f, 0xff, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xff, 0xf7, 0xf, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xff, 0xf9, 0x8,
-    0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1d, 0xff, 0xff, 0xfa, 0x1, 0xef, 0xff, 0xa1, 0x0, 0x0, 0x0, 0x0, 0x4, 0xdf, 0xf7, 0xdf, 0xfb, 0x0, 0x3f, 0xff, 0xff, 0x95, 0x20, 0x0, 0x36, 0xcf, 0xff, 0xa0, 0xcf, 0xfb, 0x0, 0x3, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0x0, 0xcf, 0xfb, 0x0, 0x0, 0x8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x40, 0x0, 0xcf, 0xfa, 0x0, 0x0, 0x0, 0x16, 0xad, 0xff, 0xfe, 0xc8, 0x30, 0x0, 0x0, 0xef, 0xf9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6, 0xff, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb, 0xff, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xff, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xff, 0xfa, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2e, 0xff, 0xf1, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x4, 0xef, 0xff, 0x60, 0x0, 0x0, 0x4, 0x40, 0x0, 0x0, 0x0, 0x0, 0x1, 0x9f, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xc, 0xfd, 0x85, 0x31, 0x12, 0x47, 0xbf, 0xff, 0xff, 0x80, 0x0, 0x0, 0x0, 0x4f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe5, 0x0, 0x0, 0x0, 0x0, 0x2b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x16, 0xac, 0xef, 0xff, 0xeb, 0x84, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-    /* U+003A ":" */
-    0x6, 0xef, 0x80, 0x3f, 0xff, 0xf5, 0x6f, 0xff, 0xf9, 0x4f, 0xff, 0xf7, 0xb, 0xff, 0xd1, 0x0, 0x44, 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, 0x44, 0x0, 0xc, 0xff, 0xd1, 0x5f, 0xff, 0xf8, 0x6f, 0xff, 0xf9, 0x2f, 0xff, 0xf5, 0x6, 0xef, 0x80};
-
-/*---------------------
- *  GLYPH DESCRIPTION
- *--------------------*/
-
-static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {{.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
-                                                        {.bitmap_index = 0, .adv_w = 163, .box_w = 6, .box_h = 6, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 18, .adv_w = 508, .box_w = 28, .box_h = 34, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 494, .adv_w = 277, .box_w = 12, .box_h = 34, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 698, .adv_w = 436, .box_w = 26, .box_h = 34, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 1140, .adv_w = 433, .box_w = 25, .box_h = 34, .ofs_x = 0, .ofs_y = 0},
-                                                        {.bitmap_index = 1565, .adv_w = 508, .box_w = 31, .box_h = 34, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 2092, .adv_w = 435, .box_w = 25, .box_h = 34, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 2517, .adv_w = 468, .box_w = 26, .box_h = 34, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 2959, .adv_w = 452, .box_w = 26, .box_h = 34, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 3401, .adv_w = 490, .box_w = 27, .box_h = 34, .ofs_x = 2, .ofs_y = 0},
-                                                        {.bitmap_index = 3860, .adv_w = 468, .box_w = 26, .box_h = 34, .ofs_x = 1, .ofs_y = 0},
-                                                        {.bitmap_index = 4302, .adv_w = 163, .box_w = 6, .box_h = 26, .ofs_x = 2, .ofs_y = 0}};
-
-/*---------------------
- *  CHARACTER MAPPING
- *--------------------*/
-
-static const uint8_t glyph_id_ofs_list_0[] = {0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
-
-/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {{.range_start = 46, .range_length = 13, .glyph_id_start = 1, .unicode_list = NULL, .glyph_id_ofs_list = glyph_id_ofs_list_0, .list_length = 13, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL}};
-
-/*-----------------
- *    KERNING
- *----------------*/
-
-/*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] = {0, 1, 2, 0, 3, 4, 5, 6, 7, 8, 9, 2, 10};
-
-/*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] = {0, 1, 2, 3, 4, 5, 6, 7, 2, 8, 9, 10, 11};
-
-/*Kern values between classes*/
-static const int8_t kern_class_values[] = {0, -8, -9, 8, 8, -10, 0, -9, 8, 0, 0, -8, 0, 0, 0, -8, 0, 0, -6, 0, 0, 0, 8, -2, 0, 0, 0, -18, 0, -2, 0, 0, 0, 0, 0, 0, -4, -4, 0, -8, -10, 0, 0, 0, 15, 0, -19, -2, -12, 0, -2, -38, 8, -6, 5, 0, 0, 0, -4, -4, 0, -4, -11, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, -6, 0, 0, 0, -41, -15, 8, 0, -7, -50, -15, 0, -15, 0, -15, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0};
-
-/*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes = {
-    .class_pair_values   = kern_class_values,
-    .left_class_mapping  = kern_left_class_mapping,
-    .right_class_mapping = kern_right_class_mapping,
-    .left_class_cnt      = 10,
-    .right_class_cnt     = 11,
-};
-
-/*--------------------
- *  ALL CUSTOM DATA
- *--------------------*/
-
-#    if LV_VERSION_CHECK(8, 0, 0)
-/*Store all the custom data of the font*/
-static lv_font_fmt_txt_glyph_cache_t cache;
-static const lv_font_fmt_txt_dsc_t   font_dsc = {
-#    else
-static lv_font_fmt_txt_dsc_t font_dsc             = {
-#    endif
-    .glyph_bitmap  = glyph_bitmap,
-    .glyph_dsc     = glyph_dsc,
-    .cmaps         = cmaps,
-    .kern_dsc      = &kern_classes,
-    .kern_scale    = 16,
-    .cmap_num      = 1,
-    .bpp           = 4,
-    .kern_classes  = 1,
-    .bitmap_format = 0,
-#    if LV_VERSION_CHECK(8, 0, 0)
-    .cache = &cache
-#    endif
-};
-
-/*-----------------
- *  PUBLIC FONT
- *----------------*/
-
-/*Initialize a public general font descriptor*/
-#    if LV_VERSION_CHECK(8, 0, 0)
-const lv_font_t montserrat_48_digits = {
-#    else
-lv_font_t                    montserrat_48_digits = {
-#    endif
-    .get_glyph_dsc    = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/
-    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
-    .line_height      = 34,                            /*The maximum line height required by the font*/
-    .base_line        = 0,                             /*Baseline measured from the bottom of the line*/
-#    if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
-    .subpx = LV_FONT_SUBPX_NONE,
-#    endif
-#    if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
-    .underline_position  = -5,
-    .underline_thickness = 2,
-#    endif
-    .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
-};
-
-#endif /*#if MONTSERRAT_48_DIGITS*/
diff --git a/keyboards/stront/keymaps/zzeneg/halconf.h b/keyboards/stront/keymaps/zzeneg/halconf.h
deleted file mode 100644
index 46c5a48c9a9..00000000000
--- a/keyboards/stront/keymaps/zzeneg/halconf.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2023 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define HAL_USE_I2C TRUE
-
-#include_next <halconf.h>
diff --git a/keyboards/stront/keymaps/zzeneg/icons/flag_pl.c b/keyboards/stront/keymaps/zzeneg/icons/flag_pl.c
deleted file mode 100644
index cac55d0eea6..00000000000
--- a/keyboards/stront/keymaps/zzeneg/icons/flag_pl.c
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#ifdef __has_include
-#    if __has_include("lvgl.h")
-#        ifndef LV_LVGL_H_INCLUDE_SIMPLE
-#            define LV_LVGL_H_INCLUDE_SIMPLE
-#        endif
-#    endif
-#endif
-
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#    include "lvgl.h"
-#else
-#    include "lvgl/lvgl.h"
-#endif
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#    define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FLAG_PL
-#    define LV_ATTRIBUTE_IMG_FLAG_PL
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FLAG_PL uint8_t flag_pl_map[] = {
-    0xff, 0xff, 0xff, 0xff, /*Color of index 0*/
-    0x3c, 0x14, 0xdc, 0xff, /*Color of index 1*/
-
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0,
-};
-
-const lv_img_dsc_t flag_pl = {
-    .header.cf          = LV_IMG_CF_INDEXED_1BIT,
-    .header.always_zero = 0,
-    .header.reserved    = 0,
-    .header.w           = 60,
-    .header.h           = 40,
-    .data_size          = 328,
-    .data               = flag_pl_map,
-};
diff --git a/keyboards/stront/keymaps/zzeneg/icons/flag_ru.c b/keyboards/stront/keymaps/zzeneg/icons/flag_ru.c
deleted file mode 100644
index 8019b0b4183..00000000000
--- a/keyboards/stront/keymaps/zzeneg/icons/flag_ru.c
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#ifdef __has_include
-#    if __has_include("lvgl.h")
-#        ifndef LV_LVGL_H_INCLUDE_SIMPLE
-#            define LV_LVGL_H_INCLUDE_SIMPLE
-#        endif
-#    endif
-#endif
-
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#    include "lvgl.h"
-#else
-#    include "lvgl/lvgl.h"
-#endif
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#    define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FLAG_RU
-#    define LV_ATTRIBUTE_IMG_FLAG_RU
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FLAG_RU uint8_t flag_ru_map[] = {
-    0xff, 0xff, 0xff, 0xff, /*Color of index 0*/
-    0xd8, 0x88, 0x0c, 0xff, /*Color of index 1*/
-
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-const lv_img_dsc_t flag_ru = {
-    .header.cf          = LV_IMG_CF_INDEXED_1BIT,
-    .header.always_zero = 0,
-    .header.reserved    = 0,
-    .header.w           = 60,
-    .header.h           = 40,
-    .data_size          = 328,
-    .data               = flag_ru_map,
-};
diff --git a/keyboards/stront/keymaps/zzeneg/icons/flag_uk.c b/keyboards/stront/keymaps/zzeneg/icons/flag_uk.c
deleted file mode 100644
index 8bf82348296..00000000000
--- a/keyboards/stront/keymaps/zzeneg/icons/flag_uk.c
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#ifdef __has_include
-#    if __has_include("lvgl.h")
-#        ifndef LV_LVGL_H_INCLUDE_SIMPLE
-#            define LV_LVGL_H_INCLUDE_SIMPLE
-#        endif
-#    endif
-#endif
-
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
-#    include "lvgl.h"
-#else
-#    include "lvgl/lvgl.h"
-#endif
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#    define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_FLAG_UK
-#    define LV_ATTRIBUTE_IMG_FLAG_UK
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_FLAG_UK uint8_t flag_uk_map[] = {
-    0xfe, 0xfe, 0xfe, 0xff, /*Color of index 0*/
-    0x32, 0x15, 0xc9, 0xff, /*Color of index 1*/
-    0x6c, 0x25, 0x06, 0xff, /*Color of index 2*/
-    0xcd, 0xbd, 0xca, 0xff, /*Color of index 3*/
-
-    0x40, 0x02, 0xaa, 0xaa, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xaa, 0xaa, 0xcd, 0x57, 0x50, 0x00, 0xea, 0xaa, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xaa, 0xab, 0xd5, 0x50, 0x55, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xaa, 0xb3, 0x55, 0xc0, 0xd5, 0x40, 0x03, 0xaa, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xaa, 0xf5, 0x54, 0x00, 0xc5, 0x54, 0x00, 0x2a, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xac, 0xd5, 0x70, 0x03, 0xb3, 0x55, 0x00, 0x0e, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xbd, 0x55, 0x00, 0x0a, 0xab, 0x15, 0x50, 0x00, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xab, 0x35, 0x5c, 0x00, 0xea, 0xaa, 0xcd, 0x54, 0x00, 0x3a, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaf, 0x55, 0x40, 0x02, 0xaa, 0xaa, 0xac, 0x55, 0x40, 0x02, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xcd, 0x57, 0x00, 0x3a, 0xaa, 0xaa, 0xab, 0x35, 0x50, 0x00, 0xea, 0x81, 0x55, 0x4e, 0xab, 0xd5, 0x50, 0x00, 0xaa, 0xaa,
-    0xaa, 0xaa, 0xb1, 0x55, 0x00, 0x0a, 0x81, 0x55, 0x4e, 0xb3, 0x55, 0xc0, 0x0e, 0xaa, 0xaa, 0xaa, 0xaa, 0xac, 0xd5, 0x40, 0x03, 0x81, 0x55, 0x4e, 0xf5, 0x54, 0x00, 0x2a, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xc5, 0x54, 0x00, 0x01, 0x55, 0x40, 0xd5, 0x70, 0x03, 0xaa, 0xaa, 0xaa, 0xff, 0xff, 0xff, 0xc3, 0xfc, 0x00, 0x01, 0x55, 0x40, 0xff, 0x00, 0x03, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x55, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x55, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-    0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x55, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x55, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xc0, 0x03, 0xff, 0x01, 0x55, 0x40, 0x00, 0xff, 0xcf, 0xff, 0xff, 0xff, 0xaa, 0xaa, 0xaa, 0xc0, 0x0d, 0x54, 0x01, 0x55, 0x40, 0x00, 0xd5, 0x53, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xac, 0x00, 0x15, 0x53, 0x81, 0x55, 0x4e, 0xc0, 0x0d, 0x57, 0x2a, 0xaa, 0xaa, 0xaa, 0xaa, 0xb0, 0x03, 0x55, 0x0a, 0x81, 0x55, 0x4e, 0xb0, 0x03, 0x55, 0x4e, 0xaa, 0xaa,
-    0xaa, 0xab, 0x00, 0x05, 0x54, 0xea, 0x81, 0x55, 0x4e, 0xab, 0x00, 0x35, 0x5c, 0xaa, 0xaa, 0xaa, 0xac, 0x00, 0xd5, 0x42, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xc0, 0x0d, 0x55, 0x3a, 0xaa, 0xaa, 0xc0, 0x01, 0x55, 0x3a, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xac, 0x00, 0xd5, 0x72, 0xaa, 0xab, 0x00, 0x35, 0x50, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xab, 0x00, 0x35, 0x54, 0xea, 0xb0, 0x00, 0x55, 0x4e, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xb0, 0x03, 0x55, 0xca, 0xc0, 0x0d, 0x54, 0x2a, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xac, 0x00, 0xd5, 0x53, 0x00, 0x15, 0x53, 0xaa, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xaa, 0xc0, 0x0d, 0x57, 0x03, 0x55, 0x0a, 0xaa, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xaa, 0xb0, 0x03, 0x55, 0x05, 0x54, 0xea, 0xaa, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xaa, 0xab, 0x00, 0x35, 0xd5, 0x42, 0xaa, 0xaa, 0xaa, 0xaa, 0x81, 0x55, 0x4e, 0xaa, 0xaa, 0xaa, 0xaa, 0xc0, 0x0d,
-};
-
-const lv_img_dsc_t flag_uk = {
-    .header.cf          = LV_IMG_CF_INDEXED_2BIT,
-    .header.always_zero = 0,
-    .header.reserved    = 0,
-    .header.w           = 60,
-    .header.h           = 40,
-    .data_size          = 616,
-    .data               = flag_uk_map,
-};
diff --git a/keyboards/stront/keymaps/zzeneg/keymap.c b/keyboards/stront/keymaps/zzeneg/keymap.c
deleted file mode 100644
index 67cc52e142c..00000000000
--- a/keyboards/stront/keymaps/zzeneg/keymap.c
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "zzeneg_display.h"
-#include "raw_hid.h"
-#include "transactions.h"
-
-// Left-hand home row mods
-#define HOME_A LGUI_T(KC_A)
-#define HOME_S LALT_T(KC_S)
-#define HOME_D LCTL_T(KC_D)
-#define HOME_F LSFT_T(KC_F)
-
-// Right-hand home row mods
-#define HOME_J RSFT_T(KC_J)
-#define HOME_K RCTL_T(KC_K)
-#define HOME_L LALT_T(KC_L)
-#define HOME_P RGUI_T(KC_P)
-
-// bottom mods
-#define SYM_SPC LT(_SYMBOL, KC_SPC)
-#define NUM_TAB LT(_NUMBER, KC_TAB)
-#define FUNC_ESC LT(_FUNC, KC_ESC)
-#define FUNC_ENT LT(_FUNC, KC_ENT)
-#define NAV_BSPC LT(_NAV, KC_BSPC)
-#define EU_DEL LT(_EU, KC_DEL)
-
-// game layer mods
-#define LALT_Q LALT_T(KC_Q)
-#define LSFT_MINS LSFT_T(KC_MINS)
-#define LCTL_ESC LCTL_T(KC_ESC)
-#define LGUI_QUOT LGUI_T(KC_QUOT)
-
-enum custom_keycodes {
-    M_EMAIL = SAFE_RANGE,
-    M_CBR,
-    M_PRN,
-    M_BRC,
-    M_ARROW,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* QWERTY
-     *               .---------------------------.                    .---------------------------.
-     *               |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |
-     * .------+------+------+------+------+------|                    |------+------+------+------+------+------.
-     * |  Q   |   A  |   S  |   D  |   F  |   G  |                    |   H  |   J  |   K  |   L  |   P  |  ;   |
-     * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
-     * |  -   |   Z  |   X  |   C  |   V  |   B  |--------.  .--------|   N  |   M  |   ,  |   .  |   /  |  '   |
-     * '-----------------------------------------/       /    \       \-----------------------------------------'
-     *                         | Esc  | Tab  |  / Space /      \ Enter \  | Bsps | Del  |
-     *                         |_FUNC | _NUM | /_SYMBOL/        \ _FUNC \ | _NAV | _EU  |
-     *                         `-------------''-------'          '-------''-------------'
-     */
-    // clang-format off
-    [_QWERTY] = LAYOUT(
-                            KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,     KC_O,
-        KC_Q,     HOME_A,   HOME_S,  HOME_D,  HOME_F,  KC_G,                KC_H,    HOME_J,  HOME_K,   HOME_L,  HOME_P,   KC_SCLN,
-        KC_MINS,  KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,                KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  KC_QUOT,
-                                   FUNC_ESC,  NUM_TAB,  SYM_SPC,     FUNC_ENT,  NAV_BSPC,  EU_DEL
-    ),
-
-    [_GAME] = LAYOUT(
-                            KC_W,    KC_E,    KC_R,    KC_T,               KC_Y,    KC_U,    KC_I,     KC_O,
-        LALT_Q,     KC_A,   KC_S,    KC_D,    KC_F,    KC_G,               KC_H,    KC_J,    KC_K,     KC_L,    KC_P,     KC_SCLN,
-        LSFT_MINS,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,               KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH,  LGUI_QUOT,
-                                    LCTL_ESC,  NUM_TAB,  SYM_SPC,    FUNC_ENT,  NAV_BSPC,  EU_DEL
-    ),
-
-    [_EU] = LAYOUT(
-                               XXXXXXX,     RALT(KC_E),  XXXXXXX,     M_CBR,               KC_MUTE,     RALT(KC_U),  XXXXXXX,  RALT(KC_O),
-        XXXXXXX,  RALT(KC_A),  RALT(KC_S),  LCTL(KC_C),  KC_LSFT,     M_PRN,               M_EMAIL,     KC_RSFT,     M_ARROW,  RALT(KC_L),  XXXXXXX,  XXXXXXX,
-        XXXXXXX,  RALT(KC_Z),  RALT(KC_X),  RALT(KC_C),  LCTL(KC_V),  M_BRC,               RALT(KC_N),  XXXXXXX,     XXXXXXX,  XXXXXXX,     XXXXXXX,  XXXXXXX,
-                                                 FUNC_ESC,   NUM_TAB,   SYM_SPC,      XXXXXXX,  XXXXXXX,   _______
-    ),
-
-    [_NAV] = LAYOUT(
-                            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,             XXXXXXX,        XXXXXXX,  KC_PGDN,  KC_PGUP,
-        XXXXXXX,  KC_LGUI,  KC_LALT,  KC_LCTL,  KC_LSFT,  XXXXXXX,             LALT(KC_UP),    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_PAUS,
-        XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,             LALT(KC_DOWN),  KC_HOME,  KC_END,   KC_INS,   KC_APP,   XXXXXXX,
-                                       FUNC_ESC,   NUM_TAB,   SYM_SPC,     XXXXXXX,  _______,  EU_DEL
-    ),
-
-    [_NUMBER] = LAYOUT(
-                           KC_7,    KC_8,    KC_9,    KC_PLUS,             XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-        KC_GRV,   KC_0,    KC_4,    KC_5,    KC_6,    KC_DOT,              XXXXXXX,  KC_RSFT,  KC_RCTL,  KC_LALT,  KC_RGUI,  XXXXXXX,
-        KC_BSPC,  KC_AT,   KC_1,    KC_2,    KC_3,    KC_ASTR,             XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-                                    KC_ENT,  _______,  TG(_GAME),       FUNC_ENT,  NAV_BSPC,  EU_DEL
-    ),
-
-    [_SYMBOL] = LAYOUT(
-                            KC_PERC,  KC_PLUS,  KC_LCBR,  KC_RCBR,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-        KC_DLR,   KC_AMPR,  KC_EXLM,  KC_EQL,   KC_LPRN,  KC_RPRN,            XXXXXXX,  KC_RSFT,  KC_RCTL,  KC_LALT,  KC_RGUI,  XXXXXXX,
-        KC_BSLS,  KC_PIPE,  KC_HASH,  KC_ASTR,  KC_LBRC,  KC_RBRC,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-                                         MO(_SYS),  KC_BSPC, _______,     FUNC_ENT,  NAV_BSPC,  EU_DEL
-    ),
-
-    [_FUNC] = LAYOUT(
-                            KC_F7,   KC_F8,   KC_F9,   KC_CAPS,            XXXXXXX,  KC_PSCR,  KC_SCRL,  KC_NUM,
-        KC_LCTL,  KC_F11,   KC_F4,   KC_F5,   KC_F6,   KC_F12,             XXXXXXX,  KC_RSFT,  KC_RCTL,  KC_LALT,  KC_RGUI,  XXXXXXX,
-        KC_CIRC,  KC_F10,   KC_F1,   KC_F2,   KC_F3,   KC_TILD,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-                                         _______, KC_MNXT, KC_MPLY,     _______, XXXXXXX,  MO(_SYS)
-    ),
-
-    [_SYS] = LAYOUT(
-                            BL_DOWN,  BL_UP,    BL_TOGG,  XXXXXXX,            XXXXXXX,   RGB_TOG,  RGB_MOD,  RGB_RMOD,
-        XXXXXXX,  XXXXXXX,  DT_UP,    DT_DOWN,  DT_PRNT,  XXXXXXX,            XXXXXXX,   RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_SPI,  RGB_M_P,
-        EH_LEFT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  EH_RGHT,            EH_RGHT,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_SPD,  EH_LEFT,
-                                            _______, QK_BOOT, _______,     _______, QK_BOOT, _______
-    )
-    // clang-format on
-};
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    // clang-format off
-    [_QWERTY] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_GAME]   = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_EU]     = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_NAV]    = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
-    [_NUMBER] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
-    [_SYMBOL] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
-    [_FUNC]   = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
-    [_SYS]    = { ENCODER_CCW_CW(BL_DOWN, BL_UP),   ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }
-    // clang-format on
-};
-#endif // ENCODER_MAP_ENABLE
-
-/* different tapping term for different fingers */
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // pinkies
-        case HOME_A:
-        case HOME_P:
-            return 250;
-        // ring
-        case HOME_S:
-        case HOME_L:
-            return 200;
-        // middle
-        case HOME_D:
-        case HOME_K:
-            return 160;
-        // index
-        case HOME_F:
-        case HOME_J:
-            return 140;
-        // thumb and game
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-/* helper function for custom increased tapping term for home row CTRL + other keys */
-uint16_t HOME_CTRL_pressed_time = 0;
-void     custom_home_row_ctrl(keyrecord_t *record, uint16_t time) {
-    if (record->tap.count && get_mods() & MOD_MASK_CTRL) {
-        if (TIMER_DIFF_16(record->event.time, HOME_CTRL_pressed_time) < time) {
-            del_mods(MOD_MASK_CTRL);
-            tap_code(KC_D);
-        }
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    dprintf("process_record_user %u %s %s %d\n", keycode, record->event.pressed ? "pressed" : "depressed", record->tap.interrupted ? "interrupted" : "not interrupted", record->tap.count);
-
-    if (record->event.pressed) {
-        uint8_t data[32];
-        data[0] = 0;
-
-        switch (keycode) {
-            // send hid commands
-            case KC_VOLU:
-            case KC_VOLD:
-                data[0] = _VOLUME;
-                break;
-
-            // handle macros
-            case M_EMAIL:
-                SEND_STRING("zzeneg@gmail.com");
-                break;
-            case M_CBR:
-                SEND_STRING("{}" SS_TAP(X_LEFT));
-                break;
-            case M_PRN:
-                SEND_STRING("()" SS_TAP(X_LEFT));
-                break;
-            case M_BRC:
-                SEND_STRING("[]" SS_TAP(X_LEFT));
-                break;
-            case M_ARROW:
-                SEND_STRING("=>");
-                break;
-
-            // custom increased tapping term for home row CTRL + other keys
-            case HOME_D:
-                // save time when CTRL from D key is pressed
-                if (!record->tap.count) {
-                    HOME_CTRL_pressed_time = record->event.time;
-                }
-                break;
-            case HOME_S:
-                // if S is pressed and CTRL is active, and < 150 passed since CTRL was pressed, cancel CTRL and send D instead
-                custom_home_row_ctrl(record, 150);
-                break;
-            case HOME_A:
-                // if A is pressed and CTRL is active, and < 180 passed since CTRL was pressed, cancel CTRL and send D instead
-                custom_home_row_ctrl(record, 180);
-                break;
-        }
-
-        if (data[0]) {
-            dprintf("raw_hid_send %u\n", data[0]);
-            raw_hid_send(data, sizeof(data));
-        }
-    }
-
-    return true;
-}
-
-/* Active Layer processing */
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (is_display_enabled()) {
-        display_process_layer_state(get_highest_layer(state));
-    } else if (is_keyboard_master() && !is_keyboard_left()) {
-        uint8_t layer = get_highest_layer(state);
-        dprintf("RPC_ID_USER_LAYER_SYNC: %u\n", layer);
-        transaction_rpc_send(RPC_ID_USER_LAYER_SYNC, 1, &layer);
-    }
-
-    return state;
-}
-
-/* Caps Word processing */
-void caps_word_set_user(bool active) {
-    if (is_display_enabled()) {
-        display_process_caps_word(active);
-    } else if (is_keyboard_master() && !is_keyboard_left()) {
-        dprintf("RPC_ID_USER_CAPS_WORD_SYNC: %s\n", active ? "active" : "inactive");
-        transaction_rpc_send(RPC_ID_USER_CAPS_WORD_SYNC, 1, &active);
-    }
-}
-
-/* default caps word logic that allows KC_MINS. Underscore can be typed with KC_RSFT + KC_MINS */
-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 next key.
-            return true;
-
-        // Keycodes that continue Caps Word, without shifting.
-        case KC_1 ... KC_0:
-        case KC_BSPC:
-        case KC_DEL:
-        case KC_MINS:
-        case KC_RSFT:
-            return true;
-
-        default:
-            return false; // Deactivate Caps Word.
-    }
-}
-
-/* Raw HID processing*/
-void raw_hid_receive(uint8_t *data, uint8_t length) {
-    dprintf("raw_hid_receive - received %u bytes \n", length);
-
-    if (is_display_enabled()) {
-        display_process_raw_hid_data(data, length);
-    } else if (is_keyboard_master() && !is_keyboard_left()) {
-        dprint("RPC_ID_USER_HID_SYNC \n");
-        transaction_rpc_send(RPC_ID_USER_HID_SYNC, length, data);
-    }
-}
-
-void hid_sync(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer) {
-    if (is_display_enabled()) {
-        display_process_raw_hid_data((uint8_t *)initiator2target_buffer, initiator2target_buffer_size);
-    }
-}
-
-void layer_sync(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer) {
-    if (is_display_enabled()) {
-        display_process_layer_state(*(uint8_t *)initiator2target_buffer);
-    }
-}
-
-void caps_word_sync(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer) {
-    if (is_display_enabled()) {
-        display_process_caps_word(*(bool *)initiator2target_buffer);
-    }
-}
-
-void keyboard_post_init_user() {
-    // sync received hid data
-    transaction_register_rpc(RPC_ID_USER_HID_SYNC, hid_sync);
-    // sync highest layer (a bit more performant than standard SPLIT_LAYER_STATE_ENABLE)
-    transaction_register_rpc(RPC_ID_USER_LAYER_SYNC, layer_sync);
-    // sync caps word state
-    transaction_register_rpc(RPC_ID_USER_CAPS_WORD_SYNC, caps_word_sync);
-}
diff --git a/keyboards/stront/keymaps/zzeneg/lv_conf.h b/keyboards/stront/keymaps/zzeneg/lv_conf.h
deleted file mode 100644
index 8b0c1f3f833..00000000000
--- a/keyboards/stront/keymaps/zzeneg/lv_conf.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2023 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* disable some things before lv_conf include */
-#define LV_USE_CALENDAR 0
-#define LV_USE_SPAN 0
-#define LV_USE_ROLLER 0
-#define LV_USE_TEXTAREA 0
-
-#include_next <lv_conf.h>
-
-/* Custom fonts:
-    - montserrat_20_en_ru - english/cyrillic symbols, range 0x20-0x7F,0x0410-0x044F,0x0401,0x0451
-    - montserrat_48_digits - digits, dot and colon only, range 0x2E,0x30-0x3A
- */
-
-#undef LV_FONT_CUSTOM_DECLARE
-#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(montserrat_20_en_ru) LV_FONT_DECLARE(montserrat_48_digits)
-
-#undef LV_FONT_DEFAULT
-#define LV_FONT_DEFAULT &montserrat_20_en_ru
-
-#undef LV_FONT_MONTSERRAT_20
-#define LV_FONT_MONTSERRAT_20 0
-
-#undef LV_FONT_MONTSERRAT_48
-#define LV_FONT_MONTSERRAT_48 0
-
-// #undef LV_FONT_MONTSERRAT_16
-// #define LV_FONT_MONTSERRAT_16 1
-
-// #undef LV_FONT_MONTSERRAT_18
-// #define LV_FONT_MONTSERRAT_18 1
-
-// #undef LV_FONT_MONTSERRAT_20
-// #define LV_FONT_MONTSERRAT_20 1
-
-// #undef LV_FONT_MONTSERRAT_22
-// #define LV_FONT_MONTSERRAT_22 1
-
-// #undef LV_FONT_MONTSERRAT_24
-// #define LV_FONT_MONTSERRAT_24 1
-
-// #undef LV_FONT_MONTSERRAT_26
-// #define LV_FONT_MONTSERRAT_26 1
-
-// #undef LV_FONT_MONTSERRAT_28
-// #define LV_FONT_MONTSERRAT_28 1
-
-// #undef LV_FONT_MONTSERRAT_30
-// #define LV_FONT_MONTSERRAT_30 1
-
-// #undef LV_FONT_MONTSERRAT_32
-// #define LV_FONT_MONTSERRAT_32 1
-
-// #undef LV_FONT_MONTSERRAT_34
-// #define LV_FONT_MONTSERRAT_34 1
-
-// #undef LV_FONT_MONTSERRAT_36
-// #define LV_FONT_MONTSERRAT_36 1
-
-// #undef LV_FONT_MONTSERRAT_38
-// #define LV_FONT_MONTSERRAT_38 1
-
-// #undef LV_FONT_MONTSERRAT_40
-// #define LV_FONT_MONTSERRAT_40 1
-
-// #undef LV_FONT_MONTSERRAT_42
-// #define LV_FONT_MONTSERRAT_42 1
-
-// #undef LV_FONT_MONTSERRAT_44
-// #define LV_FONT_MONTSERRAT_44 1
-
-// #undef LV_FONT_MONTSERRAT_46
-// #define LV_FONT_MONTSERRAT_46 1
-
-// #undef LV_FONT_MONTSERRAT_48
-// #define LV_FONT_MONTSERRAT_48 1
-
-/* disable widgets*/
-#undef LV_USE_ANIMIMG
-#define LV_USE_ANIMIMG 0
-#undef LV_USE_BAR
-#define LV_USE_BAR 0
-#undef LV_USE_BTN
-#define LV_USE_BTN 0
-#undef LV_USE_BTNMATRIX
-#define LV_USE_BTNMATRIX 0
-#undef LV_USE_CANVAS
-#define LV_USE_CANVAS 0
-#undef LV_USE_CHECKBOX
-#define LV_USE_CHECKBOX 0
-#undef LV_USE_DROPDOWN
-#define LV_USE_DROPDOWN 0
-#undef LV_USE_LINE
-#define LV_USE_LINE 0
-#undef LV_USE_SLIDER
-#define LV_USE_SLIDER 0
-#undef LV_USE_SWITCH
-#define LV_USE_SWITCH 0
-#undef LV_USE_TABLE
-#define LV_USE_TABLE 0
-
-/* disable extra components */
-#undef LV_USE_CHART
-#define LV_USE_CHART 0
-#undef LV_USE_COLORWHEEL
-#define LV_USE_COLORWHEEL 0
-#undef LV_USE_IMGBTN
-#define LV_USE_IMGBTN 0
-#undef LV_USE_KEYBOARD
-#define LV_USE_KEYBOARD 0
-#undef LV_USE_LED
-#define LV_USE_LED 0
-#undef LV_USE_LIST
-#define LV_USE_LIST 0
-#undef LV_USE_MENU
-#define LV_USE_MENU 0
-#undef LV_USE_METER
-#define LV_USE_METER 0
-#undef LV_USE_MSGBOX
-#define LV_USE_MSGBOX 0
-#undef LV_USE_SPINBOX
-#define LV_USE_SPINBOX 0
-#undef LV_USE_SPINNER
-#define LV_USE_SPINNER 0
-#undef LV_USE_TABVIEW
-#define LV_USE_TABVIEW 0
-#undef LV_USE_TILEVIEW
-#define LV_USE_TILEVIEW 0
-#undef LV_USE_WIN
-#define LV_USE_WIN 0
-
-/* disable themes */
-#undef LV_USE_THEME_BASIC
-#define LV_USE_THEME_BASIC 0
-#undef LV_USE_THEME_MONO
-#define LV_USE_THEME_MONO 0
-
-/* disable layouts */
-#undef LV_USE_GRID
-#define LV_USE_GRID 0
-
-/* disable build examples */
-#undef LV_BUILD_EXAMPLES
-#define LV_BUILD_EXAMPLES 0
diff --git a/keyboards/stront/keymaps/zzeneg/mcuconf.h b/keyboards/stront/keymaps/zzeneg/mcuconf.h
deleted file mode 100644
index 47ee67119de..00000000000
--- a/keyboards/stront/keymaps/zzeneg/mcuconf.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2023 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef RP_I2C_USE_I2C1
-#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/stront/keymaps/zzeneg/rules.mk b/keyboards/stront/keymaps/zzeneg/rules.mk
deleted file mode 100644
index 26ddf778031..00000000000
--- a/keyboards/stront/keymaps/zzeneg/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# CONSOLE_ENABLE = yes
-
-EXTRAKEY_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-CAPS_WORD_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
-DYNAMIC_TAPPING_TERM_ENABLE = yes
-
-POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
-
-RAW_ENABLE = yes
-
-SRC +=  zzeneg_display.c \
-		fonts/montserrat_20_en_ru.c \
-		fonts/montserrat_48_digits.c \
-		icons/flag_uk.c \
-		icons/flag_ru.c
diff --git a/keyboards/stront/keymaps/zzeneg/zzeneg_display.c b/keyboards/stront/keymaps/zzeneg/zzeneg_display.c
deleted file mode 100644
index d8d6f4d70be..00000000000
--- a/keyboards/stront/keymaps/zzeneg/zzeneg_display.c
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2023 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "zzeneg_display.h"
-#include "display.h"
-#include "raw_hid.h"
-#include "lvgl_helpers.h"
-
-uint16_t home_screen_timer = 0;
-
-/* screens */
-static lv_obj_t *screen_home;
-static lv_obj_t *screen_volume;
-static lv_obj_t *screen_media;
-
-/* home screen content */
-static lv_obj_t *label_time;
-static lv_obj_t *label_volume_home;
-static lv_obj_t *label_shift;
-static lv_obj_t *label_ctrl;
-static lv_obj_t *label_alt;
-static lv_obj_t *label_gui;
-static lv_obj_t *label_layer;
-static lv_obj_t *label_caps;
-static lv_obj_t *label_caps_word;
-static lv_obj_t *icon_layout;
-
-/* volume screen content */
-static lv_obj_t *arc_volume;
-static lv_obj_t *label_volume_arc;
-
-/* media screen content */
-static lv_obj_t *label_media_artist;
-static lv_obj_t *label_media_title;
-
-LV_IMG_DECLARE(flag_ru);
-LV_IMG_DECLARE(flag_uk);
-/* can be replaced with PL flag (update rules.mk as well) */
-// LV_IMG_DECLARE(flag_pl);
-
-enum layout { _EN = 0, _RU };
-void set_layout_icon(uint8_t layout) {
-    switch (layout) {
-        case _EN:
-            lv_img_set_src(icon_layout, &flag_uk);
-            break;
-
-        case _RU:
-            lv_img_set_src(icon_layout, &flag_ru);
-            break;
-    }
-}
-
-void read_string(uint8_t *data, char *string_data) {
-    uint8_t data_length = data[1];
-    memcpy(string_data, data + 2, data_length);
-    string_data[data_length] = '\0';
-}
-
-void start_home_screen_timer(void) {
-    dprint("reset home screen\n");
-    home_screen_timer = timer_read();
-}
-
-void init_screen_home_custom(void) {
-    screen_home = lv_scr_act();
-    lv_obj_add_style(screen_home, &style_screen, 0);
-    use_flex_column(screen_home);
-
-    label_volume_home = lv_label_create(screen_home);
-    lv_label_set_text(label_volume_home, "");
-
-    lv_obj_t *mods = lv_obj_create(screen_home);
-    lv_obj_add_style(mods, &style_container, 0);
-    use_flex_row(mods);
-
-    label_gui   = create_button(mods, "GUI", &style_button, &style_button_active);
-    label_alt   = create_button(mods, "ALT", &style_button, &style_button_active);
-    label_ctrl  = create_button(mods, "CTL", &style_button, &style_button_active);
-    label_shift = create_button(mods, "SFT", &style_button, &style_button_active);
-
-    label_time = lv_label_create(screen_home);
-    lv_label_set_text(label_time, "00:00");
-    lv_obj_set_style_text_font(label_time, &montserrat_48_digits, LV_PART_MAIN);
-
-    lv_obj_t *caps = lv_obj_create(screen_home);
-    lv_obj_add_style(caps, &style_container, 0);
-    use_flex_row(caps);
-
-    label_caps      = create_button(caps, "CAPS", &style_button, &style_button_active);
-    label_caps_word = create_button(caps, "CAPS WORD", &style_button, &style_button_active);
-
-    lv_obj_t *bottom_row = lv_obj_create(screen_home);
-    lv_obj_add_style(bottom_row, &style_container, 0);
-
-    label_layer = lv_label_create(bottom_row);
-    lv_label_set_text(label_layer, "");
-    lv_obj_align(label_layer, LV_ALIGN_LEFT_MID, 10, 0);
-    display_process_layer_state(0);
-
-    icon_layout = lv_img_create(bottom_row);
-    lv_obj_set_style_radius(icon_layout, 4, 0);
-    lv_obj_set_style_clip_corner(icon_layout, true, 0);
-    lv_obj_align(icon_layout, LV_ALIGN_RIGHT_MID, -10, 0);
-}
-
-void init_screen_volume(void) {
-    screen_volume = lv_obj_create(NULL);
-    lv_obj_add_style(screen_volume, &style_screen, 0);
-
-    arc_volume = lv_arc_create(screen_volume);
-    lv_obj_set_size(arc_volume, 200, 200);
-    lv_obj_center(arc_volume);
-
-    label_volume_arc = lv_label_create(screen_volume);
-    lv_label_set_text(label_volume_arc, "00");
-    lv_obj_set_style_text_font(label_volume_arc, &montserrat_48_digits, LV_PART_MAIN);
-    lv_obj_center(label_volume_arc);
-
-    lv_obj_t *volume_text_label = lv_label_create(screen_volume);
-    lv_label_set_text(volume_text_label, "Volume");
-    lv_obj_align(volume_text_label, LV_ALIGN_BOTTOM_MID, 0, -10);
-}
-
-void init_screen_media(void) {
-    screen_media = lv_obj_create(NULL);
-    lv_obj_add_style(screen_media, &style_screen, 0);
-    use_flex_column(screen_media);
-    lv_obj_set_flex_align(screen_media, LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
-
-    label_media_artist = lv_label_create(screen_media);
-    lv_label_set_text(label_media_artist, "N/A");
-    lv_label_set_long_mode(label_media_artist, LV_LABEL_LONG_WRAP);
-    lv_obj_set_width(label_media_artist, lv_pct(90));
-    lv_obj_set_style_text_align(label_media_artist, LV_TEXT_ALIGN_CENTER, 0);
-
-    label_media_title = lv_label_create(screen_media);
-    lv_label_set_text(label_media_title, "N/A");
-    lv_label_set_long_mode(label_media_title, LV_LABEL_LONG_WRAP);
-    lv_obj_set_width(label_media_title, lv_pct(90));
-    lv_obj_set_style_text_align(label_media_title, LV_TEXT_ALIGN_CENTER, 0);
-}
-
-bool display_init_user(void) {
-    init_screen_home_custom();
-    init_screen_volume();
-    init_screen_media();
-
-    return false;
-}
-
-void display_process_raw_hid_data(uint8_t *data, uint8_t length) {
-    uint8_t data_type = data[0];
-    char    string_data[length - 2];
-    dprintf("display_process_raw_hid_data - received data_type %u \n", data_type);
-    switch (data_type) {
-        case _TIME:
-            dprintf("time %02d:%02d\n", data[1], data[2]);
-            lv_label_set_text_fmt(label_time, "%02d:%02d", data[1], data[2]);
-            break;
-
-        case _VOLUME:
-            dprintf("volume %d\n", data[1]);
-            lv_label_set_text_fmt(label_volume_home, "Volume: %02d%%", data[1]);
-            lv_label_set_text_fmt(label_volume_arc, "%02d", data[1]);
-            lv_arc_set_value(arc_volume, data[1]);
-            lv_scr_load(screen_volume);
-            start_home_screen_timer();
-            break;
-
-        case _LAYOUT:
-            dprintf("layout %d\n", data[1]);
-            set_layout_icon(data[1]);
-            break;
-
-        case _MEDIA_ARTIST:
-            read_string(data, string_data);
-            dprintf("media artist %s\n", string_data);
-            lv_label_set_text(label_media_artist, string_data);
-            lv_scr_load(screen_media);
-            start_home_screen_timer();
-            break;
-
-        case _MEDIA_TITLE:
-            read_string(data, string_data);
-            dprintf("media title %s\n", string_data);
-            lv_label_set_text(label_media_title, string_data);
-            lv_scr_load(screen_media);
-            start_home_screen_timer();
-            break;
-    }
-}
-
-void display_process_layer_state(uint8_t layer) {
-    switch (layer) {
-        case _QWERTY:
-            lv_label_set_text(label_layer, "QWERTY");
-            break;
-        case _GAME:
-            lv_label_set_text(label_layer, "GAME");
-            break;
-        case _EU:
-            lv_label_set_text(label_layer, "EU");
-            break;
-        case _NAV:
-            lv_label_set_text(label_layer, "NAV");
-            break;
-        case _NUMBER:
-            lv_label_set_text(label_layer, "NUMBER");
-            break;
-        case _SYMBOL:
-            lv_label_set_text(label_layer, "SYMBOL");
-            break;
-        case _FUNC:
-            lv_label_set_text(label_layer, "FUNC");
-            break;
-        case _SYS:
-            lv_label_set_text(label_layer, "SYSTEM");
-            break;
-    }
-}
-
-void display_housekeeping_task(void) {
-    if (home_screen_timer && timer_elapsed(home_screen_timer) > 5000) {
-        home_screen_timer = 0;
-        lv_scr_load(screen_home);
-    }
-
-    toggle_state(label_shift, LV_STATE_PRESSED, MODS_SHIFT);
-    toggle_state(label_ctrl, LV_STATE_PRESSED, MODS_CTRL);
-    toggle_state(label_alt, LV_STATE_PRESSED, MODS_ALT);
-    toggle_state(label_gui, LV_STATE_PRESSED, MODS_GUI);
-}
-
-void display_process_caps(bool active) {
-    toggle_state(label_caps, LV_STATE_PRESSED, active);
-}
-
-void display_process_caps_word(bool active) {
-    dprint("display_process_caps_word\n");
-    toggle_state(label_caps_word, LV_STATE_PRESSED, active);
-}
diff --git a/keyboards/stront/keymaps/zzeneg/zzeneg_display.h b/keyboards/stront/keymaps/zzeneg/zzeneg_display.h
deleted file mode 100644
index 22b36793f40..00000000000
--- a/keyboards/stront/keymaps/zzeneg/zzeneg_display.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2023 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "quantum.h"
-
-typedef enum {
-    _QWERTY = 0,
-    _GAME,
-    _EU,
-    _NAV,
-    _NUMBER,
-    _SYMBOL,
-    _FUNC,
-    _SYS,
-} layer_number;
-
-typedef enum {
-    _TIME = 0,
-    _VOLUME,
-    _LAYOUT,
-    _MEDIA_ARTIST,
-    _MEDIA_TITLE,
-} hid_data_type;
-
-void display_process_raw_hid_data(uint8_t *data, uint8_t length);
-void display_process_layer_state(uint8_t layer);
-void display_process_caps_word(bool active);
diff --git a/keyboards/swiss/info.json b/keyboards/swiss/info.json
new file mode 100644
index 00000000000..039153cd7f5
--- /dev/null
+++ b/keyboards/swiss/info.json
@@ -0,0 +1,97 @@
+{
+    "manufacturer": "Bregoli",
+    "keyboard_name": "swiss",
+    "maintainer": "Bregoli",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B4", "B5", "B6", "C6", "C7", "D3"],
+        "rows": ["D6", "D4", "D5", "B2", "D7"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0420",
+        "vid": "0x4C43"
+    },
+    "community_layouts": ["60_hhkb"],
+    "layouts": {
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/swiss/keymaps/default/keymap.c b/keyboards/swiss/keymaps/default/keymap.c
new file mode 100644
index 00000000000..7f7d2ef6033
--- /dev/null
+++ b/keyboards/swiss/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_60_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_BSLS, 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_BSPC,
+    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_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_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    ),
+    /* FN */
+    [1] = LAYOUT_60_hhkb(
+        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_INS,  KC_DEL,
+    KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCT, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS
+    )
+};
+
diff --git a/keyboards/swiss/keymaps/via/keymap.c b/keyboards/swiss/keymaps/via/keymap.c
new file mode 100644
index 00000000000..7f7d2ef6033
--- /dev/null
+++ b/keyboards/swiss/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_60_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_BSLS, 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_BSPC,
+    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_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_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    ),
+    /* FN */
+    [1] = LAYOUT_60_hhkb(
+        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_INS,  KC_DEL,
+    KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCT, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS
+    )
+};
+
diff --git a/keyboards/swiss/keymaps/via/rules.mk b/keyboards/swiss/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/swiss/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/swiss/readme.md b/keyboards/swiss/readme.md
new file mode 100644
index 00000000000..779f7dcc7fa
--- /dev/null
+++ b/keyboards/swiss/readme.md
@@ -0,0 +1,28 @@
+# Swiss
+
+![Swiss](https://i.imgur.com/8G6MB5D.png)
+
+An HHKB that looks like... Cheese?
+A fun, not so serious, ridiculously cheesy keyboard. 
+
+* Keyboard Maintainer: [Bregoli](https://geekhack.org/index.php?topic=119509.0)
+* Hardware Supported: Custom HHKB PCB and C3 Unified Daughterboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make swiss:default
+
+Flashing example for this keyboard:
+
+    make swiss: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 `QK_BOOT` if it is available
diff --git a/keyboards/swiss/rules.mk b/keyboards/swiss/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/swiss/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/sx60/keymaps/amnobis/config.h b/keyboards/sx60/keymaps/amnobis/config.h
deleted file mode 100644
index a5568e400de..00000000000
--- a/keyboards/sx60/keymaps/amnobis/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../config.h"
diff --git a/keyboards/sx60/keymaps/amnobis/keymap.c b/keyboards/sx60/keymaps/amnobis/keymap.c
deleted file mode 100644
index 014fed6cabe..00000000000
--- a/keyboards/sx60/keymaps/amnobis/keymap.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_ansi_split_bs_rshift( 
-			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_BSLS, KC_ESC,
-	KC_SPC, 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_BSPC,
-	KC_SPC, MO(1),   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_SPC, 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_SPC, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT ),
-
-	LAYOUT_ansi_split_bs_rshift(
-			 QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_UP,   KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_LPRN, KC_RPRN, KC_GRV,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-	LAYOUT_ansi_split_bs_rshift(
-			 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-    LAYOUT_ansi_split_bs_rshift(
-			 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-    LAYOUT_ansi_split_bs_rshift(
-			 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-    LAYOUT_ansi_split_bs_rshift(
-			 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-    LAYOUT_ansi_split_bs_rshift(
-			 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-    LAYOUT_ansi_split_bs_rshift(
-			 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-    LAYOUT_ansi_split_bs_rshift(
-			 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-    LAYOUT_ansi_split_bs_rshift(
-			 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-    LAYOUT_ansi_split_bs_rshift(
-			 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
-};
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
diff --git a/keyboards/sx60/keymaps/amnobis/readme.md b/keyboards/sx60/keymaps/amnobis/readme.md
deleted file mode 100644
index 207d2418049..00000000000
--- a/keyboards/sx60/keymaps/amnobis/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Default Keymap
-===
-
-Super simple default keymap.
-
-Keymap Maintainer: [amnobis](https://github.com/amnobis)
-
-Intended usage: This is mostly provided for testing before you build your own keymap and as a reference to a stock(ish) configuration
diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c
index 66bc494be6c..22f37db539c 100644
--- a/keyboards/sx60/matrix.c
+++ b/keyboards/sx60/matrix.c
@@ -214,7 +214,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         return 0;
     } else {
         uint8_t data = 0;
-        mcp23018_status = i2c_readReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
+        mcp23018_status = i2c_read_register(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
         if (!mcp23018_status) {
             current_matrix[current_row] |= (~((uint16_t)data) << 8);
         }
@@ -245,7 +245,7 @@ static void select_row(uint8_t row)
            set active row output : 1
            set other rows hi-Z : 1 */
         uint8_t port = 0xFF & ~(1<<abs(row-4));
-        mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOB, &port, 1, I2C_TIMEOUT);
+        mcp23018_status = i2c_write_register(I2C_ADDR, GPIOB, &port, 1, I2C_TIMEOUT);
     }
 
     uint8_t pin = row_pins[row];
diff --git a/keyboards/sx60/sx60.c b/keyboards/sx60/sx60.c
index cb7f2b88ff9..12fa6a9ed55 100755
--- a/keyboards/sx60/sx60.c
+++ b/keyboards/sx60/sx60.c
@@ -27,9 +27,9 @@ uint8_t init_mcp23018(void) {
         0b00000000,
     };
 
-    mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, direction, 2, I2C_TIMEOUT);
+    mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, direction, 2, I2C_TIMEOUT);
     if (mcp23018_status) return mcp23018_status;
 
-    mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, pullup, 2, I2C_TIMEOUT);
+    mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, pullup, 2, I2C_TIMEOUT);
     return mcp23018_status;
 }
diff --git a/keyboards/synapse/keymaps/7u_space/rules.mk b/keyboards/synapse/keymaps/7u_space/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/synapse/keymaps/7u_space/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/synapse/keymaps/default/rules.mk b/keyboards/synapse/keymaps/default/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/synapse/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/synapse/readme.md b/keyboards/synapse/readme.md
deleted file mode 100644
index f98fee8e42b..00000000000
--- a/keyboards/synapse/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# synapse
-
-![synapse](https://i.imgur.com/OQNNPBhh.jpg)
-
-Stagger PCB for Cervello!
-
-* Keyboard Maintainer: https://github.com/qpockets
-* Hardware Availability: [P3D Store](https://p3dstore.com/products/cervello-acrylic-keyboard-case-and-pcb-group-buy?_pos=4&_sid=fd078da46&_ss=r&variant=40398412677304) Group Buy
-
-Make example for this keyboard (after setting up your build environment):
-
-    make synapse:default
-
-Flashing example for this keyboard:
-
-    make synapse: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 `QK_BOOT` if it is available
-* 
diff --git a/keyboards/synthlabs/060/config.h b/keyboards/synthlabs/060/config.h
deleted file mode 100644
index 4a475316ede..00000000000
--- a/keyboards/synthlabs/060/config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Aaron Hong (@hongaaronc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Backlighting */
-#define RGB_MATRIX_LED_COUNT 63
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// RGB Matrix Animation modes
-// 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_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_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
-#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
-// Disabled due to firmware size constraints
-// Can be enabled in exchange for some other effects
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json
index b816b18027b..0c5870b46aa 100644
--- a/keyboards/synthlabs/060/info.json
+++ b/keyboards/synthlabs/060/info.json
@@ -30,6 +30,39 @@
     "force_nkro": true
   },
   "rgb_matrix": {
+    "animations": {
+      "alphas_mods": true,
+      "gradient_up_down": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_sat": true,
+      "band_val": true,
+      "cycle_all": true,
+      "cycle_left_right": true,
+      "cycle_up_down": true,
+      "rainbow_moving_chevron": true,
+      "cycle_out_in": true,
+      "raindrops": true,
+      "jellybean_raindrops": true,
+      "hue_breathing": true,
+      "hue_pendulum": true,
+      "hue_wave": true,
+      "pixel_rain": true,
+      "pixel_flow": true,
+      "pixel_fractal": true,
+      "solid_reactive_simple": true,
+      "solid_reactive": true,
+      "solid_reactive_wide": true,
+      "solid_reactive_multiwide": true,
+      "solid_reactive_cross": true,
+      "solid_reactive_multicross": true,
+      "solid_reactive_nexus": true,
+      "solid_reactive_multinexus": true,
+      "splash": true,
+      "multisplash": true,
+      "solid_splash": true,
+      "solid_multisplash": true
+    },
     "driver": "ws2812",
     "layout": [
         {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
@@ -99,7 +132,8 @@
         {"flags": 1, "matrix": [4, 11], "x": 180, "y": 64},
         {"flags": 1, "matrix": [4, 12], "x": 200, "y": 64},
         {"flags": 1, "matrix": [4, 13], "x": 220, "y": 64}
-    ]
+    ],
+    "sleep": true
   },
   "community_layouts": [
     "60_ansi",
diff --git a/keyboards/synthlabs/065/info.json b/keyboards/synthlabs/065/info.json
new file mode 100644
index 00000000000..d8d0d96c3f1
--- /dev/null
+++ b/keyboards/synthlabs/065/info.json
@@ -0,0 +1,606 @@
+{
+    "manufacturer": "Synth Labs",
+    "keyboard_name": "065",
+    "maintainer": "hongaaronc",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP22", "GP23", "GP24", "GP25", "GP26", "GP27", "GP28", "GP29", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9"],
+        "rows": ["GP0", "GP1", "GP21", "GP20", "GP19"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alpha_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "sleep": true,
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"x": 11, "y": 0, "flags": 2},
+            {"matrix": [0, 1], "x": 14, "y": 0, "flags": 4},
+            {"x": 26, "y": 0, "flags": 2},
+            {"matrix": [0, 2], "x": 29, "y": 0, "flags": 4},
+            {"x": 41, "y": 0, "flags": 2},
+            {"matrix": [0, 3], "x": 44, "y": 0, "flags": 4},
+            {"x": 56, "y": 0, "flags": 2},
+            {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4},
+            {"x": 70, "y": 0, "flags": 2},
+            {"matrix": [0, 5], "x": 74, "y": 0, "flags": 4},
+            {"x": 85, "y": 0, "flags": 2},
+            {"matrix": [0, 6], "x": 89, "y": 0, "flags": 4},
+            {"x": 100, "y": 0, "flags": 2},
+            {"matrix": [0, 7], "x": 104, "y": 0, "flags": 4},
+            {"x": 115, "y": 0, "flags": 2},
+            {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
+            {"x": 130, "y": 0, "flags": 2},
+            {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
+            {"x": 145, "y": 0, "flags": 2},
+            {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
+            {"x": 160, "y": 0, "flags": 2},
+            {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
+            {"x": 175, "y": 0, "flags": 2},
+            {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
+            {"x": 194, "y": 0, "flags": 2},
+            {"matrix": [0, 13], "x": 201, "y": 0, "flags": 1},
+            {"x": 216, "y": 0, "flags": 2},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
+            {"matrix": [1, 13], "x": 205, "y": 16, "flags": 1},
+            {"matrix": [1, 12], "x": 186, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 171, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 156, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 141, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 126, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 97, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 67, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
+            {"matrix": [1, 0], "x": 3, "y": 16, "flags": 1},
+            {"matrix": [2, 0], "x": 5, "y": 32, "flags": 1},
+            {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 70, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 85, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 100, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 115, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 130, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 145, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 175, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 199, "y": 32, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
+            {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
+            {"matrix": [3, 13], "x": 209, "y": 48, "flags": 1},
+            {"matrix": [3, 12], "x": 188, "y": 48, "flags": 1},
+            {"matrix": [3, 11], "x": 168, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 153, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 138, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 123, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 108, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 93, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 78, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 63, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 48, "flags": 4},
+            {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+            {"matrix": [4, 0], "x": 1, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 20, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
+            {"matrix": [4, 5], "x": 74, "y": 64, "flags": 4},
+            {"matrix": [4, 7], "x": 104, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 134, "y": 64, "flags": 4},
+            {"matrix": [4, 10], "x": 151, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 169, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 194, "y": 64, "flags": 1},
+            {"matrix": [4, 13], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
+    "url": "http://065.synthlabs.io",
+    "usb": {
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "pid": "0x3635",
+        "vid": "0x534E"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP18"
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [2, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [2, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_split_bs_lshift_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [2, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 3},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 9], "x": 8, "y": 4, "w": 3},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [2, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 6.5, "y": 4},
+                {"matrix": [4, 9], "x": 7.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/synthlabs/065/keymaps/default/keymap.c b/keyboards/synthlabs/065/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d0e0d04cddd
--- /dev/null
+++ b/keyboards/synthlabs/065/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [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_DEL, 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_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,   MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [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_DEL, _______, _______,
+    _______, KC_HOME,   KC_UP,  KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_CAPS, _______, _______,
+    _______, _______, _______,                    KC_ENT,           KC_ENT,           KC_ENT, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/synthlabs/065/keymaps/via/keymap.c b/keyboards/synthlabs/065/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d0e0d04cddd
--- /dev/null
+++ b/keyboards/synthlabs/065/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [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_DEL, 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_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,   MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [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_DEL, _______, _______,
+    _______, KC_HOME,   KC_UP,  KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_CAPS, _______, _______,
+    _______, _______, _______,                    KC_ENT,           KC_ENT,           KC_ENT, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/synthlabs/065/keymaps/via/rules.mk b/keyboards/synthlabs/065/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/synthlabs/065/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/synthlabs/065/readme.md b/keyboards/synthlabs/065/readme.md
new file mode 100644
index 00000000000..be14a36f053
--- /dev/null
+++ b/keyboards/synthlabs/065/readme.md
@@ -0,0 +1,27 @@
+# Synth Labs 065
+
+![065](https://i.imgur.com/1iLYrP1h.jpg)
+
+The 065 Keyboard by Synth Labs.
+
+* Keyboard Maintainer: [Nostril](https://github.com/hongaaronc)
+* Hardware Supported: [Synth Labs 065 Soldered + Hotswap PCB](https://github.com/0xCB-dev/SL-065-PCB)
+* Hardware Designer: [0xCB](https://0xcb.dev/)
+* Hardware Availability: Awaiting GB, or order your own parts using [the open-source PCB production files](https://github.com/0xCB-dev/SL-065-PCB)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make synthlabs/065:default
+
+Flashing example for this keyboard:
+
+    make synthlabs/065: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).
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the Escape 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 `QK_BOOT` if it is available
diff --git a/keyboards/synthlabs/065/rules.mk b/keyboards/synthlabs/065/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/keymap.c b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c
deleted file mode 100644
index d124a011f6f..00000000000
--- a/keyboards/synthlabs/solo/keymaps/iidx/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2022 Aaron Hong (@hongaaronc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "joystick.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-                                    JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6,
-        JS_8, MO(1), JS_7,
-                                    JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6
-    ),
-    [1] = LAYOUT_all(
-                                    JS_9,JS_0,JS_10, _______,JS_11,JS_1,JS_12,
-        _______, _______, _______,
-                                    JS_10,JS_0,JS_9, _______,JS_11,JS_1,JS_12
-    ),
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-/* The amount of time the encoder has to remain stationary, before unregistering encoder bindings */
-uint16_t encoder_stationary_release_delay_ms = 25;
-
-uint16_t encoder_last_update_time = 0;
-
-enum {
-    CCW_JOYSTICK_BUTTON = 8,
-    CW_JOYSTICK_BUTTON = 7,
-};
-
-enum {
-    CCW_MACRO = SAFE_RANGE,
-    CW_MACRO,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case CCW_MACRO:
-            unregister_joystick_button(CW_JOYSTICK_BUTTON);
-            register_joystick_button(CCW_JOYSTICK_BUTTON);
-            encoder_last_update_time = timer_read(); /* Update the last time that the encoder was detected as rotated */
-            return false;
-        case CW_MACRO:
-            unregister_joystick_button(CCW_JOYSTICK_BUTTON);
-            register_joystick_button(CW_JOYSTICK_BUTTON);
-            encoder_last_update_time = timer_read();  /* Update the last time that the encoder was detected as rotated */
-            return false;
-        default:
-            return true;
-    }
-}
-
-void housekeeping_task_user(void) {
-    uint16_t current_time = timer_read();
-    uint16_t elapsed_time_since_last_update = current_time - encoder_last_update_time;
-
-    /* If an encoder has been stationary for encoder_stationary_release_delay_ms, then unregister the joystick buttons for both directions */
-    if (elapsed_time_since_last_update >= encoder_stationary_release_delay_ms) {
-        unregister_joystick_button(CCW_JOYSTICK_BUTTON);
-        unregister_joystick_button(CW_JOYSTICK_BUTTON);
-    }
-}
-
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] =   { ENCODER_CCW_CW(
-                CCW_MACRO,
-                CW_MACRO
-            ) },
-    [1] =   { ENCODER_CCW_CW(_______, _______) },
-};
-#endif
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/readme.md b/keyboards/synthlabs/solo/keymaps/iidx/readme.md
deleted file mode 100644
index f56fa622d32..00000000000
--- a/keyboards/synthlabs/solo/keymaps/iidx/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# IIDX Synth Labs Solo Layout
-
-This keymap is intended for usage as a gamepad for [beatmania IIDX INFINITAS](https://p.eagate.573.jp/game/infinitas/2/index.html).
-
-This keycap follows the default keymapping for the game, shown here:
-
-![Default Keymapping Settings Screen](https://i.imgur.com/Va48FnZ.png)
-
-The face buttons correspond directly to ボタン 1 - ボタン 7
-
-Turning the knob clockwise corresponds to スクラッチ-右回転
-Turning the knob counter-clockwise corresponds to スクラッチ-左回転
-
-While holding down the knob button
-* The bottom row of face buttons corresponds to ボタン E1 - ボタン E4
-* The top-left and top-right face buttons correspond to ボタン 1 and ボタン 2, for adjustment of in-game scroll speed
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/rules.mk b/keyboards/synthlabs/solo/keymaps/iidx/rules.mk
deleted file mode 100644
index 550de161438..00000000000
--- a/keyboards/synthlabs/solo/keymaps/iidx/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-JOYSTICK_ENABLE = yes
-DEBOUNCE_TYPE = sym_eager_pk
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 27e3025fe37..986a4db76e0 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -17,34 +17,7 @@
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 84
-#    define RGB_MATRIX_KEYPRESSES                                      // Reacts to keypresses
-// #    define RGB_MATRIX_KEYRELEASES                                     // Reacts to keyreleases (instead of keypresses)
-// #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS                             // Enables framebuffer effects
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED                             // Turns off effects when suspended
-// Limit brightness to support USB-A at 0.5 A
-// TODO: Do this dynamically based on power source
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 176                          // Limits maximum brightness of LEDs to 176 out of 255. If not defined, maximum brightness is set to 255
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Sets the default mode, if none has been set
-#    define RGB_MATRIX_DEFAULT_HUE 142                                 // Sets the default hue value, if none has been set
-#    define RGB_MATRIX_DEFAULT_SAT 255                                 // Sets the default saturation value, if none has been set
-#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS       // Sets the default brightness value, if none has been set
-#    define RGB_MATRIX_DEFAULT_SPD 127                                 // Sets the default animation speed, if none has been set
-#    define RGB_MATRIX_DISABLE_KEYCODES                                // Disables control of rgb matrix by keycodes (must use code functions to control the feature)
-
-#    define 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_OUT_IN_DUAL
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_RAINDROPS
-#    define ENABLE_RGB_MATRIX_SPLASH
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-#endif  // RGB_MATRIX_ENABLE
+#define RGB_MATRIX_DISABLE_KEYCODES // Disables control of rgb matrix by keycodes (must use code functions to control the feature)
 
 // Mechanical locking support; use KC_LCAP, KC_LNUM, or KC_LSCR instead in keymap
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
index eba3a115b8b..536b310cc03 100644
--- a/keyboards/system76/launch_1/info.json
+++ b/keyboards/system76/launch_1/info.json
@@ -11,7 +11,28 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "raindrops": true,
+            "splash": true,
+            "multisplash": true
+        },
+        "default": {
+            "animation": "rainbow_moving_chevron",
+            "hue": 142,
+            "sat": 255,
+            "speed": 127
+        },
+        "driver": "ws2812",
+        "max_brightness": 176,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
diff --git a/keyboards/system76/launch_1/usb_mux.c b/keyboards/system76/launch_1/usb_mux.c
index 6cb04dcdd71..dd51b7c4b29 100644
--- a/keyboards/system76/launch_1/usb_mux.c
+++ b/keyboards/system76/launch_1/usb_mux.c
@@ -77,51 +77,14 @@ i2c_status_t usb7206_read_reg(struct USB7206* self, uint32_t addr, uint8_t* data
         return status;
     }
 
-    uint8_t read[2] = {
-        0x00,  // Buffer address MSB: always 0
-        0x06,  // Buffer address LSB: 6 to skip header
-    };
-
-    status = i2c_start((self->addr << 1) | I2C_WRITE, I2C_TIMEOUT);
-    if (status >= 0) {
-        for (uint16_t i = 0; i < sizeof(read); i++) {
-            status = i2c_write(read[i], I2C_TIMEOUT);
-            if (status < 0) {
-                goto error;
-            }
-        }
-    } else {
-        goto error;
-    }
-
-    status = i2c_start((self->addr << 1) | I2C_READ, I2C_TIMEOUT);
-    if (status < 0) {
-        goto error;
-    }
-
-    // Read and ignore buffer length
-    status = i2c_read_ack(I2C_TIMEOUT);
-    if (status < 0) {
-        goto error;
-    }
+    uint16_t read = 0x0006; // Buffer address 6 to skip header
+    uint8_t data_with_buffer_length[length];
+    status = i2c_readReg16((self->addr << 1), read, data_with_buffer_length, length, I2C_TIMEOUT);
 
     for (uint16_t i = 0; i < (length - 1) && status >= 0; i++) {
-        status = i2c_read_ack(I2C_TIMEOUT);
-        if (status >= 0) {
-            data[i] = (uint8_t)status;
-        }
+        data[i] = data_with_buffer_length[i+1];
     }
 
-    if (status >= 0) {
-        status = i2c_read_nack(I2C_TIMEOUT);
-        if (status >= 0) {
-            data[(length - 1)] = (uint8_t)status;
-        }
-    }
-
-error:
-    i2c_stop();
-
     return (status < 0) ? status : length;
 }
 
@@ -160,35 +123,21 @@ i2c_status_t usb7206_write_reg(struct USB7206* self, uint32_t addr, uint8_t* dat
         (uint8_t)(addr >> 8),   // Register address byte 1
         (uint8_t)(addr >> 0),   // Register address byte 0
     };
+    uint8_t send_buffer_length = sizeof(register_write) + length;
+    uint8_t send_buffer[send_buffer_length];
+    uint8_t j = 0;
 
-    status = i2c_start((self->addr << 1) | I2C_WRITE, I2C_TIMEOUT);
-    if (status >= 0) {
-        for (uint16_t i = 0; i < sizeof(register_write); i++) {
-            status = i2c_write(register_write[i], I2C_TIMEOUT);
-            if (status < 0) {
-                goto error;
-            }
-        }
+    for (uint16_t i = 0; i < sizeof(register_write); i++) {
+        send_buffer[j++] = register_write[i];
+    }
 
-        for (uint16_t i = 0; i < length; i++) {
-            status = i2c_write(data[i], I2C_TIMEOUT);
-            if (status < 0) {
-                goto error;
-            }
-        }
-    } else {
-        goto error;
+    for (uint16_t i = 0; i < length; i++) {
+        send_buffer[j++] = data[i];
     }
 
-    i2c_stop();
+    status = i2c_transmit((self->addr << 1), send_buffer, send_buffer_length, I2C_TIMEOUT);
 
     status = usb7206_register_access(self);
-    if (status < 0) {
-        goto error;
-    }
-
-error:
-    i2c_stop();
 
     return (status < 0) ? status : length;
 }
@@ -354,7 +303,7 @@ i2c_status_t ptn5110_init(struct PTN5110* self) {
 
 // Read PTN5110 CC_STATUS.
 // Returns zero on success or a negative number on error.
-i2c_status_t ptn5110_get_cc_status(struct PTN5110* self, uint8_t* cc) { return i2c_readReg(self->addr << 1, 0x1D, cc, 1, I2C_TIMEOUT); }
+i2c_status_t ptn5110_get_cc_status(struct PTN5110* self, uint8_t* cc) { return i2c_read_register(self->addr << 1, 0x1D, cc, 1, I2C_TIMEOUT); }
 
 // Set PTN5110 SSMUX orientation.
 // Returns zero on success or a negative number on error.
@@ -362,7 +311,7 @@ i2c_status_t ptn5110_set_ssmux(struct PTN5110* self, bool orientation) { return
 
 // Write PTN5110 COMMAND.
 // Returns zero on success or negative number on error.
-i2c_status_t ptn5110_command(struct PTN5110* self, uint8_t command) { return i2c_writeReg(self->addr << 1, 0x23, &command, 1, I2C_TIMEOUT); }
+i2c_status_t ptn5110_command(struct PTN5110* self, uint8_t command) { return i2c_write_register(self->addr << 1, 0x23, &command, 1, I2C_TIMEOUT); }
 
 // Set orientation of PTN5110 operating as a sink, call this once.
 // Returns zero on success or a negative number on error.
diff --git a/keyboards/tacworks/tac_k1/config.h b/keyboards/tacworks/tac_k1/config.h
new file mode 100644
index 00000000000..7cc691ea956
--- /dev/null
+++ b/keyboards/tacworks/tac_k1/config.h
@@ -0,0 +1,13 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
diff --git a/keyboards/tacworks/tac_k1/halconf.h b/keyboards/tacworks/tac_k1/halconf.h
new file mode 100644
index 00000000000..8760386e815
--- /dev/null
+++ b/keyboards/tacworks/tac_k1/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/tacworks/tac_k1/info.json b/keyboards/tacworks/tac_k1/info.json
new file mode 100644
index 00000000000..cf098291be8
--- /dev/null
+++ b/keyboards/tacworks/tac_k1/info.json
@@ -0,0 +1,411 @@
+{
+    "manufacturer": "TACWORKS",
+    "keyboard_name": "TAC-K1",
+    "maintainer": "JoyLee",
+    "bootloader": "wb32-dfu",
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "A5",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9"],
+        "rows": ["A1", "A2", "A3", "A4", "C13"]
+    },
+    "processor": "WB32FQ95",
+    "url": "https://tacworks.store",
+    "usb": {
+        "device_version": "1.0.0",
+        "force_nkro": true,
+        "pid": "0xE431",
+        "suspend_wakeup_delay": 1000,
+        "vid": "0x342D"
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4, "w": 2.5},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tacworks/tac_k1/keymaps/default/keymap.c b/keyboards/tacworks/tac_k1/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ba7dcc81963
--- /dev/null
+++ b/keyboards/tacworks/tac_k1/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [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_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_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,   MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                   _______, KC_SPC,  _______,                   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [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,  EE_CLR,  _______, KC_HOME,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,          KC_END,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, KC_MPLY,          KC_INS,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______, KC_VOLU, _______,
+        _______, _______, _______,                    _______, _______, _______,                     _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT
+    )
+};
diff --git a/keyboards/tacworks/tac_k1/keymaps/via/keymap.c b/keyboards/tacworks/tac_k1/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ba7dcc81963
--- /dev/null
+++ b/keyboards/tacworks/tac_k1/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [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_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_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,   MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                   _______, KC_SPC,  _______,                   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [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,  EE_CLR,  _______, KC_HOME,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,          KC_END,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, KC_MPLY,          KC_INS,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______, KC_VOLU, _______,
+        _______, _______, _______,                    _______, _______, _______,                     _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT
+    )
+};
diff --git a/keyboards/tacworks/tac_k1/keymaps/via/rules.mk b/keyboards/tacworks/tac_k1/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/tacworks/tac_k1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/tacworks/tac_k1/mcuconf.h b/keyboards/tacworks/tac_k1/mcuconf.h
new file mode 100644
index 00000000000..ca0e017ebdf
--- /dev/null
+++ b/keyboards/tacworks/tac_k1/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
diff --git a/keyboards/tacworks/tac_k1/readme.md b/keyboards/tacworks/tac_k1/readme.md
new file mode 100644
index 00000000000..8ec29459c74
--- /dev/null
+++ b/keyboards/tacworks/tac_k1/readme.md
@@ -0,0 +1,25 @@
+
+# TAC-K1
+
+![tac-k1](https://i.imgur.com/3YGvrSZh.jpg)
+
+* Keyboard Maintainer: [JoyLee](https://github.com/itarze)
+* Hardware Supported: TAC-K1 PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tacworks/tac_k1:default
+
+Flashing example for this keyboard:
+
+    make tacworks/tac_k1: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 `QK_BOOT` if it is available
diff --git a/keyboards/tacworks/tac_k1/rules.mk b/keyboards/tacworks/tac_k1/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/tacworks/tac_k1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/tada68/keymaps/abishalom/config.h b/keyboards/tada68/keymaps/abishalom/config.h
deleted file mode 100644
index af01528b434..00000000000
--- a/keyboards/tada68/keymaps/abishalom/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define BACKLIGHT_BREATHING
diff --git a/keyboards/tada68/keymaps/abishalom/keymap.c b/keyboards/tada68/keymaps/abishalom/keymap.c
deleted file mode 100644
index 69fe144dea4..00000000000
--- a/keyboards/tada68/keymaps/abishalom/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-#define SEMI_FN LT(_FL, KC_SCLN)
-
-//Tap Dance Declarations
-enum {
-  TD_WIN_LOCK = 0
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_WIN_LOCK]  = ACTION_TAP_DANCE_DOUBLE(MAGIC_NO_GUI, MAGIC_UNNO_GUI)
-};
-
-//
-////In Layer declaration, add tap dance item in place of a key code
-//TD(TD_WIN_LOCK)
-
-// Press fn+GUI once to lock, double tap to unlock.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |FNCAP|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter  |PgUp  |
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = LAYOUT_ansi(
-  QK_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_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_DEL,
-  LT(_FL, KC_CAPS), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   SEMI_FN,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(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * | ` | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |    |
-   * |----------------------------------------------------------------|
-   * |     |Pre| U |NXT|   |   |   |PGD| U |PGU|PSC|   |   |     |Ins |
-   * |----------------------------------------------------------------|
-   * |      |MUT|VU-|VU+|PPl|   |   | L | D | R |   |   |        |Home|
-   * |----------------------------------------------------------------|
-   * |        |   |BRG|BL-|BL+|BLT|   |   |   |   |   |      |Stp|End |
-   * |----------------------------------------------------------------|
-   * |    |WTOG|    |                       |   |   |    |Pre|PPl|Nxt |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  KC_GRAVE, 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_MPRV,KC_MNXT,_______, _______,_______,KC_PGDN,KC_UP,KC_PGUP,KC_PSCR,_______,_______, _______,KC_INSERT,
-  _______,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPLY,_______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,        _______,KC_HOME,
-  _______,_______,BL_BRTG,BL_DOWN,BL_UP, BL_TOGG, _______,_______,_______,_______,_______,_______, KC_STOP, KC_END,
-  _______,TD(TD_WIN_LOCK),_______,                 _______,               _______,KC_TRNS,_______,KC_MPRV,KC_MPLY, KC_MNXT),
-
-};
diff --git a/keyboards/tada68/keymaps/abishalom/readme.md b/keyboards/tada68/keymaps/abishalom/readme.md
deleted file mode 100644
index e0a852fbbf0..00000000000
--- a/keyboards/tada68/keymaps/abishalom/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# abishalom Tada68
-
-My Tada68 layout. 
-Caps lock acts as a function key when held, otherwise just caps lock. 
-In the function layer, arrow keys mapped to ijkl, while the wasd keys used for media controls.
-
diff --git a/keyboards/tada68/keymaps/abishalom/rules.mk b/keyboards/tada68/keymaps/abishalom/rules.mk
deleted file mode 100644
index f125bbcdf30..00000000000
--- a/keyboards/tada68/keymaps/abishalom/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # 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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SLEEP_LED_ENABLE = yes       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Tappa Dance Bitch
-VIA_ENABLE = yes
diff --git a/keyboards/tada68/keymaps/amnesia0287/keymap.c b/keyboards/tada68/keymaps/amnesia0287/keymap.c
deleted file mode 100644
index a0cea9c28f1..00000000000
--- a/keyboards/tada68/keymaps/amnesia0287/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-#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.
-#define _BL  0
-#define _HLa 1
-#define _HLb 2
-#define _HL  3
-#define _XL  4
-
-enum hype_keycodes {
-  FN_HLa = SAFE_RANGE,
-  FN_HLb
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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,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_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_PGDN,
-  SC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   SC_RSPC,KC_UP,LT(_HLa, KC_END),
-  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,FN_HLa,FN_HLb, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _HL: Hype Fn Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|   |   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_HLa] = 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_DEL,KC_INS,
-     KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,
-      _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,KC_PGUP,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
-
-[_HLb] = 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_DEL,KC_INS,
-     KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,
-      _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,KC_PGUP,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
-
-[_HL] = LAYOUT_ansi(
-  BL_TOGG, BL_DOWN,BL_UP, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,LALT(KC_F4),MAGIC_UNSWAP_BACKSLASH_BACKSPACE,
-     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,MAGIC_SWAP_BACKSLASH_BACKSPACE,
-      _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,KC_MNXT,_______,
-    KC_MPRV,  KC_MPLY,  KC_MNXT,                     KC_MPLY,                     _______,_______,_______,KC_MRWD,KC_MPRV,KC_MFFD),
-
-[_XL] = LAYOUT_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,_______,
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,_______,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,_______,_______,_______),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case FN_HLa:
-      if (record->event.pressed)
-      {
-        layer_on(_HLa);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      else
-      {
-        layer_off(_HLa);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      return false;
-      break;
-    case FN_HLb:
-      if (record->event.pressed)
-      {
-        layer_on(_HLb);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      else
-      {
-        layer_off(_HLb);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/tada68/keymaps/amnesia0287/readme.md b/keyboards/tada68/keymaps/amnesia0287/readme.md
deleted file mode 100644
index 53412d7c255..00000000000
--- a/keyboards/tada68/keymaps/amnesia0287/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# default TADA68 layout
-
-This layout replicates the default factory layout of the TADA68.
diff --git a/keyboards/tada68/keymaps/ardakilic/keymap.c b/keyboards/tada68/keymaps/ardakilic/keymap.c
deleted file mode 100755
index cfada729213..00000000000
--- a/keyboards/tada68/keymaps/ardakilic/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include QMK_KEYBOARD_H
-
-//KC_NUBS (\|) is equivalent to ["é] key in Turkish keyboards.
-//KC_GRV (~ `) is equivalent to [<>|] key in Turkish keyboards.
-//I've put grave to bottom, and nonUS backslash to top to make it more similar to Turkish layout.  ["é] key is more above than [<>|] key.
-//Default top right button was KC_GRV (~ `) (Grave key) even if it looks like Tilde key.
-
-// 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 _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |PWR |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |\ | |
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|~ ` |
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |CMD |        Space          |CMD |FN |Alt|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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,KC_PWR,
-  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_NUBS,
-  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_GRV,
-  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        KC_RGUI,MO(_FL),KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   | PP|PLA|PN |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |MUT|VU-|VU+|   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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_HOME,
-  _______,_______,_______,_______,_______,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,        _______,KC_END,
-  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,_______,_______,_______,
-  _______,_______,_______,                 _______,               _______,_______,_______,_______,_______,_______),
-};
diff --git a/keyboards/tada68/keymaps/ardakilic/readme.md b/keyboards/tada68/keymaps/ardakilic/readme.md
deleted file mode 100755
index 72654f55ed6..00000000000
--- a/keyboards/tada68/keymaps/ardakilic/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Ardakilic's TADA68 layout
-
-This layout aims to use Ansi keyboard for my needs in ease, especially to work on macOS, and to have a layout more similar to Apple keyboards.
-
-This layout aims to have a similar layout to Apple keyboards while using ISO layouts with the ANSI keymap. The layout is directly considered using Turkish Qwerty keyboards.
-
-The changes that were applied over default layout:
-
-* Make Win/cmd keys right next to space bar just like Apple keyboards.
-* Adding a power (`KC_PWR`) key, so the lock screen shortcut works.
-* Re-use the page up and page down keys to make ["é] (`KC_NUBS`) and [<>|] (`KC_GRAVE`) keys more accessible.
-* Optimize the function layer, by removing the mouse movement combinations and adding additional media keys.
-* Swap the positions of volume up and volume down and mute buttons on function layer, so these keys are actually with the same order as Apple keyboard layout.
-
-I'm re-purposing page up and page down keys in this layout, because in macOS alt/option + arrow keys, in Windows and Linux, space bar/shift spacebar combinations already cover their work, and is more accessible if you'd ask me.
diff --git a/keyboards/tada68/keymaps/ardakilic/rules.mk b/keyboards/tada68/keymaps/ardakilic/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/tada68/keymaps/ardakilic/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/bazooka/config.h b/keyboards/tada68/keymaps/bazooka/config.h
deleted file mode 100644
index a4885e2bdcc..00000000000
--- a/keyboards/tada68/keymaps/bazooka/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "../../config.h"
-
-#define GRAVE_ESC_ALT_OVERRIDE
-#define GRAVE_ESC_CTRL_OVERRIDE 
diff --git a/keyboards/tada68/keymaps/bazooka/keymap.c b/keyboards/tada68/keymaps/bazooka/keymap.c
deleted file mode 100644
index ad43055ac3b..00000000000
--- a/keyboards/tada68/keymaps/bazooka/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-#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.
-#define _BL 0
-#define _MAC 1
-#define _FUNC 2
-#define _MOUSE 3
-
-#define MAC_TOG TG(_MAC)
-
-enum {
-  FUN_LAY = SAFE_RANGE,
-  MOU_TOG,
-  WIN_LCK,
-  WIN_KEY,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc`| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = LAYOUT_ansi(
-  QK_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_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_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_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,WIN_KEY,KC_LALT,                         KC_SPC,                KC_RALT,FUN_LAY,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _MAC: Mac Layer
-   * ,----------------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |Win |Alt |Ctrl|                       |Ctrl|   |Win|   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_MAC] = LAYOUT_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-          _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  KC_LGUI,KC_LALT,KC_LCTL,                        _______,                KC_RCTL,_______,KC_RGUI,_______,_______,_______),
-
-
-  /* Keymap _FUNC: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  Del  |HPg |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |Mac|   |PSc|ScL|PsB| Calc|Ins |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |Stp|Ply|PTr|NTr|        |Hme |
-   * |----------------------------------------------------------------|
-   * |        |BL |Bl-|Bl+|   |   |   |Mou|MUT|VU-|VU+|      |PgU|End |
-   * |----------------------------------------------------------------|
-   * |    |WnLc|    |                       |   |   |    |Hme|PgD|End |
-   * `----------------------------------------------------------------'
-   */
-[_FUNC] = LAYOUT_ansi(
-  _______,  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_WHOM,
-  _______,_______,_______,_______,_______,_______,_______,_______,MAC_TOG,_______,KC_PSCR,KC_SCRL,KC_PAUS,KC_CALC, KC_INS,
-  _______,_______,_______,_______,_______,_______,_______,_______,KC_MSTP,KC_MPLY,KC_MPRV,KC_MNXT,        _______,KC_HOME,
-          _______,BL_TOGG, BL_DOWN,BL_UP, _______,_______,_______,MOU_TOG,KC_MUTE,KC_VOLD,KC_VOLU,_______,KC_PGUP,KC_END ,
-  _______,WIN_LCK,_______,                        _______,                _______,_______,_______,KC_HOME,KC_PGDN,KC_END),
-
-  /* Keymap _MOUSE: Mouse Navigation Layer
-   * ,----------------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |   McR  |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |  McL |MsU|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_MOUSE] = LAYOUT_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        KC_BTN2,_______,
-          _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_BTN1,KC_MS_U,_______,
-  _______,_______,_______,                        _______,                _______,_______,_______,KC_MS_L,KC_MS_D,KC_MS_R),
-
-};
-
-#define SET_BIT(var, pos) (var |= (1UL << pos))
-#define CLEAR_BIT(var, pos) (var &= ~(1UL << pos))
-#define TOGGLE_BIT(var, pos) (var ^= (1UL << pos))
-#define CHECK_BIT(var, pos) (var & (1U << pos)) 
-
-static uint8_t keyboard_state = 0;
-// bit 0 = function layer status (on/off)
-// bit 1 = mouse navigation layer state
-// bit 2 = windows key lock state
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    // acts like a momentary function layer press
-    case FUN_LAY:
-      if (record->event.pressed) { 
-        layer_on(_FUNC);
-        if (CHECK_BIT(keyboard_state, 1)) {
-          layer_on(_MOUSE);
-        } 
-        else {
-          layer_off(_MOUSE);
-        }
-        // turns on function layer status
-        SET_BIT(keyboard_state, 0);
-      }
-      // key released
-      else {
-        layer_off(_FUNC);
-        layer_off(_MOUSE);
-        // turns off function layer status
-        CLEAR_BIT(keyboard_state, 0);
-      }
-      break;
-
-    case MOU_TOG:
-      if(record->event.pressed) {
-        // toggles navigation layer state
-        TOGGLE_BIT(keyboard_state, 1);
-
-        // if FN is pressed down while hitting this key, the correct layer will be updated,
-        // so that the FN key doesn't need to be pressed down again to start using the functionality
-        if (CHECK_BIT(keyboard_state, 0)) {
-          if (CHECK_BIT(keyboard_state, 1)) {
-            layer_on(_MOUSE);
-          }
-          else {
-            layer_off(_MOUSE);
-          } 
-        }
-      }
-      break;
-
-    case WIN_LCK:
-      if (record->event.pressed) {
-        // toggles windows key lock state
-        TOGGLE_BIT(keyboard_state, 2);
-      }
-      break;
-
-    // uses seperate WIN_KEY so that WIN_LCK does not affect Mac Layer's KC_LGUI
-    case WIN_KEY:
-      // checks if windows key lock is off to allow key to be pressed
-      if (!CHECK_BIT(keyboard_state, 2)) {
-        if (record->event.pressed) {
-          SEND_STRING(SS_DOWN(X_LGUI));
-          return false;
-        }
-        // key released
-        else { 
-          SEND_STRING(SS_UP(X_LGUI));
-          return false;
-        }
-      }
-      break;
-  }
-  return true;
-};
diff --git a/keyboards/tada68/keymaps/bazooka/readme.md b/keyboards/tada68/keymaps/bazooka/readme.md
deleted file mode 100644
index de11a2b898a..00000000000
--- a/keyboards/tada68/keymaps/bazooka/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# FireBazooka's TADA68 layout
-
-This layout follows a layout very similiar to the default, but with added functionality settings.
-
-* This layout will start with the basic layer and default function layer on start-up
-* This means that that FN+Arrow Keys will have Page Up, Page Down, Home, & End on default
-* Press FN+M to turn on Mouse Functionality (FN+Arrows Keys to move the mouse, FN+RShift for left click, & FN+Enter for right click)
-* Pressing FN+M again will toggle the FN+Arrow Keys back to the default of PgUp, PgDn, Home, & End
-* Press FN+I to change the Control, Windows, & Alt keys to a different configuration that I use for Mac (Win, Alt, Ctrl, _SPACE_, Ctrl, FN, Win)
-* Pressing FN+I again will revert back to the default Ctrl, Win, Alt setting
-* Pressing FN+Win will toggle the Windows Key Lock (Note: will not affect Win in the Mac Layer configuration)
-
-Coding practices:
-Using my limited C knowledge, I essentienally used flags to get certain functionality working (this probably isn't the way QMK should be used,
-but I couldn't find/got lazy trying to find the functions used to toggle layers correctly). This means that I used a static unsigned 8-bit integer
-called "keyboard_state" to check the current flags that are on and off currently for the keyboard.
-
-Example:
-keyboard_state = B00000101
-+ The FN key is currently pressed down (bit 0)
-+ The mouse layer is turned off (bit 1)
-+ The Windows Key Lock is turned on (bit 2)
-
-keyboard_state = B00000010
-+ The FN key is currently NOT being pressed down (bit 0)
-+ The mouse layer is turned on (bit 1)
-+ The Windows Key Lock is turned off (bit 2)
-
-This means that certain bitwise functions like CHECK_BIT(...) and SET_BIT(...) are used on "keyboard_state" to manipulate it.
diff --git a/keyboards/tada68/keymaps/bazooka/rules.mk b/keyboards/tada68/keymaps/bazooka/rules.mk
deleted file mode 100644
index 697e093edd8..00000000000
--- a/keyboards/tada68/keymaps/bazooka/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/tada68/keymaps/cheese/keymap.c b/keyboards/tada68/keymaps/cheese/keymap.c
deleted file mode 100755
index c229fdd8b7b..00000000000
--- a/keyboards/tada68/keymaps/cheese/keymap.c
+++ /dev/null
@@ -1,107 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _CL 2
-#define _AL 3
-
-enum custom_keycodes {
-    SPX4 = SAFE_RANGE
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case SPX4:
-                SEND_STRING("    ");
-                return false;
-        }
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |PgUp|
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgDn|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|Del |
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Win |        Space          |Win| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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,    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_PGUP,
-  MO(_CL),  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_DEL,
-  KC_LCTL, KC_LALT,LM(_AL,0x08),                KC_SPC,                       LM(_AL,0x18),MO(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |` ~ |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|   |   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |MUT|VU-|VU+|   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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_GRV,
-  SPX4,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME,
-  _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END,
-  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,_______, _______, _______,
-  _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
-
-  /* Keymap _CL: Caps Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |` ~ |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|   |   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |MUT|VU-|VU+|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_CL] = LAYOUT_ansi(
-  _______, 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_GRV ,
-  _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME,
-  _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END,
-  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,KC_BTN1, KC_MS_U, KC_BTN2,
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
-
-  /* Keymap _AL: ALT Layer
-   * ,----------------------------------------------------------------.
-   * |` ~|   |   |   |   |   |   |   |   |   |   |   |   |       | ` ~|
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_AL] = LAYOUT_ansi(
-  KC_GRV, _______ ,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV ,
-  _______,_______, _______, _______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
-  _______,_______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-  _______,_______,_______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______,  _______,
-  _______,_______,_______,                 _______,               _______,_______,_______, _______, _______,  _______),
-};
diff --git a/keyboards/tada68/keymaps/cheese/readme.md b/keyboards/tada68/keymaps/cheese/readme.md
deleted file mode 100755
index 8374e469b9c..00000000000
--- a/keyboards/tada68/keymaps/cheese/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# pgillan's Cheese TADA68 layout
-
-A collection of tweaks to make the keyboard more mac friendly and increase personal usability,
-based on the default keymap.
-
-* Turned the caps-lock into an additional function key so I didn't have to try to hit the
-  the keys on the right with one hand.
-* Moved the arrow/mouse controls to the caps-lock layer from the function layer.
-* Swapped the Windows key and Alt keys, I didn't have to do it in OS X.
-* Made the escape key work as a backtick when "Alt" is depressed, so I can 1) reverse
-  direction when I Alt-Tab through current applications, and Alt-Backtick through 
-  open windows.
-* Turned the backtick/tilde key into another backspace key, so I can just go all the way
-  up to the corner without overshooting.
-* Adjusted the volume controles so M is "mute", the "," ( or "<") is "down", and "." (or ">") 
-  is "up".  It just makes a ton more sense, I have no idea why it would have been done any
-  differently.
-* Moved PageUp/PageDown up above the delete key, and made the Home and End on the capslock
-  and function layers.
-* Made the tab key on the function layer output 4 spaces instead of a tab character.
diff --git a/keyboards/tada68/keymaps/cheese/rules.mk b/keyboards/tada68/keymaps/cheese/rules.mk
deleted file mode 100644
index 697e093edd8..00000000000
--- a/keyboards/tada68/keymaps/cheese/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/tada68/keymaps/devinceble/keymap.c b/keyboards/tada68/keymaps/devinceble/keymap.c
deleted file mode 100755
index c8aaa04f844..00000000000
--- a/keyboards/tada68/keymaps/devinceble/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 Devinceble AKA Vimwarrior
- *
- * 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_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_BSLS,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_BSPC,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_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,MO(1),KC_PGDN,
-    MO(2), KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN,KC_UP,KC_RGHT),
-
-    [1] = LAYOUT_ansi(
-    _______, 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_BTN1, KC_MS_U,KC_BTN2,_______, _______,_______,_______,_______,_______,_______,KC_UP,_______, _______,KC_HOME,
-    KC_CAPS,KC_MS_L,KC_MS_D,KC_MS_R,_______,_______,_______,_______,_______,_______,KC_LEFT,KC_RGHT,        _______,KC_END,
-    _______,_______,_______,_______, _______,_______, _______,_______,_______,_______,KC_DOWN,_______, _______, _______,
-    _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______
-    ),
-
-    [2] = LAYOUT_ansi(
-    _______, 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_HOME,
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END,
-    _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
-    _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______
-    ),
-};
diff --git a/keyboards/tada68/keymaps/devinceble/readme.md b/keyboards/tada68/keymaps/devinceble/readme.md
deleted file mode 100755
index a11be12075d..00000000000
--- a/keyboards/tada68/keymaps/devinceble/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Devinceble AKA Vimwarrior TADA68 Keymap
-
-Build BIN File:
-
-    make tada68:devinceble
-
diff --git a/keyboards/tada68/keymaps/devinceble/rules.mk b/keyboards/tada68/keymaps/devinceble/rules.mk
deleted file mode 100644
index b1b4e026998..00000000000
--- a/keyboards/tada68/keymaps/devinceble/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = yes
-
-
diff --git a/keyboards/tada68/keymaps/dlg/config.h b/keyboards/tada68/keymaps/dlg/config.h
deleted file mode 100644
index e1a6eb1a2b0..00000000000
--- a/keyboards/tada68/keymaps/dlg/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define GRAVE_ESC_ALT_OVERRIDE
diff --git a/keyboards/tada68/keymaps/dlg/keymap.c b/keyboards/tada68/keymaps/dlg/keymap.c
deleted file mode 100755
index 2e5df8e4ec6..00000000000
--- a/keyboards/tada68/keymaps/dlg/keymap.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-#define _MAC 2
-#define _LA 3
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt|Fn |Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   *
-   * Note: Shift + Esc = ~
-   *       Win   + Esc = `
-   */
-[_BL] = LAYOUT_ansi(
-  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_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_RBRC, KC_BSLS, KC_DEL ,
-  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_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, LM(_LA, MOD_LALT),      KC_SPC,                          KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |`swp|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  Del |`swp|
-   * |----------------------------------------------------------------|
-   * |     |BL |BL-|BL+|   |   |   |   |mac|   |PSc|   |   |     |Ins |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |Lef|Dn |Up |Rig|   |   |        |Hme |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |Hme|PDn|End |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  MAGIC_UNSWAP_GRAVE_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,   MAGIC_SWAP_GRAVE_ESC,
-  _______, BL_TOGG, BL_DOWN, BL_UP  , _______, _______, _______, _______, TG(_MAC),_______,  KC_PSCR, _______, _______, _______, KC_INS,
-  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______,     _______,      KC_HOME,
-  _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU,  _______, _______,     KC_PGUP,      KC_END ,
-  _______, _______, _______,                 _______,                     _______, _______,  _______, KC_HOME,     KC_PGDN,      KC_END ),
-
-  /* Keymap _MAC: Mac Layer
-   * ,----------------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |Win |                       |Win |   |Alt|   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_MAC] = LAYOUT_ansi(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,     _______,
-  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_LCTL, KC_LALT, KC_LGUI,                        _______,                       KC_RGUI, _______, KC_RALT, _______, _______, _______),
-
-  /* Keymap _LA: Left Alt Layer - LALT-4 maps to LALT-F4 so I can quit apps
-   * ,----------------------------------------------------------------.
-   * |    |   |   |   |F4 |   |   |   |   |   |   |   |   |      |    |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_LA] = LAYOUT_ansi(
-  _______, _______, _______, _______, KC_F4,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,     _______,
-  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______,                        _______,                       _______, _______, _______, _______, _______, _______),
-};
diff --git a/keyboards/tada68/keymaps/dlg/readme.md b/keyboards/tada68/keymaps/dlg/readme.md
deleted file mode 100755
index 9bb9d2496e4..00000000000
--- a/keyboards/tada68/keymaps/dlg/readme.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# dlg's layout
-
-[tshack's layout](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tada68/keymaps/tshack), with:
- + Mac layer
-   + Press Fn-I to align the bottom row to mac standards
- + volume controls moved to Fn+ M<>
- + Fn+Del for Insert
- + `GRAVE_ESC_ALT_OVERRIDE` so cmd-opt-esc still works (thx [mattdicarlo](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tada68/keymaps/mattdicarlo))
- + `LALT` layer - LALT-4 maps to LALT-F4 so you can close windows in Windows
-
-
-### Base Layer
-
-```
-,----------------------------------------------------------------.
-|Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-|----------------------------------------------------------------|
-|Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-|----------------------------------------------------------------|
-|Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-|----------------------------------------------------------------|
-|Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |PgDn|
-|----------------------------------------------------------------|
-|Ctrl|Win |Alt |        Space          |Alt|Fn |Ctrl|<- |Dn | -> |
-`----------------------------------------------------------------'
-```
-Note: 
-* Shift + Esc = ~ (tilde)
-* Win   + Esc = ` (grave)
-
-
-### Fn Layer
-
-```
-,----------------------------------------------------------------.
-|   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  Del  |    |
-|----------------------------------------------------------------|
-|     |BL |BL-|BL+|   |   |   |   |mac|   |PSc|   |   |     |Ins |
-|----------------------------------------------------------------|
-|      |   |   |   |   |   |<- |Dn |Up | ->|   |   |        |Hme |
-|----------------------------------------------------------------|
-|        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End |
-|----------------------------------------------------------------|
-|    |    |    |                       |   |   |    |Hme|PDn|End |
-`----------------------------------------------------------------'
-```
-
-### Mac Layer
-
-```
-,----------------------------------------------------------------.
-|   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
-|----------------------------------------------------------------|
-|     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-|----------------------------------------------------------------|
-|      |   |   |   |   |   |   |   |   |   |   |   |        |    |
-|----------------------------------------------------------------|
-|        |   |   |   |   |   |   |   |   |   |   |      |   |    |
-|----------------------------------------------------------------|
-|Ctrl|Alt |Win |                       |Win |   |Alt|   |   |    |
-`----------------------------------------------------------------'
-```
-
-### `LALT` Layer
-
-```
-,----------------------------------------------------------------.
-|   |   |   |   |F4 |   |   |   |   |   |   |   |   |       |    |
-|----------------------------------------------------------------|
-|     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-|----------------------------------------------------------------|
-|      |   |   |   |   |   |   |   |   |   |   |   |        |    |
-|----------------------------------------------------------------|
-|        |   |   |   |   |   |   |   |   |   |   |      |   |    |
-|----------------------------------------------------------------|
-|    |Alt |    |                       |    |   |   |   |   |    |
-`----------------------------------------------------------------'
-```
diff --git a/keyboards/tada68/keymaps/dlg/rules.mk b/keyboards/tada68/keymaps/dlg/rules.mk
deleted file mode 100644
index e381f2fdda6..00000000000
--- a/keyboards/tada68/keymaps/dlg/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # 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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/tada68/keymaps/emdarcher/config.h b/keyboards/tada68/keymaps/emdarcher/config.h
deleted file mode 100644
index b193cf18de2..00000000000
--- a/keyboards/tada68/keymaps/emdarcher/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define BACKLIGHT_BREATHING
-#define GRAVE_ESC_ALT_OVERRIDE
-
diff --git a/keyboards/tada68/keymaps/emdarcher/keymap.c b/keyboards/tada68/keymaps/emdarcher/keymap.c
deleted file mode 100755
index 5a218ba711b..00000000000
--- a/keyboards/tada68/keymaps/emdarcher/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-#define _CL 2
-#define _ML 3
-
-#define KC_X0   LT(_CL, KC_CAPS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |Win |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = LAYOUT_ansi(
-  QK_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_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_DEL,
-  KC_X0,   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_LALT,KC_LGUI,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer for FN key
-   */
-[_FL] = 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_DEL, KC_INS ,
-  _______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS, _______,KC_HOME,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_MRWD,KC_MFFD,        _______, KC_END,
-  _______,        _______,BL_BRTG,BL_DOWN,BL_TOGG,BL_UP,  KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
-  _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
-
- /* Keymap _CL: Function Layer for Caps Lock key
-  * uses VIM like control with hjkl for arrow keys
-  */
-
-[_CL] = 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_DEL, KC_INS ,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS, _______,KC_HOME,
-  _______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,_______,_______,         _______, KC_END,
-  _______,        _______,_______,_______,_______,_______,KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
-  _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
-
- /* Keymap _ML: The Mouse control layer, activated by using both _FL and _CL layers
-  * Activates mouse control. Keeps lower layer's control
-  */
-[_ML] = LAYOUT_ansi(
-  KC_ESC ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_WH_R, KC_WH_L,KC_WH_U,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______, KC_WH_D,
-  _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_BTN1, KC_MS_U, KC_BTN2,
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
-
-};
-
-
-//layer state control
-layer_state_t layer_state_set_user(layer_state_t state){
-    //switch to _ML if both _FL and _CL are activated
-    return update_tri_layer_state(state, _FL, _CL, _ML);
-}
diff --git a/keyboards/tada68/keymaps/emdarcher/readme.md b/keyboards/tada68/keymaps/emdarcher/readme.md
deleted file mode 100755
index 04b5a77e183..00000000000
--- a/keyboards/tada68/keymaps/emdarcher/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# emdarcher's TADA68 layout
-
-A layout that adds a few extra features on the function layers. Designed for use in a MAC or Unix environment, and has some VIM inspiration.
-
-- Added Caps Lock for an extra FN layer with VIM like control on hjlk keys.
-- Added Breathing Backlight Toggle.
-- Made the ESC key use GESC for functionality for Grave and Tilde with shift or GUI modifiers.
-- Added Print Screen, Scroll Lock, and Pause keys on P,[,] keys to add Mac screen brightness control.
-    * On Mac, Scroll Lock is Brightness Down and Pause is Brightness Up, so with this FN+[ = brighness down, FN+] = brightness up
-- Has Mac Fast-forward and Rewind keys mapped for changing media tracks. FN+; = Rewind, FN+' = Fast-forward
-- Moved LGUI to the default MAC Command key position.
-- Has a mouse control layer that is activated by pressing both FN and CAPS LOCK
-- FN+X toggles the backlight breathing mode
-
-
diff --git a/keyboards/tada68/keymaps/emdarcher/rules.mk b/keyboards/tada68/keymaps/emdarcher/rules.mk
deleted file mode 100644
index d44788422b2..00000000000
--- a/keyboards/tada68/keymaps/emdarcher/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-
diff --git a/keyboards/tada68/keymaps/fakb/config.h b/keyboards/tada68/keymaps/fakb/config.h
deleted file mode 100644
index b0b5394644b..00000000000
--- a/keyboards/tada68/keymaps/fakb/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define MOUSEKEY_DELAY             0
-#define MOUSEKEY_INTERVAL          4
-#define MOUSEKEY_MAX_SPEED         5
-#define MOUSEKEY_TIME_TO_MAX       77
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
diff --git a/keyboards/tada68/keymaps/fakb/keymap.c b/keyboards/tada68/keymaps/fakb/keymap.c
deleted file mode 100755
index f5cfdea61ce..00000000000
--- a/keyboards/tada68/keymaps/fakb/keymap.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#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.
-
-#define LCTL_MA LCTL_T(KC_UP)
-#define LSFT_MA LSFT_T(KC_DOWN)
-#define RSFT_MA SFT_T(KC_UP)
-#define TABS_MA LT(1,KC_TAB)
-#define SPCE_MA LT(2,KC_SPC)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_ansi(
- QK_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_BSLS,KC_NUBS,
- TABS_MA,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,_______,
- LCTL_MA,KC_A   ,KC_S   ,KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_ENT ,_______,
- LSFT_MA,KC_Z   ,KC_X   ,KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        RSFT_MA,MO(1)  ,_______,
- KC_LCTL,KC_LALT,KC_LGUI,                SPCE_MA,                        KC_RGUI,KC_RALT,_______,_______,_______,_______),
-
-[1] = LAYOUT_ansi(
- KC_PSCR,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_INS ,_______,
- _______,_______,_______,KC_PGUP,KC_PGDN,KC_HOME,KC_END ,KC_PGDN,KC_PGUP,_______,_______,_______,_______,KC_DEL ,_______,
- KC_CAPS,KC_NUBS,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,_______,_______,        _______,_______,
- _______,_______,BL_TOGG,BL_UP  ,BL_DOWN,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______,        _______,_______,_______,
- _______,_______,_______,                _______,                        _______,_______,_______,_______,_______,_______),
-
-[2] = LAYOUT_ansi(
- _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
- KC_BTN5,KC_BTN4,KC_BTN3,KC_BTN2,KC_BTN1,KC_HOME,KC_END ,_______,_______,_______,_______,_______,_______,_______,_______,
- _______,_______,KC_WH_L,KC_WH_U,KC_WH_D,KC_WH_R,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______,        _______,_______,
- _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,
- _______,_______,_______,                _______,                        _______,_______,_______,_______,_______,_______),
-
-
-};
diff --git a/keyboards/tada68/keymaps/fakb/readme.md b/keyboards/tada68/keymaps/fakb/readme.md
deleted file mode 100755
index 563d5bbbaff..00000000000
--- a/keyboards/tada68/keymaps/fakb/readme.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# FabulousAnomalyKeyBoard
-
-This layout features an efficient layout for people without
-a mouse.
-
-## layers
-
-Layer Base:	complete basic keyboard
-Layer Fn-Tab:	F1-F12, Arrow Keys, Home, End, Backlight, Media
-Layer Fn-Space: mouse keys in a vim like manner
-
-For detailed info check out keymap.c
-
-## the CTRL key
-
-It is where you would suspect CAPSLOCK to be.
-WHO NEEDS CAPSLOCK ANYWAYS?
-For those rare cases you need to shout at somebody in a comment
-section you can still do a capslock by using TAB+CTRL
-
-## SUPER key
-
-There are two super keys. They are next to the space bar.
-The intention is easing the use of tiling window mangers
-
-## emergency mouse
-
-Without a mouse you will find yourself in a situation where all
-your tiling goodness will just not be able to click onto that 
-"close ads" button.
-This keymap integrates a basic mouse pointer directly into the keyboard.
-Mouse is accessible via holding SPACE and tapping keys:
-```
-SPACE+
-h	Move cursor left
-j	Move cursor down
-k	Move cursor up
-l	Move cursor right
-
-w	Middle Mouse Click
-r	Right click
-e	Left click
-
-s	Scroll wheel left
-d	Scroll wheel down
-f	Scroll wheel up
-g	Scroll wheel right
-```
-
-## shell focused
-
-Working in a shell the up and down arrow keys are often needed to
-look at old commands or reuse some.
-When held, the left ctrl and left shift will act as expected,
-but when tapped they will become UP and DOWN arrow-keys.
-
-## krautfriend
-The keys <|> are accessible even without a 102nd key
diff --git a/keyboards/tada68/keymaps/fakb/rules.mk b/keyboards/tada68/keymaps/fakb/rules.mk
deleted file mode 100644
index 043515605f4..00000000000
--- a/keyboards/tada68/keymaps/fakb/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/fezzant/keymap.c b/keyboards/tada68/keymaps/fezzant/keymap.c
deleted file mode 100644
index eedfce7a6bd..00000000000
--- a/keyboards/tada68/keymaps/fezzant/keymap.c
+++ /dev/null
@@ -1,121 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Layers
-
-#define _BL 0
-#define _FL 1
-#define _NUM 2
-#define _BSPC 3
-
-// Macros
-// name macros here for keymap reference
-enum {
-  EMAIL_ADD = SAFE_RANGE,
-  OTHER_MACRO
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if(record->event.pressed){
-    switch(keycode) {
-      // copy these lines to define new macro
-      case EMAIL_ADD:
-        SEND_STRING("email@example.com");
-        return false; break;
-      // copy to here
-      case OTHER_MACRO:
-        SEND_STRING("The Other Macro");
-        return false; break;
-    }
-  }
-  return true;
-};
-
-// Keymaps
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * .----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |Home|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |End |
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lft|Dwn|Rig |
-   * '----------------------------------------------------------------'
-   */
-[_BL] = 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, KC_GRAVE,
-  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,
-  LT(_BSPC,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_HOME,
-  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(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-
-  /* Keymap _FL: Function Layer
-   * .-----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Paus |
-   * |-----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |BLB|BL-|BL |BL+|Foobr|ToNUM|
-   * |-----------------------------------------------------------------|
-   * |KC_NO |   |   |   |   |   |   |   |   |   |   |Mnu|        |PgUp |
-   * |-----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |PgDn |
-   * |-----------------------------------------------------------------|
-   * |WinUl|WinLk|   |                      |   |   |    |Nxt|Stp|Prev |
-   * '-----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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_PAUSE ,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,BL_BRTG,BL_DOWN,BL_TOGG, BL_UP,  KC_MAIL,TG(_NUM),
-  XXXXXXX,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_APPLICATION,        _______,KC_PGUP,
-  _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_BTN1, KC_MS_U, KC_PGDN,
-  MAGIC_UNNO_GUI,MAGIC_NO_GUI,_______,                 _______,               _______,_______,_______,KC_MPRV,KC_MSTP, KC_MNXT),
-
-
-  /* Keymap _NUM: Numpad Layer
-   * .----------------------------------------------------------------.
-   * |Esc| 1 | 2 | 3 | 4 | 5 | 6 |NP7|Np8|Np9|   | - | + |Backspc|CALC| 15
-   * |----------------------------------------------------------------|
-   * |Tab |NumL| up|   |   |   |Np4|Np5|Np6|   |   | / | * |     |    | 15
-   * |----------------------------------------------------------------|
-   * |To__BL|lft|dwn|rit|   |   |Np1|Np2|Np3|   |   |   |Enter   |Prsc| 14
-   * |----------------------------------------------------------------|
-   * |Shift   | Z | X | C | V |   |Np.|Np.|Np.|   |   |      |msU|Rclk| 14
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |            Np0       |Emal|   |Lclk|msL|msD|msR | 10
-   * '----------------------------------------------------------------'
-   */
-[_NUM] = LAYOUT_ansi(
-  KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_P7,   KC_P8,   KC_P9,XXXXXXX,   KC_KP_MINUS, KC_KP_PLUS, KC_BSPC,KC_CALC,
-  KC_TAB,KC_NUM, KC_UP,XXXXXXX,XXXXXXX, XXXXXXX,KC_P4,KC_P5,KC_P6,XXXXXXX,XXXXXXX,KC_PSLS,KC_PAST, XXXXXXX,_______,
-  TG(_NUM), KC_LEFT, KC_DOWN, KC_RIGHT,XXXXXXX,XXXXXXX,KC_P1,KC_P2,KC_P3,XXXXXXX,XXXXXXX,XXXXXXX, KC_KP_ENTER,KC_PSCR,
-  KC_LSFT, KC_Z, KC_X, KC_C, KC_V,XXXXXXX, KC_PDOT, KC_PDOT, KC_PDOT,XXXXXXX,XXXXXXX,XXXXXXX, KC_MS_U, KC_BTN2,
-  KC_LCTL, KC_LGUI, KC_LALT,KC_P0,EMAIL_ADD,_______,KC_BTN1,KC_MS_L,KC_MS_D, KC_MS_R),
-
-
-  /* Keymap _BSPC: back_SPACE Layer
-   * .----------------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |Up |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |Lft|Dwn|Rig|End|   |        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |       Backspace         |   |NO |   |   |   |   |
-   * '----------------------------------------------------------------'
-   */
-[_BSPC] = LAYOUT_ansi(
-  _______, _______ ,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______,_______,_______,_______,_______,_______,_______,_______,KC_UP,_______,_______,_______, _______, _______,_______,
-  _______,_______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_RIGHT,KC_END,_______,        _______,_______,
-  _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______, _______,
-  _______,_______,_______,                 KC_BSPC,                 _______,XXXXXXX,_______,_______,_______, _______)
-
-
-};
diff --git a/keyboards/tada68/keymaps/fezzant/readme.md b/keyboards/tada68/keymaps/fezzant/readme.md
deleted file mode 100644
index 08a9433eebf..00000000000
--- a/keyboards/tada68/keymaps/fezzant/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## Fezzant's Tada68 keymap
-
-Includes easy copy-paste macro creation for strings or combo keypresses.
-
-* Layer 0: Mostly-standard base layer, with home/end replacing pgup/pgdn.
-* Layer 1: Momentary function layer, with some added buttons.
-* Layer 2: Toggle numpad layer, with a layout conducive to spreadsheets and calculations
-* Layer 3: Momentary function layer to put backspace on spacebar, with arrow keys on right hand homerow area.
diff --git a/keyboards/tada68/keymaps/fezzant/rules.mk b/keyboards/tada68/keymaps/fezzant/rules.mk
deleted file mode 100644
index 705fc39e23f..00000000000
--- a/keyboards/tada68/keymaps/fezzant/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/hhkb68/keymap.c b/keyboards/tada68/keymaps/hhkb68/keymap.c
deleted file mode 100644
index 8ec7b8774e0..00000000000
--- a/keyboards/tada68/keymaps/hhkb68/keymap.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = 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_BSLS, 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_BSPC, KC_DEL, 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_PGDN, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
-	[1] = LAYOUT_ansi(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_DEL, KC_INS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_END, KC_TRNS, BL_DOWN,BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, 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/tada68/keymaps/hhkb68/layers.json b/keyboards/tada68/keymaps/hhkb68/layers.json
deleted file mode 100644
index 1d084034df0..00000000000
--- a/keyboards/tada68/keymaps/hhkb68/layers.json
+++ /dev/null
@@ -1 +0,0 @@
-[["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_BSLS", "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_BSPC", "KC_DEL", "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_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(1)", "KC_PGDN", "MO(1)", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT"], ["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_INS", "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_DEL", "KC_HOME", "KC_TRNS", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_LEFT", "KC_RGHT", "KC_TRNS", "KC_END", "KC_TRNS", "BL_DOWN", "BL_TOGG", "BL_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_DOWN", "KC_TRNS", "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/tada68/keymaps/hhkb68/readme.md b/keyboards/tada68/keymaps/hhkb68/readme.md
deleted file mode 100644
index 013b812fc6b..00000000000
--- a/keyboards/tada68/keymaps/hhkb68/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# HHKB68
-Layout to closely match the primary and function layers of the HHKB.
diff --git a/keyboards/tada68/keymaps/iso-nor/config.h b/keyboards/tada68/keymaps/iso-nor/config.h
deleted file mode 100644
index 6f70f09beec..00000000000
--- a/keyboards/tada68/keymaps/iso-nor/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/tada68/keymaps/iso-nor/keymap.c b/keyboards/tada68/keymaps/iso-nor/keymap.c
deleted file mode 100644
index 43afcdff814..00000000000
--- a/keyboards/tada68/keymaps/iso-nor/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  +|  '|Backspa |  ´|
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  Å|  ¨| Ent-|Del |
-   * |-------------------------------------------------------| er|----|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  Ø|  Æ| @ |   |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shif| <>|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  -| Shift| Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-  [_BL] = 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_GRV,  KC_BSPC, KC_EQL,
-    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_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_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(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /* Keymap _FL1: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  QK_BOOT|PSCR|
-   * |----------------------------------------------------------------|
-   * |     |   | Up|   |   |   |   |   |   |   |   |BL-|BL+|BL   | INS|
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |   | PP|PLA| PN|    |   |HOME|
-   * |----------------------------------------------------------------|
-   * |    |   |   |   |   |   |   |   |   |  V-| MV| V+|     |   | END|
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-  [_FL] = LAYOUT_iso(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, KC_PSCR,
-    _______, _______,   KC_UP, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, _______,          KC_INS,
-    _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_END,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______
-  ),
-
-};
diff --git a/keyboards/tada68/keymaps/iso-nor/readme.md b/keyboards/tada68/keymaps/iso-nor/readme.md
deleted file mode 100644
index 5ade71ab4d9..00000000000
--- a/keyboards/tada68/keymaps/iso-nor/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# TADA68 layout for ISO-NOR
-
-> An ISO-style layout for Norwegian keyboards.
-
-This layout was specifically made for Norwegian keyboards (i.e. includes `Æ`, `Ø` and `Å`), and is tested on a TADA68 purchased from [kbdfans](https://kbdfans.cn/) in September 2018.
-
-### Specifics
-
-As it's an ISO style keymap, it works with the fat double-row `Enter` key and the narrower left `Shift` and `<>` key. In addition, it switches the `'` key and the `´` key since the latter one is less common in Norwegian, and the first one normally is placed where the `Escape` key is located on a TADA68.
-
-## Installation
-
-Please see the [tada68 readme](../../readme.md) using the following command
-
-```
-make tada68:iso-nor:bin
-```
diff --git a/keyboards/tada68/keymaps/iso-nor/rules.mk b/keyboards/tada68/keymaps/iso-nor/rules.mk
deleted file mode 100644
index 00ecf0184fe..00000000000
--- a/keyboards/tada68/keymaps/iso-nor/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/iso-uk/config.h b/keyboards/tada68/keymaps/iso-uk/config.h
deleted file mode 100644
index 1e1005aeef8..00000000000
--- a/keyboards/tada68/keymaps/iso-uk/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "../../config.h"
-
-#define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 6
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/iso-uk/keymap.c b/keyboards/tada68/keymaps/iso-uk/keymap.c
deleted file mode 100644
index 72df9b7dc23..00000000000
--- a/keyboards/tada68/keymaps/iso-uk/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |Del |
-   * |-------------------------------------------------------    -----|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;| '|  #|Entr|PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift|  \ |  Z|  X|  C|  V|  B|  N|  M|  ,|  .| /|Rshift|Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-  [_BL] = 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, 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_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_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(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-	),
-
-  /* Keymap _FL1: Function Layer 1
-   * ,----------------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Delete| Ins|
-   * |----------------------------------------------------------------|
-   * |     |   | ↑ |   |   |   |   |   |   |   |   |   |   |     |Home|
-   * |-------------------------------------------------------    -----|
-   * |       | ← | ↓ | → |   |   |   |   |   |   |   |  |   |    | End|
-   * |----------------------------------------------------------------|
-   * |     |   |   |   | L+|LED| L-|   | V+|  V-|Mut|  | MsBtn|Up|MsBn|
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    | Lt| Dn| Rt |
-   * `----------------------------------------------------------------'
-   */
-  [_FL] = LAYOUT_iso(
-    _______, 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_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
-    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
-    _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-	),
-};
diff --git a/keyboards/tada68/keymaps/iso-uk/readme.md b/keyboards/tada68/keymaps/iso-uk/readme.md
deleted file mode 100644
index 168310c499f..00000000000
--- a/keyboards/tada68/keymaps/iso-uk/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# TADA68 layout for ISO UK
-
-This layout has been tested on a TADA68 purchased from kbdfans in March 2018. The physical key layout includes the "double height" iso Enter key and the "short" Left Shift along side the iso Backslash key. [See this keyboard-layout-editor.com Gist](http://www.keyboard-layout-editor.com/#/gists/acf0f32f7ea0d0ed35c901663ca47919)
-
-The Base Layer and Function layer defined here match the layout defined by the kbdfans keyboard layout tool found at http://123.57.250.164:3000/tada68
-
-## Installation
-
-Please see the [tada68 readme](../../readme.md) using the following command
-
-```
-make tada68:iso-uk:bin
-```
diff --git a/keyboards/tada68/keymaps/iso-uk/rules.mk b/keyboards/tada68/keymaps/iso-uk/rules.mk
deleted file mode 100644
index 00ecf0184fe..00000000000
--- a/keyboards/tada68/keymaps/iso-uk/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/isoish/keymap.c b/keyboards/tada68/keymaps/isoish/keymap.c
deleted file mode 100644
index fc961ea4c46..00000000000
--- a/keyboards/tada68/keymaps/isoish/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| \ |Ret|PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|    <>| Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN| APP|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-  [_BL] = LAYOUT_ansi_split_enter(
-    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_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_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_BSLS, 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_NUBS, KC_UP,   KC_PGDN,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(_FL), KC_APP,  KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /* Keymap _FL1: Function Layer 1
-   * ,----------------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  QK_BOOT|PSCR|
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |BL-|BL+|BL   | INS|
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   | PP|PLA| PN|    |   |HOME|
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |  V-| MV| V+|     |   | END|
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-  [_FL] = LAYOUT_ansi_split_enter(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT, KC_PSCR,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, KC_INS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME,
-    _______,          _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_END,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______
-  ),
-
-};
diff --git a/keyboards/tada68/keymaps/isoish/readme.md b/keyboards/tada68/keymaps/isoish/readme.md
deleted file mode 100644
index 48ad783c83d..00000000000
--- a/keyboards/tada68/keymaps/isoish/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ISO(ish) - Basic ISO format layout for TADA68 #
-
-Basic layout with some edits to work better with ISO (nordic) layout. Due to the wide left shift it isn't quite Nordic iso though.
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/isoish/rules.mk b/keyboards/tada68/keymaps/isoish/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/tada68/keymaps/isoish/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/kbp-v60/keymap.c b/keyboards/tada68/keymaps/kbp-v60/keymap.c
deleted file mode 100755
index f456917cad9..00000000000
--- a/keyboards/tada68/keymaps/kbp-v60/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-// Tilde is shift-grave
-#define KC_TLDE S(KC_GRV)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Del |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Home|
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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, 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,
-  MO(_FL), 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,                        MO(_FL), KC_ALGR, KC_RGUI,  KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * | ` | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |Prt|Bks|PgU|Hom|End|Pau| Up|   |   |     |end |
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|Scl|Del|PgD| ~ |Ins|Lef|Dow|Rig|        |Prt |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = 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_DEL,  KC_INS,
-  KC_CAPS, _______, KC_UP,   _______, KC_BSPC, KC_PSCR, KC_PGUP, KC_HOME, KC_END,  KC_PAUS, KC_UP,   _______, _______, _______, KC_END,
-  _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  KC_SCRL, KC_PGDN, KC_TLDE, KC_INS,  KC_LEFT, KC_DOWN, KC_RIGHT,         _______, KC_PSCR,
-  _______,          _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
-  _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
-};
diff --git a/keyboards/tada68/keymaps/kbp-v60/readme.md b/keyboards/tada68/keymaps/kbp-v60/readme.md
deleted file mode 100755
index f15b2781999..00000000000
--- a/keyboards/tada68/keymaps/kbp-v60/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# KBP V60 like TADA68 layout
-
-This layout resembles the KBParadise V60 FN layer and moves around some keys.
diff --git a/keyboards/tada68/keymaps/kbp-v60/rules.mk b/keyboards/tada68/keymaps/kbp-v60/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/tada68/keymaps/kbp-v60/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/laas/config.h b/keyboards/tada68/keymaps/laas/config.h
deleted file mode 100755
index 6f70f09beec..00000000000
--- a/keyboards/tada68/keymaps/laas/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/tada68/keymaps/laas/keymap.c b/keyboards/tada68/keymaps/laas/keymap.c
deleted file mode 100755
index 165112263a8..00000000000
--- a/keyboards/tada68/keymaps/laas/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-  * ,----------------------------------------------------------------.
-  * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-  * |----------------------------------------------------------------|
-  * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-  * |----------------------------------------------------------------|
-  * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-  * |----------------------------------------------------------------|
-  * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-  * |----------------------------------------------------------------|
-  * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-  * `----------------------------------------------------------------'
-  */
-  [_BL] = 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, 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_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_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(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-  * ,----------------------------------------------------------------.
-  * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-  * |----------------------------------------------------------------|
-  * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |VMU |
-  * |----------------------------------------------------------------|
-  * |      |<- |Dn | ->|   |   |   |   |   |   |   |   |        |Hme |
-  * |----------------------------------------------------------------|
-  * |        |   |   |Bl-|BL |BL+|   |  |   |   |   |   |   |VU-|End |
-  * |----------------------------------------------------------------|
-  * |    |    |    |      Play/Pause       |   |   |    |Rwd|VU+|Fwd |
-  * `----------------------------------------------------------------'
-  */
-  [_FL] = LAYOUT_ansi(
-    _______, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,
-    _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
-    _______, _______, _______, BL_DOWN,BL_TOGG, BL_UP,  _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
-    _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT),
-};
diff --git a/keyboards/tada68/keymaps/laas/readme.md b/keyboards/tada68/keymaps/laas/readme.md
deleted file mode 100755
index 48497062c99..00000000000
--- a/keyboards/tada68/keymaps/laas/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# laas' TADA68 layout
-
-* Disabled mouse controls
-* Fn + PgUp -> Home
-* Fn + PgDown -> End
-* Media control for Windows:
-    * Fn + Left: Previous track
-    * Fn + Right: Next track
-    * Fn + Up: Volume up
-    * Fn + Down: Volume down
-    * Fn + Delete: Mute
-    * Fn + Space: Play/pause
diff --git a/keyboards/tada68/keymaps/laas/rules.mk b/keyboards/tada68/keymaps/laas/rules.mk
deleted file mode 100755
index dbaa9045e7b..00000000000
--- a/keyboards/tada68/keymaps/laas/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/tada68/keymaps/mattdicarlo/config.h b/keyboards/tada68/keymaps/mattdicarlo/config.h
deleted file mode 100644
index 90589bb54f2..00000000000
--- a/keyboards/tada68/keymaps/mattdicarlo/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "../../config.h"
-
-#define GRAVE_ESC_ALT_OVERRIDE
diff --git a/keyboards/tada68/keymaps/mattdicarlo/keymap.c b/keyboards/tada68/keymaps/mattdicarlo/keymap.c
deleted file mode 100755
index 5847ff0c8a5..00000000000
--- a/keyboards/tada68/keymaps/mattdicarlo/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Layer names for readability.
-#define BASE_LAYER 0
-#define FUNC_LAYER 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// Base layer, always active.
-[BASE_LAYER] = LAYOUT_ansi(
-  QK_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_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_DEL,
-  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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, MO(1),   _______, KC_LEFT, KC_DOWN, KC_RGHT),
-
-// Function overlay, toggled by the Fn key.
-[FUNC_LAYER] = 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_VOLU,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_MUTE,
-  _______,          _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_TOGG, _______, KC_PGUP, _______,
-  _______, _______, KC_MRWD,                   KC_MPLY,                            KC_MFFD, _______, _______, KC_HOME, KC_PGDN, KC_END),
-};
diff --git a/keyboards/tada68/keymaps/mattdicarlo/readme.md b/keyboards/tada68/keymaps/mattdicarlo/readme.md
deleted file mode 100755
index 47f04663c2c..00000000000
--- a/keyboards/tada68/keymaps/mattdicarlo/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Matt's TADA68 layout
-
-Mac OS modifier layout, plus various tweaks to the standard Tada68 layout.
-
-Uses Grave/Esc on the Esc key so that Cmd+Esc works to cycle through application windows as if the Grave/Tilde key was in the usual place, and sets the `GRAVE_ESC_ALT_OVERRIDE` flag so that Cmd-Opt-Esc still opens the Force Quit menu.
-
-Blanks on the switches above the Right Arrow and in between the Left Arrow and Fn keys, to give the arrow cluster a bit more separation and make it easier to find by feel.
diff --git a/keyboards/tada68/keymaps/mattdicarlo/rules.mk b/keyboards/tada68/keymaps/mattdicarlo/rules.mk
deleted file mode 100644
index 9f973f158bb..00000000000
--- a/keyboards/tada68/keymaps/mattdicarlo/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/mattgemmell/config.h b/keyboards/tada68/keymaps/mattgemmell/config.h
deleted file mode 100644
index f4b045cd32e..00000000000
--- a/keyboards/tada68/keymaps/mattgemmell/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define GRAVE_ESC_GUI_OVERRIDE
diff --git a/keyboards/tada68/keymaps/mattgemmell/keymap.c b/keyboards/tada68/keymaps/mattgemmell/keymap.c
deleted file mode 100644
index 0e9614fdff8..00000000000
--- a/keyboards/tada68/keymaps/mattgemmell/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | §  |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |Del |
-   * |-------------------------------------------------------    -----|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;| '| \ |Entr|PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift| `  |  Z|  X|  C|  V|  B|  N|  M|  ,|  .| /|Rshift|Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |LGUI|        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-  [_BL] = LAYOUT_iso(
-    QK_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_NUBS,
-    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_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_NUHS, KC_ENT,  KC_PGUP,
-    KC_LSFT, KC_GRV,  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_LALT, KC_LGUI,                   KC_SPC,                             KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-	),
-
-  /* Keymap _FL1: Function Layer 1
-   * ,----------------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|       |BR↑ |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |Prn|Scl|Pau|Up |   |     |BR↓ |
-   * |-------------------------------------------------------    -----|
-   * |       | V+| V-|Mut|   |   |   |   |Hom|PgU|Lft|Rig|  |    |Home|
-   * |----------------------------------------------------------------|
-   * |     |   |   |   | L+|LED| L-|   |   |End|PgDn|Dow|    | ↑ | End|
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    | ← | ↓ | →  |
-   * `----------------------------------------------------------------'
-   */
-  [_FL] = LAYOUT_iso(
-    _______, 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_BRMU,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,          KC_BRMD,
-    _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, KC_HOME,
-    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_MS_U, KC_END,
-    _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-	),
-};
diff --git a/keyboards/tada68/keymaps/mattgemmell/readme.md b/keyboards/tada68/keymaps/mattgemmell/readme.md
deleted file mode 100644
index de8e0c4980a..00000000000
--- a/keyboards/tada68/keymaps/mattgemmell/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Custom TADA68 layout for ISO UK with Apple-specific tweaks
-
-This layout is based on the [ISO UK](../iso-uk) layout, with changes to make it
-more user friendly when used on Apple devices, like iPads and the Mac.
-
-
-## Installation
-
-Please see the [Tada68 readme](../../readme.md). Make the firmware wih the
-following command:
-
-```
-make tada68:mattgemmell:flashbin
-```
diff --git a/keyboards/tada68/keymaps/mattgemmell/rules.mk b/keyboards/tada68/keymaps/mattgemmell/rules.mk
deleted file mode 100644
index 5425d055f1c..00000000000
--- a/keyboards/tada68/keymaps/mattgemmell/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/tada68/keymaps/mekberg/config.h b/keyboards/tada68/keymaps/mekberg/config.h
deleted file mode 100644
index d29180a5aff..00000000000
--- a/keyboards/tada68/keymaps/mekberg/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-// Define some configuration for modtap behavior
-// #define TAPPING_TERM 150
-#define PERMISSIVE_HOLD
diff --git a/keyboards/tada68/keymaps/mekberg/keymap.c b/keyboards/tada68/keymaps/mekberg/keymap.c
deleted file mode 100755
index 663adb67c83..00000000000
--- a/keyboards/tada68/keymaps/mekberg/keymap.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Fillers to make layering more clear
-// The default names have been swapped to make the keymap more readable.
-#define XXXXXX KC_TRNS
-#define ______ KC_NO
-
-// ISO keycodes with Swedish layout names
-#define SE_PLUS KC_MINS         // +
-#define SE_TCK KC_EQL           // Fronttick (´)
-#define SE_DASH KC_SLSH         // -
-#define SE_UML KC_RBRC          // Umlaut (¨)
-#define SE_QUT KC_NUHS          // Singlequote (')
-#define SE_AUML KC_QUOT     	// Ä
-#define SE_ARNG KC_LBRC     	// Å
-#define SE_OUML KC_SCLN     	// Ö
-#define SE_LT KC_NUBS       	// <
-
-// My common shortcuts
-#define MY_PREV KC_MRWD         // Media: Previous
-#define MY_NEXT KC_MFFD         // Media: Next
-#define MY_PLAY KC_MPLY         // Media: Play/Pause
-#define MY_LOCK C(A(KC_L))      // Mac: Lock
-
-
-/*
-TADA68 ISO physical layout
-1u == 8chars
-,----------------------------------------------------------------------------------------------------------------------------------------------.
-|        |        |        |        |        |        |        |        |        |        |        |        |        |      2u        |        |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |        |
-|--------------------------------------------------------------------------------------------------------------------------|          |--------|
-|     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        |   1,25u  |        |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|   1,25u  |        |        |        |        |        |        |        |        |        |        |        |     1,75u    |        |        |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|   1,25u  |   1,25u  |   1,25u  |                                                       |        |        |        |        |        |        |
-`----------------------------------------------------------------------------------------------------------------------------------------------'
-*/
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_iso(
-//  ,----------------------------------------------------------------------------------------------------------------------------------------------.
-//  |  Esc   |    1   |    2   |    3   |    4   |    5   |    6   |    7   |    8   |    9   |    0   |    +   |    ´   |   Backspace    |  Home  |
-     QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    SE_PLUS, SE_TCK,     KC_BSPC,      KC_HOME,
-//  |----------------------------------------------------------------------------------------------------------------------------------------------|
-//  |    Tab     |    Q   |    W   |    E   |    R   |    T   |    Y   |    U   |    I   |    O   |    P   |    Å   |    ¨   |            |  End   |
-     LT(2,KC_TAB), KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    SE_ARNG, SE_UML,              KC_END,
-//  |--------------------------------------------------------------------------------------------------------------------------|          |--------|
-//  |    LCtrl     |    A   |    S   |    D   |    F   |    G   |    H   |    J   |    K   |    L   |   Ö    |   Ä    |   '    |   Enter  |  PgUp  |
-        KC_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,   SE_OUML, SE_AUML, SE_QUT,    KC_ENT,  KC_PGUP,
-//  |----------------------------------------------------------------------------------------------------------------------------------------------|
-//  |  LShift  |   <>   |    Z   |   X    |   C    |    V   |    B   |    N   |    M   |   ,    |   .    |   -    |   RShift     |   Up   |  PgDn  |
-      KC_LSFT,   SE_LT,  KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,  SE_DASH,    KC_RSFT,     KC_UP,  KC_PGDN,
-//  |----------------------------------------------------------------------------------------------------------------------------------------------|
-//  |  LCtrl   |   LAlt   | Command  |                        Space                          |Command |  RAlt  |  Fn    |  Left  |  Down  | Right  |
-      KC_LCTL,   KC_LALT,   KC_LGUI,                         KC_SPC,                          KC_LGUI, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-//  `----------------------------------------------------------------------------------------------------------------------------------------------'
-	),
-
-	[1] = LAYOUT_iso(
-//  ,----------------------------------------------------------------------------------------------------------------------------------------------.
-//  |        |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   |     Delete     |  Ins   |
-     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,
-//  |----------------------------------------------------------------------------------------------------------------------------------------------|
-//  |            |        |   Up   |        |        |        |        |        |        |        |        |        |        |            |  Mute  |
-        ______,    ______,  KC_UP,   ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,              KC_MUTE,
-//  |--------------------------------------------------------------------------------------------------------------------------|   Lock   |--------|
-//  |  Caps Lock   |  Left  |  Down  | Right  | BLight |        |        |        |        |        |        |        |        |  Screen  | VolUp  |
-        KC_CAPS,    KC_LEFT, KC_DOWN, KC_RGHT, BL_BRTG, ______,   ______,  ______,  ______,  ______,  ______,  ______,  ______,  MY_LOCK,  KC_VOLU,
-//  |----------------------------------------------------------------------------------------------------------------------------------------------|
-//  |          |        |        |        |  Bl-   |BLtoggle | Bl+   |        |        |        |        |        |              |  Stop  | VolDn  |
-       ______,   ______,  ______,  ______, BL_DOWN, BL_TOGG, BL_UP,    ______,  ______,  ______,  ______,  ______,    ______,    KC_MSTP,  KC_VOLD,
-//  |----------------------------------------------------------------------------------------------------------------------------------------------|
-//  |          |          |          |                        Sleep                          |        |        |        |  Prev  |  Play  |  Fwd   |
-      ______,    ______,    ______,                          KC_SLEP,                           ______,  ______,  XXXXXX, MY_PREV, MY_PLAY, MY_NEXT
-//  `----------------------------------------------------------------------------------------------------------------------------------------------'
-	),
-
-	[2] = LAYOUT_iso(
-//  ,----------------------------------------------------------------------------------------------------------------------------------------------.
-//  |   Esc  |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   |     Delete     |        |
-     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,     ______,
-//  |----------------------------------------------------------------------------------------------------------------------------------------------|
-//  |            |        |   Up   |        |        |        |        |        |        |        |        |        |        |            |  Mute  |
-        XXXXXX,      ______, KC_UP,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,              KC_MUTE,
-//  |--------------------------------------------------------------------------------------------------------------------------|          |--------|
-//  |              |  Left  |  Down  | Right  |        |        |  Left  |  Down  |   Up   | Right  |        |        |        |          | VolUp  |
-        ______,     KC_LEFT, KC_DOWN, KC_RGHT,  ______,  ______, KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT,  ______,  ______,  ______,   ______,  KC_VOLU,
-//  |----------------------------------------------------------------------------------------------------------------------------------------------|
-//  |          |        |        |        |        |        |        |        |        |        |        |        |              | Stop   | VolDn  |
-       ______,   ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,    ______,    KC_MSTP,  KC_VOLD,
-//  |----------------------------------------------------------------------------------------------------------------------------------------------|
-//  |          |          |          |                                                       |        |        |        |  Prev  |  Play  |  Fwd   |
-      ______,    ______,    ______,                          ______,                           ______,  ______,  ______, MY_PREV, MY_PLAY, MY_NEXT
-//  `----------------------------------------------------------------------------------------------------------------------------------------------'
-	)
-};
diff --git a/keyboards/tada68/keymaps/mekberg/readme.md b/keyboards/tada68/keymaps/mekberg/readme.md
deleted file mode 100644
index be578e95726..00000000000
--- a/keyboards/tada68/keymaps/mekberg/readme.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Mekberg's TADA68 layout
-
-More or less a standard Swedish ISO layout, with Mac-centric key positions. All keys not assigned on non-default layers are set to KC_NO
-as I don't want them to pass through when activating a layer.
-
-# Layers
-
-### Base Layer
-
-```
-,----------------------------------------------------------------------------------------------------------------------------------------------.
-|  Esc   |    1   |    2   |    3   |    4   |    5   |    6   |    7   |    8   |    9   |    0   |    +   |    ´   |   Backspace    |  Home  |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|    Tab     |    Q   |    W   |    E   |    R   |    T   |    Y   |    U   |    I   |    O   |    P   |    Å   |    ¨   |            |  End   |
-|--------------------------------------------------------------------------------------------------------------------------|          |--------|
-|    LCtrl     |    A   |    S   |    D   |    F   |    G   |    H   |    J   |    K   |    L   |   Ö    |   Ä    |   '    |   Enter  |  PgUp  |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|  LShift  |   <>   |    Z   |   X    |   C    |    V   |    B   |    N   |    M   |   ,    |   .    |   -    |   RShift     |   Up   |  PgDn  |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|  LCtrl   |   LAlt   | Command  |                        Space                          |Command |  RAlt  |  Fn    |  Left  |  Down  | Right  |
-`----------------------------------------------------------------------------------------------------------------------------------------------'
-```
-
-### Fn Layer (layer 1)
-
-```
-,----------------------------------------------------------------------------------------------------------------------------------------------.
-|        |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   |     Delete     |  Ins   |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|            |        |   Up   |        |        |        |        |        |        |        |        |        |        |            |  Mute  |
-|--------------------------------------------------------------------------------------------------------------------------|          |--------|
-|  Caps Lock   |  Left  |  Down  | Right  | BLight |        |        |        |        |        |        |        |        |          | VolUp  |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|          |        |        |        |  Bl-   |BLtoggle | Bl+   |        |        |        |        |        |              |  Stop  | VolDn  |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|          |          |          |                                                       |        |        |        |  Prev  |  Play  |  Fwd   |
-`----------------------------------------------------------------------------------------------------------------------------------------------'
-```
-
-Mainly used for media keys and F-keys, as well as a nav cluster on WASD. Also has backlight keys, that are rarely used.
-
-### Modtap Tab Layer (layer 2)
-
-```
-,----------------------------------------------------------------------------------------------------------------------------------------------.
-|   Esc  |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   |     Delete     |        |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|            |        |   Up   |        |        |        |        |        |        |        |        |        |        |            |  Mute  |
-|--------------------------------------------------------------------------------------------------------------------------|          |--------|
-|              |  Left  |  Down  | Right  |        |        |  Left  |  Down  |   Up   | Right  |        |        |        |          | VolUp  |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|          |        |        |        |        |        |        |        |        |        |        |        |              | Stop   | VolDn  |
-|----------------------------------------------------------------------------------------------------------------------------------------------|
-|          |          |          |                                                       |        |        |        |  Prev  |  Play  |  Fwd   |
-`----------------------------------------------------------------------------------------------------------------------------------------------'
-```
-
-Tab acts as Tab when tapped, and as Layer 2 when held. Used for HJKL nav keys and Delete.
diff --git a/keyboards/tada68/keymaps/mekberg/rules.mk b/keyboards/tada68/keymaps/mekberg/rules.mk
deleted file mode 100644
index dbaa9045e7b..00000000000
--- a/keyboards/tada68/keymaps/mekberg/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/tada68/keymaps/mlechner/keymap.c b/keyboards/tada68/keymaps/mlechner/keymap.c
deleted file mode 100755
index 2640f09fe48..00000000000
--- a/keyboards/tada68/keymaps/mlechner/keymap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-enum custom_keycodes {
-  MAC_AE = SAFE_RANGE,
-  MAC_OE,
-  MAC_SS,
-	MAC_UE,
-  MAC_SHFT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |FN   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |Win |        Space          |Win|Alt |Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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,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_DEL,
-  MO(_FL), 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_LALT, KC_LGUI,                KC_SPC,                        KC_RGUI,KC_RALT,KC_CAPS, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   | Ü |   | Ö |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      | Ä | ß |   |   |   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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 ,
-  _______,_______,_______,_______,_______, _______,_______,MAC_UE,_______,MAC_OE,_______,_______,_______, _______,KC_HOME,
-  _______,MAC_AE , MAC_SS,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_END,
-  _______  ,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2,
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	if (record->event.pressed) {
-		switch(keycode) {
-			case MAC_UE:
-        if(keyboard_report->mods & MOD_BIT(KC_LSFT)) {
-          clear_keyboard();
-          SEND_STRING(SS_LALT("u") SS_LSFT("u"));
-        } else {
-				  SEND_STRING(SS_LALT("u")"u");
-        }
-				return false;
-      case MAC_AE:
-        if(keyboard_report->mods & MOD_BIT(KC_LSFT)) {
-          clear_keyboard();
-				  SEND_STRING(SS_LALT("u") SS_LSFT("a"));
-        } else {
-          SEND_STRING(SS_LALT("u")"a");
-        }
-        return false;
-      case MAC_OE:
-        if(keyboard_report->mods & MOD_BIT(KC_LSFT)) {
-          clear_keyboard();
-          SEND_STRING(SS_LALT("u") SS_LSFT("o"));
-        } else {
-          SEND_STRING(SS_LALT("u")"o");
-        }
-        return false;
-      case MAC_SS:
-        SEND_STRING(SS_LALT("s"));
-        return false;
-		}
-	}
-	return true;
-};
diff --git a/keyboards/tada68/keymaps/mlechner/readme.md b/keyboards/tada68/keymaps/mlechner/readme.md
deleted file mode 100755
index c35a19bbbd9..00000000000
--- a/keyboards/tada68/keymaps/mlechner/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# mlechner's TADA68 layout
-
-The layout is Mac style with Caps Lock remapped to FN and German Umlaute on the function layer.
diff --git a/keyboards/tada68/keymaps/mlechner/rules.mk b/keyboards/tada68/keymaps/mlechner/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/tada68/keymaps/mlechner/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/onelivesleft/config.h b/keyboards/tada68/keymaps/onelivesleft/config.h
deleted file mode 100644
index bada95bea55..00000000000
--- a/keyboards/tada68/keymaps/onelivesleft/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 6
diff --git a/keyboards/tada68/keymaps/onelivesleft/keymap.c b/keyboards/tada68/keymaps/onelivesleft/keymap.c
deleted file mode 100644
index 30ec5cbbd8f..00000000000
--- a/keyboards/tada68/keymaps/onelivesleft/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Del |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |CAPS|
-   * |-------------------------------------------------------    -----|
-   * |FN     |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;| '|  #|Entr|Home|
-   * |----------------------------------------------------------------|
-   * |Shift|  \ |  Z|  X|  C|  V|  B|  N|  M|  ,|  .| /|Rshift|Up|End|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-  [_BL] = 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, 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_CAPS,
-    MO(_FL), 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_HOME,
-    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, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-	),
-
-  /* Keymap _FL1: Function Layer 1
-   * ,----------------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Delete| Ins|
-   * |----------------------------------------------------------------|
-   * |     |   | ↑ |   |   |   |   |   |   |   | Prnt |  |  |   |Break|
-   * |-------------------------------------------------------    -----|
-   * |     | ← | ↓ | → |   |   |   |   |   |   |   | ` |   |     |PgUp|
-   * |----------------------------------------------------------------|
-   * |     |   |   |   | L+|LED| L-|   | Mut|  V-|V+|  | MsBtn|Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |MsBn| Lt| Dn| Rt |
-   * `----------------------------------------------------------------'
-   */
-  [_FL] = LAYOUT_iso(
-    _______, 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_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,          KC_BRK,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_GRV,  _______, _______, KC_PGUP,
-    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BTN2, KC_MS_U, KC_PGDN,
-    _______, _______, _______,                   _______,                            _______, _______, KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R
-	),
-};
diff --git a/keyboards/tada68/keymaps/onelivesleft/readme.md b/keyboards/tada68/keymaps/onelivesleft/readme.md
deleted file mode 100644
index 49f1013d283..00000000000
--- a/keyboards/tada68/keymaps/onelivesleft/readme.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# onelivesleft TADA68 layout for ISO UK
-
-This is a layout designed with programming in mind.  It's a modification of the `iso-uk` layout, and has been tested on a TADA68 purchased from kbdfans in May 2019. The physical key layout includes the "double height" iso Enter key and the "short" Left Shift along side the iso Backslash key. [See this keyboard-layout-editor.com Gist](http://www.keyboard-layout-editor.com/#/gists/acf0f32f7ea0d0ed35c901663ca47919)
-
-## Layout features:
-
-### Navigation column, from top-right down
-
-Bare:
-* Delete
-* Capslock
-* Home
-* End
-
-With FN:
-* Insert
-* Break
-* Page Up
-* Page Down
-
-### Mouse
-* Fn + cursors to move
-* Fn + Right Ctrl for left click
-* Fn + Right Shift for right click
-
-### Misc
-* Capslock key used as a second Fn key (for easy one-handed alt+F4 etc.)
-* Fn + ': `
-* Fn + P: Printscreen
-
-
-## Installation
-
-Please see the [tada68 readme](../../readme.md) using the following command
-
-```
-make tada68:onelivesleft:flashbin
-```
diff --git a/keyboards/tada68/keymaps/onelivesleft/rules.mk b/keyboards/tada68/keymaps/onelivesleft/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/tada68/keymaps/onelivesleft/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/pascamel/keymap.c b/keyboards/tada68/keymaps/pascamel/keymap.c
deleted file mode 100755
index d581a0d4c85..00000000000
--- a/keyboards/tada68/keymaps/pascamel/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |Cmd |        Space          | FN|Ctrl|Alt|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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,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_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_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_LALT,KC_LGUI,                KC_SPC,                        MO(_FL),KC_RCTL, KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * | ~ | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |Bl-|BL |BL+|   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|   |   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |<< |>|||>> |   |   |   |   |VU-|VU+|MUT|   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  KC_TILDE,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_UP,_______,_______, _______,_______,_______, BL_DOWN,BL_TOGG,BL_UP,  _______,_______, _______,KC_HOME,
-  _______,KC_LEFT, KC_DOWN, KC_RIGHT, _______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END,
-  _______,KC_MRWD, KC_MPLY, KC_MFFD, _______,_______,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_BTN1, KC_MS_U, KC_BTN2,
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
-};
diff --git a/keyboards/tada68/keymaps/pascamel/readme.md b/keyboards/tada68/keymaps/pascamel/readme.md
deleted file mode 100755
index a829133fc62..00000000000
--- a/keyboards/tada68/keymaps/pascamel/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# pascamel's TADA68 layout
-
-A layout based on raylas' layout with some updates on the fn layer especially around media keys.
-
-### Main layer
-
-![Imgur](https://i.imgur.com/UColvfc.png)
-
-### Fn layer
-
-![Imgur](https://i.imgur.com/pDQFoCQ.png)
diff --git a/keyboards/tada68/keymaps/pascamel/rules.mk b/keyboards/tada68/keymaps/pascamel/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/tada68/keymaps/pascamel/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/peippo/config.h b/keyboards/tada68/keymaps/peippo/config.h
deleted file mode 100644
index 6f70f09beec..00000000000
--- a/keyboards/tada68/keymaps/peippo/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/tada68/keymaps/peippo/keymap.c b/keyboards/tada68/keymaps/peippo/keymap.c
deleted file mode 100644
index e5dee253066..00000000000
--- a/keyboards/tada68/keymaps/peippo/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	/* Default layer
-	* ,----------------------------------------------------------------------------------------------------------------------------.
-	* | GrvEsc|   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |   9   |   0   |   +   |   ´   | Backspace  | MacOS |
-	* |----------------------------------------------------------------------------------------------------------------------------|
-	* | Tab      |   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   |   Å   |   ¨   |  Enter  | Del   |
-	* |-----------------------------------------------------------------------------------------------------------,        |-------|
-	* | Mod Layer |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   Ö   |   Ä   |   '   |        | PgUp  |
-	* |----------------------------------------------------------------------------------------------------------------------------|
-	* | Shift   |   <  |   Z   |   X   |   C   |   V   |   B   |   N   |   M   |   ,   |   .   |   -   |   Shift   |  Up   | PgDn  |
-	* |----------------------------------------------------------------------------------------------------------------------------|
-	* | Control | Option | Command |                         Space                 | Cmnd  | Opt   | ModLr | Left  | Down  | Right |
-	* `----------------------------------------------------------------------------------------------------------------------------'
-	*/
-
-	[_BL] = LAYOUT_iso(
-		QK_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, AG_NORM,
-		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_DEL,
-		MO(_FL), 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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT
-	),
-
-	/* Modifier layer
-	* ,----------------------------------------------------------------------------------------------------------------------------.
-	* | Esc   |       |       |       |       |       |       |       |   [   |   ]   |       |       |       |   Delete   |Windows|
-	* |----------------------------------------------------------------------------------------------------------------------------|
-	* |          |       |       |       |       |       |       | PgUp  |   Up  | PgDn  |       |       |       |         |       |
-	* |-----------------------------------------------------------------------------------------------------------,        |-------|
-	* |           |       |Scrnsht|Desktop|       |       |       | Left  | Down  | Right |       |       |       |        | VolUp |
-	* |----------------------------------------------------------------------------------------------------------------------------|
-	* | Shift   |      |       |       |       | BL-   |BL Togg| BL+   |       |       |       |       |   Shift   | Play  | VolDn |
-	* |----------------------------------------------------------------------------------------------------------------------------|
-	* |         |        |         |                                               |       |       |       | Prev  | Mute  | Next  |
-	* `----------------------------------------------------------------------------------------------------------------------------'
-	*/
-
-	[_FL] = LAYOUT_iso(
-		KC_ESC,  _______, _______,    _______, _______, _______, _______, _______, RALT(KC_8), RALT(KC_9), _______, _______, _______, KC_DEL,   AG_SWAP,
-		_______, _______, _______,    _______, _______, _______, _______, KC_PGUP, KC_UP,      KC_PGDN,    _______, _______, _______,           _______,
-		_______, _______, SGUI(KC_5), KC_F11,  _______, _______, _______, KC_LEFT, KC_DOWN,    KC_RGHT,    _______, _______, _______, _______,  KC_VOLU,
-		KC_LSFT, _______, _______,    _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______,    _______,    _______, _______, KC_RSFT, KC_MPLY,  KC_VOLD,
-		_______, _______, _______,                      _______,                               _______,    _______, _______, KC_MRWD, KC_MUTE,  KC_MFFD
-	),
-
-};
diff --git a/keyboards/tada68/keymaps/peippo/readme.md b/keyboards/tada68/keymaps/peippo/readme.md
deleted file mode 100644
index c3cf8b3c62c..00000000000
--- a/keyboards/tada68/keymaps/peippo/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# TADA68 ISO keymap by peippo
-
-Nordic ISO layout with faster access to cursor movement keys and brackets.
-
-## Keymap notes
-
--   A few MacOS specific shortcuts, but also has a key dedicated for swapping Alt and GUI buttons for Windows use.
--   Default layer has a Grave Escape which outputs Escape when pressed normally, and `§` when Shift or Command are held. I like to setup Command+Esc to moving focus to next window (MacOS preferences, Keyboard / Shortcuts / Keyboard).
--   `Caps Lock` or `FN` can be held to access the modifier layer.
-
-## Modifier layer
-
--   Additional cursor movement keys on `J/K/L/I`, and Page Up/Page Down on `U/O`.
--   Easier access to [] & {} (w/ Shift) on `8/9` (MacOS).
--   Show desktop on `D` (MacOS).
--   Screen capture tool on `S` (MacOS).
--   Media shortcuts on Arrow keys & Page Up/Page Down.
--   MacOS/Windows key for swapping Alt and GUI on both sides.
--   Backlighting adjustment (Toggle on `B`, increase/decrease on `V/B`).
-
-### Build
-
-To build the firmware, run `make tada68:peippo:flashbin`.
-Detailed instructions at https://github.com/qmk/qmk_firmware/tree/master/keyboards/tada68
diff --git a/keyboards/tada68/keymaps/raylas/keymap.c b/keyboards/tada68/keymaps/raylas/keymap.c
deleted file mode 100755
index 3b4fcd6138b..00000000000
--- a/keyboards/tada68/keymaps/raylas/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |Cmd |        Space          | FN|Ctrl|Alt|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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,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_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_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_LALT,KC_LGUI,                KC_SPC,                        MO(_FL),KC_RCTL, KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * | ~ | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|   |   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  KC_TILDE,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_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME,
-  _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END,
-  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2,
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
-};
diff --git a/keyboards/tada68/keymaps/raylas/readme.md b/keyboards/tada68/keymaps/raylas/readme.md
deleted file mode 100755
index aaec1258e04..00000000000
--- a/keyboards/tada68/keymaps/raylas/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-![TADA68 layout image](https://i.imgur.com/cV9niMC.jpg)
-
-# raylas's TADA68 layout
-
-A layout with some bottom row key swapping to accomadate macOS a little more, whilst keeping the TADA68 quirks alive.
-- Also added a function-accessed tilde to the Esc key
diff --git a/keyboards/tada68/keymaps/raylas/rules.mk b/keyboards/tada68/keymaps/raylas/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/tada68/keymaps/raylas/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/rbong/config.h b/keyboards/tada68/keymaps/rbong/config.h
deleted file mode 100644
index af01528b434..00000000000
--- a/keyboards/tada68/keymaps/rbong/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define BACKLIGHT_BREATHING
diff --git a/keyboards/tada68/keymaps/rbong/keymap.c b/keyboards/tada68/keymaps/rbong/keymap.c
deleted file mode 100644
index d8675696bee..00000000000
--- a/keyboards/tada68/keymaps/rbong/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-// Dual bind caps to left ctrl and escape when held
-#define CAPSDUAL CTL_T(KC_ESC)
-
-enum custom_keycodes {
-  TRMEXIT = 0
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case TRMEXIT:
-        SEND_STRING(SS_LCTL("\\")SS_LCTL("n"));
-        return false;
-    }
-  }
-  return true;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |~ ` | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = LAYOUT_ansi(
-  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_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_DEL,
-  CAPSDUAL, 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,
-  TRMEXIT,  KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |<- |DN |UP | ->|   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |BR |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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_HOME,
-  _______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,  KC_UP,KC_RIGHT,_______,_______,        _______,KC_END,
-  _______,_______,BL_BRTG,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE ,_______,KC_BTN1, KC_MS_U, KC_BTN2,
-  _______,_______,_______,                 _______,               _______,_______ ,_______,KC_MS_L,KC_MS_D, KC_MS_R),
-};
diff --git a/keyboards/tada68/keymaps/rbong/readme.md b/keyboards/tada68/keymaps/rbong/readme.md
deleted file mode 100644
index a19f77ca80c..00000000000
--- a/keyboards/tada68/keymaps/rbong/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# rbong's Keyboard Layout
-
-This layout is very vim oriented.
-
-* Dual binds CAPS to Ctrl/ESC
-* Binds escape to grave accent/tilde
-* FN+hjkl are bound to the arrow keys
-* Ctrl is bound to Ctrl+\\ Ctrl+n (`:terminal` escape sequence)
-* FN+x puts the backlight into breathing mode
diff --git a/keyboards/tada68/keymaps/rbong/rules.mk b/keyboards/tada68/keymaps/rbong/rules.mk
deleted file mode 100644
index 697e093edd8..00000000000
--- a/keyboards/tada68/keymaps/rbong/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h
index f902184d82a..21ddfa1850e 100755
--- a/keyboards/tada68/keymaps/rgb/config.h
+++ b/keyboards/tada68/keymaps/rgb/config.h
@@ -12,7 +12,7 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16         // Number of LEDs. Change this to match your use case.
+#define RGBLIGHT_LED_COUNT 16         // Number of LEDs. Change this to match your use case.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tada68/keymaps/rys/keymap.c b/keyboards/tada68/keymaps/rys/keymap.c
deleted file mode 100644
index 45ad5741bd9..00000000000
--- a/keyboards/tada68/keymaps/rys/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-
-enum rys_keycodes {
-  PSTOKEN = SAFE_RANGE,
-  QSTOKEN
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case PSTOKEN:
-      if (record->event.pressed) {
-        SEND_STRING(RYS_PSTOKEN);
-      }
-      break;
-    case QSTOKEN:
-      if (record->event.pressed) {
-        SEND_STRING(RYS_QSTOKEN);
-      }
-      break;
-  }
-  return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |Del |
-   * |-------------------------------------------------------    -----|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;| '|  #|Entr|PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift|  \ |  Z|  X|  C|  V|  B|  N|  M|  ,|  .| /|Rshift|Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |LGUI|        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-  [_BL] = 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, 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_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_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_LALT, KC_LGUI,                   KC_SPC,                             KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-	),
-
-  /* Keymap _FL1: Function Layer 1
-   * ,----------------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|       | :D |
-   * |----------------------------------------------------------------|
-   * |     |LMB| Up|RMB|   |   |   |   |   |   |   |   |   |     |    |
-   * |-------------------------------------------------------    -----|
-   * |       |Lef|Dow|Rig|   |   |   |   |   |   |   |  |   |    |Home|
-   * |----------------------------------------------------------------|
-   * |     |   |   |   | L+|LED| L-|   | V+|  V-|Mut|  | MsBtn|↑ | End|
-   * |----------------------------------------------------------------|
-   * |    |    |    |      Reset            |   |   |    | ← | ↓ | →  |
-   * `----------------------------------------------------------------'
-   */
-  [_FL] = LAYOUT_iso(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, PSTOKEN,
-    _______, KC_BTN1, KC_UP,   KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
-    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   QSTOKEN, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_MS_U, KC_END,
-    _______, _______, _______,                   QK_BOOT,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-	),
-};
diff --git a/keyboards/tada68/keymaps/rys/readme.md b/keyboards/tada68/keymaps/rys/readme.md
deleted file mode 100644
index bf6a643d336..00000000000
--- a/keyboards/tada68/keymaps/rys/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Custom Tada68 layout for ISO UK with Apple-y tweaks
-
-This layout is based on the [ISO UK](../iso-uk) layout, with the following
-changes:
-
-Swap Win and Alt on the left side (Option and Command on macOS)
-
-## Installation
-
-Please see the [Tada68 readme](../../readme.md). Make the firmware wih the
-following command:
-
-```
-make tada68:rys:flashbin
-```
diff --git a/keyboards/tada68/keymaps/rys/rules.mk b/keyboards/tada68/keymaps/rys/rules.mk
deleted file mode 100644
index 48aa308d541..00000000000
--- a/keyboards/tada68/keymaps/rys/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
-RYS_PSTOKEN = $(shell security find-generic-password -a qmk -s tada68 -w)
-RYS_QSTOKEN = $(shell security find-generic-password -a qmk -s tada68-2 -w)
-CFLAGS += -DRYS_PSTOKEN=\"$(RYS_PSTOKEN)\"
-CFLAGS += -DRYS_QSTOKEN=\"$(RYS_QSTOKEN)\"
diff --git a/keyboards/tada68/keymaps/shalzz/config.h b/keyboards/tada68/keymaps/shalzz/config.h
deleted file mode 100644
index 3214a33fb4f..00000000000
--- a/keyboards/tada68/keymaps/shalzz/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define DISABLE_SPACE_CADET_ROLLOVER
-#define GRAVE_ESC_ALT_OVERRIDE
diff --git a/keyboards/tada68/keymaps/shalzz/keymap.c b/keyboards/tada68/keymaps/shalzz/keymap.c
deleted file mode 100644
index 05c1d68ff64..00000000000
--- a/keyboards/tada68/keymaps/shalzz/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |FN |Alt|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   *
-   * Note: Shift + Esc = ~
-   *       Win   + Esc = `
-   */
-[_BL] = LAYOUT_ansi(
-  QK_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_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_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_PGUP,
-  SC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   SC_RSPC,KC_UP,KC_PGDN,
-  KC_LCTL, KC_LGUI,KC_LALT,            LT(_BL, KC_SPC),                    MO(_FL),KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |PRSC|
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Ins |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|   |   |<- |Dn |Up | ->|   |   |        |Hme |
-   * |----------------------------------------------------------------|
-   * |    (   |   |   |Bl-|BL |BL+|   |   |VU-|VU+|MUT|   )  |   |End |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_INS,
-  _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RGHT,_______,_______,        _______,KC_HOME,
-  KC_LPRN,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_RPRN, _______, KC_END,
-  _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
-};
diff --git a/keyboards/tada68/keymaps/shalzz/readme.md b/keyboards/tada68/keymaps/shalzz/readme.md
deleted file mode 100644
index 3e4cf60673f..00000000000
--- a/keyboards/tada68/keymaps/shalzz/readme.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Shalzz's Unix layout
-
-This layout is based on the Unix Layout with a few changes.
-
-```
- Base Layer
-,----------------------------------------------------------------.
-|Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-|----------------------------------------------------------------|
-|Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-|----------------------------------------------------------------|
-|CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-|----------------------------------------------------------------|
-|Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-|----------------------------------------------------------------|
-|Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-`----------------------------------------------------------------'
-Note: Shift + Esc = ~
-      Win   + Esc = `
-      Fn    + LShift = (
-      Fn    + RShift = )
-
- Fn Layer
-,----------------------------------------------------------------.
-|   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |PRSC|
-|----------------------------------------------------------------|
-|     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Ins |
-|----------------------------------------------------------------|
-|      |<- |Dn | ->|   |   |<- |Dn |Up | ->|   |   |        |Hme |
-|----------------------------------------------------------------|
-|    (   |   |   |Bl-|BL |BL+|   |   |VU-|VU+|MUT|   )  |   |End |
-|----------------------------------------------------------------|
-|    |    |    |                       |   |   |    |   |   |    |
-`----------------------------------------------------------------'
-
-```
-
-The changes that were applied over the Unix layout:
-
-* Left and Right Shift when pressed alone emit `(` and `)` respectively. Hold shift for normal behaviour.
-* Fn + Left and Right Shift also act as actual `(` and `)` keys respectively.
-* Changed PrintSc to `Fn+``
-* Fixed Holding down space activating the function layer instead of the lower layer.
diff --git a/keyboards/tada68/keymaps/shalzz/rules.mk b/keyboards/tada68/keymaps/shalzz/rules.mk
deleted file mode 100644
index 4595aa8c24f..00000000000
--- a/keyboards/tada68/keymaps/shalzz/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output on port C6
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = yes      # Breathing sleep LED during USB suspend
diff --git a/keyboards/tada68/keymaps/sm0g/config.h b/keyboards/tada68/keymaps/sm0g/config.h
deleted file mode 100644
index 3a2370b62cd..00000000000
--- a/keyboards/tada68/keymaps/sm0g/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define BACKLIGHT_BREATHING
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/sm0g/keymap.c b/keyboards/tada68/keymaps/sm0g/keymap.c
deleted file mode 100644
index 09e5d8b2213..00000000000
--- a/keyboards/tada68/keymaps/sm0g/keymap.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _GM 2
-#define _GF 3
-
-
-// Tap dance declarations (These must go above the keymaps)
-enum {
-  TD_F1 = 0,
-  TD_F2,
-  TD_F3,
-  TD_F4,
-  TD_F5,
-  TD_F6,
-  TD_F7,
-  TD_F8,
-  TD_F9,
-  TD_F10,
-  TD_F11,
-  TD_F12,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   \   |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Bksp |Del |
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Caps|Win |Alt |        Space          |Alt|Ctrl| FN|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = LAYOUT_ansi(
-  KC_ESC, TD(TD_F1), TD(TD_F2), TD(TD_F3), TD(TD_F4), TD(TD_F5), TD(TD_F6), TD(TD_F7), TD(TD_F8), TD(TD_F9), TD(TD_F10), TD(TD_F11), TD(TD_F12), KC_BSLS,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_BSPC,KC_DEL,
-  CTL_T(KC_ESC), 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,
-  SC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   SC_RSPC,KC_UP,KC_PGDN,
-  KC_CAPS, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RCTL,MO(_FL), KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|       |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * | Caps |<- |Dn | ->|   |   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |   |Prev|P/P|Next|
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TG(_GM), KC_INS ,
-  _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME,
-  KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END,
-  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  BL_BRTG,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MPRV,KC_MPLY, KC_MNXT),
-
-[_GM] = 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_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_BSPC,KC_DEL,
-  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_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_CAPS, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,KC_RCTL,MO(_GF), KC_LEFT,KC_DOWN,KC_RGHT),
-  
-[_GF] = LAYOUT_ansi(
- _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TG(_GM), KC_INS ,
-  _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME,
-  KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END,
-  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  BL_BRTG,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MPRV,KC_MPLY, KC_MNXT),
-
-};
-
-// Tapdance definitions. Tap Dance F Keys.
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_F1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_F1),
-  [TD_F2] = ACTION_TAP_DANCE_DOUBLE(KC_2, KC_F2),
-  [TD_F3] = ACTION_TAP_DANCE_DOUBLE(KC_3, KC_F3),
-  [TD_F4] = ACTION_TAP_DANCE_DOUBLE(KC_4, KC_F4),
-  [TD_F5] = ACTION_TAP_DANCE_DOUBLE(KC_5, KC_F5),
-  [TD_F6] = ACTION_TAP_DANCE_DOUBLE(KC_6, KC_F6),
-  [TD_F7] = ACTION_TAP_DANCE_DOUBLE(KC_7, KC_F7),
-  [TD_F8] = ACTION_TAP_DANCE_DOUBLE(KC_8, KC_F8),
-  [TD_F9] = ACTION_TAP_DANCE_DOUBLE(KC_9, KC_F9),
-  [TD_F10] = ACTION_TAP_DANCE_DOUBLE(KC_0, KC_F10),
-  [TD_F11] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_F11),
-  [TD_F12] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_F12),
-};
diff --git a/keyboards/tada68/keymaps/sm0g/readme.md b/keyboards/tada68/keymaps/sm0g/readme.md
deleted file mode 100644
index 9916dcabd8b..00000000000
--- a/keyboards/tada68/keymaps/sm0g/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-```
-                 ______          __            __         ______ ______ 
-.-----.--------.|      |.-----. |  |_.---.-.--|  |.---.-.|    __|  __  |
-|__ --|        ||  --  ||  _  | |   _|  _  |  _  ||  _  ||  __  |  __  |
-|_____|__|__|__||______||___  | |____|___._|_____||___._||______|______|
-                        |_____|                                         
-```
-
-Just my simple layout for the Tada68.  
-Space [Cadet Shift](https://docs.qmk.fm/#/feature_space_cadet_shift) is enabled.  
-LCTRL and Caps have been swapped and the new CTRL also acts as ESC when tapped and CTRL when held.  
-This is helpful for me as a VIM user.  
-Some other changes.  
-
-Tap Dance for the F Row.. i.e double tap 1 and get F1 instead. 
diff --git a/keyboards/tada68/keymaps/sm0g/rules.mk b/keyboards/tada68/keymaps/sm0g/rules.mk
deleted file mode 100644
index 7f95d4bd848..00000000000
--- a/keyboards/tada68/keymaps/sm0g/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = yes       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Tappa Dance
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/stephengrier/config.h b/keyboards/tada68/keymaps/stephengrier/config.h
deleted file mode 100755
index 56c5996d255..00000000000
--- a/keyboards/tada68/keymaps/stephengrier/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "../../config.h"
-
-#define BACKLIGHT_BREATHING
diff --git a/keyboards/tada68/keymaps/stephengrier/keymap.c b/keyboards/tada68/keymaps/stephengrier/keymap.c
deleted file mode 100755
index 1b0c843d2e4..00000000000
--- a/keyboards/tada68/keymaps/stephengrier/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |FN     |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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,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_DEL,
-  MO(_FL), 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_LALT,KC_LGUI,                KC_SPC,                        KC_RALT,MO(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |UP |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|   |   |   |<- |Dn | ->|   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |BR |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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_UP,_______,_______, _______,_______,_______, KC_UP,_______,_______,_______,_______, _______,KC_HOME,
-  _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,        _______,KC_END,
-  _______,_______,BL_BRTG,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2,
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
-};
diff --git a/keyboards/tada68/keymaps/stephengrier/readme.md b/keyboards/tada68/keymaps/stephengrier/readme.md
deleted file mode 100755
index f10f4ebdc0a..00000000000
--- a/keyboards/tada68/keymaps/stephengrier/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# stephengrier's TADA68 layout
-
-This layout mostly replicates the default ANSI layout of the TADA68 but with a
-few modifications to suit my tastes.
-
-The modifications from the default keymap are:
-
-* Replaced capslock with a second function key
-* Swapped the left ALT and Win keys to be more like the Mac layout
-* Added an arrow key cluster on the IJKL keys
-* Fn+x toggles backlight breathing mode
-
-With this keymap backlight breathing mode can be enabled/disabled with Fn+x.
-This is not supported at all in the default keymap.
-
diff --git a/keyboards/tada68/keymaps/stephengrier/rules.mk b/keyboards/tada68/keymaps/stephengrier/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/tada68/keymaps/stephengrier/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/tokyovigilante/config.h b/keyboards/tada68/keymaps/tokyovigilante/config.h
deleted file mode 100755
index 099d26914e3..00000000000
--- a/keyboards/tada68/keymaps/tokyovigilante/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define QMK_ESC_OUTPUT F0 // usually COL
-#define QMK_ESC_INPUT D0 // usually ROW
-#define QMK_LED B6
diff --git a/keyboards/tada68/keymaps/tokyovigilante/keymap.c b/keyboards/tada68/keymaps/tokyovigilante/keymap.c
deleted file mode 100644
index 1b4ccb7c036..00000000000
--- a/keyboards/tada68/keymaps/tokyovigilante/keymap.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_ansi(QK_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_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_GRV,
-                      KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                                               KC_HOME, MO(1),   KC_END,  KC_LEFT, KC_DOWN, KC_RGHT),
-
-	[1] = LAYOUT_ansi(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_P7,   KC_P8,   KC_P9,   KC_NUM,  BL_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
-                      KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_TRNS, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_END,
-                      KC_TRNS, KC_P1,   KC_P2,   KC_P3,   KC_TRNS, BL_DOWN, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-                      KC_TRNS, MO(2),   KC_TRNS, KC_TRNS,                                              KC_RALT, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT),
-
-	[2] = LAYOUT_ansi(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,   QK_BOOT, 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,   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,
-                      KC_NO,   KC_TRNS, KC_NO,   KC_NO,                                                KC_NO,   KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO)
-};
diff --git a/keyboards/tada68/keymaps/tokyovigilante/layers.json b/keyboards/tada68/keymaps/tokyovigilante/layers.json
deleted file mode 100644
index 67c5be56246..00000000000
--- a/keyboards/tada68/keymaps/tokyovigilante/layers.json
+++ /dev/null
@@ -1 +0,0 @@
-[["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_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_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_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"], ["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_DEL", "KC_INS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "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_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "BL_DOWN", "BL_TOGG", "BL_UP", "KC_TRNS", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_TRNS", "MO(2)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MS_L", "KC_MS_D", "KC_MS_R"], ["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", "QK_BOOT", "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", "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", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/tokyovigilante/readme.md b/keyboards/tada68/keymaps/tokyovigilante/readme.md
deleted file mode 100644
index 8544399d65f..00000000000
--- a/keyboards/tada68/keymaps/tokyovigilante/readme.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# TADA68 (65% ATMega32U4 PCB)
-
-The TADA68 comes with a custom firmware based on the LUFA mass storage
-driver, which mounts the user-accessible portion of the flash storage
-as a USB drive. This is prone to failure and can only be accessed by
-hitting the physical reset button on the base of the board, which is
-relatively accessible in an assembled keyboard.
-
-This keymap has some customisation to work with a TADA68 which has been
-ISP-reflashed (using a USBasp or other ISP) to work with the QMK bootloader.
-
-This allows use of dfu-programmer to reflash the firmware in DFU mode, and
-bootloader entry and exit with key-combos.
-
-To build the firmware, set up a build environment according to the standard
-QMK instructions, then run:
-
-```make tada68:tokyovigilante:production```
-
-which will build the bootloader, user firmware, and the combined image `<keyboard>_<keymap>_production.hex`.
-
-Then run
-
-```avrdude -F -c usbasp -p m32u4 -e -U flash:w:tada68_tokyovigilante_production.hex:a -U lfuse:w:0x5E:m -U hfuse:w:0xD9:m -U efuse:w:0xC3:m -U lock:w:0x3F:m```
-
-to copy it to your board (connected to the USBasp or other programmer, replacing the -c and filename parameters as required). The fuse and lock
-bitmaps will enable DFU mode.
-
-Once the board is unplugged and plugged in via USB, the default key-combo to
-enter DFU mode is Fn-Meta-R, then Esc to exit. You can then use 
-`make tada68:<keymap>:dfu` to build and flash any other custom keymap you 
-like, as the qmk-dfu bootloader can only be replaced using the ISP. This keymap is fairly basic, just make sure any replacement one has a RESET command defined (ideally on a non-default layer).
-
-More information can be found in the QMK docs: <https://docs.qmk.fm>
diff --git a/keyboards/tada68/keymaps/tokyovigilante/rules.mk b/keyboards/tada68/keymaps/tokyovigilante/rules.mk
deleted file mode 100755
index 2f7fde3d5c2..00000000000
--- a/keyboards/tada68/keymaps/tokyovigilante/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BOOTLOADER = qmk-dfu
-FIRMWARE_FORMAT = hex
diff --git a/keyboards/tada68/keymaps/trashcat/keymap.c b/keyboards/tada68/keymaps/trashcat/keymap.c
deleted file mode 100644
index 68914bd6d8e..00000000000
--- a/keyboards/tada68/keymaps/trashcat/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-#define _GM 2
-#define _GF 3
-
-// Tap dance declarations (These must go above the keymaps)
-enum {
-  TD_F1 = 0,
-  TD_F2,
-  TD_F3,
-  TD_F4,
-  TD_F5,
-  TD_F6,
-  TD_F7,
-  TD_F8,
-  TD_F9,
-  TD_F10,
-  TD_F11,
-  TD_F12,
-  TD_AE_FITCOMP,
-  TD_AE_IN,
-  TD_AE_OUT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   \   |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Bksp |Del |
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |FN| Alt|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = LAYOUT_ansi(
-  KC_ESC, TD(TD_F1), TD(TD_F2), TD(TD_F3), TD(TD_F4), TD(TD_F5), TD(TD_F6), TD(TD_F7), TD(TD_F8), TD(TD_F9), TD(TD_F10), TD(TD_F11), TD(TD_F12), KC_BSLS,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_BSPC,KC_DEL,
-  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_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,                        MO(_FL),KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  _GM  |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * | Caps |<- |Dn | ->|   |   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |   |Prev|P/P|Next|
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS ,
-  _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME,
-  KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END,
-  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______,
-  _______,_______,_______,                 TG(_GM),               _______,_______,_______,KC_MPRV,KC_MPLY, KC_MNXT),
-
-  /* Keymap _GL: Gaming Layer. Basically makes Caps Lock behave normally. I know there is a better way to do this but copy and paste was my friend
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   \   |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Bksp |Del |
-   * |----------------------------------------------------------------|
-   * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |FN| Alt|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_GM] = LAYOUT_ansi(
-  KC_ESC,TD(TD_F1), TD(TD_F2), TD(TD_F3), TD(TD_F4), TD(TD_F5), TD(TD_F6), TD(TD_F7), TD(TD_F8), TD(TD_F9), TD(TD_F10), TD(TD_F11), TD(TD_F12), _______, 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_BSPC,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_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,                _______,                        MO(_FL),KC_RALT,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-};
-
-// Tapdance definitions. Tap Dance F Keys.
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_F1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_F1),
-  [TD_F2] = ACTION_TAP_DANCE_DOUBLE(KC_2, KC_F2),
-  [TD_F3] = ACTION_TAP_DANCE_DOUBLE(KC_3, KC_F3),
-  [TD_F4] = ACTION_TAP_DANCE_DOUBLE(KC_4, KC_F4),
-  [TD_F5] = ACTION_TAP_DANCE_DOUBLE(KC_5, KC_F5),
-  [TD_F6] = ACTION_TAP_DANCE_DOUBLE(KC_6, KC_F6),
-  [TD_F7] = ACTION_TAP_DANCE_DOUBLE(KC_7, KC_F7),
-  [TD_F8] = ACTION_TAP_DANCE_DOUBLE(KC_8, KC_F8),
-  [TD_F9] = ACTION_TAP_DANCE_DOUBLE(KC_9, KC_F9),
-  [TD_F10] = ACTION_TAP_DANCE_DOUBLE(KC_0, KC_F10),
-  [TD_F11] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_F11),
-  [TD_F12] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_F12),
-  [TD_AE_FITCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, LALT(KC_SLSH)),
-  [TD_AE_IN] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, LALT(KC_LBRC)),
-[TD_AE_OUT] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, LALT(KC_RBRC))
-};
diff --git a/keyboards/tada68/keymaps/trashcat/readme.md b/keyboards/tada68/keymaps/trashcat/readme.md
deleted file mode 100644
index d8e37fa21db..00000000000
--- a/keyboards/tada68/keymaps/trashcat/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Trashcat's Tada68
-
-Just my simple layout for the Tada68.  
-Caps Lock behaves as LCtrl until switched to the Gaming Layer. I have a stupid reason for why I need caps lock at all but I won't get into it.  
-LCtrl is also LCtrl because I had no idea what else to put there.  
-
-Tap Dance for the F Row.. i.e double tap 1 and get F1 instead. 
diff --git a/keyboards/tada68/keymaps/trashcat/rules.mk b/keyboards/tada68/keymaps/trashcat/rules.mk
deleted file mode 100644
index e0ec1dc43fc..00000000000
--- a/keyboards/tada68/keymaps/trashcat/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = yes       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Tappa Dance Bitch
diff --git a/keyboards/tada68/keymaps/tshack/keymap.c b/keyboards/tada68/keymaps/tshack/keymap.c
deleted file mode 100755
index 3ca4129d151..00000000000
--- a/keyboards/tada68/keymaps/tshack/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Fn  |Win |Alt |        Space          |Alt|Fn |Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   *
-   * Note: Shift + Esc = ~
-   *       Win   + Esc = `
-   */
-[_BL] = LAYOUT_ansi(
-  QK_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_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_DEL ,
-  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_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,
-  MO(_FL), KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(_FL), KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  Del  |    |
-   * |----------------------------------------------------------------|
-   * |     |BL |BL-|BL+|   |   |   |   |   |   |PSc|   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |<- |Dn |Up | ->|   |   |        |Hme |
-   * |----------------------------------------------------------------|
-   * |        |MUT|V- |V+ |   |   |   |   |   |   |   |      |PUp|End |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |Hme|PDn|End |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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,   _______,
-  _______, BL_TOGG, BL_DOWN, BL_UP  , _______, _______, _______, _______, _______, _______,  KC_PSCR, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______,     _______,      KC_HOME,
-  _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,  _______, _______,     KC_PGUP,      KC_END ,
-  _______, _______, _______,                 _______,                     _______, _______,  _______, KC_HOME,     KC_PGDN,      KC_END ),
-};
diff --git a/keyboards/tada68/keymaps/tshack/readme.md b/keyboards/tada68/keymaps/tshack/readme.md
deleted file mode 100755
index 259b929ef80..00000000000
--- a/keyboards/tada68/keymaps/tshack/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# James Shackleford's Layout
-
-This layout has been tweaked to work well for UNIX terminal rats like
-myself.  Enjoy!
-
-```
- Base Layer
-,----------------------------------------------------------------.
-|Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-|----------------------------------------------------------------|
-|Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-|----------------------------------------------------------------|
-|Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-|----------------------------------------------------------------|
-|Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |PgDn|
-|----------------------------------------------------------------|
-|Fn  |Win |Alt |        Space          |Alt|Fn |Ctrl|<- |Dn | -> |
-`----------------------------------------------------------------'
-Note: Shift + Esc = ~ (tilde)
-      Win   + Esc = ` (grave)
-
-
- Fn Layer
-,----------------------------------------------------------------.
-|   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  Del  |    |
-|----------------------------------------------------------------|
-|     |BL |BL-|BL+|   |   |   |   |   |   |PSc|   |   |     |    |
-|----------------------------------------------------------------|
-|      |   |   |   |   |   |<- |Dn |Up | ->|   |   |        |Hme |
-|----------------------------------------------------------------|
-|        |MUT|V- |V+ |   |   |   |   |   |   |   |      |PUp|End |
-|----------------------------------------------------------------|
-|    |    |    |                       |   |   |    |Hme|PDn|End |
-`----------------------------------------------------------------'
-```
diff --git a/keyboards/tada68/keymaps/tshack/rules.mk b/keyboards/tada68/keymaps/tshack/rules.mk
deleted file mode 100644
index ef343bd7eb4..00000000000
--- a/keyboards/tada68/keymaps/tshack/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/unix/config.h b/keyboards/tada68/keymaps/unix/config.h
deleted file mode 100644
index a580d8b2e19..00000000000
--- a/keyboards/tada68/keymaps/unix/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "../../config.h"
-
-#define DISABLE_SPACE_CADET_ROLLOVER
-#define GRAVE_ESC_ALT_OVERRIDE
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/unix/keymap.c b/keyboards/tada68/keymaps/unix/keymap.c
deleted file mode 100644
index 7ff0331fda3..00000000000
--- a/keyboards/tada68/keymaps/unix/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   *
-   * Note: Shift + Esc = ~
-   *       Win   + Esc = `
-   *       Hold  + RShift = (
-   *       Hold  + LShift = )
-   */
-[_BL] = LAYOUT_ansi(
-  QK_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_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_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_PGUP,
-  SC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   SC_RSPC,KC_UP,KC_PGDN,
-  KC_LCTL, KC_LGUI,KC_LALT,            LT(_FL, KC_SPC),                    KC_RALT,MO(_FL),KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |    |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Ins |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|   |   |<- |Dn |Up | ->|   |   |        |Hme |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |   |VU-|VU+|MUT|      |   |End |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_INS,
-  _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP,KC_RGHT,_______,_______,        _______,KC_HOME,
-  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,_______,KC_VOLD,KC_VOLU,KC_MUTE,_______, _______, KC_END,
-  _______,_______,_______,                 _______,               _______,_______,_______,_______,_______, _______),
-};
diff --git a/keyboards/tada68/keymaps/unix/readme.md b/keyboards/tada68/keymaps/unix/readme.md
deleted file mode 100644
index d1680a0ac91..00000000000
--- a/keyboards/tada68/keymaps/unix/readme.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# tracyde Unix layout
-
-This layout is friendlier to those that spend the majority of their time in the *nix commandline.
-
-```
- Base Layer
-,----------------------------------------------------------------.
-|Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-|----------------------------------------------------------------|
-|Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-|----------------------------------------------------------------|
-|CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-|----------------------------------------------------------------|
-|Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-|----------------------------------------------------------------|
-|Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-`----------------------------------------------------------------'
-Note: Shift + Esc = ~
-      Win   + Esc = `
-      Hold  + RShift = (
-      Hold  + LShift = )
-
-
- Fn Layer
-,----------------------------------------------------------------.
-|   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |    |
-|----------------------------------------------------------------|
-|     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Ins |
-|----------------------------------------------------------------|
-|      |<- |Dn | ->|   |   |<- |Dn |Up | ->|   |   |        |Hme |
-|----------------------------------------------------------------|
-|        |   |   |Bl-|BL |BL+|   |   |VU-|VU+|MUT|      |   |End |
-|----------------------------------------------------------------|
-|    |    |    |                       |   |   |    |   |   |    |
-`----------------------------------------------------------------'
-
-```
-
-The changes that were applied over default layout:
-
-* Left and Right Shift when pressed alone emit `(` and `)` respectively. Press the opposite Shift to cancel.
-* Leds go into breath animation when USB suspends (because why not).
-* Holding down space activates the lower layer.
-* Changed Home and End to `Fn+PgUpPgDn`
-* Changed Insert to `Fn+Del`
-* Removed mouse movement.
-* Changed volume controls to `Fn+,./` (this makes volume controls make more sense `<` `>` act as you think they should)
-* Added arrow cluster as Fn+hjkl (vim users rejoice)
-* 'Grave-Escape' the escape key. This will allow the Esc key to function like Esc when pressed but act like the Grave key when pressed along with GUI or Shift keys. This allows you to use the Apple hotkey of CMD + ~ to switch between windows of the same app. In my config.h file I implemented the override 'GRAVE_ESC_ALT_OVERRIDE'. This will force ESC to be registered when hitting ALT. This preserves the Apple hotkey Cmd+Opt+Esc.
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/unix/rules.mk b/keyboards/tada68/keymaps/unix/rules.mk
deleted file mode 100644
index bcb15ec5ed9..00000000000
--- a/keyboards/tada68/keymaps/unix/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = yes      # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/keymaps/wamsm_tada/config.h b/keyboards/tada68/keymaps/wamsm_tada/config.h
deleted file mode 100644
index d24af2cbfdc..00000000000
--- a/keyboards/tada68/keymaps/wamsm_tada/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "../../config.h"
-
-#define GRAVE_ESC_ALT_OVERRIDE
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/wamsm_tada/keymap.c b/keyboards/tada68/keymaps/wamsm_tada/keymap.c
deleted file mode 100755
index d99cdd82367..00000000000
--- a/keyboards/tada68/keymaps/wamsm_tada/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#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.
-#define _BL 0
-#define _FL 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |FN     |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |CMD |        Space          |CMD |FN |Alt|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = LAYOUT_ansi(
-  QK_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_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_DEL,
-  MO(_FL), 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_LALT,KC_LGUI,                KC_SPC,                        KC_RGUI,MO(_FL),KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |    |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |Up |   |   |   |   |     |Ins |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|>|||   |   |<- |Dn | ->|   |   |        |Hme |
-   * |----------------------------------------------------------------|
-   * |        |VU-|VU+|MUT|   |   |   |   |BL-|BL+|BL |CAPS  |   |End |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |<< |>|| | >>|
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  _______, 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_UP,_______,_______, _______,_______,_______,KC_UP,_______,_______,_______,_______, _______,KC_INS ,
-  _______,KC_LEFT,KC_DOWN,KC_RIGHT,KC_MPLY,_______,_______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,        _______,KC_HOME,
-  _______,KC_VOLD, KC_VOLU, KC_MUTE, _______,_______, _______,  _______,BL_DOWN,BL_UP,  BL_TOGG,KC_CAPS,_______,KC_END,
-  _______,_______,_______,                 _______,               _______,_______,_______,KC_MRWD, KC_MPLY, KC_MFFD),
-};
diff --git a/keyboards/tada68/keymaps/wamsm_tada/readme.md b/keyboards/tada68/keymaps/wamsm_tada/readme.md
deleted file mode 100755
index bf1c36552ce..00000000000
--- a/keyboards/tada68/keymaps/wamsm_tada/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Wamsm's TADA68 layout
-
-This layout aims to be more MacOS compatible as well as improving upon the functions in the second layer.
-
-The changes that were applied over default layout:
-
-* Make Win/cmd keys right next to space bar just like Apple keyboards.
-* 'Grave-Escape' the escape key. This will allow the Esc key to function like Esc when pressed but act like the Grave key when pressed along with GUI or Shift keys. This allows you to use the Apple hotkey of CMD + ~ to switch between windows of the same app. In my config.h file I implemented the override 'GRAVE_ESC_ALT_OVERRIDE'. This will force ESC to be registered when hitting ALT. This preserves the Apple hotkey Cmd+Opt+Esc.
-* Moved CAPSLOCK function layer in the space of right shift. In first layer, CAPS acts as secondary fucntion key.
-* Changed LEDDown, LEDUp, LEDPower to Fn+,./ (seems more natural to put them towards the edge of the 1u keys)
-* Added arrow cluster as Fn+ijkl
-* Changed Home and End to Fn+PgUpPgDn
-* Replaced mouse controls with media controls (previous track = left arrow, next track = right arrow, play/pause = down arrow, stop track = up arrow)
-* Added an extra play/pause as Fn+f (so I can easily reach pause while fingers are on the home row)
-* Changed volume controls to Fn+zxc (this make mute eminently reachable)
-* Changed Insert to Fn+Del
-
-Many of the secondary function control ideas came from this blog post: https://chrisabides.wordpress.com/2016/08/31/review-and-programming-tutorial-tada68/
-So thank you to chrisabides!
diff --git a/keyboards/tada68/keymaps/wamsm_tada/rules.mk b/keyboards/tada68/keymaps/wamsm_tada/rules.mk
deleted file mode 100644
index 14367f2f8a3..00000000000
--- a/keyboards/tada68/keymaps/wamsm_tada/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/takashicompany/ejectix/info.json b/keyboards/takashicompany/ejectix/info.json
new file mode 100644
index 00000000000..560c2533263
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/info.json
@@ -0,0 +1,90 @@
+{
+    "manufacturer": "takashicompany",
+    "keyboard_name": "Ejectix",
+    "maintainer": "takashicompany",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 11
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 11,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0049",
+        "vid": "0x7463"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [1, 3], "x": 3, "y": 0},
+                {"matrix": [2, 0], "x": 4, "y": 0},
+                {"matrix": [2, 3], "x": 5, "y": 0},
+                {"matrix": [3, 0], "x": 6, "y": 0},
+                {"matrix": [3, 3], "x": 7, "y": 0},
+                {"matrix": [4, 0], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 5], "x": 10, "y": 0},
+                {"matrix": [0, 1], "x": 0.5, "y": 1},
+                {"matrix": [0, 4], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [2, 1], "x": 4.5, "y": 1},
+                {"matrix": [2, 4], "x": 5.5, "y": 1},
+                {"matrix": [3, 1], "x": 6.5, "y": 1},
+                {"matrix": [3, 4], "x": 7.5, "y": 1},
+                {"matrix": [4, 1], "x": 8.5, "y": 1},
+                {"matrix": [4, 4], "x": 9.5, "y": 1},
+                {"matrix": [0, 2], "x": 1, "y": 2},
+                {"matrix": [0, 5], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2},
+                {"matrix": [1, 5], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [3, 2], "x": 7, "y": 2},
+                {"matrix": [3, 5], "x": 8, "y": 2},
+                {"matrix": [4, 2], "x": 9, "y": 2},
+                {"matrix": [5, 0], "x": 1.75, "y": 3},
+                {"matrix": [5, 1], "x": 3, "y": 3},
+                {"matrix": [5, 2], "x": 4.25, "y": 3},
+                {"matrix": [5, 3], "x": 5.5, "y": 3},
+                {"matrix": [5, 4], "x": 6.75, "y": 3},
+                {"matrix": [5, 5], "x": 8, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/takashicompany/ejectix/keymaps/default/keymap.c b/keyboards/takashicompany/ejectix/keymaps/default/keymap.c
new file mode 100644
index 00000000000..b2c94317642
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT),
+        KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_BSPC
+    ),
+    
+    [1] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [2] = LAYOUT(
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3),
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [3] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TRNS,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT),
+        KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(4, KC_SPC), LT(4, KC_LNG1), KC_BSPC
+    ),
+        
+    [4] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3,
+        LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [5] = LAYOUT(
+        KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, KC_TRNS,
+        KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [6] = LAYOUT(
+        KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_TRNS,
+        KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ), 
+    
+    [7] = LAYOUT(
+        KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [8] = LAYOUT(
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), KC_TRNS,
+        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/takashicompany/ejectix/keymaps/via/keymap.c b/keyboards/takashicompany/ejectix/keymaps/via/keymap.c
new file mode 100644
index 00000000000..b2c94317642
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT),
+        KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_BSPC
+    ),
+    
+    [1] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [2] = LAYOUT(
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3),
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [3] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TRNS,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT),
+        KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(4, KC_SPC), LT(4, KC_LNG1), KC_BSPC
+    ),
+        
+    [4] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3,
+        LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [5] = LAYOUT(
+        KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, KC_TRNS,
+        KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [6] = LAYOUT(
+        KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_TRNS,
+        KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ), 
+    
+    [7] = LAYOUT(
+        KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [8] = LAYOUT(
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), KC_TRNS,
+        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/takashicompany/ejectix/keymaps/via/rules.mk b/keyboards/takashicompany/ejectix/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/takashicompany/ejectix/readme.md b/keyboards/takashicompany/ejectix/readme.md
new file mode 100644
index 00000000000..3a731808d60
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/readme.md
@@ -0,0 +1,33 @@
+# Ejectix
+
+![takashicompany/ejectix](https://i.imgur.com/gGk5UVdh.jpg)
+
+Ejectix is a 36-key, low-staggered keyboard.  
+Its layout is similar to that of a conventional keyboard, making it suitable for an introductory keyboard of 30% size.  
+Its relatively simple structure makes it easy to assemble, and it is recommended for those who are just starting to build their own keyboards.  
+Since the firmware is VIA-compatible, it is possible to write the firmware and change the keymap from a web browser by using Remap.  
+The MX socket is also supported, making it easy to replace the keyswitch for long-lasting use.  
+Underglow LEDs can also be used to decorate your desk.
+
+* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany)
+* Hardware Supported: Ejectix PCB, Pro Micro
+* Hardware Availability: https://github.com/takashicompany/ejectix
+
+Make example for this keyboard (after setting up your build environment):
+
+    make takashicompany/ejectix:default
+    
+
+Flashing example for this keyboard:
+
+    make takashicompany/ejectix: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 `QK_BOOT` if it is available
diff --git a/keyboards/takashicompany/ejectix/rules.mk b/keyboards/takashicompany/ejectix/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index c7f1d860ee6..55bc23a5927 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/config.h
@@ -1,41 +1,4 @@
-/*
-Copyright 2021 takashicompany
-
-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
-
-/* 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
-
-/*
- * 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
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #define EE_HANDS
diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json
index a13f15cb4a4..e0c020d0fdf 100644
--- a/keyboards/takashicompany/heavy_left/info.json
+++ b/keyboards/takashicompany/heavy_left/info.json
@@ -1,13 +1,24 @@
 {
     "keyboard_name": "Heavy Left",
     "manufacturer": "takashicompany",
-    "url": "",
     "maintainer": "takashicompany",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
     "usb": {
         "vid": "0x7463",
         "pid": "0x0015",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
@@ -19,11 +30,8 @@
             "rainbow_mood": true,
             "rainbow_swirl": true,
             "snake": true,
-            "knight": true,
             "christmas": true,
             "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
             "twinkle": true
         }
     },
@@ -36,10 +44,11 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "main": "eeprom"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c
index e88fc04c9b5..0a58e386f0e 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c
@@ -18,11 +18,11 @@
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
-    KC_00 = SAFE_RANGE
+    KC_00 = QK_USER
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
+
     LAYOUT(
         KC_ESC, KC_PSLS, KC_PAST, KC_PMNS, 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, JP_YEN, KC_BSPC, KC_DEL,
         KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_HOME,
@@ -37,8 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
+    )
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -50,4 +49,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
     }
     return true;
-}
\ No newline at end of file
+}
diff --git a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
deleted file mode 100644
index 5e5fef6456b..00000000000
--- a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2021 takashicompany
- *
- * 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_japanese.h"
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    KC_00 = QK_KB_0,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
-    LAYOUT(
-        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, 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, JP_YEN, KC_BSPC, KC_DEL,
-        KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_HOME,
-        KC_P4, KC_P5, KC_P6, KC_PCMM,KC_LCTL, KC_A, KC_S, LT(2, KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_END,
-        KC_P1, KC_P2, KC_P3, KC_PEQL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_UP, KC_RSFT, KC_PGUP,
-        KC_P0, KC_00, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, LALT_T(KC_LNG2), LALT_T(KC_LNG2), LSFT_T(KC_TAB), KC_SPC, LT(1, KC_LNG1), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, MO(3)
-    ),
-
-    LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, KC_LBRC, KC_SLSH, KC_MINS, JP_BSLS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, JP_YEN, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    
-    LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-      LAYOUT(
-        KC_NUM,  KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_00:
-            if (record->event.pressed) {
-                SEND_STRING("00");
-            }
-            return false;
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
index eb523ebe509..fed6a0ae98a 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
@@ -22,7 +22,7 @@ enum custom_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
+
     LAYOUT(
         KC_ESC, KC_PSLS, KC_PAST, KC_PMNS, 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, JP_YEN, KC_BSPC, KC_DEL,
         KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_HOME,
@@ -37,24 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-    LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    
-    LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
-
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -66,4 +49,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
     }
     return true;
-}
\ No newline at end of file
+}
diff --git a/keyboards/takashicompany/heavy_left/readme.md b/keyboards/takashicompany/heavy_left/readme.md
index a048103f849..ef676eba03f 100644
--- a/keyboards/takashicompany/heavy_left/readme.md
+++ b/keyboards/takashicompany/heavy_left/readme.md
@@ -1,6 +1,6 @@
 # heavy_left
 
-![heavy_left](https://github.com/takashicompany/heavy_left/blob/master/images/qmk.jpg)
+![heavy_left](https://i.imgur.com/cWHrklQh.jpeg)
 
 This is a 95-key split type Japanese keyboard.  
 It has a numeric keypad on the left hand side, which can be used not only for entering numbers but also as a dedicated macro pad.  
@@ -10,7 +10,7 @@ It also supports key switch replacement with MX sockets and LED underglow.
 左手側にテンキーが備え付けられており、数字の入力だけでなく専用のマクロパッドとしても使用が可能です。  
 MXソケットによるキースイッチの付替えや、LEDによるアンダーグロウにも対応しています。  
 
-* Keyboard Maintainer: [takashicompany](https://github.com/yourusername)
+* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany)
 * Hardware Supported: PCB, Pro Micro 
 * Hardware Availability: https://github.com/takashicompany/heavy_left
 
diff --git a/keyboards/takashicompany/heavy_left/rules.mk b/keyboards/takashicompany/heavy_left/rules.mk
index 2bccd4af0ca..6e7633bfe01 100644
--- a/keyboards/takashicompany/heavy_left/rules.mk
+++ b/keyboards/takashicompany/heavy_left/rules.mk
@@ -1,14 +1 @@
-# 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
-
-SPLIT_KEYBOARD=yes
\ No newline at end of file
+# This file intentionally left blank
diff --git a/keyboards/takashicompany/minidivide_max/info.json b/keyboards/takashicompany/minidivide_max/info.json
new file mode 100644
index 00000000000..32e67e944d8
--- /dev/null
+++ b/keyboards/takashicompany/minidivide_max/info.json
@@ -0,0 +1,129 @@
+{
+    "manufacturer": "takashicompany",
+    "keyboard_name": "miniDivide MAX",
+    "maintainer": "takashicompany",
+    "build": {
+        "lto": true
+    },
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 16,
+        "sleep": true,
+        "split_count": [8, 8]
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["B5", "B4", "E6", "D7", "C6", "D4"],
+                "rows": ["F4", "F5", "F6", "F7", "B1"]
+            }
+        },
+        "soft_serial_pin": "D2"
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0054",
+        "vid": "0x7463"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "dynamic_keymap": {
+        "layer_count": 7
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.4},
+                {"matrix": [0, 1], "x": 1, "y": 0.4},
+                {"matrix": [0, 2], "x": 2, "y": 0.2},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.2},
+                {"matrix": [0, 5], "x": 5, "y": 0.4},
+                {"matrix": [5, 0], "x": 9, "y": 0.4},
+                {"matrix": [5, 1], "x": 10, "y": 0.2},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0.2},
+                {"matrix": [5, 4], "x": 13, "y": 0.4},
+                {"matrix": [5, 5], "x": 14, "y": 0.4},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.4},
+                {"matrix": [1, 1], "x": 1, "y": 1.4},
+                {"matrix": [1, 2], "x": 2, "y": 1.2},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.2},
+                {"matrix": [1, 5], "x": 5, "y": 1.4},
+                {"matrix": [6, 0], "x": 9, "y": 1.4},
+                {"matrix": [6, 1], "x": 10, "y": 1.2},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1.2},
+                {"matrix": [6, 4], "x": 13, "y": 1.4},
+                {"matrix": [6, 5], "x": 14, "y": 1.4},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.4},
+                {"matrix": [2, 1], "x": 1, "y": 2.4},
+                {"matrix": [2, 2], "x": 2, "y": 2.2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.2},
+                {"matrix": [2, 5], "x": 5, "y": 2.4},
+                {"matrix": [7, 0], "x": 9, "y": 2.4},
+                {"matrix": [7, 1], "x": 10, "y": 2.2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2.2},
+                {"matrix": [7, 4], "x": 13, "y": 2.4},
+                {"matrix": [7, 5], "x": 14, "y": 2.4},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.4},
+                {"matrix": [3, 1], "x": 1, "y": 3.4},
+                {"matrix": [3, 2], "x": 2, "y": 3.2},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.2},
+                {"matrix": [3, 5], "x": 5, "y": 3.4},
+                {"matrix": [8, 0], "x": 9, "y": 3.4},
+                {"matrix": [8, 1], "x": 10, "y": 3.2},
+                {"matrix": [8, 2], "x": 11, "y": 3},
+                {"matrix": [8, 3], "x": 12, "y": 3.2},
+                {"matrix": [8, 4], "x": 13, "y": 3.4},
+                {"matrix": [8, 5], "x": 14, "y": 3.4},
+
+                {"matrix": [4, 2], "x": 3, "y": 4.1},
+                {"matrix": [4, 3], "x": 4, "y": 4.3},
+                {"matrix": [4, 4], "x": 5, "y": 4.5},
+                {"matrix": [4, 5], "x": 6, "y": 4.7},
+
+                {"matrix": [9, 0], "x": 8, "y": 4.7},
+                {"matrix": [9, 1], "x": 9, "y": 4.5},
+                {"matrix": [9, 2], "x": 10, "y": 4.3},
+                {"matrix": [9, 3], "x": 11, "y": 4.1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/takashicompany/minidivide_max/keymaps/default/keymap.c b/keyboards/takashicompany/minidivide_max/keymaps/default/keymap.c
new file mode 100644
index 00000000000..2553cd6316e
--- /dev/null
+++ b/keyboards/takashicompany/minidivide_max/keymaps/default/keymap.c
@@ -0,0 +1,56 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_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, KC_BSPC,
+        KC_TAB, LT(4, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
+        KC_LCTL, KC_A, KC_S, LT(3, KC_D), KC_F, KC_G, KC_H, KC_J, LT(3, KC_K), KC_L, KC_ENT, KC_ENT, 
+        KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_BSPC, 
+        KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RGUI, KC_RCTL
+    ),
+    
+    [1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        KC_TRNS, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [2] = LAYOUT(
+        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_TRNS,
+        KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ), 
+    
+    [4] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS,
+        KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(5), MO(6), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [5] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+        KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+        KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+    
+};
diff --git a/keyboards/takashicompany/minidivide_max/keymaps/via/keymap.c b/keyboards/takashicompany/minidivide_max/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ae19ae8dbe3
--- /dev/null
+++ b/keyboards/takashicompany/minidivide_max/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT(
+        LT(4, KC_ESC), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+        KC_TAB, LT(4, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
+        KC_LCTL, KC_A, KC_S, LT(3, KC_D), KC_F, KC_G, KC_H, KC_J, LT(3, KC_K), KC_L, KC_ENT, KC_ENT, 
+        KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_BSPC, 
+        KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RGUI, KC_RCTL
+    ),
+    
+    [1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        KC_TRNS, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
+        KC_TRNS, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [2] = LAYOUT(
+        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_TRNS,
+        KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ), 
+    
+    [4] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS,
+        KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
+        KC_TRNS, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, MO(5), MO(6),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [5] = LAYOUT(
+        RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+        KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+        KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+
+};
diff --git a/keyboards/takashicompany/minidivide_max/keymaps/via/rules.mk b/keyboards/takashicompany/minidivide_max/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/takashicompany/minidivide_max/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/takashicompany/minidivide_max/readme.md b/keyboards/takashicompany/minidivide_max/readme.md
new file mode 100644
index 00000000000..1360305f6b8
--- /dev/null
+++ b/keyboards/takashicompany/minidivide_max/readme.md
@@ -0,0 +1,48 @@
+# miniDivide MAX
+
+![miniDivide Max](https://i.imgur.com/5xozuXDh.jpg)
+
+miniDivide MAX is a 56-key segmented keyboard with 16mm spaced key layout.  
+The keys are 80% the size of conventional keys, making this keyboard suitable for people with small hands as well as those who want to type with minimal finger movement.  
+The 56-key layout makes it possible to start using this keyboard with a feel similar to a conventional keyboard.  
+It is also smaller and thinner than a conventional keyboard, making it suitable for carrying around and taking up minimal space when placed on a desk.  
+The split design allows you to type in a natural position.  
+In addition, it is also compatible with underglow LEDs and BLE Micro Pro, so it can be reconfigured to suit the case in which it is used.  
+
+---
+
+miniDivide MAXは16mm間隔のキー配置を採用した56キーの分割キーボードです。  
+
+キーが従来の80%の大きさなので、手が小さい人はもちろん最小限の指の移動で文字を打ちたい人に適したキーボードです。  
+
+56キー配置されているため、従来のキーボードに近い使用感で使い始めることが可能です。  
+
+また従来のキーボードよりも小さく薄いため持ち運びにも適していますし、デスクに置いた時にスペースが最小限で済むメリットもあります。  
+
+分割型なため、自然な体勢で文字を打つことができます。  
+
+その他、アンダーグロウLEDやBLE Micro Proなどにも対応しているため使用ケースにあわせて組み替えることが可能です。  
+
+
+
+* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany)
+* Hardware Supported: miniDivide MAX PCB, Pro Micro
+* Hardware Availability: https://github.com/takashicompany/minidivide_max
+
+Make example for this keyboard (after setting up your build environment):
+
+    make takashicompany/minidivide_max:default
+
+Flashing example for this keyboard:
+
+    make takashicompany/minidivide_max: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 `QK_BOOT` if it is available
diff --git a/keyboards/takashicompany/minidivide_max/rules.mk b/keyboards/takashicompany/minidivide_max/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/takashicompany/minidivide_max/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h
deleted file mode 100644
index 5665732b042..00000000000
--- a/keyboards/takashicompany/minizone/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 takashicompany (@takashicompany)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* 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
-
-/*
- * 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
diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json
index 911b924cfc5..e5690d5488f 100644
--- a/keyboards/takashicompany/minizone/info.json
+++ b/keyboards/takashicompany/minizone/info.json
@@ -3,11 +3,31 @@
     "manufacturer": "takashicompany",
     "url": "https://github.com/takashicompany/minizone",
     "maintainer": "takashicompany",
+    "development_board": "promicro",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
     "usb": {
         "vid": "0x7463",
         "pid": "0x0021",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
@@ -31,8 +51,6 @@
         "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/takashicompany/minizone/keymaps/default/keymap.c b/keyboards/takashicompany/minizone/keymaps/default/keymap.c
index a1ae5d866c1..f69284703a7 100644
--- a/keyboards/takashicompany/minizone/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/minizone/keymaps/default/keymap.c
@@ -5,66 +5,66 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    LAYOUT(
-        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
-        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
-        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
+    [0] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC,
         KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_PGUP, KC_PGDN
     ),
-    
-    LAYOUT(
-        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, 
-        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
+
+    [1] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3),
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
-        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), 
-        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, 
+
+    [2] = LAYOUT(
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3),
+        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3),
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
-        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
-        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
-        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
+
+    [3] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC,
         KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_PGUP, KC_PGDN
     ),
-        
-    LAYOUT(
-        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, 
-        LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, 
+
+    [4] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3,
+        LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
+
+    [5] = LAYOUT(
         KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS,
         KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE,
         KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
-        KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, 
-        KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, 
+
+    [6] = LAYOUT(
+        KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO,
+        KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ), 
-    
-    LAYOUT(
-        KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, 
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
-        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8), MO(9), 
+    ),
+
+    [7] = LAYOUT(
+        KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
-        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), 
-        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-        RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, 
+
+    [8] = LAYOUT(
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3),
+        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO,
         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/takashicompany/minizone/keymaps/via/config.h b/keyboards/takashicompany/minizone/keymaps/via/config.h
deleted file mode 100644
index f357dce3032..00000000000
--- a/keyboards/takashicompany/minizone/keymaps/via/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2022 takashicompany (@takashicompany)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 10
\ No newline at end of file
diff --git a/keyboards/takashicompany/minizone/keymaps/via/keymap.c b/keyboards/takashicompany/minizone/keymaps/via/keymap.c
index f64501f2f5f..f69284703a7 100644
--- a/keyboards/takashicompany/minizone/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/minizone/keymaps/via/keymap.c
@@ -5,72 +5,66 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    LAYOUT(
-        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
-        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
-        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
+    [0] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC,
         KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_PGUP, KC_PGDN
     ),
-    
-    LAYOUT(
-        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, 
-        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
+
+    [1] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3),
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
-        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), 
-        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, 
+
+    [2] = LAYOUT(
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3),
+        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3),
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
-        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 
-        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, 
-        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, 
+
+    [3] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC,
         KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_PGUP, KC_PGDN
     ),
-        
-    LAYOUT(
-        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 
-        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, 
-        LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, 
+
+    [4] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3,
+        LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
-        KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, 
-        KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, 
+
+    [5] = LAYOUT(
+        KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS,
+        KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
-        KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, 
-        KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, 
-        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ), 
-    
-    LAYOUT(
-        KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, 
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
-        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8), MO(9), 
+
+    [6] = LAYOUT(
+        KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO,
+        KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    
-    LAYOUT(
-        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), 
-        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-        RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, 
+
+    [7] = LAYOUT(
+        KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ), 
-    LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    ),
+
+    [8] = LAYOUT(
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3),
+        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO,
         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/takashicompany/minizone/rules.mk b/keyboards/takashicompany/minizone/rules.mk
index e6ed3b4b034..6e7633bfe01 100644
--- a/keyboards/takashicompany/minizone/rules.mk
+++ b/keyboards/takashicompany/minizone/rules.mk
@@ -1,13 +1 @@
-# 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
-OLED_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/takashicompany/radialex/readme.md b/keyboards/takashicompany/radialex/readme.md
index 2f723ba6869..0fb92dd9fc0 100644
--- a/keyboards/takashicompany/radialex/readme.md
+++ b/keyboards/takashicompany/radialex/readme.md
@@ -8,7 +8,7 @@ Your iconic keys and keycaps can be placed in the center of the keyboard.
 It is possible to make it shine with LED backlighting.  
 The keyswitches can also be replaced with MX sockets.  
 
-* Keyboard Maintainer: [takashicompany](https://github.com/yourusername)
+* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany)
 * Hardware Supported: PCB, Pro Micro
 * Hardware Availability: https://github.com/takashicompany/radialex
 
diff --git a/keyboards/takashicompany/rookey/info.json b/keyboards/takashicompany/rookey/info.json
new file mode 100644
index 00000000000..94733454090
--- /dev/null
+++ b/keyboards/takashicompany/rookey/info.json
@@ -0,0 +1,50 @@
+{
+    "manufacturer": "takashicompany",
+    "keyboard_name": "Rookey",
+    "maintainer": "takashicompany",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "E6"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"]
+        ]
+    },
+    "url": "https://github.com/takashicompany/rookey",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0056",
+        "vid": "0x7463"
+    },
+    "dynamic_keymap": {
+        "layer_count": 16
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 0, "y": 1},
+                {"matrix": [0, 5], "x": 1, "y": 1},
+                {"matrix": [0, 6], "x": 2, "y": 1},
+                {"matrix": [0, 7], "x": 3, "y": 1},
+                {"matrix": [0, 8], "x": 4, "y": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/takashicompany/rookey/keymaps/default/keymap.c b/keyboards/takashicompany/rookey/keymaps/default/keymap.c
new file mode 100644
index 00000000000..a224aaf7ea5
--- /dev/null
+++ b/keyboards/takashicompany/rookey/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        LT(1, KC_Q), KC_W, KC_E, KC_R,
+        KC_A, KC_S, KC_D, KC_F,
+        KC_V
+    ),
+    [1] = LAYOUT(
+        _______, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_1, KC_2) },
+    [1] =   { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) }
+};
+#endif
diff --git a/keyboards/qvex/lynepad2/keymaps/mcrosson/rules.mk b/keyboards/takashicompany/rookey/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/qvex/lynepad2/keymaps/mcrosson/rules.mk
rename to keyboards/takashicompany/rookey/keymaps/default/rules.mk
diff --git a/keyboards/takashicompany/rookey/keymaps/via/keymap.c b/keyboards/takashicompany/rookey/keymaps/via/keymap.c
new file mode 100644
index 00000000000..4e189861459
--- /dev/null
+++ b/keyboards/takashicompany/rookey/keymaps/via/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_Q, KC_W, KC_E, KC_R,
+        KC_A, KC_S, KC_D, KC_F,
+        KC_V
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+    [0]     =   { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/takashicompany/rookey/keymaps/via/rules.mk b/keyboards/takashicompany/rookey/keymaps/via/rules.mk
new file mode 100644
index 00000000000..6ccd6d91943
--- /dev/null
+++ b/keyboards/takashicompany/rookey/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/takashicompany/rookey/readme.md b/keyboards/takashicompany/rookey/readme.md
new file mode 100644
index 00000000000..f9393ca2200
--- /dev/null
+++ b/keyboards/takashicompany/rookey/readme.md
@@ -0,0 +1,43 @@
+# Rookey
+
+![takashicompany/rookey](https://i.imgur.com/kLQDeZZh.jpg)
+
+Rookey, as the name implies, is a DIY keyboard "Rookie" creation.
+
+With its small number of parts and simple structure, it can be easily completed even by first-time assemblers.
+
+Despite its small size, it can be used as a 9-key macro pad, and a rotary encoder can also be attached.
+
+It can be used not only as a first unit, but also as a long-lasting unit.
+
+---
+
+Rookeyは名前の通り、DIYキーボードの"Rookie"のために作られた一作です。
+
+部品数が少なく、構造がシンプルなため初めて組み立てる人でも容易に完成させることができます。
+
+小さいながらも9キーのマクロパッドとして使用ができる上に、ロータリーエンコーダの取り付けも可能です。
+
+初めての一台としてはもちろん、永く使い続ける一台としても愛用することができます。
+
+* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany)
+* Hardware Supported: Rookey PCB, Pro Micro
+* Hardware Availability: https://github.com/takashicompany/rookey
+
+Make example for this keyboard (after setting up your build environment):
+
+    make takashicompany/rookey:default
+
+Flashing example for this keyboard:
+
+    make takashicompany/rookey: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 `QK_BOOT` if it is available
diff --git a/keyboards/takashicompany/rookey/rules.mk b/keyboards/takashicompany/rookey/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/takashicompany/rookey/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/takashiski/hecomi/keymaps/kakunpc/config.h b/keyboards/takashiski/hecomi/keymaps/kakunpc/config.h
deleted file mode 100644
index 326b1212595..00000000000
--- a/keyboards/takashiski/hecomi/keymaps/kakunpc/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2018 kakunpc
- *
- * 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
-
-// place overrides here
-#define MASTER_RIGHT
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_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
diff --git a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
deleted file mode 100644
index df1b1195bc0..00000000000
--- a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2018 takashiski
- * Copyright 2019 kakunpc
- *
- * 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{
-    DF,
-    LW,
-    FN
-};
-
-
-#define LT_F13 LT(FN, KC_F13)
-#define LT_F14 LT(FN, KC_F14)
-#define KC_LW MO(LW)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [DF]=LAYOUT(
-            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_TAB  ,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,                 KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS,
-            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_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_DEL,
-            KC_LGUI,KC_NO,KC_LALT,KC_LW,LT_F13,KC_SPC,               KC_SPC,LT_F14,KC_LEFT,KC_UP,KC_DOWN,KC_RIGHT
-            ),
-    [LW]=LAYOUT(
-            RGB_TOG,KC_NO,RGB_VAD,RGB_VAI,RGB_HUI,RGB_HUD,KC_TRNS,    RGB_MOD,RGB_RMOD,KC_TRNS,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,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,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,KC_NO,KC_NO
-            ),
-    [FN]=LAYOUT(
-            KC_ESC,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_BSPC,
-            KC_TAB  ,KC_NO,KC_UP,KC_NO,KC_NO,KC_NO,KC_NO,           KC_7,KC_8,KC_0,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
-            KC_LCTL ,KC_LEFT,KC_DOWN,KC_RIGHT,KC_NO,KC_NO,         KC_4,KC_5,KC_6,KC_NO,KC_NO,KC_NO,KC_NO,
-            KC_LSFT   ,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,               KC_1,KC_2,KC_3,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
-            KC_LGUI,KC_NO,KC_LALT,KC_INT5,KC_NO,KC_SPC,             KC_0,KC_NO,KC_HOME,KC_PGUP,KC_PGDN,KC_END
-            ),
-};
diff --git a/keyboards/takashiski/hecomi/keymaps/kakunpc/readme.md b/keyboards/takashiski/hecomi/keymaps/kakunpc/readme.md
deleted file mode 100644
index d5ccbbf824c..00000000000
--- a/keyboards/takashiski/hecomi/keymaps/kakunpc/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The kakunpc keymap for hecomi_alpha
diff --git a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/config.h b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/config.h
deleted file mode 100644
index dbacdcce580..00000000000
--- a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 takashiski
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c
deleted file mode 100644
index 4b35b084187..00000000000
--- a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2018 takashiski
- *
- * 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_japanese.h"
-
-enum Layer
-{
-	JP,
-	EN,
-	CONFIG
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[JP] = LAYOUT(
-		JP_LABK,JP_RABK,JP_PLUS,JP_MINS,
-		LT(CONFIG,JP_DOT),JP_COMM,JP_LBRC,LT(CONFIG,JP_RBRC)
-		),
-[EN] = LAYOUT(
-		KC_LT,KC_GT,KC_PLUS,KC_MINS,
-		LT(CONFIG,KC_DOT),KC_COMM,KC_LBRC,LT(CONFIG,KC_RBRC)
-		),
-[CONFIG]= LAYOUT(
-		KC_NO,DF(JP),DF(JP),KC_NO,
-		KC_TRNS,DF(EN),DF(JP),KC_TRNS
-		)
-
-};
diff --git a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/readme.md b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/readme.md
deleted file mode 100644
index 7fee17acd9c..00000000000
--- a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# keymap for brainfuck
-
- This keymap is specialized for the brainfuck programming language.
-
-| < | > | + | - |
-| . | , | [ | ] |
-
-and when you hold . or ], change config layer.
-
-default layer is for JP keyboard(logical pairing).
-you can choose EN keyboard(typewrite pairing).
-
diff --git a/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
deleted file mode 100644
index 0ab6cc9891e..00000000000
--- a/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2019 takashiski
- *
- * 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 LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
-#define _________________QWERTY_L1_________________        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
-#define _________________QWERTY_L2_________________        KC_A,    KC_S,    KC_D,    KC_F,    KC_G
-#define _________________QWERTY_L3_________________        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
-
-#define _________________QWERTY_R1_________________        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P
-#define _________________QWERTY_R2_________________        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN
-#define _________________QWERTY_R3_________________        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLASH
-
-#define ________________NUMBER_LEFT________________       KC_1,    KC_2,    KC_3,    KC_4,    KC_5
-#define ________________NUMBER_RIGHT_______________       KC_6,    KC_7,    KC_8,    KC_9,    KC_0
-#define _________________FUNC_LEFT_________________       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
-#define _________________FUNC_RIGHT________________       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_wrapper(
-			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
-			KC_TAB,   _________________QWERTY_L1_________________,KC_Y,    _________________QWERTY_R1_________________,KC_LBRC,KC_RBRC,KC_ENT,
-			KC_CAPS,  _________________QWERTY_L2_________________,         _________________QWERTY_R2_________________,KC_QUOT,KC_NUHS,
-			KC_LSFT,  _________________QWERTY_L3_________________,    KC_B,_________________QWERTY_R3_________________,KC_INT1,KC_RSFT,
-			KC_LCTL,  KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_RGUI,KC_APP,KC_RCTL
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/takashiski/otaku_split/rev0/keymaps/sample/readme.md b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/readme.md
deleted file mode 100644
index dbaaa2eb8ef..00000000000
--- a/keyboards/takashiski/otaku_split/rev0/keymaps/sample/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for otaku_split
\ No newline at end of file
diff --git a/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
deleted file mode 100644
index c98b7bed8bb..00000000000
--- a/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2019 takashiski
- *
- * 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 the keycodes used by our macros in process_record_user
-
-#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
-#define _________________QWERTY_L1_________________        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
-#define _________________QWERTY_L2_________________        KC_A,    KC_S,    KC_D,    KC_F,    KC_G
-#define _________________QWERTY_L3_________________        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
-
-#define _________________QWERTY_R1_________________        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P
-#define _________________QWERTY_R2_________________        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN
-#define _________________QWERTY_R3_________________        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLASH
-
-#define ________________NUMBER_LEFT________________       KC_1,    KC_2,    KC_3,    KC_4,    KC_5
-#define ________________NUMBER_RIGHT_______________       KC_6,    KC_7,    KC_8,    KC_9,    KC_0
-#define _________________FUNC_LEFT_________________       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
-#define _________________FUNC_RIGHT________________       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
-
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-enum layers{
-	BASE=0
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_wrapper(
-			KC_GRAVE, KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,             KC_6, KC_7,  KC_8,  KC_9,  KC_0,  KC_MINUS  ,KC_EQL,KC_INT3,KC_BSPC,
-			KC_TAB,   _________________QWERTY_L1_________________,KC_Y,    _________________QWERTY_R1_________________,KC_LBRC,KC_RBRC,KC_ENT,
-			KC_CAPS,  _________________QWERTY_L2_________________,         _________________QWERTY_R2_________________,KC_QUOT,KC_NUHS,
-			KC_LSFT,  _________________QWERTY_L3_________________,         KC_B,_________________QWERTY_R3_________________,KC_INT1,KC_RSFT,
-			KC_LCTL,  KC_LGUI,KC_LALT,KC_INT5,KC_TAB,KC_SPC,KC_SPC,        KC_SPC,KC_ENT,KC_BSPC,KC_INT4,KC_INT2,KC_RALT,KC_APP,KC_RCTL
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/takashiski/otaku_split/rev1/keymaps/sample/readme.md b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/readme.md
deleted file mode 100644
index dbaaa2eb8ef..00000000000
--- a/keyboards/takashiski/otaku_split/rev1/keymaps/sample/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for otaku_split
\ No newline at end of file
diff --git a/keyboards/takayoshiotake/three_octave_sharp/keymaps/default/keymap.c b/keyboards/takayoshiotake/three_octave_sharp/keymaps/default/keymap.c
index 220eade9a9e..00bffdfa72d 100644
--- a/keyboards/takayoshiotake/three_octave_sharp/keymaps/default/keymap.c
+++ b/keyboards/takayoshiotake/three_octave_sharp/keymaps/default/keymap.c
@@ -6,40 +6,64 @@
 #define KC_JEIS KC_JAPANESE_EISUU
 #define KC_JKAN KC_JAPANESE_KANA
 
-#define LT_L1ES LT(1, KC_ESC)
+#define LT_L1TB LT(1, KC_TAB)
+#define LT_L2ES LT(2, KC_ESC)
+#define LT_L4EN LT(4, KC_ENT)
 #define MT_LGJE MT(MOD_LGUI, KC_JEIS)
 #define MT_RAJK MT(MOD_RALT, KC_JKAN)
 
-#define KC_MUTE KC_KB_MUTE
-#define KC_VOLM KC_KB_VOLUME_DOWN
-#define KC_VOLP KC_KB_VOLUME_UP
+#define LS_MINS LSFT(KC_MINS)
+#define LS_EQL LSFT(KC_EQL)
+#define LS_BSLS LSFT(KC_BSLS)
+#define LS_GRV LSFT(KC_GRV)
+#define LS_LBRC LSFT(KC_LBRC)
+#define LS_RBRC LSFT(KC_RBRC)
+#define LS_SCLN LSFT(KC_SCLN)
+#define LS_QUOT LSFT(KC_QUOT)
+#define LS_COMM LSFT(KC_COMM)
+#define LS_DOT LSFT(KC_DOT)
+#define LS_SLSH LSFT(KC_SLSH)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT(
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-		LT_L1ES, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
-		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    MO(2),   MO(3),
+		LT_L2ES, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+		LT_L1TB, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    LT_L4EN,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    MO(5),   MO(3),
 		KC_LCTL, MT_LGJE, KC_SPC,  MT_RAJK, KC_RCTL
 	),
 
 	[1] = LAYOUT(
-		_______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  _______,
+		KC_LSFT, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
 		XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______,
 		_______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
 		_______, _______, _______, _______, _______
 	),
 
 	[2] = LAYOUT(
-		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______, _______, _______, _______,
-		KC_CAPS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_UP,   KC_DOWN, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, XXXXXXX, KC_RSFT,
+		XXXXXXX, _______, _______, _______, _______, _______, _______, _______, LS_MINS, LS_EQL,  LS_BSLS, LS_GRV,
+		XXXXXXX, _______, _______, _______, _______, _______, LS_LBRC, LS_RBRC, LS_SCLN, LS_QUOT, _______,
+		_______, _______, _______, _______, _______, _______, LS_COMM, LS_DOT,  LS_SLSH, _______,
 		_______, _______, _______, _______, _______
 	),
 
 	[3] = LAYOUT(
-		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-		KC_CAPS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  _______,
-		_______, KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_MUTE, KC_VOLM, KC_VOLP, XXXXXXX,
+		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+		_______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_RSFT,
+		_______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX,
+		_______, _______, _______, _______, _______
+	),
+
+	[4] = LAYOUT(
+		_______, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), _______,
+		_______, _______, _______, _______, _______, _______, LS_LBRC, LS_RBRC, LS_SCLN, LS_QUOT, XXXXXXX,
+		_______, _______, _______, _______, _______, _______, LS_COMM, LS_DOT,  LS_SLSH, XXXXXXX,
+		_______, _______, _______, _______, _______
+	),
+
+	[5] = 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,  _______, _______, _______, XXXXXXX, _______,
 		_______, _______, _______, _______, _______
 	)
 };
\ No newline at end of file
diff --git a/keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/config.h b/keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/config.h
index 5820f933f75..18827ede092 100644
--- a/keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/config.h
+++ b/keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/config.h
@@ -4,3 +4,5 @@
 
 #define VIAL_UNLOCK_COMBO_ROWS {1, 1}
 #define VIAL_UNLOCK_COMBO_COLS {0, 10}
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/keymap.c b/keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/keymap.c
index 220eade9a9e..00bffdfa72d 100644
--- a/keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/keymap.c
+++ b/keyboards/takayoshiotake/three_octave_sharp/keymaps/vial/keymap.c
@@ -6,40 +6,64 @@
 #define KC_JEIS KC_JAPANESE_EISUU
 #define KC_JKAN KC_JAPANESE_KANA
 
-#define LT_L1ES LT(1, KC_ESC)
+#define LT_L1TB LT(1, KC_TAB)
+#define LT_L2ES LT(2, KC_ESC)
+#define LT_L4EN LT(4, KC_ENT)
 #define MT_LGJE MT(MOD_LGUI, KC_JEIS)
 #define MT_RAJK MT(MOD_RALT, KC_JKAN)
 
-#define KC_MUTE KC_KB_MUTE
-#define KC_VOLM KC_KB_VOLUME_DOWN
-#define KC_VOLP KC_KB_VOLUME_UP
+#define LS_MINS LSFT(KC_MINS)
+#define LS_EQL LSFT(KC_EQL)
+#define LS_BSLS LSFT(KC_BSLS)
+#define LS_GRV LSFT(KC_GRV)
+#define LS_LBRC LSFT(KC_LBRC)
+#define LS_RBRC LSFT(KC_RBRC)
+#define LS_SCLN LSFT(KC_SCLN)
+#define LS_QUOT LSFT(KC_QUOT)
+#define LS_COMM LSFT(KC_COMM)
+#define LS_DOT LSFT(KC_DOT)
+#define LS_SLSH LSFT(KC_SLSH)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT(
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-		LT_L1ES, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
-		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    MO(2),   MO(3),
+		LT_L2ES, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+		LT_L1TB, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    LT_L4EN,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    MO(5),   MO(3),
 		KC_LCTL, MT_LGJE, KC_SPC,  MT_RAJK, KC_RCTL
 	),
 
 	[1] = LAYOUT(
-		_______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  _______,
+		KC_LSFT, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
 		XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______,
 		_______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
 		_______, _______, _______, _______, _______
 	),
 
 	[2] = LAYOUT(
-		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______, _______, _______, _______,
-		KC_CAPS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_UP,   KC_DOWN, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, XXXXXXX, KC_RSFT,
+		XXXXXXX, _______, _______, _______, _______, _______, _______, _______, LS_MINS, LS_EQL,  LS_BSLS, LS_GRV,
+		XXXXXXX, _______, _______, _______, _______, _______, LS_LBRC, LS_RBRC, LS_SCLN, LS_QUOT, _______,
+		_______, _______, _______, _______, _______, _______, LS_COMM, LS_DOT,  LS_SLSH, _______,
 		_______, _______, _______, _______, _______
 	),
 
 	[3] = LAYOUT(
-		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-		KC_CAPS, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  _______,
-		_______, KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_MUTE, KC_VOLM, KC_VOLP, XXXXXXX,
+		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+		_______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_RSFT,
+		_______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX,
+		_______, _______, _______, _______, _______
+	),
+
+	[4] = LAYOUT(
+		_______, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), _______,
+		_______, _______, _______, _______, _______, _______, LS_LBRC, LS_RBRC, LS_SCLN, LS_QUOT, XXXXXXX,
+		_______, _______, _______, _______, _______, _______, LS_COMM, LS_DOT,  LS_SLSH, XXXXXXX,
+		_______, _______, _______, _______, _______
+	),
+
+	[5] = 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,  _______, _______, _______, XXXXXXX, _______,
 		_______, _______, _______, _______, _______
 	)
 };
\ No newline at end of file
diff --git a/keyboards/tanuki/keymaps/tucznak/config.h b/keyboards/tanuki/keymaps/tucznak/config.h
deleted file mode 100644
index 37d42c08140..00000000000
--- a/keyboards/tanuki/keymaps/tucznak/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#undef MANUFACTURER
-#undef PRODUCT
-
-#define MANUFACTURER    "Potato Inc."
-#define PRODUCT         "Trash Panda"
-
-/* for bootloader */
-#define QMK_ESC_OUTPUT B2
-#define QMK_ESC_INPUT D0
-#define QMK_LED B0
-
-/* send tap key if no layer key was used even after tap delay */
-#undef TAPPING_TERM
-#define TAPPING_TERM 250
-#define RETRO_TAPPING
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/tanuki/keymaps/tucznak/keymap.c b/keyboards/tanuki/keymaps/tucznak/keymap.c
deleted file mode 100644
index 2b687b8485c..00000000000
--- a/keyboards/tanuki/keymaps/tucznak/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _BASE,
-    _DN,
-    _UP,
-	_NAV,
-    _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
-    /* Base layer (0)
-     * ,------------------------------------------------------------------------.
-     * | Esc |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bksp |
-     * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
-     * |  Tab |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ů  | Nav |
-     * `------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----'
-     *   | Shift |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,	 |  .  |Enter |
-     *   `-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+------'
-     *        | Ctrl | GUI |LAlt |   Space    |  SpaceUp  |AltGr| Down |
-     *        `--------------------------------------------------------'
-     */
-	 
-    [_BASE] = LAYOUT(
-        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, TT(_NAV), 
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_ENT,  
-                 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,            LT(_UP,KC_SPC),   KC_RALT, MO(_DN)
-    ),
-	
-	/* Down layer (1)
-	 * function keys and numbers
-     * ,------------------------------------------------------------------------.
-     * | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12  |
-     * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
-     * |      |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |     |
-     * `------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----'
-     *   |       |NumLk|     |     |  +  |  -  |  *  |  /  |  ,	 |  .  |      |
-     *   `-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+------'
-     *        |  Fn  |     |     |   C+A+D    |   C+A+I   |     |      |
-     *        `--------------------------------------------------------'
-     */
-	 
-    [_DN] = 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_KP_1, KC_KP_2, KC_KP_3, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, _______,
-        _______, KC_NUM,  _______, _______, KC_PPLS, KC_PMNS, KC_PAST, KC_PSLS, KC_COMM, KC_DOT,  _______, 
-                 MO(_FN), _______, _______, LCA(KC_DEL),      LCA(KC_INS),      _______, _______
-    ),
-	
-	/* Up layer (2)
-	 * national and special characters
-     * ,------------------------------------------------------------------------.
-     * | +1  | ě2  | š3  | č4  | ř5  | ž6  | ý7  | á8  | í9  | é0  |  ´  |  ˇ   |
-     * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
-     * |  ;°  |     |     |     |  |  |  (  |  )  |  §  |  !  |  /  |  ú  |     |
-     * `------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----'
-     *   |       |     |     |  \  |  %  |  =  |  ¨  |  '  |  -	 |  _  |      |
-     *   `-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+------'
-     *        |      |     |     |            |           |     |      |
-     *        `--------------------------------------------------------'
-     */
-	 
-    [_UP] = LAYOUT(
-        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,          KC_6,          KC_7,    KC_8,          KC_9,          KC_0,          KC_EQL,  LSFT(KC_EQL),
-        KC_GRV,  _______, _______, _______, LSFT(KC_NUBS), LSFT(KC_RBRC), KC_RBRC, KC_QUOT,       LSFT(KC_QUOT), LSFT(KC_LBRC), KC_LBRC, _______,
-        _______, _______, _______, KC_NUBS, LSFT(KC_MINS), KC_MINS,       KC_BSLS, LSFT(KC_BSLS), KC_SLSH,       LSFT(KC_SLSH), _______,
-                 _______, _______, _______, _______,                      _______,                _______,       _______
-    ),
-	
-	/* Navigation layer (3)
-	 * arrows, nav cluster
-     * ,------------------------------------------------------------------------.
-     * |     |     |     |     |     |Home |PgUp |     |     | Up  | Ins | Del  |
-     * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
-     * |      |     |     |     |     | End |PgDn |     |Left |Down |Right|     |
-     * `------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----'
-     *   |       |Caps |PrtSc|ScrLk|Pause|     |     |     |   	 |     |      |
-     *   `-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+------'
-     *        |      |     |     |            |           |     | Menu |
-     *        `--------------------------------------------------------'
-     */
-	 
-    [_NAV] = LAYOUT(
-        _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, KC_UP,   KC_INS,  KC_DEL, 
-        _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, 
-        _______, KC_CAPS, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, 
-                 _______, _______, _______, _______,          _______,          _______, KC_APP
-    ),
-	
-	/* Function layer (4)
-	 * keyboard and system control
-     * ,------------------------------------------------------------------------.
-     * |Reset|     |     |     |     |     |     |Play |Prev |Next |Stop |      |
-     * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
-     * |Sleep | VLK |Mod+ |Hue+ |Sat+ |Val+ |     |     |Vol- |Vol+ |Mute |     |
-     * `------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----'
-     *   |       | TOG |Mod- |Hue- |Sat- |Val- |     |     |   	 |     |      |
-     *   `-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+------'
-     *        |      |     |     |            |           |     |      |
-     *        `--------------------------------------------------------'
-     */
-	 
-    [_FN] = LAYOUT(
-        QK_BOOT, _______, _______,  _______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, _______, 
-        KC_SLEP, VK_TOGG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, 
-        _______, RGB_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, 
-                 _______, _______,  _______, _______,          _______,          _______, _______
-    )
-    
-};
-
-bool process_record_user (uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
diff --git a/keyboards/tanuki/keymaps/tucznak/readme.md b/keyboards/tanuki/keymaps/tucznak/readme.md
deleted file mode 100644
index b38490c9c56..00000000000
--- a/keyboards/tanuki/keymaps/tucznak/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# TuCZnak's modified layout
-
-This layout is optimized for Czech national QWERTZ keymap.
-It includes separated layers for:
- - F-keys and numbers
- - national and special characters
- - navigation cluster
- - keyboard config and media control
diff --git a/keyboards/tanuki/keymaps/tucznak/rules.mk b/keyboards/tanuki/keymaps/tucznak/rules.mk
deleted file mode 100644
index 627c8939495..00000000000
--- a/keyboards/tanuki/keymaps/tucznak/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# screw Caterina
-BOOTLOADER = qmk-dfu
-
-# Build Options
-#   comment out to disable the options.
-#
-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       # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE =yes    # Enable keyboard underlight functionality (+4870)
-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality (+1150)
-MIDI_ENABLE = no        # MIDI controls
-AUDIO_ENABLE = no
-UNICODE_ENABLE = no     # Unicode
-BLUETOOTH_ENABLE = no   # Enable Bluetooth with the Adafruit EZ-Key HID
-TAP_DANCE_ENABLE = no
diff --git a/keyboards/teleport/native/config.h b/keyboards/teleport/native/config.h
index 99c82df12e1..31d0025883c 100644
--- a/keyboards/teleport/native/config.h
+++ b/keyboards/teleport/native/config.h
@@ -14,9 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use 3 dynamic keymap layers */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /* i2C Config */
 #define I2C_DRIVER I2CD1
 #define I2C1_SCL_PIN        B6
@@ -27,36 +24,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9
 #define I2C1_CLOCK_SPEED 400000
 
-
-/* RGB Matrix driver config */
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
-#define DRIVER_1_LED_TOTAL 46
-#define DRIVER_2_LED_TOTAL 39
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-#define RGB_MATRIX_LED_FLUSH_LIMIT 32
+#define IS31FL3733_SDB_PIN B9
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED 
-
-#define RGB_MATRIX_DEFAULT_SPD 40
-#define RGB_MATRIX_DEFAULT_VAL 220
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CUSTOM_SINGLE_COLOR_RAINDROPS
 
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// 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                   // 2 Alphas and mods have different colors
-#define ENABLE_RGB_MATRIX_BREATHING                     // 3 Breath a static color
-#define ENABLE_RGB_MATRIX_CYCLE_ALL                     // 4 Cycle all colors
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN                 // 5 Cycle vertically
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL                  // 6 Cycle in a spirals
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP                // 7 Heatmap of typing speed
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE                // 8 Static background, pressed keys light up
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE      // 9 Pressed keys and nearby keys light up
 #define ENABLE_RGB_MATRIX_CUSTOM_SINGLE_COLOR_RAINDROPS // 0 Single color raindrops, random keys lighting up at randomized intensity
 #define ENABLE_RGB_MATRIX_CUSTOM_STATIC_GAME_MODE       // - Game mode sets the entire matrix (static) once, then stops LED refreshes
 
@@ -95,6 +68,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGB_MATRIX_TYPING_HEATMAP_SLIM
 #endif
 
-
 /* Set HSE clock since it differs from F411 default */
 #define STM32_HSECLK 16000000
diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json
index 87b97e5b2d1..3cd857a55dc 100644
--- a/keyboards/teleport/native/info.json
+++ b/keyboards/teleport/native/info.json
@@ -11,7 +11,26 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "is31fl3733"
+        "animations": {
+            "alphas_mods": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_up_down": true,
+            "cycle_spiral": true,
+            "typing_heatmap": true,
+            "solid_reactive": true,
+            "solid_reactive_multiwide": true
+        },
+        "default": {
+            "speed": 40,
+            "val": 220
+        },
+        "driver": "is31fl3733",
+        "led_flush_limit": 32,
+        "sleep": true
+    },
+    "build": {
+        "lto": true
     },
     "features": {
         "bootmagic": true,
@@ -19,8 +38,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "lto": true
+        "nkro": true
     },
     "diode_direction": "ROW2COL",
     "matrix_pins": {
diff --git a/keyboards/teleport/native/native.c b/keyboards/teleport/native/native.c
index ab6d588de70..b53979e27cc 100644
--- a/keyboards/teleport/native/native.c
+++ b/keyboards/teleport/native/native.c
@@ -16,111 +16,103 @@
 
 #include "quantum.h"
 
-/* This board has !SDB of the is31 wired to D2. Set high to enable */
-void keyboard_post_init_kb(void) {
-    setPinOutput(B9);
-    writePinHigh(B9);
-    
-    keyboard_post_init_user();
-}
-
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
  *   |  |     G location
  *   |  |     |     B location
  *   |  |     |     | */
-    {0, L_1,  K_1,  J_1},               // Row 1
-    {0, L_2,  K_2,  J_2},
-    {0, L_3,  K_3,  J_3},
-    {0, L_4,  K_4,  J_4},
-    {0, L_5,  K_5,  J_5},
-    {0, L_6,  K_6,  J_6},
-    {0, L_7,  K_7,  J_7},
-    {0, L_8,  K_8,  J_8},
-    {0, L_9,  K_9,  J_9},
-    {0, L_10, K_10, J_10},
-    {0, L_11, K_11, J_11},
-    {0, L_12, K_12, J_12},
-    {0, L_13, K_13, J_13},
-    {0, L_14, K_14, J_14},
-    {0, L_15, K_15, J_15},
-    {0, L_16, K_16, J_16},
+    {0, SW12_CS1,  SW11_CS1,  SW10_CS1},               // Row 1
+    {0, SW12_CS2,  SW11_CS2,  SW10_CS2},
+    {0, SW12_CS3,  SW11_CS3,  SW10_CS3},
+    {0, SW12_CS4,  SW11_CS4,  SW10_CS4},
+    {0, SW12_CS5,  SW11_CS5,  SW10_CS5},
+    {0, SW12_CS6,  SW11_CS6,  SW10_CS6},
+    {0, SW12_CS7,  SW11_CS7,  SW10_CS7},
+    {0, SW12_CS8,  SW11_CS8,  SW10_CS8},
+    {0, SW12_CS9,  SW11_CS9,  SW10_CS9},
+    {0, SW12_CS10, SW11_CS10, SW10_CS10},
+    {0, SW12_CS11, SW11_CS11, SW10_CS11},
+    {0, SW12_CS12, SW11_CS12, SW10_CS12},
+    {0, SW12_CS13, SW11_CS13, SW10_CS13},
+    {0, SW12_CS14, SW11_CS14, SW10_CS14},
+    {0, SW12_CS15, SW11_CS15, SW10_CS15},
+    {0, SW12_CS16, SW11_CS16, SW10_CS16},
 
-    {0, I_1,  H_1,  G_1},               // Row 2
-    {0, I_2,  H_2,  G_2},
-    {0, I_3,  H_3,  G_3},
-    {0, I_4,  H_4,  G_4},
-    {0, I_5,  H_5,  G_5},
-    {0, I_6,  H_6,  G_6},
-    {0, I_7,  H_7,  G_7},
-    {0, I_8,  H_8,  G_8},
-    {0, I_9,  H_9,  G_9},
-    {0, I_10, H_10, G_10},
-    {0, I_11, H_11, G_11},
-    {0, I_12, H_12, G_12},
-    {0, I_13, H_13, G_13},
-    {0, I_15, H_15, G_15},
-    {0, I_16, H_16, G_16},
+    {0, SW9_CS1,  SW8_CS1,  SW7_CS1},               // Row 2
+    {0, SW9_CS2,  SW8_CS2,  SW7_CS2},
+    {0, SW9_CS3,  SW8_CS3,  SW7_CS3},
+    {0, SW9_CS4,  SW8_CS4,  SW7_CS4},
+    {0, SW9_CS5,  SW8_CS5,  SW7_CS5},
+    {0, SW9_CS6,  SW8_CS6,  SW7_CS6},
+    {0, SW9_CS7,  SW8_CS7,  SW7_CS7},
+    {0, SW9_CS8,  SW8_CS8,  SW7_CS8},
+    {0, SW9_CS9,  SW8_CS9,  SW7_CS9},
+    {0, SW9_CS10, SW8_CS10, SW7_CS10},
+    {0, SW9_CS11, SW8_CS11, SW7_CS11},
+    {0, SW9_CS12, SW8_CS12, SW7_CS12},
+    {0, SW9_CS13, SW8_CS13, SW7_CS13},
+    {0, SW9_CS15, SW8_CS15, SW7_CS15},
+    {0, SW9_CS16, SW8_CS16, SW7_CS16},
 
-    {0, F_1,  E_1,  D_1},               // Row 3
-    {0, F_3,  E_3,  D_3},
-    {0, F_4,  E_4,  D_4},
-    {0, F_5,  E_5,  D_5},
-    {0, F_6,  E_6,  D_6},
-    {0, F_7,  E_7,  D_7},
-    {0, F_8,  E_8,  D_8},
-    {0, F_9,  E_9,  D_9},
-    {0, F_10, E_10, D_10},
-    {0, F_11, E_11, D_11},
-    {0, F_12, E_12, D_12},
-    {0, F_13, E_13, D_13},
-    {0, F_14, E_14, D_14},
-    {0, F_15, E_15, D_15},
-    {0, F_16, E_16, D_16},
+    {0, SW6_CS1,  SW5_CS1,  SW4_CS1},               // Row 3
+    {0, SW6_CS3,  SW5_CS3,  SW4_CS3},
+    {0, SW6_CS4,  SW5_CS4,  SW4_CS4},
+    {0, SW6_CS5,  SW5_CS5,  SW4_CS5},
+    {0, SW6_CS6,  SW5_CS6,  SW4_CS6},
+    {0, SW6_CS7,  SW5_CS7,  SW4_CS7},
+    {0, SW6_CS8,  SW5_CS8,  SW4_CS8},
+    {0, SW6_CS9,  SW5_CS9,  SW4_CS9},
+    {0, SW6_CS10, SW5_CS10, SW4_CS10},
+    {0, SW6_CS11, SW5_CS11, SW4_CS11},
+    {0, SW6_CS12, SW5_CS12, SW4_CS12},
+    {0, SW6_CS13, SW5_CS13, SW4_CS13},
+    {0, SW6_CS14, SW5_CS14, SW4_CS14},
+    {0, SW6_CS15, SW5_CS15, SW4_CS15},
+    {0, SW6_CS16, SW5_CS16, SW4_CS16},
 
-    {1, L_1,  K_1,  J_1},               // Row 4
-    {1, L_3,  K_3,  J_3},
-    {1, L_4,  K_4,  J_4},
-    {1, L_5,  K_5,  J_5},
-    {1, L_6,  K_6,  J_6},
-    {1, L_7,  K_7,  J_7},
-    {1, L_8,  K_8,  J_8},
-    {1, L_9,  K_9,  J_9},
-    {1, L_10, K_10, J_10},
-    {1, L_11, K_11, J_11},
-    {1, L_12, K_12, J_12},
-    {1, L_13, K_13, J_13},
-    {1, L_14, K_14, J_14},
-    {1, L_16, K_16, J_16},
+    {1, SW12_CS1,  SW11_CS1,  SW10_CS1},               // Row 4
+    {1, SW12_CS3,  SW11_CS3,  SW10_CS3},
+    {1, SW12_CS4,  SW11_CS4,  SW10_CS4},
+    {1, SW12_CS5,  SW11_CS5,  SW10_CS5},
+    {1, SW12_CS6,  SW11_CS6,  SW10_CS6},
+    {1, SW12_CS7,  SW11_CS7,  SW10_CS7},
+    {1, SW12_CS8,  SW11_CS8,  SW10_CS8},
+    {1, SW12_CS9,  SW11_CS9,  SW10_CS9},
+    {1, SW12_CS10, SW11_CS10, SW10_CS10},
+    {1, SW12_CS11, SW11_CS11, SW10_CS11},
+    {1, SW12_CS12, SW11_CS12, SW10_CS12},
+    {1, SW12_CS13, SW11_CS13, SW10_CS13},
+    {1, SW12_CS14, SW11_CS14, SW10_CS14},
+    {1, SW12_CS16, SW11_CS16, SW10_CS16},
 
-    {1, I_1,  H_1,  G_1},               // Row 5
-    {1, I_2,  H_2,  G_2},
-    {1, I_3,  H_3,  G_3},
-    {1, I_4,  H_4,  G_4},
-    {1, I_5,  H_5,  G_5},
-    {1, I_6,  H_6,  G_6},
-    {1, I_7,  H_7,  G_7},
-    {1, I_8,  H_8,  G_8},
-    {1, I_9,  H_9,  G_9},
-    {1, I_10, H_10, G_10},
-    {1, I_11, H_11, G_11},
-    {1, I_12, H_12, G_12},
-    {1, I_14, H_14, G_14},
-    {1, I_15, H_15, G_15},
-    {1, I_16, H_16, G_16},
+    {1, SW9_CS1,  SW8_CS1,  SW7_CS1},               // Row 5
+    {1, SW9_CS2,  SW8_CS2,  SW7_CS2},
+    {1, SW9_CS3,  SW8_CS3,  SW7_CS3},
+    {1, SW9_CS4,  SW8_CS4,  SW7_CS4},
+    {1, SW9_CS5,  SW8_CS5,  SW7_CS5},
+    {1, SW9_CS6,  SW8_CS6,  SW7_CS6},
+    {1, SW9_CS7,  SW8_CS7,  SW7_CS7},
+    {1, SW9_CS8,  SW8_CS8,  SW7_CS8},
+    {1, SW9_CS9,  SW8_CS9,  SW7_CS9},
+    {1, SW9_CS10, SW8_CS10, SW7_CS10},
+    {1, SW9_CS11, SW8_CS11, SW7_CS11},
+    {1, SW9_CS12, SW8_CS12, SW7_CS12},
+    {1, SW9_CS14, SW8_CS14, SW7_CS14},
+    {1, SW9_CS15, SW8_CS15, SW7_CS15},
+    {1, SW9_CS16, SW8_CS16, SW7_CS16},
 
-    {1, F_1,  E_1,  D_1},               // Row 6
-    {1, F_2,  E_2,  D_2},
-    {1, F_3,  E_3,  D_3},
-    {1, F_7,  E_7,  D_7},
-    {1, F_11, E_11, D_11},
-    {1, F_12, E_12, D_12},
-    {1, F_13, E_13, D_13},
-    {1, F_14, E_14, D_14},
-    {1, F_15, E_15, D_15},
-    {1, F_16, E_16, D_16}
+    {1, SW6_CS1,  SW5_CS1,  SW4_CS1},               // Row 6
+    {1, SW6_CS2,  SW5_CS2,  SW4_CS2},
+    {1, SW6_CS3,  SW5_CS3,  SW4_CS3},
+    {1, SW6_CS7,  SW5_CS7,  SW4_CS7},
+    {1, SW6_CS11, SW5_CS11, SW4_CS11},
+    {1, SW6_CS12, SW5_CS12, SW4_CS12},
+    {1, SW6_CS13, SW5_CS13, SW4_CS13},
+    {1, SW6_CS14, SW5_CS14, SW4_CS14},
+    {1, SW6_CS15, SW5_CS15, SW4_CS15},
+    {1, SW6_CS16, SW5_CS16, SW4_CS16}
 };
 #endif
\ No newline at end of file
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/4brad/config.h b/keyboards/tempo_turtle/bradpad/keymaps/4brad/config.h
deleted file mode 100644
index 4b885f24a16..00000000000
--- a/keyboards/tempo_turtle/bradpad/keymaps/4brad/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 v3ritas <v3ritas@tempoturtle.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
-#undef TAPPING_TERM
-#define TAPPING_TERM 190
-
-#define MUSIC_MASK (keycode != KC_NO)
-#define MIDI_ADVANCED
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/4brad/keymap.c b/keyboards/tempo_turtle/bradpad/keymaps/4brad/keymap.c
deleted file mode 100644
index 4c9da96a2bd..00000000000
--- a/keyboards/tempo_turtle/bradpad/keymaps/4brad/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-Copyright 2021 v3ritas <v3ritas@tempoturtle.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
-
-extern MidiDevice midi_device;
-
-enum layers {
-    _NATURAL,
-    _SHARP,
-    _FLAT,
-};
-
-/*
-MIDI CC codes for generic ON/OFF swiches
-80,81,82,83
-values off = 0-63
-*/
-
-#define OFF 0
-
-/*values on = 64-127*/
-
-#define ON 127
-
-/*implementation inspo taken from here: https://github.com/luantty2/pheromone_keyboard/blob/master/keyboards/pheromone/keymaps/default/keymap.c */
-
-enum custom_keycodes { MIDI_CC80 = SAFE_RANGE, MIDI_CC81, MIDI_CC82, MIDI_CC83 };
-
-static bool toggled_MIDI_CC80 = 0, toggled_MIDI_CC81 = 0, toggled_MIDI_CC82 = 0, toggled_MIDI_CC83 = 0;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case MIDI_CC80:
-            if (!IS_LAYER_ON(_NATURAL)) {
-                toggled_MIDI_CC80 = false;
-                if (record->event.pressed) {
-                    midi_send_cc(&midi_device, midi_config.channel, 80, ON);
-                } else {
-                    midi_send_cc(&midi_device, midi_config.channel, 80, OFF);
-                }
-                return true;
-            } else {
-                if (record->event.pressed) {
-                    if (!toggled_MIDI_CC80) {
-                        midi_send_cc(&midi_device, midi_config.channel, 80, ON);
-                    } else {
-                        midi_send_cc(&midi_device, midi_config.channel, 80, OFF);
-                    }
-                    toggled_MIDI_CC80 = !toggled_MIDI_CC80;
-                }
-                return false;
-            }
-        case MIDI_CC81:
-            if (!IS_LAYER_ON(_NATURAL)) {
-                toggled_MIDI_CC81 = false;
-                if (record->event.pressed) {
-                    midi_send_cc(&midi_device, midi_config.channel, 81, ON);
-                } else {
-                    midi_send_cc(&midi_device, midi_config.channel, 81, OFF);
-                }
-                return true;
-            } else {
-                if (record->event.pressed) {
-                    if (!toggled_MIDI_CC81) {
-                        midi_send_cc(&midi_device, midi_config.channel, 81, ON);
-                    } else {
-                        midi_send_cc(&midi_device, midi_config.channel, 81, OFF);
-                    }
-                    toggled_MIDI_CC81 = !toggled_MIDI_CC81;
-                }
-                return false;
-            }
-        case MIDI_CC82:
-            if (!IS_LAYER_ON(_NATURAL)) {
-                toggled_MIDI_CC82 = false;
-                if (record->event.pressed) {
-                    midi_send_cc(&midi_device, midi_config.channel, 82, ON);
-                } else {
-                    midi_send_cc(&midi_device, midi_config.channel, 82, OFF);
-                }
-                return true;
-            } else {
-                if (record->event.pressed) {
-                    if (!toggled_MIDI_CC82) {
-                        midi_send_cc(&midi_device, midi_config.channel, 82, ON);
-                    } else {
-                        midi_send_cc(&midi_device, midi_config.channel, 82, OFF);
-                    }
-                    toggled_MIDI_CC82 = !toggled_MIDI_CC82;
-                }
-                return false;
-            }
-        case MIDI_CC83:
-            if (!IS_LAYER_ON(_NATURAL)) {
-                toggled_MIDI_CC83 = false;
-                if (record->event.pressed) {
-                    midi_send_cc(&midi_device, midi_config.channel, 83, ON);
-                } else {
-                    midi_send_cc(&midi_device, midi_config.channel, 83, OFF);
-                }
-                return true;
-            } else {
-                if (record->event.pressed) {
-                    if (!toggled_MIDI_CC83) {
-                        midi_send_cc(&midi_device, midi_config.channel, 83, ON);
-                    } else {
-                        midi_send_cc(&midi_device, midi_config.channel, 83, OFF);
-                    }
-                    toggled_MIDI_CC83 = !toggled_MIDI_CC83;
-                }
-                return false;
-            }
-    }
-    return true;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_NATURAL] = LAYOUT(
-        MI_C, MI_BNDD,    MI_BNDU,   MI_G,
-        MI_D, MIDI_CC80,  MIDI_CC81, MI_A,
-        MI_E, MIDI_CC82,  MIDI_CC83, MI_B,
-        MI_F, MI_OCTD,    MI_OCTU,   MI_C,
-              MO(_SHARP), MO(_FLAT)),
-    [_SHARP] = LAYOUT(
-        MI_Cs, KC_TRNS,  KC_TRNS,  MI_Gs,
-        MI_Ds, KC_TRNS,  KC_TRNS,  MI_As,
-        MI_F , KC_TRNS,  KC_TRNS,  MI_C ,
-        MI_Fs, MI_TRSD,  MI_TRSU,  MI_Cs,
-               KC_TRNS,  KC_TRNS),
-    [_FLAT] = LAYOUT(
-        MI_B , KC_TRNS,  KC_TRNS,  MI_Gb,
-        MI_Db, KC_TRNS,  KC_TRNS,  MI_Ab,
-        MI_Eb, KC_TRNS,  KC_TRNS,  MI_Bb,
-        MI_E , MI_TRSD,  MI_TRSU,  MI_B,
-               KC_TRNS,  KC_TRNS),
-};
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/4brad/rules.mk b/keyboards/tempo_turtle/bradpad/keymaps/4brad/rules.mk
deleted file mode 100644
index b7152364aee..00000000000
--- a/keyboards/tempo_turtle/bradpad/keymaps/4brad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MIDI_ENABLE = yes  #enable MIDI
\ No newline at end of file
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/config.h b/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/config.h
deleted file mode 100644
index 4b885f24a16..00000000000
--- a/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 v3ritas <v3ritas@tempoturtle.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
-#undef TAPPING_TERM
-#define TAPPING_TERM 190
-
-#define MUSIC_MASK (keycode != KC_NO)
-#define MIDI_ADVANCED
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/keymap.c b/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/keymap.c
deleted file mode 100644
index ed489780ce4..00000000000
--- a/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2021 v3ritas <v3ritas@tempoturtle.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 layers {
-    _NATURAL,
-    _SHARP,
-    _FLAT
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_NATURAL] = LAYOUT(
-        MI_C, MI_BNDD,  MI_BNDU,  MI_G,
-        MI_D, MI_VELD,  MI_VELU,  MI_A,
-        MI_E, MI_TRSD,  MI_TRSU,  MI_B,
-        MI_F, MI_OCTD,  MI_OCTU,  MI_C,
-             MO(_SHARP), MO(_FLAT)),
-    [_SHARP] = LAYOUT(
-        MI_Cs, KC_TRNS, KC_TRNS, MI_Gs,
-        MI_Ds, KC_TRNS, KC_TRNS, MI_As,
-        MI_F , KC_TRNS, KC_TRNS, MI_C ,
-        MI_Fs, KC_TRNS, KC_TRNS, MI_Cs,
-             KC_TRNS, KC_TRNS),
-    [_FLAT] = LAYOUT(
-        MI_B , KC_TRNS, KC_TRNS, MI_Gb,
-        MI_Db, KC_TRNS, KC_TRNS, MI_Ab,
-        MI_Eb, KC_TRNS, KC_TRNS, MI_Bb,
-        MI_E , KC_TRNS, KC_TRNS, MI_B,
-             KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/rules.mk b/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/rules.mk
deleted file mode 100644
index b7152364aee..00000000000
--- a/keyboards/tempo_turtle/bradpad/keymaps/midi_demo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MIDI_ENABLE = yes  #enable MIDI
\ No newline at end of file
diff --git a/keyboards/terrazzo/config.h b/keyboards/terrazzo/config.h
index d2e76f1de09..8be468fabe2 100644
--- a/keyboards/terrazzo/config.h
+++ b/keyboards/terrazzo/config.h
@@ -15,43 +15,11 @@
  */
 #pragma once
 
-#ifdef LED_MATRIX_ENABLE
-
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#define LED_MATRIX_LED_COUNT 105
-#define LED_MATRIX_ROWS 15
-#define LED_MATRIX_COLS 7
-#define LED_MATRIX_MAXIMUM_BRIGHTNESS 20
-#define LED_DISABLE_WHEN_USB_SUSPENDED
-
-// LED Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
-// #    define ENABLE_LED_MATRIX_ALPHAS_MODS
-// #    define ENABLE_LED_MATRIX_BREATHING
-// #    define ENABLE_LED_MATRIX_BAND
-// #    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-// #    define ENABLE_LED_MATRIX_BAND_SPIRAL
-// #    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-// #    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-// #    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-// #    define ENABLE_LED_MATRIX_DUAL_BEACON
-// #    if defined(LED_MATRIX_KEYREACTIVE_ENABLED)
-// #        define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #        define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-// #        define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #        define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #        define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #        define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-// #        define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// #        define ENABLE_LED_MATRIX_SPLASH
-// #        define ENABLE_LED_MATRIX_MULTISPLASH
-// #    endif
-// #    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-// #    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#endif
 
 /* Terrazzo animations */
+#define LED_MATRIX_ROWS 15
+#define LED_MATRIX_COLS 7
 
 // #define DISABLE_TERRAZZO_EFFECT_STRIPES
 // #define DISABLE_TERRAZZO_EFFECT_DINO
diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/info.json
index 279c0f33242..53a497cfc4e 100644
--- a/keyboards/terrazzo/info.json
+++ b/keyboards/terrazzo/info.json
@@ -21,7 +21,9 @@
         ]
     },
     "led_matrix": {
-        "driver": "is31fl3731"
+        "driver": "is31fl3731",
+        "max_brightness": 20,
+        "sleep": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index 7717b36e659..53b0bd4c519 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -21,7 +21,7 @@
     #include "print.h"
     #include "quantum.h"
 
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  * https://cdn-learn.adafruit.com/downloads/pdf/adafruit-15x7-7x15-charlieplex-led-matrix-charliewing-featherwing.pdf
  */
diff --git a/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c b/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
deleted file mode 100644
index fae625e6a4b..00000000000
--- a/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@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,     QK_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_GRV,  KC_BSLS,
-        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_BSPC,
-        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_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, MO(1),
-                    KC_LGUI,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                            KC_RCTL
-    ),
-    [1] = LAYOUT(
-        QK_BOOT,    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,
-        _______,    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_UP  , _______, _______,
-        _______,    _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,
-                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
-                    _______,          _______,          _______, _______,          _______,          _______,                            _______
-    ),
-};
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h
new file mode 100644
index 00000000000..fbb498c4081
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Jesse Leventhal (@The=Mad-Noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json
index 3ea2515e646..c67262c562d 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/info.json
+++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json
@@ -1,59 +1,71 @@
 {
-  "keyboard_name": "NCC-1701-KB v2",
-  "manufacturer": "The Mad Noodle",
-  "url": "instagram.com/the_mad_noodle",
-  "maintainer": "The-Mad-Noodle",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1701",
-    "device_version": "0.0.2"
-  },
-  "matrix_pins": {
-    "cols": ["B4", "B5", "B6"],
-    "rows": ["D4", "D6", "D7"]
-  },
-  "diode_direction": "ROW2COL",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "D0", "pin_b": "D1"}
-    ]
-  },
-  "rgblight": {
-    "led_count": 4,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B7"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_ortho_3x3": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
+    "manufacturer": "The Mad Noodle",
+    "keyboard_name": "NCC-1701-KB v2",
+    "maintainer": "The-Mad-Noodle",
+    "url": "https://www.madnoodleprototypes.com/",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 4,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "rows": ["D4", "D6", "D7"],
+        "cols": ["B4", "B5", "B6"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x0021",
+        "vid": "0x6A6C"
+    },
+    "community_layouts": ["ortho_3x3"],
+    "layouts": {
+        "LAYOUT_ortho_3x3": {
+            "layout": [
+                {"x":0, "y":0, "matrix": [0,0]}, 
+                {"label":"Encoder", "x":1, "y":0, "matrix": [0,1]}, 
+                {"x":2, "y":0, "matrix": [0,2]}, 
+                {"x":0, "y":1, "matrix": [1,0]}, 
+                {"x":1, "y":1, "matrix": [1,1]}, 
+                {"x":2, "y":1, "matrix": [1,2]},
+                {"x":0, "y":2, "matrix": [2,0]}, 
+                {"x":1, "y":2, "matrix": [2,1]}, 
+                {"x":2, "y":2, "matrix": [2,2]}
+              ]
+        }
+    },
 
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2}
-      ]
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D0", "pin_b": "D1" }
+        ]
+    
     }
-  }
-}
+}
\ No newline at end of file
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c
index 15b6df3b1a4..52932a3baa4 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c
+++ b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c
@@ -1,10 +1,13 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    /* LAYER 0
-     * ,-----------------------.
-     * |   <<  |  MUTE |  >>   |  ENCODER - PRESS (MUTE) / HOLD (LAYER 2) / KNOB (VOLUME CONTROL)
+    /* LAYER 0 
+     * ,-------|ENCODER|-------.
+     * |   <<  |  MUTE |  >>   |
      * |-------+-------+-------|
      * |  STOP |  PLAY | MEDIA |
      * |-------+-------+-------|
@@ -13,72 +16,70 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [0] = LAYOUT_ortho_3x3(
-      KC_MPRV, LT(2, KC_MUTE), KC_MNXT,
+      KC_MPRV, LT(2, KC_MUTE), KC_MNXT, 
       KC_MSTP, KC_MPLY, KC_MSEL,
       KC_CALC, KC_MAIL, LT(1, KC_MYCM)
       ),
 
 
-    /* LAYER 1
-     * ,-----------------------.
-     * | MODE+ |RGB TOG| MODE- |  ENCODER - PRESS (NA) / KNOB (Hue Control)
+    /* LAYER 1 
+     * ,-------|ENCODER|-------.
+     * | MODE+ |RGB TOG| MODE- |
      * |-------+-------+-------|
-     * |  SPD- |  SPD+ |Bright |
+     * |Bright-| PLAIN |Bright+|
      * |-------+-------+-------|
-     * |  SAT+ |  SAT- |       |
+     * | SWIRL |BREATH |       |
      * `-----------------------'
      */
-
+    
     [1] = LAYOUT_ortho_3x3(
-      RGB_MOD, RGB_TOG, RGB_RMOD,
-      RGB_SPI, RGB_SPD, RGB_VAI,
-      RGB_SAI, RGB_SAD, KC_TRNS
+      RGB_MOD, RGB_TOG, RGB_RMOD, 
+      RGB_VAD, RGB_M_P, RGB_VAI, 
+      LT(3,RGB_M_SW), RGB_M_B, KC_TRNS
       ),
 
-
-    /* LAYER 2 (ENCODER)
-     * ,-----------------------.
-     * |       |       |       |  ENCODER - PRESS (NA) / KNOB (Arrow Left/Right)
+      
+    /* LAYER 2 
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
      * |-------+-------+-------|
      * |       |       |       |
      * |-------+-------+-------|
      * |       |       |       |
      * `-----------------------'
      */
-
+    
     [2] = LAYOUT_ortho_3x3(
-      KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS
+      ),
+
+      
+    /* LAYER 3 
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       |       |
+     * `-----------------------'
+     */
+    
+    [3] = LAYOUT_ortho_3x3(
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
       KC_TRNS, KC_TRNS, KC_TRNS
       )
 
 };
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-
-  switch (get_highest_layer(layer_state)) {
-      case 1:
-          if (clockwise) {
-              rgblight_increase_hue();
-          } else {
-              rgblight_decrease_hue();
-          }
-          break;
-      case 2:
-          if (clockwise) {
-              tap_code(KC_RGHT);
-          } else {
-              tap_code(KC_LEFT);
-          }
-          break;
-      default:
-          if (clockwise) {
-              tap_code(KC_VOLU);
-          } else {
-              tap_code(KC_VOLD);
-          }
-          break;
-
-  }
-    return true;
-}
+/*Encoder Mapping*/
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
+    [2] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
+    [3] =  { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+};
+#endif
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/rules.mk b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/rules.mk
new file mode 100644
index 00000000000..a40474b4d5c
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/via/keymap.c b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..22ceb93c7e9
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/via/keymap.c
@@ -0,0 +1,85 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* LAYER 0
+     * ,-------|ENCODER|-------.
+     * |   <<  |  MUTE |  >>   |
+     * |-------+-------+-------|
+     * |  STOP |  PLAY | MEDIA |
+     * |-------+-------+-------|
+     * | CALC  | MY PC | TO(3) |
+     * `-----------------------'
+     */
+
+    [0] = LAYOUT_ortho_3x3(
+      KC_MPRV, KC_MUTE, KC_MNXT, 
+      KC_MSTP, KC_MPLY, KC_MSEL,
+      KC_CALC, KC_MYCM, TO(3)
+      ),
+
+
+    /* LAYER 1
+     * ,-------|ENCODER|-------.
+     * | MODE+ |RGB TOG| MODE- |
+     * |-------+-------+-------|
+     * |Bright-| PLAIN |Bright+|
+     * |-------+-------+-------|
+     * | SWIRL |BREATH | TO(0) |
+     * `-----------------------'
+     */
+    
+    [1] = LAYOUT_ortho_3x3(
+      RGB_MOD, RGB_TOG, RGB_RMOD, 
+      RGB_VAD, RGB_M_P, RGB_VAI, 
+      RGB_M_SW, RGB_M_B, TO(0)
+      ),
+
+      
+    /* LAYER 2
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       | TO(0) |
+     * `-----------------------'
+     */
+    
+    [2] = LAYOUT_ortho_3x3(
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, TO(0)
+      ),
+
+      
+    /* LAYER 3
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
+     * |-------+-------+-------|
+     * | TO(1) |       | TO(2) |
+     * |-------+-------+-------|
+     * |       |       | TO(0) |
+     * `-----------------------'
+     */
+    
+    [3] = LAYOUT_ortho_3x3(
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      TO(1), KC_TRNS, TO(2), 
+      KC_TRNS, KC_TRNS, TO(0)
+      )
+
+};
+
+/*Encoder Mapping*/
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [1] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)},
+    [2] =  { ENCODER_CCW_CW(RGB_SAD, RGB_SAI)},
+    [3] =  { ENCODER_CCW_CW(KC_UP,   KC_DOWN)},
+};
+#endif
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/via/rules.mk b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/via/rules.mk
new file mode 100644
index 00000000000..6ccd6d91943
--- /dev/null
+++ b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/readme.md b/keyboards/themadnoodle/ncc1701kb/v2/readme.md
index 4e70dd34221..02639aeec35 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/readme.md
+++ b/keyboards/themadnoodle/ncc1701kb/v2/readme.md
@@ -1,17 +1,27 @@
-# NCC-1701-KB v2 Keypad with Encoder
+# NCC-1701-KB v.2
 
-![NCC-1701-KB V2 TOP](https://static.wixstatic.com/media/59d0ff_e9812deb74a4408ca77599a19a8f93b6~mv2.jpg)
-![NCC-1701-KB V2 RGB](https://static.wixstatic.com/media/59d0ff_7a8968b70ed849a591664332964cc936~mv2.jpg)
+![NCC1701KBv2](https://i.imgur.com/Zq1SjBTh.jpg)
 
-The NCC-1701-KB v2 by The Mad Noodle Prototypes is a custom Star Trek inspired 3x3 mechanical keypad with an encoder knob and full RGB Underglow.
+*The NCC-1701-KB v.2 is a 8 key macro keypad with a push button encoder knob*
 
-* Keyboard Maintainer: [The Mad Noodle Prototypes](https://github.com/The-Mad-Noodle)
-* Hardware Supported: NCC-1701-KB v2 PCB, ATmega32U4
-* Hardware Availability: [MadNoodlePrototypes.com](https://www.madnoodleprototypes.com/shop)
+* Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle)
+* Hardware Supported: NCC-1701-KB v.2 PCB
+* Hardware Availability: https://www.madnoodleprototypes.com/shop
 
-Make example for this keyboard (after setting up your build environment):
 
-    make themadnoodle/ncc1701kb/v2:default
+Compile example for this keyboard (after setting up your build environment):
 
-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).
+    qmk compile -kb themadnoodle/ncc1701kb/v2 -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb themadnoodle/ncc1701kb/v2 -km 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 & Flashing
+
+
+**Physical reset button**: 
+
+* Press the physical button located on the top left of the back of the PCB (Labeled RST) to enter Bootloader Mode
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
index dd5d8dbfe96..6e7633bfe01 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
+++ b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
@@ -1,14 +1 @@
-# 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes        # Unicode
-ENCODER_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h
new file mode 100644
index 00000000000..d51dabf53d2
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Jesse Leventhal (@The=Mad-Noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
\ No newline at end of file
diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json
index 5f21cbbc758..8ad698df387 100644
--- a/keyboards/themadnoodle/noodlepad/info.json
+++ b/keyboards/themadnoodle/noodlepad/info.json
@@ -1,59 +1,52 @@
 {
-  "keyboard_name": "Noodle Pad v1",
-  "manufacturer": "The Mad Noodle",
-  "url": "instagram.com/the_mad_noodle",
-  "maintainer": "The-Mad-Noodle",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1701",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B4", "B5", "B6"],
-    "rows": ["D4", "D6", "D7"]
-  },
-  "diode_direction": "ROW2COL",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "D0", "pin_b": "D1"}
-    ]
-  },
-  "rgblight": {
-    "led_count": 4,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "ws2812": {
-    "pin": "B7"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_ortho_3x3": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
+    "manufacturer": "The Mad Noodle",
+    "keyboard_name": "NoodlePad",
+    "maintainer": "The-Mad-Noodle",
+    "url": "https://www.madnoodleprototypes.com/",
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 4,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x3": {
+            "layout": [
+                {"x":0, "y":0, "matrix": [0,0]}, 
+                {"label":"Encoder", "x":1, "y":0, "matrix": [0,1]}, 
+                {"x":2, "y":0, "matrix": [0,2]}, 
+                {"x":0, "y":1, "matrix": [1,0]}, 
+                {"x":1, "y":1, "matrix": [1,1]}, 
+                {"x":2, "y":1, "matrix": [1,2]},
+                {"x":0, "y":2, "matrix": [2,0]}, 
+                {"x":1, "y":2, "matrix": [2,1]}, 
+                {"x":2, "y":2, "matrix": [2,2]}
+              ]
+        }
+    },
 
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2}
-      ]
-    }
-  }
-}
+}
\ No newline at end of file
diff --git a/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c b/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c
index 8fc7e2a27ba..73294a41ab7 100644
--- a/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c
+++ b/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c
@@ -1,10 +1,13 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* LAYER 0
-     * ,-----------------------.
-     * |   <<  |  MUTE |  >>   |  ENCODER - PRESS (MUTE) / KNOB (VOLUME CONTROL)
+     * ,-------|ENCODER|-------.
+     * |   <<  |  MUTE |  >>   |
      * |-------+-------+-------|
      * |  STOP |  PLAY | MEDIA |
      * |-------+-------+-------|
@@ -13,72 +16,70 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [0] = LAYOUT_ortho_3x3(
-      KC_MPRV, LT(2, KC_MUTE), KC_MNXT,
+      KC_MPRV, LT(2, KC_MUTE), KC_MNXT, 
       KC_MSTP, KC_MPLY, KC_MSEL,
       KC_CALC, KC_MAIL, LT(1, KC_MYCM)
       ),
 
 
     /* LAYER 1
-     * ,-----------------------.
-     * | MODE+ |RGB TOG| MODE- |  ENCODER - PRESS (NA) / KNOB (Hue Control)
+     * ,-------|ENCODER|-------.
+     * | MODE+ |RGB TOG| MODE- |
      * |-------+-------+-------|
-     * |  SPD- |  SPD+ |Bright |
+     * |Bright-| PLAIN |Bright+|
      * |-------+-------+-------|
-     * |  SAT+ |  SAT- |       |
+     * | SWIRL |BREATH |       |
      * `-----------------------'
      */
-
+    
     [1] = LAYOUT_ortho_3x3(
-      RGB_MOD, RGB_TOG, RGB_RMOD,
-      RGB_SPI, RGB_SPD, RGB_VAI,
-      RGB_SAI, RGB_SAD, KC_TRNS
+      RGB_MOD, RGB_TOG, RGB_RMOD, 
+      RGB_VAD, RGB_M_P, RGB_VAI, 
+      LT(3,RGB_M_SW), RGB_M_B, KC_TRNS
       ),
 
-
-    /* LAYER 2 (ENCODER)
-     * ,-----------------------.
-     * |       |       |       |  ENCODER - PRESS (NA) / KNOB (Arrow Left/Right)
+      
+    /* LAYER 2
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
      * |-------+-------+-------|
      * |       |       |       |
      * |-------+-------+-------|
      * |       |       |       |
      * `-----------------------'
      */
-
+    
     [2] = LAYOUT_ortho_3x3(
-      KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS
+      ),
+
+      
+    /* LAYER 3
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       |       |
+     * `-----------------------'
+     */
+    
+    [3] = LAYOUT_ortho_3x3(
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
       KC_TRNS, KC_TRNS, KC_TRNS
       )
 
 };
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-
-  switch (get_highest_layer(layer_state)) {
-      case 1:
-          if (clockwise) {
-              rgblight_increase_hue();
-          } else {
-              rgblight_decrease_hue();
-          }
-          break;
-      case 2:
-          if (clockwise) {
-              tap_code(KC_RGHT);
-          } else {
-              tap_code(KC_LEFT);
-          }
-          break;
-      default:
-          if (clockwise) {
-              tap_code(KC_VOLU);
-          } else {
-              tap_code(KC_VOLD);
-          }
-          break;
-
-  }
-    return true;
-}
+/*Encoder Mapping*/
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
+    [2] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
+    [3] =  { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+};
+#endif
diff --git a/keyboards/themadnoodle/noodlepad/keymaps/default/rules.mk b/keyboards/themadnoodle/noodlepad/keymaps/default/rules.mk
new file mode 100644
index 00000000000..a40474b4d5c
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/themadnoodle/noodlepad/keymaps/via/keymap.c b/keyboards/themadnoodle/noodlepad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..22ceb93c7e9
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/keymaps/via/keymap.c
@@ -0,0 +1,85 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* LAYER 0
+     * ,-------|ENCODER|-------.
+     * |   <<  |  MUTE |  >>   |
+     * |-------+-------+-------|
+     * |  STOP |  PLAY | MEDIA |
+     * |-------+-------+-------|
+     * | CALC  | MY PC | TO(3) |
+     * `-----------------------'
+     */
+
+    [0] = LAYOUT_ortho_3x3(
+      KC_MPRV, KC_MUTE, KC_MNXT, 
+      KC_MSTP, KC_MPLY, KC_MSEL,
+      KC_CALC, KC_MYCM, TO(3)
+      ),
+
+
+    /* LAYER 1
+     * ,-------|ENCODER|-------.
+     * | MODE+ |RGB TOG| MODE- |
+     * |-------+-------+-------|
+     * |Bright-| PLAIN |Bright+|
+     * |-------+-------+-------|
+     * | SWIRL |BREATH | TO(0) |
+     * `-----------------------'
+     */
+    
+    [1] = LAYOUT_ortho_3x3(
+      RGB_MOD, RGB_TOG, RGB_RMOD, 
+      RGB_VAD, RGB_M_P, RGB_VAI, 
+      RGB_M_SW, RGB_M_B, TO(0)
+      ),
+
+      
+    /* LAYER 2
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       | TO(0) |
+     * `-----------------------'
+     */
+    
+    [2] = LAYOUT_ortho_3x3(
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, TO(0)
+      ),
+
+      
+    /* LAYER 3
+     * ,-------|ENCODER|-------.
+     * |       |       |       |
+     * |-------+-------+-------|
+     * | TO(1) |       | TO(2) |
+     * |-------+-------+-------|
+     * |       |       | TO(0) |
+     * `-----------------------'
+     */
+    
+    [3] = LAYOUT_ortho_3x3(
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      TO(1), KC_TRNS, TO(2), 
+      KC_TRNS, KC_TRNS, TO(0)
+      )
+
+};
+
+/*Encoder Mapping*/
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [1] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)},
+    [2] =  { ENCODER_CCW_CW(RGB_SAD, RGB_SAI)},
+    [3] =  { ENCODER_CCW_CW(KC_UP,   KC_DOWN)},
+};
+#endif
diff --git a/keyboards/themadnoodle/noodlepad/keymaps/via/rules.mk b/keyboards/themadnoodle/noodlepad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..6ccd6d91943
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/themadnoodle/noodlepad/readme.md b/keyboards/themadnoodle/noodlepad/readme.md
deleted file mode 100644
index e4439dac45b..00000000000
--- a/keyboards/themadnoodle/noodlepad/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Noodle Pad v1 Keypad with Encoder
-
-![NoodlePad TOP](https://static.wixstatic.com/media/59d0ff_052f27ee5ae84266821af7277c51c4ed~mv2.jpg)
-![NoodlePad RGB](https://static.wixstatic.com/media/59d0ff_c91f2adc258547a38cc5b480a8d9c510~mv2.jpg)
-
-The Noodle Pad by The Mad Noodle Prototypes is a custom 3x3 mechanical keypad with an encoder knob and full RGB Underglow.
-
-* Keyboard Maintainer: [The Mad Noodle Prototypes](https://github.com/The-Mad-Noodle)
-* Hardware Supported: NoodlePad PCB, ATmega32U4
-* Hardware Availability: [MadNoodlePrototypes.com](https://www.madnoodleprototypes.com/shop)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make themadnoodle/noodlepad: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/themadnoodle/noodlepad/rules.mk b/keyboards/themadnoodle/noodlepad/rules.mk
index dd5d8dbfe96..318832e1219 100644
--- a/keyboards/themadnoodle/noodlepad/rules.mk
+++ b/keyboards/themadnoodle/noodlepad/rules.mk
@@ -1,14 +1,3 @@
-# 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes        # Unicode
-ENCODER_ENABLE = yes
+# Default folder for noodlepad
+DEFAULT_FOLDER = themadnoodle/noodlepad/v1
+
diff --git a/keyboards/themadnoodle/noodlepad/v1/info.json b/keyboards/themadnoodle/noodlepad/v1/info.json
new file mode 100644
index 00000000000..e868400ee11
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/v1/info.json
@@ -0,0 +1,25 @@
+{
+    "manufacturer": "The Mad Noodle",
+    "keyboard_name": "NoodlePad v1",
+    "maintainer": "The-Mad-Noodle",
+    "url": "https://www.madnoodleprototypes.com/",
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "rows": ["D4", "D6", "D7"],
+        "cols": ["B4", "B5", "B6"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x6A6C"
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D0", "pin_b": "D1" }
+        ]
+    
+    }
+}
\ No newline at end of file
diff --git a/keyboards/themadnoodle/noodlepad/v1/readme.md b/keyboards/themadnoodle/noodlepad/v1/readme.md
new file mode 100644
index 00000000000..a0ef4076181
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/v1/readme.md
@@ -0,0 +1,27 @@
+# NoodlePad v.1
+
+![NoodPad v1](https://i.imgur.com/dmThaHq.jpg)
+
+The Noodlepad v.1 is a 8 key macro keypad with a push button encoder knob.
+
+* Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle)
+* Hardware Supported: NoodlePad v.1 PCB
+* Hardware Availability: https://www.madnoodleprototypes.com/shop
+
+
+Compile example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb themadnoodle/noodlepad/v1 -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb themadnoodle/noodlepad/v1 -km 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 & Flashing
+
+
+**Physical reset button**: 
+
+* Press the physical button located on the top left of the back of the PCB (Labeled RST) to enter Bootloader Mode
diff --git a/keyboards/themadnoodle/noodlepad/v1/rules.mk b/keyboards/themadnoodle/noodlepad/v1/rules.mk
new file mode 100644
index 00000000000..bd924561489
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/v1/rules.mk
@@ -0,0 +1 @@
+#this file was left intentionally blank
diff --git a/keyboards/themadnoodle/noodlepad/v2/info.json b/keyboards/themadnoodle/noodlepad/v2/info.json
new file mode 100644
index 00000000000..d66c2813ce3
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/v2/info.json
@@ -0,0 +1,24 @@
+{
+    "manufacturer": "The Mad Noodle",
+    "keyboard_name": "NoodlePad v2",
+    "maintainer": "The-Mad-Noodle",
+    "url": "https://www.madnoodleprototypes.com/",
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B5", "B6"],
+        "rows": ["F1", "D6", "D7"]
+    },
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x0002",
+        "vid": "0x6A6C"
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D0", "pin_b": "D1" }
+        ]
+    
+    }
+}
\ No newline at end of file
diff --git a/keyboards/themadnoodle/noodlepad/v2/readme.md b/keyboards/themadnoodle/noodlepad/v2/readme.md
new file mode 100644
index 00000000000..4b180c2066a
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/v2/readme.md
@@ -0,0 +1,27 @@
+# NoodlePad v.2
+
+![NoodPad v2](https://i.imgur.com/tzP0tdzh.jpg)
+
+The Noodlepad v.2 is a 8 hotswap key macro keypad with a push button encoder knob.
+
+* Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle)
+* Hardware Supported: NoodlePad v.2 PCB
+* Hardware Availability: https://www.madnoodleprototypes.com/shop
+
+
+Compile example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb themadnoodle/noodlepad/v2 -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb themadnoodle/noodlepad/v2 -km 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 & Flashing
+
+
+**Physical reset button**: 
+
+* Press the physical button located on the top left of the back of the PCB (Labeled RST) to enter Bootloader Mode
diff --git a/keyboards/themadnoodle/noodlepad/v2/rules.mk b/keyboards/themadnoodle/noodlepad/v2/rules.mk
new file mode 100644
index 00000000000..bd924561489
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad/v2/rules.mk
@@ -0,0 +1 @@
+#this file was left intentionally blank
diff --git a/keyboards/themadnoodle/noodlepad_micro/config.h b/keyboards/themadnoodle/noodlepad_micro/config.h
new file mode 100644
index 00000000000..1dd3a20816b
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad_micro/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
diff --git a/keyboards/themadnoodle/noodlepad_micro/info.json b/keyboards/themadnoodle/noodlepad_micro/info.json
new file mode 100644
index 00000000000..fe7ab9ea751
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad_micro/info.json
@@ -0,0 +1,72 @@
+{
+    "manufacturer": "The Mad Noodle",
+    "keyboard_name": "NoodlePad Micro",
+    "maintainer": "the-mad-noodle",
+    "url": "https://www.madnoodleprototypes.com/",
+    "bootloader": "rp2040",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 4,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP0"],
+        "rows": ["GP26", "GP27", "GP28"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "3.0.0",
+        "pid": "0x0004",
+        "vid": "0x6A6C"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2}
+            ]
+        }
+    },
+    "ws2812": {
+        "pin": "GP29",
+        "driver": "vendor"
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "GP2", "pin_b": "GP1" }
+            { "pin_a": "GP3", "pin_b": "GP4" }
+        ]
+    
+    }
+
+
+}
diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c
new file mode 100644
index 00000000000..663a668ae84
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* LAYER 0
+     * ,--ENC2--       --ENC1--.
+     * |   <<  |       |  >>   |
+     * |-------+-------+-------|
+     * |  STOP |  PLAY | MEDIA |
+     * |-------+-------+-------|
+     * | CALC  | MAIL  | PC/FN |
+     * `-----------------------'
+     */
+
+    [0] = LAYOUT(
+      KC_MPRV,           KC_MNXT, 
+      KC_MSTP, KC_MPLY, KC_MSEL,
+      LT(2,KC_CALC), KC_MAIL, LT(1, KC_MYCM)
+      ),
+
+
+    /* LAYER 1
+     * ,--ENC2--       --ENC1--.
+     * | MODE+ |       | MODE- |  
+     * |-------+-------+-------|
+     * |Bright-|  Tog  |Bright+|
+     * |-------+-------+-------|
+     * | PLAIN |BREATH |       |
+     * `-----------------------'
+     */
+    
+    [1] = LAYOUT(
+      RGB_MOD,          RGB_RMOD, 
+      RGB_VAD, RGB_TOG, RGB_VAI, 
+      RGB_M_P, RGB_M_B, KC_TRNS
+      ),
+
+      
+    /* LAYER 2 (ENCODER)
+     * ,--ENC2--       --ENC1--.
+     * |       |       |       |  
+     * |-------+-------+-------|
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       |       |
+     * `-----------------------'
+     */
+    
+    [2] = LAYOUT(
+      KC_TRNS,          KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+
+/*Encoder Mapping*/
+//-----------------------(ENC1)---------------------------------(ENC2)-----------------
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT),      ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),      ENCODER_CCW_CW(RGB_SAD, RGB_SAI)  },
+    [2] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),      ENCODER_CCW_CW(RGB_SPD, RGB_SPI)  }
+};
+#endif
diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk
new file mode 100644
index 00000000000..a40474b4d5c
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d6df824a508
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c
@@ -0,0 +1,87 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* LAYER 0
+     * ,--ENC2--       --ENC1--.
+     * |   <<  |       |  >>   |  
+     * |-------+-------+-------|
+     * |  STOP |  PLAY | MEDIA |
+     * |-------+-------+-------|
+     * | CALC  | MY PC | TO(3) |
+     * `-----------------------'
+     */
+
+    [0] = LAYOUT(
+      KC_MPRV,           KC_MNXT, 
+      KC_MSTP, KC_MPLY, KC_MSEL,
+      KC_CALC, KC_MYCM, TO(3)
+      ),
+
+
+    /* LAYER 1
+     * ,--ENC2--       --ENC1--.
+     * | MODE+ |       | MODE- |  
+     * |-------+-------+-------|
+     * |Bright-|  Tog  |Bright+|
+     * |-------+-------+-------|
+     * | PLAIN |BREATH | TO(0) |
+     * `-----------------------'
+     */
+    
+    [1] = LAYOUT(
+      RGB_MOD,          RGB_RMOD, 
+      RGB_VAD, RGB_TOG, RGB_VAI, 
+      RGB_M_P, RGB_M_B, TO(0)
+      ),
+
+      
+    /* LAYER 2 
+     * ,--ENC2--       --ENC1--.
+     * |       |       |       |  
+     * |-------+-------+-------|
+     * |       |       |       |
+     * |-------+-------+-------|
+     * |       |       | TO(0) |
+     * `-----------------------'
+     */
+    
+    [2] = LAYOUT(
+      KC_TRNS,          KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, TO(0)
+      ),
+
+    /* LAYER 3 
+     * ,--ENC2--       --ENC1--.
+     * |       |       |       |  
+     * |-------+-------+-------|
+     * | TO(1) |       | TO(2) |
+     * |-------+-------+-------|
+     * |       |       | TO(0) |
+     * `-----------------------'
+     */
+    
+    [3] = LAYOUT(
+      KC_TRNS,         KC_TRNS, 
+      TO(1), KC_TRNS, TO(2), 
+      KC_TRNS, KC_TRNS, TO(0)
+      )
+    
+};
+
+
+/*Encoder Mapping*/
+//-----------------------(ENC1)---------------------------------(ENC2)-----------------
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT),      ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),      ENCODER_CCW_CW(RGB_SAD, RGB_SAI)  },
+    [2] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),      ENCODER_CCW_CW(RGB_SPD, RGB_SPI)  },
+    [3] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT),      ENCODER_CCW_CW(KC_DOWN, KC_UP)    },
+
+};
+#endif
diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk
new file mode 100644
index 00000000000..6ccd6d91943
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/themadnoodle/noodlepad_micro/readme.md b/keyboards/themadnoodle/noodlepad_micro/readme.md
new file mode 100644
index 00000000000..a77c1ad7ba3
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad_micro/readme.md
@@ -0,0 +1,28 @@
+# NoodlePad [Micro]
+
+![NoodlePad [Micro]](https://i.imgur.com/uRmVt3ah.jpg)
+
+The NoodlePad [Micro] is a 6 key 2 encoder macro keypad designed using RP2040 chipset.
+
+* Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle)
+* Hardware Supported: NoodlePad [Micro]
+* Hardware Availability: https://www.madnoodleprototypes.com/shop
+
+Compile example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb themadnoodle/noodlepad_micro -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb themadnoodle/noodlepad_micro -km 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 & Flashing
+
+
+**Physical reset button**: 
+
+* Double press the button on the back, center, left of the PCB labeled "R" to enter the bootloader drive mode.
+
+* If you have a pre-compiled .uf2 file, copy it into bootloader drive (RPI-RP2), board will reset automatically once file is copied sucessfully
\ No newline at end of file
diff --git a/keyboards/themadnoodle/noodlepad_micro/rules.mk b/keyboards/themadnoodle/noodlepad_micro/rules.mk
new file mode 100644
index 00000000000..6968c523355
--- /dev/null
+++ b/keyboards/themadnoodle/noodlepad_micro/rules.mk
@@ -0,0 +1,2 @@
+# This file intentionally left blank
+
diff --git a/keyboards/themadnoodle/udon13/config.h b/keyboards/themadnoodle/udon13/config.h
new file mode 100644
index 00000000000..fbb498c4081
--- /dev/null
+++ b/keyboards/themadnoodle/udon13/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Jesse Leventhal (@The=Mad-Noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
diff --git a/keyboards/themadnoodle/udon13/info.json b/keyboards/themadnoodle/udon13/info.json
new file mode 100644
index 00000000000..b0ece11612f
--- /dev/null
+++ b/keyboards/themadnoodle/udon13/info.json
@@ -0,0 +1,75 @@
+{
+    "manufacturer": "The Mad Noodle",
+    "keyboard_name": "Udon13",
+    "maintainer": "The-Mad-Noodle",
+    "url": "https://www.madnoodleprototypes.com/",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "encoder": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 6,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F5", "F4", "F6"],
+        "rows": ["F7", "F1", "D6", "D7"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0012",
+        "vid": "0x6A6C"
+    },
+    "layouts": {
+        "LAYOUT": {
+          "layout": [
+            {"label":"Encoder", "x":3, "y":0, "matrix": [0,3]},
+            {"x":0, "y":1, "matrix": [1,0]},
+            {"x":1, "y":1, "matrix": [1,1]},
+            {"x":2, "y":1, "matrix": [1,2]},
+            {"x":3, "y":1, "matrix": [1,3]}, 
+            {"x":0, "y":2, "matrix": [2,0]},
+            {"x":1, "y":2, "matrix": [2,1]},
+            {"x":2, "y":2, "matrix": [2,2]},
+            {"x":3, "y":2, "matrix": [2,3]}, 
+            {"x":0, "y":3, "matrix": [3,0]},
+            {"x":1, "y":3, "matrix": [3,1]},
+            {"x":2, "y":3, "matrix": [3,2]},
+            {"x":3, "y":3, "matrix": [3,3]}
+            ]
+        }
+    },
+
+    "encoder": {
+        "rotary": [
+            { "pin_a": "B6", "pin_b": "B5" }
+        ]
+    
+    }
+}
\ No newline at end of file
diff --git a/keyboards/themadnoodle/udon13/keymaps/default/keymap.c b/keyboards/themadnoodle/udon13/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d9e4ddc51ef
--- /dev/null
+++ b/keyboards/themadnoodle/udon13/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*Layer 0*/
+    [0] = LAYOUT(
+        KC_MUTE,
+        KC_MPLY, KC_MPRV, KC_MNXT, KC_MSEL, 
+        KC_UNDO, KC_CALC, KC_MAIL, KC_MYCM, 
+        KC_COPY, KC_CUT, KC_PSTE, TO(3)
+        ),
+
+/*Layer 1*/
+    [1] = LAYOUT(
+        RGB_TOG, 
+        RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, 
+        RGB_MOD, RGB_RMOD, RGB_M_P, RGB_M_B, 
+        RGB_M_SW, RGB_SPD, RGB_SPI, TO(0)
+        ),
+
+/*Layer 2*/ 
+    [2] = LAYOUT(
+        KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, TO(0)
+        ),
+
+/*Layer 3*/       
+    [3] = LAYOUT(
+        KC_NO, 
+        TO(1), TO(2), KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, TO(0)
+        ),
+
+};
+
+/*Encoder Mapping*/
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  {ENCODER_CCW_CW(KC_VOLD,  KC_VOLU)},
+    [1] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [2] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT)},
+    [3] =  { ENCODER_CCW_CW(KC_DOWN,   KC_UP)},
+   
+};
+#endif
diff --git a/keyboards/themadnoodle/udon13/keymaps/default/rules.mk b/keyboards/themadnoodle/udon13/keymaps/default/rules.mk
new file mode 100644
index 00000000000..217da48272e
--- /dev/null
+++ b/keyboards/themadnoodle/udon13/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/themadnoodle/udon13/keymaps/via/keymap.c b/keyboards/themadnoodle/udon13/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6f6fcc60590
--- /dev/null
+++ b/keyboards/themadnoodle/udon13/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*Layer 0*/
+    [0] = LAYOUT(
+    KC_MUTE, 
+        KC_MPLY, KC_MPRV, KC_MNXT, KC_MSEL, 
+        KC_UNDO, KC_CALC, KC_MAIL, KC_MYCM, 
+        KC_COPY, KC_CUT, KC_PSTE, TO(3)
+        ),
+
+/*Layer 1*/
+    [1] = LAYOUT(
+        RGB_TOG, 
+        RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, 
+        RGB_MOD, RGB_RMOD, RGB_M_P, RGB_M_B, 
+        RGB_M_SW, RGB_SPD, RGB_SPI, TO(0)
+        ),
+
+/*Layer 2*/ 
+    [2] = LAYOUT(
+        KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, TO(0)
+        ),
+
+/*Layer 3*/       
+    [3] = LAYOUT(
+        KC_NO, 
+        TO(1), TO(2), KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, TO(0)
+        ),
+
+};
+
+/*Encoder Mapping*/
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  {ENCODER_CCW_CW(KC_VOLD,  KC_VOLU)},
+    [1] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [2] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT)},
+    [3] =  { ENCODER_CCW_CW(KC_DOWN,   KC_UP)},
+   
+};
+#endif
diff --git a/keyboards/themadnoodle/udon13/keymaps/via/rules.mk b/keyboards/themadnoodle/udon13/keymaps/via/rules.mk
new file mode 100644
index 00000000000..e81bb711d50
--- /dev/null
+++ b/keyboards/themadnoodle/udon13/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+ENCODER_MAP_ENABLE = yes
+LTO_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/themadnoodle/udon13/readme.md b/keyboards/themadnoodle/udon13/readme.md
new file mode 100644
index 00000000000..a55dc2c7cb3
--- /dev/null
+++ b/keyboards/themadnoodle/udon13/readme.md
@@ -0,0 +1,27 @@
+# Udon:13
+
+![Udon13](https://i.imgur.com/DppYeTCh.jpg)
+
+*The Udon:13 is a 12 hotswap key macro keypad with a push button encoder knob and 128x32 OLED display*
+
+* Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle)
+* Hardware Supported: Udon:13 PCB
+* Hardware Availability: https://www.madnoodleprototypes.com/shop
+
+
+Compile example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb themadnoodle/udon13 -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb themadnoodle/udon13 -km 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 & Flashing
+
+
+**Physical reset button**: 
+
+* Press the physical button located on the top left of the back of the PCB (Labeled RST) to enter Bootloader Mode
diff --git a/keyboards/themadnoodle/udon13/rules.mk b/keyboards/themadnoodle/udon13/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/themadnoodle/udon13/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/themadnoodle/udon13/udon13.c b/keyboards/themadnoodle/udon13/udon13.c
new file mode 100644
index 00000000000..bda0ae7e7bc
--- /dev/null
+++ b/keyboards/themadnoodle/udon13/udon13.c
@@ -0,0 +1,76 @@
+// Copyright 2023 The Mad Noodle(@the_mad_noodle)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+
+/* OLED Settings */
+//------------------------------------------------------------------------------------------------
+
+static void render_logo(void) { // Render Mad Noodle logo
+    static const char PROGMEM logo_1[] = {0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x04, 0x06, 0x82, 0xc3, 0x43, 0x61, 0xa1, 0xa1, 0xa1, 0xa1, 0x61, 0x43, 0xc3, 0x82, 0x06, 0x04, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00};
+    static const char PROGMEM logo_2[] = {0xf8, 0x1e, 0xc3, 0xf8, 0x5c, 0x76, 0x7b, 0x6d, 0x75, 0x55, 0x55, 0x75, 0x6d, 0x7b, 0x76, 0x5e, 0x7e, 0x77, 0x5b, 0x6d, 0x75, 0x55, 0x55, 0x75, 0x4d, 0x7b, 0x66, 0x5c, 0xf0, 0xc3, 0x3e, 0xf0};
+    static const char PROGMEM logo_3[] = {0x1f, 0x78, 0xc1, 0x0f, 0x38, 0xe0, 0xc0, 0x00, 0x00, 0x02, 0x0e, 0x0e, 0x8e, 0xc6, 0xc0, 0x40, 0x40, 0xc0, 0xc6, 0x8e, 0x0e, 0x0e, 0x02, 0x00, 0x80, 0xc0, 0x60, 0x38, 0x0f, 0xc0, 0x7c, 0x0f};
+    static const char PROGMEM logo_4[] = {0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 0x31, 0x23, 0x66, 0x44, 0x44, 0xc4, 0xc4, 0x84, 0x84, 0x84, 0x84, 0xc4, 0xc4, 0x44, 0x46, 0x66, 0x23, 0x11, 0x18, 0x0c, 0x06, 0x03, 0x00, 0x00, 0x00};
+    oled_set_cursor(0, 0);
+    oled_write_raw_P(logo_1, sizeof(logo_1));
+    oled_set_cursor(0, 1);
+    oled_write_raw_P(logo_2, sizeof(logo_2));
+    oled_set_cursor(0, 2);
+    oled_write_raw_P(logo_3, sizeof(logo_3));
+    oled_set_cursor(0, 3);
+    oled_write_raw_P(logo_4, sizeof(logo_4));
+}
+//-----------
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    render_logo();
+    oled_set_cursor(7, 0);
+    oled_write_P(PSTR("The Mad Noodle"), false);
+
+    oled_set_cursor(7, 1);
+    oled_write_P(PSTR("Layer: "), false);
+
+    /*
+    To change LAYER NAMES displayed on the OLED ensure they are a total of 6 characters, including spaces.
+    Example:
+    ---------------------------------------------------
+    case 0:
+          oled_write_P(PSTR("Base  "), false);
+          break;
+    ---------------------------------------------------
+    "B A S E *SPACE* *SPACE*" = 6 characters
+    This would change layer 0 to Base on the OLED
+    */
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("Zero  "), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("One   "), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("Two   "), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("Three "), false);
+            break;
+
+        default:
+            oled_write_P(PSTR("N/A   "), false);
+    }
+    oled_set_cursor(7, 2);
+    oled_write_P(PSTR("Status: "), false);
+    oled_set_cursor(7, 3);
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("   "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("   "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("   "), false);
+
+    return false;
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json
new file mode 100644
index 00000000000..0f1d8e021cc
--- /dev/null
+++ b/keyboards/theone/info.json
@@ -0,0 +1,253 @@
+{
+    "manufacturer": "github.com/sowbug",
+    "keyboard_name": "Theone",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 8
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "key_lock": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"],
+        "rows": ["C14", "C15", "A0", "A1", "A2", "A3"]
+    },
+    "processor": "STM32F072",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "center_point": [112, 30],
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 40, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 85, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 95, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 110, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 120, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 130, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 140, "y": 0, "flags": 4},
+            {"matrix": [1, 14], "x": 152, "y": 0, "flags": 4},
+            {"matrix": [2, 14], "x": 152, "y": 10, "flags": 4},
+            {"matrix": [1, 13], "x": 130, "y": 10, "flags": 4},
+            {"matrix": [1, 12], "x": 120, "y": 10, "flags": 4},
+            {"matrix": [1, 11], "x": 110, "y": 10, "flags": 4},
+            {"matrix": [1, 10], "x": 100, "y": 10, "flags": 4},
+            {"matrix": [1, 9], "x": 90, "y": 10, "flags": 4},
+            {"matrix": [1, 8], "x": 80, "y": 10, "flags": 4},
+            {"matrix": [1, 7], "x": 70, "y": 10, "flags": 4},
+            {"matrix": [1, 6], "x": 60, "y": 10, "flags": 4},
+            {"matrix": [1, 5], "x": 50, "y": 10, "flags": 4},
+            {"matrix": [1, 4], "x": 40, "y": 10, "flags": 4},
+            {"matrix": [1, 3], "x": 30, "y": 10, "flags": 4},
+            {"matrix": [1, 2], "x": 20, "y": 10, "flags": 4},
+            {"matrix": [1, 1], "x": 10, "y": 10, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 10, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 20, "flags": 4},
+            {"matrix": [2, 1], "x": 15, "y": 20, "flags": 4},
+            {"matrix": [2, 2], "x": 25, "y": 20, "flags": 4},
+            {"matrix": [2, 3], "x": 35, "y": 20, "flags": 4},
+            {"matrix": [2, 4], "x": 45, "y": 20, "flags": 4},
+            {"matrix": [2, 5], "x": 55, "y": 20, "flags": 4},
+            {"matrix": [2, 6], "x": 65, "y": 20, "flags": 4},
+            {"matrix": [2, 7], "x": 75, "y": 20, "flags": 4},
+            {"matrix": [2, 8], "x": 85, "y": 20, "flags": 4},
+            {"matrix": [2, 9], "x": 95, "y": 20, "flags": 4},
+            {"matrix": [2, 10], "x": 105, "y": 20, "flags": 4},
+            {"matrix": [2, 11], "x": 115, "y": 20, "flags": 4},
+            {"matrix": [2, 12], "x": 125, "y": 20, "flags": 4},
+            {"matrix": [2, 13], "x": 135, "y": 20, "flags": 4},
+            {"matrix": [1, 16], "x": 152, "y": 20, "flags": 4},
+            {"matrix": [2, 16], "x": 152, "y": 30, "flags": 4},
+            {"matrix": [3, 13], "x": 127.5, "y": 30, "flags": 4},
+            {"matrix": [3, 11], "x": 117.5, "y": 30, "flags": 4},
+            {"matrix": [3, 10], "x": 107.5, "y": 30, "flags": 4},
+            {"matrix": [3, 9], "x": 97.5, "y": 30, "flags": 4},
+            {"matrix": [3, 8], "x": 87.5, "y": 30, "flags": 4},
+            {"matrix": [3, 7], "x": 77.5, "y": 30, "flags": 4},
+            {"matrix": [3, 6], "x": 67.5, "y": 30, "flags": 4},
+            {"matrix": [3, 5], "x": 57.5, "y": 30, "flags": 4},
+            {"matrix": [3, 4], "x": 47.5, "y": 30, "flags": 4},
+            {"matrix": [3, 3], "x": 37.5, "y": 30, "flags": 4},
+            {"matrix": [3, 2], "x": 27.5, "y": 30, "flags": 4},
+            {"matrix": [3, 1], "x": 17.5, "y": 30, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 30, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 40, "flags": 4},
+            {"matrix": [4, 2], "x": 22.5, "y": 40, "flags": 4},
+            {"matrix": [4, 3], "x": 32.5, "y": 40, "flags": 4},
+            {"matrix": [4, 4], "x": 42.5, "y": 40, "flags": 4},
+            {"matrix": [4, 5], "x": 52.5, "y": 40, "flags": 4},
+            {"matrix": [4, 6], "x": 62.5, "y": 40, "flags": 4},
+            {"matrix": [4, 7], "x": 72.5, "y": 40, "flags": 4},
+            {"matrix": [4, 8], "x": 82.5, "y": 40, "flags": 4},
+            {"matrix": [4, 9], "x": 92.5, "y": 40, "flags": 4},
+            {"matrix": [4, 10], "x": 102.5, "y": 40, "flags": 4},
+            {"matrix": [4, 11], "x": 112.5, "y": 40, "flags": 4},
+            {"matrix": [4, 13], "x": 122.5, "y": 40, "flags": 4},
+            {"matrix": [4, 14], "x": 142, "y": 42, "flags": 4},
+            {"matrix": [5, 15], "x": 152, "y": 52, "flags": 4},
+            {"matrix": [5, 14], "x": 142, "y": 52, "flags": 4},
+            {"matrix": [5, 13], "x": 132, "y": 52, "flags": 4},
+            {"matrix": [5, 12], "x": 120, "y": 50, "flags": 4},
+            {"matrix": [5, 10], "x": 110, "y": 50, "flags": 4},
+            {"matrix": [5, 9], "x": 100, "y": 50, "flags": 4},
+            {"matrix": [5, 6], "x": 37.5, "y": 50, "flags": 4},
+            {"matrix": [5, 2], "x": 25, "y": 50, "flags": 4},
+            {"matrix": [5, 1], "x": 12.5, "y": 50, "flags": 4},
+            {"matrix": [5, 0], "x": 0, "y": 50, "flags": 4}
+        ],
+        "max_brightness": 130,
+        "sleep": true
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x3249",
+        "vid": "0x49F5"
+    },
+    "ws2812": {
+        "pin": "B9"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "Ins", "matrix": [1, 14], "x": 15.2, "y": 0},
+                {"label": "~`", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!1", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "@2", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "#3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$4", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%5", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^6", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&7", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*8", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(9", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")0", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_-", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+=", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backsp", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"label": "Del", "matrix": [2, 14], "x": 15.2, "y": 1},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+                {"label": "{[", "matrix": [2, 11], "x": 11.5, "y": 2},
+                {"label": "}]", "matrix": [2, 12], "x": 12.5, "y": 2},
+                {"label": "|\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "PageUp", "matrix": [1, 16], "x": 15.2, "y": 2},
+                {"label": "Caps", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3},
+                {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "PageDn", "matrix": [2, 16], "x": 15.2, "y": 3},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<,", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">.", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?/", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14.2, "y": 4.2},
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Opt", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Cmd", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Cmd", "matrix": [5, 9], "x": 10, "y": 5},
+                {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5},
+                {"label": "Ctrl", "matrix": [5, 12], "x": 12, "y": 5},
+                {"label": "\u2190", "matrix": [5, 13], "x": 13.2, "y": 5.2},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14.2, "y": 5.2},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15.2, "y": 5.2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/theone/keymaps/default/keymap.c b/keyboards/theone/keymaps/default/keymap.c
new file mode 100644
index 00000000000..cd8f8a51311
--- /dev/null
+++ b/keyboards/theone/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 Persama (@Persama)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// layer Mac
+[0] = LAYOUT(
+    KC_ESC,     KC_BRID,    KC_BRIU,    KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MUTE,    KC_VOLD,    KC_VOLU,                KC_DEL,
+    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_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_HOME,
+    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_LALT,    KC_LGUI,                                        KC_SPC,                             KC_RGUI,    MO(1),      KC_RCTL,    KC_LEFT,    KC_DOWN,    KC_RGHT),
+// layer Mac Fn
+[1] = 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_INS,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    DF(0),      DF(2),      _______,    _______,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    KC_END,
+    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
+    _______,    _______,    _______,                                        _______,                            _______,    _______,    _______,    _______,    _______,    _______),
+// layer win
+[2] = 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_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_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_HOME,
+    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(3),      KC_RCTL,    KC_LEFT,    KC_DOWN,    KC_RGHT),
+// layer win Fn
+[3] = LAYOUT(
+    _______,    KC_BRID,    KC_BRIU,    _______,    _______,    _______,    _______,    KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MUTE,    KC_VOLD,    KC_VOLU,                KC_INS, 
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    DF(0),      DF(2),      _______,    _______,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    KC_END,
+    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
+    _______,    _______,    _______,                                        _______,                            _______,    _______,    _______,    _______,    _______,    _______),
+};
diff --git a/keyboards/theone/keymaps/via/keymap.c b/keyboards/theone/keymaps/via/keymap.c
new file mode 100644
index 00000000000..cd8f8a51311
--- /dev/null
+++ b/keyboards/theone/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 Persama (@Persama)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// layer Mac
+[0] = LAYOUT(
+    KC_ESC,     KC_BRID,    KC_BRIU,    KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MUTE,    KC_VOLD,    KC_VOLU,                KC_DEL,
+    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_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_HOME,
+    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_LALT,    KC_LGUI,                                        KC_SPC,                             KC_RGUI,    MO(1),      KC_RCTL,    KC_LEFT,    KC_DOWN,    KC_RGHT),
+// layer Mac Fn
+[1] = 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_INS,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    DF(0),      DF(2),      _______,    _______,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    KC_END,
+    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
+    _______,    _______,    _______,                                        _______,                            _______,    _______,    _______,    _______,    _______,    _______),
+// layer win
+[2] = 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_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_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_HOME,
+    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(3),      KC_RCTL,    KC_LEFT,    KC_DOWN,    KC_RGHT),
+// layer win Fn
+[3] = LAYOUT(
+    _______,    KC_BRID,    KC_BRIU,    _______,    _______,    _______,    _______,    KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MUTE,    KC_VOLD,    KC_VOLU,                KC_INS, 
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    DF(0),      DF(2),      _______,    _______,
+    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    KC_END,
+    _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
+    _______,    _______,    _______,                                        _______,                            _______,    _______,    _______,    _______,    _______,    _______),
+};
diff --git a/keyboards/theone/keymaps/via/rules.mk b/keyboards/theone/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/theone/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/theone/readme.md b/keyboards/theone/readme.md
new file mode 100644
index 00000000000..1993bc24505
--- /dev/null
+++ b/keyboards/theone/readme.md
@@ -0,0 +1,23 @@
+# theone
+
+ *theone is a standard 81 key keyboard.*
+
+ * Keyboard Maintainer: [txdyqiang]
+ * Hardware Supported: theone PCB
+ * Hardware Availability: Private
+
+ Make example for this keyboard (after setting up your build environment):
+
+     make theone:default
+
+ Flashing example for this keyboard:
+
+     make theone: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 one way:
+
+ * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
diff --git a/keyboards/theone/rules.mk b/keyboards/theone/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/theone/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/0010/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/0010/config.h
deleted file mode 100644
index 060f5922f2c..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/0010/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2017 Balz Guenat
- *
- * 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/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c
deleted file mode 100644
index 6f0bb654d6a..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2017 Balz Guenat
- *
- * 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 ______ KC_TRNS
-
-/*
-    This switch layout is ANSI with the following modifications:
-        Split right shift
-        225 125 275 spacebar
-        Bottom right singles
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
--------------------------------------------------------------------------------------------
-|Esc|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  Backspace  |
--------------------------------------------------------------------------------------------
-|  Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
--------------------------------------------------------------------------------------------
-|  Cpslock  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |   Enter   |
--------------------------------------------------------------------------------------------
-|    Shift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  Shift  | Up  |
--------------------------------------------------------------------------------------------
-| Ctrl  |  GUI |  Alt | L1(Space)  | LED  |     Space     | Home | End | Left |Rght |Down |
--------------------------------------------------------------------------------------------
-*/
-[0] = LAYOUT_base(
-    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_UP,
-    KC_LCTL, KC_LGUI, KC_LALT, LT(1,KC_SPACE),      BL_TOGG,      KC_SPC,  KC_HOME, KC_END,  KC_LEFT, KC_RGHT, KC_DOWN
-),
-/*
--------------------------------------------------------------------------------------------
-| ~   | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |  DEL      |
--------------------------------------------------------------------------------------------
-|      |      | UP |      |     |     |     |     |    |    |      |      |      | PrtSc  |
--------------------------------------------------------------------------------------------
-|      |Left | Down |Right |  |   |  |  |    | |     |     |             |  SLEEP         |
--------------------------------------------------------------------------------------------
-|             |     |     |     |     |     | | |     |     |     |         |     |       |
--------------------------------------------------------------------------------------------
-|       |       |       |            |  Reset  |            |       |       |       |     |
--------------------------------------------------------------------------------------------
-*/
-[1] = LAYOUT_base(
-    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_UP,   ______, ______, ______, ______, ______, ______,   ______,  ______, ______, ______, KC_PSCR,
-    ______,  KC_LEFT, KC_DOWN, KC_RGHT, ______, ______, ______, ______,       ______,          ______, ______, ______, KC_SLEP,
-    ______,           ______,  ______,  ______,  ______, ______,  ______, ______,   ______,  ______, ______, ______, KC_PGUP,
-    ______,  ______,  ______,           ______,  QK_BOOT, ______,                 ______,         ______,  ______, ______, KC_PGDN
-),
-};
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk
deleted file mode 100644
index d924278d3f9..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2017 Balz Guenat
-#
-# 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/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-# MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-# EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-# CONSOLE_ENABLE = no         # Console for debug(+400)
-# COMMAND_ENABLE = yes        # Commands for debug and configuration
-# NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-# BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-# MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-# AUDIO_ENABLE = no           # Audio output on port C6
-# UNICODE_ENABLE = no         # Unicode
-# BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-# RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-# SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c
deleted file mode 100644
index a8a61c9efb1..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define DEFAULT_LAYER   0
-#define HHKB_NAV_LAYER  1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [DEFAULT_LAYER] = LAYOUT_hhkb_arrow(
-    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_BSLS, 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_BSPC,
-    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, MO(1),
-    KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,    KC_SPC,     KC_SPC,    KC_RALT,  KC_RGUI,   _______, KC_MENU, KC_RCTL
-  ),
-
-  [HHKB_NAV_LAYER] = LAYOUT_hhkb_arrow(
-    QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-    _______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_PSCR,   KC_SCRL,   KC_PAUS,   KC_UP, _______, KC_DEL,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_HOME,   KC_PGUP, KC_LEFT,  KC_RGHT, KC_ENT,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_END,  KC_PGDN,  KC_DOWN,  _______, _______,
-    _______,  _______,  _______, _______,      _______,      _______,  _______, _______,  _______, _______, _______
-  )
-};
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/readme.md
deleted file mode 100644
index 53b1333dcd8..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/cijanzen/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# cijanzen's keymap for the Bananasplit
-## Layout Notes
-
-Split right shift and split backspace. Second layer follows HHKB layer 2 layout.
-
-Base layer:
-```
--------------------------------------------------------------------------------------------
-| Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
--------------------------------------------------------------------------------------------
-|  Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |Backspace|
--------------------------------------------------------------------------------------------
-|   Caps  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
--------------------------------------------------------------------------------------------
-|    Shift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  Shift  | Fn1 |
--------------------------------------------------------------------------------------------
-| Ctrl  |  GUI  |  Alt  |               Space             |  Alt  |  GUI  |  App  | Ctrl  |
--------------------------------------------------------------------------------------------
-```
-
-Fn1 layer:
-
-```
--------------------------------------------------------------------------------------------
-|Reset| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
--------------------------------------------------------------------------------------------
-|        |     |     |     |     |     |     |     |Pscr |Slck |Paus | Up  |     |   Del  |
--------------------------------------------------------------------------------------------
-|         |     |     |     |     |     |     |     |Home |PgUp |Left |Right|    Enter    |
--------------------------------------------------------------------------------------------
-|             |     |     |     |     |     |     |     |End  |PgDn |Down |         |     |
--------------------------------------------------------------------------------------------
-|       |       |       |                                 |       |       |       |       |
--------------------------------------------------------------------------------------------
-```
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/config.h
deleted file mode 100644
index 77fac3a966a..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2017 Balz Guenat
- *
- * 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/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-// place overrides here
-#define GRAVE_ESC_CTRL_OVERRIDE
-#define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 8
-
-#endif
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
deleted file mode 100644
index 2d65ae102ba..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2017 Balz Guenat
- *
- * 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 custom_keycodes {
-  WIN_SWITCH_LAYOUT = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
--------------------------------------------------------------------------------------------
-|GvEsc|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |
--------------------------------------------------------------------------------------------
-|  Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
--------------------------------------------------------------------------------------------
-|   Fn1   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
--------------------------------------------------------------------------------------------
-|    Shift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  Shift  |M(0) |
--------------------------------------------------------------------------------------------
-| Ctrl  |  GUI  |  Alt  |   Space    |  Fn1  |   Space    |  Alt  |  GUI  |  App  | Ctrl  |
--------------------------------------------------------------------------------------------
-*/
-[0] = LAYOUT_base(
-    QK_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_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,
-    MO(1),   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, WIN_SWITCH_LAYOUT,
-    KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, MO(1), KC_SPC,       KC_RALT, KC_RGUI, KC_NO,   KC_APP,  KC_RCTL
-),
-/*
--------------------------------------------------------------------------------------------
-|     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |           |
--------------------------------------------------------------------------------------------
-| CpsLck |Prev |Vol+ |Next |PgUp | Ins |Home |WrdL |WrdR | End |     |     |     | PrtSc  |
--------------------------------------------------------------------------------------------
-|  TRNS   |Mute |Vol- |Play |PgDn | Del |Left |Down | Up  |Right|     |     |             |
--------------------------------------------------------------------------------------------
-|             |     |     |     |     |     |DelWL|DelWR|     |     |     |         |     |
--------------------------------------------------------------------------------------------
-|       |       |       |            | TRNS  |            |       |       |       | Reset |
--------------------------------------------------------------------------------------------
-*/
-[1] = LAYOUT_base(
-    _______, 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_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, KC_PGUP, KC_INS, KC_HOME, LCTL(KC_LEFT), LCTL(KC_RGHT), KC_END,  _______, _______, _______, KC_PSCR,
-    _______, KC_MUTE, KC_VOLD, KC_MPLY, KC_PGDN, KC_DEL, KC_LEFT, KC_DOWN,       KC_UP,         KC_RGHT, _______, _______, _______,
-    _______,          BL_STEP, BL_BRTG, _______, _______,_______, LCTL(KC_BSPC), LCTL(KC_DEL),  _______, _______, _______, _______, _______,
-    _______, _______, _______,          _______, _______,_______,                _______,       _______, _______, _______, QK_BOOT
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-
-    case WIN_SWITCH_LAYOUT: {
-      // Sends Alt+Shift on both key down and key up.
-      // Designed to switch between two keyboard layouts on Windows using a locking switch.
-      // Does nothing if right shift is pressed for easy resync.
-      if (!(get_mods() & MOD_BIT(KC_RSFT)))
-        SEND_STRING(SS_DOWN(X_LALT)SS_TAP(X_LSFT)SS_UP(X_LALT));
-      return false;
-    }
-
-    default:
-      return true;
-  }
-}
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/readme.md
deleted file mode 100644
index b9ce5f44a1e..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# /u/Coloneljesus's keymap for the Bananasplit
-
-Default layer:
-
-```
--------------------------------------------------------------------------------------------
-|GvEsc|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |
--------------------------------------------------------------------------------------------
-|  Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
--------------------------------------------------------------------------------------------
-|   Fn1   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
--------------------------------------------------------------------------------------------
-|    Shift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |     Shift     |
--------------------------------------------------------------------------------------------
-| Ctrl  |  GUI  |  Alt  |   Space    |  Fn1  |   Space    |  Alt  |  GUI  |  App  | Ctrl  |
--------------------------------------------------------------------------------------------
-```
-
-Fn1 layer:
-
-```
--------------------------------------------------------------------------------------------
-|     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |           |
--------------------------------------------------------------------------------------------
-| CpsLck |Prev |Vol+ |Next |PgUp | Ins |Home |WrdL |WrdR | End |     |     |     | PrtSc  |
--------------------------------------------------------------------------------------------
-|  TRNS   |Mute |Vol- |Play |PgDn | Del |Left |Down | Up  |Right|     |     |             |
--------------------------------------------------------------------------------------------
-|             |     |     |     |     |     |DelWL|DelWR|     |     |     |               |
--------------------------------------------------------------------------------------------
-|       |       |       |            | TRNS  |            |       |       |       | Reset |
--------------------------------------------------------------------------------------------
-```
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk
deleted file mode 100644
index d924278d3f9..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2017 Balz Guenat
-#
-# 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/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-# MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-# EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-# CONSOLE_ENABLE = no         # Console for debug(+400)
-# COMMAND_ENABLE = yes        # Commands for debug and configuration
-# NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-# BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-# MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-# AUDIO_ENABLE = no           # Audio output on port C6
-# UNICODE_ENABLE = no         # Unicode
-# BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-# RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-# SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
deleted file mode 100644
index df9983015f1..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-  Author: jockyxu1122
-
-  Hightlight: split backspace, split space, arrows on bottom right,
-    and backlighting support (capslock's backlighting cannot be controlled separately).
-
-  Note that "Previous track" and "next track" might only work with Windows.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define DEFAULT_LAYER 0
-#define LAYER_1 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-  -------------------------------------------------------------
-  |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ` |Del|
-  -------------------------------------------------------------
-  | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |
-  -------------------------------------------------------------
-  | Caps | A | S | D | F | G | H | J | K | L | ; | ' |  Enter |
-  -------------------------------------------------------------
-  | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift| Up|
-  -------------------------------------------------------------
-  |Ctrl| GUI| Alt|  Space   |MoL1| Backspc| Hm|End| <-|Dwn| ->|
-  -------------------------------------------------------------
-  Hm: Home
-  MoL1: Mo(L1)
-  */
-  [DEFAULT_LAYER] = LAYOUT_hhkb_arrow(
-    // row 1
-    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_DEL,
-    // row 2
-    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,
-    // row 3
-    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,
-    // row 4
-    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,
-    // row 5
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(LAYER_1), KC_BSPC, KC_HOME, KC_END, KC_LEFT, KC_DOWN,
-      KC_RIGHT
-  ),
-
-  /*
-  -------------------------------------------------------------
-  |LED| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |Ins|
-  -------------------------------------------------------------
-  |     |   |   | @ |   |   |   |   |   |   |   |BDn|BUp|     |
-  -------------------------------------------------------------
-  |      |   |   |   |   |   |   |   |   |   |   |   |        |
-  -------------------------------------------------------------
-  |        |   |   |Cal|   |www|   |Mut|   |   |   |      |VUp|
-  -------------------------------------------------------------
-  |    |    |    |  Pause   |    |        |PUp|PDn|PTk|VDn|NTk|
-  -------------------------------------------------------------
-  @: Email
-  BDn: LED brightness down
-  BUp: LED brightness up
-  Cal: Calculator
-  Ins: Insert
-  Mut: Mute
-  NTk: Next track
-  PDn: Page down
-  PTk: Previous track
-  PUp: Page up
-  VDn: Volume down
-  VUp: Volume up
-  www: Browser home page
-  */
-  [LAYER_1] = LAYOUT_hhkb_arrow(
-    // row 1
-    BL_TOGG, 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_INS,
-    // row 2
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MAIL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, BL_DOWN,BL_UP,  KC_TRNS,
-    // row 3
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,
-    // row 4
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_WHOM, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_VOLU,
-    // row 5
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_MPRV, KC_VOLD,
-      KC_MNXT
-  )
-};
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
deleted file mode 100644
index 664a0a0483c..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
+++ /dev/null
@@ -1,66 +0,0 @@
-Yida's keymap for BananaSplit
-===
-
-Hightlight: split backspace, split space, arrows on bottom right, and
-backlighting support (capslock's backlighting cannot be controlled separately).
-
-Note that "Previous track" and "next track" might only work with Windows.
-
-Default layer:
-
-```
-  -------------------------------------------------------------
-  |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ` |Del|
-  -------------------------------------------------------------
-  | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |
-  -------------------------------------------------------------
-  | Caps | A | S | D | F | G | H | J | K | L | ; | ' |  Enter |
-  -------------------------------------------------------------
-  | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift| Up|
-  -------------------------------------------------------------
-  |Ctrl| GUI| Alt|  Space   |MoL1| Backspc| Hm|End| <-|Dwn| ->|
-  -------------------------------------------------------------
-  Hm: Home
-  MoL1: Mo(L1)
-```
-
-Layer_1:
-
-```
-  -------------------------------------------------------------
-  |LED| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |Ins|
-  -------------------------------------------------------------
-  |     |   |   | @ |   |   |   |   |   |   |   |BDn|BUp|     |
-  -------------------------------------------------------------
-  |      |   |   |   |   |   |   |   |   |   |   |   |        |
-  -------------------------------------------------------------
-  |        |   |   |Cal|   |www|   |Mut|   |   |   |      |VUp|
-  -------------------------------------------------------------
-  |    |    |    |  Pause   |    |        |PUp|PDn|PTk|VDn|NTk|
-  -------------------------------------------------------------
-  @: Email
-  BDn: LED brightness down
-  BUp: LED brightness up
-  Cal: Calculator
-  Ins: Insert
-  Mut: Mute
-  NTk: Next track
-  PDn: Page down
-  PTk: Previous track
-  PUp: Page up
-  VDn: Volume down
-  VUp: Volume up
-  www: Browser home page
-```
-
-Compile and flash:
-
-`cd` to `/qmk_firmware` folder, then
-```
-make bananasplit:jockyxu1122_ansi
-```
-
-A .hex file will be generated under `/qmk_firmware` folder.
-
-
-To flash, use QMK Toolbox.
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
deleted file mode 100644
index 5146c8f4f33..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-  Author: jockyxu1122
-
-  Hightlight: split backspace, ISO Enter, split space, arrows on bottom right,
-    and toggable capslock backlight.
-
-  Note that "Previous track" and "next track" might only work with Windows.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define DEFAULT_LAYER 0
-#define LAYER_1 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-  -------------------------------------------------------------
-  |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ` |Del|
-  -------------------------------------------------------------
-  | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Ent |
-  --------------------------------------------------------    -
-  | Caps | A | S | D | F | G | H | J | K | L | ; | ' | \ |    |
-  -------------------------------------------------------------
-  | Shift  | Z | X | C | V | B | N | M | , | . | Shift| Up| / |
-  -------------------------------------------------------------
-  |Ctrl| GUI| Alt|  Space   |MoL1| Backspc| Hm|End| <-|Dwn| ->|
-  -------------------------------------------------------------
-  Hm: Home
-  MoL1: Mo(L1)
-  */
-  [DEFAULT_LAYER] = LAYOUT_hhkb_arrow(
-    // row 1
-    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_DEL,
-    // row 2
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT,
-    // row 3
-    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_BSLS,
-    // row 4
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH,
-    // row 5
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(LAYER_1), KC_BSPC, KC_HOME, KC_END, KC_LEFT, KC_DOWN,
-      KC_RIGHT
-  ),
-
-  /*
-  -------------------------------------------------------------
-  |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |Ins|
-  -------------------------------------------------------------
-  |     |   |   | @ |   |   |   |   |   |   |   |   |   |     |
-  --------------------------------------------------------    -
-  |      |   |   |   |   |   |   |   |   |   |   |   |   |    |
-  -------------------------------------------------------------
-  |        |   |   |Cal|   |www|   |Mut|   |   |      |VUp|   |
-  -------------------------------------------------------------
-  |    |    |    |  Pause   |    |        |PUp|PDn|PTk|VDn|NTk|
-  -------------------------------------------------------------
-  @: Email
-  Cal: Calculator
-  Ins: Insert
-  Mut: Mute
-  NTk: Next track
-  PDn: Page down
-  PTk: Previous track
-  PUp: Page up
-  VDn: Volume down
-  VUp: Volume up
-  www: Browser home page
-  */
-  [LAYER_1] = LAYOUT_hhkb_arrow(
-    // row 1
-    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_INS,
-    // row 2
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MAIL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    // row 3
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,
-    // row 4
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_WHOM, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_VOLU, KC_TRNS,
-    // row 5
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_MPRV, KC_VOLD,
-      KC_MNXT
-  )
-};
-
-/*
-Capslock's led cannot be controlled separately on bananasplit and you can only turn on/off all
-  leds at once. If you only install led for capslock, it will look like capslock has toggable
-  backlight.
-*/
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    DDRB |= (1 << 7);
-    PORTB |= (1 << 7);
-  } else {
-    DDRB &= ~(1 << 7);
-    PORTB &= ~(1 << 7);
-  }
-  return false;
-}
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
deleted file mode 100644
index e135f73e3a7..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Yida's keymap for BananaSplit
-===
-
-Hightlight: split backspace, ISO Enter, split space, arrows on bottom right, and toggable capslock backlight.
-
-Note that "Previous track" and "next track" might only work with Windows.
-
-Default layer:
-```
-  -------------------------------------------------------------
-  |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ` |Del|
-  -------------------------------------------------------------
-  | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Ent |
-  --------------------------------------------------------    -
-  | Caps | A | S | D | F | G | H | J | K | L | ; | ' | \ |    |
-  -------------------------------------------------------------
-  | Shift  | Z | X | C | V | B | N | M | , | . | Shift| Up| / |
-  -------------------------------------------------------------
-  |Ctrl| GUI| Alt|  Space   |MoL1| Backspc| Hm|End| <-|Dwn| ->|
-  -------------------------------------------------------------
-  Hm: Home
-  MoL1: Mo(L1)
-```
-
-Layer_1:
-```
-  -------------------------------------------------------------
-  |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |Ins|
-  -------------------------------------------------------------
-  |     |   |   | @ |   |   |   |   |   |   |   |   |   |     |
-  --------------------------------------------------------    -
-  |      |   |   |   |   |   |   |   |   |   |   |   |   |    |
-  -------------------------------------------------------------
-  |        |   |   |Cal|   |www|   |Mut|   |   |      |VUp|   |
-  -------------------------------------------------------------
-  |    |    |    |  Pause   |    |        |PUp|PDn|PTk|VDn|NTk|
-  -------------------------------------------------------------
-  @: Email
-  Cal: Calculator
-  Ins: Insert
-  Mut: Mute
-  NTk: Next track
-  PDn: Page down
-  PTk: Previous track
-  PUp: Page up
-  VDn: Volume down
-  VUp: Volume up
-  www: Browser home page
-```
-
-Compile and flash:
-
-`cd` to `/qmk_firmware` folder, then
-```
-make bananasplit:jockyxu1122_iso
-```
-
-A .hex file will be generated under `/qmk_firmware` folder.
-
-
-To flash, use QMK Toolbox.
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c
deleted file mode 100644
index 9fdf1127afe..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define DEFAULT_LAYER 0
-#define THUMB_LAYER   1
-#define NORMAN_LAYER  2
-#define MOD_LAYER     3
-
-#define HYPER_TAB ALL_T(KC_TAB)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [DEFAULT_LAYER] = LAYOUT_hhkb_arrow(
-    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_BSLS, KC_DEL,
-    HYPER_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_BSPC,
-    CTL_T(KC_ESC),   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,  RSFT_T(KC_SLSH),  KC_UP, TG(NORMAN_LAYER),
-    KC_CAPS,  KC_LALT,  KC_LGUI,  KC_SPC,      MO(THUMB_LAYER),      KC_SPC,  KC_LGUI, KC_LALT,  KC_LEFT, KC_DOWN, KC_RIGHT
-  ),
-
-  [THUMB_LAYER] = LAYOUT_hhkb_arrow(
-    MO(MOD_LAYER), 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_UNDS,   KC_PLUS,   KC_LCBR,   KC_RCBR,   _______, _______, _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_MINS,   KC_EQL,   KC_LBRC, KC_RBRC,  _______, _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
-    _______,  _______,  _______, _______,      _______,      _______,  _______, _______,  _______, _______, _______
-  ),
-
-  [NORMAN_LAYER] = LAYOUT_hhkb_arrow(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______,   _______,   KC_D,   KC_F,   KC_K,   KC_J,   KC_U,   KC_R,   KC_L,   KC_SCLN,   _______, _______, _______,
-    _______,   _______,   _______,   KC_E,   KC_T,  _______,   KC_Y,   KC_N,   KC_I,   KC_O,   KC_H,  _______, _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   KC_P,   _______,   _______,  _______,  _______,  _______, _______,
-    _______,  _______,  _______, _______,      _______,      _______,  _______, _______,  _______, _______, _______
-  ),
-
-  [MOD_LAYER] = LAYOUT_hhkb_arrow(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,  _______,   _______,   _______,  QK_BOOT,  _______,   _______,   _______,   _______,   _______,   _______,   _______, _______, _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______, _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
-    _______,  _______,  _______, _______,      _______,      _______,  _______, _______,  _______, _______, _______
-  ),
-};
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/rask/README.md b/keyboards/thevankeyboards/bananasplit/keymaps/rask/README.md
deleted file mode 100644
index ec19d3935bc..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/rask/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# rask's BananaSplit60
-
-![BS60 layout](http://i.imgur.com/Q7so1py.png)
-
-## Notes
-
-### Layers
-
-Base layer is a regular HHKBish ANSI layer. Toggling the
-alternate base layer (Fn3) makes it simpler to play games with
-the left space being set to be an actual Space.
-
-Layer 1 (Fn1) contains usual 60% functionalities such as the
-F-row, while Layer 2 (Fn2) contains media controls.
-
-The final layer (Fn4) is a special layer that acts as a lock
-layer, meaning the keyboard is locked while the layer
-is active. This firmware assumes a lock switch (read below).
-
-### Lock switches
-
-1.25u between the split space halves and the 1u key right
-left of LeftArrow are to be operated with a lock switch.
-If you don't have lock switches you should swap the `MO()`
-calls with `TG()` calls to make the layer toggles work
-with regular non/locking switches.
-
-## How to make and flash
-
-(These instructions are for Linux-based operating systems
-with `dfu-programmer` available.)
-
-`cd` into the `bananasplit` keyboard's directory and run
-
-    make rask
-
-which should result in a file called `bananasplit_rask.hex` appearing
-in your QMK root directory.
-
-Now plug in your BananaSplit60 keyboard via USB. Verify
-with `lsusb` that it appears. At least my PCB did not have
-anything preflashed so you should see `atmega32u4` or similar
-in the `lsusb` output.
-
-Now you can flash the firmware by
-
-    $ sudo dfu-programmer atmega32u4 erase
-    $ cd /qmk_firmware/root/directory
-    $ sudo dfu-programmer atmega32u4 flash bananasplit_rask.hex
-
-_If_ you happen to have some other `atmega32u4` based device
-I suggest you plug it out before flashing your BS60 just to
-prevent accidentally flashing your old device.
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c
deleted file mode 100644
index c8543e33530..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// rask's BananaSplit60 layout
-
-#define L_BASE      0
-#define L_BASE_ALT  1
-#define L_ONE       2
-#define L_TWO       3
-#define L_LOCK      4
-
-#define ______  KC_TRNS
-#define XXXXXX  KC_NO
-
-// L_BASE
-// Initial layer with default keymap
-//
-// L_BASE_ALT
-// Layer with some standardisation e.g. make
-// space key "full" to make gaming less of a
-// chore
-//
-// L_ONE
-// General things like F-row and navigation
-//
-// L_TWO
-// Media controls and more exotic keybinds
-//
-// L_LOCK
-// Lock the keyboard, release to unlock
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [L_BASE] = LAYOUT_hhkb_arrow(
-        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_BSLS,    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_BSPC,
-        MO(L_ONE),  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,     MT(MOD_RSFT, KC_SLSH),  KC_UP,      MO(L_TWO),
-        KC_LCTL,    KC_LGUI,    KC_LALT,    KC_BSPC,        MO(L_BASE_ALT), KC_SPACE,   KC_RALT,    MO(L_LOCK),             KC_LEFT,    KC_DOWN,    KC_RIGHT
-    ),
-
-    [L_BASE_ALT] = LAYOUT_hhkb_arrow(
-        ______,     ______, ______, ______, ______, ______, ______, ______, ______,     ______,     ______,     ______,     ______,     ______,     ______,
-        ______,     ______, ______, ______, ______, ______, ______, ______, ______,     ______,     ______,     ______,     ______,                 ______,
-        ______,     ______, ______, ______, ______, ______, ______, ______, ______,     ______,     ______,     ______,                             ______,
-        ______,             ______, ______, ______, ______, ______, ______, ______,     ______,     ______,     ______,                 ______,     ______,
-        ______,     ______,     ______,     KC_SPACE,       ______,         ______,     ______,     ______,                 ______,     ______,     ______
-    ),
-
-    [L_ONE] = LAYOUT_hhkb_arrow(
-        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_INS,
-        ______,     ______, ______, ______, ______, ______, ______, ______, ______,     ______,     ______,     ______,     ______,                 ______,
-        ______,     ______, ______, ______, ______, ______, ______, ______, ______,     ______,     ______,     ______,                             ______,
-        ______,             ______, ______, ______, ______, ______, ______, ______,     ______,     ______,     ______,                 KC_PGUP,    ______,
-        ______,     ______,     ______,     ______,         ______,         ______,     ______,     ______,                 KC_HOME,    KC_PGDN,    KC_END
-
-    ),
-
-    [L_TWO] = LAYOUT_hhkb_arrow(
-        ______,     ______, ______, ______, ______, ______, ______, ______, ______,     ______,     ______,     ______,     ______,     ______,     ______,
-        ______,     ______, ______, ______, ______, ______, ______, ______, ______,     KC_MPRV,    KC_MPLY,    KC_MNXT,    ______,                 ______,
-        KC_CAPS,    ______, ______, ______, ______, ______, ______, ______, ______,     KC_VOLD,    KC_VOLU,    KC_MUTE,                            ______,
-        ______,             ______, ______, ______, ______, ______, ______, ______,     KC_MSTP,    ______,     ______,                 ______,     ______,
-        ______,     KC_APP,     ______,     ______,         ______,         ______,     ______,     ______,                 ______,     ______,     ______
-    ),
-
-    [L_LOCK] = LAYOUT_hhkb_arrow(
-        XXXXXX,     XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX,     XXXXXX,     XXXXXX,     XXXXXX,     XXXXXX,     XXXXXX,     XXXXXX,
-        XXXXXX,     XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX,     XXXXXX,     XXXXXX,     XXXXXX,     XXXXXX,                 XXXXXX,
-        XXXXXX,     XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX,     XXXXXX,     XXXXXX,     XXXXXX,                             XXXXXX,
-        XXXXXX,             XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX,     XXXXXX,     XXXXXX,     XXXXXX,                 XXXXXX,     XXXXXX,
-        XXXXXX,     XXXXXX,     XXXXXX,     XXXXXX,         XXXXXX,         XXXXXX,     XXXXXX,     ______,                 XXXXXX,     XXXXXX,     XXXXXX
-    ),
-};
diff --git a/keyboards/thevankeyboards/caravan/keymaps/default/config.h b/keyboards/thevankeyboards/caravan/keymaps/default/config.h
deleted file mode 100644
index 6f70f09beec..00000000000
--- a/keyboards/thevankeyboards/caravan/keymaps/default/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/thevankeyboards/minivan/keymaps/belak/config.h b/keyboards/thevankeyboards/minivan/keymaps/belak/config.h
deleted file mode 100644
index 488ffa54181..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/belak/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 500
-#define PERMISSIVE_HOLD
-
-#endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
deleted file mode 100644
index 67d11f5e4c8..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Layer names. We stick to 3 letters if possible so MO(NAME) fits in 7
-// characters and doesn't mess with the grid.
-#define _QW 0
-#define _L1 1
-#define _L2 2
-#define _L3 3
-
-// Curly braces have their own keys. These are defined so they don't mess up the
-// grid in layer 2.
-#define L_CURBR LSFT(KC_LBRC)
-#define R_CURBR LSFT(KC_RBRC)
-
-#define L1_TAB  LT(_L1, KC_TAB)
-#define L2_ESC  LT(_L2, KC_ESC)
-#define L2_SLSH LT(_L2, KC_SLSH)
-#define L3_QUOT LT(_L3, KC_QUOT)
-
-// Tap dance magic
-#define TD_LGUI TD(BE_TD_GUI)
-#define TD_LCTL TD(BE_TD_CTL)
-#define TD_LALT TD(BE_TD_ALT)
-
-#define ACTION_TAP_DANCE_MOD_TAP(mod) \
-    { .fn = {mod_tap_fn, NULL, mod_reset_fn}, .user_data = (void *)&((uint8_t){mod}), }
-
-enum belak_td {
-    BE_TD_GUI = 0,
-    BE_TD_CTL,
-    BE_TD_ALT,
-};
-
-void mod_tap_fn(tap_dance_state_t *state, void *user_data);
-void mod_reset_fn(tap_dance_state_t *state, void *user_data);
-
-tap_dance_action_t tap_dance_actions[] = {
-    [BE_TD_GUI] = ACTION_TAP_DANCE_MOD_TAP(KC_LGUI),
-    [BE_TD_CTL] = ACTION_TAP_DANCE_MOD_TAP(KC_LCTL),
-    [BE_TD_ALT] = ACTION_TAP_DANCE_MOD_TAP(KC_LALT),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QW] = LAYOUT_arrow_command( /* Qwerty */
-        L2_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-        L1_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   L2_SLSH,
-        TD_LCTL, MO(_L3), TD_LALT, TD_LGUI,          KC_SPC,  KC_SPC,           MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_L1] = LAYOUT_arrow_command( /* LAYER 1 */
-        KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-        _______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_DOWN, KC_UP,   KC_LEFT, KC_RGHT, KC_QUOT,
-        _______, KC_ESC,  _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_RSFT,
-        _______, KC_LGUI, _______, _______,          _______, _______,          _______, _______, _______, _______
-    ),
-    [_L2] = LAYOUT_arrow_command( /* LAYER 2 */
-        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-        KC_ESC,  KC_PIPE, KC_DQUO, KC_UNDS, KC_PLUS, L_CURBR, R_CURBR, KC_4,    KC_5,    KC_6,    KC_VOLU, _______,
-        _______, _______, _______, _______, _______, _______, KC_0,    KC_1,    KC_2,    KC_3,    KC_VOLD, _______,
-        _______, _______, _______, _______,          _______, _______,          KC_RALT, _______, _______, _______
-    ),
-    [_L3] = LAYOUT_arrow_command( /* LAYER 3 */
-        _______, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______,
-        KC_ESC,  _______, _______, _______, _______, _______, _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,
-        _______, _______, _______, _______, _______, _______, _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_RSFT,
-        _______, _______, _______, _______,          _______, _______,          KC_RALT, _______, _______, _______
-    )
-};
-
-// Tap dance functions
-void mod_tap_fn(tap_dance_state_t *state, void *user_data) {
-    switch (state->count) {
-        case 1:
-            uint8_t *mod = (uint8_t *)user_data;
-            register_mods(MOD_BIT(*mod));
-            send_keyboard_report();
-            break;
-        case 2:
-            layer_on(_L2);
-            break;
-        case 3:
-            layer_off(_L2);
-            layer_on(_L1);
-            break;
-        default:
-            reset_tap_dance(state);
-    }
-}
-
-void mod_reset_fn(tap_dance_state_t *state, void *user_data) {
-    uint8_t *mod = (uint8_t *)user_data;
-    layer_off(_L1);
-    layer_off(_L2);
-    unregister_mods(MOD_BIT(*mod));
-    send_keyboard_report();
-}
diff --git a/keyboards/thevankeyboards/minivan/keymaps/belak/readme.md b/keyboards/thevankeyboards/minivan/keymaps/belak/readme.md
deleted file mode 100644
index b0a505c4ae1..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/belak/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Belak's TV44 (TV46?) layout
-
-This layout is roughly based on the low-rider arrow-southpaw layout from [the
-configurator](http://minivan.config.thevankeyboards.com) with a number of
-changes to make it easier to use and add in missing keys (like adding / and '
-to the main layer)
-
-## Rev1
-
-* Moved enter to a more standard location to have a full spacebar
-* Quote is now on L1
-* Small tweaks to make modifiers work a little more consistently
-* Greatly increase the tapping term to make the tap-dance mods easier to use
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk
deleted file mode 100644
index 8f713277591..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-#EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-#CONSOLE_ENABLE = yes        # Console for debug(+400)
-#DEBUG_ENABLE = yes
-#COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-TAP_DANCE_ENABLE = yes
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
deleted file mode 100644
index e6c4f248773..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-#ifdef DEBOUNCE
-#undef DEBOUNCE
-#endif
-#define DEBOUNCE 2
-#define MOUSEKEY_INTERVAL           10
-#define MOUSEKEY_DELAY              0
-#define MOUSEKEY_TIME_TO_MAX        120
-#define MOUSEKEY_MAX_SPEED          9
-#define MOUSEKEY_WHEEL_DELAY        0
-#define MOUSEKEY_WHEEL_MAX_SPEED    2
-#define MOUSEKEY_WHEEL_TIME_TO_MAX  120
-#define TAPPING_TOGGLE         1
-#define TAPPING_TERM           200
-#define FORCE_NKRO
-#endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
deleted file mode 100644
index fb86bda7a94..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
+++ /dev/null
@@ -1,225 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _DV 0
-#define _NM 1
-#define _NV 2
-#define _MN 3
-#define _FN 4
-
-// Requires KC_TRNS/_______ for the trigger key in the destination layer
-#define NM_SP   LT(_NM, KC_SPC)
-#define NV_SP   LT(_NV, KC_SPC)
-#define MN_EN   LT(_MN, KC_ENT)
-#define FN_EX   LT(_FN, KC_ESC)
-
-// Curly braces have their own keys. These are defined to make them not mess up
-// the grid in layer 2.
-#define L_CURB  LSFT(KC_LBRC)
-#define R_CURB  LSFT(KC_RBRC)
-
-// Hypers
-#define HYP0  HYPR(KC_0)
-#define HYP1  HYPR(KC_1)
-#define HYP2  HYPR(KC_2)
-#define HYP3  HYPR(KC_3)
-#define HYP4  HYPR(KC_4)
-#define HYP5  HYPR(KC_5)
-#define HYP6  HYPR(KC_6)
-#define HYP7  HYPR(KC_7)
-#define HYP8  HYPR(KC_8)
-#define HYP9  HYPR(KC_9)
-
-// MEH
-#define MEH0  MEH(KC_0)
-#define MEH1  MEH(KC_1)
-#define MEH2  MEH(KC_2)
-#define MEH3  MEH(KC_3)
-#define MEH4  MEH(KC_4)
-#define MEH5  MEH(KC_5)
-#define MEH6  MEH(KC_6)
-#define MEH7  MEH(KC_7)
-#define MEH8  MEH(KC_8)
-#define MEH9  MEH(KC_9)
-
-// CAG
-#define CAG0  LCAG(KC_0)
-#define CAG1  LCAG(KC_1)
-#define CAG2  LCAG(KC_2)
-#define CAG3  LCAG(KC_3)
-#define CAG4  LCAG(KC_4)
-#define CAG5  LCAG(KC_5)
-#define CAG6  LCAG(KC_6)
-#define CAG7  LCAG(KC_7)
-#define CAG8  LCAG(KC_8)
-#define CAG9  LCAG(KC_9)
-
-// ALTS
-#define ALT0   LALT(KC_0)
-#define ALT1   LALT(KC_1)
-#define ALT2   LALT(KC_2)
-#define ALT3   LALT(KC_3)
-#define ALT4   LALT(KC_4)
-#define ALT5   LALT(KC_5)
-#define ALT6   LALT(KC_6)
-#define ALT7   LALT(KC_7)
-#define ALT8   LALT(KC_8)
-#define ALT9   LALT(KC_9)
-#define ALTX   LALT(KC_GRV)
-#define ALTL   LALT(KC_LEFT)
-#define ALTR   LALT(KC_RIGHT)
-#define ALTESC LALT(KC_ESC)
-#define ALTEQL LALT(KC_EQL)
-#define ALTMIN LALT(KC_MINS)
-
-// BACK AND FORWARD
-#define XBACK  LGUI(LALT(KC_LEFT))
-#define XFFWD  LGUI(LALT(KC_RIGHT))
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  SWTCH
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-/* DVORAK
- * ,---------+------+------+------+------+------+------+------+------+------+------+------------.
- * |  TAB    |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |  BACKSPACE |
- * |---------`------`------`------`------`------`------`------`------`------`------`------------|
- * |  LCTL    |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  MN/ENTER |
- * |----------`------`------`------`------`------`------`------`------`------`------`-----------|
- * |  LSHFT    |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z   |   RSHFT |
- * |-----------`------`------`------`------`------`-------`------`------`------`------`---------|
- * |  FN EX   |   GUI    |    ALT   |  NM / SPACE  | NV / SPACE |  RALT |   -   |   =   |  ESC  |
- *  `---------+----------+----------+-----^^^------+----^^^-----+-------+-------+-------+-------'
- */
-  [_DV] = LAYOUT_arrow(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    MN_EN,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    FN_EX,   KC_LGUI, KC_LALT,                   NM_SP,   NV_SP,            KC_RALT, KC_MINS, KC_EQL,  KC_ESC
-   ),
-
-
-
-/* NUMBERS
- * ,---------+------+------+------+------+------+------+------+------+------+------+------------.
- * |   ESC   |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |     DELETE |
- * |---------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   LCTL   |   !  |   @  |   [  |   {  |  (   |  )   |   }  |   ]  |   | |   ?  |     ENTER  |
- * |----------`------`------`------`------`------`------`------`------`------`------`-----------|
- * |   LSFT    |   `  |  ~   |  #   |   $  |   %  |   ^  |   &  |   *  |   _  |   +   |     =   |
- * |   LSFT    |   `  |  ~   |  #   |   $  |   %  |   ^  |   &  |   *  |   _  |   +   |     /   |
- * |-----------`------`------`------`------`------`-------`------`------`------`------`---------|
- * |          |    GUI   |   LALT   |-----TRNS-----|   SPACE    |  RALT |   -   |   =   |   \   |
- * |-----------`------`------`------`------`------`-------`------`------`------`------`---------|
- */
-  [_NM] = LAYOUT_arrow(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-    _______, KC_EXLM, KC_AT,   KC_LBRC, L_CURB,  KC_LPRN, KC_RPRN, R_CURB,  KC_RBRC, KC_PIPE, KC_QUES, _______,
-    _______, KC_GRV,  KC_TILD, KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, KC_SLSH,
-    _______, _______, _______,                   _______, KC_SPC,           _______, KC_MINS, KC_EQL,  KC_BSLS
-  ),
-
-
-
-/* NAVIGATION
- * ,---------+------+------+------+------+------+------+------+------+------+------+------------.
- * |   ESC   |  MWU |  MWL |  MU  |  MWR | MPRV | MNXT | HOME |  UP  |  END | PGUP |    DELETE  |
- * |---------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   LCTL   |  MWD |  ML  |  MD  |  MR  | MRWD | MFFD | LEFT | DOWN | RIGHT| PGDN |      MB2  |
- * |----------`------`------`------`------`------`------`------`------`------`------`-----------|
- * |   LSFT    | HYP1 | HYP2 | HYP3 | HYP4 | HYP5 | HYP6 | HYP7 | HYP8 | HYP9 |  HYP0 |  VOLUP  |
- * |-----------`------`------`------`------`------`-------`------`------`------`------`---------|
- * |          |    GUI   |   LALT   |     MB1      |----TRNS----|  MUTE | PLAY  |  STOP | VOLDN |
- *  `---------+----------+----------+-----^^^------+----^^^-----+-------+-------+-------+-------'
- */
-  [_NV] = LAYOUT_arrow(
-    KC_ESC,  KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, KC_MPRV, KC_MNXT, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_DEL,
-    _______, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_MRWD, KC_MFFD, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BTN2,
-    _______, HYP1,    HYP2,    HYP3,    HYP4,    HYP5,    HYP6,    HYP7,    HYP8,    HYP9,    HYP0,    KC_VOLU,
-    _______, _______, _______,                   KC_BTN1, _______,          KC_MUTE, KC_MPLY, KC_MSTP, KC_VOLD
-  ),
-
-
-
-/* MODIFIED NUMBERS
- * ,---------+------+------+------+------+------+------+------+------+------+------+------------.
- * |  ALTESC | CAG1 | CAG2 | CAG3 | CAG4 | CAG5 | CAG6 | CAG7 | CAG8 | CAG9 | CAG0 |     SWTCH  |
- * |---------`------`------`------`------`------`------`------`------`------`------`------------|
- * |  ALT `   | ALT1 | ALT2 | ALT3 | ALT4 | ALT5 | ALT6 | ALT7 | ALT8 | ALT9 | ALT0 |----TRNS---|
- * |----------`------`------`------`------`------`------`------`------`------`------`-----------|
- * |  ALT =    | MEH1 | MEH2 | MEH3 | MEH4 | MEH5 | MEH6 | MEH7 | MEH8 | MEH9 |  MEH0 |         |
- * |-----------`------`------`------`------`------`-------`------`------`------`------`---------|
- * |  ALT -   |          |   XBACK  |   ALT LEFT   |  ALT RIGHT | XFFWD |       |       |       |
- *  `---------+----------+----------+-----^^^------+----^^^-----+-------+-------+-------+-------'
- */
-  [_MN] = LAYOUT_arrow(
-    ALTESC,  CAG1,    CAG2,    CAG3,    CAG4,    CAG5,    CAG6,    CAG7,    CAG8,    CAG9,    CAG0,    SWTCH,
-    ALTX,    ALT1,    ALT2,    ALT3,    ALT4,    ALT5,    ALT6,    ALT7,    ALT8,    ALT9,    ALT0,    _______,
-    ALTEQL,  MEH1,    MEH2,    MEH3,    MEH4,    MEH5,    MEH6,    MEH7,    MEH8,    MEH9,    MEH0,    XXXXXXX,
-    ALTMIN,  XXXXXXX, XBACK,                     ALTL,    ALTR,             XFFWD,   XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-
-
-/* FUNCTIONS
- * ,---------+------+------+------+------+------+------+------+------+------+------+------------.
- * |   ESC   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  |    DELETE  |
- * |---------`------`------`------`------`------`------`------`------`------`------`------------|
- * |   LCTL   |  F11 |  F12 |  F13 |  F14 |  F15 |  F16 |  F17 |  F18 |  F19 |  F20 |           |
- * |----------`------`------`------`------`------`------`------`------`------`------`-----------|
- * |   LSFT    |      |      |      |      |      |      |      |      |      |       |         |
- * |-----------`------`------`------`------`------`-------`------`------`------`------`---------|
- * |---TRNS---|   CAPS   |   LALT   |              |   SWTCH    |  RALT |       | QK_BOOT |--TRNS-|
- *  `---------+----------+----------+-----^^^------+----^^^-----+-------+-------+-------+-------'
- */
-  [_FN] = LAYOUT_arrow(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-    _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  XXXXXXX,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR,  KC_SLEP, KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX,
-    _______, KC_CAPS, _______,                   XXXXXXX, SWTCH,            KC_RALT, XXXXXXX, QK_BOOT, _______
-  )
-
-
-
-/* Transparent placeholder for more layers
- * ,---------+------+------+------+------+------+------+------+------+------+------+------------.
- * |         |      |      |      |      |      |      |      |      |      |      |            |
- * |---------`------`------`------`------`------`------`------`------`------`------`------------|
- * |          |      |      |      |      |      |      |      |      |      |      |           |
- * |----------`------`------`------`------`------`------`------`------`------`------`-----------|
- * |           |      |      |      |      |      |      |      |      |      |       |         |
- * |-----------`------`------`------`------`------`-------`------`------`------`------`---------|
- * |          |          |          |              |            |       |       |       |       |
- *  `---------+----------+----------+-----^^^------+----^^^-----+-------+-------+-------+-------'
- */
-//  [_TR] = LAYOUT_arrow(
-//    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-//    _______, _______, _______,                   _______, _______,          _______, _______, _______, _______
-//  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch (keycode) {
-      case SWTCH:
-        SEND_STRING(SS_DOWN(X_LGUI));
-        SEND_STRING(SS_DOWN(X_LSFT));
-        SEND_STRING(SS_TAP(X_ENTER));
-        SEND_STRING(SS_UP(X_LSFT));
-        SEND_STRING(SS_UP(X_LGUI));
-        return false;
-    }
-  }
-  return true;
-}
diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/readme.md b/keyboards/thevankeyboards/minivan/keymaps/budi/readme.md
deleted file mode 100644
index e5de86ef811..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/budi/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Budi's TV44 Arrow layout
-
-- Dvorak main layer
-- Somewhat easy bracket access for easy devs, happy :)
-- Dedicated gaming layers cuz u don't wanna mess with apm
-- Mainly for windows, but with translated alt/cmd on os, it's good to go
-
-ASCII graphics shamelessly stolen from tong92's layout :)
-
-Updates August 2018:
-- Escape both ways
-- Only include QMK_KEYBOARD_H
-
-Updates July 2018:
-- I guess I don't play games that much anymore
-- SUGDW modifiers
-- Somehow LALT(LSFT(KC_RET)) does not register correctly on my mac
diff --git a/keyboards/thevankeyboards/minivan/keymaps/core/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/core/keymap.c
deleted file mode 100644
index 95987e1ca85..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/core/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QW 0
-#define _L1 1
-#define _L2 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
-    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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, MO(_L2),
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,                    MO(_L1), KC_RALT, KC_RCTL
-  ),
-  [_L1] = LAYOUT( /* LAYER 1 */
-    KC_GRV,  KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_CALC, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_PAUS,
-    KC_TAB,  KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  _______,
-    _______, _______, _______, _______, _______, _______, KC_END,  _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______, _______,                   _______, _______, _______
-  ),
-  [_L2] = LAYOUT( /* LAYER 2 */
-    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,    KC_UNDS, KC_PLUS,
-    _______, _______, _______, _______, _______, KC_COMM, KC_SLSH, KC_RBRC, KC_LBRC, KC_BSLS, _______, _______,
-    _______, _______, _______,                   _______, _______,                   _______, _______, _______
-  ),
-};
diff --git a/keyboards/thevankeyboards/minivan/keymaps/core/readme.md b/keyboards/thevankeyboards/minivan/keymaps/core/readme.md
deleted file mode 100644
index 3ec503b21f0..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/core/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# A minivan keymap based off the Vertex Core
-
-## Main differences
-
-* There are only 3 keys on the bottom right, so menu was dropped
-* There are only 3 keys on the bottom left, so Pn was dropped because there is
-  no programmable layer.
-* There are only 12 keys in the first row, so the delete key (along with scroll
-  lock) has been dropped.
-* The F1-F12 keys have been shifted by 1 so they all fit in the first row of
-  layer 2.
-* Moved the grave/tilde to layer 1 (because in layer 2 it's now taken up by F1).
-* Keys relating to speed have been removed
-* The `L_Win + L_Alt + R_spacebar = R_Shift, R_Alt, Menu and R_Ctrl as arrow
-  keys` as mentioned in the manual does not work.
-* The layer 2 plus shift should have support for symbols in the first row (where
-  the F1-F12 keys are) but this has not been implemented, so you need to use the
-  second row (where the numbers are).
diff --git a/keyboards/thevankeyboards/minivan/keymaps/danbee/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/danbee/keymap.c
deleted file mode 100644
index 22a39d63987..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/danbee/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-  _QW,
-  _L1,
-  _L2,
-};
-
-#define CTL_TAB LCTL_T(KC_TAB)
-#define L2_QUOT LT(_L2, KC_QUOT)
-#define SFT_GRV LSFT_T(KC_GRV)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: qwerty */
-  /*┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
-    │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Bcksp│
-    ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬─────┤
-    │Ctrl│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ Fn 2│
-    ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
-    │Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shf│
-    ├────┬─┴───┼───┴┬──┴───┴─┬─┴───┴─┬─┴──┬┴───┴┬──┴───┤
-    │Fn  │  Alt│ Cmd│ Return │ Space │Cmd │Hyper│  Ctrl│
-    └────┴─────┴────┴────────┴───────┴────┴─────┴──────┘*/
-  [_QW] = LAYOUT( /* Qwerty */
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    CTL_TAB, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, L2_QUOT,
-    SFT_GRV, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_L1), KC_LALT, KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RGUI, KC_HYPR, KC_RCTL
-  ),
-  /* 1: fn */
-  /*┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
-    │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │   Del│
-    ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬─────┤
-    │    │   │   │   │   │   │ ◀ │ ▼ │ ▲ │ ▶ │   │     │
-    ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
-    │      │   │   │   │   │   │   │   │ [ │ ] │ \ │   │
-    ├────┬─┴───┼───┴┬──┴───┴─┬─┴───┴─┬─┴──┬┴───┴┬──┴───┤
-    │    │     │    │        │       │    │     │      │
-    └────┴─────┴────┴────────┴───────┴────┴─────┴──────┘*/
-  [_L1] = LAYOUT( /* LAYER 1 */
-    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_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, _______,
-    _______, _______, _______,                   _______, _______,                   _______, _______, _______
-  ),
-  /* 2: fn 2 */
-  /*┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
-    │ § │Br-│Br+│   │   │   │   │   │   │ - │ = │ Eject│
-    ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬─────┤
-    │    │   │   │   │   │   │Hom│PgD│PgU│End│Ins│     │
-    ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
-    │      │   │   │   │   │Prv│Nxt│Mut│Vo-│Vo+│   │   │
-    ├────┬─┴───┼───┴┬──┴───┴─┬─┴───┴─┬─┴──┬┴───┴┬──┴───┤
-    │    │     │    │        │ Pause │    │     │      │
-    └────┴─────┴────┴────────┴───────┴────┴─────┴──────┘*/
-  [_L2] = LAYOUT( /* LAYER 2 */
-    KC_NUBS, KC_BRID, KC_BRIU, _______, QK_BOOT, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_EJCT,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  _______,
-    _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-    _______, _______, _______,                   _______, KC_MPLY,                   _______, _______, _______
-  ),
-};
diff --git a/keyboards/thevankeyboards/minivan/keymaps/danbee/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/danbee/rules.mk
deleted file mode 100644
index 0a5b666e855..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/danbee/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c
deleted file mode 100644
index 614fe97710e..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2020 Dan Herrera
- *
- * 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
-
-// Custom Keycodes and Combinations Used
-#define DEL_SHF SFT_T(KC_DEL)
-#define SPC_ALT LALT_T(KC_SPC)
-#define QUAKE LCTL(KC_GRV)
-
-#define WKSP_L LALT(LCTL(KC_LEFT))
-#define WKSP_D LALT(LCTL(KC_DOWN))
-#define WKSP_U LALT(LCTL(KC_UP))
-#define WKSP_R LALT(LCTL(KC_RGHT))
-
-#define AM_CYC A(S(KC_SPC))
-#define AM_SHR A(S(KC_COMM))
-#define AM_GRW A(S(KC_DOT))
-#define AM_REL A(S(KC_Z))
-#define AM_LFT A(S(KC_H))
-#define AM_RGH A(S(KC_L))
-#define AM_CW A(S(KC_K))
-#define AM_CCW A(S(KC_J))
-#define AM_TLL A(S(KC_1))
-#define AM_TLW A(S(KC_2))
-#define AM_BSP A(S(KC_3))
-#define AM_FUL A(S(KC_4))
-
-
-
-enum layers {
-  _BASE,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-    KC_TAB, KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L, KC_SLSH,
-    KC_ESC,    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S, KC_MINS,
-   DEL_SHF, KC_SCLN,    KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z, KC_BSPC,
-   KC_LCTL, KC_LGUI,   LOWER,                   KC_LSFT, SPC_ALT,                     RAISE, KC_RGUI, KC_ENT
-),
-
-[_LOWER] = LAYOUT(
-   XXXXXXX,  AM_CYC,  AM_SHR,  AM_GRW,  AM_REL, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, XXXXXXX,
-   XXXXXXX,  AM_LFT,  AM_CCW,   AM_CW,  AM_RGH, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, XXXXXXX,
-   XXXXXXX,  AM_TLL,  AM_TLW,  AM_BSP,  AM_FUL, XXXXXXX, XXXXXXX,  WKSP_L,  WKSP_D,  WKSP_U,  WKSP_R, XXXXXXX,
-   _______, XXXXXXX, _______,                   _______, XXXXXXX,                   _______, _______, XXXXXXX
-),
-
-[_RAISE] = LAYOUT(
-     QUAKE,  KC_GRV, KC_TILD, KC_BSLS, KC_PIPE, KC_LPRN, KC_RPRN,    KC_7,    KC_8,    KC_9, KC_SLSH,  KC_EQL,
-   XXXXXXX, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_LCBR, KC_RCBR,    KC_4,    KC_5,    KC_6, KC_ASTR, KC_PLUS,
-   XXXXXXX, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC,    KC_1,    KC_2,    KC_3, KC_MINS, KC_BSPC,
-   _______, XXXXXXX, _______,                   KC_LABK, KC_RABK,                   _______,    KC_0, XXXXXXX
-),
-
-[_ADJUST] = LAYOUT(
-     QK_BOOT, KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX,
-   XXXXXXX, KC_WAKE, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX,   KC_F5,   KC_F6,   KC_F7,   KC_F8, XXXXXXX,
-   XXXXXXX,  KC_PWR, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX,
-   _______, _______, _______,                   XXXXXXX, XXXXXXX,                   _______, _______, XXXXXXX
-),
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/thevankeyboards/minivan/keymaps/dcompact/readme.md b/keyboards/thevankeyboards/minivan/keymaps/dcompact/readme.md
deleted file mode 100644
index f3f3d8ca6ea..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/dcompact/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# DCompact Layout
-
-**Dvorak, Layered, Mouse-Enabled, Compact -- now with Game Mode~**
-
-_See [the layout source](keymap.c) for the actual layout_
-
-## Goals
-
-The following are the goals kept in mind when designing the DCompact
-layout:
-
-- Provide minimal travel distance when typing English or coding
-- Consistent muscle memory translation from standard QWERTY
-- Stateless typing experience
-- OS-agnostic features, macros, and key placement
-- Minimize dependence on mouse usage
-
-These are generally all met or balanced within reason. This layout is
-not intended at all to be a familiar layout for much of anyone (except
-maybe those who already type in Dvorak) -- this is meant to amplify the
-best parts of having limited, ortholinear keys with layering.
-
-## As Reference Material
-
-If you're reading this hoping to find reference material to implement
-your own layout, then please feel free to copy over this layout and
-make edits where you see fit. I removed a lot of the features I felt
-extraneous to my usage and simplified style where I felt needed. This
-would hopefully mean that my code should feel like a good base to
-develop from for those new to QMK.
-
-_Remember that settings defined in the layout directory override and
-merge with those in the keyboard folder_
-
-## Relevant Links
-
-- [Online Dvorak Layout Trainer](https://learn.dvorak.nl/)
-- [Dvorak Wikipedia Page](https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard)
-- [QMK Docs](https://docs.qmk.fm/#/)
-- [QMK KeyCode Reference](https://docs.qmk.fm/#/keycodes)
-
-## Contact
-
-Maintainer: [Dan](https://github.com/loksonarius)
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/dcompact/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/dcompact/rules.mk
deleted file mode 100644
index ac4c145396d..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/dcompact/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# https://docs.qmk.fm/#/config_options?id=feature-options
-# Features Specifically Wanted
-EXTRAKEY_ENABLE = yes
-STENO_ENABLE = yes
-NKRO_ENABLE = yes
-
-# Features taking up space
-MOUSEKEY_ENABLE = no
-MIDI_ENABLE = no
-CONSOLE_ENABLE = no
diff --git a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h b/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h
deleted file mode 100644
index 958b0cdaf5b..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 505
-#define PERMISSIVE_HOLD
-#define RETRO_TAPPING
-
-// smooth mousekeys (copied from the ergo ez config)
-#ifdef MOUSEKEY_ENABLE
-  #define MOUSEKEY_INTERVAL 16
-  #define MOUSEKEY_DELAY 0
-  #define MOUSEKEY_TIME_TO_MAX 60
-  #define MOUSEKEY_MAX_SPEED 7
-  #define MOUSEKEY_WHEEL_DELAY 0
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-  #define WS2812_DI_PIN D0
-  #define RGBLED_NUM 3
-  #define RGBLIGHT_EFFECT_BREATHING
-#endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/halvves/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/halvves/keymap.c
deleted file mode 100644
index ece72f3319c..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/halvves/keymap.c
+++ /dev/null
@@ -1,237 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _UTIL,
-  _MOUSE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-};
-
-#define MOUSE  MO(_MOUSE)
-#define ESC_UT LT(_UTIL, KC_ESC)
-#define SPC_LO LT(_LOWER, KC_SPC)
-#define SPC_RA LT(_RAISE, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
-* ,--------------------------------------------------------------------------.
-* | Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  Bksp |
-* |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-* | Lo/Esc|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |   '  |
-* |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-* | Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |Enter|
-* |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-* | Ctrl | Alt  |  GUI  | Space/LOWER | Space/RAISE |Mouse |  [  |  ]  |     |
-* `--------------------------------------------------------------------------'
-*/
-[_QWERTY] = LAYOUT_arrow(
-KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-ESC_UT,  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_LALT, KC_LGUI,                   SPC_LO,  SPC_RA,           MOUSE,   KC_LBRC, KC_RBRC, XXXXXXX
-),
-
-/* Colemak
-* ,--------------------------------------------------------------------------.
-* | Tab  |  Q  |  W  |  F  |  P  |  G  |  J  |  L  |  U  |  Y  |  ;  |  Del  |
-* |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-* | Lo/Esc|  A  |  R  |  S  |  T  |  D  |  H  |  N  |  E  |  I  |  O  |   '  |
-* |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-* | Shift  |  Z  |  X  |  C  |  V  |  B  |  K  |  M  |  ,  |  .  | /   |Enter|
-* |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-* | Ctrl | Alt  |  GUI  | Space/LOWER | Space/RAISE |Mouse |  [  |  ]  |     |
-* `--------------------------------------------------------------------------'
-*/
-[_COLEMAK] = LAYOUT_arrow(
-KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-ESC_UT,  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_ENT,
-KC_LCTL, KC_LALT, KC_LGUI,                   SPC_LO,  SPC_RA,           MOUSE,   KC_LBRC, KC_RBRC, XXXXXXX
-),
-
-/* Dvorak
-* ,--------------------------------------------------------------------------.
-* | Tab  |  /  |  ,  |  .  |  P  |  Y  |  F  |  G  |  C  |  R  |  L  |  Del  |
-* |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-* | Lo/Esc|  A  |  O  |  E  |  U  |  I  |  D  |  H  |  T  |  N  |  S  |   '  |
-* |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-* | Shift  |  ;  |  Q  |  J  |  K  |  X  |  B  |  M  |  W  |  V  | Z   |Enter|
-* |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-* | Ctrl | Alt  |  GUI  | Space/LOWER | Space/RAISE |Mouse |  [  |  ]  |     |
-* `--------------------------------------------------------------------------'
-*/
-[_DVORAK] = LAYOUT_arrow(
-KC_TAB,  KC_SLSH, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-ESC_UT,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_QUOT,
-KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-KC_LCTL, KC_LALT, KC_LGUI,                   SPC_LO,  SPC_RA,           MOUSE,   KC_LBRC, KC_RBRC, XXXXXXX
-),
-
-/* Lower
-* ,--------------------------------------------------------------------------.
-* |   ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |  Del  |
-* |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-* | Del   | F1  | F2  | F3  | F4  | F5  | F6  |  _  |  +  |  {  |  }  |   |  |
-* |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-* |        | F7  | F8  | F9  | F10 | F11 | F12 |ISO ~|ISO ||     |     |     |
-* |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-* |      |      |       |             |             | Next |Vol- |Vol+ |Play |
-* `--------------------------------------------------------------------------'
-*/
-[_LOWER] = LAYOUT_arrow(
-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
-),
-
-/* Raise
-* ,--------------------------------------------------------------------------.
-* |   `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  Del  |
-* |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-* | Del   | F1  | F2  | F3  | F4  | F5  | F6  |  -  |  =  |  [  |  ]  |   \  |
-* |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-* |        | F7  | F8  | F9  | F10 | F11 | F12 |ISO #|ISO /|     |     |     |
-* |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-* |      |      |       |             |             | Next |Vol- |Vol+ |Play |
-* `--------------------------------------------------------------------------'
-*/
-[_RAISE] = LAYOUT_arrow(
-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
-),
-
-/* Util
-* ,--------------------------------------------------------------------------.
-* |      |     |     |     |     |     |     |     |     |     |     |       |
-* |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-* |       |     |     |     |     |     |LEFT | UP  |DOWN |RIGHT|     |      |
-* |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-* |        |     |     |     |     |     |     |     |     |     |     |     |
-* |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-* |      |      |       |             |             |      |     |     |     |
-* `--------------------------------------------------------------------------'
-*/
-[_UTIL] = LAYOUT_arrow(
-_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-_______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-_______, _______, _______,                   _______, _______,          _______, _______, _______, _______
-),
-
-/* Mouse
-* ,--------------------------------------------------------------------------.
-* |      |     | M U |     |     |     |     |     |     |L Clk|R Clk| W Up  |
-* |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-* |       | M L | M D | M R |     |     |     |     |     |     |     |W Dwn |
-* |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-* |        |     |     |     |     |     |     |     |     |     |     |     |
-* |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-* |      |      |       |             |             |      |     |     |     |
-* `--------------------------------------------------------------------------'
-*/
-[_MOUSE] = LAYOUT_arrow(
-XXXXXXX, XXXXXXX, KC_MS_U, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, KC_WH_U,
-XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_D,
-XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust
-* ,--------------------------------------------------------------------------.
-* |      |     |     |     |     |QWRTY|COLMK|DVRAK|     |     |     | QK_BOOT |
-* |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-* |       |     |     |     |     |     |     |     |     |     |     |      |
-* |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-* |        |     |     |     |     |     |     |     |     |     |     |     |
-* |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-* |      |      |       |             |             |      |     |     |     |
-* `--------------------------------------------------------------------------'
-*/
-[_ADJUST] = LAYOUT_arrow(
-XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERTY,  COLEMAK, DVORAK,  XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
-XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-)
-
-
-};
-
-void keyboard_post_init_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-    // set up rgb effects on only the third led (index 2)
-    rgblight_set_effect_range(2, 1);
-
-    // set led effects to breathing mode in warm white
-    rgblight_sethsv_noeeprom(38, 191, 198);
-    rgblight_mode_noeeprom(RGBLIGHT_EFFECT_BREATHING + 2);
-
-    // set other led's to off
-    setrgb(0, 0, 0, (rgb_led_t *)&led[0]);
-    setrgb(0, 0, 0, (rgb_led_t *)&led[1]);
-    rgblight_set();
-  #endif
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-  #ifdef RGBLIGHT_ENABLE
-    if (layer_state_cmp(state, _ADJUST)) {
-      setrgb(70, 255, 200, (rgb_led_t *)&led[0]);
-      setrgb(255, 70, 100, (rgb_led_t *)&led[1]);
-    } else if (layer_state_cmp(state, _LOWER)) {
-      setrgb(70, 255, 200, (rgb_led_t *)&led[0]);
-      setrgb(0, 0, 0, (rgb_led_t *)&led[1]);
-    } else if (layer_state_cmp(state, _RAISE)) {
-      setrgb(0, 0, 0, (rgb_led_t *)&led[0]);
-      setrgb(255, 70, 100, (rgb_led_t *)&led[1]);
-    } else if (layer_state_cmp(state, _UTIL)) {
-      setrgb(200, 70, 225, (rgb_led_t *)&led[0]);
-      setrgb(200, 70, 225, (rgb_led_t *)&led[1]);
-    } else if (layer_state_cmp(state, _MOUSE)) {
-      setrgb(255, 145, 5, (rgb_led_t *)&led[0]);
-      setrgb(255, 145, 5, (rgb_led_t *)&led[1]);
-    } else {
-      setrgb(0, 0, 0, (rgb_led_t *)&led[0]);
-      setrgb(0, 0, 0, (rgb_led_t *)&led[1]);
-    }
-
-    rgblight_set();
-  #endif
-
-  return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/thevankeyboards/minivan/keymaps/halvves/readme.md b/keyboards/thevankeyboards/minivan/keymaps/halvves/readme.md
deleted file mode 100644
index c12b7512a0d..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/halvves/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# a kumo cloud (minivan) layout for halvves
-
-A rough approximation of the halvves let's split layout.
diff --git a/keyboards/thevankeyboards/minivan/keymaps/halvves/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/halvves/rules.mk
deleted file mode 100644
index 574f73771dd..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/halvves/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h
deleted file mode 100644
index 426b76b3b19..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define PERMISSIVE_HOLD
-#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
deleted file mode 100644
index 0999c9490c4..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_arrow_command( /* Qwerty */
-    QK_GESC,       KC_Q,    KC_W,    KC_E,  KC_R, KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-    LT(2, KC_TAB), KC_A,    KC_S,    KC_D,  KC_F, KC_G,    KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, LT(2, KC_ENT),
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,  KC_V, KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_UP,   MT(MOD_RSFT, KC_SLSH),
-    KC_LCTL,       KC_LGUI, KC_LALT, MO(3), LT(1, KC_SPC), LT(1, KC_SPC), MO(4),   KC_LEFT, KC_DOWN, KC_RIGHT
-  ),
-  [1] = LAYOUT_arrow_command( /* LAYER 2 */
-    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_TRNS, KC_MINS, KC_EQL,  KC_SCLN, KC_QUOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_QUOT, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_PGUP, KC_BSLS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME, KC_PGDN, KC_END
-  ),
-  [2] = LAYOUT_arrow_command( /* LAYER 1 */
-    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_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PGUP, KC_PIPE,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME, KC_PGDN, KC_END
-  ),
-  [3] = LAYOUT_arrow_command( /* LAYER 3 */
-    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
-  ),
-  [4] = LAYOUT_arrow_command( /* Gaming Layer*/
-    KC_ESC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
-    KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(5, KC_SLSH),
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_SPACE, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-  [5] = LAYOUT_arrow_command( /* QK_BOOT Layer*/
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  )
-};
-
-void keyboard_post_init_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-    // Set up RGB effects on _only_ the third LED (index 2)
-    rgblight_set_effect_range(2, 1);
-    // Set LED effects to breathing mode in a tealish blue color
-    rgblight_sethsv_noeeprom(185, 255, 255);
-    rgblight_mode_noeeprom(RGBLIGHT_EFFECT_BREATHING + 2);
-
-    // Init the first two LEDs to a static color
-    setrgb(0, 0, 0, (rgb_led_t *)&led[0]);
-    setrgb(0, 0, 0, (rgb_led_t *)&led[1]);
-    rgblight_set();
-  #endif //RGBLIGHT_ENABLE
-}
-
-layer_state_t layer_state_set_user(layer_state_t state){
-  #ifdef RGBLIGHT_ENABLE
-    uint8_t led0r = 0; uint8_t led0g = 0; uint8_t led0b = 0;
-    uint8_t led1r = 0; uint8_t led1g = 0; uint8_t led1b = 0;
-
-    if (layer_state_cmp(state, 1)) {
-      led0r = 255;
-    }
-    if (layer_state_cmp(state, 2)) {
-      led0g = 255;
-    }
-
-    if (layer_state_cmp(state, 4)) {
-      led1b = 255;
-    }
-    if (layer_state_cmp(state, 5)) {
-      led1r = 255;
-    }
-
-    setrgb(led0r, led0g, led0b, (rgb_led_t *)&led[0]);
-    setrgb(led1r, led1g, led1b, (rgb_led_t *)&led[1]);
-    rgblight_set();
-  #endif //RGBLIGHT_ENABLE
-  return state;
-}
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/readme.md b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/readme.md
deleted file mode 100644
index fd95b56ab85..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/readme.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Jetpacktuxedo's minivan layout
-
-This differs quite a bit from the stock layout but leaves keys in a more familiar position in my opinion. It is designed to use the arrow+command layout, but I used a fairly similar layout for the normal arrow layout. Additionally, I use an mx lock switch on the key between the right space key and the arrow cluster. If you don't want to use a lock switch you should change MO(4) on the base layer to use TG(4) instead for a similar effect.
-
-## Base Layer (0)
-
-The base layer is pretty simple, straight qwerty layout where available. Of note: /? is to the right of the arrow keys. Yes this is kinda weird sometimes, but you get used to it. Tab is tab when pressed and fn2 when held, Enter is the same. GESC is esc when used alone, but ~ when shifted. Tapping FN 1 is space
-```
-|GESC| Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  | BSPC |
-| TAB | A  | S  | D  | F  | G  | H  | J  | K  | L  | ;  |ENTER|
-|SHIFT | Z  | X  | C  | V  | B  | N  | M  | ,  | .  | UP | /  |
-|CTRL|WIN |ALT |FN 3|   FN 1   |  SPACE | FN 4 |LEFT|DOWN|RIGH|
-```
-## Numeric Layer (1)
-
-This layer has the numrow as well as swapping the arrow keys for a nav cluster, and swapping ;: for '" and /? for \|. With that almost all of the missing keys are accounted for.
-```
-| `  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  |  DEL |
-|     |    |    |    |    |    |    |    | -  | =  | '  |     |
-|      |    |    |    |    |    |    |    | [  |  ] |PGUP| \  |
-|    |    |    |    |          |        |      |HOME|PGDN|END |
-```
-## Symbolic Layer (2)
-
-I don't want to be using two key combos constantly, so I also added this symbol layer that is basically shift+numeric layer
-```
-| ~  | !  | @  | #  | $  | %  | ^  | &  | *  | (  | )  |  DEL |
-|     |    |    |    |    |    |    |    | _  | +  | "  |     |
-|      |    |    |    |    |    |    |    | {  |  } |PGUP| |  |
-|    |    |    |    |          |        |      |HOME|PGDN|END |
-```
-## Fkeys (3)
-
-I very rarely use Fkeys, but figured I'd throw them on anyway just in case. The setup basically mimics the way Fkeys are usually done on a 60%, with F11 and F12 still on - and =, even though the location of those keys has moved.
-```
-|    | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 |F10 |      |
-|     |    |    |    |    |    |    |    |F11 |F12 |    |     |
-|      |    |    |    |    |    |    |    |    |    |    |    |
-|    |    |    |    |          |        |      |    |    |    |
-```
-## Gaming Layer (4)
-
-Originally this was just going to be a gaming layer (make esc just esc, make tab just tab, move space to the left side), but I ended up in a hotel without a usb mouse, so I added mousekeys to it as well.
-```
-|ESC |    |    |    |    |    |MWUP|MRCK|M_UP|MLCK|    |      |
-| TAB |    |    |    |    |    |MWDN|M_LF|M_DN|M_RG|    |     |
-|      |    |    |    |    |    |    |    |    |    |    |    |
-|    |    |    |    |   SPACE  |        |      |    |    |    |
-```
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk
deleted file mode 100644
index 04cff0238a3..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c
deleted file mode 100644
index 38b4c371389..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2020 by Jos Boersema
- *
- */
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-
-        /*                            Redefine a layer in this file
-         *
-         * _Activate_ one or more of the below BASESFILE_LAYER_..., to redefine the layer
-         * in this file. The version in ./keymap.c will be ignored. Keep in mind to use
-         * transparent keys (_______) for “hold” layer switch keys on the BASE map, for
-         * your new layer.
-         */
-// #define BASESFILE_LAYER_ACC 
-// #define BASESFILE_LAYER_DRA 
-// #define BASESFILE_LAYER_BON 
-// #define BASESFILE_LAYER_PAD 
-// #define BASESFILE_LAYER_MOV 
-// #define BASESFILE_LAYER_RAR 
-// #define BASESFILE_LAYER_FUN 
-
-        /*  ⬇ */
-
-    /* Layer _..._BASE: Qwerty, normal BASE layer and 'default' layer
-     *
-     * - Dual use keys create a delay in the key (tap/hold keys), therefore
-     *   space is not dual use (most ued key), neither is hyphen.
-     */ 
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_COLEMAK__DEF_BASE)
-    [ _DEF_BASE ] = LAYOUT_redefined (
-# elif defined(BASE_COLEMAK__ALT_BASE)
-    [ _ALT_BASE ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._BASE (Letters). This is Colemak, except backspace/tab 
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        qQ    wW    fF    pP    gG    | jJ    lL    uU    yY    ;:         Bksp
-         Tab+LCtl   aA    rR    sS    tT    dD    | hH    nN    eE    iI    oO           '"
-         LSht+_PAD  zZ    xX    cC    vV    bB    | kK    mM    ,<    .>    /?    RSht+_FUN 
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) LGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (RGUI)                                                               (_MOV)
-
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-*/
-//
-//      <pink2            , <pink, <ring, <midd, <indx, <ind|, indx>, inde>, midd>   , ring>  , pink>   , pink2>        ,
-//      -*!-              ,      ,      ,      ,      ,    <|,>     ,      ,         ,        ,         ,               ,
-        KC_ESC            , KC_Q , KC_W , KC_F , KC_P , KC_G , KC_J , KC_L , KC_U    , KC_Y   , KC_SCLN , KC_BSPC       ,
-        LCTL_T ( KC_TAB ) , KC_A , KC_R , KC_S , KC_T , KC_D , KC_H , KC_N , KC_E    , KC_I   , KC_O    , KC_QUOT       ,
-        CHOLTAP_LSHFT     , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_K , KC_M , KC_COMM , KC_DOT , KC_SLSH , CHOLTAP_RSHFT ,
-//      -----------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , MO ( _PAD )
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1_BASE
-# endif
-
-# ifdef SWITCH_HOLD_ACC_NSY 
-                           , DUO_HOLD , CHOLTAP_ACCE 
-# else
-                           , CHOLTAP_ACCE , DUO_HOLD
-# endif
-                                                     , LEFTCENTER_THUMB
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                                     , TRANS_MIDLEFT
-#     endif
-
-                                                                       , RIGHTCENTER_THUMB , DUO_HOLD , KC__YGUI
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                                                 , MO ( _FUN )
-# endif                                                                                    
-                                                                                           
-# ifdef MORE_KEY__ARROW                                                                    
-                                                                                                                 , MORE_key2  
-# endif                                                                                    
-                                                                                           
-                                                                                                                 , CHOLTAP_LAYR
-//                         ,              ,          ,               <|,>                  ,          ,          ,
-//      <1           ±  ±  , <2           , <3       , <4             |, 4>                , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-    /* Layer _..._NSY: Numbers and symbols, to work with the Colemak base layer above (unchanged from Qwerty).
-     *          Off hand Number input (-.Bksp ent (shft)tab).
-     */
-    // KC_TILD does not work there, because of a limitation with shifted keys (nov 2019).
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_COLEMAK__DEF_BASE)
-    [ _DEF_NSY ] = LAYOUT_redefined (
-# elif defined(BASE_COLEMAK__ALT_BASE)
-    [ _ALT_NSY ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._NSY (Numbers and SYmbols). This fits the above Colemak layer _..._BASE
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    -_    \|    =+    | +     |     _     {     }   ~+RSht 
-                          ^^                              ^  // Only differences with normal version _..._NSY
-     ---------------------------------------------------------------------------
-     Left+LAlt ___   ___   Ent  | .   ___   LGUI  Right+RAlt
-                     -*-       <|>    -*-                                         //(hold) Access on _..._BASE
-       <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-            ^                                   ^
-          (RGUI)                              (_MOV)
-*/
-//
-//
-//      <pink2             , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>  , index>  , middl>  , ring>   , pinky>  , pink2>             ,
-//                         , -*-     ,         ,         ,         ,       <|,>        ,         ,         ,         ,         ,                    ,
-        CTO_BASE           , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL             ,
-        LCTL_T ( KC_TAB )  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , RCTL_T ( KC_GRV )  , 
-        LSFT_DASH          , KC_LBRC , KC_RBRC , KC_MINS , KC_BSLS , KC_EQL  , KC_PLUS , KC_PIPE , KC_UNDS , KC_LCBR , KC_RCBR , RSFT_TILDE         ,  
-//      ---------------------------------------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , XXXXXXX
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1  
-# endif
-
-                           , _______ , _______ , KC_ENT 
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                               , TRANS_MIDLEFT  
-# endif
-
-                                                               , KC_DOT , DUO_HOLD , KC__YGUI
-                                                             
-# ifdef TRANSMINIVAN_RIGHTSIDE                               
-                                                                                              , XXXXXXX
-# endif                                                      
-                                                             
-# ifdef MORE_KEY__ARROW                                      
-                                                                                              , MORE_key2  
-# endif                                                      
-                                                             
-                                                                                              , RALT_T ( KC_RGHT )
-//                         ,         , -*-     ,             <|,>       , -*-      ,          ,
-//      <1           ±  ±  , <2      , <3      , <4           |, 4>     , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.md
deleted file mode 100644
index e09532babd0..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_colemak.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Minifan layout
-
-Compiled for: Colemak
-=====================
-
-This file details the compile version `#define BASE_COLEMAK__DEF_BASE, BASE_COLEMAK__ALT_BASE`.
-This is a Colemak layout.
-
-Control follows Unix logic here (left/center), not Colemak Backspace.
-
-Colemak keymaps
----------------
-
-──────────Colemak──────────────
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_base_layer_colemak_ve.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_nsy_layer_qwerty_vc.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-(…)
-
-For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-
-![Minivan illustration Overview layers by key, Colemak](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_colemak_2000_vi.jpg)
-
-Layers (text)
-=============
-
-        ───────────────Colemak────────────────
-     Layer _..._BASE (Letters). This is Colemak, except backspace/tab 
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        qQ    wW    fF    pP    gG    | jJ    lL    uU    yY    ;:         Bksp
-         Tab+LCtl   aA    rR    sS    tT    dD    | hH    nN    eE    iI    oO           '"
-         LSht+_PAD  zZ    xX    cC    vV    bB    | kK    mM    ,<    .>    /?    RSht+_FUN 
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) RGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (LGUI)                                                               (_MOV)
-
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-
-Remarks: The left modifiers have a slight delay in combination with an outside pointer device (mouse, stylus).
-It seems this will be difficult to fix, because it is spread over two devices. To avoid the
-±0.2 second delay, activate a layer where the modifiers are direct (`_PAD`), using the layer toggle on left shift. 
-
-The two keys with ';' (Del;`_ACC`, Right;`_RAR`) do not auto-repeat on double tap, like QMK normal layer-tap keys.
-There is an uncluttered _Delete_ on `_PAD`, an uncluttered _Right_ arrow on the `_MOV` layer.
-
-Holding both `_DEF_NSY` keys left and right of the "split space bar" (enter, space) results in layer `_DRA`.
-
-Holding either one of the just above mentioned `_DEF_NSY` layer keys (<3 and 3>), with the `_ACC` layer key
-(on <2) results in layer `_BON`.
-
-
-- - -
-
-
-     Layer _..._NSY (Numbers and SYmbols). (Same as Qwerty numbers layer.)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    -_    \|    =+    | +     |     _     {     }   ~+RSht 
-                          ^^                              ^  // Only differences with Dvorak version _DEF_NSY
-     ---------------------------------------------------------------------------
-                 Left+LAlt ___   ___   Ent  | .   ___   RGUI  Right+RAlt
-                                 -*-       <|>    -*-                 u      //(hold) Access on _DEF_BASE
-                   <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-                        ^                                   ^
-                      (LGUI)                              (_MOV)
-
-
-
-- - -
-
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.c
deleted file mode 100644
index 22f62cc8313..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2020 by Jos Boersema
- *
- */
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-        /*                            Redefine a layer in this file
-         *
-         * _Activate_ one or more of the below BASESFILE_LAYER_..., to redefine the layer
-         * in this file. The version in ./keymap.c will be ignored. Keep in mind to use
-         * transparent keys (_______) for “hold” layer switch keys on the BASE map, for
-         * your new layer.
-         */
-// #define BASESFILE_LAYER_ACC 
-// #define BASESFILE_LAYER_DRA 
-// #define BASESFILE_LAYER_BON 
-// #define BASESFILE_LAYER_PAD 
-// #define BASESFILE_LAYER_MOV 
-// #define BASESFILE_LAYER_RAR 
-// #define BASESFILE_LAYER_FUN 
-
-        /*  ⬇ */
-
-    /* Layer _..._BASE: default BASE layer (Dvorak)
-     *
-     * - Dual use keys create a delay in the key (tap/hold keys), therefore
-     *   space is not dual use (most used key), neither is hyphen.
-     */ 
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_DVORAK__DEF_BASE)
-    [ _DEF_BASE ] = LAYOUT_redefined (
-# elif defined(BASE_DVORAK__ALT_BASE)
-    [ _ALT_BASE ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._BASE (LeTteRs, standard Dvorak)
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        '"    ,<    .>    pP    yY    | fF    gG    cC    rR    lL         Bksp
-         Tab+LCtl   aA    oO    eE    uU    iI    | dD    hH    tT    nN    sS           -_
-         LSht+_PAD  ;:    qQ    jJ    kK    xX    | bB    mM    wW    vV    zZ    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) LGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-          …                                                                    …
-     
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ³) 'South paw' hardware configuration 
-     ⁴) 'Arrow' hardware configuration 
-     ³ ⁴) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ⁵) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ⁶) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-*/
-//
-//      <pink2            , <pinky  , <ring   , <middl , <indx, <ind|, indx>, inde>, midd>, ring>, pink>, pink2>        ,
-//      -*!-              ,         ,         ,        ,      ,    <|,>     ,      ,      ,      ,      ,               ,
-        KC_ESC            , KC_QUOT , KC_COMM , KC_DOT , KC_P , KC_Y , KC_F , KC_G , KC_C , KC_R , KC_L , KC_BSPC       ,
-        LCTL_T ( KC_TAB ) , KC_A    , KC_O    , KC_E   , KC_U , KC_I , KC_D , KC_H , KC_T , KC_N , KC_S , KC_MINS       ,
-        CHOLTAP_LSHFT     , KC_SCLN , KC_Q    , KC_J   , KC_K , KC_X , KC_B , KC_M , KC_W , KC_V , KC_Z , CHOLTAP_RSHFT ,
-//      -----------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , MO ( _PAD )
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1_BASE  
-# endif
-
-# ifdef SWITCH_HOLD_ACC_NSY 
-                           , DUO_HOLD , CHOLTAP_ACCE 
-# else
-                           , CHOLTAP_ACCE , DUO_HOLD
-# endif
-
-                                                     , LEFTCENTER_THUMB
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                                     , TRANS_MIDLEFT
-# endif
-
-                                                                       , RIGHTCENTER_THUMB , DUO_HOLD , KC__YGUI
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                                                 , MO ( _FUN )
-# endif                                                                                    
-                                                                                           
-# ifdef MORE_KEY__ARROW                                                                    
-                                                                                                                 , MORE_key2  
-# endif                                                                                    
-                                                                                           
-                                                                                                                 , CHOLTAP_LAYR
-//                         ,              ,          ,               <|,>                  ,          ,          ,
-//      <1           ±  ±  , <2           , <3       , <4             |, 4>                , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-    /* Layer _..._NSY: Numbers and symbols.
-     *          Off hand Number input (-.Bksp ent (shft)tab).
-     */
-    // KC_TILD does not work there, because of a limitation with shifted keys (nov 2019).
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_DVORAK__DEF_BASE)
-    [ _DEF_NSY ] = LAYOUT_redefined (
-# elif defined(BASE_DVORAK__ALT_BASE)
-    [ _ALT_NSY ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._NSY (Numbers and SYmbols)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    /?    \|    =+    | +     |     ?     {     }   ~+RSht 
-     ---------------------------------------------------------------------------
-     Left+LAlt ___   ___   Ent  | .   ___   LGUI  Right+RAlt
-                     -*-       <|>    -*-                                         //(hold) Access on _..._BASE
-       <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-            …                                   …
-*/
-//
-//
-//      <pink2             , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>  , index>  , middl>  , ring>   , pinky>  , pink2>             ,
-//                         , -*-     ,         ,         ,         ,       <|,>        ,         ,         ,         ,         ,                    ,
-        CTO_BASE           , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL             ,
-        LCTL_T ( KC_TAB )  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , RCTL_T ( KC_GRV )  ,
-        LSFT_DASH          , KC_LBRC , KC_RBRC , KC_SLSH , KC_BSLS , KC_EQL  , KC_PLUS , KC_PIPE , KC_QUES , KC_LCBR , KC_RCBR , RSFT_TILDE         ,
-//      ---------------------------------------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , TRANS_LEFT
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1
-# endif
-
-                           , _______ , _______ , KC_ENT
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                               , TRANS_MIDLEFT
-# endif
-                                                        , KC_DOT , DUO_HOLD , KC__YGUI
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                       , TRANS_RIGHT
-# endif
-
-# ifdef MORE_KEY__ARROW
-                                                                                       , MORE_key2  
-# endif                                     
-
-                                                                                       , RALT_T ( KC_RIGHT )
-//                         ,         , -*-     ,      <|,>       , -*-      ,          ,
-//      <1           ±  ±  , <2      , <3      , <4    |, 4>     , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-
-        /* ⬆⬇ */
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.md
deleted file mode 100644
index fb2c48b869d..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Minifan layout
-
-Compiled for: Dvorak
-====================
-
-This file details the compile version `#define BASE_DVORAK__DEF_BASE,
-BASE_DVORAK__ALT_BASE`. This is a Dvorak layout.
-
-Dvorak keymaps
---------------
-
-──────────Dvorak───────────────
-
-![Minivan layout Image BASEdef-alt](http://socialism.nl/misc/minivan/minivan_base_layer_dvorak_ve.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image NSYdef-alt](http://socialism.nl/misc/minivan/minivan_nsy_layer_dvorak_vc.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-(…) 
-
-For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-
-![Minivan illustration Overview layers by key, Dvorak](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_dvorak_2000_vi.jpg)
-
-Layers (text)
-=============
- 
-         Layer _..._BASE (LeTteRs, standard Dvorak)
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        '"    ,<    .>    pP    yY    | fF    gG    cC    rR    lL         Bksp
-         Tab+LCtl   aA    oO    eE    uU    iI    | dD    hH    tT    nN    sS           -_
-         LSht+_PAD  ;:    qQ    jJ    kK    xX    | bB    mM    wW    vV    zZ    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _DEF_NSY(_DRA)  Enter+_MOV| Space  _DEF_NSY(_DRA) RGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (LGUI)                                                               (_MOV)
-     
-     ₁) Dual hold for _DRA, single hold for _DEF_NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-
-Remarks: The left modifiers have a slight delay in combination with an outside pointer device (mouse, stylus).
-It seems this will be difficult to fix, because it is spread over two devices. To avoid the
-±0.2 second delay, activate a layer where the modifiers are direct (`_PAD`), using the layer toggle on left shift. 
-
-The two keys with ';' (Del;`_ACC`, Right;`_RAR`) do not auto-repeat on double tap, like QMK normal layer-tap keys.
-There is an uncluttered _Delete_ on `_PAD`, an uncluttered _Right_ arrow on the `_MOV` layer.
-
-Holding both `_DEF_NSY` keys left and right of the "split space bar" (enter, space) results in layer `_DRA`.
-
-Holding either one of the just above mentioned `_DEF_NSY` layer keys (<3 and 3>), with the `_ACC` layer key
-(on <2) results in layer `_BON`.
-
-- - -
-
-     Layer _..._NSY (Numbers and SYmbols)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    /?    \|    =+    | +     |     ?     {     }   ~+RSht 
-     ---------------------------------------------------------------------------
-                 Left+LAlt ___   ___   Ent  | .   ___   RGUI  Right+RAlt
-                                 -*-       <|>    -*-                        //(hold) Access on _DEF_BASE
-                   <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-                        ^                                   ^
-                      (LGUI)                              (_MOV)
-
-- - -
-
-Key associations
-----------------
-Key placement associations between layers for Dvorak.
-
-![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_dvorak_1500_ve.jpg)
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.c
deleted file mode 100644
index c686704a4b8..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2020 by Jos Boersema
- *
- */
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-        /*                            Redefine a layer in this file
-         *
-         * _Activate_ one or more of the below BASESFILE_LAYER_..., to redefine the layer
-         * in this file. The version in ./keymap.c will be ignored. Keep in mind to use
-         * transparent keys (_______) for “hold” layer switch keys on the BASE map, for
-         * your new layer.
-         *
-         */
-// #define BASESFILE_LAYER_ACC 
-// #define BASESFILE_LAYER_DRA 
-// #define BASESFILE_LAYER_BON 
-// #define BASESFILE_LAYER_PAD 
-// #define BASESFILE_LAYER_MOV 
-// #define BASESFILE_LAYER_RAR 
-// #define BASESFILE_LAYER_FUN 
-
-        /* ⬆⬇ */
-
-    /* Layers _ALT_BASE, _ALT_NSY: Descramble basic layers if the computer itself is
-     *                  applying Dvorak remapping.
-     *
-     *          When a computer is already set to Dvorak, connecting a
-     *          keyboard which is natively Dvorak results in garbage.
-     *          The computer side normal keycodes to Dvorak remapping goes
-     *          on top of the wrong input, resulting in the following being
-     *          effective:
-     *
-     *          _DEF_BASE layer:        |
-     *          Esc  -  w  v  l  f   u  i  j  p  n  Bspc
-     *          Tab  a  r  .  g  c   e  d  y  b  o  [
-     *          Sht  s  '  h  t  q   x  m  ,  k  ;  Sht
-     *                     Enter  Space
-     *          _DEF_NSY layer:        |
-     *          _DEF_BASE !  @  #  $  %   ^  &  *  (  )  Bspc
-     *          [    1  2  3  4  5   \  ]  z  /  =  `
-     *          Sht  0  9  8  7  6   |  }  Z  ?  +  `
-     *                     Enter  Space
-     *
-     *          _ACC layer:        |
-     *          <just semi-random character strings>
-     *
-     *          _DRA, _BON: same as _ACC: garbage.
-     *
-     *          To solve this results in the strange layout given below.
-     *          The result is close to a Qwerty layout. It will not be ideal
-     *          for Qwerty typers because the symbols are not arranged that
-     *          well.
-     */ 
-
-
-    /* Layer _ALT_BASE: Descrambled _DEF_BASE layer for a computer already set to Dvorak (see above).
-     *           It is a copy of _DEF_BASE, with moved around stuff, and points to _ALT_NSY instead
-     *           of _DEF_NSY, because that too has some descrambled symbols. The rest is the same.
-     *
-     */
-
-// This layout is only foreseen on ‛Alternate’.
-    [ _ALT_BASE ] = LAYOUT_redefined (
-
-/*
-     Layer _ALT_BASE (Dvorak descramble mode for letters, end result shown)
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        '"    ,<    .>    pP    yY    | fF    gG    cC    rR    lL         Bksp
-         Tab+LCtl   aA    oO    eE    uU    iI    | dD    hH    tT    nN    sS           -_
-         LSht+_PAD  ;:    qQ    jJ    kK    xX    | bB    mM    wW    vV    zZ    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _ALT_NSY(_DRA)  Enter+_MOV| Space  _ALT_NSY(_DRA) LGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━━━━━━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (RGUI)                                                               (_MOV)
-
-     ₁) Dual hold for _DRA, single hold for _DEF_NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-
-
-     _ALT_BASE input results in the same as _DEF_BASE with computer side Dvorak remapping. Only shown what changes:
-
-              '"    ,<    .>    pP    yY    | fF    gG    cC    rR    lL                 // row 4, result
-                    oO    eE    uU    iI    | dD    hH    tT    nN    sS   -_            // row 3, result
-              ;:    qQ    jJ    kK    xX    | bB          wW    vV    zZ                 // row 2, result
-     ---------------------------------------------------------------------------------------
-                        _ALT_NSY                           _ALT_NSY                              // row 1, result
-
-     (Keys for 'aA', '\|' and 'mM' are the same in Dvorak and Qwerty.)
-
- */
-//                                                   
-//
-//      <pink2            , <pink, <ring, <midd, <indx, <ind|, indx>, inde>, middle> , ring>  , pink>   , pink2>        ,
-//      -*-               ,      ,      ,      ,      ,    <|,>     ,      ,         ,        ,         , -!-           ,
-        KC_ESC            , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I    , KC_O   , KC_P    , KC_BSPC       ,
-        LCTL_T ( KC_TAB ) , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K    , KC_L   , KC_SCLN , KC_QUOT       ,
-        CHOLTAP_LSHFT     , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH , CHOLTAP_RSHFT ,
-//      -----------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT )
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , MO ( _PAD )
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1_BASE
-# endif
-
-# ifdef SWITCH_HOLD_ACC_NSY 
-                           , DUO_HOLD , CHOLTAP_ACCE 
-# else
-                           , CHOLTAP_ACCE , DUO_HOLD
-# endif
-
-                                                     , LEFTCENTER_THUMB
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                                     , TRANS_MIDLEFT
-#     endif
-
-                                                                       , RIGHTCENTER_THUMB , DUO_HOLD , KC__YGUI
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                                                 , MO ( _FUN )
-# endif                                                                                    
-                                                                                           
-# ifdef MORE_KEY__ARROW                                                                    
-                                                                                                                 , MORE_key2  
-# endif                                                                                    
-                                                                                           
-                                                                                                                 , CHOLTAP_LAYR
-//                         ,              ,          ,               <|,>                  ,          ,          ,
-//      <1           ±  ±  , <2           , <3       , <4             |, 4>                , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-
-    /* Layer _ALT_NSY: Descrambled _DEF_NSY layer for a computer already set to Dvorak (see just above).
-     *
-     */
-    // KC_TILD does not work there, because of a limitation with shifted keys (nov 2019).
-
-    [ _ALT_NSY ] = LAYOUT_redefined (
-
-/*
-     Layer _ALT_NSY (Dvorak descramble mode for numbers/symbols)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   -_    =+    [{    \|    ]}    | }     |     {     _     +   ~+RSht            // row 2, raw
-     ---------------------------------------------------------------------------
-     Left+LAlt ___   ___   Ent  | .   ___   LGUI  Right+RAlt
-                     -*-       <|>    -*-                                         //(hold) Access on _DEF_BASE
-       <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-            ^                                   ^
-          (RGUI)                              (_MOV)
-
-     _ALT_NSY input results in the same as _DEF_NSY with computer side Dvorak remapping. Only shown what changes:
-
-              [{    ]}    /?           =+   |   +         ?     {     }                  // row 2, result
- */
-//
-//      <pink2             , <pinky  , <ring  , <middl  , <index  , <indx2 |, indx2>  , index>  , middl>  , ring>   , pinky>  , pink2>             ,
-//                         , -*-     ,        ,         ,         ,       <|,>        ,         ,         ,         , -*-     ,                    ,
-        CTO_BASE           , KC_EXLM , KC_AT  , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL             ,
-        LCTL_T ( KC_TAB )  , KC_1    , KC_2   , KC_3    , KC_4    , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , RCTL_T ( KC_GRV )  , 
-        LSFT_DASH          , KC_MINS , KC_EQL , KC_LBRC , KC_BSLS , KC_RBRC , KC_RCBR , KC_PIPE , KC_LCBR , KC_UNDS , KC_PLUS , RSFT_TILDE         ,  
-//      --------------------------------------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , XXXXXXX
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1
-# endif
-
-                           , _______ , _______ , KC_ENT 
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                               , TRANS_MIDLEFT
-# endif
-
-                                                               , KC_DOT , DUO_HOLD , KC__YGUI  
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                              , XXXXXXX
-# endif                                                                                   
-                                                                                          
-# ifdef MORE_KEY__ARROW                                                                   
-                                                                                              , MORE_key2  
-# endif                                                                                   
-                                                                                          
-                                                                                              , RALT_T ( KC_RIGHT )
-//                         ,         , -*-     ,             <|,>       , -*-      ,          ,
-//      <1           ±  ±  , <2      , <3      , <4           |, 4>     , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.md
deleted file mode 100644
index c9a81fc0824..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_dvorak_descramble.md
+++ /dev/null
@@ -1,135 +0,0 @@
-# Minifan layout
-
-Compiled for: Dvorak² 
-=====================
-
-This file details the compile version `#define BASE_DVORAK_DESCRAMBLE__ALT_BASE`
-which has a special version of Dvorak so that you can type Dvorak on a computer
-*already* set to do Dvorak layout re-mapping.
-
-This can be useful on for example a laptop, for which the build-in
-keyboard should to be in Dvorak.
-
-Dvorak² keymaps
----------------
-
-──────────Dvorak───────────────
-
-![Minivan layout Image BASEdef-alt](http://socialism.nl/misc/minivan/minivan_base_layer_dvorak_ve.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image NSYdef-alt](http://socialism.nl/misc/minivan/minivan_nsy_layer_dvorak_vc.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-(…) 
-
-For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-
-![Minivan illustration Overview layers by key, Dvorak](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_dvorak_2000_vi.jpg)
-
-Layers (text)
-=============
- 
-          Layer _ALT_BASE (Dvorak descramble mode for letters)
-                                                  | Right hand
-          <pink2    <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>    // Keys by finger
-          -o-                                    <|>                                    ... // -o- BASE access
-          Esc       '"    ,<    .>    pP    yY    | fF    gG    cC    rR    lL         Bksp
-          Tab+LCtl  aA    oO    eE    uU    iI    | dD    hH    tT    nN    sS           -_
-          LSht+_PAD ;:    qQ    jJ    kK    xX    | bB    mM    wW    vV    zZ    RSht+_FUN
-              +_MOV⁵                              |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _ALT_NSY(_DRA)  Enter+_MOV| Space  _ALT_NSY(_DRA) RGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━━━━━━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (LGUI)                                                               (_MOV)
-
-     ₁) Dual hold for _DRA, single hold for _DEF_NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-
-
-     This layer input results in the same as normal Dvorak if computer side Dvorak remapping is occuring.
-     Only shown what changes:
-
-              '"    ,<    .>    pP    yY    | fF    gG    cC    rR    lL                 // row 4, result
-                    oO    eE    uU    iI    | dD    hH    tT    nN    sS   -_            // row 3, result
-              ;:    qQ    jJ    kK    xX    | bB          wW    vV    zZ                 // row 2, result
-     -------------------------------------------------------------------------------
-                        _ALT_NSY                           _ALT_NSY                              // row 1, result
-
-     (Keys for 'aA', '\|' and 'mM' are the same in Dvorak and Qwerty.)
-
-- - -
-    
-     Layer _ALT_NSY (Dvorak descramble mode for numbers-symbols)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   -_    =+    [{    \|    ]}    | }     |     {     _     +   ~+RSht            // row 2, raw
-     ---------------------------------------------------------------------------
-                 Left+LAlt ___   ___   Ent  | .   ___   RGUI  Right+RAlt
-                                 -*-       <|>    -*-                        //(hold) Access on _DEF_BASE
-                   <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-                        ^                                   ^
-                      (LGUI)                              (_MOV)
-
-     This layer input results in the same as regular Dvorak _..._NSY layer, if computer side Dvorak remapping
-     is occuring. Only shown what changes:
-
-              [{    ]}    /?           =+   |   +         ?     {     }                  // row 2, result
-
-- - -
-
-Special feature: 'Descramble' mode
-==================================
-
-![Minivan descramble Dvorak](http://socialism.nl/misc/minivan/minivan_descramble.jpg)
-
-  This is an option to take care of typing normally on a computer already
-  set to Dvorak ('descramble' mode.)  
-
-  Activation: go to `_RAR` layer, than touch what is space bar on the BASE layer
-  (the key just right from the middle on the first row). This cycles through the modes.
-
-      ⮚ When the left led is white: normal mode.
-      ⮚ Right led white: full descramble mode (Linux descrambled Unicode input).
-      ⮚ Middle led white: half descramble mode, with normal Unicode input system.
-
-  With the middle led set to white, you can take advantage of a Unicode
-  input mode that works on your system, if it is the same when the
-  computer is set to Dvorak or not (see `_RAR` layer for Unicode input
-  encoding selection). This more or less means there is one more Unicode
-  encoding option than already standard in QMK: 'descrambled' version for 
-  Linux (Shift-Control-U HEX) encoding, for use on a computer *already* set to
-  Dvorak.
-
-  To test it, (in Debian/Linux) go to a terminal in X and type (normal user)
-
-        > setxkbmap -layout us -variant dvorak
-
-  Undo:
-
-        > setxkbmap -layout us
-
-  Unicode on Windos operating system may require to install something special.
-
-
-Key associations
-----------------
-Key placement associations between layers for Dvorak.
-
-![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_dvorak-descramble_1500_ve.jpg)
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_hebrew.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_hebrew.c
deleted file mode 100644
index cac77aac601..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_hebrew.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2021 by Jos Boersema
- *
- */
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-// See the user configuration file: ./base_hebrew.h
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-        /*  ⬇ */
-
-    /* Layer _..._BASE: default BASE layer (Hebrew)
-     *
-     * - Dual use keys create a delay in the key (tap/hold keys), therefore
-     *   space is not dual use (most used key), neither is hyphen.
-     */ 
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_HEBREW__DEF_BASE)
-    [ _DEF_BASE ] = LAYOUT_redefined (
-# elif defined(BASE_HEBREW__ALT_BASE)
-    [ _ALT_BASE ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._BASE (LeTteRs, standard Hebrew as in Israel)
-     ➡ This is a simple hebrew layout. Notice the letter ק is displaced from normal,
-       to retain compatibility with Dvorak-English for ,<.>. There are no niqqud
-       available, because it is far too many unique symbols in Unicode, and it is 
-       rarely used.
-
-                                            HEBREW_ISRAEL
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        /;    ׳     ק     ר     א     | ט     ו     ן     ם     פ          Bksp
-         Tab+LCtl   ש     ד     ג/RLM כ₪    ע     | י     ח     ל/LRM ך     ף:           ,״ //Right-Left-Mark
-         LSht+_PAD  ז     ס     ב     ה     נ     | מ     צ     ת<    ץ>    .?    RSht+_FUN //<>os side flip?
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) LGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-          …                                                                    …
-
-                                            HEBREW_QWERTY 
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        ת•    ץ•    ק     ר     א     | ט     ו     ן     ם׳    פ״         Bksp
-         Tab+LCtl   ש     ד     ג/RLM כ₪    ע     | י     ח     ל/LRM ך     ף:           '" //Right-Left-Mark
-         LSht+_PAD  ז     ס     ב     ה     נ     | מ     צ     ,<    .>    /?    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) LGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-          …                                                                    …
-
-                                            HEBREW_DVORAK
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        '"    ,<    .>    ר     א     | ט     ו     ן     ם׳    פ״         Bksp
-         Tab+LCtl   ש     ד     ג/RLM כ₪    ע     | י     ח     ל/LRM ך     ף             ־ //Right-Left-Mark
-         LSht+_PAD  ז:    ס     ב     ה     נ     | מ     צ     ת     ץ     ק•    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) LGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-          …                                                                    …
-
-     
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ³) 'South paw' hardware configuration 
-     ⁴) 'Arrow' hardware configuration 
-     ³ ⁴) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ⁵) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ⁶) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-     ⁷) Letters marked with • are displaced from standard hebrew layout.
-*/
-//
-//      <pink2            , <pinky    , <ring     , <middl    , <indx     ,      <ind|, indx>     , inde>     , midd>     , ring>     , pink>     , pink2>        ,
-//      -*!-              ,           ,           ,           ,           ,         <|,>          ,           ,           ,           ,           ,               ,
-        KC_ESC      
-
-# if   defined(HEBREW_ISRAEL)
-                          , XP_HEB_AA , XP_HEB_AB , XP_HEB_AC 
-# elif defined(HEBREW_QWERTY)
-                          , XP_HEB_AA , XP_HEB_AB , XP_HEB_AC
-# elif defined(HEBREW_DVORAK)
-                          , KC_QUOT   , KC_COMM   , KC_DOT 
-# endif // HEBREW_DVORAK/QWERTY
-                                                              , XP_HEB_AD , XP_HEB_AE , XP_HEB_AF , XP_HEB_AG , XP_HEB_AH , XP_HEB_AI , XP_HEB_AJ , KC_BSPC       ,
-        LCTL_T ( KC_TAB ) , XP_HEB_BA , XP_HEB_BB , XP_HEB_BC , XP_HEB_BD , XP_HEB_BE , XP_HEB_BF , XP_HEB_BG , XP_HEB_BH , XP_HEB_BI , XP_HEB_BJ
-//                                                                                                                                      ^^^^^^^^^  Different in Qwerty (done in macros) with ':'
-
-# if   defined(HEBREW_ISRAEL)
-                                                                                                                                                  , XP_HEB_BK     , // ,"
-# elif defined(HEBREW_QWERTY)
-                                                                                                                                                  , KC_QUOT       , // '"
-# elif defined(HEBREW_DVORAK)
-                                                                                                                                                  , XP_HEB_MQF    , // ־
-# endif // HEBREW_*
-
-        CHOLTAP_LSHFT     , XP_HEB_CA , XP_HEB_CB , XP_HEB_CC , XP_HEB_CD , XP_HEB_CE , XP_HEB_CF , XP_HEB_CG 
-
-# if   defined(HEBREW_ISRAEL)
-                                                                                                              , XP_HEB_CH , XP_HEB_CI , XP_HEB_CJ
-# elif defined(HEBREW_QWERTY)
-                                                                                                              , KC_COMM   , KC_DOT    , KC_SLSH    
-# elif defined(HEBREW_DVORAK)
-                                                                                                              , XP_HEB_CH , XP_HEB_CI , XP_HEB_CJ
-# endif // HEBREW_*
-                                                                                                                                                  , CHOLTAP_RSHFT ,
-//      -----------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , MO ( _PAD )
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1_BASE  
-# endif
-
-# ifdef SWITCH_HOLD_ACC_NSY 
-                           , DUO_HOLD , CHOLTAP_ACCE 
-# else
-                           , CHOLTAP_ACCE , DUO_HOLD
-# endif
-
-                                                     , LEFTCENTER_THUMB
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                                     , TRANS_MIDLEFT
-# endif
-
-                                                                       , RIGHTCENTER_THUMB , DUO_HOLD , KC__YGUI
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                                                 , MO ( _FUN )
-# endif                                                                                    
-                                                                                           
-# ifdef MORE_KEY__ARROW                                                                    
-                                                                                                                 , MORE_key2  
-# endif                                                                                    
-                                                                                           
-                                                                                                                 , CHOLTAP_LAYR
-//                         ,              ,          ,               <|,>                  ,          ,          ,
-//      <1           ±  ±  , <2           , <3       , <4             |, 4>                , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-    /* Layer _..._NSY: Numbers and symbols.
-     *          Off hand Number input (-.Bksp ent (shft)tab).
-     */
-    // KC_TILD does not work there, because of a limitation with shifted keys (nov 2019).
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_HEBREW__DEF_BASE)
-    [ _DEF_NSY ] = LAYOUT_redefined (
-# elif defined(BASE_HEBREW__ALT_BASE)
-    [ _ALT_NSY ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._NSY (Numbers and SYmbols)
-     ➡ The brace type symbols are *not* reversed as on standard hebrew boards (I find it confusing).
- 
-                                      HEBREW_ISRAEL & HEBREW_QWERTY 
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    -_    \|    =+    | +     |     ־     {     }   ~+RSht 
-                                                          ^                       // Only difference with Qwerty
-     ---------------------------------------------------------------------------
-     Left+LAlt ___   ___   Ent  | .   ___   LGUI  Right+RAlt
-                     -*-       <|>    -*-                                         //(hold) Access on _..._BASE
-       <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-            …                                   …
-    
-                                      HEBREW_DVORAK (Same as standard Dvorak)
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    /?    \|    =+    | +     |     ?     {     }   ~+RSht 
-     ---------------------------------------------------------------------------
-     Left+LAlt ___   ___   Ent  | .   ___   LGUI  Right+RAlt
-                     -*-       <|>    -*-                                         //(hold) Access on _..._BASE
-       <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-            …                                   …
-*/
-//
-//
-//      <pink2             , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>  , index>  , middl>  , ring>   , pinky>  , pink2>             ,
-//                         , -*-     ,         ,         ,         ,       <|,>        ,         ,         ,         ,         ,                    ,
-        CTO_BASE           , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL             ,
-        LCTL_T ( KC_TAB )  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , RCTL_T ( KC_GRV )  ,
-        LSFT_DASH          , KC_LBRC , KC_RBRC 
-
-# if   defined(HEBREW_ISRAEL)
-                                               , KC_MINUS // allows -_, with Maqaf on mirror place right 
-# elif defined(HEBREW_QWERTY)
-                                               , KC_MINUS // same as HEBREW_ISRAEL
-# elif defined(HEBREW_DVORAK)
-                                               , KC_SLSH 
-# endif // HEBREW_*
-
-                                                         , KC_BSLS , KC_EQL  , KC_PLUS , KC_PIPE 
-
-
-# if   defined(HEBREW_ISRAEL)
-                                                                                                 , XP_HEB_MQF // '־' Maqaf
-# elif defined(HEBREW_QWERTY)
-                                                                                                 , XP_HEB_MQF //
-# elif defined(HEBREW_DVORAK)
-                                                                                                 , KC_QUES 
-# endif // HEBREW_*
-                                                                                                           , KC_LCBR , KC_RCBR , RSFT_TILDE         ,
-//      ---------------------------------------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , TRANS_LEFT
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1
-# endif
-
-                           , _______ , _______ , KC_ENT
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                               , TRANS_MIDLEFT
-# endif
-                                                        , KC_DOT , DUO_HOLD , KC__YGUI
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                       , TRANS_RIGHT
-# endif
-
-# ifdef MORE_KEY__ARROW
-                                                                                       , MORE_key2  
-# endif                                     
-
-                                                                                       , RALT_T ( KC_RIGHT )
-//                         ,         , -*-     ,      <|,>       , -*-      ,          ,
-//      <1           ±  ±  , <2      , <3      , <4    |, 4>     , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-
-        /* ⬆⬇ */
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_hebrew.h b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_hebrew.h
deleted file mode 100644
index f5604b8f1ea..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_hebrew.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2021 by Jos Boersema
- *
- */
-
-#pragma once
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-        /*                            Harmonize layout with a Latin layout
-         *
-         * See base_hebrew.md for design objectives. 
-         */
-  #define HEBREW_ISRAEL // Close to standard Israeli hebrew.
-//#define HEBREW_QWERTY // Harmonize punctuation symbols with Qwerty.
-//#define HEBREW_DVORAK // Harmonize punctuation symbols with Dvorak.
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-        /*                            Redefine a layer in this file
-         *
-         * _Activate_ one or more of the below BASESFILE_LAYER_..., to redefine the layer
-         * in this file. The version in ./keymap.c will be ignored. Keep in mind to use
-         * transparent keys (_______) for “hold” layer switch keys on the BASE map, for
-         * your new layer.
-         */
-// #define BASESFILE_LAYER_ACC 
-// #define BASESFILE_LAYER_DRA 
-// #define BASESFILE_LAYER_BON 
-// #define BASESFILE_LAYER_PAD 
-// #define BASESFILE_LAYER_MOV 
-// #define BASESFILE_LAYER_RAR 
-// #define BASESFILE_LAYER_FUN 
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_hebrew.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_hebrew.md
deleted file mode 100644
index 0e7adc40c8f..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_hebrew.md
+++ /dev/null
@@ -1,198 +0,0 @@
-# Minifan layout
-
-Compiled for: Hebrew
-====================
-
-This file details the compile version `#define BASE_HEBREW__DEF_BASE,
-BASE_HEBREW__ALT_BASE`. This is a basic Hebrew layout, without niqqud.
-
-Only the most common symbols are implemented.  Hebrew symbols are all
-done in Unicode.
-
-See also ![./readme.md](./readme.md) chapter 7 _Language support_.
-
-Parenthesis/braces/etc direction seems to be dealt with at the computer
-side, depending on the surrounding symbols. The keyboard is printing
-these symbols unchanged from what they are in standard Latin layouts,
-and are represented that way in the manual.
-      
-Options
-=======
-
-You can compile the hebrew to be like a common Israeli layout, or to harmonize the
-punctuation symbols with either Dvorak or Qwerty. See the configuration file 
-![./base_hebrew.h](./base_hebrew.h)
-
-☞ Israeli Hebrew
-
-As close to a simple standard hebrew layout as possible.
-A little larger memory cost than the other options. No `'"` ASCII quotes symbols,
-but proper ׳ and ״ (in Unicode).
-
-☞ Qwerty with Hebrew
-
-The letters ת, ץ get displaced from the standard hebrew layout.
-Numerical layer is the same as standard Qwerty, except the symbol 
-`_` symbol becomes `־` (Maqaf). No `;` symbol.
-
-☞ Qwerty derivatives with Hebrew
-
-It is adviced to use Qwerty with Hebrew in this case, and adjust by hand
-coding if needed.  “Workman” should harmonize the same as Qwerty.
-Colemak displaces the “;:” key relative to Qwerty, therefore you may
-like to change the “:” shifted symbol (by hand). The obscurity of this
-use case gets extreme, there will not be options for this.
-
-☞ Dvorak with Hebrew
-
-The letter ק gets displaced from the standard hebrew layout.
-Numerical layer is the same as standard Dvorak. No `;` symbol.
-
-
-Flash memory cost
------------------
-
-This layout adds several dozen new Unicode symbols, which takes up a certain
-amount of additional space in keyboard memory. If you end up going over
-the limit, you may need to change your compilation software setup, and/or
-you can look into the “Eviscerations” chapters in ![./user_config.h](./user_config.h)
-
-Hebrew keymaps
---------------
-
-──────────Hebrew Israel────────
-
-![Minivan layout Image BASEdef-alt](http://socialism.nl/misc/minivan/minivan_base_layer_hebrew-israel_ve.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image NSYdef-alt](http://socialism.nl/misc/minivan/minivan_nsy_layer_hebrew-israel_vd.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-(…) 
-
-──────────Hebrew Qwerty────────
-
-![Minivan layout Image BASEdef-alt](http://socialism.nl/misc/minivan/minivan_base_layer_hebrew-qwerty_ve.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image NSYdef-alt](http://socialism.nl/misc/minivan/minivan_nsy_layer_hebrew-israel_vd.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-(…) 
-
-──────────Hebrew Dvorak────────
-
-![Minivan layout Image BASEdef-alt](http://socialism.nl/misc/minivan/minivan_base_layer_hebrew-dvorak_ve.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image NSYdef-alt](http://socialism.nl/misc/minivan/minivan_nsy_layer_dvorak_vc.jpg)
-Layer: `..._NSY` (Same as Dvorak.)
-
-──────────in common────────────
-
-(…) 
-
-For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-
-![Minivan illustration Overview layers by key, Hebrew](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_hebrew_2000_vk.jpg)
-
-Layers (text)
-=============
-
-(The “x” padding was necessary to undo the direction of these characters being reversed.
-This layout might still not be represenetd correctly on your system. See the graphics instead.)
-
-                                            HEBREW_ISRAEL
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Escxxxxxxxx/;xxxx׳xxxxxקxxxxxרxxxxxאxxxxx|xטxxxxxוxxxxxןxxxxxםxxxxxפxxxxxxxxxxBksp
-         Tab+LCtlxxxשxxxxxדxxxxxג/RLMxכx₪xxxעxxxxx|xיxxxxxחxxxxxל/LRMxךxxxxxף:xxxxxxxxxxx,״ //Right-Left-Mark
-         LSht+_PADxxזxxxxxסxxxxxבxxxxxהxxxxxנxxxxx|xמxxxxxצxxxxxת<xxxxץ>xxxx.?xxxxRSht+_FUN //<>os side flip?
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
- 
-                                            HEBREW_QWERTY 
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Escxxxxxxxxת•xxxxץ•xxxxקxxxxxרxxxxxאxxxxx|xטxxxxxוxxxxxןxxxxxםx׳xxxפx״xxxxxxxxBksp
-         Tab+LCtlxxxשxxxxxדxxxxxג/RLMxכx₪xxxעxxxxx|xיxxxxxחxxxxxל/LRMxךxxxxxף:xxxxxxxxxxx'" //Right-Left-Mark
-         LSht+_PADxxזxxxxxסxxxxxבxxxxxהxxxxxנxxxxx|xמxxxxxצxxxxx,<xxxx.>xxxx/?xxxxRSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-         (…)
-
-                                            HEBREW_DVORAK
-         Layer _..._BASE (LeTteRs, standard Hebrew)
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Escxxxxxxxx'"xxxx,<xxxx.>xxxxרxxxxxאxxxxx|xטxxxxxוxxxxxןxxxxxםx׳xxxפx״xxxxxxxxBksp
-         Tab+LCtlxxxשxxxxxדxxxxxג/RLMxכx₪xxxעxxxxx|xיxxxxxחxxxxxל/LRMxךxxxxxףxxxxxxxxxxxxx־ //Right/Left-Mark
-         LSht+_PADxxז:xxxxסxxxxxבxxxxxהxxxxxנxxxxx|xמxxxxxצxxxxxתxxxxxץxxxxxק•xxxxRSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _DEF_NSY(_DRA)  Enter+_MOV| Space  _DEF_NSY(_DRA) RGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (LGUI)                                                               (_MOV)
-
-
-     ₁) Dual hold for _DRA, single hold for _DEF_NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-     ⁷) Letters marked with • are displaced from standard hebrew layout.
-
-Remarks: The left modifiers have a slight delay in combination with an outside pointer device (mouse, stylus).
-It seems this will be difficult to fix, because it is spread over two devices. To avoid the
-±0.2 second delay, activate a layer where the modifiers are direct (`_PAD`), using the layer toggle on left shift. 
-
-The two keys with ';' (Del;`_ACC`, Right;`_RAR`) do not auto-repeat on double tap, like QMK normal layer-tap keys.
-There is an uncluttered _Delete_ on `_PAD`, an uncluttered _Right_ arrow on the `_MOV` layer.
-
-Holding both `_DEF_NSY` keys left and right of the "split space bar" (enter, space) results in layer `_DRA`.
-
-Holding either one of the just above mentioned `_DEF_NSY` layer keys (<3 and 3>), with the `_ACC` layer key
-(on <2) results in layer `_BON`.
-
-- - -
-
-     Layer _..._NSY (Numbers and SYmbols)
-    
-                                      HEBREW_ISRAEL & HEBREW_QWERTY (_ becomes ־ Maqaf)
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASExxxxx!xxxxx@xxxxx#xxxxx$xxxxx%xxxxx|x^xxxxx&xxxxx*xxxxx(xxxx)xxxxxxxDel
-     Tab+LCtlx1!xxxx2@xxxx3#xxxx4$xxxx5%xxxx|x6^xxxx7&xxxx8*xxxx9(xxx0)xx`~+RCtl
-     -+LShtxxx[{xxxx]}xxxx-_xxxx\|xxxx=+xxxx|x+xxxxx|xxxxx־xxxxx{xxxxx}xxx~+RSht
-                                                          ^                       // Only difference with Qwerty
-     ---------------------------------------------------------------------------
-                 Left+LAlt ___   ___   Ent  | .   ___   RGUI  Right+RAlt
-                                 -*-       <|>    -*-                        //(hold) Access on _DEF_BASE
-                   <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-                        ^                                   ^
-                      (LGUI)                              (_MOV)
-
-
-                                      HEBREW_DVORAK (Same as standard Dvorak)
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    /?    \|    =+    | +     |     ?     {     }   ~+RSht 
-     ---------------------------------------------------------------------------
-     (…)
-- - -
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c
deleted file mode 100644
index b54af62011c..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2020 by Jos Boersema
- *
- */
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-// See the user configuration file: ./base_numpad.h
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-// This is moved into ./user_config.h, because global #defines are affected.
-//((#include "./base_numpad.h" // Pull in the user configuration))
-
-        /*  ⬇ */
-
-    /* Layer _..._BASE: default BASE layer (Dvorak)
-     *
-     * This thing is different from the usual different letters arrangement.
-     * It is a numbers pad, one for the left hand, and one for the right
-     * hand. Both are as identical as possible. The use case is the same as
-     * a number pad keyboard: single handed numbers input.
-     *
-     * The number 5 is under the middle finger home row, as expected for blind
-     * number pad typing.
-     *
-     * The left/upper key, where normally BASE is located, is now OTHER_BASE.
-     * That switches the board to the ‛Default’ layout, which is effectively the
-     * same way as a return to BASE in the sense of BASE being the letters/layer
-     * switch layer. “Other Base” reached from the normal letters/layer-switching 
-     * BASE layout will then turn the keyboard into these number pads layers.
-     *
-     * A modified Numbers&Symbols layer _NSY is still supplied with this Numbers
-     * Pad layout (as with other Base layers).
-     * 
-     * The standard numbers pad layer _PAD also still exists. That one has the
-     * numbers arranged differently. 
-     *
-     */ 
-
-// When putting this layer on ‛Default’, it produced undesired side effects:
-// • _RAR and _MOV hold keys on the ‛Alternate’ letters layer, failed to switch back.
-// • Parts of the Numbers Pad keys got activated through transparent layer switch keys on letters layer.
-// Since there is no use for Numpad on ‛Default’ Base anyway, this is simply not supported, which seems to solve the problem.
-
-
-# ifndef NUMPAD_BASE_SINGLE 
-
-    [ _ALT_BASE ] = LAYOUT_redefined (
-
-/*
-     Layer _..._BASE (Number pad, square layout)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     !AlterGo Bspc  7     8     9     -     | Bspc  7     8     9    -   Bspc  //!AlterGo: to _DEF_BASE
-     =         *    4     5     6     +     | *     4     5     6    +      =
-     _NSY¹     /    1     2     3     ,     | /     1     2     3    ,   _NSY¹ 
-     ------------------------------------------------------------------------
-                   xxx     0     .     Ent  | NumL  0     .     Ent
-                                           <|>
-                   <1   ±  <2    <3    <4   | 4>    3> ±  2>    1>  
-                        …                   |          …²
-
-     Layer _..._BASE (Number pad, with NumLock off)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring >pin>pink2>
-                                           <|>
-     !AlterGo Bspc  Home  Up    PgUp  -     | Bspc  Home  Up    PgUp  -   Bspc  //!AlterGo: to _DEF_BASE 
-     =         *    Left  5     Right +     | *     Left  5     Right +      =  // modified 5
-     _NSY¹     /    End   Down  PgDn  ,     | /     End   Down  PgDn  ,   _NSY¹
-     -------------------------------------------------------------------------
-                   xxx     Ins   Del   Ent  | NumL  Ins   Del   Ent
-                                           <|>
-                   <1   ±  <2    <3    <4   | 4>    3>  ± 2>    1>  
-                        …                   |           …² 
- 
-     ₁) Toggle to the accompanying Super-Sub-Script (_NSY) layer.
-     ₂) Note anomaly: additional hardware key ‛arrow’ shifted one to the left.
-
-*/
-//
-//      <pink2        , <pinky         , <ring   , <middl  , <indx   ,        <ind|, indx>          , inde>   , midd>   , ring>   , pink>       , pink2>      ,
-//      -*!-          ,                ,         ,         ,         ,           <|,>               ,         ,         ,         ,             ,             ,
-        OTHER_BASE_GO , KC_BSPC        , KC_KP_7 , KC_KP_8 , KC_KP_9 , KC_KP_MINUS , KC_BSPC        , KC_KP_7 , KC_KP_8 , KC_KP_9 , KC_KP_MINUS , KC_BSPC     ,
-        KC_KP_EQUAL   , KC_KP_ASTERISK , KC_KP_4 , KC_KP_5 , KC_KP_6 , KC_KP_PLUS  , KC_KP_ASTERISK , KC_KP_4 , KC_KP_5 , KC_KP_6 , KC_KP_PLUS  , KC_KP_EQUAL ,
-        CTO_NUMS      , KC_KP_SLASH    , KC_KP_1 , KC_KP_2 , KC_KP_3 , KC_KP_COMMA , KC_KP_SLASH    , KC_KP_1 , KC_KP_2 , KC_KP_3 , KC_KP_COMMA , CTO_NUMS    ,
-//      -------------------------------------------------------------------------------------------------------------------------------------------------------
-        XXXXXXX
-
-#     ifdef TRANSMINIVAN_LEFTSIDE
-                      , TRANS_LEFT  
-#     endif
-
-#     ifdef MORE_KEY__COMMAND
-                      , MORE_key1 // Note anomaly, not MORE_key1_BASE: numpad is treated as a common layer here, because that is ± how it functions.
-#     endif
-
-                      , KC_KP_0    , KC_KP_DOT , KC_KP_ENTER     
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                               , TRANS_MIDLEFT 
-#     endif
-
-                                                               , KC_NUM , KC_KP_0
-// ---⬇
-// Note anomaly: the additional 'arrow' hardware key is shifted one to the
-// left, compared to other Base layouts, and so is TRANS_RIGHT This is to
-// maintain 'window/command' key on the same key between layers.
-
-#     ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                      , TRANS_RIGHT  
-#     endif                                                                              
-                                                                                     
-#     ifdef MORE_KEY__ARROW                                                              
-                                    
-                                                                                    //, MORE_key2   
-                                                                                      , KC__YGUI
-
-// Note anomaly: not the usual configurable key (MORE_key2), but GUI. This
-// is because position has shifted already, and this GUI allows all the usual
-// keys on a 100% keyboard to be reached with all modifiers, including GUIs,
-// if 'command' hardware key is included. Unfortunately this causes a gap
-// in the numpad layout, but pressing GUI by itself in error will unlikely
-// produce serious mistakes.  Maintaining similar keys between layers seems
-// more important. Since Numpad already is a navigation cluster, it seems
-// more important to allow all keys to be reachable with all modifiers,
-// including GUIs, than to have a quick switch over to the _MOV layer here.
-// Obviously it is fair enough to do this differently, but if someone needs a
-// Numpad + either GUI key combination, that could be a real problem without
-// GUIs here, whereas adding a _MOV switch is a matter of convenience. It
-// seems important to be able to type anything a regular 100% keyboard can,
-// or as near to it as possible.
-//
-// These anomalies are the same for all the Numpad layers here.
-                                                                                  
-#     endif                                                                              
-// ---⬆
-                                                                                      , KC_KP_DOT 
-                                                                                     
-                                                                                                 , KC_KP_ENTER
-//                    ,            ,           ,             <|,>           ,         ,          ,
-//      <1      ±  ±  , <2         , <3        , <4           |, 4>         , 3> ± ±  , 2>       ,      1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-    /* Layer _ALT_NSY: super-/sub-script numbers numpad, square layout
-     */
-
-    [ _ALT_NSY ] = LAYOUT_redefined (
-
-/*
-     Layer _..._BASE (super-/sub-script numbers, Numlock on/off)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     BASE     Bspc  ⁷₇    ⁸₈    ⁹₉    -     | Bspc  ⁷₇    ⁸₈    ⁹₉   -   Bspc
-     =         *    ⁴₄    ⁵₅    ⁶₆    +     | *     ⁴₄    ⁵₅    ⁶₆   +      =
-     LSht      /    ¹₁    ²₂    ³₃    ,     | /     ¹₁    ²₂    ³₃   ,   RSht
-     -*-                                   <|>                            -*- //(toggle) Access on Base
-     ------------------------------------------------------------------------
-                   xxx    ⁰₀     .DEL  Ent  | xxx   ⁰₀    .DEL  Ent  
-                                           <|>      
-                   <1   ±  <2    <3    <4   | 4>    3>  ± 2>    1>  
-                        …                   |           …¹  
-
-     ₁) Note anomaly: additional hardware key ‛arrow’ shifted one to the left.
-
-*/
-//High/low numbers guide:
-//¹₁         ²₂         ³₃         ⁴₄         ⁵₅       | ⁶₆         ⁷₇         ⁸₈         ⁹₉         ⁰₀       
-//XP_DRA_BA  XP_DRA_BB  XP_DRA_BC  XP_DRA_BD  XP_DRA_BE  XP_DRA_BF  XP_DRA_BG  XP_DRA_BH  XP_DRA_BI  XP_DRA_BJ
-//
-//      <pink2      , <pinky         , <ring     , <middl    , <indx     ,        <ind|, indx>          , inde>     , midd>     , ring>     , pink>       , pink2>      ,
-//      -*!-        ,                ,           ,           ,           ,           <|,>               ,           ,           ,           ,             ,             ,
-        CTO_BASE    , KC_BSPC        , XP_DRA_BG , XP_DRA_BH , XP_DRA_BI , KC_KP_MINUS , KC_BSPC        , XP_DRA_BG , XP_DRA_BH , XP_DRA_BI , KC_KP_MINUS , KC_BSPC     ,
-        KC_KP_EQUAL , KC_KP_ASTERISK , XP_DRA_BD , XP_DRA_BE , XP_DRA_BF , KC_KP_PLUS  , KC_KP_ASTERISK , XP_DRA_BD , XP_DRA_BE , XP_DRA_BF , KC_KP_PLUS  , KC_KP_EQUAL ,
-        KC_LSFT     , KC_KP_SLASH    , XP_DRA_BA , XP_DRA_BB , XP_DRA_BC , KC_KP_COMMA , KC_KP_SLASH    , XP_DRA_BA , XP_DRA_BB , XP_DRA_BC , KC_KP_COMMA , KC_RSFT     ,
-//      -----------------------------------------------------------------------------------------------------------------------------------------------------------------
-        XXXXXXX   
-
-#     ifdef TRANSMINIVAN_LEFTSIDE
-                    , TRANS_LEFT
-#     endif
-
-#     ifdef MORE_KEY__COMMAND
-                    , MORE_key1
-#     endif
-
-                    , XP_DRA_BJ , KC_KP_DOT , KC_KP_ENTER 
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                                          , TRANS_MIDLEFT  
-#     endif
-
-                                                          , XXXXXXX       , XP_DRA_BJ 
-
-// See comment on the first layout in this file (double handed Base layer), about the next few keys:
-// ---⬇
-
-#     ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                      , TRANS_RIGHT
-#     endif                                                                                       
-                                                                                              
-#     ifdef MORE_KEY__ARROW                                                                       
-                                                                                    //, MORE_key2   
-                                                                                      , KC__YGUI
-#     endif                                                                                                   
-// ---⬆
-                                                                                      , KC_KP_DOT   
-                                                                                                          
-                                                                                                  , KC_KP_ENTER
-//                  ,           ,           ,           <|,>              ,           ,           ,
-//      <1    ±  ±  , <2        , <3        , <4         |, 4>            , 3>  ±  ±  , 2>        ,       1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-# else // NUMPAD_BASE_SINGLE is defined ====================================================================
-
-    [ _ALT_BASE ] = LAYOUT_redefined (
-
-/*
-     
-     * Layer Numbers Pad on Base:
-     *        « See also documentation in keymap.c at _PAD layer, of which this is almost entirely a copy »
-     *        One difference is the key to go to the _ALT_NSY layer (denoted “NUMS:” just below).
-     *        The other difference is the key to switch to default Base and also immediately goes there
-     *        (denoted “!AlterGo” here).
-     
-     Layer _ALT_BASE (Number pad, with NumLock on)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     !AlterGo NUMS: xxx   xxx   xxx   xxx   | =     7     8     9    -   Bspc  // NUMS: to ¹/₁
-     LCtl     xxx   xxx   xxx   xxx   xxx   | *     4     5     6    +   RCtl
-     LSht     xxx   xxx   xxx   xxx   xxx   | /     1     2     3    ,   RSht  
-     ------------------------------------------------------------------------
-                   LAlt   Del    Tab   Ent  | NumL  0     .     RAlt      
-                                           <|>           
-                   <1   ±  <2    <3    <4   | 4>    3> ±  2>    1>  
-                        …                   |          …¹
-
-     Layer _ALT_BASE (Number pad, with NumLock off)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring >pin>pink2>
-                                           <|>
-     !AlterGo NUMS: xxx   xxx   xxx   xxx   | =     Home  Up    PgUp  -   Bspc  // NUMS: to ¹/₁
-     LCtl     xxx   xxx   xxx   xxx   xxx   | *     Left  5     Right +   RCtl  // modified 5
-     LSht     xxx   xxx   xxx   xxx   xxx   | /     End   Down  PgDn  ,   RSht  
-     -------------------------------------------------------------------------
-                   LAlt   Del    Tab   Ent  | NumL  Ins   Del   RAlt      
-                                           <|>
-                   <1   ±  <2    <3    <4   | 4>    3> ±  2>    1>  
-                        …                   |          …¹
-
-     ₁) Note anomaly: additional hardware key ‛arrow’ shifted one to the left.
- 
-*/
-
-//High/low numbers guide:
-//¹₁         ²₂         ³₃         ⁴₄         ⁵₅       | ⁶₆         ⁷₇         ⁸₈         ⁹₉         ⁰₀       
-//XP_DRA_BA  XP_DRA_BB  XP_DRA_BC  XP_DRA_BD  XP_DRA_BE  XP_DRA_BF  XP_DRA_BG  XP_DRA_BH  XP_DRA_BI  XP_DRA_BJ
-//
-//      <pink2        , <pinky   , <ring   , <middl  , <index  , <indx2 |, indx2>         , index>  , middl>  , ring>   , pinky>      , pink2>  ,
-//                    ,          ,         ,         ,         , -*-   <|,>               ,         ,         ,         ,             ,         ,
-        OTHER_BASE_GO , CTO_NUMS , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_KP_EQUAL    , KC_KP_7 , KC_KP_8 , KC_KP_9 , KC_KP_MINUS , KC_BSPC ,
-        KC_LCTL       , XXXXXXX  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_KP_ASTERISK , KC_KP_4 , KC_KP_5 , KC_KP_6 , KC_KP_PLUS  , KC_RCTL ,
-        KC_LSFT       , XXXXXXX  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_KP_SLASH    , KC_KP_1 , KC_KP_2 , KC_KP_3 , KC_KP_COMMA , KC_RSFT ,
-//      ------------------------------------------------------------------------------------------------------------------------------------
-        KC_LALT 
-
-#     ifdef TRANSMINIVAN_LEFTSIDE
-                , TRANS_LEFT  
-#     endif
-
-#     ifdef MORE_KEY__COMMAND
-                , MORE_key1
-#     endif
-
-                , KC_DEL     , KC_TAB , KC_KP_ENTER
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                                    , TRANS_MIDLEFT
-#     endif
-
-                                                    , KC_NUM , KC_KP_0 
-
-// See comment on the first layout in this file (double handed Base layer), about the next few keys:
-// ---⬇
-
-#     ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                           , TRANS_RIGHT   
-#     endif                                                                                     
-                                                                                            
-#     ifdef MORE_KEY__ARROW                                                                     
-                                                                         //, MORE_key2   
-                                                                           , KC__YGUI
-#     endif                                                                                                 
-// ---⬆
-                                                                           , KC_KP_DOT  
-
-                                                                                         , KC_RALT
-//              ,            ,        ,           <|,>           ,         ,             ,
-//   <1  ± ±    , <2         , <3     , <4         |, 4>         , 3> ± ±  , 2>          ,       1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-    [ _ALT_NSY ] = LAYOUT_redefined (
-
-/*
-     
-     * Layer Numbers Pad on Base:
-     *        This layer is the same as the above, except the numbers are in super-/sub-script.
-     *
-     
-     Layer _ALT_NSY (Number pad, with NumLock on/off)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     BASE     xxx   xxx   xxx   xxx   xxx   | =     ⁷₇    ⁸₈    ⁹₉   -   Bspc
-     LCtl     xxx   xxx   xxx   xxx   xxx   | *     ⁴₄    ⁵₅    ⁶₆   +   RCtl
-     LSht     xxx   xxx   xxx   xxx   xxx   | /     ¹₁    ²₂    ³₃   ,   RSht  
-     ------------------------------------------------------------------------
-                   LAlt   Del    Tab   Ent  | xxx   ⁰₀    .DEL  RAlt      
-                                           <|>           
-                   <1   ±  <2    <3    <4   | 4>    3> ±  2>    1>  
-                        …                   |          …¹                 
-
-     ₁) Note anomaly: additional hardware key ‛arrow’ shifted one to the left.
-
-*/
-
-//High/low numbers guide:
-//¹₁         ²₂         ³₃         ⁴₄         ⁵₅       | ⁶₆         ⁷₇         ⁸₈         ⁹₉         ⁰₀       
-//XP_DRA_BA  XP_DRA_BB  XP_DRA_BC  XP_DRA_BD  XP_DRA_BE  XP_DRA_BF  XP_DRA_BG  XP_DRA_BH  XP_DRA_BI  XP_DRA_BJ
-//
-//      <pink2   , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>         , index>    , middl>    , ring>     , pinky>      , pink2>  ,
-//               ,         ,         ,         ,         , -*-   <|,>               ,           ,           ,           ,             ,         ,
-        CTO_BASE , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_KP_EQUAL    , XP_DRA_BG , XP_DRA_BH , XP_DRA_BI , KC_KP_MINUS , KC_BSPC ,
-        KC_LCTL  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_KP_ASTERISK , XP_DRA_BD , XP_DRA_BE , XP_DRA_BF , KC_KP_PLUS  , KC_RCTL ,
-        KC_LSFT  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_KP_SLASH    , XP_DRA_BA , XP_DRA_BB , XP_DRA_BC , KC_KP_COMMA , KC_RSFT ,
-//      -----------------------------------------------------------------------------------------------------------------------------------
-        KC_LALT 
-
-#     ifdef TRANSMINIVAN_LEFTSIDE
-                 , TRANS_LEFT   
-#     endif
-
-#     ifdef MORE_KEY__COMMAND
-                 , MORE_key1
-#     endif
-
-                 , KC_DEL     , KC_TAB , KC_KP_ENTER
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                       , TRANS_MIDLEFT
-#     endif
-
-                                                       , XXXXXXX , XP_DRA_BJ
-
-// See comment on the first layout in this file (double handed Base layer), about the next few keys:
-// ---⬇
-
-#     ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                             , TRANS_RIGHT
-#     endif                                                                              
-                                                                                     
-#     ifdef MORE_KEY__ARROW                                                              
-                                                                           //, MORE_key2   
-                                                                             , KC__YGUI
-#     endif                                                                                          
-// ---⬆
-                                                                                         , KC_KP_DOT    
-
-                                                                                         , KC_RALT
-//               ,            ,        ,             <|,>        ,           ,           ,
-//      <1  ± ±  , <2         , <3     , <4           |, 4>      , 3>  ± ±   , 2>        ,       1>
-
-                      ),
-
-# endif // NUMPAD_BASE_SINGLE 
-
-        /* ⬆⬇ */
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.h b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.h
deleted file mode 100644
index d4440721ff6..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2020 by Jos Boersema
- *
- */
-
-#pragma once
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-        /*                      ➡ Number pad Configuration ⬅
-         *
-         * This concerns this Base layer in the shape of a numerical key pad, not the numerical
-         * key pad layer which is part of the common layer system, which is defined and configured
-         * elsewhere (see ./user_config.h).
-         *
-         * _Activate_ the below to have a single keypad definition on this layer, for the right
-         * hand. Modifiers are also defined.
-         * _Remove_ the below to have two keypad definitions on this Base layer, one for each hand.
-         *
-         * In both cases, you can reach the accompanying number pad layer with the super-/sub-script
-         * numbers. For either option, there is a matching * super-/sub-script layer, which is
-         * automatically compiled with it.
-         */
-  #define NUMPAD_BASE_SINGLE // _Activate_ to resemble a one handed numerical keyboard, for right hand.
-                             // _Remove_ to have two numerical key pads, side by side, one for each hand.
-                             //
-        /* Tip: When in doubt it might be best to choose the single handed layer, because it
-         * resembles a regular keyboard more, and has modifier combinations.
-         */
-
-
-        /*                      ➡ Removing the numbers pad _PAD layer ⬅
-         *
-         * You may have no use for this common layer, if you have a numerical
-         * keypad on the Alternate Base already.
-         *
-         * While _PAD layer gives quick uncluttered access to Control, Shift and Alt
-         * to modify your pointer device input, the _MOV layer does the same. You
-         * end up with the same functionality, with or without _PAD, in this matter.
-         *
-         * This does precisely the same as REMOVE_PAD in ./user_config.h, but this
-         * setting here overrides any setting in ./user_config.h
-         */
-//#define REMOVES_PAD // _Activate_ to strip out the _PAD layer, _remove_ to have the _PAD layer.
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-        /*                            Redefine a layer in this file
-         *
-         * _Activate_ one or more of the below BASESFILE_LAYER_..., to redefine the layer
-         * in this file. The version in ./keymap.c will be ignored. Keep in mind to use
-         * transparent keys (_______) for “hold” layer switch keys on the BASE map, for
-         * your new layer.
-         */
-// #define BASESFILE_LAYER_ACC 
-// #define BASESFILE_LAYER_DRA 
-// #define BASESFILE_LAYER_BON 
-// #define BASESFILE_LAYER_PAD 
-// #define BASESFILE_LAYER_MOV 
-// #define BASESFILE_LAYER_RAR 
-// #define BASESFILE_LAYER_FUN 
-
-
-// The below sets some things up based on the above #defines.
-
-// Stripping out _PAD layer, sets the #define used global configuration file ./user_config.h
-# ifdef REMOVES_PAD         // this file
-#     ifndef REMOVE_PAD     // user_config.h
-#         define REMOVE_PAD  // removes _PAD layer
-#     endif
-# endif
-// Inserting the _PAD layer, even if stripped in ./user_config.h
-# ifndef REMOVES_PAD         // this file
-#     ifdef REMOVE_PAD       // user_config.h
-#         undef REMOVE_PAD   // activtaes _PAD layer
-#     endif
-# endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.md
deleted file mode 100644
index 0ebe9a29d97..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_numpad.md
+++ /dev/null
@@ -1,364 +0,0 @@
-# Minifan layout
-
-Compile options
----------------
-
-In ![./base_numpad.h](./base_numpad.h) this base layout is configured.
-
-• Single numpad.
-
-This number pad choice only has a number pad for the right hand. The
-usual modifiers are in their expected places.
-
-The single numbers pad variation is also a compile option for the _common
-layer_ `_PAD`, albeit without a super/subscript auxilery layer.
-
-• Dual numpad.
-
-This numbers pad choice has a number pad for each hand. There are two 
-number pads together on the keyboard at once.
-
-Numpad keymaps
-==============
-
-Single numpad
--------------
-
-──────────Numpad───────────────
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_base_layer_numpad_single_vd.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_nsy_layer_numpad_single_vd.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-The otherwise ‛common’ layers are not directly available in this special layout.
-You can still reach them as normal through your other Base layer.
-
-For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-
-![Minivan illustration Overview layers by key, Numpad single](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_numpad_single_2000_vi.jpg)
-
-
-Layers (text)
-
-     Layer _ALT_BASE (Number pad, with NumLock on)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     !AlterGo NUMS: xxx   xxx   xxx   xxx   | =     7     8     9    -   Bspc  // NUMS: to ¹/₁
-     LCtl     xxx   xxx   xxx   xxx   xxx   | *     4     5     6    +   RCtl
-     LSht     xxx   xxx   xxx   xxx   xxx   | /     1     2     3    ,   RSht  
-     ------------------------------------------------------------------------
-                   LAlt   Del    Tab   Ent  | NumL  0     .     RAlt      
-                                           <|>           
-                   <1   ±  <2    <3    <4   | 4>    3> ±  2>    1>  
-                      LGUI                  |        RGUI¹
-
-     Layer _ALT_BASE (Number pad, with NumLock off)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring >pin>pink2>
-                                           <|>
-     !AlterGo NUMS: xxx   xxx   xxx   xxx   | =     Home  Up    PgUp  -   Bspc  // NUMS: to ¹/₁
-     LCtl     xxx   xxx   xxx   xxx   xxx   | *     Left  5     Right +   RCtl  // modified 5
-     LSht     xxx   xxx   xxx   xxx   xxx   | /     End   Down  PgDn  ,   RSht  
-     -------------------------------------------------------------------------
-                   LAlt   Del    Tab   Ent  | NumL  Ins   Del   RAlt      
-                                           <|>
-                   <1   ±  <2    <3    <4   | 4>    3> ±  2>    1>  
-                        ^                   |          ^
-                       LGUI                 |         RGUI¹         
-
-
-     ₁) Note anomaly: additional hardware key ‛arrow’ shifted one to the left.
-
-- - -
- 
-     Layer _ALT_NSY (Number pad, with NumLock on/off)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     BASE     xxx   xxx   xxx   xxx   xxx   | =     ⁷₇    ⁸₈    ⁹₉   -   Bspc
-     LCtl     xxx   xxx   xxx   xxx   xxx   | *     ⁴₄    ⁵₅    ⁶₆   +   RCtl
-     LSht     xxx   xxx   xxx   xxx   xxx   | /     ¹₁    ²₂    ³₃   ,   RSht  
-     ------------------------------------------------------------------------
-                   LAlt   Del    Tab   Ent  | xxx   ⁰₀    .DEL  RAlt      
-                                           <|>           
-                   <1   ±  <2    <3    <4   | 4>    3> ±  2>    1>  
-                        ^                   |          ^
-                       LGUI                 |         RGUI¹
-
-     ₁) Note anomaly: additional hardware key ‛arrow’ shifted one to the left.
-
-Dual numpad
------------
-
-![Minivan layout all](http://socialism.nl/misc/minivan/minivan_keycapview_numpad_double_vg.jpg)
-
-──────────Numpad───────────────
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_base_layer_numpad_double_vg.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_nsy_layer_numpad_double_vd.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-The otherwise ‛common’ layers are not directly available in this special layout.
-You can still reach them as normal through your other Base layer.
-
-For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-
-![Minivan illustration Overview layers by key, Numpad double](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_numpad_double_2000_vi.jpg)
-
-
-Layers (text)
-
-        ───────────────Numpad────────────────
-
-     Layer _..._BASE (Number pad, square layout)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     !AlterGo Bspc  7     8     9     -     | Bspc  7     8     9    -   Bspc  //!AlterGo: to _DEF_BASE
-     =         *    4     5     6     +     | *     4     5     6    +      =
-     _NSY¹     /    1     2     3     ,     | /     1     2     3    ,   _NSY¹ 
-     ------------------------------------------------------------------------
-                   xxx     0     .     Ent  | NumL  0     .     Ent
-                                           <|>
-                   <1   ±  <2    <3    <4   | 4>    3> ±  2>    1>  
-                        ^                   |          ^
-                       LGUI                 |         RGUI²
-
-     Layer _..._BASE (Number pad, with NumLock off)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring >pin>pink2>
-                                           <|>
-     !AlterGo Bspc  Home  Up    PgUp  -     | Bspc  Home  Up    PgUp  -   Bspc  //!AlterGo: to _DEF_BASE 
-     =         *    Left  5     Right +     | *     Left  5     Right +      =  // modified 5
-     _NSY¹     /    End   Down  PgDn  ,     | /     End   Down  PgDn  ,   _NSY¹
-     -------------------------------------------------------------------------
-                   xxx     Ins   Del   Ent  | NumL  Ins   Del   Ent
-                                           <|>
-                   <1   ±  <2    <3    <4   | 4>    3>  ± 2>    1>  
-                        ^                   |           ^
-                       LGUI                 |          RGUI²
- 
-     ₁) Toggle to the accompanying Super-Sub-Script (_NSY) layer.
-     ₂) Note anomaly: additional hardware key ‛arrow’ shifted one to the left.
-
-- - -
-
-     Layer _..._BASE (super-/sub-script numbers, Numlock on/off)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     BASE     Bspc  ⁷₇    ⁸₈    ⁹₉    -     | Bspc  ⁷₇    ⁸₈    ⁹₉   -   Bspc
-     =         *    ⁴₄    ⁵₅    ⁶₆    +     | *     ⁴₄    ⁵₅    ⁶₆   +      =
-     LSht      /    ¹₁    ²₂    ³₃    ,     | /     ¹₁    ²₂    ³₃   ,   RSht
-     -*-                                   <|>                            -*- //(toggle) Access on Base
-     ------------------------------------------------------------------------
-                   xxx    ⁰₀     .DEL  Ent  | xxx   ⁰₀    .DEL  Ent  
-                                           <|>      
-                   <1   ±  <2    <3    <4   | 4>    3>  ± 2>    1>  
-                        ^                   |           ^
-                       LGUI                 |          RGUI¹
-
-     ₁) Note anomaly: additional hardware key ‛arrow’ shifted one to the left.
-
-
-Special Base layer Numpad
-=========================
-
-This is a layout resembling a “numbers pad”. A “numbers pad”
-is a separate square on a 100% sized keyboard, or separate keypad.
-
-Unlike more usual base layers choices, which typically contain a letters
-layout and access to all the common layers, this ‛Base’ layer is
-quite different. Once you have switched to it, you lack keys to access
-all ‛common’ layers. 
-
-You can only switch back to your ‛regular’ base layer, or switch to a
-second form of the numbers pad. This second layer is called “auxilery”
-layer here, but technically it is the same thing as the numbers/symbols
-`_NSY` layer, which accompanies a letters layer like Qwerty or Dvorak.
-
-Use the top left key from the numbers pad layer, to switch back to the
-other ‛Base’ layer. This is also unique to this special ‛Base’ layer,
-but similar to the way the “common layers” switch back to Base.
-
-The other Base layer (once you are in this Number Pad layer) for most
-people will be a letters layer with Qwerty, Dvorak or some other layout
-on it, in which the keyboard will start up.  To reach the numbers pad
-Base layer, use the key ‛Other Base’ on the `_RAR` layer.
-
-
-Led colors
-----------
-
-The led colors for this ‛Base’ layer are different from the usual. They show
-the state of the Numbers Lock, on or off. Colors are green/light-blue/blue to
-indicate Numbers Lock is off, which means the navigation cluster is active.
-Colors are blue/light-blue/green to indicate the Numbers Lock is on,
-meaning you can type numbers. 
-
-This follows the same scheme as the `_PAD` layer, which in turn follows
-the logic of the `_NSY` (numbers/symbols) layer being blue, and the `_MOV`
-(movement/navigation) layer being green, in such a way that the left most
-led is the indicator thereof, following reading direction left to right. The
-brightness of the leds is diminished, to indicate the difference with `_PAD` 
-layer (whether or not that layer is compiled).
-
-
-Auxilery numpad layer
----------------------
-
-With the numbers pad layer comes a second layer, as is normal for
-all Base layer choices. This second layer is the same as the normal
-numbers pad, except the numbers are in super- ⁽¹²³⁾ or sub-script
-₍₁₂₃₎. 
-
-The numbers on the second layer become subscript when Shift is pressed,
-otherwise they are in super-script. These super-/sub-script forms of the
-numbers Unicode (see the `_RAR` layer).
-
-This second form of numbers pad is reached from keys on the numbers pad
-Base layer. You can switch back to the regular numbers pad, with the
-upper/left key.  Another key stroke from there on the upper/left key,
-will bring you back to what is likely your regular typing layer.
-
-
-Auxilery numpad layer led colors
---------------------------------
-
-For the second layer that comes with it, with super-/sub-script numbers,
-the led colors are what they “normally” are (for other compile
-choices) for this layer (the ‛Alternate‛ Base accompanying layer,
-usually numbers/symbols): blue/blue/light-blue.  There is no indication
-of Numbers Lock on this layer, although a few keys are altered by Numbers
-Lock (Dot/Delete ‛.’, and Enter).
-
-
-‛Arrow’ additional hardware key
-===============================
-
-Unlike with other layers: the optional ‛arrow’ hardware key on the
-right hand is not inserted between the last and second last keys on the
-right, and neither is it set to the configurable default value (toggle
-`_MOV` layer). Instead, this key is inserted one key over to the left,
-and it is set to GUI.
-
-The reason is that this GUI will line up with the GUI on the ‛Base’
-layer. If combined with the ‛command’ hardware key on the right, set
-to the other GUI, you can reach all Numbers Pad keys with all modifiers,
-including both GUIs.
-
-Another reason is that a typical use of the additional hardware
-key on the right (called ‛Arrow’) will by default lead to a navigation
-layer, however the Numbers Pad already has its own navigation. To add
-a toggle to `_MOV` would be a matter of convenience, whereas not being
-able to reach all Numbers Pad keys with either GUI could represent a
-serious problem.
-
-Downsides to this design are the loss of default ‛Arrow’ hardware key
-use on this layer, and a sort of gap of one key in the Numbers Pad layout.
-The downsides seem to be matters of style and convenience, whereas not 
-being able to type whatever you can on a 100% keyboard could be a serious
-problem for someone (keyboard shortcuts mainly).
-
-There is no default solution to type everything with all modifiers
-including the GUIs, without adding the additional hardware key(s).
-Obviously it is possible to just stick a GUI on a free spot, but that 
-makes things chaotic. Single pad Numbers Pad could be re-arranged to
-make room for GUI, which would loose more of its similarity to other 
-keyboards.
-
-
-Numbers pads everywhere ?
-=========================
-
-Perhaps the amount of options for a numberical keypad are a bit overkill.
-It had to do with how it developed.
-
-For some overview of your options:
-
-     ①  Common layer numerical keypad. Just another layer, like `_RAR`, `_BON`, etc.
-
-       1. You can have a numerical keypad in the _common layers._
-       2. You can also remove this layer entirely.
-
-       3. This “common layers” numbers pad is activated through the Base layer, on Left Shift tap.
-       4. Returns to ‛Default Base’ with upper/left key.
-
-       5. Variation of form: right hand square form, resembling a key pad on
-                             other keyboards.
-       6. Variation of form: the numbers in a straight line, resembling the 
-                            `_NSY` layer and other layers.
-
-     ② A numerical keypad on the other ‛Base’ layer, in the dual layout system.
-
-       1. You can have a numerical keypad on the ‛Alternate Base’ position.
-       2. You can also put something different on ‛Alternate Base’, such as a
-          Colemak layout.
-
-       3. This layer is activated through the `_RAR` layer, by choosing ‛Other
-          Base’. 
-       4. Returns to ‛Default Base’ with upper/left key, effectively the same as with
-          the common numerical keypad layer, and all other common layers.
-    
-       5. Variation of form: right hand square form, resembling a key pad on
-                             other keyboards.
-       6. Variation of form: dual handed square form, so you have a key pad for
-                             each hand.
-
-       7. For all variation of form, there is an accompanying layer which is
-          the same, except the numbers are in Unicode super (unshifted) and
-          sub-script (shifted).
-
-Some examples:
-
-①  As close to a 100% ‛regular’ keyboard as possible.
-
-  If you have no use for ‛Alternate Base’ with anything else, you could put
-  the single handed numerical keypad there, and remove the common `_PAD` layer
-  to have less mental clutter.
-
-  This makes accessing `_MOV` on Left Shift easier, you have modifiers with 
-  the numerical keypad, and you have super/sub-script as well (although its use
-  is probably rather rare).
-
-②  The predictable numbers typing option.
-
-  If you want ‛Alternate Base’ to have something else (or nothing
-  at all), keep the `_PAD` layer, and choose straight line numbers,
-  so that you don't have to learn a second way to type numbers, if you
-  ever have a need to type keypad numbers (which could be quite rare).
-
-  In this version, you are not envisioning the use of keypad navigation,
-  but rather use regular `_MOV` layer navigation. (This was the original
-  programming on the keyboard, before more options developed; it follows
-  the overall logic that the same or similar keys are in the same or
-  similar positions.)
-
-③  The everything option.
-
-  You could keep both `_PAD` with straight lined up numbers if you like typing
-  all numbers the same way, and also compile numpad single square on ‛Alternate
-  Base’ to have good access to a regular numerical keypad, should you ever need
-  it, and/or to have an easier to access navigation cluster there (easier than
-  navigation on the straight line numpad variation that is, where navigation
-  is difficult). 
-
-④  The numerical keyboard specialist.
-
-  You could compile it for both hands, if you type so much on a numerical 
-  keypad, that it is useful to be fast on it with either hand. 
-
-  It will be harder to type on the double numerical keyboard with modifiers 
-  (Shift, Control, Alt), but if you compile with the common numbers pad layer, 
-  you can reach such combinations there. To keep things similar, you can compile
-  this common numbers pad layer with numbers in square form, rather than a straight
-  line.
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.c
deleted file mode 100644
index 0814070f3d3..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2020 by Jos Boersema
- *
- */
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-
-        /*                            Redefine a layer in this file
-         *
-         * _Activate_ one or more of the below BASESFILE_LAYER_..., to redefine the layer
-         * in this file. The version in ./keymap.c will be ignored. Keep in mind to use
-         * transparent keys (_______) for “hold” layer switch keys on the BASE map, for
-         * your new layer.
-         */
-// #define BASESFILE_LAYER_ACC 
-// #define BASESFILE_LAYER_DRA 
-// #define BASESFILE_LAYER_BON 
-// #define BASESFILE_LAYER_PAD 
-// #define BASESFILE_LAYER_MOV 
-// #define BASESFILE_LAYER_RAR 
-// #define BASESFILE_LAYER_FUN 
-
-        /*  ⬇ */
-
-    /* Layer _..._BASE: Qwerty, normal BASE layer and 'default' layer
-     *
-     * - Dual use keys create a delay in the key (tap/hold keys), therefore
-     *   space is not dual use (most ued key), neither is hyphen.
-     */ 
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_QWERTY__DEF_BASE)
-    [ _DEF_BASE ] = LAYOUT_redefined (
-# elif defined(BASE_QWERTY__ALT_BASE)
-    [ _ALT_BASE ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._BASE (Letters). This is Qwerty 
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        qQ    wW    eE    rR    tT    | yY    uU    iI    oO    pP         Bksp
-         Tab+LCtl   aA    sS    dD    fF    gG    | hH    jJ    kK    lL    ;:           '"
-         LSht+_PAD  zZ    xX    cC    vV    bB    | nN    mM    ,<    .>    /?    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) LGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (RGUI)                                                               (_MOV)
-
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-*/
-//
-//      <pink2            , <pink, <ring, <midd, <indx, <ind|, indx>, inde>, midd>   , ring>  , pink>   , pink2>        ,
-//      -*!-              ,      ,      ,      ,      ,    <|,>     ,      ,         ,        ,         ,               ,
-        KC_ESC            , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I    , KC_O   , KC_P    , KC_BSPC       ,
-        LCTL_T ( KC_TAB ) , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K    , KC_L   , KC_SCLN , KC_QUOT       ,
-        CHOLTAP_LSHFT     , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH , CHOLTAP_RSHFT ,
-//      -----------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , MO ( _PAD )
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1_BASE
-# endif
-
-# ifdef SWITCH_HOLD_ACC_NSY 
-                           , DUO_HOLD , CHOLTAP_ACCE 
-# else
-                           , CHOLTAP_ACCE , DUO_HOLD
-# endif
-
-                                                     , LEFTCENTER_THUMB
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                                     , TRANS_MIDLEFT
-# endif
-
-                                                                       , RIGHTCENTER_THUMB , DUO_HOLD , KC__YGUI
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                                                            , MO ( _FUN )
-# endif                                                                                               
-                                                                                                      
-# ifdef MORE_KEY__ARROW                                                                               
-                                                                                                                            , MORE_key2  
-# endif                                                                                               
-                                                                                                      
-                                                                                                                            , CHOLTAP_LAYR
-//                         ,              ,          ,               <|,>                             ,          ,          ,
-//      <1           ±  ±  , <2           , <3       , <4             |, 4>                           , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-    /* Layer _..._NSY: Numbers and symbols, to work with the Qwerty base layer above.
-     *          Off hand Number input (-.Bksp ent (shft)tab).
-     */
-    // KC_TILD does not work there, because of a limitation with shifted keys (nov 2019).
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_QWERTY__DEF_BASE)
-    [ _DEF_NSY ] = LAYOUT_redefined (
-# elif defined(BASE_QWERTY__ALT_BASE)
-    [ _ALT_NSY ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._NSY (Numbers and SYmbols). This fits the above Qwerty layer _..._BASE
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    -_    \|    =+    | +     |     _     {     }   ~+RSht 
-                          ^^                              ^  // Only differences with normal version _..._NSY
-     ---------------------------------------------------------------------------
-     Left+LAlt ___   ___   Ent  | .   ___   LGUI  Right+RAlt
-                     -*-       <|>    -*-                                         //(hold) Access on _..._BASE
-       <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-            ^                                   ^
-          (RGUI)                              (_MOV)
-*/
-//
-//
-//      <pink2             , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>  , index>  , middl>  , ring>   , pinky>  , pink2>             ,
-//                         , -*-     ,         ,         ,         ,       <|,>        ,         ,         ,         ,         ,                    ,
-        CTO_BASE           , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL             ,
-        LCTL_T ( KC_TAB )  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0
-// Harmonizes with ‛Qwerty Base Arrow’, so that if both are compiled, the user isn't
-// messing up this key on this Qwerty layout, which has to be different in the other Qwerty.
-# ifdef QWERTY_BASEARROW_HARMONIZE
-                                                                                                                               , KC_SLSH            , // Same as in ‛Qwerty Base Arrow’. A ‛`’ exists on _BON also.
-# else
-                                                                                                                               , RCTL_T ( KC_GRV )  , // Default
-# endif
-        LSFT_DASH          , KC_LBRC , KC_RBRC , KC_MINS , KC_BSLS , KC_EQL  , KC_PLUS , KC_PIPE , KC_UNDS , KC_LCBR , KC_RCBR , RSFT_TILDE         ,  
-//      ---------------------------------------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , XXXXXXX
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1  
-# endif
-
-                           , _______ , _______ , KC_ENT
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                               , TRANS_MIDLEFT  
-# endif
-
-                                                               , KC_DOT , DUO_HOLD , KC__YGUI  
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                              , XXXXXXX
-# endif                                                                                       
-                                                                                              
-# ifdef MORE_KEY__ARROW                                                                       
-                                                                                              , MORE_key2  
-# endif                                                                                       
-                                                                                              
-                                                                                              , RALT_T ( KC_RGHT )
-//                         ,         , -*-     ,             <|,>       , -*-      ,          ,
-//      <1           ±  ±  , <2      , <3      , <4           |, 4>     , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.md
deleted file mode 100644
index 6eda191754a..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# Minifan layout
-
-Compiled for: Qwerty
-====================
-
-This file details the compile version `#define BASE_QWERTY__DEF_BASE, BASE_QWERTY__ALT_BASE`.
-This is a Qwerty layout.
-
-Dual layout combination with Qwerty Base Arrow
-==============================================
-⚠ If you also compile `base_qwerty_basearrow`, the key for `/?` on `_NSY` layer in that
-`base_qwerty_basearrow` layout, will be replicated in _this_ Qwerty layout on the `_NSY`
-layer. It will displace the key `RCTL_T ( KC_GRV )`. Right Control, unless tapped for
-‛\`’ or tapped with shift for ‛~’ ➡ becomes `/?` (slash/questionmark). 
-
-The reason for this is that when you switch from one or the other Qwerty variation
-(with or without arrows on ‛Base’ layer), it will likely be confusing to type ‛/?’
-on that key in one version of Qwerty, and suddenly get a ‛\`~’ in the other. The reason
-it is not in the normal position on ‛Qwerty Base Arrow’, is because it gets displaced
-by ‛Up Arrow’. 
-
-You will likely switch from the Base Arrow variation to the regular version, due to a need
-for the row of keys displaced by the arrow cluster, or the other way around to get Base
-access to the arrows, rather than a need for this side effect: ‛/?’ being substituted for
-‛\`~’.
-
-This means you will loose `_NSY` layer access to ‛\`’, in both versions of Qwerty. You will
- have to use the key for ‛\`~’ on the `_BON` layer, which is an uncluttered version of this 
-key (it repeats). It also means that you have two keys toward ‛/?’ in standard Qwerty: the
-default position for Qwerty, and this additional one to harmonize with ‛Qwerty Base Arrow’.
-
-This harmonization can be disabled in ![./base_qwerty_basearrow.h](./base_qwerty_basearrow.h),
-with `QWERTY_BASEARROW_HARMONIZE`.
-
-See also: ![./base_qwerty_basearrow.md](./base_qwerty_basearrow.md)
-
-Qwerty keymaps
---------------
-
-──────────Qwerty───────────────
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_base_layer_qwerty_ve.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_nsy_layer_qwerty_vc.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-(…)
-
-For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-
-![Minivan illustration Overview layers by key, Qwerty](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_qwerty_2000_vi.jpg)
-
-Layers (text)
-=============
-
-        ───────────────Qwerty─────────────────
-
-         Layer _..._BASE (Letters). This is standard Qwerty 
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        qQ    wW    eE    rR    tT    | yY    uU    iI    oO    pP         Bksp
-         Tab+LCtl   aA    sS    dD    fF    gG    | hH    jJ    kK    lL    ;:           '"
-         LSht+_PAD  zZ    xX    cC    vV    bB    | nN    mM    ,<    .>    /?    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _DEF_NSY(_DRA)  Enter+_MOV| Space  _DEF_NSY(_DRA) RGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (LGUI)                                                               (_MOV)
-
-     ₁) Dual hold for _DRA, single hold for _DEF_NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-
-Remarks: The left modifiers have a slight delay in combination with an outside pointer device (mouse, stylus).
-It seems this will be difficult to fix, because it is spread over two devices. To avoid the
-±0.2 second delay, activate a layer where the modifiers are direct (`_PAD`), using the layer toggle on left shift. 
-
-The two keys with ';' (Del;`_ACC`, Right;`_RAR`) do not auto-repeat on double tap, like QMK normal layer-tap keys.
-There is an uncluttered _Delete_ on `_PAD`, an uncluttered _Right_ arrow on the `_MOV` layer.
-
-Holding both `_DEF_NSY` keys left and right of the "split space bar" (enter, space) results in layer `_DRA`.
-
-Holding either one of the just above mentioned `_DEF_NSY` layer keys (<3 and 3>), with the `_ACC` layer key
-(on <2) results in layer `_BON`.
-
-
-- - -
-
-
-     Layer _..._NSY (Numbers and SYmbols). This fits the above Qwerty layer _DEF_BASE
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl // `~+RCtl becomes /? in dual …
-     -+LSht   [{    ]}    -_    \|    =+    | +     |     _     {     }   ~+RSht //  … layout with Qwerty Base Arrow
-     ---------------------------------------------------------------------------
-                 Left+LAlt ___   ___   Ent  | .   ___   RGUI  Right+RAlt
-                                 -*-       <|>    -*-                 u      //(hold) Access on _DEF_BASE
-                   <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-                        ^                                   ^
-                      (LGUI)                              (_MOV)
-
-
-
-- - -
-
-Key associations
-----------------
-Key placement associations between layers for Qwerty.
-
-![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_qwerty_1500_ve.jpg)
-
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.c
deleted file mode 100644
index 674f16c85a8..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2020 by Jos Boersema
- *
- */
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-
-        /*                            Redefine a layer in this file
-         *
-         * _Activate_ one or more of the below BASESFILE_LAYER_..., to redefine the layer
-         * in this file. The version in ./keymap.c will be ignored. Keep in mind to use
-         * transparent keys (_______) for “hold” layer switch keys on the BASE map, for
-         * your new layer.
-         */
-// #define BASESFILE_LAYER_ACC 
-// #define BASESFILE_LAYER_DRA 
-// #define BASESFILE_LAYER_BON 
-// #define BASESFILE_LAYER_PAD 
-// #define BASESFILE_LAYER_MOV 
-// #define BASESFILE_LAYER_RAR 
-// #define BASESFILE_LAYER_FUN 
-
-        /*  ⬇ */
-
-    /* Layer _..._BASE: Qwerty with arrows on Base, normal BASE layer and 'default' layer
-     *
-     * - This version of Qwerty puts arrows on Base, and assumes the 'arrow' hardware key.
-     *   When not compiled with 'arrow' hardware key, Base will not contain ‛down arrow’.
-     *
-     *   This does not mean that this is the recommended version of Qwerty in general for
-     *   the 'arrow' hardware key with Qwerty. Regular Qwerty works with the additional
-     *   hardware key 'arrow'. The regular Qwerty compile option just works differently
-     *   than this version with arrows on Base. Regular qwerty has the additional hardware
-     *   key on the right be a toggle to _MOV layer, where you then have arrows in the same 
-     *   area. Notice further that in all cases, you have a hold key to the _MOV layer under
-     *   what is colloqually known as the ‛left space bar’, which leads to convenient arrow
-     *   keys in the home row.
-     *
-     *   Putting directional arrow keys on the Base layer will cost you several keys on 
-     *   the Base layer: hold _RAR, GUI, and ‛/?’. 
-     *   • The ‛/?’ key is displaced to the _NSY layer.
-     *   • The GUI key is lost. You could decide to also use the ‛south paw’/‛command’ 
-     *     hardware key, which is a GUI by default. 
-     *   • Hold key to _RAR layer is lost. You can only reach _RAR layer, using the right
-     *     shift toggle, which is on a short timer.
-     *
-     *   My recommendation would be: see if you can make things work with regular Qwerty 
-     *   if you are a 10 fingers typist, first. Moving your hand to this arrow cluster 
-     *   seems to be a high cost to pay. You will also loose the default location for ‛/?’.
-     *
-     *   For special need situations regarding this right hand row1/2 arrow cluster, a
-     *   tap to _MOV layer on the ‛arrow’ hardware key, should be a reasonable cost to
-     *   pay, if a situation is already important enough to decide to move your hand there.
-     *   For short uses of arrow keys, holding to the _MOV layer is the most efficient.
-     *
-     *   If you are not a 10 finger typist though, holding a key to _MOV layer seems to be
-     *   inconvenient, and thus arrows on Base could be better for you.
-     *
-     *   Hence my conclusion: only compile ‛Qwerty with arrows on Base’ if the regular
-     *   Qwerty isn't working for you.
-     *  
-     */ 
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_QWERTY_BASEARROW__DEF_BASE)
-    [ _DEF_BASE ] = LAYOUT_redefined (
-# elif defined(BASE_QWERTY_BASEARROW__ALT_BASE)
-    [ _ALT_BASE ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._BASE (Letters). This is Qwerty with arrows on Base
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        qQ    wW    eE    rR    tT    | yY    uU    iI    oO    pP         Bksp
-         Tab+LCtl   aA    sS    dD    fF    gG    | hH    jJ    kK    lL    ;:           '"
-         LSht+_PAD  zZ    xX    cC    vV    bB    | nN    mM    ,<    .>    Up    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) Left    Right
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎                      // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (RGUI)                                                               (Down)
-
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration. Set to Down Arrow.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-*/
-//
-//      <pink2            , <pink, <ring, <midd, <indx, <ind|, indx>, inde>, midd>   , ring>  , pink>   , pink2>        ,
-//      -*!-              ,      ,      ,      ,      ,    <|,>     ,      ,         ,        ,         ,               ,
-        KC_ESC            , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I    , KC_O   , KC_P    , KC_BSPC       ,
-        LCTL_T ( KC_TAB ) , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K    , KC_L   , KC_SCLN , KC_QUOT       ,
-        CHOLTAP_LSHFT     , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM , KC_DOT , KC_UP   , CHOLTAP_RSHFT ,
-                                                                                            //  KC_SLSH
-//      -----------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , MO ( _PAD )
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1_BASE
-# endif
-
-# ifdef SWITCH_HOLD_ACC_NSY 
-                           , DUO_HOLD , CHOLTAP_ACCE 
-# else
-                           , CHOLTAP_ACCE , DUO_HOLD
-# endif
-
-                                                     , LEFTCENTER_THUMB
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                                     , TRANS_MIDLEFT
-# endif
-
-                                                                       , RIGHTCENTER_THUMB , DUO_HOLD
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                                      , MO ( _FUN )
-# endif                                                                                    
-                                                                                           
-                                                                                                                 , KC_LEFT
-                                                                                                              // , KC__YGUI
-                                                                                           
-# ifdef MORE_KEY__ARROW                                                                    
-                                                                                                                 , KC_DOWN
-                                                                                                              // , MORE_key2  
-# endif                                                                                    
-                                                                                           
-                                                                                                                 , KC_RIGHT
-                                                                                                              // , CHOLTAP_LAYR
-//                         ,              ,          ,               <|,>                  ,          ,          ,
-//      <1           ±  ±  , <2           , <3       , <4             |, 4>                , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-    /* Layer _..._NSY: Numbers and symbols, to work with the Qwerty base layer above.
-     *          Off hand Number input (-.Bksp ent (shft)tab).
-     */
-    // KC_TILD does not work there, because of a limitation with shifted keys (nov 2019).
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_QWERTY_BASEARROW__DEF_BASE)
-    [ _DEF_NSY ] = LAYOUT_redefined (
-# elif defined(BASE_QWERTY_BASEARROW__ALT_BASE)
-    [ _ALT_NSY ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._NSY (Numbers and SYmbols). This fits the above Qwerty layer _..._BASE
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)       /?
-     -+LSht   [{    ]}    -_    \|    =+    | +     |     _     {     }   ~+RSht // `~ on _BON
-                          ^^                              ^  // Only differences with normal version _..._NSY
-     ---------------------------------------------------------------------------
-     Left+LAlt ___   ___   Ent  | .   ___   LGUI  Right+RAlt
-                     -*-       <|>    -*-                                         //(hold) Access on _..._BASE
-       <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-            ^                                   ^
-          (RGUI)                              (_MOV)
-*/
-//
-//
-//      <pink2             , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>  , index>  , middl>  , ring>   , pinky>  , pink2>             ,
-//                         , -*-     ,         ,         ,         ,       <|,>        ,         ,         ,         ,         ,                    ,
-        CTO_BASE           , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL             ,
-        LCTL_T ( KC_TAB )  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_SLSH            , 
-        LSFT_DASH          , KC_LBRC , KC_RBRC , KC_MINS , KC_BSLS , KC_EQL  , KC_PLUS , KC_PIPE , KC_UNDS , KC_LCBR , KC_RCBR , RSFT_TILDE         , // note¹
-//      ---------------------------------------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , XXXXXXX
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1  
-# endif
-
-                           , _______ , _______ , KC_ENT
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                               , TRANS_MIDLEFT  
-# endif
-
-                                                               , KC_DOT , DUO_HOLD , KC__YGUI  
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                              , XXXXXXX
-# endif                                                                                       
-                                                                                              
-# ifdef MORE_KEY__ARROW                                                                       
-                                                                                              , MORE_key2  
-# endif                                                                                       
-                                                                                              
-                                                                                              , RALT_T ( KC_RGHT )
-//                         ,         , -*-     ,             <|,>       , -*-      ,          ,
-//      <1           ±  ±  , <2      , <3      , <4           |, 4>     , 3>       , 2>       , ±  ±  1>
-
-// note¹
-// Sacrificing RCTL, because ‛/’ is a major much used symbol,
-// which seem to warrant being uncluttered. ‛`’ exists also on _BON
-// (uncluttered). This breaks the logic that all these standard symbols 
-// exist on this layer _NSY. However, ` and ~ are often in a diminutive 
-// placement on mini keyboards, and ‛arrows on top’ was always going to
-// be a stretch for a keyboard like this. The other option is to have a
-// special macro to put tilde ‛~’ and accent grave ‛`’ both on Shift,
-// but it doesn't seem to make much difference, and makes the firmware
-// even larger.
-                      ),
-
-        /* ⬆⬇ */
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.h b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.h
deleted file mode 100644
index 386a6e593a9..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2021 by Jos Boersema
- *
- */
-
-#pragma once
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-        /*          • Harmonize regular Qwerty
-         * 
-         * If compiling this ‛Qwerty Base Arrow’ base pair with regular Qwerty on
-         * the other base pair (dual layout), the key ‛/?’ on the _NSY layer in
-         * Qwerty Base Arrow, will be replicated in the same spot in regular Qwerty.
-         *
-         * Regular Qwerty will still also have a ‛/?’ key in the normal Qwerty location.
-         * See ./base_qwerty_basearrow.md and ./base_qwerty.md for details.
-         */
-  #define QWERTY_BASEARROW_HARMONIZE // _Activate_ to harmonize the ‛/?’ key in the regular Qwerty layout.
-                                     // _Remove_ leave regular Qwerty layout unchanged from default.
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-
-        /*                            Redefine a layer in this file
-         *
-         * _Activate_ one or more of the below BASESFILE_LAYER_..., to redefine the layer
-         * in this file. The version in ./keymap.c will be ignored. Keep in mind to use
-         * transparent keys (_______) for “hold” layer switch keys on the BASE map, for
-         * your new layer.
-         */
-// #define BASESFILE_LAYER_ACC 
-// #define BASESFILE_LAYER_DRA 
-// #define BASESFILE_LAYER_BON 
-// #define BASESFILE_LAYER_PAD 
-// #define BASESFILE_LAYER_MOV 
-// #define BASESFILE_LAYER_RAR 
-// #define BASESFILE_LAYER_FUN 
-
-        /*  ⬇ */
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.md
deleted file mode 100644
index 889633714a0..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_qwerty_basearrow.md
+++ /dev/null
@@ -1,134 +0,0 @@
-# Minifan layout
-
-Compiled for: Qwerty with arrows on Base
-========================================
-This version of Qwerty puts arrows on Base, and assumes the 'arrow' hardware key.
-
-You have to manually set *#define `MORE_KEY__ARROW`* in `./user_config.h`, 
-to let compilation know you have that additional hardware key.
-
-If not compiled with ‛Arrow’ hardware key, Base will not contain ‛Down arrow’.
-You do not have to worry about what to set the additional hardware key to, on
-the Base layer. This will be set to Down Arrow, to complete that arrow cluster.
-
-Is arrows on Base efficient ?
-=============================
-This variation of Qwerty is not necessarily the recommended version of
-Qwerty for a board with the additional ‛Arrow’ hardware key.
-The regular Qwerty compile option can provide good arrow access. 
-
-Putting directional arrow keys on the Base layer will cost you several
-keys on the Base layer: hold to layer `_RAR` (power, media, etc. layer),
-GUI, and ‛/?’.
-
-• The ‛/?’ key is displaced to the `_NSY` (numbers & symbols) layer, and is not 
-  in the default spot for a Qwerty layout.
-
-• The GUI key is lost. You could decide to also use the ‛south paw’/‛command’ 
-  hardware key, which is a GUI by default. 
-
-• Hold key to `_RAR` layer is lost. You can only reach `_RAR` layer using the
-  right shift toggle, which is on a short timer.
-
-
-Have it both ways
-=================
-You could compile regular Qwerty on one of the Base pairs (‛Default’ or 
-‛Alternate’), and Qwerty _with Arrows on Base_ on the other. That way
-you can switch to see what works for you. You could leave it like
-that, and choose what you want depending on what you are doing. 
-
-Dual layout combination with Qwerty Base Arrow
-==============================================
-The option `QWERTY_BASEARROW_HARMONIZE` in `./base_qwerty_basearrow.h` is set
-by default, causing the key ‛/?’ in the _regular_ Qwerty layout to _also_ be
-located in the same spot as in this ‛Qwerty with Arrows on Base’ layout. 
-
-See also: ![./base_qwerty_basearrow.h](./base_qwerty_basearrow.h).
-See also: ![./base_qwerty.md](./base_qwerty.md) for the reason behind this.
-
-
-Qwerty keymaps
---------------
-
-──────────Qwerty───────────────
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_base_layer_qwerty_basearrow_va.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_nsy_layer_qwerty_basearrow_vb.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-(…)
-
-For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-
-![Minivan illustration Overview layers by key, Qwerty arrows on Base](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_qwerty_basearrow_2000_vj.jpg)
-
-Layers (text)
-=============
-
-        ───────────────Qwerty─────────────────
-
-     Layer _..._BASE (Letters). This is Qwerty with arrows on Base
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        qQ    wW    eE    rR    tT    | yY    uU    iI    oO    pP         Bksp
-         Tab+LCtl   aA    sS    dD    fF    gG    | hH    jJ    kK    lL    ;:           '"
-         LSht+_PAD  zZ    xX    cC    vV    bB    | nN    mM    ,<    .>    Up    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) Left    Right
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎                      // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (RGUI)                                                               (Down)
-
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration. Set to Down Arrow.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-
-Remarks: The left modifiers have a slight delay in combination with an outside pointer device (mouse, stylus).
-It seems this will be difficult to fix, because it is spread over two devices. To avoid the
-±0.2 second delay, activate a layer where the modifiers are direct (`_PAD`), using the layer toggle on left shift. 
-
-The key with ';' (Del;`_ACC`) does not auto-repeat on double tap, like QMK normal layer-tap keys.
-There is an uncluttered _Delete_ on `_PAD`.
-
-Holding both `_DEF_NSY` keys left and right of the "split space bar" (enter, space) results in layer `_DRA`.
-
-Holding either one of the just above mentioned `_DEF_NSY` layer keys (<3 and 3>), with the `_ACC` layer key
-(on <2) results in layer `_BON`.
-
-
-- - -
-
-
-     Layer _..._NSY (Numbers and SYmbols). This fits the above Qwerty layer _..._BASE
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)       /?
-     -+LSht   [{    ]}    -_    \|    =+    | +     |     _     {     }   ~+RSht // See _BON for ‛`’
-                          ^^                              ^  // Only differences with normal version _..._NSY
-     ---------------------------------------------------------------------------
-     Left+LAlt ___   ___   Ent  | .   ___   LGUI  Right+RAlt
-                     -*-       <|>    -*-                                         //(hold) Access on _..._BASE
-       <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-            ^                                   ^
-          (RGUI)                              (_MOV)
-
-
-
-- - -
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_workman.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_workman.c
deleted file mode 100644
index 3a2f4eaa4f7..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_workman.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2021 by Jos Boersema
- *
- */
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-
-// --------------------------------------^---------------------------------------
-//            Below here no more comfortable configuration options.....
-// --------------------------------------^---------------------------------------
-
-
-        /*                            Redefine a layer in this file
-         *
-         * _Activate_ one or more of the below BASESFILE_LAYER_..., to redefine the layer
-         * in this file. The version in ./keymap.c will be ignored. Keep in mind to use
-         * transparent keys (_______) for “hold” layer switch keys on the BASE map, for
-         * your new layer.
-         */
-// #define BASESFILE_LAYER_ACC 
-// #define BASESFILE_LAYER_DRA 
-// #define BASESFILE_LAYER_BON 
-// #define BASESFILE_LAYER_PAD 
-// #define BASESFILE_LAYER_MOV 
-// #define BASESFILE_LAYER_RAR 
-// #define BASESFILE_LAYER_FUN 
-
-        /*  ⬇ */
-
-    /* Layer _..._BASE: Workman, normal BASE layer and 'default' layer
-     *
-     * - Dual use keys create a delay in the key (tap/hold keys), therefore
-     *   space is not dual use (most ued key), neither is hyphen.
-     */ 
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_WORKMAN__DEF_BASE)
-    [ _DEF_BASE ] = LAYOUT_redefined (
-# elif defined(BASE_WORKMAN__ALT_BASE)
-    [ _ALT_BASE ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._BASE (Letters). This is Workman 
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        qQ    dD·   rR·   wW·   bB·   | jJ·   fF·   uU·   pP·   :;·        Bksp
-         Tab+LCtl   aA    sS    hH·   tT·   gG    | yY·   nN·   eE·   oO·   iI·          '"
-         LSht+_PAD  zZ    xX    mM·   cC·   vV·   | kK·   lL·   ,<    .>    /?    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) LGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (RGUI)                                                               (_MOV)
-
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-     ₇) Letters marked by ‛·’ are different from Qwerty.
-*/
-//
-//      <pink2            , <pink, <ring, <midd, <indx, <ind|, indx>, inde>, midd>   , ring>  , pink>   , pink2>        ,
-//      -*!-              ,      ,      ,      ,      ,    <|,>     ,      ,         ,        ,         ,               ,
-        KC_ESC            , KC_Q , KC_D , KC_R , KC_W , KC_B , KC_J , KC_F , KC_U    , KC_P   , KC_SCLN , KC_BSPC       ,
-        LCTL_T ( KC_TAB ) , KC_A , KC_S , KC_H , KC_T , KC_G , KC_Y , KC_N , KC_E    , KC_O   , KC_I    , KC_QUOT       ,
-        CHOLTAP_LSHFT     , KC_Z , KC_X , KC_M , KC_C , KC_V , KC_K , KC_L , KC_COMM , KC_DOT , KC_SLSH , CHOLTAP_RSHFT ,
-//      -----------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , MO ( _PAD )
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1_BASE
-# endif
-
-# ifdef SWITCH_HOLD_ACC_NSY 
-                           , DUO_HOLD , CHOLTAP_ACCE 
-# else
-                           , CHOLTAP_ACCE , DUO_HOLD
-# endif
-
-                                                     , LEFTCENTER_THUMB
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                                     , TRANS_MIDLEFT
-# endif
-
-                                                                       , RIGHTCENTER_THUMB , DUO_HOLD , KC__YGUI
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                                                 , MO ( _FUN )
-# endif                                                                                    
-                                                                                           
-# ifdef MORE_KEY__ARROW                                                                    
-                                                                                                                 , MORE_key2  
-# endif                                                                                    
-                                                                                           
-                                                                                                                 , CHOLTAP_LAYR
-//                         ,              ,          ,               <|,>                  ,          ,          ,
-//      <1           ±  ±  , <2           , <3       , <4             |, 4>                , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
-
-    /* Layer _..._NSY: Numbers and symbols, to work with the Workman base layer above. (Same as Qwerty.)
-     *          Off hand Number input (-.Bksp ent (shft)tab).
-     */
-    // KC_TILD does not work there, because of a limitation with shifted keys (nov 2019).
-
-// Process user configuration wrt ‛Default’ or ‛Alternative’ spot for this layout.
-# if   defined(BASE_WORKMAN__DEF_BASE)
-    [ _DEF_NSY ] = LAYOUT_redefined (
-# elif defined(BASE_WORKMAN__ALT_BASE)
-    [ _ALT_NSY ] = LAYOUT_redefined (
-# endif
-
-/*
-     Layer _..._NSY (Numbers and SYmbols). This fits the above Workman layer _..._BASE
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    -_    \|    =+    | +     |     _     {     }   ~+RSht 
-                          ^^                              ^  // Only differences with normal version _..._NSY
-     ---------------------------------------------------------------------------
-     Left+LAlt ___   ___   Ent  | .   ___   LGUI  Right+RAlt
-                     -*-       <|>    -*-                                         //(hold) Access on _..._BASE
-       <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-            ^                                   ^
-          (RGUI)                              (_MOV)
-*/
-//
-//
-//      <pink2             , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>  , index>  , middl>  , ring>   , pinky>  , pink2>             ,
-//                         , -*-     ,         ,         ,         ,       <|,>        ,         ,         ,         ,         ,                    ,
-        CTO_BASE           , KC_EXLM , KC_AT   , KC_HASH , KC_DLR  , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL             ,
-        LCTL_T ( KC_TAB )  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , RCTL_T ( KC_GRV )  ,
-        LSFT_DASH          , KC_LBRC , KC_RBRC , KC_MINS , KC_BSLS , KC_EQL  , KC_PLUS , KC_PIPE , KC_UNDS , KC_LCBR , KC_RCBR , RSFT_TILDE         ,  
-//      ---------------------------------------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , XXXXXXX
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1  
-# endif
-
-                           , _______ , _______ , KC_ENT
-
-# ifdef TRANSMINIVAN_MIDLEFT
-                                               , TRANS_MIDLEFT  
-# endif
-
-                                                               , KC_DOT , DUO_HOLD , KC__YGUI  
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                              , XXXXXXX
-# endif                                                                                       
-                                                                                              
-# ifdef MORE_KEY__ARROW                                                                       
-                                                                                              , MORE_key2  
-# endif                                                                                       
-                                                                                              
-                                                                                              , RALT_T ( KC_RGHT )
-//                         ,         , -*-     ,             <|,>       , -*-      ,          ,
-//      <1           ±  ±  , <2      , <3      , <4           |, 4>     , 3>       , 2>       , ±  ±  1>
-
-                      ),
-
-        /* ⬆⬇ */
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_workman.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_workman.md
deleted file mode 100644
index 2d68e2ea06c..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/base_workman.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Minifan layout
-
-Compiled for: Workman
-=====================
-
-This file details the compile version `#define BASE_WORKMAN__DEF_BASE, BASE_WORKMAN__ALT_BASE`.
-This is a Workman layout. 
-
-The number & symbols layer (`_NSY`) is the same as for Qwerty.
-
-Workman keymaps
----------------
-
-─────────Workman───────────────
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_base_layer_workman_va.jpg)
-Layer: `..._BASE`
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_nsy_layer_qwerty_vc.jpg)
-Layer: `..._NSY`
-
-──────────in common────────────
-
-(…)
-
-For more about the other layers, see ➡ ![readme.md](./readme.md) ⬅
-
-![Minivan illustration Overview layers by key, Workman](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_workman_2000_vi.jpg)
-
-Layers (text)
-=============
-
-        ───────────────Workman─────────────────
-
-     Layer _..._BASE (Letters). This is Workman 
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- BASE access
-         Esc        qQ    dD    rR    wW    bB    | jJ    fF    uU    pP    :;         Bksp
-         Tab+LCtl   aA    sS    hH    tT    gG    | yY    nN    eE    oO    iI           '"
-         LSht+_PAD  zZ    xX    mM    cC    vV    | kK    lL    ,<    .>    /?    RSht+_FUN
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) LGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (RGUI)                                                               (_MOV)
-
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ₃) 'South paw' hardware configuration. Configurable, default shown.
-     ₄) 'Arrow' hardware configuration  Configurable, default shown.
-     ₃ ₄) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ₅) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ₆) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-
-Remarks: The left modifiers have a slight delay in combination with an outside pointer device (mouse, stylus).
-It seems this will be difficult to fix, because it is spread over two devices. To avoid the
-±0.2 second delay, activate a layer where the modifiers are direct (`_PAD`), using the layer toggle on left shift. 
-
-The two keys with ';' (Del;`_ACC`, Right;`_RAR`) do not auto-repeat on double tap, like QMK normal layer-tap keys.
-There is an uncluttered _Delete_ on `_PAD`, an uncluttered _Right_ arrow on the `_MOV` layer.
-
-Holding both `_DEF_NSY` keys left and right of the "split space bar" (enter, space) results in layer `_DRA`.
-
-Holding either one of the just above mentioned `_DEF_NSY` layer keys (<3 and 3>), with the `_ACC` layer key
-(on <2) results in layer `_BON`.
-
-
-- - -
-
-
-     Layer _..._NSY (Numbers and SYmbols). This fits the above Workman layer _DEF_BASE
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     !     @     #     $     %     | ^     &     *     (    )       Del
-     Tab+LCtl 1!    2@    3#    4$    5%    | 6^    7&    8*    9(   0)  `~+RCtl
-     -+LSht   [{    ]}    -_    \|    =+    | +     |     _     {     }   ~+RSht 
-                          ^^                              ^  // Only differences with Dvorak version _DEF_NSY
-     ---------------------------------------------------------------------------
-                 Left+LAlt ___   ___   Ent  | .   ___   RGUI  Right+RAlt
-                                 -*-       <|>    -*-                 u      //(hold) Access on _DEF_BASE
-                   <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-                        ^                                   ^
-                      (LGUI)                              (_MOV)
-
-
-
-- - -
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/config.h b/keyboards/thevankeyboards/minivan/keymaps/josjoha/config.h
deleted file mode 100644
index 9db4d596de6..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * © 2019,2020 by Jos Boersema
- */
-
-
-#pragma once
-#define LAYER_STATE_16BIT // This saves more than 400 bytes on the hex file
-
-// place overrides here
-
-// Some defines meant to decrease the firmware size. The firmware is otherwise over the maximum (atmega32u4)
-//# ifndef LTO_ENABLE
-     //Disable old style macro handling: MACRO() & action_get_macro
-//#     define NO_ACTION_MACRO // This saves 320 bytes
-      //disable calling of action_function() from the fn_actions array (deprecated)
-//#     define NO_ACTION_FUNCTION  // This saves 96 bytes
-//# endif
-
-#define PERMISSIVE_HOLD
-#define RGBLIGHT_SLEEP // QMK docs: "If defined, the RGB lighting will be switched off when the host goes to sleep"
-#define RGBLIGHT_EFFECT_BREATHING
-
-// Layer switch TT(layer) tapping amount to make it toggle
-#define TAPPING_TERM_HOLTAP 225 // 175 ms proved unreliable, 225 ms seems ok (personal preference)
-
-
-// Attempts to reduce firmware size:
-    //#define LTO_ENABLE // Did not decrease firmware size when tested on 26 Jan 2020 
-    //#define NO_DEBUG //disable debugging (already defined)
-    //#define NO_PRINT JJdisable printing/debugging using hid_listen (already defined)
-    //#define NO_ACTION_LAYER //disable layers (obviously need layers)
-    //#define NO_ACTION_TAPPING // This saves 2516 bytes (9%) (keymap uses tapping)
-    //#define NO_ACTION_ONESHOT // This did not reduse firmware size on 26 Jan 2020
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
deleted file mode 100644
index 39eb45e15ed..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
+++ /dev/null
@@ -1,1784 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Authors: This QMK keymap file is a combination of the default
- * keymap, led code original copied/edited from ../jetpacktuxedo, some
- * copy/paste from QMK documentation code examples (etc).
- * Remainder: © 2019, 2020, 2021 by Jos Boersema
- */
-
-// --------------------------------------v---------------------------------------
-//                                 Configuration:
-// --------------------------------------v---------------------------------------
-#include "./user_config.h" // Edit this file to set user preference compile options.
-// --------------------------------------^---------------------------------------
-
-
-
-    /* Configurable keymap for Minivan layouts 44, 45, 46 keys.  
-     * May work for 12×12×12×[11-12] keys as well.
-     * Configuration in ./user_config.h
-     */
-
-  /* Overview of the code
-   *
-   * The base layers are in separate files;
-   * process_record_user(), unicode macros are defined in unicode_macros.c;
-   * accented characters are defined in unicode_weurope.h
-   *
-   * Unicode macros facilitate recomputing for re-computing the Dvorak with changed letters 
-   * ('descramble'), and exist because space ran out for * UP(…).
-   *
-   * The led color code might be a bit hairy, due to speed/count middle led overlapping layer color. 
-   *
-   *  Preprocessor indentation: # always in column one, #includes and #defines
-   *  are most to the left unless nested, except in the user configuration
-   *  block where room is left for a ‛//’. Logical stuff (#if etc) is
-   *  indented from column two, and then in each nesting goes 4 more spaces
-   *  to the right, so in between the normal code indentations. There should
-   *  be a newline above and below logical statements. This makes preprocessor
-   *  statements stand out, while giving more information in each statement.
-   *  C indentation: trying to follow QMK standard.
-   *
-   */
-
-
-#include QMK_KEYBOARD_H
-
-// Bit masks for the Base layers, to set them as Default, in order to make transparency look back to the right one.
-#define _DEF_BASE_MASK 0x1 // Some functions take a bit-mask, where layer 0 (zero) is called 0x1 instead.
-#define _ALT_BASE_MASK 0x2 // Some functions take a bit-mask, where layer 0 (zero) is called 0x1 instead.
-
-// Below #defines the internal order of the layers.
-// Notice this order in layer_state_set_user as well, regarding the led indicators.
-enum {
-    _DEF_BASE,  //  Default BASE layer (layer at startup). Typically the letters.
-
-# ifndef MINIFAN_SINGLE_LAYOUT
-
-    _ALT_BASE,  //  Alternative BASE layer.
-
-# endif
-
-    _DEF_NSY,   //  numbers and symbols
-
-# ifndef MINIFAN_SINGLE_LAYOUT
-
-    _ALT_NSY,   //  Alternate version of _DEF_NSY
-
-# endif
-
-    _MOV,  //  movement arrows and mouse
-    _RAR,  //  keys RARely used, Unicode config, Power keys, Media keys, alternate mode switch, speed/size count, …
-
-# ifndef REMOVE_PAD
-
-    _PAD,  //  Numbers pad. These are different versions of the same numbers, that is ‛1’ (_NSY) ≠ ‛1’ (_PAD).
-
-# endif
-
-# ifndef REMOVE_ACC // Removes this layer entirely, if set.
-
-    _ACC,  //  Accented letters 
-
-# endif
-
-# ifndef REMOVE_DRA // Removes this layer entirely, if set.
-
-    _DRA,  //  Unusual symbols and whatever else
-
-# endif
-
-# ifndef REMOVE_BON // Removes this layer entirely, if set.
-
-    _BON,  //  Bonus layer with more Unicode symbols
-
-# endif
-
-    _FUN,  //  function keys, layer switcher, given highest order precedence just in case
-} ;
-// The default and alternate base layers needs to have a low order
-// number, so that the other layers can be accessed on top of it.
-// Default Layer is set, according to active Base pair.
-
-// What BASE layer is active.
-enum {
-    _NORMAL_, // BASE layer is _DEF_BASE
-    _FULL_,   // BASE layer is _ALT_BASE
-# ifdef DVORAK_DESCRAMBLE // not used with other keymaps
-    _HALF_,   // BASE layer is _ALT_BASE For DVORAK_DESCRAMBLE keymap: does *not* re-compute letters in Unicode
-              // This is for different Unicode encodings than “Control+U+HEX” (Linux). It will go through what is set on _RAR
-# endif
-};
-// The mechanism is about what layer to return to, once needing to go back to the letters layer (BASE).
-
-# ifndef STARTUP_ALTERNATE // Startup with in default BASE, normal mode.
-short alternate = _NORMAL_;
-# else                    // Startup with alternate BASE active
-short alternate = _FULL_; // 
-# endif
-
-//* Shift detection
-bool shift_ison = 0; // keep track of the state of shift (Capslock is ignored). There may be more elegant code for this in
-                     //   QMK (a function seems to do it?), but this is simple and keeps the issue isolated to this file.
-# define TRUE 1
-# define FALSE 0
-bool _fun_stay = FALSE; // for making _FUN layer not return to BASE after pressing an F-key
-bool leds_on; // toggle leds on/off
-
-# ifdef LEDS_OFF_BASE_DEF  
-bool led_middle_on = TRUE; // Set to off later, if startup setting is off.
-# endif
-
-bool isolate_trigger = FALSE; // detects if _FUN layer move was pressed, and no other key (no normal use of Shift).
-bool capslock; // keeps track of capslock state
-bool numlock; // keeps track of numlock state
-//layer_state_t state_recall; // We are calling the function set_led_colors_ from this file as well.
-// speed measuring
-bool     speed_measure = SPEED_INIT_VALUE; // feature activated or not on startup
-uint32_t speed_counttime; // counts the time
-short    speed_countdown = SPEED_COUNTDOWN; // countdown to next computation/effects
-int      speed; // we store typing result (keys/second) to make reporting less stressful on user, as it doesn't run away after typing
-                // the value is recorded 10 times higher, to allow another digit of precision, needed to calculate Words-Per-Minute
-long int speed_batches = 0; // This counts how many batches of SPEED_COUNTDOWN have been added to wordcount_speed_add
-long int speed_add = 0; // This just adds the speed computed for every batch of SPEED_COUNTDOWN, also times 10 for precision
-// character and word counting, attempting to count the final text being written
-bool     sizecount_measure = COUNT_INIT_VALUE; // feature activated or not on startup
-long int sizecount_blanks = 0; // This counts spaces/enters as a means of counting words, with manual substraction key
-long int sizecount_chars = 0; // This counts characters, substraction for delete/backspace
-bool     sizecount_word; // remember if the last character was whitespace, so a second does not count a word
-bool     sizecount_menu = FALSE; // menu mode for configuring sizecount led color & alert system for maximum size.
-long int sizecount_max = 0; // the maximum system for count, alert user about relative size/limit
-bool     sizecount_max_type; // is size counting by word or by character
-#define SIZECOUNT_WORD 0 // The type of text size counting: words
-#define SIZECOUNT_CHAR 1 //           "                   : characters
-
-/* This file contains mostly the Unicode and special macros.
-   It contains the function: process_record_user(...)
-   It has been isolated because the source file got long.
- */
-#include "./unicode_macros.c"
-
-
-// Pre-existing function, run when the keyboard starts up.
-void keyboard_post_init_user (void) {
-
-# ifdef RGBLIGHT_ENABLE
-
-// Set side leds on/off startup
-#     ifdef STARTUP_SIDE_LEDS_OFF
-    leds_on = FALSE;
-#     else
-    leds_on = TRUE;
-#     endif
-
-    // Set up RGB effects on _only_ the first LED 
-    rgblight_set_effect_range (1, 1); // Takes a range: 1st arg is start, 2nd how many
-    rgblight_sethsv_noeeprom (HSV_WHITE); // Startup color of keyboard.
-    // Set LED effects to breathing mode
-    rgblight_mode_noeeprom (RGBLIGHT_EFFECT_BREATHING + 2);
-
-    // Init the first and last LEDs to a static color.
-    setrgb (0, 0, 0, (rgb_led_t *)&led[0]); // Led[0] is led 0
-    setrgb (0, 0, 0, (rgb_led_t *)&led[2]); // 2nd led
-
-// The logic seems to be to establish the effect first, and then toggle it on/off.
-#     ifdef STARTUP_MID_LED_OFF
-    rgblight_disable (); // 
-#         ifdef LEDS_OFF_BASE_DEF  // This messes with led effect on/off, so we need to track the state of this setting now.
-    led_middle_on = FALSE;
-#         endif
-#     endif
-
-    isolate_rgblight_set ();
-
-# endif //RGBLIGHT_ENABLE
-
-// Set startup layer
-# ifdef STARTUP_ALTERNATE 
-    layer_move (_ALT_BASE);
-# else
-    layer_move (_DEF_BASE);
-# endif
-
-    _fun_stay = TRUE; // startup with F-keys not returning to Base after stroke (_FUN)
-
-}
-
-
-// Writes a number as if typed on keyboard. Typically to show a speed/text size measurement.
-// If last argument is TRUE it prints a dot ‛.’ before the last digit
-int write_number (long int input, short divide10) { 
-    long int step10;
-    short digit;
-    short start = FALSE;
-    short printed = 0;
-    char output[2];
-
-    output[1] = '\0';
-    if (0 > input) { // number is negative
-        send_string ("-"); // minus
-        printed++;
-        input *= -1; // turn positive
-    }
-    for (step10 = 1000000000; 0 != step10; step10 /= 10) { // assuming 32 bit, ± 10⁹
-        digit = input / step10; 
-        input = input % step10;
-        if (!start) { // remove leading zeros
-            if ((0 != digit) || (1 == step10)) start = TRUE; // If all zeros, always print last zero.
-        }
-        if (divide10 && (1 == step10)) { // print with a dot before the last digit
-            send_string (".");
-            printed++;
-        }
-        if (start) { // print
-            output[0] = '0' + digit;
-            send_string (output);
-            printed++;
-        }
-    }
-    return printed;
-}
-
-
-// This function prevents the middle led from being altered by layer
-// switching (showing the layer color, that is), when another 
-// functionality takes precedent over the middle led.
-void middle_led_control (short hsv_h, short hsv_s, short hsv_v ) {
-# ifdef RGBLIGHT_ENABLE
-
-    if (FALSE == speed_measure) { // only touch middle led if no speed measuring going on
-       if ( ! ((TRUE == sizecount_measure) && (0 != sizecount_max)) ) { // only touch middle led if no text size
-              // counting set to a maximum is going on.
-
-            rgblight_sethsv_noeeprom (hsv_h, hsv_s, hsv_v); // set it
-        }
-    }
-
-# endif
-}
-
-
-// Set middle led color for speed system. Needed in various places.
-void speed_led (int speed) {
-# ifdef RGBLIGHT_ENABLE
-
-    speed /= 10; // argument is in 10 times its value
-    if ( ! ((TRUE == sizecount_measure) && (0 != sizecount_max)) ) { // only touch middle led if no text size
-           // counting set to a maximum is going on.
-        rgblight_sethsv_noeeprom (SPEED_HUE_STEP * speed + SPEED_HUE_START, 255, 128); // full saturation, but half lit
-        rgblight_set (); // only center led is altered, no need to go through isolate_rgblight_set()
-    }
-
-# endif
-}
-
-
-// do this in one place to handle left/right leds being off here
-void isolate_rgblight_set (void) {
-
-# ifdef RGBLIGHT_ENABLE
-    if (!leds_on) { // left/right leds are off
-        // overwrite previously colors
-        uint8_t led0r = 0; uint8_t led0g = 0; uint8_t led0b = 0;
-        uint8_t led2r = 0; uint8_t led2g = 0; uint8_t led2b = 0;
-        led0r = 0; 
-        led0g = 0; 
-        led0b = 0; 
-        led2r = 0; 
-        led2g = 0; 
-        led2b = 0; 
-        setrgb(led0r, led0g, led0b, (rgb_led_t *)&led[0]); // Led 0
-        setrgb(led2r, led2g, led2b, (rgb_led_t *)&led[2]); // Led 2
-    }
-    rgblight_set ();
-# endif
-
-}
-
-
-// _FUN layer leds.
-void indicate_fun_stay (void) {
-# ifdef RGBLIGHT_ENABLE
-
-    uint8_t led0r = 0; uint8_t led0g = 0; uint8_t led0b = 0;
-    uint8_t led2r = 0; uint8_t led2g = 0; uint8_t led2b = 0;
-    // See also below under _FUN layer led
-    if (_fun_stay == TRUE) { // normal mode, 0 (100% normal)
-        led0r = 255; // red
-        led2r = 255; // Yellow
-        led2g = 50;
-    }else{
-        led0r = 255; // Yellow
-        led0g = 50;  //   
-        led2r = 255; // red
-    }
-    setrgb(led0r, led0g, led0b, (rgb_led_t *)&led[0]); // Led 0
-    setrgb(led2r, led2g, led2b, (rgb_led_t *)&led[2]); // Led 2
-    isolate_rgblight_set ();
-
-# endif //RGBLIGHT_ENABLE
-}
-
-
-// _RAR layer leds
-// It is a function because this is also called when the Base layer OTHER_BASE key is pressed
-void indicate_base (void) {
-# ifdef RGBLIGHT_ENABLE
-
-    uint8_t led0r = 0; uint8_t led0g = 0; uint8_t led0b = 0;
-    uint8_t led2r = 0; uint8_t led2g = 0; uint8_t led2b = 0;
-    // See also below under _FUN layer led
-    if (_NORMAL_ == alternate) { // normal mode, 0 (100% normal)
-        led0r = 255; //  shine white left led
-        led0g = 255;
-        led0b = 255;
-        rgblight_sethsv_noeeprom (HSV_PURPLE);  // This overrides the speed setting.
-        led2r = 100; // purple
-        led2b = 100;
-    }
-
-#     ifdef DVORAK_DESCRAMBLE // not used with other keymaps
-      else if (_HALF_ == alternate) { // alternate mode, 1 (normal unicode)
-        led0r = 100; // purple
-        led0b = 100;
-        rgblight_sethsv_noeeprom (HSV_WHITE); //  shine white middle led (still breathes)
-        led2r = 100; // purple
-        led2b = 100;
-    }
-#     endif
-
-      else if (_FULL_ == alternate) { // alternate mode, 1 (recomputed unicode for DVORAK_DESCRAMBLE)
-        led0r = 100; // purple
-        led0b = 100;
-        rgblight_sethsv_noeeprom (HSV_PURPLE); 
-        led2r = 255;//  shine white right led
-        led2g = 255; 
-        led2b = 255; 
-    }
-    setrgb(led0r, led0g, led0b, (rgb_led_t *)&led[0]); // Led 0
-    setrgb(led2r, led2g, led2b, (rgb_led_t *)&led[2]); // Led 2
-    isolate_rgblight_set ();
-
-# endif //RGBLIGHT_ENABLE
-}
-
-
-// Sets led colors for all layers. Including Capslock/Numlock changes. See a computer side activated function for that too:
-//                                                                                    led_update_user (…)
-void set_led_colors_ (layer_state_t state) {
-# ifdef RGBLIGHT_ENABLE
-
-    uint8_t led0r = 0; uint8_t led0g = 0; uint8_t led0b = 0;
-    uint8_t led2r = 0; uint8_t led2g = 0; uint8_t led2b = 0;
-    short color_ddl = 28 ;
-
-#     ifdef LEDS_OFF_BASE_DEF 
-    // Special case of switching centre led effect on/off
-    if (!layer_state_cmp (state, _DEF_BASE)) { // letters
-        //if (rgblight_is_enabled())
-        if (led_middle_on) { // Follows user setting based on _RAR key.
-            rgblight_enable_noeeprom (); // Would be easier if middle_led_control (…) could set brightness to dark, but seems to not work.
-        }
-    }
-#     endif
-
-    // The order should be the reverse of the #defines of layer number of the layers on top
-    // because higher layer number is higher priority if activated
-    /* _DEF_BASE 0 _ALT_BASE 1 _DEF_NSY 2 _ALT_NSY 3 _MOV 4 _RAR 5 _PAD 6 _ACC 7 _DRA 8 _BON 9 _FUN 10 */
-    if (layer_state_cmp (state, _FUN)) { // F-keys, and layer toggles
-        middle_led_control (HSV_RED); // purple
-        indicate_fun_stay (); // Indicates state of _fun_stay, but only when it is being toggled.
-        return ; // indicate_fun_stay function already does it all.
-    } 
-
-#     ifndef REMOVE_BON // Removes this layer entirely, if set.
-    else if (layer_state_cmp (state, _BON)) {  // Bonus layer with encircled numbers and more symbols
-        // side leds dark
-        middle_led_control (HSV_YELLOW); 
-    }
-#     endif // REMOVE_BON 
-
-#     ifndef REMOVE_DRA // This cuts out the whole _DRA layer
-    else if (layer_state_cmp (state, _DRA)) { // Unicode drawings and unusual things
-        led0r = 255; // gold red
-        led0g = 128; // 
-        led2r = 255; //
-        led2g = 128; //
-        middle_led_control( HSV_GOLDENROD ); 
-    }
-#     endif // REMOVE_DRA
-
-#     ifndef REMOVE_ACC // This cuts out the whole _ACC layer.
-    else if (layer_state_cmp (state, _ACC)) { // Accented letters (Unicode input layer)
-        led0g = 150; // With some blue, because it is also a symbol 
-        led0b = 100;
-        led2g = 150;
-        led2b = 100;
-        middle_led_control (HSV_TURQUOISE); // cyan
-    }
-#    endif // REMOVE_ACC
-
-#    ifndef REMOVE_PAD
-    else if (layer_state_cmp (state, _PAD)) { // numbers pad layer
-        if (numlock) {
-            led0b = 255; // Blue for the numbers part 
-            led2g = 255; // Green for the navigation part
-        }else{
-            led0g = 255; // reversed 
-            led2b = 255; //
-        }
-        middle_led_control (60, 20, 100); // yellow (low saturation)
-    }
-#     endif // REMOVE_PAD
-
-    //---
-    else if (layer_state_cmp (state, _RAR)) { // layer with special keys
-        indicate_base (); // this function already does it all
-        return; // 
-    }
-    //---
-    else if (layer_state_cmp (state, _MOV)) { // movement layer
-        led0g = 255;// movement is green, "go forward"
-        led2g = 255; 
-        middle_led_control(HSV_GREEN);
-    }
-    //--- (pair)
-    else if (layer_state_cmp (state, _ALT_NSY)) { // alternate, numbers/symbols 
-        led0b = 255; //  first led follows the corresponding default layer: _DEF_NSY 
-        led2r = color_ddl; // Same as DDL, to which it belongs.
-        led2g = color_ddl; // 
-        led2b = color_ddl; // 
-        middle_led_control (HSV_BLUE); 
-    }
-    else if (layer_state_cmp (state, _DEF_NSY)) { // symbols and numbers
-        led0b = 255; // blue for symbols, like ink (writing)
-        led2b = 255;
-        middle_led_control (HSV_BLUE);
-    }
-    //--- (pair)
-    // Alternate BASE layer (alternate)
-    else if (layer_state_cmp (state, _ALT_BASE)) {
-
-#     ifdef LEDS_OFF_BASE_ALT // Alternative Base leds off (always)
-
-        rgblight_disable_noeeprom ();
-
-#     else // do use leds on Alternative Base layer
-
-#         if !defined(BASE_NUMPAD__ALT_BASE) // Normal led colors for ‛regular’ base layers like Dvorak, Qwerty. 
-
-        if (capslock) {
-           led2r = 255; // Brighter version to indicate capslock
-           led2g = 255; // 
-           led2b = 255; // 
-        } else {
-           led2r = color_ddl; // A bit of a white not too bright color on right
-           led2g = color_ddl; // 
-           led2b = color_ddl; // 
-        }
-        middle_led_control (HSV_TEAL); // seems to be the same as CYAN/AZURE, conflicts with _ACC
-
-#         else // Numpad configured on Alternate Base, which should show the state of NumLock
-
-        // This is a copy of the _PAD led colors, but less bright
-        if (numlock) {
-            led0b = 80; // Blue for the numbers part 
-            led2g = 80; // Green for the navigation part
-        }else{
-            led2b = 80; // reversed 
-            led0g = 80; //
-        }
-        middle_led_control (60, 20, 100);  // light-blue
-
-#         endif // BASE_NUMPAD__ALT_BASE
-
-#     endif // LEDS_OFF_BASE_ALT 
-
-    }
-    // Default layer (generally), normal BASE layer
-    else if (layer_state_cmp (state, _DEF_BASE)) { // letters
-
-#     ifdef LEDS_OFF_BASE_DEF // Default Base leds off (always)
-
-        rgblight_disable_noeeprom ();
-
-#     else // Do use leds on Default Base
-
-        if (capslock) {
-            led0r = 255; // Brighter version to indicate capslock
-            led0g = 255; // 
-            led0b = 255; // 
-        } else {
-            led0r = 28; // A bit of a weak white color on left 
-            led0g = 28; // 
-            led0b = 28; // 
-        }
-        middle_led_control (HSV_TEAL);
-
-#     endif // LEDS_OFF_BASE_DEF 
-
-    }
-    //---
-
-    // pushes the configuration
-    setrgb (led0r, led0g, led0b, (rgb_led_t *)&led[0]); // Led 0
-    setrgb (led2r, led2g, led2b, (rgb_led_t *)&led[2]); // Led 2
-
-    isolate_rgblight_set (); // Activates the led color change, after on/off check.
-
-# endif //RGBLIGHT_ENABLE
-}
-
-// Pre-existing QMK function, called when NumLock/CapsLock key is pressed, including on another keyboard.
-// This function sets two booleans that keep track of the current capslock/numlock state, for use in layer led colors.
-bool led_update_user (led_t led_state) {
-
-    if (led_state.num_lock) { // This doesn't look at the keyboard leds or any other actual leds. It seems to look at whether
-                              // or not the computer has numlock in the on/off state.
-        numlock = TRUE;
-    }else{
-        numlock = FALSE;
-    }
-    if (led_state.caps_lock) {
-        capslock = TRUE;
-    }else{
-        capslock = FALSE;
-    }
-    //layer_state_set_user 
-    set_led_colors_ (state_recall); // Update leds
-    return true ;
-}
-
-
-// pre-existing function, called when layer changes
-layer_state_t layer_state_set_user (layer_state_t state) {
-
-  set_led_colors_ (state); // Update leds 
-  state_recall = state; // Recall this, for calling set_led_colors_(…) on Num/Capslock changes in led_update_user(…)
-  return state;
-}
-
-// -------------------------------- layers --------------------------------
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-/********************        What base layers to use:        **************/
-
-//                         * Dvorak *
-# if defined(BASE_DVORAK__DEF_BASE) || defined(BASE_DVORAK__ALT_BASE)
-#     include "./base_dvorak.c" // Regular Dvorak.
-# endif
-
-//                         * Dvorak descramble *
-# if defined(BASE_DVORAK_DESCRAMBLE__ALT_BASE) // only for ‛Alternate’ base
-#     include "./base_dvorak_descramble.c" // Dvorak for when computer is already remapping to Dvorak.
-# endif
-
-//                         * Qwerty *
-# if defined(BASE_QWERTY__DEF_BASE) || defined(BASE_QWERTY__ALT_BASE)
-#     include "./base_qwerty.c" // Regular Qwerty.
-# endif
-    
-//                         * Qwerty arrows on Base *
-# if defined(BASE_QWERTY_BASEARROW__DEF_BASE) || defined(BASE_QWERTY_BASEARROW__ALT_BASE)
-#     include "./base_qwerty_basearrow.c" // Qwerty + arrows
-# endif
-
-//                         * Colemak *
-# if defined(BASE_COLEMAK__DEF_BASE) || defined(BASE_COLEMAK__ALT_BASE)
-#     include "./base_colemak.c" // Regular Colemak.
-# endif
-
-//                         * Workman *
-# if defined(BASE_WORKMAN__DEF_BASE) || defined(BASE_WORKMAN__ALT_BASE)
-#     include "./base_workman.c" // Regular Workman.
-# endif
-
-//                         * Numpad *
-# if defined(BASE_NUMPAD__ALT_BASE)
-#     include "./base_numpad.c" // Numbers pad
-# endif
-
-//                         * Hebrew *
-# if defined(BASE_HEBREW__DEF_BASE) || defined(BASE_HEBREW__ALT_BASE)
-#     include "./base_hebrew.c" // Hebrew
-# endif
-
-// // ⬇ insert your ./base_YOUR_KEYMAP.c #include here:
-
-
-//                         * YOUR KEYMAP *
-// # if defined(BASE_YOUR_KEYMAP__DEF_BASE) || defined(BASE_YOUR_KEYMAP__ALT_BASE)
-// #     include "./base_YOUR_KEYMAP.c" // Your Keymap.
-// # endif
-
-// If your keymap also has a ./base_YOUR_KEYMAP.h configuration/header file, #include it in ./user_config.h
-// Look for similar inclusions of base header files, similar to the #includes here.
-// You should be able to just copy what you did here, and only change “.c” into “.h”.
-
-// // ⬆
-
-
-        // See the ./bases_*.c file for definition of _DEF_BASE, _DEF_NSY, _ALT_BASE, _ALT_NSY layers, selected in ./user_config.h
-
-        /* ⬆⬇ (next layer) */
-
-
-# ifndef BASESFILE_LAYER_MOV // Use a definition of this layer in the ./bases_* file, where this #define can be defined.
-
-    /* Layer _MOV: Movement layer: mouse and hands on navigation
-     *          Also delete/backspace, to navigate and delete together.
-     */
-
-    [ _MOV ] = LAYOUT_redefined (
-
-/*
-     Layer _MOV (MOVement, mouse movement on right hand)
-
-     triangle layout (mouse right hand):
-    
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                                        //(toggle) on _FUN
-     BASE   PgDn  Up    PgUp  Home  Btn3  | xxx   WhDn  MsUp  WhU   WhLft    Bksp
-     LCtl   Left  Down  Right End   Btn1  | Btn1  MsLft MsDn  MsRht WhRht    RCtl
-     LSht*- xxx   Acc2  Acc1  Acc0  Btn2  | Btn2  Btn3  Btn4  Btn5  xxx      RSht      //(toggle) on BASE
-     ----------------------------------------------------------------------------
-     LAlt Del   Ent   ___ | PgUp  PgDn  LGUI  RAlt
-                      -*-<|>                                                             //(hold) on BASE
-     <1 ± <2    <3    <4  | 4>    3>    2>  ± 1>  
-        …                                   …
-
-     triangle layout, 'arrow' additional hardware key, with arrow cluster (difference marked _):
-    
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                                        //(toggle) on _FUN
-     BASE   PgDn  Up    PgUp  Home  Btn3  | xxx   WhDn  MsUp  WhU   WhLft    Bksp
-     LCtl   Left  Down  Right End   Btn1  | Btn1  MsLft MsDn  MsRht WhRht    RCtl
-     LSht*- xxx   Acc2  Acc1  Acc0  Btn2  | Btn2  Btn3  Btn4  Btn5  _Up_     RSht      //(toggle) on BASE
-     ----------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp       PgDn   _Left__Down__Right_
-                                      -*-<|>                                             //(hold) on BASE
-                     <1 ± <2    <3    <4  | 4>         3>      2>   _±_    1>  
-                        …     
-
-     triangle layout, 'arrow' additional hardware key, with arrow cluster and navigation keys:
-    
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                                        //(toggle) on _FUN
-     BASE   PgDn  Up    PgUp  Home _Btn4_ | xxx   WhDn  MsUp  WhU   WhLft    Bksp
-     LCtl   Left  Down  Right End   Btn1  | Btn1  MsLft MsDn  MsRht WhRht    RCtl
-     LSht*- xxx   Acc2  Acc1  Acc0 _Btn5_ | Btn2  Btn3 _Home__PgUp_ _Up_   _PgDn_      //(toggle) on BASE
-     ----------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp      _End_   _Left__Down__Right_
-                                      -*-<|>                                             //(hold) on BASE
-                     <1 ± <2    <3    <4  | 4>         3>      2>   _±_    1>  
-                        …
-
-
-     flat layout (mouse movement on left hand):
-    
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                                        //(toggle) on _FUN
-     BASE   WLft  WDn   WUp   WRht  xxx   | Btn3  PgUp  Home  End   PgDn     Bksp
-     LCtl   MLft  MDn   MUp   MRht  Btn1  | Btn1  Left  Up    Down  Right    RCtl
-     LSht*- Btn5  Btn4  Btn3  Butn2 xxx   | Btn2  Acc0  Acc1  Acc2  xxx      RSht      //(toggle) on BASE
-     ----------------------------------------------------------------------------
-     LAlt Del   Ent   ___ | PgUp  PgDn  LGUI  RAlt
-                      -*-<|>                                                             //(hold) on BASE
-     <1 ± <2    <3    <4  | 4>    3>    2>  ± 1>  
-        …
-
-     flat layout, 'arrow' additional hardware key, with arrow cluster (difference marked _)
-   
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                                        //(toggle) on _FUN
-     BASE   WLft  WDn   WUp   WRht  xxx   | Btn3  PgUp  Home  End   PgDn     Bksp
-     LCtl   MLft  MDn   MUp   MRht  Btn1  | Btn1  Left  Up    Down  Right    RCtl
-     LSht*- Btn5  Btn4  Btn3  Butn2 xxx   | Btn2  Acc0  Acc1  Acc2  xxx      RSht      //(toggle) on BASE
-     ----------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp       _Left_ _Up_  _Down__Right_
-                                      -*-<|>                                           //(hold) on BASE
-                     <1 ± <2    <3    <4  | 4>          3>     2>   _±_    1>  
-                        …
-
-     flat layout, 'arrow' additional hardware key, with arrow cluster and additional navigation keys:
-   
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                                        //(toggle) on _FUN
-     BASE   WLft  WDn   WUp   WRht  xxx   |_Acc2_ PgUp  Home  End   PgDn     Bksp
-     LCtl   MLft  MDn   MUp   MRht  Btn1  | Btn1  Left  Up    Down  Right    RCtl
-     LSht*- Btn5  Btn4  Btn3  Butn2 xxx   |_Acc1_ Acc0 _PgUp__Home__End_   _PgDn_      //(toggle) on BASE
-     ----------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp       _Left_ _Up_  _Down__Right_
-                                      -*-<|>                                             //(hold) on BASE
-                     <1 ± <2    <3    <4  | 4>          3>     2>   _±_    1>  
-                        …
-
-     flat layout, 'arrow' additional hardware key, with arrow cluster, additional navigation keys, vi(1) layout:
-   
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                                        //(toggle) on _FUN
-     BASE   WLft  WDn   WUp   WRht  xxx   |_Acc2_ PgUp  Home  End   PgDn     Bksp
-     LCtl   MLft  MDn   MUp   MRht  Btn1  | Left  Down  Up    Right Btn1     RCtl
-     LSht*- Btn5  Btn4  Btn3  Butn2 xxx   |_Acc1_ Acc0 _PgUp__Home__End_   _PgDn_      //(toggle) on BASE
-     ----------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp       _Left_ _Down__Up_  _Right_
-                                      -*-<|>                                             //(hold) on BASE
-                     <1 ± <2    <3    <4  | 4>          3>     2>   _±_    1>  
-                        …
- */
-
-         /* Inner default navigation/mouse layout. 11 means row 1, column 1, etc.
-          * Configured for arrows on the right, mouse on the left (BTN* on the left side, that is).
-          */
-
-#     ifndef ARROWS_TRIANGLE
-#         define NAVI_11 KC_BTN3 // NAVI for 'navigation cluster', 11 for row 1, column 1, etc.
-#         define                 NAVI_12 KC_PGUP
-#         define                                 NAVI_13 KC_HOME
-#         define                                                 NAVI_14 KC_END
-#         define                                                                NAVI_15 KC_PGDN
-#         define NAVI_21 KC_BTN1
-#         define                 NAVI_22 KC_LEFT
-#         define                                 NAVI_23 KC_UP
-#         define                                                 NAVI_24 KC_DOWN
-#         define                                                                NAVI_25 KC_RIGHT
-#         define NAVI_31 KC_BTN2
-#         define                 NAVI_32 KC_ACL0
-#         define                                 NAVI_33 KC_ACL1
-#         define                                                 NAVI_34 KC_ACL2
-#         define                                                                NAVI_35 XXXXXXX
-          //-----------------------------------------------------------------------------------
-          // Configured for left handed mouse, with xxx,BTN* on the right most column.
-#         define MOUS_11 KC_WH_L  // MOUS for mouse, etc.
-#         define                 MOUS_12 KC_WH_D
-#         define                                 MOUS_13 KC_WH_U
-#         define                                                 MOUS_14 KC_WH_R
-#         define                                                                MOUS_15 XXXXXXX
-#         define MOUS_21 KC_MS_L
-#         define                 MOUS_22 KC_MS_D
-#         define                                 MOUS_23 KC_MS_U
-#         define                                                 MOUS_24 KC_MS_R
-#         define                                                                MOUS_25 KC_BTN1
-#         define MOUS_31 KC_BTN5
-#         define                 MOUS_32 KC_BTN4
-#         define                                 MOUS_33 KC_BTN3
-#         define                                                 MOUS_34 KC_BTN2
-#         define                                                                MOUS_35 XXXXXXX
-#     endif
-
-// Alternative navigation/mouse layout: arrows in triangle, and left hand on the left 'wasd' location.
-// If you want these arrows on the right hand, you may want to edit this, to put right most column left, etc.
-
-#     ifdef ARROWS_TRIANGLE
-#         define NAVI_11 KC_PGDN
-#         define                 NAVI_12 KC_UP   
-#         define                                 NAVI_13 KC_PGUP
-#         define                                                 NAVI_14 KC_HOME
-#         define                                                                 NAVI_15 KC_BTN3
-#         define NAVI_21 KC_LEFT
-#         define                 NAVI_22 KC_DOWN
-#         define                                 NAVI_23 KC_RIGHT
-#         define                                                  NAVI_24 KC_END
-#         define                                                                 NAVI_25 KC_BTN1
-#         define NAVI_31 XXXXXXX
-#         define                 NAVI_32 KC_ACL2
-#         define                                 NAVI_33 KC_ACL1
-#         define                                                  NAVI_34 KC_ACL0
-#         define                                                                 NAVI_35 KC_BTN2
-          //------------------------------------------------------------------------------------
-          // If switching hands to put mouse left, same as for navigation side: switch outer columns by editing here.
-#         define MOUS_11 XXXXXXX
-#         define                 MOUS_12 KC_WH_D
-#         define                                 MOUS_13 KC_MS_U
-#         define                                                 MOUS_14 KC_WH_U
-#         define                                                                MOUS_15 KC_WH_L
-#         define MOUS_21 KC_BTN1
-#         define                 MOUS_22 KC_MS_L
-#         define                                 MOUS_23 KC_MS_D
-#         define                                                 MOUS_24 KC_MS_R
-#         define                                                                MOUS_25 KC_WH_R
-#         define MOUS_31 KC_BTN2
-#         define                 MOUS_32 KC_BTN3
-#         define                                 MOUS_33 KC_BTN4
-#         define                                                 MOUS_34 KC_BTN5
-#         define                                                                MOUS_35 XXXXXXX
-#     endif
-
-// Default left/right layout, meaning arrows right and mouse left.
-#     ifndef ARROWS_LEFT
-#         define LEFT_AA MOUS_11
-#         define LEFT_AB MOUS_12
-#         define LEFT_AC MOUS_13
-#         define LEFT_AD MOUS_14
-#         define LEFT_AE MOUS_15
-#         define LEFT_BA MOUS_21
-#         define LEFT_BB MOUS_22
-#         define LEFT_BC MOUS_23
-#         define LEFT_BD MOUS_24
-#         define LEFT_BE MOUS_25
-#         define LEFT_CA MOUS_31
-#         define LEFT_CB MOUS_32
-#         define LEFT_CC MOUS_33
-#         define LEFT_CD MOUS_34
-#         define LEFT_CE MOUS_35
-#         define RGHT_AA NAVI_11
-#         define RGHT_AB NAVI_12
-#         define RGHT_AC NAVI_13
-#         define RGHT_AD NAVI_14
-#         define RGHT_AE NAVI_15
-#         define RGHT_BA NAVI_21
-#         define RGHT_BB NAVI_22
-#         define RGHT_BC NAVI_23
-#         define RGHT_BD NAVI_24
-#         define RGHT_BE NAVI_25
-#         define RGHT_CA NAVI_31
-#         define RGHT_CB NAVI_32
-#         define RGHT_CC NAVI_33
-#         define RGHT_CD NAVI_34
-#         define RGHT_CE NAVI_35
-#     endif
-      
-#     ifdef ARROWS_LEFT
-#         define LEFT_AA NAVI_11
-#         define LEFT_AB NAVI_12
-#         define LEFT_AC NAVI_13
-#         define LEFT_AD NAVI_14
-#         define LEFT_AE NAVI_15
-#         define LEFT_BA NAVI_21
-#         define LEFT_BB NAVI_22
-#         define LEFT_BC NAVI_23
-#         define LEFT_BD NAVI_24
-#         define LEFT_BE NAVI_25
-#         define LEFT_CA NAVI_31
-#         define LEFT_CB NAVI_32
-#         define LEFT_CC NAVI_33
-#         define LEFT_CD NAVI_34
-#         define LEFT_CE NAVI_35
-#         define RGHT_AA MOUS_11
-#         define RGHT_AB MOUS_12
-#         define RGHT_AC MOUS_13
-#         define RGHT_AD MOUS_14
-#         define RGHT_AE MOUS_15
-#         define RGHT_BA MOUS_21
-#         define RGHT_BB MOUS_22
-#         define RGHT_BC MOUS_23
-#         define RGHT_BD MOUS_24
-#         define RGHT_BE MOUS_25
-#         define RGHT_CA MOUS_31
-#         define RGHT_CB MOUS_32
-#         define RGHT_CC MOUS_33
-#         define RGHT_CD MOUS_34
-#         define RGHT_CE MOUS_35
-#     endif
-
-/* Definition of the additional arrow cluster with optional navigation keys, for the 'arrow' hardware layout.
- *
- * By default what becomes the up-arrow (row 2, 2nd key from right) is a no-action key on this layer,
- * which can be displaced without worry.
- * Keys that are displaced for the larger arrow cluster with navigation keys, get moved to the second definition
- * of KC_BTN2 and KC_BTN3, which is on the non-mouse hand.
- *
- * Only the version where the triangle arrows are defined for the left hand, or the version where the flat line
- * arrows are defined for the right hand, are supported.
- *
- * There are several configurations, worked down in order to keep this mess under control.
- *                
- *                                           v----------------------not-defined-------------v----------------v
- *                                 !MOREKEY2_ARROW_CLUSTER   !MOREKEY2_ADD_NAVIGATION  !ARROWS_TRIANGLE  !ARROWS_LEFT             
- * defined MOREKEY2_ARROW_CLUSTER   ......................            yes                    yes            yes
- * defined MOREKEY2_ADD_NAVIGATION        yes                 .......................        yes          only for flat arrows
- * defined ARROWS_TRIANGLE                yes                         yes               ...............      no  
- * defined ARROWS_LEFT                    yes                    only for triangle          yes           ...........
- *                                  MOREKEY2_ARROW_CLUSTER    MOREKEY2_ADD_NAVIGATION   ARROWS_TRIANGLE   ARROWS_LEFT             
- *                                           ^--------------------------defined-------------^----------------^
- *
- * Definition order:
- *  0 no arrow cluster (and therefore no additional navigation keys either)
- *  1 triangle arrows with arrow cluster
- *  2    ''                  ''          + additional navigation and repositioning displaced keys
- *  3 flat arrows with arrow cluster
- *  4    ''                  ''          + additional navigation and repositioning displaced keys
- */
-
-                                               /* 0 (Nothing special, just the default keys)*/
-
-// Default layout without arrow cluster. (With a little imagination you can visualize the keyboard.)
-#     if !defined(MOREKEY2_ARROW_CLUSTER) 
-//                                                                             Default 
-#         define _MOV_KEY_ROW2_KEY1                               KC_RSFT    
-#         define _MOV_KEY_ROW2_KEY2                     RGHT_CE              // Key counting from the right to the left. 
-#         define _MOV_KEY_ROW2_KEY3           RGHT_CD                        
-#         define _MOV_KEY_ROW2_KEY4 RGHT_CC                                  
-//                                  ------------------------------------------
-#         define _MOV_KEY_ROW1_KEY1                               KC_RALT    //                         ''
-#         define _MOV_KEY_ROW1_KEY2                     MORE_key2            //                         ''
-#         define _MOV_KEY_ROW1_KEY3           KC__YGUI                       //                         ''                 (etc)
-#         define _MOV_KEY_ROW1_KEY4 KC_PGDN                                  
-//                <|,>        ,         ,         ,         ,
-//                 |, 4>      , 3>      , 2>      , ±       , 1>         // ± is the additional hardware key
-#     endif                                                       
-
-                                              /* 1 (triangle arrows with arrow cluster) */
-
-// Patch in the arrows for arrow triangle layout
-#     if defined(MOREKEY2_ARROW_CLUSTER) && defined(ARROWS_TRIANGLE)
-//                                                                             Arrow cluster
-#         define _MOV_KEY_ROW2_KEY2                     KC_UP                
-//                                 ------------------------------------------
-#         define _MOV_KEY_ROW1_KEY1                               KC_RIGHT   
-#         define _MOV_KEY_ROW1_KEY2                     KC_DOWN              
-#         define _MOV_KEY_ROW1_KEY3           KC_LEFT                        
-//                <|,>        ,         ,         ,         ,
-//                 |, 4>      , 3>      , 2>      , ±       , 1> 
-#     endif
-
-// The default layout around the arrows
-#     if defined(MOREKEY2_ARROW_CLUSTER) && !defined(MOREKEY2_ADD_NAVIGATION) && defined(ARROWS_TRIANGLE)      
-//                                                                             Default keys
-#         define _MOV_KEY_ROW2_KEY1                               KC_RSFT    
-#         define _MOV_KEY_ROW2_KEY3           RGHT_CD                        
-#         define _MOV_KEY_ROW2_KEY4 RGHT_CC                                  
-//                                 ------------------------------------------
-#         define _MOV_KEY_ROW1_KEY4 KC_PGDN                                  
-//                <|,>        ,         ,         ,         ,
-//                 |, 4>      , 3>      , 2>      , ±       , 1> 
-#    endif                                     
-                                           
-                                              /*  2 (  ''                  ''          + additional navigation and repositioning displaced keys) */
-
-// Patch in the navigation keys for the arrow in triangle layout.
-#     if defined(MOREKEY2_ADD_NAVIGATION) && defined(ARROWS_TRIANGLE)        // Navigation additional keys (arrows implied).
-#         define _MOV_KEY_ROW2_KEY1                               KC_PGDN    
-#         define _MOV_KEY_ROW2_KEY3           KC_PGUP                        
-#         define _MOV_KEY_ROW2_KEY4 KC_HOME                                  
-//                                 ------------------------------------------
-#         define _MOV_KEY_ROW1_KEY4 KC_END                                   
-//                    <|,>        ,         ,         ,         ,
-//                     |, 4>      , 3>      , 2>      , ±       , 1>         
-#     endif
-
-// We have now overwritten the positions of RGHT_CC and RGHT_CD, which could be useful keys.
-// You don't want to mess with BTN1 on the other hand, because it needs to select together with mouse moving in many applications.
-#     if defined(MOREKEY2_ADD_NAVIGATION) && defined(ARROWS_TRIANGLE) && defined(ARROWS_LEFT)  // ARROWS_LEFT because the wider map is edited
-//
-//        ... spelling this out to keep brain for exploding:
-//        Overwritten (copied from above):
-//         #define RGHT_CC MOUS_33
-//         #define                                 MOUS_33 KC_BTN4
-//         #define RGHT_CD MOUS_34
-//         #define                                                 MOUS_34 KC_BTN5
-//        'BTN4' and 'BTN5' are overwritten.
-//        Where are KC_BTN2 and KC_BTN3 on the non-mouse hand:
-//         #define                                                                 NAVI_15 KC_BTN3
-//         #define LEFT_AE NAVI_15
-//         #define                                                                 NAVI_35 KC_BTN2
-//         #define LEFT_CE NAVI_35
-//        'LEFT_AE' and 'LEFT_CE' provide room.
-//
-#         undef  LEFT_AE
-#         define LEFT_AE KC_BTN4
-#         undef  LEFT_CE
-#         define LEFT_CE KC_BTN5
-#     endif
-
-                                              /* 3 (flat arrows with arrow cluster) */
-
-#     if defined(MOREKEY2_ARROW_CLUSTER) && !defined(ARROWS_TRIANGLE)
-//                                                                         arrow cluster
-#         define _MOV_KEY_ROW1_KEY1                               KC_RIGHT                                 
-#         define _MOV_KEY_ROW1_KEY2                     KC_DOWN                        
-#         define _MOV_KEY_ROW1_KEY3           KC_UP                
-#         define _MOV_KEY_ROW1_KEY4 KC_LEFT    
-//                    <|,>        ,         ,         ,         ,
-//                     |, 4>      , 3>      , 2>      , ±       , 1> 
-#     endif
-
-// The default layout around the arrows
-#     if defined(MOREKEY2_ARROW_CLUSTER) && !defined(MOREKEY2_ADD_NAVIGATION) && !defined(ARROWS_TRIANGLE)      
-//                                                                         Default 
-#         define _MOV_KEY_ROW2_KEY1                               KC_RSFT    
-#         define _MOV_KEY_ROW2_KEY2                     RGHT_CE              // Key counting from the right to the left. 
-#         define _MOV_KEY_ROW2_KEY3           RGHT_CD                        
-#         define _MOV_KEY_ROW2_KEY4 RGHT_CC                                  
-//                    <|,>        ,         ,         ,         ,
-//                     |, 4>      , 3>      , 2>      , ±       , 1> 
-#     endif
-
-
-                                              /* 4 (   ''                  ''          + additional navigation and repositioning displaced keys) */
-
-// The definitions for the additional navigation keys (HOME, etc)
-#     if defined(MOREKEY2_ADD_NAVIGATION) && !defined(ARROWS_TRIANGLE)
-//                                                                         Additional navigation keys: flat
-#         define _MOV_KEY_ROW2_KEY1                               KC_PGDN                                  
-#         define _MOV_KEY_ROW2_KEY2                     KC_END                         
-#         define _MOV_KEY_ROW2_KEY3           KC_HOME              
-#         define _MOV_KEY_ROW2_KEY4 KC_PGUP    
-//                    <|,>        ,         ,         ,         ,
-//                     |, 4>      , 3>      , 2>      , ±       , 1>         
-#     endif
-
-// Replace the overwritten key positions:
-# if defined(MOREKEY2_ADD_NAVIGATION) && !defined(ARROWS_TRIANGLE) && !defined(ARROWS_LEFT)   // !ARROWS_LEFT because the wider map is edited
-//
-//        Overwritten (copied from above):
-//         #define RGHT_CC NAVI_33
-//         #define                                 NAVI_33 KC_ACL1
-//         #define RGHT_CD NAVI_34
-//         #define                                                 NAVI_34 KC_ACL2
-//        'KC_ACL1' and 'KC_ACL2' are overwritten.
-//        Where are BTN2 and BTN3 on the non-mouse hand:
-//         #define NAVI_11 KC_BTN3
-//         #define RGHT_AA NAVI_11
-//         #define NAVI_31 KC_BTN2
-//         #define RGHT_CA NAVI_31
-//        'RGHT_AA' and 'RGHT_CA' provide room.
-//         It seems best to count the acceleration keys from right to left/up on the keyboard.
-//
-#         undef  RGHT_AA
-#         define RGHT_AA KC_ACL2
-#         undef  RGHT_CA
-#         define RGHT_CA KC_ACL1
-#     endif
-
-// Changes the home row on the right hand to become HJKL (as in Qwerty) vi(1) arrow keys,
-// and causes the arrow block to move one key to the left. The key lost on the left is
-// put back on the other end (pinky).
-// Row 3
-#     if defined(VI_SWITCHERYDOO) && !defined(ARROWS_TRIANGLE) // For all hardware variants
-//                |, indx2>  , index>  , middl>   , ring>     , pinky>    , pink2>    ,
-//               <|,>        ,         ,          ,           ,           ,           ,
-#         undef  RGHT_BA
-#         define RGHT_BA KC_LEFT
-#         undef  RGHT_BB
-#         define RGHT_BB           KC_DOWN
-#         undef  RGHT_BC
-#         define RGHT_BC                     KC_UP
-#         undef  RGHT_BD
-#         define RGHT_BD                                KC_RIGHT
-#         undef  RGHT_BE
-#         define RGHT_BE                                            KC_BTN1
-#     endif
-// Row 1
-#     if defined(VI_SWITCHERYDOO) && !defined(ARROWS_TRIANGLE) && defined(MOREKEY2_ARROW_CLUSTER) // Only for 'arrow' hardware
-//                                                                         arrow cluster
-#         undef  _MOV_KEY_ROW1_KEY1 
-#         define _MOV_KEY_ROW1_KEY1                               KC_RIGHT                                 
-#         undef  _MOV_KEY_ROW1_KEY2
-#         define _MOV_KEY_ROW1_KEY2                     KC_UP                          
-#         undef  _MOV_KEY_ROW1_KEY3
-#         define _MOV_KEY_ROW1_KEY3           KC_DOWN              
-#         undef  _MOV_KEY_ROW1_KEY4
-#         define _MOV_KEY_ROW1_KEY4 KC_LEFT    
-//                    <|,>        ,         ,         ,         ,
-//                     |, 4>      , 3>      , 2>      , ±       , 1>         
-#     endif
-
-// (If you want to alter something in detail just for your keyboard, it is probably smart to just write in the keycodes (like KC_PGUP) in the final definitions here below.)
-//
-//      <pink2   , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>  , index>  , middl>             , ring>              , pinky>             , pink2>             ,
-//               ,         ,         , -*-     ,         ,       <|,>        ,         ,                    ,                    ,                    ,                    ,
-        CTO_BASE , LEFT_AA , LEFT_AB , LEFT_AC , LEFT_AD , LEFT_AE , RGHT_AA , RGHT_AB , RGHT_AC            , RGHT_AD            , RGHT_AE            , KC_BSPC            ,
-        KC_LCTL  , LEFT_BA , LEFT_BB , LEFT_BC , LEFT_BD , LEFT_BE , RGHT_BA , RGHT_BB , RGHT_BC            , RGHT_BD            , RGHT_BE            , KC_RCTL            ,
-        KC_LSFT  , LEFT_CA , LEFT_CB , LEFT_CC , LEFT_CD , LEFT_CE , RGHT_CA , RGHT_CB , _MOV_KEY_ROW2_KEY4 , _MOV_KEY_ROW2_KEY3 , _MOV_KEY_ROW2_KEY2 , _MOV_KEY_ROW2_KEY1 ,
-//      --------------------------------------------------------------------------------------------------------------------------------------------------------------------
-        KC_LALT 
-#     ifdef TRANSMINIVAN_LEFTSIDE
-                , TRANS_LEFT
-#     endif
-
-#     ifdef MORE_KEY__COMMAND
-                , MORE_key1 
-#     endif
-
-                , KC_DEL , KC_ENT 
-
-#     ifndef SPACE_LEFT__ENTER_RIGHT      // standard, layer switch on Base
-                                  , _______ 
-#     else                                // reversed
-                                  , KC_PGUP 
-#     endif
-
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                            , TRANS_MIDLEFT
-#     endif
-
-
-#     ifndef SPACE_LEFT__ENTER_RIGHT                // standard
-                                            , KC_PGUP 
-#     else                                          // reversed, layer switch on Base
-                                            , _______ 
-#     endif
-
-
-#     ifdef TRANSMINIVAN_RIGHTSIDE
-                                                      , TRANS_RIGHT
-#     endif
-
-                                                      , _MOV_KEY_ROW1_KEY4 , _MOV_KEY_ROW1_KEY3
-
-#     ifdef MORE_KEY__ARROW
-                                                                           , _MOV_KEY_ROW1_KEY2
-#     endif
-                                                                                                , _MOV_KEY_ROW1_KEY1
-//            ,          ,        , -*-   <|,>        ,                    ,                    ,
-//      <1 ±± , <2       , <3     , <4     |, 4>      , 3>                 , 2>                 , ±  ±  1>
-
-                      ),
-
-# endif // BASESFILE_LAYER_MOV
-
-        /* ⬆⬇ */
-
-# ifndef BASESFILE_LAYER_RAR // Use a definition of this layer in the ./bases_* file, where this #define can be defined.
-
-    /* Layer _RAR: Various special keys.
-     *          - The key which switches between Default and Alternate base layer.
-     *          - Power keys
-     *            The power keys have to be pressed with Shift, as a safety guard.
-     *            Without shift they write their name, as if someone typed it.
-     *          - Media keys
-     *          - Brightness for screen keys (depends on computer system if it works)
-     *          - Leds of keyboard on/off
-     *          - Unicode input mode
-     *            ☑  precedes the Unicode input modes, as memory aid and tester
-     *               Note that ☑ has no letters in its Unicode, but press with Shift for 🗹 
-     *               which does. This matters when testing ‛descramble’ Dvorak mode.
-     *          - Capslock is on its normal position
-     *          - Insert
-     *          - APP (whatever it is) fakes being next to right GUI (though other layer).
-     *          - The traditional obsolete button like ScrLk/PrtSc are also included, in
-     *            case some program needs them.
-     *          - Speed measuring
-     *          - Text size measuring
-     *          - Some unused spots remaining.
-     */
-
-    [ _RAR ] = LAYOUT_redefined (
-
-/*
-     _RAR (RARe keys. Power keys, Unicode mode, Alternate BASE, Media, Brightness, Speed, leds, …)
-    
-     <pink2<pinky <ring <middl <indexx<indx2| indx2>index>middl>ring> pinky> pink2>
-                                           <|>      -*-                                //(toggle) on _FUN
-     BASE  Cnt/Mx Cnull CWmin  CRprt  Speed | SRprt Play  Next  Prev  Stop RSht(•)   
-     CapsL Power• Wake• Sleep• Pause• ScrLk | PrtSc xxx   Vol+  Vol-  Mute Insert     // • requires Shift
-     ☑     uLNX   uBSD  uOSX   uWIN   uWNC  | xxx   xxx   Bri+  Bri-  xxx     APP     // Ü(nicode) tester
-     ----------------------------------------------------------------------------
-     SLed  MLeds RGUI  xxx  | !Alter  xxx   LGUI  ___            // Middle-led, Side-leds, ! 'alternate'
-                           <|>                    -*-                                   // (Hold) on BASE
-     <1 ±  <2  ± <3    <4   | 4>      3>    2>  ± 1>  
-        …                                       …
- */
-//
-//      <pink2    , <pinky           , <ring            , <middl           , <index           , <indx2           |, indx2>        , index>  , middl>           , ring>              , pinky>  , pink2>        ,
-//                ,                  ,                  ,                  , -*-              ,                 <|,>              ,         ,                  ,                    ,         ,               ,
-        CTO_BASE  , COUNT_TOG        , COUNT_NULL       , COUNT_WORDMIN    , COUNT_REPORT     , SPEED_TOG         , SPEED_REPORT  , KC_MPLY , KC_MNXT          , KC_MPRV            , KC_MSTP , KC_RSFT       ,
-        KC_CAPS   , C_KC_PWR         , C_KC_WAKE        , C_KC_SLEP        , C_KC_PAUS        , KC_SCRL           , KC_PSCR       , XXXXXXX , KC_VOLU          , KC_VOLD            , KC_MUTE , KC_INS        ,
-        XP_DRA_CG , UC_LINX          , UC_BSD           , UC_MAC           , UC_WIN           , UC_WINC           , XXXXXXX       , XXXXXXX , KC_BRIGHTNESS_UP , KC_BRIGHTNESS_DOWN , XXXXXXX , KC_APP        ,
-//      -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-        LEDS_ON  
-#     ifdef TRANSMINIVAN_LEFTSIDE
-                , TRANS_LEFT
-#     endif
-
-#     ifdef MORE_KEY__COMMAND
-                , MORE_key1
-#     endif
-
-#     ifdef LEDS_OFF_BASE_DEF  // This messes with led effect on/off, so we need to track the state of this setting now.
-                , RGBTOG_ 
-#     else                     // Here we don't mess with led effect on/off, so we can use QMK key blindly.
-                , RGB_TOG
-#     endif
-                          , KC__XGUI , XXXXXXX 
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                               , TRANS_MIDLEFT
-#     endif
-
-                                               , OTHER_BASE , XXXXXXX 
-
-#     ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                      , TRANS_RIGHT
-#     endif                                                           
-                                                                      
-                                                                      , KC__YGUI
-                                                                      
-#     ifdef MORE_KEY__ARROW                                           
-                                                                      , MORE_key2  
-#     endif                                                           
-                                                                                 , _______
-//              ,         ,          ,       <|,>        ,            ,          ,
-//      <1 ± ±  , <2      , <3       , <4     |, 4>      , 3>         , 2>       , ±  ±  1>
-
-                      ),
-
-# endif // BASESFILE_LAYER_RAR
-
-        /* ⬆⬇ */
-
-# ifndef REMOVE_PAD // This removes all references to _PAD in the code, therefore is not functionally the same as BASESFILE_LAYER_PAD
-
-#     ifndef BASESFILE_LAYER_PAD // Use a definition of this layer in the ./bases_* file, where this #define can be defined.
-
-#         ifndef NUMPAD_COMMON_SQUARE // Use default _PAD layer, where numbers are aligned as they are on _NSY.
-                                  // Conversely, if this is defined, this layer will resembel a numeric keypad.
-                                  // See also base_numpad.c 
-
-    /* Layer _PAD: Numbers pad, for numbers pad version of numbers (computer programs can see the difference).
-     *             Number pad navigation will be more or less useless, but there is a repetition of the Numpad
-     *             keys 4,2,8,6 row 4 for arrows, and 3,1,7,9 row 2 for navigation, to make it a little easier to find.
-     */
-
-    [ _PAD ] = LAYOUT_redefined (
-
-/*
-     Layer _PAD Numbers Pad (special symbol versions; regular '1' is not the same as this numpad '1', etc)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                    -*-                    <|>                                         //(toggle) on _FUN
-     BASE     xxx   xxx   .DEL  4LEFT 2DOWN | 8UP   6RGHT *     xxx   xxx      Bksp
-     LCtl     1END  2DOWN 3PGDN 4LEFT 5     | 6RGHT 7HOME 8UP   9PGUP 0INS        -
-     LSht     xxx   xxx   /     xxx   =     | +     3PGDN 1END  7HOME 9PGUP    RSht
-     -*---------------------------------------------------------------------------- //-*-  toggle on BASE
-     LAlt     Del   Tab   ENT  |  NUML  xxx   LGUI  RAlt
-                              <|>
-     <1   ±   <2    <3    <4   |  4>    3>    2>  ± 1>  
-          …                                       …
-
- */
-
-//
-//      <pink2   , <pinky  , <ring   , <middl      , <index  , <indx2     |, indx2>     , index>  , middl>         , ring>   , pinky>  , pink2>      ,
-//               ,         ,         ,             ,         , -*-       <|,>           ,         ,                ,         ,         ,             ,
-        CTO_BASE , XXXXXXX , XXXXXXX , KC_KP_DOT   , KC_KP_4 , KC_KP_2     , KC_KP_8    , KC_KP_6 , KC_KP_ASTERISK , XXXXXXX , XXXXXXX , KC_BSPC     ,
-        KC_LCTL  , KC_KP_1 , KC_KP_2 , KC_KP_3     , KC_KP_4 , KC_KP_5     , KC_KP_6    , KC_KP_7 , KC_KP_8        , KC_KP_9 , KC_KP_0 , KC_KP_MINUS ,
-        KC_LSFT  , XXXXXXX , XXXXXXX , KC_KP_SLASH , XXXXXXX , KC_KP_EQUAL , KC_KP_PLUS , KC_KP_3 , KC_KP_1        , KC_KP_7 , KC_KP_9 , KC_RSFT     ,
-//      ----------------------------------------------------------------------------------------------------------------------------------------------
-        KC_LALT 
-
-#             ifdef TRANSMINIVAN_LEFTSIDE
-                , _______ // On Base layers this key typically defaults to MO ( _PAD )
-#             endif
-
-#             ifdef MORE_KEY__COMMAND
-                , MORE_key1
-#             endif
-
-                , KC_DEL , KC_TAB , KC_KP_ENTER
-
-#             ifdef TRANSMINIVAN_MIDLEFT
-                                                , TRANS_MIDLEFT
-#             endif
-
-                                                , KC_NUM , XXXXXXX , KC__YGUI
-
-#             ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                  , TRANS_RIGHT
-#             endif
-
-#             ifdef MORE_KEY__ARROW
-                                                                                  , MORE_key2  
-#             endif
-
-                                                                                  , KC_RALT
-//              ,        ,        ,           <|,>           ,         ,          ,
-//      <1  ± ± , <2     , <3     , <4         |, 4>         , 3>      , 2>       , ±  ±  1>
-
-                      ),
-
-#         else // NUMPAD_COMMON_SQUARE 
-
-    [ _PAD ] = LAYOUT_redefined (
-
-/*
-     
-     * Layer _PAD: Option for a different _PAD layer in the common layers system.
-     *             This variety resembles the square layout of a numerical keyboard.
-     *             It is different from one of the Numpad Base layer compile options, in that
-     *             it only has a number pad for the right hand. It is also different in featuring
-     *             modifiers, and the overall layout is sligthly different (Enter, = symbol).
-     *
-     *             ‛Tab’ on key 3 left hand is the same as the other _PAD layer option (with the
-     *             numbers in a line, equal to the _NSY layer), to retain the same ability to
-     *             type Control-Tab. It seems better to have RAlt in its usual place, Enter in
-     *             its usual place, than to strictly follow a standard numeric keyboard layout
-     *             (which puts Enter somewhere on the right, row 1). It seems easy enough to
-     *             type Enter on this key as well, even with the right hand. Numlock is also
-     *             in its usual place. Note that ‛Del’ on the left, row 1, is not a numbers pad
-     *             Delete/Dot key, but standard Delete, also in the usual place.
-     *
-     *             This is probably the better one of the square layout numpads, unless you have a use
-     *             for the two hands version. This is also available on ‛Base’ Numpad.
-     * 
-     
-     Layer _PAD (Number pad, with NumLock on)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     BASE     xxx   xxx   xxx   xxx   xxx   | =     7     8     9    -   Bspc
-     LCtl     xxx   xxx   xxx   xxx   xxx   | *     4     5     6    +   RCtl
-     LSht     xxx   xxx   xxx   xxx   xxx   | /     1     2     3    ,   RSht  
-     ------------------------------------------------------------------------
-                   LAlt   Del    Tab   Ent  | NumL  0     .     RAlt      
-                                           <|>           
-                   <1   ±  <2    <3    <4   | 4>    3>    2>  ± 1>  
-                        …                   |                 …           
-
-     Layer _PAD (Number pad, with NumLock off)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring >pin>pink2>
-                                           <|>
-     BASE     xxx   xxx   xxx   xxx   xxx   | =     Home  Up    PgUp  -   Bspc
-     LCtl     xxx   xxx   xxx   xxx   xxx   | *     Left  5     Right +   RCtl
-     LSht     xxx   xxx   xxx   xxx   xxx   | /     End   Down  PgDn  ,   RSht  
-     -------------------------------------------------------------------------
-                   LAlt   Del    Tab   Ent  | NumL  Ins   Del   RAlt      
-                                           <|>
-                   <1   ±  <2    <3    <4   | 4>    3>    2>  ± 1>  
-                        …                   |                 …           
- 
-*/
-
-//
-//      <pink2   , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>         , index>  , middl>  , ring>   , pinky>      , pink2>  ,
-//               ,         ,         ,         ,         , -*-   <|,>               ,         ,         ,         ,             ,         ,
-        CTO_BASE , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_KP_EQUAL    , KC_KP_7 , KC_KP_8 , KC_KP_9 , KC_KP_MINUS , KC_BSPC ,
-        KC_LCTL  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_KP_ASTERISK , KC_KP_4 , KC_KP_5 , KC_KP_6 , KC_KP_PLUS  , KC_RCTL ,
-        KC_LSFT  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_KP_SLASH    , KC_KP_1 , KC_KP_2 , KC_KP_3 , KC_KP_COMMA , KC_RSFT ,
-//      -----------------------------------------------------------------------------------------------------------------------------------
-        KC_LALT 
-
-#             ifdef TRANSMINIVAN_LEFTSIDE
-                , TRANS_LEFT  
-#             endif
-
-#             ifdef MORE_KEY__COMMAND
-                , MORE_key1
-#             endif
-
-                , KC_DEL     , KC_TAB , KC_KP_ENTER  
-
-#             ifdef TRANSMINIVAN_MIDLEFT
-                                                    , TRANS_MIDLEFT
-#             endif
-
-                                                    , KC_NUM , KC_KP_0 
-
-// See comment in ./base_numpad.c on the first layout (double handed Base layer), about the next few keys:
-// This layer follows that layout Base Numpad.
-// ---⬇
-
-#     ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                           , TRANS_RIGHT   
-#     endif                                                                                     
-                                                                                            
-#     ifdef MORE_KEY__ARROW                                                                     
-                                                                         //, MORE_key2   
-                                                                           , KC__YGUI
-#     endif                                                                                           
-// ---⬆
-                                                                           , KC_KP_DOT  
-
-                                                                                       , KC_RALT
-//              ,            ,        ,           <|,>           ,         ,           ,
-//      <1  ± ± , <2         , <3     , <4         |, 4>         , 3> ± ±  , 2>        ,       1>
-
-                      ),
-
-
-#         endif // NUMPAD_COMMON_SQUARE 
-
-#     endif // BASESFILE_LAYER_PAD
-
-# endif // REMOVE_PAD
-
-        /* ⬆⬇ */
-
-# ifndef REMOVE_ACC // This cuts out the whole _ACC layer.
-
-#     ifndef BASESFILE_LAYER_ACC // Use a definition of this layer in the ./bases_* file, where this #define can be defined.
-
-    /* Layer _ACC: Accented and other unusual characters. It seems this would
-     *             cover Dutch, German, French, Scandinavia, Italy and Spain.
-     *          It should helps with remembering what keys are where, if one
-     *             knows the logic behind it (however flawed it might be).
-     *          This layer has the uncluttered Tab key (whoohoo!).
-     *
-     *          The logic is ... Versions of the vowels with accents are
-     *                              widened vertically on the board, from their
-     *                              normal position.
-     *                           Grave is a line going up, thus on upper row. é
-     *                           Acute is a line going down, thus on lower row. è
-     *                           Diaereses is dots going horizontal, thus middle. ë
-     *                           Diareses is umlaut which is most frequent if
-     *                              including German, thus home row. ë
-     *                           There is no room for Caret on the left, thus it is
-     *                              on the right, following same-finger logic (O 
-     *                              is ring finger, etc).
-     *                           Caret is on the lower row to make room for versions 
-     *                              of 'n' and 'c' near their normal position.
-     *                           There is no room for ÿŸ on the normal y, because
-     *                              íÍ is on it, which is more important, and to
-     *                              keep the logic of that block, therefore it is
-     *                              as close to it as can be.
-     *                           øØ and åÅ follow the same-finger logic (a is left
-     *                              hand pinky, etc), and are on remaining spots.
-     *                           œŒ and æÆ are also no remaining spots, both close
-     *                              to êÊ for the e in there, the œŒ being further
-     *                              to the left to follow the same finger logic on
-     *                              that right hand side: a on the right, o on the left.
-     *                           ¡ and ¿ had no more room on this layer, therefore,
-     *                              and because they are unusual, they are on the 
-     *                              _DRA(wings) layer. They are located under the keys
-     *                              that also have ! and ?, respectively.
-     *
-     */ 
-
-    [ _ACC ] = LAYOUT_redefined (
-
-/*
-     Layer _ACC (ACCented characters, see _RAR layer for input modes)
-    
-     <pink2    <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                       -*-              <|>                                            //(toggle) on _FUN
-     BASE      áÁ    óÓ    éÉ    úÚ    íÍ    | ýÝ    ijIJ    çÇ    øØ    åÅ    Bksp
-     RCTL(Tab) äÄ    öÖ    ëË    üÜ    ïÏ    | ÿŸ    œŒ    æÆ    ñÑ     ß       μ
-     LSht      àÀ    òÒ    èÈ    ùÙ    ìÌ    | îÎ    ûÛ    êÊ    ôÔ    â    RSht
-     ----------------------------------------------------------------------------
-     LAlt ___   ___   Ent  | Spc   ___   ___   RAlt 
-          -*-             <|>                                                            //(hold) on BASE
-     <1 ± <2    <3    <4   | 4>    3>    2>  ± 1>  
-        …                                    …
- */
-//
-//      <pink2          , <pinky    , <ring     , <middl    , <index    , <indx2   |, indx2>    , index>    , middl>    , ring>     , pinky>    , pink2>    ,
-//                      ,           ,           ,           ,           ,         <|,>-*-       ,           ,           ,           ,           ,           ,
-        CTO_BASE        , XP_ACC_AA , XP_ACC_AB , XP_ACC_AC , XP_ACC_AD , XP_ACC_AE , XP_ACC_AF , XP_ACC_AG , XP_ACC_AH , XP_ACC_AI , XP_ACC_AJ , KC_BSPC   ,
-        LCTL ( KC_TAB ) , XP_ACC_BA , XP_ACC_BB , XP_ACC_BC , XP_ACC_BD , XP_ACC_BE , XP_ACC_BF , XP_ACC_BG , XP_ACC_BH , XP_ACC_BI , XP_ACC_BJ , XP_ACC_BK , 
-        KC_LSFT         , XP_ACC_CA , XP_ACC_CB , XP_ACC_CC , XP_ACC_CD , XP_ACC_CE , XP_ACC_CF , XP_ACC_CG , XP_ACC_CH , XP_ACC_CI , XP_ACC_CJ , KC_RSFT   ,
-//      ----------------------------------------------------------------------------------------------------------------------------------------------
-        KC_LALT 
-#         ifdef TRANSMINIVAN_LEFTSIDE
-                        , TRANS_LEFT
-#         endif
-
-#         ifdef MORE_KEY__COMMAND
-                        , MORE_key1
-#         endif
-
-                        , _______ , _______ , KC_ENT  
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                                     , TRANS_MIDLEFT
-#     endif
-
-                                                     , KC_SPC , _______ , _______ 
-
-#         ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                  , TRANS_RIGHT
-#         endif                                              
-                                                             
-#         ifdef MORE_KEY__ARROW                              
-                                                                                  , MORE_key2  
-#         endif                                              
-                                                             
-                                                                                  , KC_RALT
-//              , -*-     ,         ,      <|,>               ,         ,         , 
-//      <1 ± ±  , <2      , <3      , <4    |, 4>             , 3>      , 2>      , ±  ±  1>
-
-                      ),
-
-#     endif // BASESFILE_LAYER_ACC
-
-# endif // REMOVE_ACC
-
-        /* ⬆⬇ */
-
-# ifndef REMOVE_DRA // This cuts out the whole _DRA layer
-
-#     ifndef BASESFILE_LAYER_DRA // Use a definition of this layer in the ./bases_* file, where this #define can be defined.
-
-    /* Layer _DRA: Drawings, like various Unicode symbols.
-     *   
-     */
-
-    [ _DRA ] = LAYOUT_redefined (
-
-/*
-     Layer _DRA (DRAwings, whatever else (rendering width varies in different applications))
-    
-     <pink2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                             -*-        <|>                                            //(toggle) on _FUN
-     BASE  “„    ”≤    £≥    ∅ ¢   ±ƒ    | ❦♥    🙂🙁  👍👎   ⁽₍    ⁾₎    Bksp
-     Tab   ¹₁    ²₂    ³₃    ⁴₄    ⁵₅    | ⁶₆    ⁷₇    ⁸₈     ⁹₉    ⁰₀    RCTL
-     LSht 「━    」─   °〇   •§    …·    | ⮘⮙   ⮚⮛     ¿¡    《┄    》┅   RSht
-     -------------------------------------------------------------------------
-     LAlt ___   ___   Ent  | Spc   ___   ___   RAlt 
-                -*-       <|>      -*-                                                   //(hold) on BASE
-     <1 ± <2    <3    <4   | 4>    3>    2>  ± 1>  
-        …                                    …
- */
-//
-//      <pink2   , <pinky    , <ring     , <middl    , <index    , <indx2   |, indx2>    , index>    , middl>    , ring>     , pinky>    , pink2>  ,
-//               ,           ,           ,           ,           ,         <|,>          , -*-       ,           ,           ,           ,         ,
-        CTO_BASE , XP_DRA_AA , XP_DRA_AB , XP_DRA_AC , XP_DRA_AD , XP_DRA_AE , XP_DRA_AF , XP_DRA_AG , XP_DRA_AH , XP_DRA_AI , XP_DRA_AJ , KC_BSPC ,
-        KC_TAB   , XP_DRA_BA , XP_DRA_BB , XP_DRA_BC , XP_DRA_BD , XP_DRA_BE , XP_DRA_BF , XP_DRA_BG , XP_DRA_BH , XP_DRA_BI , XP_DRA_BJ , KC_RCTL ,
-        KC_LSFT  , XP_DRA_CA , XP_DRA_CB , XP_DRA_CC , XP_DRA_CD , XP_DRA_CE , XP_DRA_CF , XP_DRA_CG , XP_DRA_CH , XP_DRA_CI , XP_DRA_CJ , KC_RSFT ,
-//      --------------------------------------------------------------------------------------------------------------------------------------------
-        KC_LALT 
-
-#         ifdef TRANSMINIVAN_LEFTSIDE
-                , TRANS_LEFT
-#         endif
-
-#         ifdef MORE_KEY__COMMAND
-                , MORE_key1
-#         endif
-
-                , _______ , _______ , KC_ENT
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                             , TRANS_MIDLEFT
-#     endif
-
-                                             , KC_SPC , _______ , _______ 
-
-#         ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                          , TRANS_RIGHT
-#         endif
-
-#         ifdef MORE_KEY__ARROW
-                                                                          , MORE_key2  
-#         endif                          
-
-                                                                          , KC_RALT
-//              ,         ,         ,      <|,>       ,         ,         ,
-//      <1 ± ±  , <2      , <3      , <4    |, 4>     , 3>      , 2>      , ±  ±  1>
-
-                      ),
-
-#     endif // BASESFILE_LAYER_RAR
-
-# endif // REMOVE_DRA
-
-        /* ⬆⬇ */
-
-# ifndef REMOVE_BON // Removes this layer entirely, if set.
-
-#     ifndef BASESFILE_LAYER_BON // Use a definition of this layer in the ./bases_* file, where this #define can be defined.
-
-/* 
- * Bonus layer: Enumeration numbers, some general purpose / mathematical symbols
- * ⁻ is an exponential minus sign (the center-dot · can be used in exponents too)
- * × is multiplication
- * ‰ is promille, ‱ is pro-tenthousandth
- * 
- */
-
-    [ _BON ] = LAYOUT_redefined (
-
-/* 
-     Layer _BON (Bonus layer, a variety of more stuffs.)
-
-     <pink2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                   -*-  <|>
-     BASE  ‛ 🛠  ’ ⬆   ¤ 🄯   ∑ ©   ‰ ‱   | ★ ٭   😊 ⍨  ×  ⃰   √     ⁻ ⁺    Bksp
-     `~    ① ⬅   ② ⬇   ③ ➡   ④ ┏   ⑤  ┓  | ⑥ ┃   ⑦ ┇   ⑧ ╋   ⑨     ⓪ ∞    — ≈    // — is a dash (larger), not hyphen
-     LSht  ‹     ›     ÷     ☞ ┗   ≠  ┛  | ✗ ┣   ✓ ┫   ⚠     «     »      RSht
-     -------------------------------------------------------------------------
-     Left  ___   ___   Ent  | Spc   ___   ___   Right
-           -*-   -*-       <|>      -*-                                                   // Activation on BASE
-     <1  ± <2    <3    <4   | 4>    3>    2>  ± 1>  
-         …                                    …
- */
-//
-//      <pink2      , <pinky    , <ring     , <middl    , <index    , <indx2   |, indx2>    , index>    , middl>    , ring>     , pinky>    , pink2>    ,
-//                  ,           ,           ,           ,           ,         <|,>          ,           ,           ,           ,           ,           ,
-        CTO_BASE    , XP_BON_AA , XP_BON_AB , XP_BON_AC , XP_BON_AD , XP_BON_AE , XP_BON_AF , XP_BON_AG , XP_BON_AH , XP_BON_AI , XP_BON_AJ , KC_BSPC   ,
-        KC_GRV      , XP_BON_BA , XP_BON_BB , XP_BON_BC , XP_BON_BD , XP_BON_BE , XP_BON_BF , XP_BON_BG , XP_BON_BH , XP_BON_BI , XP_BON_BJ , XP_BON_BK ,
-        KC_LSFT     , XP_BON_CA , XP_BON_CB , XP_BON_CC , XP_BON_CD , XP_BON_CE , XP_BON_CF , XP_BON_CG , XP_BON_CH , XP_BON_CI , XP_BON_CJ , KC_RSFT   ,
-//      -------------------------------------------------------------------------------------------------------------------------------------------------
-        KC_LEFT 
-
-#         ifdef TRANSMINIVAN_LEFTSIDE
-                , TRANS_LEFT
-#         endif
-
-#         ifdef MORE_KEY__COMMAND
-                , MORE_key1
-#         endif                 
-
-                , _______ , _______ , KC_ENT
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                             , TRANS_MIDLEFT
-#     endif
-
-                                             , KC_SPC , _______ , _______
-
-#         ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                          , TRANS_RIGHT
-#         endif
-
-#         ifdef MORE_KEY__ARROW                    
-                                                                          , MORE_key2  
-#         endif                                                                                           
-                                                                          , KC_RIGHT
-//              ,         ,         ,      <|,>       ,         ,         ,
-//      <1  ± ± , <2      , <3      , <4    |, 4>     , 3>      , 2>      , ± ± 1>
-
-                      ),
-
-#     endif // BASESFILE_LAYER_BON
-
-# endif // REMOVE_BON 
-
-        /* ⬆⬇ */
-                          
-# ifndef BASESFILE_LAYER_FUN // Use a definition of this layer in the ./bases_* file, where this #define can be defined.
-
-    /* Layer _FUN: Function keys until F20. Some combo modifiers control/alt/shift
-     * Toward any layer by toggle. Layer can be set to return to BASE after one F-key press (FUN<, row 1)
-     */
-
-    [ _FUN ] = LAYOUT_redefined ( 
-
-/*
-     Layer _FUN (F-keys, Layer access, Set BASE key direction)
-    
-     <pink2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-     toggl toggl set   toggl toggl toggl | toggl toggl                            // Type of layer switch
-                                        <|>                                       
-     BASE: NUMS: _PAD  _ACC  _DRA  _BON  | _MOV  _RAR  xxx   xxx   xxx    Bksp       //':' are dynamic ...
-     LCtl  F1    F2    F3    F4    F5    | F6    F7    F8    F9    F10    RCtl
-     LSht  F11   F12   F13   F14   F15   | F16   F17   F18   F19   F20    RSht     
-     ----------------------------------------------------------------------*--       //-*-  toggle on BASE
-     LAlt  LCtl&  LCtl&  LSht&  | FUN< +LCtl&LSht LGUI   RAlt                        //... < toggle 'stay'
-           LSht   LAlt   LAlt   |      &LAlt                                    
-           +xxx   +xxx   +xxx   |      +xxx
-                               <|>
-     <1  ± <2     <3     <4     | 4>   3>         2>  ±  1>                
-         …                                            …
- */
-//
-//      <pink2   , <pinky   , <ring       , <middl   , <index   , <indx2    |, indx2>      , index>      , middl>  , ring>   , pinky>  , pink2>  ,
-//               ,          , -*-         ,          ,          ,          <|,>            ,             ,         ,         ,         ,         ,
-        CTO_BASE , CTO_NUMS , TO ( _PAD ) , CTO_ACCE , CTO_DRAW , TO ( _BON ), TO ( _MOV ) , TO ( _RAR ) , XXXXXXX , XXXXXXX , XXXXXXX , KC_BSPC ,
-        KC_LCTL  , KC_F1    , KC_F2       , KC_F3    , KC_F4    , KC_F5      , KC_F6       , KC_F7       , KC_F8   , KC_F9   , KC_F10  , KC_RCTL ,
-        KC_LSFT  , KC_F11   , KC_F12      , KC_F13   , KC_F14   , KC_F15     , KC_F16      , KC_F17      , KC_F18  , KC_F19  , KC_F20  , KC_RSFT ,
-//      ------------------------------------------------------------------------------------------------------------------------------------------
-        KC_LALT 
-#     ifdef TRANSMINIVAN_LEFTSIDE
-                , TRANS_LEFT
-#     endif
-
-#     ifdef MORE_KEY__COMMAND
-                , MORE_key1
-#     endif
-
-                , MT ( MOD_LCTL | MOD_LSFT, XXXXXXX ) , MT ( MOD_LCTL | MOD_LALT , XXXXXXX ) , MT ( MOD_LSFT | MOD_LALT , XXXXXXX )
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                                                                                                                    , TRANS_MIDLEFT
-#     endif
-
-                                                                                                                                    , _FUN_STAY , MT ( MOD_LCTL | MOD_LSFT | MOD_LALT , XXXXXXX ) , KC__YGUI
-
-#     ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                                                                                                                                             , _______ // On Base layers this key typically defaults to MO ( _FUN )
-#     endif
-
-#     ifdef MORE_KEY__ARROW
-                                                                                                                                                                                                             , MORE_key2  
-#     endif
-                                                                                                                                                                                                             , KC_RALT
-//              ,                                     ,                                      ,                                    <|,>          ,                                                 ,          ,
-//      <1 ± ±  , <2                                  , <3                                   , <4                                  |, 4>        , 3>                                              , 2>       , ±  ±  1>
-
-                      ),
-
-# endif // BASESFILE_LAYER_FUN
-
-        /* ⬆  */
-
-
-/*
- * New layer template. Includes left/right movement arrows, deletion, modifiers.
- * If you want a new layer, in the logic of this layout you would add a toggle on the
- * _FUN layer top row on the first free key to it, and optionally alter the hold 
- * layer switch keys on the base layers. (Check if a new layer will fit on the chip.)
- *
-    [ _??? ] = LAYOUT_redefined (
-
-// <pink2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-//                                    <|>
-// BASE  xxx   xxx   xxx   xxx   xxx   | xxx   xxx   xxx   xxx   xxx    Bksp
-// LCtl  xxx   xxx   xxx   xxx   xxx   | xxx   xxx   xxx   xxx   xxx    RCtl
-// LSht  xxx   xxx   xxx   xxx   xxx   | xxx   xxx   xxx   xxx   xxx    RSht
-// -------------------------------------------------------------------------
-// LAlt+Left Del   ___   Ent  | Spc   ___   ___   RAlt+Right
-//                           <|>
-// <1   ±    <2    <3    <4   | 4>    3>    2>  ± 1>  
-//      …                                       …
-//
-//
-//      <pink2   , <pinky  , <ring   , <middl  , <index  , <indx2 |, indx2>  , index>  , middl>  , ring>   , pinky>  , pink2>  ,
-//               ,         ,         ,         ,         ,       <|,>        ,         ,         ,         ,         ,         ,
-        CTO_BASE , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_BSPC ,
-        KC_LCTL  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_RCTL ,
-        KC_LSFT  , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_RSFT ,
-//      ------------------------------------------------------------------------------------------------------------------------
-        LALT_T ( KC_LEFT ) 
-
-# ifdef TRANSMINIVAN_LEFTSIDE
-                           , TRANS_LEFT
-# endif
-
-# ifdef MORE_KEY__COMMAND
-                           , MORE_key1
-# endif                 
-
-                           , KC_DEL , XXXXXXX , KC_ENT
-
-#     ifdef TRANSMINIVAN_MIDLEFT
-                                                       , TRANS_MIDLEFT
-#     endif
-
-                                                       , KC_SPC , XXXXXXX , XXXXXXX
-
-# ifdef TRANSMINIVAN_RIGHTSIDE
-                                                                                    , TRANS_RIGHT
-# endif
-
-# ifdef MORE_KEY__ARROW
-                                                                                    , MORE_key2  
-# endif                                                                                          
-
-                                                                                    , RALT_T ( KC_RIGHT )
-//                         ,        ,         ,      <|,>       ,         ,         ,
-//      <1      ± ±        , <2     , <3      , <4    |, 4>     , 3>      , 2>      , ± ± 1>
-
-                      ),
-*/
-
-};
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/minifan_config_compact.h b/keyboards/thevankeyboards/minivan/keymaps/josjoha/minifan_config_compact.h
deleted file mode 100644
index 932acf2a827..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/minifan_config_compact.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
-* © 2020,2021 by Jos Boersema
- */
-
-#pragma once
-
-/* 
- * If MINIFAN_CONFIG_COMPACT in ./user_config.h ⬇
- */
-      
-//#define BASE_QWERTY__DEF_BASE 
-//#define BASE_QWERTY__ALT_BASE
-//#define BASE_QWERTY_BASEARROW__DEF_BASE // ➡ base_qwerty_basearrow.h
-//#define BASE_QWERTY_BASEARROW__ALT_BASE // ➡ base_qwerty_basearrow.h
-  #define BASE_DVORAK__DEF_BASE
-//#define BASE_DVORAK__ALT_BASE
-//#define BASE_DVORAK_DESCRAMBLE__ALT_BASE 
-//#define BASE_COLEMAK__DEF_BASE
-//#define BASE_COLEMAK__ALT_BASE 
-//#define BASE_WORKMAN__DEF_BASE
-//#define BASE_WORKMAN__ALT_BASE
-//#define BASE_NUMPAD__ALT_BASE // ➡ base_numpad.h
-//#define BASE_HEBREW__DEF_BASE // ➡ base_hebrew.h
-  #define BASE_HEBREW__ALT_BASE // ➡ base_hebrew.h
-
-//#define MINIFAN_SINGLE_LAYOUT 
-
-//#define STARTUP_ALTERNATE 
-//#define STARTUP_SIDE_LEDS_OFF
-//#define STARTUP_MID_LED_OFF 
-//#define STARTUP_SPEED
-//#define STARTUP_COUNT
-
-//#define MORE_KEY__COMMAND 
-//#define MORE_KEY__ARROW  
-
-//#define TRANSMINIVAN_LAYOUT ....... 
-//#define TRANSMINIVAN_LEFTSIDE  
-  #define TRANS_LEFT XXXXXXX    
-//#define TRANSMINIVAN_MIDLEFT   
-  #define TRANS_MIDLEFT XXXXXXX 
-//#define TRANSMINIVAN_RIGHTSIDE 
-  #define TRANS_RIGHT XXXXXXX   
-
-//#define MORE_key1_BASE TG ( _RAR ) 
-//#define MORE_key1_BASE KC_DEL     
-  #define MORE_key1_BASE KC__XGUI  
-//#define MORE_key1      KC_DEL   
-  #define MORE_key1      KC__XGUI
-  #define MOREKEY2_ARROW_CLUSTER 
-//#define MOREKEY2_ADD_NAVIGATION 
-  #define MORE_key2 _MOV_UP 
-//#define MORE_key2 KC_DEL 
-
-  #define ARROWS_TRIANGLE 
-//#define VI_SWITCHERYDOO 
-
-  #define NUMPAD_COMMON_SQUARE 
-
-  #define SPEED_COUNTDOWN 25 
-  #define SPEED_HUE_STEP 8 
-  #define SPEED_HUE_START 160 
-  #define WORDS_PER_MINUTE 
-
-//#define BASE_RIGHT_ALT 
-//#define SWITCH_GUIS 
-//#define UNICODE_CURRENCY 0x20ac 
-//#define POINT_ON_CHECKBOXES 
-//#define SWITCH_BASE_ROW1_23 
-//#define SWITCH_HOLD_ACC_NSY 
-  #define SWITCH_LSHIFT_PAD_MOV
-  #define SWITCH_RSHIFT_FUN_RAR
-//#define SPACE_LEFT__ENTER_RIGHT 
-
-//#define REMOVE_PAD 
-//#define REMOVE_ACC 
-//#define _ACC_KEY_ALT_LAYER _BON 
-//#define _ACC_KEY_ALT_LAYER _DRA 
-//#define REMOVE_DRA 
-//#define _DRA_KEY_ALT_LAYER _ACC 
-//#define _DRA_KEY_ALT_LAYER _BON
-//#define REMOVE_BON 
-//#define _BON_KEY_ALT_LAYER _ACC 
-//#define _BON_KEY_ALT_LAYER _DRA 
-//#define ALL_DRA_BON_EVISCERATIONS 
-  #define BOX_DRAWINGS 
-  #define SUB_SCRIPT_NUMS 
-  #define FULL_DRA_2NDROW 
-  #define FULL_DRA_4THROW 
-  #define FULL_BON_4THROW 
-
-//#define LEDS_OFF_BASE_DEF 
-//#define LEDS_OFF_BASE_ALT
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/readme.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/readme.md
deleted file mode 100644
index a535a6f1f98..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/readme.md
+++ /dev/null
@@ -1,1252 +0,0 @@
-# Minivan keyboard layout _Minifan_
-A 40% keyboard made first by TheVan Keyboards
-_https://thevankeyboards.com_ now taken over by TKC
-_https://thekey.company_
-
-![Minivan layout all](http://socialism.nl/misc/minivan/minivan-all-layers-visualization_vd.jpg)
-
-Table of Contents
-=================
-
-      1  Overview
-          1.1 Hardware compatibility
-          1.2 Software compatibility
-      2  'make' example
-      3  Base layouts
-          3.1  Normal layouts
-                3.1.1 Qwerty
-                3.1.2 Qwerty with arrows on Base
-                3.1.3 Dvorak
-                3.1.4 Dvorak² 
-                3.1.5 Colemak
-                3.1.6 Workman
-          3.2 Special layouts
-                3.2.1 Numbers pad
-          3.3 Non-Latin languages
-                3.3.1 Hebrew
-      4 The common system
-          4.1 Layer access
-          4.2 Layout in graphics
-          4.3 Layout in text
-          4.4 Movement layer options
-          4.5 Numbers pad layer options
-      5 Led colors for layers
-      6 Compile options
-      7 Language support
-          7.1 Input methods
-          7.2 Unicode symbols
-      8 Speed measuring
-          8.1 Speed Led color compilation assist
-      9 Text size measuring
-          9.1 Text size Usage
-     10 Making your own base layer(s)
-     11 Evisceration
-     12 Key associations
-          12.1 Compared to regular keyboard
-     13 Trouble shooting
-        • Compiling
-        • Unicode
-        • Leds
-        • Weird layer jumping
-        • Difficult/impossible key combinations ?
-     14 Why you want this layout
-     15 BUGS
-     16 Resources
-     17 Author(s)
-
-1 Overview
-==========
-
-☑ _Intuitive:_ Key placement follows what a 10 finger typist is used
-  to on a regular keyboard. Similar keys meanings are on the same
-  key in different layers, or the same finger, etc. See also chapter
-  12, _Key associations._ Thumbs control the most used layer access.
-
-☑ _Feature rich:_ Dual layout, with several standard layouts to choose
-  from. Expanded character set. Measure typing speed and/or amount of text
-  typed. Mouse control, media control, power control, Unicode encoding for
-  several platforms. In total there are about 4 times as many key functions
-  than on a regular keyboard.
-
-☑ _Configurable:_ Choose between standard layouts (Qwerty, Dvorak, etc);
-  additional hardware keys ‛command/south-paw’ and/or ‛arrow’; movement
-  layer WASD or flat arrows/mouse; numbers pad similar to regular numbers
-  and/or like a regular numbers pad; and other settings. Easy to add your
-  own layers. See ![./user_config.h](./user_config.h)
-
-☒ What it does *not* do: work on a computer set to a non-English language,
-  such as German or French. (To add such functionality requires some work,
-  but it seems it should be possible. See ![./todo.md](./todo.md).)
-
-![Minivan illustration Overview layers](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization_1500_vg.jpg)
-
-By key view:
-
-![Minivan illustration Overview layers by key](http://socialism.nl/misc/minivan/minivan-all-layers-clear-visualization-by-key_2000_vi.jpg)
-
-1.1 Hardware compatibility
-==========================
-This keymap functions on _Minivan_ hardware variants with 44, 45 and
-46 keys.
-
-It may be fairly easily ported to 12x12x12x[11|12|13] keyboards.
-
-1.2 Software compatibility
-==========================
-This keymap relies on Unicode, in an attempt to avoid the 
-“dead key” system for accented characters on many non-English keyboards.
-You need to have Unicode input working on your computer.
-
-On a Linux computer operating system, this keymap is designed to work
-with this keyboard/language setting:
-
-        > setxkbmap -layout us
-        > echo $LANG
-        `en_US.UTF-8`
-
-If that works for you, you can type the most important characters in
-the western European group of languages, native from the keyboard.
-
-This keymap might not function as expected if you want to use a
-different keyboard language setting in your operating system.
-
-See also chapter 7 _Language support_.
-
-2 'make' example
-================
-     … Download the repository, resolve software dependencies etc..
-     … To change compile options: edit ./user_config.h (or `./minifan_config_compact.h`)
-     > cd […]/qmk_firmware
-     > make thevankeyboards/minivan:josjoha
-     > su
-     # dfu-programmer atmega32u4 erase
-     # dfu-programmer atmega32u4 flash thevankeyboards_minivan_josjoha.hex
-     # dfu-programmer atmega32u4 start
-
-This “Mini*fan*” layout is explained in several readme files, with
-links to the others files in this readme. The common system is explained
-in this readme.md file. The options for the letters and number/symbol
-layer pairs (two pairs in the dual layout) are explained in their
-separate readme file, see immediately below. Compile options are detailed
-in ![./user_config.h](./user_config.h)
-
-3 Base layouts
-==============
-Layouts are presented here in a sort of simplified key caps view.  If a
-base layer pair has its own user configuration options, they are located
-in `./base_NAME.h`.
-
-3.1 Normal layouts
-------------------
-These are layouts for commonly used configurations, such as Qwerty or Dvorak.
-
-3.1.1 Qwerty
-------------
-
-![Minivan layout impression](http://socialism.nl/misc/minivan/minivan_keycapview_qwerty_vc.jpg)
-
-For the readme about the Qwerty version, see ➡ ![base_qwerty.md](./base_qwerty.md) ⬅
-
-3.1.2 Qwerty with arrows on Base
---------------------------------
-
-![Minivan layout impression](http://socialism.nl/misc/minivan/minivan_keycapview_qwerty_basearrow_ve.jpg)
-
-For the readme about this Qwerty variation, see ➡ ![base_qwerty_basearrow.md](./base_qwerty_basearrow.md) ⬅
-
-3.1.3 Dvorak
--------------
-
-![Minivan layout impression](http://socialism.nl/misc/minivan/minivan_keycapview_dvorak_vc.jpg)
-
-For the readme about the Dvorak version, see ➡ ![base_dvorak.md](./base_dvorak.md) ⬅
-
-3.1.4 Dvorak² 
--------------
-
-![Minivan layout impression](http://socialism.nl/misc/minivan/minivan_keycapview_dvorak_descramble_vb.jpg)
-
-Regular Dvorak for a computer already set to Dvorak.
-
-For the readme about the Dvorak² version, see ➡ ![base_dvorak_descramble.md](./base_dvorak_descramble.md) ⬅
-
-3.1.5 Colemak
--------------
-
-![Minivan layout impression](http://socialism.nl/misc/minivan/minivan_keycapview_colemak_vc.jpg)
-
-For the readme about the Colemak version, see ➡ ![base_colemak.md](./base_colemak.md) ⬅
-
-3.1.6 Workman
--------------
-
-![Minivan layout impression](http://socialism.nl/misc/minivan/minivan_keycapview_workman_va.jpg)
-
-For the readme about the Workman version, see ➡ ![base_workman.md](./base_workman.md) ⬅
-
-3.2 Special layouts
-===================
-These are unusual layouts. Most people will probably only want one of these on the ‛Alternate’ layout,
-with a normal layout on ‛Default’. How this works is explained below.
-
-3.2.1 Numbers pad
------------------
-
-![Minivan layout impression](http://socialism.nl/misc/minivan/minivan_keycapview_numpad_single_va.jpg)
-
-For the readme about the Numpad version, see ➡ ![base_numpad.md](./base_numpad.md) ⬅
-
-
-3.3 Non-Latin languages
-=======================
-
-3.3.1 Hebrew
-------------
-
-![Minivan layout impression](http://socialism.nl/misc/minivan/minivan_keycapview_hebrew_vc.jpg)
-
-For the readme about the Hebrew version, see ➡ ![base_hebrew.md](./base_hebrew.md) ⬅
-
-
-4 The common system
-===================
-
-![Minivan layout impression](http://socialism.nl/misc/minivan/minivan_keycapview_common_vc.jpg)
-
-4.1 Layer access
-----------------
-The graphic below shows how layers are reached from the ‛Default base’ layer.
-
-This seems to be the place where one is supposed to say: “This is simple”. 
-It may look more confusing than it is. If you write down an alphabet A,B, ➡ Z,
-made arrows from every key on a keyboard picture to one of the letters, it could
-look just as confusing. When switching to a layer, you only think about where you
-want to go.
-
-![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-default-base-layer-activation_2000_vi.jpg)
-
-Each of the two base layers comes with its own second layer, typically
-numbers-symbols. The other layers are used common between the default and
-alternate base layers.  You can switch between the default base layer
-(typically letters), and another base layer, the alternate base layer
-(also typically letters), on the `_RAR` layer with key ‛Other Base’.
-
-                   Layer overview:                    Defined in:
-
-        • Default Letters / Base                   ┓
-        • Default Numbers-symbols                  ┃
-                                                   ┣ ./base_….c/md files
-              • Alternate Letters / Base           ┃
-              • Alternate numbers-symbols layout   ┛
-
-           • Numbers pad                           ┓
-           • Accented characters                   ┃
-           • Additional Unicode characters         ┃
-           • More Additional Unicode characters    ┣ ./keymap.c(etc)/readme.md
-           • Movement arrows/mouse                 ┃   “The common system”
-           • Function keys / layer toggles         ┃
-           • Power, media, Speed, Text size, etc.  ┛
-
-4.2 Layout in graphics
-----------------------
-
-![Minivan layout Image BASEdef](http://socialism.nl/misc/minivan/minivan_base_layer_hide_def_base_ve.jpg)
-Layer: `DEF_BASE`
-
-![Minivan layout Image NSYdef](http://socialism.nl/misc/minivan/minivan_nsy_layer_hide_def_base_vc.jpg)
-Layer: `DEF_NSY`
-
-![Minivan layout Image BASEalt](http://socialism.nl/misc/minivan/minivan_base_layer_hide_alt_base_ve.jpg)
-Layer: `ALT_BASE`
-
-![Minivan layout Image NSYalt](http://socialism.nl/misc/minivan/minivan_nsy_layer_hide_alt_base_vc.jpg)
-Layer: `ALT_NSY`
-
-![Minivan layout Image PAD](http://socialism.nl/misc/minivan/minivan_pad_layer_vc.jpg)
-Layer: `_PAD`
-
-^ See below for a different configuration of the numbers pad keys. See above for a Base layout for a numbers pad.
-
-![Minivan layout Image ACC](http://socialism.nl/misc/minivan/minivan_acc_layer_vd.jpg)
-Layer: `_ACC`
-
-![Minivan layout Image DRA](http://socialism.nl/misc/minivan/minivan_dra_layer_vd.jpg)
-Layer: `_DRA`
-
-![Minivan layout Image BON](http://socialism.nl/misc/minivan/minivan_bon_layer_vc.jpg)
-Layer: `_BON`
-
-![Minivan layout Image FUN](http://socialism.nl/misc/minivan/minivan_fun_layer_vb.jpg)
-Layer: `_FUN`
-
-![Minivan layout Image MOV](http://socialism.nl/misc/minivan/minivan_mov_layer_triangle_hw-basic-and-allkeys_vb.jpg)
-Layer: `_MOV`
-
-^ There is an alternative flat arrow configuration for this layer (see below),
-and options to compile with the 'arrow' hardware layout.
-
-![Minivan layout Image RAR](http://socialism.nl/misc/minivan/minivan_rar_layer_vc.jpg)
-Layer: `_RAR`
-
-4.3 Layout in text
-------------------
-     What comes on “___” is to be defined by the Base layers choice.
-
-         Layer _DEF_BASE (Letters layer, see ./base* files for what comes on ‛__’)
-                                                  | Right hand
-         <pink2     <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pinky2>   // Keys by finger
-         -o-                                     <|>                                    ... //-o- Base access
-         Esc        __    __    __    __    __    | __    __    __    __    __         Bksp
-         Tab+LCtl   __    __    __    __    __    | __    __    __    __    __           __
-         LSht+_PAD  __    __    __    __    __    | __    __    __    __    __    RSht+_FUN 
-             +_MOV⁵                               |                                   +_RAR⁶
-     ---------------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA)  Enter+_MOV| Space  _..._NSY(_DRA) RGUI    Right;_RAR 
-               hold     hold₍₁,₂٭₎      hold      |        hold₍₁,₂٭₎             hold     // switch type
-               hold₍₂₎  ^-┃-----------------------+--------^ ┃                          // ₁₎ both = _DRA
-               ┗━━━_BON━━━╋┅───────────┄┄┄«or»┄┄┄─+─────────┅┛                          // ₂₎ both = _BON
-     <1   ±    <2       <3              <4        | 4>     3>             2>   ±  1>    // Keys by number
-          ^³                                                                   ^⁴   // Optional more keys
-        (LGUI)                                                               (_MOV)
-     
-     ₁) Dual hold for _DRA, single hold for _..._NSY. Marked by: ^--…--^
-     ₂) Hold key “<2” with either٭ key “<3” or “3>” for _BON, single hold “<2” for _ACC. Marked: ┗━━…━━┛
-     ³) 'South paw' hardware configuration. Configurable, default shown.
-     ⁴) 'Arrow' hardware configuration  Configurable, default shown.
-     ³ ⁴) There are two more optional hardware keys, to make it easier to compile for
-          a 12x12x12x11 or 12x12x12x12 layouts.
-     ⁵) Left Shift when pressed with another key. Medium long: to toggle _PAD. Long: toggle _MOV.
-     ⁶) Right shift when pressed with another key. medium long: to toggle _FUN. Long: toggle _RAR.
-
-Remarks: The left modifiers have a slight delay in combination with an outside pointer device (mouse, stylus).
-It seems this will be difficult to fix, because it is spread over two devices. To avoid the
-±0.2 second delay, activate a layer where the modifiers are direct (`_PAD`, `_MOV`), using the layer toggle on
-left shift. 
-
-The two keys with ';' (Del;`_ACC`, Right;`_RAR`) do not auto-repeat on double tap, like QMK normal layer-tap keys.
-
-There is an uncluttered _Delete_ on `_PAD`, an uncluttered _Right_ arrow on the `_MOV` layer.
-
-There is an uncluttered _Tab_ on both the `_DRA` and `_ACC` layers. They can be modified with _Control_ there.
-
-Holding both `_..._NSY` keys left and right of the "split space bar" (enter, space) results in layer `_DRA`.
-
-Holding either one of the just above mentioned `_..._NSY` layer keys (<3 and 3>), with the `_ACC` layer key
-(on <2) results in layer `_BON`.
-
-- - -
-
-     Layer _..._NSY (Numbers and SYmbols, ./base* files for what comes on ‛__’)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-              -*-                          <|>                                  //(toggle) Access on _FUN
-     BASE     __    __    __    __    __    | __    __    __    __   __     Bspc
-     Tab+LCtl __    __    __    __    __    | __    __    __    __   __  __+RCtl
-     -+LSht   __    __    __    __    __    | __    __    __    __   __  __+RSht 
-     ---------------------------------------------------------------------------
-                 Left+LAlt ___   ___   Ent  | .   ___   RGUI  Right+RAlt
-                                 -*-       <|>    -*-                        //(hold) Access on _DEF_BASE
-                   <1   ±  <2    <3    <4   | 4>  3>    2>  ± 1>  
-                        ^                                   ^
-                      (LGUI)                              (_MOV)
-
-- - -
-     
-     Layer _FUN (F-keys, Layer access)
-    
-     <pink2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-     toggl toggl set   toggl toggl toggl | toggl toggl                            // Type of layer switch
-                                        <|>                                       
-     BASE: NUMS: _PAD  _ACC  _DRA  _BON  | _MOV  _RAR  xxx   xxx   xxx   Bspc       //':' are dynamic ...
-     LCtl  F1    F2    F3    F4    F5    | F6    F7    F8    F9    F10   RCtl
-     LSht  F11   F12   F13   F14   F15   | F16   F17   F18   F19   F20   RSht     
-     ---------------------------------------------------------------------*--       //-*-  toggle on Base
-              LAlt  LCtl&  LCtl&  LSht&  | FUN< +LCtl&LSht RGUI   RAlt              //... < toggle 'stay'
-                    LSht   LAlt   LAlt   |      &LAlt                                    
-                    +xxx   +xxx   +xxx   |      +xxx
-                                        <|>
-              <1  ± <2     <3     <4     | 4>   3>         2>  ±  1>                
-                  ^                                            ^
-                (LGUI)                                       (_MOV)
-
-Remarks.  FUN< toggles an immediate return to the Base layer after pressing an F-key, 
-or staying on the `_FUN` layer. Right led yellow indicates F-layer stays active.
-
-- - -
-    
-This is the _triangle_ configuration for arrows, arrow are on left hand (WASD):
-
-     Layer _MOV (MOVement, mouse movement on right hand)
-    
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                                
-     Base   PgDn  Up    PgUp  Home  Btn3  | xxx   WhDn  MsUp  WhU   WhLft Bksp
-     LCtl   Left  Down  Right End   Btn1  | Btn1  MsLft MsDn  MsRht WhRht RCtl
-     LSht   xxx   Acc2  Acc1  Acc0  Btn2  | Btn2  Btn3  Btn4  Btn5  xxx   RSht
-     -------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp  PgDn  RGUI  RAlt
-                                      -*-<|>                                                 
-                     <1 ± <2    <3    <4  | 4>    3>    2>  ± 1>  
-                        ^                                   ^
-                      (LGUI)                              (DOWN)
-
-
-Remarks. For the Minivan _arrow_ hardware layout with arrow cluster, you get this on ‛Base’:
-
-     (…)
-     LSht+_PAD ;:    qQ    jJ    kK    xX    | bB    mM    wW    vV    zZ    RSht+_FUN
-     -------------------------------------------------------------------------------
-     Left+LAlt Del;_ACC _..._NSY(_DRA) Enter+_MOV| Space  _..._NSY(_DRA) RGUI  _MOV  Right;_RAR 
-                                                                               ^^^^     // new key (toggle)
-
-… and this on `_MOV` for the _triangle_ configuration:
-
-     (…)
-     LSht*- xxx   Acc2  Acc1  Acc0  Btn2  | Btn2  Btn3  Btn4  Btn5  _Up_  RSht
-     ---------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp       PgDn  _Left__Down__Right_
-                                      -*-<|>                                 
-                     <1 ± <2    <3    <4  | 4>         3>     2>   _±_    1>  
-                        ^
-                      (LGUI)
-
-… or this on `_MOV` for the _triangle_ arrow configuration with additional _navigation_ keys:
-
-     BASE   PgDn  Up    PgUp  Home _Btn4_ | xxx   WhDn  MsUp  WhU   WhLft Bksp
-     LCtl   Left  Down  Right End   Btn1  | Btn1  MsLft MsDn  MsRht WhRht RCtl
-     LSht*- xxx   Acc2  Acc1  Acc0 _Btn5_ | Btn2  Btn3 _Home__PgUp_ _Up_ _PgDn_
-     ---------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp      _End_  _Left__Down__Right_
-                                      -*-<|>                                  
-                     <1 ± <2    <3    <4  | 4>         3>     2>   _±_    1>  
-                        ^
-                      (LGUI)
-
-
-This is the _flat_ configuration for arrows, arrow are on right hand:
-
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                              
-     BASE   WLft  WDn   WUp   WRht  xxx   | Btn3  PgUp  Home  End   PgDn  Bksp
-     LCtl   MLft  MDn   MUp   MRht  Btn1  | Btn1  Left  Up    Down  Right RCtl
-     LSht*- Btn5  Btn4  Btn3  Butn2 xxx   | Btn2  Acc0  Acc1  Acc2  xxx   RSht
-     -------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp  PgDn  RGUI  RAlt
-                                      -*-<|>                                                
-                     <1 ± <2    <3    <4  | 4>    3>    2>  ± 1>  
-                        ^                                   ^
-                      (LGUI)                              (DOWN)
-
-For the Minivan _arrow_ hardware layout with _flat_ arrow cluster, you get this on `_MOV`:
-
-     (…)
-     BASE   WLft  WDn   WUp   WRht  xxx   | Btn3  PgUp  Home  End   PgDn  Bksp
-     LCtl   MLft  MDn   MUp   MRht  Btn1  | Btn1  Left  Up    Down  Right RCtl
-     LSht*- Btn5  Btn4  Btn3  Butn2 xxx   | Btn2  Acc0  Acc1  Acc2  xxx   RSht
-     ---------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp      _Left_ _UP_  _Down__Right_
-                                      -*-<|>                                 
-                     <1 ± <2    <3    <4  | 4>         3>     2>   _±_    1>  
-                        ^   
-                      (LGUI)
-
-… or this on `_MOV` for the _flat_ arrow configuration with additional _navigation_ keys:
-
-     BASE   WLft  WDn   WUp   WRht  xxx   |_Acc2_ PgUp  Home  End   PgDn  Bksp
-     LCtl   MLft  MDn   MUp   MRht  Btn1  | Btn1  Left  Up    Down  Right RCtl
-     LSht*- Btn5  Btn4  Btn3  Butn2 xxx   |_Acc1_ Acc0 _PgUp__Home__End_ _PgDn_
-     ---------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp      _Left_ _UP_  _Down__Right_
-                                      -*-<|>                                  
-                     <1 ± <2    <3    <4  | 4>         3>     2>   _±_    1>  
-                        ^ 
-                      (LGUI)
-
-… or this on `_MOV` for the _flat_ arrow configuration, […], and vi(1) layout:
-
-     <pinky2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                         <|>-*-                                 
-     BASE   WLft  WDn   WUp   WRht  xxx   |_Acc2_ PgUp  Home  End   PgDn  Bksp
-     LCtl   MLft  MDn   MUp   MRht  Btn1  | Left  Down  Up    Right Btn1  RCtl         // vi as in Qwerty
-     LSht*- Btn5  Btn4  Btn3  Butn2 xxx   |_Acc1_ Acc0 _PgUp__Home__End_ _PgDn_
-     ---------------------------------------------------------------------------
-                     LAlt Del   Ent   ___ | PgUp      _Left_ _Down__Up_  _Right_       // vi as in Qwerty
-                                      -*-<|>                                  
-                     <1 ± <2    <3    <4  | 4>         3>     2>   _±_    1>  
-                        ^
-                      (LGUI)
-
-For the 'arrow' hardware layout (additional key on the right), keys on the first
-row are sacrificed and lost. The right most key on the second row is also lost.
-The two keys on places 3 and 4 when counting from the right on the second row,
-are being moved to the spots for Btn2 and Btn3 on the hand that also has the 
-arrows (those keys are otherwise twice defined for left and right hand).
-
-- - -
-    
-     _RAR (RARe keys. Power keys, Unicode mode, Alternate Base, Media, Brightness, Speed, Size, leds, …)
-    
-     <pink2<pinky <ring <middl <indexx<indx2| indx2>index>middl>ring> pinky> pink2>
-                                           <|>      -*-                                //(toggle) on _FUN
-     BASE  Cnt/Mx Cnull CWmin  CRprt  Speed | SRprt Play  Next  Prev  Stop RSht(•)   
-     CapsL Power• Wake• Sleep• Pause• ScrLk | PrtSc xxx   Vol+  Vol-  Mute Insert     // • requires Shift
-     ☑     uLNX   uBSD  uOSX   uWIN   uWNC  | xxx   xxx   Bri+  Bri-  xxx     APP     // Ü(nicode) tester
-     ----------------------------------------------------------------------------
-                     SLed  MLeds LGUI  xxx  | !Alter  xxx   RGUI  ___   // Mid-led, Side-leds, !Alternate
-                                           <|>                    -*-                   // (Hold) on Base
-                     <1  ± <2    <3    <4   | 4>      3>    2>  ± 1>  
-                         ^                                      ^
-                       (LGUI)                                 (_MOV)
-
-Remarks. !Alter switches between normal and alternate Base layer.
-
-☑ is a Unicode tester key. uLNX for Linux Unicode input encoding, uBSD
-for BSD Unix, uWIN for Windos, uWNC for another Windos encoding. The
-change is retained between on/off power cycles.
-
-MLed switches on/off the middle led, SLeds switches on/off the side leds.
-
-The keys marked with • require Shift to be activated, as a means of
-preventing accidents. Shift here is on (Base) 'Backspace' (upper/right key)
-which also reduces accidents (combinations which are never pressed
-normally). If you press these keys without 'shift' they print their own
-name between angled brackets. Example: pressing the 2nd key on the 3rd
-row prints `“<POWER>”`.
-
-Bri+, Bri-: screen brightness (if your system supports it.)
-
-Speed: toggles speed measuring on/off. SRprt: writes your speed.
-See topic about Speed measuring.
-
-Cnt/Mx, Cnull CWmin, CRprt: text size measuring. See topic.
-
-- - -
-    
-    
-     Layer _PAD Numbers Pad (special symbol versions; regular '1' is not the same as this numpad '1', etc)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                    -*-                    <|>                                         //(toggle) on _FUN
-     BASE     xxx   xxx   .DEL  4LEFT 2DOWN | 8UP   6RGHT *     xxx   xxx   Bspc
-     LCtl     1END  2DOWN 3PGDN 4LEFT 5     | 6RGHT 7HOME 8UP   9PGUP 0INS     -
-     LSht     xxx   xxx   /     xxx   =     | +     3PGDN 1END  7HOME 9PGUP RSht
-     -*-------------------------------------------------------------------------    //-*-  toggle on Base
-                  LAlt     Del   Tab   ENT  |  NUML  xxx   RGUI  RAlt
-                                           <|>
-                  <1   ±   <2    <3    <4   | 4>     3>    2>  ± 1>  
-                       ^                                       ^
-                     (LGUI)                                  (_MOV)
-
-Remarks: The keys between `.DEL` and `*`, `+` and `RSht` constitute sort of
-navigation clusters, to make it easier to find the number pad versions thereof.
-
-This is the variety for `_PAD` layer, which resembles a numerical keypad:
-
-     Layer _PAD (Number pad, square layout)
-    
-     <pink2   <pinky<ring <middl<index<indx2| indx2>index>middl>ring>pin>pink2>
-                                           <|>
-     BASE     xxx   xxx   xxx   xxx   xxx   | =     7HOME 8UP   9PGUP -   Bspc
-     LCtl     xxx   xxx   xxx   xxx   xxx   | *     4LEFT 5     6RGHT +   RCtl
-     LSht     xxx   xxx   xxx   xxx   xxx   | /     1END  2DOWN 3PGDN ,   RSht  
-     ------------------------------------------------------------------------
-                   LAlt   Del    Tab   ENT  | NUML  0INS  .DEL  RAlt      
-                                           <|>           
-                   <1   ±  <2    <3    <4   | 4>    3>  ± 2>    1>  
-                        ^                               ^ 
-                      (LGUI)                          (RGUI)¹
-
-     ₁) Note anomaly, see Base Numpad for details `./base_numpad.md`.
-        Different placement and different meaning, compared to the usual common layers.
-
-- - -
-    
-    
-     Layer _ACC (ACCented characters, see _RAR layer for input modes)
-    
-     <pink2    <pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                       -*-              <|>                                            //(toggle) on _FUN
-     BASE      áÁ    óÓ    éÉ    úÚ    íÍ    | ýÝ    ijIJ    çÇ    øØ    åÅ    Bksp
-     LCTL(Tab) äÄ    öÖ    ëË    üÜ    ïÏ    | ÿŸ    œŒ    æÆ    ñÑ     ß       μ
-     LSht      àÀ    òÒ    èÈ    ùÙ    ìÌ    | îÎ    ûÛ    êÊ    ôÔ    â    RSht
-     ----------------------------------------------------------------------------
-                       LAlt ___   ___   Ent  | Spc   ___   ___   RAlt 
-                            -*-             <|>                                        //(hold) on Base
-                       <1 ± <2    <3    <4   | 4>    3>    2>  ± 1>  
-                          …                                    …
-
-- - -
-    
-    
-     Layer _DRA (DRAwings, whatever else (rendering width might vary in different applications))
-
-     <pink2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                             -*-        <|>                                            //(toggle) on _FUN
-     BASE  “„    ”≤    £≥    ∅ ¢   ±ƒ    | ❦♥    🙂🙁  👍👎   ⁽₍    ⁾₎    Bspc 
-     Tab   ¹₁    ²₂    ³₃    ⁴₄    ⁵₅    | ⁶₆    ⁷₇    ⁸₈     ⁹₉    ⁰₀    RCTL
-     LSht 「━    」─   °〇   •§    …·    | ☐☒   ☑🗹     ¿¡    《┄    》┅   RSht     //  ☐ ☒ ☑ 🗹 or ⮘ ⮙ ⮚ ⮛
-     -------------------------------------------------------------------------
-                   LAlt ___   ___   Ent  | Spc   ___   ___   RAlt 
-                              -*-       <|>      -*-                                     //(hold) on Base
-                   <1 ± <2    <3    <4   | 4>    3>    2>  ± 1>  
-                      ^                                    ^
-                    (LGUI)                               (_MOV)
-
-Remarks. ☐ ☒ ☑ 🗹 or ⮘ ⮙ ⮚ ⮛
-- - -
-
-     Layer _BON (Bonus layer, a variety of more stuffs.)
-
-     <pink2<pinky<ring <middl<index<indx2| indx2>index>middl>ring> pinky>pink2>
-                                   -*-  <|>                                            //(toggle) on _FUN
-     BASE  ‛ 🛠  ’ ⬆   ¤ 🄯   ∑ ©   ‰ ‱   | ★ ٭   😊 ⍨  ×  ⃰   √     ⁻ ⁺    Bksp
-     `~    ① ⬅   ② ⬇   ③ ➡   ④ ┏   ⑤  ┓  | ⑥ ┃   ⑦ ┇   ⑧ ╋   ⑨     ⓪ ∞    — ≈     // — is a dash (larger)
-     LSht  ‹     ›     ÷     ☞ ┗   ≠  ┛  | ✗ ┣   ✓ ┫   ⚠     «     »      RSht
-     -------------------------------------------------------------------------
-                  Left  ___   ___   Ent  | Spc   ___   ___   Right
-                        -*-   -*-       <|>      -*-                                // Activation on Base
-                  <1  ± <2    <3    <4   | 4>    3>    2>  ± 1>  
-                      ^                                    ^
-                    (LGUI)                               (_MOV)
-    
-- - -
-
-4.4 Movement layer options
---------------------------
-The movement layer (`_MOV`) has several configuration options. You
-can either have _triangle_ configuration arrows on the _left_ hand
-(with navigation keys around it), or a _flat_ arrow configuration on
-the _right_ hand (with navigation above it).
-
-You can configure for the _arrow_ hardware layout (one additional hardware
-key on the right). The additional key on the Base layer can toggle to the
-movement layer, and than becomes part of the arrow cluster. For both
-versions (_triangle_ arrows left hand or _flat_ arrows right hand) you
-can compile this second arrow cluster to be completed with navigation keys
-(Home, End, PageUp, PageDown).
-
-![Minivan layout Image MOV 3 defaultf](http://socialism.nl/misc/minivan/minivan_mov_layer_flat_hw-basic_vb.jpg)
-
-![Minivan layout Image MOV 3b default](http://socialism.nl/misc/minivan/minivan_mov_layer_triangle_hw-basic_vb.jpg)
-
-^ `#define ARROWS_TRIANGLE`
-
-![Minivan illustration BASE towards 3](http://socialism.nl/misc/minivan/minivan_layer_illustration_base_mov_hw-arrow_vb.jpg)
-
-^ Illustration of accessing the arrows/navigation with a key on the Base layer
-
-![Minivan layout Image MOV 3b + arrow](http://socialism.nl/misc/minivan/minivan_mov_layer_hardw-arrow_triangle_vb.jpg)
-
-^ `#define ARROWS_TRIANGLE`, `MORE_KEY__ARROW`, `MOREKEY2_ARROW_CLUSTER`, `MORE_key2 _MOV_UP`
-
-![Minivan layout Image MOV 3b + navig](http://socialism.nl/misc/minivan/minivan_mov_layer_hardw-arrow_triangle_addnav_vb.jpg)
-
-^ `#define ARROWS_TRIANGLE`, `MORE_KEY__ARROW`, `MOREKEY2_ARROW_CLUSTER`, `MOREKEY2_ADD_NAVIGATION`, `MORE_key2 _MOV_UP` (note change on previously BTN2/3)
-
-![Minivan layout Image MOV 3 + arrows](http://socialism.nl/misc/minivan/minivan_mov_layer_hardw-arrow_flat_vb.jpg)
-
-^ `#define MORE_KEY__ARROW`, `MOREKEY2_ARROW_CLUSTER`, `MORE_key2 _MOV_UP`
-
-![Minivan layout Image MOV 3 + naviga](http://socialism.nl/misc/minivan/minivan_mov_layer_hardw-arrow_flat_addnav_vb.jpg)
-
-^ `#define MORE_KEY__ARROW`, `MOREKEY2_ARROW_CLUSTER`, `MOREKEY2_ADD_NAVIGATION`, `MORE_key2 _MOV_UP` (note change on previously BTN2/3)
-
-![Minivan layout Image MOV 3 vi arrow](http://socialism.nl/misc/minivan/minivan_mov_layer_vi_vb.jpg)
-
-^ `#define` \[`MORE_KEY__ARROW`, `MOREKEY2_ARROW_CLUSTER`\] `VI_SWITCHERYDOO`, `#undef ARROWS_TRIANGLE`
-
-4.5 Numbers pad layer options
------------------------------
-This concerns the numbers pad layer, the one that is part of the common layers.
-
-![Minivan layout Image PAD](http://socialism.nl/misc/minivan/minivan_pad_layer_vc.jpg)
-
-![Minivan layout Image PAD squared](http://socialism.nl/misc/minivan/minivan_pad_layer_squared_vb.jpg)
-
-^ `#define NUMPAD_COMMON_SQUARE`
-
-5 Led colors for layers
-=======================
-      • letters                          Led: low-white/teal/off⁽¹⁾          _DEF_BASE "Default base"
-        • letters (alternate)              Led: off/teal/low-white           _ALT_BASE "Alternate base"
-      • numbers                          Led: blue/blue/blue                 _DEF_NSY "Default Numbers SYmbols"
-        • numbers (alternate)              Led: blue/blue/low-white          _ALT_NSY "Alternate Numbers SYmbols"
-      • number pad symbol versions       Led: green/low-white/blue ⁽²⁾       _PAD "numbers PAD"
-      • accented characters é, ø, ß …    Led: cyan/cyan/cyan                 _ACC "ACCented"
-      • Unicode symbols, ¹, ±, ° …       Led: yellow/yellow/yellow           _DRA "DRAwings"
-      • Unicode symbols, ①, ‰, ÷ …       Led: off/yellow/off                 _BON "Bonus"
-      • function keys,                   Led: red/red/orange ⁽³⁾             _FUN "FUNction keys"
-      • and a movement layer             Led: green/green/green              _MOV "MOVement"
-      • keys like Power, Play,           Led: white/purple/purple ⁽⁴⁾        _RAR "RARe keys"
-
-      Leds:
-            • ⁽¹⁾ The low-white led is bright-white when capslock is on. Optionally the middle led (cyan) can
-                  show the color of the last layer that was active.
-            • ⁽²⁾ The colors are reversed blue/low-white/green when numlock is on. 
-                  Left led color memory aid: same as either numbers or movement layer for numlock on/off.
-            • ⁽³⁾ The colors are reversed to orange/red/red when set to deactivate after one F-key press.
-            • ⁽⁴⁾ The colors are reversed purple/purple/white, indicating which of the two base layers
-                  is active (see below).
-            • Middle led: Breathing effect. When not breathing, keyboard is not working normally with the computer.
-                        - When speed measurement is active, the middle led color indicates the speed, unless
-                          text size counting set to a maximum is active.
-                        - When text size counting is active and set to a maximum amount, the middle led color 
-                          indicates progress to the limit from green to red, flipping white/red on the limit.
-                        - When on Base layer it shows a teal color, or (compile option) the layer most recently active.
-                        - When the left/right leds are off, when on Base, it shows a teal color (not last active), even
-                          if so compiled.
-            • Leds can be switched on/off on the _RAR layer (SLeds, MLed).
-
-
-6 Compile options
-=================
-         Layout
-
- • Several layouts to choose from: Qwerty, Dvorak, Colemak, Workman, Numpad.
-
- • You can use the keyboard with two different letters/number-symbols layouts.
-
-         Hardware
-
- • Hardware key configurations: _default_ (44), _arrow_ (45), _south paw_ (45), _arrow_ + _south paw_ (46).
-
-![Minivan illustration 0](http://socialism.nl/misc/minivan/minivan_illustration_arrow_southpaw.jpg)
-   (On the `_RAR` layer, the additional _south paw_ key is more to the right.)
-
- • What the additional hardware keys for _arrow,_ _south paw_ should be.
-
-         Navigation cluster
-
- • An arrow cluster for _arrow_ hardware configuration, on the `_MOV` layer.
-
- • All navigation keys around _arrow_ hardware configuration arrow cluster on `_MOV` layer.
-
- • Navigation cluster in a triangle (WASD) (left hand), or flat layout with optional vi(1) layout.
-
-         Numpad (in common layers)
- 
- • Numpad with numbers in a row.
-
- • Numpad with layers in a block form.
-
-         Special functions
-
- • Set speed measuring on/off at keyboard startup.
-
- • Set text size measuring on/off at keyboard startup.
-
-         Changing symbols
-
- • Switching the GUIs left/right, and some other specific key changes.  
-
- • Reduce firmware size/bloat: remove or eviscerate Unicode layer(s).
-
- For the complete list, see ![./user_config.h](./user_config.h)
-
-7 Language support
-==================
-
-7.1 Input methods
-=================
-There seem to generally be two ways in QMK for typing a language other than English.
-One is to use a language specific remapping on the computer operating side, and
-to use the QMK supplied symbols in the keymaps. This may include the use of a “dead key”.
-Presumably you can also still use the Unicode symbols. 
-
-⚠ *There are currently no such Base pair layouts available. If this is the method you want,
-you may want to look elsewhere.*
-
-The other way is to type the additional symbols in Unicode. _The computer
-operating must understand these special sequences._  Several Unicode
-input modes are available, which can be changed while the keyboard is
-running. There is no need for a “dead key”.  The language setting
-in the computer operating system can be set to English. This layout is
-designed for this method, to avoid the dead key problem.
-
-7.2 Unicode symbols
-===================
-For the remainder of this chapter the Unicode input method is assumed.
-
-You may be able to type your language, with the help of some of the Unicode
-layers and one of these layouts: Qwerty, Dvorak, Coleman, Workman. The following
-languages might work for you this way. 
-
-     • Dutch (éëèïijí)
-     • English (—“”‛’)
-     • French (çœæéèàòùîûêôâëïüÿ)
-     • German (äöüß)
-     • Norwegian, Danish (œæøå, éêèëóêò, üáà …)
-     • Spanish (¿¡ñ)
-     • Swedish (äåö …)
-
-The following quotation marks are available, which seems it would cover these languages: 
-
-     'test' "test" “test” „test” ‛test’ ,test’¹ «test» ‹test› 《test》 「test」 — test
-
-     ¹) Left side is a basic comma.
-
-See the `_ACC` _accented characters_ layer for all characters with diacritic markings.
-If you miss a symbol, you could replace one you don't use and add it yourself (by
-reprogramming the source code).
-
-8 Speed measuring
-=================
-      ‛Speed’ starts speed measuring.
-      ‛SRprt’ stands for ‛Speed Report’:
-                • Tap to get your speed report.
-                • Hold for a while for led color compilation (see below).
-      ☞ Text size counting (see below) middle led colors take precedence,
-        when a maximum is set, over layer colors or speed measurement.
-
-With the key ‛Speed’ on the `_RAR` layer, the speed of your latest
-completed batch of 25 key presses is computed, as well as the average of
-all your batches of 25 keys. The speed is displayed as the color of the
-middle led, which otherwise shows the layer color. A bright white middle
-led indicates ‛Speed’ has just been activated.
-
-With the key ‛SRprt’ (short for ‛Speed Report’), the keyboard
-will write your typing speed either in keystrokes per second (k/s)
-or words-per-minute (wpm), depending on your compilation configuration.
-
-“Keystrokes per second” uses the following format: `<A k/s B.B k/s
-Cx25keys>`. A is the amount of key presses per second (k/s) of your
-last batch, B.B is your average over the last C batches of keys.
-When using “Words per minute”, A is in word-per-minute, B is also
-in words-per-minute: `<A wpm B wpm Cx25keys>`, no decimal precision.
-Example: <150wpm;108wpm20x25keys>
-
-Batches with 0 k/s are not counted to the average. You can take a
-longer break without it affecting your average.
-
-8.1 Speed Led color compilation assist
---------------------------------------
-If you hold the ‛Speed Report’ key for one second, it will increment the
-speed, and led color accordingly. This can be helpful when configuring
-your speed measuring compile settings. This works best with speed
-measuring set off.
-
-9 Text size measuring
-=====================
-      ‛Cnt/Mx’ stands for ‛Count/Maximum’: 
-                • Tap to start counting, tap again to suspend.
-                • Hold > 0.5 seconds for maximum menu.
-      ‛Cnull’ stands for ‛Count null’:
-                • Tap to set the counts to zero.
-      ‛CWmin’ stands for ‛Count Word minus’:
-                • Tap to detract one word from the word count. 
-                • Hold > 0.5 seconds to detract 10 words.
-      ‛CRprt’ stands for ‛Count Report’:
-                • Tap to get a counting report. 
-      ☞ ‛Count’ and ‛Speed’ (see above) reports get added to the
-        character count, but not to the word count.
-      ☞ Auto-repeating keys do not get counted as characters.
-
-You can count your text by character and word, by activating the key
-‛Count’ on the `_RAR` layer. Pressing ‛Count’ again will suspend
-counting, pressing it yet again resumes where the count left off earlier.
-The middle led turns cyan when no maximum is set (see below),
-or to green when it is set.
-
-You can set a maximum to type, with the ‛Cnt/Mx’ key.  In your
-editor (or wherever typing these characters is harmless) you will get
-the following menu by pressing the ‛Cnt/MX’ key for at least half
-a second: `<Nc|w>`. In here: *N* stands for your numerical input, *c*
-for a maximum count in *characters* or *w* for a maximum in *words.*
-
-Start typing a number, finish with either *c* or *w* to make the maximum
-be counted in either characters or words. If you want to leave the
-menu before giving *c* or *w*, enter a *dot* ‛.’ or ‛Escape’,
-which will leave the maximum value at 0 (zero). A maximum value of zero
-implies there is no maximum.
-
-Setting a maximum of 1000 characters looks like so:
-
-        Hold ‛Cnt/MX’ results in: `<Nc|w>` 
-        Then type “1000” results in: `<Nc|w>1000`
-        Then type “c” results in: `<Nc|w>1000->1000c`
-        At this point the keyboard is out of this special input menu.
-
-        The keyboard indicates what it accepted as your input, by 
-        repeating the number, just before your last input is being printed.
-
-With a maximum established, the middle led color goes from green to red,
-as you type. When the maximum is reached, the keyboard will output a
-Backspace character for every key you subsequently press, making it
-impossible to go any further, until text size counting has been disabled,
-or the count is reduced. The middle led changes color between red and 
-white while at the maximum set size, for every new input character.
-
-To get your word count report, press ‛CReport’ short for: ‛Count
-Report’.  It comes in the form: `<Ac;Bw>`, where A is your character
-count, and B is your word count. Example: `<5420c;547w>`. 
-
-When a maximum is established, the report will only be given in
-either characters or words, and the maximum is given with it, like so:
-`<66w>[200w]`. 66 words have been written, a maximum of 200 words has
-been set.
-
-If you have a maximum established and use it across different articles,
-you no longer have the total count. You can activate speed measuring,
-which in its report includes the total characters pressed.
-
-9.1 Text size Usage
--------------------
-It is assumed that you will take the report in the document you are
-editing, and then delete it. If you do character counting, the value of 
-the report itself is added to the character count. Therefore you should
-delete that without using an auto-repeating on the deletion key. That
-way the characters are subtracted again.
-
-If you count in words, the report is not added to the word count. You
-can delete it however you want.
-
-This works the same for a ‛*Speed* Report’ you might like to take.
-You can take it in the document, and then delete it in the same,
-without affecting the text size counting in characters or words.
-When deleting keys with Backspace or Delete, the character count goes down
-accordingly, the word count does not.
-
-Words are counted by counting Space and Enter key presses. Immediately
-repeating blanks do not add to the word count.  You can only manually
-subtract from the word count, using the key ‛CWmin’ short for ‛Count
-Word minus’. This means that if you delete sections in your document,
-you need to manually subtract the same words.
-
-Example: after typing something and then typing `<Enter>` twice to start a
-new paragraph, counts for one word. When deleting three words with their
-three blank areas, then tapping ‛Count Word minus’ three times,
-should result in an accurate word count. To add words to the count,
-type mock ones and then delete them: “x x x x” adds *three* words,
-“y y  y ” also adds three words (three separate blank spaces).
-
-Layer changes, shift and unusual/complex keys do not get counted.
-Navigation, arrow and mouse keys do not get counted. Auto-repeating
-of keys does not affect the *character* count, therefore should be avoided
-if you want to count in characters.
-
-10 Making your own base layer(s)
-================================
-You can insert your own `_DEF_BASE`, `_DEF_NSY` and/or `_ALT_BASE`, `_ALT_NSY`
-Base plus number/symbols layer pairs, integrate it nicely with the rest 
-of the code, and re-define a special characters layer to go with it if
-you want (etc). The idea is to make it easy to change the alphanumerical
-keys, while leaving the modifiers, layer switch keys etc. the same. 
-`YOUR_KEYMAP` stands for a name you choose.
-
-First we will look at a simple keymap, without its own configuration
-options or header file.
-
-     ① Make a file named: `./base_YOUR_KEYMAP.c`), with at least 
-       those two layers: _..._BASE and _..._NSY. It is probably best to
-       copy one of the existing `./base_....c` files, and edit that.
-
-     ② Add a #define to `./user_config.h`:
-       #define BASE_YOUR_KEYMAP__DEF_BASE
-       #define BASE_YOUR_KEYMAP__ALT_BASE
-       Under the topic ‛Base layers’ there is a comment to help you.
-
-     ③ Edit ./keymap.c to have your new file #included, using your just defined
-       preprocessor element. Close to the other #includes is a comment there to
-       help you. Look just under the line with this, in ./keymap.c:
-
-       const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-       (…)
-       // // ⬇ insert your ./base_YOUR_KEYMAP.c #include here:
-
-       // # if defined(BASE_YOUR_KEYMAP__DEF_BASE) || defined(BASE_YOUR_KEYMAP__ALT_BASE)
-       // #     include "./base_YOUR_KEYMAP.c" // Your Keymap.
-       // # endif
-
-Now you have integrated your base layers alternative. To compile it:
-
-     ④ _Activate_ your #define BASES_YOUR_KEYMAP__DEF_BASE or 
-       BASES_YOUR_KEYMAP__ALT_BASE in `./user_config.h`,
-       _Remove_ any other base layers from being defined on the
-       same spot _DEF_BASE or _ALT_BASE to prevent a conflict.
-
-     ⑤ Check Preprocessing with:
-       > gcc -E keymap.c | less
-
-     ⑥ Compile and flash to your keyboard.
-
-You can redefine any layer in your new `./base_YOUR_KEYMAP.c`
-You can do that by setting one or more of the `BASESFILE_LAYER_...` defines in 
-your own `./base_YOUR_KEYMAP.c` file. See near the top of an existing 
-`./base_....c` file for clues.
-`_ACC` in particular is a layer meant to augment a keymap with special 
-characters for a given language/layout in the base layer(s). Perhaps you
-want to redefine it, for example.
-
-Example: Having done the above points ① ➡ ④ for a `./base_YOUR_KEYMAP.c` file. 
-Let's say you re-arranged keys on `_ACC` to suit ... French.
-
-     ⑦ In your `./base_YOUR_KEYMAP.c`:
-       #define `BASESFILE_LAYER_ACC`
-       The `_ACC` in ./keymap.c will now be ignored.
-
-You can re-define `_ACC` in your own file. 
-
-     ⑧ Copy an existing `_ACC` layer into `./base_YOUR_KEYMAP.c` 
-       Edit it so that French characters like ‛Ç’ ‛«»’, ‛œ’, ‛æ’,
-       ‛ô’, ‛é’ etc. are in positions that work best. You can look in
-       `unicode_weurope.h` to find some Unicode points already defined.
-
-     ⑨ Compile and flash to your keyboard.
-
-Now we will look at a more complicated keymap, where you are also altering
-preprocessor constants defined in ![./user_config.h](./user_config.h) (Warning, perhaps this
-is overkill … ;-)
-
-Example: the `./base_numpad.c` has an option to entirely eviscerate the
-`_PAD` layer, for convenience. (Why is this even useful ? Good question !
-One reason could be that it can set up a default, so that anyone who chooses
-this `./base_numpad.c` Base layer, automatically is eviscerating the `_PAD`
-_common_ layer, without having to do anything else. On the downside, it
-could be confusing that one option is configured in two places.)
-
-Having done the above points ⑦ ➡ ⑧ as well, let's say for some reason you
-need to reverse Left GUI and Right GUI.
-
-      ⑨ Copy your User Configuration Block at the top of your `./base_YOUR_KEYMAP.c`
-        and the GPL License, and place that in a new _header_ file: 
-        `./base_YOUR_KEYMAP.h` 
-    
-      ① ⓪  Write the necessary code to set and unset the constant
-           `SWITCH_GUIS` in your `./base_YOUR_KEYMAP.h` file You are encouraged
-           to write code which overrides any setting in `./user_config.h,` for
-           those constants which you choose to affect, for simplicity sake. 
-           (This is not a C programming manual, so it won't get into this.)
-   
-      ① ①  Look in `./user_config.h`, and #include your header file there, in
-           a similar way as was done for your C code file. It should be just
-           below the user configuration block, and has a template for you.
-   
-      ① ②  Compile, flash and test.
-   
-      ① ③  It would be nice to put a remark on the general preprocessor constants
-           which you might be affecting, that your keymap could be affecting them.
-           You would edit the ./user_config.h comments with a short one line notice,
-           such as:
-   
-           *
-           * ⚠ Note: ./base_YOUR_KEYMAP.h can overrides this setting, if compiled with that ‛Base’ layer.
-           */
-
-Putting your `*.h` header file in ![./user_config.h](./user_config.h) isn't strictly
-necessary, unless you alter “general preprocessor constants”
-defined in ![./user_config.h](./user_config.h) (not local constants for your keymap only).
-
-Perhaps a separate header file is overkill. On the other hand, whatever
-preprocessor logic is necessary after user configuration has been given,
-can be handled in one place, if #included as suggested. It allows you
-to override the settings in ![./user_config.h](./user_config.h) from your header file
-(because it is #included immediately below those). If a user is playing with
-keymaps Base compile choices, it could be convenient to play with
-`./base_YOUR_KEYMAP.h` settings, have everything that could be relevant
-close at hand, then forgetting about those settings once compiling
-with another Base layer, and be able to return to it with previous
-configuration already done.
-
-You can also just #include your header file at the top of your 
-`./base_YOUR_KEYMAP.h` file, if it does not touch anything else but your
-local keymap.
-
-11 Evisceration
-===============
-Cutting down the keymap reduces the firmware size, and helps reducing
-mental clutter from having masses of symbols you might never want to use.
-
-You can compile as a single layout. Define only a ‛Default’ base pair,
-and set `MINIFAN_SINGLE_LAYOUT` (![./user_config.h](./user_config.h)). The leds for the
-base layers letters and numbers&symbols, will show up as they would for
-the ‛Alternate’ layer in a dual layout compilation.
-
-You can remove the layers `_ACC`, `_DRA` and/or `_BON` (see
-![./user_config.h](./user_config.h) around `REMOVE_ACC`). 
-
-You can remove a set of symbols from one or more of Unicode layers,
-such as not having box drawing characters on `_BON`, or no sub-script
-numbers on `_DRA` (see ![./user_config.h](./user_config.h) under 
-`Eviscerations ②/②` ) ⬅
-
-
-12 Key associations
-===================
-The keymap was designed to have the same or similar keys on the same key
-or close to it, on different layers. Sometimes the association goes by
-what finger is used, and/or on what row. For example the symbol ‛(’
-on the numbers-symbols layer (`_NSY`), becomes the symbol ‛⁽’ on
-another layer.
-
-![Minivan layout Image associations](http://socialism.nl/misc/minivan/minivan-relationships_common_1500_ve.jpg)
-
-12.1 Compared to regular keyboard
-=================================
-The main advantage compared to a regular keyboard is to never have to
-leave the homerow. 
-
-Basic trade-off examples are: (①) on a regular keyboard you need to
-reach two rows up to press a number like ‛4’; (②) three rows up to reach
-an F-key like ‛F4’; (③) or move your hand entirely to reach the navigation
-cluster for ‛Up-Arrow’. On this Minivan 40% keyboard with this ‛Minifan’
-layout you (①) move either thumb sideways a little to hold down the 
-number/symbols layer key, and then press down left index finger for ‛4’;
-(②) press and let go ‛Right-Shift’ to toggle the F-keys layer and then 
-press down left index finger for ‛F4’; (③) press down left thumb on where 
-it probably is resting, and then move left ring finger one row up to reach
-‛Up-Arrow’.
-
-A downside is that you would be typing a non-standard keyboard, making
-it harder to adapt to regular keyboards. On the upside, this keyboard is
-small enough to take it with you. Plugging it into some other computer
-is only going to work, if that other computer is not using a language
-setting which changes too many keycodes, or if changing the language
-setting is not a problem.
-
-In total the differences are probably marginal. It can be worth it if
-you are doing a lot of 10 finger typing. The change in efficiency might
-be similar to changing from Qwerty to Dvorak or another such optimized
-layout, although incomparably much easier to learn than changing from
-Qwerty to Dvorak (in author's personal experience). If the latter can
-take years, the former could take weeks to months. Keep in mind that
-you have the whole standard letters keymap where it used to be, plus the
-numbers with their shifted symbols are in predictable locations.
-
-The hardest to learn out of the standard symbols, will be: /\=+|?, and
-to a lesser degree {}[]. These are now evenly spread out, rather than this
-mess you have under right little finger on regular keyboards.
-
-13 Trouble shooting
-===================
-  • Compiling
-
-  If the firmware is too large, you can try using a different version
-  of the compiler, or you may have to reduce size by removing certain
-  options.
-
-  • Unicode
-
-  Unicode is chaos: try going to `_RAR` layer, and hit the Unicode
-  operating system buttons.
-
-  • Leds
-
-  Leds not working after flashing firmware: try going to `_RAR` layer, 
-  and hit the key MLeds and SLeds, which switch Leds on/off.
-
-  • Weird layer jumping
-
-  You weirdly end up on the `_PAD`, `_FUN` or some other layer while
-  typing ? If you jump to layers which are on Shift key toggles, this
-  is a typing mistake. 
-
-  • Difficult/impossible key combinations ?
-
-  An example of a difficult key combination is: the modifier Control, 
-  Shift, or Alt, with media key “volume up” (or down, etc). It may 
-  work to press and hold “Control” (which should communicate “Control
-  depressed”), then activate `_RAR` layer with the hold key (which 
-  communicates nothing to the computer attached to the keyboard), 
-  press and let go “volume up” (which should communicate just that), let
-  go of the `_RAR` layer (which again communicates nothing), let go of
-  the Control key (which should communicate “Control released”).. 
-
-14 Why you want this layout
-===========================
-☞  This layout seems easy to learn and predictable. It is not personalized
-  or idiosyncratic, but rather based on existing keyboards, typewriters
-  and commonly used symbols in the supported languages. The key placement
-  is as close to a regular keyboard as possible, unless there are clearly
-  better placement choices.
-
-☞  The normally most used layer after letters is “numbers & symbols” 
-  (123…, !@#…, []/…, called `_NSY`). This layer you can access by either
-  your left or right thumb, to spread fatigue.
-
-☞  Right hand pinky is no longer overused, as it is on regular keyboards.
-
-☞  0-9 enumerations / numbers, they are on the same fingers as a standard
-  keyboard. 
-
-☞  The symbols normally reached by shifting a number, are also still on
-  the same fingers.
-
-☞  Because one often uses an F-key only once, the layer can switch back
-  to Base after an F-key is used.
-
-☞  Modifier combination keys on `_FUN` layer for use with F-keys.
-
-☞  The movement layer has a bunch of layout options, and allows for mouse
-  use.
-
-☞  The layer with Power buttons protects you from accidental keystrokes
-  on the critical keys. 
-
-☞  If you need working with Control/Shift/Alt and a pointing device in
-  right hand, you can quickly get uncluttered such keys by tapping left shift.
-
-☞  The accented layer makes it possible to set the keyboard in a mode
-  on the computer side without dead-keys.
-
-☞  The second Unicode layer adds a fair amount of fun stuff to spice up 
-  your writing. Write H₂O, 2⁷·⁰=128, ±8 °C, §2.1, 2 ³/₈", a note⁴, £ 6.²⁵
-  etc.
-        
-☞  The third Unicode layer adds a proper dash — and French style
-  quotations «»‹› and other stuff. ①  «Ça va bien», ②  5 × 3 ≠ 14,
-  ③  .083% ÷ 2 ≈ 4‱ ➡  4.₁₅‱
-
-                  ┏━━━━━━┓
-                  ┃ test ┃
-                ┅━╋━━━━━━┛
-                  ┇ ④
-
-☞  Speed and text size measuring, including to set a maximum on your text input.
-  These are features not part of regular keyboards.
-
-☞  Easy to create your own dual layout for letters / numbers.
-
-☞  If you do want to reprogram the code, it has a lot of comments to make
-  it easier to follow, and over the top much documentation as you can see.
-
-15 BUGS
-=======
-  No real bugs known currently. Just some minor issues …
-
-  `LCTL_T` `( KC_TAB )` is not seen as a blank by word counting, use as Control is not
-  ignored in character counting. (This minor issue is ignored for now. Tab is not
-  normally used in text writing.)
-
-  The evisceration may not have been worked out yet into the ultimate scrubbing of
-  everything that may have become redundant, because it does complicate the code with
-  a lot of #defines. Perhaps it should be done eventually, if there is an actual need.
-
-  ➡ You can send bug reports to what seem useful channels, and/or contact e-mail. Thanks
-
-16 Resources
-============
-This links to an external file, with some additional resources.
-[Resources](http://socialism.nl/misc/minivan/ "Additional resources")
-
-     ☞ Gimp .xcf files.
-     ☞ Some precompiled hex files.
-     ☞ Documentation in other formats.
-       …
-
-17 Author(s)
-============
-  This keymap.c was edited from the Minivan default, original LED
-  support was copied/edited from ../jetpacktuxedo/ keymap. Thanks to 
-  QMK support for their help, especially Drashna.
-
-  _Personal note:_ This keymap came about because of a sudden need
-  for a replacement keyboard. It took over a year to make (≈ 1.5 h/day).
-  The goal became to make a good keymap for everyone without the time to
-  make one.
-
-  Written on the Minivan: Jos Boersema. [contact](https://market.socialism.nl/author/ "get e-mail address there")
-  If anyone forks this or whatever, feel free to drop me a note.
-
-  Contributions to this key map:
-      - …
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/josjoha/rules.mk
deleted file mode 100644
index e04cfe17ddb..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable Leds. If you set to “no”, that saves ≈ 13% of the firmware size.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-UNICODEMAP_ENABLE = yes     #
-LTO_ENABLE = yes            # To reduce firmware size
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/todo.md b/keyboards/thevankeyboards/minivan/keymaps/josjoha/todo.md
deleted file mode 100644
index 6ab2f795b6d..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/todo.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Todo:
-=====
-
-
-                       § Further development
-
-           The following seem interesting for further development. However following the “scratch your
-           own itch” rule, perhaps it should be someone else's interest.
-
-             ☐ It seems fun to have a user friendly front end to compile the available variations of this keymap.
-               Such a front end could edit minifan_config_compact.h 
-           
-             ☐ Language specific keyboards, such as Qwertz and Azerty, etc.
-               Two option exist:
-               • Using an include like #include keymap_german.h (etc).
-               • If a language specific #include and computer language setting is not used, but merely some basics
-                 such as a matching basic alphabet ABC…XYZ on Base, with some additional Unicode symbols for that
-                 language on _ACC and or other Unicode layers, it might be simple to make, and avoid the dead key
-                 problem. To go another step and recreate a key like ‛<>’ (as it seems to exist in Qwertz), would
-                 seem to require macros in unicode_macros.c.
-
-                       § Other:
-
-             ☐ Testing all user configurations
-             ☐ Porting to Planck keyboard.
-             ☐ Review/fix C indendation. QMK indentation is not my preferred style, and 
-               therefore it is not entirely consistent. 
-            ?☐ A lock mode, so that others cannot type on it if you walk off ?
-            ?☐ Fun and games: game layer.
-
-            ?☒ User defining macros (record/play user input), another special Base layer ? Is there 
-               room for this, or how to create it if not.
-               ➡ It seems a bit odd to have a keyboard with internal registers. Probably better handled at the
-                 application level, so that the keyboard remains a basic input device.
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_hebrew.h b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_hebrew.h
deleted file mode 100644
index 881a80884bb..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_hebrew.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2021 by Jos Boersema
- *
- */
-
-#pragma once
-
-/*        An amount of Unicode #defines
- *        - hebrew
- */
-
-    // 
-#define HB_ALEF  0x05D0 // 'HB' for 'Hebrew', "ALEF" for Alef         : א
-#define HB_BET   0x05D1 //      "           , "BET" for Bet           : ב
-#define HB_GIMEL 0x05D2 //      "           , "GIMEL" for Gimel       : ג
-#define HB_DALET 0x05D3 //      "           , "DALET" for Daled       : ד
-#define HB_HE    0x05D4 //      "           , "HE" for He             : ה
-#define HB_VAV   0x05D5 //      "           , "VAV" for Vav           : ו
-#define HB_ZAYIN 0x05D6 //      "           , "ZAYIN" for Zayin       : ז
-#define HB_GET   0x05D7 //      "           , "HET" for Het           : ח
-#define HB_TET   0x05D8 //      "           , "TET" for Tet           : ט
-#define HB_YOD   0x05D9 //      "           , "YOD" for Yod           : י
-#define HB_KAFS  0x05DA //      "           , "KAFS" for Kaf sofiet   : ך
-#define HB_KAF   0x05DB //      "           , "KAF" for Kaf           : כ
-#define HB_LAMED 0x05DC //      "           , "LAMED" for Lamed       : ל
-#define HB_MEMS  0x05DD //      "           , "MEMS" for Mem sofiet   : ם
-#define HB_MEM   0x05DE //      "           , "MEM" for Mem           : מ
-#define HB_NUNS  0x05DF //      "           , "NUNS" for Nun sofiet   : ן
-#define HB_NUN   0x05E0 //      "           , "NUN" for Nun           : נ
-#define HB_SAMEG 0x05E1 //      "           , "SAMEG" for Sameg       : ס
-#define HB_AYIN  0x05E2 //      "           , "AYIN" for Ayin         : ע
-#define HB_PES   0x05E3 //      "           , "PES"  for Pe sofiet    : ף
-#define HB_PE    0x05E4 //      "           , "PE" for Pe             : פ
-#define HB_TSDIS 0x05E5 //      "           , "TSDIS" for Tsadi sofiet: ץ
-#define HB_TSADI 0x05E6 //      "           , "TSADI" for Tsadi       : צ
-#define HB_QOF   0x05E7 //      "           , "QOF" for Qof           : ק
-#define HB_RESH  0x05E8 //      "           , "RESH" for Resh         : ר
-#define HB_SHIN  0x05E9 //      "           , "SHIN" for Shin         : ש
-#define HB_TAV   0x05EA //      "           , "TAV" for Tav           : ת
-#define HB_MAQAF 0x05be //      "           , "MAQAF" for Maqaf       : ־
-
-// Yiddish digraphs:
-//#define HB_D_VAV 0x05F0 //      "           , "D_VAV" for double Van  : װ
-//#define HB_VAVYD 0x05F1 //      "           , "VAVYD" for Vav Yod     : ױ
-//#define HB_D_YOD 0x05F2 //      "           , "D_YOD" for double Yod  : ײ
-
-// special
-#define HB_RLM   0x200F //      "           , "RLM" for Right-Left-Mark: <non-printing>
-#define HB_LRM   0x200E //      "           , "LRM" for Left-Right-Mark: <non-printing>
-
-
-// The below are displacing symbols on other layers, some of which are quite obscure
-// and end up being unused. They are compiled based on a #define.
-// These where reported as symbols present on hebrew keyboards: 
-// U+05F3 : HEBREW PUNCTUATION GERESH
-// U+20AC : EURO SIGN
-// U+20AA : NEW SHEQEL SIGN {shekel}
-// U+00B0 : DEGREE SIGN
-// U+05AB : HEBREW ACCENT OLE
-// U+05BD : HEBREW POINT METEG {siluq}
-// U+00D7 : MULTIPLICATION SIGN {z notation Cartesian product}
-// U+200E : LEFT-TO-RIGHT MARK [LRM]
-// U+200F : RIGHT-TO-LEFT MARK [RLM]
-// U+05BE : HEBREW PUNCTUATION MAQAF
-// U+2013 : EN DASH
-// U+05C2 : HEBREW POINT SIN DOT
-// U+05C1 : HEBREW POINT SHIN DOT
-// U+05B8 : HEBREW POINT QAMATS
-// U+05F0 : HEBREW LIGATURE YIDDISH DOUBLE VAV {tsvey vovn}
-// U+05B9 : HEBREW POINT HOLAM
-// U+05B7 : HEBREW POINT PATAH
-// U+05B2 : HEBREW POINT HATAF PATAH
-// U+05F1 : HEBREW LIGATURE YIDDISH VAV YOD
-// U+05F2 : HEBREW LIGATURE YIDDISH DOUBLE YOD {tsvey yudn}
-// U+05B4 : HEBREW POINT HIRIQ
-// U+201D : RIGHT DOUBLE QUOTATION MARK {double comma quotation mark}
-// U+201E : DOUBLE LOW-9 QUOTATION MARK {low double comma quotation mark}
-// U+05F4 : HEBREW PUNCTUATION GERSHAYIM
-// U+05B6 : HEBREW POINT SEGOL
-// U+05B1 : HEBREW POINT HATAF SEGOL
-// U+05B5 : HEBREW POINT TSERE
-// U+2019 : RIGHT SINGLE QUOTATION MARK {single comma quotation mark}
-// U+201A : SINGLE LOW-9 QUOTATION MARK {low single comma quotation mark}
-// U+00F7 : DIVISION SIGN {obelus}
-// U+05BA : HEBREW POINT HOLAM HASER FOR VAV
-// U+200D : ZERO WIDTH JOINER [ZWJ]
-// U+201C : LEFT DOUBLE QUOTATION MARK {double turned comma quotation mark}
-// U+201D : RIGHT DOUBLE QUOTATION MARK {double comma quotation mark}
-// U+034F : COMBINING GRAPHEME JOINER [CGJ]
-// U+05C6 : HEBREW PUNCTUATION NUN HAFUKHA
-// U+200C : ZERO WIDTH NON-JOINER [ZWNJ]
-// U+2018 : LEFT SINGLE QUOTATION MARK {single turned comma quotation mark}
-// U+2019 : RIGHT SINGLE QUOTATION MARK {single comma quotation mark}
-// Note: many modifiers probably only work with a hebrew language setting on the computer
-//  operating system. As Unicode, it would print a disconnected diacretical symbol.
-
-// Geresh
-#define HB_GERSH 0x05F3 //      "           , "GERSH" for Geresh      : 
-#define HB_GRSHM 0x05F4 //      "           , "GRSHM" for Gershayim   : 
-// Currency
-#define HB_SHEKL 0x20AA //      "           , "SHEKL" for shekel      :
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
deleted file mode 100644
index ddd37c89e35..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
+++ /dev/null
@@ -1,2671 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2019, 2020 by Jos Boersema
- *
- */
-
-/* This file contains mostly the Unicode and special macros.
-   It contains the function: process_record_user(...)
- */
-
-#include "./unicode_macros.h"
-#include "./unicode_weurope.h"
-#include "./unicode_hebrew.h"
-
-// Definition of ƒ (Dutch currency symbol).
-// Best changed in user_config.h, if you like a Euro symbol instead.
-//
-# ifndef UNICODE_CURRENCY // Prior optional definition in user_config.h
-#     define UNICODE_CURRENCY 0x0192 // Hex number. The unicode hex number for position ƒ in the default keymap.
-# endif
-
-//
-// 🛠
-#define CS_USER_DEFINED 0x1F6E0 // Hammer & wrench (place holder). 
-
-#define DIV10POINT TRUE // suggest to function write_number, to divide by 10 and print as a fraction: N.N
-
-// Gives Unicode code points to the relevant QMK functions.
-// Handles Dvorak 'descramble' Unicode mode, if compiled (only tested on Linux).
-void unicode_hex2output (long unsigned int unshifted, long unsigned int shifted) {
-
-    long unsigned int input; // which argument to work on
-
-# ifdef DVORAK_DESCRAMBLE // Do the letter descramble if needed.
-
-    char output[10]; // will hold the ascii for output
-    int index; // count backwards 'to left' in the string
-    long unsigned int bitmove; // move computation to next digit.
-    long unsigned int work; // temporary value for computation
-
-# endif
-
-    // What to work on
-    if(shift_ison) input = shifted; // Trying to get everything possible here in this function, to reduce firmware size.
-    else input = unshifted;
-
-# ifndef DVORAK_DESCRAMBLE // Only normal mode
-
-    register_unicode ( (uint32_t) input ) ;
-
-# else
-
-    if(_FULL_ != alternate){ 
-
-        register_unicode ( (uint32_t) input ) ; // normal Unicode mode
-
-    }else{  // Special Dvorak-descramble mode: 0-9=0-9, a=a, b=n, c=i, d=h, e=d, f=y 
-    
-        // Take the hex value 4 bits at a time, starting with the least significant, convert to ascii, store
-        index = 9;
-        output[index] = '\0'; // terminator
-        bitmove = 0x1; 
-        while ((work = (input / bitmove)) && (index >= 0)) {
-            index --;
-            work &= 0xF; 
-            if (work < 0xA){  // numbers
-                output[index] = work + 0x30; // pad to ASCII
-            }else{            // alphas
-                if (0xA == work) output[index] = 'a';
-                if (0xB == work) output[index] = 'n';
-                if (0xC == work) output[index] = 'i';
-                if (0xD == work) output[index] = 'h';
-                if (0xE == work) output[index] = 'd';
-                if (0xF == work) output[index] = 'y';
-            }
-            bitmove *= 0x10; // next digit
-        }
-    
-        SEND_STRING ( SS_DOWN(X_LCTL) SS_DOWN(X_LSFT) "f" SS_UP(X_LSFT) SS_UP(X_LCTL) ); // lead-in for Unicode on Linux, 'descramble' mode
-        send_string (output + index); // pointer to argument with formatted string
-        SEND_STRING ( " " ); // Ends the Unicode numerical input mode
-    }
-
-# endif // DVORAK_DESCRAMBLE mode for that Base layer & mode setting is compiled in
-
-} 
-
-
-// Wrapper for unicode keys that do have the same on shift.
-void unicode_hex2output_single (long unsigned int either) {
-    unicode_hex2output (either, either);
-}
-
-
-// Required by QMK Unicode
-const uint32_t unicode_map[] PROGMEM = {
-
-};
-
-// Macro name definitions. The Unicode layers _ACC, _DRA and _BON are defined here,
-// because the Unicode map system does not have enough space (at time of this programming, year 2020).
-enum custom_keycodes {
-
-    // Macro, allowing the upper left button to switch to either _DEF_BASE base layer, or the _ALT_BASE base layer.
-    // Alternate is set on/half/off in the _RAR layer. The word "base" is used to avoid "default," because the default
-    // layer system call DF() is not being used.
-    CTO_BASE = SAFE_RANGE, // 'C' for costum, "TO" for to, "BASE" for chosen base layer
-
-    OTHER_BASE, // cycles modes: use _DEF_BASE, _ALT_BASE. For “dvorak²” layout (descramble) compile option, there is a third mode.
-
-# if defined(BASE_NUMPAD__ALT_BASE)
-    OTHER_BASE_GO, // Like OTHER_BASE, but also immediately switches to the other BASE layer.
-# endif
-
-    CTO_NUMS, // activates number-symbols layer, taking into account the dual layout mode
-    CTO_ACCE, //             accented        '' 
-    CTO_DRAW, //             drawings        ''
-
-# ifndef CHOLTAP_ACCE_NOP
-    CHOLTAP_ACCE, // Go to accented layer, or others in combination with other keys.
-# endif 
-
-// Keys can be pressed together for a separate layer (like 'adjust layer' on the Planck).
-    DUO_HOLD,
-
-    CHOLTAP_RSHFT, // Go to _FUN layer, or shift modifier.
-    CHOLTAP_LSHFT, // Go to <configurable> layer, or shift modifier.
-    CHOLTAP_LAYR,  // Go to _RAR layer, or right arrow 
-
-// Shifts which on tap produce a key
-
-   RSFT_TILDE,
-   LSFT_DASH,
-
-// Special macro to make F-keys one-shot or not.
-    _FUN_STAY,
-
-// Layer toggle to be guaranteed on up-key, therefore macro definition here.
-    _MOV_UP,
-
-// These macros protect the critical keys like 'Power' from accidental press, by needing Shift to be pressed.
-    C_KC_PWR,  // Powers computer off.
-    C_KC_WAKE,
-    C_KC_SLEP, // sleep computer
-    C_KC_PAUS, // pauze computer
-
-// Toggles side leds on/off. 
-    LEDS_ON,
-    RGBTOG_, 
-
-// Typing speed measuring 
-    SPEED_TOG,
-    SPEED_REPORT,
-
-// Word/character counting
-    COUNT_TOG,     // starts word counting
-    COUNT_REPORT,  // writes to the computer as if typing, gives count report
-    COUNT_WORDMIN, // reduces the word count
-    COUNT_NULL,    // resets count to zero
-    LT__MOV__KC_ENT, // move to layer _MOV, or <enter>
-
-// The _ACC layer, additional Unicode.
-# ifndef REMOVE_ACC // This cuts out the whole _ACC layer.
-    XP_ACC_AA,
-    XP_ACC_AB,
-    XP_ACC_AC,
-    XP_ACC_AD,
-    XP_ACC_AE,
-    XP_ACC_AF,
-    XP_ACC_AG,
-    XP_ACC_AH,
-    XP_ACC_AI,
-    XP_ACC_AJ,
-    XP_ACC_BA,
-    XP_ACC_BB,
-    XP_ACC_BC,
-    XP_ACC_BD,
-    XP_ACC_BE,
-    XP_ACC_BF,
-    XP_ACC_BG,
-    XP_ACC_BH,
-    XP_ACC_BI,
-    XP_ACC_BJ,
-    XP_ACC_BK,
-    XP_ACC_CA,
-    XP_ACC_CB,
-    XP_ACC_CC,
-    XP_ACC_CD,
-    XP_ACC_CE,
-    XP_ACC_CF,
-    XP_ACC_CG,
-    XP_ACC_CH,
-    XP_ACC_CI,
-    XP_ACC_CJ,
-# endif // REMOVE_ACC 
-
-# ifndef REMOVE_DRA // This cuts out the whole _DRA layer
-// The _DRA layer, additional Unicode.
-    XP_DRA_AA,
-    XP_DRA_AB,
-    XP_DRA_AC,
-    XP_DRA_AD,
-    XP_DRA_AE,
-    XP_DRA_AF,
-    XP_DRA_AG,
-    XP_DRA_AH,
-    XP_DRA_AI,
-    XP_DRA_AJ,
-    XP_DRA_BA,
-    XP_DRA_BB,
-    XP_DRA_BC,
-    XP_DRA_BD,
-    XP_DRA_BE,
-    XP_DRA_BF,
-    XP_DRA_BG,
-    XP_DRA_BH,
-    XP_DRA_BI,
-    XP_DRA_BJ,// XP_DRA_BK , // no 'BK' key definition on this layer
-    XP_DRA_CA,
-    XP_DRA_CB,
-    XP_DRA_CC,
-    XP_DRA_CD,
-    XP_DRA_CE,
-    XP_DRA_CF,
-# endif // REMOVE_DRA
-    XP_DRA_CG, // Needed for ☑ on Unicode tester key in _RAR
-# ifndef REMOVE_DRA // This cuts out the whole _DRA layer
-    XP_DRA_CH,
-    XP_DRA_CI,
-    XP_DRA_CJ,
-# endif // REMOVE_DRA
-
-// The _BON layer, additional Unicode.
-# ifndef REMOVE_BON // Removes this layer entirely, if set.
-    XP_BON_AA,
-    XP_BON_AB,
-    XP_BON_AC,
-    XP_BON_AD,
-    XP_BON_AE,
-    XP_BON_AF,
-    XP_BON_AG,
-    XP_BON_AH,
-    XP_BON_AI,
-    XP_BON_AJ,
-    XP_BON_BA,
-    XP_BON_BB,
-    XP_BON_BC,
-    XP_BON_BD,
-    XP_BON_BE,
-    XP_BON_BF,
-    XP_BON_BG,
-    XP_BON_BH,
-    XP_BON_BI,
-    XP_BON_BJ,
-    XP_BON_BK,
-    XP_BON_CA,
-    XP_BON_CB,
-    XP_BON_CC,
-    XP_BON_CD,
-    XP_BON_CE,
-    XP_BON_CF,
-    XP_BON_CG,
-    XP_BON_CH,
-    XP_BON_CI,
-    XP_BON_CJ,
-# endif // REMOVE_BON 
-
-// Hebrew
-# if defined(BASE_HEBREW__DEF_BASE) || defined(BASE_HEBREW__ALT_BASE)
-    XP_HEB_AA,
-    XP_HEB_AB,
-    XP_HEB_AC,
-    XP_HEB_AD,
-    XP_HEB_AE,
-    XP_HEB_AF,
-    XP_HEB_AG,
-    XP_HEB_AH,
-    XP_HEB_AI,
-    XP_HEB_AJ,
-    XP_HEB_BA,
-    XP_HEB_BB,
-    XP_HEB_BC,
-    XP_HEB_BD,
-    XP_HEB_BE,
-    XP_HEB_BF,
-    XP_HEB_BG,
-    XP_HEB_BH,
-    XP_HEB_BI,
-    XP_HEB_BJ,
-#     if defined(HEBREW_ISRAEL)
-    XP_HEB_BK,  // 
-#     endif
-    XP_HEB_CA,
-    XP_HEB_CB,
-    XP_HEB_CC,
-    XP_HEB_CD,
-    XP_HEB_CE,
-    XP_HEB_CF,
-    XP_HEB_CG,
-#     if defined(HEBREW_ISRAEL) || defined(HEBREW_DVORAK)
-    XP_HEB_CH,
-    XP_HEB_CI,
-    XP_HEB_CJ,
-#     endif
-    XP_HEB_MQF, // ־
-# endif //BASE_HEBREW__*
-
-};
-
-// Pre-existing function, called for every key up and down.
-// This function is sortof the hub of the whole thing.
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    // User input for the word count menu
-    if (sizecount_menu) {
-         if (record->event.pressed) { // key down
-
-             switch (keycode) {
-                 case KC_0: // read in how many is maximum
-                     sizecount_max = (sizecount_max * 10);
-                     break;
-
-                 case KC_1:
-                     sizecount_max = (sizecount_max * 10) + 1;
-                     break;
-
-                 case KC_2:
-                     sizecount_max = (sizecount_max * 10) + 2;
-                     break;
-
-                 case KC_3:
-                     sizecount_max = (sizecount_max * 10) + 3;
-                     break;
-
-                 case KC_4:
-                     sizecount_max = (sizecount_max * 10) + 4;
-                     break;
-
-                 case KC_5:
-                     sizecount_max = (sizecount_max * 10) + 5;
-                     break;
-
-                 case KC_6:
-                     sizecount_max = (sizecount_max * 10) + 6;
-                     break;
-
-                 case KC_7:
-                     sizecount_max = (sizecount_max * 10) + 7;
-                     break;
-
-                 case KC_8:
-                     sizecount_max = (sizecount_max * 10) + 8;
-                     break;
-
-                 case KC_9:
-                     sizecount_max = (sizecount_max * 10) + 9;
-                     break;
-
-                 case KC_C: // count characters
-                     sizecount_max_type = SIZECOUNT_CHAR;
-                     sizecount_menu = FALSE;
-                     break;
-
-                 case KC_W: // count words
-                     sizecount_max_type = SIZECOUNT_WORD;
-                     sizecount_menu = FALSE;
-                     break;
-
-                 // Anything else ends menu input.
-                 case KC_DOT:
-                 case KC_ESC:
-                     sizecount_menu = FALSE; // break out
-                     break;
-
-             }
-             if (!sizecount_menu) { // end
-                     send_string ("->");
-                     write_number (sizecount_max, FALSE);  // just indicate something
-             }
-         }
-    }
-
-    // Go back to base-layer after pressing an F-key, on key-up to avoid BASE key activation
-    if ((_fun_stay == FALSE) && // 
-        (((keycode >= KC_F1) && (keycode <= KC_F12))
-         ||
-        ((keycode >= KC_F13) && (keycode <= KC_F24)))) {  // assumes keycodes 1-12 and 13-24 are consequtive, which seems likely, although using 1-24 failed (probably not consequtive)
-         // Go back to base layer
-         if (!(record->event.pressed)) { // key up
-             if (alternate) { // 
-                 layer_move (_ALT_BASE); 
-             }else{
-                 layer_move (_DEF_BASE);
-             }
-        }
-    }
-
-    // Detect if Shift was pressed in isolation, by seeing if another key was pressed during the time
-    // the right shift key was held down.
-    // This system is also used by CHOLTAP_ACCE
-    // This helps make sure a tapped use of these keys is correctly differentiated from their use as a  
-    // modifier/layer-hold key. The Shift and CHOLTAP_ACCE should not normally interfere with each other.
-    if (isolate_trigger) { // speed: hoping this statement to execute a little quicker overall, than the next 
-        if ((keycode != CHOLTAP_RSHFT)   // not right shift up
-             &&
-            (keycode != CHOLTAP_LSHFT)   // not left shift up
-             &&
-            (keycode != CHOLTAP_ACCE)    // _ACC layer (and others)
-             &&
-            (keycode != RSFT_TILDE)      // Shift on _NSY
-             &&
-            (keycode != LSFT_DASH)       // Shift on _NSY
-             &&
-            (keycode != CHOLTAP_LAYR)) 
-                                       { // _RAR layer, or RAlt/Alt-Gr
-            isolate_trigger = FALSE; // another key was pressed
-        }
-    }
-
-    // This block contains the complex macros, which should not count in speed counting or word/character counting,
-    // because they aren't typed characters.
-    switch (keycode) {
-
-        // Typing speed measuring
-        case SPEED_TOG: // Toggle speed measuring on/off
-            if (record->event.pressed) { // key down
-                if (speed_measure) {
-                    speed_measure = FALSE;
-
-# ifdef RGBLIGHT_ENABLE
-                    rgblight_sethsv_noeeprom (HSV_PURPLE); // indicates stop (_RAR color)
-# endif
-
-                }else{
-                    // initialization of measurements
-                    speed_measure = TRUE; // activates
-                    speed = 0; // start at 0 k/s 
-                    speed_countdown = SPEED_COUNTDOWN; // reset, speed is measured in batches of keypresses
-                    speed_counttime = timer_read32 ();// get current time
-                    speed_add = 0;// speed average accumulator, it keeps adding the *speed* of each batch to this total
-                    speed_batches = 0; // divider for speed_add to get the average
-
-# ifdef RGBLIGHT_ENABLE
-                    // set middle led
-                    rgblight_sethsv_noeeprom (HSV_WHITE); // indicates start
-# endif
-
-                }
-
-# ifdef RGBLIGHT_ENABLE
-                isolate_rgblight_set ();
-# endif
-
-            }
-            break; 
-
-        case SPEED_REPORT: // Report the current typing speed by writing it, as if typing
-            if (record->event.pressed) { // down
-                short added = 5; // This counts how many characters the report itself is adding into the current text,
-                                 // to later delete it from the character count for text-size counting.
-              
-                if (speed_measure) {
-
-# ifdef WORDS_PER_MINUTE
-
-                    // The speed is recorded as an accumulation of keystrokes-per-second, times 10 for added precision.
-                    // This will be converted into words-per-minute by dividing by 5 characters for a word including
-                    // blank space and punctuation, and multiplied by 60 for seconds per minute. ⁶⁰/₅ = 12. Multiplied
-                    // by 12 is the simple conversion.
-                    send_string ("<"); // +1 character written // analogue to '<POWER>'
-                    added += write_number ((long int)((speed*12)/10), FALSE); // writes the speed 
-                    send_string ("wpm"); // +3 character written
-                    if (0 != speed_batches) {
-                        long int average_times_ten;
-                        average_times_ten =(long int) ((speed_add * 12) / speed_batches); // *12 converts k/s to wpm
-
-                        send_string (";"); // +①   ''       
-                        added += write_number (average_times_ten / 10, FALSE); // writes the average speed, cannot use decimal because precision is not there
-                        send_string ("wpm"); // +③
-                        added += write_number ((long int) speed_batches, FALSE); // amount of batches
-                        send_string ("x"); // +①
-                        added += 9 + write_number ((long int) SPEED_COUNTDOWN, FALSE); // amount of batches
-                        send_string ("keys"); // +④ = ⑨
-           
-                        speed_led ( (int) (average_times_ten / 12));// on report, show the average
-                                                                         // we need to convert back to k/s now
-                    }
-
-# else // keystrokes per second, k/s
-
-                    send_string ("<"); // +1 character written // analogue to '<POWER>'
-                    added += write_number ((long int)(speed/10), FALSE); // writes the speed 
-                    send_string ("k/s"); // +3 character written
-                    if (0 != speed_batches) {
-                        long int average_times_ten;
-                        average_times_ten =(long int) (speed_add / speed_batches);
-
-                        send_string (";"); // +①   ''       
-                        added += write_number (average_times_ten, DIV10POINT); // writes the average speed 
-                        send_string ("k/s"); // +③
-                        added += write_number ((long int) speed_batches, FALSE); // amount of batches
-                        send_string ("x"); // +①
-                        added += 9 + write_number ((long int) SPEED_COUNTDOWN, FALSE); // amount of batches
-                        send_string ("keys"); // +④ = ⑨
-           
-                        speed_led ( (int) average_times_ten );// on report, show the average. speed_led divides by 10
-                    }
-
-# endif
-
-                    send_string (">"); // +1 = 5
-                    if (sizecount_measure) sizecount_chars += added;   // the user is expected to hit <backspace>
-                }else{
-                    send_string ("<Soff>"); // indicates off
-                    if (sizecount_measure) sizecount_chars += 5;  // user: <backspace>, to take it down again
-                }
-
-                key_timer = timer_read ();
-
-            }else{ // key up
-                // This use of the key is for callibrating your colors; it is difficult otherwise to see.
-                // This is not part of normal usage, therefore it is kept bare bones to reduce firmware size
-                if (timer_elapsed (key_timer) > 999) { // held for one second
-                    speed += 10;
-                    write_number ((long int)(speed/10), FALSE); // writes the speed 
-                    speed_led (speed); // update led
-                }
-            }
-            break;
-
-        case COUNT_TOG: // Toggle start/stop text size measuring
-            if (record->event.pressed) { // key down
-
-                key_timer = timer_read ();
-
-            }else{ // up
-                if (timer_elapsed (key_timer) < 500) { // held for less than half a second (tapped)
-                    if (sizecount_measure) {
-
-                        sizecount_measure = FALSE;
-
-# ifdef RGBLIGHT_ENABLE
-                        rgblight_sethsv_noeeprom (HSV_PURPLE); // indicates stop (color of _RAR)
-                        isolate_rgblight_set ();
-# endif
-
-                    }else{
-
-                        sizecount_measure = TRUE; // start counting
-                        sizecount_word = FALSE; // detect double blanks. leading blanks are not a word
-
-# ifdef RGBLIGHT_ENABLE
-                        if (0 == sizecount_max) {
-                            rgblight_sethsv_noeeprom (HSV_BLUE); // indicates start/activated, but only without maximum set
-                            isolate_rgblight_set (); // .. if maximum set, led goes green to red.
-                        }else{
-                            rgblight_sethsv_noeeprom (HSV_GREEN); // indicates start/activated, but only without maximum set
-                            isolate_rgblight_set (); // .. if maximum set, led goes green to red.
-                        }
-# endif
-
-                    }
-                }else{ // held longer
-                    sizecount_menu = TRUE;
-                    send_string ("<Nc|w>"); // Menu: N amount, c|w character|word counting. Input is a number then ‛c’ or ‛w’
-                    sizecount_max = 0;
-                }
-            }
-            break;
-
-        case COUNT_NULL: // Sets the count to zero, which allows on/off to have a suspend/resume 
-            if (record->event.pressed) { // key up
-                sizecount_blanks = 0; // 
-                sizecount_chars = 0;
-
-# ifdef RGBLIGHT_ENABLE
-                rgblight_sethsv_noeeprom (HSV_CYAN); // indicates reset
-                isolate_rgblight_set ();
-# endif
-
-            }
-            break;
-
-        case COUNT_REPORT: // Report the current typing speed 
-            if (record->event.pressed) {
-                // We assume the user is writing a report in its active document, and then likely deleting it.
-                short added = 0; // This counts how much characters the report adds into the user document.
-
-                if (sizecount_measure) {
-                    send_string ("<"); // + 1 and ① characters (1 is one logical stream, ① another)
-                    if (0 == sizecount_max) { // no size counting maximum, print both characters and words
-
-                        added += write_number (sizecount_chars, FALSE); // returns how many characters where printed
-                        send_string ("c;"); // + 2
-                        added += write_number (sizecount_blanks, FALSE) + 5; // adds here
-                        send_string ("w>"); // + 2 = 5
-
-                    }else{ // Only show the one for which the maximum is set, don't throw off that mental focus
-                        if (SIZECOUNT_WORD == sizecount_max_type ) {
-
-                            added += write_number (sizecount_blanks, FALSE) + 3;
-                            send_string ("w>"); // + ② = ③
-
-                        }else{ // characters
-
-                            added += write_number (sizecount_chars, FALSE) + 3; // returns how many characters where printed
-                            send_string ("c>"); // + ② = ③
-
-                        }
-                        // add current maximum setting
-                        send_string ("["); // + 1
-                        added += write_number (sizecount_max, FALSE) + 3; 
-                        if (SIZECOUNT_WORD == sizecount_max_type) send_string ("w]"); // + 2
-                        else                                      send_string ("c]"); // + 2
-                    }
-                    sizecount_chars += added; // Account for the written characters in the report itself.
-
-                }else{ // no size counting, also here: keep the report terse
-                     send_string ("<Coff>"); // indicates off (no need to add to count, since counting is off)
-                }
-            }
-            break;
-
-        // This allows the user to manually remove word counts, when he has deleted a word.
-        // This is not needed for character count, because <backspace> counts as minus.
-        case COUNT_WORDMIN: // Take down one word in the word-count.
-            if (record->event.pressed) { // down
-                key_timer = timer_read ();
-            }else{ // up
-                if (timer_elapsed (key_timer) < 500) { // held for less than half a second (tapped)
-                    sizecount_blanks--;
-                }else{
-                    sizecount_blanks -= 10;
-                }
-            }
-            break;
-
-    // Shift detection system.
-                                                  // Disused because it turned out 'one shot' like Unicode input. Shift detection copied from.
-                                                  // https://github.com/kyleterry/qmk_firmware/blob/master/quantum/quantum.c
-                                                  //uint8_t shifted = get_mods() & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT));
-
-        // Crude but self contained in this source file shift detection.
-        // ... right shift
-        case KC_RSFT:
-        // + ... left shift
-        case KC_LSFT:
-            if (record->event.pressed) { // key down
-                shift_ison = 1; // shift depressed
-            }else{ // key up
-                shift_ison = 0; // shift released
-            }
-            // There are macros on Shift who also alter this variable.
-            break;
-
-        case OTHER_BASE: // Switching through the default/alternate BASE modes, and Descramble for that Dvorak compile
-            if (record->event.pressed) {
-                ;
-            }else{ // key up
-
-                // Cycles through the modes
-# ifdef DVORAK_DESCRAMBLE // version Dvorak+Dvorak-descramble has 3 modes
-                if (_NORMAL_ == alternate) {
-                    alternate = _FULL_;// alternate layers
-                    default_layer_set (_ALT_BASE_MASK); // This is needed only for a rare case,
-                                 //  where _DEF_BASE and _ALT_BASE their layer switching keys don't line up,
-                                 //  such as with Qwerty Base Arrow
-                } else if (_HALF_ == alternate) {
-                    alternate = _NORMAL_;// normal layers
-                    default_layer_set (_DEF_BASE_MASK);
-                }else{ // _FULL_ == alternate
-                    alternate = _HALF_;// alternate layers, without 'descramble' recomputing Unicode
-                    //default_layer_set (_ALT_BASE_MASK);
-                    // it cycles, and this comes always after it was set _FULL_
-                }
-# else          // Only switching the BASE layers between alternate and default
-
-                if (_NORMAL_ == alternate) {
-                    alternate = _FULL_;// alternate base layers
-                    default_layer_set (_ALT_BASE_MASK);
-                }else{
-                    alternate = _NORMAL_;// default base layers
-                    default_layer_set (_DEF_BASE_MASK);
-                } 
-# endif
-
-                indicate_base ();  // activate led change 
-            }
-            break; 
-
-# if defined(BASE_NUMPAD__ALT_BASE)
-
-        case OTHER_BASE_GO: // Switching through the default/alternate BASE modes, and Descramble for that Dvorak compile
-            if (record->event.pressed) {
-                ;
-            }else{ // key up
-
-                // Cycles through the modes
-# ifdef DVORAK_DESCRAMBLE // version Dvorak+Dvorak-descramble has 3 modes
-                if (_NORMAL_ == alternate) {
-                    alternate = _FULL_;// alternate layers
-                    default_layer_set (_ALT_BASE_MASK);
-                } else if (_HALF_ == alternate) {
-                    alternate = _NORMAL_;// normal layers
-                    default_layer_set (_DEF_BASE_MASK);
-                }else{ // _FULL_ == alternate
-                    alternate = _HALF_;// alternate layers, without 'descramble' recomputing Unicode
-                    //default_layer_set (_ALT_BASE_MASK);
-                    // it cycles, and this comes always after it was set _FULL_
-                }
-# else          // Only switching the BASE layers between alternate and default
-
-                if (_NORMAL_ == alternate) {
-                    alternate = _FULL_;// alternate base layers
-                    default_layer_set (_ALT_BASE_MASK);
-                }else{
-                    alternate = _NORMAL_;// default base layers
-                    default_layer_set (_DEF_BASE_MASK);
-                } 
-# endif
-                // make the switch to the other Base layer
-                if (alternate) { // 
-                    layer_move (_ALT_BASE); 
-                }else{
-                    layer_move (_DEF_BASE);
-                }
-            }
-            break; 
-# endif
-
-        //     Switching to layers:
-
-        case CTO_BASE:
-        // User pressed upper/left button, while not on BASE layer: ‛escape’ from a layer to BASE layer.
-        // On BASE itself, that key is <Escape>.
-            if (record->event.pressed) { // key down
-                ;
-            }else{ // key up
-                if (alternate) { // go to the alternate version (bit of a hack maybe, but all alternate
-                       // ... modes are non-zero)
-                    layer_move (_ALT_BASE); 
-                }else{
-                    layer_move (_DEF_BASE); 
-                }
-            } 
-            break;
-
-        case CTO_NUMS: // activates number-symbols layer
-            if (record->event.pressed) { // key down
-                ; 
-            }else{ // key up, so that upon key down the target layer isn't already activated, triggering that key on up
-                if (alternate) { // go to the alternate version
-                    layer_move (_ALT_NSY); 
-                }else{
-                    layer_move (_DEF_NSY); 
-                }
-            } 
-            break; 
-
-        case CTO_ACCE: // Unicode layer
-            if (record->event.pressed) { // key down
-                ;
-            }else{ // key up
-
-# ifndef REMOVE_ACC // This cuts out the whole _ACC layer.
-                layer_move (_ACC); // activates normal accented layer
-# else
-#     ifdef _ACC_KEY_ALT_LAYER
-                layer_move (_ACC_KEY_ALT_LAYER); // Alternative layer user configuration
-#     endif
-# endif
-
-            }
-            break; 
-
-        case CTO_DRAW: // Unicode layer
-            if (record->event.pressed) { // key down
-                ;
-            }else{ // key up
-
-# ifndef REMOVE_DRA // This cuts out the whole _DRA layer.
-                layer_move (_DRA); // activates normal accented layer
-# else
-#     ifdef _DRA_KEY_ALT_LAYER
-                layer_move (_DRA_KEY_ALT_LAYER); // Alternative layer user configuration
-#     endif
-# endif
-            } 
-          break; 
-
-        // The below are a simulated LT(layer,kc), layer-tap. 
-        // Double-tap-hold repeater functionality: not done. 
-        // They switch what layer to use depending on 'alternate' variable
-        // Basically it starts the right layer on key down, goes back to base layer on key up,
-        // and throws in a keypress as well if tapped.
-        // It also integrates with DUO_HOLD, to reach the _BON layer.
-
-# ifndef CHOLTAP_ACCE_NOP // When this key has been eviscerated, this macro becomes useless
-        case CHOLTAP_ACCE: // Works with DUO_HOLD macro to activate one of several layers.
-            if (record->event.pressed) { // key down
-                key_timer = timer_read ();
-                isolate_trigger = TRUE; // keep track of whether another key gets pressed.
-
-                duo_press_acc_bon ++; // This signals to the two DUO_HOLD keys, whether a move to _BON is desired.
-
-                if (duo_press_nsy_dra) { // One or more of the DUO_HOLD layer keys was already pressed; move to _BON
-
-#     ifndef REMOVE_BON // Removes this layer entirely, if set.
-                    layer_move (_BON); // Bonus Unicode layer
-#     else
-#         ifdef _BON_KEY_ALT_LAYER
-                    layer_move (_BON_KEY_ALT_LAYER); // Alternative layer user configuration
-#         endif
-#     endif 
-
-                }else{ // pressed in isolation
-
-#     ifndef REMOVE_ACC // This cuts out the whole _ACC layer.
-                    layer_move (_ACC); // Accented layer
-#     else
-#         ifdef _ACC_KEY_ALT_LAYER
-                    layer_move (_ACC_KEY_ALT_LAYER); // Alternative layer user configuration
-#         endif
-#     endif 
-
-                }
-            }else{ // key up
-
-                duo_press_acc_bon --;
-
-                if (1 == duo_press_nsy_dra) { // One DUO_HOLD layer keys is still pressed; move to numbers/symbols
-
-                    if (_FULL_ == alternate) {
-                        layer_move (_ALT_NSY); 
-                    }else{
-                        layer_move (_DEF_NSY); 
-                    }
-                }else if (2 == duo_press_nsy_dra) { // Two of the DUO_HOLD layer keys are still pressed: move to _DRA
-
-#     ifndef REMOVE_DRA // This cuts out the whole _DRA layer.
-                    layer_move (_DRA); // activates normal accented layer
-#     else
-#         ifdef _DRA_KEY_ALT_LAYER
-                    layer_move (_DRA_KEY_ALT_LAYER); // Alternative layer user configuration
-#         endif
-#     endif
-
-                }else{
-                    if (alternate) { // No _DEF_NSY layer keys remain pressed; Go back to base layer
-                        layer_move (_ALT_BASE); 
-                    }else{
-                        layer_move (_DEF_BASE);
-                    }
-                }
-
-                // Pressed in isolation
-                if (isolate_trigger) 
-                {
-                    if (timer_elapsed (key_timer) <= TAPPING_TERM_HOLTAP) { // tapped
-                        SEND_STRING (SS_TAP (X_DEL));
-                    }
-                }
-            }
-            break;
-# endif // CHOLTAP_ACCE_NOP
-
-        case CHOLTAP_LAYR: //to _RAR on hold, otherwise a keycode
-            if (record->event.pressed) { // key down
-                key_timer = timer_read ();
-                isolate_trigger = TRUE; // keep track of whether another key gets pressed.
-
-# ifdef BASE_RIGHT_ALT
-                SEND_STRING (SS_DOWN (X_RALT)); 
-# else
-                layer_move (_RAR); // activates descrambled drawings layer
-# endif
-
-            }else{ // key up
-                // Go back to base layer
-                if (speed_measure) speed_led (speed); // The _RAR layer overwrites the middle led, 
-                  //.. for use with alternate _HALF_ led colors (middle); thus needs to be set back to speed
-                  // led color upon leaving.
-
-# ifdef BASE_RIGHT_ALT
-                SEND_STRING (SS_UP (X_RALT)); 
-# else
-                if (alternate) { 
-                    layer_move (_ALT_BASE); 
-                }else{
-                    layer_move (_DEF_BASE);
-                }
-# endif
-
-                // Pressed in isolation
-                if (isolate_trigger) 
-                {
-                    if (timer_elapsed (key_timer) <= TAPPING_TERM_HOLTAP) { // tapped
-                        SEND_STRING (SS_TAP (X_RIGHT));
-                    }
-                }
-            }
-            break;
-
-# ifndef DUO_HOLD_BASIC
-        // This is the normal 'big' version, dealing with switching between _DEF_NSY/_ALT_NSY, _ACC, _DRA and _BON, in 
-        // .. conjunction with the CHOLTAP_ACCE macro.
-        case DUO_HOLD: // The macro around the split space-bar. Both keys come to this macro.
-            if (record->event.pressed) { // key down
-
-                duo_press_nsy_dra ++; // simple way to keep track of how many are pressed
-
-                if (duo_press_acc_bon){ // Preceded by holding the _ACC/_BON layer switch key: move to _BON
-
-#     ifndef REMOVE_BON // Removes this layer entirely, if set.
-                    layer_move (_BON); // Bonus Unicode layer
-#     else
-#         ifdef _BON_KEY_ALT_LAYER
-                    layer_move (_BON_KEY_ALT_LAYER); // Alternative layer user configuration
-#         endif
-#     endif 
-
-                }else if (1 == duo_press_nsy_dra) { // This is the first press of either of the DUO_HOLD keys on BASE
-
-                    if (_NORMAL_ == alternate) {
-                        layer_move (_DEF_NSY); 
-                    }else{
-                        layer_move (_ALT_NSY); 
-                    }
-                }
-                else if (2 == duo_press_nsy_dra) { // both are pressed
-
-#     ifndef REMOVE_DRA // This cuts out the whole _DRA layer.
-                    layer_move (_DRA); // activates normal accented layer
-#     else
-#         ifdef _DRA_KEY_ALT_LAYER
-                    layer_move (_DRA_KEY_ALT_LAYER); // Alternative layer user configuration
-#         endif
-#     endif
-                }
-
-            }else{ // key up
-
-                duo_press_nsy_dra --; 
-
-                if (1 == duo_press_nsy_dra) {
-                    if (duo_press_acc_bon){ // Still holding the _ACC/_BON layer switch key, and one DUO_HOLD keys
-
-#     ifndef REMOVE_BON // Removes this layer entirely, if set.
-                    layer_move (_BON); // Bonus Unicode layer
-#     else
-#         ifdef _BON_KEY_ALT_LAYER
-                    layer_move (_BON_KEY_ALT_LAYER); // Alternative layer user configuration
-#         endif
-#     endif 
-
-                    }else{
-                        if (_NORMAL_ == alternate) { 
-                            layer_move (_DEF_NSY); 
-                        }else{
-                            layer_move (_ALT_NSY); 
-                        }
-                    }
-                }
-                else { // Has to be zero.
-                    if (duo_press_acc_bon){ // Still holding the _ACC/_BON layer switch key, but zero DUO_HOLD layer keys
-
-#     ifndef REMOVE_ACC // This cuts out the whole _ACC layer.
-                        layer_move (_ACC); // Accented layer
-#     else
-#         ifdef _ACC_KEY_ALT_LAYER
-                        layer_move (_ACC_KEY_ALT_LAYER); // Alternative layer user configuration
-#         endif
-#     endif 
-
-                    }else{
-                         if (alternate) { // Back to letters
-                            layer_move (_ALT_BASE); 
-                         }else{
-                            layer_move (_DEF_BASE);
-                         }
-                    }
-                }
-            }
-            break;
-# else
-        // This is the eviscerated version, compiled when all Unicode layers _ACC, _DRA, _BON are cut, and layer key
-        // .. combinations have not been assigned other uses.
-        case DUO_HOLD: // The macro for the keys around the split space-bar. Both keys come to this macro.
-            if (record->event.pressed) { // key down
-
-                duo_press_nsy_dra ++; // simple way to keep track of how many are pressed
-
-                if (0 != duo_press_nsy_dra) { // One or more of the DUO_HOLD keys is pressed
-                    if (_NORMAL_ == alternate) {
-                        layer_move (_DEF_NSY); 
-                    }else{
-                        layer_move (_ALT_NSY); 
-                    }
-                }
-            }else{ // key up
-
-                duo_press_nsy_dra --; 
-
-                if (0 == duo_press_nsy_dra) { // None of the DUO_HOLD keys remains pressed
-                    if (alternate) { // Back to letters
-                       layer_move (_ALT_BASE); 
-                    }else{
-                       layer_move (_DEF_BASE);
-                    }
-                }
-            }
-            break;
-# endif // DUO_HOLD_BASIC
-
-        //   When held the key is shift. When tapped it is computed if the tap is short enough,
-        // and if no other key was pressed, in which case: right-shift-up is a toggle to the _FUN layer.
-        // The timing is meant to be able to undo an erroneous shift press just by holding longer,
-        // and the test if another key was pressed is to prevent an erroneous detection when typing
-        // very fast.
-        //   The reason for this on shift is to isolate GUI, where _FUN was previously more easily
-        // located. No alternative tapping function with GUI because some systems do not treat GUI
-        // purely as a modifier it seems. Since it is a toggle anyway, _FUN can fit away from the thumb-hold row.
-        case CHOLTAP_RSHFT: // When tapped it toggles the _FUN layer, when held it is Shift
-
-            if (record->event.pressed) { // key down
-
-                SEND_STRING (SS_DOWN (X_RSFT)); 
-                shift_ison = 1; // shift depressed
-
-                key_timer = timer_read ();
-                isolate_trigger = TRUE; // keep track of whether another key gets pressed until key-up
-
-            }else{ // key up
-
-                SEND_STRING (SS_UP (X_RSFT)); 
-                shift_ison = 0; // shift released
-
-                if (isolate_trigger) { // no other key was hit since key down 
-
-
-                    // Held medium long: _PAD, long: _MOV.
-                    // The reason to have a switch to _MOV on the left hand, is to be able to reach arrows on a toggle,
-                    // all by the left hand, when the right hand is on the mouse.
-                    if ((timer_elapsed (key_timer) <= 200)) { // tapped short (milliseconds)
-
-# ifndef SWITCH_RSHIFT_FUN_RAR // user config to reverse what this key its timing toggles to
-
-                        layer_move (_FUN); // activates function layer as a toggle
-
-                    } else { // held for longer
-
-                        layer_move (_RAR); 
- 
-# else
-
-                        layer_move (_RAR); // activates function layer as a toggle
-
-                    } else { // held for longer
-
-                        layer_move (_FUN); 
-
-# endif
- 
-
-                    }
-                }
-            }
-            break;
-
-        // The left-shift version of the above keycode. User can configure something (_PAD is default)
-        case CHOLTAP_LSHFT: // When tapped it toggles the _MOV layer, when held it is Shift
-                            // _RAR was the first idea, but some of its keys are too dangerous regarding accidents.
-            if (record->event.pressed) { // key down
-
-                SEND_STRING (SS_DOWN (X_LSFT)); 
-                shift_ison = 1; // shift depressed
-
-# ifndef REMOVE_PAD // The _PAD layer exists, we will use a timer …
-
-                key_timer = timer_read ();
-
-# endif
-
-
-                // This variable is re-used, for speed and because using both shifts is useless,
-                // .. thus very rare, and also not a usage problem if it occured.
-                isolate_trigger = TRUE; // keep track of whether another key gets pressed.
-
-            }else{ // key up
-
-                SEND_STRING (SS_UP (X_LSFT)); 
-                shift_ison = 0; // shift released
-
-                if (isolate_trigger) { // no other key was hit since key down 
-
-# ifndef REMOVE_PAD // The _PAD layer exists, differentiate meaning by timer.
-
-                    // Held medium long: _PAD, long: _MOV.
-                    // The reason to have a switch to _MOV on the left hand, is to be able to reach arrows on a toggle,
-                    // all by the left hand, when the right hand is on the mouse.
-                    if ((timer_elapsed (key_timer) <= 200)) { // tapped medium-long (milliseconds)
-
-#     ifndef SWITCH_LSHIFT_PAD_MOV // user config to reverse what this key its timing toggles to
-
-                        layer_move (_PAD); 
-
-                    } else { // held for longer
-
-                        layer_move (_MOV); 
-
-#     else
-
-                        layer_move (_MOV); 
-
-                    } else { // held for longer
-
-                        layer_move (_PAD); 
-
-#     endif
-
-                    }
-
-# else // _PAD layer was eviscerated
-
-                        layer_move (_MOV); 
-
-# endif
-
-                }
-            }
-            break;
-
-/*
-        case RSFT_TILDE:
-
-            if (record->event.pressed) { // key down
-
-                SEND_STRING (SS_DOWN (X_RSFT)); 
-                shift_ison = 1; // shift depressed
-
-                key_timer = timer_read ();
-                isolate_trigger = TRUE; // keep track of whether another key gets pressed until key-up
-
-            }else{ // key up
-
-                SEND_STRING (SS_UP (X_RSFT)); 
-                shift_ison = 0; // shift released
-
-                if (isolate_trigger) { // no other key was hit since key down 
-
-
-                    // Held medium long: _PAD, long: _MOV.
-                    // The reason to have a switch to _MOV on the left hand, is to be able to reach arrows on a toggle,
-                    // all by the left hand, when the right hand is on the mouse.
-                    if ((timer_elapsed (key_timer) <= 200)) { // tapped short (milliseconds)
-
-                        SEND_STRING ("~");
-
-                    }
-                }
-            }
-            break;
-*/
-
-        case RSFT_TILDE: // firmware size optimization, saves 36 bytes
-        case LSFT_DASH:
-
-            if (record->event.pressed) { // key down
-
-                if (RSFT_TILDE == keycode) { // this is probably not needed, both can be left or right shift
-                    SEND_STRING (SS_DOWN (X_RSFT)); 
-                }else{
-                    SEND_STRING (SS_DOWN (X_LSFT)); 
-                }
-                shift_ison = 1; // shift depressed
-
-                key_timer = timer_read ();
-                isolate_trigger = TRUE; // keep track of whether another key gets pressed until key-up
-
-            }else{ // key up
-
-                if (RSFT_TILDE == keycode) { 
-                    SEND_STRING (SS_UP (X_RSFT)); 
-                }else{
-                    SEND_STRING (SS_UP (X_LSFT)); 
-                }
-  
-                shift_ison = 0; // shift released
-
-                if (isolate_trigger) { // no other key was hit since key down 
-
-
-                    // Held medium long: _PAD, long: _MOV.
-                    // The reason to have a switch to _MOV on the left hand, is to be able to reach arrows on a toggle,
-                    // all by the left hand, when the right hand is on the mouse.
-                    if ((timer_elapsed (key_timer) <= 200)) { // tapped short (milliseconds)
-
-                        if (RSFT_TILDE == keycode) { 
-                            SEND_STRING ("~");
-                        }else{
-                            SEND_STRING ("-");
-                        }
-                    }
-                }
-            }
-            break;
-
-        case _FUN_STAY: // toggles if the f-keys return _FUN layer to BASE after one press
-            if (record->event.pressed) { // key down
-
-                if (_fun_stay == FALSE) { 
-                    _fun_stay = TRUE;
-                }else{
-                    _fun_stay = FALSE;
-                }
-                indicate_fun_stay (); // leds
-            }
-            break;
-
-# ifdef MOREKEY2_ARROW_CLUSTER
-
-        case _MOV_UP: // To be sure it activates on up key, and not already has triggered the _MOV layer during up-key.
-            if (record->event.pressed) { // key down
-               ;
-            }else{ // key up
-               layer_move (_MOV);
-            }
-            break;
-# endif
-
-        // These keys are so disruptive on an erroneous key press, that they are behind a shift lock.
-        // When used unshifted, they print a memory aid string: their name.
-        case C_KC_PWR: 
-            if (record->event.pressed) { // key down
-                if (shift_ison) { 
-                    SEND_STRING (SS_TAP (X_PWR)); 
-                }else{
-                    SEND_STRING ("<POWER>"); // Memory aid
-                }
-            }
-            break;
-
-        case C_KC_WAKE:
-            if (record->event.pressed) { // key down
-                if (shift_ison) { 
-                    SEND_STRING (SS_TAP (X_WAKE)); 
-                }else{
-                    SEND_STRING ("<WAKE>"); // Memory aid
-                }
-            }
-            break;
-
-        case C_KC_SLEP:
-            if (record->event.pressed) { // key down
-                if (shift_ison) { 
-                    SEND_STRING (SS_TAP (X_SLEP)); 
-                }else{
-                    SEND_STRING ("<SLEEP>"); // Memory aid
-                }
-            }
-            break;
-
-        case C_KC_PAUS:
-            if (record->event.pressed) { // key down
-                if (shift_ison) { 
-                    SEND_STRING (SS_TAP (X_PAUS)); 
-                }else{
-                    SEND_STRING ("<PAUSE>"); // Memory aid
-                }
-            }
-            break;
-
-        case LEDS_ON: // Toggles left/right leds on or off
-            if (record->event.pressed) { // key down
-
-# ifdef RGBLIGHT_ENABLE
-                if (leds_on == FALSE) { 
-                    leds_on = TRUE;
-                }else{
-                    leds_on = FALSE;
-                }
-                set_led_colors_ (state_recall); // Update leds
-            }
-# endif
-
-            break;
-
-# ifdef LEDS_OFF_BASE_DEF  // This messes with led effect on/off, so we need to track the state of this setting now.
-        case RGBTOG_: // Toggles middle led on or off
-            if (record->event.pressed) { // key down
-                if (led_middle_on == FALSE) { 
-                    led_middle_on = TRUE;
-                    rgblight_enable_noeeprom (); 
-                }else{
-                    led_middle_on = FALSE;
-                    rgblight_disable_noeeprom (); 
-                }
-            }
-            break;
-# endif   
-
-        // Some keycodes treated specially for the two counting systems (speed, text size)
-        // Deletions:
-        case KC_BSPC: // non-counting speed
-        case KC_DEL: // non-counting speed
-            if (record->event.pressed) { // key down
-                if (sizecount_measure) sizecount_chars--; // minus count for text size (removed a character)
-            }
-            break;
-
-        // White space for counting words
-        case LT__MOV__KC_ENT: // We want to count the <enter> for word-counts, sadly this looses the key repetition of LT(…)
-            if (record->event.pressed) { // key down
-
-                key_timer = timer_read ();
-                layer_move (_MOV);
-
-            }else{ // key up
-                 if (alternate) { // Back to letters
-                     layer_move (_ALT_BASE); 
-                 }else{
-                     layer_move (_DEF_BASE);
-                 }
-                 if (timer_elapsed (key_timer) <= TAPPING_TERM_HOLTAP) { // tapped
-                     send_string ("\n");
-                     if (sizecount_measure) {
-                         sizecount_chars++;
-
-                         if (sizecount_word) sizecount_blanks++; // count a word
-                         sizecount_word = FALSE; // don't count immediately next blank as a word
-                     }
-                 }
-            }
-            break;
-
-        // Word counting
-        case KC_SPC:
-            if (record->event.pressed) { // key down
-                if (sizecount_measure) {
-                    sizecount_chars++;
-
-                    if (sizecount_word) sizecount_blanks++; // count a word
-                    sizecount_word = FALSE; // don't count immediately next blank as a word
-                }
-            }
-            break;
-
-        // These are excluded from counting for text size/speed, they prevent the “default“ in the case statement to execute.
-
-        case KC_LEFT:
-        case KC_UP:
-        case KC_DOWN:
-        case KC_RIGHT:
-        case KC_PGUP:
-        case KC_PGDN:
-        case KC_HOME:
-        case KC_END:
-        case LALT_T ( KC_LEFT ):
-            if (speed_measure) speed_countdown++; // Navigation could be integral to someone typing and correcting mistakes,
-                                                  // but those keys don't add any text.
-        // Mouse movement is discounted in both speed and text size
-        case KC_WH_L:
-        case KC_WH_D:
-        case KC_WH_U:
-        case KC_WH_R:
-        case KC_MS_L:
-        case KC_MS_D:
-        case KC_MS_U:
-        case KC_MS_R:
-        case KC_BTN1:
-        case KC_BTN5:
-        case KC_BTN4:
-        case KC_BTN3:
-        case KC_BTN2:
-            break;
-
-
-        default: // If something else, it is a speed- and text measurement counting key
-            if (record->event.pressed) { // key down
-                if (speed_measure) speed_countdown--;
-                if (sizecount_measure) sizecount_chars++; 
-            }
-    }
-
-    // If speed measuring is on, count keypresses
-    // The idea is to more/less follow common standard with typing speed counting: shift is not counted,
-    // layer-switching or its equivalent is neither. Arrows are not counted. 
-    if (speed_measure) {
-        if (record->event.pressed) { // key down
-
-            if (0 >= speed_countdown) {
-
-                // key presses per second, but times ten for added precision of one digit
-                // This calculation quickly looses precision if not calculated with high enough numbers, but low enough to fit.
-                speed = (int) ( (SPEED_COUNTDOWN * 1000 ) / ((timer_read32 () - speed_counttime)/10) ); // counts time in ms
-                speed_led (speed); // updates led
-
-                // record for average
-                if (0 < (speed/10)) { // ignore 0 k/s batches, we assume the typer took a break
-                    speed_batches++; 
-                    speed_add += speed; 
-                }
-
-                // reset for next batch
-                speed_countdown = SPEED_COUNTDOWN; // reset
-                speed_counttime = timer_read32 ();
-            }
-        }
-    }
-
-    // For word-counting, ignore double blanks
-    if (sizecount_measure) {
-        if (record->event.pressed) { 
-            bool within = TRUE; // When text size is maximized, this indicates we are not yet at that maximum.
-
-# ifdef RGBLIGHT_ENABLE
-            unsigned short size_fraction = 0; // Used to compute led color as a fraction of a set maximum which is already typed.
-# endif
-
-            // ignoring blanks wordcount
-            if ((keycode != KC_SPC)
-                 &&
-                (keycode != KC_TAB) // This is ok, but a tab on BASE layer combo with Control, is not caught by this XXX (problem ignored, I never write Tab in a text worth counting)
-                 &&
-                (keycode != LT__MOV__KC_ENT)
-                 &&
-                (keycode != LT__MOV__KC_ENT)) {
-
-                sizecount_word = TRUE; // current key is not a blank, so we set this trigger for next key press
-            }
-
-            // computing maximum count effects: leds
-            if (0 != sizecount_max) { 
-
-                if (SIZECOUNT_WORD == sizecount_max_type) {
-                    if (sizecount_blanks > sizecount_max) within = FALSE;
-                }else{ // count chars
-                    if (sizecount_chars > sizecount_max) within = FALSE;
-                }
-
-                // led colors
-                if (within) { // green to red middle led
-
-# ifdef RGBLIGHT_ENABLE
-                    if (SIZECOUNT_WORD == sizecount_max_type) {
-                        size_fraction = (90 * sizecount_blanks) / sizecount_max; 
-                    }else{
-                        size_fraction = (90 * sizecount_chars) / sizecount_max;
-                    } 
-
-                    rgblight_sethsv_noeeprom (90 - size_fraction , 255, 255); // green to red, full saturation, full lit
-# endif
-                
-                }else{ // when at or over the limit: blink led red/white
-                    if ((KC_BSPC != keycode) 
-                         && (KC_DEL != keycode) // User already deleting, doubling is confusing
-                         && (CHOLTAP_LAYR != keycode)) { // This brings up the _RAR layer, to access the Count settings.
-
-                        SEND_STRING (SS_TAP(X_BSPC)); // refuses to type further, the user is stopped from typing to make it obvious
-
-                    }
-
-# ifdef RGBLIGHT_ENABLE
-                    if (sizecount_chars & 0x1) { // flip by every keypress
-                        rgblight_sethsv_noeeprom (HSV_RED);
-                    }else{
-                        rgblight_sethsv_noeeprom (HSV_WHITE); 
-                    }
-# endif
-
-                }
-
-# ifdef RGBLIGHT_ENABLE
-                rgblight_set (); // only center led is altered, no need to go through isolate_rgblight_set()
-# endif
-
-            }
-        }
-    }
-
-    // Simple macros, printing a character.
-    switch (keycode) {
-
-        /* _ACC layer definitions. */
-
-   // ------------------------- row 4
-
-# ifndef REMOVE_ACC // This cuts out the whole _ACC layer.
-        case XP_ACC_AA: // because a 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CAL_ACU, CAU_ACU);//  á Á
-            }
-            break;
-
-        case XP_ACC_AB: // because o (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (COL_ACU, COU_ACU);// ó Ó
-            }
-            break;
-
-        case XP_ACC_AC: // because e (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CEL_ACU, CEU_ACU);// é É
-            }
-            break;
-
-        case XP_ACC_AD: // because u (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CUL_ACU, CUU_ACU);// ú Ú
-            }
-            break;
-
-        case XP_ACC_AE: // because i (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CIL_ACU, CIU_ACU);// í Í 
-            }
-            break;
-
-        case XP_ACC_AF: // Because near Y 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CYL_ACU, CYU_ACU);// ý Ý
-            }
-            break;
-
-        case XP_ACC_AG: // because near Y 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CIJL_BI, CIJU_BI);// ij IJ
-            }
-            break;
-
-        case XP_ACC_AH: // because c (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CCL_CDL, CCU_CDL);// ç Ç
-            }
-            break;
-
-        case XP_ACC_AI: // because ring-finger left is o (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (COL_STK, COU_STK);// ø Ø
-            }
-            break;
-
-        case XP_ACC_AJ: // because pinky finger left is a 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CAL_RNG, CAU_RNG);// å Å
-            }
-            break;
-
-   // ------------------------- row 3
-        case XP_ACC_BA: // because a 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CAL_DIA, CAU_DIA);// ä Ä
-            }
-            break;
-
-        case XP_ACC_BB: // because o (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (COL_DIA, COU_DIA);// ö Ö
-            }
-            break;
-
-        case XP_ACC_BC: // because e (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CEL_DIA, CEU_DIA);// ë Ë
-            }
-            break;
-
-        case XP_ACC_BD: // because u (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CUL_DIA, CUU_DIA);// ü Ü
-            }
-            break;
-
-        case XP_ACC_BE: // because i
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CIL_DIA, CIU_DIA);// ï Ï
-            }
-            break;
-
-        case XP_ACC_BF: // because near y
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CYL_DIA, CYU_DIA);// ÿ Ÿ
-            }
-            break;
-
-        case XP_ACC_BG: // because vague logic about other hand having ae near on similar fingers
-            if (record->event.pressed) { // key down
-                unicode_hex2output (COEL_BI, COEU_BI);// œ Œ
-            }
-            break;
-
-        case XP_ACC_BH: // because near œ, toward the side of a (pinky)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CAEL_BI, CAEU_BI);// æ Æ
-            }
-            break;
-
-        case XP_ACC_BI: // because n
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CNL_TLD, CNU_TLD);// ñ Ñ
-            }
-            break;
-
-        case XP_ACC_BJ: // because s
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (CSL_SHP);// ß ß
-            }
-            break;
-
-        case XP_ACC_BK: // because roughly the location on French keyboard
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (C_MU_L);// μ
-            }
-            break;
-
-   // ------------------------- row 2
-        case XP_ACC_CA: // because a
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CAL_GRA, CAU_GRA);//à À
-            }
-            break;
-
-        case XP_ACC_CB: // because o (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (COL_GRA, COU_GRA);// ò Ò
-            }
-            break;
-
-        case XP_ACC_CC: // because e (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CEL_GRA, CEU_GRA);// è È
-            }
-            break;
-
-        case XP_ACC_CD: // because u (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CUL_GRA, CUU_GRA);// ù Ù
-            }
-            break;
-
-        case XP_ACC_CE: // because i (Dvorak)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CIL_GRA, CIU_GRA);// ì Ì
-            }
-            break;
-
-        case XP_ACC_CF: // because other hand same finger i
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CIL_CAR, CIU_CAR);// î Î
-            }
-            break;
-
-        case XP_ACC_CG: // because  other hand same finger u 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CUL_CAR, CUU_CAR);// û Û
-            }
-            break;
-
-        case XP_ACC_CH: // because  other hand same finger e 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CEL_CAR, CEU_CAR);// ê Ê
-            }
-            break;
-
-        case XP_ACC_CI: // because  other hand same finger o 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (COL_CAR, COU_CAR);// ô Ô
-            }
-            break;
-
-        case XP_ACC_CJ: // because  other hand same finger a 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CAL_CAR, CAU_CAR);// â Â
-            }
-            break;
-
-# endif // REMOVE_ACC // This cuts out the whole _ACC layer.
-
-
-        /* _DRA layer definitions. */
-
-
-# ifndef REMOVE_DRA // This cuts out the whole _DRA layer
-   // ------------------------- row 4
-        case XP_DRA_AA: // because '", the opening „“ at the ‛open’ of the keyboard (left/up)
-            if (record->event.pressed) { // key down
-
-                unicode_hex2output (CS_DQUHR, CS_DQUL);// “ „
-
-            }
-            break;
-
-        case XP_DRA_AB: // because to the right of opening “, ≤ on <
-            if (record->event.pressed) { // key down
-
-                unicode_hex2output (CS_DQUH, CS_ELTHAN);// ” ≤
-
-            }
-            break;
-
-        case XP_DRA_AC: // because this is where the £ is on an English keyboard, on 'any' money symbols ¤; ≥ on >
-            if (record->event.pressed) { // key down
-
-                unicode_hex2output (CS_POUND, CS_EGTHAN);// £ ≥
-
-            }
-            break;
-
-        case XP_DRA_AD: // because ∅ looks like ¢, and ¢ (cent) is on $ (money) ?
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_4THROW
-                unicode_hex2output (CS_NONE, CS_CENT);// ∅ ¢
-#     else
-                unicode_hex2output_single (CS_NONE);// ∅ ¢
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_AE: // because percentages %‰‱ and money ƒ are numerical ?
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_4THROW
-                unicode_hex2output (CS_PLMI, CS_LGULDEN);// ± ƒ
-#     else
-                unicode_hex2output_single (CS_PLMI);// ±
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_AF: // Because left of 🙂, on top of ★
-            if (record->event.pressed) { // key down
-
-                unicode_hex2output (CS_FLEUR, CS_HEART);// ❦ ♥
-
-            }
-            break;
-
-        case XP_DRA_AG: // because 😊 ⍨ 
-            if (record->event.pressed) { // key down
-
-                unicode_hex2output (CS_SMIL, CS_SAD_);// 🙂 🙁
-
-            }
-            break;
-
-        case XP_DRA_AH: // because «no reason», next to 😊 (emoticons)
-            if (record->event.pressed) { // key down
-
-                unicode_hex2output (CS_THUP, CS_THDN);// 👍 👎
-
-            }
-            break;
-
-        case XP_DRA_AI: // because (
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_4THROW
-                unicode_hex2output (CS_OPSUP, CS_OPSUB);// ⁽ ₍
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_AJ: // because )
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_4THROW
-                unicode_hex2output (CS_CPSUP, CS_CPSUB);// ⁾ ₎
-#     endif
-
-            }
-            break;
-
-   // ------------------------- row 3
-        case XP_DRA_BA: // because 1
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_1SUP, CN_1SUB);// ¹ ₁
-#     else
-                unicode_hex2output_single (CN_1SUP);// ¹ 
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_BB: // because 2
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_2SUP, CN_2SUB);// ² ₂
-#     else
-                unicode_hex2output_single (CN_2SUP);// ²
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_BC: // because 3
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_3SUP, CN_3SUB);// ³ ₃
-#     else
-                unicode_hex2output_single (CN_3SUP);// ³
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_BD: // because 4
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_4SUP, CN_4SUB);// ⁴ ₄
-#     else
-                unicode_hex2output_single (CN_4SUP);// ⁴
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_BE: // because 5
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_5SUP, CN_5SUB);// ⁵ ₅
-#     else
-                unicode_hex2output_single (CN_5SUP);// ⁵
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_BF: // because 6
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_6SUP, CN_6SUB);// ⁶ ₆
-#     else
-                unicode_hex2output_single (CN_6SUP);// ⁶
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_BG: // because 7
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_7SUP, CN_7SUB);// ⁷ ₇
-#     else
-                unicode_hex2output_single (CN_7SUP);// ⁷
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_BH: // because 8
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_8SUP, CN_8SUB);// ⁸ ₈
-#     else
-                unicode_hex2output_single (CN_8SUP);// ⁸
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_BI: // because 9
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_9SUP, CN_9SUB);// ⁹ ₉
-#     else
-                unicode_hex2output_single (CN_9SUP);// ⁹
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_BJ: // because 0
-            if (record->event.pressed) { // key down
-
-#     ifdef SUB_SCRIPT_NUMS 
-                unicode_hex2output (CN_0SUP, CN_0SUB);// ⁰ ₀
-#     else
-                unicode_hex2output_single (CN_0SUP);// ⁰
-#     endif
-
-            }
-            break;
-
-   // ------------------------- row 2
-        case XP_DRA_CA: // because [
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_2NDROW
-                unicode_hex2output (CS_OCBRA, CB_HHORI);// 「 ━
-#     else
-                unicode_hex2output_single (CB_HHORI);// ━
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_CB: // because ]
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_2NDROW
-                unicode_hex2output (CS_CCBRA, CB_LHORI);// 」 ─
-#     else
-                unicode_hex2output_single (CB_LHORI);// ─
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_CC: // because «no reason»
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_2NDROW
-                unicode_hex2output (CS_DEGREE, CS_CIRCLE);// ° 〇
-#     else
-                unicode_hex2output_single (CS_DEGREE);// °
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_CD: // because «no reason»
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_2NDROW
-                unicode_hex2output (CS_BULLET, CS_PARA);// • §
-#     else
-                unicode_hex2output_single (CS_BULLET);// •
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_CE: // because «no reason»
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_2NDROW
-                unicode_hex2output (CS_ELLIPS, CS_MIDDOT);// … ·
-#     else
-                unicode_hex2output_single (CS_ELLIPS);// … 
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_CF: // because «no reason» (+ resembles ‛☒’ ?), ✗
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CS_CHECK_B, CS_CHECK_N);// ☐ ☒
-            }
-            break;
-# endif
-
-        // This one must be included for _RAR layer
-        case XP_DRA_CG: // because next to ✗ ☐ ☒
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_2NDROW
-                unicode_hex2output (CS_CHECK_Y, CS_CHECK_H);// ☑ 🗹
-#     else
-                unicode_hex2output_single (CS_CHECK_Y);// ☑ 
-#     endif
-
-            }
-            break;
-
-# ifndef REMOVE_DRA // This cuts out the whole _DRA layer
-        case XP_DRA_CH: // because ?
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CQU_INV, CEX_INV);// ¿ ¡
-            }
-            break;
-
-        case XP_DRA_CI: // because {, ┄ «no reason» (opposite side from ━)
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_2NDROW
-                unicode_hex2output (CS_ODABRA, CB_LHORID);// 《 ┄ 
-#     else
-                unicode_hex2output_single (CB_LHORID);// ┄ 
-#     endif
-
-            }
-            break;
-
-        case XP_DRA_CJ: // because }, ┅ «no reason» (opposite side from ─)
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_DRA_2NDROW
-                unicode_hex2output (CS_CDABRA, CB_HHORID);// 》 ┅
-#     else
-                unicode_hex2output_single (CB_HHORID);// ┅
-#     endif
-            }
-            break;
-# endif // REMOVE_DRA
-
-
-        /* _BON layer definitions. */
-
-   // ------------------------- row 4
-# ifndef REMOVE_BON // Removes this layer entirely, if set.
-        case XP_BON_AA: // because of ' "
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_BON_4THROW
-                unicode_hex2output (CS_HQUOSB, CS_USER_DEFINED);// ‛ 🛠
-#     else
-                unicode_hex2output_single (CS_HQUOSB);// ‛ 
-#     endif
-
-            }
-            break;
-
-        case XP_BON_AB: // because of <, because "WASD" on _MOV
-   //  0x2019, single quotation mark: ’
-   // 0x2B06 arrow up: ⬆
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CS_HQUOSE, CS_ARR_UP);// ’ ⬆
-            }
-            break;
-
-        case XP_BON_AC: // because of >
-   // 0x00A4 any currency symbol: ¤
-   // 0x1F12F  Copyleft: 🄯 (means free to copy, see also © for not free to copy.)
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_BON_4THROW
-            unicode_hex2output (CS_CURREN, CS_COPYL);// ¤ 🄯 
-#     else
-            unicode_hex2output_single (CS_CURREN);// ¤
-#     endif
-
-            }
-            break;
-
-        case XP_BON_AD: // because $ and ¢ can be about money, and money is often added together
-                        // because … no reason, left over space.
-   //  0x2211,  summation: ∑
-   //  0xA9, copyright: ©
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_BON_4THROW
-            unicode_hex2output (CS_CUMMU, CS_COPY);// ∑ ©
-#     else
-            unicode_hex2output_single (CS_CUMMU);// ∑
-#     endif
-
-            }
-            break;
-
-        case XP_BON_AE: // because % for percent
-   //  0x2030,//  promille: ‰
-   //  0x2031,//  pro ten thousandth: ‱
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_BON_4THROW
-                unicode_hex2output (CS_PROM, CS_PROTT);// ‰ ‱
-#     else
-                unicode_hex2output_single (CS_PROM);// ‰
-#     endif
-
-            }
-            break;
-
-        case XP_BON_AF: // Because ♥ is a star, ❦ and stars can be used as bullet points
-   //  0x2605, star: ★
-   //  0x066D, star small: ٭
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_BON_4THROW
-                unicode_hex2output (CS_STARB, CS_STARL);// ★ ٭
-#     else
-                unicode_hex2output_single (CS_STARB);// ★
-#     endif
-
-            }
-            break;
-
-        case XP_BON_AG: // because of 🙂 🙁
-   //  0x1f60A,// <smile> ^^  😊
-   //  0x2368,//  "Squiggly" face <sad>  ⍨
-
-#     ifdef FULL_BON_4THROW
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CS_SMILP, CS_SQUIG);// 😊 ⍨
-            }
-#     endif
-
-            break;
-
-        case XP_BON_AH: // because * also for multiply, because asterisk *
-   //  0x00D7,//  multiply: ×
-   //  0x20F0     high asterisk:  ⃰(this thing seems to behave a bit weird in vim(1) or terminal)
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_BON_4THROW
-                unicode_hex2output (CS_MULT, CS_ASTL);// ×  ⃰
-#     else
-                unicode_hex2output_single (CS_MULT);// × 
-#     endif
-
-            }
-            break;
-
-        case XP_BON_AI: // because ø sort of seems to divide something, and √ also does that, and close to ⁻⁺ (exponential)
-   //  0x221A,//  square root: √
-            if (record->event.pressed) { // key down
-
-#     ifdef FULL_BON_4THROW
-            unicode_hex2output_single (CS_SQRT);// √ 
-#     endif
-
-            }
-            break;
-
-        case XP_BON_AJ: // because å points in the circle where this exponential minus goes, and it is right/"up" on the board
-                        // because ⁻⁺ belong together
-   //  0x207B,//  exponential minus sign: ⁻
-   //  0x207A,//  exponential plus: ⁺
-
-#     ifdef FULL_BON_4THROW
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CS_EXPMIN, CS_EXPPLS);// ⁻ ⁺
-            }
-#     endif
-
-            break;
-
-   // ------------------------- row 3
-        case XP_BON_BA: // because 1, because "WASD" on _MOV (depending on setup)
-   //  0x2460,   "1" : ①
-   //  0x2B05, arrow left: ⬅
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CN_1CIRC, CS_ARR_LE);// ① ⬅
-            }
-            break;
-
-        case XP_BON_BB: // because 2, because "WASD" on _MOV (depending)
-   //  0x2461,   "2" : ② 
-   //  0x2B07, arrow down: ⬇
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CN_2CIRC, CS_ARR_DN);// ② ⬇
-            }
-            break;
-
-        case XP_BON_BC: // because 3, because "WASD" on _MOV (depending)
-   //  0x2462,   "3" : ③
-   //  0x27A1, arrow right: ➡
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CN_3CIRC, CS_ARR_RI);// ③ ➡
-            }
-            break;
-
-        case XP_BON_BD: // because 4, because ┏ forms a box with the other box drawings to the right/down
-   //  0x2463,   "4" : ④
-   //  0x250F, box drawing heavy: ┏
-            if (record->event.pressed) { // key down
-
-#     ifdef BOX_DRAWINGS
-                unicode_hex2output (CN_4CIRC, CB_C_RIDN);// ④ ┏
-#     else
-                unicode_hex2output_single (CN_4CIRC);// ④
-#     endif
-
-            }
-            break;
-
-        case XP_BON_BE: // because 5, because ┓ forms a box
-   //  0x2513,box drawing heavy: ┓
-            if (record->event.pressed) { // key down
-
-#     ifdef BOX_DRAWINGS
-                unicode_hex2output (CN_5CIRC, CB_C_LEDN);// ⑤ ┓
-#     else
-                unicode_hex2output_single (CN_5CIRC);// ⑤ 
-#     endif
-
-            }
-            break;
-
-        case XP_BON_BF: // because 6, because ┃ continues box block
-   //  0x2465,   "6" : ⑥
-   //  0x2503, box drawing heavy: ┃
-            if (record->event.pressed) { // key down
-
-#     ifdef BOX_DRAWINGS
-                unicode_hex2output (CN_6CIRC, CB_VE);// ⑥ ┃
-#     else
-                unicode_hex2output_single (CN_6CIRC);// ⑥ 
-#     endif
-
-            }
-            break;
-
-        case XP_BON_BG: // because 7, because ┇ continues box block
-   //  0x2466,   "7" : ⑦
-   //  0x2507,    dotted line verticle (heavy): ┇
-            if (record->event.pressed) { // key down
-
-#     ifdef BOX_DRAWINGS
-                unicode_hex2output (CN_7CIRC, CB_VE_DOT);// ⑦ ┇
-#     else
-                unicode_hex2output_single (CN_7CIRC);// ⑦ 
-#     endif
-
-            }
-            break;
-
-        case XP_BON_BH: // because 8, ╋ because 8 also has a crossing line in it
-   //  0x254B, crossing lines: ╋
-   //  0x2467,   "8" : ⑨
-            if (record->event.pressed) { // key down
-
-#     ifdef BOX_DRAWINGS
-                unicode_hex2output (CN_8CIRC, CB_VE_BI);// ⑧ ╋
-#     else
-                unicode_hex2output_single (CN_8CIRC);// ⑧ 
-#     endif
-
-            }
-            break;
-
-        case XP_BON_BI: // because 9
-   //  0x2468,   "9" : ⑨
-   //  0x2513,box drawing heavy: ┓
-            if (record->event.pressed) { // key down
-
-                unicode_hex2output_single (CN_9CIRC);// ⑨ 
-
-            }
-            break;
-
-        case XP_BON_BJ: // because 0, because a "0" can also be a symbol for infinity, round & round
-   //  0x24EA,   "0" : ⓪
-   //  0x221E,//  infinity:∞
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CN_0CIRC, CS_INFIN);// ⓪ ∞
-            }
-            break;
-
-        case XP_BON_BK: // because -, because ~
-   //  0x2014,// dash: — (might not render differently than a hyphen - in some applications. Dash is longer).
-   //  0x2248,// about equal to: ≈
-            if (record->event.pressed) { // key down
-                unicode_hex2output (CS_DASH, CS_ABOUT);// — ≈
-            }
-            break;
-
-   // ------------------------- row 2
-        case XP_BON_CA: // because 1 above, because 「[
-   //  0x2039, opening single corner quotation: ‹
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (CS_GUILSLE);//  ‹
-            }
-            break;
-
-        case XP_BON_CB: // because 2 above, because 」]
-   //  0x203A, closing sinle corner quotation: ›
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (CS_GUILSRI);//  ›
-            }
-            break;
-
-        case XP_BON_CC: // because 3 above, because / (division)
-   //  0x00F7,//  division: ÷
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (CS_DIVI);//  ÷
-            }
-            break;
-
-        case XP_BON_CD: // because 4 above, ┗ because forms box
-   //  0x261E, hand bullet point: ☞
-   //  0x2517, box drawing heavy: ┗
-            if (record->event.pressed) { // key down
-#    ifdef BOX_DRAWINGS
-                unicode_hex2output (CS_FINGER, CB_C_RIUP);//  ☞ ┗
-#    else
-                unicode_hex2output_single (CS_FINGER);//  ☞
-#    endif
-
-            }
-            break;
-
-        case XP_BON_CE: // because 5 above, because =, ┛ because forms box
-   //  0x2260,//  inequal: ≠
-   //  0x251B, box drawing heavy: ┛
-            if (record->event.pressed) { // key down
-
-#    ifdef BOX_DRAWINGS
-                unicode_hex2output (CS_UNEQL, CB_C_LEUP);//  ≠ ┛
-#    else
-                unicode_hex2output_single (CS_UNEQL);//  ≠
-#    endif
-
-            }
-            break;
-
-        case XP_BON_CF: // because ☒ , ┣ box drawings block, some place
-   //  0x2717, cross mark: ✗ (complements ✓)
-   //  0x2523, box drawing: ┣
-            if (record->event.pressed) { // key down
-
-#    ifdef BOX_DRAWINGS
-                unicode_hex2output (CS_BOTCH, CB_VE_RI);//  ✗ ┣
-#    else
-                unicode_hex2output_single (CS_BOTCH);//  ✗ 
-#    endif
-
-            }
-            break;
-
-        case XP_BON_CG: // because 7 above, because ☑ 🗹 , ┫ complements with key to its left
-   //  0x2713, checkmark: ✓ 
-   //  0x252B, box drawing: ┫
-
-            if (record->event.pressed) { // key down
-#    ifdef BOX_DRAWINGS
-                unicode_hex2output (CS_CHECK, CB_VE_LE);//  ✓ ┫
-#    else
-                unicode_hex2output_single (CS_CHECK);//  ✓
-#    endif
-
-            }
-            break;
-
-        case XP_BON_CH: // because 8 above, because ¡ (inverted exclamation mark)
-   //  0x26A0,//  alert: ⚠
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (CS_ALERT);//  ⚠
-            }
-            break;
-
-        case XP_BON_CI: // because 9 above, because 《
-   //  0xAB, French quotation opening: «
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (CS_GUILLE);//  «
-            }
-            break;
-
-        case XP_BON_CJ: // because 0 above, because 》
-   //  0xBB, French quotation closing: »
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (CS_GUILRI);//  »
-            }
-            break;
-
-# endif // REMOVE_BON 
-
-// Hebrew
-# if defined(BASE_HEBREW__DEF_BASE) || defined(BASE_HEBREW__ALT_BASE)
-// The layout follows a standard hebrew keyboard, with the exception
-// of ק, which is displaced by “.>” copied from the Dvorak layout.
-
-        // HEBREW_DVORAK
-        // These letters on the upper left follow Dvorak layout.
-        // The reason is space on the device: these are not macros.
-        // Also: typing compatibility between Dvorak and Hebrew
-        // for these similar/same symbols: ,<.>. Idealy these symbols
-        // should be the hebrew variation, if space allows it.
-
-# if defined(HEBREW_ISRAEL)
-
-        case XP_HEB_AA: //
-            if (record->event.pressed) { // key down
-                // These shifts-up seem to work on GNU/Debian/Linux, otherwise it prints ':'
-                if (shift_ison) send_string ( SS_UP(X_RSFT) SS_UP(X_LSFT) ";" ); // moved here from <esc> on standard hebrew
-                else send_string  ("/");//
-            } break;
-
-        case XP_HEB_AB: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_GERSH);// ׳
-            }
-            break;
-        
-        case XP_HEB_AC: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_QOF);// ק
-            }
-            break;
-
-# elif defined(HEBREW_QWERTY)
-
-        case XP_HEB_AA: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_TAV);// ת
-            }
-            break;
-
-        case XP_HEB_AB: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_TSDIS);// ץ 
-            }
-            break;
-
-        case XP_HEB_AC: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_QOF);// ק
-            }
-            break;
-
-# endif // #HEBREW_*
-
-        case XP_HEB_AD: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_RESH);// ר
-            }
-            break;
-
-        case XP_HEB_AE: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_ALEF);// א
-    
-            }
-            break;
-
-        case XP_HEB_AF: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_TET);// ט
-            }
-            break;
-
-        case XP_HEB_AG: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_VAV);// ו
-            }
-            break;
-
-        case XP_HEB_AH: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_NUNS);// ן
-            }
-            break;
-
-        case XP_HEB_AI: 
-            if (record->event.pressed) { // key down
-
-# if   defined(HEBREW_ISRAEL)
-                        // The logic is that it mirrors '", “„, ”≤, ‛’ in Dvorak Base and other layers.
-                        // Therefore the little and ring fingers are used. Mirroring ━─ and ┄┅ on DRA_
-                        // layer, the outside on the keyboard is “big/fat”, the inside is “small/thin”,
-                        // like something protected in a shell. Hence: ……׳״
-                unicode_hex2output_single (HB_MEMS);// ם // ׳ is located elsewhere
-# elif defined(HEBREW_QWERTY) || defined(HEBREW_DVORAK)
-                unicode_hex2output (HB_MEMS, HB_GERSH);// ם׳
-# endif
-
-            }
-            break;
-
-        case XP_HEB_AJ: //
-            if (record->event.pressed) { // key down
-
-# if   defined(HEBREW_ISRAEL)
-                unicode_hex2output_single (HB_PE);// פ // ״ is located elsewhere
-# elif defined(HEBREW_QWERTY) || defined(HEBREW_DVORAK)
-                unicode_hex2output (HB_PE, HB_GRSHM);// פ״
-# endif
-
-            }
-            break;
-
-   // ------------------------- row 3
-        case XP_HEB_BA: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_SHIN);// ש
-            }
-            break;
-
-        case XP_HEB_BB: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_DALET);// ד
-            }
-            break;
-
-        case XP_HEB_BC: //Right-left-mark to the first free strong homerow finger on the left (middle)
-            if (record->event.pressed) { // key down
-                unicode_hex2output (HB_GIMEL, HB_RLM);// ג {RLM}
-            }
-            break;
-
-        case XP_HEB_BD: // The logic is that כ is the same key as 4 on another layer, which connects
-                        // with $, and other currencies in the same region (ģ). 
-            if (record->event.pressed) { // key down
-                unicode_hex2output (HB_KAF, HB_SHEKL);// כ₪
-            }
-            break;
-
-        case XP_HEB_BE: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_AYIN);// ע
-            }
-            break;
-
-        case XP_HEB_BF: // 
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_YOD);// י
-            }
-            break;
-
-        case XP_HEB_BG: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_GET);// ח
-            }
-            break;
-
-        case XP_HEB_BH: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output (HB_LAMED, HB_LRM);// ל {LRM}
-            }
-            break;
-
-        case XP_HEB_BI: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_KAFS);// ך
-            }
-            break;
-
-        case XP_HEB_BJ: //
-            if (record->event.pressed) { // key down
-
-# if   defined(HEBREW_ISRAEL) || defined(HEBREW_QWERTY)
-                if (shift_ison) send_string (":"); // : (the hebrew eqquivalent is apparently almost never used, and this saves space)
-                else unicode_hex2output_single (HB_PES);// ף
-# elif defined(HEBREW_DVORAK)
-                unicode_hex2output_single (HB_PES);// ף
-# endif 
-
-            }
-            break;
-
-# if defined(HEBREW_ISRAEL)
-        case XP_HEB_BK: // 
-            if (record->event.pressed) { // key down
-                if (shift_ison) unicode_hex2output_single (HB_GRSHM);// ״
-                else send_string (","); // comma
-            }
-            break;
-# endif
-
-        case XP_HEB_MQF: // ־ Maqaf
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_MAQAF);// ־ 
-            }
-            break;
-
-   // ------------------------- row 2
-        case XP_HEB_CA: //
-            if (record->event.pressed) { // key down
-// Hebrew harmonization + ':'
-# if   defined(HEBREW_ISRAEL) || defined(HEBREW_QWERTY)
-                unicode_hex2output_single (HB_ZAYIN);// ז
-# elif defined(HEBREW_DVORAK)
-                if (shift_ison) send_string (":"); //
-                else unicode_hex2output_single (HB_ZAYIN);// ז
-# endif
-            }
-            break;
-
-        case XP_HEB_CB: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_SAMEG);// ס
-            }
-            break;
-
-        case XP_HEB_CC: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_BET);// ב
-            }
-            break;
-
-        case XP_HEB_CD: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_HE);// ה
-            }
-            break;
-
-        case XP_HEB_CE: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_NUN);// נ
-            }
-            break;
-
-        case XP_HEB_CF: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_MEM);// מ
-            }
-            break;
-
-        case XP_HEB_CG: //
-            if (record->event.pressed) { // key down
-                unicode_hex2output_single (HB_TSADI);// צ 
-            }
-            break;
-
-#     if defined(HEBREW_ISRAEL) || defined(HEBREW_DVORAK)
-        case XP_HEB_CH: //
-            if (record->event.pressed) { // key down
-
-#         if defined(HEBREW_ISRAEL)
-                if (shift_ison) send_string ("<"); // 
-                else unicode_hex2output_single (HB_TAV);// ת
-#         else // HEBREW_DVORAK
-                unicode_hex2output_single (HB_TAV);// ת
-#         endif 
-
-            }
-            break;
-
-        case XP_HEB_CI: //
-            if (record->event.pressed) { // key down
-
-#         if defined(HEBREW_ISRAEL)
-                if (shift_ison) send_string (">"); // 
-                else unicode_hex2output_single (HB_TSDIS);// ץ
-#         else // HEBREW_DVORAK
-                unicode_hex2output_single (HB_TSDIS);// ץ
-#         endif 
-
-            }
-            break;
-
-        case XP_HEB_CJ: // anomaly
-            if (record->event.pressed) { // key down
-
-#         if defined(HEBREW_ISRAEL)
-                if (shift_ison) send_string ("?"); // 
-                else send_string ("."); // 
-#         else // HEBREW_DVORAK
-                unicode_hex2output_single (HB_QOF);// ק
-#         endif 
-
-            }
-            break;
-#     endif // HEBREW_*
-
-    // HB_D_VAV,
-    // HB_VAVYD,
-    // HB_D_YOD,
-# endif // Hebrew Base layer
-    }
-
-    return true;
-};
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.h b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.h
deleted file mode 100644
index 35433159110..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Remainder: © 2019 by J.B. <joshb@xs4all.nl>
- *
- */
-
-#pragma once
-
-/* This file contains function declarations for functions used in
- * unicode_macros.c
- */
-
-#define PRESCRAMBLED_U "f"  // This is the letter 'u' for Unicode input, as effective on GNU/Debian/Linux 10 set to Dvorak
-static uint16_t key_timer; // Used in _DDL to differentiate layer switching in half or full descramble mode.
-                           // In 'full' mode it goes to _DDD and _DDA Unicode layers, in 'half' mode to _DRA and _ACC.
-
-short duo_press_nsy_dra = 0; // This remembers how many of the duo-press keys are being pressed: _NSY / _DRA layers
-short duo_press_acc_bon = 0; // This remembers how many of the duo-press keys are being pressed: _ACC / _BON layers
-layer_state_t state_recall; // Also used when leds on/off is pressed
-
-void deactivate_all_but (int layer);
-void activate_this_layer (int layer);
-void indicate_base (void);
-void leds_show_off (void);
-void speed_report (int speed);
-void speed_led (int speed);
-void indicate_fun_stay (void);
-int write_number (long int input, short divide10); 
-void isolate_rgblight_set (void);
-void set_led_colors_ (layer_state_t state);
-
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_weurope.h b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_weurope.h
deleted file mode 100644
index f4a5bdab72b..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_weurope.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * Author: © 2019, 2020 by Jos Boersema
- *
- */
-
-#pragma once
-
-/*        An amount of Unicode #defines
- *        - western european accented characters
- *        - various punctuation symbols, different number formats, math symbols, other symbols. 
- */
-
-    // a lower case variants
-#define CAL_ACU  0xe1 //   'C' for Costum 'A' for a, 'L' for lower, "ACU" for acute: á
-#define CAL_CAR  0xe2 //        ''              ''        ''        "CAR" for caret: â
-#define CAL_DIA  0xe4 //        ''              ''        ''        "DIA" for diaereses: ä
-#define CAL_GRA  0xe0 //        ''              ''        ''        "GRA" for grave: à
-      // A upper case variants
-#define CAU_ACU  0xc1 //        ''              ''   'U' for upper, "ACU" for acute: Á
-#define CAU_CAR  0xc2 //        ''              ''        ''        "CAR" for caret: Â
-#define CAU_DIA  0xc4 //        ''              ''        ''        "DIA" for diaereses: Ä
-#define CAU_GRA  0xc0 //        ''              ''        ''        "GRA" for grave: À
-
-    // A with ring (Scandinavia)
-#define CAL_RNG  0xe5 //        ''        'A' for a, 'L' for lower, "RNG" for Ring: å
-#define CAU_RNG  0xc5 //        ''             ''    'U' for upper,        ''     : Å
-
-    // AE (French)          
-#define CAEL_BI  0xe6 //        ''        "AE" for ae, 'L' for lower        ''              : æ
-#define CAEU_BI  0xc6 //        ''              ''     'U' for upper,       ''              : Æ
-
-    // OE (French)
-#define COEL_BI  0x153 //       ''        "AO" for ao, 'L' for lower, "BI" for two-character: œ
-#define COEU_BI  0x152 //       ''              ''     'U' for upper,       ''              ; Œ
-
-   // Mu (French)
-#define C_MU_L   0x03BC //      ''        "MU" for Mu (Greek letter), 'L' for lower: 
-
-    // C with cedilla
-#define CCL_CDL  0xe7 //        ''        'C' for c, 'L' for lower, "CDL" for cedilla: ç 
-#define CCU_CDL  0xc7 //        ''             ''    'U' for upper,        ''        : Ç
-
-    // e lower case variants
-#define CEL_ACU  0xe9 //   'C' for Costum 'E' for e, 'L' for lower, "ACU" for acute: é
-#define CEL_CAR  0xea //        ''              ''        ''        "CAR" for caret: ê
-#define CEL_DIA  0xeb //        ''              ''        ''        "DIA" for diaereses: ë
-#define CEL_GRA  0xe8 //        ''              ''        ''        "GRA" for grave: è
-      // E upper case variants
-#define CEU_ACU  0xc9 //        ''              ''   'U' for uuper, "ACU" for acute: É
-#define CEU_CAR  0xca //        ''              ''        ''        "CAR" for caret: Ê
-#define CEU_DIA  0xcb //        ''              ''        ''        "DIA" for diaereses: Ë
-#define CEU_GRA  0xc8 //        ''              ''        ''        "GRA" for grave: È
-    
-    // i lower case variants
-#define CIL_ACU  0xed //        ''         'I' for i, 'L' for lower, "ACU" for acute: í
-#define CIL_CAR  0xee //        ''              ''         ''        "CAR" for caret: î
-#define CIL_DIA  0xef //        ''              ''         ''        "DIA" for diaereses: ï
-#define CIL_GRA  0xec //        ''              ''         ''        "GRA" for grave: ì
-      // I upper case variants
-#define CIU_ACU  0xcd //        ''              ''    'U' for upper, "ACU" for acute: Í
-#define CIU_CAR  0xce //        ''              ''         ''        "CAR" for caret: Î
-#define CIU_DIA  0xcf //        ''              ''         ''        "DIA" for diaereses: Ï
-#define CIU_GRA  0xcc //        ''              ''         ''        "GRA" for grave: Ì
-
-    // N with tilde
-#define CNL_TLD  0xf1 //        ''        'N' for n, 'L' for lower, "TLD" for tilde: ñ
-#define CNU_TLD  0xd1 //        ''             ''    'U' for upper,        ''      : Ñ
-
-    //Spanish additional symbols:
-#define CEX_INV  0xa1 //        ''        "EX" for exclamation mark, "INV" for inverted: ¡
-#define CQU_INV  0xbf //        ''        "QU" for question mark,           ''         : ¿
-    
-    // o lower case variants
-#define COL_ACU  0xf3 //   'C' for Costum 'O' for a, 'L' for lower, "ACU" for acute: ó
-#define COL_CAR  0xf4 //        ''              ''        ''        "CAR" for caret: ô
-#define COL_DIA  0xf6 //        ''              ''        ''        "DIA" for diaereses: ö
-#define COL_GRA  0xf2 //        ''              ''        ''        "GRA" for grave: ò
-      // O upper case variants
-#define COU_ACU  0xd3 //        ''              ''   'U' for upper, "ACU" for acute: Ó
-#define COU_CAR  0xd4 //        ''              ''        ''        "CAR" for caret: Ô
-#define COU_DIA  0xd6 //        ''              ''        ''        "DIA" for diaereses: Ö
-#define COU_GRA  0xd2 //        ''              ''        ''        "GRA" for grave: Ò
-                            
-    // O with stroke (Scandinavia)
-#define COL_STK  0xf8 //        ''        'O' for o, 'L' for lower, "STK" for Stroke: ø
-#define COU_STK  0xd8 //        ''             ''    'U' for upper,        ''       : Ø
-
-    // u lower case variants
-#define CUL_ACU  0xfa //    'C' for Costum 'U' for u, 'L' for lower, "ACU" for acute: ú
-#define CUL_CAR  0xfb //        ''              ''        ''        "CAR" for caret: û
-#define CUL_DIA  0xfc //        ''              ''        ''        "DIA" for diaereses: ü
-#define CUL_GRA  0xf9 //        ''              ''        ''        "GRA" for grave: ù
-      // U upper case variants
-#define CUU_ACU  0xda //        ''        'U' for u, 'U' for upper, "ACU" for acute: Ú
-#define CUU_CAR  0xdb //        ''              ''        ''        "CAR" for caret: Û
-#define CUU_DIA  0xdc //        ''              ''        ''        "DIA" for diaereses: Ü
-#define CUU_GRA  0xd9 //        ''              ''        ''        "GRA" for grave: Ù
-
-    // Y with acute
-#define CYL_ACU  0xfd //        ''        'Y' for y, 'L' for lower, "ACU" for Acute: ý
-#define CYU_ACU  0xdd //        ''             ''    'U' for upper,        ''      : Ý
-    // Y with diaereses
-#define CYL_DIA  0xff //        ''        'Y' for y, 'L' for lower, "DIA" for Diareses: ÿ
-#define CYU_DIA  0x178 //       ''             ''    'U' for upper,        ''         : Ÿ
-
-    // Dutch IJ 
-#define CIJL_BI  0x133 //       ''        'IJ' for ij, 'L' for lower, BI for two-character: ij
-#define CIJU_BI  0x132 //       ''              ''   , 'U' for upper      ''              : IJ
-
-    //German:
-     // sharp s 
-#define CSL_SHP  0xdf //        ''         'S' for s, 'L' for lower, "SHP" for sharp: ß
-  
-    // Some Unicode symbols that might be handy
-      // Happy symbols:
-#define CS_SMIL  0x1f642 // "C" for costum, "S" for symbol , "SMIL"  for <smile> 🙂 
-#define CS_SMILP 0x1F60A //     ''        ,     ''         , "SMIL" for smile, "P" for plus: 😊
-#define CS_THUP  0x1f44d //     ''        ,     ''         , "THUP"  for <thumb up> 👍 
-  
-      //Sad symbols
-#define CS_SAD_  0x1f641 //     ''        ,     ''         , "SAD_"   for  <sad face>  🙁 
-#define CS_SQUIG 0x2368 //      ''        ,     ''         , "SQUIG" for squigly face: ⍨
-#define CS_THDN  0x1f44e //     ''        ,     ''         , "THDN"  for <thumb down>  👎 
-
-// Punctuation
-#define CS_ASTL    0x20F0 //    ''     ,    ''       , "AST" for asterisk, "L" for little:  ⃰
-#define CS_DASH    0x2014 //    ''     ,    ''       , "DASH" for dash (a longer hyphen, if rendered correctly): —
-#define CS_DQUH    0x201D //    ''     ,    ''       , "D" for double, "QU" for quote, "H" for high: ”
-#define CS_DQUHR   0x201C //    ''     ,    ''       ,     ''       ,       ,,       ,     ''      , "R" for reverse: “
-#define CS_DQUL    0x201E //    ''     ,    ''       ,                               , "L" for low: „
-#define CS_GUILLE  0xAB //      ''     ,    ''       , "GUIL" for guillemet (French quotation), "LE" for left-pointing: «
-#define CS_GUILRI  0xBB //      ''     ,    ''       ,        ''                              , "RI" for right-pointing: »
-#define CS_GUILSLE 0x2039 //    ''     ,    ''       ,        ''                              , "S" for simple, "LE" for left-pointing: ‹
-#define CS_GUILSRI 0x203A //    ''     ,    ''       ,        ''                              ,     ''        , "RI" for right-pointing: ›
-#define CS_HQUOSB  0x201B //    ''     ,    ''       , "H" for high, "QUO" for quote, "S" for single, "B" for begin: ‛
-#define CS_HQUOSE  0x2019 //    ''     ,    ''       ,     ''              ''             ''        , "E" for end: ’
-
-     // Unusual parenthesis types
-#define CS_OCBRA  0x300c //     ''     ,    ''       , "O" for opening, "C" for corner, "BRA" for bracket:「
-#define CS_CCBRA  0x300d //     ''     ,    ''       , "C" for closing,     ''                ''         : 」
-#define CS_ODABRA 0x300a //     ''          ''       , "O" for opening, "D" for double, "A" for angled, "BRA" for bracket:《
-#define CS_CDABRA 0x300b //     ''     ,    ''       , "C" for closing,     ''              ''                ''         : 》
-
-     // currency
-#define CS_LGULDEN  UNICODE_CURRENCY //    ''        , "L" for lower, "GULDEN" for gulden (guilder): ƒ
-                // ^ special case for easy user configuration
-#define CS_CURREN 0xA4 //       ''     ,        ''   , "CURREN" for currency, 'any currency' symbol: ¤
-#define CS_POUND  0xA3 //       ''     ,        ''   , "POUND" for pound: £
-#define CS_CENT   0xA2 //       ''     ,        ''   , "CENT" for cent: ¢
-
-    // legal
-#define CS_COPY   0xA9 //       ''     ,        ''   , "COPY" for copyright: 
-#define CS_COPYL  0x1F12F  //   ''     ,        ''   , "COPY" for Copyright, "L" for left: 
-    
-     // circle, dots, bullet points
-#define CS_BULLET 0x2022 //     ''     ,        ''   , "BULLET" for bullet: •
-#define CS_CIRCLE 0x3007 //     ''     ,        ''   , "CIRCLE" for circle: 〇
-#define CS_DEGREE 0xB0   //     ''     ,        ''   , "DEGREE" for degree: °
-#define CS_ELLIPS 0x2026 //     ''     ,        ''   , "ELLIPS" for bullet: …
-#define CS_FINGER 0x261E //     ''     ,        ''   , "FINGER" for finger: ☞
-#define CS_MIDDOT 0x00B7 //     ''     ,        ''   , "MIDDOT" for mid dot: ·
-#define CS_PARA   0x00A7 //     ''     ,        ''   , "PARA" for paragraaf: §
-
-     // super and sub script numbers
-#define CN_0SUB  0x2080 //      ''     , N for number, "SUB" for sub-script or "SUP" for super-script:₀
-#define CN_0SUP  0x2070 //      ''     ,    ''       ,                           ''                  :⁰
-#define CN_1SUB  0x2081 //      ''     ,    ''       ,        ''                                     :₁
-#define CN_1SUP  0xB9   //      ''     ,    ''       ,                           ''                  :¹
-#define CN_2SUB  0x2082 //      ''     ,    ''       ,        ''                                     :₂
-#define CN_2SUP  0xB2   //      ''     ,    ''       ,                           ''                  :²
-#define CN_3SUB  0x2083 //      ''     ,    ''       ,        ''                                     :₃
-#define CN_3SUP  0xB3   //      ''     ,    ''       ,                           ''                  :³
-#define CN_4SUB  0x2084 //      ''     ,    ''       ,        ''                                     :₄
-#define CN_4SUP  0x2074 //      ''     ,    ''       ,                           ''                  :⁴
-#define CN_5SUB  0x2085 //      ''     ,    ''       ,        ''                                     :₅
-#define CN_5SUP  0x2075 //      ''     ,    ''       ,                           ''                  :⁵
-#define CN_6SUB  0x2086 //      ''     ,    ''       ,        ''                                     :₆
-#define CN_6SUP  0x2076 //      ''     ,    ''       ,                           ''                  :⁶
-#define CN_7SUB  0x2087 //      ''     ,    ''       ,        ''                                     :₇
-#define CN_7SUP  0x2077 //      ''     ,    ''       ,                           ''                  :⁷
-#define CN_8SUB  0x2088 //      ''     ,    ''       ,        ''                                     :₈
-#define CN_8SUP  0x2078 //      ''     ,    ''       ,                           ''                  :⁸
-#define CN_9SUB  0x2089 //      ''     ,    ''       ,        ''                                     :₉
-#define CN_9SUP  0x2079 //      ''     ,    ''       ,                           ''                  :⁹
-
-// Exponent symbols
-#define CS_CPSUB  0x208E //   ''     ,    ''       , "C" for closing, "P" for paranthesis, "SUB" for subscript: ₎
-#define CS_OPSUB  0x208D //   ''     ,    ''       , "O" for opening,     ''             ,       ''           : ₍
-#define CS_CPSUP  0x207E //   ''     ,    ''       , "C" for closing,     ''             , "SUP" for superscript: ⁾
-#define CS_OPSUP  0x207D //   ''     ,    ''       , "O" for opening:     ''             ,       ''             : ⁽
-#define CS_EXPMIN 0x207B //   ''     ,    ''       , "EXP" for exponent, "MIN" for minus : ⁻
-#define CS_EXPPLS 0x207A //   ''     ,    ''       ,       ''          , "PLS" for plus : ⁺
-// Math
-#define CS_ABOUT  0x2248 //   ''     ,    ''       , "ABOUT" for about equal: ≈
-#define CS_CUMMU  0x2211 //   ''     ,    ''       , "CUMMU" for cummulative: ∑
-#define CS_DIVI   0xF7 //     ''     ,    ''       , "DIVI" for division: ÷
-#define CS_EGTHAN 0x2265 //   ''     ,    ''       , "E" for equal, "G" for or-greater, "THAN" for than: ≥
-#define CS_ELTHAN 0x2264 //   ''     ,    ''       , "E" for equal, "L" for or-less, "THAN" for than: ≤
-#define CS_INFIN  0x221E //   ''     ,    ''       , "INFIN" for infinity: ∞
-#define CS_MULT   0xD7 //     ''     ,    ''       , "MULTI" for multiplication: ×
-#define CS_NONE   0x2205 //   ''     ,    ''       , "NONE" for empty-set / no-solution: ∅ 
-#define CS_PLMI   0xB1   //   ''     ,    ''       , "PLMI" for plus-minus; ±
-#define CS_PROM   0x2030 //   ''     ,    ''       , "PROM" for promille: ‰
-#define CS_PROTT  0x2031 //   ''     ,    ''       , "PRO" for pro-, "TT" for ten-thousandth: ‱
-#define CS_SQRT   0x221A //   ''     ,    ''       , "SQRT" for square root: √
-#define CS_UNEQL  0x2260 //   ''     ,    ''       , "UNEQL" for unequal: ≠
- 
-# ifdef POINT_ON_CHECKBOXES
-    // pointers
-#     define CS_CHECK_H 0x2B9B // ''     ,    ''       , "H" for Down,          ''      : ⮛
-#     define CS_CHECK_B 0x2B98 // ''     ,    ''       , "L" for Left, "ARROW" for arrow: ⮘
-#     define CS_CHECK_Y 0x2B9A // ''     ,    ''       , "R" for Right,         ''      : ⮚
-#     define CS_CHECK_N 0x2B99 // ''     ,    ''       , "U" for UP,            ''      : ⮙
-# else
-    // checkboxes
-#     define CS_CHECK_H 0x1F5F9 // ''  ,    ''       , "CHECK" for check mark, "H" for heavy: 🗹
-#     define CS_CHECK_B 0x2610 //  ''  ,    ''       ,         ''            , "B" for blank: ☐ 
-#     define CS_CHECK_Y 0x2611 //  ''  ,    ''       ,         ''            , "Y" for yes: ☑ 
-#     define CS_CHECK_N 0x2612 //  ''  ,    ''       ,         ''            , "N" for no: ☒ 
-# endif
-
-// More arrows
-#define CS_ARR_DN 0x2B07 //     ''     ,    ''       , "ARR" for arrow, "DN" for down: ⬇
-#define CS_ARR_LE 0x2B05 //     ''     ,    ''       , "ARR" for arrow, "LE" for left: ⬅
-#define CS_ARR_RI 0x27A1 //     ''     ,    ''       , "ARR" for arrow, "RI" for right: ➡
-#define CS_ARR_UP 0x2B06 //     ''     ,    ''       , "ARR" for arrow, "UP" for up: ⬆
-
-// More checkmarks
-#define CS_BOTCH 0x2717 //      ''     ,    ''       , "BOTCH" for botched: ✗
-#define CS_CHECK 0x2713 //      ''     ,    ''       , "CHECK" for check mark: ✓
-
-// circled numbers
-#define CN_0CIRC  0x24EA //   ''     , "N" for number, "0" for , "CIRC" for circled: ⓪
-#define CN_1CIRC  0x2460 //   ''     ,     ''        , "1" for 1, "CIRC" for circled: ①
-#define CN_2CIRC  0x2461 //   ''     ,     ''        , "2" for 2, "CIRC" for circled: ②
-#define CN_3CIRC  0x2462 //   ''     ,     ''        , "3" for 3, "CIRC" for circled: ③
-#define CN_4CIRC  0x2463 //   ''     ,     ''        , "4" for 4, "CIRC" for circled: ④
-#define CN_5CIRC  0x2464 //   ''     ,     ''        , "5" for 5, "CIRC" for circled: ⑤
-#define CN_6CIRC  0x2465 //   ''     ,     ''        , "6" for 6, "CIRC" for circled: ⑥
-#define CN_7CIRC  0x2466 //   ''     ,     ''        , "7" for 7, "CIRC" for circled: ⑦
-#define CN_8CIRC  0x2467 //   ''     ,     ''        , "8" for 8, "CIRC" for circled: ⑧
-#define CN_9CIRC  0x2468 //   ''     ,     ''        , "9" for 9, "CIRC" for circled: ⑨
-#define CN_10CIRC 0x2469 //   ''     ,     ''        , "10" for 10, "CIRC" for circled: ⑩
-#define CN_11CIRC 0x246A //   ''     ,     ''        , "11" for 11, "CIRC" for circled: ⑪
-#define CN_12CIRC 0x246B //   ''     ,     ''        , "12" for 12, "CIRC" for circled: ⑫
-#define CN_13CIRC 0x246C //   ''     ,     ''        , "13" for 13, "CIRC" for circled: ⑬
-#define CN_14CIRC 0x246D //   ''     ,     ''        , "14" for 14, "CIRC" for circled: ⑭
-#define CN_15CIRC 0x246E //   ''     ,     ''        , "15" for 15, "CIRC" for circled: ⑮
-#define CN_16CIRC 0x246F //   ''     ,     ''        , "16" for 16, "CIRC" for circled: ⑯
-#define CN_17CIRC 0x2470 //   ''     ,     ''        , "17" for 17, "CIRC" for circled: ⑰
-#define CN_18CIRC 0x2471 //   ''     ,     ''        , "18" for 18, "CIRC" for circled: ⑱
-#define CN_19CIRC 0x2472 //   ''     ,     ''        , "19" for 19, "CIRC" for circled: ⑲
-
-// Box drawings
-#define CB_C_LEDN 0x2513 //   ''     , "B" for box drawing, "C" for corner, "LE" for left, "DN" for down: ┓
-#define CB_C_LEUP 0x251B //   ''     ,     ''             , "C" for corner, "LE" for left, "UP" for up: ┛
-#define CB_C_RIDN 0x250F //   ''     ,     ''             , "C" for corner, "RI" for right, "DN" for down: ┏
-#define CB_C_RIUP 0x2517 //   ''     ,     ''             , "C" for corner, "RI" for right, "UP" for up: ┗
-#define CB_VE     0x2503 //   ''     ,     ''             , "VE" for verticle: ┃
-#define CB_VE_BI  0x254B //   ''     ,     ''             , "VE" for verticle, "BI" for bi (two): ╋
-#define CB_VE_DOT 0x2507 //   ''     ,     ''             , "VE" for verticle, "DOT" for dotted: ┇
-#define CB_VE_LE  0x252B //   ''     ,     ''             , "VE" for verticle, "LE" for left: ┫
-#define CB_VE_RI  0x2523 //   ''     ,     ''             , "VE" for verticle, "RI" for right: ┣
-// Horizontal lines, can be used with box drawings
-#define CB_HHORI  0x2501 //   ''     ,     ''             , "H" for heavy,         ''           : ━
-#define CB_HHORID 0x2505 //   ''     ,     ''             , "H" for heavy,         ''           , "D" for dashes: ┅
-#define CB_LHORI  0x2500 //   ''     ,     ''             , "L" for light, "HORI" for horizontal: ─
-#define CB_LHORID 0x2504 //   ''     ,     ''             , "L" for light,         ''           , "D" for dashes: ┄
-
-// Signs, unusual
-#define CS_ALERT 0x26A0 //    ''     , "S" for symbol, "ALERT" for alert/warning: ⚠
-#define CS_STARB 0x2605 //    ''     ,    ''         , "STAR" for star, "B" for big: ★
-#define CS_STARL 0x66D  //    ''     ,    ''         , "STAR" for star, "L" for little: ٭
-#define CS_FLEUR 0x2766 //    ''     ,    ''         , "FLEUR" for fleur (flower): ❦
-#define CS_HEART 0x2665 //    ''     ,    ''         , "HEART" for heart: ♥
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/user_config.h b/keyboards/thevankeyboards/minivan/keymaps/josjoha/user_config.h
deleted file mode 100644
index 6552c9a49f8..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/user_config.h
+++ /dev/null
@@ -1,751 +0,0 @@
-/*
- * License (GPL):
-  
-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/>.
-
- * © 2019,2020 by Jos Boersema
- *
- */
-
-#pragma once
-
-// ------------------------------------- ⬇ --------------------------------------
-//                                 Configuration:
-// ------------------------------------- ⬇ --------------------------------------
-
-  // (For the non-coders: 
-  // “_Remove_” means to place ‛//’ in front of a line. The rest of the line becomes a comment.
-  // Placing ‛//’ in front of a line, means whatever follows it will be ignored during compilation.
-  // “_Activate_”   means to *delete* the two ‛//’ in front. Now the rest of the line *will* be compiled
-  // /* ... */ is another a way to turn “...” into being a comment which is ignored during compilation.
-  // (The documentation here is geared toward people who have no understanding about programming.)
-
-       /*
-        --------------------------------------------------------------------------------------
-                                                                                          ----
-                                                                                            --
-                                                                                             -
-          Table of Contents:
-         
-                            -0- ➡ Compact configuration file ⬅
-
-                            -1- ➡ Letters / Numbers & Symbols layouts ⬅
-                    • Qwerty
-                    • Qwerty with Base arrows
-                    • Dvorak
-                    • Dvorak descramble mode
-                    • Colemak
-                    • Workman
-                    • Numpad
-                    • Hebrew
-
-                            -2- ➡ Eviscerations ( ① / ② ) ⬅
-                    • Single layout
-
-                            -3- ➡ Startup settings ⬅
-                    • Alternate Base
-                    • Leds on/off at startup.
-                    • Speed measuring
-                    • Text size counting ⬅
-
-                            -4- ➡ How many hardware keys 1st row ⬅
-
-                            -5- ⚠ ≠ Minivan ⬅
-
-                            -6- ➡ Defining the meaning of the additional hardware keys ⬅
-                    • Defining the additional key for 'South paw' (also called 'Command')
-                    • Defining 'Arrow' hardware layout additional keys
-
-                            -7- ➡ Arrows/Navigation cluster ⬅
-                    • Navigation cluster configuration
-                    • VI editor arrows
-
-                            -8- ➡ Number pad Configuration⬅
-
-                            -9- ➡ Speed measuring ⬅
-
-                           -10- ➡ Some alternative keys ⬅
-                    • Right Alt or hold(_RAR) on Base
-                    • GUI left/right
-                    • Alternate currency symbol
-                    • Check boxes or Pointers
-                    • Switch _ACC/_BON ⬅➡ *left* side _NSY/_DRA hold keys
-                    • Switch _PAD ⬅➡ _MOV on Left Shift toggle
-                    • Switch _FUN ⬅➡ _RAR on Right Shift toggle
-                    • “Switch spacebars”: ‛Space-bar’ ⬅➡ “‛Enter’ + ‛layer-hold _MOV’”
-
-                           -11- ➡ Eviscerations ( ② / ② ) ⬅
-                    • Removing the numbers pad _PAD layer
-                    • Removing one or more of the Unicode layers _ACC, _DRA or_BON
-                    • Removing groups of characters
-
-                           -12- ➡ Leds ⬅
-        - 
-        --
-        ----
-        --------------------------------------------------------------------------------------
-        */
-
-       /*                   -0- ➡ Compact configuration file ⬅
-        *
-        * If you _activate_ this, this whole heavily documented configuration block below
-        * gets skipped, and instead a bare bones configuration file with all these same options
-        * gets read. There is no functional difference.
-        * 
-        * (You can use the compact configuration if you like that better. It can make communicating
-        * a configuration easier. The fully documented configuration is left in a state of default
-        * when uploaded to QMK, so that it gives the most commonly used layout: Qwerty with Numpad,
-        * basic 44 Minivan keys. The compact version its state is whatever it is.)
-        */
-//#define MINIFAN_CONFIG_COMPACT // _Activate_ this, to load the configuration in ./minifan_config_compact.h (note: mini‛f’an).
-#ifndef MINIFAN_CONFIG_COMPACT // (don't alter this)
-
-      
-       /*                   -1- ➡ Letters / Numbers & Symbols layouts ⬅
-        *
-        * Here you can configure what letters layer (BASE layer), and number&symbols layer you
-        * want. This is a dual layout system, so you can choose a second pair as well. You can
-        * switch between them with a key on the _RAR layer. All the other layers are the same,
-        * regardless of your choice in letter/number&symbol layers.
-        *
-        * The letters layer is the BASE layer, from which you also reach all other layers.
-        * The letters it has is the alphabet in its simplest form: abcdefghijklmnopqrstuvwxyz.
-        * The numbers & symbols layer has what you find on any regular keyboard: 123… !@#… []/…
-        * The numbers & symbols layer is made to fit the Letters layer, due to small differences
-        * between layouts like Qwerty and Dvorak (in this case the symbols ‛-’, ‛/’, ‛?’, and ‛_’).
-        *
-        * Example: A Qwerty letters layer, with a fitting numbers & symbols layer, as ‛Default’.
-        *          A Dvorak letters layer, with a fitting numbers & symbols layer, as ‛Alternate’.
-        *
-        * You will be asked to configure one layout as ‛Default’ and another as ‛Alternate’.
-        *
-        * A bases layout may have locally re-defined one or more of the common layers. If you
-        * choose two bases layouts who re-define the same common layer locally, you will need
-        * to choose either one by commenting out the other.
-        */
-        // 
-        //          • Qwerty
-        //                   (a regular Qwerty layout)
-        //  _Activate_ one of these two, _remove_ the other.
-  #define BASE_QWERTY__DEF_BASE // _Activate_ if you want Qwerty on the ‛Default’ spot
-//#define BASE_QWERTY__ALT_BASE // _Activate_ if you want Qwerty on the ‛Alternate’ spot
-        //                   Note: you still need to set if you have the additional ‛arrow’ hardware key. You
-        //                         can ignore what it should be defined as, because it will be a plain arrow on Base.
-        // 
-        //          • Qwerty with Base arrows
-        //                   (provides direct access to arrows)
-        //  _Activate_ one of these two, _remove_ the other.
-//#define BASE_QWERTY_BASEARROW__DEF_BASE // _Activate_ if you want Qwerty with Base arrows on the ‛Default’ spot
-//#define BASE_QWERTY_BASEARROW__ALT_BASE // _Activate_ if you want Qwerty with Base arrows on the ‛Alternate’ spot
-        // ➡ ➡ ➡ This Base layer has configuration options at the top of its file. See ./ base_qwerty_basearrow.h
-        //
-        //          • Dvorak
-        //                  (a regular Dvorak layout)
-        // _Activate_ one of these two, _remove_ the other.
-//#define BASE_DVORAK__DEF_BASE // _Activate_ if you want Dvorak on the ‛Default’ spot
-//#define BASE_DVORAK__ALT_BASE // _Activate_ if you want Dvorak on the ‛Alternate’ spot
-        // 
-        //          • Dvorak descramble mode
-        //                  (Dvorak for a computer already remapping to Dvorak)
-        //  This layout is only available on ‛Alternate’, because of the special _HALF_ descramble mode.
-//#define BASE_DVORAK_DESCRAMBLE__ALT_BASE // _Activate_ if you want Dvorak on the ‛Alternate’ spot
-        // 
-        //          • Colemak
-        //                   (a regular Colemak layout)
-        //  _Activate_ one of these two, _remove_ the other.
-//#define BASE_COLEMAK__DEF_BASE // _Activate_ if you want Colemak on the ‛Default’ spot
-//#define BASE_COLEMAK__ALT_BASE // _Activate_ if you want Colemak on the ‛Alternate’ spot
-        // 
-        //          • Workman
-        //                   (a regular Workman layout)
-        //  _Activate_ one of these two, _remove_ the other.
-//#define BASE_WORKMAN__DEF_BASE // _Activate_ if you want Workman on the ‛Default’ spot
-//#define BASE_WORKMAN__ALT_BASE // _Activate_ if you want Workman on the ‛Alternate’ spot
-        // 
-        //          • Numpad
-        //                   (a numerical keypad, one for left hand and one for right hand)
-        //  _Activate_ to get Numpad on Alternate. There is no option for Numpad on ‛Default’ base.
-  #define BASE_NUMPAD__ALT_BASE // _Activate_ if you want Numpad on the ‛Alternate’ spot
-        // ➡ ➡ ➡ This Base layer has configuration options at the top of its file. See ./base_numpad.h
-        //
-        //          • Hebrew
-        //                  (a simple Hebrew layout)
-        // _Activate_ one of these two, _remove_ the other.
-//#define BASE_HEBREW__DEF_BASE // _Activate_ if you want Hebrew on the ‛Default’ spot
-//#define BASE_HEBREW__ALT_BASE // _Activate_ if you want Hebrew on the ‛Alternate’ spot
-        // ➡ ➡ ➡ This Base layer has configuration options at the top of its file. See ./base_hebrew.h
-        //
-        /*                  -2- ➡ Eviscerations ( ① / ② ) ⬅
-         */
-        /*          • Single layout
-         *
-         * Removes the ‛Alternate’ base layers, and removes the switch key on _RAR.
-         * ⚠ You have to not define a ‛Alternate’ base layer pair. Define only a ‛Default’ pair.
-         */
-//#define MINIFAN_SINGLE_LAYOUT // _Activate_ to only have the ‛Default’ base layers, _remove_ to also have ‛Alternate’.
-
-
-        /*                  -3- ➡ Startup settings ⬅
-         */
-        /*          • Alternate Base
-         *
-         * You can define which of the two BASE layers is on when powering up the keyboard.
-         */
-//#define STARTUP_ALTERNATE // Example: For BASES_QWERTY_DVORAK defined: _remove_ is startup in Qwerty, _active_ is
-                            //          startup in Dvorak
-        /*          • Leds on/off at startup.
-         */
-//#define STARTUP_SIDE_LEDS_OFF // _Activate_ to have side leds be off at keyboard startup (when you plug it in / computer powers on).
-//#define STARTUP_MID_LED_OFF // _Activate_ to have middle led be off at keyboard startup.
-        //
-        /*          • Speed measuring
-         */
-//#define STARTUP_SPEED // _Activate_ for default speed measuring on, _remove_ to set off at startup.
-        //
-        /*          • Text size counting ⬅
-         */
-//#define STARTUP_COUNT // _Activate_ for default character/word counting on, _remove_ to set off at startup.
-
-
-
-        /*                  -4- ➡ How many hardware keys 1st row ⬅
-         *
-         * Define how many keys your keyboard has.
-         */
-         // Default               (12x12x12x8 keys)
-         //'Command'              (12x12x12x9 keys) + key on the left
-         //'Arrow'                (12x12x12x9 keys) + key on the right
-         //'South paw' + 'Arrow'  (12x12x12x10 keys)
-//#define MORE_KEY__COMMAND // Additional key 1st row on the left. This hardware layout is called 'Command' or 'South paw'.
-//#define MORE_KEY__ARROW   // Additional key 1st row (counting from row with space-bar) on the right, called 'Arrow' layout. 
-         //
-         // See below for how to define your additional key(s).
-
-
-        /*                  -5- ⚠ ≠ Minivan ⬅
-         *
-         * This section is for when you want to flash this keymap unto a board with more
-         * keys than the Minivan has. 
-         *
-         *       Trans-Minivan keymap: 12x12x12x11, 12x12x12x12, 12x12x12x13 keys
-         *                                          Example board: Planck (12x12x12x12)
-         *
-         * It is assumed that you enabled MORE_KEY__ARROW and
-         * MORE_KEY__COMMAND, to get to 12x12x12x10 keys. With this you
-         * can get to one, two or three more keys on row 1, without manually
-         * editing all layers. You could first edit the definition on layers that you have
-         * a specific meaning for these keys, and let the rest be patched with the definitions
-         * here.
-         *
-         * It can help to inspect the preprocessing with > gcc -E keymap.c | less
-         *
-         *                        Planck keyboard
-         *
-         * The identifier TRANSMINIVAN_MIDLEFT could help compile the layout on a Planck keyboard,
-         * if it has a two unit large spacebar. You compile without TRANSMINIVAN_LEFTSIDE in that case.
-         * All keys on the left, row 1 (closest to the user) shift one unit to the left, with TRANS_MIDLEFT
-         * inserted on what would be the left key of the two unit spacebar (assuming that is a key).
-         *
-         *                         Other keyboards formats
-         *
-         * It is always possible to just padd the rows somewhere, if you have even more keys. On the other
-         * hand, to try to cut this layout down to fewer keys than it has at minimum (12x12x12x8), is likely
-         * going to reduce its functionality, and will require some puzzling to keep a well organized BASE
-         * layer, and have “hold key” layer switching work correctly.
-         *
-         * FIXME: not been compiled or tested for any boards.
-         */
-//#define TRANSMINIVAN_LAYOUT ....... // Set this to something with the needed amount of keycodes.
-                          // Your values are inserted here: [ _LTR ] = LAYOUT_redefined (
-                          //                                           ^^^^^^^^^^^^^^^^ (throughout all layers)
-//#define TRANSMINIVAN_LEFTSIDE  // _Activate_ to get yet one more key on the left side row 1
-  #define TRANS_LEFT XXXXXXX     // Define what the TRANSMINIVAN_LEFTSIDE key should be, where it is not otherwise defined.
-                                 // (Ignored if TRANSMINIVAN_LEFTSIDE is _removed_).
-                                 //
-//#define TRANSMINIVAN_MIDLEFT   // _Activate_ to get yet one more key on the first key from center, row 1.
-  #define TRANS_MIDLEFT XXXXXXX  // Define what the TRANSMINIVAN_RIGHTSIDE key should be on all layers at once.
-                                 // (Ignored if TRANSMINIVAN_MIDLEFT is _removed_).
-                                 //
-//#define TRANSMINIVAN_RIGHTSIDE // _Activate_ to get yet one more key on the right side row 1
-  #define TRANS_RIGHT XXXXXXX    // Define what the TRANSMINIVAN_RIGHTSIDE key should be, where it is not otherwise defined.
-                                 // (Ignored if TRANSMINIVAN_RIGHTSIDE is _removed_).
-
-
-        /*                  -6- ➡ Defining the meaning of the additional hardware keys ⬅
-         *
-         * Some possibilities you might like:
-         *
-         * ① Number-pad and F-keys layers are only on a toggle. If you want them accessible on a hold key, you can use
-         *   these additional hardware keys. Make sure to use a transparent key on that location on those layers.
-         *
-         * ② You can use the right side additional key for quick access to an arrow/navigation cluster (see below).
-         *
-         * ③ Other uses, such as a delete key and/or a special interface key your system needs.
-         */
-        /*          • Defining the additional key for 'South paw' (also called 'Command')
-         *
-         * Left side additional key. This is ignored if MORE_KEY__COMMAND is not defined.
-         */
-        // Configure here what this key is on the BASE layers (excluding Base Numpad compile option).
-//#define MORE_key1_BASE TG ( _RAR ) // _Activate_ this to get a toggle to layer _RAR.  MO(_RAR) does not follow a BASE switch by ‛Other Base’.
-//#define MORE_key1_BASE KC_DEL      // Could be useful if you like to toggle to certain layers and stay there for a while.
-  #define MORE_key1_BASE KC__XGUI    // (Default) (Using KC__XGUI makes sure it is the *other* GUI, relative to KC__YGUI.)
-        //
-        // Configure here what this key is on all other layers
-//#define MORE_key1      KC_DEL   // Configure here what this key is on all other layers (and Base Numpad).
-  #define MORE_key1      KC__XGUI // (Default)
-        //
-        //
-        /*          • Defining 'Arrow' hardware layout additional keys
-         *
-         * You can create an arrow-cluster with your additional MORE_key2 hardware key on the _MOV layer.
-         * Either way: this new key can toggle to _MOV layer, with the key that on the _MOV layer becomes the down-arrow,
-         * in the middle of an arrow cluster. To do that, uncomment MOREKEY2_ARROW_CLUSTER.
-         * The keys that are by default defined on those keys on _MOV layer, will now be overwritten (they are not typically
-         * that much used there).
-         *
-         * Arrow cluster for 'arrow' layout: _activate_ MOREKEY2_ARROW_CLUSTER and _activate_ #define MORE_key2 _MOV_UP
-         * No arrow cluster for 'arrow' layout: _remove_ MOREKEY2_ARROW_CLUSTER, and set MORE_key2 to whatever you want.
-         */
-  #define MOREKEY2_ARROW_CLUSTER // Arrow cluster on _MOV layer. This is ignored if MORE_KEY__ARROW is not defined.
-                             // This will cost you 'Right Alt' and 'GUI' on the _MOV layer.
-//#define MOREKEY2_ADD_NAVIGATION // Additional navigation keys around arrow cluster MOREKEY2_ARROW_CLUSTER. Ignored if MOREKEY2_ARROW_CLUSTER is not defined.
-                                // Note: this will cause mouse buttons 'BTN4' and 'BTN5' on the _MOV layer to be moved.
-        /*
-         * Define the key you want on the additional key. Leave it to _MOV_UP if you want an arrow cluster, easily
-         * accessed with this key.
-         *
-         * If you want to be able to type all arrow cluster keys with both GUI keys, than you cannot have this additional
-         * arrow cluster around the ‛arrow’ additional hardware key, because it eats away the GUI just to the left of
-         * that additional hardware key. 
-         *
-         * For typing both GUIs with the navigation cluster, you also need the left side additional hardware key. In this
-         * case, you can still set the optional hardware key on the right to _MOV_UP, but that is marginally useful
-         * as you already have that on Left Shift. 
-         *
-         * When aiming to type all normally available keys on a 100% keyboard with all modifiers including GUIs, you
-         * could use the right hand side optional hardware key (‛arrow’), because it causes the right side GUI to be
-         * available there. (This kind of stuff affects rare or even never used keyboard shortcuts.)
-         */
-  #define MORE_key2 _MOV_UP // Right side additional key. This is ignored if MORE_KEY__ARROW is not defined.
-//#define MORE_key2 KC_DEL  // More or less a random suggestion. Harmonizes well with “.DEL” on Numbers Pad.
-                            // It is convenient to have an uncluttered Delete key on the Base layer.
-//#define MORE_key2 <...your choice...> // Right side additional key.
-        //
-
-
-        /*                  -7- ➡ Arrows/Navigation cluster ⬅
-         */
-        /*          • Navigation cluster configuration
-         * 
-         * _Activate_ below line to use a "WASD" type layout (on the spot where WASD is in Qwerty).
-         * _Remove_ if you prefer a flat type layout, with arrows in a row, on the right hand.
-         */
-  #define ARROWS_TRIANGLE // Implies mouse is also similarly in a triangle.
-        /*
-         *          • VI editor arrows
-         *
-         * Vi is a famous editor, with its own peculiar text cursor movement arrangement (arrows).
-         * This option modifies the flat arrows layout on the right hand, to be like the “HJKL” 
-         * arrows in the editor vi(1). “HJKL” meaning: the 7th to 10th key on the 3rd row.
-         * The arrows on the additional MOREKEY2_ARROW_CLUSTER also get harmonized to be like vi.
-         */
-//#define VI_SWITCHERYDOO //  You have to _remove_ ARROWS_TRIANGLE, or this gets ignored.
-
-
-        /*                  -8- ➡ Number pad Configuration⬅
-         *
-         * This concerns the Numbers Pad layer, which is part of the common layers (not the Bse
-         * layer, which also has a Numbers Pad option).
-         *
-         * There are two compile versions for the number pad layer ‛_PAD’, in the common layers. 
-         *
-         * _Activate_ the below to have the numbers pad _PAD layer resemble the squared layout of
-         * a numerical keyboard, allowing to type all numbers with the right hand.
-         * _Remove_ the below to have the numbers in this layer follow the layout of the _NSY layer,
-         * with the numbers on a line from left to right on the home row, across both hands.
-         */
-//#define NUMPAD_COMMON_SQUARE // _Activate_ to resemble a one handed numerical keyboard.
-
-
-        /*                  -9- ➡ Speed measuring ⬅
-         */
-        /*
-         * Led color configuration. You can see the speed you have configured below directly on the keyboard,
-         * after you compiled and flashed it.
-         * Set speed measuring to <off>.
-         * Hold the 'Report' key for one second, then release. The keyboard prints a number, which is the
-         * amount of characters per second for which that color is then being shown. Hold it again for
-         * a second, and it increments. Toggle speed measuring on/off to restart.
-         * You can play with the below settings until you like the result.
-         *
-         * The default values (8, 160 respectively) are starting at blue, avoiding confusion with default
-         * cyan for BASE layer, going to purple and further avoiding confusion with text size counting.
-         * Very fast typers could reach red, and then it goes further to yellow, etc.
-         */
-  #define SPEED_COUNTDOWN 25 // After how many keypresses to update the effect(s).
-  #define SPEED_HUE_STEP 8 // For each key/sec faster, the hue value of HSV goes this step further.
-  #define SPEED_HUE_START 160 // The starting hue for 0 k/s (0 = 255 = red).
-        /*
-         * Speed report in words-per-minute (wpm) rather than keystrokes-per-second (k/s). wpm = k/s * ⁶⁰/₅ = k/s * 12
-         */
-  #define WORDS_PER_MINUTE // _Activate_ to get speed report in words-per-minute, _remove_ to get it in keystrokes-per-second (k/s).
-
-
-        /*                 -10- ➡ Some alternative keys ⬅
-         */
-        /*
-         *          • Right Alt or hold(_RAR) on Base
-         *
-         * _Activate_ below line to get Right-Alt or Alt-Gr (same thing) on Base.
-         * A short tap results in RAlt briefly pressed, plus Right-Arrow.
-         * When pressed with another key, however short, results only in RAlt, and no Right-Arrow.
-         * Held a little longer than tapping it, results in only RAlt being pressed, no Right-Arrow.
-         *
-         * _Remove_ to have a layer hold key to the _RAR layer there, instead of RAlt, together with tapped Right-Arrow.
-         */
-//#define BASE_RIGHT_ALT // _Activate_ to get Right-Alt instead of _RAR on Base layer.
-        /*
-         *          • GUI left/right
-         *
-         * _Activate_ below line to have LGUI (also called OS or Win key, etc) where RGUI is, 
-         * and RGUI where LGUI is.
-         */
-//#define SWITCH_GUIS // _Activate_ this if you want LGUI on the BASE layer rather than RGUI, despite that spot being on the right.
-        /*
-         *          • Alternate currency symbol
-         *
-         * _Activate_ the below to get a Euro symbol, where ƒ (Dutch Guilder) is on the default map (_DRA layer).
-         */
-  #define UNICODE_CURRENCY 0x20ac // Hex number, euro symbol €. The unicode hex number for position ƒ in the default keymap.
-        /*    
-         *          • Check boxes or Pointers
-         *
-         * You can have these symbols (checkboxes):  ☐  ☒  ☑  🗹
-         *                     or these (pointers):  ⮘  ⮙  ⮚  ⮛
-         */
-//#define POINT_ON_CHECKBOXES // _Activate_ to get arrows, _remove_ to get checkboxes on _DRA layer.
-        /*    
-         *          • Switch _ACC/_BON and *left* side _NSY/_DRA hold keys
-         *
-         * If you type a lot of _ACC layer (accented keys), and not much _DRA layer, you might like to
-         * switch the _ACC hold key, and the left side _NSY key, if you find it awkward to reach to the
-         * left with your thumb. These two keys are next to each other. Only the Base layer is affected. 
-         */
-//#define SWITCH_HOLD_ACC_NSY // _Activate_ to switch the *left* _NSY and _ACC layer hold keys, on Base layer.
-        /*    
-         *          • Switch _PAD and _MOV on Left Shift toggle
-         *
-         * Recommended if you use _MOV more than _PAD
-         */
-//#define SWITCH_LSHIFT_PAD_MOV // _Activate_ to make _MOV layer be on the fast tap, and _PAD on a short hold toggle
-        /*    
-         *          • Switch _FUN and _RAR on Right Shift toggle
-         *
-         * Recommended if you use _RAR more than _FUN
-         */
-//#define SWITCH_RSHIFT_FUN_RAR // _Activate_ to make _RAR layer be on the fast tap, and _FUN on a short hold toggle
-        /*
-         *          • “Switch spacebars”: ‛Space-bar’ ⬅➡ “‛Enter’ + ‛layer-hold _MOV’”
-         *
-         * Recommended if you usually type ‛Space-bar’ with your left hand.
-         * These keys also switch on _MOV (movement) layer. Page-Up goes one spot to the left.
-         */
-//#define SPACE_LEFT__ENTER_RIGHT // _Activate_ for ‛Space bar’ left, ‛Enter’ and ‛_MOV hold’ right hand.
-
-
-        /*                 -11- ➡ Eviscerations ( ② / ② ) ⬅
-         */
-        /*          • Removing the numbers pad _PAD layer
-         *
-         * You may have no use for this common layer, if you have a numerical keypad on the Alternate Base already.
-         *
-         * ⚠ Note: ./base_numpad.h can overrides this setting, if compiled with that ‛Base layers’.
-         */
-//#define REMOVE_PAD // _Activate_ to strip out the _PAD layer, _remove_ to have the _PAD layer.
-        //
-        /*          • Removing one or more of the Unicode layers _ACC, _DRA or_BON
-         */
-        /* Removes the _ACC layer, optionally redirect its key. This can save some 750 bytes. 
-         */
-//#define REMOVE_ACC // _Activate_ to strip out the _ACC layer, _remove_ to have the _ACC layer.
-        /* Unless REMOVE_ACC is _active_, the next defines which redirect the _ACC key(s) are ignored. */
-//#define _ACC_KEY_ALT_LAYER _BON // _Activate_ to make the key(s) that normally goes to _ACC, go to _BON instead.
-//#define _ACC_KEY_ALT_LAYER _DRA // _Activate_ to make the key(s) that normally goes to _ACC, go to _DRA instead.
-        /*
-         *
-         * Removes the _DRA layer, optionally redirect its key. Also saves some 750 bytes.
-         */
-//#define REMOVE_DRA // _Activate_ to strip out the _DRA layer, _remove_ to have the _DRA layer.
-        /* Unless REMOVE_DRA is _active_, the next defines which redirect the _DRA key(s) are ignored. */
-//#define _DRA_KEY_ALT_LAYER _ACC // _Activate_ to make the key(s) that normally goes to _ACC, go to _ACC instead.
-//#define _DRA_KEY_ALT_LAYER _BON // _Activate_ to make the key(s) that normally goes to _ACC, go to _BON instead.
-        /*
-         *
-         * Removes the _BON layer, optionally redirect its key. Also saves some 750 bytes.
-         */
-//#define REMOVE_BON // _Activate_ to strip out the _BON layer, _remove_ to have the _BON layer.
-        /* Unless REMOVE_BON is _active_, the next defines which redirect the _BON key(s) are ignored. */
-//#define _BON_KEY_ALT_LAYER _ACC // _Activate_ to make the key(s) that normally goes to _BON, go to _ACC instead.
-//#define _BON_KEY_ALT_LAYER _DRA // _Activate_ to make the key(s) that normally goes to _BON, go to _DRA instead.
-        /*
-         *
-         *          • Removing groups of characters
-         */
-        /*
-         * The below cut out an amount of symbols on a given layer, to simplify and/or reduce firmware size a little.
-         */
-//#define ALL_DRA_BON_EVISCERATIONS // _Activate_ this to _remove_ the below all at once. (Seems to save only ±114 bytes)
-                                    //
-  #define BOX_DRAWINGS // _Activate_ to get box drawings on _BON. Horizontal lines (━─┄┅) on _DRA are not affected.
-                   // Affected on rows 2 and 3: ┣┫┏┗┃┇┛┓
-                   // Full, 3rd row, boxdr.:  Ctrl   ① ⬅   ② ⬇   ③ ➡  ④ ┏  ⑤  ┓  ⑥ ┃  ⑦ ┇   ⑧ ╋  ⑨    ⓪ ∞   — 
-                   // Full, 2nd row, boxdr.:  LSht   ‹     ›     ÷    ☞ ┗  ≠  ┛  ✗ ┣  ✓ ┫   ⚠    «    »     RSht
-                   //
-                   // 3rd row, no boxdrawing: Ctrl   ① ⬅   ② ⬇   ③ ➡  ④    ⑤     ⑥    ⑦     ⑧    ⑨    ⓪ ∞   — 
-                   // 2nd row, no boxdrawing: LSht   ‹     ›     ÷    ☞    ≠     ✗    ✓     ⚠    «    »     RSht
-                   //
-  #define SUB_SCRIPT_NUMS // _Activate_ to get subscript numbers (₁₂₃…₀) on _DRA.
-                      // Affected on row 3: ₁₂₃₄₅₆₇₈₉₀
-                      // Thinned out 3rd row: xxx   ¹     ²     ³    ⁴    ⁵    ⁶     ⁷     ⁸     ⁹     ⁰   xxx
-                      // Full 3rd row:        xxx   ¹₁    ²₂    ³₃   ⁴₄   ⁵₅   ⁶₆    ⁷₇    ⁸₈    ⁹₉    ⁰₀  xxx
-                      //
-  #define FULL_DRA_2NDROW // _Activate_ to have symbols on all unshifted + shifted positions on _DRA, 2nd row.
-                      // Affected: 「 」 〇 § · 🗹  《 》
-                      // Full 2nd row:        LSht  「━   」─   °〇  •§   …·   ☐ ☒   ☑ 🗹   ¿¡ 《┄   》┅    Rsht
-                      // Thinned out 2nd row: LSht  ━     ─     °    •    …    ☐ ☑   ☑     ¿¡  ┄    ┅      RSht
-                      //
-  #define FULL_DRA_4THROW // _Activate_ to have symbols on all unshifted + shifted positions on _DRA, 4th row.
-                      // Affected 4th row:          ¢ ƒ               ⁽ ₍ ⁾ ₎
-                      // Full 4th row:        BASE  “„    ”≤    £≥   ∅ ¢  ±ƒ   ❦ ♥   🙂🙁  👍👎 ⁽₍   ⁾₎    Bkspc
-                      // Thinned out 4th row: BASE  “„    ”≤    £≥   ∅    ±    ❦ ♥   🙂🙁  👍👎                           Bkspc
-                      //
-  #define FULL_BON_4THROW // _Activate_ to have symbols on all unshifted + shifted positions on _BON, 4th row.
-                        // Affected 4th row: 🛠 ¤ ∑ ‱ ٭ 😊 ⍨  ⃰ ⁻ ⁺ 🄯 ©  ⃰ √ ⁻⁺
-                        // Full 4th row:        BASE  ‛🛠   ’⬆    ¤ 🄯   ∑ ©  ‰‱   ★٭   😊⍨    × ⃰   √    ⁻⁺    Bkspc
-                        // Thinned out 4th row: BASE  ‛     ’⬆               ‰    ★           ×               Bkspc
-                        //
-
-
-        /*                 -12- ➡ Leds ⬅
-         *
-         * Leds off for the Default or Alternative Base Layer.
-         * Implies: no indication on Default Base for: Caps-lock, typing speed, 
-         * typing amount done of a limit.
-         * Speed / typing amount indicated by led will be visible by going to another layer.
-         */
-//#define LEDS_OFF_BASE_DEF // _Activate_ to make leds dark when in ‛Default Base’ layer.
-         //
-//#define LEDS_OFF_BASE_ALT // _Activate_ to make leds dark when in ‛Alternative Base’ layer.
-
-// ------------------------------------- ⬆ --------------------------------------
-//            Below here no more comfortable configuration options.....
-//            There may be configuration options in the layout ./bases_....h file you chose.
-// ------------------------------------- ⬆ --------------------------------------
-
-#else                            // (ignore this)
-#    include "./minifan_config_compact.h"
-#endif // MINIFAN_CONFIG_COMPACT
-
-
-// ------------------------------------- ⬇ --------------------------------------
-//                                 Base layer headers
-// ------------------------------------- ⬇ --------------------------------------
-
-//                         * Numpad *
-# if defined(BASE_NUMPAD__ALT_BASE)
-#     include "./base_numpad.h" // Numbers pad header
-# endif
-//                         * Qwerty Base Arrow *
-# if defined(BASE_QWERTY_BASEARROW__DEF_BASE) || defined(BASE_QWERTY_BASEARROW__ALT_BASE)
-#     include "./base_qwerty_basearrow.h" // qwerty base arrow, header
-# endif
-//                         * Hebrew *
-# if defined(BASE_HEBREW__DEF_BASE) || defined(BASE_HEBREW__ALT_BASE)
-#     include "./base_hebrew.h" // Hebrew header
-# endif
-
-// // ⬇ insert your ./base_YOUR_KEYMAP.h #include here:
-
-//                         * YOUR KEYMAP *
-// # if defined(BASE_YOUR_KEYMAP__DEF_BASE) || defined(BASE_YOUR_KEYMAP__ALT_BASE)
-// #     include "./base_YOUR_KEYMAP.h" // Your Keymap header/configuration file.
-// # endif
-
-// // ⬆
-
-// ------------------------------------- ⬆ --------------------------------------
-// Base layer headers are best #included here, so the preprocessor statements 
-// following the user configuration block can pick up on anything that was set.
-//
-// Example: base_numpad.h _activate_ ‛REMOVE_PAD’. Based upon that, the preprocessor
-// constant ‛_PAD’ is changed into ‛_FUN’ in the below statements.
-// ------------------------------------- ⬆ --------------------------------------
-
-
-
-// The below sets some things up based on the above #defines.
-
-// This is sort of a hack. It re-defines _ALT_BASE and _ALT_NSY to point to the same
-// layer as _DEF_BASE and _DEF_NSY, because there are quite a few references to the
-// former and putting #if then around each one complicated the code even more. If needed,
-// it can be changed later. This option already reduces firmware size, so we should be
-// well below the maximum.
-# ifdef MINIFAN_SINGLE_LAYOUT
-#     define _ALT_BASE _DEF_BASE
-#     define _ALT_NSY _DEF_NSY
-# endif
-
-// This triggers the compilation of Dvorak descramble mode.
-# ifdef BASE_DVORAK_DESCRAMBLE__ALT_BASE
-#     define DVORAK_DESCRAMBLE
-# endif
-
-// Prevent likely erroneous configuration. If no 'Arrow' hardware layout, then not patching in an arrow cluster.
-# if !defined(MORE_KEY__ARROW) && defined(MOREKEY2_ARROW_CLUSTER)
-#     undef MOREKEY2_ARROW_CLUSTER
-# endif
-
-# if !defined(MORE_KEY__ARROW) && defined(MOREKEY2_ADD_NAVIGATION)
-#     undef MOREKEY2_ADD_NAVIGATION
-# endif
-# if !defined(MOREKEY2_ARROW_CLUSTER) && defined(MOREKEY2_ADD_NAVIGATION)
-#     undef MOREKEY2_ADD_NAVIGATION // Only navigation keys, when the are arrows defined.
-# endif
-
-// When choosing 'triangle' arrows, then they go left. Not 'triangle' arrows, than right.
-# ifdef ARROWS_TRIANGLE
-         /* _Activate_ below line to put the arrows on the left, comment out to have arrows right. */
-#     define ARROWS_LEFT // Implies mouse is right
-# endif
-
-
-// Set up user GUI choice:
-# ifndef SWITCH_GUIS
-#     define KC__XGUI KC_LGUI // Name logic is alphabetic order left to right …X (…) …Y in layout definitions..
-#     define KC__YGUI KC_RGUI // .. meaning KC__XGUI is left on the keymap, KC__YGUI is right.
-# else
-#     define KC__XGUI KC_RGUI
-#     define KC__YGUI KC_LGUI
-# endif
-
-// Switch “spacebars”:
-# ifndef SPACE_LEFT__ENTER_RIGHT                // standard
-#     define LEFTCENTER_THUMB LT__MOV__KC_ENT
-#     define RIGHTCENTER_THUMB KC_SPC
-# else
-#     define LEFTCENTER_THUMB KC_SPC            // reversed
-#     define RIGHTCENTER_THUMB LT__MOV__KC_ENT
-# endif
-
-// Define the layout macro for the amount of hardware keys.
-// These for Minivan are defined up in the code tree.
-# if !defined(MORE_KEY__COMMAND) && !defined(MORE_KEY__ARROW)
-#     define LAYOUT_redefined LAYOUT                // Default (8 keys on 1st row)
-# endif
-
-# if !defined(MORE_KEY__COMMAND) && defined(MORE_KEY__ARROW)
-#     define LAYOUT_redefined LAYOUT_arrow          // Additional key 1st row on the right. 'Arrow'
-# endif
-
-# if defined(MORE_KEY__COMMAND) && !defined(MORE_KEY__ARROW)
-#     define LAYOUT_redefined LAYOUT_command        // Additional key 1st row on the left. 'Command'
-# endif
-
-# if defined(MORE_KEY__COMMAND) && defined(MORE_KEY__ARROW)
-#     define LAYOUT_redefined LAYOUT_arrow_command  // Additional keys 1st row both left and right. 'Arrow' + 'Command'
-# endif
-
-# ifdef TRANSMINIVAN_LAYOUT 
-#     undef LAYOUT_redefined
-#     define LAYOUT_redefined TRANSMINIVAN_LAYOUT
-# endif
-
-
-// Process user config setting for speed measuring
-# ifdef STARTUP_SPEED
-#     define SPEED_INIT_VALUE TRUE
-# else
-#     define SPEED_INIT_VALUE FALSE
-# endif
-// Process user config setting for text size measuring
-# ifdef STARTUP_COUNT
-#     define COUNT_INIT_VALUE TRUE
-# else
-#     define COUNT_INIT_VALUE FALSE
-# endif
-
-
-// Get all key reductions at once
-# ifdef ALL_DRA_BON_EVISCERATIONS
-#     ifdef BOX_DRAWINGS   
-#         undef BOX_DRAWINGS   
-#     endif
-
-#     ifdef SUB_SCRIPT_NUMS
-#         undef SUB_SCRIPT_NUMS
-#     endif
-
-#     ifdef FULL_DRA_2NDROW
-#         undef FULL_DRA_2NDROW
-#     endif
-
-#     ifdef FULL_DRA_4THROW
-#         undef FULL_DRA_4THROW
-#     endif
-
-#     ifdef FULL_BON_4THROW
-#         undef FULL_BON_4THROW
-#     endif
-# endif
-
-// This resolves compiling “TO (_BON)” on the _FUN layer.
-# ifdef REMOVE_BON
-#     undef _BON
-#     ifdef _BON_KEY_ALT_LAYER
-#         define _BON _BON_KEY_ALT_LAYER  // To what user wants
-#     else
-#         define _BON _FUN                // void behavior
-#     endif
-# endif
-
-// This resolves compiling “TO (_PAD)” on the _FUN layer.
-# ifdef REMOVE_PAD
-#     undef _PAD
-#     define _PAD _FUN                // void behavior
-# endif
-
-// If the _ACC layer hold key has no function anymore because the layers _ACC and _BON to which it
-// switches have been removed, and no alternative use been set, that key reverts to being KC_DEL,
-// and the whole macro CHOLTAP_ACCE it normally activates gets cut.
-# if  defined(REMOVE_ACC) \
-  && !defined(_ACC_KEY_ALT_LAYER) \
-  &&  defined(REMOVE_BON) \
-  && !defined(_BON_KEY_ALT_LAYER)
-#     define CHOLTAP_ACCE KC_DEL // replaces in the keymap
-#     define CHOLTAP_ACCE_NOP    // cuts CHOLTAP_ACCE out of macros
-# endif
-
-// Here all Unicode layers _ACC, _DRA and _BON have been removed, and none of their key(s) has
-// been re-assigned to a useful purpose. That makes that whole system redundant, so it is simplified.
-# if  defined(REMOVE_ACC) \
-  && !defined(_ACC_KEY_ALT_LAYER) \
-  &&  defined(REMOVE_DRA) \
-  && !defined(_DRA_KEY_ALT_LAYER) \
-  &&  defined(REMOVE_BON) \
-  && !defined(_BON_KEY_ALT_LAYER)
-#     define CHOLTAP_ACCE KC_DEL // replaces in the keymap
-#     define CHOLTAP_ACCE_NOP    // cuts CHOLTAP_ACCE out of macros
-#     define DUO_HOLD_BASIC   // cuts out the long DUO_HOLD macro, replaces it with a simple 'descramble'-aware hold(_NSY/_DDN) 
-# endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/king/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/king/keymap.c
deleted file mode 100644
index 4c9019c669d..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/king/keymap.c
+++ /dev/null
@@ -1,124 +0,0 @@
- /* Copyright 2020 King Wang Wong
-  * 
-  * 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 {
-    _ML,
-    _FL,
-    _NL,
-    _SL,
-    _RL
-};
-
-
-#define SPC_FUN LT(_FL, KC_SPC)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-      /* 0: Main Layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐
-   * │ ESC │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │BKSPC    │  
-   * ├─────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────────┤
-   * │ TAB  │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │ ;   │ENTER   │
-   * ├──────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬─────┤
-   * │ LSHFT   │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │'    │
-   * ├────────┬┴─────┴─┬───┴─┬───┴─────┴──┬──┴─────┴─────┴─┬───┴─┬───┴─┬───┴─────┤
-   * │LCTRL   │   LGUI │ LALT│SPACE(_NL)  │MO(_NL)         │MO_SL│     │MO(RL    │
-   * └────────┴────────┴─────┴────────────┴────────────────┴─────┴─────┴─────────┘
-   */
-    [_ML] = LAYOUT(
-        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_ENT,         
-        KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_QUOT,     
-        KC_LCTL, KC_LGUI, KC_LALT,         SPC_FUN,        MO(_NL),        MO(_SL), XXXXXXX,  MO(_RL)
-    ),
-
-
-      /* 1: Function Layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐
-   * │     │     │HOME │ UP  │END  │PGUP │     │ F1  │ F2  │ F3  │ F4  │         │
-   * ├─────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────────┤
-   * │ CAPS │     │LEFT │DOWN │RIGHT│PGDN │     │ F5  │ F6  │ F7  │ F8  │ QUOT   │
-   * ├──────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬─────┤
-   * │         │     │     │ DEL │ INS │     │     │ F9  │ F10 │ F11 │ F12 │     │
-   * ├────────┬┴─────┴─┬───┴─┬───┴─────┴──┬──┴─────┴─────┴─┬───┴─┬───┴─┬───┴─────┤
-   * │        │        │     │            │                │     │     │         │
-   * └────────┴────────┴─────┴────────────┴────────────────┴─────┴─────┴─────────┘
-   */
-    [_FL] = LAYOUT(
-        _______,   XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, KC_F1, KC_F2,   KC_F3,    KC_F4,   _______,  
-        KC_CAPS,   XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_F5, KC_F6,   KC_F7,    KC_F8,   KC_QUOT,        
-        _______,   XXXXXXX, XXXXXXX, KC_DEL,  KC_INS,  XXXXXXX, XXXXXXX, KC_F9, KC_F10,  KC_F11,   KC_F12,  _______,        
-        _______,   _______,  _______,         _______,          _______,        _______, _______,  _______
-    ),
-
-
-
-      /* 2: Number Layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐
-   * │  ~  │  !  │  @  │  #  │  $  │  %  │  ^  │  &  │  *  │  (  │  )  │         │
-   * ├─────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────────┤
-   * │   `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  8  │ 0   │        │
-   * ├──────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬─────┤
-   * │         │     │     │     │     │     │     │     │     │     │     │     │
-   * ├────────┬┴─────┴─┬───┴─┬───┴─────┴──┬──┴─────┴─────┴─┬───┴─┬───┴─┬───┴─────┤
-   * │        │        │     │            │                │     │     │         │
-   * └────────┴────────┴─────┴────────────┴────────────────┴─────┴─────┴─────────┘
-   */
-    [_NL] = LAYOUT(
-        KC_TILD,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  _______,  
-        KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______,         
-        _______,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,           
-        _______,  _______,   _______,        _______,          _______,          _______, _______, _______
-    ),
-
-      /* 3: Symbol Layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐
-   * │     │  _  │  +  │  {  │  }  │  |  │     │     │     │     │     │         │
-   * ├─────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────────┤
-   * │      │  -  │  =  │  [  │  ]  │  \  │     │ DEL │ INS │     │     │        │
-   * ├──────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬─────┤
-   * │         │     │     │     │     │     │     │     │     │     │     │     │
-   * ├────────┬┴─────┴─┬───┴─┬───┴─────┴──┬──┴─────┴─────┴─┬───┴─┬───┴─┬───┴─────┤
-   * │        │        │     │            │                │     │     │         │
-   * └────────┴────────┴─────┴────────────┴────────────────┴─────┴─────┴─────────┘
-   */
-    [_SL] = LAYOUT(
-        _______,  KC_UNDS, KC_PLUS,  KC_LCBR, KC_RCBR,  KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
-        _______,  KC_MINS, KC_EQL,   KC_LBRC, KC_RBRC,  KC_BSLS, XXXXXXX, KC_DEL,  KC_INS,  XXXXXXX, XXXXXXX, XXXXXXX,           
-        _______,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           
-        _______,  _______,  _______,          _______,           _______,          _______, _______, _______
-    ),
-
-        /* 4: Reset Layer
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐
-   * │QK_BOOT│     │     │     │     │     │     │     │     │     │     │         │
-   * ├─────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────────┤
-   * │      │     │     │     │     │     │     │     │     │     │     │        │
-   * ├──────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬─────┤
-   * │         │     │     │     │     │     │     │     │     │     │     │     │
-   * ├────────┬┴─────┴─┬───┴─┬───┴─────┴──┬──┴─────┴─────┴─┬───┴─┬───┴─┬───┴─────┤
-   * │        │        │     │            │                │     │     │         │
-   * └────────┴────────┴─────┴────────────┴────────────────┴─────┴─────┴─────────┘
-   */
-    [_RL] = LAYOUT(
-        QK_BOOT, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   
-        XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, 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/thevankeyboards/minivan/keymaps/king/readme.md b/keyboards/thevankeyboards/minivan/keymaps/king/readme.md
deleted file mode 100644
index edcf5f43e9f..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/king/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# King's KUMO layout
-
-Currently uses the fewest key layout (three keys on both sides of the bottom row) for the KUMO/minivan
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/king/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/king/rules.mk
deleted file mode 100644
index 5ae757f3c52..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/king/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/config.h b/keyboards/thevankeyboards/minivan/keymaps/lexworth/config.h
deleted file mode 100644
index 36062c47b9c..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-// place overrides here
-#define BACKLIGHT_PIN B7
-#define BACKLIGHT_LEVELS 5
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
deleted file mode 100644
index 2bdf303e9f8..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Helpful defines
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT
-	(QK_GESC,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,            KC_BSPC, 
-	LT(1,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(1,KC_QUOT), 
-	SC_LSPO,       KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, 
-	KC_LCTL,  KC_LALT,  KC_LGUI,    KC_ENT,    KC_SPC,    TG(2),    LT(3,KC_APP),      KC_DEL),
-	
-	[1] = LAYOUT
-	(KC_CAPS,  KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, KC_UNDS, KC_P7, KC_P8, KC_P9, KC_EQL,       KC_TRNS, 
-	KC_TRNS,    KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PPLS,    KC_TRNS, 
-	KC_MUTE,     KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_NUM, 
-	KC_TRNS,   KC_TRNS,   KC_MSTP,    KC_PENT,     KC_P0,          KC_PDOT,     KC_APP,              KC_TRNS),
-	
-	[2] = LAYOUT
-	(KC_TRNS,  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,                   KC_TRNS, 
-	KC_TRNS,    KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,  KC_0,                    KC_TRNS, 
-	KC_TILD,     KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, 
-	KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,         KC_TRNS,     KC_TRNS,        KC_F11,            KC_F12),
-	
-	[3] = LAYOUT
-	(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR,   KC_TRNS, 
-	KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,  KC_PIPE, 
-	KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, 
-	BL_TOGG,  BL_DOWN,   BL_UP,     KC_TRNS,            KC_TRNS,        KC_TRNS,             KC_TRNS,       QK_BOOT)
-};
diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/readme.md b/keyboards/thevankeyboards/minivan/keymaps/lexworth/readme.md
deleted file mode 100644
index 5ac3aafdcc1..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Minivan
-
-![Layout Image](https://drive.google.com/file/d/1rDbtoOBvw5lxfvUBLYmjTt6MJPoeXngr/view?usp=sharing)
-
-# Custom keymap for the minivan with backlight enabled and 5 backlight levels.
-# Hardware Supported:  Minivan
-# Hardware Availability:  [thevankeyboards.com](https://thevankeyboards.com/)
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/lexworth/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/lexworth/rules.mk
deleted file mode 100644
index 9c7dc2e122f..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/lexworth/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
index 49d7d463aaf..07915657c10 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
@@ -38,5 +38,5 @@
 #ifdef RGBLIGHT_ENABLE
   #define WS2812_DI_PIN D0
   #define RGBLIGHT_TIMER
-  #define RGBLED_NUM 3
+  #define RGBLIGHT_LED_COUNT 3
 #endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/config.h b/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/config.h
deleted file mode 100644
index 271f48d0011..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-// place overrides here
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/keymap.c
deleted file mode 100644
index fec08cea3ea..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/keymap.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#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.
-
-#define _QW 0
-#define _DV 1
-#define _CM 2
-#define _L1 3
-#define _L2 4
-#define _L3 5
-
-// Curly braces have their own keys. These are defined to make them not mess up
-// the grid in layer 2.
-#define L_CURBR LSFT(KC_LBRC)
-#define R_CURBR LSFT(KC_RBRC)
-
-enum custom_keycodes {
-  DVORAK = SAFE_RANGE,
-  QWERTY,
-  COLEMAK
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    MO(_L1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, MO(_L1),
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
-    KC_LCTL, MO(_L2), KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RALT, KC_ESC,  TG(_L3)
-  ),
-  [_DV] = LAYOUT( /* Dvorak */
-    KC_TAB,  KC_SLSH, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    MO(_L1), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    MO(_L1),
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    MO(_L2),
-    KC_LCTL, MO(_L2), KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RALT, KC_ESC,  TG(_L3)
-  ),
-  [_CM] = LAYOUT( /* Colemak */
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    MO(_L1), KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    MO(_L1),
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
-    KC_LCTL, MO(_L2), KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RALT, KC_ESC,  TG(_L3)
-  ),
-  [_L1] = LAYOUT( /* LAYER 1 */
-    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-    _______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_DOWN, KC_UP,   KC_LEFT, KC_RGHT, _______,
-    _______, KC_ESC,  _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_RSFT,
-    _______, KC_LGUI, _______,                   _______, _______,                   _______, _______, _______
-  ),
-  [_L2] = LAYOUT( /* LAYER 2 */
-    _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, _______, KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    KC_ESC,  KC_PIPE, KC_DQUO, KC_UNDS, KC_PLUS, L_CURBR, R_CURBR, KC_4,    KC_5,    KC_6,    KC_VOLU, KC_ENT,
-    _______, _______, _______, _______, _______, _______, KC_0,    KC_1,    KC_2,    KC_3,    KC_VOLD, _______,
-    _______, _______, _______,                   _______, _______,                   _______, _______, _______
-  ),
-  [_L3] = LAYOUT( /* LAYER 3 */
-    _______, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______,
-    KC_ESC,  _______, _______, _______, _______, _______, _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,
-    KC_LSFT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-    _______, KC_LSFT, KC_B,                      KC_SPC,  KC_C,                      _______, _______, _______
-  )
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-      switch(keycode) {
-        case DVORAK:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_DV);
-          }
-          return false;
-        case QWERTY:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_QW);
-          }
-          return false;
-        case COLEMAK:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_CM);
-          }
-          return false;
-        default:
-          return true;
-      }
-    return true;
-};
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/readme.md b/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/readme.md
deleted file mode 100644
index 3584c8b23f1..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# mikethetiger's keymap for tv44
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/rules.mk
deleted file mode 100644
index 93e7cd8bb74..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/mikethetiger/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
deleted file mode 100644
index f21d779163f..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,226 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-// Keycodes
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  BACKLIT
-};
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define ALT_GRV     ALT_T(KC_GRV)               // Tap for Backtick, hold for Alt (Ctrl+Alt+Shift)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- *
- * ,---------+------+------+------+------+------+------+------+------+------+------+---------.
- * |Hyper/Tab|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  Bksp   |
- * |---------`------`------`------`------`------`------`------`------`------`------`---------|
- * | Ctrl/Esc |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '    |
- * |----------`------`------`------`------`------`------`------`------`------`------`--------|
- * |   Shift   |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Sft/Ent|
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
- * |  Alt/` |   GUI   |  Lower |    Space     |    Space     |  Raise  | GUI  | Alt  | Ctrl  |
- *  `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
- */
-[_QWERTY] = LAYOUT_arrow(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    HPR_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    CTL_ESC ,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,    KC_QUOT     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    KC_LSFT  ,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,    SFT_ENT    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    ALT_GRV ,   KC_LGUI     ,   LOWER ,     KC_SPC     ,     KC_SPC      ,  RAISE  ,  KC_RGUI, KC_RALT,     KC_RCTL   ),
-/*`---------+---------------+---------+-------^^^------+-------^^^-------+----------+--------+--------+--------------'*/
-
-/* Colemak
- * ,---------+------+------+------+------+------+------+------+------+------+------+---------.
- * |Hyper/Tab|   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |  Bksp   |
- * |---------`------`------`------`------`------`------`------`------`------`------`---------|
- * | Ctrl/Esc |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |   '    |
- * |----------`------`------`------`------`------`------`------`------`------`------`--------|
- * |   Shift   |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Sft/Ent|
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
- * |  Alt/` |   GUI   |  Lower |    Space     |    Space     |  Raise  | GUI  | Alt  | Ctrl  |
- *  `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
- */
-[_COLEMAK] = LAYOUT_arrow(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    HPR_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN,    KC_BSPC      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    CTL_ESC ,   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,    SFT_ENT    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    ALT_GRV ,   KC_LGUI     ,   LOWER ,     KC_SPC     ,     KC_SPC      ,  RAISE  ,  KC_RGUI, KC_RALT,     KC_RCTL   ),
-/*`---------+---------------+---------+-------^^^------+-------^^^-------+----------+--------+--------+--------------'*/
-
-/* Dvorak
- * ,---------+------+------+------+------+------+------+------+------+------+------+---------.
- * |Hyper/Tab|   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |  Bksp   |
- * |---------`------`------`------`------`------`------`------`------`------`------`---------|
- * | Ctrl/Esc |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |   -    |
- * |----------`------`------`------`------`------`------`------`------`------`------`--------|
- * | Shift     |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Sft/Ent|
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
- * |  Alt/` |   GUI   |  Lower |    Space     |    Space     |  Raise  | GUI  | Alt  | Ctrl  |
- *  `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
- */
-[_DVORAK] = LAYOUT_arrow(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    HPR_TAB,KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    CTL_ESC ,   KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    KC_LSFT  , KC_SCLN,   KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    ALT_GRV ,   KC_LGUI     ,   LOWER ,     KC_SPC     ,     KC_SPC      ,  RAISE  ,  KC_RGUI, KC_RALT,     KC_RCTL   ),
-/*`---------+---------------+---------+-------^^^------+-------^^^-------+----------+--------+--------+--------------'*/
-
-/* Lower
- * ,---------+------+------+------+------+------+------+------+------+------+------+---------.
- * |   0     |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   Del   |
- * |---------`------`------`------`------`------`------`------`------`------`------`---------|
- * |   $      |   4  |   5  |   6  |   .  |   +  |   *  |   4  |   5  |   6  |   .  | PageUp |
- * |----------`------`------`------`------`------`------`------`------`------`------`--------|
- * |   =       |   7  |   8  |   9  |   0  |   -  |   /  |   1  |   2  |   3  |  Up  |PageDn |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
- * |  Brite |         |        |    Home      |     End      |         | Left | Down | Right |
- *  `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
- */
-[_LOWER] = LAYOUT_arrow(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-ALL_T(KC_0),   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL       ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-CTL_T(KC_DLR),  KC_4,    KC_5,    KC_6,  KC_DOT, KC_PLUS, KC_ASTR,    KC_4,    KC_5,    KC_6,  KC_DOT,    KC_PGUP     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-SFT_T(KC_EQL),   KC_7,    KC_8,    KC_9,    KC_0, KC_MINS, KC_SLSH,    KC_1,    KC_2,    KC_3,   KC_UP, SFT_T(KC_PGDN),
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-ALT_T(BACKLIT),   _______   , _______ ,     KC_HOME    ,      KC_END     , _______ ,  KC_LEFT, KC_DOWN,     KC_RGHT   ),
-/*`---------+---------------+---------+-------^^^------+-------^^^-------+----------+--------+--------+--------------'*/
-
-/* Raise
- * ,---------+------+------+------+------+------+------+------+------+------+------+---------.
- * |   ~     |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   Del   |
- * |---------`------`------`------`------`------`------`------`------`------`------`---------|
- * |   F1     |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   ?  |   +  |   {  |   }  |        |
- * |----------`------`------`------`------`------`------`------`------`------`------`--------|
- * |   F7      |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   /  |   =  |   [  |   ]  |       |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
- * |  Brite |         |        |     Play     |     Next     |         | Mute | Vol- | Vol+  |
- *  `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
- */
-[_RAISE] = LAYOUT_arrow(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-ALL_T(KC_TILD),KC_EXLM,KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,    KC_DEL       ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-CTL_T(KC_F1),  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_UNDS, KC_QUES, KC_PLUS, KC_LCBR, KC_RCBR,    KC_PIPE     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
- SFT_T(KC_F7),  KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_MINS, KC_SLSH,  KC_EQL, KC_LBRC, KC_RBRC, SFT_T(KC_BSLS),
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-ALT_T(BACKLIT),   _______   , _______ ,     KC_MPLY    ,     KC_MNXT     , _______ ,  KC_MUTE, KC_VOLD,     KC_VOLU   ),
-/*`---------+---------------+---------+-------^^^------+-------^^^-------+----------+--------+--------+--------------'*/
-
-/* Adjust (Lower + Raise)
- * ,---------+------+------+------+------+------+------+------+------+------+------+---------.
- * |         | Reset|      |      |      |      |      |      |      |      |      |  Reset  |
- * |---------`------`------`------`------`------`------`------`------`------`------`---------|
- * |          |      |      |      |      |AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |        |
- * |----------`------`------`------`------`------`------`------`------`------`------`--------|
- * |           |      |      |      |      |     |       |      |      |      |      |       |
- * |-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
- * |        |         |        |              |              |         |      |      |       |
- *  `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
- */
-[_ADJUST] = LAYOUT_arrow(
-/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/
-    _______, QK_BOOT , _______, _______, _______, _______, _______, _______, _______, _______, _______,      QK_BOOT      ,
-/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/
-    _______ ,_______, _______, _______, _______, AG_NORM, AG_SWAP,  QWERTY, COLEMAK,  DVORAK, _______,    _______     ,
-/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/
-    _______  ,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______    ,
-/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/
-    _______ ,   _______     , _______ ,     _______    ,     _______     , _______ ,  _______, _______,     _______   ),
-/*`---------+---------------+---------+-------^^^------+-------^^^-------+----------+--------+--------+--------------'*/
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/thevankeyboards/minivan/keymaps/smt/readme.md b/keyboards/thevankeyboards/minivan/keymaps/smt/readme.md
deleted file mode 100644
index 059fd1bbdee..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/smt/readme.md
+++ /dev/null
@@ -1,126 +0,0 @@
-# smt's TV44 keymap
-
-This keymap is based on a combination of my Planck keymap and [jeebak's TV44 layout](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tv44/keymaps/jeebak). I removed the macros and TouchCursor/MouseCursor layers, because I'm just not ready for that level of mind-mapping.
-
-I had been using something close to the default Minivan layout, but after spending a bit of time with the Planck and Preonic, I decided it would be better for me to try to standardize to some degree, where possible.
-
-Also, it's worth noting that my Minivan is one with the "arrows" layout, which has a 45th key. In spite of this, the 45-key Minivan is still technically considered a "TV44" as far as I know.
-
-![smt's TV44 keymap](https://i.imgur.com/Y4n6eHj.png)
-
-## Notable features (most of which can be found in my or jeebak's respective keymap file):
-
-1. **Shift/Enter**
-
-    I use both the left and right shift keys when I type. When I want to modify a key with shift, I hold shift with the hand opposite the one typing the key. In the default keymap, Enter is where shift would be on a standard keyboard layout. Oh, muscle memory.
-
-    Thankfully, QMK supports [mod-tap](https://github.com/jackhumbert/qmk_firmware/wiki#fun-with-modifier-keys) keys, and this allows me to set the Enter key to send a modifier (MOD_LSFT) when held, and KC_ENT when tapped. Awesome!
-
-2. **Hyper/Tab**
-
-    This key modifies with "Hyper" (see [Brett Terpstra's post](http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/) on this) when held, and outputs the code for Tab when tapped. On the Mac, I use KeyboardMaestro to remap my hyper-keys to do a lot of crazy things.
-
-3. **Ctrl/Escape**
-
-    I set up another mod-tap, this time for the Escape key that would act as a Control modifier when held.
-
-4. **Alt/Backtick**
-
-    I don't currently have LEDs on most of my keyboards, and I certainly don't want LED controls on the base layer of a 40%.
-
-    So, why use backtick in the lower left corner? I use it as my tmux prefix key, so I need to type it more frequently than most people. Putting it on the base layer works well for my use case, and it's consistent with where I place it in my Planck and Preonic keymaps.
-
-    I also like Alt in that position, so it works well as yet another mod-tap key.
-
-
-## Layers
-
-### Qwerty
-
-```
-,---------+------+------+------+------+------+------+------+------+------+------+---------.
-|Hyper/Tab|   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  Bksp   |
-|---------`------`------`------`------`------`------`------`------`------`------`---------|
-| Ctrl/Esc |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '    |
-|----------`------`------`------`------`------`------`------`------`------`------`--------|
-|   Shift   |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Sft/Ent|
-|-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
-|  Alt/` |   GUI   |  Lower |    Space     |    Space     |  Raise  | GUI  | Alt  | Ctrl  |
- `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
-```
-
-### Colemak
-
-```
-,---------+------+------+------+------+------+------+------+------+------+------+---------.
-|Hyper/Tab|   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |  Bksp   |
-|---------`------`------`------`------`------`------`------`------`------`------`---------|
-| Ctrl/Esc |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |   '    |
-|----------`------`------`------`------`------`------`------`------`------`------`--------|
-|   Shift   |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Sft/Ent|
-|-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
-|  Alt/` |   GUI   |  Lower |    Space     |    Space     |  Raise  | GUI  | Alt  | Ctrl  |
- `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
-```
-
-### Dvorak
-
-```
-,---------+------+------+------+------+------+------+------+------+------+------+---------.
-|Hyper/Tab|   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |  Bksp   |
-|---------`------`------`------`------`------`------`------`------`------`------`---------|
-| Ctrl/Esc |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |   -    |
-|----------`------`------`------`------`------`------`------`------`------`------`--------|
-| Shift     |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Sft/Ent|
-|-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
-|  Alt/` |   GUI   |  Lower |    Space     |    Space     |  Raise  | GUI  | Alt  | Ctrl  |
- `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
-```
-
-### Lower
-
-This is where I put the number row, two numpad clusters, common arithmetic operators, and cursorkeys: Arrow cluster, Home/End, Page Up/Page Down. `0` and `$` are also placed on the left side for convenient access to beginning-of-line and end-of-line Vim commands. BRITE has been moved here from the base layer.
-
-```
-,---------+------+------+------+------+------+------+------+------+------+------+---------.
-|   0     |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   Del   |
-|---------`------`------`------`------`------`------`------`------`------`------`---------|
-|   $      |   4  |   5  |   6  |   .  |   +  |   *  |   4  |   5  |   6  |   .  | PageUp |
-|----------`------`------`------`------`------`------`------`------`------`------`--------|
-|   =       |   7  |   8  |   9  |   0  |   -  |   /  |   1  |   2  |   3  |  Up  |PageDn |
-|-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
-|  Brite |         |        |    Home      |     End      |         | Left | Down | Right |
- `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
-```
-
-### Raise
-
-As a developer, it makes the most sense for me to group all the commonly-used symbols that don't fit on the main layer. In particular, having the dual-column of parens-braces-brackets helps me keep them straight. I've dropped basic media controls onto this layer as well.
-
-```
-,---------+------+------+------+------+------+------+------+------+------+------+---------.
-|   ~     |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   Del   |
-|---------`------`------`------`------`------`------`------`------`------`------`---------|
-|   F1     |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   ?  |   +  |   {  |   }  |   |    |
-|----------`------`------`------`------`------`------`------`------`------`------`--------|
-|   F7      |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   /  |   =  |   [  |   ]  |   \   |
-|-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
-|  Brite |         |        |     Play     |     Next     |         | Mute | Vol- | Vol+  |
- `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
-```
-
-### Adjust (Lower + Raise)
-
-Utility layer. There isn't much here; it's mainly for swapping the default keymap between Qwerty and Dvorak, or putting the keyboard into flash mode via the Reset key.
-
-```
-,---------+------+------+------+------+------+------+------+------+------+------+---------.
-|         | Reset|      |      |      |      |      |      |      |      |      |   Del   |
-|---------`------`------`------`------`------`------`------`------`------`------`---------|
-|          |      |      |      |      |AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |        |
-|----------`------`------`------`------`------`------`------`------`------`------`--------|
-|           |      |      |      |      |     |       |      |      |      |      |       |
-|-----------`------`------`------`------`-----'-------`------`------`------`------`-------|
-|        |         |        |              |              |         |      |      |       |
- `-------+---------+--------+-----^^^------+-----^^^------+---------+------+------+-------'
-```
diff --git a/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk
deleted file mode 100644
index 93e7cd8bb74..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/config.h b/keyboards/thevankeyboards/minivan/keymaps/tong92/config.h
deleted file mode 100644
index be959a823cd..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/tong92/config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-#ifdef BACKLIGHT_ENABLE
-    #define BACKLIGHT_PIN B2
-    #define BACKLIGHT_LEVELS 7
-#endif
-
-#endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
deleted file mode 100644
index dc15779a170..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
+++ /dev/null
@@ -1,195 +0,0 @@
-//Author: tong92 <tong92power@gmail.com>
-#include QMK_KEYBOARD_H
-
-#ifdef BACKLIGHT_ENABLE
-  #include "backlight.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-enum tv44_layers {
-  _WINDOW,
-  _MAC,
-  _LOWER,
-  _RAISE,
-  _WINDOW_SHORTCUT,
-  _MAC_SHORTCUT,
-  _MOUSE
-};
-
-enum tv44_keycodes {
-  WINDOW = SAFE_RANGE,
-  MAC,
-  MOUSE,
-  BACKLIT,
-  EXT_MOUSE
-};
-
-#define LOWER LT(_LOWER, KC_SPC)
-#define RAISE LT(_RAISE, KC_SPC)
-#define WINDOW_SHORTCUT MO(_WINDOW_SHORTCUT)
-#define MAC_SHORTCUT MO(_MAC_SHORTCUT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Window - Qwerty
- * ,--------------------------------------------------------------------------.
- * | Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  Bksp |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * | Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  | Enter|
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * | Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |Shift|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * | Ft   |  GUI  | Alt  | Space/LOWER | Space/RAISE |  '   |  [  |  ]  | Alt |
- * `--------------------------------------------------------------------------'
- */
-[_WINDOW] = LAYOUT_arrow(
-KC_TAB, KC_Q,   KC_W,   KC_E, KC_R,   KC_T,   KC_Y,   KC_U, KC_I,   KC_O,   KC_P,   KC_BSPC,
-KC_LCTL,KC_A,   KC_S,   KC_D, KC_F,   KC_G,   KC_H,   KC_J, KC_K,   KC_L,   KC_SCLN,KC_ENT,
-KC_LSFT,KC_Z,   KC_X,   KC_C, KC_V,   KC_B,   KC_N,   KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
-WINDOW_SHORTCUT,    KC_LGUI,KC_LALT,              LOWER,  RAISE,        KC_QUOT,KC_LBRC,KC_RBRC,KC_RALT
-),
-/* Mac - Qwerty
- * ,--------------------------------------------------------------------------.
- * | Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  Bksp |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * | Cmd   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  | Enter|
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * | Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |Shift|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * | Ft   |  Alt | Ctrl  | Space/LOWER | Space/RAISE |  '   |  [  |  ]  | Alt |
- * `--------------------------------------------------------------------------'
- */
-[_MAC] = LAYOUT_arrow(
-KC_TAB, KC_Q,   KC_W,   KC_E, KC_R,   KC_T,   KC_Y,   KC_U, KC_I,   KC_O,   KC_P,   KC_BSPC,
-KC_LGUI,KC_A,   KC_S,   KC_D, KC_F,   KC_G,   KC_H,   KC_J, KC_K,   KC_L,   KC_SCLN,KC_ENT,
-KC_LSFT,KC_Z,   KC_X,   KC_C, KC_V,   KC_B,   KC_N,   KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
-MAC_SHORTCUT,    KC_LALT, KC_LCTL,              LOWER,  RAISE,        KC_QUOT,KC_LBRC,KC_RBRC,KC_RALT
-),
-/* LOWER
- * ,--------------------------------------------------------------------------.
- * |  `   |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |       |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * |       |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  -  |  +  |  [  |  ]  |   \  |
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * |        |  F7 |  F8 |  F9 | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * |      |       |      |             |             |  END | LEFT| Down|RIGHT|
- * `--------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_arrow(
-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,  KC_MINS,KC_PLUS,KC_LBRC,KC_RBRC,KC_BSLS,
-_______,KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,KC_HOME,KC_PGUP,KC_UP  ,KC_PGDN,
-XXXXXXX,_______,_______,                _______,XXXXXXX,        KC_END, KC_LEFT,KC_DOWN,KC_RIGHT
-),
-/* RAISE
- * ,--------------------------------------------------------------------------.
- * |  ~   |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |       |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * |       |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  _  |  =  |  {  |  }  |   |  |
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * |        |  F7 |  F8 |  F9 | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * |      |       |      |             |             |  END | LEFT| Down|RIGHT|
- * `--------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_arrow(
-KC_TILD,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
-_______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_UNDS,KC_EQL, KC_LCBR,KC_RCBR,KC_PIPE,
-_______,KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,KC_HOME,KC_PGUP,KC_UP  ,KC_PGDN,
-XXXXXXX,_______,_______,                _______,_______,        KC_END, KC_LEFT,KC_DOWN,KC_RIGHT
-),
-/* Window Shortcut
- * ,--------------------------------------------------------------------------.
- * |  ESC |WinOf|WinUp|     |     |Sh+Ca|     | PgUp| UP  | PgDo|PrtSc| DELET |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * |       |WinLe|WinDo|WinRi|     |Al+Ca|CapsL| LEFT| DOWN|RIGHT|     |      |
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * |        |WinLW|WinRW|     |     |Ct+Ca|ScroL| HOME|     | END |     | Ctrl|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * |      | DeskL | DeskR| Task Manager|    DeskX    | MOUSE|     |     | LED |
- * `--------------------------------------------------------------------------'
- */
-[_WINDOW_SHORTCUT] = LAYOUT_arrow(
-KC_ESC ,LALT(KC_F4)        ,LGUI(KC_UP)         ,XXXXXXX       ,XXXXXXX,S(KC_CAPS)         ,XXXXXXX          ,KC_PGUP,KC_UP  ,KC_PGDN ,KC_PSCR,KC_DEL,
-_______,LGUI(KC_LEFT)      ,LGUI(KC_DOWN)       ,LGUI(KC_RIGHT),XXXXXXX,LALT(KC_CAPS)      ,KC_CAPS          ,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX,XXXXXXX,
-_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX       ,XXXXXXX,LCTL(KC_CAPS)      ,KC_SCRL          ,KC_HOME,XXXXXXX,KC_END  ,XXXXXXX,KC_RCTL,
-_______,LGUI(LCTL(KC_LEFT)),LGUI(LCTL(KC_RIGHT)),                       LCTL(LALT(KC_DEL)) ,LGUI(LCTL(KC_F4)),        MOUSE  ,XXXXXXX ,XXXXXXX,BACKLIT
-),
-/* Mac Shortcut
- * ,--------------------------------------------------------------------------.
- * |  ESC |CmdUp|CmdDo|     |     |     |     | PgUp| UP  | PgDo|PrtSc| DELET |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * |       |WBlkL|WBlkR|     |ScrFu|     |CapsL| LEFT| DOWN|RIGHT|     |      |
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * |        |BlckL|BlckR|     |     |     |     | HOME|     | END |     | Ctrl|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * |      |       |      |             |             | MOUSE|     |     | LED |
- * `--------------------------------------------------------------------------'
- */
-[_MAC_SHORTCUT] = LAYOUT_arrow(
-KC_ESC ,LGUI(KC_UP)        ,LGUI(KC_DOWN)         ,XXXXXXX       ,XXXXXXX,XXXXXXX         ,XXXXXXX          ,KC_PGUP,KC_UP  ,KC_PGDN ,KC_PSCR,KC_DEL,
-_______,LALT(LSFT(KC_LEFT))      ,LALT(LSFT(KC_RIGHT))       ,XXXXXXX,LGUI(LCTL(KC_F)),XXXXXXX      ,KC_CAPS          ,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX,XXXXXXX,
-_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX       ,XXXXXXX,XXXXXXX     ,XXXXXXX          ,KC_HOME,XXXXXXX,KC_END  ,XXXXXXX,KC_RCTL,
-_______,_______,_______, _______,_______,        MOUSE  ,XXXXXXX ,XXXXXXX,BACKLIT
-),
-/* MOUSE
- * ,--------------------------------------------------------------------------.
- * |      |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     | QK_BOOT |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * |       |     |Mo_Le|Mo_Do|Mo_Ri|     |     |M_Bt1|M_WhD|M_Bt2|     |      |
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * |        |     |     |     |     |     |     |M_AC0|M_AC1|M_AC2|     |WINDO|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * |      |      |      | GO_DEFAULT  |  GO_DEFAULT |       |     |     | MAC |
- * `--------------------------------------------------------------------------'
- */
-[_MOUSE] = LAYOUT_arrow(
-XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,XXXXXXX,KC_WH_L,KC_WH_U,KC_WH_R,XXXXXXX,QK_BOOT,
-XXXXXXX,XXXXXXX,KC_MS_L,KC_MS_D,KC_MS_R,XXXXXXX,XXXXXXX,KC_BTN1,KC_WH_D,KC_BTN2,XXXXXXX,XXXXXXX,
-XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_ACL0,KC_ACL1,KC_ACL2,XXXXXXX,WINDOW,
-XXXXXXX,XXXXXXX,XXXXXXX,                EXT_MOUSE,EXT_MOUSE,        XXXXXXX,XXXXXXX,XXXXXXX,MAC
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case WINDOW:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WINDOW);
-      }
-      return false;
-      break;
-    case MAC:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_MAC);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      }
-      return false;
-      break;
-    case MOUSE:
-      if (record->event.pressed) {
-        layer_on(_MOUSE);
-      }
-      return false;
-      break;
-    case EXT_MOUSE:
-      if (record->event.pressed) {
-        layer_off(_MOUSE);
-        layer_off(_WINDOW_SHORTCUT);
-        layer_off(_MAC_SHORTCUT);
-      }
-      return false;
-      break;
-  }
-  return true;
-};
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/readme.md b/keyboards/thevankeyboards/minivan/keymaps/tong92/readme.md
deleted file mode 100644
index 8208572568c..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/tong92/readme.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# The tong92's keymap for tv44
-
-- Arrow Layout (45key)
-- my keymap for Window User
-- Mouse Layer : space -> Default Layer
-
-## Qwerty
-	,--------------------------------------------------------------------------.
-	| Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bksp  |
-	|------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-	| Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  | Enter|
-	|-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-	| Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |Shift|
-	|--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-	| Ftn1 |  GUI  | Alt  | Space/LOWER | Space/RAISE |  '   |  [  |  ]  | Alt |
-	`--------------------------------------------------------------------------'
-
-
-## RAISE
-	,--------------------------------------------------------------------------.
-	|  ~   |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |       |
-	|------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-	|       |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  _  |  =  |  {  |  }  |   |  |
-	|-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-	|        |  F7 |  F8 |  F9 | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
-	|--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-	|      |       |      |             |             |  END | LEFT| Down|RIGHT|
-	`--------------------------------------------------------------------------'
-
-
-## FTN
-	,--------------------------------------------------------------------------.
-	|  ESC |WinOf|WinUp|     |     |Sh+Ca|     | PgUp| UP  | PgDo|PrtSc| DELET |
-	|------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-	|       |WinLe|WinDo|WinRi|     |Al+Ca|CapsL| LEFT| DOWN|RIGHT|     |      |
-	|-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-	|        |WinLW|WinRW|     |     |Ct+Ca|ScroL| HOME|     | END |     | Ctrl|
-	|--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-	|      | DeskL | DeskR| Task Manager|    DeskX    | MOUSE|     |     | LED |
-	`--------------------------------------------------------------------------'
-
-
-## MOUSE
-	,--------------------------------------------------------------------------.
-	|      |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     | RESET |
-	|------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-	|       |     |Mo_Le|Mo_Do|Mo_Ri|     |     |M_Bt1|M_WhD|M_Bt2|     |      |
-	|-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-	|        |     |     |     |     |     |     |M_AC0|M_AC1|M_AC2|     |     |
-	|--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-	|      |      |      | GO_DEFAULT  |  GO_DEFAULT |       |     |     |     |
-	`--------------------------------------------------------------------------'
diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk
deleted file mode 100644
index 850f2d3de60..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/minivan/keymaps/via/keymap.json b/keyboards/thevankeyboards/minivan/keymaps/via/keymap.json
index 54ceb5c342d..bff872dee84 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/via/keymap.json
+++ b/keyboards/thevankeyboards/minivan/keymaps/via/keymap.json
@@ -9,10 +9,12 @@
     ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"]
   ],
   "config": {
-    "features": {
-      "via": true,
+    "build": {
       "lto": true
     },
+    "features": {
+      "via": true
+    },
     "dynamic_keymap": {
       "layer_count": 4
     }
diff --git a/keyboards/thevankeyboards/minivan/keymaps/vial/config.h b/keyboards/thevankeyboards/minivan/keymaps/vial/config.h
index 785e9dd3a71..fc17f86c6dc 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/vial/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/vial/config.h
@@ -27,7 +27,7 @@
 #define USB_MAX_POWER_CONSUMPTION 100
 #define PERMISSIVE_HOLD
 #define RGB_DI_PIN D0
-#define RGBLED_NUM 3
+#define RGBLIGHT_LED_COUNT 3
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 #define IS_COMMAND() ( keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) )
diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h b/keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h
deleted file mode 100644
index df06a262062..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
deleted file mode 100644
index cbd6aa8b3d2..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names { _QWERTY, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, LOWER, RAISE, ADJUST };
-
-// Aliases for some other things I want to try out
-#define RAI_ESC LT(_RAISE, KC_ESC)
-#define LOW_QUQ LT(_LOWER, KC_QUOT)
-#define LOW_MIN LT(_LOWER, KC_MINS) // Same as above, but for Dvorak layer
-#define GUIBSPC GUI_T(KC_BSPC)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_DVORAK] = LAYOUT( /* 0: Dvorak */
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-    RAI_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    LOW_MIN,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    KC_LCTL, KC_LALT, LOWER,                     GUIBSPC, KC_SPC,                    RAISE,   KC_LGUI, KC_ENT
-  ),
-
-  [_QWERTY] = LAYOUT( /* 1: Qwerty */
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    RAI_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, LOW_QUQ,
-    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_LALT, LOWER,                     KC_BSPC, KC_SPC,                    RAISE,   KC_LGUI, KC_ENT
-  ),
-
-  [_COLEMAK] = LAYOUT( /* 2: Colemak */
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    RAI_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    LOW_QUQ,
-    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_LCTL, KC_LALT, LOWER,                     KC_BSPC, KC_SPC,                    RAISE,   KC_LGUI, KC_ENT
-  ),
-
-  [_LOWER] = LAYOUT( /* 1: FN 1 */
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
-    _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-    KC_LEFT, KC_RGHT, _______,                   KC_DEL,  KC_INS,                    _______, KC_UP,   KC_DOWN
-  ),
-
-  [_RAISE] = LAYOUT( /* 2: FN 2 */
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-    _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
-    KC_LEFT, KC_RGHT, _______,                   KC_DEL,  KC_INS,                    _______, KC_UP,   KC_DOWN
-  ),
-
-  [_ADJUST] = LAYOUT(
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-    _______, QK_BOOT, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_HOME, KC_END,  _______,                   _______, _______,                   _______, KC_PGUP, KC_PGDN
-  )
-};
-// clang-format on
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case QWERTY:
-                set_single_persistent_default_layer(_QWERTY);
-                return false;
-            case COLEMAK:
-                set_single_persistent_default_layer(_COLEMAK);
-                return false;
-            case DVORAK:
-                set_single_persistent_default_layer(_DVORAK);
-                return false;
-        }
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md b/keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md
deleted file mode 100644
index ac84c08cfa6..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for tv44
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
deleted file mode 100644
index 93e7cd8bb74..00000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/config.h b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/config.h
deleted file mode 100644
index df06a262062..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
deleted file mode 100644
index 45d58fee1df..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
+++ /dev/null
@@ -1,211 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#ifdef BACKLIGHT_ENABLE
-  #include "backlight.h"
-#endif
-
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-
-void backlight_toggle(void){
-};
-
-enum roadkit_layers {
-  _NUMPAD,
-  _FPH,
-  _FPHNOISY,
-  _ADJUST,
-  _DYN
-};
-
-enum roadkit_keycodes {
-  NUMPAD = SAFE_RANGE,
-  FPH_1,
-  FPH_2,
-  FPH_3,
-  FPH_4,
-  FPH_5,
-  FPH_6,
-  FPH_7,
-  FPH_8,
-  FPH_9,
-  FN_0,
-  BACKLIT,
-  MACSLEEP,
-  DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_NUMPAD] = LAYOUT_numpad_4x4( /* Numpad */
-    KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_PLUS,
-    KC_KP_4,    KC_KP_5,    KC_KP_6,
-    KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_KP_ENTER,
-    LT(_ADJUST, KC_KP_0),   KC_KP_DOT
-  ),
-  [_FPH] = LAYOUT_numpad_4x4( /* Quiet T9 */
-    FPH_7,      FPH_8,      FPH_9,      KC_KP_PLUS,
-    FPH_4,      FPH_5,      FPH_6,
-    FPH_1,      FPH_2,      FPH_3,      SFT_T(KC_KP_ENTER),
-    LT(_ADJUST, KC_SPACE),  KC_KP_DOT
-  ),
-  [_FPHNOISY] = LAYOUT_numpad_4x4( /* Noisy T9 */
-    FPH_7,      FPH_8,      FPH_9,      KC_KP_PLUS,
-    FPH_4,      FPH_5,      FPH_6,
-    FPH_1,      FPH_2,      FPH_3,      SFT_T(KC_KP_ENTER),
-    LT(_ADJUST, KC_SPACE),  KC_KP_DOT
-    ),
-  [_ADJUST] = LAYOUT_numpad_4x4( /* Adjustments */
-    KC_NUM,     TG(_FPHNOISY), TG(_FPH), TG(_NUMPAD),
-    KC_BSPC,    BACKLIT,       KC_DEL,
-    MACSLEEP,   _______,       _______,  _______,
-    _______,                   MO(_DYN)
-  ),
-  [_DYN] = LAYOUT_numpad_4x4( /* DYNAMIC MACRO */
-    DM_REC1, DM_REC2, _______, DM_RSTP,
-    _______, _______,  _______,
-    DM_PLY1, DM_PLY2, _______, _______,
-    _______,            _______
-  ),
-};
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-uint16_t fph_tap_qty = false;
-uint16_t fph_keycode = 0; // stores which spacebar was used, either raise or lower...
-
-uint16_t get_render_keycode(uint16_t keycode, uint16_t tap_qty){ // maybe replace shift with "mods"
-  tap_qty--; // reduce by one to match array indexes.
-  switch(keycode){
-    case FPH_2:
-      {uint16_t kc[] = {KC_A, KC_B, KC_C};
-       if(tap_qty % 6 > 2)
-        return LSFT(kc[tap_qty % 3]);
-      return kc[tap_qty % 3];}
-    break;
-    case FPH_3:
-      {uint16_t kc[] = {KC_D, KC_E, KC_F};
-       if(tap_qty % 6 > 2)
-        return LSFT(kc[tap_qty % 3]);
-      return kc[tap_qty % 3];}
-    break;
-    case FPH_4:
-      {uint16_t kc[] = {KC_G, KC_H, KC_I};
-       if(tap_qty % 6 > 2)
-        return LSFT(kc[tap_qty % 3]);
-      return kc[tap_qty % 3];}
-    break;
-    case FPH_5:
-      {uint16_t kc[] = {KC_J, KC_K, KC_L};
-       if(tap_qty % 6 > 2)
-        return LSFT(kc[tap_qty % 3]);
-      return kc[tap_qty % 3];}
-    break;
-    case FPH_6:
-      {uint16_t kc[] = {KC_M, KC_N, KC_O};
-       if(tap_qty % 6 > 2)
-        return LSFT(kc[tap_qty % 3]);
-      return kc[tap_qty % 3];}
-    break;
-    case FPH_7:
-      {uint16_t kc[] = {KC_P, KC_Q, KC_R, KC_S};
-       if(tap_qty % 8 > 2)
-        return LSFT(kc[tap_qty % 4]);
-      return kc[tap_qty % 4];}
-    break;
-    case FPH_8:
-      {uint16_t kc[] = {KC_T, KC_U, KC_V};
-       if(tap_qty % 8 > 2)
-        return LSFT(kc[tap_qty % 4]);
-      return kc[tap_qty % 4];}
-    break;
-    case FPH_9:
-      {uint16_t kc[] = {KC_W, KC_X, KC_Y, KC_Z};
-       if(tap_qty % 8 > 2)
-        return LSFT(kc[tap_qty % 4]);
-      return kc[tap_qty % 4];}
-    break;
-    case FPH_1:
-      {uint16_t kc[] = {KC_COMM, LSFT(KC_SLSH), KC_EXLM, KC_AT, KC_MINS, KC_UNDS, KC_PLUS,
-          KC_SCLN, LSFT(KC_SCLN), KC_QUOT, LSFT(KC_QUOT), KC_TILD,
-          KC_PIPE, KC_BSLS, KC_HASH, LSFT(KC_4), KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR,
-          KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, LSFT(KC_COMM), LSFT(KC_DOT)};
-      return kc[tap_qty % 26];}
-  }
-  return KC_NO;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_dynamic_macro(keycode, record)) {
-      return false;
-    }
-    uint8_t layer;
-    layer = get_highest_layer(layer_state);
-
-    switch (keycode) {
-    case FPH_1 ... FPH_9:
-      if(layer == _FPHNOISY){
-        if (record->event.pressed) {
-          if(fph_keycode != keycode) { // key change
-            fph_tap_qty = 0;
-            fph_keycode = keycode;
-          } else { // same key tapped again so erase and increment.
-            register_code(KC_BSPC);
-            unregister_code(KC_BSPC);
-            fph_tap_qty++;
-          }
-          uint16_t render_keycode = get_render_keycode(keycode, fph_tap_qty);
-          // find mods? Apply mods..
-          register_code(render_keycode);
-          unregister_code(render_keycode);
-        } else {
-          // do we need to do anything on key-release?
-        }
-      } else { // not noisy, be demure .
-        if (record->event.pressed) {
-          if(fph_keycode != keycode) { // key change, kill everything.
-            uint16_t render_keycode = get_render_keycode(fph_keycode, fph_tap_qty);
-            // find mods? Apply mods..
-            register_code(render_keycode);
-            unregister_code(render_keycode);
-            fph_keycode = keycode;
-            fph_tap_qty = 0;
-          } else { // same key tapped again so increment counter silently
-            fph_tap_qty++;
-          }
-        } else {
-            // do we need to do anything on key-release?
-            // maybe start a timer on this one?
-        }
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      }
-      return false;
-      break;
-    case MACSLEEP:
-      if (record->event.pressed) {
-          register_code(KC_RSFT);
-          register_code(KC_RCTL);
-          register_code(KC_PWR);
-          unregister_code(KC_PWR);
-          unregister_code(KC_RCTL);
-          unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/readme.md
deleted file mode 100644
index ad630be195b..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Flip Phone layout for Roadkit
-
-BEWARE, THIS DOES NOT WORK YET. 
-
-Uses the numpad with classic cellular phone style letters assigned to the numbers.
-
-# LAYERS
-
-* Numpad - The layer that matches the caps mostly
-* FPH - Base layer for text
-* FPHNOISY - Text layer that outputs every character and then backspaces as they're replaced
-* DYN - dynamic macro layer for recording and playing macros
-
-## FPH
-
-Poke the "2" key twice and it makes "B".
-
-## FPHNOISY
-
-Poke the "2" key twice and it makes "A"+backspace+"B" so you can see it cycle through.
-
-## MACROS
-
-May be able to record macros with the T9 layer because the "KC_*"s are only sent
-at the end.  Trying to do a macro with T9NOISY would probably fill up the buffer
-in just a few characters.
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk
deleted file mode 100644
index 93e7cd8bb74..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/khord/config.h b/keyboards/thevankeyboards/roadkit/keymaps/khord/config.h
deleted file mode 100644
index da6ed7189c7..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/khord/config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-#define TAPPING_TERM 175
-
-#ifdef BACKLIGHT_ENABLE
-  #define BACKLIGHT_PIN B5
-  #define BACKLIGHT_LEVELS 3
-  #define BACKLIGHT_ON_STATE 0
-#endif	
-	
-#endif
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
deleted file mode 100644
index eb7bb3ab760..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _NP 0
-#define _L1 1
-#define _L2 2
-
-enum custom_keycodes {
-  NUMPAD = SAFE_RANGE,
-  ADMIN,
-  SMSPC1,
-  STR192,
-  STR255
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Numpad
-   * ,-----------------------.
-   * |  7  |  8  |  9  |Bksp |
-   * |-----`-----`-----`-----|
-   * |  4  |  5  |  6  | Tab |
-   * |-----`-----`-----`-----|
-   * |  1  |  2  |  3  |Enter|
-   * |-----`-----`-----`-----|
-   * |  0  |Space|  .  |  /  |
-   * `-----`-----`-----`-----'
-   * | L1  | L2  |     |     | Layer hold
-   */
-  [_NP] = LAYOUT_ortho_4x4( /* Numpad */
-    KC_P7,        KC_P8,         KC_P9,   KC_BSPC,
-    KC_P4,        KC_P5,         KC_P6,   KC_TAB,
-    KC_P1,        KC_P2,         KC_P3,   KC_PENT,
-    LT(1, KC_P0), LT(2, KC_SPC), KC_PDOT, KC_PSLS
-  ),
-
-  /* L1
-   * ,-----------------------.
-   * |Reset|     |     | Del |
-   * |-----`-----`-----`-----|
-   * | Left| Down| Up  |Right|
-   * |-----`-----`-----`-----|
-   * | 192.| 255 |     |     |
-   * |-----`-----`-----`-----|
-   * |_____| LED |  .  |     |
-   * `-----`-----`-----`-----'
-   */
-  [_L1] = LAYOUT_ortho_4x4( /* LAYER 1 */
-    QK_BOOT, XXXXXXX, XXXXXXX, KC_DEL,
-    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-    STR192,  STR255,  XXXXXXX, XXXXXXX,
-    _______, BL_STEP, _______, XXXXXXX
-  ),
-
-  /* L2
-   * ,-----------------------.
-   * |     |     | str | str |
-   * |-----`-----`-----`-----|
-   * |     |     |     |     |
-   * |-----`-----`-----`-----|
-   * |     |     |     |     |
-   * |-----`-----`-----`-----|
-   * |     |_____|     |     |
-   * `-----`-----`-----`-----'
-   */
-  [_L2] = LAYOUT_ortho_4x4( /* LAYER 2 */
-    XXXXXXX, XXXXXXX, ADMIN,   SMSPC1,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, _______, XXXXXXX, XXXXXXX
-  )
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case ADMIN:
-      if (record->event.pressed) {
-  SEND_STRING("Administrator");
-      }
-      return false;
-      break;
-    case SMSPC1:
-      if (record->event.pressed) {
-  SEND_STRING("Simspace1!");
-      }
-      return false;
-      break;
-    case STR192:
-      if (record->event.pressed) {
-  SEND_STRING("192.168.");
-      }
-      return false;
-      break;
-    case STR255:
-      if (record->event.pressed) {
-  SEND_STRING("255");
-      }
-      return false;
-      break;
-  }
-  return true;
-};
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
deleted file mode 100644
index f6dfc2483b8..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no      # Enable Tap Dance functionality
-
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/mjt/config.h b/keyboards/thevankeyboards/roadkit/keymaps/mjt/config.h
deleted file mode 100644
index df06a262062..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/mjt/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
deleted file mode 100644
index db846740505..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
+++ /dev/null
@@ -1,230 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#ifdef BACKLIGHT_ENABLE
-  #include "backlight.h"
-#endif
-
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-
-void backlight_toggle(void){
-};
-
-enum roadkit_layers {
-  _NUMPAD,
-  _NAVIGATION,
-  _EXCEL,
-  _ADJUST,
-  _DYN
-};
-
-enum minivan_keycodes {
-  NUMPAD = SAFE_RANGE,
-  NAVIGATION,
-  EXCEL,
-  NUMPAD_LOCK,
-  NAVIGATION_LOCK,
-  EXCEL_LOCK,
-  PARENS,
-  BRACKETS,
-  BRACES,
-  BACKLIT,
-  MACSLEEP,
-  DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_NUMPAD] = LAYOUT_numpad_4x4( /* Numpad */
-    KC_KP_7, KC_KP_8, KC_KP_9,   KC_KP_PLUS,
-    KC_KP_4, KC_KP_5, KC_KP_6,
-    KC_KP_1, KC_KP_2, KC_KP_3,   NAVIGATION,
-    EXCEL,            KC_KP_DOT
-  ),
-  [_EXCEL] = LAYOUT_numpad_4x4( /* Excel related */
-    KC_KP_SLASH, KC_KP_ASTERISK, KC_MINS,  KC_TAB,
-    KC_QUOT,     KC_KP_EQUAL,    PARENS,
-    KC_DQT,      BRACKETS,       BRACES,   _______,
-    _______,                     MO(_DYN)
-  ),
-  [_NAVIGATION] = LAYOUT_numpad_4x4( /* Navigation */
-    KC_HOME, _______, KC_PGUP,  KC_TAB,
-    KC_END,  KC_UP,   KC_PGDN,
-    KC_LEFT, KC_DOWN, KC_RIGHT, _______,
-    _______,          MO(_DYN)
-  ),
-  [_ADJUST] = LAYOUT_numpad_4x4( /* Adjustments */
-    KC_NUM,     MACSLEEP,    BACKLIT,         _______,
-    KC_BSPC,     _______,    KC_DEL,
-    EXCEL_LOCK, NUMPAD_LOCK, NAVIGATION_LOCK, _______,
-    _______,                 _______
-  ),
-  [_DYN] = LAYOUT_numpad_4x4( /* DYNAMIC MACRO */
-    DM_REC1,  DM_REC2,  _______, _______,
-    _______,         _______,         _______,
-    DM_PLY1, DM_PLY2, _______, _______,
-    _______,                          _______
-  ),
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_startup[][2]    = SONG(STARTUP_SOUND);
-float tone_numpad[][2]     = SONG(QWERTY_SOUND);
-float tone_excel[][2]     = SONG(DVORAK_SOUND);
-float tone_navigation[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-
-float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool fn_tap_used = false; // sets to false when space is pressed,
-                          // sets to true when any other key is pressed,
-                          //when space is lifted, if another key was prssed, don't send space.
-uint16_t fn_keycode = 0; // stores which spacebar was used, either raise or lower...
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (!process_record_dynamic_macro(keycode, record)) {
-    return false;
-  }
-
-  switch (keycode) {
-      case NAVIGATION: // This key is enter if tapped, navigation if held
-        if (record->event.pressed) {
-          fn_keycode = NAVIGATION; // these two lines figure out if the next action is
-          fn_tap_used = false;
-          layer_on(_NAVIGATION);
-          update_tri_layer(_EXCEL, _NAVIGATION, _ADJUST);
-        } else {
-          layer_off(_NAVIGATION);
-          update_tri_layer(_EXCEL, _NAVIGATION, _ADJUST);
-          if(!fn_tap_used && fn_keycode == NAVIGATION ){
-              register_code(KC_KP_ENTER);
-              unregister_code(KC_KP_ENTER);
-              fn_keycode = 0;
-              fn_tap_used = false;
-          }
-        }
-        return false;
-        break;
-      case EXCEL:
-        if (record->event.pressed) {
-          fn_keycode = EXCEL;
-          fn_tap_used = false;
-          layer_on(_EXCEL);
-          update_tri_layer(_EXCEL, _NAVIGATION, _ADJUST);
-        } else {
-          layer_off(_EXCEL);
-          update_tri_layer(_EXCEL, _NAVIGATION, _ADJUST);
-          if(!fn_tap_used && fn_keycode == EXCEL ){
-              register_code(KC_KP_0);
-              unregister_code(KC_KP_0);
-              fn_keycode = 0;
-              fn_tap_used = false;
-          }
-        }
-        return false;
-        break;
-    default:
-        fn_tap_used = true;
-        break; // don't return because this just handles the spacebars.
-    }
-    // this is the normal keycode processing switch from Planck default layout.
-    switch (keycode) {
-    case NUMPAD_LOCK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_numpad);
-        #endif
-        persistant_default_layer_set(1UL<<_NUMPAD);
-      }
-      return false;
-      break;
-    case NAVIGATION_LOCK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_navigation);
-        #endif
-        persistant_default_layer_set(1UL<<_NAVIGATION);
-      }
-      return false;
-      break;
-    case EXCEL_LOCK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_excel);
-        #endif
-        persistant_default_layer_set(1UL<<_EXCEL);
-      }
-      return false;
-      break;
-    case PARENS:
-      if (record->event.pressed) {
-          register_code(KC_RSFT);
-          register_code(KC_9);
-          unregister_code(KC_9);
-          register_code(KC_0);
-          unregister_code(KC_0);
-          register_code(KC_RSFT);
-          register_code(KC_LEFT);
-          unregister_code(KC_LEFT);
-      }
-      return false;
-      break;
-    case BRACKETS:
-      if (record->event.pressed) {
-          register_code(KC_LBRC);
-          unregister_code(KC_LBRC);
-          register_code(KC_RBRC);
-          unregister_code(KC_RBRC);
-          register_code(KC_LEFT);
-          unregister_code(KC_LEFT);
-        }
-        return false;
-        break;
-    case BRACES:
-      if (record->event.pressed) {
-          register_code(KC_RSFT);
-          register_code(KC_LBRC);
-          unregister_code(KC_LBRC);
-          register_code(KC_RBRC);
-          unregister_code(KC_RBRC);
-          unregister_code(KC_RSFT);
-          register_code(KC_LEFT);
-          unregister_code(KC_LEFT);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      }
-      return false;
-      break;
-    case MACSLEEP:
-      if (record->event.pressed) {
-          register_code(KC_RSFT);
-          register_code(KC_RCTL);
-          register_code(KC_PWR);
-          unregister_code(KC_PWR);
-          unregister_code(KC_RCTL);
-          unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/mjt/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/mjt/readme.md
deleted file mode 100644
index 80c0e5240e3..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/mjt/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Mike's custom keymap for roadkit
-
-Based on the 13 key layout.
-
-## LAYERS
-
-* Numpad - The layer that matches the caps
-* Excel - / * - = and () [] {} macros
-* Navigation - arrow keys and home/end
-* ADJUST - just like planck adjust, lets you set default layer.
-* DYN - dynamic macro layer for recording and playing macros
-
-## MACROS
-
-Sadly, the dynamic macros are probably going worthless because they keys that
-they record have to be pressed on this keyboard. This keyboard doesn't have
-most letters...
-
-## LEADER KEYS
-
-This board would probably be better with the user of leader keys instead of
-complex layers with a raise/lower setup...  Something to look into for later. 
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk
deleted file mode 100644
index 93e7cd8bb74..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/wavebeem-gamepad/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/wavebeem-gamepad/keymap.c
deleted file mode 100644
index dfdded8e7b6..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/wavebeem-gamepad/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_ortho_4x4(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,
-    KC_ESC,  KC_A,    KC_S,    KC_D,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,
-    KC_F,    KC_LALT, KC_LCTL, KC_SPC
-  ),
-};
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/wavebeem-gamepad/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/wavebeem-gamepad/readme.md
deleted file mode 100644
index 7eeb07ede14..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/wavebeem-gamepad/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-![Keymap Diagram](https://i.imgur.com/hRjbhEn.png)
-
-# Gamepad Layout by @wavebeem
-
-The concept behind this layout is the left side of a computer keyboard,
-optimized with essential keys for playing FPS games. It was designed for TheVan
-RoadKit, but it should work for any 4x4 ortholinear keyboard.
-
-I play with my pinky on `Shift`, thumb on `Space`, and the rest of my fingers on
-`W A S D`. I use my thumb for `Control`, `X`, and sometimes `C`. I usually use
-`Z` with my ring finger. It also helps to angle my fingers more perpendicular to
-the board in order to allow my thumb to more easily access the `Z X C` row.
-
-The number keys `1 2 3` are missing for weapon switching, but you can usually
-switch with the mouse wheel or rebind those to `Z X C` or something else.
-
-The key `R` for reloading is missing, but I prefer to use my extra mouse buttons
-for that.
-
-I don't really use `Alt` for games, but I kept it around for `Alt-Tab` in
-Windows.
-
-# Keymap Text Diagram
-
-```
-+-------+-------+-------+-------+
-| Tab   | Q     | W     | E     |
-+-------+-------+-------+-------+
-| Esc   | A     | S     | D     |
-+-------+-------+-------+-------+
-| Shift | Z     | X     | C     |
-+-------+-------+-------+-------+
-| F     | Alt   | Ctrl  | Space |
-+-------+-------+-------+-------+
-```
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/wavebeem-gamepad/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/wavebeem-gamepad/rules.mk
deleted file mode 100644
index 825ca368817..00000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/wavebeem-gamepad/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h
index a9909d10016..827133aed36 100644
--- a/keyboards/tkc/california/config.h
+++ b/keyboards/tkc/california/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json
index d309e872f4e..731e65323ee 100644
--- a/keyboards/tkc/california/info.json
+++ b/keyboards/tkc/california/info.json
@@ -17,6 +17,9 @@
         "pin": "B7",
         "breathing": true
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "indicators": {
         "caps_lock": "F0",
         "num_lock": "F1"
diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h
index 265e0abbc31..a57c0b4b1d0 100644
--- a/keyboards/tkc/portico/config.h
+++ b/keyboards/tkc/portico/config.h
@@ -17,38 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-#    define DRIVER_1_LED_TOTAL 36
-#    define DRIVER_2_LED_TOTAL 31
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-#else
-// IS31FL3731 driver
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
+
+#ifndef RGB_MATRIX_ENABLE
+// IS31FL3731 driver
 #define IS31FL3731_LED_COUNT 67
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
index 6eb15efb735..4f908c83e62 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -9,7 +9,39 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h
index 2c8ecf806da..3da76c332d8 100644
--- a/keyboards/tkc/portico68v2/config.h
+++ b/keyboards/tkc/portico68v2/config.h
@@ -18,62 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define DRIVER_1_LED_TOTAL 82
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-#define DRIVER_INDICATOR_LED_TOTAL 0
-#define RGB_MATRIX_CENTER { 116, 32 }
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// 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
-#    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_LED_PROCESS_LIMIT 5
-// #define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/info.json
index 7a11cb61720..38a94c2c9d0 100644
--- a/keyboards/tkc/portico68v2/info.json
+++ b/keyboards/tkc/portico68v2/info.json
@@ -9,7 +9,53 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [116, 32],
+        "driver": "is31fl3741",
+        "max_brightness": 175,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c
index 90d8c12fcaf..0f3c557b2ca 100644
--- a/keyboards/tkc/portico68v2/portico68v2.c
+++ b/keyboards/tkc/portico68v2/portico68v2.c
@@ -18,90 +18,90 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB1 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB2 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB3 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB4 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB5 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB6 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB7 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB8 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB9 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB10 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB11 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB12 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB13 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB14 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB15 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB16 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB17 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB18 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB19 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB21 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB22 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB23 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB24 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB25 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB26 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB27 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB28 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB29 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB30 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB31 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB32 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB33 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB34 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB35 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB36 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB37 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB38 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB39 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB40 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB41 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB42 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB43 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB44 */
-    {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB45 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB46 */
-    {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB47 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB48 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB49 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB50 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB51 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB52 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB53 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB54 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB55 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB56 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB57 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB58 */
-    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB59 */
-    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB60 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB61 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB62 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB63 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB64 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB65 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB66 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB67 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB1 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB2 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB3 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB4 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB5 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB6 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB7 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB8 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB9 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB10 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB11 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB12 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB13 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB14 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB15 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB16 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB17 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB18 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB19 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB21 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB22 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB23 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB24 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB25 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB26 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB27 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB28 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB29 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB30 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB31 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB32 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB33 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB34 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB35 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB36 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB37 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB38 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB39 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB40 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB41 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB42 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB43 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB44 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB45 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB46 */
+    {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB47 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB48 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB49 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB50 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB51 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB52 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB53 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB54 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB55 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB56 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB57 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB58 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB59 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB60 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB61 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* RGB62 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB63 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB64 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB65 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB66 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB67 */
 
-    {0,CS36_SW1,CS35_SW1,CS34_SW1}, /* RGB68 */
-    {0,CS36_SW2,CS35_SW2,CS34_SW2}, /* RGB69 */
-    {0,CS36_SW3,CS35_SW3,CS34_SW3}, /* RGB70 */
-    {0,CS36_SW4,CS35_SW4,CS34_SW4}, /* RGB71 */
-    {0,CS36_SW5,CS35_SW5,CS34_SW5}, /* RGB72 */
-    {0,CS36_SW6,CS35_SW6,CS34_SW6}, /* RGB73 */
-    {0,CS36_SW7,CS35_SW7,CS34_SW7}, /* RGB74 */
-    {0,CS36_SW8,CS35_SW8,CS34_SW8}, /* RGB75 */
-    {0,CS36_SW9,CS35_SW9,CS34_SW9}, /* RGB76 */
-    {0,CS39_SW1,CS38_SW1,CS37_SW1}, /* RGB77 */
-    {0,CS39_SW2,CS38_SW2,CS37_SW2}, /* RGB78 */
-    {0,CS39_SW3,CS38_SW3,CS37_SW3}, /* RGB79 */
-    {0,CS39_SW4,CS38_SW4,CS37_SW4}, /* RGB80 */
-    {0,CS39_SW5,CS38_SW5,CS37_SW5}, /* RGB81 */
-    {0,CS39_SW6,CS38_SW6,CS37_SW6}, /* RGB82 */
+    {0,SW1_CS36,SW1_CS35,SW1_CS34}, /* RGB68 */
+    {0,SW2_CS36,SW2_CS35,SW2_CS34}, /* RGB69 */
+    {0,SW3_CS36,SW3_CS35,SW3_CS34}, /* RGB70 */
+    {0,SW4_CS36,SW4_CS35,SW4_CS34}, /* RGB71 */
+    {0,SW5_CS36,SW5_CS35,SW5_CS34}, /* RGB72 */
+    {0,SW6_CS36,SW6_CS35,SW6_CS34}, /* RGB73 */
+    {0,SW7_CS36,SW7_CS35,SW7_CS34}, /* RGB74 */
+    {0,SW8_CS36,SW8_CS35,SW8_CS34}, /* RGB75 */
+    {0,SW9_CS36,SW9_CS35,SW9_CS34}, /* RGB76 */
+    {0,SW1_CS39,SW1_CS38,SW1_CS37}, /* RGB77 */
+    {0,SW2_CS39,SW2_CS38,SW2_CS37}, /* RGB78 */
+    {0,SW3_CS39,SW3_CS38,SW3_CS37}, /* RGB79 */
+    {0,SW4_CS39,SW4_CS38,SW4_CS37}, /* RGB80 */
+    {0,SW5_CS39,SW5_CS38,SW5_CS37}, /* RGB81 */
+    {0,SW6_CS39,SW6_CS38,SW6_CS37}, /* RGB82 */
 };
 
 led_config_t g_led_config = {
@@ -133,13 +133,13 @@ bool rgb_matrix_indicators_kb(void) {
         return false;
     }
     if (host_keyboard_led_state().caps_lock) {
-        for (uint8_t i = 0; i < DRIVER_1_LED_TOTAL; i++) {
+        for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
             rgb_matrix_set_color(i, 0xFF, 0xFF, 0xFF);
         }
     }
     else {
          if (rgb_matrix_get_flags() == LED_FLAG_NONE) {
-            for (uint8_t i = 0; i < DRIVER_1_LED_TOTAL; i++) {
+            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
                 rgb_matrix_set_color(i, 0, 0, 0);
             }
         }
diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
index 8146141bf09..8d209e37759 100644
--- a/keyboards/tkc/portico75/config.h
+++ b/keyboards/tkc/portico75/config.h
@@ -17,68 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#    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 IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#    define DRIVER_1_LED_TOTAL 98
-#    define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-#    define DRIVER_INDICATOR_LED_TOTAL 0
-#else
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+
+#ifndef RGB_MATRIX_ENABLE
 // WT_RGB IS31FL3741 driver code
-#    define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 #    define IS31FL3741_LED_COUNT 98
 
 #    define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
index 5a900369725..fa2a24951fa 100644
--- a/keyboards/tkc/portico75/info.json
+++ b/keyboards/tkc/portico75/info.json
@@ -9,7 +9,39 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3741"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c
index 0a22a37d4e3..cd6dafe31aa 100644
--- a/keyboards/tkc/portico75/portico75.c
+++ b/keyboards/tkc/portico75/portico75.c
@@ -25,119 +25,119 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if defined(RGB_MATRIX_ENABLE) || defined(RGB_BACKLIGHT_PORTICO75)
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {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},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
+
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, //Encoder, NO_LED
+
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW9_CS15, SW9_CS14, SW9_CS13},
+
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
+
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},
+
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW2_CS6, SW2_CS5, SW2_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},
+    {0, SW9_CS6, SW9_CS5, SW9_CS4},
+
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW8_CS3, SW8_CS2, SW8_CS1},
+    {0, SW9_CS3, SW9_CS2, SW9_CS1},
+
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
 
 /*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},
+    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW6_CS39, SW6_CS38, SW6_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37},
+    {0, SW8_CS39, SW8_CS38, SW8_CS37},
+    {0, SW9_CS39, SW9_CS38, SW9_CS37},
+
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
+    {0, SW8_CS36, SW8_CS35, SW8_CS34},
+    {0, SW9_CS36, SW9_CS35, SW9_CS34},
+
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 };
 #endif
 
diff --git a/keyboards/tkc/tkc1800/keymaps/smt/keymap.c b/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
deleted file mode 100644
index 76a262bcf57..00000000000
--- a/keyboards/tkc/tkc1800/keymaps/smt/keymap.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* Copyright 2017 Mathias Andersson <wraul@dbox.se>
- *
- * 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
-
-// Custom macros
-#define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
-#define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
-#define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
-
-//Layers
-
-enum {
-  QWERTY = 0,
-  COLEMAK,
-  DVORAK,
-  FUNCTION,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap QWERTY: (Qwerty Layer) Default Layer
-   * ,-------------------------------------------------------.     ,-------------------.
-   * |Esc| F1| F2| F3| F4| | F5| F6| F7| F8| | F9|F10|F11|F12|     |Ins |Home|PgUp|PrSc|
-   * `-------------------------------------------------------'     |-------------------|
-   *                                                               |Del |End |PgDn|ScrL|
-   * ,-----------------------------------------------------------. |-------------------|
-   * | ~ | 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | |NumL| /  | *  |Paus|
-   * |-----------------------------------------------------------| |-------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | | 7  | 8  | 9  | -  |
-   * |-----------------------------------------------------------| |-------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return | | 4  | 5  | 6  | +  |
-   * |-----------------------------------------------------------' |-------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift  | Up | 1  | 2  | 3  | Ent|
-   * |--------------------------------------------------------'----`--------------|    |
-   * |Ctrl|Gui |Alt |      Space           |Alt |Gui|Ctr|Left |Down|Rght| 0  | .  |    |
-   * `---------------------------------------------------------------------------------'
-   */
-  [QWERTY] = LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,                    KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
-    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_BSLS, KC_GRV,  KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
-    HPR_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_BSPC,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-    CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                        KC_RALT, MO(FUNCTION), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT, KC_PENT
-  ),
-  /* Keymap COLEMAK: (Colemak Layer) Default Layer
-   * ,-------------------------------------------------------.     ,-------------------.
-   * |Esc| F1| F2| F3| F4| | F5| F6| F7| F8| | F9|F10|F11|F12|     |Ins |Home|PgUp|PrSc|
-   * `-------------------------------------------------------'     |-------------------|
-   *                                                               |Del |End |PgDn|ScrL|
-   * ,-----------------------------------------------------------. |-------------------|
-   * | ~ | 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | |NumL| /  | *  |Paus|
-   * |-----------------------------------------------------------| |-------------------|
-   * |Tab  |  Q|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|  \  | | 7  | 8  | 9  | -  |
-   * |-----------------------------------------------------------| |-------------------|
-   * |CAPS   |  A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '|Return | | 4  | 5  | 6  | +  |
-   * |-----------------------------------------------------------' |-------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  K|  M|  ,|  .|  /|Shift  | Up | 1  | 2  | 3  | Ent|
-   * |--------------------------------------------------------'----`--------------|    |
-   * |Ctrl|Gui |Alt |      Space           |Alt |Gui|Ctr|Left |Down|Rght| 0  | .  |    |
-   * `---------------------------------------------------------------------------------'
-   */
-  [COLEMAK] = 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_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
-    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_BSLS, KC_GRV,  KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
-    HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-    CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                        KC_RALT, MO(FUNCTION), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT, KC_PENT
-  ),
-  /* Keymap DVORAK: (Dvorak Layer) Default Layer
-   * ,-------------------------------------------------------.     ,-------------------.
-   * |Esc| F1| F2| F3| F4| | F5| F6| F7| F8| | F9|F10|F11|F12|     |Ins |Home|PgUp|PrSc|
-   * `-------------------------------------------------------'     |-------------------|
-   *                                                               |Del |End |PgDn|ScrL|
-   * ,-----------------------------------------------------------. |-------------------|
-   * | ~ | 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]|  \| ~ | |NumL| /  | *  |Paus|
-   * |-----------------------------------------------------------| |-------------------|
-   * |Tab  |  '|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|  BS | | 7  | 8  | 9  | -  |
-   * |-----------------------------------------------------------| |-------------------|
-   * |CAPS   |  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -|Return | | 4  | 5  | 6  | +  |
-   * |-----------------------------------------------------------' |-------------------|
-   * |Shift   |  ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z|Shift  | Up | 1  | 2  | 3  | Ent|
-   * |--------------------------------------------------------'----`--------------|    |
-   * |Ctrl|Gui |Alt |      Space           |Alt |Gui|Ctr|Left |Down|Rght| 0  | .  |    |
-   * `---------------------------------------------------------------------------------'
-   */
-  [DVORAK] = 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_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,  KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
-    HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSPC,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-    CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_LSFT, XXXXXXX, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                        KC_RALT, MO(FUNCTION), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT, KC_PENT
-  ),
-  [FUNCTION] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-                                                                                                                                           KC_DEL,  KC_END,  KC_PGDN, KC_SCRL,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_NUM,  KC_PSLS, KC_PAST, KC_PAUS,
-    _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______, _______, _______,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______,      KC_UP,       KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, _______, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT, KC_PENT
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(DVORAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-#ifdef OLED_ENABLE
-bool oled_task_user(void) {
-    oled_write_P(PSTR("TKC1800\n"),false);
-	// Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case QWERTY:
-            oled_write_P(PSTR("Base\n"), false);
-            break;
-		case COLEMAK:
-            oled_write_P(PSTR("Colemak\n"), false);
-            break;
-		case DVORAK:
-            oled_write_P(PSTR("Dvorak\n"), false);
-            break;
-        case FUNCTION:
-            oled_write_P(PSTR("Function\n"), false);
-            break;
-        default:
-            // Or use the write_ln shortcut over adding '\n' to the end of your string
-            oled_write_ln_P(PSTR("Undefined"), false);
-    }
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-
-    return false;
-}
-#endif
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index 5a3bda67c26..ef2f04081f6 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/tmo50/keymaps/olivia/keymap.c b/keyboards/tmo50/keymaps/olivia/keymap.c
deleted file mode 100644
index f7a094060d5..00000000000
--- a/keyboards/tmo50/keymaps/olivia/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2019 funderburker
- *
- * 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 LT1_SPC     LT(1, KC_SPC)
-#define LT1_BSPC     LT(1, KC_BSPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Default layer
-  [0] = LAYOUT_all(
-		KC_VOLU, 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_BSPC,
-		KC_VOLD, MT(MOD_LCTL, KC_ESC), 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_MUTE, 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(2),
-		KC_MPLY, KC_LALT, KC_LGUI, LT1_BSPC, LT1_SPC, KC_RALT, MO(3)
-  ),
-
-  // Fn1 layer
-  [1] = LAYOUT_all(
-		KC_TRNS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
-		KC_TRNS, KC_TRNS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC,  KC_TRNS, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_ESC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  // Fn2 layer
-  [2] = LAYOUT_all(
-		KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,  KC_END,   KC_UP, KC_TRNS, KC_TRNS, KC_DEL,
-		KC_BRID, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  // Fn3 layer
-  [3] = LAYOUT_all(
-        QK_BOOT, 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_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DOWN,KC_TRNS, 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/tmo50/keymaps/ottodokto/config.h b/keyboards/tmo50/keymaps/ottodokto/config.h
deleted file mode 100644
index 7dcbc74ef76..00000000000
--- a/keyboards/tmo50/keymaps/ottodokto/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*---RGB settings-------------------------------------------- */
-#undef  RGBLIGHT_HUE_STEP
-#undef  RGBLIGHT_SAT_STEP
-#undef  RGBLIGHT_VAL_STEP
-#undef  RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL
-
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 200
\ No newline at end of file
diff --git a/keyboards/tmo50/keymaps/ottodokto/keymap.c b/keyboards/tmo50/keymaps/ottodokto/keymap.c
deleted file mode 100644
index 736b0374fd6..00000000000
--- a/keyboards/tmo50/keymaps/ottodokto/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-/*---default defines-------------------------------------------- */
-#define LT1_SPC     LT(1, KC_SPC)
-#define LT2_SPC     LT(2, KC_SPC)
-
-
-#define RGB_STA RGB_M_P		// rgb static
-#define RGB_BRE RGB_M_B 	// rgb breathe
-#define RGB_RAI RGB_M_R 	// rgb rainbow
-#define RGB_SWI RGB_M_SW 	// rgb swirl
-#define RGB_SNA RGB_M_SN	// rgb snake9
-#define RGB_KNI RGB_M_K 	// rgb knight
-#define RGB_GRA RGB_M_G 	// rgb gradient
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Default layer
-  [0] = LAYOUT_all(
-		KC_VOLU, 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_BSPC,
-		KC_VOLD, MT(MOD_LCTL, KC_ESC), 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_MUTE, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_RSFT,
-		KC_MPLY, KC_LGUI, KC_LALT, LT2_SPC, LT1_SPC, KC_RALT, MO(3)
-  ),
-  // Numerals layer
-  [1] = LAYOUT_all(
-		KC_BRIU, QK_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_DEL,
-		KC_BRID, KC_CAPS, _______, _______, _______, _______, _______, _______, KC_4, KC_5,    KC_6,   _______, _______, _______,
-		RGB_MOD, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, _______, _______, _______, _______,
-		RGB_RMOD, _______, _______, _______, _______, _______, _______
-  ),
-  // FN & Navigation layer
-  [2] = LAYOUT_all(
-		KC_PGUP, _______,  KC_END, KC_UP, KC_HOME, _______, _______, _______, KC_F1, KC_F2,    KC_F3,   KC_F4,    _______, _______, _______,
-		KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, KC_F5, KC_F6,    KC_F7,   KC_F8, _______, _______,
-		KC_PSCR, _______, _______, _______, _______, _______, _______, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,
-		KC_RGUI, _______, _______, _______, _______, _______, _______
-  ),
-  // RGB Control Layer
-  [3] = LAYOUT_all(
-		RGB_SPI, RGB_TOG, RGB_HUD, RGB_VAI, RGB_HUI, _______, _______, _______, _______, _______,    _______,   _______,    _______, _______, QK_BOOT,
-		RGB_SPD, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______, _______, _______, _______,    _______,   _______, _______, _______,
-		_______, _______, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, VK_TOGG, _______, _______, _______, EE_CLR,
-		_______, _______, _______, _______, _______, _______, _______
-  )
-};
diff --git a/keyboards/tmo50/keymaps/ottodokto/rules.mk b/keyboards/tmo50/keymaps/ottodokto/rules.mk
deleted file mode 100644
index 43d2ebb17a2..00000000000
--- a/keyboards/tmo50/keymaps/ottodokto/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VELOCIKEY_ENABLE = yes 		# Enable velocikey.
diff --git a/keyboards/tmo50/keymaps/pyrol/keymap.c b/keyboards/tmo50/keymaps/pyrol/keymap.c
deleted file mode 100644
index b45f5250e15..00000000000
--- a/keyboards/tmo50/keymaps/pyrol/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2019 funderburker
- *
- * 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 CALTDEL LCA(KC_DEL)
-#define TSKMGR C(S(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Default layer
-  [0] = LAYOUT_all(
-		KC_VOLU, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_EQL, KC_BSPC,
-		KC_VOLD, 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_MPLY, 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(3),
-		KC_MUTE, KC_LGUI, KC_LALT, LT(1, KC_SPC), LT(2, KC_SPC), KC_RALT, MO(4)
-  ),
-
-  // Fn1 layer
-  [1] = LAYOUT_all(
-		A(KC_TAB), KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_RBRC, KC_LBRC, KC_DEL,
-		C(KC_C), KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRV, KC_TRNS,
-		C(KC_V), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS,
-		C(KC_X), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  //Fn2 layer
-  [2] = LAYOUT_all(
-		A(KC_TAB), KC_TAB,  KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC, KC_LBRC, KC_DEL,
-		C(KC_C), KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TILD, KC_TRNS,
-		C(KC_V), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS,
-		C(KC_X), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  // Fn3 layer
-  [3] = LAYOUT_all(
-		CALTDEL, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-		TSKMGR, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, TO(5), 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, KC_TRNS, KC_TRNS,
-		KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  // Fn4 layer
-  [4] = LAYOUT_all(
-    	QK_BOOT, 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_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-  // Game layer!
-  [5] = LAYOUT_all(
-		KC_VOLU, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_EQL, KC_BSPC,
-		KC_VOLD, 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_MPLY, 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(3),
-		KC_F12, KC_F13, KC_LALT, KC_SPC, LT(2, KC_SPC), KC_RALT, TO(0)
-  ),
-};
diff --git a/keyboards/tmo50/keymaps/xerpocalypse/keymap.c b/keyboards/tmo50/keymaps/xerpocalypse/keymap.c
deleted file mode 100644
index 53070fcb0bd..00000000000
--- a/keyboards/tmo50/keymaps/xerpocalypse/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2019 funderburker
- *
- * 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 LT1_SPC     LT(1, KC_SPC)
-#define LT2_SPC     LT(2, KC_BSPC)
-#define TSKMNGR     C(S(KC_ESC))
-#define ALT_TAB     A(KC_TAB)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // Default layer
-  [0] = LAYOUT_all(
-		KC_TRNS, 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_BSPC,
-		KC_TRNS, 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_TRNS, 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(3),
-		KC_TRNS, 		  KC_LGUI, KC_LALT, LT1_SPC, LT2_SPC, KC_RALT, KC_RCTL
-  ),
- 
-  // Fn1 layer
-  [1] = LAYOUT_all(
-		KC_GRV,  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,
-		C(KC_C), KC_TRNS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_TRNS,
-		C(KC_V), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC,  KC_TRNS, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS,
-		C(KC_X), 		  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  // Fn2 layer
-  [2] = LAYOUT_all(
-		ALT_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
-		TSKMNGR, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_HOME, KC_END,  KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, 		  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  // Fn3 layer
-  [3] = LAYOUT_all(
-        QK_BOOT, 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_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_UP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, BL_STEP, BL_DOWN,KC_TRNS, 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/tokyokeyboard/tokyo60/keymaps/swappedBottomRow/keymap.c b/keyboards/tokyokeyboard/tokyo60/keymaps/swappedBottomRow/keymap.c
deleted file mode 100644
index f0b54c36359..00000000000
--- a/keyboards/tokyokeyboard/tokyo60/keymaps/swappedBottomRow/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define BL 0
-#define FN 1
-/*
- * Default HHKB Layout
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: Default layer
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ Esc │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │  \  │  `  │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ Tab │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │BkSpc│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│Ctrl │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │█████│Enter│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│Shift│█████│  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │█████│Shift│ Fn  │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│█████│ Gui │ Alt │█████│█████│Space│█████│█████│█████│█████│█████│ Alt │ Gui │█████│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     */
-[BL] = LAYOUT_60_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_BSLS, 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_BSPC,
-        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_LSFT,            KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M, KC_COMM,  KC_DOT, KC_SLSH,      KC_RSFT, MO(FN),
-             KC_LGUI, KC_LALT,              KC_SPC,                         KC_RALT, KC_RGUI ),
-    /* 1: HHKB Fn layer
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│     │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │ Ins │ Del │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│Caps │ RGB │RGBfw│RGBrv│BLtog│BLstp│     │     │ Psc │ Slk │ Pus │ Up  │     │     │█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │ VoD │ VoU │ Mut │     │     │NP_* │NP_/ │Home │PgUp │Left │Right│█████│NPEnt│█████│
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│     │█████│     │     │Calc │     │     │NP_+ │NP_- │ End │PgDwn│Down │█████│     │     │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│█████│     │     │█████│█████│█████│     │█████│█████│█████│█████│     │     │█████│█████│
-└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-     */
-[FN]= LAYOUT_60_hhkb(
-       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_INS,  KC_DEL,
-       KC_CAPS, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,   KC_UP, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,       KC_PENT,
-       KC_TRNS,       KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS,  KC_END, KC_PGDN, KC_DOWN,       KC_TRNS, KC_TRNS,
-             KC_TRNS, KC_TRNS,                   KC_TRNS,                         KC_TRNS, KC_TRNS ),
-};
diff --git a/keyboards/tominabox1/adalyn/rules.mk b/keyboards/tominabox1/adalyn/rules.mk
index 60522b4706e..92299c80b9c 100644
--- a/keyboards/tominabox1/adalyn/rules.mk
+++ b/keyboards/tominabox1/adalyn/rules.mk
@@ -7,7 +7,4 @@ 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
-COMBO_ENABLE = no
+
diff --git a/keyboards/tominabox1/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h
index 9b01cb3da47..333d0a100eb 100644
--- a/keyboards/tominabox1/le_chiffre/config.h
+++ b/keyboards/tominabox1/le_chiffre/config.h
@@ -19,9 +19,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/*
- * WS2812 Underglow Matrix options
- */
-#define RGB_MATRIX_LED_COUNT 11
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/tominabox1/le_chiffre/info.json b/keyboards/tominabox1/le_chiffre/info.json
index 8ebc0778e65..47c07ab3618 100644
--- a/keyboards/tominabox1/le_chiffre/info.json
+++ b/keyboards/tominabox1/le_chiffre/info.json
@@ -73,7 +73,8 @@
         "max_brightness": 150,
         "sat_steps": 8,
         "speed_steps": 10,
-        "val_steps": 8
+        "val_steps": 8,
+        "sleep": true
     },
     "usb": {
         "vid": "0x7431",
diff --git a/keyboards/torn/keymaps/kinesish/config.h b/keyboards/torn/keymaps/kinesish/config.h
deleted file mode 100644
index 5c4de67989a..00000000000
--- a/keyboards/torn/keymaps/kinesish/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Alexander Dergachev (alexander.dergachev@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_TERM 200
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-#define PERMISSIVE_HOLD_PER_KEY
diff --git a/keyboards/torn/keymaps/kinesish/keymap.c b/keyboards/torn/keymaps/kinesish/keymap.c
deleted file mode 100644
index 9ddbac3601b..00000000000
--- a/keyboards/torn/keymaps/kinesish/keymap.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Copyright 2020 Alexander Dergachev (alexander.dergachev@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 torn_layers { _QWERTY, _LOWER, _RAISE, _ADJUST };
-
-#define G_DEL LGUI_T(KC_DEL)
-#define G_ENT RGUI_T(KC_ENT)
-
-#define C_BSPC LCTL_T(KC_BSPC)
-#define C_SPC RCTL_T(KC_SPC)
-
-#define S_EQL LSFT_T(KC_EQL)
-#define S_MINS RSFT_T(KC_MINS)
-
-#define R_TAB LT(_RAISE, KC_TAB)
-#define R_BSLS LT(_RAISE, KC_BSLS)
-
-#define L_GRV LT(_LOWER, KC_GRV)
-#define L_QUOT LT(_LOWER, KC_QUOT)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------.    ,-----------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |    |   Y  |   U  |   I  |   O  |   P  |  \   |
- * | Raise|      |      |      |      |      |    |      |      |      |      |      | Raise|
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * | `    |   A  |   S  |   D  |   F  |   G  |    |   H  |   J  |   K  |   L  |   ;  |  '   |
- * | Lower|      |      |      |      |      |    |      |      |      |      |      | Lower|
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |  =+  |   Z  |   X  |   C  |   V  |   B  |    |   N  |   M  |   ,  |   .  |   /  |  -_  |
- * | Shift|      |      |      |      |      |    |      |      |      |      |      | Shift|
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- *               | ____ | Alt  | Bksp | Del  |    |Enter |Space | Alt  | ____ |
- *               |      |      | Ctrl | Gui  |    | Gui  | Ctrl |      |      |
- *               `---------------------------'    `---------------------------'
- */
-[_QWERTY] = LAYOUT_split_3x6_4(
-    R_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    R_BSLS,
-    L_GRV,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, L_QUOT,
-    S_EQL,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, S_MINS ,
-                     _______, KC_LALT, C_BSPC,  G_DEL,     G_ENT,   C_SPC,   KC_RALT, _______
-),
-
-/* Lower
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |  Esc |   !  |   @  |   #  |   $  |   %  |    |   ^  |   &  |   *  |   (  |   )  |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |   1  |   2  |   3  |   4  |   5  |    |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |   [  |   ]  |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- *               | ____ | Alt  | Bksp | Del  |    |Enter |Space | Alt  | ____ |
- *               |      |      | Ctrl | Gui  |    | Gui  | Ctrl |      |      |
- *               `---------------------------'    `---------------------------'
- */
-[_LOWER] = LAYOUT_split_3x6_4(
-    KC_ESC,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
-    KC_TRNS,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
-    KC_TRNS,  _______, _______, _______, _______, _______,   _______, _______, _______, KC_LBRC, KC_RBRC, KC_TRNS,
-                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-/* Raise
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |    | S+H  | S+A+L|  UP  | S+A+R| S+E  |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |  F6  |  F7  |  F8  |  F9  |  F10 |    | Home | Left | Down | Right| End  | PgUp |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |  F11 |  F12 |      |      |      |    | A+L  | S+L  | S+D  | S+R  | A+R  | PgDn |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- *               | ____ | Alt  | Bksp | Del  |    |Enter |Space | Alt  | ____ |
- *               |      |      | Ctrl | Gui  |    | Gui  | Ctrl |      |      |
- *               `---------------------------'    `---------------------------'
- */
-[_RAISE] = LAYOUT_split_3x6_4(
-    KC_TRNS, KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,     S(KC_HOME), S(A(KC_LEFT)), KC_UP,      S(A(KC_RGHT)), S(KC_END),  KC_TRNS,
-    KC_TRNS, KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_HOME,    KC_LEFT,       KC_DOWN,    KC_RGHT,       KC_END,     KC_PGUP,
-    KC_TRNS, KC_F11, KC_F12,  _______, _______, _______,   A(KC_LEFT), S(KC_LEFT),    S(KC_DOWN), S(KC_RGHT),    A(KC_RGHT), KC_PGDN ,
-                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-/* Adjust
- * ,-----------------------------------------.    ,-----------------------------------------.
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- *               | ____ | Alt  | Bksp | Del  |    |Enter |Space | Alt  | ____ |
- *               |      |      | Ctrl | Gui  |    | Gui  | Ctrl |      |      |
- *               `---------------------------'    `---------------------------'
- */
-[_ADJUST] = LAYOUT_split_3x6_4(
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-                      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-)
-
-};
-
-const uint16_t PROGMEM encoder_keymaps[][2][2] = {
-    [_QWERTY] =  { { C(S(KC_TAB)), C(KC_TAB) },     { G(A(KC_LEFT)), G(A(KC_RIGHT)) } },
-    [_LOWER]  =  { { C(KC_LEFT),   C(KC_RGHT) },    { KC_VOLD,       KC_VOLU } },
-    [_RAISE]  =  { { G(KC_LEFT),   G(KC_RGHT) },    { G(KC_TAB),     G(S(KC_TAB)) } },
-    [_ADJUST] =  { { KC_TRNS,      KC_TRNS },       { KC_TRNS,       KC_TRNS } },
-};
-// clang-format on
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    torn_set_led(0, IS_LAYER_ON_STATE(state, _RAISE));
-    torn_set_led(1, IS_LAYER_ON_STATE(state, _LOWER));
-    torn_set_led(2, IS_LAYER_ON_STATE(state, _ADJUST));
-    return state;
-}
-
-/*
- * Enable `HOLD_ON_OTHER_KEY_PRESS` only for `Shift`.
- * For more info see `HOLD_ON_OTHER_KEY_PRESS_PER_KEY` in `docs/tap_hold.md`.
- */
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case S_EQL:
-            return true;
-        case S_MINS:
-            return true;
-        default:
-            return false;
-    }
-}
-
-/*
- * Enable `PERMISSIVE_HOLD` for `Shift` modifers.
- * For more info see `PERMISSIVE_HOLD_PER_KEY` in `docs/tap_hold.md`.
- */
-
-bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case S_EQL:
-            return true;
-        case S_MINS:
-            return true;
-        default:
-            return false;
-    }
-}
diff --git a/keyboards/torn/keymaps/kinesish/readme.md b/keyboards/torn/keymaps/kinesish/readme.md
deleted file mode 100644
index 481602e5bce..00000000000
--- a/keyboards/torn/keymaps/kinesish/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# A Custom Keymap for [Torn](https://github.com/rtitmuss/torn)
-
-## Keymap
-This keymap was inspired by default layout of Kinesis Advantage.
-
-The main idea behind this keymap is that you have all modifiers as well as layer keys duplicated on both halves.
diff --git a/keyboards/torn/mcp23018.c b/keyboards/torn/mcp23018.c
index 12c4f9bc7f3..ba26e67ba9c 100644
--- a/keyboards/torn/mcp23018.c
+++ b/keyboards/torn/mcp23018.c
@@ -48,7 +48,7 @@ i2c_status_t mcp23018_writeReg(uint8_t regaddr, const uint8_t* data, uint16_t le
         return mcp23018_status;
     }
 
-    mcp23018_status = i2c_writeReg((MCP23018_ADDR << 1), regaddr, data, length, MCP23018_TIMEOUT);
+    mcp23018_status = i2c_write_register((MCP23018_ADDR << 1), regaddr, data, length, MCP23018_TIMEOUT);
     return mcp23018_status;
 }
 
@@ -57,6 +57,6 @@ i2c_status_t mcp23018_readReg(uint8_t regaddr, uint8_t* data, uint16_t length) {
         return mcp23018_status;
     }
 
-    mcp23018_status = i2c_readReg((MCP23018_ADDR << 1), regaddr, data, length, MCP23018_TIMEOUT);
+    mcp23018_status = i2c_read_register((MCP23018_ADDR << 1), regaddr, data, length, MCP23018_TIMEOUT);
     return mcp23018_status;
 }
diff --git a/keyboards/touchpad/matrix.c b/keyboards/touchpad/matrix.c
index 6bffb826bdd..87944cb7cc6 100644
--- a/keyboards/touchpad/matrix.c
+++ b/keyboards/touchpad/matrix.c
@@ -38,7 +38,7 @@ volatile uint8_t LEDs[6][6] = {{0}};//Stores current LED values
 //Read data from the cap touch IC
 uint8_t readDataFromTS(uint8_t reg) {
   uint8_t rx[1] = { 0 };
-  if (i2c_readReg(0x1C << 1, reg, rx, 1, 100) == 0) {
+  if (i2c_read_register(0x1C << 1, reg, rx, 1, 100) == 0) {
     return rx[0];
   }
   return 0;
diff --git a/keyboards/tr60w/keymaps/joule-flow/keymap.c b/keyboards/tr60w/keymaps/joule-flow/keymap.c
deleted file mode 100644
index 3adc9a84f98..00000000000
--- a/keyboards/tr60w/keymaps/joule-flow/keymap.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	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_BSLS, KC_GRV,
-        KC_TAB,  KC_Q,    KC_W,    		KC_E,    		KC_R,    		KC_T,    		KC_Z,    	KC_U,    	KC_I,    	KC_O,    	KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
-        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_Y,    		KC_X,    		KC_C,    		KC_V,    		KC_B,    	KC_N,    	KC_M,    	KC_COMM, 	KC_DOT,  KC_MINS, KC_LSFT, TG(1),
-				KC_LCTL, KC_LGUI, KC_LALT,                                				KC_SPC,                          								 KC_RALT, KC_F12, KC_RCTL
-			),
-
-    LAYOUT_60_tsangan_hhkb(
-        QK_BOOT, 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_NUHS, KC_NUBS,
-        _______, KC_BSPC, KC_UP, 			KC_ENT, 		_______, 		_______, 		_______, 	KC_WH_U, 	KC_BTN1 , KC_MS_U , KC_BTN2, KC_WH_L, _______, KC_DEL,
-        _______, KC_LEFT, KC_DOWN,		KC_RIGHT, 	_______, 		_______, 		_______, 	KC_WH_D, 	KC_MS_L , KC_MS_D , KC_MS_R, KC_WH_R,          _______,
-        _______,          RCTL(KC_Y), RCTL(KC_X),	RCTL(KC_C),	RCTL(KC_V),	_______,  _______, 	_______, 	_______, 	_______, _______, _______, _______,
-        _______, _______, _______,                                				_______,                         								 _______, _______, _______
-    )
-
-};
diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json
index a674acb2759..9c3474c32ed 100644
--- a/keyboards/trashman/ketch/info.json
+++ b/keyboards/trashman/ketch/info.json
@@ -130,7 +130,7 @@
 
         {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
         {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5},
-        {"matrix": [3, 0], "x": 2.75, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25},
         {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
         {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
         {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5},
diff --git a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/config.h b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/config.h
deleted file mode 100644
index 64f73ab021a..00000000000
--- a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
-Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define TAPPING_TERM 150
diff --git a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c b/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
deleted file mode 100644
index 7b7b565c0fc..00000000000
--- a/keyboards/trashman/ketch/keymaps/jetpacktuxedo/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 
-Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include QMK_KEYBOARD_H
-#include <config.h>
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_jetvan( /* Qwerty */
-        QK_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,
-        LT(2, KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    KC_SCLN, LT(2, KC_ENT),
-        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_UP,   MT(MOD_RSFT, KC_SLSH),
-        KC_LCTL,       KC_LGUI, KC_LALT,                   LT(1, KC_SPC),                     KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-    [1] = LAYOUT_jetvan( /* LAYER 1 */
-        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_TRNS, KC_MINS, KC_EQL,  KC_SCLN, KC_QUOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_QUOT, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_PGUP, KC_BSLS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_HOME, KC_PGDN, KC_END
-    ),
-    [2] = LAYOUT_jetvan( /* LAYER 2 */
-        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_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PGUP, KC_PIPE,
-        KC_TRNS, TG(4),   MO(3),                              KC_TRNS,                   KC_HOME, KC_PGDN, KC_END
-    ),
-    [3] = LAYOUT_jetvan( /* LAYER 3 */
-        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
-    ),
-    [4] = LAYOUT_jetvan( /* Gaming Layer*/
-        KC_ESC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
-        KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(5, KC_SLSH),
-        KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [5] = LAYOUT_jetvan( /* QK_BOOT Layer*/
-        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
-
-const rgblight_segment_t PROGMEM layer1[] = RGBLIGHT_LAYER_SEGMENTS(
-    {9, 1, HSV_RED}
-);
-
-const rgblight_segment_t PROGMEM layer2[] = RGBLIGHT_LAYER_SEGMENTS(
-    {9, 1, HSV_GREEN}
-);
-
-const rgblight_segment_t PROGMEM layer3[] = RGBLIGHT_LAYER_SEGMENTS(
-    {8, 1, HSV_CYAN}
-);
-
-const rgblight_segment_t PROGMEM layer4[] = RGBLIGHT_LAYER_SEGMENTS(
-    {8, 1, HSV_MAGENTA}
-);
-
-const rgblight_segment_t PROGMEM layer5[] = RGBLIGHT_LAYER_SEGMENTS(
-    {8, 1, HSV_YELLOW}
-);
-
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    layer1,
-    layer2,
-    layer3,
-    layer4,
-    layer5
-);
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(1, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 3));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 4));
-    rgblight_set_layer_state(4, layer_state_cmp(state, 5));
-    return state;
-}
-
-void keyboard_post_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-        // Litearlly just doing this to lower the brightness. Since I am about to
-        // turn on the rainbow effect which changes the hue I don't actually care
-        // what that gets set to, but I am also lowering the saturation to get more
-        // of a pastel feel
-        rgblight_sethsv_noeeprom(0, 192, 128);
-        // Set LED effects to rainbow
-        rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
-        rgblight_layers = my_rgb_layers;
-    #endif //RGBLIGHT_ENABLE
-}
diff --git a/keyboards/treasure/type9s3/config.h b/keyboards/treasure/type9s3/config.h
deleted file mode 100644
index b87cd59b2f2..00000000000
--- a/keyboards/treasure/type9s3/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2023 Treasure
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 9
-
-#define RGB_MATRIX_DEFAULT_SPD 40  // Sets the default animation speed, if none has been set
-#define RGB_MATRIX_DEFAULT_VAL 120
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
diff --git a/keyboards/treasure/type9s3/info.json b/keyboards/treasure/type9s3/info.json
index 8e9c9fa38f1..cb2bcf3a7a7 100644
--- a/keyboards/treasure/type9s3/info.json
+++ b/keyboards/treasure/type9s3/info.json
@@ -31,6 +31,28 @@
         "pin": "B6"
     },
     "rgb_matrix": {
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "jellybean_raindrops": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "default": {
+            "speed": 40,
+            "val": 120
+        },
         "driver": "ws2812",
         "layout": [
             { "matrix": [2, 0],"flags": 4, "x": 0, "y": 20 },
@@ -42,7 +64,8 @@
             { "matrix": [0, 0],"flags": 4, "x": 0, "y": 0 },
             { "matrix": [0, 1],"flags": 4, "x": 10, "y": 0 },
             { "matrix": [0, 2],"flags": 4, "x": 20, "y": 0 }
-        ]
+        ],
+        "sleep": true
     },
     "community_layouts": ["ortho_3x3"],
     "layouts": {
diff --git a/keyboards/tunks/ergo33/keymaps/default/config.h b/keyboards/tunks/ergo33/keymaps/default/config.h
index 33edf0b03cc..3ca11c66a66 100644
--- a/keyboards/tunks/ergo33/keymaps/default/config.h
+++ b/keyboards/tunks/ergo33/keymaps/default/config.h
@@ -20,7 +20,7 @@
  * No external LED PCB: 10
  * External LED PCB: 14
  */
-#define RGBLED_NUM 14
+#define RGBLIGHT_LED_COUNT 14
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tunks/ergo33/keymaps/prpro/config.h b/keyboards/tunks/ergo33/keymaps/prpro/config.h
deleted file mode 100644
index 4fc3b213225..00000000000
--- a/keyboards/tunks/ergo33/keymaps/prpro/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 Mika Kuitunen 
-  * 
-  * 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
-
-/* RGB LED count
- * No external LED PCB: 10
- * External LED PCB: 14
- */
-#define RGBLED_NUM 14
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_SLEEP
-
-/* Tap dance delay in ms */
-#define TAPPING_TERM 175
\ No newline at end of file
diff --git a/keyboards/tunks/ergo33/keymaps/prpro/keymap.c b/keyboards/tunks/ergo33/keymaps/prpro/keymap.c
deleted file mode 100644
index 8751f651263..00000000000
--- a/keyboards/tunks/ergo33/keymaps/prpro/keymap.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* Copyright 2020 Mika Kuitunen
-  *
-  * 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_finnish.h"
-
-enum layers {
-    _BASE = 0,
-    _PRPRO,
-    _PRPRO2,
-};
-
-/* Tap Dance declarations */
-enum {
-    TD_1,
-    TD_2,
-    TD_3,
-    TD_4,
-    TD_5,
-    TD_6,
-    TD_COMMA,
-    TD_HOME,
-    TD_K,
-    TD_DEL,
-    TD_X,
-    TD_C,
-    TD_V,
-    TD_Z
-};
-
-/* Tap Dance definitions */
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_1] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_1), LCTL(LSFT(KC_1))),
-    [TD_2] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_2), LCTL(LSFT(KC_2))),
-    [TD_3] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_3), LCTL(LSFT(KC_3))),
-    [TD_4] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_4), LCTL(LSFT(KC_4))),
-    [TD_5] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_5), LCTL(LSFT(KC_5))),
-    [TD_6] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_6), LCTL(LSFT(KC_6))),
-    [TD_COMMA] = ACTION_TAP_DANCE_DOUBLE(KC_COMMA, KC_DOT),
-    [TD_HOME] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
-    [TD_K] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_K), LCTL(LSFT(KC_K))),
-    [TD_DEL] = ACTION_TAP_DANCE_DOUBLE(KC_DEL, LSFT(KC_DEL)),
-    [TD_X] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_X), KC_S),
-    [TD_C] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), KC_M),
-    [TD_V] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_V), LCTL(KC_L)),
-    [TD_Z] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_Z), LCTL(LSFT(KC_Z)))
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_BASE] = LAYOUT(
-        KC_ESC,  KC_0,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-        KC_Y,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
-        KC_H,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-        KC_N,    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    TG(_PRPRO),
-        KC_LGUI, KC_LCTL,                                                KC_ENT,
-                                               KC_LALT,  KC_SPC,  KC_ENT
-    ),
-
-    [_PRPRO] = LAYOUT(
-        KC_ESC,     KC_M,        KC_V,         KC_UP,      KC_A,       KC_Y,       KC_C,
-        KC_1,       KC_2,        KC_LEFT,      KC_DOWN,    KC_RIGHT,   TD(TD_Z),   TD(TD_DEL),
-        FI_SECT,    TD(TD_HOME), KC_J,         KC_K,       KC_L,       TD(TD_K),   TG(_PRPRO2),
-        KC_S,       KC_LSFT,     LCTL(KC_X),   LCTL(KC_C), LCTL(KC_V), LCTL(KC_S), TG(_PRPRO),
-        LCTL(KC_L), KC_LCTL,                                                                   KC_ENT,
-                                                                  KC_LALT,     KC_SPC,  KC_ENT
-    ),
-
-    [_PRPRO2] = LAYOUT(
-        KC_TRNS, KC_TRNS, TD(TD_1), TD(TD_2), TD(TD_3),     TD(TD_4), TD(TD_5),
-        KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_I,     KC_O,     TD(TD_COMMA), KC_TRNS,  TG(_PRPRO2),
-        KC_TRNS, KC_TRNS,                                                         KC_TRNS,
-                                                      KC_TRNS,   KC_TRNS, KC_TRNS
-    ),
-};
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_MS_WH_DOWN);
-        } else {
-            tap_code(KC_MS_WH_UP);
-        }
-    }
-    return true;
-}
-#endif
-
-#ifdef RGBLIGHT_LAYERS
-#define HUE_PRIMARY 10
-#define HSV_PRIMARY HUE_PRIMARY, 255, 255
-#define HSV_CAPS HUE_PRIMARY, 255, 64
-#define HSV_LAYER_BASE HUE_PRIMARY, 255, 64
-#define HSV_LAYER_PRPRO 213, 255, 64
-#define HSV_LAYER_PRPRO2 184, 255, 64
-
-const rgblight_segment_t PROGMEM ug_default_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 14, HSV_PRIMARY},
-    {10, 4, HSV_OFF}
-);
-
-const rgblight_segment_t PROGMEM ug_caps_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {11, 1, HSV_CAPS}
-);
-
-const rgblight_segment_t PROGMEM ug_base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {13, 1, HSV_LAYER_BASE}
-);
-
-const rgblight_segment_t PROGMEM ug_prpro_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {13, 1, HSV_LAYER_PRPRO}
-);
-
-const rgblight_segment_t PROGMEM ug_prpro2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {13, 1, HSV_LAYER_PRPRO2}
-);
-
-/* Define layer order, later layers take precedence */
-const rgblight_segment_t* const PROGMEM ug_layers[] = RGBLIGHT_LAYERS_LIST(
-    ug_default_layer,
-    ug_caps_layer,
-    ug_base_layer,
-    ug_prpro_layer,
-    ug_prpro2_layer
-);
-
-void keyboard_post_init_user(void) {
-    /* Enable the LED layers */
-    rgblight_layers = ug_layers;
-    rgblight_set_layer_state(0, true);
-    rgblight_set_layer_state(2, true);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, true);
-    /* Both layers will light up if both kb layers are active */
-    rgblight_set_layer_state(2, layer_state_cmp(state, 0));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(4, layer_state_cmp(state, 2));
-    return state;
-}
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(1, led_state.caps_lock);
-    return true;
-}
-#endif
diff --git a/keyboards/tunks/ergo33/keymaps/prpro/readme.md b/keyboards/tunks/ergo33/keymaps/prpro/readme.md
deleted file mode 100644
index d9507df7384..00000000000
--- a/keyboards/tunks/ergo33/keymaps/prpro/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ergo33 Premiere Pro  Layout
-
-Default layout + Premiere pro editing layout for Ergo33.
-
-On this layout, the second and third layers are Adobe Premiere Pro hotkeys. You'll need to use [My custom shortcuts](https://github.com/kulmajaba/tunks-keyboard/blob/master/Ergo33%20prpro.kys) for it to work.
diff --git a/keyboards/tunks/ergo33/keymaps/prpro/rules.mk b/keyboards/tunks/ergo33/keymaps/prpro/rules.mk
deleted file mode 100644
index 2176e6dc2b9..00000000000
--- a/keyboards/tunks/ergo33/keymaps/prpro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes      # Tap dance
\ No newline at end of file
diff --git a/keyboards/tunks/ergo33/keymaps/rgb/config.h b/keyboards/tunks/ergo33/keymaps/rgb/config.h
index 60cee638d25..036bcf81b8f 100644
--- a/keyboards/tunks/ergo33/keymaps/rgb/config.h
+++ b/keyboards/tunks/ergo33/keymaps/rgb/config.h
@@ -20,9 +20,9 @@
  * No external LED PCB: 10
  * External LED PCB: 14
  */
-#if defined(RGBLED_NUM)
-#    undef RGBLED_NUM
-#    define RGBLED_NUM 10
+#if defined(RGBLIGHT_LED_COUNT)
+#    undef RGBLIGHT_LED_COUNT
+#    define RGBLIGHT_LED_COUNT 10
 #endif
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/tw40/readme.md b/keyboards/tw40/readme.md
deleted file mode 100644
index 7db7378590a..00000000000
--- a/keyboards/tw40/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Training Wheel 40
-
-![tw40](https://cdn.shopify.com/s/files/1/0501/7537/7592/products/tw40_600x.jpg?v=1607835284)
-
-* Keyboard Maintainer: [KnoblesseOblige](https://github.com/KnoblesseOblige)
-* Hardware Supported: Training Wheel 40 PCB
-* Hardware Availability: https://p3dstore.com/products/tw40-gb
-
-Make example for this keyboard (after setting up your build environment):
-
-    make tw40:default
-
-
-To flash a new firmware plug in the keyboard while holding Esc (top left key) and then run the commands below.
-
-Flashing example for this keyboard:
-
-    make tw40: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/tweetydabird/chameleon/config.h b/keyboards/tweetydabird/chameleon/config.h
deleted file mode 100644
index ba31336014e..00000000000
--- a/keyboards/tweetydabird/chameleon/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2023 Markus Knutsson (@TweetyDaBird)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/keyboards/tweetydabird/lotus58/config.h b/keyboards/tweetydabird/lotus58/config.h
deleted file mode 100644
index 4175568d403..00000000000
--- a/keyboards/tweetydabird/lotus58/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 Markus Knutsson (@TweetyDaBird)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// Options not yet fully implemented in info.json
-#define RGBLIGHT_DEFAULT_VAL 87
-
-#define SPLIT_HAND_PIN B5
diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json
index 4e41fcc7bde..646843e7652 100644
--- a/keyboards/tweetydabird/lotus58/info.json
+++ b/keyboards/tweetydabird/lotus58/info.json
@@ -16,11 +16,11 @@
         "bootmagic": true,
         "command": false,
         "console": false,
+        "encoder": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "oled": true,
-        "encoder": true,
         "rgblight": true,
         "split": true,
         "tri_layer": true
@@ -32,14 +32,14 @@
     "pin_compatible": "promicro",
     "processor": "atmega32u4",
     "rgblight": {
+        "default": {
+            "val": 87
+        },
         "led_count": 70,
-        "split": true,
-        "split_count": [35, 35],
+        "max_brightness": 175,
         "sleep": true,
-        "max_brightness": 175
-    },
-    "ws2812": {
-        "pin": "D3"
+        "split": true,
+        "split_count": [35, 35]
     },
     "split": {
         "bootmagic": {
@@ -53,6 +53,9 @@
                 ]
             }
         },
+        "handedness": {
+            "pin": "B5"
+        },
         "soft_serial_pin": "D2",
         "transport": {
             "protocol": "serial",
@@ -70,10 +73,13 @@
     },
     "url": "https://lectronz.com/stores/tweetys-wild-thinking",
     "usb": {
-        "vid": "0xFEED",
-        "pid": "0x23B0",
         "device_version": "1.2.3",
-        "force_nkro": true
+        "force_nkro": true,
+        "pid": "0x23B0",
+        "vid": "0xFEED"
+    },
+    "ws2812": {
+        "pin": "D3"
     },
     "layouts": {
         "LAYOUT": {
@@ -141,4 +147,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lotus58/keymaps/default/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
index 2a74f1b9a9d..4cb6b4cfe79 100644
--- a/keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
+++ b/keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
@@ -4,10 +4,10 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-      KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MPLY,        KC_MPLY, 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_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-      KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                             KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-LCTL_T(KC_LEFT), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DOWN,        KC_UP,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RCTL_T(KC_RGHT),
+        QK_GESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MPLY,        KC_MPLY, 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_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+        KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                             KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        LCTL_T(KC_LEFT), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DOWN,        KC_UP,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RCTL_T(KC_RGHT),
                                    KC_LGUI, TG(2),   KC_LALT, LSFT_T(KC_SPC), RSFT_T(KC_ENT),   KC_RALT, TG(1), RGUI_T(KC_BSPC)
     ),
 
@@ -28,8 +28,8 @@ LCTL_T(KC_LEFT), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DOWN,        KC
     ),
 
     [3] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,        _______, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_SAI, RGB_TOG,
-        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                          XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD,RGB_SAD, RGB_M_P,
+        QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, AC_TOGG, _______,        _______, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_SAI, RGB_TOG,
+        QK_RBT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                          XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD,RGB_SAD, RGB_M_P,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS,                          XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_VAI, RGB_M_B,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_VAD, RGB_M_R,
                                    _______, _______, _______, _______,        _______, _______, _______, _______ 
@@ -39,9 +39,9 @@ LCTL_T(KC_LEFT), KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DOWN,        KC
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
 };
 #endif
 
@@ -76,6 +76,16 @@ static void print_status_narrow(void) {
     led_t led_usb_state = host_keyboard_led_state();
     oled_write_ln_P(PSTR("Caps- lock"), led_usb_state.caps_lock);
     
+#ifdef AUTO_SHIFT_ENABLE
+
+    bool autoshift = get_autoshift_state();
+    oled_advance_page(true);
+    oled_write_P(PSTR("Auto-Shift"), autoshift);
+    oled_advance_page(true);
+    
+#endif
+
+    
 }
 
 bool oled_task_user(void) {
@@ -83,4 +93,5 @@ bool oled_task_user(void) {
     print_status_narrow();
     return false;
 }
+
 #endif
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lotus58/rules.mk b/keyboards/tweetydabird/lotus58/rules.mk
new file mode 100644
index 00000000000..4cd2262cc77
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = tweetydabird/lotus58/promicro
\ No newline at end of file
diff --git a/keyboards/tzarc/djinn/rev1/config.h b/keyboards/tzarc/djinn/rev1/config.h
index cdcabed05c0..7c8dc042f31 100644
--- a/keyboards/tzarc/djinn/rev1/config.h
+++ b/keyboards/tzarc/djinn/rev1/config.h
@@ -14,9 +14,6 @@
 #endif // SERIAL_USART_SPEED
 
 // RGB configuration
-#define RGB_MATRIX_LED_COUNT 84
-#define RGB_MATRIX_SPLIT \
-    { 42, 42 }
 #define RGB_POWER_ENABLE_PIN B1
 #define RGB_CURR_1500mA_OK_PIN B0
 #define RGB_CURR_3000mA_OK_PIN C5
diff --git a/keyboards/tzarc/djinn/rev1/info.json b/keyboards/tzarc/djinn/rev1/info.json
index 8a77a0fdc1a..a0422dea93d 100644
--- a/keyboards/tzarc/djinn/rev1/info.json
+++ b/keyboards/tzarc/djinn/rev1/info.json
@@ -97,6 +97,7 @@
       {"flags": 4, "matrix": [6, 4], "x": 120, "y": 30},
       {"flags": 4, "matrix": [6, 5], "x": 94, "y": 30},
       {"flags": 4, "matrix": [6, 6], "x": 68, "y": 30}
-    ]
+    ],
+    "split_count": [42, 42]
   }
 }
diff --git a/keyboards/tzarc/djinn/rev2/config.h b/keyboards/tzarc/djinn/rev2/config.h
index 00a893ff650..bc7fcb3712b 100644
--- a/keyboards/tzarc/djinn/rev2/config.h
+++ b/keyboards/tzarc/djinn/rev2/config.h
@@ -17,9 +17,6 @@
 #define SERIAL_USART_FULL_DUPLEX
 
 // RGB configuration
-#define RGB_MATRIX_LED_COUNT 86
-#define RGB_MATRIX_SPLIT \
-    { 43, 43 }
 #define RGB_POWER_ENABLE_PIN B0
 #define RGB_CURR_1500mA_OK_PIN C5
 #define RGB_CURR_3000mA_OK_PIN C4
diff --git a/keyboards/tzarc/djinn/rev2/info.json b/keyboards/tzarc/djinn/rev2/info.json
index a8716209ea6..33db91971eb 100644
--- a/keyboards/tzarc/djinn/rev2/info.json
+++ b/keyboards/tzarc/djinn/rev2/info.json
@@ -98,6 +98,7 @@
       {"flags": 4, "matrix": [6, 4], "x": 120, "y": 30},
       {"flags": 4, "matrix": [6, 5], "x": 94, "y": 30},
       {"flags": 4, "matrix": [6, 6], "x": 68, "y": 30}
-    ]
+    ],
+    "split_count": [43, 43]
   }
 }
diff --git a/keyboards/tzarc/ghoul/config.h b/keyboards/tzarc/ghoul/config.h
index 402f14cd924..4709151e8df 100644
--- a/keyboards/tzarc/ghoul/config.h
+++ b/keyboards/tzarc/ghoul/config.h
@@ -9,6 +9,3 @@
 
 // EEPROM configuration
 #define EEPROM_SPI_MB85RS64V
-
-// RGB configuration
-#define RGB_MATRIX_LED_COUNT 40
diff --git a/keyboards/uk78/keymaps/rask/README.md b/keyboards/uk78/keymaps/rask/README.md
deleted file mode 100644
index c9740c9f891..00000000000
--- a/keyboards/uk78/keymaps/rask/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# rask's UK78 Layout
-
-![UK78 Layout](https://i.imgur.com/46trAbD.png)
-
-### Update 2018-03-10
-
-Added `RGB_MOD` key on layer two to the `F` key location, allows
-shuffling between underglow animation modes.
-
-## Flashing
-
-Plug the keyboard in and press the reset button, then in the main
-`qmk_firmware` directory run
-
-    $ sudo make uk78:rask:dfu
diff --git a/keyboards/uk78/keymaps/rask/keymap.c b/keyboards/uk78/keymaps/rask/keymap.c
deleted file mode 100644
index 01220a775ea..00000000000
--- a/keyboards/uk78/keymaps/rask/keymap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#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.
-#define _BL 0
-#define _FL1 1
-#define _FL2 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* _BL: Base Layer(Default) - For ISO enter use ANSI
-   * ,-------------------------------------------------------------------------------.
-   * |`   | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| \|Del |NLck|  P/|  P*|  P-|
-   * |-------------------------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Bspc |  P7|  P8|  P9|    |
-   * |--------------------------------------------------------------------------|  P+|
-   * | L1    |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|    Ent|  P4|  P5|  P6|    |
-   * |-------------------------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| L2   | Up|  P1|  P2|  P3|    |
-   * |--------------------------------------------------------------------------|PEnt|
-   * |Ctrl  |Alt   |        Space        |AltGr  |Win    |Lef|Dow| Rig|  P0|  P.|    |
-   * `-------------------------------------------------------------------------------'
-   */
-  [_BL] = LAYOUT_all(
-    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_BSLS,  KC_DEL,  KC_NUM,  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_BSPC, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    MO(_FL1),KC_A,    KC_S,    KC_D,   KC_F,    KC_G,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,           KC_ENT,  KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_LSFT, KC_LSFT, KC_Z,    KC_X,   KC_C,    KC_V,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_FL2),MO(_FL2), KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LCTL, KC_LALT, KC_LALT,                         KC_SPC,                             KC_RALT, KC_LGUI, KC_LGUI, KC_LEFT,  KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
-  ),
-
-  /* _FL1: Function Layer 1 - For ISO enter use ANSI
-   * ,-------------------------------------------------------------------------------.
-   * |Esc|F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|PScr|Ins|    |    |    |    |
-   * |-------------------------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |    |    |    |
-   * |-------------------------------------------------------------------------------|
-   * |       |   |   |   |   |   |   |   |   |   |   |   |       |    |    |    |    |
-   * |-------------------------------------------------------------------------------|
-   * |         |   |   |   |   |   |   |   |   |   |   |    |PgUp|    |    |    |    |
-   * |-------------------------------------------------------------------------------|
-   * |       |      |                      |     |     |Home|PgDn|End |    |    |    |
-   * `-------------------------------------------------------------------------------'
-   */
-  [_FL1] = 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_PSCR, KC_INS,  _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, _______
-  ),
-
-  /* _FL2: Function Layer 2 - For ISO enter use ANSI
-   * ,-------------------------------------------------------------------------------.
-   * |   |  |   |   |   |   |   |   |   |   |   |   |   |    |   |    |    |    |    |
-   * |-------------------------------------------------------------------------------|
-   * |     |   |   |   |RST|   |   |   |   |Prv|Ply|Nxt|   |     |    |    |    |    |
-   * |-------------------------------------------------------------------------------|
-   * |Caps   |   |   |uln|Hu+|Va+|Sa+|   |   |Vod|Vou|Mut|  |    |    |    |    |    |
-   * |-------------------------------------------------------------------------------|
-   * |         |   |   |RGB|Hu-|Va-|Sa-|Bl-|Bl+|Stp|   |    |    |    |    |    |    |
-   * |-------------------------------------------------------------------------------|
-   * |       |Menu  |       BL_Toggle      |     |     |    |    |    |    |    |    |
-   * `-------------------------------------------------------------------------------'
-   */
-  [_FL2] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,          _______, _______, _______, _______, _______,
-    KC_CAPS, _______, _______, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DOWN, BL_UP,   KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_APP,  KC_APP,                             BL_TOGG,                            _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-};
-
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    DDRA |= (1 << 3); PORTA |= (1 << 3);
-  } else {
-    DDRA &= ~(1 << 3); PORTA &= ~(1 << 3);
-  }
-  return false;
-}
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index f3431bd412f..70dfd10d97a 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -18,66 +18,3 @@
 /* Midi Slider */
 #define SLIDER_PIN F6
 #define MIDI_ADVANCED
-
-/* RGB Matrix configuration */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 22
-#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-// #    define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 50  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL  // default mode
-
-// 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
-// #    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
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
index 5474bc5279f..d9d0ea30edd 100644
--- a/keyboards/ungodly/launch_pad/info.json
+++ b/keyboards/ungodly/launch_pad/info.json
@@ -9,10 +9,19 @@
     "device_version": "99.9.9"
   },
   "rgb_matrix": {
+    "animations": {
+      "gradient_left_right": true,
+      "cycle_pinwheel": true
+    },
+    "default": {
+      "animation": "cycle_pinwheel"
+    },
     "driver": "ws2812",
+    "max_brightness": 150,
     "sat_steps": 8,
     "val_steps": 8,
-    "speed_steps": 10
+    "speed_steps": 10,
+    "sleep": true
   },
   "matrix_pins": {
     "cols": ["B0", "B1", "B2", "B3"],
diff --git a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
deleted file mode 100644
index e3292dd30c8..00000000000
--- a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/* Copyright 2020 Ungodly Design <hello@ungodly.design>
- *
- * 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 "analog.h"
-#include "qmk_midi.h"
-
-/* Force Numlock on */
-void matrix_init_user (void) {
-  if (!host_keyboard_led_state().num_lock) {
-      tap_code(KC_NUM_LOCK);
-  }
-}
-
-// Tap Dance declarations
-enum {
-    TD_ESC_TAB,
-    TD_NUMLOCK_L1,
-    TD_3_L0
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Escape, twice for Number 4 (armor plates in warzone)
-    [TD_ESC_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_TAB),
-    [TD_3_L0] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_3, 1),
-    [TD_NUMLOCK_L1] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_NUM_LOCK, 1),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Numpad Layer
-  * ,-------------------.
-  * | NV | /  | *  |BK/FN|
-  * |----|----|----|-----|
-  * | 7  | 8  | 9  |  -  |
-  * |----|----|----|-----|
-  * | 4  | 5  | 6  |  +  |
-  * |----|----|----|-----|
-  * | 1  | 2  | 3  | En  |
-  * |----|----|----|-----|
-  * | 0  | 0  | .  | En  |
-  * `--------------------'
-  */
-  [0] = LAYOUT_ortho_5x4(
-   TD(TD_NUMLOCK_L1),  KC_PSLS,  KC_PAST, LT(2, KC_BSPC),
-   KC_P7,    KC_P8,    KC_P9,        KC_PMNS,
-   KC_P4,    KC_P5,    KC_P6,        KC_PPLS,
-   KC_P1,    KC_P2,    KC_P3,        KC_PENT,
-   KC_P0,    KC_P0,  KC_PDOT,        KC_PENT
-  ),
-  /* Keymap _WAR: (Warzone Layer) Default Numpad Layer for COD Warzone N00BS
-  * ,-------------------.
-  * | R  | F  | V  | Spc |
-  * |----|----|----|-----|
-  * | E  | D  | C  | Alt |
-  * |----|----|----|-----|
-  * | W  | S  | X  |  4  |
-  * |----|----|----|-----|
-  * | Q  | A  | Z  |  3  |
-  * |----|----|----|-----|
-  * | Esc|Ctrl|Shift| M |
-  * `--------------------'
-  */
-  [1] = LAYOUT_ortho_5x4(
-    KC_R,    KC_F,    KC_V,     KC_SPACE,
-    KC_E,    KC_D,    KC_C,     KC_LALT,
-    KC_W,    KC_S,    KC_X,     KC_4,
-    KC_Q,    KC_A,    KC_Z,     TD(TD_3_L0),
-    TD(TD_ESC_TAB),    KC_LCTL,  KC_LSFT,   KC_M
-  ),
-  /* Keymap _FN: RGB Function Layer
-   * ,-------------------.
-   * |LAYR|    |    |RTOG|
-   * |----|----|----|----|
-   * |HUD |HUI |    |RGBP|
-   * |----|----|----|----|
-   * |SAD |SAI |    |RMOD|
-   * |----|----|----|----|
-   * |VAD |VAS |    |    |
-   * |----|----|----|----|
-   * |RST |RST |    |    |
-   * `-------------------'
-   */
-    [2] = LAYOUT_ortho_5x4(
-      KC_LUP,  XXXXXXX,  XXXXXXX,   RGB_TOG,
-      RGB_HUD,  RGB_HUI,  XXXXXXX,   RGB_M_P,
-      RGB_SAD,  RGB_SAI,  XXXXXXX,   RGB_MOD,
-      RGB_VAD,  RGB_VAI,  XXXXXXX,   XXXXXXX,
-        QK_BOOT,  QK_BOOT,  XXXXXXX,   XXXXXXX
-  ),
-};
-
-// (Optional) Rotary Encoder, Volume Control
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (clockwise) {
-      tap_code(KC_VOLU);
-  } else {
-      tap_code(KC_VOLD);
-  }
-  return true;
-}
-
-// Potentiometer Slider, MIDI Control
-uint8_t divisor = 0;
-void slider(void){
-  if (divisor++) { // only run the slider function 1/256 times it's called
-      return;
-  }
-  midi_send_cc(&midi_device, 2, 0x3E, 0x7F - (analogReadPin(SLIDER_PIN) >> 3));
-}
-
-void matrix_scan_user(void) {
-  slider();
-}
-
-// 0.91" OLED, 128x32 resolution
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-static void render_rocket_logo(void) {
-  static const char PROGMEM rocket_logo[]={
-    // Rocket Screen
-    // 'home', 128x32px
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x20, 0x50, 0x50, 0x90,
-    0x10, 0x10, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80,
-    0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x10, 0x10, 0xf0, 0x10, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04,
-    0x04, 0xfc, 0xfc, 0xfc, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0xfc, 0x7c, 0x7e, 0x7e, 0x7f,
-    0x81, 0x81, 0x81, 0x81, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff,
-    0xff, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0x01, 0x01, 0x01, 0xf9, 0x01, 0xf9, 0x01,
-    0xf9, 0x01, 0xf9, 0x01, 0x01, 0x01, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe6,
-    0xe6, 0xe6, 0xe6, 0xe6, 0xff, 0x8c, 0x52, 0x52, 0x52, 0xde, 0x84, 0x08, 0x84, 0x08, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04,
-    0x05, 0x05, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x07, 0x04, 0x04, 0x08, 0x08, 0x08, 0x10, 0x10,
-    0x10, 0x1f, 0x1f, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f, 0x10, 0x20, 0x20, 0x40,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7f,
-    0x7f, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x40, 0x40, 0x40, 0x4a, 0x44, 0x4a, 0x40,
-    0x4f, 0x40, 0x4f, 0x40, 0x40, 0x40, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x9c,
-    0x9c, 0x9c, 0x9c, 0x1c, 0xff, 0x31, 0x4a, 0x4a, 0x4a, 0x7b, 0x10, 0x21, 0x10, 0x21, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
-  oled_write_raw_P(rocket_logo, sizeof(rocket_logo));
-}
-static void render_warzone_logo(void) {
-  static const char PROGMEM warzone_logo[]={
-    // Home Screen
-    // 'warzone_bit', 128x32px
-    0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xe0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0xe0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfe,
-    0xfc, 0xf0, 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0x7f, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x80, 0x00, 0x00, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0xc0, 0xc0, 0xc0,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xf8, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0x1f,
-    0x07, 0x01, 0x00, 0x00, 0x00, 0x03, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff,
-    0xff, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfe, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0x03, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x01, 0x0f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-    0x00, 0x03, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7e, 0x7e, 0x7e, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f,
-    0x1f, 0x07, 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7e, 0x7e, 0x7e, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x01, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x07, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x0f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7e, 0x00
-  };
-  oled_write_raw_P(warzone_logo, sizeof(warzone_logo));
-}
-static void render_light_logo(void) {
-  static const char PROGMEM light_logo[]={
-    // RGB Screen
-    // 'rgb', 128x32px
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x9c, 0x80, 0x80,
-    0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x20, 0x50, 0x50, 0x90,
-    0x10, 0x10, 0x20, 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,
-    0x80, 0x80, 0x80, 0x00, 0x00, 0xe0, 0x19, 0x04, 0x62, 0x11, 0x09, 0x04, 0x04, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x01, 0x02, 0x04, 0x19, 0x10, 0x10, 0xf0, 0x00, 0x00, 0xf0, 0x00, 0xf0, 0xe0, 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, 0xc7, 0x24, 0x04,
-    0x07, 0xe4, 0x24, 0x24, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04,
-    0x05, 0x05, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x88, 0x30, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x80, 0x40, 0x60, 0x30, 0x98, 0x08, 0x08, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x07, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x22, 0x24,
-    0x24, 0xc4, 0x44, 0x22, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1d, 0x01, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x03, 0x02, 0x02,
-    0x02, 0x03, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
-  oled_write_raw_P(light_logo, sizeof(light_logo));
-}
-
-bool oled_task_user(void) {
-  switch (get_highest_layer(layer_state)) {
-    case 0:
-      render_rocket_logo();
-      break;
-    case 1:
-      render_warzone_logo();
-      break;
-    case 2:
-      render_light_logo();
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR(" UND"), false);
-      break;
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/ungodly/launch_pad/keymaps/warzone/rules.mk b/keyboards/ungodly/launch_pad/keymaps/warzone/rules.mk
deleted file mode 100644
index 791d5ab5021..00000000000
--- a/keyboards/ungodly/launch_pad/keymaps/warzone/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/unikeyboard/diverge3/keymaps/workman/rules.mk b/keyboards/unikeyboard/diverge3/keymaps/workman/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/unikeyboard/diverge3/keymaps/workman/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/unison/keymaps/via/config.h b/keyboards/unison/keymaps/via/config.h
index 48fe417a5dc..07a2c9f5cc3 100644
--- a/keyboards/unison/keymaps/via/config.h
+++ b/keyboards/unison/keymaps/via/config.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-    #undef RGBLED_NUM
-    #define RGBLED_NUM 17 // Layer Indicator(2) + Rotary Encoder(5) + Optional(2) + Under(8)
+    #undef RGBLIGHT_LED_COUNT
+    #define RGBLIGHT_LED_COUNT 17 // Layer Indicator(2) + Rotary Encoder(5) + Optional(2) + Under(8)
 
     #undef RGBLIGHT_LED_MAP
     #define RGBLIGHT_LED_MAP {2, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16} // Left to Right to Under
diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/info.json
index 63320719943..43a3d9472c3 100644
--- a/keyboards/v60_type_r/info.json
+++ b/keyboards/v60_type_r/info.json
@@ -18,22 +18,6 @@
     "pin": "F7",
     "on_state": 0
   },
-  "rgblight": {
-    "driver": "custom",
-    "led_count": 1,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["60_ansi", "60_iso"],
diff --git a/keyboards/v60_type_r/keymaps/followingghosts/config.h b/keyboards/v60_type_r/keymaps/followingghosts/config.h
deleted file mode 100644
index a2612e2d322..00000000000
--- a/keyboards/v60_type_r/keymaps/followingghosts/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2018 Ben Lewis (FollowingGhosts)
- *
- * 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 V60_POLESTAR
-#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
deleted file mode 100644
index 419c9ad5a72..00000000000
--- a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright 2018 Ben Lewis (FollowingGhosts)
- *
- * 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 is adapted from the official ANSI layout provided by the KBP V60 Type R
-* as depicted in their manual and on the stock keycaps.
-*/
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap 0: Default Layer (Qwerty)
-   * CAPS opens Layer 1 if held, acts normally if tapped
-   * Tab is used for Mouse Layer (2)
-   * ,-----------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   Bs  |
-   * |-----------------------------------------------------------|
-   * |L2/Tab|  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
-   * |-----------------------------------------------------------|
-   * |L1/Caps|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|
-   * |LShift( |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| RShift)  |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space              |Fn0 |Gui |App|Ctrl|
-   * `-----------------------------------------------------------'
-   */
-  [0] = 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,
-	       LT(2, 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,
-	       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,
-	       SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,
-	       KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                                      MO(1),   KC_RGUI, KC_APP,  KC_RCTL),
-
-         /*
-         Keymap 1: FN Layer
-         AGSW swaps Alt and OS keys for Windows/Mac
-         RGB enabled
-         Backlight keys are swapped as firmware is backwards?
-         * ,-----------------------------------------------------------.
-         * |`  | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  Del  |
-         * |-----------------------------------------------------------|
-         * |     |   |Up |RGB|HUI|SAI|VAI|   |Prt|Scl|Pau|Up|   | Ins  |
-         * |-----------------------------------------------------------|
-         * |      |Lft|Dwn|Rig|HUD|SAD|VAD|   |Hme|PgU|Lef|Rig|        |
-         * |-----------------------------------------------------------|
-         * |        |BLD|BLT|BLI|   |VolD|VolU|Mut|End|PgD|Dwn|  QK_BOOT |
-         * |-----------------------------------------------------------|
-         * |    |    |    |                        |    |AGSW|    |    |
-         * `-----------------------------------------------------------'
-         */
-
-  [1] = 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,
-	       KC_TRNS,   KC_TRNS,  KC_UP,    RGB_TOG,  RGB_HUI, RGB_SAI, RGB_VAI,   KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS,
-	       KC_TRNS,   KC_LEFT,  KC_DOWN,  KC_RIGHT, RGB_HUD, RGB_SAD, RGB_VAD,   KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,          KC_TRNS,
-	       KC_TRNS,   BL_UP,   BL_STEP,  BL_DOWN, KC_TRNS,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN,           QK_BOOT,
-	       KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  AG_SWAP, KC_TRNS, KC_TRNS),
-
-/*
-Mouse Layer
-M1 = Mouse Button 1
-M2 = Mouse Button 2
-WASD are Up Left Right Down respectively
-* ,-----------------------------------------------------------.
-* |   |   |    |   |   |   |   |   |   |   |   |    |    |    |
-* |-----------------------------------------------------------|
-* |     | M1|MUP|M2 |   |   |   |   |   |   |   |MPLY|   |    |
-* |-----------------------------------------------------------|
-* |       |ML |MDN|MR |   |   |   |   |   |   |MPRV|MNXT|     |
-* |-----------------------------------------------------------|
-* |        |   |   |   |   |   |   |   |   |   |   |          |
-* |-----------------------------------------------------------|
-* |    |    |    |                         |    |    |   |    |
-* `-----------------------------------------------------------'
-*/
-         [2] = LAYOUT_60_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_BTN1,  KC_MS_U,    KC_BTN2,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,    KC_TRNS,          KC_TRNS,
-                KC_TRNS,   KC_MS_L,  KC_MS_D,  KC_MS_R, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT,          KC_TRNS,
-                KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,           QK_BOOT,
-                KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
-
-
-};
-
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-      // output low
-      DDRE  |=  (1<<PE6);
-      PORTE &= ~(1<<PE6);
-  }
-  else {
-      // Hi-Z
-      DDRE  &= ~(1<<PE6);
-      PORTE &= ~(1<<PE6);
-  }
-  return false;
-}
diff --git a/keyboards/v60_type_r/keymaps/followingghosts/readme.md b/keyboards/v60_type_r/keymaps/followingghosts/readme.md
deleted file mode 100644
index a7379a52ddd..00000000000
--- a/keyboards/v60_type_r/keymaps/followingghosts/readme.md
+++ /dev/null
@@ -1,61 +0,0 @@
-KB Paradise V60 Type R Customised Layout by FollowingGhosts
-======================
-
-This is my custom keymap for the Polestar Type R
-
-## Keymap Notes
-Supports Underglow lighting with RGB modifier keys and normal backlight
-Selectable swap between Alt and OS keys which is stored in EEPROM
-CAPSLOCK acts as FN when held/equivalent to MO1
-TAB acts as FN2 when held to provide a mouse layer with WASD and Q and E as left and right click respectively
-LShift and RShift have Space Cadet Shift enabled
-
-RGB colour setting is set to HSV to bring it in line with (QMK docs)([https://beta.docs.qmk.fm/features/feature_rgblight])
-R+/R- are hue, G+/G- are saturation and B+/B- are value
-
-```
- Keymap 0: Default/Windows Layer (Qwerty)
- * ,-----------------------------------------------------------.
- * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   Bs  |
- * |-----------------------------------------------------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
- * |-----------------------------------------------------------|
- * |CAP/MO1|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
- * |-----------------------------------------------------------|
- * |LShift  |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| RShift   |
- * |-----------------------------------------------------------|
- * |Ctrl|Gui |Alt |      Space              | MO1|Gui |App|Ctrl|
- *  -----------------------------------------------------------'
-
-
-Keymap 1: FN Layer
-   *  -----------------------------------------------------------.
-   * |  | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  Del  |
-   * |-----------------------------------------------------------|
-   * |     |   |Up |RGB|HUI|SAI|VAI|   |Prt|Scl|Pau|Up|   | Ins  |
-   * |-----------------------------------------------------------|
-   * |      |Lft|Dwn|Rig|HUD|SAD|VAD|   |Hme|PgU|Lef|Rig|        |
-   * |-----------------------------------------------------------|
-   * |        |BLD|BLT|BLI|   |VolD|VolU|Mut|End|PgD|Dwn|        |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                        |    |AGSW|    |    |
-   * '-----------------------------------------------------------'
-
-Mouse Layer
-   M1 = Mouse Button 1
-   M2 = Mouse Button 2
-   WASD are Up Left Right Down respectively
-   * ,-----------------------------------------------------------.
-   * |   |   |    |   |   |   |   |   |   |   |   |    |    |    |
-   * |-----------------------------------------------------------|
-   * |     | M1|MUP|M2 |   |   |   |   |   |   |   |MPLY|   |    |
-   * |-----------------------------------------------------------|
-   * |       |ML |MDN|MR |   |   |   |   |   |   |MNXT|MPRV|     |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------|
-   * |    |    |    |                         |    |    |   |    |
-   *  -----------------------------------------------------------'
-```
-### Build
-To build this keymap, simply run `make v60_type_r:followingghosts`.
diff --git a/keyboards/v60_type_r/keymaps/followingghosts/rules.mk b/keyboards/v60_type_r/keymaps/followingghosts/rules.mk
deleted file mode 100644
index a1b0120a6be..00000000000
--- a/keyboards/v60_type_r/keymaps/followingghosts/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-CONSOLE_ENABLE = no
diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/config.h b/keyboards/v60_type_r/keymaps/ifohancroft/config.h
deleted file mode 100644
index 3d26fae0316..00000000000
--- a/keyboards/v60_type_r/keymaps/ifohancroft/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 IFo Hancroft
- *
- * 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
-
-// place overrides here
-#ifdef V60_POLESTAR
-#undef V60_POLESTAR
-#endif
-#define USB_POLLING_INTERVAL_MS 1
-#define FORCE_NKRO
diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/keymap.c b/keyboards/v60_type_r/keymaps/ifohancroft/keymap.c
deleted file mode 100644
index c5ed0d7ed95..00000000000
--- a/keyboards/v60_type_r/keymaps/ifohancroft/keymap.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright 2021 IFo Hancroft
-  *
-  * 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] = {
-
-    /* Default Layer
-    * ------------------------------------------------------------------------------------------------------------------------------
-    * | `     || 1     || 2     || 3     || 4     || 5     || 6     || 7     || 8     || 9     || 0     || -     || =     || Bkspc |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * | Tab   || Q     || W     || E     || R     || T     || Y     || U     || I     || O     || P     || [     || ]     || \     |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * | ESC   || A     || S     || D     || F     || G     || H     || J     || K     || L     || ;     || "     ||       || Enter |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * | Shift || Z     || X     || C     || V     || B     || N     || M     || ,     || .     || /     ||       || Shift ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * | Ctrl  || Super || Alt   ||       || Space ||       ||       ||       ||       || TG(1) || Alt   || Super || Ctrl  ||       |
-    * ------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_60_ansi(
-        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_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_ESC,  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,                                      TG(1),   KC_RALT, KC_RGUI, KC_RCTL
-    ),
-
-    /* Function Layer
-    * ------------------------------------------------------------------------------------------------------------------------------
-    * |       || F1    || F2    || F3    || F4    || F5    || F6    || F7    || F8    || F9    || F10   || F11   || F12   || Del   |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       || Left  || Down  || Up    || Right ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_60_ansi(
-        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_DEL,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   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_TRNS
-    ),
-
-    /* Empty Layer
-    * ------------------------------------------------------------------------------------------------------------------------------
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_60_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_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-    /* Empty Layer
-    * ------------------------------------------------------------------------------------------------------------------------------
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * |----------------------------------------------------------------------------------------------------------------------------|
-    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
-    * ------------------------------------------------------------------------------------------------------------------------------
-    */
-    LAYOUT_60_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_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/readme.md b/keyboards/v60_type_r/keymaps/ifohancroft/readme.md
deleted file mode 100644
index c8106ae0cda..00000000000
--- a/keyboards/v60_type_r/keymaps/ifohancroft/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-![IFo Hancroft KBParadise V60 Type R Layout Image](https://i.imgur.com/3BGQS75.png)
-
-# IFo Hancroft's KBParadise V60 Type R Layout
-
- - Layer 1: A standard ANSI QWERTY layer.
- - Layer 2: A function layer. It contains the F1-12 keys, the arrow keys and the Del key.
- - Layer 3: An empty layer in-case I need something on-the-fly so I can remap with VIA.
- - Layer 4: An empty layer in-case I need something on-the-fly so I can remap with VIA.
-
-This keymap also sets the polling rate of the keyboard to 1ms, disables the MOUSEKEY, EXTRAKEY, BACKLIGHT, and RGBLIGHT features, and enables the following features:
-
- - NKRO (forced on)
- - VIA
diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk b/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk
deleted file mode 100644
index 03be782d45e..00000000000
--- a/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-NKRO_ENABLE = yes
-VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/v60_type_r/keymaps/vimouse/config.h b/keyboards/v60_type_r/keymaps/vimouse/config.h
deleted file mode 100644
index 285cb4fa238..00000000000
--- a/keyboards/v60_type_r/keymaps/vimouse/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2017 benlyall, 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
-
-#define V60_POLESTAR
-
-// place overrides here
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-#define MOUSEKEY_WHEEL_DELAY    0
diff --git a/keyboards/v60_type_r/keymaps/vimouse/keymap.c b/keyboards/v60_type_r/keymaps/vimouse/keymap.c
deleted file mode 100644
index 2eb06c05037..00000000000
--- a/keyboards/v60_type_r/keymaps/vimouse/keymap.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright 2017 benlyall, 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
-
-#define _____ KC_TRNS
-#define XXXXX KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap 0: Default Layer
-     * ,-----------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   Bs  |
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
-     * |-----------------------------------------------------------|
-     * |FN0   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |
-     * |-----------------------------------------------------------|
-     * |LShift  |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| RShift   |
-     * |-----------------------------------------------------------|
-     * |Ctrl|Alt |Gui |      Space/L3           |Gui |Alt |Ctrl|Fn1|
-     * `-----------------------------------------------------------'
-     */
-    [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,  XXXXX, 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,
-        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, XXXXX,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXX,
-        KC_LCTL, KC_LALT, KC_LGUI,               LT(2, KC_SPC),                          KC_RGUI, KC_RALT,  KC_RCTL, MO(3)),
-    /* Keymap 1: FN Layer
-     * ,-----------------------------------------------------------.
-     * |`  | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  Del  |
-     * |-----------------------------------------------------------|
-     * |     |   |   |   |   |   |   |   |   |   |PSc|SLk|Pau| Ins |
-     * |-----------------------------------------------------------|
-     * |      |   |   |   |   |   | Lt| Dn| Up| Rt|Hom|PgU|        |
-     * |-----------------------------------------------------------|
-     * |        |   |   |   |   |   |Mut|VDn|VUp|End|PgD|          |
-     * |-----------------------------------------------------------|
-     * |    |    |    |                        |    |    |    |    |
-     * `-----------------------------------------------------------'
-     */
-    [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_DEL,
-        _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____, KC_PSCR, KC_SCRL, KC_PAUS,          KC_INS,
-        _____,   _____,   _____,   _____,   _____,   _____, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, KC_HOME, KC_PGUP,           _____,
-        _____,   _____,   _____,   _____,   _____,   _____,   _____, KC_MUTE, KC_VOLD, KC_VOLU,  KC_END, KC_PGDN,           _____,  _____,
-        _____,   _____,   _____,               _____,                                                      _____,   _____,  _____,  _____),
-    /* Keymap 2: Mouse Keys Layer
-     * ,-----------------------------------------------------------.
-     * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |
-     * |-----------------------------------------------------------|
-     * |     |   |   |   |   |   |   |MWU|MWD|   |   |   |   |     |
-     * |-----------------------------------------------------------|
-     * |      |   |   |   |   |   |MLt|MDn|MUp|MRt|   |   |        |
-     * |-----------------------------------------------------------|
-     * |        |   |   |   |   |SPC|Ms1|Ms2|Ms3|   |   |          |
-     * |-----------------------------------------------------------|
-     * |    |    |    |                        |    |    |    |    |
-     * `-----------------------------------------------------------'
-     */
-    [2] = LAYOUT_all(
-        _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,  _____,  _____,  _____,  _____,  _____,
-        _____,   _____,   _____,   _____,   _____,   _____,   _____,   KC_MS_WH_UP, KC_MS_WH_DOWN,   _____, _____, _____, _____,          _____,
-        _____,   _____,   _____,   _____,   _____,   _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, _____, _____,           _____,
-        _____,   _____,   _____,   _____,   _____,   _____,   KC_SPC, KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3,  _____, _____,           _____,  _____,
-        _____,   _____,   _____,               _____,                                                      _____,   _____,  _____,  _____),
-    /* Keymap 3: LED Modification Layer
-     * ,-----------------------------------------------------------.
-     * |   |BLT|BLC|UGT|UGP|UGB|UGR|   |   |   |   |   |   |       |
-     * |-----------------------------------------------------------|
-     * |     |RD+|GN+|BL+|HU+|SA+|VA+|   |   |   |   |   |   |     |
-     * |-----------------------------------------------------------|
-     * |      |RD-|GN-|BL-|HU-|SA-|VA-|   |   |   |   |   |        |
-     * |-----------------------------------------------------------|
-     * |        |   |   |   |   |   |   |   |   |   |   |          |
-     * |-----------------------------------------------------------|
-     * |    |    |    |                        |    |    |    |    |
-     * `-----------------------------------------------------------'
-     */
-    [3] = LAYOUT_all(
-        _____, BL_TOGG, BL_STEP, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R,   _____,   _____,   _____,   _____,   _____,   _____,  _____,  _____,
-        _____, RGB_RI,  RGB_GI,  RGB_BI,  RGB_HUI, RGB_SAI, RGB_VAI,   _____,   _____,   _____,   _____,   _____,   _____,          _____,
-        _____, RGB_RD,  RGB_GD,  RGB_BD,  RGB_HUD, RGB_SAD, RGB_VAD,   _____,   _____,   _____,   _____,   _____,           _____,
-        _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,   _____,           _____,  _____,
-        _____,   _____,   _____,               _____,                                                      _____,   _____,  _____,  _____),
-};
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        // output low
-        DDRE  |=  (1<<PE6);
-        PORTE &= ~(1<<PE6);
-    }
-    else {
-        // Hi-Z
-        DDRE  &= ~(1<<PE6);
-        PORTE &= ~(1<<PE6);
-    }
-    return false;
-}
diff --git a/keyboards/v60_type_r/keymaps/vimouse/rules.mk b/keyboards/v60_type_r/keymaps/vimouse/rules.mk
deleted file mode 100644
index 31077066a36..00000000000
--- a/keyboards/v60_type_r/keymaps/vimouse/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/v60_type_r/rules.mk b/keyboards/v60_type_r/rules.mk
index d6654ffea64..a7f2bc70267 100644
--- a/keyboards/v60_type_r/rules.mk
+++ b/keyboards/v60_type_r/rules.mk
@@ -8,7 +8,7 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable the RGB Underglow
+RGBLIGHT_ENABLE = no        # Enable the RGB Underglow
 AUDIO_ENABLE = no           # Audio output
 
 LTO_ENABLE = yes
diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c
index 871d9915d30..b266472e64e 100644
--- a/keyboards/v60_type_r/v60_type_r.c
+++ b/keyboards/v60_type_r/v60_type_r.c
@@ -131,20 +131,6 @@ void set_rgb_pin_off(uint8_t pin) {
 	PORTF |= _BV(pin);
 }
 
-void rgblight_set(void) {
-	  // xprintf("Setting RGB underglow\n");
-    if (!rgblight_config.enable) {
-          led[0].r = 0;
-          led[0].g = 0;
-          led[0].b = 0;
-          set_rgb_pin_off(RGB_RED_PIN);
-          set_rgb_pin_off(RGB_GREEN_PIN);
-          set_rgb_pin_off(RGB_BLUE_PIN);
-    }
-
-   //  //xprintf("Red: %u, Green: %u, Blue: %u\n", led[0].r, led[0].g, led[0].b);
-}
-
 ISR(TIMER3_COMPA_vect)
 {
     static uint8_t pwm = 0;
diff --git a/keyboards/vertex/angler2/rules.mk b/keyboards/vertex/angler2/rules.mk
index b5cde0eb87a..b96c8ddbec0 100644
--- a/keyboards/vertex/angler2/rules.mk
+++ b/keyboards/vertex/angler2/rules.mk
@@ -4,8 +4,8 @@
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+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
diff --git a/keyboards/vertex/cycle8/config.h b/keyboards/vertex/cycle8/config.h
new file mode 100644
index 00000000000..ea83fd49fa4
--- /dev/null
+++ b/keyboards/vertex/cycle8/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Eason
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_SPI_DRIVER SPID2
diff --git a/keyboards/vertex/cycle8/halconf.h b/keyboards/vertex/cycle8/halconf.h
new file mode 100644
index 00000000000..7dda577da1b
--- /dev/null
+++ b/keyboards/vertex/cycle8/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Eason
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/vertex/cycle8/info.json b/keyboards/vertex/cycle8/info.json
new file mode 100644
index 00000000000..100c2d21f16
--- /dev/null
+++ b/keyboards/vertex/cycle8/info.json
@@ -0,0 +1,523 @@
+{
+    "keyboard_name": "Cycle8",
+    "manufacturer": "vertex",
+    "url": "",
+    "maintainer": "Eason",
+    "usb": {
+        "vid": "0x8A94",
+        "pid": "0x8F70",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 7,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "indicators": {
+        "caps_lock": "C13",
+        "scroll_lock": "A10"
+    },
+    "matrix_pins": {
+        "rows": ["B7", "B6", "B5", "B4", "B3","A15"],
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "A8", "A9"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F103",
+    "bootloader": "uf2boot",
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_iso",
+        "tkl_iso_split_bs_rshift",
+    ],
+    "layouts":{
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+           ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+           ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+           ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 14], "x": 14, "y": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+           ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+           ]
+        }
+    }
+}
diff --git a/keyboards/vertex/cycle8/keymaps/default/keymap.c b/keyboards/vertex/cycle8/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ec3138424f7
--- /dev/null
+++ b/keyboards/vertex/cycle8/keymaps/default/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2022 Eason
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+ #include QMK_KEYBOARD_H
+
+ 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_PSCR, KC_SCRL, KC_PAUS,
+       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+       KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_RSFT, KC_UP,
+       KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_LALT, KC_LGUI, KC_MENU, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
+   )
+ };
diff --git a/keyboards/vertex/cycle8/keymaps/via/keymap.c b/keyboards/vertex/cycle8/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ec3138424f7
--- /dev/null
+++ b/keyboards/vertex/cycle8/keymaps/via/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2022 Eason
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+ #include QMK_KEYBOARD_H
+
+ 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_PSCR, KC_SCRL, KC_PAUS,
+       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+       KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_RSFT, KC_UP,
+       KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_LALT, KC_LGUI, KC_MENU, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
+   )
+ };
diff --git a/keyboards/vertex/cycle8/keymaps/via/rules.mk b/keyboards/vertex/cycle8/keymaps/via/rules.mk
new file mode 100644
index 00000000000..36b7ba9cbc9
--- /dev/null
+++ b/keyboards/vertex/cycle8/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/vertex/cycle8/mcuconf.h b/keyboards/vertex/cycle8/mcuconf.h
new file mode 100644
index 00000000000..bac8fc07c5f
--- /dev/null
+++ b/keyboards/vertex/cycle8/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Eason
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
diff --git a/keyboards/vertex/cycle8/readme.md b/keyboards/vertex/cycle8/readme.md
new file mode 100644
index 00000000000..b12008b5d0b
--- /dev/null
+++ b/keyboards/vertex/cycle8/readme.md
@@ -0,0 +1,27 @@
+# cycle8
+
+![Cycle8](https://i.imgur.com/gCExreih.png)
+
+A customizable soldered TKL/80% keyboard.
+
+* Keyboard Maintainer: [EASON](https://github.com/EasonQian1)
+* Hardware Supported: Cycle8 PCB
+* Hardware Availability: [EASON](https://github.com/EasonQian1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make vertex/cycle8:default
+
+Flashing example for this keyboard:
+
+    make vertex/cycle8: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 Esc in the keyboard then replug
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`
diff --git a/keyboards/vertex/cycle8/rules.mk b/keyboards/vertex/cycle8/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/vertex/cycle8/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/vertex/t75/info.json b/keyboards/vertex/t75/info.json
new file mode 100644
index 00000000000..82f7b7a5e86
--- /dev/null
+++ b/keyboards/vertex/t75/info.json
@@ -0,0 +1,114 @@
+{
+    "manufacturer": "vertex",
+    "keyboard_name": "T75",
+    "board": "STM32_F103_STM32DUINO",
+    "bootloader": "stm32duino",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B1" 
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B2", "B10", "B11", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B12", "B13", "B14"],
+        "rows": ["A0", "A7", "A6", "A5", "A4", "A3"]
+    },
+    "processor": "STM32F103",
+    "usb": {
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "pid": "0x3006",
+        "vid": "0x28E9"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4},
+                {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [5, 11], "x": 13, "y": 4},
+                {"matrix": [5, 12], "x": 14, "y": 4},
+                {"matrix": [5, 13], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/vertex/t75/keymaps/default/keymap.c b/keyboards/vertex/t75/keymaps/default/keymap.c
new file mode 100644
index 00000000000..96aa2a2fee9
--- /dev/null
+++ b/keyboards/vertex/t75/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2022 vertex
+ *
+ * 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,  KC_DEL,
+		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_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_RIGHT
+		
+	),
+	[1] = LAYOUT(
+      	_______,  KC_MYCM,   KC_WSCH,   KC_MAIL,   KC_CALC,   KC_MSEL,   KC_MSTP,   KC_MPRV,   KC_MPLY,   KC_MNXT,   KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,
+		_______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+		_______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, 
+		_______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
+		_______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
+		_______,  _______,   _______,                         _______,                         _______,   _______,   _______,  _______,  _______
+		
+	)
+};
+	
\ No newline at end of file
diff --git a/keyboards/vertex/t75/keymaps/via/keymap.c b/keyboards/vertex/t75/keymaps/via/keymap.c
new file mode 100644
index 00000000000..16b129c64c9
--- /dev/null
+++ b/keyboards/vertex/t75/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2022 vertex
+ *
+ * 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,  KC_DEL,
+		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_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_RIGHT
+		
+	),
+	[1] = LAYOUT(
+      	_______,  KC_MYCM,   KC_WSCH,   KC_MAIL,   KC_CALC,   KC_MSEL,   KC_MSTP,   KC_MPRV,   KC_MPLY,   KC_MNXT,   KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,
+		_______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+		_______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, 
+		_______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
+		_______,  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
+		_______,  _______,   _______,                         _______,                         _______,   _______,   _______,  _______,  _______
+		
+	)
+};
+	
+
+
diff --git a/keyboards/vertex/t75/keymaps/via/rules.mk b/keyboards/vertex/t75/keymaps/via/rules.mk
new file mode 100644
index 00000000000..43061db1dd4
--- /dev/null
+++ b/keyboards/vertex/t75/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/vertex/t75/readme.md b/keyboards/vertex/t75/readme.md
new file mode 100644
index 00000000000..e435d4db172
--- /dev/null
+++ b/keyboards/vertex/t75/readme.md
@@ -0,0 +1,22 @@
+# t75
+
+* A customizable soldering 75% keyboard.
+
+* Keyboard Maintainer: [JACKY](https://github.com/JackyJia73)
+* Hardware Supported: t75
+* Hardware Availability: [vertex-kb](https://github.com/Vertex-kb)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make vertex/t75:default
+
+Flashing example for this keyboard:
+
+    make vertex/t75: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 Enter in the keyboard then replug
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`
diff --git a/keyboards/vertex/t75/rules.mk b/keyboards/vertex/t75/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/vertex/t75/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/vial_example/vial_atmega32u4/config.h b/keyboards/vial_example/vial_atmega32u4/config.h
deleted file mode 100644
index f0718a34fee..00000000000
--- a/keyboards/vial_example/vial_atmega32u4/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    "Vial"
-#define PRODUCT         "ATmega32u4 example"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 2
-
-#define MATRIX_ROW_PINS { D7, E6 }
-#define MATRIX_COL_PINS { B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* 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
-
-/* Use 1000hz polling */
-#define USB_POLLING_INTERVAL_MS 1
diff --git a/keyboards/vial_example/vial_atmega32u4/info.json b/keyboards/vial_example/vial_atmega32u4/info.json
new file mode 100644
index 00000000000..edca7bfc7f6
--- /dev/null
+++ b/keyboards/vial_example/vial_atmega32u4/info.json
@@ -0,0 +1,33 @@
+{
+    "manufacturer": "Vial",
+    "keyboard_name": "ATmega32u4 example",
+    "maintainer": "xyz",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5"],
+        "rows": ["D7", "E6"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/keymap.c b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/keymap.c
index c8fb892589c..6c76cbf73d5 100644
--- a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/keymap.c
+++ b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/keymap.c
@@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_A, KC_B,
         KC_C, KC_D
-    ),
-
-    [2] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
-    ),
-
-    [3] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/vial.json b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/vial.json
index 513be6e2ce1..7525baeac5b 100644
--- a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/vial.json
+++ b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/vial.json
@@ -1,5 +1,4 @@
 {
-  "name": "Vial ATmega32u4 Example",
   "matrix": {
     "rows": 2,
     "cols": 2
diff --git a/keyboards/vial_example/vial_atmega32u4/rules.mk b/keyboards/vial_example/vial_atmega32u4/rules.mk
index 0592d11fd13..6e7633bfe01 100644
--- a/keyboards/vial_example/vial_atmega32u4/rules.mk
+++ b/keyboards/vial_example/vial_atmega32u4/rules.mk
@@ -1,22 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = no           # Audio output
+# This file intentionally left blank
diff --git a/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.c b/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.c
deleted file mode 100644
index be5b4a824e4..00000000000
--- a/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include "vial_atmega32u4.h"
diff --git a/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.h b/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.h
deleted file mode 100644
index 12c2bedb5f6..00000000000
--- a/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, \
-	K10, K11  \
-) { \
-	{ K00,   K01 }, \
-	{ K10,   K11 }  \
-}
diff --git a/keyboards/vial_example/vial_rp2040/config.h b/keyboards/vial_example/vial_rp2040/config.h
deleted file mode 100644
index c0564cd69a0..00000000000
--- a/keyboards/vial_example/vial_rp2040/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    "Vial"
-#define PRODUCT         "RP2040 example"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 2
-
-#define MATRIX_ROW_PINS { GP2, GP4 }
-#define MATRIX_COL_PINS { GP3, GP5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* 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/vial_example/vial_rp2040/info.json b/keyboards/vial_example/vial_rp2040/info.json
new file mode 100644
index 00000000000..2387a88ba6b
--- /dev/null
+++ b/keyboards/vial_example/vial_rp2040/info.json
@@ -0,0 +1,33 @@
+{
+    "manufacturer": "Vial",
+    "keyboard_name": "RP2040 example",
+    "maintainer": "xyz",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP3", "GP5"],
+        "rows": ["GP2", "GP4"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/vial_example/vial_rp2040/keymaps/vial/keymap.c b/keyboards/vial_example/vial_rp2040/keymaps/vial/keymap.c
index c8fb892589c..6c76cbf73d5 100644
--- a/keyboards/vial_example/vial_rp2040/keymaps/vial/keymap.c
+++ b/keyboards/vial_example/vial_rp2040/keymaps/vial/keymap.c
@@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_A, KC_B,
         KC_C, KC_D
-    ),
-
-    [2] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
-    ),
-
-    [3] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/vial_example/vial_rp2040/rules.mk b/keyboards/vial_example/vial_rp2040/rules.mk
index 34863972e2d..6e7633bfe01 100644
--- a/keyboards/vial_example/vial_rp2040/rules.mk
+++ b/keyboards/vial_example/vial_rp2040/rules.mk
@@ -1,23 +1 @@
-# MCU name
-MCU = RP2040
-BOOTLOADER = rp2040
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no      # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+# This file intentionally left blank
diff --git a/keyboards/vial_example/vial_rp2040/vial_rp2040.c b/keyboards/vial_example/vial_rp2040/vial_rp2040.c
deleted file mode 100644
index 2ffcfd355d3..00000000000
--- a/keyboards/vial_example/vial_rp2040/vial_rp2040.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include "vial_rp2040.h"
diff --git a/keyboards/vial_example/vial_rp2040/vial_rp2040.h b/keyboards/vial_example/vial_rp2040/vial_rp2040.h
deleted file mode 100644
index 12c2bedb5f6..00000000000
--- a/keyboards/vial_example/vial_rp2040/vial_rp2040.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, \
-	K10, K11  \
-) { \
-	{ K00,   K01 }, \
-	{ K10,   K11 }  \
-}
diff --git a/keyboards/vial_example/vial_stm32f072/config.h b/keyboards/vial_example/vial_stm32f072/config.h
deleted file mode 100644
index 9221a958ad2..00000000000
--- a/keyboards/vial_example/vial_stm32f072/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    "Vial"
-#define PRODUCT         "STM32F072 example"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 2
-
-#define MATRIX_ROW_PINS { B10, B11 }
-#define MATRIX_COL_PINS { B1, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* 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
-
-/* Use 1000hz polling */
-#define USB_POLLING_INTERVAL_MS 1
diff --git a/keyboards/vial_example/vial_stm32f072/info.json b/keyboards/vial_example/vial_stm32f072/info.json
new file mode 100644
index 00000000000..ed850d92664
--- /dev/null
+++ b/keyboards/vial_example/vial_stm32f072/info.json
@@ -0,0 +1,33 @@
+{
+    "manufacturer": "Vial",
+    "keyboard_name": "STM32F072 example",
+    "maintainer": "qmk",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B0"],
+        "rows": ["B10", "B11"]
+    },
+    "processor": "STM32F072",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/vial_example/vial_stm32f072/keymaps/vial/keymap.c b/keyboards/vial_example/vial_stm32f072/keymaps/vial/keymap.c
index c8fb892589c..6c76cbf73d5 100644
--- a/keyboards/vial_example/vial_stm32f072/keymaps/vial/keymap.c
+++ b/keyboards/vial_example/vial_stm32f072/keymaps/vial/keymap.c
@@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_A, KC_B,
         KC_C, KC_D
-    ),
-
-    [2] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
-    ),
-
-    [3] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/vial_example/vial_stm32f072/keymaps/vial/vial.json b/keyboards/vial_example/vial_stm32f072/keymaps/vial/vial.json
index 91738d9d8b7..7525baeac5b 100644
--- a/keyboards/vial_example/vial_stm32f072/keymaps/vial/vial.json
+++ b/keyboards/vial_example/vial_stm32f072/keymaps/vial/vial.json
@@ -1,5 +1,4 @@
 {
-  "name": "Vial STM32F072 Example",
   "matrix": {
     "rows": 2,
     "cols": 2
diff --git a/keyboards/vial_example/vial_stm32f072/rules.mk b/keyboards/vial_example/vial_stm32f072/rules.mk
index 26beabb1dc5..6e7633bfe01 100644
--- a/keyboards/vial_example/vial_stm32f072/rules.mk
+++ b/keyboards/vial_example/vial_stm32f072/rules.mk
@@ -1,26 +1 @@
-# MCU name
-MCU = STM32F072
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no      # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+# This file intentionally left blank
diff --git a/keyboards/vial_example/vial_stm32f072/vial_stm32f072.c b/keyboards/vial_example/vial_stm32f072/vial_stm32f072.c
deleted file mode 100644
index 464f7c54f92..00000000000
--- a/keyboards/vial_example/vial_stm32f072/vial_stm32f072.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include "vial_stm32f072.h"
diff --git a/keyboards/vial_example/vial_stm32f072/vial_stm32f072.h b/keyboards/vial_example/vial_stm32f072/vial_stm32f072.h
deleted file mode 100644
index 12c2bedb5f6..00000000000
--- a/keyboards/vial_example/vial_stm32f072/vial_stm32f072.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, \
-	K10, K11  \
-) { \
-	{ K00,   K01 }, \
-	{ K10,   K11 }  \
-}
diff --git a/keyboards/vial_example/vial_stm32f103_vibl/config.h b/keyboards/vial_example/vial_stm32f103_vibl/config.h
index 149d788cb86..dcec5e98702 100644
--- a/keyboards/vial_example/vial_stm32f103_vibl/config.h
+++ b/keyboards/vial_example/vial_stm32f103_vibl/config.h
@@ -2,29 +2,5 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    "Vial"
-#define PRODUCT         "STM32F103-vibl example"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 2
-
-#define MATRIX_ROW_PINS { B10, B11 }
-#define MATRIX_COL_PINS { B1, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* 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
-
-/* Use 1000hz polling */
-#define USB_POLLING_INTERVAL_MS 1
-
 /* Because we use vibl, this has to be defined here instead of under keymaps/vial/config.h */
 #define VIAL_KEYBOARD_UID {0x07, 0x30, 0x3E, 0x60, 0x00, 0x62, 0xA3, 0xD4}
diff --git a/keyboards/vial_example/vial_stm32f103_vibl/info.json b/keyboards/vial_example/vial_stm32f103_vibl/info.json
new file mode 100644
index 00000000000..1e28edc40a8
--- /dev/null
+++ b/keyboards/vial_example/vial_stm32f103_vibl/info.json
@@ -0,0 +1,33 @@
+{
+    "manufacturer": "Vial",
+    "keyboard_name": "STM32F103-vibl example",
+    "maintainer": "xyz",
+    "bootloader": "vibl",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B0"],
+        "rows": ["B10", "B11"]
+    },
+    "processor": "STM32F103",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/keymap.c b/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/keymap.c
index c8fb892589c..6c76cbf73d5 100644
--- a/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/keymap.c
+++ b/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/keymap.c
@@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_A, KC_B,
         KC_C, KC_D
-    ),
-
-    [2] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
-    ),
-
-    [3] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/vial.json b/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/vial.json
index a8815e26ffb..7525baeac5b 100644
--- a/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/vial.json
+++ b/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/vial.json
@@ -1,5 +1,4 @@
 {
-  "name": "Vial STM32F103-vibl Example",
   "matrix": {
     "rows": 2,
     "cols": 2
diff --git a/keyboards/vial_example/vial_stm32f103_vibl/rules.mk b/keyboards/vial_example/vial_stm32f103_vibl/rules.mk
index fb6dfdc8836..6e7633bfe01 100644
--- a/keyboards/vial_example/vial_stm32f103_vibl/rules.mk
+++ b/keyboards/vial_example/vial_stm32f103_vibl/rules.mk
@@ -1,26 +1 @@
-# MCU name
-MCU = STM32F103
-BOOTLOADER = vibl
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no      # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+# This file intentionally left blank
diff --git a/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.c b/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.c
deleted file mode 100644
index 9e40994cdd0..00000000000
--- a/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include "vial_stm32f103_vibl.h"
diff --git a/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.h b/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.h
deleted file mode 100644
index 12c2bedb5f6..00000000000
--- a/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, \
-	K10, K11  \
-) { \
-	{ K00,   K01 }, \
-	{ K10,   K11 }  \
-}
diff --git a/keyboards/vial_example/vial_stm32f401/config.h b/keyboards/vial_example/vial_stm32f401/config.h
deleted file mode 100644
index 8f20b709ba1..00000000000
--- a/keyboards/vial_example/vial_stm32f401/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    "Vial"
-#define PRODUCT         "STM32F401 example"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 2
-
-#define MATRIX_ROW_PINS { B10, B11 }
-#define MATRIX_COL_PINS { B1, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* 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
-
-/* Use 1000hz polling */
-#define USB_POLLING_INTERVAL_MS 1
diff --git a/keyboards/vial_example/vial_stm32f401/info.json b/keyboards/vial_example/vial_stm32f401/info.json
new file mode 100644
index 00000000000..1de94194116
--- /dev/null
+++ b/keyboards/vial_example/vial_stm32f401/info.json
@@ -0,0 +1,33 @@
+{
+    "manufacturer": "Vial",
+    "keyboard_name": "STM32F401 example",
+    "maintainer": "xyz",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B0"],
+        "rows": ["B10", "B11"]
+    },
+    "processor": "STM32F401",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/vial_example/vial_stm32f401/keymaps/vial/keymap.c b/keyboards/vial_example/vial_stm32f401/keymaps/vial/keymap.c
index c8fb892589c..6c76cbf73d5 100644
--- a/keyboards/vial_example/vial_stm32f401/keymaps/vial/keymap.c
+++ b/keyboards/vial_example/vial_stm32f401/keymaps/vial/keymap.c
@@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_A, KC_B,
         KC_C, KC_D
-    ),
-
-    [2] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
-    ),
-
-    [3] = LAYOUT(
-        KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/vial_example/vial_stm32f401/rules.mk b/keyboards/vial_example/vial_stm32f401/rules.mk
index d96d8afde04..6e7633bfe01 100644
--- a/keyboards/vial_example/vial_stm32f401/rules.mk
+++ b/keyboards/vial_example/vial_stm32f401/rules.mk
@@ -1,26 +1 @@
-# MCU name
-MCU = STM32F401
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no      # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+# This file intentionally left blank
diff --git a/keyboards/vial_example/vial_stm32f401/vial_stm32f401.c b/keyboards/vial_example/vial_stm32f401/vial_stm32f401.c
deleted file mode 100644
index 8e14bd33873..00000000000
--- a/keyboards/vial_example/vial_stm32f401/vial_stm32f401.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include "vial_stm32f401.h"
diff --git a/keyboards/vial_example/vial_stm32f401/vial_stm32f401.h b/keyboards/vial_example/vial_stm32f401/vial_stm32f401.h
deleted file mode 100644
index 12c2bedb5f6..00000000000
--- a/keyboards/vial_example/vial_stm32f401/vial_stm32f401.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, \
-	K10, K11  \
-) { \
-	{ K00,   K01 }, \
-	{ K10,   K11 }  \
-}
diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h
index 0538906eccc..050a0cca223 100644
--- a/keyboards/viendi8l/config.h
+++ b/keyboards/viendi8l/config.h
@@ -33,8 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define RGBLIGHT_DEFAULT_VAL 0
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json
index d50b96a887c..29dbd5b25aa 100644
--- a/keyboards/viendi8l/info.json
+++ b/keyboards/viendi8l/info.json
@@ -9,7 +9,10 @@
         "device_version": "0.0.1"
     },
     "rgblight": {
-        "led_count": 4
+        "led_count": 4,
+        "default": {
+            "val": 0
+        }
     },
     "ws2812": {
         "pin": "B15",
diff --git a/keyboards/viktus/osav2/keymaps/default/keymap.c b/keyboards/viktus/osav2/keymaps/default/keymap.c
index 41533f136ca..9efc093864a 100644
--- a/keyboards/viktus/osav2/keymaps/default/keymap.c
+++ b/keyboards/viktus/osav2/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_normal_split(
-        KC_DEL,  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_BSLS, KC_TILD,
+        KC_DEL,  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_BSLS, KC_GRV,
         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_BSPC,
         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_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, MO(1),
diff --git a/keyboards/viktus/osav2/keymaps/via/keymap.c b/keyboards/viktus/osav2/keymaps/via/keymap.c
index 41533f136ca..9efc093864a 100644
--- a/keyboards/viktus/osav2/keymaps/via/keymap.c
+++ b/keyboards/viktus/osav2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_normal_split(
-        KC_DEL,  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_BSLS, KC_TILD,
+        KC_DEL,  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_BSLS, KC_GRV,
         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_BSPC,
         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_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, MO(1),
diff --git a/keyboards/viktus/osav2_topre/ec.c b/keyboards/viktus/osav2_topre/ec.c
index fd2e8fa0ec5..076ffc0ba86 100644
--- a/keyboards/viktus/osav2_topre/ec.c
+++ b/keyboards/viktus/osav2_topre/ec.c
@@ -151,16 +151,16 @@ bool ec_matrix_scan(matrix_row_t current_matrix[]) {
             switch(row) {
                 case 0:
                     switch(col) {
-                        case 14: // lower threshold for split backspace: left 1U( rest,  btm)
-                        case 15: // lower threshold for 2U backspace: 2U(38 rest, 60 btm)
-                            reset_pt = 44;
-                            actuation_pt = 48;
+                        case 14: // lower threshold for split backspace: left 1U
+                        case 15: // lower threshold for 2U backspace: 2U
+                            reset_pt = 48;
+                            actuation_pt = 53;
                             break;
                     }
                     break;
                 case 3:
                     switch(col) {
-                        case 14: // Lower threshold for right shift: 1.75U(40 rest, 70 btm)
+                        case 14: // Lower threshold for right shift: 1.75U
                             reset_pt = 48;
                             actuation_pt = 53;
                             break;
@@ -168,17 +168,17 @@ bool ec_matrix_scan(matrix_row_t current_matrix[]) {
                     break;
                 case 4:
                     switch(col) {
-                        case 3: // Lower threshold for left space: col3( rest,  btm)
-                        case 4: // Lower threshold for left space: col4(38 rest, 88 btm)
+                        case 3: // Lower threshold for left space: col3
+                        case 4: // Lower threshold for left space: col4
                             reset_pt = 50;
                             actuation_pt = 60;
                             break;
-                        case 5: // Lower threshold for left space: col5( rest,  btm)
-                        case 6: // Lower threshold for left space: col6(40 rest, 80 btm)
+                        case 5: // Lower threshold for left space: col5
+                        case 6: // Lower threshold for left space: col6
                             reset_pt = 48;
                             actuation_pt = 58;
                             break;
-                        case 14: // Lower threshold for right shift: 2.75U( rest,  btm)
+                        case 14: // Lower threshold for right shift: 2.75U
                             reset_pt = 48;
                             actuation_pt = 53;
                             break;
diff --git a/keyboards/viktus/osav2_topre/keymaps/default/keymap.c b/keyboards/viktus/osav2_topre/keymaps/default/keymap.c
index b9561c9b325..bb7bc014744 100644
--- a/keyboards/viktus/osav2_topre/keymaps/default/keymap.c
+++ b/keyboards/viktus/osav2_topre/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_back_175u_shift(
-        KC_DEL,  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_BSLS, KC_TILDE,
+        KC_DEL,  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_BSLS, KC_GRV,
         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_BSPC,
         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, MO(1),
diff --git a/keyboards/viktus/osav2_topre/keymaps/via/keymap.c b/keyboards/viktus/osav2_topre/keymaps/via/keymap.c
index b9561c9b325..bb7bc014744 100644
--- a/keyboards/viktus/osav2_topre/keymaps/via/keymap.c
+++ b/keyboards/viktus/osav2_topre/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_back_175u_shift(
-        KC_DEL,  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_BSLS, KC_TILDE,
+        KC_DEL,  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_BSLS, KC_GRV,
         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_BSPC,
         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, MO(1),
diff --git a/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c b/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
deleted file mode 100644
index dac34bd228c..00000000000
--- a/keyboards/viktus/sp_mini/keymaps/peott-fr/keymap.c
+++ /dev/null
@@ -1,117 +0,0 @@
- /* Copyright 2021 peott
-  *
-  * 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
-
-// Layers by name
-enum custom_layers {
-    _BASE,
-    _LHAND,
-    _RHAND,
-    _NUM
-};
-
-// Layers defined by function
-#define LHAND LT(_LHAND,KC_SPC)
-#define RHAND LT(_RHAND,KC_BSPC)
-#define NUM TG(_NUM)
-// Keycodes for cleaner code
-#define L_CTRL LCTL_T(KC_MPRV)
-#define L_ALT LALT_T(KC_MNXT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_all(
-        KC_MPLY, 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_BSLS,
-        KC_TRNS, 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, NUM,
-        KC_TRNS, KC_LCTL, KC_A,    KC_S,  KC_D,  KC_F,  KC_G,    KC_H,  KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,
-        KC_TRNS, SC_LSPO, KC_Z,    KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,
-        KC_TRNS, L_CTRL,  KC_LGUI, L_ALT, KC_NO, LHAND,          RHAND, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_LHAND] = LAYOUT_all(
-        QK_BOOT, 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_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS,
-        KC_PGUP, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT,  KC_TRNS,
-        KC_PGDN, KC_LSFT, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT,  KC_BSPC,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, SC_RSPC, KC_TRNS,
-        KC_END,  KC_LCTL, KC_TRNS, KC_LALT, KC_TRNS, KC_TRNS,              KC_TRNS, KC_RALT, KC_RCTL, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [_RHAND] = LAYOUT_all(
-        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_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_BSLS,
-        KC_NO, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,     KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, KC_NO,   KC_PIPE,
-        KC_NO, KC_LSFT, KC_NO,   KC_NO, KC_NO,   KC_NO,  KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,   SC_RSPC, 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
-    ),
-    [_NUM] = LAYOUT_all(
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_F13,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_NO, KC_NO, KC_NO, NUM,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_P4,   KC_P5,   KC_P6,   KC_PCMM, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_P1,   KC_P2,   KC_P3,   KC_PEQL, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,            KC_P0,   KC_PDOT, KC_PENT, KC_NO,   KC_NO, KC_NO
-    )
-};
-
-void keyboard_pre_init_user(void) {
-    setPinOutput(F5);  // initialize F5 for LED
-    setPinOutput(F6);  // initialize F6 for LED
-    setPinOutput(F7);  // initialize F7 for LED
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePinLow(F5);
-    writePinLow(F6);
-    writePinLow(F7);
-    switch (get_highest_layer(state)) {
-        case _LHAND:
-            writePinHigh(F5);
-            break;
-        case _RHAND:
-            writePinHigh(F6);
-            break;
-        case _NUM:  // replace 'XXXX' with the layer or function name
-            writePinHigh(F7);
-            break;
-        case KC_F13:
-            writePinHigh(F7);
-            writePinHigh(F5);
-            writePinHigh(F6);
-            break;
-        }
-    return state;
-}
-
-bool spongebob_mode = false;
-bool spongebob_case = false;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (spongebob_mode) {
-    switch(keycode) {
-      case KC_A...KC_Z:
-        if (record->event.pressed) {
-          (spongebob_case ^= 1) == 0 ? tap_code16(S(keycode)) : tap_code(keycode);
-          return false; break;
-        }
-    }
-  }
-  switch(keycode) {
-    case KC_F13:
-      if (record->event.pressed) {
-        spongebob_mode ^= 1;
-      }
-      return false; break;
-  }
-  return true;
-}
-
-
diff --git a/keyboards/vitamins_included/keymaps/numpad/config.h b/keyboards/vitamins_included/keymaps/numpad/config.h
deleted file mode 100644
index 95dd8ec4643..00000000000
--- a/keyboards/vitamins_included/keymaps/numpad/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Use I2C or Serial. Default is Serial */
-// #define USE_I2C
-
-/* Select hand configuration */
-// Defaults:
-// Rev1: EE_HANDS
-// Rev2: SPLIT_HAND_PIN B4
-
-// You can override the defaults (rev1 doesn't support SPLIT_HAND_PIN)
-//#define EE_HANDS
-//#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-
-#ifdef AUDIO_ENABLE
-  #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                SONG(DVORAK_SOUND), \
-                                SONG(COLEMAK_SOUND) \
-                              }
-#endif
diff --git a/keyboards/vitamins_included/keymaps/numpad/keymap.c b/keyboards/vitamins_included/keymaps/numpad/keymap.c
deleted file mode 100644
index 4108259df86..00000000000
--- a/keyboards/vitamins_included/keymaps/numpad/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// 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 _NUMPAD 0
-#define _ADJUST 1
-
-enum custom_keycodes {
-  NUMPAD = SAFE_RANGE,
-  ADJUST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Numpad
- * ,-----------------------------------------------------------------------------------.
- * |   0  |   1  |   4  |   7  | nlck |  <-- |   0  |   1  |   4  |   7  | nlck |  <-- |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |  adj |   2  |   5  |   8  |   /  |  \/  |   ,  |   2  |   5  |   8  |   /  |  \/  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   .  |   3  |   6  |   9  |   *  |  /\  |   .  |   3  |   6  |   9  |   *  |  /\  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Enter|  tab |   -  |   +  |bckspc|  --> | Enter|  tab |   -  |   +  |bckspc|  --> |
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_ortho_4x12(
-  KC_KP_0,     KC_KP_1,    KC_KP_4,     KC_KP_7,    KC_NUM_LOCK,    KC_LEFT,   KC_KP_0,     KC_KP_1,    KC_KP_4,     KC_KP_7,    KC_NUM_LOCK,    KC_LEFT,
-  ADJUST,      KC_KP_2,    KC_KP_5,     KC_KP_8,    KC_KP_SLASH,    KC_DOWN,   ADJUST,      KC_KP_2,    KC_KP_5,     KC_KP_8,    KC_KP_SLASH,    KC_DOWN,
-  KC_KP_DOT,   KC_KP_3,    KC_KP_6,     KC_KP_9,    KC_KP_ASTERISK, KC_UP,     KC_KP_DOT,   KC_KP_3,    KC_KP_6,     KC_KP_9,    KC_KP_ASTERISK, KC_UP,
-  KC_KP_ENTER, KC_TAB,     KC_KP_MINUS, KC_KP_PLUS, KC_BSPC,        KC_RIGHT,  KC_KP_ENTER, KC_TAB,     KC_KP_MINUS, KC_KP_PLUS, KC_BSPC,        KC_RIGHT
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      | QK_BOOT QK_BOOT |      |      |      |      |RGBMOD|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] =  LAYOUT_ortho_4x12(
-  _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, RGB_MOD
-)
-
-
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/vitamins_included/keymaps/vitavim/config.h b/keyboards/vitamins_included/keymaps/vitavim/config.h
deleted file mode 100644
index 95dd8ec4643..00000000000
--- a/keyboards/vitamins_included/keymaps/vitavim/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Use I2C or Serial. Default is Serial */
-// #define USE_I2C
-
-/* Select hand configuration */
-// Defaults:
-// Rev1: EE_HANDS
-// Rev2: SPLIT_HAND_PIN B4
-
-// You can override the defaults (rev1 doesn't support SPLIT_HAND_PIN)
-//#define EE_HANDS
-//#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-
-#ifdef AUDIO_ENABLE
-  #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                SONG(DVORAK_SOUND), \
-                                SONG(COLEMAK_SOUND) \
-                              }
-#endif
diff --git a/keyboards/vitamins_included/keymaps/vitavim/keymap.c b/keyboards/vitamins_included/keymaps/vitavim/keymap.c
deleted file mode 100644
index 5c2715550f7..00000000000
--- a/keyboards/vitamins_included/keymaps/vitavim/keymap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#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 layers {
-    _ALPHAS,
-    _MODS,
-    _VIM,
-    _NUMPAD,
-    _CODE,
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Alphas
- * ,--------------------------------------------------------------------------------------------.
- * | Tab    |   q  |  w  |   e  |    r    |  t   |   y  |   u   |   i  |   o  |   p    |   ins  |
- * |--------+------+-----+------+---------+------+------+-------+------+------+--------+--------|
- * |ctl(esc)|   a  |  s  |   d  |    f    |  g   |   h  |   j   |  k   |   l  |LT(2,;:)|sft(ent)|
- * |--------+------+-----+------+---------+------|------+-------+------+------+--------+--------|
- * |LSPO    |   z  |  x  |   c  |    v    |  b   |   n  |   m   |  ,<  |  .>  |   up   |  RSPC  |
- * |--------+------+-----+------+---------+------+------+-------+------+------+--------+--------|
- * | ctl    |  GUI | alt |MO(1) |lt(3,del)|Space |Space |bckspc |MO(4) | left |  down  |  right |
- * `--------------------------------------------------------------------------------------------'
- */
-[_ALPHAS] = LAYOUT_ortho_4x12(
-  KC_TAB,         KC_Q,    KC_W,    KC_E,  KC_R,         KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,          KC_INS,
-  LCTL_T(KC_ESC), KC_A,    KC_S,    KC_D,  KC_F,         KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    LT(2,KC_SCLN), RSFT_T(KC_ENT),
-  SC_LSPO,        KC_Z,    KC_X,    KC_C,  KC_V,         KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_UP,         SC_RSPC,
-  KC_LCTL,        KC_LGUI, KC_LALT, MO(1), LT(3,KC_DEL), KC_SPC, KC_SPC, KC_BSPC, MO(4),   KC_LEFT, KC_DOWN,       KC_RGHT
-),
-
-/* MODS
- * ,-----------------------------------------------------------------------------------.
- * |  `~   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  |PrtSc |
- * |-------+------+------+------+------+-------------+------+------+------+------+------|
- * |Meh(F7)|  !   |   *  |   #  |  $   |  %   |  ^   |   &  |  *   |  '"  |  "   |  \|  |
- * |-------+------+------+------+------+------|------+------+------+------+------+------|
- * | LS/(  |  z   |   x  |  [{  |  ]   |   b  |  -_  |  =+  |  /?  |  \|  | PgUp | RS/) |
- * |-------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl  |      |      |      |      | spc  |  _   |bckspc|      | Home |PgDwn | End  |
- * `------------------------------------------------------------------------------------'
- */
-[_MODS] =  LAYOUT_ortho_4x12(
-    KC_GRV,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PSCR,
-    MEH(KC_F7),      KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUOT, KC_DQUO, KC_BSLS,
-    LSFT_T(KC_LCBR), KC_Z,    KC_X,    KC_LBRC, KC_RBRC, KC_B,    KC_MINS, KC_EQL,  KC_SLSH, KC_BSLS, KC_PGUP, RSFT_T(KC_RCBR),
-    KC_LCTL,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC,  KC_UNDS, KC_BSPC, KC_NO,   KC_HOME, KC_PGDN, KC_END
-),
-
-/* VIM layer that adds vim navigation by holding the ; key. Includes keys like $,^ for end/beg of line and b,w,e,d,y. Also includes
- * quick keys for excel like alt(=) for sum, ctl(+) & ctl(-) to add/remove columns/rows.
- * ,--------------------------------------------------------------------------------------.
- * |  Tab   |  "'  |  b  |  w  |   e    |  d  |   y  | Vol- | Vol+ | TO(0)|  TG(2) |reset |
- * |--------+------+-----+-----+--------+-----+------+------+------+------+--------+------|
- * |Ctl(Esc)| Home |Home |Pg Up|Pg Down | End | Left | Down |  Up  |Right |LT(2,;:)|Enter |
- * |--------+------+-----+-----+--------+-----|------+------+------+------+--------+------|
- * | sft    |  ;:  |  q  |  ^  |   $    |  x  |alt(=)|ctl(+)|ctl(-)|      |        |      |
- * |--------+------+-----+-----+--------+-----+------+------+------+------+--------+------|
- * | Ctl    |  GUI | alt | sft |sft(ctl)| spc |  del | bspc |      |      |        |      |
- * `--------------------------------------------------------------------------------------'
- */
-[_VIM] =  LAYOUT_ortho_4x12(
-    KC_TAB,         KC_QUOT, KC_B,    KC_W,    KC_E,          KC_D,   KC_Y,         KC_VOLD,       KC_VOLU,       TO(0),   TG(2),         QK_BOOT,
-    LCTL_T(KC_ESC), KC_HOME, KC_HOME, KC_PGUP, KC_PGDN,       KC_END, KC_LEFT,      KC_DOWN,       KC_UP,         KC_RGHT, LT(2,KC_SCLN), KC_ENT,
-    KC_LSFT,        KC_SCLN, KC_Q,    KC_CIRC, KC_DLR,        KC_X,   RALT(KC_EQL), RCTL(KC_PLUS), RCTL(KC_PMNS), KC_NO,   KC_NO,         KC_TRNS,
-    KC_LCTL,        KC_LGUI, KC_LALT, KC_LSFT, LSFT(KC_LCTL), KC_SPC, KC_DEL,       KC_BSPC,       KC_NO,         KC_NO,   KC_NO,         KC_TRNS
-),
-
-/* NUMPAD: Numpad with operators and other keys
- * ,-------------------------------------------------------------------------------------.
- * |  [{  |   !  |   @  |   #  |   $  |   %  |  (   |   7  |  8   |   9  |  )   |   ]}   |
- * |------+------+------+------+------+-------------+------+------+------+------+--------|
- * |  {   |  /   |   *  |   -  |  +   |      |  =   |   4  |  5   |  6   |  ;:  |   }    |
- * |------+------+------+------+------+------|------+------+------+------+------+--------|
- * | sft( |      |      |      |      |      |      |   1  |  2   |  3   |      |kc_sft()|
- * |------+------+------+------+------+------+------+------+------+------+------+--------|
- * |      |      |      |      |      |Space |Space |   0  |      |      |      |        |
- * `-------------------------------------------------------------------------------------'
- */
-[_NUMPAD] =  LAYOUT_ortho_4x12(
-    KC_LBRC, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LPRN, KC_7, KC_8,  KC_9,  KC_RPRN, KC_RBRC,
-    KC_LCBR, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_NO,   KC_EQL,  KC_4, KC_5,  KC_6,  KC_SCLN, KC_RCBR,
-    SC_LSPO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_1, KC_2,  KC_3,  KC_PEQL, SC_RSPC,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC,  KC_0, KC_NO, KC_NO, KC_NO,   KC_NO
-),
-
-/* CODE
- * ,---------------------------------------------------------------------------.
- * | ~` | F11 | F12 | 3  |  4  |  5  |  6   |   :  |   -  |   >  |   0  |  Del |
- * |----+-----+-----+----+-----+-------------+------+-----+------+------+------|
- * |    |  /  |  *  | {  | [{  |  (  |   )  |  ]}  |  }   |  '"  |  ]}  |  \|  |
- * |----+-----+-----+----+-----+-----|------+------+------+------+------+------|
- * |    | F7  | F8  | F9 | F10 | F11 |   ~  |  =   |  \   |RGBTOG|RGBHUI|RGBHUD|
- * |----+-----+-----+----+-----+-----+------+------+------+------+------+------|
- * |    |     |     |    |     |     |      |      |      |RGBVAD|RBGVAI|RGBMOD|
- * `---------------------------------------------------------------------------'
- */
-[_CODE] =  LAYOUT_ortho_4x12(
-    KC_GRV,  KC_F11,  KC_F12,  KC_3,    KC_4,    KC_5,    KC_6,    KC_COLN, KC_MINS, KC_GT,   KC_0,    KC_DEL,
-    KC_TRNS, KC_PSLS, KC_PAST, KC_LCBR, KC_LBRC, KC_LPRN, KC_RPRN, KC_RBRC, KC_RCBR, KC_QUOT, KC_RBRC, KC_BSLS,
-    KC_TRNS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_TILD, KC_EQL,  KC_NUBS, RGB_TOG, RGB_HUI, RGB_HUD,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, RGB_MOD
-)
-
-};
diff --git a/keyboards/w1_at/config.h b/keyboards/w1_at/config.h
deleted file mode 100644
index 79fdc4275fe..00000000000
--- a/keyboards/w1_at/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-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
-
-/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
-#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/w1_at/info.json b/keyboards/w1_at/info.json
deleted file mode 100644
index 896e523c838..00000000000
--- a/keyboards/w1_at/info.json
+++ /dev/null
@@ -1,569 +0,0 @@
-{
-    "keyboard_name": "W1-AT",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x5754",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
-        "rows": ["A2", "B9", "B8", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B6",
-        "num_lock": "B3",
-        "scroll_lock": "A15",
-        "kana": "A13",
-        "on_state": 0
-    },
-    "bootmagic": {
-        "matrix": [0, 2]
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
-
-                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
-
-                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
-
-                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
-
-                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_wkl": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
-
-                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
-
-                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
-
-                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
-
-                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
-
-                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
-
-                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
-
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
-
-                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
-
-                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_wkl": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
-
-                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
-
-                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "#", "matrix": [1, 15], "x": 15, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
-
-                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 2.75},
-
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
-
-                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        },
-        "LAYOUT_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Delete", "matrix": [2, 14], "x": 16.25, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "/", "matrix": [0, 18], "x": 19.5, "y": 0},
-                {"label": "*", "matrix": [0, 19], "x": 20.5, "y": 0},
-
-                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-
-                {"label": "7", "matrix": [1, 16], "x": 17.5, "y": 1},
-                {"label": "8", "matrix": [1, 17], "x": 18.5, "y": 1},
-                {"label": "9", "matrix": [1, 18], "x": 19.5, "y": 1},
-                {"label": "+", "matrix": [1, 19], "x": 20.5, "y": 1},
-
-                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "#", "matrix": [1, 15], "x": 15, "y": 2},
-                {"label": "Enter", "matrix": [2, 15], "x": 16, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "4", "matrix": [2, 16], "x": 17.5, "y": 2},
-                {"label": "5", "matrix": [2, 17], "x": 18.5, "y": 2},
-                {"label": "6", "matrix": [2, 18], "x": 19.5, "y": 2},
-                {"label": "-", "matrix": [2, 19], "x": 20.5, "y": 2},
-
-                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"label": "1", "matrix": [3, 16], "x": 17.5, "y": 3},
-                {"label": "2", "matrix": [3, 17], "x": 18.5, "y": 3},
-                {"label": "3", "matrix": [3, 18], "x": 19.5, "y": 3},
-                {"label": "-", "matrix": [3, 19], "x": 20.5, "y": 3},
-
-                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 15], "x": 15.75, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 16], "x": 17.5, "y": 4},
-                {"label": "00", "matrix": [4, 17], "x": 18.5, "y": 4},
-                {"label": ".", "matrix": [4, 18], "x": 19.5, "y": 4},
-                {"label": "Enter", "matrix": [4, 19], "x": 20.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/w1_at/keymaps/default/keymap.c b/keyboards/w1_at/keymaps/default/keymap.c
deleted file mode 100644
index 7c190b73d6e..00000000000
--- a/keyboards/w1_at/keymaps/default/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* 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
-
-enum custom_keycodes {
-    KC_P00 = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
-    KC_F1, KC_F2,     QK_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_DEL,    KC_NUM,  KC_PMNS, KC_PSLS, KC_PAST,
-    KC_F3, KC_F4,     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_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_F5, KC_F6,     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_P4,   KC_P5,   KC_P6,   KC_PMNS,
-    KC_F7, KC_F8,     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, MO(1),              KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
-    KC_F9, KC_F10,    KC_LCTL,          KC_LALT,                        KC_SPC,                                    KC_RALT,          KC_RCTL,            KC_P0,   KC_P00,  KC_PDOT, KC_PENT),
-
-[1] = LAYOUT_all( /* FN */
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_VOLD, 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_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case KC_P00:
-                tap_code(KC_P0);
-                tap_code(KC_P0);
-                return false;
-        }
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/w1_at/keymaps/default/readme.md b/keyboards/w1_at/keymaps/default/readme.md
deleted file mode 100644
index af0497e7209..00000000000
--- a/keyboards/w1_at/keymaps/default/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# The default keymap for W1-AT. 
-
-Layer 0
-
-![Layer 0](https://i.imgur.com/pLdgxlJ.png)
-
-Layer 1
-
-![Layer 1](https://i.imgur.com/v24h9EO.png)
diff --git a/keyboards/w1_at/keymaps/via/readme.md b/keyboards/w1_at/keymaps/via/readme.md
deleted file mode 100644
index 33cdf89e600..00000000000
--- a/keyboards/w1_at/keymaps/via/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# The default keymap for W1-AT. VIA support enabled.
-
-Layer 0
-
-![Layer 0](https://i.imgur.com/4bUxnAz.png)
-
-Layer 1
-
-![Layer 1](https://i.imgur.com/v24h9EO.png)
diff --git a/keyboards/w1_at/keymaps/zq/keymap.c b/keyboards/w1_at/keymaps/zq/keymap.c
deleted file mode 100644
index eba9aedb8f2..00000000000
--- a/keyboards/w1_at/keymaps/zq/keymap.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright 2021 Zhi Quan
- *
- * 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 custom_keycodes {
-    KC_P00 = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
-    KC_F1,   KC_F2,      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,     TG(2),   KC_PSLS, KC_PAST, KC_PMNS,
-    KC_F3,   KC_F4,      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_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_F5,   KC_F6,      KC_ESC,  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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_F7,   KC_F8,      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, MO(1),               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_F9,   KC_F10,     KC_LCTL,          KC_LCMD,                            KC_SPC,                                      KC_ROPT,          MO(1),               KC_P0,   KC_P00,  KC_PDOT, KC_PENT),
-
-[1] = LAYOUT_all( /* FN */
-    KC_TRNS, 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_DEL,  KC_TRNS,    KC_TRNS, KC_MPRV, KC_MNXT, 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_PSCR, KC_TRNS, KC_TRNS, QK_BOOT,             KC_HOME, KC_UP,   KC_PGUP, KC_VOLU,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_LEFT, KC_MUTE, KC_RGHT, KC_VOLU,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_END,  KC_DOWN, KC_PGDN, KC_MPLY,
-    KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY),
-
-[2] = LAYOUT_all( /* Numpad */
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_HOME, KC_UP,   KC_PGUP, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_LEFT, XXXXXXX, 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_END,  KC_DOWN, KC_PGDN, 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,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch(keycode) {
-        case KC_P00:
-            if (record->event.pressed) {
-                tap_code(KC_P0);
-                tap_code(KC_P0);
-            }
-            return false;
-            break;
-        case KC_ESC:
-            if (record->event.pressed) {
-                // Turn on capslock indicator.
-                writePin(LED_CAPS_LOCK_PIN, LED_PIN_ON_STATE);
-            } else {
-                // Turn off capslock indicator.
-                writePin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
-            }
-    }
-    return true;
-}
-
-// Customized function so that numlock and capslock indicator are no longer controlled by the host.
-bool led_update_user(led_t led_state) {
-#if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN)
-#    if LED_PIN_ON_STATE == 0
-        // invert the whole thing to avoid having to conditionally !led_state.x later
-        led_state.raw = ~led_state.raw;
-#    endif
-
-// #    ifdef LED_NUM_LOCK_PIN
-//         writePin(LED_NUM_LOCK_PIN, led_state.num_lock);
-// #    endif
-// #    ifdef LED_CAPS_LOCK_PIN
-//         writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
-// #    endif
-#    ifdef LED_SCROLL_LOCK_PIN
-        writePin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock);
-#    endif
-#    ifdef LED_COMPOSE_PIN
-        writePin(LED_COMPOSE_PIN, led_state.compose);
-#    endif
-#    ifdef LED_KANA_PIN
-        writePin(LED_KANA_PIN, led_state.kana);
-#    endif
-#endif
-
-    // Return false to let led_update_kb fall through.
-    return false;
-}
-
-// Customized function to manage numlock indicator based on layer.
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        // Base layer
-        case 0:
-            // Turn on numlock indicator.
-            writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE);
-            break;
-
-        // Numpad navigation layer
-        case 2:
-            // Turn off numlock indicator.
-            writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
-            break;
-    }
-
-    return state;
-}
\ No newline at end of file
diff --git a/keyboards/w1_at/keymaps/zq/readme.md b/keyboards/w1_at/keymaps/zq/readme.md
deleted file mode 100644
index 103130b161a..00000000000
--- a/keyboards/w1_at/keymaps/zq/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Personal W1-AT keymap
-The main highlights are as follows:
-* VIA support enabled
-* Enter bootloader mode using Fn + \
-* Grave key (` and ~) in place of Esc key
-* Esc in place of CapsLock key
-* Use NumLock LED indicator on layers: ON in layer 0, OFF in layer 2 (workaround for macOS since there is no NumLock key)
-* Use CapsLock LED indicator on Esc key
-
-
-## Layer 0 (Base)
----
-![Layer 0](https://i.imgur.com/l1OKSBB.png)
-
-## Layer 1 (Function)
----
-![Layer 1](https://i.imgur.com/RdzVyvb.png)
-
-## Layer 2 (Numpad Navigation)
----
-![Layer 2](https://i.imgur.com/xKVnQaK.png)
\ No newline at end of file
diff --git a/keyboards/w1_at/readme.md b/keyboards/w1_at/readme.md
deleted file mode 100644
index 7608e72f762..00000000000
--- a/keyboards/w1_at/readme.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# W1-AT
-
-This is a standard weird layout PCB, best build with a 10U spacebar. It supports VIA.
-
-* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
-* Hardware Supported: A TKL keyboard with STM32F072CB
-* Hardware Availability: https://geon.works/ 
-
-## Instructions
-
-### Build
-
-Make example for this keyboard (after setting up your build environment):
-
-    make w1_at: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 w1_at:<keymap>:flash`)
diff --git a/keyboards/w1_at/rules.mk b/keyboards/w1_at/rules.mk
deleted file mode 100644
index 7c0709f41e6..00000000000
--- a/keyboards/w1_at/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Wildcard to allow APM32 MCU
-DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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/w1_at/w1_at.c b/keyboards/w1_at/w1_at.c
deleted file mode 100644
index d4c4ce932a3..00000000000
--- a/keyboards/w1_at/w1_at.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 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 "quantum.h"
-
-void led_init_ports(void) {
-    // Set our LED pins as open drain outputs
-    palSetLineMode(LED_CAPS_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(LED_NUM_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(LED_SCROLL_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(LED_KANA_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(A14, PAL_MODE_OUTPUT_OPENDRAIN);
-}
-
-layer_state_t layer_state_set_kb(layer_state_t state) {
-    writePin(A14, !layer_state_cmp(state, 1));
-    return layer_state_set_user(state);
-}
\ No newline at end of file
diff --git a/keyboards/waterfowl/keymaps/cyanduck/keymap.c b/keyboards/waterfowl/keymaps/cyanduck/keymap.c
deleted file mode 100644
index ac52c7454df..00000000000
--- a/keyboards/waterfowl/keymaps/cyanduck/keymap.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright 2022  CyanDuck
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _COLEMAKDH,
-    _NAVNUM,
-    _SYM,
-    _FUNC,
-    _GAME
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak-DH
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |   Q  |   W  |   F  |   P  |   B  |                      |   J  |   L  |   U  |   Y  |   ;  |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * |   A  |   R  |   S  |   T  |   G  |                      |   M  |   N  |   E  |   I  |   O  |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * |   Z  |   X  |   C  |   D  |   V  |  |  2  |    |  3  |  |   K  |   H  |   ,  |   .  |   /  |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   | DEL | SPACE | TAB  |            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_COLEMAKDH] = LAYOUT(
-  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,         KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-  KC_A,    MT(MOD_LALT, KC_R),    MT(MOD_LCTL, KC_S),    MT(MOD_LSFT, KC_T),    KC_G,         KC_M,    MT(MOD_LSFT, KC_N),    MT(MOD_LCTL, KC_E),    MT(MOD_LALT, KC_I),    KC_O,
-  KC_Z,    KC_X,    KC_C,    MT(MOD_LGUI, KC_D),    KC_V,         KC_K,    MT(MOD_LGUI, KC_H),    KC_COMM, KC_DOT,  KC_SLSH,
-  KC_1, LT(3,KC_DEL), LT(1,KC_SPC), KC_TAB, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-
-/* NAVNUM
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |  ESC | PgUp |  UP  | PgDn | TO(4)|                      |   /  |   7  |   8  |   9  |   -  |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * | Home | Left | Down | Right| End  |                      |   =  |   4  |   5  |   6  |   +  |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * |      |      |  INS | TO(2)|      |  |  2  |    |  3  |  |   0  |   1  |   2  |   3  |   *  |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   | DEL | SPACE | MO(3)|            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_NAVNUM] = LAYOUT(
-  KC_ESC,    KC_PGUP,    KC_UP,    KC_PGDN,   TO(4),    KC_SLSH,    KC_7,    KC_8,    KC_9,    KC_MINS,
-  KC_HOME,   KC_LEFT,    KC_DOWN,  KC_RGHT,   KC_END,  KC_EQL,     KC_4,    KC_5,    KC_6,    KC_PLUS,
-  KC_NO,    KC_NO,      KC_INS,   TO(2),     KC_NO,    KC_0,       KC_1,    KC_2,    KC_3,    KC_ASTR,
-  KC_1, LT(3,KC_DEL), LT(1,KC_SPC), KC_ESC, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-
-/* SYM
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |   %  |   @  |   [  |   ]  |   \  |                      |   ¦  |   ¬  |   ^  |      |      |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * |   #  |   !  |   (  |   )  |   |  |                      |   _  |   '  |   "  |   ~  |   `  |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * |   $  |   £  |   {  |   }  |   &  |  |  2  |    |  3  |  | TO(1)|      |      |      |      |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   | DEL | SPACE | TAB  |            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_SYM] = LAYOUT(
-  KC_PERC, S(KC_QUOT),   KC_LBRC, KC_RBRC,  KC_NUBS,     RALT(KC_GRV), S(KC_GRV), KC_CIRC, KC_NO,   KC_NO,
-  KC_NONUS_HASH, KC_EXLM, KC_LPRN, KC_RPRN, S(KC_NUBS),      KC_UNDS, KC_QUOT, S(KC_2), S(KC_NUHS), KC_GRV,
-  KC_DLR, S(KC_3),  KC_LCBR, KC_RCBR, KC_AMPR,      TO(1), KC_NO,   KC_NO,   KC_NO,   KC_NO,
-  KC_1, LT(3,KC_DEL), LT(1,KC_SPC), KC_TAB, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-
-/* FUNC
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |      |      |      |      |      |                      |      |  F7  |  F8  |  F9  |  F11 |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * |      |      |      |      |      |                      |      |  F4  |  F5  |  F6  |  F12 |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * | Reset|      |      |      |      |  |  2  |    |  3  |  |  F10 |  F1  |  F2  |  F3  |  F13 |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   | DEL | SPACE | TAB  |            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_FUNC] =  LAYOUT(
-  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F11,
-  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_NO,   KC_F4,   KC_F5,   KC_F6,   KC_F12,
-  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F13,
-  KC_1, LT(3,KC_DEL), LT(1,KC_SPC), KC_TAB, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-
-/* GAME
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |  ESC |   Q  |   W  |   E  |   R  |                      |      |      |      |      |      |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * |Shift |   A  |   S  |   D  |   F  |                      |      |      |      |      |      |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * | Ctrl |   Z  |   X  |   C  |   V  |  |  2  |    |  3  |  |      |      |      |      |      |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   |  T  | SPACE | TAB  |            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_GAME] = LAYOUT(
-  KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,         KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
-  KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,         KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
-  KC_LCTL,    KC_Z,    KC_X,    KC_C,    KC_V,         KC_NO,    KC_NO,    KC_NO, KC_NO,  KC_NO,
-  KC_1, KC_T, KC_SPC, KC_TAB, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-};
diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
index e01f469285d..3da58bc5d2d 100644
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/config.h
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil b/keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil
deleted file mode 100644
index fbfe79ba7a1..00000000000
--- a/keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "uid": -1, "layout": [[["KC_ESCAPE", -1, "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", -1, "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCREEN", "KC_SCROLLLOCK", "KC_PAUSE"], ["KC_GRAVE", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINUS", "KC_EQUAL", "KC_BSPACE", -1, "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_LBRACKET", "KC_RBRACKET", "KC_BSLASH", -1, "KC_DELETE", "KC_END", "KC_PGDOWN"], ["KC_CAPSLOCK", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCOLON", "KC_QUOTE", -1, "KC_ENTER", "KC_NO", -1, -1, -1], ["KC_LSHIFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMMA", "KC_DOT", "KC_SLASH", -1, -1, "KC_RSHIFT", "KC_NO", -1, "KC_UP", -1], ["KC_LCTRL", "KC_LGUI", "KC_LALT", -1, -1, -1, "KC_SPACE", -1, -1, -1, "KC_RGUI", -1, "MO(1)", -1, "KC_RCTRL", "KC_LEFT", "KC_DOWN", "KC_RIGHT"]], [["KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "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, "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RESET", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["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, "KC_TRNS", "KC_NO", -1, -1, -1], ["KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, -1, "KC_TRNS", "KC_NO", -1, "KC_VOLU", -1], ["KC_TRNS", "KC_TRNS", "KC_TRNS", -1, -1, -1, "KC_TRNS", -1, -1, -1, "KC_TRNS", -1, "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_TRNS"]]], "encoder_layout": [[], []], "layout_options": 0, "macro": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], "vial_protocol": -1, "via_protocol": 9}
\ No newline at end of file
diff --git a/keyboards/wavtype/p01_ultra/keymaps/vial/config.h b/keyboards/wavtype/p01_ultra/keymaps/vial/config.h
index 0d44202e5a1..9a91adfe05c 100644
--- a/keyboards/wavtype/p01_ultra/keymaps/vial/config.h
+++ b/keyboards/wavtype/p01_ultra/keymaps/vial/config.h
@@ -4,4 +4,6 @@
 
 #define VIAL_KEYBOARD_UID {0xAF, 0xD3, 0xD3, 0xB9, 0xA1, 0x5C, 0x47, 0x8F}
 #define VIAL_UNLOCK_COMBO_ROWS {1, 2}
-#define VIAL_UNLOCK_COMBO_COLS {0, 15}
\ No newline at end of file
+#define VIAL_UNLOCK_COMBO_COLS {0, 15}
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index f6839b90064..c86ead57bd8 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -17,65 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 27
-
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_DEFAULT_HUE 108 // Sets the default hue value, if none has been set
-
-// 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
-// #    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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json
index 4d4081faf0c..802ae8eed6c 100644
--- a/keyboards/wekey/we27/info.json
+++ b/keyboards/wekey/we27/info.json
@@ -9,7 +9,14 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "rainbow_moving_chevron": true
+        },
+        "default": {
+            "hue": 108
+        },
+        "driver": "ws2812",
+        "react_on_keyup": true
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "C7", "D6", "D4"],
diff --git a/keyboards/werk_technica/one/config.h b/keyboards/werk_technica/one/config.h
new file mode 100644
index 00000000000..765e70851b4
--- /dev/null
+++ b/keyboards/werk_technica/one/config.h
@@ -0,0 +1,7 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Set HSE clock since it differs from F411 default */
+#define STM32_HSECLK 16000000
\ No newline at end of file
diff --git a/keyboards/werk_technica/one/info.json b/keyboards/werk_technica/one/info.json
new file mode 100644
index 00000000000..4933c7fd7cd
--- /dev/null
+++ b/keyboards/werk_technica/one/info.json
@@ -0,0 +1,297 @@
+{
+    "manufacturer": "werk_technica",
+    "keyboard_name": "one",
+    "maintainer": "ebastler",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "A15"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B1", "B10", "B12", "B13", "B14", "B15", "A8", "A10", "A13", "A5", "A4", "C15"],
+        "rows": ["A0", "A1", "A2", "A3", "B9", "B8"]
+    },
+    "processor": "STM32F411",
+    "url": "https://werktechnica.com/",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x7774"
+    },
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "PRSC", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "DIAL", "matrix": [3, 13], "x": 15.25, "y": 0},
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "BKSP", "matrix": [0, 14], "x": 13, "y": 1.25, "w": 2},
+                {"label": "HOME", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\"", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "PG UP", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "ENTER", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "PG DN", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"label": "SHIFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "SHIFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "UP", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "CTRL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "SUPER", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "ALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "SPACE", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "ALT", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "FUNC", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "LEFT", "matrix": [5, 12], "x": 13.5, "y": 5.5},
+                {"label": "DOWN", "matrix": [5, 13], "x": 14.5, "y": 5.5},
+                {"label": "RIGHT", "matrix": [5, 14], "x": 15.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "PRSC", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "DIAL", "matrix": [3, 13], "x": 15.25, "y": 0},
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "BKSP", "matrix": [0, 14], "x": 13, "y": 1.25, "w": 2},
+                {"label": "HOME", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "ENTER", "matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"label": "PG UP", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "NUHS", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "PG DN", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"label": "SHIFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "NUBS", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "SHIFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "UP", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "CTRL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "SUPER", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "ALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "SPACE", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "ALT", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "FUNC", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "LEFT", "matrix": [5, 12], "x": 13.5, "y": 5.5},
+                {"label": "DOWN", "matrix": [5, 13], "x": 14.5, "y": 5.5},
+                {"label": "RIGHT", "matrix": [5, 14], "x": 15.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "PRSC", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "DIAL", "matrix": [3, 13], "x": 15.25, "y": 0},
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": " ", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "BKSP", "matrix": [0, 14], "x": 14, "y": 1.25},
+                {"label": "HOME", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "TAB", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\"", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "PG UP", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "CAPS", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "ENTER", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "PG DN", "matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"label": "SHIFT", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "NUBS", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "SHIFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "UP", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "CTRL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "SUPER", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "ALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "SPACE", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.75},
+                {"label": "SPACE", "matrix": [5, 6], "x": 6.5, "y": 5.25, "w": 1.25},
+                {"label": "SPACE", "matrix": [5, 8], "x": 7.75, "y": 5.25, "w": 2.25},
+                {"label": "ALT", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "FUNC", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "LEFT", "matrix": [5, 12], "x": 13.5, "y": 5.5},
+                {"label": "DOWN", "matrix": [5, 13], "x": 14.5, "y": 5.5},
+                {"label": "RIGHT", "matrix": [5, 14], "x": 15.5, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/werk_technica/one/keymaps/default/keymap.c b/keyboards/werk_technica/one/keymaps/default/keymap.c
new file mode 100644
index 00000000000..6d172db617e
--- /dev/null
+++ b/keyboards/werk_technica/one/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2023 Moritz Plattner
+ *
+ * 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(    /* keymap for layer 0 */
+        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,            LT(2, 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_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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, LT(1, KC_APP),     KC_LEFT, KC_DOWN,  KC_RGHT
+        ),
+
+    [1] = LAYOUT_all(    /* keymap for layer 1 */
+        KC_TRNS, KC_TRNS, KC_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_TRNS, KC_TRNS, KC_INS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_HOME,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_END,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          MO(2),   KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS
+        ),
+
+    [2] = LAYOUT_all(    /* keymap for layer 2 */
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS
+        ),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+};
+#endif
diff --git a/keyboards/werk_technica/one/keymaps/default/rules.mk b/keyboards/werk_technica/one/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/werk_technica/one/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/werk_technica/one/keymaps/via/keymap.c b/keyboards/werk_technica/one/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6d172db617e
--- /dev/null
+++ b/keyboards/werk_technica/one/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2023 Moritz Plattner
+ *
+ * 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(    /* keymap for layer 0 */
+        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,            LT(2, 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_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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, LT(1, KC_APP),     KC_LEFT, KC_DOWN,  KC_RGHT
+        ),
+
+    [1] = LAYOUT_all(    /* keymap for layer 1 */
+        KC_TRNS, KC_TRNS, KC_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_TRNS, KC_TRNS, KC_INS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_HOME,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_END,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          MO(2),   KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS
+        ),
+
+    [2] = LAYOUT_all(    /* keymap for layer 2 */
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS
+        ),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    [2] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+};
+#endif
diff --git a/keyboards/werk_technica/one/keymaps/via/rules.mk b/keyboards/werk_technica/one/keymaps/via/rules.mk
new file mode 100644
index 00000000000..9061429e54a
--- /dev/null
+++ b/keyboards/werk_technica/one/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes 
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/werk_technica/one/mcuconf.h b/keyboards/werk_technica/one/mcuconf.h
new file mode 100644
index 00000000000..d25a2619fd1
--- /dev/null
+++ b/keyboards/werk_technica/one/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include_next <mcuconf.h>
+
+/* Set PLL M divider from 4 (F411 GENERIC default) to 8, because of 16 MHz crystal on board */
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE                    8
\ No newline at end of file
diff --git a/keyboards/werk_technica/one/readme.md b/keyboards/werk_technica/one/readme.md
new file mode 100644
index 00000000000..8870e5f6931
--- /dev/null
+++ b/keyboards/werk_technica/one/readme.md
@@ -0,0 +1,26 @@
+# werk.technica one
+
+![WT One Moloko](https://i.imgur.com/4Bvywra.png)
+
+From looks to sound and feel, Werk One was designed as a cost is no object flagship product. A modular 75% exploded profile keyboard kit with hybrid gasket mount array and AEK-styled classic side profile curve.
+
+In a world of minimalism, Werk One is our tribute to the sophistication of art deco and 70’s futurism.
+
+* Keyboard Maintainer: [ebastler](https://github.com/ebastler)
+* Hardware Supported: Rev1 solder and hotswap PCB (both work with `default` and `via` keymaps, but not all keymap positions are available on hotswap PCBs)
+* Hardware Availability: [Groupbuy](https://werktechnica.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb werk_technica/one -km default
+
+Flash example for this keyboard (after setting up your build environment):
+
+    qmk flash -kb werk_technica/one -km 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 2 ways:
+* Bootmagic reset: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard
+* Physical reset button: Hold for approx. 1 second to enter Bootloader
diff --git a/keyboards/werk_technica/one/rules.mk b/keyboards/werk_technica/one/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/werk_technica/one/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/westfoxtrot/cyclops/keymaps/peippo/config.h b/keyboards/westfoxtrot/cyclops/keymaps/peippo/config.h
deleted file mode 100644
index 6278fae6585..00000000000
--- a/keyboards/westfoxtrot/cyclops/keymaps/peippo/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 '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
-
-// place overrides here
diff --git a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c b/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
deleted file mode 100644
index 40f8c98344d..00000000000
--- a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2018 westfoxtrot
- *
- * 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] = {
-
-	/* Default layer
-	* ,--------------------------------------------------------------------------------------------------------------------.  ,-------.
-	* | GrvEsc |   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |   9   |   0   |   +   |   ´   | Backspace |  | PgUp  |
-	* |--------------------------------------------------------------------------------------------------------------------+  +-------+
-	* | Tab      |   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   |   Å   |   ¨   |  Enter  |  | PgDn  |
-	* |-----------------------------------------------------------------------------------------------------------,        |  `-------`
-	* | Mod Layer |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   Ö   |   Ä   |   '   |        |
-	* |-----------------------------------------------------------------------------------------------------------------------,
-	* | Shift   |   <  |   Z   |   X   |   C   |   V   |   B   |   N   |   M   |   ,   |   .   |   -   |    Shift     |  Up   |
-	* |-----------------------------------------------------------------------------------------------------------------------+-------,
-	* | Control | Option | Command |                        Space                         | Command | Option  | Left  | Down  | Right |
-	* `-------------------------------------------------------------------------------------------------------------------------------'
-	*/
-
-	[0] = LAYOUT(
-		QK_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_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_PGDN,
-		MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
-		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,   KC_UP,
-		KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT),
-
-
-	/* Modifier layer
-	* ,--------------------------------------------------------------------------------------------------------------------.  ,-------.
-	* | Esc    |       |       |       |       |       |       |       |   [   |   ]   |       |       |       |   Delete  |  | VolUp |
-	* |--------------------------------------------------------------------------------------------------------------------+  +-------+
-	* |          |       |       |       |       |       |       | PgUp  |  Up   | PgDn  |       |       |       |         |  | VolDn |
-	* |-----------------------------------------------------------------------------------------------------------,        |  `-------`
-	* |           |       |Scrnsht|Desktop|       |       |       | Left  |  Down | Right |       |       | Reset |        |
-	* |-----------------------------------------------------------------------------------------------------------------------,
-	* | Shift   |      |       |       |       |       |       |       |       |       |       |       |    Shift     | Play  |
-	* |-----------------------------------------------------------------------------------------------------------------------+-------,
-	* |         |        |         |                                                      |         |         | Prev  | Mute  | Next  |
-	* `-------------------------------------------------------------------------------------------------------------------------------'
-	*/
-
-	[1] = LAYOUT(
-		KC_ESC,  _______, _______,    _______, _______, _______, _______, _______, RALT(KC_8),  RALT(KC_9), _______, _______, _______, KC_DEL,  KC_VOLU,
-		_______, _______, _______,    _______, _______, _______, _______, KC_PGUP, KC_UP,       KC_PGDN,    _______, _______, _______,          KC_VOLD,
-		_______, _______, SGUI(KC_5), KC_F11,  _______, _______, _______, KC_LEFT, KC_DOWN,     KC_RGHT,    _______, _______, QK_BOOT, _______,
-		KC_LSFT, _______, _______,    _______, _______, _______, _______, _______, _______,     _______,    _______, _______, KC_RSFT, _______, KC_MPLY,
-		_______, _______, _______,                               _______,                                   _______, _______,          KC_MRWD, KC_MUTE, KC_MFFD),
-};
diff --git a/keyboards/westfoxtrot/cyclops/keymaps/peippo/readme.md b/keyboards/westfoxtrot/cyclops/keymaps/peippo/readme.md
deleted file mode 100644
index a587d74c2af..00000000000
--- a/keyboards/westfoxtrot/cyclops/keymaps/peippo/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Cyclops keymap by peippo
-
-Nordic layout with faster access to cursor movement keys and brackets.
-
-## Keymap notes
-
--   Default layer has a Grave Escape which outputs Escape when pressed normally, and `§` when Shift or Command are held. I like to setup Command+Esc to moving focus to next window (MacOS preferences, Keyboard / Shortcuts / Keyboard).
--   `Caps Lock` can be held to access the modifier layer.
-
-## Modifier layer
-
--   Additional cursor movement keys on `J/K/L/I`, and Page Up/Page Down on `U/O`.
--   Easier access to [] & {} (w/ Shift) on `8/9`.
--   Show desktop on `D`.
--   Screen capture tool on `S`.
--   Media shortcuts on Arrow keys & Page Up/Page Down.
-
-### Build
-
-To build the firmware, run `make westfoxtrot/cyclops:peippo`.
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c b/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
deleted file mode 100644
index 2aa63a234c5..00000000000
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2019 westfoxtrot
- *
- * 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 _MA 0
-#define _F1 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_MA] = LAYOUT_all( /* Base */
-  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_DEL, 	 	KC_NUM, 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_BSPC, 	 	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-  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_NO,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
-  KC_LSFT,KC_BSLS,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_CAPS, KC_LGUI,KC_LALT,                    KC_NO,KC_SPC,KC_NO,        KC_RALT,KC_RALT,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
-
-[_F1] = LAYOUT_all( /* Function Layer */
-  QK_BOOT, 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_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
-  _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,  _______,  	 	_______, _______, _______, _______,
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______, 	_______, _______, _______, _______,
-  _______, _______,_______,                    _______,_______,_______,        _______,_______,_______,          _______,_______,_______,    _______, _______, _______),
-
-};
-
-void matrix_init_user(void) {
-  //user initialization
-}
-
-void matrix_scan_user(void) {
-  //user matrix
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/readme.md b/keyboards/westfoxtrot/cypher/rev5/keymaps/max/readme.md
deleted file mode 100644
index 05c37002666..00000000000
--- a/keyboards/westfoxtrot/cypher/rev5/keymaps/max/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for cypher
\ No newline at end of file
diff --git a/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/README.md b/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/README.md
deleted file mode 100644
index 7c1fa38fcbb..00000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# krusli's RAMA M6-A Layout
-
-Personal keymap for the RAMA M6-A.
-
-Keymap was from my own port for the M6-A before official support was added, thus the backlighting code is not ported yet from the official default keymap.
-
-Top-right button acts as a "toggle between layers" button. Layer 0 -> Layer 1 -> Layer 2 -> Layer 0 -> ...
-
-*   Layer 0: Git and Discord shortcuts
-*   Layer 1: Media playback and volume controls
-*   Layer 2: Osu! gamepad layer
-
-## Helpful alternative keymaps (WIP)
-
-### Arrow cluster
-
-Use [karabiner-elements](https://github.com/tekezo/Karabiner-Elements) on macOS so that the state of the modifiers (shift, caps lock) are synchronised between keyboards (for shift + arrow key text selection, for example). It's also a handy tool for customising keyboard behaviour on a Mac.
-
-On Windows/Linux modifier state should be shared between all keyboards by default.
-
-Installation: install [homebrew](https://brew.sh) and run `brew install Caskroom/cask/karabiner-elements`.
-
-```C
-LAYOUT(
-  KC_ESC,   KC_UP,   TO(_LAYER0),
-  KC_LEFT,  KC_DOWN, KC_RIGHT
-)
-```
diff --git a/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/keymap.c b/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/keymap.c
deleted file mode 100644
index f12e489b348..00000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-// 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 layers
-{
-    _LAYER0,
-    _LAYER1,
-    _LAYER2
-};
-
-enum custom_keycodes
-{
-    GIT_ADD = SAFE_RANGE,
-    GIT_COMMIT,
-    GIT_PUSH,
-    MUTE,
-    DEAFEN
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    if (record->event.pressed)
-    {
-        switch (keycode)
-        {
-        case GIT_ADD:
-            SEND_STRING("git add ." SS_TAP(X_ENTER));
-            break;
-        case GIT_COMMIT:
-            SEND_STRING("git commit -m " SS_DOWN(X_LSFT) SS_TAP(X_QUOTE) SS_UP(X_LSFT));
-            break;
-        case GIT_PUSH:
-            SEND_STRING("git push" SS_TAP(X_ENTER));
-            break;
-        case MUTE:
-            SEND_STRING(SS_LGUI(SS_LSFT("M")));
-            break;
-        case DEAFEN:
-            SEND_STRING(SS_LGUI(SS_LSFT("D")));
-            break;
-            return false;
-        }
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_LAYER0] = LAYOUT(
-        MUTE, DEAFEN, TO(_LAYER1),
-        GIT_ADD, GIT_COMMIT, GIT_PUSH),
-    [_LAYER1] = LAYOUT(
-        KC_VOLD, KC_VOLU, TO(_LAYER2),
-        KC_MRWD, KC_MPLY, KC_MNXT),
-    [_LAYER2] = LAYOUT(
-        KC_ESC, KC_UP, TO(_LAYER0),
-        KC_Z, KC_X, KC_SPACE)};
-
-void matrix_init_user(void)
-{
-#ifdef BACKLIGHT_ENABLE
-    backlight_level(0);
-#endif
-}
diff --git a/keyboards/wilba_tech/rama_works_m6_a/keymaps/rys/keymap.c b/keyboards/wilba_tech/rama_works_m6_a/keymaps/rys/keymap.c
deleted file mode 100644
index f7e35a9efc0..00000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/keymaps/rys/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers
-{
-    _LAYER0,
-    _LAYER1
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_LAYER0] = LAYOUT(
-        KC_NO,   KC_UP,   TO(_LAYER1),
-        KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-    [_LAYER1] = LAYOUT(
-        KC_NUBS,    KC_NUHS,    TO(_LAYER0),
-        LCAG(KC_Z), LCAG(KC_X), LCAG(KC_C)
-    )
-};
diff --git a/keyboards/wilba_tech/wt20_h1/info.json b/keyboards/wilba_tech/wt20_h1/info.json
new file mode 100644
index 00000000000..77905e275e0
--- /dev/null
+++ b/keyboards/wilba_tech/wt20_h1/info.json
@@ -0,0 +1,80 @@
+{
+    "manufacturer": "wilba.tech",
+    "keyboard_name": "WT20-H1",
+    "maintainer": "Wilba",
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F0", "B2", "B1"],
+        "rows": ["B3", "F1", "F5", "F6", "F7"]
+    },
+    "processor": "atmega32u4",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0041",
+        "vid": "0x6582"
+    },
+    "community_layouts": ["ortho_5x4", "numpad_5x4"],
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4}
+            ]
+        },
+        "LAYOUT_ortho_5x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c b/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c
new file mode 100644
index 00000000000..541fbd05fb1
--- /dev/null
+++ b/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c
@@ -0,0 +1,14 @@
+// Copyright 2024 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_5x4(
+    KC_NUM,  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
+  ),
+};
diff --git a/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c b/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c
new file mode 100644
index 00000000000..4fc052443e4
--- /dev/null
+++ b/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2024 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "../default/keymap.c"
diff --git a/keyboards/wilba_tech/wt20_h1/keymaps/via/rules.mk b/keyboards/wilba_tech/wt20_h1/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/wilba_tech/wt20_h1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/wilba_tech/wt20_h1/readme.md b/keyboards/wilba_tech/wt20_h1/readme.md
new file mode 100644
index 00000000000..586b7e36f4e
--- /dev/null
+++ b/keyboards/wilba_tech/wt20_h1/readme.md
@@ -0,0 +1,19 @@
+# wilba.tech WT20-H1
+
+WT20-H1 is a hotswap numpad PCB supporting split plus, enter and zero keys (i.e. 5x4 ortho).
+
+Initially designed for the [HIBI JUNIOR](https://hibi.mx/products/junior-r1)
+
+-   Keyboard Maintainer: [wilba](https://github.com/wilba)
+-   Hardware Supported: wilba.tech WT20-H1-HIBI
+-   Hardware Availability: [HIBI](https://hibi.mx/products/junior-r1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wilba_tech/wt20_h1:default
+
+Flashing example for this keyboard:
+
+    make wilba_tech/wt20_h1: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/wilba_tech/wt20_h1/rules.mk b/keyboards/wilba_tech/wt20_h1/rules.mk
new file mode 100644
index 00000000000..c80812f6e0a
--- /dev/null
+++ b/keyboards/wilba_tech/wt20_h1/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally blank
diff --git a/keyboards/wilba_tech/wt60_a/rules.mk b/keyboards/wilba_tech/wt60_a/rules.mk
index 9ca8e8f9734..f7482c7a2f2 100644
--- a/keyboards/wilba_tech/wt60_a/rules.mk
+++ b/keyboards/wilba_tech/wt60_a/rules.mk
@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt60_a/wt60_a.c b/keyboards/wilba_tech/wt60_a/wt60_a.c
new file mode 100644
index 00000000000..04657835c9d
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_a/wt60_a.c
@@ -0,0 +1,120 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#if defined(MONO_BACKLIGHT_WT60_A)
+#    include "drivers/led/issi/is31fl3736-mono.h"
+#endif
+
+#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT60_A)
+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
+
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
+
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
+
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
+
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
+
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
+
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
+
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
+
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
+
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
+
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
+
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
+};
+#endif
diff --git a/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c b/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
deleted file mode 100644
index df9f0cc50cc..00000000000
--- a/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-// Default layout for WT60-D
-#include QMK_KEYBOARD_H
-
-enum my_layers {
-  _QWERTY,
-  _FNMS,
-};
-
-#define FNMS MO(_FNMS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// Default layer
-[_QWERTY] = LAYOUT_all(
-	QK_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_BSLS, 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_BSPC,
-	KC_GRV,  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_NO,   KC_Z,   KC_X,  KC_C, KC_V, KC_B,  KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FNMS,
-	KC_LCTL, KC_LALT, KC_LCMD,                   KC_SPC,                     KC_SPC,  FNMS,    KC_RALT, KC_RCTL),
-
-// Fn1 Layer
-[_FNMS] = 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_BSLS,  KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, QK_BOOT,
-	AG_TOGG, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, 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_DOWN, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-};
diff --git a/keyboards/wilba_tech/wt60_d/keymaps/madhatter/rules.mk b/keyboards/wilba_tech/wt60_d/keymaps/madhatter/rules.mk
deleted file mode 100644
index 35591533cc6..00000000000
--- a/keyboards/wilba_tech/wt60_d/keymaps/madhatter/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt65_a/rules.mk b/keyboards/wilba_tech/wt65_a/rules.mk
index 9ca8e8f9734..f7482c7a2f2 100644
--- a/keyboards/wilba_tech/wt65_a/rules.mk
+++ b/keyboards/wilba_tech/wt65_a/rules.mk
@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt65_a/wt65_a.c b/keyboards/wilba_tech/wt65_a/wt65_a.c
new file mode 100644
index 00000000000..398525c2391
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_a/wt65_a.c
@@ -0,0 +1,120 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#if defined(MONO_BACKLIGHT_WT65_A)
+#    include "drivers/led/issi/is31fl3736-mono.h"
+#endif
+
+#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT65_A)
+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
+
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
+
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
+
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
+
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
+
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
+
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
+
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
+
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
+
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
+
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
+
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
+};
+#endif
diff --git a/keyboards/wilba_tech/wt65_b/rules.mk b/keyboards/wilba_tech/wt65_b/rules.mk
index 9ca8e8f9734..f7482c7a2f2 100644
--- a/keyboards/wilba_tech/wt65_b/rules.mk
+++ b/keyboards/wilba_tech/wt65_b/rules.mk
@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt65_b/wt65_b.c b/keyboards/wilba_tech/wt65_b/wt65_b.c
new file mode 100644
index 00000000000..2e2385ace29
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_b/wt65_b.c
@@ -0,0 +1,120 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#if defined(MONO_BACKLIGHT_WT65_B)
+#    include "drivers/led/issi/is31fl3736-mono.h"
+#endif
+
+#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT65_B)
+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
+
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
+
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
+
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
+
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
+
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
+
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
+
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
+
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
+
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
+
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
+
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
+};
+#endif
diff --git a/keyboards/wilba_tech/wt65_g3/info.json b/keyboards/wilba_tech/wt65_g3/info.json
new file mode 100644
index 00000000000..bf0e0ed9d06
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_g3/info.json
@@ -0,0 +1,395 @@
+{
+    "manufacturer": "wilba.tech",
+    "keyboard_name": "WT65-G3",
+    "maintainer": "Wilba",
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "processor": "atmega32u4",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x003A",
+        "vid": "0x6582"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt65_g3/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_g3/keymaps/default/keymap.c
new file mode 100644
index 00000000000..159c2b0be26
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_g3/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Default layout for WT65-G3
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // Default layer
+    [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_NO,   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_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    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_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    // Fn1 Layer
+    [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_TRNS, KC_TRNS, KC_INS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/wilba_tech/wt65_g3/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_g3/keymaps/via/keymap.c
new file mode 100644
index 00000000000..4fc052443e4
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_g3/keymaps/via/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2024 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "../default/keymap.c"
diff --git a/keyboards/wilba_tech/wt65_g3/keymaps/via/rules.mk b/keyboards/wilba_tech/wt65_g3/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_g3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/wilba_tech/wt65_g3/readme.md b/keyboards/wilba_tech/wt65_g3/readme.md
new file mode 100644
index 00000000000..12744874d75
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_g3/readme.md
@@ -0,0 +1,19 @@
+# wilba.tech WT65-G3
+
+WT65-G3 is a keyboard PCB supporting 65% ANSI/ISO layout, 6.25U/7U bottom row (no blocker) and full/split backspace.
+
+Initially designed for the [HIBI HIBIKI](https://hibi.mx/products/hibiki)
+
+-   Keyboard Maintainer: [wilba](https://github.com/wilba)
+-   Hardware Supported: wilba.tech WT65-G3-HIBI
+-   Hardware Availability: [HIBI](https://hibi.mx/products/hibiki)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wilba_tech/wt65_g3:default
+
+Flashing example for this keyboard:
+
+    make wilba_tech/wt65_g3: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/wilba_tech/wt65_g3/rules.mk b/keyboards/wilba_tech/wt65_g3/rules.mk
new file mode 100644
index 00000000000..c80812f6e0a
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_g3/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally blank
diff --git a/keyboards/wilba_tech/wt65_h3/info.json b/keyboards/wilba_tech/wt65_h3/info.json
new file mode 100644
index 00000000000..7cef91a68c1
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h3/info.json
@@ -0,0 +1,390 @@
+{
+    "manufacturer": "wilba.tech",
+    "keyboard_name": "WT65-H3",
+    "maintainer": "Wilba",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "processor": "atmega32u4",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0036",
+        "vid": "0x6582"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt65_h3/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_h3/keymaps/default/keymap.c
new file mode 100644
index 00000000000..3fd505a748d
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h3/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Default layout for WT65-H3
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // Default layer
+    [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_NO,   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,   MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                               KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    // Fn1 Layer
+    [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_TRNS, KC_TRNS, KC_INS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/wilba_tech/wt65_h3/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_h3/keymaps/via/keymap.c
new file mode 100644
index 00000000000..4fc052443e4
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h3/keymaps/via/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2024 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "../default/keymap.c"
diff --git a/keyboards/wilba_tech/wt65_h3/keymaps/via/rules.mk b/keyboards/wilba_tech/wt65_h3/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/wilba_tech/wt65_h3/readme.md b/keyboards/wilba_tech/wt65_h3/readme.md
new file mode 100644
index 00000000000..7e57842e8f2
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h3/readme.md
@@ -0,0 +1,19 @@
+# wilba.tech WT65-H3
+
+WT65-H3 is a keyboard PCB supporting 65% ANSI layout, 6.25U/7U bottom row (no blocker) and full/split backspace.
+
+Initially designed for the [HIBI HIBIKI](https://hibi.mx/products/hibiki)
+
+-   Keyboard Maintainer: [wilba](https://github.com/wilba)
+-   Hardware Supported: wilba.tech WT65-H3-HIBI
+-   Hardware Availability: [HIBI](https://hibi.mx/products/hibiki)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wilba_tech/wt65_h3:default
+
+Flashing example for this keyboard:
+
+    make wilba_tech/wt65_h3: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/wilba_tech/wt65_h3/rules.mk b/keyboards/wilba_tech/wt65_h3/rules.mk
new file mode 100644
index 00000000000..c80812f6e0a
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h3/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally blank
diff --git a/keyboards/wilba_tech/wt65_xt/keymaps/zunger/keymap.c b/keyboards/wilba_tech/wt65_xt/keymaps/zunger/keymap.c
deleted file mode 100644
index 64b24e9bf4d..00000000000
--- a/keyboards/wilba_tech/wt65_xt/keymaps/zunger/keymap.c
+++ /dev/null
@@ -1,640 +0,0 @@
-/* Copyright 2021 Yonatan Zunger
- *
- * 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 <assert.h>
-
-// This keymap is designed to make it easy to type in a wide variety of languages, as well as
-// generate mathematical symbols (à la Space Cadet), without relying on the host OS to do
-// key mappings or handle accents. Why? Because different OS's do this in radically different
-// ways, and don't support all of the features one often needs.
-//
-// LAYER MAGIC (aka, typing in many alphabets)
-// 
-//   This keyboard has three sets of "polyglot" layers: GREEK, CADET, and YIDDISH. Each of these
-// is actually a pair of layers, FOO and SHIFTFOO, which are full of Unicode points that let you
-// type in them. (The Greek and Yiddish keymaps selected here are very canted towards use on a
-// QWERTY layout, rather than the "standard" layouts often used for those languages in monolingual
-// environments. This is useful if your keyboard doesn't have legends for all of them, which in
-// most cases it won't. Of course, you could easily add more.)
-//
-//   These each have their own layer select key, which can act as a held modifier key (GREEK+s to
-// produce sigma, etc). There's also a "layer lock" key; layer lock + modifier switches you into
-// that layer until you hit "layer lock" again to bounce back to QWERTY.
-//
-// ACCENT MAGIC
-//
-//   We want to support easy typing of diacriticals, again without relying on the host OS. (On
-// MacOS, if you want Unicode to work you have to lose all the normal accent combining keys, and
-// if you're in a multi-OS world, each OS has a totally different input method)
-//
-//   The real nuance comes from the three different ways Unicode represents these. Many common
-// accent + letter combinations like é have their own dedicated code points (the combined
-// normal form). One can also place a "combining accent mark" after the letter's code point to
-// form the decomposed normal form (NFKD); this often renders the same as the combined form, but
-// many less-sophisticated apps won't realize it's the same thing as the combined form (thus messing
-// up string matching), and if you backspace you need to backspace *twice* to remove the character,
-// because it's literally two characters. Finally, if you want to render just the accent mark as a
-// symbol of its own, that's a *third* code point. If you're simply typing, you don't want to think
-// about any of this!
-//
-//   We thus have a bunch of special keycodes for "accent requests," which live on the FUNCTION
-// layer. Accent requests don't do anything immediate, but when the *next* non-modifier key is hit,
-// we generate a combined code point (if possible), two uncombined points (in cases where combined
-// points don't exist), or the isolated accent followed by the next character typed (in cases where
-// what you typed next isn't a letterform at all, e.g. you hit the space bar). You can also hit
-// shift-<accent request> to just generate the uncombined accent on its own.
-//
-// The current accent request codes are modeled on the ones in MacOS.
-//
-//    fn+`    Grave accent (`)
-//    fn+e    Acute accent (´)
-//    fn+i    Circumflex (^)
-//    fn+u    Diaresis / umlaut / trema (¨)
-//    fn+c    Cedilla (¸)
-//    fn+n    Tilde (˜)
-//
-// Together, these functions make for a nice "polyglot" keyboard: one that can easily type in a wide
-// variety of languages, which is very useful for people who, well, need to type in a bunch of
-// languages.
-//
-// The major TODOs are:
-//   - Add accent support for Hebrew accents.
-//   - Factor the code below so that the data layers are more clearly separated from the code logic,
-//     so that other users of this keymap can easily add whichever alphabets they need without
-//     having to deeply understand the implementation. Probably something similar to
-//     users/drashna/keyrecords/unicode.c, but I want to see if I can do some preprocessor magic
-//     so that we can actually have the rendered *character* sitting in the code instead of just the
-//     hex code point!
-//
-// PLATFORM MAGIC (aka, working well on both Mac and Windows)
-//
-//   Finally, this keyboard can switch between Mac and Windows modes, changing various macro
-// combinations, the Unicode mode, and the position of the ALT and GUI keys.
-
-
-enum custom_keycodes {
-  // We provide special layer management keys:
-  //    GREEK triggers the Greek (aka "Front") layer, or the SHIFTGREEK layer when shift is held.
-  //          (Because we use Unicode, we need to implement shift-handling at the firmware level,
-  //          rather than the OS level like we do in the QWERTY layer)
-  //    CADET or GREEK+ALT triggers the Cadet (aka "Top") layer, or the SHIFTCADET layer when
-  //          shift is held.
-  //    YIDDISH triggers a keymap designed for easy Hebrew and Yiddish, based loosely on QWERTY
-  //          layouts.
-  //    LAYER_LOCK locks the "base" layer (i.e., QWERTY, GREEK, or CADET) to the value which is
-  //          pressed at the moment that it is being released. When a layer lock is set, the
-  //          analogous layer modifier key is reversed; e.g., if you lock the GREEK layer, then the
-  //          GREEK button bounces you back to QWERTY.
-  //
-  // We also parse the shift, alt, and caps lock keys to provide management of those which is
-  // compatible with these various layers.
-  KC_GREEK = SAFE_RANGE,
-  KC_CADET,
-  KC_YIDDISH,
-  KC_LAYER_LOCK,
-  KC_PLATFORM,  // Platform select
-
-  // OS-dependent macros
-  KC_VC_MUTE,  // Video conference mute
-  KC_VC_HAND,  // Video conference hand-raise
-  KC_SCRNSHT,  // Screenshot (gui-shift-S on Windows, gui-shift-4 on Mac)
-
-  // These are the keycodes generated by the various "accent request" keystrokes.
-  KC_ACCENT_START,
-  KC_CGRV = KC_ACCENT_START,  // Grave accent
-  KC_CAGU,  // Acute accent
-  KC_CDIA,  // Diaresis / umlaut / trema
-  KC_CCIR,  // Circumflex
-  KC_CCED,  // Cedilla
-  KC_CTIL,  // Tilde
-  KC_ACCENT_END,
-};
-
-enum layers_keymap {
-  _QWERTY = 0,
-
-  _FIRST_LANGUAGE_LAYER,
-  _YIDDISH = _FIRST_LANGUAGE_LAYER,
-  _SHIFTYIDDISH,
-  _GREEK,
-  _SHIFTGREEK,
-  _CADET,
-  _SHIFTCADET,
-  _LAST_LANGUAGE_LAYER,
-
-  // Function goes last.
-  _FUNCTION = _LAST_LANGUAGE_LAYER,
-};
-
-// We manage our OS mode internally, and store it in a static, rather than EEPROM, bit. That's
-// because it changes as we flip machines, and there's no good reason to wear out the memory.
-enum os_modes {
-  _WINDOWS = 0,
-  _MAC = 1,
-  _OS_MODES_MAX = 2,
-};
-static uint8_t os_mode = _MAC;
-
-// Key types matter for accent handling. If there's a pending accent request and another key is
-// pressed:
-// - If it's a normal key, we trigger all our magic accent handling.
-// - If it's a modifier key, we do nothing and let the accent request hold until the next keypress.
-// - If it's a special key, we drop the accent request but don't handle it.
-enum key_types {
-  _NORMAL_KEY,
-  _MODIFIER_KEY,
-  _SPECIAL_KEY,
-};
-
-// msec to hold the platform key to trigger a switch
-#define PLATFORM_HOLD_DURATION 750
-
-// This is so that H(xxxx) has the same width as _______, which makes the grids more legible.
-#define H(x) UC(0x##x)
-#define MO_FN MO(_FUNCTION)
-#define KC_LLCK KC_LAYER_LOCK
-
-// Values for our OS-dependent keys, as arrays keyed by OS mode. Use Meet shortcuts on Mac, Teams on Windows
-const char *VC_MUTE_VALUES[_OS_MODES_MAX] = {SS_LCTL(SS_LSFT("m")), SS_LCMD("d")};
-const char *VC_HAND_VALUES[_OS_MODES_MAX] = {SS_LCTL(SS_LSFT("k")), SS_LCTL(SS_LCMD("h"))};
-const char *SCRNSHT_VALUES[_OS_MODES_MAX] = {SS_LGUI(SS_LSFT("s")), SS_LCMD(SS_LSFT("4"))};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_QWERTY] = LAYOUT_65_xt_ansi_blocker_tsangan(
-		KC_ESC,      KC_LLCK,    KC_GRAVE,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_PLATFORM, KC_MPLY,    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_SCRNSHT,  KC_YIDDISH, 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_PGDN,
-		KC_GREEK,    KC_CADET,   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_VC_HAND,  KC_VC_MUTE, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO_FN,            KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* The Greek and Cadet layers. Tab, backspace, the nav and modifier keys, and the control block
-   * are always transparent.
-   *
-   * QWERTY GREEK   SGREEK  CADET   SCADET  YID      SYID
-   *   `                                    ׳ 05f3   ״ 05f4
-   *   1    ₁ 2081  ¹ 00b9  ¡ 00a1  ¿ 00bf  [transparent]
-   *   2    ₂ 2082  ² 00b2  « 00ab  » 00bb  [transparent]
-   *   3    ₃ 2083  ³ 00b3  £ 00a3  € 20ac  [transparent]
-   *   4    ₄ 2084  ⁴ 2074                  [transparent]
-   *   5    ₅ 2085  ⁵ 2075                  [transparent]
-   *   6    ₆ 2086  ⁶ 2076                  [transparent]
-   *   7    ₇ 2087  ⁷ 2077                  [transparent]
-   *   8    ₈ 2088  ⁸ 2078  ° 00b0  ⊗ 2297  [transparent]
-   *   9    ₉ 2089  ⁹ 2079                  [transparent]
-   *   0    ₀ 2080  ⁰ 2070  ∅ 2205          [transparent]
-   *   -    ₋ 208b  ⁻ 207b  ¬ 00ac  ⊖ 2296  [transparent]
-   *   =    ₊ 208a  ₋ 208b  ≠ 2260  ⊕ 2295  [transparent]
-   *   q    θ 03b8  Θ 0398  ℚ 211a          ק 05e7
-   *   w    ω 03c9  Ω 03a9                  ש 05e9
-   *   e    ε 03b5  Ε 0395  ∃ 2203  ∄ 2204  ע 05e2
-   *   r    ρ 03c1  Ρ 03a1  ℝ 211d          ר 05e8
-   *   t    τ 03c4  Τ 03a4                  ט 05d8  תּ fb4a
-   *   y    ψ 03c8  Ψ 03a8  ∨ 2228  ∧ 2227  ײ 05f2  ײַ fb1f
-   *   u    υ 03c5  Υ 03a5  ∪ 222a  ∩ 2229  ו 05d5  ױ 05f1
-   *   i    ι 03b9  Ι 0399  ∞ 221e  ℵ 2135  י 05d9
-   *   o    ο 03bf  Ο 039f                  ו 05d5  אָ fb2f
-   *   p    π 03c0  Π 03a0  ≡ 2261  ≢ 2262  פ 05e4  ף 05e3
-   *   [                    ± 00b1  ∓ 2213
-   *   ]                    ≈ 2248  ≉ 2249
-   *   \                    ∼ 223c  ≁ 2241
-   *   a    α 03b1  Α 0391  ∀ 2200  Å 212b  א 05d0  אַ fb2e
-   *   s    σ 03c3  Σ 03a3  ∈ 2208  ∉ 2209   ס 05e1 ת 05ea
-   *   d    δ 03b4  Δ 0394  ⊂ 2282  ⊄ 2284   ד 05d3
-   *   f    φ 03c6  Φ 03a6  ⊆ 2286  ⊈ 2288   פֿ fb4e
-   *   g    γ 03b3  Γ 0393  ⊇ 2287  ⊉ 2289   ג 05d2
-   *   h    η 03b7  Η 0397  ← 2190  ⇐ 21d0   ה 05d4
-   *   j            ϑ 03d1  ↓ 2193  ⇓ 21d3   ח 05d7  כֿ fb4d
-   *   k    κ 03ba  Κ 039a  ↑ 2191  ⇑ 21d1   כ 05db  ך 05da
-   *   l    λ 03bb  Λ 039b  → 2192  ⇒ 21d2   ל 05dc
-   *   ;    … 2026  ⋯ 22ef  ↔ 2194  ⇔ 21d4
-   *   '    · 00b7  • 2022  ∴ 2234  ⊙ 2299
-   *   z    ζ 03b6  Ζ 0396  ℤ 2124           ז 05d6
-   *   x    ξ 03be  Ξ 039e  ✘ 2718            צ 05e6  ץ 05e5
-   *   c    χ 03c7  Χ 03a7  ℂ 2102            כ 05db  ך 05da
-   *   v            ς 03c2  ✔ 2714  √ 221a    װ 05f0  בֿ fb4c
-   *   b    β 03b2  Β 0392                    ב 05d1
-   *   n    ν 03bd  Ν 039d  ℕ 2115            נ 05e0  ן 05df
-   *   m    μ 03bc  Μ 039c                    מ 05de  ם 05dd
-   *   ,    ≪ 226a  ≫ 226b  ∂ 2202  ∫ 222b
-   *   .    ≲ 2272  ≳ 2273  ≰ 2270  ≱ 2271
-   *   /                            ⊘ 2298
-   */
-	[_YIDDISH] = LAYOUT_65_xt_ansi_blocker_tsangan(
-		KC_TRNS,  KC_TRNS,    H(05f3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS,  KC_TRNS,    KC_TRNS, H(05e7), H(05e9), H(05e2), H(05e8), H(05d8), H(05f2), H(05d5), H(05d9), H(05d5), H(05e4), KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(05d0), H(05e1), H(05d3), H(fb4e), H(05d2), H(05d4), H(05d7), H(05db), H(05dc), KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(05d6), H(05e6), H(05db), H(05f0), H(05d1), H(05e0), H(05de), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
-	[_SHIFTYIDDISH] = LAYOUT_65_xt_ansi_blocker_tsangan(
-		KC_TRNS,  KC_TRNS,    H(05f4), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, H(fb4a), H(fb1f), H(05f1), KC_TRNS, H(fb2f), H(05e3), KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS,  KC_TRNS,    KC_TRNS, H(fb2e), H(05ea), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, H(fb4d), H(05da), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, H(05e5), H(05da), H(fb4c), KC_TRNS, H(05df), H(05dd), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
-	[_GREEK] = LAYOUT_65_xt_ansi_blocker_tsangan(
-		KC_TRNS,  KC_TRNS,    XXXXXXX, H(2081), H(2082), H(2083), H(2084), H(2085), H(2086), H(2087), H(2088), H(2089), H(2080), H(208b), H(208a), KC_TRNS,          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(03b8), H(03c9), H(03b5), H(03c1), H(03c4), H(03c8), H(03c5), H(03b9), H(03bf), H(03c0), XXXXXXX, XXXXXXX, XXXXXXX,          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(03b1), H(03c3), H(03b4), H(03c6), H(03b3), H(03b7), XXXXXXX, H(03ba), H(03bb), H(2026), H(00b7), KC_TRNS,                   KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(03b6), H(03be), H(03c7), XXXXXXX, H(03b2), H(03bd), H(03bc), H(226a), H(2272), XXXXXXX, KC_TRNS,                   KC_TRNS, KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
-	[_SHIFTGREEK] = LAYOUT_65_xt_ansi_blocker_tsangan(
-		KC_TRNS,  KC_TRNS,    XXXXXXX, H(00b9), H(00b2), H(00b3), H(2074), H(2075), H(2076), H(2077), H(2078), H(2079), H(2070), H(207b), H(208b), KC_TRNS,          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(0398), H(03a9), H(0395), H(03a1), H(03a4), H(03a8), H(03a5), H(0399), H(039f), H(03a0), XXXXXXX, XXXXXXX, XXXXXXX,          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(0391), H(03a3), H(0394), H(03a6), H(0393), H(0397), H(03d1), H(039a), H(039b), H(22ef), H(2022), KC_TRNS,                   KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(0396), H(039e), H(03a7), H(03c2), H(0392), H(039d), H(039c), H(226b), H(2273), XXXXXXX, KC_TRNS,                   KC_TRNS, KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
-	[_CADET] = LAYOUT_65_xt_ansi_blocker_tsangan(
-		KC_TRNS,  KC_TRNS,    XXXXXXX, H(00a1), H(00ab), H(00a3), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(00b0), XXXXXXX, H(2205), H(00ac), H(2260), KC_TRNS,          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(211a), XXXXXXX, H(2203), H(211d), XXXXXXX, H(2228), H(222a), H(221e), XXXXXXX, H(2261), H(00b1), H(2248), H(223c),          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(2200), H(2208), H(2282), H(2286), H(2287), H(2190), H(2193), H(2191), H(2192), H(2194), H(2234), KC_TRNS,                   KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(2124), H(2718), H(2102), H(2714), XXXXXXX, H(2115), XXXXXXX, H(2202), H(2270), XXXXXXX, KC_TRNS,                   KC_TRNS, KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
-	[_SHIFTCADET] = LAYOUT_65_xt_ansi_blocker_tsangan(
-		KC_TRNS,  KC_TRNS,    XXXXXXX, H(00bf), H(00bb), H(20ac), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(2297), XXXXXXX, XXXXXXX, H(2296), H(2295), KC_TRNS,          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, XXXXXXX, XXXXXXX, H(2204), XXXXXXX, XXXXXXX, H(2227), H(2229), H(2135), XXXXXXX, H(2262), H(2213), H(2249), H(2241),          KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, H(212b), H(2209), H(2284), H(2288), H(2289), H(21d0), H(21d3), H(21d1), H(21d2), H(21d4), H(2299), KC_TRNS,                   KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, H(221a), XXXXXXX, XXXXXXX, XXXXXXX, H(222b), H(2271), H(2298), KC_TRNS,                   KC_TRNS, KC_TRNS,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
-  // The function layer mostly contains the accent marks, but also has a few meta-control
-  // operations. The accent marks are placed by analogy with Mac OS.
-	[_FUNCTION] = LAYOUT_65_xt_ansi_blocker_tsangan(
-		QK_BOOT,  KC_TRNS,    KC_CGRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX,          XXXXXXX,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, XXXXXXX, XXXXXXX, KC_CAGU, XXXXXXX, XXXXXXX, XXXXXXX, KC_CDIA, KC_CCIR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,
-		KC_TRNS,  KC_TRNS,    KC_TRNS, XXXXXXX, XXXXXXX, KC_CCED, XXXXXXX, XXXXXXX, KC_CTIL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS,                   XXXXXXX, XXXXXXX,
-		KC_TRNS,  KC_TRNS,    KC_RCTL, KC_RGUI, KC_RALT,                            KC_TRNS,                                     KC_TRNS,          XXXXXXX, XXXXXXX, XXXXXXX),
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Accent implementation
-//
-// In the body of process_record_user, we store an "accent_request", which is the accent keycode if
-// one was just selected, or zero otherwise. When the *next* key is hit, we look up whether the
-// accent request plus that next keycode (plus the state of the shift key) together amount to an
-// interesting combined (NFKC) character, and if so, emit it; otherwise, we emit the accent as a
-// separate character and then process the next key normally. The resulting UI behavior is similar
-// to that of the combining accent keys in MacOS.
-//
-// We store two arrays, depending on whether shift is or isn't held. Each is two-dimensional, with
-// its outer key by the next keycode struck, and the inner key by the accent requested. The outer
-// array has KC_Z + 1 as its upper bound, so that we can save memory by only coding alphabetic keys.
-// The contents are either Unicode code points, or zero to indicate that we don't have a point for
-// this combination.
-
-#define KC_NUM_ACCENTS (KC_ACCENT_END - KC_ACCENT_START)
-#define KC_NUM_SLOTS (KC_Z + 1)
-
-const uint16_t PROGMEM unshifted_accents[KC_NUM_SLOTS][KC_NUM_ACCENTS] = {
-  //         KC_CGRV, KC_CAGU, KC_CDIA, KC_CCIR, KC_CCED, KC_CTIL
-  [KC_A] = { 0x00e0,  0x00e1,  0x00e4,  0x00e2,  0,       0x00e3 },
-  [KC_E] = { 0x00e8,  0x00e9,  0x00eb,  0x00ea,  0,       0      },
-  [KC_I] = { 0x00ec,  0x00ed,  0x00ef,  0x00ee,  0,       0      },
-  [KC_O] = { 0x00f2,  0x00f3,  0x00f6,  0x00f4,  0,       0x00f5 },
-  [KC_U] = { 0x00f9,  0x00fa,  0x00fc,  0x00fb,  0,       0      },
-  [KC_Y] = { 0,       0,       0x00ff,  0,       0,       0      },
-  [KC_N] = { 0,       0,       0,       0,       0,       0x00f1 },
-  [KC_C] = { 0,       0,       0,       0,       0x00e7,  0      },
-};
-
-const uint16_t PROGMEM shifted_accents[KC_NUM_SLOTS][KC_NUM_ACCENTS] = {
-  //         KC_CGRV, KC_CAGU, KC_CDIA, KC_CCIR, KC_CCED, KC_CTIL
-  [KC_A] = { 0x00c0,  0x00c1,  0x00c4,  0x00c2,  0,       0x00c3 },
-  [KC_E] = { 0x00c8,  0x00c9,  0x00cb,  0x00ca,  0,       0      },
-  [KC_I] = { 0x00cc,  0x00cd,  0x00cf,  0x00ce,  0,       0      },
-  [KC_O] = { 0x00d2,  0x00d3,  0x00d6,  0x00d4,  0,       0x00d5 },
-  [KC_U] = { 0x00d9,  0x00da,  0x00dc,  0x00db,  0,       0      },
-  [KC_Y] = { 0,       0,       0x00df,  0,       0,       0      },
-  [KC_N] = { 0,       0,       0,       0,       0,       0x00d1 },
-  [KC_C] = { 0,       0,       0,       0,       0x00c7,  0      },
-};
-
-// The uncombined and combined forms of the accents, for when we want to emit them as single
-// characters.
-const uint16_t PROGMEM uncombined_accents[KC_NUM_ACCENTS] = {
-  [KC_CGRV - KC_ACCENT_START] = 0x0060,
-  [KC_CAGU - KC_ACCENT_START] = 0x00b4,
-  [KC_CDIA - KC_ACCENT_START] = 0x00a8,
-  [KC_CCIR - KC_ACCENT_START] = 0x005e,
-  [KC_CCED - KC_ACCENT_START] = 0x00b8,
-  [KC_CTIL - KC_ACCENT_START] = 0x02dc,
-};
-
-const uint16_t PROGMEM combined_accents[KC_NUM_ACCENTS] = {
-  [KC_CGRV - KC_ACCENT_START] = 0x0300,
-  [KC_CAGU - KC_ACCENT_START] = 0x0301,
-  [KC_CDIA - KC_ACCENT_START] = 0x0308,
-  [KC_CCIR - KC_ACCENT_START] = 0x0302,
-  [KC_CCED - KC_ACCENT_START] = 0x0327,
-  [KC_CTIL - KC_ACCENT_START] = 0x0303,
-};
-
-// This function manages keypresses that happen after an accent has been selected by an earlier
-// keypress.
-// Args:
-//   accent_key: The accent key which was earlier selected. This must be in the range
-//     [KC_ACCENT_START, KC_ACCENT_END).
-//   keycode: The keycode which was just pressed.
-//   is_shifted: The current shift state (as set by a combination of shift and caps lock)
-//
-// Returns true if the keycode has been completely handled by this function (and so should not be
-// processed further by process_record_user) or false otherwise.
-bool process_key_after_accent(
-    uint16_t accent_key,
-    uint16_t keycode,
-    bool is_shifted
-) {
-  assert(accent_key >= KC_ACCENT_START);
-  assert(accent_key < KC_ACCENT_END);
-  const int accent_index = accent_key - KC_ACCENT_START;
-
-  // If the keycode is outside A..Z, we know we shouldn't even bother with a table lookup.
-  if (keycode <= KC_Z) {
-    // Pick the correct array. Because this is progmem, we're going to need to do the
-    // two-dimensional array indexing by hand, and so we just cast it to a single-dimensional array.
-    const uint16_t *points = (const uint16_t*)(is_shifted ? shifted_accents : unshifted_accents);
-    const uint16_t code_point = pgm_read_word(points + KC_NUM_ACCENTS * keycode + accent_index);
-    if (code_point) {
-      register_unicode(code_point);
-      return true;
-    }
-  }
-
-  // If we get here, there was no accent match. Emit the accent as its own character (i.e. a
-  // Unicode combining accent mark) and return false so that process_record_user also registers
-  // whatever is appropriate for the keycode after that. The host can figure out what to do with
-  // combining Unicode.
-  register_unicode(pgm_read_word(uncombined_accents + accent_index));
-  return false;
-}
-
-// This is a bitmask which selects the activation bits for layers *other* than our language
-// selectors.
-#define NON_LANGUAGE_LAYERS ~(((1UL << _LAST_LANGUAGE_LAYER) - 1) - ((1UL << _FIRST_LANGUAGE_LAYER) - 1))
-
-// Update the current layer state and return the layer we're in.
-uint8_t update_layer(
-  uint8_t layer_lock,
-  uint8_t layer_select_held,
-  bool shifted
-) {
-  uint8_t current_layer = layer_lock;
-  layer_state_t language_layers = 0;
-
-  // If there's a layer select being held right now, then it updates the current layer.
-  // (If it's the layer select for the currently locked layer, then instead it's a toggle
-  // back to _QWERTY!)
-  if (layer_select_held != _QWERTY) {
-    current_layer = (layer_lock == layer_select_held ? _QWERTY : layer_select_held);
-  }
-
-  language_layers |= (1UL << current_layer);
-
-  // If we're shifted (with either shift or caps lock), and we're in one of our special
-  // layers, bump up to the SHIFTED version of that layer. We don't do this for QWERTY;
-  // there we just emit USB HID codes and let the host deal with shift.
-  if (shifted && current_layer != _QWERTY) {
-    ++current_layer;
-    language_layers |= (1UL << current_layer);
-  }
-
-  // Update the QMK layer state by stomping just the language layer bits.
-  const layer_state_t new_layer_state = (layer_state & NON_LANGUAGE_LAYERS) | language_layers;
-  if (new_layer_state != layer_state) {
-    layer_state_set(new_layer_state);
-  }
-
-  return current_layer;
-}
-
-void set_os_mode(uint8_t new_mode) {
-  os_mode = new_mode;
-  // NB: We set unicode_config.input_mode directly, rather than calling
-  // set_unicode_input_mode, because we don't want to persist this and so we shouldn't put
-  // extra load on the EEPROMs.
-  unicode_config.input_mode = (os_mode == _MAC ? UNICODE_MODE_MACOS : UNICODE_MODE_WINCOMPOSE);
-  // Swap LALT and LGUI depending on Mac/Windows.
-  keymap_config.swap_lalt_lgui = (os_mode == _MAC);
-  // This would be a great moment for some auditory or visual feedback, but this keyboard
-  // doesn't support it. :(
-}
-
-void toggle_os_mode(void) {
-  set_os_mode((os_mode + 1) % _OS_MODES_MAX);
-}
-
-void keyboard_post_init_user(void) {
-  set_os_mode(_WINDOWS);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  // We track these persistent globals and manage them on our own, rather than trying to rely on
-  // get_mods or the like, because this function is called *before* that's updated!
-  static bool shift_held = false;
-  static bool alt_held = false;
-  static bool ctrl_held = false;
-  static bool super_held = false;
-
-  // These are where we remember the values of lock states.
-  static bool shift_lock = false;
-  static uint8_t layer_lock = _QWERTY;  // The currently locked layer
-  static uint8_t next_layer_lock = _QWERTY;  // Used when layer_lock is held
-  // Which layer select key is currently being held down. _QWERTY is equivalent to "none."
-  static uint8_t layer_select_held = _QWERTY; 
-
-  // When the hold on the platform key started
-  static uint16_t platform_hold_start = 0;
-
-  // The accent request, or zero if there isn't one.
-  static uint16_t accent_request = 0;
-
-  // What kind of key we're striking right now, so that we know what to do if any accent requests
-  // are hanging around.
-  uint8_t key_type = _NORMAL_KEY;
-
-  // The layer selection and locking logic is:
-  // * By default, the current layer is given by saved value layer_lock.
-  // * If a layer select key is held down, we update the current layer to that value.
-  //   (But special thing: If the current layer lock is <layer> and you hit the select key
-  //   for <layer>, it instead toggles the current layer back to _QWERTY! That way you can
-  //   insert some QWERTY keys in the midst of other-layer text.)
-  // * If the KC_LAYER_LOCK key is held down and a layer select key gets pressed, we update
-  //   next_layer_lock to that selected layer. When KC_LAYER_LOCK is released, we update
-  //   layer_lock to next_layer_lock. Note that that simply tapping KC_LAYER_LOCK resets 
-  //   layer_lock to _QWERTY.
-  // * After all of this is done, we check if shift is held (via either shift or caps lock);
-  //   if it is, and our current layer isn't _QWERTY, then we bump the current layer ID by 1
-  //   to get the shifted layer.
-
-  // Step 1: Process various interesting keycodes, especially ones that update our running
-  // state variables.
-  switch (keycode) {
-    // Monitoring the modifier keys, because we'll need them for our logic!
-    case KC_LSFT:
-    case KC_RSFT:
-      shift_held = record->event.pressed;
-      key_type = _MODIFIER_KEY;
-      break;
-    case KC_CAPS:
-      // If we're in QWERTY mode, caps lock is already going to be managed by the host OS, but by
-      // tracking it ourselves we can also usefully apply it to the GREEK and CADET layers.
-      shift_lock = !shift_lock;
-      key_type = _MODIFIER_KEY;
-      break;
-    case KC_LALT:
-    case KC_RALT:
-      alt_held = record->event.pressed;
-      key_type = _MODIFIER_KEY;
-      break;
-    case KC_LCTL:
-    case KC_RCTL:
-      ctrl_held = record->event.pressed;
-      key_type = _MODIFIER_KEY;
-      break;
-    case KC_LGUI:
-    case KC_RGUI:
-      super_held = record->event.pressed;
-      key_type = _MODIFIER_KEY;
-      break;
-
-    case KC_LAYER_LOCK:
-      if (record->event.pressed) {
-        // On press, get ready for a layer selection.
-        next_layer_lock = _QWERTY;
-      } else {
-        // On release, propagate next_layer_lock to layer_lock.
-        layer_lock = next_layer_lock;
-      }
-      key_type = _MODIFIER_KEY;
-      break;
-
-    // Layer selectors
-    case KC_GREEK:
-      if (record->event.pressed) {
-        layer_select_held = _GREEK;
-        next_layer_lock = _GREEK;
-      } else {
-        layer_select_held = _QWERTY;
-      }
-      key_type = _MODIFIER_KEY;
-      break;
-    case KC_CADET:
-      if (record->event.pressed) {
-        layer_select_held = _CADET;
-        next_layer_lock = _CADET;
-      } else {
-        layer_select_held = _QWERTY;
-      }
-      key_type = _MODIFIER_KEY;
-      break;
-    case KC_YIDDISH:
-      if (record->event.pressed) {
-        layer_select_held = _YIDDISH;
-        next_layer_lock = _YIDDISH;
-      } else {
-        layer_select_held = _QWERTY;
-      }
-      key_type = _MODIFIER_KEY;
-      break;
-
-    // Accent selectors
-    case KC_CGRV:
-    case KC_CAGU:
-    case KC_CDIA:
-    case KC_CCIR:
-    case KC_CCED:
-    case KC_CTIL:
-      // The accent request keys normally update accent_request (whose effect will trigger the next
-      // time we see a "normal" key pressed). However, shift+accent request will instead immediately
-      // generate the Unicode combining accent symbol instead.
-      if (shift_held) {
-        register_unicode(pgm_read_word(combined_accents + keycode - KC_ACCENT_START));
-        return false;
-      } else {
-        accent_request = keycode;
-      }
-      key_type = _MODIFIER_KEY;
-      break;
-
-    // Our special keycodes
-    case KC_PLATFORM:
-      if (record->event.pressed) {
-        platform_hold_start = record->event.time;
-      } else if (platform_hold_start != 0 && record->event.time - platform_hold_start > PLATFORM_HOLD_DURATION) {
-        toggle_os_mode();
-      }
-      key_type = _SPECIAL_KEY;
-      return true;
-
-    case KC_VC_MUTE:
-      if (record->event.pressed) {
-        send_string(VC_MUTE_VALUES[os_mode]);
-        return true;
-      }
-      key_type = _SPECIAL_KEY;
-      break;
-
-    case KC_VC_HAND:
-      if (record->event.pressed) {
-        send_string(VC_HAND_VALUES[os_mode]);
-        return true;
-      }
-      key_type = _SPECIAL_KEY;
-      break;
-
-    case KC_SCRNSHT:
-      if (record->event.pressed) {
-        send_string(SCRNSHT_VALUES[os_mode]);
-        return true;
-      }
-      key_type = _SPECIAL_KEY;
-      break;
-
-    case QK_BOOT:
-      key_type = _SPECIAL_KEY;
-      break;
-  }
-
-  // Step 2: Finalize current_layer and update the QMK layer state.
-  const bool shifted = (shift_held != shift_lock);
-  const uint8_t current_layer = update_layer(layer_lock, layer_select_held, shifted);
-
-  // Step 3: Handle accents.
-  bool handled = false;
-  if (accent_request && record->event.pressed) {
-    // If we're in any layer other than _QWERTY, or a modifier key is being held down,
-    // then we're actually generating a special key, not a normal one.
-    if (key_type == _NORMAL_KEY &&
-        (current_layer != _QWERTY || ctrl_held || super_held || alt_held)) {
-      key_type = _SPECIAL_KEY;
-    }
-
-    switch (key_type) {
-      case _NORMAL_KEY:
-        handled = process_key_after_accent(accent_request, keycode, shifted);
-        accent_request = 0;
-        break;
-
-      case _SPECIAL_KEY:
-        accent_request = 0;
-        break;
-
-      case _MODIFIER_KEY:
-        break;
-    }
-  }
-
-  return !handled;
-}
diff --git a/keyboards/wilba_tech/wt65_xt/keymaps/zunger/readme.md b/keyboards/wilba_tech/wt65_xt/keymaps/zunger/readme.md
deleted file mode 100644
index fe1264a0855..00000000000
--- a/keyboards/wilba_tech/wt65_xt/keymaps/zunger/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-* A polyglot keymap for the RamaWorks Zenith
-* Author: Yonatan Zunger (zunger@gmail.com)
-
-This keyboard is designed to make it easy to type a wide range of symbols and a wide range of
-alphabets, without relying on the host OS, because... host OS's aren't fantastic at a lot of
-things.
-
-See the keymap file for most of the documentation, in the form of comments; this is still in
-development!
diff --git a/keyboards/wilba_tech/wt65_xt/keymaps/zunger/rules.mk b/keyboards/wilba_tech/wt65_xt/keymaps/zunger/rules.mk
deleted file mode 100644
index a61cfa33fa9..00000000000
--- a/keyboards/wilba_tech/wt65_xt/keymaps/zunger/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# You need Unicode for this map.
-UNICODE_ENABLE = yes        # Unicode
diff --git a/keyboards/wilba_tech/wt75_a/rules.mk b/keyboards/wilba_tech/wt75_a/rules.mk
index 9ca8e8f9734..f7482c7a2f2 100644
--- a/keyboards/wilba_tech/wt75_a/rules.mk
+++ b/keyboards/wilba_tech/wt75_a/rules.mk
@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt75_a/wt75_a.c b/keyboards/wilba_tech/wt75_a/wt75_a.c
new file mode 100644
index 00000000000..111e6c3a2c1
--- /dev/null
+++ b/keyboards/wilba_tech/wt75_a/wt75_a.c
@@ -0,0 +1,120 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#if defined(MONO_BACKLIGHT_WT75_A)
+#    include "drivers/led/issi/is31fl3736-mono.h"
+#endif
+
+#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT75_A)
+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
+
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
+
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
+
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
+
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
+
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
+
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
+
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
+
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
+
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
+
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
+
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
+};
+#endif
diff --git a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h b/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h
deleted file mode 100644
index dc2a125b1e0..00000000000
--- a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#undef PRODUCT
-#define PRODUCT "MadHatter's Custom Singa V3"
diff --git a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/keymap.c b/keyboards/wilba_tech/wt75_b/keymaps/madhatter/keymap.c
deleted file mode 100644
index dd80c43c187..00000000000
--- a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum singav3_layers {
-    _QWERTY,
-    _FNMS
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	// Default layer
-	[_QWERTY] = LAYOUT_75_ansi_blocker_split_bs(
-		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_PAUS, KC_DEL,
-		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_BSLS, 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_BSPC,          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(_FNMS),        KC_LEFT, KC_DOWN, KC_RGHT),
-
-	// Fn1 Layer
-	[_FNMS] = LAYOUT_75_ansi_blocker_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_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, QK_BOOT,          KC_VOLU,
-		AG_TOGG, KC_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_BTN1,                   KC_MS_U, KC_BTN2,
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_MS_L, KC_MS_D, KC_MS_R),
-};
-
diff --git a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/rules.mk b/keyboards/wilba_tech/wt75_b/keymaps/madhatter/rules.mk
deleted file mode 100644
index 6c605daecf5..00000000000
--- a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/wilba_tech/wt75_b/rules.mk b/keyboards/wilba_tech/wt75_b/rules.mk
index 9ca8e8f9734..f7482c7a2f2 100644
--- a/keyboards/wilba_tech/wt75_b/rules.mk
+++ b/keyboards/wilba_tech/wt75_b/rules.mk
@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt75_b/wt75_b.c b/keyboards/wilba_tech/wt75_b/wt75_b.c
new file mode 100644
index 00000000000..5a4b7de39f0
--- /dev/null
+++ b/keyboards/wilba_tech/wt75_b/wt75_b.c
@@ -0,0 +1,120 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#if defined(MONO_BACKLIGHT_WT75_B)
+#    include "drivers/led/issi/is31fl3736-mono.h"
+#endif
+
+#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT75_B)
+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
+
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
+
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
+
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
+
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
+
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
+
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
+
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
+
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
+
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
+
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
+
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
+};
+#endif
diff --git a/keyboards/wilba_tech/wt75_c/rules.mk b/keyboards/wilba_tech/wt75_c/rules.mk
index 9ca8e8f9734..f7482c7a2f2 100644
--- a/keyboards/wilba_tech/wt75_c/rules.mk
+++ b/keyboards/wilba_tech/wt75_c/rules.mk
@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt75_c/wt75_c.c b/keyboards/wilba_tech/wt75_c/wt75_c.c
new file mode 100644
index 00000000000..741bfb95948
--- /dev/null
+++ b/keyboards/wilba_tech/wt75_c/wt75_c.c
@@ -0,0 +1,120 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#if defined(MONO_BACKLIGHT_WT75_C)
+#    include "drivers/led/issi/is31fl3736-mono.h"
+#endif
+
+#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT75_C)
+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
+
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
+
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
+
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
+
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
+
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
+
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
+
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
+
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
+
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
+
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
+
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
+};
+#endif
diff --git a/keyboards/wilba_tech/wt80_a/rules.mk b/keyboards/wilba_tech/wt80_a/rules.mk
index 9ca8e8f9734..f7482c7a2f2 100644
--- a/keyboards/wilba_tech/wt80_a/rules.mk
+++ b/keyboards/wilba_tech/wt80_a/rules.mk
@@ -11,7 +11,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
 # project specific files
-SRC =	drivers/led/issi/is31fl3736-simple.c \
+SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt80_a/wt80_a.c b/keyboards/wilba_tech/wt80_a/wt80_a.c
new file mode 100644
index 00000000000..4acf56994df
--- /dev/null
+++ b/keyboards/wilba_tech/wt80_a/wt80_a.c
@@ -0,0 +1,120 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#if defined(MONO_BACKLIGHT_WT80_A)
+#    include "drivers/led/issi/is31fl3736-mono.h"
+#endif
+
+#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT80_A)
+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
+
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
+
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
+
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
+
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
+
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
+
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
+
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
+
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
+
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
+
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
+
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
+};
+#endif
diff --git a/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c b/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c
deleted file mode 100644
index 0a3e7b936ec..00000000000
--- a/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL0 0
-#define _FL1 1
-#define _FL2 2
-#define _FL3 3
-
-#define MACOSLK LCTL(LGUI(KC_Q)) // CTRL+CMD+Q == screen lock in macOS 10.13+
-
-enum rys_keycodes {
-  STOKEN1 = SAFE_RANGE,
-  STOKEN2,
-  STOKEN3,
-  STOKEN4,
-  STOKEN5,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case STOKEN1:
-      if (record->event.pressed) {
-        SEND_STRING(RYS_STOKEN1);
-      }
-      break;
-    case STOKEN2:
-      if (record->event.pressed) {
-        SEND_STRING(RYS_STOKEN2);
-      }
-      break;
-    case STOKEN3:
-      if (record->event.pressed) {
-        SEND_STRING(RYS_STOKEN3);
-      }
-      break;
-    case STOKEN4:
-      if (record->event.pressed) {
-        SEND_STRING(RYS_STOKEN4);
-      }
-      break;
-    case STOKEN5:
-      if (record->event.pressed) {
-        SEND_STRING(RYS_STOKEN5);
-      }
-      break;
-  }
-  return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap base layer (_BL0) - default layer
-   * ,---------------------------.
-   * | ST1  | ST2  | ST3  | ST4  |
-   * |---------------------------|
-   * |MO(1) | LOCK | VOL- | VOL+ |
-   * `---------------------------'
-   */
-   [_BL0] = LAYOUT(
-     STOKEN1, STOKEN2, STOKEN3, STOKEN4,
-    MO(_FL1), MACOSLK, KC_VOLD, KC_VOLU),
-  /* Keymap base layer (_FL1) - function layer 1
-   * ,---------------------------.
-   * |      |      |      |      |
-   * |---------------------------|
-   * |      | ST5  |   \  | RST  |
-   * `---------------------------'
-   */
-   [_FL1] = LAYOUT(
-     _______, _______, _______, _______,
-     _______, STOKEN5, KC_NUBS, QK_BOOT),
-  /* Keymap base layer (_FL2) - function layer 2
-   * ,---------------------------.
-   * |      |      |      |      |
-   * |---------------------------|
-   * |      |      |      |      |
-   * `---------------------------'
-   */
-   [_FL2] = LAYOUT(
-     _______, _______, _______, _______,
-     _______, _______, _______, _______),
-  /* Keymap base layer (_FL3) - function layer 3
-   * ,---------------------------.
-   * |      |      |      |      |
-   * |---------------------------|
-   * |      |      |      |      |
-   * `---------------------------'
-   */
-   [_FL3] = LAYOUT(
-     _______, _______, _______, _______,
-     _______, _______, _______, _______),
-};
diff --git a/keyboards/wilba_tech/wt8_a/keymaps/rys/rules.mk b/keyboards/wilba_tech/wt8_a/keymaps/rys/rules.mk
deleted file mode 100644
index ea22dca6cb6..00000000000
--- a/keyboards/wilba_tech/wt8_a/keymaps/rys/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-RYS_STOKEN1 = "$(shell security find-generic-password -a qmk -s wt8a-1 -w)"
-RYS_STOKEN2 = "$(shell security find-generic-password -a qmk -s wt8a-2 -w)"
-RYS_STOKEN3 = "$(shell security find-generic-password -a qmk -s wt8a-3 -w)"
-RYS_STOKEN4 = "$(shell security find-generic-password -a qmk -s wt8a-4 -w)"
-RYS_STOKEN5 = "$(shell security find-generic-password -a qmk -s wt8a-5 -w)"
-
-CFLAGS += -DRYS_STOKEN1=\"$(RYS_STOKEN1)\"
-CFLAGS += -DRYS_STOKEN2=\"$(RYS_STOKEN2)\"
-CFLAGS += -DRYS_STOKEN3=\"$(RYS_STOKEN3)\"
-CFLAGS += -DRYS_STOKEN4=\"$(RYS_STOKEN4)\"
-CFLAGS += -DRYS_STOKEN5=\"$(RYS_STOKEN5)\"
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index e218f0af4be..1523fbdb853 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -33,7 +33,7 @@
 #error VIA_EEPROM_CUSTOM_CONFIG_SIZE was not defined to store backlight_config struct
 #endif
 
-#include "drivers/led/issi/is31fl3736-simple.h"
+#include "drivers/led/issi/is31fl3736-mono.h"
 
 #define BACKLIGHT_EFFECT_MAX 3
 
@@ -50,116 +50,6 @@ backlight_config g_config = {
     .color_1 = MONO_BACKLIGHT_COLOR_1,
 };
 
-const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
-    {0, A_1},
-    {0, A_2},
-    {0, A_3},
-    {0, A_4},
-    {0, A_5},
-    {0, A_6},
-    {0, A_7},
-    {0, A_8},
-
-    {0, B_1},
-    {0, B_2},
-    {0, B_3},
-    {0, B_4},
-    {0, B_5},
-    {0, B_6},
-    {0, B_7},
-    {0, B_8},
-
-    {0, C_1},
-    {0, C_2},
-    {0, C_3},
-    {0, C_4},
-    {0, C_5},
-    {0, C_6},
-    {0, C_7},
-    {0, C_8},
-
-    {0, D_1},
-    {0, D_2},
-    {0, D_3},
-    {0, D_4},
-    {0, D_5},
-    {0, D_6},
-    {0, D_7},
-    {0, D_8},
-
-    {0, E_1},
-    {0, E_2},
-    {0, E_3},
-    {0, E_4},
-    {0, E_5},
-    {0, E_6},
-    {0, E_7},
-    {0, E_8},
-
-    {0, F_1},
-    {0, F_2},
-    {0, F_3},
-    {0, F_4},
-    {0, F_5},
-    {0, F_6},
-    {0, F_7},
-    {0, F_8},
-
-    {0, G_1},
-    {0, G_2},
-    {0, G_3},
-    {0, G_4},
-    {0, G_5},
-    {0, G_6},
-    {0, G_7},
-    {0, G_8},
-
-    {0, H_1},
-    {0, H_2},
-    {0, H_3},
-    {0, H_4},
-    {0, H_5},
-    {0, H_6},
-    {0, H_7},
-    {0, H_8},
-
-    {0, I_1},
-    {0, I_2},
-    {0, I_3},
-    {0, I_4},
-    {0, I_5},
-    {0, I_6},
-    {0, I_7},
-    {0, I_8},
-
-    {0, J_1},
-    {0, J_2},
-    {0, J_3},
-    {0, J_4},
-    {0, J_5},
-    {0, J_6},
-    {0, J_7},
-    {0, J_8},
-
-    {0, K_1},
-    {0, K_2},
-    {0, K_3},
-    {0, K_4},
-    {0, K_5},
-    {0, K_6},
-    {0, K_7},
-    {0, K_8},
-
-    {0, L_1},
-    {0, L_2},
-    {0, L_3},
-    {0, L_4},
-    {0, L_5},
-    {0, L_6},
-    {0, L_7},
-    {0, L_8}
-};
-
 bool g_suspend_state = false;
 
 // Global tick at 20 Hz
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index 72ddb34ee70..cf36288705e 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -980,34 +980,34 @@ 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( IS31FL3741_I2C_ADDRESS_1, 0 );
-    is31fl3741_update_led_control_registers( IS31FL3741_I2C_ADDRESS_1, 0 );
+	is31fl3741_update_pwm_buffers( 0 );
+    is31fl3741_update_led_control_registers( 0 );
 #elif defined(RGB_BACKLIGHT_M10_C)
-    is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_1, 0 );
-    is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_1, 0 );
+    is31fl3731_update_pwm_buffers( 0 );
+    is31fl3731_update_led_control_registers( 0 );
 #elif defined(RGB_BACKLIGHT_HS60)
-    is31fl3733_update_pwm_buffers( IS31FL3733_I2C_ADDRESS_1, 0 );
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
+    is31fl3733_update_pwm_buffers( 0 );
+    is31fl3733_update_led_control_registers(  0 );
 #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_KW_MEGA)
-    is31fl3733_update_pwm_buffers( IS31FL3733_I2C_ADDRESS_1, 0 );
-    is31fl3733_update_pwm_buffers( IS31FL3733_I2C_ADDRESS_2, 1 );
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+    is31fl3733_update_pwm_buffers( 0 );
+    is31fl3733_update_pwm_buffers( 1 );
+    is31fl3733_update_led_control_registers( 0 );
+    is31fl3733_update_led_control_registers( 1 );
 #elif defined(RGB_BACKLIGHT_NEBULA12)
-    is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_1, 0 );
-    is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_1, 0 );
+    is31fl3731_update_pwm_buffers( 0 );
+    is31fl3731_update_led_control_registers( 0 );
 #elif defined(RGB_BACKLIGHT_U80_A)
     static uint8_t driver = 0;
     switch ( driver )
     {
         case 0:
-            is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_1, 0 );
+            is31fl3731_update_pwm_buffers( 0 );
             break;
         case 1:
-            is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_2, 1 );
+            is31fl3731_update_pwm_buffers( 1 );
             break;
         case 2:
-            is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_3, 2 );
+            is31fl3731_update_pwm_buffers( 2 );
             break;
     }
     if ( ++driver > 2 )
@@ -1015,10 +1015,10 @@ void backlight_update_pwm_buffers(void)
         driver = 0;
     }
 #else
-    is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_1, 0 );
-    is31fl3731_update_pwm_buffers( IS31FL3731_I2C_ADDRESS_2, 1 );
-    is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_1, 0 );
-    is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_2, 1 );
+    is31fl3731_update_pwm_buffers( 0 );
+    is31fl3731_update_pwm_buffers( 1 );
+    is31fl3731_update_led_control_registers( 0 );
+    is31fl3731_update_led_control_registers( 1 );
 #endif
 }
 
@@ -2134,7 +2134,7 @@ void backlight_init_drivers(void)
     // This actually updates the LED drivers
     is31fl3218_update_led_control_registers();
 #elif defined(RGB_BACKLIGHT_HS60)
-    is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
+    is31fl3733_init( 0 );
 
     for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
     {
@@ -2153,10 +2153,10 @@ void backlight_init_drivers(void)
         is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
     }
     // This actually updates the LED drivers
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
+    is31fl3733_update_led_control_registers( 0 );
 #elif defined(RGB_BACKLIGHT_NK65)
-    is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
-    is31fl3733_init( IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_NONE );
+    is31fl3733_init( 0 );
+    is31fl3733_init( 1 );
 
     for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
     {
@@ -2167,11 +2167,11 @@ void backlight_init_drivers(void)
     }
     is31fl3733_set_led_control_register( 7+64-1, 0, 1, 0 ); //Enable LB7 green enable for indicators
     // This actually updates the LED drivers
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+    is31fl3733_update_led_control_registers( 0 );
+    is31fl3733_update_led_control_registers( 1 );
 #elif defined(RGB_BACKLIGHT_NK87)
-    is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
-    is31fl3733_init( IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_NONE );
+    is31fl3733_init( 0 );
+    is31fl3733_init( 1 );
 
     for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
     {
@@ -2197,11 +2197,11 @@ void backlight_init_drivers(void)
     }
     is31fl3733_set_led_control_register( 48+64-1, 0, 0, 1 ); //Enable LB48 blue enable for indicators
     // This actually updates the LED drivers
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+    is31fl3733_update_led_control_registers( 0 );
+    is31fl3733_update_led_control_registers( 1 );
 #elif defined(RGB_BACKLIGHT_NEBULA68)
-    is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
-    is31fl3733_init( IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_NONE );
+    is31fl3733_init( 0 );
+    is31fl3733_init( 1 );
 
     for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
     {
@@ -2211,20 +2211,20 @@ void backlight_init_drivers(void)
         is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
     }
     // This actually updates the LED drivers
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+    is31fl3733_update_led_control_registers( 0 );
+    is31fl3733_update_led_control_registers( 1 );
 #elif defined(RGB_BACKLIGHT_PORTICO75)
-    is31fl3741_init( IS31FL3741_I2C_ADDRESS_1 );
+    is31fl3741_init( 0 );
 	bool enabled = true;
     for ( int index = 0; index < IS31FL3741_LED_COUNT; index++ )
     {
         is31fl3741_set_led_control_register( index, enabled, enabled, enabled );
     }
     // This actually updates the LED drivers
-    is31fl3741_update_led_control_registers( IS31FL3741_I2C_ADDRESS_1, 0 );
+    is31fl3741_update_led_control_registers( 0 );
 #elif defined(RGB_BACKLIGHT_KW_MEGA)
-    is31fl3733_init( IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_NONE );
-    is31fl3733_init( IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_NONE );
+    is31fl3733_init( 0 );
+    is31fl3733_init( 1 );
 
     for ( int index = 0; index < IS31FL3733_LED_COUNT; index++ )
     {
@@ -2234,18 +2234,18 @@ void backlight_init_drivers(void)
         is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
     }
     // This actually updates the LED drivers
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_1, 0 );
-    is31fl3733_update_led_control_registers( IS31FL3733_I2C_ADDRESS_2, 1 );
+    is31fl3733_update_led_control_registers( 0 );
+    is31fl3733_update_led_control_registers( 1 );
 #else
     // Init the #1 driver
-    is31fl3731_init( IS31FL3731_I2C_ADDRESS_1 );
+    is31fl3731_init( 0 );
     // Init the #2 driver (if used)
 #if !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_M10_C)
-    is31fl3731_init( IS31FL3731_I2C_ADDRESS_2 );
+    is31fl3731_init( 1 );
 #endif
     // Init the #3 driver (if used)
 #if defined(RGB_BACKLIGHT_U80_A)
-    is31fl3731_init( IS31FL3731_I2C_ADDRESS_3 );
+    is31fl3731_init( 2 );
 #endif
 
     // Experimental feature, not in configuration yet
@@ -2378,12 +2378,12 @@ void backlight_init_drivers(void)
     }
     // This actually updates the LED drivers
     // TODO: refactor this to use DRIVER_COUNT
-    is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_1, 0 );
+    is31fl3731_update_led_control_registers(  0 );
 #if !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_M10_C)
-    is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_2, 1 );
+    is31fl3731_update_led_control_registers( 1 );
 #endif
 #if defined(RGB_BACKLIGHT_U80_A)
-    is31fl3731_update_led_control_registers( IS31FL3731_I2C_ADDRESS_3, 2 );
+    is31fl3731_update_led_control_registers( 2 );
 #endif
 #endif
 
diff --git a/keyboards/wilba_tech/zeal60/keymaps/crd/config.h b/keyboards/wilba_tech/zeal60/keymaps/crd/config.h
deleted file mode 100644
index a70f9da7e6a..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/crd/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-/* enable/disable LEDs based on layout */
-#undef RGB_BACKLIGHT_USE_SPLIT_BACKSPACE
-#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
-
-#undef RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT
-#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
-
-#undef RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT
-#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 1
-
-#undef RGB_BACKLIGHT_USE_7U_SPACEBAR
-#define RGB_BACKLIGHT_USE_7U_SPACEBAR 1
-
-#undef RGB_BACKLIGHT_USE_ISO_ENTER
-#define RGB_BACKLIGHT_USE_ISO_ENTER 0
-
-#undef RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS
-#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
-
-#undef RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 1
-
-#undef RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT
-#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 3
-
-#undef RGB_BACKLIGHT_EFFECT
-#define RGB_BACKLIGHT_EFFECT 0
\ No newline at end of file
diff --git a/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c
deleted file mode 100644
index dfbe6a972e6..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-// tsangan layout for Zeal60
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-  _BL = 0, // Base Layer
-  _FL,     // Function Layer
-  _CL      // Control Layer
-};
-
-// Custom #defined keycodes (shorter macros for readability)
-#define KC_CTES CTL_T(KC_ESC)
-#define KC_RSUP RSFT_T(KC_UP)
-#define KC_RGLT RCMD_T(KC_LEFT)
-#define KC_RADN LT(_CL, KC_DOWN)
-#define KC_RCRT RCTL_T(KC_RIGHT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_BL] = LAYOUT_60_ansi_split_bs_rshift(
-		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,  XXXXXXX,
-		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_CTES, 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_RSUP, MO(_FL),
-		KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             XXXXXXX, KC_RGLT, KC_RADN, KC_RCRT
-	),
-	[_FL] = LAYOUT_60_ansi_split_bs_rshift(
-		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_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, KC_MUTE, _______, _______, KC_PGDN, KC_PGUP, _______,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_SCRL, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______,                            _______,                            _______, _______, _______, _______
-	),
-	[_CL] = LAYOUT_60_ansi_split_bs_rshift(
-		_______, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  _______, _______, _______, _______, BR_DEC,  BR_INC,  _______,  _______,
-		_______, _______, _______, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  _______, _______, _______, _______, ES_DEC,  ES_INC,  QK_BOOT,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______,                            _______,                            _______, _______, _______, _______
-	),
-};
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
deleted file mode 100644
index 1fbd7457420..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
+++ /dev/null
@@ -1,79 +0,0 @@
-# RGB Underglow Strip on the Zeal60: A Guide
-
-<img src="https://i.imgur.com/UuUdOCb.jpg" width="800">
-
-## Requirements
-
-- WS2812B RGB strip, preferably 60 LEDs/meter
-- Wire, solder
-- Tape, hot glue, or some sort of adhesive
-
-## A. Connecting the strip
-You might find the [**full PCB image**](https://cdn.shopify.com/s/files/1/0490/7329/files/zeal60jumpers.png) helpful. Ignore the red boxes!
-
-1. Connect V+ to the receiving end of the thermistor labeled F1; connect GND to the board's GND pin. (*Avoid connecting +V to the board's +5V pin* - you will likely overload the thermistor, and you will limit your maximum brightness.)
-
-    <img src="https://i.imgur.com/jd7qivh.png" width="300">
-
-2. Connect DI to PB0.
-
-    <img src="https://i.imgur.com/BiMyMLv.jpg" width="300">
-
-3. Should look something like this when finished:
-
-    <img src="https://i.imgur.com/ngxYMuA.jpg" width="600">
-
-*Optional:* To allow considerably more light to escape, consider angling the strip outwards by using some sort of fulcrum under the strip. (I used a thick wire.)
-
-## B. Enabling the strip
-1. If it is not present already, add the following to your ***keymap's*** ```Makefile```:
-
-    ```Makefile
-    RGBLIGHT_ENABLE = yes
-    AUDIO_ENABLE = no     #Underglow animations cannot be used with audio.
-    ```
-2. If it is not present already, add the following to your *keymap's* ```config.h```, and edit the values as necessary:
-
-    ```c
-    // Set up RGB underglow.
-    #define WS2812_DI_PIN B0          // The pin your RGB strip is wired to
-    #define RGBLED_NUM 35          // Number of LEDs
-    #define RGBLIGHT_HUE_STEP 5    // How much each press of rgb_hue changes hue
-    #define RGBLIGHT_SAT_STEP 10   // How much each press of rgb_sat changes sat
-    #define RGBLIGHT_VAL_STEP 10   // How much each press of rgb_val changes val
-    ```
-3. If they are not present already, add the following keycodes to your keymap to control the RGB strip: ```RGB_TOG``` (on/off), ```RGB_MOD``` (step through modes), ```RGB_HUI```, ```RGB_HUD```, ```RGB_SAI```, ```RGB_SAD```, ```RGB_VAI```, ```RGB_VAD``` (HSV increase/decrease). Add these to your keymap.
-
-## C. Dealing with current limits
-USB 2.0 ports on laptops provide up to 500mA max, but USB 3.0 ports can provide up to 900mA; USB 3.1 up to 1.5A; and powered USB hubs even more. We can run our keyboard at a higher brightness if we draw more power. **The Zeal60 uses 500mA at max brightness.** This means that **you have about 400mA remaining for the strip to use on a USB 3.0 port**; 1000mA free on a USB 3.1 port, so on and so forth.
-
-***Warning:*** **This means you will need to turn *off* your RGB strip before connecting to a USB 2.0 port**, as USB 2.0 cannot sustain the current necessary!
-
-1. If not present already, add the following to your keymap's ```config.h```. Change the numbers based on your needs. The ones below are safe underestimates.
-
-    ```c
-    // Enable current limiting for RGB underglow.
-    #define RGBSTRIP_CURRENT_LIMIT 400    // Strip current limit in mA. (USB amperage - 500mA for keyboard)
-    #define RGBSTRIP_MAX_CURRENT_PER_LIGHT 50 // mA per light when at max brightness.
-    ```
-    *Example:* I use a USB port capable of providing 1800 mA. The keyboard uses 500mA, so my personal value (in the `tusing` keymap) for `RGBSTRIP_CURRENT_LIMIT` is 1300. The particular WS2812B RGB strip I have uses a maximum of 60 mA per LED, so that is my personal value for `RGBSTRIP_MAX_CURRENT_PER_LIGHT`.
-2. Toggle on the LED strip (```RGB_TOG```) and step through animations (```RGB_MOD```) to test it out!
-
-## D. Sources and resources
-### A. Connecting the strip.
-* [In-depth description of connecting an RGB strip to the GH60](https://www.reddit.com/r/MechanicalKeyboards/comments/4d5or2/my_first_custom_build_satan_gh60_rbg_underglow_in/d1nz3o7/)
-* [32U4 Pinout](https://40.media.tumblr.com/93b6bbd4113418c2b45459bb177e67c5/tumblr_mi49a20QMB1s5t695o1_1280.png)
-* [Redditor describes connecting RGB strips on his Satan GH60](https://www.reddit.com/r/MechanicalKeyboards/comments/4hbjw4/finally_finished_my_satan_gh60_also_granite_o/d2qn8zx/?context=3)
-* [Another Redditor on RGB with the Satan GH60](https://www.reddit.com/r/MechanicalKeyboards/comments/4ewzdx/gh60_satan_with_the_rgb_mod/d251uu6/ )
-
-### B. Enabling the strip.
-* [QMK Wiki portion on underglow](https://github.com/jackhumbert/qmk_firmware/wiki#rgb-under-glow-mod)
-* [Planck ```Makefile```, ```config.h```, and ```keymap.c``` config example](https://github.com/jackhumbert/qmk_firmware/tree/master/keyboards/planck/keymaps/yang)
-* [Video demonstrating keycode functions and RGB modes on a KC60](https://www.youtube.com/watch?v=VKrpPAHlisY)
-
-### C. Dealing with current limits.
-* [Discussion of cutting jumpers and adding resistors to lower current from Zeal60](https://www.reddit.com/r/MechanicalKeyboards/comments/5hou92/photos_zeal60_lets_just_say_santa_came_early_this/db23qid/)
-* [A selection of 900mA-1.5A current hold fuses - look for an SMD 0805-sized fuse.](https://goo.gl/748avG)
-* [Video detailing technique to solder 0805 resistors](https://www.youtube.com/watch?v=PU7wLcuqc-I&t=123s&list=FLheMlKEVQ5cmVXazUt6HrxQ&index=2)
-* [QMK feature request to implement max power draw limits in ```config.h```](https://github.com/jackhumbert/qmk_firmware/issues/954)
-* [Commit enabling max power draw limits in ```config.h```](https://github.com/jackhumbert/qmk_firmware/commit/83e613ad239459582ae28f78b6c81535b9b138d7)
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h b/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h
deleted file mode 100644
index e797f819413..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-/* Enable/disable LEDs based on layout. */
-#undef RGB_BACKLIGHT_USE_SPLIT_BACKSPACE
-#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
-
-#undef RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT
-#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
-
-#undef RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT
-#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
-
-#undef RGB_BACKLIGHT_USE_7U_SPACEBAR
-#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
-
-#undef RGB_BACKLIGHT_USE_ISO_ENTER
-#define RGB_BACKLIGHT_USE_ISO_ENTER 0
-
-#undef RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS
-#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
-
-// Set up RGB underglow.
-#define WS2812_DI_PIN B0          // The pin your RGB strip is wired to
-#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 35          // Number of LEDs
-#define RGBLIGHT_HUE_STEP 5    // How much each press of rgb_hue changes hue
-#define RGBLIGHT_SAT_STEP 10   // How much each press of rgb_sat changes sat
-#define RGBLIGHT_VAL_STEP 10   // How much each press of rgb_val changes val
-
-// Enable current limiting for RGB underglow.
-#define RGBSTRIP_CURRENT_LIMIT 1300    // Strip current limit in mA. (USB amperage - 500mA for keyboard)
-#define RGBSTRIP_MAX_CURRENT_PER_LIGHT 40 // mA per light when at max brightness.
-
-// Scale brightnes according to BRIGHTNESS_CORRECTION_TABLE in quantum/rgblight.c.
-// This allows to mitigate uneven brightness from LED underglow strips.
-// #define LED_BRIGHTNESS_CORRECTION
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
deleted file mode 100644
index 21cb2cd73fc..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-// Default layout for Zeal60
-#include QMK_KEYBOARD_H
-
-// For readability.
-#define   _x_   KC_NO
-#define AUD_PRV LCTL(KC_MPRV) // Previous music track
-#define AUD_PLY LCTL(KC_MPLY) // Pause music
-#define AUD_NXT LCTL(KC_MNXT) // Next music track
-
-// Zeal60-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] = {
-// Default layer: Pressing caps-lock momentarily switches to Layer 1.
-// This is the default layer. Pressing an empty keycode on another layer will take you here.
-    [0] = {
-        {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_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},
-        {MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,    _x_  },
-        {KC_LSFT,   _x_  , KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,   _x_  },
-        {KC_LCTL, KC_LGUI, KC_LALT,   _x_  ,   _x_  ,   _x_  ,   _x_  , KC_SPC,    _x_  ,   _x_  , KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT}
-    },
-
-// Layer 1: Pressing enter switches to layer 2, where backlight controls live.
-// This is a momentary layer: once you let go of caps, you'll be back in layer 1.
-    [1] = {
-        {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_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,  KC_DEL,  _______},
-        {_______, AUD_PRV, AUD_PLY, AUD_NXT, _______, _______, _______, _______, _______, _______, _______, _______, TO(2)  ,   _x_  },
-        {KC_CAPS,   _x_  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _x_  },
-        {KC_RCTL, KC_RGUI, KC_RALT,   _x_  ,   _x_  ,   _x_  ,   _x_  , _______,   _x_  ,   _x_  , KC_HOME, KC_PGUP, KC_PGDN,  KC_END}
-    },
-
-// Layer 2: Zeal60 and backlight configuration. (Get here quickly by pressing Caps+Enter from Layer 1.)
-// This is a persistent layer. Get back to the default layer by pressing enter.
-    [2] = {
-        {QK_BOOT, EF_DEC,  EF_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  _______, _______, _______, _______, _______, _______, _______},
-        {_______, H1_DEC,  H1_INC,  S1_DEC,  S1_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______},
-        {_______, H2_DEC,  H2_INC,  S2_DEC,  S2_INC,  _______, _______, _______, _______, _______, _______, _______, TO(0)  ,   _x_  },
-        {RGB_MOD,   _x_  , RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______,   _x_  },
-        {RGB_TOG, RGB_VAD, RGB_VAI,   _x_  ,   _x_  ,   _x_  ,   _x_  , _______,   _x_  ,   _x_  , _______, _______, _______, _______}
-    }
-};
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk
deleted file mode 100644
index 762905da03f..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no  # Underglow cannot be used with audio.
diff --git a/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c b/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c
deleted file mode 100644
index a74ec357011..00000000000
--- a/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright 2017 Kyle Peatt <kpeatt@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
-
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty
-    * ,-----------------------------------------------------------------------------------------.
-    * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-    * |-----------------------------------------------------------------------------------------+
-    * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-    * |-----------------------------------------------------------------------------------------+
-    * | Caps/FN |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-    * |-----------------------------------------------------------------------------------------+
-    * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |     RShift      |
-    * |-----------------------------------------------------------------------------------------+
-    * | Ctrl |  GUI  |  Alt  |              Space                |  Alt  |  GUI  |  Ctrl |  Fn  |
-    * `-----------------------------------------------------------------------------------------'
-    */
-
-    [0] = LAYOUT_60_ansi(
-        QK_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_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,
-        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_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-        KC_LCTL,KC_LGUI,KC_LALT,                KC_SPC,                          KC_RALT,KC_RGUI, KC_RCTL, MO(1)
-    ),
-
-    /* FN Layer
-    * ,-----------------------------------------------------------------------------------------.
-    * |  `~ | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10  | F11  | F12  |        |
-    * |-----------------------------------------------------------------------------------------+
-    * |        |     |  Up |     |     |     |     |     |     |     |RGBMOD| Val+| Val- |RBGTOG|
-    * |-----------------------------------------------------------------------------------------+
-    * |         | Left| Down|Right|     |     |     |     | Sat+| Sat-| Hue+| Hue-|             |
-    * |-----------------------------------------------------------------------------------------+
-    * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------------------------+
-    * |      |       |       |                                   |     |      |     |     |     |
-    * `-----------------------------------------------------------------------------------------'
-    */
-
-    [1] = 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_UP,______,______,______,______,______,______,______,RGB_MOD,RGB_VAI,RGB_VAD,RGB_TOG,
-        ______,KC_LEFT,KC_DOWN,KC_RGHT,______, ______, ______,______,RGB_SAI,RGB_SAD,RGB_HUI,RGB_HUD,______,
-        ______,______,______,______,______, ______, ______,______,______,______,______,        ______,
-        ______,______,______,                ______,                        ______,______,______,______
-    ),
-    /* You can copy this layer as base for a new fn layer * /
-	[n] = LAYOUT_60_ansi(
-        ______,______,______,______,______,______,______,______,______,______,______,______,______,______,
-        ______,______,______,______,______,______,______,______,______,______,______,______,______,______,
-        ______,______,______,______,______,______,______,______,______,______,______,______,______,
-        ______,______,______,______,______,______,______,______,______,______,______,        ______,
-        ______,______,______,                ______,                        ______,______,______,______
-    ), // */
-};
diff --git a/keyboards/winkeyless/bface/keymaps/kpeatt/readme.md b/keyboards/winkeyless/bface/keymaps/kpeatt/readme.md
deleted file mode 100644
index a7eef1e5fcf..00000000000
--- a/keyboards/winkeyless/bface/keymaps/kpeatt/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-kpeatt's bface layout
-======================
-
-## Keyboard Notes
-- This is for a clone bface PCB that is no longer for sale as far as I can tell. [Used to be sold on KBDFans](https://www.aliexpress.com/item/bface-60-RGB-underground-copy-pcb-from-china-gh60-pcb-Customize-keyboard-PCB/32731084597.html).
-- To put in reset mode hold `left ctrl` while inserting the USB cable
-- Use flashing instructions in the main `bface` directory
-
-### Build
-To build this keymap, run `make bface:kpeatt` from the qmk_firmware directory.
diff --git a/keyboards/winkeyless/bface/keymaps/p3lim/README.md b/keyboards/winkeyless/bface/keymaps/p3lim/README.md
deleted file mode 100644
index 94e84e7f221..00000000000
--- a/keyboards/winkeyless/bface/keymaps/p3lim/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# p3lim's b.face layout
-
-![](https://user-images.githubusercontent.com/26496/61170794-bf8a2c80-a56e-11e9-893f-f1766e7a9a04.png)
-
-My layout using the winkeyless b.face X2 PCB.
-
-### Building & Flashing
-
-- Set up QMK
-	- `pip install --user qmk`
-	- `qmk setup`
-- Add udev rules if on Linux
-	- Follow the docs: <https://docs.qmk.fm/#/faq_build?id=linux-udev-rules>
-- Build and flash
-	- `qmk flash -kb winkeyless/bface -km p3lim`
-- Hold bottom-left key while connecting to put in flashing mode
-
-### Layout notes
-
-The keys indicated with a gray color in the image above was not supported by the layout so a custom matrix was made.
-The two additional keys were on pins 22+41 and 22+42, C3+B1 and C3+B2, which is mapped to col 10 row 1 and col 10 row 2 in the matrix.
diff --git a/keyboards/winkeyless/bface/keymaps/p3lim/keymap.c b/keyboards/winkeyless/bface/keymaps/p3lim/keymap.c
deleted file mode 100644
index f702810f9c2..00000000000
--- a/keyboards/winkeyless/bface/keymaps/p3lim/keymap.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-Copyright 2019-2021 Adrian L Lange <legal@p3lim.net>
-
-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 LAYOUT_p3lim(\
-  K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, \
-  K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, \
-  K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KC2, KD2, \
-  K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, KC1, \
-  K00, K10, K20,           K56,                K57, KB0, KC0  \
-){ \
-  { K00,   K10,   K20,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB0,   KC0,   KC_NO, KC_NO }, \
-  { K01,   K11,   K21,   K31,   K41,   K51,   KC_NO, KC_NO, KC_NO, KC_NO, KA1,   KB1,   KC1,   KC_NO, KC_NO }, \
-  { K02,   K12,   K22,   K32,   K42,   K52,   KC_NO, KC_NO, KC_NO, KC_NO, KA2,   KB2,   KC2,   KD2,   KC_NO }, \
-  { K03,   K13,   K23,   K33,   K43,   K53,   KC_NO, KC_NO, KC_NO, KC_NO, KA3,   KB3,   KC3,   KC_NO, KC_NO }, \
-  { K04,   K14,   K24,   K34,   K44,   K54,   KC_NO, KC_NO, KC_NO, KC_NO, KA4,   KB4,   KC4,   KC_NO, KE4   }, \
-  { 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, K16,   K26,   K36,   K46,   K56,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB6,   KC6,   KD6,   KE6   }, \
-  { KC_NO, K17,   K27,   K37,   K47,   K57,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB7,   KC7,   KD7,   KE7   } \
-}
-
-enum my_keycodes {
-	C_ESC0 = SAFE_RANGE, // layer 0 esc
-	C_ESC1,              // layer 1 esc
-	C_NO1,               // æ, requires RCTL to be a compose key in software
-	C_NO2,               // ø, requires RCTL to be a compose key in software
-	C_NO3                // å, requires RCTL to be a compose key in software
-};
-
-// use compiler macros for simpler stuff
-#define C_KVM1 LCA(KC_1)
-#define C_KVM2 LCA(KC_2)
-#define C_KVM3 LCA(KC_3)
-#define C_KVM4 LCA(KC_4)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	/* QWERTY
-	* ,-----------------------------------------------------------------------------------------.
-	* | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-	* |-----------------------------------------------------------------------------------------+
-	* |   Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |        |
-	* |---------------------------------------------------------------------------------| Enter |
-	* |   Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |  \  |       |
-	* |-----------------------------------------------------------------------------------------+
-	* |   Shift   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |   Shift   | Del |
-	* |-----------------------------------------------------------------------------------------+
-	* |  FN1  | Alt |  GUI   |              Space                      |  FN2   | Alt |  Ctrl   |
-	* `-----------------------------------------------------------------------------------------'
-	*/
-	[0] = LAYOUT_p3lim(
-		C_ESC0,  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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
-		MO(1),   KC_LALT, KC_LGUI,                   KC_SPC,                             MO(2),   KC_RGUI, KC_RCTL
-	),
-
-	/* FN1
-	* ,-----------------------------------------------------------------------------------------.
-	* |  `  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |           |
-	* |-----------------------------------------------------------------------------------------+
-	* |  Caps  | Home| Up  | End | PgUp|     |     |     |     |     |     |     |     |        |
-	* |---------------------------------------------------------------------------------|       |
-	* |         | Left| Down|Right| PgDn|PrtSc|     |     |     |     |     |     |     |       |
-	* |-----------------------------------------------------------------------------------------+
-	* |           | KVM1| KVM2| KVM3| KVM4|     |     |     |     |     |     |           |     |
-	* |-----------------------------------------------------------------------------------------+
-	* |       |     |        |                                         |        |     |         |
-	* `-----------------------------------------------------------------------------------------'
-	*/
-	[1] = LAYOUT_p3lim(
-		C_ESC1,  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_CAPS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, C_KVM1,  C_KVM2,  C_KVM3,  C_KVM4,  _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______,                   _______,                            KC_NO,   _______, _______
-	),
-
-	/* FN2
-	* ,-----------------------------------------------------------------------------------------.
-	* |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
-	* |-----------------------------------------------------------------------------------------+
-	* |        |     |     |     |     |     |     |     |     |     |     |  Å  |     |        |
-	* |---------------------------------------------------------------------------------|       |
-	* |         |     |     |     |     |     |     |     |     |     |  Ø  |  Æ  |     |       |
-	* |-----------------------------------------------------------------------------------------+
-	* |           |     |     |     |     |     |     |     |     |     |     |           |     |
-	* |-----------------------------------------------------------------------------------------+
-	* |       |     |        |                                         |        |     |         |
-	* `-----------------------------------------------------------------------------------------'
-	*/
-	[2] = LAYOUT_p3lim(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_NO3,   _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_NO2,   C_NO1,   _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		KC_NO,   _______, _______,                   _______,                            _______, _______, _______
-	),
-	/*
-	[n] = LAYOUT_p3lim(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______,                   _______,                            _______, _______, _______
-	),
-	*/
-};
-
-static bool grave_esc_shifted = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record){
-	const uint8_t mods = get_mods();
-	uint8_t shifted = mods & MOD_MASK_SHIFT;
-
-	switch(keycode){
-		case C_ESC0: // layer 0
-			if(record->event.pressed){
-				grave_esc_shifted = shifted;
-				register_code(shifted ? KC_GRAVE : KC_ESCAPE);
-			} else
-				unregister_code(grave_esc_shifted ? KC_GRAVE : KC_ESCAPE);
-			return false;
-		case C_ESC1: // layer 1
-			if(record->event.pressed){
-				grave_esc_shifted = shifted;
-				register_code(shifted ? KC_ESCAPE : KC_GRAVE);
-			} else
-				unregister_code(grave_esc_shifted ? KC_ESCAPE : KC_GRAVE);
-			return false;
-		case C_NO1: // æ
-			if(record->event.pressed){
-				// we use shift for A and E to make it capitalized, no need to handle it here
-				tap_code(KC_RCTL);
-				tap_code(KC_A);
-				tap_code(KC_E);
-			}
-			return false;
-		case C_NO2: // ø
-			// the "/" symbol can't be shifted, so we have to deal with that
-			if(record->event.pressed){
-				if(shifted){
-					unregister_code(KC_LSFT); // reset the shift state, I always use LSFT personally
-					tap_code(KC_RCTL);
-					tap_code(KC_SLSH);
-					tap_code16(S(KC_O));
-					register_code(KC_LSFT); // enable the shift state again to keep state consistent
-				} else {
-					tap_code(KC_RCTL);
-					tap_code(KC_SLSH);
-					tap_code(KC_O);
-				}
-			}
-			return false;
-		case C_NO3: // å
-			// the "o" symbol can't be shifted, so we have to deal with that
-			if(record->event.pressed){
-				if(shifted){
-					unregister_code(KC_LSFT); // reset the shift state, I always use LSFT personally
-					tap_code(KC_RCTL);
-					tap_code(KC_O);
-					tap_code16(S(KC_A));
-					register_code(KC_LSFT); // enable the shift state again to keep state consistent
-				} else {
-					tap_code(KC_RCTL);
-					tap_code(KC_O);
-					tap_code(KC_A);
-				}
-			}
-			return false;
-	}
-	return true;
-}
diff --git a/keyboards/winkeyless/bface/keymaps/p3lim/rules.mk b/keyboards/winkeyless/bface/keymaps/p3lim/rules.mk
deleted file mode 100644
index e0ed6f0c2d6..00000000000
--- a/keyboards/winkeyless/bface/keymaps/p3lim/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/winry/winry315/config.h b/keyboards/winry/winry315/config.h
index 4a3c8c3e274..7bb818d273a 100644
--- a/keyboards/winry/winry315/config.h
+++ b/keyboards/winry/winry315/config.h
@@ -3,78 +3,4 @@
 
 #pragma once
 
-// clang-format on
-
-// RGB Matrix configuration.
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 27
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-
-#    define RGB_MATRIX_CENTER \
-        { 35, 35 }
-
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// This option is required for the TYPING_HEATMAP and DIGITAL_RAIN effects,
-// both of which are disabled below, so the common support for those effects is
-// disabled too.
-#    undef RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// This option is required for reactive effects; disabling this option will
-// implicitly disable all of them.
-#    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
-// The PIXEL_FRACTAL effect does not work properly when the matrix layout is
-// different from the physical layout; it also has problems when underglow
-// LEDs are present, or when multiple LEDs are associated with the same key.
-#    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-// Framebuffer effects; can be enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// is defined.  Both of these effects currently don't work properly when the
-// key matrix does not match the physical layout, so they are disabled.
-#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-// Reactive effects; can be enabled only if at least one 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
-
-#endif
+#define RGB_MATRIX_LED_COUNT 27
diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json
index 98bb376ba2a..a7d71aca462 100644
--- a/keyboards/winry/winry315/info.json
+++ b/keyboards/winry/winry315/info.json
@@ -9,7 +9,51 @@
         "vid": "0xF1F1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [35, 35],
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sleep": true
     },
     "rgblight": {
         "saturation_steps": 8,
diff --git a/keyboards/winry/winry315/keymaps/vial/vial.json b/keyboards/winry/winry315/keymaps/vial/vial.json
index 3f26ea1dedb..ab8a1498b25 100644
--- a/keyboards/winry/winry315/keymaps/vial/vial.json
+++ b/keyboards/winry/winry315/keymaps/vial/vial.json
@@ -228,7 +228,7 @@
 			{
 				"x":1
 			},
-			"0,17\n\n\n0,2"
+			"0,15\n\n\n0,2"
 		],
 		[
 			"0,13\n\n\n0,2",
@@ -247,7 +247,7 @@
 			{
 				"x":1
 			},
-			"0,17\n\n\n0,2"
+			"0,16\n\n\n0,2"
 		]
 	]
   }
diff --git a/keyboards/wolf/m60_b/config.h b/keyboards/wolf/m60_b/config.h
deleted file mode 100644
index a0d44d48e3f..00000000000
--- a/keyboards/wolf/m60_b/config.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-
-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 */
-#ifdef RGB_MATRIX_ENABLE
-
-#define RGB_MATRIX_LED_COUNT 62
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES 
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
-
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-
-#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
-// The PIXEL_FRACTAL effect does not work properly when the matrix layout is
-// different from the physical layout; it also has problems when underglow
-// LEDs are present, or when multiple LEDs are associated with the same key.
-#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-// Framebuffer effects; can be enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// is defined.  Both of these effects currently don't work properly when the
-// key matrix does not match the physical layout, so they are disabled.
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-// Reactive effects; can be enabled only if at least one 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
-
-#endif
diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/info.json
index 2c3b4a3b0d3..6d39d0bbf87 100644
--- a/keyboards/wolf/m60_b/info.json
+++ b/keyboards/wolf/m60_b/info.json
@@ -23,6 +23,50 @@
     },
     "processor": "atmega32u4",
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [2, 0], "x": 7, "y": 32},
@@ -87,7 +131,9 @@
             {"flags": 4, "matrix": [0, 12], "x": 209, "y": 0},
             {"flags": 4, "matrix": [2, 12], "x": 227, "y": 0},
             {"flags": 4, "matrix": [0, 13], "x": 244, "y": 0}
-        ]
+        ],
+        "max_brightness": 120,
+        "sleep": true
     },
     "url": "",
     "usb": {
diff --git a/keyboards/wolf/m6_c/config.h b/keyboards/wolf/m6_c/config.h
deleted file mode 100644
index d5f391bcdd2..00000000000
--- a/keyboards/wolf/m6_c/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2023 contact@vwolf.be
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 6
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES 
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
\ No newline at end of file
diff --git a/keyboards/wolf/m6_c/info.json b/keyboards/wolf/m6_c/info.json
index ff83a951641..f6f2416902f 100644
--- a/keyboards/wolf/m6_c/info.json
+++ b/keyboards/wolf/m6_c/info.json
@@ -25,7 +25,6 @@
         "driver": "ws2812",
         "max_brightness": 120,
         "animations": {
-            "solid_color": true,
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
@@ -70,6 +69,9 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
+        "default": {
+            "animation": "cycle_all"
+        },
         "layout": [
             { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
             { "flags": 4, "matrix": [0, 1], "x": 122, "y": 0 },
@@ -77,7 +79,8 @@
             { "flags": 4, "matrix": [1, 2], "x": 244, "y": 64 },
             { "flags": 4, "matrix": [1, 1], "x": 122, "y": 64 },
             { "flags": 4, "matrix": [1, 0], "x": 0, "y": 64 }
-        ]
+        ],
+        "sleep": true
     },
     "url": "",
     "usb": {
diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h
deleted file mode 100644
index 81e0b787cbf..00000000000
--- a/keyboards/wolf/ts60/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 <me@homedrop.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
-#define BACKLIGHT_DEFAULT_LEVEL 6
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json
index 5e883d2bf19..8f6d9318ea5 100644
--- a/keyboards/wolf/ts60/info.json
+++ b/keyboards/wolf/ts60/info.json
@@ -31,6 +31,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "ws2812": {
diff --git a/keyboards/woodkeys/meira/keymaps/cole/config.h b/keyboards/woodkeys/meira/keymaps/cole/config.h
deleted file mode 100644
index 1dd4c39f254..00000000000
--- a/keyboards/woodkeys/meira/keymaps/cole/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2017 Cole Markham, WoodKeys.click
- *
- * 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
-
-// place overrides here
-#define MUSIC_MASK (keycode != KC_NO)
-#ifdef AUDIO_ENABLE
-   #define STARTUP_SONG SONG(IMPERIAL_MARCH)
-   // Disable music mode to keep the firmware size down
-   #define NO_MUSIC_MODE
-
-#endif
diff --git a/keyboards/woodkeys/meira/keymaps/cole/keymap.c b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
deleted file mode 100644
index 91a03d88610..00000000000
--- a/keyboards/woodkeys/meira/keymaps/cole/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Copyright 2017 Cole Markham
- *
- * 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 RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 5
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        /* Qwerty
-         * ,-----------------------------------------------------------------------------------.
-         * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-         * |------+------+------+------+------+-------------+------+------+------+------+------|
-         * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
-         * |------+------+------+------+------+------|------+------+------+------+------+------|
-         * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-         * |------+------+------+------+------+------+------+------+------+------+------+------|
-         * |Adjust| Ctrl | Ctrl  | Alt  |Lower | Cmd  |Space |Raise | Left | Down |  Up  |Right |
-         * `-----------------------------------------------------------------------------------'
-         */
-        [_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_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_ENT,
-                ADJUST,  KC_LCTL, KC_LALT, KC_LALT, LOWER,   KC_LGUI,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-        ),
-
-        /* Lower
-         * ,-----------------------------------------------------------------------------------.
-         * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-         * |------+------+------+------+------+-------------+------+------+------+------+------|
-         * |   ~  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
-         * |------+------+------+------+------+------|------+------+------+------+------+------|
-         * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
-         * |------+------+------+------+------+------+------+------+------+------+------+------|
-         * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-         * `-----------------------------------------------------------------------------------'
-         */
-        [_LOWER] = LAYOUT(
-                _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-                KC_TILD,  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_QUOT,
-                _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-        ),
-
-        /* Raise
-         * ,-----------------------------------------------------------------------------------.
-         * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-         * |------+------+------+------+------+-------------+------+------+------+------+------|
-         * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-         * |------+------+------+------+------+------|------+------+------+------+------+------|
-         * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
-         * |------+------+------+------+------+------+------+------+------+------+------+------|
-         * |      |      |      |      |      |             |      | Home | PgUp | PgDn | End  |
-         * `-----------------------------------------------------------------------------------'
-         */
-        [_RAISE] = LAYOUT(
-                _______,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-                KC_GRV,  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_HOME, KC_PGDN, KC_PGUP, KC_END
-        ),
-
-        /* Adjust (Lower + Raise)
-         * ,-----------------------------------------------------------------------------------.
-         * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-         * |------+------+------+------+------+-------------+------+------+------+------+------|
-         * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
-         * |------+------+------+------+------+------|------+------+------+------+------+------|
-         * |      |      |      |      |      |      |      |      |      |      |      |      |
-         * |------+------+------+------+------+------+------+------+------+------+------+------|
-         * |      |      |      |      |      |             |      |      |      |      |      |
-         * `-----------------------------------------------------------------------------------'
-         */
-        [_ADJUST] =  LAYOUT(
-                QK_BOOT, _______,   _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,
-                BL_STEP, RGB_MOD, _______, AU_ON,   AU_OFF,  _______, _______, _______,  _______, _______,  _______, _______,
-                BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, OU_AUTO, OU_USB, OU_BT
-        )
-};
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_mode(RGB_current_mode);
-#endif
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-        if (record->event.pressed) {
-            //not sure how to have keyboard check mode and set it to a variable, so my work around
-            //uses another variable that would be set to true after the first time a reactive key is pressed.
-            if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-            } else {
-                TOG_STATUS = !TOG_STATUS;
-#ifdef RGBLIGHT_ENABLE
-                rgblight_mode(16);
-#endif
-            }
-            layer_on(_LOWER);
-            update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-        } else {
-#ifdef RGBLIGHT_ENABLE
-            rgblight_mode(RGB_current_mode);   // revert RGB to initial mode prior to RGB mode change
-#endif
-            TOG_STATUS = false;
-            layer_off(_LOWER);
-            update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case RAISE:
-        if (record->event.pressed) {
-            //not sure how to have keyboard check mode and set it to a variable, so my work around
-            //uses another variable that would be set to true after the first time a reactive key is pressed.
-            if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-            } else {
-                TOG_STATUS = !TOG_STATUS;
-#ifdef RGBLIGHT_ENABLE
-                rgblight_mode(15);
-#endif
-            }
-            layer_on(_RAISE);
-            update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-        } else {
-#ifdef RGBLIGHT_ENABLE
-            rgblight_mode(RGB_current_mode);  // revert RGB to initial mode prior to RGB mode change
-#endif
-            layer_off(_RAISE);
-            TOG_STATUS = false;
-            update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case ADJUST:
-        // FIXME add RGB feedback
-        if (record->event.pressed) {
-            layer_on(_ADJUST);
-        } else {
-            layer_off(_ADJUST);
-        }
-        return false;
-        break;
-    case BL_TOGG:
-#ifdef BACKLIGHT_ENABLE
-        if (record->event.pressed) {
-            print("Enabling backlight\n");
-            backlight_init_ports();
-        }
-#endif
-        return false;
-        break;
-    case BL_STEP:
-        if (record->event.pressed) {
-#ifdef BACKLIGHT_ENABLE
-            backlight_step();
-#endif
-
-        }
-        return false;
-        break;
-        //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-#ifdef RGBLIGHT_ENABLE
-    case RGB_MOD:
-        if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-        }
-        return false;
-        break;
-#endif
-  }
-  return true;
-}
diff --git a/keyboards/woodkeys/meira/keymaps/cole/readme.md b/keyboards/woodkeys/meira/keymaps/cole/readme.md
deleted file mode 100644
index be840488132..00000000000
--- a/keyboards/woodkeys/meira/keymaps/cole/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for meira
diff --git a/keyboards/woodkeys/meira/keymaps/cole/rules.mk b/keyboards/woodkeys/meira/keymaps/cole/rules.mk
deleted file mode 100644
index eed6b9c1190..00000000000
--- a/keyboards/woodkeys/meira/keymaps/cole/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-AUDIO_ENABLE = yes           # Audio output on port C6
-LTO_ENABLE = yes # -4-7k
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/config.h b/keyboards/woodkeys/meira/keymaps/grahampheath/config.h
deleted file mode 100644
index 638ebffb8ce..00000000000
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2017 Cole Markham, WoodKeys.click
- *
- * 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
-
-// place overrides here
-#define MUSIC_MASK (keycode != KC_NO)
-#ifdef AUDIO_ENABLE
-#undef AUDIO_PIN
-#define AUDIO_PIN C6
-    #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
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
deleted file mode 100644
index c95a3183b17..00000000000
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* Copyright 2017 Cole Markham
- *
- * 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 RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _EMOJI 5
-#define _ADJUST 6
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  EMOJI,
-  ADJUST,
-  TOUNGE,
-  JOY,
-  FROWN,
-  HEART,
-  THMBUP,
-  THMBDN,
-  SHRUG,
-  WINK,
-  GRIN,
-  LLAP,
-  CRY,
-  SHIT,
-  FLIP,
-  FNGLEFT,
-  ABOVE,
-  FNGRIGHT,
-  CONFUSED
-};
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-#define KC_X0 MT(MOD_LCTL, KC_ESC)  // Hold for Left Ctrl, Tap for GraveESC
-#define KC_X1 MT(MOD_RSFT, KC_ENT)  // Hold for Right Shift, Tap for Enter
-#define KC_X2 MT(MOD_RSFT, LGUI(KC_ENT))  // Send Command Enter
-#define KC_X3 MT(MOD_LGUI, KC_SPC)  // Hold for Left GUI, Tap for Space
-#define KC_EMOJ TT(_EMOJI)  // Hold for Emoji Layer, or tap 5 times.
-#define KC_QS LGUI(KC_SPC)  // Send Command + Space (for QuickSilver).
-#define KC_TABR LGUI(KC_RCBR)  // Send Command + } (for tab changing).
-#define KC_TABL LGUI(KC_LCBR)  // Send Command + { (for tab changing).
-#define HYPR_0 HYPR(KC_TILD)  // Send Hyper + ~.
-#define HYPR_1 HYPR(KC_EXLM)  // Send Hyper + !.
-#define HYPR_2 HYPR(KC_AT)  // Send Hyper + @.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Emoji | Ctrl | Alt  |Lower | Cmd  |Space+|Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_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_BSPC,
-    KC_X0,   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_X1,
-    KC_EMOJ, KC_LCTL,  KC_LALT, KC_LGUI, LOWER,  KC_X3,    KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Colemak
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  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_ENT ,
-    ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Dvorak
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Emoji Layer
-   *
-   * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-   * │HYPR0│     │ ;-) │     │     │ :-P │     │     │:'-( │FLIP │     │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │HYPR1│  👆 │SHRUG│     │ :-( │     │ <3  │ :-) │     │LLAP │     │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-   * │HYPR2│     │     │     | :-\ │     │     │ :-D │ SHIT│     │     │     │
-   * ├─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┼─────┼─────┼─────┼─────┤
-   * │     │     │     │     │Brig-│   Sleep   │Brig+│ 👈  │ 👎  |  👍 │ 👉 │
-   * └─────┴─────┴─────┴─────┴─────┴───────────┴─────┴─────┴─────┴─────┴─────┘
-   */
-  [_EMOJI] = LAYOUT (
-    HYPR_0,  _______, WINK,    _______, _______,  TOUNGE,  _______, _______, CRY,     FLIP,    _______, _______,
-    HYPR_1,  ABOVE,   SHRUG,   _______, FROWN,    _______, HEART,   JOY,     _______, LLAP,    _______, _______,
-    HYPR_2,  _______, _______, _______, CONFUSED, _______, _______, GRIN,    SHIT,    _______, _______, _______,
-    _______, _______, _______, _______, KC_SCRL,  KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN,  THMBUP,  FNGRIGHT
-  ),
-
-
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Tab- |      |      | Tab+ |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-    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_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
-    _______, _______, _______, _______, _______, KC_QS,   KC_QS, _______, KC_TABL, _______,  _______, KC_TABR
-  ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Home | PgUp | PgDn | End  |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-    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_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, KC_X2,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-  ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] =  LAYOUT(
-    _______, QK_BOOT, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, KC_DEL,
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-};
-
-#ifdef AUDIO_ENABLE
-
-  float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-  float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-  float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-
-
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-      }
-      return false;
-      break;
-    case LOWER:
-        if (record->event.pressed) {
-            layer_on(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-            layer_off(_LOWER);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case RAISE:
-        if (record->event.pressed) {
-            layer_on(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-            layer_off(_RAISE);
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        }
-        return false;
-        break;
-    case ADJUST:
-        // FIXME add RGB feedback
-        if (record->event.pressed) {
-            layer_on(_ADJUST);
-        } else {
-            layer_off(_ADJUST);
-        }
-        return false;
-        break;
-    case BL_STEP:
-        if (record->event.pressed) {
-            print("Stepping backlight\n");
-
-        }
-        return false;
-        break;
-    case FLIP:
-      if (record->event.pressed) {
-        SEND_STRING("&fliptable;");
-      }
-      return false;
-      break;
-    case CONFUSED:
-      if (record->event.pressed) {
-        SEND_STRING(":-\\");
-      }
-      // register_codeturn false;
-      break;
-    case SHIT:
-      if (record->event.pressed) {
-        SEND_STRING("&shit; ");
-      }
-      return false;
-      break;
-    case CRY:
-      if (record->event.pressed) {
-        SEND_STRING(":'-( ");
-      }
-      return false;
-      break;
-    case LLAP:
-      if (record->event.pressed) {
-        SEND_STRING("&llap; ");
-      }
-      return false;
-      break;
-    case GRIN:
-      if (record->event.pressed) {
-        SEND_STRING(":-D ");
-      }
-      return false;
-      break;
-    case TOUNGE:
-      if (record->event.pressed) {
-        SEND_STRING(":-P ");
-      }
-      return false;
-      break;
-    case JOY:
-      if (record->event.pressed) {
-        SEND_STRING(":-) ");
-      }
-      return false;
-      break;
-    case FROWN:
-      if (record->event.pressed) {
-        SEND_STRING(":-( ");
-      }
-      return false;
-      break;
-    case HEART:
-      if (record->event.pressed) {
-        SEND_STRING("<3 ");
-      }
-      return false;
-      break;
-    case SHRUG:
-      if (record->event.pressed) {
-        SEND_STRING("&shrug; ");
-      }
-      return false;
-      break;
-    case THMBUP:
-      if (record->event.pressed) {
-        SEND_STRING("&thumbup; ");
-      }
-      return false;
-      break;
-    case THMBDN:
-      if (record->event.pressed) {
-        SEND_STRING("&thumbdown; ");
-      }
-      return false;
-      break;
-    case FNGLEFT:
-      if (record->event.pressed) {
-        SEND_STRING("&fingerleft; ");
-      }
-      return false;
-      break;
-    case FNGRIGHT:
-      if (record->event.pressed) {
-        SEND_STRING("&fingerright; ");
-      }
-      return false;
-      break;
-    case WINK:
-      if (record->event.pressed) {
-        SEND_STRING(";-) ");
-      }
-      return false;
-      break;
-    case ABOVE:
-      if (record->event.pressed) {
-        SEND_STRING("&above; ");
-      }
-      return false;
-      break;
-
-  }
-  return true;
-}
-
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/readme.md b/keyboards/woodkeys/meira/keymaps/grahampheath/readme.md
deleted file mode 100644
index 10459e35666..00000000000
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/readme.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Graham's Meira.
-
-Don't expect this to work for you unaltered! For the record, these are my notes, not a guide for you :-)
-
-## Known issues:
-Anything over 28k will begin to overwrite the boot loader, which is a pain!
-
-Be sure to check file size with:
-```
-avr-size meira_promicro_grahampheath.hex
-```
-
-## Sounds
-I've added a [8ohm 0.5W speaker](http://a.co/6MIKZSy), its a bit large, but it fits in approximately the same space as the ProMicro. I soldered directly to  PC6 and GND.
-
-As the Meira code stood, adding sound increased the hex beyond what the boot loader could handle, so I had to dial way back on features that I wasnt using, like backlighting and RGB support. I also removed function keys, though I think you could restore some of these features, you certainly can't restore all of them and still fit with a boot loader.
-
-## Build
-
-Built for the ProMicro with:
-```
-make meira/promicro:grahampheath
-```
-
-Build and upload with, which is cool because it will sense your port.
-```
-make meira/promicro:grahampheath:avrdude
-```
-
-Program a hex directly with:
-```
-avrdude -p atmega32u4 -P /dev/tty.usbmodem14111 -c avr109 -v -e -D -U flash:w:meira_promicro_grahampheath.hex
-```
-
-If you use an AVRISP you will be program a hex without a boot loader:
-```
-avrdude -p atmega32u4 -P /dev/tty.usbmodem14111 -c avrisp -v -e -U flash:w:meira_promicro_grahampheath.hex
-```
-
-## Bricked
-Did you overwrite your boot loader?
-
-I did...
-
-I used an [Ardunio as an ISP](https://learn.sparkfun.com/tutorials/installing-an-arduino-bootloader), and was able to program various boot loaders. Ultimately it seemed like this was the right combo:
-
-[ProMicro pinout](https://cdn.sparkfun.com/assets/9/c/3/c/4/523a1765757b7f5c6e8b4567.png)
-
-[Wiring](https://forum.arduino.cc/index.php?PHPSESSID=467mm69btif69hdj5e3gil5465&action=dlattach;topic=363341.0;attach=145820): [via u/dmjlambert](https://forum.arduino.cc/index.php?topic=363341.0)
-
-ProMicro boot loader hex is called `Caterina-promicro16.hex` and is stored on [Sparkfun's GitHub](https://github.com/sparkfun/Arduino_Boards)
-
-```
-avrdude -c avrisp -p m32u4 -P /dev/tty.usbmodem14141 -v -e -U flash:w:Caterina-promicro16.hex -U efuse:w:0xcb:m -U hfuse:w:0xd8:m -U lfuse:w:0xff:m
-```
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk b/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
deleted file mode 100644
index c4e55a1a657..00000000000
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_ENABLE = yes           # Audio output on port C6
-LTO_ENABLE = yes # -4-7k
-MOUSEKEY_ENABLE = no       # Mouse keys(-47kb)
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index 28c506d8675..25d390cecf3 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -19,65 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLIGHT_DI_PIN E6
 
-#define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_LIGHT
-#define RGBLIGHT_DEFAULT_HUE          36
-
-#define RGB_MATRIX_LED_COUNT 9
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #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
-// #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
 
 /*
  * Feature disable options
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index eacbbbccbd4..3c395e057a1 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -9,7 +9,42 @@
         "max_power": 100
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B3", "B2", "B1", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
@@ -30,6 +65,7 @@
         "pin": "F1"
     },
     "rgblight": {
+        "driver": "custom",
         "max_brightness": 120,
         "sleep": true,
         "animations": {
@@ -41,6 +77,9 @@
             "christmas": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "hue": 36
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h
index 98f2b869735..733b226f695 100644
--- a/keyboards/work_louder/micro/config.h
+++ b/keyboards/work_louder/micro/config.h
@@ -3,63 +3,10 @@
 
 #pragma once
 
-
-#define RGB_MATRIX_LED_COUNT 12
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define RGB_MATRIX_DISABLE_KEYCODES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_MATRIX_KEYPRESSES
 
 #define RGBLIGHT_DI_PIN D2
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_GRADIENT + 9
-#define RGBLIGHT_DEFAULT_HUE 213
-
-#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
-// #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
 
 /* disable debug print */
 //#define NO_DEBUG
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json
index d76e7aa0494..1b57ca82e88 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/info.json
@@ -21,6 +21,7 @@
     },
     "processor": "atmega32u4",
     "rgblight": {
+        "driver": "custom",
         "animations": {
             "alternating": false,
             "breathing": true,
@@ -33,6 +34,9 @@
             "static_gradient": true,
             "twinkle": true
         },
+        "default": {
+            "hue": 213
+        },
         "brightness_steps": 8,
         "hue_steps": 8,
         "led_count": 8,
@@ -44,7 +48,42 @@
         "pin": "D1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sleep": true
     },
     "url": "https://worklouder.cc/",
     "usb": {
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 22c6f7b1bdd..e50f6a7e431 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -19,64 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLIGHT_DI_PIN        C7
 
-#define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_LIGHT
-#define RGBLIGHT_DEFAULT_HUE          170
-
-#define RGB_MATRIX_LED_COUNT              2
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #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
-// #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
 
 /*
  * Feature disable options
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index ab064bd019e..61c48b3e802 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -10,7 +10,42 @@
         "max_power": 100
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6"],
@@ -27,6 +62,7 @@
     },
     "rgblight": {
         "led_count": 6,
+        "driver": "custom",
         "max_brightness": 120,
         "sleep": true,
         "animations": {
@@ -38,6 +74,9 @@
             "christmas": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "hue": 170
         }
     },
     "bootmagic": {
diff --git a/keyboards/work_louder/numpad/config.h b/keyboards/work_louder/numpad/config.h
index f6a70b90b0a..f7d00396534 100644
--- a/keyboards/work_louder/numpad/config.h
+++ b/keyboards/work_louder/numpad/config.h
@@ -19,60 +19,7 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGB_MATRIX_LED_COUNT 16
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define RGB_MATRIX_DISABLE_KEYCODES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-
 
 #define RGBLIGHT_DI_PIN D2
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_GRADIENT + 9
-#define RGBLIGHT_DEFAULT_HUE 213
-
-#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
-// #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
diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/info.json
index 0fa2bf2565d..bd615c40808 100644
--- a/keyboards/work_louder/numpad/info.json
+++ b/keyboards/work_louder/numpad/info.json
@@ -29,6 +29,39 @@
         "lto": true
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [3, 3], "x": 141, "y": 64},
@@ -47,9 +80,12 @@
             {"flags": 4, "matrix": [0, 1], "x": 103, "y": 7},
             {"flags": 4, "matrix": [0, 2], "x": 122, "y": 7},
             {"flags": 4, "matrix": [0, 3], "x": 141, "y": 7}
-        ]
+        ],
+        "max_brightness": 150,
+        "sleep": true
     },
     "rgblight": {
+        "driver": "custom",
         "animations": {
             "breathing": true,
             "knight": true,
@@ -59,6 +95,9 @@
             "static_gradient": true,
             "twinkle": true
         },
+        "default": {
+            "hue": 213
+        },
         "brightness_steps": 8,
         "hue_steps": 8,
         "led_count": 8,
diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c
index b4d1a2ad729..9b395559714 100644
--- a/keyboards/work_louder/rgb_functions.c
+++ b/keyboards/work_louder/rgb_functions.c
@@ -24,9 +24,9 @@
 
 #include "ws2812_bitbang.c"
 
-void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds) {
-    ws2812_setleds(start_led, num_leds);
-}
+const rgblight_driver_t rgblight_driver = {
+    .setleds = ws2812_setleds,
+};
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index de91d98de93..57f309513b2 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -20,67 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_DI_PIN        D2
 
 #define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_GRADIENT + 9
-#define RGBLIGHT_DEFAULT_HUE          213
 
 #define RGB_MATRIX_LED_COUNT              49
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #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
-// #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_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
-#define RGB_MATRIX_DEFAULT_HUE 191 // Sets the default hue value, if none has been set
 
 /*
  * Feature disable options
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index 1946b8bcf40..8714133ae7e 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -9,7 +9,44 @@
       "max_power": 100
     },
     "rgb_matrix": {
-      "driver": "ws2812"
+      "animations": {
+        "alphas_mods": true,
+        "gradient_up_down": true,
+        "gradient_left_right": true,
+        "breathing": true,
+        "band_sat": true,
+        "band_val": true,
+        "band_pinwheel_sat": true,
+        "band_pinwheel_val": true,
+        "band_spiral_sat": true,
+        "band_spiral_val": true,
+        "cycle_all": true,
+        "cycle_left_right": true,
+        "cycle_up_down": true,
+        "rainbow_moving_chevron": true,
+        "cycle_out_in": true,
+        "cycle_out_in_dual": true,
+        "cycle_pinwheel": true,
+        "cycle_spiral": true,
+        "dual_beacon": true,
+        "rainbow_beacon": true,
+        "rainbow_pinwheels": true,
+        "raindrops": true,
+        "jellybean_raindrops": true,
+        "hue_breathing": true,
+        "hue_pendulum": true,
+        "hue_wave": true,
+        "pixel_rain": true,
+        "pixel_flow": true,
+        "pixel_fractal": true
+      },
+      "default": {
+        "animation": "solid_color",
+        "hue": 191
+      },
+      "driver": "ws2812",
+      "max_brightness": 120,
+      "sleep": true
     },
     "matrix_pins": {
       "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "E6"],
@@ -25,6 +62,7 @@
       "pin": "D1"
     },
     "rgblight": {
+      "driver": "custom",
       "max_brightness": 120,
       "sleep": true,
       "animations": {
@@ -36,6 +74,9 @@
         "christmas": true,
         "static_gradient": true,
         "twinkle": true
+      },
+      "default": {
+          "hue": 213
       }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/wren/keymaps/walterhanley/config.h b/keyboards/wren/keymaps/walterhanley/config.h
deleted file mode 100644
index 3dd5b47c160..00000000000
--- a/keyboards/wren/keymaps/walterhanley/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Walter Hanley
- *
- * 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
-
-// Lower board power consumption to boost compatibility
-#define USB_MAX_POWER_CONSUMPTION 250
diff --git a/keyboards/wren/keymaps/walterhanley/keymap.c b/keyboards/wren/keymaps/walterhanley/keymap.c
deleted file mode 100644
index bf6afc9ac66..00000000000
--- a/keyboards/wren/keymaps/walterhanley/keymap.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright 2021 Walter Hanley
- *
- * 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
-
-// Cmd-tab tablesetting
-bool is_cmd_tab_active = false;
-uint16_t cmd_tab_timer = 0;
-
-// Alt-tab tablesetting
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-
-// Defines keycode alias
-#define ECTL LCTL_T(KC_ESC)
-#define EGUI LGUI_T(KC_ESC)
-#define DELSYM LT(_SYMBOL, KC_DEL)
-#define SCLNAV LT(_NAV, KC_SCLN)
-#define TGNLCK TG(_NLCK)
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _MAC,
-    _WIN,
-    _NLCK,
-    _SYMBOL,
-    _NAV
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    NSEAL = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Mac */
-    [_MAC] = LAYOUT(
-     KC_PSLS, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  KC_INS,  KC_HOME, KC_PGUP, KC_NO,
-     KC_PAST, KC_4,    KC_5,    KC_6,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, KC_DEL,  KC_END,  KC_PGDN, KC_NO,
-     KC_PMNS, KC_1,    KC_2,    KC_3,    ECTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    SCLNAV,  KC_QUOT, KC_NO,   KC_UP,   KC_NO,   KC_NO,
-     KC_PPLS, KC_0,    KC_DOT,  KC_ENT,  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-                                                           TGNLCK,  KC_LALT, KC_LGUI, KC_BSPC, KC_ENT,  KC_SPC,  DELSYM,  KC_RGUI, KC_RALT, KC_MUTE
-    ),
-
-    /* Windows */
-    [_WIN] = LAYOUT(
-     KC_PSLS, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  KC_INS,  KC_HOME, KC_PGUP, KC_NO,
-     KC_PAST, KC_4,    KC_5,    KC_6,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, KC_DEL,  KC_END,  KC_PGDN, KC_NO,
-     KC_PMNS, KC_1,    KC_2,    KC_3,    EGUI,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    SCLNAV,  KC_QUOT, KC_NO,   KC_UP,   KC_NO,   KC_NO,
-     KC_PPLS, KC_0,    KC_DOT,  KC_ENT,  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-                                                           TGNLCK,  KC_LALT, KC_LCTL, KC_BSPC, KC_ENT,  KC_SPC,  DELSYM,  KC_RCTL, KC_RALT, KC_MUTE
-    ),
-
-    /* In-Keyboard Numlock */
-    [_NLCK] = LAYOUT(
-     KC_PSLS, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     KC_PAST, KC_LEFT, KC_5,    KC_RGHT, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     KC_PMNS, KC_END,  KC_DOWN, KC_PGDN, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     KC_PPLS, KC_INS,  KC_DOT,  KC_ENT,  _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                           TGNLCK,  _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Symbols, F-Keys, and Text Macros */
-    [_SYMBOL] = LAYOUT(
-     NSEAL,   _______, _______, _______, 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_UNDS, KC_LCBR, KC_LBRC, _______,                   _______, KC_RBRC, KC_RCBR, KC_MINS, _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Nav Cluster and Settings*/
-    [_NAV] = LAYOUT(
-     DF(_MAC), _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     DF(_WIN), _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _______,  _______, _______, _______, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        // Encoder functionality for _MAC layer
-        if (IS_LAYER_ON(_MAC))
-        {
-            if (clockwise) {
-                if (!is_cmd_tab_active) {
-                    is_cmd_tab_active = true;
-                    register_code(KC_LGUI);
-                }
-                cmd_tab_timer = timer_read();
-                tap_code16(KC_TAB);
-            } else {
-                if (!is_cmd_tab_active) {
-                    is_cmd_tab_active = true;
-                    register_code(KC_LGUI);
-                }
-                cmd_tab_timer = timer_read();
-                tap_code16(S(KC_TAB));
-            }
-        }
-        // Encoder functionality for _WIN layer
-        else if (IS_LAYER_ON(_WIN)) {
-            if (clockwise) {
-                if (!is_alt_tab_active) {
-                    is_alt_tab_active = true;
-                    register_code(KC_LALT);
-                }
-                alt_tab_timer = timer_read();
-                tap_code16(KC_TAB);
-            } else {
-                if (!is_alt_tab_active) {
-                    is_alt_tab_active = true;
-                    register_code(KC_LALT);
-                }
-                alt_tab_timer = timer_read();
-                tap_code16(S(KC_TAB));
-            }
-        }
-    } else if (index == 1) { /* Second encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case NSEAL:
-            if (record->event.pressed) {
-                // when keycode NSEAL is pressed
-                SEND_STRING("What the fuck did you just fucking say about me, you little bitch? I'll have you know I graduated top of my class in the Navy Seals, and I've been involved in numerous secret raids on Al-Quaeda, and I have over 300 confirmed kills. I am trained in gorilla warfare and I'm the top sniper in the entire US armed forces. You are nothing to me but just another target. I will wipe you the fuck out with precision the likes of which has never been seen before on this Earth, mark my fucking words. You think you can get away with saying that shit to me over the Internet? Think again, fucker. As we speak I am contacting my secret network of spies across the USA and your IP is being traced right now so you better prepare for the storm, maggot. The storm that wipes out the pathetic little thing you call your life. You're fucking dead, kid. I can be anywhere, anytime, and I can kill you in over seven hundred ways, and that's just with my bare hands. Not only am I extensively trained in unarmed combat, but I have access to the entire arsenal of the United States Marine Corps and I will use it to its full extent to wipe your miserable ass off the face of the continent, you little shit. If only you could have known what unholy retribution your little 'clever' comment was about to bring down upon you, maybe you would have held your fucking tongue. But you couldn't, you didn't, and now you're paying the price, you goddamn idiot. I will shit fury all over you and you will drown in it. You're fucking dead, kiddo.");
-            } else {
-                // when keycode NSEAL is released
-            }
-            break;
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-    if (is_cmd_tab_active) {
-        if (timer_elapsed(cmd_tab_timer) > 1000) {
-            unregister_code(KC_LGUI);
-            is_cmd_tab_active = false;
-        }
-    }
-    if (is_alt_tab_active) {
-        if (timer_elapsed(alt_tab_timer) > 1000) {
-            unregister_code(KC_LALT);
-            is_alt_tab_active = false;
-        }
-    }
-}
diff --git a/keyboards/wren/keymaps/walterhanley/readme.md b/keyboards/wren/keymaps/walterhanley/readme.md
deleted file mode 100644
index 27e32360dc4..00000000000
--- a/keyboards/wren/keymaps/walterhanley/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-![Author's Layout](https://github.com/walterhanley/wren-keyboard/blob/main/images/author-layout.png?raw=true)
-
-# Author's Wren Layout
-
-This is my personal Wren layout, which includes a few layers and macros that 
-I find useful. It started as a clone of the default keymap, but will likely
-diverge more as time goes on.
-
-Please note that this layout preserves the entire keyboard matrix, but only 
-includes keycodes for a numpad/nav cluster configuration. Depending on your 
-configuration, you may need to replace some of the existing KC_NO values 
-with actual keycodes.
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/README.md b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/README.md
deleted file mode 100644
index 3e84b4ee607..00000000000
--- a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-## Greetings, Traveler!
-
-This layout is for the [Wuque ikki68 Aurora](https://shop.wuquestudio.com/pages/ikki68-aurora) and is primarily meant for Windows.
-
-The keymap is similar to the default keymap for the Aurora, but it overloads the left alt key to behave like an additional 'Fn' key while keeping the standard functionality of the alt key intact.
-
-### For Example
-```
-LeftAlt + 1...N         -> F1...FN
-LeftAlt + L/R Arrows    -> Home/End
-LeftAlt + Home          -> End
-LeftAlt + Backspace     -> Delete
-LeftAlt + Esc           -> Backtick (`)
-LeftAlt + Shift + Esc   -> Tilde (~)
-LeftAlt + LeftShift + 4 -> Alt+F4
-```
-
-The novel part of this keymap is that it **preserves the default functionality** of the left alt key, so ```'alt + tab', 'ctrl + alt + del', 'alt + f4'```, etc. all work as expected without having to use timers.
-
-Everything also works with other modifier keys, so ```'alt + L/R' and 'alt + shift + L/R'``` work great for text manipulation to select lines.
-
-This **super alt** keymap will feel very familiar for anyone **coming from macOS** since the Windows alt key is in the same position as CMD on macOS keyboards.
-
-And finally, the original alt key functionality can be toggled at any time by pressing ```'Fn + period'``` so for example if a game requires use of the left alt, you can easily turn it off.
-
-### Toggle LED Modes
-You can also cycle though multiple LED modes (underglow, logo, all, none) by pressing ```'Fn + x'``` (the default ikki68 Aurora keymap only supports all or none). The last value set is persisted in EEPROM.
-
-### Compiling/Flashing
-1) After installing QMK MSYS, open the QMK MSYS terminal
-2) Type ```qmk compile -kb wuque/ikki68_aurora -km ewersp``` to test compilation
-3) Type ```qmk flash -kb wuque/ikki68_aurora -km ewersp``` to start flashing
-4) Press ```Fn+Page Up``` to put your keyboard into bootloader mode
-    - Note: After installing the keymap, to enter bootloader mode again press and hold ```Fn+B``` for half a second
-5) Wait for the ```Validating... Success``` message to appear and you're done!
-    - Note: If it gets stuck on ```Bootloader not found. Trying again every 0.5s...``` you may need to run QMK Toolbox to install/update drivers
-
-If you have any questions, feel free to reach out to me at: ewersp [at] gmail [dot] com.
-
-Enjoy! **<3**
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/config.h b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/config.h
deleted file mode 100644
index 1282334dce2..00000000000
--- a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Paul Ewers
- * 
- * 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 FORCE_NKRO
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
deleted file mode 100644
index ac47e5888c3..00000000000
--- a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Copyright 2021 Paul Ewers
- * 
- * 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 alt_keycodes {
-    ALT_DEL = SAFE_RANGE, // Map left alt + backspace to delete
-    LED_TOG               // Toggle LED modes
-};
-
-// Friendly layer names
-enum alt_layers {
-    DEF = 0,
-    ALT,
-    MAC,
-    FUNC,
-    SUPR
-};
-
-// EEPROM storage mode
-enum alt_led_mode {
-    LED_MODE_ALL = 0,
-    LED_MODE_LOGO,
-    LED_MODE_UNDERGLOW,
-    LED_MODE_OFF,
-    LED_MODE_TOTAL
-};
-
-// EEPROM storage type
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t led_mode: 8;
-    };
-} user_config_t;
-
-user_config_t user_config;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [DEF] = 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_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_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_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_UP,
-        KC_LCTL, KC_LGUI, MO(SUPR),         KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(FUNC),KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [ALT] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______, _______, KC_LALT,          _______,          _______,          _______,          _______, _______, _______,             _______, _______, _______
-    ),
-    [MAC] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______, KC_LALT, KC_LGUI,          _______,          _______,          _______,          KC_RGUI, _______, KC_RALT,             _______, _______, _______
-    ),
-    [FUNC] = 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_END,  KC_VOLU,
-        _______, RGB_HUD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_M_P, _______, _______, _______, KC_BRIU, KC_PAUS, KC_PSCR, _______, _______,             KC_MUTE, KC_VOLD,
-        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_SAD, RGB_M_B, _______, _______, _______, KC_BRID, _______, _______,          _______,
-        _______, _______, RGB_TOG, LED_TOG, _______, EE_CLR,  QK_BOOT, _______, _______, TG(MAC), TG(ALT), _______, _______, _______,             KC_PGUP,
-        _______, _______, KC_LALT,          _______,          _______,          _______,          _______, _______, _______,             KC_HOME, KC_PGDN, KC_END
-    ),
-    [SUPR] = 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,  ALT_DEL, ALT_DEL,    KC_END,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,             KC_HOME, _______, KC_END
-    )
-};
-
-// If the super alt layer is the active layer
-bool super_alt_layer_active = false;
-
-// If we need to unregister alt when leaving the super alt layer
-bool need_to_unregister_alt = false;
-
-// This runs code every time that the layers get changed
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case DEF:
-            // When returning to the default layer, check if we need to unregister the left alt key
-            if (super_alt_layer_active && need_to_unregister_alt) {
-                unregister_code(KC_LALT);
-            }
-            super_alt_layer_active = false;
-            need_to_unregister_alt = false;
-            break;
-        case SUPR:
-            super_alt_layer_active = true;
-            break;
-    }
-    return state;
-}
-
-// There is a total of 20 LEDs on the board; the 4 logo LEDs have indices 16, 17, 18, 19
-void update_led_mode(void) {
-    rgblight_setrgb(0, 0, 0);
-    switch (user_config.led_mode) {
-        case LED_MODE_ALL:
-            rgblight_set_effect_range(0, RGBLED_NUM);
-            rgblight_enable_noeeprom();
-            break;
-        case LED_MODE_LOGO: 
-            rgblight_set_effect_range(16, 4);
-            rgblight_enable_noeeprom();
-            break;
-        case LED_MODE_UNDERGLOW:
-            rgblight_set_effect_range(0, 16);
-            rgblight_enable_noeeprom();
-            break;
-        case LED_MODE_OFF:
-            rgblight_disable_noeeprom();
-            break;
-    }
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-    update_led_mode();
-}
-
-void eeconfig_init_user(void) {
-    user_config.raw      = 0;
-    user_config.led_mode = LED_MODE_ALL;
-    eeconfig_update_user(user_config.raw);
-    rgblight_enable();
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-
-    switch (keycode) {
-        // These are the keys we want to 'fall though' and behave as usual when pressed with the alt modifier
-        case KC_A ... KC_Z:
-        case KC_TAB:
-        case KC_DEL:
-        case KC_UP:
-        case KC_DOWN:
-        case KC_ENT:
-        case KC_SPC:
-        case MO(FUNC):
-            if (super_alt_layer_active && record->event.pressed) {
-                // Only activate the alt modifier for the first key press
-                if ((get_mods() & MOD_BIT(KC_LALT)) == false) {
-                    register_code(KC_LALT);
-                    need_to_unregister_alt = true;
-                }
-            }
-            // We still want to process the keycode normally
-            return true;
-        case KC_F4:
-            // Map alt+shift+4 to alt+f4
-            if (super_alt_layer_active && (get_mods() & MOD_BIT(KC_LSFT))) {
-                if (record->event.pressed) {
-                    register_code(KC_LALT);
-                } else {
-                    unregister_code(KC_LALT);
-                }
-            }
-            return true;
-        case ALT_DEL:
-            if (record->event.pressed) {
-                register_code(KC_DEL);
-            } else {
-                unregister_code(KC_DEL);
-            }
-            return false;
-        case LED_TOG:
-            if (record->event.pressed) {
-                user_config.led_mode = (user_config.led_mode + 1) % LED_MODE_TOTAL;
-                update_led_mode();
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;
-        case QK_BOOT:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    reset_keyboard();
-                }
-            }
-            return false;
-        case QK_CLEAR_EEPROM:
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-            } else {
-                if (timer_elapsed32(key_timer) >= 500) {
-                    eeconfig_init();
-                }
-            }
-            return false;
-        default:
-            return true; // Process all other keycodes normally
-    }
-}
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/rules.mk b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index d28ca9eac48..1069259547a 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -15,43 +15,6 @@
  */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 18
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_CENTER \
-        { 92, 33 }
-
-// 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_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-#    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT    // Full gradient scrolling left to right
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN       // Full gradient scrolling top to bottom
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN        // Full gradient scrolling out to in
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL      // Full gradient spinning pinwheel around center of keyboard
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL        // Full gradient spinning spiral around center of keyboard
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS   // Full dual gradients spinning two halfs of keyboard
-#    define ENABLE_RGB_MATRIX_RAINDROPS           // Randomly changes a single key's hue
-
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE   // Pulses keys hit to hue & value then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE          // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE     // Hue & value pulse near a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS    // Hue & value pulse the same column and row of a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
-
-#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
-#    define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
-#    define DRIVER_1_LED_TOTAL 36
-#    define DRIVER_2_LED_TOTAL 35
-#    define DRIVER_3_LED_TOTAL 15
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
+#define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json
index 7684ca6b396..b110bc6e496 100644
--- a/keyboards/xbows/knight/info.json
+++ b/keyboards/xbows/knight/info.json
@@ -9,7 +9,29 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_cross": true,
+            "splash": true,
+            "solid_multisplash": true  
+        },
+        "center_point": [92, 33],
+        "driver": "is31fl3731",
+        "led_process_limit": 18,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
diff --git a/keyboards/xbows/knight/knight.c b/keyboards/xbows/knight/knight.c
index 05ff84060c5..87a297a5ed6 100644
--- a/keyboards/xbows/knight/knight.c
+++ b/keyboards/xbows/knight/knight.c
@@ -15,7 +15,7 @@
  */
  #include "quantum.h"
  #ifdef RGB_MATRIX_ENABLE
- const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 
    {0, C1_3, C2_3, C3_3},   // L01
    {0, C1_4, C2_4, C3_4},   // L02
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index 433d8d994fd..1069259547a 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -15,43 +15,6 @@
  */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 18
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_CENTER \
-        { 92, 33 }
-
-// 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_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-#    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT    // Full gradient scrolling left to right
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN       // Full gradient scrolling top to bottom
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN        // Full gradient scrolling out to in
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL      // Full gradient spinning pinwheel around center of keyboard
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL        // Full gradient spinning spiral around center of keyboard
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS   // Full dual gradients spinning two halfs of keyboard
-#    define ENABLE_RGB_MATRIX_RAINDROPS           // Randomly changes a single key's hue
-
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE   // Pulses keys hit to hue & value then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE          // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE     // Hue & value pulse near a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS    // Hue & value pulse the same column and row of a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
-
-#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
-#    define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
-#    define DRIVER_1_LED_TOTAL 36
-#    define DRIVER_2_LED_TOTAL 35
-#    define DRIVER_3_LED_TOTAL 15
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
+#define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/info.json
index 695ef03672d..d524aed93ea 100644
--- a/keyboards/xbows/knight_plus/info.json
+++ b/keyboards/xbows/knight_plus/info.json
@@ -9,7 +9,29 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_cross": true,
+            "splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [92, 33],
+        "driver": "is31fl3731",
+        "led_process_limit": 18,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
diff --git a/keyboards/xbows/knight_plus/knight_plus.c b/keyboards/xbows/knight_plus/knight_plus.c
index b84f6b964b7..a5335337f1e 100644
--- a/keyboards/xbows/knight_plus/knight_plus.c
+++ b/keyboards/xbows/knight_plus/knight_plus.c
@@ -15,7 +15,7 @@
  */
  #include "quantum.h"
  #ifdef RGB_MATRIX_ENABLE
- const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 
   {0, C1_3, C2_3, C3_3},   // L01
   {0, C1_4, C2_4, C3_4},   // L02
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index 1710e17c2f3..d488c7c9e84 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -15,45 +15,6 @@
  */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 18
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_CENTER \
-        { 92, 33 }
-
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-
-// 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_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-#    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT    // Full gradient scrolling left to right
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN       // Full gradient scrolling top to bottom
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN        // Full gradient scrolling out to in
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL      // Full gradient spinning pinwheel around center of keyboard
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL        // Full gradient spinning spiral around center of keyboard
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS   // Full dual gradients spinning two halfs of keyboard
-#    define ENABLE_RGB_MATRIX_RAINDROPS           // Randomly changes a single key's hue
-
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE   // Pulses keys hit to hue & value then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE          // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE     // Hue & value pulse near a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS    // Hue & value pulse the same column and row of a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
-
-#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
-#    define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
-#    define DRIVER_1_LED_TOTAL 36
-#    define DRIVER_2_LED_TOTAL 36
-#    define DRIVER_3_LED_TOTAL 15
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
+#define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/info.json
index 892dda88781..af496e6e36b 100644
--- a/keyboards/xbows/nature/info.json
+++ b/keyboards/xbows/nature/info.json
@@ -9,7 +9,29 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_cross": true,
+            "splash": true,
+            "solid_multisplash": true  
+        },
+        "center_point": [92, 33],
+        "driver": "is31fl3731",
+        "led_process_limit": 18,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
diff --git a/keyboards/xbows/nature/nature.c b/keyboards/xbows/nature/nature.c
index 1ba964e453b..9fcd40c08c8 100644
--- a/keyboards/xbows/nature/nature.c
+++ b/keyboards/xbows/nature/nature.c
@@ -15,7 +15,7 @@
  */
  #include "quantum.h"
  #ifdef RGB_MATRIX_ENABLE
- const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 
 	{0, C1_3, C2_3, C3_3},   // L01
 	{0, C1_4, C2_4, C3_4},   // L02
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index df025a850da..0966c03f477 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -15,38 +15,4 @@
  */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 18
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_CENTER \
-        { 30, 32 }
-
-// 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_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-#    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT    // Full gradient scrolling left to right
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN       // Full gradient scrolling top to bottom
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN        // Full gradient scrolling out to in
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL      // Full gradient spinning pinwheel around center of keyboard
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL        // Full gradient spinning spiral around center of keyboard
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS   // Full dual gradients spinning two halfs of keyboard
-#    define ENABLE_RGB_MATRIX_RAINDROPS           // Randomly changes a single key's hue
-
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE   // Pulses keys hit to hue & value then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE          // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE     // Hue & value pulse near a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS    // Hue & value pulse the same column and row of a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
-
-#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_VCC
-#    define RGB_MATRIX_LED_COUNT 22
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_VCC
diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json
index 2f5f5f4cd86..6ccb05e1b95 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -9,7 +9,29 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_cross": true,
+            "splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [30, 32],
+        "driver": "is31fl3731",
+        "led_process_limit": 18,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["D4", "D6", "B2", "B1"],
diff --git a/keyboards/xbows/numpad/numpad.c b/keyboards/xbows/numpad/numpad.c
index 519a1b36f41..b84f59fbed7 100644
--- a/keyboards/xbows/numpad/numpad.c
+++ b/keyboards/xbows/numpad/numpad.c
@@ -15,7 +15,7 @@
  */
  #include "quantum.h"
  #ifdef RGB_MATRIX_ENABLE
- const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 
   {0, C3_3,  C2_3, C1_3},   // L01
   {0, C3_4,  C2_4, C1_4},   // L02
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index 92bcfa492c7..c9910cb1452 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -15,43 +15,6 @@
  */
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 18
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_CENTER { 103, 32 }
-
-// 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_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-#    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT    // Full gradient scrolling left to right
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN       // Full gradient scrolling top to bottom
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN        // Full gradient scrolling out to in
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL      // Full gradient spinning pinwheel around center of keyboard
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL        // Full gradient spinning spiral around center of keyboard
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS   // Full dual gradients spinning two halfs of keyboard
-#    define ENABLE_RGB_MATRIX_RAINDROPS           // Randomly changes a single key's hue
-
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE   // Pulses keys hit to hue & value then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE          // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE     // Hue & value pulse near a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS    // Hue & value pulse the same column and row of a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
-
-#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
-#    define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SDA
-#    define DRIVER_1_LED_TOTAL 36
-#    define DRIVER_2_LED_TOTAL 36
-#    define DRIVER_3_LED_TOTAL 15
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
-
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
+#define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SDA
diff --git a/keyboards/xbows/ranger/info.json b/keyboards/xbows/ranger/info.json
index edbb5fc5045..f51d400ee4f 100644
--- a/keyboards/xbows/ranger/info.json
+++ b/keyboards/xbows/ranger/info.json
@@ -9,7 +9,29 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_cross": true,
+            "splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [103, 32],
+        "driver": "is31fl3731",
+        "led_process_limit": 18,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "D7", "F6", "F7", "D4", "D5", "D3"],
diff --git a/keyboards/xbows/ranger/ranger.c b/keyboards/xbows/ranger/ranger.c
index 028b5fca5c0..1ebb9a127c6 100644
--- a/keyboards/xbows/ranger/ranger.c
+++ b/keyboards/xbows/ranger/ranger.c
@@ -17,7 +17,7 @@
 #include "quantum.h"
 
  #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 
     {0, C3_3, C2_3, C1_3},  // L01
     {0, C3_4, C2_4, C1_4},  // L02
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index 7d06b7abdae..82b582bfe12 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -1,64 +1,4 @@
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-
-// 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
-// #    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 IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
-#    define DRIVER_1_LED_TOTAL 35
-#    define DRIVER_2_LED_TOTAL 32
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
index 8212f310343..487fc766983 100644
--- a/keyboards/xbows/woody/info.json
+++ b/keyboards/xbows/woody/info.json
@@ -9,7 +9,41 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "is31fl3731"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B6", "C6", "C7", "F4", "F5", "F6", "F7", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c
index e58ec15e102..9bfa1fd2193 100644
--- a/keyboards/xbows/woody/woody.c
+++ b/keyboards/xbows/woody/woody.c
@@ -1,6 +1,6 @@
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 
 	{0, C8_8,  C7_8, C6_8},   // LA17
 	{0, C9_8,  C7_7, C6_7},   // LA16
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index 4e6d418f212..81d5dc1e83e 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -26,15 +26,10 @@
 //RGB Matrix defines
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
+#define IS31FL3731_LED_COUNT 64
 
-#define DRIVER_1_LED_TOTAL 32
-#define DRIVER_2_LED_TOTAL 32
-#define IS31FL3731_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 #define RGB_MATRIX_LED_COUNT (IS31FL3731_LED_COUNT + WS2812_LED_TOTAL)
 
-#define RGB_MATRIX_DEFAULT_VAL 80
-#define RGB_MATRIX_KEYPRESSES
-
 // enable/disable LEDs based on layout
 // switch between split backspace (1) or normal backspace(0)
 #define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 1
@@ -45,52 +40,3 @@
 // | ? |  Shift  | Fn |    vs     |  Shift  | Up | Fn |
 // `------------------'           `-------------------'
 #define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 1
-
-// 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
-#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
diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/info.json
index e32c8c53a83..12d6a5d5292 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/info.json
+++ b/keyboards/xelus/dawn60/rev1_qmk/info.json
@@ -3,6 +3,52 @@
         "pin": "F0"
     },
     "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "val": 80
+        },
         "driver": "custom"
     },
     "matrix_pins": {
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
index 35ac5a06b2e..6b8f91bc2f8 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
+++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
@@ -145,22 +145,22 @@ led_config_t g_led_config = { {
 //Custom Driver
 static void init(void) {
     i2c_init();
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_1);
-    is31fl3731_init(IS31FL3731_I2C_ADDRESS_2);
+    is31fl3731_init(0);
+    is31fl3731_init(1);
     for (int index = 0; index < IS31FL3731_LED_COUNT; index++) {
         bool enabled = true;
         is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
     }
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_1, 0);
-    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_2, 1);
+    is31fl3731_update_led_control_registers(0);
+    is31fl3731_update_led_control_registers(1);
     
     //RGB Underglow ws2812
     
 }
 
 static void flush(void) {
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_1, 0);
-    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_2, 1);
+    is31fl3731_update_pwm_buffers(0);
+    is31fl3731_update_pwm_buffers(1);
     ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
 }
 
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
index 6e3a51166eb..c8b4a6e5b16 100755
--- a/keyboards/xelus/la_plus/config.h
+++ b/keyboards/xelus/la_plus/config.h
@@ -22,59 +22,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-// RGB Matrix
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 32
-
-#define RGB_MATRIX_DEFAULT_VAL 80
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-// #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
-
 // Custom Startup Animation
 // comment out for solid animation
 // #define STARTUP_ANIMATION_DOTS
diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json
index be1fa115846..85e4e60215c 100644
--- a/keyboards/xelus/la_plus/info.json
+++ b/keyboards/xelus/la_plus/info.json
@@ -12,7 +12,42 @@
         "pin": "F1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true
+        },
+        "default": {
+            "animation": "cycle_all",
+            "val": 80
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index e12b1af4430..6cb40a9fae4 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -38,57 +38,4 @@
 
 // RGB Matrix defines
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-
-#define DRIVER_1_LED_TOTAL 117
-#define IS31FL3741_LED_COUNT DRIVER_1_LED_TOTAL
-
-#define RGB_MATRIX_DEFAULT_VAL 80
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-
-#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_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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 IS31FL3741_LED_COUNT RGB_MATRIX_LED_COUNT // is31fl3741.h does not set this for custom driver
diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json
index 092021b23ac..fe88e695be1 100644
--- a/keyboards/xelus/pachi/rgb/rev1/info.json
+++ b/keyboards/xelus/pachi/rgb/rev1/info.json
@@ -10,7 +10,56 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "custom"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all",
+            "val": 80
+        },
+        "driver": "custom",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C13", "C14", "C15", "H0", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "H1", "B10", "B11"],
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.c b/keyboards/xelus/pachi/rgb/rev1/rev1.c
index e43726115ed..b45dded891e 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.c
+++ b/keyboards/xelus/pachi/rgb/rev1/rev1.c
@@ -29,131 +29,131 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
  *   |  |         G location
  *   |  |         |         B location
  *   |  |         |         | */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, //A1
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, //A2
-    {0, CS33_SW1, CS32_SW1, CS31_SW1}, //A3
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, //A4
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, //A5
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, //A6
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, //A7
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, //A8
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, //A9
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, //A10
-    {0, CS9_SW1 , CS8_SW1 , CS7_SW1 }, //A11
-    {0, CS6_SW1 , CS5_SW1 , CS4_SW1 }, //A12
-    {0, CS3_SW1 , CS2_SW1 , CS1_SW1 }, //A13
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, //A1
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, //A2
+    {0, SW1_CS33, SW1_CS32, SW1_CS31}, //A3
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, //A4
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, //A5
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, //A6
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, //A7
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, //A8
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, //A9
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, //A10
+    {0, SW1_CS9 , SW1_CS8 , SW1_CS7 }, //A11
+    {0, SW1_CS6 , SW1_CS5 , SW1_CS4 }, //A12
+    {0, SW1_CS3 , SW1_CS2 , SW1_CS1 }, //A13
 
-    {0, CS39_SW2, CS38_SW2, CS37_SW2}, //B1
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, //B2
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, //B3
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, //B4
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, //B5
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, //B6
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, //B7
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, //B8
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, //B9
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, //B10
-    {0, CS9_SW2 , CS8_SW2 , CS7_SW2 }, //B11
-    {0, CS6_SW2 , CS5_SW2 , CS4_SW2 }, //B12
-    {0, CS3_SW2 , CS2_SW2 , CS1_SW2 }, //B13
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, //B1
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, //B2
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, //B3
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, //B4
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, //B5
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, //B6
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, //B7
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, //B8
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, //B9
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, //B10
+    {0, SW2_CS9 , SW2_CS8 , SW2_CS7 }, //B11
+    {0, SW2_CS6 , SW2_CS5 , SW2_CS4 }, //B12
+    {0, SW2_CS3 , SW2_CS2 , SW2_CS1 }, //B13
 
-    {0, CS39_SW3, CS38_SW3, CS37_SW3}, //C1
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, //C2
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, //C3
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, //C4
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, //C5
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, //C6
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, //C7
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, //C8
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, //C9
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, //C10
-    {0, CS9_SW3 , CS8_SW3 , CS7_SW3 }, //C11
-    {0, CS6_SW3 , CS5_SW3 , CS4_SW3 }, //C12
-    {0, CS3_SW3 , CS2_SW3 , CS1_SW3 }, //C13
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, //C1
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, //C2
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, //C3
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, //C4
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, //C5
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, //C6
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, //C7
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, //C8
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, //C9
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, //C10
+    {0, SW3_CS9 , SW3_CS8 , SW3_CS7 }, //C11
+    {0, SW3_CS6 , SW3_CS5 , SW3_CS4 }, //C12
+    {0, SW3_CS3 , SW3_CS2 , SW3_CS1 }, //C13
 
-    {0, CS39_SW4, CS38_SW4, CS37_SW4}, //D1
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, //D2
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, //D3
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, //D4
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, //D5
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, //D6
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, //D7
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, //D8
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, //D9
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, //D10
-    {0, CS9_SW4 , CS8_SW4 , CS7_SW4 }, //D11
-    {0, CS6_SW4 , CS5_SW4 , CS4_SW4 }, //D12
-    {0, CS3_SW4 , CS2_SW4 , CS1_SW4 }, //D13
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, //D1
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, //D2
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, //D3
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, //D4
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, //D5
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, //D6
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, //D7
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, //D8
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, //D9
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, //D10
+    {0, SW4_CS9 , SW4_CS8 , SW4_CS7 }, //D11
+    {0, SW4_CS6 , SW4_CS5 , SW4_CS4 }, //D12
+    {0, SW4_CS3 , SW4_CS2 , SW4_CS1 }, //D13
 
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, //E1
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, //E2
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, //E3
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, //E4
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, //E5
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, //E6
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, //E7
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, //E8
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, //E9
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, //E10
-    {0, CS9_SW5 , CS8_SW5 , CS7_SW5 }, //E11
-    {0, CS6_SW5 , CS5_SW5 , CS4_SW5 }, //E12
-    {0, CS3_SW5 , CS2_SW5 , CS1_SW5 }, //E13
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, //E1
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, //E2
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, //E3
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, //E4
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, //E5
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, //E6
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, //E7
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, //E8
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, //E9
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, //E10
+    {0, SW5_CS9 , SW5_CS8 , SW5_CS7 }, //E11
+    {0, SW5_CS6 , SW5_CS5 , SW5_CS4 }, //E12
+    {0, SW5_CS3 , SW5_CS2 , SW5_CS1 }, //E13
 
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}, //F1
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, //F2
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, //F3
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, //F4
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, //F5
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, //F6
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, //F7
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, //F8
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, //F9
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, //F10
-    {0, CS9_SW6 , CS8_SW6 , CS7_SW6 }, //F11
-    {0, CS6_SW6 , CS5_SW6 , CS4_SW6 }, //F12
-    {0, CS3_SW6 , CS2_SW6 , CS1_SW6 }, //F13
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}, //F1
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, //F2
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, //F3
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, //F4
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, //F5
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, //F6
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, //F7
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, //F8
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, //F9
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, //F10
+    {0, SW6_CS9 , SW6_CS8 , SW6_CS7 }, //F11
+    {0, SW6_CS6 , SW6_CS5 , SW6_CS4 }, //F12
+    {0, SW6_CS3 , SW6_CS2 , SW6_CS1 }, //F13
 
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}, //G1
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, //G2
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, //G3
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, //G4
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, //G5
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, //G6
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, //G7
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, //G8
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, //G9
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, //G10
-    {0, CS9_SW7 , CS8_SW7 , CS7_SW7 }, //G11
-    {0, CS6_SW7 , CS5_SW7 , CS4_SW7 }, //G12
-    {0, CS3_SW7 , CS2_SW7 , CS1_SW7 }, //G13
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}, //G1
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, //G2
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, //G3
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, //G4
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, //G5
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, //G6
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, //G7
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, //G8
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, //G9
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, //G10
+    {0, SW7_CS9 , SW7_CS8 , SW7_CS7 }, //G11
+    {0, SW7_CS6 , SW7_CS5 , SW7_CS4 }, //G12
+    {0, SW7_CS3 , SW7_CS2 , SW7_CS1 }, //G13
 
-    {0, CS39_SW8, CS38_SW8, CS37_SW8}, //H1
-    {0, CS36_SW8, CS35_SW8, CS34_SW8}, //H2
-    {0, CS33_SW8, CS32_SW8, CS31_SW8}, //H3
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, //H4
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, //H5
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, //H6
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, //H7
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, //H8
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, //H9
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, //H10
-    {0, CS9_SW8 , CS8_SW8 , CS7_SW8 }, //H11
-    {0, CS6_SW8 , CS5_SW8 , CS4_SW8 }, //H12
-    {0, CS3_SW8 , CS2_SW8 , CS1_SW8 }, //H13
+    {0, SW8_CS39, SW8_CS38, SW8_CS37}, //H1
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, //H2
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, //H3
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, //H4
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, //H5
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, //H6
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, //H7
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, //H8
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, //H9
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, //H10
+    {0, SW8_CS9 , SW8_CS8 , SW8_CS7 }, //H11
+    {0, SW8_CS6 , SW8_CS5 , SW8_CS4 }, //H12
+    {0, SW8_CS3 , SW8_CS2 , SW8_CS1 }, //H13
 
-    {0, CS39_SW9, CS38_SW9, CS37_SW9}, //I1
-    {0, CS36_SW9, CS35_SW9, CS34_SW9}, //I2
-    {0, CS33_SW9, CS32_SW9, CS31_SW9}, //I3
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, //I4
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, //I5
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, //I6
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, //I7
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, //I8
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, //I9
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, //I10
-    {0, CS9_SW9 , CS8_SW9 , CS7_SW9 }, //I11
-    {0, CS6_SW9 , CS5_SW9 , CS4_SW9 }, //I12
-    {0, CS3_SW9 , CS2_SW9 , CS1_SW9 }  //I13
+    {0, SW9_CS39, SW9_CS38, SW9_CS37}, //I1
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, //I2
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, //I3
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, //I4
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, //I5
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, //I6
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, //I7
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, //I8
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, //I9
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, //I10
+    {0, SW9_CS9 , SW9_CS8 , SW9_CS7 }, //I11
+    {0, SW9_CS6 , SW9_CS5 , SW9_CS4 }, //I12
+    {0, SW9_CS3 , SW9_CS2 , SW9_CS1 }  //I13
 };
 
 __attribute__ ((weak))
@@ -188,7 +188,7 @@ led_config_t g_led_config = { {
 
 static void init(void) {
     i2c_init();
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_1);
+    is31fl3741_init(0);
     for (int index = 0; index < IS31FL3741_LED_COUNT; index++) {
         bool enabled = !(   ( index == -1+0+13) || //A13
                             ( index == -1+13+3) || //B3
@@ -223,7 +223,7 @@ static void init(void) {
                         );
         is31fl3741_set_led_control_register(index, enabled, enabled, enabled);
     }
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+    is31fl3741_update_led_control_registers(0);
 }
 
 const rgb_matrix_driver_t rgb_matrix_driver = {
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index f8526027051..50f7d6ac1df 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -38,61 +38,7 @@
 
 // RGB Matrix defines
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-
-#define DRIVER_1_LED_TOTAL 117
-#define IS31FL3741_LED_COUNT DRIVER_1_LED_TOTAL
-
-#define RGB_MATRIX_DEFAULT_VAL 80
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-
-#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
-
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#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 IS31FL3741_LED_COUNT RGB_MATRIX_LED_COUNT // is31fl3741.h does not set this for custom driver
 
 // VIA KB level
 #define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/info.json
index e0b5dc7d1a7..ea712b78d81 100644
--- a/keyboards/xelus/pachi/rgb/rev2/info.json
+++ b/keyboards/xelus/pachi/rgb/rev2/info.json
@@ -9,7 +9,54 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "custom"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all",
+            "val": 80
+        },
+        "driver": "custom",
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A10", "A9"],
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.c b/keyboards/xelus/pachi/rgb/rev2/rev2.c
index 25d1406653c..f595e889c3b 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.c
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.c
@@ -29,131 +29,131 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
  *   |  |         G location
  *   |  |         |         B location
  *   |  |         |         | */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, //A1
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, //A2
-    {0, CS33_SW1, CS32_SW1, CS31_SW1}, //A3
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, //A4
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, //A5
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, //A6
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, //A7
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, //A8
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, //A9
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, //A10
-    {0, CS9_SW1 , CS8_SW1 , CS7_SW1 }, //A11
-    {0, CS6_SW1 , CS5_SW1 , CS4_SW1 }, //A12
-    {0, CS3_SW1 , CS2_SW1 , CS1_SW1 }, //A13
-
-    {0, CS39_SW2, CS38_SW2, CS37_SW2}, //B1
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, //B2
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, //B3
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, //B4
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, //B5
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, //B6
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, //B7
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, //B8
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, //B9
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, //B10
-    {0, CS9_SW2 , CS8_SW2 , CS7_SW2 }, //B11
-    {0, CS6_SW2 , CS5_SW2 , CS4_SW2 }, //B12
-    {0, CS3_SW2 , CS2_SW2 , CS1_SW2 }, //B13
-
-    {0, CS39_SW3, CS38_SW3, CS37_SW3}, //C1
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, //C2
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, //C3
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, //C4
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, //C5
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, //C6
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, //C7
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, //C8
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, //C9
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, //C10
-    {0, CS9_SW3 , CS8_SW3 , CS7_SW3 }, //C11
-    {0, CS6_SW3 , CS5_SW3 , CS4_SW3 }, //C12
-    {0, CS3_SW3 , CS2_SW3 , CS1_SW3 }, //C13
-
-    {0, CS39_SW4, CS38_SW4, CS37_SW4}, //D1
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, //D2
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, //D3
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, //D4
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, //D5
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, //D6
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, //D7
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, //D8
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, //D9
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, //D10
-    {0, CS9_SW4 , CS8_SW4 , CS7_SW4 }, //D11
-    {0, CS6_SW4 , CS5_SW4 , CS4_SW4 }, //D12
-    {0, CS3_SW4 , CS2_SW4 , CS1_SW4 }, //D13
-
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, //E1
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, //E2
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, //E3
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, //E4
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, //E5
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, //E6
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, //E7
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, //E8
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, //E9
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, //E10
-    {0, CS9_SW5 , CS8_SW5 , CS7_SW5 }, //E11
-    {0, CS6_SW5 , CS5_SW5 , CS4_SW5 }, //E12
-    {0, CS3_SW5 , CS2_SW5 , CS1_SW5 }, //E13
-
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}, //F1
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, //F2
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, //F3
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, //F4
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, //F5
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, //F6
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, //F7
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, //F8
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, //F9
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, //F10
-    {0, CS9_SW6 , CS8_SW6 , CS7_SW6 }, //F11
-    {0, CS6_SW6 , CS5_SW6 , CS4_SW6 }, //F12
-    {0, CS3_SW6 , CS2_SW6 , CS1_SW6 }, //F13
-
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}, //G1
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, //G2
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, //G3
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, //G4
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, //G5
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, //G6
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, //G7
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, //G8
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, //G9
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, //G10
-    {0, CS9_SW7 , CS8_SW7 , CS7_SW7 }, //G11
-    {0, CS6_SW7 , CS5_SW7 , CS4_SW7 }, //G12
-    {0, CS3_SW7 , CS2_SW7 , CS1_SW7 }, //G13
-
-    {0, CS39_SW8, CS38_SW8, CS37_SW8}, //H1
-    {0, CS36_SW8, CS35_SW8, CS34_SW8}, //H2
-    {0, CS33_SW8, CS32_SW8, CS31_SW8}, //H3
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, //H4
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, //H5
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, //H6
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, //H7
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, //H8
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, //H9
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, //H10
-    {0, CS9_SW8 , CS8_SW8 , CS7_SW8 }, //H11
-    {0, CS6_SW8 , CS5_SW8 , CS4_SW8 }, //H12
-    {0, CS3_SW8 , CS2_SW8 , CS1_SW8 }, //H13
-
-    {0, CS39_SW9, CS38_SW9, CS37_SW9}, //I1
-    {0, CS36_SW9, CS35_SW9, CS34_SW9}, //I2
-    {0, CS33_SW9, CS32_SW9, CS31_SW9}, //I3
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, //I4
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, //I5
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, //I6
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, //I7
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, //I8
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, //I9
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, //I10
-    {0, CS9_SW9 , CS8_SW9 , CS7_SW9 }, //I11
-    {0, CS6_SW9 , CS5_SW9 , CS4_SW9 }, //I12
-    {0, CS3_SW9 , CS2_SW9 , CS1_SW9 }  //I13
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, //A1
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, //A2
+    {0, SW1_CS33, SW1_CS32, SW1_CS31}, //A3
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, //A4
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, //A5
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, //A6
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, //A7
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, //A8
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, //A9
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, //A10
+    {0, SW1_CS9 , SW1_CS8 , SW1_CS7 }, //A11
+    {0, SW1_CS6 , SW1_CS5 , SW1_CS4 }, //A12
+    {0, SW1_CS3 , SW1_CS2 , SW1_CS1 }, //A13
+
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, //B1
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, //B2
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, //B3
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, //B4
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, //B5
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, //B6
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, //B7
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, //B8
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, //B9
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, //B10
+    {0, SW2_CS9 , SW2_CS8 , SW2_CS7 }, //B11
+    {0, SW2_CS6 , SW2_CS5 , SW2_CS4 }, //B12
+    {0, SW2_CS3 , SW2_CS2 , SW2_CS1 }, //B13
+
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, //C1
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, //C2
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, //C3
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, //C4
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, //C5
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, //C6
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, //C7
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, //C8
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, //C9
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, //C10
+    {0, SW3_CS9 , SW3_CS8 , SW3_CS7 }, //C11
+    {0, SW3_CS6 , SW3_CS5 , SW3_CS4 }, //C12
+    {0, SW3_CS3 , SW3_CS2 , SW3_CS1 }, //C13
+
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, //D1
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, //D2
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, //D3
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, //D4
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, //D5
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, //D6
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, //D7
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, //D8
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, //D9
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, //D10
+    {0, SW4_CS9 , SW4_CS8 , SW4_CS7 }, //D11
+    {0, SW4_CS6 , SW4_CS5 , SW4_CS4 }, //D12
+    {0, SW4_CS3 , SW4_CS2 , SW4_CS1 }, //D13
+
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, //E1
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, //E2
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, //E3
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, //E4
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, //E5
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, //E6
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, //E7
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, //E8
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, //E9
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, //E10
+    {0, SW5_CS9 , SW5_CS8 , SW5_CS7 }, //E11
+    {0, SW5_CS6 , SW5_CS5 , SW5_CS4 }, //E12
+    {0, SW5_CS3 , SW5_CS2 , SW5_CS1 }, //E13
+
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}, //F1
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, //F2
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, //F3
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, //F4
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, //F5
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, //F6
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, //F7
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, //F8
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, //F9
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, //F10
+    {0, SW6_CS9 , SW6_CS8 , SW6_CS7 }, //F11
+    {0, SW6_CS6 , SW6_CS5 , SW6_CS4 }, //F12
+    {0, SW6_CS3 , SW6_CS2 , SW6_CS1 }, //F13
+
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}, //G1
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, //G2
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, //G3
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, //G4
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, //G5
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, //G6
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, //G7
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, //G8
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, //G9
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, //G10
+    {0, SW7_CS9 , SW7_CS8 , SW7_CS7 }, //G11
+    {0, SW7_CS6 , SW7_CS5 , SW7_CS4 }, //G12
+    {0, SW7_CS3 , SW7_CS2 , SW7_CS1 }, //G13
+
+    {0, SW8_CS39, SW8_CS38, SW8_CS37}, //H1
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, //H2
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, //H3
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, //H4
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, //H5
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, //H6
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, //H7
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, //H8
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, //H9
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, //H10
+    {0, SW8_CS9 , SW8_CS8 , SW8_CS7 }, //H11
+    {0, SW8_CS6 , SW8_CS5 , SW8_CS4 }, //H12
+    {0, SW8_CS3 , SW8_CS2 , SW8_CS1 }, //H13
+
+    {0, SW9_CS39, SW9_CS38, SW9_CS37}, //I1
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, //I2
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, //I3
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, //I4
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, //I5
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, //I6
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, //I7
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, //I8
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, //I9
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, //I10
+    {0, SW9_CS9 , SW9_CS8 , SW9_CS7 }, //I11
+    {0, SW9_CS6 , SW9_CS5 , SW9_CS4 }, //I12
+    {0, SW9_CS3 , SW9_CS2 , SW9_CS1 }  //I13
 };
 
 __attribute__ ((weak))
@@ -194,7 +194,7 @@ led_config_t g_led_config = { {
 
 static void init(void) {
     i2c_init();
-    is31fl3741_init(IS31FL3741_I2C_ADDRESS_1);
+    is31fl3741_init(0);
     for (int index = 0; index < IS31FL3741_LED_COUNT; index++) {
         bool enabled = !(   ( index == -1+0+13) || //A13
                             ( index == -1+13+3) || //B3
@@ -229,7 +229,7 @@ static void init(void) {
                         );
         is31fl3741_set_led_control_register(index, enabled, enabled, enabled);
     }
-    is31fl3741_update_led_control_registers(IS31FL3741_I2C_ADDRESS_1, 0);
+    is31fl3741_update_led_control_registers(0);
 }
 
 const rgb_matrix_driver_t rgb_matrix_driver = {
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index 9a0146172dd..f601945a152 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -36,10 +36,6 @@
 // I2C EEPROM
 #define EEPROM_I2C_24LC64
 
-/* RGB Matrix */
-#define RGB_MATRIX_LED_COUNT 28
-#define NOP_FUDGE 0.4
-
 // RGB PWM
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 2
@@ -52,57 +48,4 @@
 #define WS2812_EXTERNAL_PULLUP
 
 // RGB Matrix settings
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CUSTOM_test_mode
-
-// 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
-#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
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
index c082afbca20..196c1ad1c43 100644
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -13,7 +13,54 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h
index 56ecd57ec9d..877313776ad 100644
--- a/keyboards/xelus/xs60/hotswap/config.h
+++ b/keyboards/xelus/xs60/hotswap/config.h
@@ -40,4 +40,4 @@
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 
 // Bitbang WS2812
-#define NOP_FUDGE 0.4
+#define WS2812_BITBANG_NOP_FUDGE 0.4
diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h
index 4b7be4d4414..5b966800c68 100644
--- a/keyboards/xelus/xs60/soldered/config.h
+++ b/keyboards/xelus/xs60/soldered/config.h
@@ -42,4 +42,4 @@
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 
 // Bitbang WS2812
-#define NOP_FUDGE 0.4
+#define WS2812_BITBANG_NOP_FUDGE 0.4
diff --git a/keyboards/xiudi/xd002/keymaps/tap_dance/config.h b/keyboards/xiudi/xd002/keymaps/tap_dance/config.h
deleted file mode 100644
index 1fd93f875fa..00000000000
--- a/keyboards/xiudi/xd002/keymaps/tap_dance/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 500
-#define PERMISSIVE_HOLD
diff --git a/keyboards/xiudi/xd002/keymaps/tap_dance/keymap.c b/keyboards/xiudi/xd002/keymaps/tap_dance/keymap.c
deleted file mode 100644
index 9d337bc8d97..00000000000
--- a/keyboards/xiudi/xd002/keymaps/tap_dance/keymap.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _BASE = 0,
-};
-
-enum {
-  TD_BC = 0
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_BC]  = ACTION_TAP_DANCE_DOUBLE(KC_B, KC_C)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    KC_A,  TD(TD_BC)
-  )
-};
diff --git a/keyboards/xiudi/xd002/keymaps/tap_dance/rules.mk b/keyboards/xiudi/xd002/keymaps/tap_dance/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/xiudi/xd002/keymaps/tap_dance/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/xiudi/xd004/keymaps/system_and_media/keymap.c b/keyboards/xiudi/xd004/keymaps/system_and_media/keymap.c
deleted file mode 100644
index f87a04e1e43..00000000000
--- a/keyboards/xiudi/xd004/keymaps/system_and_media/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BASE 0    // Base layer
-#define _SYSTEM 1  // System actions
-#define _VOLUME 2  // Volume actions
-
-#define SUPER_ALT_F4_TIMER 300  // Timeout on the super alt-f4 key
-
-/*
-    The idea of this is pretty simple: base layer has four action, two of which (the outermost)
-    are regular keystrokes on tap, and a momentary layer switch on hold, sending you to layers 1 and 2.
-
-    The other bit of customization here is the 'Super Alt F4' which does Alt-F4, and then Enter if tapped
-    again SUPER_ALT_F4_TIMER miliseconds after. This lets you Alt-F4 applications, and finally quickly
-    double-tap it to Alt-F4+Enter to shut down the PC.
-*/
-
-bool is_alt_f4_active = false;
-uint16_t alt_f4_timer = 0;
-
-enum custom_keycodes {  // Make sure have the awesome keycode ready
-    SUPER_ALT_F4 = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    // 0: Base Layer
-    [_BASE] = LAYOUT_ortho_1x4(LT(_SYSTEM, KC_F5), C(G(KC_LEFT)), C(G(KC_RIGHT)), LT(_VOLUME, KC_F7)),
-
-    // 1: System actions
-    [_SYSTEM] = LAYOUT_ortho_1x4(_______, SUPER_ALT_F4, G(KC_D), G(KC_L)),
-
-    // 2: Volume actions
-    [_VOLUME] = LAYOUT_ortho_1x4(KC_MEDIA_NEXT_TRACK, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _______),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {  // This will do most of the grunt work with the keycodes.
-        case SUPER_ALT_F4:
-            if (record->event.pressed) {
-                if (!is_alt_f4_active) {
-                    is_alt_f4_active = true;
-                    tap_code16(LALT(KC_F4));  // Alt-F4
-                } else {
-                    tap_code(KC_ENTER);  // Tap enter
-                }
-            }
-            alt_f4_timer = timer_read();
-            break;
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-    if (is_alt_f4_active && timer_elapsed(alt_f4_timer) > SUPER_ALT_F4_TIMER) {
-        is_alt_f4_active = false;
-    }
-};
diff --git a/keyboards/xiudi/xd004/keymaps/system_and_media/readme.md b/keyboards/xiudi/xd004/keymaps/system_and_media/readme.md
deleted file mode 100644
index 3e5533b036d..00000000000
--- a/keyboards/xiudi/xd004/keymaps/system_and_media/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Slightly more advanced keymap for XD004 PCB
-
-A somehow more useful keymap, allowing one to move across virtual desktops on Windows, etc.
-
-It also has a 'Super Alt-F4' key for Windows that, when tapped does Alt-F4, unless two consecutive taps are less than 300ms apart, in which case the second tap becomes Enter. This allows you to close all apps doing taps, and then when the System shutdown window arrives you do a second quick tap and it will type enter, thus shutting down the computer.
-
-## Build
-
-To build the keymap, simply run `make xiudi/xd004:system_and_media`.
diff --git a/keyboards/xiudi/xd60/keymaps/Jos/README.md b/keyboards/xiudi/xd60/keymaps/Jos/README.md
deleted file mode 100644
index c93ea25bfd5..00000000000
--- a/keyboards/xiudi/xd60/keymaps/Jos/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Jos's Layout
-
-Custom layout with various options. Designed to be used with the Canadian Multilingual software layout.
-
-## Layout
-This is the physical layout of my xd60, for reference. See the keymap file for actual software layout.
-![Keyboard Layout (Physical appearence)](https://i.imgur.com/qzOmqyq.png "Physical Layout")
-
-## Features
-**Caps Lock** is **Escape** and the **Window key** is a **Function** key that still acts like the **Window** key in conjuction with `w`, `s`, `d`, `l`, `t`, `e`, `h`, and `SPACE`.
-
-There are a few `#define` lines at the beginning of the keymap file that enable the following options if not commented:
-- `ISOLIKE_ALT_ENTER`: `RALT` + `ENT` is the same as `RALT`+`BSLS`. For logical placement of `{` and `}` (the former being `RALT`+`BSLS`) with ANSI enter on a ISO-based layout.
-- `TWO_SFT_CAPS`: Both shifts together → Caps Lock.
-- `APP_IS_RALT_RCTRL`: Menu would be between `RCTRL` and `RALT`, so now `RALT` + `RCTRL` → `APP`.
-- `HELD_ESC_IS_SHIFT`: Holding `ESC` → `SHIFT`. It always register shift when pressing `ESC`. Useful for VIM.
-- `BSPC_BLOCKS_DEL`: If `BSPC` is held, we disable `DEL`. To avoid acidental presses of `DEL` with split backspace key. 
-- `ALT_MINSEQL_IS_ALT_78`: Pressing `ALT+MINS/EQL` will act like `ALT+7/8`. Will yield `{}` instead of `½¬` in Canadian Multilingual Layout. Diminished finger stretching. 
-
-
-# Build
-To build, simply run `make xiudi/xd60:Jos`
diff --git a/keyboards/xiudi/xd60/keymaps/Jos/config.h b/keyboards/xiudi/xd60/keymaps/Jos/config.h
deleted file mode 100644
index a3b0cd1ec08..00000000000
--- a/keyboards/xiudi/xd60/keymaps/Jos/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Delay for tap/hold for tap dance commands */
-#define TAPPING_TERM 150
diff --git a/keyboards/xiudi/xd60/keymaps/Jos/keymap.c b/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
deleted file mode 100644
index ccc06e66338..00000000000
--- a/keyboards/xiudi/xd60/keymaps/Jos/keymap.c
+++ /dev/null
@@ -1,202 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-// TODO: THOSE ARE IDEAS:
-// TODO:
-// TODO: - Proper support for "GUI+TAB" application switching, with the GUI holding and shift, etc.
-// TODO:     - Maybe implement a process_record instead of a tap-dance, or complex tap dance?
-// TODO: - Media keys on Fn1 layer, *hjklm,.* or arrow cluster?
-// TODO: - What more than NumPad + RGB on the Fn3 toggled layer?
-// TODO: - Add an in-keymap way to toggle LGUI/F(0) key, HELD_ESC_IS_SHIFT and BSPC_BLOCKS_DEL.
-// TODO:
-// TODO: THOSE ARE BUGS TO FIX:
-// TODO: - None (found so far)
-
-// Adjusting process_record_user functionnalities, comment to disable.
-#define ISOLIKE_ALT_ENTER
-#define TWO_SFT_CAPS
-#define APP_IS_RALT_RCTRL
-#define HELD_ESC_IS_SHIFT
-#define BSPC_BLOCKS_DEL
-#define ALT_MINSEQL_IS_ALT_78
-
-// Cases where the GUI key will actually do what the GUI key normally does.
-#define AC_G_W    LGUI(KC_W)   // Ubuntu: Shows windows on current desktop
-#define AC_G_S    LGUI(KC_S)   // Ubuntu: Overview of all desktops
-#define AC_G_D    LGUI(KC_D)   // Windows: Show/Toggle desktop
-#define AC_G_L    LGUI(KC_L)   // Ubuntu/Windows: Lock session
-#define AC_G_T    LGUI(KC_T)   // Ubuntu: Shows Trash // elementary: Opens terminal
-#define AC_G_E    LGUI(KC_E)   // Windows: Opens file explorer
-#define AC_G_H    LGUI(KC_H)   // Windows: Show/Hide hidden files
-#define AC_G_SPC  LGUI(KC_SPC) // elementary: Shows application launcher
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  LAYOUT_all(
-      KC_GRAVE, 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_ESC,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,  KC_QUOT,   KC_NO,               KC_ENT,
-      KC_LSFT,  KC_LGUI, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,  KC_UP,     MO(1),
-      KC_LCTL,  TD(0),   KC_LALT,                            KC_SPC ,                             KC_RALT,  KC_RCTL,   KC_LEFT,  KC_DOWN,   KC_RIGHT),
-                                                                                                                                           
-  // 1: Function 1 Layers                                                                                                                  
-  LAYOUT_all(                                                                                                                                  
-      QK_BOOT, 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_PAUS,   KC_PSCR,
-      KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,
-      KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT,  KC_MSTP,  KC_TRNS,   KC_NO,               KC_TRNS,
-      KC_TRNS, TG(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,   KC_TRNS,  KC_PGUP,   KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS,  KC_TRNS,   KC_HOME,  KC_PGDN,   KC_END),
-                                                                                                                                           
-  // 2: GUI/Function 2 Layer                                                                                                                   
-  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_PAUS,    KC_PSCR,
-      KC_TRNS, KC_TRNS, AC_G_W,  AC_G_E,  KC_TRNS, AC_G_T,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,              KC_TRNS,
-      KC_TRNS, KC_TRNS, AC_G_S,  AC_G_D,  KC_TRNS, KC_TRNS, AC_G_H,  KC_TRNS, KC_TRNS, AC_G_L,   KC_TRNS,  KC_TRNS,   KC_NO,                KC_TRNS,
-      KC_TRNS, KC_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,                            AC_G_SPC,                            KC_TRNS,  KC_TRNS,   KC_HOME,  KC_PGDN,  KC_END),
-                                                                                                                                           
-  // 3: NumPad/Function 3 Toggle Layer                                                                                                                   
-  LAYOUT_all(                                                                                                                                  
-      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_7,    KC_8,    KC_9,     KC_PSLS,  KC_PMNS,   KC_PPLS,  KC_TRNS,    KC_TRNS,
-      KC_TRNS, KC_NO,   KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, KC_NO,   KC_4,    KC_5,    KC_6,     KC_PAST,  KC_NO,     KC_NO,                KC_NO,
-      KC_TRNS, KC_NO,   KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD, KC_NO,   KC_1,    KC_2,    KC_3,     KC_PMNS,  KC_PENT,   KC_NO,                KC_TRNS,
-      KC_NO,   KC_TRNS, KC_NO,   KC_NO,   RGB_TOG, RGB_MOD, KC_NO,   KC_NO,   KC_0,    KC_COMM,  KC_DOT,   KC_PPLS,   KC_NO,    KC_TRNS,    KC_TRNS,
-      KC_NO,   KC_TRNS, KC_NO,                              KC_TRNS,                             KC_PENT,  KC_PENT,   KC_TRNS,  KC_TRNS,    KC_TRNS)  ,
-
-// TRaNSparent layer for reference
-/*  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_NO,                KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,    KC_TRNS,
-/      KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,    KC_TRNS), */
-};
-
-// LGUI acts as F(1) if held or as a tapped LGUI if tapped. Adapted from https://goo.gl/WnqGNS
-// Commented lines are for the "sticky" layer on two presses. Left it here for reference.
-static const int GUILAY = 2; // GUI Layer is layer #2
-
-typedef struct {
-  bool layer_toggle;
-  bool sticky;
-} td_ta_state_t;
-
-static void ang_tap_dance_ta_finished (tap_dance_state_t *state, void *user_data) {
-  td_ta_state_t *td_ta = (td_ta_state_t *) user_data;
-
-//  if (td_ta->sticky) {
-//    td_ta->sticky = false;
-//    td_ta->layer_toggle = false;
-//    layer_off (GUILAY);
-//    return;
-//  }
-//
-  if (state->count == 1 && !state->pressed) {
-    register_code (KC_LGUI);
-//    td_ta->sticky = false;
-    td_ta->layer_toggle = false;
-  } else {
-    td_ta->layer_toggle = true;
-    layer_on(GUILAY);
-//    td_ta->sticky = (state->count == 2);
-  }
-}
-
-// Added this one to make it more reactive on keyup
-static void ang_tap_dance_ta_each (tap_dance_state_t *state, void *user_data) {
-  td_ta_state_t *td_ta = (td_ta_state_t *) user_data;
-
-  if (!td_ta->layer_toggle) {   // Braces added for clarity
-    unregister_code (KC_LGUI);
-  }
-}
-
-
-static void ang_tap_dance_ta_reset (tap_dance_state_t *state, void *user_data) {
-  td_ta_state_t *td_ta = (td_ta_state_t *) user_data;
-
-  if (!td_ta->layer_toggle) {   // Braces added for clarity
-    unregister_code (KC_LGUI);
-  }
-//  if (!td_ta->sticky)
-    layer_off (GUILAY); // We don't verify it was swithed on, switching off regardless
-}
-
-
-tap_dance_action_t tap_dance_actions[] = {
-   [0]  = {
-     .fn = { ang_tap_dance_ta_each, ang_tap_dance_ta_finished, ang_tap_dance_ta_reset },
-     .user_data = (void *)&((td_ta_state_t) { false, false })
-   }
-};
-
-#if defined ISOLIKE_ALT_ENTER  || defined TWO_SFT_CAPS  || defined APP_IS_RALT_RCTRL || defined ALT_MINSEQL_IS_ALT_78
-// Function for the special modifiers actions below, makes it cleaner and yields smaller firmware.
-static bool special_mods(uint16_t keycode, keyrecord_t *record, uint16_t modifier) {
-  if (record->event.pressed && (keyboard_report->mods & MOD_BIT(modifier))) {
-    register_code(keycode);
-    return false;
-  } else {
-    unregister_code(keycode);
-    return true;
-  }
-}
-#endif
-
-#ifdef BSPC_BLOCKS_DEL
-static bool del_blocked = false; // Static as to not be defined elsewhere
-#endif
-
-// This function is processed before the key events on each key press/release.
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode){
-    #ifdef ISOLIKE_ALT_ENTER
-    // RALT + ENT is the same as RALT+BSLS. 
-    // For logical placement of *{* and *}* (the former being RALT+BSLS) with ANSI enter on 
-    // ISO-based Canadian Multilingual layout (or any other ISO layout on ANSI keyboards).
-    case KC_ENT:    return special_mods(KC_BSLS, record, KC_RALT);  // RALT + ENT -> RALT + BSLS            // See comment above
-    #endif
-    #ifdef TWO_SFT_CAPS
-    case KC_LSFT:   return special_mods(KC_CAPS, record, KC_RSFT);  // Both shifts together -> Caps Lock    // RSFT  pressed first case
-    case KC_RSFT:   return special_mods(KC_CAPS, record, KC_LSFT);  // Both shifts together -> Caps Lock    // LSFT  pressed first case
-    #endif
-    #ifdef APP_IS_RALT_RCTRL
-    case KC_RCTL:   return special_mods(KC_APP,  record, KC_RALT);  // RALT + RCTRL -> APP                  // RCTRL pressed first case
-    case KC_RALT:   return special_mods(KC_APP,  record, KC_RCTL);  // RALT + RCTRL -> APP                  // RALT  pressed first case
-    #endif
-    #ifdef ALT_MINSEQL_IS_ALT_78
-    case KC_MINS:  return special_mods(KC_7,  record, KC_RALT); // RALT + MINS -> RALT+7                  // {} in CAN Mult. softawre layout
-    case KC_EQL:   return special_mods(KC_8,  record, KC_RALT); // RALT + EQL  -> RALT+8                  // ½¬ normally... Less finger stretch.
-    #endif
-    #ifdef HELD_ESC_IS_SHIFT
-    case KC_ESC:    // Physically *ESC* is *CAPS*                   // Holding ESC -> SHIFT  (0 delay)      // Less awkward *<ESC>:wq* in vim
-      if (record->event.pressed) {
-        register_code(KC_ESC);      // Tapping ESC
-        unregister_code(KC_ESC);
-        register_code(KC_LSFT);     // Holding LSFT
-        return false;
-      } else {
-        unregister_code(KC_LSFT);   // Releasing LSFT
-        return false;
-      }
-    #endif
-    #ifdef BSPC_BLOCKS_DEL
-    // If BSPC is held, we flag DEL as disabled. To avoids acidental presses of DEL with split backspace key.
-    case KC_BSPC:
-      del_blocked = record->event.pressed;
-      return true;
-    // We don't handle DEL if it is pressed and flagged as disabled
-    case KC_DEL:
-      if (del_blocked && record->event.pressed) {
-        return false;
-      } else {
-        return true;
-      }
-    #endif
-    default: return true;   // Let QMK handle the rest as usual
-  }
-}
-
-
diff --git a/keyboards/xiudi/xd60/keymaps/Jos/rules.mk b/keyboards/xiudi/xd60/keymaps/Jos/rules.mk
deleted file mode 100644
index 7af3f44b9a0..00000000000
--- a/keyboards/xiudi/xd60/keymaps/Jos/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes		# Enables Tap Dance
diff --git a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c b/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
deleted file mode 100644
index 845cd1a137a..00000000000
--- a/keyboards/xiudi/xd60/keymaps/birkir/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  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_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_NO,             KC_ENT,
-    KC_LSFT, KC_SLSH, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_NO,    KC_RSFT, KC_UP,    TG(2),
-    KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_LEFT, KC_DOWN,  KC_RIGHT
-  ),
-
-  // 1: Function Layer
-  LAYOUT_all(
-    KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  BL_DOWN,  BL_UP,   KC_F13,   KC_F14,
-    KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,
-    KC_NO,    KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
-    KC_LSFT,  KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  TG(2),
-    KC_LCTL,  KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END
-  ),
-
-  // 2: Cool Layer
-  LAYOUT_all(
-    QK_BOOT, BL_DOWN,  BL_UP,   BL_ON,   BL_OFF, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_MODE_PLAIN, KC_TRNS,
-    KC_NO,    KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,
-    KC_NO,    KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
-    KC_LSFT,  KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  TG(2),
-    KC_LCTL,  KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END
-  )
-};
-
-bool edit = false;
-uint32_t mode;
-uint16_t hue;
-uint8_t sat;
-uint8_t val;
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-  if (state == 0 && edit == true) {
-    mode = rgblight_get_mode();
-    hue = rgblight_get_hue();
-    sat = rgblight_get_sat();
-    val = rgblight_get_val();
-    edit = false;
-  }
-
-  switch (get_highest_layer(state)) {
-    case 1:
-      rgblight_mode(1);
-      rgblight_setrgb(0xD3, 0x7F, 0xED);
-      break;
-    case 2:
-      rgblight_mode(1);
-      rgblight_setrgb(0xFF, 0x00, 0x00);
-      edit = true;
-      break;
-    default:
-      rgblight_mode(mode);
-      rgblight_sethsv(hue, sat, val);
-      break;
-  }
-  return state;
-}
diff --git a/keyboards/xiudi/xd60/keymaps/birkir/readme.md b/keyboards/xiudi/xd60/keymaps/birkir/readme.md
deleted file mode 100644
index 47a1523f6c5..00000000000
--- a/keyboards/xiudi/xd60/keymaps/birkir/readme.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Birkir's Keymap for XIUDI's 60% XD60 PCB
-
-Custom layout with some custom layers. Mac friendly.
-
-## Layout
-![Birkir's Layout](https://i.imgur.com/I69AYG1.png)
-
-### Layer 0
-Base layer as shown on layout above
-
-### Layer 1
-Active while pressing and holding `MENU`
-
-RGB is purple while active
-
-- `ESC` is `~`
-
-### Layer 2
-Toggled on and off with `FN`
-
-RGB is red while active
-
-RGB settings are persisted for layer 0 when done.
-
- - `1` Backlight DEC
- - `2` Backlight INC
- - `3` Backlight OFF
- - `4` Backlight ON
- - `5` RGB Toggle
- - `6` RGB Mode
- - `7` RGB Hue DEC (-)
- - `8` RGB Hue INC (+)
- - `9` RGB Saturation DEC (-)
- - `0` RGB Saturation INC (+)
- - `-/_` RGB Brightness DEC (-)
- - `+/=` RGB Brightness INC (+)
- - `BACKSPACE` RGB Mode set to PLAIN
-
-## TODO
-
-- Mac shortcuts on Layer 1
-- More dynamic keyboard configuration on Layer 2
-
-## Build
-To build the default keymap, simply run `make xiudi/xd60:birkir`.
diff --git a/keyboards/xiudi/xd60/keymaps/cheese/README.md b/keyboards/xiudi/xd60/keymaps/cheese/README.md
deleted file mode 100644
index 04ff5c4219e..00000000000
--- a/keyboards/xiudi/xd60/keymaps/cheese/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# cheese's Layout
-Customized xd60 keymap 
-
-![Base Layout](https://i.imgur.com/oSg0DPf.png "Base Layout")
-![Fn Layout](https://i.imgur.com/kOOQgVx.png "Fn Layout")
-
-## Programming Instructions:
-`cd` into keymap directory, `make dfu`
-
-## Features
-- Media keys and movement keys setup like on the pok3r
-- Lower right movement keys setup like on the fc660m (fn+direction for home/end/page up and down)
-- Caps lock can be triggered by pressing both shift keys at the same time (and deactivated the same way)
diff --git a/keyboards/xiudi/xd60/keymaps/cheese/keymap.c b/keyboards/xiudi/xd60/keymaps/cheese/keymap.c
deleted file mode 100644
index 674b2bccc1d..00000000000
--- a/keyboards/xiudi/xd60/keymaps/cheese/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-// Each layer gets a name for readability.
-// 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, and you can also skip them entirely
-// and just use numbers.
-#define _BL 0
-#define _FL 1
-#define _LS 2
-#define _RS 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * |FUNCTION|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return|
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space           |FN|Left|Up|Down|Right|
-   * `-----------------------------------------------------------'
-   */
-  [_BL] = 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,
-      MO(_FL), KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NO,    KC_ENT,
-      LM(_LS, MOD_LSFT), KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  LM(_RS, MOD_RSFT), LM(_RS, MOD_RSFT), LM(_RS, MOD_RSFT),
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(_FL), KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT),
-
-// Function Layer
-  [_FL] = 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_DEL,  KC_DEL,
-      KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_CALC, KC_INS,  KC_PGUP,  KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
-      KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU,  KC_TRNS,  KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_APP,  KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,  KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                        KC_TRNS, KC_HOME, KC_PGUP, KC_PGDN, KC_END),
-
-// Left Shift Layer
-  [_LS] = LAYOUT_all(
-      KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_CAPS, KC_CAPS,
-      KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-// Right Shift Layer
-  [_RS] = LAYOUT_all(
-      KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/xiudi/xd60/keymaps/edulpn/keymap.c b/keyboards/xiudi/xd60/keymaps/edulpn/keymap.c
deleted file mode 100644
index 544854024e3..00000000000
--- a/keyboards/xiudi/xd60/keymaps/edulpn/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  LAYOUT_all(
-      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_NO,
-      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_NO,             KC_ENT,
-      KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_NO, KC_RSFT,    KC_NO,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RALT,    MO(1), KC_NO, KC_RGUI,    KC_RCTL),
-
-  // 1: Function Layer
-  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_NO,
-      KC_NO,    KC_NO,    KC_UP,    KC_NO,    KC_INSERT,  KC_HOME,  KC_PGUP,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  KC_NO,    KC_NO,              KC_NO,
-      KC_NO,    KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_DEL,     KC_END,   KC_PGDN,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_NO,    KC_NO,              KC_ENT,
-      KC_LSFT,  KC_NO,    KC_MPRV,  KC_MPLY,  KC_MNXT,    KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_RSFT,  KC_NO,    KC_NO,
-      KC_LCTL,  KC_LGUI,  KC_LALT,                           KC_SPC,                                      KC_RALT,  MO(1),    KC_NO,    KC_RGUI,  KC_RCTL),
-
-};
diff --git a/keyboards/xiudi/xd60/keymaps/edulpn/readme.md b/keyboards/xiudi/xd60/keymaps/edulpn/readme.md
deleted file mode 100644
index ba37eb6d7e1..00000000000
--- a/keyboards/xiudi/xd60/keymaps/edulpn/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Edulpn Keymap for the XD60 PCB
-
-## Additional Notes
-60% Keymap for XD60 with GH60 ANSI layout (based on Supercoffe's keymap) + customized Fn layer.
-
-![Edulpn Keymap for the XD60 PCB](https://i.imgur.com/PoL5qcr.png)
-
-## Build
-To build the default keymap, simply run `make xiudi/xd60:edulpn`.
diff --git a/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c b/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
deleted file mode 100644
index b097b58e36b..00000000000
--- a/keyboards/xiudi/xd60/keymaps/edulpn64/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  LAYOUT_all(
-      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_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_NO,             KC_ENT,
-      KC_LSFT, KC_NO,   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_DEL,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(1),   KC_RCTL,  KC_LEFT, KC_DOWN,  KC_RIGHT),
-
-  // 1: Function Layer
-  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_BSPC,  KC_BSPC,
-      KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_PSCR,KC_SCRL,KC_PAUS, RGB_RMOD,RGB_MOD,  RGB_VAD,           RGB_VAI,
-      KC_CAPS, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_INS, KC_HOME,KC_PGUP, RGB_HUD, RGB_HUI,  KC_NO,             KC_ENT,
-      KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_END,  KC_PGDN, KC_NO,    KC_RSFT, KC_UP,    KC_DEL,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(1),   KC_RCTL,  KC_LEFT, KC_DOWN,  KC_RIGHT),
-
-};
diff --git a/keyboards/xiudi/xd60/keymaps/edulpn64/readme.md b/keyboards/xiudi/xd60/keymaps/edulpn64/readme.md
deleted file mode 100644
index 0fd6e827524..00000000000
--- a/keyboards/xiudi/xd60/keymaps/edulpn64/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Edulpn64 Keymap for XIUDI's 60% XD60 PCB
-
-![Edulpn64 Keymap for XD60](https://dl2.pushbulletusercontent.com/K6bdlBlP5ix7jdMAr8QKes4johmpUfPI/image.png)
-
-## Additional Notes
-This keymap uses the Default XD60 base layer, but follows the GK64 function layer (one of my XD60 boards use GK64 keycaps).
-
-## Build
-To build the default keymap, simply run `make xiudi/xd60:edulpn64`.
diff --git a/keyboards/xiudi/xd60/keymaps/finnish/keymap.c b/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
deleted file mode 100644
index 67e852eb20a..00000000000
--- a/keyboards/xiudi/xd60/keymaps/finnish/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2021 Minna Pallari (@pallarim)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keymap_finnish.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  LAYOUT_all(
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    FI_PLUS,  FI_ACUT,  MO(1), KC_BSPC,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    FI_ARNG,  FI_DIAE,           KC_NO,
-      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    FI_ODIA, FI_ADIA, FI_QUOT,             KC_ENT,
-      KC_LSFT, FI_LABK,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,    FI_MINS,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RALT, KC_RCTL,    KC_LEFT, KC_DOWN,  KC_RIGHT),
-
-  // 1: Function Layer
-  LAYOUT_all(
-      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
-      KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SCRL,  KC_PAUS,           KC_DEL,
-      KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
-      KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDN,  KC_END),
-
-};
diff --git a/keyboards/xiudi/xd60/keymaps/finnish/readme.md b/keyboards/xiudi/xd60/keymaps/finnish/readme.md
deleted file mode 100644
index 2e5c96f770d..00000000000
--- a/keyboards/xiudi/xd60/keymaps/finnish/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Finnish/Swedish iso Keymap for XIUDI's XD60 PCB
-
-FI/SV iso Keymap for XD60.
-
-## Keymap
-
-### Base Layer
-
-![Base layer](https://i.imgur.com/TrChS0N.png)
-
-### Function Layer
-
-![Default Keymap layer 2](https://img.alicdn.com/imgextra/i1/1713761720/TB2K0gTalPxQeBjy1XcXXXHzVXa_!!1713761720.png)
-
-## Build
-
-To build the default keymap, simply run:
-
-    make xiudi/xd60/rev2:finnish  # XD60 rev2
-    make xiudi/xd60/rev3:finnish  # XD60 rev3
diff --git a/keyboards/xiudi/xd60/keymaps/fvolpe83/config.h b/keyboards/xiudi/xd60/keymaps/fvolpe83/config.h
deleted file mode 100755
index b26b00b1898..00000000000
--- a/keyboards/xiudi/xd60/keymaps/fvolpe83/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-/* Changes the number of taps required for layer toggle*/
-#define TAPPING_TOGGLE 3
-
-/* The RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_SLEEP
-
-// lighting layers
-#define RGBLIGHT_LAYERS
diff --git a/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c b/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
deleted file mode 100755
index c19a90abf8b..00000000000
--- a/keyboards/xiudi/xd60/keymaps/fvolpe83/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_all(
-		QK_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_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_NO,
-		MO(1), KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
-		KC_LSFT,       KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_NO,   KC_RSFT, KC_PSCR,
-		KC_LCTL,       KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_APP,  KC_NO,   TT(1),   KC_RCTL),
-	
-	[1] = 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_NO, KC_DEL,
-		KC_TAB,  KC_INS,  KC_DEL,  KC_UP,   KC_PGUP, KC_PGDN, KC_NO, KC_MS_BTN1, KC_MS_UP,    KC_MS_BTN2,  KC_NO,  KC_NO,  KC_NO,   KC_NO,
-		KC_TRNS, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO, KC_MS_LEFT, KC_MS_DOWN,  KC_MS_RIGHT, KC_NO,  KC_NO,  KC_NO,   KC_ENT,
-		KC_LSFT, KC_PSCR, KC_NO,   KC_HOME, KC_END,  KC_NO,   KC_NO, KC_NO,      KC_MS_BTN3,  KC_NO,       KC_NO,  KC_NO,  KC_NO,   KC_RSFT, MO(2),
-		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                  KC_RALT,     KC_APP, KC_NO,  KC_TRNS, KC_RCTL),
-	
-	[2] = LAYOUT_all(
-		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, QK_BOOT,
-		KC_NO, BL_TOGG, BL_STEP, BL_ON,    BL_OFF,   BL_UP,    BL_DOWN, BL_BRTG, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,
-		KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI,  RGB_HUD,  RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_NO, KC_NO,
-		KC_NO, RGB_M_P, RGB_M_B, RGB_M_R,  RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_TRNS,
-		KC_NO, KC_NO,   KC_NO,                                KC_NO,                               KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO)
-};
-
-const rgblight_segment_t PROGMEM my_0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 6, HSV_CYAN},
-	{6, 6, HSV_BLUE}
-);
-
-const rgblight_segment_t PROGMEM my_1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {1, 4, HSV_GREEN},
-	{7, 4, HSV_GREEN}
-);
-const rgblight_segment_t PROGMEM my_2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {1, 4, HSV_PURPLE},
-	{7, 4, HSV_PURPLE}
-);
-
-const rgblight_segment_t PROGMEM my_caps_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 1, HSV_RED},
-	{5, 1, HSV_RED},
-	{6, 1, HSV_RED},
-	{11, 1, HSV_RED}
-);
-	
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_0_layer,
-	my_1_layer,
-    my_2_layer,
-	my_caps_layer
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_layers;
-	layer_state_set_user(layer_state);
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, 0));
-	rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    return state;
-};
-
- bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(3, led_state.caps_lock);
-    return true;
-};
-
-/* // EEPROM Reset Function
-void eeconfig_init_user(void) {
-	backlight_enable(); // Enable backlight by default
-	rgblight_enable(); // Enable RGB by default
-	rgblight_sethsv(HSV_BLUE);  // Set it to orange by default
-}; */
diff --git a/keyboards/xiudi/xd60/keymaps/fvolpe83/readme.md b/keyboards/xiudi/xd60/keymaps/fvolpe83/readme.md
deleted file mode 100755
index 63e507935d6..00000000000
--- a/keyboards/xiudi/xd60/keymaps/fvolpe83/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# fvolpe83's keymap for XIUDI's 60% XD60 PCB rev3
-
-3 layers in ISO:
-
-- 0 for ISO querty with split backspace and split right shift 
-- 1 for arrows and  mouse 
-- 2 for backlight
-
-
-![Keyboard Layout (Physical appearence)](https://i.imgur.com/Zgc4Fv6.jpg "physical layout")
-
-
-## Additional Notes
-
-RGB lighting enabled and goes to sleep with the host, each layer has its own color, caps layer is still there (can be enabled via software) but acts as FN
-
-- 0 = cyan/blue
-- caps = red
-- 1 =  green
-- 2 = purple
-
-tapping toggle has been defined to 3 in the separate config.h
-
-via has been enabled
-
-## Build
-
-To build the keymap, simply run:
-
-    make xiudi/xd60/rev3:fvolpe83  # XD60 rev3
-	
-	
-![Keyboard Layout (Physical appearence)](https://i.imgur.com/CSRPjbX.png "physical layout")
diff --git a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c b/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
deleted file mode 100644
index 05a122bbab0..00000000000
--- a/keyboards/xiudi/xd60/keymaps/kmontag42/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "backlight.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  LAYOUT_all(
-      QK_LEAD, 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_ESC,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_DOT,           KC_ENT,
-      SC_LSPO, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_NO,   SC_RSPC, KC_RGUI,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(1),   KC_LEFT,  KC_DOWN, KC_UP,   KC_RIGHT),
-
-  // 1: Function Layer
-  LAYOUT_all(
-      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13, KC_F14,
-      KC_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,  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,   KC_NO,   KC_NO,    KC_NO,   KC_NO,  KC_NO,
-      KC_NO,   KC_NO,   KC_NO,                            KC_NO,                           MO(1),   KC_NO,    KC_NO,   KC_NO,  KC_NO),
-
-};
-
-// Loop
-void matrix_scan_user(void) {
-  static uint8_t old_layer = 255;
-  uint8_t new_layer = get_highest_layer(layer_state);
-
-  if (old_layer != new_layer) {
-    switch (new_layer) {
-    case 0:
-      rgblight_mode(1);
-      rgblight_setrgb(0xFF, 0xFF, 0xFF);
-      break;
-    case 1:
-      rgblight_mode(18);
-      rgblight_setrgb(0x00, 0xFF, 0xFF);
-      break;
-    }
-
-    old_layer = new_layer;
-  }
-};
diff --git a/keyboards/xiudi/xd60/keymaps/kmontag42/readme.md b/keyboards/xiudi/xd60/keymaps/kmontag42/readme.md
deleted file mode 100644
index fcbf2099c8b..00000000000
--- a/keyboards/xiudi/xd60/keymaps/kmontag42/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# KMontag42's XD60/XD64 Keymap and Layout
-
-[![Built with Spacemacs](https://cdn.rawgit.com/syl20bnr/spacemacs/442d025779da2f62fc86c2082703697714db6514/assets/spacemacs-badge.svg)](http://spacemacs.org)
-
-## Additional Notes
-This layout is  WIP for me as I use my shiny new keyboard more and more. I will work to keep this updated.
-
-## Notable features
-* Arrows only on the bottom row
-** i prefer vim style movement, so this works well for me
-* Layer based RGB lighting
-** i use rgb lights to determine what layer is currently active
-* Maximum key usage
-** unless someone tells me otherwise, I believe this is the maximum number of keys the board can support without PCB modding
-* I use emacs, which could account for some of the oddities in my layout and macros
-
-## Build
-To build the default keymap, simply run `make xiudi/xd60:kmontag42`.
diff --git a/keyboards/xiudi/xd60/keymaps/kmontag42/rules.mk b/keyboards/xiudi/xd60/keymaps/kmontag42/rules.mk
deleted file mode 100644
index d0d2ef6d532..00000000000
--- a/keyboards/xiudi/xd60/keymaps/kmontag42/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LEADER_ENABLE = yes
diff --git a/keyboards/xiudi/xd60/keymaps/krusli/keymap.c b/keyboards/xiudi/xd60/keymaps/krusli/keymap.c
deleted file mode 100644
index 15eb93e6dfd..00000000000
--- a/keyboards/xiudi/xd60/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-#define _BASE 0
-#define _FN   1
-
-/* HHKB-like layout for standard 60% layout with split RShift */
-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_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_NO,   KC_ENT,
-      KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, MO(1),
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RALT, KC_RGUI, _______, KC_APP,  KC_RCTL),
-
-  [_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_DEL,   _______,
-      QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_INS,
-      _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_NO,        _______,
-      _______, KC_NO,   _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,  _______,
-      _______, _______, _______,                          _______,                              _______, _______, _______, _______, _______),
-};
diff --git a/keyboards/xiudi/xd60/keymaps/krusli/readme.md b/keyboards/xiudi/xd60/keymaps/krusli/readme.md
deleted file mode 100644
index c6d6834e6a4..00000000000
--- a/keyboards/xiudi/xd60/keymaps/krusli/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# krusli's Keymap for XIUDI's 60% XD60 PCB
-
-## Additional Notes
-Keymap for the XD60 (ANSI) with 2.25u left shift, split right shift. HHKB-like function layer.
-
-## Build
-To build this keymap, simply run `make xiudi/xd60:krusli` on the top-level directory for QMK.
diff --git a/keyboards/xiudi/xd60/keymaps/melka/.gitignore b/keyboards/xiudi/xd60/keymaps/melka/.gitignore
deleted file mode 100644
index c79982f2ea8..00000000000
--- a/keyboards/xiudi/xd60/keymaps/melka/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-passwd.h
diff --git a/keyboards/xiudi/xd60/keymaps/melka/config.h b/keyboards/xiudi/xd60/keymaps/melka/config.h
deleted file mode 100644
index 37581d12ea9..00000000000
--- a/keyboards/xiudi/xd60/keymaps/melka/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#if __GNUC__ > 5
-#    if __has_include("passwd.h")
-#        include "passwd.h"
-#    endif  // if file exists
-#endif      // __GNUC__
-
-#ifndef PASSWORD_A
-    #define PASSWORD_A "1234567890"
-#endif
-
-#ifndef PASSWORD_B
-    #define PASSWORD_B "pass123"
-#endif
-
-#define RGBLIGHT_LAYERS
-
-#define LSPO_KEYS KC_LSFT, KC_TRNS, KC_5
-#define RSPC_KEYS KC_RSFT, KC_TRNS, KC_MINS
diff --git a/keyboards/xiudi/xd60/keymaps/melka/keymap.c b/keyboards/xiudi/xd60/keymaps/melka/keymap.c
deleted file mode 100644
index 0a1f5d4e494..00000000000
--- a/keyboards/xiudi/xd60/keymaps/melka/keymap.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/*
-Security Note: While it is possible to use macros to send passwords, credit card numbers,
-and other sensitive information it is a supremely bad idea to do so. Anyone who gets a hold
-of your keyboard will be able to access that information by opening a text editor.
-*/
-enum custom_keycodes
-{
-  PASS_A = SAFE_RANGE,
-  PASS_B
-};
-
-#define ___ KC_NO
-
-#define LAYOUT_melka(                                                           \
-    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, K2C,            \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48)                                \
-  {                                                                             \
-    {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, ___},     \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D},     \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3E, K3D},     \
-    {K40, K41, K42, ___, ___, K43, ___, K3C, K46, K0E, K44, K45, K47, K48}      \
-  }
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // 0: Base Layer
-    LAYOUT_melka(
-      KC_NUBS,  KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_MINS,    KC_EQL,     KC_DEL,     KC_BSPC,
-      KC_TAB,   KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       KC_LBRC,    KC_RBRC,    KC_ENT,
-      KC_CAPS,  KC_A,       KC_S,       KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOT,    KC_BSLS,
-      MT(KC_LSFT, KC_5),  KC_GRV,     KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,       KC_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    MT(KC_RSFT, KC_MINS),    KC_UP,      MO(1),
-      KC_LCTL,  KC_LALT,    KC_LGUI,                                        KC_SPC,                                         KC_RGUI,    KC_RALT,    KC_LEFT,  KC_DOWN,      KC_RIGHT),
-
-  // 1: Function Layer
-  LAYOUT_melka(
-      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_WH_U,    KC_UP,      KC_WH_D,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-      _______,  KC_LEFT,    KC_DOWN,    KC_RIGHT,   _______,    _______,    _______,    _______,    _______,    _______,    KC_HOME,    KC_PGUP,    _______,
-      TO(2),    TO(3),      _______,    KC_APP,     BL_STEP,    _______,    _______,    _______,    _______,    _______,    _______,    KC_END,     KC_PGDN,    KC_VOLU,    _______,
-      _______,  _______,    _______,                                        _______,                                        _______,    _______,    _______,    KC_VOLD,    KC_MUTE),
-
-  // 2: RGB Layer
-  LAYOUT_melka(
-      RGB_TOG,  RGB_M_P,    RGB_RMOD,   RGB_MOD,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_X,    RGB_M_G,    RGB_M_T,    _______,    _______,    QK_BOOT,
-      _______,  RGB_HUD,    RGB_HUI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-      _______,  RGB_SAD,    RGB_SAI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-      TO(0),    _______,    RGB_VAD,    RGB_VAI,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    PASS_A,      PASS_B,    _______,    _______,
-      _______,  _______,    _______,                                        _______,                                        _______,    _______,    _______,    _______,    _______),
-
-  // 3: Keypad Layer
-  LAYOUT_melka(
-      KC_ESC,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_NUM,     KC_PEQL,    KC_PSLS,    KC_PAST,    _______,    _______,
-      _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P7,      KC_P8,      KC_P9,      KC_PMNS,    _______,
-      _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P4,      KC_P5,      KC_P6,      KC_PPLS,
-      TO(0),    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_P1,      KC_P2,      KC_P3,      KC_PENT,    TO(0),
-      _______,  _______,    _______,                                        _______,                                        KC_P0,      KC_P0,      KC_PDOT,    KC_PENT,    _______)
-};
-
-// Light LEDs 6 to 9 and 12 to 15 red when caps lock is active. Hard to ignore!
-const rgblight_segment_t PROGMEM rgb_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {2, 4, HSV_RED},       // Light 4 LEDs, starting with LED 6
-    {6, 4, HSV_RED}       // Light 4 LEDs, starting with LED 12
-);
-// Light LEDs 9 & 10 in cyan when keyboard layer 1 is active
-const rgblight_segment_t PROGMEM rgb_function_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {9, 2, HSV_CYAN}
-);
-// Light LEDs 11 & 12 in purple when keyboard layer 2 is active
-const rgblight_segment_t PROGMEM rgb_backlight_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {10, 2, HSV_PURPLE}
-);
-const rgblight_segment_t PROGMEM rgb_keypad_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {4, 4, HSV_RED}
-);
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    rgb_capslock_layer,
-    rgb_function_layer,
-    rgb_backlight_layer,    // Overrides caps lock layer
-    rgb_keypad_layer     // Overrides other layers
-);
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // Both layers will light up if both kb layers are active
-    rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    return state;
-}
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    return true;
-}
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = rgb_layers;
-}
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
-
-static bool control_disabled = false;
-static bool delete_pressed = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  if (keycode == KC_BSPC)
-  {
-    if (record->event.pressed)
-    {
-      if (keyboard_report->mods & MOD_BIT(KC_LCTL))
-      {
-        delete_pressed = true;
-        control_disabled = true;
-        unregister_code(KC_LCTL);
-        register_code(KC_DEL);
-        return false;
-      }
-    }
-    else if (delete_pressed)
-    {
-      delete_pressed = false;
-      unregister_code(KC_DEL);
-
-      if (control_disabled)
-      {
-        control_disabled = false;
-        register_code(KC_LCTL);
-      }
-      return false;
-    }
-  }
-  else if (keycode == KC_LCTL && !record->event.pressed && delete_pressed)
-  {
-    delete_pressed = false;
-    control_disabled = false;
-    unregister_code(KC_DEL);
-    register_code(KC_BSPC);
-    return false;
-  }
-
-  switch (keycode)
-  {
-  case PASS_A:
-    if (record->event.pressed)
-    {
-      SEND_STRING(PASSWORD_A "\n");
-    }
-    break;
-  case PASS_B:
-    if (record->event.pressed)
-    {
-      SEND_STRING(PASSWORD_B "\n");
-    }
-    break;
-  }
-  return true;
-}
diff --git a/keyboards/xiudi/xd60/keymaps/melka/passwd_template.h b/keyboards/xiudi/xd60/keymaps/melka/passwd_template.h
deleted file mode 100644
index a78de6d40d6..00000000000
--- a/keyboards/xiudi/xd60/keymaps/melka/passwd_template.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-To define your password, rename this file to passwd.h and edit the defines below.
-
-Security Note: While it is possible to use macros to send passwords, credit card numbers,
-and other sensitive information it is a supremely bad idea to do so. Anyone who gets a hold
-of your keyboard will be able to access that information by opening a text editor.
-*/
-
-#define PASSWORD_A "enter your first password here"
-#define PASSWORD_B "second password if you need"
diff --git a/keyboards/xiudi/xd60/keymaps/melka/readme.md b/keyboards/xiudi/xd60/keymaps/melka/readme.md
deleted file mode 100644
index 23e7ab0b092..00000000000
--- a/keyboards/xiudi/xd60/keymaps/melka/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# melka's keymap for XIUDI's 60% XD60 rev3 PCB
-
-## Additional Notes
-Custom Keymap for XD60 rev3. French Mac layout.
-
-## Security Note
-This keymap includes macros for entering passwords.
-
-While it is possible to use macros to send passwords, credit card numbers,
-and other sensitive information it is a supremely bad idea to do so. Anyone who gets a hold
-of your keyboard will be able to access that information by opening a text editor.
-
-Use this functionnality at your own risk.
-
-To define your password, rename passwd_template.h file to passwd.h and edit the defines inside.
-
-## Build
-
-To build this keymap, simply run:
-
-    make xiudi/xd60/rev3:melka  # XD60 rev3
diff --git a/keyboards/xiudi/xd60/keymaps/petesmom/README.md b/keyboards/xiudi/xd60/keymaps/petesmom/README.md
deleted file mode 100644
index 075928205c4..00000000000
--- a/keyboards/xiudi/xd60/keymaps/petesmom/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# pete's mom Layout
-
-Customized xd60 keymap based on yuuki's but a step sideways with Mac support. For Pete on his 40th
-
-## Programming Instructions
-
-Change the layout in `keymap.c` then run `make xiudi/xd60:petesmom`. The compiled file will be located in `.build/xiudi_xd60_petesmom.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run:
-
-* `sudo dfu-programmer atmega32u4 erase`
-* `sudo dfu-programmer atmega32u4 flash .build/xiudi_xd60-petesmom.hex`
-* `sudo dfu-programmer atmega32u4 start`
-
-## Layout
-
-See `keymap.c` for the details, but here are the important features:
-
-| Key                        | Function                           |
-| -------------------------- | ---------------------------------- |
-| ESC | ESC when pressed alone but acts as ~ when pressed with Shift or LGUI down |
-| FN + ESC | Grave |
-| Right Shift | When tapped generates / |
-| FN + HJKL | Arrow Keys |
-| FN + C | ^ |
-| FN + V | & |
-| FN + , . RShift | Mac Vol - + Mute |
-| FN + P [ ] \ | Mac Play/Pause, Prev Track, Next Track, Stop |
diff --git a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c b/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
deleted file mode 100644
index f6dd13e9fa5..00000000000
--- a/keyboards/xiudi/xd60/keymaps/petesmom/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-#define BASE 0
-#define FN 1
-
-#define CTL_SLSH CTL_T(KC_SLSH)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  [BASE] = LAYOUT_all(
-      QK_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_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_NO,              KC_ENT,
-      KC_LSFT,   KC_NO,   KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_NO,    RSFT_T(KC_SLASH),  KC_UP,    KC_RCTL,
-      CTL_SLSH,  KC_LALT, KC_LGUI,                              KC_SPC,                              KC_RGUI,  MO(FN),  KC_LEFT,  KC_DOWN,  KC_RIGHT
-      ),
-  // 1: Function Layer
-  [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_DEL,   KC_DEL,
-      KC_TRNS,   RGB_MOD, RGB_VAI,  KC_TRNS,  KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_MPLY, KC_MRWD,  KC_MFFD,            KC_MSTP,
-      KC_TRNS,   RGB_TOG, RGB_VAD,  KC_MUTE,  KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS, KC_TRNS,  KC_NO,              KC_ENT,
-      KC_TRNS,   KC_NO,   KC_TRNS,  KC_TRNS,  KC_CIRC, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,  KC_VOLU, KC_NO,   KC_MUTE,KC_PGUP,  QK_BOOT,
-      KC_TRNS,   KC_TRNS, KC_TRNS,                              KC_SPC,                              KC_TRNS, KC_TRNS,  KC_HOME,  KC_PGDN,KC_END
-      ),
-
-};
diff --git a/keyboards/xiudi/xd60/keymaps/rooski/instructions.txt b/keyboards/xiudi/xd60/keymaps/rooski/instructions.txt
deleted file mode 100644
index 1486647dcd2..00000000000
--- a/keyboards/xiudi/xd60/keymaps/rooski/instructions.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-cd c:/QMK
-make xd60        / /                 / / / / / / 
\ No newline at end of file
diff --git a/keyboards/xiudi/xd60/keymaps/rooski/keymap.c b/keyboards/xiudi/xd60/keymaps/rooski/keymap.c
deleted file mode 100644
index 00dea7dcd4e..00000000000
--- a/keyboards/xiudi/xd60/keymaps/rooski/keymap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-// XD60 Rev 2.0
-
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-//#include "action_tapping.h"
-#include "backlight.h"
-
-// Define tapping term
-#define TAPPING_TERM    150
-
-// Layer definitions~
-#define _BL 0
-#define _FL 1
-#define _LK 2
-
-// RShift TapHold
-#define RSTT MT(MOD_RSFT, KC_SLSH)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* (Base Layer) Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-   * |-----------------------------------------------------------|
-   * | Caps |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return |
-   * |-----------------------------------------------------------|
-   * |Shift  |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|Shift| Up |Del |
-   * |-----------------------------------------------------------|
-   * |Ctrl|Gui |Alt |      Space           |Ctrl|Fn| LT| DN | RT |
-   * `-----------------------------------------------------------'
-   */
-  // 0: Base Layer
-  [_BL] = LAYOUT_all(
-      QK_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_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, XXXXXXX, KC_ENT,
-      KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  XXXXXXX, RSTT,    KC_UP,   KC_DEL,
-      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RIGHT),
-
-  // 1: Function Layer
-  [_FL] = 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_DEL,  KC_DEL,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,
-      XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            TG(_LK), _______, KC_HOME, _______, KC_END),
-
- // 2: Lighting Keys
-  [_LK] = LAYOUT_all(
-      TO(_BL), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   QK_BOOT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX,
-      QK_BOOT, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLU, KC_MUTE, XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, RGB_VAI, BL_STEP,
-      XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            TO(_BL), XXXXXXX, RGB_TOG, RGB_VAD, RGB_MOD),
-
-};
diff --git a/keyboards/xiudi/xd60/keymaps/semicolonsnet/keymap.c b/keyboards/xiudi/xd60/keymaps/semicolonsnet/keymap.c
deleted file mode 100644
index 7b1bacf0fe9..00000000000
--- a/keyboards/xiudi/xd60/keymaps/semicolonsnet/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Chase Nordengren 
-  * 
-  * 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(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_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, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_SLSH), KC_UP, KC_DEL, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
-	[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_F13, KC_F14, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_VOLU, KC_VOLD, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LCAG(KC_SCLN), LCAG(KC_QUOT), KC_NO, KC_TRNS, KC_TRNS, KC_NO, LCAG(KC_Z), LCAG(KC_X), LCAG(KC_ASTR), LCAG(KC_V), LCAG(KC_B), LCAG(KC_N), LCAG(KC_M), LCAG(KC_COMM), KC_INS, KC_DEL, KC_TRNS, KC_PGUP, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, LCAG(KC_SPC), KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END)
-};
-
-// Loop
diff --git a/keyboards/xiudi/xd60/keymaps/semicolonsnet/readme.md b/keyboards/xiudi/xd60/keymaps/semicolonsnet/readme.md
deleted file mode 100644
index 7e74f753ff4..00000000000
--- a/keyboards/xiudi/xd60/keymaps/semicolonsnet/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Semicolonsnet Keymap for XIUDI's 60% XD60 PCB
-
-![Semicolonsnet Keymap for XD60](https://i.imgur.com/VZygOqK.png)
-
-## Additional Notes
-Custom Keymap for XD60 - uses a META key and lots of shortcut keys that are later software controlled
-
-## Build
-
-To build the default keymap, simply run:
-
-    make xiudi/xd60/rev2:default  # XD60 rev2
-    make xiudi/xd60/rev3:default  # XD60 rev3
\ No newline at end of file
diff --git a/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c b/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
deleted file mode 100644
index 5b1f0916002..00000000000
--- a/keyboards/xiudi/xd60/keymaps/stanleylai/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  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_BSLS,  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_BSPC,
-      MO(1),   KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NO,             KC_ENT,
-      KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  MO(2),   KC_UP,    KC_DEL,
-      KC_LCTL, KC_LALT, KC_LGUI,                          KC_SPC,                          KC_RGUI, KC_RALT,  KC_LEFT, KC_DOWN,  KC_RIGHT),
-
-  // 1: Function Layer
-  LAYOUT_all(
-      QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
-      KC_CAPS, KC_MPRV, KC_UP,   KC_MNXT, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,             KC_DEL,
-      MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,             KC_ENT,
-      KC_LSFT, KC_NO,   KC_VOLD, KC_MUTE, KC_VOLU,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_PGUP,  KC_INS,
-      KC_LCTL, KC_LALT, KC_LGUI,                          KC_MPLY,                         KC_RGUI, KC_RALT,  KC_HOME, KC_PGDN,  KC_END),
-
-  // 2: RGB Layer
-  LAYOUT_all(
-      KC_NO,   BL_TOGG, BL_STEP, 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,   RGB_TOG, RGB_MOD, KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,             KC_NO,
-      KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    KC_NO,             KC_NO,
-      KC_NO,   KC_NO,   RGB_HUD, RGB_SAD, RGB_VAD,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,    MO(2),   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/xiudi/xd60/keymaps/styr/keymap.c b/keyboards/xiudi/xd60/keymaps/styr/keymap.c
deleted file mode 100644
index fdadd3a1353..00000000000
--- a/keyboards/xiudi/xd60/keymaps/styr/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _BL 0
-#define _FL 1
-#define _LL 2
-
-enum custom_keycodes {
-  MACRO_STRING
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  [_BL] = 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_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,
-      MO(_LL), KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NO,            KC_ENT,
-      KC_LSFT, XXXXXXX, 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_DEL,
-      KC_LCTL, KC_LALT, KC_LGUI,                          KC_SPC,                          MO(_FL), KC_RALT, KC_LEFT,  KC_DOWN, KC_RIGHT),
-
-  // 1: Function Layer
-  [_FL] = LAYOUT_all(
-      XXXXXXX,   KC_F1,     KC_F2,     KC_F3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_F13,   KC_F14,
-      XXXXXXX,   RGB_TOG,   RGB_MOD,   RGB_RMOD,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  RGB_HUI,  RGB_HUD,  XXXXXXX,  RGB_VAI,  RGB_VAD,  XXXXXXX,
-      XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2,
-      XXXXXXX,   XXXXXXX,   XXXXXXX,                    MACRO_STRING,                                            XXXXXXX,    F(0),    KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT),
-
-  [_LL] = LAYOUT_all(
-      XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_F13,   KC_F14,
-      XXXXXXX,   RGB_TOG, XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,   XXXXXXX,    XXXXXXX,   XXXXXXX,
-      XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,   XXXXXXX,    KC_MUTE,
-      XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,    XXXXXXX,   XXXXXXX, KC_VOLU, KC_MPLY,
-      XXXXXXX,   XXXXXXX,   XXXXXXX,                    XXXXXXX,                                            XXXXXXX,    F(0),    KC_MRWD, KC_VOLD, KC_MFFD),
-
-
-};
-
-// Macros
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case MACRO_STRING:
-      if(record->event.pressed){
-        SEND_STRING("My Custom String");
-      }
-      return false;
-      break;
-    default:
-      return true;
-  }
-}
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/xiudi/xd60/keymaps/styr/readme.md b/keyboards/xiudi/xd60/keymaps/styr/readme.md
deleted file mode 100644
index 1c5d160cfa5..00000000000
--- a/keyboards/xiudi/xd60/keymaps/styr/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Keyboard Layout by Styr
-
-## Additional Notes
-Default Keymap for XD60 as indicated on the original sale page.
-
-## Build
-To build the default keymap, simply run `make xiudi/xd60/rev3:styr`.
diff --git a/keyboards/xiudi/xd60/keymaps/supercoffee/keymap.c b/keyboards/xiudi/xd60/keymaps/supercoffee/keymap.c
deleted file mode 100644
index bdc47082a54..00000000000
--- a/keyboards/xiudi/xd60/keymaps/supercoffee/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  LAYOUT_all(
-      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_NO,
-      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_NO,             KC_ENT,
-      KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_NO, KC_RSFT,    KC_NO,
-      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          MO(1),   KC_RALT,  KC_NO, KC_RGUI,    KC_RCTL),
-
-  // 1: Function Layer
-  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_F13,   KC_F14,
-      KC_NO,   KC_NO,   KC_UP,   KC_END,  KC_NO,  KC_NO,   KC_CALC, KC_PGUP, KC_NO, KC_NO,    KC_NO,  KC_NO,    KC_NO,             KC_DEL,
-      KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_NO,  KC_NO,   KC_HOME, KC_PGDN, KC_NO,  KC_NO,   KC_NO,  KC_PGUP,  KC_NO,             KC_ENT,
-      KC_LSFT, KC_NO,   KC_NO,   KC_DEL,  BL_STEP,KC_NO,   KC_NO,   KC_VOLD, KC_VOLU,KC_MUTE, KC_NO,  KC_PGDN,  KC_RSFT, KC_NO,    KC_NO,
-      KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                            MO(1),  KC_RALT,  KC_NO, KC_RGUI,    KC_RCTL),
-
-};
diff --git a/keyboards/xiudi/xd60/keymaps/supercoffee/readme.md b/keyboards/xiudi/xd60/keymaps/supercoffee/readme.md
deleted file mode 100644
index 111f34e7202..00000000000
--- a/keyboards/xiudi/xd60/keymaps/supercoffee/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Supercoffee Keymap for DeskCandy 60% XD60 PCB
-
-![Supercoffee Keymap for XD60](https://i.imgur.com/SPg4wXw.jpg)
-
-## Additional Notes
-60% Keymap for XD60 with GH60 ANSI layout. Arrow keys mapped to WASD in function layer.
-
-## Build
-To build the default keymap, simply run `make xiudi/xd60:supercoffee`.
diff --git a/keyboards/xiudi/xd60/keymaps/suryanisaac/README.md b/keyboards/xiudi/xd60/keymaps/suryanisaac/README.md
deleted file mode 100644
index dbc94dbf733..00000000000
--- a/keyboards/xiudi/xd60/keymaps/suryanisaac/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# suryanisaac's layout
-
-Just my custom layout, works really well for me so hopefully you guys like it.
-
-## Features:
-
-- Arrow keys on IJKL on Layer 1
-- Layer 1 toggle is the Caps Lock (No one likes caps lock)
-- Nav keys close to arrow keys, good for programming
-- Non-convoluted media control
-- For Mac or Linux with Kinto
-- Left and Right brackets on left shift and right shift
-- Layer 1 has F1 to F12 on number keys
-
-
-Pictures Available Here: https://imgur.com/a/7UzkhOu
diff --git a/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c b/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
deleted file mode 100644
index fff9fc6fc38..00000000000
--- a/keyboards/xiudi/xd60/keymaps/suryanisaac/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Suryan Isaac
-  * 
-  * 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
-
-/* THIS FILE WAS GENERATED!
- *
- * This file was generated by qmk json2c. You may or may not want to
- * edit it directly.
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_60_ansi(QK_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_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, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, TG(1)),
-	[1] = LAYOUT_60_ansi(QK_BOOT, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_UP, KC_PGDN, KC_END, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/xiudi/xd60/keymaps/yuuki/README.md b/keyboards/xiudi/xd60/keymaps/yuuki/README.md
deleted file mode 100644
index ba0de049ee2..00000000000
--- a/keyboards/xiudi/xd60/keymaps/yuuki/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# yuuki's Layout
-
-Customized xd60 keymap with inspirations from HHKB and the layout I used on my Vortex Core (a 40% keyboard).
-
-## Programming Instructions
-
-Change the layout in `keymap.c` then run `make xiudi/xd60:yuuki`. The compiled file will be located in `.build/xiudi_xd60_yuuki.hex` relative to the project root. To flash it onto your keyboard, use whatever program works on your OS. I personally use `dfu-programmer`, and run:
-
-* reset keyboard by pressing the reset button on the back of the PCB
-* `sudo dfu-programmer atmega32u4 erase`
-* `sudo dfu-programmer atmega32u4 flash .build/xiudi_xd60_yuuki.hex`
-* `sudo dfu-programmer atmega32u4 start`
-
-## Layout
-
-![Keyboard Layout](https://github.com/cideM/cidem.github.io/blob/master/keyboard-layout.png "Layout")
-
-Upper row is default layer, bottom row is function layer. I Didn't include the symbols, such as @,# or $, as their placement is just as you'd expect it.
-
-## Summary of Changes
-
-| Key                        | Function                           |
-| -------------------------- | ---------------------------------- |
-| Capslock | Forward Slash when tapped and Left Control when held |
-| Left Control | Temporarily activate function layer |
-| FN + ESC | Grave |
-| Space Cadet Shift | Left Shift tapped writes ( and Right Shift tapped writes )  |
-| FN + HJKL | Arrow Keys |
-| Rightmost key in second row from bottom | Temporarily activate function layer |
-| FN + C | ^ |
-| FN + V | & (both for convenience as I use these keys a lot with VIM navigation and I find them hard reach) |
diff --git a/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c b/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
deleted file mode 100644
index 90cb77b96ea..00000000000
--- a/keyboards/xiudi/xd60/keymaps/yuuki/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-#define BASE 0
-#define FN 1
-
-#define CTL_SLSH CTL_T(KC_SLSH)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  // 0: Base Layer
-  [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,
-      CTL_SLSH,  KC_A,    KC_S,     KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN,  KC_QUOT,  KC_NO,              KC_ENT,
-      SC_LSPO,   KC_NO,   KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_NO,    SC_RSPC,  KC_UP,    MO(FN),
-      MO(FN),    KC_LGUI, KC_LALT,                              KC_SPC,                              KC_RALT,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RIGHT
-      ),
-  // 1: Function Layer
-  [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_DEL,   KC_DEL,
-      KC_TRNS,   RGB_MOD, RGB_VAI,  RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_DEL,
-      KC_TRNS,   RGB_TOG, RGB_VAD,  KC_MUTE,  KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_NO,              KC_ENT,
-      KC_TRNS,   KC_NO,   KC_TRNS,  KC_TRNS,  KC_CIRC, KC_AMPR, 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_SPC,                              KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGDN,  KC_END
-      ),
-
-};
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/config.h b/keyboards/xiudi/xd75/keymaps/4sstylz/config.h
deleted file mode 100644
index 6241444a84b..00000000000
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
-
-/* Enable the space-cadet options */
-#define RSPC_KEYS KC_RSFT, KC_TRNS, KC_PGUP
-#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_PGDN
-#define LSPO_KEYS KC_LSFT, KC_TRNS, KC_HOME
-#define LCPO_KEYS KC_LCTL, KC_TRNS, KC_END
-
-#define TAPPING_TERM 175
-
-#define BACKLIGHT_BREATHING
-#undef RGBLIGHT_EFFECT_BREATHING
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/keycodes.h b/keyboards/xiudi/xd75/keymaps/4sstylz/keycodes.h
deleted file mode 100644
index d0460856b2d..00000000000
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/keycodes.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    Version 2, December 2004
- *
- * Copyright (C) 2019 4sStylZ <4sstylz@protonmail.ch>
- *
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
- */
-#include QMK_KEYBOARD_H
-
-/**
- * Macro for selecting all the text in the document.
- * Usual shortcut : Ctrl+A.
- *
- * @param keyrecord_t *record
- *
- * @return void
- */
-void select_all(keyrecord_t *record) {
-    if (record->event.pressed) {
-        tap_code16(C(KC_A));
-    }
-}
-
-/**
- * Macro for selecting the current row.
- *
- * @param keyrecord_t *record
- *
- * @return void
- */
-void select_row(keyrecord_t *record) {
-    if (record->event.pressed) {
-        tap_code(KC_HOME);
-        tap_code16(S(KC_END));
-    }
-}
-
-/**
- * Macro for selecting the current word.
- * Usage : You need to have the cursor into the word or directly at the right.
- *
- *
- * Usual shortcut : Ctrl+A.
- *
- * @param keyrecord_t *record
- *
- * @return void
- */
-void select_word(keyrecord_t *record) {
-    if (record->event.pressed) {
-        register_code(KC_LCTL);
-        tap_code(KC_LEFT);
-        tap_code16(S(KC_RGHT));
-        unregister_code(KC_LCTL);
-    }
-}
-
-/**
- * Macro for inserting two 0 with keypad.
- * Be carefull to have the keypad lock enabled
- *
- * @param keyrecord_t *record
- *
- * @return void
- */
-void insert_00(keyrecord_t *record) {
-    if (record->event.pressed) {
-        tap_code16(S(KC_0));
-        tap_code16(S(KC_0));
-    }
-}
-
-/**
- * Bépo Windows lock
- *
- * @param keyrecord_t *record
- *
- * @return void
- */
-void windows_lock(void) {
-    tap_code16(G(KC_O));
-}
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
deleted file mode 100644
index 5222497937c..00000000000
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * 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 "keycodes.h"
-#include "leds.h"
-
-// Implement Super-alt↯tab
-// See https://docs.qmk.fm/#/feature_macros?id=super-alt↯tab
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-bool is_screen_lock_triggered = false;
-uint16_t screen_lock_timer = 0;
-
-// Defining all the custom keycodes.
-enum custom_keycodes {
-  ALT_TAB  = SAFE_RANGE,
-  KC_00  ,
-  SLC_ROW,
-  SLC_ALL,
-  SLC_WRD
-};
-
-enum combo_events {
-  SCR_LCK
-};
-
-const uint16_t PROGMEM lock_combo[] = {KC_J, KC_K, KC_L, KC_SCLN, COMBO_END};
-combo_t key_combos[] = {COMBO(lock_combo, SCR_LCK)};
-
-// Layer shorthand
-#define _QW 0
-#define _FN 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
- * │` Esc │   1  │   2  │   3  │   4  │   5  │  Del │   6  │   7  │   8  │   9  │   0  │  -   │  =   │PrtScn│
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │ Tab  │   Q  │   W  │   E  │   R  │   T  │ Bksp │   Y  │   U  │   I  │   O  │   P  │  [   │  ]   │ Home │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │ FN   │   A  │   S  │   D  │   F  │   G  │Enter │   H  │   J  │   K  │   L  │   ;  │   '  │   #  │  End │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │ Shft │   Z  │   X  │   C  │   V  │   B  │ALTTAB│   N  │   M  │   ,  │   .  │   /  │ Shft │ FN   │ PgUp │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │ Ctrl │ Gui  │ Alt  │ Back │ Frwd │Space │ App  │Space │ Left │  Up  │ Down │ Right│ Alt  │ Ctrl │ PgDn │
- * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
- */
-
-  [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-    QK_GESC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5  , KC_DEL , KC_6  , KC_7   , KC_8   , KC_9   , KC_0    , KC_MINUS, KC_EQUAL, KC_PSCR,
-    KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T  , KC_BSPC, KC_Y  , KC_U   , KC_I   , KC_O   , KC_P    , KC_LBRC , KC_RBRC , KC_HOME,
-    MO(_FN), KC_A   , KC_S   , KC_D   , KC_F   , KC_G  , KC_ENT , KC_H  , KC_J   , KC_K   , KC_L   , KC_SCLN , KC_QUOT , KC_NUHS , KC_END ,
-    KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B  , ALT_TAB, KC_N  , KC_M   , KC_COMM, KC_DOT , KC_SLSH , KC_RSFT , MO(_FN) , KC_PGUP,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_WBAK, KC_WFWD, KC_SPC, KC_APP , KC_SPC, KC_LEFT, KC_UP  , KC_DOWN, KC_RIGHT, KC_RALT , KC_RCTL , KC_PGDN
-  ),
-
-/* FUNCTION
- * NB :  My OS  layout (Bépo) don't have direct access to numbers, so that's why I use « LSFT » mod for the keypad.
- * You need to remove LSFT(KC) for using this layout with Qwerty. Also the use of KC_8, 7, and V are some specific Bépo
- * things.
- * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
- * │Alt F4│  F1  │  F2  │  F3  │  F4  │  F5  │BL Tog│  F6  │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │ # Lk │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │      │      │SltAll│SltRow│SltRow│ Brt+ │BL Stp│      │      │ KP 7 │ KP 8 │ KP 9 │   8  │      │      │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │      │      │ Cut  │ Copy │Paste │ Brt- │BL Brt│      │      │ KP 4 │ KP 5 │ KP 6 │   7  │      │Reset │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │      │      │ Mute │ Vol- │ Vol+ │ Play │Ld Tog│      │      │ KP 1 │ KP 2 │ KP 3 │Enter │      │      │
- * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
- * │      │      │      │      │      │      │Ld M+ │      │      │ KP 0 │KC 00 │  V   │      │      │      │
- * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
- */
-
-  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    LALT(KC_F4), KC_F1  , KC_F2       , KC_F3       , KC_F4       , KC_F5  , BL_TOGG, KC_F6  , KC_F7  , KC_F8      , KC_F9      , KC_F10    , KC_F11  , KC_F12 , KC_NUM,
-    _______    , _______, SLC_ALL     , SLC_ROW     , SLC_WRD     , KC_BRIU, BL_STEP, _______, _______, LSFT(KC_7) , LSFT(KC_8) , LSFT(KC_9), KC_8    , _______, _______,
-    _______    , _______, LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), KC_BRID, BL_BRTG, _______, _______, LSFT(KC_4) , LSFT(KC_5) , LSFT(KC_6), KC_7    , _______, QK_BOOT,
-    _______    , _______, KC_MUTE     , KC_VOLD     , KC_VOLU     , KC_MPLY, RGB_TOG, _______, _______, LSFT(KC_1) , LSFT(KC_2) , LSFT(KC_3), KC_ENT  , _______, _______,
-    _______    , _______, _______     , _______     , _______     , _______, RGB_MOD, _______, _______, LSFT(KC_0) , KC_00      , KC_V      , _______ , _______, _______
-  )
-};
-
-// Processing all the key pressed.
-// Alt+tab.
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  // Depending keycodes…
-  switch (keycode) { // This will do most of the grunt work with the keycodes.
-    case ALT_TAB:
-      if (record->event.pressed) {
-        if (!is_alt_tab_active) {
-          is_alt_tab_active = true;
-          gp100_led_on();
-          register_code(KC_LALT);
-        }
-        alt_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-    case KC_00:
-      insert_00(record);
-      break;
-    case SLC_ALL:
-      select_all(record);
-      break;
-    case SLC_ROW:
-      select_row(record);
-      break;
-    case SLC_WRD:
-      select_word(record);
-      break;
-  }
-  return true;
-}
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-  switch(combo_index) {
-    case SCR_LCK:
-      if (pressed) {
-        /*if (!is_screen_lock_triggered) {*/
-          is_screen_lock_triggered = true;
-          gp103_led_on();
-          windows_lock();
-        /*}*/
-        screen_lock_timer = timer_read();
-      }
-      break;
-  }
-}
-
-void matrix_scan_user(void) {     // The very important timer.
-  if (is_alt_tab_active) {
-    if (timer_elapsed(alt_tab_timer) > 750) {
-      unregister_code(KC_LALT);
-      gp100_led_off();
-      is_alt_tab_active = false;
-    }
-  }
-  if (is_screen_lock_triggered) {
-    if (timer_elapsed(screen_lock_timer) > 750) {
-      gp103_led_off();
-      is_screen_lock_triggered = false;
-    }
-  }
-}
-
-void led_set_user(uint8_t usb_led) {
-    if (IS_LAYER_ON(_FN)) {
-        capslock_led_on();
-    } else {
-        capslock_led_off();
-    }
-}
-
-void keyboard_post_init_user (void) {
-  setDefaultDisplay();
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _FN:
-        setFNDisplay();
-        break;
-
-    default: //  for any other layers, or the default layer
-        setDefaultDisplay();
-        break;
-    }
-  return state;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/leds.h b/keyboards/xiudi/xd75/keymaps/4sstylz/leds.h
deleted file mode 100644
index a5ad863b0aa..00000000000
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/leds.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    Version 2, December 2004
- *
- * Copyright (C) 2019 4sStylZ <4sstylz@protonmail.ch>
- *
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
- */
-#include QMK_KEYBOARD_H
-
-void setDefaultDisplay(void) {
-    _delay_ms(10);
-    rgblight_setrgb_at(180, 35, 0, 0);
-    _delay_ms(10);
-    rgblight_setrgb_at(200, 35, 0, 1);
-    _delay_ms(10);
-    rgblight_setrgb_at(220, 35, 0, 2);
-    _delay_ms(10);
-    rgblight_setrgb_at(220, 35, 0, 3);
-    _delay_ms(10);
-    rgblight_setrgb_at(200, 35, 0, 4);
-    _delay_ms(10);
-    rgblight_setrgb_at(180, 35, 0, 5);
-}
-
-void setFNDisplay(void) {
-    _delay_ms(10);
-    rgblight_setrgb_at(145, 45, 0, 0);
-    _delay_ms(10);
-    rgblight_setrgb_at(160, 45, 0, 1);
-    _delay_ms(10);
-    rgblight_setrgb_at(175, 45, 0, 2);
-    _delay_ms(10);
-    rgblight_setrgb_at(190, 45, 0, 3);
-    _delay_ms(10);
-    rgblight_setrgb_at(205, 45, 0, 4);
-    _delay_ms(10);
-    rgblight_setrgb_at(220, 45, 0, 5);
-}
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/readme.md b/keyboards/xiudi/xd75/keymaps/4sstylz/readme.md
deleted file mode 100644
index 31efa071fc8..00000000000
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Personal keymap of 4sStylZ
-
-* Similar to a Typematrix 2030 layout,
-* 3 leds on the GP001, GP003 and Capslock led
diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/rules.mk b/keyboards/xiudi/xd75/keymaps/4sstylz/rules.mk
deleted file mode 100644
index 4b2777fd21e..00000000000
--- a/keyboards/xiudi/xd75/keymaps/4sstylz/rules.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-COMBO_ENABLE     = yes # Enable combo for special function when using multiple keys at once.
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE  = yes # Enable WS2812 RGB underlight.
-
-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 # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-MIDI_ENABLE      = no  # MIDI support
-AUDIO_ENABLE     = no  # Audio output on port C6
-UNICODE_ENABLE   = no  # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
diff --git a/keyboards/xiudi/xd75/keymaps/arpinfidel/config.h b/keyboards/xiudi/xd75/keymaps/arpinfidel/config.h
deleted file mode 100644
index 24caea21527..00000000000
--- a/keyboards/xiudi/xd75/keymaps/arpinfidel/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
-#define TAPPING_TOGGLE 2
-
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_MAX_SPEED 4
-#define MOUSEKEY_TIME_TO_MAX 5
-
-#define MOUSEKEY_WHEEL_MAX_SPEED 1
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 50
diff --git a/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c b/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
deleted file mode 100644
index 0705cff9382..00000000000
--- a/keyboards/xiudi/xd75/keymaps/arpinfidel/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _QW 0
-#define _FN 1
-
-enum my_kc {
-  A_BL_TG = SAFE_RANGE
-  // , A_BL_Y
-  // , A_BL_N
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BSPC   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | [      | ]      | \      | Y      | U      | I      | O      | P      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | UP     | DEL    | DOWN   | H      | J      | K      | L      | ;      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | HOME   | PG UP  | END    | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | FN     | LGUI   | LALT   | SPACE  | SPACE  | FN     | PG DN  | FN     | BSPC   | BSPC   | RALT   | RGUI   | FN     | RCTRL  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_MINS, KC_GRV , KC_EQL , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSPC,
-  KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_LBRC, KC_RBRC, KC_BSLS, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_QUOT,
-  KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_UP  , KC_DEL , KC_DOWN, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_ENT,
-  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_HOME, KC_PGUP, KC_END , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
-  KC_LCTL, TT(_FN), KC_LGUI, KC_LALT, KC_SPC , KC_SPC , TT(_FN), KC_PGDN, TT(_FN), KC_BSPC, KC_BSPC, KC_RALT, KC_RGUI, TT(_FN), KC_RCTL
- ),
-
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F1     | F2     | F3     | F4     | F5     | F6     |        |        |        | F7     | F8     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | MS W U |        | MS 2   | MS UP  | MS 1   | MS 3   | RGB HD |        | RGB HI | [      | ]      | UP     |        | =      | \      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | MS W D |        | MS L   | MS DN  | MS R   |        | RGB SD |        | RGB SI | -      | LEFT   | DOWN   | RIGHT  |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | RGB VD | BL TG  | RGB VI |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | FN     | RGB TG |        | MS W L | MS W R |        | QK_BOOT  |        | MS 1   | MS 2   | RGB RMD| RGB MD | FN     |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   RGB_HUD, _______, RGB_HUI, KC_F7,   KC_F8,   KC_F9,   KC_F10  , KC_F11 , KC_F12,
-  KC_WH_U, _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, RGB_SAD, _______, RGB_SAI, KC_LBRC, KC_RBRC, KC_UP  , _______ , KC_EQL , KC_BSLS,
-  KC_WH_D, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, RGB_VAD, _______, RGB_VAI, KC_MINS, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______, RGB_RMOD,A_BL_TG, RGB_MOD, _______, _______, _______, _______ , _______, _______,
-  _______, TT(_FN), RGB_TOG, _______, KC_WH_L, KC_WH_R, TT(_FN), QK_BOOT, TT(_FN), KC_BTN1, KC_BTN2, _______, _______ , TT(_FN), _______
- )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case A_BL_TG:
-      if (record->event.pressed) {
-        // toggle keycaps leds (f5 pin)
-        PORTF ^= (1 << 5);
-      }
-      return false;
-
-    // case A_BL_Y:
-    //   if (record->event.pressed) {
-    //     keycaps_led_on();
-    //   }
-    //   return false;
-
-    // case A_BL_N:
-    //   if (record->event.pressed) {
-    //     keycaps_led_off();
-    //   }
-    //   return false;
-
-    default:
-      return true;
-  }
-}
-
-// Runs whenever there is a layer state change.
-layer_state_t layer_state_set_user(layer_state_t state) {
-  uint8_t layer = get_highest_layer(state);
-
-  gp100_led_off();
-  gp103_led_off();
-
-  // turns on gp100 (top left led) for odd layers
-  if (layer & (1<<0)) gp100_led_on();
-  // turns on gp103 (top mid led) for layers 2, 6, ...
-  if (layer & (1<<1)) gp103_led_on();
-
-  return state;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/arpinfidel/readme.md b/keyboards/xiudi/xd75/keymaps/arpinfidel/readme.md
deleted file mode 100644
index 033049dd911..00000000000
--- a/keyboards/xiudi/xd75/keymaps/arpinfidel/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# ArpinFidel's layout for xd75
-
-```
-QWERTY
-.--------------------------------------------------------------------------------------------------------------------------------------.
-| ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BSPC   |
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-| TAB    | Q      | W      | E      | R      | T      | [      | ]      | \      | Y      | U      | I      | O      | P      | '      |
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-| CAP LK | A      | S      | D      | F      | G      | UP     | DEL    | DOWN   | H      | J      | K      | L      | ;      | ENTER  |
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-| LSHIFT | Z      | X      | C      | V      | B      | HOME   | PG UP  | END    | N      | M      | ,      | .      | /      | RSHIFT |
-|--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-| LCTRL  | FN     | LGUI   | LALT   | SPACE  | SPACE  | FN     | PG DN  | FN     | BSPC   | BSPC   | RALT   | RGUI   | FN     | RCTRL  |
-'--------------------------------------------------------------------------------------------------------------------------------------'
-
-FUNCTION
-.--------------------------------------------------------------------------------------------------------------------------------------.
-| F1     | F2     | F3     | F4     | F5     | F6     |        |        |        | F7     | F8     | F9     | F10    | F11    | F12    |
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-| MS W U |        | MS 2   | MS UP  | MS 1   | MS 3   | RGB HD |        | RGB HI | [      | ]      | UP     |        | =      | \      |
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-| MS W D |        | MS L   | MS DN  | MS R   |        | RGB SD |        | RGB SI | -      | LEFT   | DOWN   | RIGHT  |        |        |
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-|        |        |        |        |        |        | RGB VD | BL TG  | RGB VI |        |        |        |        |        |        |
-|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-|        | FN     | RGB TG |        | MS W L | MS W R |        | RESET  |        | MS 1   | MS 2   | RGB RMD| RGB MD | FN     |        |
-'--------------------------------------------------------------------------------------------------------------------------------------'
-```
-
-special keys in the middle. hold fn for momentary switch, double tap for toggle. mouse control, arrow keys, led control, and special keys on fn layer.
-
-TODO :
-- backlight brightness
-- dynamic macros
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/arpinfidel/rules.mk b/keyboards/xiudi/xd75/keymaps/arpinfidel/rules.mk
deleted file mode 100644
index 5130423e474..00000000000
--- a/keyboards/xiudi/xd75/keymaps/arpinfidel/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
deleted file mode 100644
index 2654efdbe71..00000000000
--- a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * 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/>.
- *
- */
-
-
- // 2019/03/04 takashiski
- // NORTICE
- // This layout is for Japanese Keyboard User.
- // So there are logicalparing symbols and special keycode like a JP_BSLS, JP_HENK, JP_MHEN, JP_YEN.
- // 日本語キーボードとして認識させて使うことが前提なので、記号位置が英語キーボードとは異なります。
- // また、日本語キーボードでないと認識されない特殊なキーコードが含まれています。
-
-#include QMK_KEYBOARD_H
-
-
-// Layer shorthand
-enum LAYER{
-  _QW,
-  _EASY_QW,
-  _CURSOR,
-  _RS,
-  _LW
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- //qwerty layer(almost use default)
- [_QW] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_INT3,  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_ENT, 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_BSLS,  KC_ENT,  KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT, KC_UP,   KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, LT(_LW,KC_TAB), KC_SPC,  LT(_CURSOR,KC_ENT),  LT(_RS,KC_BSPC), KC_INT4, KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
- //4th row shifted 1u from regular ortholinear.
- [_EASY_QW] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_INT3,  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_ENT, 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_BSLS,  KC_ENT,  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_INT1, KC_UP,   KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, LT(_LW,KC_TAB), KC_SPC,  LT(_CURSOR,KC_ENT),  LT(_RS,KC_BSPC), KC_INT4, KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-//LOWER
- [_LW] = LAYOUT(
-  KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_PSCR,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, KC_INS ,
-  KC_CAPS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, _______, _______, _______,
-  KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, KC_PGUP, KC_SCRL,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
- ),
-
-//RAISE
- [_RS] = LAYOUT(
-   KC_NUM,  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_SCRL, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
-   KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______,
-   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_UP,   BL_DOWN,  _______,KC_WH_U, KC_MS_U, KC_WH_D,
-   QK_BOOT, DF(_QW), DF(_EASY_QW), _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
-	 ),
- [_CURSOR] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_INT3,  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_ENT, KC_DEL,
-  KC_CAPS,  KC_LEFT,    KC_DOWN,    KC_UP,    KC_RIGHT,    KC_G,    KC_LEFT,    KC_DOWN,    KC_UP,    KC_RIGHT,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,  KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT, KC_UP,   KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, LT(_LW,KC_TAB), KC_SPC,  KC_ENT,  LT(_RS,KC_BSPC), KC_INT4, KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-)
-
-};
diff --git a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/readme.md b/keyboards/xiudi/xd75/keymaps/atomic_style_jp/readme.md
deleted file mode 100644
index 7164f5c6b76..00000000000
--- a/keyboards/xiudi/xd75/keymaps/atomic_style_jp/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# atomic style jp
-
-This layout is based Standard Japanese Layout and atomic style layout.
-
diff --git a/keyboards/xiudi/xd75/keymaps/boy_314/config.h b/keyboards/xiudi/xd75/keymaps/boy_314/config.h
deleted file mode 100644
index 7b9637ef9c2..00000000000
--- a/keyboards/xiudi/xd75/keymaps/boy_314/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
deleted file mode 100644
index 1f3897f484e..00000000000
--- a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _DV 0
-#define _QW 1
-#define _NP 2
-#define _FN1 3
-#define _FN2 4
-
-#define RGBLIGHT_LIGHT_VAL 255
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {10, 10, 10};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* DVORAK
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | '      | .      | .      | P      | Y      | [      | UP      | ]      | F      | G      | C      | R      | L      | /      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | O      | E      | U      | I      | LEFT   | DOWN   | RIGHT  | D      | H      | T      | N      | S      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | ;      | Q      | J      | K      | X      | PG DN  | UP     | PG UP  | M      | W      | W      | V      | Z      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | DEL    | LALT   | WIN    | FN1    | SPACE  | LEFT   | DOWN   | RIGHT  | SPACE  | FN2    | LEFT   | DOWN   | UP     | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_DV] = LAYOUT_ortho_5x15( /* DVORAK */
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_LBRC, KC_UP,   KC_RBRC, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-  LCTL_T(KC_CAPS), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_LEFT, KC_DOWN, KC_RGHT, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT,
-  SC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_PGDN,  KC_UP,  KC_PGUP, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SC_RSPC,
-  KC_LCTL, KC_DEL,  KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  MO(_FN2),KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
- ),
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | HOME   | DEL    | PG UP  | H      | J      | K      | L      | ;      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | END    | UP     | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | DEL    | LALT   | WIN    | FN1    | SPACE  | LEFT   | DOWN   | RIGHT  | SPACE  | FN2    | LEFT   | DOWN   | UP     | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT,
-  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_LCTL, KC_DEL,  KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  MO(_FN2),KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
- ),
- 
-/* NUMPAD
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        | /      | *      | -      |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | 7      | 8      | 9      |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | 4      | 5      | 6      |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | 1      | 2      | 3      |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        | 0      | +      | .      |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */  
-
-  [_NP] = LAYOUT_ortho_5x15( /* NUMPAD */
-  _______, _______, _______, _______, _______, _______, KC_SLSH, KC_ASTR, KC_MINS, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,    KC_7,    KC_8,    KC_9, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,    KC_4,    KC_5,    KC_6, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,    KC_1,    KC_2,    KC_3, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,    KC_0, KC_PLUS,  KC_DOT, _______, _______, _______, _______, _______, _______
- ),
-
-/* FUNCTION1
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |   `    |   !    |   @    |   #    |   $    |   %    |        |        |        |    ^   |   &    |   *    |   (    |   )    | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   ~    |   !    |   @    |   #    |   $    |   %    | QK_BOOT  |RGB HUE-|RGB HUE+|    ^   |   &    |   *    |   (    |   )    | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | DEL    |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |RGB SAT-|RGB SAT+| DVORAK |   _    |   +    |   {    |   }    |   |    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |BRIGHT- |BRIGHT+ | QWERTY |        |        | HOME   | END    |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |RGB MODE|RGB MODE|        |        | PREV   | VOL UP |VOL DOWN| NEXT   |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_FN1] = LAYOUT_ortho_5x15( /* FUNCTION1 */
-  KC_GRV , KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,   QK_BOOT, RGB_HUD, RGB_HUI, 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, RGB_SAD, RGB_SAI, TO(_DV), KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, RGB_VAD, RGB_VAI, TO(_QW), _______, _______, KC_HOME,  KC_END, _______,
-  _______, _______, _______, _______, _______, _______, _______,RGB_RMOD, RGB_MOD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
-
-/* FUNCTION2
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |   `    | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |   `    |        |        |   UP   |        |        | QK_BOOT  |RGB HUE-|RGB HUE+| NUMPAD |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | DEL    |        |  LEFT  |  DOWN  | RIGHT  |        |        |RGB SAT-|RGB SAT+| DVORAK |   -    |   =    |   [    |   ]    |   \    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |BRIGHT- |BRIGHT+ | QWERTY |        |        | PAGE UP| PAGE DN|        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |RGB MODE|RGB MODE|        |        | PREV   | VOL UP |VOL DOWN| NEXT   |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */    
- 
- [_FN2] = LAYOUT_ortho_5x15( /* FUNCTION2 */
-  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_GRV, _______, _______,   KC_UP, _______, _______,   QK_BOOT, RGB_HUD, RGB_HUI, TG(_NP), _______, _______, _______, _______, KC_DEL,
-  KC_DEL, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_SAI, TG(_DV), KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, TG(_QW), _______, _______, KC_PGDN, KC_PGUP, _______,
-  _______, _______, _______, _______, _______, _______, _______,RGB_RMOD, RGB_MOD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- )
-};
-
-void matrix_init_user(void) {
-  if (!host_keyboard_led_state().num_lock) {
-    register_code(KC_NUM_LOCK);
-    unregister_code(KC_NUM_LOCK);
-  }
-}
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        rgblight_mode(18);
-    } else {
-        rgblight_mode(14);
-    }
-    return false;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/boy_314/readme.md b/keyboards/xiudi/xd75/keymaps/boy_314/readme.md
deleted file mode 100644
index 4008aff1c36..00000000000
--- a/keyboards/xiudi/xd75/keymaps/boy_314/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Boy_314's XD75RE Layout
-- Default is DVORAK, FN+N to switch to QWERTY, FN+H to switch to DVORAK (N and H on QWERTY layout)
-- Features many symbols and function keys in secondary layers.
-- Dedicated bracket and braces keys on bottom right 4 keys, useful for programming
-- RGB underglow changes to a fast cycle mode when CAPS LOCK is activated
-- NOTE: WORK IN PROGRESS
-# THINGS TO DO
-- add numpad toggle layer
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/config.h b/keyboards/xiudi/xd75/keymaps/bramver/config.h
deleted file mode 100644
index 2264af74c27..00000000000
--- a/keyboards/xiudi/xd75/keymaps/bramver/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2018 darm
- *
- * 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 MOUSEKEY_DELAY             0
-#define MOUSEKEY_INTERVAL          16
-#define MOUSEKEY_MAX_SPEED         7
-#define MOUSEKEY_TIME_TO_MAX       60
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-#define MOUSEKEY_WHEEL_DELAY 0
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
deleted file mode 100644
index 960ef3ff1c7..00000000000
--- a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2018 darm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _BASE     0
-#define _LOWER    1
-#define _LINVERT  2
-#define _RAISE    3
-#define _EMOJIFY  4
-
-enum emoji_map {
-  UNAM, // unamused 😒
-  HEYE, // smiling face with heart shaped eyes 😍
-  OK, // ok hand sign 👌
-  SMIR, // smirk 😏
-  PRAY, // pray 🙏
-  CELE, // celebration 🙌
-  COOL, // smile with sunglasses 😎
-  EYES, // eyes
-  THNK, // BIG THONK
-  NAIL, // Nailcare 💅
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-  [UNAM] = 0x1F612,
-  [HEYE] = 0x1f60d,
-  [OK]   = 0x1F44C,
-  [SMIR] = 0x1F60F,
-  [PRAY] = 0x1F64F,
-  [CELE] = 0x1F64C,
-  [COOL] = 0x1F60E,
-  [EYES] = 0x1F440,
-  [THNK] = 0x1F914,
-  [NAIL] = 0x1F485,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT_ortho_5x15(
-    QK_GESC , KC_1  , KC_2    , KC_3    , KC_4    , KC_5    , KC_MPRV , KC_MPLY , KC_MNXT , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_BSPC,
-    KC_TAB  , KC_Q  , KC_W    , KC_E    , KC_R    , KC_T    , KC_MINS , KC_EQL  , KC_BSLS , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_ENT ,
-    MO(3)   , KC_A  , KC_S    , KC_D    , KC_F    , KC_G    , KC_LBRC , KC_MUTE , 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_HOME , KC_SLEP , KC_END  , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT,
-    KC_LCTL , MO(4) , KC_LALT , KC_LGUI , KC_SPC  , KC_SPC  , MO(1)   , KC_DEL  , MO(2)   , KC_SPC  , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , KC_RGUI,
-  ),
-
-  [_LOWER] = LAYOUT_ortho_5x15(
-    _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DOWN , BL_UP   , _______ , _______ , _______ , _______ , _______ , _______,
-    _______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , BL_STEP , RGB_TOG , RGB_MOD , _______ , _______ , _______ , _______ , _______ , _______,
-    _______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , RGB_HUI , RGB_HUD , RGB_SAI , _______ , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , _______,
-    _______ , _______ , _______ , _______ , _______ , _______ , RGB_SAD , RGB_VAI , RGB_VAD , _______ , _______ , _______ , _______ , _______ , _______,
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
-  ),
-
-  [_LINVERT] = LAYOUT_ortho_5x15(
-    _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DOWN , BL_UP   , _______ , _______ , _______ , _______ , _______ , _______,
-    _______ , _______ , _______ , _______ , _______ , _______ , BL_STEP , RGB_TOG , RGB_MOD , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______,
-    _______ , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , _______ , RGB_SAI , RGB_HUI , RGB_HUD , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______,
-    _______ , _______ , _______ , _______ , _______ , _______ , RGB_SAD , RGB_VAI , RGB_VAD , _______ , _______ , _______ , _______ , _______ , _______,
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______
-  ),
-
-  [_RAISE] = LAYOUT_ortho_5x15(
-    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_7    , KC_8    , KC_9    , _______ , _______ , _______ , _______ , _______ , KC_MUTE , KC_VOLD , KC_VOLU , _______ , _______,
-    _______ , _______ , KC_4    , KC_5    , KC_6    , _______ , _______ , _______ , _______ , _______ , KC_MPRV , KC_MPLY , KC_MNXT , _______ , _______,
-    _______ , _______ , KC_1    , KC_2    , KC_3    , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
-    _______ , _______ , _______ , KC_0    , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______
-  ),
-
-  [_EMOJIFY] = LAYOUT_ortho_5x15(
-    TO(0)   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , QK_BOOT,
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
-    _______ , UM(CELE), UM(PRAY), UM(NAIL), UM(OK)  , UM(THNK), _______ , _______ , _______ , UM(UNAM), UM(HEYE), UM(COOL), UM(EYES), UM(SMIR), _______,
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
-    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______
-  )
-
-};
-
-void matrix_init_user(void) {
-  _delay_ms(20); // Gets rid of tick
-  set_unicode_input_mode(UNICODE_MODE_LINUX);
-}
-
-/* Template for future layers
- [_LAYER_NAME] = LAYOUT_ortho_5x15(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- )
-};
-*/
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/readme.md b/keyboards/xiudi/xd75/keymaps/bramver/readme.md
deleted file mode 100644
index cd1a78936e3..00000000000
--- a/keyboards/xiudi/xd75/keymaps/bramver/readme.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# XD75 Layout
-
-Standard qwerty layout.  
-Limited emoji support and proper mouse settings.
-
-## Keymap
-
-```
-_BASE
-  |    GESC |    1    |    2    |    3    |    4    |    5    |    MPRV |    MPLY |    MNXT |    6    |    7    |    8    |    9    |    0    |    BSPC |
-  |    TAB  |    Q    |    W    |    E    |    R    |    T    |    MINS |    EQL  |    BSLS |    Y    |    U    |    I    |    O    |    P    |    ENT  |
-  |   MO(3) |    A    |    S    |    D    |    F    |    G    |    LBRC |    MUTE |    RBRC |    H    |    J    |    K    |    L    |    SCLN |    QUOT |
-  |    LSFT |    Z    |    X    |    C    |    V    |    B    |    HOME |    SLEP |    END  |    N    |    M    |    COMM |    DOT  |    SLSH |    RSFT |
-  |    LCTL | MO(4)   |    LALT |    LGUI |    SPC  |    SPC  |   MO(1) |    DEL  |   MO(2) |   SPC   |    LEFT |    DOWN |    UP   |    RGHT |    RGUI |
-
-_LOWER
-  | _______ | _______ | _______ | _______ | _______ | _______ | BL_TOGG | BL_DOWN | BL_UP   | _______ | _______ | _______ | _______ | _______ | _______ |
-  | _______ |    WH_L |    BTN1 |    MS_U |    BTN2 |    WH_U | BL_STEP | RGB_TOG | RGB_MOD | _______ | _______ | _______ | _______ | _______ | _______ |
-  | _______ |    WH_R |    MS_L |    MS_D |    MS_R |    WH_D | RGB_HUI | RGB_HUD | RGB_SAI | _______ |    LEFT |    DOWN |    UP   |    RGHT | _______ |
-  | _______ | _______ | _______ | _______ | _______ | _______ | RGB_SAD | RGB_VAI | RGB_VAD | _______ | _______ | _______ | _______ | _______ | _______ |
-  | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ |
-
-_LINVERT
-  | _______ | _______ | _______ | _______ | _______ | _______ | BL_TOGG | BL_DOWN | BL_UP   | _______ | _______ | _______ | _______ | _______ | _______ |
-  | _______ | _______ | _______ | _______ | _______ | _______ | BL_STEP | RGB_TOG | RGB_MOD |    WH_U |    BTN1 |    MS_U |    BTN2 |    WH_L | _______ |
-  | _______ |    LEFT |    DOWN |    UP   |    RGHT | _______ | RGB_SAI | RGB_HUI | RGB_HUD |    WH_D |    MS_L |    MS_D |    MS_R |    WH_R | _______ |
-  | _______ | _______ | _______ | _______ | _______ | _______ | RGB_SAD | RGB_VAI | RGB_VAD | _______ | _______ | _______ | _______ | _______ | _______ |
-  | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ |
-
-_RAISE
-  |    F1   |    F2   |    F3   |    F4   |    F5   |    F6   | _______ | _______ | _______ |    F7   |    F8   |    F9   |    F10  |   F11   |   F12   |
-  | _______ | _______ |    7    |    8    |    9    | _______ | _______ | _______ | _______ | _______ |    MUTE |    VOLD |    VOLU | _______ | _______ |
-  | _______ | _______ |    4    |    5    |    6    | _______ | _______ | _______ | _______ | _______ |    MPRV |    MPLY |    MNXT | _______ | _______ |
-  | _______ | _______ |    1    |    2    |    3    | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ |
-  | _______ | _______ | _______ |    0    | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ |
-
-_EMOJIFY
-  | TO(0)   | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | RESET   |
-  | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ |
-  | _______ | UM(CELE) | UM(PRAY) | UM(NAIL) | UM(OK) | UM(THNK) | _______ | _______ | _______ | UM(UNAM) | UM(HEYE) | UM(COOL) | UM(EYES) | UM(SMIR) | _______ |
-  | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ |
-  | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ |
-```
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/rules.mk b/keyboards/xiudi/xd75/keymaps/bramver/rules.mk
deleted file mode 100644
index 1c3d4d8cd08..00000000000
--- a/keyboards/xiudi/xd75/keymaps/bramver/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build options
-BACKLIGHT_ENABLE = yes		# Switch LEDs
-MOUSEKEY_ENABLE = yes			# Emulates mouse key using keypresses
-RGBLIGHT_ENABLE = yes 		# LED strips
-EXTRAKEY_ENABLE = yes 		# Use system and audio control key codes
-TAP_DANCE_ENABLE = no 		# Use multi-tap features
-UNICODEMAP_ENABLE = yes  	# Emojify me pls
diff --git a/keyboards/xiudi/xd75/keymaps/bulbizarre/config.h b/keyboards/xiudi/xd75/keymaps/bulbizarre/config.h
deleted file mode 100644
index e6975da8a20..00000000000
--- a/keyboards/xiudi/xd75/keymaps/bulbizarre/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
deleted file mode 100644
index 02dbe01f171..00000000000
--- a/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-
-// Layer shorthand
-#define _QW 0
-#define _FN 1
-#define _FS 2
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    SWITCH_FN = SAFE_RANGE,
-    SWITCH_FS
-};
-
-uint16_t lt12_timer;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | ENTER  | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | H      | J      | K      | L      | :      | @      | ~      | ENTER  | HOME   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | B      | N      | M      | ,      | .      | /      | RSHIFT | UP     | END    |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | DEL    | LALT   | PSCR   | SPACE  | SPACE  | SPACE  | SPACE  | ALTGR  | FN     | FX     | RCTRL  | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-    [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-        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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,      KC_P,      KC_LBRC, KC_RBRC, KC_ENT,  KC_DEL,
-        KC_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_HOME,
-        KC_LSFT, KC_BSLS, 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_DEL,  KC_LALT, KC_PSCR, KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_ALGR, SWITCH_FN, SWITCH_FS, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | =      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | ENTER  | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | H      | J      | K      | L      | :      | @      | ~      | ENTER  | HOME   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | B      | N      | M      | ,      | .      | /      | RSHIFT | UP     | END    |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | DEL    | LALT   | PSCR   | SPACE  | SPACE  | SPACE  | SPACE  | ALTGR  | FN     | FX     | RCTRL  | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-    [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-        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_EQL,  KC_BSPC,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_QW), TO(_FS), _______, _______, _______, _______
-    ),
-
-/* FUNCTIONS
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | RGB+   | BL_BRT | F3     | F4     | F5     | F6     | F7     | F8     | F9     | /      | *      | -      | +      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | RGB_H+ | RGB-   | BL-    | E      | R      | T      | Y      | U      | I      | O      | 7      | 8      | 9      | ENTER  | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | RGB_H- | RGB_M+ | BL+    | VOL+   | F      | G      | H      | J      | K      | L      | 4      | 5      | 6      | ENTER  | QK_BOOT  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | RGB_S+ | RGB_M- | BL_S   | VOL-   | V      | B      | B      | N      | M      | ,      | 1      | 2      | 3      | UP     | END    |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | RGB_S- | RGB_T  | BL_T   | MUTE   | SPACE  | SPACE  | SPACE  | SPACE  | ALTGR  | FN     | FX     | 0      | .      | .      | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-    [_FS] = LAYOUT_ortho_5x15( /* FUNCTION */
-        _______, RGB_VAI, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
-        RGB_HUI, RGB_VAD, BL_UP,   _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
-        RGB_HUD, RGB_RMOD,BL_DOWN, KC_VOLU, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, QK_BOOT,
-        RGB_SAI, RGB_MOD, BL_STEP, KC_VOLD, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
-        RGB_SAD, RGB_TOG, BL_TOGG, KC_MUTE, _______, _______, _______, _______, _______, TO(_FN), TO(_QW), KC_P0,   KC_PDOT, KC_DOT,  _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case SWITCH_FN:
-        if (record->event.pressed) {
-            lt12_timer = timer_read();
-            layer_on(_FN);
-            gp100_led_on();
-        } else {
-            if (timer_elapsed(lt12_timer) > 200) {  
-            layer_off(_FN);
-            gp100_led_off();
-            }
-        }
-        return false;
-        break;
-        case SWITCH_FS:
-        if (record->event.pressed) {
-            lt12_timer = timer_read();
-            layer_on(_FS);
-            gp100_led_on();
-        } else {
-            if (timer_elapsed(lt12_timer) > 200) {  
-            layer_off(_FS);
-            gp100_led_off();
-            }
-        }
-        return false;
-        break;
-    }
-    return true;
-}
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        capslock_led_on();
-    } else {
-        capslock_led_off();
-    }
-    if (IS_LAYER_ON(_FN) || IS_LAYER_ON(_FS)) {
-        gp100_led_on();
-    } else {
-        gp100_led_off();
-    }
-    return false;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/bulbizarre/readme.md b/keyboards/xiudi/xd75/keymaps/bulbizarre/readme.md
deleted file mode 100644
index 87ee9d7055a..00000000000
--- a/keyboards/xiudi/xd75/keymaps/bulbizarre/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Bulbizarre keymap
-
-Modified full layout, F-key layer, numpad and function layer.
-Uses backlight, RGB underglow, and tap or hold layer switching keys.
diff --git a/keyboards/xiudi/xd75/keymaps/bulbizarre/rules.mk b/keyboards/xiudi/xd75/keymaps/bulbizarre/rules.mk
deleted file mode 100644
index e20fde4ed09..00000000000
--- a/keyboards/xiudi/xd75/keymaps/bulbizarre/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c b/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
deleted file mode 100644
index 6dcdcdef187..00000000000
--- a/keyboards/xiudi/xd75/keymaps/buzzlighter1/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include QMK_KEYBOARD_H
-#define _QW 0
-#define _FN 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | Del    | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | HOME   | CAPS   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | TT(FN) | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | \      | END    | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | Vol+   | PGUP   | UP     | PGDWN  |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | WIN    | MUTE   | LALT   |                             SPACE                            | Vol-   | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_HOME, KC_CAPS,
-    TT(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_END,  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_VOLU, KC_PGUP, KC_UP,   KC_PGDN,
-    KC_LCTL, KC_LGUI, KC_MUTE, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,  KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | GRV    | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | _______| _______|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | _______| P7     | P8     | P9     | +      | P*     | XXXXXXX| XXXXXXX| NKRON  | NKROFF | XXXXXXX| BL_DEC | BL_INC | RGB HD | RGB HI |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | _______| P4     | P5     | P6     | NumLk  | CALC   | RESET  | BOOTLDR| CLEAREE| XXXXXXX| XXXXXXX| BL_BRTG| BL_STEP| RGB SD | RGB SI |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | _______| P1     | P2     | P3     | -      | P/     | XXXXXXX| XXXXXXX|  PREV  | NXT    | PLAY   | BL_OFF | BL_ON  | RGB VD | RGB VI |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | _______| P0     | P.     | PENT   |                             SPACE                            | BL_TOGG| RGB TG | RGB RMD| RGB MD |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    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_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_PAST, XXXXXXX, XXXXXXX, NK_ON,   NK_OFF,  XXXXXXX, BL_DEC,  BL_INC,  RGB_HUD, RGB_HUI,
-    _______, KC_P4,   KC_P5,   KC_P6,   KC_LNUM, KC_CALC, QK_RBT,  QK_BOOT, EE_CLR,  XXXXXXX, XXXXXXX, BL_BRTG, BL_STEP, RGB_SAD, RGB_SAI,
-    _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, KC_PSLS, XXXXXXX, XXXXXXX, KC_MPRV, KC_MNXT, KC_MPLY, BL_OFF,  BL_ON,   RGB_VAD, RGB_VAI,
-    _______, KC_P0,   KC_PDOT, KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD
-  )
-};
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        capslock_led_on();
-    } else {
-        capslock_led_off();
-    }
-
-    if (IS_LAYER_ON(_FN)) {
-      gp100_led_on();
-    } else {
-      gp100_led_off();
-    }
-
-    return false;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md b/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
deleted file mode 100644
index 1b0ac3020a3..00000000000
--- a/keyboards/xiudi/xd75/keymaps/buzzlighter1/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# XD75 with 7U spacebar
-Two layers - qwerty and combined function + adjust. Backlight and "RGB" disabled. NKRO enabled.
diff --git a/keyboards/xiudi/xd75/keymaps/buzzlighter1/rules.mk b/keyboards/xiudi/xd75/keymaps/buzzlighter1/rules.mk
deleted file mode 100644
index 6420d6b81ca..00000000000
--- a/keyboards/xiudi/xd75/keymaps/buzzlighter1/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no
-NKRO_ENABLE = yes
diff --git a/keyboards/xiudi/xd75/keymaps/c4software_bepo/config.h b/keyboards/xiudi/xd75/keymaps/c4software_bepo/config.h
deleted file mode 100644
index 6605bbf93f7..00000000000
--- a/keyboards/xiudi/xd75/keymaps/c4software_bepo/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/c4software_bepo/keymap.c b/keyboards/xiudi/xd75/keymaps/c4software_bepo/keymap.c
deleted file mode 100644
index 991cb31b552..00000000000
--- a/keyboards/xiudi/xd75/keymaps/c4software_bepo/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2017 Valentin Brosseau
- *
- * 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_bepo.h"
-
-// Layer shorthand
-#define _BP 0
-#define _FN 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Native BepoDev for compatible computer
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | "      | <      | >      | (      | )      | %      | VOL-   | VOL+   | @      | +      | -      | /      | *      | =      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | B      | E_ACUT | P      | O      | $      | E_GRAV | DEL    | E_CIRC | V      | D      | L      | J      | Z      | C_CEDIL|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | RALT   | A      | U      | I      | E      | ,      | BACKSP | ENTER  | C      | T      | S      | R      | N      | M      | W      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | A_GRAV | Y      | X      | .      | K      | BACKSP | ENTER  | ’      | Q      | G      | H      | F      | UP     | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LALT   | LCTRL  | FN     | LGUI   | SPACE  | SPACE  | RALT   | RALT   | SPACE  | SPACE  | RGUI   | FN     | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_BP] = LAYOUT_ortho_5x15( /* BepoDev */
-  KC_ESC,  BP_DQUO,    BP_LDAQ,    BP_RDAQ, BP_LPRN, BP_RPRN,    BP_PERC,    KC_VOLD, KC_VOLU, BP_AT,   BP_PLUS, BP_MINS,  BP_SLSH,  BP_ASTR, BP_EQL,
-  KC_TAB,  BP_B,       BP_EACU,    BP_P,    BP_O,    BP_DLR,     BP_EGRV,    KC_DEL,  BP_DCIR, BP_V,    BP_D,    BP_L,     BP_J,     BP_Z,    BP_CCED,
-  KC_RALT, BP_A,       BP_U,       BP_I,    BP_E,    BP_COMM,    KC_BSPC,    KC_ENT,  BP_C,    BP_T,    BP_S,    BP_R,     BP_N,     BP_M,    BP_W,
-  KC_LSFT, BP_AGRV,    BP_Y,       BP_X,    BP_DOT,  BP_K,       KC_BSPC,    KC_ENT,  BP_QUOT, BP_Q,    BP_G,    BP_H,     BP_F,     KC_UP,   KC_RSFT,
-  KC_LALT, KC_LCTL,    MO(_FN),    KC_LGUI, KC_SPC,  KC_SPC,     KC_RALT,    KC_RALT, KC_SPC,  KC_SPC,  KC_RGUI, MO(_FN),  KC_LEFT,  KC_DOWN, KC_RGHT
- ),
-
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | P/     | P*     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        | P7     | P8     | P9     | -      | RGB_TOG| RGB_MOD| RGB_HUI|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | PREV   | PLAY   | NEXT   | STOP   |        |        |        | P4     | P5     | P6     | +      | RGB_SAI| RGB_SAD| RGB_VAI|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | VOL-   | MUTE   | VOL+   |        |        |        |        | P1     | P2     | P3     | ENT    | RGB_VAD| Home   | RGB_HUD|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | QK_BOOT  |        | FN     |        |        |        |        |        | P0     | P0     | .      | FN     |        | End    |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_SLSH, KC_ASTR, 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_P7,   KC_P8,   KC_P9,   KC_MINS, RGB_TOG, RGB_MOD, RGB_HUI,
-  KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, RGB_SAI, RGB_SAD, RGB_VAI,
-  KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_P1,   KC_P2,   KC_P3,   KC_ENT,  RGB_VAD, KC_HOME, RGB_HUD,
-  QK_BOOT, KC_TRNS, MO(_FN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_0, KC_KP_0, KC_PDOT, MO(_FN), KC_TRNS, KC_END,  KC_TRNS
- )
-};
diff --git a/keyboards/xiudi/xd75/keymaps/c4software_bepo/readme.md b/keyboards/xiudi/xd75/keymaps/c4software_bepo/readme.md
deleted file mode 100644
index b95130a31b8..00000000000
--- a/keyboards/xiudi/xd75/keymaps/c4software_bepo/readme.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# c4software Custom Keyboard
-
-Layout for Bépo Dev
-
-```
-/* Native BepoDev for compatible computer
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | "      | <      | >      | (      | )      | %      | VOL-   | VOL+   | @      | +      | -      | /      | *      | =      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | B      | E_ACUT | P      | O      | $      | E_GRAV | DEL    | E_CIRC | V      | D      | L      | J      | Z      | C_CEDIL|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | RALT   | A      | U      | I      | E      | ,      | BACKSP | ENTER  | C      | T      | S      | R      | N      | M      | W      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | A_GRAV | Y      | X      | .      | K      | BACKSP | ENTER  | ’      | Q      | G      | H      | F      | UP     | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LALT   | LCTRL  | FN     | LGUI   | SPACE  | SPACE  | RALT   | RALT   | SPACE  | SPACE  | RGUI   | FN     | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- ```
-
- The FN layer :
-
- ```
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | P/     | P*     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        | P7     | P8     | P9     | -      | RGB_TOG| RGB_MOD| RGB_HUI|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | PREV   | PLAY   | NEXT   | STOP   |        |        |        | P4     | P5     | P6     | +      | RGB_SAI| RGB_SAD| RGB_VAI|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | VOL-   | MUTE   | VOL+   |        |        |        |        | P1     | P2     | P3     | ENT    | RGB_VAD| Home   | RGB_HUD|
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RESET  |        | FN     |        |        |        |        |        | P0     | P0     | .      | FN     |        | End    |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- ```
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/c4software_bepo/rules.mk b/keyboards/xiudi/xd75/keymaps/c4software_bepo/rules.mk
deleted file mode 100644
index 7efceba50a8..00000000000
--- a/keyboards/xiudi/xd75/keymaps/c4software_bepo/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/keyboards/xiudi/xd75/keymaps/clanghans/config.h b/keyboards/xiudi/xd75/keymaps/clanghans/config.h
deleted file mode 100755
index c21c036fd6f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/clanghans/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Chris Langhans
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_SLEEP
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c b/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
deleted file mode 100755
index b4ddd80f09f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/clanghans/keymap.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2020 Chris Langhans
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _QW 0
-#define _FN 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* QWERTY
-     * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-     * │  Esc │   1  │   2  │   3  │   4  │   5  │ Bsp  │   6  │   7  │   8  │   9  │   0  │  -   │  =   │ ~    │
-     * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-     * │ Tab  │   Q  │   W  │   E  │   R  │   T  │ Del  │   Y  │   U  │   I  │   O  │   P  │  [   │  ]   │ \    │
-     * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-     * │ Ctrl │   A  │   S  │   D  │   F  │   G  │      │   H  │   J  │   K  │   L  │   ;  │   '  │ Home │ PgUp │
-     * ├──────┼──────┼──────┼──────┼──────┼──────┼Enter ┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-     * │ Shift│   Z  │   X  │   C  │   V  │   B  │      │   N  │   M  │   ,  │   .  │   /  │ Shft │ End  │ PgDn │
-     * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-     * │ Ctrl │ Gui  │ Alt  │  FN  │     Bsp     │ N/A  │    Space    │ Alt  │ Ctrl │ Left │ Down │  Up  │ Right│
-     * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
-     */
-    [_QW] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_BSPC, 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_DEL,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_ENT,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HOME, KC_PGUP,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    XXXXXXX, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_END,  KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), XXXXXXX, KC_BSPC, XXXXXXX, KC_SPC,  XXXXXXX, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-    /* FUNCTION
-     * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
-     * │Alt F4│  F1  │  F2  │  F3  │  F4  │  F5  │      │  F6  │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │ # Lk │
-     * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-     * │      │      │      │      │RGBHUI│BL_TOG│      │  7   │  8   │  9   │  /   │      │      │      │      │
-     * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-     * │      │      │      │      │RGBSAI│RGBMOD│      │  4   │  5   │  6   │  *   │      │      │      │Reset │
-     * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-     * │      │      │      │      │RGBVAI│      │      │  1   │  2   │  3   │  -   │      │      │      │      │
-     * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-     * │      │      │      │      │      │      │      │  0   │      │  ,   │  +   │      │      │      │      │
-     * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
-     */
-     [_FN] = LAYOUT(
-        LALT(KC_F4), 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_NUM,
-        _______,     _______, _______, _______, RGB_HUI, RGB_TOG, _______, KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______, _______, _______, _______,
-        _______,     _______, _______, _______, RGB_SAI, RGB_MOD, _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______, _______, _______, QK_BOOT,
-        _______,     _______, _______, _______, RGB_VAI, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______, _______, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, KC_P0,   _______, KC_PDOT, KC_PPLS, _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/xiudi/xd75/keymaps/clanghans/readme.md b/keyboards/xiudi/xd75/keymaps/clanghans/readme.md
deleted file mode 100755
index eed6369ada9..00000000000
--- a/keyboards/xiudi/xd75/keymaps/clanghans/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# xd75 from Chris Langhans
-
-- qwerty layer
-- special function layer with num pad and shortcuts 
-
-* Build/Flash
-  qmk setup
-  qmk compile -kb xiudi/xd75 -km clanghans
-  qmk flash -kb xiudi/xd75 -km clanghans
-  
-  Hit 'Raise'+'PgUp' for entering bootloader mode
diff --git a/keyboards/xiudi/xd75/keymaps/colinta/config.h b/keyboards/xiudi/xd75/keymaps/colinta/config.h
deleted file mode 100644
index 354c9c91860..00000000000
--- a/keyboards/xiudi/xd75/keymaps/colinta/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2017 Colin T.A. Gray
- *
- * 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
-
-// place overrides here
-
-// QMK customization:
-// - after 1.5s, turn off one-shot keys
-#define ONESHOT_TIMEOUT 1500
-// - TT(layer) only needs one press
-#define TAPPING_TOGGLE 1
diff --git a/keyboards/xiudi/xd75/keymaps/colinta/keymap.c b/keyboards/xiudi/xd75/keymaps/colinta/keymap.c
deleted file mode 100644
index 3cf286aeb51..00000000000
--- a/keyboards/xiudi/xd75/keymaps/colinta/keymap.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/* Copyright 2017 Colin T.A. Gray
- *
- * 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 IS_COLINTA
-#include "secrets.h"
-#else
-#define SENDSTRING_MM0 ""
-#define SENDSTRING_MM1 ""
-#define SENDSTRING_MM2 ""
-#endif
-
-// layers:
-// - colemak,
-// - record-mode (adds stop buttons)
-// - qwerty
-// - fn (recording, changing layers)
-#define LAYER_COLEMAK 0
-#define LAYER_RECORD 1
-#define LAYER_QWERTY 2
-#define LAYER_FN 3
-
-// custom keys:
-// - goto layer keys
-#define GOTO_FN TT(LAYER_FN)
-#define GOTO_CM TO(LAYER_COLEMAK)
-#define GOTO_QW TO(LAYER_QWERTY)
-// - sticky keys, aka one-shot
-#define OSCTL OSM(MOD_LCTL)
-#define OSALT OSM(MOD_LALT)
-#define OSSFT OSM(MOD_LSFT)
-#define OSGUI OSM(MOD_LGUI)
-// "MMENU" is a macro for "CMD+SPC" (aka Spotlight/Alfred)
-#define MMENU LGUI(KC_SPC)
-#define _____ KC_TRNS
-#define MM_0 DM_PLY1
-#define MM_1 DM_PLY2
-
-// tap-hold settings
-#define LONGPRESS_DELAY 250
-#define TH_EVENTS_COUNT 13
-
-enum my_keycods {
-    TH_M0 = SAFE_RANGE,
-    TH_M1,
-    TH_M2,
-    TH_F1,
-    TH_F2,
-    TH_F3,
-    TH_F4,
-    TH_F5,
-    TH_F6,
-    TH_F7,
-    TH_F8,
-    TH_F9,
-    TH_F10,
-    TH_LAST,
-    MM_2,
-    DM_CLEAR,
-    DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* COLEMAK
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | M(0)   | M(1)   | DEL    | 6      | 7      | 8      | 9      | 0      | -      |
- * |--------+-/F1----+-/F2----+-/F3----+-/F4----+-/F5----+--------+--------+--------+-/F6----+-/F7----+-/F8----+-/F9----+-/F10---+--------|
- * | TAB    | Q      | W      | F      | P      | G      | M(2)   |  (FN)  | BKSP   | J      | L      | U      | Y      | ;      | =      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | SHIFT  | A      | R      | S      | T      | D      | [      | ]      | ENTER  | H      | N      | E      | I      | O      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | CTRL   | Z      | X      | C      | V      | B      | HOME   | END    | PG UP  | K      | M      | ,      | .      | /      | \      |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | VOL-   | PLAY   | VOL+   | ALT    | GUI    |          SPACE           | PG DN  | MENU   | ESC    | LEFT   | DOWN   | UP     | RIGHT  |
- * '--/RRND----/MUTE----/FFWD-------------------------------------------------------------------------------------------------------------'
- */
-
-  [LAYER_COLEMAK] = LAYOUT(
-    KC_GRV, TH_F1, TH_F2, TH_F3, TH_F4, TH_F5,  MM_0,    MM_1,    KC_DEL,  TH_F6, TH_F7,  TH_F8,   TH_F9,   TH_F10,  KC_MINS,
-    KC_TAB, KC_Q,  KC_W,  KC_F,  KC_P,  KC_G,   MM_2,    GOTO_FN, KC_BSPC, KC_J,  KC_L,   KC_U,    KC_Y,    KC_SCLN, KC_EQL,
-    OSCTL,  KC_A,  KC_R,  KC_S,  KC_T,  KC_D,   KC_LBRC, KC_RBRC, KC_ENT,  KC_H,  KC_N,   KC_E,    KC_I,    KC_O,    KC_QUOT,
-    OSSFT,  KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,   KC_HOME, KC_END,  KC_PGUP, KC_K,  KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
-    TH_M0,  TH_M1,  TH_M2, OSALT, OSGUI, _____ , KC_SPC,  _____ ,  KC_PGDN, MMENU, KC_ESC, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-/* DYN_REC LAYER - recording tap/hold keys is possible, but they will always "tap" (macros don't record holding duration)
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |  STOP  |  STOP  |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        |        |        |        |        |        |  STOP  |  STOP  |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |                          |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [LAYER_RECORD] = LAYOUT(
-    _____, _____, _____, _____, _____, _____, DM_RSTP, DM_RSTP, _____, _____, _____, _____, _____, _____, _____,
-    _____, _____, _____, _____, _____, _____, DM_RSTP, DM_RSTP, _____, _____, _____, _____, _____, _____, _____,
-    _____, _____, _____, _____, _____, _____,    _____,        _____,     _____, _____, _____, _____, _____, _____, _____,
-    _____, _____, _____, _____, _____, _____,    _____,        _____,     _____, _____, _____, _____, _____, _____, _____,
-    _____, _____, _____, _____, _____, _____,    _____,        _____,     _____, _____, _____, _____, _____, _____, _____
-  ),
-
-/* QWERTY - doesn't support recording of macros, btw.  Falls through to colemak for most keys, but passes through the recording layer, so heads up.
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        | M(0)   | M(1)   |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | Q      | W      | E      | R      | T      | M(2)   |  (FN)  |        | Y      | U      | I      | O      | P      |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | SHIFT  | A      | S      | D      | F      | G      |        |        |        | H      | J      | K      | L      | ;      |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | CTRL   | Z      | X      | C      | V      | B      |        |        |        | N      | M      |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        | ALT    | GUI    |                          |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [LAYER_QWERTY] = LAYOUT(
-    _____,    _____, _____, _____,    _____,    _____,    MM_0,  MM_1,    _____, _____, _____, _____, _____, _____, _____,
-    _____,    KC_Q,  KC_W,  KC_E,     KC_R,     KC_T,     MM_2,  GOTO_FN, _____, KC_Y,  KC_U, KC_I,  KC_O,  KC_P,    _____,
-    MOD_LSFT, KC_A,  KC_S,  KC_D,     KC_F,     KC_G,     _____,  _____,  _____, KC_H,  KC_J, KC_K,  KC_L,  KC_SCLN, _____,
-    MOD_LCTL, KC_Z,  KC_X,  KC_C,     KC_V,     KC_B,     _____,  _____,  _____, KC_N,  KC_M, _____, _____, _____,   _____,
-    _____,    _____, _____, MOD_LALT, MOD_LGUI, _____, _____,  _____,  _____, _____, _____, _____, _____, _____, _____
-  ),
-
-/* FN LAYER - change layouts and start recording a macro
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | COLEMAK| QWERTY |        |        |        |        | REC 1  | REC 2  |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        |        |        |        |        |        |        | ------ |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        | QK_BOOT  |         DM_CLEAR         |        |        | QK_BOOT  |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [LAYER_FN] = LAYOUT(
-    GOTO_CM, GOTO_QW, KC_NO, KC_NO, KC_NO, KC_NO, DM_REC1, DM_REC2, 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, 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,   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, QK_BOOT,  KC_NO, DM_CLEAR, KC_NO,             KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO
-  )
-};
-
-typedef struct {
-    bool is_pressed;
-    uint16_t timer;
-    uint16_t kc_tap;
-    uint16_t kc_hold;
-} tap_hold_t;
-
-static tap_hold_t th_events[] = {
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_VOLD, .kc_hold = KC_MRWD }, // TH_M0
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_MPLY, .kc_hold = KC_MUTE }, // TH_M1
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_VOLU, .kc_hold = KC_MFFD }, // TH_M2
-
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_1, .kc_hold = KC_F1 }, // TH_F1
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_2, .kc_hold = KC_F2 }, // TH_F2
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_3, .kc_hold = KC_F3 }, // TH_F3
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_4, .kc_hold = KC_F4 }, // TH_F4
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_5, .kc_hold = KC_F5 }, // TH_F5
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_6, .kc_hold = KC_F6 }, // TH_F6
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_7, .kc_hold = KC_F7 }, // TH_F7
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_8, .kc_hold = KC_F8 }, // TH_F8
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_9, .kc_hold = KC_F9 }, // TH_F9
-    { .is_pressed = false, .timer = 0, .kc_tap = KC_0, .kc_hold = KC_F10 } // TH_F10
-};
-
-void taphold_tapped(uint8_t index, bool pressed) {
-    if (index >= TH_EVENTS_COUNT) { return; }
-
-    tap_hold_t *th_event = &th_events[index];
-
-    if (pressed) {
-        th_event->timer = timer_read();
-        th_event->is_pressed = true;
-    } else if (th_event->is_pressed) {
-        register_code(th_event->kc_tap);
-        unregister_code(th_event->kc_tap);
-        th_event->is_pressed = false;
-    }
-}
-
-void matrix_scan_user(void) {
-    for (uint8_t index = 0 ; index < TH_EVENTS_COUNT ; ++index ) {
-        tap_hold_t *th_event = &th_events[index];
-        if ( th_event->is_pressed && timer_elapsed(th_event->timer) > LONGPRESS_DELAY) {
-            register_code(th_event->kc_hold);
-            unregister_code(th_event->kc_hold);
-            th_event->is_pressed = false;
-        }
-    }
-}
-
-// if the dynamic macros haven't been recorded, we send the default macro strings.
-bool did_record_m1 = false;
-bool did_record_m2 = false;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    bool try_dynamic_macro = true;
-    if ((keycode == QK_DYNAMIC_MACRO_PLAY_1 && !did_record_m1) || (keycode == QK_DYNAMIC_MACRO_PLAY_2 && !did_record_m2)) {
-        try_dynamic_macro = false;
-    }
-    else if (keycode == DM_CLEAR) {
-        try_dynamic_macro = false;
-        did_record_m1 = false;
-        did_record_m2 = false;
-    }
-
-    if (try_dynamic_macro && !process_record_dynamic_macro(keycode, record)) {
-        if (keycode == QK_DYNAMIC_MACRO_PLAY_1) {
-                did_record_m1 = true;
-        }
-
-        if (keycode == QK_DYNAMIC_MACRO_PLAY_2) {
-                did_record_m2 = true;
-        }
-
-        if (keycode == QK_DYNAMIC_MACRO_RECORD_START_1 || keycode == QK_DYNAMIC_MACRO_RECORD_START_2) {
-                layer_move(LAYER_RECORD);
-        }
-        else if (keycode == QK_DYNAMIC_MACRO_RECORD_STOP) {
-                layer_move(LAYER_COLEMAK);
-        }
-
-        return false;
-    }
-
-    switch (keycode) {
-    case QK_DYNAMIC_MACRO_PLAY_1:
-        SEND_STRING(SENDSTRING_MM0);
-        return false;
-    case QK_DYNAMIC_MACRO_PLAY_2:
-        SEND_STRING(SENDSTRING_MM1);
-        return false;
-    case MM_2:
-        SEND_STRING(SENDSTRING_MM2);
-        return false;
-    case TH_M0 ... TH_LAST:
-        taphold_tapped(keycode - TH_M0, record->event.pressed);
-        return false;
-    }
-
-    return true;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/colinta/readme.md b/keyboards/xiudi/xd75/keymaps/colinta/readme.md
deleted file mode 100644
index 92c76e13150..00000000000
--- a/keyboards/xiudi/xd75/keymaps/colinta/readme.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# colinta's keymap for XD75
-
-```
-make xiudi/xd75:colinta:dfu
-```
-
-The default layout is a Colemak keyboard with "one-shot" keys assigned to the modifier keys.
-
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    | ESC    | 1      | 2      | 3      | 4      | 5      | DYN_M1 | DYN_M2 | DEL    | 6      | 7      | 8      | 9      | 0      | -      |
-    |--------+-/F1----+-/F2----+-/F3----+-/F4----+-/F5----+--------+--------+--------+-/F6----+-/F7----+-/F8----+-/F9----+-/F10---+--------|
-    | TAB    | Q      | W      | F      | P      | G      | MACRO  |  (FN)  | BKSP   | J      | L      | U      | Y      | ;      | =      |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-    | SHIFT  | A      | R      | S      | T      | D      | [      | ]      | ENTER  | H      | N      | E      | I      | O      | '      |
-    |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-    | CTRL   | Z      | X      | C      | V      | B      | HOME   | END    | PG UP  | K      | M      | ,      | .      | /      | \      |
-    |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-    | VOL-   | PLAY   | VOL+   | ALT    | GUI    |          SPACE           | PG DN  | MENU   | ESC    | LEFT   | DOWN   | UP     | RIGHT  |
-    '--/RRND----/MUTE----/FFWD-------------------------------------------------------------------------------------------------------------'
-
-
-I've implemented my own "tap/hold" feature, identical in spirit to "Space Cadet", but generic.  Tapping "1" sends a 1, but press and hold to send "F1".  Or, tap "VOL-" to turn the volume down, but press and hold to rewind.
-
-The function layer is only to switch to Qwerty (so other people can use this keyboard - also turns off sticky keys) and to start recording keypresses.
-
-I implemented "stop recording" in a unique way; starting a macro recording sends the keyboard layer to one that has all the macro keys assigned to `DM_RSTP`, and restores the layer to the default when recording is stopped.
-
-I wish Dynamic Macros supported more, because I'd like to record a third macro in the MACRO slot instead of hardcoding it.  I'm using these to store some passwords.
-
-## Regarding "secrets.h"
-
-The macros I'm using are sensitive, I'm comfortable having them hardcoded onto my keyboard (no SSN or private GPG keys), but not suitable for public viewing.  So I've put them in a header file that is excluded from the project, and I can include this file using a compiler flag.
-
-If you would *also* like to take advantage of this feature, you'll first want to make sure your "secrets" file isn't included in the repo.  Open `.git/info/exclude` and add `secrets.h` to that file, below the comments.
-
-###### .git/info/exclude
-```
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-/keyboards/xiudi/xd75/keymaps/colinta/secrets.h
-```
-
-Then you can create this file and add your macro strings to it:
-
-```
-$EDITOR keyboards/xiudi/xd75/keymaps/colinta/secrets.h
-```
-
-###### secrets.h
-```
-#define SENDSTRING_MM0 "abcd1234"
-#define SENDSTRING_MM1 "shhhhh secret"
-#define SENDSTRING_MM2 "stop saying pickle rick"
-```
-
-To include the feature at compile time, include the flag `IS_COLINTA` like so:
-
-```
-make xiudi/xd75:colinta:dfu EXTRAFLAGS=-DIS_COLINTA
-```
diff --git a/keyboards/xiudi/xd75/keymaps/daniel/keymap.c b/keyboards/xiudi/xd75/keymaps/daniel/keymap.c
deleted file mode 100644
index c2e49d87e5d..00000000000
--- a/keyboards/xiudi/xd75/keymaps/daniel/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QW 0
-#define _NV 1
-#define _NM 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QW] = LAYOUT_ortho_5x15(
-  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_DEL,
-  MO(_NV), 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(_NM), 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_SPC , KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT
- ),
- [_NV] = LAYOUT_ortho_5x15(
-  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_BSPC, _______, KC_HOME, KC_UP  , KC_END , KC_INS , _______, _______, _______, _______,
-  _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [_NM] = LAYOUT_ortho_5x15(
-  _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- )
-};
diff --git a/keyboards/xiudi/xd75/keymaps/daniel/readme.md b/keyboards/xiudi/xd75/keymaps/daniel/readme.md
deleted file mode 100644
index 3305d0f30bd..00000000000
--- a/keyboards/xiudi/xd75/keymaps/daniel/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Daniels xd75 keymap
diff --git a/keyboards/xiudi/xd75/keymaps/davidrambo/config.h b/keyboards/xiudi/xd75/keymaps/davidrambo/config.h
deleted file mode 100644
index 6e6349c7cf6..00000000000
--- a/keyboards/xiudi/xd75/keymaps/davidrambo/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
-
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
diff --git a/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c b/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
deleted file mode 100644
index 7787a59ff81..00000000000
--- a/keyboards/xiudi/xd75/keymaps/davidrambo/keymap.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Copyright 2021 David Rambo
- *
- * 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
-
-//aliases for clarity in layering
-#define ABSPC  LALT(KC_BSPC) // delete whole word in Mac
-#define CBSPC  LCTL(KC_BSPC) // delete whole word in PC
-#define ALEFT  LALT(KC_LEFT)
-#define ARGHT  LALT(KC_RGHT)
-#define CRGHT  LCTL(KC_RGHT)
-#define CLEFT  LCTL(KC_LEFT)
-#define SftEnt SFT_T(KC_ENT)
-#define BSGUI  LGUI_T(KC_BSPC)
-#define BSCTL  LCTL_T(KC_BSPC)
-
-// internet browser tab shortcuts and window/application swapping for Mac and Win
-#define GSL     LGUI(S(KC_LEFT)) // back one tab in Safari
-#define GSR     LGUI(S(KC_RGHT)) // forward one tab in Safari
-#define CTLPGDN LCTL(KC_PGDN)   // back one tab on PC
-#define CTLPGUP LCTL(KC_PGUP)   // forward one tab on PC
-#define GTAB    LGUI(KC_TAB)    // Mac: switch applications
-#define GGRV    LGUI(KC_GRV)    // Mac: switch between windows within an application
-#define ATAB    LALT(KC_TAB)
-#define CTAB    LCTL(KC_TAB)
-
-// toggles for navigation layers for Mac, PC, and Roguelike Numpad
-#define NAV     LT(5, KC_ESC)
-#define NAVPC   LT(6, KC_ESC)
-#define NAVQUD  MO(7)
-
-enum custom_layer {
-    _COLEMAK,
-    _PC,
-    _GAME,     // Gaming layer
-    _QUD,3     // Roguelike layer
-    _SYMBOL,   // Function keys, numbers, symbols, Backlighting
-    _NAV,      // Navigation Layer on Mac
-    _NAVPC,    // Navigation Layer on Win
-    _NAVQUD,   // Numpad for Roguelike 8-directional movement
-}
-
-// tapdance declarations
-enum {
-  SFT_LCK
-};
-
-// alias for tapdance
-#define SftLck TD(SFT_LCK)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* COLEMAK
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | `~     | 1      | 2      | 3      | 4      | 5      | -_     |   PC   | =+     | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | ESC/`~ | Q      | W      | F      | P      | G      | [      |   \|   | ]      | J      | L      | U      | Y      | ;      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | NAVTAB | A      | S      | D      | F      | G      | PgUp   |PlayPaus| ENTER  | H      | N      | E      | I      | O      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |SFT/CAPS| Z      | X      | C      | V      | B      | PgDn   |  UP    | ENTER  | K      | M      | ,      | .      | /      | SftEnt |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | DEL    | LGUI   | LCTRL  | LALT   | LGUI   | BKSPC  | LEFT   | DOWN   | RIGHT  | SPACE  | SYMBOL | RGUI   | RALT   | RCTRL  | BL     |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_COLEMAK] = LAYOUT_ortho_5x15( /* COLEMAK */
-   KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_MINS, TO(1)  , KC_EQL,  KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_BSPC,
-   KC_TAB , KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,   KC_LBRC, KC_BSLS, KC_RBRC, KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-   NAV    , KC_A,    KC_R,    KC_S,    KC_T,    KC_D,   KC_PGUP, KC_MPLY, GGRV   , KC_H,   KC_N,   KC_E,    KC_I,    KC_O,    KC_QUOT,
-   SftLck , KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_PGDN, KC_UP  , GTAB   , KC_K,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, SftEnt,
-   KC_DEL , KC_LGUI, KC_LCTL, KC_LALT, KC_LCTL, BSGUI,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC, MO(4) , KC_RGUI, KC_RALT, KC_RCTL, BL_STEP
- ),
-    
-// Linux/Windows Layer: essentially swaps Control and GUI
-
- [_PC] = LAYOUT_ortho_5x15( /* WINDOWS */
-   _______, _______, _______, _______, _______, _______, _______, TO(2)  , _______, _______, _______, _______, _______, _______, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-   NAVPC  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, ATAB   , _______, _______, _______, _______, _______, _______,
-   _______, KC_PSCR, KC_LGUI, _______, KC_LGUI, BSCTL  , _______, _______, _______, _______, _______, KC_RCTL, _______, KC_RGUI, _______
- ),
-
- [_GAME] = LAYOUT_ortho_5x15( /* Gaming Layer */
-   _______, _______, _______, _______, _______, _______, _______, TO(0)  , _______, _______, _______, _______, _______, _______, TO(3)  ,
-   KC_ESC , KC_T   , KC_Q   , KC_W   , KC_E   , KC_R   , KC_F7  , KC_F8  , KC_F9  , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , _______,
-   KC_TAB , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   , KC_F4  , KC_F5  , KC_F6  , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, _______,
-   KC_LALT, KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_F1  , KC_F2  , KC_F3  , KC_N   , KC_M   , _______, _______, _______, KC_ENT ,
-   _______, _______, _______, KC_G   , KC_B   , KC_SPC , KC_I   , KC_M   , ATAB   , _______, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______
- ),
-  
-   [_QUD] = LAYOUT_ortho_5x15( /* Roguelike Layer */
-   _______, _______, _______, _______, _______, _______, _______,KC_PSLS, KC_PAST, _______, _______, _______, _______, _______, TO(0),
-   QK_GESC, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,   KC_LBRC, KC_BSLS, KC_RBRC, KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-   NAV    , KC_A,    KC_R,    KC_S,    KC_T,    KC_D,   KC_PGUP, KC_MPLY, GGRV   , KC_H,   KC_N,   KC_E,    KC_I,    KC_O,    KC_QUOT,
-   SftLck , KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_PGDN, KC_UP  , ATAB   , KC_K,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, SftEnt ,
-   KC_DEL , KC_LGUI, KC_LGUI, KC_LALT, KC_LCTL, TO(7),  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC, MO(4) , KC_RGUI, KC_RALT, KC_RCTL, _______
- ),
-    
-/* SYMBOL
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F12    | F1     | F2     | F3     | F4     | F5     |        |        |        | F6     | F7     | F8     | F9     | F10    | F11    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | [{     | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      | 0      | }]     |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | !      | @      | #      | $      | %      |        |        |        | ^      | &      | *      | (      | )      | =      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | HOME   | END    | BL_OFF | BL_ON  |        |        |        |        |        | -_     |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_SYMBOL] = LAYOUT_ortho_5x15( /* SYMBOL */
-   KC_F12 , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , _______, _______, _______, KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-   KC_LBRC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______, _______, _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_RBRC,
-   _______, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL ,
-   _______, KC_HOME, KC_END , BL_OFF , BL_ON  , KC_VOLD, _______, _______, _______, KC_VOLU, KC_MINS, _______, _______, _______, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
- 
- [_NAV] = LAYOUT_ortho_5x15( /* NAVIGATION for Mac */
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, CTAB   , ALEFT  , KC_UP  , ARGHT  , KC_DEL , _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, GTAB   , ABSPC  , KC_HOME, KC_END , GGRV   , _______,
-   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
- [_NAVPC] = LAYOUT_ortho_5x15( /* NAVIGATION FOR PC: replaces Alt with Control, GUI with Alt, and browser tab shortcuts*/
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, CTAB   , CLEFT  , KC_UP  , CRGHT  , KC_DEL , _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, ATAB   , CBSPC  , KC_HOME, KC_END , _______, _______,
-   QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-    
- [_NAVQUD] = LAYOUT_ortho_5x15( /* NAVIGATION for Mac */
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSLS, KC_PAST, _______, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_2, KC_KP_6, KC_PPLS, _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_5, KC_KP_3, _______, _______,
-   _______, _______, _______, _______, _______,   TO(3), _______, _______, _______, _______, KC_KP_0, KC_PDOT, _______, _______, _______
- )
-};
-
-// Shift vs capslock function. From bbaserdem's Planck keymap.
-void caps_tap (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_code (KC_LSFT);
-    } else if (state->count == 2) {
-        unregister_code (KC_LSFT);
-        register_code (KC_CAPS);
-    }
-}
-void caps_tap_end (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code (KC_LSFT);
-    } else {
-        unregister_code (KC_CAPS);
-    }
-}
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Shift, twice for Caps Lock
-  [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end )
-};
-
-/* Template for future layers
- [_LAYER_NAME] = { 
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- }
-};
-*/
diff --git a/keyboards/xiudi/xd75/keymaps/davidrambo/readme.md b/keyboards/xiudi/xd75/keymaps/davidrambo/readme.md
deleted file mode 100644
index 4199a5d807d..00000000000
--- a/keyboards/xiudi/xd75/keymaps/davidrambo/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# XD75
-
-This is a Colemak layout for XD75 with both Mac and Linux/Windows layers.
-These two layers share momentary toggle access to a "Symbol" layer, which is modeled after my Planck layout (see planck/keymaps/davidrambo).
-Each of the base Colemak layers have their own Navigation layers for the right hand to use arrows and shortcuts for both text editing and web browsing.
-It also has two layers used for games: one with a typical WASD orientation, another for playing Roguelikes that need a numpad.
-
-The rules.mk file overrides the XD75's "BACKLIGHT_ENABLE" with YES and also adds tap dance functionality.
diff --git a/keyboards/xiudi/xd75/keymaps/davidrambo/rules.mk b/keyboards/xiudi/xd75/keymaps/davidrambo/rules.mk
deleted file mode 100644
index edc9cc6bc1f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/davidrambo/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-TAP_DANCE_ENABLE = yes      # Enable tap dance functionality
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/developper_bepo/config.h b/keyboards/xiudi/xd75/keymaps/developper_bepo/config.h
deleted file mode 100644
index 0183e024271..00000000000
--- a/keyboards/xiudi/xd75/keymaps/developper_bepo/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Quentin Lebastard
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c b/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
deleted file mode 100644
index da24da9a34f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/developper_bepo/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2017 Quentin Lebastard
- *
- * 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_bepo.h"
-
-// Layer shorthand
-#define _BP 0
-#define _FN 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | $      | "      | {      | }      | (      | )      | VOL-   | MUTE   | VOL+   | +      | -      | /      | *      | =      | %      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | B      | E_ACUT | P      | O      | E_GRAV |        |        |        | ^      | V      | D      | L      | J      | Z      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | ESC    | A      | U      | I      | E      | ,      | HOME   |        | END    | C      | T      | S      | R      | N      | M      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | W      | Y      | X      | .      | K      | PAGE UP|        | PAGE D | ?      | Q      | G      | H      | F      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | LGUI   | ALT    |        | _      |ENTER/FN| DEL    |        | BACKSP |SPACE/FN| _      | ALT    | ALT    | RGUI   | LCTRL  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_BP] = LAYOUT_ortho_5x15( /* BepoDev */
-  BP_DLR,    BP_DQUO,  BP_LCBR,    BP_RCBR, BP_LPRN, BP_RPRN,        KC_VOLD, KC_MUTE, KC_VOLU,   BP_PLUS,         BP_MINS, BP_SLSH, BP_ASTR,  BP_EQL,  BP_PERC,
-  KC_TAB,    BP_B,     BP_EACU,    BP_P,    BP_O,    BP_EGRV,        KC_KP_7, KC_KP_8, KC_KP_9,   BP_DCIR,         BP_V,    BP_D,    BP_L,     BP_J,    BP_Z,
-  KC_ESC,    BP_A,     BP_U,       BP_I,    BP_E,    BP_COMM,        KC_HOME, KC_KP_5, KC_END,    BP_C,            BP_T,    BP_S,    BP_R,     BP_N,    BP_M,
-  KC_LSFT,   BP_W,     BP_Y,       BP_X,    BP_DOT,  BP_K,           KC_PGUP, KC_END,  KC_PGDN,   BP_QUOT,         BP_Q,    BP_G,    BP_H,     BP_F,    KC_RSFT,
-  KC_LCTL,   KC_LGUI, KC_RALT,     KC_LGUI, BP_UNDS, LT(_FN,KC_ENT), KC_DEL,  KC_KP_0, KC_BSPC,   LT(_FN,KC_SPC),  BP_UNDS, KC_RALT, KC_RALT,  KC_RGUI, KC_LCTL
- ),
-
-
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F1     | F2     | F3     | F4     | F5     | F6     | PREV   | PAUSE  | NEXT   | F7     | F8     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      | 0      |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | |      | \      | [      | ]      | &      |        |        |        |        | LEFT   | DOWN   | UP     | RIGHT  |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        | <      | >      | @      |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        | _      | MO(_FN)|        |        |        |        | MO(_FN)| _      |        |        |        | QK_BOOT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  KC_F1,   KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,          KC_MPRV, KC_MPLY, KC_MNXT, KC_F7,          KC_F8,      KC_F9,       KC_F10,      KC_F11,     KC_F12,
-  _______, S(BP_DQUO), S(BP_LDAQ), S(BP_RDAQ), S(BP_LPRN), S(BP_RPRN),     _______, _______, _______, S(BP_AT),       S(BP_PLUS), S(BP_MINS), S(BP_SLSH), S(BP_ASTR), S(BP_EQL),
-  _______, RALT(BP_B), BP_BSLS,    BP_LBRC,    BP_RBRC,    RALT(BP_P),     _______, _______, _______, _______,        KC_LEFT,    KC_DOWN,     KC_UP  ,     KC_RGHT,    _______,
-  _______, BP_BSLS,    _______,    _______,    _______,    _______,        _______, _______, _______, _______,        BP_LABK,    BP_RABK,     BP_AT  ,     _______,    _______,
-  _______, _______,    _______,    _______,    _______,    LT(_FN,KC_ENT), _______, _______, _______, LT(_FN,KC_SPC), _______,    _______,     _______,     _______,    QK_BOOT
- )
-
-};
diff --git a/keyboards/xiudi/xd75/keymaps/developper_bepo/readme.md b/keyboards/xiudi/xd75/keymaps/developper_bepo/readme.md
deleted file mode 100644
index 82172ff9816..00000000000
--- a/keyboards/xiudi/xd75/keymaps/developper_bepo/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# developper_bepo Custom Keyboard
-
-Layout for Bépo Software development
-
-* Improved access to frequently used keys in software development
-* Modified layout for english input
-* Easy access to layers with space and enter key
-
-Keyboard maintainer: [Quentin Lebastard](https://github.com/lebastaq)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make xiudi/xd75:developper_bepo
diff --git a/keyboards/xiudi/xd75/keymaps/developper_bepo/rules.mk b/keyboards/xiudi/xd75/keymaps/developper_bepo/rules.mk
deleted file mode 100644
index 7efceba50a8..00000000000
--- a/keyboards/xiudi/xd75/keymaps/developper_bepo/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/keyboards/xiudi/xd75/keymaps/dothtm75/config.h b/keyboards/xiudi/xd75/keymaps/dothtm75/config.h
deleted file mode 100644
index 155d4562d53..00000000000
--- a/keyboards/xiudi/xd75/keymaps/dothtm75/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2017 Mike Cramer
- *
- * 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 HOLD_ON_OTHER_KEY_PRESS
-
-#define MIDI_ADVANCED
diff --git a/keyboards/xiudi/xd75/keymaps/dothtm75/keymap.c b/keyboards/xiudi/xd75/keymaps/dothtm75/keymap.c
deleted file mode 100644
index 1767915dace..00000000000
--- a/keyboards/xiudi/xd75/keymaps/dothtm75/keymap.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * 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_5x15(
-        KC_GRV,        KC_1,          KC_2,          KC_3,          KC_4,          KC_5,          LGUI(KC_MINS), LGUI(KC_EQL),  KC_6,          KC_7,          KC_8,          KC_9,          KC_0,          LGUI(KC_0),    KC_BSPC,
-        KC_TAB,        KC_Q,          KC_W,          KC_E,          KC_R,          KC_T,          LGUI(KC_LCBR), LGUI(KC_RCBR), KC_Y,          KC_U,          KC_I,          KC_O,          KC_P,          KC_LBRC,       KC_BSLS,
-        KC_ESC,        KC_A,          KC_S,          KC_D,          KC_F,          KC_G,          LGUI(KC_LBRC), LGUI(KC_RBRC), 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,          LGUI(KC_QUES), LGUI(KC_SLSH), KC_N,          KC_M,          KC_COMM,       KC_DOT,        KC_SLSH,       KC_UP,         KC_RSFT,
-        MO(2),         KC_LCTL,       KC_LALT,       KC_LGUI,       LT(1,KC_SPC),  KC_SPC,        LGUI(KC_SPC),  KC_NO,         KC_SPC,        LT(1,KC_SPC),  KC_RGUI,       KC_RALT,       KC_LEFT,       KC_DOWN,       KC_RGHT
-    ),
-
-    [1] = LAYOUT_ortho_5x15(
-        KC_TILD,       KC_F1,         KC_F2,         KC_F3,         KC_F4,         KC_NO,         KC_MINS,       KC_EQL,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         LGUI(KC_1),    KC_DEL,
-        KC_NO,         KC_F5,         KC_F6,         KC_F7,         KC_F8,         KC_NO,         KC_LCBR,       KC_RCBR,       KC_NO,         KC_LCBR,       KC_RCBR,       KC_DQUO,       KC_QUOT,       KC_NO,         KC_SLSH,
-        KC_NO,         KC_F9,         KC_F10,        KC_F11,        KC_F12,        KC_NO,         KC_LBRC,       KC_RBRC,       KC_NO,         KC_LBRC,       KC_RBRC,       KC_LT,         KC_GT,         KC_NO,         KC_PENT,
-        KC_TRNS,       KC_UNDS,       KC_PLUS,       KC_MINS,       KC_EQL,        KC_NO,         KC_QUES,       KC_SLSH,       KC_NO,         KC_QUES,       KC_SLSH,       KC_QUES,       KC_SLSH,       LCAG(KC_UP),   KC_TRNS,
-        MO(15),        KC_TRNS,       KC_TRNS,       KC_TRNS,       KC_TRNS,       LGUI(KC_SPC),  HYPR(KC_J),    KC_TRNS,       LGUI(KC_SPC),  KC_TRNS,       KC_TRNS,       KC_TRNS,       LGUI(KC_LBRC), LCAG(KC_DOWN), LGUI(KC_RBRC)
-    ),
-
-    [2] = LAYOUT_ortho_5x15(
-        DB_TOGG,       KC_F1,         KC_F2,         KC_F3,         KC_F4,         KC_F5,         KC_NO,         KC_NO,         KC_F6,         KC_F7,         KC_F8,         KC_F9,         KC_F10,        KC_NO,         KC_DEL,
-        RGB_TOG,       KC_F11,        KC_F12,        KC_F13,        KC_F14,        KC_F15,        KC_NO,         KC_NO,         KC_F16,        KC_F17,        KC_F18,        KC_F19,        KC_F20,        KC_NO,         KC_NO,
-        HYPR(KC_H),    KC_MUTE,       KC_VOLD,       KC_VOLU,       KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_F21,        KC_F22,        KC_F23,        KC_F24,        KC_NO,         KC_NO,         KC_NO,
-        KC_TRNS,       KC_MPRV,       KC_MPLY,       KC_MNXT,       KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_PGUP,       KC_TRNS,
-        KC_TRNS,       KC_TRNS,       KC_TRNS,       KC_TRNS,       MO(15),        HYPR(KC_K),    KC_NO,         KC_NO,         KC_TRNS,       MO(15),        KC_TRNS,       KC_TRNS,       KC_HOME,       KC_PGDN,       KC_END
-
-    ),
-
-    // Musical keys
-
-    [3] = LAYOUT_ortho_5x15(
-        // Chromatic Scale       Vertical  Typing 60
-        KC_ESC,        MI_C,          MI_E,          MI_Gs,          MI_C1,         MI_E1,        KC_NO,         KC_NO,          MI_Gs1,        MI_C2,         MI_E2,         MI_Gs2,        MI_C3,         MI_E3,        MI_TR0,
-        KC_TAB,        MI_Cs,         MI_F,          MI_A,           MI_Cs1,        MI_F1,        KC_NO,         KC_NO,          MI_A1,         MI_Cs2,        MI_F2,         MI_A2,         MI_Cs3,        MI_F3,        MI_TRSU,
-        KC_SPC,        MI_D,          MI_Fs,         MI_As,          MI_D1,         MI_Fs1,       KC_NO,         KC_NO,          MI_As1,        MI_D2,         MI_Fs2,        MI_As2,        MI_D3,         MI_Fs3,       MI_TRSD,
-        MI_SUST,        MI_Ds,         MI_G,          MI_B,           MI_Ds1,        MI_G1,        KC_NO,         KC_NO,          MI_B1,         MI_Ds2,        MI_G2,         MI_B2,         MI_Ds3,        MI_G3,        MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [4] = LAYOUT_ortho_5x15(
-        // Pocket Operator Scale Vertical  Typing 60
-        KC_ESC,        MI_C,          MI_G,           MI_C1,         MI_G1,         MI_C2,        KC_NO,         KC_NO,          MI_G2,         MI_C3,         MI_G3,         MI_C4,         MI_G4,         MI_C5,        MI_TR0,
-        KC_TAB,        MI_D,          MI_Gs,          MI_D1,         MI_Gs1,        MI_D2,        KC_NO,         KC_NO,          MI_Gs2,        MI_D3,         MI_Gs3,        MI_D4,         MI_Gs4,        MI_D5,        MI_TRSU,
-        KC_SPC,        MI_Ds,         MI_As,          MI_Ds1,        MI_As1,        MI_Ds2,       KC_NO,         KC_NO,          MI_As2,        MI_Ds3,        MI_As3,        MI_Ds4,        MI_As4,        MI_Ds5,       MI_TRSD,
-        MI_SUST,        MI_F,          MI_B,           MI_F1,         MI_B1,         MI_F2,        KC_NO,         KC_NO,          MI_B2,         MI_F3,         MI_B3,         MI_F4,         MI_B4,         MI_F5,        MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [5] = LAYOUT_ortho_5x15(
-        // Major scale           Vertical  Typing 60
-        KC_ESC,        MI_C,          MI_G,           MI_D1,         MI_A1,         MI_E2,        KC_NO,         KC_NO,          MI_B2,         MI_F3,         MI_C4,         MI_G4,         MI_D5,         MI_A5,        MI_TR0,
-        KC_TAB,        MI_D,          MI_A,           MI_E1,         MI_B1,         MI_F2,        KC_NO,         KC_NO,          MI_C3,         MI_G3,         MI_D4,         MI_A4,         MI_E5,         MI_B5,        MI_TRSU,
-        KC_SPC,        MI_E,          MI_B,           MI_F1,         MI_C2,         MI_G2,        KC_NO,         KC_NO,          MI_D3,         MI_A3,         MI_E4,         MI_B4,         MI_F5,        KC_NO,         MI_TRSD,
-        MI_SUST,        MI_F,           MI_C1,         MI_G1,         MI_D2,         MI_A2,        KC_NO,         KC_NO,          MI_E3,         MI_B3,         MI_F4,         MI_C5,         MI_G5,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [6] = LAYOUT_ortho_5x15(
-        // Black Keys            Vertical  Typing 60
-        KC_ESC,        MI_C,          MI_A,           MI_G1,         MI_F2,         MI_D3,        KC_NO,         KC_NO,          MI_C4,         MI_A4,         MI_G5,        KC_NO,         KC_NO,         KC_NO,         MI_TR0,
-        KC_TAB,        MI_D,           MI_C1,         MI_A1,         MI_G2,         MI_F3,        KC_NO,         KC_NO,          MI_D4,         MI_C5,         MI_A5,        KC_NO,         KC_NO,         KC_NO,         MI_TRSU,
-        KC_SPC,        MI_F,           MI_D1,         MI_C2,         MI_A2,         MI_G3,        KC_NO,         KC_NO,          MI_F4,         MI_D5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TRSD,
-        MI_SUST,        MI_G,           MI_F1,         MI_D2,         MI_C3,         MI_A3,        KC_NO,         KC_NO,          MI_G4,         MI_F5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [7] = LAYOUT_ortho_5x15(
-        // Chromatic Scale       Vertical
-        KC_ESC,        MI_C,          MI_E,          MI_Gs,          MI_C1,         MI_E1,         MI_Gs1,        MI_C2,         MI_E2,         MI_Gs2,        MI_C3,         MI_E3,         MI_Gs3,       KC_NO,         MI_TR0,
-        KC_TAB,        MI_Cs,         MI_F,          MI_A,           MI_Cs1,        MI_F1,         MI_A1,         MI_Cs2,        MI_F2,         MI_A2,         MI_Cs3,        MI_F3,         MI_A3,        KC_NO,         MI_TRSU,
-        KC_SPC,        MI_D,          MI_Fs,         MI_As,          MI_D1,         MI_Fs1,        MI_As1,        MI_D2,         MI_Fs2,        MI_As2,        MI_D3,         MI_Fs3,        MI_As3,       KC_NO,         MI_TRSD,
-        MI_SUST,        MI_Ds,         MI_G,          MI_B,           MI_Ds1,        MI_G1,         MI_B1,         MI_Ds2,        MI_G2,         MI_B2,         MI_Ds3,        MI_G3,         MI_B3,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [8] = LAYOUT_ortho_5x15(
-        // Pocket Operator Scale Vertical
-        KC_ESC,        MI_C,          MI_G,           MI_C1,         MI_G1,         MI_C2,         MI_G2,         MI_C3,         MI_G3,         MI_C4,         MI_G4,         MI_C5,         MI_G5,        KC_NO,         MI_TR0,
-        KC_TAB,        MI_D,          MI_Gs,          MI_D1,         MI_Gs1,        MI_D2,         MI_Gs2,        MI_D3,         MI_Gs3,        MI_D4,         MI_Gs4,        MI_D5,         MI_Gs5,       KC_NO,         MI_TRSU,
-        KC_SPC,        MI_Ds,         MI_As,          MI_Ds1,        MI_As1,        MI_Ds2,        MI_As2,        MI_Ds3,        MI_As3,        MI_Ds4,        MI_As4,        MI_Ds5,        MI_As5,       KC_NO,         MI_TRSD,
-        MI_SUST,        MI_F,          MI_B,           MI_F1,         MI_B1,         MI_F2,         MI_B2,         MI_F3,         MI_B3,         MI_F4,         MI_B4,         MI_F5,         MI_B5,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [9] = LAYOUT_ortho_5x15(
-        // Major scale           Vertical
-        KC_ESC,        MI_C,          MI_G,           MI_D1,         MI_A1,         MI_E2,         MI_B2,         MI_F3,         MI_C4,         MI_G4,         MI_D5,         MI_A5,        KC_NO,         KC_NO,         MI_TR0,
-        KC_TAB,        MI_D,          MI_A,           MI_E1,         MI_B1,         MI_F2,         MI_C3,         MI_G3,         MI_D4,         MI_A4,         MI_E5,         MI_B5,        KC_NO,         KC_NO,         MI_TRSU,
-        KC_SPC,        MI_E,          MI_B,           MI_F1,         MI_C2,         MI_G2,         MI_D3,         MI_A3,         MI_E4,         MI_B4,         MI_F5,        KC_NO,         KC_NO,         KC_NO,         MI_TRSD,
-        MI_SUST,        MI_F,           MI_C1,         MI_G1,         MI_D2,         MI_A2,         MI_E3,         MI_B3,         MI_F4,         MI_C5,         MI_G5,        KC_NO,         KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [10] = LAYOUT_ortho_5x15(
-        // Black Keys            Vertical
-        KC_ESC,        MI_C,          MI_A,           MI_G1,         MI_F2,         MI_D3,         MI_C4,         MI_A4,         MI_G5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TR0,
-        KC_TAB,        MI_D,           MI_C1,         MI_A1,         MI_G2,         MI_F3,         MI_D4,         MI_C5,         MI_A5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TRSU,
-        KC_SPC,        MI_F,           MI_D1,         MI_C2,         MI_A2,         MI_G3,         MI_F4,         MI_D5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TRSD,
-        MI_SUST,        MI_G,           MI_F1,         MI_D2,         MI_C3,         MI_A3,         MI_G4,         MI_F5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [11] = LAYOUT_ortho_5x15(
-        // Chromatic Scale       Horizontal
-        KC_ESC,        MI_C,          MI_Cs,         MI_D,          MI_Ds,         MI_E,          MI_F,          MI_Fs,         MI_G,          MI_Gs,         MI_A,          MI_As,         MI_B,          KC_NO,         MI_TR0,
-        KC_TAB,         MI_C1,         MI_Cs1,        MI_D1,         MI_Ds1,        MI_E1,         MI_F1,         MI_Fs1,        MI_G1,         MI_Gs1,        MI_A1,         MI_As1,        MI_B1,        KC_NO,         MI_TRSU,
-        KC_SPC,         MI_C2,         MI_Cs2,        MI_D2,         MI_Ds2,        MI_E2,         MI_F2,         MI_Fs2,        MI_G2,         MI_Gs2,        MI_A2,         MI_As2,        MI_B2,        KC_NO,         MI_TRSD,
-        MI_SUST,         MI_C3,         MI_Cs3,        MI_D3,         MI_Ds3,        MI_E3,         MI_F3,         MI_Fs3,        MI_G3,         MI_Gs3,        MI_A3,         MI_As3,        MI_B3,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-    [12] = LAYOUT_ortho_5x15(
-        // Pocket Operator Scale Horizontal
-        KC_ESC,        MI_C,          MI_D,          MI_Ds,         MI_F,          MI_G,          MI_Gs,         MI_As,         MI_B,           MI_C1,         MI_D1,         MI_Ds1,        MI_F1,        KC_NO,         MI_TR0,
-        KC_TAB,         MI_G1,         MI_Gs1,        MI_As1,        MI_B1,         MI_C2,         MI_D2,         MI_Ds2,        MI_F2,         MI_G2,         MI_Gs2,        MI_As2,        MI_B2,        KC_NO,         MI_TRSU,
-        KC_SPC,         MI_C3,         MI_D3,         MI_Ds3,        MI_F3,         MI_G3,         MI_Gs3,        MI_As3,        MI_B3,         MI_C4,         MI_D4,         MI_Ds4,        MI_F4,        KC_NO,         MI_TRSD,
-        MI_SUST,         MI_G4,         MI_Gs4,        MI_As4,        MI_B4,         MI_C5,         MI_D5,         MI_Ds5,        MI_F5,         MI_G5,         MI_Gs5,        MI_As5,        MI_B5,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [13] = LAYOUT_ortho_5x15(
-        // Major scale           Horizontal
-        KC_ESC,        MI_C,          MI_D,          MI_E,          MI_F,          MI_G,          MI_A,          MI_B,           MI_C1,         MI_D1,         MI_E1,         MI_F1,         MI_G1,        KC_NO,         MI_TR0,
-        KC_TAB,         MI_A1,         MI_B1,         MI_C2,         MI_D2,         MI_E2,         MI_F2,         MI_G2,         MI_A2,         MI_B2,         MI_C3,         MI_D3,         MI_E3,        KC_NO,         MI_TRSU,
-        KC_SPC,         MI_F3,         MI_G3,         MI_A3,         MI_B3,         MI_C4,         MI_D4,         MI_E4,         MI_F4,         MI_G4,         MI_A4,         MI_B4,         MI_C5,        KC_NO,         MI_TRSD,
-        MI_SUST,         MI_D5,         MI_E5,         MI_F5,         MI_G5,         MI_A5,         MI_B5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-    [14] = LAYOUT_ortho_5x15(
-        // Black Keys            Horizontal
-        KC_ESC,        MI_C,          MI_D,          MI_F,          MI_G,          MI_A,           MI_C1,         MI_D1,         MI_F1,         MI_G1,         MI_A1,         MI_C2,         MI_D2,        KC_NO,         MI_TR0,
-        KC_TAB,         MI_F2,         MI_G2,         MI_A2,         MI_C3,         MI_D3,         MI_F3,         MI_G3,         MI_A3,         MI_C4,         MI_D4,         MI_F4,         MI_G4,        KC_NO,         MI_TRSU,
-        KC_SPC,         MI_A4,        MI_C,          MI_D,          MI_F,          MI_G,          MI_A,          KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TRSD,
-        MI_SUST,        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,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [15] = LAYOUT_ortho_5x15(
-        // Settings
-        DB_TOGG,       MI_CH1,        MI_CH2,        MI_CH3,        MI_CH4,        MI_CH5,        KC_NO,         KC_NO,         MI_CH6,        MI_CH7,        MI_CH8,        AU_TOGG,        KC_NO,         KC_NO,         QK_BOOT,
-        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         DF(3),         DF(4),         DF(5),         DF(6),         KC_NO,         KC_NO,         KC_NO,
-        RGB_MOD,       RGB_HUI,       RGB_SAI,       RGB_VAI,       RGB_SPI,       KC_NO,         KC_NO,         KC_NO,         DF(11),        DF(12),        DF(13),        DF(14),        KC_NO,         KC_NO,         DB_TOGG,
-        RGB_RMOD,      RGB_HUD,       RGB_SAD,       RGB_VAD,       RGB_SPD,       KC_NO,         KC_NO,         KC_NO,         DF(7),         DF(8),         DF(9),         DF(10),        KC_NO,         KC_NO,         KC_NO,
-        KC_TRNS,       KC_NO,         KC_NO,         KC_NO,         KC_TRNS,       DF(0),         DF(0),         DF(0),         DF(0),         KC_TRNS,       KC_NO,         KC_TRNS,       KC_NO,         KC_NO,         KC_NO
-    )
-};
-
diff --git a/keyboards/xiudi/xd75/keymaps/dothtm75/rules.mk b/keyboards/xiudi/xd75/keymaps/dothtm75/rules.mk
deleted file mode 100644
index 56c4130708c..00000000000
--- a/keyboards/xiudi/xd75/keymaps/dothtm75/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-MIDI_ENABLE = yes
diff --git a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/config.h b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/config.h
deleted file mode 100644
index e6975da8a20..00000000000
--- a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
deleted file mode 100644
index 1cabfd8ef86..00000000000
--- a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/keymap.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * 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 planck_keycodes {
-  DUMMY = SAFE_RANGE,
-  DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-// Layer shorthand
-#define _QW 0
-#define _FN 1
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if ( !process_record_dynamic_macro( keycode, record ) ) {
-    return false;
-  }
-
-  return true;
-};
-
-void macro_tog_key( tap_dance_state_t *state, void *user_data ) {
-  if ( state->count > 3 )
-    return;
-
-  keyrecord_t kr;
-  kr.event.pressed = false;
-  uint16_t action = QK_DYNAMIC_MACRO_RECORD_STOP;
-
-  if ( state->count == 1 ) {
-    action = QK_DYNAMIC_MACRO_PLAY_1;
-  }
-  else if ( state->count == 2 ) {
-    action = QK_DYNAMIC_MACRO_RECORD_STOP;
-    kr.event.pressed = true;
-  }
-  else if ( state->count == 3 ) {
-    action = QK_DYNAMIC_MACRO_RECORD_START_1;
-  }
-
-  process_record_dynamic_macro( action, &kr );
-}
-
-enum {
-  MCROTOG_ = 0
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [MCROTOG_]  = ACTION_TAP_DANCE_FN( macro_tog_key )
-};
-
-// Key shorthand
-#define MCROTOG TD( MCROTOG_ )
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | HOME   | DEL    | PG UP  | H      | J      | K      | L      | ;      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | END    | UP     | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | LGUI   | LALT   | FN     | SPACE  | SPACE  | LEFT   | DOWN   | RIGHT  | MCRTOG | SPACE  | FN     | RALT   | RGUI   | RCTRL  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
-  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, MCROTOG, KC_SPC,  MO(_FN), KC_RALT, KC_RGUI, KC_RCTL
- ),
-
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F1     | F2     | F3     | F4     | F5     | F6     | NUM LK | P/     | P*     | F7     | F8     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | SELECT | CALC   | MYCOMP | MAIL   | RGB HD | RGB HI | P7     | P8     | P9     | -      |        |        | PR SCR | SCR LK | PAUSE  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | PREV   | PLAY   | NEXT   | STOP   | RGB SD | RGB SI | P4     | P5     | P6     | +      |        | QK_BOOT  |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | VOL-   | MUTE   | VOL+   | APP    | RGB VD | RGB VI | P1     | P2     | P3     | PENT   |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        | RGB TG | FN     | RGB RMD| RGB MD | P0     |        | P.     | PENT   | PENT   | FN     |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NUM,  KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
-  KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, QK_BOOT, _______, _______, _______,
-  KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
-  _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
- )
-};
diff --git a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/readme.md b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/readme.md
deleted file mode 100644
index b29295c7488..00000000000
--- a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for xd75, with led controls
diff --git a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/rules.mk b/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/rules.mk
deleted file mode 100644
index 7708eba6a18..00000000000
--- a/keyboards/xiudi/xd75/keymaps/dyn_macro_tap_dance/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-TAP_DANCE_ENABLE = yes
-
diff --git a/keyboards/xiudi/xd75/keymaps/fabian/config.h b/keyboards/xiudi/xd75/keymaps/fabian/config.h
deleted file mode 100644
index a72596783dd..00000000000
--- a/keyboards/xiudi/xd75/keymaps/fabian/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/fabian/keymap.c b/keyboards/xiudi/xd75/keymaps/fabian/keymap.c
deleted file mode 100644
index 32ecb77f861..00000000000
--- a/keyboards/xiudi/xd75/keymaps/fabian/keymap.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/* Copyright 2015-2017 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/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-enum custom_layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define CTL_ESC CTL_T(KC_ESC)  // Tap for Escape, hold for Control
-#define HPR_TAB ALL_T(KC_TAB)  // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
-#define MEH_GRV MEH_T(KC_GRV)  // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
-#define SFT_BSP SFT_T(KC_BSPC) // Tap for Backspace, hold for Shift
-#define SFT_ENT SFT_T(KC_ENT)  // Tap for Enter, hold for Shift
-#define SFT_SPC SFT_T(KC_SPC)  // Tap for Space, hold for Shift
-#define UMLAUT  RALT(KC_U)     // Combine Alt and U
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,--------------------------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |      |      |      |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |      |      |      |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |      |      |      |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  |Lower |Space |      |      |      | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
- * `--------------------------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_5x15(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  _______, _______, _______, HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
-),
-
-/* Colemak
- * ,--------------------------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |      |      |      |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |      |      |      |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |      |      |      |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  |Lower |Space |      |      |      | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
- * `--------------------------------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_ortho_5x15(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  _______, _______, _______, HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
-),
-
-/* Dvorak
- * ,--------------------------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |      |      |      |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |      |      |      |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |      |      |      |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Meh  | Alt  | GUI  |Lower |Space |      |      |      | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
- * `--------------------------------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_ortho_5x15(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    _______, _______, _______, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    _______, _______, _______, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  SFT_BSP, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    _______, _______, _______, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT,
-  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  _______, _______, _______, HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
-),
-
-/* Lower
- * ,--------------------------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |      |      |      |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |      |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |      |      |      |  F12 | MS L | MS D |MS U  | MS R |MS Btn|
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `--------------------------------------------------------------------------------------------------------'
-  */
-[_LOWER] = LAYOUT_ortho_5x15(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  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,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,--------------------------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |      |      |      |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |      |      |      |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |      |      |      |  F12 | Left | Down |  Up  | Rght |MS_BN2|
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- * `--------------------------------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_5x15(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  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_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_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_BTN2,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,--------------------------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |   #  |   #  |   #  |   #  |   #  |   #  |      |      |      |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |      |      |      |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |      |      |      |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |      |      |      |      |      |   E  |   U  |      |      |      |
- * `--------------------------------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_ortho_5x15(
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    XXXXXXX, XXXXXXX, XXXXXXX, KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    XXXXXXX, XXXXXXX, XXXXXXX, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    XXXXXXX, XXXXXXX, XXXXXXX, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,--------------------------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |      |      | Reset|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|      |      |      |AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|      |      |      |MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * `--------------------------------------------------------------------------------------------------------'
- */
-
-[_ADJUST] = LAYOUT_ortho_5x15(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_DEL,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   _______, _______, _______, MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/fabian/rules.mk b/keyboards/xiudi/xd75/keymaps/fabian/rules.mk
deleted file mode 100644
index a494cc8a8e1..00000000000
--- a/keyboards/xiudi/xd75/keymaps/fabian/rules.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/xiudi/xd75/keymaps/french/config.h b/keyboards/xiudi/xd75/keymaps/french/config.h
deleted file mode 100644
index e6975da8a20..00000000000
--- a/keyboards/xiudi/xd75/keymaps/french/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/french/keymap.c b/keyboards/xiudi/xd75/keymaps/french/keymap.c
deleted file mode 100644
index fb6b1a2c786..00000000000
--- a/keyboards/xiudi/xd75/keymaps/french/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "keymap_french.c"
-#include QMK_KEYBOARD_H
-
-
-// Layer shorthand
-#define _AZ 0
-#define _FN 1
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* AZERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | &      | é      | "      | '      | (      | -      | è      | _      | ç      | à      | )      | =      | INSERT | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | a      | z      | e      | r      | t      | y      | u      | i      | o      | p      | ^      | $      | ENTER  | PG UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | q      | s      | d      | f      | g      | h      | j      | k      | l      | m      | ù      | *      | ENTER  | PG DN  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | w      | x      | c      | v      | b      | n      | ,      | ;      | :      | !      | <      | LSHIFT | UP     | DEL    |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | CMD    | ALT    | FN     | SPACE  | SPACE  | SPACE  | SPACE  | ALGR   | MENU   | HOME   | END    | LEFT   | DOWN   | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_AZ] = LAYOUT_ortho_5x15( /* AZERTY */
-  FR_ESC,  	FR_AMPR, 	FR_EACU, 	FR_DQUO, 	FR_QUOT,  	FR_LPAR, 	FR_MINS, 	FR_EGRV,  	FR_UNDS,  	FR_CCED,  	FR_AGRV,  	FR_RPAR,  	FR_EQUA,  	FR_INST,  	FR_BSPC,
-  FR_TAB,  	FR_A,   	FR_Z,    	FR_E,    	FR_R,     	FR_T,    	FR_Y,    	FR_U,     	FR_I,     	FR_O,		FR_P,     	FR_HAT,   	FR_DLR,   	FR_ENTR,  	FR_PGUP,
-  FR_CAPL, 	FR_Q,   	FR_S,    	FR_D,    	FR_F,     	FR_G,    	FR_H,    	FR_J,     	FR_K,     	FR_L,     	FR_M,     	FR_UGRV,  	FR_AST,   	FR_ENTR,  	FR_PGDN,
-  FR_LSFT, 	FR_W,    	FR_X,    	FR_C,    	FR_V,     	FR_B,    	FR_N,    	FR_COMM,  	FR_SCLN,  	FR_COLN,  	FR_EXCL,  	FR_LABK,      	FR_RSFT,  	FR_UP,    	FR_DEL,
-  FR_LCTR, 	FR_LCMD, 	FR_LALT, 	MO(_FN),	FR_SPAC,  	FR_SPAC, 	FR_SPAC, 	FR_SPAC,  	FR_ALGR,  	FR_MENU,  	FR_HOME,  	FR_END,   	FR_LEFT,  	FR_DOWN,  	FR_RIGT
- ),
-
-
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | PRINT  | LED    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | PREV   | PLAY   | NEXT   |        |        |        |        | NUM LCK| 7      | 8      | 9      | *      |        | LED+   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | VOL-   | MUTE   | VOL+   |        |        |        |        |        | 4      | 5      | 6      | -      |        | LED-   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        | 1      | 2      | 3      | +      |        | LEDMAX |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | QK_BOOT  |        |        | FN     |        |        |        |        |        |        | 0      | .      | PENT   |        | LEDLVL |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  FR_EMPT,	FR_F1,		FR_F2,		FR_F3,		FR_F4,		FR_F5,		FR_F6,  	FR_F7,		FR_F8,    	FR_F9,		FR_F10, 	FR_F11,  	FR_F12,   	FR_PSCR,	BL_TOGG,
-  FR_EMPT,	FR_MPRV,	FR_MPLY,	FR_MNXT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_NUML,  	FR_7,     	FR_8,   	FR_9,    	FR_MULT,  	FR_EMPT,	BL_UP, 
-  FR_EMPT,	FR_MVDN,	FR_MUTE,	FR_MVUP,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_4,     	FR_5,   	FR_6,    	FR_MOIN,  	FR_EMPT,	BL_DOWN,
-  FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_1,     	FR_2,   	FR_3,    	FR_PLUS,  	FR_EMPT,	BL_ON,
-  QK_BOOT,	FR_EMPT,	FR_EMPT,	FR_TRANS,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_EMPT,  	FR_0,   	FR_DOT,  	FR_ENTK,  	FR_EMPT,	BL_STEP
- )
-};
diff --git a/keyboards/xiudi/xd75/keymaps/french/keymap_french.c b/keyboards/xiudi/xd75/keymaps/french/keymap_french.c
deleted file mode 100644
index c3461383818..00000000000
--- a/keyboards/xiudi/xd75/keymaps/french/keymap_french.c
+++ /dev/null
@@ -1,157 +0,0 @@
-enum french_key {
-
-	FR_EMPT			= 0x00,
-	FR_TRANS,
-	FR_Q			= 0x04,
-	FR_B,
-	FR_C,
-	FR_D,
-	FR_E,
-	FR_F,
-	FR_G,
-	FR_H,
-	FR_I,
-	FR_J,
-	FR_K,
-	FR_L,
-	FR_COMM,		/* 0x10 */
-	FR_N,
-	FR_O,
-	FR_P,
-	FR_A,
-	FR_R,
-	FR_S,
-	FR_T,
-	FR_U,
-	FR_V,
-	FR_Z,
-	FR_X,
-	FR_Y,
-	FR_W,
-	FR_AMPR,  
-	FR_EACU,
-	FR_DQUO,		/* 0x20 */
-	FR_QUOT,
-	FR_LPAR,
-	FR_MINS,
-	FR_EGRV,
-	FR_UNDS,
-	FR_CCED,
-	FR_AGRV,
-	FR_ENTR,
-	FR_ESC,
-	FR_BSPC,
-	FR_TAB,
-	FR_SPAC,
-	FR_RPAR,
-	FR_EQUA,
-	FR_HAT,
-	FR_DLR,			/* 0x30 */
-	FR_AST			=0x32,
-	FR_M,
-	FR_UGRV,
-	FR_SCLN			=0x36,
-	FR_COLN,
-	FR_EXCL,
-	FR_CAPL,
-	FR_F1,
-	FR_F2,
-	FR_F3,
-	FR_F4,
-	FR_F5,
-	FR_F6,
-	FR_F7,			/* 0x40 */
-	FR_F8,
-	FR_F9,
-	FR_F10,
-	FR_F11,
-	FR_F12,
-	FR_PSCR,
-	FR_INST			=0x49,
-	FR_HOME,
-	FR_PGUP,
-    	FR_DEL,
-    	FR_END,
-    	FR_PGDN,
-    	FR_RIGT,
-    	FR_LEFT,		/* 0x50 */
-    	FR_DOWN,
-    	FR_UP,
-	FR_NUML,
-	FR_SLSH,		/* KEYPAD */
-	FR_MULT,
-	FR_MOIN,
-	FR_PLUS,
-	FR_ENTK,
-	FR_1,
-	FR_2,
-	FR_3,
-	FR_4,
-	FR_5,
-	FR_6,
-	FR_7,
-	FR_8,			/* 0x60 */
-	FR_9,
-	FR_0,
-	FR_DOT,
-	FR_LABK,
-	FR_EQ			=0x67 /* END KEYPAD */,
-	FR_F13,
-    	FR_F14,
-    	FR_F15,
-    	FR_F16,
-    	FR_F17,
-    	FR_F18,
-    	FR_F19,
-    	FR_F20,
-    	FR_F21,			/* 0x70 */
-    	FR_F22,
-    	FR_F23,
-    	FR_F24,
-	FR_MENU			=0x76
-};
-
-
-enum french_control_touch{
-
-	/* Modifiers */
-	FR_LCTR			= 0xE0,
-    	FR_LSFT,
-    	FR_LALT,
-    	FR_LCMD,
-    	FR_RCTR,
-    	FR_RSFT,
-    	FR_ALGR,
-    	FR_RCMD
-};
-
-
-enum french_media_key{
-	/* System Control */
-    	FR_SYSTEM_POWER		= 0xA5,
-    	FR_SYSTEM_SLEEP,
-    	FR_SYSTEM_WAKE,
-
-    	/* Media Control */
-    	FR_MUTE,
-    	FR_MVUP,
-    	FR_MVDN,
-    	FR_MNXT,
-    	FR_MPRV,
-    	FR_MSTP,
-    	FR_MPLY,
-    	FR_MEDIA_SELECT,
-    	FR_MEDIA_EJECT,
-    	FR_MAIL,
-    	FR_CALCULATOR,
-    	FR_MY_COMPUTER,
-    	FR_WWW_SEARCH,
-    	FR_WWW_HOME,
-    	FR_WWW_BACK,
-    	FR_WWW_FORWARD,
-    	FR_WWW_STOP,
-    	FR_WWW_REFRESH,
-    	FR_WWW_FAVORITES,
-    	FR_MEDIA_FAST_FORWARD,
-    	FR_MEDIA_REWIND		/* 0xBC */
-};
diff --git a/keyboards/xiudi/xd75/keymaps/french/readme.md b/keyboards/xiudi/xd75/keymaps/french/readme.md
deleted file mode 100644
index a45bf248dab..00000000000
--- a/keyboards/xiudi/xd75/keymaps/french/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Clavier AZERTY français
-
-![Disposition Clavier](https://i.imgur.com/tH9TVBc.png)
-
-
-# Configuration du clavier
-
-Ce clavier AZERTY est basé sur le fichier keymap_french.c de correspondance QWERTY - AZERTY.
-
-Ce fichier est composé de trois énumérations (layout français, touches de contrôle, touches multimédias) correspondant aux keycodes sous la forme d'hexa.
-
-Il peut être utilisé pour toute autre configuration de clavier juste en incluant ce fichier dans son propre keymap.c.
-
-La touche de fonction permet elle d'avoir accès aux différentes touches multimédias ainsi qu'au pavé numérique. Mais aussi si le clavier est équipé de led, à différents modes d'éclairage.
-
-# Compilation 
-
-```
-make xiudi/xd75:french:dfu
-```
diff --git a/keyboards/xiudi/xd75/keymaps/french/rules.mk b/keyboards/xiudi/xd75/keymaps/french/rules.mk
deleted file mode 100644
index 324d9ebd059..00000000000
--- a/keyboards/xiudi/xd75/keymaps/french/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-RGBLIGHT_ENABLE = no
-
diff --git a/keyboards/xiudi/xd75/keymaps/germanized/config.h b/keyboards/xiudi/xd75/keymaps/germanized/config.h
deleted file mode 100644
index d8c8f2d5025..00000000000
--- a/keyboards/xiudi/xd75/keymaps/germanized/config.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2018 Kolja Brauns
- *
- * 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
-
-// place overrides here
-
-//Tap-Toggle
-#define TAPPING_TOGGLE 3
-
-//Tap Dancing
-#define TAPPING_TERM 200
-
-// normal characters
-#define DE_Z KC_Y
-#define DE_Y KC_Z
-
-#define DE_A KC_A
-#define DE_B KC_B
-#define DE_C KC_C
-#define DE_D KC_D
-#define DE_E KC_E
-#define DE_F KC_F
-#define DE_G KC_G
-#define DE_H KC_H
-#define DE_I KC_I
-#define DE_J KC_J
-#define DE_K KC_K
-#define DE_L KC_L
-#define DE_M KC_M
-#define DE_N KC_N
-#define DE_O KC_O
-#define DE_P KC_P
-#define DE_Q KC_Q
-#define DE_R KC_R
-#define DE_S KC_S
-#define DE_T KC_T
-#define DE_U KC_U
-#define DE_V KC_V
-#define DE_W KC_W
-#define DE_X KC_X
-
-#define DE_0 KC_0
-#define DE_1 KC_1
-#define DE_2 KC_2
-#define DE_3 KC_3
-#define DE_4 KC_4
-#define DE_5 KC_5
-#define DE_6 KC_6
-#define DE_7 KC_7
-#define DE_8 KC_8
-#define DE_9 KC_9
-
-#define DE_DOT KC_DOT
-#define DE_COMM KC_COMM
-
-#define DE_SS KC_MINS
-#define DE_ADIA KC_QUOT
-#define DE_UDIA KC_LBRC
-#define DE_ODIA KC_SCLN
-
-#define DE_CIRC KC_GRAVE // accent circumflex ^ and ring °
-#define DE_ACUT KC_EQL // accent acute ´ and grave `
-#define DE_PLUS KC_RBRC // + and * and ~
-#define DE_HASH KC_BSLS // # and '
-#define DE_LABK KC_NUBS // < and > and |
-#define DE_MINS KC_SLSH // - and _
-
-// shifted characters
-#define DE_DEG  LSFT(DE_CIRC) // °
-#define DE_EXLM LSFT(KC_1) // !
-#define DE_DQUO LSFT(KC_2) // "
-#define DE_SECT LSFT(KC_3) // §
-#define DE_DLR  LSFT(KC_4) // $
-#define DE_PERC LSFT(KC_5) // %
-#define DE_AMPR LSFT(KC_6) // &
-#define DE_SLSH LSFT(KC_7) // /
-#define DE_LPRN LSFT(KC_8) // (
-#define DE_RPRN LSFT(KC_9) // )
-#define DE_EQL  LSFT(KC_0) // =
-#define DE_QUES LSFT(DE_SS) // ?
-#define DE_GRV  LSFT(DE_ACUT) // `
-#define DE_ASTR LSFT(DE_PLUS) // *
-#define DE_QUOT LSFT(DE_HASH) // '
-#define DE_RABK LSFT(DE_LABK) // >
-#define DE_COLN LSFT(KC_DOT) // :
-#define DE_SCLN LSFT(KC_COMM) // ;
-#define DE_UNDS LSFT(DE_MINS) // _
-
-// Alt Gr-ed characters
-#define DE_SUP2 ALGR(KC_2) // ²
-#define DE_SUP3 ALGR(KC_3) // ³
-#define DE_LCBR ALGR(KC_7) // {
-#define DE_LBRC ALGR(KC_8) // [
-#define DE_RBRC ALGR(KC_9) // ]
-#define DE_RCBR ALGR(KC_0) // }
-#define DE_BSLS ALGR(DE_SS) // backslash
-#define DE_AT  ALGR(KC_Q) // @
-#define DE_EURO ALGR(KC_E) // €
-#define DE_TILD ALGR(DE_PLUS) // ~
-#define DE_PIPE ALGR(DE_LABK) // |
-
-// Launchy
-#define ALT_SPC LALT(KC_SPC)
diff --git a/keyboards/xiudi/xd75/keymaps/germanized/keymap.c b/keyboards/xiudi/xd75/keymaps/germanized/keymap.c
deleted file mode 100644
index 1dc7bc96073..00000000000
--- a/keyboards/xiudi/xd75/keymaps/germanized/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2017 Kolja Brauns
-*/
-#include QMK_KEYBOARD_H
-
-//Tap Dance Declarations
-enum {
-  TD_ESC_RUPT = 0
-};
-
-enum {
-  TD_TAB = 1
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Esc, twice Ctrl+Alt+Del
-  [TD_ESC_RUPT]  = ACTION_TAP_DANCE_DOUBLE(KC_ESC, LALT(LCTL(KC_DEL))),
-  [TD_TAB]  = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, LGUI(KC_TAB))
-// Other declarations would go here, separated by commas, if you have them
-};
-
-//In Layer declaration, add tap dance item in place of a key code
-
-
-// Layer shorthand
-#define _QWZ 0
-#define _FNC 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- 
-    /* QWZ
- * .-----------------------------------------------------------------------------------------------------------------------.
- * |  Esc  |   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |   9   |   0   |   ß   |   ´   | BckSpc|  Esc  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * |  Tab  |   Q   |   W   |   E   |   R   |   T   |   Z   |   U   |   I   |   O   |   P   |   Ü   |   +   |       |  PgUp |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| Enter |-------|
- * | Ctrl/ |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   Ö   |   Ä   |   #   |       |  PgDn |
- * | GUITab|       |       |       |       |       |       |       |       |       |       |       |       |       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | LShift|   Y   |   X   |    C  |   V   |   B   |   N   |   M   |   ,   |   .   |   -   |   ^   | Home/ |  Up   |  End  |
- * |       |       |       |       |       |       |       |       |       |       |       |       | RShift|       |       |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | LCtrl | LAlt  | MO(1)/|     Space     |   Backspace   | MO(1)/|AltGr/ |  Win  |   <   |  Del  | Left  | Down  | Right |
- * |       |       | Enter |               |               | TO(1) |Pause  |       |       |       |       |       |       |
- * °-----------------------------------------------------------------------------------------------------------------------°
- */
- 
-	[_QWZ] = LAYOUT_ortho_5x15(
-	TD(TD_ESC_RUPT), KC_1,    KC_2,          KC_3,   KC_4,   KC_5,    KC_6,  KC_7,  KC_8,                  KC_9,    KC_0,    DE_SS,   DE_ACUT,               KC_BSPC, KC_ESC,
-	KC_TAB,          KC_Q,    KC_W,          KC_E,   KC_R,   KC_T,    DE_Z,  KC_U,  KC_I,                  KC_O,    KC_P,    DE_UDIA, DE_PLUS,               KC_NO,   KC_PGUP,
-	TD(TD_TAB),      KC_A,    KC_S,          KC_D,   KC_F,   KC_G,    KC_H,  KC_J,  KC_K,                  KC_L,    DE_ODIA, DE_ADIA, DE_HASH,               KC_ENT,  KC_PGDN,
-    KC_LSFT,         DE_Y,    KC_X,          KC_C,   KC_V,   KC_B,    KC_N,  KC_M,  KC_COMM,               KC_DOT,  DE_MINS, DE_CIRC, MT(MOD_RSFT, KC_HOME), KC_UP,   KC_END,
-    KC_LCTL,         KC_LALT, LT(1, KC_ENT), KC_SPC, KC_NO,  KC_BSPC, KC_NO, TT(1), MT(MOD_RALT, KC_PAUS), KC_RGUI, DE_LABK, KC_DEL,  KC_LEFT,               KC_DOWN, KC_RGHT
-    ),
-	
-	/* FNC
- * .-----------------------------------------------------------------------------------------------------------------------.
- * | Reset |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |   F7  |   F8  |   F9  |   F10 |  F11  |  F12  | _____ | _____ |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | _____ | _____ | _____ |Bright+| _____ | _____ | _____ | _____ | _____ |   Up  | PrtSc | _____ | _____ | _____ | _____ |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | _____ | _____ | _____ |RGB Tog|RGB Mod| _____ | _____ | _____ | Left  |  Down | Right | _____ | _____ | Play  | _____ |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | CpsLck| _____ | _____ |Bright-| _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | VolUp | Mute  |
- * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
- * | TO(0) | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | Prev  | VolDn | Next  |
- * °-----------------------------------------------------------------------------------------------------------------------°
-*/	
-	[_FNC] = LAYOUT_ortho_5x15(
-	QK_BOOT, 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, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS,
-	KC_CAPS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
-	TO(0),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
-	)
-	
-};
-
diff --git a/keyboards/xiudi/xd75/keymaps/germanized/readme.md b/keyboards/xiudi/xd75/keymaps/germanized/readme.md
deleted file mode 100644
index 81e98c9f70e..00000000000
--- a/keyboards/xiudi/xd75/keymaps/germanized/readme.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# XD75RE  
-
-Copyright 2018 Kolja Brauns  
-
-### Current release: 1.7
-
-**Features**  
-A keymap for German users of the XD75RE keyboard, customized to my needs. Not optimized for ten-finger typing. Some choices are due to me being a lefty.  
-Designed to ease transition from staggered layouts, with the most important keys in the same positions. All German alphanumerics on main layer. Keyboard language should be set to DE in your OS.  
-Lots of dual-use keys, mostly with hold/tap. See visual representation below.
-Some 2u keys, using PoS caps. If you don't have any you'll have to replace the dummy keys with the relevant keycodes.  
-Full nav keys on main layer.  
-Designed to be used with an additional macropad, no numpad configured.  
-
- **QWZ** - Layer 0, Default Layer. QWERTZ layout.  
- 
- 
-  .-----------------------------------------------------------------------------------------------------------------------.
-  |  Esc  |   1   |   2   |   3   |   4   |   5   |   6   |   7   |   8   |   9   |   0   |   ß   |   ´   | BckSpc|  Esc  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  |  Tab  |   Q   |   W   |   E   |   R   |   T   |   Z   |   U   |   I   |   O   |   P   |   Ü   |   +   |       |  PgUp |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| Enter |-------|
-  | Ctrl/ |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   Ö   |   Ä   |   #   |       |  PgDn |
-  | GUITab|       |       |       |       |       |       |       |       |       |       |       |       |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  | LShift|   Y   |   X   |    C  |   V   |   B   |   N   |   M   |   ,   |   .   |   -   |   ^   | Home/ |  Up   |  End  |
-  |       |       |       |       |       |       |       |       |       |       |       |       | RShift|       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  | LCtrl | LAlt  | MO(1)/|     Space     |   Backspace   | MO(1)/|AltGr/ |  Win  |   <   |  Del  | Left  | Down  | Right |
-  |       |       | Enter |               |               | TO(1) |Pause  |       |       |       |       |       |       |
-  °-----------------------------------------------------------------------------------------------------------------------°
- 
-
- 
- 
-**FNC** - Layer 1, Function Layer. F-Keys, additional useful keys. Usually accessed temporarily, can be toggled if necessary.  
-
-
-  .-----------------------------------------------------------------------------------------------------------------------.
-  | Reset |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |   F7  |   F8  |   F9  |   F10 |  F11  |  F12  | _____ | _____ |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  | _____ | _____ | _____ |Bright+| _____ | _____ | _____ | _____ | _____ |   Up  | PrtSc | _____ | _____ | _____ | _____ |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  | _____ | _____ | _____ |RGB Tog|RGB Mod| _____ | _____ | _____ | Left  |  Down | Right | _____ | _____ | Play  | _____ |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  | CpsLck| _____ | _____ |Bright-| _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | VolUp | Mute  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------|
-  | TO(0) | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | Prev  | VolDn | Next  |
-  °-----------------------------------------------------------------------------------------------------------------------°
-  
-
-
-*Release 1.1*  
-
-Added Printscreen to second layer.  
-Added shortcut to Launchy to AltGr.  
-
-*Release 1.3*  
-
-Now using PoS keys for 2u keys, added dummy keys accordingly (not strictly necessary since debouncing handles this, but without this you'll have double input rarely.)  
-Cleaned keymap up & removed unnecessary layers.  
-
-*Release 1.4*  
-Fixed position of the reset key, replaced right spacebar with backspace.  
-
-*Release 1.5*  
-Reset moved to Esc. Removed Numpad since it wasn't getting any use. Removed random other keys on function layer that weren't getting any use or are covered by my macropad. Added RShift for held home key.  
-Added secondary arrow keys on JIKL.  
-
-*Release 1.6*  
-Major rework and cleanup.   
-Capslock removed. Caps now temporarily toggles function layer when held, Esc when tapped. LShift is Capslock when tapped. Esc is Ctrl-Alt-Del on tap.  
-Left lower MO(1) is now Enter on tap. Right lower Layer(1) is now Tap-Toggle (Toggle:_Tap thrice).  
-Media keys moved to nav section - Enter=Play, Up=VolUp, Down=VolDn, Left=Prev, Right=Next, End=Mute.  
-Added PrintScreen on P on Layer 1.  
-Added cleaner visual representation since the multi-function keys make the actual keymap messy.  
-Moved old versions into folder together, only current version in root keymap directory now. 
-
-*Release 1.7*  
-Backspace split, includes Esc now.  
-Capslock moved to function layer to keep smoother LShift operation.  
-Original Caps key now Ctrl, Alt+GUI on double-tap - inspired by Android.  
-Cleaned up visual representation in readme.
diff --git a/keyboards/xiudi/xd75/keymaps/germanized/rules.mk b/keyboards/xiudi/xd75/keymaps/germanized/rules.mk
deleted file mode 100644
index 0b95ead09ad..00000000000
--- a/keyboards/xiudi/xd75/keymaps/germanized/rules.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dancing
-
diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/config.h b/keyboards/xiudi/xd75/keymaps/hybrid/config.h
deleted file mode 100644
index 8aa116d9939..00000000000
--- a/keyboards/xiudi/xd75/keymaps/hybrid/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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_TERM 170
-//#define RGBLIGHT_LAYERS
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
deleted file mode 100644
index 60fa737dc8c..00000000000
--- a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Copyright 2020 Hybrid
- *
- * 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 {
-    _MAIN = 0,
-    _LY1,
-    _LY2,
-};
-
-enum {
-  TD_A,
-  TD_E,
-  TD_I,
-  TD_O,
-  TD_U,
-  TD_SLASH,
-  TD_UNDER,
-  TD_OP_ACCOL,
-  TD_CL_ACCOL,
-  TD_QUESTION,
-  TD_CEDILLE,
-  TD_DOT,
-};
-
-
-
-void dance_a_accent (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_0);
-  }
-  else {
-    tap_code (KC_Q);
-  }
-}
-void dance_e_accent (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_2);
-  }
-  else if (state->count == 3) {
-    tap_code (KC_7);
-  }
-  else {
-    tap_code (KC_E);
-  }
-}
-void dance_i_accent (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P2);
-    tap_code (KC_P3);
-    tap_code (KC_P8);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-  else {
-    tap_code (KC_I);
-
-  }
-}
-void dance_o_accent (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P2);
-    tap_code (KC_P4);
-    tap_code (KC_P4);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-  else {
-    tap_code (KC_O);
-  }
-}
-void dance_u_accent (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P2);
-    tap_code (KC_P4);
-    tap_code (KC_P9);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-  else {
-    tap_code (KC_U);
-  }
-
-}
-void dance_slash (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P9);
-    tap_code (KC_P2);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-  else {
-    tap_code (KC_PSLS);
-  }
-}
-void dance_under (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P9);
-    tap_code (KC_P5);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-  else {
-    tap_code (KC_6);
-  }
-}
-void dance_open_accol (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P1);
-    tap_code (KC_P2);
-    tap_code (KC_P3);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-  else if (state->count == 3) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P9);
-    tap_code (KC_P1);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-  else {
-    tap_code (KC_5);
-  }
-}
-void dance_close_accol (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P1);
-    tap_code (KC_P2);
-    tap_code (KC_P5);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-
-  }
-  else if (state->count == 3) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P9);
-    tap_code (KC_P3);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-  else {
-    tap_code (KC_MINS);
-  }
-}
-void dance_question (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P0);
-    tap_code (KC_P3);
-    tap_code (KC_P3);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-
-  }
-  else {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P0);
-    tap_code (KC_P6);
-    tap_code (KC_P3);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-
-  }
-}
-void dance_cedille (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_9);
-  }
-  else {
-    tap_code (KC_C);
-  }
-}
-void dance_dot (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P4);
-    tap_code (KC_P4);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-  else {
-    tap_code (KC_NUM_LOCK);
-    register_code (KC_LALT);
-    tap_code (KC_P0);
-    tap_code (KC_P4);
-    tap_code (KC_P6);
-    unregister_code (KC_LALT);
-    tap_code (KC_NUM_LOCK);
-  }
-}
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_A] = ACTION_TAP_DANCE_FN(dance_a_accent),
-  [TD_E] = ACTION_TAP_DANCE_FN(dance_e_accent),
-  [TD_I] = ACTION_TAP_DANCE_FN(dance_i_accent),
-  [TD_O] = ACTION_TAP_DANCE_FN(dance_o_accent),
-  [TD_U] = ACTION_TAP_DANCE_FN(dance_u_accent),
-  [TD_SLASH] = ACTION_TAP_DANCE_FN(dance_slash),
-  [TD_UNDER] = ACTION_TAP_DANCE_FN(dance_under),
-  [TD_OP_ACCOL] = ACTION_TAP_DANCE_FN(dance_open_accol),
-  [TD_CL_ACCOL] = ACTION_TAP_DANCE_FN(dance_close_accol),
-  [TD_QUESTION] = ACTION_TAP_DANCE_FN(dance_question),
-  [TD_CEDILLE] = ACTION_TAP_DANCE_FN(dance_cedille),
-  [TD_DOT] = ACTION_TAP_DANCE_FN(dance_dot),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-// red led layout
-  [_MAIN] = LAYOUT_ortho_5x15(
-    KC_ESC, KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, TD(TD_DOT), KC_6, KC_7, KC_8, KC_9, KC_0, DF(_LY1), KC_NO,
-    KC_TAB, TD(TD_A), KC_W, TD(TD_E), KC_R, KC_T, KC_Y, KC_ENT, TD(TD_U), TD(TD_I), TD(TD_O), KC_P, KC_NO, TD(TD_OP_ACCOL), TD(TD_CL_ACCOL),
-    KC_PGUP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_ENT, KC_J, KC_K, KC_L, KC_SCLN, KC_UP, KC_NO, KC_NO,
-    KC_PGDN, KC_Z, KC_X, TD(TD_CEDILLE), KC_V, KC_B, KC_N, KC_DOT, TD(TD_QUESTION), TD(TD_UNDER), TD(TD_SLASH), KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-    KC_NO, KC_NO, KC_LALT, KC_LCTL, KC_LSFT, KC_SPC, KC_HOME, KC_LGUI, KC_END, KC_BSPC, KC_RALT, KC_DEL, KC_PMNS, KC_NO, MO(1)
-    ),
-
-// green led layout
-  [_LY1] = LAYOUT_ortho_5x15(
-    KC_ESC, RGB_TOG, RGB_RMOD, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_K, RGB_M_G, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_LY2), DF(_MAIN),
-    DB_TOGG, KC_PSCR, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-    QK_BOOT, KC_NO, KC_S, KC_D, KC_F, KC_G, KC_Z, KC_J, KC_K, KC_L, KC_M, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_LSFT,
-    KC_NO, KC_X, KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_SCLN, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PEQL, KC_LCBR,
-    KC_NO, KC_NO, KC_NO, KC_SPC, KC_SPC, KC_SPC, KC_TRNS, KC_NO, KC_TRNS, KC_P0,  KC_P1, KC_P2, KC_P3, KC_TRNS
-    ),
-
-// blue led layout
-  [_LY2] = LAYOUT_ortho_5x15(
-    KC_MPRV, KC_MNXT, KC_NO, KC_NO, KC_NO, BL_ON, BL_OFF, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_RMOD, RGB_MOD, KC_NO, DF(_LY1),
-    KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, BL_TOGG, BL_STEP, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, RGB_M_P, RGB_M_B,
-    KC_MPLY, KC_MSTP, KC_MUTE, KC_NO, KC_NO, BL_DOWN,BL_UP,  KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, RGB_M_R, RGB_M_SW,
-    KC_MRWD, KC_MFFD, KC_NO, KC_NO, KC_NO, BL_BRTG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAD, RGB_VAI, RGB_M_SN, RGB_M_K,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, RGB_SPD, RGB_SPI, RGB_M_X, RGB_M_G
-    )
-
-};
-
-
-//Define layer colors
-#define rgblight_setrgb_user_MAIN()  rgblight_sethsv(HSV_RED)
-#define rgblight_setrgb_user_LY1()  rgblight_sethsv(HSV_GREEN)
-#define rgblight_setrgb_user_LY2() rgblight_sethsv(HSV_BLUE)
-
-void matrix_init_user(void) {
-  rgblight_enable();
-  rgblight_mode(1);
-  rgblight_setrgb_user_MAIN();
-}
-
-
-//Set a color based on the layer
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case _LY1:
-      rgblight_setrgb_user_LY1();
-      break;
-    case _LY2:
-      rgblight_setrgb_user_LY2();
-      break;
-    default:
-      rgblight_setrgb_user_MAIN();
-      break;
-  }
-  return state;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/readme.md b/keyboards/xiudi/xd75/keymaps/hybrid/readme.md
deleted file mode 100644
index dbe41037c23..00000000000
--- a/keyboards/xiudi/xd75/keymaps/hybrid/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# My XD75 keyboard 
-# The layouts are 100 % customizable by myself.
-# The layout 1 is almost finished (layer 2 and layer 3 are not finished, for testing purpose as far)
-# Layout 1 => rgb red
-# Layout 2 => rgb green
-# Layout 1 => rgb blue
-# (to memorize => rgb :) )
-#
-# I added some double tap dance for french accent (à é è î ô ù, not for every accents) and c & ç 
-# Some double tap dance for useful mapping (- & _ ,  ({[ & )}], etc...  )
-#
-#
diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/rules.mk b/keyboards/xiudi/xd75/keymaps/hybrid/rules.mk
deleted file mode 100644
index 403c3c65ce9..00000000000
--- a/keyboards/xiudi/xd75/keymaps/hybrid/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-UNICODE_ENABLE = no
-SLEEP_LED_ENABLE = no
-BACKLIGHT_ENABLE = no
-
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/config.h b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/config.h
deleted file mode 100644
index 0c8015e2271..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * 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
-
-// place overrides here
-#undef BACKLIGHT_BREATHING
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
deleted file mode 100644
index dd7a5802f4c..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/keymap.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2017 Lukmanul Hakim
- *
- * 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
-
-// Fillers to make layering more clear
-#define ___T___ KC_TRNS
-
-// Layer shorthand
-#define _QW 0
-#define _LW 1
-#define _RS 2
-#define _RT 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* SPLIT QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | NUM/   | NUM*   | NUM-   | 6      | 7      | 8      | 9      | 0      | `      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | NUM7   | NUM8   | NUM9   | Y      | U      | I      | O      | P      | BSPACE |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | LCTRL  | A      | S      | D      | F      | G      | NUM4   | NUM5   | NUM6   | H      | J      | K      | L      | ;      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | NUM1   | NUM2   | NUM3   | N      | M      | <      | >      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        | LALT   | RAISE  | LGUI   | SPACE  | SPACE  | NUM+   | NUM0   | NUM.   | SPACE  | SPACE  | RGUI   | LOWER  | RALT   |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-	
- [_QW] = LAYOUT_ortho_5x15( /* SPLIT QWERTY */
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PSLS, KC_PAST, KC_PMNS, 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_P7,   KC_P8,   KC_P9,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   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_P1,   KC_P2,   KC_P3,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  _______, KC_LALT, MO(_RS), KC_LGUI, KC_SPC,  KC_SPC,  KC_PPLS, KC_P0,   KC_PDOT, KC_SPC, KC_SPC,  KC_RGUI, MO(_LW), KC_RALT, _______
- ),
-
-/* LOWERED
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F11    |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | PREV   | NEXT   | VOLUP  |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        | PLAY   | STOP   | VOLDWN |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        | MUTE   |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_MPRV, KC_MNXT, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_MPLY, KC_MSTP, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, MO(_RT), MO(_RT), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/* RAISED
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        | F12    | F6     | F7     | F8     | F9     | F10    | DELETE |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        |        |        |        |        |        |        |        | PRTSCR |        | [      | ]      | -      | =      | \      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        |        | BACKL+ |        | LEFT   | DOWN   | UP     | RIGHT  |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        | BACKL- |        | HOME   | PGDN   | PGUP   | END    |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_RS] = LAYOUT_ortho_5x15( /* RAISED */
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_BSLS,
-  _______, _______, _______, _______, _______, _______, _______, _______, BL_UP,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN,_______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______
- ),
-
-/* QK_BOOT
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        | QK_BOOT  |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_RT] = LAYOUT_ortho_5x15( /* QK_BOOT */
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- )
-
-};
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/rules.mk b/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/rules.mk
deleted file mode 100644
index 4c894d79738..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kim-kim-xd73/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim/config.h b/keyboards/xiudi/xd75/keymaps/kim-kim/config.h
deleted file mode 100644
index 0c8015e2271..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kim-kim/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
- *
- * 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
-
-// place overrides here
-#undef BACKLIGHT_BREATHING
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c b/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
deleted file mode 100644
index 3e49a0d7a49..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kim-kim/keymap.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2017 Lukmanul Hakim
- *
- * 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
-
-// Fillers to make layering more clear
-#define ___T___ KC_TRNS
-
-// Layer shorthand
-#define _QW 0
-#define _LW 1
-#define _RS 2
-#define _RT 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* SPLIT QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | NUM/   | NUM*   | NUM-   | 6      | 7      | 8      | 9      | 0      | `      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | NUM7   | NUM8   | NUM9   | Y      | U      | I      | O      | P      | BSPACE |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | LCTRL  | A      | S      | D      | F      | G      | NUM4   | NUM5   | NUM6   | H      | J      | K      | L      | ;      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | NUM1   | NUM2   | NUM3   | N      | M      | <      | >      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LALT   | RAISE  | RAISE  | LGUI   | SPACE  | SPACE  | NUM+   | NUM0   | NUM.   | SPACE  | SPACE  | RGUI   | LOWER  | LOWER  | RALT   |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-	
- [_QW] = LAYOUT_ortho_5x15( /* SPLIT QWERTY */
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PSLS, KC_PAST, KC_PMNS, 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_P7,   KC_P8,   KC_P9,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   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_P1,   KC_P2,   KC_P3,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  KC_LALT, MO(_RS), MO(_RS), KC_LGUI, KC_SPC,  KC_SPC,  KC_PPLS, KC_P0,   KC_PDOT, KC_SPC, KC_SPC,  KC_RGUI, MO(_LW), MO(_LW), KC_RALT
- ),
-
-/* LOWERED
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F11    |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | PREV   | NEXT   | VOLUP  |        |        | RGBTOG |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        | PLAY   | STOP   | VOLDWN |        |        | RGBMOD |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        | MUTE   |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_MPRV, KC_MNXT, KC_VOLU, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_MPLY, KC_MSTP, KC_VOLD, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, MO(_RT), MO(_RT), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-/* RAISED
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        | F12    | F6     | F7     | F8     | F9     | F10    | DELETE |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        |        |        |        |        |        |        |        | PRTSCR |        | [      | ]      | -      | =      | \      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        |        | BACKL+ |        | LEFT   | DOWN   | UP     | RIGHT  |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        | BACKL- |        | HOME   | PGDN   | PGUP   | END    |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_RS] = LAYOUT_ortho_5x15( /* RAISED */
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_BSLS
-  _______, _______, _______, _______, _______, _______, _______, _______, BL_UP,  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN,_______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______
- ),
-
-/* QK_BOOT
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        | QK_BOOT  |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
- 
- [_RT] = LAYOUT_ortho_5x15( /* QK_BOOT */
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- )
-
-};
diff --git a/keyboards/xiudi/xd75/keymaps/kim-kim/rules.mk b/keyboards/xiudi/xd75/keymaps/kim-kim/rules.mk
deleted file mode 100644
index 4c894d79738..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kim-kim/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-
diff --git a/keyboards/xiudi/xd75/keymaps/kloki/config.h b/keyboards/xiudi/xd75/keymaps/kloki/config.h
deleted file mode 100644
index e6975da8a20..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kloki/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/kloki/keymap.c b/keyboards/xiudi/xd75/keymaps/kloki/keymap.c
deleted file mode 100644
index 2a8fde5f35c..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kloki/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _WO 0
-#define _QW 1
-#define _NUM 2
-#define _SYM 3
-#define _FUN 4
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
- [_WO] = LAYOUT_ortho_5x15( /* WORKMAN */
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   MO(_FUN),TG(_NUM),TG(_QW),KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_Q,    KC_D,    KC_R,    KC_W,   KC_B,   KC_GRV,  KC_LGUI, KC_QUOT, KC_J,   KC_F,   KC_U,    KC_P,    KC_SCLN, KC_BSLS,
-  CTL_T(KC_ESC),KC_A,KC_S,   KC_H,    KC_T,   KC_G,   KC_EQL,  KC_UP,   KC_MINS, KC_Y,   KC_N,   KC_E,    KC_O,    KC_I,    KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,   KC_V,   KC_LEFT, KC_DOWN, KC_RGHT, KC_K,   KC_L,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  KC_MEH,KC_LGUI,KC_LALT,KC_LEFT,KC_RGHT,LT(_SYM,KC_SPC),LGUI_T(KC_ENT),KC_SPC,LT(_SYM,KC_TAB),KC_BSPC,KC_DOWN,KC_UP,KC_LBRC,KC_RBRC,MO(_SYM)
- ),
-
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-  _______,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   _______, _______, _______, KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    _______,
-  _______,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   _______, _______, _______, KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    _______,
-  _______,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   _______, _______, _______, KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, _______,
-  _______,  KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   _______, _______, _______, KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, _______,
-  _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______
- ),//
-
- [_NUM] = LAYOUT_ortho_5x15( /* NUM */
-  _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
-  _______,  _______, _______, _______, _______,_______,KC_7,    KC_8,    KC_9, _______,_______,_______, _______, _______, _______,
-  _______,  _______, _______, _______, _______,_______,KC_4,    KC_5,    KC_6, _______,_______,_______, _______, _______, _______,
-  _______,  _______, _______, _______, _______,_______,KC_1,    KC_2,    KC_3, _______,_______,_______, _______, _______, _______,
-  _______,  _______, _______, _______, _______,_______,_______, KC_0, _______, _______,_______,_______, _______, _______, _______
- ),
- [_SYM] = LAYOUT_ortho_5x15( /* SYM */
-  _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  _______, _______, _______, KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  _______,  KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR,KC_ASTR,_______, KC_F11,  KC_F12,  KC_LABK,KC_HOME,KC_UP,   KC_PGUP, KC_ASTR, _______,
-  _______,  KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN,KC_GRV, _______, _______, _______, KC_RABK,KC_LEFT,KC_DOWN, KC_RIGHT,KC_PLUS, _______,
-  _______,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC,KC_TILD,_______, _______, _______, KC_AMPR,KC_END, KC_DOWN, KC_PGDN, KC_BSLS, _______,
-  _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______
- ),
- [_FUN] = LAYOUT_ortho_5x15( /* FUN */
-  _______,  RGB_RMOD,RGB_MOD, RGB_TOG, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, QK_BOOT,
-  _______,  RGB_HUD, RGB_HUI, RGB_MODE_PLAIN, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
-  _______,  RGB_SAD, RGB_SAI, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
-  _______,  RGB_VAD, RGB_VAI, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
-  _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______
- )
-};
-
-bool CTRLDOWN = false;
-bool WINDOWN = false;
-bool SHIFTDOWN = false;
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    switch (layer) {
-        case 0:
-            rgblight_setrgb(0,240, 255);
-            break;
-        case 1:
-            rgblight_setrgb(0,255, 100);
-            break;
-        case 2:
-            rgblight_setrgb(10,255, 0);
-            break;
-        case 3:
-            rgblight_setrgb(255,0, 85);
-            break;
-        case 4:
-            rgblight_setrgb(240,255, 0);
-            break;
-        default:
-            // none
-            break;
-    }
-    if ( SHIFTDOWN) {
-        rgblight_setrgb(255,255, 255);
-        }
-    if ( CTRLDOWN) {
-        rgblight_setrgb(240,255, 0);
-        }
-    if ( WINDOWN) {
-        rgblight_setrgb(255,255, 255);
-        }
-
-
-
-};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case KC_LGUI:
-      if (record->event.pressed) {
-        WINDOWN = true;
-        } else {
-        WINDOWN = false;
-      }
-      return true;
-    case LGUI_T(KC_ENT):
-      if (record->event.pressed) {
-        WINDOWN = true;
-        } else {
-        WINDOWN = false;
-      }
-      return true;
-    case CTL_T(KC_ESC):
-      if (record->event.pressed) {
-        CTRLDOWN = true;
-        } else {
-        CTRLDOWN = false;
-      }
-      return true;
-    case KC_LSFT:
-      if (record->event.pressed) {
-        SHIFTDOWN = true;
-        } else {
-        SHIFTDOWN = false;
-      }
-      return true;
-    case KC_RSFT:
-      if (record->event.pressed) {
-        SHIFTDOWN = true;
-        } else {
-        SHIFTDOWN = false;
-      }
-      return true;
-    default:
-      return true; // Process all other keycodes normally
-  }
-};
diff --git a/keyboards/xiudi/xd75/keymaps/kloki/readme.md b/keyboards/xiudi/xd75/keymaps/kloki/readme.md
deleted file mode 100644
index 1896b644565..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kloki/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Kloki's xd75 layout
-
--workman
--qwerty layer
--num layer
--overloaded modifier
--a lot of duplicated keys to make common shortcuts work
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/kloki/rules.mk b/keyboards/xiudi/xd75/keymaps/kloki/rules.mk
deleted file mode 100644
index 52a8f38d45f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/kloki/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/keyboards/xiudi/xd75/keymaps/markus/config.h b/keyboards/xiudi/xd75/keymaps/markus/config.h
deleted file mode 100644
index 15b0ac8e362..00000000000
--- a/keyboards/xiudi/xd75/keymaps/markus/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2022 Markus Weimar
- *
- * 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
-
-// place overrides here
-
-// Mouse keys (accelerated)
-//#define MOUSEKEY_MOVE_DELTA        1
-//#define MOUSEKEY_WHEEL_DELTA       1
-//#define MOUSEKEY_DELAY             90
-//#define MOUSEKEY_INTERVAL          16
-//#define MOUSEKEY_MAX_SPEED         20
-//#define MOUSEKEY_TIME_TO_MAX       0
-//#define MOUSEKEY_WHEEL_MAX_SPEED   1
-//#define MOUSEKEY_WHEEL_TIME_TO_MAX 0
-// Mouse keys (constant)
-#define MK_3_SPEED
-#define MK_MOMENTARY_ACCEL
-#define MK_C_OFFSET_UNMOD   12
-#define MK_C_INTERVAL_UNMOD 16
-#define MK_C_OFFSET_0       2
-#define MK_C_INTERVAL_0     16
-#define MK_C_OFFSET_1       4
-#define MK_C_INTERVAL_1     16
-#define MK_C_OFFSET_2       24
-#define MK_C_INTERVAL_2     16
-#define MK_W_OFFSET_UNMOD   1
-#define MK_W_INTERVAL_UNMOD 40
-#define MK_W_OFFSET_0       1
-#define MK_W_INTERVAL_0     360
-#define MK_W_OFFSET_1       1
-#define MK_W_INTERVAL_1     120
-#define MK_W_OFFSET_2       1
-#define MK_W_INTERVAL_2     20
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
diff --git a/keyboards/xiudi/xd75/keymaps/markus/keymap.c b/keyboards/xiudi/xd75/keymaps/markus/keymap.c
deleted file mode 100644
index 18052f5ef7a..00000000000
--- a/keyboards/xiudi/xd75/keymaps/markus/keymap.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Copyright 2022 Markus Weimar
- *
- * 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_german.h"
-
-#define ________ KC_TRNS
-#define ___xx___ KC_NO
-
-enum my_layers {
-    _QWZ,
-    _QWY,
-    _GAM,
-    _FN1,
-    _FN2,
-    _FN3,
-};
-
-enum my_keycodes {
-    QWERTZ = SAFE_RANGE,
-    QWERTY,
-    GAMING,
-    FN1,
-    FN2,
-    FN3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTZ
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | 1 !    | 2 "    | 3 §    | 4 $    | 5 %    | 6 &    | Vol-   | Mute   | Vol+   | 7 /    | 8 (    | 9 )    | 0 =    | ẞ ?    | Ü      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Esc    | Q      | W      | E      | R      | T      | Home   | Play   | End    | Z      | U      | I      | O      | P      | Ä      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | LShift | A      | S      | D      | F      | G      | Pg Up  | Up     | Pg Dn  | H      | J      | K      | L      | Ö      | RShift |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | LCtrl  | Y      | X      | C      | V      | B      | Left   | Down   | Right  | N      | M      | , ;    | . :    | - _    | RCtrl  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Caps   | Fn3    | LGUI   | LAlt   | Fn2    | Fn1    | Tab    | Del    | Enter  | Space  | Bksp   | RAlt   | LGUI   | Fn3    | Ins    |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_QWZ] = LAYOUT_ortho_5x15(
-DE_1,     DE_2,     DE_3,     DE_4,     DE_5,     DE_6,     KC_VOLD,  KC_MUTE,  KC_VOLU,  DE_7,     DE_8,     DE_9,     DE_0,     DE_SS,    DE_UDIA,
-KC_ESC,   DE_Q,     DE_W,     DE_E,     DE_R,     DE_T,     KC_HOME,  KC_MPLY,  KC_END,   DE_Z,     DE_U,     DE_I,     DE_O,     DE_P,     DE_ADIA,
-KC_LSFT,  DE_A,     DE_S,     DE_D,     DE_F,     DE_G,     KC_PGUP,  KC_UP,    KC_PGDN,  DE_H,     DE_J,     DE_K,     DE_L,     DE_ODIA,  KC_RSFT,
-KC_LCTL,  DE_Y,     DE_X,     DE_C,     DE_V,     DE_B,     KC_LEFT,  KC_DOWN,  KC_RIGHT, DE_N,     DE_M,     DE_COMM,  DE_DOT,   DE_MINS,  KC_RCTL,
-KC_CAPS,  MO(_FN3), KC_LGUI,  KC_LALT,  MO(_FN2), MO(_FN1), KC_TAB,   KC_DEL,   KC_ENT,   KC_SPC,   KC_BSPC,  KC_RALT,  KC_LGUI,  MO(_FN3), KC_INS
-),
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        | Y      |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | Z      |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_QWY] = LAYOUT_ortho_5x15(
-DE_1,     DE_2,     DE_3,     DE_4,     DE_5,     DE_6,     KC_VOLD,  KC_MUTE,  KC_VOLU,  DE_7,     DE_8,     DE_9,     DE_0,     DE_SS,    DE_UDIA,
-KC_ESC,   DE_Q,     DE_W,     DE_E,     DE_R,     DE_T,     KC_HOME,  KC_MPLY,  KC_END,   DE_Y,     DE_U,     DE_I,     DE_O,     DE_P,     DE_ADIA,
-KC_LSFT,  DE_A,     DE_S,     DE_D,     DE_F,     DE_G,     KC_PGUP,  KC_UP,    KC_PGDN,  DE_H,     DE_J,     DE_K,     DE_L,     DE_ODIA,  KC_RSFT,
-KC_LCTL,  DE_Z,     DE_X,     DE_C,     DE_V,     DE_B,     KC_LEFT,  KC_DOWN,  KC_RIGHT, DE_N,     DE_M,     DE_COMM,  DE_DOT,   DE_MINS,  KC_RCTL,
-KC_CAPS,  MO(_FN3), KC_LGUI,  KC_LALT,  MO(_FN2), MO(_FN1), KC_TAB,   KC_DEL,   KC_ENT,   KC_SPC,   KC_BSPC,  KC_RALT,  KC_LGUI,  MO(_FN3), KC_INS
-),
-
-/* GAMING
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        | Y      |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | Z      |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Fn2    |        |        |        | Space  |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_GAM] = LAYOUT_ortho_5x15(
-DE_1,     DE_2,     DE_3,     DE_4,     DE_5,     DE_6,     KC_VOLD,  KC_MUTE,  KC_VOLU,  DE_7,     DE_8,     DE_9,     DE_0,     DE_SS,    DE_UDIA,
-KC_ESC,   DE_Q,     DE_W,     DE_E,     DE_R,     DE_T,     KC_HOME,  KC_MPLY,  KC_END,   DE_Y,     DE_U,     DE_I,     DE_O,     DE_P,     DE_ADIA,
-KC_LSFT,  DE_A,     DE_S,     DE_D,     DE_F,     DE_G,     KC_PGUP,  KC_UP,    KC_PGDN,  DE_H,     DE_J,     DE_K,     DE_L,     DE_ODIA,  KC_RSFT,
-KC_LCTL,  DE_Z,     DE_X,     DE_C,     DE_V,     DE_B,     KC_LEFT,  KC_DOWN,  KC_RIGHT, DE_N,     DE_M,     DE_COMM,  DE_DOT,   DE_MINS,  KC_RCTL,
-MO(_FN2), MO(_FN3), KC_LGUI,  KC_LALT,  KC_SPC,   MO(_FN1), KC_TAB,   KC_DEL,   KC_ENT,   KC_SPC,   KC_BSPC,  KC_RALT,  KC_LGUI,  MO(_FN3), KC_INS
-),
-
-/* FN1
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F1     | F2     | F3     | F4     | F5     | F6     | Prev   | Play   | Next   | F7     | F8     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | @      | ~      | €      | ´      | `      | Rewind | Stop   | FastFW | \      | {      | }      | +      | *      | − MNS  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | "      | '      | ‚      | ‘      | ’      |        |        |        | |      | [      | ]      | !      | ?      |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | °      | ^      | „      | “      | ”      |        |        |        | #      | <      | >      | …      | – EN   |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_FN1] = LAYOUT_ortho_5x15(
-KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-________, DE_AT,    DE_TILD,  DE_EURO,  DE_ACUT,  DE_GRV,   KC_MRWD,  KC_MSTP,  KC_MFFD,  DE_BSLS,  DE_LCBR,  DE_RCBR,  DE_PLUS,  DE_ASTR,  UC(L'−'),
-________, DE_DQUO,  DE_QUOT,  UC(L'‚'), UC(L'‘'), UC(L'’'), ________, ________, ________, DE_PIPE,  DE_LBRC,  DE_RBRC,  DE_EXLM,  DE_QUES,  ________,
-________, DE_DEG,   DE_CIRC,  UC(L'„'), UC(L'“'), UC(L'”'), ________, ________, ________, DE_HASH,  DE_LABK,  DE_RABK,  UC(L'…'), UC(L'–'), ________,
-________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________
-),
-
-/* FN2
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        | %      | (      | )      | P/     | P*     | P-     | Print  | Scroll | Pause  | ẞ      | ±      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        | Vol-   | Mute   | Vol+   | Bspc   | P7     | P8     | P9     | P+     | WH_U   | MS_U   | WH_D   | ×      | ÷      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | App    | ACL2   | ACL1   | ACL0   | Space  | P4     | P5     | P6     | WH_L   | MS_L   | MS_D   | MS_R   | WH_R   |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        | Prev   | Play   | Next   | Tab    | P1     | P2     | P3     | PEnter | BTN1   | BTN2   | BTN3   | — EM   |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Fn2    |        |        |        |        | PEnter | P0     | . :    | P,     | BTN1   | BTN2   | BTN3   |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_FN2] = LAYOUT_ortho_5x15(
-___xx___, ___xx___, ___xx___, ___xx___, DE_PERC,  DE_LPRN,  DE_RPRN,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PSCR,  KC_LSCR,  KC_PAUS,  UC(L'ẞ'), UC(L'±'),
-________, ___xx___, KC_VOLD,  KC_MUTE,  KC_VOLU,  KC_BSPC,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_WH_U,  KC_MS_U,  KC_WH_D,  UC(L'×'), UC(L'÷'),
-________, KC_APP,   KC_ACL2,  KC_ACL1,  KC_ACL0,  KC_SPC,   KC_P4,    KC_P5,    KC_P6,    KC_WH_L,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_WH_R,  ________,
-________, ___xx___, KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_TAB,   KC_P1,    KC_P2,    KC_P3,    KC_PENT,  KC_BTN1,  KC_BTN2,  KC_BTN3,  UC(L'—'), ________,
-MO(_FN2), ________, ________, ________, ________, KC_PENT,  KC_P0,    DE_DOT,   KC_PDOT,  KC_BTN1,  KC_BTN2,  KC_BTN3,  ________, ________, ________
-),
-
-/* FN3
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F13    | F14    | F15    | F16    | F17    | F18    | Bri-   |        | Bri+   | F19    | F20    | F21    | F22    | F23    | F24    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | QWERTZ | U LNX  |        |        | Power  | L TOG  | L MP   | L MOD  |        | Pg Up  | Up     | Pg Dn  |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | QWERTY | U WIN  | ›      | ‹      | Sleep  | L HUI  | L SAI  | L VAI  | Home   | Left   | Down   | Right  | End    |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | GAMING | U MAC  | »      | «      | Wake   | L HUD  | L SAD  | L VAD  | NumSp  | ThinSp | NaNbSp | NbSp   | NbHyph |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        | Reset  |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_FN3] = LAYOUT_ortho_5x15(
-KC_F13,   KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18,   KC_BRID,  ___xx___, KC_BRIU,  KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,   KC_F24,
-________, QWERTZ,   UC_LINX,  ___xx___, ___xx___, KC_PWR,   RGB_TOG,  RGB_M_P,  RGB_MOD,  ___xx___, KC_PGUP,  KC_UP,    KC_PGDN,  ___xx___, ___xx___,
-________, QWERTY,   UC_WINC,  UC(L'›'), UC(L'‹'), KC_SLEP,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_END,   ________,
-________, GAMING,   UC_MAC,   UC(L'»'), UC(L'«'), KC_WAKE,  RGB_HUD,  RGB_SAD,  RGB_VAD,  UC(L' '), UC(L' '), UC(L' '), UC(L' '), UC(L'‑'), ________,
-________, ________, ________, ________, ________, ________, ________, QK_BOOT,  ________, ________, ________, ________, ________, ________, ________
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch(keycode) {
-        case QWERTZ:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWZ);
-            }
-            return false;
-            break;
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_QWY);
-            }
-            return false;
-            break;
-        case GAMING:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_GAM);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/markus/readme.md b/keyboards/xiudi/xd75/keymaps/markus/readme.md
deleted file mode 100644
index fc5959bcdc7..00000000000
--- a/keyboards/xiudi/xd75/keymaps/markus/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# XD75 keymap
-
-This keymap has three base layers (QWERTZ, QWERTY, Gaming) and three function layers (Fn1, Fn2, Fn3).
-
-QWERTY is identical to QWERTZ, except `z` and `y` are swapped.
-
-Gaming is a modified QWERTY layer for left-hand usage.
-
-The function layers contain:
-
-* Symbols
-* Unicode characters (e.g. dashes, figure space, non-breaking space and hyphen)
-* Unicode input mode switches
-* Numpad
-* Function keys
-* Media, mouse and LED controls
diff --git a/keyboards/xiudi/xd75/keymaps/markus/rules.mk b/keyboards/xiudi/xd75/keymaps/markus/rules.mk
deleted file mode 100644
index f2552d2fa81..00000000000
--- a/keyboards/xiudi/xd75/keymaps/markus/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = no
-MIDI_ENABLE = no
-AUDIO_ENABLE = no
-UNICODE_ENABLE = yes
-BLUETOOTH_ENABLE = no
-RGBLIGHT_ENABLE = yes
-SLEEP_LED_ENABLE = no
diff --git a/keyboards/xiudi/xd75/keymaps/minna/config.h b/keyboards/xiudi/xd75/keymaps/minna/config.h
deleted file mode 100644
index f8805edc36f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/minna/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2022 Minna Pallari (@pallarim)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// place overrides here
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/minna/keymap.c b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
deleted file mode 100644
index 535c870ff7b..00000000000
--- a/keyboards/xiudi/xd75/keymaps/minna/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2022 Minna Pallari (@pallarim)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keymap_finnish.h"
-
-enum unicode_names {
-    BEER,
-    BEERS
-};
-
-enum custom_keycodes {
-    QMKBEST = SAFE_RANGE,
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    [BEER]  = 0x1F37A,  // 🍺
-    [BEERS] = 0x1F37B   // 🍻
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-		switch(keycode) {
-			case QMKBEST:
-				SEND_STRING(SS_LGUI("r") SS_DELAY(500) "calc\n" SS_DELAY(1000) "1337");
-                break;
-		}
-	}
-	return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │ESC│ § | 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ + │ ´ │BS │
- * ├───|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
- * │TAB    | Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Å │ ¨ │   │
- * ├───|───|───|───|───|───|───|───|───|───|───|───|───|───|ENT|
- * │CPS    │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ö │ Ä │ ' │   │
- * ├───|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
- * │SFT│ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │SFT|UP |   │
- * ├───|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
- * │CTR│FN │WIN│ALT│BER│  SPC  │  SPC  │AGR│MNU│CTR│LF │DN │RG │
- * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
- */
-
-	[0] = LAYOUT_ortho_5x15(
-   KC_ESC, FI_SECT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, FI_PLUS, FI_ACUT, KC_BSPC,
-   KC_TAB, KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, FI_ARNG, FI_DIAE, KC_ENT, 
-   KC_CAPS, KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, FI_ODIA, FI_ADIA, FI_QUOT, KC_NO,
-   KC_LSFT, FI_LABK, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, FI_MINS, KC_RSFT, KC_UP, KC_NO,
-   KC_LCTL, MO(1), KC_LGUI, KC_LALT, UP(BEER, BEERS), KC_SPC, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-/*
- * ┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │Mute│CAL| F1│F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│DEL│
- * ├────|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
- * │MSel    |My │Ma │RGB│RGB│Cal│ 7 │ 8 │ 9 │ - │   │Prn│SL │ P │
- * │        |Cmp│il │HUD│HUI│   │   │   │   │   │   │Scr│CK │ a │
- * ├────|───|───|───|───|───|───|───|───|───|───|───|───|───| u |
- * │MPrev   │   │   │RGB│RGB│   │ 4 │ 5 │ 6 │ + │RST│   │   │ s │
- * │        │NXT│STP│SAD│SAI│PLY│   │   │   │   │   │   │   │ e │
- * ├────|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
- * │Vo- │Mte│Vo+│App│RGB│RGB│   │ 1 │ 2 │ 3 │ENT│   │   |   |   │
- * │    │   │   │   │VAD│VAI│   │ 1 │ 2 │ 3 │ENT│   │   |   |   │
- * ├────|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
- * │    │FN │RGB│   │RMR│RGB_MOD│ 0     │ . │ENT│ENT│FN │UCR│UCM│
- * └────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
- */
-
-	[1] = LAYOUT_ortho_5x15(
-    KC_MUTE, QMKBEST, 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_MSEL, KC_NO,   KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_CALC, KC_P7, KC_P8, KC_P9, KC_MINS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS,
-    KC_MPRV, KC_NO,   KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_MPLY, KC_P4, KC_P5, KC_P6, KC_PLUS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, MO(1),   RGB_TOG, KC_NO,   RGB_RMOD,RGB_MOD, KC_NO, KC_P0, KC_NO, KC_PDOT, KC_PENT, KC_PENT, MO(1), UC_PREV, UC_NEXT)
-};
-
diff --git a/keyboards/xiudi/xd75/keymaps/minna/readme.md b/keyboards/xiudi/xd75/keymaps/minna/readme.md
deleted file mode 100644
index 0291fd3a85a..00000000000
--- a/keyboards/xiudi/xd75/keymaps/minna/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# XD75 Fi/Sv board with some extras
-
-## Keymap
-
-### Base & Function Layer
-
-![Base layer](https://i.imgur.com/x8VFgYg.png)
-
-## Build
-
-To build the default keymap, simply run:
-
-    make xiudi/xd75/minna
diff --git a/keyboards/xiudi/xd75/keymaps/minna/rules.mk b/keyboards/xiudi/xd75/keymaps/minna/rules.mk
deleted file mode 100644
index 0517619ed13..00000000000
--- a/keyboards/xiudi/xd75/keymaps/minna/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-UNICODEMAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/msiu/config.h b/keyboards/xiudi/xd75/keymaps/msiu/config.h
deleted file mode 100644
index 4fbd59becc8..00000000000
--- a/keyboards/xiudi/xd75/keymaps/msiu/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/msiu/keymap.c b/keyboards/xiudi/xd75/keymaps/msiu/keymap.c
deleted file mode 100644
index 4c10e465990..00000000000
--- a/keyboards/xiudi/xd75/keymaps/msiu/keymap.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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/>.
- */
-
-/* What this layout is: QWERTY layout with the standard 40% layers. For easy
- * switching between my xd75 and contra
- */
-
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _QW 0
-#define _DV 1
-#define _LW 2
-#define _RS 3
-#define _FN 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | `      | 1      | 2      | 3      | 4      | 5      | -      | =      | \      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | TAB    | Q      | W      | E      | R      | T      | 7      | 8      | 9      | Y      | U      | I      | O      | P      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | ESC    | A      | S      | D      | F      | G      | 4      | 5      | 6      | H      | J      | K      | L      | ;      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | 1      | 2      | 3      | N      | M      | ,      | .      | /      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | HYPER  | LALT   | LGUI   | LOWER  | FN     | 0      |        | .      | SPACE  | RAISE  | LEFT   | DOWN   | UP     | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-  KC_GRV,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PLUS, KC_MINS, KC_ASTR, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_7,    KC_8,    KC_9   , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  LCTL_T(KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_4,    KC_5,    KC_6   , 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_1,    KC_2,    KC_3   , KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  KC_LCTL,         KC_HYPR, KC_LALT, KC_LGUI, MO(_LW), MO(_FN), KC_0,    _______, KC_DOT , KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
- ),
-
- /* Dvorak */
-
-  [_DV] = LAYOUT_ortho_5x15( /* Dvorak */
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-   _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    _______, _______, _______, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______,
-   _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    _______, _______, _______, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-   _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    _______, _______, _______, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______,
-   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-
-/* LOWERED
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     |        |        |        | F6     | F7     | F8     | F9     | F10    | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | ~      | !      | @      | #      | $      | %      |        | VOLU   |        | ^      | &      | *      | (      | )      | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     | PREV   | PLAY   | NEXT   | F6     | _      | +      | {      | }      | |      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    |        | VOLD   |        | F12    | PAGEDW | PAGEUP | HOME   | END    | MUTE   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        | MUTE   |        | PLAY   |        | PREV   | VOLD   | VOLU   | NEXT   |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, KC_VOLU, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_MPRV, KC_MPLY, KC_MNXT, KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, KC_VOLD, _______, KC_F12,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-  _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
- ),
-
-/* RAISED
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     |        |        |        | F6     | F7     | F8     | F9     | F10    | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | `      | 1      | 2      | 3      | 4      | 5      |        | VOLU   |        | 6      | 7      | 8      | 9      | 0      |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     | PREV   | PLAY   | NEXT   | F6     | -      | =      | [      | ]      | \      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    |        | VOLD   |        | F12    | PAGEUP | PAGEDW | HOME   | END    | MUTE   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        | MUTE   |        | PLAY   |        | PREV   | VOLD   | VOLU   | NEXT   |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_RS] = LAYOUT_ortho_5x15( /* RAISED */
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, KC_VOLU, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_MPRV, KC_MPLY, KC_MNXT, KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, KC_VOLD, _______, KC_F12,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
-  _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
- ),
-
-/* FUNCTION */
-
- [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, KC_PSCR, _______,
-  _______, _______, _______, TO(_DV), TO(_QW), _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- )
-};
-
-
diff --git a/keyboards/xiudi/xd75/keymaps/msiu/readme.md b/keyboards/xiudi/xd75/keymaps/msiu/readme.md
deleted file mode 100644
index f37eee41a33..00000000000
--- a/keyboards/xiudi/xd75/keymaps/msiu/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# msiu's keymap for xd75
-
-QWERTY keymap for xd75 with centered numpad and standard 40% layers for easy switching between xd75 and contra/planck.
diff --git a/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c b/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
deleted file mode 100644
index 2abcb3bfb00..00000000000
--- a/keyboards/xiudi/xd75/keymaps/neothefox/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define LOWER  MO(_LOWER)
-#define RAISE  MO(_RAISE)
-#define SYSTEM MO(_SYSTEM)
-#define MPASTE LSFT(KC_INSERT)
-
-enum xd75_layers {
- _QWERTY,
- _LOWER,
- _RAISE,
- _SYSTEM
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | INSERT | HOME   | PG UP  | H      | J      | K      | L      | ;      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | DEL    | END    | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | GUI    | MENU   | ALT    | LOWER  | SPACE  | SPACE  | SPACE  | SPACE  | SPACE  | RAISE  | LEFT   | DOWN   | UP     | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_QWERTY] = LAYOUT_ortho_5x15( /* QWERTY */
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_INS,  KC_HOME, KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_DEL,  KC_END,  KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_MENU, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-  ),
-
-/* SYSTEM
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |  Boot  | Debug  |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |RGB_TOG |RGB_VAI |RGB VAD |        |        | PASTE  | PR SCR | SCR LK | PAUSE  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |RGB_MOD |RGB_SAI |RGB_HUI |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |RGB_SAD |RGB_HUD |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_SYSTEM] = LAYOUT_ortho_5x15( /* FUNCTION */
-    QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, _______, _______, MPASTE,  KC_PSCR, KC_SCRL, KC_PAUSE,
-    _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-/* LOWER
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | ~      | !      | @      | #      | $      | %      |        |        |        | ^      | &      | *      | (      | )      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | DELETE | F1     | F2     | F3     | F4     | F5     |        |        |        | F6     | _      | +      | {      | }      | |      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    |        |        |        | F12    | ISO ~  | ISO |  | Home   | End    |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        | Next   | Vol-   | Vol+   | Play   |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_LOWER] = LAYOUT_ortho_5x15( /* LOWER */
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-    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_HOME,KC_END, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-
-/* RAISE
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | `      | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      | 0      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        | F1     | F2     | F3     | F4     | F5     |        |        |        | F6     | -      | =      | [      | ]      | \      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        | F7     | F8     | F9     | F10    | F11    |        |        |        | F12    | ISO #  | ISO /  | Pg Up  | Pg Dn  |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        | Next   | Vol-   | Vol+   | Play   |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_RAISE] = LAYOUT_ortho_5x15( /* QWERTY */
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_MINUS,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_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  )
-};
-
-// SYSTEM layer toggle
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _SYSTEM);
-}
-
diff --git a/keyboards/xiudi/xd75/keymaps/neothefox/readme.md b/keyboards/xiudi/xd75/keymaps/neothefox/readme.md
deleted file mode 100644
index 117ecafb799..00000000000
--- a/keyboards/xiudi/xd75/keymaps/neothefox/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# A OLKB-like layout for XD75
diff --git a/keyboards/xiudi/xd75/keymaps/odyssey/config.h b/keyboards/xiudi/xd75/keymaps/odyssey/config.h
deleted file mode 100644
index 63eee4ea1db..00000000000
--- a/keyboards/xiudi/xd75/keymaps/odyssey/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#define MK_3_SPEED 
-#define TAPPING_TERM 20
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_MAX_SPEED 4
-#define MOUSEKEY_TIME_TO_MAX 10
-#define MOUSEKEY_WHEEL_MAX_SPEED 4
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 10
-#define MK_C_OFFSET_0 4
-#define MK_C_INTERVAL_0 30
-#define MK_C_OFFSET_1 8
-#define MK_C_INTERVAL_1 20
-#define MK_C_OFFSET_2 16
-#define MK_C_INTERVAL_2 20
-#define MK_C_OFFSET_UNMOD 3
-#define MK_C_INTERVAL_UNMOD 25
diff --git a/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c b/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
deleted file mode 100644
index 61eb4a2dcf7..00000000000
--- a/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
+++ /dev/null
@@ -1,237 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _QW 0
-#define _CM 1
-#define _FN 2
-
-typedef enum {
-  NONE_NONE,
-  SINGLE_TAP,
-  SINGLE_HOLD,
-  DOUBLE_SINGLE_TAP
-} td_state_t;
-
-static td_state_t td_state = NONE_NONE;
-int cur_dance (tap_dance_state_t *state);
-void altlp_finished (tap_dance_state_t *state, void *user_data);
-void altlp_reset (tap_dance_state_t *state, void *user_data);
-
-// Four differend underglow states for 2 language layouts x 2 states of colemak layer
-enum layer_states {
-  S_ENGLISH,
-  S_COLEMAK,
-  S_CRUSSIAN,
-  S_QRUSSIAN
-} l_state = S_ENGLISH;
-
-// CLMK to toggle colemak (active only with english qwerty, saves intent in russian but does nothing untill switched back to english)
-// RNBW - rainbow underglow
-// PING - ping pong underglow
-// SP_UP/DW - underglow speed controls
-enum custom_keycodes {
-  STUB = SAFE_RANGE,
-  CLMK,
-  RNBW,
-  PING,
-  SP_UP,
-  SP_DW
-};
-
-// Escape if taped, FN layer mod if held
-enum tapdance_codes {
-  LESC
-};
-
-bool sstate = false;
-int rgb = 0;
-int speed = 300;
-
-void set_colors(int r, int g, int b) {
-  for(int i = 0; i<6; i++) {
-    sethsv(r, g, b, (rgb_led_t *)&led[i]);
-  }
-  rgblight_set();
-}
-
-void update_led_state_c(void) {
-  if (rgb>0) return;
-  if (td_state == SINGLE_HOLD) set_colors(HSV_BLUE);
-  else {
-    if (l_state == S_ENGLISH) set_colors(HSV_RED);
-    if (l_state == S_QRUSSIAN) set_colors(HSV_GREEN);
-    if (l_state == S_COLEMAK) set_colors(HSV_YELLOW);
-    if (l_state == S_CRUSSIAN) set_colors(85, 100, 100);
-  }
-}
-
-int cur_dance (tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted && state->pressed) { return SINGLE_HOLD; }
-    else if (!state->pressed) { return SINGLE_TAP; }
-    else { return SINGLE_HOLD; }
-  }
-  if (state->count == 2) { return DOUBLE_SINGLE_TAP; }
-  else { return 3; }
-}
-
-// Tapdance code stolen long time ago from one of the forum answers i found related to my problem, sadly can't provide link for the credits
-void lesc_finished (tap_dance_state_t *state, void *user_data) {
-  td_state = cur_dance(state);
-  switch (td_state) {
-    case SINGLE_TAP:
-      register_code16(KC_ESC);
-      break;
-    case SINGLE_HOLD:
-      layer_on(_FN);
-      update_led_state_c();
-      sstate = false;
-      break;
-    case DOUBLE_SINGLE_TAP:
-      break;
-    case NONE_NONE:
-      break;
-  }
-}
-
-void lesc_reset (tap_dance_state_t *state, void *user_data) {
-  switch (td_state) {
-    case SINGLE_TAP:
-      unregister_code16(KC_ESC);
-      break;
-    case SINGLE_HOLD:
-      layer_off(_FN);
-      if (sstate == false) {
-        register_code16(KC_ESC);
-        unregister_code16(KC_ESC);
-      }
-      break;
-    case DOUBLE_SINGLE_TAP:
-      break;
-    case NONE_NONE:
-      break;
-  }
-  td_state = NONE_NONE;
-  update_led_state_c();
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [LESC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lesc_finished, lesc_reset)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-KC_GRV,  KC_1,       KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, RNBW,    KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,      KC_BSPC,
-KC_TAB,  KC_Q,       KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_QUOT,
-KC_CAPS, KC_A,       KC_S,    KC_D,    KC_F,    KC_G,    CLMK,    KC_DEL,  SP_UP,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_ENT,
-KC_LSFT, KC_Z,       KC_X,    KC_C,    KC_V,    KC_B,    _______, KC_UP,   SP_DW,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT,
-KC_LCTL, LSFT(KC_9), KC_LALT, KC_LGUI, TD(LESC),KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT,  TD(LESC),KC_RGUI, KC_RALT, RSFT(KC_0),KC_RCTL
-  ),
-  [_CM] = LAYOUT_ortho_5x15( /* COLEMAK */
-_______, _______, _______, _______, _______, _______, _______, PING,    _______, _______, _______, _______, _______, _______, _______,
-_______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_Z,    _______, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_SLSH,
-_______, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    _______, _______, _______, KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    _______,
-_______, KC_X,    KC_V,    KC_C,    KC_D,    KC_B,    _______, _______, _______, KC_K,    KC_H,    KC_DOT,  KC_COMM, KC_QUOT, _______,
-_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_P7,   KC_P8,   KC_P9,  KC_F7,   KC_F8,   KC_F9,   KC_F10,        KC_F11,        KC_F12,
-QK_BOOT, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, KC_WH_U, KC_P4,   KC_P5,   KC_P6,  _______, _______, _______, RSFT(KC_MINS), LSFT(KC_MINS), _______,
-_______, KC_MS_L, KC_MS_D, KC_MS_R, KC_MINS, KC_WH_D, KC_P1,   KC_P2,   KC_P3,  _______, KC_PPLS, KC_ACL0, KC_ACL1,       KC_ACL2,       _______,
-_______, KC_ACL0, KC_ACL1, KC_ACL2, KC_WH_L, KC_WH_R, KC_NUM,  KC_PGUP, KC_P0,  _______, _______, _______, _______,       _______,       _______,
-RGB_TOG, _______, _______, _______, KC_BSPC, KC_BSPC, KC_HOME, KC_PGDN, KC_END, KC_BSPC, KC_BSPC, _______, _______,       _______,       _______
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if(keycode != TD(LESC))
-    sstate = true;
-  switch (keycode) {
-    case SP_UP:
-      if (speed>25)
-        speed -= 25;
-      break;
-    case SP_DW:
-      if (speed < 1000)
-        speed += 25;
-      break;
-    case RNBW:
-      if(record->event.pressed) {
-        rgb = rgb == 0 ? 1 : 0;
-        update_led_state_c();
-      }
-      break;
-    case PING:
-      if(record->event.pressed) {
-        rgb = rgb == 0 ? 2 : 0;
-        update_led_state_c();
-      }
-      break;
-    case CLMK:
-      if(record->event.pressed) {
-        if (l_state == S_COLEMAK) {
-          layer_off(_CM);
-          l_state = S_ENGLISH;
-        }
-        else if (l_state == S_ENGLISH) {
-          layer_on(_CM);
-          l_state = S_COLEMAK;
-        }
-        else if (l_state == S_CRUSSIAN) { l_state = S_QRUSSIAN; }
-        else if (l_state == S_QRUSSIAN) { l_state = S_CRUSSIAN; }
-      }
-      update_led_state_c();
-      break;
-    case KC_CAPS:
-      if(record->event.pressed) {
-        if (l_state == S_ENGLISH) l_state = S_QRUSSIAN;
-        else if (l_state == S_QRUSSIAN) l_state = S_ENGLISH;
-        else if (l_state == S_COLEMAK) {
-          layer_off(_CM);
-          l_state = S_CRUSSIAN;
-        }
-        else if (l_state == S_CRUSSIAN) {
-          layer_on(_CM);
-          l_state = S_COLEMAK;
-        }
-        update_led_state_c();
-      }
-      break;
-  }
-  return true;
-}
-
-// Rainbow globals
-int t = 0;
-int rc = 0;
-int col = 0;
-bool right = false;
-
-void matrix_scan_user(void) {
-  if (rgb==0) return; // Do nothing each tick right away if neither of animations enabled
-  if (rgb==1) {
-    if (rc == 0) {
-      rc = speed;
-      for(int i = 0; i<6; i++) {
-        sethsv(42*((t+i)%6), 255, 255, (rgb_led_t *)&led[i]);
-      }
-      rgblight_set();
-      t++; t = t % 6;
-    }
-  } else if (rgb==2) {
-    if (rc == 0) {
-      rc = speed;
-      col = (col + 1) % 36;
-      for (int i = 0; i<6; i++) {
-        if (i==t)
-          sethsv(42*(((col-1)/6)%6), 255, 255, (rgb_led_t *)&led[(right ? t : 5-t)]);
-        else
-          sethsv(0, 0, 0, (rgb_led_t *)&led[right ? i : 5-i]);
-      }
-      rgblight_set();
-      t++; t = t % 6;
-      if (t == 0) right = !right;
-    }
-  }
-  rc--;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/odyssey/readme.md b/keyboards/xiudi/xd75/keymaps/odyssey/readme.md
deleted file mode 100644
index 668c2bf23d9..00000000000
--- a/keyboards/xiudi/xd75/keymaps/odyssey/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Personal keymap of flutterlice
-Called Odyssey because it took me what feels like ten year to come up with perfect keymap that satisfied all my needs.
diff --git a/keyboards/xiudi/xd75/keymaps/odyssey/rules.mk b/keyboards/xiudi/xd75/keymaps/odyssey/rules.mk
deleted file mode 100644
index 5d80f200412..00000000000
--- a/keyboards/xiudi/xd75/keymaps/odyssey/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TAP_DANCE_ENABLE=yes
-MOUSEKEY_ENABLE=yes
-COMMAND_ENABLE=no
diff --git a/keyboards/xiudi/xd75/keymaps/pitty/config.h b/keyboards/xiudi/xd75/keymaps/pitty/config.h
deleted file mode 100644
index e6975da8a20..00000000000
--- a/keyboards/xiudi/xd75/keymaps/pitty/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/pitty/keymap.c b/keyboards/xiudi/xd75/keymaps/pitty/keymap.c
deleted file mode 100644
index 016da730d77..00000000000
--- a/keyboards/xiudi/xd75/keymaps/pitty/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * 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_hungarian.h" 
-
-enum XD75_layers {
-  _QWERTY,
-  _GAME,
-  _LOWER,
-  _RAISE
-};
-
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  GAME,
-  LOWER,
-  RAISE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-/* Qwerty
- * ,--------------------------------------------------------------------------------------------------------.
- * |  0   |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   Ö  |  Ü   |  Ó   |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | TAB  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  |  Ő   |  Ú   |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   É  |  Á   |  Ű   |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------|
- * | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   -  | Shift|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  ALt |Lower |    Space    | Enter| Bksp |AltGr | Raise|      |      |      |      |      |
- * `--------------------------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_5x15(
-  HU_0,                  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    HU_ODIA,  HU_UDIA, HU_OACU, KC_INS,  KC_PGUP,
-  KC_TAB,                KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    HU_Z,    KC_U,    KC_I,    KC_O,    KC_P,     HU_ODAC, HU_UACU, KC_DEL,  KC_PGDN,
-  KC_ESC,                KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    HU_EACU,  HU_AACU, HU_UDAC,  _______, KC_HOME,
-  MT(MOD_LSFT, KC_NUBS), HU_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    HU_COMM, HU_DOT,  HU_MINS,  KC_RSFT, HU_EQL,  KC_UP,   KC_END,
-  KC_LCTL,               KC_LGUI, KC_LALT, TT(_LOWER),   KC_SPC,  _______, KC_ENT,  KC_BSPC, KC_RALT, TT(_RAISE),   _______,  _______, KC_LEFT, KC_DOWN, KC_RIGHT
-),
-
-
-/* Game
- * ,--------------------------------------------------------------------------------------------------------.
- * |  0   |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   Ö  |  Ü   |  Ó   |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | TAB  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  |  Ő   |  Ú   |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   É  |  Á   |  Ű   |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------|
- * | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   -  | Shift|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI |  ALt |Raise |    Space    | Enter| Bksp |AltGr | Lower|      |      |      |      |      |
- * `--------------------------------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT_ortho_5x15(
-  HU_0,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    HU_ODIA,  HU_UDIA,  HU_OACU, KC_INS,  KC_PGUP,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    HU_Z,    KC_U,    KC_I,    KC_O,    KC_P,     HU_ODAC,  HU_UACU, KC_DEL,  KC_PGDN,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    HU_EACU,  HU_AACU,  HU_UDAC,  _______, KC_HOME,
-  KC_LSFT, HU_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    HU_COMM, HU_DOT,  HU_MINS,  KC_RSFT,  HU_EQL,  KC_UP,   KC_END,
-  KC_LCTL, KC_LGUI, KC_LALT, TT(_RAISE),   KC_SPC,  _______, KC_ENT,  KC_BSPC, KC_RALT, TT(_LOWER),   _______,  _______,  KC_LEFT, KC_DOWN, KC_RIGHT
-),
-
-
-/* Lower
- * ,--------------------------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |   7  |   8  |   9  |   +  |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |  Up  |      |      |      |      |   4  |   5  |   6  |   -  |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------|
- * |      | Left | Down | Right|      |      |      |   1  |   2  |   3  |   *  |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------|
- * |      |      |      |Lnxcpy|Lnxpst|      |      |   0  |      |      |   /  |  =   |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |PageDn|PageUp|  End |      |      |      |
- * `--------------------------------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_5x15(
-  _______, _______, _______, _______, _______, _______, _______, HU_7,    HU_8,    HU_9,    HU_PLUS,   _______,     _______, _______, _______,
-  _______, _______, KC_UP,   _______, _______, _______, _______, HU_4,    HU_5,    HU_6,    HU_MINS,   _______,     _______, _______, _______,
-  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, HU_1,    HU_2,    HU_3,    HU_ASTR,   _______,     _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, HU_0,    _______, _______, HU_SLSH,   HU_EQL,      _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_GAME), TO(_QWERTY), _______, _______, _______
-),
-
-/* Raise
- * ,--------------------------------------------------------------------------------------------------------.
- * |  F12 |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |  Up  |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------|
- * |      | Left | Down | Right|      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Home |PageDn|PageUp|  End |      |      |      |
- * `--------------------------------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_5x15(
-  _______, 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_UP,   _______, _______, _______, _______, _______, _______, _______, _______,   _______,     _______, _______, _______,
-  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,   _______,     _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,     _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(_GAME), TO(_QWERTY), _______, _______, _______
-),
-
-
-
-};
-
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _RAISE:
-        rgblight_setrgb (0xC3,  0xFF, 0xFF);
-		rgblight_mode(5);
-        break;
-    case _LOWER:
-        rgblight_setrgb (0xFF, 0xFF, 0xFF);
-		rgblight_mode(5);
-        break;
-    case _GAME:
-        rgblight_mode(8);
-        break;
-    default: //  for any other layers, or the default layer
-        rgblight_mode(14);
-        break;
-    }
-  return state;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/pitty/readme.md b/keyboards/xiudi/xd75/keymaps/pitty/readme.md
deleted file mode 100644
index b0cc4299786..00000000000
--- a/keyboards/xiudi/xd75/keymaps/pitty/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-My keymap for the XD75
-
-Including Hungarian characters and layer reactive underglow.
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/pitty/rules.mk b/keyboards/xiudi/xd75/keymaps/pitty/rules.mk
deleted file mode 100644
index 52a8f38d45f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/pitty/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c b/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
deleted file mode 100644
index 8c57995f2f0..00000000000
--- a/keyboards/xiudi/xd75/keymaps/raoeus/keymap.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Copyright 2017 WunderaaaaaAa
- * Modified by RAOEUS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-void matrix_init_user(void) {
-    steno_set_mode(STENO_MODE_GEMINI);
-}
-
-enum layer_names { _QWERTY, _LOWER, _RAISE, _BOTH, _STENO };
-
-enum keycodes { QWERTY = SAFE_RANGE, LOWER, RAISE, STENO, EXT_STN };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* QWERTY
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | Bksp   | NUM    | /      | *      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | Del    | 7      | 8      | 9      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-     * | Esc    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | "      | 4      | 5      | 6      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-     * | LShift | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | Enter  | 1      | 2      | 3      |
-     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-     * | LCtl   | LAlt   | LGUI   | Steno  | Lower  | Space  | Space  | Raise  | Left   | Down   | Up     | Right  | 0      | .      | Enter  |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-    [_QWERTY] = LAYOUT_ortho_5x15(
-	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_NUM, KC_PSLS, KC_PAST, 
-	KC_TAB,   KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_DEL,  KC_P7,  KC_P8,   KC_P9, 
-	KC_ESC,   KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_P4,  KC_P5,   KC_P6, 
-	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_P1,  KC_P2,   KC_P3, 
-	KC_LCTL,  KC_LALT, KC_LGUI, STENO, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_P0,  KC_PDOT, KC_PENT),
-
-    /* STENO
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | #      | #      | #      | #      | #      | #      | #      | #      | #      | #      | #      | #      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * | FN     | S      | T      | P      | H      | *      | *      | F      | P      | L      | T      | D      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-     * |        | S      | K      | W      | R      | *      | *      | R      | B      | G      | S      | Z      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-     * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-     * | EXIT   |        |        | #      | A      | O      | E      | U      | #      | PWR    | RES1   | RES2   |        |        |        |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-    [_STENO] = LAYOUT_ortho_5x15(
-	STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC,  XXXXXXX, XXXXXXX, XXXXXXX, 
-	STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,  XXXXXXX, XXXXXXX, XXXXXXX, 
-	XXXXXXX, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR,  XXXXXXX, XXXXXXX, XXXXXXX, 
-	XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-	EXT_STN, XXXXXXX, XXXXXXX, STN_N1,  STN_A,   STN_O,   STN_E,   STN_U,   STN_N2,  STN_PWR, STN_RE1, STN_RE2, XXXXXXX, XXXXXXX, XXXXXXX),
-
-    /* LOWER
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | ~      | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      | Bksp   |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | ~      | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      | Del    |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | CAPS   | F1     | F2     | F3     | F4     | F5     | F6     | _      | +      | {      | }      | |      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        | F7     | F8     | F9     | F10    | F11    | F12    | ISO ~  | ISO |  | Home   | End    |        |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        |        |        |        | Next   | Vol-   | Vol+   | Play   |        |        |        |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_ortho_5x15(
-	KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC, _______, _______, _______, 
-	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_CAPS, 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_HOME, KC_END,  _______, _______, _______, _______, 
-	_______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______),
-
-    /* RAISE
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | Bksp   |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | Del    |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | CAPS   | F1     | F2     | F3     | F4     | F5     | F6     | -      | =      | [      | ]      | \      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        | F7     | F8     | F9     | F10    | F11    | F12    | ISO #  | ISO /  | Pg Up  | Pg Dn  |        |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        |        |        |        | Next   | Vol-   | Vol+   | Play   |        |        |        |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_ortho_5x15(
-	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_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  _______, _______, _______, 
-	KC_CAPS, 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_PGUP, KC_PGDN, _______, _______, _______, _______, 
-	_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______),
-
-    /* BOTH (LOWER + RAISE)
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        | Reset  | Debug  |        |        |        |        |        |        |        |        | Del    |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        | AGNorm | AGSwap | QWERTY | STENO  |        |        | PLAIN  |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | RGB+   |        |        |        |        |        |        | RGBTOG | HUE+   | SAT+   | BRITE+ | SPEED+ |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | RGB-   |        |        |        |        |        |        |        | HUE-   | SAT-   | BRITE- | SPEED- |        |        |        |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-    [_BOTH] = LAYOUT_ortho_5x15(
-	KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, 
-	_______,  QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  _______, _______, _______, 
-	_______,  _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY,  STENO,   _______, _______, RGB_M_P, _______, _______, _______, 
-	RGB_MOD,  _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, 
-	RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                layer_move(_QWERTY);
-            };
-            return false;
-            break;
-        case STENO:
-            if (record->event.pressed) {
-                layer_move(_STENO);
-            }
-            return false;
-            break;
-        case EXT_STN:
-            if (record->event.pressed) {
-                layer_off(_STENO);
-            }
-            return false;
-            break;
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _BOTH);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _BOTH);
-            }
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _BOTH);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _BOTH);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/raoeus/readme.md b/keyboards/xiudi/xd75/keymaps/raoeus/readme.md
deleted file mode 100644
index fdb1095881b..00000000000
--- a/keyboards/xiudi/xd75/keymaps/raoeus/readme.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# RAOEUS Layout for the XD75
-
-This layout is based on the Preonic layout, but with an additional numpad on the right. I have also added a stenography layer for use with Plover.
-
-To compile this XD75 keymapping, please run `make xiudi/xd75:raoeus`
-
-To compile _and_ flash, please run `make xiudi/xd75:raoeus:flash`
-
-    /* QWERTY
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | Bksp   | NUM    | /      | *      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | Del    | 7      | 8      | 9      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-     * | Esc    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | "      | 4      | 5      | 6      |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-     * | LShift | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | Enter  | 1      | 2      | 3      |
-     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-     * | LCtl   | LAlt   | LGUI   | Steno  | Lower  | Space  | Space  | Raise  | Left   | Down   | Up     | Right  | 0      | .      | Enter  |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-    
-    /* STENO
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | #      | #      | #      | #      | #      | #      | #      | #      | #      | #      | #      | #      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-     * | FN     | S      | T      | P      | H      | *      | *      | F      | P      | L      | T      | D      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-     * |        | S      | K      | W      | R      | *      | *      | R      | B      | G      | S      | Z      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-     * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-     * | EXIT   |        |        | #      | A      | O      | E      | U      | #      | PWR    | RES1   | RES2   |        |        |        |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-
-    /* LOWER
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | ~      | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      | Bksp   |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | ~      | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      | Del    |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | CAPS   | F1     | F2     | F3     | F4     | F5     | F6     | _      | +      | {      | }      | |      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        | F7     | F8     | F9     | F10    | F11    | F12    | ISO ~  | ISO |  | Home   | End    |        |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        |        |        |        | Next   | Vol-   | Vol+   | Play   |        |        |        |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-
-    /* RAISE
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | Bksp   |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | `      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | Del    |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | CAPS   | F1     | F2     | F3     | F4     | F5     | F6     | -      | =      | [      | ]      | \      |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        | F7     | F8     | F9     | F10    | F11    | F12    | ISO #  | ISO /  | Pg Up  | Pg Dn  |        |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        |        |        |        | Next   | Vol-   | Vol+   | Play   |        |        |        |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
-
-    /* BOTH (LOWER + RAISE)
-     * .--------------------------------------------------------------------------------------------------------------------------------------.
-     * | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        | Reset  | Debug  |        |        |        |        |        |        |        |        | Del    |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        | AGNorm | AGSwap | QWERTY | STENO  |        |        | PLAIN  |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | RGB+   |        |        |        |        |        |        | RGBTOG | HUE+   | SAT+   | BRITE+ | SPEED+ |        |        |        |
-     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     * | RGB-   |        |        |        |        |        |        |        | HUE-   | SAT-   | BRITE- | SPEED- |        |        |        |
-     * '--------------------------------------------------------------------------------------------------------------------------------------'
-     */
diff --git a/keyboards/xiudi/xd75/keymaps/raoeus/rules.mk b/keyboards/xiudi/xd75/keymaps/raoeus/rules.mk
deleted file mode 100644
index 0694ab5b65f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/raoeus/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = no        # Mouse keys
-STENO_ENABLE = yes          # Additional protocols for Stenography requires VIRTSER
-AUTO_SHIFT_ENABLE = yes	    # When you hold down a character in QWERTY, shift is automatically applied
diff --git a/keyboards/xiudi/xd75/keymaps/revok75/config.h b/keyboards/xiudi/xd75/keymaps/revok75/config.h
deleted file mode 100644
index a5484876ef4..00000000000
--- a/keyboards/xiudi/xd75/keymaps/revok75/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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
-
-// place overrides here
-#undef BACKLIGHT_BREATHING
diff --git a/keyboards/xiudi/xd75/keymaps/revok75/keymap.c b/keyboards/xiudi/xd75/keymaps/revok75/keymap.c
deleted file mode 100644
index 5799ea5aafe..00000000000
--- a/keyboards/xiudi/xd75/keymaps/revok75/keymap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-#define _QW_M 0
-#define _QW_W 1
-#define _FN 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY-Mac
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | %      | 6     | 7      | 8      | 9      | 0      | -       | =    | Cut    | BACKSP   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y     | U      | I      | O      | P      | {      | }     | Copy   | Paste    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | H     | J      | K      | L      | ;      | '      | ENTER  | ENTER | REF      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | N     | M      | ,      | .      | /      | \      | RSHIFT| UP     | SAVE     |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |  LALT   | LGUI   | LALT	|	FIND	| CMD T   | SPACE  | SPACE | ALFRED | FN-MO  | RALT   | RGUI   | RCTRL  | LEFT  | DOWN   | RIGHT    |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- 	[_QW_M] = LAYOUT_ortho_5x15( /* QWERTY MAC*/
-  	QK_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,     LGUI(KC_X),  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_LCBR,    KC_RCBR,    LGUI(KC_C),  LGUI(KC_V),
-  	KC_CAPS,  KC_A,     KC_S,     KC_D,     	KC_F,     	KC_G, 	KC_H,   KC_J,   				KC_K,     KC_L,     KC_SCLN,  KC_QUOT,    LGUI(KC_R), KC_NO,       KC_ENT,
-  	KC_LSFT,  KC_Z,     KC_X,     KC_C,     	KC_V,     	KC_B, 	KC_N,   KC_M,   				KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS,    KC_RSFT,    KC_UP,       LGUI(KC_S),
-  	KC_LCTL,  KC_LALT,  KC_LGUI,	LGUI(KC_F), LGUI(KC_T), KC_SPC, KC_NO, 	LALT(KC_SPACE),	MO(_FN), 	KC_RGUI,  KC_RALT,  KC_RCTL,    KC_LEFT,    KC_DOWN,     KC_RGHT
-	),
-
- /* QWERTY-Win
-  * .--------------------------------------------------------------------------------------------------------------------------------------.
-  * | ESC    | 1      | 2      | 3      | 4      | %      | 6     | 7      | 8      | 9      | 0      | -       | =    | Cut    | BACKSP   |
-  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-  * | TAB    | Q      | W      | E      | R      | T      | Y     | U      | I      | O      | P      | {      | }     | Copy   | Paste    |
-  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-  * | CAP LK | A      | S      | D      | F      | G      | H     | J      | K      | L      | ;      | '      | ENTER  | ENTER | REF      |
-  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-  * | LSHIFT | Z      | X      | C      | V      | B      | N     | M      | ,      | .      | /      | \      | RSHIFT | UP    | SAVE     |
-  * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-  * | LALT   | LGUI   | LALT   |  FIND  | CMD T	 | SPACE | SPACE  | START  | FN-MO  | RALT   | RGUI   | RCTRL  | LEFT  | DOWN   | RIGHT    |
-  * '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-
-  [_QW_W] =  LAYOUT_ortho_5x15( /* QWERTY WIN*/
-  	QK_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,     LCTL(KC_X),  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_LCBR,     KC_RCBR,    LCTL(KC_C),  LCTL(KC_V),
-  	KC_CAPS,  KC_A,     KC_S,     KC_D,     		KC_F,     	KC_G, 	KC_H,   KC_J,   				KC_K,     KC_L,     KC_SCLN,  KC_QUOT,     LCTL(KC_R), KC_NO,       KC_ENT,
-  	KC_LSFT,  KC_Z,     KC_X,     KC_C,     		KC_V,     	KC_B, 	KC_N,   KC_M,   				KC_COMM,  KC_DOT,   KC_SLSH,  KC_BSLS,     KC_RSFT,    KC_UP,       LCTL(KC_S),
-  	KC_LCTL,  KC_LALT,  KC_LGUI,  LCTL(KC_F), 	LCTL(KC_T), KC_SPC, KC_NO,	LCTL(QK_GESC),	MO(_FN), 	KC_RGUI,  KC_RALT,  KC_RCTL,     KC_LEFT,    KC_DOWN,     KC_RGHT
- 	),
-
-/* FUNCTION
-* .--------------------------------------------------------------------------------------------------------------------------------------.
-* | ESC    | F1     | F2     | F3     | F4     | F5     | F6    | F7     | F8     | F9     | F10    | VOLDN   | VOLUP  | MUTE   | DEL    |
-* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
-* | TAB    | -      | WIN    | -      | -      | RGB_TOG| -     | -      | OPTION  | QK_BOOT  | -     | [       | ]      | -      | -      |
-* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
-* | CAP LK | MAC    | RAINBOW| PLAIN  | -      | -      | -     | -      | -      | -      | ;      | '       | ENTER  |  ENTER | REF    |
-* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
-* | LSHIFT | INC    | DEC    | HUE I  | HUE D  | SAT I  | SAT D | -      | -      | .      | /      | \       | RSHIFT|  HOME   | SAVE   |
-* |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
-* | LALT   | LGUI   | LALT   |  FIND  | CMD T	 | SPACE | SPACE  | ALFRED | FN-MO  | RALT   | RGUI   |  RCTRL  | PGUP   | END    | PGDN   |
-* '--------------------------------------------------------------------------------------------------------------------------------------'
-*/
-
-	[_FN] = LAYOUT_ortho_5x15( /* OSLAYOUT + NUMPAD + MEDIA + LIGHTING */
-   	KC_TRNS, KC_F1,     KC_F2,						 KC_F3,    		   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_VOLD, KC_VOLU, KC_MUTE, KC_DEL,
-  	KC_TRNS, KC_NO,     DF(_QW_W),    		 KC_NO,    		   KC_NO,   RGB_TOG, KC_NO,   KC_NO,   KC_RALT, QK_BOOT, KC_NO,   KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS,
-  	KC_TRNS, DF(_QW_M), RGB_MODE_RAINBOW,  RGB_MODE_PLAIN, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  	KC_TRNS, RGB_VAI,   RGB_VAD,  				 RGB_HUI,  		   RGB_HUD, RGB_SAI, RGB_SAD, KC_NO,   KC_NO,   KC_DOT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS,
-  	KC_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_END,	 KC_PGDN
-	)
-};
diff --git a/keyboards/xiudi/xd75/keymaps/revok75/readme.md b/keyboards/xiudi/xd75/keymaps/revok75/readme.md
deleted file mode 100644
index ecec8c96292..00000000000
--- a/keyboards/xiudi/xd75/keymaps/revok75/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for Revok 75
diff --git a/keyboards/xiudi/xd75/keymaps/revok75/rules.mk b/keyboards/xiudi/xd75/keymaps/revok75/rules.mk
deleted file mode 100644
index a9aedf5920d..00000000000
--- a/keyboards/xiudi/xd75/keymaps/revok75/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/config.h b/keyboards/xiudi/xd75/keymaps/scheiklb/config.h
deleted file mode 100644
index ea9ca7a9501..00000000000
--- a/keyboards/xiudi/xd75/keymaps/scheiklb/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#define DE_PASTE LCTL(KC_V) // CTRL+V
-#define DE_COPY LCTL(KC_C) // CTRL+C
-#define DE_CUT LCTL(KC_X) // CTRL+X
-#define DE_UNDO LCTL(DE_Z) // CTRL+Z
-
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
deleted file mode 100644
index d54699ada48..00000000000
--- a/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#include "keymap_german.h"
-
-// Layer shorthand
-#define _QWZ 0
-#define _FNC 1
-#define _AGR 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-	[_QWZ] = {
-	{ KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,     DE_CIRC, DE_UNDO,  KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    DE_SS,   DE_ACUT},
-	{ KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,     DE_COPY, DE_PASTE, DE_Z,   KC_U,   KC_I,    KC_O,    KC_P,    DE_UDIA, DE_PLUS},
-	{ KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,     KC_G,     KC_DEL,  KC_BSPC,  KC_H,   KC_J,   KC_K,    KC_L,    DE_ODIA, DE_ADIA, DE_HASH},
-    { KC_LSFT, DE_Y,    KC_X,    KC_C,    KC_V,     KC_B,     KC_DOWN, KC_UP,    KC_N,   KC_M,   KC_COMM, KC_DOT,  DE_MINS, KC_TRNS, KC_RSFT},
-    { KC_LCTL, DE_LABK, KC_HOME, KC_LALT, KC_ENTER, KC_ENTER, KC_LEFT, KC_RIGHT, KC_SPC, KC_SPC, MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, MO(1) },
-    },
-
-	[_FNC] = {
-	{ QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_TRNS, KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12},
-	{ KC_TAB,  DE_AT,   KC_TRNS, DE_EURO, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_TILD },
-	{ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
-	{ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT },
-	{ KC_LCTL, DE_PIPE, KC_HOME, KC_LALT, KC_ENTER, KC_ENTER, KC_LEFT, KC_RIGHT, KC_SPC, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
-	},
-
-    [_AGR] = {
-
-    { KC_ESC,  KC_TRNS, DE_SUP2, DE_SUP3, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, DE_LCBR, DE_LBRC, DE_RBRC, DE_RCBR, DE_BSLS, KC_TRNS},
-	{ KC_TAB,  DE_AT,   KC_TRNS, DE_EURO, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_TILD },
-	{ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
-	{ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT },
-	{ KC_LCTL, DE_PIPE, KC_HOME, KC_LALT, KC_ENTER, KC_ENTER, KC_LEFT, KC_RIGHT, KC_SPC, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
-	},
-
-};
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk b/keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk
deleted file mode 100644
index 52ea43a828b..00000000000
--- a/keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021 Paul Maria Scheikl (@ScheiklP)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no       # Enable Tap Dancing
diff --git a/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c b/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
deleted file mode 100644
index 1301f89565f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/skewwhiffy/keymap.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Copyright 2017 Kenny Hung
- *
- * 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_uk.h"
-
-// Layer shorthand
-enum Layers {
-  cm, // colemak
-  dv, // dvorak
-  qw, // qwerty
-  nbl, // numbers left
-  nbr, // numbers right
-  syl, // symbols left
-  syr, // symbols right
-  nal, // navigation left
-  nar // navigation right
-};
-
-// Layer buttons
-#define _Z_SFT SFT_T(UK_Z)
-#define _SCLSH SFT_T(UK_SCLN)
-#define _SLSH SFT_T(UK_SLSH)
-
-#define _X_NB LT(nbl, UK_X)
-#define _Q_NB LT(nbl, UK_Q)
-#define _DOT_NB LT(nbr, UK_DOT)
-#define _V_NB LT(nbr, UK_V)
-#define __NBL LT(nbl, _______)
-#define __NBR LT(nbr, _______)
-
-#define _C_SY LT(syl, UK_C)
-#define _J_SY LT(syl, UK_J)
-#define _W_SY LT(syr, UK_W)
-#define _COM_SY LT(syr, UK_COMM)
-#define __SYL LT(syl, _______)
-#define __SYR LT(syr, _______)
-
-#define _V_NAL LT(nal, UK_V)
-#define _K_NAL LT(nal, UK_K)
-#define _M_NAR LT(nar, UK_M)
-#define __NAL LT(nal, _______)
-#define __NAR LT(nar, _______)
-
-// Custom hotkeys
-#define _TERM LCTL(UK_QUOT) // Hotkey for terminal
-#define _S_TAB S(KC_TAB)
-#define _C_LEFT LCTL(KC_LEFT)
-#define _C_RGHT LCTL(KC_RGHT)
-#define _A_LEFT LALT(KC_LEFT)
-#define _A_RGHT LALT(KC_RGHT)
-
-enum custom_keycodes {
-  IJ_OMN = SAFE_RANGE // IntelliJ Omnibox
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | Q      | W      | F      | P      | G      |        |        |        |        |        | J      | L      | U      | Y      | ;      |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | A      | R      | S      | T      | D      |        |        |        |        |        | H      | N      | E      | I      | O      |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | Z      | X      | C      | V      | B      |        |        | UP     |        |        | K      | M      | ,      | .      | /      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |        |        |        |        |        |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | LSHIFT | LCTRL  | LALT   | LGUI   | SPACE  | ENT    | LEFT   | DOWN   | RIGHT  | DEL    | BKSPC  | RGUI   | RALT   | RCTRL  | RSHIFT |
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- */
-  [cm] = LAYOUT_ortho_5x15(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    UK_Q,    UK_W,    UK_F,    UK_P,    UK_G,    _______, _______, _______, _______, _______, UK_J,    UK_L,    UK_U,    UK_Y,    UK_SCLN,
-    UK_A,    UK_R,    UK_S,    UK_T,    UK_D,    _______, _______, _______, _______, _______, UK_H,    UK_N,    UK_E,    UK_I,    UK_O   ,
-    _Z_SFT,  _X_NB,   _C_SY,   _V_NAL,  UK_B,    _______, _______, KC_UP,   _______, _______, UK_K,    _M_NAR,  _COM_SY, _DOT_NB, _SLSH  ,
-    KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  KC_ENT,  KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  KC_BSPC, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT
-  ),
-
-/* Dvorak
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | '      | ,      | .      | P      | Y      |        |        |        |        |        | F      | G      | C      | R      | L      |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | A      | O      | E      | U      | I      |        |        |        |        |        | D      | H      | T      | N      | S      |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | ;      | Q      | J      | K      | X      |        |        |        |        |        | B      | M      | W      | V      | Z      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |        |        |        |        |        |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- */
-  [dv] = LAYOUT_ortho_5x15(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    UK_QUOT, UK_COMM, UK_DOT,  UK_P,    UK_Y,    _______, _______, _______, _______, _______, UK_F,    UK_G,    UK_C,    UK_R,    UK_L   ,
-    UK_A,    UK_O,    UK_E,    UK_U,    UK_I,    _______, _______, _______, _______, _______, UK_D,    UK_H,    UK_T,    UK_N,    UK_S   ,
-    _SCLSH,  _Q_NB,   _J_SY,   _K_NAL,  UK_X,    _______, _______, _______, _______, _______, UK_B,    _M_NAR,  _W_SY,   _V_NB,   _Z_SFT ,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-/* QWERTY _QW
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | Q      | W      | E      | R      | T      |        |        |        |        |        | Y      | U      | I      | O      | P      |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | A      | S      | D      | F      | G      |        |        |        |        |        | H      | J      | K      | L      | ;      |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | Z      | X      | C      | V      | B      |        |        |        |        |        | N      | M      | ,      | .      | /      |
- * | SHIFT  | NUMBER | SYMBOL | NAV    |        |        |        |        |        |        |        | NAV    | SYMBOL | FUNC   | SHIFT  |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------------------------------------------------------------------------------------------------------------------------------------|
- * | LSHIFT | LCTRL  | LALT   | LGUI   | SPACE  | ENT    |        |        |        | DEL    | BKSPC  | RGUI   | RALT   | RCTRL  | RSHIFT |
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- */
-  [qw] = LAYOUT_ortho_5x15(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    UK_Q,    UK_W,    UK_E,    UK_R,    UK_T,    _______, _______, _______, _______, _______, UK_Y,    UK_U,    UK_I,    UK_O,    UK_P   ,
-    UK_A,    UK_S,    UK_D,    UK_F,    UK_G,    _______, _______, _______, _______, _______, UK_H,    UK_J,    UK_K,    UK_L,    UK_SCLN,
-    _Z_SFT,  _X_NB,   _C_SY,   _V_NAL,  UK_B,    _______, _______, _______, _______, _______, UK_N,    _M_NAR,  _COM_SY, _DOT_NB, _SLSH  ,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-/* Numbers _NB
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | F7     | F8     | F9     | F10    |        |        |        |        |        |        | 7      | 8      | 9      |        |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        | F4     | F5     | F6     | F11    |        |        |        |        |        |        | 4      | 5      | 6      |        |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        | F1     | F2     | F3     | F12    |        |        |        |        |        | 0      | 1      | 2      | 3      | .      |
- * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-  [nbl] = LAYOUT_ortho_5x15(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, _______, _______, _______, UK_7,    UK_8,    UK_9,    _______,
-    _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,  _______, _______, _______, _______, _______, _______, UK_4,    UK_5,    UK_6,    _______,
-    _______, __NBL,   KC_F2,   KC_F3,   KC_F12,  _______, _______, _______, _______, _______, UK_0,    UK_1,    UK_2,    UK_3,    UK_DOT,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [nbr] = LAYOUT_ortho_5x15(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, _______, _______, _______, UK_7,    UK_8,    UK_9,    _______,
-    _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,  _______, _______, _______, _______, _______, _______, UK_4,    UK_5,    UK_6,    _______,
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,  _______, _______, _______, _______, _______, UK_0,    UK_1,    UK_2,    __NBR,   UK_DOT ,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
- /* Symbols _SY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | !      | £      | _      | -      | ~      |        |        |        |        |        | \      | {      | }      | /      | #      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | $      | %      | +      | =      |        |        |        |        |        |        | "      | (      | )      | '      | @      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | ^      | &      | *      | |      |        |        |        |        |        |        | <      | [      | ]      | >      | `      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-  [syl] = LAYOUT_ortho_5x15(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    UK_EXLM, UK_PND,  UK_UNDS, UK_MINS, UK_TILD, _______, _______, _______, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH,
-    UK_DLR,  UK_PERC, UK_PLUS, UK_EQL,  _______, _______, _______, _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT  ,
-    UK_CIRC, UK_AMPR, __SYL,   UK_PIPE, _______, _______, _______, _______, _______, _______, UK_LABK, UK_LBRC, UK_RBRC, UK_RABK, UK_GRV ,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [syr] = LAYOUT_ortho_5x15(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    UK_EXLM, UK_PND,  UK_UNDS, UK_MINS, UK_TILD, _______, _______, _______, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH,
-    UK_DLR,  UK_PERC, UK_PLUS, UK_EQL,  _______, _______, _______, _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT  ,
-    UK_CIRC, UK_AMPR, UK_ASTR, UK_PIPE, _______, _______, _______, _______, _______, _______, UK_LABK, UK_LBRC, __SYR,   UK_RABK, UK_GRV ,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-/*
- * Navigation _NA
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | QK_BOOT  | COLEMA | DVORAK | QWERTY |        | RGB_TG |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Esc    | Ctrl L | Up     | Ctrl R |        | RGB HD | RGB HI |        |        |        |        | PtSn   | ScLk   | Pause  |        |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | Tab    | Left   | Down   | Right  |        | RGB SD | RGB SI |        |        |        |        | Insert | Home   | PgUp   | Term   |
- * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | ShTab  | Alt L  | Shift  | Alt R  |        | RGB VD | RGB VI |        |        |        |        | ScLk   | End    | PgDn   |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        | RGB RMD| RGB MD |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-  [nal] = LAYOUT_ortho_5x15(
-    QK_BOOT, DF(cm),  DF(dv),  DF(qw),  _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_ESC,  _C_LEFT, KC_UP  , _C_RGHT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-    KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _TERM  ,
-    _S_TAB,  _A_LEFT, IJ_OMN,  __NAL,   _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, KC_SCRL, KC_END,  KC_PGDN, _______,
-    _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [nar] = LAYOUT_ortho_5x15(
-    QK_BOOT, DF(cm),  DF(dv),  DF(qw),  _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_ESC,  _C_LEFT, KC_UP  , _C_RGHT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-    KC_TAB,  KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _TERM  ,
-    _S_TAB,  _A_LEFT, IJ_OMN,  _A_RGHT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, __NAR,   KC_END,  KC_PGDN, _______,
-    _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-      case IJ_OMN:
-        SEND_STRING(SS_TAP(X_LSFT)SS_TAP(X_LSFT));
-        return false;
-    }
-  }
-  return true;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/skewwhiffy/readme.md b/keyboards/xiudi/xd75/keymaps/skewwhiffy/readme.md
deleted file mode 100644
index 33ae5412979..00000000000
--- a/keyboards/xiudi/xd75/keymaps/skewwhiffy/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Kenny Hung's custom keyboard
-
-Contact me at kennysubs+github@outlook.com
-
-Copied from my Diverge 3 layout with a few minor changes. See skewwhiffy repo setup for further deets.
diff --git a/keyboards/xiudi/xd75/keymaps/skewwhiffy/rules.mk b/keyboards/xiudi/xd75/keymaps/skewwhiffy/rules.mk
deleted file mode 100644
index 52a8f38d45f..00000000000
--- a/keyboards/xiudi/xd75/keymaps/skewwhiffy/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/config.h b/keyboards/xiudi/xd75/keymaps/tdl-jturner/config.h
deleted file mode 100644
index 210c4441c36..00000000000
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2018 Josh Turner (/u/tdl-jturner)
- *
- * 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/>.
- */
-
- // additional config optoinsa vailable at https://docs.qmk.fm/reference/config-options#the-config.h-file
-
-#pragma once
-
-// place overrides here
-
-// place overrides here
-//#define TAPPING_TERM 200
-#define TAPPING_TOGGLE 2
-//#define PERMISSIVE_HOLD
-#define FORCE_NKRO
-
-#define MOUSEKEY_INTERVAL 16
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 7
-#define MOUSEKEY_WHEEL_DELAY 0
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
deleted file mode 100644
index 626f77f67f4..00000000000
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* Copyright 2018 Josh Turner (/u/tdl-jturner)
- *
- * 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 xd75_layers {
-  _QWERTY,
-  _COLEMAK,
-  _LYMD,
-  _LYFK,
-  _LYMED,
-  _LYNUM,
-  _LYNAV,
-  _LYMOS,
-  _LYSYS,
-  _LYLT
-};
-
-enum xd75_keycodes {
-  HELP = SAFE_RANGE,
-  KC_BSDEL,
-  KC_FBSLH,
-  KC_DOTQ,
-  KC_CPIPE,
-  COLEMAK,
-  QWERTY,
-  KC_LYDEF
-};
-
-//Tap Dance Declarations
-enum {
-  TD_LOCK_SLEEP,
-  TD_ABK,
-  TD_BRC,
-  TD_CBR,
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Esc, twice for Caps Lock
-  [TD_LOCK_SLEEP]  = ACTION_TAP_DANCE_DOUBLE(LGUI(KC_L), KC_SLEP),
-  [TD_ABK] = ACTION_TAP_DANCE_DOUBLE(KC_LABK,KC_RABK),
-  [TD_BRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC,KC_RBRC),
-  [TD_CBR] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR,KC_RCBR)
-// Other declarations would go here, separated by commas, if you have them
-};
-
-//remaps for pretty layouts
-#define ________ KC_TRNS
-#define ___XX___ KC_NO
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- //QWERY - Base Layer
- [_QWERTY] = LAYOUT_ortho_5x15(
-         KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,________  ,________,________,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  ,KC_MINUS,
-         KC_TAB ,  KC_Q  ,  KC_W  ,  KC_E  ,  KC_R  ,  KC_T  ,________  ,________,________,  KC_Y  ,  KC_U  ,  KC_I  ,  KC_O  ,  KC_P  ,KC_BSDEL, //Custom shift Codes. Backspace ^ Delete
-LT(_LYMD,KC_ESC),  KC_A  ,  KC_S  ,  KC_D  ,  KC_F  ,  KC_G  ,________  ,________,________,  KC_H  ,  KC_J  ,  KC_K  ,  KC_L  ,KC_SCLN ,KC_QUOT,
-         SC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_N  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,SC_RSPC, // Custom Shift Codes. ,^| .^?  /^|
-      KC_MEH ,KC_LCTL ,KC_LGUI ,KC_LALT ,MO(_LYNUM), KC_SPC ,________  ,________,________, KC_ENT ,MO(_LYNAV),TD(TD_CBR) ,TD(TD_BRC),TD(TD_ABK),TD(TD_LOCK_SLEEP)
-
- ),
-
- //_COLEMAK - Colemak Layout - Identical to qwerty layer except for the layout changes
- [_COLEMAK] = LAYOUT_ortho_5x15(
-         KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,________  ,________,________,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  ,KC_MINUS,
-         KC_TAB ,  KC_Q  ,  KC_W  ,  KC_F  ,  KC_P  ,  KC_G  ,________  ,________,________,  KC_J  ,  KC_L  ,  KC_U  ,  KC_Y  ,KC_SCLN ,KC_BSDEL, //Custom shift Codes. Backspace ^ Delete
-LT(_LYMD,KC_ESC),  KC_A  ,  KC_R  ,  KC_S  ,  KC_T  ,  KC_D  ,________  ,________,________,  KC_H  ,  KC_N  ,  KC_E  ,  KC_I  ,  KC_O  ,KC_QUOT,
-         SC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_K  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,SC_RSPC, // Custom Shift Codes. ,^| .^?  /^|
-     KC_MEH ,KC_LCTL ,KC_LGUI ,KC_LALT ,MO(_LYNUM), KC_SPC ,________  ,________,________, KC_ENT ,MO(_LYNAV),TD(TD_CBR) ,TD(TD_BRC),TD(TD_ABK),TD(TD_LOCK_SLEEP)
-
- ),
-
- // Decision Layer
- [_LYMD] =
-    LAYOUT_ortho_5x15(
-       ________,________  ,________  ,________  ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-       ________,MO(_LYFK) ,MO(_LYMED),________  ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,________,
-       ________,MO(_LYNUM),MO(_LYNAV),________  ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-       ________,MO(_LYMOS),MO(_LYSYS),MO(_LYLT) ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-       ________,________  ,________  ,________  ,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
-     ),
-
- //F Keys
- [_LYFK] =
-    LAYOUT_ortho_5x15(
-      ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-      KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_F7   ,KC_F8   ,KC_F9   ,KC_F12  ,________,
-      ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_F4   ,KC_F5   ,KC_F6   ,KC_F11  ,___XX___,
-      ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_F1   ,KC_F2   ,KC_F3   ,KC_F10  ,___XX___,
-      ________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
-    ),
-//Media Keys
-[_LYMED] =
-   LAYOUT_ortho_5x15(
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-     KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_VOLU ,___XX___,___XX___,________,
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_MPRV ,KC_MUTE ,KC_MNXT ,___XX___,___XX___,
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_VOLD ,___XX___,KC_MSTP ,___XX___,
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_MPLY ,___XX___,___XX___,___XX___,___XX___
-   ),
-//Num Keys
-[_LYNUM] =
-  LAYOUT_ortho_5x15(
-    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_PEQL ,KC_PSLS ,KC_PAST ,KC_PMNS ,___XX___,
-    KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_7    ,KC_8    ,KC_9    ,KC_MINUS,________,
-    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_4    ,KC_5    ,KC_6    ,KC_PPLS ,KC_PSLS,
-    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_1    ,KC_2    ,KC_3    ,KC_PENT ,KC_PAST,
-    ________,________,________,________,________,________,________,________,________,________,KC_0    ,KC_0    ,KC_PDOT ,KC_PEQL ,___XX___
-  ),
-//Navigation Keys
-[_LYNAV] =
- LAYOUT_ortho_5x15(
-   ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-   KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_HOME ,KC_UP   ,KC_PGUP ,KC_PSCR ,________,
-   ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_LEFT ,KC_F5   ,KC_RIGHT,KC_SCRL ,___XX___,
-   ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_END  ,KC_DOWN ,KC_PGDN ,KC_PAUS ,___XX___,
-   ________,________,________,________,________,________,________,________,________,________,________,KC_INS  ,KC_DEL  ,___XX___,___XX___
- ),
- //Mouse Keys
- [_LYMOS] =
-  LAYOUT_ortho_5x15(
-    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-    KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_MS_U ,KC_WH_U ,KC_ACL2 ,________,
-    _______,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_MS_L ,KC_ACL0 ,KC_MS_R ,KC_ACL1 ,___XX___,
-    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_MS_D ,KC_WH_D ,KC_BTN2 ,___XX___,
-    ________,________,________,________,________,________,________,________,________,________,KC_BTN1 ,KC_BTN3 ,KC_BTN4 ,___XX___,___XX___
-  ),
-  //Systen Keys
-  [_LYSYS] =
-   LAYOUT_ortho_5x15(
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-     KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,________,
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,QWERTY  ,COLEMAK ,___XX___,QK_BOOT,
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-     ________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
-   ),
-
-// Light Control
-[_LYLT] =
-  LAYOUT_ortho_5x15(
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
-     KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,RGB_HUD ,RGB_HUI ,RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI,
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,RGB_TOG ,RGB_RMOD,RGB_MOD ,___XX___,___XX___,___XX___,
-     ________,________,________,________,________,________,___XX___,___XX___,___XX___,BL_TOGG ,BL_DOWN ,BL_UP   ,BL_BRTG ,___XX___,___XX___,
-     ________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
-  )
-};
-
-//Define layer colors
-#define rgblight_setrgb_user_base()  rgblight_sethsv(325,255,255)
-#define rgblight_setrgb_user_LYFK()  rgblight_sethsv(HSV_RED)
-#define rgblight_setrgb_user_LYMED() rgblight_sethsv(HSV_BLUE)
-#define rgblight_setrgb_user_LYNUM() rgblight_sethsv(HSV_PURPLE)
-#define rgblight_setrgb_user_LYNAV() rgblight_sethsv(HSV_CYAN)
-#define rgblight_setrgb_user_LYMOS() rgblight_sethsv(HSV_ORANGE)
-#define rgblight_setrgb_user_LYSYS() rgblight_sethsv(HSV_GREEN)
-#define rgblight_setrgb_user_LYLT()  rgblight_sethsv(HSV_YELLOW)
-#define rgblight_setrgb_user_LYMD()  rgblight_sethsv(HSV_WHITE)
-
-//initialize rgb
-void matrix_init_user(void) {
-  rgblight_enable();
-  rgblight_mode(1);
-  rgblight_setrgb_user_base();
-}
-
-//Set a color based on the layer
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch(get_highest_layer(state)) {
-    case _LYFK:
-      rgblight_setrgb_user_LYFK();
-      break;
-    case _LYMED:
-      rgblight_setrgb_user_LYMED();
-      break;
-    case _LYNUM:
-      rgblight_setrgb_user_LYNUM();
-      break;
-    case _LYNAV:
-      rgblight_setrgb_user_LYNAV();
-      break;
-    case _LYMOS:
-      rgblight_setrgb_user_LYMOS();
-      break;
-    case _LYSYS:
-      rgblight_setrgb_user_LYSYS();
-      break;
-    case _LYLT:
-      rgblight_setrgb_user_LYLT();
-      break;
-    case _LYMD:
-      rgblight_setrgb_user_LYMD();
-      break;
-    default:
-      rgblight_setrgb_user_base();
-      break;
-  }
-  return state;
-}
-
-
-//Const for shift
-const uint8_t shift = MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT);
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  switch(keycode) {
-    case KC_LYDEF:
-      layer_clear();
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case KC_BSDEL:
-      if (record->event.pressed) {
-        if (keyboard_report->mods & shift) {
-          if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
-            unregister_code(KC_LEFT_SHIFT);
-          }
-          else {
-            unregister_code(KC_RIGHT_SHIFT);
-          }
-          register_code(KC_DEL);
-        }
-        else {
-          register_code(KC_BSPC);
-        }
-      }
-      else {
-        unregister_code(KC_DEL);
-        unregister_code (KC_BSPC);
-      }
-      return false;
-      break;
-    case KC_FBSLH:
-      if (record->event.pressed) {
-        if (keyboard_report->mods & shift) {
-            if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
-              unregister_code(KC_LEFT_SHIFT);
-            }
-            else {
-              unregister_code(KC_RIGHT_SHIFT);
-            }
-          register_code(KC_BACKSLASH);
-        }
-        else {
-          register_code(KC_SLSH);
-        }
-      }
-      else {
-        unregister_code(KC_BACKSLASH);
-        unregister_code (KC_SLSH);
-      }
-      return false;
-      break;
-    case KC_DOTQ:
-      if (record->event.pressed) {
-        if (keyboard_report->mods & shift) {
-          register_code(KC_SLSH); // shifted slash = ?
-        }
-        else {
-          register_code(KC_DOT);
-        }
-      }
-      else {
-        unregister_code(KC_SLSH); // shifted slash = ?
-        unregister_code (KC_DOT);
-      }
-      return false;
-      break;
-    case KC_CPIPE:
-      if (record->event.pressed) {
-        if (keyboard_report->mods & shift) {
-          register_code(KC_BSLS);
-        }
-        else {
-          register_code(KC_COMM);
-        }
-      }
-      else {
-        unregister_code(KC_BSLS);
-        unregister_code (KC_COMM);
-      }
-      return false;
-      break;
-    }
-    return true;
-};
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/readme.md b/keyboards/xiudi/xd75/keymaps/tdl-jturner/readme.md
deleted file mode 100644
index a430be0a27b..00000000000
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-/u/tdl-jturner - XD75 Layout
-===
-
-Keyboard Layout Editor: [Link](http://www.keyboard-layout-editor.com/#/gists/b2b23097ef70fd9170e266e4cbc06c02)
-
-Make Command: make xiudi/xd75:tdl-jturner
-
-Notes:
-* Based on Qwerty
-* Tweaks for DBA & Programming including tap dance braces on lower right, custom shift codes, and F5 access on Nav layer
-* Layers are all based on layer control on the left and the right is a 10 key pattern
-* Layers include Functions, Media, Numpad, Navigation, Mouse, System, and Lighting
diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/rules.mk b/keyboards/xiudi/xd75/keymaps/tdl-jturner/rules.mk
deleted file mode 100644
index 996d77045e2..00000000000
--- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2018 Josh Turner (/u/tdl-jturner)
-#
-# 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/>.
-
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c b/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
deleted file mode 100644
index f7872e7f944..00000000000
--- a/keyboards/xiudi/xd75/keymaps/tomswartz07/keymap.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * 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 preonic_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | `~     | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | BKSP   | -      | =      | \      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | Del    | [      | ]      | HOME   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | ESC    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | ENTER  |        |        | END    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | '      |        |        | PG UP  |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | LGUI   | LALT   | LOWER  | BKSP   | ENTER  | SPACE  | RAISE  | LEFT   | DOWN   | UP     | RIGHT  |        |        | PG DN  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_QWERTY] = LAYOUT_ortho_5x15( /* QWERTY */
-    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_MINS, KC_EQL,   KC_BSLS,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,  KC_LBRC, KC_RBRC,  KC_HOME,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,  KC_NO,   KC_NO,    KC_END,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT, KC_NO,   KC_NO,    KC_PGUP,
-    KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_BSPC, KC_ENT, KC_SPC, RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_RALT, KC_NO,    KC_PGDN
-  ),
-
-/* LOWER
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ~      | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | BKSP   |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | ~      |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | DEL    |        |        |        |        |        |        | _      | +      | {      | }      |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        | Home   | End    |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        | Vol -  | VOL +  |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_LOWER] = LAYOUT_ortho_5x15( /* LOWER */
-    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_BSLS,
-    KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, _______, _______
-  ),
-
-/* RAISE
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | `~     | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | BKSP   |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | `~     |        |        |        |        |        |        |        |        |        |        | Del    |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | DEL    |        |        |        |        |        |        | -      | =      | [      | ]      | \      |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_RAISE] = LAYOUT_ortho_5x15( /* RAISE */
-    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_BSLS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-/* ADJUST
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        | RGB HD | RGB HI |        |        |        |        |        |        | PR SCR | SCR LK | INSERT |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | PREV   | PLAY   | NEXT   |        | RGB SD | RGB SI | LEFT   | DOWN   | UP     | RIGHT  |        | QK_BOOT  |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | VOL-   | MUTE   | VOL+   |RGB RMD | RGB VD | RGB VI |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RGB TG | RGB MD |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_ADJUST] = LAYOUT_ortho_5x15( /* ADJUST */
-    _______, 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_NUM,  KC_SLSH,
-    _______, QK_BOOT, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_INS,
-    KC_MPRV, KC_MPLY, KC_MNXT, _______, RGB_SAD, RGB_SAI, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, QK_BOOT, _______, _______, _______,
-    KC_VOLD, KC_MUTE, KC_VOLU, RGB_RMOD,RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/xiudi/xd75/keymaps/xo/config.h b/keyboards/xiudi/xd75/keymaps/xo/config.h
deleted file mode 100644
index 31cdef2578a..00000000000
--- a/keyboards/xiudi/xd75/keymaps/xo/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define TAPPING_TOGGLE 2
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 150
diff --git a/keyboards/xiudi/xd75/keymaps/xo/keymap.c b/keyboards/xiudi/xd75/keymaps/xo/keymap.c
deleted file mode 100644
index 8fa1f9feaa3..00000000000
--- a/keyboards/xiudi/xd75/keymaps/xo/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// You might want to alter this to something that matches the keycap LED colors
-// you installed.
-#define BASE_COLOR RGB_ORANGE
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_ortho_5x15(
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_GRV, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_BSLS, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
-    KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_HOME, KC_DEL, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
-    KC_LSFT, LCTL_T(KC_Z), LALT_T(KC_X), KC_C, KC_V, KC_B, KC_END, KC_UP, KC_PGDN, KC_N, KC_M, KC_COMM, RALT_T(KC_DOT), RCTL_T(KC_SLSH), KC_RSFT,
-    TT(1), KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC, KC_ENT, KC_RGUI, KC_RALT, KC_RCTL, TT(1)),
-  [1] = LAYOUT_ortho_5x15(
-    KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_P7, KC_P8, KC_P9, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
-    LCTL(KC_GRV), KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P4, KC_P5, KC_P6, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,
-    KC_CAPS, KC_TRNS, KC_TRNS, KC_MSTP, RGB_SAD, RGB_SAI, KC_P1, KC_P2, KC_P3, KC_PLUS, KC_TRNS, QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU,
-    MO(2), KC_PSCR, KC_PAUS, KC_APP, RGB_VAD, RGB_VAI, KC_P0, KC_SLSH, KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT,
-    TG(1), KC_TRNS, RGB_TOG, KC_SCRL, RGB_RMOD, RGB_MOD, KC_NUM, KC_TRNS, KC_ASTR, KC_PENT, KC_PENT, MO(1), KC_TRNS, KC_TRNS, TG(1)),
-  [2] = LAYOUT_ortho_5x15(
-    QK_BOOT, 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, 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, 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, BL_DOWN,BL_UP,  BL_TOGG,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_TOG)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    backlight_level(4);
-  } else {
-    backlight_level(6);
-  }
-
-  if (IS_MODIFIER_KEYCODE(keycode)) {
-    if (record->event.pressed) {
-      rgblight_setrgb(RGB_RED);
-    } else {
-      rgblight_setrgb(BASE_COLOR);
-    }
-  }
-
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case 0:
-      rgblight_setrgb(BASE_COLOR);
-      break;
-    case 1:
-      rgblight_setrgb(RGB_AZURE);
-      break;
-    case 2:
-      rgblight_setrgb(RGB_PURPLE);
-      break;
-    }
-  return state;
-}
diff --git a/keyboards/xiudi/xd75/keymaps/xo/readme.md b/keyboards/xiudi/xd75/keymaps/xo/readme.md
deleted file mode 100644
index d8ecb1c2a3e..00000000000
--- a/keyboards/xiudi/xd75/keymaps/xo/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# xster's keymap
-
-My layout preferences. Done on a xd75 that had keycap LEDs.
-
-It has reactive keypress keycap light dimming. Layers and modifiers have
-RGB underlit colors.
diff --git a/keyboards/xiudi/xd75/keymaps/xo/rules.mk b/keyboards/xiudi/xd75/keymaps/xo/rules.mk
deleted file mode 100644
index baa653f7803..00000000000
--- a/keyboards/xiudi/xd75/keymaps/xo/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-BACKLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
deleted file mode 100755
index 219961e434d..00000000000
--- a/keyboards/xiudi/xd87/keymaps/mac_underglow/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Tomasz Adamczyk <siano@sianecki.pl>
- *
- * 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_tkl_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_F13,  KC_F14,  KC_F15,
-      KC_GRV,  KC_1,   KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
-      KC_TAB,  KC_Q,   KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
-      KC_CAPS, KC_A,   KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,   KC_L,   KC_SCLN,KC_QUOT,          KC_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_LALT, KC_LGUI,                     KC_SPC,                       KC_RGUI, KC_RALT, MO(1),KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-  [1] = LAYOUT_tkl_ansi(
-      QK_BOOT,          EE_CLR,  DB_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_TOGG, BL_UP, 
-      KC_TRNS, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_BRTG, BL_DOWN,
-      KC_TRNS, KC_TRNS, RGB_VAD, RGB_RMOD,RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,           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/xiudi/xd87/keymaps/mac_underglow/readme.md b/keyboards/xiudi/xd87/keymaps/mac_underglow/readme.md
deleted file mode 100755
index 61fee2218f3..00000000000
--- a/keyboards/xiudi/xd87/keymaps/mac_underglow/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# The Mac OS layout for xd87
-
-With underglow and backlight support.
-
-## Keymap
-
-### Layer 0
-
-![XD87 - mac_underglow keymap - layer 0](https://i.imgur.com/LXq8phy.png)
-
-### Layer 1
-
-![XD87 - mac_underglow_keymap - layer 1](https://i.imgur.com/swqwVaO.png)
\ No newline at end of file
diff --git a/keyboards/xiudi/xd87/keymaps/mac_underglow/rules.mk b/keyboards/xiudi/xd87/keymaps/mac_underglow/rules.mk
deleted file mode 100755
index fa5f343e706..00000000000
--- a/keyboards/xiudi/xd87/keymaps/mac_underglow/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-COMMAND_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
index 98ebfcb4831..2b4ee4aad0a 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/info.json
@@ -1,373 +1,373 @@
 {
-  "keyboard_name": "XD96",
-  "manufacturer": "KPrepublic",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x7844",
-    "pid": "0x9696",
-    "device_version": "0.0.1"
-  },
-  "backlight": {
-    "pin": "B5",
-    "levels": 10
-  },
-  "rgblight": {
-    "led_count": 16,
-    "max_brightness": 50,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "indicators": {
-    "caps_lock": "B6",
-    "num_lock": "C6",
-    "on_state": 0
-  },
-  "ws2812": {
-    "pin": "C7"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_96_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [5, 6], "x": 14, "y": 0},
-        {"matrix": [0, 14], "x": 15, "y": 0},
-        {"matrix": [0, 15], "x": 16, "y": 0},
-        {"matrix": [0, 16], "x": 17, "y": 0},
-        {"matrix": [0, 17], "x": 18, "y": 0},
+    "keyboard_name": "XD96",
+    "manufacturer": "KPrepublic",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x7844",
+        "pid": "0x9696",
+        "device_version": "0.0.1"
+    },
+    "backlight": {
+        "pin": "B5",
+        "levels": 10
+    },
+    "rgblight": {
+        "led_count": 16,
+        "max_brightness": 50,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "num_lock": "C6",
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
 
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-        {"matrix": [1, 12], "x": 12, "y": 1},
-        {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-        {"matrix": [1, 14], "x": 15, "y": 1},
-        {"matrix": [1, 15], "x": 16, "y": 1},
-        {"matrix": [1, 16], "x": 17, "y": 1},
-        {"matrix": [1, 17], "x": 18, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
 
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2},
-        {"matrix": [2, 2], "x": 2.5, "y": 2},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2},
-        {"matrix": [2, 5], "x": 5.5, "y": 2},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-        {"matrix": [2, 11], "x": 11.5, "y": 2},
-        {"matrix": [2, 12], "x": 12.5, "y": 2},
-        {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-        {"matrix": [2, 14], "x": 15, "y": 2},
-        {"matrix": [2, 15], "x": 16, "y": 2},
-        {"matrix": [2, 16], "x": 17, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
 
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3},
-        {"matrix": [3, 2], "x": 2.75, "y": 3},
-        {"matrix": [3, 3], "x": 3.75, "y": 3},
-        {"matrix": [3, 4], "x": 4.75, "y": 3},
-        {"matrix": [3, 5], "x": 5.75, "y": 3},
-        {"matrix": [3, 6], "x": 6.75, "y": 3},
-        {"matrix": [3, 7], "x": 7.75, "y": 3},
-        {"matrix": [3, 8], "x": 8.75, "y": 3},
-        {"matrix": [3, 9], "x": 9.75, "y": 3},
-        {"matrix": [3, 10], "x": 10.75, "y": 3},
-        {"matrix": [3, 11], "x": 11.75, "y": 3},
-        {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-        {"matrix": [3, 14], "x": 15, "y": 3},
-        {"matrix": [3, 15], "x": 16, "y": 3},
-        {"matrix": [3, 16], "x": 17, "y": 3},
-        {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
 
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-        {"matrix": [4, 2], "x": 2.25, "y": 4},
-        {"matrix": [4, 3], "x": 3.25, "y": 4},
-        {"matrix": [4, 4], "x": 4.25, "y": 4},
-        {"matrix": [4, 5], "x": 5.25, "y": 4},
-        {"matrix": [4, 6], "x": 6.25, "y": 4},
-        {"matrix": [4, 7], "x": 7.25, "y": 4},
-        {"matrix": [4, 8], "x": 8.25, "y": 4},
-        {"matrix": [4, 9], "x": 9.25, "y": 4},
-        {"matrix": [4, 10], "x": 10.25, "y": 4},
-        {"matrix": [4, 11], "x": 11.25, "y": 4},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-        {"matrix": [4, 13], "x": 14, "y": 4},
-        {"matrix": [4, 14], "x": 15, "y": 4},
-        {"matrix": [4, 15], "x": 16, "y": 4},
-        {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
 
-        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-        {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-        {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
-        {"matrix": [5, 12], "x": 13, "y": 5},
-        {"matrix": [5, 13], "x": 14, "y": 5},
-        {"matrix": [5, 14], "x": 15, "y": 5},
-        {"matrix": [5, 15], "x": 16, "y": 5},
-        {"matrix": [5, 16], "x": 17, "y": 5},
-        {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
-      ]
-    },
-    "LAYOUT_96_iso": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [5, 6], "x": 14, "y": 0},
-        {"matrix": [0, 14], "x": 15, "y": 0},
-        {"matrix": [0, 15], "x": 16, "y": 0},
-        {"matrix": [0, 16], "x": 17, "y": 0},
-        {"matrix": [0, 17], "x": 18, "y": 0},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5},
+                {"matrix": [5, 15], "x": 16, "y": 5},
+                {"matrix": [5, 16], "x": 17, "y": 5},
+                {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+            ]
+        },
+        "LAYOUT_96_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
 
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-        {"matrix": [1, 12], "x": 12, "y": 1},
-        {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-        {"matrix": [1, 14], "x": 15, "y": 1},
-        {"matrix": [1, 15], "x": 16, "y": 1},
-        {"matrix": [1, 16], "x": 17, "y": 1},
-        {"matrix": [1, 17], "x": 18, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
 
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2},
-        {"matrix": [2, 2], "x": 2.5, "y": 2},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2},
-        {"matrix": [2, 5], "x": 5.5, "y": 2},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-        {"matrix": [2, 11], "x": 11.5, "y": 2},
-        {"matrix": [2, 12], "x": 12.5, "y": 2},
-        {"matrix": [2, 14], "x": 15, "y": 2},
-        {"matrix": [2, 15], "x": 16, "y": 2},
-        {"matrix": [2, 16], "x": 17, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
 
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3},
-        {"matrix": [3, 2], "x": 2.75, "y": 3},
-        {"matrix": [3, 3], "x": 3.75, "y": 3},
-        {"matrix": [3, 4], "x": 4.75, "y": 3},
-        {"matrix": [3, 5], "x": 5.75, "y": 3},
-        {"matrix": [3, 6], "x": 6.75, "y": 3},
-        {"matrix": [3, 7], "x": 7.75, "y": 3},
-        {"matrix": [3, 8], "x": 8.75, "y": 3},
-        {"matrix": [3, 9], "x": 9.75, "y": 3},
-        {"matrix": [3, 10], "x": 10.75, "y": 3},
-        {"matrix": [3, 11], "x": 11.75, "y": 3},
-        {"matrix": [3, 13], "x": 12.75, "y": 3},
-        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-        {"matrix": [3, 14], "x": 15, "y": 3},
-        {"matrix": [3, 15], "x": 16, "y": 3},
-        {"matrix": [3, 16], "x": 17, "y": 3},
-        {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
 
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4},
-        {"matrix": [4, 2], "x": 2.25, "y": 4},
-        {"matrix": [4, 3], "x": 3.25, "y": 4},
-        {"matrix": [4, 4], "x": 4.25, "y": 4},
-        {"matrix": [4, 5], "x": 5.25, "y": 4},
-        {"matrix": [4, 6], "x": 6.25, "y": 4},
-        {"matrix": [4, 7], "x": 7.25, "y": 4},
-        {"matrix": [4, 8], "x": 8.25, "y": 4},
-        {"matrix": [4, 9], "x": 9.25, "y": 4},
-        {"matrix": [4, 10], "x": 10.25, "y": 4},
-        {"matrix": [4, 11], "x": 11.25, "y": 4},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-        {"matrix": [4, 13], "x": 14, "y": 4},
-        {"matrix": [4, 14], "x": 15, "y": 4},
-        {"matrix": [4, 15], "x": 16, "y": 4},
-        {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
 
-        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-        {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-        {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
-        {"matrix": [5, 12], "x": 13, "y": 5},
-        {"matrix": [5, 13], "x": 14, "y": 5},
-        {"matrix": [5, 14], "x": 15, "y": 5},
-        {"matrix": [5, 15], "x": 16, "y": 5},
-        {"matrix": [5, 16], "x": 17, "y": 5},
-        {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
-      ]
-    },
-    "LAYOUT_all": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [5, 6], "x": 14, "y": 0},
-        {"matrix": [0, 14], "x": 15, "y": 0},
-        {"matrix": [0, 15], "x": 16, "y": 0},
-        {"matrix": [0, 16], "x": 17, "y": 0},
-        {"matrix": [0, 17], "x": 18, "y": 0},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5},
+                {"matrix": [5, 15], "x": 16, "y": 5},
+                {"matrix": [5, 16], "x": 17, "y": 5},
+                {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
 
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-        {"matrix": [1, 12], "x": 12, "y": 1},
-        {"matrix": [1, 13], "x": 13, "y": 1},
-        {"matrix": [5, 3], "x": 14, "y": 1},
-        {"matrix": [1, 14], "x": 15, "y": 1},
-        {"matrix": [1, 15], "x": 16, "y": 1},
-        {"matrix": [1, 16], "x": 17, "y": 1},
-        {"matrix": [1, 17], "x": 18, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [5, 9], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
 
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2},
-        {"matrix": [2, 2], "x": 2.5, "y": 2},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2},
-        {"matrix": [2, 5], "x": 5.5, "y": 2},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-        {"matrix": [2, 11], "x": 11.5, "y": 2},
-        {"matrix": [2, 12], "x": 12.5, "y": 2},
-        {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-        {"matrix": [2, 14], "x": 15, "y": 2},
-        {"matrix": [2, 15], "x": 16, "y": 2},
-        {"matrix": [2, 16], "x": 17, "y": 2},
-        {"matrix": [2, 17], "x": 18, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
+                {"matrix": [2, 17], "x": 18, "y": 2},
 
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3},
-        {"matrix": [3, 2], "x": 2.75, "y": 3},
-        {"matrix": [3, 3], "x": 3.75, "y": 3},
-        {"matrix": [3, 4], "x": 4.75, "y": 3},
-        {"matrix": [3, 5], "x": 5.75, "y": 3},
-        {"matrix": [3, 6], "x": 6.75, "y": 3},
-        {"matrix": [3, 7], "x": 7.75, "y": 3},
-        {"matrix": [3, 8], "x": 8.75, "y": 3},
-        {"matrix": [3, 9], "x": 9.75, "y": 3},
-        {"matrix": [3, 10], "x": 10.75, "y": 3},
-        {"matrix": [3, 11], "x": 11.75, "y": 3},
-        {"matrix": [3, 12], "x": 12.75, "y": 3},
-        {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
-        {"matrix": [3, 14], "x": 15, "y": 3},
-        {"matrix": [3, 15], "x": 16, "y": 3},
-        {"matrix": [3, 16], "x": 17, "y": 3},
-        {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [3, 17], "x": 18, "y": 3},
 
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4},
-        {"matrix": [4, 2], "x": 2.25, "y": 4},
-        {"matrix": [4, 3], "x": 3.25, "y": 4},
-        {"matrix": [4, 4], "x": 4.25, "y": 4},
-        {"matrix": [4, 5], "x": 5.25, "y": 4},
-        {"matrix": [4, 6], "x": 6.25, "y": 4},
-        {"matrix": [4, 7], "x": 7.25, "y": 4},
-        {"matrix": [4, 8], "x": 8.25, "y": 4},
-        {"matrix": [4, 9], "x": 9.25, "y": 4},
-        {"matrix": [4, 10], "x": 10.25, "y": 4},
-        {"matrix": [4, 11], "x": 11.25, "y": 4},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-        {"matrix": [4, 13], "x": 14, "y": 4},
-        {"matrix": [4, 14], "x": 15, "y": 4},
-        {"matrix": [4, 15], "x": 16, "y": 4},
-        {"matrix": [4, 16], "x": 17, "y": 4},
-        {"matrix": [4, 17], "x": 18, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
 
-        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-        {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-        {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
-        {"matrix": [5, 12], "x": 13, "y": 5},
-        {"matrix": [5, 13], "x": 14, "y": 5},
-        {"matrix": [5, 14], "x": 15, "y": 5},
-        {"matrix": [5, 15], "x": 16, "y": 5},
-        {"matrix": [5, 16], "x": 17, "y": 5},
-        {"matrix": [5, 17], "x": 18, "y": 5}
-      ]
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5},
+                {"matrix": [5, 15], "x": 16, "y": 5},
+                {"matrix": [5, 16], "x": 17, "y": 5},
+                {"matrix": [5, 17], "x": 18, "y": 5}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/xiudi/xd96/keymaps/default/keymap.c b/keyboards/xiudi/xd96/keymaps/default/keymap.c
index 3d904759caa..d0cfbe23b16 100644
--- a/keyboards/xiudi/xd96/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/default/keymap.c
@@ -4,35 +4,22 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_96_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_INS,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  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_NUM,   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_BSLS,       KC_P7,    KC_P8,    KC_P9,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────├         ┤ */
-	  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_P4,    KC_P5,    KC_P6,    KC_PPLS,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  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_P1,    KC_P2,    KC_P3,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-	  KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,                                                         L1_RALT,       KC_RCTL,       KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [0] = LAYOUT_96_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_INS,  KC_DEL,  KC_HOME, KC_END,  KC_PGUP, 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_NUM,  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_BSLS,          KC_P7,   KC_P8,   KC_P9,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             L1_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_96_ansi(
+        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    )
 
-  [1] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  BL_TOGG,  BL_STEP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______,  RGB_TOG,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────┼         ┤ */
-	  _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-	  _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  )
 };
diff --git a/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
index 7c26664b0ec..a485d2f9ef4 100644
--- a/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
@@ -4,35 +4,22 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_96_iso(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    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_INS,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  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_NUM,   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_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_PPLS,
-/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  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_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,                                                         L1_RALT,       KC_RCTL,       KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [0] = LAYOUT_96_iso(
+        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_INS,  KC_DEL,  KC_HOME, KC_END,  KC_PGUP, 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_NUM,  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_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_PPLS,
+        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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             L1_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_96_iso(
+        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    )
 
-  [1] = LAYOUT_96_iso(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  BL_TOGG,  BL_STEP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______,  RGB_TOG,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────├─────────├─────────┼         ┤ */
-	  _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-	  _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  )
 };
diff --git a/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c b/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
deleted file mode 100644
index b554860c204..00000000000
--- a/keyboards/xiudi/xd96/keymaps/uuupah/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2020 Jonathan Souter 
- * 
- * 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 LT_ENT2 LT(2,KC_ENT)
-
-#ifdef RGBLIGHT_ENABLE
-void matrix_init_user(void) {
-  rgblight_disable();
-}
-#endif
-
-enum custom_keycodes {
-  ZEROZER,
-};
-
-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_CALC, KC_PSCR, KC_HOME, KC_END,  KC_PGUP, 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_BSLS, KC_DEL,  KC_NUM,  _______, KC_PMNS, KC_PSLS,
-	  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_BSPC,          KC_P7,   KC_P8,   KC_P9,   KC_PAST,
-	  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, _______, LT_ENT2,          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-	  KC_LSFT, KC_BSLS, 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_P1,   KC_P2,   KC_P3,   KC_EQL,
-	  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_P0,   ZEROZER, KC_PDOT, KC_PENT
-  ),
-
-  [1] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, QK_BOOT, _______, _______, _______, _______,
-	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	  _______, KC_MPLY, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   KC_PSCR, _______,          _______, _______, _______, _______,
-	  _______, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, _______,          _______, _______, _______, _______,
-	  _______, _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,          _______, _______, _______, _______,
-	  _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______, _______
-  ),
-  
-  [2] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______,          _______, _______, _______, _______,
-	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  _______, _______,          _______, _______, _______, _______,
-	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______,          _______, _______, _______, _______,
-	  _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______, _______
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case ZEROZER:
-      if (record->event.pressed) {
-        SEND_STRING("00");
-      } else {
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/xiudi/xd96/keymaps/via/keymap.c b/keyboards/xiudi/xd96/keymaps/via/keymap.c
index 8fdb8efe210..2d6524958dc 100644
--- a/keyboards/xiudi/xd96/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/via/keymap.c
@@ -2,67 +2,40 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_96_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_INS,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  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_NUM,  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_BSLS,       KC_P7,    KC_P8,    KC_P9,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────├         ┤ */
-      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_P4,    KC_P5,    KC_P6,    KC_PPLS,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      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_P1,    KC_P2,    KC_P3,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-      KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,                                                         MO(1),        KC_RCTL,       KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [0] = LAYOUT_96_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_INS,  KC_DEL,  KC_HOME, KC_END,  KC_PGUP, 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_NUM,  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_BSLS,          KC_P7,   KC_P8,   KC_P9,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
 
-  [1] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  BL_TOGG,  BL_STEP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,  RGB_TOG,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────┼         ┤ */
-      _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-      _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [1] = LAYOUT_96_ansi(
+        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    ),
 
-  [2] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────┼         ┤ */
-      _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-      _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [2] = LAYOUT_96_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_96_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    ),
 
-  [3] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────┼         ┤ */
-      _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-      _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
 };
diff --git a/keyboards/xiudi/xd96/matrix_diagram.md b/keyboards/xiudi/xd96/matrix_diagram.md
new file mode 100644
index 00000000000..ba4181b0c78
--- /dev/null
+++ b/keyboards/xiudi/xd96/matrix_diagram.md
@@ -0,0 +1,42 @@
+# Matrix Diagram for KPrepublic XD96
+
+```
+Spaced Function Row ────────────────────────────────────────┐
+┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │
+└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘
+                                                    ┌───────┐       ┌───────┐
+                          2u Function Row Backspace │0D     │       │0G     │
+                                                    └───────┘       └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │56 │0E │0F │0G │0H │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤    ┌───────┐                            ┌───┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │59 │1E │1F │1G │1H │    │1D     │ 2u Backspace               │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤    └─┬─────┤      ┌─────┐               │1H │   ┌───┐
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │2E │2F │2G │2H │      │2D   │      │     │               │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┼───┼───┼───┼───┤   ┌──┴─────┤   ┌──┴┐3D  │               ├───┤   │2H │ 2u Numpad Plus
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D  │3E │3F │3G │3H │   │3D      │   │3C │    │               │   │   │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┼───┼───┼───┤   └────────┘   └───┴────┘   ┌───────┐   │3H │   ├───┤
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │4E │4F │4G │4H │    ANSI         ISO         │4E     │   │   │   │   │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┼───┤    Enter        Enter       └───────┘   └───┘   │4H │ 2u Numpad Enter
+│50  │51  │52  │55                      │5A   │58   │5C │5D │5E │5F │5G │5H │                              2u Zero            │   │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘                              on Shift Row       └───┘
+┌────────┐                                   ┌───┬──────────┬───────┐
+│40      │ 2.25u LShift      1u/2.75u RShift │4B │4D        │5E     │ 2u Numpad Zero
+└────────┘                                   └───┴──────────┴───────┘
+                                             ┌────┬────┬────┐
+                             3x 1.25u RShift │4B  │4C  │4D  │
+                                             └────┴────┴────┘
+┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+│50  │51  │52  │55                      │5A  │58  │5C  │5D  │ ANSI
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌─────┬───┬─────┬───────────────────────┬─────┬─────┬───┬───┐
+│50   │51 │52   │55                     │5A   │58   │5C │5D │ Tsangan
+└─────┴───┴─────┴───────────────────────┴─────┴─────┴───┴───┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┬───┬───┐
+│50   │51   │55                         │5A   │58   │5C │5D │ WKL
+└─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┘
+      ┌───┬─────┬───────────────────────────┬─────┬───┐
+      │51 │52   │55                         │58   │5C │ HHKB
+      └───┴─────┴───────────────────────────┴─────┴───┘
+```
diff --git a/keyboards/xiudi/xd96/readme.md b/keyboards/xiudi/xd96/readme.md
index 5f4038ef3fd..47a91c834d1 100644
--- a/keyboards/xiudi/xd96/readme.md
+++ b/keyboards/xiudi/xd96/readme.md
@@ -9,7 +9,7 @@ Keyboard with 96 Keys & RGB LED Underglow
 
 * Keyboard Maintainer: QMK Community
 * Hardware Supported: XD96
-* Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd96-pcb-90-custom-mechanical-keyboard-supports-tkg-tools-underglow-rgb-programmed); [AliExpress](https://aliexpress.com/item/cospad-Custom-Mechanical-Keyboard-Kit-up-tp-24-keys-Supports-TKG-TOOLS-Underglow-RGB-PCB-20/32818383873.html)
+* Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd96-pcb-90-custom-mechanical-keyboard-supports-tkg-tools-underglow-rgb-programmed); [AliExpress](https://www.aliexpress.com/i/2251832661406145.html)
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/xw60/keymaps/pingjunior/keymap.c b/keyboards/xw60/keymaps/pingjunior/keymap.c
deleted file mode 100644
index 5c49e174ef5..00000000000
--- a/keyboards/xw60/keymaps/pingjunior/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* 0: default */
-  LAYOUT_pingjunior(
-    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_PENT, 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, MO(2),    
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
-  ),
-  /* 1: hhkb */
-  LAYOUT_pingjunior(
-    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_BSLS, 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_BSPC,
-    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_PENT, 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, MO(2),    
-    KC_NO,   KC_LALT, KC_LGUI,                            KC_SPC,                                      KC_RGUI, KC_RALT, KC_NO
-  ),
-  /* 2: fn */
-  LAYOUT_pingjunior(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-    KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, KC_DEL,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, _______,
-             _______, _______, _______, _______, _______, HF_TOGG, HF_DWLU, HF_DWLD, _______, _______, KC_DOWN, _______, _______,
-    _______, _______, _______,                            _______,                                     _______, _______, _______
-  ),
-
-};
diff --git a/keyboards/xw60/keymaps/pingjunior/readme.md b/keyboards/xw60/keymaps/pingjunior/readme.md
deleted file mode 100644
index 0943a88a955..00000000000
--- a/keyboards/xw60/keymaps/pingjunior/readme.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# The default keymap for pingjunior
-
- ### layer 0 - default
-  ```
-  .--------------------------------------------------------------------------.
-  | esc|  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |  ` |bksp|
-  |--------------------------------------------------------------------------|
-  | tab   |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] |   \  |
-  |--------------------------------------------------------------------------|
-  | caps   |  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |pent|enter|
-  |--------------------------------------------------------------------------|
-  | shift    |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / |  shift | fn |
-  |--------------------------------------------------------------------------|
-  | ctrl | gui| alt  |               space                | alt  | gui/ ctrl |
-  '--------------------------------------------------------------------------'
-  ```
- ### layer 1 - hhkb
-  ```
-  .--------------------------------------------------------------------------.
-  | esc|  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |  \ |  ` |
-  |--------------------------------------------------------------------------|
-  | tab   |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] | bksp |
-  |--------------------------------------------------------------------------|
-  | ctrl   |  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |pent|enter|
-  |--------------------------------------------------------------------------|
-  | shift    |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / |  shift | fn |
-  '--------------------------------------------------------------------------'
-         | alt| gui  |               space                | gui  | alt|
-         '------------------------------------------------------------'
-  ```
- ### layer 2 - fn
-  ```
-  ,--------------------------------------------------------------------------.
-  |    | f1 | f2 | f3 | f4 | f5 | f6 | f7 | f8 | f9 | f10| f11| f12| ins| del|
-  |--------------------------------------------------------------------------|
-  | caps |    | up |    |    |    |    |    |    |    |    | up |    |  del  |
-  |--------------------------------------------------------------------------|
-  |       |left|down|rght|    |    |    |    |    |    |left|rght|    |      |
-  |--------------------------------------------------------------------------|
-  |          |    |    |    |    |buzz| +  | -  |    |    |down|        |    |
-  |--------------------------------------------------------------------------|
-  |      |    |      |                                    |      |    |      |
-  '--------------------------------------------------------------------------'
-  ``` 
\ No newline at end of file
diff --git a/keyboards/yampad/keymaps/traditional/keymap.c b/keyboards/yampad/keymaps/traditional/keymap.c
deleted file mode 100644
index 6bd18cfd299..00000000000
--- a/keyboards/yampad/keymaps/traditional/keymap.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* MIT License
-
-Copyright (c) 2020 Richard Davey (Daveyr)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#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 layers {
-  _BL = 0,
-  _NV,
-  _FN
-};
-
-enum custom_keycodes {
-  KC_DBL0 = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap _BL: (Base Layer) Default Layer
- * ,-------------------.
- * | NV | /  | *  |-/FN|
- * |----|----|----|----|
- * | 7  | 8  | 9  |    |
- * |----|----|----| +  |
- * | 4  | 5  | 6  |    |
- * |----|----|----|----|
- * | 1  | 2  | 3  |    |
- * |----|----|----| En |
- * | 0  | 00 | .  |    |
- * `-------------------'
- */
-  [_BL] = LAYOUT(
-    TG(_NV),  KC_PSLS,  KC_PAST,   LT(_FN, 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_DBL0,  KC_PDOT,   KC_PENT
-  ),
-
-/* Keymap _NV: Navigation layer
- * ,-------------------.
- * |INS |BSPC|    |    |
- * |----|----|----|----|
- * |HOME| UP |PGUP|    |
- * |----|----|----|    |
- * |LEFT|DEL |RGHT|    |
- * |----|----|----|----|
- * |END |DOWN|PGDN|    |
- * |----|----|----|    |
- * |    |    |    |    |
- * `-------------------'
- */
-  [_NV] = LAYOUT(
-    KC_INS,   KC_BSPC, XXXXXXX,   TG(_NV),
-    KC_HOME,  KC_UP,   KC_PGUP,
-    KC_LEFT,  KC_DEL,  KC_RGHT,   XXXXXXX,
-    KC_END,   KC_DOWN, KC_PGDN,
-    XXXXXXX,  XXXXXXX, XXXXXXX,   XXXXXXX
-  ),
-
-/* Keymap _FN: RGB Function Layer
- * ,-------------------.
- * |RMOD|RGBP|RTOG| FN |
- * |----|----|----|----|
- * |HUD |HUI |    |    |
- * |----|----|----|    |
- * |SAD |SAI |    |    |
- * |----|----|----|----|
- * |VAD |VAS |    |    |
- * |----|----|----|    |
- * |RST |    |    |    |
- * `-------------------'
- */
-  [_FN] = LAYOUT(
-    RGB_MOD,  RGB_M_P,  RGB_TOG,   _______,
-    RGB_HUD,  RGB_HUI,  XXXXXXX,
-    RGB_SAD,  RGB_SAI,  XXXXXXX,   XXXXXXX,
-    RGB_VAD,  RGB_VAI,  XXXXXXX,
-    QK_BOOT,  XXXXXXX,  XXXXXXX,   XXXXXXX
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case KC_DBL0:
-      if (record->event.pressed) {
-        SEND_STRING("00");
-      } else {
-        // when keycode KC_DBL0 is released
-      }
-      break;
-
-  }
-  return true;
-};
-
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;  // flips the display 270 degrees
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_P(PSTR("Layer"), false);
-  switch (get_highest_layer(layer_state)) {
-    case _BL:
-      oled_write_ln_P(PSTR(" BAS"), false);
-      break;
-    case _NV:
-      oled_write_ln_P(PSTR(" NAV"), false);
-      break;
-    case _FN:
-      oled_write_ln_P(PSTR(" RGB"), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR(" UND"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(PSTR("-----"), false);
-  oled_write_P(PSTR("Stats"), false);
-  oled_write_P(led_state.num_lock ? PSTR("num:*") : PSTR("num:."), false);
-  oled_write_P(led_state.caps_lock ? PSTR("cap:*") : PSTR("cap:."), false);
-  oled_write_P(led_state.scroll_lock ? PSTR("scr:*") : PSTR("scr:."), false);
-
-  // Host Keyboard RGB backlight status
-  oled_write_P(PSTR("-----"), false);
-  oled_write_P(PSTR("Light"), false);
-
-  static char led_buf[30];
-  snprintf(led_buf, sizeof(led_buf) - 1, "RGB:%cM: %2d\nh: %2ds: %2dv: %2d\n",
-      rgblight_is_enabled() ? '*' : '.', (uint8_t)rgblight_get_mode(),
-      (uint8_t)(rgblight_get_hue() / RGBLIGHT_HUE_STEP),
-      (uint8_t)(rgblight_get_sat() / RGBLIGHT_SAT_STEP),
-      (uint8_t)(rgblight_get_val() / RGBLIGHT_VAL_STEP));
-  oled_write(led_buf, false);
-
-    return false;
-}
-#endif
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index 6985b4b8bb2..aa9b295e020 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -15,13 +15,7 @@
  */
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-
-#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
-#    define WS2812_PWM_DRIVER PWMD1
-#    define WS2812_PWM_CHANNEL 1
-#    define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#    define WS2812_DMA_CHANNEL 5
-
-#endif
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_DMA_CHANNEL 5
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
index a1b5a0e9cfa..c3aaf39e2d8 100644
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -30,6 +30,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "debounce": 8,
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index 98480b2687e..4d5c6629996 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -15,14 +15,10 @@
  */
 #pragma once
 
-#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+#define RGBLIGHT_LAYERS_RETAIN_VAL
 
-#    define RGBLIGHT_LAYERS
-#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#    define RGBLIGHT_LAYERS_RETAIN_VAL
-
-#   define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
-#   define WS2812_PWM_CHANNEL 2     // default: 2
-#   define WS2812_PWM_PAL_MODE 2
-#   define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#   define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
+#define WS2812_PWM_CHANNEL 2     // default: 2
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_DMA_CHANNEL 3
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
index 2bf8cd36b3d..956016a7e6d 100644
--- a/keyboards/yandrstudio/nightstar75/info.json
+++ b/keyboards/yandrstudio/nightstar75/info.json
@@ -24,6 +24,13 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
         }
     },
     "matrix_pins": {
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 4aa37c5f20b..81b549b60d7 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -15,76 +15,8 @@
  */
 #pragma once
 
-/* RGB Matrix */
-#ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_LED_COUNT 82
-
-#   define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
-#   define WS2812_PWM_CHANNEL 2  // default: 2
-#   define WS2812_PWM_PAL_MODE 2  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
-#   define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#   define WS2812_DMA_CHANNEL 5  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-
-
-#   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED true
-#   define RGB_MATRIX_CENTER { 96, 32 }
-#   define RGB_MATRIX_KEYPRESSES
-#   define RGB_MATRIX_FRAMEBUFFER_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
-#   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
-
-
-#ifdef RGBLIGHT_ENABLE
-#   define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
-#   define WS2812_PWM_CHANNEL 2  // default: 2
-#   define WS2812_PWM_PAL_MODE 2  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
-#   define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#   define WS2812_DMA_CHANNEL 5  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#endif
+#define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
+#define WS2812_PWM_CHANNEL 2  // default: 2
+#define WS2812_PWM_PAL_MODE 2  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL 5  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index 1ac32fe9a49..27515bebbc7 100644
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -12,7 +12,55 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [96, 32],
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["A15", "B3", "B4", "B6", "B7", "B5", "C13", "A5", "A4", "B14", "B15", "A8", "A9", "A10"],
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index dba2f773950..7ecdfeafcfc 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -16,65 +16,7 @@
 
 #pragma once
 
-/* RGB Matrix */
-#ifdef RGB_MATRIX_ENABLE
-
-#    define RGB_MATRIX_LED_COUNT 86
-
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_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
-#   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 WS2812_PWM_DRIVER PWMD3  // default: PWMD2
-#    define WS2812_PWM_CHANNEL 2  // default: 2
-#    define WS2812_DMA_STREAM STM32_DMA1_STREAM3  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#    define WS2812_DMA_CHANNEL 3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-
-#endif
+#define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
+#define WS2812_PWM_CHANNEL 2  // default: 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM3  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL 3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
index 3cd784934ab..372330eb68f 100644
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ b/keyboards/yandrstudio/nz67v2/info.json
@@ -11,7 +11,54 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index 3386838c749..686696be7d5 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -15,67 +15,8 @@
  */
 #pragma once
 
-/* RGB Matrix */
-#ifdef RGB_MATRIX_ENABLE
-
-#    define RGB_MATRIX_LED_COUNT 69
-
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 250
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_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
-
-#   define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#   define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#   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 WS2812_PWM_DRIVER PWMD3
-#   define WS2812_PWM_CHANNEL 2
-#   define WS2812_PWM_PAL_MODE 2
-#   define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#   define WS2812_DMA_CHANNEL 3
-
-#endif
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 2
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_DMA_CHANNEL 3
diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json
index a82f58300b1..0e4a0f62434 100644
--- a/keyboards/yandrstudio/tg67/info.json
+++ b/keyboards/yandrstudio/tg67/info.json
@@ -11,7 +11,54 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 250,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["B2", "B10", "B11", "A8", "A9", "A10", "B5", "A15", "B3", "A2", "A3", "B4", "A4", "A5", "A6"],
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index 592953720f1..05a8922788f 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -15,13 +15,9 @@
  */
 #pragma once
 
-#    define RGBLIGHT_LAYERS
-#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#    define RGBLIGHT_LAYERS_RETAIN_VAL
+#define RGBLIGHT_LAYERS_RETAIN_VAL
 
-#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
-#    define WS2812_PWM_DRIVER PWMD3
-#    define WS2812_PWM_CHANNEL 2
-#    define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#    define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_DMA_CHANNEL 3
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
index 0ea82bd3adf..7f5308f50a7 100644
--- a/keyboards/yandrstudio/yr6095/info.json
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -19,6 +19,13 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
         }
     },
     "ws2812": {
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
index a0841c469ce..08e10e243ed 100644
--- a/keyboards/yandrstudio/yr80/config.h
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -16,14 +16,10 @@
 
 #pragma once
 
-#    define RGBLIGHT_LAYERS
-#    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#    define RGBLIGHT_LAYERS_RETAIN_VAL
+#define RGBLIGHT_LAYERS_RETAIN_VAL
 
-#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
-#   define WS2812_PWM_DRIVER PWMD3
-#   define WS2812_PWM_CHANNEL 2
-#   define WS2812_PWM_PAL_MODE 2
-#   define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#   define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 2
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_DMA_CHANNEL 3
diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json
index ce9f4bc3790..3581fa9d1c8 100644
--- a/keyboards/yandrstudio/yr80/info.json
+++ b/keyboards/yandrstudio/yr80/info.json
@@ -19,6 +19,13 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
         }
     },
     "ws2812": {
diff --git a/keyboards/yatara/drink_me/keymaps/caterpillar/keymap.c b/keyboards/yatara/drink_me/keymaps/caterpillar/keymap.c
deleted file mode 100644
index f7bfdf1df53..00000000000
--- a/keyboards/yatara/drink_me/keymaps/caterpillar/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        LSFT(KC_O),
-        LSFT(KC_R),
-        LSFT(KC_U),
-        LSFT(KC_SLSH)
-    )
-};
diff --git a/keyboards/yatara/drink_me/keymaps/caterpillar/readme.md b/keyboards/yatara/drink_me/keymaps/caterpillar/readme.md
deleted file mode 100644
index d04a30f238a..00000000000
--- a/keyboards/yatara/drink_me/keymaps/caterpillar/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Drink Me - Caterpillar layout
-
-> ‘Who are you?’ said the Caterpillar.
-
-![Drink Me - Default layout](https://i.imgur.com/BHWNATB.png)
-
-```
-O, R, U, ?
-```
diff --git a/keyboards/yatara/drink_me/keymaps/cheshire_cat/keymap.c b/keyboards/yatara/drink_me/keymaps/cheshire_cat/keymap.c
deleted file mode 100644
index 528c1e408ee..00000000000
--- a/keyboards/yatara/drink_me/keymaps/cheshire_cat/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_LEFT,
-        KC_DOWN,
-        KC_UP,
-        KC_RIGHT
-    )
-};
diff --git a/keyboards/yatara/drink_me/keymaps/cheshire_cat/readme.md b/keyboards/yatara/drink_me/keymaps/cheshire_cat/readme.md
deleted file mode 100644
index 1dd0d658a3e..00000000000
--- a/keyboards/yatara/drink_me/keymaps/cheshire_cat/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Drink Me - Cheshire Cat layout
-
-> ‘Would you tell me, please, which way I ought to go from here?’
->
-> ‘That depends a good deal on where you want to get to,’ said the Cat.
-
-Cursor keys in VI layout.
-
-![Drink Me - Default layout](https://i.imgur.com/E4cScrK.png)
-
-```
-Left, Down, Up, Right
-```
diff --git a/keyboards/yatara/drink_me/keymaps/dormouse/keymap.c b/keyboards/yatara/drink_me/keymaps/dormouse/keymap.c
deleted file mode 100644
index e2d29a026ab..00000000000
--- a/keyboards/yatara/drink_me/keymaps/dormouse/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_SLEP,
-        KC_MUTE,
-        KC_VOLD,
-        KC_VOLU
-    )
-};
diff --git a/keyboards/yatara/drink_me/keymaps/dormouse/readme.md b/keyboards/yatara/drink_me/keymaps/dormouse/readme.md
deleted file mode 100644
index 1a8c854d44e..00000000000
--- a/keyboards/yatara/drink_me/keymaps/dormouse/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Drink Me - Dormouse layout
-
-> The Dormouse slowly opened his eyes. ‘I wasn’t asleep,’ he said in a hoarse, feeble voice: ‘I heard every word you fellows were saying.’
-
-Sleep and volume control.
-
-![Drink Me - Default layout](https://i.imgur.com/VQXH512.png)
-
-```
-Sleep, Mute, Volume down, Volume up
-```
diff --git a/keyboards/yatara/drink_me/keymaps/dormouse/rules.mk b/keyboards/yatara/drink_me/keymaps/dormouse/rules.mk
deleted file mode 100644
index fcfd2225bcf..00000000000
--- a/keyboards/yatara/drink_me/keymaps/dormouse/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-EXTRAKEY_ENABLE = yes
diff --git a/keyboards/yatara/drink_me/keymaps/queen/config.h b/keyboards/yatara/drink_me/keymaps/queen/config.h
deleted file mode 100644
index 4cb538fc6c7..00000000000
--- a/keyboards/yatara/drink_me/keymaps/queen/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/yatara/drink_me/keymaps/queen/keymap.c b/keyboards/yatara/drink_me/keymaps/queen/keymap.c
deleted file mode 100644
index 806dae3fcd9..00000000000
--- a/keyboards/yatara/drink_me/keymaps/queen/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-enum td_keys {
-    TD_K0,
-    TD_K1,
-    TD_K2,
-    TD_K3
-};
-
-
-void td_spade_lnx (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_unicode(0x2660); // ♠
-    } else {
-        set_unicode_input_mode(UNICODE_MODE_LINUX);
-    }
-    reset_tap_dance(state);
-}
-
-
-void td_diamond_osx (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_unicode(0x2666); // ♦
-    } else {
-        set_unicode_input_mode(UNICODE_MODE_MACOS);
-    }
-    reset_tap_dance(state);
-}
-
-
-void td_club_win (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_unicode(0x2663); // ♣
-    } else {
-        set_unicode_input_mode(UNICODE_MODE_WINDOWS);
-    }
-    reset_tap_dance(state);
-}
-
-
-void td_heart_winc (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_unicode(0x2665); // ♥
-    } else {
-        set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
-    }
-    reset_tap_dance(state);
-}
-
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_K0] = ACTION_TAP_DANCE_FN(td_spade_lnx),
-    [TD_K1] = ACTION_TAP_DANCE_FN(td_diamond_osx),
-    [TD_K2] = ACTION_TAP_DANCE_FN(td_club_win),
-    [TD_K3] = ACTION_TAP_DANCE_FN(td_heart_winc)
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        TD(TD_K0),
-        TD(TD_K1),
-        TD(TD_K2),
-        TD(TD_K3)
-    )
-};
diff --git a/keyboards/yatara/drink_me/keymaps/queen/readme.md b/keyboards/yatara/drink_me/keymaps/queen/readme.md
deleted file mode 100644
index cd89b7b0cb7..00000000000
--- a/keyboards/yatara/drink_me/keymaps/queen/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Drink Me - Queen layout
-
-> ‘Off with her head!’ the Queen shouted at the top of her voice. Nobody moved.
->
-> ‘Who cares for you?’ said Alice, (she had grown to her full size by this time.) ‘You’re nothing but a pack of cards!’
-
-Single tap for unicode symbols for playing card suits:
-
-![Drink Me - Queen layout single tap](https://i.imgur.com/xwHicLJ.png)
-
-```
-Spade, Diamond, Club, Heart
-```
-
-Double tap to change operating system unicode input method:
-
-![Drink Me - Queen layout double tap](https://i.imgur.com/fBbzq55.png)
-```
-Linux, OSX, Windows, Wincompose
-```
diff --git a/keyboards/yatara/drink_me/keymaps/queen/rules.mk b/keyboards/yatara/drink_me/keymaps/queen/rules.mk
deleted file mode 100644
index 705db8e333f..00000000000
--- a/keyboards/yatara/drink_me/keymaps/queen/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-UNICODE_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/ydkb/grape/config.h b/keyboards/ydkb/grape/config.h
index c0bea85abae..a835243d580 100644
--- a/keyboards/ydkb/grape/config.h
+++ b/keyboards/ydkb/grape/config.h
@@ -28,5 +28,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json
index 32c9914bdbc..75aa8fffafe 100644
--- a/keyboards/ydkb/grape/info.json
+++ b/keyboards/ydkb/grape/info.json
@@ -12,6 +12,9 @@
         "pin": "B7",
         "breathing": true
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "rgblight": {
         "led_count": 4
     },
diff --git a/keyboards/ydkb/just60/keymaps/thinxer/keymap.c b/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
deleted file mode 100644
index ebb7ba36734..00000000000
--- a/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2019 Jianfei Wang
- *
- * 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,
-    _COMMAND
-};
-
-#define FN_SPC LT(_FN, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-        QK_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_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,
-        MO(_FN),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,           KC_ENT,
-        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_LALT, KC_LGUI,  FN_SPC,           KC_SPC,          KC_RGUI, KC_RALT,          KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT
-    ),
-    [_FN] = LAYOUT(
-         KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10, KC_F11,  KC_F12, _______,
-        KC_CAPS, KC_HOME,   KC_UP,  KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______,  KC_INS,  KC_DEL, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______, _______,     MO(_COMMAND),
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______,          _______,          _______, _______,          KC_HOME, KC_PGDN, KC_PGUP,  KC_END
-     ),
-    [_COMMAND] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR,  QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______,          _______,          _______, _______,          _______, _______, _______, _______
-     )
-};
diff --git a/keyboards/ydkb/just60/keymaps/thinxer/readme.md b/keyboards/ydkb/just60/keymaps/thinxer/readme.md
deleted file mode 100644
index 9cd12c192f6..00000000000
--- a/keyboards/ydkb/just60/keymaps/thinxer/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# thinxer keymap for Just60
-
-This is a duplicate of the default keymap, but for a Just60 with the QMK DFU bootloader.
-
-This layout is an ANSI layout with a Minila spacebar row.
-
-```
- +-------------------------------------------------------------------------+
- | ESC | 1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = | BACKSP |
- +-------------------------------------------------------------------------+
- | TAB  |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] |   \  |
- +-------------------------------------------------------------------------+
- | FN     |  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |  RETURN |
- +-------------------------------------------------------------------------+
- | LSHIFT   |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / |   RSHIFT   |
- +-------------------------------------------------------------------------+
- | LCMD | LALT | LGUI | FN | SPACE | RGUI | RALT | LEFT | DOWN | UP | RGHT |
- +-------------------------------------------------------------------------+
-```
diff --git a/keyboards/ydkb/just60/keymaps/thinxer/rules.mk b/keyboards/ydkb/just60/keymaps/thinxer/rules.mk
deleted file mode 100644
index 0613ea8667c..00000000000
--- a/keyboards/ydkb/just60/keymaps/thinxer/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOOTLOADER = qmk-dfu
diff --git a/keyboards/yiancardesigns/barleycorn/matrix.c b/keyboards/yiancardesigns/barleycorn/matrix.c
index 99366d60987..9ef29265662 100644
--- a/keyboards/yiancardesigns/barleycorn/matrix.c
+++ b/keyboards/yiancardesigns/barleycorn/matrix.c
@@ -42,9 +42,9 @@ static void init_pins(void) {
     unselect_rows();
     // Set I/O
     uint8_t send_data[2] = { 0xFF, 0x03};
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data[0], 2, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data[0], 2, 20);
     // Set Pull-up
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x0C, &send_data[0], 2, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x0C, &send_data[0], 2, 20);
 
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
         if ( x < 8 ) {
@@ -75,7 +75,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
     matrix_io_delay();
 
     uint8_t port_expander_col_buffer[2];
-    i2c_readReg((PORT_EXPANDER_ADDRESS << 1), 0x12, &port_expander_col_buffer[0], 2, 20);
+    i2c_read_register((PORT_EXPANDER_ADDRESS << 1), 0x12, &port_expander_col_buffer[0], 2, 20);
 
     // For each col...
     for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
diff --git a/keyboards/yiancardesigns/gingham/gingham.c b/keyboards/yiancardesigns/gingham/gingham.c
index 496ae357054..f34d4d7cfdb 100644
--- a/keyboards/yiancardesigns/gingham/gingham.c
+++ b/keyboards/yiancardesigns/gingham/gingham.c
@@ -22,7 +22,7 @@ void matrix_init_kb(void) {
     // Due to the way the port expander is setup both LEDs are already outputs. This is set n matrix.copy
     //Turn the red LED on as power indicator.
     send_data = 0x10;
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &send_data, 1, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x09, &send_data, 1, 20);
 
     matrix_init_user();
 }
@@ -31,7 +31,7 @@ bool led_update_kb(led_t led_state) {
     bool res = led_update_user(led_state);
     if(res) {
         send_data = led_state.caps_lock ? 0x18 : 0x10;
-        i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &send_data, 1, 20);
+        i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x09, &send_data, 1, 20);
     }
     return res;
 }
diff --git a/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
deleted file mode 100644
index 67fdf6c35d1..00000000000
--- a/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright codecoffeecode
- *
- * 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
-
-//This is the ANSI version of the PCB
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_60_ansi_split_bs_rshift( /* Base */
-    QK_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_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, MO(2),
-    KC_LCTL,  KC_LGUI,  KC_LALT,                       KC_SPC,                          KC_RALT,  MO(1)  ,  KC_APP,  KC_RCTL),
-
-[1] = LAYOUT_60_ansi_split_bs_rshift( /* FN */
-    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_DEL,
-    KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  QK_BOOT,  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_VOLU,  KC_VOLD,  KC_MUTE,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-[2] = LAYOUT_60_ansi_split_bs_rshift( /* 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_DEL, KC_DEL,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-    KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  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_60_ansi_split_bs_rshift( /* 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),
-};
diff --git a/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/readme.md b/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/readme.md
deleted file mode 100644
index 6f6dbfc859a..00000000000
--- a/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-### Single backspace with a short right shift.
\ No newline at end of file
diff --git a/keyboards/yiancardesigns/gingham/matrix.c b/keyboards/yiancardesigns/gingham/matrix.c
index 47c8830565f..d17518b4940 100644
--- a/keyboards/yiancardesigns/gingham/matrix.c
+++ b/keyboards/yiancardesigns/gingham/matrix.c
@@ -42,9 +42,9 @@ static void init_pins(void) {
     unselect_rows();
     // Set I/O
     uint8_t send_data = 0x07;
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data, 1, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data, 1, 20);
     // Set Pull-up
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x06, &send_data, 1, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x06, &send_data, 1, 20);
 
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
         if ( (x > 0) && (x < 12) ) {
@@ -80,15 +80,15 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         // Select the col pin to read (active low)
         switch (col_index) {
             case 0 :
-                i2c_readReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &pin_state, 1, 20);
+                i2c_read_register((PORT_EXPANDER_ADDRESS << 1), 0x09, &pin_state, 1, 20);
                 pin_state = pin_state & 0x01;
                 break;
             case 12 :
-                i2c_readReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &pin_state, 1, 20);
+                i2c_read_register((PORT_EXPANDER_ADDRESS << 1), 0x09, &pin_state, 1, 20);
                 pin_state = pin_state & (1 << 2);
                 break;
             case 13 :
-                i2c_readReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &pin_state, 1, 20);
+                i2c_read_register((PORT_EXPANDER_ADDRESS << 1), 0x09, &pin_state, 1, 20);
                 pin_state = pin_state & (1 << 1);
                 break;
             default :
diff --git a/keyboards/yiancardesigns/seigaiha/matrix.c b/keyboards/yiancardesigns/seigaiha/matrix.c
index 212b8015f05..55ee239db4c 100644
--- a/keyboards/yiancardesigns/seigaiha/matrix.c
+++ b/keyboards/yiancardesigns/seigaiha/matrix.c
@@ -42,9 +42,9 @@ static void init_pins(void) {
     unselect_rows();
     // Set I/O
     uint8_t send_data = 0x1F;
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data, 1, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data, 1, 20);
     // Set Pull-up
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x06, &send_data, 1, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x06, &send_data, 1, 20);
 
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
         if ( x < 10 ) {
@@ -75,7 +75,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
     matrix_io_delay();
 
     uint8_t port_expander_col_buffer;
-    i2c_readReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &port_expander_col_buffer, 1, 20);
+    i2c_read_register((PORT_EXPANDER_ADDRESS << 1), 0x09, &port_expander_col_buffer, 1, 20);
 
     // For each col...
     for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
diff --git a/keyboards/yiancardesigns/seigaiha/seigaiha.c b/keyboards/yiancardesigns/seigaiha/seigaiha.c
index 7a39637b916..03d420f0539 100644
--- a/keyboards/yiancardesigns/seigaiha/seigaiha.c
+++ b/keyboards/yiancardesigns/seigaiha/seigaiha.c
@@ -26,7 +26,7 @@ void led_update_ports(led_t led_state) {
     } else {
         send_data &= ~(1 << 5);
     }
-    i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x0A, &send_data, 1, 20);
+    i2c_write_register((PORT_EXPANDER_ADDRESS << 1), 0x0A, &send_data, 1, 20);
 }
 
 __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/keyboards/ymdk/bface/keymaps/emdarcher/config.h b/keyboards/ymdk/bface/keymaps/emdarcher/config.h
deleted file mode 100644
index e1a6eb1a2b0..00000000000
--- a/keyboards/ymdk/bface/keymaps/emdarcher/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define GRAVE_ESC_ALT_OVERRIDE
diff --git a/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c b/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c
deleted file mode 100644
index 10095f929b7..00000000000
--- a/keyboards/ymdk/bface/keymaps/emdarcher/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright 2019 Ethan Durrant (emdarcher)
-
-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 _FL 1
-#define _CL 2
-#define _AL 3
-#define KC_X0   LT(_CL, KC_CAPS)   
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    //Base layer
-    [0] = LAYOUT_60_ansi_split_rshift(
-        QK_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_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_X0,     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_LALT,KC_LGUI,              KC_SPC,                        MO(_FL),MO(_AL),KC_RCTL,        KC_DOWN
-    ),
-    //FN Layer
-    [_FL] = LAYOUT_60_ansi_split_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,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MRWD,KC_MFFD,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MPLY,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,        KC_TRNS,KC_PGUP,
-        KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,        KC_PGDN
-    ),
-    //CAPS LOCK Layer
-    [_CL] = LAYOUT_60_ansi_split_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,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_HOME,
-        KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,         KC_END
-    ),
-    //Alt layer
-	[_AL] = LAYOUT_60_ansi_split_rshift(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,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,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RIGHT,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS, KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,                        KC_TRNS,KC_TRNS,KC_TRNS,         KC_TRNS
-    ),  
-    /* You can copy this layer as base for a new fn layer * /
-	[n] = LAYOUT_60_ansi_split_rshift(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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/ymdk/bface/keymaps/emdarcher/readme.md b/keyboards/ymdk/bface/keymaps/emdarcher/readme.md
deleted file mode 100644
index 7cba92fab60..00000000000
--- a/keyboards/ymdk/bface/keymaps/emdarcher/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# emdarcher's keymap
-
-Base Layer:
-![base](https://i.imgur.com/ie5aF7d.jpg)
-
-Uses a tweaked 60% ANSI layout with split right shift and up/down keys in the bottom right. Resulted from being used to 65% boards with arrow keys in bottom right and using the up/down arrows a lot in terminal.
-
-- Page Up/Down, and Home/End have been mapped to the up/down keys on different layers.
-- The Caps Lock Layer uses VIM style directions on HJKL keys.
-- LGUI moved to Mac Command Key location
-- FN2 layer that has arrows on IJKL for one-handed arrow key control.
-- Added Print Screen, Scroll Lock, and Pause keys on P,[,] keys to add Mac screen brightness control.
-    * On Mac, Scroll Lock is Brightness Down and Pause is Brightness Up, so with this FN+[ = brighness down, FN+] = brightness up
-- Has Mac Fast-forward and Rewind keys mapped for changing media tracks. FN+; = Rewind, FN+' = Fast-forward
diff --git a/keyboards/ymdk/bface/keymaps/minila/keymap.c b/keyboards/ymdk/bface/keymaps/minila/keymap.c
deleted file mode 100644
index f249b50e202..00000000000
--- a/keyboards/ymdk/bface/keymaps/minila/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2019 Ethan Durrant (emdarcher)
-
-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 {
-  _BL,
-  _FL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    //Base Layer
-    [_BL] = 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_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, 
-		LT(_FL, 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_NO, MT(MOD_RCTL, KC_ENT), 
-		SC_LSPO, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_UP, KC_DEL, 
-		KC_LCTL, KC_LGUI, KC_LALT, MO(_FL), KC_SPC, MO(_FL), KC_RALT, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    //FN Layer
-    [_FL] = LAYOUT_all(
-		KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, 
-		_______, _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, NK_TOGG, KC_PSCR, KC_SCRL, KC_PAUS, _______, BL_STEP, BL_TOGG, 
-		_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_INS, KC_HOME, KC_PGUP, KC_BSPC, _______, _______, _______, 
-		_______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, 
-		_______, _______, _______, _______, KC_ENT, _______, _______, _______, _______, _______, _______
-    ),
-};
diff --git a/keyboards/ymdk/bface/keymaps/minila/readme.md b/keyboards/ymdk/bface/keymaps/minila/readme.md
deleted file mode 100644
index 7b3760c136e..00000000000
--- a/keyboards/ymdk/bface/keymaps/minila/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Basically layout like on Filco Minila board, found here: https://geekboards.ru/product/filco-minila
-
-There is one single function layer that can be accessed by holding either FN key or Caps Lock. Enter is also a Right Control when held down. Shifts are also '(' and ')' respectively when tapped.
-
-You can control underglow RGBs:
-
-* FN+Z - Toggle
-* FN+X - Effect
-* FN+C - Color
-* FN+V - Brightness lower
-* FN+B - Brightness higher
diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h
index ed0d3f95397..14ed1d644c0 100644
--- a/keyboards/ymdk/id75/config.h
+++ b/keyboards/ymdk/id75/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 89
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json
index e30afaf717f..76bed29efb5 100644
--- a/keyboards/ymdk/id75/info.json
+++ b/keyboards/ymdk/id75/info.json
@@ -158,7 +158,8 @@
             {"flags": 2, "x": 190, "y": 0},
             {"flags": 2, "x": 224, "y": 0}
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "sleep": true
     },
     "usb": {
         "device_version": "0.0.1",
diff --git a/keyboards/ymdk/id75/keymaps/dothtm75/config.h b/keyboards/ymdk/id75/keymaps/dothtm75/config.h
deleted file mode 100644
index 155d4562d53..00000000000
--- a/keyboards/ymdk/id75/keymaps/dothtm75/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2017 Mike Cramer
- *
- * 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 HOLD_ON_OTHER_KEY_PRESS
-
-#define MIDI_ADVANCED
diff --git a/keyboards/ymdk/id75/keymaps/dothtm75/keymap.c b/keyboards/ymdk/id75/keymaps/dothtm75/keymap.c
deleted file mode 100644
index f8267aff643..00000000000
--- a/keyboards/ymdk/id75/keymaps/dothtm75/keymap.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Copyright 2017 Wunder
- *
- * 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_5x15(
-        KC_GRV,        KC_1,          KC_2,          KC_3,          KC_4,          KC_5,          LGUI(KC_MINS), LGUI(KC_EQL),  KC_6,          KC_7,          KC_8,          KC_9,          KC_0,          LGUI(KC_0),    KC_BSPC,
-        KC_TAB,        KC_Q,          KC_W,          KC_E,          KC_R,          KC_T,          LGUI(KC_LCBR), LGUI(KC_RCBR), KC_Y,          KC_U,          KC_I,          KC_O,          KC_P,          KC_LBRC,       KC_BSLS,
-        KC_ESC,        KC_A,          KC_S,          KC_D,          KC_F,          KC_G,          LGUI(KC_LBRC), LGUI(KC_RBRC), 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,          LGUI(KC_QUES), LGUI(KC_SLSH), KC_N,          KC_M,          KC_COMM,       KC_DOT,        KC_SLSH,       KC_UP,         KC_RSFT,
-        MO(2),         KC_LCTL,       KC_LALT,       KC_LGUI,       LT(1,KC_SPC),  KC_SPC,        LGUI(KC_SPC),  LGUI(KC_SPC),  KC_SPC,        LT(1,KC_SPC),  KC_RGUI,       KC_RALT,       KC_LEFT,       KC_DOWN,       KC_RGHT
-    ),
-
-    [1] = LAYOUT_ortho_5x15(
-        KC_TILD,       KC_F1,         KC_F2,         KC_F3,         KC_F4,         KC_NO,         KC_MINS,       KC_EQL,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         LGUI(KC_1),    KC_DEL,
-        KC_NO,         KC_F5,         KC_F6,         KC_F7,         KC_F8,         KC_NO,         KC_LCBR,       KC_RCBR,       KC_NO,         KC_LCBR,       KC_RCBR,       KC_DQUO,       KC_QUOT,       KC_NO,         KC_SLSH,
-        KC_NO,         KC_F9,         KC_F10,        KC_F11,        KC_F12,        KC_NO,         KC_LBRC,       KC_RBRC,       KC_NO,         KC_LBRC,       KC_RBRC,       KC_LT,         KC_GT,         KC_NO,         KC_PENT,
-        KC_TRNS,       KC_UNDS,       KC_PLUS,       KC_MINS,       KC_EQL,        KC_NO,         KC_QUES,       KC_SLSH,       KC_NO,         KC_QUES,       KC_SLSH,       KC_QUES,       KC_SLSH,       LCAG(KC_UP),   KC_TRNS,
-        MO(15),        KC_TRNS,       KC_TRNS,       KC_TRNS,       KC_TRNS,       LGUI(KC_SPC),  HYPR(KC_J),    KC_TRNS,       LGUI(KC_SPC),  KC_TRNS,       KC_TRNS,       KC_TRNS,       LGUI(KC_LBRC), LCAG(KC_DOWN), LGUI(KC_RBRC)
-    ),
-
-    [2] = LAYOUT_ortho_5x15(
-        DB_TOGG,       KC_F1,         KC_F2,         KC_F3,         KC_F4,         KC_F5,         KC_NO,         KC_NO,         KC_F6,         KC_F7,         KC_F8,         KC_F9,         KC_F10,        KC_NO,         KC_DEL,
-        RGB_TOG,       KC_F11,        KC_F12,        KC_F13,        KC_F14,        KC_F15,        KC_NO,         KC_NO,         KC_F16,        KC_F17,        KC_F18,        KC_F19,        KC_F20,        KC_NO,         KC_NO,
-        HYPR(KC_H),    KC_MUTE,       KC_VOLD,       KC_VOLU,       KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_F21,        KC_F22,        KC_F23,        KC_F24,        KC_NO,         KC_NO,         KC_NO,
-        KC_TRNS,       KC_MPRV,       KC_MPLY,       KC_MNXT,       KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_PGUP,       KC_TRNS,
-        KC_TRNS,       KC_TRNS,       KC_TRNS,       KC_TRNS,       MO(15),        HYPR(KC_K),    KC_NO,         KC_NO,         KC_TRNS,       MO(15),        KC_TRNS,       KC_TRNS,       KC_HOME,       KC_PGDN,       KC_END
-
-    ),
-
-    // Musical keys
-
-    [3] = LAYOUT_ortho_5x15(
-        // Chromatic Scale       Vertical  Typing 60
-        KC_ESC,        MI_C,          MI_E,          MI_Gs,          MI_C1,         MI_E1,        KC_NO,         KC_NO,          MI_Gs1,        MI_C2,         MI_E2,         MI_Gs2,        MI_C3,         MI_E3,        MI_TR0,
-        KC_TAB,        MI_Cs,         MI_F,          MI_A,           MI_Cs1,        MI_F1,        KC_NO,         KC_NO,          MI_A1,         MI_Cs2,        MI_F2,         MI_A2,         MI_Cs3,        MI_F3,        MI_TRSU,
-        KC_SPC,        MI_D,          MI_Fs,         MI_As,          MI_D1,         MI_Fs1,       KC_NO,         KC_NO,          MI_As1,        MI_D2,         MI_Fs2,        MI_As2,        MI_D3,         MI_Fs3,       MI_TRSD,
-        MI_SUST,        MI_Ds,         MI_G,          MI_B,           MI_Ds1,        MI_G1,        KC_NO,         KC_NO,          MI_B1,         MI_Ds2,        MI_G2,         MI_B2,         MI_Ds3,        MI_G3,        MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [4] = LAYOUT_ortho_5x15(
-        // Pocket Operator Scale Vertical  Typing 60
-        KC_ESC,        MI_C,          MI_G,           MI_C1,         MI_G1,         MI_C2,        KC_NO,         KC_NO,          MI_G2,         MI_C3,         MI_G3,         MI_C4,         MI_G4,         MI_C5,        MI_TR0,
-        KC_TAB,        MI_D,          MI_Gs,          MI_D1,         MI_Gs1,        MI_D2,        KC_NO,         KC_NO,          MI_Gs2,        MI_D3,         MI_Gs3,        MI_D4,         MI_Gs4,        MI_D5,        MI_TRSU,
-        KC_SPC,        MI_Ds,         MI_As,          MI_Ds1,        MI_As1,        MI_Ds2,       KC_NO,         KC_NO,          MI_As2,        MI_Ds3,        MI_As3,        MI_Ds4,        MI_As4,        MI_Ds5,       MI_TRSD,
-        MI_SUST,        MI_F,          MI_B,           MI_F1,         MI_B1,         MI_F2,        KC_NO,         KC_NO,          MI_B2,         MI_F3,         MI_B3,         MI_F4,         MI_B4,         MI_F5,        MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [5] = LAYOUT_ortho_5x15(
-        // Major scale           Vertical  Typing 60
-        KC_ESC,        MI_C,          MI_G,           MI_D1,         MI_A1,         MI_E2,        KC_NO,         KC_NO,          MI_B2,         MI_F3,         MI_C4,         MI_G4,         MI_D5,         MI_A5,        MI_TR0,
-        KC_TAB,        MI_D,          MI_A,           MI_E1,         MI_B1,         MI_F2,        KC_NO,         KC_NO,          MI_C3,         MI_G3,         MI_D4,         MI_A4,         MI_E5,         MI_B5,        MI_TRSU,
-        KC_SPC,        MI_E,          MI_B,           MI_F1,         MI_C2,         MI_G2,        KC_NO,         KC_NO,          MI_D3,         MI_A3,         MI_E4,         MI_B4,         MI_F5,        KC_NO,         MI_TRSD,
-        MI_SUST,        MI_F,           MI_C1,         MI_G1,         MI_D2,         MI_A2,        KC_NO,         KC_NO,          MI_E3,         MI_B3,         MI_F4,         MI_C5,         MI_G5,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [6] = LAYOUT_ortho_5x15(
-        // Black Keys            Vertical  Typing 60
-        KC_ESC,        MI_C,          MI_A,           MI_G1,         MI_F2,         MI_D3,        KC_NO,         KC_NO,          MI_C4,         MI_A4,         MI_G5,        KC_NO,         KC_NO,         KC_NO,         MI_TR0,
-        KC_TAB,        MI_D,           MI_C1,         MI_A1,         MI_G2,         MI_F3,        KC_NO,         KC_NO,          MI_D4,         MI_C5,         MI_A5,        KC_NO,         KC_NO,         KC_NO,         MI_TRSU,
-        KC_SPC,        MI_F,           MI_D1,         MI_C2,         MI_A2,         MI_G3,        KC_NO,         KC_NO,          MI_F4,         MI_D5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TRSD,
-        MI_SUST,        MI_G,           MI_F1,         MI_D2,         MI_C3,         MI_A3,        KC_NO,         KC_NO,          MI_G4,         MI_F5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [7] = LAYOUT_ortho_5x15(
-        // Chromatic Scale       Vertical
-        KC_ESC,        MI_C,          MI_E,          MI_Gs,          MI_C1,         MI_E1,         MI_Gs1,        MI_C2,         MI_E2,         MI_Gs2,        MI_C3,         MI_E3,         MI_Gs3,       KC_NO,         MI_TR0,
-        KC_TAB,        MI_Cs,         MI_F,          MI_A,           MI_Cs1,        MI_F1,         MI_A1,         MI_Cs2,        MI_F2,         MI_A2,         MI_Cs3,        MI_F3,         MI_A3,        KC_NO,         MI_TRSU,
-        KC_SPC,        MI_D,          MI_Fs,         MI_As,          MI_D1,         MI_Fs1,        MI_As1,        MI_D2,         MI_Fs2,        MI_As2,        MI_D3,         MI_Fs3,        MI_As3,       KC_NO,         MI_TRSD,
-        MI_SUST,        MI_Ds,         MI_G,          MI_B,           MI_Ds1,        MI_G1,         MI_B1,         MI_Ds2,        MI_G2,         MI_B2,         MI_Ds3,        MI_G3,         MI_B3,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [8] = LAYOUT_ortho_5x15(
-        // Pocket Operator Scale Vertical
-        KC_ESC,        MI_C,          MI_G,           MI_C1,         MI_G1,         MI_C2,         MI_G2,         MI_C3,         MI_G3,         MI_C4,         MI_G4,         MI_C5,         MI_G5,        KC_NO,         MI_TR0,
-        KC_TAB,        MI_D,          MI_Gs,          MI_D1,         MI_Gs1,        MI_D2,         MI_Gs2,        MI_D3,         MI_Gs3,        MI_D4,         MI_Gs4,        MI_D5,         MI_Gs5,       KC_NO,         MI_TRSU,
-        KC_SPC,        MI_Ds,         MI_As,          MI_Ds1,        MI_As1,        MI_Ds2,        MI_As2,        MI_Ds3,        MI_As3,        MI_Ds4,        MI_As4,        MI_Ds5,        MI_As5,       KC_NO,         MI_TRSD,
-        MI_SUST,        MI_F,          MI_B,           MI_F1,         MI_B1,         MI_F2,         MI_B2,         MI_F3,         MI_B3,         MI_F4,         MI_B4,         MI_F5,         MI_B5,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [9] = LAYOUT_ortho_5x15(
-        // Major scale           Vertical
-        KC_ESC,        MI_C,          MI_G,           MI_D1,         MI_A1,         MI_E2,         MI_B2,         MI_F3,         MI_C4,         MI_G4,         MI_D5,         MI_A5,        KC_NO,         KC_NO,         MI_TR0,
-        KC_TAB,        MI_D,          MI_A,           MI_E1,         MI_B1,         MI_F2,         MI_C3,         MI_G3,         MI_D4,         MI_A4,         MI_E5,         MI_B5,        KC_NO,         KC_NO,         MI_TRSU,
-        KC_SPC,        MI_E,          MI_B,           MI_F1,         MI_C2,         MI_G2,         MI_D3,         MI_A3,         MI_E4,         MI_B4,         MI_F5,        KC_NO,         KC_NO,         KC_NO,         MI_TRSD,
-        MI_SUST,        MI_F,           MI_C1,         MI_G1,         MI_D2,         MI_A2,         MI_E3,         MI_B3,         MI_F4,         MI_C5,         MI_G5,        KC_NO,         KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [10] = LAYOUT_ortho_5x15(
-        // Black Keys            Vertical
-        KC_ESC,        MI_C,          MI_A,           MI_G1,         MI_F2,         MI_D3,         MI_C4,         MI_A4,         MI_G5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TR0,
-        KC_TAB,        MI_D,           MI_C1,         MI_A1,         MI_G2,         MI_F3,         MI_D4,         MI_C5,         MI_A5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TRSU,
-        KC_SPC,        MI_F,           MI_D1,         MI_C2,         MI_A2,         MI_G3,         MI_F4,         MI_D5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TRSD,
-        MI_SUST,        MI_G,           MI_F1,         MI_D2,         MI_C3,         MI_A3,         MI_G4,         MI_F5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [11] = LAYOUT_ortho_5x15(
-        // Chromatic Scale       Horizontal
-        KC_ESC,        MI_C,          MI_Cs,         MI_D,          MI_Ds,         MI_E,          MI_F,          MI_Fs,         MI_G,          MI_Gs,         MI_A,          MI_As,         MI_B,          KC_NO,         MI_TR0,
-        KC_TAB,         MI_C1,         MI_Cs1,        MI_D1,         MI_Ds1,        MI_E1,         MI_F1,         MI_Fs1,        MI_G1,         MI_Gs1,        MI_A1,         MI_As1,        MI_B1,        KC_NO,         MI_TRSU,
-        KC_SPC,         MI_C2,         MI_Cs2,        MI_D2,         MI_Ds2,        MI_E2,         MI_F2,         MI_Fs2,        MI_G2,         MI_Gs2,        MI_A2,         MI_As2,        MI_B2,        KC_NO,         MI_TRSD,
-        MI_SUST,         MI_C3,         MI_Cs3,        MI_D3,         MI_Ds3,        MI_E3,         MI_F3,         MI_Fs3,        MI_G3,         MI_Gs3,        MI_A3,         MI_As3,        MI_B3,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-    [12] = LAYOUT_ortho_5x15(
-        // Pocket Operator Scale Horizontal
-        KC_ESC,        MI_C,          MI_D,          MI_Ds,         MI_F,          MI_G,          MI_Gs,         MI_As,         MI_B,           MI_C1,         MI_D1,         MI_Ds1,        MI_F1,        KC_NO,         MI_TR0,
-        KC_TAB,         MI_G1,         MI_Gs1,        MI_As1,        MI_B1,         MI_C2,         MI_D2,         MI_Ds2,        MI_F2,         MI_G2,         MI_Gs2,        MI_As2,        MI_B2,        KC_NO,         MI_TRSU,
-        KC_SPC,         MI_C3,         MI_D3,         MI_Ds3,        MI_F3,         MI_G3,         MI_Gs3,        MI_As3,        MI_B3,         MI_C4,         MI_D4,         MI_Ds4,        MI_F4,        KC_NO,         MI_TRSD,
-        MI_SUST,         MI_G4,         MI_Gs4,        MI_As4,        MI_B4,         MI_C5,         MI_D5,         MI_Ds5,        MI_F5,         MI_G5,         MI_Gs5,        MI_As5,        MI_B5,        KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [13] = LAYOUT_ortho_5x15(
-        // Major scale           Horizontal
-        KC_ESC,        MI_C,          MI_D,          MI_E,          MI_F,          MI_G,          MI_A,          MI_B,           MI_C1,         MI_D1,         MI_E1,         MI_F1,         MI_G1,        KC_NO,         MI_TR0,
-        KC_TAB,         MI_A1,         MI_B1,         MI_C2,         MI_D2,         MI_E2,         MI_F2,         MI_G2,         MI_A2,         MI_B2,         MI_C3,         MI_D3,         MI_E3,        KC_NO,         MI_TRSU,
-        KC_SPC,         MI_F3,         MI_G3,         MI_A3,         MI_B3,         MI_C4,         MI_D4,         MI_E4,         MI_F4,         MI_G4,         MI_A4,         MI_B4,         MI_C5,        KC_NO,         MI_TRSD,
-        MI_SUST,         MI_D5,         MI_E5,         MI_F5,         MI_G5,         MI_A5,         MI_B5,        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-    [14] = LAYOUT_ortho_5x15(
-        // Black Keys            Horizontal
-        KC_ESC,        MI_C,          MI_D,          MI_F,          MI_G,          MI_A,           MI_C1,         MI_D1,         MI_F1,         MI_G1,         MI_A1,         MI_C2,         MI_D2,        KC_NO,         MI_TR0,
-        KC_TAB,         MI_F2,         MI_G2,         MI_A2,         MI_C3,         MI_D3,         MI_F3,         MI_G3,         MI_A3,         MI_C4,         MI_D4,         MI_F4,         MI_G4,        KC_NO,         MI_TRSU,
-        KC_SPC,         MI_A4,        MI_C,          MI_D,          MI_F,          MI_G,          MI_A,          KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         MI_TRSD,
-        MI_SUST,        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,         MI_OCTU,
-        MO(15),        KC_LCTL,       KC_LALT,       KC_LGUI,       MI_BNDD,      MI_SUST,        MI_SUST,        MI_SUST,        MI_SUST,        MI_BNDU,      KC_NO,         KC_NO,         MI_MODD,      MI_MODU,      MI_OCTD
-
-    ),
-
-    [15] = LAYOUT_ortho_5x15(
-        // Settings
-        DB_TOGG,       MI_CH1,        MI_CH2,        MI_CH3,        MI_CH4,        MI_CH5,        KC_NO,         KC_NO,         MI_CH6,        MI_CH7,        MI_CH8,        AU_TOGG,        KC_NO,         KC_NO,         QK_BOOT,
-        KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         KC_NO,         DF(3),         DF(4),         DF(5),         DF(6),         KC_NO,         KC_NO,         KC_NO,
-        RGB_MOD,       RGB_HUI,       RGB_SAI,       RGB_VAI,       RGB_SPI,       KC_NO,         KC_NO,         KC_NO,         DF(11),        DF(12),        DF(13),        DF(14),        KC_NO,         KC_NO,         DB_TOGG,
-        RGB_RMOD,      RGB_HUD,       RGB_SAD,       RGB_VAD,       RGB_SPD,       KC_NO,         KC_NO,         KC_NO,         DF(7),         DF(8),         DF(9),         DF(10),        KC_NO,         KC_NO,         KC_NO,
-        KC_TRNS,       KC_NO,         KC_NO,         KC_NO,         KC_TRNS,       DF(0),         DF(0),         DF(0),         DF(0),         KC_TRNS,       KC_NO,         KC_TRNS,       KC_NO,         KC_NO,         KC_NO
-    )
-};
-
diff --git a/keyboards/ymdk/id75/keymaps/dothtm75/rules.mk b/keyboards/ymdk/id75/keymaps/dothtm75/rules.mk
deleted file mode 100644
index 56c4130708c..00000000000
--- a/keyboards/ymdk/id75/keymaps/dothtm75/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-MIDI_ENABLE = yes
diff --git a/keyboards/ymdk/melody96/hotswap/keymaps/zunger/config.h b/keyboards/ymdk/melody96/hotswap/keymaps/zunger/config.h
deleted file mode 100644
index cc06440e0dd..00000000000
--- a/keyboards/ymdk/melody96/hotswap/keymaps/zunger/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2018 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
-
-// Enable cmd-option-escape on mac.
-#define GRAVE_ESC_ALT_OVERRIDE
-
-// place overrides here
diff --git a/keyboards/ymdk/melody96/hotswap/keymaps/zunger/keymap.c b/keyboards/ymdk/melody96/hotswap/keymaps/zunger/keymap.c
deleted file mode 100644
index c84f656080f..00000000000
--- a/keyboards/ymdk/melody96/hotswap/keymaps/zunger/keymap.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/* Copyright 2019 Yonatan Zunger
- *
- * 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 <assert.h>
-
-// This keymap is designed to make it easy to type in a wide variety of languages, as well as
-// generate mathematical symbols (à la Space Cadet).
-//
-// LAYER MAGIC (aka, typing in many alphabets)
-//   This keyboard has three "base" layers: QWERTY, GREEK, and CADET. The GREEK and CADET layers
-// are actually full of Unicode points, and so which point they generate depends on things like
-// whether the shift key is down. To handle this, each of those layers is actually *two* layers, one
-// with and one without shift. In our main loop, we manage modifier state detection, as well as
-// layer switch detection, and pick the right layer on the fly.
-//   Layers are selected with a combination of three keys. The "Greek" and "Cadet" keys act like
-// modifiers: When held down, they transiently select the indicated base layer. The "Layer Lock" key
-// locks the value of the base layer at whatever is currently held; so e.g., if you hold Greek +
-// Layer Lock, you'll stay in Greek mode until you hit Layer Lock again without any of the mods
-// held.
-//   TODO: This system of layer selection is nice for math, but it's not very nice for actually
-// typing in multiple languages. It seems like a better plan will be to reserve one key for each
-// base layer -- maybe fn + F(n) -- which can either be held as a modifier or tapped to switch
-// layers. That will open up adding some more languages, like Yiddish, but to do this effectively
-// we'll need to find a good UI with which to show the currently selected layer. Need to check what
-// the melody96 has in the way of outputs (LEDs, sound, etc).
-//
-// ACCENT MAGIC (aka, typing conveniently in Romance languages)
-//   We want to support easy typing of diacritical marks. We can't rely on the host OS for this,
-// because (e.g.) on MacOS, to make any of the other stuff work, we need to be using the Unicode
-// input method at the OS level, which breaks all the normal accent stuff on that end. So we do it
-// ourselves. Accents can actually be invoked in two different ways: one fast and very compatible,
-// one very versatile but with occasional compatibility problems.
-//
-//   THE MAIN WAY: You can hit one of the "accent request" key patterns immediately *before* typing
-//   a letter to be accented. It will emit the corresponding accented Unicode. For example, you can
-//   hit fn-e to request an acute accent, followed by i, and it will output í, U+00ED LATIN SMALL
-//   LETTER I WITH ACUTE. These "combined characters" are in Unicode normal form C (NFKC), which is
-//   important because many European websites and apps, in particular, tend to behave very badly
-//   (misunderstanding and/or crashing) when presented with characters in other forms! The catch is
-//   that this only works for the various combinations of letters and accents found in the Latin-1
-//   supplement block of Unicode -- basically, things you need for Western European languages.
-//
-//   (NB: If you make an accent request followed by a letter which can't take the corresponding
-//   accent, it will output the uncombined form of the accent followed by whatever you typed; so
-//   e.g., if you hit fn-e followed by f, it will output ´f, U+00B4 ACUTE ACCENT followed by an
-//   ordinary f. This is very similar to the default behavior of MacOS.)
-//
-//   THE FLEXIBLE WAY: If you hit the accent request with a shift -- e.g., fn-shift-e -- it will
-//   instead immediately output the corresponding *combining* Unicode accent mark, which will modify
-//   the *previous* character you typed. For example, if you type i followed by fn-shift-e, it will
-//   generate í. But don't be fooled by visual similarity: unlike the previous example, this one is
-//   an ordinary i followed by U+0301 COMBINING ACUTE ACCENT. It's actually *two symbols*, and this
-//   is Unicode normal form D (NFKD). Unlike NFKC, there are NFKD representations of far more
-//   combinations of letters and accents, and it's easy to add more of these if you need. (The NFKC
-//   representation of such combinations is identical to their NFKD representation)
-//
-//   Programs that try to compare Unicode strings *should* first normalize them by converting them
-//   all into one normal form or another, and there are functions in every programming language to
-//   do this -- e.g., JavaScript's string.normalize() -- but lots of programmers fail to understand
-//   this, and so write code that massively freaks out when it encounters the wrong form.
-//
-// The current accent request codes are modeled on the ones in MacOS.
-//
-//    fn+`    Grave accent (`)
-//    fn+e    Acute accent (´)
-//    fn+i    Circumflex (^)
-//    fn+u    Diaresis / umlaut / trema (¨)
-//    fn+c    Cedilla (¸)
-//    fn+n    Tilde (˜)
-//
-// Together, these functions make for a nice "polyglot" keyboard: one that can easily type in a wide
-// variety of languages, which is very useful for people who, well, need to type in a bunch of
-// languages.
-//
-// The major TODOs are:
-//   - Update the layer selection logic (and add visible layer cues);
-//   - Factor the code below so that the data layers are more clearly separated from the code logic,
-//     so that other users of this keymap can easily add whichever alphabets they need without
-//     having to deeply understand the implementation.
-
-
-enum custom_keycodes {
-  // We provide special layer management keys:
-  //    GREEK triggers the Greek (aka "Front") layer, or the SHIFTGREEK layer when shift is held.
-  //          (Because we use Unicode, we need to implement shift-handling at the firmware level,
-  //          rather than the OS level like we do in the QWERTY layer)
-  //    CADET or GREEK+ALT triggers the Cadet (aka "Top") layer, or the SHIFTCADET layer when
-  //          shift is held.
-  //    LAYER_LOCK locks the "base" layer (i.e., QWERTY, GREEK, or CADET) to the value which is
-  //          pressed at the moment that it is being released. When a layer lock is set, the
-  //          analogous layer modifier key is reversed; e.g., if you lock the GREEK layer, then the
-  //          GREEK button bounces you back to QWERTY.
-  //
-  // We also parse the shift, alt, and caps lock keys to provide management of those which is
-  // compatible with these various layers.
-  KC_GREEK = SAFE_RANGE,
-  KC_CADET,
-  KC_LAYER_LOCK,
-
-  // These are the keycodes generated by the various "accent request" keystrokes.
-  KC_ACCENT_START,
-  KC_CGRV = KC_ACCENT_START,  // Grave accent
-  KC_CAGU,  // Acute accent
-  KC_CDIA,  // Diaresis / umlaut / trema
-  KC_CCIR,  // Circumflex
-  KC_CCED,  // Cedilla
-  KC_CTIL,  // Tilde
-  KC_ACCENT_END,
-};
-
-enum layers_keymap {
-  _QWERTY = 0,
-  _FUNCTION,
-
-  _GREEK,
-  _SHIFTGREEK,
-  _CADET,
-  _SHIFTCADET,
-};
-
-// This is so that H(xxxx) has the same width as _______, which makes the grids more legible.
-#define H(x) UC(0x##x)
-#define MO_FN MO(_FUNCTION)
-#define KC_LLCK KC_LAYER_LOCK
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // NB: Using GESC for escape in the QWERTY layer as a temporary hack because I messed up the
-  // switch on the KC_GRV key; change back to KC_ESC once this is fixed.
-	[_QWERTY] = LAYOUT_96_ansi(
-    QK_GESC, 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_END,  KC_PGUP, KC_PGDN, KC_MPLY, KC_BRK,
-    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_LLCK, 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_BSLS, KC_P7,   KC_P8,   KC_P9,
-    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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    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_P1,   KC_P2,   KC_P3,
-    KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             MO_FN,   KC_GREEK,KC_CADET,KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
-  /* The Greek layers. Shown here are the QWERTY layer (for visual reference) and the two Greek
-   * layers.
-   * ,----------------------------------------------------------------------------
-   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|HOM|END|PGU|PGD|MUT|BRK|  QWERTY
-   * | ` | ₁ | ₂ | ₃ | ₄ | ₅ | ₆ | ₇ | ₈ | ₉ | ₀ | ₋ | ₊ | ₍ | ₎ |   |   |   |   |  SHIFTGREEK
-   * | ` | ¹ | ² | ³ | ⁴ | ⁵ | ⁶ | ⁷ | ⁸ | ⁹ | ⁰ | ⁻ | ⁺ | ⁽ | ⁾ |   |   |   |   |  GREEK
-   * |---------------------------------------------------------------------------|
-   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |LCK| / | * | - |
-   * | ` | ¿ |   | € |   |   |   |   |   |   |   |   | ≁ | BKSPC |LCK|   | ⊗ |   |
-   * |   |   |   |   |   |   |   |   |   |   |   | ∝ | ∼ | BKSPC |LCK| ⊘ | ⊙ | ⊖ |
-   * |---------------------------------------------------------------------------|
-   * | TAB  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \ | 7 | 8 | 9 |   |
-   * |      | Θ | Ω | Ε | Ρ | Τ | Ψ | Υ | Ι | Ο | Π |   |   |    |   |   |   |   |
-   * |      | θ | ω | ε | ρ | τ | ψ | υ | ι | ο | π |   |   |    |   |   |   |   |
-   * |-----------------------------------------------------------------------| + |
-   * | CTRL   | A | S | D | F | G | H | J | K | L | ; | ' |  RET | 4 | 5 | 6 | ⊕ |
-   * | CTRL   | Α | Σ | Δ | Φ | Γ | Η |   | Κ | Λ | … | ∴ |  RET |   |   |   |   |
-   * | CTRL   | α | σ | δ | φ | γ | η | ϑ | κ | λ | ⋯ | ⋅ |  RET |   |   |   |   |
-   * |-----------------------------------------------------------------------|---|
-   * | SHIFT   | Z | X | C | V | B | N | M | , | . | / |SHFT | ↑ | 1 | 2 | 3 |   |
-   * | SHIFT   | Ζ | Ξ | Χ | ✔ | Β | Ν | Μ | ≲ | ≳ |   |SHFT |   |   |   |   |   |
-   * | SHIFT   | ζ | ξ | χ | ς | β | ν | μ | ≪ | ≫ | ∫ |SHFT |   |   |   |   |   |
-   * |-----------------------------------------------------------------------|ENT|
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ | ← | ↓ | → | 0 | . |   |
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
-   * `---------------------------------------------------------------------------'
-   */
-	[_GREEK] = LAYOUT_96_ansi(
-    KC_GRV,  H(00b9), H(00b2), H(00b3), H(2074), H(2075), H(2076), H(2077), H(2078), H(2079), H(2070), H(207b), H(207a), H(207d), H(207e), XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    KC_GRV,  _______, _______, _______, _______, _______, _______, _______, H(00b0), _______, _______, H(221d), H(223c),          _______, _______, H(2298), H(2299), H(2296),
-    _______, H(03b8), H(03c9), H(03b5), H(03c1), H(03c4), H(03c8), H(03c5), H(03b9), H(03bf), H(03c0), KC_LBRC, KC_RBRC,          KC_BSLS, KC_P7,   KC_P8,   KC_P9,
-    _______, H(03b1), H(03c3), H(03b4), H(03c6), H(03b3), H(03b7), H(03d1), H(03ba), H(03bb), H(22ef), H(22c5),                   _______, KC_P4,   KC_P5,   KC_P6,   H(2295),
-    _______,          H(03b6), H(03be), H(03c7), H(03c2), H(03b2), H(03bd), H(03bc), H(226a), H(226b), H(222b), _______,          _______, KC_P1,   KC_P2,   KC_P3,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PENT),
-	[_SHIFTGREEK] = LAYOUT_96_ansi(
-    KC_GRV,  H(2081), H(2082), H(2083), H(2084), H(2085), H(2086), H(2087), H(2088), H(2089), H(2080), H(208b), H(208a), H(208d), H(208e), XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    KC_GRV,  H(00bf), _______, H(20ac), _______, _______, _______, _______, _______, _______, _______, XXXXXXX, H(2241),          _______, _______, XXXXXXX, H(2297), XXXXXXX,
-    _______, H(0398), H(03a9), H(0395), H(03a1), H(03a4), H(03a8), H(03a5), H(0399), H(039f), H(03a0), KC_LBRC, KC_RBRC,          KC_BSLS, KC_P7,   KC_P8,   KC_P9,
-    _______, H(0391), H(03a3), H(0394), H(03a6), H(0393), H(0397), XXXXXXX, H(039a), H(039b), H(2026), H(2234),                   _______, KC_P4,   KC_P5,   KC_P6,   H(2295),
-    _______,          H(0396), H(039e), H(03a7), H(2714), H(0392), H(039d), H(039c), H(2272), H(2273), XXXXXXX, _______,          _______, KC_P1,   KC_P2,   KC_P3,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PENT),
-  /* The Cadet layers. Again, we show the QWERTY layer and the two cadet layers.
-   * ,----------------------------------------------------------------------------
-   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|HOM|END|PGU|PGD|MUT|BRK|  QWERTY
-   * | ∅ |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |  SHIFTCADET
-   * | ¬ |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |  CADET
-   * |---------------------------------------------------------------------------|
-   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |LCK| / | * | - |
-   * | ` | ¡ |   | £ |   |   |   |   | ° |   |   | * | ∓ | BKSPC |LCK|   |   |   |
-   * |   |   |   |   |   |   |   |   |   |   |   |   | ± | BKSPC |LCK|   | × |   |
-   * |---------------------------------------------------------------------------|
-   * | TAB  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \ | 7 | 8 | 9 |   |
-   * |      | ℚ |   |   | ℝ | ⊆ | ⊇ |   | ℵ | ∄ |   | ∉ |   |    | * | * | * |   |
-   * |      | ∧ | ∨ | ∩ | ∪ | ⊂ | ⊃ | ∀ | ∞ | ∃ | ∂ | ∈ |   |    | * | * | * |   | [1]
-   * |-----------------------------------------------------------------------| + |
-   * | CTRL   | A | S | D | F | G | H | J | K | L | ; | ' |  RET | 4 | 5 | 6 | ⊕ |
-   * | CTRL   | Å |   | ∇ |   | ⇑ | ⇓ | ⇐ | ⇒ | ⇔ |   |   |  RET | * | * | * |   |
-   * | CTRL   | ⟘ | ⊤ | ⊢ | ⊣ | ↑ | ↓ | ← | → | ↔ |   |   |  RET | * | * | * |   | [1]
-   * |-----------------------------------------------------------------------|---|
-   * | SHIFT   | Z | X | C | V | B | N | M | , | . | / |SHFT | ↑ | 1 | 2 | 3 |   |
-   * | SHIFT   | ℤ | ℂ |   | ≉ | ≢ | ℕ |   |   |   |   |SHFT |   | * | * | * |   |
-   * | SHIFT   |   | ≠ |   | ≈ | ≡ | ≤ | ≥ |   |   | ÷ |SHFT |   | * | * | * |   | [1]
-   * |-----------------------------------------------------------------------|ENT|
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ | ← | ↓ | → | 0 | . |   |
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
-   * `---------------------------------------------------------------------------'
-   * [1] CADET + numpad moves the mouse. SHIFT+CADET+NUMPAD moves it more quickly. CADET+5
-   * clicks the mouse, and SHIFT+CADET+FIVE right-clicks.
-   */
-	[_CADET] = LAYOUT_96_ansi(
-    H(00AC), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    KC_GRV,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(00b1),          _______, _______, XXXXXXX, H(00d7), XXXXXXX,
-    _______, H(2227), H(2228), H(2229), H(222a), H(2282), H(2283), H(2200), H(221e), H(2203), H(2202), H(2208), XXXXXXX,          XXXXXXX, KC_P7,   KC_P8,   KC_P9,
-    _______, H(22a5), H(22a4), H(22a2), H(22a3), H(2191), H(2193), H(2190), H(2192), H(2194), XXXXXXX, XXXXXXX,                   _______, KC_P4,   KC_P5,   KC_P6,   XXXXXXX,
-    _______,          XXXXXXX, H(2260), XXXXXXX, H(2248), H(2261), H(2264), H(2265), XXXXXXX, XXXXXXX, H(00f7), _______,          _______, KC_P1,   KC_P2,   KC_P3,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PENT),
-	[_SHIFTCADET] = LAYOUT_96_ansi(
-    H(2205), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    KC_GRV,  H(00a1), XXXXXXX, H(00a3), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(2213),          _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,
-    _______, H(211a), XXXXXXX, XXXXXXX, H(211d), H(2286), H(2287), XXXXXXX, H(2135), H(2204), XXXXXXX, H(2209), XXXXXXX,          XXXXXXX, KC_P7,   KC_P8,   KC_P9,
-    _______, H(212b), XXXXXXX, H(2207), XXXXXXX, H(21d1), H(21d3), H(21d0), H(21d2), H(21d4), XXXXXXX, XXXXXXX,                   _______, KC_P4,   KC_P5,   KC_P6,   XXXXXXX,
-    _______,          H(2124), H(2102), XXXXXXX, H(2249), H(2262), H(2115), XXXXXXX, XXXXXXX, XXXXXXX, H(00f7), _______,          _______, KC_P1,   KC_P2,   KC_P3,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PENT),
-
-  // Function layer is mostly for keyboard meta-control operations, but also contains the combining
-  // accent marks. These are deliberately placed to match where the analogous controls go on Mac OS.
-	[_FUNCTION] = LAYOUT_96_ansi(
-    KC_CGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT,
-    KC_CGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______, KC_CAGU, _______, _______, _______, KC_CDIA, KC_CCIR, _______, _______, _______, _______,          _______, _______, _______, _______,
-    _______, _______, _______, UC_MAC,  UC_LINX, UC_WIN,  UC_BSD,  UC_WINC, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
-    _______,          _______, _______, KC_CCED, _______, _______, KC_CTIL, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Accent implementation
-//
-// In the body of process_record_user, we store an "accent_request", which is the accent keycode if
-// one was just selected, or zero otherwise. When the *next* key is hit, we look up whether the
-// accent request plus that next keycode (plus the state of the shift key) together amount to an
-// interesting combined (NFKC) character, and if so, emit it; otherwise, we emit the accent as a
-// separate character and then process the next key normally. The resulting UI behavior is similar
-// to that of the combining accent keys in MacOS.
-//
-// We store two arrays, depending on whether shift is or isn't held. Each is two-dimensional, with
-// its outer key by the next keycode struck, and the inner key by the accent requested. The outer
-// array has KC_Z + 1 as its upper bound, so that we can save memory by only coding alphabetic keys.
-// The contents are either Unicode code points, or zero to indicate that we don't have a point for
-// this combination.
-
-#define KC_NUM_ACCENTS (KC_ACCENT_END - KC_ACCENT_START)
-#define KC_NUM_SLOTS (KC_Z + 1)
-
-const uint16_t PROGMEM unshifted_accents[KC_NUM_SLOTS][KC_NUM_ACCENTS] = {
-  //         KC_CGRV, KC_CAGU, KC_CDIA, KC_CCIR, KC_CCED, KC_CTIL
-  [KC_A] = { 0x00e0,  0x00e1,  0x00e4,  0x00e2,  0,       0x00e3 },
-  [KC_E] = { 0x00e8,  0x00e9,  0x00eb,  0x00ea,  0,       0      },
-  [KC_I] = { 0x00ec,  0x00ed,  0x00ef,  0x00ee,  0,       0      },
-  [KC_O] = { 0x00f2,  0x00f3,  0x00f6,  0x00f4,  0,       0x00f5 },
-  [KC_U] = { 0x00f9,  0x00fa,  0x00fc,  0x00fb,  0,       0      },
-  [KC_Y] = { 0,       0,       0x00ff,  0,       0,       0      },
-  [KC_N] = { 0,       0,       0,       0,       0,       0x00f1 },
-  [KC_C] = { 0,       0,       0,       0,       0x00e7,  0      },
-};
-
-const uint16_t PROGMEM shifted_accents[KC_NUM_SLOTS][KC_NUM_ACCENTS] = {
-  //         KC_CGRV, KC_CAGU, KC_CDIA, KC_CCIR, KC_CCED, KC_CTIL
-  [KC_A] = { 0x00c0,  0x00c1,  0x00c4,  0x00c2,  0,       0x00c3 },
-  [KC_E] = { 0x00c8,  0x00c9,  0x00cb,  0x00ca,  0,       0      },
-  [KC_I] = { 0x00cc,  0x00cd,  0x00cf,  0x00ce,  0,       0      },
-  [KC_O] = { 0x00d2,  0x00d3,  0x00d6,  0x00d4,  0,       0x00d5 },
-  [KC_U] = { 0x00d9,  0x00da,  0x00dc,  0x00db,  0,       0      },
-  [KC_Y] = { 0,       0,       0x00df,  0,       0,       0      },
-  [KC_N] = { 0,       0,       0,       0,       0,       0x00d1 },
-  [KC_C] = { 0,       0,       0,       0,       0x00c7,  0      },
-};
-
-// The uncombined and combined forms of the accents, for when we want to emit them as single
-// characters.
-const uint16_t PROGMEM uncombined_accents[KC_NUM_ACCENTS] = {
-  [KC_CGRV - KC_ACCENT_START] = 0x0060,
-  [KC_CAGU - KC_ACCENT_START] = 0x00b4,
-  [KC_CDIA - KC_ACCENT_START] = 0x00a8,
-  [KC_CCIR - KC_ACCENT_START] = 0x005e,
-  [KC_CCED - KC_ACCENT_START] = 0x00b8,
-  [KC_CTIL - KC_ACCENT_START] = 0x02dc,
-};
-
-const uint16_t PROGMEM combined_accents[KC_NUM_ACCENTS] = {
-  [KC_CGRV - KC_ACCENT_START] = 0x0300,
-  [KC_CAGU - KC_ACCENT_START] = 0x0301,
-  [KC_CDIA - KC_ACCENT_START] = 0x0308,
-  [KC_CCIR - KC_ACCENT_START] = 0x0302,
-  [KC_CCED - KC_ACCENT_START] = 0x0327,
-  [KC_CTIL - KC_ACCENT_START] = 0x0303,
-};
-
-// This function manages keypresses that happen after an accent has been selected by an earlier
-// keypress.
-// Args:
-//   accent_key: The accent key which was earlier selected. This must be in the range
-//     [KC_ACCENT_START, KC_ACCENT_END).
-//   keycode: The keycode which was just pressed.
-//   is_shifted: The current shift state (as set by a combination of shift and caps lock)
-//   force_no_accent: If true, we're in a situation where we want to force there to be no
-//     accent combination -- if e.g. we're in a non-QWERTY layer, or if other modifier keys
-//     are held.
-//
-// Returns true if the keycode has been completely handled by this function (and so should not be
-// processed further by process_record_user) or false otherwise.
-bool process_key_after_accent(
-    uint16_t accent_key,
-    uint16_t keycode,
-    bool is_shifted,
-    bool force_no_accent
-) {
-  assert(accent_key >= KC_ACCENT_START);
-  assert(accent_key < KC_ACCENT_END);
-  const int accent_index = accent_key - KC_ACCENT_START;
-
-  // If the keycode is outside A..Z, or force_no_accent is set, we know we shouldn't even bother
-  // with a table lookup.
-  if (keycode <= KC_Z && !force_no_accent) {
-    // Pick the correct array. Because this is progmem, we're going to need to do the
-    // two-dimensional array indexing by hand, and so we just cast it to a single-dimensional array.
-    const uint16_t *points = (const uint16_t*)(is_shifted ? shifted_accents : unshifted_accents);
-    const uint16_t code_point = pgm_read_word_near(points + KC_NUM_ACCENTS * keycode + accent_index);
-    if (code_point) {
-      register_unicode(code_point);
-      return true;
-    }
-  }
-
-  // If we get here, there was no accent match. Emit the accent as its own character, and then let
-  // the caller figure out what to do next.
-  register_unicode(pgm_read_word_near(uncombined_accents + accent_index));
-  return false;
-}
-
-// Layer bitfields.
-#define GREEK_LAYER (1UL << _GREEK)
-#define SHIFTGREEK_LAYER (1UL << _SHIFTGREEK)
-#define CADET_LAYER (1UL << _CADET)
-#define SHIFTCADET_LAYER (1UL << _SHIFTCADET)
-// The layers we don't touch.
-#define LAYER_MASK ~(GREEK_LAYER|SHIFTGREEK_LAYER|CADET_LAYER|SHIFTCADET_LAYER)
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  // We track these persistent globals and manage them on our own, rather than trying to rely on
-  // get_mods or the like, because this function is called *before* that's updated!
-  static bool shift_held = false;
-  static bool alt_held = false;
-  static bool ctrl_held = false;
-  static bool super_held = false;
-  static bool greek_held = false;
-  static bool cadet_held = false;
-
-  // These are where we remember the values of lock states.
-  static bool shift_lock = false;
-  static int layer_lock = _QWERTY;
-
-  // The accent request, or zero if there isn't one.
-  static uint16_t accent_request = 0;
-
-  // If this is set to true, don't trigger any handling of pending accent requests. That's what we
-  // want to do if e.g. the user just hit the shift key or something.
-  bool ignore_accent_change = !record->event.pressed;
-
-  // Step 1: Process any modifier key state changes, so we can maintain that state.
-  if (keycode == KC_LSFT || keycode == KC_RSFT) {
-    shift_held = record->event.pressed;
-    ignore_accent_change = true;
-  } else if (keycode == KC_LALT || keycode == KC_RALT) {
-    alt_held = record->event.pressed;
-    ignore_accent_change = true;
-  } else if (keycode == KC_LCTL || keycode == KC_RCTL) {
-    ctrl_held = record->event.pressed;
-    ignore_accent_change = true;
-  } else if (keycode == KC_LGUI || keycode == KC_RGUI) {
-    super_held = record->event.pressed;
-    ignore_accent_change = true;
-  } else if (keycode == KC_GREEK) {
-    greek_held = record->event.pressed;
-    ignore_accent_change = true;
-  } else if (keycode == KC_CADET) {
-    cadet_held = record->event.pressed;
-    ignore_accent_change = true;
-  }
-
-  // Step 2: Figure out which layer we're supposed to be in, by transforming all the prior stuff
-  // into layer requests.
-  const bool greek_request = (greek_held && !alt_held);
-  const bool cadet_request = (cadet_held || (greek_held && alt_held));
-
-  // Now, handle the lock keys. We store next_layer_lock in a local variable so that we can
-  // determine the layer to pick right now before we update layer_lock.
-  int next_layer_lock = layer_lock;
-  if (keycode == KC_CAPS) {
-    // If we're in QWERTY mode, caps lock is already going to be managed by the host OS, but by
-    // tracking it ourselves we can also usefully apply it to the GREEK and CADET layers.
-    if (record->event.pressed) {
-      shift_lock = !shift_lock;
-    }
-  } else if (keycode == KC_LAYER_LOCK) {
-    if (record->event.pressed) {
-      if (cadet_request) {
-        next_layer_lock = _CADET;
-      } else if (greek_request) {
-        next_layer_lock = _GREEK;
-      } else {
-        next_layer_lock = _QWERTY;
-      }
-    }
-  }
-
-  // OK! Now we know which buttons are being held, and the current and upcoming states of the locks.
-  // We can compute our new base layer. Remember that the CADET and GREEK keys act as their own
-  // antonyms if they match the layer lock -- e.g., if you have CADET locked, then CADET+X generates
-  // QWERTY-X.
-  int base_layer;
-  if (cadet_request) {
-    base_layer = (layer_lock == _CADET ? _QWERTY : _CADET);
-  } else if (greek_request) {
-    base_layer = (layer_lock == _GREEK ? _QWERTY : _GREEK);
-  } else {
-    base_layer = layer_lock;
-  }
-
-  const bool shifted = (shift_held != shift_lock);
-  int actual_layer;
-  if (base_layer == _CADET) {
-    actual_layer = (shifted ? _SHIFTCADET : _CADET);
-  } else if (base_layer == _GREEK) {
-    actual_layer = (shifted ? _SHIFTGREEK : _GREEK);
-  } else {
-    // We don't do shifting for the QWERTY layer, since for that we emit USB HID codes and shifting
-    // is managed by the host OS.
-    actual_layer = _QWERTY;
-  }
-
-  // And now we can update the layer lock and the actual firmware layer selector.
-  layer_lock = next_layer_lock;
-  layer_state_t new_layer_state = (layer_state & LAYER_MASK) | (1UL << actual_layer);
-  if (new_layer_state != layer_state) {
-    layer_state_set(new_layer_state);
-  }
-
-  // Step 3: Handle accents. If there's a pending accent request, process it. If what the user just
-  // hit creates a new accent request, update the pending state for the next keypress.
-  if (!ignore_accent_change && accent_request && record->event.pressed) {
-    // Only do the accent stuff if we're in the QWERTY layer and we aren't modifying something.
-    const bool force_no_accent = (
-        actual_layer != _QWERTY ||
-        ctrl_held ||
-        super_held ||
-        alt_held
-    );
-    const uint16_t old_accent = accent_request;
-    accent_request = 0;
-    if (process_key_after_accent(old_accent, keycode, shifted, force_no_accent)) {
-      return false;
-    }
-  }
-
-  // And if a new accent request just arrived, update accent_request.
-  if (keycode >= KC_ACCENT_START && keycode < KC_ACCENT_END && record->event.pressed) {
-    if (shifted) {
-      // Shift + accent request generates the combining accent key, and leaves accent_request alone.
-      register_unicode(pgm_read_word_near(combined_accents + keycode - KC_ACCENT_START));
-      return false;
-    } else {
-      accent_request = keycode;
-    }
-  }
-
-  return true;
-}
diff --git a/keyboards/ymdk/melody96/hotswap/keymaps/zunger/readme.md b/keyboards/ymdk/melody96/hotswap/keymaps/zunger/readme.md
deleted file mode 100644
index 3eb64a2e739..00000000000
--- a/keyboards/ymdk/melody96/hotswap/keymaps/zunger/readme.md
+++ /dev/null
@@ -1,78 +0,0 @@
-* The "Cadet-Style" keymap for the melody96.
-* Author: Yonatan Zunger (zunger@gmail.com)
-
-This is an experimental keymap being used both for practical reasons (as my daily driver) and to
-work out the ideas of a "space-cadet-style" keyboard which can type text and mathematical symbols
-with equal ease. It's designed for anyone who frequently needs to do this outside of a LaTeX
-environment, or for anyone who loves the old "Space Cadet" keyboard! And it works at its best when
-you have actual Cadet keycaps (like SA Symbolics) installed, because those keycaps will actually
-show what you get.
-
-The core idea of this keyboard is that, in addition to a QWERTY base layer and a function layer, it
-supports two additional base layers -- the GREEK layer (the analogue of the Space Cadet "Greek," or
-"Front," keys) and the CADET layer (the analogue of the Space Cadet "Top" keys). These layers use
-Unicode to generate all of the mathematical symbols you can find on a traditional Space Cadet
-layout, plus a bunch of extras.
-
-Because Unicode can't be encoded using the traditional USB HID protocol, QMK does some clever but
-horrifying things to fool your OS. One consequence of this is that the shift key needs to be handled
-by the keyboard firmware, not the host OS. To handle this, we have two additional layers --
-SHIFTGREEK and SHIFTCADET -- and handle the flipping between all of these layers here in the
-firmware.
-
-*The simple bit: Using this layout on a Melody96*
-
-At the core of this layout are three special modifier keys and two special lock keys:
-
-* The GREEK key, to the right of the spacebar, activates the GREEK layer. GREEK+SHIFT activates
-  SHIFTGREEK. These keys generate Greek letters on the letter keys (thus the name), and a few
-  mathematical symbols on other keys. They correspond to the notations on the front of traditional
-  Space Cadet keys; if your capset doesn't include those (alas, most don't), they're the "pretty
-  obvious" mappings.
-* The CADET key, to the right of GREEK, activates the CADET layer. These are the symbols above the
-  letters on a Space Cadet layout. CADET+SHIFT activates the SHIFTCADET layer, with even more
-  symbols.
-* The FUNCTION key, to the right of CADET, activates the function layer. This is where you have a
-  reset mechanism, a selector for which Unicode input type you want, and so on.
-
-Additionally, GREEK+ALT is equivalent to CADET. This is handy for other keyboards where you don't
-have room for this many modifiers.
-
-The lock keys are:
-
-* Caps lock, if you use it, will also act as a "shift lock" for the Greek and Cadet layers. Shift
-  lock is slightly different, in that while it is engaged shift will _dis_engage it; that's actually
-  pretty useful when typing math.
-* An additional "layer lock" key, by default where "num lock" usually goes, will lock the choice of
-  base layer. To use it, hold down any invocation of the GREEK or CADET layers, or none at all, and
-  hit lock; it will then put you in that layer. The corresponding modifier key will then toggle you
-  back to the QWERTY layer. (So for example, if you hit GREEK+LAYER_LOCK and release them, you're
-  now typing in Greek; the GREEK modifier would cause you to type QWERTY momentarily. To go back to
-  ordinary QWERTY mode, you'd just hit LAYER_LOCK again with no modifiers held)
-
-To see the full layout, check out the big comment in keymap.c.
-
-*A less-simple bit: Adapting this to other keyboards*
-
-This is really a canary for generic Cadet implementations. Before this can be made generic, a few
-things will have to happen:
-
-(1) Instead of a fixed keymap, this has to be refactored into some kind of array showing the
-mappings of QWERTY-layer keys onto the appropriate code points in the GREEK and CADET layers, and
-some preprocessor magic needs to auto-transform this plus a traditional keymap for the QWERTY layer
-into keymaps for all five of the core layers. (Function layers would presumably be handled on a
-per-keyboard basis)
-
-(2) The standard mapping of those should have some #define's to control things like whether there
-are physical F-keys (you would probably want to move superscript and subscripts onto the numbers if
-there weren't, and figure out what to do with the non-numeric super/sub keys), whether you actually
-want to enable GREEK+ALT=CADET, and so on;
-
-(3) There should be support for controlling indicator LEDs based on the base layer selection,
-caps/shift lock state, and layer lock state, as well as for triggering audio on transitions;
-
-(4) All the core fancy logic in process_record_user which implements the layer handling should be
-factored out into its own function, so that keyboards can easily reuse that, too.
-
-This is a lovely TODO for future work, and could be particularly fun to go along with new releases
-of SA Symbolics and the like. Anyone interested in such things, ping me!
diff --git a/keyboards/ymdk/melody96/hotswap/keymaps/zunger/rules.mk b/keyboards/ymdk/melody96/hotswap/keymaps/zunger/rules.mk
deleted file mode 100644
index a61cfa33fa9..00000000000
--- a/keyboards/ymdk/melody96/hotswap/keymaps/zunger/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# You need Unicode for this map.
-UNICODE_ENABLE = yes        # Unicode
diff --git a/keyboards/ymdk/melody96/soldered/keymaps/crilith/keymap.c b/keyboards/ymdk/melody96/soldered/keymaps/crilith/keymap.c
deleted file mode 100644
index e5eff6ee9d7..00000000000
--- a/keyboards/ymdk/melody96/soldered/keymaps/crilith/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-#define KC_REC DM_REC1
-#define KC_DONE DM_RSTP
-#define KC_PLAY DM_PLY1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-    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_BSLS, KC_BSPC, KC_NUM,  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_BSLS,          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_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    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,                             TT(1),   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
-
-	LAYOUT(
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
-    _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, KC_TAB,
-    BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, KC_TAB,
-    _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______,                            KC_PLAY,                            _______, KC_REC,  KC_DONE, _______, _______, _______, _______, _______, _______),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-	return true;
-}
diff --git a/keyboards/ymdk/melody96/soldered/keymaps/dvz/config.h b/keyboards/ymdk/melody96/soldered/keymaps/dvz/config.h
deleted file mode 100644
index 380e11a3a11..00000000000
--- a/keyboards/ymdk/melody96/soldered/keymaps/dvz/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
- /* Copyright 2021 Milan Düwel
-  *
-  * 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 COMBO_TERM 100
-
-//#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYER_BLINK
-
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
diff --git a/keyboards/ymdk/melody96/soldered/keymaps/dvz/keymap.c b/keyboards/ymdk/melody96/soldered/keymaps/dvz/keymap.c
deleted file mode 100644
index 20d4d1e5105..00000000000
--- a/keyboards/ymdk/melody96/soldered/keymaps/dvz/keymap.c
+++ /dev/null
@@ -1,161 +0,0 @@
- /* Copyright 2021 Milan Düwel
-  *
-  * 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
-
- /* This keymap is designed for use with a German keyboard layout.
-  * It is essentially the same as the default via keymap but adds combo functionality to type umlauts as well as lighting layers for various actions.
-  * Toggling the combo feature also disables KC_LGUI so both can be turned off for gaming. If you want to get rid of it without reflashing new firmware, use KC_RGUI instead.
-  * Layers 2 and 3 are currently unused but are configurable within via.
-  */
-
-enum combos {
-  UML_AE,
-  UML_OE,
-  UML_UE,
-  UML_SZ
-};
-
-const uint16_t PROGMEM ae_combo[] = {KC_A, KC_E, COMBO_END};
-const uint16_t PROGMEM oe_combo[] = {KC_O, KC_E, COMBO_END};
-const uint16_t PROGMEM ue_combo[] = {KC_U, KC_E, COMBO_END};
-const uint16_t PROGMEM sz_combo[] = {KC_S, KC_Y, COMBO_END};
-
-combo_t key_combos[] = {
-  [UML_AE] = COMBO(ae_combo, KC_QUOT),
-  [UML_OE] = COMBO(oe_combo, KC_SCLN),
-  [UML_UE] = COMBO(ue_combo, KC_LBRC),
-  [UML_SZ] = COMBO(sz_combo, KC_MINS)
-};
-
-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_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-    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_BSLS, KC_BSPC, KC_NUM,  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_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-    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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    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),   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
-
-	[1] = LAYOUT(
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
-    BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_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, CM_TOGG, BL_TOGG, BL_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END,  KC_TRNS, KC_TRNS, KC_MUTE),
-
-	[2] = LAYOUT(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, 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(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-/*  The lighting layers feature a caps indicator as well as layer blinks for mute and the function layer (blink only to allow unhindered adjustment of the RGB backlight settings).
-    Sadly these colours can not be customized within VIA.
-*/
-
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 1, HSV_RED},
-    {15, 17, HSV_RED}
-);
-
-const rgblight_segment_t PROGMEM my_function_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {10, 12, HSV_YELLOW}
-);
-
-const rgblight_segment_t PROGMEM my_f2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_CYAN}
-);
-
-const rgblight_segment_t PROGMEM my_f3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_PURPLE}
-);
-
-const rgblight_segment_t PROGMEM my_flash_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_RED}
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_capslock_layer,
-    my_function_layer,    // Overrides caps lock layer
-    my_f2_layer,
-    my_f3_layer,
-    my_flash_layer
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-};
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    return true;
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    //rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 3));
-    return state;
-};
-
-// Note we user post_process_record_user because we want the state
-// after the flag has been flipped...
-void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_CAPS:
-        case KC_MUTE:
-        case QK_COMBO_TOGGLE:
-            if (record->event.pressed) {
-                rgblight_blink_layer(4, 250);
-            }
-            break;
-        case MO(1):
-            if (record->event.pressed) {
-                rgblight_blink_layer(1, 250);
-            }
-            break;
-    }
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-        case KC_LGUI:   //use combo toggle to disable the win key while gaming
-            if (record->event.pressed) {
-                if (is_combo_enabled()==false) {
-                    return false;
-                }
-            }
-            return true; // Let QMK send the enter press/release events
-        default:
-            return true; // Process all other keycodes normally
-  }
-};
diff --git a/keyboards/ymdk/melody96/soldered/keymaps/dvz/readme.md b/keyboards/ymdk/melody96/soldered/keymaps/dvz/readme.md
deleted file mode 100644
index d82055244eb..00000000000
--- a/keyboards/ymdk/melody96/soldered/keymaps/dvz/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# DvZ's VIA compatible keymap with rolling umlauts for german typists
-
-Added by: [devilzmods](https://github.com/devilzmods)
diff --git a/keyboards/ymdk/melody96/soldered/keymaps/dvz/rules.mk b/keyboards/ymdk/melody96/soldered/keymaps/dvz/rules.mk
deleted file mode 100644
index a1e85f13f4e..00000000000
--- a/keyboards/ymdk/melody96/soldered/keymaps/dvz/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes # reduce firmware size
-COMBO_ENABLE = yes
-#UNICODE_ENABLE = yes
-BOOTLOADER = caterina
diff --git a/keyboards/ymdk/sp64/keymaps/daed/keymap.c b/keyboards/ymdk/sp64/keymaps/daed/keymap.c
deleted file mode 100644
index 723d3b1f888..00000000000
--- a/keyboards/ymdk/sp64/keymaps/daed/keymap.c
+++ /dev/null
@@ -1,140 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _BASE,
-    _GAMER,
-    _FN,
-    _RAISE,
-    _MODE,
-    _GACROS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │ Esc │  1  │  2  │  3  │  4  │  5  │  6  │    │  7  │  8  │  9  │  0  │  -  │  =  │ BkSp     │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │ Tab    │  Q  │  W  │  E  │  R  │  T  │    │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │ \     │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │ Ctrl    │  A  │  S  │  D  │  F  │  G  │    │  H  │  J  │  K  │  L  │  ;  │  '  │ Enter      │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │ LShift   │  Z  │  X  │  C  │  V  │  B  │    │  N  │  M  │  <  │  >  │  ?  │ Sft │ Up  │ _MO │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │ _FN  │ Win │ Alt  │             │ _RA │    │               │ Alt   │ Win  │ Lft │ Dwn │ Rgt │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_BASE] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    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_LCTL, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCLN,   KC_QUOTE,                 KC_ENTER,
-  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,       MO(_MODE),
-  MO(_FN), KC_LGUI, KC_LALT, KC_SPACE,      MO(_RAISE),             KC_SPACE,           KC_RALT,      KC_RCTL,   KC_LEFT,     KC_DOWN,     KC_RIGHT
-  ),
-/* Keymap 1: Gamer layer
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │ Esc │  1  │  2  │  3  │  4  │  5  │  6  │    │  7  │  8  │  9  │  0  │  -  │  =  │ BkSp     │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │ Tab    │  Q  │  W  │  E  │  R  │  T  │    │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │ \     │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │ Ctrl    │  A  │  S  │  D  │  F  │  G  │    │  H  │  J  │  K  │  L  │  ;  │  '  │ Enter      │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │ LShift   │  Z  │  X  │  C  │  V  │  B  │    │  N  │  M  │  <  │  >  │  ?  │ Sft │ Up  │ _MO │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │ _FN  │ F13 │ Alt  │             │ _GA │    │               │ Alt   │ Win  │ Lft │ Dwn │ Rgt │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_GAMER] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    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_LCTL, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCLN,   KC_QUOTE,                 KC_ENTER,
-  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,       MO(_MODE),
-  MO(_FN), KC_F13,  KC_LALT, KC_SPACE,      MO(_GACROS),             KC_SPACE,           KC_RALT,      KC_RCTL,   KC_LEFT,     KC_DOWN,     KC_RIGHT
-  ),
-
-/* Keymap 2: Function
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │  `  │ F1  │  F2 │ F3  │ F4  │ F5  │ F6  │    │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │          │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │        │     │     │     │     │     │    │     │     │     │     │     │     │     │       │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │         │     │     │     │     │     │    │Left │ Up  │Down │Right│     │     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │     │     │     │     │     │    │     │     │     │     │     │     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │             │     │    │               │       │      │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_FN] = LAYOUT(
-  KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-  _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_CAPS, _______, _______, _______, _______, _______,        KC_LEFT, KC_DOWN,   KC_UP, KC_RIGHT, _______, _______,          _______,
-  _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
-  _______, _______, _______, _______,          _______,        _______,          _______, _______,          KC_HOME, KC_PGDN, KC_END
-  ),
-/* Keymap 3: Raise / Quality of life
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │  `  │ F1  │  F2 │ F3  │ F4  │ F5  │ F6  │    │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │          │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │        │     │     │     │     │     │    │     │     │     │     │     │     │     │       │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │         │     │     │     │     │     │    │Left │ Up  │Down │Right│     │     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │     │     │     │     │     │    │     │     │     │     │     │     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │             │     │    │               │       │      │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_RAISE] = LAYOUT(
-  KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-  _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_CAPS, _______, _______, _______, _______, _______,        KC_LEFT, KC_DOWN,   KC_UP, KC_RIGHT, _______, _______,          _______,
-  _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______,  _______, KC_PGUP, _______,
-  _______, _______, _______, _______,          _______,        _______,          _______, _______,           KC_HOME, KC_PGDN, KC_END
-  ),
-/* Keymap 4: Mode switching
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │  `  │ F1  │  F2 │ F3  │ F4  │ F5  │ F6  │    │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │          │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │ RGB 0/1│RGBM-│RGBB+│RGBM+│     │     │    │     │     │     │     │     │     │     │ Reset │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │         │RGBS-│RGBB-│RGBS+│     │     │    │Left │ Up  │Down │Right│     │     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │     │     │     │     │     │    │     │     │     │ GAME| BASE│     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │             │     │    │               │       │      │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_MODE] = LAYOUT(
-  KC_GRAVE, 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_RMOD, RGB_VAI, RGB_MOD, _______, _______,        _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-  _______, RGB_SPD,  RGB_VAD, RGB_SPI, _______, _______,        KC_LEFT, KC_DOWN,   KC_UP, KC_RIGHT, _______, _______,          _______,
-  _______, _______,  _______, _______, _______, _______,        _______, _______, _______, TO(_GAMER), TO(_BASE), _______, _______, _______,
-  _______, _______,  _______, _______,          _______,        _______,          _______, _______,          _______, _______, _______
-  ),
-/* Keymap 5: Gaming macros
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │  `  │ F1  │  F2 │ F3  │ F4  │ F5  │ F6  │    │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │          │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │        │     │ PUSH│     │     │     │    │     │     │     │     │     │     │     │       │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │         │     │ FALL│     │     │     │    │Left │ Up  │Down │Right│     │     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │     │ CAP │     │     │     │    │     │     │     │ GAME| BASE│     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │             │     │    │               │       │      │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_GACROS] = LAYOUT(
-  KC_GRAVE, 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_LEFT, KC_DOWN,   KC_UP, KC_RIGHT, _______, _______,          _______,
-  _______, _______,  _______, _______, _______, _______,          _______, _______, _______, TO(_GAMER), TO(_BASE), _______, _______, _______,
-  _______, _______,       _______, _______,        _______, _______,                                _______, _______,          _______, _______, _______
-  ),
-};
diff --git a/keyboards/ymdk/sp64/keymaps/minkezhang/config.h b/keyboards/ymdk/sp64/keymaps/minkezhang/config.h
deleted file mode 100644
index 5bfa79eb210..00000000000
--- a/keyboards/ymdk/sp64/keymaps/minkezhang/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2022 Minke Zhang (@minkezhang)
-// SPDX-License-Identifier: GPL-3.0-only
-#pragma once
-
-#define RGBLIGHT_LAYERS
diff --git a/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c b/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c
deleted file mode 100644
index e384c2a9e9e..00000000000
--- a/keyboards/ymdk/sp64/keymaps/minkezhang/keymap.c
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2022 Minke Zhang (@minkezhang)
-// SPDX-License-Identifier: GPL-3.0-only
-#include QMK_KEYBOARD_H
-
-/* Layer transitions diagram
- *
- * BASE <-> _FN     [MO]
- * BASE <-> _NUM    [TG]
- * _NUM <-> _MIRROR [MO]
- *
- * Direct transitions between layers not listed here are considered bugs.
- */
-enum layer_names {
-    BASE,     // default layer
-    _FN,      // function layer
-    _NUM,     // numpad
-    _MIRROR,  // mirrorboard layer
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │ Esc │  1  │  2  │  3  │  4  │  5  │  6  │    │  7  │  8  │  9  │  0  │  -  │  =  │ BkSp     │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │ 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  │  <  │  >  │  ?  │Shft │ Up  │ Del │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │ Ctrl │ Win │ Alt  │ Fn          │ Sp  │    │               │ Alt   │ Fn   │ Lft │ Dwn │ Rgt │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[BASE] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4, KC_5,     KC_6,           KC_7, KC_8,    KC_9,     KC_0,      KC_MINUS,    KC_EQUAL,    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_QUOTE,                 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_DEL,
-  KC_LCTL, KC_LGUI, KC_LALT, MO(_FN),        KC_SPACE,       KC_SPACE,       KC_RALT, TG(_NUM),            KC_LEFT,     KC_DOWN,     KC_RIGHT
-  ),
-
-/* Function
- *
- * Cannot access the _NUM layer directly.
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │  `  │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │    │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │          │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │        │     │     │ Up  │     │     │    │     │     │     │     │     │     │     │       │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │ Enter   │     │ Lft │ Dwn │ Rgt │     │    │     │     │     │     │     │     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │     │     │     │     │     │    │     │     │     │     │     │     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │             │     │    │               │       │ NO   │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_FN] = LAYOUT(
-  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,          KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  _______,
-  _______, _______, _______, KC_UP,   _______,  _______,        _______, _______, _______, _______, _______,  _______,  _______, _______,
-  KC_ENT,  _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______,        _______, _______, _______, _______, _______,  _______,           _______,
-  _______, _______, _______, _______, _______,  _______,        _______, _______, _______, _______, _______,  _______,  _______, _______,
-  _______, _______, _______, _______,           _______,        _______,          _______, KC_NO,             _______,  _______, _______
-  ),
-
-/* Numpad
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │  `  │     │     │     │     │     │     │    │ Num │  /  │  *  │  -  │     |     │          |
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │        │     │     │     │     │     │    │     │  7  │  8  │  9  │  +  │     │     │       │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │         │     │     │     │     │     │    │     │  4  │  5  │  6  │     │     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │     │     │     │     │     │    │     │  1  │  2  │  3  │ Ent │     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │ Fn          │     │    │ 0             │ .     │ Fn   │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_NUM] = LAYOUT(
-  KC_GRV,  _______, _______, _______,     _______, _______, _______,          KC_NUM, KC_PSLS, KC_PAST,  KC_PMNS, _______, _______, _______,
-  _______, _______, _______, _______,     _______, _______,          _______, KC_P7,  KC_P8,   KC_P9,    KC_PPLS, _______, _______, _______,
-  _______, _______, _______, _______,     _______, _______,          _______, KC_P4,  KC_P5,   KC_P6,    _______, _______,          _______,
-  _______, _______, _______, _______,     _______, _______,          _______, KC_P1,  KC_P2,   KC_P3,    KC_PENT, _______, _______, _______,
-  _______, _______, _______, MO(_MIRROR),          _______,          KC_P0,           KC_PDOT, TG(_NUM),          _______, _______, _______
-  ),
-
-/* Mirrorboard
- *
- * Useful in some niche situations per XKCD. Cannot pass directly to BASE layer
- * without releasing the _MIRROR toggle key.
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │ Bk  │  =  │  -  │  0  │  9  │  8  │  7  │    │     │     │     │     │     |     │          |
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │ \      │  P  │  O  │  I  │  U  │  Y  │    │     │     │     │     │     │     │     │       │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │ Enter   │  ;  │  L  │  K  │  J  │  H  │    │     │     │     │     │     │     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │  ?  │  >  │  <  │  M  │  N  │    │     │     │     │     │     │     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │             │     │    │               │       │ NO   │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_MIRROR] = LAYOUT(
-  KC_BSPC, KC_EQUAL,  KC_MINUS, KC_0,    KC_9, KC_8,    KC_7,          _______, _______, _______, _______, _______, _______, _______,
-  KC_BSLS, KC_P,      KC_O,     KC_I,    KC_U, KC_Y,          _______, _______, _______, _______, _______, _______, _______, _______,
-  KC_ENT,  KC_SCLN,   KC_L,     KC_K,    KC_J, KC_H,          _______, _______, _______, _______, _______, _______,          _______,
-  _______, KC_SLSH,   KC_DOT,   KC_COMM, KC_M, KC_N,          _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______,   _______,  _______,       _______,       _______,          _______, KC_NO,            _______, _______, _______
-  ),
-};
-
-#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-const rgblight_segment_t PROGMEM BASE_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 12, HSV_OFF});
-const rgblight_segment_t PROGMEM _FN_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 12, HSV_RED});
-const rgblight_segment_t PROGMEM _NUM_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 12, HSV_YELLOW});
-const rgblight_segment_t PROGMEM _MIRROR_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 12, HSV_ORANGE});
-
-const rgblight_segment_t* const PROGMEM user_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    BASE_layer,
-    _FN_layer,
-    _NUM_layer,
-    _MIRROR_layer
-);
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = user_rgb_layers;
-}
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, BASE));
-
-    return state;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-/* Add some indication for current function layer.
- *
- * N.B.: rgblight_set_layer_state calls rgblight_mode_noeeprom.
- */
-    rgblight_set_layer_state(1, layer_state_cmp(state, _FN));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _NUM));
-    rgblight_set_layer_state(3, layer_state_cmp(state, _MIRROR));
-
-    return state;
-}
-#endif
diff --git a/keyboards/ymdk/sp64/keymaps/minkezhang/readme.md b/keyboards/ymdk/sp64/keymaps/minkezhang/readme.md
deleted file mode 100644
index 50d4eb87883..00000000000
--- a/keyboards/ymdk/sp64/keymaps/minkezhang/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# YMDK Split 64
-Personal Keymap for [minkezhang](https://github.com/minkezhang)
-
-## Compile
-```bash
-qmk compile -kb ymdk/sp64 -km minkezhang
-```
diff --git a/keyboards/ymdk/sp64/keymaps/minkezhang/rules.mk b/keyboards/ymdk/sp64/keymaps/minkezhang/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/ymdk/sp64/keymaps/minkezhang/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/ymdk/sp64/keymaps/walston/keymap.c b/keyboards/ymdk/sp64/keymaps/walston/keymap.c
deleted file mode 100644
index 5f4af717f7e..00000000000
--- a/keyboards/ymdk/sp64/keymaps/walston/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include QMK_KEYBOARD_H
-enum layer_names {
-  BASE, // default layer
-  _FUN, // function layer
-  _NUMPAD, // num-pad
-  _MEDIA // media keys
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │    │  7  │  8  │  9  │  0  │  -  │  =  │ BkSp     │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │ Tab    │  Q  │  W  │  E  │  R  │  T  │    │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │ \     │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │ Ctrl    │  A  │  S  │  D  │  F  │  G  │    │  H  │  J  │  K  │  L  │  ;  │  '  │ Enter      │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │ LShift   │  Z  │  X  │  C  │  V  │  B  │    │  N  │  M  │  <  │  >  │  ?  │ Sft │ Up  │_MED │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │ _NUM │_MED │ Alt  │ Cmd         │ Spc │    │ Space         │ Cmd   │ Alt  │ Lft │ Dwn │ Rgt │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[BASE] = LAYOUT(
-  MT(QK_BOOT, KC_GRAVE),   KC_1,      KC_2,    KC_3,    KC_4,    KC_5,     KC_6,     KC_7,    KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    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_LCTL,               KC_A,      KC_S,    KC_D,    KC_F,    KC_G,     KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOTE,                  KC_ENTER,
-  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,     OSL(_MEDIA),
-  LT(_NUMPAD, KC_CAPS), TT(_MEDIA), KC_LALT, KC_LGUI, LT(_FUN, KC_SPACE),    KC_SPACE,          KC_RGUI, KC_RALT,        KC_LEFT,   KC_DOWN,        KC_RIGHT
-  ),
-/* Keymap 1: Function Layer / Vim Arrows
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │ Esc │ F1  │  F2 │ F3  │ F4  │ F5  │ F6  │    │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │          │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │        │     │     │     │     │     │    │     │     │     │     │     │     │     │       │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │         │     │     │     │     │     │    │     │Left │ Up  │Down │Right│     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │     │     │     │     │     │    │     │     │     │     │     │     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │             │     │    │               │       │      │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_FUN] = 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_LEFT, KC_UP,   KC_DOWN, KC_RIGHT, _______, _______,          _______,
-  _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______,  _______, _______, _______, _______,
-  _______, _______, _______, _______,          _______,           _______,          _______, _______,           _______, _______, _______
-  ),
-/* Keymap 2: NumPad
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │     │     │     │     │     │     │     │    │  7  │  8  │  9  │     │ Vol-│ Vol+│ Mute     │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │        │     │     │     │     │     │    │     │  4  │  5  │  6  │     │ |<< │ >>| │ >||   │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │         │     │     │     │     │     │    │     │  1  │  2  │  3  │     │     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │     │     │     │     │     │    │     │  0  │     │     │     │     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │             │     │    │               │       │      │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_NUMPAD] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______,           KC_P7,   KC_P8,   KC_P9,   _______, KC_VOLD, KC_VOLU, KC_MUTE,
-  _______, _______, _______, _______, _______, _______,           _______, KC_P4,   KC_P5,   KC_P6,   _______, KC_MPRV, KC_MNXT, KC_MPLY,
-  _______, _______, _______, _______, _______, _______,           _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,          _______,
-  _______, _______, _______, _______, _______, _______,           _______, KC_P0,   _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______,          _______,           _______,          _______, _______,          _______, _______, _______
-  ),
-/* Keymap 3: Media
- *
- * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
- * │     │     │     │     │     │     │     │    │     │     │     │     │     │     │          │
- * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
- * │        │     │     │     │     │     │    │     │     │     │     │     │     │     │       │
- * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
- * │         │     │     │     │     │     │    │     │     │     │     │     │     │            │
- * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
- * │          │     │     │     │     │     │    │     │     │     │     │     │     │     │     │
- * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
- * │      │     │      │ Backlight   │     │    │               │       │      │     │     │     │
- * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
- */
-[_MEDIA] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          _______,
-  _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, RGB_TOG,          _______,           _______,          _______, _______,          _______, _______, _______
-  ),
-};
diff --git a/keyboards/ymdk/sp64/keymaps/walston/rules.mk b/keyboards/ymdk/sp64/keymaps/walston/rules.mk
deleted file mode 100644
index a6c5cfa18a0..00000000000
--- a/keyboards/ymdk/sp64/keymaps/walston/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMMAND_ENABLE = no
diff --git a/keyboards/ymdk/sp64/matrix.c b/keyboards/ymdk/sp64/matrix.c
index b5f0e104620..6f8c7962ebb 100644
--- a/keyboards/ymdk/sp64/matrix.c
+++ b/keyboards/ymdk/sp64/matrix.c
@@ -114,7 +114,7 @@ uint8_t matrix_scan(void)
 #ifdef RIGHT_HALF
     uint8_t data = 0x7F;
     // Receive the columns from right half
-    i2c_receive(I2C_ADDR_WRITE, &data, 1, MCP23018_I2C_TIMEOUT);
+    i2c_receive(I2C_ADDR, &data, 1, MCP23018_I2C_TIMEOUT);
     cols |= ((~(data) & 0x7F) << 7);
 #endif
 
@@ -162,7 +162,7 @@ static void matrix_select_row(uint8_t row)
   //Set the remote row on port A
   txdata[0] = GPIOA;
   txdata[1] = 0xFF & ~(1<<row);
-  mcp23018_status = i2c_transmit(I2C_ADDR_WRITE, (uint8_t *)txdata, 2, MCP23018_I2C_TIMEOUT);
+  mcp23018_status = i2c_transmit(I2C_ADDR, (uint8_t *)txdata, 2, MCP23018_I2C_TIMEOUT);
 #endif
 
   // select other half
diff --git a/keyboards/ymdk/sp64/sp64.c b/keyboards/ymdk/sp64/sp64.c
index 12f25777135..e9f30d91f91 100644
--- a/keyboards/ymdk/sp64/sp64.c
+++ b/keyboards/ymdk/sp64/sp64.c
@@ -39,7 +39,7 @@ uint8_t init_mcp23018(void)
   data[0] = IODIRA;
   data[1] = 0b00000000;
   data[2] = 0b11111111;
-  mcp23018_status = i2c_transmit(I2C_ADDR_WRITE, (uint8_t *)data, 3, MCP23018_I2C_TIMEOUT);
+  mcp23018_status = i2c_transmit(I2C_ADDR, (uint8_t *)data, 3, MCP23018_I2C_TIMEOUT);
   if (mcp23018_status != I2C_STATUS_SUCCESS)
     goto out;
 
@@ -50,7 +50,7 @@ uint8_t init_mcp23018(void)
   data[0] = GPPUA;
   data[1] = 0b00000000;
   data[2] = 0b11111111;
-  mcp23018_status = i2c_transmit(I2C_ADDR_WRITE, (uint8_t *)data, 3, MCP23018_I2C_TIMEOUT);
+  mcp23018_status = i2c_transmit(I2C_ADDR, (uint8_t *)data, 3, MCP23018_I2C_TIMEOUT);
   if (mcp23018_status != I2C_STATUS_SUCCESS)
     goto out;
 
@@ -61,7 +61,7 @@ uint8_t init_mcp23018(void)
   data[0] = OLATA;
   data[1] = 0b11111111;
   data[2] = 0b11111111;
-  mcp23018_status = i2c_transmit(I2C_ADDR_WRITE, (uint8_t *)data, 3, MCP23018_I2C_TIMEOUT);
+  mcp23018_status = i2c_transmit(I2C_ADDR, (uint8_t *)data, 3, MCP23018_I2C_TIMEOUT);
 
 out:
   return (mcp23018_status);
diff --git a/keyboards/ymdk/sp64/sp64.h b/keyboards/ymdk/sp64/sp64.h
index afad36ee9a4..0e3e3c38b89 100644
--- a/keyboards/ymdk/sp64/sp64.h
+++ b/keyboards/ymdk/sp64/sp64.h
@@ -23,9 +23,7 @@
 # include "i2c_master.h"
 
 // I2C aliases and register addresses (see "mcp23018.md")
-# define I2C_ADDR        0b0100000
-# define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
-# define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+# define I2C_ADDR        (0b0100000<<1)
 # define IODIRA          0x00            // i/o direction register
 # define IODIRB          0x01
 # define GPPUA           0x0C            // GPIO pull-up resistor register
diff --git a/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c b/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
deleted file mode 100644
index 7afe4ed067c..00000000000
--- a/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, 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_BSPC,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_NO, 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_LALT, KC_LGUI, _______, KC_SPC, _______, _______, KC_RALT, _______, KC_RGUI, KC_RCTL),
-
-    LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, QK_BOOT,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
-        _______, KC_NO,	  _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-
-};
diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h
index b66c41ad696..8d59b7832f4 100644
--- a/keyboards/ymdk/ymd09/config.h
+++ b/keyboards/ymdk/ymd09/config.h
@@ -18,59 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_MATRIX_LED_COUNT 9
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// 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
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/info.json
index 11552ae5b20..52dc9d31609 100644
--- a/keyboards/ymdk/ymd09/info.json
+++ b/keyboards/ymdk/ymd09/info.json
@@ -46,6 +46,40 @@
         }
     },
     "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 2], "x": 64, "y": 0},  //7
@@ -58,6 +92,7 @@
             {"flags": 4, "matrix": [2, 1], "x": 32, "y": 64}, //2
             {"flags": 4, "matrix": [2, 0], "x": 0, "y": 64}   //3
         ],
-        "center_point": [32, 32]
+        "center_point": [32, 32],
+        "sleep": true
     }
 }
diff --git a/keyboards/ymdk/ymd09/keymaps/andys8/keymap.c b/keyboards/ymdk/ymd09/keymaps/andys8/keymap.c
deleted file mode 100644
index 130db7e4e7c..00000000000
--- a/keyboards/ymdk/ymd09/keymaps/andys8/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright 2021 andys8 <andys8@users.noreply.github.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
-#include "sendstring_german.h"
-
-enum custom_keycodes {
-    GIT_STASH = SAFE_RANGE,
-    GIT_STASH_POP,
-    GIT_COMMIT,
-    COPY_PASTE,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case GIT_STASH:
-            if (record->event.pressed) {
-                SEND_STRING("git stash\n");
-            }
-            break;
-        case GIT_STASH_POP:
-            if (record->event.pressed) {
-                SEND_STRING("git stash pop\n");
-            }
-            break;
-        case GIT_COMMIT:
-            if (record->event.pressed) {
-                SEND_STRING("git add -A && git commit -a\n");
-            }
-            break;
-        case COPY_PASTE:
-            if (record->event.pressed) {
-                tap_code16(C(KC_C));
-            } else {
-                tap_code16(C(KC_V));
-            }
-            break;
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = LAYOUT(GIT_STASH, GIT_STASH_POP, GIT_COMMIT,
-               LCTL(KC_F4), LT(1, KC_SPACE), LCTL(KC_F6),
-               COPY_PASTE, LCTL(KC_F2), LCTL(KC_F3)),
-
-  [1] = LAYOUT(RGB_RMOD, RGB_TOG, RGB_MOD,
-               RGB_HUI, KC_TRNS, RGB_SAI,
-               RGB_HUD, RGB_M_P, RGB_SAD),
-
-};
diff --git a/keyboards/ymdk/ymd40/air40/config.h b/keyboards/ymdk/ymd40/air40/config.h
deleted file mode 100644
index 2f64f97d93b..00000000000
--- a/keyboards/ymdk/ymd40/air40/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 Dennis Kruyt (dennis@kruyt.org)
- *
- * 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_MATRIX_LED_COUNT 51
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130 // Limit to vendor-recommended value
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// 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
-#    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
\ No newline at end of file
diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json
index daf104ebfec..4e791c87c47 100644
--- a/keyboards/ymdk/ymd40/air40/info.json
+++ b/keyboards/ymdk/ymd40/air40/info.json
@@ -9,7 +9,54 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 130,
+        "sleep": true
     },
     "matrix_pins": {
         "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
diff --git a/keyboards/ymdk/ymd75/rev4/iso/config.h b/keyboards/ymdk/ymd75/rev4/iso/config.h
index 317c0ec2362..58c4b34d617 100644
--- a/keyboards/ymdk/ymd75/rev4/iso/config.h
+++ b/keyboards/ymdk/ymd75/rev4/iso/config.h
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/ymdk/ymd75/rev4/iso/info.json b/keyboards/ymdk/ymd75/rev4/iso/info.json
index d7e27dbdeb1..180c68beaa0 100644
--- a/keyboards/ymdk/ymd75/rev4/iso/info.json
+++ b/keyboards/ymdk/ymd75/rev4/iso/info.json
@@ -179,7 +179,8 @@
             { "flags": 2, "x": 38, "y": 60 },
             { "flags": 2, "x": 1, "y": 60 },
             { "flags": 2, "x": 1, "y": 32 }
-        ]
+        ],
+        "sleep": true
     },
     "community_layouts": ["75_iso"],
     "layouts": {
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md
deleted file mode 100644
index 249fff7ccb9..00000000000
--- a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Personal Config by @AnthonyWharton
-
-The keymap and layout macro's in the main repository are for the following
-keyboard:
-
-![@AnthonyWharton's YMD96](https://i.imgur.com/uhKmkBz.jpg)
-
-**Note:** This setup has locking Caps Lock and Num Lock keys, so if you wish
-to use this layout and do not have such keys, you should :
-
- - Change the keys `KC_LCAP` and `KC_LNUM` to `KC_CAPS`  and `KC_NUM` 
-   respectively.
- - Remove the `LOCKING_SUPPORT_ENABLE` and `LOCKING_RESYNC_ENABLE` lines
-   from `config.h`.
-
-For any other questions, find my latest contact information on my github page.
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h
deleted file mode 100644
index 27a2fcd6a7c..00000000000
--- a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Anthony Wharton <th3ant@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
-
-/* Required for MX Locks installed */
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 12
-
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1.0-2.7
-#define RGBLIGHT_EFFECT_BREATHE_MAX 255     // 1-255
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 7
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3
-#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 0
-#define RGBLIGHT_EFFECT_KNIGHT_LED_NUM RGBLED_NUM
-#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 500
diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
deleted file mode 100644
index 9e334e9e32a..00000000000
--- a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Anthony Wharton <th3ant@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 LicensezZZ
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define _DEFLT 0
-#define _RAISE 1
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	
-	/* Layer 0, default layer */	
-	[_DEFLT] = LAYOUT_iso(
-		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_HOME, KC_END,  KC_INS,  KC_DEL,  KC_PGUP,
-		KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,      KC_BSPC,      KC_LNUM, KC_PSLS, KC_PAST, KC_PGDN,
-		KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,       KC_ENT,     KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-		KC_LCAP,  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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-		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,                        MO(_RAISE),      KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT
-	),
-
-	/* Layer 1, raise layer */ 
-	[_RAISE] = LAYOUT_iso(
-		_______,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,   KC_F24,  _______, KC_PAUS, KC_SCRL, _______, _______, _______,
-		_______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, BL_OFF,  BL_ON,   BL_DOWN,  BL_UP,        _______,     _______, _______, _______, _______,
-		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD,  RGB_VAI,      KC_MUTE,     _______, KC_VOLU, _______, _______,
-		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,  BL_TOGG,                   KC_MPRV, KC_MPLY, KC_MNXT, _______,
-		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     KC_PGUP, _______, KC_VOLD, _______, QK_LOCK,
-		_______,  _______, KC_RALT,                               _______,                           _______,      _______,    KC_HOME, KC_PGDN, KC_END,  _______, _______
-	)
-};
diff --git a/keyboards/ymdk/ymd96/keymaps/epx/keymap.c b/keyboards/ymdk/ymd96/keymaps/epx/keymap.c
deleted file mode 100644
index c0542efd6d1..00000000000
--- a/keyboards/ymdk/ymd96/keymaps/epx/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-     Copyright 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified Copyright 2018 Elvis Pfutzenreuter <elvis.pfutzenreuter@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 LicensezZZ
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define _x_ KC_TRNS
-#define _DEFLT 0
-#define _AR 1
-#define _RAISE 2
-
-#define LAYOUT LAYOUT_default
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Layer 0, default layer
-   *  | Esc  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | || > |  <<  |  >>  | vol+ | vol- | Bkspc |
-   *  |  ~`  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |    0 |    - |    = |    BkSpc    |NumLck|   /  |   *  |   -   |
-   *  |   Tab   |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |    P |    { |    } |     \    |  7   |   8  |   9  |       |
-   *  |   Ctrl    |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |    ; |   '  |     Return     |  4   |   5  |   6  |   +   |
-   *  |    LShft     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |       RShft       |  1   |   2  |   3  |       | 
-   *  | Ctrl  |  Alt  |  Win  |                  Space                      |  Win  |  Fn   |  Alt  |   Ctrl   |      0      |   .  | Enter |
-   * 
-   * Layout is inspired on Model F.
-   * Extra keys on top right, as well as some seldom-used keys, are media keys in default layer.
-   * Num Lock toogles layer, so the numeric block works as a Model F navigation block in a Mac.
-   * (Fn-Num Lock operates as conventional Num Lock in case the keyboard needs to be used with Windows or Linux.)
-   * Caps Lock operates normally but it takes FN to work, the key is Ctrl by default, like in Model F.
-   */
-  [_DEFLT] = 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_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_BSPC,
-    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,          TO(_AR), 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_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    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_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LCTL, KC_LALT,KC_LGUI,                     KC_SPC,                   KC_RGUI, KC_NO, MO(_RAISE), KC_RALT,  KC_RCTL,                  KC_P0,   KC_P0,   KC_PDOT
-  ),
-
-  /* Layer 1, Num Lock activated 
-   *  ...
-   *  ... 
-   *  ... | Home |  Up  | Pg Up |       |
-   *  ... | Left | (no) | Right |   +   |
-   *  ... | End  | Down | Pg Dn |       |
-   *  ... |     Ins     |  Del  | Enter |
-   */
-  [_AR] = LAYOUT(
-    _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_,
-    _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_,       TO(_DEFLT), _x_, _x_, _x_,
-    _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_,          KC_HOME, KC_UP,   KC_PGUP, _x_,
-    _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_,               KC_LEFT, KC_NO,   KC_RGHT, _x_,
-    _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_,                    KC_END,  KC_DOWN, KC_PGDN, _x_,
-    _x_, _x_,_x_, _x_, _x_, _x_, _x_, _x_, _x_,                                    KC_INS,  KC_INS,  KC_DEL
-  ),
-
-  /* Layer 2, raise layer
-   *  |      |      |      |      |      |      |      |      |      |      |      |      |      | PrtSc |Pause|ScrLck| stop | mute |  Del  |
-   *  |          | RGB Toggle | RGB Hue - | RGB Hue + |   |   |   |   |   |   |    |      |      |     Del     |NumLck|      |      |       |
-   *  |          | RGB Mode + | RGB Satu- | RGB Satu+  |   |   |   |   |   |   |      |      |      |          |      |      |      |       |
-   *  | Caps Lck | RGB Mode - | RGB Brgt- | RGB Brgt+   |   |   |   |   |   |   |   |   |     |                |      |      |      |       |
-   *  |              |      |      |      |      |      |      |      |      |      |      |                   |      |      |      |       |
-   *  |       |       |       |                                             | Win Menu  |      |        |      |             |      |       |
-   */ 
-  [_RAISE] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_PAUS,  KC_SCRL, KC_MUTE, KC_MSTP, KC_DEL,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            KC_NUM,  _______, _______, _______,
-    _______, RGB_TOG, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
-    KC_CAPS, RGB_MOD, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______,  _______, _______,                   _______, _______, _______, _______,
-    _______, RGB_RMOD,RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______,                             _______, _______, _______, _______,
-    _______, _______,_______,                     _______,                  KC_APP,  _______,    _______,  _______,  _______,               _______, _______, _______
-  ),
-
-};
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/config.h b/keyboards/ymdk/ymd96/keymaps/hgoel89/config.h
deleted file mode 100644
index b1d74e1e693..00000000000
--- a/keyboards/ymdk/ymd96/keymaps/hgoel89/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 300
-
-#endif
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
deleted file mode 100644
index 067beaa75ab..00000000000
--- a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/*
-#define _QWERTY 0
-#define _LOWER  1
-#define _RAISE  2*/
-/*
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};*/
-
-void matrix_scan_user(void) {
-  // runs at every matrix scan.
-}
-
-enum {
-  TD_H_E = 0
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_H_E] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
-};
-#define ______ KC_TRNS
-#define _DEFLT 0
-#define _RAISE 1
-
-#define LAYOUT LAYOUT_custom
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	
-	/* Layer 0, default layer
-	*  | Esc  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |Print | Home | End  |Insert|Delete| PgUp | 19 keys
-	*  |  ~`  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |    0 |    - |    = |    BkSpc    |NumLck|   /  |   *  | PgDn | 18 keys
-	*  |   Tab   |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |    P |    { |    } |     \    |  7   |   8  |   9  |   -  | 18 keys
-	*  |   Caps   |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |    ; |   '  |     Return     |  4   |   5  |   6  |   +  | 17 keys
-	*  |    LShft     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |       RShft       |  1   |   2  |   3  |  En  | 16 keys
-	*  | Ctrl  |  Win  |  Alt  |                  Space                      |  Fn  |  Win | Left | Down |  Up  | Right|   0  |   .  |      | 12 keys
-	*/
-	
-    [_DEFLT] = LAYOUT(
-			KC_ESC,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,       KC_F12,      KC_PSCR, KC_HOME,    KC_END, KC_INSERT,   KC_DELETE,      KC_PGUP,
-			KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,      KC_EQL,          KC_BSPC,         KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, 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_BSLS,         KC_P7,  KC_P8,       KC_P9,          KC_NO,
-			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_P4,  KC_P5,       KC_P6,          KC_PPLS,
-			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(_RAISE),     KC_P1,  KC_P2,       KC_P3,          KC_PENT,
-			KC_LCTL, KC_LGUI,KC_LALT,                              KC_SPC,                   KC_RGUI     ,          KC_LEFT, KC_DOWN,    KC_UP,      KC_RGHT,  KC_P0,          KC_PDOT
-	),
-	/* Layer 1, raise layer
-	*  |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-	*  |      |      |      |      |      |      |      |      |      |      |      |      |      |             |      |      |      |      |
-	*  |         |      |rgb_up|rgb_dn|rgb_mo|      |      |      |      |      |  F22 |  F23  |  F24 |         |      |      |      |      |
-	*  |          |      |      |      |      |      |      |      |      |      |      |      |                |      |      |      |      |
-	*  |              |      |      |      |      |      |      |      | VolDn| VolUp| Mute |     Play/Pause    |      |      |      |      |
-	*  |       |       |       |                                             |      |      |MPrev |      |      | MNext|      |      |      |
-	*/ 
-	[_RAISE] = LAYOUT(
-			QK_BOOT,RGB_TOG,  BL_TOGG,  BL_STEP,    ______,  ______,  ______,  ______,  ______,  ______,  ______, ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,
-			______,  BL_UP,   BL_DOWN, ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,
-			______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_F22,  KC_F23,  KC_F24,  ______,  ______,  ______,  ______,  ______,
-			______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_MODE_FORWARD	,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,
-			______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  ______,  ______,  ______,  ______,  KC_VOLD,KC_VOLU, KC_MUTE,      KC_MPLY,  ______,  ______,  ______,  ______,
-		    ______,  ______,  BL_OFF,                              BL_ON,                        ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______
-	)
-};
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/readme.md b/keyboards/ymdk/ymd96/keymaps/hgoel89/readme.md
deleted file mode 100644
index 05488df990d..00000000000
--- a/keyboards/ymdk/ymd96/keymaps/hgoel89/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Harshit
-Modified the layout according to me. Full 2u NumPad 0, 5 * 1u modifiers on right of space. Split right shift.
\ No newline at end of file
diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/rules.mk b/keyboards/ymdk/ymd96/keymaps/hgoel89/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/ymdk/ymd96/keymaps/hgoel89/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h
deleted file mode 100644
index d44817cae9a..00000000000
--- a/keyboards/yncognito/batpad/config.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright 2020 Yncognito
-
-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_MATRIX_LED_COUNT 8
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_KEYRELEASES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-
-// 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
-#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
diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json
index 4ec1dc045ff..0335608cfb1 100644
--- a/keyboards/yncognito/batpad/info.json
+++ b/keyboards/yncognito/batpad/info.json
@@ -12,7 +12,56 @@
         "pin": "B5"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "ws2812",
+        "react_on_keyup": true
     },
     "matrix_pins": {
         "cols": ["F1", "F0", "D5", "D3"],
diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h
index 4c3ced2c426..78ba8a377c0 100644
--- a/keyboards/yoichiro/lunakey_macro/config.h
+++ b/keyboards/yoichiro/lunakey_macro/config.h
@@ -27,9 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Mouse Keys Combined mode */
 //#define MK_COMBINED
 
-/* Layer Count */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/yosino58/keymaps/default/config.h b/keyboards/yosino58/keymaps/default/config.h
index 763b31aa109..e82254fff17 100644
--- a/keyboards/yosino58/keymaps/default/config.h
+++ b/keyboards/yosino58/keymaps/default/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 100
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
+#define RGBLIGHT_LED_COUNT 12
 #define RGBLIGHT_LIMIT_VAL 120
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/yosino58/keymaps/sakura/config.h b/keyboards/yosino58/keymaps/sakura/config.h
deleted file mode 100644
index a463ee1808f..00000000000
--- a/keyboards/yosino58/keymaps/sakura/config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 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
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-#define MASTER_RIGHT
-// #define EE_HANDS
-
-#define OLED_DISPLAY_128X64
-
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
-
-#undef RGBLED_NUM
-#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 29
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#define MOUSEKEY_DELAY             50
-#define MOUSEKEY_INTERVAL          10
-#define MOUSEKEY_MAX_SPEED         3
-#define MOUSEKEY_TIME_TO_MAX       20
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
diff --git a/keyboards/yosino58/keymaps/sakura/keymap.c b/keyboards/yosino58/keymaps/sakura/keymap.c
deleted file mode 100644
index e3c8c52d7de..00000000000
--- a/keyboards/yosino58/keymaps/sakura/keymap.c
+++ /dev/null
@@ -1,290 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-  ADJUST,
-  RGBRST
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* QWERTY
- * ,-----------------------------------------.                                  ,-----------------------------------------.
- * |  `   |   1  |   2  |   3  |   4  |   5  |                                  |   6  |   7  |   8  |   9  |   0  |  -   |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                                  |   Y  |   U  |   I  |   O  |   P  |  =   |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |LShift|   A  |   S  |   D  |   F  |   G  |                                  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |LCTRL |   Z  |   X  |   C  |   V  |   B  |-------.-------.  ,---------------|   N  |   M  |   ,  |   .  |   /  |  \   |
- * `-----------------------------------------/  Del  /       /   \       \ Bksp \----------------------------------------'
- *                          | LAlt | LGUI | /-------/ Space /     \ Enter \-------\  |   [  |  ]   |
- *                          |      |      |/ LOWER /       /       \       \ RAISE \ |      |      |
- *                          `-----------------------------'         '------------------------------'
- */
- [_QWERTY] = LAYOUT(
-  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_TAB,   KC_Q, KC_W, KC_E, KC_R,    KC_T,                                           KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_EQL,
-  KC_LSFT,  KC_A, KC_S, KC_D, KC_F,    KC_G,                                           KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-  KC_LCTL,  KC_Z, KC_X, KC_C, KC_V,    KC_B,    KC_DEL,    KC_SPC, KC_ENT, KC_BSPC,    KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
-                              KC_LALT, KC_LGUI, LOWER,                     RAISE,      KC_LBRC, KC_RBRC
-  ),
-
-/* LOWER
- * ,-----------------------------------------.                                  ,-----------------------------------------.
- * | ESC  |  F1  |  F2  |  F3  |  F4  |  F5  |                                  |  F6  |  F7  |  F8  |  F9  |  F10 |      |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * | Tab  |   /  |   -  |   7  |   8  |   9  |                                  | PSCR | SLCK | Pause|      |  ��  |      |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |LShift|   *  |   +  |   4  |   5  |   6  |                                  |Insert| Home |PageUP|      |  ��  |  ��  |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |LCTRL |   .  |   0  |   1  |   2  |   3  |-------.-------.  ,---------------|  Del | End  |PageDN|  ��  | Num  | Caps |
- * `-----------------------------------------/  F11  /       /   \       \  F12  \----------------------------------------'
- *                          | LAlt | LGUI | /-------/ Space /     \ Enter \-------\  |      |      |
- *                          |      |      |/ LOWER /       /       \       \       \ |      |      |
- *                          `-----------------------------'         '------------------------------'
- */
- [_LOWER] = LAYOUT(
-  KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX,
-  _______, KC_PSLS, KC_PMNS, KC_P7, KC_P8,   KC_P9,                                       KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, KC_UP,   XXXXXXX,
-  _______, KC_PAST, KC_PPLS, KC_P4, KC_P5,   KC_P6,                                       KC_INS,  KC_HOME, KC_PGUP, XXXXXXX, KC_DOWN, KC_RGHT,
-  _______, KC_PDOT, KC_P0,   KC_P1, KC_P2,   KC_P3,   KC_F11,  _______, _______, KC_F12,  KC_DEL,  KC_END,  KC_PGDN, KC_LEFT, KC_NUM,  KC_CAPS,
-                                    _______, _______, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-/* RAISE
- * ,-----------------------------------------.                                  ,-----------------------------------------.
- * |QK_BOOT |      |      |      |      |      |                                  | Mute | Vol+ | Play |      |      |      |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                                  | Prev | Vol- | Next |      |      |      |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |MS_Bt1| MS_U |MS_Bt2|MS_WhU|MS_WhL|                                  |      |      |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      | MS_L | MS_D | MS_R |MS_WhD|MS_WhR|-------.-------.  ,---------------|      |      | MODE | HUE- | SAT- | VAL- |
- * `-----------------------------------------/       /       /   \       \       \----------------------------------------'
- *                          |      |      | /-------/ Space /     \ Enter \-------\  |      |      |
- *                          |      |      |/       /       /       \       \ RAISE \ |      |      |
- *                          `-----------------------------'         '------------------------------'
- */
- [_RAISE] = LAYOUT(
-  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,                                     KC_MUTE, KC_VOLU, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX,                                     KC_MPRV, KC_VOLD, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U,    KC_WH_L,                                     XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
-  XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,    KC_WH_R, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, RGBRST,  RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
-                                      XXXXXXX,    XXXXXXX, XXXXXXX,                   _______, XXXXXXX, XXXXXXX
-  )
-
-/*   ADJUST
- * ,-----------------------------------------.                                  ,-----------------------------------------.
- * |QK_BOOT |      |      |      |      |      |                                  |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                                  |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                                  |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                                  |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------.-------.  ,---------------|      |      |      |      |      |      |
- * `-----------------------------------------/       /       /   \       \       \----------------------------------------'
- *                          |      |      | /-------/       /     \       \-------\  |      |      |
- *                          |      |      |/       /       /       \       \       \ |      |      |
- *                          `-----------------------------'         '------------------------------'
-
- [_ADJUST] = LAYOUT(
-  QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                      XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX
-  ) 
-*/
-};
-
-
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-}
-
-#ifdef OLED_ENABLE
-
-//assign the right code to your layers for OLED display
-#define L_QWERTY 0
-#define L_LOWER 2
-#define L_RAISE 4
-#define L_ADJUST 8
-
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_logo(void);
-
-bool oled_task_user(void) {
-  if (is_keyboard_master()) {
-    static char indctr[2][20][5]=
-    {
-      // white icon
-      {
-        {0x80,0x81,0x82,0x83,0},
-        {0x88,0x89,0x8A,0x8B,0},
-        {0x90,0x91,0x92,0x93,0},
-        {0x98,0x99,0x9A,0x9B,0},
-        {0x01,0x02,0x03,0x04,0},
-        {0xA0,0xA1,0xA2,0xA3,0},
-        {0xA8,0xA9,0xAA,0xAB,0},
-        {0xB0,0xB1,0xB2,0xB3,0},
-        {0xB8,0xB9,0xBA,0xBB,0},
-        {0x21,0x22,0x23,0x24,0},
-        {0xC0,0xC1,0xC2,0xC3,0},
-        {0xC8,0xC9,0xCA,0xCB,0},
-        {0xD0,0xD1,0xD2,0xD3,0},
-        {0xD8,0xD9,0xDA,0xDB,0},
-        {0x41,0x42,0x43,0x44,0},
-        {0xE0,0xE1,0xE2,0xE3,0},
-        {0xE8,0xE9,0xEA,0xEB,0},
-        {0xF0,0xF1,0xF2,0xF3,0},
-        {0xF8,0xF9,0xFA,0xFB,0},
-        {0x61,0x62,0x63,0x64,0}
-      },
-      // Black icon
-      {
-        {0x84,0x85,0x86,0x87,0},
-        {0x8C,0x8D,0x8E,0x8F,0},
-        {0x94,0x95,0x96,0x97,0},
-        {0x9C,0x9D,0x9E,0x9F,0},
-        {0x05,0x06,0x07,0x08,0},
-        {0xA4,0xA5,0xA6,0xA7,0},
-        {0xAC,0xAD,0xAE,0xAF,0},
-        {0xB4,0xB5,0xB6,0xB7,0},
-        {0xBC,0xBD,0xBE,0xBF,0},
-        {0x25,0x26,0x27,0x28,0},
-        {0xC4,0xC5,0xC6,0xC7,0},
-        {0xCC,0xCD,0xCE,0xCF,0},
-        {0xD4,0xD5,0xD6,0xD7,0},
-        {0xDC,0xDD,0xDE,0xDF,0},
-        {0x45,0x46,0x47,0x48,0},
-        {0xE4,0xE5,0xE6,0xE7,0},
-        {0xEC,0xED,0xEE,0xEF,0},
-        {0xF4,0xF5,0xF6,0xF7,0},
-        {0xFC,0xFD,0xFE,0xFF,0},
-        {0x65,0x66,0x67,0x68,0}
-      }
-    };
-
-    int rown = 0;
-    int rowc = 0;
-    int rowl = 0;
-    int rowr = 0;
-    int rowa = 0;
-
-    //Set Indicator icon
-    led_t led_state = host_keyboard_led_state();
-    if (led_state.num_lock) { rown = 1; } else { rown = 0; }
-    if (led_state.caps_lock) { rowc = 1; } else { rowc = 0; }
-    if (layer_state == L_LOWER) { rowl = 1; }
-    if (layer_state == L_RAISE) { rowr = 1; }
-    if (layer_state == L_ADJUST) { rowa = 1; }
-
-    oled_write(indctr[rowl]  [0], false);
-    oled_write(indctr[rowr]  [1], false);
-    oled_write(indctr[rowa]  [2], false);
-    oled_write(indctr[rowc]  [3], false);
-    oled_write(indctr[rown]  [4], false);
-    oled_write_char(0x13, false);
-    oled_write(indctr[rowl]  [5], false);
-    oled_write(indctr[rowr]  [6], false);
-    oled_write(indctr[rowa]  [7], false);
-    oled_write(indctr[rowc]  [8], false);
-    oled_write(indctr[rown]  [9], false);
-    oled_write_char(0x13, false);
-    oled_write(indctr[rowl]  [10], false);
-    oled_write(indctr[rowr]  [11], false);
-    oled_write(indctr[rowa]  [12], false);
-    oled_write(indctr[rowc]  [13], false);
-    oled_write(indctr[rown]  [14], false);
-    oled_write_char(0x13, false);
-    oled_write(indctr[rowl]  [15], false);
-    oled_write(indctr[rowr]  [16], false);
-    oled_write(indctr[rowa]  [17], false);
-    oled_write(indctr[rowc]  [18], false);
-    oled_write(indctr[rown]  [19], false);
-
-  }else{
-    oled_write(read_logo(), false);
-  }
-  return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-      } else {
-        layer_off(_LOWER);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-      } else {
-        layer_off(_RAISE);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
diff --git a/keyboards/yosino58/keymaps/sakura/rules.mk b/keyboards/yosino58/keymaps/sakura/rules.mk
deleted file mode 100644
index 679c8c155d6..00000000000
--- a/keyboards/yosino58/keymaps/sakura/rules.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-OLED_ENABLE = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/logo_reader.c \
-        # ./lib/rgb_state_reader.c \
-        # ./lib/layer_state_reader.c \
-        # ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/info.json
new file mode 100644
index 00000000000..c4a143cb73c
--- /dev/null
+++ b/keyboards/yushakobo/ergo68/info.json
@@ -0,0 +1,222 @@
+{
+    "manufacturer": "yushakobo",
+    "keyboard_name": "ergo68",
+    "maintainer": "yushakobo",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true,
+    },
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "url": "",
+    "usb": {
+        "vid": "0x3265",
+        "pid": "0x0011",
+        "device_version": "1.0.0"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            {"x": 0, "y": 0, "flags": 8},
+            {"x": 11, "y": 0, "flags": 8},
+            {"x": 21, "y": 0, "flags": 8},
+            {"matrix": [0, 0], "x": 0, "y": 10, "flags": 1},
+            {"matrix": [0, 1], "x": 14, "y": 10, "flags": 4},
+            {"matrix": [0, 2], "x": 28, "y": 7, "flags": 4},
+            {"matrix": [0, 3], "x": 42, "y": 6, "flags": 4},
+            {"matrix": [0, 4], "x": 56, "y": 7, "flags": 4},
+            {"matrix": [0, 5], "x": 70, "y": 9, "flags": 4},
+            {"matrix": [1, 6], "x": 84, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 70, "y": 20, "flags": 4},
+            {"matrix": [1, 4], "x": 56, "y": 19, "flags": 4},
+            {"matrix": [1, 3], "x": 42, "y": 17, "flags": 4},
+            {"matrix": [1, 2], "x": 28, "y": 19, "flags": 4},
+            {"matrix": [1, 1], "x": 14, "y": 22, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 22, "flags": 1},
+            {"matrix": [2, 0], "x": 0, "y": 34, "flags": 1},
+            {"matrix": [2, 1], "x": 14, "y": 34, "flags": 4},
+            {"matrix": [2, 2], "x": 28, "y": 31, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 29, "flags": 4},
+            {"matrix": [2, 4], "x": 56, "y": 31, "flags": 4},
+            {"matrix": [2, 5], "x": 70, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 84, "y": 26, "flags": 4},
+            {"matrix": [3, 6], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 70, "y": 44, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 42, "flags": 4},
+            {"matrix": [3, 3], "x": 42, "y": 41, "flags": 4},
+            {"matrix": [3, 2], "x": 28, "y": 42, "flags": 4},
+            {"matrix": [3, 1], "x": 14, "y": 45, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 45, "flags": 1},
+            {"matrix": [4, 0], "x": 0, "y": 57, "flags": 1},
+            {"matrix": [4, 1], "x": 14, "y": 57, "flags": 1},
+            {"matrix": [4, 2], "x": 28, "y": 54, "flags": 1},
+            {"matrix": [4, 3], "x": 49, "y": 54, "flags": 1},
+            {"matrix": [4, 4], "x": 63, "y": 55, "flags": 1},
+            {"matrix": [4, 5], "x": 81, "y": 58, "flags": 1},
+            {"matrix": [4, 6], "x": 95, "y": 64, "flags": 1},
+            {"x": 224, "y": 0, "flags": 8},
+            {"x": 214, "y": 0, "flags": 8},
+            {"x": 203, "y": 0, "flags": 8},
+            {"matrix": [5, 0], "x": 224, "y": 10, "flags": 1},
+            {"matrix": [5, 1], "x": 210, "y": 10, "flags": 4},
+            {"matrix": [5, 2], "x": 196, "y": 7, "flags": 4},
+            {"matrix": [5, 3], "x": 182, "y": 6, "flags": 4},
+            {"matrix": [5, 4], "x": 168, "y": 7, "flags": 4},
+            {"matrix": [5, 5], "x": 154, "y": 9, "flags": 4},
+            {"matrix": [6, 6], "x": 140, "y": 15, "flags": 4},
+            {"matrix": [6, 5], "x": 154, "y": 20, "flags": 4},
+            {"matrix": [6, 4], "x": 168, "y": 19, "flags": 4},
+            {"matrix": [6, 3], "x": 182, "y": 17, "flags": 4},
+            {"matrix": [6, 2], "x": 196, "y": 19, "flags": 4},
+            {"matrix": [6, 1], "x": 210, "y": 22, "flags": 4},
+            {"matrix": [6, 0], "x": 224, "y": 22, "flags": 1},
+            {"matrix": [7, 0], "x": 224, "y": 34, "flags": 1},
+            {"matrix": [7, 1], "x": 210, "y": 34, "flags": 4},
+            {"matrix": [7, 2], "x": 196, "y": 31, "flags": 4},
+            {"matrix": [7, 3], "x": 182, "y": 29, "flags": 4},
+            {"matrix": [7, 4], "x": 168, "y": 31, "flags": 4},
+            {"matrix": [7, 5], "x": 154, "y": 32, "flags": 4},
+            {"matrix": [7, 6], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [8, 6], "x": 140, "y": 38, "flags": 4},
+            {"matrix": [8, 5], "x": 154, "y": 44, "flags": 4},
+            {"matrix": [8, 4], "x": 168, "y": 42, "flags": 4},
+            {"matrix": [8, 3], "x": 182, "y": 41, "flags": 4},
+            {"matrix": [8, 2], "x": 196, "y": 42, "flags": 4},
+            {"matrix": [8, 1], "x": 210, "y": 45, "flags": 4},
+            {"matrix": [8, 0], "x": 224, "y": 45, "flags": 1},
+            {"matrix": [9, 0], "x": 224, "y": 57, "flags": 1},
+            {"matrix": [9, 1], "x": 210, "y": 57, "flags": 1},
+            {"matrix": [9, 2], "x": 196, "y": 54, "flags": 1},
+            {"matrix": [9, 3], "x": 175, "y": 54, "flags": 1},
+            {"matrix": [9, 4], "x": 161, "y": 55, "flags": 1},
+            {"matrix": [9, 5], "x": 144, "y": 58, "flags": 1},
+            {"matrix": [9, 6], "x": 130, "y": 64, "flags": 1}
+        ],
+        "max_brightness": 100,
+        "sleep": true,
+        "split_count": [37, 37],
+        "animations":{
+            "alphas_mods": true,
+            "breathing": true,
+            "cycle_all": true,
+            "rainbow_moving_chevron": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "solid_reactive": true,
+            "splash": true,
+            "solid_splash": true,
+        },
+        "default":{
+          "val": 50
+        },
+        "led_process_limit":16
+    },
+    "split": {
+        "enabled": true,
+        "handedness": {
+            "pin": "B6"
+        },
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true
+            }
+        },
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0.6},
+                {"matrix":[0,1], "x":1, "y":0.6},
+                {"matrix":[0,2], "x":2, "y":0.2},
+                {"matrix":[0,3], "x":3, "y":0},
+                {"matrix":[0,4], "x":4, "y":0.2},
+                {"matrix":[0,5], "x":5, "y":0.4},
+
+                {"matrix":[5,5], "x":10, "y":0.4},
+                {"matrix":[5,4], "x":11, "y":0.2},
+                {"matrix":[5,3], "x":12, "y":0},
+                {"matrix":[5,2], "x":13, "y":0.2},
+                {"matrix":[5,1], "x":14, "y":0.6},
+                {"matrix":[5,0], "x":15, "y":0.6},
+
+                {"matrix":[1,0], "x":0, "y":1.6},
+                {"matrix":[1,1], "x":1, "y":1.6},
+                {"matrix":[1,2], "x":2, "y":1.2},
+                {"matrix":[1,3], "x":3, "y":1},
+                {"matrix":[1,4], "x":4, "y":1.2},
+                {"matrix":[1,5], "x":5, "y":1.4},
+                {"matrix":[1,6], "x":6, "y":0.8},
+
+                {"matrix":[6,6], "x":9, "y":0.8},
+                {"matrix":[6,5], "x":10, "y":1.4},
+                {"matrix":[6,4], "x":11, "y":1.2},
+                {"matrix":[6,3], "x":12, "y":1},
+                {"matrix":[6,2], "x":13, "y":1.2},
+                {"matrix":[6,1], "x":14, "y":1.6},
+                {"matrix":[6,0], "x":15, "y":1.6},
+
+                {"matrix":[2,0], "x":0, "y":2.6},
+                {"matrix":[2,1], "x":1, "y":2.6},
+                {"matrix":[2,2], "x":2, "y":2.2},
+                {"matrix":[2,3], "x":3, "y":2},
+                {"matrix":[2,4], "x":4, "y":2.2},
+                {"matrix":[2,5], "x":5, "y":2.4},
+                {"matrix":[2,6], "x":6, "y":1.8},
+
+                {"matrix":[7,6], "x":9, "y":1.8},
+                {"matrix":[7,5], "x":10, "y":2.4},
+                {"matrix":[7,4], "x":11, "y":2.2},
+                {"matrix":[7,3], "x":12, "y":2},
+                {"matrix":[7,2], "x":13, "y":2.2},
+                {"matrix":[7,1], "x":14, "y":2.6},
+                {"matrix":[7,0], "x":15, "y":2.6},
+
+                {"matrix":[3,0], "x":0, "y":3.6},
+                {"matrix":[3,1], "x":1, "y":3.6},
+                {"matrix":[3,2], "x":2, "y":3.2},
+                {"matrix":[3,3], "x":3, "y":3},
+                {"matrix":[3,4], "x":4, "y":3.2},
+                {"matrix":[3,5], "x":5, "y":3.4},
+                {"matrix":[3,6], "x":6, "y":2.8},
+
+                {"matrix":[8,6], "x":9, "y":2.8},
+                {"matrix":[8,5], "x":10, "y":3.4},
+                {"matrix":[8,4], "x":11, "y":3.2},
+                {"matrix":[8,3], "x":12, "y":3},
+                {"matrix":[8,2], "x":13, "y":3.2},
+                {"matrix":[8,1], "x":14, "y":3.6},
+                {"matrix":[8,0], "x":15, "y":3.6},
+
+                {"matrix":[4,0], "x":0, "y":4.6},
+                {"matrix":[4,1], "x":1, "y":4.6},
+                {"matrix":[4,2], "x":2, "y":4.2},
+                {"matrix":[4,3], "x":3.5, "y":4.2},
+                {"matrix":[4,4], "x":4.5, "y":4.4},
+                {"matrix":[4,5], "x":5.5, "y":4.4, "h": 2},
+                {"matrix":[4,6], "x":6.5, "y":4.6, "h": 2},
+
+                {"matrix":[9,6], "x":8.5, "y":4.6, "h": 2},
+                {"matrix":[9,5], "x":9.5, "y":4.4, "h": 2},
+                {"matrix":[9,4], "x":10.5, "y":4.4},
+                {"matrix":[9,3], "x":11.5, "y":4.2},
+                {"matrix":[9,2], "x":13, "y":4.2},
+                {"matrix":[9,1], "x":14, "y":4.6},
+                {"matrix":[9,0], "x":15, "y":4.6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yushakobo/ergo68/keymaps/default/keymap.c b/keyboards/yushakobo/ergo68/keymaps/default/keymap.c
new file mode 100644
index 00000000000..57f41095027
--- /dev/null
+++ b/keyboards/yushakobo/ergo68/keymaps/default/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2023 yushakobo
+ *
+ * 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_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_PSCR,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_LBRC, KC_RBRC,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_MINS,  KC_EQL,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,  KC_DEL, KC_BSPC,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+        KC_LCTL,KC_LGUI,KC_LALT,  MO(1),  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC, KC_RALT,  KC_APP, KC_LCTL
+    ),
+        [1] = LAYOUT(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // caps lock cyan
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 128);
+    } else {
+        RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
+    }
+
+    // num lock cyan
+    if (host_keyboard_led_state().num_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 128);
+    } else {
+        RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
+    }
+
+    // scroll lock cyan
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 128);
+    } else {
+        RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 0);
+    }
+
+    // layer state
+    switch (get_highest_layer(layer_state)) {
+        case 1:
+            RGB_MATRIX_INDICATOR_SET_COLOR(37, 0, 0, 128);
+            break;
+        case 2:
+            RGB_MATRIX_INDICATOR_SET_COLOR(38, 0, 0, 128);
+            break;
+        case 3:
+            RGB_MATRIX_INDICATOR_SET_COLOR(39, 0, 0, 128);
+            break;
+    }
+    return false;
+}
diff --git a/keyboards/yushakobo/ergo68/keymaps/via/keymap.c b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c
new file mode 100644
index 00000000000..57f41095027
--- /dev/null
+++ b/keyboards/yushakobo/ergo68/keymaps/via/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2023 yushakobo
+ *
+ * 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_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_PSCR,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_LBRC, KC_RBRC,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_MINS,  KC_EQL,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,  KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,  KC_DEL, KC_BSPC,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+        KC_LCTL,KC_LGUI,KC_LALT,  MO(1),  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC, KC_RALT,  KC_APP, KC_LCTL
+    ),
+        [1] = LAYOUT(
+        QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // caps lock cyan
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 128);
+    } else {
+        RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
+    }
+
+    // num lock cyan
+    if (host_keyboard_led_state().num_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 128);
+    } else {
+        RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
+    }
+
+    // scroll lock cyan
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 128);
+    } else {
+        RGB_MATRIX_INDICATOR_SET_COLOR(2, 0, 0, 0);
+    }
+
+    // layer state
+    switch (get_highest_layer(layer_state)) {
+        case 1:
+            RGB_MATRIX_INDICATOR_SET_COLOR(37, 0, 0, 128);
+            break;
+        case 2:
+            RGB_MATRIX_INDICATOR_SET_COLOR(38, 0, 0, 128);
+            break;
+        case 3:
+            RGB_MATRIX_INDICATOR_SET_COLOR(39, 0, 0, 128);
+            break;
+    }
+    return false;
+}
diff --git a/keyboards/yushakobo/ergo68/keymaps/via/rules.mk b/keyboards/yushakobo/ergo68/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/yushakobo/ergo68/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yushakobo/ergo68/readme.md b/keyboards/yushakobo/ergo68/readme.md
new file mode 100644
index 00000000000..863c747f77b
--- /dev/null
+++ b/keyboards/yushakobo/ergo68/readme.md
@@ -0,0 +1,27 @@
+# ergo68
+
+![ergo68](https://i.imgur.com/ucr11Mgh.jpg)
+
+This is 68 keys Column-staggered Split keyboard.
+
+* Keyboard Maintainer: [yushakobo](https://github.com/yushakobo)
+* Hardware Supported: ergo68 PCB, Pro Micro
+* Hardware Availability: [yushakobo shop](https://shop.yushakobo.jp)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yushakobo/ergo68:default
+
+Flashing example for this keyboard:
+
+    make yushakobo/ergo68: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 `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/yushakobo/ergo68/rules.mk b/keyboards/yushakobo/ergo68/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/yushakobo/ergo68/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index 1d3b4dd3ee0..82b19956dc8 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_LED_COUNT 18
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 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 150 out of 255. Higher may cause the controller to crash.
-//      HSV_TEAL
-#endif
-
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_MAX_LAYERS 8
 
diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json
index 58374a7de78..51c41a6e82a 100644
--- a/keyboards/yushakobo/quick17/info.json
+++ b/keyboards/yushakobo/quick17/info.json
@@ -10,7 +10,9 @@
     },
     "rgb_matrix": {
         "driver": "ws2812",
+        "max_brightness": 150,
         "sat_steps": 8,
+        "sleep": true,
         "val_steps": 8,
         "speed_steps": 10
     },
diff --git a/keyboards/yynmt/dozen0/keymaps/f12/keymap.c b/keyboards/yynmt/dozen0/keymaps/f12/keymap.c
deleted file mode 100644
index 33512faa678..00000000000
--- a/keyboards/yynmt/dozen0/keymaps/f12/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 yynmt
- *
- * 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_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/zfrontier/big_switch/keymaps/longtap/keymap.c b/keyboards/zfrontier/big_switch/keymaps/longtap/keymap.c
deleted file mode 100644
index 486adcf3696..00000000000
--- a/keyboards/zfrontier/big_switch/keymaps/longtap/keymap.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright 2020 zFrontier
- *
- * 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 <print.h>
-
-
-enum {
-    TD_ENTER = 0,
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT( TD(TD_ENTER) ),
-};
-
-
-
-void keyboard_post_init_user(void) {
-    print("zFrontier S01.6 boot...\n");
-    rgblight_enable_noeeprom();
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING);
-    rgblight_sethsv_noeeprom(0,0,128);
-}
-
-
-void zf_switch_rgb_mode(void) {
-    switch (rgblight_get_mode() ) {
-        case RGBLIGHT_MODE_BREATHING:
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
-            break;
-        case RGBLIGHT_MODE_RAINBOW_MOOD:
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
-            break;
-        case RGBLIGHT_MODE_RAINBOW_SWIRL:
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE);
-            break;
-        case RGBLIGHT_MODE_SNAKE:
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT);
-            break;
-        case RGBLIGHT_MODE_KNIGHT:
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_CHRISTMAS);
-            break;
-        case RGBLIGHT_MODE_CHRISTMAS:
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_GRADIENT);
-            break;
-        case RGBLIGHT_MODE_STATIC_GRADIENT:
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_RGB_TEST);
-            break;
-        case RGBLIGHT_MODE_RGB_TEST:
-        default:
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING);
-            break;
-    }
-}
-
-void zf_send_random_string(void) {
-    uint8_t tmpu8 = (timer_read() & 0x7);
-    switch (tmpu8) {
-        case 0:
-        case 1:
-            SEND_STRING("Sazabi, launching!");
-            break;
-        case 2:
-        case 3:
-            SEND_STRING("I, Char Aznable, will purge them, Amuro!");
-            break;
-        case 4:
-        case 5:
-            SEND_STRING("Their souls are weighted down by gravity!");
-            break;
-        case 6:
-            SEND_STRING("Go, Axis! With my unpleasant memories!");
-            break;
-        case 7:
-            SEND_STRING("Hello from zFrontier!");
-            break;
-    }
-
-    tap_code(KC_ENT);
-}
-
-void dance_finished(tap_dance_state_t *state, void *user_data) {
-    switch (state->count) {
-        case 1:
-            register_code(KC_ENTER);
-            break;
-        case 2:
-            zf_switch_rgb_mode();
-            break;
-        default:
-            zf_send_random_string();
-            break;
-    }
-}
-
-void dance_reset(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code(KC_ENTER);
-    }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ENTER] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_finished, dance_reset)
-};
diff --git a/keyboards/zfrontier/big_switch/keymaps/longtap/readme.md b/keyboards/zfrontier/big_switch/keymaps/longtap/readme.md
deleted file mode 100644
index a94e5c32cb2..00000000000
--- a/keyboards/zfrontier/big_switch/keymaps/longtap/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# The longtap keymap for big_switch, the single switch keyboard,
-- tap once : send ENTER
-- tap twice : change RGB backlight mode
-- tap three times : send a pesudo-random string
diff --git a/keyboards/zfrontier/big_switch/keymaps/longtap/rules.mk b/keyboards/zfrontier/big_switch/keymaps/longtap/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/zfrontier/big_switch/keymaps/longtap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/z12/config.h b/keyboards/zigotica/z12/config.h
similarity index 100%
rename from keyboards/z12/config.h
rename to keyboards/zigotica/z12/config.h
diff --git a/keyboards/z12/info.json b/keyboards/zigotica/z12/info.json
similarity index 100%
rename from keyboards/z12/info.json
rename to keyboards/zigotica/z12/info.json
diff --git a/keyboards/z12/keymaps/default/config.h b/keyboards/zigotica/z12/keymaps/default/config.h
similarity index 100%
rename from keyboards/z12/keymaps/default/config.h
rename to keyboards/zigotica/z12/keymaps/default/config.h
diff --git a/keyboards/z12/keymaps/default/keymap.c b/keyboards/zigotica/z12/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/z12/keymaps/default/keymap.c
rename to keyboards/zigotica/z12/keymaps/default/keymap.c
diff --git a/keyboards/z12/keymaps/default/readme.md b/keyboards/zigotica/z12/keymaps/default/readme.md
similarity index 100%
rename from keyboards/z12/keymaps/default/readme.md
rename to keyboards/zigotica/z12/keymaps/default/readme.md
diff --git a/keyboards/z12/keymaps/default/rules.mk b/keyboards/zigotica/z12/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/z12/keymaps/default/rules.mk
rename to keyboards/zigotica/z12/keymaps/default/rules.mk
diff --git a/keyboards/z12/readme.md b/keyboards/zigotica/z12/readme.md
similarity index 100%
rename from keyboards/z12/readme.md
rename to keyboards/zigotica/z12/readme.md
diff --git a/keyboards/z12/rules.mk b/keyboards/zigotica/z12/rules.mk
similarity index 100%
rename from keyboards/z12/rules.mk
rename to keyboards/zigotica/z12/rules.mk
diff --git a/keyboards/z34/config.h b/keyboards/zigotica/z34/config.h
similarity index 100%
rename from keyboards/z34/config.h
rename to keyboards/zigotica/z34/config.h
diff --git a/keyboards/z34/info.json b/keyboards/zigotica/z34/info.json
similarity index 100%
rename from keyboards/z34/info.json
rename to keyboards/zigotica/z34/info.json
diff --git a/keyboards/z34/keymaps/default/config.h b/keyboards/zigotica/z34/keymaps/default/config.h
similarity index 100%
rename from keyboards/z34/keymaps/default/config.h
rename to keyboards/zigotica/z34/keymaps/default/config.h
diff --git a/keyboards/z34/keymaps/default/keymap.c b/keyboards/zigotica/z34/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/z34/keymaps/default/keymap.c
rename to keyboards/zigotica/z34/keymaps/default/keymap.c
diff --git a/keyboards/z34/keymaps/default/readme.md b/keyboards/zigotica/z34/keymaps/default/readme.md
similarity index 100%
rename from keyboards/z34/keymaps/default/readme.md
rename to keyboards/zigotica/z34/keymaps/default/readme.md
diff --git a/keyboards/z34/keymaps/default/rules.mk b/keyboards/zigotica/z34/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/z34/keymaps/default/rules.mk
rename to keyboards/zigotica/z34/keymaps/default/rules.mk
diff --git a/keyboards/z34/readme.md b/keyboards/zigotica/z34/readme.md
similarity index 100%
rename from keyboards/z34/readme.md
rename to keyboards/zigotica/z34/readme.md
diff --git a/keyboards/z34/rules.mk b/keyboards/zigotica/z34/rules.mk
similarity index 100%
rename from keyboards/z34/rules.mk
rename to keyboards/zigotica/z34/rules.mk
diff --git a/keyboards/ziptyze/lets_split_v3/config.h b/keyboards/ziptyze/lets_split_v3/config.h
new file mode 100644
index 00000000000..a4b5e40dcba
--- /dev/null
+++ b/keyboards/ziptyze/lets_split_v3/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2023 ziptyze
+
+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 SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP16
+#define SERIAL_USART_RX_PIN GP17
+#define SERIAL_USART_PIN_SWAP
+
diff --git a/keyboards/ziptyze/lets_split_v3/info.json b/keyboards/ziptyze/lets_split_v3/info.json
new file mode 100644
index 00000000000..3db80047568
--- /dev/null
+++ b/keyboards/ziptyze/lets_split_v3/info.json
@@ -0,0 +1,305 @@
+{
+    "manufacturer": "ziptyze",
+    "keyboard_name": "Let's Split v3",
+    "maintainer": "ziptyze",
+    "board": "GENERIC_RP_RP2040",
+    "bootloader": "rp2040",
+    "processor": "RP2040",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x6900",
+        "vid": "0x6F75"
+    },
+    "split": {
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        },
+        "enabled": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP25", "GP27", "GP28", "GP4", "GP5", "GP8"],
+            ["GP24", "GP26", "GP29", "GP3", "GP6", "GP9"],
+            ["GP23", "GP21", "GP18", "GP15", "GP12", "GP10"],
+            ["GP22", "GP20", "GP19", "GP14", "GP13", "GP11"]
+        ]
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP1"
+    },
+    "community_layouts": ["ortho_4x12"],
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [4, 0], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 5], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 0], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 4], "x": 11, "y": 1},
+                {"matrix": [5, 5], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 0], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 5], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 0], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 3], "x": 10, "y": 3},
+                {"matrix": [7, 4], "x": 11, "y": 3},
+                {"matrix": [7, 5], "x": 12, "y": 3}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [63, 63],
+        "max_brightness": 200,
+        "sleep": true,
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "layout": [
+            { "flags": 2, "x": 62, "y": 1 },
+            { "flags": 2, "x": 70, "y": 1 },
+            { "flags": 2, "x": 79, "y": 1 },
+            { "flags": 2, "x": 88, "y": 1 },
+            { "flags": 2, "x": 98, "y": 1 },
+            { "flags": 2, "x": 107, "y": 1 },
+            { "flags": 2, "x": 111, "y": 4 },
+            { "flags": 2, "x": 111, "y": 12 },
+
+            { "flags": 4, "matrix": [0, 5], "x": 103, "y": 8 },
+            { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
+            { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
+            { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
+            { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
+            { "flags": 4, "matrix": [1, 5], "x": 103, "y": 24 },
+
+            { "flags": 2, "x": 111, "y": 20 },
+            { "flags": 2, "x": 111, "y": 28 },
+            { "flags": 2, "x": 111, "y": 36 },
+            { "flags": 2, "x": 111, "y": 44 },
+
+            { "flags": 4, "matrix": [2, 5], "x": 103, "y": 40 },
+            { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
+            { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
+            { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
+            { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
+            { "flags": 1, "matrix": [3, 5], "x": 103, "y": 56 },
+
+            { "flags": 2, "x": 111, "y": 52 },
+            { "flags": 2, "x": 111, "y": 60 },
+            { "flags": 2, "x": 107, "y": 63 },
+            { "flags": 2, "x": 98, "y": 63 },
+            { "flags": 2, "x": 88, "y": 63 },
+            { "flags": 2, "x": 79, "y": 63 },
+            { "flags": 2, "x": 70, "y": 63 },
+            { "flags": 2, "x": 61, "y": 63 },
+            { "flags": 2, "x": 51, "y": 63 },
+            { "flags": 2, "x": 42, "y": 63 },
+            { "flags": 2, "x": 33, "y": 63 },
+            { "flags": 2, "x": 23, "y": 63 },
+            { "flags": 2, "x": 14, "y": 63 },
+            { "flags": 2, "x": 5, "y": 63 },
+            { "flags": 2, "x": 1, "y": 60 },
+            { "flags": 2, "x": 1, "y": 52 },
+
+            { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 },
+            { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
+            { "flags": 1, "matrix": [3, 2], "x": 47, "y": 56 },
+            { "flags": 4, "matrix": [2, 2], "x": 47, "y": 40 },
+            { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
+            { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
+
+            { "flags": 2, "x": 1, "y": 44 },
+            { "flags": 2, "x": 1, "y": 36 },
+            { "flags": 2, "x": 1, "y": 28 },
+            { "flags": 2, "x": 1, "y": 20 },
+
+            { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
+            { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
+            { "flags": 4, "matrix": [1, 2], "x": 47, "y": 24 },
+            { "flags": 4, "matrix": [0, 2], "x": 47, "y": 8 },
+            { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
+            { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
+
+            { "flags": 2, "x": 1, "y": 12 },
+            { "flags": 2, "x": 1, "y": 4 },
+            { "flags": 2, "x": 5, "y": 1 },
+            { "flags": 2, "x": 13, "y": 1 },
+            { "flags": 2, "x": 28, "y": 1 },
+            { "flags": 2, "x": 37, "y": 1 },
+            { "flags": 2, "x": 47, "y": 1 },
+
+
+
+
+            { "flags": 2, "x": 174, "y": 1 },
+            { "flags": 2, "x": 182, "y": 1 },
+            { "flags": 2, "x": 191, "y": 1 },
+            { "flags": 2, "x": 200, "y": 1 },
+            { "flags": 2, "x": 210, "y": 1 },
+            { "flags": 2, "x": 219, "y": 1 },
+            { "flags": 2, "x": 223, "y": 4 },
+            { "flags": 2, "x": 223, "y": 12 },
+
+            { "flags": 1, "matrix": [4, 5], "x": 215, "y": 8 },
+            { "flags": 4, "matrix": [4, 4], "x": 196, "y": 8 },
+            { "flags": 4, "matrix": [4, 3], "x": 177, "y": 8 },
+            { "flags": 4, "matrix": [5, 3], "x": 177, "y": 24 },
+            { "flags": 4, "matrix": [5, 4], "x": 196, "y": 24 },
+            { "flags": 1, "matrix": [5, 5], "x": 215, "y": 24 },
+
+            { "flags": 2, "x": 223, "y": 20 },
+            { "flags": 2, "x": 223, "y": 28 },
+            { "flags": 2, "x": 223, "y": 36 },
+            { "flags": 2, "x": 223, "y": 44 },
+
+            { "flags": 1, "matrix": [6, 5], "x": 215, "y": 40 },
+            { "flags": 4, "matrix": [6, 4], "x": 196, "y": 40 },
+            { "flags": 4, "matrix": [6, 3], "x": 177, "y": 40 },
+            { "flags": 1, "matrix": [7, 3], "x": 177, "y": 56 },
+            { "flags": 1, "matrix": [7, 4], "x": 196, "y": 56 },
+            { "flags": 1, "matrix": [7, 5], "x": 215, "y": 56 },
+
+            { "flags": 2, "x": 223, "y": 52 },
+            { "flags": 2, "x": 223, "y": 60 },
+            { "flags": 2, "x": 219, "y": 63 },
+            { "flags": 2, "x": 210, "y": 63 },
+            { "flags": 2, "x": 200, "y": 63 },
+            { "flags": 2, "x": 191, "y": 63 },
+            { "flags": 2, "x": 182, "y": 63 },
+            { "flags": 2, "x": 173, "y": 63 },
+            { "flags": 2, "x": 163, "y": 63 },
+            { "flags": 2, "x": 154, "y": 63 },
+            { "flags": 2, "x": 145, "y": 63 },
+            { "flags": 2, "x": 135, "y": 63 },
+            { "flags": 2, "x": 126, "y": 63 },
+            { "flags": 2, "x": 117, "y": 63 },
+            { "flags": 2, "x": 113, "y": 60 },
+            { "flags": 2, "x": 113, "y": 52 },
+
+            { "flags": 1, "matrix": [7, 0], "x": 121, "y": 56 },
+            { "flags": 1, "matrix": [7, 1], "x": 140, "y": 56 },
+            { "flags": 1, "matrix": [7, 2], "x": 159, "y": 56 },
+            { "flags": 4, "matrix": [6, 2], "x": 159, "y": 40 },
+            { "flags": 4, "matrix": [6, 1], "x": 140, "y": 40 },
+            { "flags": 4, "matrix": [6, 0], "x": 121, "y": 40 },
+
+            { "flags": 2, "x": 113, "y": 44 },
+            { "flags": 2, "x": 113, "y": 36 },
+            { "flags": 2, "x": 113, "y": 28 },
+            { "flags": 2, "x": 113, "y": 20 },
+
+            { "flags": 4, "matrix": [5, 0], "x": 121, "y": 24 },
+            { "flags": 4, "matrix": [5, 1], "x": 148, "y": 24 },
+            { "flags": 4, "matrix": [5, 2], "x": 159, "y": 24 },
+            { "flags": 4, "matrix": [4, 2], "x": 159, "y": 8 },
+            { "flags": 4, "matrix": [4, 1], "x": 148, "y": 8 },
+            { "flags": 4, "matrix": [4, 0], "x": 121, "y": 8 },
+
+            { "flags": 2, "x": 113, "y": 12 },
+            { "flags": 2, "x": 113, "y": 4 },
+            { "flags": 2, "x": 117, "y": 1 },
+            { "flags": 2, "x": 140, "y": 1 },
+            { "flags": 2, "x": 149, "y": 1 },
+            { "flags": 2, "x": 159, "y": 1 },
+            { "flags": 2, "x": 169, "y": 1 }
+        ]
+    }
+}
diff --git a/keyboards/ziptyze/lets_split_v3/keymaps/default/keymap.c b/keyboards/ziptyze/lets_split_v3/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d640e1bf234
--- /dev/null
+++ b/keyboards/ziptyze/lets_split_v3/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2020 Danny Nguyen <danny@keeb.io>
+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_4x12(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  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_GRV,  KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC,  KC_SPC,  TL_UPPR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  ),
+
+  [1] = LAYOUT_ortho_4x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    BL_STEP, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  ),
+
+  [2] = LAYOUT_ortho_4x12(
+    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_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_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  ),
+
+  [3] = LAYOUT_ortho_4x12(
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/ziptyze/lets_split_v3/keymaps/via/keymap.c b/keyboards/ziptyze/lets_split_v3/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d640e1bf234
--- /dev/null
+++ b/keyboards/ziptyze/lets_split_v3/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2020 Danny Nguyen <danny@keeb.io>
+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_4x12(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  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_GRV,  KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC,  KC_SPC,  TL_UPPR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  ),
+
+  [1] = LAYOUT_ortho_4x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    BL_STEP, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  ),
+
+  [2] = LAYOUT_ortho_4x12(
+    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_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_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  ),
+
+  [3] = LAYOUT_ortho_4x12(
+    _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/ziptyze/lets_split_v3/keymaps/via/rules.mk b/keyboards/ziptyze/lets_split_v3/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/ziptyze/lets_split_v3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ziptyze/lets_split_v3/readme.md b/keyboards/ziptyze/lets_split_v3/readme.md
new file mode 100644
index 00000000000..18b967d9057
--- /dev/null
+++ b/keyboards/ziptyze/lets_split_v3/readme.md
@@ -0,0 +1,26 @@
+# Let's Split v3
+
+![Let's Split v3](https://i.imgur.com/ksZ64dKh.jpg)
+
+Version 3 of the Let's Split keyboard, originally designed by Wootapatoot. This version features identical PCBs for both halves powered by an RP2040 controller. Each half features full hot swap capability as well as in-switch addressable LEDs and 39 1mm underglow LEDs.
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+* Hardware Supported: Let's Split v3 PCB
+* Hardware Availability: [1upkeyboards](https://1upkeyboards.com/shop/keyboard-kits/diy-40-kits/lets-split-v3/#choose-your-kit)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ziptyze/lets_split_v3:default
+
+Flashing example for this keyboard:
+
+    make ziptyze/lets_split_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 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix, the top left key, and plug in the keyboard
+* **BOOTSEL button**: Hold down the reset button on the PCB, and plug in the keyboard
diff --git a/keyboards/ziptyze/lets_split_v3/rules.mk b/keyboards/ziptyze/lets_split_v3/rules.mk
new file mode 100644
index 00000000000..161ec22b16e
--- /dev/null
+++ b/keyboards/ziptyze/lets_split_v3/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/zj68/keymaps/splitbs/keymap.c b/keyboards/zj68/keymaps/splitbs/keymap.c
deleted file mode 100644
index 24c8b35dcbb..00000000000
--- a/keyboards/zj68/keymaps/splitbs/keymap.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Collin Diekvoss <cdiekvoss@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] = {
-
-    LAYOUT_65_ansi_split_bs(
-        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_BSLS, KC_GRV, KC_INS,
-        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_BSPC, KC_DEL,
-        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_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,
-        MO(1),   KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    LAYOUT_65_ansi_split_bs(
-        QK_BOOT, 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_SCRL, KC_PAUS,
-        KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-};
diff --git a/keyboards/zj68/keymaps/splitbs/readme.md b/keyboards/zj68/keymaps/splitbs/readme.md
deleted file mode 100644
index 9047475eebd..00000000000
--- a/keyboards/zj68/keymaps/splitbs/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ZJ68 W/ Split Backspace
-
-The plate that comes with the kit from Drop only allows one layout, but the pcb supports having a split backspace, so by widening the plate where the stabilizers are meant to go, you can fit the two switches in, if you want to go back to a single backspace later, you can still use pcb mount stabilizers.
\ No newline at end of file
diff --git a/keyboards/zlabkeeb/15pad/info.json b/keyboards/zlabkeeb/15pad/info.json
new file mode 100644
index 00000000000..9733d0169a8
--- /dev/null
+++ b/keyboards/zlabkeeb/15pad/info.json
@@ -0,0 +1,77 @@
+{
+    "keyboard_name": "ZLABKEEB 15PAD",
+    "manufacturer": "zlabkeeb",
+    "maintainer": "zlabkeeb",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "encoder": true,
+        "mousekey": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "url": "https://github.com/zlabkeeb",
+    "usb": {
+        "vid": "0x4154",
+        "pid": "0x4454",
+        "device_version": "1.0.0"
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 13,
+        "max_brightness": 180,
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "GP15",
+        "driver": "vendor"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP1", "pin_b": "GP2"},
+            {"pin_a": "GP3", "pin_b": "GP4"},
+            {"pin_a": "GP5", "pin_b": "GP6"}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["GP11", "GP12", "GP13", "GP14"],
+        "rows": ["GP7", "GP8", "GP9", "GP10"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0], "encoder": 0},
+                {"x": 1, "y": 0, "matrix": [0, 1], "encoder": 1},
+                {"x": 3, "y": 0, "matrix": [0, 3], "encoder": 2},
+                {"x": 0, "y": 0, "matrix": [1, 0]},
+                {"x": 1, "y": 0, "matrix": [1, 1]},
+                {"x": 2, "y": 0, "matrix": [1, 2]},
+                {"x": 3, "y": 0, "matrix": [1, 3]},
+                {"x": 0, "y": 0, "matrix": [2, 0]},
+                {"x": 1, "y": 0, "matrix": [2, 1]},
+                {"x": 2, "y": 0, "matrix": [2, 2]},
+                {"x": 3, "y": 0, "matrix": [2, 3]},
+                {"x": 0, "y": 0, "matrix": [3, 0]},
+                {"x": 1, "y": 0, "matrix": [3, 1]},
+                {"x": 2, "y": 0, "matrix": [3, 2]},
+                {"x": 3, "y": 0, "matrix": [3, 3]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/zlabkeeb/15pad/keymaps/default/keymap.c b/keyboards/zlabkeeb/15pad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..fb19b67b4dc
--- /dev/null
+++ b/keyboards/zlabkeeb/15pad/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/*
+Copyright 2024 zlabkeeb (zlabkeeb@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] = {
+	/*
+	 * ┌─────────┬─────────┐         ┌─────────┐
+	 * │   MUTE  │   MPLY  │         │   TRNS  │
+	 * ├─────────┼─────────┼─────────┼─────────┤
+	 * │    1    │    2    │    3    │    4    │
+	 * ├─────────┼─────────┼─────────┼─────────┤
+	 * │    5    │    6    │    7    │    8    │
+	 * ├─────────┼─────────┼─────────┼─────────┤
+	 * │    9    │    0    │ ENTER   │  DELL   │
+	 * └─────────┴─────────┴─────────┴─────────┘
+	 */
+    [0] = LAYOUT(
+        KC_MUTE, KC_MPLY, KC_TRNS,
+        KC_1, KC_2, KC_3, KC_4,
+        KC_5, KC_6, KC_7, KC_8,
+        KC_9, KC_0, KC_ENT, KC_DEL
+        )
+};
+#if defined (ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_DOWN, KC_UP)}
+};
+#endif
diff --git a/keyboards/zlabkeeb/15pad/keymaps/default/rules.mk b/keyboards/zlabkeeb/15pad/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/zlabkeeb/15pad/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/zlabkeeb/15pad/keymaps/via/keymap.c b/keyboards/zlabkeeb/15pad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..9ffc6db3c02
--- /dev/null
+++ b/keyboards/zlabkeeb/15pad/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/*
+Copyright 2024 zlabkeeb (zlabkeeb@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] = {
+	/*
+	 * ┌─────────┬─────────┐         ┌─────────┐
+	 * │  TO(0)  │  TO(1)  │         │   TO(2) │
+	 * ├─────────┼─────────┼─────────┼─────────┤
+	 * │    1    │    2    │    3    │    4    │
+	 * ├─────────┼─────────┼─────────┼─────────┤
+	 * │    5    │    6    │    7    │    8    │
+	 * ├─────────┼─────────┼─────────┼─────────┤
+	 * │    9    │    0    │ ENTER   │  DELL   │
+	 * └─────────┴─────────┴─────────┴─────────┘
+	 */
+    [0] = LAYOUT(
+        TO(0), TO(1),    TO(2),
+        KC_1, KC_2, KC_3, KC_4,
+        KC_5, KC_6, KC_7, KC_8,
+        KC_9, KC_0, KC_ENT, KC_DEL
+        ),
+    [1] = LAYOUT(
+        TO(0), TO(1),    TO(2),
+        KC_1, KC_2, KC_3, KC_4,
+        KC_5, KC_6, KC_7, KC_8,
+        KC_LEFT, KC_RIGHT, KC_DOWN, KC_UP
+        )
+};
+#if defined (ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_DOWN, KC_UP)},
+    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_DOWN, KC_UP)}
+};
+#endif
diff --git a/keyboards/zlabkeeb/15pad/keymaps/via/rules.mk b/keyboards/zlabkeeb/15pad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/zlabkeeb/15pad/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/zlabkeeb/15pad/readme.md b/keyboards/zlabkeeb/15pad/readme.md
new file mode 100644
index 00000000000..2587b4ab9b7
--- /dev/null
+++ b/keyboards/zlabkeeb/15pad/readme.md
@@ -0,0 +1,28 @@
+# 15PAD
+
+![15PAD](https://i.imgur.com/J7sZSnx.jpeg)
+
+15PAD is a Macropad With 12 Keys & 3 Rotary Encoder, Designed And Manufactured In INDONESIA.
+
+-   Keyboard Maintainer: [zlabkeeb](https://github.com/zlabkeeb)
+-   Hardware Supported: 15Pad PCB, RP2040 ZERO
+-   Hardware Availability: (INDONESIA ONLY) [Tokopedia](https://www.tokopedia.com/zahranetid/macropad-15pad-via-compatible)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zlabkeeb/15pad:default
+
+Flashing example for this keyboard:
+
+    make zlabkeeb/15pad: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 top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
diff --git a/keyboards/zlabkeeb/15pad/rules.mk b/keyboards/zlabkeeb/15pad/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/zlabkeeb/15pad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/zlabkeeb/6pad/info.json b/keyboards/zlabkeeb/6pad/info.json
new file mode 100644
index 00000000000..cd37d4ca023
--- /dev/null
+++ b/keyboards/zlabkeeb/6pad/info.json
@@ -0,0 +1,65 @@
+{
+    "keyboard_name": "ZLABKEEB 6PAD",
+    "manufacturer": "zlabkeeb",
+    "maintainer": "zlabkeeb",
+    "development_board": "promicro",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "encoder": true,
+        "mousekey": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "url": "https://github.com/zlabkeeb",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0x4154",
+        "pid": "0x7A77"
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 4,
+        "max_brightness": 180,
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
+    "matrix_pins": {
+        "direct": [
+            ["D1", "D0", "D4"],
+            ["C6", "D7", "E6"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/zlabkeeb/6pad/keymaps/default/keymap.c b/keyboards/zlabkeeb/6pad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d0048cd88df
--- /dev/null
+++ b/keyboards/zlabkeeb/6pad/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/*
+Copyright 2024 zlabkeeb (zlabkeeb@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] = {
+    /*
+     * ┌─────────┌─────────┌─────────┐
+     * │    1    │ layer 1 │    3    │
+     * ├─────────┼─────────┼─────────|
+     * │    4    │    5    │    6    |
+     * ├─────────┼─────────┼─────────┘
+     */
+    [0] = LAYOUT(
+        KC_1, TO(1), KC_2,
+        KC_3, KC_4, KC_5
+        ),
+    /*
+     * ┌─────────┌─────────┌─────────┐
+     * │    A    │ layer O │    B    │
+     * ├─────────┼─────────┼─────────|
+     * │    C    │    D    │    E    |
+     * ├─────────┼─────────┼─────────┘
+     */
+    [1] = LAYOUT(
+        KC_A, TO(0), KC_B,
+        KC_C, KC_D, KC_E
+        )
+};
+
+#if defined (ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [1] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP)}
+};
+#endif
diff --git a/keyboards/zlabkeeb/6pad/keymaps/default/rules.mk b/keyboards/zlabkeeb/6pad/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/zlabkeeb/6pad/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/zlabkeeb/6pad/keymaps/via/keymap.c b/keyboards/zlabkeeb/6pad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d958bfb5bdf
--- /dev/null
+++ b/keyboards/zlabkeeb/6pad/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2024 zlabkeeb (zlabkeeb@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] = {
+    /*
+     * ┌─────────┌─────────┌─────────┐
+     * │    1    │    2    │    3    │
+     * ├─────────┼─────────┼─────────|
+     * │    4    │    5    │    6    |
+     * ├─────────┼─────────┼─────────┘
+     */
+    [0] = LAYOUT(
+        KC_1, KC_2, KC_3,
+        KC_4, KC_5, KC_6
+        )
+};
+
+#if defined (ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}
+};
+#endif
diff --git a/keyboards/zlabkeeb/6pad/keymaps/via/rules.mk b/keyboards/zlabkeeb/6pad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/zlabkeeb/6pad/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/zlabkeeb/6pad/readme.md b/keyboards/zlabkeeb/6pad/readme.md
new file mode 100644
index 00000000000..9470ee1d6d9
--- /dev/null
+++ b/keyboards/zlabkeeb/6pad/readme.md
@@ -0,0 +1,26 @@
+# 6PAD
+
+![6PAD](https://i.imgur.com/yt3dKCBh.jpeg)
+
+6PAD is a Simple Yet Elegant Macropad, 5 Keys & Single Rotary Encoder, Designed And Manufactured In INDONESIA.
+
+-   Support RGB light UnderGlow
+-   Keyboard Maintainer: [zlabkeeb](https://github.com/zlabkeeb)
+-   Hardware Supported: 6Pad PCB, Promicro
+-   Hardware Availability: (INDONESIA Only) Will be available at [Tokopedia](https://www.tokopedia.com/zahranetid)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zlabkeeb/6pad:default
+
+Flashing example for this keyboard:
+
+    make zlabkeeb/6pad: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 1 way:
+
+-   **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
diff --git a/keyboards/zlabkeeb/6pad/rules.mk b/keyboards/zlabkeeb/6pad/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/zlabkeeb/6pad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/zsa/moonlander/config.h b/keyboards/zsa/moonlander/config.h
new file mode 100644
index 00000000000..9fbb7a64b5f
--- /dev/null
+++ b/keyboards/zsa/moonlander/config.h
@@ -0,0 +1,87 @@
+/* Copyright 2020 ZSA Technology Labs, Inc <@zsa>
+ * Copyright 2020 Jack Humbert <jack.humb@gmail.com>
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.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 WEBUSB_LANDING_PAGE_URL u8"configure.ergodox-ez.com"
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 7
+
+/*  PCB default pin-out */
+// #define MATRIX_ROW_PINS { B10, B11, B12, B13, B14, B15 }
+// #define MATRIX_COL_PINS { A0, A1, A2, A3, A6, A7, B0 }
+
+// #define MCP23_ROW_PINS { GPB5, GBP4, GBP3, GBP2, GBP1, GBP0 }
+// #define MCP23_COL_PINS { GPA0, GBA1, GBA2, GBA3, GBA4, GBA5, GBA6 }
+
+// #define MCP23_LED_R GPB7
+// #define MCP23_LED_G GPB6
+// #define MCP23_LED_B GPA7
+
+#define EEPROM_I2C_24LC128
+
+// Not needed, is default address:
+// #define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10100000
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* 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
+
+/*
+ * 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 IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
+
+#define MOUSEKEY_INTERVAL           20
+#define MOUSEKEY_DELAY              0
+#define MOUSEKEY_TIME_TO_MAX        60
+#define MOUSEKEY_MAX_SPEED          7
+#define MOUSEKEY_WHEEL_DELAY        400
+#define MOUSEKEY_WHEEL_INTERVAL     MOUSEKEY_INTERVAL
+#define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
+
+#define MUSIC_MAP
+
+#define FIRMWARE_VERSION_SIZE 17
+#define DYNAMIC_KEYMAP_EEPROM_ADDR (EECONFIG_SIZE + FIRMWARE_VERSION_SIZE)
+
+#define AUDIO_PIN A5
+#define AUDIO_PIN_ALT A4
+#define AUDIO_PIN_ALT_AS_NEGATIVE
diff --git a/keyboards/moonlander/halconf.h b/keyboards/zsa/moonlander/halconf.h
similarity index 100%
rename from keyboards/moonlander/halconf.h
rename to keyboards/zsa/moonlander/halconf.h
diff --git a/keyboards/zsa/moonlander/info.json b/keyboards/zsa/moonlander/info.json
new file mode 100644
index 00000000000..31d6693e398
--- /dev/null
+++ b/keyboards/zsa/moonlander/info.json
@@ -0,0 +1,162 @@
+{
+    "keyboard_name": "Moonlander Mark I",
+    "manufacturer": "ZSA Technology Labs",
+    "url": "zsa.io/moonlander",
+    "maintainer": "ZSA via Drashna",
+    "usb": {
+        "vid": "0x3297",
+        "pid": "0x1969",
+        "device_version": "0.0.1"
+    },
+    "dynamic_keymap": {
+        "layer_count": 8
+    },
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [120, 36],
+        "driver": "is31fl3731",
+        "max_brightness": 175,
+        "sleep": true
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_moonlander": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+
+                {"matrix": [6, 0], "x": 10, "y": 0.25},
+                {"matrix": [6, 1], "x": 11, "y": 0.25},
+                {"matrix": [6, 2], "x": 12, "y": 0.125},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0.125},
+                {"matrix": [6, 5], "x": 15, "y": 0.375},
+                {"matrix": [6, 6], "x": 16, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.125},
+                {"matrix": [7, 3], "x": 13, "y": 1},
+                {"matrix": [7, 4], "x": 14, "y": 1.125},
+                {"matrix": [7, 5], "x": 15, "y": 1.375},
+                {"matrix": [7, 6], "x": 16, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 2.25},
+                {"matrix": [8, 1], "x": 11, "y": 2.25},
+                {"matrix": [8, 2], "x": 12, "y": 2.125},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2.125},
+                {"matrix": [8, 5], "x": 15, "y": 2.375},
+                {"matrix": [8, 6], "x": 16, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+                {"matrix": [9, 1], "x": 11, "y": 3.25},
+                {"matrix": [9, 2], "x": 12, "y": 3.125},
+                {"matrix": [9, 3], "x": 13, "y": 3},
+                {"matrix": [9, 4], "x": 14, "y": 3.125},
+                {"matrix": [9, 5], "x": 15, "y": 3.375},
+                {"matrix": [9, 6], "x": 16, "y": 3.375},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.375},
+                {"matrix": [4, 1], "x": 1, "y": 4.375},
+                {"matrix": [4, 2], "x": 2, "y": 4.125},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.125},
+                {"matrix": [5, 3], "x": 5, "y": 4.5, "w": 2},
+
+                {"matrix": [11, 3], "x": 10, "y": 4.5, "w": 2},
+                {"matrix": [10, 2], "x": 12, "y": 4.125},
+                {"matrix": [10, 3], "x": 13, "y": 4},
+                {"matrix": [10, 4], "x": 14, "y": 4.125},
+                {"matrix": [10, 5], "x": 15, "y": 4.375},
+                {"matrix": [10, 6], "x": 16, "y": 4.375},
+
+                {"matrix": [5, 0], "x": 5, "y": 5.5, "h": 1.5},
+                {"matrix": [5, 1], "x": 6, "y": 5.5, "h": 1.5},
+                {"matrix": [5, 2], "x": 7, "y": 5.5, "h": 1.5},
+
+                {"matrix": [11, 4], "x": 9, "y": 5.5, "h": 1.5},
+                {"matrix": [11, 5], "x": 10, "y": 5.5, "h": 1.5},
+                {"matrix": [11, 6], "x": 11, "y": 5.5, "h": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/moonlander/keymaps/default/config.h b/keyboards/zsa/moonlander/keymaps/default/config.h
similarity index 100%
rename from keyboards/moonlander/keymaps/default/config.h
rename to keyboards/zsa/moonlander/keymaps/default/config.h
diff --git a/keyboards/moonlander/keymaps/default/keymap.c b/keyboards/zsa/moonlander/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/moonlander/keymaps/default/keymap.c
rename to keyboards/zsa/moonlander/keymaps/default/keymap.c
diff --git a/keyboards/moonlander/keymaps/via/keymap.c b/keyboards/zsa/moonlander/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/moonlander/keymaps/via/keymap.c
rename to keyboards/zsa/moonlander/keymaps/via/keymap.c
diff --git a/keyboards/moonlander/keymaps/via/readme.md b/keyboards/zsa/moonlander/keymaps/via/readme.md
similarity index 100%
rename from keyboards/moonlander/keymaps/via/readme.md
rename to keyboards/zsa/moonlander/keymaps/via/readme.md
diff --git a/keyboards/zsa/moonlander/keymaps/via/rules.mk b/keyboards/zsa/moonlander/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/zsa/moonlander/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/zsa/moonlander/matrix.c b/keyboards/zsa/moonlander/matrix.c
new file mode 100644
index 00000000000..aa97d0721ff
--- /dev/null
+++ b/keyboards/zsa/moonlander/matrix.c
@@ -0,0 +1,233 @@
+/* Copyright 2020 ZSA Technology Labs, Inc <@zsa>
+ * Copyright 2020 Jack Humbert <jack.humb@gmail.com>
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.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 "moonlander.h"
+#include "i2c_master.h"
+
+/*
+#define MATRIX_ROW_PINS { B10, B11, B12, B13, B14, B15 } outputs
+#define MATRIX_COL_PINS { A0, A1, A2, A3, A6, A7, B0 }   inputs
+ */
+/* matrix state(1:on, 0:off) */
+extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
+extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
+static matrix_row_t raw_matrix_right[MATRIX_COLS];
+
+#define ROWS_PER_HAND (MATRIX_ROWS / 2)
+#ifndef MOONLANDER_I2C_TIMEOUT
+#    define MOONLANDER_I2C_TIMEOUT 100
+#endif
+
+extern bool mcp23018_leds[3];
+extern bool is_launching;
+
+bool           mcp23018_initd = false;
+static uint8_t mcp23018_reset_loop;
+
+uint8_t mcp23018_tx[3];
+uint8_t mcp23018_rx[1];
+
+void mcp23018_init(void) {
+    i2c_init();
+
+    // #define MCP23_ROW_PINS { GPB5, GBP4, GBP3, GBP2, GBP1, GBP0 }       outputs
+    // #define MCP23_COL_PINS { GPA0, GBA1, GBA2, GBA3, GBA4, GBA5, GBA6 } inputs
+
+    mcp23018_tx[0] = 0x00;        // IODIRA
+    mcp23018_tx[1] = 0b00000000;  // A is output
+    mcp23018_tx[2] = 0b00111111;  // B is inputs
+
+    if (MSG_OK != i2c_transmit(MCP23018_DEFAULT_ADDRESS << 1, mcp23018_tx, 3, MOONLANDER_I2C_TIMEOUT)) {
+        dprintf("error hori\n");
+    } else {
+        mcp23018_tx[0] = 0x0C;        // GPPUA
+        mcp23018_tx[1] = 0b10000000;  // A is not pulled-up
+        mcp23018_tx[2] = 0b11111111;  // B is pulled-up
+
+        if (MSG_OK != i2c_transmit(MCP23018_DEFAULT_ADDRESS << 1, mcp23018_tx, 3, MOONLANDER_I2C_TIMEOUT)) {
+            dprintf("error hori\n");
+        } else {
+            mcp23018_initd = is_launching = true;
+        }
+    }
+}
+
+void matrix_init_custom(void) {
+    dprintf("matrix init\n");
+    // debug_matrix = true;
+    // outputs
+    setPinOutput(B10);
+    setPinOutput(B11);
+    setPinOutput(B12);
+    setPinOutput(B13);
+    setPinOutput(B14);
+    setPinOutput(B15);
+
+    // inputs
+    setPinInputLow(A0);
+    setPinInputLow(A1);
+    setPinInputLow(A2);
+    setPinInputLow(A3);
+    setPinInputLow(A6);
+    setPinInputLow(A7);
+    setPinInputLow(B0);
+
+    mcp23018_init();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+
+    // Try to re-init right side
+    if (!mcp23018_initd) {
+        if (++mcp23018_reset_loop == 0) {
+            // if (++mcp23018_reset_loop >= 1300) {
+            // since mcp23018_reset_loop is 8 bit - we'll try to reset once in 255 matrix scans
+            // this will be approx bit more frequent than once per second
+            print("trying to reset mcp23018\n");
+            mcp23018_init();
+            if (!mcp23018_initd) {
+                print("right side not responding\n");
+            } else {
+                print("right side attached\n");
+#ifdef RGB_MATRIX_ENABLE
+                rgb_matrix_init();
+#endif
+            }
+        }
+    }
+
+    matrix_row_t data = 0;
+    // actual matrix
+    for (uint8_t row = 0; row <= ROWS_PER_HAND; row++) {
+        // strobe row
+        switch (row) {
+            case 0: writePinHigh(B10); break;
+            case 1: writePinHigh(B11); break;
+            case 2: writePinHigh(B12); break;
+            case 3: writePinHigh(B13); break;
+            case 4: writePinHigh(B14); break;
+            case 5: writePinHigh(B15); break;
+            case 6: break; // Left hand has 6 rows
+        }
+
+        // right side
+        if (mcp23018_initd) {
+            // #define MCP23_ROW_PINS { GPB5, GBP4, GBP3, GBP2, GBP1, GBP0 }       outputs
+            // #define MCP23_COL_PINS { GPA0, GBA1, GBA2, GBA3, GBA4, GBA5, GBA6 } inputs
+
+            // select row
+            mcp23018_tx[0] = 0x12;                                                                   // GPIOA
+            mcp23018_tx[1] = (0b01111111 & ~(1 << (row))) | ((uint8_t)!mcp23018_leds[2] << 7);       // activate row
+            mcp23018_tx[2] = ((uint8_t)!mcp23018_leds[1] << 6) | ((uint8_t)!mcp23018_leds[0] << 7);  // activate row
+
+            if (MSG_OK != i2c_transmit(MCP23018_DEFAULT_ADDRESS << 1, mcp23018_tx, 3, MOONLANDER_I2C_TIMEOUT)) {
+                dprintf("error hori\n");
+                mcp23018_initd = false;
+            }
+
+            // read col
+
+            mcp23018_tx[0] = 0x13;  // GPIOB
+            if (MSG_OK != i2c_read_register(MCP23018_DEFAULT_ADDRESS << 1, mcp23018_tx[0], &mcp23018_rx[0], 1, MOONLANDER_I2C_TIMEOUT)) {
+                dprintf("error vert\n");
+                mcp23018_initd = false;
+            }
+
+            data = ~(mcp23018_rx[0] & 0b00111111);
+            // data = 0x01;
+        } else {
+            data = 0;
+        }
+
+        if (raw_matrix_right[row] != data) {
+            raw_matrix_right[row] = data;
+            changed         = true;
+        }
+
+
+        // left side
+        if (row < ROWS_PER_HAND) {
+            // i2c comm incur enough wait time
+            if (!mcp23018_initd) {
+                // need wait to settle pin state
+                matrix_io_delay();
+            }
+            // read col data
+            data = (
+                (readPin(A0) << 0 ) |
+                (readPin(A1) << 1 ) |
+                (readPin(A2) << 2 ) |
+                (readPin(A3) << 3 ) |
+                (readPin(A6) << 4 ) |
+                (readPin(A7) << 5 ) |
+                (readPin(B0) << 6 )
+            );
+            // unstrobe  row
+            switch (row) {
+                case 0: writePinLow(B10); break;
+                case 1: writePinLow(B11); break;
+                case 2: writePinLow(B12); break;
+                case 3: writePinLow(B13); break;
+                case 4: writePinLow(B14); break;
+                case 5: writePinLow(B15); break;
+                case 6: break;
+            }
+
+            if (current_matrix[row] != data) {
+                current_matrix[row]    = data;
+                changed                = true;
+            }
+        }
+    }
+    for (uint8_t row = 0; row < ROWS_PER_HAND; row++) {
+        current_matrix[11 - row] = 0;
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            current_matrix[11 - row] |= ((raw_matrix_right[6 - col] & (1 << row) ? 1 : 0) << col);
+        }
+    }
+    return changed;
+}
+
+// DO NOT REMOVE
+// Needed for proper wake/sleep
+void matrix_power_up(void) {
+    bool temp_launching = is_launching;
+
+    matrix_init_custom();
+
+    is_launching = temp_launching;
+    if (!is_launching) {
+        ML_LED_1(false);
+        ML_LED_2(false);
+        ML_LED_3(false);
+        ML_LED_4(false);
+        ML_LED_5(false);
+        ML_LED_6(false);
+    }
+
+    // initialize matrix state: all keys off
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+    }
+
+}
+
+bool is_transport_connected(void) {
+    return mcp23018_initd;
+}
\ No newline at end of file
diff --git a/keyboards/moonlander/mcuconf.h b/keyboards/zsa/moonlander/mcuconf.h
similarity index 100%
rename from keyboards/moonlander/mcuconf.h
rename to keyboards/zsa/moonlander/mcuconf.h
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/zsa/moonlander/moonlander.c
similarity index 99%
rename from keyboards/moonlander/moonlander.c
rename to keyboards/zsa/moonlander/moonlander.c
index 5b52ba70314..dad795d3150 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/zsa/moonlander/moonlander.c
@@ -172,7 +172,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
 
 #ifdef RGB_MATRIX_ENABLE
 // clang-format off
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
diff --git a/keyboards/moonlander/moonlander.h b/keyboards/zsa/moonlander/moonlander.h
similarity index 100%
rename from keyboards/moonlander/moonlander.h
rename to keyboards/zsa/moonlander/moonlander.h
diff --git a/keyboards/zsa/moonlander/readme.md b/keyboards/zsa/moonlander/readme.md
new file mode 100644
index 00000000000..546681e6306
--- /dev/null
+++ b/keyboards/zsa/moonlander/readme.md
@@ -0,0 +1,58 @@
+# Moonlander
+
+![Moonlander](https://i.imgur.com/st2PCgph.png)
+
+A next-gen split, ergonomic keyboard with an active left side, USB type C, integrated wrist rest, and a thumb cluster that can move.
+
+
+* Keyboard Maintainer: [drashna](https://github.com/drashna), [ZSA](https://github.com/zsa/)
+* Hardware Supported: Moonlander MK 1 (STM32F303xC)
+* Hardware Availability: [ZSA Store](https://zsa.io/moonlander/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zsa/moonlander:default
+
+Flashing example for this keyboard:
+
+    make zsa/moonlander: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).
+
+
+## Moonlander Customization
+
+### Indicator LEDs
+
+There are 6 functions for enabling and disabling the LEDs on the top of the boards. The functions are `ML_LED_1(bool)` through `ML_LED_6(bool)`, with the first LED being the left most LED on the left hand, and the sixth LED being the right most LED on the right side. 
+
+By default, the Indicator LEDs are used to indicate the layer state for the keyboard.  If you wish to change this (and indicate caps/num/scroll lock status instead), then define `MOONLANDER_USER_LEDS` in your `config.h` file. 
+
+
+### Oryx Configuration
+
+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. 
+
+### RGB Matrix Features
+
+If you're using the Smart LED (layer indication) feature from the Oryx Configurator, you want to make sure that you enable these options by adding `#define ORYX_CONFIGURATOR` to your keymap's `config.h`. 
+
+This changes the `RGB_TOG` keycode so that it will toggle the lights on and off, in a way that will allow the Smart LEDs to continue to work, even with the rest of the LEDs turned off. 
+
+Additionally, a new keycode has been added to toggle the Smart LEDs.  Use `TOGGLE_LAYER_COLOR`, if you aren't already.
+
+### Detecting split / Gaming mode
+
+To make it extra gaming friendly, you can configure what happens when you disconnect the right half. This is especially useful when using gaming unfriendly layers or layouts (e.g. home row mods, dvorak, colemak).
+
+Example for enabling a specific layer while right side is disconnected:
+
+```
+void housekeeping_task_user(void) {
+    if (!is_transport_connected()) {
+        // set layer
+    }
+}
+```
diff --git a/keyboards/moonlander/rules.mk b/keyboards/zsa/moonlander/rules.mk
similarity index 100%
rename from keyboards/moonlander/rules.mk
rename to keyboards/zsa/moonlander/rules.mk
diff --git a/keyboards/ztboards/after/keymaps/ellicose/keymap.c b/keyboards/ztboards/after/keymaps/ellicose/keymap.c
deleted file mode 100644
index 59b768ccc6b..00000000000
--- a/keyboards/ztboards/after/keymaps/ellicose/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_65_ansi_wkl_split_bs(
-        QK_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_BSLS, KC_GRV,  KC_AUDIO_MUTE   ,
-        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_BSPC,          KC_PGUP  ,
-        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_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  ,          MO(1)    ,
-        KC_CAPS,          KC_LALT,                   KC_SPC,                              KC_RGUI, MO(1),            KC_LEFT, KC_DOWN,          KC_RGHT
-		),
-
-    [1] = LAYOUT_65_ansi_wkl_split_bs(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS
-		)
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  /*  Custom encoder control - handles CW/CCW turning of encoder
-   *  Default behavior:
-   *    main layer:
-   *       CW: move mouse right
-   *      CCW: move mouse left
-   *    other layers:
-   *       CW: = (equals/plus - increase slider in Adobe products)
-   *      CCW: - (minus/underscore - decrease slider in adobe products)
-   * Thank you to imchipwood/dumbpad for defining this.
-   */
-  if (index == 0) {
-    switch(get_highest_layer(layer_state)) {
-      case 1:
-        // main layer - move mouse right (CW) and left (CCW)
-        if (clockwise) {
-          tap_code(KC_BRIGHTNESS_UP);
-        } else {
-          tap_code(KC_BRIGHTNESS_DOWN);
-        }
-        break;
-
-      default:
-        // other layers - =/+ (quals/plus) (CW) and -/_ (minus/underscore) (CCW)
-        if (clockwise) {
-          tap_code(KC_AUDIO_VOL_UP);
-        } else {
-          tap_code(KC_AUDIO_VOL_DOWN);
-        }
-        break;
-    }
-  }
-    return true;
-}
diff --git a/keyboards/ztboards/after/keymaps/phlop/keymap.c b/keyboards/ztboards/after/keymaps/phlop/keymap.c
deleted file mode 100644
index 9f14bc14fbd..00000000000
--- a/keyboards/ztboards/after/keymaps/phlop/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_65_ansi_wkl_split_bs(
-        QK_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_BSLS, KC_GRV,  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_BSPC,          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  ,          MO(1)    ,
-        KC_LCTL,          KC_LALT,                   KC_SPC,                              KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN,          KC_RGHT
-		),
-
-    [1] = LAYOUT_65_ansi_wkl_split_bs(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS
-		)
-};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    switch(get_highest_layer(layer_state)) {
-    case 1: //EDIT THESE FOR THE ENCODER'S FUNCTION WHEN PRESSING MO(1)
-	  if (clockwise) {
-        tap_code16 (KC_VOLU);
-      } else {
-        tap_code16(KC_VOLD);
-      }
-      break;
-    // default: //EDIT THESE FOR THE ENCODER'S FUNCTIONS ON DEFAULT LAYER
-      if (clockwise) {
-        tap_code16(KC_VOLU);
-      } else {
-        tap_code16(KC_VOLD);
-      }
-      break;
-    }
-  }
-    return true;
-};
diff --git a/keyboards/zykrah/fuyu/config.h b/keyboards/zykrah/fuyu/config.h
index 20b0feb5230..45615228689 100644
--- a/keyboards/zykrah/fuyu/config.h
+++ b/keyboards/zykrah/fuyu/config.h
@@ -17,46 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
-#ifdef RGB_MATRIX_ENABLE
-/* The pin connected to the data pin of the LEDs */
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS * 3/4
-
-/* The number of LEDs connected (7 Snowflake, 34 Underglow) */
-#define DRIVER_LED_TOTAL 41
-#define RGB_MATRIX_LED_COUNT 41
-
 /* Caps locks LED index default is 0 (LED1 on PCB) */
 #define CAPS_LOCK_LED_INDEX 0
-
-/* Enable 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
-#endif
diff --git a/keyboards/zykrah/fuyu/info.json b/keyboards/zykrah/fuyu/info.json
index 5431d14329e..01053d48212 100644
--- a/keyboards/zykrah/fuyu/info.json
+++ b/keyboards/zykrah/fuyu/info.json
@@ -27,7 +27,42 @@
         "cols": ["GP29", "GP28", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP27", "GP9", "GP1", "GP0"]
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "default": {
+            "val": 150
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
     },
     "ws2812": {
         "pin": "GP2",
diff --git a/keyboards/zykrah/fuyu/keymaps/via/keymap.c b/keyboards/zykrah/fuyu/keymaps/via/keymap.c
index 95eb2692cb5..d502e9c50fb 100644
--- a/keyboards/zykrah/fuyu/keymaps/via/keymap.c
+++ b/keyboards/zykrah/fuyu/keymaps/via/keymap.c
@@ -102,7 +102,7 @@ bool rgb_matrix_indicators_user(void) {
 #if defined(RGB_MATRIX_ENABLE)
 
 #define INDICATOR_RGB_DIVISOR 4
-extern rgb_led_t rgb_matrix_ws2812_array[DRIVER_LED_TOTAL];
+extern rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_COUNT];
 bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     for (uint8_t i = led_min; i < led_max; i++) {
         if (g_led_config.flags[i] & LED_FLAG_INDICATOR) {
diff --git a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c
index 9540ce43f89..c0baf9f47a7 100644
--- a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c
+++ b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c
@@ -18,10 +18,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
      */
     [0] = LAYOUT_60_ansi_arrow(
-        QK_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_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_RSFT, KC_UP,   KC_SLSH,
-        KC_LCTL, KC_LGUI,       KC_LALT,             KC_SPC,                      KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
+        QK_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_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_RSFT, KC_UP,   KC_SLSH,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c
index b07d56ea206..228522f1b67 100644
--- a/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c
@@ -11,9 +11,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │
      * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│
      * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
-     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│
-     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
      * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
      * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
      */
diff --git a/layouts/default/ortho_5x10/info.json b/layouts/default/ortho_5x10/info.json
index 0c4cb9bb498..cf02fd618ae 100644
--- a/layouts/default/ortho_5x10/info.json
+++ b/layouts/default/ortho_5x10/info.json
@@ -58,7 +58,7 @@
                 {"x":6, "y":4},
                 {"x":7, "y":4},
                 {"x":8, "y":4},
-                {"x":9, "y":4},
+                {"x":9, "y":4}
             ]
         }
     }
diff --git a/layouts/default/ortho_5x13/default_ortho_5x13/keymap.c b/layouts/default/ortho_5x13/default_ortho_5x13/keymap.c
new file mode 100644
index 00000000000..11958f37007
--- /dev/null
+++ b/layouts/default/ortho_5x13/default_ortho_5x13/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │Bsp│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Tab│Q  │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │#  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │Ent│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Sft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ ↑ │ / │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Ctl│GUI│LWR│Alt│RSE│   │   │   │Alt│Sft│←  │ ↓ │ → │
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_5x13(
+        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_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_NUHS, 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_NUBS,  KC_Z,  KC_X,    KC_C,  KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_SLSH,
+        KC_LCTL, KC_LGUI,  TT(1), KC_LALT, TT(2), KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ortho_5x13(
+       KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , KC_EQL  ,
+       KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       _______, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______ ,
+       _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+    ),
+    [2] = LAYOUT_ortho_5x13(
+      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  ,
+      _______, _______, _______, _______,  QK_RBT, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_WH_U, _______ ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R
+    ),
+};
diff --git a/layouts/default/ortho_5x13/info.json b/layouts/default/ortho_5x13/info.json
new file mode 100644
index 00000000000..1bfa00d7703
--- /dev/null
+++ b/layouts/default/ortho_5x13/info.json
@@ -0,0 +1,80 @@
+{
+    "keyboard_name": "5x13 ortholinear layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_ortho_5x13": {
+            "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":0 , "y":1},
+                {"x":1 , "y":1},
+                {"x":2 , "y":1},
+                {"x":3 , "y":1},
+                {"x":4 , "y":1},
+                {"x":5 , "y":1},
+                {"x":6 , "y":1},
+                {"x":7 , "y":1},
+                {"x":8 , "y":1},
+                {"x":9 , "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+
+                {"x":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":12, "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":12, "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},
+                {"x":12, "y":4}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/ortho_5x13/layout.json b/layouts/default/ortho_5x13/layout.json
new file mode 100644
index 00000000000..017a9d0fcd2
--- /dev/null
+++ b/layouts/default/ortho_5x13/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","",""],
+["","","","","","","","","","","","",""],
+["","","","","","","","","","","","",""],
+["","","","","","","","","","","","",""],
+["","","","","","","","","","","","",""]
diff --git a/layouts/default/ortho_5x13/readme.md b/layouts/default/ortho_5x13/readme.md
new file mode 100644
index 00000000000..4ec2f9297af
--- /dev/null
+++ b/layouts/default/ortho_5x13/readme.md
@@ -0,0 +1,3 @@
+# ortho_5x13
+
+    LAYOUT_ortho_5x13
diff --git a/layouts/default/ortho_5x14/default_ortho_5x14/keymap.c b/layouts/default/ortho_5x14/default_ortho_5x14/keymap.c
index 5816e968d13..38270746123 100644
--- a/layouts/default/ortho_5x14/default_ortho_5x14/keymap.c
+++ b/layouts/default/ortho_5x14/default_ortho_5x14/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
      * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│
      * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
-     * │Esc│Tab│ Q │ W │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
+     * │Esc│Tab│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │
      * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
      * │Del│Cap│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │
      * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [0] = LAYOUT_ortho_5x14(
         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_ESC,  KC_TAB,  KC_Q,    KC_W,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        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_RBRC,
         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_NUHS,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
         KC_LEFT, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_ENT,  KC_ENT,  KC_SPC,  KC_SPC,  KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, KC_DOWN
diff --git a/layouts/default/ortho_6x13/default_ortho_6x13/keymap.c b/layouts/default/ortho_6x13/default_ortho_6x13/keymap.c
new file mode 100644
index 00000000000..527f87f84bc
--- /dev/null
+++ b/layouts/default/ortho_6x13/default_ortho_6x13/keymap.c
@@ -0,0 +1,46 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│Del│Bsp│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Tab│Q  │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │#  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │Ent│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Sft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ ↑ │ / │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Ctl│GUI│Lwr│Alt│Rse│   │   │   │Alt│Sft│←  │ ↓ │ → │
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_6x13(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,  KC_BSPC,
+        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_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_NUHS, 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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_SLSH,
+        KC_LCTL, KC_LGUI, TT(0),   KC_LALT, TT(2),   KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT
+    )
+    [1] = LAYOUT_ortho_6x13(
+       KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, _______, _______ ,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       _______, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______ ,
+       _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+    ),
+    [2] = LAYOUT_ortho_6x13(
+      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  ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______, _______,  QK_RBT, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_WH_U, _______ ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R
+    ),
+};
diff --git a/layouts/default/ortho_6x13/info.json b/layouts/default/ortho_6x13/info.json
new file mode 100644
index 00000000000..728bce3b2c1
--- /dev/null
+++ b/layouts/default/ortho_6x13/info.json
@@ -0,0 +1,94 @@
+{
+    "keyboard_name": "6x13 ortholinear layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_ortho_6x13": {
+            "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":0 , "y":1},
+                {"x":1 , "y":1},
+                {"x":2 , "y":1},
+                {"x":3 , "y":1},
+                {"x":4 , "y":1},
+                {"x":5 , "y":1},
+                {"x":6 , "y":1},
+                {"x":7 , "y":1},
+                {"x":8 , "y":1},
+                {"x":9 , "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+
+                {"x":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":12, "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":12, "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},
+                {"x":12, "y":4},
+               
+                {"x":0 , "y":5},
+                {"x":1 , "y":5},
+                {"x":2 , "y":5},
+                {"x":3 , "y":5},
+                {"x":4 , "y":5},
+                {"x":5 , "y":5},
+                {"x":6 , "y":5},
+                {"x":7 , "y":5},
+                {"x":8 , "y":5},
+                {"x":9 , "y":5},
+                {"x":10, "y":5},
+                {"x":11, "y":5},
+                {"x":12, "y":5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/ortho_6x13/layout.json b/layouts/default/ortho_6x13/layout.json
new file mode 100644
index 00000000000..1e5dab5b896
--- /dev/null
+++ b/layouts/default/ortho_6x13/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"","","","","","","","","","","","",""],
+["","","","","","","","","","","","",""],
+["","","","","","","","","","","","",""],
+["","","","","","","","","","","","",""],
+["","","","","","","","","","","","",""],
+["","","","","","","","","","","","",""]
diff --git a/layouts/default/ortho_6x13/readme.md b/layouts/default/ortho_6x13/readme.md
new file mode 100644
index 00000000000..d4ea33dda92
--- /dev/null
+++ b/layouts/default/ortho_6x13/readme.md
@@ -0,0 +1,3 @@
+# ortho_6x13
+
+    LAYOUT_ortho_6x13
diff --git a/layouts/default/readme.md b/layouts/default/readme.md
index d5d268ae8b6..892dbf1e034 100644
--- a/layouts/default/readme.md
+++ b/layouts/default/readme.md
@@ -1403,6 +1403,21 @@ LAYOUT_ortho_5x12
 └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
 ```
 
+```
+LAYOUT_ortho_5x13
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+```
+
 ```
 LAYOUT_ortho_5x14
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@@ -1465,6 +1480,23 @@ LAYOUT_ortho_6x4
 └───┴───┴───┴───┘
 ```
 
+```
+LAYOUT_ortho_6x13
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │
+└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+```
+
 ```
 LAYOUT_planck_mit
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
diff --git a/lib/python/qmk/build_targets.py b/lib/python/qmk/build_targets.py
index 1ab489cec3c..d974d04020c 100644
--- a/lib/python/qmk/build_targets.py
+++ b/lib/python/qmk/build_targets.py
@@ -6,7 +6,7 @@
 from pathlib import Path
 from dotty_dict import dotty, Dotty
 from milc import cli
-from qmk.constants import QMK_FIRMWARE, INTERMEDIATE_OUTPUT_PREFIX
+from qmk.constants import QMK_FIRMWARE, INTERMEDIATE_OUTPUT_PREFIX, HAS_QMK_USERSPACE, QMK_USERSPACE
 from qmk.commands import find_make, get_make_parallel_args, parse_configurator_json
 from qmk.keyboard import keyboard_folder
 from qmk.info import keymap_json
@@ -118,7 +118,11 @@ def generate_compilation_database(self, build_target: str = None, skip_clean: bo
         self.prepare_build(build_target=build_target, **env_vars)
         command = self.compile_command(build_target=build_target, dry_run=True, **env_vars)
         from qmk.cli.generate.compilation_database import write_compilation_database  # Lazy load due to circular references
-        write_compilation_database(command=command, output_path=QMK_FIRMWARE / 'compile_commands.json', skip_clean=skip_clean, **env_vars)
+        output_path = QMK_FIRMWARE / 'compile_commands.json'
+        ret = write_compilation_database(command=command, output_path=output_path, skip_clean=skip_clean, **env_vars)
+        if ret and output_path.exists() and HAS_QMK_USERSPACE:
+            shutil.copy(str(output_path), str(QMK_USERSPACE / 'compile_commands.json'))
+        return ret
 
     def compile(self, build_target: str = None, dry_run: bool = False, **env_vars) -> None:
         if self._clean or self._compiledb:
diff --git a/lib/python/qmk/cli/bux.py b/lib/python/qmk/cli/bux.py
index 8c7f1727796..669521d08ef 100755
--- a/lib/python/qmk/cli/bux.py
+++ b/lib/python/qmk/cli/bux.py
@@ -19,7 +19,7 @@ def bux(cli):
     config.set_config('user', 'bux', bux + 1)
     cli.save_config()
 
-    buck = """
+    buck = r"""
 @@BBBBBBBBBBBBBBBBBBBBK    `vP8#####BE2~   x###g_     `S###q  n##}  -j#Bl.   vBBBBBBBBBBBBBBBBBBBB@@
 @B   `:!:                 ^#@#]-   `!t@@&. 7@@B@#^   _Q@Q@@R  y@@l:P@#1'                   `!!_   B@
 @B  r@@@B                 g@@|      ` N@@u 7@@iv@@u *#@z"@@R  y@@&@@Q-                    l@@@D   B@
@@ -34,7 +34,7 @@ def bux(cli):
 @B        _y   ]#   ,c       vUWNWWPsfsssN9WyccnckAfUfWb0DR0&R5RRRddq2_  `@D`jr@2U@#c3@1@Qc-      B@
 @B         !7!    .r]`       }AE0RdRqNd9dNR9fUIzzosPqqAddNNdER9EE9dPy!    BQ!zy@iU@.Q@@y@8x-      B@
 @B           :****>.         '7adddDdR&gRNdRbd&dNNbbRdNdd5NdRRD0RSf}-     .k0&EW`xR .8Q=NRRx      B@
-@B        =**-rx*r}r~}"        ;n2jkzsf3N3zsKsP5dddRddddRddNNqPzy\\"            '~****"            B@
+@B        =**-rx*r}r~}"        ;n2jkzsf3N3zsKsP5dddRddddRddNNqPzy\"            '~****"            B@
 @B        :!!~!;=~r>:*_         `:^vxikylulKfHkyjzzozoIoklix|^!-`                                 B@
 @B                                    ```'-_""::::!:_-.``                                         B@
 @B   `-                                                                                       .`  B@
diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py
index 4c36dec3e79..8d1195bc8f0 100755
--- a/lib/python/qmk/cli/compile.py
+++ b/lib/python/qmk/cli/compile.py
@@ -41,17 +41,17 @@ def compile(cli):
         cli.args.filter = []
         cli.config.mass_compile.keymap = cli.config.compile.keymap
         cli.config.mass_compile.parallel = cli.config.compile.parallel
-        cli.config.mass_compile.no_temp = False
+        cli.args.no_temp = False
         return mass_compile(cli)
 
     # If we've received `-km all`, reroute it to mass-compile.
     if cli.args.keymap == 'all':
         from .mass_compile import mass_compile
-        cli.args.builds = [f'{cli.args.keyboard}:all']
+        cli.args.builds = [f'{cli.config.compile.keyboard}:all']
         cli.args.filter = []
         cli.config.mass_compile.keymap = None
         cli.config.mass_compile.parallel = cli.config.compile.parallel
-        cli.config.mass_compile.no_temp = False
+        cli.args.no_temp = False
         return mass_compile(cli)
 
     # Build the environment vars
diff --git a/lib/python/qmk/cli/find.py b/lib/python/qmk/cli/find.py
index 55a05300924..8f3a29c90ce 100644
--- a/lib/python/qmk/cli/find.py
+++ b/lib/python/qmk/cli/find.py
@@ -1,7 +1,7 @@
 """Command to search through all keyboards and keymaps for a given search criteria.
 """
 from milc import cli
-from qmk.search import search_keymap_targets
+from qmk.search import filter_help, search_keymap_targets
 
 
 @cli.argument(
@@ -11,7 +11,7 @@
     action='append',
     default=[],
     help=  # noqa: `format-python` and `pytest` don't agree here.
-    "Filter the list of keyboards based on their info.json data. Accepts the formats key=value, function(key), or function(key,value), eg. 'features.rgblight=true'. Valid functions are 'absent', 'contains', 'exists' and 'length'. May be passed multiple times; all filters need to match. Value may include wildcards such as '*' and '?'."  # noqa: `format-python` and `pytest` don't agree here.
+    f"Filter the list of keyboards based on their info.json data. Accepts the formats key=value, function(key), or function(key,value), eg. 'features.rgblight=true'. Valid functions are {filter_help()}. May be passed multiple times; all filters need to match. Value may include wildcards such as '*' and '?'."  # noqa: `format-python` and `pytest` don't agree here.
 )
 @cli.argument('-p', '--print', arg_only=True, action='append', default=[], help="For each matched target, print the value of the supplied info.json key. May be passed multiple times.")
 @cli.argument('-km', '--keymap', type=str, default='default', help="The keymap name to build. Default is 'default'.")
diff --git a/lib/python/qmk/cli/format/json.py b/lib/python/qmk/cli/format/json.py
index 283513254c5..87a3837d10e 100755
--- a/lib/python/qmk/cli/format/json.py
+++ b/lib/python/qmk/cli/format/json.py
@@ -92,8 +92,8 @@ def format_json(cli):
     output = json.dumps(json_data, cls=json_encoder, sort_keys=True)
 
     if cli.args.inplace:
-        with open(cli.args.json_file, 'w+', encoding='utf-8') as outfile:
-            outfile.write(output)
+        with open(cli.args.json_file, 'w+', encoding='utf-8', newline='\n') as outfile:
+            outfile.write(output + '\n')
 
     # Display the results if print was set
     # We don't operate in-place by default, so also display to stdout
diff --git a/lib/python/qmk/cli/generate/compilation_database.py b/lib/python/qmk/cli/generate/compilation_database.py
index 5100d2b6d25..a2190fee66c 100755
--- a/lib/python/qmk/cli/generate/compilation_database.py
+++ b/lib/python/qmk/cli/generate/compilation_database.py
@@ -17,6 +17,7 @@
 from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.keymap import keymap_completer
+from qmk.build_targets import KeyboardKeymapBuildTarget
 
 
 @lru_cache(maxsize=10)
@@ -138,4 +139,5 @@ def generate_compilation_database(cli: MILC) -> Union[bool, int]:
     elif not current_keymap:
         cli.log.error('Could not determine keymap!')
 
-    return write_compilation_database(current_keyboard, current_keymap, QMK_FIRMWARE / 'compile_commands.json')
+    target = KeyboardKeymapBuildTarget(current_keyboard, current_keymap)
+    return target.generate_compilation_database()
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 00fb1d9585f..fc681300a37 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -108,6 +108,8 @@ def generate_config_items(kb_info_json, config_h_lines):
         elif key_type.startswith('array'):
             config_h_lines.append(generate_define(config_key, f'{{ {", ".join(map(str, config_value))} }}'))
         elif key_type == 'bool':
+            config_h_lines.append(generate_define(config_key, 'true' if config_value else 'false'))
+        elif key_type == 'flag':
             if config_value:
                 config_h_lines.append(generate_define(config_key))
         elif key_type == 'mapping':
diff --git a/lib/python/qmk/cli/generate/keyboard_c.py b/lib/python/qmk/cli/generate/keyboard_c.py
index f0103416137..5a6c9674860 100755
--- a/lib/python/qmk/cli/generate/keyboard_c.py
+++ b/lib/python/qmk/cli/generate/keyboard_c.py
@@ -9,21 +9,25 @@
 from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 
 
-def _gen_led_config(info_data):
+def _gen_led_configs(info_data):
+    lines = []
+
+    if 'layout' in info_data.get('rgb_matrix', {}):
+        lines.extend(_gen_led_config(info_data, 'rgb_matrix'))
+
+    if 'layout' in info_data.get('led_matrix', {}):
+        lines.extend(_gen_led_config(info_data, 'led_matrix'))
+
+    return lines
+
+
+def _gen_led_config(info_data, config_type):
     """Convert info.json content to g_led_config
     """
     cols = info_data['matrix_size']['cols']
     rows = info_data['matrix_size']['rows']
 
-    config_type = None
-    if 'layout' in info_data.get('rgb_matrix', {}):
-        config_type = 'rgb_matrix'
-    elif 'layout' in info_data.get('led_matrix', {}):
-        config_type = 'led_matrix'
-
     lines = []
-    if not config_type:
-        return lines
 
     matrix = [['NO_LED'] * cols for _ in range(rows)]
     pos = []
@@ -53,6 +57,7 @@ def _gen_led_config(info_data):
     lines.append(f'  {{ {", ".join(flags)} }},')
     lines.append('};')
     lines.append('#endif')
+    lines.append('')
 
     return lines
 
@@ -98,7 +103,7 @@ def generate_keyboard_c(cli):
     # Build the layouts.h file.
     keyboard_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#include QMK_KEYBOARD_H', '']
 
-    keyboard_h_lines.extend(_gen_led_config(kb_info_json))
+    keyboard_h_lines.extend(_gen_led_configs(kb_info_json))
     keyboard_h_lines.extend(_gen_matrix_mask(kb_info_json))
 
     # Show the results
diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py
index b9e89032b9e..5863a0983ad 100755
--- a/lib/python/qmk/cli/generate/keyboard_h.py
+++ b/lib/python/qmk/cli/generate/keyboard_h.py
@@ -33,18 +33,11 @@ def _generate_layouts(keyboard, kb_info_json):
         layout_keys = []
         layout_matrix = [['KC_NO'] * col_num for _ in range(row_num)]
 
-        for index, key_data in enumerate(layout_data['layout']):
+        for key_data in layout_data['layout']:
             row, col = key_data['matrix']
             identifier = f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}'
-
             if row >= row_num or col >= col_num:
-                key_name = key_data.get('label', identifier)
-                if row >= row_num:
-                    cli.log.error(f'{keyboard}/{layout_name}: Matrix row for key {index} ({key_name}) is {row} but must be less than {row_num}')
-
-                if col >= col_num:
-                    cli.log.error(f'{keyboard}/{layout_name}: Matrix column for key {index} ({key_name}) is {col} but must be less than {col_num}')
-
+                cli.log.error(f'Skipping layouts due to {layout_name} containing invalid matrix values')
                 return []
 
             layout_matrix[row][col] = identifier
diff --git a/lib/python/qmk/cli/git/submodule.py b/lib/python/qmk/cli/git/submodule.py
index ef116ea1248..1cbfd74e882 100644
--- a/lib/python/qmk/cli/git/submodule.py
+++ b/lib/python/qmk/cli/git/submodule.py
@@ -1,8 +1,8 @@
 import shutil
+from pathlib import Path
 
 from milc import cli
 
-from qmk.path import normpath
 from qmk import submodules
 
 REMOVE_DIRS = [
@@ -40,12 +40,12 @@ def git_submodule(cli):
     remove_dirs = REMOVE_DIRS
     if cli.config.git_submodule.force:
         # Also trash everything that isnt marked as "safe"
-        for path in normpath('lib').iterdir():
+        for path in Path('lib').iterdir():
             if not any(ignore in path.as_posix() for ignore in IGNORE_DIRS):
                 remove_dirs.append(path)
 
-    for folder in map(normpath, remove_dirs):
-        if normpath(folder).is_dir():
+    for folder in map(Path, remove_dirs):
+        if folder.is_dir():
             print(f"Removing '{folder}'")
             shutil.rmtree(folder)
 
diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py
index a7c85b5643d..7ebb0cf9c45 100644
--- a/lib/python/qmk/cli/lint.py
+++ b/lib/python/qmk/cli/lint.py
@@ -13,6 +13,7 @@
 from qmk.c_parse import c_source_files
 
 CHIBIOS_CONF_CHECKS = ['chconf.h', 'halconf.h', 'mcuconf.h', 'board.h']
+INVALID_KB_FEATURES = set(['encoder_map', 'dip_switch_map', 'combo', 'tap_dance', 'via'])
 
 
 def _list_defaultish_keymaps(kb):
@@ -69,6 +70,17 @@ def _handle_json_errors(kb, info):
     return ok
 
 
+def _handle_invalid_features(kb, info):
+    """Check for features that should never be enabled at the keyboard level
+    """
+    ok = True
+    features = set(info.get('features', []))
+    for found in features & INVALID_KB_FEATURES:
+        ok = False
+        cli.log.error(f'{kb}: Invalid keyboard level feature detected - {found}')
+    return ok
+
+
 def _chibios_conf_includenext_check(target):
     """Check the ChibiOS conf.h for the correct inclusion of the next conf.h
     """
@@ -154,6 +166,9 @@ def keyboard_check(kb):
         ok = False
 
     # Additional checks
+    if not _handle_invalid_features(kb, kb_info):
+        ok = False
+
     rules_mk_assignment_errors = _rules_mk_assignment_only(kb)
     if rules_mk_assignment_errors:
         ok = False
diff --git a/lib/python/qmk/cli/mass_compile.py b/lib/python/qmk/cli/mass_compile.py
index 69b9103fdc8..7db704d6c25 100755
--- a/lib/python/qmk/cli/mass_compile.py
+++ b/lib/python/qmk/cli/mass_compile.py
@@ -52,9 +52,9 @@ def mass_compile_targets(targets: List[BuildTarget], clean: bool, dry_run: bool,
 	{' '.join(command)} \\
 		>>"{build_log}" 2>&1 \\
 		|| cp "{build_log}" "{failed_log}"
-	@{{ grep '\[ERRORS\]' "{build_log}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:{keymap_name}" ; }} \\
-		|| {{ grep '\[WARNINGS\]' "{build_log}" >/dev/null 2>&1 && printf "Build %-64s \e[1;33m[WARNINGS]\e[0m\\n" "{keyboard_name}:{keymap_name}" ; }} \\
-		|| printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:{keymap_name}"
+	@{{ grep '\\[ERRORS\\]' "{build_log}" >/dev/null 2>&1 && printf "Build %-64s \\e[1;31m[ERRORS]\\e[0m\\n" "{keyboard_name}:{keymap_name}" ; }} \\
+		|| {{ grep '\\[WARNINGS\\]' "{build_log}" >/dev/null 2>&1 && printf "Build %-64s \\e[1;33m[WARNINGS]\\e[0m\\n" "{keyboard_name}:{keymap_name}" ; }} \\
+		|| printf "Build %-64s \\e[1;32m[OK]\\e[0m\\n" "{keyboard_name}:{keymap_name}"
 	@rm -f "{build_log}" || true
 """# noqa
                 )
diff --git a/lib/python/qmk/cli/migrate.py b/lib/python/qmk/cli/migrate.py
index c1b1ad1ea9d..0bab5c1949f 100644
--- a/lib/python/qmk/cli/migrate.py
+++ b/lib/python/qmk/cli/migrate.py
@@ -47,9 +47,12 @@ def migrate(cli):
     files = _candidate_files(cli.args.keyboard)
 
     # Filter down keys if requested
-    keys = info_map.keys()
+    keys = list(filter(lambda key: info_map[key].get("to_json", True), info_map.keys()))
     if cli.args.filter:
         keys = list(set(keys) & set(cli.args.filter))
+        rejected = set(cli.args.filter) - set(keys)
+        for key in rejected:
+            cli.log.info(f'{{fg_yellow}}Skipping {key} as migration not possible...')
 
     cli.log.info(f'{{fg_green}}Migrating keyboard {{fg_cyan}}{cli.args.keyboard}{{fg_green}}.{{fg_reset}}')
 
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index ce956d0ce14..cb50acf8bb9 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -15,7 +15,7 @@
 from qmk.path import keyboard
 from qmk.json_encoders import InfoJSONEncoder
 from qmk.json_schema import deep_update, json_load
-from qmk.constants import MCU2BOOTLOADER
+from qmk.constants import MCU2BOOTLOADER, QMK_FIRMWARE
 
 COMMUNITY = Path('layouts/default/')
 TEMPLATE = Path('data/templates/keyboard/')
@@ -254,6 +254,6 @@ def new_keyboard(cli):
     augment_community_info(community_info, keyboard(kb_name) / community_info.name)
 
     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.')
-    cli.log.info(f"And build with {{fg_yellow}}qmk compile -kb {kb_name} -km default{{fg_reset}}.")
+    cli.log.info(f"Build Command: {{fg_yellow}}qmk compile -kb {kb_name} -km default{{fg_reset}}.")
+    cli.log.info(f'Project Location: {{fg_cyan}}{QMK_FIRMWARE}/{keyboard(kb_name)}{{fg_reset}},')
+    cli.log.info("{{fg_yellow}}Now update the config files to match the hardware!{{fg_reset}}")
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index d51741ecb6e..815b8514742 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -7,7 +7,7 @@
 
 from milc import cli
 
-from qmk.constants import CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS
+from qmk.constants import COL_LETTERS, ROW_LETTERS, CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS
 from qmk.c_parse import find_layouts, parse_config_h_file, find_led_config
 from qmk.json_schema import deep_update, json_load, validate
 from qmk.keyboard import config_h, rules_mk
@@ -78,9 +78,11 @@ def _find_invalid_encoder_index(info_data):
     return ret
 
 
-def _additional_validation(keyboard, info_data):
+def _validate_layouts(keyboard, info_data):  # noqa C901
     """Non schema checks
     """
+    col_num = info_data.get('matrix_size', {}).get('cols', 0)
+    row_num = info_data.get('matrix_size', {}).get('rows', 0)
     layouts = info_data.get('layouts', {})
     layout_aliases = info_data.get('layout_aliases', {})
     community_layouts = info_data.get('community_layouts', [])
@@ -90,6 +92,21 @@ def _additional_validation(keyboard, info_data):
     if len(layouts) == 0 or all(not layout.get('json_layout', False) for layout in layouts.values()):
         _log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in info.json.')
 
+    # Make sure all layouts are DD
+    for layout_name, layout_data in layouts.items():
+        if layout_data.get('c_macro', False):
+            _log_error(info_data, f'{layout_name}: Layout macro should not be defined within ".h" files.')
+
+    # Make sure all matrix values are in bounds
+    for layout_name, layout_data in layouts.items():
+        for index, key_data in enumerate(layout_data['layout']):
+            row, col = key_data['matrix']
+            key_name = key_data.get('label', f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}')
+            if row >= row_num:
+                _log_error(info_data, f'{layout_name}: Matrix row for key {index} ({key_name}) is {row} but must be less than {row_num}')
+            if col >= col_num:
+                _log_error(info_data, f'{layout_name}: Matrix column for key {index} ({key_name}) is {col} but must be less than {col_num}')
+
     # Warn if physical positions are offset (at least one key should be at x=0, and at least one key at y=0)
     for layout_name, layout_data in layouts.items():
         offset_x = min([_get_key_left_position(k) for k in layout_data['layout']])
@@ -122,12 +139,20 @@ def _additional_validation(keyboard, info_data):
         if layout_name not in layouts and layout_name not in layout_aliases:
             _log_error(info_data, 'Claims to support community layout %s but no %s() macro found' % (layout, layout_name))
 
+
+def _validate_keycodes(keyboard, info_data):
+    """Non schema checks
+    """
     # keycodes with length > 7 must have short forms for visualisation purposes
     for decl in info_data.get('keycodes', []):
         if len(decl["key"]) > 7:
             if not decl.get("aliases", []):
                 _log_error(info_data, f'Keycode {decl["key"]} has no short form alias')
 
+
+def _validate_encoders(keyboard, info_data):
+    """Non schema checks
+    """
     # encoder IDs in layouts must be in range and not duplicated
     found = _find_invalid_encoder_index(info_data)
     for layout_name, encoder_index, reason in found:
@@ -141,7 +166,10 @@ def _validate(keyboard, info_data):
     try:
         validate(info_data, 'qmk.api.keyboard.v1')
 
-        _additional_validation(keyboard, info_data)
+        # Additional validation
+        _validate_layouts(keyboard, info_data)
+        _validate_keycodes(keyboard, info_data)
+        _validate_encoders(keyboard, info_data)
 
     except jsonschema.ValidationError as e:
         json_path = '.'.join([str(p) for p in e.absolute_path])
@@ -210,6 +238,9 @@ def _extract_features(info_data, rules):
             key = '_'.join(key.split('_')[:-1]).lower()
             value = True if value.lower() in true_values else False if value.lower() in false_values else value
 
+            if key in ['lto']:
+                continue
+
             if 'config_h_features' not in info_data:
                 info_data['config_h_features'] = {}
 
@@ -501,6 +532,9 @@ def _config_to_json(key_type, config_value):
     """Convert config value using spec
     """
     if key_type.startswith('array'):
+        if key_type.count('.') > 1:
+            raise Exception(f"Conversion of {key_type} not possible")
+
         if '.' in key_type:
             key_type, array_type = key_type.split('.', 1)
         else:
@@ -513,7 +547,7 @@ def _config_to_json(key_type, config_value):
         else:
             return list(map(str.strip, config_value.split(',')))
 
-    elif key_type == 'bool':
+    elif key_type in ['bool', 'flag']:
         if isinstance(config_value, bool):
             return config_value
         return config_value in true_values
@@ -683,27 +717,23 @@ def _extract_led_config(info_data, keyboard):
     cols = info_data['matrix_size']['cols']
     rows = info_data['matrix_size']['rows']
 
-    # Determine what feature owns g_led_config
-    features = info_data.get("features", {})
-    feature = None
-    if features.get("rgb_matrix", False):
-        feature = "rgb_matrix"
-    elif features.get("led_matrix", False):
-        feature = "led_matrix"
-
-    if feature:
-        # Process
-        for file in find_keyboard_c(keyboard):
-            try:
-                ret = find_led_config(file, cols, rows)
-                if ret:
-                    info_data[feature] = info_data.get(feature, {})
-                    info_data[feature]["layout"] = ret
-            except Exception as e:
-                _log_warning(info_data, f'led_config: {file.name}: {e}')
-
-        if info_data[feature].get("layout", None) and not info_data[feature].get("led_count", None):
-            info_data[feature]["led_count"] = len(info_data[feature]["layout"])
+    for feature in ['rgb_matrix', 'led_matrix']:
+        if info_data.get('features', {}).get(feature, False) or feature in info_data:
+
+            # Only attempt search if dd led config is missing
+            if 'layout' not in info_data.get(feature, {}):
+                # Process
+                for file in find_keyboard_c(keyboard):
+                    try:
+                        ret = find_led_config(file, cols, rows)
+                        if ret:
+                            info_data[feature] = info_data.get(feature, {})
+                            info_data[feature]['layout'] = ret
+                    except Exception as e:
+                        _log_warning(info_data, f'led_config: {file.name}: {e}')
+
+            if info_data[feature].get('layout', None) and not info_data[feature].get('led_count', None):
+                info_data[feature]['led_count'] = len(info_data[feature]['layout'])
 
     return info_data
 
diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py
index b00df749ccf..1d5f863807f 100644
--- a/lib/python/qmk/json_schema.py
+++ b/lib/python/qmk/json_schema.py
@@ -7,6 +7,7 @@
 from functools import lru_cache
 from typing import OrderedDict
 from pathlib import Path
+from copy import deepcopy
 
 from milc import cli
 
@@ -22,7 +23,8 @@ def _dict_raise_on_duplicates(ordered_pairs):
     return d
 
 
-def json_load(json_file, strict=True):
+@lru_cache(maxsize=20)
+def _json_load_impl(json_file, strict=True):
     """Load a json file from disk.
 
     Note: file must be a Path object.
@@ -42,7 +44,11 @@ def json_load(json_file, strict=True):
         exit(1)
 
 
-@lru_cache(maxsize=0)
+def json_load(json_file, strict=True):
+    return deepcopy(_json_load_impl(json_file=json_file, strict=strict))
+
+
+@lru_cache(maxsize=20)
 def load_jsonschema(schema_name):
     """Read a jsonschema file from disk.
     """
@@ -57,7 +63,7 @@ def load_jsonschema(schema_name):
     return json_load(schema_path)
 
 
-@lru_cache(maxsize=0)
+@lru_cache(maxsize=1)
 def compile_schema_store():
     """Compile all our schemas into a schema store.
     """
@@ -73,7 +79,7 @@ def compile_schema_store():
     return schema_store
 
 
-@lru_cache(maxsize=0)
+@lru_cache(maxsize=20)
 def create_validator(schema):
     """Creates a validator for the given schema id.
     """
diff --git a/lib/python/qmk/painter_qgf.py b/lib/python/qmk/painter_qgf.py
index 2b8edfb04db..cc4697f1c62 100644
--- a/lib/python/qmk/painter_qgf.py
+++ b/lib/python/qmk/painter_qgf.py
@@ -1,9 +1,11 @@
 # Copyright 2021 Nick Brassel (@tzarc)
+# Copyright 2023 Pablo Martinez (@elpekenin) <elpekenin@elpekenin.dev>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # Quantum Graphics File "QGF" Image File Format.
 # See https://docs.qmk.fm/#/quantum_painter_qgf for more information.
 
+import functools
 from colorsys import rgb_to_hsv
 from types import FunctionType
 from PIL import Image, ImageFile, ImageChops
@@ -15,6 +17,12 @@ def o24(i):
     return o16(i & 0xFFFF) + o8((i & 0xFF0000) >> 16)
 
 
+# Helper to convert from RGB888 to the QMK "dialect" of HSV888
+def rgb888_to_qmk_hsv888(e):
+    hsv = rgb_to_hsv(e[0] / 255.0, e[1] / 255.0, e[2] / 255.0)
+    return (int(hsv[0] * 255.0), int(hsv[1] * 255.0), int(hsv[2] * 255.0))
+
+
 ########################################################################################################################
 
 
@@ -60,6 +68,14 @@ def write(self, fp):
             + o16(self.frame_count)  # frame count
         )
 
+    @property
+    def image_size(self):
+        return self.image_width, self.image_height
+
+    @image_size.setter
+    def image_size(self, size):
+        self.image_width, self.image_height = size
+
 
 ########################################################################################################################
 
@@ -180,6 +196,14 @@ def write(self, fp):
                  + o16(self.bottom)  # bottom
                  )
 
+    @property
+    def bbox(self):
+        return self.left, self.top, self.right, self.bottom
+
+    @bbox.setter
+    def bbox(self, bbox):
+        self.left, self.top, self.right, self.bottom = bbox
+
 
 ########################################################################################################################
 
@@ -221,42 +245,159 @@ def _accept(prefix):
     return False
 
 
-def _save(im, fp, filename):
+def _for_all_frames(x: FunctionType, /, images):
+    frame_num = 0
+    last_frame = None
+    for frame in images:
+        # Get number of of frames in this image
+        nfr = getattr(frame, "n_frames", 1)
+        for idx in range(nfr):
+            frame.seek(idx)
+            frame.load()
+            copy = frame.copy().convert("RGB")
+            x(frame_num, copy, last_frame)
+            last_frame = copy
+            frame_num += 1
+
+
+def _compress_image(frame, last_frame, *, use_rle, use_deltas, format_, **_kwargs):
+    # Convert the original frame so we can do comparisons
+    converted = qmk.painter.convert_requested_format(frame, format_)
+    graphic_data = qmk.painter.convert_image_bytes(converted, format_)
+
+    # Convert the raw data to RLE-encoded if requested
+    raw_data = graphic_data[1]
+    if use_rle:
+        rle_data = qmk.painter.compress_bytes_qmk_rle(graphic_data[1])
+    use_raw_this_frame = not use_rle or len(raw_data) <= len(rle_data)
+    image_data = raw_data if use_raw_this_frame else rle_data
+
+    # Work out if a delta frame is smaller than injecting it directly
+    use_delta_this_frame = False
+    bbox = None
+    if use_deltas and last_frame is not None:
+        # If we want to use deltas, then find the difference
+        diff = ImageChops.difference(frame, last_frame)
+
+        # Get the bounding box of those differences
+        bbox = diff.getbbox()
+
+        # If we have a valid bounding box...
+        if bbox:
+            # ...create the delta frame by cropping the original.
+            delta_frame = frame.crop(bbox)
+
+            # Convert the delta frame to the requested format
+            delta_converted = qmk.painter.convert_requested_format(delta_frame, format_)
+            delta_graphic_data = qmk.painter.convert_image_bytes(delta_converted, format_)
+
+            # Work out how large the delta frame is going to be with compression etc.
+            delta_raw_data = delta_graphic_data[1]
+            if use_rle:
+                delta_rle_data = qmk.painter.compress_bytes_qmk_rle(delta_graphic_data[1])
+            delta_use_raw_this_frame = not use_rle or len(delta_raw_data) <= len(delta_rle_data)
+            delta_image_data = delta_raw_data if delta_use_raw_this_frame else delta_rle_data
+
+            # If the size of the delta frame (plus delta descriptor) is smaller than the original, use that instead
+            # This ensures that if a non-delta is overall smaller in size, we use that in preference due to flash
+            # sizing constraints.
+            if (len(delta_image_data) + QGFFrameDeltaDescriptorV1.length) < len(image_data):
+                # Copy across all the delta equivalents so that the rest of the processing acts on those
+                graphic_data = delta_graphic_data
+                raw_data = delta_raw_data
+                rle_data = delta_rle_data
+                use_raw_this_frame = delta_use_raw_this_frame
+                image_data = delta_image_data
+                use_delta_this_frame = True
+
+        # Default to whole image
+        bbox = bbox or [0, 0, *frame.size]
+        # Fix sze (as per #20296), we need to cast first as tuples are inmutable
+        bbox = list(bbox)
+        bbox[2] -= 1
+        bbox[3] -= 1
+
+    return {
+        "bbox": bbox,
+        "graphic_data": graphic_data,
+        "image_data": image_data,
+        "use_delta_this_frame": use_delta_this_frame,
+        "use_raw_this_frame": use_raw_this_frame,
+    }
+
+
+# Helper function to save each frame to the output file
+def _write_frame(idx, frame, last_frame, *, fp, frame_offsets, **kwargs):
+    # Not an argument of the function as it would consume from **kwargs
+    format_ = kwargs["format_"]
+
+    # (potentially) Apply RLE and/or delta, and work out output image's information
+    outputs = _compress_image(frame, last_frame, **kwargs)
+    bbox = outputs["bbox"]
+    graphic_data = outputs["graphic_data"]
+    image_data = outputs["image_data"]
+    use_delta_this_frame = outputs["use_delta_this_frame"]
+    use_raw_this_frame = outputs["use_raw_this_frame"]
+
+    # Write out the frame descriptor
+    frame_offsets.frame_offsets[idx] = fp.tell()
+    vprint(f'{f"Frame {idx:3d} base":26s} {fp.tell():5d}d / {fp.tell():04X}h')
+    frame_descriptor = QGFFrameDescriptorV1()
+    frame_descriptor.is_delta = use_delta_this_frame
+    frame_descriptor.is_transparent = False
+    frame_descriptor.format = format_['image_format_byte']
+    frame_descriptor.compression = 0x00 if use_raw_this_frame else 0x01  # See qp.h, painter_compression_t
+    frame_descriptor.delay = frame.info.get('duration', 1000)  # If we're not an animation, just pretend we're delaying for 1000ms
+    frame_descriptor.write(fp)
+
+    # Write out the palette if required
+    if format_['has_palette']:
+        palette = graphic_data[0]
+        palette_descriptor = QGFFramePaletteDescriptorV1()
+
+        # Convert all palette entries to HSV888 and write to the output
+        palette_descriptor.palette_entries = list(map(rgb888_to_qmk_hsv888, palette))
+        vprint(f'{f"Frame {idx:3d} palette":26s} {fp.tell():5d}d / {fp.tell():04X}h')
+        palette_descriptor.write(fp)
+
+    # Write out the delta info if required
+    if use_delta_this_frame:
+        # Set up the rendering location of where the delta frame should be situated
+        delta_descriptor = QGFFrameDeltaDescriptorV1()
+        delta_descriptor.bbox = bbox
+
+        # Write the delta frame to the output
+        vprint(f'{f"Frame {idx:3d} delta":26s} {fp.tell():5d}d / {fp.tell():04X}h')
+        delta_descriptor.write(fp)
+
+    # Write out the data for this frame to the output
+    data_descriptor = QGFFrameDataDescriptorV1()
+    data_descriptor.data = image_data
+    vprint(f'{f"Frame {idx:3d} data":26s} {fp.tell():5d}d / {fp.tell():04X}h')
+    data_descriptor.write(fp)
+
+
+def _save(im, fp, _filename):
     """Helper method used by PIL to write to an output file.
     """
     # Work out from the parameters if we need to do anything special
     encoderinfo = im.encoderinfo.copy()
-    append_images = list(encoderinfo.get("append_images", []))
-    verbose = encoderinfo.get("verbose", False)
-    use_deltas = encoderinfo.get("use_deltas", True)
-    use_rle = encoderinfo.get("use_rle", True)
 
-    # Helper for inline verbose prints
-    def vprint(s):
-        if verbose:
-            print(s)
+    # Helper for prints, noop taking any args if not verbose
+    global vprint
+    verbose = encoderinfo.get("verbose", False)
+    vprint = print if verbose else lambda *_args, **_kwargs: None
 
     # Helper to iterate through all frames in the input image
-    def _for_all_frames(x: FunctionType):
-        frame_num = 0
-        last_frame = None
-        for frame in [im] + append_images:
-            # Get number of of frames in this image
-            nfr = getattr(frame, "n_frames", 1)
-            for idx in range(nfr):
-                frame.seek(idx)
-                frame.load()
-                copy = frame.copy().convert("RGB")
-                x(frame_num, copy, last_frame)
-                last_frame = copy
-                frame_num += 1
+    append_images = list(encoderinfo.get("append_images", []))
+    for_all_frames = functools.partial(_for_all_frames, images=[im, *append_images])
 
     # Collect all the frame sizes
     frame_sizes = []
-    _for_all_frames(lambda idx, frame, last_frame: frame_sizes.append(frame.size))
+    for_all_frames(lambda _idx, frame, _last_frame: frame_sizes.append(frame.size))
 
     # Make sure all frames are the same size
-    if len(list(set(frame_sizes))) != 1:
+    if len(set(frame_sizes)) != 1:
         raise ValueError("Mismatching sizes on frames")
 
     # Write out the initial graphics descriptor (and write a dummy value), so that we can come back and fill in the
@@ -264,8 +405,7 @@ def _for_all_frames(x: FunctionType):
     graphics_descriptor_location = fp.tell()
     graphics_descriptor = QGFGraphicsDescriptor()
     graphics_descriptor.frame_count = len(frame_sizes)
-    graphics_descriptor.image_width = frame_sizes[0][0]
-    graphics_descriptor.image_height = frame_sizes[0][1]
+    graphics_descriptor.image_size = frame_sizes[0]
     vprint(f'{"Graphics descriptor block":26s} {fp.tell():5d}d / {fp.tell():04X}h')
     graphics_descriptor.write(fp)
 
@@ -276,117 +416,9 @@ def _for_all_frames(x: FunctionType):
     vprint(f'{"Frame offsets block":26s} {fp.tell():5d}d / {fp.tell():04X}h')
     frame_offsets.write(fp)
 
-    # Helper function to save each frame to the output file
-    def _write_frame(idx, frame, last_frame):
-        # If we replace the frame we're going to output with a delta, we can override it here
-        this_frame = frame
-        location = (0, 0)
-        size = frame.size
-
-        # Work out the format we're going to use
-        format = encoderinfo["qmk_format"]
-
-        # Convert the original frame so we can do comparisons
-        converted = qmk.painter.convert_requested_format(this_frame, format)
-        graphic_data = qmk.painter.convert_image_bytes(converted, format)
-
-        # Convert the raw data to RLE-encoded if requested
-        raw_data = graphic_data[1]
-        if use_rle:
-            rle_data = qmk.painter.compress_bytes_qmk_rle(graphic_data[1])
-        use_raw_this_frame = not use_rle or len(raw_data) <= len(rle_data)
-        image_data = raw_data if use_raw_this_frame else rle_data
-
-        # Work out if a delta frame is smaller than injecting it directly
-        use_delta_this_frame = False
-        if use_deltas and last_frame is not None:
-            # If we want to use deltas, then find the difference
-            diff = ImageChops.difference(frame, last_frame)
-
-            # Get the bounding box of those differences
-            bbox = diff.getbbox()
-
-            # If we have a valid bounding box...
-            if bbox:
-                # ...create the delta frame by cropping the original.
-                delta_frame = frame.crop(bbox)
-                delta_location = (bbox[0], bbox[1])
-                delta_size = (bbox[2] - bbox[0], bbox[3] - bbox[1])
-
-                # Convert the delta frame to the requested format
-                delta_converted = qmk.painter.convert_requested_format(delta_frame, format)
-                delta_graphic_data = qmk.painter.convert_image_bytes(delta_converted, format)
-
-                # Work out how large the delta frame is going to be with compression etc.
-                delta_raw_data = delta_graphic_data[1]
-                if use_rle:
-                    delta_rle_data = qmk.painter.compress_bytes_qmk_rle(delta_graphic_data[1])
-                delta_use_raw_this_frame = not use_rle or len(delta_raw_data) <= len(delta_rle_data)
-                delta_image_data = delta_raw_data if delta_use_raw_this_frame else delta_rle_data
-
-                # If the size of the delta frame (plus delta descriptor) is smaller than the original, use that instead
-                # This ensures that if a non-delta is overall smaller in size, we use that in preference due to flash
-                # sizing constraints.
-                if (len(delta_image_data) + QGFFrameDeltaDescriptorV1.length) < len(image_data):
-                    # Copy across all the delta equivalents so that the rest of the processing acts on those
-                    this_frame = delta_frame
-                    location = delta_location
-                    size = delta_size
-                    converted = delta_converted
-                    graphic_data = delta_graphic_data
-                    raw_data = delta_raw_data
-                    rle_data = delta_rle_data
-                    use_raw_this_frame = delta_use_raw_this_frame
-                    image_data = delta_image_data
-                    use_delta_this_frame = True
-
-        # Write out the frame descriptor
-        frame_offsets.frame_offsets[idx] = fp.tell()
-        vprint(f'{f"Frame {idx:3d} base":26s} {fp.tell():5d}d / {fp.tell():04X}h')
-        frame_descriptor = QGFFrameDescriptorV1()
-        frame_descriptor.is_delta = use_delta_this_frame
-        frame_descriptor.is_transparent = False
-        frame_descriptor.format = format['image_format_byte']
-        frame_descriptor.compression = 0x00 if use_raw_this_frame else 0x01  # See qp.h, painter_compression_t
-        frame_descriptor.delay = frame.info['duration'] if 'duration' in frame.info else 1000  # If we're not an animation, just pretend we're delaying for 1000ms
-        frame_descriptor.write(fp)
-
-        # Write out the palette if required
-        if format['has_palette']:
-            palette = graphic_data[0]
-            palette_descriptor = QGFFramePaletteDescriptorV1()
-
-            # Helper to convert from RGB888 to the QMK "dialect" of HSV888
-            def rgb888_to_qmk_hsv888(e):
-                hsv = rgb_to_hsv(e[0] / 255.0, e[1] / 255.0, e[2] / 255.0)
-                return (int(hsv[0] * 255.0), int(hsv[1] * 255.0), int(hsv[2] * 255.0))
-
-            # Convert all palette entries to HSV888 and write to the output
-            palette_descriptor.palette_entries = list(map(rgb888_to_qmk_hsv888, palette))
-            vprint(f'{f"Frame {idx:3d} palette":26s} {fp.tell():5d}d / {fp.tell():04X}h')
-            palette_descriptor.write(fp)
-
-        # Write out the delta info if required
-        if use_delta_this_frame:
-            # Set up the rendering location of where the delta frame should be situated
-            delta_descriptor = QGFFrameDeltaDescriptorV1()
-            delta_descriptor.left = location[0]
-            delta_descriptor.top = location[1]
-            delta_descriptor.right = location[0] + size[0] - 1
-            delta_descriptor.bottom = location[1] + size[1] - 1
-
-            # Write the delta frame to the output
-            vprint(f'{f"Frame {idx:3d} delta":26s} {fp.tell():5d}d / {fp.tell():04X}h')
-            delta_descriptor.write(fp)
-
-        # Write out the data for this frame to the output
-        data_descriptor = QGFFrameDataDescriptorV1()
-        data_descriptor.data = image_data
-        vprint(f'{f"Frame {idx:3d} data":26s} {fp.tell():5d}d / {fp.tell():04X}h')
-        data_descriptor.write(fp)
-
     # Iterate over each if the input frames, writing it to the output in the process
-    _for_all_frames(_write_frame)
+    write_frame = functools.partial(_write_frame, format_=encoderinfo["qmk_format"], fp=fp, use_deltas=encoderinfo.get("use_deltas", True), use_rle=encoderinfo.get("use_rle", True), frame_offsets=frame_offsets)
+    for_all_frames(write_frame)
 
     # Go back and update the graphics descriptor now that we can determine the final file size
     graphics_descriptor.total_file_size = fp.tell()
diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py
index 74364ee04b0..bb588d2e1c3 100644
--- a/lib/python/qmk/path.py
+++ b/lib/python/qmk/path.py
@@ -12,11 +12,19 @@
 def is_keyboard(keyboard_name):
     """Returns True if `keyboard_name` is a keyboard we can compile.
     """
-    if keyboard_name:
-        keyboard_path = QMK_FIRMWARE / 'keyboards' / keyboard_name
-        rules_mk = keyboard_path / 'rules.mk'
+    if not keyboard_name:
+        return False
+
+    # keyboard_name values of 'c:/something' or '/something' trigger append issues
+    # due to "If the argument is an absolute path, the previous path is ignored"
+    # however it should always be a folder located under qmk_firmware/keyboards
+    if Path(keyboard_name).is_absolute():
+        return False
+
+    keyboard_path = QMK_FIRMWARE / 'keyboards' / keyboard_name
+    rules_mk = keyboard_path / 'rules.mk'
 
-        return rules_mk.exists()
+    return rules_mk.exists()
 
 
 def under_qmk_firmware(path=Path(os.environ['ORIG_CWD'])):
diff --git a/lib/python/qmk/search.py b/lib/python/qmk/search.py
index 84cf6cbe326..33550a3db27 100644
--- a/lib/python/qmk/search.py
+++ b/lib/python/qmk/search.py
@@ -5,7 +5,7 @@
 import fnmatch
 import logging
 import re
-from typing import List, Tuple
+from typing import Callable, List, Optional, Tuple
 from dotty_dict import dotty, Dotty
 from milc import cli
 
@@ -15,6 +15,82 @@
 from qmk.keymap import list_keymaps, locate_keymap
 from qmk.build_targets import KeyboardKeymapBuildTarget, BuildTarget
 
+TargetInfo = Tuple[str, str, dict]
+
+
+# by using a class for filters, we dont need to worry about capturing values
+# see details <https://github.com/qmk/qmk_firmware/pull/21090>
+class FilterFunction:
+    """Base class for filters.
+    It provides:
+        - __init__: capture key and value
+
+    Each subclass should provide:
+        - func_name: how it will be specified on CLI
+            >>> qmk find -f <func_name>...
+        - apply: function that actually applies the filter
+            ie: return whether the input kb/km satisfies the condition
+    """
+
+    key: str
+    value: Optional[str]
+
+    func_name: str
+    apply: Callable[[TargetInfo], bool]
+
+    def __init__(self, key, value):
+        self.key = key
+        self.value = value
+
+
+class Exists(FilterFunction):
+    func_name = "exists"
+
+    def apply(self, target_info: TargetInfo) -> bool:
+        _kb, _km, info = target_info
+        return self.key in info
+
+
+class Absent(FilterFunction):
+    func_name = "absent"
+
+    def apply(self, target_info: TargetInfo) -> bool:
+        _kb, _km, info = target_info
+        return self.key not in info
+
+
+class Length(FilterFunction):
+    func_name = "length"
+
+    def apply(self, target_info: TargetInfo) -> bool:
+        _kb, _km, info = target_info
+        return (self.key in info and len(info[self.key]) == int(self.value))
+
+
+class Contains(FilterFunction):
+    func_name = "contains"
+
+    def apply(self, target_info: TargetInfo) -> bool:
+        _kb, _km, info = target_info
+        return (self.key in info and self.value in info[self.key])
+
+
+def _get_filter_class(func_name: str, key: str, value: str) -> Optional[FilterFunction]:
+    """Initialize a filter subclass based on regex findings and return it.
+    None if no there's no filter with the name queried.
+    """
+
+    for subclass in FilterFunction.__subclasses__():
+        if func_name == subclass.func_name:
+            return subclass(key, value)
+
+    return None
+
+
+def filter_help() -> str:
+    names = [f"'{f.func_name}'" for f in FilterFunction.__subclasses__()]
+    return ", ".join(names[:-1]) + f" and {names[-1]}"
+
 
 def _set_log_level(level):
     cli.acquire_lock()
@@ -48,11 +124,12 @@ def _keymap_exists(keyboard, keymap):
         return keyboard if locate_keymap(keyboard, keymap) is not None else None
 
 
-def _load_keymap_info(kb_km):
+def _load_keymap_info(target: Tuple[str, str]) -> TargetInfo:
     """Returns a tuple of (keyboard, keymap, info.json) for the given keyboard/keymap combination.
     """
+    kb, km = target
     with ignore_logging():
-        return (kb_km[0], kb_km[1], keymap_json(kb_km[0], kb_km[1]))
+        return (kb, km, keymap_json(kb, km))
 
 
 def expand_make_targets(targets: List[str]) -> List[Tuple[str, str]]:
@@ -139,26 +216,14 @@ def _filter_keymap_targets(target_list: List[Tuple[str, str]], filters: List[str
                 key = function_match.group('key')
                 value = function_match.group('value')
 
-                if value is not None:
-                    if func_name == 'length':
-                        valid_keymaps = filter(lambda e, key=key, value=value: key in e[2] and len(e[2].get(key)) == int(value), valid_keymaps)
-                    elif func_name == 'contains':
-                        valid_keymaps = filter(lambda e, key=key, value=value: key in e[2] and value in e[2].get(key), valid_keymaps)
-                    else:
-                        cli.log.warning(f'Unrecognized filter expression: {function_match.group(0)}')
-                        continue
-
-                    cli.log.info(f'Filtering on condition: {{fg_green}}{func_name}{{fg_reset}}({{fg_cyan}}{key}{{fg_reset}}, {{fg_cyan}}{value}{{fg_reset}})...')
-                else:
-                    if func_name == 'exists':
-                        valid_keymaps = filter(lambda e, key=key: key in e[2], valid_keymaps)
-                    elif func_name == 'absent':
-                        valid_keymaps = filter(lambda e, key=key: key not in e[2], valid_keymaps)
-                    else:
-                        cli.log.warning(f'Unrecognized filter expression: {function_match.group(0)}')
-                        continue
-
-                    cli.log.info(f'Filtering on condition: {{fg_green}}{func_name}{{fg_reset}}({{fg_cyan}}{key}{{fg_reset}})...')
+                filter_class = _get_filter_class(func_name, key, value)
+                if filter_class is None:
+                    cli.log.warning(f'Unrecognized filter expression: {function_match.group(0)}')
+                    continue
+                valid_keymaps = filter(filter_class.apply, valid_keymaps)
+
+                value_str = f", {{fg_cyan}}{value}{{fg_reset}})" if value is not None else ""
+                cli.log.info(f'Filtering on condition: {{fg_green}}{func_name}{{fg_reset}}({{fg_cyan}}{key}{{fg_reset}}{value_str}...')
 
             elif equals_match is not None:
                 key = equals_match.group('key')
diff --git a/platforms/arm_atsam/gpio.h b/platforms/arm_atsam/gpio.h
index a42aaff54d6..fd8caeab0bc 100644
--- a/platforms/arm_atsam/gpio.h
+++ b/platforms/arm_atsam/gpio.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "stdint.h"
+#include <stdint.h>
 #include "samd51j18a.h"
 
 #include "pin_defs.h"
@@ -26,13 +26,13 @@ typedef uint8_t pin_t;
 #define SAMD_PIN(pin) ((pin)&0x1f)
 #define SAMD_PIN_MASK(pin) (1 << ((pin)&0x1f))
 
-#define setPinInput(pin)                                                                 \
+#define gpio_set_pin_input(pin)                                                          \
     do {                                                                                 \
         PORT->Group[SAMD_PORT(pin)].PINCFG[SAMD_PIN(pin)].bit.INEN = 1;                  \
         PORT->Group[SAMD_PORT(pin)].DIRCLR.reg                     = SAMD_PIN_MASK(pin); \
     } while (0)
 
-#define setPinInputHigh(pin)                                                               \
+#define gpio_set_pin_input_high(pin)                                                       \
     do {                                                                                   \
         PORT->Group[SAMD_PORT(pin)].DIRCLR.reg                       = SAMD_PIN_MASK(pin); \
         PORT->Group[SAMD_PORT(pin)].OUTSET.reg                       = SAMD_PIN_MASK(pin); \
@@ -40,7 +40,7 @@ typedef uint8_t pin_t;
         PORT->Group[SAMD_PORT(pin)].PINCFG[SAMD_PIN(pin)].bit.PULLEN = 1;                  \
     } while (0)
 
-#define setPinInputLow(pin)                                                                \
+#define gpio_set_pin_input_low(pin)                                                        \
     do {                                                                                   \
         PORT->Group[SAMD_PORT(pin)].DIRCLR.reg                       = SAMD_PIN_MASK(pin); \
         PORT->Group[SAMD_PORT(pin)].OUTCLR.reg                       = SAMD_PIN_MASK(pin); \
@@ -48,27 +48,27 @@ typedef uint8_t pin_t;
         PORT->Group[SAMD_PORT(pin)].PINCFG[SAMD_PIN(pin)].bit.PULLEN = 1;                  \
     } while (0)
 
-#define setPinOutputPushPull(pin)                                    \
+#define gpio_set_pin_output_push_pull(pin)                           \
     do {                                                             \
         PORT->Group[SAMD_PORT(pin)].DIRSET.reg = SAMD_PIN_MASK(pin); \
         PORT->Group[SAMD_PORT(pin)].OUTCLR.reg = SAMD_PIN_MASK(pin); \
     } while (0)
 
-#define setPinOutputOpenDrain(pin) _Static_assert(0, "arm_atsam platform does not implement an open-drain output")
+#define gpio_set_pin_output_open_drain(pin) _Static_assert(0, "Open-drain outputs are not available on ATSAM")
 
-#define setPinOutput(pin) setPinOutputPushPull(pin)
+#define gpio_set_pin_output(pin) gpio_set_pin_output_push_pull(pin)
 
-#define writePinHigh(pin)                                            \
+#define gpio_write_pin_high(pin)                                     \
     do {                                                             \
         PORT->Group[SAMD_PORT(pin)].OUTSET.reg = SAMD_PIN_MASK(pin); \
     } while (0)
 
-#define writePinLow(pin)                                             \
+#define gpio_write_pin_low(pin)                                      \
     do {                                                             \
         PORT->Group[SAMD_PORT(pin)].OUTCLR.reg = SAMD_PIN_MASK(pin); \
     } while (0)
 
-#define writePin(pin, level)                                             \
+#define gpio_write_pin(pin, level)                                       \
     do {                                                                 \
         if (level)                                                       \
             PORT->Group[SAMD_PORT(pin)].OUTSET.reg = SAMD_PIN_MASK(pin); \
@@ -76,6 +76,6 @@ typedef uint8_t pin_t;
             PORT->Group[SAMD_PORT(pin)].OUTCLR.reg = SAMD_PIN_MASK(pin); \
     } while (0)
 
-#define readPin(pin) ((PORT->Group[SAMD_PORT(pin)].IN.reg & SAMD_PIN_MASK(pin)) != 0)
+#define gpio_read_pin(pin) ((PORT->Group[SAMD_PORT(pin)].IN.reg & SAMD_PIN_MASK(pin)) != 0)
 
-#define togglePin(pin) (PORT->Group[SAMD_PORT(pin)].OUTTGL.reg = SAMD_PIN_MASK(pin))
+#define gpio_toggle_pin(pin) (PORT->Group[SAMD_PORT(pin)].OUTTGL.reg = SAMD_PIN_MASK(pin))
diff --git a/platforms/avr/_print.h b/platforms/avr/_print.h
index 5c1fdd26d84..bf8247c2f3a 100644
--- a/platforms/avr/_print.h
+++ b/platforms/avr/_print.h
@@ -24,10 +24,3 @@
 #pragma once
 
 #include "avr/xprintf.h"
-
-// Create user & normal print defines
-#define print(s) xputs(PSTR(s))
-#define println(s) xputs(PSTR(s "\r\n"))
-#define uprint(s) xputs(PSTR(s))
-#define uprintln(s) xputs(PSTR(s "\r\n"))
-#define uprintf(fmt, ...) __xprintf(PSTR(fmt), ##__VA_ARGS__)
\ No newline at end of file
diff --git a/platforms/avr/drivers/audio_pwm_hardware.c b/platforms/avr/drivers/audio_pwm_hardware.c
index 6799cf2fdde..d484fba00fb 100644
--- a/platforms/avr/drivers/audio_pwm_hardware.c
+++ b/platforms/avr/drivers/audio_pwm_hardware.c
@@ -216,12 +216,12 @@ void channel_2_stop(void) {
 void audio_driver_initialize(void) {
 #ifdef AUDIO1_PIN_SET
     channel_1_stop();
-    setPinOutput(AUDIO1_PIN);
+    gpio_set_pin_output(AUDIO1_PIN);
 #endif
 
 #ifdef AUDIO2_PIN_SET
     channel_2_stop();
-    setPinOutput(AUDIO2_PIN);
+    gpio_set_pin_output(AUDIO2_PIN);
 #endif
 
     // TCCR3A / TCCR3B: Timer/Counter #3 Control Registers TCCR3A/TCCR3B, TCCR1A/TCCR1B
diff --git a/platforms/avr/drivers/backlight_pwm.c b/platforms/avr/drivers/backlight_pwm.c
index 74d25753a4e..f6ab9391e27 100644
--- a/platforms/avr/drivers/backlight_pwm.c
+++ b/platforms/avr/drivers/backlight_pwm.c
@@ -291,11 +291,11 @@ ISR(TIMERx_OVF_vect) {
 #endif // BACKLIGHT_BREATHING
 
 void backlight_init_ports(void) {
-    setPinOutput(BACKLIGHT_PIN);
+    gpio_set_pin_output(BACKLIGHT_PIN);
 #if BACKLIGHT_ON_STATE == 1
-    writePinLow(BACKLIGHT_PIN);
+    gpio_write_pin_low(BACKLIGHT_PIN);
 #else
-    writePinHigh(BACKLIGHT_PIN);
+    gpio_write_pin_high(BACKLIGHT_PIN);
 #endif
 
     // I could write a wall of text here to explain... but TL;DW
diff --git a/platforms/avr/drivers/i2c_master.c b/platforms/avr/drivers/i2c_master.c
index 58939f3e00e..64083d862a4 100644
--- a/platforms/avr/drivers/i2c_master.c
+++ b/platforms/avr/drivers/i2c_master.c
@@ -24,6 +24,7 @@
 #include "timer.h"
 #include "wait.h"
 #include "util.h"
+#include "progmem.h"
 
 #ifndef F_SCL
 #    define F_SCL 400000UL // SCL frequency
@@ -38,7 +39,7 @@
 
 #define TWBR_val (((F_CPU / F_SCL) - 16) / 2)
 
-void i2c_init(void) {
+__attribute__((weak)) void i2c_init(void) {
     TWSR = 0; /* no prescaler */
     TWBR = (uint8_t)TWBR_val;
 
@@ -94,7 +95,7 @@ static i2c_status_t i2c_start_impl(uint8_t address, uint16_t timeout) {
     return I2C_STATUS_SUCCESS;
 }
 
-i2c_status_t i2c_start(uint8_t address, uint16_t timeout) {
+__attribute__((always_inline)) static inline 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
@@ -105,6 +106,11 @@ i2c_status_t i2c_start(uint8_t address, uint16_t timeout) {
     return status;
 }
 
+__attribute__((always_inline)) static inline void i2c_stop(void) {
+    // transmit STOP condition
+    TWCR = (1 << TWINT) | (1 << TWEN) | (1 << TWSTO);
+}
+
 i2c_status_t i2c_write(uint8_t data, uint16_t timeout) {
     // load data into data register
     TWDR = data;
@@ -167,6 +173,18 @@ i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length,
     return status;
 }
 
+i2c_status_t i2c_transmit_P(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout) {
+    i2c_status_t status = i2c_start(address | I2C_ACTION_WRITE, timeout);
+
+    for (uint16_t i = 0; i < length && status >= 0; i++) {
+        status = i2c_write(pgm_read_byte((const char*)data++), timeout);
+    }
+
+    i2c_stop();
+
+    return status;
+}
+
 i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout) {
     i2c_status_t status = i2c_start(address | I2C_ACTION_READ, timeout);
 
@@ -189,7 +207,7 @@ i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16
     return (status < 0) ? status : I2C_STATUS_SUCCESS;
 }
 
-i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
+i2c_status_t i2c_write_register(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
     i2c_status_t status = i2c_start(devaddr | 0x00, timeout);
     if (status >= 0) {
         status = i2c_write(regaddr, timeout);
@@ -204,7 +222,7 @@ i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data,
     return status;
 }
 
-i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
+i2c_status_t i2c_write_register16(uint8_t devaddr, uint16_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
     i2c_status_t status = i2c_start(devaddr | 0x00, timeout);
     if (status >= 0) {
         status = i2c_write(regaddr >> 8, timeout);
@@ -223,7 +241,7 @@ i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, const uint8_t* da
     return status;
 }
 
-i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
+i2c_status_t i2c_read_register(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
     i2c_status_t status = i2c_start(devaddr, timeout);
     if (status < 0) {
         goto error;
@@ -256,7 +274,7 @@ i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16
     return (status < 0) ? status : I2C_STATUS_SUCCESS;
 }
 
-i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
+i2c_status_t i2c_read_register16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
     i2c_status_t status = i2c_start(devaddr, timeout);
     if (status < 0) {
         goto error;
@@ -293,7 +311,8 @@ i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uin
     return (status < 0) ? status : I2C_STATUS_SUCCESS;
 }
 
-void i2c_stop(void) {
-    // transmit STOP condition
-    TWCR = (1 << TWINT) | (1 << TWEN) | (1 << TWSTO);
-}
+__attribute__((weak)) i2c_status_t i2c_ping_address(uint8_t address, uint16_t timeout) {
+    i2c_status_t status = i2c_start(address, timeout);
+    i2c_stop();
+    return status;
+}
\ No newline at end of file
diff --git a/platforms/avr/drivers/i2c_master.h b/platforms/avr/drivers/i2c_master.h
index 04ef126c809..b797997619e 100644
--- a/platforms/avr/drivers/i2c_master.h
+++ b/platforms/avr/drivers/i2c_master.h
@@ -21,6 +21,13 @@
 
 #include <stdint.h>
 
+// ### DEPRECATED - DO NOT USE ###
+#define i2c_writeReg(devaddr, regaddr, data, length, timeout) i2c_write_register(devaddr, regaddr, data, length, timeout)
+#define i2c_writeReg16(devaddr, regaddr, data, length, timeout) i2c_write_register16(devaddr, regaddr, data, length, timeout)
+#define i2c_readReg(devaddr, regaddr, data, length, timeout) i2c_read_register(devaddr, regaddr, data, length, timeout)
+#define i2c_readReg16(devaddr, regaddr, data, length, timeout) i2c_read_register16(devaddr, regaddr, data, length, timeout)
+// ###############################
+
 #define I2C_READ 0x01
 #define I2C_WRITE 0x00
 
@@ -34,14 +41,11 @@ typedef int16_t i2c_status_t;
 #define I2C_TIMEOUT_INFINITE (0xFFFF)
 
 void         i2c_init(void);
-i2c_status_t i2c_start(uint8_t address, uint16_t timeout);
-i2c_status_t i2c_write(uint8_t data, uint16_t timeout);
-int16_t      i2c_read_ack(uint16_t timeout);
-int16_t      i2c_read_nack(uint16_t timeout);
 i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_transmit_P(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout);
 i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
-void         i2c_stop(void);
+i2c_status_t i2c_write_register(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_write_register16(uint8_t devaddr, uint16_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_read_register(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_read_register16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_ping_address(uint8_t address, uint16_t timeout);
diff --git a/platforms/avr/drivers/ps2/ps2_io.c b/platforms/avr/drivers/ps2/ps2_io.c
index b75a1ab0bec..fb874743729 100644
--- a/platforms/avr/drivers/ps2/ps2_io.c
+++ b/platforms/avr/drivers/ps2/ps2_io.c
@@ -19,18 +19,18 @@ void clock_init(void) {}
 
 void clock_lo(void) {
     // Transition from input with pull-up to output low via Hi-Z instead of output high
-    writePinLow(PS2_CLOCK_PIN);
-    setPinOutput(PS2_CLOCK_PIN);
+    gpio_write_pin_low(PS2_CLOCK_PIN);
+    gpio_set_pin_output(PS2_CLOCK_PIN);
 }
 
 void clock_hi(void) {
-    setPinInputHigh(PS2_CLOCK_PIN);
+    gpio_set_pin_input_high(PS2_CLOCK_PIN);
 }
 
 bool clock_in(void) {
-    setPinInputHigh(PS2_CLOCK_PIN);
+    gpio_set_pin_input_high(PS2_CLOCK_PIN);
     wait_us(1);
-    return readPin(PS2_CLOCK_PIN);
+    return gpio_read_pin(PS2_CLOCK_PIN);
 }
 
 /*
@@ -40,16 +40,16 @@ void data_init(void) {}
 
 void data_lo(void) {
     // Transition from input with pull-up to output low via Hi-Z instead of output high
-    writePinLow(PS2_DATA_PIN);
-    setPinOutput(PS2_DATA_PIN);
+    gpio_write_pin_low(PS2_DATA_PIN);
+    gpio_set_pin_output(PS2_DATA_PIN);
 }
 
 void data_hi(void) {
-    setPinInputHigh(PS2_DATA_PIN);
+    gpio_set_pin_input_high(PS2_DATA_PIN);
 }
 
 bool data_in(void) {
-    setPinInputHigh(PS2_DATA_PIN);
+    gpio_set_pin_input_high(PS2_DATA_PIN);
     wait_us(1);
-    return readPin(PS2_DATA_PIN);
+    return gpio_read_pin(PS2_DATA_PIN);
 }
diff --git a/platforms/avr/drivers/serial.c b/platforms/avr/drivers/serial.c
index 730d9b7a012..b529f9b45ee 100644
--- a/platforms/avr/drivers/serial.c
+++ b/platforms/avr/drivers/serial.c
@@ -239,28 +239,28 @@ inline static void serial_delay_half2(void) {
 
 inline static void serial_output(void) ALWAYS_INLINE;
 inline static void serial_output(void) {
-    setPinOutput(SOFT_SERIAL_PIN);
+    gpio_set_pin_output(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);
+    gpio_set_pin_input_high(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);
+    return !!gpio_read_pin(SOFT_SERIAL_PIN);
 }
 
 inline static void serial_low(void) ALWAYS_INLINE;
 inline static void serial_low(void) {
-    writePinLow(SOFT_SERIAL_PIN);
+    gpio_write_pin_low(SOFT_SERIAL_PIN);
 }
 
 inline static void serial_high(void) ALWAYS_INLINE;
 inline static void serial_high(void) {
-    writePinHigh(SOFT_SERIAL_PIN);
+    gpio_write_pin_high(SOFT_SERIAL_PIN);
 }
 
 void soft_serial_initiator_init(void) {
diff --git a/platforms/avr/drivers/spi_master.c b/platforms/avr/drivers/spi_master.c
index ae9df03c02d..74b847c71a2 100644
--- a/platforms/avr/drivers/spi_master.c
+++ b/platforms/avr/drivers/spi_master.c
@@ -41,10 +41,10 @@ static uint8_t currentSlaveConfig = 0;
 static bool    currentSlave2X     = false;
 
 void spi_init(void) {
-    writePinHigh(SPI_SS_PIN);
-    setPinOutput(SPI_SCK_PIN);
-    setPinOutput(SPI_MOSI_PIN);
-    setPinInput(SPI_MISO_PIN);
+    gpio_write_pin_high(SPI_SS_PIN);
+    gpio_set_pin_output(SPI_SCK_PIN);
+    gpio_set_pin_output(SPI_MOSI_PIN);
+    gpio_set_pin_input(SPI_MISO_PIN);
 
     SPCR = (_BV(SPE) | _BV(MSTR));
 }
@@ -105,8 +105,8 @@ bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
         SPSR |= _BV(SPI2X);
     }
     currentSlavePin = slavePin;
-    setPinOutput(currentSlavePin);
-    writePinLow(currentSlavePin);
+    gpio_set_pin_output(currentSlavePin);
+    gpio_write_pin_low(currentSlavePin);
 
     return true;
 }
@@ -169,8 +169,8 @@ spi_status_t spi_receive(uint8_t *data, uint16_t length) {
 
 void spi_stop(void) {
     if (currentSlavePin != NO_PIN) {
-        setPinOutput(currentSlavePin);
-        writePinHigh(currentSlavePin);
+        gpio_set_pin_output(currentSlavePin);
+        gpio_write_pin_high(currentSlavePin);
         currentSlavePin = NO_PIN;
         SPSR &= ~(_BV(SPI2X));
         SPCR &= ~(currentSlaveConfig);
diff --git a/platforms/avr/gpio.h b/platforms/avr/gpio.h
index 95f15c28dcd..6f089bc6638 100644
--- a/platforms/avr/gpio.h
+++ b/platforms/avr/gpio.h
@@ -22,17 +22,17 @@ typedef uint8_t pin_t;
 
 /* Operation of GPIO by pin. */
 
-#define setPinInput(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
-#define setPinInputHigh(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
-#define setPinInputLow(pin) _Static_assert(0, "AVR processors cannot implement an input as pull low")
-#define setPinOutputPushPull(pin) (DDRx_ADDRESS(pin) |= _BV((pin)&0xF))
-#define setPinOutputOpenDrain(pin) _Static_assert(0, "AVR platform does not implement an open-drain output")
-#define setPinOutput(pin) setPinOutputPushPull(pin)
+#define gpio_set_pin_input(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
+#define gpio_set_pin_input_high(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
+#define gpio_set_pin_input_low(pin) _Static_assert(0, "GPIO pulldowns in input mode are not available on AVR")
+#define gpio_set_pin_output_push_pull(pin) (DDRx_ADDRESS(pin) |= _BV((pin)&0xF))
+#define gpio_set_pin_output_open_drain(pin) _Static_assert(0, "Open-drain outputs are not available on AVR")
+#define gpio_set_pin_output(pin) gpio_set_pin_output_push_pull(pin)
 
-#define writePinHigh(pin) (PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
-#define writePinLow(pin) (PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
-#define writePin(pin, level) ((level) ? writePinHigh(pin) : writePinLow(pin))
+#define gpio_write_pin_high(pin) (PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
+#define gpio_write_pin_low(pin) (PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
+#define gpio_write_pin(pin, level) ((level) ? gpio_write_pin_high(pin) : gpio_write_pin_low(pin))
 
-#define readPin(pin) ((bool)(PINx_ADDRESS(pin) & _BV((pin)&0xF)))
+#define gpio_read_pin(pin) ((bool)(PINx_ADDRESS(pin) & _BV((pin)&0xF)))
 
-#define togglePin(pin) (PORTx_ADDRESS(pin) ^= _BV((pin)&0xF))
+#define gpio_toggle_pin(pin) (PORTx_ADDRESS(pin) ^= _BV((pin)&0xF))
diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk
index aef449cadf7..a625f2e5d01 100644
--- a/platforms/avr/platform.mk
+++ b/platforms/avr/platform.mk
@@ -201,17 +201,17 @@ else ifeq ($(strip $(BOOTLOADER)), qmk-hid)
 QMK_BOOTLOADER_TYPE = HID
 endif
 
-bootloader:
+bootloader: cpfirmware
 ifeq ($(strip $(QMK_BOOTLOADER_TYPE)),)
 	$(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
+	make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ clean TARGET=Bootloader$(QMK_BOOTLOADER_TYPE)
 	$(QMK_BIN) generate-dfu-header --quiet --keyboard $(KEYBOARD) --output lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/Keyboard.h
 	$(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 PROGRAM_SIZE_KB=$(shell n=`expr $(MAX_SIZE) / 1024` && echo $$(($$n)) || echo 0))
 	$(eval BOOT_SECTION_SIZE_KB=$(shell n=`expr  $(BOOTLOADER_SIZE) / 1024` && echo $$(($$n)) || echo 0))
 	$(eval FLASH_SIZE_KB=$(shell n=`expr $(PROGRAM_SIZE_KB) + $(BOOT_SECTION_SIZE_KB)` && echo $$(($$n)) || echo 0))
-	make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ MCU=$(MCU) ARCH=$(ARCH) F_CPU=$(F_CPU) FLASH_SIZE_KB=$(FLASH_SIZE_KB) BOOT_SECTION_SIZE_KB=$(BOOT_SECTION_SIZE_KB)
+	make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ MCU=$(MCU) ARCH=$(ARCH) F_CPU=$(F_CPU) FLASH_SIZE_KB=$(FLASH_SIZE_KB) BOOT_SECTION_SIZE_KB=$(BOOT_SECTION_SIZE_KB) TARGET=Bootloader$(QMK_BOOTLOADER_TYPE)
 	printf "Bootloader$(QMK_BOOTLOADER_TYPE).hex copied to $(TARGET)_bootloader.hex\n"
 	cp lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/Bootloader$(QMK_BOOTLOADER_TYPE).hex $(TARGET)_bootloader.hex
 endif
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
index 9209e99e760..73c2b40f469 100644
--- a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
@@ -1,4 +1,4 @@
-// Copyright 2022 Stefan Kerkmann
+// Copyright 2024 Stefan Kerkmann
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
@@ -55,8 +55,32 @@
 #    define SERIAL_USART_RX_PIN GP1
 #endif
 
+/**======================
+ **      UART Driver
+ *========================**/
+
+#if !defined(UART_DRIVER)
+#    define UART_DRIVER SIOD0
+#endif
+
+#if !defined(UART_TX_PIN)
+#    define UART_TX_PIN GP0
+#endif
+
+#if !defined(UART_RX_PIN)
+#    define UART_RX_PIN GP1
+#endif
+
+#if !defined(UART_CTS_PIN)
+#    define UART_CTS_PIN GP2
+#endif
+
+#if !defined(UART_RTS_PIN)
+#    define UART_RTS_PIN GP3
+#endif
+
 /**======================
  **    Double-tap
  *========================**/
 
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET 
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
diff --git a/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/hal_lld.h b/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/hal_lld.h
new file mode 100644
index 00000000000..15d7fbec0b4
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/hal_lld.h
@@ -0,0 +1,8 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+// TODO: Remove when upstream no longer requires patching
+#include <stm32_registry.h>
+
+#include_next <hal_lld.h>
diff --git a/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/stm32_registry.h b/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/stm32_registry.h
new file mode 100644
index 00000000000..766df5a78ee
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/stm32_registry.h
@@ -0,0 +1,14 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+// TODO: Remove when STM32_FLASH_SECTORS_PER_BANK fixed upstream
+#ifndef STM32_FLASH_SECTORS_PER_BANK
+#    define STM32_FLASH_SECTORS_PER_BANK 64
+#endif
+
+#include_next <stm32_registry.h>
+
+// TODO: Remove when STM32_FLASH_NUMBER_OF_BANKS fixed upstream
+#undef STM32_FLASH_NUMBER_OF_BANKS
+#define STM32_FLASH_NUMBER_OF_BANKS 1
diff --git a/platforms/chibios/boards/QMK_BLOK/configs/config.h b/platforms/chibios/boards/QMK_BLOK/configs/config.h
index 168afb1fc46..834dc497d3b 100644
--- a/platforms/chibios/boards/QMK_BLOK/configs/config.h
+++ b/platforms/chibios/boards/QMK_BLOK/configs/config.h
@@ -3,6 +3,10 @@
 
 #pragma once
 
+/**======================
+ **    I2C Driver
+ *========================**/
+
 #ifndef I2C_DRIVER
 #    define I2C_DRIVER I2CD0
 #endif
@@ -13,6 +17,26 @@
 #    define I2C1_SCL_PIN D0
 #endif
 
+/**======================
+ **      UART Driver
+ *========================**/
+
+#ifndef UART_DRIVER
+#    define UART_DRIVER SIOD0
+#endif
+
+#ifndef UART_TX_PIN
+#    define UART_TX_PIN D3
+#endif
+
+#ifndef UART_RX_PIN
+#    define UART_RX_PIN D2
+#endif
+
+/**======================
+ **    Double-tap
+ *========================**/
+
 #ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #    define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #endif
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/config.h b/platforms/chibios/boards/QMK_PM2040/configs/config.h
index ec85ae0cf40..f8b46b7fe45 100644
--- a/platforms/chibios/boards/QMK_PM2040/configs/config.h
+++ b/platforms/chibios/boards/QMK_PM2040/configs/config.h
@@ -3,6 +3,10 @@
 
 #pragma once
 
+/**======================
+ **    I2C Driver
+ *========================**/
+
 #ifndef I2C_DRIVER
 #    define I2C_DRIVER I2CD1
 #endif
@@ -13,6 +17,26 @@
 #    define I2C1_SCL_PIN D0
 #endif
 
+/**======================
+ **      UART Driver
+ *========================**/
+
+#ifndef UART_DRIVER
+#    define UART_DRIVER SIOD0
+#endif
+
+#ifndef UART_TX_PIN
+#    define UART_TX_PIN D3
+#endif
+
+#ifndef UART_RX_PIN
+#    define UART_RX_PIN D2
+#endif
+
+/**======================
+ **    Double-tap
+ *========================**/
+
 #ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #    define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #endif
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index f1636f9da05..8f46fe07360 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -69,6 +69,20 @@
 #    ifndef SPI_MISO_PAL_MODE
 #        define SPI_MISO_PAL_MODE (PAL_MODE_ALTERNATE_SPI | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_DRIVE4)
 #    endif
+
+#    ifndef UART_TX_PAL_MODE
+#        define UART_TX_PAL_MODE PAL_MODE_ALTERNATE_UART
+#    endif
+#    ifndef UART_RX_PAL_MODE
+#        define UART_RX_PAL_MODE PAL_MODE_ALTERNATE_UART
+#    endif
+#    ifndef UART_CTS_PAL_MODE
+#        define UART_CTS_PAL_MODE PAL_MODE_ALTERNATE_UART
+#    endif
+#    ifndef UART_RTS_PAL_MODE
+#        define UART_RTS_PAL_MODE PAL_MODE_ALTERNATE_UART
+#    endif
+
 #endif
 
 // STM32 compatibility
@@ -94,6 +108,11 @@
 #    if defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) || defined(STM32L1XX)
 #        define USE_I2CV1
 #    endif
+
+#    if defined(STM32G0XX) || defined(STM32G4XX) || defined(STM32L5XX) || defined(STM32H7XX)
+#        define USE_USARTV3
+#    endif
+
 #endif
 
 // GD32 compatibility
diff --git a/platforms/chibios/converters/promicro_to_imera/_pin_defs.h b/platforms/chibios/converters/promicro_to_imera/_pin_defs.h
new file mode 100644
index 00000000000..475a84d6975
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_imera/_pin_defs.h
@@ -0,0 +1,36 @@
+// Copyright 2023 splitkb.com
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Left side (front)
+#define D3 0U
+#define D2 1U
+//      GND
+//      GND
+#define D1 2U
+#define D0 3U
+#define D4 4U
+#define C6 5U
+#define D7 6U
+#define E6 7U
+#define B4 8U
+#define B5 9U
+
+// Right side (front)
+//      RAW
+//      GND
+//      RESET
+//      VCC
+#define F4 29U
+#define F5 28U
+#define F6 17U
+#define F7 16U
+#define B1 22U
+#define B3 20U
+#define B2 23U
+#define B6 21U
+
+// LEDs
+#define D5 24U // Power LED, default-on
+#define B0 18U // Unconnected
diff --git a/platforms/chibios/converters/promicro_to_imera/converter.mk b/platforms/chibios/converters/promicro_to_imera/converter.mk
new file mode 100644
index 00000000000..bfca20cd993
--- /dev/null
+++ b/platforms/chibios/converters/promicro_to_imera/converter.mk
@@ -0,0 +1,10 @@
+# rp2040_ce MCU settings for converting AVR projects
+MCU := RP2040
+BOARD := QMK_PM2040
+BOOTLOADER := rp2040
+
+# These are defaults based on what has been implemented for RP2040 boards
+SERIAL_DRIVER ?= vendor
+WS2812_DRIVER ?= vendor
+BACKLIGHT_DRIVER ?= software
+OPT_DEFS += -DUSB_VBUS_PIN=19U
diff --git a/platforms/chibios/drivers/analog.c b/platforms/chibios/drivers/analog.c
index bf84ce8f763..fb146df9367 100644
--- a/platforms/chibios/drivers/analog.c
+++ b/platforms/chibios/drivers/analog.c
@@ -31,7 +31,15 @@
 #endif
 
 #if STM32_ADCV3_OVERSAMPLING
-#    error "STM32 ADCV3 Oversampling is not supported at this time."
+// Apparently all ADCV3 chips that support oversampling (STM32L4xx, STM32L4xx+,
+// STM32G4xx, STM32WB[35]x) have errata like “Wrong ADC result if conversion
+// done late after calibration or previous conversion”; the workaround is to
+// perform a dummy conversion and discard its result.  STM32G4xx chips also
+// have the “ADC channel 0 converted instead of the required ADC channel”
+// errata, one workaround for which is also to perform a dummy conversion.
+#    define ADC_DUMMY_CONVERSIONS_AT_START 1
+#else
+#    define ADC_DUMMY_CONVERSIONS_AT_START 0
 #endif
 
 // Otherwise assume V3
@@ -76,8 +84,10 @@
 #ifndef ADC_COUNT
 #    if defined(RP2040) || defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F4XX) || defined(GD32VF103) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
 #        define ADC_COUNT 1
-#    elif defined(STM32F3XX)
+#    elif defined(STM32F3XX) || defined(STM32G4XX)
 #        define ADC_COUNT 4
+#    elif defined(STM32L4XX)
+#        define ADC_COUNT 3
 #    else
 #        error "ADC_COUNT has not been set for this ARM microcontroller."
 #    endif
@@ -89,13 +99,24 @@
 #    error "The ARM ADC implementation currently only supports reading one channel at a time."
 #endif
 
+// Add dummy conversions as extra channels (this would work only on chips that
+// have multiple channel index fields instead of a channel mask, but all chips
+// that need that workaround are like that).
+#define ADC_TOTAL_CHANNELS (ADC_DUMMY_CONVERSIONS_AT_START + ADC_NUM_CHANNELS)
+
 #ifndef ADC_BUFFER_DEPTH
 #    define ADC_BUFFER_DEPTH 1
 #endif
 
 // For more sampling rate options, look at hal_adc_lld.h in ChibiOS
-#ifndef ADC_SAMPLING_RATE
-#    define ADC_SAMPLING_RATE ADC_SMPR_SMP_1P5
+#if !defined(ADC_SAMPLING_RATE) && !defined(RP2040)
+#    if defined(ADC_SMPR_SMP_1P5)
+#        define ADC_SAMPLING_RATE ADC_SMPR_SMP_1P5
+#    elif defined(ADC_SMPR_SMP_2P5) // STM32L4XX, STM32L4XXP, STM32G4XX, STM32WBXX
+#        define ADC_SAMPLING_RATE ADC_SMPR_SMP_2P5
+#    else
+#        error "Cannot determine the default ADC_SAMPLING_RATE for this MCU."
+#    endif
 #endif
 
 // Options are 12, 10, 8, and 6 bit.
@@ -108,7 +129,7 @@
 #endif
 
 static ADCConfig   adcCfg = {};
-static adcsample_t sampleBuffer[ADC_NUM_CHANNELS * ADC_BUFFER_DEPTH];
+static adcsample_t sampleBuffer[ADC_TOTAL_CHANNELS * ADC_BUFFER_DEPTH];
 
 // Initialize to max number of ADCs, set to empty object to initialize all to false.
 static bool adcInitialized[ADC_COUNT] = {};
@@ -116,7 +137,7 @@ static bool adcInitialized[ADC_COUNT] = {};
 // TODO: add back TR handling???
 static ADCConversionGroup adcConversionGroup = {
     .circular     = FALSE,
-    .num_channels = (uint16_t)(ADC_NUM_CHANNELS),
+    .num_channels = (uint16_t)(ADC_TOTAL_CHANNELS),
 #if defined(USE_ADCV1)
     .cfgr1 = ADC_CFGR1_CONT | ADC_RESOLUTION,
     .smpr  = ADC_SAMPLING_RATE,
@@ -240,6 +261,74 @@ __attribute__((weak)) adc_mux pinToMux(pin_t pin) {
         case C5:  return TO_MUX( ADC_CHANNEL_IN15, 0 );
         // STM32F103x[C-G] in 144-pin packages also have analog inputs on F6...F10, but they are on ADC3, and the
         // ChibiOS ADC driver for STM32F1xx currently supports only ADC1, therefore these pins are not usable.
+#elif defined(STM32L4XX)
+        case A0: return TO_MUX( ADC_CHANNEL_IN5,  0 ); // Can also be ADC2 in some cases
+        case A1: return TO_MUX( ADC_CHANNEL_IN6,  0 ); // Can also be ADC2 in some cases
+        case A2: return TO_MUX( ADC_CHANNEL_IN7,  0 ); // Can also be ADC2
+        case A3: return TO_MUX( ADC_CHANNEL_IN8,  0 ); // Can also be ADC2
+        case A4: return TO_MUX( ADC_CHANNEL_IN9,  0 ); // Can also be ADC2
+        case A5: return TO_MUX( ADC_CHANNEL_IN10, 0 ); // Can also be ADC2
+        case A6: return TO_MUX( ADC_CHANNEL_IN11, 0 ); // Can also be ADC2
+        case A7: return TO_MUX( ADC_CHANNEL_IN12, 0 ); // Can also be ADC2
+        case B0: return TO_MUX( ADC_CHANNEL_IN15, 0 ); // Can also be ADC2
+        case B1: return TO_MUX( ADC_CHANNEL_IN16, 0 ); // Can also be ADC2
+        case C0: return TO_MUX( ADC_CHANNEL_IN1,  0 ); // Can also be ADC2 or ADC3
+        case C1: return TO_MUX( ADC_CHANNEL_IN2,  0 ); // Can also be ADC2 or ADC3
+        case C2: return TO_MUX( ADC_CHANNEL_IN3,  0 ); // Can also be ADC2 or ADC3
+        case C3: return TO_MUX( ADC_CHANNEL_IN4,  0 ); // Can also be ADC2 or ADC3
+        case C4: return TO_MUX( ADC_CHANNEL_IN13, 0 ); // Can also be ADC2
+        case C5: return TO_MUX( ADC_CHANNEL_IN14, 0 ); // Can also be ADC2
+#    if STM32_HAS_GPIOF && STM32_ADC_USE_ADC3
+        case F3:  return TO_MUX( ADC_CHANNEL_IN6,  2 );
+        case F4:  return TO_MUX( ADC_CHANNEL_IN7,  2 );
+        case F5:  return TO_MUX( ADC_CHANNEL_IN8,  2 );
+        case F6:  return TO_MUX( ADC_CHANNEL_IN9,  2 );
+        case F7:  return TO_MUX( ADC_CHANNEL_IN10, 2 );
+        case F8:  return TO_MUX( ADC_CHANNEL_IN11, 2 );
+        case F9:  return TO_MUX( ADC_CHANNEL_IN12, 2 );
+        case F10: return TO_MUX( ADC_CHANNEL_IN13, 2 );
+#    endif
+#elif defined(STM32G4XX)
+        case A0:  return TO_MUX( ADC_CHANNEL_IN1,  0 ); // Can also be ADC2
+        case A1:  return TO_MUX( ADC_CHANNEL_IN2,  0 ); // Can also be ADC2
+        case A2:  return TO_MUX( ADC_CHANNEL_IN3,  0 );
+        case A3:  return TO_MUX( ADC_CHANNEL_IN4,  0 );
+        case A4:  return TO_MUX( ADC_CHANNEL_IN17, 1 );
+        case A5:  return TO_MUX( ADC_CHANNEL_IN13, 1 );
+        case A6:  return TO_MUX( ADC_CHANNEL_IN3,  1 );
+        case A7:  return TO_MUX( ADC_CHANNEL_IN4,  1 );
+        case B0:  return TO_MUX( ADC_CHANNEL_IN15, 0 ); // Can also be ADC3
+        case B1:  return TO_MUX( ADC_CHANNEL_IN12, 0 ); // Can also be ADC3
+        case B2:  return TO_MUX( ADC_CHANNEL_IN12, 1 );
+        case B11: return TO_MUX( ADC_CHANNEL_IN14, 0 ); // Can also be ADC2
+        case B12: return TO_MUX( ADC_CHANNEL_IN11, 0 ); // Can also be ADC4
+        case B13: return TO_MUX( ADC_CHANNEL_IN5,  2 );
+        case B14: return TO_MUX( ADC_CHANNEL_IN5,  0 ); // Can also be ADC4
+        case B15: return TO_MUX( ADC_CHANNEL_IN15, 1 ); // Can also be ADC4
+        case C0:  return TO_MUX( ADC_CHANNEL_IN6,  0 ); // Can also be ADC2
+        case C1:  return TO_MUX( ADC_CHANNEL_IN7,  0 ); // Can also be ADC2
+        case C2:  return TO_MUX( ADC_CHANNEL_IN8,  0 ); // Can also be ADC2
+        case C3:  return TO_MUX( ADC_CHANNEL_IN9,  0 ); // Can also be ADC2
+        case C4:  return TO_MUX( ADC_CHANNEL_IN5,  1 );
+        case C5:  return TO_MUX( ADC_CHANNEL_IN11, 1 );
+        case D8:  return TO_MUX( ADC_CHANNEL_IN12, 3 );
+        case D9:  return TO_MUX( ADC_CHANNEL_IN13, 3 );
+        case D10: return TO_MUX( ADC_CHANNEL_IN7,  2 ); // Can also be ADC4
+        case D11: return TO_MUX( ADC_CHANNEL_IN8,  2 ); // Can also be ADC4
+        case D12: return TO_MUX( ADC_CHANNEL_IN9,  2 ); // Can also be ADC4
+        case D13: return TO_MUX( ADC_CHANNEL_IN10, 2 ); // Can also be ADC4
+        case D14: return TO_MUX( ADC_CHANNEL_IN11, 2 ); // Can also be ADC4
+        case E5:  return TO_MUX( ADC_CHANNEL_IN2,  3 );
+        case E7:  return TO_MUX( ADC_CHANNEL_IN4,  2 );
+        case E8:  return TO_MUX( ADC_CHANNEL_IN6,  2 ); // Can also be ADC4
+        case E9:  return TO_MUX( ADC_CHANNEL_IN2,  2 );
+        case E10: return TO_MUX( ADC_CHANNEL_IN14, 2 ); // Can also be ADC4
+        case E11: return TO_MUX( ADC_CHANNEL_IN15, 2 ); // Can also be ADC4
+        case E12: return TO_MUX( ADC_CHANNEL_IN16, 2 ); // Can also be ADC4
+        case E13: return TO_MUX( ADC_CHANNEL_IN3,  2 );
+        case E14: return TO_MUX( ADC_CHANNEL_IN1,  3 );
+        case F0:  return TO_MUX( ADC_CHANNEL_IN10, 0 );
+        case F1:  return TO_MUX( ADC_CHANNEL_IN10, 1 );
 #elif defined(RP2040)
         case 26U: return TO_MUX(0, 0);
         case 27U: return TO_MUX(1, 0);
@@ -306,7 +395,11 @@ int16_t adc_read(adc_mux mux) {
 #elif defined(RP2040)
     adcConversionGroup.channel_mask = 1 << mux.input;
 #else
-    adcConversionGroup.sqr[0] = ADC_SQR1_SQ1_N(mux.input);
+    adcConversionGroup.sqr[0] = ADC_SQR1_SQ1_N(mux.input)
+#    if ADC_DUMMY_CONVERSIONS_AT_START >= 1
+                                | ADC_SQR1_SQ2_N(mux.input)
+#    endif
+        ;
 #endif
 
     ADCDriver* targetDriver = intToADCDriver(mux.adc);
@@ -321,9 +414,9 @@ int16_t adc_read(adc_mux mux) {
 
 #if defined(USE_ADCV2) || defined(RP2040)
     // fake 12-bit -> N-bit scale
-    return (*sampleBuffer) >> (12 - ADC_RESOLUTION);
+    return (sampleBuffer[ADC_DUMMY_CONVERSIONS_AT_START]) >> (12 - ADC_RESOLUTION);
 #else
     // already handled as part of adcConvert
-    return *sampleBuffer;
+    return sampleBuffer[ADC_DUMMY_CONVERSIONS_AT_START];
 #endif
 }
diff --git a/platforms/chibios/drivers/audio_dac.h b/platforms/chibios/drivers/audio_dac.h
index 07cd622ead2..2f62d12934b 100644
--- a/platforms/chibios/drivers/audio_dac.h
+++ b/platforms/chibios/drivers/audio_dac.h
@@ -23,11 +23,6 @@
 #    define A5 PAL_LINE(GPIOA, 5)
 #endif
 
-/**
- * Size of the dac_buffer arrays. All must be the same size.
- */
-#define AUDIO_DAC_BUFFER_SIZE 256U
-
 /**
  * Highest value allowed sample value.
 
@@ -96,6 +91,35 @@
 #    define AUDIO_DAC_SAMPLE_RATE 44100U
 #endif
 
+/**
+ * Size of the dac_buffer array. This controls the length of the runtime buffer
+ * which accumulates the data to be sent to the DAC every few milliseconds, and
+ * it does not need to correspond to the length of the wavetable for the chosen
+ * waveform defined by AUDIO_DAC_SAMPLE_WAVEFORM_* in the additive DAC driver.
+ * By default, this is set to be as close to 3.3 ms as possible, giving 300 DAC
+ * interrupts per second. Any smaller and the interrupt load gets too heavy and
+ * this results in crackling due to buffer underrun in the additive DAC driver;
+ * too large and the RAM (additive driver) or flash (basic driver) usage may be
+ * too high, causing build failures, and matrix scanning is liable to have long
+ * periodic pauses that delay key presses or releases or fully lose short taps.
+ * Large buffers also cause notes to take longer to stop after they should from
+ * music mode or MIDI input.
+ * This should be a power of 2 for maximum compatibility.
+ */
+#ifndef AUDIO_DAC_BUFFER_SIZE
+#    if AUDIO_DAC_SAMPLE_RATE < 5100U
+#        define AUDIO_DAC_BUFFER_SIZE 16U
+#    elif AUDIO_DAC_SAMPLE_RATE < 9900U
+#        define AUDIO_DAC_BUFFER_SIZE 32U
+#    elif AUDIO_DAC_SAMPLE_RATE < 19500U
+#        define AUDIO_DAC_BUFFER_SIZE 64U
+#    elif AUDIO_DAC_SAMPLE_RATE < 38700U
+#        define AUDIO_DAC_BUFFER_SIZE 128U
+#    else
+#        define AUDIO_DAC_BUFFER_SIZE 256U
+#    endif
+#endif
+
 /**
  * The number of tones that can be played simultaneously. If too high a value
  * is used here, the keyboard will freeze and glitch-out when that many tones
diff --git a/platforms/chibios/drivers/audio_dac_additive.c b/platforms/chibios/drivers/audio_dac_additive.c
index 26e044b0487..d6fde42b68f 100644
--- a/platforms/chibios/drivers/audio_dac_additive.c
+++ b/platforms/chibios/drivers/audio_dac_additive.c
@@ -53,35 +53,39 @@
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_SINE
 /* one full sine wave over [0,2*pi], but shifted up one amplitude and left pi/4; for the samples to start at 0
  */
-static const dacsample_t dac_buffer_sine[AUDIO_DAC_BUFFER_SIZE] = {
+static const dacsample_t dac_buffer_sine[] = {
     // 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};
+    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
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_TRIANGLE
-static const dacsample_t dac_buffer_triangle[AUDIO_DAC_BUFFER_SIZE] = {
+static const dacsample_t dac_buffer_triangle[] = {
     // 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};
+    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
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
-static const dacsample_t dac_buffer_square[AUDIO_DAC_BUFFER_SIZE] = {
-    [0 ... AUDIO_DAC_BUFFER_SIZE / 2 - 1]                     = AUDIO_DAC_OFF_VALUE,  // first and
-    [AUDIO_DAC_BUFFER_SIZE / 2 ... AUDIO_DAC_BUFFER_SIZE - 1] = AUDIO_DAC_SAMPLE_MAX, // second half
+static const dacsample_t dac_buffer_square[] = {
+    AUDIO_DAC_OFF_VALUE,  // first and
+    AUDIO_DAC_SAMPLE_MAX, // second steps
 };
 #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] = {
-    [0 ... AUDIO_DAC_BUFFER_SIZE/3 -1 ]                               = 0,
-    [AUDIO_DAC_BUFFER_SIZE / 4 ... AUDIO_DAC_BUFFER_SIZE / 2 -1 ]     = AUDIO_DAC_SAMPLE_MAX / 3,
-    [AUDIO_DAC_BUFFER_SIZE / 2 ... 3 * AUDIO_DAC_BUFFER_SIZE / 4 -1 ] = 2 * AUDIO_DAC_SAMPLE_MAX / 3,
-    [3 * AUDIO_DAC_BUFFER_SIZE / 4 ... AUDIO_DAC_BUFFER_SIZE -1 ]     = AUDIO_DAC_SAMPLE_MAX,
+static const dacsample_t dac_buffer_staircase[] = {
+    0,
+    AUDIO_DAC_SAMPLE_MAX / 3,
+    2 * AUDIO_DAC_SAMPLE_MAX / 3,
+    AUDIO_DAC_SAMPLE_MAX,
 }
 */
 #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};
+static const dacsample_t dac_buffer_trapezoid[] = {
+    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
 
 static dacsample_t dac_buffer[AUDIO_DAC_BUFFER_SIZE];
@@ -124,20 +128,30 @@ __attribute__((weak)) uint16_t dac_value_generate(void) {
     uint_fast16_t value     = 0;
     float         frequency = 0.0f;
 
+#if defined(AUDIO_DAC_SAMPLE_WAVEFORM_SINE)
+    const size_t wavetable_length = ARRAY_SIZE(dac_buffer_sine);
+#elif defined(AUDIO_DAC_SAMPLE_WAVEFORM_TRIANGLE)
+    const size_t wavetable_length = ARRAY_SIZE(dac_buffer_triangle);
+#elif defined(AUDIO_DAC_SAMPLE_WAVEFORM_TRAPEZOID)
+    const size_t wavetable_length = ARRAY_SIZE(dac_buffer_trapezoid);
+#elif defined(AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE)
+    const size_t wavetable_length = ARRAY_SIZE(dac_buffer_square);
+#endif
+
     for (size_t i = 0; i < active_tones_snapshot_length; i++) {
         /* Note: a user implementation does not have to rely on the active_tones_snapshot, but
          * could directly query the active frequencies through audio_get_processed_frequency */
         frequency = active_tones_snapshot[i];
 
         float new_dac_if = dac_if[i];
-        new_dac_if += frequency * ((float)AUDIO_DAC_BUFFER_SIZE / AUDIO_DAC_SAMPLE_RATE * 2.0f / 3.0f);
+        new_dac_if += frequency * ((float)wavetable_length / AUDIO_DAC_SAMPLE_RATE * 2.0f / 3.0f);
         /*Note: the 2/3 are necessary to get the correct frequencies on the
          *      DAC output (as measured with an oscilloscope), since the gpt
          *      timer runs with 3*AUDIO_DAC_SAMPLE_RATE; and the DAC callback
          *      is called twice per conversion.*/
 
-        while (new_dac_if >= AUDIO_DAC_BUFFER_SIZE)
-            new_dac_if -= AUDIO_DAC_BUFFER_SIZE;
+        while (new_dac_if >= wavetable_length)
+            new_dac_if -= wavetable_length;
         dac_if[i] = new_dac_if;
 
         // Wavetable generation/lookup
diff --git a/platforms/chibios/drivers/audio_pwm_hardware.c b/platforms/chibios/drivers/audio_pwm_hardware.c
index 40d891326fd..21b5c6892cd 100644
--- a/platforms/chibios/drivers/audio_pwm_hardware.c
+++ b/platforms/chibios/drivers/audio_pwm_hardware.c
@@ -22,6 +22,12 @@
 #    define AUDIO_PWM_COUNTER_FREQUENCY 100000
 #endif
 
+#ifndef AUDIO_PWM_COMPLEMENTARY_OUTPUT
+#    define AUDIO_PWM_OUTPUT_MODE PWM_OUTPUT_ACTIVE_HIGH
+#else
+#    define AUDIO_PWM_OUTPUT_MODE PWM_COMPLEMENTARY_OUTPUT_ACTIVE_HIGH
+#endif
+
 extern bool    playing_note;
 extern bool    playing_melody;
 extern uint8_t note_timbre;
@@ -29,7 +35,7 @@ extern uint8_t note_timbre;
 static PWMConfig pwmCFG = {.frequency = AUDIO_PWM_COUNTER_FREQUENCY, /* PWM clock frequency  */
                            .period    = 2,
                            .callback  = NULL,
-                           .channels  = {[(AUDIO_PWM_CHANNEL - 1)] = {.mode = PWM_OUTPUT_ACTIVE_HIGH, .callback = NULL}}};
+                           .channels  = {[(AUDIO_PWM_CHANNEL - 1)] = {.mode = AUDIO_PWM_OUTPUT_MODE, .callback = NULL}}};
 
 static float channel_1_frequency = 0.0f;
 
diff --git a/platforms/chibios/drivers/i2c_master.c b/platforms/chibios/drivers/i2c_master.c
index 7c49f9d0059..ad11d850dd7 100644
--- a/platforms/chibios/drivers/i2c_master.c
+++ b/platforms/chibios/drivers/i2c_master.c
@@ -1,5 +1,6 @@
 /* Copyright 2018 Jack Humbert
  * Copyright 2018 Yiancar
+ * Copyright 2023 customMK
  *
  * 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
@@ -90,8 +91,6 @@
 #    endif
 #endif
 
-static uint8_t i2c_address;
-
 static const I2CConfig i2cconfig = {
 #if defined(USE_I2CV1_CONTRIB)
     I2C1_CLOCK_SPEED,
@@ -125,7 +124,7 @@ static i2c_status_t i2c_epilogue(const msg_t status) {
     // From ChibiOS HAL: "After a timeout the driver must be stopped and
     // restarted because the bus is in an uncertain state." We also issue that
     // hard stop in case of any error.
-    i2c_stop();
+    i2cStop(&I2C_DRIVER);
 
     return status == MSG_TIMEOUT ? I2C_STATUS_TIMEOUT : I2C_STATUS_ERROR;
 }
@@ -150,28 +149,19 @@ __attribute__((weak)) void i2c_init(void) {
     }
 }
 
-i2c_status_t i2c_start(uint8_t address) {
-    i2c_address = address;
-    i2cStart(&I2C_DRIVER, &i2cconfig);
-    return I2C_STATUS_SUCCESS;
-}
-
 i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout) {
-    i2c_address = address;
     i2cStart(&I2C_DRIVER, &i2cconfig);
-    msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, 0, 0, TIME_MS2I(timeout));
+    msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (address >> 1), data, length, 0, 0, TIME_MS2I(timeout));
     return i2c_epilogue(status);
 }
 
 i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout) {
-    i2c_address = address;
     i2cStart(&I2C_DRIVER, &i2cconfig);
-    msg_t status = i2cMasterReceiveTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, TIME_MS2I(timeout));
+    msg_t status = i2cMasterReceiveTimeout(&I2C_DRIVER, (address >> 1), data, length, TIME_MS2I(timeout));
     return i2c_epilogue(status);
 }
 
-i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
-    i2c_address = devaddr;
+i2c_status_t i2c_write_register(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
     i2cStart(&I2C_DRIVER, &i2cconfig);
 
     uint8_t complete_packet[length + 1];
@@ -180,12 +170,11 @@ i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data,
     }
     complete_packet[0] = regaddr;
 
-    msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), complete_packet, length + 1, 0, 0, TIME_MS2I(timeout));
+    msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (devaddr >> 1), complete_packet, length + 1, 0, 0, TIME_MS2I(timeout));
     return i2c_epilogue(status);
 }
 
-i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
-    i2c_address = devaddr;
+i2c_status_t i2c_write_register16(uint8_t devaddr, uint16_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
     i2cStart(&I2C_DRIVER, &i2cconfig);
 
     uint8_t complete_packet[length + 2];
@@ -195,25 +184,27 @@ i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, const uint8_t* da
     complete_packet[0] = regaddr >> 8;
     complete_packet[1] = regaddr & 0xFF;
 
-    msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), complete_packet, length + 2, 0, 0, TIME_MS2I(timeout));
+    msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (devaddr >> 1), complete_packet, length + 2, 0, 0, TIME_MS2I(timeout));
     return i2c_epilogue(status);
 }
 
-i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
-    i2c_address = devaddr;
+i2c_status_t i2c_read_register(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
     i2cStart(&I2C_DRIVER, &i2cconfig);
-    msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), &regaddr, 1, data, length, TIME_MS2I(timeout));
+    msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (devaddr >> 1), &regaddr, 1, data, length, TIME_MS2I(timeout));
     return i2c_epilogue(status);
 }
 
-i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
-    i2c_address = devaddr;
+i2c_status_t i2c_read_register16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) {
     i2cStart(&I2C_DRIVER, &i2cconfig);
     uint8_t register_packet[2] = {regaddr >> 8, regaddr & 0xFF};
-    msg_t   status             = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), register_packet, 2, data, length, TIME_MS2I(timeout));
+    msg_t   status             = i2cMasterTransmitTimeout(&I2C_DRIVER, (devaddr >> 1), register_packet, 2, data, length, TIME_MS2I(timeout));
     return i2c_epilogue(status);
 }
 
-void i2c_stop(void) {
-    i2cStop(&I2C_DRIVER);
-}
+__attribute__((weak)) i2c_status_t i2c_ping_address(uint8_t address, uint16_t timeout) {
+    // ChibiOS does not provide low level enough control to check for an ack.
+    // Best effort instead tries reading register 0 which will either succeed or timeout.
+    // This approach may produce false negative results for I2C devices that do not respond to a register 0 read request.
+    uint8_t data = 0;
+    return i2c_readReg(address, 0, &data, sizeof(data), timeout);
+}
\ No newline at end of file
diff --git a/platforms/chibios/drivers/i2c_master.h b/platforms/chibios/drivers/i2c_master.h
index deee7ecc084..132ffd14c07 100644
--- a/platforms/chibios/drivers/i2c_master.h
+++ b/platforms/chibios/drivers/i2c_master.h
@@ -26,6 +26,13 @@
 
 #include <stdint.h>
 
+// ### DEPRECATED - DO NOT USE ###
+#define i2c_writeReg(devaddr, regaddr, data, length, timeout) i2c_write_register(devaddr, regaddr, data, length, timeout)
+#define i2c_writeReg16(devaddr, regaddr, data, length, timeout) i2c_write_register16(devaddr, regaddr, data, length, timeout)
+#define i2c_readReg(devaddr, regaddr, data, length, timeout) i2c_read_register(devaddr, regaddr, data, length, timeout)
+#define i2c_readReg16(devaddr, regaddr, data, length, timeout) i2c_read_register16(devaddr, regaddr, data, length, timeout)
+// ###############################
+
 typedef int16_t i2c_status_t;
 
 #define I2C_STATUS_SUCCESS (0)
@@ -33,11 +40,10 @@ typedef int16_t i2c_status_t;
 #define I2C_STATUS_TIMEOUT (-2)
 
 void         i2c_init(void);
-i2c_status_t i2c_start(uint8_t address);
 i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout);
 i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
-i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
-void         i2c_stop(void);
+i2c_status_t i2c_write_register(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_write_register16(uint8_t devaddr, uint16_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_read_register(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_read_register16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
+i2c_status_t i2c_ping_address(uint8_t address, uint16_t timeout);
diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index f199716a2b2..fa8481d2dcf 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -62,25 +62,25 @@ inline static void serial_delay_blip(void) {
     wait_us(1);
 }
 inline static void serial_output(void) {
-    setPinOutput(SOFT_SERIAL_PIN);
+    gpio_set_pin_output(SOFT_SERIAL_PIN);
 }
 inline static void serial_input(void) {
-    setPinInputHigh(SOFT_SERIAL_PIN);
+    gpio_set_pin_input_high(SOFT_SERIAL_PIN);
 }
 inline static bool serial_read_pin(void) {
-    return !!readPin(SOFT_SERIAL_PIN);
+    return !!gpio_read_pin(SOFT_SERIAL_PIN);
 }
 inline static void serial_low(void) {
-    writePinLow(SOFT_SERIAL_PIN);
+    gpio_write_pin_low(SOFT_SERIAL_PIN);
 }
 inline static void serial_high(void) {
-    writePinHigh(SOFT_SERIAL_PIN);
+    gpio_write_pin_high(SOFT_SERIAL_PIN);
 }
 
 void interrupt_handler(void *arg);
 
 // Use thread + palWaitLineTimeout instead of palSetLineCallback
-//  - Methods like setPinOutput and palEnableLineEvent/palDisableLineEvent
+//  - Methods like gpio_set_pin_output and palEnableLineEvent/palDisableLineEvent
 //    cause the interrupt to lock up, which would limit to only receiving data...
 static THD_WORKING_AREA(waThread1, 128);
 static THD_FUNCTION(Thread1, arg) {
diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index 481a2e422aa..57fc53d49f6 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -32,12 +32,12 @@ __attribute__((weak)) void spi_init(void) {
         is_initialised = true;
 
         // Try releasing special pins for a short time
-        setPinInput(SPI_SCK_PIN);
+        gpio_set_pin_input(SPI_SCK_PIN);
         if (SPI_MOSI_PIN != NO_PIN) {
-            setPinInput(SPI_MOSI_PIN);
+            gpio_set_pin_input(SPI_MOSI_PIN);
         }
         if (SPI_MISO_PIN != NO_PIN) {
-            setPinInput(SPI_MISO_PIN);
+            gpio_set_pin_input(SPI_MISO_PIN);
         }
 
         chThdSleepMilliseconds(10);
@@ -271,10 +271,10 @@ bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
 #if SPI_SELECT_MODE == SPI_SELECT_MODE_PAD
     spiConfig.ssport = PAL_PORT(slavePin);
     spiConfig.sspad  = PAL_PAD(slavePin);
-    setPinOutput(slavePin);
+    gpio_set_pin_output(slavePin);
 #elif SPI_SELECT_MODE == SPI_SELECT_MODE_NONE
     if (slavePin != NO_PIN) {
-        setPinOutput(slavePin);
+        gpio_set_pin_output(slavePin);
     }
 #else
 #    error "Unsupported SPI_SELECT_MODE"
@@ -284,7 +284,7 @@ bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
     spiSelect(&SPI_DRIVER);
 #if SPI_SELECT_MODE == SPI_SELECT_MODE_NONE
     if (slavePin != NO_PIN) {
-        writePinLow(slavePin);
+        gpio_write_pin_low(slavePin);
     }
 #endif
 
@@ -319,7 +319,7 @@ void spi_stop(void) {
     if (spiStarted) {
 #if SPI_SELECT_MODE == SPI_SELECT_MODE_NONE
         if (currentSlavePin != NO_PIN) {
-            writePinHigh(currentSlavePin);
+            gpio_write_pin_high(currentSlavePin);
         }
 #endif
         spiUnselect(&SPI_DRIVER);
diff --git a/platforms/chibios/drivers/uart.c b/platforms/chibios/drivers/uart.c
deleted file mode 100644
index 39a59dd4450..00000000000
--- a/platforms/chibios/drivers/uart.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2021
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "uart.h"
-
-#if defined(MCU_KINETIS)
-static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE};
-#elif defined(WB32F3G71xx) || defined(WB32FQ95xx)
-static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE, SD1_WRDLEN, SD1_STPBIT, SD1_PARITY, SD1_ATFLCT};
-#else
-static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE, SD1_CR1, SD1_CR2, SD1_CR3};
-#endif
-
-void uart_init(uint32_t baud) {
-    static bool is_initialised = false;
-
-    if (!is_initialised) {
-        is_initialised = true;
-
-#if defined(MCU_KINETIS)
-        serialConfig.sc_speed = baud;
-#else
-        serialConfig.speed = baud;
-#endif
-
-#if defined(USE_GPIOV1)
-        palSetLineMode(SD1_TX_PIN, SD1_TX_PAL_MODE);
-        palSetLineMode(SD1_RX_PIN, SD1_RX_PAL_MODE);
-#else
-        palSetLineMode(SD1_TX_PIN, PAL_MODE_ALTERNATE(SD1_TX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
-        palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE(SD1_RX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
-#endif
-        sdStart(&SERIAL_DRIVER, &serialConfig);
-    }
-}
-
-void uart_write(uint8_t data) {
-    sdPut(&SERIAL_DRIVER, data);
-}
-
-uint8_t uart_read(void) {
-    msg_t res = sdGet(&SERIAL_DRIVER);
-
-    return (uint8_t)res;
-}
-
-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);
-}
-
-bool uart_available(void) {
-    return !sdGetWouldBlock(&SERIAL_DRIVER);
-}
diff --git a/platforms/chibios/drivers/uart.h b/platforms/chibios/drivers/uart.h
index 16983072cec..c1945575f13 100644
--- a/platforms/chibios/drivers/uart.h
+++ b/platforms/chibios/drivers/uart.h
@@ -1,18 +1,7 @@
-/* Copyright 2021
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// Copyright 2024 Stefan Kerkmann
+// Copyright 2021 QMK
+// Copyright 2024 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -24,93 +13,188 @@
 #include "gpio.h"
 #include "chibios_config.h"
 
-#ifndef SERIAL_DRIVER
-#    define SERIAL_DRIVER SD1
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef SERIAL_DRIVER
+#    define UART_DRIVER SERIAL_DRIVER
+#endif
+#ifdef SD1_TX_PIN
+#    define UART_TX_PIN SD1_TX_PIN
+#endif
+#ifdef SD1_RX_PIN
+#    define UART_RX_PIN SD1_RX_PIN
+#endif
+#ifdef SD1_CTS_PIN
+#    define UART_CTS_PIN SD1_CTS_PIN
+#endif
+#ifdef SD1_RTS_PIN
+#    define UART_RTS_PIN SD1_RTS_PIN
+#endif
+#ifdef SD1_TX_PAL_MODE
+#    define UART_TX_PAL_MODE SD1_TX_PAL_MODE
+#endif
+#ifdef SD1_RX_PAL_MODE
+#    define UART_RX_PAL_MODE SD1_RX_PAL_MODE
+#endif
+#ifdef SD1_CTS_PAL_MODE
+#    define UART_RTS_PAL_MODE SD1_CTS_PAL_MODE
+#endif
+#ifdef SD1_RTS_PAL_MODE
+#    define UART_TX_PAL_MODE SD1_RTS_PAL_MODE
+#endif
+#ifdef SD1_CR1
+#    define UART_CR1 SD1_CR1
+#endif
+#ifdef SD1_CR2
+#    define UART_CR2 SD1_CR2
+#endif
+#ifdef SD1_CR3
+#    define UART_CR3 SD1_CR3
+#endif
+#ifdef SD1_WRDLEN
+#    define UART_WRDLEN SD1_WRDLEN
+#endif
+#ifdef SD1_STPBIT
+#    define UART_STPBIT SD1_STPBIT
+#endif
+#ifdef SD1_PARITY
+#    define UART_PARITY SD1_PARITY
+#endif
+#ifdef SD1_ATFLCT
+#    define UART_ATFLCT SD1_ATFLCT
+#endif
+// ========
+
+#ifndef UART_DRIVER
+#    if (HAL_USE_SERIAL == TRUE)
+#        define UART_DRIVER SD1
+#    elif (HAL_USE_SIO == TRUE)
+#        define UART_DRIVER SIOD1
+#    endif
 #endif
 
-#ifndef SD1_TX_PIN
-#    define SD1_TX_PIN A9
+#ifndef UART_TX_PIN
+#    define UART_TX_PIN A9
 #endif
 
-#ifndef SD1_RX_PIN
-#    define SD1_RX_PIN A10
+#ifndef UART_RX_PIN
+#    define UART_RX_PIN A10
 #endif
 
-#ifndef SD1_CTS_PIN
-#    define SD1_CTS_PIN A11
+#ifndef UART_CTS_PIN
+#    define UART_CTS_PIN A11
 #endif
 
-#ifndef SD1_RTS_PIN
-#    define SD1_RTS_PIN A12
+#ifndef UART_RTS_PIN
+#    define UART_RTS_PIN A12
 #endif
 
 #ifdef USE_GPIOV1
-#    ifndef SD1_TX_PAL_MODE
-#        define SD1_TX_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
+#    ifndef UART_TX_PAL_MODE
+#        define UART_TX_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
 #    endif
-#    ifndef SD1_RX_PAL_MODE
-#        define SD1_RX_PAL_MODE PAL_MODE_INPUT
+#    ifndef UART_RX_PAL_MODE
+#        define UART_RX_PAL_MODE PAL_MODE_INPUT
 #    endif
-#    ifndef SD1_CTS_PAL_MODE
-#        define SD1_CTS_PAL_MODE PAL_MODE_INPUT
+#    ifndef UART_CTS_PAL_MODE
+#        define UART_CTS_PAL_MODE PAL_MODE_INPUT
 #    endif
-#    ifndef SD1_RTS_PAL_MODE
-#        define SD1_RTS_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
+#    ifndef UART_RTS_PAL_MODE
+#        define UART_RTS_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
 #    endif
 #else
-#    ifndef SD1_TX_PAL_MODE
-#        define SD1_TX_PAL_MODE 7
+#    ifndef UART_TX_PAL_MODE
+#        define UART_TX_PAL_MODE 7
 #    endif
 
-#    ifndef SD1_RX_PAL_MODE
-#        define SD1_RX_PAL_MODE 7
+#    ifndef UART_RX_PAL_MODE
+#        define UART_RX_PAL_MODE 7
 #    endif
 
-#    ifndef SD1_CTS_PAL_MODE
-#        define SD1_CTS_PAL_MODE 7
+#    ifndef UART_CTS_PAL_MODE
+#        define UART_CTS_PAL_MODE 7
 #    endif
 
-#    ifndef SD1_RTS_PAL_MODE
-#        define SD1_RTS_PAL_MODE 7
+#    ifndef UART_RTS_PAL_MODE
+#        define UART_RTS_PAL_MODE 7
 #    endif
 #endif
 
-#ifndef SD1_CR1
-#    define SD1_CR1 0
+#ifndef UART_CR1
+#    define UART_CR1 0
 #endif
 
-#ifndef SD1_CR2
-#    define SD1_CR2 0
+#ifndef UART_CR2
+#    define UART_CR2 0
 #endif
 
-#ifndef SD1_CR3
-#    define SD1_CR3 0
+#ifndef UART_CR3
+#    define UART_CR3 0
 #endif
 
-#ifndef SD1_WRDLEN
-#    define SD1_WRDLEN 3
+#ifndef UART_WRDLEN
+#    define UART_WRDLEN 3
 #endif
 
-#ifndef SD1_STPBIT
-#    define SD1_STPBIT 0
+#ifndef UART_STPBIT
+#    define UART_STPBIT 0
 #endif
 
-#ifndef SD1_PARITY
-#    define SD1_PARITY 0
+#ifndef UART_PARITY
+#    define UART_PARITY 0
 #endif
 
-#ifndef SD1_ATFLCT
-#    define SD1_ATFLCT 0
+#ifndef UART_ATFLCT
+#    define UART_ATFLCT 0
 #endif
 
+/**
+ * @brief Initialize the UART driver. This function must be called only once,
+ * before any of the below functions can be called.
+ *
+ * @param baud The baud rate to transmit and receive at. This may depend on the
+ * device you are communicating with. Common values are 1200, 2400, 4800, 9600,
+ * 19200, 38400, 57600, and 115200.
+ */
 void uart_init(uint32_t baud);
 
+/**
+ * @brief Transmit a single byte.
+ *
+ * @param data The byte to transmit.
+ */
 void uart_write(uint8_t data);
 
+/**
+ * @brief Receive a single byte.
+ *
+ * @return uint8_t The byte read from the receive buffer. This function will
+ * block if the buffer is empty (ie. no data to read).
+ */
 uint8_t uart_read(void);
 
+/**
+ * @brief Transmit multiple bytes.
+ *
+ * @param data A pointer to the data to write from.
+ * @param length The number of bytes to write. Take care not to overrun the
+ * length of `data`.
+ */
 void uart_transmit(const uint8_t *data, uint16_t length);
 
+/**
+ * @brief Receive multiple bytes.
+ *
+ * @param data A pointer to the buffer to read into.
+ * @param length The number of bytes to read. Take care not to overrun the
+ * length of `data`.
+ */
 void uart_receive(uint8_t *data, uint16_t length);
 
+/**
+ * @brief Return whether the receive buffer contains data. Call this function
+ * to determine if `uart_read()` will return data immediately.
+ *
+ * @return true If there is data available to read.
+ * @return false If there is no data available to read.
+ */
 bool uart_available(void);
diff --git a/platforms/chibios/drivers/uart_serial.c b/platforms/chibios/drivers/uart_serial.c
new file mode 100644
index 00000000000..6aff4eae47a
--- /dev/null
+++ b/platforms/chibios/drivers/uart_serial.c
@@ -0,0 +1,65 @@
+// Copyright 2024 Stefan Kerkmann (@KarlK90)
+// Copyright 2021 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "uart.h"
+
+#if defined(MCU_KINETIS)
+static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE};
+#elif defined(WB32F3G71xx) || defined(WB32FQ95xx)
+static SerialConfig serialConfig = {
+    SERIAL_DEFAULT_BITRATE, UART_WRDLEN, UART_STPBIT, UART_PARITY, UART_ATFLCT,
+};
+#else
+static SerialConfig serialConfig = {
+    SERIAL_DEFAULT_BITRATE,
+    UART_CR1,
+    UART_CR2,
+    UART_CR3,
+};
+#endif
+
+void uart_init(uint32_t baud) {
+    static bool is_initialised = false;
+
+    if (is_initialised) {
+        return;
+    }
+    is_initialised = true;
+
+#if defined(MCU_KINETIS)
+    serialConfig.sc_speed = baud;
+#else
+    serialConfig.speed = baud;
+#endif
+
+#if defined(USE_GPIOV1)
+    palSetLineMode(UART_TX_PIN, UART_TX_PAL_MODE);
+    palSetLineMode(UART_RX_PIN, UART_RX_PAL_MODE);
+#else
+    palSetLineMode(UART_TX_PIN, PAL_MODE_ALTERNATE(UART_TX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    palSetLineMode(UART_RX_PIN, PAL_MODE_ALTERNATE(UART_RX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+#endif
+
+    sdStart(&UART_DRIVER, &serialConfig);
+}
+
+void uart_write(uint8_t data) {
+    sdPut(&UART_DRIVER, data);
+}
+
+uint8_t uart_read(void) {
+    return (uint8_t)sdGet(&UART_DRIVER);
+}
+
+void uart_transmit(const uint8_t *data, uint16_t length) {
+    sdWrite(&UART_DRIVER, data, length);
+}
+
+void uart_receive(uint8_t *data, uint16_t length) {
+    sdRead(&UART_DRIVER, data, length);
+}
+
+bool uart_available(void) {
+    return !sdGetWouldBlock(&UART_DRIVER);
+}
diff --git a/platforms/chibios/drivers/uart_sio.c b/platforms/chibios/drivers/uart_sio.c
new file mode 100644
index 00000000000..442df1c54d8
--- /dev/null
+++ b/platforms/chibios/drivers/uart_sio.c
@@ -0,0 +1,77 @@
+// Copyright 2024 Stefan Kerkmann (@KarlK90)
+// Copyright 2021 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "uart.h"
+
+#if defined(MCU_RP)
+// 38400 baud, 8 data bits, 1 stop bit, no parity, no flow control
+static SIOConfig sioConfig = {
+    .baud      = SIO_DEFAULT_BITRATE,
+    .UARTLCR_H = (UART_UARTLCR_H_WLEN_8BITS | UART_UARTLCR_H_FEN),
+    .UARTCR    = 0U,
+    .UARTIFLS  = (UART_UARTIFLS_RXIFLSEL_1_8F | UART_UARTIFLS_TXIFLSEL_1_8E),
+    .UARTDMACR = 0U,
+};
+#else
+static SIOConfig sioConfig = {
+    .baud  = SIO_DEFAULT_BITRATE,
+#    if defined(MCU_STM32) && defined(USE_USARTV3)
+    .presc = USART_PRESC1,
+#    endif
+    .cr1   = UART_CR1,
+    .cr2   = UART_CR2,
+    .cr3   = UART_CR3,
+};
+#endif
+
+void uart_init(uint32_t baud) {
+    static bool is_initialised = false;
+
+    if (is_initialised) {
+        return;
+    }
+    is_initialised = true;
+
+    sioConfig.baud = baud;
+
+#if defined(USE_GPIOV1)
+    palSetLineMode(UART_TX_PIN, UART_TX_PAL_MODE);
+    palSetLineMode(UART_RX_PIN, UART_RX_PAL_MODE);
+#else
+    palSetLineMode(UART_TX_PIN, PAL_MODE_ALTERNATE(UART_TX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    palSetLineMode(UART_RX_PIN, PAL_MODE_ALTERNATE(UART_RX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+#endif
+
+    sioStart(&UART_DRIVER, &sioConfig);
+}
+
+void uart_write(uint8_t data) {
+    chnPutTimeout(&UART_DRIVER, data, TIME_INFINITE);
+}
+
+uint8_t uart_read(void) {
+    msg_t result = chnGetTimeout(&UART_DRIVER, TIME_INFINITE);
+
+    if (sioHasRXErrorsX(&UART_DRIVER)) {
+        sioGetAndClearErrors(&UART_DRIVER);
+    }
+
+    return (uint8_t)result;
+}
+
+void uart_transmit(const uint8_t *data, uint16_t length) {
+    chnWrite(&UART_DRIVER, data, length);
+}
+
+void uart_receive(uint8_t *data, uint16_t length) {
+    chnRead(&UART_DRIVER, data, length);
+
+    if (sioHasRXErrorsX(&UART_DRIVER)) {
+        sioGetAndClearErrors(&UART_DRIVER);
+    }
+}
+
+bool uart_available() {
+    return !sioIsRXEmptyX(&UART_DRIVER);
+}
diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c
index e3b735a1a69..1ed87c4381e 100644
--- a/platforms/chibios/drivers/ws2812_bitbang.c
+++ b/platforms/chibios/drivers/ws2812_bitbang.c
@@ -3,14 +3,23 @@
 #include "gpio.h"
 #include "chibios_config.h"
 
+// DEPRECATED - DO NOT USE
+#if defined(NOP_FUDGE)
+#    define WS2812_BITBANG_NOP_FUDGE NOP_FUDGE
+#endif
+
 /* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */
 
-#ifndef NOP_FUDGE
+#ifndef WS2812_BITBANG_NOP_FUDGE
 #    if defined(STM32F0XX) || defined(STM32F1XX) || defined(GD32VF103) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define NOP_FUDGE 0.4
+#        define WS2812_BITBANG_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
+#        if defined(RP2040)
+#            error "Please use `vendor` WS2812 driver for RP2040"
+#        else
+#            error "WS2812_BITBANG_NOP_FUDGE configuration required"
+#        endif
+#        define WS2812_BITBANG_NOP_FUDGE 1 // this just pleases the compile so the above error is easier to spot
 #    endif
 #endif
 
@@ -29,7 +38,7 @@
 #endif
 
 #define NUMBER_NOPS 6
-#define CYCLES_PER_SEC (CPU_CLOCK / NUMBER_NOPS * NOP_FUDGE)
+#define CYCLES_PER_SEC (CPU_CLOCK / NUMBER_NOPS * WS2812_BITBANG_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_CYCLE (NS_PER_SEC / CYCLES_PER_SEC)
 #define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE)
@@ -53,15 +62,15 @@ void sendByte(uint8_t byte) {
         // using something like wait_ns(is_one ? T1L : T0L) here throws off timings
         if (is_one) {
             // 1
-            writePinHigh(WS2812_DI_PIN);
+            gpio_write_pin_high(WS2812_DI_PIN);
             wait_ns(WS2812_T1H);
-            writePinLow(WS2812_DI_PIN);
+            gpio_write_pin_low(WS2812_DI_PIN);
             wait_ns(WS2812_T1L);
         } else {
             // 0
-            writePinHigh(WS2812_DI_PIN);
+            gpio_write_pin_high(WS2812_DI_PIN);
             wait_ns(WS2812_T0H);
-            writePinLow(WS2812_DI_PIN);
+            gpio_write_pin_low(WS2812_DI_PIN);
             wait_ns(WS2812_T0L);
         }
     }
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 440687bd72a..6bba22767f7 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -48,9 +48,6 @@
 #ifndef WS2812_PWM_COMPLEMENTARY_OUTPUT
 #    define WS2812_PWM_OUTPUT_MODE PWM_OUTPUT_ACTIVE_HIGH
 #else
-#    if !STM32_PWM_USE_ADVANCED
-#        error "WS2812_PWM_COMPLEMENTARY_OUTPUT requires STM32_PWM_USE_ADVANCED == TRUE"
-#    endif
 #    define WS2812_PWM_OUTPUT_MODE PWM_COMPLEMENTARY_OUTPUT_ACTIVE_HIGH
 #endif
 
diff --git a/platforms/chibios/gpio.h b/platforms/chibios/gpio.h
index 80551abac58..a8d6554f296 100644
--- a/platforms/chibios/gpio.h
+++ b/platforms/chibios/gpio.h
@@ -22,24 +22,24 @@ typedef ioline_t pin_t;
 
 /* Operation of GPIO by pin. */
 
-#define setPinInput(pin) palSetLineMode((pin), PAL_MODE_INPUT)
-#define setPinInputHigh(pin) palSetLineMode((pin), PAL_MODE_INPUT_PULLUP)
-#define setPinInputLow(pin) palSetLineMode((pin), PAL_MODE_INPUT_PULLDOWN)
-#define setPinOutputPushPull(pin) palSetLineMode((pin), PAL_MODE_OUTPUT_PUSHPULL)
-#define setPinOutputOpenDrain(pin) palSetLineMode((pin), PAL_MODE_OUTPUT_OPENDRAIN)
-#define setPinOutput(pin) setPinOutputPushPull(pin)
+#define gpio_set_pin_input(pin) palSetLineMode((pin), PAL_MODE_INPUT)
+#define gpio_set_pin_input_high(pin) palSetLineMode((pin), PAL_MODE_INPUT_PULLUP)
+#define gpio_set_pin_input_low(pin) palSetLineMode((pin), PAL_MODE_INPUT_PULLDOWN)
+#define gpio_set_pin_output_push_pull(pin) palSetLineMode((pin), PAL_MODE_OUTPUT_PUSHPULL)
+#define gpio_set_pin_output_open_drain(pin) palSetLineMode((pin), PAL_MODE_OUTPUT_OPENDRAIN)
+#define gpio_set_pin_output(pin) gpio_set_pin_output_push_pull(pin)
 
-#define writePinHigh(pin) palSetLine(pin)
-#define writePinLow(pin) palClearLine(pin)
-#define writePin(pin, level)   \
-    do {                       \
-        if (level) {           \
-            writePinHigh(pin); \
-        } else {               \
-            writePinLow(pin);  \
-        }                      \
+#define gpio_write_pin_high(pin) palSetLine(pin)
+#define gpio_write_pin_low(pin) palClearLine(pin)
+#define gpio_write_pin(pin, level)    \
+    do {                              \
+        if (level) {                  \
+            gpio_write_pin_high(pin); \
+        } else {                      \
+            gpio_write_pin_low(pin);  \
+        }                             \
     } while (0)
 
-#define readPin(pin) palReadLine(pin)
+#define gpio_read_pin(pin) palReadLine(pin)
 
-#define togglePin(pin) palToggleLine(pin)
+#define gpio_toggle_pin(pin) palToggleLine(pin)
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index f38a888012e..b13eed39be8 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -402,6 +402,17 @@ ifeq ($(strip $(MCU)), risc-v)
                -mabi=$(MCU_ABI) \
                -mcmodel=$(MCU_CMODEL) \
                -mstrict-align
+
+    # Deal with different arch revisions and gcc renaming them
+    ifneq ($(shell echo 'int main() { asm("csrc 0x300,8"); return 0; }' | $(TOOLCHAIN)gcc $(MCUFLAGS) $(TOOLCHAIN_CFLAGS) -x c -o /dev/null - 2>/dev/null >/dev/null; echo $$?),0)
+        MCUFLAGS = -march=$(MCU_ARCH)_zicsr \
+                   -mabi=$(MCU_ABI) \
+                   -mcmodel=$(MCU_CMODEL) \
+                   -mstrict-align
+        ifneq ($(shell echo 'int main() { asm("csrc 0x300,8"); return 0; }' | $(TOOLCHAIN)gcc $(MCUFLAGS) $(TOOLCHAIN_CFLAGS) -x c -o /dev/null - 2>/dev/null >/dev/null; echo $$?),0)
+            $(call CATASTROPHIC_ERROR,Incompatible toolchain,No compatible RISC-V toolchain found. Can't work out correct architecture.)
+        endif
+    endif
 else
     # ARM toolchain specific configuration
     TOOLCHAIN ?= arm-none-eabi-
diff --git a/platforms/gpio.h b/platforms/gpio.h
index b47f6f8e432..6a87e75b014 100644
--- a/platforms/gpio.h
+++ b/platforms/gpio.h
@@ -19,4 +19,21 @@
 
 #if __has_include_next("gpio.h")
 #    include_next "gpio.h" /* Include the platforms gpio.h */
-#endif
\ No newline at end of file
+#endif
+
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+
+#define setPinInput(pin) gpio_set_pin_input(pin)
+#define setPinInputHigh(pin) gpio_set_pin_input_high(pin)
+#define setPinInputLow(pin) gpio_set_pin_input_low(pin)
+#define setPinOutputPushPull(pin) gpio_set_pin_output_push_pull(pin)
+#define setPinOutputOpenDrain(pin) gpio_set_pin_output_open_drain(pin)
+#define setPinOutput(pin) gpio_set_pin_output_push_pull(pin)
+
+#define writePinHigh(pin) gpio_write_pin_high(pin)
+#define writePinLow(pin) gpio_write_pin_low(pin)
+#define writePin(pin, level) gpio_write_pin(pin, level)
+
+#define readPin(pin) gpio_read_pin(pin)
+
+#define togglePin(pin) gpio_toggle_pin(pin)
diff --git a/quantum/action.c b/quantum/action.c
index 677a26d5a17..8e027ccf378 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -1008,9 +1008,7 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
  */
 __attribute__((weak)) void tap_code_delay(uint8_t code, uint16_t delay) {
     register_code(code);
-    for (uint16_t i = delay; i > 0; i--) {
-        wait_ms(1);
-    }
+    wait_ms(delay);
     unregister_code(code);
 }
 
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index 28c82675172..c1a15004930 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -17,6 +17,7 @@
 #include "audio.h"
 #include "eeconfig.h"
 #include "timer.h"
+#include "debug.h"
 #include "wait.h"
 #include "util.h"
 
@@ -62,6 +63,13 @@
  * the internal state of the audio system does its calculations with the later - ms
  */
 
+#ifndef AUDIO_DEFAULT_ON
+#    define AUDIO_DEFAULT_ON true
+#endif
+#ifndef AUDIO_DEFAULT_CLICKY_ON
+#    define AUDIO_DEFAULT_CLICKY_ON true
+#endif
+
 #ifndef AUDIO_TONE_STACKSIZE
 #    define AUDIO_TONE_STACKSIZE 8
 #endif
@@ -117,32 +125,31 @@ void eeconfig_update_audio_current(void) {
     eeconfig_update_audio(audio_config.raw);
 }
 
+void eeconfig_update_audio_default(void) {
+    audio_config.valid         = true;
+    audio_config.enable        = AUDIO_DEFAULT_ON;
+    audio_config.clicky_enable = AUDIO_DEFAULT_CLICKY_ON;
+    eeconfig_update_audio(audio_config.raw);
+}
+
 void audio_init(void) {
     if (audio_initialized) {
         return;
     }
 
-    // Check EEPROM
-#ifdef EEPROM_ENABLE
-    if (!eeconfig_is_enabled()) {
-        eeconfig_init();
-    }
     audio_config.raw = eeconfig_read_audio();
-#else // EEPROM settings
-    audio_config.enable        = true;
-#    ifdef AUDIO_CLICKY_ON
-    audio_config.clicky_enable = true;
-#    endif
-#endif // EEPROM settings
+    if (!audio_config.valid) {
+        dprintf("audio_init audio_config.valid = 0. Write default values to EEPROM.\n");
+        eeconfig_update_audio_default();
+    }
 
     for (uint8_t i = 0; i < AUDIO_TONE_STACKSIZE; i++) {
         tones[i] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
     }
 
-    if (!audio_initialized) {
-        audio_driver_initialize();
-        audio_initialized = true;
-    }
+    audio_driver_initialize();
+    audio_initialized = true;
+
     stop_all_notes();
 #ifndef AUDIO_INIT_DELAY
     audio_startup();
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index a4a908b43c5..eb0bedc6f9f 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -33,7 +33,8 @@ typedef union {
     struct {
         bool    enable : 1;
         bool    clicky_enable : 1;
-        uint8_t level : 6;
+        bool    valid : 1;
+        uint8_t reserved : 5;
     };
 } audio_config_t;
 
diff --git a/quantum/backlight/backlight.c b/quantum/backlight/backlight.c
index e89b34696c1..eb64dd71e8c 100644
--- a/quantum/backlight/backlight.c
+++ b/quantum/backlight/backlight.c
@@ -42,20 +42,26 @@ backlight_config_t backlight_config;
 static uint8_t breathing_period = BREATHING_PERIOD;
 #endif
 
+static void backlight_check_config(void) {
+    /* Add some out of bound checks for backlight config */
+
+    if (backlight_config.level > BACKLIGHT_LEVELS) {
+        backlight_config.level = BACKLIGHT_LEVELS;
+    }
+}
+
 /** \brief Backlight initialization
  *
  * FIXME: needs doc
  */
 void backlight_init(void) {
-    /* check signature */
-    if (!eeconfig_is_enabled()) {
-        eeconfig_init();
-        eeconfig_update_backlight_default();
-    }
     backlight_config.raw = eeconfig_read_backlight();
-    if (backlight_config.level > BACKLIGHT_LEVELS) {
-        backlight_config.level = BACKLIGHT_LEVELS;
+    if (!backlight_config.valid) {
+        dprintf("backlight_init backlight_config.valid = 0. Write default values to EEPROM.\n");
+        eeconfig_update_backlight_default();
     }
+    backlight_check_config();
+
     backlight_set(backlight_config.enable ? backlight_config.level : 0);
 }
 
@@ -183,6 +189,7 @@ void eeconfig_update_backlight_current(void) {
 }
 
 void eeconfig_update_backlight_default(void) {
+    backlight_config.valid     = true;
     backlight_config.enable    = BACKLIGHT_DEFAULT_ON;
     backlight_config.breathing = BACKLIGHT_DEFAULT_BREATHING;
     backlight_config.level     = BACKLIGHT_DEFAULT_LEVEL;
diff --git a/quantum/backlight/backlight.h b/quantum/backlight/backlight.h
index 85812bff3a5..c34fb5858d1 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
+        bool    valid : 1;
         uint8_t level : 5;
     };
 } backlight_config_t;
diff --git a/quantum/backlight/backlight_driver_common.c b/quantum/backlight/backlight_driver_common.c
index 8c3fe461d7c..fb2770ee3c8 100644
--- a/quantum/backlight/backlight_driver_common.c
+++ b/quantum/backlight/backlight_driver_common.c
@@ -26,23 +26,23 @@ static const pin_t backlight_pin = BACKLIGHT_PIN;
 
 static inline void backlight_on(pin_t backlight_pin) {
 #if BACKLIGHT_ON_STATE == 0
-    writePinLow(backlight_pin);
+    gpio_write_pin_low(backlight_pin);
 #else
-    writePinHigh(backlight_pin);
+    gpio_write_pin_high(backlight_pin);
 #endif
 }
 
 static inline void backlight_off(pin_t backlight_pin) {
 #if BACKLIGHT_ON_STATE == 0
-    writePinHigh(backlight_pin);
+    gpio_write_pin_high(backlight_pin);
 #else
-    writePinLow(backlight_pin);
+    gpio_write_pin_low(backlight_pin);
 #endif
 }
 
 void backlight_pins_init(void) {
     // Setup backlight pin as output and output to off state.
-    FOR_EACH_LED(setPinOutput(backlight_pin); backlight_off(backlight_pin);)
+    FOR_EACH_LED(gpio_set_pin_output(backlight_pin); backlight_off(backlight_pin);)
 }
 
 void backlight_pins_on(void) {
diff --git a/quantum/bootmagic/bootmagic.c b/quantum/bootmagic/bootmagic.c
new file mode 100644
index 00000000000..419ec5229e4
--- /dev/null
+++ b/quantum/bootmagic/bootmagic.c
@@ -0,0 +1,79 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "bootmagic.h"
+#include "matrix.h"
+#include "keyboard.h"
+#include "wait.h"
+#include "eeconfig.h"
+#include "bootloader.h"
+
+#ifndef BOOTMAGIC_DEBOUNCE
+#    if defined(DEBOUNCE) && DEBOUNCE > 0
+#        define BOOTMAGIC_DEBOUNCE (DEBOUNCE * 2)
+#    else
+#        define BOOTMAGIC_DEBOUNCE 30
+#    endif
+#endif
+
+/** \brief Reset eeprom
+ *
+ * ...just incase someone wants to only change the eeprom behaviour
+ */
+__attribute__((weak)) void bootmagic_reset_eeprom(void) {
+    eeconfig_disable();
+}
+
+/** \brief Decide reboot based on current matrix state
+ */
+__attribute__((weak)) bool bootmagic_should_reset(void) {
+    // If the configured key (commonly Esc) is held down on power up,
+    // reset the EEPROM valid state and jump to bootloader.
+    // This isn't very generalized, but we need something that doesn't
+    // rely on user's keymaps in firmware or EEPROM.
+    uint8_t row = BOOTMAGIC_ROW;
+    uint8_t col = BOOTMAGIC_COLUMN;
+
+#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_ROW_RIGHT) && defined(BOOTMAGIC_COLUMN_RIGHT)
+    if (!is_keyboard_left()) {
+        row = BOOTMAGIC_ROW_RIGHT;
+        col = BOOTMAGIC_COLUMN_RIGHT;
+    }
+#endif
+
+    return matrix_get_row(row) & (1 << col);
+}
+
+/** \brief The abridged version of TMK's bootmagic based on Wilba.
+ *
+ *  100% less potential for accidentally making the keyboard do stupid things.
+ */
+__attribute__((weak)) void bootmagic_scan(void) {
+    // We need multiple scans because debouncing can't be turned off.
+    matrix_scan();
+    wait_ms(BOOTMAGIC_DEBOUNCE);
+    matrix_scan();
+
+    if (bootmagic_should_reset()) {
+        bootmagic_reset_eeprom();
+
+        // Jump to bootloader.
+        bootloader_jump();
+    }
+}
+
+void bootmagic(void) {
+    bootmagic_scan();
+}
diff --git a/quantum/bootmagic/bootmagic.h b/quantum/bootmagic/bootmagic.h
index db826025ce5..ee6fb49748e 100644
--- a/quantum/bootmagic/bootmagic.h
+++ b/quantum/bootmagic/bootmagic.h
@@ -15,8 +15,26 @@
  */
 #pragma once
 
-#if defined(BOOTMAGIC_LITE)
-#    include "bootmagic_lite.h"
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef BOOTMAGIC_LITE_ROW
+#    define BOOTMAGIC_ROW BOOTMAGIC_LITE_ROW
+#endif
+#ifdef BOOTMAGIC_LITE_COLUMN
+#    define BOOTMAGIC_COLUMN BOOTMAGIC_LITE_COLUMN
+#endif
+#ifdef BOOTMAGIC_LITE_ROW_RIGHT
+#    define BOOTMAGIC_ROW_RIGHT BOOTMAGIC_LITE_ROW_RIGHT
+#endif
+#ifdef BOOTMAGIC_LITE_COLUMN_RIGHT
+#    define BOOTMAGIC_COLUMN_RIGHT BOOTMAGIC_LITE_COLUMN_RIGHT
+#endif
+// ========
+
+#ifndef BOOTMAGIC_COLUMN
+#    define BOOTMAGIC_COLUMN 0
+#endif
+#ifndef BOOTMAGIC_ROW
+#    define BOOTMAGIC_ROW 0
 #endif
 
 void bootmagic(void);
diff --git a/quantum/bootmagic/bootmagic_lite.c b/quantum/bootmagic/bootmagic_lite.c
deleted file mode 100644
index efce6bfd121..00000000000
--- a/quantum/bootmagic/bootmagic_lite.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bootmagic.h"
-#include "matrix.h"
-#include "keyboard.h"
-#include "wait.h"
-#include "eeconfig.h"
-#include "bootloader.h"
-
-/** \brief Reset eeprom
- *
- * ...just incase someone wants to only change the eeprom behaviour
- */
-__attribute__((weak)) void bootmagic_lite_reset_eeprom(void) {
-    eeconfig_disable();
-}
-
-/** \brief The lite version of TMK's bootmagic based on Wilba.
- *
- *  100% less potential for accidentally making the keyboard do stupid things.
- */
-__attribute__((weak)) void bootmagic_lite(void) {
-    // We need multiple scans because debouncing can't be turned off.
-    matrix_scan();
-#if defined(DEBOUNCE) && DEBOUNCE > 0
-    wait_ms(DEBOUNCE * 2);
-#else
-    wait_ms(30);
-#endif
-    matrix_scan();
-
-    // If the configured key (commonly Esc) is held down on power up,
-    // reset the EEPROM valid state and jump to bootloader.
-    // This isn't very generalized, but we need something that doesn't
-    // rely on user's keymaps in firmware or EEPROM.
-    uint8_t row = BOOTMAGIC_LITE_ROW;
-    uint8_t col = BOOTMAGIC_LITE_COLUMN;
-
-#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_LITE_ROW_RIGHT) && defined(BOOTMAGIC_LITE_COLUMN_RIGHT)
-    if (!is_keyboard_left()) {
-        row = BOOTMAGIC_LITE_ROW_RIGHT;
-        col = BOOTMAGIC_LITE_COLUMN_RIGHT;
-    }
-#endif
-
-    if (matrix_get_row(row) & (1 << col)) {
-        bootmagic_lite_reset_eeprom();
-
-        // Jump to bootloader.
-        bootloader_jump();
-    }
-}
-
-void bootmagic(void) {
-    bootmagic_lite();
-}
diff --git a/quantum/bootmagic/bootmagic_lite.h b/quantum/bootmagic/bootmagic_lite.h
deleted file mode 100644
index 17777e6b4a5..00000000000
--- a/quantum/bootmagic/bootmagic_lite.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#ifndef BOOTMAGIC_LITE_COLUMN
-#    define BOOTMAGIC_LITE_COLUMN 0
-#endif
-#ifndef BOOTMAGIC_LITE_ROW
-#    define BOOTMAGIC_LITE_ROW 0
-#endif
-
-void bootmagic_lite(void);
diff --git a/quantum/bootmagic/magic.c b/quantum/bootmagic/magic.c
deleted file mode 100644
index d68df3fa588..00000000000
--- a/quantum/bootmagic/magic.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include "wait.h"
-#include "matrix.h"
-#include "bootloader.h"
-#include "debug.h"
-#include "keycode_config.h"
-#include "host.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#include "bootmagic.h"
-
-keymap_config_t keymap_config;
-
-__attribute__((weak)) void bootmagic(void) {}
-
-/** \brief Magic
- *
- * FIXME: Needs doc
- */
-void magic(void) {
-    /* check signature */
-    if (!eeconfig_is_enabled()) {
-        eeconfig_init();
-    }
-
-    /* init globals */
-    debug_config.raw  = eeconfig_read_debug();
-    keymap_config.raw = eeconfig_read_keymap();
-
-    bootmagic();
-
-    /* read here just incase bootmagic process changed its value */
-    layer_state_t default_layer = (layer_state_t)eeconfig_read_default_layer();
-    default_layer_set(default_layer);
-
-    /* Also initialize layer state to trigger callback functions for layer_state */
-    layer_state_set_kb((layer_state_t)layer_state);
-}
diff --git a/quantum/bootmagic/magic.h b/quantum/bootmagic/magic.h
deleted file mode 100644
index 2c3969b85ca..00000000000
--- a/quantum/bootmagic/magic.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-void magic(void);
diff --git a/quantum/debounce/asym_eager_defer_pk.c b/quantum/debounce/asym_eager_defer_pk.c
index 954d43536c0..b6fcdc3d4e7 100644
--- a/quantum/debounce/asym_eager_defer_pk.c
+++ b/quantum/debounce/asym_eager_defer_pk.c
@@ -18,8 +18,9 @@
  */
 
 /*
-Basic symmetric per-key algorithm. Uses an 8-bit counter per key.
-When no state changes have occured for DEBOUNCE milliseconds, we push the state.
+Asymetric per-key algorithm. After pressing a key, it immediately changes state,
+with no further inputs accepted until DEBOUNCE milliseconds have occurred. After
+releasing a key, that state is pushed after no changes occur for DEBOUNCE milliseconds.
 */
 
 #include "debounce.h"
diff --git a/quantum/deferred_exec.c b/quantum/deferred_exec.c
index a0046a9648d..b3be3747d47 100644
--- a/quantum/deferred_exec.c
+++ b/quantum/deferred_exec.c
@@ -124,13 +124,19 @@ void deferred_exec_advanced_task(deferred_executor_t *table, size_t table_count,
 
         // Run through each of the executors
         for (int i = 0; i < table_count; ++i) {
-            deferred_executor_t *entry = &table[i];
+            deferred_executor_t *entry      = &table[i];
+            deferred_token       curr_token = entry->token;
 
             // Check if we're supposed to execute this entry
-            if (entry->token != INVALID_DEFERRED_TOKEN && ((int32_t)TIMER_DIFF_32(entry->trigger_time, now)) <= 0) {
+            if (curr_token != INVALID_DEFERRED_TOKEN && ((int32_t)TIMER_DIFF_32(entry->trigger_time, now)) <= 0) {
                 // Invoke the callback and work work out if we should be requeued
                 uint32_t delay_ms = entry->callback(entry->trigger_time, entry->cb_arg);
 
+                // If the token has changed, then the callback has canceled and re-queued. Skip further processing.
+                if (entry->token != curr_token) {
+                    continue;
+                }
+
                 // Update the trigger time if we have to repeat, otherwise clear it out
                 if (delay_ms > 0) {
                     // Intentionally add just the delay to the existing trigger time -- this ensures the next
diff --git a/quantum/dip_switch.c b/quantum/dip_switch.c
index 6e254578d13..69cf6652919 100644
--- a/quantum/dip_switch.c
+++ b/quantum/dip_switch.c
@@ -19,8 +19,6 @@
 #include <string.h> // for memcpy
 
 #include "dip_switch.h"
-#include "gpio.h"
-#include "util.h"
 
 #ifdef SPLIT_KEYBOARD
 #    include "split_common/split_util.h"
@@ -35,24 +33,17 @@
 #endif
 
 #ifdef DIP_SWITCH_PINS
-#    define NUMBER_OF_DIP_SWITCHES (ARRAY_SIZE(dip_switch_pad))
 static pin_t dip_switch_pad[] = DIP_SWITCH_PINS;
 #endif
 
 #ifdef DIP_SWITCH_MATRIX_GRID
-typedef struct matrix_index_t {
-    uint8_t row;
-    uint8_t col;
-} matrix_index_t;
-
-#    define NUMBER_OF_DIP_SWITCHES (ARRAY_SIZE(dip_switch_pad))
-static matrix_index_t dip_switch_pad[] = DIP_SWITCH_MATRIX_GRID;
-extern bool           peek_matrix(uint8_t row_index, uint8_t col_index, bool read_raw);
-static uint16_t       scan_count;
+static matrix_intersection_t dip_switch_pad[] = DIP_SWITCH_MATRIX_GRID;
+extern bool                  peek_matrix(uint8_t row_index, uint8_t col_index, bool read_raw);
+static uint16_t              scan_count;
 #endif /* DIP_SWITCH_MATRIX_GRID */
 
-static bool dip_switch_state[NUMBER_OF_DIP_SWITCHES]      = {0};
-static bool last_dip_switch_state[NUMBER_OF_DIP_SWITCHES] = {0};
+static bool dip_switch_state[NUM_DIP_SWITCHES]      = {0};
+static bool last_dip_switch_state[NUM_DIP_SWITCHES] = {0};
 
 __attribute__((weak)) bool dip_switch_update_user(uint8_t index, bool active) {
     return true;
@@ -70,18 +61,40 @@ __attribute__((weak)) bool dip_switch_update_mask_kb(uint32_t state) {
     return dip_switch_update_mask_user(state);
 }
 
+#ifdef DIP_SWITCH_MAP_ENABLE
+#    include "keymap_introspection.h"
+#    include "action.h"
+
+#    ifndef DIP_SWITCH_MAP_KEY_DELAY
+#        define DIP_SWITCH_MAP_KEY_DELAY TAP_CODE_DELAY
+#    endif
+
+static void dip_switch_exec_mapping(uint8_t index, bool on) {
+    // The delays below cater for Windows and its wonderful requirements.
+    action_exec(on ? MAKE_DIPSWITCH_ON_EVENT(index, true) : MAKE_DIPSWITCH_OFF_EVENT(index, true));
+#    if DIP_SWITCH_MAP_KEY_DELAY > 0
+    wait_ms(DIP_SWITCH_MAP_KEY_DELAY);
+#    endif // DIP_SWITCH_MAP_KEY_DELAY > 0
+
+    action_exec(on ? MAKE_DIPSWITCH_ON_EVENT(index, false) : MAKE_DIPSWITCH_OFF_EVENT(index, false));
+#    if DIP_SWITCH_MAP_KEY_DELAY > 0
+    wait_ms(DIP_SWITCH_MAP_KEY_DELAY);
+#    endif // DIP_SWITCH_MAP_KEY_DELAY > 0
+}
+#endif // DIP_SWITCH_MAP_ENABLE
+
 void dip_switch_init(void) {
 #ifdef DIP_SWITCH_PINS
 #    if defined(SPLIT_KEYBOARD) && defined(DIP_SWITCH_PINS_RIGHT)
     if (!isLeftHand) {
         const pin_t dip_switch_pad_right[] = DIP_SWITCH_PINS_RIGHT;
-        for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
+        for (uint8_t i = 0; i < NUM_DIP_SWITCHES; i++) {
             dip_switch_pad[i] = dip_switch_pad_right[i];
         }
     }
 #    endif
-    for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
-        setPinInputHigh(dip_switch_pad[i]);
+    for (uint8_t i = 0; i < NUM_DIP_SWITCHES; i++) {
+        gpio_set_pin_input_high(dip_switch_pad[i]);
     }
     dip_switch_read(true);
 #endif
@@ -108,9 +121,9 @@ void dip_switch_read(bool forced) {
     }
 #endif
 
-    for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
+    for (uint8_t i = 0; i < NUM_DIP_SWITCHES; i++) {
 #ifdef DIP_SWITCH_PINS
-        dip_switch_state[i] = !readPin(dip_switch_pad[i]);
+        dip_switch_state[i] = !gpio_read_pin(dip_switch_pad[i]);
 #endif
 #ifdef DIP_SWITCH_MATRIX_GRID
         dip_switch_state[i] = peek_matrix(dip_switch_pad[i].row, dip_switch_pad[i].col, read_raw);
@@ -118,11 +131,21 @@ void dip_switch_read(bool forced) {
         dip_switch_mask |= dip_switch_state[i] << i;
         if (last_dip_switch_state[i] != dip_switch_state[i] || forced) {
             has_dip_state_changed = true;
+#ifndef DIP_SWITCH_MAP_ENABLE
             dip_switch_update_kb(i, dip_switch_state[i]);
+#else
+            dip_switch_exec_mapping(i, dip_switch_state[i]);
+#endif
         }
     }
     if (has_dip_state_changed) {
+#ifndef DIP_SWITCH_MAP_ENABLE
         dip_switch_update_mask_kb(dip_switch_mask);
+#endif
         memcpy(last_dip_switch_state, dip_switch_state, sizeof(dip_switch_state));
     }
 }
+
+void dip_switch_task(void) {
+    dip_switch_read(false);
+}
diff --git a/quantum/dip_switch.h b/quantum/dip_switch.h
index 6e79dcb0bf7..76298593592 100644
--- a/quantum/dip_switch.h
+++ b/quantum/dip_switch.h
@@ -20,11 +20,36 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "gpio.h"
+#include "util.h"
+
+#if defined(DIP_SWITCH_PINS)
+#    define NUM_DIP_SWITCHES ARRAY_SIZE(((pin_t[])DIP_SWITCH_PINS))
+#elif defined(DIP_SWITCH_MATRIX_GRID)
+typedef struct matrix_intersection_t {
+    uint8_t row;
+    uint8_t col;
+} matrix_intersection_t;
+#    define NUM_DIP_SWITCHES ARRAY_SIZE(((matrix_intersection_t[])DIP_SWITCH_MATRIX_GRID))
+#endif
+
+#ifndef NUM_DIP_SWITCHES
+#    define NUM_DIP_SWITCHES 0
+#endif
 
 bool dip_switch_update_kb(uint8_t index, bool active);
 bool dip_switch_update_user(uint8_t index, bool active);
 bool dip_switch_update_mask_user(uint32_t state);
 bool dip_switch_update_mask_kb(uint32_t state);
 
-void dip_switch_init(void);
 void dip_switch_read(bool forced);
+
+void dip_switch_init(void);
+void dip_switch_task(void);
+
+#ifdef DIP_SWITCH_MAP_ENABLE
+#    define NUM_DIP_STATES 2
+#    define DIP_SWITCH_OFF_ON(off, on) \
+        { (off), (on) }
+extern const uint16_t dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES];
+#endif // DIP_SWITCH_MAP_ENABLE
diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index d9eea13758e..2d2180b4b44 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -54,7 +54,7 @@ void eeconfig_init_quantum(void) {
     // Enable oneshot and autocorrect by default: 0b0001 0100 0000 0000
     eeprom_update_word(EECONFIG_KEYMAP, 0x1400);
     eeprom_update_byte(EECONFIG_BACKLIGHT, 0);
-    eeprom_update_byte(EECONFIG_AUDIO, 0xFF); // On by default
+    eeprom_update_byte(EECONFIG_AUDIO, 0);
     eeprom_update_dword(EECONFIG_RGBLIGHT, 0);
     eeprom_update_byte(EECONFIG_RGBLIGHT_EXTENDED, 0);
     eeprom_update_byte(EECONFIG_UNUSED, 0);
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 7ab194ed529..0a48ac9a07b 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -1,297 +1,179 @@
-/*
- * Copyright 2018 Jack Humbert <jack.humb@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/>.
- */
+// Copyright 2022-2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "encoder.h"
-#include "keyboard.h"
+#include <string.h>
 #include "action.h"
-#include "keycodes.h"
+#include "encoder.h"
 #include "wait.h"
 
-#ifdef SPLIT_KEYBOARD
-#    include "split_util.h"
-#endif
-
-// for memcpy
-#include <string.h>
-
 #ifndef ENCODER_MAP_KEY_DELAY
-#    include "action.h"
 #    define ENCODER_MAP_KEY_DELAY TAP_CODE_DELAY
 #endif
 
-#if !defined(ENCODER_RESOLUTIONS) && !defined(ENCODER_RESOLUTION)
-#    define ENCODER_RESOLUTION 4
-#endif
-
-#if !defined(ENCODERS_PAD_A) || !defined(ENCODERS_PAD_B)
-#    error "No encoder pads defined by ENCODERS_PAD_A and ENCODERS_PAD_B"
-#endif
+__attribute__((weak)) bool should_process_encoder(void) {
+    return is_keyboard_master();
+}
 
-extern volatile bool isLeftHand;
+static encoder_events_t encoder_events;
+static bool             signal_queue_drain = false;
 
-static pin_t encoders_pad_a[NUM_ENCODERS_MAX_PER_SIDE] = ENCODERS_PAD_A;
-static pin_t encoders_pad_b[NUM_ENCODERS_MAX_PER_SIDE] = ENCODERS_PAD_B;
+void encoder_init(void) {
+    memset(&encoder_events, 0, sizeof(encoder_events));
+    encoder_driver_init();
+}
 
-#ifdef ENCODER_RESOLUTIONS
-static uint8_t encoder_resolutions[NUM_ENCODERS] = ENCODER_RESOLUTIONS;
-#endif
+static void encoder_queue_drain(void) {
+    encoder_events.tail     = encoder_events.head;
+    encoder_events.dequeued = encoder_events.enqueued;
+}
 
-#ifndef ENCODER_DIRECTION_FLIP
-#    define ENCODER_CLOCKWISE true
-#    define ENCODER_COUNTER_CLOCKWISE false
-#else
-#    define ENCODER_CLOCKWISE false
-#    define ENCODER_COUNTER_CLOCKWISE true
-#endif
-static int8_t encoder_LUT[] = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
+static bool encoder_handle_queue(void) {
+    bool    changed = false;
+    uint8_t index;
+    bool    clockwise;
+    while (encoder_dequeue_event(&index, &clockwise)) {
+#ifdef ENCODER_MAP_ENABLE
 
-static uint8_t encoder_state[NUM_ENCODERS]  = {0};
-static int8_t  encoder_pulses[NUM_ENCODERS] = {0};
+        // The delays below cater for Windows and its wonderful requirements.
+        action_exec(clockwise ? MAKE_ENCODER_CW_EVENT(index, true) : MAKE_ENCODER_CCW_EVENT(index, true));
+#    if ENCODER_MAP_KEY_DELAY > 0
+        wait_ms(ENCODER_MAP_KEY_DELAY);
+#    endif // ENCODER_MAP_KEY_DELAY > 0
 
-// encoder counts
-static uint8_t thisCount;
-#ifdef SPLIT_KEYBOARD
-// encoder offsets for each hand
-static uint8_t thisHand, thatHand;
-// encoder counts for each hand
-static uint8_t thatCount;
-#endif
+        action_exec(clockwise ? MAKE_ENCODER_CW_EVENT(index, false) : MAKE_ENCODER_CCW_EVENT(index, false));
+#    if ENCODER_MAP_KEY_DELAY > 0
+        wait_ms(ENCODER_MAP_KEY_DELAY);
+#    endif // ENCODER_MAP_KEY_DELAY > 0
 
-static uint8_t encoder_value[NUM_ENCODERS] = {0};
+#else // ENCODER_MAP_ENABLE
 
-__attribute__((weak)) void encoder_wait_pullup_charge(void) {
-    wait_us(100);
-}
+        encoder_update_kb(index, clockwise);
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) {
-    return true;
-}
+#endif // ENCODER_MAP_ENABLE
 
-__attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
-    bool res = encoder_update_user(index, clockwise);
-#if !defined(ENCODER_TESTS)
-    if (res) {
-        if (clockwise) {
-#    if defined(EXTRAKEY_ENABLE)
-            tap_code_delay(KC_VOLU, 10);
-#    elif defined(MOUSEKEY_ENABLE)
-            tap_code_delay(KC_MS_WH_UP, 10);
-#    else
-            tap_code_delay(KC_PGDN, 10);
-#    endif
-        } else {
-#    if defined(EXTRAKEY_ENABLE)
-            tap_code_delay(KC_VOLD, 10);
-#    elif defined(MOUSEKEY_ENABLE)
-            tap_code_delay(KC_MS_WH_DOWN, 10);
-#    else
-            tap_code_delay(KC_PGUP, 10);
-#    endif
-        }
+        changed = true;
     }
-#endif // ENCODER_TESTS
-    return res;
+    return changed;
 }
 
-__attribute__((weak)) bool should_process_encoder(void) {
-    return is_keyboard_master();
-}
+bool encoder_task(void) {
+    bool changed = false;
 
-void encoder_init(void) {
 #ifdef SPLIT_KEYBOARD
-    thisHand  = isLeftHand ? 0 : NUM_ENCODERS_LEFT;
-    thatHand  = NUM_ENCODERS_LEFT - thisHand;
-    thisCount = isLeftHand ? NUM_ENCODERS_LEFT : NUM_ENCODERS_RIGHT;
-    thatCount = isLeftHand ? NUM_ENCODERS_RIGHT : NUM_ENCODERS_LEFT;
-#else // SPLIT_KEYBOARD
-    thisCount                = NUM_ENCODERS;
-#endif
-
-#ifdef ENCODER_TESTS
-    // Annoying that we have to clear out values during initialisation here, but
-    // because all the arrays are static locals, rerunning tests in the same
-    // executable doesn't reset any of these. Kinda crappy having test-only code
-    // here, but it's the simplest solution.
-    memset(encoder_value, 0, sizeof(encoder_value));
-    memset(encoder_state, 0, sizeof(encoder_state));
-    memset(encoder_pulses, 0, sizeof(encoder_pulses));
-    static const pin_t encoders_pad_a_left[] = ENCODERS_PAD_A;
-    static const pin_t encoders_pad_b_left[] = ENCODERS_PAD_B;
-    for (uint8_t i = 0; i < thisCount; i++) {
-        encoders_pad_a[i] = encoders_pad_a_left[i];
-        encoders_pad_b[i] = encoders_pad_b_left[i];
+    // Attempt to process existing encoder events in case split handling has already enqueued events
+    if (should_process_encoder()) {
+        changed |= encoder_handle_queue();
     }
-#endif
+#endif // SPLIT_KEYBOARD
 
-#if defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
-    // Re-initialise the pads if it's the right-hand side
-    if (!isLeftHand) {
-        static const pin_t encoders_pad_a_right[] = ENCODERS_PAD_A_RIGHT;
-        static const pin_t encoders_pad_b_right[] = ENCODERS_PAD_B_RIGHT;
-        for (uint8_t i = 0; i < thisCount; i++) {
-            encoders_pad_a[i] = encoders_pad_a_right[i];
-            encoders_pad_b[i] = encoders_pad_b_right[i];
-        }
+    if (signal_queue_drain) {
+        signal_queue_drain = false;
+        encoder_queue_drain();
     }
-#endif // defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
-
-    // Encoder resolutions is handled purely master-side, so concatenate the two arrays
-#if defined(SPLIT_KEYBOARD) && defined(ENCODER_RESOLUTIONS)
-#    if defined(ENCODER_RESOLUTIONS_RIGHT)
-    static const uint8_t encoder_resolutions_right[NUM_ENCODERS_RIGHT] = ENCODER_RESOLUTIONS_RIGHT;
-#    else  // defined(ENCODER_RESOLUTIONS_RIGHT)
-    static const uint8_t encoder_resolutions_right[NUM_ENCODERS_RIGHT] = ENCODER_RESOLUTIONS;
-#    endif // defined(ENCODER_RESOLUTIONS_RIGHT)
-    for (uint8_t i = 0; i < NUM_ENCODERS_RIGHT; i++) {
-        encoder_resolutions[NUM_ENCODERS_LEFT + i] = encoder_resolutions_right[i];
-    }
-#endif // defined(SPLIT_KEYBOARD) && defined(ENCODER_RESOLUTIONS)
 
-    for (uint8_t i = 0; i < thisCount; i++) {
-        setPinInputHigh(encoders_pad_a[i]);
-        setPinInputHigh(encoders_pad_b[i]);
-    }
-    encoder_wait_pullup_charge();
-    for (uint8_t i = 0; i < thisCount; i++) {
-        encoder_state[i] = (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
+    // Let the encoder driver produce events
+    encoder_driver_task();
+
+    // Process any events that were enqueued
+    if (should_process_encoder()) {
+        changed |= encoder_handle_queue();
     }
+
+    return changed;
 }
 
-#ifdef ENCODER_MAP_ENABLE
-static void encoder_exec_mapping(uint8_t index, bool clockwise) {
-    // The delays below cater for Windows and its wonderful requirements.
-    action_exec(clockwise ? MAKE_ENCODER_CW_EVENT(index, true) : MAKE_ENCODER_CCW_EVENT(index, true));
-#    if ENCODER_MAP_KEY_DELAY > 0
-    wait_ms(ENCODER_MAP_KEY_DELAY);
-#    endif // ENCODER_MAP_KEY_DELAY > 0
+bool encoder_queue_full_advanced(encoder_events_t *events) {
+    return events->head == (events->tail - 1) % MAX_QUEUED_ENCODER_EVENTS;
+}
 
-    action_exec(clockwise ? MAKE_ENCODER_CW_EVENT(index, false) : MAKE_ENCODER_CCW_EVENT(index, false));
-#    if ENCODER_MAP_KEY_DELAY > 0
-    wait_ms(ENCODER_MAP_KEY_DELAY);
-#    endif // ENCODER_MAP_KEY_DELAY > 0
+bool encoder_queue_full(void) {
+    return encoder_queue_full_advanced(&encoder_events);
 }
-#endif // ENCODER_MAP_ENABLE
 
-static bool encoder_update(uint8_t index, uint8_t state) {
-    bool    changed = false;
-    uint8_t i       = index;
+bool encoder_queue_empty_advanced(encoder_events_t *events) {
+    return events->head == events->tail;
+}
 
-#ifdef ENCODER_RESOLUTIONS
-    const uint8_t resolution = encoder_resolutions[i];
-#else
-    const uint8_t resolution = ENCODER_RESOLUTION;
-#endif
+bool encoder_queue_empty(void) {
+    return encoder_queue_empty_advanced(&encoder_events);
+}
 
-#ifdef SPLIT_KEYBOARD
-    index += thisHand;
-#endif
-    encoder_pulses[i] += encoder_LUT[state & 0xF];
+bool encoder_queue_event_advanced(encoder_events_t *events, uint8_t index, bool clockwise) {
+    // Drop out if we're full
+    if (encoder_queue_full_advanced(events)) {
+        return false;
+    }
 
-#ifdef ENCODER_DEFAULT_POS
-    if ((encoder_pulses[i] >= resolution) || (encoder_pulses[i] <= -resolution) || ((state & 0x3) == ENCODER_DEFAULT_POS)) {
-        if (encoder_pulses[i] >= 1) {
-#else
-    if (encoder_pulses[i] >= resolution) {
-#endif
+    // Append the event
+    encoder_event_t new_event   = {.index = index, .clockwise = clockwise ? 1 : 0};
+    events->queue[events->head] = new_event;
 
-            encoder_value[index]++;
-            changed = true;
-#ifdef SPLIT_KEYBOARD
-            if (should_process_encoder())
-#endif // SPLIT_KEYBOARD
-#ifdef ENCODER_MAP_ENABLE
-                encoder_exec_mapping(index, ENCODER_COUNTER_CLOCKWISE);
-#else  // ENCODER_MAP_ENABLE
-        encoder_update_kb(index, ENCODER_COUNTER_CLOCKWISE);
-#endif // ENCODER_MAP_ENABLE
-        }
+    // Increment the head index
+    events->head = (events->head + 1) % MAX_QUEUED_ENCODER_EVENTS;
+    events->enqueued++;
 
-#ifdef ENCODER_DEFAULT_POS
-        if (encoder_pulses[i] <= -1) {
-#else
-    if (encoder_pulses[i] <= -resolution) { // direction is arbitrary here, but this clockwise
-#endif
-            encoder_value[index]--;
-            changed = true;
-#ifdef SPLIT_KEYBOARD
-            if (should_process_encoder())
-#endif // SPLIT_KEYBOARD
-#ifdef ENCODER_MAP_ENABLE
-                encoder_exec_mapping(index, ENCODER_CLOCKWISE);
-#else  // ENCODER_MAP_ENABLE
-        encoder_update_kb(index, ENCODER_CLOCKWISE);
-#endif // ENCODER_MAP_ENABLE
-        }
-        encoder_pulses[i] %= resolution;
-#ifdef ENCODER_DEFAULT_POS
-        encoder_pulses[i] = 0;
-    }
-#endif
-    return changed;
+    return true;
 }
 
-bool encoder_read(void) {
-    bool changed = false;
-    for (uint8_t i = 0; i < thisCount; i++) {
-        uint8_t new_status = (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
-        if ((encoder_state[i] & 0x3) != new_status) {
-            encoder_state[i] <<= 2;
-            encoder_state[i] |= new_status;
-            changed |= encoder_update(i, encoder_state[i]);
-        }
+bool encoder_dequeue_event_advanced(encoder_events_t *events, uint8_t *index, bool *clockwise) {
+    if (encoder_queue_empty_advanced(events)) {
+        return false;
     }
-    return changed;
+
+    // Retrieve the event
+    encoder_event_t event = events->queue[events->tail];
+    *index                = event.index;
+    *clockwise            = event.clockwise;
+
+    // Increment the tail index
+    events->tail = (events->tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+    events->dequeued++;
+
+    return true;
 }
 
-#ifdef SPLIT_KEYBOARD
-void last_encoder_activity_trigger(void);
+bool encoder_queue_event(uint8_t index, bool clockwise) {
+    return encoder_queue_event_advanced(&encoder_events, index, clockwise);
+}
 
-void encoder_state_raw(uint8_t *slave_state) {
-    memcpy(slave_state, &encoder_value[thisHand], sizeof(uint8_t) * thisCount);
+bool encoder_dequeue_event(uint8_t *index, bool *clockwise) {
+    return encoder_dequeue_event_advanced(&encoder_events, index, clockwise);
 }
 
-void encoder_update_raw(uint8_t *slave_state) {
-    bool changed = false;
-    for (uint8_t i = 0; i < thatCount; i++) { // Note inverted logic -- we want the opposite side
-        const uint8_t index = i + thatHand;
-        int8_t        delta = slave_state[i] - encoder_value[index];
-        while (delta > 0) {
-            delta--;
-            encoder_value[index]++;
-            changed = true;
-#    ifdef ENCODER_MAP_ENABLE
-            encoder_exec_mapping(index, ENCODER_COUNTER_CLOCKWISE);
-#    else  // ENCODER_MAP_ENABLE
-            encoder_update_kb(index, ENCODER_COUNTER_CLOCKWISE);
-#    endif // ENCODER_MAP_ENABLE
-        }
-        while (delta < 0) {
-            delta++;
-            encoder_value[index]--;
-            changed = true;
-#    ifdef ENCODER_MAP_ENABLE
-            encoder_exec_mapping(index, ENCODER_CLOCKWISE);
-#    else  // ENCODER_MAP_ENABLE
-            encoder_update_kb(index, ENCODER_CLOCKWISE);
-#    endif // ENCODER_MAP_ENABLE
+void encoder_retrieve_events(encoder_events_t *events) {
+    memcpy(events, &encoder_events, sizeof(encoder_events));
+}
+
+void encoder_signal_queue_drain(void) {
+    signal_queue_drain = 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) {
+    bool res = encoder_update_user(index, clockwise);
+#if !defined(ENCODER_TESTS)
+    if (res) {
+        if (clockwise) {
+#    if defined(EXTRAKEY_ENABLE)
+            tap_code_delay(KC_VOLU, 10);
+#    elif defined(MOUSEKEY_ENABLE)
+            tap_code_delay(KC_MS_WH_UP, 10);
+#    else
+            tap_code_delay(KC_PGDN, 10);
+#    endif
+        } else {
+#    if defined(EXTRAKEY_ENABLE)
+            tap_code_delay(KC_VOLD, 10);
+#    elif defined(MOUSEKEY_ENABLE)
+            tap_code_delay(KC_MS_WH_DOWN, 10);
+#    else
+            tap_code_delay(KC_PGUP, 10);
+#    endif
         }
     }
-
-    // Update the last encoder input time -- handled external to encoder_read() when we're running a split
-    if (changed) last_encoder_activity_trigger();
+#endif // ENCODER_TESTS
+    return res;
 }
-#endif
diff --git a/quantum/encoder.h b/quantum/encoder.h
index 1cbac98cb57..317a91f1da5 100644
--- a/quantum/encoder.h
+++ b/quantum/encoder.h
@@ -22,45 +22,93 @@
 #include "gpio.h"
 #include "util.h"
 
+#ifdef ENCODER_ENABLE
+
+__attribute__((weak)) bool should_process_encoder(void);
+
 void encoder_init(void);
-bool encoder_read(void);
+bool encoder_task(void);
+bool encoder_queue_event(uint8_t index, bool clockwise);
+bool encoder_dequeue_event(uint8_t *index, bool *clockwise);
 
 bool encoder_update_kb(uint8_t index, bool clockwise);
 bool encoder_update_user(uint8_t index, bool clockwise);
 
-#ifdef SPLIT_KEYBOARD
+#    ifdef SPLIT_KEYBOARD
+
+#        if defined(ENCODERS_PAD_A_RIGHT)
+#            ifndef NUM_ENCODERS_LEFT
+#                define NUM_ENCODERS_LEFT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
+#            endif
+#            ifndef NUM_ENCODERS_RIGHT
+#                define NUM_ENCODERS_RIGHT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A_RIGHT))
+#            endif
+#        else
+#            ifndef NUM_ENCODERS_LEFT
+#                define NUM_ENCODERS_LEFT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
+#            endif
+#            ifndef NUM_ENCODERS_RIGHT
+#                define NUM_ENCODERS_RIGHT NUM_ENCODERS_LEFT
+#            endif
+#        endif
+#        ifndef NUM_ENCODERS
+#            define NUM_ENCODERS (NUM_ENCODERS_LEFT + NUM_ENCODERS_RIGHT)
+#        endif
+
+#    else // SPLIT_KEYBOARD
+
+#        ifndef NUM_ENCODERS
+#            define NUM_ENCODERS ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
+#        endif
+#        define NUM_ENCODERS_LEFT NUM_ENCODERS
+#        define NUM_ENCODERS_RIGHT 0
 
-void encoder_state_raw(uint8_t* slave_state);
-void encoder_update_raw(uint8_t* slave_state);
+#    endif // SPLIT_KEYBOARD
 
-#    if defined(ENCODERS_PAD_A_RIGHT)
-#        define NUM_ENCODERS_LEFT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
-#        define NUM_ENCODERS_RIGHT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A_RIGHT))
-#    else
-#        define NUM_ENCODERS_LEFT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
-#        define NUM_ENCODERS_RIGHT NUM_ENCODERS_LEFT
-#    endif
-#    define NUM_ENCODERS (NUM_ENCODERS_LEFT + NUM_ENCODERS_RIGHT)
+#    ifndef NUM_ENCODERS
+#        define NUM_ENCODERS 0
+#        define NUM_ENCODERS_LEFT 0
+#        define NUM_ENCODERS_RIGHT 0
+#    endif // NUM_ENCODERS
 
-#else // SPLIT_KEYBOARD
+#    define NUM_ENCODERS_MAX_PER_SIDE MAX(NUM_ENCODERS_LEFT, NUM_ENCODERS_RIGHT)
 
-#    define NUM_ENCODERS ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
-#    define NUM_ENCODERS_LEFT NUM_ENCODERS
-#    define NUM_ENCODERS_RIGHT 0
+#    ifndef MAX_QUEUED_ENCODER_EVENTS
+#        define MAX_QUEUED_ENCODER_EVENTS MAX(4, ((NUM_ENCODERS_MAX_PER_SIDE) + 1))
+#    endif // MAX_QUEUED_ENCODER_EVENTS
 
-#endif // SPLIT_KEYBOARD
+typedef struct encoder_event_t {
+    uint8_t index : 7;
+    uint8_t clockwise : 1;
+} encoder_event_t;
 
-#ifndef NUM_ENCODERS
-#    define NUM_ENCODERS 0
-#    define NUM_ENCODERS_LEFT 0
-#    define NUM_ENCODERS_RIGHT 0
-#endif // NUM_ENCODERS
+typedef struct encoder_events_t {
+    uint8_t         enqueued;
+    uint8_t         dequeued;
+    uint8_t         head;
+    uint8_t         tail;
+    encoder_event_t queue[MAX_QUEUED_ENCODER_EVENTS];
+} encoder_events_t;
 
-#define NUM_ENCODERS_MAX_PER_SIDE MAX(NUM_ENCODERS_LEFT, NUM_ENCODERS_RIGHT)
+// Get the current queued events
+void encoder_retrieve_events(encoder_events_t *events);
 
-#ifdef ENCODER_MAP_ENABLE
-#    define NUM_DIRECTIONS 2
-#    define ENCODER_CCW_CW(ccw, cw) \
-        { (cw), (ccw) }
+// Encoder event queue management
+bool encoder_queue_event_advanced(encoder_events_t *events, uint8_t index, bool clockwise);
+bool encoder_dequeue_event_advanced(encoder_events_t *events, uint8_t *index, bool *clockwise);
+
+// Reset the queue to be empty
+void encoder_signal_queue_drain(void);
+
+#    ifdef ENCODER_MAP_ENABLE
+#        define NUM_DIRECTIONS 2
+#        define ENCODER_CCW_CW(ccw, cw) \
+            { (cw), (ccw) }
 extern const uint16_t encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS];
-#endif // ENCODER_MAP_ENABLE
+#    endif // ENCODER_MAP_ENABLE
+
+// "Custom encoder lite" support
+void encoder_driver_init(void);
+void encoder_driver_task(void);
+
+#endif // ENCODER_ENABLE
diff --git a/quantum/encoder/tests/config_encoder_common.h b/quantum/encoder/tests/config_encoder_common.h
new file mode 100644
index 00000000000..6b3b20182b5
--- /dev/null
+++ b/quantum/encoder/tests/config_encoder_common.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+// Override the one in quantum/util because it doesn't like working on x64 builds.
+#define ARRAY_SIZE(array) (sizeof((array)) / sizeof((array)[0]))
diff --git a/quantum/encoder/tests/config_mock.h b/quantum/encoder/tests/config_mock.h
index 703dcaf1036..9eb59ddc881 100644
--- a/quantum/encoder/tests/config_mock.h
+++ b/quantum/encoder/tests/config_mock.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_left_eq_right.h b/quantum/encoder/tests/config_mock_split_left_eq_right.h
index c80ac4d5198..ea795657ef1 100644
--- a/quantum/encoder/tests/config_mock_split_left_eq_right.h
+++ b/quantum/encoder/tests/config_mock_split_left_eq_right.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_left_gt_right.h b/quantum/encoder/tests/config_mock_split_left_gt_right.h
index 91d5f3d6058..abcfe039189 100644
--- a/quantum/encoder/tests/config_mock_split_left_gt_right.h
+++ b/quantum/encoder/tests/config_mock_split_left_gt_right.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_left_lt_right.h b/quantum/encoder/tests/config_mock_split_left_lt_right.h
index 4108a184a68..075c774b0d1 100644
--- a/quantum/encoder/tests/config_mock_split_left_lt_right.h
+++ b/quantum/encoder/tests/config_mock_split_left_lt_right.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_no_left.h b/quantum/encoder/tests/config_mock_split_no_left.h
index 9db7fa7e41b..dfd8358929b 100644
--- a/quantum/encoder/tests/config_mock_split_no_left.h
+++ b/quantum/encoder/tests/config_mock_split_no_left.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_no_right.h b/quantum/encoder/tests/config_mock_split_no_right.h
index 14f18015e66..5683eade8c9 100644
--- a/quantum/encoder/tests/config_mock_split_no_right.h
+++ b/quantum/encoder/tests/config_mock_split_no_right.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_role.h b/quantum/encoder/tests/config_mock_split_role.h
index c80ac4d5198..ea795657ef1 100644
--- a/quantum/encoder/tests/config_mock_split_role.h
+++ b/quantum/encoder/tests/config_mock_split_role.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/encoder_tests.cpp b/quantum/encoder/tests/encoder_tests.cpp
index b7c18aeec00..499e413aed4 100644
--- a/quantum/encoder/tests/encoder_tests.cpp
+++ b/quantum/encoder/tests/encoder_tests.cpp
@@ -41,7 +41,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderTest : public ::testing::Test {};
diff --git a/quantum/encoder/tests/encoder_tests_split_left_eq_right.cpp b/quantum/encoder/tests/encoder_tests_split_left_eq_right.cpp
index 916e47b1851..7d6b3e30e6b 100644
--- a/quantum/encoder/tests/encoder_tests_split_left_eq_right.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_left_eq_right.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestLeftEqRight : public ::testing::Test {
@@ -63,6 +70,7 @@ class EncoderSplitTestLeftEqRight : public ::testing::Test {
 };
 
 TEST_F(EncoderSplitTestLeftEqRight, TestInitLeft) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     EXPECT_EQ(pinIsInputHigh[0], true);
@@ -77,6 +85,7 @@ TEST_F(EncoderSplitTestLeftEqRight, TestInitLeft) {
 }
 
 TEST_F(EncoderSplitTestLeftEqRight, TestInitRight) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     EXPECT_EQ(pinIsInputHigh[0], false);
@@ -90,7 +99,8 @@ TEST_F(EncoderSplitTestLeftEqRight, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseLeft) {
+TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -102,9 +112,19 @@ TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseLeft) {
     EXPECT_EQ(updates_array_idx, 1); // one update received
     EXPECT_EQ(updates[0].index, 0);
     EXPECT_EQ(updates[0].clockwise, true);
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseRightSent) {
+TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseRightMaster) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -113,23 +133,60 @@ TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseRightSent) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 3);
+    EXPECT_EQ(updates[0].clockwise, true);
 
-    EXPECT_EQ(slave_state[0], 0);
-    EXPECT_EQ(slave_state[1], 0xFF);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftEqRight, TestMultipleEncodersRightReceived) {
+TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseLeftSlave) {
+    isMaster   = false;
     isLeftHand = true;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(0, false);
+    setAndRead(1, false);
+    setAndRead(0, true);
+    setAndRead(1, true);
 
-    uint8_t slave_state[32] = {1, 0xFF}; // First right encoder is CCW, Second right encoder CW
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 2); // two updates received, one for each changed item on the right side
-    EXPECT_EQ(updates[0].index, 2);
-    EXPECT_EQ(updates[0].clockwise, false);
-    EXPECT_EQ(updates[1].index, 3);
-    EXPECT_EQ(updates[1].clockwise, true);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
+}
+
+TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseRightSlave) {
+    isMaster   = false;
+    isLeftHand = false;
+    encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(6, false);
+    setAndRead(7, false);
+    setAndRead(6, true);
+    setAndRead(7, true);
+
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_left_gt_right.cpp b/quantum/encoder/tests/encoder_tests_split_left_gt_right.cpp
index 7b64bb29813..2beb4e39720 100644
--- a/quantum/encoder/tests/encoder_tests_split_left_gt_right.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_left_gt_right.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestLeftGreaterThanRight : public ::testing::Test {
@@ -94,7 +101,8 @@ TEST_F(EncoderSplitTestLeftGreaterThanRight, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseLeft) {
+TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -106,9 +114,19 @@ TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseLeft) {
     EXPECT_EQ(updates_array_idx, 1); // one update received
     EXPECT_EQ(updates[0].index, 0);
     EXPECT_EQ(updates[0].clockwise, true);
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseRightSent) {
+TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseRightMaster) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -117,23 +135,60 @@ TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseRightSent) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 3);
+    EXPECT_EQ(updates[0].clockwise, true);
 
-    EXPECT_EQ(slave_state[0], 0xFF);
-    EXPECT_EQ(slave_state[1], 0);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftGreaterThanRight, TestMultipleEncodersRightReceived) {
+TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseLeftSlave) {
+    isMaster   = false;
     isLeftHand = true;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(0, false);
+    setAndRead(1, false);
+    setAndRead(0, true);
+    setAndRead(1, true);
 
-    uint8_t slave_state[32] = {1, 0xFF}; // First right encoder is CCW, Second right encoder no change, third right encoder CW
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 2); // two updates received, one for each changed item on the right side
-    EXPECT_EQ(updates[0].index, 3);
-    EXPECT_EQ(updates[0].clockwise, false);
-    EXPECT_EQ(updates[1].index, 4);
-    EXPECT_EQ(updates[1].clockwise, true);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
+}
+
+TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseRightSlave) {
+    isMaster   = false;
+    isLeftHand = false;
+    encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(6, false);
+    setAndRead(7, false);
+    setAndRead(6, true);
+    setAndRead(7, true);
+
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_left_lt_right.cpp b/quantum/encoder/tests/encoder_tests_split_left_lt_right.cpp
index a6519c57625..5612f8b6589 100644
--- a/quantum/encoder/tests/encoder_tests_split_left_lt_right.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_left_lt_right.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestLeftLessThanRight : public ::testing::Test {
@@ -94,7 +101,8 @@ TEST_F(EncoderSplitTestLeftLessThanRight, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseLeft) {
+TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -106,9 +114,19 @@ TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseLeft) {
     EXPECT_EQ(updates_array_idx, 1); // one update received
     EXPECT_EQ(updates[0].index, 0);
     EXPECT_EQ(updates[0].clockwise, true);
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseRightSent) {
+TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseRightMaster) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -117,23 +135,60 @@ TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseRightSent) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 3);
+    EXPECT_EQ(updates[0].clockwise, true);
 
-    EXPECT_EQ(slave_state[0], 0);
-    EXPECT_EQ(slave_state[1], 0xFF);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftLessThanRight, TestMultipleEncodersRightReceived) {
+TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseLeftSlave) {
+    isMaster   = false;
     isLeftHand = true;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(0, false);
+    setAndRead(1, false);
+    setAndRead(0, true);
+    setAndRead(1, true);
 
-    uint8_t slave_state[32] = {1, 0, 0xFF}; // First right encoder is CCW, Second right encoder no change, third right encoder CW
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 2); // two updates received, one for each changed item on the right side
-    EXPECT_EQ(updates[0].index, 2);
-    EXPECT_EQ(updates[0].clockwise, false);
-    EXPECT_EQ(updates[1].index, 4);
-    EXPECT_EQ(updates[1].clockwise, true);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
+}
+
+TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseRightSlave) {
+    isMaster   = false;
+    isLeftHand = false;
+    encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(6, false);
+    setAndRead(7, false);
+    setAndRead(6, true);
+    setAndRead(7, true);
+
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_no_left.cpp b/quantum/encoder/tests/encoder_tests_split_no_left.cpp
index b6b2d7e2d19..980e4074ffd 100644
--- a/quantum/encoder/tests/encoder_tests_split_no_left.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_no_left.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestNoLeft : public ::testing::Test {
@@ -82,19 +89,8 @@ TEST_F(EncoderSplitTestNoLeft, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseLeft) {
-    isLeftHand = true;
-    encoder_init();
-    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
-    setAndRead(0, false);
-    setAndRead(1, false);
-    setAndRead(0, true);
-    setAndRead(1, true);
-
-    EXPECT_EQ(updates_array_idx, 0); // no updates received
-}
-
-TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseRightSent) {
+TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -103,23 +99,38 @@ TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseRightSent) {
     setAndRead(2, true);
     setAndRead(3, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 1);
+    EXPECT_EQ(updates[0].clockwise, true);
 
-    EXPECT_EQ(slave_state[0], 0);
-    EXPECT_EQ(slave_state[1], 0xFF);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestNoLeft, TestMultipleEncodersRightReceived) {
-    isLeftHand = true;
+TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseRightSlave) {
+    isMaster   = false;
+    isLeftHand = false;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(2, false);
+    setAndRead(3, false);
+    setAndRead(2, true);
+    setAndRead(3, true);
 
-    uint8_t slave_state[32] = {1, 0xFF}; // First right encoder is CCW, Second right encoder no change, third right encoder CW
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 2); // two updates received, one for each changed item on the right side
-    EXPECT_EQ(updates[0].index, 0);
-    EXPECT_EQ(updates[0].clockwise, false);
-    EXPECT_EQ(updates[1].index, 1);
-    EXPECT_EQ(updates[1].clockwise, true);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_no_right.cpp b/quantum/encoder/tests/encoder_tests_split_no_right.cpp
index fa0a7c18a80..d39659853b2 100644
--- a/quantum/encoder/tests/encoder_tests_split_no_right.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_no_right.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestNoRight : public ::testing::Test {
@@ -82,37 +89,48 @@ TEST_F(EncoderSplitTestNoRight, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestNoRight, TestOneClockwiseLeft) {
+TEST_F(EncoderSplitTestNoRight, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
-    setAndRead(0, false);
-    setAndRead(1, false);
-    setAndRead(0, true);
-    setAndRead(1, true);
+    setAndRead(2, false);
+    setAndRead(3, false);
+    setAndRead(2, true);
+    setAndRead(3, true);
 
-    EXPECT_EQ(updates_array_idx, 1); // one updates received
-    EXPECT_EQ(updates[0].index, 0);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 1);
     EXPECT_EQ(updates[0].clockwise, true);
-}
 
-TEST_F(EncoderSplitTestNoRight, TestOneClockwiseRightSent) {
-    isLeftHand = false;
-    encoder_init();
-
-    uint8_t slave_state[32] = {0xAA, 0xAA};
-    encoder_state_raw(slave_state);
-
-    EXPECT_EQ(slave_state[0], 0xAA);
-    EXPECT_EQ(slave_state[1], 0xAA);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestNoRight, TestMultipleEncodersRightReceived) {
+TEST_F(EncoderSplitTestNoRight, TestOneClockwiseRightSlave) {
+    isMaster   = false;
     isLeftHand = true;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(2, false);
+    setAndRead(3, false);
+    setAndRead(2, true);
+    setAndRead(3, true);
 
-    uint8_t slave_state[32] = {1, 0xFF}; // These values would trigger updates if there were encoders on the other side
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 0); // no updates received -- no right-hand encoders
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_role.cpp b/quantum/encoder/tests/encoder_tests_split_role.cpp
index 0ab7bfc2a78..b588af8c70a 100644
--- a/quantum/encoder/tests/encoder_tests_split_role.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_role.cpp
@@ -50,7 +50,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestRole : public ::testing::Test {
@@ -87,9 +87,6 @@ TEST_F(EncoderSplitTestRole, TestPrimaryRight) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
-
     EXPECT_EQ(num_updates, 1); // one update received
 }
 
@@ -116,8 +113,5 @@ TEST_F(EncoderSplitTestRole, TestNotPrimaryRight) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
-
     EXPECT_EQ(num_updates, 0); // zero updates received
 }
diff --git a/quantum/encoder/tests/mock.c b/quantum/encoder/tests/mock.c
index 61f2f8294df..1524e61ca48 100644
--- a/quantum/encoder/tests/mock.c
+++ b/quantum/encoder/tests/mock.c
@@ -19,14 +19,14 @@
 bool pins[32]           = {0};
 bool pinIsInputHigh[32] = {0};
 
-uint8_t mockSetPinInputHigh(pin_t pin) {
+uint8_t mock_set_pin_input_high(pin_t pin) {
     // dprintf("Setting pin %d input high.", pin);
     pins[pin]           = true;
     pinIsInputHigh[pin] = true;
     return 0;
 }
 
-bool mockReadPin(pin_t pin) {
+bool mock_read_pin(pin_t pin) {
     return pins[pin];
 }
 
diff --git a/quantum/encoder/tests/mock.h b/quantum/encoder/tests/mock.h
index 80c336b5ef6..28774b82ab2 100644
--- a/quantum/encoder/tests/mock.h
+++ b/quantum/encoder/tests/mock.h
@@ -24,11 +24,11 @@ typedef uint8_t pin_t;
 extern bool pins[];
 extern bool pinIsInputHigh[];
 
-#define setPinInputHigh(pin) (mockSetPinInputHigh(pin))
-#define readPin(pin) (mockReadPin(pin))
+#define gpio_set_pin_input_high(pin) (mock_set_pin_input_high(pin))
+#define gpio_read_pin(pin) (mock_read_pin(pin))
 
-uint8_t mockSetPinInputHigh(pin_t pin);
+uint8_t mock_set_pin_input_high(pin_t pin);
 
-bool mockReadPin(pin_t pin);
+bool mock_read_pin(pin_t pin);
 
 bool setPin(pin_t pin, bool val);
diff --git a/quantum/encoder/tests/mock_split.c b/quantum/encoder/tests/mock_split.c
index 5cc6cd19e17..fb5f074fbb7 100644
--- a/quantum/encoder/tests/mock_split.c
+++ b/quantum/encoder/tests/mock_split.c
@@ -19,14 +19,14 @@
 bool pins[32]           = {0};
 bool pinIsInputHigh[32] = {0};
 
-uint8_t mockSetPinInputHigh(pin_t pin) {
+uint8_t mock_set_pin_input_high(pin_t pin) {
     // dprintf("Setting pin %d input high.", pin);
     pins[pin]           = true;
     pinIsInputHigh[pin] = true;
     return 0;
 }
 
-bool mockReadPin(pin_t pin) {
+bool mock_read_pin(pin_t pin) {
     return pins[pin];
 }
 
@@ -36,7 +36,3 @@ bool setPin(pin_t pin, bool val) {
 }
 
 void last_encoder_activity_trigger(void) {}
-
-__attribute__((weak)) bool is_keyboard_master(void) {
-    return true;
-}
diff --git a/quantum/encoder/tests/mock_split.h b/quantum/encoder/tests/mock_split.h
index 2fc12f18306..0d108afa6e5 100644
--- a/quantum/encoder/tests/mock_split.h
+++ b/quantum/encoder/tests/mock_split.h
@@ -22,17 +22,14 @@
 #define SPLIT_KEYBOARD
 typedef uint8_t pin_t;
 
-void encoder_state_raw(uint8_t* slave_state);
-void encoder_update_raw(uint8_t* slave_state);
-
 extern bool pins[];
 extern bool pinIsInputHigh[];
 
-#define setPinInputHigh(pin) (mockSetPinInputHigh(pin))
-#define readPin(pin) (mockReadPin(pin))
+#define gpio_set_pin_input_high(pin) (mock_set_pin_input_high(pin))
+#define gpio_read_pin(pin) (mock_read_pin(pin))
 
-uint8_t mockSetPinInputHigh(pin_t pin);
+uint8_t mock_set_pin_input_high(pin_t pin);
 
-bool mockReadPin(pin_t pin);
+bool mock_read_pin(pin_t pin);
 
 bool setPin(pin_t pin, bool val);
diff --git a/quantum/encoder/tests/rules.mk b/quantum/encoder/tests/rules.mk
index d01c1c66ee5..eb6106039ee 100644
--- a/quantum/encoder/tests/rules.mk
+++ b/quantum/encoder/tests/rules.mk
@@ -3,6 +3,7 @@ encoder_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock.h
 
 encoder_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -13,6 +14,7 @@ encoder_split_left_eq_right_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_
 
 encoder_split_left_eq_right_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_left_eq_right.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -23,6 +25,7 @@ encoder_split_left_gt_right_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_
 
 encoder_split_left_gt_right_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_left_gt_right.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -33,6 +36,7 @@ encoder_split_left_lt_right_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_
 
 encoder_split_left_lt_right_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_left_lt_right.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -43,6 +47,7 @@ encoder_split_no_left_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_split_
 
 encoder_split_no_left_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_no_left.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -53,6 +58,7 @@ encoder_split_no_right_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_split
 
 encoder_split_no_right_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_no_right.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -63,6 +69,7 @@ encoder_split_role_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_split_rol
 
 encoder_split_role_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_role.cpp \
 	$(QUANTUM_PATH)/encoder.c
diff --git a/quantum/haptic.c b/quantum/haptic.c
index a1fea296258..6a466293a74 100644
--- a/quantum/haptic.c
+++ b/quantum/haptic.c
@@ -96,10 +96,10 @@ void haptic_init(void) {
 #endif
     eeconfig_debug_haptic();
 #ifdef HAPTIC_ENABLE_PIN
-    setPinOutput(HAPTIC_ENABLE_PIN);
+    gpio_set_pin_output(HAPTIC_ENABLE_PIN);
 #endif
 #ifdef HAPTIC_ENABLE_STATUS_LED
-    setPinOutput(HAPTIC_ENABLE_STATUS_LED);
+    gpio_set_pin_output(HAPTIC_ENABLE_STATUS_LED);
 #endif
 }
 
@@ -356,9 +356,9 @@ void haptic_shutdown(void) {
 void haptic_notify_usb_device_state_change(void) {
     update_haptic_enable_gpios();
 #if defined(HAPTIC_ENABLE_PIN)
-    setPinOutput(HAPTIC_ENABLE_PIN);
+    gpio_set_pin_output(HAPTIC_ENABLE_PIN);
 #endif
 #if defined(HAPTIC_ENABLE_STATUS_LED)
-    setPinOutput(HAPTIC_ENABLE_STATUS_LED);
+    gpio_set_pin_output(HAPTIC_ENABLE_STATUS_LED);
 #endif
 }
diff --git a/quantum/haptic.h b/quantum/haptic.h
index 5bd1a71916d..b283d5d2687 100644
--- a/quantum/haptic.h
+++ b/quantum/haptic.h
@@ -84,22 +84,22 @@ void haptic_notify_usb_device_state_change(void);
 #    ifndef HAPTIC_ENABLE_PIN
 #        error HAPTIC_ENABLE_PIN not defined
 #    endif
-#    define HAPTIC_ENABLE_PIN_WRITE_ACTIVE() writePinLow(HAPTIC_ENABLE_PIN)
-#    define HAPTIC_ENABLE_PIN_WRITE_INACTIVE() writePinHigh(HAPTIC_ENABLE_PIN)
+#    define HAPTIC_ENABLE_PIN_WRITE_ACTIVE() gpio_write_pin_low(HAPTIC_ENABLE_PIN)
+#    define HAPTIC_ENABLE_PIN_WRITE_INACTIVE() gpio_write_pin_high(HAPTIC_ENABLE_PIN)
 #else
-#    define HAPTIC_ENABLE_PIN_WRITE_ACTIVE() writePinHigh(HAPTIC_ENABLE_PIN)
-#    define HAPTIC_ENABLE_PIN_WRITE_INACTIVE() writePinLow(HAPTIC_ENABLE_PIN)
+#    define HAPTIC_ENABLE_PIN_WRITE_ACTIVE() gpio_write_pin_high(HAPTIC_ENABLE_PIN)
+#    define HAPTIC_ENABLE_PIN_WRITE_INACTIVE() gpio_write_pin_low(HAPTIC_ENABLE_PIN)
 #endif
 
 #ifdef HAPTIC_ENABLE_STATUS_LED_ACTIVE_LOW
 #    ifndef HAPTIC_ENABLE_STATUS_LED
 #        error HAPTIC_ENABLE_STATUS_LED not defined
 #    endif
-#    define HAPTIC_ENABLE_STATUS_LED_WRITE_ACTIVE() writePinLow(HAPTIC_ENABLE_STATUS_LED)
-#    define HAPTIC_ENABLE_STATUS_LED_WRITE_INACTIVE() writePinHigh(HAPTIC_ENABLE_STATUS_LED)
+#    define HAPTIC_ENABLE_STATUS_LED_WRITE_ACTIVE() gpio_write_pin_low(HAPTIC_ENABLE_STATUS_LED)
+#    define HAPTIC_ENABLE_STATUS_LED_WRITE_INACTIVE() gpio_write_pin_high(HAPTIC_ENABLE_STATUS_LED)
 #else
-#    define HAPTIC_ENABLE_STATUS_LED_WRITE_ACTIVE() writePinHigh(HAPTIC_ENABLE_STATUS_LED)
-#    define HAPTIC_ENABLE_STATUS_LED_WRITE_INACTIVE() writePinLow(HAPTIC_ENABLE_STATUS_LED)
+#    define HAPTIC_ENABLE_STATUS_LED_WRITE_ACTIVE() gpio_write_pin_high(HAPTIC_ENABLE_STATUS_LED)
+#    define HAPTIC_ENABLE_STATUS_LED_WRITE_INACTIVE() gpio_write_pin_low(HAPTIC_ENABLE_STATUS_LED)
 #endif
 
 #ifndef HAPTIC_OFF_IN_LOW_POWER
diff --git a/quantum/joystick.c b/quantum/joystick.c
index 02818e4acd3..32f19b2cd99 100644
--- a/quantum/joystick.c
+++ b/quantum/joystick.c
@@ -15,10 +15,12 @@
  */
 
 #include "joystick.h"
-
-#include "analog.h"
 #include "wait.h"
 
+#if defined(JOYSTICK_ANALOG)
+#    include "analog.h"
+#endif
+
 joystick_t joystick_state = {
     .buttons = {0},
     .axes =
@@ -31,21 +33,47 @@ joystick_t joystick_state = {
 };
 
 // array defining the reading of analog values for each axis
-__attribute__((weak)) joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {};
+__attribute__((weak)) joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
+#if JOYSTICK_AXIS_COUNT > 0
+    [0 ...(JOYSTICK_AXIS_COUNT - 1)] = JOYSTICK_AXIS_VIRTUAL
+#endif
+};
 
-__attribute__((weak)) void joystick_task(void) {
-    joystick_read_axes();
+__attribute__((weak)) void joystick_axis_init(uint8_t axis) {
+    if (axis >= JOYSTICK_AXIS_COUNT) return;
+
+#if defined(JOYSTICK_ANALOG)
+    gpio_set_pin_input(joystick_axes[axis].input_pin);
+#endif
+}
+
+__attribute__((weak)) uint16_t joystick_axis_sample(uint8_t axis) {
+    if (axis >= JOYSTICK_AXIS_COUNT) return 0;
+
+#if defined(JOYSTICK_ANALOG)
+    return analogReadPin(joystick_axes[axis].input_pin);
+#else
+    // default to resting position
+    return joystick_axes[axis].mid_digit;
+#endif
+}
+
+static inline bool is_virtual_axis(uint8_t axis) {
+    return joystick_axes[axis].input_pin == NO_PIN;
 }
 
 void joystick_flush(void) {
-    if (joystick_state.dirty) {
-        host_joystick_send(&joystick_state);
-        joystick_state.dirty = false;
-    }
+    if (!joystick_state.dirty) return;
+
+    // TODO: host.h?
+    void host_joystick_send(joystick_t * joystick);
+    host_joystick_send(&joystick_state);
+    joystick_state.dirty = false;
 }
 
 void register_joystick_button(uint8_t button) {
     if (button >= JOYSTICK_BUTTON_COUNT) return;
+
     joystick_state.buttons[button / 8] |= 1 << (button % 8);
     joystick_state.dirty = true;
     joystick_flush();
@@ -53,6 +81,7 @@ void register_joystick_button(uint8_t button) {
 
 void unregister_joystick_button(uint8_t button) {
     if (button >= JOYSTICK_BUTTON_COUNT) return;
+
     joystick_state.buttons[button / 8] &= ~(1 << (button % 8));
     joystick_state.dirty = true;
     joystick_flush();
@@ -61,37 +90,7 @@ void unregister_joystick_button(uint8_t button) {
 int16_t joystick_read_axis(uint8_t axis) {
     if (axis >= JOYSTICK_AXIS_COUNT) return 0;
 
-    // disable pull-up resistor
-    writePinLow(joystick_axes[axis].input_pin);
-
-    // if pin was a pull-up input, we need to uncharge it by turning it low
-    // before making it a low input
-    setPinOutput(joystick_axes[axis].input_pin);
-
-    wait_us(10);
-
-    if (joystick_axes[axis].output_pin != JS_VIRTUAL_AXIS) {
-        setPinOutput(joystick_axes[axis].output_pin);
-        writePinHigh(joystick_axes[axis].output_pin);
-    }
-
-    if (joystick_axes[axis].ground_pin != JS_VIRTUAL_AXIS) {
-        setPinOutput(joystick_axes[axis].ground_pin);
-        writePinLow(joystick_axes[axis].ground_pin);
-    }
-
-    wait_us(10);
-
-    setPinInput(joystick_axes[axis].input_pin);
-
-    wait_us(10);
-
-#if defined(ANALOG_JOYSTICK_ENABLE) && (defined(__AVR__) || defined(PROTOCOL_CHIBIOS))
-    int16_t axis_val = analogReadPin(joystick_axes[axis].input_pin);
-#else
-    // default to resting position
-    int16_t axis_val = joystick_axes[axis].mid_digit;
-#endif
+    int16_t axis_val = joystick_axis_sample(axis);
 
     // test the converted value against the lower range
     int32_t ref        = joystick_axes[axis].mid_digit;
@@ -111,10 +110,22 @@ int16_t joystick_read_axis(uint8_t axis) {
     return ranged_val;
 }
 
+void joystick_init_axes(void) {
+#if JOYSTICK_AXIS_COUNT > 0
+    for (int i = 0; i < JOYSTICK_AXIS_COUNT; ++i) {
+        if (is_virtual_axis(i)) {
+            continue;
+        }
+
+        joystick_axis_init(i);
+    }
+#endif
+}
+
 void joystick_read_axes(void) {
 #if JOYSTICK_AXIS_COUNT > 0
     for (int i = 0; i < JOYSTICK_AXIS_COUNT; ++i) {
-        if (joystick_axes[i].input_pin == JS_VIRTUAL_AXIS) {
+        if (is_virtual_axis(i)) {
             continue;
         }
 
@@ -133,3 +144,11 @@ void joystick_set_axis(uint8_t axis, int16_t value) {
         joystick_state.dirty      = true;
     }
 }
+
+void joystick_init(void) {
+    joystick_init_axes();
+}
+
+void joystick_task(void) {
+    joystick_read_axes();
+}
diff --git a/quantum/joystick.h b/quantum/joystick.h
index 5de4ba66c6a..5a69ceac64a 100644
--- a/quantum/joystick.h
+++ b/quantum/joystick.h
@@ -52,24 +52,15 @@
 
 #define JOYSTICK_MAX_VALUE ((1L << (JOYSTICK_AXIS_RESOLUTION - 1)) - 1)
 
-// configure on input_pin of the joystick_axes array entry to JS_VIRTUAL_AXIS
-// to prevent it from being read from the ADC. This allows outputing forged axis value.
-//
-#define JS_VIRTUAL_AXIS 0xFF
-
+// configure on input_pin of the joystick_axes array entry to NO_PIN
+// to prevent it from being read from the ADC. This allows outputting forged axis value.
 #define JOYSTICK_AXIS_VIRTUAL \
-    { JS_VIRTUAL_AXIS, JS_VIRTUAL_AXIS, JS_VIRTUAL_AXIS, 0, 1023 }
+    { NO_PIN, 0, JOYSTICK_MAX_VALUE / 2, JOYSTICK_MAX_VALUE }
 #define JOYSTICK_AXIS_IN(INPUT_PIN, LOW, REST, HIGH) \
-    { JS_VIRTUAL_AXIS, INPUT_PIN, JS_VIRTUAL_AXIS, LOW, REST, HIGH }
-#define JOYSTICK_AXIS_IN_OUT(INPUT_PIN, OUTPUT_PIN, LOW, REST, HIGH) \
-    { OUTPUT_PIN, INPUT_PIN, JS_VIRTUAL_AXIS, LOW, REST, HIGH }
-#define JOYSTICK_AXIS_IN_OUT_GROUND(INPUT_PIN, OUTPUT_PIN, GROUND_PIN, LOW, REST, HIGH) \
-    { OUTPUT_PIN, INPUT_PIN, GROUND_PIN, LOW, REST, HIGH }
+    { INPUT_PIN, LOW, REST, HIGH }
 
 typedef struct {
-    pin_t output_pin;
     pin_t input_pin;
-    pin_t ground_pin;
 
     // the AVR ADC offers 10 bit precision, with significant bits on the higher part
     uint16_t min_digit;
@@ -87,6 +78,14 @@ typedef struct {
 
 extern joystick_t joystick_state;
 
+/**
+ * \brief Handle the initialization of the subsystem.
+ */
+void joystick_init(void);
+
+/**
+ * \brief Handle various subsystem background tasks.
+ */
 void joystick_task(void);
 
 /**
@@ -117,6 +116,9 @@ void unregister_joystick_button(uint8_t button);
  */
 int16_t joystick_read_axis(uint8_t axis);
 
+/**
+ * \brief Sample and process the all axis.
+ */
 void joystick_read_axes(void);
 
 /**
@@ -127,6 +129,4 @@ void joystick_read_axes(void);
  */
 void joystick_set_axis(uint8_t axis, int16_t value);
 
-void host_joystick_send(joystick_t *joystick);
-
 /** \} */
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 9bf4801e034..83e9909c07b 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keycode_config.h"
 #include "matrix.h"
 #include "keymap_introspection.h"
-#include "magic.h"
 #include "host.h"
 #include "led.h"
 #include "keycode.h"
@@ -33,6 +32,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sendchar.h"
 #include "eeconfig.h"
 #include "action_layer.h"
+#ifdef BOOTMAGIC_ENABLE
+#    include "bootmagic.h"
+#endif
 #ifdef AUDIO_ENABLE
 #    include "audio.h"
 #endif
@@ -141,6 +143,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef WPM_ENABLE
 #    include "wpm.h"
 #endif
+#ifdef OS_DETECTION_ENABLE
+#    include "os_detection.h"
+#endif
 
 static uint32_t last_input_modification_time = 0;
 uint32_t        last_input_activity_time(void) {
@@ -382,28 +387,30 @@ void housekeeping_task(void) {
     housekeeping_task_user();
 }
 
-/** \brief Init tasks previously located in matrix_init_quantum
+/** \brief quantum_init
  *
- * TODO: rationalise against keyboard_init and current split role
+ * Init global state
  */
 void quantum_init(void) {
-    magic();
-    led_init_ports();
-#ifdef BACKLIGHT_ENABLE
-    backlight_init_ports();
-#endif
-#ifdef AUDIO_ENABLE
-    audio_init();
-#endif
-#ifdef LED_MATRIX_ENABLE
-    led_matrix_init();
-#endif
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init();
-#endif
-#if defined(UNICODE_COMMON_ENABLE)
-    unicode_input_mode_init();
+    /* check signature */
+    if (!eeconfig_is_enabled()) {
+        eeconfig_init();
+    }
+
+    /* init globals */
+    debug_config.raw  = eeconfig_read_debug();
+    keymap_config.raw = eeconfig_read_keymap();
+
+#ifdef BOOTMAGIC_ENABLE
+    bootmagic();
 #endif
+
+    /* read here just incase bootmagic process changed its value */
+    layer_state_t default_layer = (layer_state_t)eeconfig_read_default_layer();
+    default_layer_set(default_layer);
+
+    /* Also initialize layer state to trigger callback functions for layer_state */
+    layer_state_set_kb((layer_state_t)layer_state);
 }
 
 /** \brief keyboard_init
@@ -424,6 +431,22 @@ void keyboard_init(void) {
 #endif
     matrix_init();
     quantum_init();
+    led_init_ports();
+#ifdef BACKLIGHT_ENABLE
+    backlight_init_ports();
+#endif
+#ifdef AUDIO_ENABLE
+    audio_init();
+#endif
+#ifdef LED_MATRIX_ENABLE
+    led_matrix_init();
+#endif
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_init();
+#endif
+#if defined(UNICODE_COMMON_ENABLE)
+    unicode_input_mode_init();
+#endif
 #if defined(CRC_ENABLE)
     crc_init();
 #endif
@@ -452,6 +475,9 @@ void keyboard_init(void) {
 #ifdef DIP_SWITCH_ENABLE
     dip_switch_init();
 #endif
+#ifdef JOYSTICK_ENABLE
+    joystick_init();
+#endif
 #ifdef SLEEP_LED_ENABLE
     sleep_led_init();
 #endif
@@ -627,7 +653,7 @@ void quantum_task(void) {
 #endif
 
 #ifdef DIP_SWITCH_ENABLE
-    dip_switch_read(false);
+    dip_switch_task();
 #endif
 
 #ifdef AUTO_SHIFT_ENABLE
@@ -675,7 +701,7 @@ void keyboard_task(void) {
 #endif
 
 #ifdef ENCODER_ENABLE
-    if (encoder_read()) {
+    if (encoder_task()) {
         last_encoder_activity_trigger();
         activity_has_occurred = true;
     }
@@ -730,4 +756,8 @@ void keyboard_task(void) {
 #endif
 
     led_task();
+
+#ifdef OS_DETECTION_ENABLE
+    os_detection_task();
+#endif
 }
diff --git a/quantum/keyboard.h b/quantum/keyboard.h
index 5ea57815a71..0f39fde6825 100644
--- a/quantum/keyboard.h
+++ b/quantum/keyboard.h
@@ -32,7 +32,7 @@ typedef struct {
     uint8_t row;
 } keypos_t;
 
-typedef enum keyevent_type_t { TICK_EVENT = 0, KEY_EVENT = 1, ENCODER_CW_EVENT = 2, ENCODER_CCW_EVENT = 3, COMBO_EVENT = 4 } keyevent_type_t;
+typedef enum keyevent_type_t { TICK_EVENT = 0, KEY_EVENT = 1, ENCODER_CW_EVENT = 2, ENCODER_CCW_EVENT = 3, COMBO_EVENT = 4, DIP_SWITCH_ON_EVENT = 5, DIP_SWITCH_OFF_EVENT = 6 } keyevent_type_t;
 
 /* key event */
 typedef struct {
@@ -48,6 +48,8 @@ typedef struct {
 /* special keypos_t entries */
 #define KEYLOC_ENCODER_CW 253
 #define KEYLOC_ENCODER_CCW 252
+#define KEYLOC_DIP_SWITCH_ON 251
+#define KEYLOC_DIP_SWITCH_OFF 250
 
 static inline bool IS_NOEVENT(const keyevent_t event) {
     return event.type == TICK_EVENT;
@@ -64,6 +66,9 @@ static inline bool IS_COMBOEVENT(const keyevent_t event) {
 static inline bool IS_ENCODEREVENT(const keyevent_t event) {
     return event.type == ENCODER_CW_EVENT || event.type == ENCODER_CCW_EVENT;
 }
+static inline bool IS_DIPSWITCHEVENT(const keyevent_t event) {
+    return event.type == DIP_SWITCH_ON_EVENT || event.type == DIP_SWITCH_OFF_EVENT;
+}
 
 /* Common keypos_t object factory */
 #define MAKE_KEYPOS(row_num, col_num) ((keypos_t){.row = (row_num), .col = (col_num)})
@@ -92,6 +97,12 @@ static inline bool IS_ENCODEREVENT(const keyevent_t event) {
 #    define MAKE_ENCODER_CCW_EVENT(enc_id, press) MAKE_EVENT(KEYLOC_ENCODER_CCW, (enc_id), (press), ENCODER_CCW_EVENT)
 #endif // ENCODER_MAP_ENABLE
 
+#ifdef DIP_SWITCH_MAP_ENABLE
+/* Dip Switch events */
+#    define MAKE_DIPSWITCH_ON_EVENT(switch_id, press) MAKE_EVENT(KEYLOC_DIP_SWITCH_ON, (switch_id), (press), DIP_SWITCH_ON_EVENT)
+#    define MAKE_DIPSWITCH_OFF_EVENT(switch_id, press) MAKE_EVENT(KEYLOC_DIP_SWITCH_OFF, (switch_id), (press), DIP_SWITCH_OFF_EVENT)
+#endif // DIP_SWITCH_MAP_ENABLE
+
 /* it runs once at early stage of startup before keyboard_init. */
 void keyboard_setup(void);
 /* it runs once after initializing host side protocol, debug and MCU peripherals. */
diff --git a/quantum/keycode_config.c b/quantum/keycode_config.c
index 864488a65c9..cbfbcc81407 100644
--- a/quantum/keycode_config.c
+++ b/quantum/keycode_config.c
@@ -16,6 +16,8 @@
 
 #include "keycode_config.h"
 
+keymap_config_t keymap_config;
+
 /** \brief keycode_config
  *
  * This function is used to check a specific keycode against the bootmagic config,
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index 39fd2e27266..69d62b57311 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 4ef80c5ad0c..0bde904c8ff 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -29,6 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "encoder.h"
 #endif
 
+#ifdef DIP_SWITCH_MAP_ENABLE
+#    include "dip_switch.h"
+#endif
+
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
 #endif
@@ -217,5 +221,13 @@ __attribute__((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key
         return keycode_at_encodermap_location(layer, key.col, false);
     }
 #endif // ENCODER_MAP_ENABLE
+#ifdef DIP_SWITCH_MAP_ENABLE
+    else if (key.row == KEYLOC_DIP_SWITCH_ON && key.col < NUM_DIP_SWITCHES) {
+        return keycode_at_dip_switch_map_location(key.col, true);
+    } else if (key.row == KEYLOC_DIP_SWITCH_OFF && key.col < NUM_DIP_SWITCHES) {
+        return keycode_at_dip_switch_map_location(key.col, false);
+    }
+#endif // DIP_SWITCH_MAP_ENABLE
+
     return KC_NO;
 }
diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h
index 6851c6b4e82..e553894b52c 100644
--- a/quantum/keymap_extras/keymap_belgian.h
+++ b/quantum/keymap_extras/keymap_belgian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h
index 448727decea..d1886efb102 100644
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_brazilian_abnt2.h b/quantum/keymap_extras/keymap_brazilian_abnt2.h
index 8fac7666c2a..7dfc2cbb3de 100644
--- a/quantum/keymap_extras/keymap_brazilian_abnt2.h
+++ b/quantum/keymap_extras/keymap_brazilian_abnt2.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_canadian_french.h b/quantum/keymap_extras/keymap_canadian_french.h
new file mode 100644
index 00000000000..63c9166a311
--- /dev/null
+++ b/quantum/keymap_extras/keymap_canadian_french.h
@@ -0,0 +1,122 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*******************************************************************************
+  88888888888 888      d8b                .d888 d8b 888               d8b
+      888     888      Y8P               d88P"  Y8P 888               Y8P
+      888     888                        888        888
+      888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
+      888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
+      888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
+      888     888  888 888      X88      888    888 888 Y8b.          888      X88
+      888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
+                                                        888                 888
+                                                        888                 888
+                                                        888                 888
+     .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
+    d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
+    888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
+    Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
+     "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
+         888
+    Y8b d88P
+     "Y88P"
+*******************************************************************************/
+
+#pragma once
+#include "keycodes.h"
+// clang-format off
+
+// Aliases
+#define FR_HASH KC_GRV  // #
+#define FR_1    KC_1    // 1
+#define FR_2    KC_2    // 2
+#define FR_3    KC_3    // 3
+#define FR_4    KC_4    // 4
+#define FR_5    KC_5    // 5
+#define FR_6    KC_6    // 6
+#define FR_7    KC_7    // 7
+#define FR_8    KC_8    // 8
+#define FR_9    KC_9    // 9
+#define FR_0    KC_0    // 0
+#define FR_MINS KC_MINS // -
+#define FR_EQL  KC_EQL  // =
+#define FR_Q    KC_Q    // Q
+#define FR_W    KC_W    // W
+#define FR_E    KC_E    // E
+#define FR_R    KC_R    // R
+#define FR_T    KC_T    // T
+#define FR_Y    KC_Y    // Y
+#define FR_U    KC_U    // U
+#define FR_I    KC_I    // I
+#define FR_O    KC_O    // O
+#define FR_P    KC_P    // P
+#define FR_DCIR KC_LBRC // ^ (dead)
+#define FR_CEDL KC_RBRC // ¸ (dead)
+#define FR_A    KC_A    // A
+#define FR_S    KC_S    // S
+#define FR_D    KC_D    // D
+#define FR_F    KC_F    // F
+#define FR_G    KC_G    // G
+#define FR_H    KC_H    // H
+#define FR_J    KC_J    // J
+#define FR_K    KC_K    // K
+#define FR_L    KC_L    // L
+#define FR_SCLN KC_SCLN // ;
+#define FR_DGRV KC_QUOT // ` (dead)
+#define FR_LABK KC_NUHS // <
+#define FR_LDAQ KC_NUBS // «
+#define FR_Z    KC_Z    // Z
+#define FR_X    KC_X    // X
+#define FR_C    KC_C    // C
+#define FR_V    KC_V    // V
+#define FR_B    KC_B    // B
+#define FR_N    KC_N    // N
+#define FR_M    KC_M    // M
+#define FR_COMM KC_COMM // ,
+#define FR_DOT  KC_DOT  // .
+#define FR_EACU KC_SLSH // É
+#define FR_PIPE S(FR_HASH) // |
+#define FR_EXLM S(FR_1)    // !
+#define FR_DQUO S(FR_2)    // "
+#define FR_SLSH S(FR_3)    // /
+#define FR_DLR  S(FR_4)    // $
+#define FR_PERC S(FR_5)    // %
+#define FR_QUES S(FR_6)    // ?
+#define FR_AMPR S(FR_7)    // &
+#define FR_ASTR S(FR_8)    // *
+#define FR_LPRN S(FR_9)    // (
+#define FR_RPRN S(FR_0)    // )
+#define FR_UNDS S(FR_MINS) // _
+#define FR_PLUS S(FR_EQL)  // +
+#define FR_DIAE S(FR_CEDL) // ¨ (dead)
+#define FR_COLN S(FR_SCLN) // :
+#define FR_RABK S(FR_LABK) // >
+#define FR_RDAQ S(FR_LDAQ) // »
+#define FR_QUOT S(FR_COMM) // '
+#define FR_BSLS ALGR(FR_HASH) // (backslash)
+#define FR_PLMN ALGR(FR_1)    // ±
+#define FR_AT   ALGR(FR_2)    // @
+#define FR_PND  ALGR(FR_3)    // £
+#define FR_CENT ALGR(FR_4)    // ¢
+#define FR_CURR ALGR(FR_5)    // ¤
+#define FR_NOT  ALGR(FR_6)    // ¬
+#define FR_BRKP ALGR(FR_7)    // ¦
+#define FR_SUP2 ALGR(FR_8)    // ²
+#define FR_SUP3 ALGR(FR_9)    // ³
+#define FR_QRTR ALGR(FR_0)    // ¼
+#define FR_HALF ALGR(FR_MINS) // ½
+#define FR_TQTR ALGR(FR_EQL)  // ¾
+#define FR_SECT ALGR(FR_O)    // §
+#define FR_PARA ALGR(FR_P)    // ¶
+#define FR_LBRC ALGR(FR_DCIR) // [
+#define FR_RBRC ALGR(FR_CEDL) // ]
+#define FR_TILD ALGR(FR_SCLN) // ~
+#define FR_LCBR ALGR(FR_DGRV) // {
+#define FR_RCBR ALGR(FR_LABK) // }
+#define FR_DEG  ALGR(FR_LDAQ) // °
+#define FR_MICR ALGR(FR_M)    // µ
+#define FR_MACR ALGR(FR_COMM) // ¯
+#define FR_SHYP ALGR(FR_DOT)  // ­ (soft hyphen)
+#define FR_ACUT ALGR(FR_EACU) // ´ (dead)
+
diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h
index 5b9b03babb1..baeafa40778 100644
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_colemak.h b/quantum/keymap_extras/keymap_colemak.h
index d63309f010b..b1b2fdcf805 100644
--- a/quantum/keymap_extras/keymap_colemak.h
+++ b/quantum/keymap_extras/keymap_colemak.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_croatian.h b/quantum/keymap_extras/keymap_croatian.h
index 3e7c681ced9..3ed6e29dfb4 100644
--- a/quantum/keymap_extras/keymap_croatian.h
+++ b/quantum/keymap_extras/keymap_croatian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_czech.h b/quantum/keymap_extras/keymap_czech.h
index 351c51ad411..ab00f83820a 100644
--- a/quantum/keymap_extras/keymap_czech.h
+++ b/quantum/keymap_extras/keymap_czech.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_danish.h b/quantum/keymap_extras/keymap_danish.h
index cea9444896b..9e397af1357 100644
--- a/quantum/keymap_extras/keymap_danish.h
+++ b/quantum/keymap_extras/keymap_danish.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_dvorak.h b/quantum/keymap_extras/keymap_dvorak.h
index 9205a72057f..d83f311e2a2 100644
--- a/quantum/keymap_extras/keymap_dvorak.h
+++ b/quantum/keymap_extras/keymap_dvorak.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_dvorak_fr.h b/quantum/keymap_extras/keymap_dvorak_fr.h
index b206767614e..6c9ca139d61 100644
--- a/quantum/keymap_extras/keymap_dvorak_fr.h
+++ b/quantum/keymap_extras/keymap_dvorak_fr.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_dvorak_programmer.h b/quantum/keymap_extras/keymap_dvorak_programmer.h
index 19187ed13b0..80f39f56d45 100644
--- a/quantum/keymap_extras/keymap_dvorak_programmer.h
+++ b/quantum/keymap_extras/keymap_dvorak_programmer.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_estonian.h b/quantum/keymap_extras/keymap_estonian.h
index ea9c56c12ac..3b6bf66c5ce 100644
--- a/quantum/keymap_extras/keymap_estonian.h
+++ b/quantum/keymap_extras/keymap_estonian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_finnish.h b/quantum/keymap_extras/keymap_finnish.h
index c0dc1af81ec..4c0b78ff60d 100644
--- a/quantum/keymap_extras/keymap_finnish.h
+++ b/quantum/keymap_extras/keymap_finnish.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h
index 03dbb7bc40d..db5a7ac2fff 100644
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_french_afnor.h b/quantum/keymap_extras/keymap_french_afnor.h
index 869984c4d2e..894ff4305b7 100644
--- a/quantum/keymap_extras/keymap_french_afnor.h
+++ b/quantum/keymap_extras/keymap_french_afnor.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_french_mac_iso.h b/quantum/keymap_extras/keymap_french_mac_iso.h
index e5f7514a802..89b16478bc8 100644
--- a/quantum/keymap_extras/keymap_french_mac_iso.h
+++ b/quantum/keymap_extras/keymap_french_mac_iso.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index 38b0c685ba6..074f0d321b3 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_german_mac_iso.h b/quantum/keymap_extras/keymap_german_mac_iso.h
index efa9099f201..1a50fabf1ab 100644
--- a/quantum/keymap_extras/keymap_german_mac_iso.h
+++ b/quantum/keymap_extras/keymap_german_mac_iso.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_greek.h b/quantum/keymap_extras/keymap_greek.h
index 01779cf2e85..e21022abbc8 100644
--- a/quantum/keymap_extras/keymap_greek.h
+++ b/quantum/keymap_extras/keymap_greek.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_hebrew.h b/quantum/keymap_extras/keymap_hebrew.h
index 284562072dc..b122eb09ea8 100644
--- a/quantum/keymap_extras/keymap_hebrew.h
+++ b/quantum/keymap_extras/keymap_hebrew.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_hungarian.h b/quantum/keymap_extras/keymap_hungarian.h
index fbc31ed1556..22ae74538c7 100644
--- a/quantum/keymap_extras/keymap_hungarian.h
+++ b/quantum/keymap_extras/keymap_hungarian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_icelandic.h b/quantum/keymap_extras/keymap_icelandic.h
index 3bd71c19f28..c58e48b22df 100644
--- a/quantum/keymap_extras/keymap_icelandic.h
+++ b/quantum/keymap_extras/keymap_icelandic.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_irish.h b/quantum/keymap_extras/keymap_irish.h
index 6e161628c86..ba23cddc951 100644
--- a/quantum/keymap_extras/keymap_irish.h
+++ b/quantum/keymap_extras/keymap_irish.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h
index 8092dc13018..0317cc5e780 100644
--- a/quantum/keymap_extras/keymap_italian.h
+++ b/quantum/keymap_extras/keymap_italian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_italian_mac_ansi.h b/quantum/keymap_extras/keymap_italian_mac_ansi.h
index ae1281be262..ebf2e1e7095 100644
--- a/quantum/keymap_extras/keymap_italian_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_italian_mac_ansi.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_italian_mac_iso.h b/quantum/keymap_extras/keymap_italian_mac_iso.h
index f3f01839c32..327777dd8a7 100644
--- a/quantum/keymap_extras/keymap_italian_mac_iso.h
+++ b/quantum/keymap_extras/keymap_italian_mac_iso.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_japanese.h b/quantum/keymap_extras/keymap_japanese.h
index 947317833ed..68a91be18b9 100644
--- a/quantum/keymap_extras/keymap_japanese.h
+++ b/quantum/keymap_extras/keymap_japanese.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_korean.h b/quantum/keymap_extras/keymap_korean.h
index 440a6b3b4df..f759e136bdb 100644
--- a/quantum/keymap_extras/keymap_korean.h
+++ b/quantum/keymap_extras/keymap_korean.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_latvian.h b/quantum/keymap_extras/keymap_latvian.h
index 2f26b1d8afa..3444e744bea 100644
--- a/quantum/keymap_extras/keymap_latvian.h
+++ b/quantum/keymap_extras/keymap_latvian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_lithuanian_azerty.h b/quantum/keymap_extras/keymap_lithuanian_azerty.h
index f6dd94f0ca7..235989e67b3 100644
--- a/quantum/keymap_extras/keymap_lithuanian_azerty.h
+++ b/quantum/keymap_extras/keymap_lithuanian_azerty.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_lithuanian_qwerty.h b/quantum/keymap_extras/keymap_lithuanian_qwerty.h
index 03c6b7a2af5..58f43814202 100644
--- a/quantum/keymap_extras/keymap_lithuanian_qwerty.h
+++ b/quantum/keymap_extras/keymap_lithuanian_qwerty.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h
index bc9445892f9..dbeef8d5442 100644
--- a/quantum/keymap_extras/keymap_neo2.h
+++ b/quantum/keymap_extras/keymap_neo2.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index 6464966c711..bb66fcf12f3 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_norman.h b/quantum/keymap_extras/keymap_norman.h
index 1a3a0bc53a4..9938e53efea 100644
--- a/quantum/keymap_extras/keymap_norman.h
+++ b/quantum/keymap_extras/keymap_norman.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_norwegian.h b/quantum/keymap_extras/keymap_norwegian.h
index af16fec8d6a..e50e1ab3bb1 100644
--- a/quantum/keymap_extras/keymap_norwegian.h
+++ b/quantum/keymap_extras/keymap_norwegian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_plover.h b/quantum/keymap_extras/keymap_plover.h
index c0e3311e90b..285eaa0741d 100644
--- a/quantum/keymap_extras/keymap_plover.h
+++ b/quantum/keymap_extras/keymap_plover.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_plover_dvorak.h b/quantum/keymap_extras/keymap_plover_dvorak.h
index 7feb52a25c7..8347b2b20c1 100644
--- a/quantum/keymap_extras/keymap_plover_dvorak.h
+++ b/quantum/keymap_extras/keymap_plover_dvorak.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_polish.h b/quantum/keymap_extras/keymap_polish.h
index 40870ec2378..422c58c1e39 100644
--- a/quantum/keymap_extras/keymap_polish.h
+++ b/quantum/keymap_extras/keymap_polish.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_portuguese.h b/quantum/keymap_extras/keymap_portuguese.h
index b4570ad922d..6a896de5290 100644
--- a/quantum/keymap_extras/keymap_portuguese.h
+++ b/quantum/keymap_extras/keymap_portuguese.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_portuguese_mac_iso.h b/quantum/keymap_extras/keymap_portuguese_mac_iso.h
index 57a27d04e9b..1a11cfa5ab7 100644
--- a/quantum/keymap_extras/keymap_portuguese_mac_iso.h
+++ b/quantum/keymap_extras/keymap_portuguese_mac_iso.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_romanian.h b/quantum/keymap_extras/keymap_romanian.h
index cf4c17125f1..8f90988855e 100644
--- a/quantum/keymap_extras/keymap_romanian.h
+++ b/quantum/keymap_extras/keymap_romanian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_russian.h b/quantum/keymap_extras/keymap_russian.h
index fd3a1604c8e..440692345ea 100644
--- a/quantum/keymap_extras/keymap_russian.h
+++ b/quantum/keymap_extras/keymap_russian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_russian_typewriter.h b/quantum/keymap_extras/keymap_russian_typewriter.h
index 59f341e38b2..833311076fd 100644
--- a/quantum/keymap_extras/keymap_russian_typewriter.h
+++ b/quantum/keymap_extras/keymap_russian_typewriter.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_serbian.h b/quantum/keymap_extras/keymap_serbian.h
index 732e2e939d1..fa0e474df82 100644
--- a/quantum/keymap_extras/keymap_serbian.h
+++ b/quantum/keymap_extras/keymap_serbian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_serbian_latin.h b/quantum/keymap_extras/keymap_serbian_latin.h
index 5151696a103..a2038b6df82 100644
--- a/quantum/keymap_extras/keymap_serbian_latin.h
+++ b/quantum/keymap_extras/keymap_serbian_latin.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_slovak.h b/quantum/keymap_extras/keymap_slovak.h
index 81a88fa25c0..08666ef060b 100644
--- a/quantum/keymap_extras/keymap_slovak.h
+++ b/quantum/keymap_extras/keymap_slovak.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index 1e17342c273..31a8c5f9a58 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h
index bcdd5af0c25..f87eb6b027c 100644
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_spanish_dvorak.h b/quantum/keymap_extras/keymap_spanish_dvorak.h
index fb033df770a..782f23a5be2 100644
--- a/quantum/keymap_extras/keymap_spanish_dvorak.h
+++ b/quantum/keymap_extras/keymap_spanish_dvorak.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_spanish_latin_america.h b/quantum/keymap_extras/keymap_spanish_latin_america.h
new file mode 100644
index 00000000000..2f11743061f
--- /dev/null
+++ b/quantum/keymap_extras/keymap_spanish_latin_america.h
@@ -0,0 +1,106 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*******************************************************************************
+  88888888888 888      d8b                .d888 d8b 888               d8b
+      888     888      Y8P               d88P"  Y8P 888               Y8P
+      888     888                        888        888
+      888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
+      888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
+      888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
+      888     888  888 888      X88      888    888 888 Y8b.          888      X88
+      888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
+                                                        888                 888
+                                                        888                 888
+                                                        888                 888
+     .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
+    d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
+    888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
+    Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
+     "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
+         888
+    Y8b d88P
+     "Y88P"
+*******************************************************************************/
+
+#pragma once
+#include "keycodes.h"
+// clang-format off
+
+// Aliases
+#define ES_PIPE KC_GRV  // |
+#define ES_1    KC_1    // 1
+#define ES_2    KC_2    // 2
+#define ES_3    KC_3    // 3
+#define ES_4    KC_4    // 4
+#define ES_5    KC_5    // 5
+#define ES_6    KC_6    // 6
+#define ES_7    KC_7    // 7
+#define ES_8    KC_8    // 8
+#define ES_9    KC_9    // 9
+#define ES_0    KC_0    // 0
+#define ES_QUOT KC_MINS // '
+#define ES_IQUE KC_EQL  // ¿
+#define ES_Q    KC_Q    // Q
+#define ES_W    KC_W    // W
+#define ES_E    KC_E    // E
+#define ES_R    KC_R    // R
+#define ES_T    KC_T    // T
+#define ES_Y    KC_Y    // Y
+#define ES_U    KC_U    // U
+#define ES_I    KC_I    // I
+#define ES_O    KC_O    // O
+#define ES_P    KC_P    // P
+#define ES_ACUT KC_LBRC // ´ (dead)
+#define ES_PLUS KC_RBRC // +
+#define ES_A    KC_A    // A
+#define ES_S    KC_S    // S
+#define ES_D    KC_D    // D
+#define ES_F    KC_F    // F
+#define ES_G    KC_G    // G
+#define ES_H    KC_H    // H
+#define ES_J    KC_J    // J
+#define ES_K    KC_K    // K
+#define ES_L    KC_L    // L
+#define ES_NTIL KC_SCLN // Ñ
+#define ES_LCBR KC_QUOT // {
+#define ES_RCBR KC_NUHS // }
+#define ES_LABK KC_NUBS // <
+#define ES_Z    KC_Z    // Z
+#define ES_X    KC_X    // X
+#define ES_C    KC_C    // C
+#define ES_V    KC_V    // V
+#define ES_B    KC_B    // B
+#define ES_N    KC_N    // N
+#define ES_M    KC_M    // M
+#define ES_COMM KC_COMM // ,
+#define ES_DOT  KC_DOT  // .
+#define ES_MINS KC_SLSH // -
+#define ES_MORD S(ES_PIPE) // °
+#define ES_EXLM S(ES_1)    // !
+#define ES_DQUO S(ES_2)    // "
+#define ES_NUMB S(ES_3)    // #
+#define ES_DLR  S(ES_4)    // $
+#define ES_PERC S(ES_5)    // %
+#define ES_AMPR S(ES_6)    // &
+#define ES_SLSH S(ES_7)    // /
+#define ES_LPRN S(ES_8)    // (
+#define ES_RPRN S(ES_9)    // )
+#define ES_EQL  S(ES_0)    // =
+#define ES_QUES S(ES_QUOT) // ?
+#define ES_IEXL S(ES_IQUE) // ¡
+#define ES_DIAE S(ES_ACUT) // ¨ (dead)
+#define ES_ASTR S(ES_PLUS) // *
+#define ES_LBRC S(ES_LCBR) // [
+#define ES_RBRC S(ES_RCBR) // ]
+#define ES_RABK S(ES_LABK) // >
+#define ES_SCLN S(ES_COMM) // ;
+#define ES_COLN S(ES_DOT)  // :
+#define ES_UNDS S(ES_MINS) // _
+#define ES_NOT  ALGR(ES_PIPE) // ¬
+#define ES_BSLS ALGR(ES_QUOT) // (backslash)
+#define ES_AT   ALGR(ES_Q)    // @
+#define ES_TILD ALGR(ES_PLUS) // ~
+#define ES_CIRC ALGR(ES_LCBR) // ^
+#define ES_GRV  ALGR(KC_NUHS) // `
+
diff --git a/quantum/keymap_extras/keymap_swedish.h b/quantum/keymap_extras/keymap_swedish.h
index acb49f77738..a9d015b22e2 100644
--- a/quantum/keymap_extras/keymap_swedish.h
+++ b/quantum/keymap_extras/keymap_swedish.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_swedish_mac_ansi.h b/quantum/keymap_extras/keymap_swedish_mac_ansi.h
index ef48a9e493e..36a31220a16 100644
--- a/quantum/keymap_extras/keymap_swedish_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_swedish_mac_ansi.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_swedish_mac_iso.h b/quantum/keymap_extras/keymap_swedish_mac_iso.h
index 2eaef5e60ca..7f085dc16b6 100644
--- a/quantum/keymap_extras/keymap_swedish_mac_iso.h
+++ b/quantum/keymap_extras/keymap_swedish_mac_iso.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h
index d33a2590235..20781b2e532 100644
--- a/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h
index 680bd1db9e2..dbbc24ed02c 100644
--- a/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h
+++ b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_swiss_de.h b/quantum/keymap_extras/keymap_swiss_de.h
index c22191dd4e7..2cedf237881 100644
--- a/quantum/keymap_extras/keymap_swiss_de.h
+++ b/quantum/keymap_extras/keymap_swiss_de.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_swiss_fr.h b/quantum/keymap_extras/keymap_swiss_fr.h
index e0e8e52c9ce..347815504bb 100644
--- a/quantum/keymap_extras/keymap_swiss_fr.h
+++ b/quantum/keymap_extras/keymap_swiss_fr.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_turkish_f.h b/quantum/keymap_extras/keymap_turkish_f.h
index 4fdcf3f7462..d9d08adae58 100644
--- a/quantum/keymap_extras/keymap_turkish_f.h
+++ b/quantum/keymap_extras/keymap_turkish_f.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_turkish_q.h b/quantum/keymap_extras/keymap_turkish_q.h
index 5a9362acb4c..781c4063471 100644
--- a/quantum/keymap_extras/keymap_turkish_q.h
+++ b/quantum/keymap_extras/keymap_turkish_q.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h
index 71e5f38f55a..49237768d4f 100644
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_ukrainian.h b/quantum/keymap_extras/keymap_ukrainian.h
index 3f3ec4cec2b..760cc265eaf 100644
--- a/quantum/keymap_extras/keymap_ukrainian.h
+++ b/quantum/keymap_extras/keymap_ukrainian.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_us.h b/quantum/keymap_extras/keymap_us.h
index 6101c8d8ba8..9d1c7ad628a 100644
--- a/quantum/keymap_extras/keymap_us.h
+++ b/quantum/keymap_extras/keymap_us.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_us_extended.h b/quantum/keymap_extras/keymap_us_extended.h
index 90da98c756a..c8e56cc5a83 100644
--- a/quantum/keymap_extras/keymap_us_extended.h
+++ b/quantum/keymap_extras/keymap_us_extended.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_us_international.h b/quantum/keymap_extras/keymap_us_international.h
index bd5f21ec8c6..1b211bd4a6a 100644
--- a/quantum/keymap_extras/keymap_us_international.h
+++ b/quantum/keymap_extras/keymap_us_international.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_us_international_linux.h b/quantum/keymap_extras/keymap_us_international_linux.h
index 4551cbe29ff..778ab4c8998 100644
--- a/quantum/keymap_extras/keymap_us_international_linux.h
+++ b/quantum/keymap_extras/keymap_us_international_linux.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_workman.h b/quantum/keymap_extras/keymap_workman.h
index 808caec054c..31bd953d7f5 100644
--- a/quantum/keymap_extras/keymap_workman.h
+++ b/quantum/keymap_extras/keymap_workman.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/keymap_workman_zxcvm.h b/quantum/keymap_extras/keymap_workman_zxcvm.h
index f8645ac4cfb..f05c89adb89 100644
--- a/quantum/keymap_extras/keymap_workman_zxcvm.h
+++ b/quantum/keymap_extras/keymap_workman_zxcvm.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/keymap_extras/sendstring_canadian_french.h b/quantum/keymap_extras/sendstring_canadian_french.h
new file mode 100644
index 00000000000..2abba3a9d30
--- /dev/null
+++ b/quantum/keymap_extras/sendstring_canadian_french.h
@@ -0,0 +1,120 @@
+/* Copyright 2023 Nebuleon
+ *
+ * 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/>.
+ */
+
+// Sendstring lookup tables for Canadian French layouts
+
+#pragma once
+
+#include "keymap_canadian_french.h"
+#include "send_string.h"
+
+// clang-format off
+
+const uint8_t ascii_to_shift_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 1, 1, 0, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 0, 0, 0, 1),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 1, 0, 0, 0, 1, 1),
+    KCLUT_ENTRY(0, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 1, 0, 0, 0)
+};
+
+const uint8_t ascii_to_altgr_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 1, 1, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0)
+};
+
+const uint8_t ascii_to_dead_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 1, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0)
+};
+
+const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
+    // NUL   SOH      STX      ETX      EOT      ENQ      ACK      BEL
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // BS    TAB      LF       VT       FF       CR       SO       SI
+    KC_BSPC, KC_TAB,  KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // DLE   DC1      DC2      DC3      DC4      NAK      SYN      ETB
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // CAN   EM       SUB      ESC      FS       GS       RS       US
+    XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    //       !        "        #        $        %        &        '
+    KC_SPC,  FR_1,    FR_2,    FR_HASH, FR_4,    FR_5,    FR_7,    FR_COMM,
+    // (     )        *        +        ,        -        .        /
+    FR_9,    FR_0,    FR_8,    FR_EQL,  FR_COMM, FR_MINS, FR_DOT,  FR_3,
+    // 0     1        2        3        4        5        6        7
+    FR_0,    FR_1,    FR_2,    FR_3,    FR_4,    FR_5,    FR_6,    FR_7,
+    // 8     9        :        ;        <        =        >        ?
+    FR_8,    FR_9,    FR_SCLN, FR_SCLN, FR_LABK, FR_EQL,  FR_LABK, FR_6,
+    // @     A        B        C        D        E        F        G
+    FR_2,    FR_A,    FR_B,    FR_C,    FR_D,    FR_E,    FR_F,    FR_G,
+    // H     I        J        K        L        M        N        O
+    FR_H,    FR_I,    FR_J,    FR_K,    FR_L,    FR_M,    FR_N,    FR_O,
+    // P     Q        R        S        T        U        V        W
+    FR_P,    FR_Q,    FR_R,    FR_S,    FR_T,    FR_U,    FR_V,    FR_W,
+    // X     Y        Z        [        \        ]        ^        _
+    FR_X,    FR_Y,    FR_Z,    FR_DCIR, FR_HASH, FR_CEDL, FR_DCIR, FR_MINS,
+    // `     a        b        c        d        e        f        g
+    FR_DGRV, FR_A,    FR_B,    FR_C,    FR_D,    FR_E,    FR_F,    FR_G,
+    // h     i        j        k        l        m        n        o
+    FR_H,    FR_I,    FR_J,    FR_K,    FR_L,    FR_M,    FR_N,    FR_O,
+    // p     q        r        s        t        u        v        w
+    FR_P,    FR_Q,    FR_R,    FR_S,    FR_T,    FR_U,    FR_V,    FR_W,
+    // x     y        z        {        |        }        ~        DEL
+    FR_X,    FR_Y,    FR_Z,    FR_DGRV, FR_HASH, FR_LABK, FR_SCLN, KC_DEL
+};
diff --git a/quantum/keymap_extras/sendstring_french.h b/quantum/keymap_extras/sendstring_french.h
index 0e585ec0937..238b650db37 100644
--- a/quantum/keymap_extras/sendstring_french.h
+++ b/quantum/keymap_extras/sendstring_french.h
@@ -56,7 +56,7 @@ const uint8_t ascii_to_altgr_lut[16] PROGMEM = {
     KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
     KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
     KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
-    KCLUT_ENTRY(0, 0, 0, 1, 1, 1, 1, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 1, 1, 0, 0),
     KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
     KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
     KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
@@ -108,7 +108,7 @@ const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
     // P     Q        R        S        T        U        V        W
     FR_P,    FR_Q,    FR_R,    FR_S,    FR_T,    FR_U,    FR_V,    FR_W,
     // X     Y        Z        [        \        ]        ^        _
-    FR_X,    FR_Y,    FR_Z,    FR_LPRN, FR_UNDS, FR_RPRN, FR_CCED, FR_UNDS,
+    FR_X,    FR_Y,    FR_Z,    FR_LPRN, FR_UNDS, FR_RPRN, FR_CIRC, FR_UNDS,
     // `     a        b        c        d        e        f        g
     FR_EGRV, FR_A,    FR_B,    FR_C,    FR_D,    FR_E,    FR_F,    FR_G,
     // h     i        j        k        l        m        n        o
diff --git a/quantum/keymap_extras/sendstring_spanish_latin_america.h b/quantum/keymap_extras/sendstring_spanish_latin_america.h
new file mode 100644
index 00000000000..3bfdf7d5cb0
--- /dev/null
+++ b/quantum/keymap_extras/sendstring_spanish_latin_america.h
@@ -0,0 +1,120 @@
+/* Copyright 2023 Juan David Díaz
+ *
+ * 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/>.
+ */
+
+// Sendstring lookup tables for Latam Spanish layouts
+
+#pragma once
+
+#include "send_string.h"
+#include "keymap_spanish_latin_america.h"
+
+// clang-format off
+
+const uint8_t ascii_to_shift_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 1, 1, 0, 1, 1, 1, 0),
+    KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1),
+    KCLUT_ENTRY(0, 0, 1, 1, 0, 1, 1, 0),
+    KCLUT_ENTRY(0, 0, 1, 1, 0, 1, 1, 1),
+    KCLUT_ENTRY(0, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 0, 1, 0, 1),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0)
+};
+
+const uint8_t ascii_to_altgr_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 1, 0, 1, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 1, 0)
+};
+
+const uint8_t ascii_to_dead_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 1, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0)
+};
+
+const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
+    // NUL   SOH      STX      ETX      EOT      ENQ      ACK      BEL
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // BS    TAB      LF       VT       FF       CR       SO       SI
+    KC_BSPC, KC_TAB,  KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // DLE   DC1      DC2      DC3      DC4      NAK      SYN      ETB
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // CAN   EM       SUB      ESC      FS       GS       RS       US
+    XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    //       !        "        #        $        %        &        '
+    KC_SPC,  ES_1,    ES_2,    ES_3,    ES_4,    ES_5,    ES_6,    ES_QUOT,
+    // (     )        *        +        ,        -        .        /
+    ES_8,    ES_9,    ES_PLUS, ES_PLUS, ES_COMM, ES_MINS, ES_DOT,  ES_7,
+    // 0     1        2        3        4        5        6        7
+    ES_0,    ES_1,    ES_2,    ES_3,    ES_4,    ES_5,    ES_6,    ES_7,
+    // 8     9        :        ;        <        =        >        ?
+    ES_8,    ES_9,    ES_DOT,  ES_COMM, ES_LABK, ES_0,    ES_LABK, ES_QUOT,
+    // @     A        B        C        D        E        F        G
+    ES_Q,    ES_A,    ES_B,    ES_C,    ES_D,    ES_E,    ES_F,    ES_G,
+    // H     I        J        K        L        M        N        O
+    ES_H,    ES_I,    ES_J,    ES_K,    ES_L,    ES_M,    ES_N,    ES_O,
+    // P     Q        R        S        T        U        V        W
+    ES_P,    ES_Q,    ES_R,    ES_S,    ES_T,    ES_U,    ES_V,    ES_W,
+    // X     Y        Z        [        \        ]        ^        _
+    ES_X,    ES_Y,    ES_Z,    ES_LCBR, ES_QUOT, ES_RCBR, ES_LCBR, ES_MINS,
+    // `     a        b        c        d        e        f        g
+    ES_RCBR, ES_A,    ES_B,    ES_C,    ES_D,    ES_E,    ES_F,    ES_G,
+    // h     i        j        k        l        m        n        o
+    ES_H,    ES_I,    ES_J,    ES_K,    ES_L,    ES_M,    ES_N,    ES_O,
+    // p     q        r        s        t        u        v        w
+    ES_P,    ES_Q,    ES_R,    ES_S,    ES_T,    ES_U,    ES_V,    ES_W,
+    // x     y        z        {        |        }        ~        DEL
+    ES_X,    ES_Y,    ES_Z,    ES_LCBR, ES_PIPE, ES_RCBR, ES_PLUS, KC_DEL
+};
diff --git a/quantum/keymap_introspection.c b/quantum/keymap_introspection.c
index 3d8f46ef0f5..dda88ad597e 100644
--- a/quantum/keymap_introspection.c
+++ b/quantum/keymap_introspection.c
@@ -71,6 +71,24 @@ __attribute__((weak)) uint16_t keycode_at_encodermap_location(uint8_t layer_num,
 
 #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Dip Switch mapping
+
+#if defined(DIP_SWITCH_ENABLE) && defined(DIP_SWITCH_MAP_ENABLE)
+
+uint16_t keycode_at_dip_switch_map_location_raw(uint8_t switch_idx, bool on) {
+    if (switch_idx < NUM_DIP_SWITCHES) {
+        return pgm_read_word(&dip_switch_map[switch_idx][!!on]);
+    }
+    return KC_TRNS;
+}
+
+uint16_t keycode_at_dip_switch_map_location(uint8_t switch_idx, bool on) {
+    return keycode_at_dip_switch_map_location_raw(switch_idx, on);
+}
+
+#endif // defined(DIP_SWITCH_ENABLE) && defined(DIP_SWITCH_MAP_ENABLE)
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Combos
 
diff --git a/quantum/keymap_introspection.h b/quantum/keymap_introspection.h
index 2012a2b8cc6..f7516bf42af 100644
--- a/quantum/keymap_introspection.h
+++ b/quantum/keymap_introspection.h
@@ -35,6 +35,18 @@ uint16_t keycode_at_encodermap_location(uint8_t layer_num, uint8_t encoder_idx,
 
 #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Dip Switch mapping
+
+#if defined(DIP_SWITCH_ENABLE) && defined(DIP_SWITCH_MAP_ENABLE)
+
+// Get the keycode for the dip_switch mapping location, stored in firmware rather than any other persistent storage
+uint16_t keycode_at_dip_switch_map_location_raw(uint8_t switch_idx, bool on);
+// Get the keycode for the dip_switch mapping location, potentially stored dynamically
+uint16_t keycode_at_dip_switch_map_location(uint8_t switch_idx, bool on);
+
+#endif // defined(DIP_SWITCH_ENABLE) && defined(DIP_SWITCH_MAP_ENABLE)
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Combos
 
diff --git a/quantum/led.c b/quantum/led.c
index 8d86374a6f2..e2b59851099 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -98,19 +98,19 @@ __attribute__((weak)) void led_update_ports(led_t led_state) {
 #endif
 
 #ifdef LED_NUM_LOCK_PIN
-    writePin(LED_NUM_LOCK_PIN, led_state.num_lock);
+    gpio_write_pin(LED_NUM_LOCK_PIN, led_state.num_lock);
 #endif
 #ifdef LED_CAPS_LOCK_PIN
-    writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
+    gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
 #endif
 #ifdef LED_SCROLL_LOCK_PIN
-    writePin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock);
+    gpio_write_pin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock);
 #endif
 #ifdef LED_COMPOSE_PIN
-    writePin(LED_COMPOSE_PIN, led_state.compose);
+    gpio_write_pin(LED_COMPOSE_PIN, led_state.compose);
 #endif
 #ifdef LED_KANA_PIN
-    writePin(LED_KANA_PIN, led_state.kana);
+    gpio_write_pin(LED_KANA_PIN, led_state.kana);
 #endif
 }
 
@@ -118,24 +118,24 @@ __attribute__((weak)) void led_update_ports(led_t led_state) {
  */
 __attribute__((weak)) void led_init_ports(void) {
 #ifdef LED_NUM_LOCK_PIN
-    setPinOutput(LED_NUM_LOCK_PIN);
-    writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_NUM_LOCK_PIN);
+    gpio_write_pin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
 #endif
 #ifdef LED_CAPS_LOCK_PIN
-    setPinOutput(LED_CAPS_LOCK_PIN);
-    writePin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_CAPS_LOCK_PIN);
+    gpio_write_pin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
 #endif
 #ifdef LED_SCROLL_LOCK_PIN
-    setPinOutput(LED_SCROLL_LOCK_PIN);
-    writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_SCROLL_LOCK_PIN);
+    gpio_write_pin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
 #endif
 #ifdef LED_COMPOSE_PIN
-    setPinOutput(LED_COMPOSE_PIN);
-    writePin(LED_COMPOSE_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_COMPOSE_PIN);
+    gpio_write_pin(LED_COMPOSE_PIN, !LED_PIN_ON_STATE);
 #endif
 #ifdef LED_KANA_PIN
-    setPinOutput(LED_KANA_PIN);
-    writePin(LED_KANA_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_KANA_PIN);
+    gpio_write_pin(LED_KANA_PIN, !LED_PIN_ON_STATE);
 #endif
 }
 
@@ -183,9 +183,7 @@ void led_task(void) {
         last_led_modification_time = timer_read32();
 
         if (debug_keyboard) {
-            debug("led_task: ");
-            debug_hex8(led_status);
-            debug("\n");
+            dprintf("led_task: %02X\n", led_status);
         }
         led_set(led_status);
     }
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index 4d67a295dfc..c0fb4c810b1 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -74,9 +74,6 @@ static uint8_t         led_last_enable   = UINT8_MAX;
 static uint8_t         led_last_effect   = UINT8_MAX;
 static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false};
 static led_task_states led_task_state    = SYNCING;
-#if LED_MATRIX_TIMEOUT > 0
-static uint32_t led_anykey_timer;
-#endif // LED_MATRIX_TIMEOUT > 0
 
 // double buffers
 static uint32_t led_timer_buffer;
@@ -101,7 +98,7 @@ void eeconfig_update_led_matrix_default(void) {
     led_matrix_eeconfig.mode   = LED_MATRIX_DEFAULT_MODE;
     led_matrix_eeconfig.val    = LED_MATRIX_DEFAULT_VAL;
     led_matrix_eeconfig.speed  = LED_MATRIX_DEFAULT_SPD;
-    led_matrix_eeconfig.flags  = LED_FLAG_ALL;
+    led_matrix_eeconfig.flags  = LED_MATRIX_DEFAULT_FLAGS;
     eeconfig_flush_led_matrix(true);
 }
 
@@ -114,6 +111,16 @@ void eeconfig_debug_led_matrix(void) {
     dprintf("led_matrix_eeconfig.flags = %d\n", led_matrix_eeconfig.flags);
 }
 
+void led_matrix_reload_from_eeprom(void) {
+    led_matrix_disable_noeeprom();
+    /* Reset back to what we have in eeprom */
+    eeconfig_init_led_matrix();
+    eeconfig_debug_led_matrix(); // display current eeprom values
+    if (led_matrix_eeconfig.enable) {
+        led_matrix_mode_noeeprom(led_matrix_eeconfig.mode);
+    }
+}
+
 __attribute__((weak)) uint8_t led_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
     return 0;
 }
@@ -156,9 +163,6 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
 #ifndef LED_MATRIX_SPLIT
     if (!is_keyboard_master()) return;
 #endif
-#if LED_MATRIX_TIMEOUT > 0
-    led_anykey_timer = 0;
-#endif // LED_MATRIX_TIMEOUT > 0
 
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
     uint8_t led[LED_HITS_TO_REMEMBER];
@@ -208,22 +212,11 @@ static bool led_matrix_none(effect_params_t *params) {
 }
 
 static void led_task_timers(void) {
-#if defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_MATRIX_TIMEOUT > 0
+#if defined(LED_MATRIX_KEYREACTIVE_ENABLED)
     uint32_t deltaTime = sync_timer_elapsed32(led_timer_buffer);
-#endif // defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_MATRIX_TIMEOUT > 0
+#endif // defined(LED_MATRIX_KEYREACTIVE_ENABLED)
     led_timer_buffer = sync_timer_read32();
 
-    // Update double buffer timers
-#if LED_MATRIX_TIMEOUT > 0
-    if (led_anykey_timer < UINT32_MAX) {
-        if (UINT32_MAX - deltaTime < led_anykey_timer) {
-            led_anykey_timer = UINT32_MAX;
-        } else {
-            led_anykey_timer += deltaTime;
-        }
-    }
-#endif // LED_MATRIX_TIMEOUT > 0
-
     // Update double buffer last hit timers
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
     uint8_t count = last_hit_buffer.count;
@@ -329,7 +322,7 @@ void led_matrix_task(void) {
     // while suspended and just do a software shutdown. This is a cheap hack for now.
     bool suspend_backlight = suspend_state ||
 #if LED_MATRIX_TIMEOUT > 0
-                             (led_anykey_timer > (uint32_t)LED_MATRIX_TIMEOUT) ||
+                             (last_input_activity_elapsed() > (uint32_t)LED_MATRIX_TIMEOUT) ||
 #endif // LED_MATRIX_TIMEOUT > 0
                              false;
 
@@ -432,12 +425,6 @@ void led_matrix_init(void) {
     }
 #endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
-    if (!eeconfig_is_enabled()) {
-        dprintf("led_matrix_init_drivers eeconfig is not enabled.\n");
-        eeconfig_init();
-        eeconfig_update_led_matrix_default();
-    }
-
     eeconfig_init_led_matrix();
     if (!led_matrix_eeconfig.mode) {
         dprintf("led_matrix_init_drivers led_matrix_eeconfig.mode = 0. Write default values to EEPROM.\n");
@@ -447,7 +434,7 @@ void led_matrix_init(void) {
 }
 
 void led_matrix_set_suspend_state(bool state) {
-#ifdef LED_DISABLE_WHEN_USB_SUSPENDED
+#ifdef LED_MATRIX_SLEEP
     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
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index c903a230f47..941d42aecad 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -23,32 +23,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "led_matrix_types.h"
+#include "led_matrix_drivers.h"
 #include "keyboard.h"
 
-#if defined(LED_MATRIX_IS31FL3218)
-#    include "is31fl3218-simple.h"
-#elif defined(LED_MATRIX_IS31FL3731)
-#    include "is31fl3731-simple.h"
-#endif
-#ifdef LED_MATRIX_IS31FL3733
-#    include "is31fl3733-simple.h"
-#endif
-#ifdef LED_MATRIX_IS31FL3736
-#    include "is31fl3736-simple.h"
-#endif
-#ifdef LED_MATRIX_IS31FL3737
-#    include "is31fl3737-simple.h"
-#endif
-#ifdef LED_MATRIX_IS31FL3741
-#    include "is31fl3741-simple.h"
-#endif
-#if defined(IS31FLCOMMON)
-#    include "is31flcommon.h"
-#endif
-#ifdef LED_MATRIX_SNLED27351
-#    include "snled27351-simple.h"
-#endif
-
 #ifndef LED_MATRIX_TIMEOUT
 #    define LED_MATRIX_TIMEOUT 0
 #endif
@@ -81,6 +58,10 @@
 #    define LED_MATRIX_DEFAULT_SPD UINT8_MAX / 2
 #endif
 
+#ifndef LED_MATRIX_DEFAULT_FLAGS
+#    define LED_MATRIX_DEFAULT_FLAGS LED_FLAG_ALL
+#endif
+
 #ifndef LED_MATRIX_LED_FLUSH_LIMIT
 #    define LED_MATRIX_LED_FLUSH_LIMIT 16
 #endif
@@ -159,6 +140,8 @@ bool led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
 
 void led_matrix_init(void);
 
+void led_matrix_reload_from_eeprom(void);
+
 void        led_matrix_set_suspend_state(bool state);
 bool        led_matrix_get_suspend_state(void);
 void        led_matrix_toggle(void);
@@ -193,18 +176,6 @@ led_flags_t led_matrix_get_flags(void);
 void        led_matrix_set_flags(led_flags_t flags);
 void        led_matrix_set_flags_noeeprom(led_flags_t flags);
 
-typedef struct {
-    /* Perform any initialisation required for the other driver functions to work. */
-    void (*init)(void);
-
-    /* Set the brightness of a single LED in the buffer. */
-    void (*set_value)(int index, uint8_t value);
-    /* Set the brightness of all LEDS on the keyboard in the buffer. */
-    void (*set_value_all)(uint8_t value);
-    /* Flush any buffered changes to the hardware. */
-    void (*flush)(void);
-} led_matrix_driver_t;
-
 static inline bool led_matrix_check_finished_leds(uint8_t led_idx) {
 #if defined(LED_MATRIX_SPLIT)
     if (is_keyboard_left()) {
@@ -217,8 +188,6 @@ static inline bool led_matrix_check_finished_leds(uint8_t led_idx) {
 #endif
 }
 
-extern const led_matrix_driver_t led_matrix_driver;
-
 extern led_eeconfig_t led_matrix_eeconfig;
 
 extern uint32_t     g_led_timer;
diff --git a/quantum/led_matrix/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c
index 117bed9851b..2e80bd03752 100644
--- a/quantum/led_matrix/led_matrix_drivers.c
+++ b/quantum/led_matrix/led_matrix_drivers.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "led_matrix.h"
+#include "led_matrix_drivers.h"
 
 /* Each driver needs to define a struct:
  *
@@ -33,6 +33,14 @@ const led_matrix_driver_t led_matrix_driver = {
     .set_value_all = is31fl3218_set_value_all,
 };
 
+#elif defined(LED_MATRIX_IS31FL3729)
+const led_matrix_driver_t led_matrix_driver = {
+    .init          = is31fl3729_init_drivers,
+    .flush         = is31fl3729_flush,
+    .set_value     = is31fl3729_set_value,
+    .set_value_all = is31fl3729_set_value_all,
+};
+
 #elif defined(LED_MATRIX_IS31FL3731)
 const led_matrix_driver_t led_matrix_driver = {
     .init          = is31fl3731_init_drivers,
@@ -73,12 +81,36 @@ const led_matrix_driver_t led_matrix_driver = {
     .set_value_all = is31fl3741_set_value_all,
 };
 
-#elif defined(IS31FLCOMMON)
+#elif defined(LED_MATRIX_IS31FL3742A)
+const led_matrix_driver_t led_matrix_driver = {
+    .init          = is31fl3742a_init_drivers,
+    .flush         = is31fl3742a_flush,
+    .set_value     = is31fl3742a_set_value,
+    .set_value_all = is31fl3742a_set_value_all,
+};
+
+#elif defined(LED_MATRIX_IS31FL3743A)
+const led_matrix_driver_t led_matrix_driver = {
+    .init          = is31fl3743a_init_drivers,
+    .flush         = is31fl3743a_flush,
+    .set_value     = is31fl3743a_set_value,
+    .set_value_all = is31fl3743a_set_value_all,
+};
+
+#elif defined(LED_MATRIX_IS31FL3745)
+const led_matrix_driver_t led_matrix_driver = {
+    .init          = is31fl3745_init_drivers,
+    .flush         = is31fl3745_flush,
+    .set_value     = is31fl3745_set_value,
+    .set_value_all = is31fl3745_set_value_all,
+};
+
+#elif defined(LED_MATRIX_IS31FL3746A)
 const led_matrix_driver_t led_matrix_driver = {
-    .init          = IS31FL_simple_init_drivers,
-    .flush         = IS31FL_common_flush,
-    .set_value     = IS31FL_simple_set_brightness,
-    .set_value_all = IS31FL_simple_set_brigntness_all,
+    .init          = is31fl3746a_init_drivers,
+    .flush         = is31fl3746a_flush,
+    .set_value     = is31fl3746a_set_value,
+    .set_value_all = is31fl3746a_set_value_all,
 };
 
 #elif defined(LED_MATRIX_SNLED27351)
diff --git a/quantum/led_matrix/led_matrix_drivers.h b/quantum/led_matrix/led_matrix_drivers.h
new file mode 100644
index 00000000000..a961784a62f
--- /dev/null
+++ b/quantum/led_matrix/led_matrix_drivers.h
@@ -0,0 +1,46 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+
+#if defined(LED_MATRIX_IS31FL3218)
+#    include "is31fl3218-mono.h"
+#elif defined(LED_MATRIX_IS31FL3729)
+#    include "is31fl3729-mono.h"
+#elif defined(LED_MATRIX_IS31FL3731)
+#    include "is31fl3731-mono.h"
+#elif defined(LED_MATRIX_IS31FL3733)
+#    include "is31fl3733-mono.h"
+#elif defined(LED_MATRIX_IS31FL3736)
+#    include "is31fl3736-mono.h"
+#elif defined(LED_MATRIX_IS31FL3737)
+#    include "is31fl3737-mono.h"
+#elif defined(LED_MATRIX_IS31FL3741)
+#    include "is31fl3741-mono.h"
+#elif defined(LED_MATRIX_IS31FL3742A)
+#    include "is31fl3742a-mono.h"
+#elif defined(LED_MATRIX_IS31FL3743A)
+#    include "is31fl3743a-mono.h"
+#elif defined(LED_MATRIX_IS31FL3745)
+#    include "is31fl3745-mono.h"
+#elif defined(LED_MATRIX_IS31FL3746A)
+#    include "is31fl3746a-mono.h"
+#elif defined(LED_MATRIX_SNLED27351)
+#    include "snled27351-mono.h"
+#endif
+
+typedef struct {
+    /* Perform any initialisation required for the other driver functions to work. */
+    void (*init)(void);
+
+    /* Set the brightness of a single LED in the buffer. */
+    void (*set_value)(int index, uint8_t value);
+    /* Set the brightness of all LEDS on the keyboard in the buffer. */
+    void (*set_value_all)(uint8_t value);
+    /* Flush any buffered changes to the hardware. */
+    void (*flush)(void);
+} led_matrix_driver_t;
+
+extern const led_matrix_driver_t led_matrix_driver;
diff --git a/quantum/logging/debug.h b/quantum/logging/debug.h
index 84153103569..d0590474c04 100644
--- a/quantum/logging/debug.h
+++ b/quantum/logging/debug.h
@@ -17,6 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#ifndef PROTOCOL_ARM_ATSAM
+#    include <stdio.h>
+#endif
+
 #include <stdbool.h>
 #include "print.h"
 
@@ -54,116 +58,14 @@ extern debug_config_t debug_config;
  * Debug print utils
  */
 #ifndef NO_DEBUG
-
-#    define dprint(s)                   \
-        do {                            \
-            if (debug_enable) print(s); \
-        } while (0)
-#    define dprintln(s)                   \
-        do {                              \
-            if (debug_enable) println(s); \
-        } while (0)
-#    define dprintf(fmt, ...)                              \
-        do {                                               \
-            if (debug_enable) xprintf(fmt, ##__VA_ARGS__); \
-        } while (0)
-#    define dmsg(s) dprintf("%s at %d: %s\n", __FILE__, __LINE__, s)
-
-/* Deprecated. DO NOT USE these anymore, use dprintf instead. */
-#    define debug(s)                    \
-        do {                            \
-            if (debug_enable) print(s); \
-        } while (0)
-#    define debugln(s)                    \
-        do {                              \
-            if (debug_enable) println(s); \
-        } while (0)
-#    define debug_msg(s)             \
-        do {                         \
-            if (debug_enable) {      \
-                print(__FILE__);     \
-                print(" at ");       \
-                print_dec(__LINE__); \
-                print(" in ");       \
-                print(": ");         \
-                print(s);            \
-            }                        \
-        } while (0)
-#    define debug_dec(data)                    \
-        do {                                   \
-            if (debug_enable) print_dec(data); \
-        } while (0)
-#    define debug_decs(data)                    \
-        do {                                    \
-            if (debug_enable) print_decs(data); \
-        } while (0)
-#    define debug_hex4(data)                    \
-        do {                                    \
-            if (debug_enable) print_hex4(data); \
-        } while (0)
-#    define debug_hex8(data)                    \
-        do {                                    \
-            if (debug_enable) print_hex8(data); \
+#    define dprintf(fmt, ...)                                     \
+        do {                                                      \
+            if (debug_config.enable) xprintf(fmt, ##__VA_ARGS__); \
         } while (0)
-#    define debug_hex16(data)                    \
-        do {                                     \
-            if (debug_enable) print_hex16(data); \
-        } while (0)
-#    define debug_hex32(data)                    \
-        do {                                     \
-            if (debug_enable) print_hex32(data); \
-        } while (0)
-#    define debug_bin8(data)                    \
-        do {                                    \
-            if (debug_enable) print_bin8(data); \
-        } while (0)
-#    define debug_bin16(data)                    \
-        do {                                     \
-            if (debug_enable) print_bin16(data); \
-        } while (0)
-#    define debug_bin32(data)                    \
-        do {                                     \
-            if (debug_enable) print_bin32(data); \
-        } while (0)
-#    define debug_bin_reverse8(data)                    \
-        do {                                            \
-            if (debug_enable) print_bin_reverse8(data); \
-        } while (0)
-#    define debug_bin_reverse16(data)                    \
-        do {                                             \
-            if (debug_enable) print_bin_reverse16(data); \
-        } while (0)
-#    define debug_bin_reverse32(data)                    \
-        do {                                             \
-            if (debug_enable) print_bin_reverse32(data); \
-        } while (0)
-#    define debug_hex(data) debug_hex8(data)
-#    define debug_bin(data) debug_bin8(data)
-#    define debug_bin_reverse(data) debug_bin8(data)
-
 #else /* NO_DEBUG */
-
-#    define dprint(s)
-#    define dprintln(s)
 #    define dprintf(fmt, ...)
-#    define dmsg(s)
-#    define debug(s)
-#    define debugln(s)
-#    define debug_msg(s)
-#    define debug_dec(data)
-#    define debug_decs(data)
-#    define debug_hex4(data)
-#    define debug_hex8(data)
-#    define debug_hex16(data)
-#    define debug_hex32(data)
-#    define debug_bin8(data)
-#    define debug_bin16(data)
-#    define debug_bin32(data)
-#    define debug_bin_reverse8(data)
-#    define debug_bin_reverse16(data)
-#    define debug_bin_reverse32(data)
-#    define debug_hex(data)
-#    define debug_bin(data)
-#    define debug_bin_reverse(data)
-
 #endif /* NO_DEBUG */
+
+#define dprint(s) dprintf(s)
+#define dprintln(s) dprintf(s "\r\n")
+#define dmsg(s) dprintf("%s at %d: %s\n", __FILE__, __LINE__, s)
diff --git a/quantum/logging/print.h b/quantum/logging/print.h
index 4c4195de50f..984bc10758b 100644
--- a/quantum/logging/print.h
+++ b/quantum/logging/print.h
@@ -52,40 +52,27 @@ void print_set_sendchar(sendchar_func_t func);
 #    if __has_include_next("_print.h")
 #        include_next "_print.h" /* Include the platforms print.h */
 #    else
-// Fall back to lib/printf
-#        include "printf.h" // lib/printf/printf.h
-
-// Create user & normal print defines
-#        define print(s) printf(s)
-#        define println(s) printf(s "\r\n")
+#        include "printf.h" // // Fall back to lib/printf/printf.h
 #        define xprintf printf
-#        define uprint(s) printf(s)
-#        define uprintln(s) printf(s "\r\n")
-#        define uprintf printf
-
-#    endif /* __has_include_next("_print.h") */
-#else      /* NO_PRINT */
-#    undef xprintf
+#    endif
+#else
 // Remove print defines
-#    define print(s)
-#    define println(s)
+#    undef xprintf
 #    define xprintf(fmt, ...)
-#    define uprintf(fmt, ...)
-#    define uprint(s)
-#    define uprintln(s)
+#endif
 
-#endif /* NO_PRINT */
+// Resolve before USER_PRINT can remove
+#define uprintf xprintf
 
 #ifdef USER_PRINT
 // Remove normal print defines
-#    undef print
-#    undef println
 #    undef xprintf
-#    define print(s)
-#    define println(s)
 #    define xprintf(fmt, ...)
 #endif
 
+#define print(s) xprintf(s)
+#define println(s) xprintf(s "\r\n")
+
 #define print_dec(i) xprintf("%u", i)
 #define print_decs(i) xprintf("%d", i)
 /* hex */
@@ -121,6 +108,9 @@ void print_set_sendchar(sendchar_func_t func);
 //
 // !!! DO NOT USE USER PRINT CALLS IN THE BODY OF QMK/TMK !!!
 
+#define uprint(s) uprintf(s)
+#define uprintln(s) uprintf(s "\r\n")
+
 /* decimal */
 #define uprint_dec(i) uprintf("%u", i)
 #define uprint_decs(i) uprintf("%d", i)
diff --git a/quantum/matrix.c b/quantum/matrix.c
index f087a215d46..d4586efac24 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -78,27 +78,27 @@ __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[]
 
 static inline void setPinOutput_writeLow(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {
-        setPinOutput(pin);
-        writePinLow(pin);
+        gpio_set_pin_output(pin);
+        gpio_write_pin_low(pin);
     }
 }
 
 static inline void setPinOutput_writeHigh(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {
-        setPinOutput(pin);
-        writePinHigh(pin);
+        gpio_set_pin_output(pin);
+        gpio_write_pin_high(pin);
     }
 }
 
 static inline void setPinInputHigh_atomic(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {
-        setPinInputHigh(pin);
+        gpio_set_pin_input_high(pin);
     }
 }
 
 static inline uint8_t readMatrixPin(pin_t pin) {
     if (pin != NO_PIN) {
-        return (readPin(pin) == MATRIX_INPUT_PRESSED_STATE) ? 0 : 1;
+        return (gpio_read_pin(pin) == MATRIX_INPUT_PRESSED_STATE) ? 0 : 1;
     } else {
         return 1;
     }
@@ -113,7 +113,7 @@ __attribute__((weak)) void matrix_init_pins(void) {
         for (int col = 0; col < MATRIX_COLS; col++) {
             pin_t pin = direct_pins[row][col];
             if (pin != NO_PIN) {
-                setPinInputHigh(pin);
+                gpio_set_pin_input_high(pin);
             }
         }
     }
diff --git a/quantum/os_detection.c b/quantum/os_detection.c
index e606227136a..96b026e2471 100644
--- a/quantum/os_detection.c
+++ b/quantum/os_detection.c
@@ -17,6 +17,10 @@
 #include "os_detection.h"
 
 #include <string.h>
+#include "timer.h"
+#ifdef OS_DETECTION_KEYBOARD_RESET
+#    include "quantum.h"
+#endif
 
 #ifdef OS_DETECTION_DEBUG_ENABLE
 #    include "eeconfig.h"
@@ -26,10 +30,19 @@
 #    define STORED_USB_SETUPS 50
 #    define EEPROM_USER_OFFSET (uint8_t*)EECONFIG_SIZE
 
-uint16_t usb_setups[STORED_USB_SETUPS];
+static uint16_t usb_setups[STORED_USB_SETUPS];
+#endif
+
+#ifndef OS_DETECTION_DEBOUNCE
+#    define OS_DETECTION_DEBOUNCE 200
+#endif
+
+// 2s should always be more than enough (otherwise, you may have other issues)
+#if OS_DETECTION_DEBOUNCE > 2000
+#    undef OS_DETECTION_DEBOUNCE
+#    define OS_DETECTION_DEBOUNCE 2000
 #endif
 
-#ifdef OS_DETECTION_ENABLE
 struct setups_data_t {
     uint8_t  count;
     uint8_t  cnt_02;
@@ -45,47 +58,55 @@ struct setups_data_t setups_data = {
     .cnt_ff = 0,
 };
 
-os_variant_t detected_os = OS_UNSURE;
-
-// Some collected sequences of wLength can be found in tests.
-void make_guess(void) {
-    if (setups_data.count < 3) {
-        return;
-    }
-    if (setups_data.cnt_ff >= 2 && setups_data.cnt_04 >= 1) {
-        detected_os = OS_WINDOWS;
-        return;
+static volatile os_variant_t detected_os = OS_UNSURE;
+static os_variant_t          reported_os = OS_UNSURE;
+
+// we need to be able to report OS_UNSURE if that is the stable result of the guesses
+static bool first_report = true;
+
+// to react on USB state changes
+static volatile enum usb_device_state current_usb_device_state  = USB_DEVICE_STATE_INIT;
+static enum usb_device_state          reported_usb_device_state = USB_DEVICE_STATE_INIT;
+
+// the OS detection might be unstable for a while, "debounce" it
+static volatile bool         debouncing = false;
+static volatile fast_timer_t last_time;
+
+void os_detection_task(void) {
+    if (current_usb_device_state == USB_DEVICE_STATE_CONFIGURED) {
+        // debouncing goes for both the detected OS as well as the USB state
+        if (debouncing && timer_elapsed_fast(last_time) >= OS_DETECTION_DEBOUNCE) {
+            debouncing                = false;
+            reported_usb_device_state = current_usb_device_state;
+            if (detected_os != reported_os || first_report) {
+                first_report = false;
+                reported_os  = detected_os;
+                process_detected_host_os_kb(detected_os);
+            }
+        }
     }
-    if (setups_data.count == setups_data.cnt_ff) {
-        // Linux has 3 packets with 0xFF.
-        detected_os = OS_LINUX;
-        return;
-    }
-    if (setups_data.count == 5 && setups_data.last_wlength == 0xFF && setups_data.cnt_ff == 1 && setups_data.cnt_02 == 2) {
-        detected_os = OS_MACOS;
-        return;
-    }
-    if (setups_data.count == 4 && setups_data.cnt_ff == 0 && setups_data.cnt_02 == 2) {
-        // iOS and iPadOS don't have the last 0xFF packet.
-        detected_os = OS_IOS;
-        return;
-    }
-    if (setups_data.cnt_ff == 0 && setups_data.cnt_02 == 3 && setups_data.cnt_04 == 1) {
-        // This is actually PS5.
-        detected_os = OS_LINUX;
-        return;
-    }
-    if (setups_data.cnt_ff >= 1 && setups_data.cnt_02 == 0 && setups_data.cnt_04 == 0) {
-        // This is actually Quest 2 or Nintendo Switch.
-        detected_os = OS_LINUX;
-        return;
+#ifdef OS_DETECTION_KEYBOARD_RESET
+    // resetting the keyboard on the USB device state change callback results in instability, so delegate that to this task
+    // only take action if it's been stable at least once, to avoid issues with some KVMs
+    else if (current_usb_device_state == USB_DEVICE_STATE_INIT && reported_usb_device_state != USB_DEVICE_STATE_INIT) {
+        soft_reset_keyboard();
     }
+#endif
+}
+
+__attribute__((weak)) bool process_detected_host_os_kb(os_variant_t detected_os) {
+    return process_detected_host_os_user(detected_os);
 }
 
+__attribute__((weak)) bool process_detected_host_os_user(os_variant_t detected_os) {
+    return true;
+}
+
+// Some collected sequences of wLength can be found in tests.
 void process_wlength(const uint16_t w_length) {
-#    ifdef OS_DETECTION_DEBUG_ENABLE
+#ifdef OS_DETECTION_DEBUG_ENABLE
     usb_setups[setups_data.count] = w_length;
-#    endif
+#endif
     setups_data.count++;
     setups_data.last_wlength = w_length;
     if (w_length == 0x2) {
@@ -95,7 +116,37 @@ void process_wlength(const uint16_t w_length) {
     } else if (w_length == 0xFF) {
         setups_data.cnt_ff++;
     }
-    make_guess();
+
+    // now try to make a guess
+    os_variant_t guessed = OS_UNSURE;
+    if (setups_data.count >= 3) {
+        if (setups_data.cnt_ff >= 2 && setups_data.cnt_04 >= 1) {
+            guessed = OS_WINDOWS;
+        } else if (setups_data.count == setups_data.cnt_ff) {
+            // Linux has 3 packets with 0xFF.
+            guessed = OS_LINUX;
+        } else if (setups_data.count == 5 && setups_data.last_wlength == 0xFF && setups_data.cnt_ff == 1 && setups_data.cnt_02 == 2) {
+            guessed = OS_MACOS;
+        } else if (setups_data.count == 4 && setups_data.cnt_ff == 0 && setups_data.cnt_02 == 2) {
+            // iOS and iPadOS don't have the last 0xFF packet.
+            guessed = OS_IOS;
+        } else if (setups_data.cnt_ff == 0 && setups_data.cnt_02 == 3 && setups_data.cnt_04 == 1) {
+            // This is actually PS5.
+            guessed = OS_LINUX;
+        } else if (setups_data.cnt_ff >= 1 && setups_data.cnt_02 == 0 && setups_data.cnt_04 == 0) {
+            // This is actually Quest 2 or Nintendo Switch.
+            guessed = OS_LINUX;
+        }
+    }
+
+    // only replace the guessed value if not unsure
+    if (guessed != OS_UNSURE) {
+        detected_os = guessed;
+    }
+
+    // whatever the result, debounce
+    last_time  = timer_read_fast();
+    debouncing = true;
 }
 
 os_variant_t detected_host_os(void) {
@@ -104,15 +155,28 @@ os_variant_t detected_host_os(void) {
 
 void erase_wlength_data(void) {
     memset(&setups_data, 0, sizeof(setups_data));
-    detected_os = OS_UNSURE;
+    detected_os               = OS_UNSURE;
+    reported_os               = OS_UNSURE;
+    current_usb_device_state  = USB_DEVICE_STATE_INIT;
+    reported_usb_device_state = USB_DEVICE_STATE_INIT;
+    debouncing                = false;
+    first_report              = true;
 }
 
-#    if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
+void os_detection_notify_usb_device_state_change(enum usb_device_state usb_device_state) {
+    // treat this like any other source of instability
+    current_usb_device_state = usb_device_state;
+    last_time                = timer_read_fast();
+    debouncing               = true;
+}
+
+#if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
 void slave_update_detected_host_os(os_variant_t os) {
     detected_os = os;
+    last_time   = timer_read_fast();
+    debouncing  = true;
 }
-#    endif // defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
-#endif     // OS_DETECTION_ENABLE
+#endif
 
 #ifdef OS_DETECTION_DEBUG_ENABLE
 void print_stored_setups(void) {
diff --git a/quantum/os_detection.h b/quantum/os_detection.h
index 3496ea0ed21..b8cd8983359 100644
--- a/quantum/os_detection.h
+++ b/quantum/os_detection.h
@@ -17,8 +17,9 @@
 #pragma once
 
 #include <stdint.h>
+#include <stdbool.h>
+#include "usb_device_state.h"
 
-#ifdef OS_DETECTION_ENABLE
 typedef enum {
     OS_UNSURE,
     OS_LINUX,
@@ -30,10 +31,15 @@ typedef enum {
 void         process_wlength(const uint16_t w_length);
 os_variant_t detected_host_os(void);
 void         erase_wlength_data(void);
+void         os_detection_notify_usb_device_state_change(enum usb_device_state usb_device_state);
 
-#    if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
+void os_detection_task(void);
+
+bool process_detected_host_os_kb(os_variant_t os);
+bool process_detected_host_os_user(os_variant_t os);
+
+#if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
 void slave_update_detected_host_os(os_variant_t os);
-#    endif // defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
 #endif
 
 #ifdef OS_DETECTION_DEBUG_ENABLE
diff --git a/quantum/os_detection/tests/os_detection.cpp b/quantum/os_detection/tests/os_detection.cpp
index 102349852e0..a9f671156b8 100644
--- a/quantum/os_detection/tests/os_detection.cpp
+++ b/quantum/os_detection/tests/os_detection.cpp
@@ -18,12 +18,20 @@
 
 extern "C" {
 #include "os_detection.h"
+#include "timer.h"
+
+void advance_time(uint32_t ms);
 }
 
+static uint32_t     reported_count;
+static os_variant_t reported_os;
+
 class OsDetectionTest : public ::testing::Test {
    protected:
     void SetUp() override {
         erase_wlength_data();
+        reported_count = 0;
+        reported_os    = OS_UNSURE;
     }
 };
 
@@ -34,6 +42,26 @@ os_variant_t check_sequence(const std::vector<uint16_t> &w_lengths) {
     return detected_host_os();
 }
 
+bool process_detected_host_os_kb(os_variant_t os) {
+    reported_count = reported_count + 1;
+    reported_os    = os;
+
+    return true;
+}
+
+void assert_not_reported(void) {
+    // check that it does not report the result, nor any intermediate results
+    EXPECT_EQ(reported_count, 0);
+    EXPECT_EQ(reported_os, OS_UNSURE);
+}
+
+void assert_reported(os_variant_t os) {
+    // check that it reports exclusively the result, not any intermediate results
+    EXPECT_EQ(reported_count, 1);
+    EXPECT_EQ(reported_os, os);
+    EXPECT_EQ(reported_os, detected_host_os());
+}
+
 /* Some collected data.
 
 ChibiOS:
@@ -77,88 +105,291 @@ Quest 2: [FF, FF, FF, FE, ...]
 */
 TEST_F(OsDetectionTest, TestLinux) {
     EXPECT_EQ(check_sequence({0xFF, 0xFF, 0xFF}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestChibiosMacos) {
     EXPECT_EQ(check_sequence({0x2, 0x24, 0x2, 0x28, 0xFF}), OS_MACOS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestLufaMacos) {
     EXPECT_EQ(check_sequence({0x2, 0x10, 0x2, 0xE, 0xFF}), OS_MACOS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestVusbMacos) {
     EXPECT_EQ(check_sequence({0x2, 0xE, 0x2, 0xE, 0xFF}), OS_MACOS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestChibiosIos) {
     EXPECT_EQ(check_sequence({0x2, 0x24, 0x2, 0x28}), OS_IOS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestLufaIos) {
     EXPECT_EQ(check_sequence({0x2, 0x10, 0x2, 0xE}), OS_IOS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestVusbIos) {
     EXPECT_EQ(check_sequence({0x2, 0xE, 0x2, 0xE}), OS_IOS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestChibiosWindows10) {
     EXPECT_EQ(check_sequence({0xFF, 0xFF, 0x4, 0x24, 0x4, 0x24, 0x4, 0xFF, 0x24, 0xFF, 0x4, 0xFF, 0x24, 0x4, 0x24, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A}), OS_WINDOWS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestChibiosWindows10_2) {
     EXPECT_EQ(check_sequence({0xFF, 0xFF, 0x4, 0x24, 0x4, 0x24, 0x4, 0x24, 0x4, 0x24, 0x4, 0x24}), OS_WINDOWS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestLufaWindows10) {
     EXPECT_EQ(check_sequence({0x12, 0xFF, 0xFF, 0x4, 0x10, 0xFF, 0xFF, 0xFF, 0x4, 0x10, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A}), OS_WINDOWS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestLufaWindows10_2) {
     EXPECT_EQ(check_sequence({0xFF, 0xFF, 0x4, 0x10, 0xFF, 0x4, 0xFF, 0x10, 0xFF, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A}), OS_WINDOWS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestLufaWindows10_3) {
     EXPECT_EQ(check_sequence({0xFF, 0xFF, 0x4, 0x10, 0x4, 0x10}), OS_WINDOWS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestVusbWindows10) {
     EXPECT_EQ(check_sequence({0xFF, 0xFF, 0x4, 0xE, 0xFF}), OS_WINDOWS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestVusbWindows10_2) {
     EXPECT_EQ(check_sequence({0xFF, 0xFF, 0x4, 0xE, 0x4}), OS_WINDOWS);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestChibiosPs5) {
     EXPECT_EQ(check_sequence({0x2, 0x4, 0x2, 0x28, 0x2, 0x24}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestLufaPs5) {
     EXPECT_EQ(check_sequence({0x2, 0x4, 0x2, 0xE, 0x2, 0x10}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestVusbPs5) {
     EXPECT_EQ(check_sequence({0x2, 0x4, 0x2, 0xE, 0x2}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestChibiosNintendoSwitch) {
     EXPECT_EQ(check_sequence({0x82, 0xFF, 0x40, 0x40, 0xFF, 0x40, 0x40, 0xFF, 0x40, 0x40, 0xFF, 0x40, 0x40, 0xFF, 0x40, 0x40}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestLufaNintendoSwitch) {
     EXPECT_EQ(check_sequence({0x82, 0xFF, 0x40, 0x40, 0xFF, 0x40, 0x40}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestVusbNintendoSwitch) {
     EXPECT_EQ(check_sequence({0x82, 0xFF, 0x40, 0x40}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestChibiosQuest2) {
     EXPECT_EQ(check_sequence({0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
 }
 
 TEST_F(OsDetectionTest, TestVusbQuest2) {
     EXPECT_EQ(check_sequence({0xFF, 0xFF, 0xFF, 0xFE}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
+}
+
+// Regression reported in https://github.com/qmk/qmk_firmware/pull/21777#issuecomment-1922815841
+TEST_F(OsDetectionTest, TestDetectMacM1AsIOS) {
+    EXPECT_EQ(check_sequence({0x02, 0x32, 0x02, 0x24, 0x101, 0xFF}), OS_IOS);
+    os_detection_task();
+    assert_not_reported();
+}
+
+TEST_F(OsDetectionTest, TestDoNotReportIfUsbUnstable) {
+    EXPECT_EQ(check_sequence({0xFF, 0xFF, 0xFF, 0xFE}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
+
+    advance_time(OS_DETECTION_DEBOUNCE);
+    os_detection_task();
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_LINUX);
+}
+
+TEST_F(OsDetectionTest, TestReportAfterDebounce) {
+    EXPECT_EQ(check_sequence({0xFF, 0xFF, 0xFF, 0xFE}), OS_LINUX);
+    os_detection_notify_usb_device_state_change(USB_DEVICE_STATE_CONFIGURED);
+    os_detection_task();
+    assert_not_reported();
+
+    advance_time(1);
+    os_detection_task();
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_LINUX);
+
+    advance_time(OS_DETECTION_DEBOUNCE - 3);
+    os_detection_task();
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_LINUX);
+
+    advance_time(1);
+    os_detection_task();
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_LINUX);
+
+    // advancing the timer alone must not cause a report
+    advance_time(1);
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_LINUX);
+    // the task will cause a report
+    os_detection_task();
+    assert_reported(OS_LINUX);
+    EXPECT_EQ(detected_host_os(), OS_LINUX);
+
+    // check that it remains the same after a long time
+    advance_time(OS_DETECTION_DEBOUNCE * 15);
+    assert_reported(OS_LINUX);
+    EXPECT_EQ(detected_host_os(), OS_LINUX);
+}
+
+TEST_F(OsDetectionTest, TestReportAfterDebounceLongWait) {
+    EXPECT_EQ(check_sequence({0x12, 0xFF, 0xFF, 0x4, 0x10, 0xFF, 0xFF, 0xFF, 0x4, 0x10, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A}), OS_WINDOWS);
+    os_detection_notify_usb_device_state_change(USB_DEVICE_STATE_CONFIGURED);
+    os_detection_task();
+    assert_not_reported();
+
+    advance_time(1);
+    os_detection_task();
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_WINDOWS);
+
+    // advancing the timer alone must not cause a report
+    advance_time(OS_DETECTION_DEBOUNCE * 15);
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_WINDOWS);
+    // the task will cause a report
+    os_detection_task();
+    assert_reported(OS_WINDOWS);
+    EXPECT_EQ(detected_host_os(), OS_WINDOWS);
+
+    // check that it remains the same after a long time
+    advance_time(OS_DETECTION_DEBOUNCE * 10);
+    os_detection_task();
+    assert_reported(OS_WINDOWS);
+    EXPECT_EQ(detected_host_os(), OS_WINDOWS);
+}
+
+TEST_F(OsDetectionTest, TestReportUnsure) {
+    EXPECT_EQ(check_sequence({0x12, 0xFF}), OS_UNSURE);
+    os_detection_notify_usb_device_state_change(USB_DEVICE_STATE_CONFIGURED);
+    os_detection_task();
+    assert_not_reported();
+
+    advance_time(1);
+    os_detection_task();
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_UNSURE);
+
+    // advancing the timer alone must not cause a report
+    advance_time(OS_DETECTION_DEBOUNCE - 1);
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_UNSURE);
+    // the task will cause a report
+    os_detection_task();
+    assert_reported(OS_UNSURE);
+    EXPECT_EQ(detected_host_os(), OS_UNSURE);
+
+    // check that it remains the same after a long time
+    advance_time(OS_DETECTION_DEBOUNCE * 10);
+    os_detection_task();
+    assert_reported(OS_UNSURE);
+    EXPECT_EQ(detected_host_os(), OS_UNSURE);
+}
+
+TEST_F(OsDetectionTest, TestDoNotReportIntermediateResults) {
+    EXPECT_EQ(check_sequence({0x12, 0xFF}), OS_UNSURE);
+    os_detection_notify_usb_device_state_change(USB_DEVICE_STATE_CONFIGURED);
+    os_detection_task();
+    assert_not_reported();
+
+    advance_time(OS_DETECTION_DEBOUNCE - 1);
+    os_detection_task();
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_UNSURE);
+
+    // at this stage, the final result has not been reached yet
+    EXPECT_EQ(check_sequence({0xFF}), OS_LINUX);
+    os_detection_notify_usb_device_state_change(USB_DEVICE_STATE_CONFIGURED);
+    advance_time(OS_DETECTION_DEBOUNCE - 1);
+    os_detection_task();
+    assert_not_reported();
+    // the intermedite but yet unstable result is exposed through detected_host_os()
+    EXPECT_EQ(detected_host_os(), OS_LINUX);
+
+    // the remainder is processed
+    EXPECT_EQ(check_sequence({0x4, 0x10, 0xFF, 0xFF, 0xFF, 0x4, 0x10, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A, 0x20A}), OS_WINDOWS);
+    os_detection_notify_usb_device_state_change(USB_DEVICE_STATE_CONFIGURED);
+    advance_time(OS_DETECTION_DEBOUNCE - 1);
+    os_detection_task();
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_WINDOWS);
+
+    // advancing the timer alone must not cause a report
+    advance_time(1);
+    assert_not_reported();
+    EXPECT_EQ(detected_host_os(), OS_WINDOWS);
+    // the task will cause a report
+    os_detection_task();
+    assert_reported(OS_WINDOWS);
+    EXPECT_EQ(detected_host_os(), OS_WINDOWS);
+
+    // check that it remains the same after a long time
+    advance_time(OS_DETECTION_DEBOUNCE * 10);
+    os_detection_task();
+    assert_reported(OS_WINDOWS);
+    EXPECT_EQ(detected_host_os(), OS_WINDOWS);
+}
+
+TEST_F(OsDetectionTest, TestDoNotGoBackToUnsure) {
+    // 0x02 would cause it to go back to Unsure, so check that it does not
+    EXPECT_EQ(check_sequence({0xFF, 0xFF, 0xFF, 0xFE, 0x02}), OS_LINUX);
+    os_detection_task();
+    assert_not_reported();
 }
diff --git a/quantum/os_detection/tests/rules.mk b/quantum/os_detection/tests/rules.mk
index 9bfe373f46e..1b69b71ba9f 100644
--- a/quantum/os_detection/tests/rules.mk
+++ b/quantum/os_detection/tests/rules.mk
@@ -1,5 +1,7 @@
 os_detection_DEFS := -DOS_DETECTION_ENABLE
+os_detection_DEFS += -DOS_DETECTION_DEBOUNCE=50
 
 os_detection_SRC := \
     $(QUANTUM_PATH)/os_detection/tests/os_detection.cpp \
-    $(QUANTUM_PATH)/os_detection.c
+    $(QUANTUM_PATH)/os_detection.c \
+    $(PLATFORM_PATH)/$(PLATFORM_KEY)/timer.c
diff --git a/quantum/painter/qp.h b/quantum/painter/qp.h
index 873a9d9f329..02acbf589a3 100644
--- a/quantum/painter/qp.h
+++ b/quantum/painter/qp.h
@@ -509,6 +509,12 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai
 #    define ILI9341_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_ILI9341_ENABLE
 
+#ifdef QUANTUM_PAINTER_ILI9486_ENABLE
+#    include "qp_ili9486.h"
+#else // QUANTUM_PAINTER_ILI9486_ENABLE
+#    define ILI9486_NUM_DEVICES 0
+#endif // QUANTUM_PAINTER_ILI9486_ENABLE
+
 #ifdef QUANTUM_PAINTER_ILI9488_ENABLE
 #    include "qp_ili9488.h"
 #else // QUANTUM_PAINTER_ILI9488_ENABLE
diff --git a/quantum/painter/qp_draw.h b/quantum/painter/qp_draw.h
index 3d073efe8ca..7546c061a73 100644
--- a/quantum/painter/qp_draw.h
+++ b/quantum/painter/qp_draw.h
@@ -92,4 +92,9 @@ typedef struct qp_internal_byte_output_state_t {
 
 bool qp_internal_byte_appender(uint8_t byteval, void* cb_arg);
 
+// Helper shared between image and font rendering, sends pixels to the display using:
+//     - qp_internal_decode_palette + qp_internal_pixel_appender (bpp <= 8)
+//     - qp_internal_send_bytes                                  (bpp > 8)
+bool qp_internal_appender(painter_device_t device, uint8_t bpp, uint32_t pixel_count, qp_internal_byte_input_callback input_callback, void* input_state);
+
 qp_internal_byte_input_callback qp_internal_prepare_input_state(qp_internal_byte_input_state_t* input_state, painter_compression_t compression);
diff --git a/quantum/painter/qp_draw_codec.c b/quantum/painter/qp_draw_codec.c
index cee2e32e281..4ff41d0650d 100644
--- a/quantum/painter/qp_draw_codec.c
+++ b/quantum/painter/qp_draw_codec.c
@@ -1,4 +1,5 @@
 // Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2023 Pablo Martinez (@elpekenin) <elpekenin@elpekenin.dev>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "qp_internal.h"
@@ -164,6 +165,45 @@ bool qp_internal_byte_appender(uint8_t byteval, void* cb_arg) {
     return true;
 }
 
+// Helper shared between image and font rendering -- uses either (qp_internal_decode_palette + qp_internal_pixel_appender) or (qp_internal_send_bytes) to send data data to the display based on the asset's native-ness
+bool qp_internal_appender(painter_device_t device, uint8_t bpp, uint32_t pixel_count, qp_internal_byte_input_callback input_callback, void* input_state) {
+    painter_driver_t* driver = (painter_driver_t*)device;
+
+    bool ret = false;
+
+    // Non-native pixel format
+    if (bpp <= 8) {
+        // Set up the output state
+        qp_internal_pixel_output_state_t output_state = {.device = device, .pixel_write_pos = 0, .max_pixels = qp_internal_num_pixels_in_buffer(device)};
+
+        // Decode the pixel data and stream to the display
+        ret = qp_internal_decode_palette(device, pixel_count, bpp, input_callback, input_state, qp_internal_global_pixel_lookup_table, qp_internal_pixel_appender, &output_state);
+        // Any leftovers need transmission as well.
+        if (ret && output_state.pixel_write_pos > 0) {
+            ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.pixel_write_pos);
+        }
+    }
+
+    // Native pixel format
+    else if (bpp != driver->native_bits_per_pixel) {
+        qp_dprintf("Asset's bpp (%d) doesn't match the target display's native_bits_per_pixel (%d)\n", bpp, driver->native_bits_per_pixel);
+        return false;
+    } else {
+        // Set up the output state
+        qp_internal_byte_output_state_t output_state = {.device = device, .byte_write_pos = 0, .max_bytes = qp_internal_num_pixels_in_buffer(device) * driver->native_bits_per_pixel / 8};
+
+        // Stream the raw pixel data to the display
+        uint32_t byte_count = pixel_count * bpp / 8;
+        ret                 = qp_internal_send_bytes(device, byte_count, input_callback, input_state, qp_internal_byte_appender, &output_state);
+        // Any leftovers need transmission as well.
+        if (ret && output_state.byte_write_pos > 0) {
+            ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.byte_write_pos * 8 / driver->native_bits_per_pixel);
+        }
+    }
+
+    return ret;
+}
+
 qp_internal_byte_input_callback qp_internal_prepare_input_state(qp_internal_byte_input_state_t* input_state, painter_compression_t compression) {
     switch (compression) {
         case IMAGE_UNCOMPRESSED:
diff --git a/quantum/painter/qp_draw_image.c b/quantum/painter/qp_draw_image.c
index 87c59148c21..18fa38cb19f 100644
--- a/quantum/painter/qp_draw_image.c
+++ b/quantum/painter/qp_draw_image.c
@@ -263,33 +263,8 @@ static bool qp_drawimage_recolor_impl(painter_device_t device, uint16_t x, uint1
         return false;
     }
 
-    bool ret = false;
-    if (!frame_info->is_panel_native) {
-        // Set up the output state
-        qp_internal_pixel_output_state_t output_state = {.device = device, .pixel_write_pos = 0, .max_pixels = qp_internal_num_pixels_in_buffer(device)};
-
-        // Decode the pixel data and stream to the display
-        ret = qp_internal_decode_palette(device, pixel_count, frame_info->bpp, input_callback, &input_state, qp_internal_global_pixel_lookup_table, qp_internal_pixel_appender, &output_state);
-        // Any leftovers need transmission as well.
-        if (ret && output_state.pixel_write_pos > 0) {
-            ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.pixel_write_pos);
-        }
-    } else if (frame_info->bpp != driver->native_bits_per_pixel) {
-        // Prevent stuff like drawing 24bpp images on 16bpp displays
-        qp_dprintf("Image's bpp doesn't match the target display's native_bits_per_pixel\n");
-        return false;
-    } else {
-        // Set up the output state
-        qp_internal_byte_output_state_t output_state = {.device = device, .byte_write_pos = 0, .max_bytes = qp_internal_num_pixels_in_buffer(device) * driver->native_bits_per_pixel / 8};
-
-        // Stream the raw pixel data to the display
-        uint32_t byte_count = pixel_count * frame_info->bpp / 8;
-        ret                 = qp_internal_send_bytes(device, byte_count, input_callback, &input_state, qp_internal_byte_appender, &output_state);
-        // Any leftovers need transmission as well.
-        if (ret && output_state.byte_write_pos > 0) {
-            ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.byte_write_pos * 8 / driver->native_bits_per_pixel);
-        }
-    }
+    // Decode and stream pixels
+    bool ret = qp_internal_appender(device, frame_info->bpp, pixel_count, input_callback, &input_state);
 
     qp_dprintf("qp_drawimage_recolor: %s\n", ret ? "ok" : "fail");
     qp_comms_stop(device);
diff --git a/quantum/painter/qp_draw_text.c b/quantum/painter/qp_draw_text.c
index 1ac5cab6463..664c89c6e57 100644
--- a/quantum/painter/qp_draw_text.c
+++ b/quantum/painter/qp_draw_text.c
@@ -364,16 +364,9 @@ static inline bool qp_font_code_point_handler_drawglyph(qff_font_handle_t *qff_f
     // Move the x-position for the next glyph
     state->xpos += width;
 
-    // Decode the pixel data for the glyph
+    // Decode the pixel data for the glyph, and stream it
     uint32_t pixel_count = ((uint32_t)width) * height;
-    bool     ret         = qp_internal_decode_palette(state->device, pixel_count, qff_font->bpp, state->input_callback, state->input_state, qp_internal_global_pixel_lookup_table, qp_internal_pixel_appender, state->output_state);
-
-    // Any leftovers need transmission as well.
-    if (ret && state->output_state->pixel_write_pos > 0) {
-        ret &= driver->driver_vtable->pixdata(state->device, qp_internal_global_pixdata_buffer, state->output_state->pixel_write_pos);
-    }
-
-    return ret;
+    return qp_internal_appender(state->device, qff_font->bpp, pixel_count, state->input_callback, state->input_state);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/quantum/painter/qp_internal.c b/quantum/painter/qp_internal.c
index 0e81467e26f..1f0f9817967 100644
--- a/quantum/painter/qp_internal.c
+++ b/quantum/painter/qp_internal.c
@@ -11,6 +11,7 @@ enum {
     // NOTE: We intentionally do not include surfaces here, despite them conforming to the same API.
     QP_NUM_DEVICES = (ILI9163_NUM_DEVICES)   // ILI9163
                      + (ILI9341_NUM_DEVICES) // ILI9341
+                     + (ILI9486_NUM_DEVICES) // ILI9486
                      + (ILI9488_NUM_DEVICES) // ILI9488
                      + (ST7789_NUM_DEVICES)  // ST7789
                      + (ST7735_NUM_DEVICES)  // ST7735
diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk
index ca81cffb032..d991a6d7423 100644
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@@ -9,6 +9,7 @@ VALID_QUANTUM_PAINTER_DRIVERS := \
     surface \
     ili9163_spi \
     ili9341_spi \
+    ili9486_spi \
     ili9488_spi \
     st7735_spi \
     st7789_spi \
@@ -80,6 +81,17 @@ define handle_quantum_painter_driver
             $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
             $(DRIVER_PATH)/painter/ili9xxx/qp_ili9341.c \
 
+    else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),ili9486_spi)
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
+        OPT_DEFS += -DQUANTUM_PAINTER_ILI9486_ENABLE -DQUANTUM_PAINTER_ILI9486_SPI_ENABLE
+        COMMON_VPATH += \
+            $(DRIVER_PATH)/painter/tft_panel \
+            $(DRIVER_PATH)/painter/ili9xxx
+        SRC += \
+            $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
+            $(DRIVER_PATH)/painter/ili9xxx/qp_ili9486.c \
+
     else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),ili9488_spi)
         QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
         QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index 17dc701a415..4682aceb14d 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -149,9 +149,9 @@ __attribute__((weak)) void pointing_device_init(void) {
         pointing_device_driver.init();
 #ifdef POINTING_DEVICE_MOTION_PIN
 #    ifdef POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
-        setPinInputHigh(POINTING_DEVICE_MOTION_PIN);
+        gpio_set_pin_input_high(POINTING_DEVICE_MOTION_PIN);
 #    else
-        setPinInput(POINTING_DEVICE_MOTION_PIN);
+        gpio_set_pin_input(POINTING_DEVICE_MOTION_PIN);
 #    endif
 #endif
     }
@@ -247,18 +247,19 @@ __attribute__((weak)) bool pointing_device_task(void) {
 #        error POINTING_DEVICE_MOTION_PIN not supported when sharing the pointing device report between sides.
 #    endif
 #    ifdef POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
-    if (!readPin(POINTING_DEVICE_MOTION_PIN))
+    if (!gpio_read_pin(POINTING_DEVICE_MOTION_PIN))
 #    else
-    if (readPin(POINTING_DEVICE_MOTION_PIN))
+    if (gpio_read_pin(POINTING_DEVICE_MOTION_PIN))
 #    endif
+    {
 #endif
 
 #if defined(SPLIT_POINTING_ENABLE)
 #    if defined(POINTING_DEVICE_COMBINED)
         static uint8_t old_buttons = 0;
-    local_mouse_report.buttons = old_buttons;
-    local_mouse_report         = pointing_device_driver.get_report(local_mouse_report);
-    old_buttons                = local_mouse_report.buttons;
+        local_mouse_report.buttons = old_buttons;
+        local_mouse_report         = pointing_device_driver.get_report(local_mouse_report);
+        old_buttons                = local_mouse_report.buttons;
 #    elif defined(POINTING_DEVICE_LEFT) || defined(POINTING_DEVICE_RIGHT)
         local_mouse_report = POINTING_DEVICE_THIS_SIDE ? pointing_device_driver.get_report(local_mouse_report) : shared_mouse_report;
 #    else
@@ -268,6 +269,10 @@ __attribute__((weak)) bool pointing_device_task(void) {
     local_mouse_report = pointing_device_driver.get_report(local_mouse_report);
 #endif // defined(SPLIT_POINTING_ENABLE)
 
+#ifdef POINTING_DEVICE_MOTION_PIN
+    }
+#endif
+
     // allow kb to intercept and modify report
 #if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
     if (is_keyboard_left()) {
@@ -363,7 +368,7 @@ void pointing_device_set_cpi(uint16_t cpi) {
  * @param[in] cpi uint16_t value.
  */
 void pointing_device_set_cpi_on_side(bool left, uint16_t cpi) {
-    bool local = (is_keyboard_left() & left) ? true : false;
+    bool local = (is_keyboard_left() == left);
     if (local) {
         pointing_device_driver.set_cpi(cpi);
     } else {
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.c b/quantum/pointing_device/pointing_device_auto_mouse.c
index 3135b9e531b..1b11fffedb7 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.c
+++ b/quantum/pointing_device/pointing_device_auto_mouse.c
@@ -17,6 +17,7 @@
 
 #ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
 
+#    include <stdlib.h>
 #    include <string.h>
 #    include "pointing_device_auto_mouse.h"
 #    include "debug.h"
@@ -217,7 +218,11 @@ void auto_mouse_layer_off(void) {
  * @return bool of pointing_device activation
  */
 __attribute__((weak)) bool auto_mouse_activation(report_mouse_t mouse_report) {
-    return mouse_report.x != 0 || mouse_report.y != 0 || mouse_report.h != 0 || mouse_report.v != 0 || mouse_report.buttons;
+    auto_mouse_context.total_mouse_movement.x += mouse_report.x;
+    auto_mouse_context.total_mouse_movement.y += mouse_report.y;
+    auto_mouse_context.total_mouse_movement.h += mouse_report.h;
+    auto_mouse_context.total_mouse_movement.v += mouse_report.v;
+    return abs(auto_mouse_context.total_mouse_movement.x) > AUTO_MOUSE_THRESHOLD || abs(auto_mouse_context.total_mouse_movement.y) > AUTO_MOUSE_THRESHOLD || abs(auto_mouse_context.total_mouse_movement.h) > AUTO_MOUSE_THRESHOLD || abs(auto_mouse_context.total_mouse_movement.v) > AUTO_MOUSE_THRESHOLD || mouse_report.buttons;
 }
 
 /**
@@ -235,14 +240,16 @@ void pointing_device_task_auto_mouse(report_mouse_t mouse_report) {
     // update activation and reset debounce
     auto_mouse_context.status.is_activated = auto_mouse_activation(mouse_report);
     if (is_auto_mouse_active()) {
-        auto_mouse_context.timer.active = timer_read();
-        auto_mouse_context.timer.delay  = 0;
+        auto_mouse_context.total_mouse_movement = (total_mouse_movement_t){.x = 0, .y = 0, .h = 0, .v = 0};
+        auto_mouse_context.timer.active         = timer_read();
+        auto_mouse_context.timer.delay          = 0;
         if (!layer_state_is((AUTO_MOUSE_TARGET_LAYER))) {
             layer_on((AUTO_MOUSE_TARGET_LAYER));
         }
     } else if (layer_state_is((AUTO_MOUSE_TARGET_LAYER)) && timer_elapsed(auto_mouse_context.timer.active) > auto_mouse_context.config.timeout) {
         layer_off((AUTO_MOUSE_TARGET_LAYER));
-        auto_mouse_context.timer.active = 0;
+        auto_mouse_context.timer.active         = 0;
+        auto_mouse_context.total_mouse_movement = (total_mouse_movement_t){.x = 0, .y = 0, .h = 0, .v = 0};
     }
 }
 
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.h b/quantum/pointing_device/pointing_device_auto_mouse.h
index 1343855e001..904f18b68e2 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.h
+++ b/quantum/pointing_device/pointing_device_auto_mouse.h
@@ -42,8 +42,17 @@
 #ifndef AUTO_MOUSE_DEBOUNCE
 #    define AUTO_MOUSE_DEBOUNCE 25
 #endif
+#ifndef AUTO_MOUSE_THRESHOLD
+#    define AUTO_MOUSE_THRESHOLD 10
+#endif
 
 /* data structure */
+typedef struct {
+    mouse_xy_report_t x;
+    mouse_xy_report_t y;
+    int8_t            v;
+    int8_t            h;
+} total_mouse_movement_t;
 typedef struct {
     struct {
         bool     is_enabled;
@@ -60,6 +69,7 @@ typedef struct {
         bool   is_toggled;
         int8_t mouse_key_tracker;
     } status;
+    total_mouse_movement_t total_mouse_movement;
 } auto_mouse_context_t;
 
 /* ----------Set up and control------------------------------------------------------------------------------ */
diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c
index 1088c8f76c1..b8fb868c6d3 100644
--- a/quantum/process_keycode/process_caps_word.c
+++ b/quantum/process_keycode/process_caps_word.c
@@ -14,6 +14,7 @@
 
 #include "process_caps_word.h"
 #include "process_auto_shift.h"
+#include "process_space_cadet.h"
 #include "caps_word.h"
 #include "keycodes.h"
 #include "quantum_keycodes.h"
@@ -110,6 +111,9 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
 #        endif // COMMAND_ENABLE
         ) {
             caps_word_on();
+#        ifdef SPACE_CADET_ENABLE
+            reset_space_cadet();
+#        endif // SPACE_CADET_ENABLE
         }
 #    endif     // defined(COMMAND_ENABLE) && !defined(IS_COMMAND)
 #endif         // BOTH_SHIFTS_TURNS_ON_CAPS_WORD
diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index 30a51503dbb..214cd80a87e 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -133,9 +133,8 @@ void dynamic_macro_record_key(keyrecord_t *macro_buffer, keyrecord_t **macro_poi
     if (*macro_pointer - direction != macro2_end) {
         **macro_pointer = *record;
         *macro_pointer += direction;
-    } else {
-        dynamic_macro_record_key_user(direction, record);
     }
+    dynamic_macro_record_key_user(direction, record);
 
     dprintf("dynamic macro: slot %d length: %d/%d\n", DYNAMIC_MACRO_CURRENT_SLOT(), DYNAMIC_MACRO_CURRENT_LENGTH(macro_buffer, *macro_pointer), DYNAMIC_MACRO_CURRENT_CAPACITY(macro_buffer, macro2_end));
 }
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index 377fcb69e25..5ecd897d16b 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -38,7 +38,7 @@ void process_midi_all_notes_off(void) {
 #endif // MIDI_BASIC
 
 #ifdef MIDI_ADVANCED
-static uint8_t tone_status[2][MIDI_TONE_COUNT];
+static uint8_t tone_status[MIDI_TONE_COUNT];
 
 static uint8_t  midi_modulation;
 static int8_t   midi_modulation_step;
@@ -57,8 +57,7 @@ void midi_init(void) {
     midi_config.modulation_interval = 8;
 
     for (uint8_t i = 0; i < MIDI_TONE_COUNT; i++) {
-        tone_status[0][i] = MIDI_INVALID_NOTE;
-        tone_status[1][i] = 0;
+        tone_status[i] = MIDI_INVALID_NOTE;
     }
 
     midi_modulation       = 0;
@@ -77,21 +76,19 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
             uint8_t tone     = keycode - MIDI_TONE_MIN;
             uint8_t velocity = midi_config.velocity;
             if (record->event.pressed) {
-                uint8_t note = midi_compute_note(keycode);
-                midi_send_noteon(&midi_device, channel, note, velocity);
-                dprintf("midi noteon channel:%d note:%d velocity:%d\n", channel, note, velocity);
-                tone_status[1][tone] += 1;
-                if (tone_status[0][tone] == MIDI_INVALID_NOTE) {
-                    tone_status[0][tone] = note;
+                if (tone_status[tone] == MIDI_INVALID_NOTE) {
+                    uint8_t note = midi_compute_note(keycode);
+                    midi_send_noteon(&midi_device, channel, note, velocity);
+                    dprintf("midi noteon channel:%d note:%d velocity:%d\n", channel, note, velocity);
+                    tone_status[tone] = note;
                 }
             } else {
-                uint8_t note = tone_status[0][tone];
-                tone_status[1][tone] -= 1;
-                if (tone_status[1][tone] == 0) {
+                uint8_t note = tone_status[tone];
+                if (note != MIDI_INVALID_NOTE) {
                     midi_send_noteoff(&midi_device, channel, note, velocity);
                     dprintf("midi noteoff channel:%d note:%d velocity:%d\n", channel, note, velocity);
-                    tone_status[0][tone] = MIDI_INVALID_NOTE;
                 }
+                tone_status[tone] = MIDI_INVALID_NOTE;
             }
             return false;
         }
diff --git a/quantum/process_keycode/process_space_cadet.c b/quantum/process_keycode/process_space_cadet.c
index f948ad6238b..3e280d57d97 100644
--- a/quantum/process_keycode/process_space_cadet.c
+++ b/quantum/process_keycode/process_space_cadet.c
@@ -157,10 +157,14 @@ bool process_space_cadet(uint16_t keycode, keyrecord_t *record) {
         }
         default: {
             if (record->event.pressed) {
-                sc_last = 0;
+                reset_space_cadet();
             }
             break;
         }
     }
     return true;
 }
+
+void reset_space_cadet() {
+    sc_last = 0;
+}
diff --git a/quantum/process_keycode/process_space_cadet.h b/quantum/process_keycode/process_space_cadet.h
index 6d10051532c..9d254e26fd1 100644
--- a/quantum/process_keycode/process_space_cadet.h
+++ b/quantum/process_keycode/process_space_cadet.h
@@ -21,3 +21,4 @@
 
 void perform_space_cadet(keyrecord_t *record, uint16_t sc_keycode, uint8_t holdMod, uint8_t tapMod, uint8_t keycode);
 bool process_space_cadet(uint16_t keycode, keyrecord_t *record);
+void reset_space_cadet(void);
diff --git a/quantum/process_keycode/process_steno.c b/quantum/process_keycode/process_steno.c
index bd4361580bf..c491d6f1d8c 100644
--- a/quantum/process_keycode/process_steno.c
+++ b/quantum/process_keycode/process_steno.c
@@ -128,9 +128,6 @@ static const uint16_t combinedmap_second[] PROGMEM = {STN_S2, STN_KL, STN_WL, ST
 
 #ifdef STENO_ENABLE_ALL
 void steno_init(void) {
-    if (!eeconfig_is_enabled()) {
-        eeconfig_init();
-    }
     mode = eeprom_read_byte(EECONFIG_STENOMODE);
 }
 
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index 237fa71cd33..451897e449a 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -133,7 +133,7 @@ bool preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
 
     if (!active_td || keycode == active_td) return false;
 
-    action                             = &tap_dance_actions[TD_INDEX(active_td)];
+    action                             = &tap_dance_actions[QK_TAP_DANCE_GET_INDEX(active_td)];
     action->state.interrupted          = true;
     action->state.interrupting_keycode = keycode;
     process_tap_dance_action_on_dance_finished(action);
@@ -154,7 +154,7 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
 
     switch (keycode) {
         case QK_TAP_DANCE ... QK_TAP_DANCE_MAX:
-            action = &tap_dance_actions[TD_INDEX(keycode)];
+            action = &tap_dance_actions[QK_TAP_DANCE_GET_INDEX(keycode)];
 
             action->state.pressed = record->event.pressed;
             if (record->event.pressed) {
@@ -182,7 +182,7 @@ void tap_dance_task(void) {
 
     if (!active_td || timer_elapsed(last_tap_time) <= GET_TAPPING_TERM(active_td, &(keyrecord_t){})) return;
 
-    action = &tap_dance_actions[TD_INDEX(active_td)];
+    action = &tap_dance_actions[QK_TAP_DANCE_GET_INDEX(active_td)];
     if (!action->state.interrupted) {
         process_tap_dance_action_on_dance_finished(action);
     }
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h
index 2b114dabd36..c0137c14a33 100644
--- a/quantum/process_keycode/process_tap_dance.h
+++ b/quantum/process_keycode/process_tap_dance.h
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "action.h"
+#include "quantum_keycodes.h"
 
 typedef struct {
     uint16_t interrupting_keycode;
@@ -74,8 +75,7 @@ typedef struct {
 #define ACTION_TAP_DANCE_FN_ADVANCED_WITH_RELEASE(user_fn_on_each_tap, user_fn_on_each_release, user_fn_on_dance_finished, user_fn_on_dance_reset) \
     { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, user_fn_on_each_release}, .user_data = NULL, }
 
-#define TD(n) (QK_TAP_DANCE | TD_INDEX(n))
-#define TD_INDEX(code) ((code)&0xFF)
+#define TD_INDEX(code) QK_TAP_DANCE_GET_INDEX(code)
 #define TAP_DANCE_KEYCODE(state) TD(((tap_dance_action_t *)state) - tap_dance_actions)
 
 extern tap_dance_action_t tap_dance_actions[];
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 8ae91a1847f..01bf661956f 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -15,7 +15,6 @@
  */
 
 #include "quantum.h"
-#include "magic.h"
 #include "qmk_settings.h"
 
 #if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE)
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 20b0887194a..0c2dac5ba53 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -42,7 +42,6 @@
 #include "action_layer.h"
 #include "eeconfig.h"
 #include "bootloader.h"
-#include "bootmagic.h"
 #include "timer.h"
 #include "sync_timer.h"
 #include "gpio.h"
@@ -59,6 +58,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef BOOTMAGIC_ENABLE
+#    include "bootmagic.h"
+#endif
+
 #ifdef DEFERRED_EXEC_ENABLE
 #    include "deferred_exec.h"
 #endif
@@ -233,6 +236,10 @@ extern layer_state_t layer_state;
 #    include "process_repeat_key.h"
 #endif
 
+#ifdef OS_DETECTION_ENABLE
+#    include "os_detection.h"
+#endif
+
 void set_single_persistent_default_layer(uint8_t default_layer);
 
 #define IS_LAYER_ON(layer) layer_state_is(layer)
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index d3249bd4555..882e1d07aec 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -190,6 +190,10 @@
 #define SH_T(kc) (QK_SWAP_HANDS | ((kc)&0xFF))
 #define QK_SWAP_HANDS_GET_TAP_KEYCODE(kc) ((kc)&0xFF)
 
+// Tap dance
+#define TD(i) (QK_TAP_DANCE | ((i)&0xFF))
+#define QK_TAP_DANCE_GET_INDEX(kc) ((kc)&0xFF)
+
 // MIDI aliases
 #define MIDI_TONE_MIN QK_MIDI_NOTE_C_0
 #define MIDI_TONE_MAX QK_MIDI_NOTE_B_5
diff --git a/quantum/rgb_matrix/animations/solid_reactive_anim.h b/quantum/rgb_matrix/animations/solid_reactive_anim.h
index d035da9c50c..cab7f874f71 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_anim.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_anim.h
@@ -8,7 +8,7 @@ static HSV SOLID_REACTIVE_math(HSV hsv, uint16_t offset) {
 #            ifdef RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE
     hsv.h = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 8) >> 4);
 #            endif
-    hsv.h += qsub8(130, offset);
+    hsv.h += scale8(255 - offset, 64);
     return hsv;
 }
 
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index d93d189827a..655aca18679 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -76,9 +76,6 @@ static uint8_t         rgb_last_enable   = UINT8_MAX;
 static uint8_t         rgb_last_effect   = UINT8_MAX;
 static effect_params_t rgb_effect_params = {0, LED_FLAG_ALL, false};
 static rgb_task_states rgb_task_state    = SYNCING;
-#if RGB_MATRIX_TIMEOUT > 0
-static uint32_t rgb_anykey_timer;
-#endif // RGB_MATRIX_TIMEOUT > 0
 
 // double buffers
 static uint32_t rgb_timer_buffer;
@@ -103,7 +100,7 @@ void eeconfig_update_rgb_matrix_default(void) {
     rgb_matrix_config.mode   = RGB_MATRIX_DEFAULT_MODE;
     rgb_matrix_config.hsv    = (HSV){RGB_MATRIX_DEFAULT_HUE, RGB_MATRIX_DEFAULT_SAT, RGB_MATRIX_DEFAULT_VAL};
     rgb_matrix_config.speed  = RGB_MATRIX_DEFAULT_SPD;
-    rgb_matrix_config.flags  = LED_FLAG_ALL;
+    rgb_matrix_config.flags  = RGB_MATRIX_DEFAULT_FLAGS;
     eeconfig_flush_rgb_matrix(true);
 }
 
@@ -163,9 +160,6 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
 #ifndef RGB_MATRIX_SPLIT
     if (!is_keyboard_master()) return;
 #endif
-#if RGB_MATRIX_TIMEOUT > 0
-    rgb_anykey_timer = 0;
-#endif // RGB_MATRIX_TIMEOUT > 0
 
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
     uint8_t led[LED_HITS_TO_REMEMBER];
@@ -246,18 +240,11 @@ static bool rgb_matrix_none(effect_params_t *params) {
 }
 
 static void rgb_task_timers(void) {
-#if defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_MATRIX_TIMEOUT > 0
+#if defined(RGB_MATRIX_KEYREACTIVE_ENABLED)
     uint32_t deltaTime = sync_timer_elapsed32(rgb_timer_buffer);
-#endif // defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_MATRIX_TIMEOUT > 0
+#endif // defined(RGB_MATRIX_KEYREACTIVE_ENABLED)
     rgb_timer_buffer = sync_timer_read32();
 
-    // Update double buffer timers
-#if RGB_MATRIX_TIMEOUT > 0
-    if (rgb_anykey_timer + deltaTime <= UINT32_MAX) {
-        rgb_anykey_timer += deltaTime;
-    }
-#endif // RGB_MATRIX_TIMEOUT > 0
-
     // Update double buffer last hit timers
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
     uint8_t count = last_hit_buffer.count;
@@ -370,7 +357,7 @@ void rgb_matrix_task(void) {
     // while suspended and just do a software shutdown. This is a cheap hack for now.
     bool suspend_backlight = suspend_state ||
 #if RGB_MATRIX_TIMEOUT > 0
-                             (rgb_anykey_timer > (uint32_t)RGB_MATRIX_TIMEOUT) ||
+                             (last_input_activity_elapsed() > (uint32_t)RGB_MATRIX_TIMEOUT) ||
 #endif // RGB_MATRIX_TIMEOUT > 0
                              false;
 
@@ -473,12 +460,6 @@ void rgb_matrix_init(void) {
     }
 #endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
-    if (!eeconfig_is_enabled()) {
-        dprintf("rgb_matrix_init_drivers eeconfig is not enabled.\n");
-        eeconfig_init();
-        eeconfig_update_rgb_matrix_default();
-    }
-
     eeconfig_init_rgb_matrix();
     if (!rgb_matrix_config.mode) {
         dprintf("rgb_matrix_init_drivers rgb_matrix_config.mode = 0. Write default values to EEPROM.\n");
@@ -488,7 +469,7 @@ void rgb_matrix_init(void) {
 }
 
 void rgb_matrix_set_suspend_state(bool state) {
-#ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
+#ifdef RGB_MATRIX_SLEEP
     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
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index 0d53081ef62..c1ea8e972e8 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -21,31 +21,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "rgb_matrix_types.h"
+#include "rgb_matrix_drivers.h"
 #include "color.h"
 #include "keyboard.h"
 
-#if defined(RGB_MATRIX_IS31FL3218)
-#    include "is31fl3218.h"
-#elif defined(RGB_MATRIX_IS31FL3731)
-#    include "is31fl3731.h"
-#elif defined(RGB_MATRIX_IS31FL3733)
-#    include "is31fl3733.h"
-#elif defined(RGB_MATRIX_IS31FL3736)
-#    include "is31fl3736.h"
-#elif defined(RGB_MATRIX_IS31FL3737)
-#    include "is31fl3737.h"
-#elif defined(RGB_MATRIX_IS31FL3741)
-#    include "is31fl3741.h"
-#elif defined(IS31FLCOMMON)
-#    include "is31flcommon.h"
-#elif defined(RGB_MATRIX_SNLED27351)
-#    include "snled27351.h"
-#elif defined(RGB_MATRIX_AW20216S)
-#    include "aw20216s.h"
-#elif defined(RGB_MATRIX_WS2812)
-#    include "ws2812.h"
-#endif
-
 #ifndef RGB_MATRIX_TIMEOUT
 #    define RGB_MATRIX_TIMEOUT 0
 #endif
@@ -99,6 +78,10 @@
 #    define RGB_MATRIX_DEFAULT_SPD UINT8_MAX / 2
 #endif
 
+#ifndef RGB_MATRIX_DEFAULT_FLAGS
+#    define RGB_MATRIX_DEFAULT_FLAGS LED_FLAG_ALL
+#endif
+
 #ifndef RGB_MATRIX_LED_FLUSH_LIMIT
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
 #endif
@@ -272,17 +255,6 @@ void        rgb_matrix_set_flags_noeeprom(led_flags_t flags);
 #    define rgblight_decrease_speed_noeeprom rgb_matrix_decrease_speed_noeeprom
 #endif
 
-typedef struct {
-    /* Perform any initialisation required for the other driver functions to work. */
-    void (*init)(void);
-    /* Set the colour of a single LED in the buffer. */
-    void (*set_color)(int index, uint8_t r, uint8_t g, uint8_t b);
-    /* Set the colour of all LEDS on the keyboard in the buffer. */
-    void (*set_color_all)(uint8_t r, uint8_t g, uint8_t b);
-    /* Flush any buffered changes to the hardware. */
-    void (*flush)(void);
-} rgb_matrix_driver_t;
-
 static inline bool rgb_matrix_check_finished_leds(uint8_t led_idx) {
 #if defined(RGB_MATRIX_SPLIT)
     if (is_keyboard_left()) {
@@ -295,8 +267,6 @@ static inline bool rgb_matrix_check_finished_leds(uint8_t led_idx) {
 #endif
 }
 
-extern const rgb_matrix_driver_t rgb_matrix_driver;
-
 extern rgb_config_t rgb_matrix_config;
 
 extern uint32_t     g_rgb_timer;
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index 0f979cb2337..95d1e884f09 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -14,7 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rgb_matrix.h"
+#include "rgb_matrix_drivers.h"
+
+#include <stdbool.h>
+#include "keyboard.h"
+#include "color.h"
 #include "util.h"
 
 /* Each driver needs to define the struct
@@ -32,6 +36,14 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
     .set_color_all = is31fl3218_set_color_all,
 };
 
+#elif defined(RGB_MATRIX_IS31FL3729)
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init          = is31fl3729_init_drivers,
+    .flush         = is31fl3729_flush,
+    .set_color     = is31fl3729_set_color,
+    .set_color_all = is31fl3729_set_color_all,
+};
+
 #elif defined(RGB_MATRIX_IS31FL3731)
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init          = is31fl3731_init_drivers,
@@ -72,12 +84,36 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
     .set_color_all = is31fl3741_set_color_all,
 };
 
-#elif defined(IS31FLCOMMON)
+#elif defined(RGB_MATRIX_IS31FL3742A)
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init          = is31fl3742a_init_drivers,
+    .flush         = is31fl3742a_flush,
+    .set_color     = is31fl3742a_set_color,
+    .set_color_all = is31fl3742a_set_color_all,
+};
+
+#elif defined(RGB_MATRIX_IS31FL3743A)
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init          = is31fl3743a_init_drivers,
+    .flush         = is31fl3743a_flush,
+    .set_color     = is31fl3743a_set_color,
+    .set_color_all = is31fl3743a_set_color_all,
+};
+
+#elif defined(RGB_MATRIX_IS31FL3745)
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init          = is31fl3745_init_drivers,
+    .flush         = is31fl3745_flush,
+    .set_color     = is31fl3745_set_color,
+    .set_color_all = is31fl3745_set_color_all,
+};
+
+#elif defined(RGB_MATRIX_IS31FL3746A)
 const rgb_matrix_driver_t rgb_matrix_driver = {
-    .init          = IS31FL_RGB_init_drivers,
-    .flush         = IS31FL_common_flush,
-    .set_color     = IS31FL_RGB_set_color,
-    .set_color_all = IS31FL_RGB_set_color_all,
+    .init          = is31fl3746a_init_drivers,
+    .flush         = is31fl3746a_flush,
+    .set_color     = is31fl3746a_set_color,
+    .set_color_all = is31fl3746a_set_color_all,
 };
 
 #elif defined(RGB_MATRIX_SNLED27351)
@@ -103,7 +139,7 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
 #    endif
 
 // LED color buffer
-rgb_led_t rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
+rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_COUNT];
 bool      ws2812_dirty = false;
 
 static void init(void) {
@@ -112,7 +148,7 @@ static void init(void) {
 
 static void flush(void) {
     if (ws2812_dirty) {
-        ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT);
+        ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_COUNT);
         ws2812_dirty = false;
     }
 }
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.h b/quantum/rgb_matrix/rgb_matrix_drivers.h
new file mode 100644
index 00000000000..a24cb03a185
--- /dev/null
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.h
@@ -0,0 +1,49 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+
+#if defined(RGB_MATRIX_AW20216S)
+#    include "aw20216s.h"
+#elif defined(RGB_MATRIX_IS31FL3218)
+#    include "is31fl3218.h"
+#elif defined(RGB_MATRIX_IS31FL3729)
+#    include "is31fl3729.h"
+#elif defined(RGB_MATRIX_IS31FL3731)
+#    include "is31fl3731.h"
+#elif defined(RGB_MATRIX_IS31FL3733)
+#    include "is31fl3733.h"
+#elif defined(RGB_MATRIX_IS31FL3736)
+#    include "is31fl3736.h"
+#elif defined(RGB_MATRIX_IS31FL3737)
+#    include "is31fl3737.h"
+#elif defined(RGB_MATRIX_IS31FL3741)
+#    include "is31fl3741.h"
+#elif defined(RGB_MATRIX_IS31FL3742A)
+#    include "is31fl3742a.h"
+#elif defined(RGB_MATRIX_IS31FL3743A)
+#    include "is31fl3743a.h"
+#elif defined(RGB_MATRIX_IS31FL3745)
+#    include "is31fl3745.h"
+#elif defined(RGB_MATRIX_IS31FL3746A)
+#    include "is31fl3746a.h"
+#elif defined(RGB_MATRIX_SNLED27351)
+#    include "snled27351.h"
+#elif defined(RGB_MATRIX_WS2812)
+#    include "ws2812.h"
+#endif
+
+typedef struct {
+    /* Perform any initialisation required for the other driver functions to work. */
+    void (*init)(void);
+    /* Set the colour of a single LED in the buffer. */
+    void (*set_color)(int index, uint8_t r, uint8_t g, uint8_t b);
+    /* Set the colour of all LEDS on the keyboard in the buffer. */
+    void (*set_color_all)(uint8_t r, uint8_t g, uint8_t b);
+    /* Flush any buffered changes to the hardware. */
+    void (*flush)(void);
+} rgb_matrix_driver_t;
+
+extern const rgb_matrix_driver_t rgb_matrix_driver;
diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c
index 8ac886d441f..530cb046881 100644
--- a/quantum/rgblight/rgblight.c
+++ b/quantum/rgblight/rgblight.c
@@ -116,7 +116,7 @@ animation_status_t animation_status = {};
 #endif
 
 #ifndef LED_ARRAY
-rgb_led_t led[RGBLED_NUM];
+rgb_led_t led[RGBLIGHT_LED_COUNT];
 #    define LED_ARRAY led
 #endif
 
@@ -126,7 +126,7 @@ rgblight_segment_t const *const *rgblight_layers = NULL;
 static bool deferred_set_layer_state = false;
 #endif
 
-rgblight_ranges_t rgblight_ranges = {0, RGBLED_NUM, 0, RGBLED_NUM, RGBLED_NUM};
+rgblight_ranges_t rgblight_ranges = {0, RGBLIGHT_LED_COUNT, 0, RGBLIGHT_LED_COUNT, RGBLIGHT_LED_COUNT};
 
 void rgblight_set_clipping_range(uint8_t start_pos, uint8_t num_leds) {
     rgblight_ranges.clipping_start_pos = start_pos;
@@ -134,8 +134,8 @@ void rgblight_set_clipping_range(uint8_t start_pos, uint8_t num_leds) {
 }
 
 void rgblight_set_effect_range(uint8_t start_pos, uint8_t num_leds) {
-    if (start_pos >= RGBLED_NUM) return;
-    if (start_pos + num_leds > RGBLED_NUM) return;
+    if (start_pos >= RGBLIGHT_LED_COUNT) return;
+    if (start_pos + num_leds > RGBLIGHT_LED_COUNT) return;
     rgblight_ranges.effect_start_pos = start_pos;
     rgblight_ranges.effect_end_pos   = start_pos + num_leds;
     rgblight_ranges.effect_num_leds  = num_leds;
@@ -229,13 +229,7 @@ void rgblight_init(void) {
         return;
     }
 
-    dprintf("rgblight_init called.\n");
     dprintf("rgblight_init start!\n");
-    if (!eeconfig_is_enabled()) {
-        dprintf("rgblight_init eeconfig is not enabled.\n");
-        eeconfig_init();
-        eeconfig_update_rgblight_default();
-    }
     rgblight_config.raw = eeconfig_read_rgblight();
     RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
     if (!rgblight_config.mode) {
@@ -664,7 +658,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {
 }
 
 void rgblight_setrgb_at(uint8_t r, uint8_t g, uint8_t b, uint8_t index) {
-    if (!rgblight_config.enable || index >= RGBLED_NUM) {
+    if (!rgblight_config.enable || index >= RGBLIGHT_LED_COUNT) {
         return;
     }
 
@@ -700,7 +694,7 @@ static uint8_t get_interval_time(const uint8_t *default_interval_address, uint8_
 #endif
 
 void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8_t end) {
-    if (!rgblight_config.enable || start < 0 || start >= end || end > RGBLED_NUM) {
+    if (!rgblight_config.enable || start < 0 || start >= end || end > RGBLIGHT_LED_COUNT) {
         return;
     }
 
@@ -727,19 +721,19 @@ 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);
+    rgblight_setrgb_range(r, g, b, 0, (uint8_t)RGBLIGHT_LED_COUNT / 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);
+    rgblight_setrgb_range(r, g, b, (uint8_t)RGBLIGHT_LED_COUNT / 2, (uint8_t)RGBLIGHT_LED_COUNT);
 }
 
 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);
+    rgblight_sethsv_range(hue, sat, val, 0, (uint8_t)RGBLIGHT_LED_COUNT / 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);
+    rgblight_sethsv_range(hue, sat, val, (uint8_t)RGBLIGHT_LED_COUNT / 2, (uint8_t)RGBLIGHT_LED_COUNT);
 }
 #endif // ifndef RGBLIGHT_SPLIT
 
@@ -789,7 +783,7 @@ static void rgblight_layers_write(void) {
                 break; // No more segments
             }
             // Write segment.count LEDs
-            rgb_led_t *const limit = &led[MIN(segment.index + segment.count, RGBLED_NUM)];
+            rgb_led_t *const limit = &led[MIN(segment.index + segment.count, RGBLIGHT_LED_COUNT)];
             for (rgb_led_t *led_ptr = &led[segment.index]; led_ptr < limit; led_ptr++) {
 #    ifdef RGBLIGHT_LAYERS_RETAIN_VAL
                 sethsv(segment.hue, segment.sat, current_val, led_ptr);
@@ -900,12 +894,6 @@ void rgblight_wakeup(void) {
 
 #endif
 
-__attribute__((weak)) void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds) {
-    ws2812_setleds(start_led, num_leds);
-}
-
-#ifndef RGBLIGHT_CUSTOM
-
 void rgblight_set(void) {
     rgb_led_t *start_led;
     uint8_t    num_leds = rgblight_ranges.clipping_num_leds;
@@ -915,42 +903,41 @@ void rgblight_set(void) {
             led[i].r = 0;
             led[i].g = 0;
             led[i].b = 0;
-#    ifdef RGBW
+#ifdef RGBW
             led[i].w = 0;
-#    endif
+#endif
         }
     }
 
-#    ifdef RGBLIGHT_LAYERS
+#ifdef RGBLIGHT_LAYERS
     if (rgblight_layers != NULL
-#        if !defined(RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF)
+#    if !defined(RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF)
         && rgblight_config.enable
-#        elif defined(RGBLIGHT_SLEEP)
+#    elif defined(RGBLIGHT_SLEEP)
         && !is_suspended
-#        endif
+#    endif
     ) {
         rgblight_layers_write();
     }
-#    endif
+#endif
 
-#    ifdef RGBLIGHT_LED_MAP
-    rgb_led_t led0[RGBLED_NUM];
-    for (uint8_t i = 0; i < RGBLED_NUM; i++) {
+#ifdef RGBLIGHT_LED_MAP
+    rgb_led_t led0[RGBLIGHT_LED_COUNT];
+    for (uint8_t i = 0; i < RGBLIGHT_LED_COUNT; i++) {
         led0[i] = led[pgm_read_byte(&led_map[i])];
     }
     start_led = led0 + rgblight_ranges.clipping_start_pos;
-#    else
+#else
     start_led = led + rgblight_ranges.clipping_start_pos;
-#    endif
+#endif
 
-#    ifdef RGBW
+#ifdef RGBW
     for (uint8_t i = 0; i < num_leds; i++) {
         convert_rgb_to_rgbw(&start_led[i]);
     }
-#    endif
-    rgblight_call_driver(start_led, num_leds);
-}
 #endif
+    rgblight_driver.setleds(start_led, num_leds);
+}
 
 #ifdef RGBLIGHT_SPLIT
 /* for split keyboard master side */
@@ -1279,8 +1266,8 @@ void rgblight_effect_snake(animation_status_t *anim) {
 #    endif
         for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) {
             k = pos + j * increment;
-            if (k > RGBLED_NUM) {
-                k = k % (RGBLED_NUM);
+            if (k > RGBLIGHT_LED_COUNT) {
+                k = k % (RGBLIGHT_LED_COUNT);
             }
             if (k < 0) {
                 k = k + rgblight_ranges.effect_num_leds;
@@ -1465,7 +1452,7 @@ typedef struct PACKED {
     uint8_t max_life;
 } TwinkleState;
 
-static TwinkleState led_twinkle_state[RGBLED_NUM];
+static TwinkleState led_twinkle_state[RGBLIGHT_LED_COUNT];
 
 void rgblight_effect_twinkle(animation_status_t *anim) {
     const bool random_color = anim->delta / 3;
diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h
index a222ab6b9fc..9e2b073776c 100644
--- a/quantum/rgblight/rgblight.h
+++ b/quantum/rgblight/rgblight.h
@@ -16,6 +16,12 @@
 
 #pragma once
 
+// DEPRECATED DEFINES - DO NOT USE
+#if defined(RGBLED_NUM)
+#    define RGBLIGHT_LED_COUNT RGBLED_NUM
+#endif
+// ========
+
 /***** rgblight_mode(mode)/rgblight_mode_noeeprom(mode) ****
 
  old mode number (before 0.6.117) to new mode name table
@@ -160,6 +166,7 @@ enum RGBLIGHT_EFFECT_MODE {
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "rgblight_drivers.h"
 #include "progmem.h"
 #include "eeconfig.h"
 #include "ws2812.h"
@@ -233,7 +240,7 @@ void rgblight_unblink_all_but_layer(uint8_t layer);
 
 #endif
 
-extern rgb_led_t led[RGBLED_NUM];
+extern rgb_led_t led[RGBLIGHT_LED_COUNT];
 
 extern const uint8_t  RGBLED_BREATHING_INTERVALS[4] PROGMEM;
 extern const uint8_t  RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM;
diff --git a/quantum/rgblight/rgblight_breathe_table.h b/quantum/rgblight/rgblight_breathe_table.h
index 5c7660ab6a6..147b1bf09af 100644
--- a/quantum/rgblight/rgblight_breathe_table.h
+++ b/quantum/rgblight/rgblight_breathe_table.h
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/quantum/rgblight/rgblight_drivers.c b/quantum/rgblight/rgblight_drivers.c
new file mode 100644
index 00000000000..45b60e1a5fc
--- /dev/null
+++ b/quantum/rgblight/rgblight_drivers.c
@@ -0,0 +1,20 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "rgblight_drivers.h"
+
+#if defined(RGBLIGHT_WS2812)
+#    include "ws2812.h"
+
+const rgblight_driver_t rgblight_driver = {
+    .setleds = ws2812_setleds,
+};
+
+#elif defined(RGBLIGHT_APA102)
+#    include "apa102.h"
+
+const rgblight_driver_t rgblight_driver = {
+    .setleds = apa102_setleds,
+};
+
+#endif
diff --git a/quantum/rgblight/rgblight_drivers.h b/quantum/rgblight/rgblight_drivers.h
new file mode 100644
index 00000000000..f7125a6f3d3
--- /dev/null
+++ b/quantum/rgblight/rgblight_drivers.h
@@ -0,0 +1,13 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include "color.h"
+
+typedef struct {
+    void (*setleds)(rgb_led_t *ledarray, uint16_t number_of_leds);
+} rgblight_driver_t;
+
+extern const rgblight_driver_t rgblight_driver;
diff --git a/quantum/send_string/send_string.c b/quantum/send_string/send_string.c
index 820fc251632..8b59c19219f 100644
--- a/quantum/send_string/send_string.c
+++ b/quantum/send_string/send_string.c
@@ -147,7 +147,7 @@ __attribute__((weak)) const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
 #define PGM_LOADBIT(mem, pos) ((pgm_read_byte(&((mem)[(pos) / 8])) >> ((pos) % 8)) & 0x01)
 
 void send_string(const char *string) {
-    send_string_with_delay(string, 0);
+    send_string_with_delay(string, TAP_CODE_DELAY);
 }
 
 void send_string_with_delay(const char *string, uint8_t interval) {
@@ -156,6 +156,7 @@ void send_string_with_delay(const char *string, uint8_t interval) {
         if (!ascii_code) break;
         if (ascii_code == SS_QMK_PREFIX) {
             ascii_code = *(++string);
+
             if (ascii_code == SS_TAP_CODE) {
                 // tap
                 uint8_t keycode = *(++string);
@@ -172,28 +173,30 @@ void send_string_with_delay(const char *string, uint8_t interval) {
                 // delay
                 int     ms      = 0;
                 uint8_t keycode = *(++string);
+
                 while (isdigit(keycode)) {
                     ms *= 10;
                     ms += keycode - '0';
                     keycode = *(++string);
                 }
-                while (ms--)
-                    wait_ms(1);
+
+                wait_ms(ms);
             }
+
+            wait_ms(interval);
         } else {
-            send_char(ascii_code);
+            send_char_with_delay(ascii_code, interval);
         }
+
         ++string;
-        // interval
-        {
-            uint8_t ms = interval;
-            while (ms--)
-                wait_ms(1);
-        }
     }
 }
 
 void send_char(char ascii_code) {
+    send_char_with_delay(ascii_code, TAP_CODE_DELAY);
+}
+
+void send_char_with_delay(char ascii_code, uint8_t interval) {
 #if defined(AUDIO_ENABLE) && defined(SENDSTRING_BELL)
     if (ascii_code == '\a') { // BEL
         PLAY_SONG(bell_song);
@@ -208,19 +211,30 @@ void send_char(char ascii_code) {
 
     if (is_shifted) {
         register_code(KC_LEFT_SHIFT);
+        wait_ms(interval);
     }
+
     if (is_altgred) {
         register_code(KC_RIGHT_ALT);
+        wait_ms(interval);
     }
-    tap_code(keycode);
+
+    tap_code_delay(keycode, interval);
+    wait_ms(interval);
+
     if (is_altgred) {
         unregister_code(KC_RIGHT_ALT);
+        wait_ms(interval);
     }
+
     if (is_shifted) {
         unregister_code(KC_LEFT_SHIFT);
+        wait_ms(interval);
     }
+
     if (is_dead) {
         tap_code(KC_SPACE);
+        wait_ms(interval);
     }
 }
 
diff --git a/quantum/send_string/send_string.h b/quantum/send_string/send_string.h
index dbaed43ebcc..f727ec507da 100644
--- a/quantum/send_string/send_string.h
+++ b/quantum/send_string/send_string.h
@@ -49,7 +49,7 @@ extern const uint8_t ascii_to_keycode_lut[128];
 /**
  * \brief Type out a string of ASCII characters.
  *
- * This function simply calls `send_string_with_delay(string, 0)`.
+ * This function simply calls `send_string_with_delay(string, TAP_CODE_DELAY)`.
  *
  * Most keycodes from the basic keycode range are also supported by way of a special sequence - see `send_string_keycodes.h`.
  *
@@ -61,17 +61,27 @@ void send_string(const char *string);
  * \brief Type out a string of ASCII characters, with a delay between each character.
  *
  * \param string The string to type out.
- * \param interval The amount of time, in milliseconds, to wait before typing the next character.
+ * \param interval The amount of time, in milliseconds, to wait before typing the next character. Note this can be set to 0 to ensure no delay, regardless of what TAP_CODE_DELAY is set to.
  */
 void send_string_with_delay(const char *string, uint8_t interval);
 
 /**
  * \brief Type out an ASCII character.
  *
+ * This function simply calls `send_char_with_delay(string, TAP_CODE_DELAY)`.
+ *
  * \param ascii_code The character to type.
  */
 void send_char(char ascii_code);
 
+/**
+ * \brief Type out an ASCII character, with a delay between any modifiers.
+ *
+ * \param ascii_code The character to type.
+ * \param interval The amount of time, in milliseconds, to wait in between key presses. Note this can be set to 0 to ensure no delay, regardless of what TAP_CODE_DELAY is set to.
+ */
+void send_char_with_delay(char ascii_code, uint8_t interval);
+
 /**
  * \brief Type out an eight digit (unsigned 32-bit) hexadecimal value.
  *
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 874339361d2..96f19bfd840 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -123,14 +123,14 @@ void split_watchdog_task(void) {
 void matrix_io_delay(void);
 
 static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
-    setPinInputHigh(in_pin);
-    setPinOutput(out_pin);
-    writePinLow(out_pin);
+    gpio_set_pin_input_high(in_pin);
+    gpio_set_pin_output(out_pin);
+    gpio_write_pin_low(out_pin);
     // It's almost unnecessary, but wait until it's down to low, just in case.
     wait_us(1);
-    uint8_t pin_state = readPin(in_pin);
+    uint8_t pin_state = gpio_read_pin(in_pin);
     // Set out_pin to a setting that is less susceptible to noise.
-    setPinInputHigh(out_pin);
+    gpio_set_pin_input_high(out_pin);
     matrix_io_delay(); // Wait for the pull-up to go HIGH.
     return pin_state;
 }
@@ -138,19 +138,19 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
 
 __attribute__((weak)) bool is_keyboard_left_impl(void) {
 #if defined(SPLIT_HAND_PIN)
-    setPinInput(SPLIT_HAND_PIN);
+    gpio_set_pin_input(SPLIT_HAND_PIN);
     wait_us(100);
     // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand
 #    ifdef SPLIT_HAND_PIN_LOW_IS_LEFT
-    return !readPin(SPLIT_HAND_PIN);
+    return !gpio_read_pin(SPLIT_HAND_PIN);
 #    else
-    return readPin(SPLIT_HAND_PIN);
+    return gpio_read_pin(SPLIT_HAND_PIN);
 #    endif
 #elif defined(SPLIT_HAND_MATRIX_GRID)
-#    ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
-    return peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID);
-#    else
+#    ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
     return !peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID);
+#    else
+    return peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID);
 #    endif
 #elif defined(EE_HANDS)
     if (!eeconfig_is_enabled()) {
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h
index 4d4d2b95708..5bfbe2aec79 100644
--- a/quantum/split_common/transaction_id_define.h
+++ b/quantum/split_common/transaction_id_define.h
@@ -31,6 +31,7 @@ enum serial_transaction_id {
 #ifdef ENCODER_ENABLE
     GET_ENCODERS_CHECKSUM,
     GET_ENCODERS_DATA,
+    CMD_ENCODER_DRAIN,
 #endif // ENCODER_ENABLE
 
 #ifndef DISABLE_SYNC_TIMER
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 2b9423cd636..33bc9e9f575 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
 #include <string.h>
 #include <stddef.h>
 
@@ -80,8 +81,12 @@
     { 0, 0, sizeof_member(split_shared_memory_t, member), offsetof(split_shared_memory_t, member), cb }
 #define trans_target2initiator_initializer(member) trans_target2initiator_initializer_cb(member, NULL)
 
+#define trans_initiator2target_cb(cb) \
+    { 0, 0, 0, 0, cb }
+
 #define transport_write(id, data, length) transport_execute_transaction(id, data, length, NULL, 0)
 #define transport_read(id, data, length) transport_execute_transaction(id, NULL, 0, data, length)
+#define transport_exec(id) transport_execute_transaction(id, NULL, 0, NULL, 0)
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 // Forward-declare the RPC callback handlers
@@ -234,21 +239,39 @@ static void master_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_ro
 #ifdef ENCODER_ENABLE
 
 static bool encoder_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
-    static uint32_t last_update = 0;
-    uint8_t         temp_state[NUM_ENCODERS_MAX_PER_SIDE];
+    static uint32_t  last_update   = 0;
+    static uint8_t   last_checksum = 0;
+    encoder_events_t temp_events;
+
+    bool okay = read_if_checksum_mismatch(GET_ENCODERS_CHECKSUM, GET_ENCODERS_DATA, &last_update, &temp_events, &split_shmem->encoders.events, sizeof(temp_events));
+    if (okay) {
+        if (last_checksum != split_shmem->encoders.checksum) {
+            bool    actioned = false;
+            uint8_t index;
+            bool    clockwise;
+            while (okay && encoder_dequeue_event_advanced(&split_shmem->encoders.events, &index, &clockwise)) {
+                okay &= encoder_queue_event(index, clockwise);
+                actioned = true;
+            }
 
-    bool okay = read_if_checksum_mismatch(GET_ENCODERS_CHECKSUM, GET_ENCODERS_DATA, &last_update, temp_state, split_shmem->encoders.state, sizeof(temp_state));
-    if (okay) encoder_update_raw(temp_state);
+            if (actioned) {
+                okay &= transport_exec(CMD_ENCODER_DRAIN);
+            }
+            last_checksum = split_shmem->encoders.checksum;
+        }
+    }
     return okay;
 }
 
 static void encoder_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
-    uint8_t encoder_state[NUM_ENCODERS_MAX_PER_SIDE];
-    encoder_state_raw(encoder_state);
     // Always prepare the encoder state for read.
-    memcpy(split_shmem->encoders.state, encoder_state, sizeof(encoder_state));
+    encoder_retrieve_events(&split_shmem->encoders.events);
     // Now update the checksum given that the encoders has been written to
-    split_shmem->encoders.checksum = crc8(encoder_state, sizeof(encoder_state));
+    split_shmem->encoders.checksum = crc8(&split_shmem->encoders.events, sizeof(split_shmem->encoders.events));
+}
+
+static void encoder_handlers_slave_drain(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer) {
+    encoder_signal_queue_drain();
 }
 
 // clang-format off
@@ -256,7 +279,8 @@ static void encoder_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sl
 #    define TRANSACTIONS_ENCODERS_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(encoder)
 #    define TRANSACTIONS_ENCODERS_REGISTRATIONS \
     [GET_ENCODERS_CHECKSUM] = trans_target2initiator_initializer(encoders.checksum), \
-    [GET_ENCODERS_DATA]     = trans_target2initiator_initializer(encoders.state),
+    [GET_ENCODERS_DATA]     = trans_target2initiator_initializer(encoders.events), \
+    [CMD_ENCODER_DRAIN]     = trans_initiator2target_cb(encoder_handlers_slave_drain),
 // clang-format on
 
 #else // ENCODER_ENABLE
diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c
index aade3c98d7a..83edc34859b 100644
--- a/quantum/split_common/transport.c
+++ b/quantum/split_common/transport.c
@@ -56,7 +56,7 @@ i2c_status_t transport_trigger_callback(int8_t id) {
     // Kick off the "callback executor", now that data has been written to the slave
     split_shmem->transaction_id     = id;
     split_transaction_desc_t *trans = &split_transaction_table[I2C_EXECUTE_CALLBACK];
-    return i2c_writeReg(SLAVE_I2C_ADDRESS, trans->initiator2target_offset, split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size, SLAVE_I2C_TIMEOUT);
+    return i2c_write_register(SLAVE_I2C_ADDRESS, trans->initiator2target_offset, split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size, SLAVE_I2C_TIMEOUT);
 }
 
 bool transport_execute_transaction(int8_t id, const void *initiator2target_buf, uint16_t initiator2target_length, void *target2initiator_buf, uint16_t target2initiator_length) {
@@ -65,7 +65,7 @@ bool transport_execute_transaction(int8_t id, const void *initiator2target_buf,
     if (initiator2target_length > 0) {
         size_t len = trans->initiator2target_buffer_size < initiator2target_length ? trans->initiator2target_buffer_size : initiator2target_length;
         memcpy(split_trans_initiator2target_buffer(trans), initiator2target_buf, len);
-        if ((status = i2c_writeReg(SLAVE_I2C_ADDRESS, trans->initiator2target_offset, split_trans_initiator2target_buffer(trans), len, SLAVE_I2C_TIMEOUT)) < 0) {
+        if ((status = i2c_write_register(SLAVE_I2C_ADDRESS, trans->initiator2target_offset, split_trans_initiator2target_buffer(trans), len, SLAVE_I2C_TIMEOUT)) < 0) {
             return false;
         }
     }
@@ -77,7 +77,7 @@ bool transport_execute_transaction(int8_t id, const void *initiator2target_buf,
 
     if (target2initiator_length > 0) {
         size_t len = trans->target2initiator_buffer_size < target2initiator_length ? trans->target2initiator_buffer_size : target2initiator_length;
-        if ((status = i2c_readReg(SLAVE_I2C_ADDRESS, trans->target2initiator_offset, split_trans_target2initiator_buffer(trans), len, SLAVE_I2C_TIMEOUT)) < 0) {
+        if ((status = i2c_read_register(SLAVE_I2C_ADDRESS, trans->target2initiator_offset, split_trans_target2initiator_buffer(trans), len, SLAVE_I2C_TIMEOUT)) < 0) {
             return false;
         }
         memcpy(target2initiator_buf, split_trans_target2initiator_buffer(trans), len);
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index 2e2b918d451..4f6b968fa8a 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -65,8 +65,8 @@ typedef struct _split_master_matrix_sync_t {
 
 #ifdef ENCODER_ENABLE
 typedef struct _split_slave_encoder_sync_t {
-    uint8_t checksum;
-    uint8_t state[NUM_ENCODERS_MAX_PER_SIDE];
+    uint8_t          checksum;
+    encoder_events_t events;
 } split_slave_encoder_sync_t;
 #endif // ENCODER_ENABLE
 
diff --git a/shell.nix b/shell.nix
index 63e5af0525d..88822b0b17e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,29 +1,9 @@
 let
   # We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example.
   sources = import ./util/nix/sources.nix { };
-
-  # `tomlkit` >= 0.8.0 is required to build `jsonschema` >= 4.11.0 (older
-  # version do not support some valid TOML syntax: sdispater/tomlkit#148).  The
-  # updated `tomlkit` must be used by `makeRemoveSpecialDependenciesHook`
-  # inside `poetry2nix`, therefore just providing the updated version through
-  # our `nix/pyproject.toml` does not work, and using an overlay is required.
-  pythonOverlay = final: prev: {
-    python3 = prev.python3.override {
-      packageOverrides = self: super: {
-        tomlkit = super.tomlkit.overridePythonAttrs(old: rec {
-          version = "0.11.4";
-          src = super.fetchPypi {
-            inherit (old) pname;
-            inherit version;
-            sha256 = "sha256-MjWpAQ+uVDI+cnw6wG+3IHUv5mNbNCbjedrsYPvUSoM=";
-          };
-        });
-      };
-    };
-  };
 in
 # However, if you want to override Niv's inputs, this will let you do that.
-{ pkgs ? import sources.nixpkgs { overlays = [ pythonOverlay ]; }
+{ pkgs ? import sources.nixpkgs { }
 , poetry2nix ? pkgs.callPackage (import sources.poetry2nix) { }
 , avr ? true
 , arm ? true
@@ -49,18 +29,22 @@ let
   pythonEnv = poetry2nix.mkPoetryEnv {
     projectDir = ./util/nix;
     overrides = poetry2nix.overrides.withDefaults (self: super: {
-      pillow = super.pillow.overridePythonAttrs(old: {
-        # Use preConfigure from nixpkgs to fix library detection issues and
-        # impurities which can break the build process; this also requires
-        # adding propagatedBuildInputs and buildInputs from the same source.
-        propagatedBuildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.propagatedBuildInputs;
-        buildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.buildInputs;
-        preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure;
-      });
       qmk = super.qmk.overridePythonAttrs(old: {
         # Allow QMK CLI to run "qmk" as a subprocess (the wrapper changes
         # $PATH and breaks these invocations).
         dontWrapPythonPrograms = true;
+
+        # Fix "qmk setup" to use the Python interpreter from the environment
+        # when invoking "qmk doctor" (sys.executable gets its value from
+        # $NIX_PYTHONEXECUTABLE, which is set by the "qmk" wrapper from the
+        # Python environment, so "qmk doctor" then runs with the proper
+        # $NIX_PYTHONPATH too, because sys.executable actually points to
+        # another wrapper from the same Python environment).
+        postPatch = ''
+          substituteInPlace qmk_cli/subcommands/setup.py \
+            --replace "[Path(sys.argv[0]).as_posix()" \
+              "[Path(sys.executable).as_posix(), Path(sys.argv[0]).as_posix()"
+        '';
       });
     });
   };
@@ -68,7 +52,7 @@ in
 mkShell {
   name = "qmk-firmware";
 
-  buildInputs = [ clang-tools dfu-programmer dfu-util diffutils git pythonEnv niv ]
+  buildInputs = [ clang-tools_11 dfu-programmer dfu-util diffutils git pythonEnv niv ]
     ++ lib.optional avr [
       pkgsCross.avr.buildPackages.binutils
       pkgsCross.avr.buildPackages.gcc8
diff --git a/tests/caps_word/test_caps_word.cpp b/tests/caps_word/test_caps_word.cpp
index 802f1e960e5..28d86e93243 100644
--- a/tests/caps_word/test_caps_word.cpp
+++ b/tests/caps_word/test_caps_word.cpp
@@ -423,8 +423,8 @@ TEST_P(CapsWordBothShifts, PressLRLR) {
     run_one_scan_loop();
     right_shift.press();
 
-    // For mod-tap and Space Cadet keys, wait for the tapping term.
-    if (left_shift.code == LSFT_T(KC_A) || left_shift.code == QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN) {
+    // For mod-tap, wait for the tapping term.
+    if (left_shift.code == LSFT_T(KC_A)) {
         idle_for(TAPPING_TERM);
     }
 
@@ -461,7 +461,7 @@ TEST_P(CapsWordBothShifts, PressLRRL) {
     run_one_scan_loop();
     right_shift.press();
 
-    if (left_shift.code == LSFT_T(KC_A) || left_shift.code == QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN) {
+    if (left_shift.code == LSFT_T(KC_A)) {
         idle_for(TAPPING_TERM);
     }
     run_one_scan_loop();
diff --git a/tests/tap_dance/examples.c b/tests/tap_dance/examples.c
index 13086bbb4bb..5377b397d3c 100644
--- a/tests/tap_dance/examples.c
+++ b/tests/tap_dance/examples.c
@@ -83,7 +83,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     switch (keycode) {
         case TD(CT_CLN):
-            action = &tap_dance_actions[TD_INDEX(keycode)];
+            action = &tap_dance_actions[QK_TAP_DANCE_GET_INDEX(keycode)];
             if (!record->event.pressed && action->state.count && !action->state.finished) {
                 tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
                 tap_code16(tap_hold->tap);
diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp
index 9ed80cdbcf6..29f7c710a03 100644
--- a/tests/test_common/keycode_table.cpp
+++ b/tests/test_common/keycode_table.cpp
@@ -1,4 +1,4 @@
-// Copyright 2023 QMK
+// Copyright 2024 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
diff --git a/tmk_core/protocol/arm_atsam/shift_register.c b/tmk_core/protocol/arm_atsam/shift_register.c
index 3adb682aa8b..e81db4a19d7 100644
--- a/tmk_core/protocol/arm_atsam/shift_register.c
+++ b/tmk_core/protocol/arm_atsam/shift_register.c
@@ -28,27 +28,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define CLOCK_DELAY 10
 
 void shift_init_impl(void) {
-    setPinOutput(SR_EXP_RCLK_PIN);
-    setPinOutput(SPI_DATAOUT_PIN);
-    setPinOutput(SPI_SCLK_PIN);
+    gpio_set_pin_output(SR_EXP_RCLK_PIN);
+    gpio_set_pin_output(SPI_DATAOUT_PIN);
+    gpio_set_pin_output(SPI_SCLK_PIN);
 }
 
 void shift_out_impl(const uint8_t *data, uint16_t length) {
-    writePinLow(SR_EXP_RCLK_PIN);
+    gpio_write_pin_low(SR_EXP_RCLK_PIN);
     for (uint16_t i = 0; i < length; i++) {
         uint8_t val = data[i];
 
         // shift out lsb first
         for (uint8_t bit = 0; bit < 8; bit++) {
-            writePin(SPI_DATAOUT_PIN, !!(val & (1 << bit)));
-            writePin(SPI_SCLK_PIN, true);
+            gpio_write_pin(SPI_DATAOUT_PIN, !!(val & (1 << bit)));
+            gpio_write_pin(SPI_SCLK_PIN, true);
             wait_us(CLOCK_DELAY);
 
-            writePin(SPI_SCLK_PIN, false);
+            gpio_write_pin(SPI_SCLK_PIN, false);
             wait_us(CLOCK_DELAY);
         }
     }
-    writePinHigh(SR_EXP_RCLK_PIN);
+    gpio_write_pin_high(SR_EXP_RCLK_PIN);
     return SPI_STATUS_SUCCESS;
 }
 
@@ -74,13 +74,13 @@ void shift_out(const uint8_t *data, uint16_t length) {
 }
 
 void shift_enable(void) {
-    setPinOutput(SR_EXP_OE_PIN);
-    writePinLow(SR_EXP_OE_PIN);
+    gpio_set_pin_output(SR_EXP_OE_PIN);
+    gpio_write_pin_low(SR_EXP_OE_PIN);
 }
 
 void shift_disable(void) {
-    setPinOutput(SR_EXP_OE_PIN);
-    writePinHigh(SR_EXP_OE_PIN);
+    gpio_set_pin_output(SR_EXP_OE_PIN);
+    gpio_write_pin_high(SR_EXP_OE_PIN);
 }
 
 void shift_init(void) {
diff --git a/tmk_core/protocol/arm_atsam/spi_master.c b/tmk_core/protocol/arm_atsam/spi_master.c
index 3be82fac1d9..fedb9654fde 100644
--- a/tmk_core/protocol/arm_atsam/spi_master.c
+++ b/tmk_core/protocol/arm_atsam/spi_master.c
@@ -60,8 +60,8 @@ bool spi_start(pin_t csPin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
     }
 
     currentSelectPin = csPin;
-    setPinOutput(currentSelectPin);
-    writePinLow(currentSelectPin);
+    gpio_set_pin_output(currentSelectPin);
+    gpio_write_pin_low(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.
@@ -94,8 +94,8 @@ spi_status_t spi_transmit(const uint8_t *data, uint16_t length) {
 
 void spi_stop(void) {
     if (currentSelectPin != NO_PIN) {
-        setPinOutput(currentSelectPin);
-        writePinHigh(currentSelectPin);
+        gpio_set_pin_output(currentSelectPin);
+        gpio_write_pin_high(currentSelectPin);
         currentSelectPin = NO_PIN;
     }
 }
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 66f9ad03186..7b1e6412131 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -51,6 +51,11 @@
 extern keymap_config_t keymap_config;
 #endif
 
+#if defined(CONSOLE_ENABLE)
+#    define RBUF_SIZE 256
+#    include "ring_buffer.h"
+#endif
+
 /* ---------------------------------------------------------
  *       Global interface variables and declarations
  * ---------------------------------------------------------
@@ -217,6 +222,24 @@ static const USBEndpointConfig digitizer_ep_config = {
 };
 #endif
 
+#ifdef CONSOLE_ENABLE
+/* Console endpoint state structure */
+static USBInEndpointState console_ep_state;
+
+/* Console endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */
+static const USBEndpointConfig console_ep_config = {
+    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
+    NULL,                   /* SETUP packet notification callback */
+    dummy_usb_cb,           /* IN notification callback */
+    NULL,                   /* OUT notification callback */
+    CONSOLE_EPSIZE,         /* IN maximum packet size */
+    0,                      /* OUT maximum packet size */
+    &console_ep_state,      /* IN Endpoint state */
+    NULL,                   /* OUT endpoint state */
+    usb_lld_endpoint_fields /* USB driver specific endpoint fields */
+};
+#endif
+
 #ifdef USB_ENDPOINTS_ARE_REORDERABLE
 typedef struct {
     size_t              queue_capacity_in;
@@ -347,9 +370,6 @@ typedef struct {
 typedef struct {
     union {
         struct {
-#ifdef CONSOLE_ENABLE
-            usb_driver_config_t console_driver;
-#endif
 #ifdef RAW_ENABLE
             usb_driver_config_t raw_driver;
 #endif
@@ -365,13 +385,6 @@ typedef struct {
 } usb_driver_configs_t;
 
 static usb_driver_configs_t drivers = {
-#ifdef CONSOLE_ENABLE
-#    define CONSOLE_IN_CAPACITY 4
-#    define CONSOLE_OUT_CAPACITY 4
-#    define CONSOLE_IN_MODE USB_EP_MODE_TYPE_INTR
-#    define CONSOLE_OUT_MODE USB_EP_MODE_TYPE_INTR
-    .console_driver = QMK_USB_DRIVER_CONFIG(CONSOLE, 0, true),
-#endif
 #ifdef RAW_ENABLE
 #    ifndef RAW_IN_CAPACITY
 #        define RAW_IN_CAPACITY 4
@@ -509,6 +522,9 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
 #endif
 #if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP)
             usbInitEndpointI(usbp, DIGITIZER_IN_EPNUM, &digitizer_ep_config);
+#endif
+#ifdef CONSOLE_ENABLE
+            usbInitEndpointI(usbp, CONSOLE_IN_EPNUM, &console_ep_config);
 #endif
             for (int i = 0; i < NUM_USB_DRIVERS; i++) {
 #ifdef USB_ENDPOINTS_ARE_REORDERABLE
@@ -915,50 +931,35 @@ void send_digitizer(report_digitizer_t *report) {
 #ifdef CONSOLE_ENABLE
 
 int8_t sendchar(uint8_t c) {
-    static bool timed_out = false;
-    /* The `timed_out` state is an approximation of the ideal `is_listener_disconnected?` state.
-     *
-     * When a 5ms timeout write has timed out, hid_listen is most likely not running, or not
-     * listening to this keyboard, so we go into the timed_out state. In this state we assume
-     * that hid_listen is most likely not gonna be connected to us any time soon, so it would
-     * be wasteful to write follow-up characters with a 5ms timeout, it would all add up and
-     * unncecessarily slow down the firmware. However instead of just dropping the characters,
-     * we write them with a TIME_IMMEDIATE timeout, which is a zero timeout,
-     * and this will succeed only if hid_listen gets connected again. When a write with
-     * TIME_IMMEDIATE timeout succeeds, we know that hid_listen is listening to us again, and
-     * we can go back to the timed_out = false state, and following writes will be executed
-     * with a 5ms timeout. The reason we don't just send all characters with the TIME_IMMEDIATE
-     * timeout is that this could cause bytes to be lost even if hid_listen is running, if there
-     * is a lot of data being sent over the console.
-     *
-     * This logic will work correctly as long as hid_listen is able to receive at least 200
-     * bytes per second. On a heavily overloaded machine that's so overloaded that it's
-     * unusable, and constantly swapping, hid_listen might have trouble receiving 200 bytes per
-     * second, so some bytes might be lost on the console.
-     */
-
-    const sysinterval_t timeout = timed_out ? TIME_IMMEDIATE : TIME_MS2I(5);
-    const size_t        result  = chnWriteTimeout(&drivers.console_driver.driver, &c, 1, timeout);
-    timed_out                   = (result == 0);
-    return result;
-}
-
-// Just a dummy function for now, this could be exposed as a weak function
-// Or connected to the actual QMK console
-static void console_receive(uint8_t *data, uint8_t length) {
-    (void)data;
-    (void)length;
+    rbuf_enqueue(c);
+    return 0;
 }
 
 void console_task(void) {
-    uint8_t buffer[CONSOLE_EPSIZE];
-    size_t  size = 0;
-    do {
-        size = chnReadTimeout(&drivers.console_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
-        if (size > 0) {
-            console_receive(buffer, size);
-        }
-    } while (size > 0);
+    if (!rbuf_has_data()) {
+        return;
+    }
+
+    osalSysLock();
+    if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
+        osalSysUnlock();
+        return;
+    }
+
+    if (usbGetTransmitStatusI(&USB_DRIVER, CONSOLE_IN_EPNUM)) {
+        osalSysUnlock();
+        return;
+    }
+
+    // Send in chunks - padded with zeros to 32
+    char    send_buf[CONSOLE_EPSIZE] = {0};
+    uint8_t send_buf_count           = 0;
+    while (rbuf_has_data() && send_buf_count < CONSOLE_EPSIZE) {
+        send_buf[send_buf_count++] = rbuf_dequeue();
+    }
+
+    usbStartTransmitI(&USB_DRIVER, CONSOLE_IN_EPNUM, (const uint8_t *)send_buf, CONSOLE_EPSIZE);
+    osalSysUnlock();
 }
 
 #endif /* CONSOLE_ENABLE */
diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h
index 07186f76b8d..3fd1e84fe84 100644
--- a/tmk_core/protocol/chibios/usb_main.h
+++ b/tmk_core/protocol/chibios/usb_main.h
@@ -57,7 +57,4 @@ void usb_event_queue_task(void);
 /* Putchar over the USB console */
 int8_t sendchar(uint8_t c);
 
-/* Flush output (send everything immediately) */
-void console_flush_output(void);
-
 #endif /* CONSOLE_ENABLE */
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 553f69b1e46..22cc0db8ced 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -184,41 +184,16 @@ static void raw_hid_task(void) {
  * Console
  ******************************************************************************/
 #ifdef CONSOLE_ENABLE
-/** \brief Console Task
+/** \brief Console Tasks
  *
  * FIXME: Needs doc
  */
-static void Console_Task(void) {
+static void console_flush_task(void) {
     /* Device must be connected and configured for the task to run */
     if (USB_DeviceState != DEVICE_STATE_Configured) return;
 
     uint8_t ep = Endpoint_GetCurrentEndpoint();
 
-#    if 0
-    // TODO: impl receivechar()/recvchar()
-    Endpoint_SelectEndpoint(CONSOLE_OUT_EPNUM);
-
-    /* Check to see if a packet has been sent from the host */
-    if (Endpoint_IsOUTReceived())
-    {
-        /* Check to see if the packet contains data */
-        if (Endpoint_IsReadWriteAllowed())
-        {
-            /* Create a temporary buffer to hold the read in report from the host */
-            uint8_t ConsoleData[CONSOLE_EPSIZE];
-
-            /* Read Console Report Data */
-            Endpoint_Read_Stream_LE(&ConsoleData, sizeof(ConsoleData), NULL);
-
-            /* Process Console Report Data */
-            //ProcessConsoleHIDReport(ConsoleData);
-        }
-
-        /* Finalize the stream transfer to send the last packet */
-        Endpoint_ClearOUT();
-    }
-#    endif
-
     /* IN packet */
     Endpoint_SelectEndpoint(CONSOLE_IN_EPNUM);
     if (!Endpoint_IsEnabled() || !Endpoint_IsConfigured()) {
@@ -237,6 +212,10 @@ static void Console_Task(void) {
 
     Endpoint_SelectEndpoint(ep);
 }
+
+void console_task(void) {
+    // do nothing
+}
 #endif
 
 /*******************************************************************************
@@ -341,7 +320,7 @@ void EVENT_USB_Device_StartOfFrame(void) {
     count = 0;
 
     if (!console_flush) return;
-    Console_Task();
+    console_flush_task();
     console_flush = false;
 }
 
@@ -381,9 +360,6 @@ void EVENT_USB_Device_ConfigurationChanged(void) {
 #ifdef CONSOLE_ENABLE
     /* Setup console endpoint */
     ConfigSuccess &= Endpoint_ConfigureEndpoint((CONSOLE_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_INTERRUPT, CONSOLE_EPSIZE, 1);
-#    if 0
-    ConfigSuccess &= Endpoint_ConfigureEndpoint((CONSOLE_OUT_EPNUM | ENDPOINT_DIR_OUT), EP_TYPE_INTERRUPT, CONSOLE_EPSIZE, 1);
-#    endif
 #endif
 
 #ifdef MIDI_ENABLE
@@ -627,7 +603,7 @@ int8_t sendchar(uint8_t c) {
     // The `timed_out` state is an approximation of the ideal `is_listener_disconnected?` state.
     static bool timed_out = false;
 
-    // prevents Console_Task() from running during sendchar() runs.
+    // prevents console_flush_task() from running during sendchar() runs.
     // or char will be lost. These two function is mutually exclusive.
     CONSOLE_FLUSH_SET(false);
 
@@ -812,7 +788,7 @@ static void setup_usb(void) {
 
     USB_Init();
 
-    // for Console_Task
+    // for console_flush_task
     USB_Device_EnableSOFEvents();
 }
 
@@ -876,6 +852,10 @@ void protocol_pre_task(void) {
 }
 
 void protocol_post_task(void) {
+#ifdef CONSOLE_ENABLE
+    console_task();
+#endif
+
 #ifdef MIDI_ENABLE
     MIDI_Device_USBTask(&USB_MIDI_Interface);
 #endif
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h
index 3028cf94269..47bc4f2f2bb 100644
--- a/tmk_core/protocol/report.h
+++ b/tmk_core/protocol/report.h
@@ -22,6 +22,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keycode.h"
 #include "util.h"
 
+#ifdef JOYSTICK_ENABLE
+#    include "joystick.h"
+#endif
+
 // clang-format off
 
 /* HID report IDs */
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
index eb214c0492d..0e2e63ad8ee 100644
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@@ -420,14 +420,6 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] = {
         HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
         HID_RI_REPORT_SIZE(8, 0x08),
         HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-        // Data from host
-        HID_RI_USAGE(8, 0x76),     // Vendor Defined
-        HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
-        HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
-        HID_RI_REPORT_SIZE(8, 0x08),
-        HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
     HID_RI_END_COLLECTION(0),
 };
 #endif
@@ -677,7 +669,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = {
         },
         .InterfaceNumber        = CONSOLE_INTERFACE,
         .AlternateSetting       = 0x00,
-        .TotalEndpoints         = 2,
+        .TotalEndpoints         = 1,
         .Class                  = HID_CSCP_HIDClass,
         .SubClass               = HID_CSCP_NonBootSubclass,
         .Protocol               = HID_CSCP_NonBootProtocol,
@@ -704,16 +696,6 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = {
         .EndpointSize           = CONSOLE_EPSIZE,
         .PollingIntervalMS      = 0x01
     },
-    .Console_OUTEndpoint = {
-        .Header = {
-            .Size               = sizeof(USB_Descriptor_Endpoint_t),
-            .Type               = DTYPE_Endpoint
-        },
-        .EndpointAddress        = (ENDPOINT_DIR_OUT | CONSOLE_OUT_EPNUM),
-        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
-        .EndpointSize           = CONSOLE_EPSIZE,
-        .PollingIntervalMS      = 0x01
-    },
 #endif
 
 #ifdef MIDI_ENABLE
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index 1268bdae733..2469990f4d8 100644
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -97,7 +97,6 @@ typedef struct {
     USB_Descriptor_Interface_t Console_Interface;
     USB_HID_Descriptor_HID_t   Console_HID;
     USB_Descriptor_Endpoint_t  Console_INEndpoint;
-    USB_Descriptor_Endpoint_t  Console_OUTEndpoint;
 #endif
 
 #ifdef MIDI_ENABLE
@@ -232,19 +231,6 @@ enum usb_endpoints {
 
 #ifdef CONSOLE_ENABLE
     CONSOLE_IN_EPNUM = NEXT_EPNUM,
-
-#    ifdef PROTOCOL_CHIBIOS
-// ChibiOS has enough memory and descriptor to actually enable the endpoint
-// It could use the same endpoint numbers, as that's supported by ChibiOS
-// But the QMK code currently assumes that the endpoint numbers are different
-#        ifdef USB_ENDPOINTS_ARE_REORDERABLE
-#            define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM
-#        else
-    CONSOLE_OUT_EPNUM = NEXT_EPNUM,
-#        endif
-#    else
-#        define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM
-#    endif
 #endif
 
 #ifdef MIDI_ENABLE
diff --git a/tmk_core/protocol/usb_device_state.c b/tmk_core/protocol/usb_device_state.c
index 8d56ba4d2f9..4cd241528d1 100644
--- a/tmk_core/protocol/usb_device_state.c
+++ b/tmk_core/protocol/usb_device_state.c
@@ -20,6 +20,10 @@
 #    include "haptic.h"
 #endif
 
+#ifdef OS_DETECTION_ENABLE
+#    include "os_detection.h"
+#endif
+
 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) {
@@ -32,7 +36,12 @@ static void notify_usb_device_state_change(enum usb_device_state usb_device_stat
 #if defined(HAPTIC_ENABLE) && HAPTIC_OFF_IN_LOW_POWER
     haptic_notify_usb_device_state_change();
 #endif
+
     notify_usb_device_state_change_kb(usb_device_state);
+
+#ifdef OS_DETECTION_ENABLE
+    os_detection_notify_usb_device_state_change(usb_device_state);
+#endif
 }
 
 void usb_device_state_set_configuration(bool isConfigured, uint8_t configurationNumber) {
diff --git a/tmk_core/protocol/usb_util.c b/tmk_core/protocol/usb_util.c
index 3b3be4a7675..a130e8b5e34 100644
--- a/tmk_core/protocol/usb_util.c
+++ b/tmk_core/protocol/usb_util.c
@@ -26,9 +26,9 @@ __attribute__((weak)) bool usb_connected_state(void) {
 
 __attribute__((weak)) bool usb_vbus_state(void) {
 #ifdef USB_VBUS_PIN
-    setPinInput(USB_VBUS_PIN);
+    gpio_set_pin_input(USB_VBUS_PIN);
     wait_us(5);
-    return readPin(USB_VBUS_PIN);
+    return gpio_read_pin(USB_VBUS_PIN);
 #else
     return true;
 #endif
diff --git a/tmk_core/protocol/vusb/protocol.c b/tmk_core/protocol/vusb/protocol.c
index 1f64561274b..6178d48ef2a 100644
--- a/tmk_core/protocol/vusb/protocol.c
+++ b/tmk_core/protocol/vusb/protocol.c
@@ -22,7 +22,7 @@
 #include "keyboard.h"
 #include "host.h"
 #include "timer.h"
-#include "print.h"
+#include "debug.h"
 #include "suspend.h"
 #include "wait.h"
 #include "sendchar.h"
@@ -53,7 +53,7 @@ static void initForUsbConnectivity(void) {
     usbDeviceConnect();
 }
 
-static void vusb_send_remote_wakeup(void) {
+static inline void vusb_send_remote_wakeup(void) {
     cli();
 
     uint8_t ddr_orig = USBDDR;
@@ -72,9 +72,7 @@ static void vusb_send_remote_wakeup(void) {
 
 bool vusb_suspended = false;
 
-static void vusb_suspend(void) {
-    vusb_suspended = true;
-
+static inline void vusb_suspend(void) {
 #ifdef SLEEP_LED_ENABLE
     sleep_led_enable();
 #endif
@@ -82,16 +80,13 @@ static void vusb_suspend(void) {
     suspend_power_down();
 }
 
-#if USB_COUNT_SOF
-static void vusb_wakeup(void) {
-    vusb_suspended = false;
+static inline void vusb_wakeup(void) {
     suspend_wakeup_init();
 
-#    ifdef SLEEP_LED_ENABLE
+#ifdef SLEEP_LED_ENABLE
     sleep_led_disable();
-#    endif
-}
 #endif
+}
 
 /** \brief Setup USB
  *
@@ -125,49 +120,67 @@ void protocol_post_init(void) {
     wait_ms(50);
 }
 
-void protocol_task(void) {
+static inline bool should_do_suspend(void) {
 #if USB_COUNT_SOF
     if (usbSofCount != 0) {
-        usbSofCount = 0;
-        sof_timer   = timer_read();
-        if (vusb_suspended) {
-            vusb_wakeup();
-        }
+        usbSofCount    = 0;
+        sof_timer      = timer_read();
+        vusb_suspended = false;
     } else {
         // Suspend when no SOF in 3ms-10ms(7.1.7.4 Suspending of USB1.1)
         if (!vusb_suspended && timer_elapsed(sof_timer) > 5) {
-            vusb_suspend();
+            vusb_suspended = true;
         }
     }
 #endif
-    if (vusb_suspended) {
-        vusb_suspend();
-        if (suspend_wakeup_condition()) {
-            vusb_send_remote_wakeup();
-        }
-    } else {
-        usbPoll();
+    return vusb_suspended;
+}
 
-        // TODO: configuration process is inconsistent. it sometime fails.
-        // To prevent failing to configure NOT scan keyboard during configuration
-        if (usbConfiguration && usbInterruptIsReady()) {
-            keyboard_task();
+void protocol_task(void) {
+#if !defined(NO_USB_STARTUP_CHECK)
+    if (should_do_suspend()) {
+        dprintln("suspending keyboard");
+        while (should_do_suspend()) {
+            vusb_suspend();
+            if (suspend_wakeup_condition()) {
+                vusb_send_remote_wakeup();
+
+#    if USB_SUSPEND_WAKEUP_DELAY > 0
+                // Some hubs, kvm switches, and monitors do
+                // weird things, with USB device state bouncing
+                // around wildly on wakeup, yielding race
+                // conditions that can corrupt the keyboard state.
+                //
+                // Pause for a while to let things settle...
+                wait_ms(USB_SUSPEND_WAKEUP_DELAY);
+#    endif
+            }
         }
+        vusb_wakeup();
+    }
+#endif
+
+    usbPoll();
+
+    // TODO: configuration process is inconsistent. it sometime fails.
+    // To prevent failing to configure NOT scan keyboard during configuration
+    if (usbConfiguration && usbInterruptIsReady()) {
+        keyboard_task();
+    }
 
 #ifdef RAW_ENABLE
-        usbPoll();
+    usbPoll();
 
-        if (usbConfiguration && usbInterruptIsReady4()) {
-            raw_hid_task();
-        }
+    if (usbConfiguration && usbInterruptIsReady4()) {
+        raw_hid_task();
+    }
 #endif
 
 #ifdef CONSOLE_ENABLE
-        usbPoll();
+    usbPoll();
 
-        if (usbConfiguration && usbInterruptIsReady3()) {
-            console_task();
-        }
-#endif
+    if (usbConfiguration && usbInterruptIsReady3()) {
+        console_task();
     }
+#endif
 }
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index d09b2f19b70..cfeeed37126 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -717,13 +717,6 @@ const PROGMEM uchar console_hid_report[] = {
     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
 };
 #endif
@@ -991,16 +984,6 @@ const PROGMEM usbConfigurationDescriptor_t usbConfigurationDescriptor = {
         .wMaxPacketSize      = CONSOLE_EPSIZE,
         .bInterval           = 0x01
     },
-    .consoleOUTEndpoint = {
-        .header = {
-            .bLength         = sizeof(usbEndpointDescriptor_t),
-            .bDescriptorType = USBDESCR_ENDPOINT
-        },
-        .bEndpointAddress    = (USBRQ_DIR_HOST_TO_DEVICE | USB_CFG_EP3_NUMBER),
-        .bmAttributes        = 0x03,
-        .wMaxPacketSize      = CONSOLE_EPSIZE,
-        .bInterval           = 0x01
-    }
 #    endif
 };
 
diff --git a/tmk_core/protocol/vusb/vusb.h b/tmk_core/protocol/vusb/vusb.h
index ae17e5e014c..4750e95bf25 100644
--- a/tmk_core/protocol/vusb/vusb.h
+++ b/tmk_core/protocol/vusb/vusb.h
@@ -114,7 +114,6 @@ typedef struct usbConfigurationDescriptor {
     usbInterfaceDescriptor_t consoleInterface;
     usbHIDDescriptor_t       consoleHID;
     usbEndpointDescriptor_t  consoleINEndpoint;
-    usbEndpointDescriptor_t  consoleOUTEndpoint;
 #endif
 } __attribute__((packed)) usbConfigurationDescriptor_t;
 
diff --git a/util/drivers.txt b/util/drivers.txt
index 1f6c67c4c5f..e8ed7bdb0b1 100644
--- a/util/drivers.txt
+++ b/util/drivers.txt
@@ -8,10 +8,10 @@ winusb,APM32 Bootloader,314B,0106,9ff3cc31-6772-4a3f-a492-a80d91f7a853
 winusb,STM32duino Bootloader,1EAF,0003,746915ec-99d8-4a90-a722-3c85ba31e4fe
 libusbk,USBaspLoader,16C0,05DC,e69affdc-0ef0-427c-aefb-4e593c9d2724
 winusb,Kiibohd DFU Bootloader,1C11,B007,aa5a3f86-b81e-4416-89ad-0c1ea1ed63af
-libusb,ATmega16U2,03EB,2FEF,007274da-b75f-492e-a288-8fc0aff8339f
-libusb,ATmega32U2,03EB,2FF0,ddc2c572-cb6e-4f61-a6cc-1a5de941f063
-libusb,ATmega16U4,03EB,2FF3,3180d426-bf93-4578-a693-2efbc337da8e
-libusb,ATmega32U4,03EB,2FF4,5f9726fd-f9de-487a-9fbd-8b3524a7a56a
-libusb,AT90USB64,03EB,2FF9,c6a708ad-e97d-43cd-b04a-3180d737a71b
-libusb,AT90USB162,03EB,2FFA,ef8546f0-ef09-4e7c-8fc2-ffbae1dcd84a
-libusb,AT90USB128,03EB,2FFB,fd217df3-59d0-440a-a8f3-4c0c8c84daa3
+winusb,ATmega16U2,03EB,2FEF,007274da-b75f-492e-a288-8fc0aff8339f
+winusb,ATmega32U2,03EB,2FF0,ddc2c572-cb6e-4f61-a6cc-1a5de941f063
+winusb,ATmega16U4,03EB,2FF3,3180d426-bf93-4578-a693-2efbc337da8e
+winusb,ATmega32U4,03EB,2FF4,5f9726fd-f9de-487a-9fbd-8b3524a7a56a
+winusb,AT90USB64,03EB,2FF9,c6a708ad-e97d-43cd-b04a-3180d737a71b
+winusb,AT90USB162,03EB,2FFA,ef8546f0-ef09-4e7c-8fc2-ffbae1dcd84a
+winusb,AT90USB128,03EB,2FFB,fd217df3-59d0-440a-a8f3-4c0c8c84daa3
diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index 03e05a42fec..d3bc90b1765 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -3,6 +3,11 @@
 _qmk_install() {
     echo "Installing dependencies"
 
+    . /etc/os-release
+    if [ "$VERSION_ID" == "39" ]; then
+        sudo dnf $SKIP_PROMPT copr enable erovia/dfu-programmer
+    fi
+
     # TODO: Check whether devel/headers packages are really needed
     sudo dnf $SKIP_PROMPT install \
         clang diffutils git gcc glibc-headers kernel-devel kernel-headers \
diff --git a/util/nix/poetry.lock b/util/nix/poetry.lock
index dc1b38be843..e9ac9147022 100644
--- a/util/nix/poetry.lock
+++ b/util/nix/poetry.lock
@@ -1,96 +1,97 @@
+# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+
 [[package]]
 name = "appdirs"
 version = "1.4.4"
 description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},
+    {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},
+]
 
 [[package]]
 name = "argcomplete"
-version = "2.0.0"
+version = "3.2.2"
 description = "Bash tab completion for argparse"
-category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.8"
+files = [
+    {file = "argcomplete-3.2.2-py3-none-any.whl", hash = "sha256:e44f4e7985883ab3e73a103ef0acd27299dbfe2dfed00142c35d4ddd3005901d"},
+    {file = "argcomplete-3.2.2.tar.gz", hash = "sha256:f3e49e8ea59b4026ee29548e24488af46e30c9de57d48638e24f54a1ea1000a2"},
+]
 
 [package.extras]
-test = ["wheel", "pexpect", "flake8", "coverage"]
-
-[[package]]
-name = "atomicwrites"
-version = "1.4.1"
-description = "Atomic file writes."
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+test = ["coverage", "mypy", "pexpect", "ruff", "wheel"]
 
 [[package]]
 name = "attrs"
-version = "22.1.0"
+version = "23.2.0"
 description = "Classes Without Boilerplate"
-category = "main"
 optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.7"
+files = [
+    {file = "attrs-23.2.0-py3-none-any.whl", hash = "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"},
+    {file = "attrs-23.2.0.tar.gz", hash = "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"},
+]
 
 [package.extras]
-tests_no_zope = ["cloudpickle", "pytest-mypy-plugins", "mypy (>=0.900,!=0.940)", "pytest (>=4.3.0)", "pympler", "hypothesis", "coverage[toml] (>=5.0.2)"]
-tests = ["cloudpickle", "zope.interface", "pytest-mypy-plugins", "mypy (>=0.900,!=0.940)", "pytest (>=4.3.0)", "pympler", "hypothesis", "coverage[toml] (>=5.0.2)"]
-docs = ["sphinx-notfound-page", "zope.interface", "sphinx", "furo"]
-dev = ["cloudpickle", "pre-commit", "sphinx-notfound-page", "sphinx", "furo", "zope.interface", "pytest-mypy-plugins", "mypy (>=0.900,!=0.940)", "pytest (>=4.3.0)", "pympler", "hypothesis", "coverage[toml] (>=5.0.2)"]
+cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
+dev = ["attrs[tests]", "pre-commit"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
+tests = ["attrs[tests-no-zope]", "zope-interface"]
+tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"]
+tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"]
 
 [[package]]
 name = "colorama"
-version = "0.4.5"
+version = "0.4.6"
 description = "Cross-platform colored terminal text."
-category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
 
 [[package]]
 name = "dotty-dict"
 version = "1.3.1"
 description = "Dictionary wrapper for quick access to deeply nested keys."
-category = "main"
 optional = false
 python-versions = ">=3.5,<4.0"
-
-[[package]]
-name = "editables"
-version = "0.3"
-description = "Editable installations"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
+files = [
+    {file = "dotty_dict-1.3.1-py3-none-any.whl", hash = "sha256:5022d234d9922f13aa711b4950372a06a6d64cb6d6db9ba43d0ba133ebfce31f"},
+    {file = "dotty_dict-1.3.1.tar.gz", hash = "sha256:4b016e03b8ae265539757a53eba24b9bfda506fb94fbce0bee843c6f05541a15"},
+]
 
 [[package]]
 name = "flake8"
-version = "5.0.4"
+version = "7.0.0"
 description = "the modular source code checker: pep8 pyflakes and co"
-category = "dev"
 optional = false
-python-versions = ">=3.6.1"
+python-versions = ">=3.8.1"
+files = [
+    {file = "flake8-7.0.0-py2.py3-none-any.whl", hash = "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"},
+    {file = "flake8-7.0.0.tar.gz", hash = "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132"},
+]
 
 [package.dependencies]
 mccabe = ">=0.7.0,<0.8.0"
-pycodestyle = ">=2.9.0,<2.10.0"
-pyflakes = ">=2.5.0,<2.6.0"
-
-[[package]]
-name = "flit-core"
-version = "3.7.1"
-description = "Distribution-building parts of Flit. See flit package for more information"
-category = "dev"
-optional = false
-python-versions = ">=3.6"
+pycodestyle = ">=2.11.0,<2.12.0"
+pyflakes = ">=3.2.0,<3.3.0"
 
 [[package]]
 name = "halo"
 version = "0.0.31"
 description = "Beautiful terminal spinners in Python"
-category = "main"
 optional = false
 python-versions = ">=3.4"
+files = [
+    {file = "halo-0.0.31-py2-none-any.whl", hash = "sha256:5350488fb7d2aa7c31a1344120cee67a872901ce8858f60da7946cef96c208ab"},
+    {file = "halo-0.0.31.tar.gz", hash = "sha256:7b67a3521ee91d53b7152d4ee3452811e1d2a6321975137762eb3d70063cc9d6"},
+]
 
 [package.dependencies]
 colorama = ">=0.3.9"
@@ -100,115 +101,94 @@ spinners = ">=0.0.24"
 termcolor = ">=1.1.0"
 
 [package.extras]
-ipython = ["ipywidgets (==7.1.0)", "IPython (==5.7.0)"]
-
-[[package]]
-name = "hatch-fancy-pypi-readme"
-version = "22.3.0"
-description = "Fancy PyPI READMEs with Hatch"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-hatchling = "*"
-tomli = {version = "*", markers = "python_version < \"3.11\""}
-
-[package.extras]
-tests = ["wheel", "pytest-icdiff", "pytest", "coverage", "build"]
-dev = ["mypy", "hatch-fancy-pypi-readme"]
-
-[[package]]
-name = "hatch-vcs"
-version = "0.2.0"
-description = "Hatch plugin for versioning with your preferred VCS"
-category = "dev"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-hatchling = ">=0.21.0"
-setuptools-scm = {version = ">=6.4.0", markers = "python_version > \"3\""}
-
-[[package]]
-name = "hatchling"
-version = "1.8.0"
-description = "Modern, extensible Python build backend"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-editables = ">=0.3"
-packaging = ">=21.3"
-pathspec = ">=0.9"
-pluggy = ">=1.0.0"
-tomli = {version = ">=1.2.2", markers = "python_version < \"3.11\""}
+ipython = ["IPython (==5.7.0)", "ipywidgets (==7.1.0)"]
 
 [[package]]
 name = "hid"
-version = "1.0.5"
+version = "1.0.6"
 description = "ctypes bindings for hidapi"
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "hid-1.0.6-py3-none-any.whl", hash = "sha256:60446054aec54a767d9a4e97920761f41809a055c6d51c54879e37a706dcb588"},
+    {file = "hid-1.0.6.tar.gz", hash = "sha256:48d764d7ae9746ba123b96dbf457893ca80268b7791c4b1d2e051310eeb83860"},
+]
 
 [[package]]
 name = "hjson"
 version = "3.1.0"
 description = "Hjson, a user interface for JSON."
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "hjson-3.1.0-py3-none-any.whl", hash = "sha256:65713cdcf13214fb554eb8b4ef803419733f4f5e551047c9b711098ab7186b89"},
+    {file = "hjson-3.1.0.tar.gz", hash = "sha256:55af475a27cf83a7969c808399d7bccdec8fb836a07ddbd574587593b9cdcf75"},
+]
 
 [[package]]
-name = "importlib-resources"
-version = "5.9.0"
-description = "Read resources from Python packages"
-category = "main"
+name = "importlib-metadata"
+version = "7.0.1"
+description = "Read metadata from Python packages"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "importlib_metadata-7.0.1-py3-none-any.whl", hash = "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e"},
+    {file = "importlib_metadata-7.0.1.tar.gz", hash = "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"},
+]
 
 [package.dependencies]
-zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""}
+zipp = ">=0.5"
 
 [package.extras]
-testing = ["pytest-mypy (>=0.9.1)", "pytest-black (>=0.3.7)", "pytest-enabler (>=1.3)", "pytest-cov", "pytest-flake8", "pytest-checkdocs (>=2.4)", "pytest (>=6)"]
-docs = ["jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "jaraco.packaging (>=9)", "sphinx"]
-
-[[package]]
-name = "iniconfig"
-version = "1.1.1"
-description = "iniconfig: brain-dead simple config-ini parsing"
-category = "dev"
-optional = false
-python-versions = "*"
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"]
+perf = ["ipython"]
+testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"]
 
 [[package]]
 name = "jsonschema"
-version = "4.14.0"
+version = "4.21.1"
 description = "An implementation of JSON Schema validation for Python"
-category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "jsonschema-4.21.1-py3-none-any.whl", hash = "sha256:7996507afae316306f9e2290407761157c6f78002dcf7419acb99822143d1c6f"},
+    {file = "jsonschema-4.21.1.tar.gz", hash = "sha256:85727c00279f5fa6bedbe6238d2aa6403bedd8b4864ab11207d07df3cc1b2ee5"},
+]
 
 [package.dependencies]
-attrs = ">=17.4.0"
-importlib-resources = {version = ">=1.4.0", markers = "python_version < \"3.9\""}
-pkgutil-resolve-name = {version = ">=1.3.10", markers = "python_version < \"3.9\""}
-pyrsistent = ">=0.14.0,<0.17.0 || >0.17.0,<0.17.1 || >0.17.1,<0.17.2 || >0.17.2"
+attrs = ">=22.2.0"
+jsonschema-specifications = ">=2023.03.6"
+referencing = ">=0.28.4"
+rpds-py = ">=0.7.1"
 
 [package.extras]
-format-nongpl = ["webcolors (>=1.11)", "uri-template", "rfc3986-validator (>0.1.0)", "rfc3339-validator", "jsonpointer (>1.13)", "isoduration", "idna", "fqdn"]
-format = ["webcolors (>=1.11)", "uri-template", "rfc3987", "rfc3339-validator", "jsonpointer (>1.13)", "isoduration", "idna", "fqdn"]
+format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"]
+format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"]
+
+[[package]]
+name = "jsonschema-specifications"
+version = "2023.12.1"
+description = "The JSON Schema meta-schemas and vocabularies, exposed as a Registry"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "jsonschema_specifications-2023.12.1-py3-none-any.whl", hash = "sha256:87e4fdf3a94858b8a2ba2778d9ba57d8a9cafca7c7489c46ba0d30a8bc6a9c3c"},
+    {file = "jsonschema_specifications-2023.12.1.tar.gz", hash = "sha256:48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc"},
+]
+
+[package.dependencies]
+referencing = ">=0.31.0"
 
 [[package]]
 name = "log-symbols"
 version = "0.0.14"
 description = "Colored symbols for various log levels for Python"
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "log_symbols-0.0.14-py3-none-any.whl", hash = "sha256:4952106ff8b605ab7d5081dd2c7e6ca7374584eff7086f499c06edd1ce56dcca"},
+    {file = "log_symbols-0.0.14.tar.gz", hash = "sha256:cf0bbc6fe1a8e53f0d174a716bc625c4f87043cc21eb55dd8a740cfe22680556"},
+]
 
 [package.dependencies]
 colorama = ">=0.3.9"
@@ -217,17 +197,23 @@ colorama = ">=0.3.9"
 name = "mccabe"
 version = "0.7.0"
 description = "McCabe checker, plugin for flake8"
-category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
+    {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
+]
 
 [[package]]
 name = "milc"
-version = "1.6.6"
+version = "1.8.0"
 description = "Opinionated Batteries-Included Python 3 CLI Framework."
-category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
+files = [
+    {file = "milc-1.8.0-py2.py3-none-any.whl", hash = "sha256:faee16fe92ce13eb1b0b4e24ac5b5003d7234880a8d21e4210016d70512bc921"},
+    {file = "milc-1.8.0.tar.gz", hash = "sha256:cabe658de07ab97f937c7672b8a604cc825174c28d66d3afd047a9b4b2770bbe"},
+]
 
 [package.dependencies]
 appdirs = "*"
@@ -235,543 +221,451 @@ argcomplete = "*"
 colorama = "*"
 halo = "*"
 spinners = "*"
+types-colorama = "*"
 
 [[package]]
 name = "nose2"
-version = "0.12.0"
-description = "unittest2 with plugins, the successor to nose"
-category = "dev"
+version = "0.14.1"
+description = "unittest with plugins"
 optional = false
-python-versions = "*"
+python-versions = ">=3.8"
+files = [
+    {file = "nose2-0.14.1-py3-none-any.whl", hash = "sha256:dfbf0d90c98b8d7bbf47d7721c7554ffcca86828ec074c985bb6ecc83c445a4e"},
+    {file = "nose2-0.14.1.tar.gz", hash = "sha256:7f8f03a21c9de2c33015933afcef72bf8e4a2d5dfec3b40092287de6e41b093a"},
+]
 
 [package.extras]
-dev = ["sphinx-issues", "mock", "sphinx-rtd-theme", "sphinx"]
-coverage_plugin = ["coverage"]
-
-[[package]]
-name = "packaging"
-version = "21.3"
-description = "Core utilities for Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
-
-[[package]]
-name = "pathspec"
-version = "0.9.0"
-description = "Utility library for gitignore style pattern matching of file paths."
-category = "dev"
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+coverage-plugin = ["coverage"]
+dev = ["Sphinx", "sphinx-issues", "sphinx-rtd-theme"]
 
 [[package]]
 name = "pep8-naming"
-version = "0.13.2"
+version = "0.13.3"
 description = "Check PEP-8 naming conventions, plugin for flake8"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pep8-naming-0.13.3.tar.gz", hash = "sha256:1705f046dfcd851378aac3be1cd1551c7c1e5ff363bacad707d43007877fa971"},
+    {file = "pep8_naming-0.13.3-py3-none-any.whl", hash = "sha256:1a86b8c71a03337c97181917e2b472f0f5e4ccb06844a0d6f0a33522549e7a80"},
+]
 
 [package.dependencies]
-flake8 = ">=3.9.1"
+flake8 = ">=5.0.0"
 
 [[package]]
 name = "pillow"
-version = "9.2.0"
+version = "10.2.0"
 description = "Python Imaging Library (Fork)"
-category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "pillow-10.2.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:7823bdd049099efa16e4246bdf15e5a13dbb18a51b68fa06d6c1d4d8b99a796e"},
+    {file = "pillow-10.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:83b2021f2ade7d1ed556bc50a399127d7fb245e725aa0113ebd05cfe88aaf588"},
+    {file = "pillow-10.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fad5ff2f13d69b7e74ce5b4ecd12cc0ec530fcee76356cac6742785ff71c452"},
+    {file = "pillow-10.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da2b52b37dad6d9ec64e653637a096905b258d2fc2b984c41ae7d08b938a67e4"},
+    {file = "pillow-10.2.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:47c0995fc4e7f79b5cfcab1fc437ff2890b770440f7696a3ba065ee0fd496563"},
+    {file = "pillow-10.2.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:322bdf3c9b556e9ffb18f93462e5f749d3444ce081290352c6070d014c93feb2"},
+    {file = "pillow-10.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:51f1a1bffc50e2e9492e87d8e09a17c5eea8409cda8d3f277eb6edc82813c17c"},
+    {file = "pillow-10.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:69ffdd6120a4737710a9eee73e1d2e37db89b620f702754b8f6e62594471dee0"},
+    {file = "pillow-10.2.0-cp310-cp310-win32.whl", hash = "sha256:c6dafac9e0f2b3c78df97e79af707cdc5ef8e88208d686a4847bab8266870023"},
+    {file = "pillow-10.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:aebb6044806f2e16ecc07b2a2637ee1ef67a11840a66752751714a0d924adf72"},
+    {file = "pillow-10.2.0-cp310-cp310-win_arm64.whl", hash = "sha256:7049e301399273a0136ff39b84c3678e314f2158f50f517bc50285fb5ec847ad"},
+    {file = "pillow-10.2.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:35bb52c37f256f662abdfa49d2dfa6ce5d93281d323a9af377a120e89a9eafb5"},
+    {file = "pillow-10.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9c23f307202661071d94b5e384e1e1dc7dfb972a28a2310e4ee16103e66ddb67"},
+    {file = "pillow-10.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:773efe0603db30c281521a7c0214cad7836c03b8ccff897beae9b47c0b657d61"},
+    {file = "pillow-10.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11fa2e5984b949b0dd6d7a94d967743d87c577ff0b83392f17cb3990d0d2fd6e"},
+    {file = "pillow-10.2.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:716d30ed977be8b37d3ef185fecb9e5a1d62d110dfbdcd1e2a122ab46fddb03f"},
+    {file = "pillow-10.2.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:a086c2af425c5f62a65e12fbf385f7c9fcb8f107d0849dba5839461a129cf311"},
+    {file = "pillow-10.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:c8de2789052ed501dd829e9cae8d3dcce7acb4777ea4a479c14521c942d395b1"},
+    {file = "pillow-10.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:609448742444d9290fd687940ac0b57fb35e6fd92bdb65386e08e99af60bf757"},
+    {file = "pillow-10.2.0-cp311-cp311-win32.whl", hash = "sha256:823ef7a27cf86df6597fa0671066c1b596f69eba53efa3d1e1cb8b30f3533068"},
+    {file = "pillow-10.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:1da3b2703afd040cf65ec97efea81cfba59cdbed9c11d8efc5ab09df9509fc56"},
+    {file = "pillow-10.2.0-cp311-cp311-win_arm64.whl", hash = "sha256:edca80cbfb2b68d7b56930b84a0e45ae1694aeba0541f798e908a49d66b837f1"},
+    {file = "pillow-10.2.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:1b5e1b74d1bd1b78bc3477528919414874748dd363e6272efd5abf7654e68bef"},
+    {file = "pillow-10.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0eae2073305f451d8ecacb5474997c08569fb4eb4ac231ffa4ad7d342fdc25ac"},
+    {file = "pillow-10.2.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7c2286c23cd350b80d2fc9d424fc797575fb16f854b831d16fd47ceec078f2c"},
+    {file = "pillow-10.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e23412b5c41e58cec602f1135c57dfcf15482013ce6e5f093a86db69646a5aa"},
+    {file = "pillow-10.2.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:52a50aa3fb3acb9cf7213573ef55d31d6eca37f5709c69e6858fe3bc04a5c2a2"},
+    {file = "pillow-10.2.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:127cee571038f252a552760076407f9cff79761c3d436a12af6000cd182a9d04"},
+    {file = "pillow-10.2.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8d12251f02d69d8310b046e82572ed486685c38f02176bd08baf216746eb947f"},
+    {file = "pillow-10.2.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:54f1852cd531aa981bc0965b7d609f5f6cc8ce8c41b1139f6ed6b3c54ab82bfb"},
+    {file = "pillow-10.2.0-cp312-cp312-win32.whl", hash = "sha256:257d8788df5ca62c980314053197f4d46eefedf4e6175bc9412f14412ec4ea2f"},
+    {file = "pillow-10.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:154e939c5f0053a383de4fd3d3da48d9427a7e985f58af8e94d0b3c9fcfcf4f9"},
+    {file = "pillow-10.2.0-cp312-cp312-win_arm64.whl", hash = "sha256:f379abd2f1e3dddb2b61bc67977a6b5a0a3f7485538bcc6f39ec76163891ee48"},
+    {file = "pillow-10.2.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:8373c6c251f7ef8bda6675dd6d2b3a0fcc31edf1201266b5cf608b62a37407f9"},
+    {file = "pillow-10.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:870ea1ada0899fd0b79643990809323b389d4d1d46c192f97342eeb6ee0b8483"},
+    {file = "pillow-10.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4b6b1e20608493548b1f32bce8cca185bf0480983890403d3b8753e44077129"},
+    {file = "pillow-10.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3031709084b6e7852d00479fd1d310b07d0ba82765f973b543c8af5061cf990e"},
+    {file = "pillow-10.2.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:3ff074fc97dd4e80543a3e91f69d58889baf2002b6be64347ea8cf5533188213"},
+    {file = "pillow-10.2.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:cb4c38abeef13c61d6916f264d4845fab99d7b711be96c326b84df9e3e0ff62d"},
+    {file = "pillow-10.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b1b3020d90c2d8e1dae29cf3ce54f8094f7938460fb5ce8bc5c01450b01fbaf6"},
+    {file = "pillow-10.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:170aeb00224ab3dc54230c797f8404507240dd868cf52066f66a41b33169bdbe"},
+    {file = "pillow-10.2.0-cp38-cp38-win32.whl", hash = "sha256:c4225f5220f46b2fde568c74fca27ae9771536c2e29d7c04f4fb62c83275ac4e"},
+    {file = "pillow-10.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:0689b5a8c5288bc0504d9fcee48f61a6a586b9b98514d7d29b840143d6734f39"},
+    {file = "pillow-10.2.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:b792a349405fbc0163190fde0dc7b3fef3c9268292586cf5645598b48e63dc67"},
+    {file = "pillow-10.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c570f24be1e468e3f0ce7ef56a89a60f0e05b30a3669a459e419c6eac2c35364"},
+    {file = "pillow-10.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8ecd059fdaf60c1963c58ceb8997b32e9dc1b911f5da5307aab614f1ce5c2fb"},
+    {file = "pillow-10.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c365fd1703040de1ec284b176d6af5abe21b427cb3a5ff68e0759e1e313a5e7e"},
+    {file = "pillow-10.2.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:70c61d4c475835a19b3a5aa42492409878bbca7438554a1f89d20d58a7c75c01"},
+    {file = "pillow-10.2.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:b6f491cdf80ae540738859d9766783e3b3c8e5bd37f5dfa0b76abdecc5081f13"},
+    {file = "pillow-10.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9d189550615b4948f45252d7f005e53c2040cea1af5b60d6f79491a6e147eef7"},
+    {file = "pillow-10.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:49d9ba1ed0ef3e061088cd1e7538a0759aab559e2e0a80a36f9fd9d8c0c21591"},
+    {file = "pillow-10.2.0-cp39-cp39-win32.whl", hash = "sha256:babf5acfede515f176833ed6028754cbcd0d206f7f614ea3447d67c33be12516"},
+    {file = "pillow-10.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:0304004f8067386b477d20a518b50f3fa658a28d44e4116970abfcd94fac34a8"},
+    {file = "pillow-10.2.0-cp39-cp39-win_arm64.whl", hash = "sha256:0fb3e7fc88a14eacd303e90481ad983fd5b69c761e9e6ef94c983f91025da869"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:322209c642aabdd6207517e9739c704dc9f9db943015535783239022002f054a"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3eedd52442c0a5ff4f887fab0c1c0bb164d8635b32c894bc1faf4c618dd89df2"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cb28c753fd5eb3dd859b4ee95de66cc62af91bcff5db5f2571d32a520baf1f04"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:33870dc4653c5017bf4c8873e5488d8f8d5f8935e2f1fb9a2208c47cdd66efd2"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:3c31822339516fb3c82d03f30e22b1d038da87ef27b6a78c9549888f8ceda39a"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:a2b56ba36e05f973d450582fb015594aaa78834fefe8dfb8fcd79b93e64ba4c6"},
+    {file = "pillow-10.2.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:d8e6aeb9201e655354b3ad049cb77d19813ad4ece0df1249d3c793de3774f8c7"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:2247178effb34a77c11c0e8ac355c7a741ceca0a732b27bf11e747bbc950722f"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:15587643b9e5eb26c48e49a7b33659790d28f190fc514a322d55da2fb5c2950e"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753cd8f2086b2b80180d9b3010dd4ed147efc167c90d3bf593fe2af21265e5a5"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:7c8f97e8e7a9009bcacbe3766a36175056c12f9a44e6e6f2d5caad06dcfbf03b"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:d1b35bcd6c5543b9cb547dee3150c93008f8dd0f1fef78fc0cd2b141c5baf58a"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:fe4c15f6c9285dc54ce6553a3ce908ed37c8f3825b5a51a15c91442bb955b868"},
+    {file = "pillow-10.2.0.tar.gz", hash = "sha256:e87f0b2c78157e12d7686b27d63c070fd65d994e8ddae6f328e0dcf4a0cd007e"},
+]
 
 [package.extras]
-tests = ["pytest-timeout", "pytest-cov", "pytest", "pyroma", "packaging", "olefile", "markdown2", "defusedxml", "coverage", "check-manifest"]
-docs = ["sphinxext-opengraph", "sphinx-removed-in", "sphinx-issues (>=3.0.1)", "sphinx-copybutton", "sphinx (>=2.4)", "olefile", "furo"]
-
-[[package]]
-name = "pkgutil-resolve-name"
-version = "1.3.10"
-description = "Resolve a name to an object."
-category = "main"
-optional = false
-python-versions = ">=3.6"
+docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"]
+fpx = ["olefile"]
+mic = ["olefile"]
+tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
+typing = ["typing-extensions"]
+xmp = ["defusedxml"]
 
 [[package]]
-name = "pluggy"
-version = "1.0.0"
-description = "plugin and hook calling mechanisms for python"
-category = "dev"
+name = "platformdirs"
+version = "4.2.0"
+description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.8"
+files = [
+    {file = "platformdirs-4.2.0-py3-none-any.whl", hash = "sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068"},
+    {file = "platformdirs-4.2.0.tar.gz", hash = "sha256:ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768"},
+]
 
 [package.extras]
-testing = ["pytest-benchmark", "pytest"]
-dev = ["tox", "pre-commit"]
-
-[[package]]
-name = "poetry-core"
-version = "1.0.8"
-description = "Poetry PEP 517 Build Backend"
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-
-[[package]]
-name = "py"
-version = "1.11.0"
-description = "library with cross-python path, ini-parsing, io, code, log facilities"
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"]
 
 [[package]]
 name = "pycodestyle"
-version = "2.9.1"
+version = "2.11.1"
 description = "Python style guide checker"
-category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.8"
+files = [
+    {file = "pycodestyle-2.11.1-py2.py3-none-any.whl", hash = "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"},
+    {file = "pycodestyle-2.11.1.tar.gz", hash = "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f"},
+]
 
 [[package]]
 name = "pyflakes"
-version = "2.5.0"
+version = "3.2.0"
 description = "passive checker of Python programs"
-category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.8"
+files = [
+    {file = "pyflakes-3.2.0-py2.py3-none-any.whl", hash = "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"},
+    {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"},
+]
 
 [[package]]
 name = "pygments"
-version = "2.13.0"
+version = "2.17.2"
 description = "Pygments is a syntax highlighting package written in Python."
-category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
+files = [
+    {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"},
+    {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"},
+]
 
 [package.extras]
 plugins = ["importlib-metadata"]
-
-[[package]]
-name = "pyparsing"
-version = "3.0.9"
-description = "pyparsing module - Classes and methods to define and execute parsing grammars"
-category = "dev"
-optional = false
-python-versions = ">=3.6.8"
-
-[package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
-
-[[package]]
-name = "pyrsistent"
-version = "0.18.1"
-description = "Persistent/Functional/Immutable data structures"
-category = "main"
-optional = false
-python-versions = ">=3.7"
+windows-terminal = ["colorama (>=0.4.6)"]
 
 [[package]]
 name = "pyserial"
 version = "3.5"
 description = "Python Serial Port Extension"
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "pyserial-3.5-py2.py3-none-any.whl", hash = "sha256:c4451db6ba391ca6ca299fb3ec7bae67a5c55dde170964c7a14ceefec02f2cf0"},
+    {file = "pyserial-3.5.tar.gz", hash = "sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb"},
+]
 
 [package.extras]
 cp2110 = ["hidapi"]
 
-[[package]]
-name = "pytest"
-version = "7.1.2"
-description = "pytest: simple powerful testing with Python"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
-attrs = ">=19.2.0"
-colorama = {version = "*", markers = "sys_platform == \"win32\""}
-iniconfig = "*"
-packaging = "*"
-pluggy = ">=0.12,<2.0"
-py = ">=1.8.2"
-tomli = ">=1.0.0"
-
-[package.extras]
-testing = ["xmlschema", "requests", "pygments (>=2.7.2)", "nose", "mock", "hypothesis (>=3.56)", "argcomplete"]
-
 [[package]]
 name = "pyusb"
 version = "1.2.1"
 description = "Python USB access module"
-category = "main"
 optional = false
 python-versions = ">=3.6.0"
+files = [
+    {file = "pyusb-1.2.1-py3-none-any.whl", hash = "sha256:2b4c7cb86dbadf044dfb9d3a4ff69fd217013dbe78a792177a3feb172449ea36"},
+    {file = "pyusb-1.2.1.tar.gz", hash = "sha256:a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"},
+]
 
 [[package]]
 name = "qmk"
-version = "1.1.1"
+version = "1.1.5"
 description = "A program to help users work with QMK Firmware."
-category = "main"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "qmk-1.1.5-py2.py3-none-any.whl", hash = "sha256:9c16fa2ad9b279ce9cc121a5462f02637611c6f54c49f9f2cac8ba2898f35b94"},
+    {file = "qmk-1.1.5.tar.gz", hash = "sha256:2efe3c752230c6ba24b8719c3b6e85a5644bf8f7d0dd237757eda9b7b7e60b11"},
+]
 
 [package.dependencies]
 dotty-dict = "*"
 hid = "*"
 hjson = "*"
 jsonschema = ">=4"
-milc = ">=1.4.2"
+milc = ">=1.6.8"
 pillow = "*"
 pygments = "*"
 pyserial = "*"
 pyusb = "*"
+setuptools = ">=45"
 
 [[package]]
-name = "setuptools-scm"
-version = "7.0.5"
-description = "the blessed package to manage your versions by scm tags"
-category = "dev"
+name = "referencing"
+version = "0.33.0"
+description = "JSON Referencing + Python"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "referencing-0.33.0-py3-none-any.whl", hash = "sha256:39240f2ecc770258f28b642dd47fd74bc8b02484de54e1882b74b35ebd779bd5"},
+    {file = "referencing-0.33.0.tar.gz", hash = "sha256:c775fedf74bc0f9189c2a3be1c12fd03e8c23f4d371dce795df44e06c5b412f7"},
+]
 
 [package.dependencies]
-packaging = ">=20.0"
-tomli = ">=1.0.0"
-typing-extensions = "*"
+attrs = ">=22.2.0"
+rpds-py = ">=0.7.0"
+
+[[package]]
+name = "rpds-py"
+version = "0.18.0"
+description = "Python bindings to Rust's persistent data structures (rpds)"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "rpds_py-0.18.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:5b4e7d8d6c9b2e8ee2d55c90b59c707ca59bc30058269b3db7b1f8df5763557e"},
+    {file = "rpds_py-0.18.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c463ed05f9dfb9baebef68048aed8dcdc94411e4bf3d33a39ba97e271624f8f7"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:01e36a39af54a30f28b73096dd39b6802eddd04c90dbe161c1b8dbe22353189f"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d62dec4976954a23d7f91f2f4530852b0c7608116c257833922a896101336c51"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dd18772815d5f008fa03d2b9a681ae38d5ae9f0e599f7dda233c439fcaa00d40"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:923d39efa3cfb7279a0327e337a7958bff00cc447fd07a25cddb0a1cc9a6d2da"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:39514da80f971362f9267c600b6d459bfbbc549cffc2cef8e47474fddc9b45b1"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a34d557a42aa28bd5c48a023c570219ba2593bcbbb8dc1b98d8cf5d529ab1434"},
+    {file = "rpds_py-0.18.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:93df1de2f7f7239dc9cc5a4a12408ee1598725036bd2dedadc14d94525192fc3"},
+    {file = "rpds_py-0.18.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:34b18ba135c687f4dac449aa5157d36e2cbb7c03cbea4ddbd88604e076aa836e"},
+    {file = "rpds_py-0.18.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:c0b5dcf9193625afd8ecc92312d6ed78781c46ecbf39af9ad4681fc9f464af88"},
+    {file = "rpds_py-0.18.0-cp310-none-win32.whl", hash = "sha256:c4325ff0442a12113a6379af66978c3fe562f846763287ef66bdc1d57925d337"},
+    {file = "rpds_py-0.18.0-cp310-none-win_amd64.whl", hash = "sha256:7223a2a5fe0d217e60a60cdae28d6949140dde9c3bcc714063c5b463065e3d66"},
+    {file = "rpds_py-0.18.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:3a96e0c6a41dcdba3a0a581bbf6c44bb863f27c541547fb4b9711fd8cf0ffad4"},
+    {file = "rpds_py-0.18.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:30f43887bbae0d49113cbaab729a112251a940e9b274536613097ab8b4899cf6"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fcb25daa9219b4cf3a0ab24b0eb9a5cc8949ed4dc72acb8fa16b7e1681aa3c58"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d68c93e381010662ab873fea609bf6c0f428b6d0bb00f2c6939782e0818d37bf"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b34b7aa8b261c1dbf7720b5d6f01f38243e9b9daf7e6b8bc1fd4657000062f2c"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2e6d75ab12b0bbab7215e5d40f1e5b738aa539598db27ef83b2ec46747df90e1"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b8612cd233543a3781bc659c731b9d607de65890085098986dfd573fc2befe5"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:aec493917dd45e3c69d00a8874e7cbed844efd935595ef78a0f25f14312e33c6"},
+    {file = "rpds_py-0.18.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:661d25cbffaf8cc42e971dd570d87cb29a665f49f4abe1f9e76be9a5182c4688"},
+    {file = "rpds_py-0.18.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1df3659d26f539ac74fb3b0c481cdf9d725386e3552c6fa2974f4d33d78e544b"},
+    {file = "rpds_py-0.18.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a1ce3ba137ed54f83e56fb983a5859a27d43a40188ba798993812fed73c70836"},
+    {file = "rpds_py-0.18.0-cp311-none-win32.whl", hash = "sha256:69e64831e22a6b377772e7fb337533c365085b31619005802a79242fee620bc1"},
+    {file = "rpds_py-0.18.0-cp311-none-win_amd64.whl", hash = "sha256:998e33ad22dc7ec7e030b3df701c43630b5bc0d8fbc2267653577e3fec279afa"},
+    {file = "rpds_py-0.18.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:7f2facbd386dd60cbbf1a794181e6aa0bd429bd78bfdf775436020172e2a23f0"},
+    {file = "rpds_py-0.18.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1d9a5be316c15ffb2b3c405c4ff14448c36b4435be062a7f578ccd8b01f0c4d8"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd5bf1af8efe569654bbef5a3e0a56eca45f87cfcffab31dd8dde70da5982475"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5417558f6887e9b6b65b4527232553c139b57ec42c64570569b155262ac0754f"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:56a737287efecafc16f6d067c2ea0117abadcd078d58721f967952db329a3e5c"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8f03bccbd8586e9dd37219bce4d4e0d3ab492e6b3b533e973fa08a112cb2ffc9"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4457a94da0d5c53dc4b3e4de1158bdab077db23c53232f37a3cb7afdb053a4e3"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0ab39c1ba9023914297dd88ec3b3b3c3f33671baeb6acf82ad7ce883f6e8e157"},
+    {file = "rpds_py-0.18.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9d54553c1136b50fd12cc17e5b11ad07374c316df307e4cfd6441bea5fb68496"},
+    {file = "rpds_py-0.18.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:0af039631b6de0397ab2ba16eaf2872e9f8fca391b44d3d8cac317860a700a3f"},
+    {file = "rpds_py-0.18.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:84ffab12db93b5f6bad84c712c92060a2d321b35c3c9960b43d08d0f639d60d7"},
+    {file = "rpds_py-0.18.0-cp312-none-win32.whl", hash = "sha256:685537e07897f173abcf67258bee3c05c374fa6fff89d4c7e42fb391b0605e98"},
+    {file = "rpds_py-0.18.0-cp312-none-win_amd64.whl", hash = "sha256:e003b002ec72c8d5a3e3da2989c7d6065b47d9eaa70cd8808b5384fbb970f4ec"},
+    {file = "rpds_py-0.18.0-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:08f9ad53c3f31dfb4baa00da22f1e862900f45908383c062c27628754af2e88e"},
+    {file = "rpds_py-0.18.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c0013fe6b46aa496a6749c77e00a3eb07952832ad6166bd481c74bda0dcb6d58"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e32a92116d4f2a80b629778280103d2a510a5b3f6314ceccd6e38006b5e92dcb"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e541ec6f2ec456934fd279a3120f856cd0aedd209fc3852eca563f81738f6861"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bed88b9a458e354014d662d47e7a5baafd7ff81c780fd91584a10d6ec842cb73"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2644e47de560eb7bd55c20fc59f6daa04682655c58d08185a9b95c1970fa1e07"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8e8916ae4c720529e18afa0b879473049e95949bf97042e938530e072fde061d"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:465a3eb5659338cf2a9243e50ad9b2296fa15061736d6e26240e713522b6235c"},
+    {file = "rpds_py-0.18.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:ea7d4a99f3b38c37eac212dbd6ec42b7a5ec51e2c74b5d3223e43c811609e65f"},
+    {file = "rpds_py-0.18.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:67071a6171e92b6da534b8ae326505f7c18022c6f19072a81dcf40db2638767c"},
+    {file = "rpds_py-0.18.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:41ef53e7c58aa4ef281da975f62c258950f54b76ec8e45941e93a3d1d8580594"},
+    {file = "rpds_py-0.18.0-cp38-none-win32.whl", hash = "sha256:fdea4952db2793c4ad0bdccd27c1d8fdd1423a92f04598bc39425bcc2b8ee46e"},
+    {file = "rpds_py-0.18.0-cp38-none-win_amd64.whl", hash = "sha256:7cd863afe7336c62ec78d7d1349a2f34c007a3cc6c2369d667c65aeec412a5b1"},
+    {file = "rpds_py-0.18.0-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:5307def11a35f5ae4581a0b658b0af8178c65c530e94893345bebf41cc139d33"},
+    {file = "rpds_py-0.18.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:77f195baa60a54ef9d2de16fbbfd3ff8b04edc0c0140a761b56c267ac11aa467"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:39f5441553f1c2aed4de4377178ad8ff8f9d733723d6c66d983d75341de265ab"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9a00312dea9310d4cb7dbd7787e722d2e86a95c2db92fbd7d0155f97127bcb40"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8f2fc11e8fe034ee3c34d316d0ad8808f45bc3b9ce5857ff29d513f3ff2923a1"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:586f8204935b9ec884500498ccc91aa869fc652c40c093bd9e1471fbcc25c022"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ddc2f4dfd396c7bfa18e6ce371cba60e4cf9d2e5cdb71376aa2da264605b60b9"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5ddcba87675b6d509139d1b521e0c8250e967e63b5909a7e8f8944d0f90ff36f"},
+    {file = "rpds_py-0.18.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:7bd339195d84439cbe5771546fe8a4e8a7a045417d8f9de9a368c434e42a721e"},
+    {file = "rpds_py-0.18.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:d7c36232a90d4755b720fbd76739d8891732b18cf240a9c645d75f00639a9024"},
+    {file = "rpds_py-0.18.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:6b0817e34942b2ca527b0e9298373e7cc75f429e8da2055607f4931fded23e20"},
+    {file = "rpds_py-0.18.0-cp39-none-win32.whl", hash = "sha256:99f70b740dc04d09e6b2699b675874367885217a2e9f782bdf5395632ac663b7"},
+    {file = "rpds_py-0.18.0-cp39-none-win_amd64.whl", hash = "sha256:6ef687afab047554a2d366e112dd187b62d261d49eb79b77e386f94644363294"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:ad36cfb355e24f1bd37cac88c112cd7730873f20fb0bdaf8ba59eedf8216079f"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:36b3ee798c58ace201289024b52788161e1ea133e4ac93fba7d49da5fec0ef9e"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8a2f084546cc59ea99fda8e070be2fd140c3092dc11524a71aa8f0f3d5a55ca"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4461d0f003a0aa9be2bdd1b798a041f177189c1a0f7619fe8c95ad08d9a45d7"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8db715ebe3bb7d86d77ac1826f7d67ec11a70dbd2376b7cc214199360517b641"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:793968759cd0d96cac1e367afd70c235867831983f876a53389ad869b043c948"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66e6a3af5a75363d2c9a48b07cb27c4ea542938b1a2e93b15a503cdfa8490795"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6ef0befbb5d79cf32d0266f5cff01545602344eda89480e1dd88aca964260b18"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:1d4acf42190d449d5e89654d5c1ed3a4f17925eec71f05e2a41414689cda02d1"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-musllinux_1_2_i686.whl", hash = "sha256:a5f446dd5055667aabaee78487f2b5ab72e244f9bc0b2ffebfeec79051679984"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:9dbbeb27f4e70bfd9eec1be5477517365afe05a9b2c441a0b21929ee61048124"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:22806714311a69fd0af9b35b7be97c18a0fc2826e6827dbb3a8c94eac6cf7eeb"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:b34ae4636dfc4e76a438ab826a0d1eed2589ca7d9a1b2d5bb546978ac6485461"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c8370641f1a7f0e0669ddccca22f1da893cef7628396431eb445d46d893e5cd"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c8362467a0fdeccd47935f22c256bec5e6abe543bf0d66e3d3d57a8fb5731863"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:11a8c85ef4a07a7638180bf04fe189d12757c696eb41f310d2426895356dcf05"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b316144e85316da2723f9d8dc75bada12fa58489a527091fa1d5a612643d1a0e"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf1ea2e34868f6fbf070e1af291c8180480310173de0b0c43fc38a02929fc0e3"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e546e768d08ad55b20b11dbb78a745151acbd938f8f00d0cfbabe8b0199b9880"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:4901165d170a5fde6f589acb90a6b33629ad1ec976d4529e769c6f3d885e3e80"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-musllinux_1_2_i686.whl", hash = "sha256:618a3d6cae6ef8ec88bb76dd80b83cfe415ad4f1d942ca2a903bf6b6ff97a2da"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:ed4eb745efbff0a8e9587d22a84be94a5eb7d2d99c02dacf7bd0911713ed14dd"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:6c81e5f372cd0dc5dc4809553d34f832f60a46034a5f187756d9b90586c2c307"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:43fbac5f22e25bee1d482c97474f930a353542855f05c1161fd804c9dc74a09d"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d7faa6f14017c0b1e69f5e2c357b998731ea75a442ab3841c0dbbbfe902d2c4"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:08231ac30a842bd04daabc4d71fddd7e6d26189406d5a69535638e4dcb88fe76"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:044a3e61a7c2dafacae99d1e722cc2d4c05280790ec5a05031b3876809d89a5c"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3f26b5bd1079acdb0c7a5645e350fe54d16b17bfc5e71f371c449383d3342e17"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:482103aed1dfe2f3b71a58eff35ba105289b8d862551ea576bd15479aba01f66"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1374f4129f9bcca53a1bba0bb86bf78325a0374577cf7e9e4cd046b1e6f20e24"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:635dc434ff724b178cb192c70016cc0ad25a275228f749ee0daf0eddbc8183b1"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-musllinux_1_2_i686.whl", hash = "sha256:bc362ee4e314870a70f4ae88772d72d877246537d9f8cb8f7eacf10884862432"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:4832d7d380477521a8c1644bbab6588dfedea5e30a7d967b5fb75977c45fd77f"},
+    {file = "rpds_py-0.18.0.tar.gz", hash = "sha256:42821446ee7a76f5d9f71f9e33a4fb2ffd724bb3e7f93386150b61a43115788d"},
+]
+
+[[package]]
+name = "setuptools"
+version = "69.1.1"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "setuptools-69.1.1-py3-none-any.whl", hash = "sha256:02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56"},
+    {file = "setuptools-69.1.1.tar.gz", hash = "sha256:5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8"},
+]
 
 [package.extras]
-toml = ["setuptools (>=42)"]
-test = ["virtualenv (>20)", "pytest (>=6.2)"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.2)", "pip (>=19.1)", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff (>=0.2.1)", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.2)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
 [[package]]
 name = "six"
 version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
-category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+files = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
 
 [[package]]
 name = "spinners"
 version = "0.0.24"
 description = "Spinners for terminals"
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "spinners-0.0.24-py3-none-any.whl", hash = "sha256:2fa30d0b72c9650ad12bbe031c9943b8d441e41b4f5602b0ec977a19f3290e98"},
+    {file = "spinners-0.0.24.tar.gz", hash = "sha256:1eb6aeb4781d72ab42ed8a01dcf20f3002bf50740d7154d12fb8c9769bf9e27f"},
+]
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
-description = "ANSII Color formatting for output in terminal."
-category = "main"
+version = "2.4.0"
+description = "ANSI color formatting for output in terminal"
 optional = false
-python-versions = "*"
+python-versions = ">=3.8"
+files = [
+    {file = "termcolor-2.4.0-py3-none-any.whl", hash = "sha256:9297c0df9c99445c2412e832e882a7884038a25617c60cea2ad69488d4040d63"},
+    {file = "termcolor-2.4.0.tar.gz", hash = "sha256:aab9e56047c8ac41ed798fa36d892a37aca6b3e9159f3e0c24bc64a9b3ac7b7a"},
+]
+
+[package.extras]
+tests = ["pytest", "pytest-cov"]
 
 [[package]]
 name = "tomli"
 version = "2.0.1"
 description = "A lil' TOML parser"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
+    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+]
 
 [[package]]
-name = "typing-extensions"
-version = "4.3.0"
-description = "Backported and Experimental Type Hints for Python 3.7+"
-category = "dev"
+name = "types-colorama"
+version = "0.4.15.20240205"
+description = "Typing stubs for colorama"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "types-colorama-0.4.15.20240205.tar.gz", hash = "sha256:7ae4f58d407d387f4f98b24d81e1b7657ec754ea1dc4619ae5bd27f0c367637e"},
+    {file = "types_colorama-0.4.15.20240205-py3-none-any.whl", hash = "sha256:3ab26dcd76d2f13b1b795ed5c87a1a1a29331ea64cf614bb6ae958a3cebc3a53"},
+]
 
 [[package]]
 name = "yapf"
-version = "0.32.0"
-description = "A formatter for Python code."
-category = "dev"
+version = "0.40.2"
+description = "A formatter for Python code"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
+files = [
+    {file = "yapf-0.40.2-py3-none-any.whl", hash = "sha256:adc8b5dd02c0143108878c499284205adb258aad6db6634e5b869e7ee2bd548b"},
+    {file = "yapf-0.40.2.tar.gz", hash = "sha256:4dab8a5ed7134e26d57c1647c7483afb3f136878b579062b786c9ba16b94637b"},
+]
+
+[package.dependencies]
+importlib-metadata = ">=6.6.0"
+platformdirs = ">=3.5.1"
+tomli = ">=2.0.1"
 
 [[package]]
 name = "zipp"
-version = "3.8.1"
+version = "3.17.0"
 description = "Backport of pathlib-compatible object wrapper for zip files"
-category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"},
+    {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"},
+]
 
 [package.extras]
-testing = ["pytest-mypy (>=0.9.1)", "pytest-black (>=0.3.7)", "func-timeout", "jaraco.itertools", "pytest-enabler (>=1.3)", "pytest-cov", "pytest-flake8", "pytest-checkdocs (>=2.4)", "pytest (>=6)"]
-docs = ["jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "jaraco.packaging (>=9)", "sphinx"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"]
+testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"]
 
 [metadata]
-lock-version = "1.1"
-python-versions = "^3.8"
-content-hash = "71855d16c0f315ff383322272ddfca2b4917dbba9fa5ca1863b3bd537e35fee1"
-
-[metadata.files]
-appdirs = [
-    {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},
-    {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},
-]
-argcomplete = [
-    {file = "argcomplete-2.0.0-py2.py3-none-any.whl", hash = "sha256:cffa11ea77999bb0dd27bb25ff6dc142a6796142f68d45b1a26b11f58724561e"},
-    {file = "argcomplete-2.0.0.tar.gz", hash = "sha256:6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20"},
-]
-atomicwrites = [
-    {file = "atomicwrites-1.4.1.tar.gz", hash = "sha256:81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11"},
-]
-attrs = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
-]
-colorama = [
-    {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"},
-    {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"},
-]
-dotty-dict = [
-    {file = "dotty_dict-1.3.1-py3-none-any.whl", hash = "sha256:5022d234d9922f13aa711b4950372a06a6d64cb6d6db9ba43d0ba133ebfce31f"},
-    {file = "dotty_dict-1.3.1.tar.gz", hash = "sha256:4b016e03b8ae265539757a53eba24b9bfda506fb94fbce0bee843c6f05541a15"},
-]
-editables = [
-    {file = "editables-0.3-py3-none-any.whl", hash = "sha256:ee686a8db9f5d91da39849f175ffeef094dd0e9c36d6a59a2e8c7f92a3b80020"},
-    {file = "editables-0.3.tar.gz", hash = "sha256:167524e377358ed1f1374e61c268f0d7a4bf7dbd046c656f7b410cde16161b1a"},
-]
-flake8 = [
-    {file = "flake8-5.0.4-py2.py3-none-any.whl", hash = "sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248"},
-    {file = "flake8-5.0.4.tar.gz", hash = "sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db"},
-]
-flit-core = [
-    {file = "flit_core-3.7.1-py3-none-any.whl", hash = "sha256:e454fdbf68c7036e1c7435ec7479383f9d9a1650ca5b304feb184eba1efcdcef"},
-    {file = "flit_core-3.7.1.tar.gz", hash = "sha256:14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f"},
-]
-halo = [
-    {file = "halo-0.0.31-py2-none-any.whl", hash = "sha256:5350488fb7d2aa7c31a1344120cee67a872901ce8858f60da7946cef96c208ab"},
-    {file = "halo-0.0.31.tar.gz", hash = "sha256:7b67a3521ee91d53b7152d4ee3452811e1d2a6321975137762eb3d70063cc9d6"},
-]
-hatch-fancy-pypi-readme = [
-    {file = "hatch_fancy_pypi_readme-22.3.0-py3-none-any.whl", hash = "sha256:97c7ea026fe0d305163f5380c5df1dde51051e63d0dd4a47811214a5cd4e39b4"},
-    {file = "hatch_fancy_pypi_readme-22.3.0.tar.gz", hash = "sha256:7d4651f8f07825931c92873cb51137214a938badb7a759b85c1d95bf74f86efa"},
-]
-hatch-vcs = [
-    {file = "hatch_vcs-0.2.0-py2.py3-none-any.whl", hash = "sha256:86432a0dd49acae0e69e14f285667693fcd31d9869ca21634520acc30d482f07"},
-    {file = "hatch_vcs-0.2.0.tar.gz", hash = "sha256:9913d733b34eec9bb0345d0626ca32165a4ad2de15d1ce643c36d09ca908abff"},
-]
-hatchling = [
-    {file = "hatchling-1.8.0-py3-none-any.whl", hash = "sha256:1f7d920b1478221c8709841eb2aa6069856038463816d3a27b84ca5e99000e06"},
-    {file = "hatchling-1.8.0.tar.gz", hash = "sha256:a4f982fdca0717d8c46bfe7b501302f90aaf2a5302845d550b49c8739681feb2"},
-]
-hid = [
-    {file = "hid-1.0.5-py2-none-any.whl", hash = "sha256:11836b877e81ab68cdd3abc44f2e230f0e6146c7e17ac45c185b72e0159fc9c7"},
-    {file = "hid-1.0.5.tar.gz", hash = "sha256:1e954e7f7ab9b7c9dfc78db59504692c17db3b71249492b976b1525b97dbb0e8"},
-]
-hjson = [
-    {file = "hjson-3.1.0-py3-none-any.whl", hash = "sha256:65713cdcf13214fb554eb8b4ef803419733f4f5e551047c9b711098ab7186b89"},
-    {file = "hjson-3.1.0.tar.gz", hash = "sha256:55af475a27cf83a7969c808399d7bccdec8fb836a07ddbd574587593b9cdcf75"},
-]
-importlib-resources = [
-    {file = "importlib_resources-5.9.0-py3-none-any.whl", hash = "sha256:f78a8df21a79bcc30cfd400bdc38f314333de7c0fb619763f6b9dabab8268bb7"},
-    {file = "importlib_resources-5.9.0.tar.gz", hash = "sha256:5481e97fb45af8dcf2f798952625591c58fe599d0735d86b10f54de086a61681"},
-]
-iniconfig = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
-]
-jsonschema = [
-    {file = "jsonschema-4.14.0-py3-none-any.whl", hash = "sha256:9892b8d630a82990521a9ca630d3446bd316b5ad54dbe981338802787f3e0d2d"},
-    {file = "jsonschema-4.14.0.tar.gz", hash = "sha256:15062f4cc6f591400cd528d2c355f2cfa6a57e44c820dc783aee5e23d36a831f"},
-]
-log-symbols = [
-    {file = "log_symbols-0.0.14-py3-none-any.whl", hash = "sha256:4952106ff8b605ab7d5081dd2c7e6ca7374584eff7086f499c06edd1ce56dcca"},
-    {file = "log_symbols-0.0.14.tar.gz", hash = "sha256:cf0bbc6fe1a8e53f0d174a716bc625c4f87043cc21eb55dd8a740cfe22680556"},
-]
-mccabe = [
-    {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
-    {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
-]
-milc = [
-    {file = "milc-1.6.6-py2.py3-none-any.whl", hash = "sha256:5735022d25bc7aa259139ae680efa2867ce91bab769aa3b2482c63a3158120a5"},
-    {file = "milc-1.6.6.tar.gz", hash = "sha256:a4a1673718aaceefeb62c1799e48825bc6f4e56bfd8ad4a8e341a7622e6ff000"},
-]
-nose2 = [
-    {file = "nose2-0.12.0-py2.py3-none-any.whl", hash = "sha256:da7eb5e3cbe2abb693a053e17b4fbefca98ea9ea79fc729b0b0f41e8b4196304"},
-    {file = "nose2-0.12.0.tar.gz", hash = "sha256:956e79b9bd558ee08b6200c05ad2c76465b7e3860c0c0537686089285c320113"},
-]
-packaging = [
-    {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
-    {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
-]
-pathspec = [
-    {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"},
-    {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"},
-]
-pep8-naming = [
-    {file = "pep8-naming-0.13.2.tar.gz", hash = "sha256:93eef62f525fd12a6f8c98f4dcc17fa70baae2f37fa1f73bec00e3e44392fa48"},
-    {file = "pep8_naming-0.13.2-py3-none-any.whl", hash = "sha256:59e29e55c478db69cffbe14ab24b5bd2cd615c0413edf790d47d3fb7ba9a4e23"},
-]
-pillow = [
-    {file = "Pillow-9.2.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:a9c9bc489f8ab30906d7a85afac4b4944a572a7432e00698a7239f44a44e6efb"},
-    {file = "Pillow-9.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:510cef4a3f401c246cfd8227b300828715dd055463cdca6176c2e4036df8bd4f"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7888310f6214f19ab2b6df90f3f06afa3df7ef7355fc025e78a3044737fab1f5"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:831e648102c82f152e14c1a0938689dbb22480c548c8d4b8b248b3e50967b88c"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1cc1d2451e8a3b4bfdb9caf745b58e6c7a77d2e469159b0d527a4554d73694d1"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:136659638f61a251e8ed3b331fc6ccd124590eeff539de57c5f80ef3a9594e58"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:6e8c66f70fb539301e064f6478d7453e820d8a2c631da948a23384865cd95544"},
-    {file = "Pillow-9.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:37ff6b522a26d0538b753f0b4e8e164fdada12db6c6f00f62145d732d8a3152e"},
-    {file = "Pillow-9.2.0-cp310-cp310-win32.whl", hash = "sha256:c79698d4cd9318d9481d89a77e2d3fcaeff5486be641e60a4b49f3d2ecca4e28"},
-    {file = "Pillow-9.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:254164c57bab4b459f14c64e93df11eff5ded575192c294a0c49270f22c5d93d"},
-    {file = "Pillow-9.2.0-cp311-cp311-macosx_10_10_universal2.whl", hash = "sha256:408673ed75594933714482501fe97e055a42996087eeca7e5d06e33218d05aa8"},
-    {file = "Pillow-9.2.0-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:727dd1389bc5cb9827cbd1f9d40d2c2a1a0c9b32dd2261db522d22a604a6eec9"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50dff9cc21826d2977ef2d2a205504034e3a4563ca6f5db739b0d1026658e004"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cb6259196a589123d755380b65127ddc60f4c64b21fc3bb46ce3a6ea663659b0"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b0554af24df2bf96618dac71ddada02420f946be943b181108cac55a7a2dcd4"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:15928f824870535c85dbf949c09d6ae7d3d6ac2d6efec80f3227f73eefba741c"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:bdd0de2d64688ecae88dd8935012c4a72681e5df632af903a1dca8c5e7aa871a"},
-    {file = "Pillow-9.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d5b87da55a08acb586bad5c3aa3b86505f559b84f39035b233d5bf844b0834b1"},
-    {file = "Pillow-9.2.0-cp311-cp311-win32.whl", hash = "sha256:b6d5e92df2b77665e07ddb2e4dbd6d644b78e4c0d2e9272a852627cdba0d75cf"},
-    {file = "Pillow-9.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:6bf088c1ce160f50ea40764f825ec9b72ed9da25346216b91361eef8ad1b8f8c"},
-    {file = "Pillow-9.2.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:2c58b24e3a63efd22554c676d81b0e57f80e0a7d3a5874a7e14ce90ec40d3069"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eef7592281f7c174d3d6cbfbb7ee5984a671fcd77e3fc78e973d492e9bf0eb3f"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dcd7b9c7139dc8258d164b55696ecd16c04607f1cc33ba7af86613881ffe4ac8"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a138441e95562b3c078746a22f8fca8ff1c22c014f856278bdbdd89ca36cff1b"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:93689632949aff41199090eff5474f3990b6823404e45d66a5d44304e9cdc467"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:f3fac744f9b540148fa7715a435d2283b71f68bfb6d4aae24482a890aed18b59"},
-    {file = "Pillow-9.2.0-cp37-cp37m-win32.whl", hash = "sha256:fa768eff5f9f958270b081bb33581b4b569faabf8774726b283edb06617101dc"},
-    {file = "Pillow-9.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:69bd1a15d7ba3694631e00df8de65a8cb031911ca11f44929c97fe05eb9b6c1d"},
-    {file = "Pillow-9.2.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:030e3460861488e249731c3e7ab59b07c7853838ff3b8e16aac9561bb345da14"},
-    {file = "Pillow-9.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:74a04183e6e64930b667d321524e3c5361094bb4af9083db5c301db64cd341f3"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d33a11f601213dcd5718109c09a52c2a1c893e7461f0be2d6febc2879ec2402"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1fd6f5e3c0e4697fa7eb45b6e93996299f3feee73a3175fa451f49a74d092b9f"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a647c0d4478b995c5e54615a2e5360ccedd2f85e70ab57fbe817ca613d5e63b8"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:4134d3f1ba5f15027ff5c04296f13328fecd46921424084516bdb1b2548e66ff"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:bc431b065722a5ad1dfb4df354fb9333b7a582a5ee39a90e6ffff688d72f27a1"},
-    {file = "Pillow-9.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:1536ad017a9f789430fb6b8be8bf99d2f214c76502becc196c6f2d9a75b01b76"},
-    {file = "Pillow-9.2.0-cp38-cp38-win32.whl", hash = "sha256:2ad0d4df0f5ef2247e27fc790d5c9b5a0af8ade9ba340db4a73bb1a4a3e5fb4f"},
-    {file = "Pillow-9.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:ec52c351b35ca269cb1f8069d610fc45c5bd38c3e91f9ab4cbbf0aebc136d9c8"},
-    {file = "Pillow-9.2.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:0ed2c4ef2451de908c90436d6e8092e13a43992f1860275b4d8082667fbb2ffc"},
-    {file = "Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4ad2f835e0ad81d1689f1b7e3fbac7b01bb8777d5a985c8962bedee0cc6d43da"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea98f633d45f7e815db648fd7ff0f19e328302ac36427343e4432c84432e7ff4"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7761afe0126d046974a01e030ae7529ed0ca6a196de3ec6937c11df0df1bc91c"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9a54614049a18a2d6fe156e68e188da02a046a4a93cf24f373bffd977e943421"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:5aed7dde98403cd91d86a1115c78d8145c83078e864c1de1064f52e6feb61b20"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:13b725463f32df1bfeacbf3dd197fb358ae8ebcd8c5548faa75126ea425ccb60"},
-    {file = "Pillow-9.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:808add66ea764ed97d44dda1ac4f2cfec4c1867d9efb16a33d158be79f32b8a4"},
-    {file = "Pillow-9.2.0-cp39-cp39-win32.whl", hash = "sha256:337a74fd2f291c607d220c793a8135273c4c2ab001b03e601c36766005f36885"},
-    {file = "Pillow-9.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:fac2d65901fb0fdf20363fbd345c01958a742f2dc62a8dd4495af66e3ff502a4"},
-    {file = "Pillow-9.2.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:ad2277b185ebce47a63f4dc6302e30f05762b688f8dc3de55dbae4651872cdf3"},
-    {file = "Pillow-9.2.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7c7b502bc34f6e32ba022b4a209638f9e097d7a9098104ae420eb8186217ebbb"},
-    {file = "Pillow-9.2.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d1f14f5f691f55e1b47f824ca4fdcb4b19b4323fe43cc7bb105988cad7496be"},
-    {file = "Pillow-9.2.0-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:dfe4c1fedfde4e2fbc009d5ad420647f7730d719786388b7de0999bf32c0d9fd"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:f07f1f00e22b231dd3d9b9208692042e29792d6bd4f6639415d2f23158a80013"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1802f34298f5ba11d55e5bb09c31997dc0c6aed919658dfdf0198a2fe75d5490"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17d4cafe22f050b46d983b71c707162d63d796a1235cdf8b9d7a112e97b15bac"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:96b5e6874431df16aee0c1ba237574cb6dff1dcb173798faa6a9d8b399a05d0e"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:0030fdbd926fb85844b8b92e2f9449ba89607231d3dd597a21ae72dc7fe26927"},
-    {file = "Pillow-9.2.0.tar.gz", hash = "sha256:75e636fd3e0fb872693f23ccb8a5ff2cd578801251f3a4f6854c6a5d437d3c04"},
-]
-pkgutil-resolve-name = [
-    {file = "pkgutil_resolve_name-1.3.10-py3-none-any.whl", hash = "sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e"},
-    {file = "pkgutil_resolve_name-1.3.10.tar.gz", hash = "sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174"},
-]
-pluggy = [
-    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
-    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
-]
-poetry-core = [
-    {file = "poetry-core-1.0.8.tar.gz", hash = "sha256:951fc7c1f8d710a94cb49019ee3742125039fc659675912ea614ac2aa405b118"},
-    {file = "poetry_core-1.0.8-py2.py3-none-any.whl", hash = "sha256:54b0fab6f7b313886e547a52f8bf52b8cf43e65b2633c65117f8755289061924"},
-]
-py = [
-    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
-    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
-]
-pycodestyle = [
-    {file = "pycodestyle-2.9.1-py2.py3-none-any.whl", hash = "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b"},
-    {file = "pycodestyle-2.9.1.tar.gz", hash = "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"},
-]
-pyflakes = [
-    {file = "pyflakes-2.5.0-py2.py3-none-any.whl", hash = "sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2"},
-    {file = "pyflakes-2.5.0.tar.gz", hash = "sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"},
-]
-pygments = [
-    {file = "Pygments-2.13.0-py3-none-any.whl", hash = "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"},
-    {file = "Pygments-2.13.0.tar.gz", hash = "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1"},
-]
-pyparsing = [
-    {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
-    {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
-]
-pyrsistent = [
-    {file = "pyrsistent-0.18.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:df46c854f490f81210870e509818b729db4488e1f30f2a1ce1698b2295a878d1"},
-    {file = "pyrsistent-0.18.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d45866ececf4a5fff8742c25722da6d4c9e180daa7b405dc0a2a2790d668c26"},
-    {file = "pyrsistent-0.18.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4ed6784ceac462a7d6fcb7e9b663e93b9a6fb373b7f43594f9ff68875788e01e"},
-    {file = "pyrsistent-0.18.1-cp310-cp310-win32.whl", hash = "sha256:e4f3149fd5eb9b285d6bfb54d2e5173f6a116fe19172686797c056672689daf6"},
-    {file = "pyrsistent-0.18.1-cp310-cp310-win_amd64.whl", hash = "sha256:636ce2dc235046ccd3d8c56a7ad54e99d5c1cd0ef07d9ae847306c91d11b5fec"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e92a52c166426efbe0d1ec1332ee9119b6d32fc1f0bbfd55d5c1088070e7fc1b"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7a096646eab884bf8bed965bad63ea327e0d0c38989fc83c5ea7b8a87037bfc"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cdfd2c361b8a8e5d9499b9082b501c452ade8bbf42aef97ea04854f4a3f43b22"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-win32.whl", hash = "sha256:7ec335fc998faa4febe75cc5268a9eac0478b3f681602c1f27befaf2a1abe1d8"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-win_amd64.whl", hash = "sha256:6455fc599df93d1f60e1c5c4fe471499f08d190d57eca040c0ea182301321286"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:fd8da6d0124efa2f67d86fa70c851022f87c98e205f0594e1fae044e7119a5a6"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7bfe2388663fd18bd8ce7db2c91c7400bf3e1a9e8bd7d63bf7e77d39051b85ec"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e3e1fcc45199df76053026a51cc59ab2ea3fc7c094c6627e93b7b44cdae2c8c"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-win32.whl", hash = "sha256:b568f35ad53a7b07ed9b1b2bae09eb15cdd671a5ba5d2c66caee40dbf91c68ca"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-win_amd64.whl", hash = "sha256:d1b96547410f76078eaf66d282ddca2e4baae8964364abb4f4dcdde855cd123a"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f87cc2863ef33c709e237d4b5f4502a62a00fab450c9e020892e8e2ede5847f5"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6bc66318fb7ee012071b2792024564973ecc80e9522842eb4e17743604b5e045"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:914474c9f1d93080338ace89cb2acee74f4f666fb0424896fcfb8d86058bf17c"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-win32.whl", hash = "sha256:1b34eedd6812bf4d33814fca1b66005805d3640ce53140ab8bbb1e2651b0d9bc"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-win_amd64.whl", hash = "sha256:e24a828f57e0c337c8d8bb9f6b12f09dfdf0273da25fda9e314f0b684b415a07"},
-    {file = "pyrsistent-0.18.1.tar.gz", hash = "sha256:d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96"},
-]
-pyserial = [
-    {file = "pyserial-3.5-py2.py3-none-any.whl", hash = "sha256:c4451db6ba391ca6ca299fb3ec7bae67a5c55dde170964c7a14ceefec02f2cf0"},
-    {file = "pyserial-3.5.tar.gz", hash = "sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb"},
-]
-pytest = [
-    {file = "pytest-7.1.2-py3-none-any.whl", hash = "sha256:13d0e3ccfc2b6e26be000cb6568c832ba67ba32e719443bfe725814d3c42433c"},
-    {file = "pytest-7.1.2.tar.gz", hash = "sha256:a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45"},
-]
-pyusb = [
-    {file = "pyusb-1.2.1-py3-none-any.whl", hash = "sha256:2b4c7cb86dbadf044dfb9d3a4ff69fd217013dbe78a792177a3feb172449ea36"},
-    {file = "pyusb-1.2.1.tar.gz", hash = "sha256:a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"},
-]
-qmk = [
-    {file = "qmk-1.1.1-py2.py3-none-any.whl", hash = "sha256:8694300678d9be1e594a500e82bfc9fb08a8ac0983b25fcb663ddd72b4861d97"},
-    {file = "qmk-1.1.1.tar.gz", hash = "sha256:dd028e09ebcd61f8bdf8cb82929dfafc0e007d97a5a3803b45819b4641773269"},
-]
-setuptools-scm = [
-    {file = "setuptools_scm-7.0.5-py3-none-any.whl", hash = "sha256:7930f720905e03ccd1e1d821db521bff7ec2ac9cf0ceb6552dd73d24a45d3b02"},
-    {file = "setuptools_scm-7.0.5.tar.gz", hash = "sha256:031e13af771d6f892b941adb6ea04545bbf91ebc5ce68c78aaf3fff6e1fb4844"},
-]
-six = [
-    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
-    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
-]
-spinners = [
-    {file = "spinners-0.0.24-py3-none-any.whl", hash = "sha256:2fa30d0b72c9650ad12bbe031c9943b8d441e41b4f5602b0ec977a19f3290e98"},
-    {file = "spinners-0.0.24.tar.gz", hash = "sha256:1eb6aeb4781d72ab42ed8a01dcf20f3002bf50740d7154d12fb8c9769bf9e27f"},
-]
-termcolor = [
-    {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"},
-]
-tomli = [
-    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
-    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
-]
-typing-extensions = [
-    {file = "typing_extensions-4.3.0-py3-none-any.whl", hash = "sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02"},
-    {file = "typing_extensions-4.3.0.tar.gz", hash = "sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6"},
-]
-yapf = [
-    {file = "yapf-0.32.0-py2.py3-none-any.whl", hash = "sha256:8fea849025584e486fd06d6ba2bed717f396080fd3cc236ba10cb97c4c51cf32"},
-    {file = "yapf-0.32.0.tar.gz", hash = "sha256:a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b"},
-]
-zipp = [
-    {file = "zipp-3.8.1-py3-none-any.whl", hash = "sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009"},
-    {file = "zipp-3.8.1.tar.gz", hash = "sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2"},
-]
+lock-version = "2.0"
+python-versions = "^3.11"
+content-hash = "6146ea1571def62c4f7ff33173e0144bcfd206c178936365bff8b4e1669b90ff"
diff --git a/util/nix/pyproject.toml b/util/nix/pyproject.toml
index ff484dbe799..fa62eb96c01 100644
--- a/util/nix/pyproject.toml
+++ b/util/nix/pyproject.toml
@@ -8,7 +8,7 @@ description = ""
 authors = []
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.11"
 appdirs = "*"
 argcomplete = "*"
 colorama = "*"
@@ -34,28 +34,6 @@ pep8-naming = "*"
 pyflakes = "*"
 yapf = "*"
 
-# These dependencies are required by the jsonschema >= 4.11.0 build system, but
-# are not detected automatically; they are also not present in the used Nixpkgs
-# snapshot, so need to be obtained through Poetry.
-hatchling = "*"
-hatch-vcs = "*"
-hatch-fancy-pypi-readme = "*"
-
-# The `pytest` module in the used Nixpkgs snapshot has an upper bound on the
-# `pluggy` dependency, which conflicts with the dependency of the `hatchling`
-# module; upgrading the `pytest` module fixes the conflict.
-pytest = "*"
-
-# Building the `tomli` module, which is in the dependency tree of `hatchling`,
-# requires a newer `flit-core` module than found in the used Nixpkgs snapshot.
-flit-core = "*"
-
-# Building `dotty-dict` >= 1.3.1 requires the `poetry-core` module, and the
-# version of that module provided by the used Nixpkgs snapshot cannot be built
-# on Darwin due to the regex compatibility issue in the old Nixpkgs code
-# (https://github.com/NixOS/nix/issues/4758).
-poetry-core = "*"
-
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
diff --git a/util/nix/sources.json b/util/nix/sources.json
index 8cdb9e49968..3985f75e033 100644
--- a/util/nix/sources.json
+++ b/util/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c0e881852006b132236cbf0301bd1939bb50867e",
-        "sha256": "0fy7z7yxk5n7yslsvx5cyc6h21qwi4bhxf3awhirniszlbvaazy2",
+        "rev": "98b00b6947a9214381112bdb6f89c25498db4959",
+        "sha256": "1m6dm144mbm56n9293m26f46bjrklknyr4q4kzvxkiv036ijma98",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/c0e881852006b132236cbf0301bd1939bb50867e.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/98b00b6947a9214381112bdb6f89c25498db4959.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "poetry2nix": {
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "11c0df8e348c0f169cd73a2e3d63f65c92baf666",
-        "sha256": "0i3wbp2p0x6bpj07sqpvkbx4lvjm0irvpmv2bjqx8k02mpjm7dg2",
+        "rev": "3c92540611f42d3fb2d0d084a6c694cd6544b609",
+        "sha256": "1jfrangw0xb5b8sdkimc550p3m98zhpb1fayahnr7crg74as4qyq",
         "type": "tarball",
-        "url": "https://github.com/nix-community/poetry2nix/archive/11c0df8e348c0f169cd73a2e3d63f65c92baf666.tar.gz",
+        "url": "https://github.com/nix-community/poetry2nix/archive/3c92540611f42d3fb2d0d084a6c694cd6544b609.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/util/nix/sources.nix b/util/nix/sources.nix
index 1938409dddb..fe3dadf7ebb 100644
--- a/util/nix/sources.nix
+++ b/util/nix/sources.nix
@@ -10,29 +10,50 @@ let
     let
       name' = sanitizeName name + "-src";
     in
-      if spec.builtin or true then
-        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
-      else
-        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
+    if spec.builtin or true then
+      builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+    else
+      pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
 
   fetch_tarball = pkgs: name: spec:
     let
       name' = sanitizeName name + "-src";
     in
-      if spec.builtin or true then
-        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
-      else
-        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
+    if spec.builtin or true then
+      builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
+    else
+      pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
 
   fetch_git = name: spec:
     let
       ref =
-        if spec ? ref then spec.ref else
+        spec.ref or (
           if spec ? branch then "refs/heads/${spec.branch}" else
-            if spec ? tag then "refs/tags/${spec.tag}" else
-              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+          if spec ? tag then "refs/tags/${spec.tag}" else
+          abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"
+        );
+      submodules = spec.submodules or false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                { }
+            else { };
+        in
+        if nixSupportsSubmodules
+        then { inherit submodules; }
+        else emptyArgWithWarning;
     in
-      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
+    builtins.fetchGit
+      ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
 
   fetch_local = spec: spec.path;
 
@@ -66,16 +87,16 @@ let
       hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
       hasThisAsNixpkgsPath = <nixpkgs> == ./.;
     in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
-      else
-        abort
-          ''
-            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-            add a package called "nixpkgs" to your sources.json.
-          '';
+    if builtins.hasAttr "nixpkgs" sources
+    then sourcesNixpkgs
+    else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+      import <nixpkgs> { }
+    else
+      abort
+        ''
+          Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+          add a package called "nixpkgs" to your sources.json.
+        '';
 
   # The actual fetching function.
   fetch = pkgs: name: spec:
@@ -95,13 +116,13 @@ let
   # the path directly as opposed to the fetched source.
   replace = name: drv:
     let
-      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
+      saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
       ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
     in
-      if ersatz == "" then drv else
-        # this turns the string into an actual Nix path (for both absolute and
-        # relative paths)
-        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
+    if ersatz == "" then drv else
+      # this turns the string into an actual Nix path (for both absolute and
+      # relative paths)
+    if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
 
   # Ports of functions for older nix versions
 
@@ -112,7 +133,7 @@ let
   );
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
-  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
+  range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
   stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
@@ -123,43 +144,46 @@ let
   concatStrings = builtins.concatStringsSep "";
 
   # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
-  optionalAttrs = cond: as: if cond then as else {};
+  optionalAttrs = cond: as: if cond then as else { };
 
   # fetchTarball version that is compatible between all the versions of Nix
   builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
     let
       inherit (builtins) lessThan nixVersion fetchTarball;
     in
-      if lessThan nixVersion "1.12" then
-        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchTarball attrs;
+    if lessThan nixVersion "1.12" then
+      fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+    else
+      fetchTarball attrs;
 
   # fetchurl version that is compatible between all the versions of Nix
   builtins_fetchurl = { url, name ? null, sha256 }@attrs:
     let
       inherit (builtins) lessThan nixVersion fetchurl;
     in
-      if lessThan nixVersion "1.12" then
-        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchurl attrs;
+    if lessThan nixVersion "1.12" then
+      fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+    else
+      fetchurl attrs;
 
   # Create the final "sources" from the config
   mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
-          "The values in sources.json should not have an 'outPath' attribute"
-        else
-          spec // { outPath = replace name (fetch config.pkgs name spec); }
-    ) config.sources;
+    mapAttrs
+      (
+        name: spec:
+          if builtins.hasAttr "outPath" spec
+          then
+            abort
+              "The values in sources.json should not have an 'outPath' attribute"
+          else
+            spec // { outPath = replace name (fetch config.pkgs name spec); }
+      )
+      config.sources;
 
   # The "config" used by the fetchers
   mkConfig =
     { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
-    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
+    , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile)
     , system ? builtins.currentSystem
     , pkgs ? mkPkgs sources system
     }: rec {
@@ -171,4 +195,4 @@ let
     };
 
 in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
+mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }
diff --git a/util/uf2conv.py b/util/uf2conv.py
index 84271cee4f6..67cf92f1691 100755
--- a/util/uf2conv.py
+++ b/util/uf2conv.py
@@ -30,7 +30,7 @@ def is_hex(buf):
         w = buf[0:30].decode("utf-8")
     except UnicodeDecodeError:
         return False
-    if w[0] == ':' and re.match(b"^[:0-9a-fA-F\r\n]+$", buf):
+    if w[0] == ':' and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
         return True
     return False
 
@@ -214,7 +214,7 @@ def get_drives():
                                      "get", "DeviceID,", "VolumeName,",
                                      "FileSystem,", "DriveType"])
         for line in to_str(r).split('\n'):
-            words = re.split('\s+', line)
+            words = re.split(r'\s+', line)
             if len(words) >= 3 and words[1] == "2" and words[2] == "FAT":
                 drives.append(words[0])
     else:
@@ -243,7 +243,7 @@ def has_info(d):
 def board_id(path):
     with open(path + INFO_FILE, mode='r') as file:
         file_content = file.read()
-    return re.search("Board-ID: ([^\r\n]*)", file_content).group(1)
+    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
 
 
 def list_drives():
diff --git a/vial-nckiser.sln b/vial-nckiser.sln
new file mode 100644
index 00000000000..0b1b24b0094
--- /dev/null
+++ b/vial-nckiser.sln
@@ -0,0 +1,56 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{33D2EE6C-470F-4416-8CA4-B5DA53629A24}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lufa", "lufa", "{1375FD87-99B1-4818-81F1-2C6157C076BC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projects", "Projects", "{A3714D06-FEE6-4ED6-B0FE-8A435C18BF96}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LEDNotifier", "LEDNotifier", "{B19427F0-C3B9-4282-958B-F5DB8D252A04}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CPUMonitor", "lib\lufa\Projects\LEDNotifier\CPUUsageApp\CPUMonitor.csproj", "{07D880D6-569E-4D11-A2C0-EF85E0E07CEA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LEDMixer", "lib\lufa\Projects\LEDNotifier\LEDMixerApp\LEDMixer.csproj", "{676C3EEE-B2AA-4F3F-841C-43FF91DBA9E2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TempDataLogger", "TempDataLogger", "{E803A6E0-0F25-44EB-BE3E-D97E5D573D27}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TempLoggerHostApp", "lib\lufa\Projects\TempDataLogger\TempLogHostApp\TempLoggerHostApp.csproj", "{6D617F8B-2BD1-4A5D-9088-B9DF900F324B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{07D880D6-569E-4D11-A2C0-EF85E0E07CEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07D880D6-569E-4D11-A2C0-EF85E0E07CEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07D880D6-569E-4D11-A2C0-EF85E0E07CEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07D880D6-569E-4D11-A2C0-EF85E0E07CEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{676C3EEE-B2AA-4F3F-841C-43FF91DBA9E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{676C3EEE-B2AA-4F3F-841C-43FF91DBA9E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{676C3EEE-B2AA-4F3F-841C-43FF91DBA9E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{676C3EEE-B2AA-4F3F-841C-43FF91DBA9E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D617F8B-2BD1-4A5D-9088-B9DF900F324B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D617F8B-2BD1-4A5D-9088-B9DF900F324B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D617F8B-2BD1-4A5D-9088-B9DF900F324B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D617F8B-2BD1-4A5D-9088-B9DF900F324B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{1375FD87-99B1-4818-81F1-2C6157C076BC} = {33D2EE6C-470F-4416-8CA4-B5DA53629A24}
+		{A3714D06-FEE6-4ED6-B0FE-8A435C18BF96} = {1375FD87-99B1-4818-81F1-2C6157C076BC}
+		{B19427F0-C3B9-4282-958B-F5DB8D252A04} = {A3714D06-FEE6-4ED6-B0FE-8A435C18BF96}
+		{07D880D6-569E-4D11-A2C0-EF85E0E07CEA} = {B19427F0-C3B9-4282-958B-F5DB8D252A04}
+		{676C3EEE-B2AA-4F3F-841C-43FF91DBA9E2} = {B19427F0-C3B9-4282-958B-F5DB8D252A04}
+		{E803A6E0-0F25-44EB-BE3E-D97E5D573D27} = {A3714D06-FEE6-4ED6-B0FE-8A435C18BF96}
+		{6D617F8B-2BD1-4A5D-9088-B9DF900F324B} = {E803A6E0-0F25-44EB-BE3E-D97E5D573D27}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {42E6936C-0B2F-4FDC-B274-2CCEF426A2DB}
+	EndGlobalSection
+EndGlobal